From abb1c121629b77ba868dc9c9904620504e6b74f2 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 7 Mar 2023 14:03:02 -0500
Subject: VS: Revert "Build custom commands concurrently when possible"

Since commit 33c15ae2b9 (VS: Build custom commands concurrently when
possible, 2023-01-19, v3.26.0-rc1~56^2) we add `BuildInParallel` to
custom commands in `.vcxproj` files.  However, this can break existing
projects that implicitly rely on serial execution of custom commands.
For example, custom commands in our FindCUDA module run MSVC (via nvcc)
with a common `vc*.pdb` file, and therefore cannot run in parallel.

Revert use of `BuildInParallel` while leaving most of the infrastructure
for it in place.  It can be restored later with an option or policy.

Fixes: #24576
Issue: #18405
---
 Source/cmVisualStudio10TargetGenerator.cxx | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index c88679c..52de6ff 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1806,13 +1806,10 @@ void cmVisualStudio10TargetGenerator::WriteCustomRule(
       this->WriteCustomRuleCSharp(e0, c, name, script, additional_inputs.str(),
                                   outputs.str(), comment, ccg);
     } else {
-      this->WriteCustomRuleCpp(
-        *spe2, c, script, additional_inputs.str(), outputs.str(), comment, ccg,
-        symbolic,
-        (command.GetUsesTerminal() ||
-         (command.HasMainDependency() && source->GetIsGenerated()))
-          ? BuildInParallel::No
-          : BuildInParallel::Yes);
+      // FIXME(#18405): Enable BuildInParallel::Yes via an option or policy.
+      this->WriteCustomRuleCpp(*spe2, c, script, additional_inputs.str(),
+                               outputs.str(), comment, ccg, symbolic,
+                               BuildInParallel::No);
     }
   }
 }
-- 
cgit v0.12

eta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>refs</a><a href='/oss-git/Qt.git/log/?h=v4.8.0-beta'>log</a><a href='/oss-git/Qt.git/tree/?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>tree</a><a href='/oss-git/Qt.git/commit/?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>commit</a><a class='active' href='/oss-git/Qt.git/diff/?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>diff</a><a href='/oss-git/Qt.git/stats/?h=v4.8.0-beta'>stats</a></td><td class='form'><form class='right' method='get' action='/oss-git/Qt.git/log/'>
<input type='hidden' name='h' value='v4.8.0-beta'/><input type='hidden' name='id' value='73fc68802d8c0c8d3d499b279782ce270f1c5bc6'/><input type='hidden' name='id2' value='570f8970bea646055583671397c3d2706ac45004'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='text' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><div class='cgit-panel'><b>diff options</b><form method='get' action='.'><input type='hidden' name='h' value='v4.8.0-beta'/><input type='hidden' name='id' value='73fc68802d8c0c8d3d499b279782ce270f1c5bc6'/><input type='hidden' name='id2' value='570f8970bea646055583671397c3d2706ac45004'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><div class='diffstat-header'><a href='/oss-git/Qt.git/diff/?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>Diffstat</a></div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/.gitignore?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>.gitignore</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/oss-git/Qt.git/diff/bin/createpackage.pl?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>bin/createpackage.pl</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/oss-git/Qt.git/diff/bin/elf2e32_qtwrapper.pl?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>bin/elf2e32_qtwrapper.pl</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/oss-git/Qt.git/diff/bin/patch_capabilities.pl?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>bin/patch_capabilities.pl</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/oss-git/Qt.git/diff/bin/syncqt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>bin/syncqt</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/QMLViewer.desktop?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/QMLViewer.desktop</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/QMLViewer.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/QMLViewer.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 7150 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/README.source?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/README.source</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/api?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/api</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/changelog?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/changelog</a></td><td class='right'>2039</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/collection/qtdemo.qhc.uu?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/collection/qtdemo.qhc.uu</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/compat?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/compat</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/configure-pulse.sh?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/configure-pulse.sh</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/control?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/control</a></td><td class='right'>648</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-core.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-core.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-dbus-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-dbus-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-dbus.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-dbus.install</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-dbus.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-dbus.lintian</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-declarative-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-declarative-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-declarative-dev.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-declarative-dev.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-declarative.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-declarative.install</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-declarative.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-declarative.lintian</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-dev.dirs?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-dev.dirs</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-dev.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-dev.install</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-dev.links?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-dev.links</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-dev.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-dev.lintian</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-dev.manpages?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-dev.manpages</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-dev.postinst?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-dev.postinst</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-dev.prerm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-dev.prerm</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-doc.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-doc.install</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-doc.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-doc.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-gui-tests.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-gui-tests.lintian</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-gui.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-gui.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-help-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-help-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-help.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-help.install</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-help.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-help.lintian</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-meego-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-meego-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-meego-dev.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-meego-dev.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-meego.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-meego.lintian</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-meegographicssystem.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-meegographicssystem.install</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-meegographicssystemhelper-dev.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-meegographicssystemhelper-dev.install</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-meegographicssystemhelper.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-meegographicssystemhelper.install</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-multimedia-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-multimedia-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-multimedia.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-multimedia.install</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-multimedia.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-multimedia.lintian</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-network-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-network-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-network.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-network.install</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-network.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-network.lintian</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-opengl-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-opengl-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-opengl-dev.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-opengl-dev.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-opengl.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-opengl.install</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-opengl.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-opengl.lintian</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-phonon-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-phonon-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-phonon.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-phonon.install</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-phonon.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-phonon.lintian</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-script-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-script-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-script.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-script.install</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-script.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-script.lintian</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-sql-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-sql-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-sql-sqlite-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-sql-sqlite-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-sql-sqlite.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-sql-sqlite.install</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-sql-sqlite.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-sql-sqlite.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-sql.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-sql.install</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-sql.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-sql.lintian</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-svg-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-svg-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-svg.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-svg.install</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-svg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-svg.lintian</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-test-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-test-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-test.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-test.install</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-test.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-test.lintian</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-webkit.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-webkit.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-xml-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-xml-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-xml.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-xml.install</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-xml.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-xml.lintian</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-xmlpatterns-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-xmlpatterns-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-xmlpatterns.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-xmlpatterns.install</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4-xmlpatterns.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4-xmlpatterns.lintian</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqt4.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqt4.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqtcore4-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqtcore4-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqtcore4.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqtcore4.install</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqtcore4.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqtcore4.lintian</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqtgui4-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqtgui4-dbg.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqtgui4.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqtgui4.install</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/libqtgui4.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/libqtgui4.lintian</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/manpages/lrelease.1?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/manpages/lrelease.1</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/manpages/lupdate.1?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/manpages/lupdate.1</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/manpages/moc.1?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/manpages/moc.1</a></td><td class='right'>479</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/manpages/qmake.1?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/manpages/qmake.1</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/manpages/qtconfig.1?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/manpages/qtconfig.1</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/manpages/uic.1?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/manpages/uic.1</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/mkspecs/linux-g++-cross/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/mkspecs/linux-g++-cross/qmake.conf</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/mkspecs/linux-g++-cross/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/mkspecs/linux-g++-cross/qplatformdefs.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/not-installed?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/not-installed</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/qt4-acceptance-tests.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/qt4-acceptance-tests.lintian</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/qt4-declarative-qmlviewer.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/qt4-declarative-qmlviewer.install</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/qt4-declarative-qmlviewer.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/qt4-declarative-qmlviewer.lintian</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/qt4-doc-html.doc-base?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/qt4-doc-html.doc-base</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/qt4-doc-html.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/qt4-doc-html.install</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/qt4-doc-html.links?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/qt4-doc-html.links</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/qt4-doc.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/qt4-doc.install</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/qt4-linguist-tools.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/qt4-linguist-tools.install</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/qt4-linguist-tools.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/qt4-linguist-tools.lintian</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/qt4-linguist-tools.postinst?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/qt4-linguist-tools.postinst</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/qt4-linguist-tools.prerm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/qt4-linguist-tools.prerm</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/qt4-maemo-auto-tests.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/qt4-maemo-auto-tests.lintian</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/readdir-hppa-test.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/readdir-hppa-test.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/rules?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/rules</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/source.lintian-overrides?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/source.lintian-overrides</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/source/format?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/source/format</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/tests/create_tests_xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/tests/create_tests_xml</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/tests/libqt4-gui-tests.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/tests/libqt4-gui-tests.pro</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/tests/maemo_tests.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/tests/maemo_tests.prf</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/tests/qt4-acceptance-tests.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/tests/qt4-acceptance-tests.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/tests/qt4-maemo-auto-tests.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/tests/qt4-maemo-auto-tests.pro</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/tests/tests.xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/tests/tests.xml</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/tests/testset.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/tests/testset.txt</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/tests/testsuite_footer.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/tests/testsuite_footer.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/harmattan/tests/testsuite_header.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/harmattan/tests/testsuite_header.txt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/bld.inf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/bld.inf</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/confml/qt.confml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/confml/qt.confml</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/data_caging_paths.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/data_caging_paths.prf</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/environment.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/environment.prf</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/headerexport?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/headerexport</a></td><td class='right'>977</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/implml/qt_copy.implml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/implml/qt_copy.implml</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/layers.sysdef.xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/layers.sysdef.xml</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/loc.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/loc.prf</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/non_foundation_paths.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/non_foundation_paths.prf</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/package_definition.xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/package_definition.xml</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/package_map.xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/package_map.xml</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/patches/qmake_listgen.patch?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/patches/qmake_listgen.patch</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/platform_paths.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/platform_paths.prf</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/qt.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/qt.conf</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/qt.iby?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/qt.iby</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/qt.pkg?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/qt.pkg</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/qt.sisx?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/qt.sisx</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/qt_stub.pkg?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/qt_stub.pkg</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/qt_stub.sis?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/qt_stub.sis</a></td><td class='right'>bin</td><td class='graph'>0 -> 324 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/qtconfig.flm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/qtconfig.flm</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/qtconfig.xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/qtconfig.xml</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/qtdemoapps.pkg?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/qtdemoapps.pkg</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/sysdef_1_5_1.dtd?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/sysdef_1_5_1.dtd</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/translations/qt_ar.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/translations/qt_ar.ts</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/translations/qt_fa.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/translations/qt_fa.ts</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/translations/qt_fr_symbian.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/translations/qt_fr_symbian.ts</a></td><td class='right'>8519</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/translations/qt_he.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/translations/qt_he.ts</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/translations/qt_pl_symbian.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/translations/qt_pl_symbian.ts</a></td><td class='right'>8525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/translations/qt_ru_symbian.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/translations/qt_ru_symbian.ts</a></td><td class='right'>8522</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/translations/qt_ur.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/translations/qt_ur.ts</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/translations/qt_zh_cn_symbian.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/translations/qt_zh_cn_symbian.ts</a></td><td class='right'>8517</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/translations/qt_zh_tw_symbian.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/translations/qt_zh_tw_symbian.ts</a></td><td class='right'>8505</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.profiles/symbian/translations_symbian/translations.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.profiles/symbian/translations_symbian/translations.pro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.tests/mac/coreservices/coreservices.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/mac/coreservices/coreservices.mm</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.tests/mac/coreservices/coreservices.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/mac/coreservices/coreservices.pro</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/config.tests/mac/corewlan/corewlan.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/mac/corewlan/corewlan.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.tests/qpa/wayland/wayland.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/qpa/wayland/wayland.cpp</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.tests/qpa/wayland/wayland.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/qpa/wayland/wayland.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/oss-git/Qt.git/diff/config.tests/unix/compile.test?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/unix/compile.test</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.tests/unix/icu/icu.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/unix/icu/icu.cpp</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.tests/unix/icu/icu.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/unix/icu/icu.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.tests/unix/opengldesktop/opengldesktop.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/unix/opengldesktop/opengldesktop.cpp</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/config.tests/unix/opengldesktop/opengldesktop.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/unix/opengldesktop/opengldesktop.pro</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/config.tests/unix/opengles1/opengles1.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/unix/opengles1/opengles1.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/config.tests/unix/opengles1/opengles1.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/unix/opengles1/opengles1.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/config.tests/unix/opengles2/opengles2.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/unix/opengles2/opengles2.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/config.tests/unix/opengles2/opengles2.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/unix/opengles2/opengles2.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/config.tests/x11/glxfbconfig/glxfbconfig.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/x11/glxfbconfig/glxfbconfig.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/config.tests/x11/opengl/opengl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/x11/opengl/opengl.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/config.tests/x11/opengl/opengl.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>config.tests/x11/opengl/opengl.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/oss-git/Qt.git/diff/configure?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>configure</a></td><td class='right'>600</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/oss-git/Qt.git/diff/configure.exe?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>configure.exe</a></td><td class='right'>bin</td><td class='graph'>1329152 -> 1474048 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/affine/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/affine/main.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/arthurplugin/arthurplugin.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/arthurplugin/arthurplugin.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/books/books.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/books/books.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/boxes/glbuffers.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/boxes/glbuffers.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/boxes/glbuffers.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/boxes/glbuffers.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/boxes/qtbox.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/boxes/qtbox.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/boxes/scene.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/boxes/scene.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/browser/browserapplication.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/browser/browserapplication.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/browser/cookiejar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/browser/cookiejar.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/browser/networkaccessmanager.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/browser/networkaccessmanager.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/browser/networkaccessmanager.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/browser/networkaccessmanager.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/browser/settings.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/browser/settings.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/chip/view.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/chip/view.cpp</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/chip/view.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/chip/view.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/composition/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/composition/main.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/declarative/minehunt/minehunt.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/declarative/minehunt/minehunt.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/declarative/samegame/SamegameCore/samegame.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/declarative/samegame/SamegameCore/samegame.js</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/declarative/snake/content/Link.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/declarative/snake/content/Link.qml</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/declarative/snake/content/snake.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/declarative/snake/content/snake.js</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/declarative/snake/snake.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/declarative/snake/snake.qml</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/deform/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/deform/main.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/deform/pathdeform.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/deform/pathdeform.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/demos.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/demos.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/embedded/desktopservices/desktopservices.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/desktopservices/desktopservices.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/embedded/fluidlauncher/fluidlauncher.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/fluidlauncher/fluidlauncher.pro</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/embedded/qmlcalculator/deployment.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/qmlcalculator/deployment.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/embedded/qmlclocks/deployment.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/qmlclocks/deployment.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/embedded/qmldialcontrol/deployment.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/qmldialcontrol/deployment.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/embedded/qmleasing/deployment.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/qmleasing/deployment.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/embedded/qmlflickr/deployment.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/qmlflickr/deployment.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/embedded/qmlphotoviewer/deployment.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/qmlphotoviewer/deployment.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/embedded/qmltwitter/deployment.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/qmltwitter/deployment.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/embeddeddialogs/customproxy.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/embeddeddialogs/customproxy.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/gradients/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/gradients/main.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/interview/model.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/interview/model.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/mainwindow/colorswatch.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/mainwindow/colorswatch.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/mainwindow/toolbar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/mainwindow/toolbar.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/pathstroke/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/pathstroke/main.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/pathstroke/pathstroke.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/pathstroke/pathstroke.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/qmediaplayer/qmediaplayer.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/qmediaplayer/qmediaplayer.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/shared/arthurstyle.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/shared/arthurstyle.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/shared/arthurwidgets.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/shared/arthurwidgets.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/spectrum/app/app.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/spectrum/app/app.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/spectrum/app/settingsdialog.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/spectrum/app/settingsdialog.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/demos/spreadsheet/spreadsheetitem.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>demos/spreadsheet/spreadsheetitem.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/dist/changes-4.6.0?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>dist/changes-4.6.0</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/dist/changes-4.8.0?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>dist/changes-4.8.0</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/declarative/basictypes.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/declarative/basictypes.qdoc</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/declarative/example-slideswitch.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/declarative/example-slideswitch.qdoc</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/declarative/extending.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/declarative/extending.qdoc</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/declarative/modules.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/declarative/modules.qdoc</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/development/assistant-manual.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/development/assistant-manual.qdoc</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/development/qmake-manual.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/development/qmake-manual.qdoc</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/examples/customtype.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/examples/customtype.qdoc</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/doc/src/examples/multicastreceiver.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/examples/multicastreceiver.qdoc</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/doc/src/examples/multicastsender.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/examples/multicastsender.qdoc</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/frameworks-technologies/model-view-programming.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/frameworks-technologies/model-view-programming.qdoc</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/getting-started/examples.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/getting-started/examples.qdoc</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/doc/src/images/multicastreceiver-example.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/images/multicastreceiver-example.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 13042 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/doc/src/images/multicastsender-example.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/images/multicastsender-example.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 21092 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/legal/3rdparty.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/legal/3rdparty.qdoc</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/network-programming/qtnetwork.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/network-programming/qtnetwork.qdoc</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/platforms/platform-notes-rtos.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/platforms/platform-notes-rtos.qdoc</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/platforms/platform-notes.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/platforms/platform-notes.qdoc</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/porting/porting4.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/porting/porting4.qdoc</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/snippets/accessibilityslidersnippet.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/accessibilityslidersnippet.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/snippets/code/doc_src_porting4.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/doc_src_porting4.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/snippets/code/doc_src_qmake-manual.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/doc_src_qmake-manual.pro</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/snippets/code/doc_src_qtscript.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/doc_src_qtscript.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/snippets/code/src_corelib_global_qglobal.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/src_corelib_global_qglobal.cpp</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/src_corelib_kernel_qvariant.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/snippets/code/src_gui_accessible_qaccessible.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/src_gui_accessible_qaccessible.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/doc/src/snippets/code/src_network_access_qhttpmultipart.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/src_network_access_qhttpmultipart.cpp</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/doc/src/snippets/code/src_network_access_qhttppart.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/src_network_access_qhttppart.cpp</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/snippets/declarative/application.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/declarative/application.qml</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/snippets/declarative/focus/focusColumn.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/declarative/focus/focusColumn.qml</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/snippets/declarative/states/statechangescript.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/declarative/states/statechangescript.qml</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/snippets/declarative/webview/webview.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/declarative/webview/webview.qml</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/snippets/qmake/spaces.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/qmake/spaces.pro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/snippets/qstring/stringbuilder.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/qstring/stringbuilder.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/snippets/threads/threads.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/threads/threads.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/doc/src/xml-processing/xml-patterns.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>doc/src/xml-processing/xml-patterns.qdoc</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/activeqt/hierarchy/objects.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/activeqt/hierarchy/objects.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/animation/easing/window.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/animation/easing/window.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/declarative/cppextensions/imageprovider/imageprovider.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/declarative/cppextensions/imageprovider/imageprovider.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/declarative/cppextensions/qwidgets/qwidgets.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/declarative/cppextensions/qwidgets/qwidgets.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/declarative/keyinteraction/focus/Core/GridMenu.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/declarative/keyinteraction/focus/Core/GridMenu.qml</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/declarative/righttoleft/layoutdirection/layoutdirection.qml</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/declarative/righttoleft/textalignment/textalignment.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/declarative/righttoleft/textalignment/textalignment.qml</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/declarative/touchinteraction/pincharea/flickresize.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/declarative/touchinteraction/pincharea/flickresize.qml</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/designer/calculatorbuilder/calculatorform.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/designer/calculatorbuilder/calculatorform.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/desktop/systray/systray.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/desktop/systray/systray.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/draganddrop/puzzle/pieceslist.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/draganddrop/puzzle/pieceslist.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/draganddrop/puzzle/puzzle.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/draganddrop/puzzle/puzzle.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/graphicsview/diagramscene/mainwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/graphicsview/diagramscene/mainwindow.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/graphicsview/dragdroprobot/robot.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/graphicsview/dragdroprobot/robot.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/graphicsview/flowlayout/flowlayout.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/graphicsview/flowlayout/flowlayout.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/graphicsview/padnavigator/padnavigator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/graphicsview/padnavigator/padnavigator.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/itemviews/chart/chart.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/itemviews/chart/chart.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/itemviews/coloreditorfactory/colorlisteditor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/itemviews/coloreditorfactory/colorlisteditor.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/itemviews/puzzle/piecesmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/itemviews/puzzle/piecesmodel.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/itemviews/stardelegate/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/itemviews/stardelegate/main.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/itemviews/stardelegate/stardelegate.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/itemviews/stardelegate/stardelegate.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/multimedia/audiodevices/audiodevices.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/multimedia/audiodevices/audiodevices.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/multimedia/audioinput/audioinput.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/multimedia/audioinput/audioinput.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/multimedia/audiooutput/audiooutput.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/multimedia/audiooutput/audiooutput.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/network/download/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/network/download/main.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/examples/network/multicastreceiver/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/network/multicastreceiver/main.cpp</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/examples/network/multicastreceiver/multicastreceiver.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/network/multicastreceiver/multicastreceiver.pro</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/examples/network/multicastreceiver/receiver.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/network/multicastreceiver/receiver.cpp</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/examples/network/multicastreceiver/receiver.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/network/multicastreceiver/receiver.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/examples/network/multicastsender/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/network/multicastsender/main.cpp</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/examples/network/multicastsender/multicastsender.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/network/multicastsender/multicastsender.pro</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/examples/network/multicastsender/sender.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/network/multicastsender/sender.cpp</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/examples/network/multicastsender/sender.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/network/multicastsender/sender.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/network/network.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/network/network.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/network/torrent/bencodeparser.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/network/torrent/bencodeparser.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/network/torrent/metainfo.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/network/torrent/metainfo.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/network/torrent/trackerclient.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/network/torrent/trackerclient.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/opengl/pbuffers/cube.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/opengl/pbuffers/cube.cpp</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/opengl/pbuffers/cube.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/opengl/pbuffers/cube.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/opengl/pbuffers/glwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/opengl/pbuffers/glwidget.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/painting/painterpaths/painterpaths.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/painting/painterpaths/painterpaths.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/painting/svgviewer/svgviewer.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/painting/svgviewer/svgviewer.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/richtext/syntaxhighlighter/syntaxhighlighter.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/richtext/textobject/svgtextobject.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/richtext/textobject/svgtextobject.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/richtext/textobject/textobject.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/richtext/textobject/textobject.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/script/calculator/calculator.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/script/calculator/calculator.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/script/calculator/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/script/calculator/main.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/script/context2d/context2d.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/script/context2d/context2d.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/script/context2d/context2d.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/script/context2d/context2d.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/script/context2d/domimage.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/script/context2d/domimage.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/script/context2d/environment.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/script/context2d/environment.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/script/context2d/environment.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/script/context2d/environment.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/script/customclass/bytearrayclass.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/script/customclass/bytearrayclass.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/script/customclass/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/script/customclass/main.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/script/helloscript/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/script/helloscript/main.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/script/marshal/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/script/marshal/main.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/script/qstetrix/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/script/qstetrix/main.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/sql/querymodel/customsqlmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/sql/querymodel/customsqlmodel.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/threads/mandelbrot/mandelbrot.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/threads/mandelbrot/mandelbrot.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/tools/customtype/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/tools/customtype/main.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/tools/echoplugin/echowindow/echowindow.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/tools/echoplugin/echowindow/echowindow.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/uitools/textfinder/textfinder.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/uitools/textfinder/textfinder.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/webkit/imageanalyzer/imageanalyzer.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/webkit/imageanalyzer/imageanalyzer.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/webkit/imageanalyzer/mainwindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/webkit/imageanalyzer/mainwindow.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/widgets/icons/icons.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/widgets/icons/icons.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/widgets/movie/movie.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/widgets/movie/movie.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/widgets/validators/localeselector.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/widgets/validators/localeselector.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/xml/dombookmarks/dombookmarks.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/xml/dombookmarks/dombookmarks.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/xml/htmlinfo/htmlinfo.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/xml/htmlinfo/htmlinfo.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/xml/saxbookmarks/saxbookmarks.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/xml/saxbookmarks/saxbookmarks.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/examples/xmlpatterns/recipes/querymainwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>examples/xmlpatterns/recipes/querymainwindow.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/lib/fonts/dejavu_sans_11_50.qpf2?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>lib/fonts/dejavu_sans_11_50.qpf2</a></td><td class='right'>bin</td><td class='graph'>0 -> 405944 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/aix-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/aix-g++-64/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/aix-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/aix-g++/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/aix-xlc-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/aix-xlc-64/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/aix-xlc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/aix-xlc/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/common/clang.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/clang.conf</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/common/g++-base.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/g++-base.conf</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/common/g++-macx.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/g++-macx.conf</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/common/g++-unix.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/g++-unix.conf</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/common/g++.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/g++.conf</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/common/gcc-base-macx.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/gcc-base-macx.conf</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/common/gcc-base-unix.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/gcc-base-unix.conf</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/common/gcc-base.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/gcc-base.conf</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/common/linux.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/linux.conf</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/common/llvm.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/llvm.conf</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/mkspecs/common/mac-g++.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/mac-g++.conf</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/mkspecs/common/mac-llvm.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/mac-llvm.conf</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/common/mac/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/mac/qplatformdefs.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/common/posix/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/posix/qplatformdefs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/common/qws.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/qws.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/common/symbian/backup_registration.xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/symbian/backup_registration.xml</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/common/symbian/symbian.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/symbian/symbian.conf</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/cygwin-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/cygwin-g++/qmake.conf</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/darwin-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/darwin-g++/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/features/declarative_debug.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/declarative_debug.prf</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/default_post.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/default_post.prf</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/features/enable_backup.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/enable_backup.prf</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/link_pkgconfig.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/link_pkgconfig.prf</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/mac/objective_c.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/mac/objective_c.prf</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/no_debug_info.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/no_debug_info.prf</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/qt.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/qt.prf</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/qt_config.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/qt_config.prf</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/qt_functions.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/qt_functions.prf</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/qttest_p4.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/qttest_p4.prf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/symbian/application_icon.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/symbian/application_icon.prf</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/symbian/data_caging_paths.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/symbian/data_caging_paths.prf</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/symbian/default_post.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/symbian/default_post.prf</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/symbian/run_on_phone.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/symbian/run_on_phone.prf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/symbian/sis_targets.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/symbian/sis_targets.prf</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/uitools.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/uitools.prf</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/features/unix/gdb_dwarf_index.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/unix/gdb_dwarf_index.prf</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/win32/console.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/win32/console.prf</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/win32/embed_manifest_dll.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/win32/embed_manifest_dll.prf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/win32/embed_manifest_exe.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/win32/embed_manifest_exe.prf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/features/win32/windows.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/win32/windows.prf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/freebsd-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/freebsd-g++/qmake.conf</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/freebsd-g++34/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/freebsd-g++34/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/freebsd-g++40/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/freebsd-g++40/qmake.conf</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/freebsd-icc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/freebsd-icc/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/hpux-acc-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hpux-acc-64/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/hpux-acc-o64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hpux-acc-o64/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/hpux-acc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hpux-acc/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/hpux-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hpux-g++-64/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/hpux-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hpux-g++/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/hpuxi-acc-32/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hpuxi-acc-32/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/hpuxi-acc-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hpuxi-acc-64/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/hpuxi-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hpuxi-g++-64/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/hurd-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hurd-g++/qmake.conf</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/irix-cc-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/irix-cc-64/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/irix-cc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/irix-cc/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/irix-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/irix-g++-64/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/irix-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/irix-g++/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/linux-cxx/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-cxx/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/linux-ecc-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-ecc-64/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/linux-g++-32/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-g++-32/qmake.conf</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/linux-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-g++-64/qmake.conf</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/linux-g++-maemo/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-g++-maemo/qmake.conf</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/linux-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-g++/qmake.conf</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/linux-icc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-icc/qmake.conf</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/linux-kcc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-kcc/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/linux-llvm/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-llvm/qmake.conf</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/linux-lsb-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-lsb-g++/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/linux-pgcc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-pgcc/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/lynxos-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/lynxos-g++/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/macx-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-g++/qmake.conf</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/macx-g++/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-g++/qplatformdefs.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/macx-g++40/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-g++40/qmake.conf</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/macx-g++40/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-g++40/qplatformdefs.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/macx-g++42/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-g++42/qmake.conf</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/macx-g++42/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-g++42/qplatformdefs.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/macx-icc/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-icc/qplatformdefs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/macx-llvm/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-llvm/qmake.conf</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/macx-llvm/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-llvm/qplatformdefs.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/macx-xcode/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-xcode/qmake.conf</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/macx-xcode/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-xcode/qplatformdefs.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/netbsd-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/netbsd-g++/qmake.conf</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/openbsd-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/openbsd-g++/qmake.conf</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-arm-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-arm-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-arm-gnueabi-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-arm-gnueabi-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-armv6-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-armv6-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-avr32-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-avr32-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-cellon-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-cellon-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-dm7000-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-dm7000-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-dm800-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-dm800-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-generic-g++-32/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-generic-g++-32/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-generic-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-generic-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-ipaq-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-ipaq-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-lsb-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-lsb-g++/qmake.conf</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-mips-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-mips-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-nacl-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-nacl-g++/qmake.conf</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-nacl-g++/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-nacl-g++/qplatformdefs.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-powerpc-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-powerpc-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-sh-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-sh-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-sh4al-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-sh4al-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-sharp-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-sharp-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-x86-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-x86-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-x86_64-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-x86_64-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/linux-zylonite-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-zylonite-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/qws/macx-generic-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/macx-generic-g++/qmake.conf</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/qws/macx-iphonedevice-g++/Info.plist.lib?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/macx-iphonedevice-g++/Info.plist.lib</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/qws/macx-iphonedevice-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/macx-iphonedevice-g++/qmake.conf</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/qws/macx-iphonedevice-g++/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/macx-iphonedevice-g++/qplatformdefs.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/qws/macx-iphonesimulator-g++/Info.plist.lib?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/macx-iphonesimulator-g++/Info.plist.lib</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/qws/macx-iphonesimulator-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/macx-iphonesimulator-g++/qmake.conf</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/qws/macx-iphonesimulator-g++/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/macx-iphonesimulator-g++/qplatformdefs.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/qws/macx-nacl-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/macx-nacl-g++/qmake.conf</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/qws/macx-nacl-g++/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/macx-nacl-g++/qplatformdefs.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/sco-cc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/sco-cc/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/sco-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/sco-g++/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/solaris-cc-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/solaris-cc-64/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/solaris-cc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/solaris-cc/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/solaris-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/solaris-g++-64/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/solaris-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/solaris-g++/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/symbian-gcce/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/symbian-gcce/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/tru64-cxx/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/tru64-cxx/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/tru64-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/tru64-g++/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/unixware-cc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unixware-cc/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/unixware-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unixware-g++/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/integrity-ghs/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/integrity-ghs/qmake.conf</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/integrity-ghs/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/integrity-ghs/qplatformdefs.h</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/linux-armcc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/linux-armcc/qmake.conf</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/linux-armcc/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/linux-armcc/qplatformdefs.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/linux-clang/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/linux-clang/qmake.conf</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/linux-clang/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/linux-clang/qplatformdefs.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/linux-host-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/linux-host-g++/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/macx-clang/Info.plist.app?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/macx-clang/Info.plist.app</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/macx-clang/Info.plist.lib?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/macx-clang/Info.plist.lib</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/macx-clang/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/macx-clang/qmake.conf</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/macx-clang/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/macx-clang/qplatformdefs.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/qnx-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/qnx-g++/qmake.conf</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/qws/integrity-arm-cxarm/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/qws/integrity-arm-cxarm/qmake.conf</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/qws/integrity-arm-cxarm/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/qws/integrity-arm-cxarm/qplatformdefs.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/qws/integrity-ppc-cxppc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/qws/integrity-ppc-cxppc/qmake.conf</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/qws/integrity-ppc-cxppc/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/qws/integrity-ppc-cxppc/qplatformdefs.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/qws/linux-x86-openkode-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/qws/linux-x86-openkode-g++/qmake.conf</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/vxworks-ppc-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/win32-msvc2005/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/win32-msvc2005/qmake.conf</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/win32-msvc2008/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/win32-msvc2008/qmake.conf</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/mkspecs/win32-msvc2010/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>mkspecs/win32-msvc2010/qmake.conf</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/projects.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>projects.pro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/Makefile.unix?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/Makefile.unix</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/Makefile.win32?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/Makefile.win32</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/Makefile.win32-g++?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/Makefile.win32-g++</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/Makefile.win32-g++-sh?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/Makefile.win32-g++-sh</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/cachekeys.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/cachekeys.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/qmake/generators/integrity/gbuild.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/integrity/gbuild.cpp</a></td><td class='right'>442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/qmake/generators/integrity/gbuild.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/integrity/gbuild.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/mac/pbuilder_pbx.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/mac/pbuilder_pbx.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/makefile.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/makefile.cpp</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/makefile.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/makefile.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/metamakefile.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/metamakefile.cpp</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/symbian/initprojectdeploy_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/symbian/initprojectdeploy_symbian.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/symbian/symbian_makefile.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/symbian/symbian_makefile.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/symbian/symbiancommon.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/symbian/symbiancommon.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/symbian/symmake.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/symbian/symmake.cpp</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/symbian/symmake_sbsv2.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/symbian/symmake_sbsv2.cpp</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/unix/unixmake.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/unix/unixmake.cpp</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/unix/unixmake.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/unix/unixmake.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/unix/unixmake2.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/unix/unixmake2.cpp</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/win32/borland_bmake.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/borland_bmake.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/win32/mingw_make.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/mingw_make.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/win32/msbuild_objectmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msbuild_objectmodel.cpp</a></td><td class='right'>3937</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/win32/msbuild_objectmodel.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msbuild_objectmodel.h</a></td><td class='right'>574</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/win32/msvc_nmake.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msvc_nmake.cpp</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/win32/msvc_nmake.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msvc_nmake.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/win32/msvc_objectmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msvc_objectmodel.cpp</a></td><td class='right'>1327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/win32/msvc_objectmodel.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msvc_objectmodel.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/win32/msvc_vcproj.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msvc_vcproj.cpp</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/win32/msvc_vcproj.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msvc_vcproj.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/win32/msvc_vcxproj.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msvc_vcxproj.cpp</a></td><td class='right'>786</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/win32/msvc_vcxproj.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msvc_vcxproj.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/win32/winmakefile.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/winmakefile.cpp</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/generators/win32/winmakefile.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/winmakefile.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/main.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/option.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/option.cpp</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/option.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/option.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/project.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/project.cpp</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/property.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/property.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/property.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/property.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/qmake/qmake.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>qmake/qmake.pri</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/harfbuzz/tests/shaping/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/harfbuzz/tests/shaping/main.cpp</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/README?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/README</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/change.log?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/change.log</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/cjpeg.1?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/cjpeg.1</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/djpeg.1?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/djpeg.1</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/jcapimin.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jcapimin.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/jcmarker.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jcmarker.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/jcmaster.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jcmaster.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/jconfig.cfg?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jconfig.cfg</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/jconfig.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jconfig.h</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/jconfig.mc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jconfig.mc6</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/jconfig.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jconfig.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/jdatasrc.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jdatasrc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/jddctmgr.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jddctmgr.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/jidctflt.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jidctflt.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/jinclude.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jinclude.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/jmorecfg.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jmorecfg.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/jpeglib.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jpeglib.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/jversion.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jversion.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/libjpeg.map?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/libjpeg.map</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/libjpeg.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/libjpeg.txt</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makcjpeg.st?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makcjpeg.st</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makdjpeg.st?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makdjpeg.st</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makeadsw.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makeadsw.vc6</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makeasln.vc9?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makeasln.vc9</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makecdep.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makecdep.vc6</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makecdsp.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makecdsp.vc6</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makecmak.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makecmak.vc6</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makecvcp.vc9?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makecvcp.vc9</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makeddep.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makeddep.vc6</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makeddsp.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makeddsp.vc6</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makedmak.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makedmak.vc6</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makedvcp.vc9?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makedvcp.vc9</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makefile.ansi?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.ansi</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makefile.bcc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.bcc</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makefile.dj?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.dj</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makefile.manx?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.manx</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makefile.mc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.mc6</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makefile.mms?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.mms</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makefile.sas?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.sas</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makefile.unix?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.unix</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makefile.vc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.vc</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makefile.vms?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.vms</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makefile.wat?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.wat</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makejdep.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makejdep.vc6</a></td><td class='right'>423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makejdsp.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makejdsp.vc6</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makejdsw.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makejdsw.vc6</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makejmak.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makejmak.vc6</a></td><td class='right'>425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makejsln.vc9?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makejsln.vc9</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makejvcp.vc9?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makejvcp.vc9</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makeproj.mac?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makeproj.mac</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makerdep.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makerdep.vc6</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makerdsp.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makerdsp.vc6</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makermak.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makermak.vc6</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makervcp.vc9?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makervcp.vc9</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/maketdep.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/maketdep.vc6</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/maketdsp.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/maketdsp.vc6</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/maketmak.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/maketmak.vc6</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/maketvcp.vc9?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/maketvcp.vc9</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makewdep.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makewdep.vc6</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makewdsp.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makewdsp.vc6</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makewmak.vc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makewmak.vc6</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makewvcp.vc9?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makewvcp.vc9</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makljpeg.st?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makljpeg.st</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/maktjpeg.st?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/maktjpeg.st</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/makvms.opt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makvms.opt</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libjpeg/usage.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/usage.txt</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/ANNOUNCE?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/ANNOUNCE</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/CHANGES?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/CHANGES</a></td><td class='right'>1888</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/CMakeLists.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/CMakeLists.txt</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/INSTALL?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/INSTALL</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/LICENSE?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/LICENSE</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/README?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/README</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/TODO?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/TODO</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/aclocal.m4?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/aclocal.m4</a></td><td class='right'>8949</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 20.8%;'/><td class='none' style='width: 79.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/autogen.sh?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/autogen.sh</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--<span class='modechange'>[-rwxr-xr-x]</span></td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/config.guess?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/config.guess</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--<span class='modechange'>[-rwxr-xr-x]</span></td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/config.sub?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/config.sub</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/configure?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/configure</a></td><td class='right'>13839</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 32.1%;'/><td class='none' style='width: 67.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/configure.ac?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/configure.ac</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/depcomp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/depcomp</a></td><td class='right'>630</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/example.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/example.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/install-sh?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/install-sh</a></td><td class='right'>520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/libpng-1.4.0.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/libpng-1.4.0.txt</a></td><td class='right'>3277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.6%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/libpng-config.in?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/libpng-config.in</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/libpng-manual.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/libpng-manual.txt</a></td><td class='right'>4136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/libpng.3?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/libpng.3</a></td><td class='right'>1649</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/libpngpf.3?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/libpngpf.3</a></td><td class='right'>798</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/ltmain.sh?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/ltmain.sh</a></td><td class='right'>8406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 19.5%;'/><td class='none' style='width: 80.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/missing?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/missing</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/mkinstalldirs?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/mkinstalldirs</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/png.5?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/png.5</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/png.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/png.c</a></td><td class='right'>1720</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/png.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/png.h</a></td><td class='right'>2154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngbar.jpg?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngbar.jpg</a></td><td class='right'>bin</td><td class='graph'>2498 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngbar.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngbar.png</a></td><td class='right'>bin</td><td class='graph'>2399 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngconf.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngconf.h</a></td><td class='right'>1675</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngdebug.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngdebug.h</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngerror.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngerror.c</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngget.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngget.c</a></td><td class='right'>695</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pnginfo.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pnginfo.h</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pnglibconf.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pnglibconf.h</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngmem.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngmem.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngnow.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngnow.png</a></td><td class='right'>bin</td><td class='graph'>2069 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngpread.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngpread.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngpriv.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngpriv.h</a></td><td class='right'>920</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngread.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngread.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngrio.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngrio.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngrtran.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngrtran.c</a></td><td class='right'>1545</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngrutil.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngrutil.c</a></td><td class='right'>1618</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngset.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngset.c</a></td><td class='right'>678</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngstruct.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngstruct.h</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngtest.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngtest.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngtest.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngtest.png</a></td><td class='right'>bin</td><td class='graph'>8608 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngtrans.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngtrans.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngvalid.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngvalid.c</a></td><td class='right'>6658</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngwio.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngwio.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngwrite.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngwrite.c</a></td><td class='right'>621</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngwtran.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngwtran.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/pngwutil.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngwutil.c</a></td><td class='right'>985</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/cbuilder5/README.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/README.txt</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/cbuilder5/libpng.bpf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/libpng.bpf</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/cbuilder5/libpng.bpg?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/libpng.bpg</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/cbuilder5/libpng.bpr?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/libpng.bpr</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/cbuilder5/libpng.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/libpng.cpp</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/cbuilder5/libpng.readme.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/libpng.readme.txt</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/cbuilder5/libpngstat.bpf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/libpngstat.bpf</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/cbuilder5/libpngstat.bpr?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/libpngstat.bpr</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/cbuilder5/zlib.readme.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/zlib.readme.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/visualc6/README.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/visualc6/README.txt</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/visualc6/libpng.dsp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/visualc6/libpng.dsp</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/visualc6/libpng.dsw?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/visualc6/libpng.dsw</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/visualc6/pngtest.dsp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/visualc6/pngtest.dsp</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/visualc71/PRJ0041.mak?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/visualc71/PRJ0041.mak</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/visualc71/README.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/visualc71/README.txt</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/visualc71/README_zlib.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/visualc71/README_zlib.txt</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/xcode/Info.plist?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/xcode/Info.plist</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/xcode/README.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/xcode/README.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/xcode/libpng.xcodeproj/.gitignore?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/xcode/libpng.xcodeproj/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/projects/xcode/libpng.xcodeproj/project.pbxproj?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/xcode/libpng.xcodeproj/project.pbxproj</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/README.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/README.txt</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/SCOPTIONS.ppc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/SCOPTIONS.ppc</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/descrip.mms?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/descrip.mms</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/libpng-config-body.in?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/libpng-config-body.in</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/libpng-config-head.in?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/libpng-config-head.in</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/libpng.pc.in?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/libpng.pc.in</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.32sunu?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.32sunu</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.64sunu?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.64sunu</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.acorn?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.acorn</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.aix?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.aix</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.amiga?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.amiga</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.atari?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.atari</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.bc32?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.bc32</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.beos?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.beos</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.bor?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.bor</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.cegcc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.cegcc</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.cygwin?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.cygwin</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.darwin?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.darwin</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.dec?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.dec</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.dj2?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.dj2</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.elf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.elf</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.freebsd?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.freebsd</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.gcc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.gcc</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.hp64?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.hp64</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.hpgcc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.hpgcc</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.hpux?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.hpux</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.ibmc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.ibmc</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.intel?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.intel</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.knr?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.knr</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.linux?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.linux</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.mingw?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.mingw</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.mips?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.mips</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.msc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.msc</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.ne12bsd?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.ne12bsd</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.netbsd?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.netbsd</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.openbsd?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.openbsd</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.os2?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.os2</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.sco?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.sco</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.sggcc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.sggcc</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.sgi?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.sgi</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.so9?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.so9</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.solaris?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.solaris</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.solaris-x86?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.solaris-x86</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.std?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.std</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.sunos?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.sunos</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.tc3?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.tc3</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.vcwin32?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.vcwin32</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makefile.watcom?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.watcom</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/makevms.com?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makevms.com</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/png32ce.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/png32ce.def</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/pngos2.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/pngos2.def</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/pngwin.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/pngwin.def</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/pngwin.rc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/pngwin.rc</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/scripts/smakefile.ppc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/smakefile.ppc</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/libpng/test-pngtest.sh?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/test-pngtest.sh</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/libtiff/libtiff/tif_config.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libtiff/libtiff/tif_config.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/md5/md5.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/md5/md5.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/patches/zlib-1.2.3-elf-visibility.patch?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/patches/zlib-1.2.3-elf-visibility.patch</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/phonon/gstreamer/devicemanager.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/phonon/gstreamer/devicemanager.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/phonon/gstreamer/videowidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/phonon/gstreamer/videowidget.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/phonon/gstreamer/x11renderer.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/phonon/gstreamer/x11renderer.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/phonon/phonon/mediacontroller.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/phonon/phonon/mediacontroller.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/phonon/phonon/objectdescriptionmodel.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/phonon/phonon/objectdescriptionmodel.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/phonon/phonon/qsettingsgroup_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/phonon/phonon/qsettingsgroup_p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/phonon/qt7/videowidget.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/phonon/qt7/videowidget.mm</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/webkit/WebCore/WebCore.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/webkit/WebCore/WebCore.pro</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib.pri</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/CMakeLists.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/CMakeLists.txt</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/ChangeLog?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/ChangeLog</a></td><td class='right'>355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/FAQ?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/FAQ</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/INDEX?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/INDEX</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/Makefile?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/Makefile</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/Makefile.in?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/Makefile.in</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/README?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/README</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/adler32.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/adler32.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/algorithm.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/algorithm.txt</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/compress.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/compress.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/configure?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/configure</a></td><td class='right'>459</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/crc32.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/crc32.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/deflate.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/deflate.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/deflate.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/deflate.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/doc/algorithm.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/doc/algorithm.txt</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/doc/rfc1950.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/doc/rfc1950.txt</a></td><td class='right'>619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/doc/rfc1951.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/doc/rfc1951.txt</a></td><td class='right'>955</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/doc/rfc1952.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/doc/rfc1952.txt</a></td><td class='right'>675</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/doc/txtvsbin.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/doc/txtvsbin.txt</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/example.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/example.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/examples/README.examples?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/README.examples</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/examples/fitblk.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/fitblk.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/examples/gun.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/gun.c</a></td><td class='right'>693</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/examples/gzappend.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/gzappend.c</a></td><td class='right'>500</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/examples/gzjoin.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/gzjoin.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/examples/gzlog.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/gzlog.c</a></td><td class='right'>413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/examples/gzlog.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/gzlog.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/examples/zlib_how.html?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/zlib_how.html</a></td><td class='right'>523</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/examples/zpipe.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/zpipe.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/examples/zran.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/zran.c</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/gzclose.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/gzclose.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/gzguts.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/gzguts.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/gzio.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/gzio.c</a></td><td class='right'>1026</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/gzlib.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/gzlib.c</a></td><td class='right'>537</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/gzread.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/gzread.c</a></td><td class='right'>653</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/gzwrite.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/gzwrite.c</a></td><td class='right'>531</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/infback.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/infback.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/inffast.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/inffast.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/inffast.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/inffast.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/inflate.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/inflate.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/inflate.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/inflate.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/inftrees.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/inftrees.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/inftrees.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/inftrees.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/make_vms.com?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/make_vms.com</a></td><td class='right'>461</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/minigzip.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/minigzip.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/projects/README.projects?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/projects/README.projects</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/projects/visualc6/README.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/projects/visualc6/README.txt</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/projects/visualc6/example.dsp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/projects/visualc6/example.dsp</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/projects/visualc6/minigzip.dsp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/projects/visualc6/minigzip.dsp</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/projects/visualc6/zlib.dsp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/projects/visualc6/zlib.dsp</a></td><td class='right'>609</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/projects/visualc6/zlib.dsw?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/projects/visualc6/zlib.dsw</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/treebuild.xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/treebuild.xml</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/trees.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/trees.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/trees.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/trees.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/uncompr.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/uncompr.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/win32/DLL_FAQ.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/win32/DLL_FAQ.txt</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/win32/Makefile.bor?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/win32/Makefile.bor</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/win32/Makefile.emx?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/win32/Makefile.emx</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/win32/Makefile.gcc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/win32/Makefile.gcc</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/win32/Makefile.msc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/win32/Makefile.msc</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/win32/VisualC.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/win32/VisualC.txt</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/win32/zlib.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/win32/zlib.def</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/win32/zlib1.rc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/win32/zlib1.rc</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/zconf.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/zconf.h</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/zconf.h.cmakein?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/zconf.h.cmakein</a></td><td class='right'>430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/zconf.h.in?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/zconf.h.in</a></td><td class='right'>428</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/zconf.in.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/zconf.in.h</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/zlib.3?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/zlib.3</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/zlib.3.pdf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/zlib.3.pdf</a></td><td class='right'>bin</td><td class='graph'>0 -> 8686 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/zlib.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/zlib.h</a></td><td class='right'>1242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/zlib.pc.in?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/zlib.pc.in</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/zutil.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/zutil.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/3rdparty/zlib/zutil.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/zutil.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/activeqt/container/qaxbase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/activeqt/container/qaxbase.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/activeqt/container/qaxwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/activeqt/container/qaxwidget.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/activeqt/control/qaxserver.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/activeqt/control/qaxserver.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/activeqt/control/qaxserverbase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/activeqt/control/qaxserverbase.cpp</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/activeqt/shared/qaxtypes.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/activeqt/shared/qaxtypes.cpp</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/animation/qabstractanimation.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/animation/qabstractanimation.cpp</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/animation/qabstractanimation.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/animation/qabstractanimation.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/animation/qabstractanimation_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/animation/qabstractanimation_p.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/arch/arch.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/arch.pri</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/corelib/arch/armv6/arch.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/armv6/arch.pri</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/arch/integrity/arch.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/integrity/arch.pri</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/arch/qatomic_arch.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/qatomic_arch.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/arch/qatomic_arm.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/qatomic_arm.h</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/arch/qatomic_armv5.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/qatomic_armv5.h</a></td><td class='right'>431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/arch/qatomic_armv6.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/qatomic_armv6.h</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/arch/qatomic_armv7.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/qatomic_armv7.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/arch/qatomic_integrity.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/qatomic_integrity.h</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/arch/symbian/arch.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/symbian/arch.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/Qt.git/diff/src/corelib/arch/symbian/qatomic_generic_armv6.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/symbian/qatomic_generic_armv6.cpp</a> (renamed from src/corelib/arch/armv6/qatomic_generic_armv6.cpp)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/symbian/qt_hybridheap_symbian_p.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/codecs/qiconvcodec.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/codecs/qiconvcodec.cpp</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/codecs/qtextcodec.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/codecs/qtextcodec.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/concurrent/qfuture.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qfuture.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/concurrent/qfuturewatcher.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qfuturewatcher.cpp</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/concurrent/qfuturewatcher.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qfuturewatcher.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/concurrent/qtconcurrentcompilertest.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentcompilertest.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/concurrent/qtconcurrentexception.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentexception.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/concurrent/qtconcurrentfilter.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentfilter.h</a></td><td class='right'>554</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/concurrent/qtconcurrentfunctionwrappers.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentfunctionwrappers.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/concurrent/qtconcurrentiteratekernel.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentiteratekernel.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/concurrent/qtconcurrentmap.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentmap.h</a></td><td class='right'>632</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/concurrent/qtconcurrentrun.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentrun.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/concurrent/qtconcurrentrunbase.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentrunbase.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentstoredfunctioncall.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/concurrent/qthreadpool.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qthreadpool.cpp</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/concurrent/qthreadpool.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qthreadpool.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/concurrent/qthreadpool_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qthreadpool_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/corelib.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/corelib.pro</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/global/global.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/global.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/global/qconfig-nacl.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qconfig-nacl.h</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/global/qendian.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qendian.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/global/qfeatures.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qfeatures.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/global/qfeatures.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qfeatures.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/global/qglobal.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qglobal.cpp</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/global/qglobal.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qglobal.h</a></td><td class='right'>414</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/global/qlibraryinfo.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qlibraryinfo.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/global/qnamespace.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qnamespace.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/global/qnamespace.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qnamespace.qdoc</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/io.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/io.pri</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qabstractfileengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qabstractfileengine.cpp</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qabstractfileengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qabstractfileengine_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qdatastream.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qdatastream.cpp</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qdatastream.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qdatastream.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qdebug.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qdebug.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qdir.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qdir.cpp</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qdir.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qdir.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qdir_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qdir_p.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qdiriterator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qdiriterator.cpp</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfile.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfile.cpp</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfile.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfile.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfile_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfile_p.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfileinfo.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfileinfo.cpp</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfileinfo.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfileinfo.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfileinfo_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfileinfo_p.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemengine.cpp</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemengine_mac.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemengine_mac.cpp</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemengine_p.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemengine_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemengine_symbian.cpp</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemengine_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemengine_unix.cpp</a></td><td class='right'>661</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemengine_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemengine_win.cpp</a></td><td class='right'>1219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystementry.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystementry.cpp</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystementry_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystementry_p.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemiterator_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemiterator_p.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemiterator_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemiterator_symbian.cpp</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemiterator_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemiterator_unix.cpp</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemiterator_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemiterator_win.cpp</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemmetadata_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemmetadata_p.h</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemwatcher.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemwatcher.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemwatcher_fsevents.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemwatcher_fsevents.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemwatcher_fsevents_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemwatcher_fsevents_p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemwatcher_inotify.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemwatcher_inotify.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemwatcher_kqueue.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemwatcher_kqueue.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemwatcher_kqueue_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemwatcher_kqueue_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemwatcher_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemwatcher_symbian.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfilesystemwatcher_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemwatcher_win.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfsfileengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine.cpp</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfsfileengine.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfsfileengine_iterator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine_iterator.cpp</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfsfileengine_iterator_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine_iterator_p.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfsfileengine_iterator_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine_iterator_unix.cpp</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfsfileengine_iterator_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine_iterator_win.cpp</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfsfileengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine_p.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfsfileengine_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine_unix.cpp</a></td><td class='right'>1188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qfsfileengine_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine_win.cpp</a></td><td class='right'>1286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qiodevice.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qiodevice.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qnoncontiguousbytedevice.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qnoncontiguousbytedevice.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qnoncontiguousbytedevice_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qnoncontiguousbytedevice_p.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qprocess.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qprocess.cpp</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qprocess.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qprocess.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qprocess_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qprocess_p.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qprocess_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qprocess_symbian.cpp</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qprocess_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qprocess_unix.cpp</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qprocess_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qprocess_win.cpp</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qresource.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qresource.cpp</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qsettings.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qsettings.cpp</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qsettings_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qsettings_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qtemporaryfile.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qtemporaryfile.cpp</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qtextstream.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qtextstream.cpp</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qtextstream.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qtextstream.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qtldurl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qtldurl.cpp</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qtldurl_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qtldurl_p.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qurl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qurl.cpp</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/io/qurl.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qurl.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qurltlds_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qurltlds_p.h</a></td><td class='right'>6481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/io/qurltlds_p.h.INFO?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qurltlds_p.h.INFO</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/kernel.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/kernel.pri</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qabstracteventdispatcher.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qabstracteventdispatcher.cpp</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qabstractitemmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qabstractitemmodel.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qabstractitemmodel.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qabstractitemmodel.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qcore_mac_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcore_mac_p.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qcore_symbian_p.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcore_symbian_p.cpp</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qcore_symbian_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcore_symbian_p.h</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qcore_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcore_unix.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qcore_unix_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcore_unix_p.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qcoreapplication.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcoreapplication.cpp</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qcoreapplication.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcoreapplication.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qcoreapplication_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcoreapplication_p.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qcoreevent.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcoreevent.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qcrashhandler.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcrashhandler.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qeventdispatcher_glib.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qeventdispatcher_glib.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qeventdispatcher_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qeventdispatcher_symbian.cpp</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qeventdispatcher_symbian_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qeventdispatcher_symbian_p.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qeventdispatcher_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qeventdispatcher_unix.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qeventdispatcher_unix_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qeventdispatcher_unix_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qeventdispatcher_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qeventdispatcher_win.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qeventloop.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qeventloop.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qfunctions_nacl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qfunctions_nacl.cpp</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qfunctions_nacl.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qfunctions_nacl.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qfunctions_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qfunctions_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qfunctions_wince.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qfunctions_wince.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qmetaobject.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qmetaobject.cpp</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qmetaobject.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qmetaobject.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qmetaobject_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qmetaobject_p.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qmetatype.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qmetatype.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qmetatype.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qmetatype.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qobject.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qobject.cpp</a></td><td class='right'>808</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qobject.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qobject.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qobject_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qobject_p.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qobjectdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qobjectdefs.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qpointer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qpointer.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qsharedmemory.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qsharedmemory.cpp</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qsharedmemory.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qsharedmemory.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qsharedmemory_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qsharedmemory_p.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qsharedmemory_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qsharedmemory_symbian.cpp</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qsharedmemory_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qsharedmemory_unix.cpp</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qsharedmemory_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qsharedmemory_win.cpp</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qsystemerror.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qsystemerror.cpp</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qsystemerror_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qsystemerror_p.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qsystemsemaphore_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qsystemsemaphore_unix.cpp</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qtranslator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qtranslator.cpp</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qtranslator.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qtranslator.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qvariant.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qvariant.cpp</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/kernel/qvariant.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qvariant.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/plugin/plugin.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/plugin.pri</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/plugin/qelfparser_p.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/qelfparser_p.cpp</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/plugin/qelfparser_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/qelfparser_p.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/plugin/qfactoryloader.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/qfactoryloader.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/plugin/qlibrary.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/qlibrary.cpp</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/plugin/qlibrary_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/qlibrary_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/plugin/qlibrary_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/qlibrary_unix.cpp</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/plugin/qplugin.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/qplugin.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/plugin/qpluginloader.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/qpluginloader.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/plugin/quuid.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/quuid.cpp</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/plugin/quuid.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/quuid.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/statemachine/qstatemachine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/statemachine/qstatemachine.cpp</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qmutex.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qmutex.cpp</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qmutex.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qmutex.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qmutex_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qmutex_p.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qmutex_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qmutex_symbian.cpp</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qmutex_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qmutex_unix.cpp</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qmutex_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qmutex_win.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qmutexpool.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qmutexpool.cpp</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qmutexpool_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qmutexpool_p.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qorderedmutexlocker_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qorderedmutexlocker_p.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qsemaphore.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qsemaphore.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qthread.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qthread.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qthread_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qthread_p.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qthread_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qthread_symbian.cpp</a></td><td class='right'>613</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qthread_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qthread_unix.cpp</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qthread_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qthread_win.cpp</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qthreadstorage.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qthreadstorage.cpp</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qthreadstorage.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qthreadstorage.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qwaitcondition_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qwaitcondition_symbian.cpp</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/qwaitcondition_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qwaitcondition_unix.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/thread/thread.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/thread.pri</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qbitarray.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qbitarray.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qbitarray.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qbitarray.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qbytearray.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qbytearray.cpp</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qbytearray.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qbytearray.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qcache.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qcache.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qchar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qchar.cpp</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qchar.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qchar.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qcontiguouscache.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qcontiguouscache.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qcontiguouscache.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qcontiguouscache.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qdatetime.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qdatetime.cpp</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qdatetime_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qdatetime_p.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qelapsedtimer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qelapsedtimer.cpp</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qelapsedtimer.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qelapsedtimer.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qelapsedtimer_generic.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qelapsedtimer_generic.cpp</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qelapsedtimer_mac.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qelapsedtimer_mac.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qelapsedtimer_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qelapsedtimer_symbian.cpp</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qelapsedtimer_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qelapsedtimer_unix.cpp</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qelapsedtimer_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qelapsedtimer_win.cpp</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qhash.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qhash.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qhash.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qhash.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qlinkedlist.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlinkedlist.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qlinkedlist.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlinkedlist.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qlist.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlist.cpp</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qlist.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlist.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qlocale.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale.cpp</a></td><td class='right'>5506</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 11.1%;'/><td class='none' style='width: 87.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qlocale.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qlocale.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale.qdoc</a></td><td class='right'>905</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qlocale_data_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale_data_p.h</a></td><td class='right'>8214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.5%;'/><td class='rem' style='width: 8.6%;'/><td class='none' style='width: 80.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qlocale_icu.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale_icu.cpp</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qlocale_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale_mac.mm</a></td><td class='right'>463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qlocale_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale_p.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qlocale_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale_symbian.cpp</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qlocale_tools.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale_tools.cpp</a></td><td class='right'>2961</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qlocale_tools_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale_tools_p.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qlocale_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale_unix.cpp</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qlocale_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale_win.cpp</a></td><td class='right'>988</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qmap.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qmap.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qmap.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qmap.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qpoint.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qpoint.cpp</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qpoint.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qpoint.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qqueue.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qqueue.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qqueue.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qqueue.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qregexp.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qregexp.cpp</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qregexp.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qregexp.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qscopedpointer.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qscopedpointer.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qscopedvaluerollback.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qscopedvaluerollback.cpp</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qscopedvaluerollback.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qscopedvaluerollback.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qset.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qset.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qset.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qset.qdoc</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qshareddata.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qshareddata.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qsharedpointer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qsharedpointer.cpp</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qsharedpointer.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qsharedpointer.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qsharedpointer_impl.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qsharedpointer_impl.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qsimd.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qsimd.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qstack.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qstack.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qstack.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qstack.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qstring.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qstring.cpp</a></td><td class='right'>1139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qstring.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qstring.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qstringbuilder.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qstringbuilder.cpp</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qstringbuilder.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qstringbuilder.h</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qstringlist.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qstringlist.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qstringlist.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qstringlist.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qvarlengtharray.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qvarlengtharray.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qvarlengtharray.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qvarlengtharray.qdoc</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qvector.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qvector.cpp</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/qvector.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qvector.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/tools/tools.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/tools.pri</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/xml/qxmlstream.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/xml/qxmlstream.cpp</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/corelib/xml/qxmlstream.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/corelib/xml/qxmlstream.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/dbus.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/dbus.pro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbus_symbols_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbus_symbols_p.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusabstractinterface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusabstractinterface.cpp</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusargument.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusargument.cpp</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusargument.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusargument.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusargument_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusargument_p.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusconnection.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusconnection.cpp</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusconnection.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusconnection.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusconnection_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusconnection_p.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusconnectionmanager_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusconnectionmanager_p.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusdemarshaller.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusdemarshaller.cpp</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusintegrator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusintegrator.cpp</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusintegrator_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusintegrator_p.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusinternalfilters.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusinternalfilters.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusmarshaller.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusmarshaller.cpp</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusmessage.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusmessage.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusmessage_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusmessage_p.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusmetatype.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusmetatype.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusmetatype_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusmetatype_p.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusserver.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusserver.cpp</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusserver.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusserver.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusunixfiledescriptor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusunixfiledescriptor.cpp</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusunixfiledescriptor.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusunixfiledescriptor.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusutil.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusutil.cpp</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/dbus/qdbusutil_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/dbus/qdbusutil_p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/debugger.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/debugger.pri</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qdeclarativedebug.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qdeclarativedebug.cpp</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qdeclarativedebugserver.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qdeclarativedebugserver.cpp</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qdeclarativedebugserver_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qdeclarativedebugserver_p.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qdeclarativedebugserverconnection_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qdeclarativedebugserverconnection_p.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qdeclarativedebugservice.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qdeclarativedebugservice.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qdeclarativedebugservice_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qdeclarativedebugservice_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qdeclarativedebugservice_p_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qdeclarativedebugservice_p_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qdeclarativedebugtrace.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qdeclarativedebugtrace.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qdeclarativedebugtrace_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qdeclarativedebugtrace_p.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qdeclarativeobserverinterface_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qdeclarativeobserverinterface_p.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qdeclarativeobserverservice.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qdeclarativeobserverservice.cpp</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qdeclarativeobserverservice_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qdeclarativeobserverservice_p.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qjsdebuggeragent.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qjsdebuggeragent.cpp</a></td><td class='right'>576</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qjsdebuggeragent_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qjsdebuggeragent_p.h</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qjsdebugservice.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qjsdebugservice.cpp</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qjsdebugservice_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qjsdebugservice_p.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qpacketprotocol.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qpacketprotocol.cpp</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/debugger/qpacketprotocol_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/debugger/qpacketprotocol_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/declarative.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/declarative.pro</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/graphicsitems/qdeclarativeflickable.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/graphicsitems/qdeclarativeflickable.cpp</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/graphicsitems/qdeclarativegridview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/graphicsitems/qdeclarativegridview.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/graphicsitems/qdeclarativelistview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/graphicsitems/qdeclarativelistview.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/graphicsitems/qdeclarativepincharea.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/graphicsitems/qdeclarativepincharea.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/graphicsitems/qdeclarativepincharea_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/graphicsitems/qdeclarativepincharea_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/graphicsitems/qdeclarativepincharea_p_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/graphicsitems/qdeclarativetext.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/graphicsitems/qdeclarativetext.cpp</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/graphicsitems/qdeclarativetextedit.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/graphicsitems/qdeclarativetextedit.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/graphicsitems/qdeclarativetextinput.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/graphicsitems/qdeclarativetextinput.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/graphicsitems/qdeclarativetextinput_p_p.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/graphicsitems/qdeclarativetextlayout.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/graphicsitems/qdeclarativetextlayout.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/parser/qdeclarativejsengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/parser/qdeclarativejsengine_p.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarative.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarative.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativecompiler.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativecompiler.cpp</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativecustomparser.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativecustomparser.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativedirparser.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativedirparser.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativedirparser_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativedirparser_p.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativeengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativeengine.cpp</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativeengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativeengine_p.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativeenginedebug.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativeenginedebug.cpp</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativeenginedebug_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativeenginedebug_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativeimport.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativeimport.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativeobjectscriptclass.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativeobjectscriptclass.cpp</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativeparser.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativeparser.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativeproperty.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativeproperty.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativescriptparser.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativescriptparser.cpp</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativesqldatabase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativesqldatabase.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativestringconverters.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativestringconverters.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativetypenamescriptclass.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativetypenamescriptclass.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativevaluetype.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativevaluetype.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativeworkerscript.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativeworkerscript.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qdeclarativexmlhttprequest.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qdeclarativexmlhttprequest.cpp</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qmetaobjectbuilder.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qmetaobjectbuilder.cpp</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qmetaobjectbuilder_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qmetaobjectbuilder_p.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qperformancetimer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qperformancetimer.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/qml/qperformancetimer_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/qml/qperformancetimer_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/util/qdeclarativeanimation.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/util/qdeclarativeanimation.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/util/qdeclarativeanimation_p_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/util/qdeclarativeanimation_p_p.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/util/qdeclarativeapplication.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/util/qdeclarativeapplication.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/util/qdeclarativeapplication_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/util/qdeclarativeapplication_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/util/qdeclarativelistmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/util/qdeclarativelistmodel.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/util/qdeclarativeview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/util/qdeclarativeview.cpp</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/declarative/util/qdeclarativexmllistmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/declarative/util/qdeclarativexmllistmodel.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/accessible/accessible.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/accessible/accessible.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/accessible/qaccessible.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/accessible/qaccessible.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/accessible/qaccessible.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/accessible/qaccessible.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/accessible/qaccessible_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/accessible/qaccessible_mac.mm</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/accessible/qaccessibleobject.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/accessible/qaccessibleobject.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/accessible/qaccessiblewidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/accessible/qaccessiblewidget.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/dialogs/dialogs.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/dialogs/dialogs.pri</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/dialogs/qcolordialog_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/dialogs/qcolordialog_mac.mm</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/dialogs/qdialog.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/dialogs/qdialog.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/dialogs/qfiledialog.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/dialogs/qfiledialog.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/dialogs/qfiledialog_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/dialogs/qfiledialog_mac.mm</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/dialogs/qfiledialog_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/dialogs/qfiledialog_win.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/dialogs/qfileinfogatherer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/dialogs/qfileinfogatherer.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/dialogs/qfileinfogatherer_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/dialogs/qfileinfogatherer_p.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/dialogs/qfilesystemmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/dialogs/qfilesystemmodel.cpp</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/dialogs/qfilesystemmodel.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/dialogs/qfilesystemmodel.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/dialogs/qfontdialog_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/dialogs/qfontdialog_mac.mm</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/dialogs/qinputdialog.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/dialogs/qinputdialog.cpp</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/dialogs/qinputdialog.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/dialogs/qinputdialog.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/dialogs/qmessagebox.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/dialogs/qmessagebox.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/dialogs/qnspanelproxy_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/dialogs/qnspanelproxy_mac.mm</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/dialogs/qpagesetupdialog_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/dialogs/qpagesetupdialog_mac.mm</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/egl/egl.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/egl/egl.pri</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/egl/qegl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/egl/qegl.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/egl/qegl_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/egl/qegl_qpa.cpp</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/egl/qegl_x11.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/egl/qegl_x11.cpp</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/embedded/embedded.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/embedded.pri</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/embedded/qkbd_defaultmap_qws_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/qkbd_defaultmap_qws_p.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/embedded/qkbd_qws.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/qkbd_qws.cpp</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/embedded/qkbddriverfactory_qws.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/qkbddriverfactory_qws.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/embedded/qkbdintegrity_qws.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/qkbdintegrity_qws.cpp</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/embedded/qkbdintegrity_qws.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/qkbdintegrity_qws.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/embedded/qlock.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/qlock.cpp</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/embedded/qmousedriverfactory_qws.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/qmousedriverfactory_qws.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/embedded/qmouseintegrity_qws.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/qmouseintegrity_qws.cpp</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/embedded/qmouseintegrity_qws.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/qmouseintegrity_qws.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/embedded/qscreen_qws.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/qscreen_qws.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/embedded/qscreen_qws.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/qscreen_qws.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/embedded/qscreendriverfactory_qws.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/qscreendriverfactory_qws.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/embedded/qscreenintegrityfb_qws.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/qscreenintegrityfb_qws.cpp</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/embedded/qscreenintegrityfb_qws.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/qscreenintegrityfb_qws.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/embedded/qwslock.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/qwslock.cpp</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/embedded/qwssignalhandler.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/embedded/qwssignalhandler.cpp</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicsanchorlayout_p.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicsgridlayout.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicsgridlayout.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicsgridlayout.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicsgridlayout.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicsitem.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicsitem.cpp</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicsitemanimation.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicsitemanimation.cpp</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicslayout.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicslayout.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicslayout_p.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicslayout_p.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicslayout_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicslayout_p.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicslayoutitem.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicslayoutitem.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicslayoutitem.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicslayoutitem.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicsproxywidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicsproxywidget.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicsscene.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicsscene.cpp</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicsscene_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicsscene_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicsview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicsview.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicsview_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicsview_p.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgraphicswidget_p.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgraphicswidget_p.cpp</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgridlayoutengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgridlayoutengine.cpp</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/graphicsview/qgridlayoutengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/graphicsview/qgridlayoutengine_p.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/gui.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/gui.pro</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/image.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/image.pri</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qbitmap.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qbitmap.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qbitmap.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qbitmap.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qicon.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qicon.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qicon.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qicon.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qimage.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qimage.cpp</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qimage.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qimage.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qimage_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qimage_p.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qimagereader.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qimagereader.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qmnghandler.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qmnghandler.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qmovie.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qmovie.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qnativeimage.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qnativeimage.cpp</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qpaintengine_pic.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qpaintengine_pic.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qpicture.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qpicture.cpp</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qpicture.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qpicture.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qpixmap.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qpixmap.cpp</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qpixmap.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qpixmap.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/image/qpixmap_blitter.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qpixmap_blitter.cpp</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/image/qpixmap_blitter_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qpixmap_blitter_p.h</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qpixmap_mac.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qpixmap_mac.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/image/qpixmap_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qpixmap_qpa.cpp</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qpixmap_raster.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qpixmap_raster.cpp</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qpixmap_s60.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qpixmap_s60.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qpixmap_x11.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qpixmap_x11.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qpixmapdata_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qpixmapdata_p.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qpixmapdatafactory.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qpixmapdatafactory.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qpnghandler.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qpnghandler.cpp</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qtiffhandler.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qtiffhandler.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qvolatileimagedata.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qvolatileimagedata.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/image/qxpmhandler.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/image/qxpmhandler.cpp</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/inputmethod/inputmethod.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/inputmethod/inputmethod.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/inputmethod/qcoefepinputcontext_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/inputmethod/qcoefepinputcontext_p.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/inputmethod/qcoefepinputcontext_s60.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/inputmethod/qcoefepinputcontext_s60.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/itemviews.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/itemviews.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qabstractitemdelegate.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qabstractitemdelegate.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qabstractitemview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qabstractitemview.cpp</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qabstractitemview_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qabstractitemview_p.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qabstractproxymodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qabstractproxymodel.cpp</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qabstractproxymodel.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qabstractproxymodel.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qfileiconprovider.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qfileiconprovider.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qheaderview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qheaderview.cpp</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qidentityproxymodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qidentityproxymodel.cpp</a></td><td class='right'>587</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qidentityproxymodel.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qidentityproxymodel.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qitemdelegate.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qitemdelegate.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qitemselectionmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qitemselectionmodel.cpp</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qitemselectionmodel.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qitemselectionmodel.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qlistview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qlistview.cpp</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qlistview_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qlistview_p.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qsortfilterproxymodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qsortfilterproxymodel.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qstringlistmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qstringlistmodel.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qstyleditemdelegate.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qstyleditemdelegate.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qtableview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qtableview.cpp</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qtableview.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qtableview.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/itemviews/qtreeview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/itemviews/qtreeview.cpp</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/kernel.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/kernel.pri</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/mac.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/mac.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qapplication.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qapplication.cpp</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qapplication.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qapplication.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qapplication_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qapplication_mac.mm</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qapplication_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qapplication_p.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qapplication_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qapplication_qpa.cpp</a></td><td class='right'>965</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qapplication_qws.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qapplication_qws.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qapplication_s60.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qapplication_s60.cpp</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qapplication_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qapplication_win.cpp</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qapplication_x11.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qapplication_x11.cpp</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qclipboard.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qclipboard.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qclipboard.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qclipboard.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qclipboard_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qclipboard_qpa.cpp</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcocoaapplication_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcocoaapplication_mac.mm</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcocoaapplication_mac_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcocoaapplication_mac_p.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcocoaapplicationdelegate_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcocoaapplicationdelegate_mac.mm</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcocoaintrospection_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcocoaintrospection_mac.mm</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcocoaintrospection_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcocoaintrospection_p.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcocoamenuloader_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcocoamenuloader_mac.mm</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcocoapanel_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcocoapanel_mac.mm</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcocoapanel_mac_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcocoapanel_mac_p.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcocoasharedwindowmethods_mac_p.h</a></td><td class='right'>438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcocoaview_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcocoaview_mac.mm</a></td><td class='right'>997</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcocoaview_mac_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcocoaview_mac_p.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcocoawindow_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcocoawindow_mac.mm</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcocoawindow_mac_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcocoawindow_mac_p.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcocoawindowdelegate_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcocoawindowdelegate_mac.mm</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcursor.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcursor.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcursor_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcursor_mac.mm</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcursor_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcursor_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcursor_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcursor_qpa.cpp</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qcursor_x11.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qcursor_x11.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qdesktopwidget_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qdesktopwidget_qpa.cpp</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qdesktopwidget_qpa_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qdesktopwidget_qpa_p.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qdesktopwidget_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qdesktopwidget_win.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qdnd_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qdnd_mac.mm</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qdnd_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qdnd_p.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qdnd_x11.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qdnd_x11.cpp</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qevent.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qevent.cpp</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qevent.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qevent.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qevent_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qevent_p.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qeventdispatcher_glib_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qeventdispatcher_glib_qpa.cpp</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qeventdispatcher_glib_qpa_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qeventdispatcher_glib_qpa_p.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qeventdispatcher_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qeventdispatcher_mac.mm</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qeventdispatcher_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qeventdispatcher_qpa.cpp</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qeventdispatcher_qpa_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qeventdispatcher_qpa_p.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qgenericplugin_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qgenericplugin_qpa.cpp</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qgenericplugin_qpa.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qgenericplugin_qpa.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qgenericpluginfactory_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qgenericpluginfactory_qpa.cpp</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qgenericpluginfactory_qpa.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qgenericpluginfactory_qpa.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qgesturemanager.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qgesturemanager.cpp</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qguifunctions_wince.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qguifunctions_wince.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qguiplatformplugin.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qguiplatformplugin.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qkeymapper_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qkeymapper_p.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qkeymapper_s60.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qkeymapper_s60.cpp</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qkeysequence.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qkeysequence.cpp</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qkeysequence.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qkeysequence.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qlayoutitem.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qlayoutitem.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qmacdefines_mac.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qmacdefines_mac.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qpalette.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qpalette.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformclipboard_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformclipboard_qpa.cpp</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformclipboard_qpa.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformclipboard_qpa.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformcursor_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformcursor_qpa.cpp</a></td><td class='right'>660</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformcursor_qpa.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformcursor_qpa.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformeventloopintegration_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformeventloopintegration_qpa.cpp</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformeventloopintegration_qpa.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformeventloopintegration_qpa.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformglcontext_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformglcontext_qpa.cpp</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformglcontext_qpa.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformglcontext_qpa.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformintegration_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformintegration_qpa.cpp</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformintegration_qpa.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformintegration_qpa.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformintegrationfactory_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformintegrationfactory_qpa.cpp</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformintegrationfactory_qpa_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformintegrationfactory_qpa_p.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformintegrationplugin_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformintegrationplugin_qpa.cpp</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformintegrationplugin_qpa.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformintegrationplugin_qpa.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformnativeinterface_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformnativeinterface_qpa.cpp</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformnativeinterface_qpa.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformnativeinterface_qpa.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformscreen_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformscreen_qpa.cpp</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformscreen_qpa.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformscreen_qpa.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformwindow_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformwindow_qpa.cpp</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformwindow_qpa.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformwindow_qpa.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformwindowformat_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformwindowformat_qpa.cpp</a></td><td class='right'>1008</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qplatformwindowformat_qpa.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qplatformwindowformat_qpa.h</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qsessionmanager_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qsessionmanager_qpa.cpp</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qsizepolicy.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qsizepolicy.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qsizepolicy.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qsizepolicy.qdoc</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qsoftkeymanager_s60.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qsoftkeymanager_s60.cpp</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qt_cocoa_helpers_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qt_cocoa_helpers_mac.mm</a></td><td class='right'>714</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qt_cocoa_helpers_mac_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qt_cocoa_helpers_mac_p.h</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qt_s60_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qt_s60_p.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qtooltip.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qtooltip.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qwidget.cpp</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qwidget.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qwidget.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qwidget_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qwidget_mac.mm</a></td><td class='right'>885</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qwidget_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qwidget_p.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qwidget_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qwidget_qpa.cpp</a></td><td class='right'>875</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qwidget_s60.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qwidget_s60.cpp</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qwidget_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qwidget_win.cpp</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qwidget_x11.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qwidget_x11.cpp</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qwindowdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qwindowdefs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qwindowsysteminterface_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qwindowsysteminterface_qpa.cpp</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qwindowsysteminterface_qpa.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qwindowsysteminterface_qpa.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qwindowsysteminterface_qpa_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qwindowsysteminterface_qpa_p.h</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/kernel/qx11embed_x11.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/kernel/qx11embed_x11.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/math3d/qgenericmatrix.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/math3d/qgenericmatrix.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/math3d/qmatrix4x4.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/math3d/qmatrix4x4.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/math3d/qmatrix4x4.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/math3d/qmatrix4x4.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/painting.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/painting.pri</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qbackingstore.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qbackingstore.cpp</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qbackingstore_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qbackingstore_p.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qbezier.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qbezier.cpp</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qblendfunctions.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qblendfunctions.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qblendfunctions_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qblendfunctions_p.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/painting/qblittable.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qblittable.cpp</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/painting/qblittable_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qblittable_p.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qbrush.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qbrush.cpp</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qbrush.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qbrush.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qcolor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qcolor.cpp</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qcolor_p.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qcolor_p.cpp</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/painting/qcolormap_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qcolormap_qpa.cpp</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qdrawhelper.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qdrawhelper.cpp</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qdrawhelper_neon.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qdrawhelper_neon.cpp</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qdrawhelper_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qdrawhelper_p.h</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qdrawhelper_sse2.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qdrawhelper_sse2.cpp</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qdrawingprimitive_sse2_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qdrawingprimitive_sse2_p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qgraphicssystem.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qgraphicssystem.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qgraphicssystem_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qgraphicssystem_p.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qgraphicssystem_runtime.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qgraphicssystem_runtime.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qgraphicssystem_runtime_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qgraphicssystem_runtime_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qgraphicssystemex_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qgraphicssystemex_symbian.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qgraphicssystemfactory.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qgraphicssystemfactory.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qgrayraster.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qgrayraster.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qgrayraster_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qgrayraster_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qoutlinemapper.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qoutlinemapper.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qoutlinemapper_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qoutlinemapper_p.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpaintbuffer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpaintbuffer.cpp</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpaintdevice.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpaintdevice.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpaintdevice_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpaintdevice_qpa.cpp</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpaintengine.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpaintengine.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpaintengine_alpha.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpaintengine_alpha.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpaintengine_blitter.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpaintengine_blitter.cpp</a></td><td class='right'>663</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpaintengine_blitter_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpaintengine_blitter_p.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpaintengine_mac.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpaintengine_mac.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpaintengine_mac_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpaintengine_mac_p.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpaintengine_raster.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpaintengine_raster.cpp</a></td><td class='right'>505</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpaintengine_raster_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpaintengine_raster_p.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpaintengine_x11.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpaintengine_x11.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpaintengineex.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpaintengineex.cpp</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpainter.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpainter.cpp</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpainter.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpainter.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpainter_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpainter_p.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpainterpath.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpainterpath.cpp</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpainterpath.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpainterpath.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpdf.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpdf.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpen.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpen.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpen.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpen.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpolygon.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpolygon.cpp</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qpolygon.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qpolygon.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qprintengine_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qprintengine_mac.mm</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qprintengine_pdf.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qprintengine_pdf.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/painting/qprinterinfo.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qprinterinfo.cpp</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qprinterinfo.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qprinterinfo.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/gui/painting/qprinterinfo.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qprinterinfo.qdoc</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qprinterinfo_mac.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qprinterinfo_mac.cpp</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/painting/qprinterinfo_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qprinterinfo_p.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qprinterinfo_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qprinterinfo_unix.cpp</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qprinterinfo_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qprinterinfo_win.cpp</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qrasterizer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qrasterizer.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qregion.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qregion.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qregion.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qregion.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qstroker.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qstroker.cpp</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qtextureglyphcache.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qtextureglyphcache.cpp</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qtextureglyphcache_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qtextureglyphcache_p.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qtransform.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qtransform.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/painting/qunifiedtoolbarsurface_mac.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qunifiedtoolbarsurface_mac.cpp</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/painting/qunifiedtoolbarsurface_mac_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qunifiedtoolbarsurface_mac_p.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qwindowsurface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qwindowsurface.cpp</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qwindowsurface_mac.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qwindowsurface_mac.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qwindowsurface_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qwindowsurface_p.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qwindowsurface_raster.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qwindowsurface_raster.cpp</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qwindowsurface_raster_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qwindowsurface_raster_p.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qwindowsurface_s60.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qwindowsurface_s60.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qwindowsurface_s60_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qwindowsurface_s60_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qwindowsurface_x11.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qwindowsurface_x11.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/painting/qwindowsurface_x11_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/painting/qwindowsurface_x11_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/s60framework/qs60mainappui.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/s60framework/qs60mainappui.cpp</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/s60framework/qs60mainappui.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/s60framework/qs60mainappui.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/s60framework/qs60maindocument.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/s60framework/qs60maindocument.cpp</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qcleanlooksstyle.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qcleanlooksstyle.cpp</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qcommonstyle.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qcommonstyle.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qgtkpainter.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qgtkpainter.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qgtkstyle.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qgtkstyle.cpp</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qgtkstyle_p.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qgtkstyle_p.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qgtkstyle_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qgtkstyle_p.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qmacstyle_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qmacstyle_mac.mm</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qplastiquestyle.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qplastiquestyle.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qs60style.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qs60style.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qs60style_s60.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qs60style_s60.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qstylehelper_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qstylehelper_p.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qstylesheetstyle.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qstylesheetstyle.cpp</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qstylesheetstyle_default.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qstylesheetstyle_default.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qstylesheetstyle_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qstylesheetstyle_p.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qwindowscestyle.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qwindowscestyle.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qwindowsstyle.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qwindowsstyle.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qwindowsvistastyle.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qwindowsvistastyle.cpp</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/qwindowsxpstyle.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/qwindowsxpstyle.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/styles/styles.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/styles/styles.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/symbian/qsymbianevent.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/symbian/qsymbianevent.cpp</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/symbian/qsymbianevent.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/symbian/qsymbianevent.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qcssparser.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qcssparser.cpp</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qcssparser_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qcssparser_p.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfont.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfont.cpp</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfont.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfont.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfont_mac.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfont_mac.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfont_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfont_p.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qfont_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfont_qpa.cpp</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfont_s60.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfont_s60.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfont_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfont_win.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontdatabase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontdatabase.cpp</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontdatabase.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontdatabase.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontdatabase_mac.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontdatabase_mac.cpp</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontdatabase_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontdatabase_qpa.cpp</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontdatabase_qws.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontdatabase_qws.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontdatabase_s60.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontdatabase_s60.cpp</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontdatabase_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontdatabase_win.cpp</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontdatabase_x11.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontdatabase_x11.cpp</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine.cpp</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine_coretext.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine_coretext.mm</a></td><td class='right'>880</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine_coretext_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine_coretext_p.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine_ft.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine_ft.cpp</a></td><td class='right'>384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine_ft_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine_ft_p.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine_mac.mm</a></td><td class='right'>694</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine_mac_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine_mac_p.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine_p.h</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine_qpa.cpp</a></td><td class='right'>691</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine_qpa_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine_qpa_p.h</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine_qpf.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine_qpf.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine_qws.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine_qws.cpp</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine_s60.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine_s60.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine_win.cpp</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine_win_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine_win_p.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine_x11.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine_x11.cpp</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengine_x11_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengine_x11_p.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontenginedirectwrite.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontenginedirectwrite.cpp</a></td><td class='right'>646</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontenginedirectwrite_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontenginedirectwrite_p.h</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontengineglyphcache_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontengineglyphcache_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontmetrics.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontmetrics.cpp</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qfontmetrics.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qfontmetrics.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qglyphrun.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qglyphrun.cpp</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qglyphrun.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qglyphrun.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qglyphrun_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qglyphrun_p.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qpfutil.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qpfutil.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qplatformfontdatabase_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qplatformfontdatabase_qpa.cpp</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qplatformfontdatabase_qpa.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qplatformfontdatabase_qpa.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qrawfont.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qrawfont.cpp</a></td><td class='right'>723</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qrawfont.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qrawfont.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qrawfont_ft.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qrawfont_ft.cpp</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qrawfont_mac.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qrawfont_mac.cpp</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qrawfont_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qrawfont_p.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qrawfont_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qrawfont_qpa.cpp</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/text/qrawfont_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qrawfont_win.cpp</a></td><td class='right'>707</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qstatictext.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qstatictext.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextcontrol.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextcontrol.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextcursor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextcursor.cpp</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextcursor.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextcursor.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextdocument.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextdocument.cpp</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextdocument.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextdocument.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextdocument_p.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextdocument_p.cpp</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextdocument_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextdocument_p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextdocumentfragment.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextdocumentfragment.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextdocumentlayout.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextdocumentlayout.cpp</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextdocumentlayout_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextdocumentlayout_p.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextengine.cpp</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextengine_mac.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextengine_mac.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextengine_p.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextformat.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextformat.cpp</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextformat.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextformat.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtexthtmlparser.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtexthtmlparser.cpp</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtexthtmlparser_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtexthtmlparser_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextimagehandler.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextimagehandler.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextlayout.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextlayout.cpp</a></td><td class='right'>854</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextlayout.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextlayout.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextlist.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextlist.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextobject.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextobject.cpp</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextobject.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextobject.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qtextodfwriter.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qtextodfwriter.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qzip.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qzip.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/qzipwriter_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/qzipwriter_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/text/text.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/text/text.pri</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/util/qcompleter.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/util/qcompleter.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/util/qdesktopservices.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/util/qdesktopservices.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/util/qdesktopservices_mac.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/util/qdesktopservices_mac.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/gui/util/qflickgesture_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/util/qflickgesture_p.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/util/qsystemtrayicon_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/util/qsystemtrayicon_win.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/util/qundogroup.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/util/qundogroup.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/util/qundostack.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/util/qundostack.cpp</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/util/qundostack.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/util/qundostack.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/util/qundostack_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/util/qundostack_p.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/util/util.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/util/util.pri</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qabstractbutton.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qabstractbutton.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qabstractslider_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qabstractslider_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qcheckbox.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qcheckbox.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qcheckbox.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qcheckbox.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qcocoamenu_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qcocoamenu_mac.mm</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qcombobox.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qcombobox.cpp</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qcombobox.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qcombobox.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qcombobox_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qcombobox_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qdatetimeedit.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qdatetimeedit.cpp</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qdatetimeedit_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qdatetimeedit_p.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qdial.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qdial.cpp</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qdialogbuttonbox.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qdialogbuttonbox.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qdockarealayout.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qdockarealayout.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qdockwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qdockwidget.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qeffects.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qeffects.cpp</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qfocusframe.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qfocusframe.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qlabel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qlabel.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qlinecontrol.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qlinecontrol.cpp</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qlinecontrol_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qlinecontrol_p.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qlineedit.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qlineedit.cpp</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qlineedit.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qlineedit.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qlineedit_p.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qlineedit_p.cpp</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qlineedit_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qlineedit_p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qmainwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qmainwindow.cpp</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qmainwindowlayout.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qmainwindowlayout.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qmainwindowlayout_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qmainwindowlayout_mac.mm</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qmainwindowlayout_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qmainwindowlayout_p.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qmdiarea.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qmdiarea.cpp</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qmdiarea.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qmdiarea.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qmdiarea_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qmdiarea_p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qmdisubwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qmdisubwindow.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qmenu.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qmenu.cpp</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qmenu.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qmenu.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qmenu_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qmenu_mac.mm</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qmenu_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qmenu_p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qmenu_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qmenu_symbian.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qmenu_wince.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qmenu_wince.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qmenubar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qmenubar.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qplaintextedit.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qplaintextedit.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qradiobutton.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qradiobutton.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qradiobutton.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qradiobutton.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qsizegrip.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qsizegrip.cpp</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qspinbox.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qspinbox.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qsplashscreen.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qsplashscreen.cpp</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qstackedwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qstackedwidget.cpp</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qtabbar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qtabbar.cpp</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qtabwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qtabwidget.cpp</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qtabwidget.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qtabwidget.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qtextedit.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qtextedit.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qtoolbarlayout.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qtoolbarlayout.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qtoolbutton.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qtoolbutton.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qvalidator.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qvalidator.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/qworkspace.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/qworkspace.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/gui/widgets/widgets.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/gui/widgets/widgets.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/imports/folderlistmodel/folderlistmodel.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/imports/folderlistmodel/folderlistmodel.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/imports/gestures/gestures.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/imports/gestures/gestures.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/imports/particles/particles.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/imports/particles/particles.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/multimedia/multimedia.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/multimedia/multimedia.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/multimedia/video/qvideosurfaceformat.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/multimedia/video/qvideosurfaceformat.cpp</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/access.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/access.pri</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/network/access/qfilenetworkreply.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qfilenetworkreply.cpp</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/network/access/qfilenetworkreply_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qfilenetworkreply_p.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qftp.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qftp.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/network/access/qhttpmultipart.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qhttpmultipart.cpp</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/network/access/qhttpmultipart.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qhttpmultipart.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/network/access/qhttpmultipart_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qhttpmultipart_p.h</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qhttpnetworkconnection.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qhttpnetworkconnection.cpp</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qhttpnetworkconnection_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qhttpnetworkconnection_p.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qhttpnetworkconnectionchannel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qhttpnetworkconnectionchannel.cpp</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qhttpnetworkconnectionchannel_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qhttpnetworkconnectionchannel_p.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qhttpnetworkreply.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qhttpnetworkreply.cpp</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qhttpnetworkreply_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qhttpnetworkreply_p.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qhttpnetworkrequest.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qhttpnetworkrequest.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qhttpnetworkrequest_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qhttpnetworkrequest_p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/network/access/qhttpthreaddelegate.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qhttpthreaddelegate.cpp</a></td><td class='right'>582</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/network/access/qhttpthreaddelegate_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qhttpthreaddelegate_p.h</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkaccessauthenticationmanager.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkaccessauthenticationmanager.cpp</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkaccessauthenticationmanager_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkaccessauthenticationmanager_p.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkaccessbackend.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkaccessbackend.cpp</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkaccessbackend_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkaccessbackend_p.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkaccesscachebackend.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkaccesscachebackend.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkaccessdatabackend.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkaccessdatabackend.cpp</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkaccessdatabackend_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkaccessdatabackend_p.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkaccessfilebackend.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkaccessfilebackend.cpp</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkaccessftpbackend.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkaccessftpbackend.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkaccesshttpbackend.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkaccesshttpbackend.cpp</a></td><td class='right'>851</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkaccesshttpbackend_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkaccesshttpbackend_p.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkaccessmanager.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkaccessmanager.cpp</a></td><td class='right'>445</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkaccessmanager.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkaccessmanager.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkaccessmanager_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkaccessmanager_p.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkcookie.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkcookie.cpp</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkcookiejar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkcookiejar.cpp</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkcookiejar_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkcookiejar_p.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkcookiejartlds_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkcookiejartlds_p.h</a></td><td class='right'>6481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.0%;'/><td class='none' style='width: 85.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkcookiejartlds_p.h.INFO?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkcookiejartlds_p.h.INFO</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkdiskcache.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkdiskcache.cpp</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkdiskcache_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkdiskcache_p.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkreply.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkreply.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkreply.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkreply.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkreply_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkreply_p.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkreplydataimpl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkreplydataimpl.cpp</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkreplydataimpl_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkreplydataimpl_p.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkreplyfileimpl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkreplyfileimpl.cpp</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkreplyfileimpl_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkreplyfileimpl_p.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkreplyimpl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkreplyimpl.cpp</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkreplyimpl_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkreplyimpl_p.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkrequest.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkrequest.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkrequest.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkrequest.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/access/qnetworkrequest_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/access/qnetworkrequest_p.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/bearer/bearer.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/bearer/bearer.pri</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/bearer/qbearerengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/bearer/qbearerengine.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/bearer/qbearerengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/bearer/qbearerengine_p.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/bearer/qbearerplugin.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/bearer/qbearerplugin.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/bearer/qbearerplugin_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/bearer/qbearerplugin_p.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/bearer/qnetworkconfigmanager.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/bearer/qnetworkconfigmanager.cpp</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/bearer/qnetworkconfigmanager.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/bearer/qnetworkconfigmanager.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/bearer/qnetworkconfigmanager_p.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/bearer/qnetworkconfigmanager_p.cpp</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/bearer/qnetworkconfigmanager_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/bearer/qnetworkconfigmanager_p.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/bearer/qnetworkconfiguration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/bearer/qnetworkconfiguration.cpp</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/bearer/qnetworkconfiguration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/bearer/qnetworkconfiguration.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/bearer/qnetworkconfiguration_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/bearer/qnetworkconfiguration_p.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/bearer/qnetworksession.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/bearer/qnetworksession.cpp</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/bearer/qnetworksession.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/bearer/qnetworksession.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/bearer/qnetworksession_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/bearer/qnetworksession_p.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/bearer/qsharednetworksession_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/bearer/qsharednetworksession_p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/kernel/kernel.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/kernel/kernel.pri</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/kernel/qhostaddress.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/kernel/qhostaddress.cpp</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/kernel/qhostaddress_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/kernel/qhostaddress_p.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/kernel/qhostinfo.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/kernel/qhostinfo.cpp</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/kernel/qhostinfo_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/kernel/qhostinfo_p.h</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/network/kernel/qhostinfo_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/kernel/qhostinfo_symbian.cpp</a></td><td class='right'>591</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/kernel/qhostinfo_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/kernel/qhostinfo_unix.cpp</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/kernel/qhostinfo_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/kernel/qhostinfo_win.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/kernel/qnetworkinterface_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/kernel/qnetworkinterface_symbian.cpp</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/kernel/qnetworkproxy.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/kernel/qnetworkproxy.cpp</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/kernel/qnetworkproxy.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/kernel/qnetworkproxy.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/kernel/qnetworkproxy_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/kernel/qnetworkproxy_symbian.cpp</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/network.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/network.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qabstractsocket.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qabstractsocket.cpp</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qabstractsocket.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qabstractsocket.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qabstractsocket_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qabstractsocket_p.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qabstractsocketengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qabstractsocketengine.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qabstractsocketengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qabstractsocketengine_p.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qhttpsocketengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qhttpsocketengine.cpp</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qhttpsocketengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qhttpsocketengine_p.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qlocalserver.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qlocalserver.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qlocalserver_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qlocalserver_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qlocalsocket.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qlocalsocket.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qlocalsocket_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qlocalsocket_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qlocalsocket_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qlocalsocket_win.cpp</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qnativesocketengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qnativesocketengine.cpp</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qnativesocketengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qnativesocketengine_p.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qnativesocketengine_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qnativesocketengine_unix.cpp</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qnativesocketengine_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qnativesocketengine_win.cpp</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qsocks5socketengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qsocks5socketengine.cpp</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qsocks5socketengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qsocks5socketengine_p.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/network/socket/qsymbiansocketengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qsymbiansocketengine.cpp</a></td><td class='right'>1770</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/network/socket/qsymbiansocketengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qsymbiansocketengine_p.h</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qtcpserver.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qtcpserver.cpp</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qudpsocket.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qudpsocket.cpp</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/qudpsocket.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/qudpsocket.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/socket/socket.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/socket/socket.pri</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/ssl/qssl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/ssl/qssl.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/ssl/qssl.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/ssl/qssl.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/ssl/qsslcertificate.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/ssl/qsslcertificate.cpp</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/ssl/qsslconfiguration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/ssl/qsslconfiguration.cpp</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/ssl/qsslconfiguration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/ssl/qsslconfiguration.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/ssl/qsslconfiguration_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/ssl/qsslconfiguration_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/ssl/qsslerror.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/ssl/qsslerror.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/ssl/qsslerror.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/ssl/qsslerror.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/ssl/qsslsocket.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/ssl/qsslsocket.cpp</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/ssl/qsslsocket.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/ssl/qsslsocket.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/ssl/qsslsocket_openssl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/ssl/qsslsocket_openssl.cpp</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/ssl/qsslsocket_openssl_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/ssl/qsslsocket_openssl_p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/ssl/qsslsocket_openssl_symbols.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/ssl/qsslsocket_openssl_symbols.cpp</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/ssl/qsslsocket_openssl_symbols_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/ssl/qsslsocket_openssl_symbols_p.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/network/ssl/qsslsocket_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/network/ssl/qsslsocket_p.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/gl2paintengineex/qglengineshadermanager.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/gl2paintengineex/qglengineshadermanager.cpp</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/gl2paintengineex/qglengineshadermanager_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/gl2paintengineex/qglengineshadermanager_p.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/gl2paintengineex/qglengineshadersource_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/gl2paintengineex/qglengineshadersource_p.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/gl2paintengineex/qglgradientcache.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/gl2paintengineex/qglgradientcache.cpp</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/gl2paintengineex/qglgradientcache_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/gl2paintengineex/qglgradientcache_p.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/opengl/gl2paintengineex/qglshadercache_meego_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/gl2paintengineex/qglshadercache_meego_p.h</a></td><td class='right'>457</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/opengl/gl2paintengineex/qglshadercache_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/gl2paintengineex/qglshadercache_p.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/opengl.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/opengl.pro</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/opengl/opengl.pro.user.2.1pre1?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/opengl.pro.user.2.1pre1</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qgl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qgl.cpp</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qgl.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qgl.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qgl_egl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qgl_egl.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qgl_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qgl_p.h</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/opengl/qgl_qpa.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qgl_qpa.cpp</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qgl_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qgl_win.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qgl_x11egl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qgl_x11egl.cpp</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qglextensions_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qglextensions_p.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qglframebufferobject.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qglframebufferobject.cpp</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qglframebufferobject.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qglframebufferobject.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qglframebufferobject_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qglframebufferobject_p.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/opengl/qglfunctions.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qglfunctions.cpp</a></td><td class='right'>3712</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/opengl/qglfunctions.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qglfunctions.h</a></td><td class='right'>2295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qglpaintdevice.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qglpaintdevice.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qglpaintdevice_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qglpaintdevice_p.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qglpixelbuffer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qglpixelbuffer.cpp</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qglpixelbuffer_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qglpixelbuffer_p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/opengl/qglpixelbuffer_stub.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qglpixelbuffer_stub.cpp</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qglpixmapfilter.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qglpixmapfilter.cpp</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qglshaderprogram.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qglshaderprogram.cpp</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qpaintengine_opengl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qpaintengine_opengl.cpp</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qpixmapdata_gl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qpixmapdata_gl.cpp</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qpixmapdata_poolgl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qpixmapdata_poolgl.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qwindowsurface_gl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qwindowsurface_gl.cpp</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/opengl/qwindowsurface_gl_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/qwindowsurface_gl_p.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/opengl/util/meego/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/util/meego/main.cpp</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/opengl/util/meego/shader-cache-introspector.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/opengl/util/meego/shader-cache-introspector.pro</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/openvg/openvg.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/openvg/openvg.pro</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/openvg/qpaintengine_vg.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/openvg/qpaintengine_vg.cpp</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/openvg/qpixmapdata_vg.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/openvg/qpixmapdata_vg.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/openvg/qwindowsurface_vg.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/openvg/qwindowsurface_vg.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/openvg/qwindowsurface_vg_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/openvg/qwindowsurface_vg_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/phonon/phonon.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/phonon/phonon.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/accessible/widgets/complexwidgets.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/accessible/widgets/complexwidgets.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/accessible/widgets/qaccessiblewidgets.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/accessible/widgets/qaccessiblewidgets.cpp</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/accessible/widgets/rangecontrols.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/accessible/widgets/rangecontrols.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/accessible/widgets/simplewidgets.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/accessible/widgets/simplewidgets.cpp</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/bearer/connman/qconnmanservice_linux.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/bearer/connman/qconnmanservice_linux.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/bearer/connman/qofonoservice_linux.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/bearer/connman/qofonoservice_linux.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/bearer/connman/qofonoservice_linux_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/bearer/connman/qofonoservice_linux_p.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/bearer/corewlan/corewlan.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/bearer/corewlan/corewlan.pro</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/bearer/corewlan/qcorewlanengine.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/bearer/corewlan/qcorewlanengine.mm</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/bearer/platformdefs_win.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/bearer/platformdefs_win.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/bearer/qbearerengine_impl.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/bearer/qbearerengine_impl.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/bearer/qnetworksession_impl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/bearer/qnetworksession_impl.cpp</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/bearer/qnetworksession_impl.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/bearer/qnetworksession_impl.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/bearer/symbian/qnetworksession_impl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/bearer/symbian/qnetworksession_impl.cpp</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/bearer/symbian/qnetworksession_impl.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/bearer/symbian/qnetworksession_impl.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/codecs/jp/qsjiscodec.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/codecs/jp/qsjiscodec.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/codecs/kr/qeuckrcodec.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/codecs/kr/qeuckrcodec.cpp</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/generic/linuxinput/linuxinput.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/generic/linuxinput/linuxinput.pro</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/generic/linuxinput/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/generic/linuxinput/main.cpp</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/generic/linuxinput/qlinuxinput.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/generic/linuxinput/qlinuxinput.cpp</a></td><td class='right'>557</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/generic/linuxinput/qlinuxinput.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/generic/linuxinput/qlinuxinput.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/generic/tslib/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/generic/tslib/main.cpp</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/generic/tslib/qtslib.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/generic/tslib/qtslib.cpp</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/generic/tslib/qtslib.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/generic/tslib/qtslib.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/generic/tslib/tslib.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/generic/tslib/tslib.pro</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/gfxdrivers/eglnullws/README?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/gfxdrivers/eglnullws/README</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/gfxdrivers/eglnullws/eglnullws.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/gfxdrivers/eglnullws/eglnullws.pro</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/gfxdrivers/eglnullws/eglnullwsscreen.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/gfxdrivers/eglnullws/eglnullwsscreen.cpp</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/gfxdrivers/eglnullws/eglnullwsscreen.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/gfxdrivers/eglnullws/eglnullwsscreen.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.cpp</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/gfxdrivers/eglnullws/eglnullwswindowsurface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/gfxdrivers/eglnullws/eglnullwswindowsurface.cpp</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/gfxdrivers/eglnullws/eglnullwswindowsurface.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/gfxdrivers/eglnullws/eglnullwswindowsurface.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/gfxdrivers/gfxdrivers.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/gfxdrivers/gfxdrivers.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/graphicssystems/graphicssystems.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/graphicssystems/graphicssystems.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/graphicssystems/meego/qmeegographicssystem.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/phonon/gstreamer/gstreamer.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/phonon/gstreamer/gstreamer.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/phonon/mmf/mmf.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/phonon/mmf/mmf.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/cocoa/cocoa.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/cocoa/cocoa.pro</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/cocoa/main.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/cocoa/main.mm</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/cocoa/qcocoaautoreleasepool.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/cocoa/qcocoaautoreleasepool.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/cocoa/qcocoaautoreleasepool.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/cocoa/qcocoaautoreleasepool.mm</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/cocoa/qcocoaeventloopintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/cocoa/qcocoaeventloopintegration.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/cocoa/qcocoaeventloopintegration.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/cocoa/qcocoaeventloopintegration.mm</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/cocoa/qcocoaintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/cocoa/qcocoaintegration.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/cocoa/qcocoaintegration.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/cocoa/qcocoaintegration.mm</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/cocoa/qcocoawindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/cocoa/qcocoawindow.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/cocoa/qcocoawindow.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/cocoa/qcocoawindow.mm</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/cocoa/qcocoawindowsurface.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/cocoa/qcocoawindowsurface.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/cocoa/qcocoawindowsurface.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/cocoa/qcocoawindowsurface.mm</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/cocoa/qnsview.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/cocoa/qnsview.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/cocoa/qnsview.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/cocoa/qnsview.mm</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/cocoa/qnswindowdelegate.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/cocoa/qnswindowdelegate.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/cocoa/qnswindowdelegate.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/cocoa/qnswindowdelegate.mm</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/directfb.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/directfb.pro</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/main.cpp</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/qdirectfbblitter.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/qdirectfbblitter.cpp</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/qdirectfbblitter.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/qdirectfbblitter.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/qdirectfbconvenience.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/qdirectfbconvenience.cpp</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/qdirectfbconvenience.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/qdirectfbconvenience.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/qdirectfbcursor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/qdirectfbcursor.cpp</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/qdirectfbcursor.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/qdirectfbcursor.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/qdirectfbglcontext.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/qdirectfbglcontext.cpp</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/qdirectfbglcontext.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/qdirectfbglcontext.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/qdirectfbinput.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/qdirectfbinput.cpp</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/qdirectfbinput.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/qdirectfbinput.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/qdirectfbintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/qdirectfbintegration.cpp</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/qdirectfbintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/qdirectfbintegration.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/qdirectfbwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/qdirectfbwindow.cpp</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/qdirectfbwindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/qdirectfbwindow.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/qdirectfbwindowsurface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/qdirectfbwindowsurface.cpp</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/directfb/qdirectfbwindowsurface.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/directfb/qdirectfbwindowsurface.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglconvenience/eglconvenience.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglconvenience/eglconvenience.pri</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglconvenience/qeglconvenience.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglconvenience/qeglconvenience.cpp</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglconvenience/qeglconvenience.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglconvenience/qeglconvenience.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglconvenience/qeglplatformcontext.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglconvenience/qeglplatformcontext.cpp</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglconvenience/qeglplatformcontext.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglconvenience/qeglplatformcontext.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglconvenience/qxlibeglintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglconvenience/qxlibeglintegration.cpp</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglconvenience/qxlibeglintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglconvenience/qxlibeglintegration.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglconvenience/xlibeglintegration.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglconvenience/xlibeglintegration.pri</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglfs/eglfs.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglfs/eglfs.pro</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglfs/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglfs/main.cpp</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglfs/qeglfsintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglfs/qeglfsintegration.cpp</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglfs/qeglfsintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglfs/qeglfsintegration.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglfs/qeglfsscreen.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglfs/qeglfsscreen.cpp</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglfs/qeglfsscreen.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglfs/qeglfsscreen.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglfs/qeglfswindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglfs/qeglfswindow.cpp</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglfs/qeglfswindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglfs/qeglfswindow.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglfs/qeglfswindowsurface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglfs/qeglfswindowsurface.cpp</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/eglfs/qeglfswindowsurface.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/eglfs/qeglfswindowsurface.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/externalplugin.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/externalplugin.pri</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/fb_base/fb_base.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/fb_base/fb_base.cpp</a></td><td class='right'>507</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/fb_base/fb_base.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/fb_base/fb_base.h</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/fb_base/fb_base.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/fb_base/fb_base.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/fb_base/fb_base.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/fb_base/fb_base.pro</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/fontdatabases/basicunix/basicunix.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/fontdatabases/basicunix/basicunix.pri</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/fontdatabases/fontconfig/fontconfig.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/fontdatabases/fontconfig/fontconfig.pri</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp</a></td><td class='right'>601</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/fontdatabases/genericunix/genericunix.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/fontdatabases/genericunix/genericunix.pri</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/fontdatabases/genericunix/qgenericunixfontdatabase.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/fontdatabases/genericunix/qgenericunixfontdatabase.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/glxconvenience/glxconvenience.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/glxconvenience/glxconvenience.pri</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/glxconvenience/qglxconvenience.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/glxconvenience/qglxconvenience.cpp</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/glxconvenience/qglxconvenience.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/glxconvenience/qglxconvenience.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/linuxfb/linuxfb.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/linuxfb/linuxfb.pro</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/linuxfb/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/linuxfb/main.cpp</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp</a></td><td class='right'>875</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/linuxfb/qlinuxfbintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/linuxfb/qlinuxfbintegration.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/minimal/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/minimal/main.cpp</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/minimal/minimal.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/minimal/minimal.pro</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/minimal/qminimalintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/minimal/qminimalintegration.cpp</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/minimal/qminimalintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/minimal/qminimalintegration.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/minimal/qminimalwindowsurface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/minimal/qminimalwindowsurface.cpp</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/minimal/qminimalwindowsurface.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/minimal/qminimalwindowsurface.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openkode/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openkode/main.cpp</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openkode/openkode.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openkode/openkode.pro</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openkode/openkodekeytranslator.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openkode/openkodekeytranslator.h</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openkode/qopenkodeeventloopintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openkode/qopenkodeeventloopintegration.cpp</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openkode/qopenkodeeventloopintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openkode/qopenkodeeventloopintegration.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openkode/qopenkodeintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openkode/qopenkodeintegration.cpp</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openkode/qopenkodeintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openkode/qopenkodeintegration.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openkode/qopenkodewindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openkode/qopenkodewindow.cpp</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openkode/qopenkodewindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openkode/qopenkodewindow.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openkode/resources.qrc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openkode/resources.qrc</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openkode/shaders/frag.glslf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openkode/shaders/frag.glslf</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openkode/shaders/vert.glslv?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openkode/shaders/vert.glslv</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openvglite/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openvglite/main.cpp</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openvglite/openvglite.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openvglite/openvglite.pro</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openvglite/qgraphicssystem_vglite.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openvglite/qgraphicssystem_vglite.cpp</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openvglite/qgraphicssystem_vglite.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openvglite/qgraphicssystem_vglite.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openvglite/qwindowsurface_vglite.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openvglite/qwindowsurface_vglite.cpp</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/openvglite/qwindowsurface_vglite.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/openvglite/qwindowsurface_vglite.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/platforms.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/platforms.pro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/qvfb/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/qvfb/main.cpp</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/qvfb/qvfb.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/qvfb/qvfb.pro</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/qvfb/qvfbintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/qvfb/qvfbintegration.cpp</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/qvfb/qvfbintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/qvfb/qvfbintegration.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/qvfb/qvfbwindowsurface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/qvfb/qvfbwindowsurface.cpp</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/qvfb/qvfbwindowsurface.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/qvfb/qvfbwindowsurface.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/README?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/README</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/examples/qmltest/main.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/examples/qmltest/main.mm</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/examples/qmltest/qml/main.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/examples/qmltest/qml/main.qml</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/examples/qmltest/qmlapplicationviewer/moc_qmlapplicationviewer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/examples/qmltest/qmlapplicationviewer/moc_qmlapplicationviewer.cpp</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/examples/qmltest/qmlapplicationviewer/qmlapplicationviewer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/examples/qmltest/qmlapplicationviewer/qmlapplicationviewer.cpp</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/examples/qmltest/qmlapplicationviewer/qmlapplicationviewer.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/examples/qmltest/qmlapplicationviewer/qmlapplicationviewer.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/examples/qmltest/qmltest-Info.plist?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/examples/qmltest/qmltest-Info.plist</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/examples/qmltest/qmltest.xcodeproj/project.pbxproj?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/examples/qmltest/qmltest.xcodeproj/project.pbxproj</a></td><td class='right'>491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/examples/qmltest/qmltest_Prefix.pch?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/examples/qmltest/qmltest_Prefix.pch</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/main.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/main.mm</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/quikiteventloop.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/quikiteventloop.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/quikiteventloop.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/quikiteventloop.mm</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/quikitintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/quikitintegration.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/quikitintegration.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/quikitintegration.mm</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/quikitscreen.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/quikitscreen.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/quikitscreen.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/quikitscreen.mm</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/quikitsoftwareinputhandler.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/quikitsoftwareinputhandler.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/quikitwindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/quikitwindow.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/quikitwindow.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/quikitwindow.mm</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/quikitwindowsurface.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/quikitwindowsurface.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/quikitwindowsurface.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/quikitwindowsurface.mm</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/uikit/uikit.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/uikit/uikit.pro</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/vnc/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/vnc/main.cpp</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/vnc/qvnccursor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/vnc/qvnccursor.cpp</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/vnc/qvnccursor.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/vnc/qvnccursor.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/vnc/qvncintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/vnc/qvncintegration.cpp</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/vnc/qvncintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/vnc/qvncintegration.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/vnc/qvncserver.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/vnc/qvncserver.cpp</a></td><td class='right'>1935</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/vnc/qvncserver.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/vnc/qvncserver.h</a></td><td class='right'>533</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/vnc/vnc.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/vnc/vnc.pro</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/gl_integration.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/gl_integration.pri</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/qwaylandglintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/qwaylandglintegration.cpp</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/qwaylandglintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/qwaylandglintegration.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglintegration.cpp</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglintegration.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglwindow.cpp</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglwindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglwindow.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/readback_egl/readback_egl.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/readback_egl/readback_egl.pri</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxintegration.cpp</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxintegration.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/readback_glx/readback_glx.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/readback_glx/readback_glx.pri</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglinclude.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglinclude.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.cpp</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/wayland_egl/wayland_egl.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/wayland_egl/wayland_egl.pri</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglintegration.cpp</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglintegration.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/xcomposite_egl.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_egl/xcomposite_egl.pri</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxintegration.cpp</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxintegration.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxwindow.cpp</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxwindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxwindow.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/xcomposite_glx.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_glx/xcomposite_glx.pri</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.cpp</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_share/wayland-xcomposite-client-protocol.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_share/wayland-xcomposite-client-protocol.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_share/wayland-xcomposite-protocol.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_share/wayland-xcomposite-protocol.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/main.cpp</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandbuffer.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandbuffer.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandclipboard.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandclipboard.cpp</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandclipboard.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandclipboard.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandcursor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandcursor.cpp</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandcursor.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandcursor.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylanddisplay.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylanddisplay.cpp</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylanddisplay.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylanddisplay.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandinputdevice.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandinputdevice.cpp</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandinputdevice.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandinputdevice.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandintegration.cpp</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandintegration.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandnativeinterface.cpp</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandnativeinterface.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandnativeinterface.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandscreen.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandscreen.cpp</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandscreen.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandscreen.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandshmsurface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandshmsurface.cpp</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandshmsurface.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandshmsurface.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandshmwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandshmwindow.cpp</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandshmwindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandshmwindow.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandwindow.cpp</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/qwaylandwindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/qwaylandwindow.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/wayland/wayland.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/wayland/wayland.pro</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/README?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/README</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/main.cpp</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qdri2context.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qdri2context.cpp</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qdri2context.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qdri2context.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qglxintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qglxintegration.cpp</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qglxintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qglxintegration.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qxcbconnection.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qxcbconnection.cpp</a></td><td class='right'>780</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qxcbconnection.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qxcbconnection.h</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qxcbintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qxcbintegration.cpp</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qxcbintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qxcbintegration.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qxcbkeyboard.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qxcbkeyboard.cpp</a></td><td class='right'>973</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qxcbkeyboard.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qxcbkeyboard.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qxcbnativeinterface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qxcbnativeinterface.cpp</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qxcbnativeinterface.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qxcbnativeinterface.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qxcbobject.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qxcbobject.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qxcbscreen.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qxcbscreen.cpp</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qxcbscreen.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qxcbscreen.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qxcbwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qxcbwindow.cpp</a></td><td class='right'>683</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qxcbwindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qxcbwindow.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qxcbwindowsurface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qxcbwindowsurface.cpp</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/qxcbwindowsurface.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/qxcbwindowsurface.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xcb/xcb.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xcb/xcb.pro</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/main.cpp</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qglxintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qglxintegration.cpp</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qglxintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qglxintegration.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibclipboard.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibclipboard.cpp</a></td><td class='right'>677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibclipboard.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibclipboard.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibcursor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibcursor.cpp</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibcursor.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibcursor.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibdisplay.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibdisplay.cpp</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibdisplay.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibdisplay.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibintegration.cpp</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibintegration.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibkeyboard.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibkeyboard.cpp</a></td><td class='right'>1001</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibkeyboard.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibkeyboard.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibmime.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibmime.cpp</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibmime.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibmime.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibnativeinterface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibnativeinterface.cpp</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibnativeinterface.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibnativeinterface.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibscreen.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibscreen.cpp</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibscreen.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibscreen.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibstatic.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibstatic.cpp</a></td><td class='right'>508</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibstatic.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibstatic.h</a></td><td class='right'>417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibwindow.cpp</a></td><td class='right'>737</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibwindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibwindow.h</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibwindowsurface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibwindowsurface.cpp</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/qxlibwindowsurface.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/qxlibwindowsurface.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/platforms/xlib/xlib.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/platforms/xlib/xlib.pro</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/plugins.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/plugins.pro</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/declarativeobserver.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/declarativeobserver.pro</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/abstractliveedittool.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/abstractliveedittool.cpp</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/abstractliveedittool_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/abstractliveedittool_p.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/boundingrecthighlighter.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/boundingrecthighlighter.cpp</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/boundingrecthighlighter_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/boundingrecthighlighter_p.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/colorpickertool.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/colorpickertool.cpp</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/colorpickertool_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/colorpickertool_p.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/editor.qrc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/editor.qrc</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/color-picker-24.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/color-picker-24.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3440 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/color-picker-hicontrast.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/color-picker-hicontrast.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3192 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/color-picker.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/color-picker.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3173 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/from-qml-24.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/from-qml-24.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3395 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/from-qml.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/from-qml.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3205 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/observermode-24.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/observermode-24.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 1283 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/observermode.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/observermode.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3539 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/pause-24.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/pause-24.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3307 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/pause.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/pause.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3097 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/play-24.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/play-24.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3655 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/play.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/play.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3363 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/reload.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/reload.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3418 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/resize_handle.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/resize_handle.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 160 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/select-24.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/select-24.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3510 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/select-marquee-24.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/select-marquee-24.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 2891 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/select-marquee.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/select-marquee.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 2871 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/select.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/select.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3308 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/to-qml-24.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/to-qml-24.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3407 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/to-qml.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/to-qml.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3227 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/zoom-24.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/zoom-24.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3566 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/images/zoom.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/images/zoom.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 3347 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/livelayeritem.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/livelayeritem.cpp</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/livelayeritem_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/livelayeritem_p.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/liverubberbandselectionmanipulator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/liverubberbandselectionmanipulator.cpp</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/liverubberbandselectionmanipulator_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/liverubberbandselectionmanipulator_p.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/liveselectionindicator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/liveselectionindicator.cpp</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/liveselectionindicator_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/liveselectionindicator_p.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/liveselectionrectangle.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/liveselectionrectangle.cpp</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/liveselectionrectangle_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/liveselectionrectangle_p.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/liveselectiontool.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/liveselectiontool.cpp</a></td><td class='right'>438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/liveselectiontool_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/liveselectiontool_p.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/livesingleselectionmanipulator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/livesingleselectionmanipulator.cpp</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/livesingleselectionmanipulator_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/livesingleselectionmanipulator_p.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/qmltoolbar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/qmltoolbar.cpp</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/qmltoolbar_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/qmltoolbar_p.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/subcomponentmasklayeritem.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/subcomponentmasklayeritem.cpp</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/subcomponentmasklayeritem_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/subcomponentmasklayeritem_p.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/toolbarcolorbox.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/toolbarcolorbox.cpp</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/toolbarcolorbox_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/toolbarcolorbox_p.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/zoomtool.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/zoomtool.cpp</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/editor/zoomtool_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/editor/zoomtool_p.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/qdeclarativeobserverplugin.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/qdeclarativeobserverplugin.cpp</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/qdeclarativeobserverplugin.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/qdeclarativeobserverplugin.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/qdeclarativeobserverprotocol.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/qdeclarativeobserverprotocol.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver.cpp</a></td><td class='right'>1021</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p_p.h</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/declarativeobserver/qmlobserverconstants_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/declarativeobserver/qmlobserverconstants_p.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/qmldbg_ost/qostdevice.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/qmldbg_ost/qostdevice.cpp</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/qmldbg_ost/qostdevice.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/qmldbg_ost/qostdevice.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/qmltooling/qmltooling.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qmltooling/qmltooling.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/qpluginbase.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/qpluginbase.pri</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/s60/3_2/3_2.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/s60/3_2/3_2.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/s60/5_0/5_0.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/s60/5_0/5_0.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/plugins/s60/src/qlocale_3_2.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/plugins/s60/src/qlocale_3_2.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/qbase.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/qbase.pri</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/qt3support/qt3support.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/qt3support/qt3support.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/qt3support/text/q3richtext.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/qt3support/text/q3richtext.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/qt3support/text/q3textstream.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/qt3support/text/q3textstream.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/qt3support/tools/q3cstring.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/qt3support/tools/q3cstring.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/qt3support/tools/q3valuevector.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/qt3support/tools/q3valuevector.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/qt_install.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/qt_install.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/bwins/QtCoreu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/bwins/QtCoreu.def</a></td><td class='right'>425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/bwins/QtDeclarativeu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/bwins/QtDeclarativeu.def</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/bwins/QtGuiu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/bwins/QtGuiu.def</a></td><td class='right'>1284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/bwins/QtMultimediau.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/bwins/QtMultimediau.def</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/bwins/QtNetworku.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/bwins/QtNetworku.def</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/bwins/QtOpenGLu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/bwins/QtOpenGLu.def</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/bwins/QtOpenVGu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/bwins/QtOpenVGu.def</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/bwins/QtScriptu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/bwins/QtScriptu.def</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/bwins/QtSqlu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/bwins/QtSqlu.def</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/bwins/QtSvgu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/bwins/QtSvgu.def</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/bwins/QtTestu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/bwins/QtTestu.def</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/bwins/QtXmlPatternsu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/bwins/QtXmlPatternsu.def</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/bwins/QtXmlu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/bwins/QtXmlu.def</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/bwins/phononu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/bwins/phononu.def</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/eabi/QtCoreu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/eabi/QtCoreu.def</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/eabi/QtDeclarativeu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/eabi/QtDeclarativeu.def</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/eabi/QtGuiu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/eabi/QtGuiu.def</a></td><td class='right'>674</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/eabi/QtMultimediau.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/eabi/QtMultimediau.def</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/eabi/QtNetworku.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/eabi/QtNetworku.def</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/eabi/QtOpenGLu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/eabi/QtOpenGLu.def</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/eabi/QtOpenVGu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/eabi/QtOpenVGu.def</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/eabi/QtScriptu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/eabi/QtScriptu.def</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/eabi/QtSqlu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/eabi/QtSqlu.def</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/eabi/QtSvgu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/eabi/QtSvgu.def</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/eabi/QtTestu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/eabi/QtTestu.def</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/eabi/QtXmlPatternsu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/eabi/QtXmlPatternsu.def</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/eabi/phononu.def?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/eabi/phononu.def</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60installs/s60installs.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60installs/s60installs.pro</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60main/newallocator_hook.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60main/newallocator_hook.cpp</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60main/qts60main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60main/qts60main.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60main/qts60main_mcrt0.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60main/qts60main_mcrt0.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/s60main/s60main.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/s60main/s60main.pro</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/script/api/qscriptcontextinfo.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/script/api/qscriptcontextinfo.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/script/api/qscriptengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/script/api/qscriptengine.cpp</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/script/api/qscriptengine.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/script/api/qscriptengine.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/script/api/qscriptengineagent_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/script/api/qscriptengineagent_p.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/script/api/qscriptprogram.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/script/api/qscriptprogram.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/script/api/qscriptvalue.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/script/api/qscriptvalue.cpp</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/script/api/qscriptvalueiterator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/script/api/qscriptvalueiterator.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/script/bridge/qscriptclassobject.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/script/bridge/qscriptclassobject.cpp</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/script/bridge/qscriptqobject.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/script/bridge/qscriptqobject.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/script/script.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/script/script.pro</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/scripttools/debugging/qscriptdebuggercommand.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/scripttools/debugging/qscriptdebuggercommand.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/scripttools/debugging/qscriptdebuggerconsole.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/scripttools/debugging/qscriptdebuggerconsole.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/scripttools/debugging/qscriptdebuggerevent.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/scripttools/debugging/qscriptdebuggerevent.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/scripttools/debugging/qscriptdebuggerresponse.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/scripttools/debugging/qscriptdebuggerresponse.cpp</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/scripttools/debugging/qscriptdebugoutputwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/scripttools/debugging/qscriptdebugoutputwidget.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/scripttools/debugging/qscripterrorlogwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/scripttools/debugging/qscripterrorlogwidget.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/scripttools/scripttools.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/scripttools/scripttools.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/sql/drivers/mysql/qsql_mysql.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/sql/drivers/mysql/qsql_mysql.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/sql/drivers/oci/qsql_oci.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/sql/drivers/oci/qsql_oci.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/sql/drivers/odbc/qsql_odbc.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/sql/drivers/odbc/qsql_odbc.cpp</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/sql/drivers/psql/qsql_psql.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/sql/drivers/psql/qsql_psql.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/sql/drivers/sqlite/qsql_sqlite.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/sql/drivers/sqlite/qsql_sqlite.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/sql/drivers/sqlite2/qsql_sqlite2.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/sql/drivers/sqlite2/qsql_sqlite2.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/sql/kernel/qsqldatabase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/sql/kernel/qsqldatabase.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/sql/kernel/qsqldriver.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/sql/kernel/qsqldriver.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/sql/kernel/qsqlfield.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/sql/kernel/qsqlfield.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/sql/models/qsqlrelationaltablemodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/sql/models/qsqlrelationaltablemodel.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/sql/models/qsqltablemodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/sql/models/qsqltablemodel.cpp</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/sql/models/qsqltablemodel_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/sql/models/qsqltablemodel_p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/sql/sql.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/sql/sql.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/src.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/src.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/svg/svg.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/svg/svg.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qabstracttestlogger.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qabstracttestlogger.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qabstracttestlogger_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qabstracttestlogger_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qplaintestlogger.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qplaintestlogger.cpp</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qplaintestlogger_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qplaintestlogger_p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qtest.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qtest.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qtest_global.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qtest_global.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qtestcase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qtestcase.cpp</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qtestlightxmlstreamer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qtestlightxmlstreamer.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qtestlog.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qtestlog.cpp</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qtestlog_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qtestlog_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qtestlogger.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qtestlogger.cpp</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qtestlogger_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qtestlogger_p.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qtestmouse.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qtestmouse.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qtestresult.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qtestresult.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qtestxmlstreamer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qtestxmlstreamer.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qxmltestlogger.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qxmltestlogger.cpp</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/qxmltestlogger_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/qxmltestlogger_p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/testlib/testlib.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/testlib/testlib.pro</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/bootstrap/bootstrap.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/bootstrap/bootstrap.pri</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/bootstrap/bootstrap.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/bootstrap/bootstrap.pro</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/moc/generator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/moc/generator.cpp</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/moc/generator.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/moc/generator.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/moc/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/moc/main.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/moc/moc.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/moc/moc.cpp</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/moc/moc.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/moc/moc.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/moc/outputrevision.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/moc/outputrevision.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/moc/parser.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/moc/parser.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/moc/parser.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/moc/parser.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/moc/preprocessor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/moc/preprocessor.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/uic/cpp/cppwriteincludes.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/uic/cpp/cppwriteincludes.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/uic/cpp/cppwriteincludes.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/uic/cpp/cppwriteincludes.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/uic/cpp/cppwriteinitialization.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/uic/cpp/cppwriteinitialization.cpp</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/uic/cpp/cppwriteinitialization.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/uic/cpp/cppwriteinitialization.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/uic/ui4.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/uic/ui4.cpp</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/uic/ui4.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/uic/ui4.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/uic3/converter.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/uic3/converter.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/uic3/domtool.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/uic3/domtool.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/tools/uic3/domtool.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/tools/uic3/domtool.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xml/xml.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xml/xml.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/api/quriloader.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/api/quriloader.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/api/qvariableloader.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/api/qvariableloader.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/api/qxmlquery.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/api/qxmlquery.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/data/qatomicvalue.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/data/qatomicvalue.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/data/qitem_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/data/qitem_p.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/expr/qdynamiccontextstore.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/expr/qdynamiccontextstore.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/expr/qdynamiccontextstore_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/expr/qdynamiccontextstore_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/expr/qevaluationcache_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/expr/qevaluationcache_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/expr/qletclause.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/expr/qletclause.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/schema/qxsdattribute.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/schema/qxsdattribute.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/schema/qxsdattribute_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/schema/qxsdattribute_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/schema/qxsdcomplextype.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/schema/qxsdcomplextype.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/schema/qxsdcomplextype_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/schema/qxsdcomplextype_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/schema/qxsdelement.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/schema/qxsdelement.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/schema/qxsdelement_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/schema/qxsdelement_p.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/schema/qxsdparticlechecker.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/schema/qxsdparticlechecker.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/schema/qxsdsimpletype.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/schema/qxsdsimpletype.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/schema/qxsdsimpletype_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/schema/qxsdsimpletype_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/schema/qxsdstatemachinebuilder.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/schema/qxsdstatemachinebuilder.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/utils/qautoptr_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/utils/qautoptr_p.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/src/xmlpatterns/xmlpatterns.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>src/xmlpatterns/xmlpatterns.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/.gitignore?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/.gitignore</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/.gitignore?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/baselineserver/.gitignore?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/baselineserver/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/baselineserver/bin/runserver?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/baselineserver/bin/runserver</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/baselineserver/src/baselineserver.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/baselineserver/src/baselineserver.cpp</a></td><td class='right'>576</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/baselineserver/src/baselineserver.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/baselineserver/src/baselineserver.h</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/baselineserver/src/baselineserver.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/baselineserver/src/baselineserver.pro</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/baselineserver/src/baselineserver.qrc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/baselineserver/src/baselineserver.qrc</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/baselineserver/src/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/baselineserver/src/main.cpp</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/baselineserver/src/report.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/baselineserver/src/report.cpp</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/baselineserver/src/report.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/baselineserver/src/report.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/baselineserver/src/templates/view.html?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/baselineserver/src/templates/view.html</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/common/baselineprotocol.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/common/baselineprotocol.cpp</a></td><td class='right'>527</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/common/baselineprotocol.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/common/baselineprotocol.h</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/common/baselineprotocol.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/common/baselineprotocol.pri</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/common/lookup3.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/common/lookup3.cpp</a></td><td class='right'>786</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/arthur/common/paintcommands.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/common/paintcommands.cpp</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/arthur/common/paintcommands.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/common/paintcommands.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/common/qbaselinetest.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/common/qbaselinetest.cpp</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/common/qbaselinetest.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/common/qbaselinetest.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/common/qbaselinetest.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/common/qbaselinetest.pri</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/data/qps/radial_gradients_extended.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/data/qps/radial_gradients_extended.qps</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/arthur/data/qps/radial_gradients_extended_qps.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/data/qps/radial_gradients_extended_qps.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 107978 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/arthur/lance/lance.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/arthur/lance/lance.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/baselineexample/baselineexample.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/baselineexample/baselineexample.pro</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/baselineexample/tst_baselineexample.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/baselineexample/tst_baselineexample.cpp</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/checkxmlfiles/checkxmlfiles.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/checkxmlfiles/checkxmlfiles.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/collections/collections.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/collections/collections.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/collections/tst_collections.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/collections/tst_collections.cpp</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/corelib.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/corelib.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/dbus.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/dbus.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/declarative.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/declarative.pro</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/examples/examples.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/examples/examples.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/moduleqt47/moduleqt47.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/moduleqt47/moduleqt47.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/parserstress/parserstress.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/parserstress/parserstress.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativedom/qdeclarativedom.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeecmascript/data/realToInt.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeecmascript/data/realToInt.qml</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeinfo/qdeclarativeinfo.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/basic.html?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/basic.html</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/basic.ico?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/basic.ico</a></td><td class='right'>bin</td><td class='graph'>318 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/basic.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/basic.png</a></td><td class='right'>bin</td><td class='graph'>3961 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/basic.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/basic.qml</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/elements.html?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/elements.html</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/elements.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/elements.qml</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/forward.html?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/forward.html</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/forward.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/forward.png</a></td><td class='right'>bin</td><td class='graph'>2377 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/javaScript.html?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/javaScript.html</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/javaScript.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/javaScript.qml</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/loadError.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/loadError.qml</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/newwindows.html?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/newwindows.html</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/newwindows.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/newwindows.qml</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/pixelCache.html?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/pixelCache.html</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/pixelCache.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/pixelCache.qml</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/propertychanges.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/propertychanges.qml</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/data/sethtml.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/data/sethtml.qml</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp</a></td><td class='right'>520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qmlvisual/qmlvisual.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qmlvisual/qmlvisual.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/qperformancetimer/tst_qperformancetimer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/qperformancetimer/tst_qperformancetimer.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/declarative/symbianlibs.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/declarative/symbianlibs.pri</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/exceptionsafety/exceptionsafety.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/exceptionsafety/exceptionsafety.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/gestures/tst_gestures.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/gestures/tst_gestures.cpp</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/gui.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/gui.pro</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/guiapplauncher/guiapplauncher.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/guiapplauncher/guiapplauncher.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/guiapplauncher/tst_guiapplauncher.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/guiapplauncher/tst_guiapplauncher.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/headers/tst_headers.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/headers/tst_headers.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/.gitignore?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/lancelot.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/lancelot.pro</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/aliasing.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/aliasing.qps</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/arcs.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/arcs.qps</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/arcs2.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/arcs2.qps</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/background.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/background.qps</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/background_brush.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/background_brush.qps</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/beziers.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/beziers.qps</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/bitmaps.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/bitmaps.qps</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/borderimage.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/borderimage.qps</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/brush_pens.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/brush_pens.qps</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/brushes.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/brushes.qps</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/clippaths.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/clippaths.qps</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/clipping.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/clipping.qps</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/clipping_state.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/clipping_state.qps</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/cliprects.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/cliprects.qps</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/conical_gradients.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/conical_gradients.qps</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/conical_gradients_perspectives.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/conical_gradients_perspectives.qps</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/dashes.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/dashes.qps</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/degeneratebeziers.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/degeneratebeziers.qps</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/deviceclipping.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/deviceclipping.qps</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/drawpoints.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/drawpoints.qps</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/ellipses.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/ellipses.qps</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/filltest.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/filltest.qps</a></td><td class='right'>413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/gradients.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/gradients.qps</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/hinting.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/hinting.qps</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/image_formats.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/image_formats.qps</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/images.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/images.qps</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/images2.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/images2.qps</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/join_cap_styles.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/join_cap_styles.qps</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/join_cap_styles_duplicate_control_points.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/join_cap_styles_duplicate_control_points.qps</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/linear_gradients.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/linear_gradients.qps</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/linear_gradients_perspectives.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/linear_gradients_perspectives.qps</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/linear_resolving_gradients.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/linear_resolving_gradients.qps</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/lineconsistency.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/lineconsistency.qps</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/linedashes.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/linedashes.qps</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/linedashes2.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/linedashes2.qps</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/linedashes2_aa.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/linedashes2_aa.qps</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/lines.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/lines.qps</a></td><td class='right'>558</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/lines2.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/lines2.qps</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/pathfill.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/pathfill.qps</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/paths.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/paths.qps</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/paths_aa.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/paths_aa.qps</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/pens.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/pens.qps</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/pens_aa.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/pens_aa.qps</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/pens_cosmetic.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/pens_cosmetic.qps</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/perspectives.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/perspectives.qps</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/perspectives2.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/perspectives2.qps</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/pixmap_rotation.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/pixmap_rotation.qps</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/pixmap_scaling.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/pixmap_scaling.qps</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/pixmap_subpixel.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/pixmap_subpixel.qps</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/pixmaps.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/pixmaps.qps</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/porter_duff.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/porter_duff.qps</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/porter_duff2.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/porter_duff2.qps</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/primitives.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/primitives.qps</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/radial_gradients.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/radial_gradients.qps</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/radial_gradients_perspectives.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/radial_gradients_perspectives.qps</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/rasterops.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/rasterops.qps</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/sizes.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/sizes.qps</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/text.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/text.qps</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/text_perspectives.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/text_perspectives.qps</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/scripts/tiled_pixmap.qps?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/scripts/tiled_pixmap.qps</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/lancelot/tst_lancelot.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/lancelot/tst_lancelot.cpp</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/main.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/linguist/lupdate/testdata/good/parsejscontexts/main.js</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.pro</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.ts.result?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/linguist/lupdate/testdata/good/parsejscontexts/project.ts.result</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/macnativeevents/expectedeventlist.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/macnativeevents/expectedeventlist.cpp</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/macnativeevents/expectedeventlist.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/macnativeevents/expectedeventlist.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/macnativeevents/nativeeventlist.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/macnativeevents/nativeeventlist.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/macnativeevents/nativeeventlist.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/macnativeevents/nativeeventlist.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/macnativeevents/qnativeevents_mac.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/macnativeevents/qnativeevents_mac.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/macnativeevents/tst_macnativeevents.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/macnativeevents/tst_macnativeevents.cpp</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/mediaobject/mediaobject.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/mediaobject/mediaobject.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/moc/moc.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/moc/moc.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/moc/tst_moc.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/moc/tst_moc.cpp</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/modeltest/dynamictreemodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/modeltest/dynamictreemodel.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/modeltest/modeltest.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/modeltest/modeltest.cpp</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/modeltest/tst_modeltest.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/modeltest/tst_modeltest.cpp</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/network.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/network.pro</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/networkselftest/networkselftest.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/networkselftest/networkselftest.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/networkselftest/tst_networkselftest.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/networkselftest/tst_networkselftest.cpp</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/opengl.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/opengl.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/other.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/other.pro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/patternistexamples/patternistexamples.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/patternistexamples/patternistexamples.pro</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/platformsocketengine/.gitignore?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/platformsocketengine/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/Qt.git/diff/tests/auto/platformsocketengine/platformsocketengine.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/platformsocketengine/platformsocketengine.pri</a> (renamed from tests/auto/qnativesocketengine/qsocketengine.pri)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/platformsocketengine/platformsocketengine.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/platformsocketengine/platformsocketengine.pro</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/platformsocketengine/tst_platformsocketengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/platformsocketengine/tst_platformsocketengine.cpp</a></td><td class='right'>763</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/q3dns/tst_q3dns.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/q3dns/tst_q3dns.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/q3listview/tst_q3listview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/q3listview/tst_q3listview.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/q_func_info/q_func_info.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/q_func_info/q_func_info.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qabstractfileengine/qabstractfileengine.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qabstractfileengine/qabstractfileengine.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qabstractfileengine/qabstractfileengine.qrc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qabstractfileengine/qabstractfileengine.qrc</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qabstractfileengine/resources/file.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qabstractfileengine/resources/file.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp</a></td><td class='right'>794</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qabstractnetworkcache/qabstractnetworkcache.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qabstractnetworkcache/qabstractnetworkcache.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qabstractxmlnodemodel/LoadingModel.cpp</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qabstractxmlnodemodel/qabstractxmlnodemodel.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qaccessibility/qaccessibility.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qaccessibility/qaccessibility.pro</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qaccessibility/tst_qaccessibility.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qaccessibility/tst_qaccessibility.cpp</a></td><td class='right'>785</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qaction/tst_qaction.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qaction/tst_qaction.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qalgorithms/tst_qalgorithms.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qalgorithms/tst_qalgorithms.cpp</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qanimationgroup/qanimationgroup.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qanimationgroup/qanimationgroup.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qapplication/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qapplication/test/test.pro</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qatomicint/qatomicint.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qatomicint/qatomicint.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qatomicint/tst_qatomicint.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qatomicint/tst_qatomicint.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qatomicpointer/qatomicpointer.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qatomicpointer/qatomicpointer.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qatomicpointer/tst_qatomicpointer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qatomicpointer/tst_qatomicpointer.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qaudioinput/qaudioinput.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qaudioinput/qaudioinput.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qaudiooutput/qaudiooutput.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qaudiooutput/qaudiooutput.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qbitarray/qbitarray.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qbitarray/qbitarray.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qbitarray/tst_qbitarray.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qbitarray/tst_qbitarray.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qbrush/tst_qbrush.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qbrush/tst_qbrush.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qbuffer/qbuffer.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qbuffer/qbuffer.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qbuffer/tst_qbuffer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qbuffer/tst_qbuffer.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qbuttongroup/tst_qbuttongroup.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qbuttongroup/tst_qbuttongroup.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qbytearray/qbytearray.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qbytearray/qbytearray.pro</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qbytearray/tst_qbytearray.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qbytearray/tst_qbytearray.cpp</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qbytearraymatcher/qbytearraymatcher.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qbytearraymatcher/qbytearraymatcher.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qcache/qcache.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qcache/qcache.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qchar/qchar.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qchar/qchar.pro</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qchar/tst_qchar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qchar/tst_qchar.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qcheckbox/tst_qcheckbox.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qcheckbox/tst_qcheckbox.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qclipboard/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qclipboard/test/test.pro</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qclipboard/tst_qclipboard.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qclipboard/tst_qclipboard.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qcolor/tst_qcolor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qcolor/tst_qcolor.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qcombobox/tst_qcombobox.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qcombobox/tst_qcombobox.cpp</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qcompleter/tst_qcompleter.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qcompleter/tst_qcompleter.cpp</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qcomplextext/tst_qcomplextext.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qcomplextext/tst_qcomplextext.cpp</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qcontiguouscache/qcontiguouscache.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qcontiguouscache/qcontiguouscache.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qcontiguouscache/tst_qcontiguouscache.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qcontiguouscache/tst_qcontiguouscache.cpp</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qcopchannel/testSend/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qcopchannel/testSend/main.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qcoreapplication/qcoreapplication.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qcoreapplication/qcoreapplication.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qcryptographichash/qcryptographichash.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qcryptographichash/qcryptographichash.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qcssparser/qcssparser.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qcssparser/qcssparser.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdatastream/qdatastream.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdatastream/qdatastream.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdatastream/tst_qdatastream.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdatastream/tst_qdatastream.cpp</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdate/qdate.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdate/qdate.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdatetime/qdatetime.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdatetime/qdatetime.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdatetime/tst_qdatetime.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdatetime/tst_qdatetime.cpp</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusabstractadaptor/myobject.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusabstractadaptor/myobject.h</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusabstractadaptor/qdbusabstractadaptor.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusabstractadaptor/qdbusabstractadaptor.pro</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusabstractadaptor/qmyserver/qmyserver.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusabstractadaptor/qmyserver/qmyserver.cpp</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusabstractadaptor/qmyserver/qmyserver.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusabstractadaptor/qmyserver/qmyserver.pro</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusabstractadaptor/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusabstractadaptor/test/test.pro</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp</a></td><td class='right'>985</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusabstractinterface/com.trolltech.QtDBus.Pinger.xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusabstractinterface/com.trolltech.QtDBus.Pinger.xml</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusabstractinterface/interface.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusabstractinterface/interface.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusabstractinterface/qdbusabstractinterface.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusabstractinterface/qdbusabstractinterface.pro</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusabstractinterface/qpinger/qpinger.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusabstractinterface/qpinger/qpinger.cpp</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusabstractinterface/qpinger/qpinger.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusabstractinterface/qpinger/qpinger.pro</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusabstractinterface/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusabstractinterface/test/test.pro</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusabstractinterface/tst_qdbusabstractinterface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusabstractinterface/tst_qdbusabstractinterface.cpp</a></td><td class='right'>573</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusconnection/tst_qdbusconnection.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusconnection/tst_qdbusconnection.cpp</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusinterface/myobject.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusinterface/myobject.h</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusinterface/qdbusinterface.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusinterface/qdbusinterface.pro</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusinterface/qmyserver/qmyserver.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusinterface/qmyserver/qmyserver.cpp</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusinterface/qmyserver/qmyserver.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusinterface/qmyserver/qmyserver.pro</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusinterface/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusinterface/test/test.pro</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusinterface/tst_qdbusinterface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusinterface/tst_qdbusinterface.cpp</a></td><td class='right'>629</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusmarshall/common.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusmarshall/common.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusmarshall/qdbusmarshall.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusmarshall/qdbusmarshall.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusperformance/qdbusperformance.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusperformance/qdbusperformance.pro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdbusthreading/tst_qdbusthreading.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbusthreading/tst_qdbusthreading.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qdbustype/qdbustype.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbustype/qdbustype.pro</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qdbustype/tst_qdbustype.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdbustype/tst_qdbustype.cpp</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdebug/qdebug.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdebug/qdebug.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdesktopservices/qdesktopservices.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdesktopservices/qdesktopservices.pro</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdial/tst_qdial.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdial/tst_qdial.cpp</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdir/qdir.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdir/qdir.pro</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdir/tst_qdir.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdir/tst_qdir.cpp</a></td><td class='right'>415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdiriterator/qdiriterator.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdiriterator/qdiriterator.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdiriterator/tst_qdiriterator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdiriterator/tst_qdiriterator.cpp</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdirmodel/qdirmodel.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdirmodel/qdirmodel.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdirmodel/tst_qdirmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdirmodel/tst_qdirmodel.cpp</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdom/qdom.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdom/qdom.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qdom/tst_qdom.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qdom/tst_qdom.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qeasingcurve/qeasingcurve.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qeasingcurve/qeasingcurve.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qeasingcurve/tst_qeasingcurve.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qeasingcurve/tst_qeasingcurve.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qelapsedtimer/qelapsedtimer.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qelapsedtimer/qelapsedtimer.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qevent/qevent.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qevent/qevent.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qeventloop/qeventloop.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qeventloop/qeventloop.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qeventloop/tst_qeventloop.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qeventloop/tst_qeventloop.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qexplicitlyshareddatapointer/qexplicitlyshareddatapointer.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfile/largefile/largefile.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfile/largefile/largefile.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfile/largefile/tst_largefile.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfile/largefile/tst_largefile.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfile/qfile.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfile/qfile.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfile/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfile/test/test.pro</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfile/tst_qfile.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfile/tst_qfile.cpp</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfiledialog/qfiledialog.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfiledialog/qfiledialog.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qfiledialog/resources/file.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfiledialog/resources/file.txt</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfiledialog/tst_qfiledialog.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfiledialog/tst_qfiledialog.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfiledialog2/qfiledialog2.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfiledialog2/qfiledialog2.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfiledialog2/tst_qfiledialog2.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfiledialog2/tst_qfiledialog2.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfileinfo/qfileinfo.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfileinfo/qfileinfo.pro</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfileinfo/tst_qfileinfo.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfileinfo/tst_qfileinfo.cpp</a></td><td class='right'>401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qfileopenevent/qfileopenevent.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfileopenevent/qfileopenevent.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qfileopenevent/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfileopenevent/test/test.pro</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qfileopenevent/test/tst_qfileopenevent.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfileopenevent/test/tst_qfileopenevent.cpp</a></td><td class='right'>362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qfilesystementry/qfilesystementry.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfilesystementry/qfilesystementry.pro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qfilesystementry/tst_qfilesystementry.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfilesystementry/tst_qfilesystementry.cpp</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfilesystemmodel/qfilesystemmodel.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfilesystemmodel/qfilesystemmodel.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfilesystemwatcher/qfilesystemwatcher.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfilesystemwatcher/qfilesystemwatcher.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qflags/qflags.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qflags/qflags.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfont/tst_qfont.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfont/tst_qfont.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfontdatabase/qfontdatabase.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfontdatabase/qfontdatabase.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfontdatabase/tst_qfontdatabase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfontdatabase/tst_qfontdatabase.cpp</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfontmetrics/qfontmetrics.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfontmetrics/qfontmetrics.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qfontmetrics/testfont.qrc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfontmetrics/testfont.qrc</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfontmetrics/tst_qfontmetrics.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfontmetrics/tst_qfontmetrics.cpp</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qfontmetrics/ucs4font.ttf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfontmetrics/ucs4font.ttf</a></td><td class='right'>bin</td><td class='graph'>0 -> 3076 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qftp/qftp.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qftp/qftp.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qftp/tst_qftp.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qftp/tst_qftp.cpp</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfuture/qfuture.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfuture/qfuture.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfuture/tst_qfuture.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfuture/tst_qfuture.cpp</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfuture/versioncheck.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfuture/versioncheck.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfuturewatcher/qfuturewatcher.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfuturewatcher/qfuturewatcher.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgetputenv/qgetputenv.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgetputenv/qgetputenv.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgl/tst_qgl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgl/tst_qgl.cpp</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qglfunctions/qglfunctions.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qglfunctions/qglfunctions.pro</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qglfunctions/tst_qglfunctions.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qglfunctions/tst_qglfunctions.cpp</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qglobal/qglobal.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qglobal/qglobal.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qglthreads/tst_qglthreads.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qglthreads/tst_qglthreads.cpp</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qglthreads/tst_qglthreads.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qglthreads/tst_qglthreads.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qglyphrun/qglyphrun.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qglyphrun/qglyphrun.pro</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qglyphrun/test.ttf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qglyphrun/test.ttf</a></td><td class='right'>bin</td><td class='graph'>0 -> 3712 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qglyphrun/tst_qglyphrun.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qglyphrun/tst_qglyphrun.cpp</a></td><td class='right'>582</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicseffect/qgraphicseffect.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicseffect/qgraphicseffect.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp</a></td><td class='right'>507</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicsitemanimation/qgraphicsitemanimation.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicsitemanimation/qgraphicsitemanimation.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicslayout/qgraphicslayout.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicslayout/qgraphicslayout.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicslayoutitem/qgraphicslayoutitem.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicslayoutitem/qgraphicslayoutitem.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicsobject/qgraphicsobject.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicsobject/qgraphicsobject.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicspolygonitem/qgraphicspolygonitem.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicspolygonitem/qgraphicspolygonitem.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicsscene/qgraphicsscene.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicsscene/qgraphicsscene.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicstransform/qgraphicstransform.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicstransform/qgraphicstransform.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qgraphicsview/tst_qgraphicsview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qgraphicsview/tst_qgraphicsview.cpp</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qhash/qhash.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qhash/qhash.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qhash/tst_qhash.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qhash/tst_qhash.cpp</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qheaderview/tst_qheaderview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qheaderview/tst_qheaderview.cpp</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qhelpenginecore/qhelpenginecore.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qhelpenginecore/qhelpenginecore.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qhostaddress/tst_qhostaddress.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qhostaddress/tst_qhostaddress.cpp</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qhostinfo/tst_qhostinfo.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qhostinfo/tst_qhostinfo.cpp</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qhttp/qhttp.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qhttp/qhttp.pro</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qhttpsocketengine/qhttpsocketengine.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qhttpsocketengine/qhttpsocketengine.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qicoimageformat/qicoimageformat.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qicoimageformat/qicoimageformat.pro</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qicon/qicon.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qicon/qicon.pro</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qicon/tst_qicon.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qicon/tst_qicon.cpp</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qidentityproxymodel/qidentityproxymodel.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qidentityproxymodel/qidentityproxymodel.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qimage/qimage.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qimage/qimage.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qimage/tst_qimage.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qimage/tst_qimage.cpp</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qimagereader/images/txts.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qimagereader/images/txts.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 5413 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qimagereader/qimagereader.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qimagereader/qimagereader.pro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qimagereader/qimagereader.qrc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qimagereader/qimagereader.qrc</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qimagereader/tst_qimagereader.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qimagereader/tst_qimagereader.cpp</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qimagewriter/qimagewriter.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qimagewriter/qimagewriter.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qinputdialog/tst_qinputdialog.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qinputdialog/tst_qinputdialog.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qiodevice/qiodevice.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qiodevice/qiodevice.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qiodevice/tst_qiodevice.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qiodevice/tst_qiodevice.cpp</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qitemdelegate/tst_qitemdelegate.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qitemdelegate/tst_qitemdelegate.cpp</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qitemmodel/modelstotest.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qitemmodel/modelstotest.cpp</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qitemmodel/qitemmodel.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qitemmodel/qitemmodel.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qitemmodel/tst_qitemmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qitemmodel/tst_qitemmodel.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qitemview/tst_qitemview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qitemview/tst_qitemview.cpp</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qitemview/viewstotest.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qitemview/viewstotest.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qkeysequence/tst_qkeysequence.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qkeysequence/tst_qkeysequence.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qlabel/qlabel.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qlabel/qlabel.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qlayout/qlayout.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qlayout/qlayout.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qlibrary/qlibrary.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qlibrary/qlibrary.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qlibrary/tst/tst.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qlibrary/tst/tst.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qlibrary/tst_qlibrary.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qlibrary/tst_qlibrary.cpp</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qline/qline.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qline/qline.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qlineedit/tst_qlineedit.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qlineedit/tst_qlineedit.cpp</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qlist/tst_qlist.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qlist/tst_qlist.cpp</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qlistwidget/tst_qlistwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qlistwidget/tst_qlistwidget.cpp</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qlocale/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qlocale/test/test.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qlocale/tst_qlocale.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qlocale/tst_qlocale.cpp</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qlocalsocket/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qlocalsocket/test/test.pro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qlocalsocket/tst_qlocalsocket.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qlocalsocket/tst_qlocalsocket.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/main.cpp</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/simple.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/simple.pro</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/subdir.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/subdir.pro</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/subdir_via_pro_file_extra_target.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/subdir_via_pro_file_extra_target.pro</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmake/tst_qmake.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmake/tst_qmake.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmap/qmap.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmap/qmap.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmap/tst_qmap.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmap/tst_qmap.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmargins/qmargins.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmargins/qmargins.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmath/qmath.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmath/qmath.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmdiarea/tst_qmdiarea.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmdiarea/tst_qmdiarea.cpp</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmenu/tst_qmenu.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmenu/tst_qmenu.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmessagebox/tst_qmessagebox.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmessagebox/tst_qmessagebox.cpp</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmetaobject/tst_qmetaobject.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmetaobject/tst_qmetaobject.cpp</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmetatype/qmetatype.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmetatype/qmetatype.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmetatype/tst_qmetatype.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmetatype/tst_qmetatype.cpp</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qmovie/animations/corrupt.gif?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmovie/animations/corrupt.gif</a></td><td class='right'>bin</td><td class='graph'>0 -> 847 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmovie/qmovie.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmovie/qmovie.pro</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qmovie/resources.qrc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmovie/resources.qrc</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmovie/tst_qmovie.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmovie/tst_qmovie.cpp</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmutex/qmutex.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmutex/qmutex.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmutex/tst_qmutex.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmutex/tst_qmutex.cpp</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qmutexlocker/qmutexlocker.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qmutexlocker/qmutexlocker.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/qnativesocketengine/.gitignore?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnativesocketengine/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/qnativesocketengine/qnativesocketengine.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnativesocketengine/qnativesocketengine.pro</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp</a></td><td class='right'>705</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qnetworkcachemetadata/qnetworkcachemetadata.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnetworkcachemetadata/qnetworkcachemetadata.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qnetworkdiskcache/qnetworkdiskcache.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnetworkdiskcache/qnetworkdiskcache.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qnetworkproxyfactory/qnetworkproxyfactory.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnetworkproxyfactory/qnetworkproxyfactory.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qnetworkreply/image1.jpg?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnetworkreply/image1.jpg</a></td><td class='right'>bin</td><td class='graph'>0 -> 1045459 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qnetworkreply/image2.jpg?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnetworkreply/image2.jpg</a></td><td class='right'>bin</td><td class='graph'>0 -> 879218 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qnetworkreply/image3.jpg?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnetworkreply/image3.jpg</a></td><td class='right'>bin</td><td class='graph'>0 -> 887729 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qnetworkreply/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnetworkreply/test/test.pro</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qnetworkreply/tst_qnetworkreply.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnetworkreply/tst_qnetworkreply.cpp</a></td><td class='right'>1012</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qnumeric/qnumeric.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qnumeric/qnumeric.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qobject/qobject.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qobject/qobject.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qobject/signalbug.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qobject/signalbug.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qobject/tst_qobject.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qobject/tst_qobject.cpp</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qobject/tst_qobject.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qobject/tst_qobject.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qobjectrace/qobjectrace.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qobjectrace/qobjectrace.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qpainter/qpainter.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpainter/qpainter.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qpainter/tst_qpainter.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpainter/tst_qpainter.cpp</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qpainterpath/tst_qpainterpath.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpainterpath/tst_qpainterpath.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qpauseanimation/tst_qpauseanimation.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpauseanimation/tst_qpauseanimation.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qpen/tst_qpen.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpen/tst_qpen.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qpicture/tst_qpicture.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpicture/tst_qpicture.cpp</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qpixmap/qpixmap.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpixmap/qpixmap.pro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qpixmap/tst_qpixmap.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpixmap/tst_qpixmap.cpp</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qpixmapfilter/qpixmapfilter.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpixmapfilter/qpixmapfilter.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qplaintextedit/tst_qplaintextedit.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qplaintextedit/tst_qplaintextedit.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qplugin/qplugin.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qplugin/qplugin.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qplugin/tst_qplugin.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qplugin/tst_qplugin.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qpluginloader/elftest/.gitattributes?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpluginloader/elftest/.gitattributes</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qpluginloader/elftest/corrupt1.elf64.so?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpluginloader/elftest/corrupt1.elf64.so</a></td><td class='right'>bin</td><td class='graph'>0 -> 239745 bytes<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qpluginloader/elftest/corrupt2.elf64.so?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpluginloader/elftest/corrupt2.elf64.so</a></td><td class='right'>bin</td><td class='graph'>0 -> 240097 bytes<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qpluginloader/elftest/corrupt3.elf64.so?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpluginloader/elftest/corrupt3.elf64.so</a></td><td class='right'>bin</td><td class='graph'>0 -> 240097 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qpluginloader/elftest/debugobj.so?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpluginloader/elftest/debugobj.so</a></td><td class='right'>bin</td><td class='graph'>0 -> 507232 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qpluginloader/elftest/garbage1.so?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpluginloader/elftest/garbage1.so</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qpluginloader/elftest/garbage2.so?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpluginloader/elftest/garbage2.so</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qpluginloader/elftest/garbage3.so?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpluginloader/elftest/garbage3.so</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qpluginloader/elftest/garbage4.so?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpluginloader/elftest/garbage4.so</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qpluginloader/elftest/garbage5.so?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpluginloader/elftest/garbage5.so</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qpluginloader/qpluginloader.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpluginloader/qpluginloader.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qpluginloader/tst/tst.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpluginloader/tst/tst.pro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qpluginloader/tst_qpluginloader.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpluginloader/tst_qpluginloader.cpp</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qpoint/qpoint.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpoint/qpoint.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qpointer/tst_qpointer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpointer/tst_qpointer.cpp</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qpolygon/tst_qpolygon.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qpolygon/tst_qpolygon.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qprinterinfo/tst_qprinterinfo.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qprinterinfo/tst_qprinterinfo.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qprocess/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qprocess/test/test.pro</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qprocess/tst_qprocess.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qprocess/tst_qprocess.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qprocessenvironment/qprocessenvironment.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qprocessenvironment/qprocessenvironment.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qprocessenvironment/tst_qprocessenvironment.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qprocessenvironment/tst_qprocessenvironment.cpp</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qprogressbar/tst_qprogressbar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qprogressbar/tst_qprogressbar.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qqueue/qqueue.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qqueue/qqueue.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qradiobutton/tst_qradiobutton.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qradiobutton/tst_qradiobutton.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qrand/qrand.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qrand/qrand.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qrawfont/qrawfont.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qrawfont/qrawfont.pro</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qrawfont/testfont.ttf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qrawfont/testfont.ttf</a></td><td class='right'>bin</td><td class='graph'>0 -> 63212 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qrawfont/testfont_bold_italic.ttf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qrawfont/testfont_bold_italic.ttf</a></td><td class='right'>bin</td><td class='graph'>0 -> 49760 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qrawfont/tst_qrawfont.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qrawfont/tst_qrawfont.cpp</a></td><td class='right'>850</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qreadlocker/qreadlocker.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qreadlocker/qreadlocker.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qreadwritelock/qreadwritelock.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qreadwritelock/qreadwritelock.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qreadwritelock/tst_qreadwritelock.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qreadwritelock/tst_qreadwritelock.cpp</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qrect/qrect.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qrect/qrect.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qregexp/qregexp.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qregexp/qregexp.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qregexp/tst_qregexp.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qregexp/tst_qregexp.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qregion/tst_qregion.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qregion/tst_qregion.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qresourceengine/qresourceengine.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qresourceengine/qresourceengine.pro</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qringbuffer/qringbuffer.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qringbuffer/qringbuffer.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscopedpointer/qscopedpointer.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscopedpointer/qscopedpointer.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscopedvaluerollback/qscopedvaluerollback.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscopedvaluerollback/qscopedvaluerollback.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscopedvaluerollback/tst_qscopedvaluerollback.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscopedvaluerollback/tst_qscopedvaluerollback.cpp</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptable/tst_qscriptable.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptable/tst_qscriptable.cpp</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptclass/tst_qscriptclass.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptclass/tst_qscriptclass.cpp</a></td><td class='right'>893</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptcontext/tst_qscriptcontext.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptcontext/tst_qscriptcontext.cpp</a></td><td class='right'>576</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptengine/idtranslatable-unicode.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptengine/idtranslatable-unicode.js</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptengine/qscriptengine.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptengine/qscriptengine.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptengine/qscriptengine.qrc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptengine/qscriptengine.qrc</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptengine/translatable-unicode.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptengine/translatable-unicode.js</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptengine/translatable.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptengine/translatable.js</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptengine/translations/idtranslatable-unicode.qm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptengine/translations/idtranslatable-unicode.qm</a></td><td class='right'>bin</td><td class='graph'>0 -> 209 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptengine/translations/idtranslatable-unicode.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptengine/translations/idtranslatable-unicode.ts</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptengine/translations/translatable-unicode.qm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptengine/translations/translatable-unicode.qm</a></td><td class='right'>bin</td><td class='graph'>0 -> 322 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptengine/translations/translatable-unicode.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptengine/translations/translatable-unicode.ts</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptengine/translations/translatable_la.qm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptengine/translations/translatable_la.qm</a></td><td class='right'>bin</td><td class='graph'>678 -> 975 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptengine/translations/translatable_la.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptengine/translations/translatable_la.ts</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptengine/tst_qscriptengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptengine/tst_qscriptengine.cpp</a></td><td class='right'>1569</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptextensionplugin/qscriptextensionplugin.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptextensionplugin/qscriptextensionplugin.pro</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.cpp</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptextensionplugin/simpleplugin/simpleplugin.pro</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptextensionplugin/staticplugin/__init__.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptextensionplugin/staticplugin/__init__.js</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptextensionplugin/staticplugin/staticplugin.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptextensionplugin/staticplugin/staticplugin.cpp</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptextensionplugin/staticplugin/staticplugin.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptextensionplugin/staticplugin/staticplugin.pro</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptextensionplugin/staticplugin/staticplugin.qrc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptextensionplugin/staticplugin/staticplugin.qrc</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptextensionplugin/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptextensionplugin/test/test.pro</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptextensionplugin/tst_qscriptextensionplugin.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptextensionplugin/tst_qscriptextensionplugin.cpp</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptjstestsuite/expect_fail.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptjstestsuite/expect_fail.txt</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptjstestsuite/qscriptjstestsuite.qrc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptjstestsuite/qscriptjstestsuite.qrc</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptjstestsuite/skip.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptjstestsuite/skip.txt</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp</a></td><td class='right'>819</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptv8testsuite/abstracttestsuite.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptv8testsuite/abstracttestsuite.cpp</a></td><td class='right'>493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptv8testsuite/abstracttestsuite.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptv8testsuite/abstracttestsuite.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptv8testsuite/abstracttestsuite.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptv8testsuite/abstracttestsuite.pri</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptv8testsuite/expect_fail.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptv8testsuite/expect_fail.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptv8testsuite/qscriptv8testsuite.qrc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptv8testsuite/qscriptv8testsuite.qrc</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptv8testsuite/skip.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptv8testsuite/skip.txt</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp</a></td><td class='right'>384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvalue/qscriptvalue.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvalue/qscriptvalue.pro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvalue/testgen/data.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvalue/testgen/data.txt</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvalue/testgen/testgenerator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvalue/testgen/testgenerator.cpp</a></td><td class='right'>771</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvalue/testgen/testgenerator.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvalue/testgen/testgenerator.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvalue/tst_qscriptvalue.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvalue/tst_qscriptvalue.cpp</a></td><td class='right'>1929</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvalue/tst_qscriptvalue.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvalue/tst_qscriptvalue.h</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvalue/tst_qscriptvalue_generated_cast.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvalue/tst_qscriptvalue_generated_cast.cpp</a></td><td class='right'>1453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvalue/tst_qscriptvalue_generated_comparison.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvalue/tst_qscriptvalue_generated_comparison.cpp</a></td><td class='right'>7026</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 16.3%;'/><td class='none' style='width: 83.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvalue/tst_qscriptvalue_generated_init.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvalue/tst_qscriptvalue_generated_init.cpp</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvalue/tst_qscriptvalue_generated_isXXX.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvalue/tst_qscriptvalue_generated_isXXX.cpp</a></td><td class='right'>830</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvalue/tst_qscriptvalue_generated_toXXX.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvalue/tst_qscriptvalue_generated_toXXX.cpp</a></td><td class='right'>1897</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvaluegenerated/.gitignore?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvaluegenerated/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvaluegenerated/qscriptvaluegenerated.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvaluegenerated/qscriptvaluegenerated.pro</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvaluegenerated/testgen/data.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvaluegenerated/testgen/data.txt</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='mov'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvaluegenerated/testgen/gen.py?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvaluegenerated/testgen/gen.py</a> (renamed from tests/auto/qscriptvalue/testgen/gen.py)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvaluegenerated/testgen/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvaluegenerated/testgen/main.cpp</a> (renamed from tests/auto/qscriptvalue/testgen/main.cpp)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvaluegenerated/testgen/testgen.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvaluegenerated/testgen/testgen.pro</a> (renamed from tests/auto/qscriptvalue/testgen/testgen.pro)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvaluegenerated/testgen/testgenerator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvaluegenerated/testgen/testgenerator.cpp</a></td><td class='right'>813</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvaluegenerated/testgen/testgenerator.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvaluegenerated/testgen/testgenerator.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvaluegenerated/tst_qscriptvalue.cpp</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_cast.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_cast.cpp</a></td><td class='right'>1504</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_comparison.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_comparison.cpp</a></td><td class='right'>7542</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_init.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_init.cpp</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_isXXX.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_isXXX.cpp</a></td><td class='right'>862</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_toXXX.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_toXXX.cpp</a></td><td class='right'>1963</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qscriptvalueiterator/tst_qscriptvalueiterator.cpp</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsemaphore/qsemaphore.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsemaphore/qsemaphore.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsemaphore/tst_qsemaphore.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsemaphore/tst_qsemaphore.cpp</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsequentialanimationgroup/qsequentialanimationgroup.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsequentialanimationgroup/qsequentialanimationgroup.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qset/qset.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qset/qset.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qset/tst_qset.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qset/tst_qset.cpp</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsettings/qsettings.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsettings/qsettings.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsharedpointer/externaltests.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsharedpointer/externaltests.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsharedpointer/qsharedpointer.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsharedpointer/qsharedpointer.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsharedpointer/tst_qsharedpointer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsharedpointer/tst_qsharedpointer.cpp</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsignalspy/qsignalspy.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsignalspy/qsignalspy.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsize/qsize.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsize/qsize.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsizef/qsizef.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsizef/qsizef.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsocketnotifier/qsocketnotifier.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsocketnotifier/qsocketnotifier.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsocks5socketengine/qsocks5socketengine.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsocks5socketengine/qsocks5socketengine.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsound/qsound.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsound/qsound.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsound/tst_qsound.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsound/tst_qsound.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsplitter/qsplitter.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsplitter/qsplitter.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsplitter/tst_qsplitter.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsplitter/tst_qsplitter.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsql/qsql.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsql/qsql.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsqldatabase/qsqldatabase.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsqldatabase/qsqldatabase.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsqldatabase/tst_qsqldatabase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsqldatabase/tst_qsqldatabase.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsqldriver/qsqldriver.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsqldriver/qsqldriver.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsqlerror/qsqlerror.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsqlerror/qsqlerror.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsqlfield/qsqlfield.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsqlfield/qsqlfield.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsqlquery/qsqlquery.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsqlquery/qsqlquery.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsqlquery/tst_qsqlquery.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsqlquery/tst_qsqlquery.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsqlquerymodel/qsqlquerymodel.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsqlquerymodel/qsqlquerymodel.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsqlrecord/qsqlrecord.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsqlrecord/qsqlrecord.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsqltablemodel/qsqltablemodel.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsqltablemodel/qsqltablemodel.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsqlthread/qsqlthread.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsqlthread/qsqlthread.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qsslcertificate/certificates/cert-ss-san-utf8.pem?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsslcertificate/certificates/cert-ss-san-utf8.pem</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qsslcertificate/certificates/cert-ss-san-utf8.pem.san?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsslcertificate/certificates/cert-ss-san-utf8.pem.san</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsslcertificate/certificates/gencertificates.sh?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsslcertificate/certificates/gencertificates.sh</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsslcertificate/qsslcertificate.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsslcertificate/qsslcertificate.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsslcertificate/tst_qsslcertificate.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsslcertificate/tst_qsslcertificate.cpp</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsslkey/qsslkey.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsslkey/qsslkey.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsslkey/tst_qsslkey.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsslkey/tst_qsslkey.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsslsocket/qsslsocket.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsslsocket/qsslsocket.pro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsslsocket/tst_qsslsocket.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsslsocket/tst_qsslsocket.cpp</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstate/qstate.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstate/qstate.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstatemachine/tst_qstatemachine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstatemachine/tst_qstatemachine.cpp</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstatictext/tst_qstatictext.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstatictext/tst_qstatictext.cpp</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstl/qstl.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstl/qstl.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstring/qstring.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstring/qstring.pro</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstring/tst_qstring.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstring/tst_qstring.cpp</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstringbuilder1/qstringbuilder1.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstringbuilder1/qstringbuilder1.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstringbuilder1/stringbuilder.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstringbuilder1/stringbuilder.cpp</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstringbuilder2/qstringbuilder2.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstringbuilder2/qstringbuilder2.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstringbuilder3/qstringbuilder3.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstringbuilder3/qstringbuilder3.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstringbuilder4/qstringbuilder4.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstringbuilder4/qstringbuilder4.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstringlist/qstringlist.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstringlist/qstringlist.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstringlist/tst_qstringlist.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstringlist/tst_qstringlist.cpp</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstringmatcher/qstringmatcher.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstringmatcher/qstringmatcher.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qstringref/qstringref.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstringref/qstringref.pro</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qstringref/tst_qstringref.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstringref/tst_qstringref.cpp</a></td><td class='right'>881</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstyle/qstyle.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstyle/qstyle.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsvggenerator/qsvggenerator.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsvggenerator/qsvggenerator.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qsvgrenderer/qsvgrenderer.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qsvgrenderer/qsvgrenderer.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtabbar/tst_qtabbar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtabbar/tst_qtabbar.cpp</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtableview/tst_qtableview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtableview/tst_qtableview.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtablewidget/tst_qtablewidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtablewidget/tst_qtablewidget.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtabwidget/tst_qtabwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtabwidget/tst_qtabwidget.cpp</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtconcurrentfilter/qtconcurrentfilter.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtconcurrentfilter/qtconcurrentfilter.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtconcurrentmap/qtconcurrentmap.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtconcurrentmap/qtconcurrentmap.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtconcurrentmap/tst_qtconcurrentmap.cpp</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtconcurrentrun/qtconcurrentrun.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtconcurrentrun/qtconcurrentrun.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtconcurrentrun/tst_qtconcurrentrun.cpp</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtconcurrentthreadengine/qtconcurrentthreadengine.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtconcurrentthreadengine/qtconcurrentthreadengine.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtcpserver/crashingServer/crashingServer.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtcpserver/crashingServer/crashingServer.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtcpserver/qtcpserver.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtcpserver/qtcpserver.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtcpserver/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtcpserver/test/test.pro</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtcpserver/tst_qtcpserver.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtcpserver/tst_qtcpserver.cpp</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtcpsocket/qtcpsocket.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtcpsocket/qtcpsocket.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtcpsocket/stressTest/stressTest.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtcpsocket/stressTest/stressTest.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtcpsocket/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtcpsocket/test/test.pro</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtcpsocket/tst_qtcpsocket.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtcpsocket/tst_qtcpsocket.cpp</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtemporaryfile/qtemporaryfile.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtemporaryfile/qtemporaryfile.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtemporaryfile/tst_qtemporaryfile.cpp</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtessellator/dataparser.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtessellator/dataparser.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtessellator/oldtessellator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtessellator/oldtessellator.cpp</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtessellator/testtessellator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtessellator/testtessellator.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtextbrowser/qtextbrowser.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtextbrowser/qtextbrowser.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtextcodec/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtextcodec/test/test.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtextcodec/tst_qtextcodec.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtextcodec/tst_qtextcodec.cpp</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtextdocument/tst_qtextdocument.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtextdocument/tst_qtextdocument.cpp</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtextedit/qtextedit.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtextedit/qtextedit.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtextedit/tst_qtextedit.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtextedit/tst_qtextedit.cpp</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtextlayout/tst_qtextlayout.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtextlayout/tst_qtextlayout.cpp</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtextlist/tst_qtextlist.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtextlist/tst_qtextlist.cpp</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtextstream/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtextstream/test/test.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtextstream/tst_qtextstream.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtextstream/tst_qtextstream.cpp</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qthread/qthread.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qthread/qthread.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qthread/tst_qthread.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qthread/tst_qthread.cpp</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qthreadonce/qthreadonce.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qthreadonce/qthreadonce.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qthreadpool/qthreadpool.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qthreadpool/qthreadpool.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qthreadpool/tst_qthreadpool.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qthreadpool/tst_qthreadpool.cpp</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qthreadstorage/qthreadstorage.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qthreadstorage/qthreadstorage.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qthreadstorage/tst_qthreadstorage.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qthreadstorage/tst_qthreadstorage.cpp</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtime/qtime.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtime/qtime.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtimeline/qtimeline.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtimeline/qtimeline.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtimer/qtimer.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtimer/qtimer.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtimer/tst_qtimer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtimer/tst_qtimer.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtipc/qsharedmemory/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtipc/qsharedmemory/test/test.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtmd5/qtmd5.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtmd5/qtmd5.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtokenautomaton/qtokenautomaton.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtokenautomaton/qtokenautomaton.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtranslator/qtranslator.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtranslator/qtranslator.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qtreeview/tst_qtreeview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qtreeview/tst_qtreeview.cpp</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qudpsocket/clientserver/clientserver.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qudpsocket/clientserver/clientserver.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qudpsocket/qudpsocket.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qudpsocket/qudpsocket.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qudpsocket/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qudpsocket/test/test.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qudpsocket/tst_qudpsocket.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qudpsocket/tst_qudpsocket.cpp</a></td><td class='right'>497</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qundogroup/testdata/qundogroup.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qundogroup/testdata/qundogroup.ts</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qundogroup/tst_qundogroup.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qundogroup/tst_qundogroup.cpp</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/qundostack/testdata/qundostack.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qundostack/testdata/qundostack.ts</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qundostack/tst_qundostack.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qundostack/tst_qundostack.cpp</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qurl/qurl.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qurl/qurl.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qurl/tst_qurl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qurl/tst_qurl.cpp</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/quuid/quuid.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/quuid/quuid.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/quuid/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/quuid/test/test.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/quuid/tst_quuid.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/quuid/tst_quuid.cpp</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qvariant/tst_qvariant.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qvariant/tst_qvariant.cpp</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qvarlengtharray/qvarlengtharray.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qvarlengtharray/qvarlengtharray.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qvector/qvector.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qvector/qvector.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qvector/tst_qvector.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qvector/tst_qvector.cpp</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qwaitcondition/qwaitcondition.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qwaitcondition/qwaitcondition.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qwidget/tst_qwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qwidget/tst_qwidget.cpp</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qwidget/tst_qwidget_mac_helpers.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qwidget/tst_qwidget_mac_helpers.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qwidget/tst_qwidget_mac_helpers.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qwidget/tst_qwidget_mac_helpers.mm</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qwindowsurface/tst_qwindowsurface.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qwindowsurface/tst_qwindowsurface.cpp</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qwineventnotifier/qwineventnotifier.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qwineventnotifier/qwineventnotifier.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qwizard/tst_qwizard.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qwizard/tst_qwizard.cpp</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qwritelocker/qwritelocker.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qwritelocker/qwritelocker.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qxml/qxml.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qxml/qxml.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qxmlformatter/qxmlformatter.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qxmlformatter/qxmlformatter.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qxmlquery/MessageValidator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qxmlquery/MessageValidator.cpp</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qxmlquery/NetworkOverrider.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qxmlquery/NetworkOverrider.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qxmlquery/PushBaseliner.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qxmlquery/PushBaseliner.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qxmlquery/qxmlquery.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qxmlquery/qxmlquery.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qxmlquery/tst_qxmlquery.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qxmlquery/tst_qxmlquery.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qxmlsimplereader/qxmlsimplereader.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qxmlsimplereader/qxmlsimplereader.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qxmlstream/qc14n.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qxmlstream/qc14n.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qxmlstream/qxmlstream.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qxmlstream/qxmlstream.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qxmlstream/tst_qxmlstream.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qxmlstream/tst_qxmlstream.cpp</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/qzip/qzip.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/qzip/qzip.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/script.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/script.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/selftests/alive/qtestalive.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/selftests/alive/qtestalive.cpp</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/selftests/expected_cmptest.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/selftests/expected_cmptest.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/selftests/expected_crashes_3.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/selftests/expected_crashes_3.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/selftests/expected_longstring.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/selftests/expected_longstring.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/selftests/expected_maxwarnings.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/selftests/expected_maxwarnings.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/selftests/expected_skip.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/selftests/expected_skip.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/selftests/selftests.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/selftests/selftests.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/selftests/tst_selftests.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/selftests/tst_selftests.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/symbols/tst_symbols.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/symbols/tst_symbols.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/uic/baseline/gridalignment.ui?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/uic/baseline/gridalignment.ui</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/uic/baseline/gridalignment.ui.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/uic/baseline/gridalignment.ui.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/uic/baseline/icontheme.ui?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/uic/baseline/icontheme.ui</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/auto/uic/baseline/icontheme.ui.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/uic/baseline/icontheme.ui.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/uiloader/uiloader/uiloader.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/uiloader/uiloader/uiloader.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/utf8/tst_utf8.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/utf8/tst_utf8.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/utf8/utf8.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/utf8/utf8.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/windowsmobile/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/windowsmobile/test/test.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/xmlpatterns.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/xmlpatterns.pri</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/xmlpatterns/stderrBaselines/Passhelp.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/xmlpatterns/stderrBaselines/Passhelp.txt</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/xmlpatterns/tst_xmlpatterns.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/xmlpatterns/tst_xmlpatterns.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/xmlpatternsview/xmlpatternsview.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/xmlpatternsview/xmlpatternsview.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/xmlpatternsxqts/tst_suitetest.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/xmlpatternsxqts/tst_suitetest.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/auto/xmlpatternsxslts/xmlpatternsxslts.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/benchmarks.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/benchmarks.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/codecs/qtextcodec/qtextcodec.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/corelib.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/corelib.pro</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/io/qdir/qdir.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/io/qdir/qdir.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.cpp</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/io/qfile/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/io/qfile/main.cpp</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/io/qfileinfo/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/io/qfileinfo/main.cpp</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/plugin/quuid/tst_quuid.cpp</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/thread/qmutex/qmutex.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/thread/qmutex/qmutex.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/thread/qwaitcondition/qwaitcondition.pro</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/tools/qhash/data.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/tools/qhash/data.txt</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/tools/qhash/outofline.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/tools/qhash/outofline.cpp</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/tools/qhash/qhash.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/tools/qhash/qhash.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/tools/qhash/qhash_string.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/tools/qhash/qhash_string.cpp</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/tools/qhash/qhash_string.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/tools/qhash/qhash_string.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/tools/qstring/data.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/tools/qstring/data.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/tools/qstring/fromlatin1.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/tools/qstring/fromlatin1.cpp</a></td><td class='right'>43065</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 100.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/tools/qstring/fromutf8.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/tools/qstring/fromutf8.cpp</a></td><td class='right'>28567</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 66.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 33.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/tools/qstring/generatelist_char.pl?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/tools/qstring/generatelist_char.pl</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/tools/qstring/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/tools/qstring/main.cpp</a></td><td class='right'>1216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/corelib/tools/qstring/qstring.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/corelib/tools/qstring/qstring.pro</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/dbus/dbus.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/dbus/dbus.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/Qt.git/diff/tests/benchmarks/dbus/qdbusperformance/.gitignore?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/dbus/qdbusperformance/.gitignore</a> (renamed from tests/auto/qdbusperformance/.gitignore)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/Qt.git/diff/tests/benchmarks/dbus/qdbusperformance/server/server.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/dbus/qdbusperformance/server/server.cpp</a> (renamed from tests/auto/qdbusperformance/server/server.cpp)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/Qt.git/diff/tests/benchmarks/dbus/qdbusperformance/server/server.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/dbus/qdbusperformance/server/server.pro</a> (renamed from tests/auto/qdbusperformance/server/server.pro)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/Qt.git/diff/tests/benchmarks/dbus/qdbusperformance/serverobject.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/dbus/qdbusperformance/serverobject.h</a> (renamed from tests/auto/qdbusperformance/serverobject.h)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/Qt.git/diff/tests/benchmarks/dbus/qdbusperformance/test/test.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/dbus/qdbusperformance/test/test.pro</a> (renamed from tests/auto/qdbusperformance/test/test.pro)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/Qt.git/diff/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp</a> (renamed from tests/auto/qdbusperformance/tst_qdbusperformance.cpp)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/dbus/qdbustype/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/dbus/qdbustype/main.cpp</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/dbus/qdbustype/qdbustype.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/dbus/qdbustype/qdbustype.pro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/declarative/binding/binding.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/declarative/binding/binding.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/declarative/compilation/compilation.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/declarative/compilation/compilation.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/declarative/creation/creation.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/declarative/creation/creation.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/declarative/declarative.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/declarative/declarative.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/declarative/qmltime/qmltime.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/declarative/qmltime/qmltime.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/declarative/qperformancetimer/tst_qperformancetimer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/declarative/qperformancetimer/tst_qperformancetimer.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/declarative/script/script.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/declarative/script/script.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/declarative/script/tst_script.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/declarative/script/tst_script.cpp</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/declarative/typeimports/typeimports.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/declarative/typeimports/typeimports.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/gui/gui.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/gui/gui.pro</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/gui/image/blendbench/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/gui/image/blendbench/main.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/gui/image/qimagereader/qimagereader.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/gui/image/qimagereader/qimagereader.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/gui/kernel/qguimetatype/qguimetatype.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/gui/kernel/qguimetatype/qguimetatype.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/gui/kernel/qguivariant/qguivariant.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/gui/kernel/qguivariant/qguivariant.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/gui/kernel/qguivariant/tst_qguivariant.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/gui/kernel/qguivariant/tst_qguivariant.cpp</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/gui/painting/qpainter/qpainter.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/gui/painting/qpainter/qpainter.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/gui/text/qtext/qtext.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/gui/text/qtext/qtext.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/network/access/access.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/network/access/access.pro</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp</a></td><td class='right'>435</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/network/network.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/network/network.pro</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/network/ssl/qsslsocket/tst_qsslsocket.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/network/ssl/qsslsocket/tst_qsslsocket.cpp</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/opengl/opengl.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/opengl/opengl.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/context2d/context2d.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/context2d/context2d.pro</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/context2d/tst_context2d.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/context2d/tst_context2d.cpp</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.qrc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.qrc</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptclass_bytearray/tests/construct-copy.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptclass_bytearray/tests/construct-copy.js</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptclass_bytearray/tests/construct.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptclass_bytearray/tests/construct.js</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptclass_bytearray/tests/for-in.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptclass_bytearray/tests/for-in.js</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptclass_bytearray/tests/get-element.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptclass_bytearray/tests/get-element.js</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptclass_bytearray/tests/get-length.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptclass_bytearray/tests/get-length.js</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptclass_bytearray/tests/mid.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptclass_bytearray/tests/mid.js</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptclass_bytearray/tests/set-element.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptclass_bytearray/tests/set-element.js</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptclass_bytearray/tests/set-length.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptclass_bytearray/tests/set-length.js</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptclass_bytearray/tests/sum.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptclass_bytearray/tests/sum.js</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptclass_bytearray/tests/trimmed.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptclass_bytearray/tests/trimmed.js</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptclass_bytearray/tst_qscriptclass_bytearray.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptclass_bytearray/tst_qscriptclass_bytearray.cpp</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptqobject/qscriptqobject.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptqobject/qscriptqobject.pro</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptqobject/tst_qscriptqobject.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptqobject/tst_qscriptqobject.cpp</a></td><td class='right'>1265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptvalue/tst_qscriptvalue.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptvalue/tst_qscriptvalue.cpp</a></td><td class='right'>862</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/qscriptvalueiterator/qscriptvalueiterator.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/qscriptvalueiterator/qscriptvalueiterator.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/script.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/script.pro</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/sunspider.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/sunspider.pro</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/sunspider.qrc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/sunspider.qrc</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/3d-cube.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/3d-cube.js</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/3d-morph.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/3d-morph.js</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/3d-raytrace.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/3d-raytrace.js</a></td><td class='right'>441</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/VERSION?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/VERSION</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/access-binary-trees.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/access-binary-trees.js</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/access-fannkuch.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/access-fannkuch.js</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/access-nbody.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/access-nbody.js</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/access-nsieve.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/access-nsieve.js</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/bitops-3bit-bits-in-byte.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/bitops-3bit-bits-in-byte.js</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/bitops-bits-in-byte.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/bitops-bits-in-byte.js</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/bitops-bitwise-and.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/bitops-bitwise-and.js</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/bitops-nsieve-bits.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/bitops-nsieve-bits.js</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/controlflow-recursive.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/controlflow-recursive.js</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/crypto-aes.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/crypto-aes.js</a></td><td class='right'>422</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/crypto-md5.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/crypto-md5.js</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/crypto-sha1.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/crypto-sha1.js</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/date-format-tofte.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/date-format-tofte.js</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/date-format-xparb.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/date-format-xparb.js</a></td><td class='right'>417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/math-cordic.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/math-cordic.js</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/math-partial-sums.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/math-partial-sums.js</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/math-spectral-norm.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/math-spectral-norm.js</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/regexp-dna.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/regexp-dna.js</a></td><td class='right'>1712</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/string-base64.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/string-base64.js</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/string-fasta.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/string-fasta.js</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/string-tagcloud.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/string-tagcloud.js</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/string-unpack-code.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/string-unpack-code.js</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tests/string-validate-input.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tests/string-validate-input.js</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/sunspider/tst_sunspider.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/sunspider/tst_sunspider.cpp</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/v8/tests/README.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/v8/tests/README.txt</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/v8/tests/base.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/v8/tests/base.js</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/v8/tests/crypto.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/v8/tests/crypto.js</a></td><td class='right'>1698</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/v8/tests/deltablue.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/v8/tests/deltablue.js</a></td><td class='right'>880</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/v8/tests/earley-boyer.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/v8/tests/earley-boyer.js</a></td><td class='right'>4684</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/v8/tests/raytrace.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/v8/tests/raytrace.js</a></td><td class='right'>904</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/v8/tests/regexp.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/v8/tests/regexp.js</a></td><td class='right'>1764</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/v8/tests/richards.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/v8/tests/richards.js</a></td><td class='right'>539</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/v8/tests/splay.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/v8/tests/splay.js</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/v8/tst_v8.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/v8/tst_v8.cpp</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/v8/v8.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/v8/v8.pro</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/script/v8/v8.qrc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/script/v8/v8.qrc</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/benchmarks/svg/svg.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/svg/svg.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/benchmarks/trusted-benchmarks.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/benchmarks/trusted-benchmarks.pri</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/mkspecs/.gitignore?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/mkspecs/.gitignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/mkspecs/test.sh?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/mkspecs/test.sh</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/calendar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/calendar.cpp</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/calendar.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/calendar.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/currency.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/currency.cpp</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/currency.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/currency.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/dateformats.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/dateformats.cpp</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/dateformats.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/dateformats.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/info.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/info.cpp</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/info.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/info.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/languages.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/languages.cpp</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/languages.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/languages.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/main.cpp</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/miscellaneous.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/miscellaneous.cpp</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/miscellaneous.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/miscellaneous.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/numberformats.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/numberformats.cpp</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/numberformats.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/numberformats.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/qlocale.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/qlocale.pro</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/window.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/window.cpp</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/qlocale/window.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/qlocale/window.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/socketengine/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/socketengine/main.cpp</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tests/manual/socketengine/socketengine.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/socketengine/socketengine.pro</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/manual/textrendering/glyphshaping/glyphshaping.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/manual/textrendering/glyphshaping/glyphshaping.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tests/shared/filesystem.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tests/shared/filesystem.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/activeqt/dumpcpp/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/activeqt/dumpcpp/main.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/activeqt/testcon/changeproperties.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/activeqt/testcon/changeproperties.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/lib/fulltextsearch/fulltextsearch.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/lib/fulltextsearch/fulltextsearch.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/lib/fulltextsearch/qanalyzer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/lib/fulltextsearch/qanalyzer.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/lib/lib.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/lib/lib.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/lib/qhelpsearchquerywidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/lib/qhelpsearchquerywidget.cpp</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/lib/qhelpsearchquerywidget.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/lib/qhelpsearchquerywidget.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/aboutdialog.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/aboutdialog.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/assistant.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/assistant.pro</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/assistant_images.qrc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/assistant_images.qrc</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/bookmarkfiltermodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/bookmarkfiltermodel.cpp</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/bookmarkmanager.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/bookmarkmanager.cpp</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/bookmarkmanager.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/bookmarkmanager.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/bookmarkmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/bookmarkmodel.cpp</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/centralwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/centralwidget.cpp</a></td><td class='right'>1112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/centralwidget.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/centralwidget.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/contentwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/contentwindow.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/contentwindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/contentwindow.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/doc/assistant.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/doc/assistant.qdocconf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/findwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/findwidget.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/findwidget.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/findwidget.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/globalactions.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/globalactions.cpp</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/globalactions.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/globalactions.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/helpenginewrapper.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/helpenginewrapper.cpp</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/helpenginewrapper.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/helpenginewrapper.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/helpviewer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/helpviewer.cpp</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/helpviewer.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/helpviewer.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/helpviewer_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/helpviewer_p.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/helpviewer_qtb.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/helpviewer_qtb.cpp</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/helpviewer_qtb.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/helpviewer_qtb.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/helpviewer_qwv.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/helpviewer_qwv.cpp</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/helpviewer_qwv.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/helpviewer_qwv.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/images/closebutton.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/images/closebutton.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 288 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/images/darkclosebutton.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/images/darkclosebutton.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 319 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/indexwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/indexwindow.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/main.cpp</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/mainwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/mainwindow.cpp</a></td><td class='right'>521</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/mainwindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/mainwindow.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/openpagesmanager.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/openpagesmanager.cpp</a></td><td class='right'>378</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/openpagesmanager.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/openpagesmanager.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/openpagesmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/openpagesmodel.cpp</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/openpagesmodel.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/openpagesmodel.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/openpagesswitcher.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/openpagesswitcher.cpp</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/openpagesswitcher.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/openpagesswitcher.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/openpageswidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/openpageswidget.cpp</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/openpageswidget.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/openpageswidget.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/preferencesdialog.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/preferencesdialog.cpp</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/preferencesdialog.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/preferencesdialog.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/preferencesdialog.ui?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/preferencesdialog.ui</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/remotecontrol.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/remotecontrol.cpp</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/searchwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/searchwidget.cpp</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/assistant/searchwidget.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/assistant/searchwidget.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/qcollectiongenerator/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/qcollectiongenerator/main.cpp</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/shared/collectionconfiguration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/shared/collectionconfiguration.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/assistant/tools/shared/collectionconfiguration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/assistant/tools/shared/collectionconfiguration.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/configure/configure.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/configure/configure.pro</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/configure/configureapp.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/configure/configureapp.cpp</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/configure/environment.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/configure/environment.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/configure/environment.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/configure/environment.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/data/ui4.xsd?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/data/ui4.xsd</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/buddyeditor/buddyeditor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/buddyeditor/buddyeditor.cpp</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/formeditor/dpi_chooser.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/formeditor/dpi_chooser.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/formeditor/formeditor.qrc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/formeditor/formeditor.qrc</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/formeditor/formwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/formeditor/formwindow.cpp</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/formeditor/images/mac/simplifyrichtext.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/formeditor/images/mac/simplifyrichtext.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 1988 bytes<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/formeditor/images/win/simplifyrichtext.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/formeditor/images/win/simplifyrichtext.png</a></td><td class='right'>bin</td><td class='graph'>0 -> 1933 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/formeditor/qdesigner_resource.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/formeditor/qdesigner_resource.cpp</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/formeditor/qmainwindow_container.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/formeditor/qmainwindow_container.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/lib/lib.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/lib/lib.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/objectinspector/objectinspectormodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/objectinspector/objectinspectormodel.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/propertyeditor/brushpropertymanager.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/propertyeditor/brushpropertymanager.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/propertyeditor/designerpropertymanager.cpp</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/propertyeditor/designerpropertymanager.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/propertyeditor/designerpropertymanager.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/propertyeditor/fontpropertymanager.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/propertyeditor/fontpropertymanager.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/propertyeditor/paletteeditor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/propertyeditor/paletteeditor.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/propertyeditor/propertyeditor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/propertyeditor/propertyeditor.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/signalsloteditor/connectdialog.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/signalsloteditor/connectdialog.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/signalsloteditor/signalslot_utils.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/signalsloteditor/signalsloteditor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/signalsloteditor/signalsloteditor.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/tabordereditor/tabordereditor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/tabordereditor/tabordereditor.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/taskmenu/button_taskmenu.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/taskmenu/button_taskmenu.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/taskmenu/inplace_editor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/taskmenu/inplace_editor.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/taskmenu/itemlisteditor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/taskmenu/itemlisteditor.cpp</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/taskmenu/itemlisteditor.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/taskmenu/itemlisteditor.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/taskmenu/listwidgeteditor.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/taskmenu/listwidgeteditor.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/taskmenu/tablewidgeteditor.cpp</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/taskmenu/tablewidgeteditor.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/taskmenu/tablewidgeteditor.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/taskmenu/treewidgeteditor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/taskmenu/treewidgeteditor.cpp</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/taskmenu/treewidgeteditor.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/taskmenu/treewidgeteditor.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/designer/qdesigner_formwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/designer/qdesigner_formwindow.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/designer/qdesigner_settings.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/designer/qdesigner_settings.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/designer/qdesigner_workbench.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/designer/qdesigner_workbench.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/lib.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/lib.pro</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/sdk/abstractintegration.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/sdk/abstractintegration.cpp</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/sdk/abstractintegration.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/sdk/abstractintegration.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/actioneditor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/actioneditor.cpp</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/actionrepository.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/actionrepository.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/connectionedit.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/connectionedit.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/formlayoutmenu.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/formlayoutmenu.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/formwindowbase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/formwindowbase.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/grid.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/grid.cpp</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/iconselector.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/iconselector.cpp</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/iconselector_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/iconselector_p.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/layoutinfo.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/layoutinfo.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/morphmenu.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/morphmenu.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/newactiondialog.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/newactiondialog.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/newactiondialog.ui?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/newactiondialog.ui</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_command.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_command.cpp</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_command2.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_command2.cpp</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_command2_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_command2_p.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_formbuilder.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_formbuilder.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_formwindowcommand.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_formwindowcommand.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_menu.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_menu.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_menubar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_menubar.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_promotiondialog_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_promotiondialog_p.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_propertycommand.cpp</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_propertysheet.cpp</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_tabwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_tabwidget.cpp</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_taskmenu.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_taskmenu.cpp</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_taskmenu_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_taskmenu_p.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_toolbar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_toolbar.cpp</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_toolbox.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_toolbox.cpp</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_utils.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_utils.cpp</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qdesigner_utils_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qdesigner_utils_p.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qlayout_widget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qlayout_widget.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/qtresourcemodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/qtresourcemodel.cpp</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/richtexteditor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/richtexteditor.cpp</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/richtexteditor_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/richtexteditor_p.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/shared.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/shared.pri</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/stylesheeteditor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/stylesheeteditor.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/widgetdatabase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/widgetdatabase.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/widgetfactory.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/widgetfactory.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/shared/zoomwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/shared/zoomwidget.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/uilib/abstractformbuilder.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/uilib/abstractformbuilder.cpp</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/uilib/formbuilder.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/uilib/formbuilder.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/uilib/formbuilderextra.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/uilib/formbuilderextra.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/uilib/properties.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/uilib/properties.cpp</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/uilib/resourcebuilder.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/uilib/resourcebuilder.cpp</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/uilib/ui4.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/uilib/ui4.cpp</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/lib/uilib/ui4_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/lib/uilib/ui4_p.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/uitools/quiloader.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/uitools/quiloader.cpp</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/designer/src/uitools/uitools.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/designer/src/uitools/uitools.pro</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/doxygen/config/footer.html?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/doxygen/config/footer.html</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/linguist/linguist/formpreviewview.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/linguist/linguist/formpreviewview.cpp</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/linguist/linguist/mainwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/linguist/linguist/mainwindow.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/linguist/linguist/messagemodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/linguist/linguist/messagemodel.cpp</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/linguist/lupdate/qdeclarative.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/linguist/lupdate/qdeclarative.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/linguist/lupdate/qscript.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/linguist/lupdate/qscript.cpp</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/linguist/lupdate/qscript.g?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/linguist/lupdate/qscript.g</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/macdeployqt/shared/shared.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/macdeployqt/shared/shared.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/makeqpf/mainwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/makeqpf/mainwindow.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdbus/qdbus/qdbus.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdbus/qdbus/qdbus.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdbus/qdbusviewer/qdbusviewer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdbus/qdbusviewer/qdbusviewer.cpp</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/cppcodemarker.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/cppcodemarker.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/jscodemarker.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/jscodemarker.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/qmlcodemarker.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/qmlcodemarker.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/qmlcodeparser.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/qmlcodeparser.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/qmlmarkupvisitor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/qmlmarkupvisitor.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/qmlmarkupvisitor.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/qmlmarkupvisitor.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/qmlvisitor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/qmlvisitor.cpp</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/test/assistant.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/test/assistant.qdocconf</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/test/carbide-eclipse-integration.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/test/carbide-eclipse-integration.qdocconf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/test/designer.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/test/designer.qdocconf</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/test/jambi.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/test/jambi.qdocconf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/test/linguist.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/test/linguist.qdocconf</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/test/qdeclarative.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/test/qdeclarative.qdocconf</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/test/qmake.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/test/qmake.qdocconf</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/test/qt-project.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/test/qt-project.qdocconf</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/test/standalone-eclipse-integration.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/test/standalone-eclipse-integration.qdocconf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qdoc3/tree.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qdoc3/tree.cpp</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qml/loggerwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qml/loggerwidget.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qml/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qml/main.cpp</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qml/proxysettings.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qml/proxysettings.cpp</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qml/proxysettings_maemo5.ui?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qml/proxysettings_maemo5.ui</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qml/qdeclarativetester.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qml/qdeclarativetester.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qml/qml.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qml/qml.pro</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qml/qmlruntime.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qml/qmlruntime.cpp</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/qmlplugindump/Info.plist?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qmlplugindump/Info.plist</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/qmlplugindump/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qmlplugindump/main.cpp</a></td><td class='right'>597</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/qmlplugindump/qmlplugindump.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qmlplugindump/qmlplugindump.pro</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/qmlplugindump/qmlstreamwriter.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qmlplugindump/qmlstreamwriter.cpp</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/qmlplugindump/qmlstreamwriter.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qmlplugindump/qmlstreamwriter.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qtconfig/colorbutton.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/colorbutton.cpp</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qtconfig/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/main.cpp</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qtconfig/mainwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/mainwindow.cpp</a></td><td class='right'>790</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qtconfig/mainwindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/mainwindow.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/qtconfig/mainwindow.ui?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/mainwindow.ui</a></td><td class='right'>1388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tools/qtconfig/mainwindowbase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/mainwindowbase.cpp</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tools/qtconfig/mainwindowbase.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/mainwindowbase.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tools/qtconfig/mainwindowbase.ui?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/mainwindowbase.ui</a></td><td class='right'>1384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qtconfig/paletteeditoradvanced.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/paletteeditoradvanced.cpp</a></td><td class='right'>579</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qtconfig/paletteeditoradvanced.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/paletteeditoradvanced.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/qtconfig/paletteeditoradvanced.ui?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/paletteeditoradvanced.ui</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tools/qtconfig/paletteeditoradvancedbase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/paletteeditoradvancedbase.cpp</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tools/qtconfig/paletteeditoradvancedbase.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/paletteeditoradvancedbase.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tools/qtconfig/paletteeditoradvancedbase.ui?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/paletteeditoradvancedbase.ui</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qtconfig/previewframe.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/previewframe.cpp</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qtconfig/previewframe.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/previewframe.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qtconfig/previewwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/previewwidget.cpp</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qtconfig/previewwidget.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/previewwidget.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/qtconfig/previewwidget.ui?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/previewwidget.ui</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tools/qtconfig/previewwidgetbase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/previewwidgetbase.cpp</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tools/qtconfig/previewwidgetbase.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/previewwidgetbase.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/tools/qtconfig/previewwidgetbase.ui?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/previewwidgetbase.ui</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qtconfig/qtconfig.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtconfig/qtconfig.pro</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qtestlib/wince/cetest/bootstrapped.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtestlib/wince/cetest/bootstrapped.pri</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/qtestlib/wince/cetest/deployment.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/qtestlib/wince/cetest/deployment.cpp</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/runonphone/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/runonphone/main.cpp</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/runonphone/serenum_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/runonphone/serenum_unix.cpp</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/tools/shared/qtpropertybrowser/qtpropertybrowserutils.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/shared/qtpropertybrowser/qtpropertybrowserutils.pri</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/shared/qtpropertybrowser/qtvariantproperty.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/shared/qtpropertybrowser/qtvariantproperty.cpp</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/tools.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/tools.pro</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/tools/xmlpatterns/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>tools/xmlpatterns/main.cpp</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/translations/assistant_cs.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>translations/assistant_cs.ts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/translations/assistant_de.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>translations/assistant_de.ts</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/translations/assistant_sl.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>translations/assistant_sl.ts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/translations/designer_cs.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>translations/designer_cs.ts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/translations/designer_de.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>translations/designer_de.ts</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/translations/linguist_cs.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>translations/linguist_cs.ts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/translations/linguist_sl.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>translations/linguist_sl.ts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/translations/qt_cs.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>translations/qt_cs.ts</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/translations/qt_de.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>translations/qt_de.ts</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/translations/qt_gl.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>translations/qt_gl.ts</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/translations/qtconfig_sl.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>translations/qtconfig_sl.ts</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/translations/translations.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>translations/translations.pri</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/translations/translations.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>translations/translations.pro</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/util/corelib/qurl-generateTLDs/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>util/corelib/qurl-generateTLDs/main.cpp</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/Qt.git/diff/util/corelib/qurl-generateTLDs/qurl-generateTLDs.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>util/corelib/qurl-generateTLDs/qurl-generateTLDs.pro</a> (renamed from util/network/cookiejar-generateTLDs/cookiejar-generateTLDs.pro)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/Qt.git/diff/util/integrity/qt.bod?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>util/integrity/qt.bod</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/oss-git/Qt.git/diff/util/local_database/cldr2qlocalexml.py?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>util/local_database/cldr2qlocalexml.py</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/util/local_database/enumdata.py?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>util/local_database/enumdata.py</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/oss-git/Qt.git/diff/util/local_database/qlocalexml2cpp.py?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>util/local_database/qlocalexml2cpp.py</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/util/local_database/xpathlite.py?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>util/local_database/xpathlite.py</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/Qt.git/diff/util/network/cookiejar-generateTLDs/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>util/network/cookiejar-generateTLDs/main.cpp</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/util/qlalr/doc/qlalr.qdocconf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>util/qlalr/doc/qlalr.qdocconf</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/Qt.git/diff/util/unicode/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6&amp;id2=570f8970bea646055583671397c3d2706ac45004'>util/unicode/main.cpp</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>3496 files changed, 385659 insertions, 139804 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/.gitignore b/.gitignore<br/>index 0700140..7a872c1 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/.gitignore?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>.gitignore</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/.gitignore?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>.gitignore</a></div><div class='hunk'>@@ -120,6 +120,14 @@ translations/*.qm</div><div class='ctx'> translations/*_untranslated.ts</div><div class='ctx'> qrc_*.cpp</div><div class='ctx'> </div><div class='add'>+# Test generated files</div><div class='add'>+QObject.log</div><div class='add'>+tst_*</div><div class='add'>+!tst_*.*</div><div class='add'>+tst_*.log</div><div class='add'>+tst_*.debug</div><div class='add'>+tst_*~</div><div class='add'>+</div><div class='ctx'> # xemacs temporary files</div><div class='ctx'> *.flc</div><div class='ctx'> </div><div class='hunk'>@@ -205,7 +213,7 @@ doc-build</div><div class='ctx'> # ---------------------</div><div class='ctx'> </div><div class='ctx'> ABLD.BAT</div><div class='del'>-bld.inf</div><div class='add'>+bld.inf*</div><div class='ctx'> *.mmp</div><div class='ctx'> *.mk</div><div class='ctx'> *.rss</div><div class='hunk'>@@ -223,6 +231,10 @@ plugin_commonu.def</div><div class='ctx'> *.sym</div><div class='ctx'> *.lib</div><div class='ctx'> </div><div class='add'>+# runonphone crash dumps</div><div class='add'>+d_exc_*.txt</div><div class='add'>+d_exc_*.stk</div><div class='add'>+</div><div class='ctx'> # Generated by abldfast.bat from devtools.</div><div class='ctx'> .abldsteps.*</div><div class='ctx'> </div><div class='hunk'>@@ -241,3 +253,13 @@ src/network/lib</div><div class='ctx'> src/xml/lib/</div><div class='ctx'> </div><div class='ctx'> .pc/</div><div class='add'>+</div><div class='add'>+# INTEGRITY generated files</div><div class='add'>+*.gpj</div><div class='add'>+*.int</div><div class='add'>+*.ael</div><div class='add'>+*.dla</div><div class='add'>+*.dnm</div><div class='add'>+*.dep</div><div class='add'>+*.map</div><div class='add'>+work</div><div class='head'>diff --git a/bin/createpackage.pl b/bin/createpackage.pl<br/>index 8c1c290..3d67681 100755<br/>--- a/<a href='/oss-git/Qt.git/tree/bin/createpackage.pl?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>bin/createpackage.pl</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/bin/createpackage.pl?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>bin/createpackage.pl</a></div><div class='hunk'>@@ -58,7 +58,7 @@ use File::Spec;</div><div class='ctx'> use File::Path;</div><div class='ctx'> # use CWD abs_bath, which is exported only on request</div><div class='ctx'> use Cwd 'abs_path';</div><div class='del'>-</div><div class='add'>+use File::Copy;</div><div class='ctx'> </div><div class='ctx'> sub Usage() {</div><div class='ctx'>     print &lt;&lt;ENDUSAGESTRING;</div><div class='hunk'>@@ -84,6 +84,8 @@ Where supported options are as follows:</div><div class='ctx'>      [-g|gcce-is-armv5]      = Convert gcce platform to armv5.</div><div class='ctx'>      [-d|dont-patch]         = Skip automatic patching of capabilities and pkg file if default certificate</div><div class='ctx'>                                is used. Instead non-self-signable capabilities just cause warnings.</div><div class='add'>+     [-t|tmp-dir &lt;path&gt;]     = Specifies temporary directory to be used for package creation.</div><div class='add'>+                               Defaults to 'createpackage_tmp' under same directory as templatepkg.</div><div class='ctx'> Where parameters are as follows:</div><div class='ctx'>      templatepkg             = Name of .pkg file template</div><div class='ctx'>      target                  = Either debug or release</div><div class='hunk'>@@ -130,6 +132,7 @@ my $signed_sis_name = "";</div><div class='ctx'> my $onlyUnsigned = "";</div><div class='ctx'> my $convertGcce = "";</div><div class='ctx'> my $dontPatchCaps = "";</div><div class='add'>+my $tempPackageDir = "";</div><div class='ctx'> </div><div class='ctx'> unless (GetOptions('i|install' =&gt; \$install,</div><div class='ctx'>                    'p|preprocess' =&gt; \$preprocessonly,</div><div class='hunk'>@@ -139,7 +142,8 @@ unless (GetOptions('i|install' =&gt; \$install,</div><div class='ctx'>                    's|stub' =&gt; \$stub,</div><div class='ctx'>                    'n|sisname=s' =&gt; \$signed_sis_name,</div><div class='ctx'>                    'g|gcce-is-armv5' =&gt; \$convertGcce,</div><div class='del'>-                   'd|dont-patch' =&gt; \$dontPatchCaps,)) {</div><div class='add'>+                   'd|dont-patch' =&gt; \$dontPatchCaps,</div><div class='add'>+                   't|tmp-dir=s' =&gt; \$tempPackageDir,)) {</div><div class='ctx'>     Usage();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -190,18 +194,22 @@ $key = $ARGV[3] or $key = "";</div><div class='ctx'> my $passphrase;</div><div class='ctx'> $passphrase = $ARGV[4] or $passphrase = "";</div><div class='ctx'> </div><div class='add'>+if ($tempPackageDir eq "") {</div><div class='add'>+    my ($templateVolume, $templatePath, $templateFileName) = File::Spec-&gt;splitpath($templatepkg);</div><div class='add'>+    $tempPackageDir = File::Spec-&gt;catpath($templateVolume, $templatePath."createpackage_tmp", "");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+mkpath($tempPackageDir);</div><div class='add'>+</div><div class='ctx'> # Generate output pkg basename (i.e. file name without extension)</div><div class='ctx'> my $pkgoutputbasename = $templatepkg;</div><div class='del'>-my $preservePkgOutput = "";</div><div class='ctx'> $pkgoutputbasename =~ s/_template/_$targetplatform/g;</div><div class='ctx'> $pkgoutputbasename =~ s/_installer\.pkg/_installer___temp\.pkg/g;</div><div class='del'>-if ($pkgoutputbasename eq $templatepkg) {</div><div class='del'>-    $preservePkgOutput = "1";</div><div class='del'>-}</div><div class='ctx'> $pkgoutputbasename =~ s/\.pkg//g;</div><div class='ctx'> </div><div class='ctx'> # Store output file names to variables</div><div class='del'>-my $pkgoutput = $pkgoutputbasename.".pkg";</div><div class='add'>+my ($dummy1, $dummy2, $pkgoutput) = File::Spec-&gt;splitpath($pkgoutputbasename.".pkg");</div><div class='add'>+$pkgoutput = $tempPackageDir."/".$pkgoutput;</div><div class='ctx'> my $sisoutputbasename;</div><div class='ctx'> if ($signed_sis_name eq "") {</div><div class='ctx'>     $sisoutputbasename = $pkgoutputbasename;</div><div class='hunk'>@@ -230,11 +238,7 @@ if ($templatepkg =~ m/_installer\.pkg$/i &amp;&amp; $onlyUnsigned) {</div><div class='ctx'> my $unsigned_sis_name = $sisoutputbasename."_unsigned.sis";</div><div class='ctx'> my $stub_sis_name = $sisoutputbasename.".sis";</div><div class='ctx'> </div><div class='del'>-# Store some utility variables</div><div class='del'>-my $scriptpath = dirname(__FILE__);</div><div class='ctx'> my $certtext = $certificate;</div><div class='del'>-# certificates are one step up in hierarchy</div><div class='del'>-my $certpath = File::Spec-&gt;catdir($scriptpath, File::Spec-&gt;updir(), "src/s60installs/");</div><div class='ctx'> </div><div class='ctx'> # Check some pre-conditions and print error messages if needed.</div><div class='ctx'> unless (length($templatepkg)) {</div><div class='hunk'>@@ -257,6 +261,16 @@ if (length($certificate)) {</div><div class='ctx'>     }</div><div class='ctx'> } else {</div><div class='ctx'>     #If no certificate is given, check default options</div><div class='add'>+    my $scriptpath = dirname(__FILE__);</div><div class='add'>+    my $certpath = File::Spec-&gt;catdir($scriptpath, File::Spec-&gt;updir(), "src/s60installs");</div><div class='add'>+</div><div class='add'>+    unless (-e $certpath) {</div><div class='add'>+        my $qmakeCmd = File::Spec-&gt;catfile($scriptpath, "qmake");</div><div class='add'>+        $certpath = `$qmakeCmd -query QT_INSTALL_PREFIX`;</div><div class='add'>+        $certpath =~ s/\s+$//;</div><div class='add'>+        $certpath = File::Spec-&gt;catdir($certpath, "src/s60installs");</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     $certtext = "RnD";</div><div class='ctx'>     $certificate = File::Spec-&gt;catfile($certpath, "rd.cer");</div><div class='ctx'>     $key = File::Spec-&gt;catfile($certpath, "rd-key.pem");</div><div class='hunk'>@@ -300,9 +314,7 @@ unlink $unsigned_sis_name;</div><div class='ctx'> if (!$onlyUnsigned) {</div><div class='ctx'>     unlink $signed_sis_name;</div><div class='ctx'> }</div><div class='del'>-if (!$preservePkgOutput) {</div><div class='del'>-    unlink $pkgoutput;</div><div class='del'>-}</div><div class='add'>+unlink $pkgoutput;</div><div class='ctx'> </div><div class='ctx'> # Preprocess PKG</div><div class='ctx'> </div><div class='hunk'>@@ -334,6 +346,11 @@ print OUTPUT $_;</div><div class='ctx'> close OUTPUT;</div><div class='ctx'> </div><div class='ctx'> if ($preprocessonly) {</div><div class='add'>+    # Copy preprocessed file from tmp dir to pkg file dir</div><div class='add'>+    my ($templateVolume, $templatePath, $templateFileName) = File::Spec-&gt;splitpath($templatepkg);</div><div class='add'>+    my ($dummy1, $dummy2, $copyFileName) = File::Spec-&gt;splitpath($pkgoutput);</div><div class='add'>+    my $copyTarget = File::Spec-&gt;catpath($templateVolume, $templatePath, $copyFileName);</div><div class='add'>+    copy($pkgoutput, $copyTarget) or die "Preprocessed pkg file '$pkgoutput' cannot be copied.";</div><div class='ctx'>     exit;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -354,7 +371,7 @@ if($stub) {</div><div class='ctx'>             system ("$patch_capabilities -c $pkgoutput") and print ("Warning: Package check for self-signing viability failed. Installing the package on a device will most likely fail!\n\n");</div><div class='ctx'>         } else {</div><div class='ctx'>             print("Auto-patching self-signed package.\n");</div><div class='del'>-            system ("$patch_capabilities $pkgoutput") and die ("ERROR: Automatic patching failed");</div><div class='add'>+            system ("$patch_capabilities -t $tempPackageDir $pkgoutput") and die ("ERROR: Automatic patching failed");</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='hunk'>@@ -377,9 +394,6 @@ if($stub) {</div><div class='ctx'>             print ("\nUnsigned package creation failed!\n");</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-        if (!$preservePkgOutput) {</div><div class='del'>-            unlink $pkgoutput;</div><div class='del'>-        }</div><div class='ctx'>         print ("\n");</div><div class='ctx'>         exit;</div><div class='ctx'>     }</div><div class='hunk'>@@ -405,10 +419,7 @@ if($stub) {</div><div class='ctx'>             print ("\tAdditionally signed the SIS with certificate: $row-&gt;[0]!\n");</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-        # remove temporary pkg and unsigned sis</div><div class='del'>-        if (!$preservePkgOutput) {</div><div class='del'>-            unlink $pkgoutput;</div><div class='del'>-        }</div><div class='add'>+        # remove temporary unsigned sis</div><div class='ctx'>         if (!$preserveUnsigned) {</div><div class='ctx'>             unlink $unsigned_sis_name;</div><div class='ctx'>         }</div><div class='head'>diff --git a/bin/elf2e32_qtwrapper.pl b/bin/elf2e32_qtwrapper.pl<br/>index c5e3da6..54d7bac 100755<br/>--- a/<a href='/oss-git/Qt.git/tree/bin/elf2e32_qtwrapper.pl?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>bin/elf2e32_qtwrapper.pl</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/bin/elf2e32_qtwrapper.pl?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>bin/elf2e32_qtwrapper.pl</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> ## All rights reserved.</div><div class='ctx'> ## Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='ctx'> ##</div><div class='del'>-## This file is part of the S60 port of the Qt Toolkit.</div><div class='add'>+## This file is part of the utilities of the Qt Toolkit.</div><div class='ctx'> ##</div><div class='ctx'> ## $QT_BEGIN_LICENSE:LGPL$</div><div class='ctx'> ## GNU Lesser General Public License Usage</div><div class='hunk'>@@ -81,8 +81,59 @@ my $fixupFile = "";</div><div class='ctx'> my $runCount = 0;</div><div class='ctx'> my $returnCode = 0;</div><div class='ctx'> </div><div class='add'>+# For debugging. Make it nonzero to give verbose output.</div><div class='add'>+my $debugScript = 1;</div><div class='add'>+my @usedDefFiles;</div><div class='add'>+sub recordDefFile {</div><div class='add'>+    return if (!$debugScript);</div><div class='add'>+</div><div class='add'>+    my ($msg, $file) = @_;</div><div class='add'>+    my $content = "$msg, $file:\n";</div><div class='add'>+    my $defFileFd;</div><div class='add'>+    if (!open($defFileFd, "&lt; $file")) {</div><div class='add'>+        print("Warning: Could not open $file (for debug analysis)\n");</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+    while (&lt;$defFileFd&gt;) {</div><div class='add'>+        $content .= $_;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    push(@usedDefFiles, $content);</div><div class='add'>+}</div><div class='add'>+sub printRecordedDefFiles {</div><div class='add'>+    return if (!$debugScript);</div><div class='add'>+</div><div class='add'>+    foreach (@usedDefFiles) {</div><div class='add'>+        print ("$_\n");</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+sub missingSymbolMismatch</div><div class='add'>+{</div><div class='add'>+    my $missingSymbolSum = $_[0];</div><div class='add'>+</div><div class='add'>+    printRecordedDefFiles;</div><div class='add'>+</div><div class='add'>+    print("Bug in the native elf2e32 tool: Number of missing symbols does not\n");</div><div class='add'>+    print("match number of removed symbols in the output DEF file.\n\n");</div><div class='add'>+</div><div class='add'>+    print("Original elf2e32 output:\n");</div><div class='add'>+    print("  $missingSymbolSum Frozen Export\(s\) missing from the ELF file\n\n");</div><div class='add'>+</div><div class='add'>+    print("However $defoutput[1] contains more missing entries than that.\n\n");</div><div class='add'>+</div><div class='add'>+    print("This needs to be fixed manually in the DEF file.\n");</div><div class='add'>+    exit(2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+if ($debugScript) {</div><div class='add'>+    print("PATH: $ENV{PATH}\n");</div><div class='add'>+    print("EPOCROOT: $ENV{EPOCROOT}\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> while (1) {</div><div class='ctx'>     if (++$runCount &gt; 2) {</div><div class='add'>+        printRecordedDefFiles if ($debugScript);</div><div class='ctx'>         print("Internal error in $0, link succeeded, but exports may be wrong.\n");</div><div class='ctx'>         last;</div><div class='ctx'>     }</div><div class='hunk'>@@ -96,6 +147,8 @@ while (1) {</div><div class='ctx'> </div><div class='ctx'>     my %fixupSymbols;</div><div class='ctx'>     my $foundBrokenSymbols = 0;</div><div class='add'>+    my $missingSymbolSum = 0;</div><div class='add'>+    my $missingSymbolCount = 0;</div><div class='ctx'>     my $errors = 0;</div><div class='ctx'>     while (&lt;$elf2e32Pipe&gt;) {</div><div class='ctx'>         print;</div><div class='hunk'>@@ -104,12 +157,18 @@ while (1) {</div><div class='ctx'>         } elsif (/symbol ([a-z0-9_]+) absent in the DEF file, but present in the ELF file/io) {</div><div class='ctx'>             $fixupSymbols{$1} = 1;</div><div class='ctx'>             $foundBrokenSymbols = 1;</div><div class='del'>-        } elsif (/[0-9]+ Frozen Export\(s\) missing from the ELF file/io) {</div><div class='add'>+        } elsif (/([0-9]+) Frozen Export\(s\) missing from the ELF file/io) {</div><div class='add'>+            $missingSymbolSum = $1;</div><div class='ctx'>             $foundBrokenSymbols = 1;</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'>     close($elf2e32Pipe);</div><div class='ctx'> </div><div class='add'>+    if ($debugScript) {</div><div class='add'>+        recordDefFile("Run no $runCount, elf2e32 DEF file input", "$definput[1]");</div><div class='add'>+        recordDefFile("Run no $runCount, elf2e32 DEF file output", "$defoutput[1]");</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     if ($errors) {</div><div class='ctx'>         $returnCode = 1;</div><div class='ctx'>         last;</div><div class='hunk'>@@ -125,7 +184,7 @@ while (1) {</div><div class='ctx'>         }</div><div class='ctx'>         open($newDefFile, "&lt; $defoutput[1]") or die("Could not open $defoutput[1]");</div><div class='ctx'>         open($tmpDefFile, "&gt; $defoutput[1].tmp") or die("Could not open $defoutput[1].tmp");</div><div class='del'>-        print($tmpDefFile "EXPORTS\n");</div><div class='add'>+        print($tmpDefFile "EXPORTS\n") or die("Could not write to temporary DEF file: $!");</div><div class='ctx'>         $fixupFile = "$defoutput[1].tmp";</div><div class='ctx'>         while (1) {</div><div class='ctx'>             my $origDefLine;</div><div class='hunk'>@@ -209,24 +268,25 @@ while (1) {</div><div class='ctx'>             } elsif ($defLine =~ s/; MISSING://) {</div><div class='ctx'>                 # Auto-absent symbols.</div><div class='ctx'>                 $extraData .= " ABSENT";</div><div class='add'>+                if (++$missingSymbolCount &gt; $missingSymbolSum) {</div><div class='add'>+                    missingSymbolMismatch($missingSymbolSum);</div><div class='add'>+                }</div><div class='ctx'>             }</div><div class='del'>-            print($tmpDefFile "\t$sym \@ $ordinal $extraData\n");</div><div class='add'>+            print($tmpDefFile "\t$sym \@ $ordinal $extraData\n") or die("Could not write to temporary DEF file: $!");</div><div class='ctx'>         }</div><div class='del'>-        print($tmpDefFile "\n");</div><div class='add'>+        print($tmpDefFile "\n") or die("Could not write to temporary DEF file: $!");</div><div class='ctx'>         close($origDefFile) if ($definput[1]);</div><div class='ctx'>         close($newDefFile);</div><div class='ctx'>         close($tmpDefFile);</div><div class='ctx'> </div><div class='ctx'>         $definput[1] = "$defoutput[1].tmp";</div><div class='ctx'> </div><div class='del'>-        if (!$foundBrokenSymbols || $errors) {</div><div class='del'>-            last;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        print("Rerunning elf2e32 due to DEF file / ELF file mismatch\n");</div><div class='del'>-    } else {</div><div class='add'>+    }</div><div class='add'>+    if (!$foundBrokenSymbols || $errors) {</div><div class='ctx'>         last;</div><div class='ctx'>     }</div><div class='add'>+</div><div class='add'>+    print("Rerunning elf2e32 due to DEF file / ELF file mismatch\n");</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> if ($fixupFile) {</div><div class='hunk'>@@ -260,6 +320,6 @@ if ($buildingLibrary) {</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if ($differenceFound) {</div><div class='del'>-        copy($tmpdso[1], $dso[1]);</div><div class='add'>+        copy($tmpdso[1], $dso[1]) or die("Could not copy $tmpdso[1] to $dso[1]: $!");</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='head'>diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl<br/>index 019a780..0ba8bc5 100755<br/>--- a/<a href='/oss-git/Qt.git/tree/bin/patch_capabilities.pl?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>bin/patch_capabilities.pl</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/bin/patch_capabilities.pl?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>bin/patch_capabilities.pl</a></div><div class='hunk'>@@ -53,6 +53,7 @@</div><div class='ctx'> </div><div class='ctx'> use File::Copy;</div><div class='ctx'> use File::Spec;</div><div class='add'>+use File::Path;</div><div class='ctx'> </div><div class='ctx'> sub Usage() {</div><div class='ctx'>     print("This script can be used to set capabilities of all binaries\n");</div><div class='hunk'>@@ -63,11 +64,13 @@ sub Usage() {</div><div class='ctx'>     print(" symbian-sbsv2 platform, 'target-platform' is REQUIRED. ***\n\n");</div><div class='ctx'>     print(" *** NOTE2: When patching gcce binaries built with symbian-sbsv2 toolchain,\n");</div><div class='ctx'>     print(" armv5 must be specified as platform.\n");</div><div class='del'>-    print("\nUsage: patch_capabilities.pl [-c] pkg_filename [target-platform [capability list]]\n");</div><div class='add'>+    print("\nUsage: patch_capabilities.pl [-c|-t tmp_path] pkg_filename [target-platform [capability list]]\n");</div><div class='ctx'>     print("\nE.g. patch_capabilities.pl myapp_template.pkg release-armv5 \"All -TCB\"\n");</div><div class='ctx'>     print("\nThe parameter -c can be used to just check if package is compatible with self-signing\n");</div><div class='ctx'>     print("without actually doing any patching.\n");</div><div class='ctx'>     print("Explicit capability list cannot be used with -c parameter.\n");</div><div class='add'>+    print("\nThe parameter -t can be used to specify a dir under which the temporary files are created.\n");</div><div class='add'>+    print("Defaults to 'patch_capabilities_tmp' under the path to pkg file.\n");</div><div class='ctx'>     exit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -101,6 +104,7 @@ if (@ARGV)</div><div class='ctx'>     my $pkgFileName = shift(@ARGV);</div><div class='ctx'>     my $justCheck = "";</div><div class='ctx'>     my $msgPrefix = "Patching:";</div><div class='add'>+    my $tempPatchPath = "";</div><div class='ctx'> </div><div class='ctx'>     if ($pkgFileName eq "-c") {</div><div class='ctx'>         $pkgFileName = shift(@ARGV);</div><div class='hunk'>@@ -108,6 +112,18 @@ if (@ARGV)</div><div class='ctx'>         $msgPrefix = "Warning:";</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='add'>+    if ($pkgFileName eq "-t") {</div><div class='add'>+        $tempPatchPath = shift(@ARGV);</div><div class='add'>+        $pkgFileName = shift(@ARGV);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    my ($pkgVolume, $pkgPath, $pkgPlainFileName) = File::Spec-&gt;splitpath($pkgFileName);</div><div class='add'>+    if ($tempPatchPath eq "") {</div><div class='add'>+        $tempPatchPath = File::Spec-&gt;catpath($pkgVolume, $pkgPath."patch_capabilities_tmp", "");</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    mkpath($tempPatchPath);</div><div class='add'>+</div><div class='ctx'>     # These variables will only be set for template .pkg files.</div><div class='ctx'>     my $target;</div><div class='ctx'>     my $platform;</div><div class='hunk'>@@ -165,8 +181,9 @@ if (@ARGV)</div><div class='ctx'> </div><div class='ctx'>         # Start with no binaries listed.</div><div class='ctx'>         my @binaries = ();</div><div class='add'>+        my $binariesDelimeter = "///";</div><div class='ctx'> </div><div class='del'>-        my $tempPkgFileName = $pkgFileName."_@@TEMP@@";</div><div class='add'>+        my $tempPkgFileName = $tempPatchPath."/__TEMP__".$pkgPlainFileName;</div><div class='ctx'> </div><div class='ctx'>         if (!$justCheck) {</div><div class='ctx'>             unlink($tempPkgFileName);</div><div class='hunk'>@@ -216,19 +233,23 @@ if (@ARGV)</div><div class='ctx'>                         $sourcePath =~ s/\$\(TARGET\)/$target/gm;</div><div class='ctx'>                     }</div><div class='ctx'> </div><div class='add'>+                    my ($dummy1, $dummy2, $binaryBaseName) = File::Spec-&gt;splitpath($sourcePath);</div><div class='add'>+</div><div class='ctx'>                     if ($justCheck) {</div><div class='del'>-                        push (@binaries, $sourcePath);</div><div class='add'>+                        push (@binaries, $binaryBaseName.$binariesDelimeter.$sourcePath);</div><div class='ctx'>                     } else {</div><div class='del'>-                        # Change the source file name (but only if not already patched)</div><div class='add'>+                        # Copy original files over to patching dir</div><div class='add'>+                        # Patching dir will be flat to make it cleanable with QMAKE_CLEAN, so path</div><div class='add'>+                        # will be collapsed into the file name to avoid name collisions in the rare</div><div class='add'>+                        # case where custom pkg rules are used to install files with same names from</div><div class='add'>+                        # different directories (probably using platform checks to choose only one of them.)</div><div class='ctx'>                         my $patchedSourcePath = $sourcePath;</div><div class='del'>-                        if ($patchedSourcePath !~ m/_patched_caps/)</div><div class='del'>-                        {</div><div class='del'>-                            $newLine =~ s/(^.*)(\.dll|\.exe)(.*)(\.dll|\.exe)/$1_patched_caps$2$3$4/i;</div><div class='del'>-                            $patchedSourcePath =~ s/(^.*)(\.dll|\.exe)/$1_patched_caps$2/i;</div><div class='add'>+                        $patchedSourcePath =~ s/[\/\\:]/_/g;</div><div class='add'>+                        $patchedSourcePath = "$tempPatchPath/$patchedSourcePath";</div><div class='add'>+                        $newLine =~ s/^.*(\.dll|\.exe)(.*)(\.dll|\.exe)/\"$patchedSourcePath$2$3/i;</div><div class='ctx'> </div><div class='del'>-                            copy($sourcePath, $patchedSourcePath) or die "$sourcePath cannot be copied for patching.";</div><div class='del'>-                        }</div><div class='del'>-                        push (@binaries, $patchedSourcePath);</div><div class='add'>+                        copy($sourcePath, $patchedSourcePath) or die "$sourcePath cannot be copied for patching.";</div><div class='add'>+                        push (@binaries, $binaryBaseName.$binariesDelimeter.$patchedSourcePath);</div><div class='ctx'>                     }</div><div class='ctx'>                 }</div><div class='ctx'>             }</div><div class='hunk'>@@ -250,10 +271,13 @@ if (@ARGV)</div><div class='ctx'>         my $baseCommandToExecute = "${epocToolsDir}elftran -vid 0x0 -capability \"%s\" ";</div><div class='ctx'> </div><div class='ctx'>         # Actually set the capabilities of the listed binaries.</div><div class='del'>-        foreach my $binaryPath(@binaries)</div><div class='add'>+        foreach my $binariesItem(@binaries)</div><div class='ctx'>         {</div><div class='add'>+            $binariesItem =~ m|^(.*)$binariesDelimeter(.*)$|;</div><div class='add'>+            my $binaryBaseName = $1;</div><div class='add'>+            my $binaryPath = $2;</div><div class='add'>+</div><div class='ctx'>             # Create the command line for setting the capabilities.</div><div class='del'>-            my ($binaryVolume, $binaryDirs, $binaryBaseName) = File::Spec-&gt;splitpath($binaryPath);</div><div class='ctx'>             my $commandToExecute = $baseCommandToExecute;</div><div class='ctx'>             my $executeNeeded = "";</div><div class='ctx'>             if (@capabilitiesSpecified)</div><div class='head'>diff --git a/bin/syncqt b/bin/syncqt<br/>index 7e1f581..b25a432 100755<br/>--- a/<a href='/oss-git/Qt.git/tree/bin/syncqt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>bin/syncqt</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/bin/syncqt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>bin/syncqt</a></div><div class='hunk'>@@ -75,6 +75,7 @@ my @modules_to_sync ;</div><div class='ctx'> $force_relative = 1 if ( -d "/System/Library/Frameworks" );</div><div class='ctx'> my $out_basedir = $basedir;</div><div class='ctx'> $out_basedir =~ s=\\=/=g;</div><div class='add'>+my $quoted_basedir = "\Q$basedir";</div><div class='ctx'> </div><div class='ctx'> # functions ----------------------------------------------------------</div><div class='ctx'> </div><div class='hunk'>@@ -352,11 +353,9 @@ sub syncHeader {</div><div class='ctx'> ######################################################################</div><div class='ctx'> sub fixPaths {</div><div class='ctx'>     my ($file, $dir) = @_;</div><div class='del'>-    $dir =~ s=^$basedir/=$out_basedir/= if(!($basedir eq $out_basedir));</div><div class='add'>+    $dir =~ s=^$quoted_basedir/=$out_basedir/= if(!($basedir eq $out_basedir));</div><div class='ctx'>     $file =~ s=\\=/=g;</div><div class='del'>-    $file =~ s/\+/\\+/g;</div><div class='ctx'>     $dir =~ s=\\=/=g;</div><div class='del'>-    $dir =~ s/\+/\\+/g;</div><div class='ctx'> </div><div class='ctx'>     #setup</div><div class='ctx'>     my $ret = $file;</div><div class='hunk'>@@ -380,7 +379,7 @@ sub fixPaths {</div><div class='ctx'>         my $slash = index($file_dir, "/", $i);</div><div class='ctx'>         last if($slash == -1);</div><div class='ctx'>         my $tmp = substr($file_dir, 0, $slash);</div><div class='del'>-        last unless($dir =~ m,^$tmp/,);</div><div class='add'>+        last unless($dir =~ m,^\Q$tmp\E/,);</div><div class='ctx'>         $match_dir = $tmp;</div><div class='ctx'>         $i = $slash;</div><div class='ctx'>     }</div><div class='hunk'>@@ -391,7 +390,7 @@ sub fixPaths {</div><div class='ctx'>         for(my $i = 0; $i &lt; $count; $i++) {</div><div class='ctx'>             $dots .= "../";</div><div class='ctx'>         }</div><div class='del'>-        $ret =~ s,^$match_dir,$dots,;</div><div class='add'>+        $ret =~ s,^\Q$match_dir\E,$dots,;</div><div class='ctx'>     }</div><div class='ctx'>     $ret =~ s,/+,/,g;</div><div class='ctx'>     return $ret;</div><div class='hunk'>@@ -509,13 +508,13 @@ sub symlinkFile</div><div class='ctx'> </div><div class='ctx'>     if ($isunix) {</div><div class='ctx'>         print "symlink created for $file " unless $quiet;</div><div class='del'>-        if ( $force_relative &amp;&amp; ($ifile =~ /^$basedir/)) {</div><div class='add'>+        if ( $force_relative &amp;&amp; ($ifile =~ /^$quoted_basedir/)) {</div><div class='ctx'>             my $t = getcwd();</div><div class='ctx'>             my $c = -1;</div><div class='ctx'>             my $p = "../";</div><div class='del'>-            $t =~ s-^$basedir/--;</div><div class='add'>+            $t =~ s-^$quoted_basedir/--;</div><div class='ctx'>             $p .= "../" while( ($c = index( $t, "/", $c + 1)) != -1 );</div><div class='del'>-            $file =~ s-^$basedir/-$p-;</div><div class='add'>+            $file =~ s-^$quoted_basedir/-$p-;</div><div class='ctx'>             print " ($file)\n" unless $quiet;</div><div class='ctx'>         }</div><div class='ctx'>         print "\n" unless $quiet;</div><div class='hunk'>@@ -694,7 +693,7 @@ my $class_lib_map_contents = "";</div><div class='ctx'> my @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" );</div><div class='ctx'> my @ignore_for_include_check = ( "qatomic.h" );</div><div class='ctx'> my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" );</div><div class='del'>-my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" );</div><div class='add'>+my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h", "qatomic_arm.h", "qatomic_armv7.h" );</div><div class='ctx'> my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDesigner}", "$modules{QtUiTools}", "$modules{QtDBus}", "$modules{phonon}" );</div><div class='ctx'> my %colliding_headers = ();</div><div class='ctx'> my %inject_headers = ( "$basedir/src/corelib/global" =&gt; ( "qconfig.h" ) ); # all from build dir</div><div class='hunk'>@@ -839,7 +838,7 @@ foreach my $lib (@modules_to_sync) {</div><div class='ctx'>                             @headers = ( "$out_basedir/include/$lib/$header" );</div><div class='ctx'> </div><div class='ctx'>                             # write forwarding headers to include/Qt</div><div class='del'>-                            if ($lib ne "phonon" &amp;&amp; $subdir =~ /^$basedir\/src/) {</div><div class='add'>+                            if ($lib ne "phonon" &amp;&amp; $subdir =~ /^$quoted_basedir\/src/) {</div><div class='ctx'>                                 my $file_name = "$out_basedir/include/Qt/$header";</div><div class='ctx'>                                 my $file_op = '&gt;';</div><div class='ctx'>                                 my $header_content = '';</div><div class='head'>diff --git a/config.profiles/harmattan/QMLViewer.desktop b/config.profiles/harmattan/QMLViewer.desktop<br/>new file mode 100644<br/>index 0000000..0f96731<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/QMLViewer.desktop?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/QMLViewer.desktop</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+[Desktop Entry]</div><div class='add'>+Encoding=UTF-8</div><div class='add'>+Version=1.0</div><div class='add'>+Type=Application</div><div class='add'>+Name=QMLViewer</div><div class='add'>+Exec=/usr/bin/qmlviewer -graphicssystem meego</div><div class='add'>+Icon=/usr/share/icons/hicolor/64x64/apps/QMLViewer.png</div><div class='add'>+Categories=X-MeeGo;</div><div class='add'>+OnlyShowIn=X-MeeGo;</div><div class='head'>diff --git a/config.profiles/harmattan/QMLViewer.png b/config.profiles/harmattan/QMLViewer.png<br/>new file mode 100644<br/>index 0000000..a209cd0<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/QMLViewer.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/QMLViewer.png</a></div>Binary files differ<div class='head'>diff --git a/config.profiles/harmattan/README.source b/config.profiles/harmattan/README.source<br/>new file mode 100644<br/>index 0000000..5dde0bf<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/README.source?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/README.source</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+This package uses quilt to manage all modifications to the upstream</div><div class='add'>+source.  Changes are stored in the source package as diffs in</div><div class='add'>+debian/patches and applied during the build.</div><div class='add'>+</div><div class='add'>+To configure quilt to use debian/patches instead of patches, you want</div><div class='add'>+either to export QUILT_PATCHES=debian/patches in your environment</div><div class='add'>+or use this snippet in your ~/.quiltrc:</div><div class='add'>+</div><div class='add'>+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do</div><div class='add'>+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then</div><div class='add'>+                export QUILT_PATCHES=debian/patches</div><div class='add'>+                break</div><div class='add'>+        fi</div><div class='add'>+    done</div><div class='add'>+</div><div class='add'>+To get the fully patched source after unpacking the source package, cd to</div><div class='add'>+the root level of the source package and run:</div><div class='add'>+</div><div class='add'>+    quilt push -a</div><div class='add'>+</div><div class='add'>+The last patch listed in debian/patches/series will become the current</div><div class='add'>+patch.</div><div class='add'>+</div><div class='add'>+To add a new set of changes, first run quilt push -a, and then run:</div><div class='add'>+</div><div class='add'>+    quilt new &lt;patch&gt;</div><div class='add'>+</div><div class='add'>+where &lt;patch&gt; is a descriptive name for the patch, used as the filename in</div><div class='add'>+debian/patches.  Then, for every file that will be modified by this patch,</div><div class='add'>+run:</div><div class='add'>+</div><div class='add'>+    quilt add &lt;file&gt;</div><div class='add'>+</div><div class='add'>+before editing those files.  You must tell quilt with quilt add what files</div><div class='add'>+will be part of the patch before making changes or quilt will not work</div><div class='add'>+properly.  After editing the files, run:</div><div class='add'>+</div><div class='add'>+    quilt refresh</div><div class='add'>+</div><div class='add'>+to save the results as a patch.</div><div class='add'>+</div><div class='add'>+Alternately, if you already have an external patch and you just want to</div><div class='add'>+add it to the build system, run quilt push -a and then:</div><div class='add'>+</div><div class='add'>+    quilt import -P &lt;patch&gt; /path/to/patch</div><div class='add'>+    quilt push -a</div><div class='add'>+</div><div class='add'>+(add -p 0 to quilt import if needed). &lt;patch&gt; as above is the filename to</div><div class='add'>+use in debian/patches.  The last quilt push -a will apply the patch to</div><div class='add'>+make sure it works properly.</div><div class='add'>+</div><div class='add'>+To remove an existing patch from the list of patches that will be applied,</div><div class='add'>+run:</div><div class='add'>+</div><div class='add'>+    quilt delete &lt;patch&gt;</div><div class='add'>+</div><div class='add'>+You may need to run quilt pop -a to unapply patches first before running</div><div class='add'>+this command.</div><div class='head'>diff --git a/config.profiles/harmattan/api b/config.profiles/harmattan/api<br/>new file mode 100644<br/>index 0000000..43ede3d<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/api?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/api</a></div><div class='hunk'>@@ -0,0 +1,120 @@</div><div class='add'>+interface: Phonon</div><div class='add'>+type: library</div><div class='add'>+libs-pkg: libqt4-phonon</div><div class='add'>+dev-pkg: libqt4-dev</div><div class='add'>+state: stable</div><div class='add'>+scope: Nokia MeeGo</div><div class='add'>+headers: /usr/include/qt4/phonon/*</div><div class='add'>+</div><div class='add'>+interface: QtCore</div><div class='add'>+type: library</div><div class='add'>+libs-pkg: libqtcore4</div><div class='add'>+dev-pkg: libqt4-dev</div><div class='add'>+state: stable</div><div class='add'>+scope: Nokia MeeGo</div><div class='add'>+headers: /usr/include/qt4/QtCore/*</div><div class='add'>+</div><div class='add'>+interface: QtDBus</div><div class='add'>+type: library</div><div class='add'>+libs-pkg: libqt4-dbus</div><div class='add'>+dev-pkg: libqt4-dev</div><div class='add'>+state: stable</div><div class='add'>+scope: Nokia MeeGo</div><div class='add'>+headers: /usr/include/qt4/QtDBus/*</div><div class='add'>+</div><div class='add'>+interface: QtDeclarative</div><div class='add'>+type: library</div><div class='add'>+libs-pkg: libqt4-declarative</div><div class='add'>+dev-pkg: libqt4-dev</div><div class='add'>+state: stable</div><div class='add'>+scope: Nokia MeeGo</div><div class='add'>+headers: /usr/include/qt4/QtDeclarative/*</div><div class='add'>+</div><div class='add'>+interface: QtGui</div><div class='add'>+type: library</div><div class='add'>+libs-pkg: libqtgui4</div><div class='add'>+dev-pkg: libqt4-dev</div><div class='add'>+state: stable</div><div class='add'>+scope: Nokia MeeGo</div><div class='add'>+headers: /usr/include/qt4/QtGui/*</div><div class='add'>+</div><div class='add'>+interface: QtHelp</div><div class='add'>+type: library</div><div class='add'>+libs-pkg: libqt4-help</div><div class='add'>+dev-pkg: libqt4-dev</div><div class='add'>+state: stable</div><div class='add'>+scope: Nokia MeeGo</div><div class='add'>+headers: /usr/include/qt4/QtHelp/*</div><div class='add'>+</div><div class='add'>+interface: QtMultimedia</div><div class='add'>+type: library</div><div class='add'>+libs-pkg: libqt4-multimedia</div><div class='add'>+dev-pkg: libqt4-dev</div><div class='add'>+state: stable</div><div class='add'>+scope: Nokia MeeGo</div><div class='add'>+headers: /usr/include/qt4/QtMultimedia/*</div><div class='add'>+</div><div class='add'>+interface: QtNetwork</div><div class='add'>+type: library</div><div class='add'>+libs-pkg: libqt4-network</div><div class='add'>+dev-pkg: libqt4-dev</div><div class='add'>+state: stable</div><div class='add'>+scope: Nokia MeeGo</div><div class='add'>+headers: /usr/include/qt4/QtNetwork/*</div><div class='add'>+</div><div class='add'>+interface: QtOpenGL</div><div class='add'>+type: library</div><div class='add'>+libs-pkg: libqt4-opengl</div><div class='add'>+dev-pkg: libqt4-dev libqt4-opengl-dev</div><div class='add'>+state: stable</div><div class='add'>+scope: Nokia MeeGo</div><div class='add'>+headers: /usr/include/qt4/QtOpenGL/*</div><div class='add'>+</div><div class='add'>+interface: QtScript</div><div class='add'>+type: library</div><div class='add'>+libs-pkg: libqt4-script</div><div class='add'>+dev-pkg: libqt4-dev</div><div class='add'>+state: stable</div><div class='add'>+scope: Nokia MeeGo</div><div class='add'>+headers: /usr/include/qt4/QtScript/*</div><div class='add'>+</div><div class='add'>+interface: QtSql</div><div class='add'>+type: library</div><div class='add'>+libs-pkg: libqt4-sql-sqlite libqt4-sql</div><div class='add'>+dev-pkg: libqt4-dev</div><div class='add'>+state: stable</div><div class='add'>+scope: Nokia MeeGo</div><div class='add'>+headers: /usr/include/qt4/QtSql/*</div><div class='add'>+</div><div class='add'>+interface: QtSvg</div><div class='add'>+type: library</div><div class='add'>+libs-pkg: libqt4-svg</div><div class='add'>+dev-pkg: libqt4-dev</div><div class='add'>+state: stable</div><div class='add'>+scope: Nokia MeeGo</div><div class='add'>+headers: /usr/include/qt4/QtSvg/*</div><div class='add'>+</div><div class='add'>+interface: QtTest</div><div class='add'>+type: library</div><div class='add'>+libs-pkg: libqt4-test</div><div class='add'>+dev-pkg: libqt4-dev</div><div class='add'>+state: stable</div><div class='add'>+scope: Nokia MeeGo</div><div class='add'>+headers: /usr/include/qt4/QtTest/*</div><div class='add'>+</div><div class='add'>+interface: QtXml</div><div class='add'>+type: library</div><div class='add'>+libs-pkg: libqt4-xml</div><div class='add'>+dev-pkg: libqt4-dev</div><div class='add'>+state: stable</div><div class='add'>+scope: Nokia MeeGo</div><div class='add'>+headers: /usr/include/qt4/QtXml/*</div><div class='add'>+</div><div class='add'>+interface: QtXmlPatterns</div><div class='add'>+type: library</div><div class='add'>+libs-pkg: libqt4-xmlpatterns</div><div class='add'>+dev-pkg: libqt4-dev</div><div class='add'>+state: stable</div><div class='add'>+scope: Nokia MeeGo</div><div class='add'>+headers: /usr/include/qt4/QtXmlPatterns/*</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/harmattan/changelog b/config.profiles/harmattan/changelog<br/>new file mode 100644<br/>index 0000000..b04d788<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/changelog?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/changelog</a></div><div class='hunk'>@@ -0,0 +1,2039 @@</div><div class='add'>+qt4-x11 (4.7.2~git20110302-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#226454 - QDeclarativeTextInput::mousePressEvent() doesn't</div><div class='add'>+    call QInputContext::mouseHandler()</div><div class='add'>+  * Fixes: NB#220280 - QImage forever loops on SVG</div><div class='add'>+  * Fixes: NB#222060 - PIN UI freezes if "Continue offline" dialog is</div><div class='add'>+    shown before PIN query</div><div class='add'>+  * Fixes: NB#230591 - Regression from QFuture change</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Wed, 02 Mar 2011 12:06:31 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.2~git20110221-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#227660 - QFuture uses internally QTime, instead of</div><div class='add'>+    QElapsedTimer</div><div class='add'>+  * Fixes: NB#226474 - imMicroFocus query on QML TextInput returns the</div><div class='add'>+    start of preedit instead of cursor position</div><div class='add'>+  * Fixes: NB#208927 - X dithering looks better than meego</div><div class='add'>+    graphicssystem one</div><div class='add'>+  * Fixes: NB#224327 - Malformed windows icons cause out of bounds</div><div class='add'>+    writes</div><div class='add'>+  * Fixes: NB#224413 - XPM files crash QImage (write)</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Mon, 21 Feb 2011 14:15:37 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.2~git20110215-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#224314 - malformed bmp's cause QImage to write out of</div><div class='add'>+    bounds</div><div class='add'>+  * Fixes: NB#225732 - QGraphicsItem::ItemStopsClickFocusPropagation</div><div class='add'>+    doesn't stop propagation</div><div class='add'>+  * Fixes: NB#221924 - Morpheus crashes when network connection is lost</div><div class='add'>+  * Fixes: NB#218317 - All capital "i" in turkish is wrong inside of</div><div class='add'>+    buttons.</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Thu, 17 Feb 2011 11:50:12 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.2~git20110208-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#217912 - Deadlock after changes in qprocess_unix</div><div class='add'>+  * Fixes: NB#217850 - floating point compiler optimization has no</div><div class='add'>+    effect</div><div class='add'>+  * Fixes: NB#226130 - QtQuick 1.1 integration</div><div class='add'>+  * Fixes: NB#226478 - TextEdit and TextInput need text selection modes</div><div class='add'>+  * Fixes: NB#226484 - TextInput selectWord() on word's first letter</div><div class='add'>+    often selects two words</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Wed, 09 Feb 2011 15:54:33 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.2~git20110203-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#215586 - Qt make unnecessary X calls on each mouse move</div><div class='add'>+    event QETWidget::translateXI2Event</div><div class='add'>+  * Fixes: NB#210752 - Text in QML application disappears after</div><div class='add'>+    application is restored from task switcher</div><div class='add'>+  * Fixes: NB#221806 - Subsequent signal networkAccessibleChanged</div><div class='add'>+    emitting problem of class QNetworkAccessManager</div><div class='add'>+  * Fixes: NB#218404 - Memory leaks in qx11embed_x11.cpp</div><div class='add'>+  * Fixes: NB#218410 - Fix error case in getNetWmState() in</div><div class='add'>+    qwidget_x11.cpp</div><div class='add'>+  * Fixes: NB#225875 - Integrate</div><div class='add'>+    1137379e98cab8cc67fac70b31c97001c4473eb0</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Tue, 08 Feb 2011 10:13:03 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.2~git20110119-0maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Fixes: NB#221230 - libqt4-meegographicssystemhelper needs to depend</div><div class='add'>+    on libqt4-meegographicssystem instead of recommends</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Mon, 24 Jan 2011 10:08:26 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.2~git20110119-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#212758 - creating a QPixmap triggers creation of the</div><div class='add'>+    qt_gl_share_widget</div><div class='add'>+  * Fixes: NB#219685 - QSystemSemaphore and QSharedMemory are influenced</div><div class='add'>+    by TMPDIR</div><div class='add'>+  * Fixes: NB#188780 - Items in larger layout are not centered</div><div class='add'>+  * Fixes: NB#218317 - All capital "i" in turkish is wrong inside of</div><div class='add'>+    buttons.</div><div class='add'>+  * Fixes: NB#216667 - libqt4-meego-dev is not available for i386 at all</div><div class='add'>+  * Fixes: NB#214064 - Latest focus changes break some platform</div><div class='add'>+    components</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Wed, 19 Jan 2011 17:06:16 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.2~git20110111-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#205680 - meego graphicssystem clears scene even if</div><div class='add'>+    Qt::WA_OpaquePaintEvent is set</div><div class='add'>+  * Fixes: NB#215368 - QMeeGoSwitchEvent's eventNumber() is not static</div><div class='add'>+    and the class is not exported</div><div class='add'>+  * Fixes: NB#211573 - Qt not configured with -dbus-linked</div><div class='add'>+  * Fixes: NB#211951 - Qt unnecessary build dependency to libxcursor-dev</div><div class='add'>+  * Fixes: NB#214064 - Latest focus changes break some platform</div><div class='add'>+    components</div><div class='add'>+  * Fixes: NB#216968 - QHostInfoCache should use QElapsedTimer instead</div><div class='add'>+    of QTime</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Wed, 12 Jan 2011 12:23:50 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.2~git20101231-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#213183 - Ensure two Qt raster fixes are released.</div><div class='add'>+  * Fixes: NB#215639 - Need to repopulate texture glyph cache after</div><div class='add'>+    recreating GL context</div><div class='add'>+  * Fixes: NB#212887 - would be possible to open these descriptors on-</div><div class='add'>+    demand</div><div class='add'>+  * Fixes: NB#195919 - Check whether shader compilation can be improved</div><div class='add'>+  * Fixes: NB#195442 - OpenGL paint engine produces artifacts with big</div><div class='add'>+    images</div><div class='add'>+  * Fixes: NB#186988 - opengl render Chinese text: fast change text,</div><div class='add'>+    text become black block.</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Mon, 03 Jan 2011 13:50:51 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.2~git20101209-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#205593 - Any app using meegotouch prints to console when started</div><div class='add'>+  * Fixes: NB#206111 - Sometimes MLabels apppear empty even if the text is set</div><div class='add'>+  * Fixes: NB#208617 - QtProxyFactory does not return correct (any) proxy data</div><div class='add'>+  * Fixes: NB#209473 - &lt;UninitVar&gt; qgraphicslayoutitem.cpp:143</div><div class='add'>+  * Fixes: NB#209863 - Qt tries to use id of a destroyed window</div><div class='add'>+  * Fixes: NB#210024 - MGS should provide translucency on a per-window basis</div><div class='add'>+  * Fixes: NB#210594 - Integration of focus change fixes</div><div class='add'>+  * Fixes: NB#210599 - QDeclarativeEngine object ownership issues</div><div class='add'>+  * Fixes: NB#210416 - Framerate in portrait is significantly lower than</div><div class='add'>+    in landscape</div><div class='add'>+  * Fixes: NB#199755 - Network session error when attempting to open</div><div class='add'>+    network session</div><div class='add'>+  * Fixes: NB#201619 - Synchronization is stuck in the progress</div><div class='add'>+    indicator screen when the internet is interrupted while sync</div><div class='add'>+  * Fixes: NB#209996 - Backup options view:Text inside the text box not</div><div class='add'>+    displayed properly in potrait mode</div><div class='add'>+  * Fixes: NB#194987 - Not all the synced contacts with S60 (N97 mini)</div><div class='add'>+    have an avatar</div><div class='add'>+  * Fixes: NB#206740 - Event handling in x11EventSourceDispatch is slow</div><div class='add'>+  * Fixes: NB#207115 - Qt calls eglSwapBuffers when no painting happened</div><div class='add'>+  * Fixes: NB#206119 - QSizePolicy causes the performance slow down</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Thu, 16 Dec 2010 12:22:45 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.2~git20101130-0maemo6) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Fixes: NB#198573 - Need for Signals from Qt indicating aboutToSwich and swiched state</div><div class='add'>+  * Fixes: NB#194509 - Network access from a Qt app makes dbus daemon consume tons of cpu</div><div class='add'>+  * Fixes: NB#165283 - artificial emboldening doesn't work</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Tue, 07 Dec 2010 15:31:57 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.2~git20101130-0maemo4) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Fixes: NB#205453 - Qt Update cause blocker performance drop in browser.</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Fri, 10 Dec 2010 13:21:07 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.1~git20101130.really.4.7.1~git20101118-0maemo3) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Revert to previous release.</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Fri, 03 Dec 2010 11:24:03 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.1~git20101118-0maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Proper workaround for bug 196954.</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Mon, 29 Nov 2010 14:05:44 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.1~git20101118-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Enable using OpenGL scissor test</div><div class='add'>+  * Fixes: NB#188174 - The effect of filling massive amount of html &lt;div&gt; elements with color ...</div><div class='add'>+  * Fixes: NB#194032 - Gallery crashed random while slideshow is going on</div><div class='add'>+  * Fixes: NB#193247 - Slider widget crashes WG in a given scenario</div><div class='add'>+  * Fixes: NB#199790 - Qt sends touch point update event too late on release.</div><div class='add'>+  * Fixes: NB#200091 - Random crashes observed when trying to paste value</div><div class='add'>+  * Fixes: NB#163620 - QtTest headers prevent compilation with -Wshadow -Werror</div><div class='add'>+  * Fixes: NB#189468 - &lt;Safety&gt; Invalid read reported by valgrind in libX11 when analysing accounts-ui application</div><div class='add'>+  * Fixes: NB#191811 - &lt;Safety&gt; Invalid read frequently reported in scratchbox</div><div class='add'>+  * Fixes: NB#193881 - Image format autodetection causes unnecessary lseeks</div><div class='add'>+  * Fixes: NB#198023 - GLib &gt;= 2.22 requires use of g_main_context_push_thread_default in QEventDispatcher when a QThread is created</div><div class='add'>+  * Fixes: NB#202866 - MeeGo graphicssystem dithering for textures with alpha channel looks crappy</div><div class='add'>+  * Fixes: NB#204234 - obsolete driver work-around</div><div class='add'>+  * Fixes: NB#204890 - device lock prompt keeps reappearing</div><div class='add'>+  * Fixes: NB#194345 - CoreWeb: 950 coredumps with stacktrace ending in QGestureManager::deliverEvents()</div><div class='add'>+  * Fixes: NB#204098 - qstrtod does not reset errno</div><div class='add'>+  * Fixes: NB#161439 - Using optimizations causes trouble</div><div class='add'>+  * Fixes: NB#186988 - opengl render Chinese text: fast change text, text become black block</div><div class='add'>+  * Fixes: NB#193505 - after maximizing applications fonts are sometimes corrupted</div><div class='add'>+  * Fixes: 204443 - Pinch gesture semantics change</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Mon, 22 Nov 2010 12:05:12 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.1~git20101111.really.4.7.1~git20101103-0maemo2) unstable; urgen</div><div class='add'>+</div><div class='add'>+  * Revert to previous released version</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Fri, 19 Nov 2010 10:50:40 +</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.1~git20101103-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Provide menu link and icon for QMLViewer</div><div class='add'>+  * Remove backported QScroller patch, it is to be used externally</div><div class='add'>+  * Fixes: NB#196806 - &lt;MemLeak&gt; Memory leak in feednamespacepluginmanager.cpp</div><div class='add'>+  * Fixes: NB#164431 - Blocking dialog doesn't work correctly</div><div class='add'>+  * Fixes: NB#170001 - QTouchEvent::touchpoint's isPrimary -method returns always false</div><div class='add'>+  * Fixes: NB#191116 - &lt;MemLeak&gt; Memory leak reported by valgrind on device, in XIQueryPointer.c</div><div class='add'>+  * Fixes: NB#198833 - Qt forgets to initialize members of QSharedPointer and its helpers</div><div class='add'>+  * Fixes: NB#200433 - cannot compile QMeeGoLivePixmap::livePixmapWithSize</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Thu, 04 Nov 2010 12:14:46 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.1~git20101021-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Previous problem with the experimental client decorations are</div><div class='add'>+  * now fixed, enable them again.</div><div class='add'>+  * Fixes: NB#195540 - libqt4-doc has extra &lt;tr&gt; tags</div><div class='add'>+  * Fixes: NB#198766 - MeeGo graphicssystem does not create proper deep copies of QPixmaps</div><div class='add'>+  * Fixes: NB#194397 - /usr/lib/qt4/imports/Qt/labs/ missing from packages</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Thu, 21 Oct 2010 16:01:33 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.1~git20101008-0maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Disable experimental client decorations again</div><div class='add'>+  * Fixes: NB#196543 - libQtMeeGoGraphicsSystemHelper not shipped with latest packages</div><div class='add'>+  * Fixes: NB#196712 - SVG and PNG data URIs don't work in offline mode</div><div class='add'>+  * Fixes: NB#197530 - Missing menu items from ui-file</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Fri, 15 Oct 2010 11:49:02 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.1~git20101008-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Backport QScroller from 4.8</div><div class='add'>+  * Fixes: NB#184580 - QGraphicsItem::setCacheMode(DeviceCoordinateCache) unefficient in portrait mode</div><div class='add'>+  * Fixes: NB#191792 - QML: clickable items in GridView intermittently unresponsive on B2 hardware</div><div class='add'>+  * Fixes: NB#189797 - Qt build-depends circular dependency</div><div class='add'>+  * Fixes: NB#183846 - VKB adds and accumulates _NET_WM_STATE atoms when ever it's shown</div><div class='add'>+  * Fixes: 192385 - QML: runtime.orientation doesn't change when device orientation changes</div><div class='add'>+  * Fixes: NB#197181 - host binaries in libqt4-dev do not work in x86 target</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Fri, 08 Oct 2010 14:14:42 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.1~git20101001-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Cross-compile Qt and install both host and native binaries</div><div class='add'>+  * of build tools</div><div class='add'>+  * Enable experimental client decorations</div><div class='add'>+  * Fixes: NB#191476 - Wrong reordering of Bidi Text in Labels</div><div class='add'>+  * Fixes: NB#186087 - QGraphicsItem never gets focusOutEvent on hide</div><div class='add'>+  * Fixes: NB#186988 - opengl render Chinese text: fast change text, text become black block</div><div class='add'>+  * Fixes: NB#189686 - connecting to dbus slows down MApplication c'tor creation by ~80ms</div><div class='add'>+  * Fixes: NB#188145 - Network interface doesn't go down after last client disconnects</div><div class='add'>+  * Fixes: NB#189001 - Qt4.7 bearer management icd plugin uses embedded libconninet</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Fri, 01 Oct 2010 12:44:54 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.0~git20100917-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#187981 - Device hangs up when region is set to Arabic language.</div><div class='add'>+  * Fixes: NB#163798 - QRasterPaintEnginePrivate::drawImage using memcpy instead of ARM optimized implementation</div><div class='add'>+  * Fixes: NB#187851 - Font rendering issues with Nokia font</div><div class='add'>+  * Fixes: NB#190817 - libqt4-doc has extra &lt;/div&gt; and &lt;tr&gt; tags</div><div class='add'>+  * Fixes: NB#191880 - QPixmap::size() should return 0x0 when there is no data</div><div class='add'>+  * Fixes: NB#193700 - Pinching in calendar weekly view regression</div><div class='add'>+</div><div class='add'>+ -- Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;  Tue, 21 Sep 2010 10:48:49 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.0~git20100827-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#189487 - qt4-x11 fails to build due to problems with opening data base file doc/qch/qt.qch</div><div class='add'>+  * Fixes: NB#174335 - Pinch gesture events are sent twice to application</div><div class='add'>+  * Fixes: NB#175685 - QTextDocument setTextDirection without QStaticText is not obeyed in Qt 4.7</div><div class='add'>+  * Fixes: NB#185563 - QTouchEvents are not correctly delivered to widgets</div><div class='add'>+</div><div class='add'>+ -- Bojan Radakovic &lt;bojan.radakovic@nokia.com&gt;  Mon, 06 Sep 2010 16:48:24 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.0~git20100823-0maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Fixes: NB#178358 - Qt doc package missing</div><div class='add'>+  * Stop building QtWebKit library from Qt source tree. QtWebKit will </div><div class='add'>+  * be delivered as an independent package.</div><div class='add'>+</div><div class='add'>+ -- Bojan Radakovic &lt;bojan.radakovic@nokia.com&gt;  Tue, 31 Aug 2010 10:10:15 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.0~git20100823-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#178358 - Qt doc package missing</div><div class='add'>+  * Fixes: NB#183896 - QAuthenticator need to be patched to enable signon usage for authentication</div><div class='add'>+  * Fixes: NB#176070 - QNetworkAccessManager can't be used in QThreads </div><div class='add'>+  * Fixes: NB#176651 - Height for Width in QGraphicsLayout</div><div class='add'>+  * Fixes: NB#174429 - Qt source packages are missing API files</div><div class='add'>+</div><div class='add'>+ -- Stefano Pironato &lt;stefano.pironato@nokia.com&gt;  Tue, 24 Aug 2010 14:11:00 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.0~git20100811-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream </div><div class='add'>+  * Fixes: NB#165683 - QGraphicsGridLayout::setColumnSpacing is used even after item has been removed</div><div class='add'>+  * Fixes: NB#172554 - POP: Random fenix crash @ "QAbstractSocket::writeData" when move to option selected</div><div class='add'>+  * Fixes: NB#175618 - qDrawBorderPixmap is not executing correctly when borders are too thick</div><div class='add'>+  * Fixes: NB#176643 - Segmentation fault occurs while using networking</div><div class='add'>+  * Fixes: NB#180034 - we need QTBUG-11213 fixed in Harmattan - QUuid::createUuid() is not random at all</div><div class='add'>+  * Fixes: NB#182005 - Unable to build libmcontentwidgets package with libqt4 4.7.0~git20100716-0maemo1+0m6</div><div class='add'>+</div><div class='add'>+ -- Bojan Radakovic &lt;bojan.radakovic@nokia.com&gt;  Wed, 11 Aug 2010 11:03:15 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.0~git20100716-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream </div><div class='add'>+  * Fixes: NB#176070 - QNetworkAccessManager can't be used in QThreads</div><div class='add'>+  * Fixes: NB#180047 - Call UI gets shrunken while calling any number</div><div class='add'>+  * Fixes: NB#174856 - QNetworkAccessManager broken in 4.7.0~git20100609-0maemo1+0m6</div><div class='add'>+  * Fixes: NB#179240 - QFile::read does not advance the stream</div><div class='add'>+  * Fixes: NB#173119 - Bidirectional Text Rendering in Arabic language is broken with Latin characters</div><div class='add'>+  * Fixes: NB#161897 - DuiInfoBanner's setBodyText ignores &lt;br/&gt; tag</div><div class='add'>+  * Fixes: NB#177478 - QAuthenticator should have property map</div><div class='add'>+</div><div class='add'>+ -- Janne Hamalainen &lt;janne.a.hamalainen@nokia.com&gt;  Thu, 22 Jul 2010 11:19:09 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.0~git20100704-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Fixes: NB#172773 - celluid process is causing the wakeups in idle mode</div><div class='add'>+  * Fixes: NB#175064 - QNetworkSession signals wrong state after calling stop()</div><div class='add'>+</div><div class='add'>+ -- Adrian Constantin &lt;adrian.constantin@nokia.com&gt;  Mon, 5 Jul 2010 14:39:09 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.0~git20100614-0maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Fixes: NB#167514 - [browser-blocker] Multitouch events don't work if application is launched during device start-up</div><div class='add'>+  * Fixes: NB#175383 - qt4-acceptance-tests fail during ART Execution</div><div class='add'>+</div><div class='add'>+ -- Adrian Constantin &lt;adrian.constantin@nokia.com&gt;  Mon, 5 Jul 2010 14:39:09 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.0~git20100614-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#172906 - Majority of applications crashing on exit</div><div class='add'>+  * Fixes: NB#173866 - Data added to HTML5 database doesn't get flushed/persisted to database</div><div class='add'>+  * Fixes: NB#173250 - QGLContext can create end up creating a QWidget during the QApplication destructor, leading to crash</div><div class='add'>+</div><div class='add'>+ -- Adrian Constantin &lt;adrian.constantin@nokia.com&gt;  Tue, 15 Jun 2010 11:14:33 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.7.0~git20100609-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#170006 - Qt 4.7 singleShot timer calls function immediately instead of at the next event loop</div><div class='add'>+  * Fixes: NB#167058 - TapGesture not working </div><div class='add'>+  * Fixes: NB#173089 - The Qt 4.7 does not compile icd bearermanagement network plugin  </div><div class='add'>+  * Fixes: NB#172749 - If grabGesture() called QGraphicsWidget will crash in deletion</div><div class='add'>+  * Fixes: NB#155179 - (QTBUG-9707) qpainter-&gt;drawTiledPixmap cause slow call of QX11PixmapData::toImage.</div><div class='add'>+</div><div class='add'>+ -- Bojan Radakovic &lt;bojan.radakovic@nokia.com&gt;  Thu, 10 Jun 2010 16:46:15 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.3~git20100602.0.4.7-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Release Qt 4.7. The version still keeps the 4.6.3 package version, </div><div class='add'>+  * in order to allow for emergency rollback to Qt 4.6.</div><div class='add'>+  * Fixes: NB#161556 - [METABUG] Integrate Qt 4.7 into Harmattan</div><div class='add'>+  * Fixes: NB#151100 - (QT-2948) The Qt Reg-Exp engine sometimes gives false positive empty match</div><div class='add'>+  * Fixes: NB#157450 - Frequent use of QTime in animation related routines causes bad performance</div><div class='add'>+  * Fixes: NB#156908 - Qt's QTime::currentTime is slow</div><div class='add'>+  * Fixes: NB#166193 - MDialog crashes with ~40% likelihood</div><div class='add'>+  * Fixes: NB#170944 - Gesture not delivered to a QGraphicsWidget, asserts inside Qt</div><div class='add'>+</div><div class='add'>+ -- Adrian Constantin &lt;adrian.constantin@nokia.com&gt;  Wed, 4 Jun 2010 12:46:15 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.3~git20100521-0maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#169433 -  when freeing a QQLWidget not all memory is actually freed</div><div class='add'>+  * Fixes: NB#165175 -  a class inherited from QDBusInterface can't invoke a method</div><div class='add'>+</div><div class='add'>+ -- Janne Hamalainen &lt;janne.a.hamalainen@nokia.com&gt;  Tue, 25 May 2010 10:13:31 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.3~git20100514-0maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#164183 - Random gestureEvent crashes</div><div class='add'>+</div><div class='add'>+ -- Bojan Radakovic &lt;bojan.radakovic@nokia.com&gt;  Tue, 18 May 2010 12:57:30 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.3~git20100411-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#162327 unlocking the device causes a segfault in any app open in foreground</div><div class='add'>+  * Fixes: NB#163414 Crash when hiding VKB and keep finger on screen.</div><div class='add'>+  * Fixes: NB#160270 &lt;MemLeak&gt; valgrind report shows memory leak for QImage::save()</div><div class='add'>+</div><div class='add'>+ -- Bojan Radakovic &lt;bojan.radakovic@nokia.com&gt;  Mon, 12 Apr 2010 13:51:00 +2000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.3~git20100319-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Multi-touch support</div><div class='add'>+  * Fixes: NB#159993  Qt is freezing application for 2 seconds when calling showFullScreen</div><div class='add'>+  * Fixes: NB#155384 Make drawGlyphs API public</div><div class='add'>+</div><div class='add'>+ -- Stefano Pironato &lt;stefano.pironato@nokia.com&gt;  Fri, 19 Mar 2010 15:31:00 +2000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.3~git20100310-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#146992 Double tap doesn't get recognized in MAFW test gui</div><div class='add'>+  * Fixes: NB#134295 QDBusInterface::callWithCallback deadlocks if called from the callWithCallback error callback</div><div class='add'>+</div><div class='add'>+ -- Bojan Radakovic &lt;bojan.radakovic@nokia.com&gt;  Mon, 15 Mar 2010 12:34:26 +2000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.3~git20100224-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Remove Qt3Support</div><div class='add'>+  * Add lconvert</div><div class='add'>+  * Fixes: NB#154800 Using -opensource configuration in maemo6</div><div class='add'>+  * Fixes: NB#158708 Googleplugin crashes while configuring google account</div><div class='add'>+  * Fixes: NB#158242 all unit tests for quillimagefilter-tests are core dumped</div><div class='add'>+  * Fixes: NB#157696 QDBusServiceWatcher watches only one service at a time</div><div class='add'>+</div><div class='add'>+ -- Janne Hamalainen &lt;janne.a.hamalainen@nokia.com&gt;  Wed, 24 Feb 2010 11:34:26 +2000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.2~git20100205-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#142357 - (#QT-2307) Using QDBus::CallMode other than </div><div class='add'>+  *        QDBus::Block produces invalid reply</div><div class='add'>+  * Fixes: NB#138587 - QGraphicsGridLayout row span feature is not working properly</div><div class='add'>+  * Fixes: NB#153726 - QtMultimedia module is not packaged</div><div class='add'>+</div><div class='add'>+ -- Adrian Constantin &lt;adrian.constantin@nokia.com&gt;  Fri, 12 Feb 2010 12:20:26 +2000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.1~git20091228.4-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Turn off the HW multi-touch implementation using kernel device API.</div><div class='add'>+  * Removed Qt Assistant and Designer packages.</div><div class='add'>+  * Fixes: NB#148497 - Devel package missing requires for some libraries</div><div class='add'>+  * Fixes: NB#151088 - Packaging of the Qt4.6 developer tools</div><div class='add'>+</div><div class='add'>+ -- Adrian Constantin &lt;adrian.constantin@nokia.com&gt;  Thu, 14 Jan 2010 12:43:37 +2000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.1~git20091228.2-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Fixes: NB#144690 - Please cherrypick ConsumeEventHint patch (Gesture)</div><div class='add'>+  * Fixes: NB#143903 - Application not working in none gui mode -&gt; The KDE libs cannot be installed.</div><div class='add'>+  * Fixes: NB#143427 - Qt 4.6 - lrelease does not accept empty &lt;source&gt;</div><div class='add'>+  * Fixes: NB#147283 - All DUI application crash in scratchbox</div><div class='add'>+  * Fixes: NB#147461 - QVariant::isNull() == true after QVariant::setValue()</div><div class='add'>+  * Fixes: NB#149547 - With latest Qt 20091127 Clock  application is closing on setting alarm operation</div><div class='add'>+  * Fixes: NB#117725 - sb2 cannot build camera-ui</div><div class='add'>+  * Fixes: NB#148359 - webkit traverse fixture links against phonon but it is not in package dependencies</div><div class='add'>+  * Fixes: NB#148082 - Performance of the graphics view drops when text element is rotated</div><div class='add'>+  * Fixes: NB#142507 - QTimeLine's signals are not sent while an object is being dragged with mouseMoveEvent()</div><div class='add'>+  * Fixes: NB#147744 - Translucent QGLWidgets no longer works</div><div class='add'>+  * Fixes: NB#150790 - QWebKit based application crashes when executing SunSpider</div><div class='add'>+  * Fixes: NB#150808 - Loading a web page from network to qwebview fails on columbus</div><div class='add'>+</div><div class='add'>+ -- Stefano Pironato &lt;stefano.pironato@nokia.com&gt;  Tue, 05 Jan 2010 11:10:00 +2000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20091030.2-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Fixes: NB#129594 - Qt compiled without compiler optimization</div><div class='add'>+  * The X org package does not support the MIT SHM extension anymore, </div><div class='add'>+    so the MIT SHM option is removed from Qt configuration also.</div><div class='add'>+</div><div class='add'>+ -- Adrian Constantin &lt;adrian.constantin@nokia.com&gt;  Fri, 20 Nov 2009 16:59:11 +2000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20091030-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#134295 - QDBusInterface::callWithCallback deadlocks if called from the callWithCallback error callback</div><div class='add'>+  * Fixes: NB#133005 - enabling accessibility while building Qt </div><div class='add'>+  * Fixes: NB#144501 - Application launcher does not start with the new Qt 4.6 versions</div><div class='add'>+  * Fixes: NB#129494 - Qt compiled without compiler optimization</div><div class='add'>+</div><div class='add'>+ -- Adrian Constantin &lt;adrian.constantin@nokia.com&gt;  Fri, 30 Oct 2009 15:13:18 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20091012-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Fixes: NB#141280 - libqt4-dev.postinst rules for Qt4.6 wrong</div><div class='add'>+  * Fixes: NB#133500 - libqt4-dev postinst is broken by update-alternatives from dpkg 1.15</div><div class='add'>+  * Fixes: NB#142136 - Error in satisfying dependencies for qt4-x11</div><div class='add'>+</div><div class='add'>+ -- Stefano Pironato &lt;stefano.pironato@nokia.com&gt;  Thu, 12 Oct 2009 10:30:00 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20091008-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Fixes NB#141891: - Compiling a library which uses QStateMachine doesn't work</div><div class='add'>+  * Modify rpath-link options to adapt to armel scratchbox environment</div><div class='add'>+</div><div class='add'>+ -- Adrian Constantin &lt;adrian.constantin@nokia.com&gt;  Wed, 08 Oct 2009 11:18:37 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20091002-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#141550 - Error in qdatastream.h in libqt4-dev 4.6.0~git20091001-0maemo1+0m6</div><div class='add'>+  * Fixes: NB#140293 - applet titles in applet library are not shown properly - added PATCH in qt changing glyph cache</div><div class='add'>+  * Fixes: NB#140727 - Enable multitouch support on device</div><div class='add'>+  * Fixes: NB#123012 - QPainter::drawTiledPixmap does not work properly with</div><div class='add'>+    non-power-of-two pixmaps when used in a DuiWidgetView</div><div class='add'>+</div><div class='add'>+ -- Stefano Pironato &lt;stefano.pironato@nokia.com&gt;  Thu, 01 Oct 2009 15:08:32 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20090925-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#140735 - QtGui 4.6 should have dependency to EGL</div><div class='add'>+  * Fixes: NB#139269 - qmake CONFIG=debug does not add -g</div><div class='add'>+</div><div class='add'>+ -- Adrian Constantin &lt;adrian.constantin@nokia.com&gt;  Fri, 25 Sep 2009 15:48:32 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20090911-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Fixes: NB#111282 - Homescreen rotation takes too long</div><div class='add'>+  * Fixes: NB#110604 - DuiLayouts using DuiFlowLayoutPolicy don't resize properly</div><div class='add'>+  * Fixes: NB#121054 - Items being not painted until update()/paint() explicitly called</div><div class='add'>+</div><div class='add'>+ -- Adrian Constantin &lt;adrian.constantin@nokia.com&gt;  Fri, 11 Sep 2009 15:17:33 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20090909-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Fixes: NB#137778 - qt macro causing build error when using -pedantic</div><div class='add'>+  * Fixes: NB#137775 - qt debian packaking installing a missing file</div><div class='add'>+</div><div class='add'>+ -- Adrian Constantin &lt;adrian.constantin@nokia.com&gt;  Wed, 09 Aug 2009 15:52:51 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20090907-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+  * Fixes: NB#104827 - DuiLabel truncate arabic string and renders replaces the MEDIAL form character into FINAL on the point of truncation</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Tue, 08 Aug 2009 15:17:24 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20090828-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Mon, 24 Aug 2009 15:47:37 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20090824-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+  * Fixes: NB#127429 - QtOpenGL public header refers to non-existant qglshaderprogram.h</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Mon, 24 Aug 2009 15:47:37 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20090820-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Thu, 20 Aug 2009 16:16:14 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20090819-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+  * Fixes: NB#132164 - libqt4-webkit package is broken</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Wed, 19 Aug 2009 15:32:21 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20090728-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+  * Fixes: NB#129594 - Qt compiled without compiler optimization</div><div class='add'>+  * Fixes: NB#127404 - Rendering errors with OpenGL in Qt 4.6</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Thu, 30 Jul 2009 14:02:24 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20090717-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Fixes: NB#117929 - Qt mkspecs use -Wl,--rpath by default causing warnings in Debian packaging</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Wed, 15 Jul 2009 10:32:20 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20090717-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream</div><div class='add'>+  * Partial fix for 127404.</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Wed, 15 Jul 2009 10:32:20 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.6.0~git20090706-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Switch to using 4.6.</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Wed, 07 Jul 2009 10:32:20 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.2~git20090701-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Fixes: NB#122175 - Qt debugging symbols issues </div><div class='add'>+  * Pull from upstream.</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Wed, 07 Jul 2009 10:32:20 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.2~git20090605-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+</div><div class='add'>+ -- Gareth Pethig &lt;gareth.pethig@nokia.com&gt;  Fri, 05 Jun 2009 19:46:34 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.2~git20090601-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+</div><div class='add'>+ -- Gareth Pethig &lt;gareth.pethig@nokia.com&gt;  Mon, 01 Jun 2009 17:01:23 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.2~git20090525-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+</div><div class='add'>+ -- Gareth Pethig &lt;gareth.pethig@nokia.com&gt;  Mon, 25 May 2009 15:30:34 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.2~git20090515-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+</div><div class='add'>+ -- Gareth Pethig &lt;gareth.pethig@nokia.com&gt;  Fri, 15 May 2009 20:01:16 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.2~git20090508-0maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Changed control file as per Maemo patch.</div><div class='add'>+</div><div class='add'>+ -- Gareth Pethig &lt;gareth.pethig@nokia.com&gt;  Mon, 11 May 2009 18:49:23 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.2~git20090508-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+</div><div class='add'>+ -- Gareth Pethig &lt;gareth.pethig@nokia.com&gt;  Fri, 08 May 2009 17:51:46 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.2~git20090506-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Removed -lxcb-xlib referance from mkspec.</div><div class='add'>+</div><div class='add'>+ -- Gareth Pethig &lt;gareth.pethig@nokia.com&gt;  Wed, 06 May 2009 19:01:22 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.2~git20090505-0maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Removed old EGL config patch.</div><div class='add'>+</div><div class='add'>+ -- Gareth Pethig &lt;gareth.pethig@nokia.com&gt;  Wed, 06 May 2009 14:42:35 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.2~git20090505-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+  * Added gles translucency patch</div><div class='add'>+</div><div class='add'>+ -- Gareth Pethig &lt;gareth.pethig@nokia.com&gt;  Tue, 05 May 2009 21:32:21 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.2~git20090424-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+</div><div class='add'>+ -- Gareth Pethig &lt;gareth.pethig@nokia.com&gt;  Fri, 24 Apr 2009 18:32:37 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.1~git20090422-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Wed, 22 Apr 2009 17:20:12 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.1~git20090417-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+  * Fixes: NB#110528 - int QTest::qExec() returns always 0...</div><div class='add'>+</div><div class='add'>+ -- Gareth Pethig &lt;gareth.pethig@nokia.com&gt;  Fri, 17 Apr 2009 13:30:20 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.1~git20090403-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+  * Fixes: NB#109352 - libqt4-dev is missing libQtUiTools.a</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Fri, 03 Apr 2009 17:04:40 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.1~git20090331-0maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Move QtClucene from the core package to the help package. This is only</div><div class='add'>+    used by assistant.</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Wed, 01 Apr 2009 16:44:52 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.1~git20090331-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Tue, 31 Mar 2009 10:35:50 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.1~git20090326-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+  * Add qdoc3 binary to qt4-dev-tools package.</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Thu, 26 Mar 2009 14:17:39 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.1~git20090324-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Tue, 24 Mar 2009 10:39:35 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.1~git20090317-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+  * Fixes: NB#105936</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Tue, 17 Mar 2009 14:15:30 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.1~git20090316-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream.</div><div class='add'>+  * Fixes: NB#103601</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Mon, 16 Mar 2009 13:14:17 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0-0maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Fixes: NB#103953, NB#103601</div><div class='add'>+  * Add additional dependencies for the phonon package.</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Thu, 05 Mar 2009 16:53:23 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream for 4.5.0 release.</div><div class='add'>+  * Fixes: NB#99812</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Thu, 27 Feb 2009 18:37:27 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20090219-0maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Removed subversion files and disabled patches.</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Thu, 19 Feb 2009 16:09:14 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20090219-maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Migrated to new repository.</div><div class='add'>+  * Merged with upstream.</div><div class='add'>+</div><div class='add'>+ -- Shane Bradley &lt;shane.bradley@nokia.com&gt;  Thu, 19 Feb 2009 14:24:45 +1000</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20090212-maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Removed include/Qt/qpixmapfilter.h from debian/libqt4-dev.install</div><div class='add'>+</div><div class='add'>+ -- Mohammad Anwari &lt;mohammad.anwari@nokia.com&gt;  Fri, 13 Feb 2009 09:50:33 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20090212-maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Merged with upstream.</div><div class='add'>+</div><div class='add'>+ -- Mohammad Anwari &lt;Mohammad.Anwari@nokia.com&gt;  Thu, 12 Feb 2009 13:45:11 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20090122-maemo6) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Added patch 102_egl_config.diff </div><div class='add'>+</div><div class='add'>+ -- Mohammad Anwari &lt;Mohammad.Anwari@nokia.com&gt;  Thu, 12 Feb 2009 12:53:25 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20090122-maemo5) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Removed old Ubuntu patches</div><div class='add'>+  * Added patch 101_multiple-translation.diff to series file</div><div class='add'>+</div><div class='add'>+ -- Tobias Koch &lt;ext-tobias.koch@nokia.com&gt;  Mon, 26 Jan 2009 18:48:50 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20090122-maemo4) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Multiple translation variant patch was added</div><div class='add'>+  * Shader patch was removed</div><div class='add'>+</div><div class='add'>+ -- Tobias Koch &lt;ext-tobias.koch@nokia.com&gt;  Mon, 26 Jan 2009 17:38:50 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20090122-maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Removed configure switch -no-tablet</div><div class='add'>+</div><div class='add'>+ -- Tobias Koch &lt;ext-tobias.koch@nokia.com&gt;  Thu, 22 Jan 2009 18:14:50 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20090122-maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Merged from upstream</div><div class='add'>+</div><div class='add'>+ -- Tobias Koch &lt;ext-tobias.koch@nokia.com&gt;  Thu, 22 Jan 2009 17:51:34 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20090108-maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Fixes for lintian errors</div><div class='add'>+  * Fixes in install files</div><div class='add'>+</div><div class='add'>+ -- Tobias Koch &lt;ext-tobias.koch@nokia.com&gt;  Thu, 15 Jan 2009 11:00:17 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20090108-maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Merged from upstream</div><div class='add'>+</div><div class='add'>+ -- Tobias Koch &lt;ext-tobias.koch@nokia.com&gt;  Thu, 08 Jan 2009 19:19:29 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20081217-maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Debug packages available again</div><div class='add'>+</div><div class='add'>+ -- Tobias Koch &lt;ext-tobias.koch@nokia.com&gt;  Wed, 07 Jan 2009 16:55:53 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20081217-maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Quilt works again</div><div class='add'>+  * Merged from upstream</div><div class='add'>+</div><div class='add'>+ -- Tobias Koch &lt;ext-tobias.koch@nokia.com&gt;  Tue, 17 Dec 2008 10:21:47 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20081216-maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Applied patch 100_glconfig_shader.diff until I have</div><div class='add'>+    figured out, why quilt won't run.</div><div class='add'>+</div><div class='add'>+ -- Tobias Koch &lt;ext-tobias.koch@nokia.com&gt;  Tue, 16 Dec 2008 12:51:47 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20081215-maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * added patch 100_glconfig_shader.diff submitted by &lt;mohammad.anwari@nokia.com&gt;:</div><div class='add'>+    * enable running Qt+GL in newer images of R***r</div><div class='add'>+    * solved the compilation of TextFragmentShader which failed because lacking of a precision of a vec4</div><div class='add'>+</div><div class='add'>+ -- Tobias Koch &lt;ext-tobias.koch@nokia.com&gt;  Mon, 15 Dec 2008 14:43:56 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20081209-maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Merge with upstream</div><div class='add'>+</div><div class='add'>+ -- Mohammad Anwari &lt;Mohammad.Anwari@nokia.com&gt;  Tue, 09 Dec 2008 10:31:45 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20081202-maemo3) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Removed libglu-dev from libqt4-opengl-dev</div><div class='add'>+</div><div class='add'>+ -- Mohammad Anwari &lt;Mohammad.Anwari@nokia.com&gt;  Fri, 05 Dec 2008 00:31:36 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20081202-maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Split opengl packages </div><div class='add'>+</div><div class='add'>+ -- Mohammad Anwari &lt;Mohammad.Anwari@nokia.com&gt;  Tue, 02 Dec 2008 16:35:31 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20081202-maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Pull from upstream </div><div class='add'>+</div><div class='add'>+ -- Mohammad Anwari &lt;Mohammad.Anwari@nokia.com&gt;  Tue, 02 Dec 2008 09:33:02 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0~git20081129-maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Copied to DUI's git </div><div class='add'>+</div><div class='add'>+ -- Mohammad Anwari &lt;Mohammad.Anwari@nokia.com&gt;  Sat, 29 Nov 2008 00:00:04 +0700</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0-maemo1-11142008) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * pull from upstream</div><div class='add'>+</div><div class='add'>+ -- Jani Mikkonen &lt;ext-jani.3.mikkonen@nokia.com&gt;  Fri, 14 Nov 2008 15:00:00 +0200</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.5.0-maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * new upstream version with gles2 support</div><div class='add'>+  * removed nonfunctional patches</div><div class='add'>+</div><div class='add'>+ -- Jani Mikkonen &lt;ext-jani.3.mikkonen@nokia.com&gt;  Tue, 11 Nov 2008 18:00:00 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.4.0-2maemo5) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Enabled Exceptions</div><div class='add'>+  * Added QT3 support libraries</div><div class='add'>+  * Added xml-patterns</div><div class='add'>+</div><div class='add'>+ -- Jani Mikkonen &lt;ext-jani.3.mikkonen@nokia.com&gt;  Tue, 28 Oct 2008 12:00:00 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.4.0-2maemo4) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * testing tag, minor changes </div><div class='add'>+</div><div class='add'>+ -- Jani Mikkonen &lt;ext-jani.3.mikkonen@nokia.com&gt;  Tue, 9 Sep 2008 16:00:00 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.4.0-2maemo3) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * libreadline dependency, no opengl</div><div class='add'>+</div><div class='add'>+ -- Arsi Antila &lt;ext-arsi.antila@nokia.com&gt;  Wed, 9 Jul 2008 15:36:34 +0300</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.4.0-2maemo2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * No interbase support for i386</div><div class='add'>+</div><div class='add'>+ -- Jussi Hakala &lt;ext-jussi.hakala@nokia.com&gt;  Wed, 18 Jun 2008 11:59:27 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.4.0-2maemo1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Configuration for maemo environment</div><div class='add'>+  * Workarounds for find/delete inside sbox environment</div><div class='add'>+  * Adjusted the control file to behave with etch dpkg</div><div class='add'>+</div><div class='add'>+ -- Jussi Hakala &lt;ext-jussi.hakala@nokia.com&gt;  Thu, 12 Jun 2008 13:57:49 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.4.0-2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  +++ Changes by Fathi Boudra:</div><div class='add'>+</div><div class='add'>+  * Split html documentation in qt4-doc-html package.</div><div class='add'>+  * Merge Ubuntu patches:</div><div class='add'>+    * Add lpia architecture in trusted dpkg-arch over uname.</div><div class='add'>+    * Add sqlite3 workaround in config tests fixes.</div><div class='add'>+  * Add qt-copy patch:</div><div class='add'>+    * 0227-qdatastream-regression</div><div class='add'>+      Fix a bug that causes all Qt3/2 applications to crash or hang under KDE4.</div><div class='add'>+</div><div class='add'>+  +++ Changes by Modestas Vainius:</div><div class='add'>+</div><div class='add'>+  * Add 16_qsortfilterproxymodel_invalidate_noscroll.diff patch which stops</div><div class='add'>+    scrolling to the current item/index on QSortFilterProxyModel::invalidate()</div><div class='add'>+    This patch has been scheduled for Qt 4.4.1 (TT #204403).</div><div class='add'>+  * Add missing Replaces:</div><div class='add'>+    - libqt4-opengl-dev replaces libqt4-dev (&lt;&lt; 4.4.0-2) due to obvious</div><div class='add'>+      reasons.</div><div class='add'>+    - libqt4-dev replaces libqt4-opengl-dev (&lt;&lt; 4.4.0-2) (due to qglobal.h</div><div class='add'>+      misplace).</div><div class='add'>+</div><div class='add'>+ -- Debian Qt/KDE Maintainers &lt;debian-qt-kde@lists.debian.org&gt;  Fri, 09 May 2008 23:35:16 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.4.0-1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * New upstream release.</div><div class='add'>+</div><div class='add'>+  +++ Changes by Modestas Vainius:</div><div class='add'>+</div><div class='add'>+  * Split OpenGL headers from libqt4-dev to libqt4-opengl-dev:</div><div class='add'>+    - Update install files.</div><div class='add'>+    - Make libqt4-opengl-dev depend on X OpenGL headers, hence remove the</div><div class='add'>+      latter from libqt4-dev Recommends.</div><div class='add'>+    - Add libqt4-opengl-dev to libqt4-dev Recommends.</div><div class='add'>+    - Remove libq4-opengl from libqt4-dev Depends.</div><div class='add'>+  * Explicitly add libqtcore4 to libqt4-dev (was implicit before).</div><div class='add'>+  * Rename libqt4-gui to libqtgui4 (new package).</div><div class='add'>+  * Make libqt4-gui a transitional package (Closes: #478694) depending on</div><div class='add'>+    libqtgui4, libqt4-opengl (Closes: #478264), libqt4-sql, libqt4-designer,</div><div class='add'>+    libqt4-assistant.</div><div class='add'>+  * Use ${binary:Version} instead of ${source:Version} in dependencies of</div><div class='add'>+    libqt4-core and libqt4-gui transitional packages.</div><div class='add'>+  * Require just libqtcore4 to install libqt4-dbg instead of libqt4-gui.</div><div class='add'>+  * Resync patches:</div><div class='add'>+    - 05_append_qt4_target.diff - fix offsets.</div><div class='add'>+    - 11_qdbus_to_dbus_fix.diff - remove, merged upstream.</div><div class='add'>+    - Revert to "runtime" configuration for xcursor, xinerama, xfixes and drop</div><div class='add'>+      16_always_init_qt_x11data_ptrx.diff patch. Fixed upstream.</div><div class='add'>+</div><div class='add'>+  +++ Changes by Fathi Boudra:</div><div class='add'>+</div><div class='add'>+  * Update libqt4-dev and libqt4-opengl-dev install to use complete files</div><div class='add'>+    list instead of wildcard.</div><div class='add'>+  * Update installed files: new qt help and assistant translations.</div><div class='add'>+  * Add qt-copy patch:</div><div class='add'>+    * 0226-qtreeview-column_resize_when_needed</div><div class='add'>+      This patch assures that if no header is shown, or if we only have one</div><div class='add'>+      column (so no other columns become shrinked), the contents will be</div><div class='add'>+      visible.</div><div class='add'>+</div><div class='add'>+ -- Debian Qt/KDE Maintainers &lt;debian-qt-kde@lists.debian.org&gt;  Tue, 06 May 2008 17:37:49 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.4.0~rc1-5) unstable; urgency=high</div><div class='add'>+</div><div class='add'>+  +++ Changes by Fathi Boudra:</div><div class='add'>+</div><div class='add'>+  * Add libqt4-sql-sqlite dependency to qt4-dev-tools. Qt Assistant and</div><div class='add'>+    qhelpgenerator use the sqlite plugin. (Closes: #476986)</div><div class='add'>+  * Remove qt-copy patches 0191 and 0192. The relevant code has changed</div><div class='add'>+    such that neither patch seems to have any effect (although listviews</div><div class='add'>+    still do not use active/inactive roles correctly).</div><div class='add'>+  * Add qt-copy patches:</div><div class='add'>+    * 0223-fix-qpixmap-hasalpha</div><div class='add'>+      Fix a performance regression in QPixmap::hasAlpha() in Qt 4.4.</div><div class='add'>+    * 0224-fast-qpixmap-fill</div><div class='add'>+      This patch avoids the expensive image-&gt;pixmap conversion by discarding</div><div class='add'>+      the old pixmap, creating a new one with the correct format, and doing</div><div class='add'>+      the fill server side.</div><div class='add'>+    * 0225-invalidate-tabbar-geometry-on-refresh</div><div class='add'>+      Fix problem where Konsole's tab bar is not shown immediately on startup.</div><div class='add'>+</div><div class='add'>+  +++ Changes by Modestas Vainius:</div><div class='add'>+</div><div class='add'>+  * Downgrade libqt4-dev *gl*-dev dependencies to Recommends.</div><div class='add'>+    They pull in half of X11 development headers and are rarely needed.</div><div class='add'>+    What's more, OpenGL apps will probably depend on them explicitly anyway.</div><div class='add'>+  * Add development packages of the SQL plugins to libqt4-dev Suggests.</div><div class='add'>+  * Make libqt4-sql recommend its plugins. Depends does not do us any good</div><div class='add'>+    because we don't know which plugin a user is going to use anyway. Moreover</div><div class='add'>+    installation of the libqt4-sql package does not necessarily imply usage of</div><div class='add'>+    the specific plugin(s). Finally, this resolves circular dependencies among</div><div class='add'>+    libqt4-sql and its plugins.</div><div class='add'>+  * Add myself to Uploaders.</div><div class='add'>+  * Add 16_always_init_qt_x11data_ptrx.diff, which ensures that X11-&gt;ptrX*</div><div class='add'>+    are properly initialized when Xcursor, Xinerama, Xfixes are not available</div><div class='add'>+    in default "runtime" configuration  (Closes: #476608).</div><div class='add'>+  * Pass -xfixes -xcursor -xinerama to configure because default "runtime"</div><div class='add'>+    configuration requires a user to have libxfixes-dev, libxcursor-dev and</div><div class='add'>+    libxinerama-dev installed to enable features requires respective X</div><div class='add'>+    libraries (QLibrary simply searches for "lib*.so"). This change in</div><div class='add'>+    configuration makes 16 patch irrelevant for Debian, but I'm leaving it</div><div class='add'>+    as it's still the fix for the crashes which might occur on default Qt 4.4</div><div class='add'>+    configutions.</div><div class='add'>+  * Optimize qmake: pass -optimized-qmake to configure.</div><div class='add'>+</div><div class='add'>+ -- Debian Qt/KDE Maintainers &lt;debian-qt-kde@lists.debian.org&gt;  Sun, 27 Apr 2008 04:15:28 +0300</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.4.0~rc1-4) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  +++ Changes by Sune Vuorela:</div><div class='add'>+</div><div class='add'>+  * Have libqt4-dev conflict/replace libqtwebkit-dev.</div><div class='add'>+  * Fix qmake to generate a bit better pkg-config files. Those should usually</div><div class='add'>+    not be generated - as it ends up being crackful. After a bit of patching</div><div class='add'>+    they are a bit less crackful though. (Closes: 457570)</div><div class='add'>+  * Postprocess prl files to remove the same crack as in the pc files.</div><div class='add'>+    (Closes: 470572)</div><div class='add'>+  * Do a bit nicer linking when needed instead of relying on crackfulness from</div><div class='add'>+    prl and pc files.</div><div class='add'>+  * Add a disabled patch to generate better prl files, but unfortunately too</div><div class='add'>+    much of qt4 build process relies on on it and is not yet fixed, but it is</div><div class='add'>+    saved for later use.</div><div class='add'>+  * Fix qmake makefile generation - should not add double slashes to</div><div class='add'>+    makefiles.</div><div class='add'>+  * Make libqt4-core transitional package arch:any. It doesn't bloat the</div><div class='add'>+    archive too much, but it helps on installability.</div><div class='add'>+</div><div class='add'>+  +++ Changes by Matthew Rosewarne:</div><div class='add'>+</div><div class='add'>+  * Add Recommends: qt4-doc to qt4-demos.</div><div class='add'>+  * Add watch file.</div><div class='add'>+</div><div class='add'>+ -- Debian Qt/KDE Maintainers &lt;debian-qt-kde@lists.debian.org&gt;  Tue, 15 Apr 2008 23:48:31 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.4.0~rc1-3) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  +++ Changes by Sune Vuorela:</div><div class='add'>+</div><div class='add'>+  * Clean up a bit in the dependencies of libqt4-dev. Removed dependencies:</div><div class='add'>+    libqt4-sql-mysql, libqt4-sql-odbc, libqt4-sql-psql, libqt4-sql-sqlite,</div><div class='add'>+    libqt4-sql-sqlite2, libqt4-sql-ibase, firebird2.0-dev, libaudio-dev,</div><div class='add'>+    libcupsys2-dev, libdbus-1-dev, libfreetype6-dev, libglib2.0-dev,</div><div class='add'>+    libice-dev, libiodbc2-dev, libjpeg62-dev, libmng-dev, libmysqlclient15-dev,</div><div class='add'>+    libpam0g-dev, libpng12-dev, libpq-dev, libreadline5-dev, libsm-dev,</div><div class='add'>+    libsqlite0-dev, libsqlite3-dev, libtiff4-dev, libx11-dev, libxcursor-dev,</div><div class='add'>+    libxext-dev, libxft-dev, libxi-dev, libxinerama-dev, libxmu-dev,</div><div class='add'>+    libxrandr-dev, libxrender-dev, libxslt1-dev, libxt-dev, x11proto-core-dev,</div><div class='add'>+    zlib1g-dev</div><div class='add'>+</div><div class='add'>+  +++ Changes by Fathi Boudra:</div><div class='add'>+</div><div class='add'>+  * Add libqt4-svg dependency to libqt4-gui. It helps for the transition as</div><div class='add'>+    libQtSvg.so.4 was previously in libqt4-gui package. (Closes: #475324)</div><div class='add'>+  * Replace libqcncodecs.so in libqt4-gui (&lt;&lt; 4.4.0~beta1-1). (Closes: #475340)</div><div class='add'>+  * Update 20_mips_atomic_ops patch. Qt4.4 introduced two new atomic operations</div><div class='add'>+    without the necessary assembler .set directives.</div><div class='add'>+    Thanks to Thiemo Seufer. (Closes: #475402)</div><div class='add'>+</div><div class='add'>+ -- Fathi Boudra &lt;fabo@debian.org&gt;  Sat, 12 Apr 2008 07:48:37 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.4.0~rc1-2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Add patch for Explicit template specialization cannot have a storage class</div><div class='add'>+    with gcc-4.3. Specializations of templates cannot explicitly specify</div><div class='add'>+    a storage class, and have the same storage as the primary template. </div><div class='add'>+</div><div class='add'>+ -- Fathi Boudra &lt;fabo@debian.org&gt;  Wed, 09 Apr 2008 09:40:00 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.4.0~rc1-1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * New upstream release. (Closes: #469783)</div><div class='add'>+</div><div class='add'>+  +++ Changes by Modestas Vainius:</div><div class='add'>+</div><div class='add'>+  * Refresh qt-copy patches:</div><div class='add'>+    * 0167-fix-group-reading.diff - adjust offsets.</div><div class='add'>+    * 0180-window-role.diff - adjust offsets.</div><div class='add'>+    * 0195-compositing-properties.diff - adjust offsets.</div><div class='add'>+    * 0203-qtexthtmlparser-link-color.diff - adjust offsets.</div><div class='add'>+    * 0209-prevent-qt-mixing.diff - adjust offsets.</div><div class='add'>+    * 0214-fix-qgraphicsproxywidget-tab-crash.diff - adjust offsets.</div><div class='add'>+    * 0216-allow-isystem-for-headers.diff - adjust offsets.</div><div class='add'>+  * Remove qt-copy patches:</div><div class='add'>+    * 0172-prefer-xrandr-over-xinerama.diff - merged upstream.</div><div class='add'>+    * 0178-transparency-window-types.diff - merged upstream.</div><div class='add'>+    * 0215-compile-with-Xcursor-linkage.diff - merged upstream.</div><div class='add'>+    * 0217-qurl-isempty-regression.diff - merged upstream.</div><div class='add'>+    * 0218-qassert-macro-fix.diff - merged upstream.</div><div class='add'>+    * fix-qt_bootstrapped-typo.diff  - merged upstream.</div><div class='add'>+  * Add qt-copy patches:</div><div class='add'>+    * 0220-no-x-recursion-in-xerrhandler.diff - adjust offsets.</div><div class='add'>+  * Refresh Debian patches:</div><div class='add'>+    * 02_launch_assistant-qt4.diff - adjust offsets.</div><div class='add'>+    * 05_append_qt4_target.diff - adopt to upstream changes. lrelease and</div><div class='add'>+      lupdate have been moved to tools/linguist/, adjust offsets.</div><div class='add'>+    * 50_kfreebsd_build_fix.diff - adjust offsets.</div><div class='add'>+    * 80_hurd_max_path.diff - adjust offsets.</div><div class='add'>+  * Remove Debian patches:</div><div class='add'>+    * 08_load_ssl.diff - different fix applied upstream.</div><div class='add'>+  * Update *.install files:</div><div class='add'>+    * qt4-dev-tools.install: a few renames of the language files,</div><div class='add'>+      s/assistant-qt3/assistant-qt4/, add usr/bin/xmlpatterns</div><div class='add'>+  * Add libqt4-core transitional package. (Closes: #473658)</div><div class='add'>+  * Add debian/not-installed to document files which are deliberately not</div><div class='add'>+    installed</div><div class='add'>+  * Avoid calling ./configure repeatedly during build/install: tie ./configure</div><div class='add'>+    to config.status</div><div class='add'>+</div><div class='add'>+  +++ Changes by Fathi Boudra:</div><div class='add'>+</div><div class='add'>+  * Re-introduce LD_LIBRARY_PATH workaround to use lrelease.</div><div class='add'>+  * Remove Conflicts against libqt4-core.</div><div class='add'>+  * Reorder libqt4-sql dependencies to have packages available on all</div><div class='add'>+    architectures listed first. (Closes: #473348)</div><div class='add'>+  * Add architectures availability list to libqt4-sql-ibase package.</div><div class='add'>+    (Closes: #473348)</div><div class='add'>+  * Add patch to fix unaligned access on hppa. Thanks to Bernhard R. Link.</div><div class='add'>+    (Closes: #458133)</div><div class='add'>+  * Add patch to replace remaining qdbus by dbus. Fix libqtscriptdbus build.</div><div class='add'>+  * Update configure options:</div><div class='add'>+    * Replace -qdbus by -dbus.</div><div class='add'>+    * Add -svg.</div><div class='add'>+</div><div class='add'>+  +++ Changes by Matthew Rosewarne:</div><div class='add'>+</div><div class='add'>+  * Rewrite clean rule to remove remaining build cruft.</div><div class='add'>+</div><div class='add'>+ -- Debian Qt/KDE Maintainers &lt;debian-qt-kde@lists.debian.org&gt;  Mon, 07 Apr 2008 01:36:54 -0400</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.4.0~beta1-1) experimental; urgency=low</div><div class='add'>+</div><div class='add'>+  * New upstream release.</div><div class='add'>+</div><div class='add'>+  * Add build dependencies: doxygen, firebird2.0-dev, libiodbc2-dev,</div><div class='add'>+    libpam0g-dev, libreadline5-dev, libxslt1-dev.</div><div class='add'>+  * Split libqt4-gui and libqt4-core packages.</div><div class='add'>+  * Create package for each Qt module.</div><div class='add'>+  * Enable all SQL drivers as plugins and add related packages:</div><div class='add'>+    libqt4-sql-ibase, libqt4-sql-mysql, libqt4-sql-odbc, libqt4-sql-psql,</div><div class='add'>+    libqt4-sql-sqlite, libqt4-sql-sqlite2.</div><div class='add'>+  * Add packages: libqt4-assistant, libqt4-dbus, libqt4-designer, libqt4-help,</div><div class='add'>+    libqt4-network, libqt4-opengl, libqt4-script, libqt4-svg, libqt4-test,</div><div class='add'>+    libqt4-webkit, libqt4-xml, libqt4-xmlpatterns and qt4-demos.</div><div class='add'>+  * Replace libqt4-core by libqtcore4 package.</div><div class='add'>+  * Rename libqt4-debug to libqt4-dbg like other debug packages in Debian.</div><div class='add'>+  * Update .lintian override files.</div><div class='add'>+  * Update .install files.</div><div class='add'>+  * Move translations files in their respective packages.</div><div class='add'>+  * Disable DEB_INSTALL_CHANGELOGS_ALL.</div><div class='add'>+  * Build ibase sql plugin on supported architectures only.</div><div class='add'>+  * Enable demos, examples, WebKit and XmlPatterns.</div><div class='add'>+  * Enable exceptions. It is a dependency to XmlPatterns module.</div><div class='add'>+  * Add qtdemo help collection file.</div><div class='add'>+  * Split WebKit and XmlPatterns debug packages from libqt4-dbg.</div><div class='add'>+  * Generate Doxygen tagfile in libqt4-dev. Thanks to Matthew Rosewarne.</div><div class='add'>+  * Examples and Demos are not shipped compressed anymore.</div><div class='add'>+  * Refresh qt-copy patches:</div><div class='add'>+    * 0167-fix-group-reading</div><div class='add'>+    * 0172-prefer-xrandr-over-xinerama</div><div class='add'>+    * 0178-transparency-window-types</div><div class='add'>+    * 0180-window-role</div><div class='add'>+    * 0191-listview-alternate-row-colors</div><div class='add'>+    * 0192-itemdelegate-palette-state</div><div class='add'>+    * 0195-compositing-properties</div><div class='add'>+    * 0203-qtexthtmlparser-link-color</div><div class='add'>+    * 0209-prevent-qt-mixing</div><div class='add'>+    * 0210-fix-crash-q3stylesheet-font-size</div><div class='add'>+  * Remove qt-copy patches:</div><div class='add'>+    * 0175-fix-s390-qatomic</div><div class='add'>+    * 0176-coverity-fixes</div><div class='add'>+    * 0179-transient-hack</div><div class='add'>+    * 0187-fix-font-fixed-pitch</div><div class='add'>+    * 0194-fix-moveonly-dnd-in-itemviews</div><div class='add'>+    * 0200-fix-qsslsocket-waitfor</div><div class='add'>+    * 0205-fast-qpixmap-fill</div><div class='add'>+    * 0211-q3action-crash</div><div class='add'>+  * Add qt-copy patches:</div><div class='add'>+    * 0214-fix-qgraphicsproxywidget-tab-crash</div><div class='add'>+    * 0215-compile-with-Xcursor-linkage</div><div class='add'>+    * 0216-allow-isystem-for-headers</div><div class='add'>+    * 0217-qurl-isempty-regression</div><div class='add'>+    * 0218-qassert-macro-fix</div><div class='add'>+    * fix-qt_bootstrapped-typo</div><div class='add'>+  * Refresh Debian patches:</div><div class='add'>+    * 01_qmake_for_debian</div><div class='add'>+    * 02_launch_assistant-qt4</div><div class='add'>+    * 03_launch_moc-qt4</div><div class='add'>+    * 04_launch_uic-qt4</div><div class='add'>+    * 05_append_qt4_target</div><div class='add'>+    * 08_load_ssl</div><div class='add'>+    * 10_config_tests_fixes</div><div class='add'>+    * 40_alpha_ice</div><div class='add'>+    * 41_disable_opengl_visibility</div><div class='add'>+    * 50_kfreebsd_build_fix</div><div class='add'>+    * 60_m68k_inotify_fix</div><div class='add'>+    * 80_hurd_max_path</div><div class='add'>+  * Remove Debian patches:</div><div class='add'>+    * 06_qtdemo_destdir. Useless as we ship qtdemo again.</div><div class='add'>+    * 30_arm_ftbfs_fixes. Merged upstream.</div><div class='add'>+    * 31_arm_eabi_fix. Upstream changed arm architecture handling.</div><div class='add'>+      This patch doesn't apply as it is.</div><div class='add'>+    * 91_qmake_lflags_no-undefined. Merged upstream.</div><div class='add'>+</div><div class='add'>+ -- Fathi Boudra &lt;fabo@debian.org&gt;  Thu, 13 Mar 2008 22:34:45 +0100</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.3.4-2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Add patches:</div><div class='add'>+    * 09_qmake_lflags_as-needed</div><div class='add'>+      workaround as LDFLAGS isn't honored by configure script.</div><div class='add'>+      we set --as-needed flag for Qt build only.</div><div class='add'>+    * 10_config_tests_fixes.diff</div><div class='add'>+      configuration test fixes for Interbase/Firebird and ODBC sql drivers.</div><div class='add'>+  * Update 01_qmake_for_debian patch:</div><div class='add'>+    * re-introduce link_prl and drop QT_SHARED workaround.</div><div class='add'>+  * Update rules:</div><div class='add'>+    * Remove exported LDFLAGS.</div><div class='add'>+    * Remove DEB_CONFIGURE_SCRIPT_ENV.</div><div class='add'>+    * Exclude debug files from dh_shlibdeps using DEB_DH_SHLIBDEPS_ARGS_ALL.</div><div class='add'>+    * Update configure options to use libtiff from system.</div><div class='add'>+    * Remove debug configure option to build with -02.</div><div class='add'>+    * Update common-install-arch target to fix wrong path in pkconfig and prl files.</div><div class='add'>+  * Add libtiff4-dev build dependency.</div><div class='add'>+  * Update libqt4-dev dependencies.</div><div class='add'>+</div><div class='add'>+ -- Fathi Boudra &lt;fabo@debian.org&gt;  Sat, 08 Mar 2008 10:09:02 +0100</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.3.4-1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * New upstream release:</div><div class='add'>+    * This version adds the GNU General Public License (GPL) version 3</div><div class='add'>+      to all Qt Open Source editions. The GPL Exception version 1.1</div><div class='add'>+      applies to both versions of the GPL license.</div><div class='add'>+</div><div class='add'>+  * Add qt-copy patches:</div><div class='add'>+    * 0205-fast-qpixmap-fill</div><div class='add'>+      Fix a performance issue in QPixmap::fill()</div><div class='add'>+    * 0209-prevent-qt-mixing</div><div class='add'>+      This patch changes QObjectPrivateVersion, thus preventing mixing parts</div><div class='add'>+      of upstream Qt and qt-copy.</div><div class='add'>+    * 0210-fix-crash-q3stylesheet-font-size</div><div class='add'>+      This patch fixes crashs in q3stylesheet</div><div class='add'>+      (it was possible to use a qfont size &lt; 1)</div><div class='add'>+    * 0211-q3action-crash</div><div class='add'>+      During porting qt3to4 port QGroupAction to Q3GroupAction but not QAction</div><div class='add'>+      to Q3Action (which is logical) But it crashs when it's not a q3action.</div><div class='add'>+  * Refresh and enable 0172-prefer-xrandr-over-xinerama patch.</div><div class='add'>+  * Remove 0204-fix-tulip-aliasing patch. Merged upstream.</div><div class='add'>+  * Remove 90_qmake_cxxflags_fpermissive patch.</div><div class='add'>+  * Add ${shlibs:Depends} to libqt4-dev. See missing shared library</div><div class='add'>+    dependencies thread on debian-devel mailing list.</div><div class='add'>+  * Add catalan translation. Thanks to Javier Serrano Polo. (Closes: #459822)</div><div class='add'>+  * Update copyright file. Add GPL version 3.</div><div class='add'>+  * Remove -fpermissive.</div><div class='add'>+</div><div class='add'>+ -- Fathi Boudra &lt;fabo@debian.org&gt;  Tue, 26 Feb 2008 18:38:27 +0100</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.3.3-2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Update 0203-qtexthtmlparser-link-color qt-copy patch:</div><div class='add'>+    Add qt-bugs@ issue and Trolltech task ID.</div><div class='add'>+  * Add 0204-fix-tulip-aliasing qt-copy patch:</div><div class='add'>+    Fix KDE4 RC2 crashing on startup due to Qt 4.3.3 update.</div><div class='add'>+  * Downgrade libqt4-dev dependency to qt4-dev-tools from Recommends to</div><div class='add'>+    Suggests.</div><div class='add'>+  * Add semicolon at the end of the MimeType key. Thanks to Pino Toscano.</div><div class='add'>+  * Remove 91_qmake_ldflags_as-needed patch:</div><div class='add'>+    It breaks other packages. (Closes: #457038, #457284)</div><div class='add'>+  * Add 91_qmake_lflags_no-undefined patch:</div><div class='add'>+    By default, qmake adds --no-undefined linker flag.</div><div class='add'>+</div><div class='add'>+ -- Fathi Boudra &lt;fabo@debian.org&gt;  Sun, 30 Dec 2007 23:29:09 +0100</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.3.3-1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * New upstream release.</div><div class='add'>+</div><div class='add'>+  [Adeodato Simó]</div><div class='add'>+</div><div class='add'>+  * Do not depend or build-depend on the transitional package xlibmesa-gl-dev,</div><div class='add'>+    but on libgl1-mesa-dev instead. Ditto for libglu1-xorg-dev/libglu1-mesa-dev.</div><div class='add'>+</div><div class='add'>+  [Fathi Boudra]</div><div class='add'>+</div><div class='add'>+  * Bump Standards-Version to 3.7.3.</div><div class='add'>+  * Fix description contains homepage lintian warning.</div><div class='add'>+  * Merge Kubuntu load ssl patch. Thanks to Jonathan Riddell.</div><div class='add'>+  * Add CDDL exception to debian/copyright.</div><div class='add'>+  * Add 21_assume_no_fpu_for_embedded_devices patch. Thanks to Thiemo Seufer</div><div class='add'>+    and Bradley Hughes. Not Enabled yet: It breaks ABI on mips.</div><div class='add'>+    We will keep it for later (&gt; 4.3.3-1).</div><div class='add'>+  * Add 91_qmake_ldflags_as-needed patch. Build with --as-needed linker flag.</div><div class='add'>+  * Remove qt-copy patches:</div><div class='add'>+    * 0163-fix-gcc43-support.</div><div class='add'>+    * 0185-fix-format-strings.</div><div class='add'>+    * 0188-fix-moc-parser-same-name-header.</div><div class='add'>+    * 0189-fix-q3toolbar-qcombobox-signal-slot.</div><div class='add'>+    * 0193-qtreeview-division-by-zero.diff.</div><div class='add'>+  * Add qt-copy patches:</div><div class='add'>+    * 0200-fix-qsslsocket-waitfor.</div><div class='add'>+      Fixes some QSslSocket::waitFor$X methods.</div><div class='add'>+    * 0203-qtexthtmlparser-link-color.</div><div class='add'>+      Links are assigned a foreground color according to the system current</div><div class='add'>+      color scheme.</div><div class='add'>+</div><div class='add'>+ -- Fathi Boudra &lt;fabo@debian.org&gt;  Thu, 06 Dec 2007 22:06:46 +0100</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.3.2-1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * New upstream release.</div><div class='add'>+</div><div class='add'>+  [Fathi Boudra]</div><div class='add'>+  * Update desktop files categories.</div><div class='add'>+  * Add desktop files icons. (Closes: #433581)</div><div class='add'>+  * Update patches to Qt4.3.2.</div><div class='add'>+  * Add 90_qmake_cxxflags_fpermissive patch.</div><div class='add'>+  * Remove 0186-fix-component-alpha-text patch. Merged upstream.</div><div class='add'>+  * Add qt-copy patches:</div><div class='add'>+    * 0188-fix-moc-parser-same-name-header</div><div class='add'>+    * 0189-fix-q3toolbar-qcombobox-signal-slot</div><div class='add'>+    * 0191-listview-alternate-row-colors</div><div class='add'>+    * 0192-itemdelegate-palette-state</div><div class='add'>+    * 0193-qtreeview-division-by-zero</div><div class='add'>+    * 0194-fix-moveonly-dnd-in-itemviews</div><div class='add'>+    * 0195-compositing-properties</div><div class='add'>+  * Update qt4-dev-tools long description.</div><div class='add'>+  * Update copyright:</div><div class='add'>+    * Update Trolltech GPL exception to v1.1.</div><div class='add'>+    * Add Trolltech GPL exception addenum.</div><div class='add'>+  * Update rules:</div><div class='add'>+    * Build with -fpermissive.</div><div class='add'>+    * Introduce QTVERSION.</div><div class='add'>+  * Fix qt4-config menu section. (Closes: 444896)</div><div class='add'>+</div><div class='add'>+  [Sune Vuorela]</div><div class='add'>+  * Have strict interdependencies between packages with a shlibs.local file.</div><div class='add'>+    (Closes: #438746)</div><div class='add'>+  * Don't trust uname in generating the qt build key. This has bitten us in</div><div class='add'>+    qt3, but will soon bite us in qt4 as qt4 becomes more popular.</div><div class='add'>+</div><div class='add'>+  [Ana Beatriz Guerrero Lopez]</div><div class='add'>+  * Add desktop files icons uuencoded and update rules to install them uudecoded.</div><div class='add'>+  * Add sharutils build dependency.</div><div class='add'>+</div><div class='add'>+ -- Debian Qt/KDE Maintainers &lt;debian-qt-kde@lists.debian.org&gt;  Sat, 06 Oct 2007 07:00:54 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.3.1-2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * There is a large difference between 8 spaces and a tab.</div><div class='add'>+</div><div class='add'>+ -- Sune Vuorela &lt;debian@pusling.com&gt;  Fri, 10 Aug 2007 22:20:45 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.3.1-1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * New upstream release.</div><div class='add'>+</div><div class='add'>+  [Fathi Boudra]</div><div class='add'>+  * Switch to quilt patch system.</div><div class='add'>+  * Update copyright. Add Trolltech GPL Exception.</div><div class='add'>+  * Update section in Debian menu files.</div><div class='add'>+  * Update patches for Qt4.3.1.</div><div class='add'>+  * Remove 51_kfreebsd_mkspecs patch. Moved in rules.</div><div class='add'>+  * Add 0187-fix-font-fixed-pitch patch:</div><div class='add'>+    This patch works around broken QFontInfo::fixedPitch by always using a</div><div class='add'>+    glyph metrics comparison test to guess the information. This has the</div><div class='add'>+    property of both ignoring (bad) and not relying on (good) any information</div><div class='add'>+    that might be provided by the OS's font facility. For Mac OS X only.</div><div class='add'>+  * Remove patches merged upstream:</div><div class='add'>+    * 0177-qurl-clear-fix</div><div class='add'>+    * 0183-qprocess-corruption</div><div class='add'>+    * 42_alpha_fetch_and_add</div><div class='add'>+  * Disable:</div><div class='add'>+    * 0172-prefer-xrandr-over-xinerama patch. (Closes: #433931)</div><div class='add'>+    * 0181-qdnd-x11-fix patch.</div><div class='add'>+</div><div class='add'>+  [Sune Vuorela]</div><div class='add'>+  * Add a quick and dirty test to make build on hppa fail if a current</div><div class='add'>+    getdents kernel bug is detected.</div><div class='add'>+</div><div class='add'>+ -- Fathi Boudra &lt;fboudra@free.fr&gt;  Wed, 08 Aug 2007 15:08:11 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.3.0-5) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  [Fathi Boudra]</div><div class='add'>+  * Update 01_qmake_for_debian patch. Add DEFINES += QT_SHARED in qmake.conf</div><div class='add'>+    along with the removal of link_prl. (Closes: #434019)</div><div class='add'>+  * Apply qt-copy patches:</div><div class='add'>+    * 00_0185-fix-format-strings: This patch fixes various code issues with</div><div class='add'>+      handling format strings. None of them seem to be exceptionally bad,</div><div class='add'>+      but its better safe than sorry. It is related to CVE-2007-3388.</div><div class='add'>+      TT claims the problem is not present in any version of Qt 4. Dirk Muller</div><div class='add'>+      disagrees and believes that some of them are possible to exploit.</div><div class='add'>+    * 00_0186-fix-component-alpha-text: This patch fixes component alpha</div><div class='add'>+      (LCD hinted) text when it's drawn on a non-opaque background. Qt doesn't</div><div class='add'>+      initialize the alpha channel in the glyph masks, which causes problems</div><div class='add'>+      in Konsole when transparency is enabled, and in other situations where</div><div class='add'>+      the background isn't fully opaque.</div><div class='add'>+</div><div class='add'>+ -- Fathi Boudra &lt;fboudra@free.fr&gt;  Mon, 30 Jul 2007 21:36:25 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.3.0-4) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  [Fathi Boudra]</div><div class='add'>+  * Add 42_alpha_fetch_and_add patch to fix broken threading on alpha, hangs</div><div class='add'>+    uselessly on startup. fetch-and-add is supposed to return the original</div><div class='add'>+    value before the addition. Thanks to Steve Langasek and Bradley Hughes.</div><div class='add'>+    (Closes: #433031)</div><div class='add'>+  * Update control: Replace ${source:Version} by ${binary:Version}.</div><div class='add'>+    Make the package binNMU safe. Thanks to Lior Kaplan. (Closes: #433548)</div><div class='add'>+</div><div class='add'>+ -- Fathi Boudra &lt;fboudra@free.fr&gt;  Mon, 16 Jul 2007 21:32:01 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.3.0-3) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  [Fathi Boudra]</div><div class='add'>+  * Update control: Replace deprecated ${Source-Version} by ${source:Version}.</div><div class='add'>+  * Update rules:</div><div class='add'>+    * Add bindir and libdir configure options.</div><div class='add'>+    * Replace common-install-arch target. Replaced by build system patches and</div><div class='add'>+      a fix for pkgconfig files. (Closes: #401807)</div><div class='add'>+  * Add patches:</div><div class='add'>+    * 04_launch_uic-qt4: call uic-qt4 binary.</div><div class='add'>+    * 05_append_qt4_target: append -qt4 when needed. It fixes moc-location and</div><div class='add'>+      uic_location are properly in pkgconfig files. (See bug #401807)</div><div class='add'>+    * 06_qtdemo_destdir: remove QT_BUILD_TREE in qtdemo DESTDIR target.</div><div class='add'>+      (Closes: #408639)</div><div class='add'>+  * Revert Qt handling argb visuals on X11 patch. There are dependencies</div><div class='add'>+    not fixed in Qt. They cause a few regressions when this patch is applied.</div><div class='add'>+    (Closes: #430907, #431436, #431943)</div><div class='add'>+  * Update Qt support for new window types used for compositing patch.</div><div class='add'>+    Fix crashes when 'w' is null. (Closes: #431322)</div><div class='add'>+  * Apply qt-copy patches:</div><div class='add'>+    * 00_0172-prefer-xrandr-over-xinerama: only trust libxinerama if it is not</div><div class='add'>+      the emulated information coming from xrandr 1.2.</div><div class='add'>+    * 00_0177-qurl-clear-fix: fix QUrl::clear(). Applied upstream.</div><div class='add'>+    * 00_0183-qprocess-corruption: fix plain data loss bug. Applied Upstream.</div><div class='add'>+</div><div class='add'>+ -- Fathi Boudra &lt;fboudra@free.fr&gt;  Fri, 29 Jun 2007 08:15:23 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.3.0-2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  [Brian Nelson]</div><div class='add'>+  * Changed dist back to unstable.</div><div class='add'>+  * Tightened qt4-dev-tools's dependency on libqt4-core to</div><div class='add'>+    (= ${Source-Version}), since it uses internal (non-public) classes in</div><div class='add'>+    Qt whose ABI can change. (Closes: #429817)</div><div class='add'>+  * Added a build-dependency on libxi-dev to enable tablet support.</div><div class='add'>+  * Constrict the hack to clean all binary files to the bin, config.tests,</div><div class='add'>+    and qmake directories to drastically improve its speed</div><div class='add'>+</div><div class='add'>+  [Fathi Boudra]</div><div class='add'>+  * Qt4 demos builds properly in Qt4.3. (Closes: #408639)</div><div class='add'>+  * Apply qt-copy patches:</div><div class='add'>+    * 00_0178-transparency-window-types: adds Qt support for new window types</div><div class='add'>+      used for compositing.</div><div class='add'>+    * 00_0179-transient-hack: workaround that makes setting of WM_TRANSIENT_FOR</div><div class='add'>+      work with some window types.</div><div class='add'>+    * 00_0180-window-role: several problems with Qt's support for the</div><div class='add'>+      WM_WINDOW_ROLE property.</div><div class='add'>+    * 00_0181-qdnd-x11-fix: makes the find_child algorithm in qdnd look at</div><div class='add'>+      _all_ widgets that contain the QPoint.</div><div class='add'>+    * 00_0182-argb-visuals-default: Qt handling argb visuals on X11.</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Wed, 27 Jun 2007 00:02:07 -0400</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.3.0-1) experimental; urgency=low</div><div class='add'>+</div><div class='add'>+  * New upstream release.</div><div class='add'>+    * Fixes a QListView issue. (Closes: #419654)</div><div class='add'>+</div><div class='add'>+  * Update uploaders. Add Ana, Sune and Fathi.</div><div class='add'>+</div><div class='add'>+  [Sune Vuorela]</div><div class='add'>+  * Remove 04_utf8_bug_fix: Merged upstream.</div><div class='add'>+  * Update libqt4-dev.install. Upstream installs pkgconfig files the right place.</div><div class='add'>+  * Update libqt4-core.install. Add libQtScript.</div><div class='add'>+  * Update rules:</div><div class='add'>+    * Add utils.mk to use list-missing.</div><div class='add'>+    * Cleaning seems to fail a bit. Trying to hack around that in clean::</div><div class='add'>+      target.</div><div class='add'>+</div><div class='add'>+  [Fathi Boudra]</div><div class='add'>+  * Redo 30_arm_ftbfs_fixes to fix another FTBFS. Add arm target to configure</div><div class='add'>+    script. Thanks to Sune Vuorela and Aurelien Jarno. (Closes: #426129)</div><div class='add'>+  * Remove 71_hppa_inotify_fix: Merged upstream.</div><div class='add'>+  * Update patches:</div><div class='add'>+    * 02_launch_assistant-qt4</div><div class='add'>+    * 03_launch_moc-qt4</div><div class='add'>+    * 50_kfreebsd_build_fix</div><div class='add'>+    * 80_hurd_max_path</div><div class='add'>+  * Apply qt-copy patches:</div><div class='add'>+    * 00_0163-fix-gcc43-support: Various fixes to get Qt 4.3 without hundreds</div><div class='add'>+      of warnings compiling.</div><div class='add'>+    * 00_0167-fix-group-reading: In big user environments, getgrgid_r() needs</div><div class='add'>+      more memory than sysconf() returns.</div><div class='add'>+    * 00_0175-fix-s390-qatomic: Fix s390(x) build.</div><div class='add'>+    * 00_0176-coverity-fixes: Fix various obvious memory leaks.</div><div class='add'>+  * Rename disable opengl visibility patch. It is not alpha architecture only.</div><div class='add'>+  * Add desktop files to support Desktop Environments. (Closes: #378915)</div><div class='add'>+  * Update qt4-dev-tools.install. Add qdbusviewer and pixeltool.</div><div class='add'>+    Thanks to Benjamin Meyer for the reminder.</div><div class='add'>+  * Update libqt4-dev.install. Remove qtdemo binary as we provide a tarball of the</div><div class='add'>+    demos directory. qtdemo is useless, it can't launch anything without demos</div><div class='add'>+    builded. It can only show screenshots and short description of demos,</div><div class='add'>+    users have it in Qt assistant.</div><div class='add'>+  * Update rules:</div><div class='add'>+    * Remove -debug-and-release option. Deprecated.</div><div class='add'>+    * Add configure options:</div><div class='add'>+      * -no-exceptions</div><div class='add'>+      * -debug</div><div class='add'>+      * -qdbus</div><div class='add'>+      * -pch</div><div class='add'>+      * -nomake examples</div><div class='add'>+      * -nomake demos</div><div class='add'>+</div><div class='add'>+ -- Debian Qt/KDE Maintainers &lt;debian-qt-kde@lists.debian.org&gt;  Sat, 09 Jun 2007 00:25:41 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.2.3-1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * New upstream release</div><div class='add'>+    - Fixes build failures when QT_NO_DEBUG_OUTPUT defined</div><div class='add'>+      (Closes: #418832)</div><div class='add'>+    - Fixes broken signal/slot connection in QSvgRenderer</div><div class='add'>+      (Closes: #411292)</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Thu, 12 Apr 2007 12:38:06 -0400</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.2.2-2) unstable; urgency=high</div><div class='add'>+</div><div class='add'>+  * debian/patches/04_utf8_bug_fix.dpatch: new patch to fix the "UTF-8</div><div class='add'>+    overlong sequence decoding vulnerability" [CVE-2007-0242]</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Fri, 30 Mar 2007 11:04:20 -0400</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.2.2-1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * New upstream release (Closes: #410862)</div><div class='add'>+</div><div class='add'>+  * debian/rules: set the sysconfdir to /etc/xdg instead of /etc/qt4 to</div><div class='add'>+    match the QSettings documentation (Closes: #407297)</div><div class='add'>+</div><div class='add'>+  * Added Riku Voipio's patch for ARM EABI (Closes: #408813)</div><div class='add'>+</div><div class='add'>+  * debian/patches/22_launch_moc-qt4.dpatch: new patch to ensure the Qt4</div><div class='add'>+    version of moc is launched by qdbuscpp2xml (Closes: #399049)</div><div class='add'>+</div><div class='add'>+  * Added a doc-base file for qt4-doc (Closes: #403290)</div><div class='add'>+</div><div class='add'>+  * debian/qt4-designer.links: added a link /usr/share/qt4/bin/designer -&gt;</div><div class='add'>+    /usr/bin/designer-qt4 (Closes: #410885)</div><div class='add'>+</div><div class='add'>+  * Re-arranged patches to group them by arch so that they're easier to</div><div class='add'>+    deal with</div><div class='add'>+</div><div class='add'>+  * Applied new patches for kFreeBSD and Hurd support</div><div class='add'>+    (Closes: #380097, #402007)</div><div class='add'>+</div><div class='add'>+  * debian/libqt4-gui.install: added the codecs plugins, somehow these got</div><div class='add'>+    accidentally dropped (Closes: #409228)</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Sun,  4 Mar 2007 13:50:39 -0500</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.2.1-2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * debian/patches/20_hppa_inotify_fix.dpatch: new patch that should fix</div><div class='add'>+    the FTBFS on hppa due to missing defines (Closes: #394953)</div><div class='add'>+</div><div class='add'>+  * Added patches for hurd support (Closes: #380097)</div><div class='add'>+</div><div class='add'>+  * debian/patches/10_qmake_for_debian.dpatch: restored the modification</div><div class='add'>+    to remove link_prl from the CONFIG line, which fixes problems with</div><div class='add'>+    unnecessary linkage (Closes: #394836)</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Tue, 31 Oct 2006 02:42:02 -0500</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.2.1-1) unstable; urgency=high</div><div class='add'>+</div><div class='add'>+  * New upstream release    </div><div class='add'>+    - Fixes integer overflow in pixmap handling [CVE-2006-4811]</div><div class='add'>+      (Closes: #394192)</div><div class='add'>+</div><div class='add'>+  * Install the libqtaccessiblecompatwidgets.so plugin into</div><div class='add'>+    libqt4-qt3support, so that libqt4-gui does not circularly depend on</div><div class='add'>+    libqt4-qt3support (Closes: #394351, #394629)</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Mon, 23 Oct 2006 11:59:52 -0400</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.2.0-2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * debian/control: added a dependency on libglib2.0-dev for libqt4-dev</div><div class='add'>+    (Closes: #392797, #392173)</div><div class='add'>+</div><div class='add'>+  * Added a bunch of plugins and their debugging symbols to be installed</div><div class='add'>+</div><div class='add'>+  * debian/patches/19_m68k_inotify_fix.dpatch: new patch to fix FTBFS on</div><div class='add'>+    m68k (Closes: #391902)</div><div class='add'>+</div><div class='add'>+  * Imported Ubuntu fixes, thanks to Jonathan Riddell for the tip</div><div class='add'>+    - Fix typo in debian/rules -qt-sql-slite to -qt-sql-sqlite</div><div class='add'>+      (Closes: #392808)</div><div class='add'>+    - Install usr/bin/qdbus usr/bin/qdbusxml2cpp and usr/bin/qdbuscpp2xml</div><div class='add'>+      (Closes: #391726)</div><div class='add'>+</div><div class='add'>+  * debian/control: added a libqt4-dev dependency on libsqlite0-dev</div><div class='add'>+    (Closes: #392558)</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Tue, 17 Oct 2006 23:44:31 -0400</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.2.0-1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * New upstream release</div><div class='add'>+    - No longer includes "CONFIG = ... debug" in the mkspecs/qconfig.pri</div><div class='add'>+      (Closes: #357136)</div><div class='add'>+    - Fixes QFontDialog assert() failures (Closes: #380418)</div><div class='add'>+    </div><div class='add'>+  * debian/control: made libqt4-gui conflict/replace libqt4-designer, to</div><div class='add'>+    ensure that old package is removed (Closes: #380253)</div><div class='add'>+</div><div class='add'>+  * Enable Qt's new support for using the system's SQLite 3 library</div><div class='add'>+    (Closes: #382238)</div><div class='add'>+</div><div class='add'>+  * debian/rules: removed the PostgreSQL and MySQL include hacks from the</div><div class='add'>+    configure arguments, since the configure script now autodetects them</div><div class='add'>+    itself</div><div class='add'>+</div><div class='add'>+  * debian/patches/10_qmake_for_debian.dpatch: updated for new upstream</div><div class='add'>+</div><div class='add'>+  * debian/patches/13_arm_ftbfs_fixes.dpatch: updated for new upstream</div><div class='add'>+</div><div class='add'>+  * debian/patches/19_s390_atomic.dpatch: removed, since it appears to be</div><div class='add'>+    obsolete</div><div class='add'>+</div><div class='add'>+  * debian/libqt4-debug.install: changed the wildcards to match the new</div><div class='add'>+    debug lib names.  What was once *_debug.so.* is now *.debug.  Ick.</div><div class='add'>+</div><div class='add'>+  * debian/control: removed libqt4-debug-dev since now that the _debug</div><div class='add'>+    libs have been removed and debugging symbols are shipped in their</div><div class='add'>+    place, this package is no longer needed</div><div class='add'>+</div><div class='add'>+  * Tar up the demos directory and include it in qt4-doc.  Also added the</div><div class='add'>+    qtdemo binary to libqt4-dev. (Closes: #390925)</div><div class='add'>+</div><div class='add'>+  * debian/rules: add -DQT_QLOCALE_USES_FCVT to the configure arguments</div><div class='add'>+    when building on arm, like Qt3, to fix a uic problem (Closes: #386460)</div><div class='add'>+</div><div class='add'>+  * debian/libqt4-gui.install: added usr/lib/libQtAssistantClient.so.*,</div><div class='add'>+    since it's now shipped as a shared library; previously it was a static</div><div class='add'>+    library</div><div class='add'>+</div><div class='add'>+  * Added build-deps on libdbus-1-dev and libglib2.0-dev, and added</div><div class='add'>+    libQtDBus to the libqt4-core package</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Fri,  6 Oct 2006 23:16:46 -0400</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.1.4-1.1) unstable; urgency=medium</div><div class='add'>+</div><div class='add'>+  * Non-maintainer upload.</div><div class='add'>+  * Reintroduce the libpq-dev dependency, which seems to have been removed by</div><div class='add'>+    mistake in 4.1.0-2. (Closes: #327618)</div><div class='add'>+</div><div class='add'>+ -- Steinar H. Gunderson &lt;sesse@debian.org&gt;  Tue, 29 Aug 2006 01:10:59 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.1.4-1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * New upstream release (Closes: #378443)</div><div class='add'>+</div><div class='add'>+  * Moved usr/lib/libQtDesigner.so.* and</div><div class='add'>+    usr/lib/libQtDesignerComponents.so.* from qt4-designer to libqt4-gui</div><div class='add'>+    so there the libqt4-dev package won't contain dangling symlinks</div><div class='add'>+    (Closes: #374612)</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Sun, 16 Jul 2006 15:39:29 -0700</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.1.3-3) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * debian/patches/19_s390_atomic: patch from Bastian Blank to fix</div><div class='add'>+    including of s390 specific atomic header. (Closes: #370241)</div><div class='add'>+</div><div class='add'>+  * debian/patches/18_disable_opengl_visibility.dpatch: regenerated so</div><div class='add'>+    that it applies correctly for me</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Sun, 25 Jun 2006 11:42:57 -0700</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.1.3-2) unstable; urgency=high</div><div class='add'>+</div><div class='add'>+  * patches/18_disable_opengl_visibility: disable -fvisibility-inlines-hidden</div><div class='add'>+    for src/opengl/opengl.pro as it makes gcc ICE on alpha.</div><div class='add'>+    (Closes: #368883)</div><div class='add'>+</div><div class='add'>+  * urgency set to high so that qt4-x11 stops blocking half of unstable out of</div><div class='add'>+    testing.</div><div class='add'>+</div><div class='add'>+ -- Pierre Habouzit &lt;madcoder@debian.org&gt;  Mon,  5 Jun 2006 10:28:29 +0200</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.1.3-1) unstable; urgency=high</div><div class='add'>+</div><div class='add'>+  * New upstream release</div><div class='add'>+</div><div class='add'>+  * debian/patches/16_hppa_ldcw_fix.dpatch: new patch from Ubuntu to</div><div class='add'>+    properly support hppa</div><div class='add'>+</div><div class='add'>+  * debian/patches/17_alpha_ice.dpatch: new patch from Steve Langasek to</div><div class='add'>+    fix FTBFS on alpha (Closes: #368883)</div><div class='add'>+    (urgency set to high for that fix).</div><div class='add'>+</div><div class='add'>+  * Dropped the .la files since they pull in too many unneeded</div><div class='add'>+    dependencies (Closes: #360802)</div><div class='add'>+</div><div class='add'>+  * debian/libqt4-debug.install: removed</div><div class='add'>+    usr/lib/qt4/plugins/codecs/*_debug.so since those aren't included</div><div class='add'>+    upstream anymore</div><div class='add'>+</div><div class='add'>+  * Increased standards version to 3.7.2</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Sat,  3 Jun 2006 17:56:32 -0700</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.1.2-2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * debian/libqt4-debug-dev.install, debian/libqt4-dev.install: added</div><div class='add'>+    wildcards to install .a static libraries so that the libQtUiTools and</div><div class='add'>+    libQtAssistantClient libraries are included (Closes: #358224, #355902)</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Sun, 14 May 2006 10:03:40 -0700</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.1.2-1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * New upstream release</div><div class='add'>+</div><div class='add'>+  * debian/control: removed dependencies on xlibs-static-dev and</div><div class='add'>+    xlibs-static-pic to transition to building against modular X</div><div class='add'>+    (Closes: #362262)</div><div class='add'>+</div><div class='add'>+  * debian/control: changed x-dev dependencies to x11proto-core-dev, for</div><div class='add'>+    modular X transition (Closes: #362053)</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Thu, 13 Apr 2006 10:35:28 -0700</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.1.1-1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * New upstream release</div><div class='add'>+    - Fixes the broken debug-and-release build and a load of resulting</div><div class='add'>+      bugs (Closes: #337764, #337847, #341807, #338380, #354993, #347251)</div><div class='add'>+    - debian/patches/15_alpha_ftbfs_fix.dpatch: removed, integrated upstream</div><div class='add'>+</div><div class='add'>+  * debian/control: updated libqt4-debug-dev priority to match that of the</div><div class='add'>+    override file</div><div class='add'>+</div><div class='add'>+  * debian/libqt4-dev.links: added a symlink /usr/share/qt4/bin/rcc to</div><div class='add'>+    /usr/bin/rcc (Closes: #349438)</div><div class='add'>+</div><div class='add'>+  * debian/libqt4-gui.install: added libqmng.so and libqgif.so plugins</div><div class='add'>+    (Closes: #354266)</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Mon,  6 Mar 2006 10:20:47 -0800</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.1.0-3) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Moved *_debug.prl and *_debug.la support files to the libqt4-debug-dev</div><div class='add'>+    package</div><div class='add'>+</div><div class='add'>+  * Updated to debhelper v5 compatibility</div><div class='add'>+</div><div class='add'>+  * debian/qt4-dev-tools.install: removed the /usr/share/qt4/templates</div><div class='add'>+    entry, which no longer contains anything</div><div class='add'>+</div><div class='add'>+  * Added gif support (Closes: #348092)</div><div class='add'>+</div><div class='add'>+  * debian/patches/12_mips_atomic_ops.dpatch: applied fixes from Isaac</div><div class='add'>+    Clerencia &lt;isaac@debian.org&gt;, as the last patch was not good enough to</div><div class='add'>+    fix the FTBFS bug (Closes: #335831)</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Tue, 17 Jan 2006 09:49:11 -0800</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.1.0-2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * debian/patches/12_mips_atomic_ops.dpatch: Updated patch to account for</div><div class='add'>+    2 new functions, q_atomic_test_and_set_acquire_int and</div><div class='add'>+    q_atomic_test_and_set_release_int, that were added in this release.</div><div class='add'>+    This should again fix the build failures on mips. (Closes: #335831)</div><div class='add'>+</div><div class='add'>+  * debian/patches/13_arm_ftbfs_fixes.dpatch: renamed, added a fix for the</div><div class='add'>+    new build failure due to a poorly defined qreal (Closes: #347360)</div><div class='add'>+</div><div class='add'>+  * debian/control: build against libmysqlclient15, and updated all</div><div class='add'>+    dependencies to libmysqlclient15-dev (Closes: #346586)</div><div class='add'>+</div><div class='add'>+  * debian/control: added explicit dependencies for libqt4-dev on the</div><div class='add'>+    Source-Version packages libqt4-core, libqt4-gui, libqt4-sql, and</div><div class='add'>+    libqt4-qt3support.  These dependencies were accidentally dropped in</div><div class='add'>+    the last version.  Also removed some unneeded dependencies.</div><div class='add'>+</div><div class='add'>+  * Split the *_debug.so symlinks out of libqt4-dev and into a separate</div><div class='add'>+    libqt4-debug-dev package.  Made the libqt4-debug-dev package depend on</div><div class='add'>+    the Source-Version of libqt4-debug.  This way, the symlinks won't be</div><div class='add'>+    dangling if libqt4-debug isn't installed and prevents failed linking</div><div class='add'>+    due to version mismatches.  (Closes: #346603, #346605)</div><div class='add'>+</div><div class='add'>+  * Re-enabled sqlite3 support.  It's still statically linked, however,</div><div class='add'>+    but that'll have to do because I really don't want to futz with the</div><div class='add'>+    build system. (Closes: #330976)</div><div class='add'>+</div><div class='add'>+  * Enabled sqlite2 support</div><div class='add'>+</div><div class='add'>+  * debian/patches/15_alpha_ftbfs_fix.dpatch: new patch to rename</div><div class='add'>+    q_atomic_test_and_set_release_ptr to q_atomic_test_and_set_ptr, as</div><div class='add'>+    suggested by Isaac Clerencia &lt;isaac@debian.org&gt;, to fix a FTBFS on</div><div class='add'>+    alpha. (Closes: #347353)</div><div class='add'>+</div><div class='add'>+  * debian/patches/10_qmake_for_debian: renamed from</div><div class='add'>+    10_qmake_use_qt4_tools, and updated to remove the "link_prl" from the</div><div class='add'>+    default qmake CONFIG line.  This disables the recursive linkage</div><div class='add'>+    against all indirectly-used libraries. (Closes: #343190)</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Tue, 10 Jan 2006 19:29:52 -0800</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.1.0-1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * New upstream release</div><div class='add'>+    - Fixes missing QBitArray operators (Closes: #341658)</div><div class='add'>+    - Fixes qmake problem with including bad build path (Closes: #327359)</div><div class='add'>+  </div><div class='add'>+  * Added the new QTestLib unit testing framework to the libqt4-core</div><div class='add'>+    package</div><div class='add'>+</div><div class='add'>+  * Added the new QtSvg module to the libqt4-gui package</div><div class='add'>+</div><div class='add'>+  * debian/patches/13_arm_gcc4.dpatch: new patch from Jeremy Laine to fix</div><div class='add'>+    FTBFS on arm (Closes: #343176)</div><div class='add'>+</div><div class='add'>+  * debian/patches/14_kfreebsd_build_fix.dpatch: new patch from Petr</div><div class='add'>+    Salinger to fix FTBFS on GNU/kFreeBSD (Closes: #343191)</div><div class='add'>+</div><div class='add'>+  * Split the qtconfig tool out of libqt4-gui and into a separate</div><div class='add'>+    qt4-qtconfig package, due to its linkage against libqt4-qt3support and</div><div class='add'>+    hence ridiculous dependency chain.</div><div class='add'>+</div><div class='add'>+  * debian/rules: improved/cleaned up the clean target</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Wed,  4 Jan 2006 12:56:23 -0800</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.0.1-6) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Added a target to automatically install lintian overrides, stolen from</div><div class='add'>+    debian-qt-kde.mk</div><div class='add'>+</div><div class='add'>+  * Added a bunch of lintian overrides for stuff that should be ignored</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Sat, 19 Nov 2005 01:17:03 -0800</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.0.1-5) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * debian/control: made libqt4-gui replace libqt4-core (&lt;&lt; 4.0.1-3), for</div><div class='add'>+    the plugins move (Closes: #336492)</div><div class='add'>+</div><div class='add'>+  * debian/control: removed the mention of a qt4-examples package that</div><div class='add'>+    doesn't actually exist from the qt4-doc package description</div><div class='add'>+</div><div class='add'>+  * debian/rules: remove all *.so files under</div><div class='add'>+    examples/tools/plugandpaint/plugins/ in the clean target</div><div class='add'>+    (Closes: #339674)</div><div class='add'>+</div><div class='add'>+  * Removed the menu entry for designer-qt4 from qt4-dev-tools.menu, and</div><div class='add'>+    added it to a new qt4-designer.menu</div><div class='add'>+</div><div class='add'>+  * Added a tarball of the examples to qt4-doc (Closes: #336832)</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Fri, 18 Nov 2005 10:27:03 -0800</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.0.1-4) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * debian/control: changed qt4-designer's section to "devel"</div><div class='add'>+</div><div class='add'>+  * Added a patch from Thiemo Seufer to fix the FTBFS on mips/mipsel</div><div class='add'>+    (Closes: #335831)</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Wed, 26 Oct 2005 00:13:40 -0700</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.0.1-3) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * debian/libqt4-core.install: only install the non-debug codecs, since</div><div class='add'>+    the debug ones pull in a gratuitous dependency on libqt4-debug</div><div class='add'>+    (Closes: #328913)</div><div class='add'>+</div><div class='add'>+  * debian/libqt4-debug.install: install the debug codecs here instead</div><div class='add'>+</div><div class='add'>+  * debian/control: replaced obsolete xlibs-dev dependency with the</div><div class='add'>+    required split packages (Closes: #329302)</div><div class='add'>+</div><div class='add'>+  * Completely disabled SQLite support since it's too fubar in this</div><div class='add'>+    version to be usable.  The build fails with SQLite2 support, and</div><div class='add'>+    SQLite3 is only supported by linking staticly with a version</div><div class='add'>+    distributed in the Qt source.  Meh.</div><div class='add'>+</div><div class='add'>+  * Renamed libqt4-designer to qt4-designer, merged in the designer binary</div><div class='add'>+    from qt4-dev-tools, and added a dependency on libqt4-dev</div><div class='add'>+    (Closes: #330094)</div><div class='add'>+</div><div class='add'>+  * Moved the plugins installed in libqt4-core to libqt4-gui, since they</div><div class='add'>+    link against the GUI library.  Otherwise a circular libqt4-core &lt;-&gt;</div><div class='add'>+    libqt4-gui dependency results.</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Fri, 21 Oct 2005 00:28:53 -0700</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.0.1-2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * debian/patches/10_qmake_use_qt4_tools.dpatch: new patch that modifies</div><div class='add'>+    qmake.conf so that qmake generates Makefiles that use the -qt4 tools.</div><div class='add'>+    This way, it can cope with systems that have alternatives set to use</div><div class='add'>+    the -qt3 versions.</div><div class='add'>+  </div><div class='add'>+  * Increased the conflicting Qt3 package versions to &lt;= 3.3.4-7, since</div><div class='add'>+    the Qt3 packages still don't use the alternatives system as needed to</div><div class='add'>+    coexist with Qt4.</div><div class='add'>+  </div><div class='add'>+  * debian/libqt4-core.install: added /usr/lib/qt4/plugins/codecs</div><div class='add'>+</div><div class='add'>+  * debian/patches/11_launch_assistant-qt4: new patch that modifies the</div><div class='add'>+    QAssistantClient class to launch Qt Assistant as "assistant-qt4" to</div><div class='add'>+    cope with the alternatives system (Closes: #327294)</div><div class='add'>+</div><div class='add'>+  * debian/control: Upgraded libqt4-dev's dependencies on the modules</div><div class='add'>+    libqt4-sql and libqt4-qt3support from suggests to depends, and added</div><div class='add'>+    libpq-dev and libmysqlclient14-dev | libmysqlclient-dev as</div><div class='add'>+    dependencies.  These dependencies are apparently required to make</div><div class='add'>+    building pkg-config-using packages happy. (Closes: #327618)</div><div class='add'>+</div><div class='add'>+  * debian/control: corrected libqt4-sql to suggest libmysqlclient14-dev,</div><div class='add'>+    not libmysqlclient12-dev which is deprecated</div><div class='add'>+</div><div class='add'>+  * debian/copyright: updated FSF snailmail address</div><div class='add'>+</div><div class='add'>+  * debian/libqt4-debug.install: removed the libqt3supportwidgets_debug.so</div><div class='add'>+    designer plugin, since for some reason having this installed breaks</div><div class='add'>+    designer (Closes: #325782)</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Mon, 12 Sep 2005 12:32:53 -0700</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.0.1-1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * New upstream release</div><div class='add'>+</div><div class='add'>+  * Install changes-4.0.1 as upstream changelog</div><div class='add'>+  </div><div class='add'>+  * debian/manpages/assistant-qt4.1: new manpage written from scratch</div><div class='add'>+    based on the output of "assistant -help"</div><div class='add'>+</div><div class='add'>+  * debian/manpages/designer-qt4.1, debian/manpages/linguist-qt4.1:</div><div class='add'>+    manpages stolen from the Qt3 packages and trivially adapted for Qt4</div><div class='add'>+    (Closes: #322403)</div><div class='add'>+</div><div class='add'>+  * debian/manpages/moc-qt4.1: escape some '-' characters</div><div class='add'>+</div><div class='add'>+  * debian/qt4-dev-tools.manpages: install the new assistant-qt4.1,</div><div class='add'>+    designer-qt4.1, and linguist-qt4.1 manpages</div><div class='add'>+</div><div class='add'>+  * debian/control: made qt4-dev-tools recommend qt4-doc, since assisant</div><div class='add'>+    needs it to be useful (Closes: #323251)</div><div class='add'>+</div><div class='add'>+  * Removed the FAQ from qt4-doc.docs, since it's no longer included in</div><div class='add'>+    4.0.1, and was useless anyway</div><div class='add'>+</div><div class='add'>+  * Build-depend on libmysqlclient14-dev since libmysqlclient12-dev is</div><div class='add'>+    scheduled to be removed</div><div class='add'>+</div><div class='add'>+  * debian/libqt4-dev.install: work around TT's broken "install" target in</div><div class='add'>+    this release so that the pkgconfig files are installed in</div><div class='add'>+    /usr/lib/pkgconfig instead of directly in /usr/lib.  Grrrr.</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Thu, 25 Aug 2005 19:28:35 -0700</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.0.0-3) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * debian/control: changed the xlibs-pic dependency to xlibs-static-pic</div><div class='add'>+    for the X.org transition (Closes: #319586)</div><div class='add'>+</div><div class='add'>+  * Added manpages for lrelease, lupdate, moc, qtconfig, and uic, stolen</div><div class='add'>+    from the Qt3 upstream tarball, and wrote a manpage for qmake from</div><div class='add'>+    scratch.  Since now manpages are included for all executables using</div><div class='add'>+    the alternatives, the symlinks to them no longer dangle.</div><div class='add'>+    (Closes: #319456)</div><div class='add'>+</div><div class='add'>+  * debian/libqt4-core.install: added</div><div class='add'>+    usr/lib/qt4/plugins/imageformats/libqjpeg.so to include the jpeg</div><div class='add'>+    plugin (Closes: #321582)</div><div class='add'>+</div><div class='add'>+  * debian/libqt4-debug.install: added the libqjpeg_debug.so plugin</div><div class='add'>+  </div><div class='add'>+  * debian/rules: don't hardcode the /usr/include/postgresql/8.0 path,</div><div class='add'>+    instead of the output of `pg_config --includedir`, stolen from Qt3</div><div class='add'>+    packages</div><div class='add'>+</div><div class='add'>+  * debian/libqt4-gui.install: added the OpenGL module library so that it</div><div class='add'>+    actually gets included in a package (Closes: #321874)</div><div class='add'>+</div><div class='add'>+  * debian/control: updated the package descriptions to note that the</div><div class='add'>+    Network and XML modules are included in the libqt4-core package, and</div><div class='add'>+    the OpenGL module is included in the libqt4-gui package</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Mon,  8 Aug 2005 08:58:10 -0700</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.0.0-2) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * libqt4-dev: added /usr/bin/uic3 (Closes: #318451)</div><div class='add'>+</div><div class='add'>+  * Transition to the new X.org packages:</div><div class='add'>+    + (Build-)depend on libglu1-xorg-dev instead of xlibmesa-gl-dev</div><div class='add'>+    + (Build-)depend on libxinerama-dev (Closes: #318682)</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Tue, 19 Jul 2005 21:28:19 -0700</div><div class='add'>+</div><div class='add'>+qt4-x11 (4.0.0-1) unstable; urgency=low</div><div class='add'>+</div><div class='add'>+  * Initial release (Closes: #306694)</div><div class='add'>+</div><div class='add'>+ -- Brian Nelson &lt;pyro@debian.org&gt;  Tue,  5 Jul 2005 19:42:18 -0700</div><div class='head'>diff --git a/config.profiles/harmattan/collection/qtdemo.qhc.uu b/config.profiles/harmattan/collection/qtdemo.qhc.uu<br/>new file mode 100644<br/>index 0000000..4e4898e<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/collection/qtdemo.qhc.uu?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/collection/qtdemo.qhc.uu</a></div><div class='hunk'>@@ -0,0 +1,231 @@</div><div class='add'>+begin 644 qtdemo.qhc</div><div class='add'>+M4U%,:71E(&amp;9O&lt;FUA="`S``0``0$`0"`@````%@````````````````````8`</div><div class='add'>+M```!```````````````"````````````````````````````````````````</div><div class='add'>+M``````````````4````!`_L`````"`/[````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M```````````````````````````````````````````&amp;`PT````"`MT``X$"</div><div class='add'>+MW0``````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M``"!(0(%`'6!76,`;P!M`"X`=`!R`&amp;\`;`!L`'0`90!C`&amp;@`+@!D`&amp;4`&lt;P!I</div><div class='add'>+M`&amp;&lt;`;@!E`'(`+@`T`#0`,``N`"X`+P`N`"X`+P`N`"X`+P`N`"X`+P!S`&amp;@`</div><div class='add'>+M80!R`&amp;4`+P!Q`'0`-``O`&amp;0`;P!C`"\`:`!T`&amp;T`;``M`&amp;0`90!S`&amp;D`9P!N</div><div class='add'>+M`&amp;4`&lt;@`O`&amp;0`90!S`&amp;D`9P!N`&amp;4`&lt;@`N`'$`8P!H`'T!!0!=@2UC`&amp;\`;0`N</div><div class='add'>+M`'0`&lt;@!O`&amp;P`;`!T`&amp;4`8P!H`"X`&lt;0!T`"X`-``T`#``+@`N`"\`+@`N`"\`</div><div class='add'>+M+@`N`"\`+@`N`"\`&lt;P!H`&amp;$`&lt;@!E`"\`&lt;0!T`#0`+P!D`&amp;\`8P`O`&amp;@`=`!M</div><div class='add'>+M`&amp;P`+0!Q`'0`+P!Q`'0`+@!Q`&amp;,`:``-`````@/B``/Q`^(`````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````#0($``$=`G$`9`!O`&amp;,`#0$$</div><div class='add'>+M``$=`7$`9`!O`&amp;,`#0````4#KP`#]P/H`],#Q`.O````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M`````````````!,%`P`M9`!E`',`:0!G`&amp;X`90!R``T$`P`A=`!O`&amp;\`;`!S</div><div class='add'>+M`!,#`P`M&lt;0!T`'(`90!F`&amp;0`;P!C``T"`P`A-``N`#0`+@`P``&lt;!`P`5&lt;0!T</div><div class='add'>+M``T````"`\(``^L#P@``````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````)P(#`%51`'0`(`!$`&amp;4`&lt;P!I`&amp;&lt;`;@!E`'(`</div><div class='add'>+M(`!-`&amp;$`;@!U`&amp;$`;``3`0,`+5$`=``@`#0`+@`T`"X`,``-`````P$_``$_</div><div class='add'>+M`BH##P``````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````@6@!!R%%</div><div class='add'>+M10&amp;"270`80!B`&amp;P`90!.`&amp;$`;0!E`',`&lt;`!A`&amp;,`90!4`&amp;$`8@!L`&amp;4`3@!A</div><div class='add'>+M`&amp;T`90!S`'``80!C`&amp;4`5`!A`&amp;(`;`!E``)#`%(`10!!`%0`10`@`%0`00!"</div><div class='add'>+M`$P`10`@`$X`80!M`&amp;4`&lt;P!P`&amp;$`8P!E`%0`80!B`&amp;P`90`@`"@`20!D`"``</div><div class='add'>+M20!.`%0`10!'`$4`4@`@`%``4@!)`$T`00!2`%D`(`!+`$4`60`L`"``3@!A</div><div class='add'>+M`&amp;T`90`@`%0`10!8`%0`+``@`$8`:0!L`&amp;4`4`!A`'0`:``@`%0`10!8`%0`</div><div class='add'>+M(``I`(%B`@&lt;A.3D!@E5T`&amp;$`8@!L`&amp;4`1@!O`&amp;P`9`!E`'(`5`!A`&amp;(`;`!E</div><div class='add'>+M`$8`;P!L`&amp;0`90!R`%0`80!B`&amp;P`90`#0P!2`$4`00!4`$4`(`!4`$$`0@!,</div><div class='add'>+M`$4`(`!&amp;`&amp;\`;`!D`&amp;4`&lt;@!4`&amp;$`8@!L`&amp;4`(``H`$D`9``@`$D`3@!4`$4`</div><div class='add'>+M1P!%`%(`(`!0`%(`20!-`$$`4@!9`"``2P!%`%D`+``@`$X`80!M`&amp;4`&lt;P!P</div><div class='add'>+M`&amp;$`8P!E`$D`9``@`$D`3@!4`$4`1P!%`%(`+``@`$X`80!M`&amp;4`(`!4`$4`</div><div class='add'>+M6`!4`"``*0"!;@,'(5U=`8(E=`!A`&amp;(`;`!E`$8`:0!L`'0`90!R`$$`=`!T</div><div class='add'>+M`'(`:0!B`'4`=`!E`%0`80!B`&amp;P`90!&amp;`&amp;D`;`!T`&amp;4`&lt;@!!`'0`=`!R`&amp;D`</div><div class='add'>+M8@!U`'0`90!4`&amp;$`8@!L`&amp;4`!$,`4@!%`$$`5`!%`"``5`!!`$(`3`!%`"``</div><div class='add'>+M1@!I`&amp;P`=`!E`'(`00!T`'0`&lt;@!I`&amp;(`=0!T`&amp;4`5`!A`&amp;(`;`!E`"``*`!)</div><div class='add'>+M`&amp;0`(`!)`$X`5`!%`$&lt;`10!2`"``4`!2`$D`30!!`%(`60`@`$L`10!9`"P`</div><div class='add'>+M(`!.`&amp;$`;0!E`"``5`!%`%@`5``@`"D`#0````4#W0`#^0/R`^L#Y`/=````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M```````````````````````````````%!0,!`0(%!00#`0$"!`4#`P$!`@$%</div><div class='add'>+M`@,!`0$"!0$#`0$!`0T"7@`$`2L``F(#-0$K`?``````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````@4(&amp;</div><div class='add'>+M!R%!00&amp;"!70`80!B`&amp;P`90!3`&amp;4`=`!T`&amp;D`;@!G`',`5`!A`&amp;(`;`!E`%,`</div><div class='add'>+M90!T`'0`:0!N`&amp;&lt;`&lt;P!4`&amp;$`8@!L`&amp;4`"4,`4@!%`$$`5`!%`"``5`!!`$(`</div><div class='add'>+M3`!%`"``4P!E`'0`=`!I`&amp;X`9P!S`%0`80!B`&amp;P`90`@`"@`2P!E`'D`(`!4</div><div class='add'>+M`$4`6`!4`"``4`!2`$D`30!!`%(`60`@`$L`10!9`"P`(`!6`&amp;$`;`!U`&amp;4`</div><div class='add'>+M(`!"`$P`3P!"`"``*0!L!P&lt;A@0U!`0!I`&amp;X`9`!E`'@`&lt;P!Q`&amp;P`:0!T`&amp;4`</div><div class='add'>+M7P!A`'4`=`!O`&amp;D`;@!D`&amp;4`&gt;`!?`%,`90!T`'0`:0!N`&amp;&lt;`&lt;P!4`&amp;$`8@!L</div><div class='add'>+M`&amp;4`7P`Q`%,`90!T`'0`:0!N`&amp;&lt;`&lt;P!4`&amp;$`8@!L`&amp;4`"@````2!4`0'(4E)</div><div class='add'>+M`8(1=`!A`&amp;(`;`!E`$8`:0!L`'0`90!R`$X`80!M`&amp;4`5`!A`&amp;(`;`!E`$8`</div><div class='add'>+M:0!L`'0`90!R`$X`80!M`&amp;4`5`!A`&amp;(`;`!E``5#`%(`10!!`%0`10`@`%0`</div><div class='add'>+M00!"`$P`10`@`$8`:0!L`'0`90!R`$X`80!M`&amp;4`5`!A`&amp;(`;`!E`"``*`!)</div><div class='add'>+M`&amp;0`(`!)`$X`5`!%`$&lt;`10!2`"``4`!2`$D`30!!`%(`60`@`$L`10!9`"P`</div><div class='add'>+M(`!.`&amp;$`;0!E`"``5`!%`%@`5``@`"D`@4@%!R$Y.0&amp;"(70`80!B`&amp;P`90!&amp;</div><div class='add'>+M`&amp;D`;`!T`&amp;4`&lt;@!4`&amp;$`8@!L`&amp;4`1@!I`&amp;P`=`!E`'(`5`!A`&amp;(`;`!E``=#</div><div class='add'>+M`%(`10!!`%0`10`@`%0`00!"`$P`10`@`$8`:0!L`'0`90!R`%0`80!B`&amp;P`</div><div class='add'>+M90`@`"@`3@!A`&amp;T`90!)`&amp;0`(`!)`$X`5`!%`$&lt;`10!2`"P`(`!&amp;`&amp;D`;`!T</div><div class='add'>+M`&amp;4`&lt;@!!`'0`=`!R`&amp;D`8@!U`'0`90!)`&amp;0`(`!)`$X`5`!%`$&lt;`10!2`"``</div><div class='add'>+M*0`-``````0`````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````"@`````$````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+M````````````````````````````````````````````````````````````</div><div class='add'>+9````````````````````````````````````</div><div class='add'>+`</div><div class='add'>+end</div><div class='head'>diff --git a/config.profiles/harmattan/compat b/config.profiles/harmattan/compat<br/>new file mode 100644<br/>index 0000000..7f8f011<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/compat?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/compat</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+7</div><div class='head'>diff --git a/config.profiles/harmattan/configure-pulse.sh b/config.profiles/harmattan/configure-pulse.sh<br/>new file mode 100755<br/>index 0000000..7940d33<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/configure-pulse.sh?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/configure-pulse.sh</a></div><div class='hunk'>@@ -0,0 +1,122 @@</div><div class='add'>+#/bin/sh</div><div class='add'>+#############################################################################</div><div class='add'>+##</div><div class='add'>+## Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+## All rights reserved.</div><div class='add'>+## Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+##</div><div class='add'>+## This file is the build configuration utility of the Qt Toolkit.</div><div class='add'>+##</div><div class='add'>+## $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+## GNU Lesser General Public License Usage</div><div class='add'>+## This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+## License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+## appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+## file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+## General Public License version 2.1 requirements will be met:</div><div class='add'>+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+##</div><div class='add'>+## In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+## rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+##</div><div class='add'>+## GNU General Public License Usage</div><div class='add'>+## Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+## Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+## and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+## file. Please review the following information to ensure the GNU General</div><div class='add'>+## Public License version 3.0 requirements will be met:</div><div class='add'>+## http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+##</div><div class='add'>+## Other Usage</div><div class='add'>+## Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+## conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+##</div><div class='add'>+##</div><div class='add'>+##</div><div class='add'>+##</div><div class='add'>+##</div><div class='add'>+## $QT_END_LICENSE$</div><div class='add'>+##</div><div class='add'>+#############################################################################</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+# Fail on error</div><div class='add'>+set -e</div><div class='add'>+# We will assume that if TOOLCHAIN_PATH is not set, that other required actions have not been done either</div><div class='add'>+# so advise the user - N.B.: PATH &amp; PKG_CONFIG_PATH may already be set to system values so we can't</div><div class='add'>+# simply check for them being unset.</div><div class='add'>+if [ -z "$TOOLCHAIN_PATH" ]; then</div><div class='add'>+    echo</div><div class='add'>+    echo "TOOLCHAIN_PATH    must be set to the path of the columbus toolchain, e.g.:" 1&gt;&amp;2</div><div class='add'>+    echo "                      export TOOLCHAIN_PATH=/opt/toolchains/columbus/cs2007q3-glibc2.5-arm7" 1&gt;&amp;2</div><div class='add'>+    echo "PATH              should have the path to toolchain's bin dir at beginning, e.g.:" 1&gt;&amp;2</div><div class='add'>+    echo "                      export PATH=\$TOOLCHAIN_PATH/bin:\$PATH" 1&gt;&amp;2</div><div class='add'>+    echo "PKG_CONFIG_PREFIX should have the prefix for pkg config, e.g.:" 1&gt;&amp;2</div><div class='add'>+    echo "                      export PKG_CONFIG_PREFIX=\$TOOLCHAIN_PATH/arm-none-linux-gnueabi" 1&gt;&amp;2</div><div class='add'>+    echo "PKG_CONFIG_PATH   must be set to the path(s) to pkg config .pc file location(s), e.g.:" 1&gt;&amp;2</div><div class='add'>+    echo "                      export PKG_CONFIG_PATH=\$PKG_CONFIG_PREFIX/libc/lib/pkgconfig:\$PKG_CONFIG_PREFIX/libc/usr/lib/pkgconfig" 1&gt;&amp;2</div><div class='add'>+    echo</div><div class='add'>+    exit 1</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+# We assume the current dir is the depot and we are not shadow building</div><div class='add'>+# Blast the mkspec we use, if it exists, and copy it out of debian dir</div><div class='add'>+rm -rf mkspecs/linux-g++-cross</div><div class='add'>+cp -a debian/mkspecs/linux-g++-cross mkspecs/</div><div class='add'>+</div><div class='add'>+# maemo does the next two lines, no idea why, left them for referance</div><div class='add'>+# rm -rf mkspecs/glibc-g++</div><div class='add'>+# cp -a mkspecs/linux-g++ mkspecs/glibc-g++</div><div class='add'>+</div><div class='add'>+# Run configure - we take extra arguments if given</div><div class='add'>+exec ./configure -nokia-developer \</div><div class='add'>+    -prefix "/usr" \</div><div class='add'>+    -bindir "/usr/bin" \</div><div class='add'>+    -libdir "/usr/lib" \</div><div class='add'>+    -docdir "/usr/share/qt4/doc" \</div><div class='add'>+    -headerdir "/usr/include/qt4" \</div><div class='add'>+    -datadir "/usr/share/qt4" \</div><div class='add'>+    -plugindir "/usr/lib/qt4/plugins" \</div><div class='add'>+    -translationdir "/usr/share/qt4/translations" \</div><div class='add'>+    -sysconfdir "/etc/xdg" \</div><div class='add'>+    -arch arm \</div><div class='add'>+    -xplatform linux-g++-cross \</div><div class='add'>+    -fast \</div><div class='add'>+    -mitshm \</div><div class='add'>+    -no-optimized-qmake \</div><div class='add'>+    -reduce-relocations \</div><div class='add'>+    -no-separate-debug-info \</div><div class='add'>+    -system-zlib \</div><div class='add'>+    -system-libtiff \</div><div class='add'>+    -system-libpng \</div><div class='add'>+    -system-libjpeg \</div><div class='add'>+    -no-nas-sound \</div><div class='add'>+    -qt-gif \</div><div class='add'>+    -no-qt3support \</div><div class='add'>+    -no-libmng \</div><div class='add'>+    -opengl es2 \</div><div class='add'>+    -no-accessibility \</div><div class='add'>+    -nomake examples \</div><div class='add'>+    -nomake demos \</div><div class='add'>+    -little-endian \</div><div class='add'>+    -I${TOOLCHAIN_PATH}/libc/usr/include/freetype2 \</div><div class='add'>+    -lfontconfig \</div><div class='add'>+    -no-cups \</div><div class='add'>+    -no-gtkstyle \</div><div class='add'>+    -exceptions \</div><div class='add'>+    -no-xinerama \</div><div class='add'>+    -dbus \</div><div class='add'>+    -glib \</div><div class='add'>+    -no-pch \</div><div class='add'>+    -gstreamer \</div><div class='add'>+    -svg \</div><div class='add'>+    -webkit \</div><div class='add'>+    -no-sql-ibase \</div><div class='add'>+    -xmlpatterns \</div><div class='add'>+    -system-sqlite \</div><div class='add'>+    -plugin-sql-sqlite \</div><div class='add'>+    -openssl \</div><div class='add'>+    -DQT_QLOCALE_USES_FCVT \</div><div class='add'>+    "$@"</div><div class='add'>+# End of Script</div><div class='head'>diff --git a/config.profiles/harmattan/control b/config.profiles/harmattan/control<br/>new file mode 100644<br/>index 0000000..13908a9<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/control?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/control</a></div><div class='hunk'>@@ -0,0 +1,648 @@</div><div class='add'>+Source: qt4-x11</div><div class='add'>+Section: libs</div><div class='add'>+Priority: optional</div><div class='add'>+Maintainer: Petri Latvala &lt;ext-petri.latvala@nokia.com&gt;</div><div class='add'>+Build-Depends: cdbs, debhelper (&gt;= 7), flex, quilt, sharutils,</div><div class='add'>+ libdbus-1-dev, libfreetype6-dev, libglib2.0-dev, libice-dev, libjpeg62-dev,</div><div class='add'>+ libpng12-dev, libreadline5-dev | libreadline4-dev, libsm-dev, libtiff4-dev, libx11-dev,</div><div class='add'>+ libxext-dev, libxft-dev, libxi-dev, libxmu-dev,</div><div class='add'>+ libxrandr-dev, libxrender-dev, libxslt1-dev, libxt-dev, x11proto-core-dev,</div><div class='add'>+ zlib1g-dev, libgstreamer-plugins-base0.10-dev, libgstreamer0.10-dev, libicu-dev,</div><div class='add'>+ libgles2-sgx-img-dev [arm armel] | libgles2-dev [arm armel], libgles2 [arm armel],</div><div class='add'>+ opengles-sgx-img-common-dev [arm armel], opengles-sgx-img-common [arm armel],</div><div class='add'>+ libgl-dev [i386], libgl1 [i386],</div><div class='add'>+ libxau-dev, libxcb1-dev, libxdmcp-dev, libexpat1-dev,</div><div class='add'>+ libsqlite3-dev, libsqlite3-0, libssl-dev, libasound2-dev, libxv-dev,</div><div class='add'>+ icd2-dev, icd2-osso-ic-dev, osso-wlan-dev, libconnsettings0-dev</div><div class='add'>+Standards-Version: 3.9.1.0</div><div class='add'>+</div><div class='add'>+Package: libqtcore4</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}</div><div class='add'>+Replaces: libqt4-core (&lt;&lt; 4.4.0~beta1-1), libqt4-gui (&lt;&lt; 4.4.0~beta1-1)</div><div class='add'>+Description: Qt 4 core module</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ The QtCore module contains core non-GUI functionality.</div><div class='add'>+</div><div class='add'>+Package: libqtcore4-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqtcore4 (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 library debugging symbols</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the debugging symbols for the Qt 4 Core libraries.</div><div class='add'>+</div><div class='add'>+Package: libqt4-core</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}), libqt4-network (= ${binary:Version}), libqt4-script (= ${binary:Version}), libqt4-xml (= ${binary:Version}), libqt4-dbus (= ${binary:Version})</div><div class='add'>+Description: transitional package for Qt 4 core non-GUI runtime libraries</div><div class='add'>+ Qt is a cross-platform C++ application framework.  Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This is a dummy transitional package to enable installation of other Debian</div><div class='add'>+ packages linked against Qt 4.3 or earlier Qt 4 releases previously shipped</div><div class='add'>+ in Debian.</div><div class='add'>+</div><div class='add'>+Package: libqtgui4</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}), fontconfig, opengles-sgx-img-common [arm armel], libgles2 [arm armel]</div><div class='add'>+Conflicts: libqt4-designer (&lt;&lt; 4.4.0~beta1-1)</div><div class='add'>+Replaces: libqt4-core (&lt;&lt; 4.0.1-3), libqt4-gui (&lt;&lt; 4.4.0),</div><div class='add'>+ qt4-designer (&lt;&lt; 4.1.4), libqt4-designer (&lt;&lt; 4.4.0~beta1-1)</div><div class='add'>+Description: Qt 4 GUI module</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ The QtGui module extends QtCore with GUI functionality.</div><div class='add'>+</div><div class='add'>+Package: libqtgui4-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqtgui4 (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 library debugging symbols</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the debugging symbols for the Qt 4 GUI libraries.</div><div class='add'>+</div><div class='add'>+Package: libqt4-gui</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqtgui4  (= ${binary:Version}), libqt4-svg (= ${binary:Version})</div><div class='add'>+Description: transitional package for Qt 4 GUI runtime libraries</div><div class='add'>+ Qt is a cross-platform C++ application framework.  Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This is a dummy transitional package depending on the Qt4 GUI library</div><div class='add'>+ packages which the package of the same name used to provide in Qt 4.3.4</div><div class='add'>+ and earlier Debian packages of Qt4.</div><div class='add'>+</div><div class='add'>+Package: libqt4-network</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version})</div><div class='add'>+Replaces: libqt4-core (&lt;&lt; 4.4.0~beta1-1)</div><div class='add'>+Description: Qt 4 network module</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ The QtNetwork module offers classes that allow you to write TCP/IP clients and</div><div class='add'>+ servers. It provides classes to make network programming easier and portable.</div><div class='add'>+</div><div class='add'>+Package: libqt4-network-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-network (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 library debugging symbols</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the debugging symbols for the Qt 4 Network libraries.</div><div class='add'>+</div><div class='add'>+Package: libqt4-script</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-dbus (= ${binary:Version}), libqtcore4 (= ${binary:Version})</div><div class='add'>+Replaces: libqt4-core (&lt;&lt; 4.4.0~beta1-1)</div><div class='add'>+Description: Qt 4 script module</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ The QtScript module provides classes for making Qt applications scriptable.</div><div class='add'>+</div><div class='add'>+Package: libqt4-script-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-script (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 library debugging symbols</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the debugging symbols for the Qt 4 Script libraries.</div><div class='add'>+</div><div class='add'>+Package: libqt4-sql</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version})</div><div class='add'>+Recommends: libqt4-sql-sqlite</div><div class='add'>+Suggests: libqt4-dev</div><div class='add'>+Description: Qt 4 SQL module</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ The QtSql module helps you provide seamless database integration to your Qt</div><div class='add'>+ applications.</div><div class='add'>+ .</div><div class='add'>+ If you wish to use the SQL module for development, you should install the</div><div class='add'>+ libqt4-dev package.</div><div class='add'>+</div><div class='add'>+Package: libqt4-sql-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-sql (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 library debugging symbols</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the debugging symbols for the Qt 4 SQL libraries.</div><div class='add'>+</div><div class='add'>+Package: libqt4-sql-sqlite</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql (= ${binary:Version})</div><div class='add'>+Description: Qt 4 SQLite plugin</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+  is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+</div><div class='add'>+Package: libqt4-sql-sqlite-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-sql-sqlite (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 library debugging symbols</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the debugging symbols for the Qt 4 SQL SQLite plugin.</div><div class='add'>+</div><div class='add'>+Package: libqt4-svg</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}), libqtgui4 (= ${binary:Version})</div><div class='add'>+Conflicts: libqt4-gui (&lt;&lt; 4.4.0~beta1-1)</div><div class='add'>+Replaces: libqt4-gui (&lt;&lt; 4.4.0~beta1-1)</div><div class='add'>+Description: Qt 4 SVG module</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ The QtSvg module provides classes for displaying the contents of SVG files.</div><div class='add'>+ .</div><div class='add'>+ Scalable Vector Graphics (SVG) is a language for describing two-dimensional</div><div class='add'>+ graphics and graphical applications in XML.</div><div class='add'>+</div><div class='add'>+Package: libqt4-svg-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-svg (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 library debugging symbols</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the debugging symbols for the Qt 4 SVG libraries.</div><div class='add'>+</div><div class='add'>+Package: libqt4-webkit</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqtwebkit4 (&gt;= 2.0~)</div><div class='add'>+Description: Qt 4 WebKit module</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This is a dummy transitional package to enable installation of other packages</div><div class='add'>+ linked against Qt WebKit 4.4 - 4.7 releases previously shipped from Qt source.</div><div class='add'>+</div><div class='add'>+Package: libqt4-xml</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version})</div><div class='add'>+Replaces: libqt4-core (&lt;&lt; 4.4.0~beta1-1)</div><div class='add'>+Description: Qt 4 XML module</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ The QtXml module provides a stream reader and writer for XML documents,</div><div class='add'>+ and C++ implementations of SAX and DOM.</div><div class='add'>+</div><div class='add'>+Package: libqt4-xml-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-xml (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 library debugging symbols</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the debugging symbols for the Qt 4 XML libraries.</div><div class='add'>+</div><div class='add'>+Package: libqt4-xmlpatterns</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}), libqt4-xml (= ${binary:Version})</div><div class='add'>+Replaces: libqt4-core (&lt;&lt; 4.4.0~beta1-1)</div><div class='add'>+Description: Qt 4 XML Patterns module</div><div class='add'>+ lorem ipsum</div><div class='add'>+ .</div><div class='add'>+ and all that </div><div class='add'>+</div><div class='add'>+Package: libqt4-xmlpatterns-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-xmlpatterns (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 XML patterns library debugging symbols</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the debugging symbols for the Qt 4 XML patterns</div><div class='add'>+ library.</div><div class='add'>+</div><div class='add'>+Package: libqt4-dbus</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-xml (= ${binary:Version}), libqtcore4 (= ${binary:Version})</div><div class='add'>+Replaces: libqt4-core (&lt;&lt; 4.4.0~beta1-1)</div><div class='add'>+Description: Qt 4 D-Bus module</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ The QtDBus module is a Unix-only library that you can use to make Inter-Process</div><div class='add'>+ Communication using the D-Bus protocol.</div><div class='add'>+ .</div><div class='add'>+ Applications using the QtDBus module can provide services to other, remote</div><div class='add'>+ applications by exporting objects, as well as use services exported by those</div><div class='add'>+ applications by placing calls and accessing properties.</div><div class='add'>+</div><div class='add'>+Package: libqt4-dbus-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-dbus (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 library debugging symbols</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the debugging symbols for the Qt 4 DBus libraries.</div><div class='add'>+</div><div class='add'>+Package: libqt4-help</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql (= ${binary:Version}), libqtcore4 (= ${binary:Version}), libqtgui4 (= ${binary:Version})</div><div class='add'>+Description: Qt 4 help module</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ The QtHelp module provides classes for integrating online documentation in</div><div class='add'>+ applications.</div><div class='add'>+</div><div class='add'>+Package: libqt4-help-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-help (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 library debugging symbols</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the debugging symbols for the Qt 4 Help libraries.</div><div class='add'>+</div><div class='add'>+Package: libqt4-test</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version})</div><div class='add'>+Replaces: libqt4-core (&lt;&lt; 4.4.0~beta1-1)</div><div class='add'>+Description: Qt 4 test module</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ The QtTest module provides classes for unit testing Qt applications and</div><div class='add'>+ libraries.</div><div class='add'>+</div><div class='add'>+Package: libqt4-test-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-test (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 library debugging symbols</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the debugging symbols for the Qt 4 Test libraries.</div><div class='add'>+</div><div class='add'>+Package: libqt4-dev</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libdevel</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends},</div><div class='add'>+ libqt4-dbus (= ${binary:Version}),</div><div class='add'>+ libqt4-xml (= ${binary:Version}), libqtcore4 (= ${binary:Version}),</div><div class='add'>+ libqt4-network (= ${binary:Version}), libqtgui4 (= ${binary:Version}),</div><div class='add'>+ libqt4-svg (= ${binary:Version}), libqt4-sql (= ${binary:Version}),</div><div class='add'>+ libqt4-script (= ${binary:Version}), libqt4-help (= ${binary:Version}),</div><div class='add'>+ libqt4-test (= ${binary:Version}), libqt4-phonon (= ${binary:Version}),</div><div class='add'>+ libqt4-xmlpatterns (= ${binary:Version}),</div><div class='add'>+ libqt4-multimedia (= ${binary:Version}), libqt4-opengl (= ${binary:Version}),</div><div class='add'>+ libqt4-declarative (= ${binary:Version}), qt4-linguist-tools (= ${binary:Version}),</div><div class='add'>+ libqt4-meegographicssystemhelper-dev (= ${binary:Version}) [arm armel],</div><div class='add'>+ libgl-dev [i386], libgles2-sgx-img-dev [arm armel],</div><div class='add'>+ opengles-sgx-img-common-dev [arm armel], libxv-dev, libc6-dev</div><div class='add'>+Conflicts: qt3-dev-tools (&lt;= 3:3.3.4-7)</div><div class='add'>+Replaces: libqt4-opengl-dev (&lt;&lt; 4.4.0-2)</div><div class='add'>+Suggests: libmysqlclient15-dev, libsqlite0-dev, libsqlite3-dev, libpq-dev, libiodbc2-dev, firebird2.0-dev</div><div class='add'>+Description: Qt 4 development files</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the header development files and development programs</div><div class='add'>+ such as qmake used for building Qt4 applications.</div><div class='add'>+</div><div class='add'>+Package: qt4-linguist-tools</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libdevel</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}</div><div class='add'>+Description: Qt 4 development files</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the Qt Linguist development tool</div><div class='add'>+ such as lrelease used for building Qt4 applications.</div><div class='add'>+</div><div class='add'>+Package: libqt4</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: libqt4-core (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 dummy package</div><div class='add'>+ This is a dummy alias-package.</div><div class='add'>+</div><div class='add'>+Package: libqt4-phonon</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}), libqt4-xml (= ${binary:Version}), libqtgui4 (= ${binary:Version}), libqt4-opengl (= ${binary:Version}),  libqt4-dbus (= ${binary:Version})</div><div class='add'>+Replaces: libqt4-core (&lt;&lt; 4.4.0~beta1-1)</div><div class='add'>+Description: Qt 4 Phonon Libraries</div><div class='add'>+ Qt 4 media playing libraries</div><div class='add'>+</div><div class='add'>+Package: libqt4-phonon-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-phonon (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 phonon module</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the debugging symbol for the Qt phonon library.</div><div class='add'>+</div><div class='add'>+Package: libqt4-multimedia</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}</div><div class='add'>+Description: Qt 4 Multimedia Libraries</div><div class='add'>+ Qt 4 media playing libraries</div><div class='add'>+</div><div class='add'>+Package: libqt4-multimedia-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-multimedia (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 multimedia module</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the debugging symbol for the Qt multimedia library.</div><div class='add'>+</div><div class='add'>+Package: libqt4-opengl</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: libqtcore4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, opengles-sgx-img-common [arm armel], libgles2 [arm armel], libgl1 [i386]</div><div class='add'>+Replaces: libqt4-core (&lt;&lt; 4.4.0~beta1-1)</div><div class='add'>+Description: Qt 4 OpenGL module</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ The QtOpenGL module offers classes that make it easy to use OpenGL in Qt</div><div class='add'>+ applications.</div><div class='add'>+ .</div><div class='add'>+ OpenGL is a standard API for rendering 3D graphics. OpenGL only deals with 3D</div><div class='add'>+ rendering and provides little or no support for GUI programming issues.</div><div class='add'>+ .</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the development files needed to build Qt 4 applications</div><div class='add'>+ using QtOpenGL library.</div><div class='add'>+</div><div class='add'>+Package: libqt4-opengl-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-opengl (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 library debugging symbols</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the debugging symbols for the Qt 4 OpenGL libraries.</div><div class='add'>+</div><div class='add'>+Package: libqt4-opengl-dev</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libdevel</div><div class='add'>+Depends: libqt4-dev (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Replaces: libqt4-dev (&lt;&lt; 4.4.0~beta1-1)</div><div class='add'>+Description: Qt 4 OpenGL library development files</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This is a transitional package for libqt4-opengl-dev, and can be safely removed</div><div class='add'>+ after the installation is complete.</div><div class='add'>+</div><div class='add'>+Package: qt4-acceptance-tests</div><div class='add'>+Section: libdevel</div><div class='add'>+Priority: optional</div><div class='add'>+Architecture: any</div><div class='add'>+Depends: ci-testing, ${shlibs:Depends}, ${misc:Depends}</div><div class='add'>+XB-Maemo-CI-Packages: libqtcore4</div><div class='add'>+XB-Maemo-CI-Stage: staging, acceptance</div><div class='add'>+Description: Tests for libqtcore4</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains selected autotest cases for CI testing.</div><div class='add'>+</div><div class='add'>+Package: qt4-maemo-auto-tests</div><div class='add'>+Section: libdevel</div><div class='add'>+Priority: optional</div><div class='add'>+Architecture: any</div><div class='add'>+Depends: ci-testing, ${shlibs:Depends}, ${misc:Depends}</div><div class='add'>+XB-Maemo-CI-Packages: libqtcore4</div><div class='add'>+XB-Maemo-CI-Stage: staging</div><div class='add'>+Description: Tests for Qt4</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains selected autotest cases for CI testing.</div><div class='add'>+</div><div class='add'>+Package: libqt4-declarative</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}</div><div class='add'>+Description: Qt 4 declarative module</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ The QtDeclarative module contains declarative UI functionality.</div><div class='add'>+</div><div class='add'>+Package: libqt4-declarative-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-declarative (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 library debugging symbols</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the debugging symbols for the Qt 4 Declarative</div><div class='add'>+ libraries.</div><div class='add'>+</div><div class='add'>+Package: libqt4-declarative-dev</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libdevel</div><div class='add'>+Depends: libqt4-dev (&gt;= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Description: Qt 4 Declarative development files</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This is a transitional package for libqt4-declarative-dev, and can be</div><div class='add'>+ safely removed after the installation is complete.</div><div class='add'>+</div><div class='add'>+Package: qt4-declarative-qmlviewer</div><div class='add'>+Architecture: any</div><div class='add'>+Section: devel</div><div class='add'>+Depends: libqt4-declarative (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}</div><div class='add'>+Description: Qt 4 declarative module</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ The QtDeclarative viewer allows viewing QML files</div><div class='add'>+</div><div class='add'>+Package: libqt4-gui-tests</div><div class='add'>+Section: libdevel</div><div class='add'>+Priority: optional</div><div class='add'>+Architecture: any</div><div class='add'>+Depends: ci-testing, ${shlibs:Depends}, ${misc:Depends}</div><div class='add'>+XB-Maemo-CI-Packages: libqtgui4</div><div class='add'>+XB-Maemo-CI-Stage: staging</div><div class='add'>+Description: Tests for Qt4</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains selected autotest cases for CI testing.</div><div class='add'>+</div><div class='add'>+Package: libqt4-doc</div><div class='add'>+Section: doc</div><div class='add'>+Priority: optional</div><div class='add'>+Architecture: all</div><div class='add'>+Depends: ${misc:Depends}</div><div class='add'>+Description: Qt 4 documentation</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the documentation for Qt 4.</div><div class='add'>+</div><div class='add'>+Package: libqt4-meegographicssystem</div><div class='add'>+Architecture: arm armel</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-meegographicssystemhelper</div><div class='add'>+Conflicts: libqt4-meego (&lt;&lt; 4.7.2~git20110119)</div><div class='add'>+Replaces: libqt4-meego (&lt;&lt; 4.7.2~git20110119)</div><div class='add'>+Description: Qt 4 MeeGo graphics system plugin</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the MeeGo graphics system plugin.</div><div class='add'>+</div><div class='add'>+Package: libqt4-meegographicssystemhelper</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libs</div><div class='add'>+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-meegographicssystem [arm armel]</div><div class='add'>+Conflicts: libqt4-meego (&lt;&lt; 4.7.2~git20110119)</div><div class='add'>+Replaces: libqt4-meego (&lt;&lt; 4.7.2~git20110119)</div><div class='add'>+Provides: libqt4-meego</div><div class='add'>+Description: Qt 4 MeeGo graphics system helper</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the MeeGo graphics system helper library.</div><div class='add'>+</div><div class='add'>+Package: libqt4-meegographicssystemhelper-dev</div><div class='add'>+Architecture: any</div><div class='add'>+Section: libdevel</div><div class='add'>+Depends: libqt4-meegographicssystemhelper (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Conflicts: libqt4-meego-dev (&lt;&lt; 4.7.2~git20110119)</div><div class='add'>+Replaces: libqt4-meego-dev (&lt;&lt; 4.7.2~git20110119)</div><div class='add'>+Provides: libqt4-meego-dev</div><div class='add'>+Description: Qt 4 MeeGo graphics system development libraries and headers</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package contains the MeeGo graphics system header files and</div><div class='add'>+ development libraries.</div><div class='add'>+</div><div class='add'>+Package: libqt4-meegographicssystemhelper-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: any</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-meegographicssystemhelper (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Conflicts: libqt4-meego-dbg (&lt;&lt; 4.7.2~git20110119)</div><div class='add'>+Replaces: libqt4-meego-dbg (&lt;&lt; 4.7.2~git20110119)</div><div class='add'>+Description: Qt 4 library debugging symbols</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package provides the debugging symbols for the MeeGo support</div><div class='add'>+ libraries.</div><div class='add'>+</div><div class='add'>+Package: libqt4-meegographicssystem-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: arm armel</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-meegographicssystem (= ${binary:Version}), ${misc:Depends}</div><div class='add'>+Conflicts: libqt4-meego-dbg (&lt;&lt; 4.7.2~git20110119)</div><div class='add'>+Replaces: libqt4-meego-dbg (&lt;&lt; 4.7.2~git20110119)</div><div class='add'>+Description: Qt 4 library debugging symbols</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package provides the debugging symbols for the MeeGo graphics</div><div class='add'>+ system plugin.</div><div class='add'>+</div><div class='add'>+Package: libqt4-meego</div><div class='add'>+Architecture: all</div><div class='add'>+Section: oldlibs</div><div class='add'>+Depends: libqt4-meegographicssystemhelper, libqt4-meegographicssystem [arm armel]</div><div class='add'>+Description: Qt 4 MeeGo support libraries transitional package</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package is for transitioning purposes only and can be removed.</div><div class='add'>+</div><div class='add'>+Package: libqt4-meego-dev</div><div class='add'>+Architecture: all</div><div class='add'>+Section: oldlibs</div><div class='add'>+Depends: libqt4-meegographicssystemhelper-dev</div><div class='add'>+Description: Qt 4 MeeGo support libraries transitional package</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package is for transitioning purposes only and can be removed.</div><div class='add'>+</div><div class='add'>+Package: libqt4-meego-dbg</div><div class='add'>+Priority: extra</div><div class='add'>+Architecture: all</div><div class='add'>+Section: debug</div><div class='add'>+Depends: libqt4-meegographicssystemhelper-dbg, libqt4-meegographicssystem-dbg [arm armel]</div><div class='add'>+Description: Qt 4 MeeGo support libraries transitional package</div><div class='add'>+ Qt is a cross-platform C++ application framework. Qt's primary feature</div><div class='add'>+ is its rich set of widgets that provide standard GUI functionality.</div><div class='add'>+ .</div><div class='add'>+ This package is for transitioning purposes only and can be removed.</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-core.lintian b/config.profiles/harmattan/libqt4-core.lintian<br/>new file mode 100644<br/>index 0000000..bd6e1f7<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-core.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-core.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-core: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-dbus-dbg.lintian b/config.profiles/harmattan/libqt4-dbus-dbg.lintian<br/>new file mode 100644<br/>index 0000000..aa4fa15<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-dbus-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-dbus-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-dbus-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-dbus.install b/config.profiles/harmattan/libqt4-dbus.install<br/>new file mode 100644<br/>index 0000000..2242fb3<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-dbus.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-dbus.install</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+usr/lib/libQtDBus.so.*</div><div class='add'>+usr/bin/qdbus</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-dbus.lintian b/config.profiles/harmattan/libqt4-dbus.lintian<br/>new file mode 100644<br/>index 0000000..c6a37b7<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-dbus.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-dbus.lintian</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+libqt4-dbus: package-name-doesnt-match-sonames libQtDBus4</div><div class='add'>+libqt4-dbus: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-declarative-dbg.lintian b/config.profiles/harmattan/libqt4-declarative-dbg.lintian<br/>new file mode 100644<br/>index 0000000..3d16d1e<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-declarative-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-declarative-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-declarative-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-declarative-dev.lintian b/config.profiles/harmattan/libqt4-declarative-dev.lintian<br/>new file mode 100644<br/>index 0000000..1045808<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-declarative-dev.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-declarative-dev.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-declarative-dev: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-declarative.install b/config.profiles/harmattan/libqt4-declarative.install<br/>new file mode 100644<br/>index 0000000..7b71d87<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-declarative.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-declarative.install</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+usr/lib/libQtDeclarative.so.*</div><div class='add'>+usr/lib/qt4/imports/Qt/labs/folderlistmodel</div><div class='add'>+usr/lib/qt4/imports/Qt/labs/gestures</div><div class='add'>+usr/lib/qt4/imports/Qt/labs/particles</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-declarative.lintian b/config.profiles/harmattan/libqt4-declarative.lintian<br/>new file mode 100644<br/>index 0000000..70dd96f<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-declarative.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-declarative.lintian</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+libqt4-declarative: unknown-control-file digsigsums</div><div class='add'>+libqt4-declarative: package-name-doesnt-match-sonames libQtDeclarative4</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-dev.dirs b/config.profiles/harmattan/libqt4-dev.dirs<br/>new file mode 100644<br/>index 0000000..944cf06<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-dev.dirs?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-dev.dirs</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+usr/share/qt4/doc/html</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-dev.install b/config.profiles/harmattan/libqt4-dev.install<br/>new file mode 100644<br/>index 0000000..e7edbcb<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-dev.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-dev.install</a></div><div class='hunk'>@@ -0,0 +1,85 @@</div><div class='add'>+usr/bin/native-moc</div><div class='add'>+usr/bin/qdbuscpp2xml</div><div class='add'>+usr/bin/qdbusxml2cpp</div><div class='add'>+usr/bin/native-qmake</div><div class='add'>+usr/bin/qt3to4</div><div class='add'>+usr/bin/native-rcc</div><div class='add'>+usr/bin/native-uic</div><div class='add'>+usr/bin/host-moc</div><div class='add'>+usr/bin/host-qmake</div><div class='add'>+usr/bin/host-rcc</div><div class='add'>+usr/bin/host-uic</div><div class='add'>+usr/include/qt4/QtUiTools</div><div class='add'>+usr/include/qt4/QtSvg</div><div class='add'>+usr/include/qt4/QtXml</div><div class='add'>+usr/include/qt4/QtGui</div><div class='add'>+usr/include/qt4/phonon</div><div class='add'>+usr/include/qt4/QtScript</div><div class='add'>+usr/include/qt4/QtScriptTools</div><div class='add'>+usr/include/qt4/QtSql</div><div class='add'>+usr/include/qt4/QtXmlPatterns</div><div class='add'>+usr/include/qt4/QtDBus</div><div class='add'>+usr/include/qt4/QtTest</div><div class='add'>+usr/include/qt4/QtHelp</div><div class='add'>+usr/include/qt4/Qt</div><div class='add'>+usr/include/qt4/QtCore</div><div class='add'>+usr/include/qt4/QtNetwork</div><div class='add'>+usr/include/qt4/QtMultimedia</div><div class='add'>+usr/include/qt4/QtOpenGL</div><div class='add'>+usr/include/qt4/QtDeclarative</div><div class='add'>+usr/lib/libphonon.prl</div><div class='add'>+usr/lib/libphonon.so</div><div class='add'>+usr/lib/libQtCLucene.prl</div><div class='add'>+usr/lib/libQtCLucene.so</div><div class='add'>+usr/lib/libQtCore.prl</div><div class='add'>+usr/lib/libQtCore.so</div><div class='add'>+usr/lib/libQtDBus.prl</div><div class='add'>+usr/lib/libQtDBus.so</div><div class='add'>+usr/lib/libQtGui.prl</div><div class='add'>+usr/lib/libQtGui.so</div><div class='add'>+usr/lib/libQtHelp.prl</div><div class='add'>+usr/lib/libQtHelp.so</div><div class='add'>+usr/lib/libQtNetwork.prl</div><div class='add'>+usr/lib/libQtNetwork.so</div><div class='add'>+usr/lib/libQtScript.prl</div><div class='add'>+usr/lib/libQtScript.so</div><div class='add'>+usr/lib/libQtScriptTools.prl</div><div class='add'>+usr/lib/libQtScriptTools.so</div><div class='add'>+usr/lib/libQtSql.prl</div><div class='add'>+usr/lib/libQtSql.so</div><div class='add'>+usr/lib/libQtSvg.prl</div><div class='add'>+usr/lib/libQtSvg.so</div><div class='add'>+usr/lib/libQtTest.prl</div><div class='add'>+usr/lib/libQtTest.so</div><div class='add'>+usr/lib/libQtUiTools.prl</div><div class='add'>+usr/lib/libQtUiTools.a</div><div class='add'>+usr/lib/libQtXmlPatterns.prl</div><div class='add'>+usr/lib/libQtXmlPatterns.so</div><div class='add'>+usr/lib/libQtXml.prl</div><div class='add'>+usr/lib/libQtXml.so</div><div class='add'>+usr/lib/libQtMultimedia.prl</div><div class='add'>+usr/lib/libQtMultimedia.so</div><div class='add'>+usr/lib/libQtOpenGL.prl</div><div class='add'>+usr/lib/libQtOpenGL.so</div><div class='add'>+usr/lib/libQtDeclarative.so</div><div class='add'>+usr/lib/libQtDeclarative.prl</div><div class='add'>+usr/lib/pkgconfig/phonon.pc</div><div class='add'>+usr/lib/pkgconfig/QtCLucene.pc</div><div class='add'>+usr/lib/pkgconfig/QtCore.pc</div><div class='add'>+usr/lib/pkgconfig/QtDBus.pc</div><div class='add'>+usr/lib/pkgconfig/QtGui.pc</div><div class='add'>+usr/lib/pkgconfig/QtHelp.pc</div><div class='add'>+usr/lib/pkgconfig/QtNetwork.pc</div><div class='add'>+usr/lib/pkgconfig/QtScript.pc</div><div class='add'>+usr/lib/pkgconfig/QtScriptTools.pc</div><div class='add'>+usr/lib/pkgconfig/QtSql.pc</div><div class='add'>+usr/lib/pkgconfig/QtSvg.pc</div><div class='add'>+usr/lib/pkgconfig/QtTest.pc</div><div class='add'>+usr/lib/pkgconfig/QtUiTools.pc</div><div class='add'>+usr/lib/pkgconfig/QtXmlPatterns.pc</div><div class='add'>+usr/lib/pkgconfig/QtXml.pc</div><div class='add'>+usr/lib/pkgconfig/QtMultimedia.pc</div><div class='add'>+usr/lib/pkgconfig/QtOpenGL.pc</div><div class='add'>+usr/lib/pkgconfig/QtDeclarative.pc</div><div class='add'>+usr/share/qt4/q3porting.xml</div><div class='add'>+usr/share/qt4/mkspecs</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-dev.links b/config.profiles/harmattan/libqt4-dev.links<br/>new file mode 100644<br/>index 0000000..0624825<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-dev.links?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-dev.links</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+usr/include/qt4         usr/share/qt4/include</div><div class='add'>+usr/bin/lrelease        usr/share/qt4/bin/lrelease</div><div class='add'>+usr/bin/lupdate         usr/share/qt4/bin/lupdate</div><div class='add'>+usr/bin/moc             usr/share/qt4/bin/moc</div><div class='add'>+usr/bin/qmake           usr/share/qt4/bin/qmake</div><div class='add'>+usr/bin/uic             usr/share/qt4/bin/uic</div><div class='add'>+usr/bin/lrelease        usr/bin/lrelease-qt4   </div><div class='add'>+usr/bin/lupdate         usr/bin/lupdate-qt4   </div><div class='add'>+usr/bin/moc             usr/bin/moc-qt4      </div><div class='add'>+usr/bin/qmake           usr/bin/qmake-qt4   </div><div class='add'>+usr/bin/uic             usr/bin/uic-qt4       </div><div class='add'>+usr/bin/rcc             usr/share/qt4/bin/rcc</div><div class='add'>+usr/lib/qt4/plugins     usr/share/qt4/plugins</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-dev.lintian b/config.profiles/harmattan/libqt4-dev.lintian<br/>new file mode 100644<br/>index 0000000..c4c242a<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-dev.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-dev.lintian</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+libqt4-dev: executable-not-elf-or-script ./usr/share/qt4/mkspecs/macx-pbuilder/Info.plist.app</div><div class='add'>+libqt4-dev: executable-not-elf-or-script ./usr/share/qt4/mkspecs/macx-xcode/Info.plist.app</div><div class='add'>+libqt4-dev: executable-not-elf-or-script ./usr/share/qt4/mkspecs/macx-xcode/qmake.conf</div><div class='add'>+libqt4-dev: executable-not-elf-or-script ./usr/share/qt4/mkspecs/macx-pbuilder/qmake.conf</div><div class='add'>+libqt4-dev: unknown-control-file digsigsums</div><div class='add'>+libqt4-dev: binary-from-other-architecture ./usr/bin/host-moc</div><div class='add'>+libqt4-dev: binary-or-shlib-defines-rpath ./usr/bin/host-moc /scratchbox/host_shared/lib</div><div class='add'>+libqt4-dev: binary-or-shlib-defines-rpath ./usr/bin/host-moc /host_usr/lib</div><div class='add'>+libqt4-dev: binary-from-other-architecture ./usr/bin/host-qmake</div><div class='add'>+libqt4-dev: binary-or-shlib-defines-rpath ./usr/bin/host-qmake /scratchbox/host_shared/lib</div><div class='add'>+libqt4-dev: binary-or-shlib-defines-rpath ./usr/bin/host-qmake /host_usr/lib</div><div class='add'>+libqt4-dev: binary-from-other-architecture ./usr/bin/host-rcc</div><div class='add'>+libqt4-dev: binary-or-shlib-defines-rpath ./usr/bin/host-rcc /scratchbox/host_shared/lib</div><div class='add'>+libqt4-dev: binary-or-shlib-defines-rpath ./usr/bin/host-rcc /host_usr/lib</div><div class='add'>+libqt4-dev: binary-from-other-architecture ./usr/bin/host-uic</div><div class='add'>+libqt4-dev: binary-or-shlib-defines-rpath ./usr/bin/host-uic /scratchbox/host_shared/lib</div><div class='add'>+libqt4-dev: binary-or-shlib-defines-rpath ./usr/bin/host-uic /host_usr/lib</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-dev.manpages b/config.profiles/harmattan/libqt4-dev.manpages<br/>new file mode 100644<br/>index 0000000..1e9423a<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-dev.manpages?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-dev.manpages</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+debian/manpages/lrelease.1</div><div class='add'>+debian/manpages/lupdate.1</div><div class='add'>+debian/manpages/moc.1</div><div class='add'>+debian/manpages/qmake.1</div><div class='add'>+debian/manpages/uic.1</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-dev.postinst b/config.profiles/harmattan/libqt4-dev.postinst<br/>new file mode 100644<br/>index 0000000..2ab29ff<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-dev.postinst?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-dev.postinst</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+</div><div class='add'>+set -e</div><div class='add'>+</div><div class='add'>+SPECDIR=/usr/share/qt4/mkspecs</div><div class='add'>+</div><div class='add'>+rm -f ${SPECDIR}/default</div><div class='add'>+ln -s ${SPECDIR}/#PLATFORM_ARG# ${SPECDIR}/default</div><div class='add'>+</div><div class='add'>+PREFIX=native</div><div class='add'>+if [ -f /targets/links/scratchbox.config ]; then</div><div class='add'>+    PREFIX=host</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+BINARIES="qmake moc rcc uic"</div><div class='add'>+</div><div class='add'>+for bin in $BINARIES; do</div><div class='add'>+    ln -sf "/usr/bin/${PREFIX}-${bin}" "/usr/bin/${bin}"</div><div class='add'>+done</div><div class='add'>+</div><div class='add'>+#DEBHELPER#</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-dev.prerm b/config.profiles/harmattan/libqt4-dev.prerm<br/>new file mode 100644<br/>index 0000000..0a078be<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-dev.prerm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-dev.prerm</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+</div><div class='add'>+set -e</div><div class='add'>+</div><div class='add'>+BINARIES="qmake moc rcc uic"</div><div class='add'>+</div><div class='add'>+case "$1" in</div><div class='add'>+    upgrade) ;;</div><div class='add'>+    remove|failed-upgrade|deconfigure)</div><div class='add'>+	for bin in $BINARIES; do</div><div class='add'>+	    rm -f "/usr/bin/${bin}"</div><div class='add'>+	done</div><div class='add'>+        ;;</div><div class='add'>+esac</div><div class='add'>+</div><div class='add'>+#DEBHELPER#</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-doc.install b/config.profiles/harmattan/libqt4-doc.install<br/>new file mode 100644<br/>index 0000000..badafd2<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-doc.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-doc.install</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+usr/share/qt4/doc/html/*</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-doc.lintian b/config.profiles/harmattan/libqt4-doc.lintian<br/>new file mode 100644<br/>index 0000000..e701359<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-doc.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-doc.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-doc: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-gui-tests.lintian b/config.profiles/harmattan/libqt4-gui-tests.lintian<br/>new file mode 100644<br/>index 0000000..0139465<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-gui-tests.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-gui-tests.lintian</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+libqt4-gui-tests: unknown-control-file digsigsums</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_modeltest</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qabstractbutton</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qabstractitemmodel</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qabstractprintdialog</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qabstractproxymodel</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qabstractslider</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qabstractspinbox</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qabstracttextdocumentlayout</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qabstractvideobuffer</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qabstractvideosurface</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qaction</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qboxlayout</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qfileiconprovider</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qfocusframe</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qfont</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qfontmetrics</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qformlayout</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qgraphicslayout</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qnetworkcachemetadata</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qpaintengine</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qpalette</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qparallelanimationgroup</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qpauseanimation</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qpicture</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qplaintextedit</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qpointer</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qprinterinfo</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qprogressbar</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qprogressdialog</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qpropertyanimation</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qradiobutton</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qregexpvalidator</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qscriptenginedebugger</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qscrollarea</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qscrollbar</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qsharedpointer_and_qwidget</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qsignalmapper</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qslider</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qsortfilterproxymodel</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qspinbox</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qstackedlayout</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qstackedwidget</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qstandarditem</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qstandarditemmodel</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qstatemachine</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qstringlistmodel</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qstyleoption</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qsyntaxhighlighter</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qtextblock</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qtextcursor</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qtextformat</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qtextlist</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qtextobject</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qtextscriptengine</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qtexttable</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qtoolbox</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qtoolbutton</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qtreewidgetitemiterator</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qundogroup</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qundostack</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qvideosurfaceformat</div><div class='add'>+libqt4-gui-tests: file-in-unusual-dir usr/tests/qt4/tst_qwidgetaction</div><div class='add'>+libqt4-gui-tests: non-standard-dir-in-usr usr/tests/</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-gui.lintian b/config.profiles/harmattan/libqt4-gui.lintian<br/>new file mode 100644<br/>index 0000000..ea3c04b<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-gui.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-gui.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-gui: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-help-dbg.lintian b/config.profiles/harmattan/libqt4-help-dbg.lintian<br/>new file mode 100644<br/>index 0000000..06fd248<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-help-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-help-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-help-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-help.install b/config.profiles/harmattan/libqt4-help.install<br/>new file mode 100644<br/>index 0000000..2e06a51<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-help.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-help.install</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+usr/lib/libQtHelp.so.*</div><div class='add'>+usr/lib/libQtCLucene.so.*</div><div class='add'>+usr/share/qt4/translations/qt_help_de.qm</div><div class='add'>+usr/share/qt4/translations/qt_help_pl.qm</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-help.lintian b/config.profiles/harmattan/libqt4-help.lintian<br/>new file mode 100644<br/>index 0000000..44aad04<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-help.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-help.lintian</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+libqt4-help: package-name-doesnt-match-sonames libQtCLucene4 libQtHelp4</div><div class='add'>+libqt4-help: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-meego-dbg.lintian b/config.profiles/harmattan/libqt4-meego-dbg.lintian<br/>new file mode 100644<br/>index 0000000..939f381<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-meego-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-meego-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-meego-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-meego-dev.lintian b/config.profiles/harmattan/libqt4-meego-dev.lintian<br/>new file mode 100644<br/>index 0000000..36c9ee8<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-meego-dev.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-meego-dev.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-meego-dev: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-meego.lintian b/config.profiles/harmattan/libqt4-meego.lintian<br/>new file mode 100644<br/>index 0000000..2f7b3f6<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-meego.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-meego.lintian</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+libqt4-meego: unknown-control-file digsigsums</div><div class='add'>+libqt4-meego: package-name-doesnt-match-sonames libQtMeeGoGraphicsSystemHelper4</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-meegographicssystem.install b/config.profiles/harmattan/libqt4-meegographicssystem.install<br/>new file mode 100644<br/>index 0000000..41bf9a0<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-meegographicssystem.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-meegographicssystem.install</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+usr/lib/qt4/plugins/graphicssystems/libqmeegographicssystem.so</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-meegographicssystemhelper-dev.install b/config.profiles/harmattan/libqt4-meegographicssystemhelper-dev.install<br/>new file mode 100644<br/>index 0000000..848d6ff<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-meegographicssystemhelper-dev.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-meegographicssystemhelper-dev.install</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+usr/include/qt4/QtMeeGoGraphicsSystemHelper</div><div class='add'>+usr/lib/libQtMeeGoGraphicsSystemHelper.so</div><div class='add'>+usr/lib/libQtMeeGoGraphicsSystemHelper.prl</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-meegographicssystemhelper.install b/config.profiles/harmattan/libqt4-meegographicssystemhelper.install<br/>new file mode 100644<br/>index 0000000..4eb904d<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-meegographicssystemhelper.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-meegographicssystemhelper.install</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+usr/lib/libQtMeeGoGraphicsSystemHelper.so.*</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-multimedia-dbg.lintian b/config.profiles/harmattan/libqt4-multimedia-dbg.lintian<br/>new file mode 100644<br/>index 0000000..e35e83e<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-multimedia-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-multimedia-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-multimedia-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-multimedia.install b/config.profiles/harmattan/libqt4-multimedia.install<br/>new file mode 100644<br/>index 0000000..2f6f97d<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-multimedia.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-multimedia.install</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+usr/lib/libQtMultimedia.so.*</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-multimedia.lintian b/config.profiles/harmattan/libqt4-multimedia.lintian<br/>new file mode 100644<br/>index 0000000..ef410a2<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-multimedia.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-multimedia.lintian</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+libqt4-multimedia: unknown-control-file digsigsums</div><div class='add'>+libqt4-multimedia: package-name-doesnt-match-sonames libQtMultimedia4</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-network-dbg.lintian b/config.profiles/harmattan/libqt4-network-dbg.lintian<br/>new file mode 100644<br/>index 0000000..8cae7f3<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-network-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-network-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-network-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-network.install b/config.profiles/harmattan/libqt4-network.install<br/>new file mode 100644<br/>index 0000000..1681282<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-network.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-network.install</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+usr/lib/libQtNetwork.so.*</div><div class='add'>+usr/lib/qt4/plugins/bearer/libqicdbearer.so</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-network.lintian b/config.profiles/harmattan/libqt4-network.lintian<br/>new file mode 100644<br/>index 0000000..11a2284<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-network.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-network.lintian</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+libqt4-network: package-name-doesnt-match-sonames libQtNetwork4</div><div class='add'>+libqt4-network: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-opengl-dbg.lintian b/config.profiles/harmattan/libqt4-opengl-dbg.lintian<br/>new file mode 100644<br/>index 0000000..fb470cd<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-opengl-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-opengl-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-opengl-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-opengl-dev.lintian b/config.profiles/harmattan/libqt4-opengl-dev.lintian<br/>new file mode 100644<br/>index 0000000..da53f96<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-opengl-dev.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-opengl-dev.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-opengl-dev: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-opengl.install b/config.profiles/harmattan/libqt4-opengl.install<br/>new file mode 100644<br/>index 0000000..fc0a7a6<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-opengl.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-opengl.install</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+usr/lib/libQtOpenGL.so.*</div><div class='add'>+usr/lib/qt4/plugins/graphicssystems/libqglgraphicssystem.so </div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-opengl.lintian b/config.profiles/harmattan/libqt4-opengl.lintian<br/>new file mode 100644<br/>index 0000000..8f49420<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-opengl.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-opengl.lintian</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+libqt4-opengl: package-name-doesnt-match-sonames libQtOpenGL4</div><div class='add'>+libqt4-opengl: package-relation-with-self depends</div><div class='add'>+libqt4-opengl: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-phonon-dbg.lintian b/config.profiles/harmattan/libqt4-phonon-dbg.lintian<br/>new file mode 100644<br/>index 0000000..7ce2877<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-phonon-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-phonon-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-phonon-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-phonon.install b/config.profiles/harmattan/libqt4-phonon.install<br/>new file mode 100644<br/>index 0000000..3fdc018<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-phonon.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-phonon.install</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+usr/lib/libphonon.so.*</div><div class='add'>+usr/lib/qt4/plugins/phonon_backend/libphonon_*.so</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-phonon.lintian b/config.profiles/harmattan/libqt4-phonon.lintian<br/>new file mode 100644<br/>index 0000000..a1a46b9<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-phonon.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-phonon.lintian</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+libqt4-phonon: package-name-doesnt-match-sonames libphonon4</div><div class='add'>+libqt4-phonon: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-script-dbg.lintian b/config.profiles/harmattan/libqt4-script-dbg.lintian<br/>new file mode 100644<br/>index 0000000..9290ace<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-script-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-script-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-script-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-script.install b/config.profiles/harmattan/libqt4-script.install<br/>new file mode 100644<br/>index 0000000..f8cc5c4<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-script.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-script.install</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+usr/lib/libQtScript.so.*</div><div class='add'>+usr/lib/libQtScriptTools.so.*</div><div class='add'>+usr/lib/qt4/plugins/script/libqtscriptdbus.so</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-script.lintian b/config.profiles/harmattan/libqt4-script.lintian<br/>new file mode 100644<br/>index 0000000..51b6944<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-script.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-script.lintian</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+libqt4-script: package-name-doesnt-match-sonames libQtScript4 libQtScriptTools4</div><div class='add'>+libqt4-script: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-sql-dbg.lintian b/config.profiles/harmattan/libqt4-sql-dbg.lintian<br/>new file mode 100644<br/>index 0000000..5f4f189<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-sql-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-sql-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-sql-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-sql-sqlite-dbg.lintian b/config.profiles/harmattan/libqt4-sql-sqlite-dbg.lintian<br/>new file mode 100644<br/>index 0000000..6e53ab6<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-sql-sqlite-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-sql-sqlite-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-sql-sqlite-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-sql-sqlite.install b/config.profiles/harmattan/libqt4-sql-sqlite.install<br/>new file mode 100644<br/>index 0000000..6590079<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-sql-sqlite.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-sql-sqlite.install</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+usr/lib/qt4/plugins/sqldrivers/libqsqlite.so</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-sql-sqlite.lintian b/config.profiles/harmattan/libqt4-sql-sqlite.lintian<br/>new file mode 100644<br/>index 0000000..a6eb651<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-sql-sqlite.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-sql-sqlite.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-sql-sqlite: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-sql.install b/config.profiles/harmattan/libqt4-sql.install<br/>new file mode 100644<br/>index 0000000..5ff4a1f<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-sql.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-sql.install</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+usr/lib/libQtSql.so.*</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-sql.lintian b/config.profiles/harmattan/libqt4-sql.lintian<br/>new file mode 100644<br/>index 0000000..b20d867<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-sql.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-sql.lintian</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+libqt4-sql: package-name-doesnt-match-sonames libQtSql4</div><div class='add'>+libqt4-sql: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-svg-dbg.lintian b/config.profiles/harmattan/libqt4-svg-dbg.lintian<br/>new file mode 100644<br/>index 0000000..171ee74<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-svg-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-svg-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-svg-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-svg.install b/config.profiles/harmattan/libqt4-svg.install<br/>new file mode 100644<br/>index 0000000..21289f8<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-svg.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-svg.install</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+usr/lib/libQtSvg.so.*</div><div class='add'>+usr/lib/qt4/plugins/iconengines/libqsvgicon.so</div><div class='add'>+usr/lib/qt4/plugins/imageformats/libqsvg.so</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-svg.lintian b/config.profiles/harmattan/libqt4-svg.lintian<br/>new file mode 100644<br/>index 0000000..31b3b15<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-svg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-svg.lintian</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+libqt4-svg: package-name-doesnt-match-sonames libQtSvg4</div><div class='add'>+libqt4-svg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-test-dbg.lintian b/config.profiles/harmattan/libqt4-test-dbg.lintian<br/>new file mode 100644<br/>index 0000000..587353e<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-test-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-test-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-test-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-test.install b/config.profiles/harmattan/libqt4-test.install<br/>new file mode 100644<br/>index 0000000..7883dee<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-test.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-test.install</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+usr/lib/libQtTest.so.*</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-test.lintian b/config.profiles/harmattan/libqt4-test.lintian<br/>new file mode 100644<br/>index 0000000..db7b2a6<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-test.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-test.lintian</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+libqt4-test: package-name-doesnt-match-sonames libQtTest4</div><div class='add'>+libqt4-test: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-webkit.lintian b/config.profiles/harmattan/libqt4-webkit.lintian<br/>new file mode 100644<br/>index 0000000..9c70f48<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-webkit.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-webkit.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-webkit: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-xml-dbg.lintian b/config.profiles/harmattan/libqt4-xml-dbg.lintian<br/>new file mode 100644<br/>index 0000000..8df20db<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-xml-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-xml-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-xml-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-xml.install b/config.profiles/harmattan/libqt4-xml.install<br/>new file mode 100644<br/>index 0000000..6366cb3<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-xml.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-xml.install</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+usr/lib/libQtXml.so.*</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-xml.lintian b/config.profiles/harmattan/libqt4-xml.lintian<br/>new file mode 100644<br/>index 0000000..bd61725<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-xml.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-xml.lintian</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+libqt4-xml: package-name-doesnt-match-sonames libQtXml4</div><div class='add'>+libqt4-xml: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-xmlpatterns-dbg.lintian b/config.profiles/harmattan/libqt4-xmlpatterns-dbg.lintian<br/>new file mode 100644<br/>index 0000000..aafa724<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-xmlpatterns-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-xmlpatterns-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4-xmlpatterns-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-xmlpatterns.install b/config.profiles/harmattan/libqt4-xmlpatterns.install<br/>new file mode 100644<br/>index 0000000..1997474<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-xmlpatterns.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-xmlpatterns.install</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+usr/lib/libQtXmlPatterns.so.*</div><div class='add'>+usr/bin/xmlpatterns</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4-xmlpatterns.lintian b/config.profiles/harmattan/libqt4-xmlpatterns.lintian<br/>new file mode 100644<br/>index 0000000..785b999<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4-xmlpatterns.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4-xmlpatterns.lintian</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+libqt4-xmlpatterns: package-name-doesnt-match-sonames libQtXmlPatterns4</div><div class='add'>+libqt4-xmlpatterns: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqt4.lintian b/config.profiles/harmattan/libqt4.lintian<br/>new file mode 100644<br/>index 0000000..2eb0928<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqt4.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqt4.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqt4: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqtcore4-dbg.lintian b/config.profiles/harmattan/libqtcore4-dbg.lintian<br/>new file mode 100644<br/>index 0000000..8dfcc0c<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqtcore4-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqtcore4-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqtcore4-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqtcore4.install b/config.profiles/harmattan/libqtcore4.install<br/>new file mode 100644<br/>index 0000000..1c8fc57<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqtcore4.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqtcore4.install</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+usr/lib/libQtCore.so.*</div><div class='add'>+usr/lib/qt4/plugins/codecs/lib*.so</div><div class='add'>+usr/share/qt4/translations/qt_??.qm</div><div class='add'>+usr/share/qt4/translations/qt_??_??.qm</div><div class='add'>+usr/share/qt4/translations/qvfb_*.qm</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/harmattan/libqtcore4.lintian b/config.profiles/harmattan/libqtcore4.lintian<br/>new file mode 100644<br/>index 0000000..1c14b59<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqtcore4.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqtcore4.lintian</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+libqtcore4: package-name-doesnt-match-sonames libQtCLucene4 libQtCore4</div><div class='add'>+libqtcore4: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqtgui4-dbg.lintian b/config.profiles/harmattan/libqtgui4-dbg.lintian<br/>new file mode 100644<br/>index 0000000..d166ea8<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqtgui4-dbg.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqtgui4-dbg.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+libqtgui4-dbg: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/libqtgui4.install b/config.profiles/harmattan/libqtgui4.install<br/>new file mode 100644<br/>index 0000000..4b4fa9c<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqtgui4.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqtgui4.install</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+usr/lib/libQtGui.so.*</div><div class='add'>+usr/lib/qt4/plugins/imageformats/libqgif.so</div><div class='add'>+usr/lib/qt4/plugins/imageformats/libqico.so</div><div class='add'>+usr/lib/qt4/plugins/imageformats/libqjpeg.so</div><div class='add'>+usr/lib/qt4/plugins/imageformats/libqtiff.so</div><div class='add'>+usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so</div><div class='add'>+usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so</div><div class='head'>diff --git a/config.profiles/harmattan/libqtgui4.lintian b/config.profiles/harmattan/libqtgui4.lintian<br/>new file mode 100644<br/>index 0000000..e9d4ec9<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/libqtgui4.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/libqtgui4.lintian</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+libqtgui4: package-name-doesnt-match-sonames libQtGui4</div><div class='add'>+libqtgui4: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/manpages/lrelease.1 b/config.profiles/harmattan/manpages/lrelease.1<br/>new file mode 100644<br/>index 0000000..30e58e1<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/manpages/lrelease.1?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/manpages/lrelease.1</a></div><div class='hunk'>@@ -0,0 +1,111 @@</div><div class='add'>+.TH lrelease 1 "18 October 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*-</div><div class='add'>+.\"</div><div class='add'>+.\" Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+.\" All rights reserved.</div><div class='add'>+.\" Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+.\"</div><div class='add'>+.\" This file is part of the QtGui module of the Qt Toolkit.</div><div class='add'>+.\"</div><div class='add'>+.\" $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+.\" GNU Lesser General Public License Usage</div><div class='add'>+.\" This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+.\" License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+.\" appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+.\" file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+.\" General Public License version 2.1 requirements will be met:</div><div class='add'>+.\" http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+.\"</div><div class='add'>+.\" In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+.\" rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+.\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+.\"</div><div class='add'>+.\" GNU General Public License Usage</div><div class='add'>+.\" Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+.\" Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+.\" and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+.\" file. Please review the following information to ensure the GNU General</div><div class='add'>+.\" Public License version 3.0 requirements will be met:</div><div class='add'>+.\" http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+.\"</div><div class='add'>+.\" Other Usage</div><div class='add'>+.\" Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+.\" conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\" $QT_END_LICENSE$</div><div class='add'>+.\"</div><div class='add'>+.SH NAME</div><div class='add'>+lrelease \- generate Qt message files from Qt Linguist translation files</div><div class='add'>+.SH SYNOPSIS</div><div class='add'>+.B lrelease</div><div class='add'>+.RI "[ " options " ] " project-file</div><div class='add'>+.br</div><div class='add'>+.B lrelease</div><div class='add'>+.RI "[ " options " ] " ts-files " [ -qm " qm-file " ]"</div><div class='add'>+.SH DESCRIPTION</div><div class='add'>+This page documents the</div><div class='add'>+.B Qt Linguist Release</div><div class='add'>+tool for the Qt GUI toolkit.</div><div class='add'>+.B Lrelease</div><div class='add'>+reads a qmake/tmake project file (.pro file) and converts the</div><div class='add'>+translation files (.ts files) specified in it into Qt message files</div><div class='add'>+(.qm files) used by the application to translate.</div><div class='add'>+.PP</div><div class='add'>+The .qm file format is a compact binary format that provides</div><div class='add'>+extremely fast lookups for translations and that is used by Qt.</div><div class='add'>+.SH OPTIONS</div><div class='add'>+.TP</div><div class='add'>+.I "-help"</div><div class='add'>+Display the usage and exit.</div><div class='add'>+.TP</div><div class='add'>+.I "-nocompress"</div><div class='add'>+Do not compress the .qm files.</div><div class='add'>+.TP</div><div class='add'>+.I "-verbose"</div><div class='add'>+Explain what is being done.</div><div class='add'>+.TP</div><div class='add'>+.I "-version"</div><div class='add'>+Display the version of</div><div class='add'>+.B lrelease</div><div class='add'>+and exit.</div><div class='add'>+.SH USAGE</div><div class='add'>+Here is an example .pro file that can be given to</div><div class='add'>+.B lrelease:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+HEADERS         = funnydialog.h \\</div><div class='add'>+                  wackywidget.h</div><div class='add'>+SOURCES         = funnydialog.cpp \\</div><div class='add'>+                  main.cpp \\</div><div class='add'>+                  wackywidget.cpp</div><div class='add'>+FORMS           = fancybox.ui</div><div class='add'>+TRANSLATIONS    = gnomovision_dk.ts \\</div><div class='add'>+                  gnomovision_fi.ts \\</div><div class='add'>+                  gnomovision_no.ts \\</div><div class='add'>+                  gnomovision_se.ts</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.PP</div><div class='add'>+When running</div><div class='add'>+.B lrelease</div><div class='add'>+on this project file, the Qt message files gnomovision_dk.qm,</div><div class='add'>+gnomovision_fi.qm, gnomovision_no.qm and gnomovision_se.qm will be</div><div class='add'>+generated from gnomovision_dk.ts, gnomovision_fi.ts,</div><div class='add'>+gnomovision_no.ts and gnomovision_se.ts, respectively.</div><div class='add'>+.PP</div><div class='add'>+.B Lrelease</div><div class='add'>+can also be invoked with a list of .ts files to convert:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+lrelease gnomovision_*.ts</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.SH "SEE ALSO"</div><div class='add'>+.BR lupdate (1)</div><div class='add'>+and</div><div class='add'>+.BR http://doc.trolltech.com/i18n.html</div><div class='head'>diff --git a/config.profiles/harmattan/manpages/lupdate.1 b/config.profiles/harmattan/manpages/lupdate.1<br/>new file mode 100644<br/>index 0000000..ff049b3<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/manpages/lupdate.1?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/manpages/lupdate.1</a></div><div class='hunk'>@@ -0,0 +1,117 @@</div><div class='add'>+.TH lupdate 1 "18 October 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*-</div><div class='add'>+.\"</div><div class='add'>+.\" Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+.\" All rights reserved.</div><div class='add'>+.\" Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+.\"</div><div class='add'>+.\" This file is part of the QtGui module of the Qt Toolkit.</div><div class='add'>+.\"</div><div class='add'>+.\" $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+.\" GNU Lesser General Public License Usage</div><div class='add'>+.\" This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+.\" License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+.\" appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+.\" file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+.\" General Public License version 2.1 requirements will be met:</div><div class='add'>+.\" http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+.\"</div><div class='add'>+.\" In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+.\" rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+.\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+.\"</div><div class='add'>+.\" GNU General Public License Usage</div><div class='add'>+.\" Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+.\" Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+.\" and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+.\" file. Please review the following information to ensure the GNU General</div><div class='add'>+.\" Public License version 3.0 requirements will be met:</div><div class='add'>+.\" http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+.\"</div><div class='add'>+.\" Other Usage</div><div class='add'>+.\" Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+.\" conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\" $QT_END_LICENSE$</div><div class='add'>+.\"</div><div class='add'>+.SH NAME</div><div class='add'>+lupdate \- update Qt Linguist translation files</div><div class='add'>+.SH SYNOPSIS</div><div class='add'>+.B lupdate</div><div class='add'>+.RI "[ " options " ] " project-file</div><div class='add'>+.br</div><div class='add'>+.B lupdate</div><div class='add'>+.RI "[ " options " ] " source-files " -ts " ts-files</div><div class='add'>+.SH DESCRIPTION</div><div class='add'>+This page documents the</div><div class='add'>+.B Qt Linguist Update</div><div class='add'>+tool for the Qt GUI toolkit.</div><div class='add'>+.B Lupdate</div><div class='add'>+reads a qmake/tmake project file (.pro file), finds the translatable</div><div class='add'>+strings in the specified source, header and interface files, and</div><div class='add'>+updates the translation files (.ts files) specified in it. The</div><div class='add'>+translation files are given to the translator who uses</div><div class='add'>+.B Qt Linguist</div><div class='add'>+to read the files and insert the translations.</div><div class='add'>+.PP</div><div class='add'>+The .ts file format is a simple human-readable XML format that can be</div><div class='add'>+used with version control systems if required.</div><div class='add'>+.PP</div><div class='add'>+.SH OPTIONS</div><div class='add'>+.TP</div><div class='add'>+.I "-help"</div><div class='add'>+Display the usage and exit.</div><div class='add'>+.TP</div><div class='add'>+.I "-noobsolete"</div><div class='add'>+Drop all obsolete strings.</div><div class='add'>+.TP</div><div class='add'>+.I "-verbose"</div><div class='add'>+Explain what is being done.</div><div class='add'>+.TP</div><div class='add'>+.I "-version"</div><div class='add'>+Display the version of</div><div class='add'>+.B lupdate</div><div class='add'>+and exit.</div><div class='add'>+.SH USAGE</div><div class='add'>+Here is an example .pro file that can be given to</div><div class='add'>+.B lupdate:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+HEADERS         = funnydialog.h \\</div><div class='add'>+                  wackywidget.h</div><div class='add'>+SOURCES         = funnydialog.cpp \\</div><div class='add'>+                  main.cpp \\</div><div class='add'>+                  wackywidget.cpp</div><div class='add'>+FORMS           = fancybox.ui</div><div class='add'>+TRANSLATIONS    = gnomovision_dk.ts \\</div><div class='add'>+                  gnomovision_fi.ts \\</div><div class='add'>+                  gnomovision_no.ts \\</div><div class='add'>+                  gnomovision_se.ts</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.PP</div><div class='add'>+When running</div><div class='add'>+.B lupdate</div><div class='add'>+on this project file, the translatable strings in all the files</div><div class='add'>+listed in the HEADERS, SOURCES and FORMS entries will be put in</div><div class='add'>+the translation files listed in the TRANSLATIONS entry. Previous</div><div class='add'>+translations will be reused as far as possible, and translated</div><div class='add'>+strings that have vanished from the source files are marked obsolete.</div><div class='add'>+.PP</div><div class='add'>+.B Lupdate</div><div class='add'>+can also be invoked with a list of C++ source files, .ui files</div><div class='add'>+and .ts files:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+lupdate *.cpp *.h *.ui -ts gnomovision_dk.ts</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.SH "SEE ALSO"</div><div class='add'>+.BR lrelease (1)</div><div class='add'>+and</div><div class='add'>+.BR http://doc.trolltech.com/i18n.html</div><div class='head'>diff --git a/config.profiles/harmattan/manpages/moc.1 b/config.profiles/harmattan/manpages/moc.1<br/>new file mode 100644<br/>index 0000000..522fd08<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/manpages/moc.1?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/manpages/moc.1</a></div><div class='hunk'>@@ -0,0 +1,479 @@</div><div class='add'>+.TH moc 1 "24 June 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*-</div><div class='add'>+.\"</div><div class='add'>+.\" Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+.\" All rights reserved.</div><div class='add'>+.\" Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+.\"</div><div class='add'>+.\" This file is part of the QtGui module of the Qt Toolkit.</div><div class='add'>+.\"</div><div class='add'>+.\" $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+.\" GNU Lesser General Public License Usage</div><div class='add'>+.\" This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+.\" License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+.\" appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+.\" file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+.\" General Public License version 2.1 requirements will be met:</div><div class='add'>+.\" http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+.\"</div><div class='add'>+.\" In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+.\" rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+.\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+.\"</div><div class='add'>+.\" GNU General Public License Usage</div><div class='add'>+.\" Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+.\" Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+.\" and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+.\" file. Please review the following information to ensure the GNU General</div><div class='add'>+.\" Public License version 3.0 requirements will be met:</div><div class='add'>+.\" http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+.\"</div><div class='add'>+.\" Other Usage</div><div class='add'>+.\" Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+.\" conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\" $QT_END_LICENSE$</div><div class='add'>+.\"</div><div class='add'>+.nh</div><div class='add'>+.SH NAME</div><div class='add'>+moc \- generate Qt meta object support code</div><div class='add'>+.SH SYNOPSIS</div><div class='add'>+.B moc</div><div class='add'>+[\-o file] [\-i] [\-f] [\-k] [\-ldbg] [\-nw] [\-p path] [\-q path] [\-v] file</div><div class='add'>+.SH DESCRIPTION</div><div class='add'>+This page documents the</div><div class='add'>+.B Meta Object Compiler</div><div class='add'>+for the Qt GUI application framework. The</div><div class='add'>+.B moc</div><div class='add'>+reads one or more C++ class declarations from a C++ header or source</div><div class='add'>+file and generates one C++ source file containing meta object</div><div class='add'>+information for the classes. The C++ source file generated by the</div><div class='add'>+.B moc</div><div class='add'>+must be compiled and linked with the implementation of the class (or it</div><div class='add'>+can be #included into the class's source file).</div><div class='add'>+.PP</div><div class='add'>+If you use </div><div class='add'>+.B qmake</div><div class='add'>+to create your Makefiles, build rules will be included that call the</div><div class='add'>+.B moc</div><div class='add'>+when required, so you will not need to use the </div><div class='add'>+.B moc</div><div class='add'>+directly.</div><div class='add'>+.PP</div><div class='add'>+In brief, the meta object system is a structure used by Qt (see</div><div class='add'>+.BR http://doc.trolltech.com ")"</div><div class='add'>+for component programming and run time type information.  It adds</div><div class='add'>+properties and inheritance information to (some) classes and</div><div class='add'>+provides a new type of communication between those instances of those</div><div class='add'>+classes, signal\-slot</div><div class='add'>+connections.</div><div class='add'>+.SH OPTIONS</div><div class='add'>+.TP</div><div class='add'>+.I "\-o file"</div><div class='add'>+Write output to</div><div class='add'>+.I file</div><div class='add'>+rather than to stdout.</div><div class='add'>+.TP</div><div class='add'>+.I \-f</div><div class='add'>+Force the generation of an #include statement in the output.</div><div class='add'>+This is the default for files whose name matches the regular</div><div class='add'>+expression .[hH][^.]* (i.e. the extension starts with</div><div class='add'>+.B H</div><div class='add'>+or</div><div class='add'>+.B h</div><div class='add'>+). This</div><div class='add'>+option is only useful if you have header files that do not follow the</div><div class='add'>+standard naming conventions.</div><div class='add'>+.TP</div><div class='add'>+.I "\-i"</div><div class='add'>+Do not generate an #include statement in the output.  This may be used</div><div class='add'>+to run</div><div class='add'>+.B moc</div><div class='add'>+on a C++ file containing one or more class declarations. You should then</div><div class='add'>+#include the meta object code in the .cpp file (see USAGE below).  If both</div><div class='add'>+.I \-f</div><div class='add'>+and</div><div class='add'>+.I \-i</div><div class='add'>+are present, the last one wins.</div><div class='add'>+.TP</div><div class='add'>+.I "\-nw"</div><div class='add'>+Do not generate any warnings. Not recommended.</div><div class='add'>+.TP</div><div class='add'>+.I "\-ldbg"</div><div class='add'>+Write a flood of lex debug information to stdout.</div><div class='add'>+.TP</div><div class='add'>+.I "\-p path"</div><div class='add'>+Makes</div><div class='add'>+.B moc</div><div class='add'>+prepend</div><div class='add'>+.IR path /</div><div class='add'>+to the file name in the generated #include statement (if one is generated).</div><div class='add'>+.TP</div><div class='add'>+.I "\-q path"</div><div class='add'>+Makes</div><div class='add'>+.B moc</div><div class='add'>+prepend</div><div class='add'>+.IR path /</div><div class='add'>+to the file name of qt #include files in the generated code.</div><div class='add'>+.TP</div><div class='add'>+.I "\-v"</div><div class='add'>+Displays the version of</div><div class='add'>+.B moc</div><div class='add'>+and Qt.</div><div class='add'>+.PP</div><div class='add'>+You can explicitly tell the</div><div class='add'>+.B moc</div><div class='add'>+not to parse parts of a header</div><div class='add'>+file. It recognizes any C++ comment (//) that contains the substrings</div><div class='add'>+MOC_SKIP_BEGIN or MOC_SKIP_END. They work as you would expect and you</div><div class='add'>+can have several levels of them. The net result as seen by the</div><div class='add'>+.B moc</div><div class='add'>+is as if you had removed all lines between a MOC_SKIP_BEGIN and a</div><div class='add'>+MOC_SKIP_END</div><div class='add'>+.SH USAGE</div><div class='add'>+.B moc</div><div class='add'>+is almost always invoked by</div><div class='add'>+.BR make (1),</div><div class='add'>+not by hand.</div><div class='add'>+.PP</div><div class='add'>+.B moc</div><div class='add'>+is typically used with an input file containing class declarations</div><div class='add'>+like this:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+class YourClass : public QObject {</div><div class='add'>+    Q_OBJECT</div><div class='add'>+    Q_PROPERTY( ... )</div><div class='add'>+    Q_CLASSINFO( ... )</div><div class='add'>+</div><div class='add'>+public:</div><div class='add'>+    YourClass( QObject * parent=0, const char * name=0 );</div><div class='add'>+    ~YourClass();</div><div class='add'>+</div><div class='add'>+signals:</div><div class='add'>+</div><div class='add'>+public slots:</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.PP</div><div class='add'>+Here is a useful makefile rule if you only use GNU make:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+m%.cpp: %.h</div><div class='add'>+        moc $&lt; -o $@</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.PP</div><div class='add'>+If you want to write portably, you can use individual rules of the</div><div class='add'>+following form:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+mNAME.cpp: NAME.h</div><div class='add'>+        moc $&lt; -o $@</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.PP</div><div class='add'>+You must also remember to add</div><div class='add'>+.I mNAME.cpp</div><div class='add'>+to your SOURCES (substitute your favorite name) variable and</div><div class='add'>+.I mNAME.o</div><div class='add'>+to your OBJECTS variable.</div><div class='add'>+.PP</div><div class='add'>+(While we prefer to name our C++ source files .cpp, the</div><div class='add'>+.B moc</div><div class='add'>+doesn't know that, so you can use .C, .cc, .CC, .cxx or even .c++ if</div><div class='add'>+you prefer.)</div><div class='add'>+.PP</div><div class='add'>+If you have class declarations in C++ files, we recommend that you use</div><div class='add'>+a makefile rule like this:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+NAME.o: mNAME.cpp</div><div class='add'>+</div><div class='add'>+mNAME.cpp: NAME.cpp</div><div class='add'>+        moc -i $&lt; -o $@</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.PP</div><div class='add'>+This guarantees that</div><div class='add'>+.BR make (1)</div><div class='add'>+will run the</div><div class='add'>+.B moc</div><div class='add'>+before it compiles</div><div class='add'>+.IR NAME.cpp .</div><div class='add'>+You can then put</div><div class='add'>+.PP</div><div class='add'>+.ti +4</div><div class='add'>+#include "nNAME.cpp"</div><div class='add'>+.PP</div><div class='add'>+at the end of</div><div class='add'>+.IR NAME.cpp ,</div><div class='add'>+where all the classes declared in that file are fully known.</div><div class='add'>+.SH DIAGNOSTICS</div><div class='add'>+Sometimes you may get linkage errors, saying that</div><div class='add'>+YourClass::className() is undefined or that YourClass lacks a vtbl.</div><div class='add'>+Those errors happen most often when you forget to compile the</div><div class='add'>+moc-generated C++ code or include that object file in the link</div><div class='add'>+command.</div><div class='add'>+.PP</div><div class='add'>+The</div><div class='add'>+.B moc</div><div class='add'>+will warn you about a number of dangerous or illegal constructs.</div><div class='add'>+.SH BUGS</div><div class='add'>+</div><div class='add'>+The</div><div class='add'>+.B moc</div><div class='add'>+does not expand #include or #define, it simply skips any preprocessor</div><div class='add'>+directives it encounters. This is regrettable, but is normally not a</div><div class='add'>+problem in practice.</div><div class='add'>+</div><div class='add'>+The</div><div class='add'>+.B moc</div><div class='add'>+does not handle all of C++.  The main problem is that class templates</div><div class='add'>+cannot have signals or slots.  This is an important bug.  Here is an</div><div class='add'>+example:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+class SomeTemplate&lt;int&gt; : public QFrame {</div><div class='add'>+    Q_OBJECT</div><div class='add'>+    ....</div><div class='add'>+signals:</div><div class='add'>+    void bugInMocDetected( int );</div><div class='add'>+};</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.PP</div><div class='add'>+Less importantly, the following constructs are illegal.  All of them</div><div class='add'>+have have alternatives which we think are usually better, so removing</div><div class='add'>+these limitations is not a high priority for us.</div><div class='add'>+.SS "Multiple inheritance requires QObject to be first."</div><div class='add'>+If you are using multiple inheritance, </div><div class='add'>+.B moc </div><div class='add'>+assumes that the</div><div class='add'>+.B first</div><div class='add'>+inherited class is a subclass of QObject.  Also, be sure that</div><div class='add'>+.B only</div><div class='add'>+the first inherited class is a QObject.</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+class SomeClass : public QObject, public OtherClass {</div><div class='add'>+    ...</div><div class='add'>+};</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.PP</div><div class='add'>+This bug is almost impossible to fix; since the</div><div class='add'>+.B moc</div><div class='add'>+does not expand</div><div class='add'>+#include or #define, it cannot find out which one of the base classes is a</div><div class='add'>+QObject.</div><div class='add'>+.SS "Function pointers cannot be arguments to signals or slots."</div><div class='add'>+In most cases where you would consider that, we think inheritance is a</div><div class='add'>+better alternative.  Here is an example of illegal syntax:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+class SomeClass : public QObject {</div><div class='add'>+    Q_OBJECT</div><div class='add'>+    ...</div><div class='add'>+public slots:</div><div class='add'>+    // illegal</div><div class='add'>+    void apply( void (*apply)(List *, void *), void * );</div><div class='add'>+};</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.PP</div><div class='add'>+You can work around this restriction like this:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+typedef void (*ApplyFunctionType)( List *, void * );</div><div class='add'>+</div><div class='add'>+class SomeClass : public QObject {</div><div class='add'>+    Q_OBJECT</div><div class='add'>+    ...</div><div class='add'>+public slots:</div><div class='add'>+    void apply( ApplyFunctionType, char * );</div><div class='add'>+};</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.PP</div><div class='add'>+It may sometimes be even better to replace the function pointer with</div><div class='add'>+inheritance and virtual functions, signals or slots.</div><div class='add'>+.SS "Friend declarations cannot be placed in signals or slots sections"</div><div class='add'>+Sometimes it will work, but in general, friend declarations cannot be</div><div class='add'>+placed in</div><div class='add'>+.B signals</div><div class='add'>+or</div><div class='add'>+.B slots</div><div class='add'>+sections.  Put them in the good old</div><div class='add'>+.BR private ", " protected</div><div class='add'>+or</div><div class='add'>+.B public</div><div class='add'>+sections instead.  Here is an example of the illegal syntax:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+class SomeClass : public QObject {</div><div class='add'>+    Q_OBJECT</div><div class='add'>+    ...</div><div class='add'>+signals:</div><div class='add'>+    friend class ClassTemplate&lt;char&gt;; // illegal</div><div class='add'>+};</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.SS "Signals and slots cannot be upgraded"</div><div class='add'>+The C++ feature of upgrading an inherited member function to</div><div class='add'>+.B public</div><div class='add'>+status is not extended to cover signals and slots.  Here is an illegal</div><div class='add'>+example:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+class Whatever : public QButtonGroup {</div><div class='add'>+    ...</div><div class='add'>+public slots:</div><div class='add'>+    QButtonGroup::buttonPressed; // illegal</div><div class='add'>+    ...</div><div class='add'>+};</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.PP</div><div class='add'>+The QButtonGroup::buttonPressed() slot is protected.</div><div class='add'>+.PP</div><div class='add'>+C++ quiz: What happens if you try to upgrade a protected member</div><div class='add'>+function which is overloaded?</div><div class='add'>+.IP</div><div class='add'>+- All the functions are upgraded.</div><div class='add'>+.IP</div><div class='add'>+- That is not legal C++.</div><div class='add'>+.\" Good idea, but look in the SEE ALSO section...</div><div class='add'>+.SS "Type macros cannot be used for signal and slot arguments"</div><div class='add'>+</div><div class='add'>+Since the</div><div class='add'>+.B moc</div><div class='add'>+does not expand #define, type macros that take an argument</div><div class='add'>+will not work in signals and slots. Here is an illegal example:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+#ifdef ultrix</div><div class='add'>+#define SIGNEDNESS(a) unsigned a</div><div class='add'>+#else</div><div class='add'>+#define SIGNEDNESS(a) a</div><div class='add'>+#endif</div><div class='add'>+class Whatever : public QObject {</div><div class='add'>+    ...</div><div class='add'>+signals:</div><div class='add'>+    void someSignal( SIGNEDNESS(int) ); // illegal</div><div class='add'>+};</div><div class='add'>+.PP</div><div class='add'>+A #define without arguments works.</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.SS  "Nested classes cannot be in the signals or slots sections nor have signals or slots"</div><div class='add'>+Here's an example:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+class A {</div><div class='add'>+    Q_OBJECT</div><div class='add'>+public:</div><div class='add'>+    class B {</div><div class='add'>+    public slots: // illegal</div><div class='add'>+        void b();</div><div class='add'>+        ...</div><div class='add'>+    };</div><div class='add'>+signals:</div><div class='add'>+    class B {  // illegal</div><div class='add'>+        void b();</div><div class='add'>+	...</div><div class='add'>+    }:</div><div class='add'>+};</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.PP</div><div class='add'>+.SS "Constructors cannot be used in signals or slots sections"</div><div class='add'>+It is a mystery to us why anyone would put a constructor on either the</div><div class='add'>+.B signals</div><div class='add'>+or</div><div class='add'>+.B slots</div><div class='add'>+sections.  You can't, anyway (except that it happens to work in some</div><div class='add'>+cases).  Put them in</div><div class='add'>+.BR private ", " protected</div><div class='add'>+or</div><div class='add'>+.B public</div><div class='add'>+sections, where they belong.  Here is an example of the illegal syntax:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+class SomeClass : public QObject {</div><div class='add'>+    Q_OBJECT</div><div class='add'>+public slots:</div><div class='add'>+    SomeClass( QObject *parent, const char *name )</div><div class='add'>+        : QObject( parent, name ) {} // illegal</div><div class='add'>+    ...</div><div class='add'>+};</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.SS "Properties need to be declared before the public section that contains the respective get and set functions"</div><div class='add'>+.PP</div><div class='add'>+Declaring the first property within or after the public section that</div><div class='add'>+contains the type definition and the respective get and set functions</div><div class='add'>+does not work as expected. The</div><div class='add'>+.B moc</div><div class='add'>+will complain that it can neither</div><div class='add'>+find the functions nor resolve the type. Here is an example of the</div><div class='add'>+illegal syntax:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+class SomeClass : public QObject {</div><div class='add'>+    Q_OBJECT</div><div class='add'>+public:</div><div class='add'>+    ...</div><div class='add'>+    // illegal</div><div class='add'>+    Q_PROPERTY( Priority priority READ priority WRITE setPriority )</div><div class='add'>+    Q_ENUMS( Priority )</div><div class='add'>+    enum Priority { High, Low, VeryHigh, VeryLow };</div><div class='add'>+    void setPriority( Priority );</div><div class='add'>+    Priority priority() const;</div><div class='add'>+    ...</div><div class='add'>+};</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.PP</div><div class='add'>+Work around this limitation by declaring all properties at the</div><div class='add'>+beginning of the class declaration, right after Q_OBJECT:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+.nf</div><div class='add'>+class SomeClass : public QObject {</div><div class='add'>+    Q_OBJECT</div><div class='add'>+    Q_PROPERTY( Priority priority READ priority WRITE setPriority )</div><div class='add'>+    Q_ENUMS( Priority )</div><div class='add'>+public:</div><div class='add'>+    ...</div><div class='add'>+    enum Priority { High, Low, VeryHigh, VeryLow };</div><div class='add'>+    void setPriority( Priority );</div><div class='add'>+    Priority priority() const;</div><div class='add'>+    ...</div><div class='add'>+};</div><div class='add'>+.fi</div><div class='add'>+.in -4</div><div class='add'>+.PP</div><div class='add'>+.SH "SEE ALSO"</div><div class='add'>+.BR http://www.trolltech.com ", "</div><div class='add'>+.BR "C++ ARM, section r.11.3" " (for the answer to the quiz), and"</div><div class='add'>+.BR http://doc.trolltech.com " (for complete Qt documentation)."</div><div class='head'>diff --git a/config.profiles/harmattan/manpages/qmake.1 b/config.profiles/harmattan/manpages/qmake.1<br/>new file mode 100644<br/>index 0000000..571cd70<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/manpages/qmake.1?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/manpages/qmake.1</a></div><div class='hunk'>@@ -0,0 +1,144 @@</div><div class='add'>+.TH QMAKE 1 "2005-07-23"</div><div class='add'>+.\"</div><div class='add'>+.\" Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+.\" All rights reserved.</div><div class='add'>+.\" Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+.\"</div><div class='add'>+.\" This file is part of the QtGui module of the Qt Toolkit.</div><div class='add'>+.\"</div><div class='add'>+.\" $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+.\" GNU Lesser General Public License Usage</div><div class='add'>+.\" This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+.\" License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+.\" appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+.\" file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+.\" General Public License version 2.1 requirements will be met:</div><div class='add'>+.\" http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+.\"</div><div class='add'>+.\" In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+.\" rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+.\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+.\"</div><div class='add'>+.\" GNU General Public License Usage</div><div class='add'>+.\" Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+.\" Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+.\" and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+.\" file. Please review the following information to ensure the GNU General</div><div class='add'>+.\" Public License version 3.0 requirements will be met:</div><div class='add'>+.\" http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+.\"</div><div class='add'>+.\" Other Usage</div><div class='add'>+.\" Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+.\" conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\" $QT_END_LICENSE$</div><div class='add'>+.\"</div><div class='add'>+.SH NAME</div><div class='add'>+qmake \- cross-platform makefile generator for Qt</div><div class='add'>+</div><div class='add'>+.SH SYNOPSIS</div><div class='add'>+.B qmake</div><div class='add'>+.I "[mode] [options] [files]"</div><div class='add'>+.br</div><div class='add'>+.SH "DESCRIPTION"</div><div class='add'>+.B qmake</div><div class='add'>+has two modes, one mode for generating project files based on some</div><div class='add'>+heuristics, and the other for generating makefiles. Normally you</div><div class='add'>+shouldn't need to specify a mode, as makefile generation is the default</div><div class='add'>+mode for qmake, but you may use this to test qmake on an existing</div><div class='add'>+project.</div><div class='add'>+</div><div class='add'>+.SH MODE</div><div class='add'>+.TP</div><div class='add'>+.B "\-project"</div><div class='add'>+Put qmake into project file generation mode In this mode qmake</div><div class='add'>+interprets files as files to be built, defaults to *.c; *.ui; *.y; *.l;</div><div class='add'>+*.ts; *.qrc; *.h; *.hpp; *.hh; *.hxx; *.H; *.cpp; *.cc; *.cxx; *.C</div><div class='add'>+.TP</div><div class='add'>+.B "\-makefile"</div><div class='add'>+Put qmake into makefile generation mode (default) In this mode qmake</div><div class='add'>+interprets files as project files to be processed, if skipped qmake will</div><div class='add'>+try to find a project file in your current working directory</div><div class='add'>+</div><div class='add'>+.SH WARNINGS OPTIONS</div><div class='add'>+.TP</div><div class='add'>+.BI "\-Wnone"</div><div class='add'>+Turn off all warnings</div><div class='add'>+.TP</div><div class='add'>+.BI "\-Wall"</div><div class='add'>+Turn on all warnings</div><div class='add'>+.TP</div><div class='add'>+.BI "\-Wparser"</div><div class='add'>+Turn on parser warnings</div><div class='add'>+.TP</div><div class='add'>+.BI "\-Wlogic"</div><div class='add'>+Turn on logic warnings</div><div class='add'>+</div><div class='add'>+.SH OPTIONS</div><div class='add'>+.TP</div><div class='add'>+.BI "\-o" file</div><div class='add'>+Write output to file</div><div class='add'>+.TP</div><div class='add'>+.BI "\-unix"</div><div class='add'>+Run in unix mode</div><div class='add'>+.TP</div><div class='add'>+.BI "\-win32"</div><div class='add'>+Run in win32 mode</div><div class='add'>+.TP</div><div class='add'>+.BI "\-macx"</div><div class='add'>+Run in Mac OS X mode</div><div class='add'>+.TP</div><div class='add'>+.BI "\-d"</div><div class='add'>+Increase debug level</div><div class='add'>+.TP</div><div class='add'>+.BI "\-t" templ</div><div class='add'>+Overrides TEMPLATE as templ</div><div class='add'>+.TP</div><div class='add'>+.BI "\-tp" prefix</div><div class='add'>+Overrides TEMPLATE so that prefix is prefixed</div><div class='add'>+.TP</div><div class='add'>+into the value</div><div class='add'>+.BI "\-help"</div><div class='add'>+This help</div><div class='add'>+.TP</div><div class='add'>+.BI "\-v"</div><div class='add'>+Version information</div><div class='add'>+.TP</div><div class='add'>+.BI "\-after"</div><div class='add'>+All variable assignments after this will be parsed after [files]</div><div class='add'>+.TP</div><div class='add'>+.BI "\-norecursive"</div><div class='add'>+Don't do a recursive search</div><div class='add'>+.TP</div><div class='add'>+.BI "\-recursive"</div><div class='add'>+Do a recursive search</div><div class='add'>+.TP</div><div class='add'>+.BI "\-cache file"</div><div class='add'>+Use file as cache [makefile mode only]</div><div class='add'>+.TP</div><div class='add'>+.BI "\-spec spec"</div><div class='add'>+Use spec as QMAKESPEC [makefile mode only]</div><div class='add'>+.TP</div><div class='add'>+.BI "\-nocache"</div><div class='add'>+Don't use a cache file [makefile mode only]</div><div class='add'>+.TP</div><div class='add'>+.BI "\-nodepend"</div><div class='add'>+Don't generate dependencies [makefile mode only]</div><div class='add'>+.TP</div><div class='add'>+.BI "\-nomoc"</div><div class='add'>+Don't generate moc targets [makefile mode only]</div><div class='add'>+.TP</div><div class='add'>+.BI "\-nopwd"</div><div class='add'>+Don't look for files in pwd [project mode only]</div><div class='add'>+</div><div class='add'>+.SH SEE ALSO</div><div class='add'>+.PP</div><div class='add'>+.BR /usr/share/qt4/doc/html/qmake-manual.html,</div><div class='add'>+.SH AUTHOR</div><div class='add'>+This manual page was written by Brian Nelson &lt;pyro@debian.org&gt; based on</div><div class='add'>+the output of</div><div class='add'>+.B "qmake -help".</div><div class='head'>diff --git a/config.profiles/harmattan/manpages/qtconfig.1 b/config.profiles/harmattan/manpages/qtconfig.1<br/>new file mode 100644<br/>index 0000000..977c357<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/manpages/qtconfig.1?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/manpages/qtconfig.1</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+.TH "qtconfig" "1" "3.0.3" "Nokia Corporation and/or its subsidiary(-ies)" ""</div><div class='add'>+.\"</div><div class='add'>+.\" Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+.\" All rights reserved.</div><div class='add'>+.\" Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+.\"</div><div class='add'>+.\" This file is part of the QtGui module of the Qt Toolkit.</div><div class='add'>+.\"</div><div class='add'>+.\" $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+.\" GNU Lesser General Public License Usage</div><div class='add'>+.\" This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+.\" License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+.\" appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+.\" file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+.\" General Public License version 2.1 requirements will be met:</div><div class='add'>+.\" http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+.\"</div><div class='add'>+.\" In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+.\" rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+.\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+.\"</div><div class='add'>+.\" GNU General Public License Usage</div><div class='add'>+.\" Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+.\" Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+.\" and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+.\" file. Please review the following information to ensure the GNU General</div><div class='add'>+.\" Public License version 3.0 requirements will be met:</div><div class='add'>+.\" http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+.\"</div><div class='add'>+.\" Other Usage</div><div class='add'>+.\" Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+.\" conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\" $QT_END_LICENSE$</div><div class='add'>+.\"</div><div class='add'>+.SH "NAME"</div><div class='add'>+.LP </div><div class='add'>+qtconfig \- Configuration tool for Qt</div><div class='add'>+.SH "DESCRIPTION"</div><div class='add'>+.LP </div><div class='add'>+QConfig allows for GUI based configuration of Qt and</div><div class='add'>+ other Qt based sources.</div><div class='add'>+</div><div class='add'>+.SH "ENVIRONMENT VARIABLES"</div><div class='add'>+.LP </div><div class='add'>+.TP </div><div class='add'>+\fBQTDIR\fP</div><div class='add'>+Specifies the base Qt dir</div><div class='add'>+.SH "AUTHORS"</div><div class='add'>+.LP </div><div class='add'>+TrollTech &lt;http://www.trolltech.com/&gt;</div><div class='add'>+.TH "qtconfig" "1" "3.0.3" "Troll Tech AS, Norway." ""</div><div class='add'>+.SH "NAME"</div><div class='add'>+.LP </div><div class='add'>+qtconfig \- Configuration tool for Qt</div><div class='add'>+.SH "DESCRIPTION"</div><div class='add'>+.LP </div><div class='add'>+QConfig allows for GUI based configuration of Qt and</div><div class='add'>+ other Qt based sources.</div><div class='add'>+</div><div class='add'>+.SH "ENVIRONMENT VARIABLES"</div><div class='add'>+.LP </div><div class='add'>+.TP </div><div class='add'>+\fBQTDIR\fP</div><div class='add'>+Specifies the base Qt dir</div><div class='add'>+.SH "AUTHORS"</div><div class='add'>+.LP </div><div class='add'>+TrollTech &lt;http://www.trolltech.com/&gt;</div><div class='head'>diff --git a/config.profiles/harmattan/manpages/uic.1 b/config.profiles/harmattan/manpages/uic.1<br/>new file mode 100644<br/>index 0000000..541d331<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/manpages/uic.1?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/manpages/uic.1</a></div><div class='hunk'>@@ -0,0 +1,168 @@</div><div class='add'>+.TH uic 1 "2 Aug 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*-</div><div class='add'>+.\"</div><div class='add'>+.\" Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+.\" All rights reserved.</div><div class='add'>+.\" Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+.\"</div><div class='add'>+.\" This file is part of the QtGui module of the Qt Toolkit.</div><div class='add'>+.\"</div><div class='add'>+.\" $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+.\" GNU Lesser General Public License Usage</div><div class='add'>+.\" This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+.\" License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+.\" appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+.\" file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+.\" General Public License version 2.1 requirements will be met:</div><div class='add'>+.\" http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+.\"</div><div class='add'>+.\" In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+.\" rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+.\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+.\"</div><div class='add'>+.\" GNU General Public License Usage</div><div class='add'>+.\" Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+.\" Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+.\" and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+.\" file. Please review the following information to ensure the GNU General</div><div class='add'>+.\" Public License version 3.0 requirements will be met:</div><div class='add'>+.\" http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+.\"</div><div class='add'>+.\" Other Usage</div><div class='add'>+.\" Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+.\" conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\"</div><div class='add'>+.\" $QT_END_LICENSE$</div><div class='add'>+.\"</div><div class='add'>+.SH NAME</div><div class='add'>+uic \- Qt user interface compiler</div><div class='add'>+.SH SYNOPSIS</div><div class='add'>+.B uic</div><div class='add'>+[options] file</div><div class='add'>+.SH DESCRIPTION</div><div class='add'>+This page documents the</div><div class='add'>+.B User Interface Compiler</div><div class='add'>+for the Qt GUI toolkit. The</div><div class='add'>+.B uic</div><div class='add'>+reads a user interface definition (.ui) file in XML as generated by</div><div class='add'>+.I Qt Designer</div><div class='add'>+and creates corresponding C++ header or source files. It also</div><div class='add'>+generates an image file that embeds raw image data in C++ source code.</div><div class='add'>+.PP</div><div class='add'>+.PP</div><div class='add'>+Generate declaration:</div><div class='add'>+.br</div><div class='add'>+.I "\fB	uic  [options]  \fI&lt;file&gt;"</div><div class='add'>+.br</div><div class='add'>+.PP</div><div class='add'>+Generate implementation:</div><div class='add'>+.br</div><div class='add'>+.I "\fB	uic  [options] -impl \fI&lt;headerfile&gt; &lt;file&gt;"</div><div class='add'>+.br</div><div class='add'>+        \fI&lt;headerfile&gt;\fP:    name of the declaration file</div><div class='add'>+.br</div><div class='add'>+.PP</div><div class='add'>+Generate image collection:</div><div class='add'>+.br</div><div class='add'>+.I "\fB	uic  [options] -embed \fI&lt;project&gt; &lt;image1&gt; &lt;image2&gt; &lt;image3&gt;\fP ..."</div><div class='add'>+.br</div><div class='add'>+        \fI&lt;project&gt;\fP:       project name</div><div class='add'>+        \fI&lt;image[1..n]&gt;\fP:   image files</div><div class='add'>+.br</div><div class='add'>+.\" .PP</div><div class='add'>+.\" Generate binary UI file:</div><div class='add'>+.\" .br</div><div class='add'>+.\" .I "\fB	uic  [options] -binary \fI&lt;file&gt;"</div><div class='add'>+.\" .br</div><div class='add'>+.PP</div><div class='add'>+.PP</div><div class='add'>+For convenience,</div><div class='add'>+.B uic</div><div class='add'>+can also generate declaration or implementation stubs for subclasses.</div><div class='add'>+.PP</div><div class='add'>+Generate subclass declaration:</div><div class='add'>+.br</div><div class='add'>+.I "\fB	uic  [options] -subdecl \fI&lt;subclassname&gt; &lt;baseclassheaderfile&gt; &lt;file&gt;"</div><div class='add'>+.br</div><div class='add'>+        \fI&lt;subclassname&gt;\fP:     name of the subclass to generate</div><div class='add'>+.br</div><div class='add'>+        \fI&lt;baseclassheaderfile&gt;\fP:    declaration file of the baseclass</div><div class='add'>+.PP</div><div class='add'>+Generate subclass implementation:</div><div class='add'>+.br</div><div class='add'>+.I "\fB	uic  [options] -subimpl \fI&lt;subclassname&gt; &lt;subclassheaderfile&gt; &lt;file&gt;"</div><div class='add'>+.br</div><div class='add'>+        \fI&lt;subclassname&gt;\fP:     name of the subclass to generate</div><div class='add'>+.br</div><div class='add'>+        \fI&lt;subclassheaderfile&gt;\fP:    declaration file of the subclass</div><div class='add'>+</div><div class='add'>+.SH GENERAL OPTIONS</div><div class='add'>+.TP</div><div class='add'>+.I "-o file"</div><div class='add'>+Write output to</div><div class='add'>+.I file</div><div class='add'>+rather than to stdout.</div><div class='add'>+.TP</div><div class='add'>+.I "-nofwd"</div><div class='add'>+Omit forward declarations of custom classes in the generated</div><div class='add'>+header file. This is necessary if typedef classes are used.</div><div class='add'>+.TP</div><div class='add'>+.I "-tr func"</div><div class='add'>+Use</div><div class='add'>+.I func()</div><div class='add'>+instead of tr() for internationalization.</div><div class='add'>+.TP</div><div class='add'>+.I "-version"</div><div class='add'>+Display the version of</div><div class='add'>+.B uic</div><div class='add'>+and exit.</div><div class='add'>+</div><div class='add'>+.SH USAGE</div><div class='add'>+.B uic</div><div class='add'>+is almost always invoked by</div><div class='add'>+.BR make (1),</div><div class='add'>+rather than by hand.</div><div class='add'>+.PP</div><div class='add'>+Here are useful makefile rules if you only use GNU make:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+%.h: %.ui</div><div class='add'>+.br</div><div class='add'>+        uic $&lt; -o $@</div><div class='add'>+.br</div><div class='add'>+%.cpp: %.ui</div><div class='add'>+.br</div><div class='add'>+        uic -impl $*.h $&lt; -o $@</div><div class='add'>+.in -4</div><div class='add'>+.PP</div><div class='add'>+If you want to write portably, you can use individual rules of the</div><div class='add'>+following form:</div><div class='add'>+.PP</div><div class='add'>+.in +4</div><div class='add'>+NAME.h: NAME.ui</div><div class='add'>+.br</div><div class='add'>+        uic $&lt; -o $@</div><div class='add'>+.br</div><div class='add'>+NAME.cpp: NAME.ui</div><div class='add'>+.br</div><div class='add'>+        uic -impl $*.h $&lt; -o $@</div><div class='add'>+.in -4</div><div class='add'>+.PP</div><div class='add'>+You must also remember to add</div><div class='add'>+.I NAME.cpp</div><div class='add'>+to your SOURCES (substitute your favorite name) variable and</div><div class='add'>+.I NAME.o</div><div class='add'>+to your OBJECTS variable.</div><div class='add'>+.PP</div><div class='add'>+(While we prefer to name our C++ source files .cpp, the</div><div class='add'>+.B uic</div><div class='add'>+doesn't care, so you can use .C, .cc, .CC, .cxx or even .c++ if</div><div class='add'>+you prefer.)</div><div class='add'>+.PP</div><div class='add'>+.SH "SEE ALSO"</div><div class='add'>+.BR http://www.trolltech.com/ " "</div><div class='add'>+.SH AUTHOR</div><div class='add'>+Trolltech AS &lt;info@trolltech.com&gt;</div><div class='head'>diff --git a/config.profiles/harmattan/mkspecs/linux-g++-cross/qmake.conf b/config.profiles/harmattan/mkspecs/linux-g++-cross/qmake.conf<br/>new file mode 100644<br/>index 0000000..245da1e<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/mkspecs/linux-g++-cross/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/mkspecs/linux-g++-cross/qmake.conf</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+#</div><div class='add'>+# qmake configuration for linux-g++-cross</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+MAKEFILE_GENERATOR	= UNIX</div><div class='add'>+TEMPLATE		= app</div><div class='add'>+CONFIG			+= qt warn_on release incremental link_prl</div><div class='add'>+QT			+= core gui</div><div class='add'>+QMAKE_INCREMENTAL_STYLE = sublib</div><div class='add'>+</div><div class='add'>+include(../common/g++.conf)</div><div class='add'>+include(../common/linux.conf)</div><div class='add'>+</div><div class='add'>+QMAKE_CC		= arm-none-linux-gnueabi-gcc</div><div class='add'>+QMAKE_CFLAGS            += -march=armv7a -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=softfp -fno-omit-frame-pointer -fno-optimize-sibling-calls</div><div class='add'>+QMAKE_CFLAGS_RELEASE	= -O3</div><div class='add'>+QMAKE_CFLAGS_DEBUG	= -O0</div><div class='add'>+</div><div class='add'>+QMAKE_CXX		= arm-none-linux-gnueabi-g++</div><div class='add'>+QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS</div><div class='add'>+QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE</div><div class='add'>+QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG</div><div class='add'>+</div><div class='add'>+QMAKE_LINK		= arm-none-linux-gnueabi-g++</div><div class='add'>+QMAKE_LINK_SHLIB	= arm-none-linux-gnueabi-g++</div><div class='add'>+QMAKE_LINK_C		= arm-none-linux-gnueabi-gcc</div><div class='add'>+QMAKE_LINK_C_SHLIB	= arm-none-linux-gnueabi-gcc</div><div class='add'>+QMAKE_LFLAGS		+= -Wl,-O1 -Wl,--hash-style=gnu</div><div class='add'>+</div><div class='add'>+QMAKE_AR                = arm-none-linux-gnueabi-ar cqs</div><div class='add'>+QMAKE_OBJCOPY           = arm-none-linux-gnueabi-objcopy</div><div class='add'>+QMAKE_STRIP             = arm-none-linux-gnueabi-strip</div><div class='add'>+</div><div class='add'>+#QMAKE_INCDIR            =</div><div class='add'>+#QMAKE_LIBDIR            =</div><div class='add'>+QMAKE_INCDIR_X11        =</div><div class='add'>+QMAKE_LIBDIR_X11        =</div><div class='add'>+#QMAKE_INCDIR_QT         = $$[QT_INSTALL_HEADERS]</div><div class='add'>+#QMAKE_LIBDIR_QT         = $$[QT_INSTALL_LIBS]</div><div class='add'>+QMAKE_INCDIR_OPENGL     =</div><div class='add'>+QMAKE_LIBDIR_OPENGL     =</div><div class='add'>+#QMAKE_INCDIR_EGL        = </div><div class='add'>+#QMAKE_LIBDIR_EGL        =</div><div class='add'>+#QMAKE_INCDIR_OPENVG     = </div><div class='add'>+#QMAKE_LIBDIR_OPENVG     =</div><div class='add'>+</div><div class='add'>+QMAKE_LIBS_X11          = -lXext -lX11 -lm -lz -lXau -lxcb -lXdmcp -lexpat</div><div class='add'>+</div><div class='add'>+QMAKE_LIBS_OPENGL       = -lEGL -lGLESv2 -lIMGegl -lsrv_um</div><div class='add'>+QMAKE_LIBS_OPENGL_QT    = -lEGL -lGLESv2 -lIMGegl -lsrv_um</div><div class='add'>+</div><div class='add'>+QT_CFLAGS_GSTREAMER     += -pthread -Igstreamer-0.10 -Iglib-2.0 -Iglib-2.0/include</div><div class='add'>+</div><div class='add'>+load(qt_config)</div><div class='head'>diff --git a/config.profiles/harmattan/mkspecs/linux-g++-cross/qplatformdefs.h b/config.profiles/harmattan/mkspecs/linux-g++-cross/qplatformdefs.h<br/>new file mode 100644<br/>index 0000000..57a9ce5<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/mkspecs/linux-g++-cross/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/mkspecs/linux-g++-cross/qplatformdefs.h</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the qmake spec of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "../linux-g++/qplatformdefs.h"</div><div class='head'>diff --git a/config.profiles/harmattan/not-installed b/config.profiles/harmattan/not-installed<br/>new file mode 100644<br/>index 0000000..d19a756<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/not-installed?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/not-installed</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+usr/share/qt4/translations/qvfb_pl.qm</div><div class='add'>+usr/share/qt4/translations/qvfb_zh_TW.qm</div><div class='add'>+usr/share/qt4/translations/qvfb_zh_CN.qm</div><div class='add'>+usr/lib/libQtSvg.la</div><div class='add'>+usr/lib/libQtXml.la</div><div class='add'>+usr/lib/libQtSql.la</div><div class='add'>+usr/lib/libQtOpenGL.la</div><div class='add'>+usr/lib/libQtNetwork.la</div><div class='add'>+usr/lib/libQtGui.la</div><div class='add'>+usr/lib/libQt3Support.la</div><div class='add'>+usr/lib/libQtTest.la</div><div class='add'>+usr/lib/libQtCLucene.la</div><div class='add'>+usr/lib/libQtScript.la</div><div class='add'>+usr/lib/libQtXmlPatterns.la</div><div class='add'>+usr/lib/libQtHelp.la</div><div class='add'>+usr/lib/libQtCore.la</div><div class='add'>+usr/lib/libQtDBus.la</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/harmattan/qt4-acceptance-tests.lintian b/config.profiles/harmattan/qt4-acceptance-tests.lintian<br/>new file mode 100644<br/>index 0000000..c44aad8<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/qt4-acceptance-tests.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/qt4-acceptance-tests.lintian</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+qt4-acceptance-tests: unknown-control-file digsigsums</div><div class='add'>+qt4-acceptance-tests: file-in-unusual-dir usr/tests/qt4/tst_qdbusconnection</div><div class='add'>+qt4-acceptance-tests: file-in-unusual-dir usr/tests/qt4/tst_qhash</div><div class='add'>+qt4-acceptance-tests: file-in-unusual-dir usr/tests/qt4/tst_qlist</div><div class='add'>+qt4-acceptance-tests: file-in-unusual-dir usr/tests/qt4/tst_qmap</div><div class='add'>+qt4-acceptance-tests: non-standard-dir-in-usr usr/tests/</div><div class='head'>diff --git a/config.profiles/harmattan/qt4-declarative-qmlviewer.install b/config.profiles/harmattan/qt4-declarative-qmlviewer.install<br/>new file mode 100644<br/>index 0000000..2822108<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/qt4-declarative-qmlviewer.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/qt4-declarative-qmlviewer.install</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+usr/bin/qmlviewer</div><div class='add'>+usr/share/applications/QMLViewer.desktop</div><div class='add'>+usr/share/icons/hicolor/64x64/apps/QMLViewer.png</div><div class='head'>diff --git a/config.profiles/harmattan/qt4-declarative-qmlviewer.lintian b/config.profiles/harmattan/qt4-declarative-qmlviewer.lintian<br/>new file mode 100644<br/>index 0000000..4acdec6<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/qt4-declarative-qmlviewer.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/qt4-declarative-qmlviewer.lintian</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+qt4-declarative-qmlviewer: unknown-control-file digsigsums</div><div class='head'>diff --git a/config.profiles/harmattan/qt4-doc-html.doc-base b/config.profiles/harmattan/qt4-doc-html.doc-base<br/>new file mode 100644<br/>index 0000000..58063c6<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/qt4-doc-html.doc-base?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/qt4-doc-html.doc-base</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+Document: qt4-doc-html</div><div class='add'>+Title: Qt4 Reference Documentation</div><div class='add'>+Author: Trolltech AS</div><div class='add'>+Abstract: Qt is a cross-platform C++ application framework.  Qt's</div><div class='add'>+ primary feature is its rich set of widgets that provide standard GUI</div><div class='add'>+ functionality.</div><div class='add'>+Section: Apps/programming</div><div class='add'>+</div><div class='add'>+Format: HTML</div><div class='add'>+Index: /usr/share/doc/qt4-doc-html/html/index.html</div><div class='add'>+Files: /usr/share/doc/qt4-doc-html/html/*.html</div><div class='head'>diff --git a/config.profiles/harmattan/qt4-doc-html.install b/config.profiles/harmattan/qt4-doc-html.install<br/>new file mode 100644<br/>index 0000000..8467be4<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/qt4-doc-html.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/qt4-doc-html.install</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+usr/share/qt4/doc/html</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/harmattan/qt4-doc-html.links b/config.profiles/harmattan/qt4-doc-html.links<br/>new file mode 100644<br/>index 0000000..d1fed65<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/qt4-doc-html.links?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/qt4-doc-html.links</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+usr/share/qt4/doc/html usr/share/doc/qt4-doc-html/html</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/harmattan/qt4-doc.install b/config.profiles/harmattan/qt4-doc.install<br/>new file mode 100644<br/>index 0000000..1037a6c<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/qt4-doc.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/qt4-doc.install</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+usr/share/qt4/doc/qch/*</div><div class='add'>+usr/share/qt4/doc/src/*</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/harmattan/qt4-linguist-tools.install b/config.profiles/harmattan/qt4-linguist-tools.install<br/>new file mode 100644<br/>index 0000000..73c0bb1<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/qt4-linguist-tools.install?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/qt4-linguist-tools.install</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+usr/bin/native-lrelease</div><div class='add'>+usr/bin/host-lrelease</div><div class='add'>+usr/bin/lupdate</div><div class='add'>+usr/bin/lconvert</div><div class='head'>diff --git a/config.profiles/harmattan/qt4-linguist-tools.lintian b/config.profiles/harmattan/qt4-linguist-tools.lintian<br/>new file mode 100644<br/>index 0000000..0f8ed2b<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/qt4-linguist-tools.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/qt4-linguist-tools.lintian</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+qt4-linguist-tools: unknown-control-file digsigsums</div><div class='add'>+qt4-linguist-tools: binary-from-other-architecture ./usr/bin/host-lrelease</div><div class='add'>+qt4-linguist-tools: binary-or-shlib-defines-rpath ./usr/bin/host-lrelease /scratchbox/host_shared/lib</div><div class='add'>+qt4-linguist-tools: binary-or-shlib-defines-rpath ./usr/bin/host-lrelease /host_usr/lib</div><div class='head'>diff --git a/config.profiles/harmattan/qt4-linguist-tools.postinst b/config.profiles/harmattan/qt4-linguist-tools.postinst<br/>new file mode 100644<br/>index 0000000..2453b95<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/qt4-linguist-tools.postinst?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/qt4-linguist-tools.postinst</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+</div><div class='add'>+set -e</div><div class='add'>+</div><div class='add'>+PREFIX=native</div><div class='add'>+if [ -f /targets/links/scratchbox.config ]; then</div><div class='add'>+    PREFIX=host</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+BINARIES="lrelease"</div><div class='add'>+</div><div class='add'>+for bin in $BINARIES; do</div><div class='add'>+    ln -sf "/usr/bin/${PREFIX}-${bin}" "/usr/bin/${bin}"</div><div class='add'>+done</div><div class='add'>+</div><div class='add'>+#DEBHELPER#</div><div class='head'>diff --git a/config.profiles/harmattan/qt4-linguist-tools.prerm b/config.profiles/harmattan/qt4-linguist-tools.prerm<br/>new file mode 100644<br/>index 0000000..04b51bd<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/qt4-linguist-tools.prerm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/qt4-linguist-tools.prerm</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+</div><div class='add'>+set -e</div><div class='add'>+</div><div class='add'>+BINARIES="lrelease"</div><div class='add'>+</div><div class='add'>+case "$1" in</div><div class='add'>+    upgrade) ;;</div><div class='add'>+    remove|failed-upgrade|deconfigure)</div><div class='add'>+	for bin in $BINARIES; do</div><div class='add'>+	    rm -f "/usr/bin/${bin}"</div><div class='add'>+	done</div><div class='add'>+        ;;</div><div class='add'>+esac</div><div class='add'>+</div><div class='add'>+#DEBHELPER#</div><div class='head'>diff --git a/config.profiles/harmattan/qt4-maemo-auto-tests.lintian b/config.profiles/harmattan/qt4-maemo-auto-tests.lintian<br/>new file mode 100644<br/>index 0000000..3745c80<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/qt4-maemo-auto-tests.lintian?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/qt4-maemo-auto-tests.lintian</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+qt4-maemo-auto-tests: unknown-control-file digsigsums</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qdbusabstractadaptor</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qdbusabstractinterface</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qdbuscontext</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qdbusinterface</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qdbuslocalcalls</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qdbusmetaobject</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qdbusmetatype</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qdbuspendingcall</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qdbuspendingreply</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qdbusreply</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qdbusservicewatcher</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qdbusthreading</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qdbusxmlparser</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qdebug</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qmutexlocker</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qnetworkaddressentry</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qnetworkcookie</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qnetworkcookiejar</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qnetworkproxy</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qnetworkrequest</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qobjectrace</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qpainterpathstroker</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qpen</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qpoint</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qpolygon</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qquaternion</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qqueue</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qrand</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qreadlocker</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qreadwritelock</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qrect</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qringbuffer</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qscopedpointer</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qscriptclass</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qscriptcontextinfo</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qscriptstring</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qscriptvalueiterator</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qsequentialanimationgroup</div><div class='add'>+qt4-maemo-auto-tests: file-in-unusual-dir usr/tests/qt4/tst_qset</div><div class='add'>+qt4-maemo-auto-tests: non-standard-dir-in-usr usr/tests/</div><div class='head'>diff --git a/config.profiles/harmattan/readdir-hppa-test.c b/config.profiles/harmattan/readdir-hppa-test.c<br/>new file mode 100644<br/>index 0000000..52c7d14<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/readdir-hppa-test.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/readdir-hppa-test.c</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the config.tests of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;dirent.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+</div><div class='add'>+main() {</div><div class='add'>+  int return_code;</div><div class='add'>+  DIR *dir;</div><div class='add'>+  struct dirent entry;</div><div class='add'>+  struct dirent *result;</div><div class='add'>+</div><div class='add'>+  if ((dir = opendir(".")) == NULL)</div><div class='add'>+    perror("opendir() error");</div><div class='add'>+  else {</div><div class='add'>+ //   puts("contents of .:");</div><div class='add'>+    for (return_code = readdir_r(dir, &amp;entry, &amp;result);</div><div class='add'>+         result != NULL &amp;&amp; return_code == 0;</div><div class='add'>+         return_code = readdir_r(dir, &amp;entry, &amp;result))</div><div class='add'>+      printf("%s\n", entry.d_name);</div><div class='add'>+    if (return_code != 0)</div><div class='add'>+      perror("readdir_r() error");</div><div class='add'>+    closedir(dir);</div><div class='add'>+  }</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/harmattan/rules b/config.profiles/harmattan/rules<br/>new file mode 100755<br/>index 0000000..3042551<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/rules?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/rules</a></div><div class='hunk'>@@ -0,0 +1,404 @@</div><div class='add'>+#!/usr/bin/make -f</div><div class='add'>+</div><div class='add'>+export QTDIR := $(shell pwd)</div><div class='add'>+export PATH := $(QTDIR)/bin:$(PATH)</div><div class='add'>+# workaround to use lrelease.</div><div class='add'>+export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)</div><div class='add'>+export QT_PLUGIN_PATH := $(QTDIR)/plugins</div><div class='add'>+export DH_VERBOSE=1</div><div class='add'>+</div><div class='add'>+# Only present in official source package</div><div class='add'>+#QTVERSION := $(shell ls changes-* | cut -f2 -d '-')</div><div class='add'>+CURRENTVERSION := $(shell head -1 debian/changelog  | sed 's/[^(]*(\([^)]*\)).*/\1/')</div><div class='add'>+</div><div class='add'>+include /usr/share/cdbs/1/rules/debhelper.mk</div><div class='add'>+include /usr/share/cdbs/1/class/makefile.mk</div><div class='add'>+include /usr/share/cdbs/1/rules/patchsys-quilt.mk</div><div class='add'>+include /usr/share/cdbs/1/rules/utils.mk</div><div class='add'>+</div><div class='add'>+# Find out how many parallel threads to run </div><div class='add'>+TMP_BUILD_OPTS = $(subst $(comma),$(space),$(DEB_BUILD_OPTIONS))</div><div class='add'>+ifneq (,$(filter parallel=%,$(TMP_BUILD_OPTS)))</div><div class='add'>+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(TMP_BUILD_OPTS)))</div><div class='add'>+	PARALLEL_MAKEFLAGS += -j$(NUMJOBS)</div><div class='add'>+endif</div><div class='add'>+BUILD_NOOPT := no</div><div class='add'>+ifneq (,$(filter noopt,$(TMP_BUILD_OPTS)))</div><div class='add'>+	BUILD_NOOPT := yes</div><div class='add'>+endif</div><div class='add'>+BUILD_DOCS := yes</div><div class='add'>+ifneq (,$(filter nodoc,$(TMP_BUILD_OPTS)))</div><div class='add'>+	BUILD_DOCS := no</div><div class='add'>+endif</div><div class='add'>+ifneq (,$(filter nodocs,$(TMP_BUILD_OPTS)))</div><div class='add'>+	BUILD_DOCS := no</div><div class='add'>+endif</div><div class='add'>+TRY_TARGET_BUILD := no</div><div class='add'>+ifneq (,$(filter native-tools,$(TMP_BUILD_OPTS)))</div><div class='add'>+	TRY_TARGET_BUILD := yes</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+DEB_MAKE_INVOKE := $(MAKE) $(PARALLEL_MAKEFLAGS)</div><div class='add'>+DEB_MAKE_BUILD_TARGET := sub-src</div><div class='add'>+DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install</div><div class='add'>+DEB_DH_INSTALL_SOURCEDIR := debian/tmp</div><div class='add'>+</div><div class='add'>+# Ensure the *.debug files aren't included in any package other than libqt4-dbg</div><div class='add'>+DEB_DH_INSTALL_ARGS := --exclude=.debug</div><div class='add'>+</div><div class='add'>+DEB_MAKE_CLEAN_TARGET := confclean distclean</div><div class='add'>+</div><div class='add'>+# Shlibs of the current upstream version</div><div class='add'>+DEB_DH_MAKESHLIBS_ARGS_ALL := -V</div><div class='add'>+</div><div class='add'>+DEB_DH_SHLIBDEPS_ARGS_ALL := --exclude=.debug -Xusr/bin/host-</div><div class='add'>+</div><div class='add'>+# Only present in official source package</div><div class='add'>+#DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)</div><div class='add'>+</div><div class='add'>+QT_MAEMO_TESTDIR := debian/tests</div><div class='add'>+export QMAKEFEATURES=$(CURDIR)/debian/tests</div><div class='add'>+export QMAKE_INVOKE=$(CURDIR)/bin/qmake</div><div class='add'>+export QMAKE_BUILD_ROOT=$(CURDIR)</div><div class='add'>+</div><div class='add'>+#Test packages that will run using -style option</div><div class='add'>+QT_AUTOTESTS_GUI_STYLE := "libqt4-gui-tests"</div><div class='add'>+</div><div class='add'>+# Select OpenGL backend driver</div><div class='add'>+# Enable multituch support</div><div class='add'>+ifeq ($(DEB_HOST_ARCH),arm)</div><div class='add'>+	CONFIG_ARCH_OPT = armv6</div><div class='add'>+else</div><div class='add'>+	ifeq ($(DEB_HOST_ARCH),armel)</div><div class='add'>+		CONFIG_ARCH_OPT = armv6</div><div class='add'>+	else</div><div class='add'>+		CONFIG_ARCH_OPT = i386</div><div class='add'>+	endif</div><div class='add'>+</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT -DQT_EXPERIMENTAL_CLIENT_DECORATIONS -DQT_MEEGO_EXPERIMENTAL_SHADERCACHE -DQT_MEEGO_EXPERIMENTAL_SHADERCACHE_TRACE</div><div class='add'>+</div><div class='add'>+# Check if running inside scratchbox, and that host-gcc works</div><div class='add'>+IN_SBOX = $(shell if [ -f /targets/links/scratchbox.config ]; then echo yes; else echo no; fi)</div><div class='add'>+HOST_GCC_WORKS = $(shell if host-gcc --version &gt; /dev/null; then echo yes; else echo no; fi)</div><div class='add'>+TARGET_BUILD = no</div><div class='add'>+ifeq ($(TRY_TARGET_BUILD),yes)</div><div class='add'>+	ifeq ($(IN_SBOX),yes)</div><div class='add'>+		ifeq ($(HOST_GCC_WORKS),yes)</div><div class='add'>+			TARGET_BUILD = yes</div><div class='add'>+		endif</div><div class='add'>+	endif</div><div class='add'>+# Except don't use host-gcc if building for i386</div><div class='add'>+	ifeq ($(DEB_HOST_ARCH),i386)</div><div class='add'>+		TARGET_BUILD = no</div><div class='add'>+	endif</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+TARGET_PLATFORM = linux-g++-maemo</div><div class='add'>+HOST_PLATFORM = unsupported/linux-host-g++</div><div class='add'>+PLATFORM_FLAG = -platform $(TARGET_PLATFORM)</div><div class='add'>+FORCE_PKG_CONFIG_FLAG =</div><div class='add'>+HOST_EXLUDES =</div><div class='add'>+ifeq ($(TARGET_BUILD),yes)</div><div class='add'>+	PLATFORM_FLAG = -platform $(HOST_PLATFORM) \</div><div class='add'>+			-xplatform $(TARGET_PLATFORM)</div><div class='add'>+	FORCE_PKG_CONFIG_FLAG = -force-pkg-config</div><div class='add'>+	HOST_EXCLUDES := usr/bin/host- usr/bin/qmake</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+DEB_STRIP_EXCLUDE := $(HOST_EXCLUDES)</div><div class='add'>+</div><div class='add'>+# Determine target architecture</div><div class='add'>+ifeq ($(DEB_HOST_ARCH_OS),linux)</div><div class='add'>+	ifeq ($(CONFIG_ARCH_OPT),armv6)</div><div class='add'>+		GL_BACKEND=es2</div><div class='add'>+		EXTRA_CONFIGURE_OPTS += -graphicssystem runtime \</div><div class='add'>+					-runtimegraphicssystem meego </div><div class='add'>+		CONFIG_BUILD_OPT = -release</div><div class='add'>+	else</div><div class='add'>+		GL_BACKEND=desktop</div><div class='add'>+		CONFIG_BUILD_OPT = -debug</div><div class='add'>+	endif</div><div class='add'>+else</div><div class='add'>+	TARGET_PLATFORM = glibc-g++</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+#If noopt is selected, force -debug and some compilation flags</div><div class='add'>+ifeq ($(BUILD_NOOPT),yes)</div><div class='add'>+	CONFIG_BUILD_OPT = -debug</div><div class='add'>+	CFLAGS = -g</div><div class='add'>+	CXXFLAGS = -g</div><div class='add'>+	export CFLAGS</div><div class='add'>+	export CXXFLAGS</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+MAKE_DOCS := -make docs</div><div class='add'>+DOCS_EXCLUDE :=</div><div class='add'>+ifeq ($(BUILD_DOCS),no)</div><div class='add'>+	MAKE_DOCS := -nomake docs</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+common-build-arch::  debian/stamp-makefile-build-tools</div><div class='add'>+</div><div class='add'>+debian/stamp-makefile-build-tools: debian/stamp-makefile-build</div><div class='add'>+	$(DEB_MAKE_INVOKE) sub-tools</div><div class='add'>+	touch $@</div><div class='add'>+</div><div class='add'>+common-configure-arch:: config.status</div><div class='add'>+</div><div class='add'>+config.status:</div><div class='add'>+	# Create mkspecs/glibc-g++ from mkspecs/linux-g++, needed by GNU/kFreeBSD</div><div class='add'>+	# we cannot use directly linux-g++ due to src/corelib/io/io.pri</div><div class='add'>+	rm -rf mkspecs/glibc-g++</div><div class='add'>+	cp -a mkspecs/linux-g++ mkspecs/glibc-g++</div><div class='add'>+	./configure -opensource \</div><div class='add'>+				-confirm-license \</div><div class='add'>+				$(CONFIG_BUILD_OPT) \</div><div class='add'>+				-prefix "/usr" \</div><div class='add'>+				-bindir "/usr/bin" \</div><div class='add'>+				-libdir "/usr/lib" \</div><div class='add'>+				-docdir "/usr/share/qt4/doc" \</div><div class='add'>+				-headerdir "/usr/include/qt4" \</div><div class='add'>+				-datadir "/usr/share/qt4" \</div><div class='add'>+				-plugindir "/usr/lib/qt4/plugins" \</div><div class='add'>+				-importdir "/usr/lib/qt4/imports" \</div><div class='add'>+				-translationdir "/usr/share/qt4/translations" \</div><div class='add'>+				-sysconfdir "/etc/xdg" \</div><div class='add'>+				$(PLATFORM_FLAG) \</div><div class='add'>+				$(FORCE_PKG_CONFIG_FLAG) \</div><div class='add'>+				-arch $(CONFIG_ARCH_OPT) \</div><div class='add'>+				-fast \</div><div class='add'>+				-no-optimized-qmake \</div><div class='add'>+				-reduce-relocations \</div><div class='add'>+				-no-separate-debug-info \</div><div class='add'>+				-no-rpath \</div><div class='add'>+				-system-zlib \</div><div class='add'>+				-system-libtiff \</div><div class='add'>+				-system-libpng \</div><div class='add'>+				-system-libjpeg \</div><div class='add'>+				-no-nas-sound \</div><div class='add'>+				-qt-gif \</div><div class='add'>+				-no-qt3support \</div><div class='add'>+				-no-libmng \</div><div class='add'>+				-opengl $(GL_BACKEND) \</div><div class='add'>+				-accessibility \</div><div class='add'>+				-make tools \</div><div class='add'>+				$(MAKE_DOCS) \</div><div class='add'>+				-nomake examples \</div><div class='add'>+				-nomake demos \</div><div class='add'>+				-little-endian \</div><div class='add'>+				-no-cups \</div><div class='add'>+				-no-gtkstyle \</div><div class='add'>+				-exceptions \</div><div class='add'>+				-no-xinerama \</div><div class='add'>+				-no-xcursor \</div><div class='add'>+				-dbus-linked \</div><div class='add'>+				-glib \</div><div class='add'>+				-no-pch \</div><div class='add'>+				-gstreamer \</div><div class='add'>+				-svg \</div><div class='add'>+				-no-webkit \</div><div class='add'>+				-no-sql-ibase \</div><div class='add'>+				-xmlpatterns \</div><div class='add'>+				-system-sqlite \</div><div class='add'>+				-plugin-sql-sqlite \</div><div class='add'>+				-openssl \</div><div class='add'>+				-phonon \</div><div class='add'>+				-xinput2 \</div><div class='add'>+				-icu \</div><div class='add'>+				$(EXTRA_CONFIGURE_OPTS)</div><div class='add'>+</div><div class='add'>+BINARY_NAMES := qmake moc lrelease rcc uic</div><div class='add'>+HOST_BINARIES := $(addprefix $(CURDIR)/bin/, $(addprefix host-, $(BINARY_NAMES)))</div><div class='add'>+</div><div class='add'>+# host-prefixed binaries are to be copied anyway regardless of the platform</div><div class='add'>+common-build-arch:: $(HOST_BINARIES) debian/stamp-makefile-build-target-binaries</div><div class='add'>+</div><div class='add'>+$(HOST_BINARIES):</div><div class='add'>+	cp "$(subst host-,,$@)" "$@"</div><div class='add'>+	if [ -n "$(HOST_EXCLUDES)" ]; then host-strip --strip-all "$@"; fi</div><div class='add'>+</div><div class='add'>+debian/stamp-makefile-build-target-binaries: $(HOST_BINARIES)</div><div class='add'>+# Build target-platform tools when cross-compiling</div><div class='add'>+	# First make sure qdoc3 is built</div><div class='add'>+	if [ "x$(BUILD_DOCS)" = "xyes" ]; then $(DEB_MAKE_INVOKE) -C tools/qdoc3; fi</div><div class='add'>+	# Keep qmake as is while building the rest, build into native-qmake</div><div class='add'>+	(cd qmake &amp;&amp; $(DEB_MAKE_INVOKE) clean &amp;&amp; $(QMAKE_INVOKE) -spec "$(CURDIR)/mkspecs/$(TARGET_PLATFORM)" &amp;&amp; $(DEB_MAKE_INVOKE) "TARGET=$(QTDIR)/bin/native-qmake")</div><div class='add'>+	# bootstrap needs to be first</div><div class='add'>+	for dir in src/tools/bootstrap src/tools/moc tools/linguist/lrelease src/tools/rcc src/tools/uic; do \</div><div class='add'>+		(cd "$$dir" &amp;&amp; $(DEB_MAKE_INVOKE) clean &amp;&amp; $(QMAKE_INVOKE) -spec "$(CURDIR)/mkspecs/$(TARGET_PLATFORM)" &amp;&amp; $(DEB_MAKE_INVOKE)) \</div><div class='add'>+	done</div><div class='add'>+	#Use the host binaries for the rest of the Qt build</div><div class='add'>+	for binary in moc rcc uic lrelease; do \</div><div class='add'>+		mv "$(CURDIR)/bin/$$binary" "$(CURDIR)/bin/native-$$binary" ; \</div><div class='add'>+		cp "$(CURDIR)/bin/host-$$binary" "$(CURDIR)/bin/$$binary"; \</div><div class='add'>+	done</div><div class='add'>+	touch $@</div><div class='add'>+</div><div class='add'>+#Build the auto tests</div><div class='add'>+TEST_PACKAGES := $(filter %-tests, $(DEB_PACKAGES))</div><div class='add'>+common-build-arch:: $(addprefix debian/stamp-makefile-build-autotest-,$(TEST_PACKAGES))</div><div class='add'>+</div><div class='add'>+BUILD_TEST_PACKAGE_NAME = $(subst debian/stamp-makefile-build-autotest-,,$@)</div><div class='add'>+BUILD_TEST_DIR = build_tests/$(BUILD_TEST_PACKAGE_NAME)</div><div class='add'>+$(addprefix debian/stamp-makefile-build-autotest-,$(TEST_PACKAGES)) :</div><div class='add'>+	rm -f tests/auto/$(BUILD_TEST_PACKAGE_NAME).pro</div><div class='add'>+	cp debian/tests/$(BUILD_TEST_PACKAGE_NAME).pro tests/auto</div><div class='add'>+	mkdir -p $(BUILD_TEST_DIR)</div><div class='add'>+	cd $(BUILD_TEST_DIR) &amp;&amp; $(QMAKE_INVOKE) -recursive $(CURDIR)/tests/auto/$(BUILD_TEST_PACKAGE_NAME).pro CONFIG+=maemo_tests</div><div class='add'>+	$(DEB_MAKE_INVOKE) -C $(BUILD_TEST_DIR)</div><div class='add'>+	touch $@</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+clean::</div><div class='add'>+# Extra stuff missed by confclean/distclean</div><div class='add'>+</div><div class='add'>+	# Misc. files</div><div class='add'>+	rm -f \</div><div class='add'>+	  config.status \</div><div class='add'>+	  config.tests/.qmake.cache \</div><div class='add'>+	  .qmake.cache \</div><div class='add'>+	  examples/dbus/*/Makefile.* \</div><div class='add'>+	  mkspecs/qconfig.pri \</div><div class='add'>+	  src/corelib/global/qconfig.* \</div><div class='add'>+	  src/tools/uic/qclass_lib_map.h \</div><div class='add'>+	  lib/*.so.* \</div><div class='add'>+	  lib/*.la \</div><div class='add'>+	  tests/auto/libqt4-gui-tests.pri \</div><div class='add'>+	  tests/auto/maemo-auto.pro \</div><div class='add'>+	  tests/auto/qt4-acceptance-tests.pri \</div><div class='add'>+	  tests/auto/qt4-maemo-auto-tests.pri \</div><div class='add'>+	;</div><div class='add'>+</div><div class='add'>+	# Misc. directories</div><div class='add'>+	rm -rf \</div><div class='add'>+	  examples/tools/plugandpaint/plugins/ \</div><div class='add'>+	  examples/tools/styleplugin/styles/ \</div><div class='add'>+	  mkspecs/glibc-g++/ \</div><div class='add'>+	  plugins/ \</div><div class='add'>+	  include/ \</div><div class='add'>+	  doc-build/ \</div><div class='add'>+	  doc/html/ \</div><div class='add'>+	  doc/qch/ \</div><div class='add'>+	;</div><div class='add'>+</div><div class='add'>+	# hppa test directory</div><div class='add'>+	rm -rf debian/hppa-tmp</div><div class='add'>+</div><div class='add'>+	# Leftover dirs</div><div class='add'>+	find -depth -type d \( -false \</div><div class='add'>+	  -o -name debug-shared \</div><div class='add'>+	  -o -name debug-static \</div><div class='add'>+	  -o -name \*.gch \</div><div class='add'>+	  -o -name .moc\* \</div><div class='add'>+	  -o -name .obj\* \</div><div class='add'>+	  -o -name .pch \</div><div class='add'>+	  -o -name pkgconfig \</div><div class='add'>+	  -o -name .rcc \</div><div class='add'>+	  -o -name release-shared \</div><div class='add'>+	  -o -name release-static \</div><div class='add'>+	  -o -name .uic \</div><div class='add'>+	\) -print0 | xargs -0 rm -rf</div><div class='add'>+</div><div class='add'>+	# Leftover files and all symlinks except those in .git</div><div class='add'>+	find \( -false \</div><div class='add'>+	  -o \( -name \*.a -a ! -path \*/tests/auto/qdir/types/\*.a \) \</div><div class='add'>+	  -o -name Makefile.Debug \</div><div class='add'>+	  -o -name Makefile.Release \</div><div class='add'>+	  -o -name \*.o \</div><div class='add'>+	  -o -name \*.prl \</div><div class='add'>+	  -o \( -name \*.so -a ! -path \*/tests/auto/qlibrary/library_path/invalid.so \) \</div><div class='add'>+	  -o -name \*.so.debug \</div><div class='add'>+	  -o -type l \</div><div class='add'>+	  \! -path ./.git/\* \</div><div class='add'>+	\) -print0 | xargs -0 rm -rf </div><div class='add'>+</div><div class='add'>+	# Delete all Makefiles, excluding some from src/3rdparty</div><div class='add'>+	find $(CURDIR) -name Makefile \</div><div class='add'>+	  ! -path $(CURDIR)/src/3rdparty/Makefile \</div><div class='add'>+	  ! -path $(CURDIR)/src/3rdparty/freetype/\* \</div><div class='add'>+	  ! -path $(CURDIR)/src/3rdparty/zlib/\* \</div><div class='add'>+	  ! -path $(CURDIR)/src/3rdparty/ptmalloc/Makefile \</div><div class='add'>+	  ! -path $(CURDIR)/util/gencmap/Makefile \</div><div class='add'>+	 -print0 | xargs -0 rm -rf </div><div class='add'>+</div><div class='add'>+	# Any remaining executables</div><div class='add'>+	find $(CURDIR) -type f -perm +111 -exec file -i '{}' \; \</div><div class='add'>+	 | grep -e application/x-executable \</div><div class='add'>+	 | cut -d ':' -f 1 | xargs rm -f</div><div class='add'>+</div><div class='add'>+	# Generated on build</div><div class='add'>+	rm -f debian/shlibs.local</div><div class='add'>+	rm -f debian/stamp-makefile-build-tools</div><div class='add'>+	rm -f debian/stamp-makefile-build-docs</div><div class='add'>+	rm -f debian/stamp-makefile-build-target-binaries</div><div class='add'>+	rm -f $(addprefix debian/stamp-makefile-build-autotest-,$(TEST_PACKAGES))</div><div class='add'>+	rm -f $(addprefix debian/,$(addsuffix .install, $(TEST_PACKAGES)))</div><div class='add'>+	rm -f $(addprefix tests/auto/,$(addsuffix .pro, $(TEST_PACKAGES)))</div><div class='add'>+	rm -rf build_tests/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+common-install-arch::</div><div class='add'>+	mkdir -p $(DEB_DESTDIR)/usr/share/qt4/translations/</div><div class='add'>+	cp $(CURDIR)/translations/*.ts $(DEB_DESTDIR)/usr/share/qt4/translations/.</div><div class='add'>+	find $(DEB_DESTDIR)/usr/share/qt4/translations/ -type f -name "*.ts" | xargs $(CURDIR)/bin/lrelease</div><div class='add'>+	rm -rf $(DEB_DESTDIR)/usr/share/qt4/translations/*.ts</div><div class='add'>+# Fix wrong path in pkgconfig files</div><div class='add'>+	find $(DEB_DESTDIR)/usr/lib/pkgconfig -type f -name '*.pc' \</div><div class='add'>+		-exec perl -pi -e "s, -L$(CURDIR)/?\S+,,g" {} \;</div><div class='add'>+# Fix wrong path in prl files</div><div class='add'>+	find $(DEB_DESTDIR)/usr/lib -type f -name '*.prl' \</div><div class='add'>+		-exec perl -pi -e "s, -L$(CURDIR)/\S+,,g" {} \;</div><div class='add'>+	find $(DEB_DESTDIR)/usr/lib -type f -name '*.prl' \</div><div class='add'>+		-exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/" {} \;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+install/qt4-declarative-qmlviewer::</div><div class='add'>+	install -p -D "debian/QMLViewer.desktop" "$(DEB_DESTDIR)/usr/share/applications/QMLViewer.desktop"</div><div class='add'>+	install -p -D "debian/QMLViewer.png" "$(DEB_DESTDIR)/usr/share/icons/hicolor/64x64/apps/QMLViewer.png"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+$(patsubst %,install/%,$(TEST_PACKAGES)) :: install/%:</div><div class='add'>+	rm -f debian/$(cdbs_curpkg).install</div><div class='add'>+	$(DEB_MAKE_INVOKE) -C build_tests/$(cdbs_curpkg) $(DEB_MAKE_INSTALL_TARGET)</div><div class='add'>+	$(DEB_MAKE_INVOKE) -C build_tests/$(cdbs_curpkg) QTM_TEST_INSTALL_FILE=$(CURDIR)/debian/$(cdbs_curpkg).install installtests</div><div class='add'>+	if [ -z "$(findstring $(cdbs_curpkg),$(QT_AUTOTESTS_GUI_STYLE))" ]; then \</div><div class='add'>+		$(QT_MAEMO_TESTDIR)/create_tests_xml -t $(QT_MAEMO_TESTDIR) \</div><div class='add'>+	            -i $(DEB_DESTDIR) -p $(CURDIR)/debian/$(cdbs_curpkg).install ;\</div><div class='add'>+	else \</div><div class='add'>+		$(QT_MAEMO_TESTDIR)/create_tests_xml -t $(QT_MAEMO_TESTDIR) -c "-style plastique" \</div><div class='add'>+                    -i $(DEB_DESTDIR) -p $(CURDIR)/debian/$(cdbs_curpkg).install ;\</div><div class='add'>+	fi</div><div class='add'>+</div><div class='add'>+common-install-arch::</div><div class='add'>+	find "$(CURDIR)/bin" -name "host-*" -exec install -p -D {} "$(DEB_DESTDIR)/usr/bin" \;</div><div class='add'>+	find "$(CURDIR)/bin" -name "native-*" -exec install -p -D {} "$(DEB_DESTDIR)/usr/bin" \;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+install/libqt4-doc::</div><div class='add'>+	mkdir -p "$(DEB_DESTDIR)/usr/share/qt4/doc/html/"</div><div class='add'>+	if [ "x$(BUILD_DOCS)" = "xno" ]; then touch "$(DEB_DESTDIR)/usr/share/qt4/doc/html/BUILT_WITH_NODOCS"; fi</div><div class='add'>+</div><div class='add'>+common-build-indep:: debian/stamp-makefile-build-docs</div><div class='add'>+</div><div class='add'>+debian/stamp-makefile-build-docs:</div><div class='add'>+	if [ "x$(BUILD_DOCS)" = "xyes" ]; then $(DEB_MAKE_INVOKE) docs; fi</div><div class='add'>+	touch $@</div><div class='add'>+</div><div class='add'>+binary-predeb/libqt4-dev::</div><div class='add'>+	sed -i -e 's/#PLATFORM_ARG#/$(TARGET_PLATFORM)/g' debian/$(cdbs_curpkg)/DEBIAN/postinst</div><div class='add'>+</div><div class='add'>+# Automatically install lintian overrides, stolen from debian-qt-kde.mk</div><div class='add'>+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:</div><div class='add'>+	if test -e debian/$(cdbs_curpkg).lintian; then \</div><div class='add'>+	    install -p -D -m644 debian/$(cdbs_curpkg).lintian \</div><div class='add'>+	    debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \</div><div class='add'>+        fi</div><div class='add'>+</div><div class='add'>+# Generate shlibs local files</div><div class='add'>+$(patsubst %,binary-fixup/%,$(DEB_ALL_PACKAGES)) :: binary-fixup/%: binary-strip/%</div><div class='add'>+	if test -e debian/$(cdbs_curpkg)/DEBIAN/shlibs ; then \</div><div class='add'>+		sed 's/&gt;=[^)]*/= $(CURRENTVERSION)/' debian/$(cdbs_curpkg)/DEBIAN/shlibs &gt;&gt; debian/shlibs.local ;\</div><div class='add'>+	fi</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/harmattan/source.lintian-overrides b/config.profiles/harmattan/source.lintian-overrides<br/>new file mode 100644<br/>index 0000000..1835a30<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/source.lintian-overrides?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/source.lintian-overrides</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+qt4-x11 source: changelog-should-mention-nmu</div><div class='add'>+qt4-x11 source: native-package-with-dash-version</div><div class='add'>+qt4-x11 source: source-nmu-has-incorrect-version-number</div><div class='add'>+qt4-x11 source: virtual-package-depends-without-real-package-depends build-depends: libgl-dev</div><div class='add'>+qt4-x11 source: virtual-package-depends-without-real-package-depends build-depends: libgl1</div><div class='head'>diff --git a/config.profiles/harmattan/source/format b/config.profiles/harmattan/source/format<br/>new file mode 100644<br/>index 0000000..89ae9db<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/source/format?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/source/format</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+3.0 (native)</div><div class='head'>diff --git a/config.profiles/harmattan/tests/create_tests_xml b/config.profiles/harmattan/tests/create_tests_xml<br/>new file mode 100755<br/>index 0000000..c168654<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/tests/create_tests_xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/tests/create_tests_xml</a></div><div class='hunk'>@@ -0,0 +1,174 @@</div><div class='add'>+#!/bin/sh</div><div class='add'>+</div><div class='add'>+#############################################################################</div><div class='add'>+##</div><div class='add'>+## Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+## All rights reserved.</div><div class='add'>+## Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+##</div><div class='add'>+## This file is the build configuration utility of the Qt Toolkit.</div><div class='add'>+##</div><div class='add'>+## $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+## GNU Lesser General Public License Usage</div><div class='add'>+## This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+## License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+## appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+## file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+## General Public License version 2.1 requirements will be met:</div><div class='add'>+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+##</div><div class='add'>+## In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+## rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+##</div><div class='add'>+## GNU General Public License Usage</div><div class='add'>+## Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+## Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+## and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+## file. Please review the following information to ensure the GNU General</div><div class='add'>+## Public License version 3.0 requirements will be met:</div><div class='add'>+## http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+##</div><div class='add'>+## Other Usage</div><div class='add'>+## Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+## conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+##</div><div class='add'>+##</div><div class='add'>+##</div><div class='add'>+##</div><div class='add'>+##</div><div class='add'>+## $QT_END_LICENSE$</div><div class='add'>+##</div><div class='add'>+#############################################################################</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+set -e</div><div class='add'>+#set -u</div><div class='add'>+</div><div class='add'>+xmlInstallDir="usr/share"</div><div class='add'>+</div><div class='add'>+testSuiteHeader="testsuite_header.txt"</div><div class='add'>+testSuiteFooter="testsuite_footer.txt"</div><div class='add'>+testSetTemplate="testset.txt"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#-------------------------------------------------------------------------------</div><div class='add'>+#Parameters: $1 the project file where the tests are defined</div><div class='add'>+#-------------------------------------------------------------------------------</div><div class='add'>+create_test_xml()</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+    mkdir -p "$installDir/$xmlInstallDir/$packageName"</div><div class='add'>+    xmlFile="$installDir/$xmlInstallDir/$packageName/tests.xml"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    begin_test_suite $xmlFile</div><div class='add'>+</div><div class='add'>+    for testApp in $(&lt; "$installFile"); do</div><div class='add'>+        if file -i "$installDir/$testApp"|grep -e "application/x-executable" ; then</div><div class='add'>+            add_test_set "$testApp" "$xmlFile"</div><div class='add'>+        fi</div><div class='add'>+    done</div><div class='add'>+</div><div class='add'>+    end_test_suite $xmlFile</div><div class='add'>+</div><div class='add'>+    echo "$xmlInstallDir/$packageName/tests.xml" &gt;&gt; "$installFile"</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#-------------------------------------------------------------------------------</div><div class='add'>+#Parameters: $1 the xml output file'</div><div class='add'>+#-------------------------------------------------------------------------------</div><div class='add'>+begin_test_suite()</div><div class='add'>+{</div><div class='add'>+    optstr="/&lt;suite/s;name=\"[^\"]*\";name=\"$packageName\";g"</div><div class='add'>+    template="$templateDir/$testSuiteHeader"</div><div class='add'>+    runsed $optstr $template &gt; "$1"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#Parameters: $1 the xml output file</div><div class='add'>+end_test_suite()</div><div class='add'>+{</div><div class='add'>+    cat "$templateDir/$testSuiteFooter" &gt;&gt; "$1"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#-------------------------------------------------------------------------------</div><div class='add'>+#Parameters: $1 the name of the test application</div><div class='add'>+#Parameters: $2 the xml output file</div><div class='add'>+#-------------------------------------------------------------------------------</div><div class='add'>+add_test_set()</div><div class='add'>+{</div><div class='add'>+    templateSetFile="$templateDir/$testSetTemplate"</div><div class='add'>+    testSuiteName=$(basename $1)</div><div class='add'>+    add_set_name "$testSuiteName" "$templateSetFile" |add_description "$testSuiteName" |add_case_name "$testSuiteName" |add_step "$1"  &gt;&gt; "$2"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+add_set_name()</div><div class='add'>+{</div><div class='add'>+    optstr="/&lt;set/s;name=\"[^\"]*\";name=\"${packageName}_$1\";g"</div><div class='add'>+    runsed "$optstr" "$2"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+add_case_name()</div><div class='add'>+{</div><div class='add'>+    optstr="/&lt;case/s;name=\"[^\"]*\";name=\"$1\";g"</div><div class='add'>+    runsed "$optstr" "$2"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+add_description()</div><div class='add'>+{</div><div class='add'>+    optstr="s;&lt;description&gt;.*&lt;/description&gt;;&lt;description&gt;${packageName}:$1&lt;/description&gt;;g"</div><div class='add'>+    runsed "$optstr" "$2"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+add_step()</div><div class='add'>+{</div><div class='add'>+    if [ -n "$testCliOptions" ]; then</div><div class='add'>+        optstr="s;&lt;step&gt;.*&lt;/step&gt;;&lt;step&gt;$1 $testCliOptions&lt;/step&gt;;g"</div><div class='add'>+    else</div><div class='add'>+        optstr="s;&lt;step&gt;.*&lt;/step&gt;;&lt;step&gt;$1&lt;/step&gt;;g"</div><div class='add'>+    fi</div><div class='add'>+    runsed "$optstr" "$2"</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+runsed()</div><div class='add'>+{</div><div class='add'>+    sedopt=$(echo $1)</div><div class='add'>+    cmd='sed -e "$sedopt" $2'</div><div class='add'>+    eval $cmd</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#======= main =========</div><div class='add'>+</div><div class='add'>+programName="$0"</div><div class='add'>+usage="Usage: `basename $programName` -t &lt;template_dir&gt; -d &lt;debian_dir&gt; \</div><div class='add'>+-i &lt;dir_where_tests_will_be_installed&gt; &lt;project_files&gt;"</div><div class='add'>+</div><div class='add'>+if [ $# -le 0 ]; then</div><div class='add'>+    echo "$usage" 1&gt;&amp;2</div><div class='add'>+    exit 1</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+while [ $# -gt 0 ]; do</div><div class='add'>+    case "$1" in</div><div class='add'>+        -t) templateDir=$(cd "$2"; pwd)</div><div class='add'>+            shift</div><div class='add'>+            ;;</div><div class='add'>+        -i) installDir=$(cd "$2"; pwd)</div><div class='add'>+            shift</div><div class='add'>+            ;;</div><div class='add'>+        -p) installFile="$2"</div><div class='add'>+            packageName=$(basename "$installFile" ".install")</div><div class='add'>+            shift</div><div class='add'>+            ;;</div><div class='add'>+        -c) testCliOptions="$2"</div><div class='add'>+            shift</div><div class='add'>+            ;;</div><div class='add'>+        *) projFileList="$projFileList $1";;</div><div class='add'>+    esac</div><div class='add'>+    shift</div><div class='add'>+done</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+create_test_xml</div><div class='head'>diff --git a/config.profiles/harmattan/tests/libqt4-gui-tests.pro b/config.profiles/harmattan/tests/libqt4-gui-tests.pro<br/>new file mode 100644<br/>index 0000000..d00f139<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/tests/libqt4-gui-tests.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/tests/libqt4-gui-tests.pro</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+#Staging tests for gui</div><div class='add'>+TEMPLATE = subdirs</div><div class='add'>+</div><div class='add'>+SUBDIRS += modeltest \</div><div class='add'>+    qabstractbutton \</div><div class='add'>+    qabstractitemmodel \</div><div class='add'>+    qabstractprintdialog \</div><div class='add'>+    qabstractproxymodel \</div><div class='add'>+    qabstractslider \</div><div class='add'>+    qabstractspinbox \</div><div class='add'>+    qabstracttextdocumentlayout \</div><div class='add'>+    qabstractvideobuffer \</div><div class='add'>+    qabstractvideosurface \</div><div class='add'>+    qaction \</div><div class='add'>+    qfileiconprovider \</div><div class='add'>+    qfocusframe \</div><div class='add'>+    qfont \</div><div class='add'>+    qfontmetrics \</div><div class='add'>+    qformlayout \</div><div class='add'>+    qgraphicslayout \</div><div class='add'>+    qnetworkcachemetadata \</div><div class='add'>+    qpaintengine \</div><div class='add'>+    qpalette \</div><div class='add'>+    qparallelanimationgroup \</div><div class='add'>+    qpauseanimation \</div><div class='add'>+    qpicture \</div><div class='add'>+    qplaintextedit \</div><div class='add'>+    qpointer \</div><div class='add'>+    qprinterinfo \</div><div class='add'>+    qprogressbar \</div><div class='add'>+    qprogressdialog \</div><div class='add'>+    qpropertyanimation \</div><div class='add'>+    qradiobutton \</div><div class='add'>+    qregexpvalidator \</div><div class='add'>+    qscriptenginedebugger \</div><div class='add'>+    qscrollarea \</div><div class='add'>+    qscrollbar \</div><div class='add'>+    qsharedpointer_and_qwidget \</div><div class='add'>+    qsignalmapper \</div><div class='add'>+    qslider \</div><div class='add'>+    qsortfilterproxymodel \</div><div class='add'>+    qspinbox \</div><div class='add'>+    qstackedlayout \</div><div class='add'>+    qstackedwidget \</div><div class='add'>+    qstandarditem \</div><div class='add'>+    qstandarditemmodel \</div><div class='add'>+    qstatemachine \</div><div class='add'>+    qstringlistmodel \</div><div class='add'>+    qstyleoption \</div><div class='add'>+    qsyntaxhighlighter \</div><div class='add'>+    qtextblock \</div><div class='add'>+    qtextcursor \</div><div class='add'>+    qtextformat \</div><div class='add'>+    qtextlist \</div><div class='add'>+    qtextobject \</div><div class='add'>+    qtextscriptengine \</div><div class='add'>+    qtexttable \</div><div class='add'>+    qtoolbox \</div><div class='add'>+    qtoolbutton \</div><div class='add'>+    qtreewidgetitemiterator \</div><div class='add'>+    qundogroup \</div><div class='add'>+    qundostack \</div><div class='add'>+    qvideosurfaceformat \</div><div class='add'>+    qwidgetaction</div><div class='head'>diff --git a/config.profiles/harmattan/tests/maemo_tests.prf b/config.profiles/harmattan/tests/maemo_tests.prf<br/>new file mode 100644<br/>index 0000000..3bdb802<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/tests/maemo_tests.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/tests/maemo_tests.prf</a></div><div class='hunk'>@@ -0,0 +1,57 @@</div><div class='add'>+#############################################################################</div><div class='add'>+##</div><div class='add'>+## Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+## All rights reserved.</div><div class='add'>+## Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+##</div><div class='add'>+## This file is the build configuration utility of the Qt Toolkit.</div><div class='add'>+##</div><div class='add'>+## $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+## GNU Lesser General Public License Usage</div><div class='add'>+## This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+## License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+## appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+## file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+## General Public License version 2.1 requirements will be met:</div><div class='add'>+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+##</div><div class='add'>+## In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+## rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+##</div><div class='add'>+## GNU General Public License Usage</div><div class='add'>+## Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+## Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+## and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+## file. Please review the following information to ensure the GNU General</div><div class='add'>+## Public License version 3.0 requirements will be met:</div><div class='add'>+## http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+##</div><div class='add'>+## Other Usage</div><div class='add'>+## Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+## conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+##</div><div class='add'>+##</div><div class='add'>+##</div><div class='add'>+##</div><div class='add'>+##</div><div class='add'>+## $QT_END_LICENSE$</div><div class='add'>+##</div><div class='add'>+#############################################################################</div><div class='add'>+</div><div class='add'>+load(qttest_p4)</div><div class='add'>+</div><div class='add'>+installtests.CONFIG = recursive</div><div class='add'>+!contains(TEMPLATE, subdirs): for(install_set, INSTALLS) {</div><div class='add'>+    contains(install_set, target) {</div><div class='add'>+         installtests.commands += echo $${target.path}/$${TARGET} &gt;&gt; \$(QTM_TEST_INSTALL_FILE) ;</div><div class='add'>+    } else {</div><div class='add'>+         install_set_path=$$member($${install_set}.path)</div><div class='add'>+         installtests.commands += echo $${install_set_path} &gt;&gt; \$(QTM_TEST_INSTALL_FILE) ;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QMAKE_EXTRA_TARGETS += installtests</div><div class='add'>+</div><div class='add'>+DEFINES -= $$find(DEFINES, SRCDIR.*)</div><div class='add'>+DEFINES += SRCDIR=\\\"$${target.path}\\\"</div><div class='head'>diff --git a/config.profiles/harmattan/tests/qt4-acceptance-tests.pro b/config.profiles/harmattan/tests/qt4-acceptance-tests.pro<br/>new file mode 100644<br/>index 0000000..4549f7a<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/tests/qt4-acceptance-tests.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/tests/qt4-acceptance-tests.pro</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+#Acceptance tests</div><div class='add'>+TEMPLATE = subdirs</div><div class='add'>+SUBDIRS += qdbusconnection \</div><div class='add'>+    qhash \</div><div class='add'>+    qlist \</div><div class='add'>+    qmap</div><div class='head'>diff --git a/config.profiles/harmattan/tests/qt4-maemo-auto-tests.pro b/config.profiles/harmattan/tests/qt4-maemo-auto-tests.pro<br/>new file mode 100644<br/>index 0000000..bd218f5<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/tests/qt4-maemo-auto-tests.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/tests/qt4-maemo-auto-tests.pro</a></div><div class='hunk'>@@ -0,0 +1,44 @@</div><div class='add'>+#Staging tests that require no data or style ibfo</div><div class='add'>+TEMPLATE = subdirs</div><div class='add'>+SUBDIRS += qdbusabstractadaptor \</div><div class='add'>+           qdbusabstractinterface \</div><div class='add'>+           qdbuscontext \</div><div class='add'>+           qdbusinterface \</div><div class='add'>+           qdbuslocalcalls \</div><div class='add'>+           qdbusmetaobject \</div><div class='add'>+           qdbusmetatype \</div><div class='add'>+           qdbuspendingcall \</div><div class='add'>+           qdbuspendingreply \</div><div class='add'>+           qdbusreply \</div><div class='add'>+           qdbusservicewatcher \</div><div class='add'>+           qdbusthreading \</div><div class='add'>+           qdbusxmlparser \</div><div class='add'>+           qdebug \</div><div class='add'>+           qeventloop \</div><div class='add'>+           qmutexlocker \</div><div class='add'>+           qnetworkaddressentry \</div><div class='add'>+           qnetworkproxy \</div><div class='add'>+           qnetworkrequest \</div><div class='add'>+           qnetworkcookie \</div><div class='add'>+           qnetworkcookiejar \</div><div class='add'>+           qobjectrace \</div><div class='add'>+           qpainterpathstroker \</div><div class='add'>+           qpen \</div><div class='add'>+           qpoint \</div><div class='add'>+           qpolygon \</div><div class='add'>+           qquaternion \</div><div class='add'>+           qqueue \</div><div class='add'>+           qrand \</div><div class='add'>+           qreadlocker \</div><div class='add'>+           qreadwritelock \</div><div class='add'>+           qrect \</div><div class='add'>+           qringbuffer \</div><div class='add'>+           qscopedpointer \</div><div class='add'>+           qscriptclass \</div><div class='add'>+           qscriptcontextinfo \</div><div class='add'>+           qscriptstring \</div><div class='add'>+           qscriptvalueiterator \</div><div class='add'>+           qsequentialanimationgroup \</div><div class='add'>+           qset \</div><div class='add'>+           qwaitcondition</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/harmattan/tests/tests.xml b/config.profiles/harmattan/tests/tests.xml<br/>new file mode 100644<br/>index 0000000..e276bfa<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/tests/tests.xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/tests/tests.xml</a></div><div class='hunk'>@@ -0,0 +1,320 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;</div><div class='add'>+&lt;testdefinition version="1.0"&gt;</div><div class='add'>+  &lt;suite domain="Application framework" level="Component" name="qt4-acceptance-tests" type="Functional"&gt;</div><div class='add'>+    &lt;description /&gt;</div><div class='add'>+    &lt;set feature="qt" level="Component" name="acceptance_tst_qhash" type="Functional"&gt;</div><div class='add'>+      &lt;description&gt;qt4-acceptance-tests:tst_qhash&lt;/description&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-insert1" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:insert1&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash insert1&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-erase" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:erase&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash erase&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-key" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:key&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash key&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-count" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:count&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash count&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-clear" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:clear&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash clear&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-empty" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:empty&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash empty&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-find" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:find&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash find&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-constFind" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:constFind&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash constFind&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-contains" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:contains&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash contains&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-take" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:take&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash take&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-operator_eq" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:operator_eq&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash operator_eq&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-rehash_isnt_quadratic" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:rehash_isnt_quadratic&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash rehash_isnt_quadratic&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-dont_need_default_constructor" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:dont_need_default_constructor&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash dont_need_default_constructor&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-qhash" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:qhash&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash qhash&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-qmultihash_specific" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:qmultihash_specific&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash qmultihash_specific&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-compare" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:compare&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash compare&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-compare2" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:compare2&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash compare2&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-iterators" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:iterators&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash iterators&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-keys_values_uniqueKeys" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:keys_values_uniqueKeys&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash keys_values_uniqueKeys&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qhash-noNeedlessRehashes" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qhash:noNeedlessRehashes&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qhash noNeedlessRehashes&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;environments&gt;</div><div class='add'>+        &lt;scratchbox&gt;true&lt;/scratchbox&gt;</div><div class='add'>+        &lt;hardware&gt;true&lt;/hardware&gt;</div><div class='add'>+      &lt;/environments&gt;</div><div class='add'>+    &lt;/set&gt;</div><div class='add'>+    &lt;set feature="qt" level="Component" name="acceptance_tst_qdbusconnection" type="Functional"&gt;</div><div class='add'>+      &lt;description&gt;qt4-acceptance-tests:tst_qdbusconnection&lt;/description&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qdbusconnection-noConnection" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qdbusconnection:noConnection&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qdbusconnection noConnection&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qdbusconnection-connectToBus" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qdbusconnection:connectToBus&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qdbusconnection connectToBus&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qdbusconnection-connect" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qdbusconnection:connect&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qdbusconnection connect&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qdbusconnection-send" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qdbusconnection:send&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qdbusconnection send&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qdbusconnection-sendAsync" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qdbusconnection:sendAsync&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qdbusconnection sendAsync&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qdbusconnection-sendSignal" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qdbusconnection:sendSignal&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qdbusconnection sendSignal&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qdbusconnection-registerObject" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qdbusconnection:registerObject&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qdbusconnection registerObject&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qdbusconnection-registerObject2" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qdbusconnection:registerObject2&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qdbusconnection registerObject2&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qdbusconnection-registerQObjectChildren" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qdbusconnection:registerQObjectChildren&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qdbusconnection registerQObjectChildren&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qdbusconnection-callSelf" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qdbusconnection:callSelf&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qdbusconnection callSelf&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qdbusconnection-callSelfByAnotherName" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qdbusconnection:callSelfByAnotherName&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qdbusconnection callSelfByAnotherName&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qdbusconnection-multipleInterfacesInQObject" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qdbusconnection:multipleInterfacesInQObject&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qdbusconnection multipleInterfacesInQObject&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qdbusconnection-slotsWithLessParameters" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qdbusconnection:slotsWithLessParameters&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qdbusconnection slotsWithLessParameters&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;environments&gt;</div><div class='add'>+        &lt;scratchbox&gt;true&lt;/scratchbox&gt;</div><div class='add'>+        &lt;hardware&gt;true&lt;/hardware&gt;</div><div class='add'>+      &lt;/environments&gt;</div><div class='add'>+    &lt;/set&gt;</div><div class='add'>+    &lt;set feature="qt" level="Component" name="acceptance_tst_qaction" type="Functional"&gt;</div><div class='add'>+      &lt;description&gt;qt4-acceptance-tests:tst_qaction&lt;/description&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qaction-getSetCheck" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qaction:getSetCheck&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qaction getSetCheck&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qaction-setText" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qaction:setText&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qaction setText&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qaction-setIconText" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qaction:setIconText&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qaction setIconText&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qaction-actionEvent" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qaction:actionEvent&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qaction actionEvent&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qaction-setStandardKeys" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qaction:setStandardKeys&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qaction setStandardKeys&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qaction-alternateShortcuts" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qaction:alternateShortcuts&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qaction alternateShortcuts&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qaction-enabledVisibleInteraction" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qaction:enabledVisibleInteraction&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qaction enabledVisibleInteraction&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qaction-task200823_tooltip" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qaction:task200823_tooltip&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qaction task200823_tooltip&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qaction-task229128TriggeredSignalWithoutActiongroup" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qaction:task229128TriggeredSignalWithoutActiongroup&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qaction task229128TriggeredSignalWithoutActiongroup&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qaction-task229128TriggeredSignalWhenInActiongroup" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qaction:task229128TriggeredSignalWhenInActiongroup&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qaction task229128TriggeredSignalWhenInActiongroup&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;environments&gt;</div><div class='add'>+        &lt;scratchbox&gt;true&lt;/scratchbox&gt;</div><div class='add'>+        &lt;hardware&gt;true&lt;/hardware&gt;</div><div class='add'>+      &lt;/environments&gt;</div><div class='add'>+    &lt;/set&gt;</div><div class='add'>+    &lt;set feature="qt" level="Component" name="acceptance_tst_qlist" type="Functional"&gt;</div><div class='add'>+      &lt;description&gt;qt4-acceptance-tests:tst_qlist&lt;/description&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qlist-length" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qlist:length&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qlist length&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qlist-lengthSignature" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qlist:lengthSignature&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qlist lengthSignature&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qlist-append" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qlist:append&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qlist append&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;environments&gt;</div><div class='add'>+        &lt;scratchbox&gt;true&lt;/scratchbox&gt;</div><div class='add'>+        &lt;hardware&gt;true&lt;/hardware&gt;</div><div class='add'>+      &lt;/environments&gt;</div><div class='add'>+    &lt;/set&gt;</div><div class='add'>+    &lt;set feature="qt" level="Component" name="acceptance_tst_qgraphicslayout" type="Functional"&gt;</div><div class='add'>+      &lt;description&gt;qt4-acceptance-tests:tst_qgraphicslayout&lt;/description&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qgraphicslayout-sizeHints" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qgraphicslayout:sizeHints&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qgraphicslayout sizeHints&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qgraphicslayout-compressLayoutRequest" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qgraphicslayout:compressLayoutRequest&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qgraphicslayout compressLayoutRequest&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qgraphicslayout-automaticReparenting" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qgraphicslayout:automaticReparenting&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qgraphicslayout automaticReparenting&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qgraphicslayout-verifyActivate" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qgraphicslayout:verifyActivate&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qgraphicslayout verifyActivate&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qgraphicslayout-constructors" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qgraphicslayout:constructors&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qgraphicslayout constructors&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qgraphicslayout-alternativeLayoutItems" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qgraphicslayout:alternativeLayoutItems&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qgraphicslayout alternativeLayoutItems&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qgraphicslayout-ownership" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qgraphicslayout:ownership&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qgraphicslayout ownership&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;environments&gt;</div><div class='add'>+        &lt;scratchbox&gt;true&lt;/scratchbox&gt;</div><div class='add'>+        &lt;hardware&gt;true&lt;/hardware&gt;</div><div class='add'>+      &lt;/environments&gt;</div><div class='add'>+    &lt;/set&gt;</div><div class='add'>+    &lt;set feature="qt" level="Component" name="acceptance_tst_qmap" type="Functional"&gt;</div><div class='add'>+      &lt;description&gt;qt4-acceptance-tests:tst_qmap&lt;/description&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qmap-count" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qmap:count&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qmap count&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qmap-clear" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qmap:clear&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qmap clear&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qmap-beginEnd" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qmap:beginEnd&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qmap beginEnd&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qmap-key" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qmap:key&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qmap key&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qmap-operator_eq" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qmap:operator_eq&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qmap operator_eq&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qmap-empty" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qmap:empty&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qmap empty&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qmap-contains" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qmap:contains&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qmap contains&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qmap-find" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qmap:find&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qmap find&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qmap-constFind" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qmap:constFind&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qmap constFind&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qmap-lowerUpperBound" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qmap:lowerUpperBound&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qmap lowerUpperBound&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qmap-mergeCompare" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qmap:mergeCompare&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qmap mergeCompare&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qmap-take" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qmap:take&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qmap take&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qmap-iterators" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qmap:iterators&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qmap iterators&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qmap-keys_values_uniqueKeys" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qmap:keys_values_uniqueKeys&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qmap keys_values_uniqueKeys&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;case level="Component" name="tst_qmap-qmultimap_specific" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;qt4-acceptance-tests:tst_qmap:qmultimap_specific&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;/usr/tests/qt4/tst_qmap qmultimap_specific&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;environments&gt;</div><div class='add'>+        &lt;scratchbox&gt;true&lt;/scratchbox&gt;</div><div class='add'>+        &lt;hardware&gt;true&lt;/hardware&gt;</div><div class='add'>+      &lt;/environments&gt;</div><div class='add'>+    &lt;/set&gt;</div><div class='add'>+  &lt;/suite&gt;</div><div class='add'>+&lt;/testdefinition&gt;</div><div class='head'>diff --git a/config.profiles/harmattan/tests/testset.txt b/config.profiles/harmattan/tests/testset.txt<br/>new file mode 100644<br/>index 0000000..62de93d<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/tests/testset.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/tests/testset.txt</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+    &lt;set feature="qt" level="Component" name="##Package-name_test_name##" type="Functional"&gt;</div><div class='add'>+      &lt;description&gt;##Package-name:test_name##&lt;/description&gt;</div><div class='add'>+      &lt;case level="Component" name="##tst_foo##" type="Functional"&gt;</div><div class='add'>+        &lt;description&gt;##Package-name:test_name##&lt;/description&gt;</div><div class='add'>+        &lt;step&gt;##/usr/tests/qtm/tst_foo##&lt;/step&gt;</div><div class='add'>+      &lt;/case&gt;</div><div class='add'>+      &lt;environments&gt;</div><div class='add'>+        &lt;scratchbox&gt;true&lt;/scratchbox&gt;</div><div class='add'>+        &lt;hardware&gt;true&lt;/hardware&gt;</div><div class='add'>+      &lt;/environments&gt;</div><div class='add'>+    &lt;/set&gt;</div><div class='head'>diff --git a/config.profiles/harmattan/tests/testsuite_footer.txt b/config.profiles/harmattan/tests/testsuite_footer.txt<br/>new file mode 100644<br/>index 0000000..8c71c93<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/tests/testsuite_footer.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/tests/testsuite_footer.txt</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+  &lt;/suite&gt;</div><div class='add'>+&lt;/testdefinition&gt;</div><div class='head'>diff --git a/config.profiles/harmattan/tests/testsuite_header.txt b/config.profiles/harmattan/tests/testsuite_header.txt<br/>new file mode 100644<br/>index 0000000..4c57f76<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/harmattan/tests/testsuite_header.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/harmattan/tests/testsuite_header.txt</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;</div><div class='add'>+&lt;testdefinition version="1.0"&gt;</div><div class='add'>+  &lt;suite domain="Application framework" level="Component" name="##Add your name here##" type="Functional"&gt;</div><div class='add'>+    &lt;description /&gt;</div><div class='head'>diff --git a/config.profiles/symbian/bld.inf b/config.profiles/symbian/bld.inf<br/>new file mode 100644<br/>index 0000000..6ccb11c<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/bld.inf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/bld.inf</a></div><div class='hunk'>@@ -0,0 +1,84 @@</div><div class='add'>+/*</div><div class='add'>+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+* All rights reserved.</div><div class='add'>+*</div><div class='add'>+* Description:  Build information file for Qt configuration</div><div class='add'>+*</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#include &lt;platform_paths.hrh&gt;</div><div class='add'>+</div><div class='add'>+PRJ_PLATFORMS</div><div class='add'>+TOOLS2</div><div class='add'>+</div><div class='add'>+PRJ_EXPORTS</div><div class='add'>+qtconfig.xml /epoc32/tools/makefile_templates/qt/qtconfig.xml</div><div class='add'>+qtconfig.flm /epoc32/tools/makefile_templates/qt/qtconfig.flm</div><div class='add'>+</div><div class='add'>+../../mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm /epoc32/tools/makefile_templates/qt/</div><div class='add'>+../../mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm /epoc32/tools/makefile_templates/qt/</div><div class='add'>+../../mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm /epoc32/tools/makefile_templates/qt/</div><div class='add'>+../../mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm /epoc32/tools/makefile_templates/qt/</div><div class='add'>+../../mkspecs/symbian-sbsv2/flm/qt/qt.xml /epoc32/tools/makefile_templates/qt/</div><div class='add'>+</div><div class='add'>+qt.conf    /epoc32/tools/qt.conf</div><div class='add'>+</div><div class='add'>+/* export platform specific configuration */</div><div class='add'>+</div><div class='add'>+platform_paths.prf /epoc32/include/</div><div class='add'>+data_caging_paths.prf /epoc32/include/</div><div class='add'>+non_foundation_paths.prf /epoc32/include/</div><div class='add'>+</div><div class='add'>+environment.prf /epoc32/tools/qt/mkspecs/features/environment.prf</div><div class='add'>+</div><div class='add'>+//for loc</div><div class='add'>+loc.prf                  /epoc32/tools/qt/mkspecs/features/loc.prf</div><div class='add'>+</div><div class='add'>+#ifdef FF_QT_IN_UDA</div><div class='add'>+//For UDA image</div><div class='add'>+confml/qt.confml                  CONFML_EXPORT_PATH(qt.confml,uda_content)</div><div class='add'>+implml/qt_copy.implml             CRML_EXPORT_PATH(qt_copy.implml,uda_content)</div><div class='add'>+qt.sisx                           CRML_EXPORT_PATH(../content/sis/,uda_content)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* export stub sis to enable eclipsing */</div><div class='add'>+qt_stub.sis                         /epoc32/data/z/system/install/qt_stub.sis</div><div class='add'>+</div><div class='add'>+//tools</div><div class='add'>+../../bin/createpackage.bat         /epoc32/tools/createpackage.bat</div><div class='add'>+../../bin/createpackage.pl          /epoc32/tools/createpackage.pl</div><div class='add'>+../../bin/patch_capabilities.bat    /epoc32/tools/patch_capabilities.bat</div><div class='add'>+../../bin/patch_capabilities.pl     /epoc32/tools/patch_capabilities.pl</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* export localization *.ts files */</div><div class='add'>+translations/qt_ur.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+translations/qt_fa.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+translations/qt_ar.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+translations/qt_he.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+</div><div class='add'>+translations/qt_fr_symbian.ts /epoc32/include/platform/qt/translations/qt_fr.ts</div><div class='add'>+translations/qt_pl_symbian.ts /epoc32/include/platform/qt/translations/qt_pl.ts</div><div class='add'>+translations/qt_ru_symbian.ts /epoc32/include/platform/qt/translations/qt_ru.ts</div><div class='add'>+translations/qt_zh_cn_symbian.ts /epoc32/include/platform/qt/translations/qt_zh_cn.ts</div><div class='add'>+translations/qt_zh_tw_symbian.ts /epoc32/include/platform/qt/translations/qt_zh_tw.ts</div><div class='add'>+</div><div class='add'>+../../translations/qt_ar.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+../../translations/qt_cs.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+../../translations/qt_da.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+../../translations/qt_de.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+../../translations/qt_es.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+../../translations/qt_gl.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+../../translations/qt_hu.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+../../translations/qt_ja.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+../../translations/qt_pt.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+../../translations/qt_sk.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+../../translations/qt_sl.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+../../translations/qt_sv.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+../../translations/qt_uk.ts /epoc32/include/platform/qt/translations/</div><div class='add'>+</div><div class='add'>+PRJ_EXTENSIONS</div><div class='add'>+START EXTENSION qt/qtconfig</div><div class='add'>+OPTION QT_ROOT ..</div><div class='add'>+OPTION OPTIONS -opensource -confirm-license -openvg -opengl-es-2 -script -no-scripttools -no-webkit -make make -graphicssystem openvg -phonon -phonon-backend -usedeffiles -dont-process -nomake examples -nomake demos -nomake tools -audio-backend -fpu softvfp+vfpv2</div><div class='add'>+END
\ No newline at end of file</div><div class='head'>diff --git a/config.profiles/symbian/confml/qt.confml b/config.profiles/symbian/confml/qt.confml<br/>new file mode 100644<br/>index 0000000..f5e9a49<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/confml/qt.confml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/confml/qt.confml</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='add'>+&lt;confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2"&gt;</div><div class='add'>+    &lt;confml:feature name="QT" ref="qt"&gt;</div><div class='add'>+        &lt;confml:desc&gt;QT settings&lt;/confml:desc&gt;</div><div class='add'>+        &lt;confml:setting name="QT enabled"</div><div class='add'>+                        ref="Enabled"</div><div class='add'>+                        type="boolean"&gt;</div><div class='add'>+            &lt;confml:desc&gt;To enable QT usage&lt;/confml:desc&gt;</div><div class='add'>+        &lt;/confml:setting&gt;</div><div class='add'>+    &lt;/confml:feature&gt;</div><div class='add'>+    &lt;confml:data&gt;</div><div class='add'>+        &lt;confml:qt&gt;</div><div class='add'>+            &lt;confml:Enabled&gt;true&lt;/confml:Enabled&gt;</div><div class='add'>+        &lt;/confml:qt&gt;</div><div class='add'>+    &lt;/confml:data&gt;</div><div class='add'>+&lt;/confml:configuration&gt;
\ No newline at end of file</div><div class='head'>diff --git a/config.profiles/symbian/data_caging_paths.prf b/config.profiles/symbian/data_caging_paths.prf<br/>new file mode 100644<br/>index 0000000..8bb0f79<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/data_caging_paths.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/data_caging_paths.prf</a></div><div class='hunk'>@@ -0,0 +1,71 @@</div><div class='add'>+#</div><div class='add'>+# ==============================================================================</div><div class='add'>+#  Name        : data_caging_paths.prf</div><div class='add'>+#  Part of     :</div><div class='add'>+#  Interface   : Data Caging Path Definitions API for Qt/S60</div><div class='add'>+#  Description : Paths specific to Symbian^3 and later</div><div class='add'>+#</div><div class='add'>+# Usage examples:</div><div class='add'>+#</div><div class='add'>+#     # Load these definitions on pro-file if needed:</div><div class='add'>+#     load(data_caging_paths)</div><div class='add'>+#</div><div class='add'>+#     # These variables are mostly useful when specifying deployment</div><div class='add'>+#</div><div class='add'>+#     myLib.sources = myLib.dll</div><div class='add'>+#     myLib.path = $$SHARED_LIB_DIR</div><div class='add'>+#     DEPLOYMENT += myLib</div><div class='add'>+#</div><div class='add'>+#     # Note: Do not use $$PLUGINS_DIR or $$PLUGINS_1_DIR to deploy Qt plugins.</div><div class='add'>+#     # $$QT_PUBLIC_PLUGINS_BASE specifies the public base directory for Qt</div><div class='add'>+#     # plugin stubs:</div><div class='add'>+#</div><div class='add'>+#     myPublicImageFormatPlugin.sources = myImageFormat.dll</div><div class='add'>+#     myPublicImageFormatPlugin.path = $$QT_PLUGINS_BASE_DIR/imageformats</div><div class='add'>+#     DEPLOYMENT += myPublicImageFormatPlugin</div><div class='add'>+#</div><div class='add'>+# ==============================================================================</div><div class='add'>+</div><div class='add'>+APPARC_RECOGNISER_RESOURCES_DIR  = /resource/apps/registrationresourcefiles</div><div class='add'>+APP_BITMAP_DIR                   = /resource/apps</div><div class='add'>+APP_RESOURCE_DIR                 = /resource/apps</div><div class='add'>+BITMAP_DIR                       = /resource/apps</div><div class='add'>+BIOFILE_DIR                      = /resource/messaging/bif</div><div class='add'>+CHARCONV_PLUGIN_DIR              = /resource/charconv</div><div class='add'>+CONTACTS_RESOURCE_DIR            = /resource/cntmodel</div><div class='add'>+CTRL_PANEL_RESOURCE_DIR          = /resource/controls</div><div class='add'>+CONVERTER_PLUGIN_RESOURCE_DIR    = /resource/convert</div><div class='add'>+ECOM_RESOURCE_DIR                = /resource/plugins</div><div class='add'>+ERROR_RESOURCE_DIR               = /resource/errors</div><div class='add'>+PROGRAMS_DIR                     = /sys/bin</div><div class='add'>+FEP_RESOURCES_DIR                = /resource/fep</div><div class='add'>+HELP_FILE_DIR                    = /resource/help</div><div class='add'>+LOG_ENGINE_RESOURCE_DIR          = /resource/logengine</div><div class='add'>+MTM_RESOURCE_DIR                 = /resource/messaging</div><div class='add'>+MTM_INFO_FILE_DIR                = /resource/messaging/mtm</div><div class='add'>+PRINTER_DRIVER_DIR               = /resource/printers</div><div class='add'>+SHARED_LIB_DIR                   = /sys/bin</div><div class='add'>+UIKLAF_RESOURCE_DIR              = /resource/uiklaf</div><div class='add'>+WAPPUSH_PLUGIN_RESOURCE_DIR      = /resource/messaging/wappush</div><div class='add'>+WATCHER_PLUGIN_RESOURCE_DIR      = /resource/messaging/watchers</div><div class='add'>+RECOGNISERS_DIR                  = /sys/bin</div><div class='add'>+PARSERS_DIR                      = /sys/bin</div><div class='add'>+NOTIFIERS_DIR                    = /sys/bin</div><div class='add'>+PLUGINS_DIR                      = /sys/bin</div><div class='add'>+PLUGINS_1_DIR                    = /sys/bin</div><div class='add'>+RESOURCE_FILES_DIR               = /resource</div><div class='add'>+</div><div class='add'>+CA_CERTIFICATES_DIR     = /private/101f72a6</div><div class='add'>+COMMDB_DIR              = /private/100012a5</div><div class='add'>+SS_CONFIG_FILE_DIR      = /private/101f7989/esock</div><div class='add'>+TRUSTED_FONTS_DIR       = /private/10003a16/fonts</div><div class='add'>+UNTRUSTED_FONT_DIR      = /private/10003a16/import/fonts</div><div class='add'>+WINDOW_SERVER_INI_DIR   = /private/10003b20</div><div class='add'>+SKINS_DIR               = /private/10207114</div><div class='add'>+BOOTDATA_DIR            = /resource/bootdata</div><div class='add'>+</div><div class='add'>+isEmpty(QT_PLUGINS_BASE_DIR): QT_PLUGINS_BASE_DIR = $$RESOURCE_FILES_DIR/qt$${QT_LIBINFIX}/plugins</div><div class='add'>+isEmpty(QT_IMPORTS_BASE_DIR): QT_IMPORTS_BASE_DIR = $$RESOURCE_FILES_DIR/qt/imports</div><div class='add'>+isEmpty(HW_ZDIR): HW_ZDIR = epoc32/data/z</div><div class='add'>+isEmpty(REG_RESOURCE_DIR): REG_RESOURCE_DIR = /private/10003a3f/apps</div><div class='add'>+isEmpty(REG_RESOURCE_IMPORT_DIR): REG_RESOURCE_IMPORT_DIR = /private/10003a3f/import/apps</div><div class='head'>diff --git a/config.profiles/symbian/environment.prf b/config.profiles/symbian/environment.prf<br/>new file mode 100644<br/>index 0000000..09ba90d<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/environment.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/environment.prf</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+# don't export SQLite on Symbian^3 onwards since it is already in the environment</div><div class='add'>+CONFIG *= symbian_no_export_sqlite</div><div class='add'>+</div><div class='add'>+# STL autodetection in clean builds not working, specify it explicitly</div><div class='add'>+CONFIG *= stl</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+S60_VERSION = 5.2</div><div class='add'>+SYMBIAN_VERSION = Symbian3
\ No newline at end of file</div><div class='head'>diff --git a/config.profiles/symbian/headerexport b/config.profiles/symbian/headerexport<br/>new file mode 100644<br/>index 0000000..e59979c<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/headerexport?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/headerexport</a></div><div class='hunk'>@@ -0,0 +1,977 @@</div><div class='add'>+#!/usr/bin/perl -w</div><div class='add'>+######################################################################</div><div class='add'>+#</div><div class='add'>+# Synchronizes Qt header files - internal development tool.</div><div class='add'>+#</div><div class='add'>+# Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+# Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+#</div><div class='add'>+######################################################################</div><div class='add'>+</div><div class='add'>+# use packages -------------------------------------------------------</div><div class='add'>+use File::Basename;</div><div class='add'>+use File::Path;</div><div class='add'>+use Cwd;</div><div class='add'>+use Config;</div><div class='add'>+use strict;</div><div class='add'>+</div><div class='add'>+for (my $i = 0; $i &lt; $#ARGV; $i++) {</div><div class='add'>+    if ($ARGV[$i] eq "-base-dir" &amp;&amp; $i &lt; $#ARGV - 1) {</div><div class='add'>+        $ENV{"QTDIR"} = $ARGV[$i + 1];</div><div class='add'>+        last;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+die "syncqt: QTDIR not defined" if ! $ENV{"QTDIR"}; # sanity check</div><div class='add'>+</div><div class='add'>+# global variables</div><div class='add'>+my $isunix = 0;</div><div class='add'>+my $basedir = $ENV{"QTDIR"};</div><div class='add'>+$basedir =~ s=\\=/=g;</div><div class='add'>+my %modules = ( # path to module name map</div><div class='add'>+        "QtGui" =&gt; "$basedir/src/gui",</div><div class='add'>+        "QtOpenGL" =&gt; "$basedir/src/opengl",</div><div class='add'>+        "QtOpenVG" =&gt; "$basedir/src/openvg",</div><div class='add'>+        "QtCore" =&gt; "$basedir/src/corelib",</div><div class='add'>+        "QtXml" =&gt; "$basedir/src/xml",</div><div class='add'>+        "QtXmlPatterns" =&gt; "$basedir/src/xmlpatterns",</div><div class='add'>+        "QtSql" =&gt; "$basedir/src/sql",</div><div class='add'>+        "QtNetwork" =&gt; "$basedir/src/network",</div><div class='add'>+        "QtSvg" =&gt; "$basedir/src/svg",</div><div class='add'>+        "QtDeclarative" =&gt; "$basedir/src/declarative",</div><div class='add'>+        "QtScript" =&gt; "$basedir/src/script",</div><div class='add'>+        "QtScriptTools" =&gt; "$basedir/src/scripttools",</div><div class='add'>+        "Qt3Support" =&gt; "$basedir/src/qt3support",</div><div class='add'>+        "ActiveQt" =&gt; "$basedir/src/activeqt",</div><div class='add'>+        "QtTest" =&gt; "$basedir/src/testlib",</div><div class='add'>+        "QtHelp" =&gt; "$basedir/tools/assistant/lib",</div><div class='add'>+        "QtDesigner" =&gt; "$basedir/tools/designer/src/lib",</div><div class='add'>+        "QtUiTools" =&gt; "$basedir/tools/designer/src/uitools",</div><div class='add'>+        "QtDBus" =&gt; "$basedir/src/dbus",</div><div class='add'>+        "phonon" =&gt; "$basedir/src/phonon",</div><div class='add'>+        "QtMultimedia" =&gt; "$basedir/src/multimedia",</div><div class='add'>+        "QtMeeGoGraphicsSystemHelper" =&gt; "$basedir/tools/qmeegographicssystemhelper",</div><div class='add'>+);</div><div class='add'>+my %moduleheaders = ( # restrict the module headers to those found in relative path</div><div class='add'>+        "QtWebKit" =&gt; "../WebKit/qt/Api",</div><div class='add'>+        "phonon" =&gt; "../3rdparty/phonon/phonon",</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+#$modules{"QtCore"} .= ";$basedir/mkspecs/" . $ENV{"MKSPEC"} if defined $ENV{"MKSPEC"};</div><div class='add'>+</div><div class='add'>+# global variables (modified by options)</div><div class='add'>+my $force_win = 0;</div><div class='add'>+my $check_includes = 0;</div><div class='add'>+my $create_uic_class_map = 1;</div><div class='add'>+my @modules_to_sync ;</div><div class='add'>+my $out_basedir = $basedir;</div><div class='add'>+$out_basedir =~ s=\\=/=g;</div><div class='add'>+</div><div class='add'>+# functions ----------------------------------------------------------</div><div class='add'>+</div><div class='add'>+######################################################################</div><div class='add'>+# Syntax:  showUsage()</div><div class='add'>+# Params:  -none-</div><div class='add'>+#</div><div class='add'>+# Purpose: Show the usage of the script.</div><div class='add'>+# Returns: -none-</div><div class='add'>+######################################################################</div><div class='add'>+sub showUsage</div><div class='add'>+{</div><div class='add'>+    print "$0 usage:\n";</div><div class='add'>+    print "  -windows              Force platform to Windows          (default: " . ($force_win ? "yes" : "no") . ")\n";</div><div class='add'>+    print "  -outdir &lt;PATH&gt;        Specify output directory for sync  (default: $out_basedir)\n";</div><div class='add'>+    print "  -help                 This help\n";</div><div class='add'>+    exit 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+######################################################################</div><div class='add'>+# Syntax:  checkUnix()</div><div class='add'>+# Params:  -none-</div><div class='add'>+#</div><div class='add'>+# Purpose: Check if script runs on a Unix system or not. Cygwin</div><div class='add'>+#          systems are _not_ detected as Unix systems.</div><div class='add'>+# Returns: 1 if a unix system, else 0.</div><div class='add'>+######################################################################</div><div class='add'>+sub checkUnix {</div><div class='add'>+    my ($r) = 0;</div><div class='add'>+    if ( $force_win != 0) {</div><div class='add'>+        return 0;</div><div class='add'>+    } elsif ( -f "/bin/uname" ) {</div><div class='add'>+        $r = 1;</div><div class='add'>+        (-f "\\bin\\uname") &amp;&amp; ($r = 0);</div><div class='add'>+    } elsif ( -f "/usr/bin/uname" ) {</div><div class='add'>+        $r = 1;</div><div class='add'>+        (-f "\\usr\\bin\\uname") &amp;&amp; ($r = 0);</div><div class='add'>+    }</div><div class='add'>+    if($r) {</div><div class='add'>+        $_ = $Config{'osname'};</div><div class='add'>+        $r = 0 if( /(ms)|(cyg)win/i );</div><div class='add'>+    }</div><div class='add'>+    return $r;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+sub checkRelative {</div><div class='add'>+    my ($dir) = @_;</div><div class='add'>+    return 0 if($dir =~ /^\//);</div><div class='add'>+    return 0 if(!checkUnix() &amp;&amp; $dir =~ /[a-zA-Z]:[\/\\]/);</div><div class='add'>+    return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+######################################################################</div><div class='add'>+# Syntax:  shouldMasterInclude(iheader)</div><div class='add'>+# Params:  iheader, string, filename to verify inclusion</div><div class='add'>+#</div><div class='add'>+# Purpose: Determines if header should be in the master include file.</div><div class='add'>+# Returns: 0 if file contains "#pragma qt_no_master_include" or not</div><div class='add'>+#          able to open, else 1.</div><div class='add'>+######################################################################</div><div class='add'>+sub shouldMasterInclude {</div><div class='add'>+    my ($iheader) = @_;</div><div class='add'>+    return 0 if(basename($iheader) =~ /_/);</div><div class='add'>+    return 0 if(basename($iheader) =~ /qconfig/);</div><div class='add'>+    if(open(F, "&lt;$iheader")) {</div><div class='add'>+        while(&lt;F&gt;) {</div><div class='add'>+            chomp;</div><div class='add'>+            return 0 if(/^\#pragma qt_no_master_include$/);</div><div class='add'>+        }</div><div class='add'>+        close(F);</div><div class='add'>+    } else {</div><div class='add'>+        return 0;</div><div class='add'>+    }</div><div class='add'>+    return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+######################################################################</div><div class='add'>+# Syntax:  classNames(iheader)</div><div class='add'>+# Params:  iheader, string, filename to parse for classname "symlinks"</div><div class='add'>+#</div><div class='add'>+# Purpose: Scans through iheader to find all classnames that should be</div><div class='add'>+#          synced into library's include structure.</div><div class='add'>+# Returns: List of all class names in a file.</div><div class='add'>+######################################################################</div><div class='add'>+sub classNames {</div><div class='add'>+    my @ret;</div><div class='add'>+    my ($iheader) = @_;</div><div class='add'>+    if(basename($iheader) eq "qglobal.h") {</div><div class='add'>+        push @ret, "QtGlobal";</div><div class='add'>+    } elsif(basename($iheader) eq "qendian.h") {</div><div class='add'>+        push @ret, "QtEndian";</div><div class='add'>+    } elsif(basename($iheader) eq "qconfig.h") {</div><div class='add'>+        push @ret, "QtConfig";</div><div class='add'>+    } elsif(basename($iheader) eq "qplugin.h") {</div><div class='add'>+        push @ret, "QtPlugin";</div><div class='add'>+    } elsif(basename($iheader) eq "qalgorithms.h") {</div><div class='add'>+        push @ret, "QtAlgorithms";</div><div class='add'>+    } elsif(basename($iheader) eq "qcontainerfwd.h") {</div><div class='add'>+        push @ret, "QtContainerFwd";</div><div class='add'>+    } elsif(basename($iheader) eq "qdebug.h") {</div><div class='add'>+        push @ret, "QtDebug";</div><div class='add'>+    } elsif(basename($iheader) eq "qevent.h") {</div><div class='add'>+        push @ret, "QtEvents";</div><div class='add'>+    } elsif(basename($iheader) eq "qnamespace.h") {</div><div class='add'>+        push @ret, "Qt"</div><div class='add'>+    } elsif(basename($iheader) eq "qssl.h") {</div><div class='add'>+        push @ret, "QSsl";</div><div class='add'>+    } elsif(basename($iheader) eq "qtest.h") {</div><div class='add'>+        push @ret, "QTest"</div><div class='add'>+    } elsif(basename($iheader) eq "qtconcurrentmap.h") {</div><div class='add'>+        push @ret, "QtConcurrentMap"</div><div class='add'>+    } elsif(basename($iheader) eq "qtconcurrentfilter.h") {</div><div class='add'>+        push @ret, "QtConcurrentFilter"</div><div class='add'>+    } elsif(basename($iheader) eq "qtconcurrentrun.h") {</div><div class='add'>+        push @ret, "QtConcurrentRun"</div><div class='add'>+    } elsif(basename($iheader) eq "qaudio.h") {</div><div class='add'>+        push @ret, "QAudio"</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    my $parsable = "";</div><div class='add'>+    if(open(F, "&lt;$iheader")) {</div><div class='add'>+        while(&lt;F&gt;) {</div><div class='add'>+            my $line = $_;</div><div class='add'>+            chomp $line;</div><div class='add'>+                        chop $line if ($line =~ /\r$/);</div><div class='add'>+            if($line =~ /^\#/) {</div><div class='add'>+                if($line =~ /\\$/) {</div><div class='add'>+                    while($line = &lt;F&gt;) {</div><div class='add'>+                        chomp $line;</div><div class='add'>+                        last unless($line =~ /\\$/);</div><div class='add'>+                    }</div><div class='add'>+                }</div><div class='add'>+                return @ret if($line =~ m/^#pragma qt_sync_stop_processing/);</div><div class='add'>+                push(@ret, $1) if($line =~ m/^#pragma qt_class\(([^)]*)\)[\r\n]*$/);</div><div class='add'>+                $line = 0;</div><div class='add'>+            }</div><div class='add'>+            if($line) {</div><div class='add'>+                $line =~ s,//.*$,,; #remove c++ comments</div><div class='add'>+                $line .= ";" if($line =~ m/^Q_[A-Z_]*\(.*\)[\r\n]*$/); #qt macro</div><div class='add'>+                $line .= ";" if($line =~ m/^QT_(BEGIN|END)_HEADER[\r\n]*$/); #qt macro</div><div class='add'>+                $line .= ";" if($line =~ m/^QT_(BEGIN|END)_NAMESPACE[\r\n]*$/); #qt macro</div><div class='add'>+                $line .= ";" if($line =~ m/^QT_MODULE\(.*\)[\r\n]*$/); # QT_MODULE macro</div><div class='add'>+                $parsable .= " " . $line;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        close(F);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    my $last_definition = 0;</div><div class='add'>+    my @namespaces;</div><div class='add'>+    for(my $i = 0; $i &lt; length($parsable); $i++) {</div><div class='add'>+        my $definition = 0;</div><div class='add'>+        my $character = substr($parsable, $i, 1);</div><div class='add'>+        if($character eq "/" &amp;&amp; substr($parsable, $i+1, 1) eq "*") { #I parse like this for greedy reasons</div><div class='add'>+            for($i+=2; $i &lt; length($parsable); $i++) {</div><div class='add'>+                my $end = substr($parsable, $i, 2);</div><div class='add'>+                if($end eq "*/") {</div><div class='add'>+                    $last_definition = $i+2;</div><div class='add'>+                    $i++;</div><div class='add'>+                    last;</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+        } elsif($character eq "{") {</div><div class='add'>+            my $brace_depth = 1;</div><div class='add'>+            my $block_start = $i + 1;</div><div class='add'>+          BLOCK: for($i+=1; $i &lt; length($parsable); $i++) {</div><div class='add'>+              my $ignore = substr($parsable, $i, 1);</div><div class='add'>+              if($ignore eq "{") {</div><div class='add'>+                  $brace_depth++;</div><div class='add'>+              } elsif($ignore eq "}") {</div><div class='add'>+                  $brace_depth--;</div><div class='add'>+                  unless($brace_depth) {</div><div class='add'>+                      for(my $i2 = $i+1; $i2 &lt; length($parsable); $i2++) {</div><div class='add'>+                          my $end = substr($parsable, $i2, 1);</div><div class='add'>+                          if($end eq ";" || $end ne " ") {</div><div class='add'>+                              $definition = substr($parsable, $last_definition, $block_start - $last_definition) . "}";</div><div class='add'>+                              $i = $i2 if($end eq ";");</div><div class='add'>+                              $last_definition = $i + 1;</div><div class='add'>+                              last BLOCK;</div><div class='add'>+                          }</div><div class='add'>+                      }</div><div class='add'>+                  }</div><div class='add'>+              }</div><div class='add'>+          }</div><div class='add'>+        } elsif($character eq ";") {</div><div class='add'>+            $definition = substr($parsable, $last_definition, $i - $last_definition + 1);</div><div class='add'>+            $last_definition = $i + 1;</div><div class='add'>+        } elsif($character eq "}") {</div><div class='add'>+            # a naked } must be a namespace ending</div><div class='add'>+            # if it's not a namespace, it's eaten by the loop above</div><div class='add'>+            pop @namespaces;</div><div class='add'>+            $last_definition = $i + 1;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if (substr($parsable, $last_definition, $i - $last_definition + 1) =~ m/ namespace ([^ ]*) /</div><div class='add'>+            &amp;&amp; substr($parsable, $i+1, 1) eq "{") {</div><div class='add'>+            push @namespaces, $1;</div><div class='add'>+</div><div class='add'>+            # Eat the opening { so that the condensing loop above doesn't see it</div><div class='add'>+            $i++;</div><div class='add'>+            $last_definition = $i + 1;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if($definition) {</div><div class='add'>+            $definition =~ s=[\n\r]==g;</div><div class='add'>+            my @symbols;</div><div class='add'>+            if($definition =~ m/^ *typedef *.*\(\*([^\)]*)\)\(.*\);$/) {</div><div class='add'>+                push @symbols, $1;</div><div class='add'>+            } elsif($definition =~ m/^ *typedef +(.*) +([^ ]*);$/) {</div><div class='add'>+                push @symbols, $2;</div><div class='add'>+            } elsif($definition =~ m/^ *(template *&lt;.*&gt; *)?(class|struct) +([^ ]* +)?([^&lt;\s]+) ?(&lt;[^&gt;]*&gt; ?)?\s*((,|:)\s*(public|protected|private) *.*)? *\{\}$/) {</div><div class='add'>+                push @symbols, $4;</div><div class='add'>+            } elsif($definition =~ m/^ *Q_DECLARE_.*ITERATOR\((.*)\);$/) {</div><div class='add'>+                push @symbols, "Q" . $1 . "Iterator";</div><div class='add'>+                push @symbols, "QMutable" . $1 . "Iterator";</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            foreach my $symbol (@symbols) {</div><div class='add'>+                $symbol = (join("::", @namespaces) . "::" . $symbol) if (scalar @namespaces);</div><div class='add'>+                push @ret, $symbol</div><div class='add'>+                    if ($symbol =~ /^Q[^:]*$/           # no-namespace, starting with Q</div><div class='add'>+                        || $symbol =~ /^Phonon::/);     # or in the Phonon namespace</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    return @ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+######################################################################</div><div class='add'>+# Syntax:  syncHeader(header, iheader, copy)</div><div class='add'>+# Params:  header, string, filename to create "symlink" for</div><div class='add'>+#          iheader, string, destination name of symlink</div><div class='add'>+#          copy, forces header to be a copy of iheader</div><div class='add'>+#</div><div class='add'>+# Purpose: Syncronizes header to iheader</div><div class='add'>+# Returns: 1 if successful, else 0.</div><div class='add'>+######################################################################</div><div class='add'>+sub syncHeader {</div><div class='add'>+    my ($header, $iheader, $copy) = @_;</div><div class='add'>+    $iheader =~ s=\\=/=g;</div><div class='add'>+    $header =~ s=\\=/=g;</div><div class='add'>+    return copyFile($iheader, $header) if($copy);</div><div class='add'>+</div><div class='add'>+    unless(-e $header) {</div><div class='add'>+        my $header_dir = dirname($header);</div><div class='add'>+        mkpath $header_dir;</div><div class='add'>+</div><div class='add'>+        #write it</div><div class='add'>+        my $iheader_out = fixPaths($iheader, $header_dir);</div><div class='add'>+        open HEADER, "&gt;$header" || die "Could not open $header for writing!\n";</div><div class='add'>+        print HEADER "#include \"$iheader_out\"\n";</div><div class='add'>+        close HEADER;</div><div class='add'>+        return 1;</div><div class='add'>+    }</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+######################################################################</div><div class='add'>+# Syntax:  fixPaths(file, dir)</div><div class='add'>+# Params:  file, string, filepath to be made relative to dir</div><div class='add'>+#          dir, string, dirpath for point of origin</div><div class='add'>+#</div><div class='add'>+# Purpose: file is made relative (if possible) of dir.</div><div class='add'>+# Returns: String with the above applied conversion.</div><div class='add'>+######################################################################</div><div class='add'>+sub fixPaths {</div><div class='add'>+    my ($file, $dir) = @_;</div><div class='add'>+    $dir =~ s=^$basedir/=$out_basedir/= if(!($basedir eq $out_basedir));</div><div class='add'>+    $file =~ s=\\=/=g;</div><div class='add'>+    $file =~ s/\+/\\+/g;</div><div class='add'>+    $dir =~ s=\\=/=g;</div><div class='add'>+    $dir =~ s/\+/\\+/g;</div><div class='add'>+</div><div class='add'>+    #setup</div><div class='add'>+    my $ret = $file;</div><div class='add'>+    $ret =~ s,/cygdrive/([a-zA-Z])/,$1:/,g;</div><div class='add'>+    my $file_dir = dirname($file);</div><div class='add'>+    if($file_dir eq ".") {</div><div class='add'>+        $file_dir = getcwd();</div><div class='add'>+        $file_dir =~ s=\\=/=g;</div><div class='add'>+    }</div><div class='add'>+    $file_dir =~ s,/cygdrive/([a-zA-Z])/,$1:/,g;</div><div class='add'>+    if($dir eq ".") {</div><div class='add'>+        $dir = getcwd();</div><div class='add'>+        $dir =~ s=\\=/=g;</div><div class='add'>+    }</div><div class='add'>+    $dir =~ s,/cygdrive/([a-zA-Z])/,$1:/,g;</div><div class='add'>+    return basename($file) if($file_dir eq $dir);</div><div class='add'>+</div><div class='add'>+    #guts</div><div class='add'>+    my $match_dir = 0;</div><div class='add'>+    for(my $i = 1; $i &lt; length($file_dir); $i++) {</div><div class='add'>+        my $slash = index($file_dir, "/", $i);</div><div class='add'>+        last if($slash == -1);</div><div class='add'>+        my $tmp = substr($file_dir, 0, $slash);</div><div class='add'>+        last unless($dir =~ m,^$tmp/,);</div><div class='add'>+        $match_dir = $tmp;</div><div class='add'>+        $i = $slash;</div><div class='add'>+    }</div><div class='add'>+    if($match_dir) {</div><div class='add'>+        my $after = substr($dir, length($match_dir));</div><div class='add'>+        my $count = ($after =~ tr,/,,);</div><div class='add'>+        my $dots = "";</div><div class='add'>+        for(my $i = 0; $i &lt; $count; $i++) {</div><div class='add'>+            $dots .= "../";</div><div class='add'>+        }</div><div class='add'>+        $ret =~ s,^$match_dir,$dots,;</div><div class='add'>+    }</div><div class='add'>+    $ret =~ s,/+,/,g;</div><div class='add'>+    return $ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+######################################################################</div><div class='add'>+# Syntax:  fileContents(filename)</div><div class='add'>+# Params:  filename, string, filename of file to return contents</div><div class='add'>+#</div><div class='add'>+# Purpose: Get the contents of a file.</div><div class='add'>+# Returns: String with contents of the file, or empty string if file</div><div class='add'>+#          doens't exist.</div><div class='add'>+# Warning: Dies if it does exist but script cannot get read access.</div><div class='add'>+######################################################################</div><div class='add'>+sub fileContents {</div><div class='add'>+    my ($filename) = @_;</div><div class='add'>+    my $filecontents = "";</div><div class='add'>+    if (-e $filename) {</div><div class='add'>+        open(I, "&lt; $filename") || die "Could not open $filename for reading, read block?";</div><div class='add'>+        local $/;</div><div class='add'>+        binmode I;</div><div class='add'>+        $filecontents = &lt;I&gt;;</div><div class='add'>+        close I;</div><div class='add'>+    }</div><div class='add'>+    return $filecontents;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+######################################################################</div><div class='add'>+# Syntax:  fileCompare(file1, file2)</div><div class='add'>+# Params:  file1, string, filename of first file</div><div class='add'>+#          file2, string, filename of second file</div><div class='add'>+#</div><div class='add'>+# Purpose: Determines if files are equal, and which one is newer.</div><div class='add'>+# Returns: 0 if files are equal no matter the timestamp, -1 if file1</div><div class='add'>+#          is newer, 1 if file2 is newer.</div><div class='add'>+######################################################################</div><div class='add'>+sub fileCompare {</div><div class='add'>+    my ($file1, $file2) = @_;</div><div class='add'>+    my $file1contents = fileContents($file1);</div><div class='add'>+    my $file2contents = fileContents($file2);</div><div class='add'>+    if (! -e $file1) { return 1; }</div><div class='add'>+    if (! -e $file2) { return -1; }</div><div class='add'>+    return $file1contents ne $file2contents ? (stat($file2))[9] &lt;=&gt; (stat($file1))[9] : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+######################################################################</div><div class='add'>+# Syntax:  copyFile(file, ifile)</div><div class='add'>+# Params:  file, string, filename to create duplicate for</div><div class='add'>+#          ifile, string, destination name of duplicate</div><div class='add'>+#</div><div class='add'>+# Purpose: Keeps files in sync so changes in the newer file will be</div><div class='add'>+#          written to the other.</div><div class='add'>+# Returns: 1 if files were synced, else 0.</div><div class='add'>+# Warning: Dies if script cannot get write access.</div><div class='add'>+######################################################################</div><div class='add'>+sub copyFile</div><div class='add'>+{</div><div class='add'>+    my ($file,$ifile, $copy,$knowdiff,$filecontents,$ifilecontents) = @_;</div><div class='add'>+</div><div class='add'>+    open( I, "&lt; " . $file ) || die "Could not open $file for reading";</div><div class='add'>+    local $/;</div><div class='add'>+    binmode I;</div><div class='add'>+    $filecontents = &lt;I&gt;;</div><div class='add'>+    close I;</div><div class='add'>+</div><div class='add'>+    my $ifile_dir = dirname($ifile);</div><div class='add'>+    mkpath $ifile_dir unless(-e $ifile_dir);</div><div class='add'>+    open(O, "&gt; " . $ifile) || die "Could not open $ifile for writing (no write permission?)";</div><div class='add'>+    local $/;</div><div class='add'>+    binmode O;</div><div class='add'>+    print O $filecontents;</div><div class='add'>+    close O;</div><div class='add'>+    return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+######################################################################</div><div class='add'>+# Syntax:  findFiles(dir, match, descend)</div><div class='add'>+# Params:  dir, string, directory to search for name</div><div class='add'>+#          match, string, regular expression to match in dir</div><div class='add'>+#          descend, integer, 0 = non-recursive search</div><div class='add'>+#                            1 = recurse search into subdirectories</div><div class='add'>+#</div><div class='add'>+# Purpose: Finds files matching a regular expression.</div><div class='add'>+# Returns: List of matching files.</div><div class='add'>+#</div><div class='add'>+# Examples:</div><div class='add'>+#   findFiles("/usr","\.cpp$",1)  - finds .cpp files in /usr and below</div><div class='add'>+#   findFiles("/tmp","^#",0)      - finds #* files in /tmp</div><div class='add'>+######################################################################</div><div class='add'>+sub findFiles {</div><div class='add'>+    my ($dir,$match,$descend) = @_;</div><div class='add'>+    my ($file,$p,@files);</div><div class='add'>+    local(*D);</div><div class='add'>+    $dir =~ s=\\=/=g;</div><div class='add'>+    ($dir eq "") &amp;&amp; ($dir = ".");</div><div class='add'>+    if ( opendir(D,$dir) ) {</div><div class='add'>+        if ( $dir eq "." ) {</div><div class='add'>+            $dir = "";</div><div class='add'>+        } else {</div><div class='add'>+            ($dir =~ /\/$/) || ($dir .= "/");</div><div class='add'>+        }</div><div class='add'>+        foreach $file ( sort readdir(D) ) {</div><div class='add'>+            next if ( $file  =~ /^\.\.?$/ );</div><div class='add'>+            $p = $file;</div><div class='add'>+            ($file =~ /$match/) &amp;&amp; (push @files, $p);</div><div class='add'>+            if ( $descend &amp;&amp; -d $p &amp;&amp; ! -l $p ) {</div><div class='add'>+                push @files, &amp;findFiles($p,$match,$descend);</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        closedir(D);</div><div class='add'>+    }</div><div class='add'>+    return @files;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# --------------------------------------------------------------------</div><div class='add'>+# "main" function</div><div class='add'>+# --------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+while ( @ARGV ) {</div><div class='add'>+    my $var = 0;</div><div class='add'>+    my $val = 0;</div><div class='add'>+</div><div class='add'>+    #parse</div><div class='add'>+    my $arg = shift @ARGV;</div><div class='add'>+    if ($arg eq "-h" || $arg eq "-help" || $arg eq "?") {</div><div class='add'>+        $var = "show_help";</div><div class='add'>+        $val = "yes";</div><div class='add'>+    } elsif($arg eq "-o" || $arg eq "-outdir") {</div><div class='add'>+        $var = "output";</div><div class='add'>+        $val = shift @ARGV;</div><div class='add'>+    } elsif($arg eq "-showonly" || $arg eq "-remove-stale" || $arg eq "-windows" ||</div><div class='add'>+            $arg eq "-relative" || $arg eq "-check-includes") {</div><div class='add'>+        $var = substr($arg, 1);</div><div class='add'>+        $val = "yes";</div><div class='add'>+    } elsif($arg =~ /^-no-(.*)$/) {</div><div class='add'>+        $var = $1;</div><div class='add'>+        $val = "no";</div><div class='add'>+        #these are for commandline compat</div><div class='add'>+    } elsif($arg eq "-inc") {</div><div class='add'>+        $var = "output";</div><div class='add'>+        $val = shift @ARGV;</div><div class='add'>+    } elsif($arg eq "-base-dir") {</div><div class='add'>+        # skip, it's been dealt with at the top of the file</div><div class='add'>+        shift @ARGV;</div><div class='add'>+        next;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    #do something</div><div class='add'>+    if(!$var || $var eq "show_help") {</div><div class='add'>+        print "Unknown option: $arg\n\n" if(!$var);</div><div class='add'>+        showUsage();</div><div class='add'>+    } elsif ($var eq "check-includes") {</div><div class='add'>+        if($val eq "yes") {</div><div class='add'>+            $check_includes++;</div><div class='add'>+        } elsif($check_includes) {</div><div class='add'>+            $check_includes--;</div><div class='add'>+        }</div><div class='add'>+    } elsif ($var eq "windows") {</div><div class='add'>+        if($val eq "yes") {</div><div class='add'>+            $force_win++;</div><div class='add'>+        } elsif($force_win) {</div><div class='add'>+            $force_win--;</div><div class='add'>+        }</div><div class='add'>+    } elsif ($var eq "output") {</div><div class='add'>+        my $outdir = $val;</div><div class='add'>+        if(checkRelative($outdir)) {</div><div class='add'>+            $out_basedir = getcwd();</div><div class='add'>+            chomp $out_basedir;</div><div class='add'>+            $out_basedir .= "/" . $outdir;</div><div class='add'>+        } else {</div><div class='add'>+            $out_basedir = $outdir;</div><div class='add'>+        }</div><div class='add'>+        # \ -&gt; /</div><div class='add'>+        $out_basedir =~ s=\\=/=g;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+@modules_to_sync = keys(%modules) if($#modules_to_sync == -1);</div><div class='add'>+</div><div class='add'>+$isunix = checkUnix; #cache checkUnix</div><div class='add'>+</div><div class='add'>+# create path</div><div class='add'>+mkpath "$out_basedir/include";</div><div class='add'>+mkpath "$out_basedir/mw/Qt";</div><div class='add'>+</div><div class='add'>+my @ignore_headers = ();</div><div class='add'>+my $class_lib_map_contents = "";</div><div class='add'>+my @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" );</div><div class='add'>+my @ignore_for_include_check = ( "qatomic.h" );</div><div class='add'>+my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" );</div><div class='add'>+my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" );</div><div class='add'>+my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDesigner}", "$modules{QtUiTools}", "$modules{QtDBus}", "$modules{phonon}" );</div><div class='add'>+my %colliding_headers = ();</div><div class='add'>+my %inject_headers;</div><div class='add'>+# Force generation of forwarding header for qconfig.h if (and only if) we can't</div><div class='add'>+# find the header by normal means.</div><div class='add'>+%inject_headers = ( "$basedir/src/corelib/global" =&gt; ( "*qconfig.h" ) ) unless (-e "$basedir/src/corelib/global/qconfig.h");</div><div class='add'>+</div><div class='add'>+foreach my $lib (@modules_to_sync) {</div><div class='add'>+    #iteration info</div><div class='add'>+    my $dir = $modules{$lib};</div><div class='add'>+    my $pathtoheaders = "";</div><div class='add'>+    $pathtoheaders = $moduleheaders{$lib} if ($moduleheaders{$lib});</div><div class='add'>+</div><div class='add'>+    #information used after the syncing</div><div class='add'>+    my $pri_install_classes = "";</div><div class='add'>+    my $pri_install_files = "";</div><div class='add'>+    my $pri_install_pfiles = "";</div><div class='add'>+</div><div class='add'>+    my $libcapitals = $lib;</div><div class='add'>+    $libcapitals =~ y/a-z/A-Z/;</div><div class='add'>+    my $master_contents = "#ifndef QT_".$libcapitals."_MODULE_H\n#define QT_".$libcapitals."_MODULE_H\n";</div><div class='add'>+</div><div class='add'>+    #get dependencies</div><div class='add'>+    if(-e "$dir/" . basename($dir) . ".pro") {</div><div class='add'>+        if(open(F, "&lt;$dir/" . basename($dir) . ".pro")) {</div><div class='add'>+            while(my $line = &lt;F&gt;) {</div><div class='add'>+                chomp $line;</div><div class='add'>+                if($line =~ /^ *QT *\+?= *([^\r\n]*)/) {</div><div class='add'>+                    foreach(split(/ /, $1)) {</div><div class='add'>+                        $master_contents .= "#include &lt;QtCore/QtCore&gt;\n" if($_ eq "core");</div><div class='add'>+                        $master_contents .= "#include &lt;QtGui/QtGui&gt;\n" if($_ eq "gui");</div><div class='add'>+                        $master_contents .= "#include &lt;QtNetwork/QtNetwork&gt;\n" if($_ eq "network");</div><div class='add'>+                        $master_contents .= "#include &lt;QtSvg/QtSvg&gt;\n" if($_ eq "svg");</div><div class='add'>+                        $master_contents .= "#include &lt;QtDeclarative/QtDeclarative&gt;\n" if($_ eq "declarative");</div><div class='add'>+                        $master_contents .= "#include &lt;QtScript/QtScript&gt;\n" if($_ eq "script");</div><div class='add'>+                        $master_contents .= "#include &lt;QtScriptTools/QtScriptTools&gt;\n" if($_ eq "scripttools");</div><div class='add'>+                        $master_contents .= "#include &lt;Qt3Support/Qt3Support&gt;\n" if($_ eq "qt3support");</div><div class='add'>+                        $master_contents .= "#include &lt;QtSql/QtSql&gt;\n" if($_ eq "sql");</div><div class='add'>+                        $master_contents .= "#include &lt;QtXml/QtXml&gt;\n" if($_ eq "xml");</div><div class='add'>+                        $master_contents .= "#include &lt;QtXmlPatterns/QtXmlPatterns&gt;\n" if($_ eq "xmlpatterns");</div><div class='add'>+                        $master_contents .= "#include &lt;QtOpenGL/QtOpenGL&gt;\n" if($_ eq "opengl");</div><div class='add'>+                        $master_contents .= "#include &lt;QtOpenVG/QtOpenVG&gt;\n" if($_ eq "openvg");</div><div class='add'>+                    }</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+            close(F);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    #remove the old files</div><div class='add'>+    my @subdirs = ("$out_basedir/mw/$lib");</div><div class='add'>+    foreach my $subdir (@subdirs) {</div><div class='add'>+        if (opendir DIR, $subdir) {</div><div class='add'>+            while(my $t = readdir(DIR)) {</div><div class='add'>+                my $file = "$subdir/$t";</div><div class='add'>+                if(-d $file) {</div><div class='add'>+                    push @subdirs, $file unless($t eq "." || $t eq "..");</div><div class='add'>+                } else {</div><div class='add'>+                    my @files = ($file);</div><div class='add'>+                    #push @files, "$out_basedir/mw/Qt/$t" if(-e "$out_basedir/mw/Qt/$t");</div><div class='add'>+                    foreach my $file (@files) {</div><div class='add'>+                       my $remove_file = 0;</div><div class='add'>+                       if(open(F, "&lt;$file")) {</div><div class='add'>+                            while(my $line = &lt;F&gt;) {</div><div class='add'>+                                chomp $line;</div><div class='add'>+                                if($line =~ /^\#include \"([^\"]*)\"$/) {</div><div class='add'>+                                    my $include = $1;</div><div class='add'>+                                    $include = $subdir . "/" . $include unless(substr($include, 0, 1) eq "/");</div><div class='add'>+                                    $remove_file = 1 unless(-e $include);</div><div class='add'>+                                } else {</div><div class='add'>+                                    $remove_file = 0;</div><div class='add'>+                                    last;</div><div class='add'>+                                }</div><div class='add'>+                            }</div><div class='add'>+                            close(F);</div><div class='add'>+                            unlink $file if($remove_file);</div><div class='add'>+                        }</div><div class='add'>+                    }</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+            closedir DIR;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    #create the new ones</div><div class='add'>+    foreach my $current_dir (split(/;/, $dir)) {</div><div class='add'>+        my $headers_dir = $current_dir;</div><div class='add'>+        $headers_dir .= "/$pathtoheaders" if ($pathtoheaders);</div><div class='add'>+        #calc subdirs</div><div class='add'>+        my @subdirs = ($headers_dir);</div><div class='add'>+        foreach my $subdir (@subdirs) {</div><div class='add'>+            opendir DIR, $subdir or next;</div><div class='add'>+            while(my $t = readdir(DIR)) {</div><div class='add'>+                push @subdirs, "$subdir/$t" if(-d "$subdir/$t" &amp;&amp; !($t eq ".") &amp;&amp;</div><div class='add'>+                                               !($t eq "..") &amp;&amp; !($t eq ".obj") &amp;&amp;</div><div class='add'>+                                               !($t eq ".moc") &amp;&amp; !($t eq ".rcc") &amp;&amp;</div><div class='add'>+                                               !($t eq ".uic") &amp;&amp; !($t eq "build"));</div><div class='add'>+            }</div><div class='add'>+            closedir DIR;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        #calc files and "copy" them</div><div class='add'>+        foreach my $subdir (@subdirs) {</div><div class='add'>+            my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0);</div><div class='add'>+            push @headers, $inject_headers{$subdir} if (defined $inject_headers{$subdir});</div><div class='add'>+            foreach my $header (@headers) {</div><div class='add'>+                my $shadow = ($header =~ s/^\*//);</div><div class='add'>+                $header = 0 if($header =~ /^ui_.*.h/);</div><div class='add'>+                foreach (@ignore_headers) {</div><div class='add'>+                    $header = 0 if($header eq $_);</div><div class='add'>+                }</div><div class='add'>+                if($header) {</div><div class='add'>+                    my $header_copies = 0;</div><div class='add'>+                    #figure out if it is a public header</div><div class='add'>+                    my $public_header = $header;</div><div class='add'>+                    if($public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) {</div><div class='add'>+                        $public_header = 0;</div><div class='add'>+                    } else {</div><div class='add'>+                        foreach (@ignore_for_master_contents) {</div><div class='add'>+                            $public_header = 0 if($header eq $_);</div><div class='add'>+                        }</div><div class='add'>+                    }</div><div class='add'>+</div><div class='add'>+                    my $iheader = $subdir . "/" . $header;</div><div class='add'>+                    $iheader =~ s/^\Q$basedir\E/$out_basedir/ if ($shadow);</div><div class='add'>+                    my @classes = $public_header ? classNames($iheader) : ();</div><div class='add'>+</div><div class='add'>+                    #find out all the places it goes..</div><div class='add'>+                    my @headers;</div><div class='add'>+                    if ($public_header) {</div><div class='add'>+                        @headers = ( "$out_basedir/mw/$lib/$header" );</div><div class='add'>+</div><div class='add'>+                        # write forwarding headers to include/Qt</div><div class='add'>+                        if ($lib ne "phonon" &amp;&amp; $subdir =~ /^$basedir\/src/) {</div><div class='add'>+                            my $file_name = "$out_basedir/mw/Qt/$header";</div><div class='add'>+                            my $file_op = '&gt;';</div><div class='add'>+                            my $header_content = '';</div><div class='add'>+                            if (exists $colliding_headers{$file_name}) {</div><div class='add'>+                                $file_op = '&gt;&gt;';</div><div class='add'>+                            } else {</div><div class='add'>+                                $colliding_headers{$file_name} = 1;</div><div class='add'>+                                my $warning_msg = 'Inclusion of header files from include/Qt is deprecated.';</div><div class='add'>+                                $header_content = "#ifndef QT_NO_QT_INCLUDE_WARN\n" .</div><div class='add'>+                                                  "    #if defined(__GNUC__)\n" .</div><div class='add'>+                                                  "        #warning \"$warning_msg\"\n" .</div><div class='add'>+                                                  "    #elif defined(_MSC_VER)\n" .</div><div class='add'>+                                                  "        #pragma message(\"WARNING: $warning_msg\")\n" .</div><div class='add'>+                                                  "    #endif\n".</div><div class='add'>+                                                  "#endif\n\n";</div><div class='add'>+                            }</div><div class='add'>+                            $header_content .= '#include "' . "../$lib/$header" . "\"\n";</div><div class='add'>+                            open HEADERFILE, $file_op, $file_name or die "unable to open '$file_name' : $!\n";</div><div class='add'>+                            print HEADERFILE $header_content;</div><div class='add'>+                            close HEADERFILE;</div><div class='add'>+                        }</div><div class='add'>+</div><div class='add'>+                        foreach my $full_class (@classes) {</div><div class='add'>+                            my $header_base = basename($header);</div><div class='add'>+                            # Strip namespaces:</div><div class='add'>+                            my $class = $full_class;</div><div class='add'>+                            $class =~ s/^.*:://;</div><div class='add'>+#                               if ($class =~ m/::/) {</div><div class='add'>+#                                  class =~ s,::,/,g;</div><div class='add'>+#                               }</div><div class='add'>+                            $class_lib_map_contents .= "QT_CLASS_LIB($full_class, $lib, $header_base)\n";</div><div class='add'>+                            $header_copies++ if(syncHeader("$out_basedir/mw/$lib/$class", "$out_basedir/mw/$lib/$header", 0));</div><div class='add'>+</div><div class='add'>+                            # KDE-Compat headers for Phonon</div><div class='add'>+                            if ($lib eq "phonon") {</div><div class='add'>+                                $header_copies++ if (syncHeader("$out_basedir/mw/phonon_compat/Phonon/$class", "$out_basedir/mw/$lib/$header", 0));</div><div class='add'>+                            }</div><div class='add'>+                        }</div><div class='add'>+                    } else {</div><div class='add'>+                        @headers = ( "$out_basedir/mw/$lib/private/$header" );</div><div class='add'>+                    }</div><div class='add'>+                    foreach(@headers) { #sync them</div><div class='add'>+                        $header_copies++ if(syncHeader($_, $iheader, 1));</div><div class='add'>+                    }</div><div class='add'>+</div><div class='add'>+                    if($public_header) {</div><div class='add'>+                        #put it into the master file</div><div class='add'>+                        $master_contents .= "#include \"$public_header\"\n" if(shouldMasterInclude($iheader));</div><div class='add'>+</div><div class='add'>+                        #deal with the install directives</div><div class='add'>+                        if($public_header) {</div><div class='add'>+                            my $pri_install_iheader = fixPaths($iheader, $current_dir);</div><div class='add'>+                            foreach my $class (@classes) {</div><div class='add'>+                                # Strip namespaces:</div><div class='add'>+                                $class =~ s/^.*:://;</div><div class='add'>+#                                   if ($class =~ m/::/) {</div><div class='add'>+#                                       $class =~ s,::,/,g;</div><div class='add'>+#                                   }</div><div class='add'>+                                my $class_header = fixPaths("$out_basedir/mw/$lib/$class",</div><div class='add'>+                                                            $current_dir) . " ";</div><div class='add'>+                                $pri_install_classes .= $class_header</div><div class='add'>+                                                            unless($pri_install_classes =~ $class_header);</div><div class='add'>+                            }</div><div class='add'>+                            $pri_install_files.= "$pri_install_iheader ";;</div><div class='add'>+                        }</div><div class='add'>+                    }</div><div class='add'>+                    else {</div><div class='add'>+                        my $pri_install_iheader = fixPaths($iheader, $current_dir);</div><div class='add'>+                        $pri_install_pfiles.= "$pri_install_iheader ";;</div><div class='add'>+                    }</div><div class='add'>+                    print "header created for $iheader ($header_copies)\n" if($header_copies &gt; 0);</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    # close the master include:</div><div class='add'>+    $master_contents .= "#endif\n";</div><div class='add'>+</div><div class='add'>+    my @master_includes;</div><div class='add'>+    push @master_includes, "$out_basedir/mw/$lib/$lib";</div><div class='add'>+    push @master_includes, "$out_basedir/mw/phonon_compat/Phonon/Phonon" if ($lib eq "phonon");</div><div class='add'>+    foreach my $master_include (@master_includes) {</div><div class='add'>+        #generate the "master" include file</div><div class='add'>+        my @tmp = split(/;/,$modules{$lib});</div><div class='add'>+        $pri_install_files .= fixPaths($master_include, $tmp[0]) . " "; #get the master file installed too</div><div class='add'>+        if($master_include &amp;&amp; -e $master_include) {</div><div class='add'>+            open MASTERINCLUDE, "&lt;$master_include";</div><div class='add'>+            local $/;</div><div class='add'>+            binmode MASTERINCLUDE;</div><div class='add'>+            my $oldmaster = &lt;MASTERINCLUDE&gt;;</div><div class='add'>+            close MASTERINCLUDE;</div><div class='add'>+            $oldmaster =~ s/\r//g; # remove \r's , so comparison is ok on all platforms</div><div class='add'>+            $master_include = 0 if($oldmaster eq $master_contents);</div><div class='add'>+        }</div><div class='add'>+        if($master_include &amp;&amp; $master_contents) {</div><div class='add'>+            my $master_dir = dirname($master_include);</div><div class='add'>+            mkpath $master_dir;</div><div class='add'>+            print "header (master) created for $lib\n";</div><div class='add'>+            open MASTERINCLUDE, "&gt;$master_include";</div><div class='add'>+            print MASTERINCLUDE $master_contents;</div><div class='add'>+            close MASTERINCLUDE;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    #handle the headers.pri for each module</div><div class='add'>+    my $headers_pri_contents = "";</div><div class='add'>+    $headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n";</div><div class='add'>+    $headers_pri_contents .= "SYNCQT.HEADER_CLASSES = $pri_install_classes\n";</div><div class='add'>+    $headers_pri_contents .= "SYNCQT.PRIVATE_HEADER_FILES = $pri_install_pfiles\n";</div><div class='add'>+    my $headers_pri_file = "$out_basedir/mw/$lib/headers.pri";</div><div class='add'>+    if(-e $headers_pri_file) {</div><div class='add'>+        open HEADERS_PRI_FILE, "&lt;$headers_pri_file";</div><div class='add'>+        local $/;</div><div class='add'>+        binmode HEADERS_PRI_FILE;</div><div class='add'>+        my $old_headers_pri_contents = &lt;HEADERS_PRI_FILE&gt;;</div><div class='add'>+        close HEADERS_PRI_FILE;</div><div class='add'>+        $old_headers_pri_contents =~ s/\r//g; # remove \r's , so comparison is ok on all platforms</div><div class='add'>+        $headers_pri_file = 0 if($old_headers_pri_contents eq $headers_pri_contents);</div><div class='add'>+    }</div><div class='add'>+    if($headers_pri_file &amp;&amp; $master_contents) {</div><div class='add'>+        my $headers_pri_dir = dirname($headers_pri_file);</div><div class='add'>+        mkpath $headers_pri_dir;</div><div class='add'>+        print "headers.pri file created for $lib\n";</div><div class='add'>+        open HEADERS_PRI_FILE, "&gt;$headers_pri_file";</div><div class='add'>+        print HEADERS_PRI_FILE $headers_pri_contents;</div><div class='add'>+        close HEADERS_PRI_FILE;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+unless(!$create_uic_class_map) {</div><div class='add'>+    my $class_lib_map = "$out_basedir/src/tools/uic/qclass_lib_map.h";</div><div class='add'>+    if(-e $class_lib_map) {</div><div class='add'>+        open CLASS_LIB_MAP, "&lt;$class_lib_map";</div><div class='add'>+        local $/;</div><div class='add'>+        binmode CLASS_LIB_MAP;</div><div class='add'>+        my $old_class_lib_map_contents = &lt;CLASS_LIB_MAP&gt;;</div><div class='add'>+        close CLASS_LIB_MAP;</div><div class='add'>+        $old_class_lib_map_contents =~ s/\r//g; # remove \r's , so comparison is ok on all platforms</div><div class='add'>+        $class_lib_map = 0 if($old_class_lib_map_contents eq $class_lib_map_contents);</div><div class='add'>+    }</div><div class='add'>+    if($class_lib_map) {</div><div class='add'>+        my $class_lib_map_dir = dirname($class_lib_map);</div><div class='add'>+        mkpath $class_lib_map_dir;</div><div class='add'>+        open CLASS_LIB_MAP, "&gt;$class_lib_map";</div><div class='add'>+        print CLASS_LIB_MAP $class_lib_map_contents;</div><div class='add'>+        close CLASS_LIB_MAP;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+if($check_includes) {</div><div class='add'>+    for my $lib (keys(%modules)) {</div><div class='add'>+            #calc subdirs</div><div class='add'>+            my @subdirs = ($modules{$lib});</div><div class='add'>+            foreach my $subdir (@subdirs) {</div><div class='add'>+                opendir DIR, $subdir or die "Huh, directory ".$subdir." cannot be opened.";</div><div class='add'>+                while(my $t = readdir(DIR)) {</div><div class='add'>+                    push @subdirs, "$subdir/$t" if(-d "$subdir/$t" &amp;&amp; !($t eq ".") &amp;&amp;</div><div class='add'>+                                                   !($t eq "..") &amp;&amp; !($t eq ".obj") &amp;&amp;</div><div class='add'>+                                                   !($t eq ".moc") &amp;&amp; !($t eq ".rcc") &amp;&amp;</div><div class='add'>+                                                   !($t eq ".uic") &amp;&amp; !($t eq "build"));</div><div class='add'>+                }</div><div class='add'>+                closedir DIR;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            foreach my $subdir (@subdirs) {</div><div class='add'>+                my $header_skip_qt_module_test = 0;</div><div class='add'>+                foreach(@ignore_for_qt_module_check) {</div><div class='add'>+                    foreach (split(/;/, $_)) {</div><div class='add'>+                        $header_skip_qt_module_test = 1 if ($subdir =~ /^$_/);</div><div class='add'>+                    }</div><div class='add'>+                }</div><div class='add'>+                my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0);</div><div class='add'>+                foreach my $header (@headers) {</div><div class='add'>+                    my $header_skip_qt_begin_header_test = 0;</div><div class='add'>+                    my $header_skip_qt_begin_namespace_test = 0;</div><div class='add'>+                    $header = 0 if($header =~ /^ui_.*.h/);</div><div class='add'>+                    foreach (@ignore_headers) {</div><div class='add'>+                        $header = 0 if($header eq $_);</div><div class='add'>+                    }</div><div class='add'>+                    if($header) {</div><div class='add'>+                        my $public_header = $header;</div><div class='add'>+                        if($public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) {</div><div class='add'>+                            $public_header = 0;</div><div class='add'>+                        } else {</div><div class='add'>+                            foreach (@ignore_for_master_contents) {</div><div class='add'>+                                $public_header = 0 if($header eq $_);</div><div class='add'>+                            }</div><div class='add'>+                            if($public_header) {</div><div class='add'>+                                foreach (@ignore_for_include_check) {</div><div class='add'>+                                    $public_header = 0 if($header eq $_);</div><div class='add'>+                                }</div><div class='add'>+                                foreach(@ignore_for_qt_begin_header_check) {</div><div class='add'>+                                    $header_skip_qt_begin_header_test = 1 if ($header eq $_);</div><div class='add'>+                                }</div><div class='add'>+                                foreach(@ignore_for_qt_begin_namespace_check) {</div><div class='add'>+                                    $header_skip_qt_begin_namespace_test = 1 if ($header eq $_);</div><div class='add'>+                                }</div><div class='add'>+                            }</div><div class='add'>+                        }</div><div class='add'>+</div><div class='add'>+                        my $iheader = $subdir . "/" . $header;</div><div class='add'>+                        if($public_header) {</div><div class='add'>+                            if(open(F, "&lt;$iheader")) {</div><div class='add'>+                                my $qt_module_found = 0;</div><div class='add'>+                                my $qt_begin_header_found = 0;</div><div class='add'>+                                my $qt_end_header_found = 0;</div><div class='add'>+                                my $qt_begin_namespace_found = 0;</div><div class='add'>+                                my $qt_end_namespace_found = 0;</div><div class='add'>+                                my $line;</div><div class='add'>+                                while($line = &lt;F&gt;) {</div><div class='add'>+                                    chomp $line;</div><div class='add'>+                                    my $output_line = 1;</div><div class='add'>+                                    if($line =~ /^ *\# *pragma (qt_no_included_check|qt_sync_stop_processing)/) {</div><div class='add'>+                                        last;</div><div class='add'>+                                    } elsif($line =~ /^ *\# *include/) {</div><div class='add'>+                                        my $include = $line;</div><div class='add'>+                                        if($line =~ /&lt;.*&gt;/) {</div><div class='add'>+                                            $include =~ s,.*&lt;(.*)&gt;.*,$1,;</div><div class='add'>+                                        } elsif($line =~ /".*"/) {</div><div class='add'>+                                            $include =~ s,.*"(.*)".*,$1,;</div><div class='add'>+                                        } else {</div><div class='add'>+                                            $include = 0;</div><div class='add'>+                                        }</div><div class='add'>+                                        if($include) {</div><div class='add'>+                                            for my $trylib (keys(%modules)) {</div><div class='add'>+                                                if(-e "$out_basedir/mw/$trylib/$include") {</div><div class='add'>+                                                    print "WARNING: $iheader includes $include when it should include $trylib/$include\n";</div><div class='add'>+                                                }</div><div class='add'>+                                            }</div><div class='add'>+                                        }</div><div class='add'>+                                    } elsif ($header_skip_qt_begin_header_test == 0 and $line =~ /^QT_BEGIN_HEADER\s*$/) {</div><div class='add'>+                                        $qt_begin_header_found = 1;</div><div class='add'>+                                    } elsif ($header_skip_qt_begin_header_test == 0 and $line =~ /^QT_END_HEADER\s*$/) {</div><div class='add'>+                                        $qt_end_header_found = 1;</div><div class='add'>+                                    } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_BEGIN_NAMESPACE\s*$/) {</div><div class='add'>+                                        $qt_begin_namespace_found = 1;</div><div class='add'>+                                    } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_END_NAMESPACE\s*$/) {</div><div class='add'>+                                        $qt_end_namespace_found = 1;</div><div class='add'>+                                    } elsif ($header_skip_qt_module_test == 0 and $line =~ /^QT_MODULE\(.*\)\s*$/) {</div><div class='add'>+                                        $qt_module_found = 1;</div><div class='add'>+                                    }</div><div class='add'>+                                }</div><div class='add'>+                                if ($header_skip_qt_begin_header_test == 0) {</div><div class='add'>+                                    if ($qt_begin_header_found == 0) {</div><div class='add'>+                                        print "WARNING: $iheader does not include QT_BEGIN_HEADER\n";</div><div class='add'>+                                    }</div><div class='add'>+</div><div class='add'>+                                    if ($qt_begin_header_found &amp;&amp; $qt_end_header_found == 0) {</div><div class='add'>+                                        print "WARNING: $iheader has QT_BEGIN_HEADER but no QT_END_HEADER\n";</div><div class='add'>+                                    }</div><div class='add'>+                                }</div><div class='add'>+</div><div class='add'>+                                if ($header_skip_qt_begin_namespace_test == 0) {</div><div class='add'>+                                    if ($qt_begin_namespace_found == 0) {</div><div class='add'>+                                        print "WARNING: $iheader does not include QT_BEGIN_NAMESPACE\n";</div><div class='add'>+                                    }</div><div class='add'>+</div><div class='add'>+                                    if ($qt_begin_namespace_found &amp;&amp; $qt_end_namespace_found == 0) {</div><div class='add'>+                                        print "WARNING: $iheader has QT_BEGIN_NAMESPACE but no QT_END_NAMESPACE\n";</div><div class='add'>+                                    }</div><div class='add'>+                                }</div><div class='add'>+</div><div class='add'>+                                if ($header_skip_qt_module_test == 0) {</div><div class='add'>+                                    if ($qt_module_found == 0) {</div><div class='add'>+                                        print "WARNING: $iheader does not include QT_MODULE\n";</div><div class='add'>+                                    }</div><div class='add'>+                                }</div><div class='add'>+                                close(F);</div><div class='add'>+                            }</div><div class='add'>+                        }</div><div class='add'>+                    }</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+exit 0;</div><div class='head'>diff --git a/config.profiles/symbian/implml/qt_copy.implml b/config.profiles/symbian/implml/qt_copy.implml<br/>new file mode 100644<br/>index 0000000..53d600e<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/implml/qt_copy.implml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/implml/qt_copy.implml</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='add'>+&lt;container  xmlns="http://www.symbianfoundation.org/xml/implml/1"</div><div class='add'>+            condition="${qt.Enabled}"&gt;</div><div class='add'>+    &lt;tag name="target" value="uda" /&gt;</div><div class='add'>+    &lt;content xmlns="http://www.s60.com/xml/content/2"&gt;</div><div class='add'>+      &lt;output dir="sis" flatten="true"&gt;</div><div class='add'>+        &lt;input file="sis/qt.sisx" /&gt;</div><div class='add'>+      &lt;/output&gt;</div><div class='add'>+    &lt;/content&gt;</div><div class='add'>+&lt;/container&gt;</div><div class='head'>diff --git a/config.profiles/symbian/layers.sysdef.xml b/config.profiles/symbian/layers.sysdef.xml<br/>new file mode 100644<br/>index 0000000..19d8662<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/layers.sysdef.xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/layers.sysdef.xml</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+&lt;?xml version="1.0"?&gt;</div><div class='add'>+&lt;!DOCTYPE SystemDefinition SYSTEM "sysdef_1_5_1.dtd" [</div><div class='add'>+  &lt;!-- location of Qt in the platform source tree --&gt;</div><div class='add'>+  &lt;!ENTITY layer_real_source_path "sf/mw/qt" &gt;</div><div class='add'>+</div><div class='add'>+  &lt;!-- location of our configuration files --&gt;</div><div class='add'>+  &lt;!ENTITY config_path "config.profiles/symbian" &gt;</div><div class='add'>+]&gt;</div><div class='add'>+</div><div class='add'>+&lt;SystemDefinition name="qt" schema="1.5.1"&gt;</div><div class='add'>+    &lt;systemModel&gt;</div><div class='add'>+        &lt;layer name="tools_layer"&gt;</div><div class='add'>+            &lt;module name="qtconf"&gt;</div><div class='add'>+                &lt;unit unitID="qtdo.qt.qtconf" mrp="" bldFile="&amp;layer_real_source_path;/&amp;config_path;" name="qtconf" /&gt;</div><div class='add'>+            &lt;/module&gt;</div><div class='add'>+        &lt;/layer&gt;</div><div class='add'>+        &lt;layer name="mw_layer"&gt;</div><div class='add'>+            &lt;module name="qt"&gt;</div><div class='add'>+                &lt;unit unitID="qtdo.qt" mrp="" bldFile="&amp;layer_real_source_path;" name="qt" proFile="projects.pro" qmakeArgs="-r"/&gt;</div><div class='add'>+            &lt;/module&gt;</div><div class='add'>+</div><div class='add'>+            &lt;module name="qtlocalization"&gt;</div><div class='add'>+                &lt;unit unitID="qtdo.qt.localization" mrp="" bldFile="&amp;layer_real_source_path;/&amp;config_path;/translations_symbian" name="qtlocalization" proFile="translations.pro" qmakeArgs="-r"/&gt;</div><div class='add'>+            &lt;/module&gt;</div><div class='add'>+        &lt;/layer&gt;</div><div class='add'>+        &lt;layer name="app_layer"&gt;</div><div class='add'>+            &lt;module name="qtdemos"&gt;</div><div class='add'>+                &lt;unit unitID="qtdo.qt.demos" mrp="" bldFile="&amp;layer_real_source_path;/demos" name="qtdemos" proFile="demos.pro" qmakeArgs="-r" filter="qtdemos"/&gt;</div><div class='add'>+            &lt;/module&gt;</div><div class='add'>+            &lt;module name="qtexamples"&gt;</div><div class='add'>+                &lt;unit unitID="qtdo.qt.examples" mrp="" bldFile="&amp;layer_real_source_path;/examples" name="qtexamples" proFile="examples.pro" qmakeArgs="-r" filter="qtexamples"/&gt;</div><div class='add'>+            &lt;/module&gt;</div><div class='add'>+        &lt;/layer&gt;</div><div class='add'>+    &lt;/systemModel&gt;</div><div class='add'>+&lt;/SystemDefinition&gt;</div><div class='head'>diff --git a/config.profiles/symbian/loc.prf b/config.profiles/symbian/loc.prf<br/>new file mode 100644<br/>index 0000000..dd0644b<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/loc.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/loc.prf</a></div><div class='hunk'>@@ -0,0 +1,41 @@</div><div class='add'>+CONFIG += localize_deployment</div><div class='add'>+</div><div class='add'>+qtPrepareTool(LRELEASE, lrelease)</div><div class='add'>+</div><div class='add'>+isEmpty(SYMBIANTRANSLATIONSFILES): SYMBIANTRANSLATIONSFILES = $$symbianRemoveSpecialCharacters($$basename(TARGET))    </div><div class='add'>+isEmpty(SYMBIANTRANSLATIONS):exists($${EPOCROOT}epoc32/tools/qt/mkspecs/features/symbian/symbian_i18n.prf) {</div><div class='add'>+    load($${EPOCROOT}epoc32/tools/qt/mkspecs/features/symbian/symbian_i18n.prf)</div><div class='add'>+}</div><div class='add'>+isEmpty(SYMBIANTRANSLATIONDIR): SYMBIANTRANSLATIONDIR = $${EPOCROOT}epoc32/data/z/resource/qt/translations</div><div class='add'>+isEmpty(SYMBIANWINSCWUDEBTRANSLATIONDIR): SYMBIANWINSCWUDEBTRANSLATIONDIR = $${EPOCROOT}epoc32/release/winscw/udeb/z/resource/qt/translations</div><div class='add'>+isEmpty(SYMBIANWINSCWURELTRANSLATIONDIR): SYMBIANWINSCWURELTRANSLATIONDIR = $${EPOCROOT}epoc32/release/winscw/urel/z/resource/qt/translations</div><div class='add'>+</div><div class='add'>+for(FILE, SYMBIANTRANSLATIONSFILES) {</div><div class='add'>+    for(LANGID, SYMBIANTRANSLATIONS) {    </div><div class='add'>+        TRANSLATIONS += $${EPOCROOT}epoc32/include/platform/qt/translations/$${FILE}_$${LANGID}.ts</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+contains(CONFIG, loc_source_string) {</div><div class='add'>+    LRELEASE_PARAMS = -qm</div><div class='add'>+} else {</div><div class='add'>+    LRELEASE_PARAMS = -idbased -qm</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+loc.CONFIG = no_link target_predeps  </div><div class='add'>+loc.commands = $$LRELEASE ${QMAKE_FILE_IN} $$LRELEASE_PARAMS ${QMAKE_FILE_OUT}</div><div class='add'>+loc.input = TRANSLATIONS</div><div class='add'>+loc.output = $$SYMBIANTRANSLATIONDIR/${QMAKE_FILE_BASE}.qm</div><div class='add'>+loc.variable_out = GENERATED_QM_FILES</div><div class='add'>+</div><div class='add'>+copy_qm_winscw_udeb.CONFIG = no_link target_predeps</div><div class='add'>+copy_qm_winscw_udeb.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}</div><div class='add'>+copy_qm_winscw_udeb.input = GENERATED_QM_FILES</div><div class='add'>+copy_qm_winscw_udeb.output = $$SYMBIANWINSCWUDEBTRANSLATIONDIR/${QMAKE_FILE_BASE}.qm</div><div class='add'>+</div><div class='add'>+copy_qm_winscw_urel.CONFIG = $$copy_qm_winscw_udeb.CONFIG</div><div class='add'>+copy_qm_winscw_urel.commands = $$copy_qm_winscw_udeb.commands</div><div class='add'>+copy_qm_winscw_urel.input = $$copy_qm_winscw_udeb.input</div><div class='add'>+copy_qm_winscw_urel.output = $$SYMBIANWINSCWURELTRANSLATIONDIR/${QMAKE_FILE_BASE}.qm</div><div class='add'>+</div><div class='add'>+QMAKE_EXTRA_COMPILERS += loc copy_qm_winscw_udeb copy_qm_winscw_urel</div><div class='head'>diff --git a/config.profiles/symbian/non_foundation_paths.prf b/config.profiles/symbian/non_foundation_paths.prf<br/>new file mode 100644<br/>index 0000000..8074ff7<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/non_foundation_paths.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/non_foundation_paths.prf</a></div><div class='hunk'>@@ -0,0 +1,115 @@</div><div class='add'>+#</div><div class='add'>+# ==============================================================================</div><div class='add'>+#  Name        : non_foundation_paths.prf</div><div class='add'>+#  Part of     :</div><div class='add'>+#  Interface   : None foundation code Path Definitions API for Qt/S60</div><div class='add'>+#  Description : Symbian^3 and onwards specific platform paths</div><div class='add'>+#</div><div class='add'>+# Usage examples:</div><div class='add'>+#</div><div class='add'>+#     Note: this file will not added automatically. It needs to be included</div><div class='add'>+#           when needed.</div><div class='add'>+#</div><div class='add'>+#     Variable usages to add the system include paths</div><div class='add'>+#</div><div class='add'>+#       The include paths has to be related to the layer in which your SW</div><div class='add'>+#       resides. Thus as an example: a component residing in middleware</div><div class='add'>+#       layer should use the MW specific macro.</div><div class='add'>+#</div><div class='add'>+#         INCLUDEPATH += $$NON_FOUNDATION_APP_LAYER_SYSTEMINCLUDE</div><div class='add'>+#         INCLUDEPATH += $$NON_FOUNDATION_MW_LAYER_SYSTEMINCLUDE</div><div class='add'>+#         INCLUDEPATH += $$NON_FOUNDATION_OS_LAYER_SYSTEMINCLUDE</div><div class='add'>+#         INCLUDEPATH += $$NON_FOUNDATION_ADAPT_LAYER_SYSTEMINCLUDE</div><div class='add'>+#</div><div class='add'>+#       Macros related to exporting non-foundation headers  into</div><div class='add'>+#       correct place in the new system.</div><div class='add'>+#         NON_FOUNDATION_APP_LAYER_EXPORT_PATH</div><div class='add'>+#         NON_FOUNDATION_MW_LAYER_EXPORT_PATH</div><div class='add'>+#         NON_FOUNDATION_OS_LAYER_EXPORT_PATH</div><div class='add'>+#         NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH</div><div class='add'>+#</div><div class='add'>+# ==============================================================================</div><div class='add'>+</div><div class='add'>+# ---------------------------------------</div><div class='add'>+# Location, where the non-foundation app code should export its headers.</div><div class='add'>+# These are specific to app layer to which the non-foundation code belongs to.</div><div class='add'>+# ---------------------------------------</div><div class='add'>+defineReplace(NON_FOUNDATION_APP_LAYER_EXPORT_PATH) {</div><div class='add'>+     return (/epoc32/include/ext/app/$$1)</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# ---------------------------------------</div><div class='add'>+# Location, where the non-foundation mw code should export its headers.</div><div class='add'>+# These are specific to mw layer to which the non-foundation code belongs to.</div><div class='add'>+# ---------------------------------------</div><div class='add'>+defineReplace(NON_FOUNDATION_MW_LAYER_EXPORT_PATH) {</div><div class='add'>+     return (/epoc32/include/ext/mw/$$1)</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# ---------------------------------------</div><div class='add'>+# Location, where the non-foundation os code should export its headers.</div><div class='add'>+# These are specific to os layer to which the non-foundation code belongs to.</div><div class='add'>+# ---------------------------------------</div><div class='add'>+defineReplace(NON_FOUNDATION_OS_LAYER_EXPORT_PATH) {</div><div class='add'>+     return (/epoc32/include/ext/os/$$1)</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# ---------------------------------------</div><div class='add'>+# Location, where the non-foundation adapt code should export its headers.</div><div class='add'>+# These are specific to adapt layer to which the non-foundation code belongs to.</div><div class='add'>+# ---------------------------------------</div><div class='add'>+# Temporarily commented out to help adaptation side migration</div><div class='add'>+# defineReplace(NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH) {</div><div class='add'>+#      return (/epoc32/include/ext/adapt/$$1)</div><div class='add'>+# }</div><div class='add'>+</div><div class='add'>+# **************************************************************************</div><div class='add'>+#  General comments about the 3 define statements related to include paths.</div><div class='add'>+#  It should be enough only to have one of the below macros and one of the include macros</div><div class='add'>+#  from platform_paths.hrh.</div><div class='add'>+#  No other systemincludes to epoc32/include or subdirectories.</div><div class='add'>+# **************************************************************************</div><div class='add'>+</div><div class='add'>+# This define statements defines the SYSTEMINCLUDE-line, which is intended to be</div><div class='add'>+# used in the mmp-files that are part of the applications-layer.</div><div class='add'>+#</div><div class='add'>+# Applications layer is the last one in the list, since most likely the most of</div><div class='add'>+# the headers come from middleware or os-layer  =&gt; thus they are first.</div><div class='add'>+</div><div class='add'>+NON_FOUNDATION_APP_LAYER_SYSTEMINCLUDE = \</div><div class='add'>+ /epoc32/include/ext/app \</div><div class='add'>+ /epoc32/include/ext/mw \</div><div class='add'>+ /epoc32/include/ext/os</div><div class='add'>+</div><div class='add'>+# This define statements defines the SYSTEMINCLUDE-line, which is intended to be</div><div class='add'>+# used in the mmp-files that are part of the middleware-layer.</div><div class='add'>+</div><div class='add'>+NON_FOUNDATION_MW_LAYER_SYSTEMINCLUDE = \</div><div class='add'>+ /epoc32/include/ext/mw \</div><div class='add'>+ /epoc32/include/ext/os</div><div class='add'>+</div><div class='add'>+# This define statements defines the SYSTEMINCLUDE-line, which is intended to be</div><div class='add'>+# used in the mmp-files that are part of the os-layer.</div><div class='add'>+</div><div class='add'>+NON_FOUNDATION_OS_LAYER_SYSTEMINCLUDE = \</div><div class='add'>+ /epoc32/include/ext/os</div><div class='add'>+</div><div class='add'>+# This define statements defines the SYSTEMINCLUDE-line, which is intended to be</div><div class='add'>+# used in the mmp-files that are part of the adapt-layer.</div><div class='add'>+# Temporarily commented out to help adaptation side migration</div><div class='add'>+# NON_FOUNDATION_ADAPT_LAYER_SYSTEMINCLUDE = \</div><div class='add'>+# /epoc32/include/ext/os \</div><div class='add'>+# /epoc32/include/ext/adapt</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+# ****************************************************************************</div><div class='add'>+# Definitions to export IBY files to different folders where they will be taken</div><div class='add'>+# to ROM image</div><div class='add'>+# ****************************************************************************</div><div class='add'>+</div><div class='add'>+# Following three definitions are used for exporting IBY files to</div><div class='add'>+# Core image (ROM+ROFS1). IBY files are exported according to their layer.</div><div class='add'>+</div><div class='add'>+defineReplace(NON_FOUNDATION_CORE_ADAPT_LAYER_IBY_EXPORT_PATH) {</div><div class='add'>+     return (/epoc32/rom/include/$$1)</div><div class='add'>+}</div><div class='head'>diff --git a/config.profiles/symbian/package_definition.xml b/config.profiles/symbian/package_definition.xml<br/>new file mode 100644<br/>index 0000000..bfca907<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/package_definition.xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/package_definition.xml</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='add'>+&lt;SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt"&gt;</div><div class='add'>+    &lt;!-- qt:qmakeArgs attribute is an unsupported extension used as temporary hack to get this to work with abld.</div><div class='add'>+        This will be removed when sbsv2 builds are working --&gt;</div><div class='add'>+  &lt;package id="qt" name="Qt" levels="tool mw app"&gt;</div><div class='add'>+    &lt;collection id="qtconf" name="Qt Config" level="tool"&gt;</div><div class='add'>+            &lt;component id="qt_deviceconfiguration" name="Qt Device Configuration" class="config tool" filter="s60,qt_tools" introduced="^2"&gt;</div><div class='add'>+                &lt;unit bldFile="config.profiles/symbian"/&gt;</div><div class='add'>+            &lt;/component&gt;</div><div class='add'>+    &lt;/collection&gt;</div><div class='add'>+    &lt;collection id="qt_info" name="Qt Info" level="mw"&gt;</div><div class='add'>+            &lt;component id="qt_build" name="Qt Build" introduced="^2" filter="s60"&gt;</div><div class='add'>+                &lt;unit bldFile="." qt:proFile="projects.pro"/&gt;</div><div class='add'>+            &lt;/component&gt;</div><div class='add'>+    &lt;/collection&gt;</div><div class='add'>+</div><div class='add'>+    &lt;collection id="qtlocalization" name="Qt Localization" level="app"&gt;</div><div class='add'>+            &lt;component id="qtlocalization_build" name="Qt localization Build" introduced="^2" filter="s60"&gt;</div><div class='add'>+            &lt;unit bldFile="config.profiles/symbian/translations_symbian" qt:proFile="translations.pro"/&gt;</div><div class='add'>+            &lt;/component&gt;</div><div class='add'>+    &lt;/collection&gt;</div><div class='add'>+</div><div class='add'>+    &lt;collection id="qtdemos" name="Qt Demos" level="app"&gt;</div><div class='add'>+            &lt;component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="s60,test,qtdemos,build_as_app"&gt;</div><div class='add'>+              &lt;meta rel="testbuild"&gt;</div><div class='add'>+               &lt;group name="qtdemos"/&gt;</div><div class='add'>+              &lt;/meta&gt;</div><div class='add'>+                &lt;unit bldFile="demos" qt:proFile="demos.pro"/&gt;</div><div class='add'>+            &lt;/component&gt;</div><div class='add'>+    &lt;/collection&gt;</div><div class='add'>+    &lt;collection id="qtexamples" name="Qt Examples" level="app"&gt;</div><div class='add'>+              &lt;meta rel="qtexamples"&gt;</div><div class='add'>+               &lt;group name="qtdemos"/&gt;</div><div class='add'>+              &lt;/meta&gt;</div><div class='add'>+            &lt;component id="qtexamples_build" name="Qt Examples Build" introduced="^2" filter="s60,test,qtexamples,build_as_app"&gt;</div><div class='add'>+                &lt;unit bldFile="examples" qt:proFile="examples.pro"/&gt;</div><div class='add'>+            &lt;/component&gt;</div><div class='add'>+    &lt;/collection&gt;</div><div class='add'>+  &lt;/package&gt;</div><div class='add'>+&lt;/SystemDefinition&gt;</div><div class='head'>diff --git a/config.profiles/symbian/package_map.xml b/config.profiles/symbian/package_map.xml<br/>new file mode 100644<br/>index 0000000..6233095<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/package_map.xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/package_map.xml</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+&lt;PackageMap root="sf" layer="mw"/&gt;</div><div class='head'>diff --git a/config.profiles/symbian/patches/qmake_listgen.patch b/config.profiles/symbian/patches/qmake_listgen.patch<br/>new file mode 100644<br/>index 0000000..b6224ce<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/patches/qmake_listgen.patch?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/patches/qmake_listgen.patch</a></div><div class='hunk'>@@ -0,0 +1,47 @@</div><div class='add'>+commit b2d4d498faa3c532372838ffa287906fdafdc3c6</div><div class='add'>+Author: Eckhart Koppen &lt;eckhart.koppen@nokia.com&gt;</div><div class='add'>+Date:   Fri Nov 19 17:31:36 2010 +0200</div><div class='add'>+</div><div class='add'>+    Added -listgen option (not functional!) temporarily</div><div class='add'>+</div><div class='add'>+diff --git a/qmake/option.cpp b/qmake/option.cpp</div><div class='add'>+index 27e7c18..1c52d0f 100644</div><div class='add'>+--- a/qmake/option.cpp</div><div class='add'>++++ b/qmake/option.cpp</div><div class='add'>+@@ -112,6 +112,7 @@ QString Option::mkfile::qmakespec;</div><div class='add'>+ int Option::mkfile::cachefile_depth = -1;</div><div class='add'>+ bool Option::mkfile::do_deps = true;</div><div class='add'>+ bool Option::mkfile::do_mocs = true;</div><div class='add'>++bool Option::mkfile::listgen = false;</div><div class='add'>+ bool Option::mkfile::do_dep_heuristics = true;</div><div class='add'>+ bool Option::mkfile::do_preprocess = false;</div><div class='add'>+ bool Option::mkfile::do_stub_makefile = false;</div><div class='add'>+@@ -198,6 +199,7 @@ bool usage(const char *a0)</div><div class='add'>+             "  -nocache       Don't use a cache file      [makefile mode only]\n"</div><div class='add'>+             "  -nodepend      Don't generate dependencies [makefile mode only]\n"</div><div class='add'>+             "  -nomoc         Don't generate moc targets  [makefile mode only]\n"</div><div class='add'>++            "  -listgen       Lists generated files       [makefile mode only]\n"</div><div class='add'>+             "  -nopwd         Don't look for files in pwd [project mode only]\n"</div><div class='add'>+             ,a0,</div><div class='add'>+             default_mode(a0) == Option::QMAKE_GENERATE_PROJECT  ? " (default)" : "", project_builtin_regx().toLatin1().constData(),</div><div class='add'>+@@ -297,6 +299,8 @@ Option::parseCommandLine(int argc, char **argv, int skip)</div><div class='add'>+                         Option::mkfile::do_deps = false;</div><div class='add'>+                     } else if(opt == "nomoc") {</div><div class='add'>+                         Option::mkfile::do_mocs = false;</div><div class='add'>++                    } else if(opt == "listgen") {</div><div class='add'>++                        Option::mkfile::listgen = true;</div><div class='add'>+                     } else if(opt == "nocache") {</div><div class='add'>+                         Option::mkfile::do_cache = false;</div><div class='add'>+                     } else if(opt == "createstub") {</div><div class='add'>+diff --git a/qmake/option.h b/qmake/option.h</div><div class='add'>+index b09ead2..a46d7fb 100644</div><div class='add'>+--- a/qmake/option.h</div><div class='add'>++++ b/qmake/option.h</div><div class='add'>+@@ -179,6 +179,7 @@ struct Option</div><div class='add'>+         static bool do_cache;</div><div class='add'>+         static bool do_deps;</div><div class='add'>+         static bool do_mocs;</div><div class='add'>++        static bool listgen;</div><div class='add'>+         static bool do_dep_heuristics;</div><div class='add'>+         static bool do_preprocess;</div><div class='add'>+         static bool do_stub_makefile;</div><div class='head'>diff --git a/config.profiles/symbian/platform_paths.prf b/config.profiles/symbian/platform_paths.prf<br/>new file mode 100644<br/>index 0000000..0e2131f<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/platform_paths.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/platform_paths.prf</a></div><div class='hunk'>@@ -0,0 +1,251 @@</div><div class='add'>+#</div><div class='add'>+# ==============================================================================</div><div class='add'>+#  Name        : platform_paths.prf</div><div class='add'>+#  Part of     :</div><div class='add'>+#  Interface   : Platform Path Definitions API for Qt/S60</div><div class='add'>+#  Description : Symbian^3 and onwards specific platform paths</div><div class='add'>+#</div><div class='add'>+# Usage examples:</div><div class='add'>+#</div><div class='add'>+#     Note: this file gets automatically added to all Qt/S60 projects</div><div class='add'>+#</div><div class='add'>+#     Variable usages to add the system include paths</div><div class='add'>+#</div><div class='add'>+#       The include paths has to be related to the layer in which your SW</div><div class='add'>+#       resides. Thus as an example: a component residing in middleware</div><div class='add'>+#       layer should use the MW specific macro.</div><div class='add'>+#</div><div class='add'>+#         INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE</div><div class='add'>+#         INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE</div><div class='add'>+#         INCLUDEPATH += $$OS_LAYER_SYSTEMINCLUDE</div><div class='add'>+#</div><div class='add'>+#       If there is a need to include public headers of some S60 component,</div><div class='add'>+#       various *_EXPORT_PATH macros can be utilized:</div><div class='add'>+#</div><div class='add'>+#         INCLUDEPATH += $$OS_LAYER_PUBLIC_EXPORT_PATH(somecomponent)</div><div class='add'>+#</div><div class='add'>+#     Variables related to using various parts of stdapis:</div><div class='add'>+#</div><div class='add'>+#       To use STLLIB you need to have this in your pro-file:</div><div class='add'>+#</div><div class='add'>+#         QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS</div><div class='add'>+#         DEFINES *= $$STLLIB_USAGE_DEFINES</div><div class='add'>+#</div><div class='add'>+#       Depending on what module you are using from stdapis you need to have</div><div class='add'>+#       one or more of the following variables in your pro-file.</div><div class='add'>+#</div><div class='add'>+#         INCLUDEPATH += $$OS_LAYER_LIBC_SYSTEMINCLUDE</div><div class='add'>+#         INCLUDEPATH += $$OS_LAYER_GLIB_SYSTEMINCLUDE</div><div class='add'>+#         INCLUDEPATH += $$OS_LAYER_SSL_SYSTEMINCLUDE</div><div class='add'>+#         INCLUDEPATH += $$OS_LAYER_STDCPP_SYSTEMINCLUDE</div><div class='add'>+#         INCLUDEPATH += $$OS_LAYER_BOOST_SYSTEMINCLUDE</div><div class='add'>+#         INCLUDEPATH += $$OS_LAYER_DBUS_SYSTEMINCLUDE</div><div class='add'>+#         INCLUDEPATH += $$OS_LAYER_LIBUTILITY_SYSTEMINCLUDE</div><div class='add'>+#</div><div class='add'>+#</div><div class='add'>+#</div><div class='add'>+#</div><div class='add'>+# ==============================================================================</div><div class='add'>+</div><div class='add'>+# ---------------------------------------</div><div class='add'>+# Location, where the applications layer specific public headers are exported</div><div class='add'>+# ---------------------------------------</div><div class='add'>+</div><div class='add'>+defineReplace(APP_LAYER_SDK_EXPORT_PATH) {</div><div class='add'>+     return (/epoc32/include/app/$$1)</div><div class='add'>+}</div><div class='add'>+defineReplace(APP_LAYER_PUBLIC_EXPORT_PATH) {</div><div class='add'>+     return (/epoc32/include/app/$$1)</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# ---------------------------------------</div><div class='add'>+# Location, where the applications layer specific platform headers are exported</div><div class='add'>+# ---------------------------------------</div><div class='add'>+</div><div class='add'>+defineReplace(APP_LAYER_DOMAIN_EXPORT_PATH) {</div><div class='add'>+     return (/epoc32/include/platform/app/$$1)</div><div class='add'>+}</div><div class='add'>+defineReplace(APP_LAYER_PLATFORM_EXPORT_PATH) {</div><div class='add'>+     return (/epoc32/include/platform/app/$$1)</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# ---------------------------------------</div><div class='add'>+# Location, where the middleware layer specific public headers are exported</div><div class='add'>+# ---------------------------------------</div><div class='add'>+</div><div class='add'>+defineReplace(MW_LAYER_SDK_EXPORT_PATH) {</div><div class='add'>+     return (/epoc32/include/mw/$$1)</div><div class='add'>+}</div><div class='add'>+defineReplace(MW_LAYER_PUBLIC_EXPORT_PATH) {</div><div class='add'>+     return (/epoc32/include/mw/$$1)</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# ---------------------------------------</div><div class='add'>+# Location, where the middleware layer specific platform headers are exported</div><div class='add'>+# ---------------------------------------</div><div class='add'>+</div><div class='add'>+defineReplace(MW_LAYER_DOMAIN_EXPORT_PATH) {</div><div class='add'>+     return (/epoc32/include/platform/mw/$$1)</div><div class='add'>+}</div><div class='add'>+defineReplace(MW_LAYER_PLATFORM_EXPORT_PATH) {</div><div class='add'>+     return (/epoc32/include/platform/mw/$$1)</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# ---------------------------------------</div><div class='add'>+# Location, where the os layer specific public headers are exported</div><div class='add'>+# ---------------------------------------</div><div class='add'>+</div><div class='add'>+defineReplace(OSEXT_LAYER_SDK_EXPORT_PATH) {</div><div class='add'>+     return (/epoc32/include/$$1)</div><div class='add'>+}</div><div class='add'>+# WARNING: If the following path changes see the exists() function around line 219</div><div class='add'>+defineReplace(OS_LAYER_PUBLIC_EXPORT_PATH) {</div><div class='add'>+     return (/epoc32/include/$$1)</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# ---------------------------------------</div><div class='add'>+# Location, where the os specific platform headers are exported</div><div class='add'>+# ---------------------------------------</div><div class='add'>+</div><div class='add'>+defineReplace(OSEXT_LAYER_DOMAIN_EXPORT_PATH) {</div><div class='add'>+     return (/epoc32/include/platform/$$1)</div><div class='add'>+}</div><div class='add'>+defineReplace(OS_LAYER_PLATFORM_EXPORT_PATH) {</div><div class='add'>+     return (/epoc32/include/platform/$$1)</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# ---------------------------------------</div><div class='add'>+#  General comments about the 3 define statements related to include paths:</div><div class='add'>+#  1) the /epoc32/include/oem is now defined there for backward compability.</div><div class='add'>+#     Once the directory is empty, the directory will be removed. However this</div><div class='add'>+#     enables us to ensure that if you use these define statements =&gt; you do</div><div class='add'>+#     not have to remove the statements later on, when the directory no longer</div><div class='add'>+#     exists.</div><div class='add'>+#  2) These statements should be enough in normal cases. For certain specific</div><div class='add'>+#     cases you might need to add some specific directory from /epoc32/include</div><div class='add'>+#     (for instance /epoc32/include/ecom).</div><div class='add'>+#     In normal cases the include staments in code should be relative to one of</div><div class='add'>+#     the system include paths, but in certain cases, the included files requires</div><div class='add'>+#     that the subdirectory is also part of the system include paths.</div><div class='add'>+# ---------------------------------------</div><div class='add'>+</div><div class='add'>+# This variable defines the include paths, which are intended to be</div><div class='add'>+# used in the pro-files that are part of the applications-layer. It includes all</div><div class='add'>+# the needed directories from the /epoc32/include, that are valid ones for the</div><div class='add'>+# application-layer components.</div><div class='add'>+#</div><div class='add'>+# Applications layer is the last one in the list, since most likely the most of</div><div class='add'>+# the headers come from middleware or os-layer  =&gt; thus they are first.</div><div class='add'>+</div><div class='add'>+APP_LAYER_SYSTEMINCLUDE = \</div><div class='add'>+ /epoc32/include \</div><div class='add'>+ /epoc32/include/mw \</div><div class='add'>+ /epoc32/include/platform/mw \</div><div class='add'>+ /epoc32/include/platform \</div><div class='add'>+ /epoc32/include/app \</div><div class='add'>+ /epoc32/include/platform/app \</div><div class='add'>+ /epoc32/include/platform/loc \</div><div class='add'>+ /epoc32/include/platform/mw/loc \</div><div class='add'>+ /epoc32/include/platform/app/loc \</div><div class='add'>+ /epoc32/include/platform/loc/sc \</div><div class='add'>+ /epoc32/include/platform/mw/loc/sc \</div><div class='add'>+ /epoc32/include/platform/app/loc/sc</div><div class='add'>+</div><div class='add'>+# This define statements defines the include paths, which are intended to be</div><div class='add'>+# used in the pro-files that are part of the middleware-layer. It includes all</div><div class='add'>+# the needed directories from the /epoc32/include, that are valid ones for the</div><div class='add'>+# middleware-layer components.</div><div class='add'>+</div><div class='add'>+MW_LAYER_SYSTEMINCLUDE = \</div><div class='add'>+ /epoc32/include \</div><div class='add'>+ /epoc32/include/mw \</div><div class='add'>+ /epoc32/include/platform/mw \</div><div class='add'>+ /epoc32/include/platform \</div><div class='add'>+ /epoc32/include/platform/loc \</div><div class='add'>+ /epoc32/include/platform/mw/loc \</div><div class='add'>+ /epoc32/include/platform/loc/sc \</div><div class='add'>+ /epoc32/include/platform/mw/loc/sc</div><div class='add'>+</div><div class='add'>+# This define statements defines the include paths, which are intended to be</div><div class='add'>+# used in the pro-files that are part of the  osextensions-layer. It includes all</div><div class='add'>+# the needed directories from the /epoc32/include, that are valid ones for the</div><div class='add'>+# os-layer components.</div><div class='add'>+</div><div class='add'>+OS_LAYER_SYSTEMINCLUDE = \</div><div class='add'>+ /epoc32/include \</div><div class='add'>+ /epoc32/include/platform \</div><div class='add'>+ /epoc32/include/platform/loc \</div><div class='add'>+ /epoc32/include/platform/loc/sc</div><div class='add'>+</div><div class='add'>+# This define statements defines the include paths, which are intended to be</div><div class='add'>+# used in the pro-files that are part of the os-layer. This is intended</div><div class='add'>+# to be only used by those components which need to use in their mmp-file either</div><div class='add'>+# kern_ext.mmh or nkern_ext.mmh. Reason is that those</div><div class='add'>+# 2 files already contain the /epoc32/include  as system include path.</div><div class='add'>+</div><div class='add'>+OS_LAYER_KERNEL_SYSTEMINCLUDE = \</div><div class='add'>+ /epoc32/include/platform</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+# ---------------------------------------</div><div class='add'>+# Definitions that also define the systeminclude paths for various</div><div class='add'>+# part of stdapis. Append to INCLUDEPATH in pro-file.</div><div class='add'>+# ---------------------------------------</div><div class='add'>+</div><div class='add'>+OS_LAYER_LIBC_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis) \</div><div class='add'>+                  $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/sys)</div><div class='add'>+</div><div class='add'>+OS_LAYER_GLIB_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0) \</div><div class='add'>+                  $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/glib) \</div><div class='add'>+                  $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/glib-2.0/gObject)</div><div class='add'>+</div><div class='add'>+OS_LAYER_SSL_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/openssl)</div><div class='add'>+</div><div class='add'>+# stlportv5 is preferred over stlport as it has the throwing version of operator new</div><div class='add'>+exists($${EPOCROOT}epoc32/include/stdapis/stlport) \</div><div class='add'>+:!exists($${EPOCROOT}epoc32/include/stdapis/stlportv5) {</div><div class='add'>+    OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlport)</div><div class='add'>+} else {</div><div class='add'>+    OS_LAYER_STDCPP_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/stlportv5)</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+OS_LAYER_BOOST_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/boost)</div><div class='add'>+</div><div class='add'>+OS_LAYER_DBUS_SYSTEMINCLUDE = $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/dbus-1.0) \</div><div class='add'>+                  $$OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/dbus-1.0/dbus)</div><div class='add'>+</div><div class='add'>+OS_LAYER_LIBUTILITY_SYSTEMINCLUDE = $$OS_LAYER_PLATFORM_EXPORT_PATH(stdapis/utility)</div><div class='add'>+</div><div class='add'>+# ---------------------------------------</div><div class='add'>+# Definitions to export IBY files to different folders where they will be taken</div><div class='add'>+# to ROM image</div><div class='add'>+# ---------------------------------------</div><div class='add'>+</div><div class='add'>+defineReplace(CORE_APP_LAYER_IBY_EXPORT_PATH) {</div><div class='add'>+    return(/epoc32/rom/include/core/app/$$1)</div><div class='add'>+}</div><div class='add'>+defineReplace(CORE_MW_LAYER_IBY_EXPORT_PATH) {</div><div class='add'>+    return(/epoc32/rom/include/core/mw/$$1)</div><div class='add'>+}</div><div class='add'>+defineReplace(CORE_OSEXT_LAYER_IBY_EXPORT_PATH) {</div><div class='add'>+    return(/epoc32/rom/include/core/os/$$1)</div><div class='add'>+}</div><div class='add'>+defineReplace(CORE_OS_LAYER_IBY_EXPORT_PATH) {</div><div class='add'>+    return(/epoc32/rom/include/core/os/$$1)</div><div class='add'>+}</div><div class='add'>+defineReplace(CORE_TOOLS_LAYER_IBY_EXPORT_PATH) {</div><div class='add'>+    return(/epoc32/rom/include/core/tools/$$1)</div><div class='add'>+}</div><div class='add'>+defineReplace(CORE_ADAPT_LAYER_IBY_EXPORT_PATH) {</div><div class='add'>+    return(/epoc32/rom/include/$$1)</div><div class='add'>+}</div><div class='add'>+defineReplace(CUSTOMER_VARIANT_APP_LAYER_IBY_EXPORT_PATH) {</div><div class='add'>+    return(/epoc32/rom/include/customervariant/app/$$1)</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+# You need to define the following in pro-file, if you are using the stllib:</div><div class='add'>+# QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS</div><div class='add'>+# DEFINES *= $$STLLIB_USAGE_DEFINES</div><div class='add'>+STLLIB_USAGE_CW_FLAGS = "-wchar_t on"</div><div class='add'>+STLLIB_USAGE_DEFINES = _WCHAR_T_DECLARED</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/symbian/qt.conf b/config.profiles/symbian/qt.conf<br/>new file mode 100644<br/>index 0000000..29dfa88<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/qt.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/qt.conf</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+[Paths]</div><div class='add'>+Data = $(EPOCROOT)epoc32/tools/qt</div><div class='add'>+Headers = $(EPOCROOT)epoc32/include/mw</div><div class='add'>+Binaries = $(EPOCROOT)epoc32/tools</div><div class='add'>+Prefix = $(EPOCROOT)sf/mw/qt</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/symbian/qt.iby b/config.profiles/symbian/qt.iby<br/>new file mode 100644<br/>index 0000000..18b3940<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/qt.iby?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/qt.iby</a></div><div class='hunk'>@@ -0,0 +1,105 @@</div><div class='add'>+#ifndef QT_IBY</div><div class='add'>+#define QT_IBY</div><div class='add'>+</div><div class='add'>+#include &lt;bldvariant.hrh&gt;</div><div class='add'>+</div><div class='add'>+#warning("qt.iby: hack - BINARY_SELECTION_ORDER really needs to be at the baseport/device level as it depends on the device type");</div><div class='add'>+BINARY_SELECTION_ORDER ARMV6,ARMV5 // hack - this really needs to be at the baseport/device level as it depends on the device type</div><div class='add'>+</div><div class='add'>+file=ABI_DIR\BUILD_DIR\QtCore.dll            SHARED_LIB_DIR\QtCore.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\QtGui.dll             SHARED_LIB_DIR\QtGui.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\QtOpenVG.dll          SHARED_LIB_DIR\QtOpenVG.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\QtSvg.dll             SHARED_LIB_DIR\QtSvg.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\QtSql.dll             SHARED_LIB_DIR\QtSql.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\QtXml.dll             SHARED_LIB_DIR\QtXml.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\QtNetwork.dll         SHARED_LIB_DIR\QtNetwork.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\QtScript.dll          SHARED_LIB_DIR\QtScript.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\QtTest.dll            SHARED_LIB_DIR\QtTest.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\phonon.dll            SHARED_LIB_DIR\phonon.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\QtMultimedia.dll      SHARED_LIB_DIR\QtMultimedia.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\QtXmlPatterns.dll     SHARED_LIB_DIR\QtXmlPatterns.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\QtDeclarative.dll     SHARED_LIB_DIR\QtDeclarative.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\QtOpenGL.dll          SHARED_LIB_DIR\QtOpenGL.dll</div><div class='add'>+</div><div class='add'>+// imageformats</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qgif.dll              SHARED_LIB_DIR\qgif.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qico.dll              SHARED_LIB_DIR\qico.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qjpeg.dll             SHARED_LIB_DIR\qjpeg.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qmng.dll              SHARED_LIB_DIR\qmng.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qsvg.dll              SHARED_LIB_DIR\qsvg.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qtiff.dll             SHARED_LIB_DIR\qtiff.dll</div><div class='add'>+</div><div class='add'>+// codecs</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qcncodecs.dll         SHARED_LIB_DIR\qcncodecs.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qjpcodecs.dll         SHARED_LIB_DIR\qjpcodecs.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qkrcodecs.dll         SHARED_LIB_DIR\qkrcodecs.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qtwcodecs.dll         SHARED_LIB_DIR\qtwcodecs.dll</div><div class='add'>+</div><div class='add'>+// iconengines</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qsvgicon.dll          SHARED_LIB_DIR\qsvgicon.dll</div><div class='add'>+</div><div class='add'>+// Phonon MMF backend</div><div class='add'>+// This is commented out by default, as normally Helix backend will be used.</div><div class='add'>+// If the Helix backend is present, it will override MMF backend, so make sure to remove it from</div><div class='add'>+// image creation in addition to uncommenting the following lines if you want to use MMF backend.</div><div class='add'>+file=ABI_DIR\BUILD_DIR\phonon_mmf.dll        SHARED_LIB_DIR\phonon_mmf.dll</div><div class='add'>+data=\epoc32\data\z\resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin</div><div class='add'>+</div><div class='add'>+// graphicssystems</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qvggraphicssystem.dll SHARED_LIB_DIR\qvggraphicssystem.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qglgraphicssystem.dll SHARED_LIB_DIR\qglgraphicssystem.dll</div><div class='add'>+</div><div class='add'>+// bearer</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qsymbianbearer.dll    SHARED_LIB_DIR\qsymbianbearer.dll</div><div class='add'>+</div><div class='add'>+// S60 version compatibility plugins for 5.0 (3.1 and 3.2 devices are never likely to have this in ROM,</div><div class='add'>+// so don't bother including those plugins</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qts60plugin_5_0.dll   SHARED_LIB_DIR\qts60plugin_5_0.dll</div><div class='add'>+</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qtactilefeedback.dll   SHARED_LIB_DIR\qtactilefeedback.dll</div><div class='add'>+</div><div class='add'>+// imageformats stubs</div><div class='add'>+data=\epoc32\data\z\resource\qt\plugins\imageformats\qgif.qtplugin         resource\qt\plugins\imageformats\qgif.qtplugin</div><div class='add'>+data=\epoc32\data\z\resource\qt\plugins\imageformats\qico.qtplugin         resource\qt\plugins\imageformats\qico.qtplugin</div><div class='add'>+data=\epoc32\data\z\resource\qt\plugins\imageformats\qjpeg.qtplugin        resource\qt\plugins\imageformats\qjpeg.qtplugin</div><div class='add'>+data=\epoc32\data\z\resource\qt\plugins\imageformats\qmng.qtplugin         resource\qt\plugins\imageformats\qmng.qtplugin</div><div class='add'>+data=\epoc32\data\z\resource\qt\plugins\imageformats\qsvg.qtplugin         resource\qt\plugins\imageformats\qsvg.qtplugin</div><div class='add'>+data=\epoc32\data\z\resource\qt\plugins\imageformats\qtiff.qtplugin        resource\qt\plugins\imageformats\qtiff.qtplugin</div><div class='add'>+</div><div class='add'>+// codecs stubs</div><div class='add'>+data=\epoc32\data\z\resource\qt\plugins\codecs\qcncodecs.qtplugin          resource\qt\plugins\codecs\qcncodecs.qtplugin</div><div class='add'>+data=\epoc32\data\z\resource\qt\plugins\codecs\qjpcodecs.qtplugin          resource\qt\plugins\codecs\qjpcodecs.qtplugin</div><div class='add'>+data=\epoc32\data\z\resource\qt\plugins\codecs\qkrcodecs.qtplugin          resource\qt\plugins\codecs\qkrcodecs.qtplugin</div><div class='add'>+data=\epoc32\data\z\resource\qt\plugins\codecs\qtwcodecs.qtplugin          resource\qt\plugins\codecs\qtwcodecs.qtplugin</div><div class='add'>+</div><div class='add'>+// iconengines stubs</div><div class='add'>+data=\epoc32\data\z\resource\qt\plugins\iconengines\qsvgicon.qtplugin      resource\qt\plugins\iconengines\qsvgicon.qtplugin</div><div class='add'>+</div><div class='add'>+// qml import plugins</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qmlfolderlistmodelplugin.dll      SHARED_LIB_DIR\qmlfolderlistmodelplugin.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qmlgesturesplugin.dll      SHARED_LIB_DIR\qmlgesturesplugin.dll</div><div class='add'>+file=ABI_DIR\BUILD_DIR\qmlparticlesplugin.dll      SHARED_LIB_DIR\qmlparticlesplugin.dll</div><div class='add'>+</div><div class='add'>+data=\epoc32\data\z\resource\qt\imports\Qt\labs\folderlistmodel\qmlfolderlistmodelplugin.qtplugin    resource\qt\imports\Qt\labs\folderlistmodel\qmlfolderlistmodelplugin.qtplugin</div><div class='add'>+data=\epoc32\data\z\resource\qt\imports\Qt\labs\gestures\qmlgesturesplugin.qtplugin    resource\qt\imports\Qt\labs\gestures\qmlgesturesplugin.qtplugin</div><div class='add'>+data=\epoc32\data\z\resource\qt\imports\Qt\labs\particles\qmlparticlesplugin.qtplugin    resource\qt\imports\Qt\labs\particles\qmlparticlesplugin.qtplugin</div><div class='add'>+</div><div class='add'>+data=\epoc32\data\z\resource\qt\imports\Qt\labs\folderlistmodel\qmldir    resource\qt\imports\Qt\labs\folderlistmodel\qmldir</div><div class='add'>+data=\epoc32\data\z\resource\qt\imports\Qt\labs\gestures\qmldir    resource\qt\imports\Qt\labs\gestures\qmldir</div><div class='add'>+data=\epoc32\data\z\resource\qt\imports\Qt\labs\particles\qmldir    resource\qt\imports\Qt\labs\particles\qmldir</div><div class='add'>+</div><div class='add'>+// graphicssystems</div><div class='add'>+data=\epoc32\data\z\resource\qt\plugins\graphicssystems\qvggraphicssystem.qtplugin      resource\qt\plugins\graphicssystems\qvggraphicssystem.qtplugin</div><div class='add'>+data=\epoc32\data\z\resource\qt\plugins\graphicssystems\qglgraphicssystem.qtplugin      resource\qt\plugins\graphicssystems\qglgraphicssystem.qtplugin</div><div class='add'>+</div><div class='add'>+// bearer stub</div><div class='add'>+data=\epoc32\data\z\resource\qt\plugins\bearer\qsymbianbearer.qtplugin resource\qt\plugins\bearer\qsymbianbearer.qtplugin</div><div class='add'>+</div><div class='add'>+// feedback</div><div class='add'>+data=\epoc32\data\z\resource\qt\plugins\feedback\qtactilefeedback.qtplugin              resource\qt\plugins\feedback\qtactilefeedback.qtplugin</div><div class='add'>+</div><div class='add'>+// Stub sis file</div><div class='add'>+data=ZSYSTEM\install\qt_stub.sis    System\Install\qt_stub.sis</div><div class='add'>+</div><div class='add'>+#endif // __QT_IBY__</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/symbian/qt.pkg b/config.profiles/symbian/qt.pkg<br/>new file mode 100644<br/>index 0000000..6ef51ce<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/qt.pkg?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/qt.pkg</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+; Language</div><div class='add'>+&amp;EN</div><div class='add'>+</div><div class='add'>+; SIS header: name, uid, version</div><div class='add'>+#{"Qt"},(0x2001E61C),4,8,0,TYPE=SA,RU</div><div class='add'>+</div><div class='add'>+; Manual PKG pre-rules from PRO files</div><div class='add'>+; Default HW/platform dependencies</div><div class='add'>+[0x101F7961],0,0,0,{"S60ProductID"}</div><div class='add'>+[0x102032BE],0,0,0,{"S60ProductID"}</div><div class='add'>+[0x102752AE],0,0,0,{"S60ProductID"}</div><div class='add'>+[0x1028315F],0,0,0,{"S60ProductID"}</div><div class='add'>+</div><div class='add'>+; Localised Vendor name</div><div class='add'>+%{"Nokia, Qt"}</div><div class='add'>+</div><div class='add'>+; Unique Vendor name</div><div class='add'>+:"Nokia, Qt"</div><div class='add'>+</div><div class='add'>+; Dependencies of Qt libraries</div><div class='add'>+</div><div class='add'>+; DEPLOYMENT</div><div class='add'>+"/epoc32/release/armv5/urel/QtCore.dll"    - "!:\sys\bin\QtCore.dll"</div><div class='add'>+"/epoc32/release/armv5/urel/QtXml.dll"    - "!:\sys\bin\QtXml.dll"</div><div class='add'>+"/epoc32/release/armv5/urel/QtGui.dll"    - "!:\sys\bin\QtGui.dll"</div><div class='add'>+"/epoc32/release/armv5/urel/QtNetwork.dll"    - "!:\sys\bin\QtNetwork.dll"</div><div class='add'>+"/epoc32/release/armv5/urel/qsymbianbearer.dll" - "!:\sys\bin\qsymbianbearer.dll"</div><div class='add'>+"/epoc32/release/armv5/urel/QtTest.dll"    - "!:\sys\bin\QtTest.dll"</div><div class='add'>+"/epoc32/release/armv5/urel/QtSql.dll"    - "!:\sys\bin\QtSql.dll"</div><div class='add'>+"/epoc32/release/armv5/urel/QtSvg.dll"    - "!:\sys\bin\QtSvg.dll"</div><div class='add'>+"/epoc32/release/armv5/urel/QtScript.dll"    - "!:\sys\bin\QtScript.dll"</div><div class='add'>+"/epoc32/release/armv5/urel/QtOpenVG.dll"    - "!:\sys\bin\QtOpenVG.dll"</div><div class='add'>+"/epoc32/release/armv5/urel/QtOpenGL.dll"    - "!:\sys\bin\QtOpenGL.dll"</div><div class='add'>+"/epoc32/release/armv5/urel/phonon.dll"    - "!:\sys\bin\phonon.dll"</div><div class='add'>+"/epoc32/release/armv5/urel/QtMultimedia.dll"    - "!:\sys\bin\QtMultimedia.dll"</div><div class='add'>+"/epoc32/release/armv5/urel/QtDeclarative.dll"    - "!:\sys\bin\QtDeclarative.dll"</div><div class='add'>+"/epoc32/release/armv5/urel/QtXmlPatterns.dll"    - "!:\sys\bin\QtXmlPatterns.dll"</div><div class='add'>+</div><div class='add'>+"/epoc32/release/armv5/urel/qjpeg.dll"    - "!:\sys\bin\qjpeg.dll"</div><div class='add'>+"/epoc32/data/z/resource/qt/plugins/imageformats/qjpeg.qtplugin"    - "!:\resource\qt\plugins\imageformats\qjpeg.qtplugin"</div><div class='add'>+"/epoc32/release/armv5/urel/qgif.dll"    - "!:\sys\bin\qgif.dll"</div><div class='add'>+"/epoc32/data/z/resource/qt/plugins/imageformats/qgif.qtplugin"    - "!:\resource\qt\plugins\imageformats\qgif.qtplugin"</div><div class='add'>+"/epoc32/release/armv5/urel/qmng.dll"    - "!:\sys\bin\qmng.dll"</div><div class='add'>+"/epoc32/data/z/resource/qt/plugins/imageformats/qmng.qtplugin"    - "!:\resource\qt\plugins\imageformats\qmng.qtplugin"</div><div class='add'>+"/epoc32/release/armv5/urel/qtiff.dll"    - "!:\sys\bin\qtiff.dll"</div><div class='add'>+"/epoc32/data/z/resource/qt/plugins/imageformats/qtiff.qtplugin"    - "!:\resource\qt\plugins\imageformats\qtiff.qtplugin"</div><div class='add'>+"/epoc32/release/armv5/urel/qico.dll"    - "!:\sys\bin\qico.dll"</div><div class='add'>+"/epoc32/data/z/resource/qt/plugins/imageformats/qico.qtplugin"    - "!:\resource\qt\plugins\imageformats\qico.qtplugin"</div><div class='add'>+"/epoc32/release/armv5/urel/qsvg.dll"    - "!:\sys\bin\qsvg.dll"</div><div class='add'>+"/epoc32/data/z/resource/qt/plugins/imageformats/qsvg.qtplugin"    - "!:\resource\qt\plugins\imageformats\qsvg.qtplugin"</div><div class='add'>+"/epoc32/release/armv5/urel/qcncodecs.dll"    - "!:\sys\bin\qcncodecs.dll"</div><div class='add'>+"/epoc32/data/z/resource/qt/plugins/codecs/qcncodecs.qtplugin"    - "!:\resource\qt\plugins\codecs\qcncodecs.qtplugin"</div><div class='add'>+"/epoc32/release/armv5/urel/qjpcodecs.dll"    - "!:\sys\bin\qjpcodecs.dll"</div><div class='add'>+"/epoc32/data/z/resource/qt/plugins/codecs/qjpcodecs.qtplugin"    - "!:\resource\qt\plugins\codecs\qjpcodecs.qtplugin"</div><div class='add'>+"/epoc32/release/armv5/urel/qtwcodecs.dll"    - "!:\sys\bin\qtwcodecs.dll"</div><div class='add'>+"/epoc32/data/z/resource/qt/plugins/codecs/qtwcodecs.qtplugin"    - "!:\resource\qt\plugins\codecs\qtwcodecs.qtplugin"</div><div class='add'>+"/epoc32/release/armv5/urel/qkrcodecs.dll"    - "!:\sys\bin\qkrcodecs.dll"</div><div class='add'>+"/epoc32/data/z/resource/qt/plugins/codecs/qkrcodecs.qtplugin"    - "!:\resource\qt\plugins\codecs\qkrcodecs.qtplugin"</div><div class='add'>+"/epoc32/release/armv5/urel/qvggraphicssystem.dll"    - "!:\sys\bin\qvggraphicssystem.dll"</div><div class='add'>+"/epoc32/data/z/resource/qt/plugins/graphicssystems/qvggraphicssystem.qtplugin"    - "!:\resource\qt\plugins\graphicssystems\qvggraphicssystem.qtplugin"</div><div class='add'>+"/epoc32/release/armv5/urel/qglgraphicssystem.dll" - "!:\sys\bin\qglgraphicssystem.dll"</div><div class='add'>+"/epoc32/data/z/resource/qt/plugins/graphicssystems/qglgraphicssystem.qtplugin" - "!:\resource\qt\plugins\graphicssystems\qglgraphicssystem.qtplugin"</div><div class='add'>+"/epoc32/release/armv5/urel/qsvgicon.dll"    - "!:\sys\bin\qsvgicon.dll"</div><div class='add'>+"/epoc32/data/z/resource/qt/plugins/iconengines/qsvgicon.qtplugin"    - "!:\resource\qt\plugins\iconengines\qsvgicon.qtplugin"</div><div class='add'>+"/epoc32/data/z/resource/qt/plugins/bearer/qsymbianbearer.qtplugin" - "!:\resource\qt\plugins\bearer\qsymbianbearer.qtplugin"</div><div class='add'>+</div><div class='add'>+; Phonon MMF plugin</div><div class='add'>+"/epoc32/release/armv5/urel/phonon_mmf.dll"    - "!:\sys\bin\phonon_mmf.dll"</div><div class='add'>+"/epoc32/data/z/resource/qt/plugins/phonon_backend/phonon_mmf.qtplugin" - "!:\resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+"/epoc32/release/armv5/urel/qts60plugin_5_0.dll" - "!:\sys\bin\qts60plugin_5_0.dll"</div><div class='add'>+</div><div class='add'>+; localization</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_ur.qm" - "!:\resource\qt\translations\qt_ur.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_fa.qm" - "!:\resource\qt\translations\qt_fa.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_ar.qm" - "!:\resource\qt\translations\qt_ar.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_he.qm" - "!:\resource\qt\translations\qt_he.qm"</div><div class='add'>+</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_fr.qm" - "!:\resource\qt\translations\qt_fr.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_pl.qm" - "!:\resource\qt\translations\qt_pl.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_ru.qm" - "!:\resource\qt\translations\qt_ru.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_zh_cn.qm" - "!:\resource\qt\translations\qt_zh_cn.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_zh_tw.qm" - "!:\resource\qt\translations\qt_zh_tw.qm"</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_ar.qm" - "!:\resource\qt\translations\qt_ar.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_cs.qm" - "!:\resource\qt\translations\qt_cs.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_da.qm" - "!:\resource\qt\translations\qt_da.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_de.qm" - "!:\resource\qt\translations\qt_de.qm"</div><div class='add'>+</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_es.qm" - "!:\resource\qt\translations\qt_es.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_gl.qm" - "!:\resource\qt\translations\qt_gl.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_hu.qm" - "!:\resource\qt\translations\qt_hu.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_ja.qm" - "!:\resource\qt\translations\qt_ja.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_pt.qm" - "!:\resource\qt\translations\qt_pt.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_sk.qm" - "!:\resource\qt\translations\qt_sk.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_sl.qm" - "!:\resource\qt\translations\qt_sl.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_sv.qm" - "!:\resource\qt\translations\qt_sv.qm"</div><div class='add'>+"/epoc32/data/z/resource/qt/translations/qt_uk.qm" - "!:\resource\qt\translations\qt_uk.qm"
\ No newline at end of file</div><div class='head'>diff --git a/config.profiles/symbian/qt.sisx b/config.profiles/symbian/qt.sisx<br/>new file mode 100644<br/>index 0000000..56a6051<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/qt.sisx?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/qt.sisx</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+1
\ No newline at end of file</div><div class='head'>diff --git a/config.profiles/symbian/qt_stub.pkg b/config.profiles/symbian/qt_stub.pkg<br/>new file mode 100644<br/>index 0000000..0ac4439<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/qt_stub.pkg?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/qt_stub.pkg</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+; Language</div><div class='add'>+&amp;EN</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+; SIS header: name, uid, version</div><div class='add'>+#{"Qt"},(0x2001E61C),4,8,0</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+; Manual PKG pre-rules from PRO files</div><div class='add'>+; Default HW/platform dependencies</div><div class='add'>+</div><div class='add'>+; Localised Vendor name</div><div class='add'>+%{"Nokia, Qt"}</div><div class='add'>+</div><div class='add'>+; Unique Vendor name</div><div class='add'>+:"Nokia, Qt"</div><div class='add'>+</div><div class='head'>diff --git a/config.profiles/symbian/qt_stub.sis b/config.profiles/symbian/qt_stub.sis<br/>new file mode 100644<br/>index 0000000..30d91a9<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/qt_stub.sis?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/qt_stub.sis</a></div>Binary files differ<div class='head'>diff --git a/config.profiles/symbian/qtconfig.flm b/config.profiles/symbian/qtconfig.flm<br/>new file mode 100644<br/>index 0000000..93410f0<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/qtconfig.flm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/qtconfig.flm</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+# /****************************************************************************</div><div class='add'>+# **</div><div class='add'>+# ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+# ** Contact:</div><div class='add'>+# **</div><div class='add'>+# ****************************************************************************/</div><div class='add'>+</div><div class='add'>+# FLM to build Qt tools.</div><div class='add'>+</div><div class='add'>+QT_ROOT:= ../..</div><div class='add'>+TARGETDIR:=$(EPOCROOT)/$(INSTALLPATH)</div><div class='add'>+MKSPECDIR:=$(EPOCROOT)/$(INSTALLPATH)/qt</div><div class='add'>+SOURCEDIR:=$(EXTENSION_ROOT)/$(QT_ROOT)/bin</div><div class='add'>+TOOLSSRCDIR:=$(EXTENSION_ROOT)/$(QT_ROOT)/src/tools</div><div class='add'>+LANGUAGETOOLDIR:=$(EXTENSION_ROOT)/$(QT_ROOT)/tools/linguist</div><div class='add'>+CONFIGURE_APP:=configure$(DOTEXE)</div><div class='add'>+</div><div class='add'>+$(call makepath,$(TARGETDIR))</div><div class='add'>+</div><div class='add'>+ifneq ($(filter linux,$(HOSTPLATFORM)),)</div><div class='add'>+PLATFORM:=$(PLATFORM.LINUX)</div><div class='add'>+else</div><div class='add'>+PLATFORM:=$(PLATFORM.WIN32)</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+TARGET_TOOLS:=$(TARGETDIR)/qmake$(DOTEXE) $(TARGETDIR)/moc$(DOTEXE) $(TARGETDIR)/rcc$(DOTEXE) $(TARGETDIR)/uic$(DOTEXE) $(TARGETDIR)/lrelease$(DOTEXE)</div><div class='add'>+QT_TOOLS:= $(TOOLSSRCDIR)/uic $(TOOLSSRCDIR)/moc $(TOOLSSRCDIR)/rcc $(LANGUAGETOOLDIR)/lrelease</div><div class='add'>+SOURCE_TOOLS:=$(SOURCEDIR)/qmake$(DOTEXE) $(SOURCEDIR)/moc$(DOTEXE) $(SOURCEDIR)/rcc$(DOTEXE) $(SOURCEDIR)/uic$(DOTEXE) $(SOURCEDIR)/lrelease$(DOTEXE)</div><div class='add'>+</div><div class='add'>+define QtConfiguration</div><div class='add'>+ifneq ($(filter linux,$(HOSTPLATFORM)),)</div><div class='add'>+$(TARGET_TOOLS): $(QT_TOOLS)</div><div class='add'>+else</div><div class='add'>+$(TARGET_TOOLS): $(SOURCEDIR)/qmake$(DOTEXE)</div><div class='add'>+endif</div><div class='add'>+	$(call startrule,qtconf_deploy) \</div><div class='add'>+	$(GNUCP) $(SOURCEDIR)/$$(notdir $$@) $$@ \</div><div class='add'>+	$(call endrule,qtconf_deploy)</div><div class='add'>+</div><div class='add'>+ifneq ($(filter linux,$(HOSTPLATFORM)),)</div><div class='add'>+$(QT_TOOLS): $(TOOLSSRCDIR)/bootstrap</div><div class='add'>+	$(call startrule,qtconf_tools_build) \</div><div class='add'>+	cd $$@; \</div><div class='add'>+	$(GNUMAKE38); \</div><div class='add'>+	cd .. \</div><div class='add'>+	$(call endrule,qtconf_tools_build)</div><div class='add'>+</div><div class='add'>+$(TOOLSSRCDIR)/bootstrap:$(SOURCEDIR)/qmake$(DOTEXE)</div><div class='add'>+	$(call startrule,qtconf_bootstrap_build) \</div><div class='add'>+	cd $(TOOLSSRCDIR)/bootstrap; \</div><div class='add'>+	$(GNUMAKE38); \</div><div class='add'>+	cd .. \</div><div class='add'>+	$(call endrule,qtconf_bootstrap_build)</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+$(SOURCEDIR)/qmake$(DOTEXE): $(EXTENSION_ROOT)/$(QT_ROOT)/$(CONFIGURE_APP)</div><div class='add'>+	$(call startrule,qtconf) \</div><div class='add'>+	cd $(EXTENSION_ROOT)/$(QT_ROOT) &amp;&amp; unset INCLUDE &amp;&amp; unset LIB &amp;&amp; $(EXTENSION_ROOT)/$(QT_ROOT)/$(CONFIGURE_APP) -platform $(PLATFORM) -xplatform $(XPLATFORM) $(OPTIONS) \</div><div class='add'>+	$(call endrule,qtconf)</div><div class='add'>+	$(call startrule,headerexport) \</div><div class='add'>+	cd $(EXTENSION_ROOT)/$(QT_ROOT)/config.profiles/symbian &amp;&amp; \</div><div class='add'>+	perl headerexport -base-dir $(EXTENSION_ROOT)/$(QT_ROOT) -outdir $(EPOCROOT)/epoc32/include/</div><div class='add'>+	$(call endrule,headerexport)</div><div class='add'>+	$(call startrule,mkspecexport) \</div><div class='add'>+	$(GNUCP) -R $(EXTENSION_ROOT)/$(QT_ROOT)/mkspecs $(MKSPECDIR)</div><div class='add'>+	$(call endrule,mkspecexport)</div><div class='add'>+endef</div><div class='add'>+</div><div class='add'>+# Here a variable named "done_&lt;sanitised $SISFILE&gt;" gets created</div><div class='add'>+GUARD:=done_$(call sanitise,$(TARGETDIR)/qmake$(DOTEXE))</div><div class='add'>+# If variable "done_..." not set, set it to 1, so that</div><div class='add'>+# UREL and UDEB do not execute makesis twice on the same target</div><div class='add'>+ifeq ($($(GUARD)),)</div><div class='add'>+$(GUARD):=1</div><div class='add'>+ifneq ($(filter linux,$(HOSTPLATFORM)),)</div><div class='add'>+EXPORT:: $(QT_TOOLS) $(TARGET_TOOLS)</div><div class='add'>+else</div><div class='add'>+EXPORT:: $(TARGET_TOOLS)</div><div class='add'>+endif</div><div class='add'>+$(eval $(call QtConfiguration))</div><div class='add'>+$(eval $(call whatmacro,$(TARGET_TOOLS)))</div><div class='add'>+ifeq ($(OSTYPE),unix)</div><div class='add'>+$(eval $(call GenerateStandardCleanTarget,$(QT_TOOLS) $(TARGET_TOOLS) $(SOURCE_TOOLS),$(TARGETDIR)))</div><div class='add'>+else</div><div class='add'>+$(eval $(call GenerateStandardCleanTarget,$(TARGET_TOOLS) $(SOURCE_TOOLS),$(TARGETDIR)))</div><div class='add'>+endif</div><div class='add'>+endif</div><div class='head'>diff --git a/config.profiles/symbian/qtconfig.xml b/config.profiles/symbian/qtconfig.xml<br/>new file mode 100644<br/>index 0000000..c2244d6<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/qtconfig.xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/qtconfig.xml</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;</div><div class='add'>+&lt;build xmlns="http://symbian.com/xml/build"</div><div class='add'>+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"</div><div class='add'>+       xsi:schemaLocation="http://symbian.com/xml/build http://symbian.com/xml/build/2_0.xsd"&gt;</div><div class='add'>+</div><div class='add'>+    &lt;!-- Tools interfaces --&gt;</div><div class='add'>+</div><div class='add'>+    &lt;interface name="qt.qtconfig" extends="Symbian.UserFLM" flm="qtconfig.flm"&gt;</div><div class='add'>+        &lt;param name='QT_ROOT' default='../..'/&gt;</div><div class='add'>+        &lt;param name='INSTALLPATH' default='epoc32/tools'/&gt;</div><div class='add'>+        &lt;param name='XPLATFORM' default='symbian-sbsv2'/&gt;</div><div class='add'>+        &lt;param name='PLATFORM.WIN32' default='win32-g++' /&gt;</div><div class='add'>+        &lt;param name='PLATFORM.LINUX' default='linux-g++-32' /&gt;</div><div class='add'>+        &lt;param name='OPTIONS' default='' /&gt;</div><div class='add'>+    &lt;/interface&gt;</div><div class='add'>+</div><div class='add'>+&lt;/build&gt;</div><div class='head'>diff --git a/config.profiles/symbian/qtdemoapps.pkg b/config.profiles/symbian/qtdemoapps.pkg<br/>new file mode 100644<br/>index 0000000..e03989a<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/qtdemoapps.pkg?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/qtdemoapps.pkg</a></div><div class='hunk'>@@ -0,0 +1,203 @@</div><div class='add'>+; Language</div><div class='add'>+&amp;EN</div><div class='add'>+</div><div class='add'>+; SIS header: name, uid, version</div><div class='add'>+#{"Qtdemo"},(0xE001E61C),4,8,0,TYPE=SA</div><div class='add'>+</div><div class='add'>+; Localised Vendor name</div><div class='add'>+%{"Nokia, Qt"}</div><div class='add'>+</div><div class='add'>+; Unique Vendor name</div><div class='add'>+:"Nokia, Qt"</div><div class='add'>+</div><div class='add'>+"/epoc32/release/armv5/urel/star.exe"    - "!:\sys\bin\star.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/star.rsc"    - "!:\resource\apps\star.rsc"</div><div class='add'>+"/epoc32/data/Z/private/10003a3f/import/Apps/star_reg.rsc"   - "!:\private\10003a3f\import\apps\star_reg.rsc"</div><div class='add'>+</div><div class='add'>+"/epoc32/release/armv5/urel/wiggly.exe"    - "!:\sys\bin\wiggly.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/wiggly.rsc"    - "!:\resource\apps\wiggly.rsc"</div><div class='add'>+"/epoc32/data/Z/private/10003a3f/import/Apps/wiggly_reg.rsc"   - "!:\private\10003a3f\import\apps\wiggly_reg.rsc"</div><div class='add'>+</div><div class='add'>+"/epoc32/release/armv5/urel/animatedtiles.exe"    - "!:\sys\bin\animatedtiles.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/animatedtiles.rsc"    - "!:\resource\apps\animatedtiles.rsc"</div><div class='add'>+"/epoc32/data/Z/private/10003a3f/import/Apps/animatedtiles_reg.rsc"   - "!:\private\10003a3f\import\apps\animatedtiles_reg.rsc"</div><div class='add'>+</div><div class='add'>+"/epoc32/release/armv5/urel/collidingmice.exe"    - "!:\sys\bin\collidingmice.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/collidingmice.rsc"    - "!:\resource\apps\collidingmice.rsc"</div><div class='add'>+"/epoc32/data/Z/private/10003a3f/import/Apps/collidingmice_reg.rsc"   - "!:\private\10003a3f\import\apps\collidingmice_reg.rsc"</div><div class='add'>+</div><div class='add'>+"/epoc32/release/armv5/urel/addressbook.exe"    - "!:\sys\bin\addressbook.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/addressbook.rsc"    - "!:\resource\apps\addressbook.rsc"</div><div class='add'>+"/epoc32/data/Z/private/10003a3f/import/Apps/addressbook_reg.rsc"   - "!:\private\10003a3f\import\apps\addressbook_reg.rsc"</div><div class='add'>+</div><div class='add'>+"/epoc32/release/armv5/urel/svgviewer.exe"    - "!:\sys\bin\svgviewer.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/svgviewer.rsc"    - "!:\resource\apps\svgviewer.rsc"</div><div class='add'>+"/epoc32/data/Z/private/10003a3f/import/Apps/svgviewer_reg.rsc"   - "!:\private\10003a3f\import\apps\svgviewer_reg.rsc"</div><div class='add'>+</div><div class='add'>+"/epoc32/release/armv5/urel/analogclock.exe"    - "!:\sys\bin\analogclock.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/analogclock.rsc"    - "!:\resource\apps\analogclock.rsc"</div><div class='add'>+"/epoc32/data/Z/private/10003a3f/import/Apps/analogclock_reg.rsc"   - "!:\private\10003a3f\import\apps\analogclock_reg.rsc"</div><div class='add'>+</div><div class='add'>+"/epoc32/release/armv5/urel/imagegestures.exe"    - "!:\sys\bin\imagegestures.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/imagegestures.rsc"    - "!:\resource\apps\imagegestures.rsc"</div><div class='add'>+"/epoc32/data/Z/private/10003a3f/import/Apps/imagegestures_reg.rsc"   - "!:\private\10003a3f\import\apps\imagegestures_reg.rsc"</div><div class='add'>+</div><div class='add'>+"/epoc32/release/armv5/urel/qftp.exe"    - "!:\sys\bin\qftp.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/qftp.rsc"    - "!:\resource\apps\qftp.rsc"</div><div class='add'>+"/epoc32/data/Z/private/10003a3f/import/Apps/qftp_reg.rsc"   - "!:\private\10003a3f\import\apps\qftp_reg.rsc"</div><div class='add'>+</div><div class='add'>+"/epoc32/release/armv5/urel/masterdetail.exe"    - "!:\sys\bin\masterdetail.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/masterdetail.rsc"    - "!:\resource\apps\masterdetail.rsc"</div><div class='add'>+"/epoc32/data/Z/private/10003a3f/import/Apps/masterdetail_reg.rsc"   - "!:\private\10003a3f\import\apps\masterdetail_reg.rsc"</div><div class='add'>+</div><div class='add'>+"/epoc32/release/armv5/urel/previewer.exe"    - "!:\sys\bin\previewer.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/previewer.rsc"    - "!:\resource\apps\previewer.rsc"</div><div class='add'>+"/epoc32/data/Z/private/10003a3f/import/Apps/previewer_reg.rsc"   - "!:\private\10003a3f\import\apps\previewer_reg.rsc"</div><div class='add'>+</div><div class='add'>+"/epoc32/release/armv5/urel/anomaly.exe"    - "!:\sys\bin\anomaly.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/anomaly.rsc"    - "!:\resource\apps\anomaly.rsc"</div><div class='add'>+"/epoc32/data/Z/private/10003a3f/import/Apps/anomaly_reg.rsc"   - "!:\private\10003a3f\import\apps\anomaly_reg.rsc"</div><div class='add'>+</div><div class='add'>+;qmlcalculator</div><div class='add'>+; Executable and default resource files</div><div class='add'>+"/epoc32/release/armv5/urel/qmlcalculator.exe" - "!:\sys\bin\qmlcalculator.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/qmlcalculator.rsc" - "!:\resource\apps\qmlcalculator.rsc"</div><div class='add'>+"/epoc32/data/z/private/10003a3f/import/apps/qmlcalculator_reg.rsc" - "!:\private\10003a3f\import\apps\qmlcalculator_reg.rsc"</div><div class='add'>+"/epoc32/data/z/resource/apps/qmlcalculator.mif" - "!:\resource\apps\qmlcalculator.mif"</div><div class='add'>+</div><div class='add'>+; DEPLOYMENT</div><div class='add'>+"/epoc32/data/z/private/A000E3FB/calculator.qml" - "!:\private\A000E3FB\calculator.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FB/Core/Button.qml" - "!:\private\A000E3FB\Core\Button.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FB/Core/calculator.js" - "!:\private\A000E3FB\Core\calculator.js"</div><div class='add'>+"/epoc32/data/z/private/A000E3FB/Core/Display.qml" - "!:\private\A000E3FB\Core\Display.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FB/Core/images/button-.png" - "!:\private\A000E3FB\Core\images\button-.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FB/Core/images/button-blue.png" - "!:\private\A000E3FB\Core\images\button-blue.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FB/Core/images/button-green.png" - "!:\private\A000E3FB\Core\images\button-green.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FB/Core/images/button-purple.png" - "!:\private\A000E3FB\Core\images\button-purple.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FB/Core/images/button-red.png" - "!:\private\A000E3FB\Core\images\button-red.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FB/Core/images/display.png" - "!:\private\A000E3FB\Core\images\display.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FB/Core/qmldir" - "!:\private\A000E3FB\Core\qmldir"</div><div class='add'>+</div><div class='add'>+;qmlclocks</div><div class='add'>+; Executable and default resource files</div><div class='add'>+"/epoc32/release/armv5/urel/qmlclocks.exe" - "!:\sys\bin\qmlclocks.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/qmlclocks.rsc" - "!:\resource\apps\qmlclocks.rsc"</div><div class='add'>+"/epoc32/data/z/private/10003a3f/import/apps/qmlclocks_reg.rsc" - "!:\private\10003a3f\import\apps\qmlclocks_reg.rsc"</div><div class='add'>+"/epoc32/data/z/resource/apps/qmlclocks.mif" - "!:\resource\apps\qmlclocks.mif"</div><div class='add'>+</div><div class='add'>+; DEPLOYMENT</div><div class='add'>+"/epoc32/data/z/private/A000E3FC/clocks.qml" - "!:\private\A000E3FC\clocks.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FC/content/background.png" - "!:\private\A000E3FC\content\background.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FC/content/center.png" - "!:\private\A000E3FC\content\center.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FC/content/clock-night.png" - "!:\private\A000E3FC\content\clock-night.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FC/content/clock.png" - "!:\private\A000E3FC\content\clock.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FC/content/Clock.qml" - "!:\private\A000E3FC\content\Clock.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FC/content/hour.png" - "!:\private\A000E3FC\content\hour.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FC/content/minute.png" - "!:\private\A000E3FC\content\minute.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FC/content/second.png" - "!:\private\A000E3FC\content\second.png"</div><div class='add'>+</div><div class='add'>+;qmldialcontrol</div><div class='add'>+; Executable and default resource files</div><div class='add'>+"/epoc32/release/armv5/urel/qmldialcontrol.exe" - "!:\sys\bin\qmldialcontrol.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/qmldialcontrol.rsc" - "!:\resource\apps\qmldialcontrol.rsc"</div><div class='add'>+"/epoc32/data/z/private/10003a3f/import/apps/qmldialcontrol_reg.rsc" - "!:\private\10003a3f\import\apps\qmldialcontrol_reg.rsc"</div><div class='add'>+"/epoc32/data/z/resource/apps/qmldialcontrol.mif" - "!:\resource\apps\qmldialcontrol.mif"</div><div class='add'>+</div><div class='add'>+; DEPLOYMENT</div><div class='add'>+"/epoc32/data/z/private/A000E3FD/dialcontrol.qml" - "!:\private\A000E3FD\dialcontrol.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FD/content/background.png" - "!:\private\A000E3FD\content\background.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FD/content/Dial.qml" - "!:\private\A000E3FD\content\Dial.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FD/content/needle.png" - "!:\private\A000E3FD\content\needle.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FD/content/needle_shadow.png" - "!:\private\A000E3FD\content\needle_shadow.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FD/content/overlay.png" - "!:\private\A000E3FD\content\overlay.png"</div><div class='add'>+</div><div class='add'>+;qmleasing</div><div class='add'>+; Executable and default resource files</div><div class='add'>+"/epoc32/release/armv5/urel/qmleasing.exe" - "!:\sys\bin\qmleasing.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/qmleasing.rsc" - "!:\resource\apps\qmleasing.rsc"</div><div class='add'>+"/epoc32/data/z/private/10003a3f/import/apps/qmleasing_reg.rsc" - "!:\private\10003a3f\import\apps\qmleasing_reg.rsc"</div><div class='add'>+"/epoc32/data/z/resource/apps/qmleasing.mif" - "!:\resource\apps\qmleasing.mif"</div><div class='add'>+</div><div class='add'>+; DEPLOYMENT</div><div class='add'>+"/epoc32/data/z/private/A000E3FE/easing.qml" - "!:\private\A000E3FE\easing.qml"</div><div class='add'>+</div><div class='add'>+;qmlflickr</div><div class='add'>+; Executable and default resource files</div><div class='add'>+"/epoc32/release/armv5/urel/qmlflickr.exe" - "!:\sys\bin\qmlflickr.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/qmlflickr.rsc" - "!:\resource\apps\qmlflickr.rsc"</div><div class='add'>+"/epoc32/data/z/private/10003a3f/import/apps/qmlflickr_reg.rsc" - "!:\private\10003a3f\import\apps\qmlflickr_reg.rsc"</div><div class='add'>+"/epoc32/data/z/resource/apps/qmlflickr.mif" - "!:\resource\apps\qmlflickr.mif"</div><div class='add'>+</div><div class='add'>+; DEPLOYMENT</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/flickr.qml" - "!:\private\A000E3FF\flickr.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/common/Progress.qml" - "!:\private\A000E3FF\common\Progress.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/common/qmldir" - "!:\private\A000E3FF\common\qmldir"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/common/RssModel.qml" - "!:\private\A000E3FF\common\RssModel.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/common/ScrollBar.qml" - "!:\private\A000E3FF\common\ScrollBar.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/common/Slider.qml" - "!:\private\A000E3FF\common\Slider.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/mobile/Button.qml" - "!:\private\A000E3FF\mobile\Button.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/mobile/GridDelegate.qml" - "!:\private\A000E3FF\mobile\GridDelegate.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/mobile/ImageDetails.qml" - "!:\private\A000E3FF\mobile\ImageDetails.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/mobile/images/gloss.png" - "!:\private\A000E3FF\mobile\images\gloss.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/mobile/images/lineedit.png" - "!:\private\A000E3FF\mobile\images\lineedit.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/mobile/images/lineedit.sci" - "!:\private\A000E3FF\mobile\images\lineedit.sci"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/mobile/images/quit.png" - "!:\private\A000E3FF\mobile\images\quit.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/mobile/images/stripes.png" - "!:\private\A000E3FF\mobile\images\stripes.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/mobile/images/titlebar.png" - "!:\private\A000E3FF\mobile\images\titlebar.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/mobile/images/titlebar.sci" - "!:\private\A000E3FF\mobile\images\titlebar.sci"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/mobile/images/toolbutton.png" - "!:\private\A000E3FF\mobile\images\toolbutton.png"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/mobile/images/toolbutton.sci" - "!:\private\A000E3FF\mobile\images\toolbutton.sci"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/mobile/ListDelegate.qml" - "!:\private\A000E3FF\mobile\ListDelegate.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/mobile/TitleBar.qml" - "!:\private\A000E3FF\mobile\TitleBar.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E3FF/mobile/ToolBar.qml" - "!:\private\A000E3FF\mobile\ToolBar.qml"</div><div class='add'>+</div><div class='add'>+;qmlphotoviewer</div><div class='add'>+; Executable and default resource files</div><div class='add'>+"/epoc32/release/armv5/urel/qmlphotoviewer.exe" - "!:\sys\bin\qmlphotoviewer.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/qmlphotoviewer.rsc" - "!:\resource\apps\qmlphotoviewer.rsc"</div><div class='add'>+"/epoc32/data/z/private/10003a3f/import/apps/qmlphotoviewer_reg.rsc" - "!:\private\10003a3f\import\apps\qmlphotoviewer_reg.rsc"</div><div class='add'>+"/epoc32/data/z/resource/apps/qmlphotoviewer.mif" - "!:\resource\apps\qmlphotoviewer.mif"</div><div class='add'>+</div><div class='add'>+; DEPLOYMENT</div><div class='add'>+"/epoc32/data/z/private/A000E400/photoviewer.qml" - "!:\private\A000E400\photoviewer.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E400/PhotoViewerCore/AlbumDelegate.qml" - "!:\private\A000E400\PhotoViewerCore\AlbumDelegate.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E400/PhotoViewerCore/BusyIndicator.qml" - "!:\private\A000E400\PhotoViewerCore\BusyIndicator.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E400/PhotoViewerCore/Button.qml" - "!:\private\A000E400\PhotoViewerCore\Button.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E400/PhotoViewerCore/EditableButton.qml" - "!:\private\A000E400\PhotoViewerCore\EditableButton.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E400/PhotoViewerCore/images/box-shadow.png" - "!:\private\A000E400\PhotoViewerCore\images\box-shadow.png"</div><div class='add'>+"/epoc32/data/z/private/A000E400/PhotoViewerCore/images/busy.png" - "!:\private\A000E400\PhotoViewerCore\images\busy.png"</div><div class='add'>+"/epoc32/data/z/private/A000E400/PhotoViewerCore/images/cardboard.png" - "!:\private\A000E400\PhotoViewerCore\images\cardboard.png"</div><div class='add'>+"/epoc32/data/z/private/A000E400/PhotoViewerCore/PhotoDelegate.qml" - "!:\private\A000E400\PhotoViewerCore\PhotoDelegate.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E400/PhotoViewerCore/ProgressBar.qml" - "!:\private\A000E400\PhotoViewerCore\ProgressBar.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E400/PhotoViewerCore/qmldir" - "!:\private\A000E400\PhotoViewerCore\qmldir"</div><div class='add'>+"/epoc32/data/z/private/A000E400/PhotoViewerCore/RssModel.qml" - "!:\private\A000E400\PhotoViewerCore\RssModel.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E400/PhotoViewerCore/script/script.js" - "!:\private\A000E400\PhotoViewerCore\script\script.js"</div><div class='add'>+"/epoc32/data/z/private/A000E400/PhotoViewerCore/Tag.qml" - "!:\private\A000E400\PhotoViewerCore\Tag.qml"</div><div class='add'>+</div><div class='add'>+; qmltwitter</div><div class='add'>+; Executable and default resource files</div><div class='add'>+"/epoc32/release/armv5/urel/qmltwitter.exe" - "!:\sys\bin\qmltwitter.exe"</div><div class='add'>+"/epoc32/data/z/resource/apps/qmltwitter.rsc" - "!:\resource\apps\qmltwitter.rsc"</div><div class='add'>+"/epoc32/data/z/private/10003a3f/import/apps/qmltwitter_reg.rsc" - "!:\private\10003a3f\import\apps\qmltwitter_reg.rsc"</div><div class='add'>+"/epoc32/data/z/resource/apps/qmltwitter.mif" - "!:\resource\apps\qmltwitter.mif"</div><div class='add'>+</div><div class='add'>+; DEPLOYMENT</div><div class='add'>+"/epoc32/data/z/private/A000E401/twitter.qml" - "!:\private\A000E401\twitter.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/Button.qml" - "!:\private\A000E401\TwitterCore\Button.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/FatDelegate.qml" - "!:\private\A000E401\TwitterCore\FatDelegate.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/images/gloss.png" - "!:\private\A000E401\TwitterCore\images\gloss.png"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/images/lineedit.png" - "!:\private\A000E401\TwitterCore\images\lineedit.png"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/images/lineedit.sci" - "!:\private\A000E401\TwitterCore\images\lineedit.sci"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/images/loading.png" - "!:\private\A000E401\TwitterCore\images\loading.png"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/images/stripes.png" - "!:\private\A000E401\TwitterCore\images\stripes.png"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/images/titlebar.png" - "!:\private\A000E401\TwitterCore\images\titlebar.png"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/images/titlebar.sci" - "!:\private\A000E401\TwitterCore\images\titlebar.sci"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/images/toolbutton.png" - "!:\private\A000E401\TwitterCore\images\toolbutton.png"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/images/toolbutton.sci" - "!:\private\A000E401\TwitterCore\images\toolbutton.sci"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/Loading.qml" - "!:\private\A000E401\TwitterCore\Loading.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/MultiTitleBar.qml" - "!:\private\A000E401\TwitterCore\MultiTitleBar.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/qmldir" - "!:\private\A000E401\TwitterCore\qmldir"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/RssModel.qml" - "!:\private\A000E401\TwitterCore\RssModel.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/TitleBar.qml" - "!:\private\A000E401\TwitterCore\TitleBar.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/ToolBar.qml" - "!:\private\A000E401\TwitterCore\ToolBar.qml"</div><div class='add'>+"/epoc32/data/z/private/A000E401/TwitterCore/UserModel.qml" - "!:\private\A000E401\TwitterCore\UserModel.qml"</div><div class='head'>diff --git a/config.profiles/symbian/sysdef_1_5_1.dtd b/config.profiles/symbian/sysdef_1_5_1.dtd<br/>new file mode 100644<br/>index 0000000..2defd21<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/sysdef_1_5_1.dtd?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/sysdef_1_5_1.dtd</a></div><div class='hunk'>@@ -0,0 +1,88 @@</div><div class='add'>+ &lt;!ELEMENT SystemDefinition (systemModel?, build?)&gt;</div><div class='add'>+ &lt;!ATTLIST SystemDefinition</div><div class='add'>+  name CDATA #REQUIRED</div><div class='add'>+  schema CDATA #REQUIRED&gt;</div><div class='add'>+ &lt;!ELEMENT systemModel (layer+)&gt;</div><div class='add'>+ &lt;!ELEMENT layer (logicalset* | module*)*&gt;</div><div class='add'>+ &lt;!ATTLIST layer</div><div class='add'>+  name CDATA #REQUIRED</div><div class='add'>+  levels CDATA #IMPLIED</div><div class='add'>+  span CDATA #IMPLIED&gt;</div><div class='add'>+ &lt;!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*&gt;</div><div class='add'>+ &lt;!ATTLIST logicalset name CDATA #REQUIRED&gt;</div><div class='add'>+ &lt;!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*&gt;</div><div class='add'>+ &lt;!ATTLIST logicalsubset name CDATA #REQUIRED&gt;</div><div class='add'>+ &lt;!ELEMENT module (component* | unit* | package* | prebuilt*)*&gt;</div><div class='add'>+ &lt;!ATTLIST module</div><div class='add'>+  name CDATA #REQUIRED</div><div class='add'>+  level CDATA #IMPLIED&gt;</div><div class='add'>+ &lt;!ELEMENT component (unit* | package* | prebuilt*)*&gt;</div><div class='add'>+ &lt;!ATTLIST component name CDATA #REQUIRED&gt;</div><div class='add'>+ &lt;!ELEMENT unit EMPTY&gt;</div><div class='add'>+ &lt;!ATTLIST unit</div><div class='add'>+  unitID ID #REQUIRED</div><div class='add'>+  name CDATA #REQUIRED</div><div class='add'>+  mrp CDATA #REQUIRED</div><div class='add'>+  filter CDATA #IMPLIED</div><div class='add'>+  bldFile CDATA #REQUIRED</div><div class='add'>+  priority CDATA #IMPLIED</div><div class='add'>+  contract CDATA #IMPLIED</div><div class='add'>+  proFile CDATA #IMPLIED</div><div class='add'>+  qmakeArgs CDATA #IMPLIED&gt;</div><div class='add'>+ &lt;!ELEMENT package EMPTY&gt;</div><div class='add'>+ &lt;!ATTLIST package</div><div class='add'>+  name CDATA #REQUIRED</div><div class='add'>+  mrp CDATA #REQUIRED</div><div class='add'>+  filter CDATA #IMPLIED</div><div class='add'>+  contract CDATA #IMPLIED&gt;</div><div class='add'>+ &lt;!ELEMENT prebuilt EMPTY&gt;</div><div class='add'>+ &lt;!ATTLIST prebuilt</div><div class='add'>+  name CDATA #REQUIRED</div><div class='add'>+  version CDATA #REQUIRED</div><div class='add'>+  late (Y|N) #IMPLIED</div><div class='add'>+  filter CDATA #IMPLIED</div><div class='add'>+  contract CDATA #IMPLIED&gt;</div><div class='add'>+ &lt;!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*&gt;</div><div class='add'>+ &lt;!ELEMENT unitList (unitRef+)&gt;</div><div class='add'>+ &lt;!ATTLIST unitList</div><div class='add'>+  name ID #REQUIRED</div><div class='add'>+  description CDATA #REQUIRED&gt;</div><div class='add'>+ &lt;!ELEMENT unitRef EMPTY&gt;</div><div class='add'>+ &lt;!ATTLIST unitRef unit IDREF #REQUIRED&gt;</div><div class='add'>+ &lt;!ELEMENT targetList EMPTY&gt;</div><div class='add'>+ &lt;!ATTLIST targetList</div><div class='add'>+  name ID #REQUIRED</div><div class='add'>+  description CDATA #REQUIRED</div><div class='add'>+  target IDREFS #REQUIRED&gt;</div><div class='add'>+ &lt;!ELEMENT target EMPTY&gt;</div><div class='add'>+ &lt;!ATTLIST target</div><div class='add'>+  name ID #REQUIRED</div><div class='add'>+  abldTarget CDATA #REQUIRED</div><div class='add'>+  description CDATA #REQUIRED&gt;</div><div class='add'>+ &lt;!ELEMENT option EMPTY&gt;</div><div class='add'>+ &lt;!ATTLIST option</div><div class='add'>+  name ID #REQUIRED</div><div class='add'>+  abldOption CDATA #REQUIRED</div><div class='add'>+  description CDATA #REQUIRED</div><div class='add'>+  enable (Y | N | y | n) #REQUIRED&gt;</div><div class='add'>+ &lt;!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*&gt;</div><div class='add'>+ &lt;!ATTLIST configuration</div><div class='add'>+  name ID #REQUIRED</div><div class='add'>+  description CDATA #REQUIRED</div><div class='add'>+  filter CDATA #REQUIRED&gt;</div><div class='add'>+ &lt;!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))&gt;</div><div class='add'>+ &lt;!ELEMENT unitListRef EMPTY&gt;</div><div class='add'>+ &lt;!ATTLIST unitListRef unitList IDREF #REQUIRED&gt;</div><div class='add'>+ &lt;!ELEMENT layerRef EMPTY&gt;</div><div class='add'>+ &lt;!ATTLIST layerRef layerName CDATA #REQUIRED&gt;</div><div class='add'>+ &lt;!ELEMENT buildLayer EMPTY&gt;</div><div class='add'>+ &lt;!ATTLIST buildLayer</div><div class='add'>+  command CDATA #REQUIRED</div><div class='add'>+  targetList IDREFS #IMPLIED</div><div class='add'>+  unitParallel (Y | N | y | n) #REQUIRED</div><div class='add'>+  targetParallel (Y | N | y | n) #IMPLIED&gt;</div><div class='add'>+ &lt;!ELEMENT specialInstructions EMPTY&gt;</div><div class='add'>+ &lt;!ATTLIST specialInstructions</div><div class='add'>+  name CDATA #REQUIRED</div><div class='add'>+  cwd CDATA #REQUIRED</div><div class='add'>+  command CDATA #REQUIRED&gt;</div><div class='head'>diff --git a/config.profiles/symbian/translations/qt_ar.ts b/config.profiles/symbian/translations/qt_ar.ts<br/>new file mode 100644<br/>index 0000000..aca2bd7<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/translations/qt_ar.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/translations/qt_ar.ts</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="utf-8"?&gt;</div><div class='add'>+&lt;!DOCTYPE TS&gt;</div><div class='add'>+&lt;TS version="2.0"&gt;</div><div class='add'>+&lt;context&gt;</div><div class='add'>+    &lt;name&gt;QApplication&lt;/name&gt;</div><div class='add'>+    &lt;message&gt;</div><div class='add'>+        &lt;source&gt;QT_LAYOUT_DIRECTION&lt;/source&gt;</div><div class='add'>+        &lt;comment&gt;Translate this string to the string &amp;apos;LTR&amp;apos; in left-to-right languages or to &amp;apos;RTL&amp;apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.&lt;/comment&gt;</div><div class='add'>+        &lt;translation&gt;RTL&lt;/translation&gt;</div><div class='add'>+    &lt;/message&gt;</div><div class='add'>+&lt;/context&gt;</div><div class='add'>+&lt;/TS&gt;</div><div class='head'>diff --git a/config.profiles/symbian/translations/qt_fa.ts b/config.profiles/symbian/translations/qt_fa.ts<br/>new file mode 100644<br/>index 0000000..386480e<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/translations/qt_fa.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/translations/qt_fa.ts</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='add'>+&lt;!DOCTYPE TS&gt;</div><div class='add'>+</div><div class='add'>+&lt;TS version="2.0" language="fa"&gt;</div><div class='add'>+&lt;context&gt;</div><div class='add'>+    &lt;name&gt;QApplication&lt;/name&gt;</div><div class='add'>+    &lt;message&gt;</div><div class='add'>+        &lt;source&gt;QT_LAYOUT_DIRECTION&lt;/source&gt;</div><div class='add'>+        &lt;comment&gt;Translate this string to the string &amp;apos;LTR&amp;apos; in left-to-right languages or to &amp;apos;RTL&amp;apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.&lt;/comment&gt;</div><div class='add'>+        &lt;translation&gt;RTL&lt;/translation&gt;</div><div class='add'>+    &lt;/message&gt;</div><div class='add'>+&lt;/context&gt;</div><div class='add'>+&lt;/TS&gt;</div><div class='head'>diff --git a/config.profiles/symbian/translations/qt_fr_symbian.ts b/config.profiles/symbian/translations/qt_fr_symbian.ts<br/>new file mode 100644<br/>index 0000000..e10f963<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/translations/qt_fr_symbian.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/translations/qt_fr_symbian.ts</a></div><div class='hunk'>@@ -0,0 +1,8519 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='add'>+&lt;!DOCTYPE TS&gt;</div><div class='add'>+</div><div class='add'>+&lt;TS version="2.0" language="fr"&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;CloseButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close Tab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fermer l&amp;apos;onglet&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;FakeReply&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fake error !&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fausse erreur!&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;URL non valide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Notifications&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Notifications&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Music&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Musique&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Vidéo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Communication&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Communication&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Games&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Jeux&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Accessibility&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Accessibilité&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::AudioOutput&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;html&amp;gt;The audio playback device &amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt; does not work.&amp;lt;br/&amp;gt;Falling back to &amp;lt;b&amp;gt;%2&amp;lt;/b&amp;gt;.&amp;lt;/html&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;html&amp;gt;L&amp;apos;appareil de lecture audio &amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt; ne fonctionne pas.&amp;lt;br/&amp;gt;Retour à &amp;lt;b&amp;gt;%2&amp;lt;/b&amp;gt;.&amp;lt;/html&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;html&amp;gt;Switching to the audio playback device &amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt;&amp;lt;br/&amp;gt;which just became available and has higher preference.&amp;lt;/html&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;html&amp;gt;Basculement vers l&amp;apos;appareil de lecture audio &amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt;&amp;lt;br/&amp;gt;qui vient juste d&amp;apos;être disponible et dont le niveau de préférence est plus élevé.&amp;lt;/html&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Revert back to device &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Revenir à l&amp;apos;appareil &amp;apos;%1&amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::Gstreamer::Backend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning: You do not seem to have the package gstreamer0.10-plugins-good installed.</div><div class='add'>+          Some video features have been disabled.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Attention: Vous n&amp;apos;avez apparemment pas installé le paquet gstreamer0.10-plugins-good.</div><div class='add'>+Des fonctionnalités vidéo ont été desactivées.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning: You do not seem to have the base GStreamer plugins installed.</div><div class='add'>+          All audio and video support has been disabled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Attention: Vous n&amp;apos;avez apparemment pas installées les plugins de base de GStreamer.</div><div class='add'>+Le support audio et vidéo est désactivé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::Gstreamer::MediaObject&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot start playback. </div><div class='add'>+</div><div class='add'>+Check your GStreamer installation and make sure you </div><div class='add'>+have libgstreamer-plugins-base installed.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A required codec is missing. You need to install the following codec(s) to play this content: %0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Un codec requis est manquant. Vous devez installer le codec suivant pour jouer le contenu: %0&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open media source.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;ouvrir le média source.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid source type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Type de source invalide.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not locate media source.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de localiser le média source.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open audio device. The device is already in use.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;ouvrir le périphérique audio. Celui-ci est déjà en cours d&amp;apos;utilisation.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not decode media source.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de décoder le média source.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sortie audio&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The audio output device&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Appareil de sortie audio&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucune erreur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Introuvable&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Out of memory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Mémoire insuffisante&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Non supporté&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Overflow&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dépassement&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Underflow&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Soupassement&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Already exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Existe déjà&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Path not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Chemin introuvable&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In use&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Utilisé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not ready&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pas prêt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Access denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Accès refusé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion impossible&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Disconnected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Déconnecté&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Autorisation refusée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insufficient bandwidth&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Bande passante insuffisante&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network unavailable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Réseau non disponible&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network communication error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur de communication réseau&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Streaming not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Streaming non supporté&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Server alert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Alerte serveur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid protocol&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Protocole non valide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;URL non valide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multicast error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur multicast&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur du serveur proxy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Serveur proxy non supporté&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio output error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur de sortie audio&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video output error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur de sortie vidéo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decoder error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur du décodeur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio or video components could not be played&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Les composants audio ou vidéo n&amp;apos;ont pas pu être lus&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DRM error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur GDN&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error (%1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur inconnue (%1)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::AbstractMediaPlayer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not ready to play&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pas prêt pour lecture&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de l&amp;apos;ouverture du fichier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de l&amp;apos;ouverture de l&amp;apos;URL&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Setting volume failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le réglage du volume a échoué&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Playback complete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lecture terminée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::AudioEqualizer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 Hz&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 Hz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::AudioPlayer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Getting position failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;obtention de la position a échoué&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Opening clip failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;ouverture du clip a échoué&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::EffectFactory&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enabled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Activé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::EnvironmentalReverb&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decay HF ratio (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ratio HF du déclin (%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decay time (ms)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Temps de déclin (ms)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Density (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Densité (%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Diffusion (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Diffusion (%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reflections delay (ms)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Délai réflexions (ms)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reflections level (mB)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niveau réflexions (mB)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverb delay (ms)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Délai de réverbération (ms)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverb level (mB)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niveau de réverbération (mB)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Room HF level&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niveau HF pièce&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Room level (mB)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niveau pièce (mB)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::MediaObject&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening source: type not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de l&amp;apos;ouverture de la source: type non supporté&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening source: media type could not be determined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de l&amp;apos;ouverture de la source: type de média non déterminé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::StereoWidening&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Level (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niveau (%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::VideoPlayer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La mise en pause a échoué&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La recherche a échoué&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Getting position failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;obtention de la position a échoué&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Opening clip failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;ouverture du clip a échoué&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Buffering clip failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La mise en mémoire tampon du clip a échoué&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video display error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur de l&amp;apos;affichage vidéo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::VolumeSlider&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume: %1%&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Volume: %1%&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Utilisez le slider pour ajuster le volume. La position la plus à gauche est 0%, la plus à droite est %1%&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Muted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Son coupé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3Accel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1, %2 not defined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La séquence %1, %2 n&amp;apos;est pas définie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ambiguous %1 not handled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Séquence ambiguë %1 non traitée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3DataTable&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;True&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Vrai&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;False&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Faux&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Insérer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Update&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Actualiser&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Supprimer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3FileDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy or Move a File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Copie ou déplace un fichier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lecture : %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Écriture : %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Annuler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tous les fichiers (*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nom&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Taille&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Type&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Date&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attributes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Attributs&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Look &amp;amp;in:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Chercher &amp;amp;dans :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File &amp;amp;name:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Nom de fichier :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File &amp;amp;type:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Type de fichier :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Précédent (historique)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;One directory up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aller au dossier parent&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Create New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Créer un nouveau dossier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Affichage liste&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Detail View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Affichage détaillé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Preview File Info&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Informations du fichier prévisualisé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Preview File Contents&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Contenu du fichier prévisualisé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read-write&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lecture-écriture&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read-only&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lecture seule&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write-only&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Écriture seule&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Inaccessible&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Inaccessible&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symlink to File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lien symbolique vers un fichier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symlink to Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lien symbolique vers un dossier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symlink to Special&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lien symbolique vers un fichier spécial&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fichier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dir&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dossier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Special&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fichier spécial&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ouvrir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save As&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Enregistrer sous&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Ouvrir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Enregistrer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Rename&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Renommer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Suppri&amp;amp;mer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;R&amp;amp;eload&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;R&amp;amp;echarger&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort by &amp;amp;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Trier par &amp;amp;nom&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort by &amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Trier par ta&amp;amp;ille&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort by &amp;amp;Date&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Trier par &amp;amp;date&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Unsorted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Non trié&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tri&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show &amp;amp;hidden files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Afficher les fic&amp;amp;hiers cachés&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;the file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;le fichier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;the directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;le dossier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;the symlink&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;le lien symbolique&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Supprimer %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;qt&amp;gt;Are you sure you wish to delete %1 &amp;quot;%2&amp;quot;?&amp;lt;/qt&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;qt&amp;gt;Voulez-vous vraiment supprimer %1 &amp;quot;%2&amp;quot; ?&amp;lt;/qt&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Oui&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Non&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder 1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nouveau dossier 1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nouveau dossier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nouveau dossier %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Chercher dans le dossier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dossiers&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directory:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dossier :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1</div><div class='add'>+File not found.</div><div class='add'>+Check path and filename.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1</div><div class='add'>+Impossible de trouver le fichier.</div><div class='add'>+Vérifier le chemin et le nom du fichier.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*.*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tous les fichiers (*.*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open &lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ouvrir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select a Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sélectionner un dossier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3LocalFs&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not read directory</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de lire le dossier</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not create directory</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de créer le dossier</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not remove file or directory</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de supprimer le fichier ou dossier</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not rename</div><div class='add'>+%1</div><div class='add'>+to</div><div class='add'>+%2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de renommer</div><div class='add'>+%1</div><div class='add'>+en</div><div class='add'>+%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;ouvrir</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not write</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;écrire</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3MainWindow&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aligner&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Customize...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Personnaliser...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3NetworkProtocol&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation stopped by the user&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Opération interrompue par l&amp;apos;utilisateur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3ProgressDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Annuler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3TabDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Apply&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Appliquer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Defaults&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Par défaut&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Annuler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3TextEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Annuler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Rétablir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cu&amp;amp;t&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Co&amp;amp;uper&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cop&amp;amp;ier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Co&amp;amp;ller&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Effacer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tout sélectionner&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3TitleBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;System&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Système&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Restaurer en haut&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Minimize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Réduire&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Restaurer en bas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Maximize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Maximiser&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fermer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Contains commands to manipulate the window&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Contient des commandes pour manipuler la fenêtre&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Puts a minimized window back to normal&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Moves the window out of the way&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Déplace la fenêtre à l&amp;apos;écart&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Puts a maximized window back to normal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Rend à une fenêtre minimisée son aspect normal&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Makes the window full screen&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Affiche la fenêtre en plein écran&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Closes the window&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ferme la fenêtre&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Displays the name of the window and contains controls to manipulate it&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Affiche le nom de la fenêtre et contient des contrôles pour la manipuler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3ToolBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Reste...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3UrlOperator&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le protocole &amp;apos;%1&amp;apos; n&amp;apos;est pas géré&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support listing directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le protocole `%1&amp;apos; ne permet pas de lister les fichiers d&amp;apos;un dossier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support creating new directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le protocole `%1&amp;apos; ne permet pas de créer de nouveaux dossiers&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support removing files or directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le protocole `%1&amp;apos; ne permet pas de supprimer des fichiers ou des dossiers&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support renaming files or directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le protocole `%1&amp;apos; ne permet pas de renommer des fichiers ou des dossiers&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support getting files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le protocole `%1&amp;apos; ne permet pas de recevoir des fichiers&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support putting files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le protocole `%1&amp;apos; ne permet pas d&amp;apos;envoyer des fichiers&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support copying or moving files or directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le protocole `%1&amp;apos; ne permet pas de copier ou de déplacer des fichiers&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;(unknown)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;(inconnu)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3Wizard&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Annuler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt; &amp;amp;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt; &amp;amp;Précédent&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Next &amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Suivant &amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Finish&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Terminer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Aide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAbstractSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Hôte introuvable&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion refusée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion expirée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation on socket is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Opération sur socket non supportée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Socket operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Opération socket expirée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Socket is not connected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le socket n&amp;apos;est pas connecté&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network unreachable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Réseau impossible à rejoindre&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAbstractSpinBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Step up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Augmenter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step &amp;amp;down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Diminuer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tout &amp;amp;sélectionner&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAccessibleButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Press&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Appuyer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QApplication&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QT_LAYOUT_DIRECTION&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Translate this string to the string &amp;apos;LTR&amp;apos; in left-to-right languages or to &amp;apos;RTL&amp;apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;LTR&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Executable &amp;apos;%1&amp;apos; requires Qt %2, found Qt %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;exécutable &amp;apos;%1&amp;apos; requiert Qt %2 (Qt %3 présent).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Incompatible Qt Library Error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur : bibliothèque Qt incompatible&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Activate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Activer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Activates the program&amp;apos;s main window&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Active la fenêtre principale du programme&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAxSelect&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select ActiveX Control&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sélectionner un contrôle ActiveX&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Annuler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;COM &amp;amp;Object:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Objet COM :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QCheckBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Uncheck&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Décocher&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cocher&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Toggle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Changer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QColorDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hu&amp;amp;e:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Teinte :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Sat:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Saturation :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Val:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Valeur :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Red:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Rouge :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Green:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Vert :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bl&amp;amp;ue:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ble&amp;amp;u :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A&amp;amp;lpha channel:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Canal a&amp;amp;lpha :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select Color&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sélectionner une couleur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Basic colors&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Couleurs de &amp;amp;base&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Custom colors&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Couleurs personnalisées&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Add to Custom Colors&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Ajouter aux couleurs personnalisées&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QComboBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ouvrir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;False&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Faux&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;True&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Vrai&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fermer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QCoreApplication&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: key is empty&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: clé vide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to make key&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: impossible de créer la clé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: ftok failed&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: ftok a échoué&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: already exists&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: existe déjà&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: does not exist&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: n&amp;apos;existe pas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: out of resources&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: plus de ressources disponibles&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: erreur inconnue %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDB2Driver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Incapable d&amp;apos;établir une connexion&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Incapable de soumettre la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Incapable d&amp;apos;annuler la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to set autocommit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;activer l&amp;apos;auto-soumission&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDB2Result&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;exécuter la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de prépare la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind variable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;attacher la variable&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch record %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de récupérer l&amp;apos;enregistrement %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de récupérer le suivant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch first&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de récupérer le premier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDateTimeEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;AM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;AM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;am&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;am&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;PM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;pm&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;pm&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDial&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QDial&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;QDial&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SpeedoMeter&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tachymètre&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SliderHandle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Poignée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;What&amp;apos;s This?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Qu&amp;apos;est-ce que c&amp;apos;est ?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Done&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Terminer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDialogButtonBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Enregistrer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Enregi&amp;amp;strer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ouvrir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Annuler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Annuler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fermer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Fermer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Apply&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Appliquer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reset&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Réinitialiser&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Don&amp;apos;t Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ne pas enregistrer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Discard&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ne pas enregistrer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Oui&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Yes to &amp;amp;All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Oui à &amp;amp;tout&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Non&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;N&amp;amp;o to All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Non à to&amp;amp;ut&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tout Enregistrer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Abort&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Abandonner&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Retry&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Réessayer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ignorer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore Defaults&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Restaurer les valeurs par défaut&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close without Saving&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fermer sans sauvegarder&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDirModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nom&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Taille&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Kind&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Match OS X Finder&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Type&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Type&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date Modified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dernière Modification&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDockWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fermer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Attacher&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Float&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Détacher&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDoubleSpinBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Plus&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Less&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Moins&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QErrorMessage&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Show this message again&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Afficher ce message de nouveau&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Debug Message:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Message de débogage:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Avertissement:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fatal Error:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur fatale:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFile&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Destination file exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le fichier destination existe&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Will not rename sequential file using block copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ne renommera pas le fichier séquentiel avec la copie bloc&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot remove source file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de supprimer le fichier source&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open %1 for input&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;ouvrir %1 pour lecture&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open for output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;ouvrir pour écriture&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Failure to write block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;écrire un bloc&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot create %1 for output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de créer %1 pour écriture&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFileDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tous les fichiers (*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Précédent (historique)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Affichage liste&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Detail View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Affichage détaillé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fichier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ouvrir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save As&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Enregistrer sous&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Ouvrir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Enregistrer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Recent Places&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Emplacements récents&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Rename&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Renommer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Suppri&amp;amp;mer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show &amp;amp;hidden files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Afficher les fic&amp;amp;hiers cachés&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nouveau dossier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Chercher dans le dossier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dossiers&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*.*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tous les fichiers (*.*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directory:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dossier :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 already exists.</div><div class='add'>+Do you want to replace it?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le fichier %1 existe déjà. Voulez-vous l&amp;apos;écraser ?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1</div><div class='add'>+File not found.</div><div class='add'>+Please verify the correct file name was given.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1</div><div class='add'>+Fichier introuvable.</div><div class='add'>+Veuillez vérifier que le nom du fichier est correct.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;My Computer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Poste de travail&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Parent Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dossier parent&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Files of type:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fichiers de type :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1</div><div class='add'>+Directory not found.</div><div class='add'>+Please verify the correct directory name was given.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1</div><div class='add'>+Dossier introuvable.</div><div class='add'>+Veuillez vérifier que le nom du dossier est correct.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;apos;%1&amp;apos; is write protected.</div><div class='add'>+Do you want to delete it anyway?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;apos;%1&amp;apos; est protégé en écriture.</div><div class='add'>+Voulez-vous quand même le supprimer ?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Are sure you want to delete &amp;apos;%1&amp;apos;?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Etes-vous sûr de vouloir supprimer &amp;apos;%1&amp;apos; ?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not delete directory.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de supprimer le dossier.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Drive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Unité&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File Folder&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Match Windows Explorer&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Fichier Dossier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Folder&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Dossier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Alias&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Mac OS X Finder&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Pseudo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shortcut&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Raccourci&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Inconnu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show &lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Montrer &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Successeur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Nouveau dossier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Choose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Choisir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remove&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Supprimer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File &amp;amp;name:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Nom de fichier :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Look in:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Voir dans:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Create New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Créer un nouveau dossier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFileSystemModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 TB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 To&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 GB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 Go&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 MB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 Mo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 KB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 Ko&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 bytes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 octets&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid filename&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nom de fichier invalide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;b&amp;gt;The name &amp;quot;%1&amp;quot; can not be used.&amp;lt;/b&amp;gt;&amp;lt;p&amp;gt;Try using another name, with fewer characters or no punctuations marks.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;b&amp;gt;Le nom &amp;quot;%1&amp;quot; ne peut pas être utilisé.&amp;lt;/b&amp;gt;&amp;lt;p&amp;gt;Essayez un autre nom avec moins de caractères ou sans ponctuation.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nom&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Taille&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Kind&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Match OS X Finder&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Type&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Type&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date Modified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dernière modification&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;My Computer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Mon ordinateur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Computer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ordinateur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 byte(s)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 octet(s)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFontDatabase&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Normal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Normal&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bold&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Gras&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Demi Bold&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Semi Gras&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Black&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Noir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Demi&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Demi&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Light&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Léger&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Italic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Italique&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Oblique&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Oblique&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Any&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tous&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Latin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Latin&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Greek&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Grec&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cyrillic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cyrillique&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Armenian&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Arménien&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hebrew&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Hébreu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Arabic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Arabe&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Syriac&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Syriaque&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Thaana&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Thaana&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Devanagari&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Devanagari&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bengali&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Bengali&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Gurmukhi&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Gurmukhi&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Gujarati&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Gujarati&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Oriya&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Oriya&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tamil&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tamil&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Telugu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Telugu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Kannada&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kannada&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Malayalam&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Malayalam&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sinhala&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sinhala&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Thai&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Thaï&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Lao&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lao&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tibetan&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tibétain&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Myanmar&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Myanmar&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Georgian&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Géorgien&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Khmer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Khmer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simplified Chinese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Chinois Simplifié&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Traditional Chinese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Chinois Traditionnel&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Japanese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Japonais&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Korean&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Coréen&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Vietnamese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Vietnamien&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symbol&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Symbole&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ogham&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ogham&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Runic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Runique&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;N&amp;apos;Ko&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;N&amp;apos;Ko&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFontDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Font&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Police&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Font st&amp;amp;yle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;St&amp;amp;yle de police&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Taille&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Effects&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Effets&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stri&amp;amp;keout&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Barré&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Underline&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Souligné&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sample&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Exemple&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select Font&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Choisir une police&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wr&amp;amp;iting System&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Système d&amp;apos;écriture&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFtp&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Hôte %1 trouvé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Hôte trouvé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connecté à l&amp;apos;hôte %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connecté à l&amp;apos;hôte&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to %1 closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion à %1 arrêtée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion arrêtée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Hôte %1 introuvable&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion à l&amp;apos;hôte %1 refusée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection timed out to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion expirée vers l&amp;apos;hôte %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur inconnue&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connecting to host failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Échec de la connexion à l&amp;apos;hôte</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Login failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Échec du login:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Listing directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Échec du listage du dossier :</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Changing directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Échec du changement de dossier :</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Downloading file failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Échec du téléchargement du fichier :</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Uploading file failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Échec du télédéchargement :</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Removing file failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Échec de la suppression d&amp;apos;un fichier :</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Creating directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Échec de la création d&amp;apos;un dossier :</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Removing directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Échec de la suppression d&amp;apos;un dossier :</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not connected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Non connecté&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused for data connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion donnée refusée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHostInfo&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur inconnue&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHostInfoAgent&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Hôte introuvable&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown address type&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Adresse de type inconnu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur inconnue&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No host name given&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucun nom d&amp;apos;hôte n&amp;apos;a été donné&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid hostname&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nom d&amp;apos;hôte non valide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHttp&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion refusée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Hôte %1 introuvable&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wrong content length&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Longueur du contenu invalide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;HTTP request failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Échec de la requête HTTP&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Hôte %1 trouvé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Hôte trouvé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connecté à l&amp;apos;hôte %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connecté à l&amp;apos;hôte&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to %1 closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion à %1 arrêtée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion arrêtée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur inconnue&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request aborted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Requête interrompue&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No server set to connect to&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucun serveur spécifié&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Server closed connection unexpectedly&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion interrompue par le serveur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid HTTP response header&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Entête de réponse HTTP invalide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown authentication method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Méthode d&amp;apos;authentification inconnue&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid HTTP chunked body&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fragment HTTP invalide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error writing response to device&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de l&amp;apos;écriture de la réponse&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le proxy requiert une authentification&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Authentification requise&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy requires authentication&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le proxy requiert une authentification&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host requires authentication&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;hôte requiert une authentification&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Data corrupted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Données corrompues&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SSL handshake failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;le handshake SSL a échoué&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown protocol specified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Protocole spécifié inconnu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused (or timed out)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion refusée (ou délai expiré)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;HTTPS connection requested but SSL support not compiled in&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion HTTPS requise mais le support SSL n&amp;apos;est pas compilé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHttpSocketEngine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Did not receive HTTP response from proxy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pas de réponse HTTP de la part du proxy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error parsing authentication request from proxy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur dans le reqête d&amp;apos;authentification reçue du proxy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Authentification requise&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy denied connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le Proxy a rejeté la connexion&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error communicating with HTTP proxy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur de communication avec le proxy HTTP&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Serveur proxy introuvable&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion au proxy refusée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server connection timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La connexion au serveur proxy a expiré&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy connection closed prematurely&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La connexion au serveur proxy a été fermée prématurément&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QIBaseDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur d&amp;apos;ouverture de la base de données&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not start transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La transaction n&amp;apos;a pas pu être démarrée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Incapable de soumettre la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Incapable d&amp;apos;annuler la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QIBaseResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to create BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de créer un BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to write BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;écrire le BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to open BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;ouvrir le BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to read BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de lire le BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not find array&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de trouver le tableau&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not get array data&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de trouver le tableau de données&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not get query info&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;avoir les informations sur la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not start transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de démarrer la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Incapable de soumettre la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not allocate statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;allouer la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de préparer la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not describe input statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de décrire la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not describe statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de décrire la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to close statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de fermer la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;exécuter la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not fetch next item&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de récuperer l&amp;apos;élément suivant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not get statement info&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;avoir les informations sur la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QIODevice&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Accès refusé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Too many open files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Trop de fichiers ouverts simultanément&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No such file or directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucun fichier ou dossier de ce nom&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No space left on device&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucun espace disponible sur le périphérique&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur inconnue&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QInputContext&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XIM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;XIM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;FEP&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Processeur frontal&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XIM input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Méthode d&amp;apos;entrée XIM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Windows input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Méthode d&amp;apos;entrée Windows&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mac OS X input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Méthode d&amp;apos;entrée Mac OS X&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;S60 FEP input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Méthode de saisie processeur frontal S60&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QInputDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enter a value:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Entrer une valeur :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLibrary&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not mmap &amp;apos;%1&amp;apos;: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;établir la projection en mémoire de &amp;apos;%1&amp;apos; : %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Plugin verification data mismatch in &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Données de vérification du plugin différente dans &amp;apos;%1&amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not unmap &amp;apos;%1&amp;apos;: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de supprimer la projection en mémoire de &amp;apos;%1&amp;apos; : %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin &amp;apos;%1&amp;apos; uses incompatible Qt library. (%2.%3.%4) [%5]&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le plugin &amp;apos;%1&amp;apos; utilise une bibliothèque Qt incompatible. (%2.%3.%4) [%5]&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin &amp;apos;%1&amp;apos; uses incompatible Qt library. Expected build key &amp;quot;%2&amp;quot;, got &amp;quot;%3&amp;quot;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le plugin &amp;apos;%1&amp;apos; utilise une bibliothèque Qt incompatible. Clé attendue &amp;quot;%2&amp;quot;, reçue &amp;quot;%3&amp;quot;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur inconnue&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The shared library was not found.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La bibliothèque partagée est introuvable.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The file &amp;apos;%1&amp;apos; is not a valid Qt plugin.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le fichier &amp;apos;%1&amp;apos; n&amp;apos;est pas un plugin Qt valide.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin &amp;apos;%1&amp;apos; uses incompatible Qt library. (Cannot mix debug and release libraries.)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le plugin &amp;apos;%1&amp;apos; utilise une bibliothèque Qt incompatible.  (Il est impossible de mélanger des bibliothèques &amp;apos;debug&amp;apos; et &amp;apos;release&amp;apos;.)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot load library %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de charger la bibliothèque %1 : %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot unload library %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de décharger la bibliothèque %1 : %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot resolve symbol &amp;quot;%1&amp;quot; in %2: %3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de résoudre le symbole &amp;quot;%1&amp;quot; dans %2 : %3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLineEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tout sélectionner&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Annuler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Rétablir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cu&amp;amp;t&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Co&amp;amp;uper&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cop&amp;amp;ier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Co&amp;amp;ller&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Supprimer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLocalServer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Name error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Erreur de nom&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Permission refusée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Address in use&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Address déjà utilisée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Erreur inconnue %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLocalSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Connexion refusée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Remote closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Connexion fermée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Invalid name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Nom invalide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Socket access error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Erreur d&amp;apos;accès au socket&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Socket resource error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Erreur de ressource du socket&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Socket operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: L&amp;apos;opération socket a expiré&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Datagram too large&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Datagramme trop grand&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Connection error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Erreur de connexion&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: The socket operation is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: L&amp;apos;opération n&amp;apos;est pas supportée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : erreur inconnue&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Erreur inconnue %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMYSQLDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to open database &amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;ouvrir la base de données &amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;établir une connexion&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de démarrer la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de soumettre la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;annuler la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMYSQLResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch data&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de récuperer des données&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;exécuter la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to store result&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de stocker le résultat&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de préparer l&amp;apos;instruction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to reset statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de réinitialiser l&amp;apos;instruction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;attacher la valeur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;exécuter la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind outvalues&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;attacher les valeurs de sortie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to store statement results&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de stocker les résultats de la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute next query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;exécuterla prochaine requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to store next result&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de stocker le prochain résultat&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMdiArea&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;(Untitled)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;(Sans titre)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMdiSubWindow&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 - [%2]&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 - [%2]&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fermer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Minimize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Réduire&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Restaurer en bas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Restore&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Restaurer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Move&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Déplacer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Taille&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mi&amp;amp;nimize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Réd&amp;amp;uire&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ma&amp;amp;ximize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ma&amp;amp;ximiser&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stay on &amp;amp;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Rester au premier plan&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Fermer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Maximize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Maximiser&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unshade&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Restaurer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shade&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ombrer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Restaurer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Menu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;- [%1]&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;- [%1]&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMenu&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fermer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ouvrir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Execute&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Exécuter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMenuBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Actions&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Actions&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMessageBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;h3&amp;gt;About Qt&amp;lt;/h3&amp;gt;&amp;lt;p&amp;gt;This program uses Qt version %1.&amp;lt;/p&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;h3&amp;gt;Présentation de Qt&amp;lt;/h3&amp;gt;&amp;lt;p&amp;gt;Ce programme utilise Qt version %1.&amp;lt;/p&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;p&amp;gt;Qt is a C++ toolkit for cross-platform application development.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt provides single-source portability across MS&amp;amp;nbsp;Windows, Mac&amp;amp;nbsp;OS&amp;amp;nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Please see &amp;lt;a href=&amp;quot;http://qt.nokia.com/products/licensing&amp;quot;&amp;gt;qt.nokia.com/products/licensing&amp;lt;/a&amp;gt; for an overview of Qt licensing.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt is a Nokia product. See &amp;lt;a href=&amp;quot;http://qt.nokia.com/&amp;quot;&amp;gt;qt.nokia.com&amp;lt;/a&amp;gt; for more information.&amp;lt;/p&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;p&amp;gt;Qt est une boîte à outils C++ pour le développement d’applications multiplateformes.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt fournit une portabilité source unique pour MS&amp;amp;nbsp;Windows, Mac&amp;amp;nbsp;OS&amp;amp;nbsp;X, Linux et les principales variantes commerciales d’Unix. Qt est également disponible pour appareils intégrés tels que Qt pour Embedded Linux et Qt pour Windows CE.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Il existe trois options de licence différentes conçues pour s’adapter aux besoins d’utilisateurs variés.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt concédée sous notre contrat de licence commerciale est destinée au développement de logiciels propriétaires/commerciaux dont vous ne souhaitez pas partager le code source avec des tiers ou qui ne peuvent se conformer aux termes de la LGPL GNU version 2.1 ou GPL GNU version 3.0.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt concédée sous la LGPL GNU version 2.1 est destinée au développement d’applications Qt (propriétaires ou source libre) à condition que vous vous conformiez aux conditions générales de la LGPL GNU version 2.1.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt concédée sous la licence publique générale GNU version 3.0 est destinée au développement d’applications Qt lorsque vous souhaitez utiliser ces applications avec d’autres logiciels soumis aux termes de la GPL GNU version 3.0 ou lorsque vous acceptez les termes de la GPL GNU version 3.0.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Veuillez consulter&amp;lt;a href=&amp;quot;http://qt.nokia.com/products/licensing&amp;quot;&amp;gt;qt.nokia.com/products/licensing&amp;lt;/a&amp;gt; pour un aperçu des concessions de licences Qt.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Copyright (C) 2011 Nokia Corporation et/ou ses filiales.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt est un produit Nokia. Voir &amp;lt;a href=&amp;quot;http://qt.nokia.com/&amp;quot;&amp;gt;qt.nokia.com&amp;lt;/a&amp;gt; pour de plus amples informations.&amp;lt;/p&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;About Qt&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;À propos de Qt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show Details...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Montrer les détails...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hide Details...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cacher les détails...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMultiInputContext&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select IM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sélectionner IM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMultiInputContextPlugin&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multiple input method switcher&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sélectionneur de méthode de saisie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multiple input method switcher that uses the context menu of the text widgets&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sélectionneur de méthode de saisie qui utilise le menu contextuel des widgets de texte&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNativeSocketEngine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The remote host closed the connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;hôte distant a fermé la connexion&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;opération réseau a expiré&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Out of resources&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Manque de ressources&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsupported socket operation&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Opération socket non supportée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Protocol type not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Protocol non géré&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid socket descriptor&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Descripteur de socket invalide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network unreachable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Réseau impossible à rejoindre&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Accès refusé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion expirée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion refusée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The bound address is already in use&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;adresse liée est déjà en usage&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The address is not available&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;adresse n&amp;apos;est pas disponible&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The address is protected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;adresse est protégée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to send a message&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;envoyer un message&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to receive a message&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de recevoir un message&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to write&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;écrire&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur réseau&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Another socket is already listening on the same port&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Un autre socket écoute déjà sur le même port&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to initialize non-blocking socket&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;initialiser le socket asynchrone&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to initialize broadcast socket&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;initialiser le socket broadcast&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attempt to use IPv6 socket on a platform with no IPv6 support&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tentative d&amp;apos;utiliser un socket IPv6 sur une plateforme qui ne supporte pas IPv6&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host unreachable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Hôte inaccessible&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Datagram was too large to send&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le datagramme était trop grand pour être envoyé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation on non-socket&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Operation sur non-socket&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur inconnue&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The proxy type is invalid for this operation&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le type de proxy est invalide pour cette opération&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessCacheBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de l&amp;apos;ouverture de %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessDebugPipeBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write error writing to %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de l&amp;apos;écriture dans %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessFileBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request for opening non-local file %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Requête d&amp;apos;ouverture de fichier distant %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de l&amp;apos;ouverture de %1 : %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write error writing to %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur d&amp;apos;écriture de %1 : %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open %1: Path is a directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;ouvrir %1 : le chemin est un dossier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read error reading from %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur de lecture de %1 : %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessFtpBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No suitable proxy found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucun proxy trouvé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open %1: is a directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;ouvrir %1 : le chemin est un dossier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Logging in to %1 failed: authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion à %1 a échoué : authentification requise&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error while downloading %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors du téléchargement de %1 : %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error while uploading %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de l&amp;apos;envoi de %1 : %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessHttpBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No suitable proxy found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucun proxy trouvé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkReply&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error downloading %1 - server replied: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors du téléchargement de %1 - le serveur a répondu: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Protocol &amp;quot;%1&amp;quot; is unknown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le protocole &amp;quot;%1&amp;quot; est inconnu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkReplyImpl&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation canceled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Opération annulée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QOCIDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to logon&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;ouvrir une session&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to initialize&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QOCIDriver&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;initialisation a échouée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de démarrer la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;enregistrer la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;annuler la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QOCIResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind column for batch execute&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;attacher la colonne pour une execution batch&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute batch statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;exécuter l&amp;apos;instruction batch&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to goto next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de passer au suivant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to alloc statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;allouer la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de préparer la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to get statement type&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;attacher la valeur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;exéctuer la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QODBCDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Incapable d&amp;apos;établir une connexion&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to disable autocommit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de désactiver l&amp;apos;autocommit&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Incapable de soumettre la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Incapable d&amp;apos;annuler la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to enable autocommit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;active l&amp;apos;autocommit&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect - Driver doesn&amp;apos;t support all functionality required&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QODBCResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QODBCResult::reset: Unable to set &amp;apos;SQL_CURSOR_STATIC&amp;apos; as statement attribute. Please check your ODBC driver configuration&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;QODBCResult::reset: Impossible d&amp;apos;utiliser &amp;apos;SQL_CURSOR_STATIC&amp;apos; comme attribut de requête. Veuillez vérifier la configuration de votre pilote ODBC&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;exéctuer la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de récupérer le suivant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de préparer la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind variable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;attacher la variable&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch last&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de récupérer le dernier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de récupérer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch first&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de récupérer le premier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de récupérer le précedent&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QObject&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid hostname&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nom d&amp;apos;hôte non valide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation not supported on %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Opération non supportée sur %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid URI: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;URI invalide : %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Socket error on %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur de socket sur %1 : %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remote host closed the connection prematurely on %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;hôte distant a fermé sa connexion de façon prématurée sur %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No host name given&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nom d&amp;apos;hôte manquant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPPDOptionsModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nom&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Valeur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPSQLDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;établir une connexion&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de démarrer la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de soumettre la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;annuler la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to subscribe&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de s&amp;apos;inscrire&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to unsubscribe&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de se désinscrire&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPSQLResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to create query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de créer la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de préparer la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPageSetupWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Centimeters (cm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Centimètres (cm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Millimeters (mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Millimètres (mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Inches (in)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pouces (in)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Points (pt)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Points (pts)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Formulaire&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paper&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Papier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page size:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dimensions :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Width:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Largeur :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Height:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Hauteur :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paper source:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Source du papier :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Orientation&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Orientation&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Portrait&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Portrait&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Landscape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Paysage&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverse landscape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Paysage inversé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverse portrait&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Portrait inversé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Margins&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Marges&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;top margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;marge haute&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;left margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;marge gauche&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;right margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;marge droite&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bottom margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;marge basse&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPluginLoader&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur inconnue&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin was not loaded.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le plugin n&amp;apos;a pas été chargé.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;locally connected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;connecté en local&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Aliases: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Alias : %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unknown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;inconnu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print all&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Imprimer tout&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print range&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Imprimer la sélection&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A0 (841 x 1189 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A0 (841 x 1189 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A1 (594 x 841 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A1 (594 x 841 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A2 (420 x 594 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A2 (420 x 594 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A3 (297 x 420 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A3 (297 x 420 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A5 (148 x 210 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A5 (148 x 210 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A6 (105 x 148 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A6 (105 x 148 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A7 (74 x 105 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A7 (74 x 105 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A8 (52 x 74 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A8 (52 x 74 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A9 (37 x 52 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A9 (37 x 52 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B0 (1000 x 1414 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B0 (1000 x 1414 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B1 (707 x 1000 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B1 (707 x 1000 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B2 (500 x 707 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B2 (500 x 707 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B3 (353 x 500 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B3 (353 x 500 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B4 (250 x 353 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B4 (250 x 353 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B6 (125 x 176 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B6 (125 x 176 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B7 (88 x 125 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B7 (88 x 125 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B8 (62 x 88 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B8 (62 x 88 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B9 (44 x 62 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B9 (44 x 62 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B10 (31 x 44 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B10 (31 x 44 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;C5E (163 x 229 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;C5E (163 x 229 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DLE (110 x 220 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;DLE (110 x 220 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Folio (210 x 330 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Folio (210 x 330 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ledger (432 x 279 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ledger (432 x 279 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tabloid (279 x 432 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tabloïde (279 x 432 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;US Common #10 Envelope (105 x 241 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;US Common #10 Envelope (105 x 241 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A4 (210 x 297 mm, 8.26 x 11.7 inches)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A4 (210 x 297 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B5 (176 x 250 mm, 6.93 x 9.84 inches)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B5 (176 x 250 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Executive (7.5 x 10 inches, 191 x 254 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Executive (7,5 x 10 pouces, 191 x 254 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Legal (8.5 x 14 inches, 216 x 356 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Legal (8.5 x 14 pouces, 216 x 356 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Letter (8.5 x 11 inches, 216 x 279 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Letter (8,5 x 11 pouces, 216 x 279 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print selection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Imprimer la sélection&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impr écran&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print To File ...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Imprimer dans un fichier...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File %1 is not writable.</div><div class='add'>+Please choose a different file name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;écrire dans le fichier %1.</div><div class='add'>+Veuillez choisir un nom de fichier différent.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 already exists.</div><div class='add'>+Do you want to overwrite it?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 existe.</div><div class='add'>+Voulez-vous l&amp;apos;écraser ?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le fichier existe&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;qt&amp;gt;Do you want to overwrite it?&amp;lt;/qt&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;qt&amp;gt;voulez-vous l&amp;apos;écraser ?&amp;lt;/qt&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is a directory.</div><div class='add'>+Please choose a different file name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 est un dossier.</div><div class='add'>+Veuillez choisir un nom de fichier différent.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The &amp;apos;From&amp;apos; value cannot be greater than the &amp;apos;To&amp;apos; value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La valeur &amp;apos;de&amp;apos; ne peut pas être plus grande que la valeur &amp;apos;à&amp;apos;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A0&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A1&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A2&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A3&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A4&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A5&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A6&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A7&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A8&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A9&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B0&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B1&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B2&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B3&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B4&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B5&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B6&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B7&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B8&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B9&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B10&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;C5E&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DLE&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Executive&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Folio&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ledger&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Legal&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Letter&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tabloid&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;US Common #10 Envelope&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Custom&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Personnalisé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Options &amp;gt;&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Options &amp;lt;&amp;lt;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print to File (PDF)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Imprimer dans un fichier (PDF)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print to File (Postscript)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Imprimer dans un fichier (PostScript)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Local file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fichier local&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write %1 file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ecriture du fichier %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Im&amp;amp;primer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintPreviewDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1%&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1%&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print Preview&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aperçu avant impression&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Next page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page suivante&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Previous page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page précédente&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;First page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Première page&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Last page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dernière page&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fit width&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ajuster la largeur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fit page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ajuster la page&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom in&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zoom avant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zoom arrière&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Portrait&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Portrait&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Landscape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Paysage&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show single page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Afficher une seule page&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show facing pages&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Afficher deux pages&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show overview of all pages&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Afficher un aperçu de toutes les pages&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impr écran&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page setup&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Configuration de la page&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fermer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Export to PDF&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Exporter vers PDF&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Export to PostScript&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Exporter vers PostScript&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page Setup&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Configuration de la page&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintPropertiesWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Formulaire&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Advanced&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Avancé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintSettingsOutput&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Formulaire&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copies&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Copies&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print range&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Imprimer la sélection&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print all&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Imprimer tout&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pages from&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pages&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;to&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;à&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Selection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sélection&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Output Settings&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Paramètres de sortie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copies:&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Collate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Assembler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverse&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Inverse&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Options&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Options&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Color Mode&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Mode de couleur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Color&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Couleur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Grayscale&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dégradé de gris&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duplex Printing&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impression en duplex&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;None&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucun&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Long side&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Côté long&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Short side&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Côté court&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Formulaire&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Printer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Imprimante&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Name:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Nom :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;P&amp;amp;roperties&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;P&amp;amp;ropriétés&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Location:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Emplacement :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Preview&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Prévisualisation&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type:&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Output &amp;amp;file:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Fichier de sortie:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;...&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QProcess&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open input redirection for reading&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;ouvrir la redirection d&amp;apos;entrée en lecture&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open output redirection for writing&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;ouvrir la redirection de sortie pour écriture&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Resource error (fork failure): %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur de ressouce (fork) : %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Process operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Operation de processus a expiré&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error reading from process&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur de lecture du processus&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error writing to process&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur d&amp;quot;écriture vers le processus&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Process crashed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le processus à planté&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No program defined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucun programme défini&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Process failed to start: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le démarrage du processus a échoué: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QProgressDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Annuler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPushButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ouvrir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QRadioButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cocher&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QRegExp&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;no error occurred&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;aucune erreur ne s&amp;apos;est produite&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;disabled feature used&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;option désactivée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bad char class syntax&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;syntaxe invalide pour classe de caractère&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bad lookahead syntax&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;syntaxe invalide pour lookahead&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bad repetition syntax&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;syntaxe invalide pour répétition&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid octal value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;valeur octale invalide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;missing left delim&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;délémiteur gauche manquant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unexpected end&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;fin impromptue&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;met internal limit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;rencontré limite interne&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid interval&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;intervalle non valide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid category&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;catégorie non valide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLite2Driver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de l&amp;apos;ouverture de la base de données&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de démarrer la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de soumettre la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de répéter la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLite2Result&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch results&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de récupérer les résultats&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;exécuter la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLiteDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de l&amp;apos;ouverture de la base de données&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error closing database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de la fermeture de la base de données&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de démarrer la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Incapable de soumettre la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;annuler la transaction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLiteResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch row&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de récupérer la rangée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;exécuter la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to reset statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de réinitialiser la requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind parameters&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;attacher les paramètres&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Parameter count mismatch&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nombre de paramètres incorrect&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pas de requête&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptBreakpointsModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ID&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Identifiant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lieu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Condition&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Condition&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore-count&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Comptes d&amp;apos;ignorés&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Single-shot&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Un seul tir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hit-count&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Compte de coups&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptBreakpointsWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Créer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Supprimer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebugger&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go to Line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aller à la ligne&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ligne:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Interrupt&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Interrompre&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift+F5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift+F5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Continue&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Continuer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step Into&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pas à pas détaillé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F11&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F11&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step Over&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pas à pas principal&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F10&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F10&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step Out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pas à pas sortant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift+F11&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift+F11&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Run to Cursor&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Exécuter au curseur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl+F10&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl+F10&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Run to New Script&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Exécuter au nouveau script&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Toggle Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Basculer le point d&amp;apos;arrêt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F9&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F9&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Debug Output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Effacer les résultats du débogage&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Error Log&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Effacer le journal d&amp;apos;erreurs&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Console&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Effacer la console&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Find in Script...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Chercher dans le script...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl+F&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl+F&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find &amp;amp;Next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Résultat &amp;amp;suivant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find &amp;amp;Previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Chercher &amp;amp;précédent&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift+F3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift+F3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl+G&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl+G&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Debug&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Déboguer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebuggerCodeFinderWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fermer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Précédent&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Suivant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Case Sensitive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sensible à la casse&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Whole words&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Mots entiers&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;img src=&amp;quot;:/qt/scripttools/debugging/images/wrap.png&amp;quot;&amp;gt;&amp;amp;nbsp;Search wrapped&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;img src=&amp;quot;:/qt/scripttools/debugging/images/wrap.png&amp;quot;&amp;gt;&amp;amp;nbsp;La recherche est revenue au début&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebuggerLocalsModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nom&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Valeur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebuggerStackModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Level&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niveau&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nom&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lieu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Toggle Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Basculer le point d&amp;apos;arrêt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Disable Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Désactiver le point d&amp;apos;arrêt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enable Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Activer le point d&amp;apos;arrêt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Breakpoint Condition:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Condition du point d&amp;apos;arrêt:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptEngineDebugger&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Loaded Scripts&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Scripts chargés&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Breakpoints&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Points d&amp;apos;arrêt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stack&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Empiler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Locals&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Locaux&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Console&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Console&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Debug Output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Résultats du débogage&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error Log&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Journal d&amp;apos;erreurs&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Search&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Chercher&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Afficher&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Qt Script Debugger&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Débogueur de script Qt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptNewBreakpointWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fermer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScrollBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll here&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Défiler jusqu&amp;apos;ici&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Extrême gauche&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;En haut&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Extrême droite&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bottom&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;En bas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page précédente&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page précédente&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page suivante&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page suivante&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Défiler vers la gauche&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Défiler vers le haut&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Défiler vers la droite&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Défiler vers le bas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aligner&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Position&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Position&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aligner en-bas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSharedMemory&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: create size is less then 0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : taille de création est inférieur à 0&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : impossible de vérrouiller&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to unlock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : impossible de déverrouiller&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : permission refusée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: already exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : existe déjà&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: doesn&amp;apos;t exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : n&amp;apos;existe pas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: out of resources&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : plus de ressources disponibles&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : erreur inconnue %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: key is empty&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : clé vide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: ftok failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : ftok a échoué&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to make key&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : impossible de créer la clé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: doesn&amp;apos;t exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: n&amp;apos;existe pas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: UNIX key file doesn&amp;apos;t exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: le fichier de clés UNIX n&amp;apos;existe pas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: system-imposed size restrictions&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : le système impose des restrictions sur la taille&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: not attached&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : non attaché&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: invalid size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : taille invalide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: key error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : erreur de clé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: size query failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : la requête de taille a échoué&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to set key on lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : impossible d&amp;apos;affecter la clé au verrou&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QShortcut&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Space&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Espace&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Esc&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Échap&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tab&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Backtab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tab arr&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Backspace&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Effacement&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Return&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Retour&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enter&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Entrée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ins&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Inser&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Del&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Suppr&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pause&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impr écran&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SysReq&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Syst&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Home&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Début&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;End&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fin&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Gauche&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Haut&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Droite&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Bas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PgUp&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page préc&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PgDown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page suiv&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;CapsLock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Verr maj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;NumLock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Verr num&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ScrollLock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Arrêt défil&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Menu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Précédent (historique)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Successeur (historique)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stop&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Stop&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Refresh&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Rafraîchir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Volume bas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume Mute&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Volume muet&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Volume haut</div><div class='add'>+&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bass Boost&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Graves fort&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bass Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Graves haut&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bass Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Graves bas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Treble Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aigus haut&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Treble Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aigus bas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Play&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Média démarrer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Stop&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Média arrêt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Média précédent&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Média suivant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Record&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Média enregistrer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Favorites&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Préférés&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Search&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Recherche&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Standby&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Attente&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ouvrir URL&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch Mail&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer courrier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch Media&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer média&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (0)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer (0)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer (1)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (2)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer (2)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (3)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer (3)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (4)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer (4)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (5)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer (5)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (6)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer (6)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (7)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer (7)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (8)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer (8)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (9)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer (9)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (A)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer (A)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (B)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer (B)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (C)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer (C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (D)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer (D)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (E)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer (E)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (F)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancer (F)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Monitor Brightness Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Augmenter la luminosité du moniteur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Monitor Brightness Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Baisser la luminosité du moniteur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Light On/Off&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Avec/sans lumière clavier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Brightness Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Augmenter la luminosité du clavier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Brightness Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Baisser la luminosité du clavier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Power Off&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Couper l&amp;apos;alimentation&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wake Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Réveiller&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Eject&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Éjecter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Screensaver&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Économiseur d&amp;apos;écran&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;WWW&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;WWW&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sleep&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dormir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LightBulb&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ampoule&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shop&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Magasin&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;History&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Historique&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Add Favorite&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ajouter favori&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hot Links&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Liens chauds&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Adjust Brightness&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Régler la luminosité&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Finance&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Finances&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Community&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Communauté&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Rewind&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Audio arrière&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Retour avant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Application Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Application gauche&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Application Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Application droite&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Book&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Livre&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;CD&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;CD&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Calculator&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Calculatrice&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Effacer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Grab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Effacer la prise&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fermer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Copier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cut&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Couper&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Display&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Affichage&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DOS&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;DOS&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Documents&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Documents&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Spreadsheet&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Feuille de calcul&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Browser&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Navigateur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Game&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Jeu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aller&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;iTouch&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;iTouch&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Logoff&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fermer une session&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Market&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Marché&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Meeting&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Réunion&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Menu du clavier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Menu PB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Menu PB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;My Sites&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Mes sites&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;News&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Actualités&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Home Office&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Bureau à domicile&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Option&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Option&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Coller&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Phone&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Téléphone&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reply&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Répondre&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reload&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Recharger&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rotate Windows&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Faire tourner la fenêtre&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rotation PB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Rotation PB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rotation KB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Rotation KB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Enregistrer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Send&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Envoyer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Spellchecker&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Correcteur orthographique&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Split Screen&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Partager l&amp;apos;écran&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Support&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Supporter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Task Panel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Panneau de tâches&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Terminal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Terminal&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tools&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Outils&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Travel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Voyager&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Vidéo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Word Processor&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Traitement de texte&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XFer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;XFer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom In&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Agrandir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom Out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Rétrécir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Away&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Absent&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Messenger&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Messenger&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;WebCam&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Webcaméra&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mail Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Faire suivre l&amp;apos;e-mail&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pictures&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Images&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Music&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Musique&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Battery&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Batterie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bluetooth&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Bluetooth&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wireless&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sans fil&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ultra Wide Band&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Bande ultralarge&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Audio avant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Repeat&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Audio répéter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Random Play&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Audio lecture aléatoire&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Subtitle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sous-titre&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Cycle Track&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Piste du cycle audio&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Time&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Heure&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Afficher&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Haut du menu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Suspend&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Suspendre&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hibernate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Hiberner&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print Screen&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Capture d&amp;apos;écran&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page haut&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page bas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Caps Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Verrou maj.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Num Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Verrou num.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Number Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Verrou numéro&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Arrêt défilement&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Insérer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Supprimer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Escape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Échapement&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;System Request&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Système&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sélectionner&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Oui&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Non&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Contexte1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Contexte2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Contexte3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Contexte4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Call&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Appeler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hangup&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Raccrocher&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Flip&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Retourner&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Maj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Alt&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Alt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Meta&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Méta&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;+&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;+&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Home Page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page d&amp;apos;accueil&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSlider&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page précédente&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page précédente&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Position&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Position&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page suivante&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page suivante&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSocks5SocketEngine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to proxy refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion au proxy refusée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to proxy closed prematurely&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;connexion au proxy fermée prématurément&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy host not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Hôte proxy introuvable&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to proxy timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion au proxy expirée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy authentication failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;authentification proxy a échoué&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy authentication failed: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;authentification proxy a échoué : %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SOCKS version 5 protocol error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur de protocole SOCKS version 5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;General SOCKSv5 server failure&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur générale du serveur SOCKSv5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection not allowed by SOCKSv5 server&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Connexion refusée par le serveur SOCKSv5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;TTL expired&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;TTL expiré&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SOCKSv5 command not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Commande SOCKSv5 non supportée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Address type not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Type d&amp;apos;adresse non supporté&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown SOCKSv5 proxy error code 0x%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur proxy SOCKSv5 inconnue : 0x%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;opération réseau a expiré&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSoftKeyManager&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ok&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sélectionner&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Done&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Terminer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Options&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Options&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Annuler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Exit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Quitter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSpinBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Plus&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Less&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Moins&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSql&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Supprimer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete this record?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Supprimer cet enregistrement ?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Oui&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Non&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Insérer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Update&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Actualiser&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save edits?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Enregistrer les modifications ?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Annuler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Confirm&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Confirmer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel your edits?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Annuler vos modifications ?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSslSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to write data: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;écrire les données : %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to decrypt data: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de décrypter les données: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error while reading: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de la lecture : %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error during SSL handshake: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de la poignée de main SSL : %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error creating SSL context (%1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de la création du contexte SSL (%1)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid or empty cipher list (%1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La list de chiffrements est invalide ou vide (%1)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Private key does not certify public key, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La clé privée ne certifie pas la clé publique, %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error creating SSL session, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de la création de la session SSL, %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error creating SSL session: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors de la création de la session SSL : %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot provide a certificate with no key, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible de fournir un certificat sans clé, %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error loading local certificate, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors du chargement du certificat local, %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error loading private key, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur lors du chargement de la clé privée, %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucune erreur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The issuer certificate could not be found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le certificat de l&amp;apos;émetteur est introuvable&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate signature could not be decrypted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La signature du certificat n&amp;apos;a pas pu être vérifiée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The public key in the certificate could not be read&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La clé publique du certificat n&amp;apos;a pas pu être lue&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The signature of the certificate is invalid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La signature du certificat n&amp;apos;est pas valide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate is not yet valid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le certificat n&amp;apos;est pas encore valide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate has expired&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le certificat a expiré&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate&amp;apos;s notBefore field contains an invalid time&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le champ pasAvant du certificat inclut une heure non valide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate&amp;apos;s notAfter field contains an invalid time&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le champ pasAprès du certificat inclut une heure non valide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate is self-signed, and untrusted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le certificat n&amp;apos;est pas sécurisé car signé automatiquement&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root certificate of the certificate chain is self-signed, and untrusted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le certificat racine de la chaîne de certificats n&amp;apos;est pas sécurisé car signé automatiquement&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The issuer certificate of a locally looked up certificate could not be found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le certificat de l&amp;apos;émetteur d&amp;apos;un certificat converti localement est introuvable&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No certificates could be verified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucun certificat n&amp;apos;a pu être vérifié&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;One of the CA certificates is invalid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;un des certificats CA n&amp;apos;est pas valide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The basicConstraints path length parameter has been exceeded&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le paramètre de longueur du chemin basicConstraints a été dépassé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The supplied certificate is unsuitable for this purpose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le certificat fourni ne convient pas pour cet objectif&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root CA certificate is not trusted for this purpose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le certificat CA racine n&amp;apos;est pas sécurisé pour cet objectif&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root CA certificate is marked to reject the specified purpose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le certificat CA racine est marqué pour rejeter l&amp;apos;objectif spécifié&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le certificat de l&amp;apos;émetteur candidat actuel a été rejeté car le nom de son sujet ne correspondait pas au nom de l&amp;apos;émetteur du certificat actuel&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le certificat de l&amp;apos;émetteur candidat actuel a été rejeté car le nom de son sujet et son numéro de série étaient présents et ne correspondaient pas à l&amp;apos;identifiant de la clé d&amp;apos;autorité du certificat actuel&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The peer did not present any certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le poste ne contient aucun certificat&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The host name did not match any of the valid hosts for this certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le nom d&amp;apos;hôte ne correspondait à aucun des hôtes valides pour ce certificat&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur inconnue&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QStateMachine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Missing initial state in compound state &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;État initial manquant dans l&amp;apos;état composé &amp;apos;%1&amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Missing default state in history state &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;État par défaut manquant dans l&amp;apos;état de l&amp;apos;historique &amp;apos;%1&amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No common ancestor for targets and source of transition from state &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucun ancêtre commun pour les cibles et la source de transition de l&amp;apos;état &amp;apos;%1&amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur inconnue&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSystemSemaphore&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: does not exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : n&amp;apos;existe pas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: out of resources&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: plus de ressources disponibles&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: permission refusée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: already exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 : existe déjà&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: erreur inconnue %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTDSDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to open connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;ouvrir la connexion&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to use database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;utiliser la base de données&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTabBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Défiler vers la gauche&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Défiler vers la droite&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTcpServer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation on socket is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Opération sur le socket non supportée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTextControl&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Annuler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Répéter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cu&amp;amp;t&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Co&amp;amp;uper&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cop&amp;amp;ier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy &amp;amp;Link Location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Copier l&amp;apos;adresse du &amp;amp;lien&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Co&amp;amp;ller&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Supprimer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tout sélectionner&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QToolButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Press&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Presser&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ouvrir&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUdpSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;This platform does not support IPv6&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cette plateforme ne supporte pas IPv6&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUndoGroup&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Annuler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Répéter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUndoModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;empty&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;vide&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUndoStack&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Annuler&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Répéter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUnicodeControlCharacterMenu&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LRM Left-to-right mark&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;LRM Left-to-right mark&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;RLM Right-to-left mark&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;RLM Right-to-left mark&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ZWJ Zero width joiner&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ZWJ Zero width joiner&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ZWNJ Zero width non-joiner&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ZWNJ Zero width non-joiner&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ZWSP Zero width space&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ZWSP Zero width space&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LRE Start of left-to-right embedding&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;LRE Start of left-to-right embedding&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;RLE Start of right-to-left embedding&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;RLE Start of right-to-left embedding&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LRO Start of left-to-right override&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;LRO Start of left-to-right override&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;RLO Start of right-to-left override&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;RLO Start of right-to-left override&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PDF Pop directional formatting&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;PDF Pop directional formatting&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert Unicode control character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Insérer caractère de contrôle Unicode&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWebFrame&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request cancelled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Requête annulée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request blocked&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Requête bloquée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot show URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;afficher l&amp;apos;URL&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Frame load interrupted by policy change&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Charge du cadre interrompue par le changement de politique&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot show mimetype&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Impossible d&amp;apos;afficher le mimetype&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File does not exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le fichier n&amp;apos;existe pas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWebPage&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Submit&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;default label for Submit buttons in forms on web pages&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Submit&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Submit (input element) alt text for &amp;lt;input&amp;gt; elements with no alt, title, or value&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reset&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;default label for Reset buttons in forms on web pages&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Choose File&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;title for file button used in HTML forms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Choisir le fichier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No file selected&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;text to display in file button used in HTML forms when no file is selected&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open in New Window&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open in New Window context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save Link...&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Download Linked File context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy Link&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Copy Link context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Copier le lien&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open Image&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open Image in New Window context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save Image&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Download Image context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy Image&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Copy Link context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Copier l&amp;apos;image&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open Frame&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open Frame in New Window context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Copy context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Copier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go Back&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Back context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go Forward&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Forward context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stop&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Stop context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reload&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Reload context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cut&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Cut context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Couper&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paste&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Paste context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No Guesses Found&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;No Guesses Found context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Ignore Spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Add To Dictionary&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Learn Spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Ajouter au dictionnaire&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Search The Web&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Search The Web context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Look Up In Dictionary&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Look Up in Dictionary context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open Link&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open Link context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Ignore Grammar context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Spelling&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Spelling and Grammar context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show Spelling and Grammar&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;menu item title&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hide Spelling and Grammar&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;menu item title&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check Spelling&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Check spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Vérifier l&amp;apos;orthographe&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check Spelling While Typing&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Check spelling while typing context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Vérifier l&amp;apos;orthographe pendant la saisie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check Grammar With Spelling&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Check grammar with spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Vérifier la grammaire en même temps que l&amp;apos;orthographe&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fonts&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Font context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bold&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Bold context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Gras&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Italic&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Italic context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Underline&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Underline context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Outline&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Outline context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Direction&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Writing direction context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Direction&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Text Direction&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Text direction context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Default&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Default writing direction context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Défaut&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left to Right&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Left to Right context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Gauche à droite&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right to Left&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Right to Left context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Droite à gauche&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Loading...&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller status message when the media is loading&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Chargement...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Live Broadcast&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller status message when watching a live broadcast&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Diffusion en direct&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Element&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Élément audio&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video Element&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Élément vidéo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mute Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Bouton de désactivation du son&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unmute Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Bouton de réactivation du son&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Play Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Bouton de lecture&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Bouton de pause&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Slider&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Barre de défilement&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Slider Thumb&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Curseur de la barre de défilement&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rewind Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Bouton de retour en arrière&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Return to Real-time Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Bouton de retour au temps réel&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Elapsed Time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Temps écoulé&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remaining Time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Durée restante&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Status Display&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Affichage de l&amp;apos;état&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fullscreen Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Bouton de plein écran&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek Forward Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Bouton de recherche avant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek Back Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Bouton de recherche arrière&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio element playback controls and status display&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Commandes de lecture et affichage de l&amp;apos;état de l&amp;apos;élément audio&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video element playback controls and status display&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Commandes de lecture et affichage de l&amp;apos;état de l&amp;apos;élément vidéo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mute audio tracks&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Couper le son des pistes audio&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unmute audio tracks&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Réactiver le son des pistes audio&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Begin playback&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Commencer la lecture&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause playback&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Pause lecture&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Movie time scrubber&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Épurateur de la durée du film&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Movie time scrubber thumb&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Case de défilement de l&amp;apos;épurateur de la durée du film&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rewind movie&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Rembobiner le film&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Return streaming movie to real-time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Ramener le film en streaming en temps réel&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Current movie time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Durée du film actuel&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remaining movie time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Durée de film restante&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Current movie status&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;État du film actuel&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Play movie in full-screen mode&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Regarder le film en mode plein écran&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek quickly back&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Recherche rapide arrière&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek quickly forward&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Recherche rapide avant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Indefinite time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Durée indéfinie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 days %2 hours %3 minutes %4 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1 jours %2 heures %3 minutes %4 secondes&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 hours %2 minutes %3 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1 heures %2 minutes %3 secondes&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 minutes %2 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1 minutes %2 secondes&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1 secondes&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Inspect&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Inspect Element context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No recent searches&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Label for only item in menu that appears when clicking on the search field image, when no searches have been performed&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Recent searches&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;label for first item in the menu that appears when clicking on the search field image, used as embedded menu title&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear recent searches&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;menu item in Recent Searches menu that empties menu&amp;apos;s contents&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Effacer les recherches récentes&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Unknown filesize FTP directory listing item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Web Inspector - %2&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 (%2x%3 pixels)&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Title string for images&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1 (%2x%3 pixels)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bad HTTP request&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Requête HTTP erronée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;This is a searchable index. Enter search keywords: &lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;text that appears at the start of nearly-obsolete web pages in the form of a &amp;apos;searchable index&amp;apos;&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll here&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left edge&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right edge&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bottom&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;En bas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page left&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page up&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page right&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page down&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll left&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll up&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll right&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll down&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message numerus="yes"&gt;</div><div class='add'>+            &lt;source&gt;%n file(s)&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;number of chosen file&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;</div><div class='add'>+                &lt;numerusform&gt;&lt;/numerusform&gt;</div><div class='add'>+                &lt;numerusform&gt;&lt;/numerusform&gt;</div><div class='add'>+            &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Alert - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Confirm - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Prompt - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Problem - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Problème de JavaScript - %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The script on this page appears to have a problem. Do you want to stop the script?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le script de cette page semble avoir un problème. Souhaitez-vous arrêter le script?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the next character&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the previous character&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the next word&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the previous word&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the next line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the previous line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the start of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the end of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the start of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the end of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the start of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the end of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select all&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the next character&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the previous character&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the next word&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the previous word&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the next line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the previous line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the start of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the end of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the start of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the end of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the start of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the end of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete to the start of the word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Supprimer jusqu&amp;apos;au début du mot&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete to the end of the word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Supprimer jusqu&amp;apos;à la fin du mot&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert a new paragraph&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert a new line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paste and Match Style&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Coller et suivre le style&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remove formatting&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Retirer la mise en forme&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Strikethrough&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Barré&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Subscript&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Indice&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Superscript&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Exposant&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert Bulleted List&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Insérer une liste à puces&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert Numbered List&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Insérer une liste numérotée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Indent&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Retrait&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Outdent&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Retrait négatif&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Center&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Centré&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Justify&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Justifié&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Align Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aligner à gauche&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Align Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aligner à droite&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWhatsThisAction&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;What&amp;apos;s This?&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;*&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWizard&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt; &amp;amp;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Finish&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go Back&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Continue&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Commit&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Done&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Next&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Next &amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWorkspace&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Restore&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Move&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mi&amp;amp;nimize&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ma&amp;amp;ximize&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stay on &amp;amp;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Minimize&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore Down&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sh&amp;amp;ade&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 - [%2]&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Unshade&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QXml&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;no error occurred&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error triggered by consumer&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unexpected end of file&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;more than one document type definition&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing element&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;tag mismatch&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing content&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unexpected character&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid name for processing instruction&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;version expected while reading the XML declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;wrong value for standalone declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing document type definition&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;letter is expected&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing comment&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing reference&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;internal general entity reference not allowed in DTD&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;external parsed general entity reference not allowed in attribute value&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;external parsed general entity reference not allowed in DTD&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unparsed entity reference in wrong context&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;recursive entities&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error in the text declaration of an external entity&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;encoding declaration or standalone declaration expected while reading the XML declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;standalone declaration expected while reading the XML declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QXmlPatternistCLI&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning in %1, at line %2, column %3: %4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Avertissement dans %1, à la ligne %2, colonne %3: %4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning in %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Avertissement dans %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lieu inconnu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error %1 in %2, at line %3, column %4: %5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur %1 dans %2, à la ligne %3, colonne %4: %5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error %1 in %2: %3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur %1 dans %2: %3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QXmlStream&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Extra content at end of document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid entity value.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid XML character.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sequence &amp;apos;]]&amp;gt;&amp;apos; not allowed in content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace prefix &amp;apos;%1&amp;apos; not declared&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute redefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unexpected character &amp;apos;%1&amp;apos; in public id literal.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid XML version string.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsupported XML version.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid encoding name.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Encoding %1 is unsupported&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Standalone accepts only yes or no.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid attribute in XML declaration.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Premature end of document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Expected &lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;, but got &amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unexpected &amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Expected character data.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Recursive entity detected.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Start tag expected.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XML declaration not at start of document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;NDATA in parameter entity declaration.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid processing instruction name.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid processing instruction name.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Illegal namespace declaration.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid XML name.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Opening and ending tag mismatch.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reference to unparsed entity &amp;apos;%1&amp;apos;.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Entity &amp;apos;%1&amp;apos; not declared.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reference to external entity &amp;apos;%1&amp;apos; in attribute value.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid character reference.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Encountered incorrectly encoded content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The standalone pseudo attribute must appear after the encoding.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid PUBLIC identifier.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QtXmlPatterns&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one component must be present.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Au moins un composant doit être présent.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid value of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 n&amp;apos;est pas une valeur valide du type %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When casting to %1 from %2, the source value cannot be %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;En castant de %2 vers %1, la valeur source ne peut pas être %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Effective Boolean Value ne peut être calculée pour une séquence contenant deux ou plus valeurs atomiques.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The data of a processing instruction cannot contain the string %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Les données d&amp;apos;une instruction de traitement ne peut contenir la chaîne %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 est un ivalide %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid XML 1.0 character.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 n&amp;apos;est pas un caractère XML 1.0 valide.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 was called.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 a été appelé.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In the replacement string, %1 must be followed by at least one digit when not escaped.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dans la chaîne de remplacement, %1 doit être suivi par au moins un chiffre s&amp;apos;il n&amp;apos;est pas échappé.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In the replacement string, %1 can only be used to escape itself or %2, not %3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dans la chaîne de remplacement, %1 peut seulement être utilisé pour échapper lui-même ou %2 mais pas %3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 matches newline characters&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 correspond à des caractères de saut de ligne&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Matches are case insensitive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Les correspondances ne sont pas sensibles à la casse&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid regular expression pattern: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 est un modèle d&amp;apos;expression régulière invalide: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It will not be possible to retrieve %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Il sera impossible de récupérer %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The default collection is undefined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;I&amp;apos;l n&amp;apos;y a pas de collection par défaut&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 cannot be retrieved&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 ne peut pas être récupéré&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The item %1 did not match the required type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;item %1 ne correspond pas au type requis %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an unknown schema type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 est un type de schema inconnu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A template with name %1 has already been declared.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only one %1 declaration can occur in the query prolog.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Seulement une déclaration %1 peut intervenir lors du prologue de la requête.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The initialization of variable %1 depends on itself&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;initialisation de la variable %1 dépend d&amp;apos;elle-même&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The variable %1 is unused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La variable %1 est inutilisée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Version %1 is not supported. The supported XQuery version is 1.0.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La version %1 n&amp;apos;est pas supportée. La version de XQuery supportée est 1.0.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No function with signature %1 is available&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucune fonction avec la signature %1 n&amp;apos;est disponible&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It is not possible to redeclare prefix %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Il est impossible de redéclarer le préfixe %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Prefix %1 is already declared in the prolog.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le préfixe %1 est déjà déclaré dans le prologue.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name of an option must have a prefix. There is no default namespace for options.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le nom d&amp;apos;une option doit avoir un préfixe. Il n&amp;apos;y a pas de namespace par défaut pour les options.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The Schema Import feature is not supported, and therefore %1 declarations cannot occur.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La fonctionnalité &amp;quot;Schema Import&amp;quot; n&amp;apos;est pas supportée et les déclarations %1 ne peuvent donc intervenir.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The target namespace of a %1 cannot be empty.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le namespace cible d&amp;apos;un %1 ne peut être vide.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The module import feature is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La fonctionnalité &amp;quot;module import&amp;quot; n&amp;apos;est pas supportée&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le namespace d&amp;apos;une fonction utilisateur dans un module de bibliothèque doit être équivalent au namespace du module. En d&amp;apos;autres mots, il devrait être %1 au lieu de %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A function already exists with the signature %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Une fonction avec la signature %1 existe déjà.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No external functions are supported. All supported functions can be used directly, without first declaring them as external&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Les fonctions externes ne sont pas supportées. Toutes les fonctions supportées peuvent êter utilisées directement sans les déclarer préalablement comme externes&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The %1-axis is unsupported in XQuery&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;axe %1 n&amp;apos;est pas supporté dans XQuery&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace URI cannot be the empty string when binding to a prefix, %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;URI de namespace ne peut être une chaîne vide quand on le lie à un préfixe, %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid namespace URI.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 est un URI de namespace invalide.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It is not possible to bind to the prefix %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Il est impossible de se lier au préfixe %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Two namespace declaration attributes have the same name: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Deux attributs de déclarations de namespace ont le même nom : %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace URI must be a constant and cannot use enclosed expressions.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;URI de namespace doit être une constante et ne peut contenir d&amp;apos;expressions.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 n&amp;apos;est pas dans les déclaration d&amp;apos;attribut in-scope. La fonctionnalité d&amp;apos;inport de schéma n&amp;apos;est pas supportée.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;empty&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;vide&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;zero or one&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;zéro ou un&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;exactly one&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;exactement un&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;one or more&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;un ou plus&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;zero or more&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;zéro ou plus&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The focus is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le focus est indéfini.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An attribute by name %1 has already been created.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Un attribute de nom %1 a déjà été créé.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network timeout.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le réseau ne répond pas.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 can&amp;apos;t be serialized because it appears outside the document element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;élément %1 ne peut pas être sérialisé parce qu&amp;apos;il est hors de l&amp;apos;élément document.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Year %1 is invalid because it begins with %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;année %1 est invalide parce qu&amp;apos;elle commence par %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Day %1 is outside the range %2..%3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le jour %1 est hors de l&amp;apos;intervalle %2..%3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Month %1 is outside the range %2..%3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le mois %1 est hors de l&amp;apos;intervalle %2..%3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Overflow: Can&amp;apos;t represent date %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Overflow: ne peut pas représenter la date %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Day %1 is invalid for month %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Jour %1 est invalide pour le mois %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; &lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;heure 24:%1:%2.%3 est invalide. L&amp;apos;heure est 24 mais les minutes, seconndes et millisecondes ne sont pas à 0;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Time %1:%2:%3.%4 is invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;heure %1:%2:%3.%4 est invalide.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Overflow: Date can&amp;apos;t be represented.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Overflow : la date ne peut pas être représentée.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one time component must appear after the %1-delimiter.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Au moins un composant doit apparaître après le délimiteur %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dividing a value of type %1 by %2 (not-a-number) is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Diviser une valeur du type %1 par %2 (not-a-number) est interdit.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Diviser une valeur de type %1 par %2 ou %3 (plus ou moins zéro) est interdit.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La multiplication d&amp;apos;une valeur du type %1 par %2 ou %3 (plus ou moins infini) est interdite.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A value of type %1 cannot have an Effective Boolean Value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Une valeur de type %1 ne peut pas avoir une Effective Boolean Value.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value %1 of type %2 exceeds maximum (%3).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La valeur %1 de type %2 excède le maximum (%3).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value %1 of type %2 is below minimum (%3).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La valeur %1 de type %2 est inférieur au minimum (%3).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A value of type %1 must contain an even number of digits. The value %2 does not.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Une valeur de type %1 doit contenir un nombre pair de chiffre. La valeur %2 n&amp;apos;est pas conforme.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not valid as a value of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 n&amp;apos;est pas une valeur valide de type %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operator %1 cannot be used on type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;opérateur %1 ne peut pas être utilisé pour le type %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operator %1 cannot be used on atomic values of type %2 and %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;opérateur %1 ne peut pas être utilisé pour des valeurs atomiques de type %2 ou %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace URI in the name for a computed attribute cannot be %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;URI de namespace dans le nom d&amp;apos;un attribut calculé ne peut pas être %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name for a computed attribute cannot have the namespace URI %1 with the local name %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le nom d&amp;apos;un attribut calculé ne peut pas avoir l&amp;apos;URI de namespace %1 avec le nom local %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type error in cast, expected %1, received %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur de type lors du cast, attendu %1 mais reçu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;En castant vers %1 ou des types dérivés, la valeur source doit être du même type ou une chaîne. Le type %2 n&amp;apos;est pas autorisé.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A comment cannot contain %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Un commentaire ne peut pas contenir %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A comment cannot end with a %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Un commentaire ne peut pas finir par %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Un noeuds attribut ne peut être un fils d&amp;apos;un noeuds document. C&amp;apos;est pourquoi l&amp;apos;attribut %1 est mal placé.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A library module cannot be evaluated directly. It must be imported from a main module.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Un module de bibliothèque ne peut pas être évalué directement. Il doit être importé d&amp;apos;un module principal.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No template by name %1 exists.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucun template nommé %1 n&amp;apos;existe.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Une valeur de type %1 ne peut être un prédicat. Un prédicat doit être de type numérique ou un Effective Boolean Value.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A positional predicate must evaluate to a single numeric value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Un prédicat de position doit être évalué en une unique valeur numérique.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le nom de destination dans une instruction de traitement ne peut être %1. %2 est invalide.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 n&amp;apos;est pas un nom de destination valide dans une instruction de traitement. Ce doit être une valeur %2, par ex. %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La dernière étape dans un chemin doit contenir soit des noeuds soit des valeurs atomiques. Cela ne peut pas être un mélange des deux.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No namespace binding exists for the prefix %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucun lien de namespace n&amp;apos;existe pour le préfixe %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No namespace binding exists for the prefix %1 in %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucun lien de namespace n&amp;apos;existe pour le préfixe %1 dans %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le premier argument de %1 ne peut être du type %2. Il doit être de type numérique, xs:yearMonthDuration ou xs:dayTimeDuration.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le premier argument de %1 ne peut être du type %2. Il doit être de type %3, %4 ou %5.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le deuxième argument de %1 ne peut être du type %2. Il doit être de type %3, %4 ou %5.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Si les deux valeurs ont des décalages de zone, elle doivent avoir le même. %1 et %2 sont différents.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 must be followed by %2 or %3, not at the end of the replacement string.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 doit être suivi par %2 ou %3, et non à la fin de la chaîne de remplacement.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 and %2 match the start and end of a line.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 et %2 correspondent au début et à la fin d&amp;apos;une ligne.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Whitespace characters are removed, except when they appear in character classes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Les blancs sont supprimés excepté quand ils apparaissent dans les classes de caractère&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid flag for regular expressions. Valid flags are:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 est un flag invalide pour des expressions régulières. Les flags valides sont :&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Si le premier argument est une sequence vide ou un chaîne vide (sans namespace), un préfixe ne peut être spécifié. Le préfixe %1 a été spécifié.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le forme de normalisation %1 n&amp;apos;est pas supportée. Les formes supportées sont %2, %3, %4 et %5, et aucun, ie. une chaîne vide (pas de normalisation).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A zone offset must be in the range %1..%2 inclusive. %3 is out of range.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Un décalage de zone doit être dans l&amp;apos;intervalle %1..%2 inclus. %3 est hors de l&amp;apos;intervalle.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Required cardinality is %1; got cardinality %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La cardinalité requise est %1; reçu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;encodage %1 est invalide. Il doit contenir uniquement des caractères latins, sans blanc et doit être conforme à l&amp;apos;expression régulière %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The keyword %1 cannot occur with any other mode name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le mot-clé %1 ne peut pas apparaître avec un autre nom de mode.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No variable with name %1 exists&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The value of attribute %1 must be of type %2, which %3 isn&amp;apos;t.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The prefix %1 cannot be bound. By default, it is already bound to the namespace %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A variable with name %1 has already been declared.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No value is available for the external variable with name %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A stylesheet function must have a prefixed name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Une fonction de feuille de style doit avoir un nom préfixé.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le namespace %1 est réservé; c&amp;apos;est pourquoi les fonctions définies par l&amp;apos;utilisateur ne peuvent l&amp;apos;utiliser. Essayez le préfixe prédéfini %2 qui existe pour ces cas.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An argument with name %1 has already been declared. Every argument name must be unique.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Quand la fonction %1 est utilisée pour vérifier la correspondance dans un pattern, l&amp;apos;argument doit être une référence de variable ou une chaîne de caractères.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dans un pattern XSL-T, le premier argument à la fonction %1 doit être une chaîne de caractères quand utilisé pour correspondance.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dans un pattern XSL-T, le premier argument à la fonction %1 doit être un litéral ou une référence de variable.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, function %1 cannot have a third argument.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dans un pattern XSL-T, la fonction %1 ne peut pas avoir de 3e argument.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dans un pattern XSL-T, seules les fonctions %1 et %2 (pas %3) peuvent être utilisées pour le matching.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dans un pattern XSL-T, l&amp;apos;axe %1 ne peut pas être utilisé, seulement %2 ou %3 le peuvent.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid template mode name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 est un nom de mode de template invalide.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le nom d&amp;apos;une variable liée dans un expression for doit être different de la variable positionnelle. Les deux variables appelées %1 sont en conflit.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The Schema Validation Feature is not supported. Hence, %1-expressions may not be used.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La fonctionnalité &amp;quot;Schema Validation&amp;quot; n&amp;apos;est pas supportée. Les expressions %1 ne seront pas utilisées.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;None of the pragma expressions are supported. Therefore, a fallback expression must be present&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aucune des expressions pragma n&amp;apos;est supportée. Une expression par défault doit être présente&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Each name of a template parameter must be unique; %1 is duplicated.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Chaque nom d&amp;apos;un paramètre ede template doit être unique; %1 est dupliqué.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No function with name %1 is available.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid numeric literal.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 n&amp;apos;est pas une valeur numérique valide.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;W3C XML Schema identity constraint selector&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;W3C XML Schema identity constraint field&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A construct was encountered which is disallowed in the current language(%1).&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le namespace %1 peut seulement être lié à %2 (et doit être pré-déclaré).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le préfixe %1 peut seulement être lié à %2 (et doit être prédéclaré).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An attribute with name %1 has already appeared on this element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A direct element constructor is not well-formed. %1 is ended with %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Un constructeur direct d&amp;apos;élément est mal-formé. %1 est terminé par %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name %1 does not refer to any schema type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le nom %1 ne se réfère à aucun type de schema.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 est une type complexe. Caster vers des types complexes n&amp;apos;est pas possible. Cependant, caster vers des types atomiques comme %2 marche.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not an atomic type. Casting is only possible to atomic types.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 n&amp;apos;est pas un type atomique. Il est uniquement possible de caster vers des types atomiques.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid name for a processing-instruction.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 n&amp;apos;est pas un nom valide pour une instruction de traitement.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name of an extension expression must be in a namespace.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le nom d&amp;apos;une expression d&amp;apos;extension doit être dans un namespace.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Required type is %1, but %2 was found.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le type requis est %1, mais %2 a été reçu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Promoting %1 to %2 may cause loss of precision.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La Promotion de %1 vers %2 peut causer un perte de précision.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It&amp;apos;s not possible to add attributes after any other kind of node.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Il est impossible d&amp;apos;ajouter des attributs après un autre type de noeuds.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Seule le Unicode CodepointCollation est supporté (%1), %2 n&amp;apos;est pas supporté.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Integer division (%1) by zero (%2) is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Division entière (%1) par zéro (%2) indéfinie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Division (%1) by zero (%2) is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Division (%1) par zéro (%2) indéfinie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Modulus division (%1) by zero (%2) is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Module division (%1) par zéro (%2) indéfinie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message numerus="yes"&gt;</div><div class='add'>+            &lt;source&gt;%1 takes at most %n argument(s). %2 is therefore invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 prend au maximum %n argument. %2 est donc invalide.&lt;/numerusform&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 prend au maximum %n arguments. %2 est donc invalide.&lt;/numerusform&gt;</div><div class='add'>+            &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message numerus="yes"&gt;</div><div class='add'>+            &lt;source&gt;%1 requires at least %n argument(s). %2 is therefore invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 requiert au moins %n argument. %2 est donc invalide.&lt;/numerusform&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 requiert au moins %n arguments. %2 est donc invalide.&lt;/numerusform&gt;</div><div class='add'>+            &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root node of the second argument to function %1 must be a document node. %2 is not a document node.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le noeuds racine du deuxième argument à la fonction %1 doit être un noeuds document. %2 n&amp;apos;est pas un document.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le namespace d&amp;apos;une fonction utilisateur ne peut pas être vide (essayez le préfixe prédéfini %1 qui existe pour ce genre de cas)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A default namespace declaration must occur before function, variable, and option declarations.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Un déclaration de namespace par défaut doit être placée avant toute fonction, variable ou declaration d&amp;apos;option.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace declarations must occur before function, variable, and option declarations.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Les declarations de namespace doivent être placées avant tout fonction, variable ou déclaration d&amp;apos;option.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Module imports must occur before function, variable, and option declarations.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Les imports de module doivent être placés avant tout fonction, variable ou déclaration d&amp;apos;option.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a whole number of minutes.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 n&amp;apos;est pas un nombre entier de minutes.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 can&amp;apos;t be serialized because it appears at the top level.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;attribut %1 ne peut pas être sérialisé car il apparaît à la racine.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an unsupported encoding.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 est un encodage non supporté.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 contains octets which are disallowed in the requested encoding %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 contient &amp;apos;octets&amp;apos;, qui n&amp;apos;est pas autorisé pour l&amp;apos;encodage %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le codepoint %1 dans %2 et utilisant l&amp;apos;encodage %3 est un caractère XML invalide.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ambiguous rule match.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Corresonpdance aux règles ambigüe.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In a namespace constructor, the value for a namespace cannot be an empty string.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dans un constructeur d&amp;apos;espace de noms, la valeur pour un espace de noms ne peut pas être une chaîne vide.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The prefix must be a valid %1, which %2 is not.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le préfixe doit être un valide %1; %2 n&amp;apos;e l&amp;apos;est pas.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The prefix %1 cannot be bound.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le préfixe %1 ne peut être lié.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only the prefix %1 can be bound to %2 and vice versa.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Seul le préfixe %1 peut être lié à %2, et vice versa.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The parameter %1 is required, but no corresponding %2 is supplied.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le paramètre %1 est requis, mais aucun %2 correspondant n&amp;apos;est fourni.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The parameter %1 is passed, but no corresponding %2 exists.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Le paramètre %1 est passé mais aucun %2 correspondant n&amp;apos;existe.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The URI cannot have a fragment&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;URI ne peut pas avoir de fragments&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed at this location.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;élément %1 n&amp;apos;est pas autorisé à cet emplacement.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Text nodes are not allowed at this location.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Les noeuds de texte ne sont pas autorisés à cet emplacement.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Parse error: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Erreur: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The value of the XSL-T version attribute must be a value of type %1, which %2 isn&amp;apos;t.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La valeur de l&amp;apos;attribut de version XSL-T doit être du type %1, et non %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Running an XSL-T 1.0 stylesheet with a 2.0 processor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lancement d&amp;apos;une feuille de style XSL-T 1.0 avec un processeur 2.0.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown XSL-T attribute %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Attribut XSL-T inconnu : %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 and %2 are mutually exclusive.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Les attributs %1 et %2 sont mutuellement exclusifs.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In a simplified stylesheet module, attribute %1 must be present.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dans un module de feuille de style simplifié, l&amp;apos;attribut %1 doit être présent.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;If element %1 has no attribute %2, it cannot have attribute %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Si l&amp;apos;élément %1 n&amp;apos;a pas d&amp;apos;attribut %2, il ne peut pas avoir d&amp;apos;attribut %3 ou %4.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 must have at least one of the attributes %2 or %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;élement %1 doit avoir au moins un des attributs %2 ou %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one mode must be specified in the %1-attribute on element %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Au moins un mode doit être spécifié dans l&amp;apos;attribut %1 sur l&amp;apos;élément %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 must come last.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;élément %1 doit être le dernier.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one %1-element must occur before %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Au moins un élément %1 doit être placé avant %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only one %1-element can appear.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Seulement un élément %1 peut apparaître.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one %1-element must occur inside %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Au moins un élément %1 doit apparaître dans %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When attribute %1 is present on %2, a sequence constructor cannot be used.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Quand l&amp;apos;attribut %1 est présent sur %2, un constructeur de séquence ne peut pas être utilisé.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 must have either a %2-attribute or a sequence constructor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;élément %1 doit avoir un attribut %2 ou un constructeur de séquence.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Quand un paramètre est requis, un valeur par défault ne peut pas être fournie par un attribute %1 ou un constructeur de séquence.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 cannot have children.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;élément %1 ne peut pas avoir de fils.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 cannot have a sequence constructor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;élément %1 ne peut pas avoir un constructuer de séquence.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The attribute %1 cannot appear on %2, when it is a child of %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;attribut %1 ne peut pas apparaître sur %2 quand il est fils de %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A parameter in a function cannot be declared to be a tunnel.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Un paramètre de fonction ne peut pas être déclaré comme un tunnel.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;This processor is not Schema-aware and therefore %1 cannot be used.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ce processeur ne comprend pas les Schemas. C&amp;apos;est pourquoi %1 ne peut pas être utilisé.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top level stylesheet elements must be in a non-null namespace, which %1 isn&amp;apos;t.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Les élément d&amp;apos;une feuille de style de haut niveau doivent être dans un namespace non nul; %1 ne l&amp;apos;est pas.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The value for attribute %1 on element %2 must either be %3 or %4, not %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;La valeur de l&amp;apos;attribut %1 de l&amp;apos;élement %2 doit être %3 ou %4, et pas %5.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 cannot have the value %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;attribut %1 ne peut avoir la valeur %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The attribute %1 can only appear on the first %2 element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;L&amp;apos;attribute %1 peut seulement apparaître sur le premier élément %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one %1 element must appear as child of %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Au moins un élément %1 doit apparaître comme fils de %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 has inheritance loop in its base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Circular inheritance of base type %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Circular inheritance of union %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by restriction as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by extension as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type of simple type %1 cannot be complex type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 cannot have direct base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 is not allowed to have base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 can only have simple atomic type as base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 cannot derive from %2 as the latter defines restriction as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Variety of item type of %1 must be either atomic or union.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Variety of member types of %1 must be atomic.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by list as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 is only allowed to have %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type of simple type %1 must have variety of type list.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type of simple type %1 has defined derivation by restriction as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Item type of base type does not match item type of %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 contains not allowed facet type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by union as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to have any facets.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of simple type %2 must have variety of union.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Member type %1 cannot be derived from member type %2 of %3&amp;apos;s base type %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derivation method of %1 must be extension because the base type %2 is a simple type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 has duplicated element %2 in its content model.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 has non-deterministic content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content model of complex type %1 is not a valid extension of content model of %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 must have simple content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 must have the same simple type as its base class %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 cannot be derived from base type %2%3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 with simple content cannot be derived from complex base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Item type of simple type %1 cannot be a complex type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Member type of simple type %1 cannot be a complex type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to have a member type with the same name as itself.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet collides with %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must have the same value as %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be equal or greater than %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than or equal to %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet contains invalid regular expression&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown notation %1 used in %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet contains invalid value %2: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet cannot be %2 or %3 if %4 facet of base type is %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet cannot be %2 if %3 facet of base type is %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than or equal to %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet and %2 facet cannot appear together.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be greater than %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be greater than or equal to %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type contains not allowed facet %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only %1 and %2 facets are allowed when derived by union.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 contains %2 facet with invalid data: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 contains attribute %2 twice.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 contains two different attributes that both have types derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 contains attribute %2 twice.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 contains two different attributes that both have types derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed to have a value constraint if its base type is complex.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed to have a value constraint if its type is derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value constraint of element %1 is not of elements type: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed to have substitution group affiliation as it is no global element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of element %1 cannot be derived from type of substitution group affiliation.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value constraint of attribute %1 is not of attributes type: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 has value constraint but has type derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute in derived complex type must be %2 like in base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 in derived complex type must have %2 value constraint like in base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 in derived complex type must have the same %2 value constraint like in base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 in derived complex type must have %2 value constraint.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;processContent of base wildcard must be weaker than derived wildcard.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 exists twice with different types.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Particle contains non-deterministic wildcards.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base attribute %1 is required but derived attribute is not.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of derived attribute %1 cannot be validly derived from type of base attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value constraint of derived attribute %1 does not match value constraint of base attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived attribute %1 does not exist in the base definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived attribute %1 does not match the wildcard in the base definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base attribute %1 is required but missing in derived definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived definition contains an %1 element that does not exists in the base definition&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived wildcard is not a subset of the base wildcard.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 of derived wildcard is not a valid restriction of %2 of base wildcard&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 from base type is missing in derived type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of derived attribute %1 differs from type of base attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base definition contains an %1 element that is missing in the derived definition&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 references unknown %2 or %3 element %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 references identity constraint %2 that is no %3 or %4 element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 has a different number of fields from the identity constraint %2 that it references.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Item type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Member type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of complex type cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 cannot have complex base type that has a %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of %1 element must be a simple type, %2 is not.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Substitution group %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Substitution group %1 has circular definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duplicated element names %1 in %2 element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reference %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Circular group reference for %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed in this scope&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element cannot have %2 attribute with value other than %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element cannot have %2 attribute with value other than %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 or %2 attribute of reference %3 does not match with the attribute declaration %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 has circular reference.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute in %2 must have %3 use like in base type %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 has attribute wildcard but its base type %2 has not.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enumeration facet contains invalid content: {%1} is not a value of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace prefix of qualified name %1 is not defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element %2 is not a valid restriction of the %3 element it redefines: %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Empty particle cannot be derived from non-empty particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived particle is missing element %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived element %1 is missing value constraint as defined in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived element %1 has weaker value constraint than base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fixed value constraint of element %1 differs from value constraint in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived element %1 cannot be nillable as base element is not nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Block constraints of derived element %1 must not be more weaker than in the base element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type of derived element %1 cannot be validly derived from base element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type of derived element %1 cannot be validly derived from base element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is missing in derived particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 does not match namespace constraint of wildcard in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wildcard in derived particle is not a valid subset of wildcard in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;processContent of wildcard in derived particle is weaker than wildcard in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived particle allows content that is not allowed in the base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Can not process unknown element %1, expected elements are: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed in this scope, possible elements are: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Child element is missing in that scope, possible child elements are: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Document is not a XML schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element contains invalid content: {%3} is not a value of type %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element contains invalid content: {%3}.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed to have the same %2 attribute value as the target namespace %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element without %2 attribute is not allowed inside schema without target namespace.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed inside %2 element if %3 attribute is present.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element has neither %2 attribute nor %3 child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element with %2 child element must not have a %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must be %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must have a value of %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must have a value of %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element must not have %2 and %3 attribute together.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of %1 attribute of %2 element must not be from namespace %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must not be %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must have the value %3 because the %4 attribute is set.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Specifying use=&amp;apos;prohibited&amp;apos; inside an attribute group has no effect.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element must have either %2 or %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element must have either %2 attribute or %3 or %4 as child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element requires either %2 or %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Text or entity references not allowed inside %1 element&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must contain %3, %4 or a list of URIs.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed in this context.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element has larger value than %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Prefix of qualified name %1 is not defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must either contain %3 or the other values.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Component with ID %1 has been defined previously.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element group %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Notation %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Identity constraint %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duplicated facets in simple type %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not valid according to %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match the length facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match the minLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match the maxLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match in the totalDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match in the totalDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decimal content does not match in the fractionDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decimal content does not match in the totalDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Boolean content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content does not match the length facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content does not match the minLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content does not match the maxLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid QName content: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QName content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QName content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Notation content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match length facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match minLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match maxLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Union content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Union content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Data of type %1 are not allowed to be empty.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is missing child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;There is one IDREF value with no corresponding ID: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Loaded schema file is invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 contains invalid data.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;xsi:schemaLocation namespace %1 has already appeared earlier in the instance document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No schema defined for validation.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No definition for element %1 available.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Specified type %1 is not known to the schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not defined in this scope.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Declaration for element %1 does not exist.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains invalid content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is declared as abstract.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 contains invalid data: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element contains content although it is nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fixed value constraint not allowed if element is nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 cannot contain other elements, as it has a fixed content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Specified type %1 is not validly substitutable with element type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 is not allowed to be abstract.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed attributes.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of element %1 does not match its type definition: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of element %1 does not match defined value constraint.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed child content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed text content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is missing required attribute %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 does not match the attribute wildcard.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Declaration for attribute %1 does not exist.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains two attributes of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 contains invalid content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains unknown attribute %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of attribute %1 does not match its type definition: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of attribute %1 does not match defined value constraint.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Non-unique value found for constraint %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Key constraint %1 contains absent fields.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Key constraint %1 contains references nillable element %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No referenced value found for key reference %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More than one value found for field %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Field %1 has no simple type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ID value &amp;apos;%1&amp;apos; is not unique.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;apos;%1&amp;apos; attribute contains invalid QName content: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+&lt;/TS&gt;</div><div class='head'>diff --git a/config.profiles/symbian/translations/qt_he.ts b/config.profiles/symbian/translations/qt_he.ts<br/>new file mode 100644<br/>index 0000000..aca2bd7<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/translations/qt_he.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/translations/qt_he.ts</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="utf-8"?&gt;</div><div class='add'>+&lt;!DOCTYPE TS&gt;</div><div class='add'>+&lt;TS version="2.0"&gt;</div><div class='add'>+&lt;context&gt;</div><div class='add'>+    &lt;name&gt;QApplication&lt;/name&gt;</div><div class='add'>+    &lt;message&gt;</div><div class='add'>+        &lt;source&gt;QT_LAYOUT_DIRECTION&lt;/source&gt;</div><div class='add'>+        &lt;comment&gt;Translate this string to the string &amp;apos;LTR&amp;apos; in left-to-right languages or to &amp;apos;RTL&amp;apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.&lt;/comment&gt;</div><div class='add'>+        &lt;translation&gt;RTL&lt;/translation&gt;</div><div class='add'>+    &lt;/message&gt;</div><div class='add'>+&lt;/context&gt;</div><div class='add'>+&lt;/TS&gt;</div><div class='head'>diff --git a/config.profiles/symbian/translations/qt_pl_symbian.ts b/config.profiles/symbian/translations/qt_pl_symbian.ts<br/>new file mode 100644<br/>index 0000000..e3902ae<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/translations/qt_pl_symbian.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/translations/qt_pl_symbian.ts</a></div><div class='hunk'>@@ -0,0 +1,8525 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='add'>+&lt;!DOCTYPE TS&gt;</div><div class='add'>+</div><div class='add'>+&lt;TS version="2.0" language="pl"&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;CloseButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close Tab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zamknij kartę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;FakeReply&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fake error !&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fałszywy błąd!&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawny URL&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Notifications&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Powiadomienia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Music&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Muzyka&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wideo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Communication&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Komunikacja&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Games&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Gry&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Accessibility&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dostępność&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::AudioOutput&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;html&amp;gt;The audio playback device &amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt; does not work.&amp;lt;br/&amp;gt;Falling back to &amp;lt;b&amp;gt;%2&amp;lt;/b&amp;gt;.&amp;lt;/html&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;html&amp;gt;Urządzenie dźwiękowe &amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt; nie działa.&amp;lt;br/&amp;gt;Przywracanie do &amp;lt;b&amp;gt;%2&amp;lt;/b&amp;gt;.&amp;lt;/html&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;html&amp;gt;Switching to the audio playback device &amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt;&amp;lt;br/&amp;gt;which just became available and has higher preference.&amp;lt;/html&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;html&amp;gt;Przełączanie na urządzenie dźwiękowe &amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt;&amp;lt;br/&amp;gt;które właśnie stało się dostępne i ma wyższy priorytet.&amp;lt;/html&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Revert back to device &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przywróć do urządzenia &amp;apos;%1&amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::Gstreamer::Backend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning: You do not seem to have the package gstreamer0.10-plugins-good installed.</div><div class='add'>+          Some video features have been disabled.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ostrzeżenie: Wygląda na to, że pakiet gstreamer0.10-plugins-good nie jest zainstalowany w tym systemie.</div><div class='add'>+Niektóre możliwości wideo zostały wyłączone.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning: You do not seem to have the base GStreamer plugins installed.</div><div class='add'>+          All audio and video support has been disabled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ostrzeżenie: Wygląda na to, że podstawowe wtyczki GStreamer nie są zainstalowane w tym systemie.</div><div class='add'>+Obsługa dźwięku i wideo została wyłączona&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::Gstreamer::MediaObject&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot start playback. </div><div class='add'>+</div><div class='add'>+Check your GStreamer installation and make sure you </div><div class='add'>+have libgstreamer-plugins-base installed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można rozpocząć odtwarzania.</div><div class='add'>+</div><div class='add'>+Sprawdź instalację Gstreamer i upewnij się że</div><div class='add'>+zainstalowałeś libgstreamer-plugins-base.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A required codec is missing. You need to install the following codec(s) to play this content: %0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak wymaganego kodeka. Aby odtworzyć zawartość musisz zainstalować poniższy kodek: %0&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open media source.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można otworzyć źródła mediów.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid source type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawny typ źródła.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not locate media source.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można znaleźć źródła mediów.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open audio device. The device is already in use.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można otworzyć urządzenia dźwiękowego. Urządzenie jest już używane.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not decode media source.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można zdekodować źródła mediów.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyjście dźwięku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The audio output device&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyjściowe urządzenie dźwiękowe&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak błędu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie znaleziono&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Out of memory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak pamięci&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieobsługiwane&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Overflow&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przepełnienie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Underflow&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niedopełnienie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Already exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Już istnieje&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Path not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie znaleziono ścieżki&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In use&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;W użyciu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not ready&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak gotowości&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Access denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odmowa dostępu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można połączyć&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Disconnected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Rozłączono&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odmowa uprawnień&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insufficient bandwidth&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niewystarczająca szerokość pasma&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network unavailable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sieć niedostępna&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network communication error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd komunikacji sieciowej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Streaming not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Transmisje strumieniowe nieobsługiwane&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Server alert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sygnał serwera&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid protocol&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieprawidłowy protokół&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieprawidłowy adres URL&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multicast error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd multiemisji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd serwera proxy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Serwer proxy nieobsługiwany&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio output error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd sygnału audio&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video output error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd wyjścia wideo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decoder error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd dekodera&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio or video components could not be played&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można odtworzyć składników dźwiękowych lub wideo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DRM error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd DRM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error (%1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieznany błąd (%1)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::AbstractMediaPlayer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not ready to play&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak gotowości do odtworzenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd podczas otwierania pliku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd podczas otwierania adresu URL&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Setting volume failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ustawienie głośności nie powiodło się&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Playback complete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zakończono odtwarzanie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::AudioEqualizer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 Hz&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 Hz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::AudioPlayer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Getting position failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ustalenie pozycji nie powiodło się&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Opening clip failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Otwieranie pliku nie powiodło się&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::EffectFactory&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enabled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Włączono&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::EnvironmentalReverb&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decay HF ratio (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Współczynnik HF zanikania (%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decay time (ms)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Czas zanikania (ms)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Density (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Gęstość (%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Diffusion (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Rozpraszanie (%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reflections delay (ms)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Opóźnienie odbić (ms)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reflections level (mB)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Poziom odbić (MB)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverb delay (ms)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Opóźnienie pogłosu (ms)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverb level (mB)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Poziom pogłosu (MB)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Room HF level&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Poziom HF pomieszczenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Room level (mB)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Poziom pomieszczenia (MB)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::MediaObject&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening source: type not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd podczas otwierania źródła: nieobsługiwany typ&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening source: media type could not be determined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd podczas otwierania źródła: nie można określić typu multimediów&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::StereoWidening&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Level (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Poziom (%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::VideoPlayer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wstrzymanie nie powiodło się&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyszukiwanie nie powiodło się&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Getting position failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ustalenie pozycji nie powiodło się&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Opening clip failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Otwieranie pliku nie powiodło się&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Buffering clip failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Buforowanie pliku nie powiodło się&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video display error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd wyświetlacza wideo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::VolumeSlider&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume: %1%&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Głośność: %1%&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Użyj tego suwaka aby zmienić głośność. Skrajnie lewa pozycja to 0%, skrajnie prawa to %1%&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Muted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyciszony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3Accel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1, %2 not defined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1, %2 nie określone&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ambiguous %1 not handled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niejednoznaczne %1, nie obsłużone&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3DataTable&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;True&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Prawda&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;False&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fałsz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wstaw&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Update&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uaktualnij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Skasuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3FileDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy or Move a File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Skopiuj lub przenieś plik&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Czytaj: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pisz: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Anuluj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wszystkie pliki (*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nazwa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Rozmiar&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Rodzaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Data&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attributes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybuty&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Look &amp;amp;in:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sprawdź &amp;amp;w:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File &amp;amp;name:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nazwa &amp;amp;pliku:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File &amp;amp;type:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Rodzaj pliku:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Powrót&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;One directory up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Katalog wyżej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Create New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Utwórz nowy katalog&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lista&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Detail View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Szczegóły&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Preview File Info&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podgląd informacji o pliku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Preview File Contents&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podgląd zawartości pliku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read-write&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Do zapisu i odczytu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read-only&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tylko do odczytu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write-only&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tylko do zapisu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Inaccessible&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niedostępny&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symlink to File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dowiązanie symboliczne do pliku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symlink to Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dowiązanie symboliczne do katalogu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symlink to Special&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Specjalny dowiązanie symboliczne&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Plik&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dir&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Katalog&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Special&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Specjalny &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Otwórz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save As&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zachowaj jako&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Otwórz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Zachowaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Rename&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Zmień nazwę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Skasuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;R&amp;amp;eload&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Odśwież&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort by &amp;amp;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sortuj &amp;amp;po nazwie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort by &amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sortuj po &amp;amp;rozmiarze&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort by &amp;amp;Date&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sortuj po &amp;amp;dacie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Unsorted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Bez sortowania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sortuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show &amp;amp;hidden files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pokaż &amp;amp;ukryte pliki&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;the file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;plik&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;the directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;katalog&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;the symlink&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;dowiązanie symboliczne&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Skasuj %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;qt&amp;gt;Are you sure you wish to delete %1 &amp;quot;%2&amp;quot;?&amp;lt;/qt&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;qt&amp;gt;Na pewno chcesz skasować %1 &amp;quot;%2&amp;quot;?&amp;lt;/qt&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Tak&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Nie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder 1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nowy katalog 1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nowy katalog&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nowy katalog %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Znajdź katalog&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Katalogi&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directory:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Katalog:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1</div><div class='add'>+File not found.</div><div class='add'>+Check path and filename.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1</div><div class='add'>+Plik nie znaleziony.</div><div class='add'>+Sprawdź ścieżkę i nazwę pliku.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*.*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wszystkie pliki (*.*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open &lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Otwórz &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select a Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wybierz katalog&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3LocalFs&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not read directory</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można czytać katalogu</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not create directory</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można utworzyć katalogu</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not remove file or directory</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można usunąć pliku lub katalogu</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not rename</div><div class='add'>+%1</div><div class='add'>+to</div><div class='add'>+%2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można zmienić nazwy</div><div class='add'>+%1</div><div class='add'>+na</div><div class='add'>+%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można otworzyć</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not write</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można zapisać</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3MainWindow&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyrównaj położenie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Customize...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ustawienia użytkownika...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3NetworkProtocol&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation stopped by the user&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Operacja zatrzymana przez użytkownika&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3ProgressDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Anuluj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3TabDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Apply&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zatwierdź&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pomoc&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Defaults&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Domyślne&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Anuluj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3TextEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Cofnij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Przywróć&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cu&amp;amp;t&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;W&amp;amp;ytnij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;S&amp;amp;kopiuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Wklej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyczyść&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz wszystko&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3TitleBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;System&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;System&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przywróć na wierzch&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Minimize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zminimalizuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przywróć pod spód&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Maximize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zmaksymalizuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zamknij okno&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Contains commands to manipulate the window&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawiera polecenia zarządzające oknem&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Puts a minimized window back to normal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przywraca normalny rozmiar uprzednio zminimalizowanego okna&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Moves the window out of the way&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przenosi okno w inne położenie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Puts a maximized window back to normal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przywraca normalny rozmiar uprzednio zmaksymalizowanego okna&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Makes the window full screen&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Powiększa maksymalnie okno&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Closes the window&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zamyka okno&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Displays the name of the window and contains controls to manipulate it&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyświetla nazwę okna i zawiera elementy do zarządzania nim&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3ToolBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Więcej...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3UrlOperator&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Protokół &amp;apos;%1&amp;apos; nie jest obsługiwany&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support listing directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Protokół &amp;apos;%1&amp;apos; nie obsługuje pokazywania katalogów&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support creating new directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Protokół &amp;apos;%1&amp;apos; nie obsługuje tworzenia nowych katalogów&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support removing files or directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Protokół &amp;apos;%1&amp;apos; nie obsługuje usuwania plików lub katalogów&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support renaming files or directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Protokół &amp;apos;%1&amp;apos; nie obsługuje zmiany nazwy plików lub katalogów&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support getting files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Protokół &amp;apos;%1&amp;apos; nie obsługuje pobierania plików&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support putting files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Protokół &amp;apos;%1&amp;apos; nie obsługuje wysyłania plików&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support copying or moving files or directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Protokół &amp;apos;%1&amp;apos; nie obsługuje kopiowania lub przenoszenia plików lub katalogów&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;(unknown)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;(nieznany)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3Wizard&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Anuluj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt; &amp;amp;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt; &amp;amp;Wstecz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Next &amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Dalej &amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Finish&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Zakończ&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Pomoc&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAbstractSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Host nie znaleziony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Połączenie odrzucone&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przekroczony czas połączenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation on socket is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Operacja na gnieździe nieobsługiwana&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Socket operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przekroczony czas operacji gniazda&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Socket is not connected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Gniazdo nie jest podłączone&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network unreachable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sieć niedostępna&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAbstractSpinBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Step up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Krok do &amp;amp;góry&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step &amp;amp;down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Krok w &amp;amp;dół&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Zaznacz wszystko&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAccessibleButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Press&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wciśnij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QApplication&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QT_LAYOUT_DIRECTION&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Translate this string to the string &amp;apos;LTR&amp;apos; in left-to-right languages or to &amp;apos;RTL&amp;apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;LTR&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Executable &amp;apos;%1&amp;apos; requires Qt %2, found Qt %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Program &amp;apos;%1&amp;apos; wymaga do uruchomienia Qt %2, znaleziono Qt %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Incompatible Qt Library Error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niekompatybilność biblioteki Qt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Activate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uaktywnij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Activates the program&amp;apos;s main window&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uaktywnia główne okno programu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAxSelect&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select ActiveX Control&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wybierz kontrolkę ActiveX&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Anuluj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;COM &amp;amp;Object:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Obiekt COM:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QCheckBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Uncheck&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odznacz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Toggle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przełącz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QColorDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hu&amp;amp;e:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Barwa:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Sat:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Nasycenie:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Val:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Wartość:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Red:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Czerwień:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Green:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Zieleń:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bl&amp;amp;ue:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błęki&amp;amp;t:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A&amp;amp;lpha channel:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kanał &amp;amp;alfa:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select Color&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wybierz kolor&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Basic colors&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Kolory podstawowe&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Custom colors&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wła&amp;amp;sne kolory&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Add to Custom Colors&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Dodaj do własnych kolorów&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QComboBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Otwórz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;False&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Fałsz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;True&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Prawda&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zamknij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QCoreApplication&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: key is empty&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: klucz jest pusty&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to make key&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: nie można utworzyć klucza&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: ftok failed&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: wystąpił błąd w funkcji ftok()&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: already exists&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: już istnieje&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: does not exist&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: nie istnieje&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: out of resources&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: zasoby wyczerpane&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: nieznany błąd %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDB2Driver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można nawiązać połączenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można dokonać transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wycofać transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to set autocommit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można ustawić trybu automatycznego dokonywania transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDB2Result&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wykonać polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można przygotować polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind variable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można powiązać zmiennej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch record %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pobrać rekordu %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pobrać kolejnego wiersza danych&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch first&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pobrać pierwszego wiersza danych&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDateTimeEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;AM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;AM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;am&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;am&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;PM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;pm&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;pm&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDial&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QDial&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;QDial&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SpeedoMeter&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Miernik prędkości&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SliderHandle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uchwyt suwaka&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;What&amp;apos;s This?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Co to jest?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Done&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wykonano&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDialogButtonBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zachowaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Zachowaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Otwórz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Anuluj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Anuluj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zamknij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Zamknij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Apply&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zastosuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reset&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Resetuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pomoc&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Don&amp;apos;t Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie zachowuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Discard&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odrzuć&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Tak&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Yes to &amp;amp;All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ta&amp;amp;k dla wszystkich&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Nie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;N&amp;amp;o to All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ni&amp;amp;e dla wszystkich&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zachowaj wszystko&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Abort&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przerwij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Retry&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ponów&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zignoruj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore Defaults&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przywróć ustawienia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close without Saving&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zamknij bez zapisywania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDirModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nazwa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Rozmiar&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Kind&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Match OS X Finder&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Typ&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Rodzaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date Modified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Data modyfikacji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDockWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zamknij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zadokuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Float&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uwolnij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDoubleSpinBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Więcej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Less&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Mniej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QErrorMessage&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Show this message again&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Pokaż ten komunikat ponownie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Debug Message:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Komunikat dla programisty:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ostrzeżenie:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fatal Error:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd krytyczny:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFile&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Destination file exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Plik wyjściowy już istnieje&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Will not rename sequential file using block copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można zmienić nazwy pliku sekwencyjnego używając kopiowania blokowego&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot remove source file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można usunąć oryginalnego pliku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open %1 for input&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można otworzyć pliku wejściowego %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open for output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można otworzyć pliku wyjściowego&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Failure to write block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można zapisać bloku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot create %1 for output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można utworzyć pliku wyjściowego %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFileDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wszystkie pliki (*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Powrót&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lista&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Detail View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Szczegóły&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Plik&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Otwórz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save As&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zachowaj jako&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Otwórz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Zachowaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Recent Places&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ostatnie miejsca&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Rename&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Zmień nazwę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Skasuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show &amp;amp;hidden files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pokaż &amp;amp;ukryte pliki&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nowy katalog&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Znajdź katalog&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Katalogi&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*.*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wszystkie pliki (*.*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directory:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Katalog:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 already exists.</div><div class='add'>+Do you want to replace it?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 już istnieje.</div><div class='add'>+Czy chcesz zamienić?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1</div><div class='add'>+File not found.</div><div class='add'>+Please verify the correct file name was given.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1</div><div class='add'>+Plik nie znaleziony.</div><div class='add'>+Proszę o sprawdzenie podanej nazwy pliku.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;My Computer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Mój komputer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Parent Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Katalog wyżej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Files of type:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pliki rodzaju:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1</div><div class='add'>+Directory not found.</div><div class='add'>+Please verify the correct directory name was given.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1</div><div class='add'>+Katalog nie znaleziony.</div><div class='add'>+Sprawdź podaną nazwę katalogu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;apos;%1&amp;apos; is write protected.</div><div class='add'>+Do you want to delete it anyway?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;apos;%1&amp;apos; jest zabezpieczony przed zapisem.</div><div class='add'>+Czy na pewno chcesz go skasować?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Are sure you want to delete &amp;apos;%1&amp;apos;?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Czy na pewno chcesz skasować &amp;apos;%1&amp;apos;?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not delete directory.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można skasować katalogu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Drive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Urządzenie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File Folder&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Match Windows Explorer&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Katalog&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Folder&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Katalog&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Alias&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Mac OS X Finder&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Alias&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shortcut&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Skrót&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieznany&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show &lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pokaż &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Do przodu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Nowy katalog&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Choose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Wybierz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remove&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Usuń&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File &amp;amp;name:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nazwa &amp;amp;pliku:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Look in:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Szukaj w:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Create New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Utwórz nowy katalog&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFileSystemModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 TB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 TB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 GB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 GB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 MB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 MB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 KB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 KB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 bytes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 bajtów&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid filename&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawna nazwa pliku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;b&amp;gt;The name &amp;quot;%1&amp;quot; can not be used.&amp;lt;/b&amp;gt;&amp;lt;p&amp;gt;Try using another name, with fewer characters or no punctuations marks.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;b&amp;gt;Nazwa &amp;quot;%1&amp;quot; nie może zostać użyta.&amp;lt;/b&amp;gt;&amp;lt;p&amp;gt;Spróbuj użyć nowej nazwy z mniejszą liczbą znaków lub bez znaków przystankowych.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nazwa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Rozmiar&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Kind&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Match OS X Finder&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Typ&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Rodzaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date Modified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Data modyfikacji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;My Computer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Mój komputer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Computer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Komputer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 byte(s)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 bajt(ów)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFontDatabase&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Normal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Normalny&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bold&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pogrubiony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Demi Bold&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Na wpół pogrubiony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Black&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Bardzo gruby&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Demi&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Na wpół&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Light&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cienki&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Italic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kursywa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Oblique&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pochyły&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Any&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Każdy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Latin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�aciński&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Greek&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Grecki&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cyrillic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cyrylica&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Armenian&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ormiański&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hebrew&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Hebrajski&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Arabic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Arabski&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Syriac&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Syryjski&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Thaana&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Thaana&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Devanagari&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Devanagari&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bengali&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Bengalski&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Gurmukhi&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Gurmukhi&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Gujarati&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Gudżaracki&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Oriya&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Orija&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tamil&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tamilski&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Telugu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Telugu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Kannada&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kannada&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Malayalam&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Malajalam&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sinhala&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Syngaleski&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Thai&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tajski&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Lao&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Laotański&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tibetan&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tybetański&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Myanmar&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Birmański&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Georgian&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Gruziński&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Khmer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Khmerski&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simplified Chinese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uproszczony chiński&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Traditional Chinese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tradycyjny chiński&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Japanese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Japoński&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Korean&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Koreański&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Vietnamese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wietnamski&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symbol&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Symboliczny&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ogham&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ogamiczny&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Runic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Runiczny&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;N&amp;apos;Ko&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;N&amp;apos;Ko&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFontDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Font&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Czcionka&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Font st&amp;amp;yle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;St&amp;amp;yl czcionki&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Rozmiar&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Effects&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Efekty&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stri&amp;amp;keout&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pr&amp;amp;zekreślenie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Underline&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Podkreślenie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sample&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przykład&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select Font&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wybierz czcionkę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wr&amp;amp;iting System&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sys&amp;amp;tem pisania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFtp&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Host %1 znaleziony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Host znaleziony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podłączony do hosta %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podłączony do hosta&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to %1 closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Połączenie do %1 zakończone&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Połączenie zamknięte&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Host %1 nie znaleziony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Połączenie do hosta %1 odrzucone&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection timed out to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przekroczony czas połączenia do hosta %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieznany błąd&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connecting to host failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podłączanie do hosta zakończone błędem:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Login failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Logowanie nie powiodło się:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Listing directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Listowanie katalogu zakończone błędem:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Changing directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zmiana katalogu zakończona błędem:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Downloading file failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pobieranie pliku zakończone błędem:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Uploading file failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wysyłanie pliku zakończone błędem:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Removing file failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Usuwanie pliku zakończone błędem:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Creating directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tworzenie katalogu zakończone błędem:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Removing directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Usuwanie katalogu zakończone błędem:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not connected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie podłączony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused for data connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Połączenie do przesyłu danych odrzucone&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHostInfo&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieznany błąd&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHostInfoAgent&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Host nie znaleziony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown address type&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieznany typ adresu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieznany błąd&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No host name given&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie podano nazwy hosta&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid hostname&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawna nazwa hosta&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHttp&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Połączenie odrzucone&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Host %1 nie znaleziony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wrong content length&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błędna długość zawartości&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;HTTP request failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Komenda HTTP zakończona błędem&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Host %1 znaleziony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Host znaleziony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podłączony do hosta %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podłączony do hosta&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to %1 closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Połączenie do %1 zamknięte&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Połączenie zakończone&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieznany błąd&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request aborted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Komenda przerwana&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No server set to connect to&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak serwera do podłączenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Server closed connection unexpectedly&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Serwer niespodziewanie zakończył połączenie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid HTTP response header&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawny nagłówek odpowiedzi HTTP&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown authentication method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieznana metoda autoryzacji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid HTTP chunked body&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawne ciało HTTP&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error writing response to device&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd zapisywania odpowiedzi do urządzenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wymagana autoryzacja pośrednika&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wymagana autoryzacja&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy requires authentication&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pośrednik wymaga autoryzacji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host requires authentication&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Host wymaga autoryzacji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Data corrupted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dane uszkodzone&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SSL handshake failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nawiązanie sesji SSL nie powiodło się&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown protocol specified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podano nieznany protokół&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused (or timed out)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Połączenie odrzucone (przekroczony czas połączenia)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;HTTPS connection requested but SSL support not compiled in&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zażądano połączenia HTTPS lecz obsługa SSL nie jest wkompilowana&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHttpSocketEngine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Did not receive HTTP response from proxy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie odebrano odpowiedzi HTTP od pośrednika&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error parsing authentication request from proxy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd parsowania żądania autoryzacji od pośrednika&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wymagana autoryzacja&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy denied connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pośrednik odmówił połączenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error communicating with HTTP proxy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd podczas komunikacji z pośrednikiem HTTP&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie znaleziono serwera pośredniczącego&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odmowa połączenia z pośrednikiem&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server connection timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przekroczony czas połączenia do serwera pośredniczącego&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy connection closed prematurely&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przedwczesne zakończenie połączenia z pośrednikiem&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QIBaseDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd otwierania bazy danych&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not start transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można rozpocząć transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można dokonać transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wycofać transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QIBaseResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to create BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można utworzyć obiektu typu BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to write BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można zapisać obiektu typu BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to open BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można otworzyć obiektu typu BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to read BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można odczytać obiektu typu BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not find array&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można odnaleźć tablicy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not get array data&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pobrać danych z tablicy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not get query info&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pobrać informacji o zapytaniu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not start transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można rozpocząć transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można dokonać transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not allocate statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można zaallokować polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można przygotować polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not describe input statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można opisać polecenia wejściowego&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not describe statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można opisać polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to close statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można zamknąć polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wykonać zapytania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not fetch next item&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pobrać kolejnego elementu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not get statement info&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pobrać informacji o poleceniu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QIODevice&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak dostępu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Too many open files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zbyt wiele otwartych plików&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No such file or directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak pliku lub katalogu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No space left on device&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak wolnego miejsca na urządzeniu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieznany błąd&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QInputContext&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XIM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;XIM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;FEP&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;FEP&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XIM input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Metoda wprowadzania XIM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Windows input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Metoda wprowadzania Windows&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mac OS X input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Metoda wprowadzania Mac OS X&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;S60 FEP input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Metoda wprowadzania S60 FEP&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QInputDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enter a value:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podaj wartość:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLibrary&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not mmap &amp;apos;%1&amp;apos;: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wykonać przypisania &amp;apos;%1&amp;apos;: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Plugin verification data mismatch in &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd podczas weryfikacji danych we wtyczce &amp;apos;%1&amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not unmap &amp;apos;%1&amp;apos;: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można usunąć przypisania &amp;apos;%1&amp;apos;: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin &amp;apos;%1&amp;apos; uses incompatible Qt library. (%2.%3.%4) [%5]&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wtyczka &amp;apos;%1&amp;apos; używa niepoprawnej wersji biblioteki QT. (%2.%3.%4) [%5]&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin &amp;apos;%1&amp;apos; uses incompatible Qt library. Expected build key &amp;quot;%2&amp;quot;, got &amp;quot;%3&amp;quot;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wtyczka &amp;apos;%1&amp;apos; używa niepoprawnej wersji biblioteki QT. Oczekiwano klucza &amp;quot;%2&amp;quot;, uzyskano &amp;quot;%3&amp;quot;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieznany błąd&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The shared library was not found.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Biblioteka współdzielona niedostępna.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The file &amp;apos;%1&amp;apos; is not a valid Qt plugin.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Plik &amp;quot;%1&amp;quot; nie jest poprawną wtyczką Qt.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin &amp;apos;%1&amp;apos; uses incompatible Qt library. (Cannot mix debug and release libraries.)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wtyczka &amp;quot;%1&amp;quot; używa innej wersji biblioteki Qt. (Nie można łączyć bibliotek zwykłych i debugowych.)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot load library %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można załadować biblioteki %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot unload library %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można zwolnić biblioteki %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot resolve symbol &amp;quot;%1&amp;quot; in %2: %3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można zidentyfikować symbolu &amp;quot;%1&amp;quot; w %2: %3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLineEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz wszystko&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Cofnij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Przywróć&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cu&amp;amp;t&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;W&amp;amp;ytnij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;S&amp;amp;kopiuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Wklej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Skasuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLocalServer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Name error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Błąd nazwy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Brak dostępu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Address in use&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Adres użyty&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Nieznany błąd %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLocalSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Odmowa połączenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Remote closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Drugi koniec odłączony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Invalid name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Niepoprawna nazwa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Socket access error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Błąd dostępu do gniazda&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Socket resource error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Błąd zasobów gniazda&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Socket operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Przekroczony czas operacji gniazda&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Datagram too large&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Za duży datagram&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Connection error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Błąd połączenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: The socket operation is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Operacja nie jest obsługiwana przez gniazdo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Nieznany błąd&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Nieznany błąd %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMYSQLDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to open database &amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można otworzyć bazy danych &amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można nawiązać połączenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można rozpocząć transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można potwierdzić transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wycofać transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMYSQLResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch data&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pobrać danych&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wykonać zapytania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to store result&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można zachować wyników&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można przygotować polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to reset statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można skasować polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można powiązać wartości&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wykonać polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind outvalues&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można powiązać wartości zewnętrznych&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to store statement results&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można zachować wyników polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute next query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wykonać następnego zapytania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to store next result&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można zachować następnego wyniku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMdiArea&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;(Untitled)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;(Nienazwany)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMdiSubWindow&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 - [%2]&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 - [%2]&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zamknij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Minimize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zminimalizuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przywróć pod spód&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Restore&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Przywróć&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Move&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Prze&amp;amp;nieś&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Rozmiar&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mi&amp;amp;nimize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zmi&amp;amp;nimalizuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ma&amp;amp;ximize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zma&amp;amp;ksymalizuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stay on &amp;amp;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pozostaw na &amp;amp;wierzchu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Zamknij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Maximize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zmaksymalizuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unshade&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Rozwiń&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shade&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zwiń&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przywróć&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pomoc&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Menu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;- [%1]&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;- [%1]&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMenu&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zamknij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Otwórz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Execute&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wykonaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMenuBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Actions&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Akcje&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMessageBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;h3&amp;gt;About Qt&amp;lt;/h3&amp;gt;&amp;lt;p&amp;gt;This program uses Qt version %1.&amp;lt;/p&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;h3&amp;gt;Informacje o Qt&amp;lt;/h3&amp;gt;&amp;lt;p&amp;gt; Ten program używa Qt w wersji %1.&amp;lt;/p&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;p&amp;gt;Qt is a C++ toolkit for cross-platform application development.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt provides single-source portability across MS&amp;amp;nbsp;Windows, Mac&amp;amp;nbsp;OS&amp;amp;nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Please see &amp;lt;a href=&amp;quot;http://qt.nokia.com/products/licensing&amp;quot;&amp;gt;qt.nokia.com/products/licensing&amp;lt;/a&amp;gt; for an overview of Qt licensing.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt is a Nokia product. See &amp;lt;a href=&amp;quot;http://qt.nokia.com/&amp;quot;&amp;gt;qt.nokia.com&amp;lt;/a&amp;gt; for more information.&amp;lt;/p&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;p&amp;gt;Qt jest zestawem narzędzi programistycznych dedykowanym dla języka C++. Służy on do opracowywania aplikacji międzyplatformowych.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt umożliwia jednoźródłowe przenoszenie między systemami MS&amp;amp;nbsp;Windows, Mac&amp;amp;nbsp;OS&amp;amp;nbsp;X, Linux i wszystkimi głównymi wersjami komercyjnymi systemu Unix. Środowisko Qt jest dostępne dla urządzeń wbudowanych opartych na systemie Linux ( Qt dla wbudowanego systemu Linux) oraz Windows CE.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Zestaw Qt jest dostępny w trzech różnych opcjach licencjonowania stworzonych w celu zadowolenia naszych różnych użytkowników.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt podlegający licencji zgodnie z naszą komercyjną umową licencyjną jest odpowiedni do opracowywania oprogramowań własnościowych/komercyjnych, dzięki czemu kod źródłowy nie jest udostępniany osobom trzecim. W przeciwnym razie zestaw Qt jest niezgodny z warunkami licencji GNU LGPL w wersji 2.1 lub GNU GPL w wersji 3.0.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Środowisko Qt objęte licencją GNU LGPL w wersji 2.1 nadaje się do tworzenia aplikacji Qt (własnościowych lub oprogramowań otwartych) tylko wtedy, gdy przestrzegane są warunki licencji GNU LGPL w wersji 2.1.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt objęty Powszechną Licencją Publiczną GNU w wersji 3.0 jest odpowiedni do opracowywania aplikacji QT, aby móc korzystać z aplikacji w połączeniu z oprogramowaniem podlegającym warunkom licencji GNU GPL w wersji 3.0 lub aby przestrzegać warunków licencji GNU GPL w wersji 3.0.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Więcej informacji na temat licencji Qt można znaleźć na stronie &amp;lt;a href=&amp;quot;http://qt.nokia.com/products/licensing&amp;quot;&amp;gt;qt.nokia.com/products/licensing&amp;lt;/a&amp;gt;.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Copyright (C) 2011 Nokia Corporation i/lub oddziały firmy.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt jest produktem firmy Nokia. Dodatkowe informacje znajdują się na stronie &amp;lt;a href=&amp;quot;http://qt.nokia.com/&amp;quot;&amp;gt;qt.nokia.com&amp;lt;/a&amp;gt; &amp;lt;/p&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;About Qt&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Informacje o Qt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pomoc&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show Details...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pokaż szczegóły...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hide Details...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ukryj szczegóły...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMultiInputContext&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select IM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wybierz metodę wprowadzania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMultiInputContextPlugin&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multiple input method switcher&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przełącznik metody wprowadzania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multiple input method switcher that uses the context menu of the text widgets&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przełącznik metody wprowadzania, który w widżetach tekstowych używa podręcznego menu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNativeSocketEngine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The remote host closed the connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zdalny host zakończył połączenie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przekroczony czas operacji sieciowej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Out of resources&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zasoby wyczerpane&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsupported socket operation&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieobsługiwana operacja gniazda&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Protocol type not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieobsługiwany typ protokołu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid socket descriptor&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawny opis gniazda&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network unreachable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sieć niedostępna&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak dostępu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przekroczony czas połączenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Połączenie odrzucone&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The bound address is already in use&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Adres jest aktualnie w użyciu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The address is not available&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Adres nie jest dostępny&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The address is protected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Adres jest zabezpieczony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to send a message&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wysłać wiadomości&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to receive a message&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można odebrać wiadomości&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to write&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można zapisać&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd sieci&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Another socket is already listening on the same port&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Inne gniazdo nasłuchuje już na tym porcie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to initialize non-blocking socket&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można uruchomić gniazda w nieblokującym trybie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to initialize broadcast socket&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można uruchomić gniazda rozsyłającego&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attempt to use IPv6 socket on a platform with no IPv6 support&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Próba użycia IPv6 na platformie bez obsługi IPv6&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host unreachable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Komputer niedostępny&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Datagram was too large to send&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Datagram za długi do wysłania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation on non-socket&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieprawidłowa operacja na gnieździe&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieznany błąd&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The proxy type is invalid for this operation&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ pośrednika nie jest poprawny dla tej operacji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessCacheBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd otwierania %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessDebugPipeBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write error writing to %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd w trakcie zapisywania do %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessFileBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request for opening non-local file %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Żądanie otwarcia zdalnego pliku %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd otwierania %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write error writing to %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd w trakcie zapisywania do %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open %1: Path is a directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można otworzyć %1: Ścieżka jest katalogiem&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read error reading from %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd w trakcie czytania z %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessFtpBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No suitable proxy found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie odnaleziono odpowiedniego pośrednika&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open %1: is a directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można otworzyć %1: jest to katalog&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Logging in to %1 failed: authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd podczas logowania do %1: wymagana autoryzacja&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error while downloading %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd podczas pobierania %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error while uploading %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd podczas wysyłania %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessHttpBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No suitable proxy found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie odnaleziono odpowiedniego pośrednika&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkReply&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error downloading %1 - server replied: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd podczas pobierania %1 - odpowiedź serwera: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Protocol &amp;quot;%1&amp;quot; is unknown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Protokół &amp;quot;%1&amp;quot; nie jest znany&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkReplyImpl&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation canceled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Operacja anulowana&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QOCIDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to logon&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można się zalogować&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to initialize&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QOCIDriver&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Nie można dokonać inicjalizacji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można rozpocząć transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można dokonać transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wycofać transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QOCIResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind column for batch execute&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można powiązać kolumny dla wykonania zestawu poleceń&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute batch statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wykonać polecenia wsadowego&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to goto next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można przejść do kolejnego wiersza danych&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to alloc statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można przydzielić miejsca na polecenie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można przygotować polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to get statement type&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pobrać typu polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można powiązać wartości&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wykonać polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QODBCDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można nawiązać połączenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to disable autocommit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wyłączyć trybu automatycznego dokonywania transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można potwierdzić transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wycofać transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to enable autocommit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można włączyć trybu automatycznego dokonywania transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect - Driver doesn&amp;apos;t support all functionality required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można nawiązać połączenia - sterownik nie obsługuje całej potrzebnej funkcjonalności&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QODBCResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QODBCResult::reset: Unable to set &amp;apos;SQL_CURSOR_STATIC&amp;apos; as statement attribute. Please check your ODBC driver configuration&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;QODBCResult::reset: Nie można ustawić &amp;apos;SQL_CURSOR_STATIC&amp;apos; jako atrybutu polecenia. Proszę sprawdzić konfiguracje sterownika ODBC&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wykonać polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pobrać kolejnych danych&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można przygotować polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind variable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można powiązać zmiennej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch last&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pobrać ostatnich danych&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pobrać&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch first&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pobrać pierwszych danych&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pobrać poprzednich danych&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QObject&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid hostname&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawna nazwa hosta&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation not supported on %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Operacja nieobsługiwana na %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid URI: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawny URI: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Socket error on %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd gniazda na %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remote host closed the connection prematurely on %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zdalny host przedwcześnie zakończył połączenie na %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No host name given&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie podano nazwy hosta&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPPDOptionsModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nazwa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPSQLDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można nawiązać połączenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można rozpocząć transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można potwierdzić transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wycofać transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to subscribe&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wykonać subskrypcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to unsubscribe&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można zrezygnować z subskrypcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPSQLResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to create query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można utworzyć zapytania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można przygotować polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPageSetupWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Centimeters (cm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Centymetry (cm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Millimeters (mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Milimetry (mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Inches (in)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cale (in)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Points (pt)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Punkty (pt)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Formularz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paper&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Papier&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page size:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Rozmiar strony:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Width:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Szerokość:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Height:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wysokość:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paper source:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Źródło papieru:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Orientation&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Położenie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Portrait&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Portret&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Landscape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pejzaż&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverse landscape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odwrócony pejzaż&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverse portrait&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odwrócony portret&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Margins&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Marginesy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;top margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Górny margines&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;left margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lewy margines&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;right margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Prawy margines&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bottom margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dolny margines&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPluginLoader&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieznany błąd&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin was not loaded.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wtyczka nie została załadowana.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;locally connected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;podłączony lokalnie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Aliases: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aliasy: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unknown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;nieznany&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print all&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Drukuj wszystko&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print range&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Drukuj zakres&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A0 (841 x 1189 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A0 (841 x 1189 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A1 (594 x 841 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A1 (594 x 841 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A2 (420 x 594 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A2 (420 x 594 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A3 (297 x 420 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A3 (297 x 420 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A5 (148 x 210 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A5 (148 x 210 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A6 (105 x 148 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A6 (105 x 148 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A7 (74 x 105 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A7 (74 x 105 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A8 (52 x 74 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A8 (52 x 74 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A9 (37 x 52 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A9 (37 x 52 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B0 (1000 x 1414 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B0 (1000 x 1414 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B1 (707 x 1000 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B1 (707 x 1000 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B2 (500 x 707 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B2 (500 x 707 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B3 (353 x 500 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B3 (353 x 500 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B4 (250 x 353 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B4 (250 x 353 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B6 (125 x 176 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B6 (125 x 176 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B7 (88 x 125 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B7 (88 x 125 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B8 (62 x 88 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B8 (62 x 88 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B9 (44 x 62 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B9 (44 x 62 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B10 (31 x 44 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B10 (31 x 44 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;C5E (163 x 229 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;C5E (163 x 229 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DLE (110 x 220 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;DLE (110 x 220 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Folio (210 x 330 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Folio (210 x 330 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ledger (432 x 279 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ledger (432 x 279 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tabloid (279 x 432 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tabloid (279 x 432 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;US Common #10 Envelope (105 x 241 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;US Common #10 Envelope (105 x 241 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A4 (210 x 297 mm, 8.26 x 11.7 inches)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A4 (210 x 297 mm, 8.26 x 11.7 cali)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B5 (176 x 250 mm, 6.93 x 9.84 inches)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B5 (176 x 250 mm, 6.93 x 9.84 cali)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Executive (7.5 x 10 inches, 191 x 254 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Executive (7.5 x 10 cali, 191 x 254 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Legal (8.5 x 14 inches, 216 x 356 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Legal (8.5 x 14 cali, 216 x 356 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Letter (8.5 x 11 inches, 216 x 279 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Letter (8.5 x 11 cali, 216 x 279 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print selection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Drukuj zaznaczone&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Drukowanie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print To File ...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Drukuj do pliku ...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File %1 is not writable.</div><div class='add'>+Please choose a different file name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Plik %1 jest plikiem tylko do odczytu.</div><div class='add'>+Proszę wybrać inną nazwę pliku.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 already exists.</div><div class='add'>+Do you want to overwrite it?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 już istnieje.</div><div class='add'>+Czy chcesz nadpisać?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Plik istnieje&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;qt&amp;gt;Do you want to overwrite it?&amp;lt;/qt&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;qt&amp;gt;Czy chcesz nadpisać?&amp;lt;/qt&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is a directory.</div><div class='add'>+Please choose a different file name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 jest katalogiem.</div><div class='add'>+Proszę wybrać inną nazwę pliku.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The &amp;apos;From&amp;apos; value cannot be greater than the &amp;apos;To&amp;apos; value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość &amp;quot;od&amp;quot; nie może być większa od wartości &amp;quot;do&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A0&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A6&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A6&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A7&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A7&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A8&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A8&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A9&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A9&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B0&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B6&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B6&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B7&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B7&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B8&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B8&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B9&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B9&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B10&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B10&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;C5E&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;C5E&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DLE&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;DLE&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Executive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Executive&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Folio&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Folio&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ledger&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ledger&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Legal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Legal&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Letter&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Letter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tabloid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tabloid&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;US Common #10 Envelope&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;US Common #10 Envelope&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Custom&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niestandardowy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Options &amp;gt;&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Opcje &amp;gt;&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Options &amp;lt;&amp;lt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Opcje &amp;lt;&amp;lt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print to File (PDF)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Drukuj do pliku (PDF)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print to File (Postscript)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Drukuj do pliku (Postscript)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Local file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Plik lokalny&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write %1 file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zapisz %1 plik&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wy&amp;amp;drukuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintPreviewDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1%&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1%&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print Preview&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podgląd wydruku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Next page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Następna strona&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Previous page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Poprzednia strona&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;First page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pierwsza strona&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Last page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ostatnia strona&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fit width&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dopasuj szerokość&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fit page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dopasuj stronę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom in&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Powiększ&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pomniejsz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Portrait&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Portret&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Landscape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pejzaż&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show single page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pokaż pojedynczą stronę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show facing pages&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pokaż sąsiednie strony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show overview of all pages&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pokaż wszystkie strony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wydrukuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page setup&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ustawienia strony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Export to PDF&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyeksportuj do PDF&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Export to PostScript&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyeksportuj do PostScript&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page Setup&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ustawienia strony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintPropertiesWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Forma&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strona&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Advanced&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaawansowane&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintSettingsOutput&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Forma&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copies&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Liczba kopii&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print range&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zakres wydruku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print all&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Drukuj wszystko&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pages from&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strony od&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;to&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;do&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Selection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wybrane strony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Output Settings&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ustawienia wyjściowe&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copies:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kopie:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Collate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Parami&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverse&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odwróć&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Options&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Opcje&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Color Mode&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tryb koloru&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Color&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kolor&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Grayscale&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Skala szarości&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duplex Printing&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Drukowanie dupleksowe&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;None&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Long side&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Długa strona&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Short side&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Krótka strona&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Forma&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Printer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Drukarka&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Name:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Nazwa:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;P&amp;amp;roperties&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Właściwości&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Location:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Położenie:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Preview&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podgląd&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Output &amp;amp;file:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Plik wyjściowy:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QProcess&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open input redirection for reading&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można otworzyć wejściowego przekierowania do odczytu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open output redirection for writing&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można otworzyć wyjściowego przekierowania do zapisu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Resource error (fork failure): %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd zasobów (błąd forkowania): %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Process operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przekroczony czas operacji procesu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error reading from process&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd odczytywania z procesu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error writing to process&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd zapisywania do procesu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Process crashed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wystąpił błąd w procesie - proces zakończony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No program defined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie zdefiniowano programu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Process failed to start: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można rozpocząć procesu: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QProgressDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Anuluj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPushButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Otwórz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QRadioButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QRegExp&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;no error occurred&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;nie pojawił się żaden błąd&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;disabled feature used&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;użyta funkcja została wyłączona&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bad char class syntax&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;niepoprawna składnia klasy znakowej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bad lookahead syntax&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;niepoprawna składnia &amp;quot;lookahead&amp;quot;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bad repetition syntax&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;niepoprawna składnia powtórzenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid octal value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;niepoprawna wartość ósemkowa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;missing left delim&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;brakujący lewy separator&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unexpected end&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;nieoczekiwany koniec&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;met internal limit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;napotkano wewnętrzne ograniczenie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid interval&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawny interwał&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid category&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawna kategoria&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLite2Driver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd otwierania bazy danych&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można rozpocząć transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można dokonać transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wycofać transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLite2Result&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch results&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pobrać wyników&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wykonać polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLiteDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd otwierania bazy danych&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error closing database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd zamykania bazy danych&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można rozpocząć transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można dokonać transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wycofać transakcji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLiteResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch row&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pobrać wiersza danych&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wykonać polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to reset statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można skasować polecenia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind parameters&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można powiązać parametrów&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Parameter count mismatch&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niezgodna liczba parametrów&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak zapytania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptBreakpointsModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ID&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Identyfikator&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Położenie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Condition&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Warunek&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore-count&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Licznik pominięć&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Single-shot&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;##&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hit-count&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Licznik trafień&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptBreakpointsWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nowy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Skasuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebugger&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go to Line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przejdź do linii&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Linia:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Interrupt&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przerwij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift+F5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift+F5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Continue&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kontynuuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step Into&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wskocz do wnętrza&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F11&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F11&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step Over&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przeskocz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F10&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F10&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step Out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyskocz na zewnątrz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift+F11&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift+F11&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Run to Cursor&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom do kursora&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl+F10&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl+F10&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Run to New Script&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom do nowego skryptu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Toggle Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przełącz ustawienie pułapki&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F9&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F9&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Debug Output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyczyść wyjście debuggera&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Error Log&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyczyść log z błędami&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Console&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyczyść konsolę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Find in Script...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Znajdź w skrypcie...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl+F&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl+F&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find &amp;amp;Next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Znajdź &amp;amp;następne&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find &amp;amp;Previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Znajdź &amp;amp;poprzednie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift+F3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift+F3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl+G&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl+G&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Debug&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Debuguj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebuggerCodeFinderWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zamknij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Poprzednie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Następne&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Case Sensitive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uwzględniaj wielkość liter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Whole words&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Całe słowa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;img src=&amp;quot;:/qt/scripttools/debugging/images/wrap.png&amp;quot;&amp;gt;&amp;amp;nbsp;Search wrapped&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;img src=&amp;quot;:/qt/scripttools/debugging/images/wrap.png&amp;quot;&amp;gt;&amp;amp;nbsp;Przeszukano od początku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebuggerLocalsModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nazwa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebuggerStackModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Level&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Poziom&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nazwa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Położenie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Toggle Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przełącz ustawienie pułapki&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Disable Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyłącz pułapkę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enable Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Włącz pułapkę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Breakpoint Condition:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Warunek dla pułapki:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptEngineDebugger&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Loaded Scripts&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Załadowane skrypty&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Breakpoints&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pułapki&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stack&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Stos&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Locals&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zmienne lokalne&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Console&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Konsola&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Debug Output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyjście debuggera&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error Log&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Log z błędami&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Search&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Szukaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Widok&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Qt Script Debugger&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Debugger Qt Script&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptNewBreakpointWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zamknij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScrollBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll here&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przewiń tutaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lewa krawędź&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Do góry&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Prawa krawędź&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bottom&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;W dół&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strona w lewo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strona do góry&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strona w prawo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strona w dół&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przewiń w lewo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przewiń do góry&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przewiń w prawo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przewiń w dół&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Linia w górę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Position&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pozycja&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Linia w dół&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSharedMemory&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: create size is less then 0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: rozmiar przy tworzeniu mniejszy od 0&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: nie można zablokować&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to unlock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: nie można odblokować&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: brak dostępu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: already exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: już istnieje&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: doesn&amp;apos;t exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: nie istnieje&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: out of resources&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: zasoby wyczerpane&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: nieznany błąd %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: key is empty&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: klucz jest pusty&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: ftok failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: wystąpił błąd w funkcji ftok()&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to make key&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: nie można utworzyć klucza&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: doesn&amp;apos;t exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: nie istnieje&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: UNIX key file doesn&amp;apos;t exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: unixowy plik z kluczem nie istnieje&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: system-imposed size restrictions&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: ograniczenia rozmiarów narzucone przez system&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: not attached&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: niedołączony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: invalid size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: niepoprawny rozmiar&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: key error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: błąd klucza&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: size query failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: zapytanie o rozmiar nie powiodło się&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to set key on lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: nie można ustawić klucza na zablokowanym segmencie pamięci współdzielonej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QShortcut&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Space&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Spacja&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Esc&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Esc&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tabulator&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Backtab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Backtab&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Backspace&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Backspace&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Return&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Powrót&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enter&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Enter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ins&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ins&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Del&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Del&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pauza&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wydrukuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SysReq&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;SysReq&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Home&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Home&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;End&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;End&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lewo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Góra&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Prawo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dół&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PgUp&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;PgUp&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PgDown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;PgDown&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;CapsLock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;CapsLock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;NumLock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;NumLock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ScrollLock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ScrollLock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Menu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pomoc&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Back&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Do przodu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stop&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zatrzymaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Refresh&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odśwież&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przycisz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume Mute&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wycisz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zrób głośniej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bass Boost&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wzmocnienie basów&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bass Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Basy w górę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bass Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Basy w dół&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Treble Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Soprany w górę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Treble Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Soprany w dół&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Play&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odtwarzaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Stop&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zatrzymaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Poprzednia ścieżka&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Następna ścieżka&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Record&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nagrywaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Favorites&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ulubione&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Search&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Szukaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Standby&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tryb oczekiwania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Otwórz adres&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch Mail&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom program pocztowy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch Media&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom przeglądarkę mediów&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (0)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom (0)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom (1)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (2)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom (2)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (3)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom (3)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (4)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom (4)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (5)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom (5)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (6)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom (6)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (7)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom (7)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (8)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom (8)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (9)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom (9)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (A)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom (A)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (B)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom (B)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (C)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom (C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (D)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom (D)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (E)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom (E)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (F)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uruchom (F)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Monitor Brightness Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zwiększ jasność monitora&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Monitor Brightness Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zmniejsz jasność monitora&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Light On/Off&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Włącz/wyłącz podświetlenie klawiatury&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Brightness Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zwiększ jasność klawiatury&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Brightness Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zmniejsz jasność klawiatury&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Power Off&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyłączenie zasilania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wake Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;##&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Eject&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wysuń&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Screensaver&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wygaszacz ekranu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;WWW&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;WWW&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sleep&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;##&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LightBulb&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Żarówka&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shop&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Sklep&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;History&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Historia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Add Favorite&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dodaj do ulubionych&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hot Links&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Popularne łącza&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Adjust Brightness&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ustaw jasność&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Finance&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Finanse&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Community&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Społeczność&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Rewind&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przewijanie do tyłu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;##&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Application Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;##&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Application Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;##&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Book&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Książka&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;CD&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;CD&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Calculator&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kalkulator&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyczyść&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Grab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;##&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zamknij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Skopiuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cut&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wytnij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Display&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyświetlacz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DOS&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;DOS&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Documents&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dokumenty&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Spreadsheet&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Arkusz kalkulacyjny&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Browser&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przeglądarka&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Game&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Gra&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przejdź&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;iTouch&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;iTouch&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Logoff&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyloguj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Market&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Rynek&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Meeting&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Spotkanie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Menu klawiatury&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Menu PB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Menu PG&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;My Sites&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Moje strony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;News&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wiadomości&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Home Office&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;##&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Option&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Opcje&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wklej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Phone&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Telefon&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reply&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odpowiedz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reload&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przeładuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rotate Windows&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Obróć okna&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rotation PB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Obrót PB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rotation KB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Obrót KB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zachowaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Send&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyślij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Spellchecker&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Funkcja sprawdzania pisowni&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Split Screen&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podziel ekran&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Support&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pomoc techniczna&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Task Panel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Panel zadań&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Terminal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Terminal&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tools&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Narzędzia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Travel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podróże&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wideo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Word Processor&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Edytor tekstów&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XFer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;XFer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom In&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Powiększ&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom Out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pomniejsz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Away&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;##&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Messenger&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Messenger&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;WebCam&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;WebCam&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mail Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przesyłanie wiadomości&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pictures&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zdjęcia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Music&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Muzyka&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Battery&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Bateria&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bluetooth&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Bluetooth&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wireless&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Bezprzewodowy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ultra Wide Band&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ultraszerokie pasmo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przewijanie do przodu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Repeat&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Powtarzanie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Random Play&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odtwarzanie losowe&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Subtitle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Napisy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Cycle Track&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;##&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Time&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Czas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Widok&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Menu główne&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Suspend&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wstrzymaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hibernate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Hibernuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print Screen&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wydrukuj zawartość ekranu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strona w dół&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strona do góry&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Caps Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Caps Lock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Num Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Num Lock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Number Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Number Lock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Scroll Lock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Insert&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Delete&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Escape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Escape&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;System Request&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Żądanie systemu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wybierz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tak&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kontekst1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kontekst2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kontekst3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kontekst4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Call&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wywołaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hangup&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawieś&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Flip&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odwróć&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Alt&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Alt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Meta&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Meta&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;+&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;+&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Home Page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strona startowa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSlider&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strona w lewo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strona do góry&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Position&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Położenie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strona w prawo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strona w dół&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSocks5SocketEngine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to proxy refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odmowa połączenia z pośrednikiem&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to proxy closed prematurely&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przedwczesne zakończenie połączenia z pośrednikiem&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy host not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie odnaleziono hosta pośredniczącego&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to proxy timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przekroczony czas połączenia do pośrednika&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy authentication failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Autoryzacja pośrednika zakończona błędem&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy authentication failed: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Autoryzacja pośrednika zakończona błędem: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SOCKS version 5 protocol error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd protokołu SOCKS wersji 5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;General SOCKSv5 server failure&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Generalny błąd serwera SOCKS wersji 5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection not allowed by SOCKSv5 server&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Połączenie niedozwolone przez serwer SOCKS wersji 5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;TTL expired&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;TTL stracił ważność&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SOCKSv5 command not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieobsługiwana komenda SOCKS wersji 5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Address type not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieobsługiwany typ adresu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown SOCKSv5 proxy error code 0x%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieznany kod błędu (0x%1) pośrednika SOCKS wersji 5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przekroczony czas operacji sieciowej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSoftKeyManager&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ok&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;OK&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wybierz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Done&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zrobione&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Options&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Opcje&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Anuluj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Exit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyjście&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSpinBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Więcej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Less&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Mniej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSql&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Skasuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete this record?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Skasować ten rekord?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tak&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wstaw&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Update&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Uaktualnij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save edits?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zachować zmiany?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Anuluj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Confirm&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Potwierdź&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel your edits?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Anulować zmiany?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSslSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to write data: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to decrypt data: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można odszyfrować danych: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error while reading: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd podczas czytania: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error during SSL handshake: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd podczas nawiązania sesji SSL: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error creating SSL context (%1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd tworzenia kontekstu (%1)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid or empty cipher list (%1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawna lub pusta lista szyfrów (%1)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Private key does not certify public key, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Prywatny klucz nie uwiarygodnia publicznego, %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error creating SSL session, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd tworzenia sesji SSL, %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error creating SSL session: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd tworzenia sesji SSL: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot provide a certificate with no key, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można dostarczyć certyfikatu bez klucza, %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error loading local certificate, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd ładowania lokalnego certyfikatu, %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error loading private key, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd ładowania prywatnego klucza, %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak błędu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The issuer certificate could not be found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można odnaleźć wydawcy certyfikatu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate signature could not be decrypted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można odszyfrować podpisu certyfikatu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The public key in the certificate could not be read&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można odczytać publicznego klucza w certyfikacie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The signature of the certificate is invalid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawny podpis certyfikatu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate is not yet valid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Certyfikat nie jest jeszcze ważny&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate has expired&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Certyfikat utracił ważność&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate&amp;apos;s notBefore field contains an invalid time&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pole &amp;quot;notBefore&amp;quot; certyfikatu zawiera niepoprawną datę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate&amp;apos;s notAfter field contains an invalid time&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pole &amp;quot;notAfter&amp;quot; certyfikatu zawiera niepoprawną datę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate is self-signed, and untrusted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Certyfikat z podpisem własnym, niezaufany&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root certificate of the certificate chain is self-signed, and untrusted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Główny certyfikat łańcucha certyfikatów ma własny podpis i jest niezaufany&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The issuer certificate of a locally looked up certificate could not be found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można znaleźć certyfikatu wydawcy wyszukanego lokalnie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No certificates could be verified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można zweryfikować certyfikatów&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;One of the CA certificates is invalid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Jeden z certyfikatów urzędu certyfikacji jest nieprawidłowy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The basicConstraints path length parameter has been exceeded&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Długość ścieżki określona w podstawowych warunkach ograniczających została przekroczona&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The supplied certificate is unsuitable for this purpose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dostarczony certyfikat jest nieodpowiedni do tego celu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root CA certificate is not trusted for this purpose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Główny certyfikat urzędu certyfikacji nie jest zaufany do tego celu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root CA certificate is marked to reject the specified purpose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Główny certyfikat urzędu certyfikacji jest wyznaczony do odrzucania określonego celu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Certyfikat wydawcy obecnego kandydata został odrzucony, ponieważ nazwa podmiotu nie odpowiadała nazwie wydawcy obecnego certyfikatu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Certyfikat wydawcy obecnego kandydata został odrzucony, ponieważ nazwa wydawcy i przedstawiony numer seryjny nie odpowiadały identyfikatorowi klucza urzędu certyfikacji obecnego certyfikatu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The peer did not present any certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element równorzędny nie przedstawił żadnego certyfikatu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The host name did not match any of the valid hosts for this certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nazwa hosta nie odpowiadała żadnemu z prawidłowych hostów tego certyfikatu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QStateMachine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Missing initial state in compound state &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Missing default state in history state &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No common ancestor for targets and source of transition from state &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSystemSemaphore&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: does not exist&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: out of resources&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: already exists&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTDSDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to open connection&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to use database&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTabBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll Left&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll Right&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTcpServer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation on socket is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTextControl&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cu&amp;amp;t&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy &amp;amp;Link Location&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QToolButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Press&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUdpSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;This platform does not support IPv6&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ta platforma nie obsługuje IPv6&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUndoGroup&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cofnij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przywróć&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUndoModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;empty&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;pusty&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUndoStack&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cofnij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przywróć&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUnicodeControlCharacterMenu&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LRM Left-to-right mark&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;LRM znacznik od prawej do lewej &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;RLM Right-to-left mark&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;RLM Znacznik od prawej do lewej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ZWJ Zero width joiner&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ZWJ �ącznik zerowej długości&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ZWNJ Zero width non-joiner&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ZWNJ Rozdzielnik zerowej długości&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ZWSP Zero width space&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ZWSP Przerwa zerowej długości&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LRE Start of left-to-right embedding&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;LRE Początek osadzania od lewej do prawej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;RLE Start of right-to-left embedding&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;RLE Początek osadzania od prawej do lewej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LRO Start of left-to-right override&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;LRO Początek nadpisania od lewej do prawej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;RLO Start of right-to-left override&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;RLO Początek nadpisania od prawej do lewej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PDF Pop directional formatting&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;PDF Formatowanie kierunkowe pop&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert Unicode control character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wstaw znak kontroli Unicode&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWebFrame&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request cancelled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Prośba anulowana&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request blocked&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Prośba zablokowana&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot show URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pokazać URL&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Frame load interrupted by policy change&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�adowanie ramki przerwane przez zmianę strategii&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot show mimetype&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można pokazać typu MIME&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File does not exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Plik nie istnieje&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWebPage&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Submit&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;default label for Submit buttons in forms on web pages&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Wyślij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Submit&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Submit (input element) alt text for &amp;lt;input&amp;gt; elements with no alt, title, or value&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Wyślij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reset&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;default label for Reset buttons in forms on web pages&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Wyczyść&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Choose File&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;title for file button used in HTML forms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Wybierz plik&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No file selected&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;text to display in file button used in HTML forms when no file is selected&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Nie zaznaczono pliku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open in New Window&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open in New Window context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Otwórz w nowym oknie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save Link...&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Download Linked File context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Zachowaj odsyłacz...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy Link&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Copy Link context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Skopiuj odsyłacz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open Image&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open Image in New Window context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Otwórz obrazek&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save Image&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Download Image context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Zachowaj obrazek&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy Image&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Copy Link context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Skopiuj obrazek&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open Frame&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open Frame in New Window context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Otwórz ramkę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Copy context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Skopiuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go Back&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Back context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Wróć&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go Forward&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Forward context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Idź dalej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stop&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Stop context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Zatrzymaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reload&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Reload context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Przeładuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cut&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Cut context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Wytnij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paste&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Paste context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Wklej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No Guesses Found&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;No Guesses Found context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Nie odnaleziono podpowiedzi&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Ignore Spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Zignoruj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Add To Dictionary&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Learn Spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Dodaj do słownika&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Search The Web&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Search The Web context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Wyszukaj w sieci&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Look Up In Dictionary&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Look Up in Dictionary context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Poszukaj w słowniku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open Link&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open Link context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Otwórz odsyłacz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Ignore Grammar context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Zignoruj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Spelling&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Spelling and Grammar context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Pisownia&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show Spelling and Grammar&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;menu item title&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Pokaż pisownię i gramatykę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hide Spelling and Grammar&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;menu item title&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Schowaj pisownię i gramatykę&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check Spelling&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Check spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Sprawdź pisownię&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check Spelling While Typing&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Check spelling while typing context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Sprawdzaj pisownię podczas pisania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check Grammar With Spelling&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Check grammar with spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Sprawdzaj gramatykę wraz z pisownią&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fonts&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Font context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Czcionki&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bold&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Bold context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Pogrubiony&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Italic&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Italic context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Kursywa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Underline&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Underline context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Podkreślenie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Outline&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Outline context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Kontur&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Direction&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Writing direction context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Kierunek&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Text Direction&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Text direction context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Kierunek tekstu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Default&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Default writing direction context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Domyślny&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left to Right&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Left to Right context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Z lewej na prawą&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right to Left&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Right to Left context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Z prawej na lewą&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Loading...&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller status message when the media is loading&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�adowanie...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Live Broadcast&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller status message when watching a live broadcast&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Transmisja na żywo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Element&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Element dźwiękowy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video Element&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Element wideo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mute Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Przycisk wyłączania głosu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unmute Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Przycisk włączania głosu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Play Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Przycisk odtwarzania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Przycisk pauzy&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Slider&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Suwak&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Slider Thumb&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Uchwyt suwaka&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rewind Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Przycisk przewijania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Return to Real-time Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Przycisk powrotu do czasu rzeczywistego&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Elapsed Time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Czas który upłynął&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remaining Time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Czas który pozostał&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Status Display&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Wyświetlacz stanu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fullscreen Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Przycisk trybu pełnoekranowego&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek Forward Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Przycisk przeszukiwania do przodu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek Back Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Przycisk przeszukiwania do tyłu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio element playback controls and status display&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Kontrolki odtwarzania dźwięku i wyświetlacz stanu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video element playback controls and status display&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Kontrolki odtwarzania wideo i wyświetlacz stanu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mute audio tracks&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Wyłącz ścieżkę dźwiękową&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unmute audio tracks&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Włącz ścieżkę dźwiękową&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Begin playback&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Rozpocznij odtwarzanie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause playback&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Wstrzymaj odtwarzanie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Movie time scrubber&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Suwak czasu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Movie time scrubber thumb&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Uchwyt suwaka czasu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rewind movie&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Przewiń film&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Return streaming movie to real-time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Przywróć przesyłanie filmu do czasu rzeczywistego&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Current movie time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Czas bieżącego filmu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remaining movie time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Czas do końca filmu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Current movie status&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Stan bieżącego filmu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Play movie in full-screen mode&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Odtwarzaj film w trybie pełnoekranowym&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek quickly back&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Przeszukaj szybko do tyłu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek quickly forward&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Przeszukaj szybko do przodu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Indefinite time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Nieokreślony czas&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 days %2 hours %3 minutes %4 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1 dni %2 godzin %3 minut %4 sekund&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 hours %2 minutes %3 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1 godzin %2 minut %3 sekund&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 minutes %2 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1 minut %2 sekund&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1 sekund&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Inspect&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Inspect Element context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Zwiedzaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No recent searches&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Label for only item in menu that appears when clicking on the search field image, when no searches have been performed&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Brak ostatnich wyszukiwań&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Recent searches&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;label for first item in the menu that appears when clicking on the search field image, used as embedded menu title&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Ostatnie wyszukiwania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear recent searches&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;menu item in Recent Searches menu that empties menu&amp;apos;s contents&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Wyczyść ostatnie wyszukiwania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Unknown filesize FTP directory listing item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Nieznany&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Web Inspector - %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wizytator sieciowy - %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 (%2x%3 pixels)&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Title string for images&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1 (%2x%3 piksli)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bad HTTP request&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawna komenda HTTP&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;This is a searchable index. Enter search keywords: &lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;text that appears at the start of nearly-obsolete web pages in the form of a &amp;apos;searchable index&amp;apos;&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;To jest indeks wyszukiwawczy. Podaj słowa do wyszukania:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll here&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przewiń tutaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Lewa krawędź&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Do góry&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Prawa krawędź&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bottom&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;W dół&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strona w lewo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strona do góry&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strona w prawo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Strona w dół&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przewiń w lewo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przewiń do góry&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przewiń w prawo&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przewiń w dół&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message numerus="yes"&gt;</div><div class='add'>+            &lt;source&gt;%n file(s)&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;number of chosen file&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;</div><div class='add'>+                &lt;numerusform&gt;%n plik&lt;/numerusform&gt;</div><div class='add'>+                &lt;numerusform&gt;%n pliki&lt;/numerusform&gt;</div><div class='add'>+                &lt;numerusform&gt;%n plików&lt;/numerusform&gt;</div><div class='add'>+            &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Alert - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ostrzeżenie JavaScript - %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Confirm - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Potwierdzenie JavaScript - %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Prompt - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zachęta JavaScript - %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Problem - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Problem JavaScript - %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The script on this page appears to have a problem. Do you want to stop the script?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Skrypt na tej stronie nie działa poprawnie. Czy chcesz przerwać ten skrypt?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the next character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przesuń kursor do następnego znaku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the previous character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przesuń kursor do poprzedniego znaku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the next word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przesuń kursor do następnego słowa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the previous word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przesuń kursor do poprzedniego słowa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the next line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przesuń kursor do następnej linii&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the previous line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przesuń kursor do poprzedniej linii&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the start of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przesuń kursor do początku linii&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the end of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przesuń kursor do końca linii&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the start of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przesuń kursor do początku bloku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the end of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przesuń kursor do końca bloku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the start of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przesuń kursor do początku dokumentu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the end of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przesuń kursor do końca dokumentu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select all&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz wszystko&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the next character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz do następnego znaku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the previous character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz do poprzedniego znaku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the next word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz do następnego słowa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the previous word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz do poprzedniego słowa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the next line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz do następnej linii&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the previous line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz do poprzedniej linii&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the start of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz do początku linii&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the end of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz do końca linii&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the start of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz do początku bloku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the end of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz do końca bloku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the start of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz do początku dokumentu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the end of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zaznacz do końca dokumentu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete to the start of the word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Skasuj do początku słowa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete to the end of the word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Skasuj do końca słowa&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert a new paragraph&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wstaw nowy paragraf&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert a new line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wstaw nową linię&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paste and Match Style&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wklej i dopasuj styl&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remove formatting&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Usuń formatowanie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Strikethrough&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przekreślenie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Subscript&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Indeks dolny&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Superscript&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Indeks górny&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert Bulleted List&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wstaw listę wypunktowaną&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert Numbered List&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wstaw listę ponumerowaną&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Indent&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zwiększ wcięcie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Outdent&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zmniejsz wcięcie&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Center&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyśrodkuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Justify&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyjustuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Align Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyrównaj do lewej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Align Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyrównaj do prawej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWhatsThisAction&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;What&amp;apos;s This?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Co to jest?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;*&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;*&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWizard&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Anuluj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pomoc&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt; &amp;amp;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt; &amp;amp;Wstecz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Finish&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Zakończ&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Pomoc&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wróć&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Continue&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kontynuuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Commit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dokonaj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Done&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wykonano&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Dalej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Next &amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Dalej &amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWorkspace&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Restore&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Przywróć&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Move&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Przenieś&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Rozmiar&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mi&amp;amp;nimize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zmi&amp;amp;nimalizuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ma&amp;amp;ximize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zma&amp;amp;ksymalizuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Zamknij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stay on &amp;amp;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pozostaw na &amp;amp;wierzchu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Minimize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zminimalizuj&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przywróć pod spód&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zamknij&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sh&amp;amp;ade&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Zwiń&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 - [%2]&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 - [%2]&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Unshade&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;R&amp;amp;ozwiń&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QXml&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;no error occurred&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;nie pojawił się żaden błąd&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error triggered by consumer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;błąd wywołany przez konsumenta&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unexpected end of file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;nieoczekiwany koniec pliku&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;more than one document type definition&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;więcej niż jedna definicja typu dokumentu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing element&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;wystąpił błąd podczas parsowania elementu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;tag mismatch&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;niepoprawny tag&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing content&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;wystąpił błąd podczas parsowania zawartości&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unexpected character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;nieoczekiwany znak&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid name for processing instruction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;niepoprawna nazwa dla instrukcji przetwarzającej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;version expected while reading the XML declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;oczekiwana wersja podczas czytania deklaracji XML&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;wrong value for standalone declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;błędna wartość dla deklaracji &amp;quot;standalone&amp;quot;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing document type definition&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;wystąpił błąd podczas parsowania typu definicji dokumentu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;letter is expected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;oczekiwana jest litera&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing comment&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;wystąpił błąd podczas parsowania komentarza&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing reference&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;wystąpił błąd podczas parsowania odwołania&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;internal general entity reference not allowed in DTD&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;odwołanie do jednostki ogólnej wewnętrznej nie dozwolone w DTD&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;external parsed general entity reference not allowed in attribute value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;odwołanie do jednostki ogólnej zewnętrznie przetworzonej nie dozwolone dla wartości atrybutu &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;external parsed general entity reference not allowed in DTD&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;odwołanie do jednostki ogólnej zewnętrznie przetworzonej nie dozwolone w DTD&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unparsed entity reference in wrong context&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;odwołanie do jednostki nieprzetworzonej w złym kontekście&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;recursive entities&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;jednostki rekurencyjne&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error in the text declaration of an external entity&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;błąd w deklaracji &amp;quot;text&amp;quot; zewnętrznej jednostki&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;encoding declaration or standalone declaration expected while reading the XML declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;oczekiwano deklaracji &amp;quot;encoding&amp;quot; lub &amp;quot;standalone&amp;quot; podczas odczytywania deklaracji XML&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;standalone declaration expected while reading the XML declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;deklaracja &amp;quot;standalone&amp;quot; oczekiwana podczas czytania deklaracji XML&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QXmlPatternistCLI&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning in %1, at line %2, column %3: %4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ostrzeżenie w %1, wiersz %2, kolumna %3: %4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning in %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ostrzeżenie w %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieznana lokalizacja&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error %1 in %2, at line %3, column %4: %5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd %1 w %2, wiersz %3, kolumna %4: %5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error %1 in %2: %3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd %1 w %2: %3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QXmlStream&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Extra content at end of document.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dodatkowa treść na końcu dokumentu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid entity value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawna wartość jednostki.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid XML character.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawny znak XML.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sequence &amp;apos;]]&amp;gt;&amp;apos; not allowed in content.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ciąg &amp;apos;]]&amp;gt;&amp;apos; niedozwolony w treści.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace prefix &amp;apos;%1&amp;apos; not declared&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przedrostek przestrzeni nazw &amp;apos;%1&amp;apos; nie został zadeklarowany&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute redefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut zdefiniowany wielokrotnie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unexpected character &amp;apos;%1&amp;apos; in public id literal.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieoczekiwany znak &amp;apos;%1&amp;apos; w publicznej stałej znakowej.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid XML version string.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawna wersja XML.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsupported XML version.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieobsługiwana wersja XML.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid encoding name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 jest niepoprawną nazwą kodowania.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Encoding %1 is unsupported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kodowanie %1 jest nieobsługiwane&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Standalone accepts only yes or no.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tylko wartości &amp;quot;tak&amp;quot; lub &amp;quot;nie&amp;quot; są akceptowane przez &amp;quot;standalone&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid attribute in XML declaration.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawny atrybut w deklaracji XML.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Premature end of document.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przedwczesne zakończenie dokumentu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid document.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawny dokument.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Expected &lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Oczekiwano &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;, but got &amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;, ale otrzymano &amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unexpected &amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieoczekiwany &amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Expected character data.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Oczekiwana dana znakowa.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Recursive entity detected.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wykryto jednostkę rekurencyjną.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Start tag expected.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Oczekiwano tagu start.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XML declaration not at start of document.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Deklaracja XML nie jest na początku dokumentu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;NDATA in parameter entity declaration.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;NDATA w deklaracji parametru obiektu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid processing instruction name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 jest niepoprawną nazwą instrukcji przetwarzającej.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid processing instruction name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawna nazwa instrukcji przetwarzającej.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Illegal namespace declaration.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawna deklaracja przestrzeni nazw.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid XML name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawna nazwa XML.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Opening and ending tag mismatch.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niezgodne tagi początku i końca.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reference to unparsed entity &amp;apos;%1&amp;apos;.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odwołanie do nieprzetworzonej jednostki &amp;apos;%1&amp;apos;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Entity &amp;apos;%1&amp;apos; not declared.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Jednostka &amp;apos;%1&amp;apos; nie zadeklarowana.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reference to external entity &amp;apos;%1&amp;apos; in attribute value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odwołanie do zewnętrznej jednostki &amp;apos;%1&amp;apos; jako wartość atrybutu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid character reference.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawny znak odwołania.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Encountered incorrectly encoded content.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Natrafiono na niepoprawnie zakodowaną treść.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The standalone pseudo attribute must appear after the encoding.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pseudo atrybut &amp;quot;standalone&amp;quot; musi pojawić się po &amp;quot;encoding&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid PUBLIC identifier.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 jest niepoprawnym publicznym identyfikatorem.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QtXmlPatterns&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one component must be present.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przynajmniej jeden komponent musi być obecny.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid value of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 nie jest poprawną wartością dla typu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When casting to %1 from %2, the source value cannot be %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;W rzutowaniu %1 na %2 wartość źródłowa nie może być %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Efektywna wartość boolowska (EBV) nie może być obliczona dla sekwencji zawierającej dwie lub więcej wartości atomowe.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The data of a processing instruction cannot contain the string %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dane instrukcji przetwarzania nie mogą zawierać ciągu %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 jest niepoprawnym %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid XML 1.0 character.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 nie jest poprawnym znakiem XML 1.0.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 was called.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wywołano %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In the replacement string, %1 must be followed by at least one digit when not escaped.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;W ciągu zastępczym, po %1 musi następować przynajmniej jedna cyfra&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In the replacement string, %1 can only be used to escape itself or %2, not %3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;W ciągu zastępczym, %1 może być użyte tylko do zabezpieczenia samej siebie lub %2, nigdy %3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 matches newline characters&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 dopasowało znak nowej linii&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Matches are case insensitive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dopasowania uwzględniają wielkość liter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid regular expression pattern: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 jest niepoprawnym wzorcem wyrażenia regularnego: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It will not be possible to retrieve %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie będzie można odzyskać %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The default collection is undefined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Domyślna kolekcja jest niezdefiniowana&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 cannot be retrieved&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The item %1 did not match the required type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 nie został dopasowany do wymaganego typu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an unknown schema type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 jest nieznanym typem schematu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A template with name %1 has already been declared.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Szablon o nazwie %1 został już zadeklarowany.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only one %1 declaration can occur in the query prolog.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tylko jedna deklaracja %1 może się pojawić w prologu zapytania.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The initialization of variable %1 depends on itself&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Inicjalizacja zmiennej %1 zależy od niej samej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The variable %1 is unused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zmienna %1 jest nieużywana&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Version %1 is not supported. The supported XQuery version is 1.0.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wersja %1 nie jest obsługiwana. Obsługiwaną wersją XQuery jest wersja 1.0.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No function with signature %1 is available&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Żadna funkcja w postaci %1 nie jest dostępna&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It is not possible to redeclare prefix %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie jest możliwe ponowne zadeklarowanie przedrostka %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Prefix %1 is already declared in the prolog.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przedrostek %1 jest już zadeklarowany w prologu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name of an option must have a prefix. There is no default namespace for options.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nazwa opcji musi posiadać przedrostek. Nie istnieje domyślna przestrzeń nazw dla opcji.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The Schema Import feature is not supported, and therefore %1 declarations cannot occur.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cecha &amp;quot;Import schematu&amp;quot; nie jest obsługiwana, dlatego deklaracje %1 nie mogą pojawić.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The target namespace of a %1 cannot be empty.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Docelowa przestrzeń nazw dla %1 nie może być pusta.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The module import feature is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cecha &amp;quot;Import modułu&amp;quot; nie jest obsługiwana&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przestrzeń nazw dla funkcji zdefiniowanej przez użytkownika w module bibliotecznym musi odpowiadać przestrzeni nazw modułu. Powinna to być %1 zamiast %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A function already exists with the signature %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Funkcja w postaci %1 już istnieje.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No external functions are supported. All supported functions can be used directly, without first declaring them as external&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zewnętrzne funkcje nie są obsługiwane. Wszystkie obsługiwane funkcje mogą być używane bezpośrednio, bez ich uprzedniego deklarowania jako zewnętrzne&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The %1-axis is unsupported in XQuery&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Oś %1 nie jest obsługiwana w XQuery&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace URI cannot be the empty string when binding to a prefix, %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przestrzeń nazw URI nie może być pustym ciągiem w powiązaniu z przedrostkiem, %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid namespace URI.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 jest niepoprawną przestrzenią nazw URI.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It is not possible to bind to the prefix %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie jest możliwe powiązanie z przedrostkiem %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Two namespace declaration attributes have the same name: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybuty deklaracji przestrzeni nazw mają tą samą nazwę: %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace URI must be a constant and cannot use enclosed expressions.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przestrzeń nazw URI nie może być stałą i nie może używać zawartych w niej wyrażeń.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 nie jest wewnątrz zakresu deklaracji atrybutów. Zwróć uwagę że importowanie schematów nie jest obsługiwane.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;empty&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;pusty&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;zero or one&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;zero lub jeden&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;exactly one&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;dokładnie jeden&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;one or more&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;jeden lub więcej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;zero or more&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;zero lub więcej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The focus is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Focus jest niezdefiniowany.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An attribute by name %1 has already been created.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut o nazwie %1 został już utworzony.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network timeout.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przekroczony czas połączenia.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 can&amp;apos;t be serialized because it appears outside the document element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 nie może być zserializowany ponieważ pojawił się poza elementem &amp;quot;document&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Year %1 is invalid because it begins with %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Rok %1 jest niepoprawny ponieważ rozpoczyna się: %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Day %1 is outside the range %2..%3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dzień %1 jest poza zakresem %2..%3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Month %1 is outside the range %2..%3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Miesiąc %1 jest poza zakresem %2..%3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Overflow: Can&amp;apos;t represent date %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przepełnienie: Nie można wyrazić daty %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Day %1 is invalid for month %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dzień %1 jest niepoprawny dla miesiąca %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; &lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Czas 24:%1:%2:%3 jest niepoprawny. Godzina jest 24, ale minuty, sekundy i milisekundy nie są równocześnie zerami;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Time %1:%2:%3.%4 is invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Czas %1:%2:%3.%4 jest niepoprawny.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Overflow: Date can&amp;apos;t be represented.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przepełnienie: Data nie może być wyrażona.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one time component must appear after the %1-delimiter.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przynajmniej jeden komponent musi wystąpić po nawiasie %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dividing a value of type %1 by %2 (not-a-number) is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dzielenie wartości typu %1 przez %2 (typ nienumeryczny) jest niedozwolone.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dzielenie wartości typu %1 przez %2 lub %3 (plus lub minus zero) jest niedozwolone.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Mnożenie wartości typu %1 przez %2 lub %3 (plus lub minus nieskończoność) jest niedozwolone.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A value of type %1 cannot have an Effective Boolean Value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość typu %1 nie może posiadać efektywnej wartości boolowskiej (EBV).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value %1 of type %2 exceeds maximum (%3).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość %1 typu %2 przekracza maksimum (%3).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value %1 of type %2 is below minimum (%3).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość %1 typu %2 jest poniżej minimum (%3).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A value of type %1 must contain an even number of digits. The value %2 does not.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość typu %1 musi zawierać parzystą liczbę cyfr. Wartość %2 nie zawiera.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not valid as a value of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość %1 nie jest poprawna jako wartość typu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operator %1 cannot be used on type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Operator %1 nie może być użyty dla typu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operator %1 cannot be used on atomic values of type %2 and %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Operator %1 nie może być użyty dla atomowych wartości typu %2 i %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace URI in the name for a computed attribute cannot be %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przestrzeń nazw URI nie może być %1 w nazwie dla obliczonego atrybutu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name for a computed attribute cannot have the namespace URI %1 with the local name %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nazwa dla wyliczonego atrybutu nie może zawierać przestrzeni nazw URI %1 z lokalną nazwą %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type error in cast, expected %1, received %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd typów w rzutowaniu: spodziewano się %1, otrzymano %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podczas rzutowania na %1 lub na typ pochodny, wartość źródłowa musi być tego samego typu lub musi być zapisem tekstowym. Typ %2 nie jest dozwolony.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A comment cannot contain %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Komentarz nie może zawierać %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A comment cannot end with a %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Komentarz nie może kończyć się: %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Węzeł &amp;quot;attribute&amp;quot; nie może być podelementem węzła &amp;quot;document&amp;quot;. Dlatego atrybut %1 jest w złym miejscu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A library module cannot be evaluated directly. It must be imported from a main module.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Moduł biblioteki nie może być bezpośrednio oceniony. On musi być zaimportowany z głównego modułu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No template by name %1 exists.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Szablon o nazwie %1 nie istnieje.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość typu %1 nie może być predykatem. Predykat musi być typu liczbowego lub Efektywną Wartość Logiczną.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A positional predicate must evaluate to a single numeric value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wynikiem predykatu pozycyjnego musi być pojedyncza wartość liczbowa.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Docelowa nazwa w instrukcji przetwarzania nie może być %1 w żadnej kombinacji wielkich i małych liter. Dlatego nazwa %2 jest niepoprawna.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 nie jest poprawną nazwą docelową w instrukcji przetwarzania. Nazwa musi być wartością %2, np. %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ostatni krok w ścieżce musi zawierać albo węzły albo wartości atomowe. Nie może zawierać obu jednocześnie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No namespace binding exists for the prefix %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Żadna przestrzeń nazw nie jest powiązana z przedrostkiem %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No namespace binding exists for the prefix %1 in %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Żadna przestrzeń nazw nie jest powiązana z przedrostkiem %1 w %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pierwszy argument w %1 nie może być typu %2. Musi on być typu liczbowego: xs:yearMonthDuration lub xs:dayTimeDuration.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pierwszy argument w %1 nie może być typu %2. Musi on być typu: %3, %4 lub %5.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Drugi argument w %1 nie może być typu %2. Musi on być typu: %3, %4 lub %5.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Jeśli oba argumenty mają przesunięcia strefowe, muszą one być takie same. %1 i %2 nie są takie same.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 must be followed by %2 or %3, not at the end of the replacement string.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Po %1 musi następować %2 lub %3, lecz nie na końcu zastępczego ciągu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 and %2 match the start and end of a line.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Whitespace characters are removed, except when they appear in character classes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Spacje są usuwane z wyjątkiem kiedy pojawią się w klasach znakowych&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid flag for regular expressions. Valid flags are:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 jest niepoprawną flagą dla wyrażeń regularnych. Poprawnymi flagami są:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Jeśli pierwszy argument jest pustą sekwencją lub zerowej długości ciągiem (przy braku przestrzeni nazw), przedrostek nie może wystąpić. Podano przedrostek %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Znormalizowana forma %1 nie jest obsługiwana. Obsługiwanymi formami są: %2, %3, %4 i %5 oraz pusta forma (brak normalizacji).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A zone offset must be in the range %1..%2 inclusive. %3 is out of range.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przesunięcie strefowe musi być w zakresie %1..%2 włącznie. %3 jest poza tym zakresem.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Required cardinality is %1; got cardinality %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wymagana liczność wynosi %1; otrzymano %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Enkodowanie %1 jest niepoprawne. Może ono zawierać jedynie znaki alfabetu łacińskiego, nie może zawierać spacji i musi być dopasowane do wyrażenia regularnego %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The keyword %1 cannot occur with any other mode name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Słowo kluczowe %1 nie może wystąpić z inną nazwą trybu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No variable with name %1 exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zmienna o nazwie %1 nie istnieje&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The value of attribute %1 must be of type %2, which %3 isn&amp;apos;t.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość atrybutu %1 musi być typu %2, którym nie jest %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The prefix %1 cannot be bound. By default, it is already bound to the namespace %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przedrostek %1 nie może być powiązany. Jest on domyślnie powiązany z przestrzenią nazw %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A variable with name %1 has already been declared.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zmienna o nazwie %1 została już zadeklarowana.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No value is available for the external variable with name %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak wartości dla zewnętrznej zmiennej o nazwie %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A stylesheet function must have a prefixed name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Funkcja arkusza stylu musi zawierać nazwę z przedrostkiem.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przestrzeń nazw %1 jest zarezerwowana, dlatego funkcje zdefiniowane przez użytkownika nie mogą jej użyć. Spróbuj predefiniowany przedrostek %2, który istnieje w takich przypadkach.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An argument with name %1 has already been declared. Every argument name must be unique.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Argument o nazwie %1 został już zadeklarowany. Każda nazwa argumentu musi być unikatowa.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Gdy funkcja %1 jest wykorzystana do dopasowania wewnątrz wzorca, jej argument musi być referencją do zmiennej lub napisem.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;We wzorze XSL-T pierwszy argument w funkcji %1 musi być stałą znakową podczas dopasowywania.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;We wzorze XSL-T pierwszy argument w funkcji %1 musi być stałą znakową lub nazwą zmiennej podczas dopasowywania.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, function %1 cannot have a third argument.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;We wzorze XSL-T funkcja %1 nie może zawierać trzeciego argumentu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;We wzorze XSL-T tylko funkcje %1 i %2 mogą być użyte do dopasowania, zaś funkcja %3 nie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;We wzorze XSL-T tylko osie %2 i %3 mogą być użyte, zaś oś %1 nie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid template mode name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 nie jest poprawną nazwa trybu szablonu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nazwa zmiennej powiązanej w wyrażeniu &amp;quot;for&amp;quot; musi być inna od zmiennej pozycjonującej. W związku z tym dwie zmienne o nazwie %1 kolidują ze sobą.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The Schema Validation Feature is not supported. Hence, %1-expressions may not be used.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cecha &amp;quot;Walidacja schematu&amp;quot; nie jest obsługiwana. Dlatego też wyrażenia %1 nie mogą być użyte.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;None of the pragma expressions are supported. Therefore, a fallback expression must be present&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wyrażenia &amp;quot;pragma&amp;quot; nie są obsługiwane. Dlatego musi wystąpić wyrażenie zastępcze&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Each name of a template parameter must be unique; %1 is duplicated.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Każda nazwa parametru szablonu musi być unikatowa; %1 się powtarza.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No function with name %1 is available.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Żadna funkcja o nazwie %1 nie jest dostępna.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid numeric literal.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 nie jest poprawnym zapisem liczbowym.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;W3C XML Schema identity constraint selector&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Selektor narzucenia niepowtarzalności W3C XML Schema&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;W3C XML Schema identity constraint field&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pole narzucenia niepowtarzalności W3C XML Schema&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A construct was encountered which is disallowed in the current language(%1).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wystąpiła konstrukcja która jest niedozwolona w bieżącym języku (%1).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przestrzeń nazw %1 może być jedynie powiązana z %2 (w przeciwnym wypadku jest ona domyślnie zadeklarowana).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przedrostek %1 może być jedynie powiązany z %2 (w przeciwnym wypadku jest on domyślnie zadeklarowany).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An attribute with name %1 has already appeared on this element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut o nazwie %1 już się pojawił w tym elemencie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A direct element constructor is not well-formed. %1 is ended with %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Konstruktor elementu bezpośredniego nie jest dobrze sformatowany. %1 jest zakończony %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name %1 does not refer to any schema type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nazwa %1 nie odpowiada żadnemu typowi schematu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 jest typem złożonym. Rzutowanie na typy złożone nie jest możliwe. Jednakże rzutowanie na typy atomowe np.: %2 jest dozwolone.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not an atomic type. Casting is only possible to atomic types.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 nie jest typem atomowym. Możliwe jest rzutowanie tylko na typy atomowe.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid name for a processing-instruction.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 nie jest poprawną nazwą dla instrukcji przetwarzającej.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name of an extension expression must be in a namespace.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nazwa dodatkowego wyrażenia musi znajdować sie w przestrzeni nazw.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Required type is %1, but %2 was found.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Odnaleziono typ %2, lecz wymaganym typem jest %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Promoting %1 to %2 may cause loss of precision.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przekształcenie %1 do %2 może spowodować utratę precyzji.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It&amp;apos;s not possible to add attributes after any other kind of node.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dodanie atrybutu poza węzłami nie jest możliwe.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Obsługiwane jest jedynie &amp;quot;Unicode Codepoint Collation&amp;quot; (%1), %2 nie jest obsługiwane.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Integer division (%1) by zero (%2) is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dzielenie w dziedzinie liczb całkowitych (%1) przez zero (%2) jest niezdefiniowane.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Division (%1) by zero (%2) is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dzielenie (%1) przez zero (%2) jest niezdefiniowane.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Modulus division (%1) by zero (%2) is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dzielenie modulo (%1) przez zero (%2) jest niezdefiniowane.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message numerus="yes"&gt;</div><div class='add'>+            &lt;source&gt;%1 takes at most %n argument(s). %2 is therefore invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 przyjmuje co najwyżej %n argument. %2 jest dlatego niepoprawne.&lt;/numerusform&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 przyjmuje co najwyżej %n argumenty. %2 jest dlatego niepoprawne.&lt;/numerusform&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 przyjmuje co najwyżej %n argumentów. %2 jest dlatego niepoprawne.&lt;/numerusform&gt;</div><div class='add'>+            &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message numerus="yes"&gt;</div><div class='add'>+            &lt;source&gt;%1 requires at least %n argument(s). %2 is therefore invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 wymaga przynajmniej %n argumentu. %2 jest dlatego niepoprawne.&lt;/numerusform&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 wymaga przynajmniej %n argumentów. %2 jest dlatego niepoprawne.&lt;/numerusform&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 wymaga przynajmniej %n argumentów. %2 jest dlatego niepoprawne.&lt;/numerusform&gt;</div><div class='add'>+            &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root node of the second argument to function %1 must be a document node. %2 is not a document node.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Głównym węzłem drugiego argumentu w funkcji %1 musi być węzeł &amp;quot;document&amp;quot;. %2 nie jest węzłem &amp;quot;document&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przestrzeń nazw dla funkcji zdefiniowanej przez użytkownika nie może być pusta (spróbuj predefiniowany przedrostek %1, który stworzono specjalnie do takich sytuacji)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A default namespace declaration must occur before function, variable, and option declarations.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Domyślna deklaracja przestrzeni nazw musi pojawić się przed deklaracjami funkcji, zmiennych i opcji.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace declarations must occur before function, variable, and option declarations.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Deklaracje przestrzeni nazw muszą pojawić się przed deklaracjami funkcji, zmiennych i opcji.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Module imports must occur before function, variable, and option declarations.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Importy modułów muszą pojawić się przed deklaracjami funkcji, zmiennych i opcji.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a whole number of minutes.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 nie jest całkowitą liczbą minut.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 can&amp;apos;t be serialized because it appears at the top level.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut %1 nie może być zserializowany ponieważ pojawił się na najwyższym poziomie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an unsupported encoding.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieobsługiwane kodowanie %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 contains octets which are disallowed in the requested encoding %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kod %1 który pojawił się w %2 i który używa kodowania %3 jest niepoprawnym znakiem XML.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ambiguous rule match.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dopasowano niejednoznaczną regułę.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In a namespace constructor, the value for a namespace cannot be an empty string.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;W konstruktorze przestrzeni nazw wartość przestrzeni nazw nie może być pustym ciągiem.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The prefix must be a valid %1, which %2 is not.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przedrostek musi być poprawnym %1, którym %2 nie jest.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The prefix %1 cannot be bound.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przedrostek %1 nie może być powiązany.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only the prefix %1 can be bound to %2 and vice versa.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tylko przedrostek %1 może być powiązany z %2 i vice versa.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The parameter %1 is required, but no corresponding %2 is supplied.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wymagany jest parametr %1 lecz żaden odpowiadający mu  %2 nie został dostarczony.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The parameter %1 is passed, but no corresponding %2 exists.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przekazany jest parametr %1 lecz żaden odpowiadający mu %2 nie istnieje.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The URI cannot have a fragment&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;URI nie może posiadać fragmentu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed at this location.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 jest niedozwolony w tym miejscu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Text nodes are not allowed at this location.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Węzły tekstowe są niedozwolone w tym miejscu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Parse error: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Błąd parsowania: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The value of the XSL-T version attribute must be a value of type %1, which %2 isn&amp;apos;t.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość atrybutu wersji XSL-T musi być typu %1, którym %2 nie jest.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Running an XSL-T 1.0 stylesheet with a 2.0 processor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przetwarzanie arkusza XSL-T w wersji 1.0 przez procesor w wersji 2.0.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown XSL-T attribute %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieznany atrybut %1 XSL-T.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 and %2 are mutually exclusive.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybuty %1 i %2 wzajemnie się wykluczającą.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In a simplified stylesheet module, attribute %1 must be present.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;W uproszczonym module arkuszu stylu musi wystąpić atrybut %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;If element %1 has no attribute %2, it cannot have attribute %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Jeśli element %1 nie posiada atrybutu %2, nie może on również posiadać atrybutu %3 ani %4.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 must have at least one of the attributes %2 or %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 musi posiadać przynajmniej jeden z atrybutów: %2 lub %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one mode must be specified in the %1-attribute on element %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przynajmniej jeden tryb musi być podany w atrybucie %1 elementu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 must come last.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 musi wystąpić jako ostatni.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one %1-element must occur before %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przynajmniej jeden element %1 musi wystąpić przed %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only one %1-element can appear.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Może wystąpić tylko jeden element %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one %1-element must occur inside %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przynajmniej jeden element %1 musi wystąpić wewnątrz %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When attribute %1 is present on %2, a sequence constructor cannot be used.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kiedy atrybut %1 występuje w %2 konstruktor sekwencyjny nie może być użyty.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 must have either a %2-attribute or a sequence constructor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 musi posiadać albo atrybut %2 albo sekwencyjny konstruktor.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Kiedy wymagany jest parametr, domyślna wartość nie może być dostarczona przez atrybut %1 ani przez sekwencyjny konstruktor.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 cannot have children.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 nie może posiadać potomków.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 cannot have a sequence constructor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 nie może posiadać sekwencyjnego konstruktora.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The attribute %1 cannot appear on %2, when it is a child of %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut %1 nie może wystąpić w %2 kiedy jest on potomkiem %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A parameter in a function cannot be declared to be a tunnel.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Parametr funkcji nie może być zadeklarowany jako tunelowy.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;This processor is not Schema-aware and therefore %1 cannot be used.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Procesor nie obsługuje schematów, więc %1 nie może zostać użyte.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top level stylesheet elements must be in a non-null namespace, which %1 isn&amp;apos;t.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Elementy arkusza stylu najwyższego poziomu muszą być w niezerowej przestrzeni nazw, którą %1 nie jest.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The value for attribute %1 on element %2 must either be %3 or %4, not %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartością atrybutu %1 w elemencie %2 musi być %3 albo %4, lecz nie %5.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 cannot have the value %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut %1 nie może posiadać wartości %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The attribute %1 can only appear on the first %2 element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut %1 może wystąpić jedynie w pierwszym elemencie %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one %1 element must appear as child of %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przynajmniej jeden element %1 musi wystąpić jako potomek %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 has inheritance loop in its base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 ma pętlę w dziedziczeniu w jego podstawowym typie %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Circular inheritance of base type %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cykliczne dziedziczenie podstawowego typu %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Circular inheritance of union %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cykliczne dziedziczenie unii %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by restriction as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wywieść %1 z %2 ograniczając go ponieważ jest on zdefiniowany jako końcowy.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by extension as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wywieść %1 z %2 rozszerzając go ponieważ jest on zdefiniowany jako końcowy.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type of simple type %1 cannot be complex type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ podstawowy dla typu prostego %1 nie może być typem złożonym %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 cannot have direct base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ prosty %1 nie może mieć bezpośredniego typu podstawowego %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 is not allowed to have base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ prosty %1 nie może mieć typu podstawowego %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 can only have simple atomic type as base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typem podstawowym typu prostego %1 może być tylko typ atomowy.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 cannot derive from %2 as the latter defines restriction as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ prosty %1 nie może wywodzić się z %2 ponieważ ten ostatni jest zdefiniowany jako końcowy.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Variety of item type of %1 must be either atomic or union.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typem elementów listy %1 musi być albo typ atomowy albo unia.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Variety of member types of %1 must be atomic.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typy składników %1 muszą być atomowe.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by list as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wywieść %1 z %2 poprzez listę ponieważ jest to zdefiniowane ostatecznie w typie podstawowym.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 is only allowed to have %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ prosty %1 może jedynie posiadać aspekt %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type of simple type %1 must have variety of type list.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ podstawowy dla typu prostego %1 musi być listą typów.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type of simple type %1 has defined derivation by restriction as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ podstawowy dla typu prostego %1 ma zdefiniowane wywodzenie poprzez ograniczenie jako końcowe.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Item type of base type does not match item type of %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ elementów listy typu podstawowego nie pasuje do typu elementów listy %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 contains not allowed facet type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ prosty %1 posiada niedozwolony aspekt %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by union as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wywieść %1 z %2 poprzez unię ponieważ jest to zdefiniowane ostatecznie w typie podstawowym.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to have any facets.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 nie może posiadać żadnych aspektów.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of simple type %2 must have variety of union.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ podstawowy %1 dla typu prostego %2 musi być unią.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ podstawowy %1 dla typu prostego %2 nie może posiadać ograniczenia dla atrybutu %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Member type %1 cannot be derived from member type %2 of %3&amp;apos;s base type %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ %1 składnika nie może być wywiedziony z typu %2 który jest typem składnika %3 typu podstawowego %4.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derivation method of %1 must be extension because the base type %2 is a simple type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Metodą wywodzenia z %1 musi być rozszerzenie ponieważ typ podstawowy %2 jest typem prostym.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 has duplicated element %2 in its content model.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ złożony %1 posiada powielony element %2 w jego modelu zawartości.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 has non-deterministic content.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ złożony %1 posiada nieokreśloną zawartość.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybuty typu złożonego %1 nie są poprawnym rozszerzeniem atrybutów typu podstawowego %2: %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content model of complex type %1 is not a valid extension of content model of %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Model zawartości typu złożonego %1 nie jest poprawnym rozszerzeniem modelu zawartości %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 must have simple content.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ złożony %1 musi mieć prostą zawartość.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 must have the same simple type as its base class %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ złożony %1 musi posiadać ten sam prosty typ jaki posiada jego klasa podstawowa %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 cannot be derived from base type %2%3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ złożony %1 nie może być wywiedziony z typu %2%3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybuty typu złożonego %1 nie są poprawnym ograniczeniem atrybutów typu podstawowego %2: %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 with simple content cannot be derived from complex base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ złożony %1 z prostą zawartością nie może być wywiedziony z podstawowego typu złożonego %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Item type of simple type %1 cannot be a complex type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ elementów listy w prostym typie %1 nie może być typem złożonym.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Member type of simple type %1 cannot be a complex type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ składnika typu prostego %1 nie może być typem złożonym.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to have a member type with the same name as itself.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 nie może posiadać typu składnika o tej samej nazwie jaką on sam posiada.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet collides with %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must have the same value as %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aspekt %1 musi mieć tą samą wartość jaką ma aspekt %2 typu podstawowego.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be equal or greater than %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość aspektu %1 musi większa od lub równa wartości aspektu %2 typu podstawowego.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than or equal to %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość aspektu %1 musi być mniejsza od lub równa wartości aspektu %2 typu podstawowego.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet contains invalid regular expression&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aspekt %1 zawiera niepoprawne wyrażenie regularne&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown notation %1 used in %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nieznany zapis %1 użyty w aspekcie %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet contains invalid value %2: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aspekt %1 zawiera niepoprawną wartość %2: %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet cannot be %2 or %3 if %4 facet of base type is %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet cannot be %2 if %3 facet of base type is %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than or equal to %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość aspektu %1 musi być mniejsza od lub równa wartości aspektu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość aspektu %1 musi być mniejsza od wartości aspektu %2 typu podstawowego.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet and %2 facet cannot appear together.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be greater than %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość aspektu %1 musi być większa od wartości aspektu %2 typu podstawowego.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość aspektu %1 musi być mniejsza od wartości aspektu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be greater than or equal to %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość aspektu %1 musi być większa od lub równa wartości aspektu %2 typu podstawowego.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type contains not allowed facet %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ prosty zawiera niedozwolony aspekt %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only %1 and %2 facets are allowed when derived by union.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dozwolone są jedynie aspekty %1 i %2 podczas wywodzenia z unii.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 contains %2 facet with invalid data: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 contains attribute %2 twice.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Grupa atrybutów %1 zawiera dwukrotnie atrybut %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 contains two different attributes that both have types derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Grupa atrybutów %1 zawiera dwa różne atrybuty których typy są wywiedzione z %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Grupa atrybutów %1 zawiera atrybut %2 który ma ograniczenie wartości ale typ wywodzi się z %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 contains attribute %2 twice.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ złożony %1 zawiera atrybut %2 dwukrotnie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 contains two different attributes that both have types derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ złożony %1 zawiera dwa różne atrybuty których typy są wywiedzione z %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ złożony %1 zawiera atrybut %2 który ma ograniczenie wartości ale typ wywodzi się z %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed to have a value constraint if its base type is complex.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 nie może zawierać ograniczenia wartości gdy jego typ podstawowy jest złożony.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed to have a value constraint if its type is derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 nie może zawierać ograniczenia wartości gdy jego typ jest wywiedziony z %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value constraint of element %1 is not of elements type: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ograniczenie wartości elementu %1 nie jest typu: %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed to have substitution group affiliation as it is no global element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 nie może przynależeć do grupy zastępującej ponieważ nie jest on elementem globalnym.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of element %1 cannot be derived from type of substitution group affiliation.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ elementu %1 nie może być wywiedziony z typu przynależnego do grupy zastępującej.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value constraint of attribute %1 is not of attributes type: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ograniczenie wartości atrybutu %1 nie jest typu: %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 has value constraint but has type derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut %1 posiada ograniczenie wartości lecz jego typ wywodzi się z %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute in derived complex type must be %2 like in base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 in derived complex type must have %2 value constraint like in base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut %1 w wywiedzionym typie złożonym musi zawierać ograniczenie wartości %2 jak w typie podstawowym.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 in derived complex type must have the same %2 value constraint like in base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut %1 w wywiedzionym typie złożonym musi zawierać te same ograniczenie wartości %2 jak w typie podstawowym.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 in derived complex type must have %2 value constraint.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut %1 w wywiedzionym typie złożonym musi zawierać ograniczenie wartości %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;processContent of base wildcard must be weaker than derived wildcard.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;quot;processContent&amp;quot; podstawowego dżokera musi być słabszy od wywiedzionego dżokera.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 exists twice with different types.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Istnieją dwa elementy %1 o różnych typach.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Particle contains non-deterministic wildcards.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element zawiera nieokreślone dżokery.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base attribute %1 is required but derived attribute is not.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wymagany jest bazowy atrybut %1, wywiedziony zaś nie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of derived attribute %1 cannot be validly derived from type of base attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ wywiedzionego atrybutu %1 nie może być poprawnie wywiedziony z typu podstawowego atrybutu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value constraint of derived attribute %1 does not match value constraint of base attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ograniczenie wartości wywiedzionego atrybutu %1 nie pasuje do ograniczenia wartości podstawowego atrybutu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived attribute %1 does not exist in the base definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wywiedziony atrybut %1 nie istnieje w podstawowej definicji.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived attribute %1 does not match the wildcard in the base definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wywiedziony atrybut %1 nie pasuje do dżokera w podstawowej definicji.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base attribute %1 is required but missing in derived definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak wymaganego bazowego atrybutu %1 w wywiedzionej definicji.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived definition contains an %1 element that does not exists in the base definition&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wywiedziona definicja zawiera element %1 który nie istnieje w definicji podstawowej&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived wildcard is not a subset of the base wildcard.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wywiedziony dżoker nie jest podzbiorem podstawowego dżokera.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 of derived wildcard is not a valid restriction of %2 of base wildcard&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 wywiedzionego dżokera nie jest poprawnym ograniczeniem %2 podstawowego dżokera&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 from base type is missing in derived type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak atrybutu %1 typu bazowego w wywiedzionej definicji.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of derived attribute %1 differs from type of base attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ wywiedzionego atrybutu %1 różni się od typu podstawowego atrybutu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base definition contains an %1 element that is missing in the derived definition&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podstawowa definicja zawiera element %1 którego brakuje w wywiedzionej definicji&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 references unknown %2 or %3 element %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 odwołuje się do nieznanego elementu %2 lub %3: %4.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 references identity constraint %2 that is no %3 or %4 element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 odwołuje się do narzucenia niepowtarzalności %2 które nie jest elementem %3 ani %4.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 has a different number of fields from the identity constraint %2 that it references.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 posiada inna liczbę pól od narzucenia niepowtarzalności %2 które się do niego odwołuje.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można rozwiązać typu podstawowego %1 elementu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Item type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można rozwiązać typu elementów listy %1 w elemencie %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Member type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można rozwiązać typu %1 składnika elementu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można rozwiązać typu %1 elementu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of complex type cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można rozwiązać typu podstawowego %1 dla typu złożonego.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 cannot have complex base type that has a %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Model zawartości typu złożonego %1 posiada element %2 więc nie może być on wywiedziony poprzez rozszerzenie niepustego typu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ złożony %1 nie może być wywiedziony z %2 poprzez rozszerzenie ponieważ ten ostatni zawiera element %3 w jego modelu zawartości.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of %1 element must be a simple type, %2 is not.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typem elementu %1 musi być typ prosty, %2 nim nie jest.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Substitution group %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można rozwiązać grupy zastępującej %1 elementu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Substitution group %1 has circular definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Grupa zastępująca %1 posiada cykliczną definicję.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duplicated element names %1 in %2 element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Powielona nazwa elementu %1 w elemencie %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reference %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można rozwiązać odwołania %1 do elementu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Circular group reference for %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Cykliczne odwołanie do grupy dla %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed in this scope&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element cannot have %2 attribute with value other than %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element cannot have %2 attribute with value other than %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 or %2 attribute of reference %3 does not match with the attribute declaration %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut %1 lub %2 odwołania %3 nie pasuje do deklaracji atrybutu %4.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 has circular reference.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Grupa atrybutów %1 posiada cykliczne odwołanie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute in %2 must have %3 use like in base type %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut dżokera %1 nie jest poprawnym ograniczeniem atrybutu dżokera typu podstawowego %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 has attribute wildcard but its base type %2 has not.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 posiada atrybut dżokera lecz jego typ podstawowy %2 go nie posiada.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można wyrazić unii atrybutu dżokera typu %1 i atrybutu dżokera jego typu podstawowego %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enumeration facet contains invalid content: {%1} is not a value of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Aspekt &amp;quot;enumeration&amp;quot; posiada niepoprawną zawartość: {%1} nie jest wartością typu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace prefix of qualified name %1 is not defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przedrostek przestrzeni nazw występujący w pełnej nazwie %1 nie jest zdefiniowany.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element %2 is not a valid restriction of the %3 element it redefines: %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Empty particle cannot be derived from non-empty particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pusty element nie może być wywiedziony z niepustego elementu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived particle is missing element %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak elementu %1 w wywiedzionym elemencie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived element %1 is missing value constraint as defined in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak ograniczenia wartości w wywiedzionym elemencie %1 takiego jak w podstawowym elemencie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived element %1 has weaker value constraint than base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wywiedziony element %1 posiada słabsze ograniczenie wartości niż element podstawowy.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fixed value constraint of element %1 differs from value constraint in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ograniczenie stałej wartości elementu %1 różni się od ograniczenia wartości w podstawowym elemencie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived element %1 cannot be nillable as base element is not nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wywiedziony element %1 może być zerowalny ponieważ element podstawowy nie jest zerowalny.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Block constraints of derived element %1 must not be more weaker than in the base element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ograniczenia blokujące dla wywiedzionego elementu %1 nie mogą być słabsze od ograniczeń w elemencie podstawowym.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type of derived element %1 cannot be validly derived from base element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ prosty w elemencie wywiedzionym %1 nie może być poprawnie wywiedziony z elementu podstawowego.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type of derived element %1 cannot be validly derived from base element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ złożony w elemencie wywiedzionym %1 nie może być poprawnie wywiedziony z elementu podstawowego.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is missing in derived particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak elementu %1 w wywiedzionym elemencie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 does not match namespace constraint of wildcard in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 nie pasuje do ograniczenia przestrzeni nazw dżokera w elemencie podstawowym.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wildcard in derived particle is not a valid subset of wildcard in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dżoker w wywiedzionym elemencie nie jest poprawnym podzbiorem dżokera w elemencie podstawowym.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;processContent of wildcard in derived particle is weaker than wildcard in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;quot;processContent&amp;quot; dżokera w wywiedzionym elemencie jest słabszy od dżokera w podstawowym elemencie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived particle allows content that is not allowed in the base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wywiedziony element pozwala na zawartość która jest niedozwolona w podstawowym elemencie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Can not process unknown element %1, expected elements are: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Nie można przetworzyć nieznanego elementu %1, spodziewanymi elementami są: %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed in this scope, possible elements are: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 jest niedozwolony w tym zakresie, możliwymi elementami są: %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Child element is missing in that scope, possible child elements are: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak podelementu w tym zakresie, możliwymi podelementami są: %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Document is not a XML schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dokument nie jest schematem XML.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element contains invalid content: {%3} is not a value of type %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element contains invalid content: {%3}.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Docelowa przestrzeń nazw %1 załączonego schematu jest różna od docelowej przestrzeni nazw %2 która jest zdefiniowana w schemacie załączającym.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Docelowa przestrzeń nazw %1 zaimportowanego schematu jest różna od docelowej przestrzeni nazw %2 która jest zdefiniowana w schemacie importującym.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed to have the same %2 attribute value as the target namespace %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element without %2 attribute is not allowed inside schema without target namespace.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed inside %2 element if %3 attribute is present.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element has neither %2 attribute nor %3 child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element with %2 child element must not have a %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must be %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must have a value of %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must have a value of %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element must not have %2 and %3 attribute together.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of %1 attribute of %2 element must not be from namespace %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość atrybutu %1 elementu %2 nie może pochodzić z przestrzeni nazw %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must not be %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must have the value %3 because the %4 attribute is set.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Specifying use=&amp;apos;prohibited&amp;apos; inside an attribute group has no effect.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podawanie: use=&amp;apos;prohibited&amp;apos; wewnątrz grupy atrybutów nie przynosi żadnego efektu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element must have either %2 or %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element must have either %2 attribute or %3 or %4 as child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element requires either %2 or %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Text or entity references not allowed inside %1 element&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tekst ani odwołanie nie są dozwolone wewnątrz elementu %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must contain %3, %4 or a list of URIs.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed in this context.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element has larger value than %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Prefix of qualified name %1 is not defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przedrostek w pełnej nazwie %1 nie jest zdefiniowany.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must either contain %3 or the other values.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Component with ID %1 has been defined previously.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Komponent o identyfikatorze %1 został uprzednio zdefiniowany.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 jest już zdefiniowany.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut %1 jest już zdefiniowany.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ %1 jest już zdefiniowany.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Grupa atrybutów %1 jest już zdefiniowana.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element group %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Grupa elementów %1 jest już zdefiniowana.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Notation %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zapis %1 jest już zdefiniowany.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Identity constraint %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Narzucenie niepowtarzalności %1 jest już zdefiniowane.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duplicated facets in simple type %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Powielone aspekty w prostym typie %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not valid according to %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 nie jest poprawne według %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match the length facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość ciągu koliduje z aspektem &amp;quot;length&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match the minLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość ciągu koliduje z aspektem &amp;quot;minLength&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match the maxLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość ciągu koliduje z aspektem &amp;quot;maxLength&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość ciągu koliduje z aspektem &amp;quot;pattern&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość ciągu nie widnieje na liście aspektu &amp;quot;enumeration&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby całkowitej koliduje z aspektem &amp;quot;maxInclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby całkowitej koliduje z aspektem &amp;quot;maxExclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby całkowitej koliduje z aspektem &amp;quot;minInclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby całkowitej koliduje z aspektem &amp;quot;minExclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby całkowitej nie widnieje na liście aspektu &amp;quot;enumeration&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby całkowitej koliduje z aspektem &amp;quot;pattern&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match in the totalDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby całkowitej koliduje z aspektem &amp;quot;totalDigits&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby naturalnej koliduje z aspektem &amp;quot;maxInclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby naturalnej koliduje z aspektem &amp;quot;maxExclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby naturalnej koliduje z aspektem &amp;quot;minInclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby naturalnej koliduje z aspektem &amp;quot;minExclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby naturalnej nie widnieje na liście aspektu &amp;quot;enumeration&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby naturalnej koliduje z aspektem &amp;quot;pattern&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match in the totalDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby naturalnej koliduje z aspektem &amp;quot;totalDigits&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby rzeczywistej koliduje z aspektem &amp;quot;maxInclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby rzeczywistej koliduje z aspektem &amp;quot;maxExclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby rzeczywistej koliduje z aspektem &amp;quot;minInclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby rzeczywistej koliduje z aspektem &amp;quot;minExclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby rzeczywistej nie widnieje na liście aspektu &amp;quot;enumeration&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby rzeczywistej koliduje z aspektem &amp;quot;pattern&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decimal content does not match in the fractionDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby rzeczywistej koliduje z aspektem &amp;quot;fractionDigits&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decimal content does not match in the totalDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość liczby rzeczywistej koliduje z aspektem &amp;quot;totalDigits&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość daty i czasu koliduje z aspektem &amp;quot;maxInclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość daty i czasu koliduje z aspektem &amp;quot;maxExclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość daty i czasu koliduje z aspektem &amp;quot;minInclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość daty i czasu koliduje z aspektem &amp;quot;minExclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość daty i czasu nie widnieje na liście aspektu &amp;quot;enumeration&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość daty i czasu koliduje z aspektem &amp;quot;pattern&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość długości okresu czasu koliduje z aspektem &amp;quot;maxInclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość długości okresu czasu koliduje z aspektem &amp;quot;maxExclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość długości okresu czasu koliduje z aspektem &amp;quot;minInclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość długości okresu czasu koliduje z aspektem &amp;quot;minExclusive&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość długości okresu czasu nie widnieje na liście aspektu &amp;quot;enumeration&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość długości okresu czasu koliduje z aspektem &amp;quot;pattern&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Boolean content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość boolowska koliduje z aspektem &amp;quot;pattern&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content does not match the length facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość binarna koliduje z aspektem &amp;quot;length&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content does not match the minLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość binarna koliduje z aspektem &amp;quot;minLength&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content does not match the maxLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość binarna koliduje z aspektem &amp;quot;maxLength&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość binarna nie widnieje na liście aspektu &amp;quot;enumeration&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid QName content: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Niepoprawna zawartość QName: %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QName content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość QName nie widnieje na liście aspektu &amp;quot;enumeration&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QName content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość QName koliduje z aspektem &amp;quot;pattern&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Notation content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zapis zawartości nie widnieje na liście aspektu &amp;quot;enumeration&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match length facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość listy koliduje z aspektem &amp;quot;length&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match minLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość listy koliduje z aspektem &amp;quot;minLength&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match maxLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość listy koliduje z aspektem &amp;quot;maxLength&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość listy nie widnieje na liście aspektu &amp;quot;enumeration&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość listy koliduje z aspektem &amp;quot;pattern&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Union content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość unii nie widnieje na liście aspektu &amp;quot;enumeration&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Union content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość unii koliduje z aspektem &amp;quot;pattern&amp;quot;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Data of type %1 are not allowed to be empty.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Dane typu %1 nie mogą być puste.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is missing child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak wymaganego podelementu w elemencie %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;There is one IDREF value with no corresponding ID: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Istnieje wartość IDREF bez odpowiadającej jej wartości ID: %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Loaded schema file is invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Załadowany plik nie jest poprawnym plikiem ze schematem.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 contains invalid data.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;xsi:schemaLocation namespace %1 has already appeared earlier in the instance document.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Przestrzeń nazw &amp;quot;xsi:schemaLocation&amp;quot; %1 wystąpiła już wcześniej w dokumencie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;quot;xsi:noNamespaceSchemaLocation&amp;quot; nie może wystąpić po pierwszym elemencie lub atrybucie który nie jest przestrzenią nazw.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No schema defined for validation.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak zdefiniowanego schematu dla walidacji.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No definition for element %1 available.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak dostępnej definicji dla elementu %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Specified type %1 is not known to the schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podany typ %1 nie jest schematowi znany.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not defined in this scope.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 nie jest zdefiniowany w tym zakresie.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Declaration for element %1 does not exist.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak deklaracji dla elementu %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains invalid content.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 posiada niepoprawną zawartość.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is declared as abstract.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 jest zadeklarowany jako abstrakcyjny.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 nie jest zerowalny.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 contains invalid data: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut %1 zawiera niepoprawne dane: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element contains content although it is nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element posiada zawartość chociaż jest zerowalny.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fixed value constraint not allowed if element is nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ograniczenie stałej wartości jest niedozwolone gdy element jest zerowalny.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 cannot contain other elements, as it has a fixed content.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 nie może zawierać innych elementów ponieważ posiada on stałą zawartość.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Specified type %1 is not validly substitutable with element type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Podany typ %1 nie jest poprawnie zastępowalny typem elementu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 is not allowed to be abstract.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Typ złożony %1 nie może być abstrakcyjny.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed attributes.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 zawiera niedozwolone atrybuty.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 zawiera niedozwolony podelement.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of element %1 does not match its type definition: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość elementu %1 nie pasuje do jego definicji typu: %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of element %1 does not match defined value constraint.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość elementu %1 nie pasuje do zdefiniowanego ograniczenia wartości.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed child content.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 zawiera niedozwolony podelement.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed text content.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 zawiera niedozwolony text.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is missing required attribute %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak wymaganego atrybutu %2 w elemencie %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 does not match the attribute wildcard.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut %1 nie pasuje do atrybutu dżokera.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Declaration for attribute %1 does not exist.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak deklaracji atrybutu %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains two attributes of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 posiada dwa atrybuty typu %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 contains invalid content.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Atrybut %1 posiada niepoprawną zawartość.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains unknown attribute %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Element %1 posiada nieznany atrybut %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of attribute %1 does not match its type definition: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość atrybutu %1 nie pasuje do jego definicji typu: %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of attribute %1 does not match defined value constraint.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Zawartość elementu %1 nie pasuje do zdefiniowanego ograniczenia wartości.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Non-unique value found for constraint %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Znaleziono nieunikatową wartość dla ograniczenia %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Key constraint %1 contains absent fields.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ograniczenie klucza %1 zawiera nieobecne pola.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Key constraint %1 contains references nillable element %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No referenced value found for key reference %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Brak wartości do której odwołuje się klucz %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More than one value found for field %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Znaleziono więcej niż jedną wartość dla pola %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Field %1 has no simple type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pole %1 nie posiada prostego typu.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ID value &amp;apos;%1&amp;apos; is not unique.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Wartość ID &amp;quot;%1&amp;quot; nie jest unikatowa.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;apos;%1&amp;apos; attribute contains invalid QName content: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+&lt;/TS&gt;</div><div class='head'>diff --git a/config.profiles/symbian/translations/qt_ru_symbian.ts b/config.profiles/symbian/translations/qt_ru_symbian.ts<br/>new file mode 100644<br/>index 0000000..08b201e<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/translations/qt_ru_symbian.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/translations/qt_ru_symbian.ts</a></div><div class='hunk'>@@ -0,0 +1,8522 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='add'>+&lt;!DOCTYPE TS&gt;</div><div class='add'>+</div><div class='add'>+&lt;TS version="2.0" language="ru"&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;CloseButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close Tab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Закрыть вкладку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;FakeReply&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fake error !&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка: фальшивый!&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�екорректный URL&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Notifications&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Уведомлени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Music&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Музыка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Видео&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Communication&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Общение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Games&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Игры&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Accessibility&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Специальные возможно�ти&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::AudioOutput&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;html&amp;gt;The audio playback device &amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt; does not work.&amp;lt;br/&amp;gt;Falling back to &amp;lt;b&amp;gt;%2&amp;lt;/b&amp;gt;.&amp;lt;/html&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;html&amp;gt;Звуковое у�трой�тво &amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt; не работает.&amp;lt;br/&amp;gt;Будет и�пользовать�� &amp;lt;b&amp;gt;%2&amp;lt;/b&amp;gt;.&amp;lt;/html&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;html&amp;gt;Switching to the audio playback device &amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt;&amp;lt;br/&amp;gt;which just became available and has higher preference.&amp;lt;/html&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;html&amp;gt;Переключение на звуковое у�трой�тво &amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt;&amp;lt;br/&amp;gt;, которое до�тупно и имеет вы�ший приоритет.&amp;lt;/html&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Revert back to device &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Возвращение к у�трой�тву &amp;apos;%1&amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::Gstreamer::Backend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning: You do not seem to have the package gstreamer0.10-plugins-good installed.</div><div class='add'>+          Some video features have been disabled.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Внимание: Похоже, пакет gstreamer0.10-plugins-good не у�тановлен.</div><div class='add'>+          �екоторые возможно�ти во�произведени� видео недо�тупны.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning: You do not seem to have the base GStreamer plugins installed.</div><div class='add'>+          All audio and video support has been disabled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Внимание: Похоже, о�новной модуль GStreamer не у�тановлен.</div><div class='add'>+          Поддержка видео и аудио отключена&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::Gstreamer::MediaObject&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot start playback. </div><div class='add'>+</div><div class='add'>+Check your GStreamer installation and make sure you </div><div class='add'>+have libgstreamer-plugins-base installed.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A required codec is missing. You need to install the following codec(s) to play this content: %0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;От�ут�твует необходимый кодек. Вам нужно у�тановить �ледующие кодеки дл� во�произведени� данного �одержимого: %0&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open media source.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь открыть и�точник медиа-данных.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid source type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еверный тип и�точника медиа-данных.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not locate media source.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь найти и�точник медиа-данных.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open audio device. The device is already in use.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь открыть звуковое у�трой�тво. У�трой�тво уже и�пользует��.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not decode media source.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь декодировать и�точник медиа-данных.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Во�произведение звука&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The audio output device&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;У�трой�тво во�произведени� звука&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ет ошибки&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е найдено&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Out of memory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�едо�таточно пам�ти&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е поддерживает��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Overflow&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переполнение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Underflow&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Потер� значимо�ти&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Already exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Уже �уще�твует&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Path not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Путь не найден&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In use&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;И�пользует��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not ready&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е готово&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Access denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;До�туп запрещен&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Подключение невозможно&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Disconnected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Разъединено&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отказано в разрешении&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insufficient bandwidth&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�едо�таточна� �коро�ть передачи&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network unavailable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сеть недо�тупна&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network communication error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сетева� ошибка �в�зи&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Streaming not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Потоки не поддерживают��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Server alert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сигнал �ервера&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid protocol&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еверный протокол&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еверный адре� URL&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multicast error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка групповой передачи&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка прок�и-�ервера&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прок�и-�ервер не поддерживает��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio output error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка вывода аудио&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video output error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка вывода видео&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decoder error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка декодера&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio or video components could not be played&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно во�произве�ти аудио или видеокомпоненты&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DRM error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка DRM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error (%1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тна� ошибка (%1)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::AbstractMediaPlayer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not ready to play&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е готов к во�произведению&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка при открытии файла&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка при открытии адре�а URL&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Setting volume failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сбой при на�тройке громко�ти&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Playback complete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Во�произведение завершено&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::AudioEqualizer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 Hz&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 Гц&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::AudioPlayer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Getting position failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сбой определени� позиции&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Opening clip failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сбой при открытии клипа&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::EffectFactory&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enabled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Включено&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::EnvironmentalReverb&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decay HF ratio (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ко�ффициент затухани� ВЧ (%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decay time (ms)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Врем� затухани� (м�)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Density (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Плотно�ть (%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Diffusion (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ра��е�ние (%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reflections delay (ms)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Затухание отражений (м�)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reflections level (mB)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Уровень отражений (Мбит)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverb delay (ms)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Задержка реверберации (м�)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverb level (mB)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Уровень реверберации (Мбит)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Room HF level&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Уровень ВЧ помещени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Room level (mB)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Уровень помещени� (Мбит)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::MediaObject&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening source: type not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка при открытии и�точника: тип не поддерживает��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening source: media type could not be determined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка при открытии и�точника: тип но�ител� определить невозможно&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::StereoWidening&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Level (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Уровень (%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::VideoPlayer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сбой паузы&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сбой при пои�ке&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Getting position failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сбой определени� позиции&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Opening clip failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сбой при открытии клипа&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Buffering clip failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сбой при буферизации клипа&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video display error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка отображени� видео&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::VolumeSlider&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume: %1%&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Громко�ть: %1%&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;И�пользуйте данный ползунок дл� на�тройки громко�ти. Крайнее левое положение �оответ�твует 0%, крайнее правое - %1%&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Muted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Без звука&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3Accel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1, %2 not defined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1, %2 не определён&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ambiguous %1 not handled&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3DataTable&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;True&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Да&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;False&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ет&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�тавить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Update&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Обновить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Удалить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3FileDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy or Move a File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Копировать или переме�тить файл&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Чтение: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запи�ь: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отмена&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�е файлы (*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Им�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Размер&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Тип&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Дата&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attributes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�трибуты&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;ОК&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Look &amp;amp;in:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Папка:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File &amp;amp;name:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Им� файла:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File &amp;amp;type:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Тип файла:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�азад&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;One directory up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вверх на один уровень&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Create New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Создать папку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Спи�ок&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Detail View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Подробный вид&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Preview File Info&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Предпро�мотр информации о файле&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Preview File Contents&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Предпро�мотр �одержимого файла&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read-write&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Чтение и запи�ь&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read-only&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Только чтение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write-only&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Только запи�ь&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Inaccessible&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ет до�тупа&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symlink to File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;С�ылка на файл&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symlink to Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;С�ылка на каталог&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symlink to Special&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;С�ылка на �пецфайл&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Файл&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dir&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Каталог&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Special&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Спецфайл&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Открыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save As&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сохранить как&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Открыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Сохранить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Rename&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Переименовать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Удалить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;R&amp;amp;eload&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;О&amp;amp;бновить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort by &amp;amp;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;По &amp;amp;имени&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort by &amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;По &amp;amp;размеру&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort by &amp;amp;Date&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;По &amp;amp;дате&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Unsorted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;�е упор�дочивать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Упор�дочить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show &amp;amp;hidden files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Показать �к&amp;amp;рытые файлы&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;the file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;файл&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;the directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;каталог&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;the symlink&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��ылку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Удалить %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;qt&amp;gt;Are you sure you wish to delete %1 &amp;quot;%2&amp;quot;?&amp;lt;/qt&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;qt&amp;gt;Вы дей�твительно хотите удалить %1 &amp;quot;%2&amp;quot;?&amp;lt;/qt&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Да&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;�ет&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder 1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ова� папка 1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ова� папка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ова� папка %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�айти каталог&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Каталоги&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directory:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Каталог:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1</div><div class='add'>+File not found.</div><div class='add'>+Check path and filename.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1</div><div class='add'>+Файл не найден.</div><div class='add'>+Проверьте правильно�ть пути и имени файла.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*.*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�е файлы (*.*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open &lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Открыть &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select a Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выбрать каталог&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3LocalFs&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not read directory</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь прочитать каталог</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not create directory</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь �оздать каталог</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not remove file or directory</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь удалить файл или каталог</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not rename</div><div class='add'>+%1</div><div class='add'>+to</div><div class='add'>+%2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь переименовать</div><div class='add'>+%1</div><div class='add'>+в</div><div class='add'>+%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь открыть</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not write</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь запи�ать</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3MainWindow&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выровн�ть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Customize...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�а�троить...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3NetworkProtocol&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation stopped by the user&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Операци� о�тановлена пользователем&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3ProgressDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отмена&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3TabDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ОК&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Apply&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Применить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Справка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Defaults&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;По умолчанию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отмена&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3TextEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Отменить дей�твие&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Повторить дей�твие&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cu&amp;amp;t&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Вырезать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Копировать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В&amp;amp;�тавить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Очи�тить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделить в�ё&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3TitleBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;System&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Си�темное меню&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Во��тановить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Minimize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Свернуть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Во��тановить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Maximize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ра�пахнуть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Закрыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Contains commands to manipulate the window&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Содержит команды управлени� окном&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Puts a minimized window back to normal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Возвращает �вёрнутое окно в нормальное �о�то�ние&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Moves the window out of the way&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сворачивает окно&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Puts a maximized window back to normal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Возвращает ра�пахнутое окно в нормальное �о�то�ние&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Makes the window full screen&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Разворачивает окно на ве�ь �кран&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Closes the window&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Зыкрывает окно&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Displays the name of the window and contains controls to manipulate it&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отображает название окна и �одержит команды управлени� им&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3ToolBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Больше...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3UrlOperator&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Протокол &amp;apos;%1&amp;apos; не поддерживает��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support listing directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Протокол &amp;apos;%1&amp;apos; не поддерживает про�мотр каталогов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support creating new directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Протокол &amp;apos;%1&amp;apos; не поддерживает �оздание каталогов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support removing files or directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Протокол &amp;apos;%1&amp;apos; не поддерживает удаление файлов или каталогов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support renaming files or directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Протокол &amp;apos;%1&amp;apos; не поддерживает переименование файлов или каталогов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support getting files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Протокол &amp;apos;%1&amp;apos; не поддерживает до�тавку файлов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support putting files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Протокол &amp;apos;%1&amp;apos; не поддерживает отправку файлов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support copying or moving files or directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Протокол &amp;apos;%1&amp;apos; не поддерживает копирование или перемещение файлов или каталогов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;(unknown)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;(неизве�тно)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3Wizard&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;От&amp;amp;мена&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt; &amp;amp;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt; &amp;amp;�азад&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Next &amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Далее &amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Finish&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Завершить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Справка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAbstractSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Узел не найден&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отказано в �оединении&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Врем� на �оединение и�текло&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation on socket is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Операци� � �окетом не поддерживает��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Socket operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Врем� на операцию � �окетом и�текло&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Socket is not connected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сокет не подключён&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network unreachable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сеть недо�тупна&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAbstractSpinBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Step up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Шаг вв&amp;amp;ерх&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step &amp;amp;down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Шаг вн&amp;amp;из&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Выделить в�ё&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAccessibleButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Press&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ажмите&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QApplication&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QT_LAYOUT_DIRECTION&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Translate this string to the string &amp;apos;LTR&amp;apos; in left-to-right languages or to &amp;apos;RTL&amp;apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;LTR&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Executable &amp;apos;%1&amp;apos; requires Qt %2, found Qt %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Программный модуль &amp;apos;%1&amp;apos; требует Qt %2, найдена вер�и� %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Incompatible Qt Library Error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка �овме�тимо�ти библиотеки Qt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Activate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ктивировать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Activates the program&amp;apos;s main window&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ктивирует главное окно программы&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAxSelect&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select ActiveX Control&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выбор компоненты ActiveX&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выбрать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;От&amp;amp;мена&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;COM &amp;amp;Object:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Объект COM:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QCheckBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Uncheck&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сн�ть отметку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отметить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Toggle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переключить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QColorDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hu&amp;amp;e:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Тон:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Sat:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;�а�:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Val:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Ярк:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Red:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Кра�ный:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Green:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Зелёный:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bl&amp;amp;ue:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;С&amp;amp;иний:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A&amp;amp;lpha channel:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;�льфа-канал:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select Color&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выбор цвета&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Basic colors&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;О�новные цвета&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Custom colors&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Пользователь�кие цвета&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Add to Custom Colors&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Добавить к пользователь�ким цветам&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QComboBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Открыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;False&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ет&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;True&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Да&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Закрыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QCoreApplication&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: key is empty&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: пу�той ключ&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to make key&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: невозможно �оздать ключ&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: ftok failed&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: ошибка ftok&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: already exists&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: уже �уще�твует&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: does not exist&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: не �уще�твует&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: out of resources&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: недо�таточно ре�ур�ов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1: неизве�тна� ошибка %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDB2Driver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно �оединить��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно завершить транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно отозвать транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to set autocommit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно у�тановить автозавершение транзакций&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDB2Result&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно выполнить выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно подготовить выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind variable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно прив�зать значение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch record %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно получить запи�ь %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно получить �ледующую �троку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch first&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно получить первую �троку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDateTimeEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;AM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;AM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;am&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;am&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;PM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;pm&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;pm&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDial&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QDial&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;QDial&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SpeedoMeter&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;SpeedoMeter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SliderHandle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;SliderHandle&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;What&amp;apos;s This?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Что �то?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Done&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Готово&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDialogButtonBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ОК&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сохранить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Сохранить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Открыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отмена&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;От&amp;amp;мена&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Закрыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Закрыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Apply&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Применить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reset&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сбро�ить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Справка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Don&amp;apos;t Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е �охран�ть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Discard&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отклонить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Да&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Yes to &amp;amp;All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Да дл� &amp;amp;в�ех&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;�ет&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;N&amp;amp;o to All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�&amp;amp;ет дл� в�ех&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сохранить в�е&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Abort&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прервать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Retry&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Повторить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Пропу�тить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore Defaults&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Во��тановить значени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close without Saving&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Закрыть без �охранени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;ОК&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDirModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Им�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Размер&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Kind&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Match OS X Finder&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Вид&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Тип&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date Modified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Дата изменени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDockWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Закрыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прикрепить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Float&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Открепить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDoubleSpinBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Больше&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Less&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Меньше&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QErrorMessage&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Show this message again&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Показывать �то �ообщение в дальнейшем&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Закрыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Debug Message:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отладочное �ообщение:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Предупреждение:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fatal Error:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Критиче�ка� ошибка:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFile&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Destination file exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Файл �уще�твует&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Will not rename sequential file using block copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;По�ледовательный файл не будет переименован � и�пользованием поблочного копировани�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot remove source file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно удалить и�ходный файл&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open %1 for input&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно открыть %1 дл� ввода&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open for output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно открыть дл� вывода&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Failure to write block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сбой запи�и блока&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot create %1 for output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно �оздать %1 дл� вывода&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFileDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�е файлы (*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�азад&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Спи�ок&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Detail View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Подробный вид&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Файл&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Открыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save As&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сохранить как&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Открыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Сохранить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Recent Places&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�едавние документы&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Rename&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Переименовать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Удалить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show &amp;amp;hidden files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Показать �к&amp;amp;рытые файлы&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ова� папка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�айти каталог&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Каталоги&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*.*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�е файлы (*.*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directory:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Каталог:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 already exists.</div><div class='add'>+Do you want to replace it?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 уже �уще�твует.</div><div class='add'>+Хотите заменить его?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1</div><div class='add'>+File not found.</div><div class='add'>+Please verify the correct file name was given.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1</div><div class='add'>+Файл не найден.</div><div class='add'>+Проверьте правильно�ть указанного имени файла.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;My Computer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Мой компьютер&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Parent Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Родитель�кий каталог&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Files of type:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Типы файлов:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1</div><div class='add'>+Directory not found.</div><div class='add'>+Please verify the correct directory name was given.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1</div><div class='add'>+Каталог не найден.</div><div class='add'>+Проверьте правильно�ть указанного имени каталога.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;apos;%1&amp;apos; is write protected.</div><div class='add'>+Do you want to delete it anyway?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;apos;%1&amp;apos; защищён от запи�и.</div><div class='add'>+В�ё-равно хотите удалить?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Are sure you want to delete &amp;apos;%1&amp;apos;?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вы дей�твительно хотите удалить &amp;apos;%1&amp;apos;?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not delete directory.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь удалить каталог.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Drive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ди�к&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File Folder&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Match Windows Explorer&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Папка � файлами&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Folder&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Папка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Alias&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Mac OS X Finder&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;П�евдоним&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shortcut&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Ярлык&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тный&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show &lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Показать &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вперёд&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;�ова� папка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Choose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Выбрать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remove&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Удалить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File &amp;amp;name:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Им� файла:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Look in:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Перейти к:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Create New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Создать папку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFileSystemModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 TB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 Тб&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 GB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 Гб&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 MB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 Мб&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 KB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 Кб&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 bytes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 байт&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid filename&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�екорректное им� файла&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;b&amp;gt;The name &amp;quot;%1&amp;quot; can not be used.&amp;lt;/b&amp;gt;&amp;lt;p&amp;gt;Try using another name, with fewer characters or no punctuations marks.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;b&amp;gt;Им� &amp;quot;%1&amp;quot; не может быть и�пользовано.&amp;lt;/b&amp;gt;&amp;lt;p&amp;gt;Попробуйте и�пользовать им� меньшей длины и/или без �имволов пунктуации.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Им�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Размер&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Kind&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Match OS X Finder&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Вид&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Тип&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date Modified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Дата изменени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;My Computer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Мой компьютер&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Computer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Компьютер&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 byte(s)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 байт(ов)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFontDatabase&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Normal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Обычный&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bold&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Жирный&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Demi Bold&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Полужирный&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Black&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Чёрный&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Demi&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Средний&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Light&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Светлый&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Italic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Кур�ив&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Oblique&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�аклонный&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Any&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Люба�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Latin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Латиница&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Greek&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Грече�ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cyrillic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Кириллица&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Armenian&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�рм�н�ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hebrew&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Иврит&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Arabic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�раб�ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Syriac&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сирий�ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Thaana&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Таана&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Devanagari&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Деванагири&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bengali&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Бенгаль�ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Gurmukhi&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Гурмукхи&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Gujarati&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Гуджарати&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Oriya&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ори�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tamil&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Тамиль�ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Telugu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Телугу&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Kannada&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Каннада&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Malayalam&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Малай�лам&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sinhala&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сингаль�ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Thai&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Тай�ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Lao&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Лао��ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tibetan&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Тибет�ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Myanmar&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Мь�нма&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Georgian&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Грузин�ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Khmer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Кхмер�ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simplified Chinese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Китай�ка� упрощенна�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Traditional Chinese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Китай�ка� традиционна�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Japanese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Япон�ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Korean&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Корей�ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Vietnamese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вьетнам�ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symbol&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Символьна�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ogham&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Огамиче�ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Runic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Руниче�ка�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;N&amp;apos;Ko&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;##&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFontDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Font&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Шрифт&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Font st&amp;amp;yle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;�ачертание&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Размер&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Effects&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Эффекты&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stri&amp;amp;keout&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Зачёр&amp;amp;кнутый&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Underline&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;П&amp;amp;одчёркнутый&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sample&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Пример&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select Font&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выбор шрифта&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wr&amp;amp;iting System&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Си�тема пи�ьма&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFtp&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Узел %1 найден&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Узел найден&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;У�тановлено �оединение � узлом %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Соединение � узлом у�тановлено&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to %1 closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Соединение � %1 закрыто&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Соединение закрыто&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Узел %1 не найден&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В �оединении � узлом %1 отказано&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection timed out to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Врем� на �оединение � узлом %1 и�текло&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тна� ошибка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connecting to host failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь �оединить�� � узлом:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Login failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь авторизовать��:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Listing directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь прочитать каталог:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Changing directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь �менить каталог:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Downloading file failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь загрузить файл:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Uploading file failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь отгрузить файл:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Removing file failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь удалить файл:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Creating directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь �оздать каталог:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Removing directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь удалить каталог:</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not connected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Соединение не у�тановлено&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused for data connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отказ в �оединении дл� передачи данных&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHostInfo&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тна� ошибка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHostInfoAgent&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Узел не найден&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown address type&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тный тип адре�а&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тна� ошибка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No host name given&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Им� узла не задано&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid hostname&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�екорректное им� узла&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHttp&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отказано в �оединении&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Узел %1 не найден&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wrong content length&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еверна� длина �одержимого&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;HTTP request failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;HTTP-запро� не удал��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Узел %1 найден&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Узел найден&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;У�тановлено �оединение � узлом %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Соединение � узлом у�тановлено&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to %1 closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Соединение � узлом %1 закрыто&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Соединение закрыто&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тна� ошибка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request aborted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запро� прерван&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No server set to connect to&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е указан �ервер дл� подключени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Server closed connection unexpectedly&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сервер неожиданно разорвал �оединение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid HTTP response header&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�екорректный HTTP-заголовок ответа&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown authentication method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тный метод авторизации&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid HTTP chunked body&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�екорректное HTTP-фрагментирование данных&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error writing response to device&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка запи�и ответа на у�трой�тво&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Требует�� авторизаци� на прок�и-�ервере&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Требует�� авторизаци�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy requires authentication&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прок�и-�ервер требует авторизацию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host requires authentication&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Узел требует авторизацию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Data corrupted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Данные повреждены&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SSL handshake failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Квитирование SSL не удало�ь&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown protocol specified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Указан неизве�тный протокол&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused (or timed out)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В �оединении отказано (или врем� ожидани� и�текло)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;HTTPS connection requested but SSL support not compiled in&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запрошено �оединение по протоколу HTTPS, но поддержка SSL не �компилирована&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHttpSocketEngine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Did not receive HTTP response from proxy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е получен HTTP-ответ от прок�и-�ервера&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error parsing authentication request from proxy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка разбора запро�а авторизации от прок�и-�ервера&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Требует�� авторизаци�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy denied connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прок�и-�ервер запретил �оединение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error communicating with HTTP proxy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка обмена данными � прок�и-�ервером HTTP&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прок�и-�ервер не найден&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В �оединении прок�и-�ервером отказано&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server connection timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Врем� на �оединение � прок�и-�ервером и�текло&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy connection closed prematurely&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Соединение � прок�и-�ервером неожиданно закрыто&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QIBaseDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка открыти� базы данных&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not start transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь начать транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно завершить транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно отозвать транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QIBaseResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to create BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно �оздать BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to write BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно запи�ать BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to open BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно открыть BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to read BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно прочитать BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not find array&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь найти ма��ив&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not get array data&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь найти данные ма��ива&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not get query info&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь найти информацию о запро�е&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not start transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь начать транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно завершить транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not allocate statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь получить ре�ур�ы дл� �оздани� выражени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь подготовить выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not describe input statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь опи�ать вход�щее выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not describe statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь опи�ать выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to close statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно закрыть выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно выполнить запро�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not fetch next item&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь получить �ледующий �лемент&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not get statement info&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь найти информацию о выражении&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QIODevice&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;До�туп запрещён&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Too many open files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Слишком много открытых файлов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No such file or directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Файл или каталог не �уще�твует&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No space left on device&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ет �вободного ме�та на у�трой�тве&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тна� ошибка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QInputContext&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XIM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Метод ввода X-�ервера&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;FEP&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Метод ввода S60 FEP&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XIM input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Метод ввода X-�ервера&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Windows input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Метод ввода Windows&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mac OS X input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Метод ввода Mac OS X&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;S60 FEP input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Метод ввода S60 FEP&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QInputDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enter a value:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Укажите значение:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLibrary&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not mmap &amp;apos;%1&amp;apos;: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь выполнить mmap &amp;apos;%1&amp;apos;: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Plugin verification data mismatch in &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Проверочна� информаци� дл� модул� &amp;apos;%1&amp;apos; не �овпадает&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not unmap &amp;apos;%1&amp;apos;: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь выполнить unmap &amp;apos;%1&amp;apos;: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin &amp;apos;%1&amp;apos; uses incompatible Qt library. (%2.%3.%4) [%5]&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Модуль &amp;apos;%1&amp;apos; и�пользует не�оме�тимую библиотеку Qt. (%2.%3.%4) [%5]&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin &amp;apos;%1&amp;apos; uses incompatible Qt library. Expected build key &amp;quot;%2&amp;quot;, got &amp;quot;%3&amp;quot;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Модуль &amp;apos;%1&amp;apos; и�пользует не�оме�тимую библиотеку Qt. Ожидает�� ключ &amp;quot;%2&amp;quot;, но получен ключ &amp;quot;%3&amp;quot;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тна� ошибка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The shared library was not found.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Динамиче�ка� библиотека не найдена.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The file &amp;apos;%1&amp;apos; is not a valid Qt plugin.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Файл &amp;apos;%1&amp;apos; - не �вл�ет�� корректным модулем Qt.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin &amp;apos;%1&amp;apos; uses incompatible Qt library. (Cannot mix debug and release libraries.)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Модуль &amp;apos;%1&amp;apos; и�пользует не�оме�тимую библиотеку Qt. (�евозможно �овме�тить релизные и отладочные библиотеки.)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot load library %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно загрузить библиотеку %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot unload library %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно выгрузить библиотеку %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot resolve symbol &amp;quot;%1&amp;quot; in %2: %3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно разрешить �имвол &amp;quot;%1&amp;quot; в %2: %3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLineEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделить в�ё&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Отменить дей�твие&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Повторить дей�твие&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cu&amp;amp;t&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Вырезать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Копировать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В&amp;amp;�тавить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Удалить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLocalServer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Name error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: �екорректное им�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: До�туп запрещён&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Address in use&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: �дре� и�пользует��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: �еизве�тна� ошибка %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLocalSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Отказано в �оединении&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Remote closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Закрыто удаленной �тороной&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Invalid name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: �екорректное им�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Socket access error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Ошибка обращени� к �окету&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Socket resource error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Ошибка выделени� ре�ур�ов �окета&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Socket operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Врем� на операцию � �окетом и�текло&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Datagram too large&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Датаграмма �лишком больша�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Connection error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Ошибка �оединени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: The socket operation is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: Операци� � �окетом не поддерживает��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: �еизве�тна� ошибка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: �еизве�тна� ошибка %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMYSQLDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to open database &amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно открыть базу данных &amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно �оединить��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно начать транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно завершить транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно отозвать транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMYSQLResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch data&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно получить данные&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно выполнить запро�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to store result&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно �охранить результат&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно подготовить выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to reset statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно �бро�ить выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно прив�зать значение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно выполнить выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind outvalues&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно прив�зать результирующие значени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to store statement results&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно �охранить результаты выполнени� выражени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute next query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно выполнить �ледующий запро�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to store next result&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно �охранить �ледующий результат&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMdiArea&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;(Untitled)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;(�еозаглавлено)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMdiSubWindow&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 - [%2]&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 - [%2]&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Закрыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Minimize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Свернуть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Во��тановить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Restore&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Во��тановить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Move&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Переме�тить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Размер&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mi&amp;amp;nimize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Свернуть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ma&amp;amp;ximize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Р&amp;amp;а�пахнуть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stay on &amp;amp;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;О�тавать�� &amp;amp;�верху&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Закрыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Maximize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ра�пахнуть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unshade&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Во��тановить из заголовка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shade&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Свернуть в заголовок&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Во��тановить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Справка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Меню&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;- [%1]&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;- [%1]&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMenu&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Закрыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Открыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Execute&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выполнить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMenuBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Actions&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Дей�тви�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMessageBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Закрыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;h3&amp;gt;About Qt&amp;lt;/h3&amp;gt;&amp;lt;p&amp;gt;This program uses Qt version %1.&amp;lt;/p&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;h3&amp;gt;О Qt&amp;lt;/h3&amp;gt;&amp;lt;p&amp;gt;Данна� программа и�пользует Qt вер�ии %1.&amp;lt;/p&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;p&amp;gt;Qt is a C++ toolkit for cross-platform application development.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt provides single-source portability across MS&amp;amp;nbsp;Windows, Mac&amp;amp;nbsp;OS&amp;amp;nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Please see &amp;lt;a href=&amp;quot;http://qt.nokia.com/products/licensing&amp;quot;&amp;gt;qt.nokia.com/products/licensing&amp;lt;/a&amp;gt; for an overview of Qt licensing.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt is a Nokia product. See &amp;lt;a href=&amp;quot;http://qt.nokia.com/&amp;quot;&amp;gt;qt.nokia.com&amp;lt;/a&amp;gt; for more information.&amp;lt;/p&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;p&amp;gt;Qt - �то ин�трументарий дл� разработки кро��платформенных приложений на C++.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt предо�тавл�ет �овме�тимо�ть на уровне и�ходных тек�тов между MS&amp;amp;nbsp;Windows, Mac&amp;amp;nbsp;OS&amp;amp;nbsp;X, Linux и в�еми попул�рными коммерче�кими вариантами Unix. Также Qt до�тупна дл� в�траиваемых у�трой�тв в виде Qt дл� Embedded Linux и Qt дл� Windows CE.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt до�тупна под трем� различными лицензи�ми, разработанными дл� удовлетворени� различных требований.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt под нашей коммерче�кой лицензией предназначена дл� развити� проприетарного/коммерче�кого программного обе�печени�, когда Вы не желаете предо�тавл�ть и�ходные тек�ты третьим �торонам, или в �лучае невозможно�ти прин�ти� у�ловий лицензий GNU LGPL вер�ии 2.1 или GNU GPL вер�ии 3.0.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt под лицензией GNU LGPL вер�ии 2.1 предназначена дл� разработки программного обе�печени� � открытыми и�ходными тек�тами или коммерче�кого программного обе�печени� при �облюдении у�ловий лицензии GNU LGPL вер�ии 2.1.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt под лицензией GNU General Public License вер�ии 3.0 предназначена дл� разработки программных приложений в тех �луча�х, когда Вы хотели бы и�пользовать такие приложени� в �очетании � программным обе�печением на у�лови�х лицензии GNU GPL � вер�ии 3.0 или е�ли Вы готовы �облюдать у�лови� лицензии GNU GPL вер�ии 3.0.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Обратите�ь к &amp;lt;a href=&amp;quot;http://qt.nokia.com/products/licensing&amp;quot;&amp;gt;qt.nokia.com/products/licensing&amp;lt;/a&amp;gt; дл� обзора лицензий Qt.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Copyright (C) 2011 Корпораци� Nokia и/или её дочерние подразделени�.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt - продукт компании Nokia. Обратите�ь к &amp;lt;a href=&amp;quot;http://qt.nokia.com/&amp;quot;&amp;gt;qt.nokia.com&amp;lt;/a&amp;gt; дл� получени� дополнительной информации.&amp;lt;/p&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;About Qt&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;О Qt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Справка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show Details...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Показать подробно�ти...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hide Details...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Скрыть подробно�ти...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMultiInputContext&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select IM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выбор режима ввода&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMultiInputContextPlugin&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multiple input method switcher&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переключатель режима множе�твенного ввода&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multiple input method switcher that uses the context menu of the text widgets&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переключатель режима множе�твенного ввода, и�пользуемый в контек�тном меню тек�товых виджетов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNativeSocketEngine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The remote host closed the connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Удалённый узел закрыл �оединение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Врем� на �етевую операцию и�текло&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Out of resources&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�едо�таточно ре�ур�ов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsupported socket operation&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Операци� � �окетом не поддерживает��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Protocol type not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Протокол не поддерживает��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid socket descriptor&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�екорректный де�криптор �окета&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network unreachable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сеть недо�тупна&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;До�туп запрещён&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Врем� на �оединение и�текло&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отказано в �оединении&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The bound address is already in use&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�дре� уже и�пользует��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The address is not available&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�дре� недо�тупен&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The address is protected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�дре� защищён&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to send a message&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно отправить �ообщение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to receive a message&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно получить �ообщение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to write&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно запи�ать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка �ети&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Another socket is already listening on the same port&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Другой �окет уже про�лушивает �тот порт&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to initialize non-blocking socket&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно инициализировать не-блочный �окет&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to initialize broadcast socket&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно инициализировать широковещательный �окет&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attempt to use IPv6 socket on a platform with no IPv6 support&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Попытка и�пользовать IPv6 на платформе, не поддерживающей IPv6&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host unreachable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Узел недо�тупен&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Datagram was too large to send&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Датаграмма �лишком больша� дл� отправки&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation on non-socket&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Операци� � не-�окетом&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тна� ошибка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The proxy type is invalid for this operation&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�екорректный тип прок�и-�ервера дл� данной операции&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessCacheBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка открыти� %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessDebugPipeBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write error writing to %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка запи�и в %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessFileBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request for opening non-local file %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запро� на открытие файла вне файловой �и�темы %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка открыти� %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write error writing to %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка запи�и в %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open %1: Path is a directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно открыть %1: Указан путь к каталогу&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read error reading from %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка чтени� из %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessFtpBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No suitable proxy found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Подход�щий прок�и-�ервер не найден&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open %1: is a directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно открыть %1: Указан путь к каталогу&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Logging in to %1 failed: authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Соединение � %1 не удало�ь: требует�� авторизаци�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error while downloading %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка в проце��е загрузки %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error while uploading %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка в проце��е отгрузки %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessHttpBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No suitable proxy found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Подход�щий прок�и-�ервер не найден&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkReply&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error downloading %1 - server replied: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка загрузки %1 - ответ �ервера: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Protocol &amp;quot;%1&amp;quot; is unknown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тный протокол &amp;quot;%1&amp;quot;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkReplyImpl&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation canceled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Операци� отменена&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QOCIDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to logon&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно авторизовать��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to initialize&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QOCIDriver&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно инициализировать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно начать транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно завершить транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно отозвать транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QOCIResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind column for batch execute&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно прив�зать �толбец дл� пакетного выполнени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute batch statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно выполнить пакетное выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to goto next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно перейти к �ледующей �троке&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to alloc statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно �оздать выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно подготовить выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to get statement type&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно определить тип выражени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно прив�зать результирующие значени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно выполнить выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QODBCDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно �оединить��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to disable autocommit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно отключить автозавершение транзакций&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно завершить транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно отозвать транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to enable autocommit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно включить автозавершение транзакций&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect - Driver doesn&amp;apos;t support all functionality required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно �оединить�� - Драйвер не поддерживает требуемый функционал&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QODBCResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QODBCResult::reset: Unable to set &amp;apos;SQL_CURSOR_STATIC&amp;apos; as statement attribute. Please check your ODBC driver configuration&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;QODBCResult::reset: �евозможно у�тановить &amp;apos;SQL_CURSOR_STATIC&amp;apos; атрибутом выражение. Проверьте на�тройки драйвера ODBC&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно выполнить выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно получить �ледующую �троку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно подготовить выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind variable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно прив�зать значение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch last&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно получить по�леднюю �троку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно получить данные&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch first&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно получить первую �троку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно получить предыдущую �троку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QObject&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid hostname&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�екорректное им� узла&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation not supported on %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Операци� не поддерживает�� дл� %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid URI: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�екорректный URI: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Socket error on %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошика �окета дл� %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remote host closed the connection prematurely on %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Удалённый узел неожиданно прервал �оединение дл� %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No host name given&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Им� узла не задано&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPPDOptionsModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Им�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Значение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPSQLDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно �оединить��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь начать транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь завершить транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь отозвать транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to subscribe&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно подпи�ать��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to unsubscribe&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно отпи�ать��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPSQLResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to create query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно �оздать запро�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно подготовить выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPageSetupWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Centimeters (cm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сантиметры (cm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Millimeters (mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Миллиметры (mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Inches (in)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Дюймы (in)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Points (pt)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Точки (pt)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Форма&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paper&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Бумага&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page size:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Размер �траницы:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Width:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ширина:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Height:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вы�ота:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paper source:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;И�точник бумаги:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Orientation&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ориентаци�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Portrait&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Книжна�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Landscape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�льбомна�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverse landscape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Перевёрнута� альбомна�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverse portrait&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Перевёрнута� книжна�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Margins&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Пол�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;top margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;верхнее поле&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;left margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;левое поле&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;right margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;правое поле&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bottom margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;нижнее поле&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPluginLoader&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тна� ошибка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin was not loaded.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Модуль не был загружен.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;locally connected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�оединено локально&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Aliases: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;П�евдонимы: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unknown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;неизве�тно&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Закрыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print all&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Печатать в�е&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print range&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Печатать диапазон&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A0 (841 x 1189 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A0 (841 x 1189 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A1 (594 x 841 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A1 (594 x 841 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A2 (420 x 594 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A2 (420 x 594 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A3 (297 x 420 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A3 (297 x 420 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A5 (148 x 210 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A5 (148 x 210 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A6 (105 x 148 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A6 (105 x 148 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A7 (74 x 105 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A7 (74 x 105 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A8 (52 x 74 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A8 (52 x 74 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A9 (37 x 52 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A9 (37 x 52 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B0 (1000 x 1414 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B0 (1000 x 1414 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B1 (707 x 1000 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B1 (707 x 1000 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B2 (500 x 707 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B2 (500 x 707 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B3 (353 x 500 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B3 (353 x 500 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B4 (250 x 353 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B4 (250 x 353 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B6 (125 x 176 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B6 (125 x 176 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B7 (88 x 125 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B7 (88 x 125 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B8 (62 x 88 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B8 (62 x 88 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B9 (44 x 62 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B9 (44 x 62 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B10 (31 x 44 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B10 (31 x 44 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;C5E (163 x 229 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;C5E (163 x 229 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DLE (110 x 220 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;DLE (110 x 220 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Folio (210 x 330 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Folio (210 x 330 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ledger (432 x 279 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ledger (432 x 279 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tabloid (279 x 432 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tabloid (279 x 432 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;US Common #10 Envelope (105 x 241 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Конверт US #10 (105x241 мм)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A4 (210 x 297 mm, 8.26 x 11.7 inches)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A4 (210 x 297 мм, 8.26 x 11.7 дюймов)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B5 (176 x 250 mm, 6.93 x 9.84 inches)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B5 (176 x 250 мм, 6.93 x 9.84 дюймов)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Executive (7.5 x 10 inches, 191 x 254 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Executive (191 x 254 мм, 7.5 x 10 дюймов)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Legal (8.5 x 14 inches, 216 x 356 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Legal (216 x 356 мм, 8.5 x 14 дюймов)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Letter (8.5 x 11 inches, 216 x 279 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Letter (216 x 279 мм, 8.5 x 11 дюймов)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print selection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделенный фрагмент&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Печать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print To File ...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Печать в файл ...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File %1 is not writable.</div><div class='add'>+Please choose a different file name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 недо�тупен дл� запи�и.</div><div class='add'>+Выберите другое им� файла.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 already exists.</div><div class='add'>+Do you want to overwrite it?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 уже �уще�твует.</div><div class='add'>+Хотите заменить его?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Файл �уще�твует&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;qt&amp;gt;Do you want to overwrite it?&amp;lt;/qt&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;qt&amp;gt;Хотите заменить?&amp;lt;/qt&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is a directory.</div><div class='add'>+Please choose a different file name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 - �то каталог.</div><div class='add'>+Выберите другое им� файла.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The &amp;apos;From&amp;apos; value cannot be greater than the &amp;apos;To&amp;apos; value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Значение &amp;apos;от&amp;apos; не может быть больше значени� &amp;apos;до&amp;apos;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A0&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A6&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A6&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A7&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A7&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A8&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A8&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A9&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A9&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B0&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B6&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B6&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B7&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B7&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B8&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B8&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B9&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B9&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B10&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B10&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;C5E&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;C5E&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DLE&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;DLE&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Executive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Executive&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Folio&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Folio&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ledger&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ledger&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Legal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Legal&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Letter&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Letter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tabloid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tabloid&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;US Common #10 Envelope&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;US Common #10 Envelope&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Custom&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Пользователь�кий&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Options &amp;gt;&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Параметры &amp;gt;&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Options &amp;lt;&amp;lt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Параметры &amp;lt;&amp;lt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print to File (PDF)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Печать в файл (PDF)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print to File (Postscript)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Печать в файл (Postscript)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Local file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Локальный файл&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write %1 file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запи�ь %1 файла&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Печать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintPreviewDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1%&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1%&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print Preview&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Про�мотр печати&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Next page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Следующа� �траница&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Previous page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Предыдуща� �траница&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;First page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Перва� �траница&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Last page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;По�ледн�� �траница&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fit width&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;По ширине&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fit page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�а в�ю �траницу&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom in&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Увеличить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Уменьшить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Portrait&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Книжна�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Landscape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�льбомна�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show single page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Показать одну �траницу&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show facing pages&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Показать титульные �траницы&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show overview of all pages&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Показать обзор в�ех �траниц&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Печать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page setup&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Параметры �траницы&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Export to PDF&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Эк�порт в PDF&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Export to PostScript&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Эк�порт в Postscript&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page Setup&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Параметры �траницы&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintPropertiesWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Форма&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Страница&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Advanced&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Дополнительно&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintSettingsOutput&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Форма&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copies&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Копии&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print range&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Диапазон печати&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print all&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�е&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pages from&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Страницы от&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;to&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;до&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Selection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделенный фрагмент&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Output Settings&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�а�тройки вывода&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copies:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Количе�тво копий:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Collate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Разобрать про копи�м&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverse&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Обратный пор�док&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Options&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Параметры&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Color Mode&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Режим цвета&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Color&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Цвет&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Grayscale&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Оттенки �ерого&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duplex Printing&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Дву�торонн�� печать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;None&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ет&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Long side&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;По длинной �тороне&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Short side&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;По короткой �тороне&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Форма&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Printer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Принтер&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Name:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;�азвание:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;P&amp;amp;roperties&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;С&amp;amp;вой�тва&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Location:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ра�положение:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Preview&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Про�мотр&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Тип:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Output &amp;amp;file:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вывод в &amp;amp;файл:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QProcess&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open input redirection for reading&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь открыть перенаправление ввода дл� чтени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open output redirection for writing&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь открыть перенаправление вывода дл� запи�и&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Resource error (fork failure): %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка выделени� ре�ур�ов (�бой fork): %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Process operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Врем� на операцию � проце��ом и�текло&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error reading from process&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка получени� данных от проце��а&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error writing to process&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка отправки данных проце��у&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Process crashed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Проце�� завершил�� � ошибкой&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No program defined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Программа не указана&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Process failed to start: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь запу�тить проце��: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QProgressDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отмена&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPushButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Открыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QRadioButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отметить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QRegExp&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;no error occurred&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ошибки от�ут�твуют&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;disabled feature used&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;и�пользование отключённых возможно�тей&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bad char class syntax&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;неправильный �интак�и� кла��а �имволов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bad lookahead syntax&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;неправильный предварительный �интак�и�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bad repetition syntax&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;неправильный �интак�и� повторени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid octal value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;некорректное во�ьмеричное значение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;missing left delim&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;от�ут�твует левый разделитель&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unexpected end&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;неожиданный конец&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;met internal limit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;до�тигнуто внутреннее ограничение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid interval&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;некорректный интервал&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid category&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;некорректна� категори�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLite2Driver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка открыти� базы данных&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно начать транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно завершить транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно отозвать транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLite2Result&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch results&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно получить результаты&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно выполнить выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLiteDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка открыти� базы данных&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error closing database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка закрыти� базы данных&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно начать транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно завершить транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно отозвать транзакцию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLiteResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch row&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно получить �троку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно выполнить выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to reset statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно �бро�ить выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind parameters&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно прив�зать параметр&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Parameter count mismatch&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Количе�тво параметров не �овпадает&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;От�ут�твует запро�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptBreakpointsModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ID&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ID&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Размещение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Condition&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;У�ловие&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore-count&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Пропу�тить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Single-shot&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Один раз&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hit-count&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Попаданий&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptBreakpointsWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ова�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Удалить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebugger&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go to Line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Перейти к �троке&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Строка:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Interrupt&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прервать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift+F5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift+F5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Continue&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Продолжить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step Into&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Войти в&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F11&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F11&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step Over&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Перейти через&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F10&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F10&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step Out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выйти из функции&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift+F11&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift+F11&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Run to Cursor&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выполнить до кур�ора&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl+F10&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl+F10&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Run to New Script&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выполнить до нового �ценари�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Toggle Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;У�тановить/убрать точку о�танова&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F9&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F9&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Debug Output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Очи�тить отладочный вывод&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Error Log&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Очи�тить журнал ошибок&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Console&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Очи�тить кон�оль&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Find in Script...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;�айти в �ценарии...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl+F&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl+F&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find &amp;amp;Next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�айти &amp;amp;�ледующее&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find &amp;amp;Previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�айти &amp;amp;предыдущее&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift+F3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift+F3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl+G&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl+G&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Debug&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отладка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebuggerCodeFinderWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Закрыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Предыдущий&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Следующий&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Case Sensitive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Учитывать реги�тр&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Whole words&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Слова целиком&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;img src=&amp;quot;:/qt/scripttools/debugging/images/wrap.png&amp;quot;&amp;gt;&amp;amp;nbsp;Search wrapped&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;img src=&amp;quot;:/qt/scripttools/debugging/images/wrap.png&amp;quot;&amp;gt;&amp;amp;nbsp;Пои�к � начала&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebuggerLocalsModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�азвание&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Значение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebuggerStackModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Level&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Уровень&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�азвание&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Размещение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Toggle Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;У�тановить/убрать точку о�танова&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Disable Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Убрать точку о�танова&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enable Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;У�тановить точку о�танова&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Breakpoint Condition:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;У�ловие точки о�танова:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptEngineDebugger&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Loaded Scripts&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Загруженные �ценарии&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Breakpoints&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Точки о�танова&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stack&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Стек&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Locals&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Локальные переменные&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Console&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Кон�оль&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Debug Output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отладочный вывод&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error Log&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Журнал ошибок&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Search&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Пои�к&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вид&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Qt Script Debugger&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отладчик �ценариев Qt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptNewBreakpointWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Закрыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScrollBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll here&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прокрутить �юда&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;К левой границе&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вверх&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;К правой границе&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bottom&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вниз&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�а �траницу влево&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�а �траницу вверх&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�а �траницу вправо&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�а �траницу вниз&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прокрутить влево&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прокрутить вверх&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прокрутить вправо&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прокрутить вниз&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�а �троку вверх&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Position&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Положение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�а �троку вниз&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSharedMemory&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: create size is less then 0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: размер меньше нул�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: невозможно заблокировать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to unlock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: невозможно разблокировать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: до�туп запрещён&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: already exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: уже �уще�твует&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: doesn&amp;apos;t exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: не �уще�твует&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: out of resources&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: недо�таточно ре�ур�ов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: неизве�тна� ошибка %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: key is empty&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: пу�той ключ&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: ftok failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: ошибка ftok&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to make key&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: невозможно �оздать ключ&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: doesn&amp;apos;t exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: не �уще�твует&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: UNIX key file doesn&amp;apos;t exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: �пецифиче�кий ключ UNIX не �уще�твует&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: system-imposed size restrictions&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: �и�темой наложены ограничени� на размер&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: not attached&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: не приложенный&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: invalid size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: некорректный размер&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: key error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: некорректный ключ&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: size query failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: не удало�ь запро�ить размер&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to set key on lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: невозможно у�тановить ключ на блокировку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QShortcut&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Space&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Пробел&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Esc&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Esc&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tab&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Backtab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Обратна� табул�ци�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Backspace&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Backspace&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Return&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Возврат&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enter&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ввод&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ins&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ins&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Del&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Del&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Пауза&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ра�печатать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SysReq&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;SysReq&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Home&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Главный&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;End&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Завершить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Влево&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вверх&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вправо&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вниз&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PgUp&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;PgUp&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PgDown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;PgDown&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;CapsLock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;CapsLock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;NumLock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;NumLock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ScrollLock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ScrollLock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Меню&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Справка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�азад&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вперёд&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stop&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;О�тановить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Refresh&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Обновить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Тише&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume Mute&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выключить звук&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Громче&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bass Boost&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;У�иление ба�ов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bass Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Увеличить ба�ы&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bass Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Уменьшить ба�ы&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Treble Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Увеличить ВЧ&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Treble Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Уменьшить ВЧ&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Play&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Во�произведение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Stop&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;О�тановить во�произведение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Во�произве�ти предыдущее&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Во�произве�ти �ледующее&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Record&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запи�ь&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Favorites&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Избранное&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Search&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Пои�к&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Standby&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Режим ожидани�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Открыть URL&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch Mail&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Почта&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch Media&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Проигрыватель&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (0)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запу�тить (0)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запу�тить (1)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (2)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запу�тить (2)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (3)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запу�тить (3)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (4)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запу�тить (4)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (5)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запу�тить (5)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (6)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запу�тить (6)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (7)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запу�тить (7)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (8)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запу�тить (8)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (9)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запу�тить (9)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (A)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запу�тить (A)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (B)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запу�тить (B)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (C)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запу�тить (C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (D)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запу�тить (D)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (E)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запу�тить (E)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (F)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запу�тить (F)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Monitor Brightness Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Увеличить �рко�ть монитора&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Monitor Brightness Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Уменьшить �рко�ть монитора&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Light On/Off&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вкл./Откл. под�ветку клавиатуры&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Brightness Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Увеличить �рко�ть клавиатуры&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Brightness Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Уменьшить �рко�ть клавиатуры&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Power Off&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Откл. питание&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wake Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Про�нуть��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Eject&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Извлечь&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Screensaver&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Экранна� за�тавка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;WWW&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;WWW&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sleep&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сп�щий режим&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LightBulb&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Лампочка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shop&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Магазин&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;History&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;И�тори�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Add Favorite&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Добавить избранные&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hot Links&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ктивные ��ылки&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Adjust Brightness&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�а�троить �рко�ть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Finance&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Финан�ы&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Community&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сообще�тво&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Rewind&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Перемотка аудио назад&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;##&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Application Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Приложение �лева&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Application Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Приложение �права&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Book&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Книга&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;CD&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Компакт-ди�к&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Calculator&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Калькул�тор&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Очи�тить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Grab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Очи�тить буфер&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Закрыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Скопировать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cut&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вырезать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Display&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ди�плей&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DOS&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;DOS&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Documents&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Документы&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Spreadsheet&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Электронна� таблица&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Browser&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Браузер&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Game&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Игра&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Перейти&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;iTouch&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;iTouch&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Logoff&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выйти&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Market&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Рынок&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Meeting&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�треча&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Меню клавиатуры&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Menu PB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Меню PB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;My Sites&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Мои �айты&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;News&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ово�ти&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Home Office&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Домашний офи�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Option&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Функци�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�тавить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Phone&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Телефон&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reply&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ответить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reload&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Перезагрузить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rotate Windows&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Повернуть Windows&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rotation PB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Поворот PB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rotation KB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Поворот KB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сохранить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Send&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Передать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Spellchecker&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Проверка правопи�ани�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Split Screen&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Разделить �кран&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Support&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Поддержка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Task Panel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Панель задач&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Terminal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Терминал&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tools&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ин�трументы&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Travel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;##&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Видео&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Word Processor&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Редактор тек�та&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XFer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;XFer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom In&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Увеличить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom Out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Уменьшить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Away&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;От�ут�твует&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Messenger&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Messenger&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;WebCam&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;WebCam&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mail Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Пере�лать почту&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pictures&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Фотографии&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Music&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Музыка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Battery&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ккумул�тор&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bluetooth&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Bluetooth&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wireless&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Бе�проводной&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ultra Wide Band&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сверхширокий диапазон&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Перемотка аудио вперед&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Repeat&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Повтор аудио&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Random Play&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Во�произведение аудио в �лучайном пор�дке&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Subtitle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Подзаголовок&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Cycle Track&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Повтор аудиодорожки&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Time&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Врем�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вид&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Верхнее меню&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Suspend&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прио�тановить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hibernate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сп�щий режим&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print Screen&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Печать �крана&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Страница вверх&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Страница вниз&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Caps Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Caps Lock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Num Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Num Lock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Number Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Режим ввода цифр&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Блокировка прокрутки&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�тавить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Удалить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Escape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выход&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;System Request&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Си�темный запро�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выбрать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Да&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ет&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Контек�т1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Контек�т2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Контек�т3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Контек�т4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Call&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вызов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hangup&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Завершить вызов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Flip&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Перевернуть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Alt&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Alt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Meta&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;##&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;+&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;+&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Home Page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Главна� �траница&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSlider&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Страница влево&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Страница вверх&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Position&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Положение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Страница вправо&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Страница вниз&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSocks5SocketEngine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to proxy refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В �оединении � прок�и-�ервером отказано&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to proxy closed prematurely&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Соединение � прок�и-�ервером неожиданно закрыто&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy host not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прок�и-�ервер не найден&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to proxy timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Врем� на �оединение � прок�и-�ервером и�текло&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy authentication failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь авторизовать�� на прок�и-�ервере&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy authentication failed: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�е удало�ь авторизовать�� на прок�и-�ервере: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SOCKS version 5 protocol error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка протокола SOCKSv5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;General SOCKSv5 server failure&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка �ервере SOCKSv5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection not allowed by SOCKSv5 server&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Соединение не разрешено �ервером SOCKSv5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;TTL expired&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;TTL и�текло&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SOCKSv5 command not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Команда SOCKSv5 не поддерживает��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Address type not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Тип адре�а не поддерживает��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown SOCKSv5 proxy error code 0x%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тна� ошибка SOCKSv5 прок�и (код 0x%1)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Врем� на �етевую операцию и�текло&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSoftKeyManager&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ok&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ОК&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выбрать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Done&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Готово&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Options&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Параметры&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отмена&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Exit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выход&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSpinBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Больше&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Less&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Меньше&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSql&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Удалить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete this record?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Удалить данную запи�ь?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Да&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ет&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�тавить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Update&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Обновить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save edits?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сохранить изменени�?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отмена&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Confirm&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Подтверждение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel your edits?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отменить изменени�?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSslSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to write data: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно запи�ать данные: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to decrypt data: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно ра�шифровать данные: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error while reading: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка чтени�: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error during SSL handshake: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка квитировани� SSL: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error creating SSL context (%1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка �оздани� контек�та SSL: (%1)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid or empty cipher list (%1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еправильный или пу�той �пи�ок шифров (%1)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Private key does not certify public key, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ча�тный ключ не подтверждает общий ключ, %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error creating SSL session, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка �оздани� �е��ии SSL, %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error creating SSL session: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка �оздани� �е��ии SSL: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot provide a certificate with no key, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно предо�тавить �ертификат без ключа, %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error loading local certificate, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка загрузки локального �ертификата, %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error loading private key, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка загрузки закрытого ключа, %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ет ошибки&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The issuer certificate could not be found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно найти �ертификат издател�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate signature could not be decrypted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно ра�шифровать подпи�ь �ертификата&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The public key in the certificate could not be read&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно прочитать общий ключ �ертификата&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The signature of the certificate is invalid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еверна� подпи�ь �ертификата&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate is not yet valid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сертификат еще не дей�твует&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate has expired&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сертификат и�тек&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate&amp;apos;s notBefore field contains an invalid time&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Поле notBefore �ертификата �одержит неверное врем�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate&amp;apos;s notAfter field contains an invalid time&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Поле notAfter �ертификата �одержит неверное врем�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate is self-signed, and untrusted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сертификаты � внутренней подпи�ью и не проверены&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root certificate of the certificate chain is self-signed, and untrusted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Корневой �ертификат цепочки �ертификатов имеет внутреннюю подппи�ь и не проверен&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The issuer certificate of a locally looked up certificate could not be found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно найти �ертификат издател� локального �ертификата&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No certificates could be verified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно проверить �ертификаты&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;One of the CA certificates is invalid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Один из �ертификатов центра �ертификации неверный&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The basicConstraints path length parameter has been exceeded&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Превышено значение параметра длины пути basicConstraints&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The supplied certificate is unsuitable for this purpose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Пред�тавленный �ертификат непригоден дл� �той цели&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root CA certificate is not trusted for this purpose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Корневой �ертификат ЦС не проверен дл� �той цели&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root CA certificate is marked to reject the specified purpose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Корневой �ертификат ЦС отмечен дл� отклонени� дл� указанной цели&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Текущий кандидат �ертификат издател� отклонен, так как название темы не �овпадает � названием издател� текущего �ертификата&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Текущий кандидат �ертификат издател� отклонен, так как его название издател� и �ерийный номер не �овпадают � идентификатором ключа текущего �ертификата&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The peer did not present any certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сертификат не пред�тавлен&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The host name did not match any of the valid hosts for this certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Им� владельца не �овпадает � допу�тимыми владельцами �ертификата&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тна� ошибка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QStateMachine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Missing initial state in compound state &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;От�ут�твует и�ходное �о�то�ние в �о�тавном �о�то�нии &amp;apos;%1&amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Missing default state in history state &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;От�ут�твует �о�то�ние по умолчанию в и�ториче�ком �о�то�нии &amp;apos;%1&amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No common ancestor for targets and source of transition from state &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ет общего предка дл� целей и и�точника перехода из �о�то�ни� &amp;apos;%1&amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тна� ошибка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSystemSemaphore&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: does not exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: не �уще�твует&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: out of resources&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: недо�таточно ре�ур�ов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: до�туп запрещён&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: already exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: уже �уще�твует&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: неизве�тна� ошибка %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTDSDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to open connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно открыть �оединение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to use database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно и�пользовать базу данных&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTabBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прокрутить влево&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прокрутить вправо&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTcpServer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation on socket is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Операци� � �окетом не поддерживает��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTextControl&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Отменить дей�твие&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Повторить дей�твие&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cu&amp;amp;t&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Вырезать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;amp;Копировать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy &amp;amp;Link Location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Скопировать &amp;amp;адре� ��ылки&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В&amp;amp;�тавить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Удалить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделить в�ё&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QToolButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Press&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ажать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Открыть&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUdpSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;This platform does not support IPv6&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Данна� платформа не поддерживает IPv6&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUndoGroup&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отменить дей�твие&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Повторить дей�твие&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUndoModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;empty&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;пу�то&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUndoStack&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Отменить дей�твие&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Повторить дей�твие&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUnicodeControlCharacterMenu&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LRM Left-to-right mark&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;LRM Признак пи�ьма �лева направо&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;RLM Right-to-left mark&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;RLM Признак пи�ьма �права налево&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ZWJ Zero width joiner&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ZWJ Объедин�ющий �имвол нулевой ширины&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ZWNJ Zero width non-joiner&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ZWNJ �е объедин�ющий �имвол нулевой ширины&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ZWSP Zero width space&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ZWSP Пробел нулевой ширины&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LRE Start of left-to-right embedding&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;LRE �ачать в�траивание �лева направо&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;RLE Start of right-to-left embedding&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;RLE �ачать в�траивание �права налево&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LRO Start of left-to-right override&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;LRE �ачать замену �лева направо&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;RLO Start of right-to-left override&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;RLE �ачать замену �права налево&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PDF Pop directional formatting&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;##&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert Unicode control character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�тавить управл�ющий �имвол Unicode&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWebFrame&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request cancelled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запро� отменён&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request blocked&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Запро� блокирован&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot show URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно отобразить URL&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Frame load interrupted by policy change&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Загрузка фрейма прервана изменением политики&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot show mimetype&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно отобразить тип MIME&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File does not exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Файл не �уще�твует&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWebPage&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Submit&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;default label for Submit buttons in forms on web pages&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Отправить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Submit&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Submit (input element) alt text for &amp;lt;input&amp;gt; elements with no alt, title, or value&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Отправить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reset&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;default label for Reset buttons in forms on web pages&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Сбро�ить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Choose File&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;title for file button used in HTML forms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Обзор...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No file selected&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;text to display in file button used in HTML forms when no file is selected&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Файл не указан&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open in New Window&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open in New Window context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Открыть в новом окне&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save Link...&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Download Linked File context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Сохранить по ��ылке как...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy Link&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Copy Link context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Копировать адре� ��ылки&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open Image&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open Image in New Window context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Открыть изображение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save Image&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Download Image context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Сохранить изображение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy Image&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Copy Link context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Копировать изображение в буффер обмена&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open Frame&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open Frame in New Window context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Открыть фрейм&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Copy context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Копировать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go Back&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Back context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�азад&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go Forward&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Forward context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Вперёд&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stop&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Stop context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;О�тановить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reload&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Reload context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Обновить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cut&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Cut context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Вырезать&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paste&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Paste context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;В�тавить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No Guesses Found&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;No Guesses Found context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�еверное �лово&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Ignore Spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Пропу�тить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Add To Dictionary&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Learn Spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Добавить в �ловарь&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Search The Web&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Search The Web context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;И�кать в Интернет&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Look Up In Dictionary&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Look Up in Dictionary context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;И�кать в �ловаре&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open Link&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open Link context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Открыть ��ылку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Ignore Grammar context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Пропу�тить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Spelling&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Spelling and Grammar context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Орфографи�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show Spelling and Grammar&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;menu item title&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Показать панель проверки правопи�ани�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hide Spelling and Grammar&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;menu item title&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Скрыть панель проверки правопи�ани�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check Spelling&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Check spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Проверка орфографии&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check Spelling While Typing&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Check spelling while typing context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Провер�ть орфографию при наборе тек�та&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check Grammar With Spelling&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Check grammar with spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Провер�ть грамматику � орфографией&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fonts&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Font context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Шрифты&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bold&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Bold context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Жирный&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Italic&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Italic context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Кур�ив&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Underline&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Underline context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Подчёркнутый&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Outline&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Outline context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Перечёркнутый&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Direction&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Writing direction context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�аправление пи�ьма&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Text Direction&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Text direction context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�аправление тек�та&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Default&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Default writing direction context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;По умолчанию&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left to Right&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Left to Right context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Слева направо&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right to Left&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Right to Left context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Справа налево&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Loading...&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller status message when the media is loading&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Загрузка...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Live Broadcast&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller status message when watching a live broadcast&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Потоковое вещание&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Element&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�удио-�лемент&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video Element&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Видео�лемент&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mute Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Кнопка &amp;quot;Отключить звук&amp;quot;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unmute Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Кнопка &amp;quot;Включить звук&amp;quot;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Play Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Кнопка во�произведени�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Кнопка &amp;quot;Пауза&amp;quot;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Slider&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Регул�тор&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Slider Thumb&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Метка регул�тора&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rewind Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Кнопка &amp;quot;Перемотка назад&amp;quot;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Return to Real-time Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Кнопка &amp;quot;Вернуть в реальное врем�&amp;quot;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Elapsed Time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Прошедшее врем�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remaining Time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;О�тавшее�� врем�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Status Display&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Экран �о�то�ни�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fullscreen Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Кнопка &amp;quot;�а ве�ь �кран&amp;quot;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek Forward Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Кнопка &amp;quot;Пои�к вперед&amp;quot;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek Back Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Кнопка &amp;quot;Пои�к назад&amp;quot;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio element playback controls and status display&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Органы управлени� во�произведением аудио-�лементов и отображением �о�то�ни�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video element playback controls and status display&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Органы управлени� во�произведением видео�лементов и отображением �о�то�ни�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mute audio tracks&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Отключить звук аудиодорожек&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unmute audio tracks&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Включить звук аудиодорожек&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Begin playback&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�ачать во�произведение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause playback&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Во�произведение по�ле паузы&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Movie time scrubber&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Очи�титель времени фильма&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Movie time scrubber thumb&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Метка очи�тител� времени фильма&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rewind movie&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Перемотать фильм назад&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Return streaming movie to real-time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Вернуть потоковое во�произведение фильма в реальное врем�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Current movie time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Врем� текущего фильма&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remaining movie time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;О�тавшее�� врем� фильма&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Current movie status&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Со�то�ние текущего фильма&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Play movie in full-screen mode&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Во�произведение фильма в режиме отображени� на ве�ь �кран&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek quickly back&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Бы�трый пои�к назад&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek quickly forward&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Бы�трый пои�к вперед&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Indefinite time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�еопределенное врем�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 days %2 hours %3 minutes %4 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1 дн. %2 ч. %3 мин. %4 �ек.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 hours %2 minutes %3 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1 ч. %2 мин. %3 �ек.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 minutes %2 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1 мин. %2 �ек.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1 �ек.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Inspect&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Inspect Element context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Проверить&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No recent searches&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Label for only item in menu that appears when clicking on the search field image, when no searches have been performed&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;И�тори� пои�ка пу�та&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Recent searches&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;label for first item in the menu that appears when clicking on the search field image, used as embedded menu title&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;И�тори� пои�ка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear recent searches&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;menu item in Recent Searches menu that empties menu&amp;apos;s contents&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Очи�тить и�торию пои�ка&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Unknown filesize FTP directory listing item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тно&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Web Inspector - %2&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 (%2x%3 pixels)&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Title string for images&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1 (%2x%3 px)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bad HTTP request&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�екорректный HTTP-запро�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;This is a searchable index. Enter search keywords: &lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;text that appears at the start of nearly-obsolete web pages in the form of a &amp;apos;searchable index&amp;apos;&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;Индек� пои�ка. Введите ключевые �лова дл� пои�ка: &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll here&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прокрутить �юда&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;К левой границе&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вверх&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;К правой границе&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bottom&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вниз&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�а �траницу влево&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�а �траницу вверх&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�а �траницу вправо&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�а �траницу вниз&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прокрутить влево&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прокрутить вверх&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прокрутить вправо&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Прокрутить вниз&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message numerus="yes"&gt;</div><div class='add'>+            &lt;source&gt;%n file(s)&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;number of chosen file&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;</div><div class='add'>+                &lt;numerusform&gt;%n файл(а)&lt;/numerusform&gt;</div><div class='add'>+                &lt;numerusform&gt;%n файла&lt;/numerusform&gt;</div><div class='add'>+                &lt;numerusform&gt;%n файлов&lt;/numerusform&gt;</div><div class='add'>+            &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Alert - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;JavaScript: Предупреждение - %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Confirm - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;JavaScript: Подтверждение - %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Prompt - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;JavaScript: Запро� - %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Problem - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;JavaScript: Проблема - %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The script on this page appears to have a problem. Do you want to stop the script?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Сбой выполнени� �ценари� на данной �транице. Желаете о�тановить выполение �ценари�?&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the next character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переме�тить указатель к �ледующему �имволу&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the previous character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переме�тить указатель к предыдущему �имволу&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the next word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переме�тить указатель к �ледующему �лову&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the previous word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переме�тить указатель к предыдущему �лову&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the next line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переме�тить указатель на �ледующую �троку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the previous line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переме�тить указатель на предыдущую �троку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the start of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переме�тить указатель в начало �троки&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the end of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переме�тить указатель в конец �троки&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the start of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переме�тить указатель в начало блока&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the end of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переме�тить указатель в конец блока&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the start of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переме�тить указатель в начало документа&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the end of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переме�тить указатель в конец документа&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select all&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделить в�ё&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the next character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделить до �ледующего �имвола&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the previous character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделить до предыдущего �имвола&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the next word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделить до �ледующего �лова&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the previous word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделить до предыдущего �лова&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the next line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделить до �ледующей �троки&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the previous line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделить до предыдущей �троки&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the start of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделить до начала �троки&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the end of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделить до конца �троки&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the start of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделить до начала блока&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the end of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделить до конца блока&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the start of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделить до начала документа&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the end of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выделить до конца документа&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete to the start of the word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Удалить до начала �лова&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete to the end of the word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Удалить до конца �лова&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert a new paragraph&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�тавить новый параграф&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert a new line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�тавить новую �троку&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paste and Match Style&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�тавить, �охранив �тиль&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remove formatting&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Удалить форматирование&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Strikethrough&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Зачёркнутый&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Subscript&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Под�трочный&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Superscript&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�ад�трочный&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert Bulleted List&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�тавить маркированный �пи�ок&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert Numbered List&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�тавить нумерованный �пи�ок&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Indent&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Увеличить от�туп&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Outdent&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Уменьшить от�туп&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Center&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;По центру&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Justify&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;По ширине&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Align Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;По левому краю&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Align Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;По правому краю&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWhatsThisAction&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;What&amp;apos;s This?&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;*&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWizard&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt; &amp;amp;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Finish&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go Back&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Continue&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Commit&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Done&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Next&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Next &amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWorkspace&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Restore&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Move&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mi&amp;amp;nimize&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ma&amp;amp;ximize&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stay on &amp;amp;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Minimize&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore Down&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sh&amp;amp;ade&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 - [%2]&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Unshade&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QXml&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;no error occurred&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error triggered by consumer&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unexpected end of file&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;more than one document type definition&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing element&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;tag mismatch&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing content&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unexpected character&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid name for processing instruction&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;version expected while reading the XML declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;wrong value for standalone declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing document type definition&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;letter is expected&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing comment&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing reference&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;internal general entity reference not allowed in DTD&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;external parsed general entity reference not allowed in attribute value&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;external parsed general entity reference not allowed in DTD&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unparsed entity reference in wrong context&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;recursive entities&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error in the text declaration of an external entity&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;encoding declaration or standalone declaration expected while reading the XML declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;standalone declaration expected while reading the XML declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QXmlPatternistCLI&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning in %1, at line %2, column %3: %4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Предупреждение в %1, в �троке %2, �толбце%3: %4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning in %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Предупреждение в %1: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�тное ме�тоположение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error %1 in %2, at line %3, column %4: %5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка %1 в %2, в �троке %3, �толбце %4: %5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error %1 in %2: %3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка %1 в %2: %3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QXmlStream&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Extra content at end of document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid entity value.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid XML character.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sequence &amp;apos;]]&amp;gt;&amp;apos; not allowed in content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace prefix &amp;apos;%1&amp;apos; not declared&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute redefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unexpected character &amp;apos;%1&amp;apos; in public id literal.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid XML version string.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsupported XML version.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid encoding name.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Encoding %1 is unsupported&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Standalone accepts only yes or no.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid attribute in XML declaration.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Premature end of document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Expected &lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;, but got &amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unexpected &amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Expected character data.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Recursive entity detected.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Start tag expected.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XML declaration not at start of document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;NDATA in parameter entity declaration.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid processing instruction name.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid processing instruction name.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Illegal namespace declaration.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid XML name.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Opening and ending tag mismatch.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reference to unparsed entity &amp;apos;%1&amp;apos;.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Entity &amp;apos;%1&amp;apos; not declared.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reference to external entity &amp;apos;%1&amp;apos; in attribute value.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid character reference.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Encountered incorrectly encoded content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The standalone pseudo attribute must appear after the encoding.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid PUBLIC identifier.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QtXmlPatterns&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one component must be present.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Должна при�ут�твовать как минимум одна компонента.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid value of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 не �вл�ет�� правильным значением типа %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When casting to %1 from %2, the source value cannot be %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;При преобразовании %2 в %1 и�ходное значение не может быть %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Булево значение не может быть вычи�лено дл� по�ледовательно�тей, которые �одержат два и более атомарных значени�.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The data of a processing instruction cannot contain the string %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Данные обрабатываемой ин�трукции не могут �одержать �троку &amp;apos;%1&amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 некоррекно дл� %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid XML 1.0 character.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Символ %1 недопу�тим дл� XML 1.0.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 was called.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 было вызвано.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In the replacement string, %1 must be followed by at least one digit when not escaped.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В замещаемой �троке &amp;apos;%1&amp;apos; должно �опровождать�� как минимум одной цифрой, е�ли не�кранировано.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In the replacement string, %1 can only be used to escape itself or %2, not %3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В замещаемой �троке �имвол &amp;apos;%1&amp;apos; может и�пользовать�� только дл� �кранировани� �амого �еб� или &amp;apos;%2&amp;apos;, но не &amp;apos;%3&amp;apos;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 matches newline characters&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �оответ�твует �имволам конца �троки&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Matches are case insensitive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Соответ�тви� реги�тронезави�имы&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid regular expression pattern: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 - неверный шаблон регул�рного выражени�: %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It will not be possible to retrieve %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Будет невозможно во��тановить %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The default collection is undefined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�абор по умолчанию не определён&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 cannot be retrieved&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 не может быть во��тановлен&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The item %1 did not match the required type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Элемент %1 не �оответ�твует необходимому типу %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an unknown schema type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �вл�ет�� �хемой неизве�тного типа.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A template with name %1 has already been declared.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only one %1 declaration can occur in the query prolog.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Только одно объ�вление %1 может при�ут�твовать в прологе запро�а.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The initialization of variable %1 depends on itself&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Инициализаци� переменной %1 зави�ит от �еб� �амой&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The variable %1 is unused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переменна� %1 не и�пользует��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Version %1 is not supported. The supported XQuery version is 1.0.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Вер�и� %1 не поддерживает��. Поддерживает�� XQuery вер�ии 1.0.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No function with signature %1 is available&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Функци� � �игнатурой %1 от�ут�твует&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It is not possible to redeclare prefix %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно переопределить префик� %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Prefix %1 is already declared in the prolog.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Префик� %1 уже объ�влен в прологе.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name of an option must have a prefix. There is no default namespace for options.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�азвание опции должно �одержать префик�. �ет про�тран�тва имён по умолчанию дл� опций.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The Schema Import feature is not supported, and therefore %1 declarations cannot occur.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Возможно�ть импорта �хем не поддерживает��, �ледовательно, объ�влений %1 быть не должно.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The target namespace of a %1 cannot be empty.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Целевое про�тран�тво имён %1 не может быть пу�тым.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The module import feature is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Возможно�ть импорта модулей не поддерживает��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Про�тран�тво имён пользователь�кой функции в модуле библиотеки должен �оответ�твовать про�тран�тву имён модул�. Другими �ловами, он должен быть %1 вме�то %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A function already exists with the signature %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Функци� � �игнатурой %1 уже �уще�твует.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No external functions are supported. All supported functions can be used directly, without first declaring them as external&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Внешние функции не поддерживают��. В�е поддерживаемые функции могут и�пользовать�� напр�мую без первоначального объ�влени� их в каче�тве внешних&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The %1-axis is unsupported in XQuery&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;О�ь %1 не поддерживает�� в XQuery&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace URI cannot be the empty string when binding to a prefix, %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;URI про�тран�тва имён не может быть пу�той �трокой при �в�зывании � префик�ом %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid namespace URI.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 - неверный URI про�тран�тва имён.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It is not possible to bind to the prefix %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно �в�зать � префик�ом %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Two namespace declaration attributes have the same name: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Два атрибута объ�влени� про�тран�тв имён имеют одинаковое им�: %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace URI must be a constant and cannot use enclosed expressions.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;URI про�тран�тва имён должно быть кон�тантой и не может �одержать выражений.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �вл�ет�� объ�влением атрибута вне обла�ти объ�влений. Имейте в виду, возможно�ть импорта �хем не поддерживает��.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;empty&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;пу�то&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;zero or one&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;нуль или один&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;exactly one&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ровно один&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;one or more&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;один или более&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;zero or more&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;нуль или более&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The focus is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Фоку� не определён.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An attribute by name %1 has already been created.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�трибут � именем %1 уже �уще�твует.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network timeout.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Врем� ожидани� �ети и�текло.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 can&amp;apos;t be serialized because it appears outside the document element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Элемент %1 не может быть �ериализован, так как при�ут�твует вне документа.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Year %1 is invalid because it begins with %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Год %1 неверен, так как начинает�� � %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Day %1 is outside the range %2..%3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;День %1 вне диапазона %2..%3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Month %1 is outside the range %2..%3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ме��ц %1 вне диапазона %2..%3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Overflow: Can&amp;apos;t represent date %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переполнение: �е удает�� пред�тавить дату %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Day %1 is invalid for month %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;День %1 неверен дл� ме��ца %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; &lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Врем� 24:%1:%2.%3 неверно. 24 ча�а, но минуты, �екунды и/или милли�екунды отличны от 0; &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Time %1:%2:%3.%4 is invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Врем� %1:%2:%3.%4 неверно.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Overflow: Date can&amp;apos;t be represented.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Переполнение: невозможно пред�тавить дату.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one time component must appear after the %1-delimiter.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Как минимум одна компонента времени должна �ледовать за разделителем &amp;apos;%1&amp;apos;.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dividing a value of type %1 by %2 (not-a-number) is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Деление чи�ла типа %1 на %2 (не чи�ловое выражение) недопу�тимо.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Деление чи�ла типа %1 на %2 или %3 (плю� или мину� нуль) недопу�тимо.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Умножение чи�ла типа %1 на %2 или %3 (плю�-мину� бе�конечно�ть) недопу�тимо.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A value of type %1 cannot have an Effective Boolean Value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Значение типа %1 не может быть булевым значением.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value %1 of type %2 exceeds maximum (%3).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Значение %1 типа %2 больше мак�имума (%3).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value %1 of type %2 is below minimum (%3).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Значение %1 типа %2 меньше минимума (%3).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A value of type %1 must contain an even number of digits. The value %2 does not.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Значение типа %1 должно �одержать четное количе�тво цифр. Значение %2 �тому требованию не удовлетвор�ет.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not valid as a value of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Значение %1 некорректно дл� типа %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operator %1 cannot be used on type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Оператор %1 не может и�пользовать�� дл� типа %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operator %1 cannot be used on atomic values of type %2 and %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Оператор %1 не может и�пользовать�� дл� атомарных значений типов %2 и %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace URI in the name for a computed attribute cannot be %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;URI про�тран�тва имён в названии ра��читываемого атрибута не может быть %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name for a computed attribute cannot have the namespace URI %1 with the local name %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�азвание ра�читываемого атрибута не может иметь URI про�тран�тва имён %1 � локальным именем %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type error in cast, expected %1, received %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка типов в преобразовании, ожидало�ь %1, получено %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;При преобразовании в %1 или производные от него типы и�ходное значение должно быть того же типа или �троковым литералом. Тип %2 недопу�тим.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A comment cannot contain %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Комментарий не может �одержать %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A comment cannot end with a %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Комментарий не может оканчивать�� на %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Узел-атрибут не может быть потомком узла-документа. �трибут %1 неуме�тен.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A library module cannot be evaluated directly. It must be imported from a main module.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Модуль библиотеки не может и�пользовать�� напр�мую. Он должен быть импортирован из о�новного модул�.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No template by name %1 exists.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Шаблон � именем %1 от�ут�твует.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Значение типа %1 не может быть у�ловием. У�ловием могут �вл�ть�� чи�ловой и булевый типы.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A positional predicate must evaluate to a single numeric value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Позиционный предикат должен вычи�л�ть�� как чи�ловое выражение.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Целевое им� в обрабатываемой ин�трукции не может быть %1 в любой комбинации нижнего и верхнего реги�тров. Им� %2 некорректно.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 некорректное целевое им� в обрабатываемой ин�трукции. Им� должно быть значением типа %2, например: %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;По�ледн�� ча�ть пути должна �одержать узлы или атомарные значени�, но не может �одержать и то, и другое одновременно.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No namespace binding exists for the prefix %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;От�ут�твует прив�зка к про�тран�тву имён дл� префик�а %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No namespace binding exists for the prefix %1 in %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;От�ут�твует прив�зка к про�тран�тву имён дл� префик�а %1 в %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Первый аргумент %1 не может быть типа %2. Он должен быть чи�лового типа, типа xs:yearMonthDuration или типа xs:dayTimeDuration.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Первый аргумент %1 не может быть типа %2. Он должен быть типа %3, %4 или %5.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Второй аргумент %1 не может быть типа %2. Он должен быть типа %3, %4 или %5.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Е�ли оба значени� имеют региональные �мещени�, �мещени� должны быть одинаковы. %1 и %2 не одинаковы.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 must be followed by %2 or %3, not at the end of the replacement string.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;apos;%1&amp;apos; должно �опровождать�� &amp;apos;%2&amp;apos; или &amp;apos;%3&amp;apos;, но не в конце замещаемой �троки.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 and %2 match the start and end of a line.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 и %2 �оответ�твуют началу и концу �троки.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Whitespace characters are removed, except when they appear in character classes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Символы пробелов удалены, за и�ключением тех, что были в кла��ах �имволов&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid flag for regular expressions. Valid flags are:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 - неверный флаг дл� регул�рного выражени�. Допу�тимые флаги:&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Префик� не должен быть указан, е�ли первый параметр - пу�та� по�ледовательно�ть или пу�та� �трока (вне про�тран�тва имён). Был указан префик� %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Форма нормализации %1 не поддерживает��. Поддерживают�� только %2, %3, %4, %5 и пу�та�, т.е. пу�та� �трока (без нормализации).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A zone offset must be in the range %1..%2 inclusive. %3 is out of range.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Региональное �мещение должно быть в переделах от %1 до %2 включительно. %3 выходит за допу�тимые пределы.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Required cardinality is %1; got cardinality %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еобходимо %1 �лементов, получено %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Кодировка %1 неверна. Им� кодировки должно �одержать только �имволы латиницы без пробелов и должно удовлетвор�ть регул�рному выражению %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The keyword %1 cannot occur with any other mode name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ключевое �лово %1 не может в�тречать�� � любым другим названием режима.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No variable with name %1 exists&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The value of attribute %1 must be of type %2, which %3 isn&amp;apos;t.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The prefix %1 cannot be bound. By default, it is already bound to the namespace %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A variable with name %1 has already been declared.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No value is available for the external variable with name %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A stylesheet function must have a prefixed name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Функци� �тилей должна иметь им� � префик�ом.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Про�трант�во имён %1 зарезервировано, по�тому пользователь�кие функции не могут его и�пользовать. Попробуйте предопределённый префик� %2, который �уще�твует дл� подобных �итуаций.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An argument with name %1 has already been declared. Every argument name must be unique.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Е�ли функци� %1 и�пользует�� дл� �равнени� внутри шаблона, аргумент должен быть ��ылкой на переменную или �троковым литералом.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В шаблоне XSL-T первый аргумент функции %1 должен быть �троковым литералом, е�ли функци� и�пользует�� дл� �равнени�.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В шаблоне XSL-T первый аргумент функции %1 должен быть литералом или ��ылкой на переменную, е�ли функци� и�пользует�� дл� �равнени�.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, function %1 cannot have a third argument.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В шаблоне XSL-T у функции %1 не должно быть третьего аргумента.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В шаблоне XSL-T только функции %1 и %2 могут и�пользовать�� дл� �равнени�, но не %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В шаблоне XSL-T не может быть и�пользована о�ь %1 - только о�и %2 или %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid template mode name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �вл�ет�� неверным шаблоном имени режима.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Им� переменной, �в�занной � выражением for, должно отличать�� от позиционной переменной. Две переменные � именем %1 конфликтуют.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The Schema Validation Feature is not supported. Hence, %1-expressions may not be used.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Возможно�ть проверки по �хеме не поддерживает��. Выражени� %1 не могут и�пользовать��.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;None of the pragma expressions are supported. Therefore, a fallback expression must be present&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�и одно из выражений pragma не поддерживает��. Должно �уще�твовать запа�ное выражение&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Each name of a template parameter must be unique; %1 is duplicated.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Им� каждого параметра шаблона должно быть уникальным, но %1 повтор�ет��.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No function with name %1 is available.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid numeric literal.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �вл�ет�� неверным чи�ловым литералом.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;W3C XML Schema identity constraint selector&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;W3C XML Schema identity constraint field&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A construct was encountered which is disallowed in the current language(%1).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В�тречена кон�трукци�, запрещённа� дл� текущего �зыка (%1).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Про�тран�тво имён %1 может быть �в�зано только � %2 (в данном �лучае уже предопределено).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Префик� %1 может быть �в�зан только � %2 (в данном �лучае уже предопределено).&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An attribute with name %1 has already appeared on this element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A direct element constructor is not well-formed. %1 is ended with %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Пр�мой кон�труктор �лемента �о�тавлен некорректно. %1 заканчивает�� на %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name %1 does not refer to any schema type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�азвание %1 не �оответ�твует ни одному типу �хемы.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 - �ложный тип. Преобразование к �ложным типам невозможно. Однако, преобразование к атомарным типам как %2 работает.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not an atomic type. Casting is only possible to atomic types.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 - не атомарный тип. Преобразование возможно только к атомарным типам.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid name for a processing-instruction.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �вл�ет�� неверным названием дл� ин�трукции обработки.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name of an extension expression must be in a namespace.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�азвание выражени� ра�ширени� должно быть в про�тран�тве имён.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Required type is %1, but %2 was found.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Требует�� тип %1, но обнаружен %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Promoting %1 to %2 may cause loss of precision.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Преобразование %1 к %2 может �низить точно�ть.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It&amp;apos;s not possible to add attributes after any other kind of node.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�евозможно добавл�ть атрибуты по�ле любого другого вида узла.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Поддерживает�� только Unicode Codepoint Collation (%1). %2 не поддерживает��.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Integer division (%1) by zero (%2) is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Целочи�ленное деление (%1) на нуль (%2) не определено.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Division (%1) by zero (%2) is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Деление (%1) на нуль (%2) не определено.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Modulus division (%1) by zero (%2) is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Деление по модулю (%1) на нуль (%2) не определено.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message numerus="yes"&gt;</div><div class='add'>+            &lt;source&gt;%1 takes at most %n argument(s). %2 is therefore invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 принимает не более %n аргумента. Следовательно, %2 неверно.&lt;/numerusform&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 принимает не более %n аргументов. Следовательно, %2 неверно.&lt;/numerusform&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 принимает не более %n аргументов. Следовательно, %2 неверно.&lt;/numerusform&gt;</div><div class='add'>+            &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message numerus="yes"&gt;</div><div class='add'>+            &lt;source&gt;%1 requires at least %n argument(s). %2 is therefore invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 принимает не менее %n аргумента. Следовательно, %2 неверно.&lt;/numerusform&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 принимает не менее %n аргументов. Следовательно, %2 неверно.&lt;/numerusform&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 принимает не менее %n аргументов. Следовательно, %2 неверно.&lt;/numerusform&gt;</div><div class='add'>+            &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root node of the second argument to function %1 must be a document node. %2 is not a document node.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Корневой узел второго аргумента функции %1 должен быть документом. %2 не �вл�ет�� документом.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Про�тран�тво имён дл� пользователь�ких функций не может быть пу�тым (попробуйте предопределённый префик� %1, который �уще�твует дл� подобных �итуаций)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A default namespace declaration must occur before function, variable, and option declarations.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Объ�вление про�тран�тво имён по умолчанию должно быть до объ�влени� функций, переменных и опций.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace declarations must occur before function, variable, and option declarations.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Объ�вление про�тран�тва имён должно быть до объ�влени� функций, переменных и опций.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Module imports must occur before function, variable, and option declarations.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Импортируемые модули должны быть указаны до объ�влени� функций, переменных и опций.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a whole number of minutes.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 не �вл�ет�� полным количе�твом минут.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 can&amp;apos;t be serialized because it appears at the top level.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�трибут %1 не может быть �ериализован, так как при�ут�твует на верхнем уровне.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an unsupported encoding.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Кодировка %1 не поддерживает��.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 contains octets which are disallowed in the requested encoding %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �одержит октеты, которые недопу�тимы в требуемой кодировке %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Символ � кодом %1, при�ут�твующий в %2 при и�пользовании кодировки %3, не �вл�ет�� допу�тимым �имволом XML.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ambiguous rule match.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еоднозначное �оответ�твие правилу.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In a namespace constructor, the value for a namespace cannot be an empty string.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В кон�трукторе про�тран�тва имён значение про�тран�тва имён не может быть пу�той �трокой.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The prefix must be a valid %1, which %2 is not.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Префик� должен быть корректным %1, но %2 им не �вл�ет��.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The prefix %1 cannot be bound.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Префик�%1 не может быть �в�зан.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only the prefix %1 can be bound to %2 and vice versa.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Только префик� %1 может быть �в�зан � %2 и наоборот.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The parameter %1 is required, but no corresponding %2 is supplied.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еобходим параметр %1 , но �оответ�твующего %2 не передано.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The parameter %1 is passed, but no corresponding %2 exists.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Передан параметр %1 , но �оответ�твующего %2 не �уще�твует.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The URI cannot have a fragment&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;URI не может �одержать фрагмент&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed at this location.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Элемент %1 недопу�тим в �том ме�те.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Text nodes are not allowed at this location.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Тек�товые узлы недопу�тимы в �том ме�те.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Parse error: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ошибка разбора: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The value of the XSL-T version attribute must be a value of type %1, which %2 isn&amp;apos;t.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Значение атрибута вер�ии XSL-T должно быть типа %1, но %2 им не �вл�ет��.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Running an XSL-T 1.0 stylesheet with a 2.0 processor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Выполн�ет�� таблица �тилей XSL-T 1.0 � обработчиком вер�ии 2.0.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown XSL-T attribute %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�еизве�твный атрибут XSL-T %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 and %2 are mutually exclusive.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�трибуты %1 и %2 взаимои�ключающие.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In a simplified stylesheet module, attribute %1 must be present.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;В модуле упрощённой таблицы �тилей об�зан при�ут�твовать атрибут %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;If element %1 has no attribute %2, it cannot have attribute %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Е�ли �лемент %1 не имеет атрибут %2, у него не может быть атрибутов %3 и %4.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 must have at least one of the attributes %2 or %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Элемент %1 должен иметь как минимум один из атрибутов %2 или %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one mode must be specified in the %1-attribute on element %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Как минимум один режим должен быть указан в атрибуте %1 �лемента %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 must come last.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Элемент %1 должен идти по�ледним.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one %1-element must occur before %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Как минимум один �лемент %1 должен быть перед %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only one %1-element can appear.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Должен быть только один �лемент %1.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one %1-element must occur inside %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Как минимум один �лемент %1 должен быть внутри %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When attribute %1 is present on %2, a sequence constructor cannot be used.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Е�ли %2 �одержит атрибут %1, кон�труктор по�ледовательно�ти не может быть и�пользован.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 must have either a %2-attribute or a sequence constructor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Элемент %1 должен иметь атрибут %2 или кон�труктор по�ледовательно�ти.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Е�ли параметр необходим, значение по умолчание не может быть передано через атрибут %1 или кон�труктор по�ледовательно�ти.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 cannot have children.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;У �лемента %1 не может быть потомков.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 cannot have a sequence constructor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;У �лемента %1 не может быть кон�труктора по�ледовательно�ти.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The attribute %1 cannot appear on %2, when it is a child of %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;У %2 не может быть атрибута %1, когда он �вл�ет�� потомком %3.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A parameter in a function cannot be declared to be a tunnel.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Параметр в функции не может быть объ�влен туннелем.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;This processor is not Schema-aware and therefore %1 cannot be used.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Данный обработчик не работает �о �хемами, �ледовательно, %1 не может и�пользовать��.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top level stylesheet elements must be in a non-null namespace, which %1 isn&amp;apos;t.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Элементы верхнего уровн� таблицы �тилей должны быть в про�тран�тве имен, которым %1 не �вл�ет��.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The value for attribute %1 on element %2 must either be %3 or %4, not %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Значение атрибута %1 �лемента %2 должно быть или %3, или %4, но не %5.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 cannot have the value %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�трибут %1 не может принимать значение %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The attribute %1 can only appear on the first %2 element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�трибут %1 может быть только у первого �лемента %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one %1 element must appear as child of %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Как минимум один �лемент %1 должен быть в %2.&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 has inheritance loop in its base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Circular inheritance of base type %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Circular inheritance of union %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by restriction as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by extension as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type of simple type %1 cannot be complex type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 cannot have direct base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 is not allowed to have base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 can only have simple atomic type as base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 cannot derive from %2 as the latter defines restriction as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Variety of item type of %1 must be either atomic or union.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Variety of member types of %1 must be atomic.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by list as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 is only allowed to have %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type of simple type %1 must have variety of type list.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type of simple type %1 has defined derivation by restriction as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Item type of base type does not match item type of %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 contains not allowed facet type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by union as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to have any facets.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of simple type %2 must have variety of union.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Member type %1 cannot be derived from member type %2 of %3&amp;apos;s base type %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derivation method of %1 must be extension because the base type %2 is a simple type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 has duplicated element %2 in its content model.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 has non-deterministic content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content model of complex type %1 is not a valid extension of content model of %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 must have simple content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 must have the same simple type as its base class %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 cannot be derived from base type %2%3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 with simple content cannot be derived from complex base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Item type of simple type %1 cannot be a complex type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Member type of simple type %1 cannot be a complex type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to have a member type with the same name as itself.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet collides with %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must have the same value as %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be equal or greater than %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than or equal to %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet contains invalid regular expression&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown notation %1 used in %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet contains invalid value %2: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet cannot be %2 or %3 if %4 facet of base type is %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet cannot be %2 if %3 facet of base type is %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than or equal to %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet and %2 facet cannot appear together.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be greater than %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be greater than or equal to %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type contains not allowed facet %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only %1 and %2 facets are allowed when derived by union.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 contains %2 facet with invalid data: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 contains attribute %2 twice.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 contains two different attributes that both have types derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 contains attribute %2 twice.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 contains two different attributes that both have types derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed to have a value constraint if its base type is complex.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed to have a value constraint if its type is derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value constraint of element %1 is not of elements type: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed to have substitution group affiliation as it is no global element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of element %1 cannot be derived from type of substitution group affiliation.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value constraint of attribute %1 is not of attributes type: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 has value constraint but has type derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute in derived complex type must be %2 like in base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 in derived complex type must have %2 value constraint like in base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 in derived complex type must have the same %2 value constraint like in base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 in derived complex type must have %2 value constraint.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;processContent of base wildcard must be weaker than derived wildcard.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 exists twice with different types.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Particle contains non-deterministic wildcards.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base attribute %1 is required but derived attribute is not.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of derived attribute %1 cannot be validly derived from type of base attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value constraint of derived attribute %1 does not match value constraint of base attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived attribute %1 does not exist in the base definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived attribute %1 does not match the wildcard in the base definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base attribute %1 is required but missing in derived definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived definition contains an %1 element that does not exists in the base definition&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived wildcard is not a subset of the base wildcard.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 of derived wildcard is not a valid restriction of %2 of base wildcard&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 from base type is missing in derived type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of derived attribute %1 differs from type of base attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base definition contains an %1 element that is missing in the derived definition&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 references unknown %2 or %3 element %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 references identity constraint %2 that is no %3 or %4 element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 has a different number of fields from the identity constraint %2 that it references.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Item type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Member type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of complex type cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 cannot have complex base type that has a %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of %1 element must be a simple type, %2 is not.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Substitution group %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Substitution group %1 has circular definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duplicated element names %1 in %2 element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reference %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Circular group reference for %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed in this scope&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element cannot have %2 attribute with value other than %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element cannot have %2 attribute with value other than %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 or %2 attribute of reference %3 does not match with the attribute declaration %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 has circular reference.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute in %2 must have %3 use like in base type %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 has attribute wildcard but its base type %2 has not.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enumeration facet contains invalid content: {%1} is not a value of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace prefix of qualified name %1 is not defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element %2 is not a valid restriction of the %3 element it redefines: %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Empty particle cannot be derived from non-empty particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived particle is missing element %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived element %1 is missing value constraint as defined in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived element %1 has weaker value constraint than base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fixed value constraint of element %1 differs from value constraint in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived element %1 cannot be nillable as base element is not nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Block constraints of derived element %1 must not be more weaker than in the base element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type of derived element %1 cannot be validly derived from base element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type of derived element %1 cannot be validly derived from base element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is missing in derived particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 does not match namespace constraint of wildcard in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wildcard in derived particle is not a valid subset of wildcard in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;processContent of wildcard in derived particle is weaker than wildcard in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived particle allows content that is not allowed in the base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Can not process unknown element %1, expected elements are: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed in this scope, possible elements are: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Child element is missing in that scope, possible child elements are: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Document is not a XML schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element contains invalid content: {%3} is not a value of type %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element contains invalid content: {%3}.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed to have the same %2 attribute value as the target namespace %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element without %2 attribute is not allowed inside schema without target namespace.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed inside %2 element if %3 attribute is present.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element has neither %2 attribute nor %3 child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element with %2 child element must not have a %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must be %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must have a value of %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must have a value of %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element must not have %2 and %3 attribute together.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of %1 attribute of %2 element must not be from namespace %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must not be %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must have the value %3 because the %4 attribute is set.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Specifying use=&amp;apos;prohibited&amp;apos; inside an attribute group has no effect.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element must have either %2 or %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element must have either %2 attribute or %3 or %4 as child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element requires either %2 or %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Text or entity references not allowed inside %1 element&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must contain %3, %4 or a list of URIs.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed in this context.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element has larger value than %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Prefix of qualified name %1 is not defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must either contain %3 or the other values.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Component with ID %1 has been defined previously.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element group %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Notation %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Identity constraint %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duplicated facets in simple type %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not valid according to %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match the length facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match the minLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match the maxLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match in the totalDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match in the totalDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decimal content does not match in the fractionDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decimal content does not match in the totalDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Boolean content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content does not match the length facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content does not match the minLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content does not match the maxLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid QName content: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QName content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QName content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Notation content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match length facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match minLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match maxLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Union content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Union content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Data of type %1 are not allowed to be empty.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is missing child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;There is one IDREF value with no corresponding ID: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Loaded schema file is invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 contains invalid data.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;xsi:schemaLocation namespace %1 has already appeared earlier in the instance document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No schema defined for validation.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No definition for element %1 available.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Specified type %1 is not known to the schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not defined in this scope.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Declaration for element %1 does not exist.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains invalid content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is declared as abstract.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 contains invalid data: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element contains content although it is nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fixed value constraint not allowed if element is nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 cannot contain other elements, as it has a fixed content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Specified type %1 is not validly substitutable with element type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 is not allowed to be abstract.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed attributes.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of element %1 does not match its type definition: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of element %1 does not match defined value constraint.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed child content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed text content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is missing required attribute %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 does not match the attribute wildcard.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Declaration for attribute %1 does not exist.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains two attributes of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 contains invalid content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains unknown attribute %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of attribute %1 does not match its type definition: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of attribute %1 does not match defined value constraint.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Non-unique value found for constraint %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Key constraint %1 contains absent fields.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Key constraint %1 contains references nillable element %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No referenced value found for key reference %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More than one value found for field %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Field %1 has no simple type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ID value &amp;apos;%1&amp;apos; is not unique.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;apos;%1&amp;apos; attribute contains invalid QName content: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+&lt;/TS&gt;</div><div class='head'>diff --git a/config.profiles/symbian/translations/qt_ur.ts b/config.profiles/symbian/translations/qt_ur.ts<br/>new file mode 100644<br/>index 0000000..4b26d3a<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/translations/qt_ur.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/translations/qt_ur.ts</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='add'>+&lt;!DOCTYPE TS&gt;</div><div class='add'>+</div><div class='add'>+&lt;TS version="2.0" language="ur"&gt;</div><div class='add'>+&lt;context&gt;</div><div class='add'>+    &lt;name&gt;QApplication&lt;/name&gt;</div><div class='add'>+    &lt;message&gt;</div><div class='add'>+        &lt;source&gt;QT_LAYOUT_DIRECTION&lt;/source&gt;</div><div class='add'>+        &lt;comment&gt;Translate this string to the string &amp;apos;LTR&amp;apos; in left-to-right languages or to &amp;apos;RTL&amp;apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.&lt;/comment&gt;</div><div class='add'>+        &lt;translation&gt;RTL&lt;/translation&gt;</div><div class='add'>+    &lt;/message&gt;</div><div class='add'>+&lt;/context&gt;</div><div class='add'>+&lt;/TS&gt;</div><div class='head'>diff --git a/config.profiles/symbian/translations/qt_zh_cn_symbian.ts b/config.profiles/symbian/translations/qt_zh_cn_symbian.ts<br/>new file mode 100644<br/>index 0000000..91ac2af<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/translations/qt_zh_cn_symbian.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/translations/qt_zh_cn_symbian.ts</a></div><div class='hunk'>@@ -0,0 +1,8517 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='add'>+&lt;!DOCTYPE TS&gt;</div><div class='add'>+</div><div class='add'>+&lt;TS version="2.0" language="zh_cn"&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;CloseButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close Tab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关闭标签页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;FakeReply&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fake error !&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;虚�错误�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无效URL&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Notifications&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;通知&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Music&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;视频&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Communication&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;通讯&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Games&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;游�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Accessibility&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无障�环境&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::AudioOutput&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;html&amp;gt;The audio playback device &amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt; does not work.&amp;lt;br/&amp;gt;Falling back to &amp;lt;b&amp;gt;%2&amp;lt;/b&amp;gt;.&amp;lt;/html&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;html&amp;gt;音频播放设备&amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt;�工作。&amp;lt;br/&amp;gt;无法返回到&amp;lt;b&amp;gt;%2&amp;lt;/b&amp;gt;。&amp;lt;/html&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;html&amp;gt;Switching to the audio playback device &amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt;&amp;lt;br/&amp;gt;which just became available and has higher preference.&amp;lt;/html&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;html&amp;gt;切�到刚刚�用且较为&amp;lt;br/&amp;gt;�爱的音频播放设备&amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt;。&amp;lt;/html&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Revert back to device &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;回�到设备&amp;quot;%1&amp;quot;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::Gstreamer::Backend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning: You do not seem to have the package gstreamer0.10-plugins-good installed.</div><div class='add'>+          Some video features have been disabled.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;警告：看起�，您没有安装 gstreamer0.10-plugins-good 包。</div><div class='add'>+    一些视频特性已�被关闭。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning: You do not seem to have the base GStreamer plugins installed.</div><div class='add'>+          All audio and video support has been disabled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;警告：看起�，您没有安装基础的 GStreamer �件。</div><div class='add'>+    所有的音频和视频支�都已�被关闭。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::Gstreamer::MediaObject&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot start playback. </div><div class='add'>+</div><div class='add'>+Check your GStreamer installation and make sure you </div><div class='add'>+have libgstreamer-plugins-base installed.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A required codec is missing. You need to install the following codec(s) to play this content: %0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;缺少一个需�的解�器。您需�安装如下解�器�播放这个内容：%0&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open media source.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能打开媒体�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid source type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无效的�类型。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not locate media source.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能定�媒体�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open audio device. The device is already in use.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能打开音频设备。这个设备正在被使用。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not decode media source.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能解�媒体�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音频输出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The audio output device&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音频输出设备&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未找到&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Out of memory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;存储�足&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�支�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Overflow&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;溢出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Underflow&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下溢&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Already exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;已�存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Path not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未找到路径&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In use&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在使用中&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not ready&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未就绪&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Access denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;访问被拒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法连接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Disconnected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;已断开连接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��被拒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insufficient bandwidth&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;带宽�足&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network unavailable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;网络��用&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network communication error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;网络通讯错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Streaming not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�支��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Server alert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�务器�示&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid protocol&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无效�议&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无效URL&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multicast error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;组播错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代��务器错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代��务器��支�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio output error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音频输出错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video output error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;视频输出错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decoder error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;解�器错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio or video components could not be played&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法播放音频或视频组件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DRM error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;DRM错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error (%1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知错误(%1)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::AbstractMediaPlayer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not ready to play&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�准备播放&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开文件时出错&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开URL时出错&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Setting volume failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;设置�失败&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Playback complete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;播放结�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::AudioEqualizer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 Hz&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1赫兹&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::AudioPlayer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Getting position failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;获��置失败&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Opening clip failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开片段失败&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::EffectFactory&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enabled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;已�用&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::EnvironmentalReverb&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decay HF ratio (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;高频衰�率(%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decay time (ms)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;衰�时间(毫秒)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Density (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;密度(%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Diffusion (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;散射(%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reflections delay (ms)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�映延迟(毫秒)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reflections level (mB)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�映级别(mB)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverb delay (ms)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;混�延迟(毫秒)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverb level (mB)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;混�级别(mB)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Room HF level&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;高频室级别&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Room level (mB)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;室级别(mB)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::MediaObject&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening source: type not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开�时出错：类型��支�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening source: media type could not be determined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开�时出错：无法判断多媒体类型&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::StereoWidening&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Level (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;级别(%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::VideoPlayer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;暂�失败&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;寻找失败&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Getting position failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;获��置失败&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Opening clip failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开片段失败&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Buffering clip failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;片段缓冲失败&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video display error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;视频显示错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::VolumeSlider&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume: %1%&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音�：%1%&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;请使用这个滑�调节音�。最左为%0，最�为%1%&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Muted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;已�音&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3Accel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1, %2 not defined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1，%2未定义&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ambiguous %1 not handled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�明确的%1没有被处�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3DataTable&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;True&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;真&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;False&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�入&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Update&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;更新&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;删除&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3FileDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy or Move a File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�制或者移动一个文件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;读�：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;写入：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;所有文件 (*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�称&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;大�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;类型&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;日期&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attributes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;属性&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;确定(&amp;amp;O)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Look &amp;amp;in:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;查找范围(&amp;amp;I)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File &amp;amp;name:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文件�称(&amp;amp;N)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File &amp;amp;type:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文件类型(&amp;amp;T)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�退&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;One directory up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�上一级&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Create New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;创建新文件夹&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列表视图&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Detail View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;详细视图&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Preview File Info&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;预览文件信�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Preview File Contents&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;预览文件内容&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read-write&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;读写&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read-only&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�读&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write-only&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�写&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Inaccessible&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��访问的&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symlink to File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文件的系统链接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symlink to Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;目录的系统链接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symlink to Special&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;特殊的系统链接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dir&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;目录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Special&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;特殊&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save As&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�存为&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开(&amp;amp;O)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�存(&amp;amp;S)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Rename&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�命�(&amp;amp;R)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;删除(&amp;amp;D)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;R&amp;amp;eload&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�新载入(&amp;amp;E)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort by &amp;amp;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;按�称排列(&amp;amp;N)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort by &amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;按大�排列(&amp;amp;S)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort by &amp;amp;Date&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;按日期排列(&amp;amp;D)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Unsorted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未排列的(&amp;amp;U)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;排列&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show &amp;amp;hidden files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;显示��文件(&amp;amp;H)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;the file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;the directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;目录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;the symlink&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;系统链接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;删除%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;qt&amp;gt;Are you sure you wish to delete %1 &amp;quot;%2&amp;quot;?&amp;lt;/qt&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;qt&amp;gt;你确认你想删除%1，“%2�？&amp;lt;/qt&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;是(&amp;amp;Y)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�(&amp;amp;N)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder 1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;新建文件夹1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;新建文件夹&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;新建文件夹%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;查找目录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;目录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directory:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;目录：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1</div><div class='add'>+File not found.</div><div class='add'>+Check path and filename.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文件%1</div><div class='add'>+未找到。</div><div class='add'>+请检查路径和文件�。</div><div class='add'>+&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*.*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;所有文件 (*.*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open &lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select a Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选择一个目录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3LocalFs&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not read directory</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能读�目录</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not create directory</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能创建目录</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not remove file or directory</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能移除文件或者目录</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not rename</div><div class='add'>+%1</div><div class='add'>+to</div><div class='add'>+%2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能把</div><div class='add'>+%1</div><div class='add'>+�命�为</div><div class='add'>+%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能打开</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not write</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能写入</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3MainWindow&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;排列&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Customize...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;自定义...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3NetworkProtocol&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation stopped by the user&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�作被用户�止&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3ProgressDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3TabDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;确认&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Apply&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;应用&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;帮助&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Defaults&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;默认&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3TextEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;撤消(&amp;amp;U)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��(&amp;amp;R)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cu&amp;amp;t&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;剪切(&amp;amp;T)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�制(&amp;amp;C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;粘贴(&amp;amp;P)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;清空&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选择全部&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3TitleBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;System&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;系统&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�上��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Minimize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;最�化&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�下��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Maximize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;最大化&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关闭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Contains commands to manipulate the window&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;包��作窗�的命令。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Puts a minimized window back to normal&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Moves the window out of the way&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;把窗�移到外�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Puts a maximized window back to normal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;把一个最大化窗���为普通状�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Makes the window full screen&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;窗�全�化&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Closes the window&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关闭窗�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Displays the name of the window and contains controls to manipulate it&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;显示窗��称并且包�维护它的控件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3ToolBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;更多...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3UrlOperator&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�议“%1��被支�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support listing directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�议“%1��支�列出目录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support creating new directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�议“%1��支�创建新目录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support removing files or directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�议“%1��支�移除文件或者目录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support renaming files or directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�议“%1��支��命�文件或者目录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support getting files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�议“%1��支�获�文件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support putting files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�议“%1��支�上传文件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support copying or moving files or directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�议“%1��支��制或者移动文件或者目录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;(unknown)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;(未知的)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3Wizard&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消(&amp;amp;C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt; &amp;amp;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt; 上一步(&amp;amp;B)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Next &amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下一步(&amp;amp;N) &amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Finish&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;完�(&amp;amp;F)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;帮助(&amp;amp;H)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAbstractSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主机未找到&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;连接被拒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;连接超时&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation on socket is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Socket�作�被支�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Socket operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;套接字�作超时&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Socket is not connected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;套接字没有被连接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network unreachable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;网络�能访问&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAbstractSpinBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Step up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;增加(&amp;amp;S)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step &amp;amp;down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�少(&amp;amp;D)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选择关部(&amp;amp;S)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAccessibleButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Press&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;按下&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QApplication&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QT_LAYOUT_DIRECTION&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Translate this string to the string &amp;apos;LTR&amp;apos; in left-to-right languages or to &amp;apos;RTL&amp;apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;LTR&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Executable &amp;apos;%1&amp;apos; requires Qt %2, found Qt %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;执行“%1�需�Qt %2，�找到了Qt %3。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Incompatible Qt Library Error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�兼容的Qt错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Activate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;激活&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Activates the program&amp;apos;s main window&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;激活这个程�的主窗�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAxSelect&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select ActiveX Control&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选择ActiveX控件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;确定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消(&amp;amp;C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;COM &amp;amp;Object:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;COM对象(&amp;amp;O)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QCheckBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Uncheck&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消选中&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选中&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Toggle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;切�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QColorDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hu&amp;amp;e:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;色调(&amp;amp;E)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Sat:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;饱和度(&amp;amp;S)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Val:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;亮度(&amp;amp;V)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Red:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;红色(&amp;amp;R)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Green:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;绿色(&amp;amp;G)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bl&amp;amp;ue:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�色(&amp;amp;U)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A&amp;amp;lpha channel:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Alpha通�(&amp;amp;A)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select Color&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选择颜色&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Basic colors&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;基本颜色(&amp;amp;B)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Custom colors&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;自定义颜色(&amp;amp;C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Add to Custom Colors&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;添加到自定义颜色(&amp;amp;A)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QComboBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;False&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;True&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;真&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关闭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QCoreApplication&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: key is empty&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1：键是空的&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to make key&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1：�能制造键&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: ftok failed&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1：ftok 失败&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: already exists&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1：已�存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: does not exist&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1：�存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: out of resources&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1：资�耗尽了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1：未知错误 %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDB2Driver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能连接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�交事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能回滚事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to set autocommit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能设置自动�交&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDB2Result&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能执行语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能准备语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind variable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能帮定��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch record %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能获�记录%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能获�下一个&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch first&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能获�第一个&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDateTimeEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;AM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;AM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;am&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;am&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;PM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;pm&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;pm&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDial&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QDial&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;QDial&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SpeedoMeter&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;SpeedoMeter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SliderHandle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;SliderHandle&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;What&amp;apos;s This?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;这是什么？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Done&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;完�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDialogButtonBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;确定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�存&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�存(&amp;amp;S)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消(&amp;amp;C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关闭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关闭(&amp;amp;C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Apply&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;应用&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reset&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;帮助&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Don&amp;apos;t Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��存&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Discard&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;抛弃&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;是(&amp;amp;Y)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Yes to &amp;amp;All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;全部是(&amp;amp;A)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�(&amp;amp;N)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;N&amp;amp;o to All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;全部�(&amp;amp;O)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�存全部&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Abort&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;放弃&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Retry&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�试&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;忽略&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore Defaults&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��默认&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close without Saving&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��存关闭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;确定(&amp;amp;O)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDirModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�称&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;大�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Kind&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Match OS X Finder&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;类型&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;类型&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date Modified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;日期被修改&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDockWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关闭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;锚接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Float&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;浮动&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDoubleSpinBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;更多&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Less&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;更少&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QErrorMessage&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Show this message again&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�次显示这个消�(&amp;amp;S)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;确定(&amp;amp;O)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Debug Message:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;调试消�：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;警告：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fatal Error:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;致命错误：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFile&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Destination file exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;目标文件已存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Will not rename sequential file using block copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;将�使用��制�命�顺�文件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot remove source file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法删除�文件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open %1 for input&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法输入 %1 &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open for output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法输出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Failure to write block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;写�失败&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot create %1 for output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法创建 %1 &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFileDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;所有文件 (*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�退&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列表视图&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Detail View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;详细视图&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save As&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�存为&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开(&amp;amp;O)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�存(&amp;amp;S)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Recent Places&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;最近的地方&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Rename&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�命�(&amp;amp;R)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;删除(&amp;amp;D)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show &amp;amp;hidden files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;显示��文件(&amp;amp;H)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;新建文件夹&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;查找目录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;目录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*.*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;所有文件 (*.*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directory:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;目录：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 already exists.</div><div class='add'>+Do you want to replace it?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1已�存在。</div><div class='add'>+你想�替�它么？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1</div><div class='add'>+File not found.</div><div class='add'>+Please verify the correct file name was given.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文件%1</div><div class='add'>+没有找到。</div><div class='add'>+请核实已给定正确文件�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;My Computer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;我的计算机&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Parent Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;父目录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Files of type:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文件类型：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1</div><div class='add'>+Directory not found.</div><div class='add'>+Please verify the correct directory name was given.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;目录%1</div><div class='add'>+没有找到。</div><div class='add'>+请核实已给定正确目录�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;apos;%1&amp;apos; is write protected.</div><div class='add'>+Do you want to delete it anyway?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;“%1“是写�护的。</div><div class='add'>+你还是想删除它么？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Are sure you want to delete &amp;apos;%1&amp;apos;?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;你确认你想删除“%1“？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not delete directory.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能删除目录。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Drive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;驱动器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File Folder&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Match Windows Explorer&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;文件文件夹&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Folder&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;文件夹&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Alias&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Mac OS X Finder&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;别�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shortcut&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;快�方�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show &lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;显示 &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�进&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;新建文件夹(&amp;amp;N)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Choose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选择(&amp;amp;C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remove&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移除&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File &amp;amp;name:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文件�称(&amp;amp;N)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Look in:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;查看：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Create New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;创建新文件夹&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFileSystemModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 TB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 TB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 GB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 GB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 MB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 MB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 KB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1�字节&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 bytes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1字节&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid filename&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无效文件�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;b&amp;gt;The name &amp;quot;%1&amp;quot; can not be used.&amp;lt;/b&amp;gt;&amp;lt;p&amp;gt;Try using another name, with fewer characters or no punctuations marks.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;b&amp;gt;�称“%1“�能被使用。&amp;lt;/b&amp;gt;&amp;lt;p&amp;gt;请使用�外一个包�更少字符或者��有标点符�的�称。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�称&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;大�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Kind&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Match OS X Finder&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;类型&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;类型&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date Modified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;日期被修改&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;My Computer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;我的计算机&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Computer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;计算机&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 byte(s)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1字节&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFontDatabase&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Normal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;普通&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bold&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;粗体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Demi Bold&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�粗体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Black&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;黑体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Demi&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Light&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;轻体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Italic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�大利体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Oblique&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;斜体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Any&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;任�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Latin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;拉�文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Greek&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;希腊文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cyrillic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;西里尔文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Armenian&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;亚美尼亚文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hebrew&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;希伯�文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Arabic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;阿拉伯文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Syriac&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�利亚文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Thaana&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;马尔代夫文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Devanagari&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;梵文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bengali&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;孟加拉文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Gurmukhi&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��普文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Gujarati&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��拉特文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Oriya&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;奥里雅文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tamil&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;泰米尔文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Telugu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;泰�固文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Kannada&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;埃纳德文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Malayalam&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;马拉亚拉姆文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sinhala&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;僧伽罗文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Thai&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;泰国文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Lao&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tibetan&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Myanmar&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;缅甸文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Georgian&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;格��亚文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Khmer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;谷美尔文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simplified Chinese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;简体中文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Traditional Chinese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�体中文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Japanese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;日文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Korean&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;韩文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Vietnamese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;越�文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symbol&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;符�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ogham&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;欧甘文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Runic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�北欧文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;N&amp;apos;Ko&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;N&amp;apos;Ko&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFontDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Font&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;字体(&amp;amp;F)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Font st&amp;amp;yle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;字体风格(&amp;amp;Y)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;大�(&amp;amp;S)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Effects&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;效果&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stri&amp;amp;keout&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;删除线(&amp;amp;K)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Underline&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下划线(&amp;amp;U)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sample&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;实例&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select Font&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选择字体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wr&amp;amp;iting System&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;书写系统(&amp;amp;I)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFtp&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主机%1找到了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主机找到了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;连接到主机%1了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;连接到主机了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to %1 closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;到%1的连接关闭了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;连接关闭了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主机%1没有找到&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;连接被主机 %1 拒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection timed out to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主机%1连接超时&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connecting to host failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;连接主机失败：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Login failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;登录失败：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Listing directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列出目录失败：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Changing directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;改�目录失败：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Downloading file failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下载文件失败：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Uploading file failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上传文件失败：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Removing file failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移除文件失败：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Creating directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;创建目录失败：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Removing directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移除目录失败：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not connected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;没有连接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused for data connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;因为数�连接而被拒�连接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHostInfo&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHostInfoAgent&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主机未找到&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown address type&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的地�类型&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No host name given&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未给定主机�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid hostname&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无效主机�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHttp&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;连接被拒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主机%1没有找到&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wrong content length&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;错误的内容长度&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;HTTP request failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;HTTP请求失败&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主机%1找到了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主机找到了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;连接到%1主机了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;连接到主机了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to %1 closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;到%1的连接关闭了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;连接关闭了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request aborted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;请求被放弃了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No server set to connect to&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;没有设置�连接的�务器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Server closed connection unexpectedly&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�务器异常地关闭了连接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid HTTP response header&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无效的HTTP�应头&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown authentication method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知鉴定方法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid HTTP chunked body&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无效的HTTP臃肿体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error writing response to device&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�设备中进行写回�时�生错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�需�认�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;需�认�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy requires authentication&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�需�验�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host requires authentication&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主机需�验�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Data corrupted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;数�错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SSL handshake failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;SSL �手失败&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown protocol specified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;所指定的�议是未知的&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused (or timed out)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;连接被拒�(或者超时)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;HTTPS connection requested but SSL support not compiled in&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;HTTPS 连接需� SSL，但它没有被编译进�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHttpSocketEngine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Did not receive HTTP response from proxy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未收到代�的HTTP�应&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error parsing authentication request from proxy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;解�代�的认�请求出错&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;需�认�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy denied connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�拒�连接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error communicating with HTTP proxy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;和HTTP代�通讯时�生错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未找到代��务器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�连接被拒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server connection timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代��务器连接超时&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy connection closed prematurely&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�连接过早关闭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QIBaseDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开数�库错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not start transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能开始事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�交事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能回滚事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QIBaseResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to create BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能创建BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to write BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能写入BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to open BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能打开BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to read BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能读�BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not find array&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能找到数组&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not get array data&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能得到数组数�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not get query info&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能得到查询信�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not start transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能开始事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�交事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not allocate statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能分�语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能准备语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not describe input statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�述输入语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not describe statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�述语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to close statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能关闭语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能执行查询&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not fetch next item&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能获�下一项&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not get statement info&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能得到语�信�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QIODevice&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��被拒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Too many open files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;太多打开的文件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No such file or directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;没有这个文件或者目录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No space left on device&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;设备上没有空间了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QInputContext&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XIM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;XIM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;FEP&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;FEP&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XIM input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;XIM输入法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Windows input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Windows输入法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mac OS X input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Mac OS X输入法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;S60 FEP input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;S60 FEP输入法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QInputDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enter a value:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;输入一个值：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLibrary&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not mmap &amp;apos;%1&amp;apos;: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能映射�%1“：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Plugin verification data mismatch in &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;“%1“中的�件验�数��匹�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not unmap &amp;apos;%1&amp;apos;: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�消映射“%1“：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin &amp;apos;%1&amp;apos; uses incompatible Qt library. (%2.%3.%4) [%5]&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�件“%1�使用了�兼容的Qt库。(%2.%3.%4) [%5]&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin &amp;apos;%1&amp;apos; uses incompatible Qt library. Expected build key &amp;quot;%2&amp;quot;, got &amp;quot;%3&amp;quot;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�件“%1“使用了�兼容的Qt库。期待的构建键是“%2“，得到的�是�%3“&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The shared library was not found.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;共享库没有被找到。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The file &amp;apos;%1&amp;apos; is not a valid Qt plugin.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文件“%1“�是有效的Qt�件。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin &amp;apos;%1&amp;apos; uses incompatible Qt library. (Cannot mix debug and release libraries.)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�件“%1“使用了�兼容的Qt库。(�能混�使用库的调试版本和�布版本。)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot load library %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法加载库%1：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot unload library %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法�载库%1：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot resolve symbol &amp;quot;%1&amp;quot; in %2: %3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法解�%2中的符�“%2�：%3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLineEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选择全部&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;撤消(&amp;amp;U)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��(&amp;amp;R)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cu&amp;amp;t&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;剪切(&amp;amp;T)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�制(&amp;amp;C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;粘贴(&amp;amp;P)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;删除&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLocalServer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Name error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: �称错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：��被拒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Address in use&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：地�正在被使用&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：未知错误 %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLocalSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：连接被拒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Remote closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：远程已关闭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Invalid name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：无效�称&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Socket access error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：套接字访问错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Socket resource error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：套接字资�错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Socket operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：套接字�作超时&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Datagram too large&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：数�报太大&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Connection error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：连接错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: The socket operation is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：套接字�作�被支�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：未知错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：未知错误 %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMYSQLDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to open database &amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能打开数�库&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能连接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能开始事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�交事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能回滚事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMYSQLResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch data&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能获�数�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能执行查询&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to store result&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能存储结果&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能准备语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to reset statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�置语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能绑定值&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能执行语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind outvalues&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能绑定外值&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to store statement results&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能存储语�结果&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute next query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能执行下一个查询&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to store next result&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能存储下一个结果&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMdiArea&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;(Untitled)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;(未命�的)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMdiSubWindow&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 - [%2]&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 - [%2]&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关闭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Minimize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;最�化&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�下��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Restore&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��(&amp;amp;R)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Move&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移动(&amp;amp;M)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;大�(&amp;amp;S)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mi&amp;amp;nimize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;最�化(&amp;amp;N)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ma&amp;amp;ximize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;最大化(&amp;amp;X)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stay on &amp;amp;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;总在最�(&amp;amp;T)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关闭(&amp;amp;C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Maximize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;最大化&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unshade&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消�蔽&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shade&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�蔽&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;帮助&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;- [%1]&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;- [%1]&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMenu&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关闭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Execute&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;执行&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMenuBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Actions&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�作&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMessageBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;确定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;h3&amp;gt;About Qt&amp;lt;/h3&amp;gt;&amp;lt;p&amp;gt;This program uses Qt version %1.&amp;lt;/p&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;h3&amp;gt;关于Qt&amp;lt;/h3&amp;gt;&amp;lt;p&amp;gt;此程�使用Qt版本%1。&amp;lt;/p&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;p&amp;gt;Qt is a C++ toolkit for cross-platform application development.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt provides single-source portability across MS&amp;amp;nbsp;Windows, Mac&amp;amp;nbsp;OS&amp;amp;nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Please see &amp;lt;a href=&amp;quot;http://qt.nokia.com/products/licensing&amp;quot;&amp;gt;qt.nokia.com/products/licensing&amp;lt;/a&amp;gt; for an overview of Qt licensing.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt is a Nokia product. See &amp;lt;a href=&amp;quot;http://qt.nokia.com/&amp;quot;&amp;gt;qt.nokia.com&amp;lt;/a&amp;gt; for more information.&amp;lt;/p&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;p&amp;gt;Qt是一个C++工具箱，用于跨平�应用程�开�。&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt具有�一�跨�移�性，�跨越MS&amp;amp;nbsp;Windows�Mac&amp;amp;nbsp;OS&amp;amp;nbsp;X�Linux和所有主�的商业Unix类平�进行移�。Qt还适用于嵌入�设备，如Qt for Embedded Linux和Qt for Windows CE。&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt有三���许�方�，以满足��用户需求。&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;�如您�开�专利/商业软件，但�希望与第三方共享任何�代�，或者无法符�GNU LGPL版本2.1或GNU GPL版本3.0的�款，则按照我们的商业许���议授�的Qt�常适用。&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;�如您能够符�GNU LGPL版本2.1的�款和�件，则按照GNU LGPL版本2.1授�的Qt�常适�开�Qt应用程�(专有或开放��)。&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;�如在开�Qt应用程�过程中，您希望这类应用程�能与�循GNU GPL版本3.0的软件�用，或者您愿�符�GNU GPL版本3.0�款，则按照GNU通用公共许��版本3.0授�的Qt�常适用。&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;请�阅&amp;lt;a href=&amp;quot;http://qt.nokia.com/products/licensing&amp;quot;&amp;gt;qt.nokia.com/products/licensing&amp;lt;/a&amp;gt;了解Qt授�概况。&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;版�所有 (C) 2010 诺基亚公�和/或附属公�。&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt是一款诺基亚产�。请�阅&amp;lt;a href=&amp;quot;http://qt.nokia.com/&amp;quot;&amp;gt;qt.nokia.com&amp;lt;/a&amp;gt;了解详情。&amp;lt;/p&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;About Qt&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关于Qt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;帮助&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show Details...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;显示细节……&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hide Details...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��细节……&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMultiInputContext&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select IM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选择输入法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMultiInputContextPlugin&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multiple input method switcher&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;多输入法切�器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multiple input method switcher that uses the context menu of the text widgets&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;使用文本窗�部件上下文��的多输入法切�器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNativeSocketEngine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The remote host closed the connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;远端主机关闭了这个连接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;网络�作超时&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Out of resources&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;资�耗尽了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsupported socket operation&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�被支�的套接字�作&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Protocol type not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�议类型�被支�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid socket descriptor&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无效的套接字�述符&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network unreachable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;网络�能访问&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��被拒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;连接超时&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;连接被拒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The bound address is already in use&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��用的地�已�被使用&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The address is not available&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;这个地���用&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The address is protected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;这个地�被�护了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to send a message&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能��一个消�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to receive a message&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能接收一个消�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to write&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能写入&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;网络错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Another socket is already listening on the same port&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�一个套接字已�正在监��一端�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to initialize non-blocking socket&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�始化�阻塞套接字&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to initialize broadcast socket&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�始化广播套接字&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attempt to use IPv6 socket on a platform with no IPv6 support&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;试图在�支�IPv6支�的平�上使用IPv6套接字&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host unreachable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主机�能访问&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Datagram was too large to send&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能��过大的数�报&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation on non-socket&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;对�套接字�作&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The proxy type is invalid for this operation&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;对于这个�作代�类型是无效的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessCacheBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开%1�生错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessDebugPipeBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write error writing to %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;写入%1时出错：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessFileBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request for opening non-local file %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;正在打开�本地文件 %1 的请求&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开 %1 错误：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write error writing to %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;写入 %1 错误：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open %1: Path is a directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法打开 %1：路径是一个目录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read error reading from %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;读� %1 错误：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessFtpBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No suitable proxy found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未找到�适的代�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open %1: is a directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法读� %1：是一个目录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Logging in to %1 failed: authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;登入 %1 失败：需�验�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error while downloading %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下载 %1 时错误：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error while uploading %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上载 %1 时错误：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessHttpBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No suitable proxy found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未找到�适的代�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkReply&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error downloading %1 - server replied: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下载 %1 错误 - �务器回�：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Protocol &amp;quot;%1&amp;quot; is unknown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�议“%1�是未知的&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkReplyImpl&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation canceled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�作被�消&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QOCIDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to logon&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能登录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to initialize&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QOCIDriver&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�能�始化&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能开始事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�交事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能回滚事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QOCIResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind column for batch execute&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能绑定批处�执行的列&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute batch statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能执行批处�语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to goto next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能进入下一个&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to alloc statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能分�语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能准备语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to get statement type&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能绑定值&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能执行语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QODBCDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能连接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to disable autocommit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�止自动�交&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�交事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能回滚事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to enable autocommit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能打开自动�交&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect - Driver doesn&amp;apos;t support all functionality required&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QODBCResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QODBCResult::reset: Unable to set &amp;apos;SQL_CURSOR_STATIC&amp;apos; as statement attribute. Please check your ODBC driver configuration&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;QODBCResult::reset: �能把“SQL_CURSOR_STATIC�设置为语�属性。请检查你的ODBC驱动程�设置。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能执行语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能获�下一个&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能准备语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind variable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能帮定��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch last&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能获�最�一个&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能获�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch first&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能获�第一个&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能获�上一个&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QObject&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid hostname&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无效主机�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation not supported on %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在 %1 上�被支�的�作&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid URI: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无效的 URI：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Socket error on %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 上的套接字错误：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remote host closed the connection prematurely on %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;远程主机过早地关闭了在 %1 上的这个连接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No host name given&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未指定主机�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPPDOptionsModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�称&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;值&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPSQLDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能连接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能开始事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�交事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能回滚事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to subscribe&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能订阅&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to unsubscribe&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�消订阅&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPSQLResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to create query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能创建查询&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能准备语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPageSetupWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Centimeters (cm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;厘米 (cm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Millimeters (mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;毫米 (mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Inches (in)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;英寸 (in)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Points (pt)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;点 (pt)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;窗体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paper&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;纸张&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page size:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;纸张大�：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Width:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;宽度：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Height:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;高度：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paper source:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;纸张�：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Orientation&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;方�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Portrait&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;纵�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Landscape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;横�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverse landscape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��横�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverse portrait&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��纵�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Margins&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;边�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;top margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上边�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;left margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;左边�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;right margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�边�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bottom margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下边�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPluginLoader&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin was not loaded.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�件没有被载入。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;locally connected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;本地已�连接的&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Aliases: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;别�：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unknown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;确定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print all&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打�全部&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print range&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打�范围&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A0 (841 x 1189 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A0 (841 x 1189 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A1 (594 x 841 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A1 (594 x 841 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A2 (420 x 594 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A2 (420 x 594 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A3 (297 x 420 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A3 (297 x 420 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A5 (148 x 210 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A5 (148 x 210 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A6 (105 x 148 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A6 (105 x 148 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A7 (74 x 105 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A7 (74 x 105 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A8 (52 x 74 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A8 (52 x 74 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A9 (37 x 52 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A9 (37 x 52 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B0 (1000 x 1414 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B0 (1000 x 1414 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B1 (707 x 1000 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B1 (707 x 1000 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B2 (500 x 707 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B2 (500 x 707 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B3 (353 x 500 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B3 (353 x 500 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B4 (250 x 353 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B4 (250 x 353 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B6 (125 x 176 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B6 (125 x 176 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B7 (88 x 125 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B7 (88 x 125 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B8 (62 x 88 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B8 (62 x 88 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B9 (44 x 62 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B9 (44 x 62 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B10 (31 x 44 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B10 (31 x 44 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;C5E (163 x 229 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;C5E (163 x 229 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DLE (110 x 220 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;DLE (110 x 220 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Folio (210 x 330 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Folio (210 x 330 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ledger (432 x 279 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ledger (432 x 279 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tabloid (279 x 432 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tabloid (279 x 432 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;US Common #10 Envelope (105 x 241 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;美国普通10�信� (105 x 241 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A4 (210 x 297 mm, 8.26 x 11.7 inches)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A4 (210 x 297 毫米，8.26 x 11.7 英寸)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B5 (176 x 250 mm, 6.93 x 9.84 inches)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B5 (176 x 250 毫米，6.93 x 9.84 英寸)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Executive (7.5 x 10 inches, 191 x 254 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Executive (7.5 x 10 英寸，191 x 254 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Legal (8.5 x 14 inches, 216 x 356 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Legal (8.5 x 14 英寸，216 x 356 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Letter (8.5 x 11 inches, 216 x 279 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Letter (8.5 x 11 英寸，216 x 279 毫米)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print selection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打�选择&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print To File ...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打�到文件……&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File %1 is not writable.</div><div class='add'>+Please choose a different file name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文件%1��写。</div><div class='add'>+请选择一个��的文件�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 already exists.</div><div class='add'>+Do you want to overwrite it?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1已�存在。</div><div class='add'>+你想覆盖它么？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文件存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;qt&amp;gt;Do you want to overwrite it?&amp;lt;/qt&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;qt&amp;gt;你想覆盖它么？&amp;lt;/qt&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is a directory.</div><div class='add'>+Please choose a different file name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1是目录。</div><div class='add'>+请选择一个��的文件�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The &amp;apos;From&amp;apos; value cannot be greater than the &amp;apos;To&amp;apos; value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;“从�的数值�能大于“到�的数值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A0&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A6&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A6&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A7&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A7&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A8&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A8&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A9&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A9&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B0&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B6&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B6&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B7&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B7&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B8&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B8&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B9&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B9&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B10&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B10&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;C5E&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;C5E&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DLE&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;DLE&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Executive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;决策文书&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Folio&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;对开纸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ledger&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Legal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;法律文书&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Letter&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;信纸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tabloid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�型报纸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;US Common #10 Envelope&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;美国普通10�信�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Custom&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;自定义&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Options &amp;gt;&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选项(&amp;amp;O) &amp;gt;&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Options &amp;lt;&amp;lt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选项(&amp;amp;O) &amp;lt;&amp;lt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print to File (PDF)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打�到文件(PDF)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print to File (Postscript)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打�到文件(Postscript)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Local file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;本地文件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write %1 file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;写入 %1 文件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打�(&amp;amp;P)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintPreviewDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1%&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1%&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print Preview&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打�预览&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Next page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下一页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Previous page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上一页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;First page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;第一页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Last page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;最�一页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fit width&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;适应宽度&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fit page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;适应页�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom in&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;放大&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;缩�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Portrait&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;纵�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Landscape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;横�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show single page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;显示�页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show facing pages&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;显示当�页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show overview of all pages&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;显示所有页的概览&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page setup&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打�设置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关闭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Export to PDF&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;导出为PDF&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Export to PostScript&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;导出为PostScript&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page Setup&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;页�设置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintPropertiesWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;窗体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Advanced&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;高级&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintSettingsOutput&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;窗体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copies&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;拷�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print range&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打�范围&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print all&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打�全部&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pages from&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;页数从&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;to&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;到&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Selection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选择&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Output Settings&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;输出设置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copies:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;备份：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Collate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;校对&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverse&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Options&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选项&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Color Mode&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;彩色模�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Color&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;彩色&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Grayscale&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�度&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duplex Printing&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;两部分打�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;None&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Long side&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;长侧&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Short side&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;短侧&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;窗体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Printer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打�机&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Name:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�称(&amp;amp;N)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;P&amp;amp;roperties&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;属性(&amp;amp;R)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Location:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Preview&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;预览&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;类型：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Output &amp;amp;file:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;输出文件(&amp;amp;F)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QProcess&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open input redirection for reading&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法打开用于读�的输入�定�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open output redirection for writing&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法打开用于写入的输出�定�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Resource error (fork failure): %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;资�错误(fork失败)：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Process operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;进程处�超时&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error reading from process&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;从进程中读�时�生错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error writing to process&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�进程写入时�生错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Process crashed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;进程已崩溃&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No program defined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未定义程�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Process failed to start: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;过程无法�动：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QProgressDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;撤消&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPushButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QRadioButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选中&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QRegExp&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;no error occurred&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;没有错误�生&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;disabled feature used&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;使用了失效的特效&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bad char class syntax&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;错误的字符类语法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bad lookahead syntax&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;错误的预测语法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bad repetition syntax&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;错误的��语法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid octal value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无效的八进制数值&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;missing left delim&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找�到左分隔符&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unexpected end&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�外的终止&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;met internal limit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�到内部�制&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid interval&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无效时间间隔&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid category&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无效类别&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLite2Driver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开数�库时出错&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能开始事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�交事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能回滚事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLite2Result&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch results&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能获�结果&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能执行语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLiteDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开数�库错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error closing database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关闭数�库错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能开始事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�交事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能回滚事务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLiteResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch row&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能获�行&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能执行语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to reset statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�置语�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind parameters&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能绑定�数&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Parameter count mismatch&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�数数��匹�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;没有查询&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptBreakpointsModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ID&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ID&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Condition&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore-count&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;忽略计数&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Single-shot&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hit-count&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;点击�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptBreakpointsWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;新建&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;删除&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebugger&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go to Line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;转至行&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;行：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Interrupt&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;中断&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift+F5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift+F5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Continue&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;继续&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step Into&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;进入&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F11&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F11&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step Over&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;越过&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F10&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F10&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step Out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;跳出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift+F11&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift+F11&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Run to Cursor&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�行到光标&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl+F10&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl+F10&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Run to New Script&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�行到新脚本&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Toggle Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;切�断点&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F9&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F9&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Debug Output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;清除调试输出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Error Log&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;清除错误日志&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Console&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;清除控制�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Find in Script...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在脚本中查找(&amp;amp;F)...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl+F&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl+F&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find &amp;amp;Next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;查找下一个(&amp;amp;N)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find &amp;amp;Previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;查找上一个(&amp;amp;P)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift+F3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift+F3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl+G&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl+G&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Debug&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;调试&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebuggerCodeFinderWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关闭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上一个&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下一个&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Case Sensitive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;区分大�写&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Whole words&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;整个�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;img src=&amp;quot;:/qt/scripttools/debugging/images/wrap.png&amp;quot;&amp;gt;&amp;amp;nbsp;Search wrapped&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;img src=&amp;quot;:/qt/scripttools/debugging/images/wrap.png&amp;quot;&amp;gt;&amp;amp;nbsp;�索已完�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebuggerLocalsModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�称&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;值&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebuggerStackModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Level&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;级别&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�称&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Toggle Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;切�断点&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Disable Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�用断点&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enable Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�用断点&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Breakpoint Condition:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;断点�件：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptEngineDebugger&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Loaded Scripts&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;已加载的脚本&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Breakpoints&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;断点&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stack&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;堆栈&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Locals&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;区域设置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Console&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;控制�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Debug Output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;调试输出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error Log&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;错误日志&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Search&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�索&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;查看&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Qt Script Debugger&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Qt脚本调试器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptNewBreakpointWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关闭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScrollBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll here&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;滚动到这里&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;左边缘&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;顶部&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�边缘&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bottom&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;底部&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;左一页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上一页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�一页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下一页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�左滚动&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�上滚动&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��滚动&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�下滚动&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�上排列&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Position&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�下排列&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSharedMemory&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: create size is less then 0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：创建的大��于 0&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：无法�定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to unlock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：无法�消�定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：��被拒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: already exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：已�存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: doesn&amp;apos;t exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：�存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: out of resources&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：资�耗尽了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：未知错误 %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: key is empty&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：键是空的&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: ftok failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：ftok 失败&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to make key&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：�能制造键&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: doesn&amp;apos;t exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：�存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: UNIX key file doesn&amp;apos;t exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：UNIX密钥文件�存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: system-imposed size restrictions&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：系统预设大��制&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: not attached&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：没有附加&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: invalid size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：无效大�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: key error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1: 键错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: size query failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：大�查询失败&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to set key on lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：无法设置�定的键&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QShortcut&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Space&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;空格&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Esc&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Esc&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tab&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Backtab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Backtab&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Backspace&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Backspace&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Return&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Return&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enter&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Enter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ins&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ins&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Del&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Del&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pause&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Print&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SysReq&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;SysReq&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Home&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Home&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;End&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;End&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Left&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Up&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Right&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Down&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PgUp&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;PgUp&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PgDown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;PgDown&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;CapsLock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;CapsLock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;NumLock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;NumLock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ScrollLock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ScrollLock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Menu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Help&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�退&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�进&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stop&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�止&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Refresh&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;刷新&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;调�音�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume Mute&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�音&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;调大音�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bass Boost&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;低音增强&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bass Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;调大低音&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bass Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;调�低音&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Treble Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;调大高音&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Treble Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;调�高音&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Play&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;多媒体播放&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Stop&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;多媒体�止&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上一个多媒体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下一个多媒体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Record&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;多媒体记录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Favorites&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;最喜爱的&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Search&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�索&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Standby&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;等待&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开URL&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch Mail&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动邮件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch Media&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动多媒体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (0)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动 (0)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动 (1)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (2)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动 (2)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (3)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动 (3)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (4)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动 (4)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (5)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动 (5)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (6)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动 (6)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (7)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动 (7)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (8)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动 (8)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (9)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动 (9)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (A)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动 (A)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (B)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动 (B)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (C)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动 (C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (D)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动 (D)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (E)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动 (E)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (F)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�动 (F)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Monitor Brightness Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�高监视器亮度&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Monitor Brightness Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�低监视器亮度&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Light On/Off&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;键盘�打开/关闭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Brightness Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�高键盘亮度&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Brightness Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�低键盘亮度&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Power Off&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关机&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wake Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;唤醒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Eject&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;弹出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Screensaver&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�幕�护程�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;WWW&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;WWW&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sleep&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�眠&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LightBulb&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�泡&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shop&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;商店&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;History&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;历�记录&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Add Favorite&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;添加收�夹&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hot Links&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;热点链接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Adjust Brightness&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;调节亮度&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Finance&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;财务&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Community&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;社区&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Rewind&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音频倒带&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�倒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Application Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;应用程��左&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Application Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;应用程���&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Book&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;书�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;CD&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;CD&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Calculator&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;计算器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;清除&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Grab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;清除抓�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;关闭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�制&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cut&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;剪切&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Display&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;显示&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DOS&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;DOS&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Documents&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文档&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Spreadsheet&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;电�表格&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Browser&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�览器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Game&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;游�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;转至&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;iTouch&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;iTouch&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Logoff&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;注销&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Market&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;市场&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Meeting&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;会议&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;键盘功能表&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Menu PB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;功能表PB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;My Sites&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;我的站点&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;News&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;新闻&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Home Office&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;家庭办公&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Option&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选项&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;粘贴&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Phone&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;手机&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reply&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;回�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reload&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�新加载&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rotate Windows&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;旋转视窗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rotation PB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;旋转PB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rotation KB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;旋转KB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;储存&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Send&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Spellchecker&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;拼写检查程�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Split Screen&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;分�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Support&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;支�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Task Panel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;任务��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Terminal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;终端&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tools&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;工具&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Travel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;旅行&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;视频&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Word Processor&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;字处�器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XFer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;XFer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom In&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;放大&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom Out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;缩�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Away&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;远离&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Messenger&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;##&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;WebCam&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;WebCam&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mail Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;电�邮件转�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pictures&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;图片&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Music&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Battery&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;电池&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bluetooth&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�牙&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wireless&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无线&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ultra Wide Band&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;超宽带&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音频�进&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Repeat&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音频��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Random Play&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音频�机播放&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Subtitle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�标题&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Cycle Track&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音频循环轨�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Time&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;时间&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;查看&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;顶端功能表&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Suspend&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;挂起&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hibernate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;休眠&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print Screen&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Print Screen&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page Up&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Page Down&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Caps Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Caps Lock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Num Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Num Lock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Number Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Number Lock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Scroll Lock&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Insert&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Delete&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Escape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Escape&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;System Request&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;System Request&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选择&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;是&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上下文1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上下文2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上下文3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上下文4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Call&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;呼�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hangup&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;挂起&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Flip&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;翻转&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Alt&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Alt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Meta&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Meta&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;+&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;+&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Home Page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSlider&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;左一页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上一页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Position&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�一页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下一页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSocks5SocketEngine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to proxy refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�拒�连接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to proxy closed prematurely&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�连接过早关闭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy host not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�主机未找到&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to proxy timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�连接超时&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy authentication failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�认�失败&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy authentication failed: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�认�失败: %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SOCKS version 5 protocol error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;SOCKS版本5�议错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;General SOCKSv5 server failure&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;常规�务器失败&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection not allowed by SOCKSv5 server&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;连接�被SOCKSv5�务器�许&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;TTL expired&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;TTL已过期&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SOCKSv5 command not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�支�的SOCKSv5命令&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Address type not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�支�的地�类型&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown SOCKSv5 proxy error code 0x%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知SOCKSv5代�，错误代� 0x%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;网络�作超时&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSoftKeyManager&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ok&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;确定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选择&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Done&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;完�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Options&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选项&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Exit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;退出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSpinBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;更多&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Less&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;更少&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSql&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;删除&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete this record?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;删除这�记录？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;是&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�入&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Update&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;更新&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save edits?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�存编辑？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Confirm&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;确认&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel your edits?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消您的编辑？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSslSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to write data: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能写入数�：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to decrypt data: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法解密数�：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error while reading: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;读�时错误：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error during SSL handshake: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;SSL�手错误：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error creating SSL context (%1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;创建SSL上下文错误（%1）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid or empty cipher list (%1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无效或者空白的密�列表（%1）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Private key does not certify public key, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�钥�能�明公钥，%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error creating SSL session, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;创建SSL会�错误，%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error creating SSL session: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;创建SSL会�错误：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot provide a certificate with no key, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能�供没有键的�书，%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error loading local certificate, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能载入本地�书，%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error loading private key, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能载入�有键，%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The issuer certificate could not be found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找�到�行人�书&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate signature could not be decrypted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�书签�无法解密&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The public key in the certificate could not be read&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法读��书中的公钥&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The signature of the certificate is invalid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�书签�无效&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate is not yet valid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�书��失效&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate has expired&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�书已过期&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate&amp;apos;s notBefore field contains an invalid time&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�书的notBefore字段包�无效时间&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate&amp;apos;s notAfter field contains an invalid time&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�书的notAfter字段包�无效时间&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate is self-signed, and untrusted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�书为自签�，因而��信任&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root certificate of the certificate chain is self-signed, and untrusted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�书链的根�书为自签�，因而��信任&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The issuer certificate of a locally looked up certificate could not be found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法找到在本地查找的�书的�行人�书&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No certificates could be verified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无�书�验�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;One of the CA certificates is invalid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;CA�书之一无效&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The basicConstraints path length parameter has been exceeded&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;已超过basicConstraints路径长度�数&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The supplied certificate is unsuitable for this purpose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�供的�书�适�此用途&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root CA certificate is not trusted for this purpose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;此用途�信任根CA�书&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root CA certificate is marked to reject the specified purpose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;已将根CA�书标记为拒�用于指定用途&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;当�候选�行人�书被拒�，因其�有人姓�与当��书的�行人姓��匹�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;当�候选�行人�书被拒�，因其�行人姓�和�列�虽存在，但与当��书的��密钥标识符�匹�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The peer did not present any certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;对方没有�供任何�书&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The host name did not match any of the valid hosts for this certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主机�与此�书的任何有效主机都�匹�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QStateMachine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Missing initial state in compound state &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��状�“%1�缺少�始状�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Missing default state in history state &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;历�状�“%1�缺少预设状�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No common ancestor for targets and source of transition from state &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;从状�&amp;quot;%1&amp;quot;过渡，但�和目标无共�父辈&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知错误&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSystemSemaphore&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: does not exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：�存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: out of resources&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：资�耗尽了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：��被拒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: already exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：已�存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：未知错误 %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTDSDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to open connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能打开连接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to use database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能使用数�库&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTabBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�左滚动&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��滚动&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTcpServer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation on socket is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;socket�作�被支�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTextControl&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;撤消(&amp;amp;U)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��(&amp;amp;R)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cu&amp;amp;t&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;剪切(&amp;amp;T)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�制(&amp;amp;C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy &amp;amp;Link Location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�制链接�置(&amp;amp;L)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;粘贴(&amp;amp;P)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;删除&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;选择全部&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QToolButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Press&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;按下&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;打开&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUdpSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;This platform does not support IPv6&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;这个平��支�IPv6&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUndoGroup&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;撤销&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUndoModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;empty&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;空白&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUndoStack&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;撤销&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUnicodeControlCharacterMenu&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LRM Left-to-right mark&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;LRM 从左到�标记&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;RLM Right-to-left mark&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;RLM 从��左标记&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ZWJ Zero width joiner&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ZWJ 零宽度连接器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ZWNJ Zero width non-joiner&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ZWNJ 零宽度�连接器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ZWSP Zero width space&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ZWSP 零宽度空格&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LRE Start of left-to-right embedding&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;LRE 开始从左到�嵌入&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;RLE Start of right-to-left embedding&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;RLE 开始从��左嵌入&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LRO Start of left-to-right override&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;LRO 开始从左��覆盖&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;RLO Start of right-to-left override&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;RLO 开始从��左覆盖&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PDF Pop directional formatting&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;PDF 弹出方�格�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert Unicode control character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�入Unicode控制字符&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWebFrame&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request cancelled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;请求被�消了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request blocked&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;请求被阻塞了&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot show URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法显示 URL&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Frame load interrupted by policy change&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;策略�化导致帧加载中断&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot show mimetype&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法显示 MIMETYPE&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File does not exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文件�存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWebPage&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Submit&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;default label for Submit buttons in forms on web pages&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Submit&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Submit (input element) alt text for &amp;lt;input&amp;gt; elements with no alt, title, or value&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reset&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;default label for Reset buttons in forms on web pages&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Choose File&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;title for file button used in HTML forms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;选择文件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No file selected&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;text to display in file button used in HTML forms when no file is selected&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;没有文件被选择&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open in New Window&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open in New Window context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;在新窗�中打开&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save Link...&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Download Linked File context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�存链接...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy Link&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Copy Link context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�制链接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open Image&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open Image in New Window context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;打开图片&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save Image&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Download Image context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�存图片&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy Image&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Copy Link context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�制图片&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open Frame&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open Frame in New Window context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;打开框架&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Copy context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�制&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go Back&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Back context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�退&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go Forward&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Forward context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�进&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stop&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Stop context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reload&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Reload context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�新载入&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cut&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Cut context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;剪切&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paste&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Paste context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;粘贴&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No Guesses Found&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;No Guesses Found context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;没有找到猜测&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Ignore Spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;忽略&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Add To Dictionary&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Learn Spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;添加到字典&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Search The Web&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Search The Web context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�索网页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Look Up In Dictionary&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Look Up in Dictionary context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;在字典中查找&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open Link&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open Link context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;打开链接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Ignore Grammar context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;忽略&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Spelling&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Spelling and Grammar context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show Spelling and Grammar&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;menu item title&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hide Spelling and Grammar&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;menu item title&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;��拼写和语法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check Spelling&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Check spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;检查拼写&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check Spelling While Typing&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Check spelling while typing context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;在输入时检查拼写&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check Grammar With Spelling&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Check grammar with spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;检查语法和拼写&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fonts&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Font context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;字体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bold&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Bold context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;粗体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Italic&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Italic context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�大利体&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Underline&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Underline context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Outline&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Outline context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;轮廓&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Direction&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Writing direction context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;方�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Text Direction&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Text direction context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Default&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Default writing direction context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;默认&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left to Right&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Left to Right context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;左到�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right to Left&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Right to Left context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�到左&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Loading...&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller status message when the media is loading&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;正在加载...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Live Broadcast&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller status message when watching a live broadcast&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;手机广播&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Element&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;音频元素&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video Element&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;视频元素&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mute Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�音按钮&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unmute Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�消�音按钮&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Play Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;播放按钮&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;暂�按钮&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Slider&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;滑�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Slider Thumb&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;滑�微缩图�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rewind Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;倒带按钮&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Return to Real-time Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;返回到实时按钮&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Elapsed Time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;耗时&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remaining Time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;剩余时间&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Status Display&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;状�显示&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fullscreen Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;全�按钮&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek Forward Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;��寻找按钮&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek Back Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;��寻找按钮&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio element playback controls and status display&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;音频元素播放控件和状�显示&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video element playback controls and status display&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;视频元素播放控件和状�显示&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mute audio tracks&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�音音轨&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unmute audio tracks&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�消�音音轨&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Begin playback&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;开始播放&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause playback&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;暂�播放&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Movie time scrubber&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;影片时间刷新器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Movie time scrubber thumb&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;影片时间刷新器微缩图�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rewind movie&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;影片倒带&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Return streaming movie to real-time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;将��影片返回到实时&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Current movie time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;当�影片时间&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remaining movie time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;影片剩余时间&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Current movie status&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;当�影片状�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Play movie in full-screen mode&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;以全�模�播放影片&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek quickly back&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;快速��寻找&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek quickly forward&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;快速��寻找&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Indefinite time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�定时间&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 days %2 hours %3 minutes %4 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1天%2�时%3分%4秒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 hours %2 minutes %3 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1�时%2分%3秒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 minutes %2 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1分%2秒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1秒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Inspect&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Inspect Element context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;检查&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No recent searches&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Label for only item in menu that appears when clicking on the search field image, when no searches have been performed&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;没有最近的�索&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Recent searches&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;label for first item in the menu that appears when clicking on the search field image, used as embedded menu title&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;最近的�索&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear recent searches&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;menu item in Recent Searches menu that empties menu&amp;apos;s contents&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;清除最近的�索&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Unknown filesize FTP directory listing item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Web Inspector - %2&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 (%2x%3 pixels)&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Title string for images&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1 （%2x%3 �素）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bad HTTP request&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;错误的 HTTP 请求&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;This is a searchable index. Enter search keywords: &lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;text that appears at the start of nearly-obsolete web pages in the form of a &amp;apos;searchable index&amp;apos;&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll here&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;滚动到这里&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;左边缘&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�边缘&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bottom&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;底部&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;左一页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上一页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�一页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下一页&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�左滚动&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�上滚动&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��滚动&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�下滚动&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message numerus="yes"&gt;</div><div class='add'>+            &lt;source&gt;%n file(s)&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;number of chosen file&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;</div><div class='add'>+                &lt;numerusform&gt;%n 个文件&lt;/numerusform&gt;</div><div class='add'>+            &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Alert - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;JavaScript警告 - %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Confirm - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;JavaScript确认 - %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Prompt - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;JavaScript�示 - %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Problem - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;JavaScript问题 - %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The script on this page appears to have a problem. Do you want to stop the script?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;此页上的脚本似乎有问题。是��止脚本？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the next character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移动光标到下一个字符&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the previous character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移动光标到上一个字符&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the next word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移动光标到下一个��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the previous word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移动光标到上一个��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the next line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移动光标到下一行&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the previous line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移动光标到上一行&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the start of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移动光标到行首&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the end of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移动光标到行尾&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the start of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移动光标到�首&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the end of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移动光标到�尾&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the start of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移动光标到文件开头&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the end of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移动光标到文件末尾&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select all&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;全选&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the next character&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the previous character&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the next word&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the previous word&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the next line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the previous line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the start of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the end of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the start of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the end of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the start of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the end of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete to the start of the word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;删除到��首&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete to the end of the word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;删除到��尾&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert a new paragraph&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�入新段�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert a new line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�入新行&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paste and Match Style&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;粘贴和匹�样�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remove formatting&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;删除格�设置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Strikethrough&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;删除线&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Subscript&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下标&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Superscript&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上标&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert Bulleted List&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�入项目符�列表&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert Numbered List&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�入编�列表&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Indent&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;缩进&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Outdent&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;凸出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Center&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;中心&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Justify&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;调整&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Align Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;左对�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Align Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�对�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWhatsThisAction&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;What&amp;apos;s This?&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;*&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWizard&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt; &amp;amp;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Finish&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go Back&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Continue&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Commit&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Done&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Next&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Next &amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWorkspace&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Restore&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Move&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mi&amp;amp;nimize&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ma&amp;amp;ximize&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stay on &amp;amp;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Minimize&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore Down&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sh&amp;amp;ade&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 - [%2]&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Unshade&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QXml&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;no error occurred&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error triggered by consumer&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unexpected end of file&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;more than one document type definition&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing element&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;tag mismatch&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing content&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unexpected character&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid name for processing instruction&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;version expected while reading the XML declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;wrong value for standalone declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing document type definition&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;letter is expected&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing comment&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing reference&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;internal general entity reference not allowed in DTD&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;external parsed general entity reference not allowed in attribute value&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;external parsed general entity reference not allowed in DTD&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unparsed entity reference in wrong context&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;recursive entities&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error in the text declaration of an external entity&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;encoding declaration or standalone declaration expected while reading the XML declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;standalone declaration expected while reading the XML declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QXmlPatternistCLI&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning in %1, at line %2, column %3: %4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1中出现警告，�于%2行，%3列：%4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning in %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1中出现警告：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知�置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error %1 in %2, at line %3, column %4: %5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%2中存在错误%1，�于%3行，%4列：%5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error %1 in %2: %3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%2中存在错误%1：%3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QXmlStream&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Extra content at end of document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid entity value.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid XML character.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sequence &amp;apos;]]&amp;gt;&amp;apos; not allowed in content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace prefix &amp;apos;%1&amp;apos; not declared&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute redefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unexpected character &amp;apos;%1&amp;apos; in public id literal.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid XML version string.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsupported XML version.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid encoding name.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Encoding %1 is unsupported&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Standalone accepts only yes or no.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid attribute in XML declaration.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Premature end of document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Expected &lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;, but got &amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unexpected &amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Expected character data.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Recursive entity detected.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Start tag expected.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XML declaration not at start of document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;NDATA in parameter entity declaration.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid processing instruction name.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid processing instruction name.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Illegal namespace declaration.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid XML name.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Opening and ending tag mismatch.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reference to unparsed entity &amp;apos;%1&amp;apos;.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Entity &amp;apos;%1&amp;apos; not declared.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reference to external entity &amp;apos;%1&amp;apos; in attribute value.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid character reference.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Encountered incorrectly encoded content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The standalone pseudo attribute must appear after the encoding.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid PUBLIC identifier.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QtXmlPatterns&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one component must be present.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;至少有一个组件被呈现。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid value of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是类型为 %2 的有效值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When casting to %1 from %2, the source value cannot be %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;当从 %2 抛出到 %1 时，�值�能是 %3。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;有效的布尔值(Effective Boolean Value)�能被用于计算一个包�两个或者更多原�值的�列。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The data of a processing instruction cannot contain the string %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;处�指令的数��能包�字符串 %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 是一个无效的 %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid XML 1.0 character.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是一个有效的 XML 1.0 字符。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 was called.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 被调用了。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In the replacement string, %1 must be followed by at least one digit when not escaped.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在这个替�字符串中，%1 在没有被转义的时候必须被至少一个数字跟�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In the replacement string, %1 can only be used to escape itself or %2, not %3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在这个替�字符串中，%1 �能被用于转义它本身或者 %2，而�是 %3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 matches newline characters&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 匹�了�行符&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Matches are case insensitive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;匹�是大�写��感的&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid regular expression pattern: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 是正则表达�中的一个无效模�：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It will not be possible to retrieve %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;将�能获� %1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The default collection is undefined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;默认收集(collection)是未定义的&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 cannot be retrieved&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法获� %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The item %1 did not match the required type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;项 %1 和所需的类型 %2 �匹�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an unknown schema type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 是一个未知的方案类型。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A template with name %1 has already been declared.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only one %1 declaration can occur in the query prolog.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�有一个 %1 的声明�以出现在查询�言中。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The initialization of variable %1 depends on itself&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�� %1 的�始化�赖于它本身&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The variable %1 is unused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�� %1 没有被使用&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Version %1 is not supported. The supported XQuery version is 1.0.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�支�版本 %1。被支�的 XQuery 版本是 1.0。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No function with signature %1 is available&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;没有签�为 %1 的�用函数。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It is not possible to redeclare prefix %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能��声明�缀 %1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Prefix %1 is already declared in the prolog.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�缀 %1 在�言中已�声明过了。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name of an option must have a prefix. There is no default namespace for options.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个选项的�称必须带有�缀。对于选项没有默认命�空间。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The Schema Import feature is not supported, and therefore %1 declarations cannot occur.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�支�方案导入(Schema Import)特性，并且因此 %1 声明�能出现。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The target namespace of a %1 cannot be empty.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 的目标命�空间�能为空。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The module import feature is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�支�模�导入特性&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;用户在一个库模�中定义的函数的命�空间必须和这个模�的命�空间一致。也就是说，它应该是 %1，而�是 %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A function already exists with the signature %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个带有签� %1 的函数已�存在。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No external functions are supported. All supported functions can be used directly, without first declaring them as external&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�支�外部函数。所有支�的函数必须�以被直接使用，�能把它们声明为外部的&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The %1-axis is unsupported in XQuery&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;这个 %1 轴在 XQuery 中是�被支�的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace URI cannot be the empty string when binding to a prefix, %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;当这个命�空间 URI 被绑定到一个�缀 %1 时，它�能是空字符串。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid namespace URI.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 是一个无效的命�空间 URI。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It is not possible to bind to the prefix %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;无法绑定到这个�缀 %1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Two namespace declaration attributes have the same name: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;两个命�空间声明属性使用了相�的�称：%1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace URI must be a constant and cannot use enclosed expressions.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;命�空间 URI 必须是一个常�并且�能使用�闭的表达�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是范围内属性声明。注�方案导入特性是�被支�的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;empty&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;空白&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;zero or one&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;零或者一&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;exactly one&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;确切地一&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;one or more&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一或者更多&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;zero or more&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;零或者更多&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The focus is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;焦点未定义。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An attribute by name %1 has already been created.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个�称为 %1 的属性已�被创建。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network timeout.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;网络超时。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 can&amp;apos;t be serialized because it appears outside the document element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;元素 %1 �能被串行化，因为它出现在文档元素之外。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Year %1 is invalid because it begins with %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 年是无效的，因为应该从 %2 开始。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Day %1 is outside the range %2..%3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 日是在 %2...%3 范围之外的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Month %1 is outside the range %2..%3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 月是在 %2...%3 范围之外的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Overflow: Can&amp;apos;t represent date %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;溢出：无法呈现数� %1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Day %1 is invalid for month %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 日对于 %2 月是无效的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; &lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;时间 24:%1:%2.%3 是无效的。�时是 24，但是分钟�秒和毫秒�全为 0； &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Time %1:%2:%3.%4 is invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;时间 %1:%2:%3.%4 是无效的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Overflow: Date can&amp;apos;t be represented.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;溢出：数�无法被呈现。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one time component must appear after the %1-delimiter.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;至少一个时间组件必须出现在这个 %1 界�之�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dividing a value of type %1 by %2 (not-a-number) is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个类型为 %1 的值除以 %2(�是一个数值)是��许的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个类型为 %1 的值除以 %2 或者 %3(正负零)是��许的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个类型为 %1 的值乘以 %2 或者 %3(正负无穷)是��许的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A value of type %1 cannot have an Effective Boolean Value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个类型为 %1 的值�能是一个有效的布尔值(Effective Boolean Value)。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value %1 of type %2 exceeds maximum (%3).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;类型为 %2 的值 %1 超过了最大值(%3)。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value %1 of type %2 is below minimum (%3).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;类型为 %2 的值 %1 超过了最�值(%3)。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A value of type %1 must contain an even number of digits. The value %2 does not.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;类型为 %1 的值必须包��数个数字。值 %2 �是这样的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not valid as a value of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是类型为 %2 的有效值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operator %1 cannot be used on type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�作符 %1 �能被用于类型 %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operator %1 cannot be used on atomic values of type %2 and %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�作符 %1 �能被用于类型为 %2 和 %3 的原�值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace URI in the name for a computed attribute cannot be %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个被计算的属性的�称中的命�空间 URI �能是 %1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name for a computed attribute cannot have the namespace URI %1 with the local name %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个被计算的属性的�称�能使用带有本地�称 %2 的命�空间 URI %1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type error in cast, expected %1, received %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;抛出类型错误，期望的是 %1，收到的是 %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;当抛出到 %1 或者它的派生类时，�类型必须是�一类型，或者它必须是一个字符串类型。类型 %2 是�被�许的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A comment cannot contain %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;注释�能包� %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A comment cannot end with a %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;注释�能以 %1 结尾。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个属性节点�能是一个文档节点的�节点。因此，这个属性 %1 所在�置是��适的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A library module cannot be evaluated directly. It must be imported from a main module.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个库模��能被直接评估。它必须从一个主模�中导入。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No template by name %1 exists.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;没有�为 %1 的模�存在。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;类型为 %1 的值�能被判断。一个判断必须是数值类型或者一个有效的布尔值(Effective Boolean Value)类型。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A positional predicate must evaluate to a single numeric value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个定�判断必须评估一个�一数值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个处�指令中的目标�称�能是任何大�写混�的 %1。因此，%2 是无效的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是处�指令的有效目标�称。它必须是值 %2，例如 %3。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个路径中的最�一步必须包�节点或者原�值。它�能是两者的一个组�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No namespace binding exists for the prefix %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;对于�缀 %1，没有存在绑定的命�空间。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No namespace binding exists for the prefix %1 in %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;对于 %2 中的�缀 %1，没有存在绑定的命�空间。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 的第一个�数�能是类型 %2 的。它必须是数字类型的，xs:yearMonthDuration 或者 xs:dayTimeDuration。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 的第一个�数�能是类型 %2 的。它必须是类型 %3�%4 或者 %5 的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 的第二个�数�能是类型 %2 的。它必须是类型 %3�%4 或者 %5 的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;如果两个值都有区�移(zone offset)，它们必须拥有相�的区�移。%1 和 %2 的区�移是��的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 must be followed by %2 or %3, not at the end of the replacement string.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 必须被 %2 或者 %3 跟�，�能在替�字符串的末尾。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 and %2 match the start and end of a line.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 和 %2 匹�了一行的头和尾。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Whitespace characters are removed, except when they appear in character classes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;空白字符被移除了，除�当它们出现在字符类中&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid flag for regular expressions. Valid flags are:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 是正则表达�中的一个无效标记。有效标记为：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;如果第一个�数是空�列或者零长度字符串(无命�空间)，那么就�能指定�缀。�缀 %1 被指定了。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�支�正规化(normalization)表� %1。被支�的表�是 %2�%3�%4 和 %5，以�无，例如空字符串(无正规化)。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A zone offset must be in the range %1..%2 inclusive. %3 is out of range.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;区�移(zone offset)必须在 %1...%2 范围之内。%3 是在范围之外的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Required cardinality is %1; got cardinality %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;所需�的表间关系是 %1；得到的表间关系�是 %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;编�方� %1 是无效的。它必须�包�拉�字符，必须�包�空白符�，并且必须和正则表达� %2 匹�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The keyword %1 cannot occur with any other mode name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;任何其他模��称�能出现关键字%1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No variable with name %1 exists&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The value of attribute %1 must be of type %2, which %3 isn&amp;apos;t.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The prefix %1 cannot be bound. By default, it is already bound to the namespace %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A variable with name %1 has already been declared.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No value is available for the external variable with name %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A stylesheet function must have a prefixed name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;样�表函数必须有一个�缀�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;命�空间 %1 是�留的；因此用户定义的函数�能使用它。请试试预定义的�缀 %2，它就是用于这�情况的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An argument with name %1 has already been declared. Every argument name must be unique.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;当函数%1被用于样�匹�时，�数必须是���考或者字符串。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在XSL-T样�中，函数%1的第一个�数必须是字符串，以便用于匹�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在XSL-T样�中，函数%1的第一个�数必须是文字或者���考，以便用于匹�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, function %1 cannot have a third argument.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在XSL-T样�中，函数%1�能有第三个�数。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在XSL-T样�中，�用函数%1和%2�以用于匹�，%3��以。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在XSL-T仰视中，�能使用%1轴，�能使用%2轴或者%3轴。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid template mode name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1�是一个�法的模�模��称。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个在 for 表达�中绑定的��的�称必须和这个定�����。因此，这两个�称为 %1 的��冲�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The Schema Validation Feature is not supported. Hence, %1-expressions may not be used.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�支�方案验�特性(Schema Validation Feature)。因此，也许�能使用 %1 表达�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;None of the pragma expressions are supported. Therefore, a fallback expression must be present&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�支�任何编译指示表达�(pragma expression)。因此，必须呈现一个回调表达�(fallback expression)。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Each name of a template parameter must be unique; %1 is duplicated.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�一个模��数的�称都必须是唯一的；%2是��的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No function with name %1 is available.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid numeric literal.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是一个有效的数字语义。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;W3C XML Schema identity constraint selector&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;W3C XML Schema identity constraint field&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A construct was encountered which is disallowed in the current language(%1).&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;命�空间 %1 �能和 %2 绑定(并且如果是这�情况，需���声明)。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�缀 %1 �能和 %2 绑定(并且如果是这�情况，需���声明)。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An attribute with name %1 has already appeared on this element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A direct element constructor is not well-formed. %1 is ended with %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个直接元素构造器没有很好地形�。%1 ��跟� %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name %1 does not refer to any schema type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�称 %1 没有指�任何方案类型。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 是一个��类型。无法抛出到��类型。因此，抛出到例如 %2 这样的原�类型是�以的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not an atomic type. Casting is only possible to atomic types.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是原�类型。�能抛出到原�类型。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid name for a processing-instruction.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1�是一个处�指令的�法�称。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name of an extension expression must be in a namespace.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一个扩展表达�的�称必须在一个命�空间中。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Required type is %1, but %2 was found.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;需�的类型是 %1，但是找到的是 %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Promoting %1 to %2 may cause loss of precision.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;把 %1 �级为 %2 会导致精度的�失。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It&amp;apos;s not possible to add attributes after any other kind of node.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能在任何其它类型节点�添加属性。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�支� Unicode 代�点校验(Unicode Codepoint Collation)(%1)。%2 是�被支�的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Integer division (%1) by zero (%2) is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;整数除法(%1)除零(%2)是未定义的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Division (%1) by zero (%2) is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;除法(%1)除零(%2)是未定义的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Modulus division (%1) by zero (%2) is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;求模除法(%1)除零(%2)是未定义的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message numerus="yes"&gt;</div><div class='add'>+            &lt;source&gt;%1 takes at most %n argument(s). %2 is therefore invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 最多�以有 %n 个�数。因此 %2 是无效的。&lt;/numerusform&gt;</div><div class='add'>+            &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message numerus="yes"&gt;</div><div class='add'>+            &lt;source&gt;%1 requires at least %n argument(s). %2 is therefore invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 需�至少 %n 个�数。因此 %2 是无效的。&lt;/numerusform&gt;</div><div class='add'>+            &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root node of the second argument to function %1 must be a document node. %2 is not a document node.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;函数 %1 的第二个�数的根节点必须是一个文档节点。%2 �是一个文档节点。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;用户定义函数的�字空间�能为空（试用为这�情况而存在的预定义�缀%1）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A default namespace declaration must occur before function, variable, and option declarations.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;默认命�空间声明必须出现在函数���和选项声明之�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace declarations must occur before function, variable, and option declarations.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;命�空间声明必须出现在函数���和选项声明之�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Module imports must occur before function, variable, and option declarations.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;模�导入�能出现在函数���和选项声明之�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a whole number of minutes.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是分钟的整数。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 can&amp;apos;t be serialized because it appears at the top level.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;属性 %1 �能被串行化，因为它出现在最顶层。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an unsupported encoding.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt; %1 是�被支�的编�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 contains octets which are disallowed in the requested encoding %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1包�了在请求编�%2中��许的八进�值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在使用编�%3的%2中出现的代�点%1�是一个有效的XML字符。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ambiguous rule match.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�糊规则匹�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In a namespace constructor, the value for a namespace cannot be an empty string.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The prefix must be a valid %1, which %2 is not.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�缀必须是有效的%1，而%2�是。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The prefix %1 cannot be bound.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�缀%1�能被绑定。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only the prefix %1 can be bound to %2 and vice versa.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�有�缀%1�以绑定到%2，�之也一样&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The parameter %1 is required, but no corresponding %2 is supplied.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;需��数%1，但是没有�供对应的%2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The parameter %1 is passed, but no corresponding %2 exists.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�数%1已传递，但没有相应的%2存在。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The URI cannot have a fragment&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;URI�能有片段&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed at this location.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;元素%1�能在这个�置。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Text nodes are not allowed at this location.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文本节点�能在这个�置。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Parse error: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;解�错误：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The value of the XSL-T version attribute must be a value of type %1, which %2 isn&amp;apos;t.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;XSL-T版本属性的值必须是%1类型的值，而%2�是。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Running an XSL-T 1.0 stylesheet with a 2.0 processor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在XSL-T 2.0处�器中�行一个1.0的样�表。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown XSL-T attribute %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的XSL-T属性%1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 and %2 are mutually exclusive.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;属性%1和%2彼此互斥。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In a simplified stylesheet module, attribute %1 must be present.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在一个简化样�表模�中，属性%1必须存在。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;If element %1 has no attribute %2, it cannot have attribute %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;如果元素%1没有属性%2，那么它也�能有属性%3或者%4。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 must have at least one of the attributes %2 or %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;元素%1必须至少有属性%2或者%3其中一个。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one mode must be specified in the %1-attribute on element %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在元素%2的%1属性中至少�指定一个模�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 must come last.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;元素%1必须最�出现。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one %1-element must occur before %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;至少一个元素%1�出现在%2之�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only one %1-element can appear.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能出现一个元素%1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one %1-element must occur inside %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;至少一个元素%1�出现在%2之内。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When attribute %1 is present on %2, a sequence constructor cannot be used.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;当属性%1出现在%2中时，�能使用顺�构造。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 must have either a %2-attribute or a sequence constructor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;元素%1必须有在一个%2属性或者顺�构造。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;当需��数时，�能通过属性%1或者顺�构造�供默认值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 cannot have children.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;元素%1�能有�元素。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 cannot have a sequence constructor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;元素%1�能有顺�构造。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The attribute %1 cannot appear on %2, when it is a child of %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;属性%1�能出现在%2中，因为它是%3的�元素。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A parameter in a function cannot be declared to be a tunnel.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;函数内的�数�能被声明为通�(tunnel)。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;This processor is not Schema-aware and therefore %1 cannot be used.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;这个处�器�能感知Schema，因此%1�能被使用。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top level stylesheet elements must be in a non-null namespace, which %1 isn&amp;apos;t.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;顶级样�表元素必须是在�空命�空间中的，而%1�是。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The value for attribute %1 on element %2 must either be %3 or %4, not %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;元素%2中属性%1的值必须是%3或者%4，而�是%5。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 cannot have the value %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;属性%1的值�能是%2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The attribute %1 can only appear on the first %2 element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;属性%1�能出现在�%2个元素中。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one %1 element must appear as child of %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%2必须至少�一个�元素%1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 has inheritance loop in its base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Circular inheritance of base type %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Circular inheritance of union %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by restriction as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by extension as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type of simple type %1 cannot be complex type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 cannot have direct base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 is not allowed to have base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 can only have simple atomic type as base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 cannot derive from %2 as the latter defines restriction as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Variety of item type of %1 must be either atomic or union.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Variety of member types of %1 must be atomic.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by list as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 is only allowed to have %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type of simple type %1 must have variety of type list.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type of simple type %1 has defined derivation by restriction as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Item type of base type does not match item type of %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 contains not allowed facet type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by union as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to have any facets.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of simple type %2 must have variety of union.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Member type %1 cannot be derived from member type %2 of %3&amp;apos;s base type %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derivation method of %1 must be extension because the base type %2 is a simple type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 has duplicated element %2 in its content model.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 has non-deterministic content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content model of complex type %1 is not a valid extension of content model of %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 must have simple content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 must have the same simple type as its base class %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 cannot be derived from base type %2%3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 with simple content cannot be derived from complex base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Item type of simple type %1 cannot be a complex type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Member type of simple type %1 cannot be a complex type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to have a member type with the same name as itself.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet collides with %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must have the same value as %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be equal or greater than %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than or equal to %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet contains invalid regular expression&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown notation %1 used in %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet contains invalid value %2: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet cannot be %2 or %3 if %4 facet of base type is %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet cannot be %2 if %3 facet of base type is %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than or equal to %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet and %2 facet cannot appear together.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be greater than %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be greater than or equal to %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type contains not allowed facet %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only %1 and %2 facets are allowed when derived by union.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 contains %2 facet with invalid data: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 contains attribute %2 twice.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 contains two different attributes that both have types derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 contains attribute %2 twice.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 contains two different attributes that both have types derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed to have a value constraint if its base type is complex.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed to have a value constraint if its type is derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value constraint of element %1 is not of elements type: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed to have substitution group affiliation as it is no global element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of element %1 cannot be derived from type of substitution group affiliation.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value constraint of attribute %1 is not of attributes type: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 has value constraint but has type derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute in derived complex type must be %2 like in base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 in derived complex type must have %2 value constraint like in base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 in derived complex type must have the same %2 value constraint like in base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 in derived complex type must have %2 value constraint.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;processContent of base wildcard must be weaker than derived wildcard.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 exists twice with different types.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Particle contains non-deterministic wildcards.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base attribute %1 is required but derived attribute is not.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of derived attribute %1 cannot be validly derived from type of base attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value constraint of derived attribute %1 does not match value constraint of base attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived attribute %1 does not exist in the base definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived attribute %1 does not match the wildcard in the base definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base attribute %1 is required but missing in derived definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived definition contains an %1 element that does not exists in the base definition&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived wildcard is not a subset of the base wildcard.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 of derived wildcard is not a valid restriction of %2 of base wildcard&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 from base type is missing in derived type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of derived attribute %1 differs from type of base attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base definition contains an %1 element that is missing in the derived definition&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 references unknown %2 or %3 element %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 references identity constraint %2 that is no %3 or %4 element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 has a different number of fields from the identity constraint %2 that it references.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Item type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Member type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of complex type cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 cannot have complex base type that has a %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of %1 element must be a simple type, %2 is not.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Substitution group %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Substitution group %1 has circular definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duplicated element names %1 in %2 element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reference %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Circular group reference for %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed in this scope&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element cannot have %2 attribute with value other than %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element cannot have %2 attribute with value other than %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 or %2 attribute of reference %3 does not match with the attribute declaration %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 has circular reference.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute in %2 must have %3 use like in base type %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 has attribute wildcard but its base type %2 has not.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enumeration facet contains invalid content: {%1} is not a value of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace prefix of qualified name %1 is not defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element %2 is not a valid restriction of the %3 element it redefines: %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Empty particle cannot be derived from non-empty particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived particle is missing element %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived element %1 is missing value constraint as defined in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived element %1 has weaker value constraint than base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fixed value constraint of element %1 differs from value constraint in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived element %1 cannot be nillable as base element is not nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Block constraints of derived element %1 must not be more weaker than in the base element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type of derived element %1 cannot be validly derived from base element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type of derived element %1 cannot be validly derived from base element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is missing in derived particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 does not match namespace constraint of wildcard in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wildcard in derived particle is not a valid subset of wildcard in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;processContent of wildcard in derived particle is weaker than wildcard in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived particle allows content that is not allowed in the base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Can not process unknown element %1, expected elements are: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed in this scope, possible elements are: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Child element is missing in that scope, possible child elements are: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Document is not a XML schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element contains invalid content: {%3} is not a value of type %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element contains invalid content: {%3}.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed to have the same %2 attribute value as the target namespace %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element without %2 attribute is not allowed inside schema without target namespace.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed inside %2 element if %3 attribute is present.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element has neither %2 attribute nor %3 child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element with %2 child element must not have a %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must be %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must have a value of %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must have a value of %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element must not have %2 and %3 attribute together.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of %1 attribute of %2 element must not be from namespace %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must not be %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must have the value %3 because the %4 attribute is set.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Specifying use=&amp;apos;prohibited&amp;apos; inside an attribute group has no effect.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element must have either %2 or %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element must have either %2 attribute or %3 or %4 as child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element requires either %2 or %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Text or entity references not allowed inside %1 element&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must contain %3, %4 or a list of URIs.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed in this context.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element has larger value than %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Prefix of qualified name %1 is not defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must either contain %3 or the other values.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Component with ID %1 has been defined previously.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element group %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Notation %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Identity constraint %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duplicated facets in simple type %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not valid according to %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match the length facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match the minLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match the maxLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match in the totalDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match in the totalDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decimal content does not match in the fractionDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decimal content does not match in the totalDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Boolean content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content does not match the length facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content does not match the minLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content does not match the maxLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid QName content: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QName content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QName content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Notation content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match length facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match minLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match maxLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Union content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Union content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Data of type %1 are not allowed to be empty.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is missing child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;There is one IDREF value with no corresponding ID: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Loaded schema file is invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 contains invalid data.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;xsi:schemaLocation namespace %1 has already appeared earlier in the instance document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No schema defined for validation.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No definition for element %1 available.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Specified type %1 is not known to the schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not defined in this scope.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Declaration for element %1 does not exist.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains invalid content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is declared as abstract.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 contains invalid data: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element contains content although it is nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fixed value constraint not allowed if element is nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 cannot contain other elements, as it has a fixed content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Specified type %1 is not validly substitutable with element type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 is not allowed to be abstract.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed attributes.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of element %1 does not match its type definition: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of element %1 does not match defined value constraint.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed child content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed text content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is missing required attribute %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 does not match the attribute wildcard.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Declaration for attribute %1 does not exist.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains two attributes of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 contains invalid content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains unknown attribute %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of attribute %1 does not match its type definition: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of attribute %1 does not match defined value constraint.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Non-unique value found for constraint %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Key constraint %1 contains absent fields.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Key constraint %1 contains references nillable element %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No referenced value found for key reference %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More than one value found for field %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Field %1 has no simple type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ID value &amp;apos;%1&amp;apos; is not unique.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;apos;%1&amp;apos; attribute contains invalid QName content: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+&lt;/TS&gt;</div><div class='head'>diff --git a/config.profiles/symbian/translations/qt_zh_tw_symbian.ts b/config.profiles/symbian/translations/qt_zh_tw_symbian.ts<br/>new file mode 100644<br/>index 0000000..c9eb563<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/translations/qt_zh_tw_symbian.ts?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/translations/qt_zh_tw_symbian.ts</a></div><div class='hunk'>@@ -0,0 +1,8505 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='add'>+&lt;!DOCTYPE TS&gt;</div><div class='add'>+</div><div class='add'>+&lt;TS version="2.0" language="zh_tw"&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;CloseButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close Tab&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;FakeReply&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fake error !&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�錯誤�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;URL無效&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Notifications&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Music&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Communication&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Games&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Accessibility&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::AudioOutput&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;html&amp;gt;The audio playback device &amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt; does not work.&amp;lt;br/&amp;gt;Falling back to &amp;lt;b&amp;gt;%2&amp;lt;/b&amp;gt;.&amp;lt;/html&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;html&amp;gt;音訊播放�置&amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt;無法�作。&amp;lt;br/&amp;gt;正在切�回&amp;lt;b&amp;gt;%2&amp;lt;/b&amp;gt;。&amp;lt;/html&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;html&amp;gt;Switching to the audio playback device &amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt;&amp;lt;br/&amp;gt;which just became available and has higher preference.&amp;lt;/html&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;html&amp;gt;正在切�到音訊播放�置&amp;lt;b&amp;gt;%1&amp;lt;/b&amp;gt;，&amp;lt;br/&amp;gt;該�置剛變��使用，而且優先順�較高。&amp;lt;/html&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Revert back to device &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;切�回�置&amp;quot;%1&amp;quot;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::Gstreamer::Backend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning: You do not seem to have the package gstreamer0.10-plugins-good installed.</div><div class='add'>+          Some video features have been disabled.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning: You do not seem to have the base GStreamer plugins installed.</div><div class='add'>+          All audio and video support has been disabled&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::Gstreamer::MediaObject&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot start playback. </div><div class='add'>+</div><div class='add'>+Check your GStreamer installation and make sure you </div><div class='add'>+have libgstreamer-plugins-base installed.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A required codec is missing. You need to install the following codec(s) to play this content: %0&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open media source.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid source type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not locate media source.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open audio device. The device is already in use.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not decode media source.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音訊輸出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The audio output device&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音訊輸出�置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;沒有錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找�到&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Out of memory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;記憶體�足&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�支�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Overflow&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;溢�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Underflow&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Already exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;已經存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Path not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找�到路徑&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In use&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;使用中&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not ready&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未就緒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Access denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;拒絕存�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法連線&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Disconnected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;已中斷連線&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;權��足&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insufficient bandwidth&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;頻寬�足&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network unavailable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;網路無法使用&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network communication error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;網路通訊錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Streaming not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�支�串�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Server alert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;伺�器警告&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid protocol&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;通訊�定無效&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;URL無效&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multicast error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;多點傳�錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Proxy伺�器錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�支�的Proxy伺�器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio output error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音訊輸出錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video output error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;視訊輸出錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decoder error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;解碼器錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio or video components could not be played&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音訊或視訊元件無法播放&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DRM error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;DRM錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error (%1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�明錯誤(%1)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::AbstractMediaPlayer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not ready to play&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;尚未準備好播放&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟檔案時發生錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟URL時發生錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Setting volume failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音�設定失敗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Playback complete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;播放完�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::AudioEqualizer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 Hz&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 Hz&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::AudioPlayer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Getting position failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�得�置失敗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Opening clip failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟檔案失敗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::EffectFactory&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enabled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;已啟用&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::EnvironmentalReverb&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decay HF ratio (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;衰減HF比率(%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decay time (ms)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;衰減時間(ms)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Density (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;密度(%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Diffusion (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;擴散(%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reflections delay (ms)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�射延�(ms)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reflections level (mB)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�射電平(mB)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverb delay (ms)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;殘響延�(ms)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverb level (mB)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;殘響電平(mB)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Room HF level&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;空間HF電平&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Room level (mB)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;空間電平(mB)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::MediaObject&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening source: type not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟來�時發生錯誤：�支�的類型&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening source: media type could not be determined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟來�時發生錯誤：無法判斷媒體類型&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::StereoWidening&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Level (%)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;電平(%)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::MMF::VideoPlayer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;暫�失敗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�尋失敗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Getting position failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�得�置失敗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Opening clip failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟檔案失敗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Buffering clip failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;檔案緩�處�失敗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video display error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;視訊顯示錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Phonon::VolumeSlider&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume: %1%&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Use this slider to adjust the volume. The leftmost position is 0%, the rightmost is %1%&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Muted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;已�音&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3Accel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1, %2 not defined&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ambiguous %1 not handled&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3DataTable&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;True&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;False&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Update&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3FileDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy or Move a File&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*)&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attributes&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Look &amp;amp;in:&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File &amp;amp;name:&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File &amp;amp;type:&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;One directory up&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Create New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List View&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Detail View&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Preview File Info&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Preview File Contents&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read-write&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read-only&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write-only&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Inaccessible&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symlink to File&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symlink to Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symlink to Special&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dir&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Special&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save As&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Rename&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;R&amp;amp;eload&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort by &amp;amp;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort by &amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort by &amp;amp;Date&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Unsorted&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sort&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show &amp;amp;hidden files&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;the file&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;the directory&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;the symlink&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete %1&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;qt&amp;gt;Are you sure you wish to delete %1 &amp;quot;%2&amp;quot;?&amp;lt;/qt&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;No&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder 1&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;新資料夾&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;新資料夾 %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directories&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directory:&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1</div><div class='add'>+File not found.</div><div class='add'>+Check path and filename.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*.*)&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open &lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select a Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3LocalFs&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not read directory</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not create directory</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not remove file or directory</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not rename</div><div class='add'>+%1</div><div class='add'>+to</div><div class='add'>+%2&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not write</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3MainWindow&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line up&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Customize...&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3NetworkProtocol&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation stopped by the user&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3ProgressDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3TabDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Apply&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Defaults&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3TextEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cu&amp;amp;t&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3TitleBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;System&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore up&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Minimize&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore down&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Maximize&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Contains commands to manipulate the window&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Puts a minimized window back to normal&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Moves the window out of the way&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Puts a maximized window back to normal&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Makes the window full screen&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Closes the window&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Displays the name of the window and contains controls to manipulate it&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3ToolBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More...&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3UrlOperator&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support listing directories&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support creating new directories&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support removing files or directories&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support renaming files or directories&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support getting files&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support putting files&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The protocol `%1&amp;apos; does not support copying or moving files or directories&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;(unknown)&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;Q3Wizard&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt; &amp;amp;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Next &amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Finish&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAbstractSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host not found&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation on socket is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Socket operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Socket is not connected&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network unreachable&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAbstractSpinBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Step up&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step &amp;amp;down&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAccessibleButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Press&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;按&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QApplication&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QT_LAYOUT_DIRECTION&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Translate this string to the string &amp;apos;LTR&amp;apos; in left-to-right languages or to &amp;apos;RTL&amp;apos; in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Executable &amp;apos;%1&amp;apos; requires Qt %2, found Qt %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Incompatible Qt Library Error&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Activate&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Activates the program&amp;apos;s main window&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QAxSelect&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select ActiveX Control&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;COM &amp;amp;Object:&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QCheckBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Uncheck&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Toggle&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QColorDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hu&amp;amp;e:&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Sat:&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Val:&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Red:&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Green:&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bl&amp;amp;ue:&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A&amp;amp;lpha channel:&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select Color&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Basic colors&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Custom colors&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Add to Custom Colors&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QComboBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;False&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;True&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QCoreApplication&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: key is empty&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to make key&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: ftok failed&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: already exists&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: does not exist&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1：�存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: out of resources&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QSystemSemaphore&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDB2Driver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to set autocommit&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDB2Result&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind variable&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch record %1&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch next&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch first&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDateTimeEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;AM&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;am&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PM&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;pm&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDial&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QDial&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SpeedoMeter&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SliderHandle&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;What&amp;apos;s This?&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Done&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDialogButtonBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Apply&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reset&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Don&amp;apos;t Save&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Discard&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Yes to &amp;amp;All&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;No&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;N&amp;amp;o to All&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save All&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Abort&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Retry&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore Defaults&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close without Saving&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDirModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Kind&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Match OS X Finder&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date Modified&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDockWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dock&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Float&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QDoubleSpinBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Less&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QErrorMessage&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Show this message again&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�度顯示此訊�(&amp;amp;S)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Debug Message:&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;警告：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fatal Error:&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFile&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Destination file exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;目標檔已存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Will not rename sequential file using block copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;使用�塊複製將�會�新命�循�檔&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot remove source file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法移除來�檔&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open %1 for input&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開啟 %1 以輸入&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open for output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開啟 %1 以輸出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Failure to write block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;寫入�塊時失敗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot create %1 for output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法建立 %1 以輸出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFileDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;所有檔案 (*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;返回&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列表檢視&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Detail View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;詳細檢視&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;檔案&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save As&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�存新檔&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟(&amp;amp;O)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;儲存(&amp;amp;S)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Recent Places&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;最近的地方&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Rename&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�新命�(&amp;amp;R)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;刪除(&amp;amp;D)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show &amp;amp;hidden files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;顯示隱�檔(&amp;amp;H)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;新資料夾&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;尋找目錄&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directories&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;目錄&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;All Files (*.*)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;所有檔案 (*.*)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Directory:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;目錄：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 already exists.</div><div class='add'>+Do you want to replace it?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 已存在</div><div class='add'>+您��代它嗎？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1</div><div class='add'>+File not found.</div><div class='add'>+Please verify the correct file name was given.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1</div><div class='add'>+找�到檔案。</div><div class='add'>+請檢查檔�是�正確。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;My Computer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;我的電腦&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Parent Directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;父目錄&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Files of type:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;檔案型態：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1</div><div class='add'>+Directory not found.</div><div class='add'>+Please verify the correct directory name was given.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1</div><div class='add'>+找�到目錄。</div><div class='add'>+請檢查目錄�稱是�正確。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;apos;%1&amp;apos; is write protected.</div><div class='add'>+Do you want to delete it anyway?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 有寫入�護。</div><div class='add'>+您確定�刪除它嗎？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Are sure you want to delete &amp;apos;%1&amp;apos;?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;您確定�刪除 %1 嗎？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not delete directory.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法刪除目錄。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Drive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�碟&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File Folder&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Match Windows Explorer&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;檔案資料夾&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Folder&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;資料夾&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Alias&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Mac OS X Finder&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;別�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shortcut&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�徑&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show &lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;顯示 &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;往�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;新增資料夾(&amp;amp;N)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Choose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�擇(&amp;amp;C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remove&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移除&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File &amp;amp;name:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;檔�(&amp;amp;N)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Look in:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;尋找於：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Create New Folder&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;建立新資料夾&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFileSystemModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 TB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 TB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 GB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 GB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 MB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 MB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 KB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 KB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 bytes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �元組&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid filename&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��法的檔�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;b&amp;gt;The name &amp;quot;%1&amp;quot; can not be used.&amp;lt;/b&amp;gt;&amp;lt;p&amp;gt;Try using another name, with fewer characters or no punctuations marks.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;b&amp;gt;無法使用�稱 &amp;quot;%1&amp;quot;。&amp;lt;/b&amp;gt;&amp;lt;p&amp;gt;請使用其它�稱，字元數少一點，或是��有標點符號。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�稱&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;大�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Kind&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Match OS X Finder&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;種類&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;All other platforms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;型態&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date Modified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;變更日期&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;My Computer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;我的電腦&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Computer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;電腦&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 byte(s)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1�元組&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFontDatabase&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Normal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;正常&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bold&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;粗體&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Demi Bold&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�粗體&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Black&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;黑體&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Demi&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�體&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Light&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;輕體&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Italic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;斜體&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Oblique&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;傾斜體&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Any&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;任何&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Latin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;拉�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Greek&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;希臘&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cyrillic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;斯拉夫&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Armenian&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;亞美尼亞&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hebrew&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;希伯來&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Arabic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;阿拉伯&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Syriac&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;敘利亞&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Thaana&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Thaana&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Devanagari&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Devanagari&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bengali&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;孟加拉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Gurmukhi&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Gurmukhi&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Gujarati&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Gujarati&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Oriya&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Oriya&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tamil&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�米爾&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Telugu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Telugu&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Kannada&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��那&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Malayalam&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;馬來語&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sinhala&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;錫蘭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Thai&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;泰語&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Lao&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;寮國&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tibetan&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;西�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Myanmar&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;緬甸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Georgian&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;喬治亞&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Khmer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;高棉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simplified Chinese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;簡體中文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Traditional Chinese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�體中文&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Japanese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;日語&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Korean&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;韓語&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Vietnamese&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;越�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Symbol&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;符號&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ogham&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�甘&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Runic&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;盧�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;N&amp;apos;Ko&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;N&amp;apos;Ko&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFontDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Font&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;字型(&amp;amp;F)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Font st&amp;amp;yle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;字型樣�(&amp;amp;Y)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;大�(&amp;amp;S)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Effects&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;效果&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stri&amp;amp;keout&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;刪除線(&amp;amp;K)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Underline&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;底線(&amp;amp;U)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sample&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;範例&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select Font&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�擇字型&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wr&amp;amp;iting System&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;寫入系統(&amp;amp;I)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QFtp&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找到主機 %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找到主機&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;已連接到主機 %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;已連線到主機&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to %1 closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;到 %1 的連線已關閉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;連線已關閉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找�到主機 %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;連線到主機 %1 被拒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection timed out to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;連線到主機 %1 逾時&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connecting to host failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;連線到主機失敗：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Login failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;登入失敗：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Listing directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列出目錄時失敗：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Changing directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;變更目錄時失敗：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Downloading file failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下載檔案時失敗：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Uploading file failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上傳檔案時失敗：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Removing file failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移除檔案時失敗：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Creating directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;建立目錄時失敗：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Removing directory failed:</div><div class='add'>+%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移除目錄時失敗：</div><div class='add'>+%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Not connected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未連線&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused for data connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;資料連線被拒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHostInfo&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHostInfoAgent&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找�到主機&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown address type&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的��型態&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No host name given&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未�供主機�稱&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid hostname&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主機�稱無效&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHttp&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;連線被拒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找�到主機 %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wrong content length&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;錯誤的內容長度&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;HTTP request failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;HTTP �求失敗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host %1 found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找到主機 %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找到主機&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;已連接到主機 %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connected to host&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;已連線到主機&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to %1 closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;到 %1 的連線已關閉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;連線已關閉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request aborted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�求中止&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No server set to connect to&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;沒有設定�連線到哪個伺�器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Server closed connection unexpectedly&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;伺�器無�警關閉連線&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid HTTP response header&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��法的 HTTP 回覆標頭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown authentication method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�明的驗證方法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid HTTP chunked body&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��法的 HTTP �塊主體&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error writing response to device&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;寫入回應到�置時發生錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�伺�器需��證&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;需��證&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy requires authentication&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�伺�器需��證&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host requires authentication&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主機需��證&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Data corrupted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;資料已�毀&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SSL handshake failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;SSL �通失敗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown protocol specified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;指定了未知的�定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused (or timed out)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;連線被拒（或連線逾時）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;HTTPS connection requested but SSL support not compiled in&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;HTTPS 連線需�的 SSL 支�並未編譯進來&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QHttpSocketEngine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Did not receive HTTP response from proxy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未從代�伺�器接收到 HTTP 回應&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error parsing authentication request from proxy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;剖�從代�伺�器傳來的�證�求時發生錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;需��證&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy denied connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�伺�器拒絕連線&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error communicating with HTTP proxy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;與 HTTP 代�伺�器�繫時發生錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找�到代�伺�器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�伺�器連線被拒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy server connection timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�伺�器連線逾時&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy connection closed prematurely&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�伺�器連線已�正常關閉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QIBaseDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟資料庫發生錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not start transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開始事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�交事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�轉事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QIBaseResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to create BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法建立 BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to write BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法寫入 BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to open BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開啟 BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to read BLOB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法讀� BLOB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not find array&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找�到陣列&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not get array data&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�得陣列資料&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not get query info&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�得查詢資訊&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not start transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開始事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�交事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not allocate statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�置敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法準備敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not describe input statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�述輸入敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not describe statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�述敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to close statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法關閉敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法執行查詢&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not fetch next item&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法抓�下一個項目&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not get statement info&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�得敘述資訊&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QIODevice&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;權��足&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Too many open files&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟�多檔案&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No such file or directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找�到該檔案或目錄&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No space left on device&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置上已無空間&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QInputContext&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XIM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;XIM&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;FEP&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;FEP&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XIM input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;XIM 輸入法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Windows input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Windows 輸入法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mac OS X input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Mac OS X 輸入法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;S60 FEP input method&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;S60 FEP輸入法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QInputDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enter a value:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;請輸入值：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLibrary&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not mmap &amp;apos;%1&amp;apos;: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法 mmap &amp;apos;%1&amp;apos;：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Plugin verification data mismatch in &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在 %1 中的外掛程�確�資料�符�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not unmap &amp;apos;%1&amp;apos;: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法 unmap &amp;apos;%1&amp;apos;：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin &amp;apos;%1&amp;apos; uses incompatible Qt library. (%2.%3.%4) [%5]&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;外掛程� %1 使用�相容的 Qt 函�庫（%2.%3.%4）�%5】&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin &amp;apos;%1&amp;apos; uses incompatible Qt library. Expected build key &amp;quot;%2&amp;quot;, got &amp;quot;%3&amp;quot;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;外掛程� %1 使用�相容的 Qt 函�庫。�期建構鑰 %2，�得到 %3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The shared library was not found.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找�到分享函�庫&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The file &amp;apos;%1&amp;apos; is not a valid Qt plugin.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;檔案 %1 �是�法的 Qt 外掛程�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin &amp;apos;%1&amp;apos; uses incompatible Qt library. (Cannot mix debug and release libraries.)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;外掛程� %1 使用�相容的 Qt 函�庫。（�能將除錯與釋出版的函�庫混在一起。）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot load library %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法載入函�庫 %1：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot unload library %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�載函�庫 %1：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot resolve symbol &amp;quot;%1&amp;quot; in %2: %3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�解 %2 內的符號 %1：%3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLineEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;全部�擇&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;復原(&amp;amp;U)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��(&amp;amp;R)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cu&amp;amp;t&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;剪下(&amp;amp;T)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;複製(&amp;amp;C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;貼上(&amp;amp;P)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;刪除&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLocalServer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Name error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：�稱錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：存�被拒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Address in use&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：��使用中&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：未知的錯誤 %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QLocalSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：連線被拒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Remote closed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：�端已關閉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Invalid name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：��法的�稱&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Socket access error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：Socket ��錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Socket resource error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：Socket 資�錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Socket operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：Socket �作逾時&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Datagram too large&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：資料包�大&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Connection error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：連線錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: The socket operation is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：socket �作未支�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：未知的錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: Unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：未知的錯誤 %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMYSQLDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to open database &amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開啟資料庫&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法連線&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開始事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�交事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�轉事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMYSQLResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch data&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法抓�資料&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法執行查詢&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to store result&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法儲存�果&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法準備敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to reset statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�置敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法��數值&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法執行敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind outvalues&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法��輸出值&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to store statement results&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法儲存敘述�果&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute next query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法執行下一個查詢&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to store next result&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法儲存下一個�果&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMdiArea&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;(Untitled)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;（未命�）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMdiSubWindow&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 - [%2]&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 - [%2]&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;關閉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Minimize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;最�化&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�下�復&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Restore&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;回復(&amp;amp;R)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Move&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移動(&amp;amp;M)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;大�(&amp;amp;S)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mi&amp;amp;nimize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;最�化(&amp;amp;N)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ma&amp;amp;ximize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;最大化(&amp;amp;X)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stay on &amp;amp;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;留在頂端(&amp;amp;T)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;關閉(&amp;amp;C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Maximize&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;最大化&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unshade&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消�蔽&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shade&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�蔽&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;回復&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;說明&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�單&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;- [%1]&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;- [%1]&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMenu&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;關閉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Execute&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;執行&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMenuBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Actions&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;動作&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMessageBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;確定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;h3&amp;gt;About Qt&amp;lt;/h3&amp;gt;&amp;lt;p&amp;gt;This program uses Qt version %1.&amp;lt;/p&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;h3&amp;gt;關於Qt&amp;lt;/h3&amp;gt;&amp;lt;p&amp;gt;本程�使用Qt %1版。&amp;lt;/p&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;p&amp;gt;Qt is a C++ toolkit for cross-platform application development.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt provides single-source portability across MS&amp;amp;nbsp;Windows, Mac&amp;amp;nbsp;OS&amp;amp;nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt is available under three different licensing options designed to accommodate the needs of our various users.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Please see &amp;lt;a href=&amp;quot;http://qt.nokia.com/products/licensing&amp;quot;&amp;gt;qt.nokia.com/products/licensing&amp;lt;/a&amp;gt; for an overview of Qt licensing.&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt is a Nokia product. See &amp;lt;a href=&amp;quot;http://qt.nokia.com/&amp;quot;&amp;gt;qt.nokia.com&amp;lt;/a&amp;gt; for more information.&amp;lt;/p&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;p&amp;gt;Qt是一套應用於跨平�應用程�開發的C++工具集。&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt�供橫跨MS&amp;amp;nbsp;Windows�Mac&amp;amp;nbsp;OS&amp;amp;nbsp;X�Linux��主�商業Unix系統的單一來�移�能力。Qt也�供�用於嵌入��置的版本，例如Qt for Embedded Linux和Qt for Windows CE。&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;����使用者的需求，Qt有三種��授權方�。&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;商業授權�約下的Qt授權�用於專利/商業軟體的開發，在這種情�中，您�能�想與第三方分享任何原始碼或無法�從GNU LGPL 2.1版或GNU GPL 3.0版的�款。&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;GNU LGPL 2.1版下的Qt授權�用於開發Qt應用程�(專利或開放原始碼)，您必須�從GNU LGPL 2.1版的�款與�件。&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;GNU GPL 3.0版下的Qt授權�用於開發Qt應用程�，在這種情�中，您希望將此應用程���基於GNU GPL 3.0版開發的軟體一起使用，或您樂��從GNU GPL 3.0版的�款。&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;請�閱&amp;lt;a href=&amp;quot;http://qt.nokia.com/products/licensing&amp;quot;&amp;gt;qt.nokia.com/products/licensing&amp;lt;/a&amp;gt;，此���於Qt授權會有概略的介紹。&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Copyright (C) 2011 諾基亞公��/或其�公�。&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;Qt是一項諾基亞產�。如需詳細資訊，請�閱&amp;lt;a href=&amp;quot;http://qt.nokia.com/&amp;quot;&amp;gt;qt.nokia.com&amp;lt;/a&amp;gt;。&amp;lt;/p&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;About Qt&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;關於 Qt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;說明&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show Details...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;顯示詳情...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hide Details...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;隱�詳情...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMultiInputContext&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select IM&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�擇輸入法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QMultiInputContextPlugin&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multiple input method switcher&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;多�輸入法切�器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multiple input method switcher that uses the context menu of the text widgets&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;使用文字元件中的內文�單的多�輸入法切�器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNativeSocketEngine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The remote host closed the connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�端主機關閉了連線&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;網路�作逾時&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Out of resources&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;資��足&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsupported socket operation&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未支�的 socket �作&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Protocol type not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�定型態未支�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid socket descriptor&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��法的 socket �述�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network unreachable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法使用網路&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;權��足&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;連線逾時&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;連線被拒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The bound address is already in use&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��的��已經在使用中&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The address is not available&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�得��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The address is protected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;此��已被�護&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to send a message&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�出訊�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to receive a message&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法接收訊�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to write&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法寫入&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;網路錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Another socket is already listening on the same port&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�一個 socket 已經在監��一個連接埠&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to initialize non-blocking socket&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�始化�阻擋性 socket&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to initialize broadcast socket&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�始化廣播 socket&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attempt to use IPv6 socket on a platform with no IPv6 support&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;試圖在沒有 IPv6 支�的平�上使用 IPv6 socket&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Host unreachable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法連線到主機&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Datagram was too large to send&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;資料�大無法�出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation on non-socket&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�� socket �作&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The proxy type is invalid for this operation&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�伺�器型態無法支�此�作&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessCacheBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟 %1 發生錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessDebugPipeBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write error writing to %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;寫入%1時發生寫入錯誤：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessFileBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request for opening non-local file %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�求開啟�本地端檔案 %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟 %1 發生錯誤：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write error writing to %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;寫入 %1 時發生錯誤：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open %1: Path is a directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開啟 %1：此路徑是一個目錄&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Read error reading from %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;從 %1 讀�錯誤：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessFtpBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No suitable proxy found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找�到��的代�伺�器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot open %1: is a directory&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開啟 %1：是一個目錄&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Logging in to %1 failed: authentication required&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;登入 %1 失敗：需��證&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error while downloading %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下載 %1 時發生錯誤：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error while uploading %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上傳 %1 時發生錯誤：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkAccessHttpBackend&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No suitable proxy found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找�到��的代�伺�器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkReply&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error downloading %1 - server replied: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下載 %1 時發生錯誤─伺�器回應：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Protocol &amp;quot;%1&amp;quot; is unknown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的�定 %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QNetworkReplyImpl&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation canceled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消�作&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QOCIDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to logon&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法登入&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to initialize&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;QOCIDriver&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;無法�始化&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開始事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�交事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�轉事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QOCIResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind column for batch execute&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法��欄�以�批次執行&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute batch statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法執行批次敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to goto next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法跳到下一個&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to alloc statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�置敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法準備敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to get statement type&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法��數值&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法執行敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QODBCDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法連接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to disable autocommit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法關閉自動�交功能&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�交事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�轉事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to enable autocommit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開啟自動�交功能&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect - Driver doesn&amp;apos;t support all functionality required&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QODBCResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QODBCResult::reset: Unable to set &amp;apos;SQL_CURSOR_STATIC&amp;apos; as statement attribute. Please check your ODBC driver configuration&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;QODBCResult::reset: 無法設定 SQL_CURSOR_STATIC �為敘述屬性。請檢查您的 ODBC 驅動程�的設定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法執行敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法抓�下一筆&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法準備敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind variable&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法��變數&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch last&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法抓�最後一筆&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法抓�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch first&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法抓�第一筆&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法抓��一筆&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QObject&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid hostname&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主機�稱無效&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation not supported on %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在 %1 上�支�此�作&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid URI: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��法的網�：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Socket error on %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 上發生 socket 錯誤：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remote host closed the connection prematurely on %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;於 %1 上�端主機關閉了�正常的連線&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No host name given&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未指定主機&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPPDOptionsModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�稱&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;值&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPSQLDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to connect&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法連線&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開始事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�交事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�轉事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to subscribe&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法訂閱&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to unsubscribe&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�消訂閱&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPSQLResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to create query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法建立查詢&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to prepare statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法準備敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPageSetupWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Centimeters (cm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;公分&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Millimeters (mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;公厘&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Inches (in)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;英�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Points (pt)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;點&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;表單&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paper&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;紙張&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page size:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;紙張大�：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Width:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;寬度：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Height:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;高度：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paper source:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;紙張來�：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Orientation&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;方�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Portrait&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;縱�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Landscape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;橫�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverse landscape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��橫�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverse portrait&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��縱�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Margins&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;邊緣&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;top margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上緣&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;left margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;左緣&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;right margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�緣&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bottom margin&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下緣&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPluginLoader&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The plugin was not loaded.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;外掛程�未載入。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;locally connected&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;本地連接&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Aliases: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;別�：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unknown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;OK&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;確定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print all&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;全部列�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print range&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列�範�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A0 (841 x 1189 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A0 (841 x 1189 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A1 (594 x 841 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A1 (594 x 841 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A2 (420 x 594 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A2 (420 x 594 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A3 (297 x 420 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A3 (297 x 420 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A5 (148 x 210 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A5 (148 x 210 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A6 (105 x 148 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A6 (105 x 148 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A7 (74 x 105 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A7 (74 x 105 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A8 (52 x 74 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A8 (52 x 74 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A9 (37 x 52 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A9 (37 x 52 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B0 (1000 x 1414 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B0 (1000 x 1414 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B1 (707 x 1000 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B1 (707 x 1000 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B2 (500 x 707 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B2 (500 x 707 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B3 (353 x 500 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B3 (353 x 500 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B4 (250 x 353 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B4 (250 x 353 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B6 (125 x 176 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B6 (125 x 176 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B7 (88 x 125 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B7 (88 x 125 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B8 (62 x 88 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B8 (62 x 88 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B9 (44 x 62 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B9 (44 x 62 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B10 (31 x 44 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B10 (31 x 44 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;C5E (163 x 229 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;C5E (163 x 229 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DLE (110 x 220 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;DLE (110 x 220 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Folio (210 x 330 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�開 (210 x 330 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ledger (432 x 279 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ledger (432 x 279 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tabloid (279 x 432 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tabloid (279 x 432 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;US Common #10 Envelope (105 x 241 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;US 常用 10 號信� (105x241 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A4 (210 x 297 mm, 8.26 x 11.7 inches)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A4 (210 x 297 mm, 8.26 x 11.7 英�)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B5 (176 x 250 mm, 6.93 x 9.84 inches)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B5 (176 x 250 mm, 6.93 x 9.84 英�)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Executive (7.5 x 10 inches, 191 x 254 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Executive (7.5 x 10 英�, 191 x 254 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Legal (8.5 x 14 inches, 216 x 356 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Legal (8.5 x 14 英�, 216 x 356 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Letter (8.5 x 11 inches, 216 x 279 mm)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Letter (8.5 x 11 英�, 216 x 279 mm)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print selection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列��擇�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print To File ...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列�到檔案...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File %1 is not writable.</div><div class='add'>+Please choose a different file name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;檔案 %1 無法寫入。</div><div class='add'>+請�擇其它檔�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 already exists.</div><div class='add'>+Do you want to overwrite it?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 已存在。</div><div class='add'>+您�覆寫它嗎？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;檔案已存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;qt&amp;gt;Do you want to overwrite it?&amp;lt;/qt&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;qt&amp;gt;您�覆寫它嗎？&amp;lt;/qt&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is a directory.</div><div class='add'>+Please choose a different file name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 是一個目錄。</div><div class='add'>+請�擇其他檔�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The &amp;apos;From&amp;apos; value cannot be greater than the &amp;apos;To&amp;apos; value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;起始數值�能大於��數值&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A0&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A6&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A6&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A7&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A7&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A8&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A8&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A9&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;A9&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B0&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B6&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B6&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B7&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B7&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B8&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B8&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B9&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B9&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;B10&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;B10&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;C5E&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;C5E&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DLE&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;DLE&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Executive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Executive&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Folio&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Folio&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ledger&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ledger&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Legal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Legal&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Letter&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Letter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tabloid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tabloid&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;US Common #10 Envelope&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;US Common #10 Envelope&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Custom&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;自訂&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Options &amp;gt;&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�作 (&amp;amp;O) &amp;gt;&amp;gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Options &amp;lt;&amp;lt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�作 (&amp;amp;O) &amp;lt;&amp;lt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print to File (PDF)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列�到檔案（PDF）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print to File (Postscript)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列�到檔案（Postscript）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Local file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;本地端檔案&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Write %1 file&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;寫入 %1 檔案&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列�(&amp;amp;P)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintPreviewDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1%&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1%&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print Preview&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列��覽&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Next page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下一�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Previous page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�一�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;First page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;第一�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Last page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;最後一�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fit width&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;符�寬度&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fit page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;符���&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom in&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;放大&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;縮�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Portrait&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;縱�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Landscape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;橫�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show single page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;顯示單一��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show facing pages&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;顯示��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show overview of all pages&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;顯示所有���覽&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page setup&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列�設定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;關閉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Export to PDF&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;匯出到 PDF 檔&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Export to PostScript&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;匯出到 PostScript 檔&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page Setup&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��設定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintPropertiesWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;表單&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Advanced&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;進階&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintSettingsOutput&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;表單&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copies&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;份數&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print range&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列�範�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print all&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;全部列�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pages from&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;指定��：從&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;to&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;到&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Selection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�擇�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Output Settings&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;輸出設定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copies:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;份數：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Collate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;校�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reverse&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Options&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�項&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Color Mode&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�色模�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Color&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�色&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Grayscale&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�階&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duplex Printing&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;雙工列�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;None&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Long side&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;長邊&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Short side&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;短邊&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPrintWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Form&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;表單&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Printer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�表機&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Name:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�稱(&amp;amp;N)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;P&amp;amp;roperties&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;屬性(&amp;amp;R)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Location:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Preview&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�覽&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;型態：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Output &amp;amp;file:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;輸出檔案(&amp;amp;F)：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QProcess&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open input redirection for reading&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開啟輸入導�以讀�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Could not open output redirection for writing&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開啟輸出導�以寫入&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Resource error (fork failure): %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;資�錯誤（fork 失敗）：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Process operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;行程�作逾時&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error reading from process&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;從行程讀�時發生錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error writing to process&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;寫入行程時發生錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Process crashed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;行程已崩潰&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No program defined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未定義程�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Process failed to start: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;處��啟動失敗：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QProgressDialog&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QPushButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QRadioButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;勾�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QRegExp&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;no error occurred&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;沒有發生錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;disabled feature used&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;使用已關閉的功能&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bad char class syntax&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;錯誤的字元類別語法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bad lookahead syntax&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;錯誤的 lookahead 語法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;bad repetition syntax&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;錯誤的�覆語法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid octal value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��法的八進�值&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;missing left delim&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;少了左方的�隔符&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unexpected end&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未�期�到�尾&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;met internal limit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�到內部�制&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid interval&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;間隔無效&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid category&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;類別無效&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLite2Driver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟資料庫時發生錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開始事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�交事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法復原交易&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLite2Result&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch results&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法抓��果&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法執行敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLiteDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error opening database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟資料庫發生錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error closing database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;關閉資料庫發生錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to begin transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開始事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to commit transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�交事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to rollback transaction&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�轉事務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSQLiteResult&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to fetch row&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法抓�列&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to execute statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法執行敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to reset statement&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�置敘述&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to bind parameters&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法���數&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Parameter count mismatch&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�數數��符�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No query&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;沒有查詢&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptBreakpointsModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ID&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ID&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Condition&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore-count&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;忽略次數&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Single-shot&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;單次&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hit-count&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�用次數&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptBreakpointsWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;New&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;新增&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;刪除&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebugger&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go to Line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;跳至指定行&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;行：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Interrupt&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�斷&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift+F5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift+F5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Continue&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;繼續&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step Into&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�步執行&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F11&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F11&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step Over&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�進入函�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F10&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F10&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Step Out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;跳出函�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift+F11&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift+F11&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Run to Cursor&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;執行至游標處&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl+F10&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl+F10&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Run to New Script&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;執行至新指令碼&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Toggle Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;切�中斷點&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F9&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F9&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Debug Output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;清除�錯輸出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Error Log&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;清除錯誤記錄&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Console&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;清除主控�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Find in Script...&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在指令碼中尋找(&amp;amp;F)...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl+F&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl+F&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find &amp;amp;Next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;尋找下一個(&amp;amp;N)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Find &amp;amp;Previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;尋找上一個(&amp;amp;P)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift+F3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift+F3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl+G&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl+G&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Debug&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�錯&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebuggerCodeFinderWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;關閉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上一個&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下一個&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Case Sensitive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�分大�寫&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Whole words&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;全字&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;img src=&amp;quot;:/qt/scripttools/debugging/images/wrap.png&amp;quot;&amp;gt;&amp;amp;nbsp;Search wrapped&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;&amp;lt;img src=&amp;quot;:/qt/scripttools/debugging/images/wrap.png&amp;quot;&amp;gt;&amp;amp;nbsp;�尋已繞回&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebuggerLocalsModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�稱&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;值&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptDebuggerStackModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Level&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;層級&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Name&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�稱&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptEdit&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Toggle Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;切�中斷點&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Disable Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�用中斷點&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enable Breakpoint&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟用中斷點&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Breakpoint Condition:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;中斷點�件：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptEngineDebugger&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Loaded Scripts&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;載入的指令碼&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Breakpoints&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;中斷點&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stack&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;堆疊&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Locals&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�域變數&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Console&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主控�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Debug Output&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�錯輸出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error Log&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;錯誤記錄&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Search&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�尋&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;檢視&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Qt Script Debugger&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Qt指令碼�錯程�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScriptNewBreakpointWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;關閉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QScrollBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll here&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在此�軸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;左邊緣&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;頂端&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�邊緣&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bottom&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;底端&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��左方&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��上方&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;���方&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��下方&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;往左�軸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;往上�軸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;往��軸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;往下�軸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�上排列&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Position&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Line down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�下排列&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSharedMemory&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: create size is less then 0&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：建立大��於 0&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：無法鎖定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to unlock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：無法解除鎖定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：存�被拒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: already exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：已存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: doesn&amp;apos;t exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：�存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: out of resources&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：資��足&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：未知的錯誤 %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: key is empty&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：�值是空的&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: ftok failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：ftok 失敗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to make key&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：無法產生�值&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: doesn&amp;apos;t exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：�存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: UNIX key file doesn&amp;apos;t exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：UNIX金鑰檔�存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: system-imposed size restrictions&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：系統大��制&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: not attached&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：未附加&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: invalid size&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：��法的大�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: key error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：�值錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: size query failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：大�查詢失敗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unable to set key on lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：無法設定�值&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QShortcut&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Space&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;空白�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Esc&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Esc&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Tab&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Backtab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Backtab&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Backspace&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Backspace&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Return&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Return&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enter&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Enter&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ins&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ins&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Del&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Del&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Pause&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Print&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SysReq&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;SysReq&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Home&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Home&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;End&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;End&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;左�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PgUp&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;PgUp&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PgDown&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;PgDown&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;CapsLock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;大寫鎖定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;NumLock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;數字鎖定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ScrollLock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�軸鎖定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�單&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;說明&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;返回&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;往�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stop&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�止&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Refresh&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;刷新&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音��低&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume Mute&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�音&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Volume Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音��高&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bass Boost&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�低音&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bass Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Bass Up&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bass Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Bass Down&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Treble Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Treble Up&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Treble Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Treble Down&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Play&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;媒體播放&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Stop&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;媒體�止&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Previous&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;媒體�一首&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Next&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;媒體下一首&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Media Record&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;媒體錄音&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Favorites&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;我的最愛&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Search&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�尋&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Standby&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;待命&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟網�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch Mail&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動郵件程�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch Media&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動媒體程�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (0)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動（0）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動（1）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (2)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動（2）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (3)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動（3）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (4)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動（4）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (5)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動（5）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (6)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動（6）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (7)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動（7）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (8)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動（8）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (9)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動（9）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (A)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動（A）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (B)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動（B）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (C)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動（C）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (D)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動（D）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (E)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動（E）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Launch (F)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;啟動（F）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Monitor Brightness Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;螢幕亮度�高&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Monitor Brightness Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;螢幕亮度�低&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Light On/Off&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�盤燈光開/關&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Brightness Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�盤亮度�高&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Brightness Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�盤亮度�低&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Power Off&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;關閉電�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wake Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;喚醒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Eject&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;退出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Screensaver&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;螢幕�護&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;WWW&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;WWW&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sleep&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�眠&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LightBulb&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;燈泡&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shop&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;商店&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;History&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;記錄&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Add Favorite&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;加入我的最愛&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hot Links&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;熱門連�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Adjust Brightness&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;調整亮度&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Finance&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;財務&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Community&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;社群&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Rewind&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音訊倒轉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Back Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上一個下一個&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Application Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;應用程��左&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Application Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;應用程���&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Book&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;書�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;CD&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;CD&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Calculator&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;計算機&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;清除&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear Grab&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;清除抓�內容&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;關閉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;複製&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cut&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;剪下&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Display&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;顯示&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;DOS&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;DOS&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Documents&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文件&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Spreadsheet&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;試算表&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Browser&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�覽器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Game&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�戲&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;到&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;iTouch&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;iTouch&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Logoff&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;登出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Market&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;市場&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Meeting&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;會議&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Keyboard Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�盤功能表&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Menu PB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;功能表PB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;My Sites&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;我的網站&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;News&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;新�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Home Office&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Home Office&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Option&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�項&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;貼上&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Phone&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;手機&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reply&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;回覆&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reload&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�新載入&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rotate Windows&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;旋轉視窗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rotation PB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;循環PB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rotation KB&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;循環KB&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;儲存&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Send&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;傳�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Spellchecker&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;拼字檢查&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Split Screen&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;分割畫�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Support&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;支�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Task Panel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;工作��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Terminal&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;終端機&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Tools&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;工具&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Travel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;旅行&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;視訊&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Word Processor&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文字處�器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XFer&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;XFer&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom In&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;放大&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Zoom Out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;縮�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Away&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;離開&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Messenger&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Messenger&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;WebCam&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;網路�影機&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mail Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;郵件轉寄&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pictures&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;圖片&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Music&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音樂&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Battery&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;電池&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bluetooth&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�牙&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wireless&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無線&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ultra Wide Band&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;超寬頻&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Forward&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音訊轉�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Repeat&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音訊�複&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Random Play&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音訊機播放&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Subtitle&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;副標題&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Cycle Track&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;音訊循環軌跡&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Time&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;時間&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;View&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;檢視&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top Menu&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上層功能表&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Suspend&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;暫止&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hibernate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;休眠&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Print Screen&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;列�螢幕&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page Up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;往上一�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page Down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;往下一�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Caps Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;大寫鎖定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Num Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;數字鎖定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Number Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;數字鎖定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll Lock&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�軸鎖定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�入&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;刪除&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Escape&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Escape&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;System Request&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;系統�求 SysRq&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�擇&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;是&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;內文1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;內文2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;內文3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Context4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;內文4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Call&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;呼�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hangup&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;掛斷&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Flip&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�轉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ctrl&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Ctrl&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Shift&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Shift&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Alt&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Alt&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Meta&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Meta&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;+&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;+&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;F%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;F%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Home Page&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;首�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSlider&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��左方&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��上方&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Position&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;���方&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��下方&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSocks5SocketEngine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to proxy refused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�伺�器連線被拒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to proxy closed prematurely&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�伺�器連線已�正常關閉&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy host not found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找�到代�伺�器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection to proxy timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�伺�器連線逾時&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy authentication failed&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�伺�器�證失敗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Proxy authentication failed: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;代�伺�器�證失敗：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SOCKS version 5 protocol error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;SOCKS 5 的�定錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;General SOCKSv5 server failure&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一般的 SOCKSv5 伺�器錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Connection not allowed by SOCKSv5 server&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;連線未被 SOCKSv5 伺�器�許&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;TTL expired&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;TTL 逾時&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;SOCKSv5 command not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;SOCKSv5 指令未被支�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Address type not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��型態未被支�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown SOCKSv5 proxy error code 0x%1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的 SOCKSv5 代�伺�器錯誤代碼 0x%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network operation timed out&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;網路�作逾時&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSoftKeyManager&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ok&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;確定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Done&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;完�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Options&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�項&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Exit&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;退出&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSpinBox&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;更多&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Less&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;較少&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSql&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;刪除&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete this record?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�刪除這筆紀錄嗎？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Yes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;是&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�入&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Update&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;更新&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save edits?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�儲存編輯�的內容嗎？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�消&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Confirm&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;確�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel your edits?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��消編輯嗎？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSslSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to write data: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法寫入資料：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to decrypt data: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法解密資料：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error while reading: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;讀�時發生錯誤：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error during SSL handshake: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;SSL �步時發生錯誤：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error creating SSL context (%1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;建立 SSL 內文時發生錯誤（%1）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid or empty cipher list (%1)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��法或空白的加密清單（%1）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Private key does not certify public key, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�密金鑰無法�證公開金鑰，%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error creating SSL session, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;建立 SSL 工作階段時發生錯誤：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error creating SSL session: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;建立 SSL 工作階段時發生錯誤：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot provide a certificate with no key, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;沒有金鑰無法�供憑證：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error loading local certificate, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;載入本地憑證時發生錯誤：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error loading private key, %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;載入�鑰時發生錯誤：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;沒有錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The issuer certificate could not be found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找�到發行者憑證&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate signature could not be decrypted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法解密憑證簽�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The public key in the certificate could not be read&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;憑證中的公開金鑰無法讀�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The signature of the certificate is invalid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;憑證的簽�無效&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate is not yet valid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;憑證尚未生效&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate has expired&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;憑證已逾期&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate&amp;apos;s notBefore field contains an invalid time&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;憑證的notBefore欄�包�無效的時間&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate&amp;apos;s notAfter field contains an invalid time&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;憑證的notAfter欄�包�無效的時間&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The certificate is self-signed, and untrusted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;憑證是自我簽署的，而且��信任&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root certificate of the certificate chain is self-signed, and untrusted&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;憑證�的根憑證是自我簽署的，而且��信任&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The issuer certificate of a locally looked up certificate could not be found&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;找�到本機查詢憑證的發行者憑證&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No certificates could be verified&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;沒有�確�的憑證&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;One of the CA certificates is invalid&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;CA憑證的其中之一無效&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The basicConstraints path length parameter has been exceeded&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;basicConstraints路徑長度�數已超出�制&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The supplied certificate is unsuitable for this purpose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�供的憑證��用於此目的&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root CA certificate is not trusted for this purpose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;根CA憑證在此目的中��信任&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root CA certificate is marked to reject the specified purpose&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;根CA憑證已註記拒絕該特定目的&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The current candidate issuer certificate was rejected because its subject name did not match the issuer name of the current certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;目�候�發行者的憑證已�拒絕，因為其主旨�稱和目�憑證的發行者�稱�符&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The current candidate issuer certificate was rejected because its issuer name and serial number was present and did not match the authority key identifier of the current certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;目�候�發行者的憑證已�拒絕，因為其發行者�稱��出的�號和目�憑證的授權單�金鑰識別元�符&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The peer did not present any certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�等節點未�出任何憑證&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The host name did not match any of the valid hosts for this certificate&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;主機�稱�符�此憑證任何有效的主機&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�明的錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QStateMachine&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Missing initial state in compound state &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在複�狀態&amp;quot;%1&amp;quot;中�失�始狀態&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Missing default state in history state &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在記錄狀態&amp;quot;%1&amp;quot;中�失�設狀態&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No common ancestor for targets and source of transition from state &amp;apos;%1&amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;從狀態&amp;quot;%1&amp;quot;的轉�中，目標和來�沒有共�的上階&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown error&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�明的錯誤&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QSystemSemaphore&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: does not exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：�存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: out of resources&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：資��足&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: permission denied&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：存�被拒&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: already exists&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：已存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1: unknown error %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1：未知的錯誤 %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTDSDriver&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to open connection&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法開啟連線&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unable to use database&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法使用資料庫&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTabBar&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;往左�軸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;往��軸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTcpServer&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operation on socket is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;Socket 的�作未被支�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QTextControl&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;復原(&amp;amp;U)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��(&amp;amp;R)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cu&amp;amp;t&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;剪下(&amp;amp;T)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Copy&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;複製(&amp;amp;C)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy &amp;amp;Link Location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;複製連���(&amp;amp;L)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Paste&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;貼上(&amp;amp;P)&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;刪除&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select All&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;全部�擇&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QToolButton&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Press&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;按下&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;開啟&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUdpSocket&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;This platform does not support IPv6&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;此平��支� IPv6&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUndoGroup&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;復原&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUndoModel&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt;empty&amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;＜空白＞&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUndoStack&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Undo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;復原&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Redo&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QUnicodeControlCharacterMenu&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LRM Left-to-right mark&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;LRM 左到�標記&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;RLM Right-to-left mark&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;RLM �到左標記&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ZWJ Zero width joiner&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ZWJ 零寬度連接器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ZWNJ Zero width non-joiner&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ZWNJ 零寬度�連接器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ZWSP Zero width space&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;ZWSP 零寬度空白&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LRE Start of left-to-right embedding&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;LRE 左到�嵌入起點&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;RLE Start of right-to-left embedding&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;RLE �到左嵌入起點&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;LRO Start of left-to-right override&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;LRO 左到�覆寫起點&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;RLO Start of right-to-left override&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;RLO �到左覆寫起點&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;PDF Pop directional formatting&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;PDF 彈出方�格�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert Unicode control character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�入�國碼控制字元&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWebFrame&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request cancelled&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;請求已�消&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Request blocked&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;請求已被阻擋&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot show URL&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法顯示網�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Frame load interrupted by policy change&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;框架載入因為原則變更而中斷&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cannot show mimetype&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法顯示 MIME 型態&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;File does not exist&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;檔案�存在&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWebPage&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Submit&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;default label for Submit buttons in forms on web pages&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Submit&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Submit (input element) alt text for &amp;lt;input&amp;gt; elements with no alt, title, or value&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reset&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;default label for Reset buttons in forms on web pages&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Choose File&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;title for file button used in HTML forms&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�擇檔案&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No file selected&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;text to display in file button used in HTML forms when no file is selected&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;未��任何檔案&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open in New Window&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open in New Window context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;在新視窗開啟&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save Link...&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Download Linked File context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;儲存連�...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy Link&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Copy Link context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;複製連�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open Image&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open Image in New Window context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;開啟影�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Save Image&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Download Image context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;儲存影�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy Image&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Copy Link context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;複製影�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open Frame&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open Frame in New Window context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;開啟框架&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Copy&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Copy context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;複製&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go Back&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Back context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;往回&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go Forward&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Forward context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;往�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stop&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Stop context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reload&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Reload context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�新載入&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cut&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Cut context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;剪下&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paste&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Paste context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;貼上&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No Guesses Found&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;No Guesses Found context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;找�到�能的內容&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Ignore Spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;忽略&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Add To Dictionary&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Learn Spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;新增到字典&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Search The Web&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Search The Web context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�尋站�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Look Up In Dictionary&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Look Up in Dictionary context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;在字典裡�尋&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Open Link&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Open Link context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;開啟連�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ignore&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Ignore Grammar context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;忽略&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Spelling&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Spelling and Grammar context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Show Spelling and Grammar&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;menu item title&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Hide Spelling and Grammar&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;menu item title&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;隱�拼字與文法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check Spelling&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Check spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;檢查拼字&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check Spelling While Typing&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Check spelling while typing context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;打字時立�檢查拼字&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Check Grammar With Spelling&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Check grammar with spelling context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;檢查拼字與文法&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fonts&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Font context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;字型&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bold&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Bold context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;粗體&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Italic&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Italic context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;斜體&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Underline&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Underline context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Outline&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Outline context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;外框線&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Direction&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Writing direction context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;方�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Text Direction&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Text direction context sub-menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Default&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Default writing direction context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�設&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left to Right&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Left to Right context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;從左至�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right to Left&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Right to Left context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;從�至左&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Loading...&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller status message when the media is loading&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;載入中...&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Live Broadcast&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller status message when watching a live broadcast&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�時廣播&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio Element&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;音訊元素&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video Element&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;視訊元素&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mute Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�音按鈕&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unmute Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;�消�音按鈕&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Play Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;播放按鈕&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;暫�按鈕&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Slider&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;滑桿&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Slider Thumb&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;滑桿縮圖&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rewind Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;倒轉按鈕&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Return to Real-time Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;回復��時按鈕&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Elapsed Time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;經�時間&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remaining Time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;剩餘時間&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Status Display&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;狀態顯示&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fullscreen Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;全螢幕按鈕&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek Forward Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;往��尋按鈕&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek Back Button&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;往回�尋按鈕&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Audio element playback controls and status display&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;音訊元素播放控制和狀態顯示&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Video element playback controls and status display&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;視訊元素播放控制和狀態顯示&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mute audio tracks&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;音軌�音&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unmute audio tracks&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;音軌�消�音&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Begin playback&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;開始播放&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Pause playback&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;暫�播放&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Movie time scrubber&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;影片時間清除器&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Movie time scrubber thumb&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;影片時間清除器縮圖&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Rewind movie&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;倒轉影片&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Return streaming movie to real-time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;串�影片回復��時播放&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Current movie time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;目�的影片時間&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remaining movie time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;剩餘的影片時間&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Current movie status&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;目�的影片狀態&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Play movie in full-screen mode&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;以全螢幕模�播放影片&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek quickly back&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;快速往回�尋&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Seek quickly forward&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media controller element&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;快速往��尋&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Indefinite time&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;��定時間&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 days %2 hours %3 minutes %4 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1天%2�時%3分�%4秒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 hours %2 minutes %3 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1�時%2分�%3秒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 minutes %2 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1分�%2秒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 seconds&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Media time description&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1秒�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Inspect&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Inspect Element context menu item&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;查驗&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No recent searches&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Label for only item in menu that appears when clicking on the search field image, when no searches have been performed&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;沒有最近的�尋&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Recent searches&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;label for first item in the menu that appears when clicking on the search field image, used as embedded menu title&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;最近的�尋&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Clear recent searches&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;menu item in Recent Searches menu that empties menu&amp;apos;s contents&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;清除最近的�尋&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Unknown filesize FTP directory listing item&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Web Inspector - %2&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 (%2x%3 pixels)&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;Title string for images&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;%1（%2x%3 �素）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bad HTTP request&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�良的 HTTP 請求&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;This is a searchable index. Enter search keywords: &lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;text that appears at the start of nearly-obsolete web pages in the form of a &amp;apos;searchable index&amp;apos;&lt;/comment&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll here&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在此�軸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Left edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;左邊緣&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Right edge&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�邊緣&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Bottom&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;底端&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��左方&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��上方&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;���方&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Page down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;��下方&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;往左�軸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll up&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;往上�軸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;往��軸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Scroll down&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;往下�軸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message numerus="yes"&gt;</div><div class='add'>+            &lt;source&gt;%n file(s)&lt;/source&gt;</div><div class='add'>+            &lt;comment&gt;number of chosen file&lt;/comment&gt;</div><div class='add'>+            &lt;translation&gt;</div><div class='add'>+                &lt;numerusform&gt;%n 個檔案&lt;/numerusform&gt;</div><div class='add'>+            &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Alert - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;JavaScript 警告 ─ %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Confirm - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;JavaScript 確� ─ %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Prompt - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;JavaScript �示 ─ %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;JavaScript Problem - %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;JavaScript�題 - %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The script on this page appears to have a problem. Do you want to stop the script?&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;此��上的指令碼似乎有�題。是���止指令碼？&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the next character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移動游標到下一個字元&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the previous character&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移動游標到�一個字元&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the next word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移動游標到下一個單字&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the previous word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移動游標到�一個單字&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the next line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移動游標到下一行&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the previous line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移動游標到�一行&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the start of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移動游標到這一行的起頭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the end of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移動游標到這一行的�尾&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the start of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移動游標到這一個�塊的起頭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the end of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移動游標到這一個�塊的�尾&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the start of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移動游標到這一個文件的起頭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Move the cursor to the end of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移動游標到這一個文件的�尾&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select all&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;全�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the next character&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the previous character&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the next word&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the previous word&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the next line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the previous line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the start of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the end of the line&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the start of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the end of the block&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the start of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Select to the end of the document&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete to the start of the word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;刪除到此單字的起頭&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Delete to the end of the word&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;刪除到此單字的�尾&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert a new paragraph&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�入新段�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert a new line&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�入新行&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Paste and Match Style&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;貼上並符�樣�&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Remove formatting&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;移除格�設定&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Strikethrough&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;刪除線&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Subscript&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;下標&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Superscript&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;上標&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert Bulleted List&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�入項目符號清單&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Insert Numbered List&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�入編號清單&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Indent&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;縮排&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Outdent&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;凸排&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Center&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;置中&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Justify&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;左��齊&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Align Left&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�左�齊&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Align Right&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;���齊&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWhatsThisAction&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;What&amp;apos;s This?&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWidget&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;*&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWizard&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Cancel&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;lt; &amp;amp;Back&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Finish&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Help&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Go Back&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Continue&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Commit&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Done&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Next&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Next &amp;gt;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QWorkspace&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Restore&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Move&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Size&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Mi&amp;amp;nimize&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ma&amp;amp;ximize&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Stay on &amp;amp;Top&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Minimize&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Restore Down&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Close&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sh&amp;amp;ade&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 - [%2]&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;amp;Unshade&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QXml&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;no error occurred&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error triggered by consumer&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unexpected end of file&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;more than one document type definition&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing element&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;tag mismatch&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing content&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unexpected character&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;invalid name for processing instruction&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;version expected while reading the XML declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;wrong value for standalone declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing document type definition&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;letter is expected&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing comment&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error occurred while parsing reference&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;internal general entity reference not allowed in DTD&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;external parsed general entity reference not allowed in attribute value&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;external parsed general entity reference not allowed in DTD&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;unparsed entity reference in wrong context&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;recursive entities&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;error in the text declaration of an external entity&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;encoding declaration or standalone declaration expected while reading the XML declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;standalone declaration expected while reading the XML declaration&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QXmlPatternistCLI&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning in %1, at line %2, column %3: %4&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1中的警告，�於行%2，欄%3：%4&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Warning in %1: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1中的警告：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown location&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�明的�置&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error %1 in %2, at line %3, column %4: %5&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在%2發生%1錯誤，�於行%3，欄%4：%5&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Error %1 in %2: %3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在%2發生%1錯誤：%3&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QXmlStream&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Extra content at end of document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid entity value.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid XML character.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Sequence &amp;apos;]]&amp;gt;&amp;apos; not allowed in content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace prefix &amp;apos;%1&amp;apos; not declared&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute redefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unexpected character &amp;apos;%1&amp;apos; in public id literal.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid XML version string.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsupported XML version.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid encoding name.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Encoding %1 is unsupported&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Standalone accepts only yes or no.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid attribute in XML declaration.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Premature end of document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Expected &lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;, but got &amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unexpected &amp;apos;&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Expected character data.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Recursive entity detected.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Start tag expected.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;XML declaration not at start of document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;NDATA in parameter entity declaration.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid processing instruction name.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid processing instruction name.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Illegal namespace declaration.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid XML name.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Opening and ending tag mismatch.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reference to unparsed entity &amp;apos;%1&amp;apos;.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Entity &amp;apos;%1&amp;apos; not declared.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reference to external entity &amp;apos;%1&amp;apos; in attribute value.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid character reference.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Encountered incorrectly encoded content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The standalone pseudo attribute must appear after the encoding.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid PUBLIC identifier.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+    &lt;context&gt;</div><div class='add'>+        &lt;name&gt;QtXmlPatterns&lt;/name&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one component must be present.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;必須表�至少一個組件。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid value of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是�法的 %2 型態的值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When casting to %1 from %2, the source value cannot be %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;從 %2 轉�型態為 %1 的時候，來�數值�能是 %3。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Effective Boolean Value cannot be calculated for a sequence containing two or more atomic values.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;實際布林值（Effective Boolean）無法用在兩個或兩個以上的原數值（atomic value）的計算。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The data of a processing instruction cannot contain the string %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;處�指令的資料�能包�字串 %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 是��法的 %2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid XML 1.0 character.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是�法的 XML 1.0 字元。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 was called.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 已被呼�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In the replacement string, %1 must be followed by at least one digit when not escaped.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在�代字串中，在未脫逸的情形下 %1 必須至少跟著一�數字。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In the replacement string, %1 can only be used to escape itself or %2, not %3&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在�代字串中，%1 �能用於自身或 %2 的脫逸，而� %3。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 matches newline characters&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 符�了�行字元&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Matches are case insensitive&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;比�為�分大�寫&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid regular expression pattern: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 是��法的正�表示�樣�：%2&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It will not be possible to retrieve %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�得 %1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The default collection is undefined&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�設的收�未定義&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 cannot be retrieved&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 無法�得&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The item %1 did not match the required type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;項目 %1 未符�需�的型態 %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an unknown schema type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 是未知的機制型態。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A template with name %1 has already been declared.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only one %1 declaration can occur in the query prolog.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�有一個 %1 宣告�以在查詢中。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The initialization of variable %1 depends on itself&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;變數 %1 的�始化與自身相�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The variable %1 is unused&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;變數 %1 未使用&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Version %1 is not supported. The supported XQuery version is 1.0.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;版本 %1 未支�。支�的 XQuery 版本為 1.0。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No function with signature %1 is available&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;沒有簽章為 %1 的函��使用&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It is not possible to redeclare prefix %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法�宣告�置字串 %1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Prefix %1 is already declared in the prolog.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置字串 %1 已在 prolog 中宣告。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name of an option must have a prefix. There is no default namespace for options.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�項�稱必須有�置字串。沒有�項的�設命�空間。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The Schema Import feature is not supported, and therefore %1 declarations cannot occur.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;機制匯入功能未支�，因此有 %1 個宣告無法��。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The target namespace of a %1 cannot be empty.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 的目標命�空間�能是空的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The module import feature is not supported&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;模組匯入功能未支�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace of a user defined function in a library module must be equivalent to the module namespace. In other words, it should be %1 instead of %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在函�模組中的使用者定義函�的命�空間必須與模組的命�空間相�。也就是，應該為 %1 而�是 %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A function already exists with the signature %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;已經有簽章為 %1 的函�存在。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No external functions are supported. All supported functions can be used directly, without first declaring them as external&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未支�外部函�。所有支�的���以直接使用而�需�先宣告為外部函�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The %1-axis is unsupported in XQuery&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;XQuery 中未支� %1 軸&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace URI cannot be the empty string when binding to a prefix, %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�與�置字串 %1 ��的命�空間網��能是空字串。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid namespace URI.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 是��法的命�空間網�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It is not possible to bind to the prefix %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;無法與�置字串 %1 ��。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Two namespace declaration attributes have the same name: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;有兩個命�空間宣告的屬性有相�的�稱：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace URI must be a constant and cannot use enclosed expressions.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;命�空間網�必須是常數，並且�能使用�閉敘述。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not in the in-scope attribute declarations. Note that the schema import feature is not supported.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是範�內屬性宣告。注�機制匯入功能未支�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;empty&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;空白&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;zero or one&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;0 或 1 個&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;exactly one&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;剛好一個&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;one or more&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;一個以上&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;zero or more&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;0 個以上&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The focus is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;焦點未定義。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An attribute by name %1 has already been created.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�為 %1 的屬性已被建立。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Network timeout.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;網路逾時。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 can&amp;apos;t be serialized because it appears outside the document element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;元素 %1 無法�列化，因為似乎是在文件元素之外。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Year %1 is invalid because it begins with %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;年份 %1 ��法，因為是從 %2 開始的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Day %1 is outside the range %2..%3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;日期 %1 已超出 %2 到 %3 的範�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Month %1 is outside the range %2..%3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;月份 %1 已超出 %2 到 %3 的範�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Overflow: Can&amp;apos;t represent date %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;溢�：無法表示日期 %1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Day %1 is invalid for month %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;月份 %2 中沒有日期 %1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and milliseconds are not all 0; &lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;時間 24:%1:%2.%3 ��法。�時為 24 則分�秒與毫秒都必須是 0。</div><div class='add'>+&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Time %1:%2:%3.%4 is invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;時間 %1:%2:%3.%4 ��法。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Overflow: Date can&amp;apos;t be represented.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;溢�：無法表示日期。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one time component must appear after the %1-delimiter.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在分隔符 %1 後必須至少有一個時間組件。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dividing a value of type %1 by %2 (not-a-number) is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;將型態 %1 除以 %2（�數值）是��許的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;將型態 %1 除以 %2 或 %3（正或負零）是��許的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;將型態 %1 乘以 %2 或 %3（正或負無�大）是��許的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A value of type %1 cannot have an Effective Boolean Value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;型態 %1 �能有實際布林值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value %1 of type %2 exceeds maximum (%3).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;型態 %2 的數值 %1 已超�最大值（%3）。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value %1 of type %2 is below minimum (%3).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;型態 %2 的數值 %1 已低�最�值（%3）。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A value of type %1 must contain an even number of digits. The value %2 does not.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;型態 %1 的值必須包��數個數字。數值 %2 未符�此�件。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not valid as a value of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是�法的 %2 型態的值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operator %1 cannot be used on type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�作元 %1 �能用於型態 %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Operator %1 cannot be used on atomic values of type %2 and %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�作元 %1 �能用於型態 %2 與 %3 的原數值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace URI in the name for a computed attribute cannot be %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在已計算屬性的�稱的命�空間網��能是 %1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name for a computed attribute cannot have the namespace URI %1 with the local name %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在已計算屬性的�稱�能�時有命�空間網� %1 與本地端�稱 %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type error in cast, expected %1, received %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;轉�型態錯誤，應為 %1 但接收到 %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When casting to %1 or types derived from it, the source value must be of the same type, or it must be a string literal. Type %2 is not allowed.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;轉�為型態 %1 或其�生型態時，來�數值必須是相�型態，或者是字串。型態 %2 是�被�許的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A comment cannot contain %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;註解�能包� %1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A comment cannot end with a %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;註解�能以 %1 ��尾&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An attribute node cannot be a child of a document node. Therefore, the attribute %1 is out of place.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;屬性點�能�為文件點的�節點。因此，屬性 %1 的�置���。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A library module cannot be evaluated directly. It must be imported from a main module.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能直接計算函�模組。必須�從主模組匯入。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No template by name %1 exists.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;沒有�為 %1 的樣本存在。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A value of type %1 cannot be a predicate. A predicate must have either a numeric type or an Effective Boolean Value type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;型態 %1 的值�能是謂詞（predicate）。謂詞必須是數值型態，或是實際布林值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A positional predicate must evaluate to a single numeric value.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置謂詞必須能計算出單一的數值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The target name in a processing instruction cannot be %1 in any combination of upper and lower case. Therefore, %2 is invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;處�指令的目標�稱�能是任何大�寫組�的 %1。因此，%2 是��法的值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid target name in a processing instruction. It must be a %2 value, e.g. %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是一個�法的處�指令的目標�稱。必須是 %2 的值，例如 %3。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The last step in a path must contain either nodes or atomic values. It cannot be a mixture between the two.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;路徑的最後一步必須是節點或原值，而�能在兩者之間。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No namespace binding exists for the prefix %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置字串 %1 沒有��命�空間&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No namespace binding exists for the prefix %1 in %2&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在 %2 的�置字串 %1 沒有��命�空間&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The first argument to %1 cannot be of type %2. It must be a numeric type, xs:yearMonthDuration or xs:dayTimeDuration.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;呼� %1 的第一個�數�能是 %2 型態。必須是數值型態，xs.yearMonthDuration 或 xs.dayTimeDuration。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The first argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;呼� %1 的第一個�數�能是 %2 型態。必須是 %3�%4 或 %5 型態。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The second argument to %1 cannot be of type %2. It must be of type %3, %4, or %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;呼� %1 的第二個�數�能是 %2 型態。必須是 %3�%4 或 %5 型態。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;If both values have zone offsets, they must have the same zone offset. %1 and %2 are not the same.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;如果兩個值都有�域�移，則必須是相�的�域�移。%1 與 %2 並�相�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 must be followed by %2 or %3, not at the end of the replacement string.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 後�必須跟著 %2 或 %3，而��代字串的�尾。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 and %2 match the start and end of a line.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 與 %2 符�了一行的開始與�尾。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Whitespace characters are removed, except when they appear in character classes&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;空白字元已移除，除�它們出�在字元類別&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid flag for regular expressions. Valid flags are:&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 是正�表示�中��法的旗標。�法的旗標有：&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;If the first argument is the empty sequence or a zero-length string (no namespace), a prefix cannot be specified. Prefix %1 was specified.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;如果第一個�數是空�列，或是長度為 0 的字串（沒有命�空間），則無法指定�置字串。但是您指定了 %1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The normalization form %1 is unsupported. The supported forms are %2, %3, %4, and %5, and none, i.e. the empty string (no normalization).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未支�常態化表單 %1。支�的表單有 %2�%3�%4�%5，以�無（也就是空字串，未常態化）。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A zone offset must be in the range %1..%2 inclusive. %3 is out of range.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�域�移必須是在 %1 到 %2 範�之內。%3 已超出範�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Required cardinality is %1; got cardinality %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;需�的基數為 %1；得到的是 %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The encoding %1 is invalid. It must contain Latin characters only, must not contain whitespace, and must match the regular expression %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;編碼 %1 ��法。必須�能包�拉�字元，��空白，並且�符�正�表示� %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The keyword %1 cannot occur with any other mode name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;關�字 %1 �能與任何其它模��稱一起存在。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No variable with name %1 exists&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The value of attribute %1 must be of type %2, which %3 isn&amp;apos;t.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The prefix %1 cannot be bound. By default, it is already bound to the namespace %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A variable with name %1 has already been declared.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No value is available for the external variable with name %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A stylesheet function must have a prefixed name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;樣�表函�必須有�置�稱。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace %1 is reserved; therefore user defined functions may not use it. Try the predefined prefix %2, which exists for these cases.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;命�空間 %1 已被�留，因此使用者定義函��能使用它。請試試�定義�置字串 %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An argument with name %1 has already been declared. Every argument name must be unique.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When function %1 is used for matching inside a pattern, the argument must be a variable reference or a string literal.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;當函� %1 用於樣�比�時，�數必須是變數�考或字串。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, the first argument to function %1 must be a string literal, when used for matching.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在 XSL-T 樣�內，函� %1 的第一個�數必須是字串，以便用於比�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, the first argument to function %1 must be a literal or a variable reference, when used for matching.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在 XSL-T 樣�內，函� %1 的第一個�數必須是文字或變數�考，以便用於比�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, function %1 cannot have a third argument.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在 XSL-T 樣�內，函� %1 的�能有第三個�數。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, only function %1 and %2, not %3, can be used for matching.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在 XSL-T 樣�內，�有函� %1，%2 �以用於比�。%3 �行。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在 XSL-T 樣�內，�能用 %1 軸，�能用 %2 或 %3。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an invalid template mode name.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是�法的樣本模��稱。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name of a variable bound in a for-expression must be different from the positional variable. Hence, the two variables named %1 collide.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;與 for 敘述��的變數�稱必須與�置變數��。因此，有兩個�為 %1 的變數��了。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The Schema Validation Feature is not supported. Hence, %1-expressions may not be used.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未支�機制確�功能。%1 敘述無法使用。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;None of the pragma expressions are supported. Therefore, a fallback expression must be present&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未支� pragma 敘述。因次，必須有�設的敘述。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Each name of a template parameter must be unique; %1 is duplicated.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�個樣本�數的�稱必須唯一；%1 已經被使用。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No function with name %1 is available.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid numeric literal.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是�法的數值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;W3C XML Schema identity constraint selector&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;W3C XML Schema identity constraint field&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A construct was encountered which is disallowed in the current language(%1).&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace %1 can only be bound to %2 (and it is, in either case, pre-declared).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;命�空間 %1 �能與 %2 ��（也就是說，��先定義）。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared).&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置字串 %1 �能與 %2 ��（也就是說，��先定義）。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;An attribute with name %1 has already appeared on this element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A direct element constructor is not well-formed. %1 is ended with %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;直接元素建構器沒有完整產生。%1 以 %2 ��。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name %1 does not refer to any schema type.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�稱 %1 未指�任何機制型態。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an complex type. Casting to complex types is not possible. However, casting to atomic types such as %2 works.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 是複數型態，無法轉��複數型態。然而，轉�為原型態，如 %2 是�行的。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not an atomic type. Casting is only possible to atomic types.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是一個原型態。�能轉�為原型態。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a valid name for a processing-instruction.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是處�指令的�法�稱。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The name of an extension expression must be in a namespace.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;延伸敘述的�稱必須在命�空間內。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Required type is %1, but %2 was found.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;需�的型態為 %1，但找到 %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Promoting %1 to %2 may cause loss of precision.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;將 %1 抬�為 %2 �能會失去精確度。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;It&amp;apos;s not possible to add attributes after any other kind of node.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能在任何其它種類的節點後�加入屬性。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only the Unicode Codepoint Collation is supported(%1). %2 is unsupported.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�支� Unicode Codepoint Collation（%1）。%2 未支�。;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Integer division (%1) by zero (%2) is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;整數除法 %1 除以零（%2）的行為未定義。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Division (%1) by zero (%2) is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;除法 %1 除以零（%2）的行為未定義。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Modulus division (%1) by zero (%2) is undefined.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;餘數除法 %1 除以零（%2）的行為未定義。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message numerus="yes"&gt;</div><div class='add'>+            &lt;source&gt;%1 takes at most %n argument(s). %2 is therefore invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 最多�能有 %n 個�數，因此 %2 是��法的。&lt;/numerusform&gt;</div><div class='add'>+            &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message numerus="yes"&gt;</div><div class='add'>+            &lt;source&gt;%1 requires at least %n argument(s). %2 is therefore invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;</div><div class='add'>+                &lt;numerusform&gt;%1 至少需� %n 個�數，因此 %2 是��法的。&lt;/numerusform&gt;</div><div class='add'>+            &lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The root node of the second argument to function %1 must be a document node. %2 is not a document node.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;函� %1 的第二個�數的根節點必須是文件節點。%2 �是文件節點。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The namespace for a user defined function cannot be empty (try the predefined prefix %1 which exists for cases like this)&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;使用者定義函�的命�空間�能為空白（請試著用�先定義的�置字串 %1）&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A default namespace declaration must occur before function, variable, and option declarations.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�設的命�空間宣告必須在函��變數與�項宣告之�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace declarations must occur before function, variable, and option declarations.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;命�空間宣告必須在函��變數與�項宣告之�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Module imports must occur before function, variable, and option declarations.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;模組匯入必須在函��變數與�項宣告之�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not a whole number of minutes.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 �是分�的數值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 can&amp;apos;t be serialized because it appears at the top level.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;屬性元素 %1 無法�列化，因為似乎是在頂層。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is an unsupported encoding.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 是個未被支�的編碼。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 contains octets which are disallowed in the requested encoding %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%1 包�了在�求的編碼 %2 內��許的八進�值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The codepoint %1, occurring in %2 using encoding %3, is an invalid XML character.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在 %2 內的代碼點 %1（編碼 %3）是一個��法的 XML 字元。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Ambiguous rule match.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�明確的�則符�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In a namespace constructor, the value for a namespace cannot be an empty string.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The prefix must be a valid %1, which %2 is not.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置字串必須是�法的 %1，但 %2 �是。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The prefix %1 cannot be bound.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�置字串 %1 �能被��。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only the prefix %1 can be bound to %2 and vice versa.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�有�置字串 %1 能與 %2 ��。�之亦然。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The parameter %1 is required, but no corresponding %2 is supplied.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;需��數 %1，但是沒有�供相關的 %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The parameter %1 is passed, but no corresponding %2 exists.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�數 %1 已傳�，但找�到相關的 %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The URI cannot have a fragment&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;URI �能有片段。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed at this location.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;元素 %1 �能在此�置。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Text nodes are not allowed at this location.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;文字節點�能在此�置。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Parse error: %1&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;剖�錯誤：%1&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The value of the XSL-T version attribute must be a value of type %1, which %2 isn&amp;apos;t.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;XLS-T 版本屬性的值必須是型態 %1 的值，而 %2 �是。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Running an XSL-T 1.0 stylesheet with a 2.0 processor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;使用 2.0 處�器執行 XSL-T 1.0 樣�表中。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown XSL-T attribute %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;未知的 XSL-T 屬性 %1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 and %2 are mutually exclusive.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;屬性 %1 與 %2 彼此互斥。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;In a simplified stylesheet module, attribute %1 must be present.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在簡化的樣�表模組中，屬性 %1 必須存在。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;If element %1 has no attribute %2, it cannot have attribute %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;若元素 %1 沒有屬性 %2，則也�能有屬性 %3 或 %4。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 must have at least one of the attributes %2 or %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;元素 %1 必須至少有屬性 %2 或 %3 其中一個。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one mode must be specified in the %1-attribute on element %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;在元素 %2 的 %1 屬性中至少�指定一個模�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 must come last.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;元素 %1 必須最後出�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one %1-element must occur before %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;至少一個元素 %1 �出�在 %2 之�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only one %1-element can appear.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;�能出�一個元素 %1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one %1-element must occur inside %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;至少一個元素 %1 �出�在 %2 之內。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When attribute %1 is present on %2, a sequence constructor cannot be used.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;當屬性 %1 出�在 %2 內時，�能使用�列建構�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 must have either a %2-attribute or a sequence constructor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;元素 %1 必須至少有一個屬性 %2 或一個�列建構�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;When a parameter is required, a default value cannot be supplied through a %1-attribute or a sequence constructor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;當需��數時，�能��屬性 %1 或�列建構��供�設值。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 cannot have children.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;元素 %1 �能有�元素。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 cannot have a sequence constructor.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;元素 %1�能有�列建構�。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The attribute %1 cannot appear on %2, when it is a child of %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;屬性 %1 �能出�在 %2，因為它是 %3 的�元素。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;A parameter in a function cannot be declared to be a tunnel.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;函�內的�數�能被宣告為通�（tunnel）。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;This processor is not Schema-aware and therefore %1 cannot be used.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;此處�器�是 Schema-aware，因此�能使用 %1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Top level stylesheet elements must be in a non-null namespace, which %1 isn&amp;apos;t.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;頂層樣�表元素必須是�空白的命�空間，而 %1 �是。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The value for attribute %1 on element %2 must either be %3 or %4, not %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;元素 %2 內屬性 %1 的值必須是 %3 或 %4，而�是 %5。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 cannot have the value %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;屬性 %1 的值�能為 %2。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;The attribute %1 can only appear on the first %2 element.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;屬性 %1 �能出�在� %2 個元素內。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;At least one %1 element must appear as child of %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation&gt;%2 必須至少有一個�元素 %1。&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 has inheritance loop in its base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Circular inheritance of base type %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Circular inheritance of union %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by restriction as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by extension as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type of simple type %1 cannot be complex type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 cannot have direct base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 is not allowed to have base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 can only have simple atomic type as base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 cannot derive from %2 as the latter defines restriction as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Variety of item type of %1 must be either atomic or union.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Variety of member types of %1 must be atomic.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by list as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 is only allowed to have %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type of simple type %1 must have variety of type list.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type of simple type %1 has defined derivation by restriction as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Item type of base type does not match item type of %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type %1 contains not allowed facet type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to derive from %2 by union as the latter defines it as final.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to have any facets.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of simple type %2 must have variety of union.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of simple type %2 is not allowed to have restriction in %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Member type %1 cannot be derived from member type %2 of %3&amp;apos;s base type %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derivation method of %1 must be extension because the base type %2 is a simple type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 has duplicated element %2 in its content model.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 has non-deterministic content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attributes of complex type %1 are not a valid extension of the attributes of base type %2: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content model of complex type %1 is not a valid extension of content model of %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 must have simple content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 must have the same simple type as its base class %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 cannot be derived from base type %2%3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attributes of complex type %1 are not a valid restriction from the attributes of base type %2: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 with simple content cannot be derived from complex base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Item type of simple type %1 cannot be a complex type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Member type of simple type %1 cannot be a complex type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not allowed to have a member type with the same name as itself.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet collides with %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must have the same value as %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be equal or greater than %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than or equal to %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet contains invalid regular expression&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unknown notation %1 used in %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet contains invalid value %2: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet cannot be %2 or %3 if %4 facet of base type is %5.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet cannot be %2 if %3 facet of base type is %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than or equal to %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet and %2 facet cannot appear together.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be greater than %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be less than %2 facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 facet must be greater than or equal to %2 facet of base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type contains not allowed facet %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1, %2, %3, %4, %5 and %6 facets are not allowed when derived by list.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Only %1 and %2 facets are allowed when derived by union.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 contains %2 facet with invalid data: %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 contains attribute %2 twice.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 contains two different attributes that both have types derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 contains attribute %2 that has value constraint but type that inherits from %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 contains attribute %2 twice.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 contains two different attributes that both have types derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 contains attribute %2 that has value constraint but type that inherits from %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed to have a value constraint if its base type is complex.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed to have a value constraint if its type is derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value constraint of element %1 is not of elements type: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed to have substitution group affiliation as it is no global element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of element %1 cannot be derived from type of substitution group affiliation.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value constraint of attribute %1 is not of attributes type: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 has value constraint but has type derived from %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute in derived complex type must be %2 like in base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 in derived complex type must have %2 value constraint like in base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 in derived complex type must have the same %2 value constraint like in base type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 in derived complex type must have %2 value constraint.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;processContent of base wildcard must be weaker than derived wildcard.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 exists twice with different types.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Particle contains non-deterministic wildcards.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base attribute %1 is required but derived attribute is not.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of derived attribute %1 cannot be validly derived from type of base attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Value constraint of derived attribute %1 does not match value constraint of base attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived attribute %1 does not exist in the base definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived attribute %1 does not match the wildcard in the base definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base attribute %1 is required but missing in derived definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived definition contains an %1 element that does not exists in the base definition&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived wildcard is not a subset of the base wildcard.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 of derived wildcard is not a valid restriction of %2 of base wildcard&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 from base type is missing in derived type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of derived attribute %1 differs from type of base attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base definition contains an %1 element that is missing in the derived definition&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 references unknown %2 or %3 element %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 references identity constraint %2 that is no %3 or %4 element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 has a different number of fields from the identity constraint %2 that it references.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Item type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Member type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Base type %1 of complex type cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 cannot have complex base type that has a %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content model of complex type %1 contains %2 element so it cannot be derived by extension from a non-empty type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 cannot be derived by extension from %2 as the latter contains %3 element in its content model.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type of %1 element must be a simple type, %2 is not.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Substitution group %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Substitution group %1 has circular definition.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duplicated element names %1 in %2 element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Reference %1 of %2 element cannot be resolved.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Circular group reference for %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed in this scope&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element cannot have %2 attribute with value other than %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element cannot have %2 attribute with value other than %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 or %2 attribute of reference %3 does not match with the attribute declaration %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 has circular reference.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute in %2 must have %3 use like in base type %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute wildcard of %1 is not a valid restriction of attribute wildcard of base type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 has attribute wildcard but its base type %2 has not.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Union of attribute wildcard of type %1 and attribute wildcard of its base type %2 is not expressible.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Enumeration facet contains invalid content: {%1} is not a value of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Namespace prefix of qualified name %1 is not defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element %2 is not a valid restriction of the %3 element it redefines: %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Empty particle cannot be derived from non-empty particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived particle is missing element %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived element %1 is missing value constraint as defined in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived element %1 has weaker value constraint than base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fixed value constraint of element %1 differs from value constraint in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived element %1 cannot be nillable as base element is not nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Block constraints of derived element %1 must not be more weaker than in the base element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Simple type of derived element %1 cannot be validly derived from base element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type of derived element %1 cannot be validly derived from base element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is missing in derived particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 does not match namespace constraint of wildcard in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Wildcard in derived particle is not a valid subset of wildcard in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;processContent of wildcard in derived particle is weaker than wildcard in base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Derived particle allows content that is not allowed in the base particle.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Can not process unknown element %1, expected elements are: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not allowed in this scope, possible elements are: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Child element is missing in that scope, possible child elements are: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Document is not a XML schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element contains invalid content: {%3} is not a value of type %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element contains invalid content: {%3}.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Target namespace %1 of included schema is different from the target namespace %2 as defined by the including schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Target namespace %1 of imported schema is different from the target namespace %2 as defined by the importing schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed to have the same %2 attribute value as the target namespace %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element without %2 attribute is not allowed inside schema without target namespace.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed inside %2 element if %3 attribute is present.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element has neither %2 attribute nor %3 child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element with %2 child element must not have a %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must be %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must have a value of %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must have a value of %3 or %4.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element must not have %2 and %3 attribute together.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of %1 attribute of %2 element must not be from namespace %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must not be %3.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must have the value %3 because the %4 attribute is set.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Specifying use=&amp;apos;prohibited&amp;apos; inside an attribute group has no effect.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element must have either %2 or %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element must have either %2 attribute or %3 or %4 as child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element requires either %2 or %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Text or entity references not allowed inside %1 element&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must contain %3, %4 or a list of URIs.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 element is not allowed in this context.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element has larger value than %3 attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Prefix of qualified name %1 is not defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 attribute of %2 element must either contain %3 or the other values.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Component with ID %1 has been defined previously.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Type %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute group %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element group %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Notation %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Identity constraint %1 already defined.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duplicated facets in simple type %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 is not valid according to %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match the length facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match the minLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match the maxLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;String content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Signed integer content does not match in the totalDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Unsigned integer content does not match in the totalDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Double content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decimal content does not match in the fractionDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Decimal content does not match in the totalDigits facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Date time content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the maxInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the maxExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the minInclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match the minExclusive facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Duration content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Boolean content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content does not match the length facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content does not match the minLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content does not match the maxLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Binary content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Invalid QName content: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QName content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;QName content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Notation content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match length facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match minLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match maxLength facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;List content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Union content is not listed in the enumeration facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Union content does not match pattern facet.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Data of type %1 are not allowed to be empty.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is missing child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;There is one IDREF value with no corresponding ID: %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Loaded schema file is invalid.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;%1 contains invalid data.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;xsi:schemaLocation namespace %1 has already appeared earlier in the instance document.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace element or attribute.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No schema defined for validation.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No definition for element %1 available.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Specified type %1 is not known to the schema.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not defined in this scope.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Declaration for element %1 does not exist.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains invalid content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is declared as abstract.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is not nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 contains invalid data: %2&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element contains content although it is nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Fixed value constraint not allowed if element is nillable.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 cannot contain other elements, as it has a fixed content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Specified type %1 is not validly substitutable with element type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Complex type %1 is not allowed to be abstract.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed attributes.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed child element.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of element %1 does not match its type definition: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of element %1 does not match defined value constraint.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed child content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains not allowed text content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 is missing required attribute %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 does not match the attribute wildcard.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Declaration for attribute %1 does not exist.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains two attributes of type %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Attribute %1 contains invalid content.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Element %1 contains unknown attribute %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of attribute %1 does not match its type definition: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Content of attribute %1 does not match defined value constraint.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Non-unique value found for constraint %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Key constraint %1 contains absent fields.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Key constraint %1 contains references nillable element %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;No referenced value found for key reference %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;More than one value found for field %1.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;Field %1 has no simple type.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;ID value &amp;apos;%1&amp;apos; is not unique.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+        &lt;message&gt;</div><div class='add'>+            &lt;source&gt;&amp;apos;%1&amp;apos; attribute contains invalid QName content: %2.&lt;/source&gt;</div><div class='add'>+            &lt;translation type="unfinished"&gt;&lt;/translation&gt;</div><div class='add'>+        &lt;/message&gt;</div><div class='add'>+    &lt;/context&gt;</div><div class='add'>+&lt;/TS&gt;</div><div class='head'>diff --git a/config.profiles/symbian/translations_symbian/translations.pro b/config.profiles/symbian/translations_symbian/translations.pro<br/>new file mode 100644<br/>index 0000000..832af21<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.profiles/symbian/translations_symbian/translations.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.profiles/symbian/translations_symbian/translations.pro</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+TEMPLATE = subdirs</div><div class='add'>+</div><div class='add'>+symbian: {</div><div class='add'>+SYMBIANTRANSLATIONSFILES = qt</div><div class='add'>+SYMBIANTRANSLATIONS = ur fa ar he fr pl ru zh_cn zh_tw cs da de es gl hu ja pt sk sl sv uk</div><div class='add'>+CONFIG = loc_source_string </div><div class='add'>+load(loc.prf)</div><div class='add'>+}
\ No newline at end of file</div><div class='head'>diff --git a/config.tests/mac/coreservices/coreservices.mm b/config.tests/mac/coreservices/coreservices.mm<br/>new file mode 100644<br/>index 0000000..9fc45298<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/mac/coreservices/coreservices.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/mac/coreservices/coreservices.mm</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the config.tests of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;CoreServices/CoreServices.h&gt;</div><div class='add'>+</div><div class='add'>+int main()</div><div class='add'>+{</div><div class='add'>+    FSRef ref;</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/config.tests/mac/coreservices/coreservices.pro b/config.tests/mac/coreservices/coreservices.pro<br/>new file mode 100644<br/>index 0000000..c9bf8ec<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/mac/coreservices/coreservices.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/mac/coreservices/coreservices.pro</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+SOURCES = coreservices.mm</div><div class='add'>+LIBS += -framework CoreServices</div><div class='add'>+CONFIG -= app_bundle qt</div><div class='head'>diff --git a/config.tests/mac/corewlan/corewlan.pro b/config.tests/mac/corewlan/corewlan.pro<br/>index 8451af3..a9c2560 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/config.tests/mac/corewlan/corewlan.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>config.tests/mac/corewlan/corewlan.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/mac/corewlan/corewlan.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/mac/corewlan/corewlan.pro</a></div><div class='hunk'>@@ -1,3 +1,3 @@</div><div class='del'>-SOURCES = corewlantest.mm</div><div class='add'>+OBJECTIVE_SOURCES = corewlantest.mm</div><div class='ctx'> LIBS += -framework CoreWLAN -framework Foundation</div><div class='ctx'> CONFIG -= app_bundle qt</div><div class='head'>diff --git a/config.tests/qpa/wayland/wayland.cpp b/config.tests/qpa/wayland/wayland.cpp<br/>new file mode 100644<br/>index 0000000..d0ecdac<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/qpa/wayland/wayland.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/qpa/wayland/wayland.cpp</a></div><div class='hunk'>@@ -0,0 +1,46 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the config.tests of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+#include &lt;wayland-client.h&gt;</div><div class='add'>+</div><div class='add'>+int main(int, char **)</div><div class='add'>+{</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/config.tests/qpa/wayland/wayland.pro b/config.tests/qpa/wayland/wayland.pro<br/>new file mode 100644<br/>index 0000000..0c2b899<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/qpa/wayland/wayland.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/qpa/wayland/wayland.pro</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+SOURCES = wayland.cpp</div><div class='add'>+CONFIG -= qt</div><div class='add'>+INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND</div><div class='add'>+LIBS += $$QMAKE_LIBS_WAYLAND</div><div class='head'>diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test<br/>index 29ddea7..f4a7f29 100755<br/>--- a/<a href='/oss-git/Qt.git/tree/config.tests/unix/compile.test?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>config.tests/unix/compile.test</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/unix/compile.test?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/unix/compile.test</a></div><div class='hunk'>@@ -11,9 +11,9 @@ TEST=$6</div><div class='ctx'> EXE=`basename "$6"`</div><div class='ctx'> DESCRIPTION=$7</div><div class='ctx'> shift 7</div><div class='del'>-LFLAGS=""</div><div class='add'>+LFLAGS="$SYSROOT_FLAG"</div><div class='ctx'> INCLUDEPATH=""</div><div class='del'>-CXXFLAGS=""</div><div class='add'>+CXXFLAGS="$SYSROOT_FLAG"</div><div class='ctx'> MAC_ARCH_CXXFLAGS=""</div><div class='ctx'> MAC_ARCH_LFLAGS=""</div><div class='ctx'> while [ "$#" -gt 0 ]; do</div><div class='head'>diff --git a/config.tests/unix/icu/icu.cpp b/config.tests/unix/icu/icu.cpp<br/>new file mode 100644<br/>index 0000000..657d860<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/unix/icu/icu.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/unix/icu/icu.cpp</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the config.tests of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;unicode/utypes.h&gt;</div><div class='add'>+#include &lt;unicode/ucol.h&gt;</div><div class='add'>+#include &lt;unicode/ustring.h&gt;</div><div class='add'>+</div><div class='add'>+int main(int, char **)</div><div class='add'>+{</div><div class='add'>+    UErrorCode status = U_ZERO_ERROR;</div><div class='add'>+    UCollator *collator = ucol_open("ru_RU", &amp;status);</div><div class='add'>+    if (U_FAILURE(status))</div><div class='add'>+        return 0;</div><div class='add'>+    ucol_close(collator);</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro<br/>new file mode 100644<br/>index 0000000..8e58334<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/unix/icu/icu.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/unix/icu/icu.pro</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+SOURCES = icu.cpp</div><div class='add'>+CONFIG -= qt dylib app_bundle</div><div class='add'>+unix:LIBS += -licuuc -licui18n</div><div class='add'>+win32:LIBS += -licuin</div><div class='head'>diff --git a/config.tests/unix/opengldesktop/opengldesktop.cpp b/config.tests/unix/opengldesktop/opengldesktop.cpp<br/>new file mode 100644<br/>index 0000000..54860fe<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/unix/opengldesktop/opengldesktop.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/unix/opengldesktop/opengldesktop.cpp</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the config.tests of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;GL/gl.h&gt;</div><div class='add'>+</div><div class='add'>+int main(int, char **)</div><div class='add'>+{</div><div class='add'>+    glBegin(GL_TRIANGLES);</div><div class='add'>+        glVertex2f(20.0f, 10.0f);</div><div class='add'>+        glVertex2f(10.0f, 30.0f);</div><div class='add'>+        glVertex2f(20.0f, 50.0f);</div><div class='add'>+    glEnd();</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/config.tests/unix/opengldesktop/opengldesktop.pro b/config.tests/unix/opengldesktop/opengldesktop.pro<br/>new file mode 100644<br/>index 0000000..ac70ca3<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/unix/opengldesktop/opengldesktop.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/unix/opengldesktop/opengldesktop.pro</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+SOURCES = opengldesktop.cpp</div><div class='add'>+INCLUDEPATH += $$QMAKE_INCDIR_OPENGL</div><div class='add'>+</div><div class='add'>+for(p, QMAKE_LIBDIR_OPENGL) {</div><div class='add'>+    exists($$p):LIBS += -L$$p</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+CONFIG -= qt</div><div class='add'>+LIBS += $$QMAKE_LIBS_OPENGL</div><div class='head'>diff --git a/config.tests/unix/opengles1/opengles1.cpp b/config.tests/unix/opengles1/opengles1.cpp<br/>index 69526b6..837bed4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/config.tests/unix/opengles1/opengles1.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>config.tests/unix/opengles1/opengles1.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/unix/opengles1/opengles1.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/unix/opengles1/opengles1.cpp</a></div><div class='hunk'>@@ -39,7 +39,11 @@</div><div class='ctx'> **</div><div class='ctx'> ****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;GLES/gl.h&gt;</div><div class='add'>+#ifdef BUILD_ON_MAC</div><div class='add'>+  #include &lt;OpenGLES/ES1/gl.h&gt;</div><div class='add'>+#else</div><div class='add'>+  #include &lt;GLES/gl.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> int main(int, char **)</div><div class='ctx'> {</div><div class='head'>diff --git a/config.tests/unix/opengles1/opengles1.pro b/config.tests/unix/opengles1/opengles1.pro<br/>index 1469aa9..9e60124 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/config.tests/unix/opengles1/opengles1.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>config.tests/unix/opengles1/opengles1.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/unix/opengles1/opengles1.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/unix/opengles1/opengles1.pro</a></div><div class='hunk'>@@ -7,3 +7,7 @@ for(p, QMAKE_LIBDIR_OPENGL_ES1) {</div><div class='ctx'> </div><div class='ctx'> CONFIG -= qt</div><div class='ctx'> LIBS += $$QMAKE_LIBS_OPENGL_ES1</div><div class='add'>+mac {</div><div class='add'>+    DEFINES += BUILD_ON_MAC</div><div class='add'>+    CONFIG -= app_bundle</div><div class='add'>+}</div><div class='head'>diff --git a/config.tests/unix/opengles2/opengles2.cpp b/config.tests/unix/opengles2/opengles2.cpp<br/>index 50bea92..89c1e2d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/config.tests/unix/opengles2/opengles2.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>config.tests/unix/opengles2/opengles2.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/unix/opengles2/opengles2.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/unix/opengles2/opengles2.cpp</a></div><div class='hunk'>@@ -39,7 +39,11 @@</div><div class='ctx'> **</div><div class='ctx'> ****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include &lt;GLES2/gl2.h&gt;</div><div class='add'>+#ifdef BUILD_ON_MAC</div><div class='add'>+  #include &lt;OpenGLES/ES2/gl.h&gt;</div><div class='add'>+#else</div><div class='add'>+  #include &lt;GLES2/gl2.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> int main(int, char **)</div><div class='ctx'> {</div><div class='head'>diff --git a/config.tests/unix/opengles2/opengles2.pro b/config.tests/unix/opengles2/opengles2.pro<br/>index c383fd0..34d7737 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/config.tests/unix/opengles2/opengles2.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>config.tests/unix/opengles2/opengles2.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/unix/opengles2/opengles2.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/unix/opengles2/opengles2.pro</a></div><div class='hunk'>@@ -7,3 +7,7 @@ for(p, QMAKE_LIBDIR_OPENGL_ES2) {</div><div class='ctx'> </div><div class='ctx'> CONFIG -= qt</div><div class='ctx'> LIBS += $$QMAKE_LIBS_OPENGL_ES2</div><div class='add'>+mac {</div><div class='add'>+    DEFINES += BUILD_ON_MAC</div><div class='add'>+    CONFIG -= app_bundle</div><div class='add'>+}</div><div class='head'>diff --git a/config.tests/x11/glxfbconfig/glxfbconfig.pro b/config.tests/x11/glxfbconfig/glxfbconfig.pro<br/>index 4705ca6..65f855a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/config.tests/x11/glxfbconfig/glxfbconfig.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>config.tests/x11/glxfbconfig/glxfbconfig.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/x11/glxfbconfig/glxfbconfig.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/x11/glxfbconfig/glxfbconfig.pro</a></div><div class='hunk'>@@ -7,4 +7,4 @@ for(p, QMAKE_LIBDIR_OPENGL) {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> CONFIG -= qt</div><div class='del'>-LIBS += -lGL -lGLU</div><div class='add'>+LIBS += -lGL</div><div class='head'>diff --git a/config.tests/x11/opengl/opengl.cpp b/config.tests/x11/opengl/opengl.cpp<br/>index e2da13c..ffcaff3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/config.tests/x11/opengl/opengl.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>config.tests/x11/opengl/opengl.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/x11/opengl/opengl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/x11/opengl/opengl.cpp</a></div><div class='hunk'>@@ -40,11 +40,6 @@</div><div class='ctx'> ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;GL/gl.h&gt;</div><div class='del'>-#include &lt;GL/glu.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef GLU_VERSION_1_2</div><div class='del'>-#  error "Required GLU version 1.2 not found."</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> int main(int, char **)</div><div class='ctx'> {</div><div class='head'>diff --git a/config.tests/x11/opengl/opengl.pro b/config.tests/x11/opengl/opengl.pro<br/>index 5fd41d3..5c3a1c5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/config.tests/x11/opengl/opengl.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>config.tests/x11/opengl/opengl.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/config.tests/x11/opengl/opengl.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>config.tests/x11/opengl/opengl.pro</a></div><div class='hunk'>@@ -8,4 +8,4 @@ for(p, QMAKE_LIBDIR_OPENGL) {</div><div class='ctx'> </div><div class='ctx'> CONFIG -= qt</div><div class='ctx'> win32-g++*:LIBS += -lopengl32</div><div class='del'>-else:LIBS += -lGL -lGLU</div><div class='add'>+else:LIBS += -lGL</div><div class='head'>diff --git a/configure b/configure<br/>index 3b7a1f3..e62c778 100755<br/>--- a/<a href='/oss-git/Qt.git/tree/configure?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>configure</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/configure?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>configure</a></div><div class='hunk'>@@ -186,8 +186,11 @@ fi</div><div class='ctx'> </div><div class='ctx'> PLATFORM_X11=no</div><div class='ctx'> PLATFORM_QWS=maybe</div><div class='add'>+PLATFORM_QPA=maybe</div><div class='add'>+BUILD_ON_MAC=no</div><div class='ctx'> if [ -d /System/Library/Frameworks/Carbon.framework ]; then</div><div class='ctx'>     PLATFORM_MAC=maybe</div><div class='add'>+    BUILD_ON_MAC=yes</div><div class='ctx'> else</div><div class='ctx'>     PLATFORM_MAC=no</div><div class='ctx'> fi</div><div class='hunk'>@@ -267,6 +270,22 @@ earlyArgParse()</div><div class='ctx'>                 VAL=$1</div><div class='ctx'>             fi</div><div class='ctx'>             ;;</div><div class='add'>+        -embedded-lite|-qpa)</div><div class='add'>+            VAR=qpa</div><div class='add'>+            # this option may or may not be followed by an argument</div><div class='add'>+            if [ -z "$2" ] || echo "$2" | grep '^-' &gt;/dev/null 2&gt;&amp;1; then</div><div class='add'>+                VAL=auto</div><div class='add'>+            else</div><div class='add'>+                shift;</div><div class='add'>+                VAL=$1</div><div class='add'>+            fi</div><div class='add'>+            ;;</div><div class='add'>+        -nacl)</div><div class='add'>+            shift;</div><div class='add'>+            VAR=nacl</div><div class='add'>+            VAL=$1</div><div class='add'>+            ;;</div><div class='add'>+</div><div class='ctx'>         -h|help|--help|-help)</div><div class='ctx'>             if [ "$VAL" = "yes" ]; then</div><div class='ctx'>                 OPT_HELP="$VAL"</div><div class='hunk'>@@ -301,7 +320,31 @@ earlyArgParse()</div><div class='ctx'>             PLATFORM_X11=no</div><div class='ctx'>             PLATFORM_MAC=no</div><div class='ctx'>             PLATFORM_QWS=yes</div><div class='add'>+            PLATFORM_QPA=no</div><div class='add'>+            ;;</div><div class='add'>+        qpa)</div><div class='add'>+            CFG_EMBEDDED="no"</div><div class='add'>+            if [ "$PLATFORM_QPA" != "no" ]; then</div><div class='add'>+                if [ "$PLATFORM_QPA" = "maybe" ]; then</div><div class='add'>+                    PLATFORM_X11=no</div><div class='add'>+                    PLATFORM_MAC=no</div><div class='add'>+                    PLATFORM_QWS=no</div><div class='add'>+                    PLATFORM_QPA=yes</div><div class='add'>+                fi</div><div class='add'>+            else</div><div class='add'>+                echo "No license exists to enable Qt QPA. Disabling."</div><div class='add'>+                CFG_EMBEDDED=no</div><div class='add'>+            fi</div><div class='ctx'>             ;;</div><div class='add'>+        nacl)</div><div class='add'>+            echo "Using NaCl at $VAL."</div><div class='add'>+            PLATFORM_X11=no</div><div class='add'>+            PLATFORM_MAC=no</div><div class='add'>+            PLATFORM_QWS=no</div><div class='add'>+            CFG_NACL_PATH=$VAL</div><div class='add'>+            CFG_EMBEDDED=nacl</div><div class='add'>+            ;;</div><div class='add'>+</div><div class='ctx'>         developer-build)</div><div class='ctx'>             CFG_DEV="yes"</div><div class='ctx'>             ;;</div><div class='hunk'>@@ -360,6 +403,7 @@ elif [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ] &amp;&amp; [ $COMMERCIAL_USER = "yes"</div><div class='ctx'> elif [ $COMMERCIAL_USER = "yes" ]; then</div><div class='ctx'>     # one of commercial editions</div><div class='ctx'>     [ "$PLATFORM_MAC" = "maybe" ] &amp;&amp; PLATFORM_MAC=yes</div><div class='add'>+    [ "$PLATFORM_QPA" = "maybe" ] &amp;&amp; PLATFORM_QPA=no</div><div class='ctx'>     [ "$PLATFORM_QWS" = "maybe" ] &amp;&amp; PLATFORM_QWS=no</div><div class='ctx'> </div><div class='ctx'>     # read in the license file</div><div class='hunk'>@@ -452,6 +496,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then</div><div class='ctx'> 	    PlatformCode=`echo "$PlatformCode" | sed 's/.$//'`</div><div class='ctx'> 	    ;;</div><div class='ctx'>     esac</div><div class='add'>+    ### EMBEDDED_QPA logic missing ###</div><div class='ctx'>     case "$PlatformCode,$PLATFORM_MAC,$PLATFORM_QWS" in</div><div class='ctx'>         X9,* | XC,* | XU,* | XW,* | XM,*)</div><div class='ctx'>             # Qt All-OS</div><div class='hunk'>@@ -566,12 +611,14 @@ fi</div><div class='ctx'> # initalize variables</div><div class='ctx'> #-------------------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS"</div><div class='add'>+SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"</div><div class='ctx'> for varname in $SYSTEM_VARIABLES; do</div><div class='ctx'>     qmakevarname="${varname}"</div><div class='ctx'>     # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS</div><div class='ctx'>     if [ "${varname}" = "LDFLAGS" ]; then</div><div class='ctx'>         qmakevarname="LFLAGS"</div><div class='add'>+    elif [ "${varname}" = "LD" ]; then</div><div class='add'>+        qmakevarname="LINK"</div><div class='ctx'>     fi</div><div class='ctx'>     cmd=`echo \</div><div class='ctx'> 'if [ -n "\$'${varname}'" ]; then</div><div class='hunk'>@@ -681,6 +728,11 @@ if [ -f "$relpath/src/gui/embedded/qscreenqnx_qws.cpp" ]; then</div><div class='ctx'>     CFG_MOUSE_AVAILABLE="${CFG_MOUSE_AVAILABLE} qnx"</div><div class='ctx'>     CFG_GFX_AVAILABLE="${CFG_GFX_AVAILABLE} qnx"</div><div class='ctx'> fi</div><div class='add'>+if [ -f "$relpath/src/gui/embedded/qscreenintegrityfb_qws.cpp" ]; then</div><div class='add'>+    CFG_KBD_AVAILABLE="${CFG_KBD_AVAILABLE} integrity"</div><div class='add'>+    CFG_MOUSE_AVAILABLE="${CFG_MOUSE_AVAILABLE} integrity"</div><div class='add'>+    CFG_GFX_AVAILABLE="${CFG_GFX_AVAILABLE} integrityfb"</div><div class='add'>+fi</div><div class='ctx'> </div><div class='ctx'> CFG_ARCH=</div><div class='ctx'> CFG_HOST_ARCH=</div><div class='hunk'>@@ -752,6 +804,7 @@ CFG_MAC_XARCH=auto</div><div class='ctx'> CFG_MAC_CARBON=no</div><div class='ctx'> CFG_MAC_COCOA=yes</div><div class='ctx'> COMMANDLINE_MAC_CARBON=no</div><div class='add'>+CFG_MAC_HARFBUZZ=no</div><div class='ctx'> CFG_SXE=no</div><div class='ctx'> CFG_PREFIX_INSTALL=yes</div><div class='ctx'> CFG_SDK=</div><div class='hunk'>@@ -780,6 +833,7 @@ CFG_PULSEAUDIO=auto</div><div class='ctx'> CFG_COREWLAN=auto</div><div class='ctx'> CFG_ICD=auto</div><div class='ctx'> CFG_NOPROCESS=no</div><div class='add'>+CFG_ICU=auto</div><div class='ctx'> </div><div class='ctx'> # initalize variables used for installation</div><div class='ctx'> QT_INSTALL_PREFIX=</div><div class='hunk'>@@ -887,6 +941,53 @@ if [ -d "$relpath/src/plugins/gfxdrivers" ]; then</div><div class='ctx'>   CFG_GFX_OFF="$CFG_GFX_AVAILABLE" # assume all off</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+CFG_IMAGEFORMAT_PLUGIN_AVAILABLE=</div><div class='add'>+if [ -d "$relpath/src/plugins/imageformats" ]; then</div><div class='add'>+    for a in "$relpath/src/plugins/imageformats/"*; do</div><div class='add'>+        if [ -d "$a" ]; then</div><div class='add'>+            base_a=`basename "$a"`</div><div class='add'>+            CFG_IMAGEFORMAT_PLUGIN_AVAILABLE="${CFG_IMAGEFORMAT_PLUGIN_AVAILABLE} ${base_a}"</div><div class='add'>+        fi</div><div class='add'>+    done</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+#-------------------------------------------------------------------------------</div><div class='add'>+# Set Default NaCl options</div><div class='add'>+#-------------------------------------------------------------------------------</div><div class='add'>+if [ "$CFG_EMBEDDED" = "nacl" ]; then</div><div class='add'>+    echo "Setting NaCl options:"</div><div class='add'>+    echo "-static"</div><div class='add'>+    CFG_SHARED=no</div><div class='add'>+    echo "-qpa nacl"</div><div class='add'>+    PLATFORM_QPA=yes</div><div class='add'>+    echo "-fast"</div><div class='add'>+    OPT_FAST=yes</div><div class='add'>+    echo "-qconfig nacl"</div><div class='add'>+    CFG_QCONFIG=nacl</div><div class='add'>+</div><div class='add'>+    if [ `uname` = "Linux" ]; then</div><div class='add'>+        I_FLAGS="$I_FLAGS -I${CFG_NACL_PATH}/toolchain/linux_x86/sdk/nacl-sdk/include"</div><div class='add'>+        L_FLAGS="$L_FLAGS -I${CFG_NACL_PATH}/toolchain/linux_x86/sdk/nacl-sdk/lib"</div><div class='add'>+    else</div><div class='add'>+        I_FLAGS="$I_FLAGS -I${CFG_NACL_PATH}/toolchain/mac_x86/sdk/nacl-sdk/include"</div><div class='add'>+        L_FLAGS="$L_FLAGS -I${CFG_NACL_PATH}/toolchain/mac_x86/sdk/nacl-sdk/lib"</div><div class='add'>+    fi</div><div class='add'>+</div><div class='add'>+    echo "-no-multimedia -no-webkit -no-phonon -no-nultimedia -no-mediaservices -no-xmlpatterns -no-script -no-sql-sqlite -nomake tests"</div><div class='add'>+    CFG_MULTIMEDIA=no</div><div class='add'>+    CFG_WEBKIT=no</div><div class='add'>+    CFG_PHONON=no</div><div class='add'>+    CFG_MULTIMEDIA=no</div><div class='add'>+    CFG_MEDIASERVICES=no</div><div class='add'>+    CFG_XMLPATTERNS=no</div><div class='add'>+    CFG_SCRIPT=no</div><div class='add'>+    CFG_SQLITE=no</div><div class='add'>+    CFG_SQL_sqlite=no</div><div class='add'>+    CFG_LIBTIFF=no</div><div class='add'>+    CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS tests"</div><div class='add'>+    QT_CONFIG="$QT_CONFIG nacl"</div><div class='add'>+fi</div><div class='add'>+</div><div class='ctx'> #-------------------------------------------------------------------------------</div><div class='ctx'> # parse command line arguments</div><div class='ctx'> #-------------------------------------------------------------------------------</div><div class='hunk'>@@ -941,13 +1042,13 @@ while [ "$#" -gt 0 ]; do</div><div class='ctx'>         VAL=no</div><div class='ctx'>         ;;</div><div class='ctx'>     #Qt style yes options</div><div class='del'>-    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles)</div><div class='add'>+    -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)</div><div class='ctx'>         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`</div><div class='ctx'>         VAL=yes</div><div class='ctx'>         ;;</div><div class='ctx'>     #Qt style options that pass an argument</div><div class='ctx'>     -qconfig)</div><div class='del'>-        if [ "$PLATFORM_QWS" != "yes" ]; then</div><div class='add'>+        if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then</div><div class='ctx'>             echo</div><div class='ctx'>             echo "WARNING: -qconfig is only tested and supported on Qt for Embedded Linux."</div><div class='ctx'>             echo</div><div class='hunk'>@@ -987,6 +1088,20 @@ while [ "$#" -gt 0 ]; do</div><div class='ctx'>             VAL=$1</div><div class='ctx'>         fi</div><div class='ctx'> 	;;</div><div class='add'>+    -embedded-lite|-qpa)</div><div class='add'>+        VAR=qpa</div><div class='add'>+        # this option may or may not be followed by an argument</div><div class='add'>+        if [ -z "$2" ] || echo "$2" | grep '^-' &gt;/dev/null 2&gt;&amp;1; then</div><div class='add'>+            VAL=auto</div><div class='add'>+        else</div><div class='add'>+            shift;</div><div class='add'>+            VAL=$1</div><div class='add'>+        fi</div><div class='add'>+	;;</div><div class='add'>+    -nacl)</div><div class='add'>+        VAR=nacl</div><div class='add'>+        shift;</div><div class='add'>+    ;;</div><div class='ctx'>     -opengl)</div><div class='ctx'>         VAR=opengl</div><div class='ctx'>         # this option may or may not be followed by an argument</div><div class='hunk'>@@ -1203,6 +1318,9 @@ while [ "$#" -gt 0 ]; do</div><div class='ctx'>     qconfig)</div><div class='ctx'>         CFG_QCONFIG="$VAL"</div><div class='ctx'>         ;;</div><div class='add'>+    sysroot)</div><div class='add'>+        CFG_SYSROOT="$VAL"</div><div class='add'>+        ;;</div><div class='ctx'>     bindir)</div><div class='ctx'>         QT_INSTALL_BINS="$VAL"</div><div class='ctx'>         ;;</div><div class='hunk'>@@ -1217,6 +1335,16 @@ while [ "$#" -gt 0 ]; do</div><div class='ctx'>         PLATFORM_X11=no</div><div class='ctx'>         PLATFORM_MAC=no</div><div class='ctx'>         PLATFORM_QWS=yes</div><div class='add'>+        PLATFORM_QPA=no</div><div class='add'>+        ;;</div><div class='add'>+    embedded-lite|qpa)</div><div class='add'>+        CFG_EMBEDDED="no"</div><div class='add'>+        PLATFORM_X11=no</div><div class='add'>+        PLATFORM_MAC=no</div><div class='add'>+        PLATFORM_QWS=no</div><div class='add'>+        PLATFORM_QPA=yes</div><div class='add'>+        ;;</div><div class='add'>+    nacl)</div><div class='ctx'>         ;;</div><div class='ctx'>     sse)</div><div class='ctx'>         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then</div><div class='hunk'>@@ -1323,6 +1451,7 @@ while [ "$#" -gt 0 ]; do</div><div class='ctx'> 	CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL"</div><div class='ctx'>         ;;</div><div class='ctx'>     x11)</div><div class='add'>+        PLATFORM_QPA=no</div><div class='ctx'>         PLATFORM_MAC=no</div><div class='ctx'>         PLATFORM_QWS=no</div><div class='ctx'>         PLATFORM_X11=yes</div><div class='hunk'>@@ -1371,9 +1500,16 @@ while [ "$#" -gt 0 ]; do</div><div class='ctx'>             UNKNOWN_OPT=yes</div><div class='ctx'>         fi</div><div class='ctx'>         ;;</div><div class='add'>+    harfbuzz)</div><div class='add'>+        if [ "$PLATFORM_MAC" = "yes" ] &amp;&amp; [ "$CFG_MAC_CARBON" != "yes" ] &amp;&amp; [ "$VAL" = "yes" ]; then</div><div class='add'>+            CFG_MAC_HARFBUZZ="$VAL"</div><div class='add'>+        else</div><div class='add'>+            UNKNOWN_OPT=yes</div><div class='add'>+        fi</div><div class='add'>+        ;;</div><div class='ctx'> </div><div class='ctx'>     framework)</div><div class='del'>-        if [ "$PLATFORM_MAC" = "yes" ]; then</div><div class='add'>+        if [ "$PLATFORM_MAC" = "yes" ] || [ "$PLATFORM_QPA" = "yes" ]; then</div><div class='ctx'>             CFG_FRAMEWORK="$VAL"</div><div class='ctx'>         else</div><div class='ctx'>             UNKNOWN_OPT=yes</div><div class='hunk'>@@ -1540,8 +1676,7 @@ while [ "$#" -gt 0 ]; do</div><div class='ctx'>         fi</div><div class='ctx'>         ;;</div><div class='ctx'>     gif)</div><div class='del'>-        [ "$VAL" = "qt" ] &amp;&amp; VAL=auto</div><div class='del'>-        if [ "$VAL" = "auto" ] || [ "$VAL" = "no" ]; then</div><div class='add'>+        if [ "$VAL" = "no" ]; then</div><div class='ctx'>             CFG_GIF="$VAL"</div><div class='ctx'>         else</div><div class='ctx'>             UNKNOWN_OPT=yes</div><div class='hunk'>@@ -2031,7 +2166,7 @@ while [ "$#" -gt 0 ]; do</div><div class='ctx'>             UNKNOWN_OPT=yes</div><div class='ctx'>         fi</div><div class='ctx'>         ;;</div><div class='del'>-    sql-*|gfx-*|decoration-*|kbd-*|mouse-*)</div><div class='add'>+    sql-*|gfx-*|decoration-*|kbd-*|mouse-*|imageformat-*)</div><div class='ctx'>         # if Qt style options were used, $VAL can be "no", "qt", or "plugin"</div><div class='ctx'>         # if autoconf style options were used, $VAL can be "yes" or "no"</div><div class='ctx'>         [ "$VAL" = "yes" ] &amp;&amp; VAL=qt</div><div class='hunk'>@@ -2073,6 +2208,13 @@ while [ "$#" -gt 0 ]; do</div><div class='ctx'> 		avail="$CFG_MOUSE_PLUGIN_AVAILABLE"</div><div class='ctx'> 	    fi</div><div class='ctx'>             ;;</div><div class='add'>+        imageformat)</div><div class='add'>+            avail="$CFG_IMAGEFORMAT_PLUGIN_AVAILABLE"</div><div class='add'>+            if [ "$OPT" != "plugin" ]; then</div><div class='add'>+                # png is always built in</div><div class='add'>+                avail="$avail png"</div><div class='add'>+            fi</div><div class='add'>+            ;;</div><div class='ctx'>         *)</div><div class='ctx'>             avail=""</div><div class='ctx'>             echo "BUG: Unhandled type $VAR used in $CURRENT_OPT"</div><div class='hunk'>@@ -2093,6 +2235,11 @@ while [ "$#" -gt 0 ]; do</div><div class='ctx'>             # set the CFG_SQL_driver</div><div class='ctx'>             eval "CFG_SQL_$VAL=\$OPT"</div><div class='ctx'>             continue</div><div class='add'>+        elif [ "$VAR" = "imageformat" ]; then</div><div class='add'>+            [ "$OPT" = "qt" ] &amp;&amp; OPT=yes</div><div class='add'>+            VAL="`echo $VAL |tr a-z A-Z`"</div><div class='add'>+            eval "CFG_$VAL=$OPT"</div><div class='add'>+            continue</div><div class='ctx'>         fi</div><div class='ctx'> </div><div class='ctx'>         if [ "$OPT" = "plugin" ] || [ "$OPT" = "qt" ]; then</div><div class='hunk'>@@ -2238,6 +2385,13 @@ while [ "$#" -gt 0 ]; do</div><div class='ctx'>           QT_CFLAGS_FPU=$VAL</div><div class='ctx'>        fi</div><div class='ctx'>        ;;</div><div class='add'>+    icu)</div><div class='add'>+        if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then</div><div class='add'>+            CFG_ICU="$VAL"</div><div class='add'>+        else</div><div class='add'>+            UNKNOWN_OPT=yes</div><div class='add'>+        fi</div><div class='add'>+        ;;</div><div class='ctx'>     *)</div><div class='ctx'>         UNKNOWN_OPT=yes</div><div class='ctx'>         ;;</div><div class='hunk'>@@ -2258,6 +2412,11 @@ if [ "$CFG_GUI" = "no" ]; then</div><div class='ctx'>     CFG_QT3SUPPORT="no"</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+#disable Qt3Support for Lighthouse</div><div class='add'>+if [ "$PLATFORM_QPA" = "yes" ]; then</div><div class='add'>+    CFG_QT3SUPPORT="no"</div><div class='add'>+fi</div><div class='add'>+</div><div class='ctx'> # update QT_CONFIG to show our current predefined configuration</div><div class='ctx'> case "$CFG_QCONFIG" in</div><div class='ctx'> minimal|small|medium|large|full)</div><div class='hunk'>@@ -2328,7 +2487,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then</div><div class='ctx'>     [ "$OPT_VERBOSE" = "yes" ] &amp;&amp; echo "Performing shadow build..."</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='del'>-if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ] &amp;&amp; [ "$CFG_DEBUG_RELEASE" = "yes" ]; then</div><div class='add'>+if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ] &amp;&amp; [ "$CFG_DEBUG_RELEASE" = "yes" ]; then</div><div class='ctx'>     echo</div><div class='ctx'>     echo "WARNING: -debug-and-release is not supported anymore on Qt/X11 and Qt for Embedded Linux"</div><div class='ctx'>     echo "Qt can be built in release mode with separate debug information, so"</div><div class='hunk'>@@ -2447,7 +2606,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='ctx'> # symlink fonts to be able to run application from build directory</div><div class='del'>-if [ "$PLATFORM_QWS" = "yes" ] &amp;&amp; [ ! -d "${outpath}/lib/fonts" ]; then</div><div class='add'>+if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ] &amp;&amp; [ ! -d "${outpath}/lib/fonts" ]; then</div><div class='ctx'>     if [ "$PLATFORM" = "$XPLATFORM" ]; then</div><div class='ctx'>         mkdir -p "${outpath}/lib"</div><div class='ctx'>         ln -s "${relpath}/lib/fonts" "${outpath}/lib/fonts"</div><div class='hunk'>@@ -2561,6 +2720,7 @@ if [ "$CFG_EMBEDDED" != "no" ]; then</div><div class='ctx'>         echo "Qt for Embedded Linux is not supported on this platform. Disabling."</div><div class='ctx'>         CFG_EMBEDDED=no</div><div class='ctx'>         PLATFORM_QWS=no</div><div class='add'>+        PLATFORM_QPA=no</div><div class='ctx'>         ;;</div><div class='ctx'>     esac</div><div class='ctx'> fi</div><div class='hunk'>@@ -2568,7 +2728,7 @@ if [ -z "$PLATFORM" ]; then</div><div class='ctx'>     PLATFORM_NOTES=</div><div class='ctx'>     case "$UNAME_SYSTEM:$UNAME_RELEASE" in</div><div class='ctx'>      Darwin:*)</div><div class='del'>-        if [ "$PLATFORM_MAC" = "yes" ]; then</div><div class='add'>+        if [ "$PLATFORM_MAC" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then</div><div class='ctx'>           PLATFORM=macx-g++</div><div class='ctx'>         # PLATFORM=macx-xcode</div><div class='ctx'>         else</div><div class='hunk'>@@ -2802,7 +2962,7 @@ if [ '!' -f "${XQMAKESPEC}/qplatformdefs.h" ]; then</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='ctx'> # now look at the configs and figure out what platform we are config'd for</div><div class='del'>-[ "$CFG_EMBEDDED" = "no" ] \</div><div class='add'>+[ "$CFG_EMBEDDED" = "no" ] &amp;&amp; [ "$PLATFORM_QPA" != "yes" ] \</div><div class='ctx'>   &amp;&amp; [ '!' -z "`getQMakeConf \"$XQMAKESPEC\" | grep QMAKE_LIBS_X11 | awk '{print $3;}'`" ] \</div><div class='ctx'>   &amp;&amp; PLATFORM_X11=yes</div><div class='ctx'> ### echo "$XQMAKESPEC" | grep mkspecs/qws &gt;/dev/null 2&gt;&amp;1 &amp;&amp; PLATFORM_QWS=yes</div><div class='hunk'>@@ -3010,6 +3170,9 @@ if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then</div><div class='ctx'>     sh4al)</div><div class='ctx'>         CFG_ARCH=sh4a</div><div class='ctx'>         ;;</div><div class='add'>+    arm*)</div><div class='add'>+        CFG_ARCH=arm</div><div class='add'>+        ;;</div><div class='ctx'>     *)</div><div class='ctx'>         CFG_ARCH="$CFG_EMBEDDED"</div><div class='ctx'>         ;;</div><div class='hunk'>@@ -3022,6 +3185,16 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then</div><div class='ctx'>     CFG_ARCH=$CFG_HOST_ARCH</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+# for compatibility</div><div class='add'>+COMPAT_ARCH=</div><div class='add'>+case "$CFG_ARCH" in</div><div class='add'>+arm*)</div><div class='add'>+    # previously, armv6 was a different arch</div><div class='add'>+    CFG_ARCH=arm</div><div class='add'>+    COMPAT_ARCH=armv6</div><div class='add'>+    ;;</div><div class='add'>+esac</div><div class='add'>+</div><div class='ctx'> if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then</div><div class='ctx'>     if [ "$OPT_VERBOSE" = "yes" ]; then</div><div class='ctx'>         echo "    '$CFG_ARCH' is supported"</div><div class='hunk'>@@ -3047,7 +3220,7 @@ fi</div><div class='ctx'> </div><div class='ctx'> if [ "$OPT_VERBOSE" = "yes" ]; then</div><div class='ctx'>     echo "System architecture: '$CFG_ARCH'"</div><div class='del'>-    if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='add'>+    if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then</div><div class='ctx'> 	echo "Host architecture: '$CFG_HOST_ARCH'"</div><div class='ctx'>     fi</div><div class='ctx'> fi</div><div class='hunk'>@@ -3152,6 +3325,21 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then</div><div class='ctx'>     fi</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+if [ "$CFG_EMBEDDED" = "nacl" ]; then</div><div class='add'>+    TEST_COMPILER="nacl-gcc"</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+SYSROOT_FLAG=</div><div class='add'>+if [ -n "$CFG_SYSROOT" ]; then</div><div class='add'>+    if compilerSupportsFlag --sysroot="$CFG_SYSROOT"; then</div><div class='add'>+	[ "$OPT_VERBOSE" = "yes" ] &amp;&amp; echo "Setting sysroot to: $CFG_SYSROOT"</div><div class='add'>+	SYSROOT_FLAG="--sysroot=$CFG_SYSROOT"</div><div class='add'>+    else</div><div class='add'>+	echo &gt;&amp;2 "The compiler doesn't support the --sysroot flag, I can't set the sysroot"</div><div class='add'>+	exit 1</div><div class='add'>+    fi</div><div class='add'>+fi</div><div class='add'>+export SYSROOT_FLAG    # used by config.tests/unix/compile.test</div><div class='ctx'> </div><div class='ctx'> # auto-detect precompiled header support</div><div class='ctx'> if [ "$CFG_PRECOMPILE" = "auto" ]; then</div><div class='hunk'>@@ -3306,12 +3494,16 @@ fi</div><div class='ctx'> if [ -z "$QT_INSTALL_PREFIX" ]; then</div><div class='ctx'>     if [ "$CFG_DEV" = "yes" ]; then</div><div class='ctx'>         QT_INSTALL_PREFIX="$outpath" # In Development, we use sandboxed builds by default</div><div class='del'>-    elif [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='del'>-        QT_INSTALL_PREFIX="/usr/local/Trolltech/QtEmbedded-${QT_VERSION}"</div><div class='add'>+    elif [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then</div><div class='add'>+        if [ "$PLATFORM_QPA" = "yes" ]; then</div><div class='add'>+	QT_INSTALL_PREFIX="/usr/local/Trolltech/QtLighthouse-${QT_VERSION}"</div><div class='add'>+        else</div><div class='add'>+	QT_INSTALL_PREFIX="/usr/local/Trolltech/QtEmbedded-${QT_VERSION}"</div><div class='add'>+        fi</div><div class='ctx'>         if [ "$PLATFORM" != "$XPLATFORM" ]; then</div><div class='ctx'>             QT_INSTALL_PREFIX="${QT_INSTALL_PREFIX}-${CFG_ARCH}"</div><div class='ctx'>         fi</div><div class='del'>-    elif [ -d "$EPOCROOT" ]; then</div><div class='add'>+    elif [ -d "$EPOCROOT" ] &amp;&amp; [ "$XPLATFORM_SYMBIAN" = "yes" ]; then</div><div class='ctx'>         if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then</div><div class='ctx'>             QT_INSTALL_PREFIX="$EPOCROOT/epoc32/"</div><div class='ctx'>             QT_INSTALL_LIBS="$EPOCROOT/epoc32/release/armv5/lib/"</div><div class='hunk'>@@ -3518,7 +3710,7 @@ Usage:  $relconf [-h] [-prefix &lt;dir&gt;] [-prefix-install] [-bindir &lt;dir&gt;] [-libdir</div><div class='ctx'>         [-accessibility] [-no-stl] [-stl] [-no-sql-&lt;driver&gt;] [-sql-&lt;driver&gt;]</div><div class='ctx'>         [-plugin-sql-&lt;driver&gt;] [-system-sqlite] [-no-qt3support] [-qt3support]</div><div class='ctx'>         [-platform] [-D &lt;string&gt;] [-I &lt;string&gt;] [-L &lt;string&gt;] [-help]</div><div class='del'>-        [-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff]</div><div class='add'>+        [-qt-zlib] [-system-zlib] [-no-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff]</div><div class='ctx'>         [-no-libpng] [-qt-libpng] [-system-libpng] [-no-libmng] [-qt-libmng]</div><div class='ctx'>         [-system-libmng] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make &lt;part&gt;]</div><div class='ctx'>         [-nomake &lt;part&gt;] [-R &lt;string&gt;]  [-l &lt;string&gt;] [-no-rpath]  [-rpath] [-continue]</div><div class='hunk'>@@ -3540,12 +3732,15 @@ Usage:  $relconf [-h] [-prefix &lt;dir&gt;] [-prefix-install] [-bindir &lt;dir&gt;] [-libdir</div><div class='ctx'> </div><div class='ctx'> Installation options:</div><div class='ctx'> </div><div class='add'>+    -qpa ................ This will enable the QPA build.</div><div class='add'>+                          QPA is a window system agnostic implementation of Qt.</div><div class='add'>+</div><div class='ctx'>  These are optional, but you may specify install directories.</div><div class='ctx'> </div><div class='ctx'>     -prefix &lt;dir&gt; ...... This will install everything relative to &lt;dir&gt;</div><div class='ctx'>                          (default $QT_INSTALL_PREFIX)</div><div class='ctx'> EOF</div><div class='del'>-if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='add'>+if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then</div><div class='ctx'> cat &lt;&lt;EOF</div><div class='ctx'> </div><div class='ctx'>     -hostprefix [dir] .. Tools and libraries needed when developing</div><div class='hunk'>@@ -3624,7 +3819,7 @@ Configure options:</div><div class='ctx'>  +  -largefile ......... Enables Qt to access files larger than 4 GB.</div><div class='ctx'> </div><div class='ctx'> EOF</div><div class='del'>-if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='add'>+if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then</div><div class='ctx'>     EXCN="*"</div><div class='ctx'>     EXCY=" "</div><div class='ctx'> else</div><div class='hunk'>@@ -3709,7 +3904,8 @@ fi</div><div class='ctx'>                          See the README file for a list of supported</div><div class='ctx'>                          operating systems and compilers.</div><div class='ctx'> EOF</div><div class='del'>-if [ "${PLATFORM_QWS}" != "yes" ]; then</div><div class='add'>+</div><div class='add'>+if [ "${PLATFORM_QWS}" != "yes" -a "${PLATFORM_QPA}" != "yes" ]; then</div><div class='ctx'> cat &lt;&lt; EOF</div><div class='ctx'>     -graphicssystem &lt;sys&gt; Sets an alternate graphics system. Available options are:</div><div class='ctx'>                            raster - Software rasterizer</div><div class='hunk'>@@ -3718,6 +3914,7 @@ cat &lt;&lt; EOF</div><div class='ctx'> </div><div class='ctx'> EOF</div><div class='ctx'> fi</div><div class='add'>+</div><div class='ctx'> cat &lt;&lt; EOF</div><div class='ctx'> </div><div class='ctx'>     -no-mmx ............ Do not compile with use of MMX instructions.</div><div class='hunk'>@@ -3747,8 +3944,6 @@ Third Party Libraries:</div><div class='ctx'>                          See http://www.gzip.org/zlib</div><div class='ctx'> </div><div class='ctx'>     -no-gif ............ Do not compile GIF reading support.</div><div class='del'>- *  -qt-gif ............ Compile GIF reading support.</div><div class='del'>-                         See also src/gui/image/qgifhandler_p.h</div><div class='ctx'> </div><div class='ctx'>     -no-libtiff ........ Do not compile TIFF support.</div><div class='ctx'>     -qt-libtiff ........ Use the libtiff bundled with Qt.</div><div class='hunk'>@@ -3844,7 +4039,7 @@ else</div><div class='ctx'>     SBN="*"</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='del'>-if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then</div><div class='add'>+if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then</div><div class='ctx'> </div><div class='ctx'>     cat &lt;&lt; EOF</div><div class='ctx'> </div><div class='hunk'>@@ -4071,13 +4266,32 @@ Qt/Mac only:</div><div class='ctx'>     -sdk &lt;sdk&gt; ......... Build Qt using Apple provided SDK &lt;sdk&gt;. This option requires gcc 4.</div><div class='ctx'>                          To use a different SDK with gcc 3.3, set the SDKROOT environment variable.</div><div class='ctx'> </div><div class='add'>+    -harfbuzz .......... Use HarfBuzz to do text layout instead of Core Text when possible.</div><div class='add'>+                         It is only available to Cocoa builds.</div><div class='add'>+ *  -no-harfbuzz ....... Disable HarfBuzz on Mac. It can still be enabled by setting</div><div class='add'>+                         QT_ENABLE_HARFBUZZ environment variable.</div><div class='add'>+</div><div class='ctx'> EOF</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='ctx'> if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='ctx'>     cat &lt;&lt; EOF</div><div class='add'>+Qt for Embedded Linux:</div><div class='add'>+</div><div class='add'>+    -embedded &lt;arch&gt; .... This will enable the embedded build, you must have a</div><div class='add'>+                          proper license for this switch to work.</div><div class='add'>+                          Example values for &lt;arch&gt;: arm mips x86 generic</div><div class='add'>+EOF</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+if [ "$PLATFORM_QPA" = "yes" ]; then</div><div class='add'>+    cat &lt;&lt; EOF</div><div class='add'>+Qt for QPA only:</div><div class='add'>+EOF</div><div class='add'>+fi</div><div class='ctx'> </div><div class='del'>-Qt for Embedded Linux only:</div><div class='add'>+if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then</div><div class='add'>+    cat &lt;&lt; EOF</div><div class='ctx'> </div><div class='ctx'>     -xplatform target ... The target platform when cross-compiling.</div><div class='ctx'> </div><div class='hunk'>@@ -4085,10 +4299,6 @@ Qt for Embedded Linux only:</div><div class='ctx'>     -feature-&lt;feature&gt; .. Compile in &lt;feature&gt;. The available features</div><div class='ctx'>                           are described in src/corelib/global/qfeatures.txt</div><div class='ctx'> </div><div class='del'>-    -embedded &lt;arch&gt; .... This will enable the embedded build, you must have a</div><div class='del'>-                          proper license for this switch to work.</div><div class='del'>-                          Example values for &lt;arch&gt;: arm mips x86 generic</div><div class='del'>-</div><div class='ctx'>     -armfpa ............. Target platform uses the ARM-FPA floating point format.</div><div class='ctx'>     -no-armfpa .......... Target platform does not use the ARM-FPA floating point format.</div><div class='ctx'> </div><div class='hunk'>@@ -4113,6 +4323,17 @@ Qt for Embedded Linux only:</div><div class='ctx'>     -qconfig local ...... Use src/corelib/global/qconfig-local.h rather than the</div><div class='ctx'>                           default ($CFG_QCONFIG).</div><div class='ctx'> </div><div class='add'>+    -no-opengl .......... Do not support OpenGL.</div><div class='add'>+    -opengl &lt;api&gt; ....... Enable OpenGL ES support</div><div class='add'>+                          With no parameter, this will attempt to auto-detect OpenGL ES 1.x</div><div class='add'>+                          or 2.x, or regular desktop OpenGL.</div><div class='add'>+                          Use es1 or es2 for &lt;api&gt; to override auto-detection.</div><div class='add'>+EOF</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='add'>+    cat &lt;&lt; EOF</div><div class='add'>+</div><div class='ctx'>     -depths &lt;list&gt; ...... Comma-separated list of supported bit-per-pixel</div><div class='ctx'>                           depths, from: 1, 4, 8, 12, 15, 16, 18, 24, 32 and 'all'.</div><div class='ctx'> </div><div class='hunk'>@@ -4125,14 +4346,6 @@ Qt for Embedded Linux only:</div><div class='ctx'>     -no-decoration-&lt;style&gt; ....Disable decoration &lt;style&gt; entirely.</div><div class='ctx'>                                Possible values for &lt;style&gt;: [ $CFG_DECORATION_AVAILABLE ]</div><div class='ctx'> </div><div class='del'>-    -no-opengl .......... Do not support OpenGL.</div><div class='del'>-    -opengl &lt;api&gt; ....... Enable OpenGL ES support</div><div class='del'>-                          With no parameter, this will attempt to auto-detect OpenGL ES 1.x</div><div class='del'>-                          or 2.x. Use es1 or es2 for &lt;api&gt; to override auto-detection.</div><div class='del'>-</div><div class='del'>-                          NOTE: A QGLScreen driver for the hardware is required to support</div><div class='del'>-                                OpenGL ES on Qt for Embedded Linux.</div><div class='del'>-</div><div class='ctx'>     -qt-gfx-&lt;driver&gt; ... Enable a graphics &lt;driver&gt; in the QtGui library.</div><div class='ctx'>                          Possible values for &lt;driver&gt;: [ $CFG_GFX_AVAILABLE ]</div><div class='ctx'>     -plugin-gfx-&lt;driver&gt; Enable graphics &lt;driver&gt; as a plugin to be</div><div class='hunk'>@@ -4164,8 +4377,7 @@ Qt for Embedded Linux only:</div><div class='ctx'> EOF</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_X11" = "yes" ]; then</div><div class='add'>+if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" -o "$PLATFORM_X11" = "yes" ]; then</div><div class='ctx'>     if [ "$CFG_GLIB" = "no" ]; then</div><div class='ctx'>         GBY=" "</div><div class='ctx'>         GBN="+"</div><div class='hunk'>@@ -4204,6 +4416,8 @@ fi # Help</div><div class='ctx'> </div><div class='ctx'> if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='ctx'>     Platform="Qt for Embedded Linux"</div><div class='add'>+elif [ "$PLATFORM_QPA" = "yes" ]; then</div><div class='add'>+    Platform="Qt Lighthouse"</div><div class='ctx'> elif [ "$XPLATFORM_SYMBIAN" = "yes" ]; then</div><div class='ctx'>     Platform="Qt for Symbian"</div><div class='ctx'> elif [ "$PLATFORM_MAC" = "yes" ]; then</div><div class='hunk'>@@ -4542,27 +4756,37 @@ fi</div><div class='ctx'> # $2: optional transformation</div><div class='ctx'> # relies on $QMAKESPEC, $COMPILER_CONF and $mkfile being set correctly, as the latter</div><div class='ctx'> # is where the resulting variable is written to</div><div class='add'>+# Assumes that the optional transformation produces the same variable name for each hit</div><div class='ctx'> setBootstrapVariable()</div><div class='ctx'> {</div><div class='ctx'>     getQMakeConf | $AWK '/^('"$1"')[^_A-Z0-9]/ { print $0; }' | ( [ -n "$2" ] &amp;&amp; sed "$2" ; [ -z "$2" ] &amp;&amp; cat ) | $AWK '</div><div class='add'>+BEGIN {</div><div class='add'>+    variable = ""</div><div class='add'>+    combinedValue = ""</div><div class='add'>+}</div><div class='ctx'> {</div><div class='del'>-    varLength = index($0, "=") - 1</div><div class='del'>-    valStart = varLength + 2</div><div class='del'>-    if (substr($0, varLength, 1) == "+") {</div><div class='del'>-        varLength = varLength - 1</div><div class='del'>-        valStart = valStart + 1</div><div class='add'>+    valStart = index($0, "=") + 1</div><div class='add'>+</div><div class='add'>+    append = 0</div><div class='add'>+    if (substr($0, valStart - 2, 1) == "+") {</div><div class='add'>+        append = 1</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    variable = substr($0, 0, valStart - 2 - append)</div><div class='add'>+    value = substr($0, valStart)</div><div class='add'>+    gsub("[ \t]+", "", variable)</div><div class='add'>+    gsub("^[ \t]+", "", value)</div><div class='add'>+    gsub("[ \t]+$", "", value)</div><div class='add'>+</div><div class='add'>+    if (append == 1 &amp;&amp; length(combinedValue) &gt; 0) {</div><div class='add'>+        combinedValue = combinedValue " " value</div><div class='add'>+    } else {</div><div class='add'>+        combinedValue = value</div><div class='ctx'>     }</div><div class='del'>-    var = substr($0, 0, varLength)</div><div class='del'>-    gsub("[ \t]+", "", var)</div><div class='del'>-    val = substr($0, valStart)</div><div class='del'>-    printf "%s_%s = %s\n", var, NR, val</div><div class='ctx'> }</div><div class='ctx'> END {</div><div class='del'>-    if (length(var) &gt; 0) {</div><div class='del'>-        printf "%s =", var</div><div class='del'>-        for (i = 1; i &lt;= NR; ++i)</div><div class='del'>-            printf " $(%s_%s)", var, i</div><div class='del'>-        printf "\n"</div><div class='add'>+    if (length(combinedValue) &gt; 0) {</div><div class='add'>+        printf "%s = %s\n", variable, combinedValue</div><div class='ctx'>     }</div><div class='ctx'> }' &gt;&gt; "$mkfile"</div><div class='ctx'> }</div><div class='hunk'>@@ -4660,7 +4884,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];</div><div class='ctx'>                 EXTRA_LFLAGS="\$(QMAKE_LFLAGS_RPATH)\"$rpath\" $EXTRA_LFLAGS"</div><div class='ctx'>             done</div><div class='ctx'>         fi</div><div class='del'>-        if [ "$PLATFORM_MAC" = "yes" ]; then</div><div class='add'>+        if [ "$BUILD_ON_MAC" = "yes" ]; then</div><div class='ctx'>             echo "export MACOSX_DEPLOYMENT_TARGET = 10.4" &gt;&gt; "$mkfile"</div><div class='ctx'>             echo "CARBON_LFLAGS =-framework ApplicationServices" &gt;&gt;"$mkfile"</div><div class='ctx'>             echo "CARBON_CFLAGS =-fconstant-cfstrings" &gt;&gt;"$mkfile"</div><div class='hunk'>@@ -4831,7 +5055,7 @@ if [ "$CFG_IWMMXT" = "yes" ]; then</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='ctx'> # detect neon support</div><div class='del'>-if ( [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ] ) &amp;&amp; [ "${CFG_NEON}" = "auto" ]; then</div><div class='add'>+if [ "$CFG_ARCH" = "arm" ] &amp;&amp; [ "${CFG_NEON}" = "auto" ]; then</div><div class='ctx'>     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/neon "neon" $L_FLAGS $I_FLAGS $l_FLAGS "-mfpu=neon"; then</div><div class='ctx'> 	CFG_NEON=yes</div><div class='ctx'>     else</div><div class='hunk'>@@ -4933,7 +5157,8 @@ if [ "$CFG_QS60STYLE" = "auto" ]; then</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='ctx'> if [ "$CFG_SYMBIAN_DEFFILES" = "auto" ]; then</div><div class='del'>-    if [ "$XPLATFORM_SYMBIAN" = "yes" ] &amp;&amp; [ "$CFG_DEV" = "no" ]; then</div><div class='add'>+    # elf2e32 crashes when using def files together with gcce.</div><div class='add'>+    if [ "$XPLATFORM_SYMBIAN" = "yes" ] &amp;&amp; [ "$CFG_DEV" = "no" ] &amp;&amp; [ "$XPLATFORM" != "symbian-gcce" ]; then</div><div class='ctx'>         CFG_SYMBIAN_DEFFILES=yes</div><div class='ctx'>     else</div><div class='ctx'>         CFG_SYMBIAN_DEFFILES=no</div><div class='hunk'>@@ -5315,7 +5540,7 @@ fi</div><div class='ctx'> </div><div class='ctx'> # auto-detect iconv(3) support</div><div class='ctx'> if [ "$CFG_ICONV" != "no" ]; then</div><div class='del'>-    if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='add'>+    if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then</div><div class='ctx'> 	CFG_ICONV=no</div><div class='ctx'>     elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then</div><div class='ctx'>         CFG_ICONV=yes</div><div class='hunk'>@@ -5377,8 +5602,8 @@ if [ "$PLATFORM_MAC" = "yes" -a ! -z "$QT_NAMESPACE" ]; then</div><div class='ctx'>     QT_NAMESPACE_MAC_CRC=`"$mactests/crc.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/crc $QT_NAMESPACE $L_FLAGS $I_FLAGS $l_FLAGS`</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='del'>-# X11/QWS</div><div class='del'>-if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then</div><div class='add'>+# X11/QWS/Lighthouse</div><div class='add'>+if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then</div><div class='ctx'> </div><div class='ctx'>     # auto-detect Glib support</div><div class='ctx'>     if [ "$CFG_GLIB" != "no" ]; then</div><div class='hunk'>@@ -5490,6 +5715,25 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then</div><div class='ctx'>         CFG_ICD=no</div><div class='ctx'>     fi</div><div class='ctx'> </div><div class='add'>+    # auto-detect libicu support</div><div class='add'>+    if [ "$CFG_ICU" != "no" ]; then</div><div class='add'>+        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/icu "ICU" $L_FLAGS $I_FLAGS $l_FLAGS; then</div><div class='add'>+            [ "$CFG_ICU" = "auto" ] &amp;&amp; CFG_ICU=yes</div><div class='add'>+        else</div><div class='add'>+            if [ "$CFG_ICU" = "auto" ]; then</div><div class='add'>+                CFG_ICU=no</div><div class='add'>+            elif [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then</div><div class='add'>+                # CFG_ICU is "yes"</div><div class='add'>+</div><div class='add'>+                echo "The ICU library support cannot be enabled."</div><div class='add'>+                echo " Turn on verbose messaging (-v) to $0 to see the final report."</div><div class='add'>+                echo " If you believe this message is in error you may use the continue"</div><div class='add'>+                echo " switch (-continue) to $0 to continue."</div><div class='add'>+                exit 101</div><div class='add'>+            fi</div><div class='add'>+        fi</div><div class='add'>+    fi</div><div class='add'>+</div><div class='ctx'>     # Auto-detect PulseAudio support</div><div class='ctx'>     if [ "$CFG_PULSEAUDIO" != "no" ]; then</div><div class='ctx'>         if [ -n "$PKG_CONFIG" ]; then</div><div class='hunk'>@@ -5512,7 +5756,7 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then</div><div class='ctx'>             fi</div><div class='ctx'>         fi</div><div class='ctx'>     fi</div><div class='del'>-fi # X11/QWS</div><div class='add'>+fi # X11/QWS/Lighthouse</div><div class='ctx'> </div><div class='ctx'> # X11</div><div class='ctx'> if [ "$PLATFORM_X11" = "yes" -a "$CFG_GUI" != "no" ]; then</div><div class='hunk'>@@ -5712,6 +5956,12 @@ if [ "$PLATFORM_X11" = "yes" ]; then</div><div class='ctx'> 	fi</div><div class='ctx'>     fi</div><div class='ctx'> </div><div class='add'>+    # Additional check to decide if WebKit support will be included</div><div class='add'>+    if [ "$CFG_XRENDER" = "no" ] &amp;&amp; [ "$CFG_WEBKIT" != "no" ]; then</div><div class='add'>+        echo "Warning: -no-xrender will disable the QtWebkit module."</div><div class='add'>+        CFG_WEBKIT="no"</div><div class='add'>+    fi</div><div class='add'>+</div><div class='ctx'>     # auto-detect MIT-SHM support</div><div class='ctx'>     if [ "$CFG_MITSHM" != "no" ]; then</div><div class='ctx'> 	if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/mitshm "mitshm" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then</div><div class='hunk'>@@ -5920,6 +6170,122 @@ if [ "$PLATFORM_MAC" = "yes" ]; then</div><div class='ctx'>     fi</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+if [ "$PLATFORM_QPA" = "yes" ]; then</div><div class='add'>+    # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es2 = OpenGL ES 2.x)</div><div class='add'>+    if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then</div><div class='add'>+        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengldesktop "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then</div><div class='add'>+            CFG_OPENGL=desktop</div><div class='add'>+        elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then</div><div class='add'>+            CFG_OPENGL=es2</div><div class='add'>+        elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then</div><div class='add'>+            CFG_OPENGL=es1</div><div class='add'>+        else</div><div class='add'>+            if [ "$CFG_OPENGL" = "yes" ]; then</div><div class='add'>+                echo "All the OpenGL functionality tests failed!"</div><div class='add'>+                echo " You might need to modify the include and library search paths by editing"</div><div class='add'>+                echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"</div><div class='add'>+                echo " ${XQMAKESPEC}."</div><div class='add'>+                exit 1</div><div class='add'>+            fi</div><div class='add'>+            CFG_OPENGL=no</div><div class='add'>+        fi</div><div class='add'>+    elif [ "$CFG_OPENGL" = "es1" ]; then</div><div class='add'>+        # OpenGL ES 1.x</div><div class='add'>+        "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS</div><div class='add'>+        if [ $? != "0" ]; then</div><div class='add'>+            echo "The OpenGL ES 1.x functionality test failed!"</div><div class='add'>+            echo " You might need to modify the include and library search paths by editing"</div><div class='add'>+            echo " QMAKE_INCDIR_OPENGL_ES1, QMAKE_LIBDIR_OPENGL_ES1 and QMAKE_LIBS_OPENGL_ES1 in"</div><div class='add'>+            echo " ${XQMAKESPEC}."</div><div class='add'>+            exit 1</div><div class='add'>+        fi</div><div class='add'>+    elif [ "$CFG_OPENGL" = "es2" ]; then</div><div class='add'>+        #OpenGL ES 2.x</div><div class='add'>+        if [ -n "$PKG_CONFIG" ] &amp;&amp; $PKG_CONFIG --exists glesv2 2&gt;/dev/null; then</div><div class='add'>+            QMAKE_INCDIR_OPENGL_ES2=`$PKG_CONFIG --variable=includedir glesv2 2&gt;/dev/null`</div><div class='add'>+            QMAKE_LIBDIR_OPENGL_ES2=`$PKG_CONFIG --variable=libdir glesv2 2&gt;/dev/null`</div><div class='add'>+            QMAKE_LIBS_OPENGL_ES2=`$PKG_CONFIG --libs glesv2 2&gt;/dev/null`</div><div class='add'>+            QMAKE_CFLAGS_OPENGL_ES2=`$PKG_CONFIG --cflags glesv2 2&gt;/dev/null`</div><div class='add'>+            QMakeVar set QMAKE_INCDIR_OPENGL_ES2 "$QMAKE_INCDIR_OPENGL_ES2"</div><div class='add'>+            QMakeVar set QMAKE_LIBDIR_OPENGL_ES2 "$QMAKE_LIBDIR_OPENGL_ES2"</div><div class='add'>+            QMakeVar set QMAKE_LIBS_OPENGL_ES2 "$QMAKE_LIBS_OPENGL_ES2"</div><div class='add'>+        fi</div><div class='add'>+</div><div class='add'>+        "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS $QMAKE_LIBS_OPENGL_ES2 $QMAKE_CFLAGS_OPENGL_ES2</div><div class='add'>+        if [ $? != "0" ]; then</div><div class='add'>+            echo "The OpenGL ES 2.0 functionality test failed!"</div><div class='add'>+            echo " You might need to modify the include and library search paths by editing"</div><div class='add'>+            echo " QMAKE_INCDIR_OPENGL_ES2, QMAKE_LIBDIR_OPENGL_ES2 and QMAKE_LIBS_OPENGL_ES2 in"</div><div class='add'>+            echo " ${XQMAKESPEC}."</div><div class='add'>+            exit 1</div><div class='add'>+        fi</div><div class='add'>+    elif [ "$CFG_OPENGL" = "desktop" ]; then</div><div class='add'>+        # Desktop OpenGL support</div><div class='add'>+        "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengldesktop "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS</div><div class='add'>+        if [ $? != "0" ]; then</div><div class='add'>+            echo "The OpenGL functionality test failed!"</div><div class='add'>+            echo " You might need to modify the include and library search paths by editing"</div><div class='add'>+            echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"</div><div class='add'>+            echo " ${XQMAKESPEC}."</div><div class='add'>+            exit 1</div><div class='add'>+        fi</div><div class='add'>+    fi</div><div class='add'>+</div><div class='add'>+    # auto-detect FontConfig support</div><div class='add'>+    if [ "$CFG_FONTCONFIG" != "no" ]; then</div><div class='add'>+        if [ -n "$PKG_CONFIG" ] &amp;&amp; $PKG_CONFIG --exists fontconfig --exists freetype2 2&gt;/dev/null; then</div><div class='add'>+            QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2&gt;/dev/null`</div><div class='add'>+            QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2&gt;/dev/null`</div><div class='add'>+        else</div><div class='add'>+            QT_CFLAGS_FONTCONFIG=</div><div class='add'>+            QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig"</div><div class='add'>+        fi</div><div class='add'>+        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/fontconfig "FontConfig" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS $QT_CFLAGS_FONTCONFIG $QT_LIBS_FONTCONFIG; then</div><div class='add'>+                QT_CONFIG="$QT_CONFIG fontconfig"</div><div class='add'>+                QMakeVar set QMAKE_CFLAGS_FONTCONFIG "$QT_CFLAGS_FONTCONFIG"</div><div class='add'>+                QMakeVar set QMAKE_LIBS_FONTCONFIG "$QT_LIBS_FONTCONFIG"</div><div class='add'>+                CFG_LIBFREETYPE=system</div><div class='add'>+        fi</div><div class='add'>+</div><div class='add'>+    fi</div><div class='add'>+</div><div class='add'>+    if [ -n "$PKG_CONFIG" ] &amp;&amp; $PKG_CONFIG --exists wayland-client 2&gt;/dev/null; then</div><div class='add'>+        QMAKE_CFLAGS_WAYLAND=`$PKG_CONFIG --cflags wayland-client 2&gt;/dev/null`</div><div class='add'>+        QMAKE_LIBS_WAYLAND=`$PKG_CONFIG --libs wayland-client 2&gt;/dev/null`</div><div class='add'>+        QMAKE_INCDIR_WAYLAND=`$PKG_CONFIG --variable=includedir wayland-client 2&gt;/dev/null`</div><div class='add'>+        QMAKE_LIBDIR_WAYLAND=`$PKG_CONFIG --variable=libdir wayland-client 2&gt;/dev/null`</div><div class='add'>+</div><div class='add'>+        if [ -n "$PKG_CONFIG" ] &amp;&amp; $PKG_CONFIG --exists xkbcommon 2&gt;/dev/null; then</div><div class='add'>+            QMAKE_CFLAGS_WAYLAND="$QMAKE_CFLAGS_WAYLAND `$PKG_CONFIG --cflags xkbcommon 2&gt;/dev/null`"</div><div class='add'>+            QMAKE_LIBS_WAYLAND="$QMAKE_LIBS_WAYLAND `$PKG_CONFIG --libs xkbcommon 2&gt;/dev/null`"</div><div class='add'>+        else</div><div class='add'>+            QMAKE_DEFINES_WAYLAND=QT_NO_WAYLAND_XKB</div><div class='add'>+        fi</div><div class='add'>+    fi</div><div class='add'>+</div><div class='add'>+    # QMake variables set here override those in the mkspec. Therefore we only set the variables here if they are not zero.</div><div class='add'>+    if [ -n "$QMAKE_CFLAGS_WAYLAND" ] || [ -n "$QMAKE_LIBS_WAYLAND" ]; then</div><div class='add'>+        QMakeVar set QMAKE_CFLAGS_WAYLAND "$QMAKE_CFLAGS_WAYLAND"</div><div class='add'>+        QMakeVar set QMAKE_INCDIR_WAYLAND "$QMAKE_INCDIR_WAYLAND"</div><div class='add'>+        QMakeVar set QMAKE_LIBS_WAYLAND "$QMAKE_LIBS_WAYLAND"</div><div class='add'>+        QMakeVar set QMAKE_LIBDIR_WAYLAND "$QMAKE_LIBDIR_WAYLAND"</div><div class='add'>+        QMakeVar set QMAKE_DEFINES_WAYLAND " $QMAKE_DEFINES_WAYLAND"</div><div class='add'>+    fi</div><div class='add'>+</div><div class='add'>+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/wayland "Wayland" $L_FLAGS $I_FLAGS $l_FLAGS $QMAKE_CFLAGS_WAYLAND $QMAKE_LIBS_WAYLAND; then</div><div class='add'>+        QT_CONFIG="$QT_CONFIG wayland"</div><div class='add'>+    fi</div><div class='add'>+</div><div class='add'>+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/coreservices "CoreServices" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then</div><div class='add'>+        QT_CONFIG="$QT_CONFIG coreservices"</div><div class='add'>+    else</div><div class='add'>+        QMakeVar add DEFINES QT_NO_CORESERVICES</div><div class='add'>+    fi</div><div class='add'>+</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> # QWS</div><div class='ctx'> if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='ctx'> </div><div class='hunk'>@@ -5938,7 +6304,7 @@ if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='ctx'>         CFG_EGL=auto</div><div class='ctx'>         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then</div><div class='ctx'>             CFG_OPENGL=es2</div><div class='del'>-        elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then</div><div class='add'>+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then</div><div class='ctx'>             CFG_OPENGL=es1</div><div class='ctx'>         else</div><div class='ctx'>             echo "All the OpenGL ES functionality tests failed!"</div><div class='hunk'>@@ -5974,6 +6340,9 @@ if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='ctx'>         echo "Desktop OpenGL support is not avaliable on Qt for Embedded Linux"</div><div class='ctx'>         exit 1</div><div class='ctx'>     fi</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='ctx'> </div><div class='ctx'>     # screen drivers</div><div class='ctx'>     for screen in ${CFG_GFX_ON} ${CFG_GFX_PLUGIN}; do</div><div class='hunk'>@@ -6166,7 +6535,7 @@ fi</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then</div><div class='del'>-    if [ "$PLATFORM_QWS" != "yes" ]; then</div><div class='add'>+    if [ "$PLATFORM_QWS" != "yes" -o "$PLATFORM_QPA" = "yes" ]; then</div><div class='ctx'>         CFG_DOUBLEFORMAT=normal</div><div class='ctx'>     else</div><div class='ctx'>         "$unixtests/doubleformat.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath"</div><div class='hunk'>@@ -6220,13 +6589,9 @@ fi</div><div class='ctx'> </div><div class='ctx'> # find if the platform supports IPv6</div><div class='ctx'> if [ "$CFG_IPV6" != "no" ]; then</div><div class='del'>-    #</div><div class='del'>-    # We accidently enabled IPv6 for Qt Symbian in 4.6.x. However the underlying OpenC does not fully support IPV6.</div><div class='del'>-    # Therefore for 4.7.1 and following we disable it until OpenC either supports it or we have the native Qt</div><div class='del'>-    # symbian socket engine.</div><div class='del'>-    #</div><div class='ctx'>     if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then</div><div class='del'>-        CFG_IPV6=no</div><div class='add'>+        #IPV6 should always be enabled for Symbian release</div><div class='add'>+        CFG_IPV6=yes</div><div class='ctx'>     elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then</div><div class='ctx'>         CFG_IPV6=yes</div><div class='ctx'>     else</div><div class='hunk'>@@ -6433,13 +6798,20 @@ elif [ "$XPLATFORM_SYMBIAN_SBSV2" = "yes" ]; then</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='ctx'> if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then </div><div class='del'>-    if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then</div><div class='add'>+    if [ "$CFG_ARCH" = "arm" ]; then</div><div class='ctx'>        "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/javascriptcore-jit "javascriptcore-jit" $L_FLAGS $I_FLAGS $l_FLAGS</div><div class='ctx'>         if [ $? != "0" ]; then</div><div class='ctx'>            CFG_JAVASCRIPTCORE_JIT=no</div><div class='ctx'>         fi</div><div class='del'>-    elif [ "$XPLATFORM" = "symbian-gcce" ]; then</div><div class='del'>-        CFG_JAVASCRIPTCORE_JIT=no</div><div class='add'>+    else</div><div class='add'>+	case "$XPLATFORM" in</div><div class='add'>+	    symbian-gcce)</div><div class='add'>+		CFG_JAVASCRIPTCORE_JIT=no</div><div class='add'>+		;;</div><div class='add'>+	    linux-icc*)</div><div class='add'>+		CFG_JAVASCRIPTCORE_JIT=no</div><div class='add'>+		;;</div><div class='add'>+	esac</div><div class='ctx'>     fi</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='hunk'>@@ -6472,7 +6844,12 @@ fi</div><div class='ctx'> #-------------------------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> ### fix this: user input should be validated in a loop</div><div class='del'>-if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PLATFORM_QWS" = "yes" ]; then</div><div class='add'>+if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='add'>+    PROMPT_FOR_DEPTHS="yes"</div><div class='add'>+else</div><div class='add'>+    PROMPT_FOR_DEPTHS="no"</div><div class='add'>+fi</div><div class='add'>+if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then</div><div class='ctx'>     echo</div><div class='ctx'>     echo "Choose pixel-depths to support:"</div><div class='ctx'>     echo</div><div class='hunk'>@@ -6615,6 +6992,11 @@ else</div><div class='ctx'>     QT_CONFIG="$QT_CONFIG accessibility"</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+# egl stuff does not belong in lighthouse, but rather in plugins</div><div class='add'>+if [ "$PLATFORM_QPA" = "yes" ]; then</div><div class='add'>+    CFG_EGL="no"</div><div class='add'>+fi</div><div class='add'>+</div><div class='ctx'> # enable egl</div><div class='ctx'> if [ "$CFG_EGL" = "no" ]; then</div><div class='ctx'>     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EGL"</div><div class='hunk'>@@ -6664,8 +7046,7 @@ fi</div><div class='ctx'> </div><div class='ctx'> if [ "$CFG_OPENGL" = "es1" ] || [ "$CFG_OPENGL" = "es2" ]; then</div><div class='ctx'>     if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='del'>-	QCONFIG_FLAGS="$QCONFIG_FLAGS Q_BACKINGSTORE_SUBSURFACES"</div><div class='del'>-	QCONFIG_FLAGS="$QCONFIG_FLAGS Q_USE_EGLWINDOWSURFACE"</div><div class='add'>+        QCONFIG_FLAGS="$QCONFIG_FLAGS Q_BACKINGSTORE_SUBSURFACES"</div><div class='ctx'>     fi</div><div class='ctx'>     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES"</div><div class='ctx'> fi</div><div class='hunk'>@@ -6706,6 +7087,19 @@ if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='ctx'>     QT_CONFIG="$QT_CONFIG embedded"</div><div class='ctx'>     rm -f "src/.moc/$QMAKE_OUTDIR/allmoc.cpp" # needs remaking if config changes</div><div class='ctx'> fi</div><div class='add'>+if [ "$PLATFORM_QPA" = "yes" ]; then</div><div class='add'>+    QMAKE_CONFIG="$QMAKE_CONFIG qpa"</div><div class='add'>+    QT_CONFIG="$QT_CONFIG qpa"</div><div class='add'>+    QTCONFIG_CONFIG="$QTCONFIG_CONFIG qpa"</div><div class='add'>+    rm -f "src/.moc/$QMAKE_OUTDIR/allmoc.cpp" # needs remaking if config changes</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+if [ "$CFG_EMBEDDED" = "nacl" ]; then</div><div class='add'>+    QMAKE_CONFIG="$QMAKE_CONFIG nacl pepper"</div><div class='add'>+    QT_CONFIG="$QT_CONFIG nacl pepper"</div><div class='add'>+    rm -f "src/.moc/$QMAKE_OUTDIR/allmoc.cpp" # needs remaking if config changes</div><div class='add'>+fi</div><div class='add'>+</div><div class='ctx'> if [ "$XPLATFORM_MINGW" != "yes" ]; then</div><div class='ctx'>     # Do not set this here for Windows. Let qmake do it so</div><div class='ctx'>     # debug and release precompiled headers are kept separate.</div><div class='hunk'>@@ -6870,6 +7264,7 @@ fi</div><div class='ctx'> [ "$CFG_NAS" = "system" ] &amp;&amp; QT_CONFIG="$QT_CONFIG nas"</div><div class='ctx'> [ "$CFG_OPENSSL" = "yes" ] &amp;&amp; QT_CONFIG="$QT_CONFIG openssl"</div><div class='ctx'> [ "$CFG_OPENSSL" = "linked" ] &amp;&amp; QT_CONFIG="$QT_CONFIG openssl-linked"</div><div class='add'>+[ "$CFG_MAC_HARFBUZZ" = "yes" ] &amp;&amp; QT_CONFIG="$QT_CONFIG harfbuzz"</div><div class='ctx'> </div><div class='ctx'> if [ "$PLATFORM_X11" = "yes" ]; then</div><div class='ctx'>     [ "$CFG_SM" = "yes" ] &amp;&amp; QT_CONFIG="$QT_CONFIG x11sm"</div><div class='hunk'>@@ -6964,7 +7359,7 @@ if [ '!' -z "$I_FLAGS" ]; then</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='ctx'> # turn off exceptions for the compilers that support it</div><div class='del'>-if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='add'>+if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then</div><div class='ctx'>     COMPILER=`echo $XPLATFORM | cut -f 3- -d-`</div><div class='ctx'> elif [ "$XPLATFORM" != "$PLATFORM" ]; then</div><div class='ctx'>     COMPILER=`echo $XPLATFORM | cut -f 2- -d-`</div><div class='hunk'>@@ -7001,6 +7396,10 @@ if [ "$CFG_ICD" = "yes" ]; then</div><div class='ctx'>     QT_CONFIG="$QT_CONFIG icd"</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+if [ "$CFG_ICU" = "yes" ]; then</div><div class='add'>+    QT_CONFIG="$QT_CONFIG icu"</div><div class='add'>+fi</div><div class='add'>+</div><div class='ctx'> #</div><div class='ctx'> # Some Qt modules are too advanced in C++ for some old compilers</div><div class='ctx'> # Detect here the platforms where they are known to work.</div><div class='hunk'>@@ -7120,10 +7519,8 @@ EOF</div><div class='ctx'>         canBuildQtConcurrent="no"</div><div class='ctx'> 	;;</div><div class='ctx'>     symbian-gcce)</div><div class='del'>-        canBuildQtConcurrent="no"</div><div class='ctx'>         ;;</div><div class='ctx'>     symbian-armcc)</div><div class='del'>-        canBuildQtConcurrent="no"</div><div class='ctx'>         ;;</div><div class='ctx'> esac</div><div class='ctx'> </div><div class='hunk'>@@ -7185,7 +7582,7 @@ else</div><div class='ctx'>     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SVG"</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='del'>-if [ "$CFG_WEBKIT" = "auto" ]; then</div><div class='add'>+if [ "$CFG_WEBKIT" != "no" ]; then</div><div class='ctx'>     CFG_WEBKIT="$canBuildWebKit"</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='hunk'>@@ -7402,7 +7799,7 @@ esac</div><div class='ctx'> #     ipv6</div><div class='ctx'> #</div><div class='ctx'> #     X11     : x11sm xinerama xcursor xfixes xrandr xrender mitshm fontconfig xkb</div><div class='del'>-#     Embedded: embedded freetype</div><div class='add'>+#     Embedded: embedded qpa freetype</div><div class='ctx'> #</div><div class='ctx'> ALL_OPTIONS=</div><div class='ctx'> BUILD_CONFIG=</div><div class='hunk'>@@ -7516,10 +7913,20 @@ if [ ! -z "$COMPAT_COMPILER" ]; then</div><div class='ctx'>     fi</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+# is this arch compatible with some other "standard" build key</div><div class='add'>+QT_BUILD_KEY_COMPAT_ARCH=</div><div class='add'>+if [ ! -z "$COMPAT_ARCH" ]; then</div><div class='add'>+    QT_BUILD_KEY_COMPAT_ARCH="$CFG_USER_BUILD_KEY $COMPAT_ARCH $TARGET_OPERATING_SYSTEM $COMPILER $BUILD_OPTIONS"</div><div class='add'>+    if [ -n "$QT_NAMESPACE" ]; then</div><div class='add'>+        QT_BUILD_KEY_COMPAT_COMPILER="$QT_BUILD_KEY_COMPAT_ARCH $QT_NAMESPACE"</div><div class='add'>+    fi</div><div class='add'>+fi</div><div class='add'>+</div><div class='ctx'> # strip out leading/trailing/extra whitespace</div><div class='ctx'> QT_BUILD_KEY=`echo $QT_BUILD_KEY | sed -e "s,  *, ,g" -e "s,^  *,," -e "s,  *$,,"`</div><div class='ctx'> QT_BUILD_KEY_COMPAT=`echo $QT_BUILD_KEY_COMPAT | sed -e "s,  *, ,g" -e "s,^  *,," -e "s,  *$,,"`</div><div class='ctx'> QT_BUILD_KEY_COMPAT_COMPILER=`echo $QT_BUILD_KEY_COMPAT_COMPILER | sed -e "s,  *, ,g" -e "s,^  *,," -e "s,  *$,,"`</div><div class='add'>+QT_BUILD_KEY_COMPAT_ARCH=`echo $QT_BUILD_KEY_COMPAT_ARCH | sed -e "s,  *, ,g" -e "s,^  *,," -e "s,  *$,,"`</div><div class='ctx'> </div><div class='ctx'> #-------------------------------------------------------------------------------</div><div class='ctx'> # part of configuration information goes into qconfig.h</div><div class='hunk'>@@ -7572,6 +7979,11 @@ if [ -n "$QT_BUILD_KEY_COMPAT_COMPILER" ]; then</div><div class='ctx'>     echo "#define QT_BUILD_KEY_COMPAT2 \"$QT_BUILD_KEY_COMPAT_COMPILER\"" \</div><div class='ctx'>         &gt;&gt; "$outpath/src/corelib/global/qconfig.h.new"</div><div class='ctx'> fi</div><div class='add'>+if [ -n "$QT_BUILD_KEY_COMPAT_ARCH" ]; then</div><div class='add'>+    echo "#define QT_BUILD_KEY_COMPAT3 \"$QT_BUILD_KEY_COMPAT_ARCH\"" \</div><div class='add'>+        &gt;&gt; "$outpath/src/corelib/global/qconfig.h.new"</div><div class='add'>+fi</div><div class='add'>+</div><div class='ctx'> echo "" &gt;&gt;"$outpath/src/corelib/global/qconfig.h.new"</div><div class='ctx'> </div><div class='ctx'> echo "#ifdef QT_BOOTSTRAPPED" &gt;&gt;"$outpath/src/corelib/global/qconfig.h.new"</div><div class='hunk'>@@ -7723,6 +8135,11 @@ if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='ctx'>     done</div><div class='ctx'> fi # QWS</div><div class='ctx'> </div><div class='add'>+if [ "$PLATFORM_QPA" = "yes" ]; then</div><div class='add'>+    # Add QPA to config.h</div><div class='add'>+    QCONFIG_FLAGS="$QCONFIG_FLAGS Q_WS_QPA QT_NO_QWS_QPF QT_NO_QWS_QPF2"</div><div class='add'>+fi</div><div class='add'>+</div><div class='ctx'> if [ "${CFG_USE_FLOATMATH}" = "yes" ]; then</div><div class='ctx'>     QCONFIG_FLAGS="${QCONFIG_FLAGS} QT_USE_MATH_H_FLOATS"</div><div class='ctx'> fi</div><div class='hunk'>@@ -7759,7 +8176,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"</div><div class='ctx'> [ "$CFG_SXE" = "no" ]        &amp;&amp; QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"</div><div class='ctx'> [ "$CFG_DBUS" = "no" ]      &amp;&amp; QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"</div><div class='ctx'> </div><div class='del'>-if [ "$PLATFORM_QWS" != "yes" ]; then</div><div class='add'>+if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then</div><div class='ctx'>     [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] &amp;&amp; QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"</div><div class='ctx'>     [ "$CFG_GRAPHICS_SYSTEM" = "opengl" ] &amp;&amp; QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_OPENGL"</div><div class='ctx'>     [ "$CFG_GRAPHICS_SYSTEM" = "openvg" ] &amp;&amp; QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_OPENVG"</div><div class='hunk'>@@ -7816,7 +8233,7 @@ if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then</div><div class='ctx'>     # We cannot use Linux's default export rules since they export everything.</div><div class='ctx'>     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_DLL"</div><div class='ctx'>     # Disable non-working features.</div><div class='del'>-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CONCURRENT QT_NO_QFUTURE QT_NO_CRASHHANDLER QT_NO_PRINTER QT_NO_SYSTEMTRAYICON"</div><div class='add'>+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CRASHHANDLER QT_NO_PRINTER QT_NO_SYSTEMTRAYICON"</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='ctx'> if [ -n "$QCONFIG_FLAGS" ]; then</div><div class='hunk'>@@ -7961,6 +8378,16 @@ QT_NAMESPACE = $QT_NAMESPACE</div><div class='ctx'> QT_NAMESPACE_MAC_CRC = $QT_NAMESPACE_MAC_CRC</div><div class='ctx'> </div><div class='ctx'> EOF</div><div class='add'>+if [ -n "$CFG_SYSROOT" ]; then</div><div class='add'>+    echo "# sysroot" &gt;&gt;"$QTCONFIG.tmp"</div><div class='add'>+    echo `basename "$XQMAKESPEC"` \{ &gt;&gt;"$QTCONFIG.tmp"</div><div class='add'>+    echo "  QT_SYSROOT      += \$\$quote($CFG_SYSROOT)" &gt;&gt;"$QTCONFIG.tmp"</div><div class='add'>+    echo "  QMAKE_CFLAGS    += --sysroot=\$\$QT_SYSROOT" &gt;&gt;"$QTCONFIG.tmp"</div><div class='add'>+    echo "  QMAKE_CXXFLAGS  += --sysroot=\$\$QT_SYSROOT" &gt;&gt;"$QTCONFIG.tmp"</div><div class='add'>+    echo "  QMAKE_LFLAGS    += --sysroot=\$\$QT_SYSROOT" &gt;&gt;"$QTCONFIG.tmp"</div><div class='add'>+    echo "}" &gt;&gt; "$QTCONFIG.tmp"</div><div class='add'>+    echo &gt;&gt; "$QTCONFIG.tmp"</div><div class='add'>+fi</div><div class='ctx'> if [ "$CFG_RPATH" = "yes" ]; then</div><div class='ctx'>     echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" &gt;&gt; "$QTCONFIG.tmp"</div><div class='ctx'> fi</div><div class='hunk'>@@ -7974,6 +8401,11 @@ if [ -n "$QT_CFLAGS_FPU" ]; then</div><div class='ctx'>     echo "MMP_RULES += \"ARMFPU $QT_CFLAGS_FPU\"" &gt;&gt; "$QTCONFIG.tmp"</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+if [ -n "$QMAKE_INCDIR_OPENGL_ES2" ]; then</div><div class='add'>+    echo "#Qt opengl include path" &gt;&gt; "$QTCONFIG.tmp"</div><div class='add'>+    echo "QMAKE_INCDIR_OPENGL_ES2 = \"$QMAKE_INCDIR_OPENGL_ES2\"" &gt;&gt; "$QTCONFIG.tmp"</div><div class='add'>+fi</div><div class='add'>+</div><div class='ctx'> # replace qconfig.pri if it differs from the newly created temp file</div><div class='ctx'> if cmp -s "$QTCONFIG.tmp" "$QTCONFIG"; then</div><div class='ctx'>     rm -f "$QTCONFIG.tmp"</div><div class='hunk'>@@ -8007,10 +8439,9 @@ QMAKE_LIBDIR_QT  = \$\$QT_BUILD_TREE/lib</div><div class='ctx'> EOF</div><div class='ctx'> </div><div class='ctx'> # Ensure we can link to uninistalled libraries</div><div class='del'>-if [ "$XPLATFORM_MINGW" != "yes" ] &amp;&amp; linkerSupportsFlag -rpath-link "$outpath/lib"; then</div><div class='add'>+if [ "$XPLATFORM_MINGW" != "yes" ] &amp;&amp; [ "$CFG_EMBEDDED" != "nacl" ] &amp;&amp; linkerSupportsFlag -rpath-link "$outpath/lib"; then</div><div class='ctx'>     echo "QMAKE_LFLAGS    = -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib \$\$QMAKE_LFLAGS" &gt;&gt; "$CACHEFILE.tmp"</div><div class='ctx'> fi</div><div class='del'>-</div><div class='ctx'> if [ -n "$QT_CFLAGS_PSQL" ]; then</div><div class='ctx'>     echo "QT_CFLAGS_PSQL   = $QT_CFLAGS_PSQL" &gt;&gt; "$CACHEFILE.tmp"</div><div class='ctx'> fi</div><div class='hunk'>@@ -8157,7 +8588,7 @@ else</div><div class='ctx'>     echo "Architecture:  $CFG_ARCH"</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='del'>-if [ "$PLATFORM_QWS" = "yes" ]; then</div><div class='add'>+if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then</div><div class='ctx'>     echo "Host architecture: $CFG_HOST_ARCH"</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='hunk'>@@ -8216,7 +8647,7 @@ case "$CFG_WEBKIT" in</div><div class='ctx'>     debug) echo "WebKit module .......... yes (debug)" ;;</div><div class='ctx'>     no)    echo "WebKit module .......... no" ;;</div><div class='ctx'> esac</div><div class='del'>-if [ "$CFG_WEBKIT" != "no" ]; then</div><div class='add'>+if [ "$CFG_WEBKIT" != "no" ] || [ "$CFG_SCRIPT" != "no" ]; then</div><div class='ctx'>     if [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then</div><div class='ctx'>         echo "JavaScriptCore JIT ..... To be decided by JavaScriptCore"</div><div class='ctx'>     else</div><div class='hunk'>@@ -8238,7 +8669,7 @@ if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then</div><div class='ctx'>     echo "iWMMXt support ......... ${CFG_IWMMXT}"</div><div class='ctx'>     echo "NEON support ........... ${CFG_NEON}"</div><div class='ctx'> fi</div><div class='del'>-[ "${PLATFORM_QWS}" != "yes" ] &amp;&amp; echo "Graphics System ........ $CFG_GRAPHICS_SYSTEM"</div><div class='add'>+[ "${PLATFORM_QWS}" != "yes" -a "${PLATFORM_QPA}" != "yes" ] &amp;&amp; echo "Graphics System ........ $CFG_GRAPHICS_SYSTEM"</div><div class='ctx'> echo "IPv6 support ........... $CFG_IPV6"</div><div class='ctx'> echo "IPv6 ifname support .... $CFG_IPV6IFNAME"</div><div class='ctx'> echo "getaddrinfo support .... $CFG_GETADDRINFO"</div><div class='hunk'>@@ -8361,6 +8792,7 @@ if [ "$PLATFORM_MAC" = "yes" ]; then</div><div class='ctx'>     echo "CoreWlan support ....... $CFG_COREWLAN"</div><div class='ctx'> fi</div><div class='ctx'> echo "ICD support ............ $CFG_ICD"</div><div class='add'>+echo "libICU support ......... $CFG_ICU"</div><div class='ctx'> echo</div><div class='ctx'> </div><div class='ctx'> [ "$CFG_PTMALLOC" != "no" ] &amp;&amp; echo "Use ptmalloc ........... $CFG_PTMALLOC"</div><div class='head'>diff --git a/configure.exe b/configure.exe<br/>index a1fceeb..fb6fad2 100755<br/>--- a/<a href='/oss-git/Qt.git/tree/configure.exe?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>configure.exe</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/configure.exe?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>configure.exe</a></div>Binary files differ<div class='head'>diff --git a/demos/affine/main.cpp b/demos/affine/main.cpp<br/>index c95e0b9..1975893 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/affine/main.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/affine/main.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/affine/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/affine/main.cpp</a></div><div class='hunk'>@@ -53,7 +53,7 @@ int main(int argc, char **argv)</div><div class='ctx'>     QStyle *arthurStyle = new ArthurStyle();</div><div class='ctx'>     xformWidget.setStyle(arthurStyle);</div><div class='ctx'> </div><div class='del'>-    QList&lt;QWidget *&gt; widgets = qFindChildren&lt;QWidget *&gt;(&amp;xformWidget);</div><div class='add'>+    QList&lt;QWidget *&gt; widgets = xformWidget.findChildren&lt;QWidget *&gt;();</div><div class='ctx'>     foreach (QWidget *w, widgets) {</div><div class='ctx'>         w-&gt;setStyle(arthurStyle);</div><div class='ctx'>         w-&gt;setAttribute(Qt::WA_AcceptTouchEvents);</div><div class='head'>diff --git a/demos/arthurplugin/arthurplugin.pro b/demos/arthurplugin/arthurplugin.pro<br/>index 3114293..bc542fb 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/arthurplugin/arthurplugin.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/arthurplugin/arthurplugin.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/arthurplugin/arthurplugin.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/arthurplugin/arthurplugin.pro</a></div><div class='hunk'>@@ -3,6 +3,7 @@ QTDIR       = $$QT_SOURCE_TREE</div><div class='ctx'> </div><div class='ctx'> CONFIG      += designer plugin</div><div class='ctx'> TEMPLATE    = lib</div><div class='add'>+TARGET = $$qtLibraryTarget(arthurplugin)</div><div class='ctx'> QTDIR_build:DESTDIR     = $$QT_BUILD_TREE/plugins/designer</div><div class='ctx'> </div><div class='ctx'> contains(QT_CONFIG, opengl) {</div><div class='head'>diff --git a/demos/books/books.pro b/demos/books/books.pro<br/>index a5e44e5..06718d1 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/books/books.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/books/books.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/books/books.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/books/books.pro</a></div><div class='hunk'>@@ -16,8 +16,8 @@ INSTALLS += target sources</div><div class='ctx'> symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)</div><div class='ctx'> </div><div class='ctx'> wince*: {</div><div class='del'>-    CONFIG(debug, debug|release):sqlPlugins.sources = $$QT_BUILD_TREE/plugins/sqldrivers/*d4.dll</div><div class='del'>-    CONFIG(release, debug|release):sqlPlugins.sources = $$QT_BUILD_TREE/plugins/sqldrivers/*[^d]4.dll</div><div class='add'>+    CONFIG(debug, debug|release):sqlPlugins.files = $$QT_BUILD_TREE/plugins/sqldrivers/*d4.dll</div><div class='add'>+    CONFIG(release, debug|release):sqlPlugins.files = $$QT_BUILD_TREE/plugins/sqldrivers/*[^d]4.dll</div><div class='ctx'>     sqlPlugins.path = sqldrivers</div><div class='ctx'>     DEPLOYMENT += sqlPlugins</div><div class='ctx'> }</div><div class='head'>diff --git a/demos/boxes/glbuffers.cpp b/demos/boxes/glbuffers.cpp<br/>index 7480d4a..e12132b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/boxes/glbuffers.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/boxes/glbuffers.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/boxes/glbuffers.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/boxes/glbuffers.cpp</a></div><div class='hunk'>@@ -42,6 +42,16 @@</div><div class='ctx'> #include "glbuffers.h"</div><div class='ctx'> #include &lt;QtGui/qmatrix4x4.h&gt;</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+void qgluPerspective(GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar)</div><div class='add'>+{</div><div class='add'>+    const GLdouble ymax = zNear * tan(fovy * M_PI / 360.0);</div><div class='add'>+    const GLdouble ymin = -ymax;</div><div class='add'>+    const GLdouble xmin = ymin * aspect;</div><div class='add'>+    const GLdouble xmax = ymax * aspect;</div><div class='add'>+    glFrustum(xmin, xmax, ymin, ymax, zNear, zFar);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> //============================================================================//</div><div class='ctx'> //                                  GLTexture                                 //</div><div class='ctx'> //============================================================================//</div><div class='head'>diff --git a/demos/boxes/glbuffers.h b/demos/boxes/glbuffers.h<br/>index 6e29e93..6b18d3f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/boxes/glbuffers.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/boxes/glbuffers.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/boxes/glbuffers.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/boxes/glbuffers.h</a></div><div class='hunk'>@@ -58,6 +58,8 @@ if (m_failed || !(assertion)) {</div><div class='ctx'>     returnStatement;                                                                        \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void qgluPerspective(GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar);</div><div class='add'>+</div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> class QMatrix4x4;</div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/demos/boxes/qtbox.cpp b/demos/boxes/qtbox.cpp<br/>index 347d05e..d241165 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/boxes/qtbox.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/boxes/qtbox.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/boxes/qtbox.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/boxes/qtbox.cpp</a></div><div class='hunk'>@@ -324,7 +324,7 @@ void QtBox::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWi</div><div class='ctx'>     glMatrixMode(GL_PROJECTION);</div><div class='ctx'>     glPushMatrix();</div><div class='ctx'>     glLoadMatrixf(moveToRectMatrix);</div><div class='del'>-    gluPerspective(60.0, 1.0, 0.01, 10.0);</div><div class='add'>+    qgluPerspective(60.0, 1.0, 0.01, 10.0);</div><div class='ctx'> </div><div class='ctx'>     glMatrixMode(GL_MODELVIEW);</div><div class='ctx'>     glPushMatrix();</div><div class='head'>diff --git a/demos/boxes/scene.cpp b/demos/boxes/scene.cpp<br/>index a838988..39cd0fc 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/boxes/scene.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/boxes/scene.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/boxes/scene.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/boxes/scene.cpp</a></div><div class='hunk'>@@ -922,7 +922,7 @@ void Scene::drawBackground(QPainter *painter, const QRectF &amp;)</div><div class='ctx'>     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);</div><div class='ctx'> </div><div class='ctx'>     glMatrixMode(GL_PROJECTION);</div><div class='del'>-    gluPerspective(60.0, width / height, 0.01, 15.0);</div><div class='add'>+    qgluPerspective(60.0, width / height, 0.01, 15.0);</div><div class='ctx'> </div><div class='ctx'>     glMatrixMode(GL_MODELVIEW);</div><div class='ctx'> </div><div class='head'>diff --git a/demos/browser/browserapplication.cpp b/demos/browser/browserapplication.cpp<br/>index efbcd56..3eb33c9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/browser/browserapplication.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/browser/browserapplication.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/browser/browserapplication.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/browser/browserapplication.cpp</a></div><div class='hunk'>@@ -231,14 +231,14 @@ void BrowserApplication::loadSettings()</div><div class='ctx'>     QString standardFontFamily = defaultSettings-&gt;fontFamily(QWebSettings::StandardFont);</div><div class='ctx'>     int standardFontSize = defaultSettings-&gt;fontSize(QWebSettings::DefaultFontSize);</div><div class='ctx'>     QFont standardFont = QFont(standardFontFamily, standardFontSize);</div><div class='del'>-    standardFont = qVariantValue&lt;QFont&gt;(settings.value(QLatin1String("standardFont"), standardFont));</div><div class='add'>+    standardFont = qvariant_cast&lt;QFont&gt;(settings.value(QLatin1String("standardFont"), standardFont));</div><div class='ctx'>     defaultSettings-&gt;setFontFamily(QWebSettings::StandardFont, standardFont.family());</div><div class='ctx'>     defaultSettings-&gt;setFontSize(QWebSettings::DefaultFontSize, standardFont.pointSize());</div><div class='ctx'> </div><div class='ctx'>     QString fixedFontFamily = defaultSettings-&gt;fontFamily(QWebSettings::FixedFont);</div><div class='ctx'>     int fixedFontSize = defaultSettings-&gt;fontSize(QWebSettings::DefaultFixedFontSize);</div><div class='ctx'>     QFont fixedFont = QFont(fixedFontFamily, fixedFontSize);</div><div class='del'>-    fixedFont = qVariantValue&lt;QFont&gt;(settings.value(QLatin1String("fixedFont"), fixedFont));</div><div class='add'>+    fixedFont = qvariant_cast&lt;QFont&gt;(settings.value(QLatin1String("fixedFont"), fixedFont));</div><div class='ctx'>     defaultSettings-&gt;setFontFamily(QWebSettings::FixedFont, fixedFont.family());</div><div class='ctx'>     defaultSettings-&gt;setFontSize(QWebSettings::DefaultFixedFontSize, fixedFont.pointSize());</div><div class='ctx'> </div><div class='head'>diff --git a/demos/browser/cookiejar.cpp b/demos/browser/cookiejar.cpp<br/>index 67bdf15..ac73aed 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/browser/cookiejar.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/browser/cookiejar.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/browser/cookiejar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/browser/cookiejar.cpp</a></div><div class='hunk'>@@ -186,7 +186,7 @@ void CookieJar::save()</div><div class='ctx'>         if (cookies.at(i).isSessionCookie())</div><div class='ctx'>             cookies.removeAt(i);</div><div class='ctx'>     }</div><div class='del'>-    cookieSettings.setValue(QLatin1String("cookies"), qVariantFromValue&lt;QList&lt;QNetworkCookie&gt; &gt;(cookies));</div><div class='add'>+    cookieSettings.setValue(QLatin1String("cookies"), QVariant::fromValue&lt;QList&lt;QNetworkCookie&gt; &gt;(cookies));</div><div class='ctx'>     cookieSettings.beginGroup(QLatin1String("Exceptions"));</div><div class='ctx'>     cookieSettings.setValue(QLatin1String("block"), m_exceptions_block);</div><div class='ctx'>     cookieSettings.setValue(QLatin1String("allow"), m_exceptions_allow);</div><div class='head'>diff --git a/demos/browser/networkaccessmanager.cpp b/demos/browser/networkaccessmanager.cpp<br/>index b1300cb..e2e95b1 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/browser/networkaccessmanager.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/browser/networkaccessmanager.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/browser/networkaccessmanager.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/browser/networkaccessmanager.cpp</a></div><div class='hunk'>@@ -64,7 +64,7 @@</div><div class='ctx'> NetworkAccessManager::NetworkAccessManager(QObject *parent)</div><div class='ctx'>     : QNetworkAccessManager(parent),</div><div class='ctx'>     requestFinishedCount(0), requestFinishedFromCacheCount(0), requestFinishedPipelinedCount(0),</div><div class='del'>-    requestFinishedSecureCount(0)</div><div class='add'>+    requestFinishedSecureCount(0), requestFinishedDownloadBufferCount(0)</div><div class='ctx'> {</div><div class='ctx'>     connect(this, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)),</div><div class='ctx'>             SLOT(authenticationRequired(QNetworkReply*,QAuthenticator*)));</div><div class='hunk'>@@ -106,14 +106,19 @@ void NetworkAccessManager::requestFinished(QNetworkReply *reply)</div><div class='ctx'>     if (reply-&gt;attribute(QNetworkRequest::ConnectionEncryptedAttribute).toBool() == true)</div><div class='ctx'>         requestFinishedSecureCount++;</div><div class='ctx'> </div><div class='add'>+    if (reply-&gt;attribute(QNetworkRequest::DownloadBufferAttribute).isValid() == true)</div><div class='add'>+        requestFinishedDownloadBufferCount++;</div><div class='add'>+</div><div class='ctx'>     if (requestFinishedCount % 10)</div><div class='ctx'>         return;</div><div class='ctx'> </div><div class='ctx'>     double pctCached = (double(requestFinishedFromCacheCount) * 100.0/ double(requestFinishedCount));</div><div class='ctx'>     double pctPipelined = (double(requestFinishedPipelinedCount) * 100.0/ double(requestFinishedCount));</div><div class='ctx'>     double pctSecure = (double(requestFinishedSecureCount) * 100.0/ double(requestFinishedCount));</div><div class='add'>+    double pctDownloadBuffer = (double(requestFinishedDownloadBufferCount) * 100.0/ double(requestFinishedCount));</div><div class='add'>+</div><div class='ctx'> #ifdef QT_DEBUG</div><div class='del'>-    qDebug("STATS [%lli requests total] [%3.2f%% from cache] [%3.2f%% pipelined] [%3.2f%% SSL/TLS]", requestFinishedCount, pctCached, pctPipelined, pctSecure);</div><div class='add'>+    qDebug("STATS [%lli requests total] [%3.2f%% from cache] [%3.2f%% pipelined] [%3.2f%% SSL/TLS] [%3.2f%% Zerocopy]", requestFinishedCount, pctCached, pctPipelined, pctSecure, pctDownloadBuffer);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/demos/browser/networkaccessmanager.h b/demos/browser/networkaccessmanager.h<br/>index 131368a..8d492fe 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/browser/networkaccessmanager.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/browser/networkaccessmanager.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/browser/networkaccessmanager.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/browser/networkaccessmanager.h</a></div><div class='hunk'>@@ -60,6 +60,7 @@ private:</div><div class='ctx'>     qint64 requestFinishedFromCacheCount;</div><div class='ctx'>     qint64 requestFinishedPipelinedCount;</div><div class='ctx'>     qint64 requestFinishedSecureCount;</div><div class='add'>+    qint64 requestFinishedDownloadBufferCount;</div><div class='ctx'> </div><div class='ctx'> public slots:</div><div class='ctx'>     void loadSettings();</div><div class='head'>diff --git a/demos/browser/settings.cpp b/demos/browser/settings.cpp<br/>index cba496b..789b01b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/browser/settings.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/browser/settings.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/browser/settings.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/browser/settings.cpp</a></div><div class='hunk'>@@ -121,8 +121,8 @@ void SettingsDialog::loadFromSettings()</div><div class='ctx'> </div><div class='ctx'>     // Appearance</div><div class='ctx'>     settings.beginGroup(QLatin1String("websettings"));</div><div class='del'>-    fixedFont = qVariantValue&lt;QFont&gt;(settings.value(QLatin1String("fixedFont"), fixedFont));</div><div class='del'>-    standardFont = qVariantValue&lt;QFont&gt;(settings.value(QLatin1String("standardFont"), standardFont));</div><div class='add'>+    fixedFont = qvariant_cast&lt;QFont&gt;(settings.value(QLatin1String("fixedFont"), fixedFont));</div><div class='add'>+    standardFont = qvariant_cast&lt;QFont&gt;(settings.value(QLatin1String("standardFont"), standardFont));</div><div class='ctx'> </div><div class='ctx'>     standardLabel-&gt;setText(QString(QLatin1String("%1 %2")).arg(standardFont.family()).arg(standardFont.pointSize()));</div><div class='ctx'>     fixedLabel-&gt;setText(QString(QLatin1String("%1 %2")).arg(fixedFont.family()).arg(fixedFont.pointSize()));</div><div class='head'>diff --git a/demos/chip/view.cpp b/demos/chip/view.cpp<br/>index c572337..5634f85 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/chip/view.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/chip/view.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/chip/view.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/chip/view.cpp</a></div><div class='hunk'>@@ -48,15 +48,29 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;qmath.h&gt;</div><div class='ctx'> </div><div class='add'>+void GraphicsView::wheelEvent(QWheelEvent *e)</div><div class='add'>+{</div><div class='add'>+    if (e-&gt;modifiers() &amp; Qt::ControlModifier) {</div><div class='add'>+        if (e-&gt;delta() &gt; 0)</div><div class='add'>+            view-&gt;zoomIn(6);</div><div class='add'>+        else</div><div class='add'>+            view-&gt;zoomOut(6);</div><div class='add'>+        e-&gt;accept();</div><div class='add'>+    } else {</div><div class='add'>+        QGraphicsView::wheelEvent(e);</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> View::View(const QString &amp;name, QWidget *parent)</div><div class='ctx'>     : QFrame(parent)</div><div class='ctx'> {</div><div class='ctx'>     setFrameStyle(Sunken | StyledPanel);</div><div class='del'>-    graphicsView = new QGraphicsView;</div><div class='add'>+    graphicsView = new GraphicsView(this);</div><div class='ctx'>     graphicsView-&gt;setRenderHint(QPainter::Antialiasing, false);</div><div class='ctx'>     graphicsView-&gt;setDragMode(QGraphicsView::RubberBandDrag);</div><div class='ctx'>     graphicsView-&gt;setOptimizationFlags(QGraphicsView::DontSavePainterState);</div><div class='ctx'>     graphicsView-&gt;setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);</div><div class='add'>+    graphicsView-&gt;setTransformationAnchor(QGraphicsView::AnchorUnderMouse);</div><div class='ctx'> </div><div class='ctx'>     int size = style()-&gt;pixelMetric(QStyle::PM_ToolBarIconSize);</div><div class='ctx'>     QSize iconSize(size, size);</div><div class='hunk'>@@ -111,6 +125,15 @@ View::View(const QString &amp;name, QWidget *parent)</div><div class='ctx'>     // Label layout</div><div class='ctx'>     QHBoxLayout *labelLayout = new QHBoxLayout;</div><div class='ctx'>     label = new QLabel(name);</div><div class='add'>+    label2 = new QLabel(tr("Pointer Mode"));</div><div class='add'>+    selectModeButton = new QToolButton;</div><div class='add'>+    selectModeButton-&gt;setText(tr("Select"));</div><div class='add'>+    selectModeButton-&gt;setCheckable(true);</div><div class='add'>+    selectModeButton-&gt;setChecked(true);</div><div class='add'>+    dragModeButton = new QToolButton;</div><div class='add'>+    dragModeButton-&gt;setText(tr("Drag"));</div><div class='add'>+    dragModeButton-&gt;setCheckable(true);</div><div class='add'>+    dragModeButton-&gt;setChecked(false);</div><div class='ctx'>     antialiasButton = new QToolButton;</div><div class='ctx'>     antialiasButton-&gt;setText(tr("Antialiasing"));</div><div class='ctx'>     antialiasButton-&gt;setCheckable(true);</div><div class='hunk'>@@ -126,8 +149,17 @@ View::View(const QString &amp;name, QWidget *parent)</div><div class='ctx'>     printButton = new QToolButton;</div><div class='ctx'>     printButton-&gt;setIcon(QIcon(QPixmap(":/fileprint.png")));</div><div class='ctx'> </div><div class='add'>+    QButtonGroup *pointerModeGroup = new QButtonGroup;</div><div class='add'>+    pointerModeGroup-&gt;setExclusive(true);</div><div class='add'>+    pointerModeGroup-&gt;addButton(selectModeButton);</div><div class='add'>+    pointerModeGroup-&gt;addButton(dragModeButton);</div><div class='add'>+</div><div class='ctx'>     labelLayout-&gt;addWidget(label);</div><div class='ctx'>     labelLayout-&gt;addStretch();</div><div class='add'>+    labelLayout-&gt;addWidget(label2);</div><div class='add'>+    labelLayout-&gt;addWidget(selectModeButton);</div><div class='add'>+    labelLayout-&gt;addWidget(dragModeButton);</div><div class='add'>+    labelLayout-&gt;addStretch();</div><div class='ctx'>     labelLayout-&gt;addWidget(antialiasButton);</div><div class='ctx'>     labelLayout-&gt;addWidget(openGlButton);</div><div class='ctx'>     labelLayout-&gt;addWidget(printButton);</div><div class='hunk'>@@ -145,6 +177,8 @@ View::View(const QString &amp;name, QWidget *parent)</div><div class='ctx'>     connect(rotateSlider, SIGNAL(valueChanged(int)), this, SLOT(setupMatrix()));</div><div class='ctx'>     connect(graphicsView-&gt;verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(setResetButtonEnabled()));</div><div class='ctx'>     connect(graphicsView-&gt;horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(setResetButtonEnabled()));</div><div class='add'>+    connect(selectModeButton, SIGNAL(toggled(bool)), this, SLOT(togglePointerMode()));</div><div class='add'>+    connect(dragModeButton, SIGNAL(toggled(bool)), this, SLOT(togglePointerMode()));</div><div class='ctx'>     connect(antialiasButton, SIGNAL(toggled(bool)), this, SLOT(toggleAntialiasing()));</div><div class='ctx'>     connect(openGlButton, SIGNAL(toggled(bool)), this, SLOT(toggleOpenGL()));</div><div class='ctx'>     connect(rotateLeftIcon, SIGNAL(clicked()), this, SLOT(rotateLeft()));</div><div class='hunk'>@@ -158,7 +192,7 @@ View::View(const QString &amp;name, QWidget *parent)</div><div class='ctx'> </div><div class='ctx'> QGraphicsView *View::view() const</div><div class='ctx'> {</div><div class='del'>-    return graphicsView;</div><div class='add'>+    return static_cast&lt;QGraphicsView *&gt;(graphicsView);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void View::resetView()</div><div class='hunk'>@@ -188,6 +222,14 @@ void View::setupMatrix()</div><div class='ctx'>     setResetButtonEnabled();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void View::togglePointerMode()</div><div class='add'>+{</div><div class='add'>+    graphicsView-&gt;setDragMode(selectModeButton-&gt;isChecked()</div><div class='add'>+                              ? QGraphicsView::RubberBandDrag</div><div class='add'>+                              : QGraphicsView::ScrollHandDrag);</div><div class='add'>+    graphicsView-&gt;setInteractive(selectModeButton-&gt;isChecked());</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void View::toggleOpenGL()</div><div class='ctx'> {</div><div class='ctx'> #ifndef QT_NO_OPENGL</div><div class='hunk'>@@ -212,14 +254,14 @@ void View::print()</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void View::zoomIn()</div><div class='add'>+void View::zoomIn(int level)</div><div class='ctx'> {</div><div class='del'>-    zoomSlider-&gt;setValue(zoomSlider-&gt;value() + 1);</div><div class='add'>+    zoomSlider-&gt;setValue(zoomSlider-&gt;value() + level);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void View::zoomOut()</div><div class='add'>+void View::zoomOut(int level)</div><div class='ctx'> {</div><div class='del'>-    zoomSlider-&gt;setValue(zoomSlider-&gt;value() - 1);</div><div class='add'>+    zoomSlider-&gt;setValue(zoomSlider-&gt;value() - level);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void View::rotateLeft()</div><div class='head'>diff --git a/demos/chip/view.h b/demos/chip/view.h<br/>index 0ece458..7c587d4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/chip/view.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/chip/view.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/chip/view.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/chip/view.h</a></div><div class='hunk'>@@ -43,12 +43,27 @@</div><div class='ctx'> #define VIEW_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;QFrame&gt;</div><div class='add'>+#include &lt;QGraphicsView&gt;</div><div class='ctx'> </div><div class='del'>-QT_FORWARD_DECLARE_CLASS(QGraphicsView)</div><div class='ctx'> QT_FORWARD_DECLARE_CLASS(QLabel)</div><div class='ctx'> QT_FORWARD_DECLARE_CLASS(QSlider)</div><div class='ctx'> QT_FORWARD_DECLARE_CLASS(QToolButton)</div><div class='ctx'> </div><div class='add'>+class View;</div><div class='add'>+</div><div class='add'>+class GraphicsView : public QGraphicsView</div><div class='add'>+{</div><div class='add'>+    Q_OBJECT</div><div class='add'>+public:</div><div class='add'>+    GraphicsView(View *v) : QGraphicsView(), view(v) { }</div><div class='add'>+</div><div class='add'>+protected:</div><div class='add'>+    void wheelEvent(QWheelEvent *);</div><div class='add'>+</div><div class='add'>+private:</div><div class='add'>+    View *view;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> class View : public QFrame</div><div class='ctx'> {</div><div class='ctx'>     Q_OBJECT</div><div class='hunk'>@@ -57,22 +72,27 @@ public:</div><div class='ctx'> </div><div class='ctx'>     QGraphicsView *view() const;</div><div class='ctx'> </div><div class='add'>+public slots:</div><div class='add'>+    void zoomIn(int level = 1);</div><div class='add'>+    void zoomOut(int level = 1);</div><div class='add'>+</div><div class='ctx'> private slots:</div><div class='ctx'>     void resetView();</div><div class='ctx'>     void setResetButtonEnabled();</div><div class='ctx'>     void setupMatrix();</div><div class='add'>+    void togglePointerMode();</div><div class='ctx'>     void toggleOpenGL();</div><div class='ctx'>     void toggleAntialiasing();</div><div class='ctx'>     void print();</div><div class='del'>-</div><div class='del'>-    void zoomIn();</div><div class='del'>-    void zoomOut();</div><div class='ctx'>     void rotateLeft();</div><div class='ctx'>     void rotateRight();</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'> private:</div><div class='del'>-    QGraphicsView *graphicsView;</div><div class='add'>+    GraphicsView *graphicsView;</div><div class='ctx'>     QLabel *label;</div><div class='add'>+    QLabel *label2;</div><div class='add'>+    QToolButton *selectModeButton;</div><div class='add'>+    QToolButton *dragModeButton;</div><div class='ctx'>     QToolButton *openGlButton;</div><div class='ctx'>     QToolButton *antialiasButton;</div><div class='ctx'>     QToolButton *printButton;</div><div class='head'>diff --git a/demos/composition/main.cpp b/demos/composition/main.cpp<br/>index 2195cfe..d6bc170 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/composition/main.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/composition/main.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/composition/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/composition/main.cpp</a></div><div class='hunk'>@@ -59,7 +59,7 @@ int main(int argc, char **argv)</div><div class='ctx'>     QStyle *arthurStyle = new ArthurStyle();</div><div class='ctx'>     compWidget.setStyle(arthurStyle);</div><div class='ctx'> </div><div class='del'>-    QList&lt;QWidget *&gt; widgets = qFindChildren&lt;QWidget *&gt;(&amp;compWidget);</div><div class='add'>+    QList&lt;QWidget *&gt; widgets = compWidget.findChildren&lt;QWidget *&gt;();</div><div class='ctx'>     foreach (QWidget *w, widgets)</div><div class='ctx'>         w-&gt;setStyle(arthurStyle);</div><div class='ctx'>     compWidget.show();</div><div class='head'>diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro<br/>index 5929ecf..d23bb05 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/declarative/minehunt/minehunt.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/declarative/minehunt/minehunt.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/declarative/minehunt/minehunt.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/declarative/minehunt/minehunt.pro</a></div><div class='hunk'>@@ -17,7 +17,7 @@ symbian:{</div><div class='ctx'>     TARGET.EPOCALLOWDLLDATA = 1</div><div class='ctx'>     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000</div><div class='ctx'>     include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)</div><div class='del'>-    qmlminehuntfiles.sources = MinehuntCore minehunt.qml</div><div class='add'>+    qmlminehuntfiles.files = MinehuntCore minehunt.qml</div><div class='ctx'>     DEPLOYMENT += qmlminehuntfiles</div><div class='ctx'> }</div><div class='ctx'>  </div><div class='head'>diff --git a/demos/declarative/samegame/SamegameCore/samegame.js b/demos/declarative/samegame/SamegameCore/samegame.js<br/>index b838790..d7b827a 100755<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/declarative/samegame/SamegameCore/samegame.js?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/declarative/samegame/SamegameCore/samegame.js</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/declarative/samegame/SamegameCore/samegame.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/declarative/samegame/SamegameCore/samegame.js</a></div><div class='hunk'>@@ -8,13 +8,16 @@ var blockSrc = "SamegameCore/BoomBlock.qml";</div><div class='ctx'> var scoresURL = "";</div><div class='ctx'> var gameDuration;</div><div class='ctx'> var component = Qt.createComponent(blockSrc);</div><div class='add'>+var highScoreBar = 0;</div><div class='ctx'> </div><div class='del'>-//Index function used instead of a 2D array</div><div class='del'>-function index(column,row) {</div><div class='del'>-    return column + (row * maxColumn);</div><div class='add'>+// Index function used instead of a 2D array</div><div class='add'>+function index(column, row)</div><div class='add'>+{</div><div class='add'>+    return column + row * maxColumn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-function timeStr(msecs) {</div><div class='add'>+function timeStr(msecs)</div><div class='add'>+{</div><div class='ctx'>     var secs = Math.floor(msecs/1000);</div><div class='ctx'>     var m = Math.floor(secs/60);</div><div class='ctx'>     var ret = "" + m + "m " + (secs%60) + "s";</div><div class='hunk'>@@ -23,47 +26,48 @@ function timeStr(msecs) {</div><div class='ctx'> </div><div class='ctx'> function startNewGame()</div><div class='ctx'> {</div><div class='del'>-    //Delete blocks from previous game</div><div class='del'>-    for(var i = 0; i&lt;maxIndex; i++){</div><div class='del'>-        if(board[i] != null)</div><div class='add'>+    // Delete blocks from previous game</div><div class='add'>+    for (var i = 0; i &lt; maxIndex; i++) {</div><div class='add'>+        if (board[i] != null)</div><div class='ctx'>             board[i].destroy();</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    //Calculate board size</div><div class='add'>+    // Calculate board size</div><div class='ctx'>     maxColumn = Math.floor(gameCanvas.width/gameCanvas.blockSize);</div><div class='ctx'>     maxRow = Math.floor(gameCanvas.height/gameCanvas.blockSize);</div><div class='del'>-    maxIndex = maxRow*maxColumn;</div><div class='add'>+    maxIndex = maxRow * maxColumn;</div><div class='ctx'> </div><div class='del'>-    //Close dialogs</div><div class='add'>+    // Close dialogs</div><div class='ctx'>     nameInputDialog.forceClose();</div><div class='ctx'>     dialog.forceClose();</div><div class='ctx'> </div><div class='del'>-    //Initialize Board</div><div class='add'>+    // Initialize Board</div><div class='ctx'>     board = new Array(maxIndex);</div><div class='ctx'>     gameCanvas.score = 0;</div><div class='del'>-    for(var column=0; column&lt;maxColumn; column++){</div><div class='del'>-        for(var row=0; row&lt;maxRow; row++){</div><div class='del'>-            board[index(column,row)] = null;</div><div class='del'>-            createBlock(column,row);</div><div class='add'>+    for (var column = 0; column &lt; maxColumn; column++) {</div><div class='add'>+        for (var row = 0; row &lt; maxRow; row++) {</div><div class='add'>+            board[index(column, row)] = null;</div><div class='add'>+            createBlock(column, row);</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'>     gameDuration = new Date();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-var fillFound;//Set after a floodFill call to the number of blocks found</div><div class='del'>-var floodBoard;//Set to 1 if the floodFill reaches off that node</div><div class='del'>-//NOTE: Be careful with vars named x,y, as the calling object's x,y are still in scope</div><div class='add'>+var fillFound;  // Set after a floodFill call to the number of blocks found</div><div class='add'>+var floodBoard; // Set to 1 if the floodFill reaches off that node</div><div class='add'>+</div><div class='add'>+// NOTE: Be careful with vars named x,y, as the calling object's x,y are still in scope</div><div class='ctx'> function handleClick(x,y)</div><div class='ctx'> {</div><div class='ctx'>     var column = Math.floor(x/gameCanvas.blockSize);</div><div class='ctx'>     var row = Math.floor(y/gameCanvas.blockSize);</div><div class='del'>-    if(column &gt;= maxColumn || column &lt; 0 || row &gt;= maxRow || row &lt; 0)</div><div class='add'>+    if (column &gt;= maxColumn || column &lt; 0 || row &gt;= maxRow || row &lt; 0)</div><div class='ctx'>         return;</div><div class='del'>-    if(board[index(column, row)] == null)</div><div class='add'>+    if (board[index(column, row)] == null)</div><div class='ctx'>         return;</div><div class='del'>-    //If it's a valid block, remove it and all connected (does nothing if it's not connected)</div><div class='add'>+    // If it's a valid block, remove it and all connected (does nothing if it's not connected)</div><div class='ctx'>     floodFill(column,row, -1);</div><div class='del'>-    if(fillFound &lt;= 0)</div><div class='add'>+    if (fillFound &lt;= 0)</div><div class='ctx'>         return;</div><div class='ctx'>     gameCanvas.score += (fillFound - 1) * (fillFound - 1);</div><div class='ctx'>     shuffleDown();</div><div class='hunk'>@@ -72,65 +76,65 @@ function handleClick(x,y)</div><div class='ctx'> </div><div class='ctx'> function floodFill(column,row,type)</div><div class='ctx'> {</div><div class='del'>-    if(board[index(column, row)] == null)</div><div class='add'>+    if (board[index(column, row)] == null)</div><div class='ctx'>         return;</div><div class='ctx'>     var first = false;</div><div class='del'>-    if(type == -1){</div><div class='add'>+    if (type == -1) {</div><div class='ctx'>         first = true;</div><div class='ctx'>         type = board[index(column,row)].type;</div><div class='del'>-        </div><div class='del'>-        //Flood fill initialization</div><div class='add'>+</div><div class='add'>+        // Flood fill initialization</div><div class='ctx'>         fillFound = 0;</div><div class='ctx'>         floodBoard = new Array(maxIndex);</div><div class='ctx'>     }</div><div class='del'>-    if(column &gt;= maxColumn || column &lt; 0 || row &gt;= maxRow || row &lt; 0)</div><div class='add'>+    if (column &gt;= maxColumn || column &lt; 0 || row &gt;= maxRow || row &lt; 0)</div><div class='ctx'>         return;</div><div class='del'>-    if(floodBoard[index(column, row)] == 1 || (!first &amp;&amp; type != board[index(column,row)].type))</div><div class='add'>+    if (floodBoard[index(column, row)] == 1 || (!first &amp;&amp; type != board[index(column, row)].type))</div><div class='ctx'>         return;</div><div class='ctx'>     floodBoard[index(column, row)] = 1;</div><div class='del'>-    floodFill(column+1,row,type);</div><div class='del'>-    floodFill(column-1,row,type);</div><div class='del'>-    floodFill(column,row+1,type);</div><div class='del'>-    floodFill(column,row-1,type);</div><div class='del'>-    if(first==true &amp;&amp; fillFound == 0)</div><div class='del'>-        return;//Can't remove single blocks</div><div class='del'>-    board[index(column,row)].dying = true;</div><div class='del'>-    board[index(column,row)] = null;</div><div class='add'>+    floodFill(column + 1, row, type);</div><div class='add'>+    floodFill(column - 1, row, type);</div><div class='add'>+    floodFill(column, row + 1, type);</div><div class='add'>+    floodFill(column, row - 1, type);</div><div class='add'>+    if (first == true &amp;&amp; fillFound == 0)</div><div class='add'>+        return; // Can't remove single blocks</div><div class='add'>+    board[index(column, row)].dying = true;</div><div class='add'>+    board[index(column, row)] = null;</div><div class='ctx'>     fillFound += 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> function shuffleDown()</div><div class='ctx'> {</div><div class='del'>-    //Fall down</div><div class='del'>-    for(var column=0; column&lt;maxColumn; column++){</div><div class='add'>+    // Fall down</div><div class='add'>+    for (var column = 0; column &lt; maxColumn; column++) {</div><div class='ctx'>         var fallDist = 0;</div><div class='del'>-        for(var row=maxRow-1; row&gt;=0; row--){</div><div class='del'>-            if(board[index(column,row)] == null){</div><div class='add'>+        for (var row = maxRow - 1; row &gt;= 0; row--) {</div><div class='add'>+            if (board[index(column,row)] == null) {</div><div class='ctx'>                 fallDist += 1;</div><div class='del'>-            }else{</div><div class='del'>-                if(fallDist &gt; 0){</div><div class='del'>-                    var obj = board[index(column,row)];</div><div class='del'>-                    obj.y = (row+fallDist) * gameCanvas.blockSize;</div><div class='del'>-                    board[index(column,row+fallDist)] = obj;</div><div class='del'>-                    board[index(column,row)] = null;</div><div class='add'>+            } else {</div><div class='add'>+                if (fallDist &gt; 0) {</div><div class='add'>+                    var obj = board[index(column, row)];</div><div class='add'>+                    obj.y = (row + fallDist) * gameCanvas.blockSize;</div><div class='add'>+                    board[index(column, row + fallDist)] = obj;</div><div class='add'>+                    board[index(column, row)] = null;</div><div class='ctx'>                 }</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='del'>-    //Fall to the left</div><div class='add'>+    // Fall to the left</div><div class='ctx'>     fallDist = 0;</div><div class='del'>-    for(column=0; column&lt;maxColumn; column++){</div><div class='del'>-        if(board[index(column, maxRow - 1)] == null){</div><div class='add'>+    for (column = 0; column &lt; maxColumn; column++) {</div><div class='add'>+        if (board[index(column, maxRow - 1)] == null) {</div><div class='ctx'>             fallDist += 1;</div><div class='del'>-        }else{</div><div class='del'>-            if(fallDist &gt; 0){</div><div class='del'>-                for(row=0; row&lt;maxRow; row++){</div><div class='del'>-                    obj = board[index(column,row)];</div><div class='del'>-                    if(obj == null)</div><div class='add'>+        } else {</div><div class='add'>+            if (fallDist &gt; 0) {</div><div class='add'>+                for (row = 0; row &lt; maxRow; row++) {</div><div class='add'>+                    obj = board[index(column, row)];</div><div class='add'>+                    if (obj == null)</div><div class='ctx'>                         continue;</div><div class='del'>-                    obj.x = (column-fallDist) * gameCanvas.blockSize;</div><div class='del'>-                    board[index(column-fallDist,row)] = obj;</div><div class='del'>-                    board[index(column,row)] = null;</div><div class='add'>+                    obj.x = (column - fallDist) * gameCanvas.blockSize;</div><div class='add'>+                    board[index(column - fallDist,row)] = obj;</div><div class='add'>+                    board[index(column, row)] = null;</div><div class='ctx'>                 }</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='hunk'>@@ -139,39 +143,44 @@ function shuffleDown()</div><div class='ctx'> </div><div class='ctx'> function victoryCheck()</div><div class='ctx'> {</div><div class='del'>-    //awards bonuses for no blocks left</div><div class='add'>+    // Awards bonuses for no blocks left</div><div class='ctx'>     var deservesBonus = true;</div><div class='del'>-    for(var column=maxColumn-1; column&gt;=0; column--)</div><div class='del'>-        if(board[index(column, maxRow - 1)] != null)</div><div class='add'>+    for (var column = maxColumn - 1; column &gt;= 0; column--)</div><div class='add'>+        if (board[index(column, maxRow - 1)] != null)</div><div class='ctx'>             deservesBonus = false;</div><div class='del'>-    if(deservesBonus)</div><div class='add'>+    if (deservesBonus)</div><div class='ctx'>         gameCanvas.score += 500;</div><div class='del'>-    //Checks for game over</div><div class='del'>-    if(deservesBonus || !(floodMoveCheck(0,maxRow-1, -1))){</div><div class='add'>+    // Checks for game over</div><div class='add'>+    if (deservesBonus || !(floodMoveCheck(0, maxRow - 1, -1))) {</div><div class='ctx'>         gameDuration = new Date() - gameDuration;</div><div class='del'>-        nameInputDialog.show("You won! Please enter your name:                 ");</div><div class='del'>-        nameInputDialog.initialWidth = nameInputDialog.text.width + 20;</div><div class='del'>-        if(nameInputDialog.name == "")</div><div class='del'>-            nameInputDialog.width = nameInputDialog.initialWidth;</div><div class='del'>-        nameInputDialog.text.opacity = 0;//Just a spacer</div><div class='add'>+        if(gameCanvas.score &gt; highScoreBar){</div><div class='add'>+            nameInputDialog.show("You won! Please enter your name:                 ");</div><div class='add'>+            nameInputDialog.initialWidth = nameInputDialog.text.width + 20;</div><div class='add'>+            if (nameInputDialog.name == "")</div><div class='add'>+                nameInputDialog.width = nameInputDialog.initialWidth;</div><div class='add'>+            nameInputDialog.text.opacity = 0; // Just a spacer</div><div class='add'>+        }else{</div><div class='add'>+            dialog.show("You won!");</div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//only floods up and right, to see if it can find adjacent same-typed blocks </div><div class='add'>+// Only floods up and right, to see if it can find adjacent same-typed blocks</div><div class='ctx'> function floodMoveCheck(column, row, type)</div><div class='ctx'> {</div><div class='del'>-    if(column &gt;= maxColumn || column &lt; 0 || row &gt;= maxRow || row &lt; 0)</div><div class='add'>+    if (column &gt;= maxColumn || column &lt; 0 || row &gt;= maxRow || row &lt; 0)</div><div class='ctx'>         return false;</div><div class='del'>-    if(board[index(column, row)] == null)</div><div class='add'>+    if (board[index(column, row)] == null)</div><div class='ctx'>         return false;</div><div class='ctx'>     var myType = board[index(column, row)].type;</div><div class='del'>-    if(type == myType)</div><div class='add'>+    if (type == myType)</div><div class='ctx'>         return true;</div><div class='ctx'>     return floodMoveCheck(column + 1, row, myType) ||</div><div class='del'>-           floodMoveCheck(column, row - 1, board[index(column,row)].type);</div><div class='add'>+           floodMoveCheck(column, row - 1, board[index(column, row)].type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-function createBlock(column,row){</div><div class='add'>+function createBlock(column,row)</div><div class='add'>+{</div><div class='ctx'>     // Note that we don't wait for the component to become ready. This will</div><div class='ctx'>     // only work if the block QML is a local file. Otherwise the component will</div><div class='ctx'>     // not be ready immediately. There is a statusChanged signal on the</div><div class='hunk'>@@ -199,38 +208,78 @@ function createBlock(column,row){</div><div class='ctx'>     return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-function saveHighScore(name) {</div><div class='del'>-    if(scoresURL!="")</div><div class='add'>+function initHighScoreBar()</div><div class='add'>+{</div><div class='add'>+    if(scoresURL != "")</div><div class='add'>+        return true;//don't query remote scores</div><div class='add'>+    var db = openDatabaseSync(</div><div class='add'>+        "SameGameScores",</div><div class='add'>+        "1.0",</div><div class='add'>+        "Local SameGame High Scores",</div><div class='add'>+        100</div><div class='add'>+    );</div><div class='add'>+    db.transaction(</div><div class='add'>+        function(tx) {</div><div class='add'>+            tx.executeSql('CREATE TABLE IF NOT EXISTS Scores(name TEXT, score NUMBER, gridSize TEXT, time NUMBER)');</div><div class='add'>+            // Only show results for the current grid size</div><div class='add'>+            var rs = tx.executeSql('SELECT * FROM Scores WHERE gridSize = "'</div><div class='add'>+                + maxColumn + "x" + maxRow + '" ORDER BY score desc LIMIT 10');</div><div class='add'>+            if(rs.rows.length &lt; 10)</div><div class='add'>+                highScoreBar = 0;</div><div class='add'>+            else </div><div class='add'>+                highScoreBar = rs.rows.item(rs.rows.length - 1).score;</div><div class='add'>+        }</div><div class='add'>+    );</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+function saveHighScore(name)</div><div class='add'>+{</div><div class='add'>+    if (scoresURL != "")</div><div class='ctx'>         sendHighScore(name);</div><div class='del'>-    //OfflineStorage</div><div class='del'>-    var db = openDatabaseSync("SameGameScores", "1.0", "Local SameGame High Scores",100);</div><div class='add'>+    // Offline storage</div><div class='add'>+    var db = openDatabaseSync(</div><div class='add'>+        "SameGameScores",</div><div class='add'>+        "1.0",</div><div class='add'>+        "Local SameGame High Scores",</div><div class='add'>+        100</div><div class='add'>+    );</div><div class='ctx'>     var dataStr = "INSERT INTO Scores VALUES(?, ?, ?, ?)";</div><div class='del'>-    var data = [name, gameCanvas.score, maxColumn+"x"+maxRow ,Math.floor(gameDuration/1000)];</div><div class='add'>+    var data = [</div><div class='add'>+        name,</div><div class='add'>+        gameCanvas.score,</div><div class='add'>+        maxColumn + "x" + maxRow,</div><div class='add'>+        Math.floor(gameDuration / 1000)</div><div class='add'>+    ];</div><div class='ctx'>     db.transaction(</div><div class='ctx'>         function(tx) {</div><div class='ctx'>             tx.executeSql('CREATE TABLE IF NOT EXISTS Scores(name TEXT, score NUMBER, gridSize TEXT, time NUMBER)');</div><div class='ctx'>             tx.executeSql(dataStr, data);</div><div class='ctx'> </div><div class='del'>-            //Only show results for the current grid size</div><div class='del'>-            var rs = tx.executeSql('SELECT * FROM Scores WHERE gridSize = "'+maxColumn+"x"+maxRow+'" ORDER BY score desc LIMIT 10');</div><div class='add'>+            // Only show results for the current grid size</div><div class='add'>+            var rs = tx.executeSql('SELECT * FROM Scores WHERE gridSize = "'</div><div class='add'>+                + maxColumn + "x" + maxRow + '" ORDER BY score desc LIMIT 10');</div><div class='ctx'>             var r = "\nHIGH SCORES for this grid size\n\n"</div><div class='del'>-            for(var i = 0; i &lt; rs.rows.length; i++){</div><div class='del'>-                r += (i+1)+". " + rs.rows.item(i).name +' got '</div><div class='add'>+            for (var i = 0; i &lt; rs.rows.length; i++) {</div><div class='add'>+                r += (i+1) + ". " + rs.rows.item(i).name + ' got '</div><div class='ctx'>                     + rs.rows.item(i).score + ' points in '</div><div class='ctx'>                     + rs.rows.item(i).time + ' seconds.\n';</div><div class='ctx'>             }</div><div class='add'>+            if(rs.rows.length == 10)</div><div class='add'>+                highScoreBar = rs.rows.item(9).score;</div><div class='ctx'>             dialog.show(r);</div><div class='ctx'>         }</div><div class='ctx'>     );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-function sendHighScore(name) {</div><div class='add'>+function sendHighScore(name)</div><div class='add'>+{</div><div class='ctx'>     var postman = new XMLHttpRequest()</div><div class='del'>-    var postData = "name="+name+"&amp;score="+gameCanvas.score</div><div class='del'>-        +"&amp;gridSize="+maxColumn+"x"+maxRow +"&amp;time="+Math.floor(gameDuration/1000);</div><div class='add'>+    var postData = "name=" + name + "&amp;score=" + gameCanvas.score</div><div class='add'>+        + "&amp;gridSize=" + maxColumn + "x" + maxRow</div><div class='add'>+        + "&amp;time=" + Math.floor(gameDuration / 1000);</div><div class='ctx'>     postman.open("POST", scoresURL, true);</div><div class='ctx'>     postman.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");</div><div class='del'>-    postman.onreadystatechange = function() { </div><div class='add'>+    postman.onreadystatechange = function() {</div><div class='ctx'>         if (postman.readyState == postman.DONE) {</div><div class='ctx'>             dialog.show("Your score has been uploaded.");</div><div class='ctx'>         }</div><div class='head'>diff --git a/demos/declarative/snake/content/Link.qml b/demos/declarative/snake/content/Link.qml<br/>index edaeeed..ff67ad7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/declarative/snake/content/Link.qml?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/declarative/snake/content/Link.qml</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/declarative/snake/content/Link.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/declarative/snake/content/Link.qml</a></div><div class='hunk'>@@ -77,7 +77,12 @@ Item { id:link</div><div class='ctx'>                 id: actualImageRotation</div><div class='ctx'>                 origin.x: width/2; origin.y: height/2;</div><div class='ctx'>                 angle: rotation * 90</div><div class='del'>-                Behavior on angle { NumberAnimation { duration: spawned ? 200 : 0} }</div><div class='add'>+                Behavior on angle {</div><div class='add'>+                    RotationAnimation{</div><div class='add'>+                        direction: RotationAnimation.Shortest</div><div class='add'>+                        duration: spawned ? 200 : 0</div><div class='add'>+                    }</div><div class='add'>+                }</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='head'>diff --git a/demos/declarative/snake/content/snake.js b/demos/declarative/snake/content/snake.js<br/>index 5c089de..837b82a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/declarative/snake/content/snake.js?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/declarative/snake/content/snake.js</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/declarative/snake/content/snake.js?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/declarative/snake/content/snake.js</a></div><div class='hunk'>@@ -22,20 +22,26 @@ function rand(n)</div><div class='ctx'> </div><div class='ctx'> function scheduleDirection(dir)</div><div class='ctx'> {</div><div class='del'>-    direction = dir;</div><div class='del'>-    if(scheduledDirections[scheduledDirections.length-1]!=direction)</div><div class='del'>-        scheduledDirections.push(direction);</div><div class='add'>+    if (state == "starting") {</div><div class='add'>+        direction = dir;</div><div class='add'>+        headDirection = direction;</div><div class='add'>+        head.rotation = headDirection;</div><div class='add'>+    } else if (state == "running"){</div><div class='add'>+        direction = dir;</div><div class='add'>+        if(scheduledDirections[scheduledDirections.length-1]!=direction)</div><div class='add'>+            scheduledDirections.push(direction);</div><div class='add'>+    }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> function startNewGame()</div><div class='ctx'> {</div><div class='del'>-    if (state == "starting")</div><div class='add'>+    if (state == "starting") {</div><div class='ctx'>         return;</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     if (activeGame) {</div><div class='ctx'>         endGame();</div><div class='ctx'>         startNewGameTimer.running = true;</div><div class='del'>-        state = "";</div><div class='ctx'>         return;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='head'>diff --git a/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml<br/>index b7476b7..edccd4c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/declarative/snake/snake.qml?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/declarative/snake/snake.qml</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/declarative/snake/snake.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/declarative/snake/snake.qml</a></div><div class='hunk'>@@ -88,7 +88,7 @@ Rectangle {</div><div class='ctx'>         onTriggered: { Logic.moveSkull() }</div><div class='ctx'>     }</div><div class='ctx'>     Timer {</div><div class='del'>-	id: startNewGameTimer;</div><div class='add'>+        id: startNewGameTimer;</div><div class='ctx'>         interval: 700;</div><div class='ctx'>         onTriggered: { Logic.startNewGame(); }</div><div class='ctx'>     }</div><div class='hunk'>@@ -109,6 +109,7 @@ Rectangle {</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     Image {</div><div class='add'>+</div><div class='ctx'>         Image {</div><div class='ctx'>             id: title</div><div class='ctx'>             source: "content/pics/snake.jpg"</div><div class='hunk'>@@ -117,14 +118,28 @@ Rectangle {</div><div class='ctx'>             anchors.horizontalCenter: parent.horizontalCenter</div><div class='ctx'>             anchors.verticalCenter: parent.verticalCenter</div><div class='ctx'> </div><div class='del'>-            Text {</div><div class='del'>-                color: "white"</div><div class='del'>-                font.pointSize: 24</div><div class='del'>-                horizontalAlignment: Text.AlignHCenter</div><div class='del'>-                text: "Last Score:\t" + lastScore + "\nHighscore:\t" + highScores.topScore;</div><div class='del'>-                anchors.horizontalCenter: parent.horizontalCenter</div><div class='del'>-                anchors.bottom: parent.bottom</div><div class='del'>-                anchors.bottomMargin: gridSize</div><div class='add'>+            Column {</div><div class='add'>+                spacing: 140</div><div class='add'>+                anchors.verticalCenter: parent.verticalCenter;</div><div class='add'>+                anchors.left:  parent.left;</div><div class='add'>+                anchors.right:  parent.right;</div><div class='add'>+</div><div class='add'>+                Text {</div><div class='add'>+                    color: "white"</div><div class='add'>+                    font.pointSize: 48</div><div class='add'>+                    font.italic: true;</div><div class='add'>+                    font.bold: true;</div><div class='add'>+                    text: "Snake"</div><div class='add'>+                    anchors.horizontalCenter: parent.horizontalCenter;</div><div class='add'>+                }</div><div class='add'>+</div><div class='add'>+                Text {</div><div class='add'>+                    color: "white"</div><div class='add'>+                    font.pointSize: 24</div><div class='add'>+                    anchors.horizontalCenter: parent.horizontalCenter;</div><div class='add'>+                    //horizontalAlignment: Text.AlignHCenter</div><div class='add'>+                    text: "Last Score:\t" + lastScore + "\nHighscore:\t" + highScores.topScore;</div><div class='add'>+                }</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='hunk'>@@ -154,7 +169,7 @@ Rectangle {</div><div class='ctx'>             MouseArea {</div><div class='ctx'>                 anchors.fill: parent</div><div class='ctx'>                 onPressed: {</div><div class='del'>-                    if (!head || !heartbeat.running) {</div><div class='add'>+                    if (screen.state == "") {</div><div class='ctx'>                         Logic.startNewGame();</div><div class='ctx'>                         return;</div><div class='ctx'>                     }</div><div class='hunk'>@@ -245,10 +260,12 @@ Rectangle {</div><div class='ctx'>             from: "*"</div><div class='ctx'>             to: "starting"</div><div class='ctx'>             NumberAnimation { target: progressIndicator; property: "width"; duration: 1000 }</div><div class='del'>-            NumberAnimation { target: title; property: "opacity"; duration: 500 }</div><div class='add'>+            NumberAnimation { property: "opacity"; duration: 200 }</div><div class='ctx'>         },</div><div class='ctx'>         Transition {</div><div class='del'>-            NumberAnimation { target: title; property: "opacity"; duration: 500 }</div><div class='add'>+            to: "starting"</div><div class='add'>+            NumberAnimation { target: progressIndicator; property: "width"; duration: 1000 }</div><div class='add'>+            NumberAnimation { property: "opacity"; duration: 200 }</div><div class='ctx'>         }</div><div class='ctx'>     ]</div><div class='ctx'> </div><div class='head'>diff --git a/demos/deform/main.cpp b/demos/deform/main.cpp<br/>index 70e4bec..c49117a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/deform/main.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/deform/main.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/deform/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/deform/main.cpp</a></div><div class='hunk'>@@ -56,7 +56,7 @@ int main(int argc, char **argv)</div><div class='ctx'> </div><div class='ctx'>     QStyle *arthurStyle = new ArthurStyle();</div><div class='ctx'>     deformWidget.setStyle(arthurStyle);</div><div class='del'>-    QList&lt;QWidget *&gt; widgets = qFindChildren&lt;QWidget *&gt;(&amp;deformWidget);</div><div class='add'>+    QList&lt;QWidget *&gt; widgets = deformWidget.findChildren&lt;QWidget *&gt;();</div><div class='ctx'>     foreach (QWidget *w, widgets)</div><div class='ctx'>         w-&gt;setStyle(arthurStyle);</div><div class='ctx'> </div><div class='head'>diff --git a/demos/deform/pathdeform.cpp b/demos/deform/pathdeform.cpp<br/>index 9f64c02..f80ef2b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/deform/pathdeform.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/deform/pathdeform.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/deform/pathdeform.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/deform/pathdeform.cpp</a></div><div class='hunk'>@@ -297,7 +297,7 @@ void PathDeformWidget::setStyle( QStyle * style )</div><div class='ctx'>     {</div><div class='ctx'>         m_controls-&gt;setStyle(style);</div><div class='ctx'>         </div><div class='del'>-        QList&lt;QWidget *&gt; widgets = qFindChildren&lt;QWidget *&gt;(m_controls);</div><div class='add'>+        QList&lt;QWidget *&gt; widgets = m_controls-&gt;findChildren&lt;QWidget *&gt;();</div><div class='ctx'>         foreach (QWidget *w, widgets)</div><div class='ctx'>             w-&gt;setStyle(style);</div><div class='ctx'>     }</div><div class='head'>diff --git a/demos/demos.pro b/demos/demos.pro<br/>index b8b743c..f1d5b00 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/demos.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/demos.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/demos.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/demos.pro</a></div><div class='hunk'>@@ -45,7 +45,7 @@ contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG,</div><div class='ctx'> SUBDIRS += demos_boxes</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-mac*: SUBDIRS += demos_macmainwindow</div><div class='add'>+mac* &amp;&amp; !qpa: SUBDIRS += demos_macmainwindow</div><div class='ctx'> wince*|symbian|embedded|x11: SUBDIRS += demos_embedded</div><div class='ctx'> </div><div class='ctx'> !contains(QT_EDITION, Console):!cross_compile:!embedded:!wince*:SUBDIRS += demos_arthurplugin</div><div class='head'>diff --git a/demos/embedded/desktopservices/desktopservices.pro b/demos/embedded/desktopservices/desktopservices.pro<br/>index 94ddedd..e66db1c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/embedded/desktopservices/desktopservices.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/desktopservices/desktopservices.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/embedded/desktopservices/desktopservices.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/embedded/desktopservices/desktopservices.pro</a></div><div class='hunk'>@@ -7,8 +7,8 @@ SOURCES += desktopwidget.cpp contenttab.cpp linktab.cpp main.cpp</div><div class='ctx'> </div><div class='ctx'> RESOURCES += desktopservices.qrc</div><div class='ctx'> </div><div class='del'>-music.sources = data/*.mp3 data/*.wav</div><div class='del'>-image.sources = data/*.png</div><div class='add'>+music.files = data/*.mp3 data/*.wav</div><div class='add'>+image.files = data/*.png</div><div class='ctx'> </div><div class='ctx'> target.path = $$[QT_INSTALL_DEMOS]/embedded/desktopservices</div><div class='ctx'> sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro</div><div class='head'>diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro<br/>index ca74c38..0799ed9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/embedded/fluidlauncher/fluidlauncher.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/fluidlauncher/fluidlauncher.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/embedded/fluidlauncher/fluidlauncher.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/embedded/fluidlauncher/fluidlauncher.pro</a></div><div class='hunk'>@@ -33,7 +33,7 @@ wince*{</div><div class='ctx'>         BUILD_DIR = debug</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    executables.sources = \</div><div class='add'>+    executables.files = \</div><div class='ctx'>         $$QT_BUILD_TREE/demos/embedded/embeddedsvgviewer/$${BUILD_DIR}/embeddedsvgviewer.exe \</div><div class='ctx'>         $$QT_BUILD_TREE/demos/embedded/styledemo/$${BUILD_DIR}/styledemo.exe \</div><div class='ctx'>         $$QT_BUILD_TREE/demos/deform/$${BUILD_DIR}/deform.exe \</div><div class='hunk'>@@ -45,10 +45,10 @@ wince*{</div><div class='ctx'> </div><div class='ctx'>     executables.path = .</div><div class='ctx'> </div><div class='del'>-    files.sources = $$PWD/screenshots $$PWD/slides $$PWD/../embeddedsvgviewer/shapes.svg</div><div class='add'>+    files.files = $$PWD/screenshots $$PWD/slides $$PWD/../embeddedsvgviewer/shapes.svg</div><div class='ctx'>     files.path = .</div><div class='ctx'> </div><div class='del'>-    config.sources = $$PWD/config_wince/config.xml</div><div class='add'>+    config.files = $$PWD/config_wince/config.xml</div><div class='ctx'>     config.path = .</div><div class='ctx'> </div><div class='ctx'>     DEPLOYMENT += config files executables</div><div class='hunk'>@@ -79,7 +79,7 @@ symbian {</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    executables.sources = \</div><div class='add'>+    executables.files = \</div><div class='ctx'>         $$QT_BUILD_TREE/demos/embedded/styledemo/styledemo.exe \</div><div class='ctx'>         $$QT_BUILD_TREE/demos/deform/deform.exe \</div><div class='ctx'>         $$QT_BUILD_TREE/demos/pathstroke/pathstroke.exe \</div><div class='hunk'>@@ -97,7 +97,7 @@ symbian {</div><div class='ctx'> </div><div class='ctx'>     executables.path = /sys/bin</div><div class='ctx'> </div><div class='del'>-    reg_resource.sources = \</div><div class='add'>+    reg_resource.files = \</div><div class='ctx'>         $$regResourceDir(demos/embedded/styledemo/styledemo_reg.rsc) \</div><div class='ctx'>         $$regResourceDir(demos/deform/deform_reg.rsc) \</div><div class='ctx'>         $$regResourceDir(demos/pathstroke/pathstroke_reg.rsc) \</div><div class='hunk'>@@ -114,17 +114,17 @@ symbian {</div><div class='ctx'>         $$regResourceDir(demos/embedded/flightinfo/flightinfo_reg.rsc)</div><div class='ctx'> </div><div class='ctx'>     contains(QT_CONFIG, phonon) {</div><div class='del'>-        reg_resource.sources += $$regResourceDir(demos/qmediaplayer/qmediaplayer_reg.rsc)</div><div class='add'>+        reg_resource.files += $$regResourceDir(demos/qmediaplayer/qmediaplayer_reg.rsc)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     contains(QT_CONFIG, multimedia) {</div><div class='del'>-        reg_resource.sources += $$regResourceDir(demos/spectrum/app/spectrum_reg.rsc)</div><div class='add'>+        reg_resource.files += $$regResourceDir(demos/spectrum/app/spectrum_reg.rsc)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>     reg_resource.path = $$REG_RESOURCE_IMPORT_DIR</div><div class='ctx'> </div><div class='del'>-    resource.sources = \</div><div class='add'>+    resource.files = \</div><div class='ctx'>         $$appResourceDir(demos/embedded/styledemo/styledemo.rsc) \</div><div class='ctx'>         $$appResourceDir(demos/deform/deform.rsc) \</div><div class='ctx'>         $$appResourceDir(demos/pathstroke/pathstroke.rsc) \</div><div class='hunk'>@@ -143,7 +143,7 @@ symbian {</div><div class='ctx'> </div><div class='ctx'>     resource.path = $$APP_RESOURCE_DIR</div><div class='ctx'> </div><div class='del'>-    mifs.sources = \</div><div class='add'>+    mifs.files = \</div><div class='ctx'>         $$appResourceDir(demos/embedded/fluidlauncher/fluidlauncher.mif) \</div><div class='ctx'>         $$appResourceDir(demos/embedded/styledemo/styledemo.mif) \</div><div class='ctx'>         $$appResourceDir(demos/deform/deform.mif) \</div><div class='hunk'>@@ -162,28 +162,28 @@ symbian {</div><div class='ctx'>     mifs.path = $$APP_RESOURCE_DIR</div><div class='ctx'> </div><div class='ctx'>     contains(QT_CONFIG, svg) {</div><div class='del'>-        executables.sources += \</div><div class='add'>+        executables.files += \</div><div class='ctx'>             $$QT_BUILD_TREE/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.exe \</div><div class='ctx'>             $$QT_BUILD_TREE/demos/embedded/weatherinfo/weatherinfo.exe</div><div class='ctx'> </div><div class='del'>-        reg_resource.sources += \</div><div class='add'>+        reg_resource.files += \</div><div class='ctx'>             $$regResourceDir(demos/embedded/embeddedsvgviewer/embeddedsvgviewer_reg.rsc) \</div><div class='ctx'>             $$regResourceDir(demos/embedded/weatherinfo/weatherinfo_reg.rsc)</div><div class='ctx'> </div><div class='del'>-        resource.sources += \</div><div class='add'>+        resource.files += \</div><div class='ctx'>             $$appResourceDir(demos/embedded/embeddedsvgviewer/embeddedsvgviewer.rsc) \</div><div class='ctx'>             $$appResourceDir(demos/embedded/weatherinfo/weatherinfo.rsc)</div><div class='ctx'> </div><div class='del'>-        mifs.sources += \</div><div class='add'>+        mifs.files += \</div><div class='ctx'>             $$appResourceDir(demos/embedded/embeddedsvgviewer/embeddedsvgviewer.mif) \</div><div class='ctx'>             $$appResourceDir(demos/embedded/weatherinfo/weatherinfo.mif)</div><div class='ctx'> </div><div class='ctx'>     }</div><div class='ctx'>     contains(QT_CONFIG, webkit) {</div><div class='del'>-        executables.sources += $$QT_BUILD_TREE/demos/embedded/anomaly/anomaly.exe</div><div class='del'>-        reg_resource.sources += $$regResourceDir(demos/embedded/anomaly/anomaly_reg.rsc)</div><div class='del'>-        resource.sources += $$appResourceDir(demos/embedded/anomaly/anomaly.rsc)</div><div class='del'>-        mifs.sources += \</div><div class='add'>+        executables.files += $$QT_BUILD_TREE/demos/embedded/anomaly/anomaly.exe</div><div class='add'>+        reg_resource.files += $$regResourceDir(demos/embedded/anomaly/anomaly_reg.rsc)</div><div class='add'>+        resource.files += $$appResourceDir(demos/embedded/anomaly/anomaly.rsc)</div><div class='add'>+        mifs.files += \</div><div class='ctx'>             $$appResourceDir(demos/embedded/anomaly/anomaly.mif)</div><div class='ctx'> </div><div class='ctx'>         isEmpty(QT_LIBINFIX) {</div><div class='hunk'>@@ -195,61 +195,61 @@ symbian {</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     contains(QT_CONFIG, phonon) {</div><div class='del'>-        executables.sources += $$QT_BUILD_TREE/demos/qmediaplayer/qmediaplayer.exe</div><div class='del'>-        resource.sources += $$appResourceDir(demos/qmediaplayer/qmediaplayer.rsc)</div><div class='del'>-        mifs.sources += \</div><div class='add'>+        executables.files += $$QT_BUILD_TREE/demos/qmediaplayer/qmediaplayer.exe</div><div class='add'>+        resource.files += $$appResourceDir(demos/qmediaplayer/qmediaplayer.rsc)</div><div class='add'>+        mifs.files += \</div><div class='ctx'>             $$appResourceDir(demos/qmediaplayer/qmediaplayer.mif)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     contains(QT_CONFIG, multimedia) {</div><div class='del'>-        executables.sources += $$QT_BUILD_TREE/demos/spectrum/app/spectrum.exe</div><div class='del'>-        executables.sources += $$QT_BUILD_TREE/demos/spectrum/3rdparty/fftreal/fftreal.dll</div><div class='del'>-        resource.sources += $$appResourceDir(demos/spectrum/app/spectrum.rsc)</div><div class='del'>-        mifs.sources += \</div><div class='add'>+        executables.files += $$QT_BUILD_TREE/demos/spectrum/app/spectrum.exe</div><div class='add'>+        executables.files += $$QT_BUILD_TREE/demos/spectrum/3rdparty/fftreal/fftreal.dll</div><div class='add'>+        resource.files += $$appResourceDir(demos/spectrum/app/spectrum.rsc)</div><div class='add'>+        mifs.files += \</div><div class='ctx'>             $$appResourceDir(demos/spectrum/app/spectrum.mif)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     contains(QT_CONFIG, script) {</div><div class='del'>-        executables.sources += $$QT_BUILD_TREE/examples/script/context2d/context2d.exe</div><div class='del'>-        reg_resource.sources += $$regResourceDir(examples/script/context2d/context2d_reg.rsc)</div><div class='del'>-        resource.sources += $$appResourceDir(examples/script/context2d/context2d.rsc)</div><div class='del'>-        mifs.sources += \</div><div class='add'>+        executables.files += $$QT_BUILD_TREE/examples/script/context2d/context2d.exe</div><div class='add'>+        reg_resource.files += $$regResourceDir(examples/script/context2d/context2d_reg.rsc)</div><div class='add'>+        resource.files += $$appResourceDir(examples/script/context2d/context2d.rsc)</div><div class='add'>+        mifs.files += \</div><div class='ctx'>             $$appResourceDir(examples/script/context2d/context2d.mif)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     qmldemos = qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter</div><div class='ctx'>     contains(QT_CONFIG, declarative) {</div><div class='ctx'>         for(qmldemo, qmldemos) {</div><div class='del'>-            executables.sources += $$QT_BUILD_TREE/demos/embedded/$${qmldemo}/$${qmldemo}.exe</div><div class='del'>-            reg_resource.sources += $$regResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}_reg.rsc)</div><div class='del'>-            resource.sources += $$appResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}.rsc)</div><div class='del'>-            mifs.sources += $$appResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}.mif)</div><div class='add'>+            executables.files += $$QT_BUILD_TREE/demos/embedded/$${qmldemo}/$${qmldemo}.exe</div><div class='add'>+            reg_resource.files += $$regResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}_reg.rsc)</div><div class='add'>+            resource.files += $$appResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}.rsc)</div><div class='add'>+            mifs.files += $$appResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}.mif)</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    files.sources = $$PWD/screenshots $$PWD/slides</div><div class='add'>+    files.files = $$PWD/screenshots $$PWD/slides</div><div class='ctx'>     files.path = .</div><div class='ctx'> </div><div class='del'>-    config.sources = $$PWD/config_s60/config.xml</div><div class='add'>+    config.files = $$PWD/config_s60/config.xml</div><div class='ctx'>     config.path = .</div><div class='ctx'> </div><div class='del'>-    viewerimages.sources = $$PWD/../embeddedsvgviewer/shapes.svg</div><div class='add'>+    viewerimages.files = $$PWD/../embeddedsvgviewer/shapes.svg</div><div class='ctx'>     viewerimages.path = /data/images/qt/demos/embeddedsvgviewer</div><div class='ctx'> </div><div class='ctx'>     # demos/mediaplayer make also use of these files.</div><div class='del'>-    desktopservices_music.sources = \</div><div class='add'>+    desktopservices_music.files = \</div><div class='ctx'>         $$PWD/../desktopservices/data/*.mp3 \</div><div class='ctx'>         $$PWD/../desktopservices/data/*.wav</div><div class='ctx'>     desktopservices_music.path = /data/sounds</div><div class='ctx'> </div><div class='del'>-    desktopservices_images.sources = $$PWD/../desktopservices/data/*.png</div><div class='add'>+    desktopservices_images.files = $$PWD/../desktopservices/data/*.png</div><div class='ctx'>     desktopservices_images.path = /data/images</div><div class='ctx'> </div><div class='del'>-    saxbookmarks.sources = $$PWD/../../../examples/xml/saxbookmarks/frank.xbel</div><div class='del'>-    saxbookmarks.sources += $$PWD/../../../examples/xml/saxbookmarks/jennifer.xbel</div><div class='add'>+    saxbookmarks.files = $$PWD/../../../examples/xml/saxbookmarks/frank.xbel</div><div class='add'>+    saxbookmarks.files += $$PWD/../../../examples/xml/saxbookmarks/jennifer.xbel</div><div class='ctx'>     saxbookmarks.path = /data/qt/saxbookmarks</div><div class='ctx'> </div><div class='del'>-    fluidbackup.sources = backup_registration.xml</div><div class='add'>+    fluidbackup.files = backup_registration.xml</div><div class='ctx'>     fluidbackup.path = /private/$$replace(TARGET.UID3, 0x,)</div><div class='ctx'> </div><div class='ctx'>     DEPLOYMENT += config files executables viewerimages saxbookmarks reg_resource resource \</div><div class='head'>diff --git a/demos/embedded/qmlcalculator/deployment.pri b/demos/embedded/qmlcalculator/deployment.pri<br/>index a31303d..a97498e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/embedded/qmlcalculator/deployment.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/qmlcalculator/deployment.pri</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/embedded/qmlcalculator/deployment.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/embedded/qmlcalculator/deployment.pri</a></div><div class='hunk'>@@ -4,5 +4,5 @@ symbian {</div><div class='ctx'>     qmlcalculator_uid3 = A000E3FB</div><div class='ctx'>     qmlcalculator_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlcalculator_uid3</div><div class='ctx'> }</div><div class='del'>-qmlcalculator_files.sources = $$qmlcalculator_src/calculator.qml $$qmlcalculator_src/Core</div><div class='add'>+qmlcalculator_files.files = $$qmlcalculator_src/calculator.qml $$qmlcalculator_src/Core</div><div class='ctx'> DEPLOYMENT += qmlcalculator_files</div><div class='head'>diff --git a/demos/embedded/qmlclocks/deployment.pri b/demos/embedded/qmlclocks/deployment.pri<br/>index 0946733..6c6704c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/embedded/qmlclocks/deployment.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/qmlclocks/deployment.pri</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/embedded/qmlclocks/deployment.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/embedded/qmlclocks/deployment.pri</a></div><div class='hunk'>@@ -4,5 +4,5 @@ symbian {</div><div class='ctx'>     qmlclocks_uid3 = A000E3FC</div><div class='ctx'>     qmlclocks_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlclocks_uid3</div><div class='ctx'> }</div><div class='del'>-qmlclocks_files.sources = $$qmlclocks_src/clocks.qml $$qmlclocks_src/content</div><div class='add'>+qmlclocks_files.files = $$qmlclocks_src/clocks.qml $$qmlclocks_src/content</div><div class='ctx'> DEPLOYMENT += qmlclocks_files</div><div class='head'>diff --git a/demos/embedded/qmldialcontrol/deployment.pri b/demos/embedded/qmldialcontrol/deployment.pri<br/>index e0e72e6..a978443 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/embedded/qmldialcontrol/deployment.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/qmldialcontrol/deployment.pri</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/embedded/qmldialcontrol/deployment.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/embedded/qmldialcontrol/deployment.pri</a></div><div class='hunk'>@@ -4,5 +4,5 @@ symbian {</div><div class='ctx'>     qmldialcontrol_uid3 = A000E3FD</div><div class='ctx'>     qmldialcontrol_files.path = $$APP_PRIVATE_DIR_BASE/$$qmldialcontrol_uid3</div><div class='ctx'> }</div><div class='del'>-qmldialcontrol_files.sources = $$qmldialcontrol_src/dialcontrol.qml $$qmldialcontrol_src/content</div><div class='add'>+qmldialcontrol_files.files = $$qmldialcontrol_src/dialcontrol.qml $$qmldialcontrol_src/content</div><div class='ctx'> DEPLOYMENT += qmldialcontrol_files</div><div class='head'>diff --git a/demos/embedded/qmleasing/deployment.pri b/demos/embedded/qmleasing/deployment.pri<br/>index d3621cb..946fcd9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/embedded/qmleasing/deployment.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/qmleasing/deployment.pri</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/embedded/qmleasing/deployment.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/embedded/qmleasing/deployment.pri</a></div><div class='hunk'>@@ -4,5 +4,5 @@ symbian {</div><div class='ctx'>     qmleasing_uid3 = A000E3FE</div><div class='ctx'>     qmleasing_files.path = $$APP_PRIVATE_DIR_BASE/$$qmleasing_uid3</div><div class='ctx'> }</div><div class='del'>-qmleasing_files.sources = $$qmleasing_src/easing.qml $$qmleasing_src/content</div><div class='add'>+qmleasing_files.files = $$qmleasing_src/easing.qml $$qmleasing_src/content</div><div class='ctx'> DEPLOYMENT += qmleasing_files</div><div class='head'>diff --git a/demos/embedded/qmlflickr/deployment.pri b/demos/embedded/qmlflickr/deployment.pri<br/>index b508292..a38dc95 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/embedded/qmlflickr/deployment.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/qmlflickr/deployment.pri</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/embedded/qmlflickr/deployment.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/embedded/qmlflickr/deployment.pri</a></div><div class='hunk'>@@ -4,5 +4,5 @@ symbian {</div><div class='ctx'>     qmlflickr_uid3 = A000E3FF</div><div class='ctx'>     qmlflickr_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlflickr_uid3</div><div class='ctx'> }</div><div class='del'>-qmlflickr_files.sources = $$qmlflickr_src/flickr.qml $$qmlflickr_src/common $$qmlflickr_src/mobile</div><div class='add'>+qmlflickr_files.files = $$qmlflickr_src/flickr.qml $$qmlflickr_src/common $$qmlflickr_src/mobile</div><div class='ctx'> DEPLOYMENT += qmlflickr_files</div><div class='head'>diff --git a/demos/embedded/qmlphotoviewer/deployment.pri b/demos/embedded/qmlphotoviewer/deployment.pri<br/>index 35937a8..23882e3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/embedded/qmlphotoviewer/deployment.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/qmlphotoviewer/deployment.pri</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/embedded/qmlphotoviewer/deployment.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/embedded/qmlphotoviewer/deployment.pri</a></div><div class='hunk'>@@ -4,5 +4,5 @@ symbian {</div><div class='ctx'>     qmlphotoviewer_uid3 = A000E400</div><div class='ctx'>     qmlphotoviewer_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlphotoviewer_uid3</div><div class='ctx'> }</div><div class='del'>-qmlphotoviewer_files.sources = $$qmlphotoviewer_src/photoviewer.qml $$qmlphotoviewer_src/PhotoViewerCore</div><div class='add'>+qmlphotoviewer_files.files = $$qmlphotoviewer_src/photoviewer.qml $$qmlphotoviewer_src/PhotoViewerCore</div><div class='ctx'> DEPLOYMENT += qmlphotoviewer_files</div><div class='head'>diff --git a/demos/embedded/qmltwitter/deployment.pri b/demos/embedded/qmltwitter/deployment.pri<br/>index 4404e33..3edc0e5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/embedded/qmltwitter/deployment.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/embedded/qmltwitter/deployment.pri</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/embedded/qmltwitter/deployment.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/embedded/qmltwitter/deployment.pri</a></div><div class='hunk'>@@ -4,5 +4,5 @@ symbian {</div><div class='ctx'>     qmltwitter_uid3 = A000E401</div><div class='ctx'>     qmltwitter_files.path = $$APP_PRIVATE_DIR_BASE/$$qmltwitter_uid3</div><div class='ctx'> }</div><div class='del'>-qmltwitter_files.sources = $$qmltwitter_src/twitter.qml $$qmltwitter_src/TwitterCore</div><div class='add'>+qmltwitter_files.files = $$qmltwitter_src/twitter.qml $$qmltwitter_src/TwitterCore</div><div class='ctx'> DEPLOYMENT += qmltwitter_files</div><div class='head'>diff --git a/demos/embeddeddialogs/customproxy.cpp b/demos/embeddeddialogs/customproxy.cpp<br/>index bc66165..cbc622a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/embeddeddialogs/customproxy.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/embeddeddialogs/customproxy.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/embeddeddialogs/customproxy.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/embeddeddialogs/customproxy.cpp</a></div><div class='hunk'>@@ -113,7 +113,7 @@ QVariant CustomProxy::itemChange(GraphicsItemChange change, const QVariant &amp;valu</div><div class='ctx'> {</div><div class='ctx'>     if (change == ItemChildAddedChange || change == ItemChildRemovedChange) {</div><div class='ctx'>         if (change == ItemChildAddedChange) {</div><div class='del'>-            currentPopup = qVariantValue&lt;QGraphicsItem *&gt;(value);</div><div class='add'>+            currentPopup = qvariant_cast&lt;QGraphicsItem *&gt;(value);</div><div class='ctx'>             currentPopup-&gt;setCacheMode(ItemCoordinateCache);</div><div class='ctx'>             if (scene())</div><div class='ctx'>                 currentPopup-&gt;installSceneEventFilter(this);</div><div class='head'>diff --git a/demos/gradients/main.cpp b/demos/gradients/main.cpp<br/>index df45f84..1d2f0d5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/gradients/main.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/gradients/main.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/gradients/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/gradients/main.cpp</a></div><div class='hunk'>@@ -52,7 +52,7 @@ int main(int argc, char **argv)</div><div class='ctx'>     GradientWidget gradientWidget(0);</div><div class='ctx'>     QStyle *arthurStyle = new ArthurStyle();</div><div class='ctx'>     gradientWidget.setStyle(arthurStyle);</div><div class='del'>-    QList&lt;QWidget *&gt; widgets = qFindChildren&lt;QWidget *&gt;(&amp;gradientWidget);</div><div class='add'>+    QList&lt;QWidget *&gt; widgets = gradientWidget.findChildren&lt;QWidget *&gt;();</div><div class='ctx'>     foreach (QWidget *w, widgets) {</div><div class='ctx'>         w-&gt;setStyle(arthurStyle);</div><div class='ctx'>         w-&gt;setAttribute(Qt::WA_AcceptTouchEvents);</div><div class='head'>diff --git a/demos/interview/model.cpp b/demos/interview/model.cpp<br/>index fca232c..6031615 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/interview/model.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/interview/model.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/interview/model.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/interview/model.cpp</a></div><div class='hunk'>@@ -109,7 +109,7 @@ QVariant Model::headerData(int section, Qt::Orientation orientation, int role) c</div><div class='ctx'>     if (role == Qt::DisplayRole)</div><div class='ctx'>         return QString::number(section);</div><div class='ctx'>     if (role == Qt::DecorationRole)</div><div class='del'>-        return qVariantFromValue(services);</div><div class='add'>+        return QVariant::fromValue(services);</div><div class='ctx'>     return QAbstractItemModel::headerData(section, orientation, role);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/demos/mainwindow/colorswatch.cpp b/demos/mainwindow/colorswatch.cpp<br/>index 19599bf..dd16fdd 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/mainwindow/colorswatch.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/mainwindow/colorswatch.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/mainwindow/colorswatch.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/mainwindow/colorswatch.cpp</a></div><div class='hunk'>@@ -454,7 +454,7 @@ void ColorSwatch::updateContextMenu()</div><div class='ctx'>     tabMenu-&gt;clear();</div><div class='ctx'>     splitHMenu-&gt;clear();</div><div class='ctx'>     splitVMenu-&gt;clear();</div><div class='del'>-    QList&lt;ColorSwatch*&gt; dock_list = qFindChildren&lt;ColorSwatch*&gt;(mainWindow);</div><div class='add'>+    QList&lt;ColorSwatch*&gt; dock_list = mainWindow-&gt;findChildren&lt;ColorSwatch*&gt;();</div><div class='ctx'>     foreach (ColorSwatch *dock, dock_list) {</div><div class='ctx'> //        if (!dock-&gt;isVisible() || dock-&gt;isFloating())</div><div class='ctx'> //            continue;</div><div class='hunk'>@@ -467,7 +467,7 @@ void ColorSwatch::updateContextMenu()</div><div class='ctx'> void ColorSwatch::splitInto(QAction *action)</div><div class='ctx'> {</div><div class='ctx'>     QMainWindow *mainWindow = qobject_cast&lt;QMainWindow *&gt;(parentWidget());</div><div class='del'>-    QList&lt;ColorSwatch*&gt; dock_list = qFindChildren&lt;ColorSwatch*&gt;(mainWindow);</div><div class='add'>+    QList&lt;ColorSwatch*&gt; dock_list = mainWindow-&gt;findChildren&lt;ColorSwatch*&gt;();</div><div class='ctx'>     ColorSwatch *target = 0;</div><div class='ctx'>     foreach (ColorSwatch *dock, dock_list) {</div><div class='ctx'>         if (action-&gt;text() == dock-&gt;objectName()) {</div><div class='hunk'>@@ -486,7 +486,7 @@ void ColorSwatch::splitInto(QAction *action)</div><div class='ctx'> void ColorSwatch::tabInto(QAction *action)</div><div class='ctx'> {</div><div class='ctx'>     QMainWindow *mainWindow = qobject_cast&lt;QMainWindow *&gt;(parentWidget());</div><div class='del'>-    QList&lt;ColorSwatch*&gt; dock_list = qFindChildren&lt;ColorSwatch*&gt;(mainWindow);</div><div class='add'>+    QList&lt;ColorSwatch*&gt; dock_list = mainWindow-&gt;findChildren&lt;ColorSwatch*&gt;();</div><div class='ctx'>     ColorSwatch *target = 0;</div><div class='ctx'>     foreach (ColorSwatch *dock, dock_list) {</div><div class='ctx'>         if (action-&gt;text() == dock-&gt;objectName()) {</div><div class='head'>diff --git a/demos/mainwindow/toolbar.cpp b/demos/mainwindow/toolbar.cpp<br/>index 21731dc..1176ee5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/mainwindow/toolbar.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/mainwindow/toolbar.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/mainwindow/toolbar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/mainwindow/toolbar.cpp</a></div><div class='hunk'>@@ -232,7 +232,7 @@ void ToolBar::updateMenu()</div><div class='ctx'> void ToolBar::order()</div><div class='ctx'> {</div><div class='ctx'>     QList&lt;QAction *&gt; ordered, actions1 = actions(),</div><div class='del'>-                              actions2 = qFindChildren&lt;QAction *&gt;(this);</div><div class='add'>+                              actions2 = findChildren&lt;QAction *&gt;();</div><div class='ctx'>     while (!actions2.isEmpty()) {</div><div class='ctx'>         QAction *action = actions2.takeFirst();</div><div class='ctx'>         if (!actions1.contains(action))</div><div class='head'>diff --git a/demos/pathstroke/main.cpp b/demos/pathstroke/main.cpp<br/>index 2e9153f..b357f99 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/pathstroke/main.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/pathstroke/main.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/pathstroke/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/pathstroke/main.cpp</a></div><div class='hunk'>@@ -53,7 +53,7 @@ int main(int argc, char **argv)</div><div class='ctx'>     PathStrokeWidget pathStrokeWidget(smallScreen);</div><div class='ctx'>     QStyle *arthurStyle = new ArthurStyle();</div><div class='ctx'>     pathStrokeWidget.setStyle(arthurStyle);</div><div class='del'>-    QList&lt;QWidget *&gt; widgets = qFindChildren&lt;QWidget *&gt;(&amp;pathStrokeWidget);</div><div class='add'>+    QList&lt;QWidget *&gt; widgets = pathStrokeWidget.findChildren&lt;QWidget *&gt;();</div><div class='ctx'>     foreach (QWidget *w, widgets) {</div><div class='ctx'>         w-&gt;setStyle(arthurStyle);</div><div class='ctx'>         w-&gt;setAttribute(Qt::WA_AcceptTouchEvents);</div><div class='head'>diff --git a/demos/pathstroke/pathstroke.cpp b/demos/pathstroke/pathstroke.cpp<br/>index 2d01ee5..02c35f7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/pathstroke/pathstroke.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/pathstroke/pathstroke.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/pathstroke/pathstroke.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/pathstroke/pathstroke.cpp</a></div><div class='hunk'>@@ -382,7 +382,7 @@ void PathStrokeWidget::setStyle( QStyle * style )</div><div class='ctx'>     {</div><div class='ctx'>         m_controls-&gt;setStyle(style);</div><div class='ctx'>         </div><div class='del'>-        QList&lt;QWidget *&gt; widgets = qFindChildren&lt;QWidget *&gt;(m_controls);</div><div class='add'>+        QList&lt;QWidget *&gt; widgets = m_controls-&gt;findChildren&lt;QWidget *&gt;();</div><div class='ctx'>         foreach (QWidget *w, widgets)</div><div class='ctx'>             w-&gt;setStyle(style);</div><div class='ctx'>     }</div><div class='head'>diff --git a/demos/qmediaplayer/qmediaplayer.pro b/demos/qmediaplayer/qmediaplayer.pro<br/>index fbf06d2..a7a6181 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/qmediaplayer/qmediaplayer.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/qmediaplayer/qmediaplayer.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/qmediaplayer/qmediaplayer.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/qmediaplayer/qmediaplayer.pro</a></div><div class='hunk'>@@ -27,7 +27,7 @@ DEPLOYMENT_PLUGIN += phonon_ds9 phonon_waveout</div><div class='ctx'> symbian {</div><div class='ctx'>     TARGET.UID3 = 0xA000C613</div><div class='ctx'> </div><div class='del'>-     addFiles.sources = ../embedded/desktopservices/data/sax.mp3</div><div class='add'>+     addFiles.files = ../embedded/desktopservices/data/sax.mp3</div><div class='ctx'>      addFiles.path = /data/sounds/</div><div class='ctx'>      DEPLOYMENT += addFiles</div><div class='ctx'> </div><div class='head'>diff --git a/demos/shared/arthurstyle.cpp b/demos/shared/arthurstyle.cpp<br/>index 5abcfe9..432b8b3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/shared/arthurstyle.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/shared/arthurstyle.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/shared/arthurstyle.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/shared/arthurstyle.cpp</a></div><div class='hunk'>@@ -394,7 +394,7 @@ int ArthurStyle::pixelMetric(PixelMetric pm, const QStyleOption *opt, const QWid</div><div class='ctx'> void ArthurStyle::polish(QWidget *widget)</div><div class='ctx'> {</div><div class='ctx'>     if (widget-&gt;layout() &amp;&amp; qobject_cast&lt;QGroupBox *&gt;(widget)) {</div><div class='del'>-        if (qFindChildren&lt;QGroupBox *&gt;(widget).size() == 0) {</div><div class='add'>+        if (widget-&gt;findChildren&lt;QGroupBox *&gt;().size() == 0) {</div><div class='ctx'>             widget-&gt;layout()-&gt;setSpacing(0);</div><div class='ctx'>             widget-&gt;layout()-&gt;setMargin(12);</div><div class='ctx'>         } else {</div><div class='head'>diff --git a/demos/shared/arthurwidgets.cpp b/demos/shared/arthurwidgets.cpp<br/>index 617f100..b3c75f0 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/shared/arthurwidgets.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/shared/arthurwidgets.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/shared/arthurwidgets.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/shared/arthurwidgets.cpp</a></div><div class='hunk'>@@ -313,7 +313,7 @@ void ArthurFrame::loadSourceFile(const QString &amp;sourceFile)</div><div class='ctx'> void ArthurFrame::showSource()</div><div class='ctx'> {</div><div class='ctx'>     // Check for existing source</div><div class='del'>-    if (qFindChild&lt;QTextBrowser *&gt;(this))</div><div class='add'>+    if (findChild&lt;QTextBrowser *&gt;())</div><div class='ctx'>         return;</div><div class='ctx'> </div><div class='ctx'>     QString contents;</div><div class='head'>diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro<br/>index b3ff227..a75b41a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/spectrum/app/app.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/spectrum/app/app.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/spectrum/app/app.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/spectrum/app/app.pro</a></div><div class='hunk'>@@ -86,7 +86,7 @@ symbian {</div><div class='ctx'> </div><div class='ctx'>     !contains(DEFINES, DISABLE_FFT) {</div><div class='ctx'>         # Include FFTReal DLL in the SIS file</div><div class='del'>-        fftreal.sources = ../fftreal.dll</div><div class='add'>+        fftreal.files = ../fftreal.dll</div><div class='ctx'>         fftreal.path = !:/sys/bin</div><div class='ctx'>         DEPLOYMENT += fftreal</div><div class='ctx'>     }</div><div class='head'>diff --git a/demos/spectrum/app/settingsdialog.cpp b/demos/spectrum/app/settingsdialog.cpp<br/>index 0fc620d..78c2db9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/spectrum/app/settingsdialog.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/spectrum/app/settingsdialog.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/spectrum/app/settingsdialog.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/spectrum/app/settingsdialog.cpp</a></div><div class='hunk'>@@ -65,13 +65,13 @@ SettingsDialog::SettingsDialog(</div><div class='ctx'>     QAudioDeviceInfo device;</div><div class='ctx'>     foreach (device, availableInputDevices)</div><div class='ctx'>         m_inputDeviceComboBox-&gt;addItem(device.deviceName(),</div><div class='del'>-                                       qVariantFromValue(device));</div><div class='add'>+                                       QVariant::fromValue(device));</div><div class='ctx'>     foreach (device, availableOutputDevices)</div><div class='ctx'>         m_outputDeviceComboBox-&gt;addItem(device.deviceName(),</div><div class='del'>-                                       qVariantFromValue(device));</div><div class='add'>+                                       QVariant::fromValue(device));</div><div class='ctx'> </div><div class='del'>-    m_windowFunctionComboBox-&gt;addItem(tr("None"), qVariantFromValue(int(NoWindow)));</div><div class='del'>-    m_windowFunctionComboBox-&gt;addItem("Hann", qVariantFromValue(int(HannWindow)));</div><div class='add'>+    m_windowFunctionComboBox-&gt;addItem(tr("None"), QVariant::fromValue(int(NoWindow)));</div><div class='add'>+    m_windowFunctionComboBox-&gt;addItem("Hann", QVariant::fromValue(int(HannWindow)));</div><div class='ctx'>     m_windowFunctionComboBox-&gt;setCurrentIndex(m_windowFunction);</div><div class='ctx'> </div><div class='ctx'>     // Initialize default devices</div><div class='head'>diff --git a/demos/spreadsheet/spreadsheetitem.cpp b/demos/spreadsheet/spreadsheetitem.cpp<br/>index 3d1fc0d..74a1967 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/demos/spreadsheet/spreadsheetitem.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>demos/spreadsheet/spreadsheetitem.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/demos/spreadsheet/spreadsheetitem.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>demos/spreadsheet/spreadsheetitem.cpp</a></div><div class='hunk'>@@ -72,10 +72,10 @@ QVariant SpreadSheetItem::data(int role) const</div><div class='ctx'> </div><div class='ctx'>     if (role == Qt::TextColorRole) {</div><div class='ctx'>         if (!isNumber)</div><div class='del'>-            return qVariantFromValue(QColor(Qt::black));</div><div class='add'>+            return QVariant::fromValue(QColor(Qt::black));</div><div class='ctx'>         else if (number &lt; 0)</div><div class='del'>-            return qVariantFromValue(QColor(Qt::red));</div><div class='del'>-        return qVariantFromValue(QColor(Qt::blue));</div><div class='add'>+            return QVariant::fromValue(QColor(Qt::red));</div><div class='add'>+        return QVariant::fromValue(QColor(Qt::blue));</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>      if (role == Qt::TextAlignmentRole)</div><div class='head'>diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0<br/>index 3e7d33b..2ebdc7c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/dist/changes-4.6.0?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>dist/changes-4.6.0</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/dist/changes-4.6.0?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>dist/changes-4.6.0</a></div><div class='hunk'>@@ -177,7 +177,7 @@ QtCore</div><div class='ctx'>     * Many optimisations.</div><div class='ctx'>     * Added QVariant::toFloat() and QVariant::toReal().</div><div class='ctx'>     * Added QVariant(float) constructor.</div><div class='del'>-    * qvariant_cast&lt;QVariant&gt; and qVariantFromValue&lt;QVariant&gt; are now</div><div class='add'>+    * qvariant_cast&lt;QVariant&gt; and QVariant::fromValue&lt;QVariant&gt; are now</div><div class='ctx'>       identity functions.</div><div class='ctx'>     * Added support for math3d types.</div><div class='ctx'> </div><div class='head'>diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0<br/>new file mode 100644<br/>index 0000000..1703633<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/dist/changes-4.8.0?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>dist/changes-4.8.0</a></div><div class='hunk'>@@ -0,0 +1,174 @@</div><div class='add'>+Qt 4.8 introduces many new features and improvements as well as bugfixes</div><div class='add'>+over the 4.7.x series. For more details, refer to the online documentation</div><div class='add'>+included in this distribution. The documentation is also available online:</div><div class='add'>+</div><div class='add'>+  http://qt.nokia.com/doc/4.8</div><div class='add'>+</div><div class='add'>+The Qt version 4.8 series is binary compatible with the 4.7.x series.</div><div class='add'>+Applications compiled for 4.7 will continue to run with 4.8.</div><div class='add'>+</div><div class='add'>+Some of the changes listed in this file include issue tracking numbers</div><div class='add'>+corresponding to tasks in the Qt Bug Tracker:</div><div class='add'>+</div><div class='add'>+  http://bugreports.qt.nokia.com/</div><div class='add'>+</div><div class='add'>+Each of these identifiers can be entered in the bug tracker to obtain more</div><div class='add'>+information about a particular change.</div><div class='add'>+</div><div class='add'>+****************************************************************************</div><div class='add'>+*                           General                                        *</div><div class='add'>+****************************************************************************</div><div class='add'>+</div><div class='add'>+General Improvements</div><div class='add'>+--------------------</div><div class='add'>+</div><div class='add'>+- </div><div class='add'>+</div><div class='add'>+Third party components</div><div class='add'>+----------------------</div><div class='add'>+</div><div class='add'>+ - Updated libpng to version x.y.z</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+****************************************************************************</div><div class='add'>+*                          Library                                         *</div><div class='add'>+****************************************************************************</div><div class='add'>+</div><div class='add'>+QtCore</div><div class='add'>+------</div><div class='add'>+ - Removed support for QT_NO_THREAD define for QHostInfo.</div><div class='add'>+ - Optimized plugin loading on ELF platforms.</div><div class='add'>+   Print failure reason at runtime with QT_DEBUG_PLUGINS=1 in environment.</div><div class='add'>+ - QMutexLocker: improved performence of the non contended case by inlining some function</div><div class='add'>+ - QThreadStorage: Added possibility to store object by value instead of by pointer [QTBUG-15033]</div><div class='add'>+ - QThread: fixed few race conditions [QTBUG-17257, QTBUG-15030]</div><div class='add'>+ - QtConcurrent: added support for c++0x lambda in few functions</div><div class='add'>+ - QObject: Improved performence of the signal activation</div><div class='add'>+ - QObject: added ways to connect signals using QMetaMethod</div><div class='add'>+ - QObject: deprecated qFindChild and qFindChildren</div><div class='add'>+ - QObject: optimize constructions and destruction of objects</div><div class='add'>+ - QObject: Qt::BlockingQueuedConnection can handle the return value [QTBUG-10440]</div><div class='add'>+ - QList/QVector/QStringList: added C++0x initilizer lists constructors.</div><div class='add'>+ - QVarLenghtArray: added method for consistency with QVector</div><div class='add'>+ - QStringBuilder: added support for QByteArray</div><div class='add'>+ - qSwap now uses std::swap, specialized std::swap for our container to work better with stl algoritms</div><div class='add'>+ - QVariant: deprecated global function qVariantSetValue, qVariantValue, qVariantCanConvert, qVariantFromValue</div><div class='add'>+</div><div class='add'>+QtGui</div><div class='add'>+-----</div><div class='add'>+</div><div class='add'>+ - QTabBar: reduced minimumSizeHint if ElideMode is set.</div><div class='add'>+ - QComboBox: Fixed a color propagation issue with the lineedit. [QTBUG-5950]</div><div class='add'>+ - Deprecate qGenericMatrixFromMatrix4x4 and qGenericMatrixToMatrix4x4</div><div class='add'>+ - QListView diverses optimisations [QTBUG-11438]</div><div class='add'>+ - QTreeWidget/QListWidget: use localeAwareCompare for string comparisons [QTBUG-10839]</div><div class='add'>+</div><div class='add'>+ QtOpenGL</div><div class='add'>+ --------</div><div class='add'>+ - Removed dependency of OpenGL Utility Library (GLU)</div><div class='add'>+ - Added QGLFunctions, which provides cross-platform access to the</div><div class='add'>+   OpenGL/ES 2.0 API.</div><div class='add'>+ - Including &lt;QtOpenGL&gt; will not work in combination with GLEW, as</div><div class='add'>+   QGLFunctions will undefine GLEW's defines.</div><div class='add'>+</div><div class='add'>+QtScript</div><div class='add'>+--------</div><div class='add'>+ - Deprecated qScriptValueFromQMetaObject, qScriptValueToValue, qScriptValueFromValue</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+****************************************************************************</div><div class='add'>+*                          Database Drivers                                *</div><div class='add'>+****************************************************************************</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+****************************************************************************</div><div class='add'>+*                      Platform Specific Changes                           *</div><div class='add'>+****************************************************************************</div><div class='add'>+</div><div class='add'>+Qt for Linux/X11</div><div class='add'>+----------------</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Qt for Windows</div><div class='add'>+--------------</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Qt for Mac OS X</div><div class='add'>+---------------</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Qt for Embedded Linux</div><div class='add'>+---------------------</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Qt for Windows CE</div><div class='add'>+-----------------</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+****************************************************************************</div><div class='add'>+*                      Compiler Specific Changes                           *</div><div class='add'>+****************************************************************************</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+****************************************************************************</div><div class='add'>+*                          Tools                                           *</div><div class='add'>+****************************************************************************</div><div class='add'>+</div><div class='add'>+- Build System</div><div class='add'>+</div><div class='add'>+- Assistant</div><div class='add'>+</div><div class='add'>+- Designer</div><div class='add'>+    * [QTBUG-18631] Enabled the use of promoted QWidgets in the buddy editor.</div><div class='add'>+    * [QTBUG-18120] Fixed saving of the Z-order.</div><div class='add'>+    * [QTBUG-13683] Fixed saving of QGridLayout and QFormLayout</div><div class='add'>+      by QFormBuilder.</div><div class='add'>+    * [QTBUG-10890] Added a filter to the rich text editor dialog.</div><div class='add'>+      that simplifies the HTML markup generated.</div><div class='add'>+    * [QTBUG-7777] Added support for QIcon::fromTheme.</div><div class='add'>+    * [QTBUG-7169] Fixed QtUiTools to be built with the correct</div><div class='add'>+      lib-infix.</div><div class='add'>+    * [QTBUG-3120] Added support for alignment of box layout items.</div><div class='add'>+</div><div class='add'>+- Linguist</div><div class='add'>+  - Linguist GUI</div><div class='add'>+</div><div class='add'>+  - lupdate</div><div class='add'>+</div><div class='add'>+  - lrelease</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- rcc</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- moc</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- uic</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- uic3</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- qmake</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- configure</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- qtconfig</div><div class='add'>+  * removed Qt3support dependency</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+- qt3to4</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+****************************************************************************</div><div class='add'>+*                          Plugins                                         *</div><div class='add'>+****************************************************************************</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+****************************************************************************</div><div class='add'>+*                   Important Behavior Changes                             *</div><div class='add'>+****************************************************************************</div><div class='add'>+</div><div class='head'>diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc<br/>index 37455a7..0e8056a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/declarative/basictypes.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/declarative/basictypes.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/declarative/basictypes.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/declarative/basictypes.qdoc</a></div><div class='hunk'>@@ -567,7 +567,7 @@</div><div class='ctx'> </div><div class='ctx'>     An enumeration type consists of a set of named values.</div><div class='ctx'> </div><div class='del'>-    An enumeration value may be specifed as either a string:</div><div class='add'>+    An enumeration value may be specified as either a string:</div><div class='ctx'>     \qml</div><div class='ctx'>     Text { horizontalAlignment: "AlignRight" }</div><div class='ctx'>     \endqml</div><div class='head'>diff --git a/doc/src/declarative/example-slideswitch.qdoc b/doc/src/declarative/example-slideswitch.qdoc<br/>index 82161de..a4d8cbe 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/declarative/example-slideswitch.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/declarative/example-slideswitch.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/declarative/example-slideswitch.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/declarative/example-slideswitch.qdoc</a></div><div class='hunk'>@@ -33,7 +33,7 @@ This example shows how to create a reusable switch component in QML.</div><div class='ctx'> </div><div class='ctx'> The code for this example can be found in the \c $QTDIR/examples/declarative/ui-components/slideswitch directory.</div><div class='ctx'> </div><div class='del'>-The elements that composed the switch are:</div><div class='add'>+The elements that compose the switch are:</div><div class='ctx'> </div><div class='ctx'> \list</div><div class='ctx'> \o a \c on property (the interface to interact with the switch),</div><div class='head'>diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc<br/>index b63e1cb..0f7becd 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/declarative/extending.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/declarative/extending.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/declarative/extending.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/declarative/extending.qdoc</a></div><div class='hunk'>@@ -194,7 +194,7 @@ The QML snippet shown above assigns a \c Person object to the \c BirthdayParty's</div><div class='ctx'> </div><div class='ctx'> QML can set properties of types that are more complex than basic intrinsics like</div><div class='ctx'> integers and strings.  Properties can also be object pointers, Qt interface</div><div class='del'>-pointers,  lists of object points, and lists of Qt interface pointers.  As QML</div><div class='add'>+pointers,  lists of object pointers, and lists of Qt interface pointers.  As QML</div><div class='ctx'> is typesafe it ensures that only valid types are assigned to these properties,</div><div class='ctx'> just like it does for primitive types.</div><div class='ctx'> </div><div class='head'>diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc<br/>index e0240c1..80d83a4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/declarative/modules.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/declarative/modules.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/declarative/modules.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/declarative/modules.qdoc</a></div><div class='hunk'>@@ -310,6 +310,7 @@ It is defined by a plain text file named "qmldir" that contains one or more line</div><div class='ctx'> &lt;TypeName&gt; [&lt;InitialVersion&gt;] &lt;File&gt;</div><div class='ctx'> internal &lt;TypeName&gt; &lt;File&gt;</div><div class='ctx'> plugin &lt;Name&gt; [&lt;Path&gt;]</div><div class='add'>+typeinfo &lt;File&gt;</div><div class='ctx'> \endcode</div><div class='ctx'> </div><div class='ctx'> \bold {# &lt;Comment&gt;} lines are used for comments. They are ignored by the QML engine.</div><div class='hunk'>@@ -350,6 +351,14 @@ plugin file, or a relative path from the directory containing the \c qmldir file</div><div class='ctx'> containing the plugin file. By default the engine searches for the plugin library in the directory that contains the \c qmldir</div><div class='ctx'> file. The plugin search path can be queried with QDeclarativeEngine::pluginPathList() and modified using QDeclarativeEngine::addPluginPath(). When running the \l {QML Viewer}, use the \c -P option to add paths to the plugin search path.</div><div class='ctx'> </div><div class='add'>+\bold {typeinfo &lt;File&gt;} lines add \l{Writing a qmltypes file}{type description files} to</div><div class='add'>+the module that can be read by QML tools such as Qt Creator to get information about the</div><div class='add'>+types defined by the module's plugins. &lt;File&gt; is the (relative) file name of a .qmltypes</div><div class='add'>+file.</div><div class='add'>+</div><div class='add'>+Without such a file QML tools may be unable to offer features such as code completion</div><div class='add'>+for the types defined in your plugins.</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> \section1 Debugging</div><div class='ctx'> </div><div class='hunk'>@@ -358,5 +367,119 @@ when there are problems with finding and loading modules. See</div><div class='ctx'> \l{Debugging module imports} for more information.</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+\section1 Writing a qmltypes file</div><div class='add'>+</div><div class='add'>+QML modules may refer to one or more type information files in their</div><div class='add'>+\l{Writing a qmldir file}{qmldir} file. These usually have the .qmltypes</div><div class='add'>+extension and are read by external tools to gain information about</div><div class='add'>+types defined in plugins.</div><div class='add'>+</div><div class='add'>+As such qmltypes files have no effect on the functionality of a QML module.</div><div class='add'>+Their only use is to allow tools such as Qt Creator to provide code completion,</div><div class='add'>+error checking and other functionality to users of your module.</div><div class='add'>+</div><div class='add'>+Any module that uses plugins should also ship a type description file.</div><div class='add'>+</div><div class='add'>+The best way to create a qmltypes file for your module is to generate it</div><div class='add'>+using the \c qmlplugindump tool that is provided with Qt.</div><div class='add'>+</div><div class='add'>+Example:</div><div class='add'>+If your module is in \c /tmp/imports/My/Module, you could run</div><div class='add'>+\code</div><div class='add'>+qmlplugindump My.Module 1.0 /tmp/imports &gt; /tmp/imports/My/Module/mymodule.qmltypes</div><div class='add'>+\endcode</div><div class='add'>+to generate type information for your module. Afterwards, add the line</div><div class='add'>+\code</div><div class='add'>+typeinfo mymodule.qmltypes</div><div class='add'>+\endcode</div><div class='add'>+to \c /tmp/imports/My/Module/qmldir to register it.</div><div class='add'>+</div><div class='add'>+While the qmldump tool covers most cases, it does not work if:</div><div class='add'>+\list</div><div class='add'>+\o The plugin uses a \l{QDeclarativeCustomParser}. The component that uses</div><div class='add'>+   the custom parser will not get its members documented.</div><div class='add'>+\o The plugin can not be loaded. In particular if you cross-compiled</div><div class='add'>+   the plugin for a different architecture, qmldump will not be able to</div><div class='add'>+   load it.</div><div class='add'>+\endlist</div><div class='add'>+</div><div class='add'>+In case you have to create a qmltypes file manually or need to adjust</div><div class='add'>+an existing one, this is the file format:</div><div class='add'>+</div><div class='add'>+\qml</div><div class='add'>+import QtQuick.tooling 1.0</div><div class='add'>+</div><div class='add'>+// There always is a single Module object that contains all</div><div class='add'>+// Component objects.</div><div class='add'>+Module {</div><div class='add'>+    // A Component object directly corresponds to a type exported</div><div class='add'>+    // in a plugin with a call to qmlRegisterType.</div><div class='add'>+    Component {</div><div class='add'>+</div><div class='add'>+        // The name is a unique identifier used to refer to this type.</div><div class='add'>+        // It is recommended you simply use the C++ type name.</div><div class='add'>+        name: "QDeclarativeAbstractAnimation"</div><div class='add'>+</div><div class='add'>+        // The name of the prototype Component.</div><div class='add'>+        prototype: "QObject"</div><div class='add'>+</div><div class='add'>+        // The name of the default property.</div><div class='add'>+        defaultProperty: "animations"</div><div class='add'>+</div><div class='add'>+        // The name of the type containing attached properties</div><div class='add'>+        // and methods.</div><div class='add'>+        attachedType: "QDeclarativeAnimationAttached"</div><div class='add'>+</div><div class='add'>+        // The list of exports determines how a type can be imported.</div><div class='add'>+        // Each string has the format "URI/Name version" and matches the</div><div class='add'>+        // arguments to qmlRegisterType. Usually types are only exported</div><div class='add'>+        // once, if at all.</div><div class='add'>+        // If the "URI/" part of the string is missing that means the</div><div class='add'>+        // type should be put into the package defined by the URI the</div><div class='add'>+        // module was imported with.</div><div class='add'>+        // For example if this module was imported with 'import Foo 4.8'</div><div class='add'>+        // the Animation object would be found in the package Foo and</div><div class='add'>+        // QtQuick.</div><div class='add'>+        exports: [</div><div class='add'>+            "Animation 4.7",</div><div class='add'>+            "QtQuick/Animation 1.0"</div><div class='add'>+        ]</div><div class='add'>+</div><div class='add'>+        Property {</div><div class='add'>+            name: "animations";</div><div class='add'>+            type: "QDeclarativeAbstractAnimation"</div><div class='add'>+            // defaults to false, whether this property is read only</div><div class='add'>+            isReadonly: true</div><div class='add'>+            // defaults to false, whether the type of this property was a pointer in C++</div><div class='add'>+            isPointer: true</div><div class='add'>+            // defaults to false: whether the type actually is a QDeclarativeListProperty&lt;type&gt;</div><div class='add'>+            isList: true</div><div class='add'>+        }</div><div class='add'>+        Property { name: "loops"; type: "int" }</div><div class='add'>+        Property { name: "name"; type: "string" }</div><div class='add'>+        Property { name: "loopsEnum"; type: "Loops" }</div><div class='add'>+</div><div class='add'>+        Enum {</div><div class='add'>+            name: "Loops"</div><div class='add'>+            values: {</div><div class='add'>+                "Infinite": -2,</div><div class='add'>+                "OnceOnly": 1</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        // Signal and Method work the same way. The inner Parameter</div><div class='add'>+        // declarations also support the isReadonly, isPointer and isList</div><div class='add'>+        // attributes which mean the same as for Property</div><div class='add'>+        Method { name: "restart" }</div><div class='add'>+        Signal { name: "started" }</div><div class='add'>+        Signal {</div><div class='add'>+            name: "runningChanged"</div><div class='add'>+            Parameter { type: "bool" }</div><div class='add'>+            Parameter { name: "foo"; type: "bool" }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+\endqml</div><div class='add'>+</div><div class='ctx'> */</div><div class='ctx'> /</div><div class='head'>diff --git a/doc/src/development/assistant-manual.qdoc b/doc/src/development/assistant-manual.qdoc<br/>index 8bb37ca..79fb4de 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/development/assistant-manual.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/development/assistant-manual.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/development/assistant-manual.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/development/assistant-manual.qdoc</a></div><div class='hunk'>@@ -640,7 +640,12 @@</div><div class='ctx'>             QDesktopServices::DataLocation. The first form is useful for </div><div class='ctx'>             collections that are used in a "mobile" way, e.g. carried around </div><div class='ctx'>             on a USB stick.</div><div class='del'>-            </div><div class='add'>+        \row</div><div class='add'>+            \o \c{&lt;enableFullTextSearchFallback&gt;}</div><div class='add'>+            \o This tag describes the ability to fallback and use the full text</div><div class='add'>+            search if a keyword can't be found in the index. This functionality</div><div class='add'>+            can be used while remote controlling \QA. To make it available for</div><div class='add'>+            remote control set the tag value to \c{true}.</div><div class='ctx'>     \endtable</div><div class='ctx'> </div><div class='ctx'>     In addition to those \QA specific tags, the tags for generating and registering</div><div class='head'>diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc<br/>index 44e7103..54ed3a1 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/development/qmake-manual.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/development/qmake-manual.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/development/qmake-manual.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/development/qmake-manual.qdoc</a></div><div class='hunk'>@@ -252,8 +252,7 @@</div><div class='ctx'> </div><div class='ctx'>     Normally, variables are used to contain whitespace-separated lists</div><div class='ctx'>     of values. However, it is sometimes necessary to specify values containing</div><div class='del'>-    spaces. These must be quoted by using the</div><div class='del'>-    \l{qmake Function Reference#quote-string}{quote()} function in the following way:</div><div class='add'>+    spaces. These must be quoted by using double quotes:</div><div class='ctx'> </div><div class='ctx'>     \snippet doc/src/snippets/qmake/quoting.pro 0</div><div class='ctx'> </div><div class='hunk'>@@ -261,9 +260,7 @@</div><div class='ctx'>     the variable. A similar approach is used to deal with paths that contain</div><div class='ctx'>     spaces, particularly when defining the</div><div class='ctx'>     \l{qmake Variable Reference#INCLUDEPATH}{INCLUDEPATH} and</div><div class='del'>-    \l{qmake Variable Reference#LIBS}{LIBS} variables for the Windows platform.</div><div class='del'>-    In cases like these, the \l{qmake Function Reference#quote(string)}{quote()}</div><div class='del'>-    function can be used in the following way:</div><div class='add'>+    \l{qmake Variable Reference#LIBS}{LIBS} variables for the Windows platform:</div><div class='ctx'> </div><div class='ctx'>     \snippet doc/src/snippets/qmake/spaces.pro quoting include paths with spaces</div><div class='ctx'> </div><div class='hunk'>@@ -1123,6 +1120,44 @@</div><div class='ctx'> </div><div class='ctx'>     \tableofcontents{3}</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+    \target BACKUP_REGISTRATION_FILE_MAEMO</div><div class='add'>+    \section1 BACKUP_REGISTRATION_FILE_MAEMO</div><div class='add'>+</div><div class='add'>+    \e {This is only used on the Maemo platform.}</div><div class='add'>+</div><div class='add'>+    This variable is used to specify the backup registration file to use with</div><div class='add'>+    \c enable_backup \c CONFIG value for Maemo platform. The default value is:</div><div class='add'>+    \c{$$_PRO_FILE_PWD_/backup_registration/maemo/$$basename(TARGET).conf}.</div><div class='add'>+</div><div class='add'>+    Unfortunately it is not possible to have a common registration file for Maemo like there is</div><div class='add'>+    for Symbian, so the developer must always provide one if the platform default backup support is</div><div class='add'>+    not sufficient.</div><div class='add'>+</div><div class='add'>+    For documentation about how to create backup registration files and how the device</div><div class='add'>+    backup works in general, see:</div><div class='add'>+    (\l{http://wiki.maemo.org/Documentation/Maemo_5_Developer_Guide/Generic_Platform_Components/Using_Backup_Application}{Using Backup Application})</div><div class='add'>+</div><div class='add'>+    \target BACKUP_REGISTRATION_FILE_SYMBIAN</div><div class='add'>+    \section1 BACKUP_REGISTRATION_FILE_SYMBIAN</div><div class='add'>+</div><div class='add'>+    \e {This is only used on the Symbian platform.}</div><div class='add'>+</div><div class='add'>+    This variable is used to specify the backup registration file to use with</div><div class='add'>+    \c enable_backup \c CONFIG value for Symbian platform. The default value is</div><div class='add'>+    determined as follows:</div><div class='add'>+</div><div class='add'>+    If a custom registration file \c{$$_PRO_FILE_PWD_/backup_registration/symbian/backup_registration.xml}</div><div class='add'>+    exists, it is used. Otherwise, the common registration file \c{$$[QT_INSTALL_DATA]/mkspecs/common/symbian/backup_registration.xml}</div><div class='add'>+    is used. This common registration file will define backing up of application binaries,</div><div class='add'>+    resources, and all files under application private directory. Also note that \c{C:/Data}</div><div class='add'>+    contents are backed up by default on Symbian devices, so no registration is needed for any</div><div class='add'>+    files found there.</div><div class='add'>+</div><div class='add'>+    For documentation about how to create backup registration files and how the device</div><div class='add'>+    backup works in general, see:</div><div class='add'>+    (\l{http://library.forum.nokia.com/index.jsp?topic=/S60_5th_Edition_Cpp_Developers_Library/GUID-35228542-8C95-4849-A73F-2B4F082F0C44/sdk/doc_source/guide/Connectivity-subsystem-guide/Connectivity/PC_Connectivity_How-To_Write_Backup_Aware_Software.html}{How-To Write Backup-aware Software})</div><div class='add'>+</div><div class='ctx'>     \target BLD_INF_RULES</div><div class='ctx'>     \section1 BLD_INF_RULES</div><div class='ctx'> </div><div class='hunk'>@@ -1344,6 +1379,17 @@</div><div class='ctx'>          so some \c{.ts} files may be ignored by qmake.</div><div class='ctx'>     \endtable</div><div class='ctx'> </div><div class='add'>+    These options only have an effect on Symbian and Maemo platforms:</div><div class='add'>+</div><div class='add'>+    \table 95%</div><div class='add'>+    \header \o Option \o Description</div><div class='add'>+    \row \o enable_backup \o Generates deployment for backup registration file</div><div class='add'>+         to enable backing up the application during device backup.</div><div class='add'>+         See \l{#BACKUP_REGISTRATION_FILE_MAEMO}{BACKUP_REGISTRATION_FILE_MAEMO}</div><div class='add'>+         and \l{#BACKUP_REGISTRATION_FILE_SYMBIAN}{BACKUP_REGISTRATION_FILE_SYMBIAN}</div><div class='add'>+         for more information about backup.</div><div class='add'>+    \endtable</div><div class='add'>+</div><div class='ctx'>     These options have an effect on Linux/Unix platforms:</div><div class='ctx'> </div><div class='ctx'>     \table 95%</div><div class='hunk'>@@ -1699,9 +1745,7 @@</div><div class='ctx'> </div><div class='ctx'>     To specify a path containing spaces, quote the path using the technique</div><div class='ctx'>     mentioned in the \l{qmake Project Files#Whitespace}{qmake Project Files}</div><div class='del'>-    document. For example, paths with spaces can be specified on Windows</div><div class='del'>-    and Unix platforms by using the \l{qmake Function Reference#quote-string}{quote()}</div><div class='del'>-    function in the following way:</div><div class='add'>+    document.</div><div class='ctx'> </div><div class='ctx'>     \snippet doc/src/snippets/qmake/spaces.pro quoting include paths with spaces</div><div class='ctx'> </div><div class='hunk'>@@ -1764,9 +1808,7 @@</div><div class='ctx'> </div><div class='ctx'>     To specify a path containing spaces, quote the path using the technique</div><div class='ctx'>     mentioned in the \l{qmake Project Files#Whitespace}{qmake Project Files}</div><div class='del'>-    document. For example, paths with spaces can be specified on Windows</div><div class='del'>-    and Unix platforms by using the \l{qmake Function Reference#quote-string}{quote()}</div><div class='del'>-    function in the following way:</div><div class='add'>+    document.</div><div class='ctx'> </div><div class='ctx'>     \snippet doc/src/snippets/qmake/spaces.pro quoting library paths with spaces</div><div class='ctx'> </div><div class='hunk'>@@ -1944,8 +1986,17 @@</div><div class='ctx'>     \target PWD</div><div class='ctx'>     \section1 PWD</div><div class='ctx'> </div><div class='del'>-    This variable contains the full path leading to the directory where</div><div class='del'>-    the \l{qmake Manual#qmake}{\c qmake} project file (project.pro) is located.</div><div class='add'>+    The \c PWD variable specifies the full path leading to the directory</div><div class='add'>+    containing the current file being parsed. This can be useful</div><div class='add'>+    to refer to files within the source tree when writing project files to</div><div class='add'>+    support shadow builds.</div><div class='add'>+</div><div class='add'>+    See also \l{#_PRO_FILE_PWD_}{_PRO_FILE_PWD_}.</div><div class='add'>+</div><div class='add'>+    \note IN_PWD is an alias for PWD.</div><div class='add'>+</div><div class='add'>+    \note Function calls have no effect on the value of PWD. PWD will refer to</div><div class='add'>+    the path of the calling file.</div><div class='ctx'> </div><div class='ctx'>     \target OUT_PWD</div><div class='ctx'>     \section1 OUT_PWD</div><div class='hunk'>@@ -2788,6 +2839,13 @@</div><div class='ctx'>     \l{qmake Manual#qmake}{\c qmake} or \l{#QMAKESPEC}{qmake.conf} and rarely</div><div class='ctx'>     needs to be modified.</div><div class='ctx'> </div><div class='add'>+    \section1 QMAKE_LN_SHLIB</div><div class='add'>+</div><div class='add'>+    This variable contains the command to execute when creating a link</div><div class='add'>+    to a shared library. The</div><div class='add'>+    value of this variable is typically handled by \c qmake or</div><div class='add'>+     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.</div><div class='add'>+</div><div class='ctx'>     \section1 QMAKE_POST_LINK</div><div class='ctx'> </div><div class='ctx'>     This variable contains the command to execute after linking the TARGET</div><div class='hunk'>@@ -2802,12 +2860,14 @@</div><div class='ctx'>     executed, additionally some backends will not support this - mostly only</div><div class='ctx'>     Makefile backends.</div><div class='ctx'> </div><div class='del'>-    \section1 QMAKE_LN_SHLIB</div><div class='add'>+    \section1 QMAKE_PROJECT_NAME</div><div class='ctx'> </div><div class='del'>-    This variable contains the command to execute when creating a link to a</div><div class='del'>-    shared library. The value of this variable is typically handled by</div><div class='del'>-    \l{qmake Manual#qmake}{\c qmake} or \l{#QMAKESPEC}{qmake.conf} and rarely</div><div class='del'>-    needs to be modified.</div><div class='add'>+    \e {This is used for Visual Studio project files only.}</div><div class='add'>+</div><div class='add'>+    This variable determines the name of the project when generating project</div><div class='add'>+    files for IDEs. The default value is the target name. The value of this</div><div class='add'>+    variable is typically handled by \l {qmake Manual#qmake}{ \c qmake} and</div><div class='add'>+    rarely needs to be modified.</div><div class='ctx'> </div><div class='ctx'>     \section1 QMAKE_MAC_SDK</div><div class='ctx'> </div><div class='hunk'>@@ -3488,6 +3548,19 @@</div><div class='ctx'> </div><div class='ctx'>     \tableofcontents{2}</div><div class='ctx'> </div><div class='add'>+    \section1 packagesExist(packages)</div><div class='add'>+</div><div class='add'>+    Uses the PKGCONFIG mechanism to determine whether or not the given packages</div><div class='add'>+    exist at the time of project parsing.</div><div class='add'>+</div><div class='add'>+    This can be useful to optionally enable or disable features. For example:</div><div class='add'>+</div><div class='add'>+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 157</div><div class='add'>+</div><div class='add'>+    And then, in the code:</div><div class='add'>+</div><div class='add'>+    \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 158</div><div class='add'>+</div><div class='ctx'>     \section1 basename(variablename)</div><div class='ctx'> </div><div class='ctx'>     Returns the basename of the file specified. For example:</div><div class='hunk'>@@ -3682,10 +3755,7 @@</div><div class='ctx'>     \section1 quote(string)</div><div class='ctx'> </div><div class='ctx'>     Converts a whole \e string into a single entity and returns the result.</div><div class='del'>-    Newlines, carriage returns, and tabs can be specified in the string</div><div class='del'>-    with \\n \\r and \\t. The return value does not contain either single</div><div class='del'>-    or double quotation marks unless you explicitly include them yourself,</div><div class='del'>-    but will be placed into a single entry (for literal expansion).</div><div class='add'>+    This is just a fancy way of enclosing the string into double quotes.</div><div class='ctx'> </div><div class='ctx'>     \section1 replace(string, old_string, new_string)</div><div class='ctx'> </div><div class='head'>diff --git a/doc/src/examples/customtype.qdoc b/doc/src/examples/customtype.qdoc<br/>index d98225a..b969354 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/examples/customtype.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/examples/customtype.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/examples/customtype.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/examples/customtype.qdoc</a></div><div class='hunk'>@@ -117,7 +117,7 @@</div><div class='ctx'> </div><div class='ctx'>     \snippet examples/tools/customtype/main.cpp storing a custom value</div><div class='ctx'> </div><div class='del'>-    Alternatively, the qVariantFromValue() and qVariantSetValue() functions</div><div class='add'>+    Alternatively, the QVariant::fromValue() and qVariantSetValue() functions</div><div class='ctx'>     can be used if you are using a compiler without support for member template</div><div class='ctx'>     functions.</div><div class='ctx'> </div><div class='head'>diff --git a/doc/src/examples/multicastreceiver.qdoc b/doc/src/examples/multicastreceiver.qdoc<br/>new file mode 100644<br/>index 0000000..1a0f3b5<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/examples/multicastreceiver.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/examples/multicastreceiver.qdoc</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the documentation of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:FDL$</div><div class='add'>+** GNU Free Documentation License</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU Free</div><div class='add'>+** Documentation License version 1.3 as published by the Free Software</div><div class='add'>+** Foundation and appearing in the file included in the packaging of</div><div class='add'>+** this file.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms</div><div class='add'>+** and conditions contained in a signed written agreement between you</div><div class='add'>+** and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \example network/multicastreceiver</div><div class='add'>+    \title Multicast Receiver Example</div><div class='add'>+</div><div class='add'>+    The Multicast Receiever example shows how to receive information that is</div><div class='add'>+    sent to a multicast group.</div><div class='add'>+</div><div class='add'>+    \image multicastreceiver-example.png</div><div class='add'>+*/</div><div class='head'>diff --git a/doc/src/examples/multicastsender.qdoc b/doc/src/examples/multicastsender.qdoc<br/>new file mode 100644<br/>index 0000000..55b3804<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/examples/multicastsender.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/examples/multicastsender.qdoc</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the documentation of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:FDL$</div><div class='add'>+** GNU Free Documentation License</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU Free</div><div class='add'>+** Documentation License version 1.3 as published by the Free Software</div><div class='add'>+** Foundation and appearing in the file included in the packaging of</div><div class='add'>+** this file.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms</div><div class='add'>+** and conditions contained in a signed written agreement between you</div><div class='add'>+** and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \example network/multicastsender</div><div class='add'>+    \title Multicast Sender Example</div><div class='add'>+</div><div class='add'>+    The Multicast Sender example shows how to send information to multiple</div><div class='add'>+    clients in a multicast group.</div><div class='add'>+</div><div class='add'>+    \image multicastsender-example.png</div><div class='add'>+*/</div><div class='head'>diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc<br/>index eb86476..1965df5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/frameworks-technologies/model-view-programming.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/frameworks-technologies/model-view-programming.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/frameworks-technologies/model-view-programming.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/frameworks-technologies/model-view-programming.qdoc</a></div><div class='hunk'>@@ -1934,6 +1934,13 @@</div><div class='ctx'>     \l{QSortFilterProxyModel::lessThan()}{lessThan()} function to perform custom</div><div class='ctx'>     comparisons.</div><div class='ctx'> </div><div class='add'>+    \section3 Custom data models</div><div class='add'>+</div><div class='add'>+    QIdentityProxyModel instances do not sort or filter the structure of the source model,</div><div class='add'>+    but provide a base class for creating a data proxy. This could be useful on top of a</div><div class='add'>+    QFileSystemModel for example to provide different colours for the BackgroundRole for</div><div class='add'>+    different types of files.</div><div class='add'>+</div><div class='ctx'>     \section1 Model subclassing reference</div><div class='ctx'> </div><div class='ctx'>     Model subclasses need to provide implementations of many of the virtual functions</div><div class='head'>diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc<br/>index 699900c..df53d02 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/getting-started/examples.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/getting-started/examples.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/getting-started/examples.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/getting-started/examples.qdoc</a></div><div class='hunk'>@@ -481,6 +481,8 @@</div><div class='ctx'>     \o  \l{network/bearercloud}{Bearer Cloud}\raisedaster</div><div class='ctx'>     \o  \l{network/bearermonitor}{Bearer Monitor}</div><div class='ctx'>     \o  \l{network/securesocketclient}{Secure Socket Client}</div><div class='add'>+    \o  \l{network/multicastreceiver}{Multicast Receiver}</div><div class='add'>+    \o  \l{network/multicastsender}{Multicast Sender}</div><div class='ctx'>     \endlist</div><div class='ctx'> </div><div class='ctx'>     Examples marked with an asterisk (*) are fully documented.</div><div class='head'>diff --git a/doc/src/images/multicastreceiver-example.png b/doc/src/images/multicastreceiver-example.png<br/>new file mode 100644<br/>index 0000000..8de11cd<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/images/multicastreceiver-example.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/images/multicastreceiver-example.png</a></div>Binary files differ<div class='head'>diff --git a/doc/src/images/multicastsender-example.png b/doc/src/images/multicastsender-example.png<br/>new file mode 100644<br/>index 0000000..a619b04<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/images/multicastsender-example.png?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/images/multicastsender-example.png</a></div>Binary files differ<div class='head'>diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc<br/>index 981ad39..ac1bc9d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/legal/3rdparty.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/legal/3rdparty.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/legal/3rdparty.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/legal/3rdparty.qdoc</a></div><div class='hunk'>@@ -45,6 +45,10 @@</div><div class='ctx'>     Run \c{configure -help} to see any options that may be available for</div><div class='ctx'>     controlling the use of these libraries.</div><div class='ctx'> </div><div class='add'>+    Modifications, if any, done to the third-party libraries can</div><div class='add'>+    normally be found by reviewing the change history of the</div><div class='add'>+    corresponding files in the public Qt repository.</div><div class='add'>+</div><div class='ctx'>     \tableofcontents</div><div class='ctx'> </div><div class='ctx'>     \section1 DES (\c des.cpp)</div><div class='hunk'>@@ -126,7 +130,7 @@</div><div class='ctx'> </div><div class='ctx'>     See \c src/3rdparty/harfbuzz/COPYING for license details.</div><div class='ctx'> </div><div class='del'>-    \section1 The Independent JPEG Group's JPEG Software (\c libjpeg) version 8</div><div class='add'>+    \section1 The Independent JPEG Group's JPEG Software (\c libjpeg) version 8c</div><div class='ctx'> </div><div class='ctx'>     \e{This package contains C software to implement JPEG image compression and</div><div class='ctx'>     decompression.  JPEG (pronounced "jay-peg") is a standardized compression</div><div class='hunk'>@@ -142,6 +146,49 @@</div><div class='ctx'> </div><div class='ctx'>     \hr</div><div class='ctx'> </div><div class='add'>+    The authors make NO WARRANTY or representation, either express or implied,</div><div class='add'>+    with respect to this software, its quality, accuracy, merchantability, or</div><div class='add'>+    fitness for a particular purpose.  This software is provided "AS IS", and you,</div><div class='add'>+    its user, assume the entire risk as to its quality and accuracy.</div><div class='add'>+    </div><div class='add'>+    This software is copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding.</div><div class='add'>+    All Rights Reserved except as specified below.</div><div class='add'>+    </div><div class='add'>+    Permission is hereby granted to use, copy, modify, and distribute this</div><div class='add'>+    software (or portions thereof) for any purpose, without fee, subject to these</div><div class='add'>+    conditions:\br</div><div class='add'>+    (1) If any part of the source code for this software is distributed, then this</div><div class='add'>+    README file must be included, with this copyright and no-warranty notice</div><div class='add'>+    unaltered; and any additions, deletions, or changes to the original files</div><div class='add'>+    must be clearly indicated in accompanying documentation.\br</div><div class='add'>+    (2) If only executable code is distributed, then the accompanying</div><div class='add'>+    documentation must state that "this software is based in part on the work of</div><div class='add'>+    the Independent JPEG Group".\br</div><div class='add'>+    (3) Permission for use of this software is granted only if the user accepts</div><div class='add'>+    full responsibility for any undesirable consequences; the authors accept</div><div class='add'>+    NO LIABILITY for damages of any kind.</div><div class='add'>+    </div><div class='add'>+    These conditions apply to any software derived from or based on the IJG code,</div><div class='add'>+    not just to the unmodified library.  If you use our work, you ought to</div><div class='add'>+    acknowledge us.</div><div class='add'>+    </div><div class='add'>+    Permission is NOT granted for the use of any IJG author's name or company name</div><div class='add'>+    in advertising or publicity relating to this software or products derived from</div><div class='add'>+    it.  This software may be referred to only as "the Independent JPEG Group's</div><div class='add'>+    software".</div><div class='add'>+    </div><div class='add'>+    We specifically permit and encourage the use of this software as the basis of</div><div class='add'>+    commercial products, provided that all warranty or liability claims are</div><div class='add'>+    assumed by the product vendor.</div><div class='add'>+    </div><div class='add'>+    \hr</div><div class='add'>+</div><div class='add'>+    The Graphics Interchange Format(c) is the Copyright property of</div><div class='add'>+    CompuServe Incorporated.  GIF(sm) is a Service Mark property of</div><div class='add'>+    CompuServe Incorporated.</div><div class='add'>+</div><div class='add'>+    \hr</div><div class='add'>+</div><div class='ctx'>     See \c src/3rdparty/libjpeg/README for license details.</div><div class='ctx'> </div><div class='ctx'>     \section1 MD4 (\c md4.cpp and \c md4.h)</div><div class='hunk'>@@ -178,51 +225,99 @@</div><div class='ctx'> </div><div class='ctx'>     See \c src/3rdparty/libmng/LICENSE for license details.</div><div class='ctx'> </div><div class='del'>-    \section1 PNG Reference Library (\c libpng) version 1.4.0</div><div class='add'>+    \section1 PNG Reference Library (\c libpng) version 1.5.1</div><div class='ctx'> </div><div class='ctx'>     \e{Libpng was written as a companion to the PNG specification, as a way</div><div class='ctx'>     of reducing the amount of time and effort it takes to support the PNG</div><div class='ctx'>     file format in application programs.} -- quoted from \c</div><div class='del'>-    src/3rdparty/libpng/libpng.txt.</div><div class='add'>+    src/3rdparty/libpng/libpng-manual.txt.</div><div class='ctx'> </div><div class='ctx'>     \hr</div><div class='ctx'> </div><div class='del'>-    copyright (C) 1999 by Willem van Schaik &lt;willem@schaik.com&gt;</div><div class='del'>-</div><div class='del'>-    version 1.0 - 1999.10.15 - First version.</div><div class='del'>-</div><div class='del'>-    Permission to use, copy, modify, and distribute this software and</div><div class='del'>-    its documentation for any purpose and without fee is hereby granted,</div><div class='del'>-    provided that the above copyright notice appear in all copies and</div><div class='del'>-    that both that copyright notice and this permission notice appear in</div><div class='del'>-    supporting documentation. This software is provided "as is" without</div><div class='del'>-    express or implied warranty.</div><div class='del'>-</div><div class='del'>-    \hr</div><div class='del'>-</div><div class='del'>-    Copyright (c) 1998-2001 Greg Roelofs.  All rights reserved.</div><div class='del'>-</div><div class='del'>-    This software is provided "as is," without warranty of any kind,</div><div class='del'>-    express or implied.  In no event shall the author or contributors</div><div class='del'>-    be held liable for any damages arising in any way from the use of</div><div class='del'>-    this software.</div><div class='del'>-</div><div class='del'>-    Permission is granted to anyone to use this software for any purpose,</div><div class='del'>-    including commercial applications, and to alter it and redistribute</div><div class='del'>-    it freely, subject to the following restrictions:</div><div class='del'>-</div><div class='del'>-    1. Redistributions of source code must retain the above copyright</div><div class='del'>-       notice, disclaimer, and this list of conditions.</div><div class='del'>-    2. Redistributions in binary form must reproduce the above copyright</div><div class='del'>-       notice, disclaimer, and this list of conditions in the documenta-</div><div class='del'>-       tion and/or other materials provided with the distribution.</div><div class='del'>-    3. All advertising materials mentioning features or use of this</div><div class='del'>-       software must display the following acknowledgment:</div><div class='del'>-</div><div class='del'>-          This product includes software developed by Greg Roelofs</div><div class='del'>-          and contributors for the book, "PNG: The Definitive Guide,"</div><div class='del'>-          published by O'Reilly and Associates.</div><div class='del'>-</div><div class='add'>+    libpng versions 1.2.6, August 15, 2004, through 1.5.1, February 3, 2011, are</div><div class='add'>+    Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are</div><div class='add'>+    distributed according to the same disclaimer and license as libpng-1.2.5</div><div class='add'>+    with the following individual added to the list of Contributing Authors</div><div class='add'>+    </div><div class='add'>+       Cosmin Truta</div><div class='add'>+    </div><div class='add'>+    libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are</div><div class='add'>+    Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are</div><div class='add'>+    distributed according to the same disclaimer and license as libpng-1.0.6</div><div class='add'>+    with the following individuals added to the list of Contributing Authors</div><div class='add'>+    </div><div class='add'>+       Simon-Pierre Cadieux\br</div><div class='add'>+       Eric S. Raymond\br</div><div class='add'>+       Gilles Vollant</div><div class='add'>+    </div><div class='add'>+    and with the following additions to the disclaimer:</div><div class='add'>+    </div><div class='add'>+       There is no warranty against interference with your enjoyment of the</div><div class='add'>+       library or against infringement.  There is no warranty that our</div><div class='add'>+       efforts or the library will fulfill any of your particular purposes</div><div class='add'>+       or needs.  This library is provided with all faults, and the entire</div><div class='add'>+       risk of satisfactory quality, performance, accuracy, and effort is with</div><div class='add'>+       the user.</div><div class='add'>+    </div><div class='add'>+    libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are</div><div class='add'>+    Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are</div><div class='add'>+    distributed according to the same disclaimer and license as libpng-0.96,</div><div class='add'>+    with the following individuals added to the list of Contributing Authors:</div><div class='add'>+    </div><div class='add'>+       Tom Lane\br</div><div class='add'>+       Glenn Randers-Pehrson\br</div><div class='add'>+       Willem van Schaik</div><div class='add'>+    </div><div class='add'>+    libpng versions 0.89, June 1996, through 0.96, May 1997, are</div><div class='add'>+    Copyright (c) 1996, 1997 Andreas Dilger</div><div class='add'>+    Distributed according to the same disclaimer and license as libpng-0.88,</div><div class='add'>+    with the following individuals added to the list of Contributing Authors:</div><div class='add'>+    </div><div class='add'>+       John Bowler\br</div><div class='add'>+       Kevin Bracey\br</div><div class='add'>+       Sam Bushell\br</div><div class='add'>+       Magnus Holmgren\br</div><div class='add'>+       Greg Roelofs\br</div><div class='add'>+       Tom Tanner</div><div class='add'>+    </div><div class='add'>+    libpng versions 0.5, May 1995, through 0.88, January 1996, are</div><div class='add'>+    Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.</div><div class='add'>+    </div><div class='add'>+    For the purposes of this copyright and license, "Contributing Authors"</div><div class='add'>+    is defined as the following set of individuals:</div><div class='add'>+    </div><div class='add'>+       Andreas Dilger\br</div><div class='add'>+       Dave Martindale\br</div><div class='add'>+       Guy Eric Schalnat\br</div><div class='add'>+       Paul Schmidt\br</div><div class='add'>+       Tim Wegner</div><div class='add'>+    </div><div class='add'>+    The PNG Reference Library is supplied "AS IS".  The Contributing Authors</div><div class='add'>+    and Group 42, Inc. disclaim all warranties, expressed or implied,</div><div class='add'>+    including, without limitation, the warranties of merchantability and of</div><div class='add'>+    fitness for any purpose.  The Contributing Authors and Group 42, Inc.</div><div class='add'>+    assume no liability for direct, indirect, incidental, special, exemplary,</div><div class='add'>+    or consequential damages, which may result from the use of the PNG</div><div class='add'>+    Reference Library, even if advised of the possibility of such damage.</div><div class='add'>+    </div><div class='add'>+    Permission is hereby granted to use, copy, modify, and distribute this</div><div class='add'>+    source code, or portions hereof, for any purpose, without fee, subject</div><div class='add'>+    to the following restrictions:</div><div class='add'>+    </div><div class='add'>+    1. The origin of this source code must not be misrepresented.</div><div class='add'>+    </div><div class='add'>+    2. Altered versions must be plainly marked as such and must not</div><div class='add'>+       be misrepresented as being the original source.</div><div class='add'>+    </div><div class='add'>+    3. This Copyright notice may not be removed or altered from any</div><div class='add'>+       source or altered source distribution.</div><div class='add'>+    </div><div class='add'>+    The Contributing Authors and Group 42, Inc. specifically permit, without</div><div class='add'>+    fee, and encourage the use of this source code as a component to</div><div class='add'>+    supporting the PNG file format in commercial products.  If you use this</div><div class='add'>+    source code in a product, acknowledgment is not required but would be</div><div class='add'>+    appreciated.</div><div class='add'>+    </div><div class='ctx'>     \hr</div><div class='ctx'> </div><div class='ctx'>     See \c src/3rdparty/libpng/LICENSE for license details.</div><div class='hunk'>@@ -277,7 +372,7 @@</div><div class='ctx'>     \l{http://www.sqlite.org/copyright.html}{SQLite Copyright} page on the</div><div class='ctx'>     SQLite web site for further information.</div><div class='ctx'> </div><div class='del'>-    \section1 TIFF Software Distribution (\c libtiff) version 3.8.2</div><div class='add'>+    \section1 TIFF Software Distribution (\c libtiff) version 3.9.2</div><div class='ctx'> </div><div class='ctx'>     \e {libtiff is a set of C functions (a library) that support the</div><div class='ctx'>     manipulation of TIFF image files.} -- quoted from \c</div><div class='hunk'>@@ -406,13 +501,35 @@</div><div class='ctx'> </div><div class='ctx'>     See \c src/3rdparty/wintab/wintab.h for license details.</div><div class='ctx'> </div><div class='del'>-    \section1 Data Compression Library (\c zlib) version 1.2.3</div><div class='add'>+    \section1 Data Compression Library (\c zlib) version 1.2.5</div><div class='ctx'> </div><div class='ctx'>     \e{zlib is a general purpose data compression library.  All the code</div><div class='ctx'>     is thread safe.  The data format used by the zlib library is described</div><div class='ctx'>     by RFCs (Request for Comments) 1950 to 1952} -- quoted from \c</div><div class='ctx'>     src/3rdparty/zlib/README.</div><div class='ctx'> </div><div class='add'>+    \hr</div><div class='add'>+    </div><div class='add'>+    Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler</div><div class='add'>+  </div><div class='add'>+    This software is provided 'as-is', without any express or implied</div><div class='add'>+    warranty.  In no event will the authors be held liable for any damages</div><div class='add'>+    arising from the use of this software.</div><div class='add'>+  </div><div class='add'>+    Permission is granted to anyone to use this software for any purpose,</div><div class='add'>+    including commercial applications, and to alter it and redistribute it</div><div class='add'>+    freely, subject to the following restrictions:</div><div class='add'>+  </div><div class='add'>+    1. The origin of this software must not be misrepresented; you must not</div><div class='add'>+       claim that you wrote the original software. If you use this software</div><div class='add'>+       in a product, an acknowledgment in the product documentation would be</div><div class='add'>+       appreciated but is not required.\br</div><div class='add'>+    2. Altered source versions must be plainly marked as such, and must not be</div><div class='add'>+       misrepresented as being the original software.\br</div><div class='add'>+    3. This notice may not be removed or altered from any source distribution.</div><div class='add'>+</div><div class='add'>+    \hr</div><div class='add'>+</div><div class='ctx'>     See \c src/3rdparty/zlib/README for license details.</div><div class='ctx'> </div><div class='ctx'>     \section1 JavaScriptCore</div><div class='head'>diff --git a/doc/src/network-programming/qtnetwork.qdoc b/doc/src/network-programming/qtnetwork.qdoc<br/>index a5013e1..93ba248 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/network-programming/qtnetwork.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/network-programming/qtnetwork.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/network-programming/qtnetwork.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/network-programming/qtnetwork.qdoc</a></div><div class='hunk'>@@ -257,8 +257,13 @@</div><div class='ctx'>     QUdpSocket::readDatagram() to read the datagram.</div><div class='ctx'> </div><div class='ctx'>     The \l{network/broadcastsender}{Broadcast Sender} and</div><div class='del'>-    \l{network/broadcastreceiver}{Broadcast Receiver} examples show</div><div class='del'>-    how to write a UDP sender and a UDP receiver using Qt.</div><div class='add'>+    \l{network/broadcastreceiver}{Broadcast Receiver} examples show how to</div><div class='add'>+    write a UDP sender and a UDP receiver using Qt.</div><div class='add'>+</div><div class='add'>+    QUdpSocket also supports multicasting. The</div><div class='add'>+    \l{network/multicastsender}{Multicast Sender} and</div><div class='add'>+    \l{network/multicastreceiver}{Multicast Receiver} examples show how to use</div><div class='add'>+    write UDP multicast clients.</div><div class='ctx'> </div><div class='ctx'>     \section1 Resolving Host Names using QHostInfo</div><div class='ctx'> </div><div class='head'>diff --git a/doc/src/platforms/platform-notes-rtos.qdoc b/doc/src/platforms/platform-notes-rtos.qdoc<br/>index 9a37646..62d5add 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/platforms/platform-notes-rtos.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/platforms/platform-notes-rtos.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/platforms/platform-notes-rtos.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/platforms/platform-notes-rtos.qdoc</a></div><div class='hunk'>@@ -245,3 +245,112 @@</div><div class='ctx'>     some regressions were spotted in QDateTime computation around year 0 and year 1970,</div><div class='ctx'>     which have been tracked back to faulty time zone data on some QNX versions.</div><div class='ctx'> */</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \page platform-notes-integrity.html</div><div class='add'>+    \title Platform Notes - INTEGRITY</div><div class='add'>+    \contentspage Platform Notes</div><div class='add'>+    \target INTEGRITY</div><div class='add'>+</div><div class='add'>+    \note INTEGRITY is a community supported platform. See the</div><div class='add'>+    \l{Supported Platforms} page for more information.</div><div class='add'>+</div><div class='add'>+    This page contains information about the Qt for INTEGRITY port. More</div><div class='add'>+    information about the combinations of platforms and compilers supported</div><div class='add'>+    by Qt can be found on the \l{Supported Platforms} page.</div><div class='add'>+</div><div class='add'>+    Note that Qt for INTEGRITY is currently based on \l{Qt for Embedded Linux},</div><div class='add'>+    which contains its own windowing system.</div><div class='add'>+</div><div class='add'>+    Qt for INTEGRITY contains experimental screen and input drivers based on the</div><div class='add'>+    gh_FB Framebuffer API for graphics, a Connection-based mouse and keyboard</div><div class='add'>+    support. For information about these drivers, please refer to Green Hills</div><div class='add'>+    Software standard support.</div><div class='add'>+</div><div class='add'>+    \tableofcontents</div><div class='add'>+</div><div class='add'>+    \section1 Supported Versions</div><div class='add'>+</div><div class='add'>+    Qt has been tested on INTEGRITY 10 on various PowerPC, ARM and x86 targets.</div><div class='add'>+    On some platforms a native graphics FrameBuffer driver is available and has</div><div class='add'>+    then been used for testing. On all other platforms, the default FrameBuffer</div><div class='add'>+    VNC driver is used.</div><div class='add'>+</div><div class='add'>+    \section1 Limitations</div><div class='add'>+</div><div class='add'>+    Some of Qt's functionality is currently not available on INTEGRITY:</div><div class='add'>+</div><div class='add'>+    \table</div><div class='add'>+    \header \o Function \o Notes</div><div class='add'>+    \row \o QProcess</div><div class='add'>+         \o Not implemented. Volunteers welcome.</div><div class='add'>+    \row \o QSharedMemory</div><div class='add'>+         \o Not available - INTEGRITY doesn't support SYSV style shared memory.</div><div class='add'>+    \row \o QSystemSemaphore</div><div class='add'>+         \o Not available - INTEGRITY doesn't support SYSV style system semaphores.</div><div class='add'>+    \row \o QWS Multi Process</div><div class='add'>+         \o QT_NO_QWS_MULTIPROCESS is always on due to missing shared memory support.</div><div class='add'>+    \row \o Phonon</div><div class='add'>+         \o There is no standard audio backend.</div><div class='add'>+    \row \o Qt3Support</div><div class='add'>+         \o The Qt3Support library is not available on INTEGRITY.</div><div class='add'>+    \row \o QtScript</div><div class='add'>+         \o Not available - INTEGRITY's mmap() doesn't support allocating memory.</div><div class='add'>+    \endtable</div><div class='add'>+</div><div class='add'>+    \section1 Build Instructions</div><div class='add'>+</div><div class='add'>+    Qt for INTEGRITY can be built on either a Linux or Windows (with cygwin) host.</div><div class='add'>+    In both cases, a standard installation of INTEGRITY is required, with the</div><div class='add'>+    addition of the FrameBuffer API.</div><div class='add'>+</div><div class='add'>+    Example configure line for cross-compiling Qt for INTEGRITY for an</div><div class='add'>+    ARM INTEGRITY target:</div><div class='add'>+</div><div class='add'>+    \code</div><div class='add'>+    ./configure --hostprefix=$PWD -embedded integrity -xplatform unsupported/qws/integrity-arm-cxarm -static -qt-kbd-integrity -qt-mouse-integrity -no-mouse-linuxtp -no-mouse-pc -no-kbd-tty -qt-gfx-integrityfb -no-qt3support -no-gfx-linuxfb -no-glib -no-openssl -no-largefile -little-endian -arch integrity -prefix / -opensource -no-feature-QWS_MULTIPROCESS -no-feature-SHAREDMEMORY -no-feature-PROCESS -no-feature-SYSTEMSEMAPHORE -no-feature-PRINTER -no-feature-QWS_QPF2 -no-scripttools</div><div class='add'>+    \endcode</div><div class='add'>+</div><div class='add'>+    \list</div><div class='add'>+    \o \c{--hostprefix=$PWD} - specifies the current directory as the base source for Qt</div><div class='add'>+    \o \c{-arch integrity} - sets the architecture to INTEGRITY (for atomic operations)</div><div class='add'>+    \o \c{-embedded integrity} - builds the embedded version of Qt and sets the architecture to INTEGRITY</div><div class='add'>+    \o \c{-xplatform unsupported/qws/integrity-arm-cxarm} - selects the arm-cxarm mkspec for INTEGRITY</div><div class='add'>+    \o \c{-static} - specifies a static build of Qt</div><div class='add'>+    \o \c{-no-gfx-linuxfb},  \c{-no-mouse-linuxtp}, \c{-no-mouse-pc} and \c{-no-kbd-tty} are Linux specific and won't work on INTEGRITY</div><div class='add'>+    \o \c{-no-qt3support} - required since the Qt3 support classes are not supported on INTEGRITY</div><div class='add'>+    \o \c{-no-exceptions} - reduces the size of the library by disabling exception support</div><div class='add'>+    \o \c{-no-openssl} - disable support for OpenSSL</div><div class='add'>+    \o \c{-no-glib} - disable support for unavailable Glib</div><div class='add'>+    \o \c{-no-largefile} - disable support for large (&gt; 2TB) files</div><div class='add'>+    \o \c{-no-scripttools} - disable support for QtScript tools</div><div class='add'>+    \o \c{-qt-gfx-integrity} - enables the experimental gh_FB based display driver</div><div class='add'>+    \o \c{-qt-mouse-integrity} - enables the experimental Connection-based mouse driver</div><div class='add'>+    \o \c{-qt-kbd-integrity} - enables the experimental Connection-based keyboard driver</div><div class='add'>+    \endlist</div><div class='add'>+</div><div class='add'>+    The above script will generate MULTI .gpj Project files, not Makefiles. The</div><div class='add'>+    main benefit of using these project files is automatic dependency checking,</div><div class='add'>+    but this also provides an organization known to INTEGRITY customers.</div><div class='add'>+    For Qt libraries, the top-level file is projects.gpj.</div><div class='add'>+</div><div class='add'>+    \section1 General Notes</div><div class='add'>+</div><div class='add'>+    \list</div><div class='add'>+    \o Before you run the above configure line, you may want to modify the values</div><div class='add'>+       of INTEGRITY_DIR and INTEGRITY_BSP in unsupported/qws/integrity-arm-cxarm/qmake.conf.</div><div class='add'>+       If you do not do this, you will have to modify the resulting generated projects.gpj</div><div class='add'>+</div><div class='add'>+    \o GIF support is currently not enabled.</div><div class='add'>+</div><div class='add'>+    \o Default .int files are generated. You may want to modify the amount of heap assigned</div><div class='add'>+       to each example by modifying the HeapSize declaration in the specific example .int file.</div><div class='add'>+</div><div class='add'>+    \o Some of the tools, examples and demos do not compile due to dependencies on QProcess</div><div class='add'>+       or other classes that are not available on INTEGRITY.</div><div class='add'>+</div><div class='add'>+    \endlist</div><div class='add'>+</div><div class='add'>+    \section1 Platform Regressions</div><div class='add'>+</div><div class='add'>+*/</div><div class='head'>diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc<br/>index 87b6298..c2e47c2 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/platforms/platform-notes.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/platforms/platform-notes.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/platforms/platform-notes.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/platforms/platform-notes.qdoc</a></div><div class='hunk'>@@ -602,6 +602,69 @@</div><div class='ctx'>     problem, it probably is a good idea to turn off precompiled headers.</div><div class='ctx'>     Also, consider filing a bug report with Apple so that they can</div><div class='ctx'>     improve support for this feature.</div><div class='add'>+</div><div class='add'>+    \section2 Attributes</div><div class='add'>+    The following lists a set of useful attributes that can be used to tweak applications</div><div class='add'>+    on Mac:</div><div class='add'>+</div><div class='add'>+    Qt::AA_MacPluginApplication, Qt::AA_DontUseNativeMenuBar, Qt::AA_MacDontSwapCtrlAndMeta</div><div class='add'>+    Qt::WA_MacNoClickThrough, Qt::WA_MacOpaqueSizeGrip, Qt::WA_MacShowFocusRect,</div><div class='add'>+    Qt::WA_MacNormalSize, Qt::WA_MacSmallSize, Qt::WA_MacMiniSize, Qt::WA_MacVariableSize,</div><div class='add'>+    Qt::WA_MacBrushedMetal, Qt::WA_MacAlwaysShowToolWindow, Qt::WA_MacFrameworkScaled,</div><div class='add'>+    Qt::WA_MacNoShadow, Qt::Sheet, Qt::Drawer, Qt::MacWindowToolBarButtonHint, </div><div class='add'>+    QMainWindow::unifiedTitleAndToolBarOnMac, WA_MacNoCocoaChildWindow </div><div class='add'>+</div><div class='add'>+    \section2 Mixing Qt with native code</div><div class='add'>+    Two classes are awailable for either adding native Cocoa views/controls</div><div class='add'>+    inside a Qt application, or the opposite, embedding Qt into a native</div><div class='add'>+    Cocoa application:</div><div class='add'>+</div><div class='add'>+    QMacCocoaViewContainer, QMacNativeWidget </div><div class='add'>+</div><div class='add'>+    \section3 Using native Cocoa panels</div><div class='add'>+    Launching native Cocoa panels from within a Qt application can sometimes</div><div class='add'>+    be problematic. The reason is that Qt's event dispatcher is more flexible</div><div class='add'>+    than what Cocoa offers, and lets the user spin the event dispatcher (and</div><div class='add'>+    running QEventLoop::exec) without having to think about whether or not modal</div><div class='add'>+    dialogs are showing on screen (which is a difference to Cocoa). Therefore</div><div class='add'>+    we need to do special bookkeeping in Qt to handle this correctly, which</div><div class='add'>+    unfortunately make mixing in native panels hard. The best way at the moment</div><div class='add'>+    to do this, is to follow the pattern below, where we post the call to the</div><div class='add'>+    function with native code rather than calling it directly. Then we know that</div><div class='add'>+    Qt has cleanly updated any pending event loop recursions before the native </div><div class='add'>+    panel is shown:</div><div class='add'>+</div><div class='add'>+    \code</div><div class='add'>+        #include &lt;QtGui&gt;</div><div class='add'>+</div><div class='add'>+        class NativeProxyObject : public QObject</div><div class='add'>+        {</div><div class='add'>+            Q_OBJECT</div><div class='add'>+        public slots:</div><div class='add'>+            void execNativeDialogLater()</div><div class='add'>+            {</div><div class='add'>+                QMetaObject::invokeMethod(this, "execNativeDialogNow", Qt::QueuedConnection);</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            void execNativeDialogNow()</div><div class='add'>+            {</div><div class='add'>+                NSRunAlertPanel(@"A Native dialog", @"", @"OK", @"", @"");</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+        };</div><div class='add'>+</div><div class='add'>+        #include "main.moc"</div><div class='add'>+</div><div class='add'>+        int main(int argc, char **argv){</div><div class='add'>+            QApplication app(argc, argv);</div><div class='add'>+            NativeProxyObject proxy;</div><div class='add'>+            QPushButton button("Show native dialog");</div><div class='add'>+            QObject::connect(&amp;button, SIGNAL(clicked()), &amp;proxy, SLOT(execNativeDialogLater()));</div><div class='add'>+            button.show();</div><div class='add'>+            return app.exec();</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+    \endcode</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='head'>diff --git a/doc/src/porting/porting4.qdoc b/doc/src/porting/porting4.qdoc<br/>index 8305bb9..490a81b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/porting/porting4.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/porting/porting4.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/porting/porting4.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/porting/porting4.qdoc</a></div><div class='hunk'>@@ -2374,8 +2374,8 @@</div><div class='ctx'>     pointer to a QObjectList. See also the comments on QObjectList</div><div class='ctx'>     below.</div><div class='ctx'> </div><div class='del'>-    Use QObject::findChildren() (or qFindChildren() if you need MSVC 6</div><div class='del'>-    compatibility) instead of QObject::queryList(). For example:</div><div class='add'>+    Use QObject::findChildren() instead of QObject::queryList().</div><div class='add'>+    For example:</div><div class='ctx'> </div><div class='ctx'>     \snippet doc/src/snippets/code/doc_src_porting4.cpp 18</div><div class='ctx'> </div><div class='head'>diff --git a/doc/src/snippets/accessibilityslidersnippet.cpp b/doc/src/snippets/accessibilityslidersnippet.cpp<br/>index 843cd1f..cb4347e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/snippets/accessibilityslidersnippet.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/accessibilityslidersnippet.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/accessibilityslidersnippet.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/accessibilityslidersnippet.cpp</a></div><div class='hunk'>@@ -227,7 +227,7 @@ QVariant QAccessibleAbstractSlider::invokeMethodEx(Method method, int child, con</div><div class='ctx'>     case ListSupportedMethods: {</div><div class='ctx'>         QSet&lt;QAccessible::Method&gt; set;</div><div class='ctx'>         set &lt;&lt; ListSupportedMethods;</div><div class='del'>-        return qVariantFromValue(set | qvariant_cast&lt;QSet&lt;QAccessible::Method&gt; &gt;(</div><div class='add'>+        return QVariant::fromValue(set | qvariant_cast&lt;QSet&lt;QAccessible::Method&gt; &gt;(</div><div class='ctx'>                     QAccessibleWidgetEx::invokeMethodEx(method, child, params)));</div><div class='ctx'>     }</div><div class='ctx'>     default:</div><div class='head'>diff --git a/doc/src/snippets/code/doc_src_porting4.cpp b/doc/src/snippets/code/doc_src_porting4.cpp<br/>index 730f71f..14c708a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/doc_src_porting4.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/doc_src_porting4.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/doc_src_porting4.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/code/doc_src_porting4.cpp</a></div><div class='hunk'>@@ -165,7 +165,7 @@ while (i.hasNext()) {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> //! [18]</div><div class='del'>-QList&lt;QWidget *&gt; myWidgets = qFindChildren&lt;QWidget *&gt;(myParent);</div><div class='add'>+QList&lt;QWidget *&gt; myWidgets = myParent-&gt;findChildren&lt;QWidget *&gt;();</div><div class='ctx'> //! [18]</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/doc/src/snippets/code/doc_src_qmake-manual.pro b/doc/src/snippets/code/doc_src_qmake-manual.pro<br/>index e5b749e..ee35b77 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/doc_src_qmake-manual.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/doc_src_qmake-manual.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/doc_src_qmake-manual.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/code/doc_src_qmake-manual.pro</a></div><div class='hunk'>@@ -193,15 +193,15 @@ DEFINES += USE_MY_STUFF QT_DLL</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #! [28]</div><div class='del'>-myFiles.sources = path\*.png</div><div class='add'>+myFiles.files = path\*.png</div><div class='ctx'> DEPLOYMENT += myFiles</div><div class='ctx'> #! [28]</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #! [29]</div><div class='del'>-myFiles.sources = path\file1.ext1 path2\file2.ext1 path3\*</div><div class='add'>+myFiles.files = path\file1.ext1 path2\file2.ext1 path3\*</div><div class='ctx'> myFiles.path = \some\path\on\device</div><div class='del'>-someother.sources = C:\additional\files\*</div><div class='add'>+someother.files = C:\additional\files\*</div><div class='ctx'> someother.path = \myFiles\path2</div><div class='ctx'> DEPLOYMENT += myFiles someother</div><div class='ctx'> #! [29]</div><div class='hunk'>@@ -831,12 +831,12 @@ CONFIG(debug, debug|release) {</div><div class='ctx'> #! [127]</div><div class='ctx'> </div><div class='ctx'> #! [128]</div><div class='del'>-customplugin.sources = customimageplugin.dll</div><div class='del'>-customplugin.sources += c:\myplugins\othercustomimageplugin.dll</div><div class='add'>+customplugin.files = customimageplugin.dll</div><div class='add'>+customplugin.files += c:\myplugins\othercustomimageplugin.dll</div><div class='ctx'> customplugin.path = imageformats</div><div class='del'>-dynamiclibrary.sources = mylib.dll helper.exe</div><div class='add'>+dynamiclibrary.files = mylib.dll helper.exe</div><div class='ctx'> dynamiclibrary.path = \sys\bin</div><div class='del'>-globalplugin.sources = someglobalimageplugin.dll</div><div class='add'>+globalplugin.files = someglobalimageplugin.dll</div><div class='ctx'> globalplugin.path = \resource\qt\plugins\imageformats</div><div class='ctx'> DEPLOYMENT += customplugin dynamiclibrary globalplugin</div><div class='ctx'> #! [128]</div><div class='hunk'>@@ -905,7 +905,7 @@ MMP_RULES += myIfdefBlock</div><div class='ctx'> #! [139]</div><div class='ctx'> </div><div class='ctx'> #! [140]</div><div class='del'>-somelib.sources = somelib.dll</div><div class='add'>+somelib.files = somelib.dll</div><div class='ctx'> somelib.path = \sys\bin</div><div class='ctx'> somelib.pkg_prerules = "(0x12345678), 2, 2, 0, {\"Some Package\"}" \</div><div class='ctx'>                   "(0x87654321), 1, *, * ~ 2, 2, 0, {\"Some Other Package\"}"</div><div class='hunk'>@@ -1003,7 +1003,7 @@ DEPLOYMENT -= default_bin_deployment default_resource_deployment default_reg_dep</div><div class='ctx'> </div><div class='ctx'> #! [155]</div><div class='ctx'> default_bin_deployment.flags += FILERUN RUNINSTALL</div><div class='del'>-dep_note.sources = install_note.txt</div><div class='add'>+dep_note.files = install_note.txt</div><div class='ctx'> dep_note.flags = FILETEXT TEXTEXIT</div><div class='ctx'> DEPLOYMENT += dep_note</div><div class='ctx'> #! [155]</div><div class='hunk'>@@ -1011,3 +1011,15 @@ DEPLOYMENT += dep_note</div><div class='ctx'> #! [156]</div><div class='ctx'> DEPLOYMENT.display_name = My Qt App</div><div class='ctx'> #! [156]</div><div class='add'>+</div><div class='add'>+#! [157]</div><div class='add'>+packagesExist(sqlite3 QtNetwork QtDeclarative) {</div><div class='add'>+    DEFINES += USE_FANCY_UI</div><div class='add'>+}</div><div class='add'>+#! [157]</div><div class='add'>+</div><div class='add'>+#! [158]</div><div class='add'>+#ifdef USE_FANCY_UI</div><div class='add'>+    // Use the fancy UI, as we have extra packages available</div><div class='add'>+#endif</div><div class='add'>+#! [158]</div><div class='head'>diff --git a/doc/src/snippets/code/doc_src_qtscript.cpp b/doc/src/snippets/code/doc_src_qtscript.cpp<br/>index 822e6fa..de82029 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/doc_src_qtscript.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/doc_src_qtscript.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/doc_src_qtscript.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/code/doc_src_qtscript.cpp</a></div><div class='hunk'>@@ -544,7 +544,7 @@ QScriptValue constructXmlStreamReader(QScriptContext *context, QScriptEngine *en</div><div class='ctx'>     XmlStreamReaderPointer pointer(reader);</div><div class='ctx'> </div><div class='ctx'>     // store the shared pointer in the script object that we are constructing</div><div class='del'>-    return engine-&gt;newVariant(context-&gt;thisObject(), qVariantFromValue(pointer));</div><div class='add'>+    return engine-&gt;newVariant(context-&gt;thisObject(), QVariant::fromValue(pointer));</div><div class='ctx'> }</div><div class='ctx'> //! [93]</div><div class='ctx'> </div><div class='head'>diff --git a/doc/src/snippets/code/src_corelib_global_qglobal.cpp b/doc/src/snippets/code/src_corelib_global_qglobal.cpp<br/>index 0b54cef..c79a714 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/src_corelib_global_qglobal.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/src_corelib_global_qglobal.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/src_corelib_global_qglobal.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/code/src_corelib_global_qglobal.cpp</a></div><div class='hunk'>@@ -531,3 +531,27 @@ class MyClass : public QObject</div><div class='ctx'> //! [47]</div><div class='ctx'> CApaApplication *myApplicationFactory();</div><div class='ctx'> //! [47]</div><div class='add'>+</div><div class='add'>+//! [qlikely]</div><div class='add'>+    // the condition inside the "if" will be successful most of the times</div><div class='add'>+    for (int i = 1; i &lt;= 365; i++) {</div><div class='add'>+        if (Q_LIKELY(isWorkingDay(i))) {</div><div class='add'>+            ...</div><div class='add'>+        }</div><div class='add'>+        ...</div><div class='add'>+    }</div><div class='add'>+//! [qlikely]</div><div class='add'>+</div><div class='add'>+//! [qunlikely]</div><div class='add'>+bool readConfiguration(const QFile &amp;file)</div><div class='add'>+{</div><div class='add'>+    // We expect to be asked to read an existing file</div><div class='add'>+    if (Q_UNLIKELY(!file.exists())) {</div><div class='add'>+        qWarning() &lt;&lt; "File not found";</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    ...</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+//! [qunlikely]</div><div class='head'>diff --git a/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp b/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp<br/>index a57d722..8b1bcbf 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/src_corelib_kernel_qvariant.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/code/src_corelib_kernel_qvariant.cpp</a></div><div class='hunk'>@@ -132,5 +132,5 @@ return QVariant::fromValue(s);</div><div class='ctx'> </div><div class='ctx'> //! [8]</div><div class='ctx'> QObject *object = getObjectFromSomewhere();</div><div class='del'>-QVariant data = qVariantFromValue(object);</div><div class='add'>+QVariant data = QVariant::fromValue(object);</div><div class='ctx'> //! [8]</div><div class='head'>diff --git a/doc/src/snippets/code/src_gui_accessible_qaccessible.cpp b/doc/src/snippets/code/src_gui_accessible_qaccessible.cpp<br/>index 6d22734..84eb1cd 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/src_gui_accessible_qaccessible.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/src_gui_accessible_qaccessible.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/src_gui_accessible_qaccessible.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/code/src_gui_accessible_qaccessible.cpp</a></div><div class='hunk'>@@ -46,3 +46,7 @@ if (child) {</div><div class='ctx'>     delete child;</div><div class='ctx'> }</div><div class='ctx'> //! [0]</div><div class='add'>+</div><div class='add'>+//! [1]</div><div class='add'>+typedef QAccessibleInterface* myFactoryFunction(const QString &amp;key, QObject *);</div><div class='add'>+//! [1]</div><div class='head'>diff --git a/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp b/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp<br/>new file mode 100644<br/>index 0000000..6bf6c89<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly &lt;stephen.kelly@kdab.com&gt;</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtGui module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:BSD$</div><div class='add'>+** You may use this file under the terms of the BSD license as follows:</div><div class='add'>+**</div><div class='add'>+** "Redistribution and use in source and binary forms, with or without</div><div class='add'>+** modification, are permitted provided that the following conditions are</div><div class='add'>+** met:</div><div class='add'>+**   * Redistributions of source code must retain the above copyright</div><div class='add'>+**     notice, this list of conditions and the following disclaimer.</div><div class='add'>+**   * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+**     notice, this list of conditions and the following disclaimer in</div><div class='add'>+**     the documentation and/or other materials provided with the</div><div class='add'>+**     distribution.</div><div class='add'>+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor</div><div class='add'>+**     the names of its contributors may be used to endorse or promote</div><div class='add'>+**     products derived from this software without specific prior written</div><div class='add'>+**     permission.</div><div class='add'>+**</div><div class='add'>+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</div><div class='add'>+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</div><div class='add'>+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR</div><div class='add'>+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT</div><div class='add'>+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,</div><div class='add'>+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY</div><div class='add'>+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</div><div class='add'>+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+//! [0]</div><div class='add'>+class DateFormatProxyModel : public QIdentityProxyModel</div><div class='add'>+{</div><div class='add'>+  // ...</div><div class='add'>+</div><div class='add'>+  void setDateFormatString(const QString &amp;formatString)</div><div class='add'>+  {</div><div class='add'>+    m_formatString = formatString;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  QVariant data(const QModelIndex &amp;index, int role)</div><div class='add'>+  {</div><div class='add'>+    if (role != Qt::DisplayRole)</div><div class='add'>+      return QIdentityProxyModel::data(index, role);</div><div class='add'>+</div><div class='add'>+    const QDateTime dateTime = sourceModel()-&gt;data(SourceClass::DateRole).toDateTime();</div><div class='add'>+</div><div class='add'>+    return dateTime.toString(m_formatString);</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+private:</div><div class='add'>+  QString m_formatString;</div><div class='add'>+};</div><div class='add'>+//! [0]</div><div class='head'>diff --git a/doc/src/snippets/code/src_network_access_qhttpmultipart.cpp b/doc/src/snippets/code/src_network_access_qhttpmultipart.cpp<br/>new file mode 100644<br/>index 0000000..7c2e0ac<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/src_network_access_qhttpmultipart.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/code/src_network_access_qhttpmultipart.cpp</a></div><div class='hunk'>@@ -0,0 +1,67 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the documentation of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+//! [0]</div><div class='add'>+QHttpMultiPart *multiPart = new QHttpMultiPart(QHttpMultiPart::FormDataType);</div><div class='add'>+</div><div class='add'>+QHttpPart textPart;</div><div class='add'>+textPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"text\""));</div><div class='add'>+textPart.setBody("my text");</div><div class='add'>+</div><div class='add'>+QHttpPart imagePart;</div><div class='add'>+imagePart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg"));</div><div class='add'>+imagePart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"image\""));</div><div class='add'>+QFile *file = new QFile("image.jpg");</div><div class='add'>+file-&gt;open(QIODevice::ReadOnly);</div><div class='add'>+imagePart.setBodyDevice(file);</div><div class='add'>+file-&gt;setParent(multiPart); // we cannot delete the file now, so delete it with the multiPart</div><div class='add'>+</div><div class='add'>+multiPart-&gt;append(textPart);</div><div class='add'>+multiPart-&gt;append(imagePart);</div><div class='add'>+</div><div class='add'>+QUrl url("http://my.server.tld");</div><div class='add'>+QNetworkRequest request(url);</div><div class='add'>+</div><div class='add'>+QNetworkAccessManager manager;</div><div class='add'>+QNetworkReply *reply = manager.post(request, multiPart);</div><div class='add'>+multiPart-&gt;setParent(reply); // delete the multiPart with the reply</div><div class='add'>+// here connect signals etc.</div><div class='add'>+//! [0]</div><div class='head'>diff --git a/doc/src/snippets/code/src_network_access_qhttppart.cpp b/doc/src/snippets/code/src_network_access_qhttppart.cpp<br/>new file mode 100644<br/>index 0000000..e70fead<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/src_network_access_qhttppart.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/code/src_network_access_qhttppart.cpp</a></div><div class='hunk'>@@ -0,0 +1,65 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the documentation of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+//! [0]</div><div class='add'>+Content-Type: text/plain</div><div class='add'>+Content-Disposition: form-data; name="text"</div><div class='add'>+</div><div class='add'>+here goes the body</div><div class='add'>+//! [0]</div><div class='add'>+</div><div class='add'>+//! [1]</div><div class='add'>+QHttpPart textPart;</div><div class='add'>+textPart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("text/plain"));</div><div class='add'>+textPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"text\""));</div><div class='add'>+textPart.setBody("here goes the body");</div><div class='add'>+//! [1]</div><div class='add'>+</div><div class='add'>+//! [2]</div><div class='add'>+QHttpPart imagePart;</div><div class='add'>+imagePart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg"));</div><div class='add'>+imagePart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"image\""));</div><div class='add'>+imagePart.setRawHeader("Content-ID", "my@content.id"); // add any headers you like via setRawHeader()</div><div class='add'>+QFile *file = new QFile("image.jpg");</div><div class='add'>+file-&gt;open(QIODevice::ReadOnly);</div><div class='add'>+imagePart.setBodyDevice(file);</div><div class='add'>+//! [2]</div><div class='add'>+</div><div class='head'>diff --git a/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp b/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp<br/>index d446af7..dd5cd5b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp</a></div><div class='hunk'>@@ -163,7 +163,7 @@</div><div class='ctx'>                     break;</div><div class='ctx'>                 default:</div><div class='ctx'>                     if (v.userType() == qMetaTypeId&lt;QXmlName&gt;()) {</div><div class='del'>-                        QXmlName n = qVariantValue&lt;QXmlName&gt;(v);</div><div class='add'>+                        QXmlName n = qvariant_cast&lt;QXmlName&gt;(v);</div><div class='ctx'>                         // process QXmlName n...</div><div class='ctx'>                     }</div><div class='ctx'>                     else {</div><div class='head'>diff --git a/doc/src/snippets/declarative/application.qml b/doc/src/snippets/declarative/application.qml<br/>index 06f83f2..fa8cf0b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/snippets/declarative/application.qml?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/declarative/application.qml</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/declarative/application.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/declarative/application.qml</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /****************************************************************************</div><div class='ctx'> **</div><div class='del'>-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='ctx'> ** All rights reserved.</div><div class='ctx'> ** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='ctx'> **</div><div class='head'>diff --git a/doc/src/snippets/declarative/focus/focusColumn.qml b/doc/src/snippets/declarative/focus/focusColumn.qml<br/>index 42ee3da..e6a6fcf 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/snippets/declarative/focus/focusColumn.qml?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/declarative/focus/focusColumn.qml</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/declarative/focus/focusColumn.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/declarative/focus/focusColumn.qml</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /****************************************************************************</div><div class='ctx'> **</div><div class='del'>-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='ctx'> ** All rights reserved.</div><div class='ctx'> ** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='ctx'> **</div><div class='head'>diff --git a/doc/src/snippets/declarative/states/statechangescript.qml b/doc/src/snippets/declarative/states/statechangescript.qml<br/>index f490a97..aa1246d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/snippets/declarative/states/statechangescript.qml?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/declarative/states/statechangescript.qml</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/declarative/states/statechangescript.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/declarative/states/statechangescript.qml</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /****************************************************************************</div><div class='ctx'> **</div><div class='del'>-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='ctx'> ** All rights reserved.</div><div class='ctx'> ** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='ctx'> **</div><div class='head'>diff --git a/doc/src/snippets/declarative/webview/webview.qml b/doc/src/snippets/declarative/webview/webview.qml<br/>index a986fab..f652369 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/snippets/declarative/webview/webview.qml?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/declarative/webview/webview.qml</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/declarative/webview/webview.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/declarative/webview/webview.qml</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /****************************************************************************</div><div class='ctx'> **</div><div class='del'>-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='ctx'> ** All rights reserved.</div><div class='ctx'> ** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='ctx'> **</div><div class='head'>diff --git a/doc/src/snippets/qmake/spaces.pro b/doc/src/snippets/qmake/spaces.pro<br/>index 544ef05..614d4c5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/snippets/qmake/spaces.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/qmake/spaces.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/qmake/spaces.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/qmake/spaces.pro</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> #! [quoting library paths with spaces]</div><div class='del'>-win32:LIBS += $$quote(C:/mylibs/extra libs/extra.lib)</div><div class='del'>-unix:LIBS += $$quote(-L/home/user/extra libs) -lextra</div><div class='add'>+win32:LIBS += "C:/mylibs/extra libs/extra.lib"</div><div class='add'>+unix:LIBS += "-L/home/user/extra libs" -lextra</div><div class='ctx'> #! [quoting library paths with spaces]</div><div class='ctx'> </div><div class='ctx'> #! [quoting include paths with spaces]</div><div class='del'>-win32:INCLUDEPATH += $$quote(C:/mylibs/extra headers)</div><div class='del'>-unix:INCLUDEPATH += $$quote(/home/user/extra headers)</div><div class='add'>+win32:INCLUDEPATH += "C:/mylibs/extra headers"</div><div class='add'>+unix:INCLUDEPATH += "/home/user/extra headers"</div><div class='ctx'> #! [quoting include paths with spaces]</div><div class='head'>diff --git a/doc/src/snippets/qstring/stringbuilder.cpp b/doc/src/snippets/qstring/stringbuilder.cpp<br/>index 8ff1dd8..b8acbc1 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/snippets/qstring/stringbuilder.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/qstring/stringbuilder.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/qstring/stringbuilder.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/qstring/stringbuilder.cpp</a></div><div class='hunk'>@@ -49,14 +49,9 @@</div><div class='ctx'> //! [0]</div><div class='ctx'> </div><div class='ctx'> //! [3]</div><div class='del'>-    #define QT_USE_FAST_CONCATENATION</div><div class='add'>+    DEFINES *= QT_USE_QSTRINGBUILDER</div><div class='ctx'> //! [3]</div><div class='ctx'> </div><div class='del'>-//! [4]</div><div class='del'>-    #define QT_USE_FAST_CONCATENATION</div><div class='del'>-    #define QT_USE_FAST_OPERATOR_PLUS</div><div class='del'>-//! [4]</div><div class='del'>-</div><div class='ctx'> //! [5]</div><div class='ctx'>     #include &lt;QStringBuilder&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/doc/src/snippets/threads/threads.cpp b/doc/src/snippets/threads/threads.cpp<br/>index 31f325d..5661757 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/snippets/threads/threads.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/snippets/threads/threads.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/snippets/threads/threads.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/snippets/threads/threads.cpp</a></div><div class='hunk'>@@ -93,15 +93,12 @@ private:</div><div class='ctx'> typedef int SomeClass;</div><div class='ctx'> </div><div class='ctx'> //! [7]</div><div class='del'>-QThreadStorage&lt;QCache&lt;QString, SomeClass&gt; *&gt; caches;</div><div class='add'>+QThreadStorage&lt;QCache&lt;QString, SomeClass&gt; &gt; caches;</div><div class='ctx'> </div><div class='ctx'> void cacheObject(const QString &amp;key, SomeClass *object)</div><div class='ctx'> //! [7] //! [8]</div><div class='ctx'> {</div><div class='del'>-    if (!caches.hasLocalData())</div><div class='del'>-        caches.setLocalData(new QCache&lt;QString, SomeClass&gt;);</div><div class='del'>-</div><div class='del'>-    caches.localData()-&gt;insert(key, object);</div><div class='add'>+    caches.localData().insert(key, object);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void removeFromCache(const QString &amp;key)</div><div class='hunk'>@@ -110,7 +107,7 @@ void removeFromCache(const QString &amp;key)</div><div class='ctx'>     if (!caches.hasLocalData())</div><div class='ctx'>         return;</div><div class='ctx'> </div><div class='del'>-    caches.localData()-&gt;remove(key);</div><div class='add'>+    caches.localData().remove(key);</div><div class='ctx'> }</div><div class='ctx'> //! [9]</div><div class='ctx'> </div><div class='head'>diff --git a/doc/src/xml-processing/xml-patterns.qdoc b/doc/src/xml-processing/xml-patterns.qdoc<br/>index ea29639..d54613c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/doc/src/xml-processing/xml-patterns.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>doc/src/xml-processing/xml-patterns.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/doc/src/xml-processing/xml-patterns.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>doc/src/xml-processing/xml-patterns.qdoc</a></div><div class='hunk'>@@ -415,7 +415,7 @@</div><div class='ctx'>     slight-of-hand using the \l{QMetaType} {Qt metatype system}. We</div><div class='ctx'>     must modify our example to use a couple of template functions, a</div><div class='ctx'>     friend of QMetaType (qMetaTypeId&lt;T&gt;()) and a friend of QVariant</div><div class='del'>-    (qVariantValue&lt;T&gt;()):</div><div class='add'>+    (qvariant_cast&lt;T&gt;()):</div><div class='ctx'> </div><div class='ctx'>     \snippet doc/src/snippets/code/src_xmlpatterns_api_qxmlquery.cpp 6</div><div class='ctx'> </div><div class='head'>diff --git a/examples/activeqt/hierarchy/objects.cpp b/examples/activeqt/hierarchy/objects.cpp<br/>index eff9b84..ab2cd61 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/activeqt/hierarchy/objects.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/activeqt/hierarchy/objects.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/activeqt/hierarchy/objects.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/activeqt/hierarchy/objects.cpp</a></div><div class='hunk'>@@ -62,7 +62,7 @@ void QParentWidget::createSubWidget(const QString &amp;name)</div><div class='ctx'> //! [1] //! [2]</div><div class='ctx'> QSubWidget *QParentWidget::subWidget(const QString &amp;name)</div><div class='ctx'> {</div><div class='del'>-    return qFindChild&lt;QSubWidget*&gt;(this, name);</div><div class='add'>+    return findChild&lt;QSubWidget*&gt;(name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> //! [2]</div><div class='head'>diff --git a/examples/animation/easing/window.cpp b/examples/animation/easing/window.cpp<br/>index 54fc8dd..b466cec 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/animation/easing/window.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/animation/easing/window.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/animation/easing/window.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/animation/easing/window.cpp</a></div><div class='hunk'>@@ -44,7 +44,7 @@ Window::Window(QWidget *parent)</div><div class='ctx'>     : QWidget(parent), m_iconSize(64, 64)</div><div class='ctx'> {</div><div class='ctx'>     m_ui.setupUi(this);</div><div class='del'>-    QButtonGroup *buttonGroup = qFindChild&lt;QButtonGroup *&gt;(this);     // ### workaround for uic in 4.4</div><div class='add'>+    QButtonGroup *buttonGroup = findChild&lt;QButtonGroup *&gt;();     // ### workaround for uic in 4.4</div><div class='ctx'>     m_ui.easingCurvePicker-&gt;setIconSize(m_iconSize);</div><div class='ctx'>     m_ui.easingCurvePicker-&gt;setMinimumHeight(m_iconSize.height() + 50);</div><div class='ctx'>     buttonGroup-&gt;setId(m_ui.lineRadio, 0);</div><div class='head'>diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro<br/>index 7149986..f700f0b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/declarative/cppextensions/imageprovider/imageprovider.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/declarative/cppextensions/imageprovider/imageprovider.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/declarative/cppextensions/imageprovider/imageprovider.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/declarative/cppextensions/imageprovider/imageprovider.pro</a></div><div class='hunk'>@@ -22,7 +22,7 @@ symbian:{</div><div class='ctx'>     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)</div><div class='ctx'>     TARGET.EPOCALLOWDLLDATA = 1</div><div class='ctx'> </div><div class='del'>-    importFiles.sources = ImageProviderCore/qmlimageproviderplugin.dll ImageProviderCore/qmldir</div><div class='add'>+    importFiles.files = ImageProviderCore/qmlimageproviderplugin.dll ImageProviderCore/qmldir</div><div class='ctx'>     importFiles.path = ImageProviderCore</div><div class='del'>-    DEPLOYMENT = importFiles</div><div class='add'>+    DEPLOYMENT += importFiles</div><div class='ctx'> }</div><div class='head'>diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro<br/>index 2e610f9..d92e072 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/declarative/cppextensions/qwidgets/qwidgets.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/declarative/cppextensions/qwidgets/qwidgets.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/declarative/cppextensions/qwidgets/qwidgets.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/declarative/cppextensions/qwidgets/qwidgets.pro</a></div><div class='hunk'>@@ -17,8 +17,8 @@ symbian:{</div><div class='ctx'>     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)</div><div class='ctx'>     TARGET.EPOCALLOWDLLDATA = 1</div><div class='ctx'> </div><div class='del'>-    importFiles.sources = QWidgets/qmlqwidgetsplugin.dll QWidgets/qmldir</div><div class='add'>+    importFiles.files = QWidgets/qmlqwidgetsplugin.dll QWidgets/qmldir</div><div class='ctx'>     importFiles.path = QWidgets</div><div class='ctx'> </div><div class='del'>-    DEPLOYMENT = importFiles</div><div class='add'>+    DEPLOYMENT += importFiles</div><div class='ctx'> }</div><div class='head'>diff --git a/examples/declarative/keyinteraction/focus/Core/GridMenu.qml b/examples/declarative/keyinteraction/focus/Core/GridMenu.qml<br/>index f3894fb..224d38b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/declarative/keyinteraction/focus/Core/GridMenu.qml?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/declarative/keyinteraction/focus/Core/GridMenu.qml</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/declarative/keyinteraction/focus/Core/GridMenu.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/declarative/keyinteraction/focus/Core/GridMenu.qml</a></div><div class='hunk'>@@ -86,7 +86,7 @@ FocusScope {</div><div class='ctx'>                     hoverEnabled: true</div><div class='ctx'> </div><div class='ctx'>                     onClicked: {</div><div class='del'>-                        GridView.view.currentIndex = index</div><div class='add'>+                        container.GridView.view.currentIndex = index</div><div class='ctx'>                         container.forceActiveFocus()</div><div class='ctx'>                     }</div><div class='ctx'>                 }</div><div class='head'>diff --git a/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml b/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml<br/>index 88c3624..8f9d022 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml</a></div><div class='hunk'>@@ -68,7 +68,7 @@ Item {</div><div class='ctx'>         hoverEnabled: true</div><div class='ctx'> </div><div class='ctx'>         onClicked: {</div><div class='del'>-            ListView.view.currentIndex = index</div><div class='add'>+            container.ListView.view.currentIndex = index</div><div class='ctx'>             container.forceActiveFocus()</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='head'>diff --git a/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml b/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml<br/>index 197ea39..fa343b9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/declarative/righttoleft/layoutdirection/layoutdirection.qml</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/declarative/righttoleft/layoutdirection/layoutdirection.qml</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /****************************************************************************</div><div class='ctx'> **</div><div class='del'>-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='ctx'> ** All rights reserved.</div><div class='ctx'> ** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='ctx'> **</div><div class='head'>diff --git a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml<br/>index 0d1b871..b4065ba 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /****************************************************************************</div><div class='ctx'> **</div><div class='del'>-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='ctx'> ** All rights reserved.</div><div class='ctx'> ** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='ctx'> **</div><div class='head'>diff --git a/examples/declarative/righttoleft/textalignment/textalignment.qml b/examples/declarative/righttoleft/textalignment/textalignment.qml<br/>index 4c40c3c..afd2d68 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/declarative/righttoleft/textalignment/textalignment.qml?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/declarative/righttoleft/textalignment/textalignment.qml</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/declarative/righttoleft/textalignment/textalignment.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/declarative/righttoleft/textalignment/textalignment.qml</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /****************************************************************************</div><div class='ctx'> **</div><div class='del'>-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='ctx'> ** All rights reserved.</div><div class='ctx'> ** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='ctx'> **</div><div class='head'>diff --git a/examples/declarative/touchinteraction/pincharea/flickresize.qml b/examples/declarative/touchinteraction/pincharea/flickresize.qml<br/>index 9439ace..cf5278d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/declarative/touchinteraction/pincharea/flickresize.qml?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/declarative/touchinteraction/pincharea/flickresize.qml</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/declarative/touchinteraction/pincharea/flickresize.qml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/declarative/touchinteraction/pincharea/flickresize.qml</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /****************************************************************************</div><div class='ctx'> **</div><div class='del'>-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='ctx'> ** All rights reserved.</div><div class='ctx'> ** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='ctx'> **</div><div class='head'>diff --git a/examples/designer/calculatorbuilder/calculatorform.cpp b/examples/designer/calculatorbuilder/calculatorform.cpp<br/>index ddfdca2..e14efa4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/designer/calculatorbuilder/calculatorform.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/designer/calculatorbuilder/calculatorform.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/designer/calculatorbuilder/calculatorform.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/designer/calculatorbuilder/calculatorform.cpp</a></div><div class='hunk'>@@ -58,9 +58,9 @@ CalculatorForm::CalculatorForm(QWidget *parent)</div><div class='ctx'> //! [1]</div><div class='ctx'> </div><div class='ctx'> //! [2]</div><div class='del'>-    ui_inputSpinBox1 = qFindChild&lt;QSpinBox*&gt;(this, "inputSpinBox1");</div><div class='del'>-    ui_inputSpinBox2 = qFindChild&lt;QSpinBox*&gt;(this, "inputSpinBox2");</div><div class='del'>-    ui_outputWidget = qFindChild&lt;QLabel*&gt;(this, "outputWidget");</div><div class='add'>+    ui_inputSpinBox1 = findChild&lt;QSpinBox*&gt;("inputSpinBox1");</div><div class='add'>+    ui_inputSpinBox2 = findChild&lt;QSpinBox*&gt;("inputSpinBox2");</div><div class='add'>+    ui_outputWidget = findChild&lt;QLabel*&gt;("outputWidget");</div><div class='ctx'> //! [2]</div><div class='ctx'> </div><div class='ctx'> //! [3]</div><div class='head'>diff --git a/examples/desktop/systray/systray.pro b/examples/desktop/systray/systray.pro<br/>index 9b25916..710452b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/desktop/systray/systray.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/desktop/systray/systray.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/desktop/systray/systray.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/desktop/systray/systray.pro</a></div><div class='hunk'>@@ -14,10 +14,10 @@ symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)</div><div class='ctx'> </div><div class='ctx'> wince* {</div><div class='ctx'> 	CONFIG(debug, release|debug) {</div><div class='del'>-		addPlugins.sources = $$QT_BUILD_TREE/plugins/imageformats/qsvgd4.dll</div><div class='add'>+		addPlugins.files = $$QT_BUILD_TREE/plugins/imageformats/qsvgd4.dll</div><div class='ctx'> 	}</div><div class='ctx'> 	CONFIG(release, release|debug) {</div><div class='del'>-		addPlugins.sources = $$QT_BUILD_TREE/plugins/imageformats/qsvg4.dll</div><div class='add'>+		addPlugins.files = $$QT_BUILD_TREE/plugins/imageformats/qsvg4.dll</div><div class='ctx'> 	}</div><div class='ctx'> 	addPlugins.path = imageformats</div><div class='ctx'> 	DEPLOYMENT += addPlugins</div><div class='head'>diff --git a/examples/draganddrop/puzzle/pieceslist.cpp b/examples/draganddrop/puzzle/pieceslist.cpp<br/>index 321fab1..db27e7a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/draganddrop/puzzle/pieceslist.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/draganddrop/puzzle/pieceslist.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/draganddrop/puzzle/pieceslist.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/draganddrop/puzzle/pieceslist.cpp</a></div><div class='hunk'>@@ -103,7 +103,7 @@ void PiecesList::startDrag(Qt::DropActions /*supportedActions*/)</div><div class='ctx'> </div><div class='ctx'>     QByteArray itemData;</div><div class='ctx'>     QDataStream dataStream(&amp;itemData, QIODevice::WriteOnly);</div><div class='del'>-    QPixmap pixmap = qVariantValue&lt;QPixmap&gt;(item-&gt;data(Qt::UserRole));</div><div class='add'>+    QPixmap pixmap = qvariant_cast&lt;QPixmap&gt;(item-&gt;data(Qt::UserRole));</div><div class='ctx'>     QPoint location = item-&gt;data(Qt::UserRole+1).toPoint();</div><div class='ctx'> </div><div class='ctx'>     dataStream &lt;&lt; pixmap &lt;&lt; location;</div><div class='head'>diff --git a/examples/draganddrop/puzzle/puzzle.pro b/examples/draganddrop/puzzle/puzzle.pro<br/>index 31786c7..c0400d8 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/draganddrop/puzzle/puzzle.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/draganddrop/puzzle/puzzle.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/draganddrop/puzzle/puzzle.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/draganddrop/puzzle/puzzle.pro</a></div><div class='hunk'>@@ -7,6 +7,8 @@ SOURCES     = main.cpp \</div><div class='ctx'>               pieceslist.cpp \</div><div class='ctx'>               puzzlewidget.cpp</div><div class='ctx'> </div><div class='add'>+QMAKE_PROJECT_NAME = dndpuzzle</div><div class='add'>+</div><div class='ctx'> # install</div><div class='ctx'> target.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/puzzle</div><div class='ctx'> sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg</div><div class='hunk'>@@ -16,12 +18,12 @@ INSTALLS += target sources</div><div class='ctx'> symbian:{</div><div class='ctx'>    TARGET.UID3 = 0xA000CF65</div><div class='ctx'>    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)</div><div class='del'>-   addFile.sources = example.jpg</div><div class='add'>+   addFile.files = example.jpg</div><div class='ctx'>    addFile.path = .</div><div class='ctx'>    DEPLOYMENT += addFile</div><div class='ctx'> }</div><div class='ctx'> wince*: {</div><div class='del'>-   addFile.sources = example.jpg</div><div class='add'>+   addFile.files = example.jpg</div><div class='ctx'>    addFile.path = .</div><div class='ctx'>    DEPLOYMENT += addFile</div><div class='ctx'> }</div><div class='head'>diff --git a/examples/graphicsview/diagramscene/mainwindow.cpp b/examples/graphicsview/diagramscene/mainwindow.cpp<br/>index 3b4ac04..87eb33e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/graphicsview/diagramscene/mainwindow.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/graphicsview/diagramscene/mainwindow.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/graphicsview/diagramscene/mainwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/graphicsview/diagramscene/mainwindow.cpp</a></div><div class='hunk'>@@ -236,7 +236,7 @@ void MainWindow::textColorChanged()</div><div class='ctx'>     textAction = qobject_cast&lt;QAction *&gt;(sender());</div><div class='ctx'>     fontColorToolButton-&gt;setIcon(createColorToolButtonIcon(</div><div class='ctx'>                 ":/images/textpointer.png",</div><div class='del'>-                qVariantValue&lt;QColor&gt;(textAction-&gt;data())));</div><div class='add'>+                qvariant_cast&lt;QColor&gt;(textAction-&gt;data())));</div><div class='ctx'>     textButtonTriggered();</div><div class='ctx'> }</div><div class='ctx'> //! [12]</div><div class='hunk'>@@ -247,7 +247,7 @@ void MainWindow::itemColorChanged()</div><div class='ctx'>     fillAction = qobject_cast&lt;QAction *&gt;(sender());</div><div class='ctx'>     fillColorToolButton-&gt;setIcon(createColorToolButtonIcon(</div><div class='ctx'>                  ":/images/floodfill.png",</div><div class='del'>-                 qVariantValue&lt;QColor&gt;(fillAction-&gt;data())));</div><div class='add'>+                 qvariant_cast&lt;QColor&gt;(fillAction-&gt;data())));</div><div class='ctx'>     fillButtonTriggered();</div><div class='ctx'> }</div><div class='ctx'> //! [13]</div><div class='hunk'>@@ -258,7 +258,7 @@ void MainWindow::lineColorChanged()</div><div class='ctx'>     lineAction = qobject_cast&lt;QAction *&gt;(sender());</div><div class='ctx'>     lineColorToolButton-&gt;setIcon(createColorToolButtonIcon(</div><div class='ctx'>                  ":/images/linecolor.png",</div><div class='del'>-                 qVariantValue&lt;QColor&gt;(lineAction-&gt;data())));</div><div class='add'>+                 qvariant_cast&lt;QColor&gt;(lineAction-&gt;data())));</div><div class='ctx'>     lineButtonTriggered();</div><div class='ctx'> }</div><div class='ctx'> //! [14]</div><div class='hunk'>@@ -266,21 +266,21 @@ void MainWindow::lineColorChanged()</div><div class='ctx'> //! [15]</div><div class='ctx'> void MainWindow::textButtonTriggered()</div><div class='ctx'> {</div><div class='del'>-    scene-&gt;setTextColor(qVariantValue&lt;QColor&gt;(textAction-&gt;data()));</div><div class='add'>+    scene-&gt;setTextColor(qvariant_cast&lt;QColor&gt;(textAction-&gt;data()));</div><div class='ctx'> }</div><div class='ctx'> //! [15]</div><div class='ctx'> </div><div class='ctx'> //! [16]</div><div class='ctx'> void MainWindow::fillButtonTriggered()</div><div class='ctx'> {</div><div class='del'>-    scene-&gt;setItemColor(qVariantValue&lt;QColor&gt;(fillAction-&gt;data()));</div><div class='add'>+    scene-&gt;setItemColor(qvariant_cast&lt;QColor&gt;(fillAction-&gt;data()));</div><div class='ctx'> }</div><div class='ctx'> //! [16]</div><div class='ctx'> </div><div class='ctx'> //! [17]</div><div class='ctx'> void MainWindow::lineButtonTriggered()</div><div class='ctx'> {</div><div class='del'>-    scene-&gt;setLineColor(qVariantValue&lt;QColor&gt;(lineAction-&gt;data()));</div><div class='add'>+    scene-&gt;setLineColor(qvariant_cast&lt;QColor&gt;(lineAction-&gt;data()));</div><div class='ctx'> }</div><div class='ctx'> //! [17]</div><div class='ctx'> </div><div class='head'>diff --git a/examples/graphicsview/dragdroprobot/robot.cpp b/examples/graphicsview/dragdroprobot/robot.cpp<br/>index d9744b0..9494e7a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/graphicsview/dragdroprobot/robot.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/graphicsview/dragdroprobot/robot.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/graphicsview/dragdroprobot/robot.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/graphicsview/dragdroprobot/robot.cpp</a></div><div class='hunk'>@@ -77,7 +77,7 @@ void RobotPart::dropEvent(QGraphicsSceneDragDropEvent *event)</div><div class='ctx'> {</div><div class='ctx'>     dragOver = false;</div><div class='ctx'>     if (event-&gt;mimeData()-&gt;hasColor())</div><div class='del'>-        color = qVariantValue&lt;QColor&gt;(event-&gt;mimeData()-&gt;colorData());</div><div class='add'>+        color = qvariant_cast&lt;QColor&gt;(event-&gt;mimeData()-&gt;colorData());</div><div class='ctx'>     update();</div><div class='ctx'> }</div><div class='ctx'> //! [3]</div><div class='hunk'>@@ -139,7 +139,7 @@ void RobotHead::dropEvent(QGraphicsSceneDragDropEvent *event)</div><div class='ctx'> {</div><div class='ctx'>     if (event-&gt;mimeData()-&gt;hasImage()) {</div><div class='ctx'>         dragOver = false;</div><div class='del'>-        pixmap = qVariantValue&lt;QPixmap&gt;(event-&gt;mimeData()-&gt;imageData());</div><div class='add'>+        pixmap = qvariant_cast&lt;QPixmap&gt;(event-&gt;mimeData()-&gt;imageData());</div><div class='ctx'>         update();</div><div class='ctx'>     } else {</div><div class='ctx'>         RobotPart::dropEvent(event);</div><div class='head'>diff --git a/examples/graphicsview/flowlayout/flowlayout.pro b/examples/graphicsview/flowlayout/flowlayout.pro<br/>index c029d6c..ce35367 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/graphicsview/flowlayout/flowlayout.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/graphicsview/flowlayout/flowlayout.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/graphicsview/flowlayout/flowlayout.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/graphicsview/flowlayout/flowlayout.pro</a></div><div class='hunk'>@@ -1,12 +1,10 @@</div><div class='del'>-######################################################################</div><div class='del'>-# Automatically generated by qmake (2.01a) ma 30. mar 12:46:15 2009</div><div class='del'>-######################################################################</div><div class='del'>-</div><div class='ctx'> TEMPLATE = app</div><div class='ctx'> TARGET = </div><div class='ctx'> DEPENDPATH += .</div><div class='ctx'> INCLUDEPATH += .</div><div class='ctx'> </div><div class='add'>+QMAKE_PROJECT_NAME = flowlayout_graphicsview</div><div class='add'>+</div><div class='ctx'> # Input</div><div class='ctx'> HEADERS += flowlayout.h window.h</div><div class='ctx'> SOURCES += flowlayout.cpp main.cpp window.cpp</div><div class='head'>diff --git a/examples/graphicsview/padnavigator/padnavigator.cpp b/examples/graphicsview/padnavigator/padnavigator.cpp<br/>index 22962d9..3e57dcf 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/graphicsview/padnavigator/padnavigator.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/graphicsview/padnavigator/padnavigator.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/graphicsview/padnavigator/padnavigator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/graphicsview/padnavigator/padnavigator.cpp</a></div><div class='hunk'>@@ -135,9 +135,9 @@ PadNavigator::PadNavigator(const QSize &amp;size, QWidget *parent)</div><div class='ctx'>     smoothFlipRotation-&gt;setEasingCurve(QEasingCurve::InOutQuad);</div><div class='ctx'>     smoothFlipXRotation-&gt;setEasingCurve(QEasingCurve::InOutQuad);</div><div class='ctx'>     smoothFlipYRotation-&gt;setEasingCurve(QEasingCurve::InOutQuad);</div><div class='del'>-    smoothFlipScale-&gt;setKeyValueAt(0, qVariantValue&lt;qreal&gt;(1.0));</div><div class='del'>-    smoothFlipScale-&gt;setKeyValueAt(0.5, qVariantValue&lt;qreal&gt;(0.7));</div><div class='del'>-    smoothFlipScale-&gt;setKeyValueAt(1, qVariantValue&lt;qreal&gt;(1.0));</div><div class='add'>+    smoothFlipScale-&gt;setKeyValueAt(0, qvariant_cast&lt;qreal&gt;(1.0));</div><div class='add'>+    smoothFlipScale-&gt;setKeyValueAt(0.5, qvariant_cast&lt;qreal&gt;(0.7));</div><div class='add'>+    smoothFlipScale-&gt;setKeyValueAt(1, qvariant_cast&lt;qreal&gt;(1.0));</div><div class='ctx'>     flipAnimation-&gt;addAnimation(smoothFlipRotation);</div><div class='ctx'>     flipAnimation-&gt;addAnimation(smoothFlipScale);</div><div class='ctx'>     flipAnimation-&gt;addAnimation(smoothFlipXRotation);</div><div class='hunk'>@@ -172,13 +172,13 @@ PadNavigator::PadNavigator(const QSize &amp;size, QWidget *parent)</div><div class='ctx'>     frontState-&gt;assignProperty(pad, "fill", false);</div><div class='ctx'>     frontState-&gt;assignProperty(splash, "opacity", 0.0);</div><div class='ctx'>     frontState-&gt;assignProperty(backItem, "visible", false);</div><div class='del'>-    frontState-&gt;assignProperty(flipRotation, "angle", qVariantValue&lt;qreal&gt;(0.0));</div><div class='add'>+    frontState-&gt;assignProperty(flipRotation, "angle", qvariant_cast&lt;qreal&gt;(0.0));</div><div class='ctx'>     frontState-&gt;assignProperty(selectionItem, "visible", true);</div><div class='ctx'>     backState-&gt;assignProperty(pad, "fill", true);</div><div class='ctx'>     backState-&gt;assignProperty(backItem, "visible", true);</div><div class='del'>-    backState-&gt;assignProperty(xRotation, "angle", qVariantValue&lt;qreal&gt;(0.0));</div><div class='del'>-    backState-&gt;assignProperty(yRotation, "angle", qVariantValue&lt;qreal&gt;(0.0));</div><div class='del'>-    backState-&gt;assignProperty(flipRotation, "angle", qVariantValue&lt;qreal&gt;(180.0));</div><div class='add'>+    backState-&gt;assignProperty(xRotation, "angle", qvariant_cast&lt;qreal&gt;(0.0));</div><div class='add'>+    backState-&gt;assignProperty(yRotation, "angle", qvariant_cast&lt;qreal&gt;(0.0));</div><div class='add'>+    backState-&gt;assignProperty(flipRotation, "angle", qvariant_cast&lt;qreal&gt;(180.0));</div><div class='ctx'>     backState-&gt;assignProperty(selectionItem, "visible", false);</div><div class='ctx'>     stateMachine-&gt;addDefaultAnimation(smoothXRotation);</div><div class='ctx'>     stateMachine-&gt;addDefaultAnimation(smoothYRotation);</div><div class='head'>diff --git a/examples/itemviews/chart/chart.pro b/examples/itemviews/chart/chart.pro<br/>index 53601f4..12f08b9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/itemviews/chart/chart.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/itemviews/chart/chart.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/itemviews/chart/chart.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/itemviews/chart/chart.pro</a></div><div class='hunk'>@@ -4,7 +4,7 @@ RESOURCES   = chart.qrc</div><div class='ctx'> SOURCES     = main.cpp \</div><div class='ctx'>               mainwindow.cpp \</div><div class='ctx'>               pieview.cpp</div><div class='del'>-unix:!mac:!symbian:!vxworks:LIBS+= -lm</div><div class='add'>+unix:!mac:!symbian:!vxworks:!integrity:LIBS+= -lm</div><div class='ctx'> </div><div class='ctx'> TARGET.EPOCHEAPSIZE = 0x200000 0x800000</div><div class='ctx'> </div><div class='head'>diff --git a/examples/itemviews/coloreditorfactory/colorlisteditor.cpp b/examples/itemviews/coloreditorfactory/colorlisteditor.cpp<br/>index 6797316..d8ce45b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/itemviews/coloreditorfactory/colorlisteditor.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/itemviews/coloreditorfactory/colorlisteditor.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/itemviews/coloreditorfactory/colorlisteditor.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/itemviews/coloreditorfactory/colorlisteditor.cpp</a></div><div class='hunk'>@@ -50,7 +50,7 @@ ColorListEditor::ColorListEditor(QWidget *widget) : QComboBox(widget)</div><div class='ctx'> //! [0]</div><div class='ctx'> QColor ColorListEditor::color() const</div><div class='ctx'> {</div><div class='del'>-    return qVariantValue&lt;QColor&gt;(itemData(currentIndex(), Qt::DecorationRole));</div><div class='add'>+    return qvariant_cast&lt;QColor&gt;(itemData(currentIndex(), Qt::DecorationRole));</div><div class='ctx'> }</div><div class='ctx'> //! [0]</div><div class='ctx'> </div><div class='head'>diff --git a/examples/itemviews/puzzle/piecesmodel.cpp b/examples/itemviews/puzzle/piecesmodel.cpp<br/>index d7a37a9..4235050 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/itemviews/puzzle/piecesmodel.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/itemviews/puzzle/piecesmodel.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/itemviews/puzzle/piecesmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/itemviews/puzzle/piecesmodel.cpp</a></div><div class='hunk'>@@ -124,7 +124,7 @@ QMimeData *PiecesModel::mimeData(const QModelIndexList &amp;indexes) const</div><div class='ctx'> </div><div class='ctx'>     foreach (QModelIndex index, indexes) {</div><div class='ctx'>         if (index.isValid()) {</div><div class='del'>-            QPixmap pixmap = qVariantValue&lt;QPixmap&gt;(data(index, Qt::UserRole));</div><div class='add'>+            QPixmap pixmap = qvariant_cast&lt;QPixmap&gt;(data(index, Qt::UserRole));</div><div class='ctx'>             QPoint location = data(index, Qt::UserRole+1).toPoint();</div><div class='ctx'>             stream &lt;&lt; pixmap &lt;&lt; location;</div><div class='ctx'>         }</div><div class='head'>diff --git a/examples/itemviews/stardelegate/main.cpp b/examples/itemviews/stardelegate/main.cpp<br/>index 5ff9782..1af54d0 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/itemviews/stardelegate/main.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/itemviews/stardelegate/main.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/itemviews/stardelegate/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/itemviews/stardelegate/main.cpp</a></div><div class='hunk'>@@ -71,7 +71,7 @@ void populateTableWidget(QTableWidget *tableWidget)</div><div class='ctx'>         QTableWidgetItem *item2 = new QTableWidgetItem(staticData[row].artist);</div><div class='ctx'>         QTableWidgetItem *item3 = new QTableWidgetItem;</div><div class='ctx'>         item3-&gt;setData(0,</div><div class='del'>-                       qVariantFromValue(StarRating(staticData[row].rating)));</div><div class='add'>+                       QVariant::fromValue(StarRating(staticData[row].rating)));</div><div class='ctx'> </div><div class='ctx'>         tableWidget-&gt;setItem(row, 0, item0);</div><div class='ctx'>         tableWidget-&gt;setItem(row, 1, item1);</div><div class='head'>diff --git a/examples/itemviews/stardelegate/stardelegate.cpp b/examples/itemviews/stardelegate/stardelegate.cpp<br/>index 8a7a26c..c784da2 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/itemviews/stardelegate/stardelegate.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/itemviews/stardelegate/stardelegate.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/itemviews/stardelegate/stardelegate.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/itemviews/stardelegate/stardelegate.cpp</a></div><div class='hunk'>@@ -48,8 +48,8 @@</div><div class='ctx'> void StarDelegate::paint(QPainter *painter, const QStyleOptionViewItem &amp;option,</div><div class='ctx'>                          const QModelIndex &amp;index) const</div><div class='ctx'> {</div><div class='del'>-    if (qVariantCanConvert&lt;StarRating&gt;(index.data())) {</div><div class='del'>-        StarRating starRating = qVariantValue&lt;StarRating&gt;(index.data());</div><div class='add'>+    if (index.data().canConvert&lt;StarRating&gt;()) {</div><div class='add'>+        StarRating starRating = qvariant_cast&lt;StarRating&gt;(index.data());</div><div class='ctx'> </div><div class='ctx'>         if (option.state &amp; QStyle::State_Selected)</div><div class='ctx'>             painter-&gt;fillRect(option.rect, option.palette.highlight());</div><div class='hunk'>@@ -66,8 +66,8 @@ void StarDelegate::paint(QPainter *painter, const QStyleOptionViewItem &amp;option,</div><div class='ctx'> QSize StarDelegate::sizeHint(const QStyleOptionViewItem &amp;option,</div><div class='ctx'>                              const QModelIndex &amp;index) const</div><div class='ctx'> {</div><div class='del'>-    if (qVariantCanConvert&lt;StarRating&gt;(index.data())) {</div><div class='del'>-        StarRating starRating = qVariantValue&lt;StarRating&gt;(index.data());</div><div class='add'>+    if (index.data().canConvert&lt;StarRating&gt;()) {</div><div class='add'>+        StarRating starRating = qvariant_cast&lt;StarRating&gt;(index.data());</div><div class='ctx'>         return starRating.sizeHint();</div><div class='ctx'>     } else {</div><div class='ctx'>         return QStyledItemDelegate::sizeHint(option, index);</div><div class='hunk'>@@ -81,7 +81,7 @@ QWidget *StarDelegate::createEditor(QWidget *parent,</div><div class='ctx'>                                     const QModelIndex &amp;index) const</div><div class='ctx'> </div><div class='ctx'> {</div><div class='del'>-    if (qVariantCanConvert&lt;StarRating&gt;(index.data())) {</div><div class='add'>+    if (index.data().canConvert&lt;StarRating&gt;()) {</div><div class='ctx'>         StarEditor *editor = new StarEditor(parent);</div><div class='ctx'>         connect(editor, SIGNAL(editingFinished()),</div><div class='ctx'>                 this, SLOT(commitAndCloseEditor()));</div><div class='hunk'>@@ -96,8 +96,8 @@ QWidget *StarDelegate::createEditor(QWidget *parent,</div><div class='ctx'> void StarDelegate::setEditorData(QWidget *editor,</div><div class='ctx'>                                  const QModelIndex &amp;index) const</div><div class='ctx'> {</div><div class='del'>-    if (qVariantCanConvert&lt;StarRating&gt;(index.data())) {</div><div class='del'>-        StarRating starRating = qVariantValue&lt;StarRating&gt;(index.data());</div><div class='add'>+    if (index.data().canConvert&lt;StarRating&gt;()) {</div><div class='add'>+        StarRating starRating = qvariant_cast&lt;StarRating&gt;(index.data());</div><div class='ctx'>         StarEditor *starEditor = qobject_cast&lt;StarEditor *&gt;(editor);</div><div class='ctx'>         starEditor-&gt;setStarRating(starRating);</div><div class='ctx'>     } else {</div><div class='hunk'>@@ -110,9 +110,9 @@ void StarDelegate::setEditorData(QWidget *editor,</div><div class='ctx'> void StarDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,</div><div class='ctx'>                                 const QModelIndex &amp;index) const</div><div class='ctx'> {</div><div class='del'>-    if (qVariantCanConvert&lt;StarRating&gt;(index.data())) {</div><div class='add'>+    if (index.data().canConvert&lt;StarRating&gt;()) {</div><div class='ctx'>         StarEditor *starEditor = qobject_cast&lt;StarEditor *&gt;(editor);</div><div class='del'>-        model-&gt;setData(index, qVariantFromValue(starEditor-&gt;starRating()));</div><div class='add'>+        model-&gt;setData(index, QVariant::fromValue(starEditor-&gt;starRating()));</div><div class='ctx'>     } else {</div><div class='ctx'>         QStyledItemDelegate::setModelData(editor, model, index);</div><div class='ctx'>     }</div><div class='head'>diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp<br/>index 90d0b78..8af6ce7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/multimedia/audiodevices/audiodevices.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/multimedia/audiodevices/audiodevices.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/multimedia/audiodevices/audiodevices.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/multimedia/audiodevices/audiodevices.cpp</a></div><div class='hunk'>@@ -155,7 +155,7 @@ void AudioTest::modeChanged(int idx)</div><div class='ctx'> </div><div class='ctx'>     deviceBox-&gt;clear();</div><div class='ctx'>     foreach (const QAudioDeviceInfo &amp;deviceInfo, QAudioDeviceInfo::availableDevices(mode))</div><div class='del'>-        deviceBox-&gt;addItem(deviceInfo.deviceName(), qVariantFromValue(deviceInfo));</div><div class='add'>+        deviceBox-&gt;addItem(deviceInfo.deviceName(), QVariant::fromValue(deviceInfo));</div><div class='ctx'> </div><div class='ctx'>     deviceBox-&gt;setCurrentIndex(0);</div><div class='ctx'>     deviceChanged(0);</div><div class='head'>diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp<br/>index 05ed43f..9131551 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/multimedia/audioinput/audioinput.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/multimedia/audioinput/audioinput.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/multimedia/audioinput/audioinput.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/multimedia/audioinput/audioinput.cpp</a></div><div class='hunk'>@@ -237,7 +237,7 @@ void InputTest::initializeWindow()</div><div class='ctx'>     m_deviceBox = new QComboBox(this);</div><div class='ctx'>     QList&lt;QAudioDeviceInfo&gt; devices = QAudioDeviceInfo::availableDevices(QAudio::AudioInput);</div><div class='ctx'>     for(int i = 0; i &lt; devices.size(); ++i)</div><div class='del'>-        m_deviceBox-&gt;addItem(devices.at(i).deviceName(), qVariantFromValue(devices.at(i)));</div><div class='add'>+        m_deviceBox-&gt;addItem(devices.at(i).deviceName(), QVariant::fromValue(devices.at(i)));</div><div class='ctx'> </div><div class='ctx'>     connect(m_deviceBox, SIGNAL(activated(int)), SLOT(deviceChanged(int)));</div><div class='ctx'>     layout-&gt;addWidget(m_deviceBox);</div><div class='head'>diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp<br/>index 54e4e13..3e43b02 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/multimedia/audiooutput/audiooutput.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/multimedia/audiooutput/audiooutput.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/multimedia/audiooutput/audiooutput.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/multimedia/audiooutput/audiooutput.cpp</a></div><div class='hunk'>@@ -176,7 +176,7 @@ void AudioTest::initializeWindow()</div><div class='ctx'> </div><div class='ctx'>     m_deviceBox = new QComboBox(this);</div><div class='ctx'>     foreach (const QAudioDeviceInfo &amp;deviceInfo, QAudioDeviceInfo::availableDevices(QAudio::AudioOutput))</div><div class='del'>-        m_deviceBox-&gt;addItem(deviceInfo.deviceName(), qVariantFromValue(deviceInfo));</div><div class='add'>+        m_deviceBox-&gt;addItem(deviceInfo.deviceName(), QVariant::fromValue(deviceInfo));</div><div class='ctx'>     connect(m_deviceBox,SIGNAL(activated(int)),SLOT(deviceChanged(int)));</div><div class='ctx'>     layout-&gt;addWidget(m_deviceBox);</div><div class='ctx'> </div><div class='head'>diff --git a/examples/network/download/main.cpp b/examples/network/download/main.cpp<br/>index 5980ecd..1b7e54b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/network/download/main.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/network/download/main.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/network/download/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/network/download/main.cpp</a></div><div class='hunk'>@@ -45,12 +45,19 @@</div><div class='ctx'> #include &lt;QNetworkAccessManager&gt;</div><div class='ctx'> #include &lt;QNetworkRequest&gt;</div><div class='ctx'> #include &lt;QNetworkReply&gt;</div><div class='add'>+#include &lt;QSslError&gt;</div><div class='ctx'> #include &lt;QStringList&gt;</div><div class='ctx'> #include &lt;QTimer&gt;</div><div class='ctx'> #include &lt;QUrl&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> </div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+class QSslError;</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+QT_USE_NAMESPACE</div><div class='add'>+</div><div class='ctx'> class DownloadManager: public QObject</div><div class='ctx'> {</div><div class='ctx'>     Q_OBJECT</div><div class='hunk'>@@ -66,6 +73,7 @@ public:</div><div class='ctx'> public slots:</div><div class='ctx'>     void execute();</div><div class='ctx'>     void downloadFinished(QNetworkReply *reply);</div><div class='add'>+    void sslErrors(const QList&lt;QSslError&gt; &amp;errors);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> DownloadManager::DownloadManager()</div><div class='hunk'>@@ -78,6 +86,7 @@ void DownloadManager::doDownload(const QUrl &amp;url)</div><div class='ctx'> {</div><div class='ctx'>     QNetworkRequest request(url);</div><div class='ctx'>     QNetworkReply *reply = manager.get(request);</div><div class='add'>+    connect(reply, SIGNAL(sslErrors(QList&lt;QSslError&gt;)), SLOT(sslErrors(QList&lt;QSslError&gt;)));</div><div class='ctx'> </div><div class='ctx'>     currentDownloads.append(reply);</div><div class='ctx'> }</div><div class='hunk'>@@ -140,6 +149,14 @@ void DownloadManager::execute()</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void DownloadManager::sslErrors(const QList&lt;QSslError&gt; &amp;sslErrors)</div><div class='add'>+{</div><div class='add'>+#ifndef QT_NO_OPENSSL</div><div class='add'>+    foreach (const QSslError &amp;error, sslErrors)</div><div class='add'>+        fprintf(stderr, "SSL error: %s\n", qPrintable(error.errorString()));</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void DownloadManager::downloadFinished(QNetworkReply *reply)</div><div class='ctx'> {</div><div class='ctx'>     QUrl url = reply-&gt;url();</div><div class='head'>diff --git a/examples/network/multicastreceiver/main.cpp b/examples/network/multicastreceiver/main.cpp<br/>new file mode 100644<br/>index 0000000..0411631<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/network/multicastreceiver/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/network/multicastreceiver/main.cpp</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the examples of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:BSD$</div><div class='add'>+** You may use this file under the terms of the BSD license as follows:</div><div class='add'>+**</div><div class='add'>+** "Redistribution and use in source and binary forms, with or without</div><div class='add'>+** modification, are permitted provided that the following conditions are</div><div class='add'>+** met:</div><div class='add'>+**   * Redistributions of source code must retain the above copyright</div><div class='add'>+**     notice, this list of conditions and the following disclaimer.</div><div class='add'>+**   * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+**     notice, this list of conditions and the following disclaimer in</div><div class='add'>+**     the documentation and/or other materials provided with the</div><div class='add'>+**     distribution.</div><div class='add'>+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor</div><div class='add'>+**     the names of its contributors may be used to endorse or promote</div><div class='add'>+**     products derived from this software without specific prior written</div><div class='add'>+**     permission.</div><div class='add'>+**</div><div class='add'>+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</div><div class='add'>+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</div><div class='add'>+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR</div><div class='add'>+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT</div><div class='add'>+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,</div><div class='add'>+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY</div><div class='add'>+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</div><div class='add'>+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;QApplication&gt;</div><div class='add'>+</div><div class='add'>+#include "receiver.h"</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+    QApplication app(argc, argv);</div><div class='add'>+    Receiver receiver;</div><div class='add'>+    receiver.show();</div><div class='add'>+    return receiver.exec();</div><div class='add'>+}</div><div class='head'>diff --git a/examples/network/multicastreceiver/multicastreceiver.pro b/examples/network/multicastreceiver/multicastreceiver.pro<br/>new file mode 100644<br/>index 0000000..400c92e<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/network/multicastreceiver/multicastreceiver.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/network/multicastreceiver/multicastreceiver.pro</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+HEADERS       = receiver.h</div><div class='add'>+SOURCES       = receiver.cpp \</div><div class='add'>+                main.cpp</div><div class='add'>+QT           += network</div><div class='add'>+</div><div class='add'>+# install</div><div class='add'>+target.path = $$[QT_INSTALL_EXAMPLES]/network/multicastreceiver</div><div class='add'>+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS multicastreceiver.pro</div><div class='add'>+sources.path = $$[QT_INSTALL_EXAMPLES]/network/multicastreceiver</div><div class='add'>+INSTALLS += target sources</div><div class='add'>+</div><div class='add'>+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)</div><div class='head'>diff --git a/examples/network/multicastreceiver/receiver.cpp b/examples/network/multicastreceiver/receiver.cpp<br/>new file mode 100644<br/>index 0000000..77446b9<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/network/multicastreceiver/receiver.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/network/multicastreceiver/receiver.cpp</a></div><div class='hunk'>@@ -0,0 +1,84 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the examples of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:BSD$</div><div class='add'>+** You may use this file under the terms of the BSD license as follows:</div><div class='add'>+**</div><div class='add'>+** "Redistribution and use in source and binary forms, with or without</div><div class='add'>+** modification, are permitted provided that the following conditions are</div><div class='add'>+** met:</div><div class='add'>+**   * Redistributions of source code must retain the above copyright</div><div class='add'>+**     notice, this list of conditions and the following disclaimer.</div><div class='add'>+**   * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+**     notice, this list of conditions and the following disclaimer in</div><div class='add'>+**     the documentation and/or other materials provided with the</div><div class='add'>+**     distribution.</div><div class='add'>+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor</div><div class='add'>+**     the names of its contributors may be used to endorse or promote</div><div class='add'>+**     products derived from this software without specific prior written</div><div class='add'>+**     permission.</div><div class='add'>+**</div><div class='add'>+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</div><div class='add'>+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</div><div class='add'>+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR</div><div class='add'>+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT</div><div class='add'>+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,</div><div class='add'>+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY</div><div class='add'>+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</div><div class='add'>+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;QtGui&gt;</div><div class='add'>+#include &lt;QtNetwork&gt;</div><div class='add'>+</div><div class='add'>+#include "receiver.h"</div><div class='add'>+</div><div class='add'>+Receiver::Receiver(QWidget *parent)</div><div class='add'>+    : QDialog(parent)</div><div class='add'>+{</div><div class='add'>+    groupAddress = QHostAddress("239.255.43.21");</div><div class='add'>+</div><div class='add'>+    statusLabel = new QLabel(tr("Listening for multicasted messages"));</div><div class='add'>+    quitButton = new QPushButton(tr("&amp;Quit"));</div><div class='add'>+</div><div class='add'>+    udpSocket = new QUdpSocket(this);</div><div class='add'>+    udpSocket-&gt;bind(45454, QUdpSocket::ShareAddress);</div><div class='add'>+    udpSocket-&gt;joinMulticastGroup(groupAddress);</div><div class='add'>+</div><div class='add'>+    connect(udpSocket, SIGNAL(readyRead()),</div><div class='add'>+            this, SLOT(processPendingDatagrams()));</div><div class='add'>+    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));</div><div class='add'>+</div><div class='add'>+    QHBoxLayout *buttonLayout = new QHBoxLayout;</div><div class='add'>+    buttonLayout-&gt;addStretch(1);</div><div class='add'>+    buttonLayout-&gt;addWidget(quitButton);</div><div class='add'>+    buttonLayout-&gt;addStretch(1);</div><div class='add'>+</div><div class='add'>+    QVBoxLayout *mainLayout = new QVBoxLayout;</div><div class='add'>+    mainLayout-&gt;addWidget(statusLabel);</div><div class='add'>+    mainLayout-&gt;addLayout(buttonLayout);</div><div class='add'>+    setLayout(mainLayout);</div><div class='add'>+</div><div class='add'>+    setWindowTitle(tr("Multicast Receiver"));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Receiver::processPendingDatagrams()</div><div class='add'>+{</div><div class='add'>+    while (udpSocket-&gt;hasPendingDatagrams()) {</div><div class='add'>+        QByteArray datagram;</div><div class='add'>+        datagram.resize(udpSocket-&gt;pendingDatagramSize());</div><div class='add'>+        udpSocket-&gt;readDatagram(datagram.data(), datagram.size());</div><div class='add'>+        statusLabel-&gt;setText(tr("Received datagram: \"%1\"")</div><div class='add'>+                             .arg(datagram.data()));</div><div class='add'>+    }</div><div class='add'>+}</div><div class='head'>diff --git a/examples/network/multicastreceiver/receiver.h b/examples/network/multicastreceiver/receiver.h<br/>new file mode 100644<br/>index 0000000..fd1a673<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/network/multicastreceiver/receiver.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/network/multicastreceiver/receiver.h</a></div><div class='hunk'>@@ -0,0 +1,70 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the examples of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:BSD$</div><div class='add'>+** You may use this file under the terms of the BSD license as follows:</div><div class='add'>+**</div><div class='add'>+** "Redistribution and use in source and binary forms, with or without</div><div class='add'>+** modification, are permitted provided that the following conditions are</div><div class='add'>+** met:</div><div class='add'>+**   * Redistributions of source code must retain the above copyright</div><div class='add'>+**     notice, this list of conditions and the following disclaimer.</div><div class='add'>+**   * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+**     notice, this list of conditions and the following disclaimer in</div><div class='add'>+**     the documentation and/or other materials provided with the</div><div class='add'>+**     distribution.</div><div class='add'>+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor</div><div class='add'>+**     the names of its contributors may be used to endorse or promote</div><div class='add'>+**     products derived from this software without specific prior written</div><div class='add'>+**     permission.</div><div class='add'>+**</div><div class='add'>+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</div><div class='add'>+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</div><div class='add'>+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR</div><div class='add'>+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT</div><div class='add'>+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,</div><div class='add'>+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY</div><div class='add'>+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</div><div class='add'>+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef RECEIVER_H</div><div class='add'>+#define RECEIVER_H</div><div class='add'>+</div><div class='add'>+#include &lt;QDialog&gt;</div><div class='add'>+#include &lt;QHostAddress&gt;</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+class QLabel;</div><div class='add'>+class QPushButton;</div><div class='add'>+class QUdpSocket;</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+class Receiver : public QDialog</div><div class='add'>+{</div><div class='add'>+    Q_OBJECT</div><div class='add'>+</div><div class='add'>+public:</div><div class='add'>+    Receiver(QWidget *parent = 0);</div><div class='add'>+</div><div class='add'>+private slots:</div><div class='add'>+    void processPendingDatagrams();</div><div class='add'>+</div><div class='add'>+private:</div><div class='add'>+    QLabel *statusLabel;</div><div class='add'>+    QPushButton *quitButton;</div><div class='add'>+    QUdpSocket *udpSocket;</div><div class='add'>+    QHostAddress groupAddress;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/examples/network/multicastsender/main.cpp b/examples/network/multicastsender/main.cpp<br/>new file mode 100644<br/>index 0000000..56e35c9<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/network/multicastsender/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/network/multicastsender/main.cpp</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the examples of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:BSD$</div><div class='add'>+** You may use this file under the terms of the BSD license as follows:</div><div class='add'>+**</div><div class='add'>+** "Redistribution and use in source and binary forms, with or without</div><div class='add'>+** modification, are permitted provided that the following conditions are</div><div class='add'>+** met:</div><div class='add'>+**   * Redistributions of source code must retain the above copyright</div><div class='add'>+**     notice, this list of conditions and the following disclaimer.</div><div class='add'>+**   * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+**     notice, this list of conditions and the following disclaimer in</div><div class='add'>+**     the documentation and/or other materials provided with the</div><div class='add'>+**     distribution.</div><div class='add'>+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor</div><div class='add'>+**     the names of its contributors may be used to endorse or promote</div><div class='add'>+**     products derived from this software without specific prior written</div><div class='add'>+**     permission.</div><div class='add'>+**</div><div class='add'>+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</div><div class='add'>+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</div><div class='add'>+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR</div><div class='add'>+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT</div><div class='add'>+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,</div><div class='add'>+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY</div><div class='add'>+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</div><div class='add'>+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;QApplication&gt;</div><div class='add'>+</div><div class='add'>+#include "sender.h"</div><div class='add'>+</div><div class='add'>+int main(int argc, char *argv[])</div><div class='add'>+{</div><div class='add'>+    QApplication app(argc, argv);</div><div class='add'>+    Sender sender;</div><div class='add'>+    sender.show();</div><div class='add'>+    return sender.exec();</div><div class='add'>+}</div><div class='head'>diff --git a/examples/network/multicastsender/multicastsender.pro b/examples/network/multicastsender/multicastsender.pro<br/>new file mode 100644<br/>index 0000000..7543f00<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/network/multicastsender/multicastsender.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/network/multicastsender/multicastsender.pro</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+HEADERS       = sender.h</div><div class='add'>+SOURCES       = sender.cpp \</div><div class='add'>+                main.cpp</div><div class='add'>+QT           += network</div><div class='add'>+</div><div class='add'>+# install</div><div class='add'>+target.path = $$[QT_INSTALL_EXAMPLES]/network/multicastsender</div><div class='add'>+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS multicastsender.pro</div><div class='add'>+sources.path = $$[QT_INSTALL_EXAMPLES]/network/multicastsender</div><div class='add'>+INSTALLS += target sources</div><div class='add'>+</div><div class='add'>+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)</div><div class='head'>diff --git a/examples/network/multicastsender/sender.cpp b/examples/network/multicastsender/sender.cpp<br/>new file mode 100644<br/>index 0000000..aab94aa<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/network/multicastsender/sender.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/network/multicastsender/sender.cpp</a></div><div class='hunk'>@@ -0,0 +1,105 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the examples of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:BSD$</div><div class='add'>+** You may use this file under the terms of the BSD license as follows:</div><div class='add'>+**</div><div class='add'>+** "Redistribution and use in source and binary forms, with or without</div><div class='add'>+** modification, are permitted provided that the following conditions are</div><div class='add'>+** met:</div><div class='add'>+**   * Redistributions of source code must retain the above copyright</div><div class='add'>+**     notice, this list of conditions and the following disclaimer.</div><div class='add'>+**   * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+**     notice, this list of conditions and the following disclaimer in</div><div class='add'>+**     the documentation and/or other materials provided with the</div><div class='add'>+**     distribution.</div><div class='add'>+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor</div><div class='add'>+**     the names of its contributors may be used to endorse or promote</div><div class='add'>+**     products derived from this software without specific prior written</div><div class='add'>+**     permission.</div><div class='add'>+**</div><div class='add'>+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</div><div class='add'>+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</div><div class='add'>+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR</div><div class='add'>+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT</div><div class='add'>+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,</div><div class='add'>+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY</div><div class='add'>+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</div><div class='add'>+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;QtGui&gt;</div><div class='add'>+#include &lt;QtNetwork&gt;</div><div class='add'>+</div><div class='add'>+#include "sender.h"</div><div class='add'>+</div><div class='add'>+Sender::Sender(QWidget *parent)</div><div class='add'>+    : QDialog(parent)</div><div class='add'>+{</div><div class='add'>+    groupAddress = QHostAddress("239.255.43.21");</div><div class='add'>+</div><div class='add'>+    statusLabel = new QLabel(tr("Ready to multicast datagrams to group %1 on port 45454").arg(groupAddress.toString()));</div><div class='add'>+</div><div class='add'>+    ttlLabel = new QLabel(tr("TTL for multicast datagrams:"));</div><div class='add'>+    ttlSpinBox = new QSpinBox;</div><div class='add'>+    ttlSpinBox-&gt;setRange(0, 255);</div><div class='add'>+</div><div class='add'>+    QHBoxLayout *ttlLayout = new QHBoxLayout;</div><div class='add'>+    ttlLayout-&gt;addWidget(ttlLabel);</div><div class='add'>+    ttlLayout-&gt;addWidget(ttlSpinBox);</div><div class='add'>+</div><div class='add'>+    startButton = new QPushButton(tr("&amp;Start"));</div><div class='add'>+    quitButton = new QPushButton(tr("&amp;Quit"));</div><div class='add'>+</div><div class='add'>+    buttonBox = new QDialogButtonBox;</div><div class='add'>+    buttonBox-&gt;addButton(startButton, QDialogButtonBox::ActionRole);</div><div class='add'>+    buttonBox-&gt;addButton(quitButton, QDialogButtonBox::RejectRole);</div><div class='add'>+</div><div class='add'>+    timer = new QTimer(this);</div><div class='add'>+    udpSocket = new QUdpSocket(this);</div><div class='add'>+    messageNo = 1;</div><div class='add'>+</div><div class='add'>+    connect(ttlSpinBox, SIGNAL(valueChanged(int)), this, SLOT(ttlChanged(int)));</div><div class='add'>+    connect(startButton, SIGNAL(clicked()), this, SLOT(startSending()));</div><div class='add'>+    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));</div><div class='add'>+    connect(timer, SIGNAL(timeout()), this, SLOT(sendDatagram()));</div><div class='add'>+</div><div class='add'>+    QVBoxLayout *mainLayout = new QVBoxLayout;</div><div class='add'>+    mainLayout-&gt;addWidget(statusLabel);</div><div class='add'>+    mainLayout-&gt;addLayout(ttlLayout);</div><div class='add'>+    mainLayout-&gt;addWidget(buttonBox);</div><div class='add'>+    setLayout(mainLayout);</div><div class='add'>+</div><div class='add'>+    setWindowTitle(tr("Multicast Sender"));</div><div class='add'>+    ttlSpinBox-&gt;setValue(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Sender::ttlChanged(int newTtl)</div><div class='add'>+{</div><div class='add'>+    udpSocket-&gt;setSocketOption(QAbstractSocket::MulticastTtlOption, newTtl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Sender::startSending()</div><div class='add'>+{</div><div class='add'>+    startButton-&gt;setEnabled(false);</div><div class='add'>+    timer-&gt;start(1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void Sender::sendDatagram()</div><div class='add'>+{</div><div class='add'>+    statusLabel-&gt;setText(tr("Now sending datagram %1").arg(messageNo));</div><div class='add'>+    QByteArray datagram = "Multicast message " + QByteArray::number(messageNo);</div><div class='add'>+    udpSocket-&gt;writeDatagram(datagram.data(), datagram.size(),</div><div class='add'>+                             groupAddress, 45454);</div><div class='add'>+    ++messageNo;</div><div class='add'>+}</div><div class='head'>diff --git a/examples/network/multicastsender/sender.h b/examples/network/multicastsender/sender.h<br/>new file mode 100644<br/>index 0000000..75ce4c9<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/network/multicastsender/sender.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/network/multicastsender/sender.h</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the examples of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:BSD$</div><div class='add'>+** You may use this file under the terms of the BSD license as follows:</div><div class='add'>+**</div><div class='add'>+** "Redistribution and use in source and binary forms, with or without</div><div class='add'>+** modification, are permitted provided that the following conditions are</div><div class='add'>+** met:</div><div class='add'>+**   * Redistributions of source code must retain the above copyright</div><div class='add'>+**     notice, this list of conditions and the following disclaimer.</div><div class='add'>+**   * Redistributions in binary form must reproduce the above copyright</div><div class='add'>+**     notice, this list of conditions and the following disclaimer in</div><div class='add'>+**     the documentation and/or other materials provided with the</div><div class='add'>+**     distribution.</div><div class='add'>+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor</div><div class='add'>+**     the names of its contributors may be used to endorse or promote</div><div class='add'>+**     products derived from this software without specific prior written</div><div class='add'>+**     permission.</div><div class='add'>+**</div><div class='add'>+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</div><div class='add'>+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</div><div class='add'>+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR</div><div class='add'>+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT</div><div class='add'>+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,</div><div class='add'>+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY</div><div class='add'>+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</div><div class='add'>+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef SENDER_H</div><div class='add'>+#define SENDER_H</div><div class='add'>+</div><div class='add'>+#include &lt;QDialog&gt;</div><div class='add'>+#include &lt;QHostAddress&gt;</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+class QDialogButtonBox;</div><div class='add'>+class QLabel;</div><div class='add'>+class QPushButton;</div><div class='add'>+class QTimer;</div><div class='add'>+class QUdpSocket;</div><div class='add'>+class QSpinBox;</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+class Sender : public QDialog</div><div class='add'>+{</div><div class='add'>+    Q_OBJECT</div><div class='add'>+</div><div class='add'>+public:</div><div class='add'>+    Sender(QWidget *parent = 0);</div><div class='add'>+</div><div class='add'>+private slots:</div><div class='add'>+    void ttlChanged(int newTtl);</div><div class='add'>+    void startSending();</div><div class='add'>+    void sendDatagram();</div><div class='add'>+</div><div class='add'>+private:</div><div class='add'>+    QLabel *statusLabel;</div><div class='add'>+    QLabel *ttlLabel;</div><div class='add'>+    QSpinBox *ttlSpinBox;</div><div class='add'>+    QPushButton *startButton;</div><div class='add'>+    QPushButton *quitButton;</div><div class='add'>+    QDialogButtonBox *buttonBox;</div><div class='add'>+    QUdpSocket *udpSocket;</div><div class='add'>+    QTimer *timer;</div><div class='add'>+    QHostAddress groupAddress;</div><div class='add'>+    int messageNo;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/examples/network/network.pro b/examples/network/network.pro<br/>index 458561a..0012a97 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/network/network.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/network/network.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/network/network.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/network/network.pro</a></div><div class='hunk'>@@ -16,7 +16,9 @@ SUBDIRS       = \</div><div class='ctx'>                 threadedfortuneserver \</div><div class='ctx'>                 googlesuggest \</div><div class='ctx'>                 torrent \</div><div class='del'>-                bearermonitor</div><div class='add'>+                bearermonitor \</div><div class='add'>+                multicastreceiver \</div><div class='add'>+                multicastsender</div><div class='ctx'> </div><div class='ctx'>     contains(QT_CONFIG, svg) {</div><div class='ctx'>         SUBDIRS += bearercloud</div><div class='head'>diff --git a/examples/network/torrent/bencodeparser.cpp b/examples/network/torrent/bencodeparser.cpp<br/>index 2a93fb1..edb04c6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/network/torrent/bencodeparser.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/network/torrent/bencodeparser.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/network/torrent/bencodeparser.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/network/torrent/bencodeparser.cpp</a></div><div class='hunk'>@@ -171,7 +171,7 @@ bool BencodeParser::getList(QList&lt;QVariant&gt; *list)</div><div class='ctx'> 	else if (getList(&amp;tmpList))</div><div class='ctx'> 	    tmp &lt;&lt; tmpList;</div><div class='ctx'> 	else if (getDictionary(&amp;dictionary))</div><div class='del'>-	    tmp &lt;&lt; qVariantFromValue&lt;QMap&lt;QByteArray, QVariant&gt; &gt;(dictionary);</div><div class='add'>+	    tmp &lt;&lt; QVariant::fromValue&lt;QMap&lt;QByteArray, QVariant&gt; &gt;(dictionary);</div><div class='ctx'> 	else {</div><div class='ctx'> 	    errString = QString("error at index %1").arg(index);</div><div class='ctx'> 	    return false;</div><div class='hunk'>@@ -217,7 +217,7 @@ bool BencodeParser::getDictionary(QMap&lt;QByteArray, QVariant&gt; *dictionary)</div><div class='ctx'> 	else if (getList(&amp;tmpList))</div><div class='ctx'> 	    tmp.insert(key, tmpList);</div><div class='ctx'> 	else if (getDictionary(&amp;dictionary))</div><div class='del'>-	    tmp.insert(key, qVariantFromValue&lt;QMap&lt;QByteArray, QVariant&gt; &gt;(dictionary));</div><div class='add'>+	    tmp.insert(key, QVariant::fromValue&lt;QMap&lt;QByteArray, QVariant&gt; &gt;(dictionary));</div><div class='ctx'> 	else {</div><div class='ctx'> 	    errString = QString("error at index %1").arg(index);</div><div class='ctx'> 	    return false;</div><div class='head'>diff --git a/examples/network/torrent/metainfo.cpp b/examples/network/torrent/metainfo.cpp<br/>index 293be8f..ba55eba 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/network/torrent/metainfo.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/network/torrent/metainfo.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/network/torrent/metainfo.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/network/torrent/metainfo.cpp</a></div><div class='hunk'>@@ -83,7 +83,7 @@ bool MetaInfo::parse(const QByteArray &amp;data)</div><div class='ctx'>     if (!dict.contains("info"))</div><div class='ctx'>         return false;</div><div class='ctx'> </div><div class='del'>-    QMap&lt;QByteArray, QVariant&gt; info = qVariantValue&lt;Dictionary&gt;(dict.value("info"));</div><div class='add'>+    QMap&lt;QByteArray, QVariant&gt; info = qvariant_cast&lt;Dictionary&gt;(dict.value("info"));</div><div class='ctx'> </div><div class='ctx'>     if (info.contains("files")) {</div><div class='ctx'>         metaInfoFileForm = MultiFileForm;</div><div class='hunk'>@@ -91,7 +91,7 @@ bool MetaInfo::parse(const QByteArray &amp;data)</div><div class='ctx'>         QList&lt;QVariant&gt; files = info.value("files").toList();</div><div class='ctx'> </div><div class='ctx'>         for (int i = 0; i &lt; files.size(); ++i) {</div><div class='del'>-            QMap&lt;QByteArray, QVariant&gt; file = qVariantValue&lt;Dictionary&gt;(files.at(i));</div><div class='add'>+            QMap&lt;QByteArray, QVariant&gt; file = qvariant_cast&lt;Dictionary&gt;(files.at(i));</div><div class='ctx'>             QList&lt;QVariant&gt; pathElements = file.value("path").toList();</div><div class='ctx'>             QByteArray path;</div><div class='ctx'>             foreach (QVariant p, pathElements) {</div><div class='head'>diff --git a/examples/network/torrent/trackerclient.cpp b/examples/network/torrent/trackerclient.cpp<br/>index 71fe667..0b9a581 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/network/torrent/trackerclient.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/network/torrent/trackerclient.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/network/torrent/trackerclient.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/network/torrent/trackerclient.cpp</a></div><div class='hunk'>@@ -210,7 +210,7 @@ void TrackerClient::httpRequestDone(bool error)</div><div class='ctx'>             QList&lt;QVariant&gt; peerTmp = peerEntry.toList();</div><div class='ctx'>             for (int i = 0; i &lt; peerTmp.size(); ++i) {</div><div class='ctx'>                 TorrentPeer tmp;</div><div class='del'>-                QMap&lt;QByteArray, QVariant&gt; peer = qVariantValue&lt;QMap&lt;QByteArray, QVariant&gt; &gt;(peerTmp.at(i));</div><div class='add'>+                QMap&lt;QByteArray, QVariant&gt; peer = qvariant_cast&lt;QMap&lt;QByteArray, QVariant&gt; &gt;(peerTmp.at(i));</div><div class='ctx'>                 tmp.id = QString::fromUtf8(peer.value("peer id").toByteArray());</div><div class='ctx'>                 tmp.address.setAddress(QString::fromUtf8(peer.value("ip").toByteArray()));</div><div class='ctx'>                 tmp.port = peer.value("port").toInt();</div><div class='head'>diff --git a/examples/opengl/pbuffers/cube.cpp b/examples/opengl/pbuffers/cube.cpp<br/>index 5bd35e1..631595a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/opengl/pbuffers/cube.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/opengl/pbuffers/cube.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/opengl/pbuffers/cube.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/opengl/pbuffers/cube.cpp</a></div><div class='hunk'>@@ -46,7 +46,7 @@</div><div class='ctx'> </div><div class='ctx'> static const qreal FACE_SIZE = 0.4;</div><div class='ctx'> </div><div class='del'>-static const qreal speeds[] = { 1.8f, 2.4f, 3.6f };</div><div class='add'>+static const qreal speeds[] = { 3.8f, 4.4f, 5.6f };</div><div class='ctx'> static const qreal amplitudes[] = { 2.0f, 2.5f, 3.0f };</div><div class='ctx'> </div><div class='ctx'> static inline void qSetColor(float colorVec[], QColor c)</div><div class='hunk'>@@ -197,7 +197,8 @@ Tile *TileBuilder::newTile(const QVector3D &amp;loc) const</div><div class='ctx'> Cube::Cube(const QVector3D &amp;loc)</div><div class='ctx'>     : Tile(loc)</div><div class='ctx'>     , rot(0.0f)</div><div class='del'>-    , r(0), a(0)</div><div class='add'>+    , r(0)</div><div class='add'>+    , animGroup(0)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -234,8 +235,8 @@ void Cube::setRotation(qreal r)</div><div class='ctx'> </div><div class='ctx'> void Cube::removeBounce()</div><div class='ctx'> {</div><div class='del'>-    delete a;</div><div class='del'>-    a = 0;</div><div class='add'>+    delete animGroup;</div><div class='add'>+    animGroup = 0;</div><div class='ctx'>     delete r;</div><div class='ctx'>     r = 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -247,8 +248,8 @@ void Cube::startAnimation()</div><div class='ctx'>         r-&gt;start();</div><div class='ctx'>         r-&gt;setCurrentTime(startx);</div><div class='ctx'>     }</div><div class='del'>-    if (a)</div><div class='del'>-        a-&gt;start();</div><div class='add'>+    if (animGroup)</div><div class='add'>+        animGroup-&gt;start();</div><div class='ctx'>     if (rtn)</div><div class='ctx'>         rtn-&gt;start();</div><div class='ctx'> }</div><div class='hunk'>@@ -259,8 +260,8 @@ void Cube::setAnimationPaused(bool paused)</div><div class='ctx'>     {</div><div class='ctx'>         if (r)</div><div class='ctx'>             r-&gt;pause();</div><div class='del'>-        if (a)</div><div class='del'>-            a-&gt;pause();</div><div class='add'>+        if (animGroup)</div><div class='add'>+            animGroup-&gt;pause();</div><div class='ctx'>         if (rtn)</div><div class='ctx'>             rtn-&gt;pause();</div><div class='ctx'>     }</div><div class='hunk'>@@ -268,8 +269,8 @@ void Cube::setAnimationPaused(bool paused)</div><div class='ctx'>     {</div><div class='ctx'>         if (r)</div><div class='ctx'>             r-&gt;resume();</div><div class='del'>-        if (a)</div><div class='del'>-            a-&gt;resume();</div><div class='add'>+        if (animGroup)</div><div class='add'>+            animGroup-&gt;resume();</div><div class='ctx'>         if (rtn)</div><div class='ctx'>             rtn-&gt;resume();</div><div class='ctx'>     }</div><div class='hunk'>@@ -312,13 +313,29 @@ Cube *CubeBuilder::newCube(const QVector3D &amp;loc) const</div><div class='ctx'>     c-&gt;r-&gt;setDuration(d * 4.0f);</div><div class='ctx'>     c-&gt;r-&gt;setLoopCount(-1);</div><div class='ctx'>     c-&gt;r-&gt;setEasingCurve(QEasingCurve(QEasingCurve::CosineCurve));</div><div class='add'>+</div><div class='add'>+    c-&gt;animGroup = new QSequentialAnimationGroup(c);</div><div class='add'>+</div><div class='ctx'>     // Animate movement from bottom to top</div><div class='del'>-    c-&gt;a = new QPropertyAnimation(c, "altitude");</div><div class='del'>-    c-&gt;a-&gt;setEndValue(loc.y());</div><div class='del'>-    c-&gt;a-&gt;setStartValue(loc.y() + amplitudes[ix]);</div><div class='del'>-    c-&gt;a-&gt;setDuration(d / speeds[ix]);</div><div class='del'>-    c-&gt;a-&gt;setLoopCount(-1);</div><div class='del'>-    c-&gt;a-&gt;setEasingCurve(QEasingCurve(QEasingCurve::CosineCurve));</div><div class='add'>+    QPropertyAnimation *a_up = new QPropertyAnimation(c, "altitude", c-&gt;animGroup);</div><div class='add'>+    a_up-&gt;setEndValue(loc.y());</div><div class='add'>+    a_up-&gt;setStartValue(loc.y() + amplitudes[ix]);</div><div class='add'>+    a_up-&gt;setDuration(d / speeds[ix]);</div><div class='add'>+    a_up-&gt;setLoopCount(1);</div><div class='add'>+    a_up-&gt;setEasingCurve(QEasingCurve(QEasingCurve::InQuad));</div><div class='add'>+</div><div class='add'>+    // Animate movement from top to bottom</div><div class='add'>+    QPropertyAnimation *a_down = new QPropertyAnimation(c, "altitude", c-&gt;animGroup);</div><div class='add'>+    a_down-&gt;setEndValue(loc.y() + amplitudes[ix]);</div><div class='add'>+    a_down-&gt;setStartValue(loc.y());</div><div class='add'>+    a_down-&gt;setDuration(d / speeds[ix]);</div><div class='add'>+    a_down-&gt;setLoopCount(1);</div><div class='add'>+    a_down-&gt;setEasingCurve(QEasingCurve(QEasingCurve::OutQuad));</div><div class='add'>+</div><div class='add'>+    c-&gt;animGroup-&gt;addAnimation(a_up);</div><div class='add'>+    c-&gt;animGroup-&gt;addAnimation(a_down);</div><div class='add'>+    c-&gt;animGroup-&gt;setLoopCount(-1);</div><div class='add'>+</div><div class='ctx'>     // Animate rotation</div><div class='ctx'>     c-&gt;rtn = new QPropertyAnimation(c, "rotation");</div><div class='ctx'>     c-&gt;rtn-&gt;setStartValue(c-&gt;rot);</div><div class='head'>diff --git a/examples/opengl/pbuffers/cube.h b/examples/opengl/pbuffers/cube.h<br/>index 2577e76..5c985a3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/opengl/pbuffers/cube.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/opengl/pbuffers/cube.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/opengl/pbuffers/cube.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/opengl/pbuffers/cube.h</a></div><div class='hunk'>@@ -43,6 +43,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;QtOpenGL/qgl.h&gt;</div><div class='ctx'> #include &lt;QtCore/qvector.h&gt;</div><div class='add'>+#include &lt;QtCore/qsequentialanimationgroup.h&gt;</div><div class='ctx'> #include &lt;QtGui/qmatrix4x4.h&gt;</div><div class='ctx'> #include &lt;QtGui/qvector3d.h&gt;</div><div class='ctx'> #include &lt;QtGui/qvector2d.h&gt;</div><div class='hunk'>@@ -130,8 +131,8 @@ signals:</div><div class='ctx'> private:</div><div class='ctx'>     qreal rot;</div><div class='ctx'>     QPropertyAnimation *r;</div><div class='del'>-    QPropertyAnimation *a;</div><div class='ctx'>     QPropertyAnimation *rtn;</div><div class='add'>+    QSequentialAnimationGroup *animGroup;</div><div class='ctx'>     qreal startx;</div><div class='ctx'>     friend class CubeBuilder;</div><div class='ctx'> };</div><div class='head'>diff --git a/examples/opengl/pbuffers/glwidget.cpp b/examples/opengl/pbuffers/glwidget.cpp<br/>index 930cbc8..f6f89e5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/opengl/pbuffers/glwidget.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/opengl/pbuffers/glwidget.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/opengl/pbuffers/glwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/opengl/pbuffers/glwidget.cpp</a></div><div class='hunk'>@@ -135,7 +135,7 @@ void GLWidget::initializeGeometry()</div><div class='ctx'>     CubeBuilder cBuilder(geom, 0.5);</div><div class='ctx'>     cBuilder.setColor(QColor(255, 255, 255, 212));</div><div class='ctx'>     // build the 3 bouncing, spinning cubes</div><div class='del'>-    for (int i = 0; i &lt; 3; ++i)</div><div class='add'>+    for (int i = 3; i &gt; 0; --i)</div><div class='ctx'>         cubes.append(cBuilder.newCube(QVector3D((float)(i-1), -1.5f, 5 - i)));</div><div class='ctx'> </div><div class='ctx'>     // build the spinning cube which goes in the dynamic texture</div><div class='head'>diff --git a/examples/painting/painterpaths/painterpaths.pro b/examples/painting/painterpaths/painterpaths.pro<br/>index 1f42b41..d096fa6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/painting/painterpaths/painterpaths.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/painting/painterpaths/painterpaths.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/painting/painterpaths/painterpaths.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/painting/painterpaths/painterpaths.pro</a></div><div class='hunk'>@@ -3,7 +3,7 @@ HEADERS       = renderarea.h \</div><div class='ctx'> SOURCES       = main.cpp \</div><div class='ctx'>                 renderarea.cpp \</div><div class='ctx'>                 window.cpp</div><div class='del'>-unix:!mac:!symbian:!vxworks:LIBS += -lm</div><div class='add'>+unix:!mac:!symbian:!vxworks:!integrity:LIBS += -lm</div><div class='ctx'> </div><div class='ctx'> # install</div><div class='ctx'> target.path = $$[QT_INSTALL_EXAMPLES]/painting/painterpaths</div><div class='head'>diff --git a/examples/painting/svgviewer/svgviewer.pro b/examples/painting/svgviewer/svgviewer.pro<br/>index 4809b91..6417849 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/painting/svgviewer/svgviewer.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/painting/svgviewer/svgviewer.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/painting/svgviewer/svgviewer.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/painting/svgviewer/svgviewer.pro</a></div><div class='hunk'>@@ -17,7 +17,7 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/painting/svgviewer</div><div class='ctx'> INSTALLS += target sources</div><div class='ctx'> </div><div class='ctx'> wince*: {</div><div class='del'>-     addFiles.sources = files\\*.svg</div><div class='add'>+     addFiles.files = files\\*.svg</div><div class='ctx'>      addFiles.path = "\\My Documents"</div><div class='ctx'>      DEPLOYMENT += addFiles</div><div class='ctx'> }</div><div class='hunk'>@@ -25,7 +25,7 @@ wince*: {</div><div class='ctx'> symbian: {</div><div class='ctx'>      TARGET.UID3 = 0xA000A64E</div><div class='ctx'>      include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)</div><div class='del'>-     addFiles.sources = files\\*.svg</div><div class='add'>+     addFiles.files = files\\*.svg</div><div class='ctx'>      addFiles.path = .</div><div class='ctx'>      DEPLOYMENT += addFiles</div><div class='ctx'> }</div><div class='head'>diff --git a/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro b/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro<br/>index 0574b2d..67aa1ff 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/richtext/syntaxhighlighter/syntaxhighlighter.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/richtext/syntaxhighlighter/syntaxhighlighter.pro</a></div><div class='hunk'>@@ -13,7 +13,7 @@ INSTALLS += target sources</div><div class='ctx'> symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)</div><div class='ctx'> </div><div class='ctx'> wince*: {</div><div class='del'>-   addFiles.sources = main.cpp mainwindow.cpp</div><div class='add'>+   addFiles.files = main.cpp mainwindow.cpp</div><div class='ctx'>    addFiles.path = .</div><div class='ctx'>    DEPLOYMENT += addFiles</div><div class='ctx'> }</div><div class='head'>diff --git a/examples/richtext/textobject/svgtextobject.cpp b/examples/richtext/textobject/svgtextobject.cpp<br/>index cd37d14..57d7fcc 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/richtext/textobject/svgtextobject.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/richtext/textobject/svgtextobject.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/richtext/textobject/svgtextobject.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/richtext/textobject/svgtextobject.cpp</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> QSizeF SvgTextObject::intrinsicSize(QTextDocument * /*doc*/, int /*posInDocument*/,</div><div class='ctx'>                                     const QTextFormat &amp;format)</div><div class='ctx'> {</div><div class='del'>-    QImage bufferedImage = qVariantValue&lt;QImage&gt;(format.property(Window::SvgData));</div><div class='add'>+    QImage bufferedImage = qvariant_cast&lt;QImage&gt;(format.property(Window::SvgData));</div><div class='ctx'>     QSize size = bufferedImage.size();</div><div class='ctx'>     </div><div class='ctx'>     if (size.height() &gt; 25)</div><div class='hunk'>@@ -63,7 +63,7 @@ void SvgTextObject::drawObject(QPainter *painter, const QRectF &amp;rect,</div><div class='ctx'>                                QTextDocument * /*doc*/, int /*posInDocument*/,</div><div class='ctx'>                                const QTextFormat &amp;format)</div><div class='ctx'> {</div><div class='del'>-    QImage bufferedImage = qVariantValue&lt;QImage&gt;(format.property(Window::SvgData));</div><div class='add'>+    QImage bufferedImage = qvariant_cast&lt;QImage&gt;(format.property(Window::SvgData));</div><div class='ctx'> </div><div class='ctx'>     painter-&gt;drawImage(rect, bufferedImage);</div><div class='ctx'> }</div><div class='head'>diff --git a/examples/richtext/textobject/textobject.pro b/examples/richtext/textobject/textobject.pro<br/>index 4fa9cb0..222b0fe 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/richtext/textobject/textobject.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/richtext/textobject/textobject.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/richtext/textobject/textobject.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/richtext/textobject/textobject.pro</a></div><div class='hunk'>@@ -12,7 +12,7 @@ sources.files = $$SOURCES $$HEADERS *.pro</div><div class='ctx'> sources.path = $$[QT_INSTALL_EXAMPLES]/richtext/textobject</div><div class='ctx'> INSTALLS += target sources</div><div class='ctx'> </div><div class='del'>-filesToDeploy.sources = files/*.svg</div><div class='add'>+filesToDeploy.files = files/*.svg</div><div class='ctx'> filesToDeploy.path = files</div><div class='ctx'> DEPLOYMENT += filesToDeploy</div><div class='ctx'> </div><div class='head'>diff --git a/examples/script/calculator/calculator.pro b/examples/script/calculator/calculator.pro<br/>index 6385d7e..f328fc3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/script/calculator/calculator.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/script/calculator/calculator.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/script/calculator/calculator.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/script/calculator/calculator.pro</a></div><div class='hunk'>@@ -2,6 +2,7 @@ QT += script</div><div class='ctx'> CONFIG += uitools</div><div class='ctx'> RESOURCES += calculator.qrc</div><div class='ctx'> SOURCES += main.cpp</div><div class='add'>+QMAKE_PROJECT_NAME = scripted_calculator</div><div class='ctx'> </div><div class='ctx'> contains(QT_CONFIG, scripttools): QT += scripttools</div><div class='ctx'> </div><div class='head'>diff --git a/examples/script/calculator/main.cpp b/examples/script/calculator/main.cpp<br/>index 07cddbf..2b55fac 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/script/calculator/main.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/script/calculator/main.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/script/calculator/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/script/calculator/main.cpp</a></div><div class='hunk'>@@ -89,7 +89,7 @@ int main(int argc, char **argv)</div><div class='ctx'> //! [2]</div><div class='ctx'> </div><div class='ctx'> #if !defined(QT_NO_SCRIPTTOOLS)</div><div class='del'>-    QLineEdit *display = qFindChild&lt;QLineEdit*&gt;(ui, "display");</div><div class='add'>+    QLineEdit *display = ui-&gt;findChild&lt;QLineEdit*&gt;("display");</div><div class='ctx'>     QObject::connect(display, SIGNAL(returnPressed()),</div><div class='ctx'>                      debugWindow, SLOT(show()));</div><div class='ctx'> #endif</div><div class='head'>diff --git a/examples/script/context2d/context2d.cpp b/examples/script/context2d/context2d.cpp<br/>index 1023da6..ca6c85e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/script/context2d/context2d.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/script/context2d/context2d.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/script/context2d/context2d.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/script/context2d/context2d.cpp</a></div><div class='hunk'>@@ -278,7 +278,7 @@ QVariant Context2D::strokeStyle() const</div><div class='ctx'> </div><div class='ctx'> void Context2D::setStrokeStyle(const QVariant &amp;style)</div><div class='ctx'> {</div><div class='del'>-    if (qVariantCanConvert&lt;CanvasGradient&gt;(style)) {</div><div class='add'>+    if (style.canConvert&lt;CanvasGradient&gt;()) {</div><div class='ctx'>         CanvasGradient cg = qvariant_cast&lt;CanvasGradient&gt;(style);</div><div class='ctx'>         m_state.strokeStyle = cg.value;</div><div class='ctx'>     } else {</div><div class='hunk'>@@ -296,7 +296,7 @@ QVariant Context2D::fillStyle() const</div><div class='ctx'> //! [3]</div><div class='ctx'> void Context2D::setFillStyle(const QVariant &amp;style)</div><div class='ctx'> {</div><div class='del'>-    if (qVariantCanConvert&lt;CanvasGradient&gt;(style)) {</div><div class='add'>+    if (style.canConvert&lt;CanvasGradient&gt;()) {</div><div class='ctx'>         CanvasGradient cg = qvariant_cast&lt;CanvasGradient&gt;(style);</div><div class='ctx'>         m_state.fillStyle = cg.value;</div><div class='ctx'>     } else {</div><div class='head'>diff --git a/examples/script/context2d/context2d.pro b/examples/script/context2d/context2d.pro<br/>index 54f5c31..6a0e397 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/script/context2d/context2d.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/script/context2d/context2d.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/script/context2d/context2d.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/script/context2d/context2d.pro</a></div><div class='hunk'>@@ -27,6 +27,6 @@ symbian:{</div><div class='ctx'>     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)</div><div class='ctx'>     TARGET.EPOCHEAPSIZE = 0x200000 0xA00000</div><div class='ctx'>     contextScripts.path = .</div><div class='del'>-    contextScripts.sources = scripts</div><div class='add'>+    contextScripts.files = scripts</div><div class='ctx'>     DEPLOYMENT += contextScripts</div><div class='ctx'> }</div><div class='head'>diff --git a/examples/script/context2d/domimage.cpp b/examples/script/context2d/domimage.cpp<br/>index 07bcf4a..6918c1a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/script/context2d/domimage.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/script/context2d/domimage.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/script/context2d/domimage.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/script/context2d/domimage.cpp</a></div><div class='hunk'>@@ -84,7 +84,7 @@ static QScriptValue Image(QScriptContext *context, QScriptEngine *env)</div><div class='ctx'> {</div><div class='ctx'>     QScriptValue val = context-&gt;thisObject();</div><div class='ctx'>     DomImage *image = new DomImage();</div><div class='del'>-    QScriptValue klass = env-&gt;newVariant(qVariantFromValue(image));</div><div class='add'>+    QScriptValue klass = env-&gt;newVariant(QVariant::fromValue(image));</div><div class='ctx'>     klass.setPrototype(DomImage::s_self);</div><div class='ctx'>     return klass;</div><div class='ctx'> }</div><div class='head'>diff --git a/examples/script/context2d/environment.cpp b/examples/script/context2d/environment.cpp<br/>index 7d6d6f8..e68c1ca 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/script/context2d/environment.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/script/context2d/environment.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/script/context2d/environment.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/script/context2d/environment.cpp</a></div><div class='hunk'>@@ -363,6 +363,23 @@ QScriptValue Environment::evaluate(const QString &amp;code, const QString &amp;fileName)</div><div class='ctx'>     return m_engine-&gt;evaluate(code, fileName);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool Environment::hasIntervalTimers() const</div><div class='add'>+{</div><div class='add'>+    return !m_intervalHash.isEmpty();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// This is used by the Context2D QtScript benchmark.</div><div class='add'>+void Environment::triggerTimers()</div><div class='add'>+{</div><div class='add'>+    for (int x = 0; x &lt; 2; ++x) {</div><div class='add'>+        QList&lt;int&gt; timerIds = x ? m_intervalHash.keys() : m_timeoutHash.keys();</div><div class='add'>+        for (int i = 0; i &lt; timerIds.size(); ++i) {</div><div class='add'>+            QTimerEvent fakeEvent(timerIds.at(i));</div><div class='add'>+            timerEvent(&amp;fakeEvent);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> //! [2]</div><div class='ctx'> QScriptValue Environment::toWrapper(QObject *object)</div><div class='ctx'> {</div><div class='head'>diff --git a/examples/script/context2d/environment.h b/examples/script/context2d/environment.h<br/>index dd92e85..221875f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/script/context2d/environment.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/script/context2d/environment.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/script/context2d/environment.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/script/context2d/environment.h</a></div><div class='hunk'>@@ -78,6 +78,8 @@ public:</div><div class='ctx'> //! [0]</div><div class='ctx'> </div><div class='ctx'>     QScriptEngine *engine() const;</div><div class='add'>+    bool hasIntervalTimers() const;</div><div class='add'>+    void triggerTimers();</div><div class='ctx'> </div><div class='ctx'> //! [1]</div><div class='ctx'> public slots:</div><div class='head'>diff --git a/examples/script/customclass/bytearrayclass.cpp b/examples/script/customclass/bytearrayclass.cpp<br/>index 13f70bf..f325398 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/script/customclass/bytearrayclass.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/script/customclass/bytearrayclass.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/script/customclass/bytearrayclass.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/script/customclass/bytearrayclass.cpp</a></div><div class='hunk'>@@ -88,7 +88,7 @@ ByteArrayClass::ByteArrayClass(QScriptEngine *engine)</div><div class='ctx'>     proto.setPrototype(global.property("Object").property("prototype"));</div><div class='ctx'> </div><div class='ctx'>     ctor = engine-&gt;newFunction(construct, proto);</div><div class='del'>-    ctor.setData(qScriptValueFromValue(engine, this));</div><div class='add'>+    ctor.setData(engine-&gt;toScriptValue(this));</div><div class='ctx'> }</div><div class='ctx'> //! [0]</div><div class='ctx'> </div><div class='hunk'>@@ -204,7 +204,7 @@ QScriptValue ByteArrayClass::newInstance(int size)</div><div class='ctx'> //! [1]</div><div class='ctx'> QScriptValue ByteArrayClass::newInstance(const QByteArray &amp;ba)</div><div class='ctx'> {</div><div class='del'>-    QScriptValue data = engine()-&gt;newVariant(qVariantFromValue(ba));</div><div class='add'>+    QScriptValue data = engine()-&gt;newVariant(QVariant::fromValue(ba));</div><div class='ctx'>     return engine()-&gt;newObject(this, data);</div><div class='ctx'> }</div><div class='ctx'> //! [1]</div><div class='hunk'>@@ -228,7 +228,7 @@ QScriptValue ByteArrayClass::toScriptValue(QScriptEngine *eng, const QByteArray</div><div class='ctx'>     QScriptValue ctor = eng-&gt;globalObject().property("ByteArray");</div><div class='ctx'>     ByteArrayClass *cls = qscriptvalue_cast&lt;ByteArrayClass*&gt;(ctor.data());</div><div class='ctx'>     if (!cls)</div><div class='del'>-        return eng-&gt;newVariant(qVariantFromValue(ba));</div><div class='add'>+        return eng-&gt;newVariant(QVariant::fromValue(ba));</div><div class='ctx'>     return cls-&gt;newInstance(ba);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/examples/script/customclass/main.cpp b/examples/script/customclass/main.cpp<br/>index 16e2a9f..054c71c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/script/customclass/main.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/script/customclass/main.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/script/customclass/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/script/customclass/main.cpp</a></div><div class='hunk'>@@ -38,6 +38,8 @@</div><div class='ctx'> **</div><div class='ctx'> ****************************************************************************/</div><div class='ctx'> </div><div class='add'>+#include &lt;QCoreApplication&gt;</div><div class='add'>+#include &lt;QtDebug&gt;</div><div class='ctx'> #include &lt;QtScript&gt;</div><div class='ctx'> #include "bytearrayclass.h"</div><div class='ctx'> </div><div class='head'>diff --git a/examples/script/helloscript/main.cpp b/examples/script/helloscript/main.cpp<br/>index 343a561..3bf91a0 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/script/helloscript/main.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/script/helloscript/main.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/script/helloscript/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/script/helloscript/main.cpp</a></div><div class='hunk'>@@ -39,8 +39,11 @@</div><div class='ctx'> ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include &lt;QApplication&gt;</div><div class='add'>+#include &lt;QFile&gt;</div><div class='ctx'> #include &lt;QMessageBox&gt;</div><div class='ctx'> #include &lt;QPushButton&gt;</div><div class='add'>+#include &lt;QTextStream&gt;</div><div class='add'>+#include &lt;QTranslator&gt;</div><div class='ctx'> #include &lt;QtScript&gt;</div><div class='ctx'> </div><div class='ctx'> //! [0]</div><div class='head'>diff --git a/examples/script/marshal/main.cpp b/examples/script/marshal/main.cpp<br/>index 43186e7..8ece03f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/script/marshal/main.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/script/marshal/main.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/script/marshal/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/script/marshal/main.cpp</a></div><div class='hunk'>@@ -49,7 +49,7 @@ QScriptValue toScriptValue(QScriptEngine *eng, const Container &amp;cont)</div><div class='ctx'>     typename Container::const_iterator end = cont.end();</div><div class='ctx'>     typename Container::const_iterator it;</div><div class='ctx'>     for (it = begin; it != end; ++it)</div><div class='del'>-        a.setProperty(quint32(it - begin), qScriptValueFromValue(eng, *it));</div><div class='add'>+        a.setProperty(quint32(it - begin), eng-&gt;toScriptValue(*it));</div><div class='ctx'>     return a;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/examples/script/qstetrix/main.cpp b/examples/script/qstetrix/main.cpp<br/>index 0939eec..1ecad97 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/script/qstetrix/main.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/script/qstetrix/main.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/script/qstetrix/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/script/qstetrix/main.cpp</a></div><div class='hunk'>@@ -120,7 +120,7 @@ int main(int argc, char *argv[])</div><div class='ctx'>     QScriptValue tetrix = ctor.construct(QScriptValueList() &lt;&lt; scriptUi);</div><div class='ctx'> //! [3]</div><div class='ctx'> </div><div class='del'>-    QPushButton *debugButton = qFindChild&lt;QPushButton*&gt;(ui, "debugButton");</div><div class='add'>+    QPushButton *debugButton = ui-&gt;findChild&lt;QPushButton*&gt;("debugButton");</div><div class='ctx'> #if !defined(QT_NO_SCRIPTTOOLS)</div><div class='ctx'>     QObject::connect(debugButton, SIGNAL(clicked()),</div><div class='ctx'>                      debugger.action(QScriptEngineDebugger::InterruptAction),</div><div class='head'>diff --git a/examples/sql/querymodel/customsqlmodel.cpp b/examples/sql/querymodel/customsqlmodel.cpp<br/>index 0671ad2..5b09dd6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/sql/querymodel/customsqlmodel.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/sql/querymodel/customsqlmodel.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/sql/querymodel/customsqlmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/sql/querymodel/customsqlmodel.cpp</a></div><div class='hunk'>@@ -58,7 +58,7 @@ QVariant CustomSqlModel::data(const QModelIndex &amp;index, int role) const</div><div class='ctx'>             return value.toString().toUpper();</div><div class='ctx'>     }</div><div class='ctx'>     if (role == Qt::TextColorRole &amp;&amp; index.column() == 1)</div><div class='del'>-        return qVariantFromValue(QColor(Qt::blue));</div><div class='add'>+        return QVariant::fromValue(QColor(Qt::blue));</div><div class='ctx'>     return value;</div><div class='ctx'> }</div><div class='ctx'> //! [0]</div><div class='head'>diff --git a/examples/threads/mandelbrot/mandelbrot.pro b/examples/threads/mandelbrot/mandelbrot.pro<br/>index ecbec56..2db886b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/threads/mandelbrot/mandelbrot.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/threads/mandelbrot/mandelbrot.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/threads/mandelbrot/mandelbrot.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/threads/mandelbrot/mandelbrot.pro</a></div><div class='hunk'>@@ -4,7 +4,7 @@ SOURCES       = main.cpp \</div><div class='ctx'>                 mandelbrotwidget.cpp \</div><div class='ctx'>                 renderthread.cpp</div><div class='ctx'> </div><div class='del'>-unix:!mac:!symbian:!vxworks:LIBS += -lm</div><div class='add'>+unix:!mac:!symbian:!vxworks:!integrity:LIBS += -lm</div><div class='ctx'> </div><div class='ctx'> # install</div><div class='ctx'> target.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot</div><div class='head'>diff --git a/examples/tools/customtype/main.cpp b/examples/tools/customtype/main.cpp<br/>index b326d5a..6bb5889 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/tools/customtype/main.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/tools/customtype/main.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/tools/customtype/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/tools/customtype/main.cpp</a></div><div class='hunk'>@@ -65,7 +65,7 @@ int main(int argc, char *argv[])</div><div class='ctx'> //! [retrieving a custom value]</div><div class='ctx'>     Message retrieved = stored.value&lt;Message&gt;();</div><div class='ctx'>     qDebug() &lt;&lt; "Retrieved:" &lt;&lt; retrieved;</div><div class='del'>-    retrieved = qVariantValue&lt;Message&gt;(stored);</div><div class='add'>+    retrieved = qvariant_cast&lt;Message&gt;(stored);</div><div class='ctx'>     qDebug() &lt;&lt; "Retrieved:" &lt;&lt; retrieved;</div><div class='ctx'> //! [retrieving a custom value]</div><div class='ctx'> </div><div class='head'>diff --git a/examples/tools/echoplugin/echowindow/echowindow.pro b/examples/tools/echoplugin/echowindow/echowindow.pro<br/>index d56961c..67c5237 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/tools/echoplugin/echowindow/echowindow.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/tools/echoplugin/echowindow/echowindow.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/tools/echoplugin/echowindow/echowindow.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/tools/echoplugin/echowindow/echowindow.pro</a></div><div class='hunk'>@@ -4,6 +4,7 @@ SOURCES    = echowindow.cpp \</div><div class='ctx'>              main.cpp</div><div class='ctx'> </div><div class='ctx'> TARGET     = echoplugin</div><div class='add'>+QMAKE_PROJECT_NAME = echopluginwindow</div><div class='ctx'> win32 {</div><div class='ctx'>     CONFIG(debug, release|debug):DESTDIR = ../debug/</div><div class='ctx'>     CONFIG(release, release|debug):DESTDIR = ../release/</div><div class='head'>diff --git a/examples/uitools/textfinder/textfinder.cpp b/examples/uitools/textfinder/textfinder.cpp<br/>index 660ef41..0a69d5e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/uitools/textfinder/textfinder.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/uitools/textfinder/textfinder.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/uitools/textfinder/textfinder.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/uitools/textfinder/textfinder.cpp</a></div><div class='hunk'>@@ -49,9 +49,9 @@ TextFinder::TextFinder(QWidget *parent)</div><div class='ctx'>     QWidget *formWidget = loadUiFile();</div><div class='ctx'> </div><div class='ctx'> //! [1]</div><div class='del'>-    ui_findButton = qFindChild&lt;QPushButton*&gt;(this, "findButton");</div><div class='del'>-    ui_textEdit = qFindChild&lt;QTextEdit*&gt;(this, "textEdit");</div><div class='del'>-    ui_lineEdit = qFindChild&lt;QLineEdit*&gt;(this, "lineEdit");</div><div class='add'>+    ui_findButton = findChild&lt;QPushButton*&gt;("findButton");</div><div class='add'>+    ui_textEdit = findChild&lt;QTextEdit*&gt;("textEdit");</div><div class='add'>+    ui_lineEdit = findChild&lt;QLineEdit*&gt;("lineEdit");</div><div class='ctx'> //! [0] //! [1]</div><div class='ctx'> </div><div class='ctx'> //! [2]</div><div class='head'>diff --git a/examples/webkit/imageanalyzer/imageanalyzer.h b/examples/webkit/imageanalyzer/imageanalyzer.h<br/>index 1708eb5..cdd07e8 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/webkit/imageanalyzer/imageanalyzer.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/webkit/imageanalyzer/imageanalyzer.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/webkit/imageanalyzer/imageanalyzer.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/webkit/imageanalyzer/imageanalyzer.h</a></div><div class='hunk'>@@ -38,15 +38,17 @@</div><div class='ctx'> **</div><div class='ctx'> ****************************************************************************/</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #ifndef IMAGEANALYZER_H</div><div class='ctx'> #define IMAGEANALYZER_H</div><div class='add'>+</div><div class='ctx'> #include &lt;QFutureWatcher&gt;</div><div class='ctx'> #include &lt;QtGui&gt;</div><div class='ctx'> </div><div class='del'>-QT_FORWARD_DECLARE_CLASS(QNetworkAccessManager)</div><div class='del'>-QT_FORWARD_DECLARE_CLASS(QNetworkReply)</div><div class='del'>-QT_FORWARD_DECLARE_CLASS(QNetworkDiskCache)</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+class QNetworkAccessManager;</div><div class='add'>+class QNetworkReply;</div><div class='add'>+class QNetworkDiskCache;</div><div class='add'>+QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> //! [ ImageAnalyzer - public interface ]</div><div class='ctx'> class ImageAnalyzer : public QObject</div><div class='head'>diff --git a/examples/webkit/imageanalyzer/mainwindow.h b/examples/webkit/imageanalyzer/mainwindow.h<br/>index 7e69420..bd5309d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/webkit/imageanalyzer/mainwindow.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/webkit/imageanalyzer/mainwindow.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/webkit/imageanalyzer/mainwindow.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/webkit/imageanalyzer/mainwindow.h</a></div><div class='hunk'>@@ -45,7 +45,9 @@</div><div class='ctx'> #include &lt;QWebView&gt;</div><div class='ctx'> </div><div class='ctx'> class ImageAnalyzer;</div><div class='del'>-QT_FORWARD_DECLARE_CLASS(QNetworkDiskCache)</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+class QNetworkDiskCache;</div><div class='add'>+QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> class MainWin : public QWebView</div><div class='ctx'> {</div><div class='head'>diff --git a/examples/widgets/icons/icons.pro b/examples/widgets/icons/icons.pro<br/>index 39c7ab2..48b2da9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/widgets/icons/icons.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/widgets/icons/icons.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/widgets/icons/icons.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/widgets/icons/icons.pro</a></div><div class='hunk'>@@ -17,7 +17,7 @@ INSTALLS += target sources</div><div class='ctx'> symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)</div><div class='ctx'> </div><div class='ctx'> wince*: {</div><div class='del'>-    imageFiles.sources = images/*</div><div class='add'>+    imageFiles.files = images/*</div><div class='ctx'>     wincewm*: {</div><div class='ctx'>         imageFiles.path = "/My Documents/My Pictures"</div><div class='ctx'>     } else {</div><div class='head'>diff --git a/examples/widgets/movie/movie.pro b/examples/widgets/movie/movie.pro<br/>index 517fec7..d59bf2e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/widgets/movie/movie.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/widgets/movie/movie.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/widgets/movie/movie.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/widgets/movie/movie.pro</a></div><div class='hunk'>@@ -11,7 +11,7 @@ INSTALLS += target sources</div><div class='ctx'> symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)</div><div class='ctx'> </div><div class='ctx'> wince*: {</div><div class='del'>-   addFiles.sources += *.mng</div><div class='add'>+   addFiles.files += *.mng</div><div class='ctx'>    addFiles.path = .</div><div class='ctx'>    DEPLOYMENT += addFiles</div><div class='ctx'>    DEPLOYMENT_PLUGIN += qmng</div><div class='head'>diff --git a/examples/widgets/validators/localeselector.cpp b/examples/widgets/validators/localeselector.cpp<br/>index 6a3ad2c..bcf5d91 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/widgets/validators/localeselector.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/widgets/validators/localeselector.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/widgets/validators/localeselector.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/widgets/validators/localeselector.cpp</a></div><div class='hunk'>@@ -294,7 +294,7 @@ LocaleSelector::LocaleSelector(QWidget *parent)</div><div class='ctx'>         QString text = QLocale::languageToString(QLocale::Language(l.lang))</div><div class='ctx'>                         + QLatin1Char('/')</div><div class='ctx'>                         + QLocale::countryToString(QLocale::Country(l.country));</div><div class='del'>-        addItem(text, qVariantFromValue(l));</div><div class='add'>+        addItem(text, QVariant::fromValue(l));</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     setCurrentIndex(curIndex);</div><div class='hunk'>@@ -307,6 +307,6 @@ void LocaleSelector::emitLocaleSelected(int index)</div><div class='ctx'>     QVariant v = itemData(index);</div><div class='ctx'>     if (!v.isValid())</div><div class='ctx'>         return;</div><div class='del'>-    SupportedLocale l = qVariantValue&lt;SupportedLocale&gt;(v);</div><div class='add'>+    SupportedLocale l = qvariant_cast&lt;SupportedLocale&gt;(v);</div><div class='ctx'>     emit localeSelected(QLocale(QLocale::Language(l.lang), QLocale::Country(l.country)));</div><div class='ctx'> }</div><div class='head'>diff --git a/examples/xml/dombookmarks/dombookmarks.pro b/examples/xml/dombookmarks/dombookmarks.pro<br/>index f906d2f..80bbec4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/xml/dombookmarks/dombookmarks.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/xml/dombookmarks/dombookmarks.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/xml/dombookmarks/dombookmarks.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/xml/dombookmarks/dombookmarks.pro</a></div><div class='hunk'>@@ -14,7 +14,7 @@ INSTALLS += target sources</div><div class='ctx'> symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)</div><div class='ctx'> </div><div class='ctx'> wince*: {</div><div class='del'>-     addFiles.sources = frank.xbel jennifer.xbel</div><div class='add'>+     addFiles.files = frank.xbel jennifer.xbel</div><div class='ctx'>      addFiles.path = "\\My Documents"</div><div class='ctx'>      DEPLOYMENT += addFiles</div><div class='ctx'> }</div><div class='head'>diff --git a/examples/xml/htmlinfo/htmlinfo.pro b/examples/xml/htmlinfo/htmlinfo.pro<br/>index 5e9c8ca..94b3a07 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/xml/htmlinfo/htmlinfo.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/xml/htmlinfo/htmlinfo.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/xml/htmlinfo/htmlinfo.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/xml/htmlinfo/htmlinfo.pro</a></div><div class='hunk'>@@ -2,7 +2,7 @@ SOURCES += main.cpp</div><div class='ctx'> QT -= gui</div><div class='ctx'> </div><div class='ctx'> wince*|symbian:{</div><div class='del'>-   htmlfiles.sources = *.html</div><div class='add'>+   htmlfiles.files = *.html</div><div class='ctx'>    htmlfiles.path = .</div><div class='ctx'>    DEPLOYMENT += htmlfiles</div><div class='ctx'> }</div><div class='head'>diff --git a/examples/xml/saxbookmarks/saxbookmarks.pro b/examples/xml/saxbookmarks/saxbookmarks.pro<br/>index 7293bd1..d4b09b6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/xml/saxbookmarks/saxbookmarks.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/xml/saxbookmarks/saxbookmarks.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/xml/saxbookmarks/saxbookmarks.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/xml/saxbookmarks/saxbookmarks.pro</a></div><div class='hunk'>@@ -14,7 +14,7 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/xml/saxbookmarks</div><div class='ctx'> INSTALLS += target sources</div><div class='ctx'> </div><div class='ctx'> wince*: {</div><div class='del'>-     addFiles.sources = frank.xbel jennifer.xbel</div><div class='add'>+     addFiles.files = frank.xbel jennifer.xbel</div><div class='ctx'>      addFiles.path = "\\My Documents"</div><div class='ctx'>      DEPLOYMENT += addFiles</div><div class='ctx'> }</div><div class='hunk'>@@ -22,7 +22,7 @@ wince*: {</div><div class='ctx'> symbian: {</div><div class='ctx'>      TARGET.UID3 = 0xA000C60A</div><div class='ctx'>      include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)</div><div class='del'>-     addFiles.sources = frank.xbel jennifer.xbel</div><div class='add'>+     addFiles.files = frank.xbel jennifer.xbel</div><div class='ctx'>      addFiles.path = /data/qt/saxbookmarks</div><div class='ctx'>      DEPLOYMENT += addFiles</div><div class='ctx'> }</div><div class='head'>diff --git a/examples/xmlpatterns/recipes/querymainwindow.cpp b/examples/xmlpatterns/recipes/querymainwindow.cpp<br/>index 3a2a606..95a8669 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/examples/xmlpatterns/recipes/querymainwindow.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>examples/xmlpatterns/recipes/querymainwindow.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/examples/xmlpatterns/recipes/querymainwindow.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>examples/xmlpatterns/recipes/querymainwindow.cpp</a></div><div class='hunk'>@@ -49,10 +49,10 @@ QueryMainWindow::QueryMainWindow() : ui_defaultQueries(0)</div><div class='ctx'> {</div><div class='ctx'>     setupUi(this);</div><div class='ctx'> </div><div class='del'>-    new XmlSyntaxHighlighter(qFindChild&lt;QTextEdit*&gt;(this, "inputTextEdit")-&gt;document());</div><div class='del'>-    new XmlSyntaxHighlighter(qFindChild&lt;QTextEdit*&gt;(this, "outputTextEdit")-&gt;document());</div><div class='add'>+    new XmlSyntaxHighlighter(findChild&lt;QTextEdit*&gt;("inputTextEdit")-&gt;document());</div><div class='add'>+    new XmlSyntaxHighlighter(findChild&lt;QTextEdit*&gt;("outputTextEdit")-&gt;document());</div><div class='ctx'> </div><div class='del'>-    ui_defaultQueries = qFindChild&lt;QComboBox*&gt;(this, "defaultQueries");</div><div class='add'>+    ui_defaultQueries = findChild&lt;QComboBox*&gt;("defaultQueries");</div><div class='ctx'>     QMetaObject::connectSlotsByName(this);</div><div class='ctx'>     connect(ui_defaultQueries, SIGNAL(currentIndexChanged(int)), SLOT(displayQuery(int)));</div><div class='ctx'> </div><div class='hunk'>@@ -71,7 +71,7 @@ void QueryMainWindow::displayQuery(int index)</div><div class='ctx'>     QFile queryFile(QString(":files/") + ui_defaultQueries-&gt;itemText(index));</div><div class='ctx'>     queryFile.open(QIODevice::ReadOnly);</div><div class='ctx'>     const QString query(QString::fromLatin1(queryFile.readAll()));</div><div class='del'>-    qFindChild&lt;QTextEdit*&gt;(this, "queryTextEdit")-&gt;setPlainText(query);</div><div class='add'>+    findChild&lt;QTextEdit*&gt;("queryTextEdit")-&gt;setPlainText(query);</div><div class='ctx'> </div><div class='ctx'>     evaluate(query);</div><div class='ctx'> }</div><div class='hunk'>@@ -90,7 +90,7 @@ void QueryMainWindow::loadInputFile()</div><div class='ctx'> </div><div class='ctx'>     QTextStream in(&amp;forView);</div><div class='ctx'>     QString inputDocument = in.readAll();</div><div class='del'>-    qFindChild&lt;QTextEdit*&gt;(this, "inputTextEdit")-&gt;setPlainText(inputDocument);</div><div class='add'>+    findChild&lt;QTextEdit*&gt;("inputTextEdit")-&gt;setPlainText(inputDocument);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -116,7 +116,7 @@ void QueryMainWindow::evaluate(const QString &amp;str)</div><div class='ctx'>         return;</div><div class='ctx'> </div><div class='ctx'>     buffer.close();</div><div class='del'>-    qFindChild&lt;QTextEdit*&gt;(this, "outputTextEdit")-&gt;setPlainText(QString::fromUtf8(outArray.constData()));</div><div class='add'>+    findChild&lt;QTextEdit*&gt;("outputTextEdit")-&gt;setPlainText(QString::fromUtf8(outArray.constData()));</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> //! [2]</div><div class='head'>diff --git a/lib/fonts/dejavu_sans_11_50.qpf2 b/lib/fonts/dejavu_sans_11_50.qpf2<br/>new file mode 100644<br/>index 0000000..c88d099<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/lib/fonts/dejavu_sans_11_50.qpf2?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>lib/fonts/dejavu_sans_11_50.qpf2</a></div>Binary files differ<div class='head'>diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf<br/>index d9d9c38..b0179d5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/aix-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/aix-g++-64/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/aix-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/aix-g++-64/qmake.conf</a></div><div class='hunk'>@@ -63,7 +63,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthreads</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf<br/>index 5fc4c17..2e2e991 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/aix-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/aix-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/aix-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/aix-g++/qmake.conf</a></div><div class='hunk'>@@ -63,7 +63,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthreads</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf<br/>index ae87b88..486b8c6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/aix-xlc-64/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/aix-xlc-64/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/aix-xlc-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/aix-xlc-64/qmake.conf</a></div><div class='hunk'>@@ -62,7 +62,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthreads</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf<br/>index fe91236..8655db6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/aix-xlc/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/aix-xlc/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/aix-xlc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/aix-xlc/qmake.conf</a></div><div class='hunk'>@@ -63,7 +63,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthreads</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf<br/>new file mode 100644<br/>index 0000000..069cdfa<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/common/clang.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/common/clang.conf</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+#</div><div class='add'>+# Qmake configuration for Clang on Linux and Mac</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+QMAKE_CC  = clang</div><div class='add'>+QMAKE_CXX = clang++</div><div class='add'>+</div><div class='add'>+QMAKE_LINK       = $$QMAKE_CXX</div><div class='add'>+QMAKE_LINK_SHLIB = $$QMAKE_CXX</div><div class='add'>+</div><div class='add'>+CONFIG += clang_pch_style</div><div class='add'>+QMAKE_PCH_OUTPUT_EXT = .pch</div><div class='add'>+</div><div class='add'>+QMAKE_CFLAGS_PRECOMPILE          = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='add'>+QMAKE_CFLAGS_USE_PRECOMPILE      = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}</div><div class='add'>+QMAKE_CXXFLAGS_PRECOMPILE        = -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='add'>+QMAKE_CXXFLAGS_USE_PRECOMPILE    = $$QMAKE_CFLAGS_USE_PRECOMPILE</div><div class='head'>diff --git a/mkspecs/common/g++-base.conf b/mkspecs/common/g++-base.conf<br/>new file mode 100644<br/>index 0000000..eb5b7d6<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/common/g++-base.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/common/g++-base.conf</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+#</div><div class='add'>+# Qmake configuration for the GNU C++ compiler</div><div class='add'>+#</div><div class='add'>+# Before making changes to this file, please read the comment in</div><div class='add'>+# gcc-base.conf, to make sure the change goes in the right place.</div><div class='add'>+#</div><div class='add'>+# To verify that your change has the desired effect on the final configuration</div><div class='add'>+# you can use the manual test in tests/manual/mkspecs.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+QMAKE_CC = gcc</div><div class='add'>+</div><div class='add'>+QMAKE_LINK_C       = $$QMAKE_CC</div><div class='add'>+QMAKE_LINK_C_SHLIB = $$QMAKE_CC</div><div class='add'>+</div><div class='add'>+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g</div><div class='add'>+</div><div class='add'>+QMAKE_CXX = g++</div><div class='add'>+</div><div class='add'>+QMAKE_LINK       = $$QMAKE_CXX</div><div class='add'>+QMAKE_LINK_SHLIB = $$QMAKE_CXX</div><div class='add'>+</div><div class='add'>+QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO</div><div class='add'>+</div><div class='add'>+QMAKE_PCH_OUTPUT_EXT = .gch</div><div class='add'>+</div><div class='add'>+QMAKE_CFLAGS_PRECOMPILE       = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='add'>+QMAKE_CFLAGS_USE_PRECOMPILE   = -include ${QMAKE_PCH_OUTPUT_BASE}</div><div class='add'>+QMAKE_CXXFLAGS_PRECOMPILE     = -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='add'>+QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE</div><div class='head'>diff --git a/mkspecs/common/g++-macx.conf b/mkspecs/common/g++-macx.conf<br/>new file mode 100644<br/>index 0000000..2251157<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/common/g++-macx.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/common/g++-macx.conf</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+#</div><div class='add'>+# Qmake configuration for the GNU C++ compiler on Mac OS X</div><div class='add'>+#</div><div class='add'>+# Before making changes to this file, please read the comment in</div><div class='add'>+# gcc-base.conf, to make sure the change goes in the right place.</div><div class='add'>+#</div><div class='add'>+# To verify that your change has the desired effect on the final configuration</div><div class='add'>+# you can use the manual test in tests/manual/mkspecs.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+include(g++-base.conf)</div><div class='add'>+</div><div class='add'>+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_DWARF2</div><div class='add'>+QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_DWARF2</div><div class='add'>+QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g $$QMAKE_CFLAGS_DWARF2</div><div class='add'>+</div><div class='add'>+QMAKE_LFLAGS_STATIC_LIB += -all_load</div><div class='add'>+</div><div class='add'>+QMAKE_CFLAGS_X86_64 += -Xarch_x86_64 -mmacosx-version-min=10.5</div><div class='add'>+QMAKE_CFLAGS_PPC_64 += -Xarch_ppc64 -mmacosx-version-min=10.5</div><div class='add'>+</div><div class='add'>+QMAKE_CXXFLAGS_X86_64         = $$QMAKE_CFLAGS_X86_64</div><div class='add'>+QMAKE_CXXFLAGS_PPC_64         = $$QMAKE_CFLAGS_PPC_64</div><div class='add'>+QMAKE_OBJECTIVE_CFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64</div><div class='add'>+QMAKE_OBJECTIVE_CFLAGS_PPC_64 = $$QMAKE_CFLAGS_PPC_64</div><div class='add'>+QMAKE_LFLAGS_X86_64           = $$QMAKE_CFLAGS_X86_64</div><div class='add'>+QMAKE_LFLAGS_PPC_64           = $$QMAKE_CFLAGS_PPC_64</div><div class='add'>+</div><div class='add'>+QMAKE_OBJCFLAGS_PRECOMPILE       = -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='add'>+QMAKE_OBJCFLAGS_USE_PRECOMPILE   = $$QMAKE_CFLAGS_USE_PRECOMPILE</div><div class='add'>+QMAKE_OBJCXXFLAGS_PRECOMPILE     = -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='add'>+QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE</div><div class='head'>diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf<br/>new file mode 100644<br/>index 0000000..96e301e<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/common/g++-unix.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/common/g++-unix.conf</a></div><div class='hunk'>@@ -0,0 +1,14 @@</div><div class='add'>+#</div><div class='add'>+# Qmake configuration for the GNU C++ compiler on *nix-systems</div><div class='add'>+#</div><div class='add'>+# Before making changes to this file, please read the comment in</div><div class='add'>+# gcc-base.conf, to make sure the change goes in the right place.</div><div class='add'>+#</div><div class='add'>+# To verify that your change has the desired effect on the final configuration</div><div class='add'>+# you can use the manual test in tests/manual/mkspecs.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+include(g++-base.conf)</div><div class='add'>+</div><div class='add'>+QMAKE_LFLAGS_RELEASE += -Wl,-O1</div><div class='add'>+QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined</div><div class='head'>diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf<br/>index 0d511fc..c5a34a9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/common/g++.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/g++.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/common/g++.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/common/g++.conf</a></div><div class='hunk'>@@ -1,54 +1,12 @@</div><div class='ctx'> #</div><div class='del'>-# qmake configuration for common gcc</div><div class='add'>+# Notice: g++.conf has been split into g++-base.conf and g++-unix.conf</div><div class='add'>+#</div><div class='add'>+# This file will make sure that anyone who's still including g++.conf</div><div class='add'>+# directly will get a warning and an explanation of how to fix their mkspec</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-QMAKE_CC		= gcc</div><div class='del'>-QMAKE_CFLAGS		+= -pipe</div><div class='del'>-QMAKE_CFLAGS_DEPS	+= -M</div><div class='del'>-QMAKE_CFLAGS_WARN_ON	+= -Wall -W</div><div class='del'>-QMAKE_CFLAGS_WARN_OFF	+= -w</div><div class='del'>-QMAKE_CFLAGS_RELEASE	+= -O2</div><div class='del'>-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g</div><div class='del'>-QMAKE_CFLAGS_DEBUG	+= -g</div><div class='del'>-QMAKE_CFLAGS_SHLIB	+= -fPIC</div><div class='del'>-QMAKE_CFLAGS_STATIC_LIB	+= -fPIC</div><div class='del'>-QMAKE_CFLAGS_YACC	+= -Wno-unused -Wno-parentheses</div><div class='del'>-QMAKE_CFLAGS_HIDESYMS   += -fvisibility=hidden</div><div class='del'>-QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='del'>-QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}</div><div class='del'>-</div><div class='del'>-QMAKE_CXX		= g++</div><div class='del'>-QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS</div><div class='del'>-QMAKE_CXXFLAGS_DEPS	+= $$QMAKE_CFLAGS_DEPS</div><div class='del'>-QMAKE_CXXFLAGS_WARN_ON	+= $$QMAKE_CFLAGS_WARN_ON</div><div class='del'>-QMAKE_CXXFLAGS_WARN_OFF	+= $$QMAKE_CFLAGS_WARN_OFF</div><div class='del'>-QMAKE_CXXFLAGS_RELEASE	+= $$QMAKE_CFLAGS_RELEASE</div><div class='del'>-QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO</div><div class='del'>-QMAKE_CXXFLAGS_DEBUG	+= $$QMAKE_CFLAGS_DEBUG</div><div class='del'>-QMAKE_CXXFLAGS_SHLIB	+= $$QMAKE_CFLAGS_SHLIB</div><div class='del'>-QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB</div><div class='del'>-QMAKE_CXXFLAGS_YACC	+= $$QMAKE_CFLAGS_YACC</div><div class='del'>-QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden</div><div class='del'>-QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='del'>-QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE</div><div class='del'>-</div><div class='del'>-QMAKE_LINK		= g++</div><div class='del'>-QMAKE_LINK_SHLIB	= g++</div><div class='del'>-QMAKE_LINK_C		= gcc</div><div class='del'>-QMAKE_LINK_C_SHLIB	= gcc</div><div class='del'>-QMAKE_LFLAGS		+=</div><div class='del'>-QMAKE_LFLAGS_RELEASE	+= -Wl,-O1</div><div class='del'>-QMAKE_LFLAGS_DEBUG	+=</div><div class='del'>-QMAKE_LFLAGS_APP	+=</div><div class='del'>-QMAKE_LFLAGS_SHLIB	+= -shared</div><div class='del'>-QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB</div><div class='del'>-QMAKE_LFLAGS_SONAME	+= -Wl,-soname,</div><div class='del'>-QMAKE_LFLAGS_THREAD	+=</div><div class='del'>-QMAKE_LFLAGS_NOUNDEF	+= -Wl,--no-undefined</div><div class='del'>-QMAKE_LFLAGS_RPATH	= -Wl,-rpath,</div><div class='del'>-</div><div class='del'>-QMAKE_PCH_OUTPUT_EXT    = .gch</div><div class='add'>+warning($$escape_expand("Your mkspec is including 'common/g++.conf', but the mkspecs have been refactored\\n\\tTo fix this include 'common/gcc-base-$${TARGET_PLATFORM}.conf and 'common/g++-$${TARGET_PLATFORM}.conf' instead"))</div><div class='ctx'> </div><div class='del'>-# -Bsymbolic-functions (ld) support</div><div class='del'>-QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions</div><div class='del'>-QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,</div><div class='add'>+# We include gcc-base-unix.conf and g++-unix.conf to keep the behavior of the old g++.conf</div><div class='add'>+include(gcc-base-unix.conf)</div><div class='add'>+include(g++-unix.conf)</div><div class='head'>diff --git a/mkspecs/common/gcc-base-macx.conf b/mkspecs/common/gcc-base-macx.conf<br/>new file mode 100644<br/>index 0000000..2894f86<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/common/gcc-base-macx.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/common/gcc-base-macx.conf</a></div><div class='hunk'>@@ -0,0 +1,50 @@</div><div class='add'>+#</div><div class='add'>+# Base qmake configuration for GCC on Mac OS X</div><div class='add'>+#</div><div class='add'>+# Before making changes to this file, please read the comment in</div><div class='add'>+# gcc-base.conf, to make sure the change goes in the right place.</div><div class='add'>+#</div><div class='add'>+# To verify that your change has the desired effect on the final configuration</div><div class='add'>+# you can use the manual test in tests/manual/mkspecs.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+include(gcc-base.conf)</div><div class='add'>+</div><div class='add'>+QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__</div><div class='add'>+</div><div class='add'>+QMAKE_CFLAGS_X86    += -arch i386</div><div class='add'>+QMAKE_CFLAGS_X86_64 += -arch x86_64</div><div class='add'>+QMAKE_CFLAGS_PPC    += -arch ppc</div><div class='add'>+QMAKE_CFLAGS_PPC_64 += -arch ppc64</div><div class='add'>+QMAKE_CFLAGS_DWARF2 += -gdwarf-2</div><div class='add'>+</div><div class='add'>+QMAKE_CXXFLAGS_X86    += $$QMAKE_CFLAGS_X86</div><div class='add'>+QMAKE_CXXFLAGS_X86_64 += $$QMAKE_CFLAGS_X86_64</div><div class='add'>+QMAKE_CXXFLAGS_PPC    += $$QMAKE_CFLAGS_PPC</div><div class='add'>+QMAKE_CXXFLAGS_PPC_64 += $$QMAKE_CFLAGS_PPC_64</div><div class='add'>+QMAKE_CXXFLAGS_DWARF2 += $$QMAKE_CFLAGS_DWARF2</div><div class='add'>+</div><div class='add'>+QMAKE_OBJECTIVE_CFLAGS          = $$QMAKE_CFLAGS</div><div class='add'>+QMAKE_OBJECTIVE_CFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON</div><div class='add'>+QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF</div><div class='add'>+QMAKE_OBJECTIVE_CFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG</div><div class='add'>+QMAKE_OBJECTIVE_CFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE</div><div class='add'>+QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = $$QMAKE_CXXFLAGS_HIDESYMS</div><div class='add'>+QMAKE_OBJECTIVE_CFLAGS_X86      = $$QMAKE_CFLAGS_X86</div><div class='add'>+QMAKE_OBJECTIVE_CFLAGS_X86_64   = $$QMAKE_CFLAGS_X86_64</div><div class='add'>+QMAKE_OBJECTIVE_CFLAGS_PPC      = $$QMAKE_CFLAGS_PPC</div><div class='add'>+QMAKE_OBJECTIVE_CFLAGS_PPC_64   = $$QMAKE_CFLAGS_PPC_64</div><div class='add'>+</div><div class='add'>+QMAKE_LFLAGS_X86    += $$QMAKE_CFLAGS_X86</div><div class='add'>+QMAKE_LFLAGS_X86_64 += $$QMAKE_CFLAGS_X86_64</div><div class='add'>+QMAKE_LFLAGS_PPC    += $$QMAKE_CFLAGS_PPC</div><div class='add'>+QMAKE_LFLAGS_PPC_64 += $$QMAKE_CFLAGS_PPC_64</div><div class='add'>+</div><div class='add'>+QMAKE_LFLAGS                += -headerpad_max_install_names</div><div class='add'>+QMAKE_LFLAGS_SHLIB          += -single_module -dynamiclib</div><div class='add'>+QMAKE_LFLAGS_PLUGIN         += $$QMAKE_LFLAGS_SHLIB</div><div class='add'>+QMAKE_LFLAGS_INCREMENTAL    += -undefined suppress -flat_namespace</div><div class='add'>+QMAKE_LFLAGS_SONAME         += -install_name$${LITERAL_WHITESPACE}</div><div class='add'>+QMAKE_LFLAGS_VERSION        += -current_version$${LITERAL_WHITESPACE}</div><div class='add'>+QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE}</div><div class='add'>+</div><div class='head'>diff --git a/mkspecs/common/gcc-base-unix.conf b/mkspecs/common/gcc-base-unix.conf<br/>new file mode 100644<br/>index 0000000..dc8d7e4<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/common/gcc-base-unix.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/common/gcc-base-unix.conf</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+#</div><div class='add'>+# Base qmake configuration for GCC on *nix-systems</div><div class='add'>+#</div><div class='add'>+# Before making changes to this file, please read the comment in</div><div class='add'>+# gcc-base.conf, to make sure the change goes in the right place.</div><div class='add'>+#</div><div class='add'>+# To verify that your change has the desired effect on the final configuration</div><div class='add'>+# you can use the manual test in tests/manual/mkspecs.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+include(gcc-base.conf)</div><div class='add'>+</div><div class='add'>+QMAKE_LFLAGS_SHLIB  += -shared</div><div class='add'>+QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB</div><div class='add'>+QMAKE_LFLAGS_SONAME += -Wl,-soname,</div><div class='add'>+QMAKE_LFLAGS_THREAD +=</div><div class='add'>+QMAKE_LFLAGS_RPATH   = -Wl,-rpath,</div><div class='add'>+</div><div class='add'>+# -Bsymbolic-functions (ld) support</div><div class='add'>+QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions</div><div class='add'>+QMAKE_LFLAGS_DYNAMIC_LIST   = -Wl,--dynamic-list,</div><div class='head'>diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf<br/>new file mode 100644<br/>index 0000000..0e90666<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/common/gcc-base.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/common/gcc-base.conf</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+#</div><div class='add'>+# This file is used as a basis for the following compilers:</div><div class='add'>+#</div><div class='add'>+# - The GNU C++ compiler (g++)</div><div class='add'>+# - LLVM</div><div class='add'>+# - Clang</div><div class='add'>+#</div><div class='add'>+# Platform-specific options shared by these compilers are put into:</div><div class='add'>+#</div><div class='add'>+# - gcc-base-macx.conf</div><div class='add'>+# - gcc-base-unix.conf</div><div class='add'>+#</div><div class='add'>+# These base files are then combined with configurations for each compiler:</div><div class='add'>+#</div><div class='add'>+# - g++-base.conf</div><div class='add'>+# - g++-macx.conf</div><div class='add'>+# - g++-unix.conf</div><div class='add'>+# - llvm.conf</div><div class='add'>+# - clang.conf</div><div class='add'>+#</div><div class='add'>+# The combination happens in the top level mkspec, by including a platform-</div><div class='add'>+# specific version of the base-file, for example gcc-base-macx.conf, and then</div><div class='add'>+# a (possibly platform-specific) version of the actual compiler configuration,</div><div class='add'>+# for example g++-macx.conf.</div><div class='add'>+#</div><div class='add'>+# If you are making changes to any of these files, please consider the </div><div class='add'>+# possible effect it may have due to these include-rules, and whether it</div><div class='add'>+# might make more sense to share the rule or make it more specific.</div><div class='add'>+#</div><div class='add'>+# To verify that your change has the desired effect on the final configuration</div><div class='add'>+# you can use the manual test in tests/manual/mkspecs.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+QMAKE_CFLAGS                += -pipe</div><div class='add'>+QMAKE_CFLAGS_DEPS           += -M</div><div class='add'>+QMAKE_CFLAGS_WARN_ON        += -Wall -W</div><div class='add'>+QMAKE_CFLAGS_WARN_OFF       += -w</div><div class='add'>+QMAKE_CFLAGS_RELEASE        += -O2</div><div class='add'>+QMAKE_CFLAGS_DEBUG          += -g</div><div class='add'>+QMAKE_CFLAGS_SHLIB          += -fPIC</div><div class='add'>+QMAKE_CFLAGS_STATIC_LIB     += -fPIC</div><div class='add'>+QMAKE_CFLAGS_YACC           += -Wno-unused -Wno-parentheses</div><div class='add'>+QMAKE_CFLAGS_HIDESYMS       += -fvisibility=hidden</div><div class='add'>+</div><div class='add'>+QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS</div><div class='add'>+QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS</div><div class='add'>+QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON</div><div class='add'>+QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF</div><div class='add'>+QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE</div><div class='add'>+QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG</div><div class='add'>+QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB</div><div class='add'>+QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB</div><div class='add'>+QMAKE_CXXFLAGS_YACC       += $$QMAKE_CFLAGS_YACC</div><div class='add'>+QMAKE_CXXFLAGS_HIDESYMS   += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden</div><div class='add'>+</div><div class='add'>+QMAKE_LFLAGS         +=</div><div class='add'>+QMAKE_LFLAGS_DEBUG   +=</div><div class='add'>+QMAKE_LFLAGS_APP     +=</div><div class='add'>+QMAKE_LFLAGS_RELEASE +=</div><div class='add'>+</div><div class='head'>diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf<br/>index 4fbe2dc..d60533e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/common/linux.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/linux.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/common/linux.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/common/linux.conf</a></div><div class='hunk'>@@ -28,13 +28,19 @@ QMAKE_LIBS_X11        = -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM      = -lSM -lICE</div><div class='ctx'> QMAKE_LIBS_NIS        = -lnsl</div><div class='ctx'> QMAKE_LIBS_EGL        = -lEGL</div><div class='del'>-QMAKE_LIBS_OPENGL     = -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL     = -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT  = -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM</div><div class='ctx'> QMAKE_LIBS_OPENGL_ES2 = -lGLESv2</div><div class='ctx'> QMAKE_LIBS_OPENVG     = -lOpenVG</div><div class='ctx'> QMAKE_LIBS_THREAD     = -lpthread</div><div class='ctx'> </div><div class='add'>+QMAKE_CFLAGS_WAYLAND =</div><div class='add'>+QMAKE_INCDIR_WAYLAND =</div><div class='add'>+QMAKE_LIBS_WAYLAND =</div><div class='add'>+QMAKE_LIBDIR_WAYLAND =</div><div class='add'>+QMAKE_DEFINES_WAYLAND =</div><div class='add'>+</div><div class='ctx'> QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc</div><div class='ctx'> QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/common/llvm.conf b/mkspecs/common/llvm.conf<br/>index 70f52aa..86e0ab4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/common/llvm.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/llvm.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/common/llvm.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/common/llvm.conf</a></div><div class='hunk'>@@ -1,49 +1,16 @@</div><div class='ctx'> #</div><div class='del'>-# qmake configuration for common gcc</div><div class='add'>+# Qmake configuration for LLVM on Linux and Mac</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-QMAKE_CC		= llvm-gcc</div><div class='del'>-QMAKE_CFLAGS		+= -pipe</div><div class='del'>-QMAKE_CFLAGS_DEPS	+= -M</div><div class='del'>-QMAKE_CFLAGS_WARN_ON	+= -Wall -W</div><div class='del'>-QMAKE_CFLAGS_WARN_OFF	+= -w</div><div class='del'>-QMAKE_CFLAGS_RELEASE	+= -O2</div><div class='del'>-QMAKE_CFLAGS_DEBUG	+= -g</div><div class='del'>-QMAKE_CFLAGS_SHLIB	+= -fPIC</div><div class='del'>-QMAKE_CFLAGS_STATIC_LIB	+= -fPIC</div><div class='del'>-QMAKE_CFLAGS_YACC	+= -Wno-unused -Wno-parentheses</div><div class='del'>-QMAKE_CFLAGS_HIDESYMS   += -fvisibility=hidden</div><div class='del'>-QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='del'>-QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}</div><div class='add'>+QMAKE_CC  = llvm-gcc</div><div class='add'>+QMAKE_CXX = llvm-g++</div><div class='ctx'> </div><div class='del'>-QMAKE_CXX		= llvm-g++</div><div class='del'>-QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS</div><div class='del'>-QMAKE_CXXFLAGS_DEPS	+= $$QMAKE_CFLAGS_DEPS</div><div class='del'>-QMAKE_CXXFLAGS_WARN_ON	+= $$QMAKE_CFLAGS_WARN_ON</div><div class='del'>-QMAKE_CXXFLAGS_WARN_OFF	+= $$QMAKE_CFLAGS_WARN_OFF</div><div class='del'>-QMAKE_CXXFLAGS_RELEASE	+= $$QMAKE_CFLAGS_RELEASE</div><div class='del'>-QMAKE_CXXFLAGS_DEBUG	+= $$QMAKE_CFLAGS_DEBUG</div><div class='del'>-QMAKE_CXXFLAGS_SHLIB	+= $$QMAKE_CFLAGS_SHLIB</div><div class='del'>-QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB</div><div class='del'>-QMAKE_CXXFLAGS_YACC	+= $$QMAKE_CFLAGS_YACC</div><div class='del'>-QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden</div><div class='del'>-QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='del'>-QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE</div><div class='add'>+QMAKE_LINK       = $$QMAKE_CXX</div><div class='add'>+QMAKE_LINK_SHLIB = $$QMAKE_CXX</div><div class='ctx'> </div><div class='del'>-QMAKE_LINK		= llvm-g++</div><div class='del'>-QMAKE_LINK_SHLIB	= llvm-g++</div><div class='del'>-QMAKE_LFLAGS		+=</div><div class='del'>-QMAKE_LFLAGS_RELEASE	+=</div><div class='del'>-QMAKE_LFLAGS_DEBUG	+=</div><div class='del'>-QMAKE_LFLAGS_APP	+=</div><div class='del'>-QMAKE_LFLAGS_SHLIB	+= -shared</div><div class='del'>-QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB</div><div class='del'>-QMAKE_LFLAGS_SONAME	+= -Wl,-soname,</div><div class='del'>-QMAKE_LFLAGS_THREAD	+=</div><div class='del'>-QMAKE_LFLAGS_RPATH	= -Wl,-rpath,</div><div class='add'>+QMAKE_PCH_OUTPUT_EXT = .gch</div><div class='ctx'> </div><div class='del'>-QMAKE_PCH_OUTPUT_EXT    = .gch</div><div class='del'>-</div><div class='del'>-# -Bsymbolic-functions (ld) support</div><div class='del'>-QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions</div><div class='del'>-QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,</div><div class='add'>+QMAKE_CFLAGS_PRECOMPILE       = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='add'>+QMAKE_CFLAGS_USE_PRECOMPILE   = -include ${QMAKE_PCH_OUTPUT_BASE}</div><div class='add'>+QMAKE_CXXFLAGS_PRECOMPILE     = -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='add'>+QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
\ No newline at end of file</div><div class='head'>diff --git a/mkspecs/common/mac-g++.conf b/mkspecs/common/mac-g++.conf<br/>deleted file mode 100644<br/>index 29b7408..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/common/mac-g++.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/mac-g++.conf</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# qmake configuration for common gcc on Mac OS X</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-include(mac.conf)</div><div class='del'>-</div><div class='del'>-QMAKE_COMPILER_DEFINES  += __APPLE__ __GNUC__</div><div class='del'>-QMAKE_CFLAGS		+= -pipe</div><div class='del'>-QMAKE_CFLAGS_DEPS	+= -M</div><div class='del'>-QMAKE_CFLAGS_WARN_ON	+= -Wall -W</div><div class='del'>-QMAKE_CFLAGS_WARN_OFF	+= -w</div><div class='del'>-QMAKE_CFLAGS_RELEASE	+= -O2</div><div class='del'>-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g  -gdwarf-2</div><div class='del'>-QMAKE_CFLAGS_DEBUG	+= -g</div><div class='del'>-QMAKE_CFLAGS_SHLIB	+= -fPIC</div><div class='del'>-QMAKE_CFLAGS_STATIC_LIB	+= -fPIC</div><div class='del'>-QMAKE_CFLAGS_YACC	+= -Wno-unused -Wno-parentheses</div><div class='del'>-QMAKE_CFLAGS_HIDESYMS   += -fvisibility=hidden</div><div class='del'>-QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='del'>-QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}</div><div class='del'>-</div><div class='del'>-QMAKE_CFLAGS_PPC_64     += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5</div><div class='del'>-QMAKE_OBJECTIVE_CFLAGS_PPC_64  += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5</div><div class='del'>-QMAKE_CFLAGS_X86_64     += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5</div><div class='del'>-QMAKE_OBJECTIVE_CFLAGS_X86_64  += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5</div><div class='del'>-QMAKE_CFLAGS_PPC        += -arch ppc</div><div class='del'>-QMAKE_OBJECTIVE_CFLAGS_PPC  += -arch ppc</div><div class='del'>-QMAKE_CFLAGS_X86        += -arch i386</div><div class='del'>-QMAKE_OBJECTIVE_CFLAGS_X86  += -arch i386</div><div class='del'>-QMAKE_CFLAGS_DWARF2     += -gdwarf-2</div><div class='del'>-</div><div class='del'>-QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS</div><div class='del'>-QMAKE_CXXFLAGS_DEPS	+= $$QMAKE_CFLAGS_DEPS</div><div class='del'>-QMAKE_CXXFLAGS_WARN_ON	+= $$QMAKE_CFLAGS_WARN_ON</div><div class='del'>-QMAKE_CXXFLAGS_WARN_OFF	+= $$QMAKE_CFLAGS_WARN_OFF</div><div class='del'>-QMAKE_CXXFLAGS_RELEASE	+= $$QMAKE_CFLAGS_RELEASE</div><div class='del'>-QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO</div><div class='del'>-QMAKE_CXXFLAGS_DEBUG	+= $$QMAKE_CFLAGS_DEBUG</div><div class='del'>-QMAKE_CXXFLAGS_SHLIB	+= $$QMAKE_CFLAGS_SHLIB</div><div class='del'>-QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB</div><div class='del'>-QMAKE_CXXFLAGS_YACC	+= $$QMAKE_CFLAGS_YACC</div><div class='del'>-QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden</div><div class='del'>-QMAKE_CXXFLAGS_PPC_64   += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5</div><div class='del'>-QMAKE_CXXFLAGS_X86_64   += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5</div><div class='del'>-QMAKE_CXXFLAGS_PPC      += -arch ppc</div><div class='del'>-QMAKE_CXXFLAGS_X86      += -arch i386</div><div class='del'>-QMAKE_CXXFLAGS_DWARF2   += $$QMAKE_CFLAGS_DWARF2</div><div class='del'>-QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='del'>-QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE</div><div class='del'>-</div><div class='del'>-QMAKE_LINK		 = $$QMAKE_CXX</div><div class='del'>-QMAKE_LINK_SHLIB	 = $$QMAKE_CXX</div><div class='del'>-QMAKE_LINK_C		 = $$QMAKE_CC</div><div class='del'>-QMAKE_LINK_C_SHLIB	 = $$QMAKE_CC</div><div class='del'>-QMAKE_LFLAGS		+= -headerpad_max_install_names</div><div class='del'>-QMAKE_LFLAGS_RELEASE	+=</div><div class='del'>-QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g -gdwarf-2</div><div class='del'>-QMAKE_LFLAGS_DEBUG	+=</div><div class='del'>-QMAKE_LFLAGS_APP	+=</div><div class='del'>-QMAKE_LFLAGS_SHLIB	+= -single_module -dynamiclib</div><div class='del'>-QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB</div><div class='del'>-QMAKE_LFLAGS_THREAD	+=</div><div class='del'>-QMAKE_LFLAGS_INCREMENTAL+= -undefined suppress -flat_namespace</div><div class='del'>-QMAKE_LFLAGS_SONAME	+= -install_name$${LITERAL_WHITESPACE}</div><div class='del'>-QMAKE_LFLAGS_PPC_64     += -arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5</div><div class='del'>-QMAKE_LFLAGS_X86_64     += -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5</div><div class='del'>-QMAKE_LFLAGS_PPC        += -arch ppc</div><div class='del'>-QMAKE_LFLAGS_X86        += -arch i386</div><div class='del'>-QMAKE_LFLAGS_VERSION    += -current_version$${LITERAL_WHITESPACE}</div><div class='del'>-QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE}</div><div class='del'>-# -all_load requred to make Objective-C categories work in static builds.</div><div class='del'>-QMAKE_LFLAGS_STATIC_LIB += -all_load</div><div class='del'>-QMAKE_LFLAGS_RPATH	+=</div><div class='del'>-</div><div class='del'>-QMAKE_PCH_OUTPUT_EXT    = .gch</div><div class='del'>-</div><div class='del'>-QMAKE_OBJCFLAGS_PRECOMPILE += -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='del'>-QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE</div><div class='del'>-</div><div class='del'>-QMAKE_OBJCXXFLAGS_PRECOMPILE += -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='del'>-QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE</div><div class='head'>diff --git a/mkspecs/common/mac-llvm.conf b/mkspecs/common/mac-llvm.conf<br/>deleted file mode 100644<br/>index 4ff088c..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/common/mac-llvm.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/mac-llvm.conf</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,76 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# qmake configuration for common gcc on Mac OS X</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-include(mac.conf)</div><div class='del'>-</div><div class='del'>-QMAKE_COMPILER_DEFINES  += __APPLE__ __GNUC__</div><div class='del'>-QMAKE_CC		 = llvm-gcc</div><div class='del'>-QMAKE_CFLAGS		+= -pipe</div><div class='del'>-QMAKE_CFLAGS_DEPS	+= -M</div><div class='del'>-QMAKE_CFLAGS_WARN_ON	+= -Wall -W</div><div class='del'>-QMAKE_CFLAGS_WARN_OFF	+= -w</div><div class='del'>-QMAKE_CFLAGS_RELEASE	+= -O2</div><div class='del'>-QMAKE_CFLAGS_DEBUG	+= -g</div><div class='del'>-QMAKE_CFLAGS_SHLIB	+= -fPIC</div><div class='del'>-QMAKE_CFLAGS_STATIC_LIB	+= -fPIC</div><div class='del'>-QMAKE_CFLAGS_YACC	+= -Wno-unused -Wno-parentheses</div><div class='del'>-QMAKE_CFLAGS_HIDESYMS   += -fvisibility=hidden</div><div class='del'>-QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='del'>-QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}</div><div class='del'>-</div><div class='del'>-QMAKE_CFLAGS_PPC_64     += -arch ppc64</div><div class='del'>-QMAKE_OBJECTIVE_CFLAGS_PPC_64  += -arch ppc64</div><div class='del'>-QMAKE_CFLAGS_X86_64     += -arch x86_64</div><div class='del'>-QMAKE_OBJECTIVE_CFLAGS_X86_64  += -arch x86_64</div><div class='del'>-QMAKE_CFLAGS_PPC        += -arch ppc</div><div class='del'>-QMAKE_OBJECTIVE_CFLAGS_PPC  += -arch ppc</div><div class='del'>-QMAKE_CFLAGS_X86        += -arch i386</div><div class='del'>-QMAKE_OBJECTIVE_CFLAGS_X86  += -arch i386</div><div class='del'>-QMAKE_CFLAGS_DWARF2     += -gdwarf-2</div><div class='del'>-</div><div class='del'>-QMAKE_CXX		 = llvm-g++</div><div class='del'>-QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS</div><div class='del'>-QMAKE_CXXFLAGS_DEPS	+= $$QMAKE_CFLAGS_DEPS</div><div class='del'>-QMAKE_CXXFLAGS_WARN_ON	+= $$QMAKE_CFLAGS_WARN_ON</div><div class='del'>-QMAKE_CXXFLAGS_WARN_OFF	+= $$QMAKE_CFLAGS_WARN_OFF</div><div class='del'>-QMAKE_CXXFLAGS_RELEASE	+= $$QMAKE_CFLAGS_RELEASE</div><div class='del'>-QMAKE_CXXFLAGS_DEBUG	+= $$QMAKE_CFLAGS_DEBUG</div><div class='del'>-QMAKE_CXXFLAGS_SHLIB	+= $$QMAKE_CFLAGS_SHLIB</div><div class='del'>-QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB</div><div class='del'>-QMAKE_CXXFLAGS_YACC	+= $$QMAKE_CFLAGS_YACC</div><div class='del'>-QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden</div><div class='del'>-QMAKE_CXXFLAGS_PPC_64   += -arch ppc64</div><div class='del'>-QMAKE_CXXFLAGS_X86_64   += -arch x86_64</div><div class='del'>-QMAKE_CXXFLAGS_PPC      += -arch ppc</div><div class='del'>-QMAKE_CXXFLAGS_X86      += -arch i386</div><div class='del'>-QMAKE_CXXFLAGS_DWARF2   += $$QMAKE_CFLAGS_DWARF2</div><div class='del'>-QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='del'>-QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE</div><div class='del'>-</div><div class='del'>-QMAKE_LINK		 = $$QMAKE_CXX</div><div class='del'>-QMAKE_LINK_SHLIB	 = $$QMAKE_CXX</div><div class='del'>-QMAKE_LFLAGS		+= -headerpad_max_install_names</div><div class='del'>-QMAKE_LFLAGS_RELEASE	+=</div><div class='del'>-QMAKE_LFLAGS_DEBUG	+=</div><div class='del'>-QMAKE_LFLAGS_APP	+=</div><div class='del'>-QMAKE_LFLAGS_SHLIB	+= -single_module -dynamiclib</div><div class='del'>-QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB</div><div class='del'>-QMAKE_LFLAGS_THREAD	+=</div><div class='del'>-QMAKE_LFLAGS_INCREMENTAL+= -undefined suppress -flat_namespace</div><div class='del'>-QMAKE_LFLAGS_SONAME	+= -install_name$${LITERAL_WHITESPACE}</div><div class='del'>-QMAKE_LFLAGS_PPC_64     += -arch ppc64</div><div class='del'>-QMAKE_LFLAGS_X86_64     += -arch x86_64</div><div class='del'>-QMAKE_LFLAGS_PPC        += -arch ppc</div><div class='del'>-QMAKE_LFLAGS_X86        += -arch i386</div><div class='del'>-QMAKE_LFLAGS_VERSION    += -current_version$${LITERAL_WHITESPACE}</div><div class='del'>-QMAKE_LFLAGS_COMPAT_VERSION += -compatibility_version$${LITERAL_WHITESPACE}</div><div class='del'>-QMAKE_LFLAGS_RPATH	+=</div><div class='del'>-</div><div class='del'>-QMAKE_PCH_OUTPUT_EXT    = .gch</div><div class='del'>-</div><div class='del'>-QMAKE_OBJCFLAGS_PRECOMPILE += -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='del'>-QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE</div><div class='del'>-</div><div class='del'>-QMAKE_OBJCXXFLAGS_PRECOMPILE += -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='del'>-QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE</div><div class='head'>diff --git a/mkspecs/common/mac/qplatformdefs.h b/mkspecs/common/mac/qplatformdefs.h<br/>new file mode 100644<br/>index 0000000..4a70d99<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/common/mac/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/common/mac/qplatformdefs.h</a></div><div class='hunk'>@@ -0,0 +1,97 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the qmake spec of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QPLATFORMDEFS_H</div><div class='add'>+#define QPLATFORMDEFS_H</div><div class='add'>+</div><div class='add'>+// Get Qt defines/settings</div><div class='add'>+</div><div class='add'>+#include "qglobal.h"</div><div class='add'>+</div><div class='add'>+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs</div><div class='add'>+</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// We are hot - unistd.h should have turned on the specific APIs we requested</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include &lt;dirent.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;grp.h&gt;</div><div class='add'>+#include &lt;pwd.h&gt;</div><div class='add'>+#include &lt;signal.h&gt;</div><div class='add'>+#define QT_NO_LIBRARY_UNLOAD</div><div class='add'>+</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;sys/ipc.h&gt;</div><div class='add'>+#include &lt;sys/time.h&gt;</div><div class='add'>+#include &lt;sys/shm.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/wait.h&gt;</div><div class='add'>+#include &lt;netinet/in.h&gt;</div><div class='add'>+#ifndef QT_NO_IPV6IFNAME</div><div class='add'>+#include &lt;net/if.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include "../posix/qplatformdefs.h"</div><div class='add'>+</div><div class='add'>+#undef QT_OPEN_LARGEFILE</div><div class='add'>+#undef QT_SOCKLEN_T</div><div class='add'>+#undef QT_SIGNAL_IGNORE</div><div class='add'>+</div><div class='add'>+#define QT_OPEN_LARGEFILE       0</div><div class='add'>+</div><div class='add'>+#if (MAC_OS_X_VERSION_MAX_ALLOWED &gt;= MAC_OS_X_VERSION_10_4)</div><div class='add'>+#define QT_SOCKLEN_T            socklen_t</div><div class='add'>+#else</div><div class='add'>+#define QT_SOCKLEN_T            int</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define QT_SIGNAL_IGNORE        (void (*)(int))1</div><div class='add'>+</div><div class='add'>+#define QT_SNPRINTF		::snprintf</div><div class='add'>+#define QT_VSNPRINTF		::vsnprintf</div><div class='add'>+</div><div class='add'>+#endif // QPLATFORMDEFS_H</div><div class='head'>diff --git a/mkspecs/common/posix/qplatformdefs.h b/mkspecs/common/posix/qplatformdefs.h<br/>index 973fd5a..6fac11b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/common/posix/qplatformdefs.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/posix/qplatformdefs.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/common/posix/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/common/posix/qplatformdefs.h</a></div><div class='hunk'>@@ -45,7 +45,9 @@</div><div class='ctx'> #include &lt;signal.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/socket.h&gt;</div><div class='add'>+#ifndef QT_NO_SOCKET_H</div><div class='add'>+#  include &lt;sys/socket.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> #include &lt;sys/stat.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(QT_USE_XOPEN_LFS_EXTENSIONS) &amp;&amp; defined(QT_LARGEFILE_SUPPORT)</div><div class='head'>diff --git a/mkspecs/common/qws.conf b/mkspecs/common/qws.conf<br/>index 225f0ff..59820b8 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/common/qws.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/qws.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/common/qws.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/common/qws.conf</a></div><div class='hunk'>@@ -20,5 +20,3 @@ QMAKE_INCDIR_OPENGL_ES2 =</div><div class='ctx'> QMAKE_LIBDIR_OPENGL_ES2 =</div><div class='ctx'> QMAKE_LIBS_X11          =</div><div class='ctx'> QMAKE_LIBS_X11SM        =</div><div class='del'>-QMAKE_LIBS_OPENGL       =</div><div class='del'>-QMAKE_LIBS_OPENGL_QT    =</div><div class='head'>diff --git a/mkspecs/common/symbian/backup_registration.xml b/mkspecs/common/symbian/backup_registration.xml<br/>new file mode 100644<br/>index 0000000..794e11d<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/common/symbian/backup_registration.xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/common/symbian/backup_registration.xml</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+&lt;?xml version="1.0" standalone="yes"?&gt;</div><div class='add'>+&lt;backup_registration&gt;</div><div class='add'>+    &lt;passive_backup&gt;</div><div class='add'>+        &lt;include_directory name = "\" /&gt;</div><div class='add'>+    &lt;/passive_backup&gt;</div><div class='add'>+    &lt;system_backup/&gt;</div><div class='add'>+    &lt;restore requires_reboot = "no"/&gt;</div><div class='add'>+&lt;/backup_registration&gt;</div><div class='head'>diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf<br/>index 0288ada..5bf8728 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/common/symbian/symbian.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/common/symbian/symbian.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/common/symbian/symbian.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/common/symbian/symbian.conf</a></div><div class='hunk'>@@ -30,7 +30,7 @@ QMAKE_CFLAGS_DEBUG	=</div><div class='ctx'> QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses</div><div class='ctx'> </div><div class='ctx'> MMP_OPTION_KEYWORDS = CW ARMCC GCCE</div><div class='del'>-VERSION_FLAGS.ARMCC = ARMCC_4_0</div><div class='add'>+VERSION_FLAGS.ARMCC = ARMCC_4</div><div class='ctx'> QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS</div><div class='ctx'> # Symbian build system applies -cwd source on the MWCC command line.</div><div class='ctx'> # this causes problems with include paths, -cwd include uses the same</div><div class='hunk'>@@ -39,7 +39,7 @@ QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS</div><div class='ctx'> # both on the command line and rely on the compiler using the last specified</div><div class='ctx'> QMAKE_CXXFLAGS.CW	= -cwd include</div><div class='ctx'> QMAKE_CXXFLAGS.ARMCC      = --visibility_inlines_hidden</div><div class='del'>-QMAKE_CXXFLAGS.ARMCC_4_0  = --import_all_vtbl</div><div class='add'>+QMAKE_CXXFLAGS.ARMCC_4  = --import_all_vtbl</div><div class='ctx'> QMAKE_CXXFLAGS.GCCE	= -fvisibility-inlines-hidden</div><div class='ctx'> QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS</div><div class='ctx'> QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON</div><div class='head'>diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf<br/>index 29d0958..c46384f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/cygwin-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/cygwin-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/cygwin-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/cygwin-g++/qmake.conf</a></div><div class='hunk'>@@ -65,9 +65,12 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='add'>+QMAKE_PREFIX_SHLIB      = lib</div><div class='add'>+QMAKE_PREFIX_STATICLIB  = lib</div><div class='add'>+QMAKE_EXTENSION_STATICLIB = a</div><div class='ctx'> </div><div class='ctx'> QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc</div><div class='ctx'> QMAKE_UIC		= $$[QT_INSTALL_BINS]/uic</div><div class='head'>diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf<br/>index fc55503..84dc764 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/darwin-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/darwin-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/darwin-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/darwin-g++/qmake.conf</a></div><div class='hunk'>@@ -74,7 +74,7 @@ QMAKE_LFLAGS_RPATH	=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	=</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	=</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/features/declarative_debug.prf b/mkspecs/features/declarative_debug.prf<br/>new file mode 100644<br/>index 0000000..b0248f0<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/declarative_debug.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/declarative_debug.prf</a></div><div class='hunk'>@@ -0,0 +1 @@</div><div class='add'>+contains(QT, declarative):DEFINES += QT_DECLARATIVE_DEBUG</div><div class='head'>diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf<br/>index 9fb9f10..3f93220 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/default_post.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/default_post.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/default_post.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/default_post.prf</a></div><div class='hunk'>@@ -83,8 +83,8 @@ breakpad {</div><div class='ctx'>     win32:PROJECTPATH ~= s,/,\\,</div><div class='ctx'> </div><div class='ctx'>     !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)</div><div class='del'>-    QMAKE_POST_LINK += $$quote($${QT_BREAKPAD_ROOT_PATH}$${DIR_SEPARATOR}qtbreakpadsymbols \"$$DEBUGFILENAME\" \"$$PROJECTPATH\")</div><div class='del'>-    !isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$quote($$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$QMAKE_STRIP \"$$DEBUGFILENAME\")</div><div class='add'>+    QMAKE_POST_LINK = $$QMAKE_POST_LINK$$quote($${QT_BREAKPAD_ROOT_PATH}$${QMAKE_DIR_SEP}qtbreakpadsymbols \"$$DEBUGFILENAME\" \"$$PROJECTPATH\")</div><div class='add'>+    !isEmpty(QMAKE_STRIP):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote($$QMAKE_STRIP \"$$DEBUGFILENAME\")</div><div class='ctx'> </div><div class='ctx'>     unset(TARGET_BASEPATH)</div><div class='ctx'>     unset(SYMBOLFILENAME)</div><div class='head'>diff --git a/mkspecs/features/enable_backup.prf b/mkspecs/features/enable_backup.prf<br/>new file mode 100644<br/>index 0000000..7700ca2<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/enable_backup.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/enable_backup.prf</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+# Generate deployment for backup registration file for mobile devices</div><div class='add'>+symbian|maemo5|linux-g++-maemo {</div><div class='add'>+    symbian {</div><div class='add'>+        isEmpty(BACKUP_REGISTRATION_FILE_SYMBIAN) {</div><div class='add'>+            # Do not require a custom registration file in Symbian builds as the</div><div class='add'>+            # default file can be used as is in vast majority of projects.</div><div class='add'>+            # However, if the custom file exists in the default location, use that.</div><div class='add'>+</div><div class='add'>+            CUSTOM_BACKUP_REG_FILE = $$_PRO_FILE_PWD_/backup_registration/symbian/backup_registration.xml</div><div class='add'>+</div><div class='add'>+            exists($$CUSTOM_BACKUP_REG_FILE) {</div><div class='add'>+                BACKUP_REGISTRATION_FILE = $$CUSTOM_BACKUP_REG_FILE</div><div class='add'>+            } else {</div><div class='add'>+                BACKUP_REGISTRATION_FILE = $$[QT_INSTALL_DATA]/mkspecs/common/symbian/backup_registration.xml</div><div class='add'>+            }</div><div class='add'>+        } else {</div><div class='add'>+            BACKUP_REGISTRATION_FILE = $$BACKUP_REGISTRATION_FILE_SYMBIAN</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        contains(TEMPLATE, app) {</div><div class='add'>+            enable_backup_deployment.path = /private/$$replace(TARGET.UID3, 0x,)</div><div class='add'>+        } else {</div><div class='add'>+            enable_backup_deployment.path = /private/10202D56/import/packages/$$replace(TARGET.UID3, 0x,)</div><div class='add'>+        }</div><div class='add'>+        DEPLOYMENT += enable_backup_deployment</div><div class='add'>+    } else {</div><div class='add'>+        isEmpty(BACKUP_REGISTRATION_FILE_MAEMO) {</div><div class='add'>+            BACKUP_REGISTRATION_FILE = $$_PRO_FILE_PWD_/backup_registration/maemo/$$basename(TARGET).conf</div><div class='add'>+        } else {</div><div class='add'>+            BACKUP_REGISTRATION_FILE = $$BACKUP_REGISTRATION_FILE_MAEMO</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        enable_backup_deployment.path = /etc/osso-backup/applications</div><div class='add'>+        INSTALLS += enable_backup_deployment</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    # Make sure that BACKUP_REGISTRATION_FILE has absolute path, otherwise the following exists check will not work.</div><div class='add'>+    !contains(BACKUP_REGISTRATION_FILE, "(^/|^\\\\|^.:).*"): BACKUP_REGISTRATION_FILE = $$_PRO_FILE_PWD_/$$BACKUP_REGISTRATION_FILE</div><div class='add'>+</div><div class='add'>+    !exists($$BACKUP_REGISTRATION_FILE): warning(The backup registration file \'$$BACKUP_REGISTRATION_FILE\' was not found. Please provide a valid backup registration file.)</div><div class='add'>+</div><div class='add'>+    enable_backup_deployment.files = $$BACKUP_REGISTRATION_FILE</div><div class='add'>+}</div><div class='head'>diff --git a/mkspecs/features/link_pkgconfig.prf b/mkspecs/features/link_pkgconfig.prf<br/>index d70e5de..a3dbd1f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/link_pkgconfig.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/link_pkgconfig.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/link_pkgconfig.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/link_pkgconfig.prf</a></div><div class='hunk'>@@ -1,7 +1,12 @@</div><div class='ctx'> # handle pkg-config files</div><div class='del'>-isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config</div><div class='add'>+isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config # keep consistent with qt_functions.prf too!</div><div class='add'>+</div><div class='ctx'> for(PKGCONFIG_LIB, $$list($$unique(PKGCONFIG))) {</div><div class='add'>+    # don't proceed if the .pro asks for a package we don't have!</div><div class='add'>+    !packagesExist($$PKGCONFIG_LIB):error("Package $$PKGCONFIG_LIB not found")</div><div class='add'>+</div><div class='ctx'>     QMAKE_CXXFLAGS += $$system($$PKG_CONFIG --cflags $$PKGCONFIG_LIB)</div><div class='ctx'>     QMAKE_CFLAGS += $$system($$PKG_CONFIG --cflags $$PKGCONFIG_LIB)</div><div class='ctx'>     LIBS += $$system($$PKG_CONFIG --libs $$PKGCONFIG_LIB)</div><div class='ctx'> }</div><div class='add'>+</div><div class='head'>diff --git a/mkspecs/features/mac/objective_c.prf b/mkspecs/features/mac/objective_c.prf<br/>index 0df7013..0f25f41 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/mac/objective_c.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/mac/objective_c.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/mac/objective_c.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/mac/objective_c.prf</a></div><div class='hunk'>@@ -1,13 +1,13 @@</div><div class='ctx'> </div><div class='add'>+for(source, SOURCES) {</div><div class='add'>+    contains(source,.*\\.mm?$) {</div><div class='add'>+        warning(Objective-C source \'$$source\' found in SOURCES but should be in OBJECTIVE_SOURCES)</div><div class='add'>+        SOURCES -= $$source</div><div class='add'>+        OBJECTIVE_SOURCES += $$source</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> isEmpty(QMAKE_OBJECTIVE_CC):QMAKE_OBJECTIVE_CC = $$QMAKE_CC</div><div class='del'>-    QMAKE_OBJECTIVE_CFLAGS = $$QMAKE_CFLAGS</div><div class='del'>-    QMAKE_OBJECTIVE_CFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON</div><div class='del'>-    QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF</div><div class='del'>-    QMAKE_OBJECTIVE_CFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG</div><div class='del'>-    QMAKE_OBJECTIVE_CFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE</div><div class='del'>-    QMAKE_OBJECTIVE_CFLAGS_X86 = $$QMAKE_CFLAGS_X86</div><div class='del'>-    QMAKE_OBJECTIVE_CFLAGS_PPC = $$QMAKE_CFLAGS_PPC</div><div class='del'>-    QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = $$QMAKE_CXXFLAGS_HIDESYMS</div><div class='ctx'> </div><div class='ctx'> OBJECTIVE_C_OBJECTS_DIR = $$OBJECTS_DIR</div><div class='ctx'> isEmpty(OBJECTIVE_C_OBJECTS_DIR):OBJECTIVE_C_OBJECTS_DIR = .</div><div class='head'>diff --git a/mkspecs/features/no_debug_info.prf b/mkspecs/features/no_debug_info.prf<br/>index 3acf6c8..e05410d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/no_debug_info.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/no_debug_info.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/no_debug_info.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/no_debug_info.prf</a></div><div class='hunk'>@@ -1,5 +1,14 @@</div><div class='ctx'> </div><div class='del'>-QMAKE_CFLAGS -= -g -ggdb3</div><div class='del'>-QMAKE_CXXFLAGS -= -g -ggdb3</div><div class='del'>-QMAKE_LFLAGS -= -g -ggdb3</div><div class='del'>-QMAKE_LIBFLAGS -= -g -ggdb3</div><div class='add'>+win32-msvc2*|wince*msvc* {</div><div class='add'>+    QMAKE_CFLAGS -= -Zi</div><div class='add'>+    QMAKE_CFLAGS_DEBUG -= -Zi</div><div class='add'>+    QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO -= -Zi</div><div class='add'>+    QMAKE_CXXFLAGS -= -Zi</div><div class='add'>+    QMAKE_CXXFLAGS_DEBUG -= -Zi</div><div class='add'>+    QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO -= -Zi</div><div class='add'>+} else {</div><div class='add'>+    QMAKE_CFLAGS -= -g -ggdb3</div><div class='add'>+    QMAKE_CXXFLAGS -= -g -ggdb3</div><div class='add'>+    QMAKE_LFLAGS -= -g -ggdb3</div><div class='add'>+    QMAKE_LIBFLAGS -= -g -ggdb3</div><div class='add'>+}</div><div class='head'>diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf<br/>index e59319f..191a449 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/qt.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/qt.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/qt.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/qt.prf</a></div><div class='hunk'>@@ -113,7 +113,7 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {</div><div class='ctx'>             CONFIG(debug, debug|release): QT_ITEM = $${QTPLUG}d4.dll</div><div class='ctx'>             else: QT_ITEM = $${QTPLUG}4.dll</div><div class='ctx'> </div><div class='del'>-            eval(qt_additional_plugin_$${QTPLUG}.sources = $$[QT_INSTALL_PLUGINS]/$${QT_PLUGINPATH}/$${QT_ITEM})</div><div class='add'>+            eval(qt_additional_plugin_$${QTPLUG}.files = $$[QT_INSTALL_PLUGINS]/$${QT_PLUGINPATH}/$${QT_ITEM})</div><div class='ctx'>             eval(qt_additional_plugin_$${QTPLUG}.path = $${QT_PLUGINPATH})</div><div class='ctx'> </div><div class='ctx'>             DEPLOYMENT *= qt_additional_plugin_$${QTPLUG}</div><div class='hunk'>@@ -121,7 +121,7 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {</div><div class='ctx'>         isEqual(QT_CURRENT_VERIFY, DEPLOYMENT_PLUGIN):shared:symbian: {</div><div class='ctx'>             QT_ITEM = $${QTPLUG}.dll</div><div class='ctx'> </div><div class='del'>-            eval(qt_additional_plugin_$${QTPLUG}.sources = $${QT_ITEM})</div><div class='add'>+            eval(qt_additional_plugin_$${QTPLUG}.files = $${QT_ITEM})</div><div class='ctx'>             eval(qt_additional_plugin_$${QTPLUG}.path = $${QT_PLUGINPATH})</div><div class='ctx'> </div><div class='ctx'>             DEPLOYMENT *= qt_additional_plugin_$${QTPLUG}</div><div class='head'>diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf<br/>index 19e01a1..de1cac4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/qt_config.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/qt_config.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/qt_config.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/qt_config.prf</a></div><div class='hunk'>@@ -11,7 +11,11 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) {</div><div class='ctx'>    debug(1, "Cannot load qconfig.pri!")</div><div class='ctx'> } else {</div><div class='ctx'>    debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)")</div><div class='del'>-   for(mod, $$list($$files($$dirname(QMAKE_QT_CONFIG)/modules/qt_*.pri))):include($$mod)</div><div class='add'>+   for(dir, $$list($$unique($$list($$dirname(QMAKE_QT_CONFIG) \</div><div class='add'>+                                   $$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR))))) {</div><div class='add'>+      debug(1, "Loading modules from $${dir}")</div><div class='add'>+      for(mod, $$list($$files($$dir/modules/qt_*.pri))):include($$mod)</div><div class='add'>+   }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> load(qt_functions)</div><div class='head'>diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf<br/>index 24c84a5..5baf7ce 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/qt_functions.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/qt_functions.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/qt_functions.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/qt_functions.prf</a></div><div class='hunk'>@@ -46,7 +46,12 @@ defineTest(qtAddLibrary) {</div><div class='ctx'>        }</div><div class='ctx'>     }</div><div class='ctx'>     symbian {</div><div class='del'>-        isEqual(LIB_NAME, QtGui) {</div><div class='add'>+        isEqual(LIB_NAME, QtCore) {</div><div class='add'>+            #workaround for dependency from f32file.h on e32svr.h which has moved location in symbian3</div><div class='add'>+            contains(SYMBIAN_VERSION, Symbian3) {</div><div class='add'>+                INCLUDEPATH *= $$OS_LAYER_SYSTEMINCLUDE</div><div class='add'>+            }</div><div class='add'>+        } else:isEqual(LIB_NAME, QtGui) {</div><div class='ctx'>             # Needed for #include &lt;QtGui&gt; because qs60mainapplication.h includes aknapp.h</div><div class='ctx'>             INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE</div><div class='ctx'>         } else:isEqual(LIB_NAME, QtWebKit) {</div><div class='hunk'>@@ -103,3 +108,17 @@ defineTest(qtPrepareTool) {</div><div class='ctx'>     }</div><div class='ctx'>     export($$1)</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+defineTest(packagesExist) {</div><div class='add'>+    # this can't be done in global scope here because qt_functions is loaded</div><div class='add'>+    # before the .pro is parsed, so if the .pro set PKG_CONFIG, we wouldn't know it</div><div class='add'>+    # yet. oops.</div><div class='add'>+    isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config # keep consistent with link_pkgconfig.prf! too</div><div class='add'>+</div><div class='add'>+    for(package, ARGS) {</div><div class='add'>+        !system($$PKG_CONFIG --exists $$package):return(false)</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return(true)</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf<br/>index 5002058..ede9657 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/qttest_p4.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/qttest_p4.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/qttest_p4.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/qttest_p4.prf</a></div><div class='hunk'>@@ -1,6 +1,9 @@</div><div class='ctx'> isEmpty(TEMPLATE):TEMPLATE=app</div><div class='ctx'> CONFIG += qt warn_on console depend_includepath testcase</div><div class='ctx'> </div><div class='add'>+# x11 is not defined by configure (the following line is copied from gui.pro)</div><div class='add'>+!win32:!embedded:!qpa:!mac:!symbian:CONFIG += x11</div><div class='add'>+</div><div class='ctx'> qtAddLibrary(QtTest)</div><div class='ctx'> </div><div class='ctx'> symbian:{</div><div class='head'>diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf<br/>index 56d1ea8..f058399 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/symbian/application_icon.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/symbian/application_icon.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/symbian/application_icon.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/symbian/application_icon.prf</a></div><div class='hunk'>@@ -9,6 +9,7 @@ contains(CONFIG, no_icon) {</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> !contains(CONFIG, no_icon) {</div><div class='ctx'>     baseTarget = $$symbianRemoveSpecialCharacters($$basename(TARGET))</div><div class='ctx'>     contains(baseTarget, "^.*\\..*$") {</div><div class='hunk'>@@ -30,9 +31,9 @@ contains(CONFIG, no_icon) {</div><div class='ctx'>             regZDir = $$resourceZDir</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-        default_resource_deployment.sources += $$resourceZDir/$${baseTarget}.rsc</div><div class='add'>+        default_resource_deployment.files += $$resourceZDir/$${baseTarget}.rsc</div><div class='ctx'>         default_resource_deployment.path = $$APP_RESOURCE_DIR</div><div class='del'>-        default_reg_deployment.sources += $$regZDir/$${baseTarget}_reg.rsc</div><div class='add'>+        default_reg_deployment.files += $$regZDir/$${baseTarget}_reg.rsc</div><div class='ctx'>         default_reg_deployment.path = $$REG_RESOURCE_IMPORT_DIR</div><div class='ctx'> </div><div class='ctx'>         !isEmpty(ICON) {</div><div class='hunk'>@@ -75,9 +76,10 @@ contains(CONFIG, no_icon) {</div><div class='ctx'>             }</div><div class='ctx'>             # Rules to use generated MIF file from symbian resources</div><div class='ctx'>             RSS_RULES.number_of_icons = $$size(ICON_backslashed)</div><div class='del'>-            RSS_RULES.icon_file = $$APP_RESOURCE_DIR/$${baseTarget}.mif</div><div class='ctx'> </div><div class='del'>-            default_resource_deployment.sources += $$resourceZDir/$${baseTarget}.mif</div><div class='add'>+            RSS_RULES.icon_file = $$APP_RESOURCE_DIR/$${baseTarget}.mif                </div><div class='add'>+</div><div class='add'>+            default_resource_deployment.files += $$resourceZDir/$${baseTarget}.mif</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='head'>diff --git a/mkspecs/features/symbian/data_caging_paths.prf b/mkspecs/features/symbian/data_caging_paths.prf<br/>index 2f03128..7f5420c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/symbian/data_caging_paths.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/symbian/data_caging_paths.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/symbian/data_caging_paths.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/symbian/data_caging_paths.prf</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #    </div><div class='ctx'> #     # These variables are mostly useful when specifying deployment</div><div class='ctx'> #</div><div class='del'>-#     myLib.sources = myLib.dll</div><div class='add'>+#     myLib.files = myLib.dll</div><div class='ctx'> #     myLib.path = $$SHARED_LIB_DIR</div><div class='ctx'> #     DEPLOYMENT += myLib</div><div class='ctx'> #</div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #     # $$QT_PUBLIC_PLUGINS_BASE specifies the public base directory for Qt</div><div class='ctx'> #     # plugin stubs:</div><div class='ctx'> #</div><div class='del'>-#     myPublicImageFormatPlugin.sources = myImageFormat.dll</div><div class='add'>+#     myPublicImageFormatPlugin.files = myImageFormat.dll</div><div class='ctx'> #     myPublicImageFormatPlugin.path = $$QT_PLUGINS_BASE_DIR/imageformats</div><div class='ctx'> #     DEPLOYMENT += myPublicImageFormatPlugin</div><div class='ctx'> #</div><div class='head'>diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf<br/>index ce3453a..470372e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/symbian/default_post.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/symbian/default_post.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/symbian/default_post.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/symbian/default_post.prf</a></div><div class='hunk'>@@ -10,11 +10,11 @@ contains(TEMPLATE, ".*app") {</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     contains(DESTDIR, "/.*") {</div><div class='del'>-        default_bin_deployment.sources += $$DESTDIR/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe</div><div class='add'>+        default_bin_deployment.files += $$DESTDIR/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe</div><div class='ctx'>     } else:isEmpty(DESTDIR) {</div><div class='del'>-        default_bin_deployment.sources += $$OUT_PWD/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe</div><div class='add'>+        default_bin_deployment.files += $$OUT_PWD/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe</div><div class='ctx'>     } else {</div><div class='del'>-        default_bin_deployment.sources += $$OUT_PWD/$$DESTDIR/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe</div><div class='add'>+        default_bin_deployment.files += $$OUT_PWD/$$DESTDIR/$$symbianRemoveSpecialCharacters($$basename(TARGET)).exe</div><div class='ctx'>     }</div><div class='ctx'>     default_bin_deployment.path += /sys/bin</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/features/symbian/run_on_phone.prf b/mkspecs/features/symbian/run_on_phone.prf<br/>index d845277..ba88a66 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/symbian/run_on_phone.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/symbian/run_on_phone.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/symbian/run_on_phone.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/symbian/run_on_phone.prf</a></div><div class='hunk'>@@ -5,7 +5,8 @@ GENERATE_RUN_TARGETS = false</div><div class='ctx'> contains(TEMPLATE, app): GENERATE_RUN_TARGETS = true</div><div class='ctx'> else:!equals(DEPLOYMENT, default_deployment) {</div><div class='ctx'>     for(dep_item, $$list($$DEPLOYMENT)) {</div><div class='del'>-        dep_item_sources = $$eval($${dep_item}.sources)</div><div class='add'>+        ### Qt 5: remove .sources, inconsistent with INSTALLS</div><div class='add'>+        dep_item_sources = $$eval($${dep_item}.files) $$eval($${dep_item}.sources)</div><div class='ctx'>         !isEmpty(dep_item_sources): GENERATE_RUN_TARGETS = true</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='head'>diff --git a/mkspecs/features/symbian/sis_targets.prf b/mkspecs/features/symbian/sis_targets.prf<br/>index f919e1d..f3452b7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/symbian/sis_targets.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/symbian/sis_targets.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/symbian/sis_targets.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/symbian/sis_targets.prf</a></div><div class='hunk'>@@ -4,7 +4,8 @@ GENERATE_SIS_TARGETS = false</div><div class='ctx'> contains(TEMPLATE, app): GENERATE_SIS_TARGETS = true</div><div class='ctx'> else:!equals(DEPLOYMENT, default_deployment) {</div><div class='ctx'>     for(dep_item, $$list($$DEPLOYMENT)) {</div><div class='del'>-        dep_item_sources = $$eval($${dep_item}.sources)</div><div class='add'>+        ### Qt 5: remove .sources, inconsistent with INSTALLS</div><div class='add'>+        dep_item_sources = $$eval($${dep_item}.files) $$eval($${dep_item}.sources)</div><div class='ctx'>         !isEmpty(dep_item_sources): GENERATE_SIS_TARGETS = true</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='hunk'>@@ -25,6 +26,13 @@ equals(GENERATE_SIS_TARGETS, true) {</div><div class='ctx'> </div><div class='ctx'>     qtPrepareTool(QMAKE_CREATEPACKAGE, createpackage)</div><div class='ctx'> </div><div class='add'>+    sis_objects_dir = $$OBJECTS_DIR</div><div class='add'>+    isEmpty(sis_objects_dir):sis_objects_dir = .</div><div class='add'>+</div><div class='add'>+    CREATEPACKAGE_DIR = $$sis_objects_dir/createpackage_tmp</div><div class='add'>+</div><div class='add'>+    QMAKE_CLEAN += $$CREATEPACKAGE_DIR/*</div><div class='add'>+</div><div class='ctx'>     symbian-abld|symbian-sbsv2 {</div><div class='ctx'>         symbian-sbsv2 {</div><div class='ctx'>             CONVERT_GCCE_PARAM = -g</div><div class='hunk'>@@ -47,7 +55,7 @@ equals(GENERATE_SIS_TARGETS, true) {</div><div class='ctx'>         sis_target.depends += $${baseTarget}_template.pkg</div><div class='ctx'> </div><div class='ctx'>         ok_sis_target.target = ok_sis</div><div class='del'>-        ok_sis_target.commands = $$QMAKE_CREATEPACKAGE $$CONVERT_GCCE_PARAM $(QT_SIS_OPTIONS) $${baseTarget}_template.pkg \</div><div class='add'>+        ok_sis_target.commands = $$QMAKE_CREATEPACKAGE $$CONVERT_GCCE_PARAM -t $$CREATEPACKAGE_DIR $(QT_SIS_OPTIONS) $${baseTarget}_template.pkg \</div><div class='ctx'>                                      $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)</div><div class='ctx'> </div><div class='ctx'>         unsigned_sis_target.target = unsigned_sis</div><div class='hunk'>@@ -64,7 +72,7 @@ equals(GENERATE_SIS_TARGETS, true) {</div><div class='ctx'>         unsigned_sis_target.depends += $${baseTarget}_template.pkg</div><div class='ctx'> </div><div class='ctx'>         ok_unsigned_sis_target.target = ok_unsigned_sis</div><div class='del'>-        ok_unsigned_sis_target.commands = $$QMAKE_CREATEPACKAGE $$CONVERT_GCCE_PARAM $(QT_SIS_OPTIONS) -o $${baseTarget}_template.pkg $(QT_SIS_TARGET)</div><div class='add'>+        ok_unsigned_sis_target.commands = $$QMAKE_CREATEPACKAGE $$CONVERT_GCCE_PARAM -t $$CREATEPACKAGE_DIR $(QT_SIS_OPTIONS) -o $${baseTarget}_template.pkg $(QT_SIS_TARGET)</div><div class='ctx'> </div><div class='ctx'>         target_sis_target.target = $${baseTarget}.sis</div><div class='ctx'>         target_sis_target.commands = $(MAKE) -f $(MAKEFILE) sis</div><div class='hunk'>@@ -76,7 +84,7 @@ equals(GENERATE_SIS_TARGETS, true) {</div><div class='ctx'>         installer_sis_target.depends = $${baseTarget}_installer.pkg sis</div><div class='ctx'> </div><div class='ctx'>         ok_installer_sis_target.target = ok_installer_sis</div><div class='del'>-        ok_installer_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \</div><div class='add'>+        ok_installer_sis_target.commands = $$QMAKE_CREATEPACKAGE -t $$CREATEPACKAGE_DIR $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \</div><div class='ctx'>                                                $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)</div><div class='ctx'>         ok_installer_sis_target.depends = $${baseTarget}_installer.pkg</div><div class='ctx'> </div><div class='hunk'>@@ -85,7 +93,7 @@ equals(GENERATE_SIS_TARGETS, true) {</div><div class='ctx'>         unsigned_installer_sis_target.depends = $${baseTarget}_installer.pkg unsigned_sis</div><div class='ctx'> </div><div class='ctx'>         ok_unsigned_installer_sis_target.target = ok_unsigned_installer_sis</div><div class='del'>-        ok_unsigned_installer_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) -o $${baseTarget}_installer.pkg</div><div class='add'>+        ok_unsigned_installer_sis_target.commands = $$QMAKE_CREATEPACKAGE -t $$CREATEPACKAGE_DIR $(QT_SIS_OPTIONS) -o $${baseTarget}_installer.pkg</div><div class='ctx'>         ok_unsigned_installer_sis_target.depends = $${baseTarget}_installer.pkg</div><div class='ctx'> </div><div class='ctx'>         fail_sis_nocache_target.target = fail_sis_nocache</div><div class='hunk'>@@ -105,7 +113,7 @@ equals(GENERATE_SIS_TARGETS, true) {</div><div class='ctx'>         stub_sis_target.depends += $${baseTarget}_stub.pkg</div><div class='ctx'> </div><div class='ctx'>         ok_stub_sis_target.target = ok_stub_sis</div><div class='del'>-        ok_stub_sis_target.commands = $$QMAKE_CREATEPACKAGE -s $(QT_SIS_OPTIONS) $${baseTarget}_stub.pkg \</div><div class='add'>+        ok_stub_sis_target.commands = $$QMAKE_CREATEPACKAGE -t $$CREATEPACKAGE_DIR -s $(QT_SIS_OPTIONS) $${baseTarget}_stub.pkg \</div><div class='ctx'>                                           $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)</div><div class='ctx'> </div><div class='ctx'>         QMAKE_EXTRA_TARGETS += sis_target \</div><div class='hunk'>@@ -141,6 +149,7 @@ equals(GENERATE_SIS_TARGETS, true) {</div><div class='ctx'>                 &amp;&amp; echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) &gt;&gt; $$make_cache_name</div><div class='ctx'> </div><div class='ctx'>             QMAKE_EXTRA_TARGETS += store_build_target</div><div class='add'>+            QMAKE_CLEAN += $$make_cache_name</div><div class='ctx'>         }</div><div class='ctx'>     } else {</div><div class='ctx'>         sis_destdir = $$DESTDIR</div><div class='hunk'>@@ -148,12 +157,12 @@ equals(GENERATE_SIS_TARGETS, true) {</div><div class='ctx'>         !equals(TARGET, "$$baseTarget"):sis_destdir = $$sis_destdir/$$dirname(TARGET)</div><div class='ctx'> </div><div class='ctx'>         sis_target.target = sis</div><div class='del'>-        sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) $${baseTarget}_template.pkg \</div><div class='add'>+        sis_target.commands = $$QMAKE_CREATEPACKAGE -t $$CREATEPACKAGE_DIR $(QT_SIS_OPTIONS) $${baseTarget}_template.pkg \</div><div class='ctx'>                                   - $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)</div><div class='ctx'>         sis_target.depends = first $${baseTarget}_template.pkg</div><div class='ctx'> </div><div class='ctx'>         unsigned_sis_target.target = unsigned_sis</div><div class='del'>-        unsigned_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) -o $${baseTarget}_template.pkg</div><div class='add'>+        unsigned_sis_target.commands = $$QMAKE_CREATEPACKAGE -t $$CREATEPACKAGE_DIR $(QT_SIS_OPTIONS) -o $${baseTarget}_template.pkg</div><div class='ctx'>         unsigned_sis_target.depends = first $${baseTarget}_template.pkg</div><div class='ctx'> </div><div class='ctx'>         target_sis_target.target = $${sis_destdir}/$${baseTarget}.sis</div><div class='hunk'>@@ -164,12 +173,12 @@ equals(GENERATE_SIS_TARGETS, true) {</div><div class='ctx'>         installer_sis_target.depends = $${baseTarget}_installer.pkg sis</div><div class='ctx'> </div><div class='ctx'>         ok_installer_sis_target.target = ok_installer_sis</div><div class='del'>-        ok_installer_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \</div><div class='add'>+        ok_installer_sis_target.commands = $$QMAKE_CREATEPACKAGE -t $$CREATEPACKAGE_DIR $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \</div><div class='ctx'>                                             $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)</div><div class='ctx'>         ok_installer_sis_target.depends = $${baseTarget}_installer.pkg</div><div class='ctx'> </div><div class='ctx'>         unsigned_installer_sis_target.target = unsigned_installer_sis</div><div class='del'>-        unsigned_installer_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) -o $${baseTarget}_installer.pkg</div><div class='add'>+        unsigned_installer_sis_target.commands = $$QMAKE_CREATEPACKAGE -t $$CREATEPACKAGE_DIR $(QT_SIS_OPTIONS) -o $${baseTarget}_installer.pkg</div><div class='ctx'>         unsigned_installer_sis_target.depends = $${baseTarget}_installer.pkg unsigned_sis</div><div class='ctx'> </div><div class='ctx'>         !isEmpty(sis_destdir):!equals(sis_destdir, "."):!equals(sis_destdir, "./") {</div><div class='head'>diff --git a/mkspecs/features/uitools.prf b/mkspecs/features/uitools.prf<br/>index 2d14b04..6599577 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/uitools.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/uitools.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/uitools.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/uitools.prf</a></div><div class='hunk'>@@ -3,11 +3,11 @@ qt:load(qt)</div><div class='ctx'> </div><div class='ctx'> # Include the correct version of the UiLoader library</div><div class='ctx'> symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib</div><div class='del'>-else: QTUITOOLS_LINKAGE = -lQtUiTools</div><div class='add'>+else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}</div><div class='ctx'> </div><div class='ctx'> CONFIG(debug, debug|release) {</div><div class='del'>-    mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug</div><div class='del'>-    win32: QTUITOOLS_LINKAGE = -lQtUiToolsd</div><div class='add'>+    mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug</div><div class='add'>+    win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d</div><div class='ctx'> }</div><div class='ctx'> LIBS += $$QTUITOOLS_LINKAGE</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/features/unix/gdb_dwarf_index.prf b/mkspecs/features/unix/gdb_dwarf_index.prf<br/>new file mode 100644<br/>index 0000000..14db4fc<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/unix/gdb_dwarf_index.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/unix/gdb_dwarf_index.prf</a></div><div class='hunk'>@@ -0,0 +1,15 @@</div><div class='add'>+!CONFIG(separate_debug_info):CONFIG(debug, debug|release):!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) {</div><div class='add'>+</div><div class='add'>+    QMAKE_GDB_INDEX = { test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\"; } &amp;&amp; \</div><div class='add'>+      test \$\$(gdb --version | sed -e \'s,[^0-9]\\+\\([0-9]\\)\\.\\([0-9]\\).*,\\1\\2,;q\') -gt 72 &amp;&amp; \</div><div class='add'>+      gdb --nx --batch --quiet -ex \'set confirm off\' -ex \'save gdb-index .\' -ex quit \'$(TARGET)\'  &amp;&amp; \</div><div class='add'>+      test -f $(TARGET).gdb-index &amp;&amp; \</div><div class='add'>+      $$QMAKE_OBJCOPY --add-section \'.gdb_index=$(TARGET).gdb-index\' --set-section-flags \'.gdb_index=readonly\' \'$(TARGET)\' \'$(TARGET)\' &amp;&amp; \</div><div class='add'>+      $$QMAKE_DEL_FILE $(TARGET).gdb-index || true</div><div class='add'>+</div><div class='add'>+    !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK</div><div class='add'>+    QMAKE_POST_LINK = $$QMAKE_GDB_INDEX $$QMAKE_POST_LINK</div><div class='add'>+</div><div class='add'>+    silent:QMAKE_POST_LINK = @echo indexing $@ for gdb &amp;&amp; $$QMAKE_POST_LINK</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/mkspecs/features/win32/console.prf b/mkspecs/features/win32/console.prf<br/>index b34e1c6..8a1725d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/win32/console.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/win32/console.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/win32/console.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/win32/console.prf</a></div><div class='hunk'>@@ -1,2 +1,4 @@</div><div class='ctx'> CONFIG -= windows</div><div class='del'>-contains(TEMPLATE, ".*app") : QMAKE_LFLAGS += $$QMAKE_LFLAGS_CONSOLE</div><div class='add'>+contains(TEMPLATE, ".*app") {</div><div class='add'>+    QMAKE_LFLAGS += $$QMAKE_LFLAGS_CONSOLE $$QMAKE_LFLAGS_EXE</div><div class='add'>+}</div><div class='head'>diff --git a/mkspecs/features/win32/embed_manifest_dll.prf b/mkspecs/features/win32/embed_manifest_dll.prf<br/>index 5545a62..cf96ee7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/win32/embed_manifest_dll.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/win32/embed_manifest_dll.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/win32/embed_manifest_dll.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/win32/embed_manifest_dll.prf</a></div><div class='hunk'>@@ -7,6 +7,6 @@</div><div class='ctx'>     NOPATH_TARGET ~= s,^(.*/)+,,    # Remove all paths</div><div class='ctx'>     QMAKE_LFLAGS += /MANIFEST $$quote(/MANIFESTFILE:\"$${MANIFEST_DIR}\\$${NOPATH_TARGET}.intermediate.manifest\")</div><div class='ctx'>     !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK</div><div class='del'>-    QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);2$$escape_expand(\\n\\t))$$QMAKE_POST_LINK</div><div class='add'>+    QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);2)$$QMAKE_POST_LINK</div><div class='ctx'>     QMAKE_CLEAN += \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\"</div><div class='ctx'> }</div><div class='head'>diff --git a/mkspecs/features/win32/embed_manifest_exe.prf b/mkspecs/features/win32/embed_manifest_exe.prf<br/>index c6d012e..9bc7702 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/win32/embed_manifest_exe.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/win32/embed_manifest_exe.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/win32/embed_manifest_exe.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/win32/embed_manifest_exe.prf</a></div><div class='hunk'>@@ -7,6 +7,6 @@ if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):equals(TEMPLATE, "app") {</div><div class='ctx'>     NOPATH_TARGET ~= s,^(.*/)+,,    # Remove all paths</div><div class='ctx'>     QMAKE_LFLAGS += /MANIFEST $$quote(/MANIFESTFILE:\"$${MANIFEST_DIR}\\$${NOPATH_TARGET}.intermediate.manifest\")</div><div class='ctx'>     !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK</div><div class='del'>-    QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);1$$escape_expand(\\n\\t))$$QMAKE_POST_LINK</div><div class='add'>+    QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);1)$$QMAKE_POST_LINK</div><div class='ctx'>     QMAKE_CLEAN += \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\"</div><div class='ctx'> }</div><div class='head'>diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf<br/>index cf81388..f41db80 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/features/win32/windows.prf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/features/win32/windows.prf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/features/win32/windows.prf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/features/win32/windows.prf</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> CONFIG -= console</div><div class='ctx'> contains(TEMPLATE, ".*app"){</div><div class='del'>-    QMAKE_LFLAGS += $$QMAKE_LFLAGS_WINDOWS</div><div class='add'>+    QMAKE_LFLAGS += $$QMAKE_LFLAGS_WINDOWS $$QMAKE_LFLAGS_EXE</div><div class='ctx'>     win32-g++:DEFINES += QT_NEEDS_QMAIN</div><div class='ctx'>     win32-borland:DEFINES += QT_NEEDS_QMAIN</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf<br/>index 51a1960..9d7c443 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/freebsd-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/freebsd-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/freebsd-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/freebsd-g++/qmake.conf</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> MAKEFILE_GENERATOR	= UNIX</div><div class='ctx'> TARGET_PLATFORM		= unix</div><div class='ctx'> TEMPLATE		= app</div><div class='del'>-CONFIG			+= qt warn_on release link_prl</div><div class='add'>+CONFIG			+= qt warn_on release link_prl gdb_dwarf_index</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> </div><div class='ctx'> QMAKE_CFLAGS_THREAD	= -pthread -D_THREAD_SAFE</div><div class='hunk'>@@ -28,7 +28,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	=</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	=</div><div class='ctx'> </div><div class='hunk'>@@ -48,6 +48,7 @@ QMAKE_DEL_FILE		= rm -f</div><div class='ctx'> QMAKE_DEL_DIR		= rmdir</div><div class='ctx'> QMAKE_CHK_DIR_EXISTS	= test -d</div><div class='ctx'> QMAKE_MKDIR		= mkdir -p</div><div class='del'>-include(../common/g++.conf)</div><div class='ctx'> include(../common/unix.conf)</div><div class='add'>+include(../common/gcc-base-unix.conf)</div><div class='add'>+include(../common/g++-unix.conf)</div><div class='ctx'> load(qt_config)</div><div class='head'>diff --git a/mkspecs/freebsd-g++34/qmake.conf b/mkspecs/freebsd-g++34/qmake.conf<br/>index 810efab..0f52993 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/freebsd-g++34/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/freebsd-g++34/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/freebsd-g++34/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/freebsd-g++34/qmake.conf</a></div><div class='hunk'>@@ -63,7 +63,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	=</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	=</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/freebsd-g++40/qmake.conf b/mkspecs/freebsd-g++40/qmake.conf<br/>index 4b0ac4c..bf42711 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/freebsd-g++40/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/freebsd-g++40/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/freebsd-g++40/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/freebsd-g++40/qmake.conf</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> MAKEFILE_GENERATOR	= UNIX</div><div class='ctx'> TARGET_PLATFORM		= unix</div><div class='ctx'> TEMPLATE		= app</div><div class='del'>-CONFIG			+= qt warn_on release link_prl</div><div class='add'>+CONFIG			+= qt warn_on release link_prl gdb_dwarf_index</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> </div><div class='ctx'> QMAKE_CC		= gcc40</div><div class='hunk'>@@ -63,7 +63,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	=</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	=</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/freebsd-icc/qmake.conf b/mkspecs/freebsd-icc/qmake.conf<br/>index 99d6126..acc8f14 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/freebsd-icc/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/freebsd-icc/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/freebsd-icc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/freebsd-icc/qmake.conf</a></div><div class='hunk'>@@ -86,7 +86,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	=</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	=</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf<br/>index 38c8555..b9aaf5a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/hpux-acc-64/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hpux-acc-64/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/hpux-acc-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/hpux-acc-64/qmake.conf</a></div><div class='hunk'>@@ -106,7 +106,7 @@ QMAKE_LIBS		= -lm</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXt</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL -lXt</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL -lXt</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='ctx'> QMAKE_LIBS_YACC		= -ly</div><div class='head'>diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf<br/>index 630129c..389e813 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/hpux-acc-o64/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hpux-acc-o64/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/hpux-acc-o64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/hpux-acc-o64/qmake.conf</a></div><div class='hunk'>@@ -104,7 +104,7 @@ QMAKE_LIBS_DYNLOAD	= -ldld</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='ctx'> </div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='ctx'> QMAKE_LIBS_YACC		= -ly</div><div class='head'>diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf<br/>index 1c732c6..d1b6e5c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/hpux-acc/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hpux-acc/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/hpux-acc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/hpux-acc/qmake.conf</a></div><div class='hunk'>@@ -85,7 +85,7 @@ QMAKE_LIBS		= -lm</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	= -ldld</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXt</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL -lXt</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL -lXt</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='ctx'> QMAKE_LIBS_YACC		= -ly</div><div class='head'>diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf<br/>index d8b0a4a..f796496 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/hpux-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hpux-g++-64/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/hpux-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/hpux-g++-64/qmake.conf</a></div><div class='hunk'>@@ -68,7 +68,7 @@ QMAKE_LIBS		= -lm</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	= -ldld</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='ctx'> QMAKE_LIBS_YACC		= -ly</div><div class='head'>diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf<br/>index 312c44b..e9891e7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/hpux-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hpux-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/hpux-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/hpux-g++/qmake.conf</a></div><div class='hunk'>@@ -68,7 +68,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	= -ldld</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='ctx'> QMAKE_LIBS_YACC		= -ly</div><div class='head'>diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf<br/>index a26cb32..d7e4a0a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/hpuxi-acc-32/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hpuxi-acc-32/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/hpuxi-acc-32/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/hpuxi-acc-32/qmake.conf</a></div><div class='hunk'>@@ -60,7 +60,7 @@ QMAKE_LIBS		= -lm</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXt</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL -lXt</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL -lXt</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='ctx'> QMAKE_LIBS_YACC		= -ly</div><div class='head'>diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf<br/>index 3e2d59f..3ed9b55 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/hpuxi-acc-64/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hpuxi-acc-64/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/hpuxi-acc-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/hpuxi-acc-64/qmake.conf</a></div><div class='hunk'>@@ -103,7 +103,7 @@ QMAKE_LIBS		= -lm</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXt</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL -lXt</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL -lXt</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='ctx'> QMAKE_LIBS_YACC		= -ly</div><div class='head'>diff --git a/mkspecs/hpuxi-g++-64/qmake.conf b/mkspecs/hpuxi-g++-64/qmake.conf<br/>index 3151d85..a8f445c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/hpuxi-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hpuxi-g++-64/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/hpuxi-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/hpuxi-g++-64/qmake.conf</a></div><div class='hunk'>@@ -71,7 +71,7 @@ QMAKE_LIBS		= -lm</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='ctx'> QMAKE_LIBS_YACC		= -ly</div><div class='head'>diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf<br/>index 6570e40..09a72fa 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/hurd-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/hurd-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/hurd-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/hurd-g++/qmake.conf</a></div><div class='hunk'>@@ -1,90 +1,74 @@</div><div class='ctx'> #</div><div class='ctx'> # qmake configuration for hurd-g++</div><div class='ctx'> #</div><div class='del'>-# Submitted by uch@nop.or.jp as "gnu-g++".</div><div class='del'>-# Renamed to "hurd-g++" because people were confusing GNU/Hurd with GNU/Linux.</div><div class='del'>-#</div><div class='ctx'> </div><div class='ctx'> MAKEFILE_GENERATOR	= UNIX</div><div class='ctx'> TARGET_PLATFORM		= unix</div><div class='ctx'> TEMPLATE		= app</div><div class='add'>+CONFIG			+= qt warn_on release incremental link_prl gdb_dwarf_index</div><div class='ctx'> QT			+= core gui</div><div class='del'>-CONFIG			+= qt warn_on release link_prl</div><div class='del'>-</div><div class='del'>-QMAKE_CC		= gcc</div><div class='del'>-QMAKE_LEX		= flex</div><div class='del'>-QMAKE_LEXFLAGS		=</div><div class='del'>-QMAKE_YACC		= yacc</div><div class='del'>-QMAKE_YACCFLAGS		= -d</div><div class='del'>-QMAKE_CFLAGS		= -pipe</div><div class='del'>-QMAKE_CFLAGS_DEPS	= -M</div><div class='del'>-QMAKE_CFLAGS_WARN_ON	= -Wall -W</div><div class='del'>-QMAKE_CFLAGS_WARN_OFF	= -w</div><div class='del'>-QMAKE_CFLAGS_RELEASE	= -O2</div><div class='del'>-QMAKE_CFLAGS_DEBUG	= -g</div><div class='del'>-QMAKE_CFLAGS_SHLIB	= -fPIC</div><div class='del'>-QMAKE_CFLAGS_STATIC_LIB	= $$QMAKE_CFLAGS_SHLIB</div><div class='del'>-QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses</div><div class='del'>-QMAKE_CFLAGS_THREAD	= -D_REENTRANT</div><div class='add'>+QMAKE_INCREMENTAL_STYLE = sublib</div><div class='ctx'> </div><div class='del'>-QMAKE_CXX		= g++</div><div class='del'>-QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS</div><div class='del'>-QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS</div><div class='del'>-QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON</div><div class='del'>-QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF</div><div class='del'>-QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE</div><div class='del'>-QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG</div><div class='del'>-QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB</div><div class='del'>-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB</div><div class='del'>-QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC</div><div class='del'>-QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CXXFLAGS_THREAD</div><div class='add'>+QMAKE_CFLAGS_THREAD	+= -D_REENTRANT</div><div class='add'>+QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_THREAD</div><div class='ctx'> </div><div class='del'>-QMAKE_INCDIR		=</div><div class='del'>-QMAKE_LIBDIR		=</div><div class='del'>-QMAKE_INCDIR_X11	= /usr/X11R6/include</div><div class='del'>-QMAKE_LIBDIR_X11	= /usr/X11R6/lib</div><div class='del'>-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]</div><div class='del'>-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]</div><div class='del'>-QMAKE_INCDIR_OPENGL	= /usr/X11R6/include</div><div class='del'>-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib</div><div class='add'>+QMAKE_INCDIR          =</div><div class='add'>+QMAKE_LIBDIR          =</div><div class='add'>+QMAKE_INCDIR_X11      = /usr/X11R6/include</div><div class='add'>+QMAKE_LIBDIR_X11      = /usr/X11R6/lib</div><div class='add'>+QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]</div><div class='add'>+QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]</div><div class='add'>+QMAKE_INCDIR_OPENGL   = /usr/X11R6/include</div><div class='add'>+QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib</div><div class='add'>+QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL</div><div class='add'>+QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL</div><div class='add'>+QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL</div><div class='add'>+QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL</div><div class='add'>+QMAKE_INCDIR_EGL      = </div><div class='add'>+QMAKE_LIBDIR_EGL      =</div><div class='add'>+QMAKE_INCDIR_OPENVG   = </div><div class='add'>+QMAKE_LIBDIR_OPENVG   =</div><div class='ctx'> </div><div class='del'>-QMAKE_LINK		= g++</div><div class='del'>-QMAKE_LINK_SHLIB	= g++</div><div class='del'>-QMAKE_LINK_C		= gcc</div><div class='del'>-QMAKE_LINK_C_SHLIB	= gcc</div><div class='del'>-QMAKE_LFLAGS		= -Wl,-rpath=/lib:/usr/X11R6/lib:$$[QT_INSTALL_LIBS]</div><div class='del'>-QMAKE_LFLAGS_RELEASE	=</div><div class='del'>-QMAKE_LFLAGS_DEBUG	=</div><div class='del'>-QMAKE_LFLAGS_SHLIB	= -shared</div><div class='del'>-QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB</div><div class='del'>-QMAKE_LFLAGS_SONAME	= -Wl,-soname,</div><div class='add'>+QMAKE_LIBS            =</div><div class='add'>+QMAKE_LIBS_DYNLOAD    = -ldl</div><div class='add'>+QMAKE_LIBS_X11        = -lXext -lX11 -lm</div><div class='add'>+QMAKE_LIBS_X11SM      = -lSM -lICE</div><div class='add'>+QMAKE_LIBS_NIS        = -lnsl</div><div class='add'>+QMAKE_LIBS_EGL        = -lEGL</div><div class='add'>+QMAKE_LIBS_OPENGL     = -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL_QT  = -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM</div><div class='add'>+QMAKE_LIBS_OPENGL_ES2 = -lGLESv2</div><div class='add'>+QMAKE_LIBS_OPENVG     = -lOpenVG</div><div class='add'>+QMAKE_LIBS_THREAD     = -lpthread</div><div class='ctx'> </div><div class='del'>-QMAKE_LIBS		= -lpthread # This is tricky but needed</div><div class='del'>-QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='del'>-QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='del'>-QMAKE_LIBS_X11SM 	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_NIS		= -lnsl</div><div class='del'>-QMAKE_LIBS_QT_THREAD	= -lqt-mt</div><div class='del'>-QMAKE_LIBS_THREAD	=</div><div class='add'>+QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc</div><div class='add'>+QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic</div><div class='ctx'> </div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='del'>-QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='add'>+QMAKE_AR              = ar cqs</div><div class='add'>+QMAKE_OBJCOPY         = objcopy</div><div class='add'>+QMAKE_RANLIB          =</div><div class='ctx'> </div><div class='del'>-QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc</div><div class='del'>-QMAKE_UIC		= $$[QT_INSTALL_BINS]/uic</div><div class='add'>+QMAKE_TAR             = tar -cf</div><div class='add'>+QMAKE_GZIP            = gzip -9f</div><div class='ctx'> </div><div class='del'>-QMAKE_AR		= ar cqs</div><div class='del'>-QMAKE_OBJCOPY           = objcopy</div><div class='del'>-QMAKE_RANLIB		=</div><div class='add'>+QMAKE_COPY            = cp -f</div><div class='add'>+QMAKE_COPY_FILE       = $(COPY)</div><div class='add'>+QMAKE_COPY_DIR        = $(COPY) -r</div><div class='add'>+QMAKE_MOVE            = mv -f</div><div class='add'>+QMAKE_DEL_FILE        = rm -f</div><div class='add'>+QMAKE_DEL_DIR         = rmdir</div><div class='add'>+QMAKE_STRIP           = strip</div><div class='add'>+QMAKE_STRIPFLAGS_LIB += --strip-unneeded</div><div class='add'>+QMAKE_CHK_DIR_EXISTS  = test -d</div><div class='add'>+QMAKE_MKDIR           = mkdir -p</div><div class='add'>+QMAKE_INSTALL_FILE    = install -m 644 -p</div><div class='add'>+QMAKE_INSTALL_PROGRAM = install -m 755 -p</div><div class='ctx'> </div><div class='del'>-QMAKE_TAR		= tar -cf</div><div class='del'>-QMAKE_GZIP		= gzip -9f</div><div class='del'>-</div><div class='del'>-QMAKE_COPY		= cp -f</div><div class='del'>-QMAKE_MOVE		= mv -f</div><div class='del'>-QMAKE_DEL_FILE		= rm -f</div><div class='del'>-QMAKE_DEL_DIR		= rmdir</div><div class='del'>-QMAKE_CHK_DIR_EXISTS	= test -d</div><div class='del'>-QMAKE_MKDIR		= mkdir -p</div><div class='ctx'> include(../common/unix.conf)</div><div class='add'>+include(../common/gcc-base-unix.conf)</div><div class='add'>+include(../common/g++-unix.conf)</div><div class='ctx'> load(qt_config)</div><div class='add'>+</div><div class='add'>+# This is tricky but needed</div><div class='add'>+QMAKE_LIBS           += $$QMAKE_LIBS_THREAD</div><div class='head'>diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf<br/>index b8d316e..ec94824 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/irix-cc-64/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/irix-cc-64/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/irix-cc-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/irix-cc-64/qmake.conf</a></div><div class='hunk'>@@ -94,7 +94,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	=</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL -lm</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL -lm</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf<br/>index 2f4f03f..777da9b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/irix-cc/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/irix-cc/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/irix-cc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/irix-cc/qmake.conf</a></div><div class='hunk'>@@ -94,7 +94,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	=</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL -lm</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL -lm</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/irix-g++-64/qmake.conf b/mkspecs/irix-g++-64/qmake.conf<br/>index 610d92c..aa853de 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/irix-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/irix-g++-64/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/irix-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/irix-g++-64/qmake.conf</a></div><div class='hunk'>@@ -67,7 +67,7 @@ QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='ctx'> # libGLU is using the SGI C++ library internally and this somehow clashes</div><div class='ctx'> # with the GNU C++ library (similar name mangling and symbol names?)</div><div class='ctx'> # so we add -lC so that the SGI C++ library is used first...</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf<br/>index 41841f3..77d47a9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/irix-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/irix-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/irix-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/irix-g++/qmake.conf</a></div><div class='hunk'>@@ -67,7 +67,7 @@ QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='ctx'> # libGLU is using the SGI C++ library internally and this somehow clashes</div><div class='ctx'> # with the GNU C++ library (similar name mangling and symbol names?)</div><div class='ctx'> # so we add -lC so that the SGI C++ library is used first...</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf<br/>index 879c78a..ce303b7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/linux-cxx/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-cxx/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/linux-cxx/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/linux-cxx/qmake.conf</a></div><div class='hunk'>@@ -60,7 +60,7 @@ QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='ctx'> QMAKE_LIBS_NIS		= -lnsl</div><div class='ctx'> </div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> </div><div class='ctx'> QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc</div><div class='head'>diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf<br/>index aa50b87..61a056b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/linux-ecc-64/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-ecc-64/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/linux-ecc-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/linux-ecc-64/qmake.conf</a></div><div class='hunk'>@@ -63,7 +63,7 @@ QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='ctx'> QMAKE_LIBS_NIS		= -lnsl</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/linux-g++-32/qmake.conf b/mkspecs/linux-g++-32/qmake.conf<br/>index 1e5c50b..cdf8914 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/linux-g++-32/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-g++-32/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/linux-g++-32/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/linux-g++-32/qmake.conf</a></div><div class='hunk'>@@ -5,13 +5,14 @@</div><div class='ctx'> MAKEFILE_GENERATOR	= UNIX</div><div class='ctx'> TARGET_PLATFORM		= unix</div><div class='ctx'> TEMPLATE		= app</div><div class='del'>-CONFIG			+= qt warn_on release incremental link_prl</div><div class='add'>+CONFIG			+= qt warn_on release incremental link_prl gdb_dwarf_index</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> QMAKE_INCREMENTAL_STYLE = sublib</div><div class='ctx'> </div><div class='ctx'> QMAKE_CFLAGS		= -m32</div><div class='ctx'> QMAKE_LFLAGS		= -m32</div><div class='ctx'> </div><div class='del'>-include(../common/g++.conf)</div><div class='ctx'> include(../common/linux.conf)</div><div class='add'>+include(../common/gcc-base-unix.conf)</div><div class='add'>+include(../common/g++-unix.conf)</div><div class='ctx'> load(qt_config)</div><div class='head'>diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf<br/>index e7372cc..222f6b7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/linux-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-g++-64/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/linux-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/linux-g++-64/qmake.conf</a></div><div class='hunk'>@@ -8,15 +8,17 @@</div><div class='ctx'> MAKEFILE_GENERATOR	= UNIX</div><div class='ctx'> TARGET_PLATFORM		= unix</div><div class='ctx'> TEMPLATE		= app</div><div class='del'>-CONFIG			+= qt warn_on release incremental link_prl</div><div class='add'>+CONFIG			+= qt warn_on release incremental link_prl gdb_dwarf_index</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> QMAKE_INCREMENTAL_STYLE = sublib</div><div class='ctx'> </div><div class='ctx'> QMAKE_CFLAGS		= -m64</div><div class='ctx'> QMAKE_LFLAGS		= -m64</div><div class='ctx'> </div><div class='del'>-include(../common/g++.conf)</div><div class='ctx'> include(../common/linux.conf)</div><div class='add'>+include(../common/gcc-base-unix.conf)</div><div class='add'>+include(../common/g++-unix.conf)</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> QMAKE_LIBDIR_X11      = /usr/X11R6/lib64</div><div class='ctx'> QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib64</div><div class='head'>diff --git a/mkspecs/linux-g++-maemo/qmake.conf b/mkspecs/linux-g++-maemo/qmake.conf<br/>index 0178f14..23f1f71 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/linux-g++-maemo/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-g++-maemo/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/linux-g++-maemo/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/linux-g++-maemo/qmake.conf</a></div><div class='hunk'>@@ -5,13 +5,14 @@</div><div class='ctx'> MAKEFILE_GENERATOR      = UNIX</div><div class='ctx'> TARGET_PLATFORM         = unix</div><div class='ctx'> TEMPLATE                = app</div><div class='del'>-CONFIG                 += qt warn_on release incremental link_prl</div><div class='add'>+CONFIG                 += qt warn_on release incremental link_prl gdb_dwarf_index</div><div class='ctx'> CONFIG                 += nostrip</div><div class='ctx'> QT                     += core gui</div><div class='ctx'> QMAKE_INCREMENTAL_STYLE = sublib</div><div class='ctx'> </div><div class='del'>-include(../common/g++.conf)</div><div class='ctx'> include(../common/linux.conf)</div><div class='add'>+include(../common/gcc-base-unix.conf)</div><div class='add'>+include(../common/g++-unix.conf)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> # Override the default lib/include directories for scratchbox:</div><div class='head'>diff --git a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf<br/>index 4b21896..00df894 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/linux-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/linux-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/linux-g++/qmake.conf</a></div><div class='hunk'>@@ -5,10 +5,11 @@</div><div class='ctx'> MAKEFILE_GENERATOR	= UNIX</div><div class='ctx'> TARGET_PLATFORM		= unix</div><div class='ctx'> TEMPLATE		= app</div><div class='del'>-CONFIG			+= qt warn_on release incremental link_prl</div><div class='add'>+CONFIG			+= qt warn_on release incremental link_prl gdb_dwarf_index</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> QMAKE_INCREMENTAL_STYLE = sublib</div><div class='ctx'> </div><div class='del'>-include(../common/g++.conf)</div><div class='ctx'> include(../common/linux.conf)</div><div class='add'>+include(../common/gcc-base-unix.conf)</div><div class='add'>+include(../common/g++-unix.conf)</div><div class='ctx'> load(qt_config)</div><div class='head'>diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf<br/>index ba707e23..38916ec 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/linux-icc/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-icc/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/linux-icc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/linux-icc/qmake.conf</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> MAKEFILE_GENERATOR	= UNIX</div><div class='ctx'> TARGET_PLATFORM		= unix</div><div class='ctx'> TEMPLATE		= app</div><div class='del'>-CONFIG			+= qt warn_on release link_prl</div><div class='add'>+CONFIG			+= qt warn_on release link_prl gdb_dwarf_index</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> </div><div class='ctx'> QMAKE_CC		= icc</div><div class='hunk'>@@ -70,7 +70,7 @@ QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='ctx'> QMAKE_LIBS_NIS		= -lnsl</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf<br/>index 5c6001c..01e3b73 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/linux-kcc/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-kcc/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/linux-kcc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/linux-kcc/qmake.conf</a></div><div class='hunk'>@@ -72,7 +72,7 @@ QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='ctx'> QMAKE_LIBS_NIS		= -lnsl</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	=</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/linux-llvm/qmake.conf b/mkspecs/linux-llvm/qmake.conf<br/>index 73d6609..46ea2aa 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/linux-llvm/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-llvm/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/linux-llvm/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/linux-llvm/qmake.conf</a></div><div class='hunk'>@@ -5,10 +5,11 @@</div><div class='ctx'> MAKEFILE_GENERATOR	= UNIX</div><div class='ctx'> TARGET_PLATFORM		= unix</div><div class='ctx'> TEMPLATE		= app</div><div class='del'>-CONFIG			+= qt warn_on release incremental link_prl</div><div class='add'>+CONFIG			+= qt warn_on release incremental link_prl gdb_dwarf_index</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> QMAKE_INCREMENTAL_STYLE = sublib</div><div class='ctx'> </div><div class='del'>-include(../common/llvm.conf)</div><div class='ctx'> include(../common/linux.conf)</div><div class='add'>+include(../common/gcc-base-unix.conf)</div><div class='add'>+include(../common/llvm.conf)</div><div class='ctx'> load(qt_config)</div><div class='head'>diff --git a/mkspecs/linux-lsb-g++/qmake.conf b/mkspecs/linux-lsb-g++/qmake.conf<br/>index d359625..4197db0 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/linux-lsb-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-lsb-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/linux-lsb-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/linux-lsb-g++/qmake.conf</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> MAKEFILE_GENERATOR	= UNIX</div><div class='ctx'> TARGET_PLATFORM		= unix</div><div class='ctx'> TEMPLATE		= app</div><div class='del'>-CONFIG			+= qt warn_on release incremental link_prl</div><div class='add'>+CONFIG			+= qt warn_on release incremental link_prl gdb_dwarf_index</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> QMAKE_INCREMENTAL_STYLE = sublib</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf<br/>index 16d0023..63ede78 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/linux-pgcc/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/linux-pgcc/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/linux-pgcc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/linux-pgcc/qmake.conf</a></div><div class='hunk'>@@ -63,7 +63,7 @@ QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='ctx'> QMAKE_LIBS_NIS		= -lnsl</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf<br/>index fc0fc43..6b6f405 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/lynxos-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/lynxos-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/lynxos-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/lynxos-g++/qmake.conf</a></div><div class='hunk'>@@ -66,7 +66,7 @@ QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='ctx'> QMAKE_LIBS_NIS		= -lnsl</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf<br/>index 4464686..e402e54 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/macx-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/macx-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/macx-g++/qmake.conf</a></div><div class='hunk'>@@ -13,9 +13,7 @@ CONFIG			+= qt warn_on release app_bundle incremental global_init_link_order lib</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> QMAKE_INCREMENTAL_STYLE = sublib</div><div class='ctx'> </div><div class='del'>-QMAKE_CC		 = gcc</div><div class='del'>-QMAKE_CXX		 = g++</div><div class='del'>-</div><div class='del'>-include(../common/mac-g++.conf)</div><div class='del'>-</div><div class='add'>+include(../common/mac.conf)</div><div class='add'>+include(../common/gcc-base-macx.conf)</div><div class='add'>+include(../common/g++-macx.conf)</div><div class='ctx'> load(qt_config)</div><div class='head'>diff --git a/mkspecs/macx-g++/qplatformdefs.h b/mkspecs/macx-g++/qplatformdefs.h<br/>index 669f07d..2bab720 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/macx-g++/qplatformdefs.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-g++/qplatformdefs.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/macx-g++/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/macx-g++/qplatformdefs.h</a></div><div class='hunk'>@@ -39,59 +39,5 @@</div><div class='ctx'> **</div><div class='ctx'> ****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#ifndef QPLATFORMDEFS_H</div><div class='del'>-#define QPLATFORMDEFS_H</div><div class='add'>+#include "../common/mac/qplatformdefs.h"</div><div class='ctx'> </div><div class='del'>-// Get Qt defines/settings</div><div class='del'>-</div><div class='del'>-#include "qglobal.h"</div><div class='del'>-</div><div class='del'>-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs</div><div class='del'>-</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-// We are hot - unistd.h should have turned on the specific APIs we requested</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;grp.h&gt;</div><div class='del'>-#include &lt;pwd.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#define QT_NO_LIBRARY_UNLOAD</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/ioctl.h&gt;</div><div class='del'>-#include &lt;sys/ipc.h&gt;</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;sys/shm.h&gt;</div><div class='del'>-#include &lt;sys/socket.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/wait.h&gt;</div><div class='del'>-#include &lt;netinet/in.h&gt;</div><div class='del'>-#ifndef QT_NO_IPV6IFNAME</div><div class='del'>-#include &lt;net/if.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "../common/posix/qplatformdefs.h"</div><div class='del'>-</div><div class='del'>-#undef QT_OPEN_LARGEFILE</div><div class='del'>-#undef QT_SOCKLEN_T</div><div class='del'>-#undef QT_SIGNAL_IGNORE</div><div class='del'>-</div><div class='del'>-#define QT_OPEN_LARGEFILE       0</div><div class='del'>-</div><div class='del'>-#if (MAC_OS_X_VERSION_MAX_ALLOWED &gt;= MAC_OS_X_VERSION_10_4)</div><div class='del'>-#define QT_SOCKLEN_T            socklen_t</div><div class='del'>-#else</div><div class='del'>-#define QT_SOCKLEN_T            int</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define QT_SIGNAL_IGNORE        (void (*)(int))1</div><div class='del'>-</div><div class='del'>-#define QT_SNPRINTF		::snprintf</div><div class='del'>-#define QT_VSNPRINTF		::vsnprintf</div><div class='del'>-</div><div class='del'>-#endif // QPLATFORMDEFS_H</div><div class='head'>diff --git a/mkspecs/macx-g++40/qmake.conf b/mkspecs/macx-g++40/qmake.conf<br/>index 784f5fc..07663c6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/macx-g++40/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-g++40/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/macx-g++40/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/macx-g++40/qmake.conf</a></div><div class='hunk'>@@ -13,9 +13,16 @@ CONFIG			+= qt warn_on release app_bundle incremental global_init_link_order lib</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> QMAKE_INCREMENTAL_STYLE = sublib</div><div class='ctx'> </div><div class='add'>+include(../common/mac.conf)</div><div class='add'>+include(../common/gcc-base-macx.conf)</div><div class='add'>+include(../common/g++-macx.conf)</div><div class='add'>+</div><div class='ctx'> QMAKE_CC         = gcc-4.0</div><div class='ctx'> QMAKE_CXX        = g++-4.0</div><div class='ctx'> </div><div class='del'>-include(../common/mac-g++.conf)</div><div class='add'>+QMAKE_LINK       = $$QMAKE_CXX</div><div class='add'>+QMAKE_LINK_SHLIB = $$QMAKE_CXX</div><div class='add'>+QMAKE_LINK_C       = $$QMAKE_CC</div><div class='add'>+QMAKE_LINK_C_SHLIB = $$QMAKE_CC</div><div class='ctx'> </div><div class='ctx'> load(qt_config)</div><div class='head'>diff --git a/mkspecs/macx-g++40/qplatformdefs.h b/mkspecs/macx-g++40/qplatformdefs.h<br/>index 669f07d..2bab720 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/macx-g++40/qplatformdefs.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-g++40/qplatformdefs.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/macx-g++40/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/macx-g++40/qplatformdefs.h</a></div><div class='hunk'>@@ -39,59 +39,5 @@</div><div class='ctx'> **</div><div class='ctx'> ****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#ifndef QPLATFORMDEFS_H</div><div class='del'>-#define QPLATFORMDEFS_H</div><div class='add'>+#include "../common/mac/qplatformdefs.h"</div><div class='ctx'> </div><div class='del'>-// Get Qt defines/settings</div><div class='del'>-</div><div class='del'>-#include "qglobal.h"</div><div class='del'>-</div><div class='del'>-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs</div><div class='del'>-</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-// We are hot - unistd.h should have turned on the specific APIs we requested</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;grp.h&gt;</div><div class='del'>-#include &lt;pwd.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#define QT_NO_LIBRARY_UNLOAD</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/ioctl.h&gt;</div><div class='del'>-#include &lt;sys/ipc.h&gt;</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;sys/shm.h&gt;</div><div class='del'>-#include &lt;sys/socket.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/wait.h&gt;</div><div class='del'>-#include &lt;netinet/in.h&gt;</div><div class='del'>-#ifndef QT_NO_IPV6IFNAME</div><div class='del'>-#include &lt;net/if.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "../common/posix/qplatformdefs.h"</div><div class='del'>-</div><div class='del'>-#undef QT_OPEN_LARGEFILE</div><div class='del'>-#undef QT_SOCKLEN_T</div><div class='del'>-#undef QT_SIGNAL_IGNORE</div><div class='del'>-</div><div class='del'>-#define QT_OPEN_LARGEFILE       0</div><div class='del'>-</div><div class='del'>-#if (MAC_OS_X_VERSION_MAX_ALLOWED &gt;= MAC_OS_X_VERSION_10_4)</div><div class='del'>-#define QT_SOCKLEN_T            socklen_t</div><div class='del'>-#else</div><div class='del'>-#define QT_SOCKLEN_T            int</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define QT_SIGNAL_IGNORE        (void (*)(int))1</div><div class='del'>-</div><div class='del'>-#define QT_SNPRINTF		::snprintf</div><div class='del'>-#define QT_VSNPRINTF		::vsnprintf</div><div class='del'>-</div><div class='del'>-#endif // QPLATFORMDEFS_H</div><div class='head'>diff --git a/mkspecs/macx-g++42/qmake.conf b/mkspecs/macx-g++42/qmake.conf<br/>index fb93697..3d31305 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/macx-g++42/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-g++42/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/macx-g++42/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/macx-g++42/qmake.conf</a></div><div class='hunk'>@@ -13,9 +13,16 @@ CONFIG			+= qt warn_on release app_bundle incremental global_init_link_order lib</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> QMAKE_INCREMENTAL_STYLE = sublib</div><div class='ctx'> </div><div class='add'>+include(../common/mac.conf)</div><div class='add'>+include(../common/gcc-base-macx.conf)</div><div class='add'>+include(../common/g++-macx.conf)</div><div class='add'>+</div><div class='ctx'> QMAKE_CC         = gcc-4.2</div><div class='ctx'> QMAKE_CXX        = g++-4.2</div><div class='ctx'> </div><div class='del'>-include(../common/mac-g++.conf)</div><div class='add'>+QMAKE_LINK       = $$QMAKE_CXX</div><div class='add'>+QMAKE_LINK_SHLIB = $$QMAKE_CXX</div><div class='add'>+QMAKE_LINK_C       = $$QMAKE_CC</div><div class='add'>+QMAKE_LINK_C_SHLIB = $$QMAKE_CC</div><div class='ctx'> </div><div class='ctx'> load(qt_config)</div><div class='head'>diff --git a/mkspecs/macx-g++42/qplatformdefs.h b/mkspecs/macx-g++42/qplatformdefs.h<br/>index 669f07d..2bab720 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/macx-g++42/qplatformdefs.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-g++42/qplatformdefs.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/macx-g++42/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/macx-g++42/qplatformdefs.h</a></div><div class='hunk'>@@ -39,59 +39,5 @@</div><div class='ctx'> **</div><div class='ctx'> ****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#ifndef QPLATFORMDEFS_H</div><div class='del'>-#define QPLATFORMDEFS_H</div><div class='add'>+#include "../common/mac/qplatformdefs.h"</div><div class='ctx'> </div><div class='del'>-// Get Qt defines/settings</div><div class='del'>-</div><div class='del'>-#include "qglobal.h"</div><div class='del'>-</div><div class='del'>-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs</div><div class='del'>-</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-// We are hot - unistd.h should have turned on the specific APIs we requested</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;grp.h&gt;</div><div class='del'>-#include &lt;pwd.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#define QT_NO_LIBRARY_UNLOAD</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/ioctl.h&gt;</div><div class='del'>-#include &lt;sys/ipc.h&gt;</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;sys/shm.h&gt;</div><div class='del'>-#include &lt;sys/socket.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/wait.h&gt;</div><div class='del'>-#include &lt;netinet/in.h&gt;</div><div class='del'>-#ifndef QT_NO_IPV6IFNAME</div><div class='del'>-#include &lt;net/if.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "../common/posix/qplatformdefs.h"</div><div class='del'>-</div><div class='del'>-#undef QT_OPEN_LARGEFILE</div><div class='del'>-#undef QT_SOCKLEN_T</div><div class='del'>-#undef QT_SIGNAL_IGNORE</div><div class='del'>-</div><div class='del'>-#define QT_OPEN_LARGEFILE       0</div><div class='del'>-</div><div class='del'>-#if (MAC_OS_X_VERSION_MAX_ALLOWED &gt;= MAC_OS_X_VERSION_10_4)</div><div class='del'>-#define QT_SOCKLEN_T            socklen_t</div><div class='del'>-#else</div><div class='del'>-#define QT_SOCKLEN_T            int</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define QT_SIGNAL_IGNORE        (void (*)(int))1</div><div class='del'>-</div><div class='del'>-#define QT_SNPRINTF		::snprintf</div><div class='del'>-#define QT_VSNPRINTF		::vsnprintf</div><div class='del'>-</div><div class='del'>-#endif // QPLATFORMDEFS_H</div><div class='head'>diff --git a/mkspecs/macx-icc/qplatformdefs.h b/mkspecs/macx-icc/qplatformdefs.h<br/>index 4307971..2bab720 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/macx-icc/qplatformdefs.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-icc/qplatformdefs.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/macx-icc/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/macx-icc/qplatformdefs.h</a></div><div class='hunk'>@@ -39,5 +39,5 @@</div><div class='ctx'> **</div><div class='ctx'> ****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#include "../macx-g++/qplatformdefs.h"</div><div class='add'>+#include "../common/mac/qplatformdefs.h"</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/macx-llvm/qmake.conf b/mkspecs/macx-llvm/qmake.conf<br/>index d46baea..d794701 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/macx-llvm/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-llvm/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/macx-llvm/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/macx-llvm/qmake.conf</a></div><div class='hunk'>@@ -13,6 +13,13 @@ CONFIG			+= qt warn_on release app_bundle incremental global_init_link_order lib</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> QMAKE_INCREMENTAL_STYLE = sublib</div><div class='ctx'> </div><div class='del'>-include(../common/mac-llvm.conf)</div><div class='add'>+include(../common/mac.conf)</div><div class='add'>+include(../common/gcc-base-macx.conf)</div><div class='add'>+include(../common/llvm.conf)</div><div class='add'>+</div><div class='add'>+QMAKE_OBJCFLAGS_PRECOMPILE       = -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='add'>+QMAKE_OBJCFLAGS_USE_PRECOMPILE   = $$QMAKE_CFLAGS_USE_PRECOMPILE</div><div class='add'>+QMAKE_OBJCXXFLAGS_PRECOMPILE     = -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='add'>+QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE</div><div class='ctx'> </div><div class='ctx'> load(qt_config)</div><div class='head'>diff --git a/mkspecs/macx-llvm/qplatformdefs.h b/mkspecs/macx-llvm/qplatformdefs.h<br/>index 669f07d..2bab720 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/macx-llvm/qplatformdefs.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-llvm/qplatformdefs.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/macx-llvm/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/macx-llvm/qplatformdefs.h</a></div><div class='hunk'>@@ -39,59 +39,5 @@</div><div class='ctx'> **</div><div class='ctx'> ****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#ifndef QPLATFORMDEFS_H</div><div class='del'>-#define QPLATFORMDEFS_H</div><div class='add'>+#include "../common/mac/qplatformdefs.h"</div><div class='ctx'> </div><div class='del'>-// Get Qt defines/settings</div><div class='del'>-</div><div class='del'>-#include "qglobal.h"</div><div class='del'>-</div><div class='del'>-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs</div><div class='del'>-</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-// We are hot - unistd.h should have turned on the specific APIs we requested</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;grp.h&gt;</div><div class='del'>-#include &lt;pwd.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#define QT_NO_LIBRARY_UNLOAD</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/ioctl.h&gt;</div><div class='del'>-#include &lt;sys/ipc.h&gt;</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;sys/shm.h&gt;</div><div class='del'>-#include &lt;sys/socket.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/wait.h&gt;</div><div class='del'>-#include &lt;netinet/in.h&gt;</div><div class='del'>-#ifndef QT_NO_IPV6IFNAME</div><div class='del'>-#include &lt;net/if.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "../common/posix/qplatformdefs.h"</div><div class='del'>-</div><div class='del'>-#undef QT_OPEN_LARGEFILE</div><div class='del'>-#undef QT_SOCKLEN_T</div><div class='del'>-#undef QT_SIGNAL_IGNORE</div><div class='del'>-</div><div class='del'>-#define QT_OPEN_LARGEFILE       0</div><div class='del'>-</div><div class='del'>-#if (MAC_OS_X_VERSION_MAX_ALLOWED &gt;= MAC_OS_X_VERSION_10_4)</div><div class='del'>-#define QT_SOCKLEN_T            socklen_t</div><div class='del'>-#else</div><div class='del'>-#define QT_SOCKLEN_T            int</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define QT_SIGNAL_IGNORE        (void (*)(int))1</div><div class='del'>-</div><div class='del'>-#define QT_SNPRINTF		::snprintf</div><div class='del'>-#define QT_VSNPRINTF		::vsnprintf</div><div class='del'>-</div><div class='del'>-#endif // QPLATFORMDEFS_H</div><div class='head'>diff --git a/mkspecs/macx-xcode/qmake.conf b/mkspecs/macx-xcode/qmake.conf<br/>index 3a4a500..4cb4626 100755<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/macx-xcode/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-xcode/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/macx-xcode/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/macx-xcode/qmake.conf</a></div><div class='hunk'>@@ -9,10 +9,16 @@ TEMPLATE		= app</div><div class='ctx'> CONFIG			+= qt warn_on release lib_version_first incremental plugin_no_soname link_prl app_bundle</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> </div><div class='del'>-include(../common/mac-g++.conf)</div><div class='add'>+include(../common/mac.conf)</div><div class='add'>+include(../common/gcc-base-macx.conf)</div><div class='add'>+include(../common/g++-macx.conf)</div><div class='ctx'> </div><div class='del'>-QMAKE_CC		 =</div><div class='del'>-QMAKE_CXX		 =</div><div class='add'>+QMAKE_CC                        =</div><div class='add'>+QMAKE_CXX                       =</div><div class='add'>+QMAKE_LINK                      =</div><div class='add'>+QMAKE_LINK_C                    =</div><div class='add'>+QMAKE_LINK_C_SHLIB              =</div><div class='add'>+QMAKE_LINK_SHLIB                =</div><div class='ctx'> QMAKE_CFLAGS_HIDESYMS           = </div><div class='ctx'> QMAKE_CFLAGS_PPC_64             =</div><div class='ctx'> QMAKE_CFLAGS_X86_64             =</div><div class='head'>diff --git a/mkspecs/macx-xcode/qplatformdefs.h b/mkspecs/macx-xcode/qplatformdefs.h<br/>index 669f07d..2bab720 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/macx-xcode/qplatformdefs.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/macx-xcode/qplatformdefs.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/macx-xcode/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/macx-xcode/qplatformdefs.h</a></div><div class='hunk'>@@ -39,59 +39,5 @@</div><div class='ctx'> **</div><div class='ctx'> ****************************************************************************/</div><div class='ctx'> </div><div class='del'>-#ifndef QPLATFORMDEFS_H</div><div class='del'>-#define QPLATFORMDEFS_H</div><div class='add'>+#include "../common/mac/qplatformdefs.h"</div><div class='ctx'> </div><div class='del'>-// Get Qt defines/settings</div><div class='del'>-</div><div class='del'>-#include "qglobal.h"</div><div class='del'>-</div><div class='del'>-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs</div><div class='del'>-</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-// We are hot - unistd.h should have turned on the specific APIs we requested</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;grp.h&gt;</div><div class='del'>-#include &lt;pwd.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#define QT_NO_LIBRARY_UNLOAD</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/ioctl.h&gt;</div><div class='del'>-#include &lt;sys/ipc.h&gt;</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;sys/shm.h&gt;</div><div class='del'>-#include &lt;sys/socket.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/wait.h&gt;</div><div class='del'>-#include &lt;netinet/in.h&gt;</div><div class='del'>-#ifndef QT_NO_IPV6IFNAME</div><div class='del'>-#include &lt;net/if.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "../common/posix/qplatformdefs.h"</div><div class='del'>-</div><div class='del'>-#undef QT_OPEN_LARGEFILE</div><div class='del'>-#undef QT_SOCKLEN_T</div><div class='del'>-#undef QT_SIGNAL_IGNORE</div><div class='del'>-</div><div class='del'>-#define QT_OPEN_LARGEFILE       0</div><div class='del'>-</div><div class='del'>-#if (MAC_OS_X_VERSION_MAX_ALLOWED &gt;= MAC_OS_X_VERSION_10_4)</div><div class='del'>-#define QT_SOCKLEN_T            socklen_t</div><div class='del'>-#else</div><div class='del'>-#define QT_SOCKLEN_T            int</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define QT_SIGNAL_IGNORE        (void (*)(int))1</div><div class='del'>-</div><div class='del'>-#define QT_SNPRINTF		::snprintf</div><div class='del'>-#define QT_VSNPRINTF		::vsnprintf</div><div class='del'>-</div><div class='del'>-#endif // QPLATFORMDEFS_H</div><div class='head'>diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf<br/>index 1d3fd2b..ab4b7c3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/netbsd-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/netbsd-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/netbsd-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/netbsd-g++/qmake.conf</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> MAKEFILE_GENERATOR	= UNIX</div><div class='ctx'> TARGET_PLATFORM		= unix</div><div class='ctx'> TEMPLATE		= app</div><div class='del'>-CONFIG			+= qt warn_on release link_prl</div><div class='add'>+CONFIG			+= qt warn_on release link_prl gdb_dwarf_index</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> </div><div class='ctx'> QMAKE_CC		= gcc</div><div class='hunk'>@@ -64,7 +64,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	=</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	=</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf<br/>index c948c90..56d9416 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/openbsd-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/openbsd-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/openbsd-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/openbsd-g++/qmake.conf</a></div><div class='hunk'>@@ -5,7 +5,7 @@</div><div class='ctx'> MAKEFILE_GENERATOR	= UNIX</div><div class='ctx'> TARGET_PLATFORM		= unix</div><div class='ctx'> TEMPLATE		= app</div><div class='del'>-CONFIG			+= qt warn_on release link_prl</div><div class='add'>+CONFIG			+= qt warn_on release link_prl gdb_dwarf_index</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> </div><div class='ctx'> QMAKE_CC		= gcc</div><div class='hunk'>@@ -65,7 +65,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	=</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	=</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf<br/>index 7e0a3b4..7b37813 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-arm-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-arm-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-arm-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-arm-g++/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for building with arm-linux-g++</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/linux-arm-gnueabi-g++/qmake.conf b/mkspecs/qws/linux-arm-gnueabi-g++/qmake.conf<br/>index 3611421..e1ad837 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-arm-gnueabi-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-arm-gnueabi-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-arm-gnueabi-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-arm-gnueabi-g++/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for building with arm-none-linux-gnueabi-g++</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/linux-armv6-g++/qmake.conf b/mkspecs/qws/linux-armv6-g++/qmake.conf<br/>index cd7ecca..0e2473c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-armv6-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-armv6-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-armv6-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-armv6-g++/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for building for ARMv6 devices with arm-linux-g++</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/linux-avr32-g++/qmake.conf b/mkspecs/qws/linux-avr32-g++/qmake.conf<br/>index 057c938..32c0444 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-avr32-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-avr32-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-avr32-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-avr32-g++/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for building with avr32-linux-g++</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/linux-cellon-g++/qmake.conf b/mkspecs/qws/linux-cellon-g++/qmake.conf<br/>index 363a3ce..ad66c3c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-cellon-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-cellon-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-cellon-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-cellon-g++/qmake.conf</a></div><div class='hunk'>@@ -6,8 +6,9 @@</div><div class='ctx'> # qmake configuration for building with arm-linux-g++</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/linux-dm7000-g++/qmake.conf b/mkspecs/qws/linux-dm7000-g++/qmake.conf<br/>index aea2647..c897091 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-dm7000-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-dm7000-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-dm7000-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-dm7000-g++/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for linux-dm7000-g++, for Dream Multimedia's DM7000S</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/linux-dm800-g++/qmake.conf b/mkspecs/qws/linux-dm800-g++/qmake.conf<br/>index fca93b4..002e4c7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-dm800-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-dm800-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-dm800-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-dm800-g++/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for linux-dm800-g++, for Dream Multimedia's DM800</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/linux-generic-g++-32/qmake.conf b/mkspecs/qws/linux-generic-g++-32/qmake.conf<br/>index 81af4ab..249c10aa 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-generic-g++-32/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-generic-g++-32/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-generic-g++-32/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-generic-g++-32/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for building with arm-linux-g++</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf<br/>index a026e88..e803d0d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-generic-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-generic-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-generic-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-generic-g++/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for building with g++</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> load(qt_config)</div><div class='head'>diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf<br/>index 59f4e6e..f9d33b3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-ipaq-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-ipaq-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-ipaq-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-ipaq-g++/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for building with arm-linux-g++</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/linux-lsb-g++/qmake.conf b/mkspecs/qws/linux-lsb-g++/qmake.conf<br/>index fdde2f2..988a6ea 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-lsb-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-lsb-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-lsb-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-lsb-g++/qmake.conf</a></div><div class='hunk'>@@ -3,10 +3,12 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> QMAKE_LSB               = 1</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/linux-mips-g++/qmake.conf b/mkspecs/qws/linux-mips-g++/qmake.conf<br/>index 3c55342..1a86078 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-mips-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-mips-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-mips-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-mips-g++/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for building with mipsel-linux-g++</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/linux-nacl-g++/qmake.conf b/mkspecs/qws/linux-nacl-g++/qmake.conf<br/>new file mode 100644<br/>index 0000000..7293a1a<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-nacl-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-nacl-g++/qmake.conf</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+#</div><div class='add'>+# qmake configuration for building with nacl-g++</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+include(../../common/linux.conf)</div><div class='add'>+include(../../common/qws.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='add'>+</div><div class='add'>+QT                      = core gui</div><div class='add'>+</div><div class='add'>+QMAKE_CC                = nacl-gcc</div><div class='add'>+QMAKE_CXX               = nacl-g++</div><div class='add'>+QMAKE_LINK              = nacl-g++</div><div class='add'>+QMAKE_LINK_SHLIB        = nacl-g++</div><div class='add'>+QMAKE_AR                = nacl-ar q</div><div class='add'>+QMAKE_OBJCOPY           = nacl-objcopy</div><div class='add'>+QMAKE_STRIP             = nacl-strip</div><div class='add'>+</div><div class='add'>+# work around linker crash when using PIC</div><div class='add'>+QMAKE_CFLAGS_STATIC_LIB	-= -fPIC</div><div class='add'>+QMAKE_CFLAGS_SHLIB	-= -fPIC</div><div class='add'>+QMAKE_CXXFLAGS_STATIC_LIB -= -fPIC</div><div class='add'>+QMAKE_CXXFLAGS_SHLIB	-= -fPIC</div><div class='add'>+</div><div class='add'>+#QMAKE_CFLAGS		+= -pipe -DXP_UNIX -DNACL_STANDALONE=1</div><div class='add'>+QMAKE_LIBS_DYNLOAD    -= -ldl</div><div class='add'>+</div><div class='add'>+load(qt_config)</div><div class='head'>diff --git a/mkspecs/qws/linux-nacl-g++/qplatformdefs.h b/mkspecs/qws/linux-nacl-g++/qplatformdefs.h<br/>new file mode 100644<br/>index 0000000..0e95be8<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-nacl-g++/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-nacl-g++/qplatformdefs.h</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the qmake spec of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QPLATFORMDEFS_H</div><div class='add'>+#define QPLATFORMDEFS_H</div><div class='add'>+</div><div class='add'>+// Get Qt defines/settings</div><div class='add'>+</div><div class='add'>+#define _POSIX_TIMERS</div><div class='add'>+</div><div class='add'>+#include "qglobal.h"</div><div class='add'>+</div><div class='add'>+// extra disabling.</div><div class='add'>+#ifdef __native_client__</div><div class='add'>+#define QT_NO_FSFILEENGINE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define QT_NO_SOCKET_H</div><div class='add'>+</div><div class='add'>+#define DIR void *</div><div class='add'>+#define PATH_MAX 256</div><div class='add'>+</div><div class='add'>+#include "../../common/posix/qplatformdefs.h"</div><div class='add'>+#include "qfunctions_nacl.h"</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+</div><div class='add'>+#undef QT_LSTAT</div><div class='add'>+#define QT_LSTAT                QT_STAT</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif // QPLATFORMDEFS_H</div><div class='head'>diff --git a/mkspecs/qws/linux-powerpc-g++/qmake.conf b/mkspecs/qws/linux-powerpc-g++/qmake.conf<br/>index e1926b4..6a6310a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-powerpc-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-powerpc-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-powerpc-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-powerpc-g++/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for building with g++</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/linux-sh-g++/qmake.conf b/mkspecs/qws/linux-sh-g++/qmake.conf<br/>index 61b57a3..004780a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-sh-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-sh-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-sh-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-sh-g++/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for building for SH devices with sh3-linux-g++</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/linux-sh4al-g++/qmake.conf b/mkspecs/qws/linux-sh4al-g++/qmake.conf<br/>index 9caebdf..71f6b3d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-sh4al-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-sh4al-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-sh4al-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-sh4al-g++/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for building for SH4AL-DSP devices with sh3-linux-g++</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/linux-sharp-g++/qmake.conf b/mkspecs/qws/linux-sharp-g++/qmake.conf<br/>index 083e4e8..6a000b9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-sharp-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-sharp-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-sharp-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-sharp-g++/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for building with arm-linux-g++</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/linux-x86-g++/qmake.conf b/mkspecs/qws/linux-x86-g++/qmake.conf<br/>index 7e28d4e..55011ec 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-x86-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-x86-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-x86-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-x86-g++/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for building with linux-g++</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> load(qt_config)</div><div class='head'>diff --git a/mkspecs/qws/linux-x86_64-g++/qmake.conf b/mkspecs/qws/linux-x86_64-g++/qmake.conf<br/>index d4e6189..e18d055 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-x86_64-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-x86_64-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-x86_64-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-x86_64-g++/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for building with linux-g++</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/linux-zylonite-g++/qmake.conf b/mkspecs/qws/linux-zylonite-g++/qmake.conf<br/>index 97ae600..f50b70f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-zylonite-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/linux-zylonite-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/linux-zylonite-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/linux-zylonite-g++/qmake.conf</a></div><div class='hunk'>@@ -2,8 +2,9 @@</div><div class='ctx'> # qmake configuration for building with arm-linux-g++</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/qws.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='head'>diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf<br/>index 9096712..8dcbb39 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/qws/macx-generic-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/qws/macx-generic-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/macx-generic-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/macx-generic-g++/qmake.conf</a></div><div class='hunk'>@@ -2,6 +2,8 @@</div><div class='ctx'> # qmake configuration for macx-g++ with Qtopia Core</div><div class='ctx'> #</div><div class='ctx'> </div><div class='add'>+include(../../common/unix.conf)</div><div class='add'>+</div><div class='ctx'> MAKEFILE_GENERATOR	= UNIX</div><div class='ctx'> TARGET_PLATFORM		= macx</div><div class='ctx'> TEMPLATE		= app</div><div class='hunk'>@@ -18,18 +20,18 @@ QMAKE_YACCFLAGS		= -d</div><div class='ctx'> QMAKE_CFLAGS		= -pipe</div><div class='ctx'> QMAKE_CFLAGS_WARN_ON	= -Wall -W</div><div class='ctx'> QMAKE_CFLAGS_WARN_OFF	=</div><div class='del'>-QMAKE_CFLAGS_RELEASE	= -O2 -fno-default-inline</div><div class='add'>+QMAKE_CFLAGS_RELEASE	= -O2</div><div class='ctx'> QMAKE_CFLAGS_DEBUG	= -g</div><div class='ctx'> QMAKE_CFLAGS_SHLIB	= -fPIC</div><div class='ctx'> QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses</div><div class='ctx'> QMAKE_CFLAGS_THREAD	= -D_REENTRANT</div><div class='ctx'> QMAKE_CFLAGS_HIDESYMS   = -fvisibility=hidden</div><div class='ctx'> </div><div class='del'>-QMAKE_CXX		= $(TB)c++</div><div class='add'>+QMAKE_CXX		= c++</div><div class='ctx'> QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED</div><div class='ctx'> QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON</div><div class='ctx'> QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF</div><div class='del'>-QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE</div><div class='add'>+QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE -fno-default-inline</div><div class='ctx'> QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG</div><div class='ctx'> QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB</div><div class='ctx'> QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC</div><div class='head'>diff --git a/mkspecs/qws/macx-iphonedevice-g++/Info.plist.lib b/mkspecs/qws/macx-iphonedevice-g++/Info.plist.lib<br/>new file mode 100644<br/>index 0000000..97609ed<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/macx-iphonedevice-g++/Info.plist.lib?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/macx-iphonedevice-g++/Info.plist.lib</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='add'>+&lt;!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"&gt;</div><div class='add'>+&lt;plist version="0.9"&gt;</div><div class='add'>+&lt;dict&gt;</div><div class='add'>+	&lt;key&gt;CFBundlePackageType&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;FMWK&lt;/string&gt;</div><div class='add'>+        &lt;key&gt;CFBundleShortVersionString&lt;/key&gt;</div><div class='add'>+        &lt;string&gt;@SHORT_VERSION@&lt;/string&gt;</div><div class='add'>+        &lt;key&gt;CFBundleGetInfoString&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;Created by Qt/QMake&lt;/string&gt;</div><div class='add'>+	&lt;key&gt;CFBundleSignature&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;@TYPEINFO@&lt;/string&gt;</div><div class='add'>+	&lt;key&gt;CFBundleExecutable&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;@LIBRARY@&lt;/string&gt;</div><div class='add'>+	&lt;key&gt;NOTE&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;Please, do NOT change this file -- It was generated by Qt/QMake.&lt;/string&gt;</div><div class='add'>+&lt;/dict&gt;</div><div class='add'>+&lt;/plist&gt;</div><div class='head'>diff --git a/mkspecs/qws/macx-iphonedevice-g++/qmake.conf b/mkspecs/qws/macx-iphonedevice-g++/qmake.conf<br/>new file mode 100644<br/>index 0000000..227d24e<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/macx-iphonedevice-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/macx-iphonedevice-g++/qmake.conf</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+#</div><div class='add'>+# qmake configuration for iphone-device-g++</div><div class='add'>+#</div><div class='add'>+include(../../common/mac.conf)</div><div class='add'>+include(../../common/gcc-base-macx.conf)</div><div class='add'>+include(../../common/g++-macx.conf)</div><div class='add'>+</div><div class='add'>+MAKEFILE_GENERATOR	= UNIX</div><div class='add'>+TEMPLATE		= app</div><div class='add'>+CONFIG			+= qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl</div><div class='add'>+QT			+= core gui</div><div class='add'>+QMAKE_INCREMENTAL_STYLE = sublib</div><div class='add'>+</div><div class='add'>+# Do not compile a few things</div><div class='add'>+DEFINES += QT_NO_AUDIO_BACKEND QT_NO_NETWORKPROXY QT_NO_FILESYSTEMWATCHER</div><div class='add'>+</div><div class='add'>+# You may need to change this to point to the iOS SDK you want to use.</div><div class='add'>+QMAKE_IOS_DEV_PATH = /Developer/Platforms/iPhoneOS.platform/Developer</div><div class='add'>+QMAKE_IOS_SDK = $$QMAKE_IOS_DEV_PATH/SDKs/iPhoneOS4.3.sdk</div><div class='add'>+DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=40200</div><div class='add'>+</div><div class='add'>+#clear</div><div class='add'>+QMAKE_MACOSX_DEPLOYMENT_TARGET = </div><div class='add'>+</div><div class='add'>+QMAKE_LIBS_OPENGL_ES1 += -framework OpenGLES</div><div class='add'>+QMAKE_LIBS_OPENGL_ES2 += -framework OpenGLES</div><div class='add'>+</div><div class='add'>+# TARGET_PLATFORM = ios</div><div class='add'>+QMAKE_CC         = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2</div><div class='add'>+QMAKE_CXX        = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2</div><div class='add'>+QMAKE_LINK              = $$QMAKE_CXX</div><div class='add'>+QMAKE_LINK_SHLIB        = $$QMAKE_CXX</div><div class='add'>+</div><div class='add'>+QMAKE_CFLAGS           += -arch armv7 -marm -isysroot $$QMAKE_IOS_SDK -fmessage-length=0 -fexceptions -miphoneos-version-min=4.2</div><div class='add'>+QMAKE_CXXFLAGS	        += $$QMAKE_CFLAGS</div><div class='add'>+QMAKE_OBJECTIVE_CFLAGS += -arch armv7 -marm -isysroot $$QMAKE_IOS_SDK -fmessage-length=0 -fexceptions -miphoneos-version-min=4.2 -fobjc-abi-version=2 -fobjc-legacy-dispatch</div><div class='add'>+QMAKE_LFLAGS           += -arch armv7 -marm -miphoneos-version-min=4.2 -Wl,-syslibroot,$$QMAKE_IOS_SDK</div><div class='add'>+</div><div class='add'>+QMAKE_INCDIR_OPENGL	= </div><div class='add'>+QMAKE_LIBS_OPENGL	=</div><div class='add'>+QMAKE_LIBS_OPENGL_QT	=</div><div class='add'>+</div><div class='add'>+#QMAKE_RESOURCE		=</div><div class='add'>+QMAKE_FIX_RPATH = $$QMAKE_IOS_DEV_PATH/usr/bin/install_name_tool -id </div><div class='add'>+QMAKE_AR        = $$QMAKE_IOS_DEV_PATH/usr/bin/ar cq</div><div class='add'>+QMAKE_RANLIB    = $$QMAKE_IOS_DEV_PATH/usr/bin/ranlib -s</div><div class='add'>+</div><div class='add'>+load(qt_config)</div><div class='head'>diff --git a/mkspecs/qws/macx-iphonedevice-g++/qplatformdefs.h b/mkspecs/qws/macx-iphonedevice-g++/qplatformdefs.h<br/>new file mode 100644<br/>index 0000000..629d57f<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/macx-iphonedevice-g++/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/macx-iphonedevice-g++/qplatformdefs.h</a></div><div class='hunk'>@@ -0,0 +1,99 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the qmake spec of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QPLATFORMDEFS_H</div><div class='add'>+#define QPLATFORMDEFS_H</div><div class='add'>+</div><div class='add'>+// Get Qt defines/settings</div><div class='add'>+</div><div class='add'>+#include "qglobal.h"</div><div class='add'>+</div><div class='add'>+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs</div><div class='add'>+</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// We are hot - unistd.h should have turned on the specific APIs we requested</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include &lt;dirent.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;grp.h&gt;</div><div class='add'>+#include &lt;pwd.h&gt;</div><div class='add'>+#include &lt;signal.h&gt;</div><div class='add'>+#define QT_NO_LIBRARY_UNLOAD</div><div class='add'>+</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;sys/ipc.h&gt;</div><div class='add'>+#include &lt;sys/time.h&gt;</div><div class='add'>+#include &lt;sys/shm.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/wait.h&gt;</div><div class='add'>+#include &lt;netinet/in.h&gt;</div><div class='add'>+#ifndef QT_NO_IPV6IFNAME</div><div class='add'>+#include &lt;net/if.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include "../../common/posix/qplatformdefs.h"</div><div class='add'>+</div><div class='add'>+#undef QT_OPEN_LARGEFILE</div><div class='add'>+#undef QT_SOCKLEN_T</div><div class='add'>+#undef QT_SIGNAL_IGNORE</div><div class='add'>+</div><div class='add'>+#define QT_OPEN_LARGEFILE       0</div><div class='add'>+</div><div class='add'>+#if (MAC_OS_X_VERSION_MAX_ALLOWED &gt;= MAC_OS_X_VERSION_10_4)</div><div class='add'>+#define QT_SOCKLEN_T            socklen_t</div><div class='add'>+#else</div><div class='add'>+#define QT_SOCKLEN_T            int</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define QT_SIGNAL_IGNORE        (void (*)(int))1</div><div class='add'>+</div><div class='add'>+#define QT_SNPRINTF		::snprintf</div><div class='add'>+#define QT_VSNPRINTF		::vsnprintf</div><div class='add'>+</div><div class='add'>+#define QT_QPA_DEFAULT_PLATFORM_NAME "uikit"</div><div class='add'>+</div><div class='add'>+#endif // QPLATFORMDEFS_H</div><div class='head'>diff --git a/mkspecs/qws/macx-iphonesimulator-g++/Info.plist.lib b/mkspecs/qws/macx-iphonesimulator-g++/Info.plist.lib<br/>new file mode 100644<br/>index 0000000..97609ed<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/macx-iphonesimulator-g++/Info.plist.lib?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/macx-iphonesimulator-g++/Info.plist.lib</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='add'>+&lt;!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"&gt;</div><div class='add'>+&lt;plist version="0.9"&gt;</div><div class='add'>+&lt;dict&gt;</div><div class='add'>+	&lt;key&gt;CFBundlePackageType&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;FMWK&lt;/string&gt;</div><div class='add'>+        &lt;key&gt;CFBundleShortVersionString&lt;/key&gt;</div><div class='add'>+        &lt;string&gt;@SHORT_VERSION@&lt;/string&gt;</div><div class='add'>+        &lt;key&gt;CFBundleGetInfoString&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;Created by Qt/QMake&lt;/string&gt;</div><div class='add'>+	&lt;key&gt;CFBundleSignature&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;@TYPEINFO@&lt;/string&gt;</div><div class='add'>+	&lt;key&gt;CFBundleExecutable&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;@LIBRARY@&lt;/string&gt;</div><div class='add'>+	&lt;key&gt;NOTE&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;Please, do NOT change this file -- It was generated by Qt/QMake.&lt;/string&gt;</div><div class='add'>+&lt;/dict&gt;</div><div class='add'>+&lt;/plist&gt;</div><div class='head'>diff --git a/mkspecs/qws/macx-iphonesimulator-g++/qmake.conf b/mkspecs/qws/macx-iphonesimulator-g++/qmake.conf<br/>new file mode 100644<br/>index 0000000..93c4786<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/macx-iphonesimulator-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/macx-iphonesimulator-g++/qmake.conf</a></div><div class='hunk'>@@ -0,0 +1,49 @@</div><div class='add'>+#</div><div class='add'>+# qmake configuration for macx-g++</div><div class='add'>+#</div><div class='add'>+include(../../common/mac.conf)</div><div class='add'>+include(../../common/gcc-base-macx.conf)</div><div class='add'>+include(../../common/g++-macx.conf)</div><div class='add'>+</div><div class='add'>+MAKEFILE_GENERATOR	= UNIX</div><div class='add'>+TEMPLATE		= app</div><div class='add'>+CONFIG			+= qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl</div><div class='add'>+QT			+= core gui</div><div class='add'>+QMAKE_INCREMENTAL_STYLE = sublib</div><div class='add'>+</div><div class='add'>+# Do not compile a few things</div><div class='add'>+DEFINES += QT_NO_AUDIO_BACKEND QT_NO_NETWORKPROXY QT_NO_FILESYSTEMWATCHER</div><div class='add'>+</div><div class='add'>+# You may need to change this to point to the iOS SDK you want to use.</div><div class='add'>+QMAKE_IOS_DEV_PATH = /Developer/Platforms/iPhoneSimulator.platform/Developer</div><div class='add'>+QMAKE_IOS_SDK = $$QMAKE_IOS_DEV_PATH/SDKs/iPhoneSimulator4.2.sdk</div><div class='add'>+DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=40200</div><div class='add'>+#clear</div><div class='add'>+QMAKE_MACOSX_DEPLOYMENT_TARGET =</div><div class='add'>+</div><div class='add'>+QMAKE_LIBS_OPENGL_ES1 += -framework OpenGLES</div><div class='add'>+QMAKE_LIBS_OPENGL_ES2 += -framework OpenGLES</div><div class='add'>+</div><div class='add'>+# TARGET_PLATFORM = ios</div><div class='add'>+QMAKE_CC         = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc-4.2</div><div class='add'>+QMAKE_CXX        = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++-4.2</div><div class='add'>+QMAKE_LINK              = $$QMAKE_CXX</div><div class='add'>+QMAKE_LINK_SHLIB        = $$QMAKE_CXX</div><div class='add'>+</div><div class='add'>+QMAKE_CFLAGS           += -arch i386 -isysroot $$QMAKE_IOS_SDK</div><div class='add'>+QMAKE_CXXFLAGS	        += $$QMAKE_CFLAGS</div><div class='add'>+QMAKE_OBJECTIVE_CFLAGS += -arch i386 -isysroot $$QMAKE_IOS_SDK -fobjc-abi-version=2 -fobjc-legacy-dispatch</div><div class='add'>+QMAKE_LFLAGS           += -arch i386 -Wl,-syslibroot,$$QMAKE_IOS_SDK</div><div class='add'>+</div><div class='add'>+QMAKE_INCDIR_OPENGL	= </div><div class='add'>+QMAKE_LIBS_OPENGL	=</div><div class='add'>+QMAKE_LIBS_OPENGL_QT	=</div><div class='add'>+</div><div class='add'>+#QMAKE_RESOURCE		=</div><div class='add'>+QMAKE_FIX_RPATH = $$QMAKE_IOS_DEV_PATH/usr/bin/install_name_tool -id </div><div class='add'>+QMAKE_AR        = $$QMAKE_IOS_DEV_PATH/usr/bin/ar cq</div><div class='add'>+QMAKE_RANLIB    = $$QMAKE_IOS_DEV_PATH/usr/bin/ranlib -s</div><div class='add'>+</div><div class='add'>+load(qt_config)</div><div class='add'>+</div><div class='add'>+QMAKE_OBJECTIVE_CFLAGS_X86 += -arch i386 -isysroot $$QMAKE_IOS_SDK -fobjc-abi-version=2 -fobjc-legacy-dispatch</div><div class='head'>diff --git a/mkspecs/qws/macx-iphonesimulator-g++/qplatformdefs.h b/mkspecs/qws/macx-iphonesimulator-g++/qplatformdefs.h<br/>new file mode 100644<br/>index 0000000..629d57f<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/macx-iphonesimulator-g++/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/macx-iphonesimulator-g++/qplatformdefs.h</a></div><div class='hunk'>@@ -0,0 +1,99 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the qmake spec of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QPLATFORMDEFS_H</div><div class='add'>+#define QPLATFORMDEFS_H</div><div class='add'>+</div><div class='add'>+// Get Qt defines/settings</div><div class='add'>+</div><div class='add'>+#include "qglobal.h"</div><div class='add'>+</div><div class='add'>+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs</div><div class='add'>+</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// We are hot - unistd.h should have turned on the specific APIs we requested</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include &lt;dirent.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;grp.h&gt;</div><div class='add'>+#include &lt;pwd.h&gt;</div><div class='add'>+#include &lt;signal.h&gt;</div><div class='add'>+#define QT_NO_LIBRARY_UNLOAD</div><div class='add'>+</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;sys/ipc.h&gt;</div><div class='add'>+#include &lt;sys/time.h&gt;</div><div class='add'>+#include &lt;sys/shm.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/wait.h&gt;</div><div class='add'>+#include &lt;netinet/in.h&gt;</div><div class='add'>+#ifndef QT_NO_IPV6IFNAME</div><div class='add'>+#include &lt;net/if.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include "../../common/posix/qplatformdefs.h"</div><div class='add'>+</div><div class='add'>+#undef QT_OPEN_LARGEFILE</div><div class='add'>+#undef QT_SOCKLEN_T</div><div class='add'>+#undef QT_SIGNAL_IGNORE</div><div class='add'>+</div><div class='add'>+#define QT_OPEN_LARGEFILE       0</div><div class='add'>+</div><div class='add'>+#if (MAC_OS_X_VERSION_MAX_ALLOWED &gt;= MAC_OS_X_VERSION_10_4)</div><div class='add'>+#define QT_SOCKLEN_T            socklen_t</div><div class='add'>+#else</div><div class='add'>+#define QT_SOCKLEN_T            int</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define QT_SIGNAL_IGNORE        (void (*)(int))1</div><div class='add'>+</div><div class='add'>+#define QT_SNPRINTF		::snprintf</div><div class='add'>+#define QT_VSNPRINTF		::vsnprintf</div><div class='add'>+</div><div class='add'>+#define QT_QPA_DEFAULT_PLATFORM_NAME "uikit"</div><div class='add'>+</div><div class='add'>+#endif // QPLATFORMDEFS_H</div><div class='head'>diff --git a/mkspecs/qws/macx-nacl-g++/qmake.conf b/mkspecs/qws/macx-nacl-g++/qmake.conf<br/>new file mode 100644<br/>index 0000000..7293a1a<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/macx-nacl-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/macx-nacl-g++/qmake.conf</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+#</div><div class='add'>+# qmake configuration for building with nacl-g++</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+include(../../common/linux.conf)</div><div class='add'>+include(../../common/qws.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='add'>+</div><div class='add'>+QT                      = core gui</div><div class='add'>+</div><div class='add'>+QMAKE_CC                = nacl-gcc</div><div class='add'>+QMAKE_CXX               = nacl-g++</div><div class='add'>+QMAKE_LINK              = nacl-g++</div><div class='add'>+QMAKE_LINK_SHLIB        = nacl-g++</div><div class='add'>+QMAKE_AR                = nacl-ar q</div><div class='add'>+QMAKE_OBJCOPY           = nacl-objcopy</div><div class='add'>+QMAKE_STRIP             = nacl-strip</div><div class='add'>+</div><div class='add'>+# work around linker crash when using PIC</div><div class='add'>+QMAKE_CFLAGS_STATIC_LIB	-= -fPIC</div><div class='add'>+QMAKE_CFLAGS_SHLIB	-= -fPIC</div><div class='add'>+QMAKE_CXXFLAGS_STATIC_LIB -= -fPIC</div><div class='add'>+QMAKE_CXXFLAGS_SHLIB	-= -fPIC</div><div class='add'>+</div><div class='add'>+#QMAKE_CFLAGS		+= -pipe -DXP_UNIX -DNACL_STANDALONE=1</div><div class='add'>+QMAKE_LIBS_DYNLOAD    -= -ldl</div><div class='add'>+</div><div class='add'>+load(qt_config)</div><div class='head'>diff --git a/mkspecs/qws/macx-nacl-g++/qplatformdefs.h b/mkspecs/qws/macx-nacl-g++/qplatformdefs.h<br/>new file mode 100644<br/>index 0000000..d72943d<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/qws/macx-nacl-g++/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/qws/macx-nacl-g++/qplatformdefs.h</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the qmake spec of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QPLATFORMDEFS_H</div><div class='add'>+#define QPLATFORMDEFS_H</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define _POSIX_TIMERS</div><div class='add'>+</div><div class='add'>+#include "qglobal.h"</div><div class='add'>+</div><div class='add'>+// extra disabling.</div><div class='add'>+#ifdef __native_client__</div><div class='add'>+#define QT_NO_FSFILEENGINE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define QT_NO_SOCKET_H</div><div class='add'>+</div><div class='add'>+#define DIR void *</div><div class='add'>+#define PATH_MAX 256</div><div class='add'>+</div><div class='add'>+#include "../../common/posix/qplatformdefs.h"</div><div class='add'>+#include "qfunctions_nacl.h"</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+</div><div class='add'>+#undef QT_LSTAT</div><div class='add'>+#define QT_LSTAT                QT_STAT</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif // QPLATFORMDEFS_H</div><div class='head'>diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf<br/>index 6eb5ca1..179b774 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/sco-cc/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/sco-cc/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/sco-cc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/sco-cc/qmake.conf</a></div><div class='hunk'>@@ -60,7 +60,7 @@ QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='ctx'> </div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXt</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL -lXt</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> </div><div class='ctx'> QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc</div><div class='head'>diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf<br/>index d4091ff..9b321a4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/sco-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/sco-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/sco-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/sco-g++/qmake.conf</a></div><div class='hunk'>@@ -61,7 +61,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lsocket -lm</div><div class='ctx'> </div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> </div><div class='ctx'> QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc</div><div class='head'>diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf<br/>index a026756..80709af 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/solaris-cc-64/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/solaris-cc-64/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/solaris-cc-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/solaris-cc-64/qmake.conf</a></div><div class='hunk'>@@ -83,7 +83,7 @@ QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='ctx'> QMAKE_LIBS_NIS		=</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread -lrt</div><div class='ctx'> QMAKE_LIBS_NETWORK      = -lresolv -lsocket -lxnet -lnsl</div><div class='head'>diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf<br/>index 8a8f1ac..0672841 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/solaris-cc/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/solaris-cc/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/solaris-cc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/solaris-cc/qmake.conf</a></div><div class='hunk'>@@ -66,7 +66,7 @@ QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='ctx'> QMAKE_LIBS_NIS		=</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread -lrt</div><div class='ctx'> QMAKE_LIBS_NETWORK      = -lresolv -lsocket -lxnet -lnsl</div><div class='head'>diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf<br/>index 01e331c..7bc7b9f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/solaris-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/solaris-g++-64/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/solaris-g++-64/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/solaris-g++-64/qmake.conf</a></div><div class='hunk'>@@ -87,7 +87,7 @@ QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='ctx'> QMAKE_LIBS_NIS		=</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread -lrt</div><div class='ctx'> QMAKE_LIBS_NETWORK      = -lresolv -lsocket -lxnet -lnsl</div><div class='head'>diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf<br/>index c7f6406..be21cdd 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/solaris-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/solaris-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/solaris-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/solaris-g++/qmake.conf</a></div><div class='hunk'>@@ -70,7 +70,7 @@ QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='ctx'> QMAKE_LIBS_NIS		=</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread -lrt</div><div class='ctx'> QMAKE_LIBS_NETWORK      = -lresolv -lsocket -lxnet -lnsl</div><div class='head'>diff --git a/mkspecs/symbian-gcce/qmake.conf b/mkspecs/symbian-gcce/qmake.conf<br/>index 38042e9..17b1c5f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/symbian-gcce/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/symbian-gcce/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/symbian-gcce/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/symbian-gcce/qmake.conf</a></div><div class='hunk'>@@ -4,7 +4,8 @@</div><div class='ctx'> </div><div class='ctx'> include(../common/symbian/symbian-makefile.conf)</div><div class='ctx'> </div><div class='del'>-include(../common/g++.conf)</div><div class='add'>+include(../common/g++-unix.conf)</div><div class='add'>+include(../common/gcc-base-unix.conf)</div><div class='ctx'> </div><div class='ctx'> QMAKE_CC		= arm-none-symbianelf-gcc</div><div class='ctx'> QMAKE_CXX		= arm-none-symbianelf-g++</div><div class='head'>diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf<br/>index d2c6937..afabf3e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/tru64-cxx/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/tru64-cxx/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/tru64-cxx/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/tru64-cxx/qmake.conf</a></div><div class='hunk'>@@ -60,7 +60,7 @@ QMAKE_LIBS		= -lm</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	=</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lrt</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf<br/>index f2b8e39..6acd5cd 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/tru64-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/tru64-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/tru64-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/tru64-g++/qmake.conf</a></div><div class='hunk'>@@ -62,7 +62,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	=</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lpthread -lexc -lrt</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf<br/>index 5f88b80..74478d6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/unixware-cc/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unixware-cc/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unixware-cc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unixware-cc/qmake.conf</a></div><div class='hunk'>@@ -64,7 +64,7 @@ QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='ctx'> </div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXt</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL -lXt</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> </div><div class='ctx'> QMAKE_LIBS_THREAD	=</div><div class='head'>diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf<br/>index 34d6d61..a158d95 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/unixware-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unixware-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unixware-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unixware-g++/qmake.conf</a></div><div class='hunk'>@@ -64,7 +64,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	= -ldl</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl -lm</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXt</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL -lXt</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	= -lthread</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/unsupported/integrity-ghs/qmake.conf b/mkspecs/unsupported/integrity-ghs/qmake.conf<br/>new file mode 100644<br/>index 0000000..822d6bb<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/integrity-ghs/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/integrity-ghs/qmake.conf</a></div><div class='hunk'>@@ -0,0 +1,72 @@</div><div class='add'>+#</div><div class='add'>+# qmake configuration for integrity-ghs</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+MAKEFILE_GENERATOR	= GBUILD</div><div class='add'>+#MAKEFILE_GENERATOR	= UNIX</div><div class='add'>+TEMPLATE		= app</div><div class='add'>+CONFIG			+= qt warn_on release integrity unix</div><div class='add'>+QT                      += core gui network</div><div class='add'>+</div><div class='add'>+QMAKE_CFLAGS		= -bsp $$INTEGRITY_BSP -os_dir $__OS_DIR</div><div class='add'>+QMAKE_CFLAGS		+= --diag_suppress=1,228,236,381,611,997</div><div class='add'>+QMAKE_CFLAGS_WARN_ON	=</div><div class='add'>+QMAKE_CFLAGS_WARN_OFF	= -w</div><div class='add'>+QMAKE_CFLAGS_RELEASE	= -g -Ospeed -Olink --signed_fields --no_commons</div><div class='add'>+QMAKE_CFLAGS_DEBUG	= -g --no_commons --signed_fields</div><div class='add'>+QMAKE_CFLAGS_SHLIB	=</div><div class='add'>+QMAKE_CFLAGS_THREAD	= -D_REENTRANT</div><div class='add'>+</div><div class='add'>+QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS --no_implicit_include --link_once_templates</div><div class='add'>+QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON</div><div class='add'>+QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF</div><div class='add'>+QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE</div><div class='add'>+QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG</div><div class='add'>+QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB</div><div class='add'>+QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC</div><div class='add'>+QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD</div><div class='add'>+</div><div class='add'>+QMAKE_INCDIR		=</div><div class='add'>+QMAKE_LIBDIR		=</div><div class='add'>+QMAKE_INCDIR_X11	=</div><div class='add'>+QMAKE_LIBDIR_X11	=</div><div class='add'>+QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]</div><div class='add'>+QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]</div><div class='add'>+QMAKE_INCDIR_OPENGL	=</div><div class='add'>+QMAKE_LIBDIR_OPENGL	=</div><div class='add'>+QMAKE_INCDIR_QTOPIA	= $(QPEDIR)/include</div><div class='add'>+QMAKE_LIBDIR_QTOPIA	= $(QPEDIR)/lib</div><div class='add'>+</div><div class='add'>+QMAKE_LFLAGS		= -lposix -livfs -lnet -lsocket -lfbdev -ldl</div><div class='add'>+QMAKE_LFLAGS_RELEASE	= -g -Ospeed -Olink --no_commons -non_shared --link_once_templates</div><div class='add'>+QMAKE_LFLAGS_DEBUG	= -g --no_commons</div><div class='add'>+QMAKE_LFLAGS_SHLIB      =</div><div class='add'>+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB</div><div class='add'>+QMAKE_LFLAGS_SONAME     =</div><div class='add'>+QMAKE_LFLAGS_THREAD     =</div><div class='add'>+QMAKE_LFLAGS_RPATH      =</div><div class='add'>+</div><div class='add'>+QMAKE_LIBS		=</div><div class='add'>+QMAKE_LIBS_DYNLOAD      = -ldl</div><div class='add'>+QMAKE_LIBS_X11		=</div><div class='add'>+QMAKE_LIBS_X11SM	=</div><div class='add'>+QMAKE_LIBS_QTOPIA	=</div><div class='add'>+QMAKE_LIBS_THREAD       =</div><div class='add'>+</div><div class='add'>+QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc</div><div class='add'>+QMAKE_UIC		= $$[QT_INSTALL_BINS]/uic</div><div class='add'>+</div><div class='add'>+QMAKE_AR		= ar cqs</div><div class='add'>+QMAKE_RANLIB		=</div><div class='add'>+</div><div class='add'>+QMAKE_TAR		= tar -cf</div><div class='add'>+QMAKE_GZIP		= gzip -9f</div><div class='add'>+</div><div class='add'>+QMAKE_COPY		= cp -f</div><div class='add'>+QMAKE_MOVE		= mv -f</div><div class='add'>+QMAKE_DEL_FILE		= rm -f</div><div class='add'>+QMAKE_DEL_DIR		= rmdir</div><div class='add'>+QMAKE_CHK_DIR_EXISTS	= test -d</div><div class='add'>+QMAKE_MKDIR		= mkdir -p</div><div class='add'>+load(qt_config)</div><div class='add'>+</div><div class='head'>diff --git a/mkspecs/unsupported/integrity-ghs/qplatformdefs.h b/mkspecs/unsupported/integrity-ghs/qplatformdefs.h<br/>new file mode 100644<br/>index 0000000..919d2cf<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/integrity-ghs/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/integrity-ghs/qplatformdefs.h</a></div><div class='hunk'>@@ -0,0 +1,201 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtGui module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+// Get Qt defines/settings</div><div class='add'>+</div><div class='add'>+#include "qglobal.h"</div><div class='add'>+</div><div class='add'>+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs</div><div class='add'>+</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+// We are hot - unistd.h should have turned on the specific APIs we requested</div><div class='add'>+</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include &lt;dirent.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;grp.h&gt;</div><div class='add'>+#include &lt;pwd.h&gt;</div><div class='add'>+#include &lt;signal.h&gt;</div><div class='add'>+#include &lt;dlfcn.h&gt;</div><div class='add'>+#include &lt;limits.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;sys/time.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/wait.h&gt;</div><div class='add'>+#include &lt;netinet/in.h&gt;</div><div class='add'>+#ifndef QT_NO_IPV6IFNAME</div><div class='add'>+#include &lt;net/if.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef QT_LARGEFILE_SUPPORT</div><div class='add'>+#define QT_STATBUF              struct stat64</div><div class='add'>+#define QT_STATBUF4TSTAT        struct stat64</div><div class='add'>+#define QT_STAT                 ::stat64</div><div class='add'>+#define QT_FSTAT                ::fstat64</div><div class='add'>+#define QT_LSTAT                ::lstat64</div><div class='add'>+#define QT_OPEN                 ::open64</div><div class='add'>+#define QT_TRUNCATE             ::truncate64</div><div class='add'>+#define QT_FTRUNCATE            ::ftruncate64</div><div class='add'>+#define QT_LSEEK                ::lseek64</div><div class='add'>+#else</div><div class='add'>+#define QT_STATBUF              struct stat</div><div class='add'>+#define QT_STATBUF4TSTAT        struct stat</div><div class='add'>+#define QT_STAT                 ::stat</div><div class='add'>+#define QT_FSTAT                ::fstat</div><div class='add'>+#define QT_LSTAT                ::lstat</div><div class='add'>+#define QT_OPEN                 ::open</div><div class='add'>+#define QT_TRUNCATE             ::truncate</div><div class='add'>+#define QT_FTRUNCATE            ::ftruncate</div><div class='add'>+#define QT_LSEEK                ::lseek</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef QT_LARGEFILE_SUPPORT</div><div class='add'>+#define QT_FOPEN                ::fopen64</div><div class='add'>+#define QT_FSEEK                ::fseeko64</div><div class='add'>+#define QT_FTELL                ::ftello64</div><div class='add'>+#define QT_FGETPOS              ::fgetpos64</div><div class='add'>+#define QT_FSETPOS              ::fsetpos64</div><div class='add'>+#define QT_FPOS_T               fpos64_t</div><div class='add'>+#define QT_OFF_T                off64_t</div><div class='add'>+#else</div><div class='add'>+#define QT_FOPEN                ::fopen</div><div class='add'>+#define QT_FSEEK                ::fseek</div><div class='add'>+#define QT_FTELL                ::ftell</div><div class='add'>+#define QT_FGETPOS              ::fgetpos</div><div class='add'>+#define QT_FSETPOS              ::fsetpos</div><div class='add'>+#define QT_FPOS_T               fpos_t</div><div class='add'>+#define QT_OFF_T                long</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define QT_STAT_REG		S_IFREG</div><div class='add'>+#define QT_STAT_DIR		S_IFDIR</div><div class='add'>+#define QT_STAT_MASK		S_IFMT</div><div class='add'>+#define QT_STAT_LNK		S_IFLNK</div><div class='add'>+#define QT_SOCKET_CONNECT	::connect</div><div class='add'>+#define QT_SOCKET_BIND		::bind</div><div class='add'>+#define QT_FILENO		fileno</div><div class='add'>+#ifndef QT_CLOSE</div><div class='add'>+#define QT_CLOSE		::close</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_READ</div><div class='add'>+#define QT_READ			::read</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_WRITE</div><div class='add'>+#define QT_WRITE		::write</div><div class='add'>+#endif</div><div class='add'>+#define QT_ACCESS		::access</div><div class='add'>+#define QT_GETCWD		::getcwd</div><div class='add'>+#define QT_CHDIR		::chdir</div><div class='add'>+#define QT_MKDIR		::mkdir</div><div class='add'>+#define QT_RMDIR		::rmdir</div><div class='add'>+#define QT_OPEN_RDONLY		O_RDONLY</div><div class='add'>+#define QT_OPEN_WRONLY		O_WRONLY</div><div class='add'>+#define QT_OPEN_RDWR		O_RDWR</div><div class='add'>+#define QT_OPEN_CREAT		O_CREAT</div><div class='add'>+#define QT_OPEN_TRUNC		O_TRUNC</div><div class='add'>+#define QT_OPEN_APPEND		O_APPEND</div><div class='add'>+</div><div class='add'>+#define QT_SIGNAL_RETTYPE	void</div><div class='add'>+#define QT_SIGNAL_ARGS		int</div><div class='add'>+#define QT_SIGNAL_IGNORE	SIG_IGN</div><div class='add'>+</div><div class='add'>+#define QT_MMAP                 ::mmap</div><div class='add'>+</div><div class='add'>+// Directory iteration</div><div class='add'>+#define QT_DIR                  DIR</div><div class='add'>+</div><div class='add'>+#define QT_OPENDIR              ::opendir</div><div class='add'>+#define QT_CLOSEDIR             ::closedir</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if defined(QT_LARGEFILE_SUPPORT) \</div><div class='add'>+        &amp;&amp; defined(QT_USE_XOPEN_LFS_EXTENSIONS) \</div><div class='add'>+        &amp;&amp; !defined(QT_NO_READDIR64)</div><div class='add'>+# define QT_DIRENT               struct dirent64</div><div class='add'>+# define QT_READDIR              ::readdir64</div><div class='add'>+# define QT_READDIR_R            ::readdir64_r</div><div class='add'>+#else</div><div class='add'>+# define QT_DIRENT               struct dirent</div><div class='add'>+# define QT_READDIR              ::readdir</div><div class='add'>+# define QT_READDIR_R            ::readdir_r</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define QT_SOCKLEN_T           socklen_t</div><div class='add'>+</div><div class='add'>+#if defined(_XOPEN_SOURCE) &amp;&amp; (_XOPEN_SOURCE &gt;= 500)</div><div class='add'>+#define QT_SNPRINTF		::snprintf</div><div class='add'>+#define QT_VSNPRINTF		::vsnprintf</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef MAXNAMLEN</div><div class='add'>+#  define MAXNAMLEN NAME_MAX</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef PATH_MAX</div><div class='add'>+#  define PATH_MAX MAXPATHLEN</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef NSIG</div><div class='add'>+#  define NSIG _SIGMAX</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef MAP_ANON</div><div class='add'>+#  define MAP_ANON 0</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+typedef void (*sighandler_t)(int);</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_MMAP</div><div class='add'>+#  define QT_NO_MMAP</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_SHAREDMEMORY</div><div class='add'>+#  define QT_NO_SHAREDMEMORY</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_SYSTEMSEMAPHORE</div><div class='add'>+#  define QT_NO_SYSTEMSEMAPHORE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='head'>diff --git a/mkspecs/unsupported/linux-armcc/qmake.conf b/mkspecs/unsupported/linux-armcc/qmake.conf<br/>new file mode 100644<br/>index 0000000..77891c3<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/linux-armcc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/linux-armcc/qmake.conf</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+#</div><div class='add'>+# qmake configuration for linux-armcc</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+MAKEFILE_GENERATOR      = UNIX</div><div class='add'>+TARGET_PLATFORM         = unix</div><div class='add'>+TEMPLATE                = app</div><div class='add'>+CONFIG                  += qt warn_on release incremental link_prl armcc_linker</div><div class='add'>+QT                      += core gui</div><div class='add'>+QMAKE_INCREMENTAL_STYLE = sublib</div><div class='add'>+</div><div class='add'>+include(../../common/linux.conf)</div><div class='add'>+include(../../common/armcc.conf)</div><div class='add'>+load(qt_config)</div><div class='add'>+</div><div class='add'>+# use armcc for linking since armlink doesn't understand the arm_linux_config_file option</div><div class='add'>+QMAKE_LINK		= armcc</div><div class='add'>+QMAKE_LINK_SHLIB	= armcc</div><div class='add'>+QMAKE_LINK_C		= armcc</div><div class='add'>+QMAKE_LINK_C_SHLIB	= armcc</div><div class='add'>+</div><div class='add'>+QMAKE_LFLAGS_SHLIB      += --apcs=/fpic --shared</div><div class='add'>+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB</div><div class='add'>+</div><div class='add'>+QMAKE_LIBS              += libstdc++.so librt.so</div><div class='add'>+</div><div class='add'>+CONFIG -= rvct_linker</div><div class='add'>+</div><div class='add'>+QMAKE_CFLAGS            += --gnu --arm_linux --dllimport_runtime --thumb --cpu Cortex-A9 --arm_linux_config_file="$(HOME)/qt_rvct_config" --arm-linux-paths --apcs=/interwork --visibility_inlines_hidden --diag_suppress 1300,2523</div><div class='add'>+QMAKE_CXXFLAGS          += $$QMAKE_CFLAGS --cpp</div><div class='add'>+</div><div class='add'>+QMAKE_LFLAGS            += --diag_suppress 6331,6780,6439 --arm_linux_config_file="$(HOME)/qt_rvct_config" --arm-linux-paths</div><div class='head'>diff --git a/mkspecs/unsupported/linux-armcc/qplatformdefs.h b/mkspecs/unsupported/linux-armcc/qplatformdefs.h<br/>new file mode 100644<br/>index 0000000..1b5dcc3<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/linux-armcc/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/linux-armcc/qplatformdefs.h</a></div><div class='hunk'>@@ -0,0 +1,100 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the qmake spec of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QPLATFORMDEFS_H</div><div class='add'>+#define QPLATFORMDEFS_H</div><div class='add'>+</div><div class='add'>+// Get Qt defines/settings</div><div class='add'>+</div><div class='add'>+#include "qglobal.h"</div><div class='add'>+</div><div class='add'>+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs</div><div class='add'>+</div><div class='add'>+// 1) need to reset default environment if _BSD_SOURCE is defined</div><div class='add'>+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0</div><div class='add'>+// 3) it seems older glibc need this to include the X/Open stuff</div><div class='add'>+#ifndef _GNU_SOURCE</div><div class='add'>+#  define _GNU_SOURCE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// We are hot - unistd.h should have turned on the specific APIs we requested</div><div class='add'>+</div><div class='add'>+#include &lt;features.h&gt;</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include &lt;dirent.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;grp.h&gt;</div><div class='add'>+#include &lt;pwd.h&gt;</div><div class='add'>+#include &lt;signal.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;sys/ipc.h&gt;</div><div class='add'>+#include &lt;sys/time.h&gt;</div><div class='add'>+#include &lt;sys/shm.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/wait.h&gt;</div><div class='add'>+#include &lt;netinet/in.h&gt;</div><div class='add'>+#ifndef QT_NO_IPV6IFNAME</div><div class='add'>+#include &lt;net/if.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define QT_USE_XOPEN_LFS_EXTENSIONS</div><div class='add'>+#include "../../common/posix/qplatformdefs.h"</div><div class='add'>+</div><div class='add'>+#undef QT_SOCKLEN_T</div><div class='add'>+</div><div class='add'>+#if defined(__GLIBC__) &amp;&amp; (__GLIBC__ &gt;= 2)</div><div class='add'>+#define QT_SOCKLEN_T            socklen_t</div><div class='add'>+#else</div><div class='add'>+#define QT_SOCKLEN_T            int</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(_XOPEN_SOURCE) &amp;&amp; (_XOPEN_SOURCE &gt;= 500)</div><div class='add'>+#define QT_SNPRINTF		::snprintf</div><div class='add'>+#define QT_VSNPRINTF		::vsnprintf</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif // QPLATFORMDEFS_H</div><div class='head'>diff --git a/mkspecs/unsupported/linux-clang/qmake.conf b/mkspecs/unsupported/linux-clang/qmake.conf<br/>new file mode 100644<br/>index 0000000..6b63b7a<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/linux-clang/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/linux-clang/qmake.conf</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+#</div><div class='add'>+# qmake configuration for linux-clang</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+MAKEFILE_GENERATOR = UNIX</div><div class='add'>+TARGET_PLATFORM = unix</div><div class='add'>+TEMPLATE = app</div><div class='add'>+CONFIG += qt warn_on release incremental link_prl</div><div class='add'>+QT += core gui</div><div class='add'>+</div><div class='add'>+QMAKE_INCREMENTAL_STYLE = sublib</div><div class='add'>+</div><div class='add'>+include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/clang.conf)</div><div class='add'>+</div><div class='add'>+QMAKE_LFLAGS += -ccc-gcc-name g++</div><div class='add'>+</div><div class='add'>+load(qt_config)</div><div class='head'>diff --git a/mkspecs/unsupported/linux-clang/qplatformdefs.h b/mkspecs/unsupported/linux-clang/qplatformdefs.h<br/>new file mode 100644<br/>index 0000000..336453d<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/linux-clang/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/linux-clang/qplatformdefs.h</a></div><div class='hunk'>@@ -0,0 +1,102 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the qmake spec of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QPLATFORMDEFS_H</div><div class='add'>+#define QPLATFORMDEFS_H</div><div class='add'>+</div><div class='add'>+// Get Qt defines/settings</div><div class='add'>+</div><div class='add'>+#include "qglobal.h"</div><div class='add'>+</div><div class='add'>+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs</div><div class='add'>+</div><div class='add'>+// 1) need to reset default environment if _BSD_SOURCE is defined</div><div class='add'>+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0</div><div class='add'>+// 3) it seems older glibc need this to include the X/Open stuff</div><div class='add'>+#ifndef _GNU_SOURCE</div><div class='add'>+#  define _GNU_SOURCE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// We are hot - unistd.h should have turned on the specific APIs we requested</div><div class='add'>+</div><div class='add'>+#include &lt;features.h&gt;</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include &lt;dirent.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;grp.h&gt;</div><div class='add'>+#include &lt;pwd.h&gt;</div><div class='add'>+#include &lt;signal.h&gt;</div><div class='add'>+#include &lt;dlfcn.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;sys/ipc.h&gt;</div><div class='add'>+#include &lt;sys/time.h&gt;</div><div class='add'>+#include &lt;sys/shm.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/wait.h&gt;</div><div class='add'>+#include &lt;netinet/in.h&gt;</div><div class='add'>+#ifndef QT_NO_IPV6IFNAME</div><div class='add'>+#include &lt;net/if.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define QT_USE_XOPEN_LFS_EXTENSIONS</div><div class='add'>+#include "../../common/posix/qplatformdefs.h"</div><div class='add'>+</div><div class='add'>+#undef QT_SOCKLEN_T</div><div class='add'>+</div><div class='add'>+#if defined(__GLIBC__) &amp;&amp; (__GLIBC__ &gt;= 2)</div><div class='add'>+#define QT_SOCKLEN_T		socklen_t</div><div class='add'>+#else</div><div class='add'>+#define QT_SOCKLEN_T		int</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(_XOPEN_SOURCE) &amp;&amp; (_XOPEN_SOURCE &gt;= 500)</div><div class='add'>+#define QT_SNPRINTF		::snprintf</div><div class='add'>+#define QT_VSNPRINTF		::vsnprintf</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif // QPLATFORMDEFS_H</div><div class='head'>diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf<br/>index 38849f8..46ecf37 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/linux-host-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/linux-host-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/linux-host-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/linux-host-g++/qmake.conf</a></div><div class='hunk'>@@ -101,7 +101,7 @@ QMAKE_LIBS_X11        = -lXext -lX11 -lm</div><div class='ctx'> QMAKE_LIBS_X11SM      = -lSM -lICE</div><div class='ctx'> QMAKE_LIBS_NIS        = -lnsl</div><div class='ctx'> QMAKE_LIBS_EGL        = -lEGL</div><div class='del'>-QMAKE_LIBS_OPENGL     = -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL     = -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT  = -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM</div><div class='ctx'> QMAKE_LIBS_OPENGL_ES2 = -lGLESv2</div><div class='head'>diff --git a/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf b/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf<br/>index 28e7754..c362634 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf</a></div><div class='hunk'>@@ -18,8 +18,9 @@ CONFIG			+= qt warn_on release incremental link_prl</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> QMAKE_INCREMENTAL_STYLE = sublib</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> </div><div class='ctx'> # modifications to g++.conf</div><div class='ctx'> QMAKE_CC                = sb2 gcc</div><div class='head'>diff --git a/mkspecs/unsupported/macx-clang/Info.plist.app b/mkspecs/unsupported/macx-clang/Info.plist.app<br/>new file mode 100644<br/>index 0000000..393b615<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/macx-clang/Info.plist.app?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/macx-clang/Info.plist.app</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='add'>+&lt;!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"&gt;</div><div class='add'>+&lt;plist version="0.9"&gt;</div><div class='add'>+&lt;dict&gt;</div><div class='add'>+	&lt;key&gt;CFBundleIconFile&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;@ICON@&lt;/string&gt;</div><div class='add'>+	&lt;key&gt;CFBundlePackageType&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;APPL&lt;/string&gt;</div><div class='add'>+    &lt;key&gt;CFBundleGetInfoString&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;Created by Qt/QMake&lt;/string&gt;</div><div class='add'>+	&lt;key&gt;CFBundleSignature&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;@TYPEINFO@&lt;/string&gt;</div><div class='add'>+	&lt;key&gt;CFBundleExecutable&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;@EXECUTABLE@&lt;/string&gt;</div><div class='add'>+	&lt;key&gt;CFBundleIdentifier&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;com.yourcompany.@EXECUTABLE@&lt;/string&gt;</div><div class='add'>+	&lt;key&gt;NOTE&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;This file was generated by Qt/QMake.&lt;/string&gt;</div><div class='add'>+&lt;/dict&gt;</div><div class='add'>+&lt;/plist&gt;</div><div class='head'>diff --git a/mkspecs/unsupported/macx-clang/Info.plist.lib b/mkspecs/unsupported/macx-clang/Info.plist.lib<br/>new file mode 100644<br/>index 0000000..97609ed<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/macx-clang/Info.plist.lib?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/macx-clang/Info.plist.lib</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='add'>+&lt;!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"&gt;</div><div class='add'>+&lt;plist version="0.9"&gt;</div><div class='add'>+&lt;dict&gt;</div><div class='add'>+	&lt;key&gt;CFBundlePackageType&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;FMWK&lt;/string&gt;</div><div class='add'>+        &lt;key&gt;CFBundleShortVersionString&lt;/key&gt;</div><div class='add'>+        &lt;string&gt;@SHORT_VERSION@&lt;/string&gt;</div><div class='add'>+        &lt;key&gt;CFBundleGetInfoString&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;Created by Qt/QMake&lt;/string&gt;</div><div class='add'>+	&lt;key&gt;CFBundleSignature&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;@TYPEINFO@&lt;/string&gt;</div><div class='add'>+	&lt;key&gt;CFBundleExecutable&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;@LIBRARY@&lt;/string&gt;</div><div class='add'>+	&lt;key&gt;NOTE&lt;/key&gt;</div><div class='add'>+	&lt;string&gt;Please, do NOT change this file -- It was generated by Qt/QMake.&lt;/string&gt;</div><div class='add'>+&lt;/dict&gt;</div><div class='add'>+&lt;/plist&gt;</div><div class='head'>diff --git a/mkspecs/unsupported/macx-clang/qmake.conf b/mkspecs/unsupported/macx-clang/qmake.conf<br/>new file mode 100644<br/>index 0000000..3191344<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/macx-clang/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/macx-clang/qmake.conf</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+#</div><div class='add'>+# qmake configuration for Clang on OS X</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+MAKEFILE_GENERATOR = UNIX</div><div class='add'>+TARGET_PLATFORM = macx</div><div class='add'>+TEMPLATE = app</div><div class='add'>+CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl</div><div class='add'>+QT += core gui</div><div class='add'>+QMAKE_INCREMENTAL_STYLE = sublib</div><div class='add'>+</div><div class='add'>+include(../../common/mac.conf)</div><div class='add'>+include(../../common/gcc-base-macx.conf)</div><div class='add'>+include(../../common/clang.conf)</div><div class='add'>+</div><div class='add'>+QMAKE_OBJCFLAGS_PRECOMPILE       = -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='add'>+QMAKE_OBJCFLAGS_USE_PRECOMPILE   = $$QMAKE_CFLAGS_USE_PRECOMPILE</div><div class='add'>+QMAKE_OBJCXXFLAGS_PRECOMPILE     = -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}</div><div class='add'>+QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE</div><div class='add'>+</div><div class='add'>+load(qt_config)</div><div class='head'>diff --git a/mkspecs/unsupported/macx-clang/qplatformdefs.h b/mkspecs/unsupported/macx-clang/qplatformdefs.h<br/>new file mode 100644<br/>index 0000000..154d9c8<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/macx-clang/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/macx-clang/qplatformdefs.h</a></div><div class='hunk'>@@ -0,0 +1,97 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the qmake spec of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QPLATFORMDEFS_H</div><div class='add'>+#define QPLATFORMDEFS_H</div><div class='add'>+</div><div class='add'>+// Get Qt defines/settings</div><div class='add'>+</div><div class='add'>+#include "qglobal.h"</div><div class='add'>+</div><div class='add'>+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs</div><div class='add'>+</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+// We are hot - unistd.h should have turned on the specific APIs we requested</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include &lt;dirent.h&gt;</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#include &lt;grp.h&gt;</div><div class='add'>+#include &lt;pwd.h&gt;</div><div class='add'>+#include &lt;signal.h&gt;</div><div class='add'>+#define QT_NO_LIBRARY_UNLOAD</div><div class='add'>+</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+#include &lt;sys/ioctl.h&gt;</div><div class='add'>+#include &lt;sys/ipc.h&gt;</div><div class='add'>+#include &lt;sys/time.h&gt;</div><div class='add'>+#include &lt;sys/shm.h&gt;</div><div class='add'>+#include &lt;sys/socket.h&gt;</div><div class='add'>+#include &lt;sys/stat.h&gt;</div><div class='add'>+#include &lt;sys/wait.h&gt;</div><div class='add'>+#include &lt;netinet/in.h&gt;</div><div class='add'>+#ifndef QT_NO_IPV6IFNAME</div><div class='add'>+#include &lt;net/if.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include "../../common/posix/qplatformdefs.h"</div><div class='add'>+</div><div class='add'>+#undef QT_OPEN_LARGEFILE</div><div class='add'>+#undef QT_SOCKLEN_T</div><div class='add'>+#undef QT_SIGNAL_IGNORE</div><div class='add'>+</div><div class='add'>+#define QT_OPEN_LARGEFILE       0</div><div class='add'>+</div><div class='add'>+#if (MAC_OS_X_VERSION_MAX_ALLOWED &gt;= MAC_OS_X_VERSION_10_4)</div><div class='add'>+#define QT_SOCKLEN_T            socklen_t</div><div class='add'>+#else</div><div class='add'>+#define QT_SOCKLEN_T            int</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define QT_SIGNAL_IGNORE        (void (*)(int))1</div><div class='add'>+</div><div class='add'>+#define QT_SNPRINTF		::snprintf</div><div class='add'>+#define QT_VSNPRINTF		::vsnprintf</div><div class='add'>+</div><div class='add'>+#endif // QPLATFORMDEFS_H</div><div class='head'>diff --git a/mkspecs/unsupported/qnx-g++/qmake.conf b/mkspecs/unsupported/qnx-g++/qmake.conf<br/>index 37e7bce..83c4a26 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/qnx-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/qnx-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/qnx-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/qnx-g++/qmake.conf</a></div><div class='hunk'>@@ -10,7 +10,8 @@ TEMPLATE		= app</div><div class='ctx'> CONFIG			+= qt warn_on release link_prl</div><div class='ctx'> QT			+= core gui</div><div class='ctx'> </div><div class='del'>-include(../common/g++.conf)</div><div class='add'>+include(../common/gcc-base-unix.conf)</div><div class='add'>+include(../common/g++-unix.conf)</div><div class='ctx'> include(../common/unix.conf)</div><div class='ctx'> </div><div class='ctx'> QMAKE_CFLAGS_THREAD	= -D_REENTRANT</div><div class='hunk'>@@ -31,7 +32,7 @@ QMAKE_LIBS		=</div><div class='ctx'> QMAKE_LIBS_DYNLOAD	=</div><div class='ctx'> QMAKE_LIBS_X11		= -lXext -lX11 -lm -lsocket</div><div class='ctx'> QMAKE_LIBS_X11SM	= -lSM -lICE</div><div class='del'>-QMAKE_LIBS_OPENGL	= -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL	= -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT	= -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD	=</div><div class='ctx'> QMAKE_LIBS_NETWORK      = -lsocket</div><div class='head'>diff --git a/mkspecs/unsupported/qws/integrity-arm-cxarm/qmake.conf b/mkspecs/unsupported/qws/integrity-arm-cxarm/qmake.conf<br/>new file mode 100644<br/>index 0000000..acaf3c2<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/qws/integrity-arm-cxarm/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/qws/integrity-arm-cxarm/qmake.conf</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+#</div><div class='add'>+# qmake configuration for integrity-ghs</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+INTEGRITY_DIR		= /enter/your/path/to/INTEGRITY</div><div class='add'>+INTEGRITY_BSP		= enter_your_bsp_name_here</div><div class='add'>+QMAKE_CC		= ccintarm</div><div class='add'>+QMAKE_CXX		= cxintarm</div><div class='add'>+QMAKE_LINK		= cxintarm</div><div class='add'>+QMAKE_LINK_SHLIB	= cxintarm</div><div class='add'>+include(../../integrity-ghs/qmake.conf)</div><div class='add'>+</div><div class='head'>diff --git a/mkspecs/unsupported/qws/integrity-arm-cxarm/qplatformdefs.h b/mkspecs/unsupported/qws/integrity-arm-cxarm/qplatformdefs.h<br/>new file mode 100644<br/>index 0000000..0484a33<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/qws/integrity-arm-cxarm/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/qws/integrity-arm-cxarm/qplatformdefs.h</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the qmake spec of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "../../integrity-ghs/qplatformdefs.h"</div><div class='head'>diff --git a/mkspecs/unsupported/qws/integrity-ppc-cxppc/qmake.conf b/mkspecs/unsupported/qws/integrity-ppc-cxppc/qmake.conf<br/>new file mode 100644<br/>index 0000000..829e6d3<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/qws/integrity-ppc-cxppc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/qws/integrity-ppc-cxppc/qmake.conf</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+#</div><div class='add'>+# qmake configuration for integrity-ghs</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+INTEGRITY_DIR		= /enter/your/path/to/INTEGRITY</div><div class='add'>+INTEGRITY_BSP		= enter_your_bsp_name_here</div><div class='add'>+QMAKE_CC		= ccintppc</div><div class='add'>+QMAKE_CXX		= cxintppc</div><div class='add'>+QMAKE_LINK		= cxintppc</div><div class='add'>+QMAKE_LINK_SHLIB	= cxintppc</div><div class='add'>+include(../../integrity-ghs/qmake.conf)</div><div class='add'>+</div><div class='head'>diff --git a/mkspecs/unsupported/qws/integrity-ppc-cxppc/qplatformdefs.h b/mkspecs/unsupported/qws/integrity-ppc-cxppc/qplatformdefs.h<br/>new file mode 100644<br/>index 0000000..0484a33<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/qws/integrity-ppc-cxppc/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/qws/integrity-ppc-cxppc/qplatformdefs.h</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the qmake spec of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "../../integrity-ghs/qplatformdefs.h"</div><div class='head'>diff --git a/mkspecs/unsupported/qws/linux-x86-openkode-g++/qmake.conf b/mkspecs/unsupported/qws/linux-x86-openkode-g++/qmake.conf<br/>new file mode 100644<br/>index 0000000..b891c5e<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/qws/linux-x86-openkode-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/qws/linux-x86-openkode-g++/qmake.conf</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+#</div><div class='add'>+# qmake configuration for building with linux-g++</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+include(../../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../../common/g++-unix.conf)</div><div class='add'>+include(../../../common/linux.conf)</div><div class='add'>+include(../../../common/qws.conf)</div><div class='add'>+</div><div class='add'>+load(qt_config)</div><div class='add'>+</div><div class='add'>+# ### HACK - This should be a configure check</div><div class='add'>+OPENKODE_DIR = $(OPENKODE_DIR)</div><div class='add'>+</div><div class='add'>+QMAKE_INCDIR_OPENGL_ES2 = $${OPENKODE_DIR}/include</div><div class='add'>+QMAKE_LIBDIR_OPENGL_ES2 = $${OPENKODE_DIR}/lib-target</div><div class='add'>+QMAKE_LIBS_OPENGL_ES2 = $${QMAKE_RPATH}/$${OPENKODE_DIR}/lib-target -lGLESv2_CM</div><div class='add'>+</div><div class='add'>+QMAKE_INCDIR_EGL = $$QMAKE_INCDIR_OPENGL_ES2</div><div class='add'>+QMAKE_LIBDIR_EGL = $$QMAKE_LIBDIR_OPENGL_ES2</div><div class='add'>+QMAKE_LIBS_EGL = $${QMAKE_RPATH}/$${OPENKODE_DIR}/lib-target -lEGL</div><div class='add'>+</div><div class='add'>+QMAKE_LIBS += $${QMAKE_RPATH}/$${OPENKODE_DIR}/lib-target</div><div class='head'>diff --git a/mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h b/mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h<br/>new file mode 100644<br/>index 0000000..06641b5<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h</a></div><div class='hunk'>@@ -0,0 +1,42 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the qmake spec of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "../../../linux-g++/qplatformdefs.h"</div><div class='head'>diff --git a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf<br/>index 26de9b7..bb760b2 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf</a></div><div class='hunk'>@@ -61,7 +61,6 @@ QMAKE_PCH_OUTPUT_EXT    = .gch</div><div class='ctx'> QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions</div><div class='ctx'> QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,</div><div class='ctx'> </div><div class='del'>-#include(../../common/g++.conf)</div><div class='ctx'> include(../../common/unix.conf)</div><div class='ctx'> </div><div class='ctx'> QMAKE_CFLAGS_THREAD	= -D_REENTRANT</div><div class='head'>diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf<br/>index e3eb6cd..a3b571b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf</a></div><div class='hunk'>@@ -78,7 +78,7 @@ QMAKE_LIBS_DYNLOAD    =</div><div class='ctx'> QMAKE_LIBS_X11        = -lXext -lX11</div><div class='ctx'> QMAKE_LIBS_X11SM      = -lSM -lICE</div><div class='ctx'> QMAKE_LIBS_NIS        = -lnsl</div><div class='del'>-QMAKE_LIBS_OPENGL     = -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL     = -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT  = -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD     =</div><div class='ctx'> QMAKE_LIBS_NETWORK    = # -lnetwrap # only needed if kernel is missing gethostbyname and friends</div><div class='head'>diff --git a/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf b/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf<br/>index 80b5f3e..7a77c81 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/vxworks-ppc-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/vxworks-ppc-g++/qmake.conf</a></div><div class='hunk'>@@ -14,7 +14,8 @@ VXWORKS_ARCH        = ppc</div><div class='ctx'> VXWORKS_CPU         = PPC32</div><div class='ctx'> VXWORKS_ARCH_MUNCH  = ppc</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='ctx'> </div><div class='ctx'> QMAKE_CC            = cc$$VXWORKS_ARCH_MUNCH</div><div class='head'>diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf<br/>index d0aeff6..8bdf1c5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf</a></div><div class='hunk'>@@ -78,7 +78,7 @@ QMAKE_LIBS_DYNLOAD    =</div><div class='ctx'> QMAKE_LIBS_X11        = -lXext -lX11</div><div class='ctx'> QMAKE_LIBS_X11SM      = -lSM -lICE</div><div class='ctx'> QMAKE_LIBS_NIS        = -lnsl</div><div class='del'>-QMAKE_LIBS_OPENGL     = -lGLU -lGL</div><div class='add'>+QMAKE_LIBS_OPENGL     = -lGL</div><div class='ctx'> QMAKE_LIBS_OPENGL_QT  = -lGL</div><div class='ctx'> QMAKE_LIBS_THREAD     =</div><div class='ctx'> QMAKE_LIBS_NETWORK    = # -lnet # only needed if kernel is missing gethostbyname and friends</div><div class='head'>diff --git a/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf<br/>index 83f46c0..2a96a1a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf</a></div><div class='hunk'>@@ -14,7 +14,8 @@ VXWORKS_ARCH        = simlinux</div><div class='ctx'> VXWORKS_CPU         = SIMLINUX</div><div class='ctx'> VXWORKS_ARCH_MUNCH  = pentium</div><div class='ctx'> </div><div class='del'>-include(../../common/g++.conf)</div><div class='add'>+include(../../common/gcc-base-unix.conf)</div><div class='add'>+include(../../common/g++-unix.conf)</div><div class='ctx'> include(../../common/linux.conf)</div><div class='ctx'> </div><div class='ctx'> QMAKE_CC            = cc$$VXWORKS_ARCH_MUNCH</div><div class='head'>diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf<br/>index aa58e30..a9f725c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/win32-msvc2005/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/win32-msvc2005/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/win32-msvc2005/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/win32-msvc2005/qmake.conf</a></div><div class='hunk'>@@ -1,14 +1,14 @@</div><div class='ctx'> #</div><div class='ctx'> # qmake configuration for win32-msvc2005</div><div class='ctx'> #</div><div class='del'>-# Written for Microsoft VC2005.NET</div><div class='add'>+# Written for Microsoft Visual C++ 2005</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> MAKEFILE_GENERATOR      = MSVC.NET</div><div class='ctx'> TEMPLATE                = app</div><div class='ctx'> CONFIG                  += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source copy_dir_files debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe</div><div class='ctx'> QT                      += core gui</div><div class='del'>-DEFINES                 += UNICODE WIN32 QT_LARGEFILE_SUPPORT</div><div class='add'>+DEFINES                 += UNICODE WIN32 QT_LARGEFILE_SUPPORT _BIND_TO_CURRENT_VCLIBS_VERSION=1</div><div class='ctx'> QMAKE_COMPILER_DEFINES  += _MSC_VER=1400 WIN32</div><div class='ctx'> </div><div class='ctx'> QMAKE_CC                = cl</div><div class='hunk'>@@ -53,12 +53,13 @@ QMAKE_RUN_CXX_IMP       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $&lt;</div><div class='ctx'> QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @&lt;&lt;</div><div class='ctx'> </div><div class='ctx'> QMAKE_LINK              = link</div><div class='del'>-QMAKE_LFLAGS            = /NOLOGO</div><div class='add'>+QMAKE_LFLAGS            = /NOLOGO /DYNAMICBASE /NXCOMPAT</div><div class='ctx'> QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO</div><div class='ctx'> QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF</div><div class='ctx'> QMAKE_LFLAGS_DEBUG      = /DEBUG</div><div class='ctx'> QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE</div><div class='del'>-QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"</div><div class='add'>+QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS</div><div class='add'>+QMAKE_LFLAGS_EXE        = \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"</div><div class='ctx'> QMAKE_LFLAGS_DLL        = /DLL</div><div class='ctx'> QMAKE_LFLAGS_LTCG       = /LTCG</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf<br/>index ee7b99a..fd115e7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/win32-msvc2008/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/win32-msvc2008/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/win32-msvc2008/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/win32-msvc2008/qmake.conf</a></div><div class='hunk'>@@ -1,14 +1,14 @@</div><div class='ctx'> #</div><div class='ctx'> # qmake configuration for win32-msvc2008</div><div class='ctx'> #</div><div class='del'>-# Written for Microsoft VC2005.NET</div><div class='add'>+# Written for Microsoft Visual C++ 2008</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> MAKEFILE_GENERATOR      = MSVC.NET</div><div class='ctx'> TEMPLATE                = app</div><div class='ctx'> CONFIG                  += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source copy_dir_files debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe</div><div class='ctx'> QT                      += core gui</div><div class='del'>-DEFINES                 += UNICODE WIN32 QT_LARGEFILE_SUPPORT</div><div class='add'>+DEFINES                 += UNICODE WIN32 QT_LARGEFILE_SUPPORT _BIND_TO_CURRENT_VCLIBS_VERSION=1</div><div class='ctx'> QMAKE_COMPILER_DEFINES  += _MSC_VER=1500 WIN32</div><div class='ctx'> </div><div class='ctx'> QMAKE_CC                = cl</div><div class='hunk'>@@ -55,12 +55,13 @@ QMAKE_RUN_CXX_IMP       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $&lt;</div><div class='ctx'> QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @&lt;&lt;</div><div class='ctx'> </div><div class='ctx'> QMAKE_LINK              = link</div><div class='del'>-QMAKE_LFLAGS            = /NOLOGO</div><div class='add'>+QMAKE_LFLAGS            = /NOLOGO /DYNAMICBASE /NXCOMPAT</div><div class='ctx'> QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO</div><div class='ctx'> QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF</div><div class='ctx'> QMAKE_LFLAGS_DEBUG      = /DEBUG</div><div class='ctx'> QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE</div><div class='del'>-QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"</div><div class='add'>+QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS</div><div class='add'>+QMAKE_LFLAGS_EXE        = \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"</div><div class='ctx'> QMAKE_LFLAGS_DLL        = /DLL</div><div class='ctx'> QMAKE_LFLAGS_LTCG       = /LTCG</div><div class='ctx'> </div><div class='head'>diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf<br/>index 44e460e..1cad99e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/mkspecs/win32-msvc2010/qmake.conf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>mkspecs/win32-msvc2010/qmake.conf</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/mkspecs/win32-msvc2010/qmake.conf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>mkspecs/win32-msvc2010/qmake.conf</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> #</div><div class='ctx'> # qmake configuration for win32-msvc2010</div><div class='ctx'> #</div><div class='del'>-# Written for Microsoft VC2005.NET</div><div class='add'>+# Written for Microsoft Visual C++ 2010</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> MAKEFILE_GENERATOR      = MSBUILD</div><div class='hunk'>@@ -55,12 +55,13 @@ QMAKE_RUN_CXX_IMP       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $&lt;</div><div class='ctx'> QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @&lt;&lt;</div><div class='ctx'> </div><div class='ctx'> QMAKE_LINK              = link</div><div class='del'>-QMAKE_LFLAGS            = /NOLOGO</div><div class='add'>+QMAKE_LFLAGS            = /NOLOGO /DYNAMICBASE /NXCOMPAT</div><div class='ctx'> QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO</div><div class='ctx'> QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF</div><div class='ctx'> QMAKE_LFLAGS_DEBUG      = /DEBUG</div><div class='ctx'> QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE</div><div class='del'>-QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"</div><div class='add'>+QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS</div><div class='add'>+QMAKE_LFLAGS_EXE        = \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"</div><div class='ctx'> QMAKE_LFLAGS_DLL        = /DLL</div><div class='ctx'> QMAKE_LFLAGS_LTCG       = /LTCG</div><div class='ctx'> </div><div class='head'>diff --git a/projects.pro b/projects.pro<br/>index 02bf61d..bf4dc5e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/projects.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>projects.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/projects.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>projects.pro</a></div><div class='hunk'>@@ -45,12 +45,8 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {</div><div class='ctx'>     } else:isEqual(PROJECT, docs) {</div><div class='ctx'>        contains(QT_BUILD_PARTS, tools):include(doc/doc.pri)</div><div class='ctx'>     } else:isEqual(PROJECT, translations) {</div><div class='del'>-       contains(QT_BUILD_PARTS, tools) {</div><div class='del'>-          include(translations/translations.pri)  # ts targets</div><div class='del'>-       } else {</div><div class='del'>-          !wince*:SUBDIRS += tools/linguist/lrelease</div><div class='del'>-       }</div><div class='del'>-       SUBDIRS += translations                    # qm build step</div><div class='add'>+       !contains(QT_BUILD_PARTS, tools):!wince*:SUBDIRS += tools/linguist/lrelease</div><div class='add'>+       SUBDIRS += translations</div><div class='ctx'>     } else:isEqual(PROJECT, qmake) {</div><div class='ctx'> #      SUBDIRS += qmake</div><div class='ctx'>     } else {</div><div class='head'>diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix<br/>index d941dc4..9dbe035 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/Makefile.unix?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/Makefile.unix</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/Makefile.unix?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/Makefile.unix</a></div><div class='hunk'>@@ -11,16 +11,18 @@ OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o  \</div><div class='ctx'>      meta.o makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \</div><div class='ctx'>      borland_bmake.o msvc_vcproj.o msvc_vcxproj.o msvc_nmake.o msvc_objectmodel.o msbuild_objectmodel.o \</div><div class='ctx'>      symmake.o initprojectdeploy_symbian.o symmake_abld.o symmake_sbsv2.o \</div><div class='del'>-     symbiancommon.o registry.o epocroot.o</div><div class='add'>+     symbiancommon.o registry.o epocroot.o gbuild.o</div><div class='ctx'> </div><div class='ctx'> #qt code</div><div class='ctx'> QOBJS=qtextcodec.o qutfcodec.o qstring.o qtextstream.o qiodevice.o qmalloc.o qglobal.o \</div><div class='ctx'>       qbytearray.o qbytearraymatcher.o qdatastream.o qbuffer.o qlist.o qfile.o \</div><div class='del'>-      qfsfileengine_unix.o qfsfileengine_iterator_unix.o qfsfileengine.o \</div><div class='add'>+      qfilesystementry.o qfilesystemengine_unix.o qfilesystemengine.o qfilesystemiterator_unix.o \</div><div class='add'>+      qfsfileengine_unix.o qfsfileengine.o \</div><div class='ctx'>       qfsfileengine_iterator.o qregexp.o qvector.o qbitarray.o qdir.o qdiriterator.o quuid.o qhash.o \</div><div class='ctx'>       qfileinfo.o qdatetime.o qstringlist.o qabstractfileengine.o qtemporaryfile.o \</div><div class='del'>-      qmap.o qmetatype.o qsettings.o qlibraryinfo.o qvariant.o qvsnprintf.o \</div><div class='del'>-      qlocale.o qlinkedlist.o qurl.o qnumeric.o qcryptographichash.o qxmlstream.o qxmlutils.o \</div><div class='add'>+      qmap.o qmetatype.o qsettings.o qsystemerror.o qlibraryinfo.o qvariant.o qvsnprintf.o \</div><div class='add'>+      qlocale.o qlocale_tools.o qlocale_unix.o qlinkedlist.o qurl.o qnumeric.o qcryptographichash.o \</div><div class='add'>+      qxmlstream.o qxmlutils.o \</div><div class='ctx'>       $(QTOBJS)</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -37,6 +39,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge</div><div class='ctx'> 	   $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp \</div><div class='ctx'> 	   generators/symbian/symmake_abld.cpp generators/symbian/symmake_sbsv2.cpp \</div><div class='ctx'>            generaters/symbian/symbiancommon.cpp \</div><div class='add'>+	   generators/integrity/gbuild.cpp \</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp \</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/tools/qstring.cpp $(SOURCE_PATH)/src/corelib/io/qfile.cpp \</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp \</div><div class='hunk'>@@ -44,8 +47,11 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/global/qglobal.cpp $(SOURCE_PATH)/src/corelib/tools/qregexp.cpp \</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/tools/qbytearray.cpp $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp \</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/io/qdatastream.cpp $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp \</div><div class='add'>+	   $(SOURCE_PATH)/src/corelib/io/qfilesystementry.cpp $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_unix.cpp \</div><div class='add'>+	   $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_mac.cpp \</div><div class='add'>+	   $(SOURCE_PATH)/src/corelib/io/qfilesystemengine.cpp $(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_unix.cpp \</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp \</div><div class='del'>-	   $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_unix.cpp $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp \</div><div class='add'>+	   $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp \</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp $(SOURCE_PATH)/src/corelib/tools/qlist.cpp \</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/tools/qvector.cpp $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp \</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/io/qdiriterator.cpp \</div><div class='hunk'>@@ -53,7 +59,10 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp \</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp $(SOURCE_PATH)/src/corelib/tools/qmap.cpp \</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/global/qconfig.cpp $(SOURCE_PATH)/src/corelib/io/qurl.cpp \</div><div class='del'>-	   $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp \</div><div class='add'>+	   $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp \</div><div class='add'>+	   $(SOURCE_PATH)/src/corelib/tools/qlocale_tools.cpp \</div><div class='add'>+	   $(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp \</div><div class='add'>+	   $(SOURCE_PATH)/src/corelib/tools/qlinkedlist.cpp \</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/tools/qhash.cpp $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp \</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp \</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/io/qsettings.cpp $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp \</div><div class='hunk'>@@ -61,9 +70,11 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/tools/qvsnprintf.cpp $(SOURCE_PATH)/src/corelib/global/qnumeric.cpp \</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp \</div><div class='ctx'> 	   $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp \</div><div class='add'>+	   $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp \</div><div class='ctx'> 	   $(QTSRCS)</div><div class='ctx'> </div><div class='del'>-CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \</div><div class='add'>+CPPFLAGS = -g -I. -Igenerators -Igenerators/unix -Igenerators/win32 \</div><div class='add'>+           -Igenerators/mac -Igenerators/symbian -Igenerators/integrity \</div><div class='ctx'> 	   -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \</div><div class='ctx'> 	   -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \</div><div class='ctx'> 	   -I$(SOURCE_PATH)/tools/shared \</div><div class='hunk'>@@ -71,7 +82,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/ma</div><div class='ctx'> 	   -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DQLIBRARYINFO_EPOCROOT \</div><div class='ctx'> 	   -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \</div><div class='ctx'> 	   -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \</div><div class='del'>-           -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS)</div><div class='add'>+           -DQT_NO_GEOM_VARIANT -DQT_NO_DEPRECATED $(OPENSOURCE_CXXFLAGS)</div><div class='ctx'> </div><div class='ctx'> CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)</div><div class='ctx'> </div><div class='hunk'>@@ -100,6 +111,9 @@ qvariant.o: $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp</div><div class='ctx'> qsettings.o: $(SOURCE_PATH)/src/corelib/io/qsettings.cpp</div><div class='ctx'> 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qsettings.cpp</div><div class='ctx'> </div><div class='add'>+qsystemerror.o: $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp</div><div class='add'>+	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp</div><div class='add'>+</div><div class='ctx'> qlibraryinfo.o: $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp</div><div class='ctx'> 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp</div><div class='ctx'> </div><div class='hunk'>@@ -148,6 +162,12 @@ qstring.o: $(SOURCE_PATH)/src/corelib/tools/qstring.cpp</div><div class='ctx'> qlocale.o: $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp</div><div class='ctx'> 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp</div><div class='ctx'> </div><div class='add'>+qlocale_tools.o: $(SOURCE_PATH)/src/corelib/tools/qlocale_tools.cpp</div><div class='add'>+	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale_tools.cpp</div><div class='add'>+</div><div class='add'>+qlocale_unix.o: $(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp</div><div class='add'>+	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp</div><div class='add'>+</div><div class='ctx'> qdatastream.o: $(SOURCE_PATH)/src/corelib/io/qdatastream.cpp</div><div class='ctx'> 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qdatastream.cpp</div><div class='ctx'> </div><div class='hunk'>@@ -160,6 +180,21 @@ qlist.o: $(SOURCE_PATH)/src/corelib/tools/qlist.cpp</div><div class='ctx'> qfile.o: $(SOURCE_PATH)/src/corelib/io/qfile.cpp</div><div class='ctx'> 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfile.cpp</div><div class='ctx'> </div><div class='add'>+qfilesystementry.o: $(SOURCE_PATH)/src/corelib/io/qfilesystementry.cpp</div><div class='add'>+	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystementry.cpp</div><div class='add'>+</div><div class='add'>+qfilesystemengine.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemengine.cpp</div><div class='add'>+	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystemengine.cpp</div><div class='add'>+</div><div class='add'>+qfilesystemengine_unix.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_unix.cpp</div><div class='add'>+	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_unix.cpp</div><div class='add'>+</div><div class='add'>+qfilesystemengine_mac.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_mac.cpp</div><div class='add'>+	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_mac.cpp</div><div class='add'>+</div><div class='add'>+qfilesystemiterator_unix.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_unix.cpp</div><div class='add'>+	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_unix.cpp</div><div class='add'>+</div><div class='ctx'> qfsfileengine.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp</div><div class='ctx'> 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp</div><div class='ctx'> </div><div class='hunk'>@@ -169,9 +204,6 @@ qfsfileengine_iterator.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.c</div><div class='ctx'> qfsfileengine_unix.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp</div><div class='ctx'> 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp</div><div class='ctx'> </div><div class='del'>-qfsfileengine_iterator_unix.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_unix.cpp</div><div class='del'>-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_unix.cpp</div><div class='del'>-</div><div class='ctx'> qabstractfileengine.o: $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp</div><div class='ctx'> 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp</div><div class='ctx'> </div><div class='hunk'>@@ -298,6 +330,9 @@ registry.o: $(SOURCE_PATH)/tools/shared/windows/registry.cpp</div><div class='ctx'> epocroot.o: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp</div><div class='ctx'> 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp</div><div class='ctx'> </div><div class='add'>+gbuild.o: generators/integrity/gbuild.cpp</div><div class='add'>+	$(CXX) -c -o $@ $(CXXFLAGS) generators/integrity/gbuild.cpp</div><div class='add'>+</div><div class='ctx'> projectgenerator.o: generators/projectgenerator.cpp</div><div class='ctx'> 	$(CXX) -c -o $@ $(CXXFLAGS) generators/projectgenerator.cpp</div><div class='ctx'> </div><div class='head'>diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32<br/>index c04bcb2..6fd3939 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/Makefile.win32?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/Makefile.win32</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/Makefile.win32?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/Makefile.win32</a></div><div class='hunk'>@@ -31,7 +31,7 @@ CFLAGS_EXTRA      = /MP</div><div class='ctx'> CFLAGS_BARE = -c -Fo./ \</div><div class='ctx'>               -W3 -nologo -O2 \</div><div class='ctx'>               $(CFLAGS_EXTRA) \</div><div class='del'>-              -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian \</div><div class='add'>+              -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -Igenerators\symbian -Igenerators\integrity \</div><div class='ctx'>               -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \</div><div class='ctx'>               -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \</div><div class='ctx'>               -I$(BUILD_PATH)\src\corelib\global \</div><div class='hunk'>@@ -62,7 +62,8 @@ OBJS        = project.obj main.obj makefile.obj unixmake.obj unixmake2.obj mingw</div><div class='ctx'>               makefiledeps.obj metamakefile.obj xmloutput.obj pbuilder_pbx.obj \</div><div class='ctx'>               borland_bmake.obj msvc_nmake.obj msvc_vcproj.obj msvc_vcxproj.obj \</div><div class='ctx'>               msvc_objectmodel.obj msbuild_objectmodel.obj symmake.obj initprojectdeploy_symbian.obj \</div><div class='del'>-              symmake_abld.obj symmake_sbsv2.obj symbiancommon.obj registry.obj epocroot.obj</div><div class='add'>+              symmake_abld.obj symmake_sbsv2.obj symbiancommon.obj registry.obj epocroot.obj \</div><div class='add'>+              gbuild.obj</div><div class='ctx'> </div><div class='ctx'> !IFDEF QMAKE_OPENSOURCE_EDITION</div><div class='ctx'> CFLAGS      = $(CFLAGS) -DQMAKE_OPENSOURCE_EDITION</div><div class='hunk'>@@ -73,6 +74,10 @@ QTOBJS= \</div><div class='ctx'> 	qbitarray.obj \</div><div class='ctx'> 	qbuffer.obj \</div><div class='ctx'> 	qcryptographichash.obj \</div><div class='add'>+	qfilesystementry.obj \</div><div class='add'>+	qfilesystemengine.obj \</div><div class='add'>+	qfilesystemengine_win.obj \</div><div class='add'>+	qfilesystemiterator_win.obj \</div><div class='ctx'> 	qfsfileengine.obj \</div><div class='ctx'> 	qfsfileengine_iterator.obj \</div><div class='ctx'> 	qbytearray.obj \</div><div class='hunk'>@@ -86,7 +91,6 @@ QTOBJS= \</div><div class='ctx'> 	qabstractfileengine.obj \</div><div class='ctx'> 	qfsfileengine_win.obj \</div><div class='ctx'> 	qsystemlibrary.obj \</div><div class='del'>-	qfsfileengine_iterator_win.obj \</div><div class='ctx'> 	qfileinfo.obj \</div><div class='ctx'> 	qglobal.obj \</div><div class='ctx'> 	qhash.obj \</div><div class='hunk'>@@ -94,6 +98,8 @@ QTOBJS= \</div><div class='ctx'> 	qlist.obj \</div><div class='ctx'> 	qlinkedlist.obj \</div><div class='ctx'> 	qlocale.obj \</div><div class='add'>+	qlocale_tools.obj \</div><div class='add'>+	qlocale_win.obj \</div><div class='ctx'> 	qmalloc.obj \</div><div class='ctx'> 	qmap.obj \</div><div class='ctx'> 	qregexp.obj \</div><div class='hunk'>@@ -101,6 +107,7 @@ QTOBJS= \</div><div class='ctx'> 	qutfcodec.obj \</div><div class='ctx'> 	qstring.obj \</div><div class='ctx'> 	qstringlist.obj \</div><div class='add'>+	qsystemerror.obj \</div><div class='ctx'> 	qtextstream.obj \</div><div class='ctx'> 	qdatastream.obj \</div><div class='ctx'> 	quuid.obj \</div><div class='hunk'>@@ -165,6 +172,9 @@ qmake_pch.obj:</div><div class='ctx'> {$(SOURCE_PATH)\qmake\generators\symbian}.cpp{}.obj::</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $&lt;</div><div class='ctx'> </div><div class='add'>+{$(SOURCE_PATH)\qmake\generators\integrity}.cpp{}.obj::</div><div class='add'>+	$(CXX) $(CXXFLAGS) $&lt;</div><div class='add'>+</div><div class='ctx'> {$(SOURCE_PATH)\qmake\generators\unix}.cpp{}.obj::</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $&lt;</div><div class='ctx'> </div><div class='head'>diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++<br/>index 5a46e41..d40dc29 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/Makefile.win32-g++?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/Makefile.win32-g++</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/Makefile.win32-g++?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/Makefile.win32-g++</a></div><div class='hunk'>@@ -15,7 +15,7 @@ CXX	    =	g++</div><div class='ctx'> CFLAGS	    =	-c -o$@ -O \</div><div class='ctx'> 		-I. -Igenerators -Igenerators/unix \</div><div class='ctx'> 		-Igenerators/win32 -Igenerators/mac \</div><div class='del'>-		-Igenerators/symbian \</div><div class='add'>+		-Igenerators/symbian -Igenerators/integrity \</div><div class='ctx'> 		-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \</div><div class='ctx'> 		-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \</div><div class='ctx'> 		-I$(BUILD_PATH)/src/corelib/global \</div><div class='hunk'>@@ -39,7 +39,7 @@ OBJS        = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \</div><div class='ctx'>               makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \</div><div class='ctx'>               borland_bmake.o msvc_nmake.o msvc_vcproj.o msvc_vcxproj.o \</div><div class='ctx'>               msvc_objectmodel.o msbuild_objectmodel.o symmake.o initprojectdeploy_symbian.o \</div><div class='del'>-              symmake_abld.o symmake_sbsv2.o symbiancommon.o registry.o epocroot.o</div><div class='add'>+              symmake_abld.o symmake_sbsv2.o symbiancommon.o registry.o epocroot.o gbuild.o</div><div class='ctx'> </div><div class='ctx'> ifdef QMAKE_OPENSOURCE_EDITION</div><div class='ctx'> CFLAGS      += -DQMAKE_OPENSOURCE_EDITION</div><div class='hunk'>@@ -61,10 +61,13 @@ QTOBJS= \</div><div class='ctx'> 	qtemporaryfile.o \</div><div class='ctx'> 	qfileinfo.o \</div><div class='ctx'> 	qabstractfileengine.o \</div><div class='add'>+	qfilesystementry.o \</div><div class='add'>+	qfilesystemengine.o \</div><div class='add'>+	qfilesystemengine_win.o \</div><div class='add'>+	qfilesystemiterator_win.o \</div><div class='ctx'> 	qfsfileengine.o \</div><div class='ctx'> 	qfsfileengine_iterator.o \</div><div class='ctx'> 	qfsfileengine_win.o \</div><div class='del'>-	qfsfileengine_iterator_win.o \</div><div class='ctx'> 	qglobal.o \</div><div class='ctx'> 	qhash.o \</div><div class='ctx'> 	qiodevice.o \</div><div class='hunk'>@@ -72,6 +75,8 @@ QTOBJS= \</div><div class='ctx'> 	qlist.o \</div><div class='ctx'> 	qlinkedlist.o \</div><div class='ctx'> 	qlocale.o \</div><div class='add'>+	qlocale_tools.o \</div><div class='add'>+	qlocale_win.o \</div><div class='ctx'> 	qmalloc.o \</div><div class='ctx'> 	qmap.o \</div><div class='ctx'> 	qregexp.o \</div><div class='hunk'>@@ -79,6 +84,7 @@ QTOBJS= \</div><div class='ctx'> 	qutfcodec.o \</div><div class='ctx'> 	qstring.o \</div><div class='ctx'> 	qstringlist.o \</div><div class='add'>+	qsystemerror.o \</div><div class='ctx'> 	qsystemlibrary.o \</div><div class='ctx'> 	qtextstream.o \</div><div class='ctx'> 	quuid.o \</div><div class='hunk'>@@ -172,6 +178,12 @@ qstring.o: $(SOURCE_PATH)/src/corelib/tools/qstring.cpp</div><div class='ctx'> qlocale.o: $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp</div><div class='ctx'> </div><div class='add'>+qlocale_tools.o: $(SOURCE_PATH)/src/corelib/tools/qlocale_tools.cpp</div><div class='add'>+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale_tools.cpp</div><div class='add'>+</div><div class='add'>+qlocale_win.o: $(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp</div><div class='add'>+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp</div><div class='add'>+</div><div class='ctx'> quuid.o: $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp</div><div class='ctx'> </div><div class='hunk'>@@ -193,12 +205,21 @@ qtemporaryfile.o: $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp</div><div class='ctx'> qabstractfileengine.o: $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp</div><div class='ctx'> </div><div class='add'>+qfilesystementry.o: $(SOURCE_PATH)/src/corelib/io/qfilesystementry.cpp</div><div class='add'>+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystementry.cpp</div><div class='add'>+</div><div class='add'>+qfilesystemengine.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemengine.cpp</div><div class='add'>+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystemengine.cpp</div><div class='add'>+</div><div class='add'>+qfilesystemengine_win.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_win.cpp</div><div class='add'>+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_win.cpp</div><div class='add'>+</div><div class='add'>+qfilesystemiterator_win.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_win.cpp</div><div class='add'>+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_win.cpp</div><div class='add'>+</div><div class='ctx'> qfsfileengine_win.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp</div><div class='ctx'> </div><div class='del'>-qfsfileengine_iterator_win.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_win.cpp</div><div class='del'>-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_win.cpp</div><div class='del'>-</div><div class='ctx'> qfsfileengine.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp</div><div class='ctx'> </div><div class='hunk'>@@ -235,6 +256,9 @@ qdatetime.o: $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp</div><div class='ctx'> qstringlist.o: $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp</div><div class='ctx'> </div><div class='add'>+qsystemerror.o: $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp</div><div class='add'>+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp</div><div class='add'>+</div><div class='ctx'> qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp</div><div class='ctx'> </div><div class='hunk'>@@ -295,6 +319,9 @@ registry.o: $(SOURCE_PATH)/tools/shared/windows/registry.cpp</div><div class='ctx'> epocroot.o: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp</div><div class='ctx'> </div><div class='add'>+gbuild.o: $(SOURCE_PATH)/qmake/generators/integrity/gbuild.cpp</div><div class='add'>+	$(CXX) $(CXXFLAGS) generators/integrity/gbuild.cpp</div><div class='add'>+</div><div class='ctx'> project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) project.cpp</div><div class='ctx'> </div><div class='head'>diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh<br/>index 6ca7514..49ccfbc 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/Makefile.win32-g++-sh?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/Makefile.win32-g++-sh</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/Makefile.win32-g++-sh?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/Makefile.win32-g++-sh</a></div><div class='hunk'>@@ -15,7 +15,7 @@ CXX	    =	g++</div><div class='ctx'> CFLAGS	    =	-c -o$@ -O \</div><div class='ctx'> 		-I. -Igenerators -Igenerators/unix \</div><div class='ctx'> 		-Igenerators/win32 -Igenerators/mac \</div><div class='del'>-		-Igenerators/symbian \</div><div class='add'>+		-Igenerators/symbian -Igenerators/integrity \</div><div class='ctx'> 		-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \</div><div class='ctx'> 		-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \</div><div class='ctx'> 		-I$(BUILD_PATH)/src/corelib/global \</div><div class='hunk'>@@ -39,7 +39,7 @@ OBJS        = project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \</div><div class='ctx'>               makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \</div><div class='ctx'>               borland_bmake.o msvc_nmake.o msvc_vcproj.o msvc_vcxproj.o \</div><div class='ctx'>               msvc_objectmodel.o msbuild_objectmodel.o symmake.o initprojectdeploy_symbian.o \</div><div class='del'>-              symmake_abld.o symmake_sbsv2.o symbiancommon.o registry.o epocroot.o</div><div class='add'>+              symmake_abld.o symmake_sbsv2.o symbiancommon.o registry.o epocroot.o gbuild.o</div><div class='ctx'> </div><div class='ctx'> ifdef QMAKE_OPENSOURCE_EDITION</div><div class='ctx'> CFLAGS      += -DQMAKE_OPENSOURCE_EDITION</div><div class='hunk'>@@ -61,10 +61,13 @@ QTOBJS= \</div><div class='ctx'> 	qtemporaryfile.o \</div><div class='ctx'> 	qfileinfo.o \</div><div class='ctx'> 	qabstractfileengine.o \</div><div class='add'>+	qfilesystementry.o \</div><div class='add'>+	qfilesystemengine.o \</div><div class='add'>+	qfilesystemengine_win.o \</div><div class='add'>+	qfilesystemiterator_win.o \</div><div class='ctx'> 	qfsfileengine.o \</div><div class='ctx'> 	qfsfileengine_iterator.o \</div><div class='ctx'> 	qfsfileengine_win.o \</div><div class='del'>-	qfsfileengine_iterator_win.o \</div><div class='ctx'> 	qglobal.o \</div><div class='ctx'> 	qhash.o \</div><div class='ctx'> 	qiodevice.o \</div><div class='hunk'>@@ -72,6 +75,8 @@ QTOBJS= \</div><div class='ctx'> 	qlist.o \</div><div class='ctx'> 	qlinkedlist.o \</div><div class='ctx'> 	qlocale.o \</div><div class='add'>+	qlocale_tools.o \</div><div class='add'>+	qlocale_win.o \</div><div class='ctx'> 	qmalloc.o \</div><div class='ctx'> 	qmap.o \</div><div class='ctx'> 	qregexp.o \</div><div class='hunk'>@@ -80,6 +85,7 @@ QTOBJS= \</div><div class='ctx'> 	qstring.o \</div><div class='ctx'> 	qstringlist.o \</div><div class='ctx'> 	qsystemlibrary.o \</div><div class='add'>+	qsystemerror.o \</div><div class='ctx'> 	qtextstream.o \</div><div class='ctx'> 	quuid.o \</div><div class='ctx'> 	qvector.o \</div><div class='hunk'>@@ -171,6 +177,12 @@ qstring.o: $(SOURCE_PATH)/src/corelib/tools/qstring.cpp</div><div class='ctx'> qlocale.o: $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp</div><div class='ctx'> </div><div class='add'>+qlocale_tools.o: $(SOURCE_PATH)/src/corelib/tools/qlocale_tools.cpp</div><div class='add'>+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale_tools.cpp</div><div class='add'>+</div><div class='add'>+qlocale_win.o: $(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp</div><div class='add'>+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp</div><div class='add'>+</div><div class='ctx'> quuid.o: $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp</div><div class='ctx'> </div><div class='hunk'>@@ -192,12 +204,21 @@ qtemporaryfile.o: $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp</div><div class='ctx'> qabstractfileengine.o: $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp</div><div class='ctx'> </div><div class='add'>+qfilesystementry.o: $(SOURCE_PATH)/src/corelib/io/qfilesystementry.cpp</div><div class='add'>+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystementry.cpp</div><div class='add'>+</div><div class='add'>+qfilesystemengine.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemengine.cpp</div><div class='add'>+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystemengine.cpp</div><div class='add'>+</div><div class='add'>+qfilesystemengine_win.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_win.cpp</div><div class='add'>+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_win.cpp</div><div class='add'>+</div><div class='add'>+qfilesystemiterator_win.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_win.cpp</div><div class='add'>+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_win.cpp</div><div class='add'>+</div><div class='ctx'> qfsfileengine_win.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp</div><div class='ctx'> </div><div class='del'>-qfsfileengine_iterator_win.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_win.cpp</div><div class='del'>-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_win.cpp</div><div class='del'>-</div><div class='ctx'> qfsfileengine.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp</div><div class='ctx'> </div><div class='hunk'>@@ -234,6 +255,9 @@ qdatetime.o: $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp</div><div class='ctx'> qstringlist.o: $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp</div><div class='ctx'> </div><div class='add'>+qsystemerror.o: $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp</div><div class='add'>+	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp</div><div class='add'>+</div><div class='ctx'> qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp</div><div class='ctx'> </div><div class='hunk'>@@ -294,6 +318,10 @@ registry.o: $(SOURCE_PATH)/tools/shared/windows/registry.cpp</div><div class='ctx'> epocroot.o: $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/tools/shared/symbian/epocroot.cpp</div><div class='ctx'> </div><div class='add'>+gbuild.o: $(SOURCE_PATH)/qmake/generators/integrity/gbuild.cpp</div><div class='add'>+	$(CXX) $(CXXFLAGS) generators/integrity/gbuild.cpp</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> project.o: $(SOURCE_PATH)/qmake/project.cpp $(SOURCE_PATH)/qmake/project.h $(SOURCE_PATH)/qmake/option.h</div><div class='ctx'> 	$(CXX) $(CXXFLAGS) project.cpp</div><div class='ctx'> </div><div class='head'>diff --git a/qmake/cachekeys.h b/qmake/cachekeys.h<br/>index 61030b7..2307150 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/cachekeys.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/cachekeys.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/cachekeys.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/cachekeys.h</a></div><div class='hunk'>@@ -118,60 +118,9 @@ struct FileInfoCacheKey</div><div class='ctx'> inline uint qHash(const FileInfoCacheKey &amp;f) { return f.hashCode(); }</div><div class='ctx'> </div><div class='ctx'> // -------------------------------------------------------------------------------------------------</div><div class='del'>-struct FileFixifyCacheKey</div><div class='del'>-{</div><div class='del'>-    mutable uint hash;</div><div class='del'>-    QString in_d, out_d;</div><div class='del'>-    QString file, pwd;</div><div class='del'>-    uint fixType;</div><div class='del'>-    bool canonicalize;</div><div class='del'>-    FileFixifyCacheKey(const QString &amp;f, const QString &amp;od, const QString &amp;id,</div><div class='del'>-                       uint ft, bool c)</div><div class='del'>-    {</div><div class='del'>-        hash = 0;</div><div class='del'>-        pwd = qmake_getpwd();</div><div class='del'>-        file = f;</div><div class='del'>-        if(od.isNull())</div><div class='del'>-            out_d = Option::output_dir;</div><div class='del'>-        else</div><div class='del'>-            out_d = od;</div><div class='del'>-        if(id.isNull())</div><div class='del'>-            in_d = qmake_getpwd();</div><div class='del'>-        else</div><div class='del'>-            in_d = id;</div><div class='del'>-        fixType = ft;</div><div class='del'>-        canonicalize = c;</div><div class='del'>-    }</div><div class='del'>-    QString toString() const {</div><div class='del'>-        return file + "--" + in_d + "--" + out_d + "--" + pwd + "--" +</div><div class='del'>-            QString::number(fixType) + "--" + QString::number((int)canonicalize);</div><div class='del'>-    }</div><div class='del'>-    bool operator==(const FileFixifyCacheKey &amp;f) const</div><div class='del'>-    {</div><div class='del'>-        return (f.canonicalize == canonicalize &amp;&amp;</div><div class='del'>-                f.fixType == fixType &amp;&amp;</div><div class='del'>-                f.file == file &amp;&amp;</div><div class='del'>-                f.in_d == in_d &amp;&amp;</div><div class='del'>-                f.out_d == out_d &amp;&amp;</div><div class='del'>-                f.pwd == pwd);</div><div class='del'>-    }</div><div class='del'>-    inline uint hashCode() const {</div><div class='del'>-        if(!hash)</div><div class='del'>-            hash = uint(canonicalize) | uint(fixType) |</div><div class='del'>-                   qHash(file) | qHash(in_d) | qHash(out_d) /*|qHash(pwd)*/;</div><div class='del'>-        return hash;</div><div class='del'>-    }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-inline uint qHash(const FileFixifyCacheKey &amp;f) { return f.hashCode(); }</div><div class='del'>-// -------------------------------------------------------------------------------------------------</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+inline void qmakeDeleteCacheClear(void *i) { delete reinterpret_cast&lt;T*&gt;(i); }</div><div class='ctx'> </div><div class='del'>-// As MSVC 6.0 can't handle template functions that well, we need a separate function for each type</div><div class='del'>-inline void qmakeDeleteCacheClear_QMapStringInt(void *i) { delete reinterpret_cast&lt;QMap&lt;QString,int&gt; *&gt;(i); }</div><div class='del'>-inline void qmakeDeleteCacheClear_QStringList(void *i) { delete reinterpret_cast&lt;QStringList *&gt;(i); }</div><div class='del'>-inline void qmakeDeleteCacheClear_QHashFixStringCacheKeyQString(void *i) { delete reinterpret_cast&lt;QHash&lt;FixStringCacheKey, QString&gt; *&gt;(i); }</div><div class='del'>-inline void qmakeDeleteCacheClear_QHashFileInfoCacheKeyQFileInfo(void *i) { delete reinterpret_cast&lt;QHash&lt;FileInfoCacheKey, QFileInfo&gt; *&gt;(i); }</div><div class='del'>-inline void qmakeDeleteCacheClear_QHashFileFixifyCacheKeyQString(void *i) { delete reinterpret_cast&lt;QHash&lt;FileFixifyCacheKey, QString&gt; *&gt;(i); }</div><div class='ctx'> inline void qmakeFreeCacheClear(void *i) { free(i); }</div><div class='ctx'> </div><div class='ctx'> typedef void (*qmakeCacheClearFunc)(void *);</div><div class='head'>diff --git a/qmake/generators/integrity/gbuild.cpp b/qmake/generators/integrity/gbuild.cpp<br/>new file mode 100644<br/>index 0000000..f273237<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/integrity/gbuild.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/integrity/gbuild.cpp</a></div><div class='hunk'>@@ -0,0 +1,442 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtGui module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "gbuild.h"</div><div class='add'>+#include "option.h"</div><div class='add'>+#include "meta.h"</div><div class='add'>+#include &lt;qdir.h&gt;</div><div class='add'>+#include &lt;qregexp.h&gt;</div><div class='add'>+#include &lt;qcryptographichash.h&gt;</div><div class='add'>+#include &lt;qdebug.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;time.h&gt;</div><div class='add'>+#ifdef Q_OS_UNIX</div><div class='add'>+#  include &lt;sys/types.h&gt;</div><div class='add'>+#  include &lt;sys/stat.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+unsigned int dllbase = 0x01000000;</div><div class='add'>+#define DLLOFFSET 0x600000</div><div class='add'>+</div><div class='add'>+GBuildMakefileGenerator::GBuildMakefileGenerator() : MakefileGenerator()</div><div class='add'>+{</div><div class='add'>+    nativebins &lt;&lt; "moc" &lt;&lt; "rcc" &lt;&lt; "uic" &lt;&lt; "bootstrap";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool</div><div class='add'>+GBuildMakefileGenerator::write()</div><div class='add'>+{</div><div class='add'>+    QStringList tmp;</div><div class='add'>+    QString filename(Option::output.fileName());</div><div class='add'>+    QString pathtoremove(qmake_getpwd());</div><div class='add'>+    QString relpath(pathtoremove);</div><div class='add'>+    QString strtarget(project-&gt;first("TARGET"));</div><div class='add'>+    bool isnativebin = nativebins.contains(strtarget);</div><div class='add'>+    relpath.replace(Option::output_dir, "");</div><div class='add'>+</div><div class='add'>+    /* correct output for non-prl, non-recursive case */</div><div class='add'>+    QString outname(qmake_getpwd());</div><div class='add'>+    outname += QDir::separator();</div><div class='add'>+    outname += fileInfo(Option::output.fileName()).baseName();</div><div class='add'>+    outname += projectSuffix();</div><div class='add'>+    Option::output.close();</div><div class='add'>+    Option::output.setFileName(outname);</div><div class='add'>+    MakefileGenerator::openOutput(Option::output, QString());</div><div class='add'>+</div><div class='add'>+    if (strtarget != fileInfo(project-&gt;projectFile()).baseName()) {</div><div class='add'>+        QString gpjname(strtarget);</div><div class='add'>+        QString outputName(qmake_getpwd());</div><div class='add'>+        outputName += QDir::separator();</div><div class='add'>+        outputName += fileInfo(project-&gt;projectFile()).baseName();</div><div class='add'>+        outputName += projectSuffix();</div><div class='add'>+        QFile f(outputName);</div><div class='add'>+        f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);</div><div class='add'>+        QTextStream t(&amp;f);</div><div class='add'>+        t &lt;&lt; "#!gbuild\n";</div><div class='add'>+        t &lt;&lt; "[Project]\n";</div><div class='add'>+        t &lt;&lt; gpjname &lt;&lt; projectSuffix() &lt;&lt; "\n";</div><div class='add'>+        if ((project-&gt;first("TEMPLATE") == "lib")</div><div class='add'>+                &amp;&amp; project-&gt;isActiveConfig("shared"))</div><div class='add'>+            t &lt;&lt; gpjname &lt;&lt; "_shared" &lt;&lt; projectSuffix() &lt;&lt; "\n";</div><div class='add'>+        t.flush();</div><div class='add'>+        gpjname += projectSuffix();</div><div class='add'>+        Option::output.close();</div><div class='add'>+        Option::output.setFileName(gpjname);</div><div class='add'>+        MakefileGenerator::openOutput(Option::output, QString());</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if ((project-&gt;first("TEMPLATE") == "app")</div><div class='add'>+            &amp;&amp; (!isnativebin)) {</div><div class='add'>+        QTextStream t(&amp;Option::output);</div><div class='add'>+        QString intname(strtarget);</div><div class='add'>+        intname += ".int";</div><div class='add'>+        /* this is for bulding an INTEGRITY application.</div><div class='add'>+         * generate the .int integrate file and the .gpj INTEGRITY Application</div><div class='add'>+         * project file, then go on with regular files */</div><div class='add'>+        t &lt;&lt; "#!gbuild" &lt;&lt; "\n";</div><div class='add'>+        t &lt;&lt; "[INTEGRITY Application]" &lt;&lt; "\n";</div><div class='add'>+        t &lt;&lt; "\t:binDirRelative=.\n";</div><div class='add'>+        t &lt;&lt; "\t-o " &lt;&lt; strtarget &lt;&lt; "\n";</div><div class='add'>+        t &lt;&lt; intname &lt;&lt; "\n";</div><div class='add'>+        t &lt;&lt; strtarget &lt;&lt; "_app" &lt;&lt; projectSuffix() &lt;&lt; "\n";</div><div class='add'>+        t.flush();</div><div class='add'>+</div><div class='add'>+        /* generate integrate file */</div><div class='add'>+        QFile f(intname);</div><div class='add'>+        f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);</div><div class='add'>+        QTextStream ti(&amp;f);</div><div class='add'>+        ti &lt;&lt; "# This is a file automatically generated by qmake" &lt;&lt; "\n";</div><div class='add'>+        ti &lt;&lt; "# Modifications will be lost next time you run qmake" &lt;&lt; "\n";</div><div class='add'>+        ti &lt;&lt; "Kernel" &lt;&lt; "\n";</div><div class='add'>+        ti &lt;&lt; "\tFilename\tDynamicDownload" &lt;&lt; "\n";</div><div class='add'>+        ti &lt;&lt; "EndKernel" &lt;&lt; "\n" &lt;&lt; "\n";</div><div class='add'>+        ti &lt;&lt; "AddressSpace" &lt;&lt; "\n";</div><div class='add'>+        ti &lt;&lt; "\tName\t" &lt;&lt; strtarget &lt;&lt; "\n";</div><div class='add'>+        ti &lt;&lt; "\tFilename\t" &lt;&lt; strtarget &lt;&lt; "_app" &lt;&lt; "\n";</div><div class='add'>+        ti &lt;&lt; "\tMemoryPoolSize\t0x100000" &lt;&lt; "\n";</div><div class='add'>+        ti &lt;&lt; "\tLanguage\tC++" &lt;&lt; "\n";</div><div class='add'>+        /* FIXME : heap size is huge to be big enough for every example</div><div class='add'>+         * it should probably be tailored for each example, btu there is no</div><div class='add'>+         * good way to guess that */</div><div class='add'>+        ti &lt;&lt; "\tHeapSize\t0x00D00000" &lt;&lt; "\n";</div><div class='add'>+        ti &lt;&lt; "\tTask\tInitial" &lt;&lt; "\n";</div><div class='add'>+        ti &lt;&lt; "\t\tStackSize\t0x30000" &lt;&lt; "\n";</div><div class='add'>+        ti &lt;&lt; "\tEndTask" &lt;&lt; "\n";</div><div class='add'>+        ti &lt;&lt; "EndAddressSpace" &lt;&lt; "\n";</div><div class='add'>+        ti.flush();</div><div class='add'>+</div><div class='add'>+        /* change current project file to &lt;projectname&gt;_app.gpj and continue</div><div class='add'>+         * generation */</div><div class='add'>+        filename.insert(filename.lastIndexOf("."), "_app");</div><div class='add'>+        Option::output.close();</div><div class='add'>+        Option::output.setFileName(filename);</div><div class='add'>+        MakefileGenerator::openOutput(Option::output, QString());</div><div class='add'>+    } else if ((project-&gt;first("TEMPLATE") == "lib")</div><div class='add'>+            &amp;&amp; project-&gt;isActiveConfig("shared")) {</div><div class='add'>+        QString gpjname(strtarget);</div><div class='add'>+        gpjname += "_shared";</div><div class='add'>+        gpjname += projectSuffix();</div><div class='add'>+        QFile f(gpjname);</div><div class='add'>+        f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);</div><div class='add'>+        QTextStream t(&amp;f);</div><div class='add'>+        t &lt;&lt; "#!gbuild\n"</div><div class='add'>+            "[Program]\n"</div><div class='add'>+            "\t-A libINTEGRITY.so\n"</div><div class='add'>+            "\t-A libc.so\n"</div><div class='add'>+            "\t-A libscxx.so\n"</div><div class='add'>+            "\t-A libQtCore.so\n"</div><div class='add'>+            "\t-e __ghsbegin_text\n"</div><div class='add'>+            "\t-startfile=-\n"</div><div class='add'>+            "\t:syslibraries=-\n"</div><div class='add'>+            "\t-Onolink\n";</div><div class='add'>+        t &lt;&lt; "\t-o lib" &lt;&lt; strtarget &lt;&lt; ".so\n";</div><div class='add'>+        t &lt;&lt; "\t-l" &lt;&lt; strtarget &lt;&lt; "\n";</div><div class='add'>+        t &lt;&lt; "\t-extractall=-l" &lt;&lt; strtarget &lt;&lt; "\n";</div><div class='add'>+        t &lt;&lt; "\t:outputDir=work/" &lt;&lt; filename.section(QDir::separator(), 0, -1).remove(".gpj") &lt;&lt; "\n";</div><div class='add'>+        t &lt;&lt; strtarget &lt;&lt; "_shared.ld\n";</div><div class='add'>+        t &lt;&lt; "$(__OS_DIR)/intlib/sharedobjbssinit.c\n";</div><div class='add'>+        t.flush();</div><div class='add'>+</div><div class='add'>+        QFile fl(strtarget + "_shared.ld");</div><div class='add'>+        fl.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);</div><div class='add'>+        QTextStream tl(&amp;fl);</div><div class='add'>+        tl &lt;&lt; "CONSTANTS {\n"</div><div class='add'>+             "    __INTEGRITY_MinPageAlign          = 16K\n"</div><div class='add'>+             "    __INTEGRITY_MaxPageAlign          = 16K\n"</div><div class='add'>+             "    __INTEGRITY_LibCBaseAddress       = \n";</div><div class='add'>+        tl &lt;&lt; dllbase &lt;&lt; "\n";</div><div class='add'>+        tl &lt;&lt; "}\n"</div><div class='add'>+             "-sec\n"</div><div class='add'>+             "{\n"</div><div class='add'>+             "  .picbase __INTEGRITY_LibCBaseAddress :\n"</div><div class='add'>+             "        .text :\n"</div><div class='add'>+             "  .syscall :\n"</div><div class='add'>+             "        .intercall :\n"</div><div class='add'>+             "        .interfunc :\n"</div><div class='add'>+             "  .secinfo :\n"</div><div class='add'>+             "  .rodata align(16) :\n"</div><div class='add'>+             "  .fixaddr :\n"</div><div class='add'>+             "  .fixtype :\n"</div><div class='add'>+             "        .rombeg :\n"</div><div class='add'>+             "        .textchecksum :\n"</div><div class='add'>+             "        // The above sections may be large. Leave a bigger gap for large pages.\n"</div><div class='add'>+             "  .pidbase align(__INTEGRITY_MaxPageAlign) :\n"</div><div class='add'>+             "        .sdabase :\n"</div><div class='add'>+             "        .data :\n"</div><div class='add'>+             "        .toc :\n"</div><div class='add'>+             "        .opd :\n"</div><div class='add'>+             "        .datachecksum :\n"</div><div class='add'>+             "  .bss align(__INTEGRITY_MinPageAlign) :\n"</div><div class='add'>+             "        .heap :\n"</div><div class='add'>+             "}\n";</div><div class='add'>+        tl.flush();</div><div class='add'>+        dllbase += DLLOFFSET;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    warn_msg(WarnParser, Option::output.fileName().toAscii());</div><div class='add'>+    QTextStream t(&amp;Option::output);</div><div class='add'>+    QString primaryTarget(project-&gt;values("QMAKE_CXX").at(0));</div><div class='add'>+</div><div class='add'>+    pathtoremove += QDir::separator();</div><div class='add'>+    filename.remove(qmake_getpwd());</div><div class='add'>+</div><div class='add'>+    //HEADER</div><div class='add'>+    t &lt;&lt; "#!gbuild" &lt;&lt; "\n";</div><div class='add'>+</div><div class='add'>+    /* find the architecture out of the compiler name */</div><div class='add'>+    if (filename.endsWith("projects.gpj")) {</div><div class='add'>+        primaryTarget.remove(0, 5);</div><div class='add'>+        t &lt;&lt; "macro QT_BUILD_DIR=%expand_path(.)\n";</div><div class='add'>+        t &lt;&lt; "macro __OS_DIR=" &lt;&lt; project-&gt;values("INTEGRITY_DIR").first() &lt;&lt; "\n";</div><div class='add'>+        t &lt;&lt; "primaryTarget=" &lt;&lt; primaryTarget &lt;&lt; "_integrity.tgt" &lt;&lt; "\n";</div><div class='add'>+        t &lt;&lt; "customization=util/integrity/qt.bod\n";</div><div class='add'>+    }</div><div class='add'>+    /* project type */</div><div class='add'>+    if (project-&gt;first("TEMPLATE") == "app") {</div><div class='add'>+        t &lt;&lt; "[Program]" &lt;&lt; "\n";</div><div class='add'>+        if (isnativebin) {</div><div class='add'>+            t &lt;&lt; "\t:binDir=bin\n";</div><div class='add'>+            t &lt;&lt; "\t-o " &lt;&lt; strtarget &lt;&lt; "\n";</div><div class='add'>+        } else {</div><div class='add'>+            t &lt;&lt; "\t:binDirRelative=.\n";</div><div class='add'>+            t &lt;&lt; "\t-o " &lt;&lt; strtarget &lt;&lt; "_app\n";</div><div class='add'>+        }</div><div class='add'>+    } else if (project-&gt;first("TEMPLATE") == "lib") {</div><div class='add'>+        t &lt;&lt; "[Library]" &lt;&lt; "\n";</div><div class='add'>+        t &lt;&lt; "\t:binDir=lib" &lt;&lt; "\n";</div><div class='add'>+        t &lt;&lt; "\t-o lib" &lt;&lt; strtarget &lt;&lt; ".a" &lt;&lt; "\n";</div><div class='add'>+    } else if (project-&gt;first("TEMPLATE") == "subdirs")</div><div class='add'>+        t &lt;&lt; "[Project]" &lt;&lt; "\n";</div><div class='add'>+    else</div><div class='add'>+        t &lt;&lt; project-&gt;first("TEMPLATE") &lt;&lt; "\n";</div><div class='add'>+</div><div class='add'>+    /* compilations options */</div><div class='add'>+    t &lt;&lt; "\t:sourceDir=." &lt;&lt; "\n";</div><div class='add'>+</div><div class='add'>+    t &lt;&lt; "\t:outputDir=work" &lt;&lt; relpath &lt;&lt; "\n";</div><div class='add'>+    if (filename.endsWith("projects.gpj")) {</div><div class='add'>+        t &lt;&lt; "\t:sourceDir=work\n";</div><div class='add'>+        t &lt;&lt; "\t-Iwork\n";</div><div class='add'>+        t &lt;&lt; "\t-Llib\n";</div><div class='add'>+        t &lt;&lt; "\t";</div><div class='add'>+        QStringList &amp;l = project-&gt;values("QMAKE_CXXFLAGS");</div><div class='add'>+        for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {</div><div class='add'>+            if ((*it).startsWith("-"))</div><div class='add'>+                t &lt;&lt; "\n" &lt;&lt; "\t" &lt;&lt; (*it);</div><div class='add'>+            else</div><div class='add'>+                t &lt;&lt; " " &lt;&lt; (*it);</div><div class='add'>+        }</div><div class='add'>+        t &lt;&lt; "\n";</div><div class='add'>+    }</div><div class='add'>+    t &lt;&lt; "\n";</div><div class='add'>+</div><div class='add'>+    t &lt;&lt; varGlue("DEFINES", "\t-D", "\n\t-D", "\n");</div><div class='add'>+</div><div class='add'>+    t &lt;&lt; "\t-I.\n\t-I" &lt;&lt; specdir() &lt;&lt; "\n";</div><div class='add'>+    t &lt;&lt; varGlue("INCLUDEPATH", "\t-I", "\n\t-I", "\n");</div><div class='add'>+    t &lt;&lt; "\t--cxx_include_directory .\n\t--cxx_include_directory " &lt;&lt; specdir() &lt;&lt; "\n";</div><div class='add'>+    t &lt;&lt; varGlue("INCLUDEPATH", "\t--cxx_include_directory ", "\n\t--cxx_include_directory ", "\n");</div><div class='add'>+</div><div class='add'>+    if (project-&gt;first("TEMPLATE") == "app") {</div><div class='add'>+        /* include linker flags if it's an application */</div><div class='add'>+        QString src[] = { "QMAKE_LFLAGS", "QMAKE_FRAMEWORKPATH_FLAGS", "QMAKE_LIBDIR_FLAGS", "QMAKE_LIBS", "LIBS", QString() };</div><div class='add'>+        for (int i = 0; !src[i].isNull(); i++) {</div><div class='add'>+            /* skip target libraries for native tools */</div><div class='add'>+            if (isnativebin &amp;&amp; (i == 0))</div><div class='add'>+                continue;</div><div class='add'>+            t &lt;&lt; "\t";</div><div class='add'>+            QStringList &amp;l = project-&gt;values(src[i]);</div><div class='add'>+            for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {</div><div class='add'>+                if ((*it).startsWith("-"))</div><div class='add'>+                    t &lt;&lt; "\n" &lt;&lt; "\t" &lt;&lt; (*it);</div><div class='add'>+                else</div><div class='add'>+                    t &lt;&lt; " " &lt;&lt; (*it);</div><div class='add'>+            }</div><div class='add'>+            t &lt;&lt; "\n";</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* first subdirectories/subprojects */</div><div class='add'>+    {</div><div class='add'>+        QStringList &amp;l = project-&gt;values("SUBDIRS");</div><div class='add'>+        for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {</div><div class='add'>+            QString gpjname((*it));</div><div class='add'>+            /* avoid native tools */</div><div class='add'>+            if (nativebins.contains(gpjname.section("_", -1)))</div><div class='add'>+                continue;</div><div class='add'>+            if (!project-&gt;first((*it) + ".subdir").isEmpty())</div><div class='add'>+                gpjname = project-&gt;first((*it) + ".subdir");</div><div class='add'>+            else</div><div class='add'>+                gpjname.replace("_", QDir::separator());</div><div class='add'>+            gpjname += QDir::separator() + gpjname.section(QDir::separator(), -1);</div><div class='add'>+            gpjname += projectSuffix();</div><div class='add'>+            /* make relative */</div><div class='add'>+            if (!project-&gt;values("QT_SOURCE_TREE").isEmpty()) {</div><div class='add'>+                gpjname.replace(project-&gt;values("QT_SOURCE_TREE").first() + QDir::separator(), "");</div><div class='add'>+            }</div><div class='add'>+            t &lt;&lt; gpjname &lt;&lt; "\n";</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    {</div><div class='add'>+        QStringList &amp;l = project-&gt;values("RESOURCES");</div><div class='add'>+        for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {</div><div class='add'>+            QString tmpstr((*it).replace(pathtoremove, ""));</div><div class='add'>+            t &lt;&lt; tmpstr &lt;&lt; "\t[Qt Resource]\n";</div><div class='add'>+            tmpstr = tmpstr.section(".", -2, -1).section(QDir::separator(), -1);</div><div class='add'>+            tmpstr.remove(".qrc");</div><div class='add'>+            t &lt;&lt; "\t-name " &lt;&lt; tmpstr &lt;&lt; "\n";</div><div class='add'>+            tmpstr.insert(tmpstr.lastIndexOf(QDir::separator()) + 1, "qrc_");</div><div class='add'>+            tmpstr.append(".cpp");</div><div class='add'>+            t &lt;&lt; "\t-o work/" &lt;&lt; tmpstr &lt;&lt; "\n";</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    {</div><div class='add'>+        QStringList &amp;l = project-&gt;values("FORMS");</div><div class='add'>+        for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {</div><div class='add'>+            QString tmpstr((*it).replace(pathtoremove, ""));</div><div class='add'>+            t &lt;&lt; tmpstr &lt;&lt; "\t[Qt Dialog]\n";</div><div class='add'>+            tmpstr = tmpstr.section(".", 0, 0).section(QDir::separator(), -1);</div><div class='add'>+            tmpstr.insert(tmpstr.lastIndexOf(QDir::separator()) + 1, "ui_");</div><div class='add'>+            tmpstr.remove(".ui");</div><div class='add'>+            tmpstr.append(".h");</div><div class='add'>+            t &lt;&lt; "\t-o work/" &lt;&lt; tmpstr &lt;&lt; "\n";</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* source files for this project */</div><div class='add'>+    QString src[] = { "HEADERS", "SOURCES", QString() };</div><div class='add'>+    for (int i = 0; !src[i].isNull(); i++) {</div><div class='add'>+        QStringList &amp;l = project-&gt;values(src[i]);</div><div class='add'>+        for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {</div><div class='add'>+            if ((*it).isEmpty())</div><div class='add'>+                continue;</div><div class='add'>+            /* native tools aren't preprocessed */</div><div class='add'>+            if (!isnativebin)</div><div class='add'>+                t &lt;&lt; writeOne((*it), pathtoremove);</div><div class='add'>+            else</div><div class='add'>+                t &lt;&lt; (*it).remove(pathtoremove) &lt;&lt; "\n";</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    t &lt;&lt; "\n";</div><div class='add'>+</div><div class='add'>+    {</div><div class='add'>+        QStringList &amp;l = project-&gt;values("GENERATED_SOURCES");</div><div class='add'>+        for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {</div><div class='add'>+            t &lt;&lt; "work/" &lt;&lt; (*it).section(QDir::separator(), -1) &lt;&lt; "\n";</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString GBuildMakefileGenerator::writeOne(QString filename, QString pathtoremove)</div><div class='add'>+{</div><div class='add'>+    QString s("");</div><div class='add'>+    s += filename.remove(pathtoremove);</div><div class='add'>+    if (filename.endsWith(Option::h_ext.first())) {</div><div class='add'>+        QString corename(filename.section(QDir::separator(), -1));</div><div class='add'>+        corename.remove(Option::h_ext.first());</div><div class='add'>+        corename.append(Option::cpp_ext.first());</div><div class='add'>+        corename.prepend(Option::h_moc_mod);</div><div class='add'>+        s += "\t[MOC/Qt Header]\n";</div><div class='add'>+        s += "\t-o ";</div><div class='add'>+        s += "work/";</div><div class='add'>+        s += corename;</div><div class='add'>+        s += "\n";</div><div class='add'>+    } else if (filename.section(QDir::separator(), -1).startsWith("qrc_")) {</div><div class='add'>+        QString tmpstr(filename.section("/", -1).section(".", 0, -1).remove("qrc_").remove(".cpp"));</div><div class='add'>+        s += "\n\t:depends=";</div><div class='add'>+        s += tmpstr;</div><div class='add'>+        s += ".qrc";</div><div class='add'>+        s += "\n";</div><div class='add'>+    } else if (filename.endsWith(Option::cpp_ext.first())) {</div><div class='add'>+        QString tmpstr(filename.section("/", -1));</div><div class='add'>+//        QString moctool(project-&gt;values("QMAKE_MOC").first());</div><div class='add'>+        QString filepath(pathtoremove);</div><div class='add'>+        if (!project-&gt;values("QT_SOURCE_TREE").isEmpty()) {</div><div class='add'>+            filepath.remove(project-&gt;values("QT_SOURCE_TREE").first());</div><div class='add'>+            filepath.remove(0, 1);</div><div class='add'>+        }</div><div class='add'>+//        if (!project-&gt;values("QT_BUILD_TREE").isEmpty()) {</div><div class='add'>+//            moctool.remove(project-&gt;values("QT_BUILD_TREE").first());</div><div class='add'>+//            moctool.remove(0, 1);</div><div class='add'>+//        }</div><div class='add'>+        s += "\n\t:preexecShellSafe='${QT_BUILD_DIR}/bin/moc ";</div><div class='add'>+//        s += moctool;</div><div class='add'>+//        s += " ";</div><div class='add'>+        s += varGlue("DEFINES", "-D", " -D", " ");</div><div class='add'>+        s += varGlue("INCLUDEPATH", "-I", " -I", " ");</div><div class='add'>+        s += filepath;</div><div class='add'>+        s += filename;</div><div class='add'>+        s += " -o ";</div><div class='add'>+        tmpstr.replace(Option::cpp_ext.first(), Option::cpp_moc_ext);</div><div class='add'>+        s += "work/";</div><div class='add'>+        s += tmpstr;</div><div class='add'>+        s += "\n";</div><div class='add'>+    } else</div><div class='add'>+        s += "\n";</div><div class='add'>+    return s;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool</div><div class='add'>+GBuildMakefileGenerator::openOutput(QFile &amp;file, const QString &amp;build) const</div><div class='add'>+{</div><div class='add'>+    debug_msg(1, "file is %s", file.fileName().toLatin1().constData());</div><div class='add'>+    QFileInfo fi(file);</div><div class='add'>+    if (fi.filePath().isEmpty())</div><div class='add'>+        file.setFileName(qmake_getpwd() + QDir::separator() + file.fileName());</div><div class='add'>+    if (!file.fileName().endsWith(projectSuffix())) {</div><div class='add'>+        QString outputName(file.fileName());</div><div class='add'>+        outputName += QDir::separator();</div><div class='add'>+        outputName += fileInfo(project-&gt;projectFile()).baseName();</div><div class='add'>+        outputName += projectSuffix();</div><div class='add'>+        warn_msg(WarnParser, outputName.toAscii());</div><div class='add'>+        file.setFileName(outputName);</div><div class='add'>+    }</div><div class='add'>+    debug_msg(1, "file is %s", file.fileName().toLatin1().constData());</div><div class='add'>+    bool ret = MakefileGenerator::openOutput(file, QString());</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='head'>diff --git a/qmake/generators/integrity/gbuild.h b/qmake/generators/integrity/gbuild.h<br/>new file mode 100644<br/>index 0000000..0927a2e<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/integrity/gbuild.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/integrity/gbuild.h</a></div><div class='hunk'>@@ -0,0 +1,74 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtGui module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef GBUILD_H</div><div class='add'>+#define GBUILD_H</div><div class='add'>+</div><div class='add'>+#include "makefile.h"</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+class GBuildMakefileGenerator : public MakefileGenerator</div><div class='add'>+{</div><div class='add'>+    virtual bool write();</div><div class='add'>+</div><div class='add'>+    QString projectSuffix() const { return QString(".gpj"); };</div><div class='add'>+    QString writeOne(QString filename, QString pathtoremove = "");</div><div class='add'>+</div><div class='add'>+public:</div><div class='add'>+    GBuildMakefileGenerator();</div><div class='add'>+    ~GBuildMakefileGenerator();</div><div class='add'>+</div><div class='add'>+    virtual bool supportsMetaBuild() { return false; }</div><div class='add'>+    virtual bool openOutput(QFile &amp;, const QString &amp;) const;</div><div class='add'>+protected:</div><div class='add'>+    bool doPrecompiledHeaders() const { return false; }</div><div class='add'>+    virtual bool doDepends() const { return true; }</div><div class='add'>+    QStringList nativebins;</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+inline GBuildMakefileGenerator::~GBuildMakefileGenerator()</div><div class='add'>+{ }</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+#endif // GBUILD_H</div><div class='head'>diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp<br/>index 24ae8ed..b7aec00 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/mac/pbuilder_pbx.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/mac/pbuilder_pbx.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/mac/pbuilder_pbx.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/mac/pbuilder_pbx.cpp</a></div><div class='hunk'>@@ -167,6 +167,7 @@ ProjectBuilderMakefileGenerator::writeSubDirs(QTextStream &amp;t)</div><div class='ctx'>                 }</div><div class='ctx'>                 if(tmp_proj.read(fn)) {</div><div class='ctx'>                     if(Option::debug_level) {</div><div class='add'>+                        debug_msg(1, "Dumping all variables:");</div><div class='ctx'>                         QMap&lt;QString, QStringList&gt; &amp;vars = tmp_proj.variables();</div><div class='ctx'>                         for(QMap&lt;QString, QStringList&gt;::Iterator it = vars.begin();</div><div class='ctx'>                             it != vars.end(); ++it) {</div><div class='hunk'>@@ -1271,6 +1272,8 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &amp;t)</div><div class='ctx'>                     plist_in_text = plist_in_text.replace("@EXECUTABLE@", project-&gt;first("QMAKE_ORIG_TARGET"));</div><div class='ctx'>                 } else {</div><div class='ctx'>                     plist_in_text = plist_in_text.replace("@LIBRARY@", project-&gt;first("QMAKE_ORIG_TARGET"));</div><div class='add'>+                }</div><div class='add'>+                if (!project-&gt;values("VERSION").isEmpty()) {</div><div class='ctx'>                     plist_in_text = plist_in_text.replace("@SHORT_VERSION@", project-&gt;first("VER_MAJ") + "." +</div><div class='ctx'>                                                           project-&gt;first("VER_MIN"));</div><div class='ctx'>                 }</div><div class='head'>diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp<br/>index 80c31e3..00f6b4a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/makefile.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/makefile.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/makefile.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/makefile.cpp</a></div><div class='hunk'>@@ -1486,18 +1486,20 @@ MakefileGenerator::createObjectList(const QStringList &amp;sources)</div><div class='ctx'> </div><div class='ctx'> ReplaceExtraCompilerCacheKey::ReplaceExtraCompilerCacheKey(const QString &amp;v, const QStringList &amp;i, const QStringList &amp;o)</div><div class='ctx'> {</div><div class='add'>+    static QString doubleColon = QLatin1String("::");</div><div class='add'>+</div><div class='ctx'>     hash = 0;</div><div class='ctx'>     pwd = qmake_getpwd();</div><div class='ctx'>     var = v;</div><div class='ctx'>     {</div><div class='ctx'>         QStringList il = i;</div><div class='ctx'>         il.sort();</div><div class='del'>-        in = il.join("::");</div><div class='add'>+        in = il.join(doubleColon);</div><div class='ctx'>     }</div><div class='ctx'>     {</div><div class='ctx'>         QStringList ol = o;</div><div class='ctx'>         ol.sort();</div><div class='del'>-        out = ol.join("::");</div><div class='add'>+        out = ol.join(doubleColon);</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2374,6 +2376,14 @@ MakefileGenerator::writeSubDirs(QTextStream &amp;t)</div><div class='ctx'>     qDeleteAll(targets);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void MakefileGenerator::writeSubMakeCall(QTextStream &amp;t, const QString &amp;callPrefix,</div><div class='add'>+                                         const QString &amp;makeArguments, const QString &amp;callPostfix)</div><div class='add'>+{</div><div class='add'>+    t &lt;&lt; callPrefix</div><div class='add'>+      &lt;&lt; "$(MAKE)" &lt;&lt; makeArguments</div><div class='add'>+      &lt;&lt; callPostfix &lt;&lt; endl;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void</div><div class='ctx'> MakefileGenerator::writeSubTargets(QTextStream &amp;t, QList&lt;MakefileGenerator::SubTarget*&gt; targets, int flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -2497,9 +2507,7 @@ MakefileGenerator::writeSubTargets(QTextStream &amp;t, QList&lt;MakefileGenerator::SubT</div><div class='ctx'>                 t &lt;&lt; " " &lt;&lt; valList(subtarget-&gt;depends);</div><div class='ctx'>             if(project-&gt;isEmpty("QMAKE_NOFORCE"))</div><div class='ctx'>                 t &lt;&lt;  " FORCE";</div><div class='del'>-            t &lt;&lt; out_directory_cdin</div><div class='del'>-              &lt;&lt; "$(MAKE)" &lt;&lt; makefilein</div><div class='del'>-              &lt;&lt; out_directory_cdout &lt;&lt; endl;</div><div class='add'>+            writeSubMakeCall(t, out_directory_cdin, makefilein, out_directory_cdout);</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         for(int suffix = 0; suffix &lt; targetSuffixes.size(); ++suffix) {</div><div class='hunk'>@@ -2519,9 +2527,7 @@ MakefileGenerator::writeSubTargets(QTextStream &amp;t, QList&lt;MakefileGenerator::SubT</div><div class='ctx'>                     t &lt;&lt; " " &lt;&lt; targets.at(target-1)-&gt;target &lt;&lt; "-" &lt;&lt; targetSuffixes.at(suffix) &lt;&lt; "-ordered ";</div><div class='ctx'>                 if(project-&gt;isEmpty("QMAKE_NOFORCE"))</div><div class='ctx'>                     t &lt;&lt;  " FORCE";</div><div class='del'>-                t &lt;&lt; out_directory_cdin</div><div class='del'>-                  &lt;&lt; "$(MAKE)" &lt;&lt; makefilein &lt;&lt; " " &lt;&lt; s</div><div class='del'>-                  &lt;&lt; out_directory_cdout &lt;&lt; endl;</div><div class='add'>+                writeSubMakeCall(t, out_directory_cdin,  makefilein + " " + s, out_directory_cdout);</div><div class='ctx'>             }</div><div class='ctx'>             t &lt;&lt; subtarget-&gt;target &lt;&lt; "-" &lt;&lt; targetSuffixes.at(suffix) &lt;&lt; ": " &lt;&lt; mkfile;</div><div class='ctx'>             if(!subtarget-&gt;depends.isEmpty())</div><div class='hunk'>@@ -2529,9 +2535,7 @@ MakefileGenerator::writeSubTargets(QTextStream &amp;t, QList&lt;MakefileGenerator::SubT</div><div class='ctx'>                                     "-"+targetSuffixes.at(suffix));</div><div class='ctx'>             if(project-&gt;isEmpty("QMAKE_NOFORCE"))</div><div class='ctx'>                 t &lt;&lt;  " FORCE";</div><div class='del'>-            t &lt;&lt; out_directory_cdin</div><div class='del'>-              &lt;&lt; "$(MAKE)" &lt;&lt; makefilein &lt;&lt; " " &lt;&lt; s</div><div class='del'>-              &lt;&lt; out_directory_cdout &lt;&lt; endl;</div><div class='add'>+            writeSubMakeCall(t, out_directory_cdin, makefilein + " " + s, out_directory_cdout);</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'>     t &lt;&lt; endl;</div><div class='hunk'>@@ -2639,10 +2643,7 @@ MakefileGenerator::writeSubTargets(QTextStream &amp;t, QList&lt;MakefileGenerator::SubT</div><div class='ctx'>                 QString out_directory_cdin, out_directory_cdout;</div><div class='ctx'>                 MAKE_CD_IN_AND_OUT(out_directory);</div><div class='ctx'> </div><div class='del'>-                //don't need the makefile arg if it isn't changed</div><div class='del'>-                QString makefilein;</div><div class='del'>-                if(subtarget-&gt;makefile != "$(MAKEFILE)")</div><div class='del'>-                    makefilein = " -f " + subtarget-&gt;makefile;</div><div class='add'>+                QString makefilein = " -f " + subtarget-&gt;makefile;</div><div class='ctx'> </div><div class='ctx'>                 //write the rule/depends</div><div class='ctx'>                 if(flags &amp; SubTargetOrdered) {</div><div class='hunk'>@@ -2665,12 +2666,10 @@ MakefileGenerator::writeSubTargets(QTextStream &amp;t, QList&lt;MakefileGenerator::SubT</div><div class='ctx'> </div><div class='ctx'>                 //write the commands</div><div class='ctx'>                 if(!out_directory.isEmpty()) {</div><div class='del'>-                    t &lt;&lt; out_directory_cdin</div><div class='del'>-                      &lt;&lt; "$(MAKE)" &lt;&lt; makefilein &lt;&lt; " " &lt;&lt; sub_targ</div><div class='del'>-                      &lt;&lt; out_directory_cdout &lt;&lt; endl;</div><div class='add'>+                    writeSubMakeCall(t, out_directory_cdin, makefilein + " " + sub_targ,</div><div class='add'>+                                     out_directory_cdout);</div><div class='ctx'>                 } else {</div><div class='del'>-                    t &lt;&lt; "\n\t"</div><div class='del'>-                      &lt;&lt; "$(MAKE)" &lt;&lt; makefilein &lt;&lt; " " &lt;&lt; sub_targ &lt;&lt; endl;</div><div class='add'>+                    writeSubMakeCall(t, "\n\t", makefilein + " " + sub_targ, QString());</div><div class='ctx'>                 }</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='hunk'>@@ -2739,7 +2738,7 @@ MakefileGenerator::fileInfo(QString file) const</div><div class='ctx'>     static QFileInfo noInfo = QFileInfo();</div><div class='ctx'>     if(!cache) {</div><div class='ctx'>         cache = new QHash&lt;FileInfoCacheKey, QFileInfo&gt;;</div><div class='del'>-        qmakeAddCacheClear(qmakeDeleteCacheClear_QHashFileInfoCacheKeyQFileInfo, (void**)&amp;cache);</div><div class='add'>+        qmakeAddCacheClear(qmakeDeleteCacheClear&lt;QHash&lt;FileInfoCacheKey, QFileInfo&gt; &gt;, (void**)&amp;cache);</div><div class='ctx'>     }</div><div class='ctx'>     FileInfoCacheKey cacheKey(file);</div><div class='ctx'>     QFileInfo value = cache-&gt;value(cacheKey, noInfo);</div><div class='hunk'>@@ -2814,17 +2813,6 @@ MakefileGenerator::fileFixify(const QString&amp; file, const QString &amp;out_d, const Q</div><div class='ctx'>         return file;</div><div class='ctx'>     QString ret = unescapeFilePath(file);</div><div class='ctx'> </div><div class='del'>-    //setup the cache</div><div class='del'>-    static QHash&lt;FileFixifyCacheKey, QString&gt; *cache = 0;</div><div class='del'>-    if(!cache) {</div><div class='del'>-        cache = new QHash&lt;FileFixifyCacheKey, QString&gt;;</div><div class='del'>-        qmakeAddCacheClear(qmakeDeleteCacheClear_QHashFileFixifyCacheKeyQString, (void**)&amp;cache);</div><div class='del'>-    }</div><div class='del'>-    FileFixifyCacheKey cacheKey(ret, out_d, in_d, fix, canon);</div><div class='del'>-    QString cacheVal = cache-&gt;value(cacheKey);</div><div class='del'>-    if(!cacheVal.isNull())</div><div class='del'>-        return cacheVal;</div><div class='del'>-</div><div class='ctx'>     //do the fixin'</div><div class='ctx'>     QString orig_file = ret;</div><div class='ctx'>     if(ret.startsWith(QLatin1Char('~'))) {</div><div class='hunk'>@@ -2911,7 +2899,6 @@ MakefileGenerator::fileFixify(const QString&amp; file, const QString &amp;out_d, const Q</div><div class='ctx'>     debug_msg(3, "Fixed[%d,%d] %s :: to :: %s [%s::%s] [%s::%s]", fix, canon, orig_file.toLatin1().constData(),</div><div class='ctx'>               ret.toLatin1().constData(), in_d.toLatin1().constData(), out_d.toLatin1().constData(),</div><div class='ctx'>               qmake_getpwd().toLatin1().constData(), Option::output_dir.toLatin1().constData());</div><div class='del'>-    cache-&gt;insert(cacheKey, ret);</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3126,4 +3113,182 @@ MakefileGenerator::openOutput(QFile &amp;file, const QString &amp;build) const</div><div class='ctx'>     return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+QString</div><div class='add'>+MakefileGenerator::pkgConfigFileName(bool fixify)</div><div class='add'>+{</div><div class='add'>+    QString ret = var("TARGET");</div><div class='add'>+    int slsh = ret.lastIndexOf(Option::dir_sep);</div><div class='add'>+    if(slsh != -1)</div><div class='add'>+        ret = ret.right(ret.length() - slsh - 1);</div><div class='add'>+    if(ret.startsWith("lib"))</div><div class='add'>+        ret = ret.mid(3);</div><div class='add'>+    int dot = ret.indexOf('.');</div><div class='add'>+    if(dot != -1)</div><div class='add'>+        ret = ret.left(dot);</div><div class='add'>+    ret += Option::pkgcfg_ext;</div><div class='add'>+    QString subdir = project-&gt;first("QMAKE_PKGCONFIG_DESTDIR");</div><div class='add'>+    if(!subdir.isEmpty()) {</div><div class='add'>+        // initOutPaths() appends dir_sep, but just to be safe..</div><div class='add'>+        if (!subdir.endsWith(Option::dir_sep))</div><div class='add'>+            ret.prepend(Option::dir_sep);</div><div class='add'>+        ret.prepend(subdir);</div><div class='add'>+    }</div><div class='add'>+    if(fixify) {</div><div class='add'>+        if(QDir::isRelativePath(ret) &amp;&amp; !project-&gt;isEmpty("DESTDIR"))</div><div class='add'>+            ret.prepend(project-&gt;first("DESTDIR"));</div><div class='add'>+        ret = Option::fixPathToLocalOS(fileFixify(ret, qmake_getpwd(), Option::output_dir));</div><div class='add'>+    }</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString</div><div class='add'>+MakefileGenerator::pkgConfigPrefix() const</div><div class='add'>+{</div><div class='add'>+    if(!project-&gt;isEmpty("QMAKE_PKGCONFIG_PREFIX"))</div><div class='add'>+        return project-&gt;first("QMAKE_PKGCONFIG_PREFIX");</div><div class='add'>+    return QLibraryInfo::location(QLibraryInfo::PrefixPath);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString</div><div class='add'>+MakefileGenerator::pkgConfigFixPath(QString path) const</div><div class='add'>+{</div><div class='add'>+    QString prefix = pkgConfigPrefix();</div><div class='add'>+    if(path.startsWith(prefix))</div><div class='add'>+        path = path.replace(prefix, "${prefix}");</div><div class='add'>+    return path;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+MakefileGenerator::writePkgConfigFile()</div><div class='add'>+{</div><div class='add'>+    QString fname = pkgConfigFileName(), lname = fname;</div><div class='add'>+    mkdir(fileInfo(fname).path());</div><div class='add'>+    int slsh = lname.lastIndexOf(Option::dir_sep);</div><div class='add'>+    if(slsh != -1)</div><div class='add'>+        lname = lname.right(lname.length() - slsh - 1);</div><div class='add'>+    QFile ft(fname);</div><div class='add'>+    if(!ft.open(QIODevice::WriteOnly))</div><div class='add'>+        return;</div><div class='add'>+    project-&gt;values("ALL_DEPS").append(fileFixify(fname));</div><div class='add'>+    QTextStream t(&amp;ft);</div><div class='add'>+</div><div class='add'>+    QString prefix = pkgConfigPrefix();</div><div class='add'>+    QString libDir = project-&gt;first("QMAKE_PKGCONFIG_LIBDIR");</div><div class='add'>+    if(libDir.isEmpty())</div><div class='add'>+        libDir = prefix + Option::dir_sep + "lib" + Option::dir_sep;</div><div class='add'>+    QString includeDir = project-&gt;first("QMAKE_PKGCONFIG_INCDIR");</div><div class='add'>+    if(includeDir.isEmpty())</div><div class='add'>+        includeDir = prefix + "/include";</div><div class='add'>+</div><div class='add'>+    t &lt;&lt; "prefix=" &lt;&lt; prefix &lt;&lt; endl;</div><div class='add'>+    t &lt;&lt; "exec_prefix=${prefix}\n"</div><div class='add'>+      &lt;&lt; "libdir=" &lt;&lt; pkgConfigFixPath(libDir) &lt;&lt; "\n"</div><div class='add'>+      &lt;&lt; "includedir=" &lt;&lt; pkgConfigFixPath(includeDir) &lt;&lt; endl;</div><div class='add'>+    // non-standard entry. Provides useful info normally only</div><div class='add'>+    // contained in the internal .qmake.cache file</div><div class='add'>+    t &lt;&lt; varGlue("CONFIG", "qt_config=", " ", "") &lt;&lt; endl;</div><div class='add'>+</div><div class='add'>+    //extra PKGCONFIG variables</div><div class='add'>+    const QStringList &amp;pkgconfig_vars = project-&gt;values("QMAKE_PKGCONFIG_VARIABLES");</div><div class='add'>+    for(int i = 0; i &lt; pkgconfig_vars.size(); ++i) {</div><div class='add'>+        QString var = project-&gt;first(pkgconfig_vars.at(i) + ".name"),</div><div class='add'>+                val = project-&gt;values(pkgconfig_vars.at(i) + ".value").join(" ");</div><div class='add'>+        if(var.isEmpty())</div><div class='add'>+            continue;</div><div class='add'>+        if(val.isEmpty()) {</div><div class='add'>+            const QStringList &amp;var_vars = project-&gt;values(pkgconfig_vars.at(i) + ".variable");</div><div class='add'>+            for(int v = 0; v &lt; var_vars.size(); ++v) {</div><div class='add'>+                const QStringList &amp;vars = project-&gt;values(var_vars.at(v));</div><div class='add'>+                for(int var = 0; var &lt; vars.size(); ++var) {</div><div class='add'>+                    if(!val.isEmpty())</div><div class='add'>+                        val += " ";</div><div class='add'>+                    val += pkgConfigFixPath(vars.at(var));</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        t &lt;&lt; var &lt;&lt; "=" &lt;&lt; val &lt;&lt; endl;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    t &lt;&lt; endl;</div><div class='add'>+</div><div class='add'>+    QString name = project-&gt;first("QMAKE_PKGCONFIG_NAME");</div><div class='add'>+    if(name.isEmpty()) {</div><div class='add'>+        name = project-&gt;first("QMAKE_ORIG_TARGET").toLower();</div><div class='add'>+        name.replace(0, 1, name[0].toUpper());</div><div class='add'>+    }</div><div class='add'>+    t &lt;&lt; "Name: " &lt;&lt; name &lt;&lt; endl;</div><div class='add'>+    QString desc = project-&gt;values("QMAKE_PKGCONFIG_DESCRIPTION").join(" ");</div><div class='add'>+    if(desc.isEmpty()) {</div><div class='add'>+        if(name.isEmpty()) {</div><div class='add'>+            desc = project-&gt;first("QMAKE_ORIG_TARGET").toLower();</div><div class='add'>+            desc.replace(0, 1, desc[0].toUpper());</div><div class='add'>+        } else {</div><div class='add'>+            desc = name;</div><div class='add'>+        }</div><div class='add'>+        if(project-&gt;first("TEMPLATE") == "lib") {</div><div class='add'>+            if(project-&gt;isActiveConfig("plugin"))</div><div class='add'>+               desc += " Plugin";</div><div class='add'>+            else</div><div class='add'>+               desc += " Library";</div><div class='add'>+        } else if(project-&gt;first("TEMPLATE") == "app") {</div><div class='add'>+            desc += " Application";</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    t &lt;&lt; "Description: " &lt;&lt; desc &lt;&lt; endl;</div><div class='add'>+    t &lt;&lt; "Version: " &lt;&lt; project-&gt;first("VERSION") &lt;&lt; endl;</div><div class='add'>+</div><div class='add'>+    // libs</div><div class='add'>+    t &lt;&lt; "Libs: ";</div><div class='add'>+    QString pkgConfiglibDir;</div><div class='add'>+    QString pkgConfiglibName;</div><div class='add'>+    if (Option::target_mode == Option::TARG_MACX_MODE &amp;&amp; project-&gt;isActiveConfig("lib_bundle")) {</div><div class='add'>+        pkgConfiglibDir = "-F${libdir}";</div><div class='add'>+        QString bundle;</div><div class='add'>+        if (!project-&gt;isEmpty("QMAKE_FRAMEWORK_BUNDLE_NAME"))</div><div class='add'>+            bundle = unescapeFilePath(project-&gt;first("QMAKE_FRAMEWORK_BUNDLE_NAME"));</div><div class='add'>+        else</div><div class='add'>+            bundle = unescapeFilePath(project-&gt;first("TARGET"));</div><div class='add'>+        int suffix = bundle.lastIndexOf(".framework");</div><div class='add'>+        if (suffix != -1)</div><div class='add'>+            bundle = bundle.left(suffix);</div><div class='add'>+        pkgConfiglibName = "-framework " + bundle + " ";</div><div class='add'>+    } else {</div><div class='add'>+        pkgConfiglibDir = "-L${libdir}";</div><div class='add'>+        pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());</div><div class='add'>+    }</div><div class='add'>+    t &lt;&lt; pkgConfiglibDir &lt;&lt; " " &lt;&lt; pkgConfiglibName &lt;&lt; " " &lt;&lt; endl;</div><div class='add'>+</div><div class='add'>+    QStringList libs;</div><div class='add'>+    if(!project-&gt;isEmpty("QMAKE_INTERNAL_PRL_LIBS")) {</div><div class='add'>+        libs = project-&gt;values("QMAKE_INTERNAL_PRL_LIBS");</div><div class='add'>+    } else {</div><div class='add'>+        libs &lt;&lt; "QMAKE_LIBS"; //obvious one</div><div class='add'>+    }</div><div class='add'>+    libs &lt;&lt; "QMAKE_LIBS_PRIVATE";</div><div class='add'>+    libs &lt;&lt; "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?</div><div class='add'>+    t &lt;&lt; "Libs.private: ";</div><div class='add'>+    for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it) {</div><div class='add'>+        t &lt;&lt; project-&gt;values((*it)).join(" ") &lt;&lt; " ";</div><div class='add'>+    }</div><div class='add'>+    t &lt;&lt; endl;</div><div class='add'>+</div><div class='add'>+    // flags</div><div class='add'>+    // ### too many</div><div class='add'>+    t &lt;&lt; "Cflags: "</div><div class='add'>+        // &lt;&lt; var("QMAKE_CXXFLAGS") &lt;&lt; " "</div><div class='add'>+      &lt;&lt; varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")</div><div class='add'>+      &lt;&lt; project-&gt;values("PRL_EXPORT_CXXFLAGS").join(" ")</div><div class='add'>+      &lt;&lt; project-&gt;values("QMAKE_PKGCONFIG_CFLAGS").join(" ")</div><div class='add'>+        //      &lt;&lt; varGlue("DEFINES","-D"," -D"," ")</div><div class='add'>+      &lt;&lt; " -I${includedir}" &lt;&lt; endl;</div><div class='add'>+</div><div class='add'>+    // requires</div><div class='add'>+    const QString requires = project-&gt;values("QMAKE_PKGCONFIG_REQUIRES").join(" ");</div><div class='add'>+    if (!requires.isEmpty()) {</div><div class='add'>+        t &lt;&lt; "Requires: " &lt;&lt; requires &lt;&lt; endl;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    t &lt;&lt; endl;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h<br/>index 4167ecb..245d95e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/makefile.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/makefile.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/makefile.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/makefile.h</a></div><div class='hunk'>@@ -105,6 +105,11 @@ protected:</div><div class='ctx'>     virtual bool writeStubMakefile(QTextStream &amp;t);</div><div class='ctx'>     virtual bool writeMakefile(QTextStream &amp;t);</div><div class='ctx'> </div><div class='add'>+    QString pkgConfigPrefix() const;</div><div class='add'>+    QString pkgConfigFileName(bool fixify=true);</div><div class='add'>+    QString pkgConfigFixPath(QString) const;</div><div class='add'>+    void writePkgConfigFile();   // for pkg-config</div><div class='add'>+</div><div class='ctx'>     //generating subtarget makefiles</div><div class='ctx'>     struct SubTarget</div><div class='ctx'>     {</div><div class='hunk'>@@ -122,6 +127,8 @@ protected:</div><div class='ctx'>         SubTargetsNoFlags=0x00</div><div class='ctx'>     };</div><div class='ctx'>     QList&lt;MakefileGenerator::SubTarget*&gt; findSubDirsSubTargets() const;</div><div class='add'>+    virtual void writeSubMakeCall(QTextStream &amp;t, const QString &amp;outDirectory_cdin,</div><div class='add'>+                                  const QString &amp;makeFileIn, const QString &amp;outDirectory_cdout);</div><div class='ctx'>     void writeSubTargets(QTextStream &amp;t, QList&lt;SubTarget*&gt; subtargets, int flags);</div><div class='ctx'> </div><div class='ctx'>     //extra compiler interface</div><div class='head'>diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp<br/>index c0bc92f..db9e195 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/metamakefile.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/metamakefile.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/metamakefile.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/metamakefile.cpp</a></div><div class='hunk'>@@ -138,12 +138,12 @@ BuildsMetaMakefileGenerator::init()</div><div class='ctx'>         Build *build = new Build;</div><div class='ctx'>         build-&gt;name = name;</div><div class='ctx'>         build-&gt;makefile = createMakefileGenerator(project, false);</div><div class='del'>-	if (build-&gt;makefile){</div><div class='add'>+        if (build-&gt;makefile){</div><div class='ctx'>             makefiles += build;</div><div class='del'>-	}else {</div><div class='del'>-	    delete build;</div><div class='del'>-	    return false;</div><div class='del'>-	}</div><div class='add'>+        }else {</div><div class='add'>+            delete build;</div><div class='add'>+            return false;</div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='ctx'>     return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -179,7 +179,7 @@ BuildsMetaMakefileGenerator::write(const QString &amp;oldpwd)</div><div class='ctx'>                     using_stdout = true;</div><div class='ctx'>                 } else {</div><div class='ctx'>                     if(Option::output.fileName().isEmpty() &amp;&amp;</div><div class='del'>-		       Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE)</div><div class='add'>+                       Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE)</div><div class='ctx'>                         Option::output.setFileName(project-&gt;first("QMAKE_MAKEFILE"));</div><div class='ctx'>                     Option::output_dir = oldpwd;</div><div class='ctx'>                     QString build_name = build-&gt;name;</div><div class='hunk'>@@ -217,6 +217,7 @@ BuildsMetaMakefileGenerator::write(const QString &amp;oldpwd)</div><div class='ctx'> </div><div class='ctx'>         // debugging</div><div class='ctx'>         if(Option::debug_level) {</div><div class='add'>+            debug_msg(1, "Dumping all variables:");</div><div class='ctx'>             QMap&lt;QString, QStringList&gt; &amp;vars = project-&gt;variables();</div><div class='ctx'>             for(QMap&lt;QString, QStringList&gt;::Iterator it = vars.begin(); it != vars.end(); ++it) {</div><div class='ctx'>                 if(!it.key().startsWith(".") &amp;&amp; !it.value().isEmpty())</div><div class='hunk'>@@ -305,7 +306,7 @@ SubdirsMetaMakefileGenerator::init()</div><div class='ctx'>                        &amp;&amp; project-&gt;isRecursive());</div><div class='ctx'>     if(recurse) {</div><div class='ctx'>         QString old_output_dir = Option::output_dir;</div><div class='del'>-	QString old_output = Option::output.fileName();</div><div class='add'>+        QString old_output = Option::output.fileName();</div><div class='ctx'>         QString oldpwd = qmake_getpwd();</div><div class='ctx'>         QString thispwd = oldpwd;</div><div class='ctx'>         if(!thispwd.endsWith('/'))</div><div class='hunk'>@@ -386,7 +387,7 @@ SubdirsMetaMakefileGenerator::init()</div><div class='ctx'>     self-&gt;input_dir = qmake_getpwd();</div><div class='ctx'>     self-&gt;output_dir = Option::output_dir;</div><div class='ctx'>     if(!recurse || (!Option::output.fileName().endsWith(Option::dir_sep) &amp;&amp; !QFileInfo(Option::output).isDir()))</div><div class='del'>-	self-&gt;output_file = Option::output.fileName();</div><div class='add'>+        self-&gt;output_file = Option::output.fileName();</div><div class='ctx'>     self-&gt;makefile = new BuildsMetaMakefileGenerator(project, name, false);</div><div class='ctx'>     self-&gt;makefile-&gt;init();</div><div class='ctx'>     subs.append(self);</div><div class='hunk'>@@ -419,10 +420,10 @@ SubdirsMetaMakefileGenerator::write(const QString &amp;oldpwd)</div><div class='ctx'>             writepwd = oldpwd;</div><div class='ctx'>         if(!(ret = subs.at(i)-&gt;makefile-&gt;write(writepwd)))</div><div class='ctx'>             break;</div><div class='del'>-	//restore because I'm paranoid</div><div class='add'>+        //restore because I'm paranoid</div><div class='ctx'>         qmake_setpwd(pwd);</div><div class='del'>-	Option::output.setFileName(output_name);</div><div class='del'>-	Option::output_dir = output_dir;</div><div class='add'>+        Option::output.setFileName(output_name);</div><div class='add'>+        Option::output_dir = output_dir;</div><div class='ctx'>     }</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -447,6 +448,7 @@ QT_BEGIN_INCLUDE_NAMESPACE</div><div class='ctx'> #include "symmake_abld.h"</div><div class='ctx'> #include "symmake_sbsv2.h"</div><div class='ctx'> #include "symbian_makefile.h"</div><div class='add'>+#include "gbuild.h"</div><div class='ctx'> QT_END_INCLUDE_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> MakefileGenerator *</div><div class='hunk'>@@ -490,6 +492,8 @@ MetaMakefileGenerator::createMakefileGenerator(QMakeProject *proj, bool noIO)</div><div class='ctx'>         mkfile = new SymbianMakefileTemplate&lt;UnixMakefileGenerator&gt;;</div><div class='ctx'>     } else if(gen == "SYMBIAN_MINGW") {</div><div class='ctx'>         mkfile = new SymbianMakefileTemplate&lt;MingwMakefileGenerator&gt;;</div><div class='add'>+    } else if(gen == "GBUILD") {</div><div class='add'>+        mkfile = new GBuildMakefileGenerator;</div><div class='ctx'>     } else {</div><div class='ctx'>         fprintf(stderr, "Unknown generator specified: %s\n", gen.toLatin1().constData());</div><div class='ctx'>     }</div><div class='hunk'>@@ -555,6 +559,9 @@ MetaMakefileGenerator::modesForGenerator(const QString &amp;gen,</div><div class='ctx'>         *host_mode = Option::HOST_WIN_MODE;</div><div class='ctx'> #endif</div><div class='ctx'>         *target_mode = Option::TARG_SYMBIAN_MODE;</div><div class='add'>+    } else if (gen == "GBUILD") {</div><div class='add'>+        *host_mode = Option::HOST_UNIX_MODE;</div><div class='add'>+        *target_mode = Option::TARG_INTEGRITY_MODE;</div><div class='ctx'>     } else {</div><div class='ctx'>         fprintf(stderr, "Unknown generator specified: %s\n", gen.toLatin1().constData());</div><div class='ctx'>         return false;</div><div class='head'>diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp<br/>index 896c40a..6b7a061 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/symbian/initprojectdeploy_symbian.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/symbian/initprojectdeploy_symbian.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/symbian/initprojectdeploy_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/symbian/initprojectdeploy_symbian.cpp</a></div><div class='hunk'>@@ -169,9 +169,7 @@ void initProjectDeploySymbian(QMakeProject* project,</div><div class='ctx'>                               QStringList&amp; generatedDirs,</div><div class='ctx'>                               QStringList&amp; generatedFiles)</div><div class='ctx'> {</div><div class='del'>-    QString targetPath = project-&gt;values("deploy.path").join(" ");</div><div class='del'>-    if (targetPath.isEmpty())</div><div class='del'>-        targetPath = testPath;</div><div class='add'>+    QString targetPath = testPath;</div><div class='ctx'>     if (targetPath.endsWith("/") || targetPath.endsWith("\\"))</div><div class='ctx'>         targetPath = targetPath.mid(0, targetPath.size() - 1);</div><div class='ctx'> </div><div class='hunk'>@@ -225,7 +223,10 @@ void initProjectDeploySymbian(QMakeProject* project,</div><div class='ctx'>         } else {</div><div class='ctx'>             if (0 == platform.compare(QLatin1String(EMULATOR_DEPLOYMENT_PLATFORM))) {</div><div class='ctx'>                 if (devicePathHasDriveLetter) {</div><div class='del'>-                    devicePath = qt_epocRoot() + "epoc32/winscw/" + devicePath.remove(1, 1);</div><div class='add'>+                    if (devicePath.startsWith("!"))</div><div class='add'>+                        devicePath = qt_epocRoot() + "epoc32/winscw/c" + devicePath.remove(0, 2);</div><div class='add'>+                    else</div><div class='add'>+                        devicePath = qt_epocRoot() + "epoc32/winscw/" + devicePath.remove(1, 1);</div><div class='ctx'>                 } else {</div><div class='ctx'>                     devicePath = qt_epocRoot() + "epoc32/winscw/c" + devicePath;</div><div class='ctx'>                 }</div><div class='hunk'>@@ -255,7 +256,8 @@ void initProjectDeploySymbian(QMakeProject* project,</div><div class='ctx'> </div><div class='ctx'>         QStringList flags = project-&gt;values(item + ".flags");</div><div class='ctx'> </div><div class='del'>-        foreach(QString source, project-&gt;values(item + ".sources")) {</div><div class='add'>+        // ### Qt 5: remove .sources, inconsistent with INSTALLS</div><div class='add'>+        foreach(QString source, project-&gt;values(item + ".sources") + project-&gt;values(item + ".files")) {</div><div class='ctx'>             source = Option::fixPathToLocalOS(source);</div><div class='ctx'>             QString nameFilter;</div><div class='ctx'>             QFileInfo info(source);</div><div class='head'>diff --git a/qmake/generators/symbian/symbian_makefile.h b/qmake/generators/symbian/symbian_makefile.h<br/>index bf2b01c..90044e0 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/symbian/symbian_makefile.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/symbian/symbian_makefile.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/symbian/symbian_makefile.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/symbian/symbian_makefile.h</a></div><div class='hunk'>@@ -72,7 +72,9 @@ public:</div><div class='ctx'>         } else {</div><div class='ctx'>             const QStringList deployments = this-&gt;project-&gt;values("DEPLOYMENT");</div><div class='ctx'>             for (int i = 0; i &lt; deployments.count(); ++i) {</div><div class='del'>-                if (!this-&gt;project-&gt;values(deployments.at(i) + ".sources").isEmpty()) {</div><div class='add'>+                // ### Qt 5: remove .sources, inconsistent with INSTALLS</div><div class='add'>+                if (!this-&gt;project-&gt;values(deployments.at(i) + ".sources").isEmpty() ||</div><div class='add'>+                    !this-&gt;project-&gt;values(deployments.at(i) + ".files").isEmpty()) {</div><div class='ctx'>                     generatePkg = true;</div><div class='ctx'>                     break;</div><div class='ctx'>                 }</div><div class='head'>diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp<br/>index 8f3bf64..a0a8eea 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/symbian/symbiancommon.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/symbian/symbiancommon.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/symbian/symbiancommon.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/symbian/symbiancommon.cpp</a></div><div class='hunk'>@@ -396,8 +396,8 @@ void SymbianCommonGenerator::generatePkgFile(const QString &amp;iconFile,</div><div class='ctx'> </div><div class='ctx'>     if (symbianLocalizationList.size()) {</div><div class='ctx'>         // Add localized resources to DEPLOYMENT if default resource deployment is done</div><div class='del'>-        addLocalizedResourcesToDeployment("default_resource_deployment.sources", symbianLocalizationList);</div><div class='del'>-        addLocalizedResourcesToDeployment("default_reg_deployment.sources", symbianLocalizationList);</div><div class='add'>+        addLocalizedResourcesToDeployment("default_resource_deployment.files", symbianLocalizationList);</div><div class='add'>+        addLocalizedResourcesToDeployment("default_reg_deployment.files", symbianLocalizationList);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     // deploy files specified by DEPLOYMENT variable</div><div class='head'>diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp<br/>index b1d52fe..bdba329 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/symbian/symmake.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/symbian/symmake.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/symbian/symmake.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/symbian/symmake.cpp</a></div><div class='hunk'>@@ -203,7 +203,9 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &amp;t)</div><div class='ctx'>         generatePkg = true;</div><div class='ctx'>     } else {</div><div class='ctx'>         foreach(QString item, project-&gt;values("DEPLOYMENT")) {</div><div class='del'>-            if (!project-&gt;values(item + ".sources").isEmpty()) {</div><div class='add'>+            // ### Qt 5: remove .sources, inconsistent with INSTALLS</div><div class='add'>+            if (!project-&gt;values(item + ".sources").isEmpty() ||</div><div class='add'>+                !project-&gt;values(item + ".files").isEmpty()) {</div><div class='ctx'>                 generatePkg = true;</div><div class='ctx'>                 break;</div><div class='ctx'>             }</div><div class='hunk'>@@ -572,7 +574,30 @@ void SymbianMakefileGenerator::writeMmpFileMacrosPart(QTextStream&amp; t)</div><div class='ctx'> </div><div class='ctx'> void SymbianMakefileGenerator::addMacro(QTextStream&amp; t, const QString&amp; value)</div><div class='ctx'> {</div><div class='del'>-    t &lt;&lt; "MACRO\t\t" &lt;&lt;  value &lt;&lt; endl;</div><div class='add'>+    // String macros for Makefile based platforms are defined like this in pro files:</div><div class='add'>+    //</div><div class='add'>+    //   DEFINES += VERSION_STRING=\\\"1.2.3\\\"</div><div class='add'>+    //</div><div class='add'>+    // This will not work in *.mmp files, which don't need double escaping, and</div><div class='add'>+    // will therefore result in a VERSION_STRING value of \"1.2.3\" instead of "1.2.3".</div><div class='add'>+    // Improve cross platform support by removing one level of escaping from all</div><div class='add'>+    // DEFINES values.</div><div class='add'>+    static QChar backslash = QLatin1Char('\\');</div><div class='add'>+    QString fixedValue;</div><div class='add'>+    fixedValue.reserve(value.size());</div><div class='add'>+    int pos = 0;</div><div class='add'>+    int prevPos = 0;</div><div class='add'>+    while (pos &lt; value.size()) {</div><div class='add'>+        if (value.at(pos) == backslash) {</div><div class='add'>+            fixedValue += value.mid(prevPos, pos - prevPos);</div><div class='add'>+            pos++;</div><div class='add'>+            prevPos = pos;</div><div class='add'>+        }</div><div class='add'>+        pos++;</div><div class='add'>+    }</div><div class='add'>+    fixedValue += value.mid(prevPos);</div><div class='add'>+</div><div class='add'>+    t &lt;&lt; "MACRO\t\t" &lt;&lt; fixedValue &lt;&lt; endl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -715,25 +740,13 @@ void SymbianMakefileGenerator::writeMmpFileLibraryPart(QTextStream&amp; t)</div><div class='ctx'>         if (lib.startsWith("-l")) {</div><div class='ctx'>             lib.remove(0, 2);</div><div class='ctx'>             QString mmpStatement;</div><div class='del'>-            if (lib.endsWith(".dll")) {</div><div class='del'>-                lib.chop(4);</div><div class='del'>-                mmpStatement = "LIBRARY\t\t";</div><div class='del'>-            } else if (lib.endsWith(".lib")) {</div><div class='add'>+            if (lib.endsWith(".lib")) {</div><div class='ctx'>                 lib.chop(4);</div><div class='ctx'>                 mmpStatement = "STATICLIBRARY\t";</div><div class='ctx'>             } else {</div><div class='del'>-                // Hacky way to find out what kind of library it is. Check the</div><div class='del'>-                // ARMV5 build directory for library type. We default to shared</div><div class='del'>-                // library, since that is more common.</div><div class='del'>-                QString udebStaticLibLocation(qt_epocRoot());</div><div class='del'>-                QString urelStaticLibLocation(udebStaticLibLocation);</div><div class='del'>-                udebStaticLibLocation += QString("epoc32/release/armv5/udeb/%1.lib").arg(lib);</div><div class='del'>-                urelStaticLibLocation += QString("epoc32/release/armv5/urel/%1.lib").arg(lib);</div><div class='del'>-                if (QFile::exists(udebStaticLibLocation) || QFile::exists(urelStaticLibLocation)) {</div><div class='del'>-                    mmpStatement = "STATICLIBRARY\t";</div><div class='del'>-                } else {</div><div class='del'>-                    mmpStatement = "LIBRARY\t\t";</div><div class='del'>-                }</div><div class='add'>+                if (lib.endsWith(".dll"))</div><div class='add'>+                    lib.chop(4);</div><div class='add'>+                mmpStatement = "LIBRARY\t\t";</div><div class='ctx'>             }</div><div class='ctx'>             t &lt;&lt; mmpStatement &lt;&lt;  lib &lt;&lt; ".lib" &lt;&lt; endl;</div><div class='ctx'>         }</div><div class='head'>diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp<br/>index ad25e8a..78a9024 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/symbian/symmake_sbsv2.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/symbian/symmake_sbsv2.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/symbian/symmake_sbsv2.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/symbian/symmake_sbsv2.cpp</a></div><div class='hunk'>@@ -84,6 +84,12 @@ static void fixFlmCmd(QString *cmdLine, const QMap&lt;QString, QString&gt; &amp;commandsTo</div><div class='ctx'>     // separator, so replace it with "&amp;&amp;" command concatenator.</div><div class='ctx'>     cmdLine-&gt;replace("\n\t", "&amp;&amp;");</div><div class='ctx'> </div><div class='add'>+    // Strip output suppression, as sbsv2 can't handle it in FLMs. Cannot be done by simply</div><div class='add'>+    // adding "@" to commandsToReplace, as it'd get handled last due to alphabetical ordering,</div><div class='add'>+    // potentially masking other commands that need replacing.</div><div class='add'>+    if (cmdLine-&gt;contains("@"))</div><div class='add'>+        cmdLine-&gt;replace(QRegExp(cmdFind.arg("@")), cmdReplace.arg(""));</div><div class='add'>+</div><div class='ctx'>     // Iterate command replacements in reverse alphabetical order of keys so</div><div class='ctx'>     // that keys which are starts of other longer keys are iterated after longer keys.</div><div class='ctx'>     QMapIterator&lt;QString, QString&gt; cmdIter(commandsToReplace);</div><div class='hunk'>@@ -563,12 +569,27 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream&amp; t</div><div class='ctx'>     exportFlm();</div><div class='ctx'> </div><div class='ctx'>     // Parse extra compilers data</div><div class='add'>+    QStringList rawDefines;</div><div class='ctx'>     QStringList defines;</div><div class='ctx'>     QStringList incPath;</div><div class='ctx'> </div><div class='del'>-    defines &lt;&lt; varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")</div><div class='del'>-            &lt;&lt; varGlue("QMAKE_COMPILER_DEFINES", "-D", "-D", " ")</div><div class='del'>-            &lt;&lt; varGlue("DEFINES","-D"," -D","");</div><div class='add'>+    rawDefines &lt;&lt; project-&gt;values("PRL_EXPORT_DEFINES")</div><div class='add'>+               &lt;&lt; project-&gt;values("QMAKE_COMPILER_DEFINES")</div><div class='add'>+               &lt;&lt; project-&gt;values("DEFINES");</div><div class='add'>+</div><div class='add'>+    // Remove defines containing doubly-escaped characters (e.g. escaped double-quotation mark</div><div class='add'>+    // inside a string define) as bld.inf parsing done by sbsv2 toolchain breaks if they are</div><div class='add'>+    // present.</div><div class='add'>+    static QString backslashes = QLatin1String("\\\\");</div><div class='add'>+    QMutableStringListIterator i(rawDefines);</div><div class='add'>+    while (i.hasNext()) {</div><div class='add'>+        QString val = i.next();</div><div class='add'>+        if (val.indexOf(backslashes) != -1)</div><div class='add'>+            i.remove();</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    defines &lt;&lt; valGlue(rawDefines,"-D"," -D","");</div><div class='add'>+</div><div class='ctx'>     for (QMap&lt;QString, QStringList&gt;::iterator it = systeminclude.begin(); it != systeminclude.end(); ++it) {</div><div class='ctx'>         QStringList values = it.value();</div><div class='ctx'>         for (int i = 0; i &lt; values.size(); ++i) {</div><div class='head'>diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp<br/>index bbddc5e..272f565 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/unix/unixmake.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/unix/unixmake.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/unix/unixmake.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/unix/unixmake.cpp</a></div><div class='hunk'>@@ -148,6 +148,8 @@ UnixMakefileGenerator::init()</div><div class='ctx'>                 project-&gt;values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATH") + libdirs[i];</div><div class='ctx'>             if (project-&gt;isActiveConfig("rvct_linker")) {</div><div class='ctx'>                 project-&gt;values("QMAKE_LIBDIR_FLAGS") += "--userlibpath " + escapeFilePath(libdirs[i]);</div><div class='add'>+            } else if (project-&gt;isActiveConfig("armcc_linker")) {</div><div class='add'>+                project-&gt;values("QMAKE_LIBDIR_FLAGS") += "-L--userlibpath=" + escapeFilePath(libdirs[i]);</div><div class='ctx'>             } else {</div><div class='ctx'>                 project-&gt;values("QMAKE_LIBDIR_FLAGS") += "-L" + escapeFilePath(libdirs[i]);</div><div class='ctx'>             }</div><div class='hunk'>@@ -206,6 +208,33 @@ UnixMakefileGenerator::init()</div><div class='ctx'>                 // icc style</div><div class='ctx'>                 pchFlags = pchFlags.replace("${QMAKE_PCH_OUTPUT}",</div><div class='ctx'>                                             pchBaseName + project-&gt;first("QMAKE_PCH_OUTPUT_EXT"));</div><div class='add'>+            } else {</div><div class='add'>+                // gcc style (including clang_pch_style)</div><div class='add'>+                QString headerPrefix = project-&gt;first("QMAKE_PRECOMP_PREFIX");</div><div class='add'>+                QString headerSuffix;</div><div class='add'>+                if (project-&gt;isActiveConfig("clang_pch_style"))</div><div class='add'>+                    headerSuffix = project-&gt;first("QMAKE_PCH_OUTPUT_EXT");</div><div class='add'>+                else</div><div class='add'>+                    pchBaseName += project-&gt;first("QMAKE_PCH_OUTPUT_EXT");</div><div class='add'>+</div><div class='add'>+                pchBaseName += Option::dir_sep;</div><div class='add'>+                QString pchOutputFile;</div><div class='add'>+</div><div class='add'>+                if(comps[i] == "C") {</div><div class='add'>+                    pchOutputFile = "c";</div><div class='add'>+                } else if(comps[i] == "CXX") {</div><div class='add'>+                    pchOutputFile = "c++";</div><div class='add'>+                } else if(project-&gt;isActiveConfig("objective_c")) {</div><div class='add'>+                    if(comps[i] == "OBJC")</div><div class='add'>+                        pchOutputFile = "objective-c";</div><div class='add'>+                    else if(comps[i] == "OBJCXX")</div><div class='add'>+                        pchOutputFile = "objective-c++";</div><div class='add'>+                }</div><div class='add'>+</div><div class='add'>+                if(!pchOutputFile.isEmpty()) {</div><div class='add'>+                    pchFlags = pchFlags.replace("${QMAKE_PCH_OUTPUT}",</div><div class='add'>+                            pchBaseName + pchOutputFile + headerSuffix);</div><div class='add'>+                }</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'>             if (!pchFlags.isEmpty())</div><div class='hunk'>@@ -379,7 +408,9 @@ QStringList</div><div class='ctx'>         QString header_prefix;</div><div class='ctx'>         if(!project-&gt;isEmpty("PRECOMPILED_DIR"))</div><div class='ctx'>             header_prefix = project-&gt;first("PRECOMPILED_DIR");</div><div class='del'>-        header_prefix += project-&gt;first("QMAKE_ORIG_TARGET") + project-&gt;first("QMAKE_PCH_OUTPUT_EXT");</div><div class='add'>+        header_prefix += project-&gt;first("QMAKE_ORIG_TARGET");</div><div class='add'>+        if (!project-&gt;isActiveConfig("clang_pch_style"))</div><div class='add'>+            header_prefix += project-&gt;first("QMAKE_PCH_OUTPUT_EXT");</div><div class='ctx'>         if (project-&gt;isActiveConfig("icc_pch_style")) {</div><div class='ctx'>             // icc style</div><div class='ctx'>             for(QStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) {</div><div class='hunk'>@@ -389,23 +420,25 @@ QStringList</div><div class='ctx'>                 }</div><div class='ctx'>             }</div><div class='ctx'>         } else {</div><div class='del'>-            // gcc style</div><div class='add'>+            // gcc style (including clang_pch_style)</div><div class='add'>+            QString header_suffix = project-&gt;isActiveConfig("clang_pch_style")</div><div class='add'>+                    ? project-&gt;first("QMAKE_PCH_OUTPUT_EXT") : "";</div><div class='ctx'>             header_prefix += Option::dir_sep + project-&gt;first("QMAKE_PRECOMP_PREFIX");</div><div class='ctx'>             for(QStringList::Iterator it = Option::c_ext.begin(); it != Option::c_ext.end(); ++it) {</div><div class='ctx'>                 if(file.endsWith(*it)) {</div><div class='ctx'>                     if(!project-&gt;isEmpty("QMAKE_CFLAGS_PRECOMPILE")) {</div><div class='del'>-                        QString precomp_c_h = header_prefix + "c";</div><div class='add'>+                        QString precomp_c_h = header_prefix + "c" + header_suffix;</div><div class='ctx'>                         if(!ret.contains(precomp_c_h))</div><div class='ctx'>                             ret += precomp_c_h;</div><div class='ctx'>                     }</div><div class='ctx'>                     if(project-&gt;isActiveConfig("objective_c")) {</div><div class='ctx'>                         if(!project-&gt;isEmpty("QMAKE_OBJCFLAGS_PRECOMPILE")) {</div><div class='del'>-                            QString precomp_objc_h = header_prefix + "objective-c";</div><div class='add'>+                            QString precomp_objc_h = header_prefix + "objective-c" + header_suffix;</div><div class='ctx'>                             if(!ret.contains(precomp_objc_h))</div><div class='ctx'>                                 ret += precomp_objc_h;</div><div class='ctx'>                         }</div><div class='ctx'>                         if(!project-&gt;isEmpty("QMAKE_OBJCXXFLAGS_PRECOMPILE")) {</div><div class='del'>-                            QString precomp_objcpp_h = header_prefix + "objective-c++";</div><div class='add'>+                            QString precomp_objcpp_h = header_prefix + "objective-c++" + header_suffix;</div><div class='ctx'>                             if(!ret.contains(precomp_objcpp_h))</div><div class='ctx'>                                 ret += precomp_objcpp_h;</div><div class='ctx'>                         }</div><div class='hunk'>@@ -416,13 +449,13 @@ QStringList</div><div class='ctx'>             for(QStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) {</div><div class='ctx'>                 if(file.endsWith(*it)) {</div><div class='ctx'>                     if(!project-&gt;isEmpty("QMAKE_CXXFLAGS_PRECOMPILE")) {</div><div class='del'>-                        QString precomp_cpp_h = header_prefix + "c++";</div><div class='add'>+                        QString precomp_cpp_h = header_prefix + "c++" + header_suffix;</div><div class='ctx'>                         if(!ret.contains(precomp_cpp_h))</div><div class='ctx'>                             ret += precomp_cpp_h;</div><div class='ctx'>                     }</div><div class='ctx'>                     if(project-&gt;isActiveConfig("objective_c")) {</div><div class='ctx'>                         if(!project-&gt;isEmpty("QMAKE_OBJCXXFLAGS_PRECOMPILE")) {</div><div class='del'>-                            QString precomp_objcpp_h = header_prefix + "objective-c++";</div><div class='add'>+                            QString precomp_objcpp_h = header_prefix + "objective-c++" + header_suffix;</div><div class='ctx'>                             if(!ret.contains(precomp_objcpp_h))</div><div class='ctx'>                                 ret += precomp_objcpp_h;</div><div class='ctx'>                         }</div><div class='hunk'>@@ -455,7 +488,7 @@ UnixMakefileGenerator::findLibraries()</div><div class='ctx'>                 } else if(opt.startsWith("-l")) {</div><div class='ctx'>                     if (!project-&gt;isEmpty("QMAKE_RVCT_LINKSTYLE")) {</div><div class='ctx'>                         (*it) = opt.mid(2);</div><div class='del'>-                    } else if (project-&gt;isActiveConfig("rvct_linker")) {</div><div class='add'>+                    } else if (project-&gt;isActiveConfig("rvct_linker") || project-&gt;isActiveConfig("armcc_linker")) {</div><div class='ctx'>                         (*it) = "lib" + opt.mid(2) + ".so";</div><div class='ctx'>                     } else {</div><div class='ctx'>                         stub = opt.mid(2);</div><div class='head'>diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h<br/>index d6d6b34..0b8d269 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/unix/unixmake.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/unix/unixmake.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/unix/unixmake.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/unix/unixmake.h</a></div><div class='hunk'>@@ -51,10 +51,6 @@ class UnixMakefileGenerator : public MakefileGenerator</div><div class='ctx'>     bool init_flag, include_deps;</div><div class='ctx'>     QString libtoolFileName(bool fixify=true);</div><div class='ctx'>     void writeLibtoolFile();     // for libtool</div><div class='del'>-    QString pkgConfigPrefix() const;</div><div class='del'>-    QString pkgConfigFileName(bool fixify=true);</div><div class='del'>-    QString pkgConfigFixPath(QString) const;</div><div class='del'>-    void writePkgConfigFile();   // for pkg-config</div><div class='ctx'>     void writePrlFile(QTextStream &amp;);</div><div class='ctx'> </div><div class='ctx'> public:</div><div class='head'>diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp<br/>index 911b617..30d7822 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/unix/unixmake2.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/unix/unixmake2.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/unix/unixmake2.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/unix/unixmake2.cpp</a></div><div class='hunk'>@@ -96,7 +96,8 @@ UnixMakefileGenerator::writeMakefile(QTextStream &amp;t)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if (project-&gt;values("TEMPLATE").first() == "app" ||</div><div class='del'>-        project-&gt;values("TEMPLATE").first() == "lib") {</div><div class='add'>+        project-&gt;values("TEMPLATE").first() == "lib" ||</div><div class='add'>+        project-&gt;values("TEMPLATE").first() == "aux") {</div><div class='ctx'>         if(Option::mkfile::do_stub_makefile &amp;&amp; MakefileGenerator::writeStubMakefile(t))</div><div class='ctx'>             return true;</div><div class='ctx'>         writeMakeParts(t);</div><div class='hunk'>@@ -536,7 +537,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &amp;t)</div><div class='ctx'>                 t &lt;&lt; "\n\t"</div><div class='ctx'>                   &lt;&lt; "-$(MOVE) $(TARGET) " &lt;&lt; destdir;</div><div class='ctx'>             if(!project-&gt;isEmpty("QMAKE_POST_LINK"))</div><div class='del'>-                t &lt;&lt; "\n\t" &lt;&lt; var("QMAKE_POST_LINK") &lt;&lt; "\n\t";</div><div class='add'>+                t &lt;&lt; "\n\t" &lt;&lt; var("QMAKE_POST_LINK");</div><div class='ctx'>             t &lt;&lt; endl &lt;&lt; endl;</div><div class='ctx'>         } else if(!project-&gt;isEmpty("QMAKE_BUNDLE")) {</div><div class='ctx'>             t &lt;&lt; "\n\t"</div><div class='hunk'>@@ -712,11 +713,18 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &amp;t)</div><div class='ctx'>         t &lt;&lt; info_plist_out &lt;&lt; ": " &lt;&lt; "\n\t";</div><div class='ctx'>         if(!destdir.isEmpty())</div><div class='ctx'>             t &lt;&lt; mkdir_p_asstring(destdir) &lt;&lt; "\n\t";</div><div class='add'>+        QStringList commonSedArgs;</div><div class='add'>+        if (!project-&gt;values("VERSION").isEmpty())</div><div class='add'>+            commonSedArgs &lt;&lt; "-e \"s,@SHORT_VERSION@," &lt;&lt; project-&gt;first("VER_MAJ") &lt;&lt; "." &lt;&lt; project-&gt;first("VER_MIN") &lt;&lt; ",g\" ";</div><div class='add'>+        commonSedArgs &lt;&lt; "-e \"s,@TYPEINFO@,"&lt;&lt; (project-&gt;isEmpty("QMAKE_PKGINFO_TYPEINFO") ?</div><div class='add'>+                   QString::fromLatin1("????") : project-&gt;first("QMAKE_PKGINFO_TYPEINFO").left(4)) &lt;&lt; ",g\" ";</div><div class='ctx'>         if(project-&gt;first("TEMPLATE") == "app") {</div><div class='ctx'>             QString icon = fileFixify(var("ICON"));</div><div class='ctx'>             t &lt;&lt; "@$(DEL_FILE) " &lt;&lt; info_plist_out &lt;&lt; "\n\t"</div><div class='del'>-              &lt;&lt; "@sed "</div><div class='del'>-              &lt;&lt; "-e \"s,@ICON@," &lt;&lt; icon.section(Option::dir_sep, -1) &lt;&lt; ",g\" "</div><div class='add'>+              &lt;&lt; "@sed ";</div><div class='add'>+            foreach (const QString &amp;arg, commonSedArgs)</div><div class='add'>+                t &lt;&lt; arg;</div><div class='add'>+            t &lt;&lt; "-e \"s,@ICON@," &lt;&lt; icon.section(Option::dir_sep, -1) &lt;&lt; ",g\" "</div><div class='ctx'>               &lt;&lt; "-e \"s,@EXECUTABLE@," &lt;&lt; var("QMAKE_ORIG_TARGET") &lt;&lt; ",g\" "</div><div class='ctx'>               &lt;&lt; "-e \"s,@TYPEINFO@,"&lt;&lt; (project-&gt;isEmpty("QMAKE_PKGINFO_TYPEINFO") ?</div><div class='ctx'>                          QString::fromLatin1("????") : project-&gt;first("QMAKE_PKGINFO_TYPEINFO").left(4)) &lt;&lt; ",g\" "</div><div class='hunk'>@@ -732,9 +740,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &amp;t)</div><div class='ctx'>             }</div><div class='ctx'>         } else {</div><div class='ctx'>             t &lt;&lt; "@$(DEL_FILE) " &lt;&lt; info_plist_out &lt;&lt; "\n\t"</div><div class='del'>-              &lt;&lt; "@sed "</div><div class='del'>-              &lt;&lt; "-e \"s,@LIBRARY@," &lt;&lt; var("QMAKE_ORIG_TARGET") &lt;&lt; ",g\" "</div><div class='del'>-              &lt;&lt; "-e \"s,@SHORT_VERSION@," &lt;&lt; project-&gt;first("VER_MAJ") &lt;&lt; "." &lt;&lt; project-&gt;first("VER_MIN") &lt;&lt; ",g\" "</div><div class='add'>+              &lt;&lt; "@sed ";</div><div class='add'>+            foreach (const QString &amp;arg, commonSedArgs)</div><div class='add'>+                t &lt;&lt; arg;</div><div class='add'>+            t &lt;&lt; "-e \"s,@LIBRARY@," &lt;&lt; var("QMAKE_ORIG_TARGET") &lt;&lt; ",g\" "</div><div class='ctx'>               &lt;&lt; "-e \"s,@TYPEINFO@,"</div><div class='ctx'>               &lt;&lt; (project-&gt;isEmpty("QMAKE_PKGINFO_TYPEINFO") ?</div><div class='ctx'>                   QString::fromLatin1("????") : project-&gt;first("QMAKE_PKGINFO_TYPEINFO").left(4)) &lt;&lt; ",g\" "</div><div class='hunk'>@@ -836,7 +845,9 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &amp;t)</div><div class='ctx'> </div><div class='ctx'>         if(!project-&gt;isEmpty("PRECOMPILED_DIR"))</div><div class='ctx'>             precomph_out_dir = project-&gt;first("PRECOMPILED_DIR");</div><div class='del'>-        precomph_out_dir += project-&gt;first("QMAKE_ORIG_TARGET") + project-&gt;first("QMAKE_PCH_OUTPUT_EXT");</div><div class='add'>+        precomph_out_dir += project-&gt;first("QMAKE_ORIG_TARGET");</div><div class='add'>+        if (!project-&gt;isActiveConfig("clang_pch_style"))</div><div class='add'>+            precomph_out_dir += project-&gt;first("QMAKE_PCH_OUTPUT_EXT");</div><div class='ctx'> </div><div class='ctx'>         if (project-&gt;isActiveConfig("icc_pch_style")) {</div><div class='ctx'>             // icc style</div><div class='hunk'>@@ -850,19 +861,22 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &amp;t)</div><div class='ctx'> </div><div class='ctx'>             precomp_files &lt;&lt; precomph_out_dir &lt;&lt; sourceFile &lt;&lt; objectFile;</div><div class='ctx'>         } else {</div><div class='del'>-            // gcc style</div><div class='add'>+            // gcc style (including clang_pch_style)</div><div class='ctx'>             precomph_out_dir += Option::dir_sep;</div><div class='ctx'> </div><div class='ctx'>             QString header_prefix = project-&gt;first("QMAKE_PRECOMP_PREFIX");</div><div class='add'>+            QString header_suffix = project-&gt;isActiveConfig("clang_pch_style")</div><div class='add'>+                               ? project-&gt;first("QMAKE_PCH_OUTPUT_EXT") : "";</div><div class='add'>+</div><div class='ctx'>             if(!project-&gt;isEmpty("QMAKE_CFLAGS_PRECOMPILE"))</div><div class='del'>-                precomp_files += precomph_out_dir + header_prefix + "c";</div><div class='add'>+                precomp_files += precomph_out_dir + header_prefix + "c" + header_suffix;</div><div class='ctx'>             if(!project-&gt;isEmpty("QMAKE_CXXFLAGS_PRECOMPILE"))</div><div class='del'>-                precomp_files += precomph_out_dir + header_prefix + "c++";</div><div class='add'>+                precomp_files += precomph_out_dir + header_prefix + "c++" + header_suffix;</div><div class='ctx'>             if(project-&gt;isActiveConfig("objective_c")) {</div><div class='ctx'>                 if(!project-&gt;isEmpty("QMAKE_OBJCFLAGS_PRECOMPILE"))</div><div class='del'>-                    precomp_files += precomph_out_dir + header_prefix + "objective-c";</div><div class='add'>+                    precomp_files += precomph_out_dir + header_prefix + "objective-c" + header_suffix;</div><div class='ctx'>                 if(!project-&gt;isEmpty("QMAKE_OBJCXXFLAGS_PRECOMPILE"))</div><div class='del'>-                    precomp_files += precomph_out_dir + header_prefix + "objective-c++";</div><div class='add'>+                    precomp_files += precomph_out_dir + header_prefix + "objective-c++" + header_suffix;</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='ctx'>         t &lt;&lt; "-$(DEL_FILE) " &lt;&lt; precomp_files.join(" ") &lt;&lt; "\n\t";</div><div class='hunk'>@@ -931,7 +945,9 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &amp;t)</div><div class='ctx'>             QString pchOutput;</div><div class='ctx'>             if(!project-&gt;isEmpty("PRECOMPILED_DIR"))</div><div class='ctx'>                 pchOutput = project-&gt;first("PRECOMPILED_DIR");</div><div class='del'>-            pchOutput += pchBaseName + project-&gt;first("QMAKE_PCH_OUTPUT_EXT");</div><div class='add'>+            pchOutput += pchBaseName;</div><div class='add'>+            if (!project-&gt;isActiveConfig("clang_pch_style"))</div><div class='add'>+                pchOutput += project-&gt;first("QMAKE_PCH_OUTPUT_EXT");</div><div class='ctx'> </div><div class='ctx'>             if (project-&gt;isActiveConfig("icc_pch_style")) {</div><div class='ctx'>                 // icc style</div><div class='hunk'>@@ -944,9 +960,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &amp;t)</div><div class='ctx'>                 pchFlags = pchFlags.replace("${QMAKE_PCH_TEMP_SOURCE}", sourceFile)</div><div class='ctx'>                            .replace("${QMAKE_PCH_TEMP_OBJECT}", objectFile);</div><div class='ctx'>             } else {</div><div class='del'>-                // gcc style</div><div class='add'>+                // gcc style (including clang_pch_style)</div><div class='ctx'>                 QString header_prefix = project-&gt;first("QMAKE_PRECOMP_PREFIX");</div><div class='del'>-</div><div class='add'>+                QString header_suffix = project-&gt;isActiveConfig("clang_pch_style")</div><div class='add'>+                                  ? project-&gt;first("QMAKE_PCH_OUTPUT_EXT") : "";</div><div class='ctx'>                 pchOutput += Option::dir_sep;</div><div class='ctx'>                 QString pchOutputDir = pchOutput, pchOutputFile;</div><div class='ctx'> </div><div class='hunk'>@@ -962,7 +979,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &amp;t)</div><div class='ctx'>                 }</div><div class='ctx'>                 if(pchOutputFile.isEmpty())</div><div class='ctx'>                     continue;</div><div class='del'>-                pchOutput += header_prefix + pchOutputFile;</div><div class='add'>+                pchOutput += header_prefix + pchOutputFile + header_suffix;</div><div class='ctx'> </div><div class='ctx'>                 t &lt;&lt; pchOutput &lt;&lt; ": " &lt;&lt; pchInput &lt;&lt; " " &lt;&lt; findDependencies(pchInput).join(" \\\n\t\t")</div><div class='ctx'>                   &lt;&lt; "\n\t" &lt;&lt; mkdir_p_asstring(pchOutputDir);</div><div class='hunk'>@@ -1001,6 +1018,9 @@ void UnixMakefileGenerator::init2()</div><div class='ctx'>     if(project-&gt;isEmpty("QMAKE_FRAMEWORK_VERSION"))</div><div class='ctx'>         project-&gt;values("QMAKE_FRAMEWORK_VERSION").append(project-&gt;values("VER_MAJ").first());</div><div class='ctx'> </div><div class='add'>+    if (project-&gt;values("TEMPLATE").first() == "aux")</div><div class='add'>+        return;</div><div class='add'>+</div><div class='ctx'>     if (!project-&gt;values("QMAKE_APP_FLAG").isEmpty()) {</div><div class='ctx'>         if(!project-&gt;isEmpty("QMAKE_BUNDLE")) {</div><div class='ctx'>             QString bundle_loc = project-&gt;first("QMAKE_BUNDLE_LOCATION");</div><div class='hunk'>@@ -1333,177 +1353,4 @@ UnixMakefileGenerator::writeLibtoolFile()</div><div class='ctx'>         "libdir='" &lt;&lt; Option::fixPathToTargetOS(install_dir, false) &lt;&lt; "'\n";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-QString</div><div class='del'>-UnixMakefileGenerator::pkgConfigFileName(bool fixify)</div><div class='del'>-{</div><div class='del'>-    QString ret = var("TARGET");</div><div class='del'>-    int slsh = ret.lastIndexOf(Option::dir_sep);</div><div class='del'>-    if(slsh != -1)</div><div class='del'>-        ret = ret.right(ret.length() - slsh - 1);</div><div class='del'>-    if(ret.startsWith("lib"))</div><div class='del'>-        ret = ret.mid(3);</div><div class='del'>-    int dot = ret.indexOf('.');</div><div class='del'>-    if(dot != -1)</div><div class='del'>-        ret = ret.left(dot);</div><div class='del'>-    ret += Option::pkgcfg_ext;</div><div class='del'>-    if(!project-&gt;isEmpty("QMAKE_PKGCONFIG_DESTDIR"))</div><div class='del'>-        ret.prepend(project-&gt;first("QMAKE_PKGCONFIG_DESTDIR") + Option::dir_sep);</div><div class='del'>-    if(fixify) {</div><div class='del'>-        if(QDir::isRelativePath(ret) &amp;&amp; !project-&gt;isEmpty("DESTDIR"))</div><div class='del'>-            ret.prepend(project-&gt;first("DESTDIR"));</div><div class='del'>-        ret = Option::fixPathToLocalOS(fileFixify(ret, qmake_getpwd(), Option::output_dir));</div><div class='del'>-    }</div><div class='del'>-    return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-QString</div><div class='del'>-UnixMakefileGenerator::pkgConfigPrefix() const</div><div class='del'>-{</div><div class='del'>-    if(!project-&gt;isEmpty("QMAKE_PKGCONFIG_PREFIX"))</div><div class='del'>-        return project-&gt;first("QMAKE_PKGCONFIG_PREFIX");</div><div class='del'>-    return QLibraryInfo::location(QLibraryInfo::PrefixPath);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-QString</div><div class='del'>-UnixMakefileGenerator::pkgConfigFixPath(QString path) const</div><div class='del'>-{</div><div class='del'>-    QString prefix = pkgConfigPrefix();</div><div class='del'>-    if(path.startsWith(prefix))</div><div class='del'>-        path = path.replace(prefix, "${prefix}");</div><div class='del'>-    return path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-UnixMakefileGenerator::writePkgConfigFile()</div><div class='del'>-{</div><div class='del'>-    QString fname = pkgConfigFileName(), lname = fname;</div><div class='del'>-    mkdir(fileInfo(fname).path());</div><div class='del'>-    int slsh = lname.lastIndexOf(Option::dir_sep);</div><div class='del'>-    if(slsh != -1)</div><div class='del'>-        lname = lname.right(lname.length() - slsh - 1);</div><div class='del'>-    QFile ft(fname);</div><div class='del'>-    if(!ft.open(QIODevice::WriteOnly))</div><div class='del'>-        return;</div><div class='del'>-    project-&gt;values("ALL_DEPS").append(fileFixify(fname));</div><div class='del'>-    QTextStream t(&amp;ft);</div><div class='del'>-</div><div class='del'>-    QString prefix = pkgConfigPrefix();</div><div class='del'>-    QString libDir = project-&gt;first("QMAKE_PKGCONFIG_LIBDIR");</div><div class='del'>-    if(libDir.isEmpty())</div><div class='del'>-        libDir = prefix + Option::dir_sep + "lib" + Option::dir_sep;</div><div class='del'>-    QString includeDir = project-&gt;first("QMAKE_PKGCONFIG_INCDIR");</div><div class='del'>-    if(includeDir.isEmpty())</div><div class='del'>-        includeDir = prefix + "/include";</div><div class='del'>-</div><div class='del'>-    t &lt;&lt; "prefix=" &lt;&lt; prefix &lt;&lt; endl;</div><div class='del'>-    t &lt;&lt; "exec_prefix=${prefix}\n"</div><div class='del'>-      &lt;&lt; "libdir=" &lt;&lt; pkgConfigFixPath(libDir) &lt;&lt; "\n"</div><div class='del'>-      &lt;&lt; "includedir=" &lt;&lt; pkgConfigFixPath(includeDir) &lt;&lt; endl;</div><div class='del'>-    // non-standard entry. Provides useful info normally only</div><div class='del'>-    // contained in the internal .qmake.cache file</div><div class='del'>-    t &lt;&lt; varGlue("CONFIG", "qt_config=", " ", "") &lt;&lt; endl;</div><div class='del'>-</div><div class='del'>-    //extra PKGCONFIG variables</div><div class='del'>-    const QStringList &amp;pkgconfig_vars = project-&gt;values("QMAKE_PKGCONFIG_VARIABLES");</div><div class='del'>-    for(int i = 0; i &lt; pkgconfig_vars.size(); ++i) {</div><div class='del'>-        QString var = project-&gt;first(pkgconfig_vars.at(i) + ".name"),</div><div class='del'>-                val = project-&gt;values(pkgconfig_vars.at(i) + ".value").join(" ");</div><div class='del'>-        if(var.isEmpty())</div><div class='del'>-            continue;</div><div class='del'>-        if(val.isEmpty()) {</div><div class='del'>-            const QStringList &amp;var_vars = project-&gt;values(pkgconfig_vars.at(i) + ".variable");</div><div class='del'>-            for(int v = 0; v &lt; var_vars.size(); ++v) {</div><div class='del'>-                const QStringList &amp;vars = project-&gt;values(var_vars.at(v));</div><div class='del'>-                for(int var = 0; var &lt; vars.size(); ++var) {</div><div class='del'>-                    if(!val.isEmpty())</div><div class='del'>-                        val += " ";</div><div class='del'>-                    val += pkgConfigFixPath(vars.at(var));</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        t &lt;&lt; var &lt;&lt; "=" &lt;&lt; val &lt;&lt; endl;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    t &lt;&lt; endl;</div><div class='del'>-</div><div class='del'>-    QString name = project-&gt;first("QMAKE_PKGCONFIG_NAME");</div><div class='del'>-    if(name.isEmpty()) {</div><div class='del'>-        name = project-&gt;first("QMAKE_ORIG_TARGET").toLower();</div><div class='del'>-        name.replace(0, 1, name[0].toUpper());</div><div class='del'>-    }</div><div class='del'>-    t &lt;&lt; "Name: " &lt;&lt; name &lt;&lt; endl;</div><div class='del'>-    QString desc = project-&gt;values("QMAKE_PKGCONFIG_DESCRIPTION").join(" ");</div><div class='del'>-    if(desc.isEmpty()) {</div><div class='del'>-        if(name.isEmpty()) {</div><div class='del'>-            desc = project-&gt;first("QMAKE_ORIG_TARGET").toLower();</div><div class='del'>-            desc.replace(0, 1, desc[0].toUpper());</div><div class='del'>-        } else {</div><div class='del'>-            desc = name;</div><div class='del'>-        }</div><div class='del'>-        if(project-&gt;first("TEMPLATE") == "lib") {</div><div class='del'>-            if(project-&gt;isActiveConfig("plugin"))</div><div class='del'>-               desc += " Plugin";</div><div class='del'>-            else</div><div class='del'>-               desc += " Library";</div><div class='del'>-        } else if(project-&gt;first("TEMPLATE") == "app") {</div><div class='del'>-            desc += " Application";</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    t &lt;&lt; "Description: " &lt;&lt; desc &lt;&lt; endl;</div><div class='del'>-    t &lt;&lt; "Version: " &lt;&lt; project-&gt;first("VERSION") &lt;&lt; endl;</div><div class='del'>-</div><div class='del'>-    // libs</div><div class='del'>-    t &lt;&lt; "Libs: ";</div><div class='del'>-    QString pkgConfiglibDir;</div><div class='del'>-    QString pkgConfiglibName;</div><div class='del'>-    if (Option::target_mode == Option::TARG_MACX_MODE &amp;&amp; project-&gt;isActiveConfig("lib_bundle")) {</div><div class='del'>-        pkgConfiglibDir = "-F${libdir}";</div><div class='del'>-        QString bundle;</div><div class='del'>-        if (!project-&gt;isEmpty("QMAKE_FRAMEWORK_BUNDLE_NAME"))</div><div class='del'>-            bundle = unescapeFilePath(project-&gt;first("QMAKE_FRAMEWORK_BUNDLE_NAME"));</div><div class='del'>-        else</div><div class='del'>-            bundle = unescapeFilePath(project-&gt;first("TARGET"));</div><div class='del'>-        int suffix = bundle.lastIndexOf(".framework");</div><div class='del'>-        if (suffix != -1)</div><div class='del'>-            bundle = bundle.left(suffix);</div><div class='del'>-        pkgConfiglibName = "-framework " + bundle + " ";</div><div class='del'>-    } else {</div><div class='del'>-        pkgConfiglibDir = "-L${libdir}";</div><div class='del'>-        pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());</div><div class='del'>-    }</div><div class='del'>-    t &lt;&lt; pkgConfiglibDir &lt;&lt; " " &lt;&lt; pkgConfiglibName &lt;&lt; " " &lt;&lt; endl;</div><div class='del'>-</div><div class='del'>-    QStringList libs;</div><div class='del'>-    if(!project-&gt;isEmpty("QMAKE_INTERNAL_PRL_LIBS")) {</div><div class='del'>-        libs = project-&gt;values("QMAKE_INTERNAL_PRL_LIBS");</div><div class='del'>-    } else {</div><div class='del'>-        libs &lt;&lt; "QMAKE_LIBS"; //obvious one</div><div class='del'>-    }</div><div class='del'>-    libs &lt;&lt; "QMAKE_LIBS_PRIVATE";</div><div class='del'>-    libs &lt;&lt; "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?</div><div class='del'>-    t &lt;&lt; "Libs.private: ";</div><div class='del'>-    for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it) {</div><div class='del'>-        t &lt;&lt; project-&gt;values((*it)).join(" ") &lt;&lt; " ";</div><div class='del'>-    }</div><div class='del'>-    t &lt;&lt; endl;</div><div class='del'>-</div><div class='del'>-    // flags</div><div class='del'>-    // ### too many</div><div class='del'>-    t &lt;&lt; "Cflags: "</div><div class='del'>-        // &lt;&lt; var("QMAKE_CXXFLAGS") &lt;&lt; " "</div><div class='del'>-      &lt;&lt; varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")</div><div class='del'>-      &lt;&lt; project-&gt;values("PRL_EXPORT_CXXFLAGS").join(" ")</div><div class='del'>-      &lt;&lt; project-&gt;values("QMAKE_PKGCONFIG_CFLAGS").join(" ")</div><div class='del'>-        //      &lt;&lt; varGlue("DEFINES","-D"," -D"," ")</div><div class='del'>-      &lt;&lt; " -I${includedir}" &lt;&lt; endl;</div><div class='del'>-</div><div class='del'>-    // requires</div><div class='del'>-    const QString requires = project-&gt;values("QMAKE_PKGCONFIG_REQUIRES").join(" ");</div><div class='del'>-    if (!requires.isEmpty()) {</div><div class='del'>-        t &lt;&lt; "Requires: " &lt;&lt; requires &lt;&lt; endl;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    t &lt;&lt; endl;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp<br/>index 4715577..f827842 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/borland_bmake.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/borland_bmake.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/borland_bmake.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/win32/borland_bmake.cpp</a></div><div class='hunk'>@@ -68,7 +68,8 @@ BorlandMakefileGenerator::writeMakefile(QTextStream &amp;t)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if(project-&gt;first("TEMPLATE") == "app" ||</div><div class='del'>-       project-&gt;first("TEMPLATE") == "lib") {</div><div class='add'>+       project-&gt;first("TEMPLATE") == "lib" ||</div><div class='add'>+       project-&gt;first("TEMPLATE") == "aux") {</div><div class='ctx'>         writeBorlandParts(t);</div><div class='ctx'>         return MakefileGenerator::writeMakefile(t);</div><div class='ctx'>     }</div><div class='hunk'>@@ -136,6 +137,11 @@ BorlandMakefileGenerator::init()</div><div class='ctx'> </div><div class='ctx'> void BorlandMakefileGenerator::writeBuildRulesPart(QTextStream &amp;t)</div><div class='ctx'> {</div><div class='add'>+    if (project-&gt;first("TEMPLATE") == "aux") {</div><div class='add'>+        t &lt;&lt; "first:" &lt;&lt; endl;</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     t &lt;&lt; "first: all" &lt;&lt; endl;</div><div class='ctx'>     t &lt;&lt; "all: " &lt;&lt; fileFixify(Option::output.fileName()) &lt;&lt; " " &lt;&lt; varGlue("ALL_DEPS"," "," "," ") &lt;&lt; " $(DESTDIR_TARGET)" &lt;&lt; endl &lt;&lt; endl;</div><div class='ctx'>     t &lt;&lt; "$(DESTDIR_TARGET): " &lt;&lt; var("PRE_TARGETDEPS") &lt;&lt; " $(OBJECTS) " &lt;&lt; var("POST_TARGETDEPS");</div><div class='head'>diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp<br/>index 8ba1d2a..1b5a90c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/mingw_make.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/mingw_make.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/mingw_make.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/win32/mingw_make.cpp</a></div><div class='hunk'>@@ -141,7 +141,11 @@ bool MingwMakefileGenerator::writeMakefile(QTextStream &amp;t)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if(project-&gt;first("TEMPLATE") == "app" ||</div><div class='del'>-       project-&gt;first("TEMPLATE") == "lib") {</div><div class='add'>+       project-&gt;first("TEMPLATE") == "lib" ||</div><div class='add'>+       project-&gt;first("TEMPLATE") == "aux") {</div><div class='add'>+        if(project-&gt;isActiveConfig("create_pc") &amp;&amp; project-&gt;first("TEMPLATE") == "lib")</div><div class='add'>+            writePkgConfigFile();</div><div class='add'>+</div><div class='ctx'>         if(Option::mkfile::do_stub_makefile) {</div><div class='ctx'>             t &lt;&lt; "QMAKE    = " &lt;&lt; var("QMAKE_QMAKE") &lt;&lt; endl;</div><div class='ctx'>             QStringList &amp;qut = project-&gt;values("QMAKE_EXTRA_TARGETS");</div><div class='hunk'>@@ -299,8 +303,10 @@ void MingwMakefileGenerator::init()</div><div class='ctx'> 	project-&gt;values("QMAKE_LFLAGS").append(QString("-Wl,--out-implib,") + project-&gt;first("MINGW_IMPORT_LIB"));</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    if(!project-&gt;values("DEF_FILE").isEmpty() &amp;&amp; project-&gt;values("QMAKE_SYMBIAN_SHLIB").isEmpty())</div><div class='del'>-        project-&gt;values("QMAKE_LFLAGS").append(QString("-Wl,") + project-&gt;first("DEF_FILE"));</div><div class='add'>+    if(!project-&gt;values("DEF_FILE").isEmpty() &amp;&amp; project-&gt;values("QMAKE_SYMBIAN_SHLIB").isEmpty()) {</div><div class='add'>+        QString defFileName = fileFixify(project-&gt;values("DEF_FILE")).first();</div><div class='add'>+        project-&gt;values("QMAKE_LFLAGS").append(QString("-Wl,") + escapeFilePath(defFileName));</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     MakefileGenerator::init();</div><div class='ctx'> </div><div class='hunk'>@@ -431,6 +437,11 @@ void MingwMakefileGenerator::writeObjectsPart(QTextStream &amp;t)</div><div class='ctx'> </div><div class='ctx'> void MingwMakefileGenerator::writeBuildRulesPart(QTextStream &amp;t)</div><div class='ctx'> {</div><div class='add'>+    if (project-&gt;first("TEMPLATE") == "aux") {</div><div class='add'>+        t &lt;&lt; "first:" &lt;&lt; endl;</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     t &lt;&lt; "first: all" &lt;&lt; endl;</div><div class='ctx'>     t &lt;&lt; "all: " &lt;&lt; escapeDependencyPath(fileFixify(Option::output.fileName())) &lt;&lt; " " &lt;&lt; valGlue(escapeDependencyPaths(project-&gt;values("ALL_DEPS"))," "," "," ") &lt;&lt; " $(DESTDIR_TARGET)" &lt;&lt; endl &lt;&lt; endl;</div><div class='ctx'>     t &lt;&lt; "$(DESTDIR_TARGET): " &lt;&lt; var("PRE_TARGETDEPS") &lt;&lt; " $(OBJECTS) " &lt;&lt; var("POST_TARGETDEPS");</div><div class='head'>diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp<br/>index c70d966..f50afc3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msbuild_objectmodel.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msbuild_objectmodel.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msbuild_objectmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/win32/msbuild_objectmodel.cpp</a></div><div class='hunk'>@@ -50,26 +50,14 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> // XML Tags ---------------------------------------------------------</div><div class='ctx'> const char _CLCompile[]                         = "ClCompile";</div><div class='del'>-const char _Configuration[]                     = "Configuration";</div><div class='del'>-const char _Configurations[]                    = "Configurations";</div><div class='del'>-const char q_File[]                             = "File";</div><div class='del'>-const char _FileConfiguration[]                 = "FileConfiguration";</div><div class='del'>-const char q_Files[]                            = "Files";</div><div class='del'>-const char _Filter[]                            = "Filter";</div><div class='del'>-const char _Globals[]                           = "Globals";</div><div class='ctx'> const char _ItemGroup[]                         = "ItemGroup";</div><div class='ctx'> const char _Link[]                              = "Link";</div><div class='ctx'> const char _Midl[]                              = "Midl";</div><div class='del'>-const char _Platform[]                          = "Platform";</div><div class='del'>-const char _Platforms[]                         = "Platforms";</div><div class='ctx'> const char _ResourceCompile[]                   = "ResourceCompile";</div><div class='del'>-const char _Tool[]                              = "Tool";</div><div class='del'>-const char _VisualStudioProject[]               = "VisualStudioProject";</div><div class='ctx'> </div><div class='ctx'> // XML Properties ---------------------------------------------------</div><div class='ctx'> const char _AddModuleNamesToAssembly[]          = "AddModuleNamesToAssembly";</div><div class='ctx'> const char _AdditionalDependencies[]            = "AdditionalDependencies";</div><div class='del'>-const char _AdditionalFiles[]                   = "AdditionalFiles";</div><div class='ctx'> const char _AdditionalIncludeDirectories[]      = "AdditionalIncludeDirectories";</div><div class='ctx'> const char _AdditionalLibraryDirectories[]      = "AdditionalLibraryDirectories";</div><div class='ctx'> const char _AdditionalManifestDependencies[]    = "AdditionalManifestDependencies";</div><div class='hunk'>@@ -97,11 +85,8 @@ const char _CLRSupportLastError[]               = "CLRSupportLastError";</div><div class='ctx'> const char _CLRThreadAttribute[]                = "CLRThreadAttribute";</div><div class='ctx'> const char _CLRUnmanagedCodeCheck[]             = "CLRUnmanagedCodeCheck";</div><div class='ctx'> const char _Command[]                           = "Command";</div><div class='del'>-const char _CommandLine[]                       = "CommandLine";</div><div class='ctx'> const char _CompileAs[]                         = "CompileAs";</div><div class='ctx'> const char _CompileAsManaged[]                  = "CompileAsManaged";</div><div class='del'>-const char _CompileForArchitecture[]            = "CompileForArchitecture";</div><div class='del'>-const char _CompileOnly[]                       = "CompileOnly";</div><div class='ctx'> const char _ConfigurationType[]                 = "ConfigurationType";</div><div class='ctx'> const char _CPreprocessOptions[]                = "CPreprocessOptions";</div><div class='ctx'> const char _CreateHotpatchableImage[]           = "CreateHotpatchableImage";</div><div class='hunk'>@@ -109,26 +94,20 @@ const char _CreateHotPatchableImage[]           = "CreateHotPatchableImage";</div><div class='ctx'> const char _Culture[]                           = "Culture";</div><div class='ctx'> const char _DataExecutionPrevention[]           = "DataExecutionPrevention";</div><div class='ctx'> const char _DebugInformationFormat[]            = "DebugInformationFormat";</div><div class='del'>-const char _DefaultCharIsUnsigned[]             = "DefaultCharIsUnsigned";</div><div class='ctx'> const char _DefaultCharType[]                   = "DefaultCharType";</div><div class='ctx'> const char _DelayLoadDLLs[]                     = "DelayLoadDLLs";</div><div class='ctx'> const char _DelaySign[]                         = "DelaySign";</div><div class='ctx'> const char _DeleteExtensionsOnClean[]           = "DeleteExtensionsOnClean";</div><div class='del'>-const char _Description[]                       = "Description";</div><div class='del'>-const char _Detect64BitPortabilityProblems[]    = "Detect64BitPortabilityProblems";</div><div class='ctx'> const char _DisableLanguageExtensions[]         = "DisableLanguageExtensions";</div><div class='ctx'> const char _DisableSpecificWarnings[]           = "DisableSpecificWarnings";</div><div class='ctx'> const char _DisplayLibrary[]                    = "DisplayLibrary";</div><div class='ctx'> const char _DLLDataFileName[]                   = "DLLDataFileName";</div><div class='del'>-const char _Driver[]                            = "Driver";</div><div class='ctx'> const char _EmbedManagedResourceFile[]          = "EmbedManagedResourceFile";</div><div class='ctx'> const char _EnableCOMDATFolding[]               = "EnableCOMDATFolding";</div><div class='ctx'> const char _EnableUAC[]                         = "EnableUAC";</div><div class='ctx'> const char _EnableErrorChecks[]                 = "EnableErrorChecks";</div><div class='ctx'> const char _EnableEnhancedInstructionSet[]      = "EnableEnhancedInstructionSet";</div><div class='ctx'> const char _EnableFiberSafeOptimizations[]      = "EnableFiberSafeOptimizations";</div><div class='del'>-const char _EnableFunctionLevelLinking[]        = "EnableFunctionLevelLinking";</div><div class='del'>-const char _EnableIntrinsicFunctions[]          = "EnableIntrinsicFunctions";</div><div class='ctx'> const char _EnablePREfast[]                     = "EnablePREfast";</div><div class='ctx'> const char _EntryPointSymbol[]                  = "EntryPointSymbol";</div><div class='ctx'> const char _ErrorCheckAllocations[]             = "ErrorCheckAllocations";</div><div class='hunk'>@@ -138,64 +117,50 @@ const char _ErrorCheckRefPointers[]             = "ErrorCheckRefPointers";</div><div class='ctx'> const char _ErrorCheckStubData[]                = "ErrorCheckStubData";</div><div class='ctx'> const char _ErrorReporting[]                    = "ErrorReporting";</div><div class='ctx'> const char _ExceptionHandling[]                 = "ExceptionHandling";</div><div class='del'>-const char _ExcludedFromBuild[]                 = "ExcludedFromBuild";</div><div class='ctx'> const char _ExpandAttributedSource[]            = "ExpandAttributedSource";</div><div class='ctx'> const char _ExportNamedFunctions[]              = "ExportNamedFunctions";</div><div class='ctx'> const char _FavorSizeOrSpeed[]                  = "FavorSizeOrSpeed";</div><div class='del'>-const char _FixedBaseAddress[]                  = "FixedBaseAddress";</div><div class='ctx'> const char _FloatingPointModel[]                = "FloatingPointModel";</div><div class='ctx'> const char _FloatingPointExceptions[]           = "FloatingPointExceptions";</div><div class='ctx'> const char _ForceConformanceInForLoopScope[]    = "ForceConformanceInForLoopScope";</div><div class='del'>-const char _ForceFileOutput[]                   = "ForceFileOutput";</div><div class='ctx'> const char _ForceSymbolReferences[]             = "ForceSymbolReferences";</div><div class='ctx'> const char _ForcedIncludeFiles[]                = "ForcedIncludeFiles";</div><div class='ctx'> const char _ForcedUsingFiles[]                  = "ForcedUsingFiles";</div><div class='del'>-const char _FullIncludePath[]                   = "FullIncludePath";</div><div class='ctx'> const char _FunctionLevelLinking[]              = "FunctionLevelLinking";</div><div class='ctx'> const char _FunctionOrder[]                     = "FunctionOrder";</div><div class='ctx'> const char _GenerateClientFiles[]               = "GenerateClientFiles";</div><div class='ctx'> const char _GenerateDebugInformation[]          = "GenerateDebugInformation";</div><div class='ctx'> const char _GenerateManifest[]                  = "GenerateManifest";</div><div class='ctx'> const char _GenerateMapFile[]                   = "GenerateMapFile";</div><div class='del'>-const char _GeneratePreprocessedFile[]          = "GeneratePreprocessedFile";</div><div class='ctx'> const char _GenerateServerFiles[]               = "GenerateServerFiles";</div><div class='ctx'> const char _GenerateStublessProxies[]           = "GenerateStublessProxies";</div><div class='ctx'> const char _GenerateTypeLibrary[]               = "GenerateTypeLibrary";</div><div class='ctx'> const char _GenerateXMLDocumentationFiles[]     = "GenerateXMLDocumentationFiles";</div><div class='del'>-const char _GlobalOptimizations[]               = "GlobalOptimizations";</div><div class='ctx'> const char _HeaderFileName[]                    = "HeaderFileName";</div><div class='ctx'> const char _HeapCommitSize[]                    = "HeapCommitSize";</div><div class='ctx'> const char _HeapReserveSize[]                   = "HeapReserveSize";</div><div class='ctx'> const char _IgnoreAllDefaultLibraries[]         = "IgnoreAllDefaultLibraries";</div><div class='del'>-const char _IgnoreDefaultLibraryNames[]         = "IgnoreDefaultLibraryNames";</div><div class='ctx'> const char _IgnoreEmbeddedIDL[]                 = "IgnoreEmbeddedIDL";</div><div class='ctx'> const char _IgnoreImportLibrary[]               = "IgnoreImportLibrary";</div><div class='ctx'> const char _IgnoreSpecificDefaultLibraries[]    = "IgnoreSpecificDefaultLibraries";</div><div class='ctx'> const char _IgnoreStandardIncludePath[]         = "IgnoreStandardIncludePath";</div><div class='del'>-const char _ImageHasSafeExceptionHandlers[]     = "ImageHasSafeExceptionHandlers";</div><div class='ctx'> const char _ImportLibrary[]                     = "ImportLibrary";</div><div class='del'>-const char _ImproveFloatingPointConsistency[]   = "ImproveFloatingPointConsistency";</div><div class='ctx'> const char _InlineFunctionExpansion[]           = "InlineFunctionExpansion";</div><div class='ctx'> const char _IntrinsicFunctions[]                = "IntrinsicFunctions";</div><div class='ctx'> const char _InterfaceIdentifierFileName[]       = "InterfaceIdentifierFileName";</div><div class='ctx'> const char _IntermediateDirectory[]             = "IntermediateDirectory";</div><div class='del'>-const char _InterworkCalls[]                    = "InterworkCalls";</div><div class='ctx'> const char _KeyContainer[]                      = "KeyContainer";</div><div class='ctx'> const char _KeyFile[]                           = "KeyFile";</div><div class='del'>-const char _Keyword[]                           = "Keyword";</div><div class='del'>-const char _KeepComments[]                      = "KeepComments";</div><div class='ctx'> const char _LargeAddressAware[]                 = "LargeAddressAware";</div><div class='ctx'> const char _LinkDLL[]                           = "LinkDLL";</div><div class='ctx'> const char _LinkErrorReporting[]                = "LinkErrorReporting";</div><div class='ctx'> const char _LinkIncremental[]                   = "LinkIncremental";</div><div class='ctx'> const char _LinkStatus[]                        = "LinkStatus";</div><div class='ctx'> const char _LinkTimeCodeGeneration[]            = "LinkTimeCodeGeneration";</div><div class='del'>-const char _LinkToManagedResourceFile[]         = "LinkToManagedResourceFile";</div><div class='ctx'> const char _LocaleID[]                          = "LocaleID";</div><div class='ctx'> const char _ManifestFile[]                      = "ManifestFile";</div><div class='ctx'> const char _MapExports[]                        = "MapExports";</div><div class='ctx'> const char _MapFileName[]                       = "MapFileName";</div><div class='del'>-const char _MapLines[]                          = "MapLines ";</div><div class='ctx'> const char _MergedIDLBaseFileName[]             = "MergedIDLBaseFileName";</div><div class='ctx'> const char _MergeSections[]                     = "MergeSections";</div><div class='ctx'> const char _Message[]                           = "Message";</div><div class='hunk'>@@ -203,32 +168,22 @@ const char _MidlCommandFile[]                   = "MidlCommandFile";</div><div class='ctx'> const char _MinimalRebuild[]                    = "MinimalRebuild";</div><div class='ctx'> const char _MkTypLibCompatible[]                = "MkTypLibCompatible";</div><div class='ctx'> const char _ModuleDefinitionFile[]              = "ModuleDefinitionFile";</div><div class='del'>-const char _MSDOSStubFileName[]                 = "MSDOSStubFileName";</div><div class='ctx'> const char _MultiProcessorCompilation[]         = "MultiProcessorCompilation";</div><div class='ctx'> const char _Name[]                              = "Name";</div><div class='ctx'> const char _NoEntryPoint[]                      = "NoEntryPoint";</div><div class='ctx'> const char _NullTerminateStrings[]              = "NullTerminateStrings";</div><div class='del'>-const char _ObjectFile[]                        = "ObjectFile";</div><div class='ctx'> const char _ObjectFiles[]                       = "ObjectFiles";</div><div class='ctx'> const char _ObjectFileName[]                    = "ObjectFileName";</div><div class='ctx'> const char _OmitDefaultLibName[]                = "OmitDefaultLibName";</div><div class='ctx'> const char _OmitFramePointers[]                 = "OmitFramePointers";</div><div class='del'>-const char _OpenMP[]                            = "OpenMP";</div><div class='ctx'> const char _OpenMPSupport[]                     = "OpenMPSupport";</div><div class='ctx'> const char _Optimization[]                      = "Optimization";</div><div class='del'>-const char _OptimizeForProcessor[]              = "OptimizeForProcessor";</div><div class='del'>-const char _OptimizeForWindows98[]              = "OptimizeForWindows98";</div><div class='del'>-const char _OptimizeForWindowsApplication[]     = "OptimizeForWindowsApplication";</div><div class='ctx'> const char _OptimizeReferences[]                = "OptimizeReferences";</div><div class='ctx'> const char _OutputDirectory[]                   = "OutputDirectory";</div><div class='ctx'> const char _OutputFile[]                        = "OutputFile";</div><div class='del'>-const char _Outputs[]                           = "Outputs";</div><div class='del'>-const char _ParseFiles[]                        = "ParseFiles";</div><div class='del'>-const char _Path[]                              = "Path";</div><div class='ctx'> const char _PrecompiledHeader[]                 = "PrecompiledHeader";</div><div class='ctx'> const char _PrecompiledHeaderFile[]             = "PrecompiledHeaderFile";</div><div class='ctx'> const char _PrecompiledHeaderOutputFile[]       = "PrecompiledHeaderOutputFile";</div><div class='del'>-const char _PrecompiledHeaderThrough[]          = "PrecompiledHeaderThrough";</div><div class='ctx'> const char _PreprocessorDefinitions[]           = "PreprocessorDefinitions";</div><div class='ctx'> const char _PreprocessKeepComments[]            = "PreprocessKeepComments";</div><div class='ctx'> const char _PreprocessOutputPath[]              = "PreprocessOutputPath";</div><div class='hunk'>@@ -236,11 +191,7 @@ const char _PreprocessSuppressLineNumbers[]     = "PreprocessSuppressLineNumbers</div><div class='ctx'> const char _PreprocessToFile[]                  = "PreprocessToFile";</div><div class='ctx'> const char _PreventDllBinding[]                 = "PreventDllBinding";</div><div class='ctx'> const char _PrimaryOutput[]                     = "PrimaryOutput";</div><div class='del'>-const char _Profile[]                           = "Profile";</div><div class='del'>-const char _ProfileGuidedDatabase[]             = "ProfileGuidedDatabase";</div><div class='del'>-const char _ProjectGUID[]                       = "ProjectGUID";</div><div class='ctx'> const char _ProcessorNumber[]                   = "ProcessorNumber";</div><div class='del'>-const char _ProjectType[]                       = "ProjectType";</div><div class='ctx'> const char _ProgramDatabase[]                   = "ProgramDatabase";</div><div class='ctx'> const char _ProgramDataBaseFileName[]           = "ProgramDataBaseFileName";</div><div class='ctx'> const char _ProgramDatabaseFile[]               = "ProgramDatabaseFile";</div><div class='hunk'>@@ -248,22 +199,16 @@ const char _ProxyFileName[]                     = "ProxyFileName";</div><div class='ctx'> const char _RandomizedBaseAddress[]             = "RandomizedBaseAddress";</div><div class='ctx'> const char _RedirectOutputAndErrors[]           = "RedirectOutputAndErrors";</div><div class='ctx'> const char _RegisterOutput[]                    = "RegisterOutput";</div><div class='del'>-const char _RelativePath[]                      = "RelativePath";</div><div class='del'>-const char _RemoteDirectory[]                   = "RemoteDirectory";</div><div class='ctx'> const char _RemoveObjects[]                     = "RemoveObjects";</div><div class='del'>-const char _ResourceOnlyDLL[]                   = "ResourceOnlyDLL";</div><div class='ctx'> const char _ResourceOutputFileName[]            = "ResourceOutputFileName";</div><div class='ctx'> const char _RuntimeLibrary[]                    = "RuntimeLibrary";</div><div class='ctx'> const char _RuntimeTypeInfo[]                   = "RuntimeTypeInfo";</div><div class='del'>-const char _SccProjectName[]                    = "SccProjectName";</div><div class='del'>-const char _SccLocalPath[]                      = "SccLocalPath";</div><div class='ctx'> const char _SectionAlignment[]                  = "SectionAlignment";</div><div class='ctx'> const char _ServerStubFile[]                    = "ServerStubFile";</div><div class='ctx'> const char _SetChecksum[]                       = "SetChecksum";</div><div class='ctx'> const char _ShowIncludes[]                      = "ShowIncludes";</div><div class='ctx'> const char _ShowProgress[]                      = "ShowProgress";</div><div class='ctx'> const char _SmallerTypeCheck[]                  = "SmallerTypeCheck";</div><div class='del'>-const char _SpecifySectionAttributes[]          = "SpecifySectionAttributes";</div><div class='ctx'> const char _StackCommitSize[]                   = "StackCommitSize";</div><div class='ctx'> const char _StackReserveSize[]                  = "StackReserveSize";</div><div class='ctx'> const char _StringPooling[]                     = "StringPooling";</div><div class='hunk'>@@ -294,19 +239,12 @@ const char _UACExecutionLevel[]                 = "UACExecutionLevel";</div><div class='ctx'> const char _UACUIAccess[]                       = "UACUIAccess";</div><div class='ctx'> const char _UndefineAllPreprocessorDefinitions[]= "UndefineAllPreprocessorDefinitions";</div><div class='ctx'> const char _UndefinePreprocessorDefinitions[]   = "UndefinePreprocessorDefinitions";</div><div class='del'>-const char _UniqueIdentifier[]                  = "UniqueIdentifier";</div><div class='ctx'> const char _UseFullPaths[]                      = "UseFullPaths";</div><div class='ctx'> const char _UseOfATL[]                          = "UseOfATL";</div><div class='ctx'> const char _UseOfMfc[]                          = "UseOfMfc";</div><div class='del'>-const char _UsePrecompiledHeader[]              = "UsePrecompiledHeader";</div><div class='ctx'> const char _UseUnicodeForAssemblerListing[]     = "UseUnicodeForAssemblerListing";</div><div class='ctx'> const char _ValidateAllParameters[]             = "ValidateAllParameters";</div><div class='del'>-const char _VCCLCompilerTool[]                  = "VCCLCompilerTool";</div><div class='del'>-const char _VCLibrarianTool[]                   = "VCLibrarianTool";</div><div class='del'>-const char _VCLinkerTool[]                      = "VCLinkerTool";</div><div class='ctx'> const char _VCCustomBuildTool[]                 = "VCCustomBuildTool";</div><div class='del'>-const char _VCResourceCompilerTool[]            = "VCResourceCompilerTool";</div><div class='del'>-const char _VCMIDLTool[]                        = "VCMIDLTool";</div><div class='ctx'> const char _Verbose[]                           = "Verbose";</div><div class='ctx'> const char _Version[]                           = "Version";</div><div class='ctx'> const char _WarnAsError[]                       = "WarnAsError";</div><div class='hunk'>@@ -343,7 +281,6 @@ inline XmlOutput::xml_output attrTagS(const char *name, const QString &amp;v)</div><div class='ctx'>     return tagValue(name, v);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> inline XmlOutput::xml_output attrTagX(const char *name, const QStringList &amp;v, const char *s = ",")</div><div class='ctx'> {</div><div class='ctx'>     if(v.isEmpty())</div><div class='hunk'>@@ -376,743 +313,1013 @@ inline XmlOutput::xml_output valueTagT( const triState v)</div><div class='ctx'>     return valueTag(v == _True ? "true" : "false");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static QString vcxCommandSeparator()</div><div class='ctx'> {</div><div class='ctx'>     // MSBuild puts the contents of the custom commands into a batch file and calls it.</div><div class='ctx'>     // As we want every sub-command to be error-checked (as is done by makefile-based</div><div class='ctx'>     // backends), we insert the checks ourselves, using the undocumented jump target.</div><div class='ctx'>     static QString cmdSep =</div><div class='del'>-            QLatin1String("&amp;#x000D;&amp;#x000A;if errorlevel 1 goto VCEnd&amp;#x000D;&amp;#x000A;");</div><div class='add'>+    QLatin1String("&amp;#x000D;&amp;#x000A;if errorlevel 1 goto VCEnd&amp;#x000D;&amp;#x000A;");</div><div class='ctx'>     return cmdSep;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// VCXCLCompilerTool -------------------------------------------------</div><div class='del'>-VCXCLCompilerTool::VCXCLCompilerTool()</div><div class='del'>-    :   BrowseInformation(_False),</div><div class='del'>-        BufferSecurityCheck(_False),</div><div class='del'>-        CreateHotpatchableImage(unset),</div><div class='del'>-        DisableLanguageExtensions(unset),</div><div class='del'>-        EnableFiberSafeOptimizations(unset),</div><div class='del'>-        EnablePREfast(unset),</div><div class='del'>-        ExpandAttributedSource(unset),</div><div class='del'>-        FloatingPointExceptions(unset),</div><div class='del'>-        ForceConformanceInForLoopScope(unset),</div><div class='del'>-        FunctionLevelLinking(unset),</div><div class='del'>-        GenerateXMLDocumentationFiles(unset),</div><div class='del'>-        IgnoreStandardIncludePath(unset),</div><div class='del'>-        IntrinsicFunctions(unset),</div><div class='del'>-        MinimalRebuild(unset),</div><div class='del'>-        MultiProcessorCompilation(unset),</div><div class='del'>-        OmitDefaultLibName(unset),</div><div class='del'>-        OmitFramePointers(unset),</div><div class='del'>-        Optimization("Disabled"),</div><div class='del'>-        OpenMPSupport(unset),</div><div class='del'>-        PreprocessKeepComments(unset),</div><div class='del'>-        PreprocessSuppressLineNumbers(unset),</div><div class='del'>-        RuntimeTypeInfo(unset),</div><div class='del'>-        ShowIncludes(unset),</div><div class='del'>-        SmallerTypeCheck(unset),</div><div class='del'>-        StringPooling(unset),</div><div class='del'>-        SuppressStartupBanner(unset),</div><div class='del'>-        TreatWarningAsError(unset),</div><div class='del'>-        TreatWChar_tAsBuiltInType(unset),</div><div class='del'>-        UndefineAllPreprocessorDefinitions(unset),</div><div class='del'>-        UseFullPaths(unset),</div><div class='del'>-        UseUnicodeForAssemblerListing(unset),</div><div class='del'>-        WholeProgramOptimization(unset)</div><div class='add'>+// Tree file generation ---------------------------------------------</div><div class='add'>+void XTreeNode::generateXML(XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const QString &amp;tagName, VCProject &amp;tool, const QString &amp;filter) {</div><div class='add'>+</div><div class='add'>+    if (children.size()) {</div><div class='add'>+        // Filter</div><div class='add'>+        QString tempFilterName;</div><div class='add'>+        ChildrenMap::ConstIterator it, end = children.constEnd();</div><div class='add'>+        if (!tagName.isEmpty()) {</div><div class='add'>+            tempFilterName.append(filter);</div><div class='add'>+            tempFilterName.append("\\");</div><div class='add'>+            tempFilterName.append(tagName);</div><div class='add'>+            xmlFilter &lt;&lt; tag(_ItemGroup);</div><div class='add'>+            xmlFilter &lt;&lt; tag("Filter")</div><div class='add'>+                      &lt;&lt; attrTag("Include", tempFilterName)</div><div class='add'>+                      &lt;&lt; closetag();</div><div class='add'>+            xmlFilter &lt;&lt; closetag();</div><div class='add'>+        }</div><div class='add'>+        // First round, do nested filters</div><div class='add'>+        for (it = children.constBegin(); it != end; ++it)</div><div class='add'>+            if ((*it)-&gt;children.size())</div><div class='add'>+            {</div><div class='add'>+                if ( !tempFilterName.isEmpty() )</div><div class='add'>+                    (*it)-&gt;generateXML(xml, xmlFilter, it.key(), tool, tempFilterName);</div><div class='add'>+                else</div><div class='add'>+                    (*it)-&gt;generateXML(xml, xmlFilter, it.key(), tool, filter);</div><div class='add'>+            }</div><div class='add'>+        // Second round, do leafs</div><div class='add'>+        for (it = children.constBegin(); it != end; ++it)</div><div class='add'>+            if (!(*it)-&gt;children.size())</div><div class='add'>+            {</div><div class='add'>+                if ( !tempFilterName.isEmpty() )</div><div class='add'>+                    (*it)-&gt;generateXML(xml, xmlFilter, it.key(), tool, tempFilterName);</div><div class='add'>+                else</div><div class='add'>+                    (*it)-&gt;generateXML(xml, xmlFilter, it.key(), tool, filter);</div><div class='add'>+            }</div><div class='add'>+    } else {</div><div class='add'>+        // Leaf</div><div class='add'>+        xml &lt;&lt; tag(_ItemGroup);</div><div class='add'>+        xmlFilter &lt;&lt; tag(_ItemGroup);</div><div class='add'>+        VCXProjectWriter::outputFileConfigs(tool, xml, xmlFilter, info, filter);</div><div class='add'>+        xmlFilter &lt;&lt; closetag();</div><div class='add'>+        xml &lt;&lt; closetag();</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Flat file generation ---------------------------------------------</div><div class='add'>+void XFlatNode::generateXML(XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const QString &amp;/*tagName*/, VCProject &amp;tool, const QString &amp;filter) {</div><div class='add'>+    if (children.size()) {</div><div class='add'>+        ChildrenMapFlat::ConstIterator it = children.constBegin();</div><div class='add'>+        ChildrenMapFlat::ConstIterator end = children.constEnd();</div><div class='add'>+        xml &lt;&lt; tag(_ItemGroup);</div><div class='add'>+        xmlFilter &lt;&lt; tag(_ItemGroup);</div><div class='add'>+        for (; it != end; ++it) {</div><div class='add'>+            VCXProjectWriter::outputFileConfigs(tool, xml, xmlFilter, (*it), filter);</div><div class='add'>+        }</div><div class='add'>+        xml &lt;&lt; closetag();</div><div class='add'>+        xmlFilter &lt;&lt; closetag();</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void VCXProjectWriter::write(XmlOutput &amp;xml, VCProjectSingleConfig &amp;tool)</div><div class='ctx'> {</div><div class='add'>+    xml.setIndentString("  ");</div><div class='add'>+</div><div class='add'>+    xml &lt;&lt; decl("1.0", "utf-8")</div><div class='add'>+        &lt;&lt; tag("Project")</div><div class='add'>+        &lt;&lt; attrTag("DefaultTargets","Build")</div><div class='add'>+        &lt;&lt; attrTag("ToolsVersion", "4.0")</div><div class='add'>+        &lt;&lt; attrTag("xmlns", "http://schemas.microsoft.com/developer/msbuild/2003")</div><div class='add'>+        &lt;&lt; tag("ItemGroup")</div><div class='add'>+        &lt;&lt; attrTag("Label", "ProjectConfigurations");</div><div class='add'>+</div><div class='add'>+    xml &lt;&lt; tag("ProjectConfiguration")</div><div class='add'>+        &lt;&lt; attrTag("Include" , tool.Configuration.Name)</div><div class='add'>+        &lt;&lt; tagValue("Configuration", tool.Configuration.ConfigurationName)</div><div class='add'>+        &lt;&lt; tagValue("Platform", tool.PlatformName)</div><div class='add'>+        &lt;&lt; closetag();</div><div class='add'>+</div><div class='add'>+    xml &lt;&lt; closetag()</div><div class='add'>+        &lt;&lt; tag("PropertyGroup")</div><div class='add'>+        &lt;&lt; attrTag("Label", "Globals")</div><div class='add'>+        &lt;&lt; tagValue("ProjectGuid", tool.ProjectGUID)</div><div class='add'>+        &lt;&lt; tagValue("RootNamespace", tool.Name)</div><div class='add'>+        &lt;&lt; tagValue("Keyword", tool.Keyword)</div><div class='add'>+        &lt;&lt; closetag();</div><div class='add'>+</div><div class='add'>+    // config part.</div><div class='add'>+    xml &lt;&lt; import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.Default.props");</div><div class='add'>+</div><div class='add'>+    write(xml, tool.Configuration);</div><div class='add'>+</div><div class='add'>+    xml &lt;&lt; import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.props");</div><div class='add'>+</div><div class='add'>+    // Extension settings</div><div class='add'>+    xml &lt;&lt; tag("ImportGroup")</div><div class='add'>+        &lt;&lt; attrTag("Label", "ExtensionSettings")</div><div class='add'>+        &lt;&lt; closetag();</div><div class='add'>+</div><div class='add'>+    // PropertySheets</div><div class='add'>+    xml &lt;&lt; tag("ImportGroup")</div><div class='add'>+        &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='add'>+        &lt;&lt; attrTag("Label", "PropertySheets");</div><div class='add'>+</div><div class='add'>+    xml &lt;&lt; tag("Import")</div><div class='add'>+        &lt;&lt; attrTag("Project", "$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props")</div><div class='add'>+        &lt;&lt; attrTag("Condition", "exists('$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props')")</div><div class='add'>+        &lt;&lt; closetag()</div><div class='add'>+        &lt;&lt; closetag();</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    // UserMacros</div><div class='add'>+    xml &lt;&lt; tag("PropertyGroup")</div><div class='add'>+        &lt;&lt; attrTag("Label", "UserMacros")</div><div class='add'>+        &lt;&lt; closetag();</div><div class='add'>+</div><div class='add'>+    xml &lt;&lt; tag("PropertyGroup");</div><div class='add'>+</div><div class='add'>+    if ( !tool.Configuration.OutputDirectory.isEmpty() ) {</div><div class='add'>+        xml&lt;&lt; tag("OutDir")</div><div class='add'>+            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='add'>+            &lt;&lt; valueTag(tool.Configuration.OutputDirectory);</div><div class='add'>+    }</div><div class='add'>+    if ( !tool.Configuration.IntermediateDirectory.isEmpty() ) {</div><div class='add'>+        xml&lt;&lt; tag("IntDir")</div><div class='add'>+            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='add'>+            &lt;&lt; valueTag(tool.Configuration.IntermediateDirectory);</div><div class='add'>+    }</div><div class='add'>+    if ( !tool.Configuration.PrimaryOutput.isEmpty() ) {</div><div class='add'>+        xml&lt;&lt; tag("TargetName")</div><div class='add'>+            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='add'>+            &lt;&lt; valueTag(tool.Configuration.PrimaryOutput);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if ( tool.Configuration.linker.IgnoreImportLibrary != unset) {</div><div class='add'>+        xml&lt;&lt; tag("IgnoreImportLibrary")</div><div class='add'>+            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='add'>+            &lt;&lt; valueTagT(tool.Configuration.linker.IgnoreImportLibrary);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if ( tool.Configuration.linker.LinkIncremental != linkIncrementalDefault) {</div><div class='add'>+        const triState ts = (tool.Configuration.linker.LinkIncremental == linkIncrementalYes ? _True : _False);</div><div class='add'>+        xml&lt;&lt; tag("LinkIncremental")</div><div class='add'>+            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='add'>+            &lt;&lt; valueTagT(ts);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if ( tool.Configuration.preBuild.ExcludedFromBuild != unset )</div><div class='add'>+    {</div><div class='add'>+        xml&lt;&lt; tag("PreBuildEventUseInBuild")</div><div class='add'>+            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='add'>+            &lt;&lt; valueTagT(!tool.Configuration.preBuild.ExcludedFromBuild);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if ( tool.Configuration.preLink.ExcludedFromBuild != unset )</div><div class='add'>+    {</div><div class='add'>+        xml&lt;&lt; tag("PreLinkEventUseInBuild")</div><div class='add'>+            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='add'>+            &lt;&lt; valueTagT(!tool.Configuration.preLink.ExcludedFromBuild);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if ( tool.Configuration.postBuild.ExcludedFromBuild != unset )</div><div class='add'>+    {</div><div class='add'>+        xml&lt;&lt; tag("PostBuildEventUseInBuild")</div><div class='add'>+            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='add'>+            &lt;&lt; valueTagT(!tool.Configuration.postBuild.ExcludedFromBuild);</div><div class='add'>+    }</div><div class='add'>+    xml &lt;&lt; closetag();</div><div class='add'>+</div><div class='add'>+    xml &lt;&lt; tag("ItemDefinitionGroup")</div><div class='add'>+        &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name));</div><div class='add'>+</div><div class='add'>+    // ClCompile</div><div class='add'>+    write(xml, tool.Configuration.compiler);</div><div class='add'>+</div><div class='add'>+    // Link</div><div class='add'>+    write(xml, tool.Configuration.linker);</div><div class='add'>+</div><div class='add'>+    // Midl</div><div class='add'>+    write(xml, tool.Configuration.idl);</div><div class='add'>+</div><div class='add'>+    // ResourceCompiler</div><div class='add'>+    write(xml, tool.Configuration.resource);</div><div class='add'>+</div><div class='add'>+    // Post build event</div><div class='add'>+    if ( tool.Configuration.postBuild.ExcludedFromBuild != unset )</div><div class='add'>+        write(xml, tool.Configuration.postBuild);</div><div class='add'>+</div><div class='add'>+    // Pre build event</div><div class='add'>+    if ( tool.Configuration.preBuild.ExcludedFromBuild != unset )</div><div class='add'>+        write(xml, tool.Configuration.preBuild);</div><div class='add'>+</div><div class='add'>+    // Pre link event</div><div class='add'>+    if ( tool.Configuration.preLink.ExcludedFromBuild != unset )</div><div class='add'>+        write(xml, tool.Configuration.preLink);</div><div class='add'>+</div><div class='add'>+    xml &lt;&lt; closetag();</div><div class='add'>+</div><div class='add'>+    QFile filterFile;</div><div class='add'>+    filterFile.setFileName(Option::output.fileName().append(".filters"));</div><div class='add'>+    filterFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);</div><div class='add'>+    QTextStream ts(&amp;filterFile);</div><div class='add'>+    XmlOutput xmlFilter(ts, XmlOutput::NoConversion);</div><div class='add'>+</div><div class='add'>+    xmlFilter.setIndentString("  ");</div><div class='add'>+</div><div class='add'>+    xmlFilter &lt;&lt; decl("1.0", "utf-8")</div><div class='add'>+              &lt;&lt; tag("Project")</div><div class='add'>+              &lt;&lt; attrTag("ToolsVersion", "4.0")</div><div class='add'>+              &lt;&lt; attrTag("xmlns", "http://schemas.microsoft.com/developer/msbuild/2003");</div><div class='add'>+</div><div class='add'>+    xmlFilter &lt;&lt; tag("ItemGroup");</div><div class='add'>+</div><div class='add'>+    VCProject tempProj;</div><div class='add'>+    tempProj.SingleProjects += tool;</div><div class='add'>+</div><div class='add'>+    addFilters(tempProj, xmlFilter, "Form Files");</div><div class='add'>+    addFilters(tempProj, xmlFilter, "Generated Files");</div><div class='add'>+    addFilters(tempProj, xmlFilter, "Header Files");</div><div class='add'>+    addFilters(tempProj, xmlFilter, "LexYacc Files");</div><div class='add'>+    addFilters(tempProj, xmlFilter, "Resource Files");</div><div class='add'>+    addFilters(tempProj, xmlFilter, "Source Files");</div><div class='add'>+    addFilters(tempProj, xmlFilter, "Translation Files");</div><div class='add'>+    xmlFilter &lt;&lt; closetag();</div><div class='add'>+</div><div class='add'>+    outputFilter(tempProj, xml, xmlFilter, "Source Files");</div><div class='add'>+    outputFilter(tempProj, xml, xmlFilter, "Header Files");</div><div class='add'>+    outputFilter(tempProj, xml, xmlFilter, "Generated Files");</div><div class='add'>+    outputFilter(tempProj, xml, xmlFilter, "LexYacc Files");</div><div class='add'>+    outputFilter(tempProj, xml, xmlFilter, "Translation Files");</div><div class='add'>+    outputFilter(tempProj, xml, xmlFilter, "Form Files");</div><div class='add'>+    outputFilter(tempProj, xml, xmlFilter, "Resource Files");</div><div class='add'>+</div><div class='add'>+    for (int x = 0; x &lt; tempProj.ExtraCompilers.count(); ++x) {</div><div class='add'>+        outputFilter(tempProj, xml, xmlFilter, tempProj.ExtraCompilers.at(x));</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    xml &lt;&lt; import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.targets");</div><div class='add'>+</div><div class='add'>+    xml &lt;&lt; tag("ImportGroup")</div><div class='add'>+        &lt;&lt; attrTag("Label", "ExtensionTargets")</div><div class='add'>+        &lt;&lt; closetag();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCXCLCompilerTool &amp;tool)</div><div class='add'>+void VCXProjectWriter::write(XmlOutput &amp;xml, VCProject &amp;tool)</div><div class='ctx'> {</div><div class='del'>-    return xml</div><div class='add'>+    if (tool.SingleProjects.count() == 0) {</div><div class='add'>+        warn_msg(WarnLogic, "Generator: .NET: no single project in merge project, no output");</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    xml.setIndentString("  ");</div><div class='add'>+</div><div class='add'>+    xml &lt;&lt; decl("1.0", "utf-8")</div><div class='add'>+        &lt;&lt; tag("Project")</div><div class='add'>+        &lt;&lt; attrTag("DefaultTargets","Build")</div><div class='add'>+        &lt;&lt; attrTag("ToolsVersion", "4.0")</div><div class='add'>+        &lt;&lt; attrTag("xmlns", "http://schemas.microsoft.com/developer/msbuild/2003")</div><div class='add'>+        &lt;&lt; tag("ItemGroup")</div><div class='add'>+        &lt;&lt; attrTag("Label", "ProjectConfigurations");</div><div class='add'>+</div><div class='add'>+    for (int i = 0; i &lt; tool.SingleProjects.count(); ++i) {</div><div class='add'>+        xml &lt;&lt; tag("ProjectConfiguration")</div><div class='add'>+            &lt;&lt; attrTag("Include" , tool.SingleProjects.at(i).Configuration.Name)</div><div class='add'>+            &lt;&lt; tagValue("Configuration", tool.SingleProjects.at(i).Configuration.ConfigurationName)</div><div class='add'>+            &lt;&lt; tagValue("Platform", tool.SingleProjects.at(i).PlatformName)</div><div class='add'>+            &lt;&lt; closetag();</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    xml &lt;&lt; closetag()</div><div class='add'>+        &lt;&lt; tag("PropertyGroup")</div><div class='add'>+        &lt;&lt; attrTag("Label", "Globals")</div><div class='add'>+        &lt;&lt; tagValue("ProjectGuid", tool.ProjectGUID)</div><div class='add'>+        &lt;&lt; tagValue("RootNamespace", tool.Name)</div><div class='add'>+        &lt;&lt; tagValue("Keyword", tool.Keyword)</div><div class='add'>+        &lt;&lt; closetag();</div><div class='add'>+</div><div class='add'>+    // config part.</div><div class='add'>+    xml &lt;&lt; import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.Default.props");</div><div class='add'>+    for (int i = 0; i &lt; tool.SingleProjects.count(); ++i)</div><div class='add'>+        write(xml, tool.SingleProjects.at(i).Configuration);</div><div class='add'>+    xml &lt;&lt; import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.props");</div><div class='add'>+</div><div class='add'>+    // Extension settings</div><div class='add'>+    xml &lt;&lt; tag("ImportGroup")</div><div class='add'>+        &lt;&lt; attrTag("Label", "ExtensionSettings")</div><div class='add'>+        &lt;&lt; closetag();</div><div class='add'>+</div><div class='add'>+    // PropertySheets</div><div class='add'>+    for (int i = 0; i &lt; tool.SingleProjects.count(); ++i) {</div><div class='add'>+        xml &lt;&lt; tag("ImportGroup")</div><div class='add'>+            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='add'>+            &lt;&lt; attrTag("Label", "PropertySheets");</div><div class='add'>+</div><div class='add'>+        xml &lt;&lt; tag("Import")</div><div class='add'>+            &lt;&lt; attrTag("Project", "$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props")</div><div class='add'>+            &lt;&lt; attrTag("Condition", "exists('$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props')")</div><div class='add'>+            &lt;&lt; closetag()</div><div class='add'>+            &lt;&lt; closetag();</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    // UserMacros</div><div class='add'>+    xml &lt;&lt; tag("PropertyGroup")</div><div class='add'>+        &lt;&lt; attrTag("Label", "UserMacros")</div><div class='add'>+        &lt;&lt; closetag();</div><div class='add'>+</div><div class='add'>+    xml &lt;&lt; tag("PropertyGroup");</div><div class='add'>+    for (int i = 0; i &lt; tool.SingleProjects.count(); ++i) {</div><div class='add'>+</div><div class='add'>+        if ( !tool.SingleProjects.at(i).Configuration.OutputDirectory.isEmpty() ) {</div><div class='add'>+            xml &lt;&lt; tag("OutDir")</div><div class='add'>+                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='add'>+                &lt;&lt; valueTag(tool.SingleProjects.at(i).Configuration.OutputDirectory);</div><div class='add'>+        }</div><div class='add'>+        if ( !tool.SingleProjects.at(i).Configuration.IntermediateDirectory.isEmpty() ) {</div><div class='add'>+            xml &lt;&lt; tag("IntDir")</div><div class='add'>+                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='add'>+                &lt;&lt; valueTag(tool.SingleProjects.at(i).Configuration.IntermediateDirectory);</div><div class='add'>+        }</div><div class='add'>+        if ( !tool.SingleProjects.at(i).Configuration.PrimaryOutput.isEmpty() ) {</div><div class='add'>+            xml &lt;&lt; tag("TargetName")</div><div class='add'>+                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='add'>+                &lt;&lt; valueTag(tool.SingleProjects.at(i).Configuration.PrimaryOutput);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if ( tool.SingleProjects.at(i).Configuration.linker.IgnoreImportLibrary != unset) {</div><div class='add'>+            xml &lt;&lt; tag("IgnoreImportLibrary")</div><div class='add'>+                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='add'>+                &lt;&lt; valueTagT(tool.SingleProjects.at(i).Configuration.linker.IgnoreImportLibrary);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if ( tool.SingleProjects.at(i).Configuration.linker.LinkIncremental != unset) {</div><div class='add'>+            const triState ts = (tool.SingleProjects.at(i).Configuration.linker.LinkIncremental == linkIncrementalYes ? _True : _False);</div><div class='add'>+            xml &lt;&lt; tag("LinkIncremental")</div><div class='add'>+                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='add'>+                &lt;&lt; valueTagT(ts);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if ( tool.SingleProjects.at(i).Configuration.preBuild.ExcludedFromBuild != unset )</div><div class='add'>+        {</div><div class='add'>+            xml &lt;&lt; tag("PreBuildEventUseInBuild")</div><div class='add'>+                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='add'>+                &lt;&lt; valueTagT(!tool.SingleProjects.at(i).Configuration.preBuild.ExcludedFromBuild);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if ( tool.SingleProjects.at(i).Configuration.preLink.ExcludedFromBuild != unset )</div><div class='add'>+        {</div><div class='add'>+            xml &lt;&lt; tag("PreLinkEventUseInBuild")</div><div class='add'>+                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='add'>+                &lt;&lt; valueTagT(!tool.SingleProjects.at(i).Configuration.preLink.ExcludedFromBuild);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if ( tool.SingleProjects.at(i).Configuration.postBuild.ExcludedFromBuild != unset )</div><div class='add'>+        {</div><div class='add'>+            xml &lt;&lt; tag("PostBuildEventUseInBuild")</div><div class='add'>+                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='add'>+                &lt;&lt; valueTagT(!tool.SingleProjects.at(i).Configuration.postBuild.ExcludedFromBuild);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    xml &lt;&lt; closetag();</div><div class='add'>+</div><div class='add'>+    for (int i = 0; i &lt; tool.SingleProjects.count(); ++i) {</div><div class='add'>+        xml &lt;&lt; tag("ItemDefinitionGroup")</div><div class='add'>+            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name));</div><div class='add'>+</div><div class='add'>+        // ClCompile</div><div class='add'>+        write(xml, tool.SingleProjects.at(i).Configuration.compiler);</div><div class='add'>+</div><div class='add'>+        // Link</div><div class='add'>+        write(xml, tool.SingleProjects.at(i).Configuration.linker);</div><div class='add'>+</div><div class='add'>+        // Midl</div><div class='add'>+        write(xml, tool.SingleProjects.at(i).Configuration.idl);</div><div class='add'>+</div><div class='add'>+        // ResourceCompiler</div><div class='add'>+        write(xml, tool.SingleProjects.at(i).Configuration.resource);</div><div class='add'>+</div><div class='add'>+        // Post build event</div><div class='add'>+        if ( tool.SingleProjects.at(i).Configuration.postBuild.ExcludedFromBuild != unset )</div><div class='add'>+            write(xml, tool.SingleProjects.at(i).Configuration.postBuild);</div><div class='add'>+</div><div class='add'>+        // Pre build event</div><div class='add'>+        if ( tool.SingleProjects.at(i).Configuration.preBuild.ExcludedFromBuild != unset )</div><div class='add'>+            write(xml, tool.SingleProjects.at(i).Configuration.preBuild);</div><div class='add'>+</div><div class='add'>+        // Pre link event</div><div class='add'>+        if ( tool.SingleProjects.at(i).Configuration.preLink.ExcludedFromBuild != unset )</div><div class='add'>+            write(xml, tool.SingleProjects.at(i).Configuration.preLink);</div><div class='add'>+</div><div class='add'>+        xml &lt;&lt; closetag();</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    // The file filters are added in a separate file for MSBUILD.</div><div class='add'>+    QFile filterFile;</div><div class='add'>+    filterFile.setFileName(Option::output.fileName().append(".filters"));</div><div class='add'>+    filterFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);</div><div class='add'>+    QTextStream ts(&amp;filterFile);</div><div class='add'>+    XmlOutput xmlFilter(ts, XmlOutput::NoConversion);</div><div class='add'>+</div><div class='add'>+    xmlFilter.setIndentString("  ");</div><div class='add'>+</div><div class='add'>+    xmlFilter &lt;&lt; decl("1.0", "utf-8")</div><div class='add'>+              &lt;&lt; tag("Project")</div><div class='add'>+              &lt;&lt; attrTag("ToolsVersion", "4.0")</div><div class='add'>+              &lt;&lt; attrTag("xmlns", "http://schemas.microsoft.com/developer/msbuild/2003");</div><div class='add'>+</div><div class='add'>+    xmlFilter &lt;&lt; tag("ItemGroup");</div><div class='add'>+</div><div class='add'>+    addFilters(tool, xmlFilter, "Form Files");</div><div class='add'>+    addFilters(tool, xmlFilter, "Generated Files");</div><div class='add'>+    addFilters(tool, xmlFilter, "Header Files");</div><div class='add'>+    addFilters(tool, xmlFilter, "LexYacc Files");</div><div class='add'>+    addFilters(tool, xmlFilter, "Resource Files");</div><div class='add'>+    addFilters(tool, xmlFilter, "Source Files");</div><div class='add'>+    addFilters(tool, xmlFilter, "Translation Files");</div><div class='add'>+    xmlFilter &lt;&lt; closetag();</div><div class='add'>+</div><div class='add'>+    outputFilter(tool, xml, xmlFilter, "Source Files");</div><div class='add'>+    outputFilter(tool, xml, xmlFilter, "Header Files");</div><div class='add'>+    outputFilter(tool, xml, xmlFilter, "Generated Files");</div><div class='add'>+    outputFilter(tool, xml, xmlFilter, "LexYacc Files");</div><div class='add'>+    outputFilter(tool, xml, xmlFilter, "Translation Files");</div><div class='add'>+    outputFilter(tool, xml, xmlFilter, "Form Files");</div><div class='add'>+    outputFilter(tool, xml, xmlFilter, "Resource Files");</div><div class='add'>+    for (int x = 0; x &lt; tool.ExtraCompilers.count(); ++x) {</div><div class='add'>+        outputFilter(tool, xml, xmlFilter, tool.ExtraCompilers.at(x));</div><div class='add'>+    }</div><div class='add'>+    outputFilter(tool, xml, xmlFilter, "Root Files");</div><div class='add'>+</div><div class='add'>+    xml &lt;&lt; import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.targets");</div><div class='add'>+</div><div class='add'>+    xml &lt;&lt; tag("ImportGroup")</div><div class='add'>+        &lt;&lt; attrTag("Label", "ExtensionTargets")</div><div class='add'>+        &lt;&lt; closetag();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(asmListingOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case asmListingAsmMachine:</div><div class='add'>+        return "AssemblyAndMachineCode";</div><div class='add'>+    case asmListingAsmMachineSrc:</div><div class='add'>+        return "All";</div><div class='add'>+    case asmListingAsmSrc:</div><div class='add'>+        return "AssemblyAndSourceCode";</div><div class='add'>+    case asmListingAssemblyOnly:</div><div class='add'>+        return "AssemblyCode";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(basicRuntimeCheckOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case runtimeBasicCheckNone:</div><div class='add'>+        return "";</div><div class='add'>+    case runtimeCheckStackFrame:</div><div class='add'>+        return "StackFrameRuntimeCheck";</div><div class='add'>+    case runtimeCheckUninitVariables:</div><div class='add'>+        return "UninitializedLocalUsageCheck";</div><div class='add'>+    case runtimeBasicCheckAll:</div><div class='add'>+        return "EnableFastChecks";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(callingConventionOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case callConventionCDecl:</div><div class='add'>+        return "Cdecl";</div><div class='add'>+    case callConventionFastCall:</div><div class='add'>+        return "FastCall";</div><div class='add'>+    case callConventionStdCall:</div><div class='add'>+        return "StdCall";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(CompileAsOptions option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case compileAsC:</div><div class='add'>+        return "CompileAsC";</div><div class='add'>+    case compileAsCPlusPlus:</div><div class='add'>+        return "CompileAsCpp";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(compileAsManagedOptions option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case managedAssembly:</div><div class='add'>+        return "true";</div><div class='add'>+    case managedAssemblyPure:</div><div class='add'>+        return "Safe";</div><div class='add'>+    case managedAssemblyOldSyntax:</div><div class='add'>+        return "OldSyntax";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(debugOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case debugOldStyleInfo:</div><div class='add'>+        return "OldStyle";</div><div class='add'>+    case debugEditAndContinue:</div><div class='add'>+        return "EditAndContinue";</div><div class='add'>+    case debugEnabled:</div><div class='add'>+        return "ProgramDatabase";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(enhancedInstructionSetOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case archSSE:</div><div class='add'>+        return "StreamingSIMDExtensions";</div><div class='add'>+    case archSSE2:</div><div class='add'>+        return "StreamingSIMDExtensions2";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(exceptionHandling option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case ehNone:</div><div class='add'>+        return "false";</div><div class='add'>+    case ehNoSEH:</div><div class='add'>+        return "Sync";</div><div class='add'>+    case ehSEH:</div><div class='add'>+        return "Async";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(favorSizeOrSpeedOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case favorSize:</div><div class='add'>+        return "Size";</div><div class='add'>+    case favorSpeed:</div><div class='add'>+        return "Speed";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(floatingPointModel option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case floatingPointFast:</div><div class='add'>+        return "Fast";</div><div class='add'>+    case floatingPointPrecise:</div><div class='add'>+        return "Precise";</div><div class='add'>+    case floatingPointStrict:</div><div class='add'>+        return "Strict";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(inlineExpansionOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case expandDisable:</div><div class='add'>+        return "Disabled";</div><div class='add'>+    case expandOnlyInline:</div><div class='add'>+        return "OnlyExplicitInline";</div><div class='add'>+    case expandAnySuitable:</div><div class='add'>+        return "AnySuitable";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(optimizeOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case optimizeMinSpace:</div><div class='add'>+        return "MinSpace";</div><div class='add'>+    case optimizeMaxSpeed:</div><div class='add'>+        return "MaxSpeed";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(pchOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case pchNone:</div><div class='add'>+         return "NotUsing";</div><div class='add'>+    case pchCreateUsingSpecific:</div><div class='add'>+        return "Create";</div><div class='add'>+    case pchUseUsingSpecific:</div><div class='add'>+        return "Use";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(runtimeLibraryOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case rtMultiThreaded:</div><div class='add'>+        return "MultiThreaded";</div><div class='add'>+    case rtMultiThreadedDLL:</div><div class='add'>+        return "MultiThreadedDLL";</div><div class='add'>+    case rtMultiThreadedDebug:</div><div class='add'>+        return "MultiThreadedDebug";</div><div class='add'>+    case rtMultiThreadedDebugDLL:</div><div class='add'>+        return "MultiThreadedDebugDLL";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(structMemberAlignOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case alignSingleByte:</div><div class='add'>+        return "1Byte";</div><div class='add'>+    case alignTwoBytes:</div><div class='add'>+        return "2Bytes";</div><div class='add'>+    case alignFourBytes:</div><div class='add'>+        return "4Bytes";</div><div class='add'>+    case alignEightBytes:</div><div class='add'>+        return "8Bytes";</div><div class='add'>+    case alignSixteenBytes:</div><div class='add'>+        return "16Bytes";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(warningLevelOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case warningLevel_0:</div><div class='add'>+        return "TurnOffAllWarnings";</div><div class='add'>+    case warningLevel_1:</div><div class='add'>+        return "Level1";</div><div class='add'>+    case warningLevel_2:</div><div class='add'>+        return "Level2";</div><div class='add'>+    case warningLevel_3:</div><div class='add'>+        return "Level3";</div><div class='add'>+    case warningLevel_4:</div><div class='add'>+        return "Level4";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(optLinkTimeCodeGenType option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case optLTCGEnabled:</div><div class='add'>+        return "UseLinkTimeCodeGeneration";</div><div class='add'>+    case optLTCGInstrument:</div><div class='add'>+        return "PGInstrument";</div><div class='add'>+    case optLTCGOptimize:</div><div class='add'>+        return "PGOptimization";</div><div class='add'>+    case optLTCGUpdate:</div><div class='add'>+        return "PGUpdate";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(subSystemOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case subSystemConsole:</div><div class='add'>+        return "Console";</div><div class='add'>+    case subSystemWindows:</div><div class='add'>+        return "Windows";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(machineTypeOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case machineX86:</div><div class='add'>+        return "MachineX86";</div><div class='add'>+    case machineX64:</div><div class='add'>+        return "MachineX64";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(midlCharOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case midlCharUnsigned:</div><div class='add'>+        return "Unsigned";</div><div class='add'>+    case midlCharSigned:</div><div class='add'>+        return "Signed";</div><div class='add'>+    case midlCharAscii7:</div><div class='add'>+        return "Ascii";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(midlErrorCheckOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case midlDisableAll:</div><div class='add'>+        return "None";</div><div class='add'>+    case midlEnableAll:</div><div class='add'>+        return "All";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(midlStructMemberAlignOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case midlAlignSingleByte:</div><div class='add'>+        return "1";</div><div class='add'>+    case midlAlignTwoBytes:</div><div class='add'>+        return "2";</div><div class='add'>+    case midlAlignFourBytes:</div><div class='add'>+        return "4";</div><div class='add'>+    case midlAlignEightBytes:</div><div class='add'>+        return "8";</div><div class='add'>+    case midlAlignSixteenBytes:</div><div class='add'>+        return "16";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(midlTargetEnvironment option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case midlTargetWin32:</div><div class='add'>+        return "Win32";</div><div class='add'>+    case midlTargetWin64:</div><div class='add'>+        return "X64";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(midlWarningLevelOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case midlWarningLevel_0:</div><div class='add'>+        return "0";</div><div class='add'>+    case midlWarningLevel_1:</div><div class='add'>+        return "1";</div><div class='add'>+    case midlWarningLevel_2:</div><div class='add'>+        return "2";</div><div class='add'>+    case midlWarningLevel_3:</div><div class='add'>+        return "3";</div><div class='add'>+    case midlWarningLevel_4:</div><div class='add'>+        return "4";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(enumResourceLangID option)</div><div class='add'>+{</div><div class='add'>+    if (option == 0)</div><div class='add'>+        return QString();</div><div class='add'>+    else</div><div class='add'>+        return QString::number(qlonglong(option));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(charSet option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case charSetNotSet:</div><div class='add'>+        return "NotSet";</div><div class='add'>+    case charSetUnicode:</div><div class='add'>+        return "Unicode";</div><div class='add'>+    case charSetMBCS:</div><div class='add'>+        return "MultiByte";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(ConfigurationTypes option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case typeApplication:</div><div class='add'>+        return "Application";</div><div class='add'>+    case typeDynamicLibrary:</div><div class='add'>+        return "DynamicLibrary";</div><div class='add'>+    case typeStaticLibrary:</div><div class='add'>+        return "StaticLibrary";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(useOfATL option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case useATLStatic:</div><div class='add'>+        return "Static";</div><div class='add'>+    case useATLDynamic:</div><div class='add'>+        return "Dynamic";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString toString(useOfMfc option)</div><div class='add'>+{</div><div class='add'>+    switch (option) {</div><div class='add'>+    case useMfcStatic:</div><div class='add'>+        return "Static";</div><div class='add'>+    case useMfcDynamic:</div><div class='add'>+        return "Dynamic";</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline triState toTriState(browseInfoOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option)</div><div class='add'>+    {</div><div class='add'>+    case brInfoNone:</div><div class='add'>+        return _False;</div><div class='add'>+    case brAllInfo:</div><div class='add'>+    case brNoLocalSymbols:</div><div class='add'>+        return _True;</div><div class='add'>+    }</div><div class='add'>+    return unset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline triState toTriState(preprocessOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option)</div><div class='add'>+    {</div><div class='add'>+    case preprocessNo:</div><div class='add'>+        return _False;</div><div class='add'>+    case preprocessNoLineNumbers:</div><div class='add'>+    case preprocessYes:</div><div class='add'>+        return _True;</div><div class='add'>+    }</div><div class='add'>+    return unset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline triState toTriState(optFoldingType option)</div><div class='add'>+{</div><div class='add'>+    switch (option)</div><div class='add'>+    {</div><div class='add'>+    case optNoFolding:</div><div class='add'>+        return _False;</div><div class='add'>+    case optFolding:</div><div class='add'>+        return _True;</div><div class='add'>+    }</div><div class='add'>+    return unset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline triState toTriState(addressAwarenessType option)</div><div class='add'>+{</div><div class='add'>+    switch (option)</div><div class='add'>+    {</div><div class='add'>+    case addrAwareDefault:</div><div class='add'>+        return unset;</div><div class='add'>+    case addrAwareNoLarge:</div><div class='add'>+        return _False;</div><div class='add'>+    case addrAwareLarge:</div><div class='add'>+        return _True;</div><div class='add'>+    }</div><div class='add'>+    return unset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline triState toTriState(linkIncrementalType option)</div><div class='add'>+{</div><div class='add'>+    switch (option)</div><div class='add'>+    {</div><div class='add'>+    case linkIncrementalDefault:</div><div class='add'>+        return unset;</div><div class='add'>+    case linkIncrementalNo:</div><div class='add'>+        return _False;</div><div class='add'>+    case linkIncrementalYes:</div><div class='add'>+        return _True;</div><div class='add'>+    }</div><div class='add'>+    return unset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline triState toTriState(linkProgressOption option)</div><div class='add'>+{</div><div class='add'>+    switch (option)</div><div class='add'>+    {</div><div class='add'>+    case linkProgressNotSet:</div><div class='add'>+        return unset;</div><div class='add'>+    case linkProgressAll:</div><div class='add'>+    case linkProgressLibs:</div><div class='add'>+        return _True;</div><div class='add'>+    }</div><div class='add'>+    return unset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline triState toTriState(optRefType option)</div><div class='add'>+{</div><div class='add'>+    switch (option)</div><div class='add'>+    {</div><div class='add'>+    case optReferencesDefault:</div><div class='add'>+        return unset;</div><div class='add'>+    case optNoReferences:</div><div class='add'>+        return _False;</div><div class='add'>+    case optReferences:</div><div class='add'>+        return _True;</div><div class='add'>+    }</div><div class='add'>+    return unset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline triState toTriState(termSvrAwarenessType option)</div><div class='add'>+{</div><div class='add'>+    switch (option)</div><div class='add'>+    {</div><div class='add'>+    case termSvrAwareDefault:</div><div class='add'>+        return unset;</div><div class='add'>+    case termSvrAwareNo:</div><div class='add'>+        return _False;</div><div class='add'>+    case termSvrAwareYes:</div><div class='add'>+        return _True;</div><div class='add'>+    }</div><div class='add'>+    return unset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void VCXProjectWriter::write(XmlOutput &amp;xml, const VCCLCompilerTool &amp;tool)</div><div class='add'>+{</div><div class='add'>+    xml</div><div class='ctx'>         &lt;&lt; tag(_CLCompile)</div><div class='ctx'>             &lt;&lt; attrTagX(_AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories, ";")</div><div class='ctx'>             &lt;&lt; attrTagX(_AdditionalOptions, tool.AdditionalOptions, " ")</div><div class='ctx'>             &lt;&lt; attrTagX(_AdditionalUsingDirectories, tool.AdditionalUsingDirectories, ";")</div><div class='del'>-            &lt;&lt; attrTagS(_AlwaysAppend, tool.AlwaysAppend)</div><div class='add'>+//unused    &lt;&lt; attrTagS(_AlwaysAppend, tool.AlwaysAppend)</div><div class='ctx'>             &lt;&lt; attrTagS(_AssemblerListingLocation, tool.AssemblerListingLocation)</div><div class='del'>-            &lt;&lt; attrTagS(_AssemblerOutput, tool.AssemblerOutput)</div><div class='del'>-            &lt;&lt; attrTagS(_BasicRuntimeChecks, tool.BasicRuntimeChecks)</div><div class='del'>-            &lt;&lt; attrTagT(_BrowseInformation, tool.BrowseInformation)</div><div class='add'>+            &lt;&lt; attrTagS(_AssemblerOutput, toString(tool.AssemblerOutput))</div><div class='add'>+            &lt;&lt; attrTagS(_BasicRuntimeChecks, toString(tool.BasicRuntimeChecks))</div><div class='add'>+            &lt;&lt; attrTagT(_BrowseInformation, toTriState(tool.BrowseInformation))</div><div class='ctx'>             &lt;&lt; attrTagS(_BrowseInformationFile, tool.BrowseInformationFile)</div><div class='ctx'>             &lt;&lt; attrTagT(_BufferSecurityCheck, tool.BufferSecurityCheck)</div><div class='del'>-            &lt;&lt; attrTagS(_CallingConvention, tool.CallingConvention)</div><div class='del'>-            &lt;&lt; attrTagS(_CompileAs, tool.CompileAs)</div><div class='del'>-            &lt;&lt; attrTagS(_CompileAsManaged, tool.CompileAsManaged)</div><div class='add'>+            &lt;&lt; attrTagS(_CallingConvention, toString(tool.CallingConvention))</div><div class='add'>+            &lt;&lt; attrTagS(_CompileAs, toString(tool.CompileAs))</div><div class='add'>+            &lt;&lt; attrTagS(_CompileAsManaged, toString(tool.CompileAsManaged))</div><div class='ctx'>             &lt;&lt; attrTagT(_CreateHotpatchableImage, tool.CreateHotpatchableImage)</div><div class='del'>-            &lt;&lt; attrTagS(_DebugInformationFormat, tool.DebugInformationFormat)</div><div class='add'>+            &lt;&lt; attrTagS(_DebugInformationFormat, toString(tool.DebugInformationFormat))</div><div class='ctx'>             &lt;&lt; attrTagT(_DisableLanguageExtensions, tool.DisableLanguageExtensions)</div><div class='ctx'>             &lt;&lt; attrTagX(_DisableSpecificWarnings, tool.DisableSpecificWarnings, ";")</div><div class='del'>-            &lt;&lt; attrTagS(_EnableEnhancedInstructionSet, tool.EnableEnhancedInstructionSet)</div><div class='add'>+            &lt;&lt; attrTagS(_EnableEnhancedInstructionSet, toString(tool.EnableEnhancedInstructionSet))</div><div class='ctx'>             &lt;&lt; attrTagT(_EnableFiberSafeOptimizations, tool.EnableFiberSafeOptimizations)</div><div class='ctx'>             &lt;&lt; attrTagT(_EnablePREfast, tool.EnablePREfast)</div><div class='ctx'>             &lt;&lt; attrTagS(_ErrorReporting, tool.ErrorReporting)</div><div class='del'>-            &lt;&lt; attrTagS(_ExceptionHandling, tool.ExceptionHandling)</div><div class='add'>+            &lt;&lt; attrTagS(_ExceptionHandling, toString(tool.ExceptionHandling))</div><div class='ctx'>             &lt;&lt; attrTagT(_ExpandAttributedSource, tool.ExpandAttributedSource)</div><div class='del'>-            &lt;&lt; attrTagS(_FavorSizeOrSpeed, tool.FavorSizeOrSpeed)</div><div class='add'>+            &lt;&lt; attrTagS(_FavorSizeOrSpeed, toString(tool.FavorSizeOrSpeed))</div><div class='ctx'>             &lt;&lt; attrTagT(_FloatingPointExceptions, tool.FloatingPointExceptions)</div><div class='del'>-            &lt;&lt; attrTagS(_FloatingPointModel, tool.FloatingPointModel)</div><div class='add'>+            &lt;&lt; attrTagS(_FloatingPointModel, toString(tool.FloatingPointModel))</div><div class='ctx'>             &lt;&lt; attrTagT(_ForceConformanceInForLoopScope, tool.ForceConformanceInForLoopScope)</div><div class='ctx'>             &lt;&lt; attrTagX(_ForcedIncludeFiles, tool.ForcedIncludeFiles, ";")</div><div class='ctx'>             &lt;&lt; attrTagX(_ForcedUsingFiles, tool.ForcedUsingFiles, ";")</div><div class='del'>-            &lt;&lt; attrTagT(_FunctionLevelLinking, tool.FunctionLevelLinking)</div><div class='add'>+            &lt;&lt; attrTagT(_FunctionLevelLinking, tool.EnableFunctionLevelLinking)</div><div class='ctx'>             &lt;&lt; attrTagT(_GenerateXMLDocumentationFiles, tool.GenerateXMLDocumentationFiles)</div><div class='ctx'>             &lt;&lt; attrTagT(_IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath)</div><div class='del'>-            &lt;&lt; attrTagS(_InlineFunctionExpansion, tool.InlineFunctionExpansion)</div><div class='del'>-            &lt;&lt; attrTagT(_IntrinsicFunctions, tool.IntrinsicFunctions)</div><div class='add'>+            &lt;&lt; attrTagS(_InlineFunctionExpansion, toString(tool.InlineFunctionExpansion))</div><div class='add'>+            &lt;&lt; attrTagT(_IntrinsicFunctions, tool.EnableIntrinsicFunctions)</div><div class='ctx'>             &lt;&lt; attrTagT(_MinimalRebuild, tool.MinimalRebuild)</div><div class='ctx'>             &lt;&lt; attrTagT(_MultiProcessorCompilation, tool.MultiProcessorCompilation)</div><div class='del'>-            &lt;&lt; attrTagS(_ObjectFileName, tool.ObjectFileName)</div><div class='del'>-            &lt;&lt; attrTagX(_ObjectFiles, tool.ObjectFiles, ";")</div><div class='add'>+            &lt;&lt; attrTagS(_ObjectFileName, tool.ObjectFile)</div><div class='add'>+//unused    &lt;&lt; attrTagX(_ObjectFiles, tool.ObjectFiles, ";")</div><div class='ctx'>             &lt;&lt; attrTagT(_OmitDefaultLibName, tool.OmitDefaultLibName)</div><div class='ctx'>             &lt;&lt; attrTagT(_OmitFramePointers, tool.OmitFramePointers)</div><div class='del'>-            &lt;&lt; attrTagT(_OpenMPSupport, tool.OpenMPSupport)</div><div class='del'>-            &lt;&lt; attrTagS(_Optimization, tool.Optimization)</div><div class='del'>-            &lt;&lt; attrTagS(_PrecompiledHeader, tool.PrecompiledHeader)</div><div class='del'>-            &lt;&lt; attrTagS(_PrecompiledHeaderFile, tool.PrecompiledHeaderFile)</div><div class='del'>-            &lt;&lt; attrTagS(_PrecompiledHeaderOutputFile, tool.PrecompiledHeaderOutputFile)</div><div class='del'>-            &lt;&lt; attrTagT(_PreprocessKeepComments, tool.PreprocessKeepComments)</div><div class='add'>+            &lt;&lt; attrTagT(_OpenMPSupport, tool.OpenMP)</div><div class='add'>+            &lt;&lt; attrTagS(_Optimization, toString(tool.Optimization))</div><div class='add'>+            &lt;&lt; attrTagS(_PrecompiledHeader, toString(tool.UsePrecompiledHeader))</div><div class='add'>+            &lt;&lt; attrTagS(_PrecompiledHeaderFile, tool.PrecompiledHeaderThrough)</div><div class='add'>+            &lt;&lt; attrTagS(_PrecompiledHeaderOutputFile, tool.PrecompiledHeaderFile)</div><div class='add'>+            &lt;&lt; attrTagT(_PreprocessKeepComments, tool.KeepComments)</div><div class='ctx'>             &lt;&lt; attrTagX(_PreprocessorDefinitions, tool.PreprocessorDefinitions, ";")</div><div class='ctx'>             &lt;&lt; attrTagS(_PreprocessOutputPath, tool.PreprocessOutputPath)</div><div class='ctx'>             &lt;&lt; attrTagT(_PreprocessSuppressLineNumbers, tool.PreprocessSuppressLineNumbers)</div><div class='del'>-            &lt;&lt; attrTagT(_PreprocessToFile, tool.PreprocessToFile)</div><div class='add'>+            &lt;&lt; attrTagT(_PreprocessToFile, toTriState(tool.GeneratePreprocessedFile))</div><div class='ctx'>             &lt;&lt; attrTagS(_ProgramDataBaseFileName, tool.ProgramDataBaseFileName)</div><div class='del'>-            &lt;&lt; attrTagS(_ProcessorNumber, tool.ProcessorNumber)</div><div class='del'>-            &lt;&lt; attrTagS(_RuntimeLibrary, tool.RuntimeLibrary)</div><div class='add'>+            &lt;&lt; attrTagS(_ProcessorNumber, tool.MultiProcessorCompilationProcessorCount)</div><div class='add'>+            &lt;&lt; attrTagS(_RuntimeLibrary, toString(tool.RuntimeLibrary))</div><div class='ctx'>             &lt;&lt; attrTagT(_RuntimeTypeInfo, tool.RuntimeTypeInfo)</div><div class='ctx'>             &lt;&lt; attrTagT(_ShowIncludes, tool.ShowIncludes)</div><div class='ctx'>             &lt;&lt; attrTagT(_SmallerTypeCheck, tool.SmallerTypeCheck)</div><div class='ctx'>             &lt;&lt; attrTagT(_StringPooling, tool.StringPooling)</div><div class='del'>-            &lt;&lt; attrTagS(_StructMemberAlignment, tool.StructMemberAlignment)</div><div class='add'>+            &lt;&lt; attrTagS(_StructMemberAlignment, toString(tool.StructMemberAlignment))</div><div class='ctx'>             &lt;&lt; attrTagT(_SuppressStartupBanner, tool.SuppressStartupBanner)</div><div class='del'>-            &lt;&lt; attrTagS(_TreatSpecificWarningsAsErrors, tool.TreatSpecificWarningsAsErrors)</div><div class='del'>-            &lt;&lt; attrTagT(_TreatWarningAsError, tool.TreatWarningAsError)</div><div class='add'>+//unused    &lt;&lt; attrTagS(_TreatSpecificWarningsAsErrors, tool.TreatSpecificWarningsAsErrors)</div><div class='add'>+            &lt;&lt; attrTagT(_TreatWarningAsError, tool.WarnAsError)</div><div class='ctx'>             &lt;&lt; attrTagT(_TreatWChar_tAsBuiltInType, tool.TreatWChar_tAsBuiltInType)</div><div class='ctx'>             &lt;&lt; attrTagT(_UndefineAllPreprocessorDefinitions, tool.UndefineAllPreprocessorDefinitions)</div><div class='ctx'>             &lt;&lt; attrTagX(_UndefinePreprocessorDefinitions, tool.UndefinePreprocessorDefinitions, ";")</div><div class='del'>-            &lt;&lt; attrTagT(_UseFullPaths, tool.UseFullPaths)</div><div class='add'>+            &lt;&lt; attrTagT(_UseFullPaths, tool.DisplayFullPaths)</div><div class='ctx'>             &lt;&lt; attrTagT(_UseUnicodeForAssemblerListing, tool.UseUnicodeForAssemblerListing)</div><div class='del'>-            &lt;&lt; attrTagS(_WarningLevel, tool.WarningLevel)</div><div class='add'>+            &lt;&lt; attrTagS(_WarningLevel, toString(tool.WarningLevel))</div><div class='ctx'>             &lt;&lt; attrTagT(_WholeProgramOptimization, tool.WholeProgramOptimization)</div><div class='ctx'>             &lt;&lt; attrTagS(_XMLDocumentationFileName, tool.XMLDocumentationFileName)</div><div class='ctx'>         &lt;&lt; closetag(_CLCompile);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool VCXCLCompilerTool::parseOption(const char* option)</div><div class='del'>-{</div><div class='del'>-    // skip index 0 ('/' or '-')</div><div class='del'>-    char first  = option[1];</div><div class='del'>-    char second = option[2];</div><div class='del'>-    char third  = option[3];</div><div class='del'>-    char fourth = option[4];</div><div class='del'>-    bool found = true;</div><div class='del'>-</div><div class='del'>-    switch (first) {</div><div class='del'>-    case '?':</div><div class='del'>-        qWarning("Generator: Option '/?' : MSVC.NET projects do not support outputting help info");</div><div class='del'>-        found = false;</div><div class='del'>-        break;</div><div class='del'>-    case '@':</div><div class='del'>-        qWarning("Generator: Option '/@': MSVC.NET projects do not support the use of a response file");</div><div class='del'>-        found = false;</div><div class='del'>-        break;</div><div class='del'>-    case 'l':</div><div class='del'>-        qWarning("Generator: Option '/link': qmake generator does not support passing link options through the compiler tool");</div><div class='del'>-        found = false;</div><div class='del'>-        break;</div><div class='del'>-    case 'A':</div><div class='del'>-        if(second != 'I') {</div><div class='del'>-            found = false;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        AdditionalUsingDirectories += option+3;</div><div class='del'>-        break;</div><div class='del'>-    case 'C':</div><div class='del'>-        PreprocessKeepComments = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 'D':</div><div class='del'>-        PreprocessorDefinitions += option+2;</div><div class='del'>-        break;</div><div class='del'>-    case 'E':</div><div class='del'>-        if(second == 'H') {</div><div class='del'>-            QString opt(option);</div><div class='del'>-            if (opt.endsWith("EHa"))</div><div class='del'>-                ExceptionHandling = "Async";</div><div class='del'>-            else if (opt.endsWith("EHsc"))</div><div class='del'>-                ExceptionHandling = "Sync";</div><div class='del'>-            else if (opt.endsWith("EHs"))</div><div class='del'>-                ExceptionHandling = "SyncCThrow";</div><div class='del'>-            else {</div><div class='del'>-                ExceptionHandling = "false";</div><div class='del'>-            }</div><div class='del'>-            break;</div><div class='del'>-        }else if(second == 'P') {</div><div class='del'>-            PreprocessSuppressLineNumbers = _True;</div><div class='del'>-        }</div><div class='del'>-        found = false;</div><div class='del'>-        break;</div><div class='del'>-    case 'F':</div><div class='del'>-        if(second &lt;= '9' &amp;&amp; second &gt;= '0') {</div><div class='del'>-            AdditionalOptions += option;</div><div class='del'>-            break;</div><div class='del'>-        } else {</div><div class='del'>-            switch (second) {</div><div class='del'>-            case 'A':</div><div class='del'>-                if(third == 'c') {</div><div class='del'>-                    AssemblerOutput = "AssemblyAndMachineCode";</div><div class='del'>-                    if(fourth == 's')</div><div class='del'>-                        AssemblerOutput = "All";</div><div class='del'>-                } else if(third == 's') {</div><div class='del'>-                    AssemblerOutput = "AssemblyAndSourceCode";</div><div class='del'>-                } else if(third == 'u') {</div><div class='del'>-                    UseUnicodeForAssemblerListing = _True;</div><div class='del'>-                } else {</div><div class='del'>-                    AssemblerOutput = "AssemblyCode";</div><div class='del'>-                }</div><div class='del'>-                break;</div><div class='del'>-            case 'a':</div><div class='del'>-                AssemblerListingLocation = option+3;</div><div class='del'>-                break;</div><div class='del'>-            case 'C':</div><div class='del'>-                UseFullPaths = _True;</div><div class='del'>-                break;</div><div class='del'>-            case 'd':</div><div class='del'>-                ProgramDataBaseFileName = option+3;</div><div class='del'>-                break;</div><div class='del'>-            case 'I':</div><div class='del'>-                ForcedIncludeFiles += option+3;</div><div class='del'>-                break;</div><div class='del'>-            case 'i':</div><div class='del'>-                PreprocessOutputPath += option+3;</div><div class='del'>-                break;</div><div class='del'>-            case 'm':</div><div class='del'>-                AdditionalOptions += option;</div><div class='del'>-                break;</div><div class='del'>-            case 'R':</div><div class='del'>-                BrowseInformation = _True;</div><div class='del'>-                BrowseInformationFile = option+3;</div><div class='del'>-                break;</div><div class='del'>-            case 'r':</div><div class='del'>-                BrowseInformation = _True;</div><div class='del'>-                BrowseInformationFile = option+3;</div><div class='del'>-                break;</div><div class='del'>-            case 'U':</div><div class='del'>-                ForcedUsingFiles += option+3;</div><div class='del'>-                break;</div><div class='del'>-            case 'o':</div><div class='del'>-                ObjectFileName = option+3;</div><div class='del'>-                break;</div><div class='del'>-            case 'p':</div><div class='del'>-                PrecompiledHeaderOutputFile = option+3;</div><div class='del'>-                break;</div><div class='del'>-            case 'x':</div><div class='del'>-                ExpandAttributedSource = _True;</div><div class='del'>-                break;</div><div class='del'>-            default:</div><div class='del'>-                found = false;</div><div class='del'>-                break;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 'G':</div><div class='del'>-        switch (second) {</div><div class='del'>-        case 'F':</div><div class='del'>-            StringPooling = _True;</div><div class='del'>-            break;</div><div class='del'>-        case 'L':</div><div class='del'>-            WholeProgramOptimization = _True;</div><div class='del'>-            if(third == '-')</div><div class='del'>-                WholeProgramOptimization = _False;</div><div class='del'>-            break;</div><div class='del'>-        case 'R':</div><div class='del'>-            RuntimeTypeInfo = _True;</div><div class='del'>-            if(third == '-')</div><div class='del'>-                RuntimeTypeInfo = _False;</div><div class='del'>-            break;</div><div class='del'>-        case 'S':</div><div class='del'>-            BufferSecurityCheck = _True;</div><div class='del'>-            if(third == '-')</div><div class='del'>-                BufferSecurityCheck = _False;</div><div class='del'>-            break;</div><div class='del'>-        case 'T':</div><div class='del'>-            EnableFiberSafeOptimizations = _True;</div><div class='del'>-            break;</div><div class='del'>-        case 'd':</div><div class='del'>-            CallingConvention = "Cdecl";</div><div class='del'>-            break;</div><div class='del'>-        case 'm':</div><div class='del'>-            MinimalRebuild = _True;</div><div class='del'>-            if(third == '-')</div><div class='del'>-                MinimalRebuild = _False;</div><div class='del'>-            break;</div><div class='del'>-        case 'r':</div><div class='del'>-            CallingConvention = "FastCall";</div><div class='del'>-            break;</div><div class='del'>-        case 'y':</div><div class='del'>-            FunctionLevelLinking = _True;</div><div class='del'>-            break;</div><div class='del'>-        case 'z':</div><div class='del'>-            CallingConvention = "StdCall";</div><div class='del'>-            break;</div><div class='del'>-        default:</div><div class='del'>-            found = false;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 'H':</div><div class='del'>-        AdditionalOptions += option;</div><div class='del'>-        break;</div><div class='del'>-    case 'I':</div><div class='del'>-        AdditionalIncludeDirectories += option+2;</div><div class='del'>-        break;</div><div class='del'>-    case 'L':</div><div class='del'>-        if(second == 'D') {</div><div class='del'>-            AdditionalOptions += option;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        found = false;</div><div class='del'>-        break;</div><div class='del'>-    case 'M':</div><div class='del'>-        if(second == 'D') {</div><div class='del'>-            RuntimeLibrary = "MultiThreadedDLL";</div><div class='del'>-            if(third == 'd')</div><div class='del'>-                RuntimeLibrary = "MultiThreadedDebugDLL";</div><div class='del'>-            break;</div><div class='del'>-        } else if(second == 'P') {</div><div class='del'>-            MultiProcessorCompilation = _True;</div><div class='del'>-            ProcessorNumber = option+3;</div><div class='del'>-            break;</div><div class='del'>-        } else if(second == 'T') {</div><div class='del'>-            RuntimeLibrary = "MultiThreaded";</div><div class='del'>-            if(third == 'd')</div><div class='del'>-                RuntimeLibrary = "MultiThreadedDebug";</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        found = false;</div><div class='del'>-        break;</div><div class='del'>-    case 'O':</div><div class='del'>-        switch (second) {</div><div class='del'>-        case '1':</div><div class='del'>-            Optimization = "MinSpace";</div><div class='del'>-            break;</div><div class='del'>-        case '2':</div><div class='del'>-            Optimization = "MaxSpeed";</div><div class='del'>-            break;</div><div class='del'>-        case 'b':</div><div class='del'>-            if(third == '0')</div><div class='del'>-                InlineFunctionExpansion = "Disabled";</div><div class='del'>-            else if(third == '1')</div><div class='del'>-                InlineFunctionExpansion = "OnlyExplicitInline";</div><div class='del'>-            else if(third == '2')</div><div class='del'>-                InlineFunctionExpansion = "AnySuitable";</div><div class='del'>-            else</div><div class='del'>-                found = false;</div><div class='del'>-            break;</div><div class='del'>-        case 'd':</div><div class='del'>-            Optimization = "Disabled";</div><div class='del'>-            break;</div><div class='del'>-        case 'i':</div><div class='del'>-            IntrinsicFunctions = _True;</div><div class='del'>-            break;</div><div class='del'>-        case 'p':</div><div class='del'>-            if(third == 'e')</div><div class='del'>-                OpenMPSupport = _True;</div><div class='del'>-            else</div><div class='del'>-                found = false;</div><div class='del'>-            break;</div><div class='del'>-        case 's':</div><div class='del'>-            FavorSizeOrSpeed = "Size";</div><div class='del'>-            break;</div><div class='del'>-        case 't':</div><div class='del'>-            FavorSizeOrSpeed = "Speed";</div><div class='del'>-            break;</div><div class='del'>-        case 'x':</div><div class='del'>-            Optimization = "Full";</div><div class='del'>-            break;</div><div class='del'>-        case 'y':</div><div class='del'>-            OmitFramePointers = _True;</div><div class='del'>-            if(third == '-')</div><div class='del'>-                OmitFramePointers = _False;</div><div class='del'>-            break;</div><div class='del'>-        default:</div><div class='del'>-            found = false;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 'P':</div><div class='del'>-        PreprocessToFile = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 'Q':</div><div class='del'>-        if(second == 'I') {</div><div class='del'>-            AdditionalOptions += option;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        found = false;</div><div class='del'>-        break;</div><div class='del'>-    case 'R':</div><div class='del'>-        if(second == 'T' &amp;&amp; third == 'C') {</div><div class='del'>-            if(fourth == '1')</div><div class='del'>-                BasicRuntimeChecks = "EnableFastChecks";</div><div class='del'>-            else if(fourth == 'c')</div><div class='del'>-                SmallerTypeCheck = _True;</div><div class='del'>-            else if(fourth == 's')</div><div class='del'>-                BasicRuntimeChecks = "StackFrameRuntimeCheck";</div><div class='del'>-            else if(fourth == 'u')</div><div class='del'>-                BasicRuntimeChecks = "UninitializedLocalUsageCheck";</div><div class='del'>-            else</div><div class='del'>-                found = false; break;</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 'T':</div><div class='del'>-        if(second == 'C') {</div><div class='del'>-            CompileAs = "CompileAsC";</div><div class='del'>-        } else if(second == 'P') {</div><div class='del'>-            CompileAs = "CompileAsCpp";</div><div class='del'>-        } else {</div><div class='del'>-            qWarning("Generator: Options '/Tp&lt;filename&gt;' and '/Tc&lt;filename&gt;' are not supported by qmake");</div><div class='del'>-            found = false; break;</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 'U':</div><div class='del'>-        UndefinePreprocessorDefinitions += option+2;</div><div class='del'>-        break;</div><div class='del'>-    case 'V':</div><div class='del'>-        AdditionalOptions += option;</div><div class='del'>-        break;</div><div class='del'>-    case 'W':</div><div class='del'>-        switch (second) {</div><div class='del'>-        case 'a':</div><div class='del'>-            WarningLevel = "EnableAllWarnings";</div><div class='del'>-            break;</div><div class='del'>-        case '4':</div><div class='del'>-            WarningLevel = "Level4";</div><div class='del'>-            break;</div><div class='del'>-        case '3':</div><div class='del'>-            WarningLevel = "Level3";</div><div class='del'>-            break;</div><div class='del'>-        case '2':</div><div class='del'>-            WarningLevel = "Level2";</div><div class='del'>-            break;</div><div class='del'>-        case '1':</div><div class='del'>-            WarningLevel = "Level1";</div><div class='del'>-            break;</div><div class='del'>-        case '0':</div><div class='del'>-            WarningLevel = "TurnOffAllWarnings";</div><div class='del'>-            break;</div><div class='del'>-        case 'L':</div><div class='del'>-            AdditionalOptions += option;</div><div class='del'>-            break;</div><div class='del'>-        case 'X':</div><div class='del'>-            TreatWarningAsError = _True;</div><div class='del'>-            break;</div><div class='del'>-        case 'p':</div><div class='del'>-            if(third == '6' &amp;&amp; fourth == '4') {</div><div class='del'>-                // Deprecated for VS2010 but can be used under Additional Options.</div><div class='del'>-                AdditionalOptions += option;</div><div class='del'>-                break;</div><div class='del'>-            }</div><div class='del'>-            // Fallthrough</div><div class='del'>-        default:</div><div class='del'>-            found = false; break;</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 'X':</div><div class='del'>-        IgnoreStandardIncludePath = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 'Y':</div><div class='del'>-        switch (second) {</div><div class='del'>-        case '\0':</div><div class='del'>-        case '-':</div><div class='del'>-            AdditionalOptions += option;</div><div class='del'>-            break;</div><div class='del'>-        case 'c':</div><div class='del'>-            PrecompiledHeader = "Create";</div><div class='del'>-            PrecompiledHeaderFile = option+3;</div><div class='del'>-            break;</div><div class='del'>-        case 'd':</div><div class='del'>-        case 'l':</div><div class='del'>-            AdditionalOptions += option;</div><div class='del'>-            break;</div><div class='del'>-        case 'u':</div><div class='del'>-            PrecompiledHeader = "Use";</div><div class='del'>-            PrecompiledHeaderFile = option+3;</div><div class='del'>-            break;</div><div class='del'>-        default:</div><div class='del'>-            found = false; break;</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 'Z':</div><div class='del'>-        switch (second) {</div><div class='del'>-        case '7':</div><div class='del'>-            DebugInformationFormat = "OldStyle";</div><div class='del'>-            break;</div><div class='del'>-        case 'I':</div><div class='del'>-            DebugInformationFormat = "EditAndContinue";</div><div class='del'>-            break;</div><div class='del'>-        case 'i':</div><div class='del'>-            DebugInformationFormat = "ProgramDatabase";</div><div class='del'>-            break;</div><div class='del'>-        case 'l':</div><div class='del'>-            OmitDefaultLibName = _True;</div><div class='del'>-            break;</div><div class='del'>-        case 'a':</div><div class='del'>-            DisableLanguageExtensions = _True;</div><div class='del'>-            break;</div><div class='del'>-        case 'e':</div><div class='del'>-            DisableLanguageExtensions = _False;</div><div class='del'>-            break;</div><div class='del'>-        case 'c':</div><div class='del'>-            if(third == ':') {</div><div class='del'>-                const char *c = option + 4;</div><div class='del'>-                // Go to the end of the option</div><div class='del'>-                while ( *c != '\0' &amp;&amp; *c != ' ' &amp;&amp; *c != '-')</div><div class='del'>-                    ++c;</div><div class='del'>-                if(fourth == 'f')</div><div class='del'>-                    ForceConformanceInForLoopScope = ((*c) == '-' ? _False : _True);</div><div class='del'>-                else if(fourth == 'w')</div><div class='del'>-                    TreatWChar_tAsBuiltInType = ((*c) == '-' ? _False : _True);</div><div class='del'>-                else</div><div class='del'>-                    found = false;</div><div class='del'>-            } else {</div><div class='del'>-                found = false; break;</div><div class='del'>-            }</div><div class='del'>-            break;</div><div class='del'>-        case 'g':</div><div class='del'>-        case 'm':</div><div class='del'>-        case 's':</div><div class='del'>-            AdditionalOptions += option;</div><div class='del'>-            break;</div><div class='del'>-        case 'p':</div><div class='del'>-            switch (third)</div><div class='del'>-            {</div><div class='del'>-            case '\0':</div><div class='del'>-            case '1':</div><div class='del'>-                StructMemberAlignment = "1Byte";</div><div class='del'>-                if(fourth == '6')</div><div class='del'>-                    StructMemberAlignment = "16Bytes";</div><div class='del'>-                break;</div><div class='del'>-            case '2':</div><div class='del'>-                StructMemberAlignment = "2Bytes";</div><div class='del'>-                break;</div><div class='del'>-            case '4':</div><div class='del'>-                StructMemberAlignment = "4Bytes";</div><div class='del'>-                break;</div><div class='del'>-            case '8':</div><div class='del'>-                StructMemberAlignment = "8Bytes";</div><div class='del'>-                break;</div><div class='del'>-            default:</div><div class='del'>-                found = false; break;</div><div class='del'>-            }</div><div class='del'>-            break;</div><div class='del'>-        default:</div><div class='del'>-            found = false; break;</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 'a':</div><div class='del'>-        if (second == 'r' &amp;&amp; third == 'c' &amp;&amp; fourth == 'h') {</div><div class='del'>-            if (option[5] == ':') {</div><div class='del'>-                const char *o = option;</div><div class='del'>-                if (o[6] == 'S' &amp;&amp; o[7] == 'S' &amp;&amp; o[8] == 'E') {</div><div class='del'>-                    EnableEnhancedInstructionSet = o[9] == '2' ? "StreamingSIMDExtensions2" : "StreamingSIMDExtensions";</div><div class='del'>-                    break;</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        } else if (second == 'n' &amp;&amp; third == 'a' &amp;&amp; fourth == 'l') {</div><div class='del'>-            EnablePREfast = _True;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        found = false;</div><div class='del'>-        break;</div><div class='del'>-    case 'b':   // see http://msdn.microsoft.com/en-us/library/fwkeyyhe%28VS.100%29.aspx</div><div class='del'>-        if (second == 'i' &amp;&amp; third == 'g' &amp;&amp; fourth == 'o') {</div><div class='del'>-            const char *o = option;</div><div class='del'>-            if (o[5] == 'b' &amp;&amp; o[6] == 'j') {</div><div class='del'>-                AdditionalOptions += option;</div><div class='del'>-                break;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        found = false;</div><div class='del'>-        break;</div><div class='del'>-    case 'c':</div><div class='del'>-        if(second == 'l') {</div><div class='del'>-            if(*(option+5) == 'p') {</div><div class='del'>-                CompileAsManaged = "Pure";</div><div class='del'>-            } else if(*(option+5) == 's') {</div><div class='del'>-                CompileAsManaged = "Safe";</div><div class='del'>-            } else if(*(option+5) == 'o') {</div><div class='del'>-                CompileAsManaged = "OldSyntax";</div><div class='del'>-            } else {</div><div class='del'>-                CompileAsManaged = "true";</div><div class='del'>-            }</div><div class='del'>-        } else {</div><div class='del'>-            found = false;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 'd':</div><div class='del'>-        if(second != 'o' &amp;&amp; third == 'c') {</div><div class='del'>-            GenerateXMLDocumentationFiles = _True;</div><div class='del'>-            XMLDocumentationFileName += option+4;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        found = false;</div><div class='del'>-        break;</div><div class='del'>-    case 'e':</div><div class='del'>-        if (second == 'r' &amp;&amp; third == 'r' &amp;&amp; fourth == 'o') {</div><div class='del'>-            if (option[12] == ':') {</div><div class='del'>-                if ( option[13] == 'n') {</div><div class='del'>-                    ErrorReporting = "None";</div><div class='del'>-                } else if (option[13] == 'p') {</div><div class='del'>-                    ErrorReporting = "Prompt";</div><div class='del'>-                } else if (option[13] == 'q') {</div><div class='del'>-                    ErrorReporting = "Queue";</div><div class='del'>-                } else if (option[13] == 's') {</div><div class='del'>-                    ErrorReporting = "Send";</div><div class='del'>-                } else {</div><div class='del'>-                    found = false;</div><div class='del'>-                }</div><div class='del'>-                break;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        found = false;</div><div class='del'>-        break;</div><div class='del'>-    case 'f':</div><div class='del'>-        if(second == 'p' &amp;&amp; third == ':') {</div><div class='del'>-            // Go to the end of the option</div><div class='del'>-            const char *c = option + 4;</div><div class='del'>-            while (*c != '\0' &amp;&amp; *c != ' ' &amp;&amp; *c != '-')</div><div class='del'>-                ++c;</div><div class='del'>-            switch (fourth) {</div><div class='del'>-            case 'e':</div><div class='del'>-                FloatingPointExceptions = ((*c) == '-' ? _False : _True);</div><div class='del'>-                break;</div><div class='del'>-            case 'f':</div><div class='del'>-                FloatingPointModel = "Fast";</div><div class='del'>-                break;</div><div class='del'>-            case 'p':</div><div class='del'>-                FloatingPointModel = "Precise";</div><div class='del'>-                break;</div><div class='del'>-            case 's':</div><div class='del'>-                FloatingPointModel = "Strict";</div><div class='del'>-                break;</div><div class='del'>-            default:</div><div class='del'>-                found = false;</div><div class='del'>-                break;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 'h':</div><div class='del'>-        if(second == 'o' &amp;&amp; third == 't' &amp;&amp; fourth == 'p') {</div><div class='del'>-            CreateHotpatchableImage = _True;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        qWarning("Generator: Option '/help': MSVC.NET projects do not support outputting help info");</div><div class='del'>-        found = false;</div><div class='del'>-        break;</div><div class='del'>-    case 'n':</div><div class='del'>-        if(second == 'o' &amp;&amp; third == 'l' &amp;&amp; fourth == 'o') {</div><div class='del'>-            SuppressStartupBanner = _True;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        found = false;</div><div class='del'>-        break;</div><div class='del'>-    case 'o':</div><div class='del'>-        if (second == 'p' &amp;&amp; third == 'e' &amp;&amp; fourth == 'n') {</div><div class='del'>-            OpenMPSupport = _True;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        found = false;</div><div class='del'>-        break;</div><div class='del'>-    case 's':</div><div class='del'>-        if(second == 'h' &amp;&amp; third == 'o' &amp;&amp; fourth == 'w') {</div><div class='del'>-            ShowIncludes = _True;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        found = false;</div><div class='del'>-        break;</div><div class='del'>-    case 'u':</div><div class='del'>-        UndefineAllPreprocessorDefinitions = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 'v':</div><div class='del'>-        if(second == 'd' || second == 'm') {</div><div class='del'>-            AdditionalOptions += option;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        found = false;</div><div class='del'>-        break;</div><div class='del'>-    case 'w':</div><div class='del'>-        switch (second) {</div><div class='del'>-        case 'd':</div><div class='del'>-            DisableSpecificWarnings += option+3;</div><div class='del'>-            break;</div><div class='del'>-        case 'e':</div><div class='del'>-            TreatSpecificWarningsAsErrors = option+3;</div><div class='del'>-            break;</div><div class='del'>-        default:</div><div class='del'>-            AdditionalOptions += option;</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    default:</div><div class='del'>-        AdditionalOptions += option;</div><div class='del'>-        break;</div><div class='del'>-    }</div><div class='del'>-    if(!found) {</div><div class='del'>-        warn_msg(WarnLogic, "Could not parse Compiler option: %s, added as AdditionalOption", option);</div><div class='del'>-        AdditionalOptions += option;</div><div class='del'>-    }</div><div class='del'>-    return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// VCLinkerTool -----------------------------------------------------</div><div class='del'>-VCXLinkerTool::VCXLinkerTool()</div><div class='del'>-    :        AllowIsolation(unset),</div><div class='del'>-        AssemblyDebug(unset),</div><div class='del'>-        DataExecutionPrevention(unset),</div><div class='del'>-        DelaySign(unset),</div><div class='del'>-        EnableCOMDATFolding(unset),</div><div class='del'>-        EnableUAC(unset),</div><div class='del'>-        FixedBaseAddress(unset),</div><div class='del'>-        GenerateDebugInformation(unset),</div><div class='del'>-        GenerateManifest(unset),</div><div class='del'>-        GenerateMapFile(unset),</div><div class='del'>-        HeapCommitSize(-1),</div><div class='del'>-        HeapReserveSize(-1),</div><div class='del'>-        IgnoreAllDefaultLibraries(unset),</div><div class='del'>-        IgnoreEmbeddedIDL(unset),</div><div class='del'>-        IgnoreImportLibrary(_True),</div><div class='del'>-        ImageHasSafeExceptionHandlers(unset),</div><div class='del'>-        LargeAddressAware(unset),</div><div class='del'>-        LinkDLL(unset),</div><div class='del'>-        LinkIncremental(unset),</div><div class='del'>-        LinkStatus(unset),</div><div class='del'>-        MapExports(unset),</div><div class='del'>-        NoEntryPoint(unset),</div><div class='del'>-        OptimizeReferences(unset),</div><div class='del'>-        PreventDllBinding(unset),</div><div class='del'>-        RandomizedBaseAddress(unset),</div><div class='del'>-        RegisterOutput(unset),</div><div class='del'>-        SectionAlignment(-1),</div><div class='del'>-        SetChecksum(unset),</div><div class='del'>-        //StackCommitSize(-1),</div><div class='del'>-        //StackReserveSize(-1),</div><div class='del'>-        SupportNobindOfDelayLoadedDLL(unset),</div><div class='del'>-        SupportUnloadOfDelayLoadedDLL(unset),</div><div class='del'>-        SuppressStartupBanner(unset),</div><div class='del'>-        SwapRunFromCD(unset),</div><div class='del'>-        SwapRunFromNet(unset),</div><div class='del'>-        TerminalServerAware(unset),</div><div class='del'>-        TreatLinkerWarningAsErrors(unset),</div><div class='del'>-        TurnOffAssemblyGeneration(unset),</div><div class='del'>-        TypeLibraryResourceID(0),</div><div class='del'>-        UACUIAccess(unset)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCXLinkerTool &amp;tool)</div><div class='add'>+void VCXProjectWriter::write(XmlOutput &amp;xml, const VCLinkerTool &amp;tool)</div><div class='ctx'> {</div><div class='del'>-    return xml</div><div class='add'>+    xml</div><div class='ctx'>         &lt;&lt; tag(_Link)</div><div class='ctx'>             &lt;&lt; attrTagX(_AdditionalDependencies, tool.AdditionalDependencies, ";")</div><div class='ctx'>             &lt;&lt; attrTagX(_AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories, ";")</div><div class='hunk'>@@ -1126,18 +1333,15 @@ XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCXLinkerTool &amp;tool)</div><div class='ctx'>             &lt;&lt; attrTagS(_CLRImageType, tool.CLRImageType)</div><div class='ctx'>             &lt;&lt; attrTagS(_CLRSupportLastError, tool.CLRSupportLastError)</div><div class='ctx'>             &lt;&lt; attrTagS(_CLRThreadAttribute, tool.CLRThreadAttribute)</div><div class='del'>-            &lt;&lt; attrTagS(_CLRUnmanagedCodeCheck, tool.CLRUnmanagedCodeCheck)</div><div class='del'>-            &lt;&lt; attrTagS(_CreateHotPatchableImage, tool.CreateHotPatchableImage)</div><div class='add'>+            &lt;&lt; attrTagT(_CLRUnmanagedCodeCheck, tool.CLRUnmanagedCodeCheck)</div><div class='add'>+//unused    &lt;&lt; attrTagS(_CreateHotPatchableImage, tool.CreateHotPatchableImage)</div><div class='ctx'>             &lt;&lt; attrTagT(_DataExecutionPrevention, tool.DataExecutionPrevention)</div><div class='ctx'>             &lt;&lt; attrTagX(_DelayLoadDLLs, tool.DelayLoadDLLs, ";")</div><div class='ctx'>             &lt;&lt; attrTagT(_DelaySign, tool.DelaySign)</div><div class='del'>-            &lt;&lt; attrTagS(_Driver, tool.Driver)</div><div class='del'>-            &lt;&lt; attrTagX(_EmbedManagedResourceFile, tool.EmbedManagedResourceFile, ";")</div><div class='del'>-            &lt;&lt; attrTagT(_EnableCOMDATFolding, tool.EnableCOMDATFolding)</div><div class='add'>+            &lt;&lt; attrTagS(_EmbedManagedResourceFile, tool.LinkToManagedResourceFile)</div><div class='add'>+            &lt;&lt; attrTagT(_EnableCOMDATFolding, toTriState(tool.EnableCOMDATFolding))</div><div class='ctx'>             &lt;&lt; attrTagT(_EnableUAC, tool.EnableUAC)</div><div class='ctx'>             &lt;&lt; attrTagS(_EntryPointSymbol, tool.EntryPointSymbol)</div><div class='del'>-            &lt;&lt; attrTagT(_FixedBaseAddress, tool.FixedBaseAddress)</div><div class='del'>-            &lt;&lt; attrTagS(_ForceFileOutput, tool.ForceFileOutput)</div><div class='ctx'>             &lt;&lt; attrTagX(_ForceSymbolReferences, tool.ForceSymbolReferences, ";")</div><div class='ctx'>             &lt;&lt; attrTagS(_FunctionOrder, tool.FunctionOrder)</div><div class='ctx'>             &lt;&lt; attrTagT(_GenerateDebugInformation, tool.GenerateDebugInformation)</div><div class='hunk'>@@ -1148,17 +1352,16 @@ XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCXLinkerTool &amp;tool)</div><div class='ctx'>             &lt;&lt; attrTagT(_IgnoreAllDefaultLibraries, tool.IgnoreAllDefaultLibraries)</div><div class='ctx'>             &lt;&lt; attrTagT(_IgnoreEmbeddedIDL, tool.IgnoreEmbeddedIDL)</div><div class='ctx'>             &lt;&lt; attrTagT(_IgnoreImportLibrary, tool.IgnoreImportLibrary)</div><div class='del'>-            &lt;&lt; attrTagX(_IgnoreSpecificDefaultLibraries, tool.IgnoreSpecificDefaultLibraries, ";")</div><div class='del'>-            &lt;&lt; attrTagT(_ImageHasSafeExceptionHandlers, tool.ImageHasSafeExceptionHandlers)</div><div class='add'>+            &lt;&lt; attrTagX(_IgnoreSpecificDefaultLibraries, tool.IgnoreDefaultLibraryNames, ";")</div><div class='ctx'>             &lt;&lt; attrTagS(_ImportLibrary, tool.ImportLibrary)</div><div class='ctx'>             &lt;&lt; attrTagS(_KeyContainer, tool.KeyContainer)</div><div class='ctx'>             &lt;&lt; attrTagS(_KeyFile, tool.KeyFile)</div><div class='del'>-            &lt;&lt; attrTagT(_LargeAddressAware, tool.LargeAddressAware)</div><div class='del'>-            &lt;&lt; attrTagT(_LinkDLL, tool.LinkDLL)</div><div class='add'>+            &lt;&lt; attrTagT(_LargeAddressAware, toTriState(tool.LargeAddressAware))</div><div class='add'>+            &lt;&lt; attrTagT(_LinkDLL, (tool.config-&gt;ConfigurationType == typeDynamicLibrary ? _True : unset))</div><div class='ctx'>             &lt;&lt; attrTagS(_LinkErrorReporting, tool.LinkErrorReporting)</div><div class='del'>-            &lt;&lt; attrTagT(_LinkIncremental, tool.LinkIncremental)</div><div class='del'>-            &lt;&lt; attrTagT(_LinkStatus, tool.LinkStatus)</div><div class='del'>-            &lt;&lt; attrTagS(_LinkTimeCodeGeneration, tool.LinkTimeCodeGeneration)</div><div class='add'>+            &lt;&lt; attrTagT(_LinkIncremental, toTriState(tool.LinkIncremental))</div><div class='add'>+            &lt;&lt; attrTagT(_LinkStatus, toTriState(tool.ShowProgress))</div><div class='add'>+            &lt;&lt; attrTagS(_LinkTimeCodeGeneration, toString(tool.LinkTimeCodeGeneration))</div><div class='ctx'>             &lt;&lt; attrTagS(_ManifestFile, tool.ManifestFile)</div><div class='ctx'>             &lt;&lt; attrTagT(_MapExports, tool.MapExports)</div><div class='ctx'>             &lt;&lt; attrTagS(_MapFileName, tool.MapFileName)</div><div class='hunk'>@@ -1166,32 +1369,27 @@ XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCXLinkerTool &amp;tool)</div><div class='ctx'>             &lt;&lt; attrTagS(_MergeSections, tool.MergeSections)</div><div class='ctx'>             &lt;&lt; attrTagS(_MidlCommandFile, tool.MidlCommandFile)</div><div class='ctx'>             &lt;&lt; attrTagS(_ModuleDefinitionFile, tool.ModuleDefinitionFile)</div><div class='del'>-            &lt;&lt; attrTagS(_MSDOSStubFileName, tool.MSDOSStubFileName)</div><div class='del'>-            &lt;&lt; attrTagT(_NoEntryPoint, tool.NoEntryPoint)</div><div class='del'>-            &lt;&lt; attrTagT(_OptimizeReferences, tool.OptimizeReferences)</div><div class='add'>+            &lt;&lt; attrTagT(_NoEntryPoint, tool.ResourceOnlyDLL)</div><div class='add'>+            &lt;&lt; attrTagT(_OptimizeReferences, toTriState(tool.OptimizeReferences))</div><div class='ctx'>             &lt;&lt; attrTagS(_OutputFile, tool.OutputFile)</div><div class='ctx'>             &lt;&lt; attrTagT(_PreventDllBinding, tool.PreventDllBinding)</div><div class='del'>-            &lt;&lt; attrTagS(_Profile, tool.Profile)</div><div class='del'>-            &lt;&lt; attrTagS(_ProfileGuidedDatabase, tool.ProfileGuidedDatabase)</div><div class='ctx'>             &lt;&lt; attrTagS(_ProgramDatabaseFile, tool.ProgramDatabaseFile)</div><div class='ctx'>             &lt;&lt; attrTagT(_RandomizedBaseAddress, tool.RandomizedBaseAddress)</div><div class='ctx'>             &lt;&lt; attrTagT(_RegisterOutput, tool.RegisterOutput)</div><div class='ctx'>             &lt;&lt; attrTagL(_SectionAlignment, tool.SectionAlignment, /*ifNot*/ -1)</div><div class='ctx'>             &lt;&lt; attrTagT(_SetChecksum, tool.SetChecksum)</div><div class='del'>-            &lt;&lt; attrTagS(_ShowProgress, tool.ShowProgress)</div><div class='del'>-            &lt;&lt; attrTagS(_SpecifySectionAttributes, tool.SpecifySectionAttributes)</div><div class='del'>-            &lt;&lt; attrTagS(_StackCommitSize, tool.StackCommitSize)</div><div class='del'>-            &lt;&lt; attrTagS(_StackReserveSize, tool.StackReserveSize)</div><div class='add'>+            &lt;&lt; attrTagL(_StackCommitSize, tool.StackCommitSize, /*ifNot*/ -1)</div><div class='add'>+            &lt;&lt; attrTagL(_StackReserveSize, tool.StackReserveSize, /*ifNot*/ -1)</div><div class='ctx'>             &lt;&lt; attrTagS(_StripPrivateSymbols, tool.StripPrivateSymbols)</div><div class='del'>-            &lt;&lt; attrTagS(_SubSystem, tool.SubSystem)</div><div class='del'>-            &lt;&lt; attrTagT(_SupportNobindOfDelayLoadedDLL, tool.SupportNobindOfDelayLoadedDLL)</div><div class='add'>+            &lt;&lt; attrTagS(_SubSystem, toString(tool.SubSystem))</div><div class='add'>+//            &lt;&lt; attrTagT(_SupportNobindOfDelayLoadedDLL, tool.SupportNobindOfDelayLoadedDLL)</div><div class='ctx'>             &lt;&lt; attrTagT(_SupportUnloadOfDelayLoadedDLL, tool.SupportUnloadOfDelayLoadedDLL)</div><div class='ctx'>             &lt;&lt; attrTagT(_SuppressStartupBanner, tool.SuppressStartupBanner)</div><div class='ctx'>             &lt;&lt; attrTagT(_SwapRunFromCD, tool.SwapRunFromCD)</div><div class='ctx'>             &lt;&lt; attrTagT(_SwapRunFromNet, tool.SwapRunFromNet)</div><div class='del'>-            &lt;&lt; attrTagS(_TargetMachine, tool.TargetMachine)</div><div class='del'>-            &lt;&lt; attrTagT(_TerminalServerAware, tool.TerminalServerAware)</div><div class='del'>-            &lt;&lt; attrTagT(_TreatLinkerWarningAsErrors, tool.TreatLinkerWarningAsErrors)</div><div class='add'>+            &lt;&lt; attrTagS(_TargetMachine, toString(tool.TargetMachine))</div><div class='add'>+            &lt;&lt; attrTagT(_TerminalServerAware, toTriState(tool.TerminalServerAware))</div><div class='add'>+            &lt;&lt; attrTagT(_TreatLinkerWarningAsErrors, tool.TreatWarningsAsErrors)</div><div class='ctx'>             &lt;&lt; attrTagT(_TurnOffAssemblyGeneration, tool.TurnOffAssemblyGeneration)</div><div class='ctx'>             &lt;&lt; attrTagS(_TypeLibraryFile, tool.TypeLibraryFile)</div><div class='ctx'>             &lt;&lt; attrTagL(_TypeLibraryResourceID, tool.TypeLibraryResourceID, /*ifNot*/ 0)</div><div class='hunk'>@@ -1201,619 +1399,18 @@ XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCXLinkerTool &amp;tool)</div><div class='ctx'>         &lt;&lt; closetag(_Link);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// Hashing routine to do fast option lookups ----</div><div class='del'>-// Slightly rewritten to stop on ':' ',' and '\0'</div><div class='del'>-// Original routine in qtranslator.cpp ----------</div><div class='del'>-static uint elfHash(const char* name)</div><div class='del'>-{</div><div class='del'>-    const uchar *k;</div><div class='del'>-    uint h = 0;</div><div class='del'>-    uint g;</div><div class='del'>-</div><div class='del'>-    if(name) {</div><div class='del'>-        k = (const uchar *) name;</div><div class='del'>-        while((*k) &amp;&amp;</div><div class='del'>-                (*k)!= ':' &amp;&amp;</div><div class='del'>-                (*k)!=',' &amp;&amp;</div><div class='del'>-                (*k)!=' ') {</div><div class='del'>-            h = (h &lt;&lt; 4) + *k++;</div><div class='del'>-            if((g = (h &amp; 0xf0000000)) != 0)</div><div class='del'>-                h ^= g &gt;&gt; 24;</div><div class='del'>-            h &amp;= ~g;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    if(!h)</div><div class='del'>-        h = 1;</div><div class='del'>-    return h;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-//#define USE_DISPLAY_HASH</div><div class='del'>-#ifdef USE_DISPLAY_HASH</div><div class='del'>-static void displayHash(const char* str)</div><div class='del'>-{</div><div class='del'>-    printf("case 0x%07x: // %s\n    break;\n", elfHash(str), str);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-bool VCXLinkerTool::parseOption(const char* option)</div><div class='del'>-{</div><div class='del'>-#ifdef USE_DISPLAY_HASH</div><div class='del'>-    // Main options</div><div class='del'>-    displayHash("/ALIGN"); displayHash("/ALLOWBIND"); displayHash("/ASSEMBLYMODULE");</div><div class='del'>-    displayHash("/ASSEMBLYRESOURCE"); displayHash("/BASE"); displayHash("/DEBUG");</div><div class='del'>-    displayHash("/DEF"); displayHash("/DEFAULTLIB"); displayHash("/DELAY");</div><div class='del'>-    displayHash("/DELAYLOAD"); displayHash("/DLL"); displayHash("/DRIVER");</div><div class='del'>-    displayHash("/ENTRY"); displayHash("/EXETYPE"); displayHash("/EXPORT");</div><div class='del'>-    displayHash("/FIXED"); displayHash("/FORCE"); displayHash("/HEAP");</div><div class='del'>-    displayHash("/IDLOUT"); displayHash("/IGNORE"); displayHash("/IGNOREIDL"); displayHash("/IMPLIB");</div><div class='del'>-    displayHash("/INCLUDE"); displayHash("/INCREMENTAL"); displayHash("/LARGEADDRESSAWARE");</div><div class='del'>-    displayHash("/LIBPATH"); displayHash("/LTCG"); displayHash("/MACHINE");</div><div class='del'>-    displayHash("/MAP"); displayHash("/MAPINFO"); displayHash("/MERGE");</div><div class='del'>-    displayHash("/MIDL"); displayHash("/NOASSEMBLY"); displayHash("/NODEFAULTLIB");</div><div class='del'>-    displayHash("/NOENTRY"); displayHash("/NOLOGO"); displayHash("/OPT");</div><div class='del'>-    displayHash("/ORDER"); displayHash("/OUT"); displayHash("/PDB");</div><div class='del'>-    displayHash("/PDBSTRIPPED"); displayHash("/RELEASE"); displayHash("/SECTION");</div><div class='del'>-    displayHash("/STACK"); displayHash("/STUB"); displayHash("/SUBSYSTEM");</div><div class='del'>-    displayHash("/SWAPRUN"); displayHash("/TLBID"); displayHash("/TLBOUT");</div><div class='del'>-    displayHash("/TSAWARE"); displayHash("/VERBOSE"); displayHash("/VERSION");</div><div class='del'>-    displayHash("/VXD"); displayHash("/WS "); displayHash("/libpath");</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-#ifdef USE_DISPLAY_HASH</div><div class='del'>-    // Sub options</div><div class='del'>-    displayHash("UNLOAD"); displayHash("NOBIND"); displayHash("no"); displayHash("NOSTATUS"); displayHash("STATUS");</div><div class='del'>-    displayHash("AM33"); displayHash("ARM"); displayHash("CEE"); displayHash("EBC"); displayHash("IA64"); displayHash("X86"); displayHash("X64"); displayHash("M32R");</div><div class='del'>-    displayHash("MIPS"); displayHash("MIPS16"); displayHash("MIPSFPU"); displayHash("MIPSFPU16"); displayHash("MIPSR41XX"); displayHash("PPC");</div><div class='del'>-    displayHash("SH3"); displayHash("SH3DSP"); displayHash("SH4"); displayHash("SH5"); displayHash("THUMB"); displayHash("TRICORE"); displayHash("EXPORTS");</div><div class='del'>-    displayHash("LINES"); displayHash("REF"); displayHash("NOREF"); displayHash("ICF"); displayHash("WIN98"); displayHash("NOWIN98");</div><div class='del'>-    displayHash("CONSOLE"); displayHash("EFI_APPLICATION"); displayHash("EFI_BOOT_SERVICE_DRIVER"); displayHash("EFI_ROM"); displayHash("EFI_RUNTIME_DRIVER"); displayHash("NATIVE");</div><div class='del'>-    displayHash("POSIX"); displayHash("WINDOWS"); displayHash("WINDOWSCE"); displayHash("NET"); displayHash("CD"); displayHash("NO");</div><div class='del'>-#endif</div><div class='del'>-    bool found = true;</div><div class='del'>-    switch (elfHash(option)) {</div><div class='del'>-    case 0x6b21972: // /DEFAULTLIB:library</div><div class='del'>-    case 0xaca9d75: // /EXETYPE[:DYNAMIC | :DEV386]</div><div class='del'>-    case 0x3ad5444: // /EXPORT:entryname[,@ordinal[,NONAME]][,DATA]</div><div class='del'>-    case 0x3dc3455: // /IGNORE:number,number,number,number  ### NOTE: This one is undocumented, but it is even used by Microsoft.</div><div class='del'>-                    //                                      In recent versions of the Microsoft linker they have disabled this undocumented feature.</div><div class='del'>-    case 0x0034bc4: // /VXD</div><div class='del'>-        AdditionalOptions += option;</div><div class='del'>-        break;</div><div class='del'>-    case 0x3360dbe: // /ALIGN[:number]</div><div class='del'>-        SectionAlignment = QString(option+7).toLongLong();</div><div class='del'>-        break;</div><div class='del'>-    case 0x1485c34: // /ALLOWBIND[:NO]</div><div class='del'>-        if(*(option+10) == ':' &amp;&amp; (*(option+11) == 'n' || *(option+11) == 'N'))</div><div class='del'>-            PreventDllBinding = _False;</div><div class='del'>-        else</div><div class='del'>-            PreventDllBinding = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x312011e: // /ALLOWISOLATION[:NO]</div><div class='del'>-        if(*(option+15) == ':' &amp;&amp; (*(option+16) == 'n' || *(option+16) == 'N'))</div><div class='del'>-            AllowIsolation = _False;</div><div class='del'>-        else</div><div class='del'>-            AllowIsolation = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x679c075: // /ASSEMBLYMODULE:filename</div><div class='del'>-        AddModuleNamesToAssembly += option+15;</div><div class='del'>-        break;</div><div class='del'>-    case 0x75f35f7: // /ASSEMBLYDEBUG[:DISABLE]</div><div class='del'>-        if(*(option+14) == ':' &amp;&amp; (*(option+15) == 'D'))</div><div class='del'>-            AssemblyDebug = _False;</div><div class='del'>-        else</div><div class='del'>-            AssemblyDebug = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x43294a5: // /ASSEMBLYLINKRESOURCE:filename</div><div class='del'>-            AssemblyLinkResource += option+22;</div><div class='del'>-        break;</div><div class='del'>-    case 0x062d065: // /ASSEMBLYRESOURCE:filename</div><div class='del'>-        EmbedManagedResourceFile += option+18;</div><div class='del'>-        break;</div><div class='del'>-    case 0x0336675: // /BASE:{address | @filename,key}</div><div class='del'>-        // Do we need to do a manual lookup when '@filename,key'?</div><div class='del'>-        // Seems BaseAddress only can contain the location...</div><div class='del'>-        // We don't use it in Qt, so keep it simple for now</div><div class='del'>-        BaseAddress = option+6;</div><div class='del'>-        break;</div><div class='del'>-    case 0x63bf065: // /CLRIMAGETYPE:{IJW|PURE|SAFE}</div><div class='del'>-        if(*(option+14) == 'I')</div><div class='del'>-            CLRImageType = "ForceIJWImage";</div><div class='del'>-        else if(*(option+14) == 'P')</div><div class='del'>-            CLRImageType = "ForcePureILImage";</div><div class='del'>-        else if(*(option+14) == 'S')</div><div class='del'>-            CLRImageType = "ForceSafeILImage";</div><div class='del'>-        break;</div><div class='del'>-    case 0x5f2a6a2: // /CLRSUPPORTLASTERROR{:NO | SYSTEMDLL}</div><div class='del'>-        if(*(option+20) == ':') {</div><div class='del'>-            if(*(option+21) == 'N') {</div><div class='del'>-                CLRSupportLastError = "Disabled";</div><div class='del'>-            } else if(*(option+21) == 'S') {</div><div class='del'>-                CLRSupportLastError = "SystemDlls";</div><div class='del'>-            }</div><div class='del'>-        } else {</div><div class='del'>-            CLRSupportLastError = "Enabled";</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 0xc7984f5: // /CLRTHREADATTRIBUTE:{STA|MTA|NONE}</div><div class='del'>-        if(*(option+20) == 'N')</div><div class='del'>-            CLRThreadAttribute = "DefaultThreadingAttribute";</div><div class='del'>-        else if(*(option+20) == 'M')</div><div class='del'>-            CLRThreadAttribute = "MTAThreadingAttribute";</div><div class='del'>-        else if(*(option+20) == 'S')</div><div class='del'>-            CLRThreadAttribute = "STAThreadingAttribute";</div><div class='del'>-        break;</div><div class='del'>-    case 0xa8c637b: // /CLRUNMANAGEDCODECHECK[:NO]</div><div class='del'>-        if(*(option+23) == 'N')</div><div class='del'>-            CLRUnmanagedCodeCheck = _False;</div><div class='del'>-        else</div><div class='del'>-            CLRUnmanagedCodeCheck = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x3389797: // /DEBUG</div><div class='del'>-        GenerateDebugInformation = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x0033896: // /DEF:filename</div><div class='del'>-        ModuleDefinitionFile = option+5;</div><div class='del'>-        break;</div><div class='del'>-    case 0x338a069: // /DELAY:{UNLOAD | NOBIND}</div><div class='del'>-        if(*(option+7) == 'U')</div><div class='del'>-            SupportNobindOfDelayLoadedDLL = _True;</div><div class='del'>-        else if(*(option+7) == 'N')</div><div class='del'>-            SupportUnloadOfDelayLoadedDLL = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x06f4bf4: // /DELAYLOAD:dllname</div><div class='del'>-        DelayLoadDLLs += option+11;</div><div class='del'>-        break;</div><div class='del'>-    case 0x06d451e: // /DELAYSIGN[:NO]</div><div class='del'>-        if(*(option+10) == ':' &amp;&amp; (*(option+11) == 'n' || *(option+11) == 'N'))</div><div class='del'>-            DelaySign = _False;</div><div class='del'>-        else</div><div class='del'>-            DelaySign = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x003390c: // /DLL</div><div class='del'>-        LinkDLL = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x396ea92: // /DRIVER[:UPONLY | :WDM]</div><div class='del'>-        if((*(option+7) == ':') &amp;&amp; (*(option+8) == 'U'))</div><div class='del'>-            Driver = "UpOnly";</div><div class='del'>-        else if((*(option+7) == ':') &amp;&amp; (*(option+8) == 'W'))</div><div class='del'>-            Driver = "WDM";</div><div class='del'>-        else</div><div class='del'>-            Driver = "Driver";</div><div class='del'>-        break;</div><div class='del'>-    case 0x2ee8415: // /DYNAMICBASE[:NO]</div><div class='del'>-        if(*(option+12) == ':' &amp;&amp; (*(option+13) == 'n' || *(option+13) == 'N'))</div><div class='del'>-            RandomizedBaseAddress = _False;</div><div class='del'>-        else</div><div class='del'>-            RandomizedBaseAddress = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x33a3979: // /ENTRY:function</div><div class='del'>-        EntryPointSymbol = option+7;</div><div class='del'>-        break;</div><div class='del'>-    case 0x4504334: // /ERRORREPORT:[ NONE | PROMPT | QUEUE | SEND ]</div><div class='del'>-        if(*(option+12) == ':' ) {</div><div class='del'>-            if(*(option+13) == 'N')</div><div class='del'>-                LinkErrorReporting = "NoErrorReport";</div><div class='del'>-            else if(*(option+13) == 'P')</div><div class='del'>-                LinkErrorReporting = "PromptImmediately";</div><div class='del'>-            else if(*(option+13) == 'Q')</div><div class='del'>-                LinkErrorReporting = "QueueForNextLogin";</div><div class='del'>-            else if(*(option+13) == 'S')</div><div class='del'>-                LinkErrorReporting = "SendErrorReport";</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 0x33aec94: // /FIXED[:NO]</div><div class='del'>-        if(*(option+6) == ':' &amp;&amp; (*(option+7) == 'n' || *(option+7) == 'N'))</div><div class='del'>-            FixedBaseAddress = _False;</div><div class='del'>-        else</div><div class='del'>-            FixedBaseAddress = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x33b4675: // /FORCE:[MULTIPLE|UNRESOLVED]</div><div class='del'>-        if(*(option+6) == ':' &amp;&amp; *(option+7) == 'M' )</div><div class='del'>-            ForceFileOutput = "MultiplyDefinedSymbolOnly";</div><div class='del'>-        else if(*(option+6) == ':' &amp;&amp; *(option+7) == 'U' )</div><div class='del'>-            ForceFileOutput = "UndefinedSymbolOnly";</div><div class='del'>-        else</div><div class='del'>-            ForceFileOutput = "Enabled";</div><div class='del'>-        break;</div><div class='del'>-    case 0x96d4e4e: // /FUNCTIONPADMIN[:space]</div><div class='del'>-        if(*(option+15) == ':') {</div><div class='del'>-            if(*(option+16) == '5')</div><div class='del'>-                CreateHotPatchableImage = "X86Image";</div><div class='del'>-            else if(*(option+16) == '6')</div><div class='del'>-                CreateHotPatchableImage = "X64Image";</div><div class='del'>-            else if((*(option+16) == '1') &amp;&amp; (*(option+17) == '6'))</div><div class='del'>-                CreateHotPatchableImage = "ItaniumImage";</div><div class='del'>-        } else {</div><div class='del'>-            CreateHotPatchableImage = "Enabled";</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 0x033c960: // /HEAP:reserve[,commit]</div><div class='del'>-        {</div><div class='del'>-            QStringList both = QString(option+6).split(",");</div><div class='del'>-            HeapReserveSize = both[0].toLongLong();</div><div class='del'>-            if(both.count() == 2)</div><div class='del'>-                HeapCommitSize = both[1].toLongLong();</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 0x3d91494: // /IDLOUT:[path\]filename</div><div class='del'>-        MergedIDLBaseFileName = option+8;</div><div class='del'>-        break;</div><div class='del'>-    case 0x345a04c: // /IGNOREIDL</div><div class='del'>-        IgnoreEmbeddedIDL = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x3e250e2: // /IMPLIB:filename</div><div class='del'>-        ImportLibrary = option+8;</div><div class='del'>-        break;</div><div class='del'>-    case 0xe281ab5: // /INCLUDE:symbol</div><div class='del'>-        ForceSymbolReferences += option+9;</div><div class='del'>-        break;</div><div class='del'>-    case 0xb28103c: // /INCREMENTAL[:no]</div><div class='del'>-        if(*(option+12) == ':' &amp;&amp;</div><div class='del'>-             (*(option+13) == 'n' || *(option+13) == 'N'))</div><div class='del'>-            LinkIncremental = _False;</div><div class='del'>-        else</div><div class='del'>-            LinkIncremental = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x07f1ab2: // /KEYCONTAINER:name</div><div class='del'>-        KeyContainer = option+14;</div><div class='del'>-        break;</div><div class='del'>-    case 0xfadaf35: // /KEYFILE:filename</div><div class='del'>-        KeyFile = option+9;</div><div class='del'>-        break;</div><div class='del'>-    case 0x26e4675: // /LARGEADDRESSAWARE[:no]</div><div class='del'>-        if(*(option+18) == ':' &amp;&amp;</div><div class='del'>-             *(option+19) == 'n')</div><div class='del'>-            LargeAddressAware = _False;</div><div class='del'>-        else</div><div class='del'>-            LargeAddressAware = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x2f96bc8: // /libpath:dir</div><div class='del'>-    case 0x0d745c8: // /LIBPATH:dir</div><div class='del'>-        AdditionalLibraryDirectories += option+9;</div><div class='del'>-        break;</div><div class='del'>-    case 0x0341877: // /LTCG[:NOSTATUS|:STATUS]</div><div class='del'>-        config-&gt;WholeProgramOptimization = _True;</div><div class='del'>-        LinkTimeCodeGeneration = "UseLinkTimeCodeGeneration";</div><div class='del'>-        if(*(option+5) == ':') {</div><div class='del'>-            const char* str = option+6;</div><div class='del'>-            if (*str == 'S')</div><div class='del'>-                LinkStatus = _True;</div><div class='del'>-            else if (*str == 'N')</div><div class='del'>-                LinkStatus = _False;</div><div class='del'>-#ifndef Q_OS_WIN</div><div class='del'>-            else if (strncasecmp(str, "pginstrument", 12))</div><div class='del'>-                LinkTimeCodeGeneration = "PGInstrument";</div><div class='del'>-            else if (strncasecmp(str, "pgoptimize", 10))</div><div class='del'>-                LinkTimeCodeGeneration = "PGOptimization";</div><div class='del'>-            else if (strncasecmp(str, "pgupdate", 8 ))</div><div class='del'>-                LinkTimeCodeGeneration = "PGUpdate";</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-            else if (_stricmp(str, "pginstrument"))</div><div class='del'>-                LinkTimeCodeGeneration = "PGInstrument";</div><div class='del'>-            else if (_stricmp(str, "pgoptimize"))</div><div class='del'>-                LinkTimeCodeGeneration = "PGOptimization";</div><div class='del'>-            else if (_stricmp(str, "pgupdate"))</div><div class='del'>-                LinkTimeCodeGeneration = "PGUpdate";</div><div class='del'>-#endif</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-	case 0x379ED25:</div><div class='del'>-    case 0x157cf65: // /MACHINE:{AM33|ARM|CEE|IA64|X86|M32R|MIPS|MIPS16|MIPSFPU|MIPSFPU16|MIPSR41XX|PPC|SH3|SH4|SH5|THUMB|TRICORE}</div><div class='del'>-        switch (elfHash(option+9)) {</div><div class='del'>-        case 0x0005bb6: // X86</div><div class='del'>-            TargetMachine = "MachineX86";</div><div class='del'>-            break;</div><div class='del'>-        case 0x0005b94: // X64</div><div class='del'>-            TargetMachine = "MachineX64";</div><div class='del'>-            break;</div><div class='del'>-        case 0x000466d: // ARM</div><div class='del'>-            TargetMachine = "MachineARM";</div><div class='del'>-            break;</div><div class='del'>-        case 0x0004963: // EBC</div><div class='del'>-            TargetMachine = "MachineEBC";</div><div class='del'>-            break;</div><div class='del'>-        case 0x004d494: // IA64</div><div class='del'>-            TargetMachine = "MachineIA64";</div><div class='del'>-            break;</div><div class='del'>-        case 0x0051e53: // MIPS</div><div class='del'>-            TargetMachine = "MachineMIPS";</div><div class='del'>-            break;</div><div class='del'>-        case 0x51e5646: // MIPS16</div><div class='del'>-            TargetMachine = "MachineMIPS16";</div><div class='del'>-            break;</div><div class='del'>-        case 0x1e57b05: // MIPSFPU</div><div class='del'>-            TargetMachine = "MachineMIPSFPU";</div><div class='del'>-            break;</div><div class='del'>-        case 0x57b09a6: // MIPSFPU16</div><div class='del'>-            TargetMachine = "MachineMIPSFPU16";</div><div class='del'>-            break;</div><div class='del'>-        case 0x00057b4: // SH4</div><div class='del'>-            TargetMachine = "MachineSH4";</div><div class='del'>-            break;</div><div class='del'>-        case 0x058da12: // THUMB</div><div class='del'>-            TargetMachine = "MachineTHUMB";</div><div class='del'>-            break;</div><div class='del'>-        // put the others in AdditionalOptions...</div><div class='del'>-        case 0x0046063: // AM33</div><div class='del'>-        case 0x0004795: // CEE</div><div class='del'>-        case 0x0050672: // M32R</div><div class='del'>-        case 0x5852738: // MIPSR41XX</div><div class='del'>-        case 0x0005543: // PPC</div><div class='del'>-        case 0x00057b3: // SH3</div><div class='del'>-        case 0x57b7980: // SH3DSP</div><div class='del'>-        case 0x00057b5: // SH5</div><div class='del'>-        case 0x96d8435: // TRICORE</div><div class='del'>-        default:</div><div class='del'>-            AdditionalOptions += option;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 0x62d9e94: // /MANIFEST[:NO]</div><div class='del'>-        if ((*(option+9) == ':' &amp;&amp; (*(option+10) == 'N' || *(option+10) == 'n')))</div><div class='del'>-            GenerateManifest = _False;</div><div class='del'>-        else</div><div class='del'>-            GenerateManifest = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x8b64559: // /MANIFESTDEPENDENCY:manifest_dependency</div><div class='del'>-        AdditionalManifestDependencies += option+20;</div><div class='del'>-        break;</div><div class='del'>-    case 0xe9e8195: // /MANIFESTFILE:filename</div><div class='del'>-        ManifestFile = option+14;</div><div class='del'>-        break;</div><div class='del'>-    case 0x9e9fb83: // /MANIFESTUAC http://msdn.microsoft.com/en-us/library/bb384691%28VS.100%29.aspx</div><div class='del'>-        if ((*(option+12) == ':' &amp;&amp; (*(option+13) == 'N' || *(option+13) == 'n')))</div><div class='del'>-            EnableUAC = _False;</div><div class='del'>-        else if((*(option+12) == ':' &amp;&amp; (*(option+13) == 'l' || *(option+14) == 'e'))) { // level</div><div class='del'>-            if(*(option+20) == 'a')</div><div class='del'>-                UACExecutionLevel = "AsInvoker";</div><div class='del'>-            else if(*(option+20) == 'h')</div><div class='del'>-                UACExecutionLevel = "HighestAvailable";</div><div class='del'>-            else if(*(option+20) == 'r')</div><div class='del'>-                UACExecutionLevel = "RequireAdministrator";</div><div class='del'>-        } else if((*(option+12) == ':' &amp;&amp; (*(option+13) == 'u' || *(option+14) == 'i'))) { // uiAccess</div><div class='del'>-            if(*(option+22) == 't')</div><div class='del'>-                UACUIAccess = _True;</div><div class='del'>-            else</div><div class='del'>-                UACUIAccess = _False;</div><div class='del'>-        } else if((*(option+12) == ':' &amp;&amp; (*(option+13) == 'f' || *(option+14) == 'r'))) { // fragment</div><div class='del'>-            AdditionalOptions += option;</div><div class='del'>-        }else</div><div class='del'>-            EnableUAC = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x0034160: // /MAP[:filename]</div><div class='del'>-        GenerateMapFile = _True;</div><div class='del'>-        if (option[4] == ':')</div><div class='del'>-            MapFileName = option+5;</div><div class='del'>-        break;</div><div class='del'>-    case 0x164e1ef: // /MAPINFO:{EXPORTS}</div><div class='del'>-        if(*(option+9) == 'E')</div><div class='del'>-            MapExports = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x341a6b5: // /MERGE:from=to</div><div class='del'>-        MergeSections = option+7;</div><div class='del'>-        break;</div><div class='del'>-    case 0x0341d8c: // /MIDL:@file</div><div class='del'>-        MidlCommandFile = option+7;</div><div class='del'>-        break;</div><div class='del'>-    case 0x84e2679: // /NOASSEMBLY</div><div class='del'>-        TurnOffAssemblyGeneration = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x2b21942: // /NODEFAULTLIB[:library]</div><div class='del'>-        if(*(option+13) == '\0')</div><div class='del'>-            IgnoreAllDefaultLibraries = _True;</div><div class='del'>-        else</div><div class='del'>-            IgnoreSpecificDefaultLibraries += option+14;</div><div class='del'>-        break;</div><div class='del'>-    case 0x33a3a39: // /NOENTRY</div><div class='del'>-        NoEntryPoint = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x434138f: // /NOLOGO</div><div class='del'>-        SuppressStartupBanner = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0xc841054: // /NXCOMPAT[:NO]</div><div class='del'>-        if ((*(option+9) == ':' &amp;&amp; (*(option+10) == 'N' || *(option+10) == 'n')))</div><div class='del'>-            DataExecutionPrevention = _False;</div><div class='del'>-        else</div><div class='del'>-            DataExecutionPrevention = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x0034454: // /OPT:{REF | NOREF | ICF[=iterations] | NOICF | WIN98 | NOWIN98}</div><div class='del'>-        {</div><div class='del'>-            char third = *(option+7);</div><div class='del'>-            switch (third) {</div><div class='del'>-            case 'F': // REF</div><div class='del'>-                if(*(option+5) == 'R') {</div><div class='del'>-                    OptimizeReferences = _True;</div><div class='del'>-                } else { // ICF[=iterations]</div><div class='del'>-                    EnableCOMDATFolding = _True;</div><div class='del'>-                    // [=iterations] case is not documented</div><div class='del'>-                }</div><div class='del'>-                break;</div><div class='del'>-            case 'R': // NOREF</div><div class='del'>-                OptimizeReferences = _False;</div><div class='del'>-                break;</div><div class='del'>-            case 'I': // NOICF</div><div class='del'>-                EnableCOMDATFolding = _False;</div><div class='del'>-                break;</div><div class='del'>-            default:</div><div class='del'>-                found = false;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 0x34468a2: // /ORDER:@filename</div><div class='del'>-        FunctionOrder = option+8;</div><div class='del'>-        break;</div><div class='del'>-    case 0x00344a4: // /OUT:filename</div><div class='del'>-        OutputFile = option+5;</div><div class='del'>-        break;</div><div class='del'>-    case 0x0034482: // /PDB:filename</div><div class='del'>-        ProgramDatabaseFile = option+5;</div><div class='del'>-        break;</div><div class='del'>-    case 0xa2ad314: // /PDBSTRIPPED:pdb_file_name</div><div class='del'>-        StripPrivateSymbols = option+13;</div><div class='del'>-        break;</div><div class='del'>-    case 0x00344b4: // /PGD:filename</div><div class='del'>-        ProfileGuidedDatabase = option+5;</div><div class='del'>-        break;</div><div class='del'>-    case 0x573af45: // /PROFILE</div><div class='del'>-        Profile = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x6a09535: // /RELEASE</div><div class='del'>-        SetChecksum = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x75AA4D8: // /SAFESEH:{NO}</div><div class='del'>-        {</div><div class='del'>-            if(*(option+8) == ':' &amp;&amp; *(option+9) == 'N')</div><div class='del'>-                ImageHasSafeExceptionHandlers = _False;</div><div class='del'>-            else</div><div class='del'>-                ImageHasSafeExceptionHandlers = _True;</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 0x7988f7e: // /SECTION:name,[E][R][W][S][D][K][L][P][X][,ALIGN=#]</div><div class='del'>-        SpecifySectionAttributes = option+9;</div><div class='del'>-        break;</div><div class='del'>-    case 0x348857b: // /STACK:reserve[,commit]</div><div class='del'>-        {</div><div class='del'>-            QStringList both = QString(option+7).split(",");</div><div class='del'>-            StackReserveSize = both[0].toLongLong();</div><div class='del'>-            if(both.count() == 2)</div><div class='del'>-                StackCommitSize = both[1].toLongLong();</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 0x0348992: // /STUB:filename</div><div class='del'>-        MSDOSStubFileName = option+6;</div><div class='del'>-        break;</div><div class='del'>-    case 0x9B3C00D:</div><div class='del'>-    case 0x78dc00d: // /SUBSYSTEM:{CONSOLE|EFI_APPLICATION|EFI_BOOT_SERVICE_DRIVER|EFI_ROM|EFI_RUNTIME_DRIVER|NATIVE|POSIX|WINDOWS|WINDOWSCE}[,major[.minor]]</div><div class='del'>-        {</div><div class='del'>-            // Split up in subsystem, and version number</div><div class='del'>-            QStringList both = QString(option+11).split(",");</div><div class='del'>-            switch (elfHash(both[0].toLatin1())) {</div><div class='del'>-            case 0x8438445: // CONSOLE</div><div class='del'>-                SubSystem = "Console";</div><div class='del'>-                break;</div><div class='del'>-            case 0xbe29493: // WINDOWS</div><div class='del'>-                SubSystem = "Windows";</div><div class='del'>-                break;</div><div class='del'>-            case 0x5268ea5: // NATIVE</div><div class='del'>-                SubSystem = "Native";</div><div class='del'>-                break;</div><div class='del'>-            case 0x240949e: // EFI_APPLICATION</div><div class='del'>-                SubSystem = "EFI Application";</div><div class='del'>-                break;</div><div class='del'>-            case 0xe617652: // EFI_BOOT_SERVICE_DRIVER</div><div class='del'>-                SubSystem = "EFI Boot Service Driver";</div><div class='del'>-                break;</div><div class='del'>-            case 0x9af477d: // EFI_ROM</div><div class='del'>-                SubSystem = "EFI ROM";</div><div class='del'>-                break;</div><div class='del'>-            case 0xd34df42: // EFI_RUNTIME_DRIVER</div><div class='del'>-                SubSystem = "EFI Runtime";</div><div class='del'>-                break;</div><div class='del'>-            case 0x2949c95: // WINDOWSCE</div><div class='del'>-                SubSystem = "WindowsCE";</div><div class='del'>-                break;</div><div class='del'>-            case 0x05547e8: // POSIX</div><div class='del'>-                SubSystem = "POSIX";</div><div class='del'>-                break;</div><div class='del'>-            // The following are undocumented, so add them to AdditionalOptions</div><div class='del'>-            case 0x4B69795: // windowsce</div><div class='del'>-                AdditionalOptions += option;</div><div class='del'>-                break;</div><div class='del'>-            default:</div><div class='del'>-                found = false;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 0x8b654de: // /SWAPRUN:{NET | CD}</div><div class='del'>-        if(*(option+9) == 'N')</div><div class='del'>-            SwapRunFromNet = _True;</div><div class='del'>-        else if(*(option+9) == 'C')</div><div class='del'>-            SwapRunFromCD = _True;</div><div class='del'>-        else</div><div class='del'>-            found = false;</div><div class='del'>-        break;</div><div class='del'>-    case 0x34906d4: // /TLBID:id</div><div class='del'>-        TypeLibraryResourceID = QString(option+7).toLongLong();</div><div class='del'>-        break;</div><div class='del'>-    case 0x4907494: // /TLBOUT:[path\]filename</div><div class='del'>-        TypeLibraryFile = option+8;</div><div class='del'>-        break;</div><div class='del'>-    case 0x976b525: // /TSAWARE[:NO]</div><div class='del'>-        if(*(option+8) == ':')</div><div class='del'>-            TerminalServerAware = _False;</div><div class='del'>-        else</div><div class='del'>-            TerminalServerAware = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0xaa67735: // /VERBOSE[:ICF |:LIB |:REF |:SAFESEH]</div><div class='del'>-        if(*(option+9) == ':') {</div><div class='del'>-            if (*(option+10) == 'I') {</div><div class='del'>-                ShowProgress = "LinkVerboseICF";</div><div class='del'>-            } else if ( *(option+10) == 'L') {</div><div class='del'>-                ShowProgress = "LinkVerboseLib";</div><div class='del'>-            } else if ( *(option+10) == 'R') {</div><div class='del'>-                ShowProgress = "LinkVerboseREF";</div><div class='del'>-            } else if ( *(option+10) == 'S') {</div><div class='del'>-                ShowProgress = "LinkVerboseSAFESEH";</div><div class='del'>-            } else if ( *(option+10) == 'C') {</div><div class='del'>-                ShowProgress = "LinkVerboseCLR";</div><div class='del'>-            }</div><div class='del'>-        } else {</div><div class='del'>-            ShowProgress = "LinkVerbose";</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 0xaa77f7e: // /VERSION:major[.minor]</div><div class='del'>-        Version = option+9;</div><div class='del'>-        break;</div><div class='del'>-    case 0x0034c50: // /WS[:NO]</div><div class='del'>-        if(*(option+3) == ':')</div><div class='del'>-            TreatLinkerWarningAsErrors = _False;</div><div class='del'>-        else</div><div class='del'>-            TreatLinkerWarningAsErrors = _True;</div><div class='del'>-        break;</div><div class='del'>-    default:</div><div class='del'>-        AdditionalOptions += option;</div><div class='del'>-        break;</div><div class='del'>-    }</div><div class='del'>-    if(!found) {</div><div class='del'>-        warn_msg(WarnLogic, "Could not parse Linker options: %s, added as AdditionalOption", option);</div><div class='del'>-        AdditionalOptions += option;</div><div class='del'>-    }</div><div class='del'>-    return found;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// VCMIDLTool -------------------------------------------------------</div><div class='del'>-VCXMIDLTool::VCXMIDLTool()</div><div class='del'>-    :   ApplicationConfigurationMode(unset),</div><div class='del'>-        ErrorCheckAllocations(unset),</div><div class='del'>-        ErrorCheckBounds(unset),</div><div class='del'>-        ErrorCheckEnumRange(unset),</div><div class='del'>-        ErrorCheckRefPointers(unset),</div><div class='del'>-        ErrorCheckStubData(unset),</div><div class='del'>-        GenerateStublessProxies(unset),</div><div class='del'>-        GenerateTypeLibrary(unset),</div><div class='del'>-        IgnoreStandardIncludePath(unset),</div><div class='del'>-        LocaleID(-1),</div><div class='del'>-        MkTypLibCompatible(unset),</div><div class='del'>-        SuppressCompilerWarnings(unset),</div><div class='del'>-        SuppressStartupBanner(unset),</div><div class='del'>-        ValidateAllParameters(unset),</div><div class='del'>-        WarnAsError(unset)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCXMIDLTool &amp;tool)</div><div class='add'>+void VCXProjectWriter::write(XmlOutput &amp;xml, const VCMIDLTool &amp;tool)</div><div class='ctx'> {</div><div class='del'>-    return xml</div><div class='add'>+    xml</div><div class='ctx'>         &lt;&lt; tag(_Midl)</div><div class='ctx'>             &lt;&lt; attrTagX(_AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories, ";")</div><div class='ctx'>             &lt;&lt; attrTagX(_AdditionalOptions, tool.AdditionalOptions, " ")</div><div class='ctx'>             &lt;&lt; attrTagT(_ApplicationConfigurationMode, tool.ApplicationConfigurationMode)</div><div class='ctx'>             &lt;&lt; attrTagS(_ClientStubFile, tool.ClientStubFile)</div><div class='del'>-            &lt;&lt; attrTagS(_CPreprocessOptions, tool.CPreprocessOptions)</div><div class='del'>-            &lt;&lt; attrTagS(_DefaultCharType, tool.DefaultCharType)</div><div class='add'>+            &lt;&lt; attrTagX(_CPreprocessOptions, tool.CPreprocessOptions, " ")</div><div class='add'>+            &lt;&lt; attrTagS(_DefaultCharType, toString(tool.DefaultCharType))</div><div class='ctx'>             &lt;&lt; attrTagS(_DLLDataFileName, tool.DLLDataFileName)</div><div class='del'>-            &lt;&lt; attrTagS(_EnableErrorChecks, tool.EnableErrorChecks)</div><div class='add'>+            &lt;&lt; attrTagS(_EnableErrorChecks, toString(tool.EnableErrorChecks))</div><div class='ctx'>             &lt;&lt; attrTagT(_ErrorCheckAllocations, tool.ErrorCheckAllocations)</div><div class='ctx'>             &lt;&lt; attrTagT(_ErrorCheckBounds, tool.ErrorCheckBounds)</div><div class='ctx'>             &lt;&lt; attrTagT(_ErrorCheckEnumRange, tool.ErrorCheckEnumRange)</div><div class='hunk'>@@ -1833,443 +1430,113 @@ XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCXMIDLTool &amp;tool)</div><div class='ctx'>             &lt;&lt; attrTagS(_ProxyFileName, tool.ProxyFileName)</div><div class='ctx'>             &lt;&lt; attrTagS(_RedirectOutputAndErrors, tool.RedirectOutputAndErrors)</div><div class='ctx'>             &lt;&lt; attrTagS(_ServerStubFile, tool.ServerStubFile)</div><div class='del'>-            &lt;&lt; attrTagS(_StructMemberAlignment, tool.StructMemberAlignment)</div><div class='add'>+            &lt;&lt; attrTagS(_StructMemberAlignment, toString(tool.StructMemberAlignment))</div><div class='ctx'>             &lt;&lt; attrTagT(_SuppressCompilerWarnings, tool.SuppressCompilerWarnings)</div><div class='ctx'>             &lt;&lt; attrTagT(_SuppressStartupBanner, tool.SuppressStartupBanner)</div><div class='del'>-            &lt;&lt; attrTagS(_TargetEnvironment, tool.TargetEnvironment)</div><div class='add'>+            &lt;&lt; attrTagS(_TargetEnvironment, toString(tool.TargetEnvironment))</div><div class='ctx'>             &lt;&lt; attrTagS(_TypeLibFormat, tool.TypeLibFormat)</div><div class='ctx'>             &lt;&lt; attrTagS(_TypeLibraryName, tool.TypeLibraryName)</div><div class='ctx'>             &lt;&lt; attrTagX(_UndefinePreprocessorDefinitions, tool.UndefinePreprocessorDefinitions, ";")</div><div class='ctx'>             &lt;&lt; attrTagT(_ValidateAllParameters, tool.ValidateAllParameters)</div><div class='ctx'>             &lt;&lt; attrTagT(_WarnAsError, tool.WarnAsError)</div><div class='del'>-            &lt;&lt; attrTagS(_WarningLevel, tool.WarningLevel)</div><div class='add'>+            &lt;&lt; attrTagS(_WarningLevel, toString(tool.WarningLevel))</div><div class='ctx'>         &lt;&lt; closetag(_Midl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool VCXMIDLTool::parseOption(const char* option)</div><div class='del'>-{</div><div class='del'>-#ifdef USE_DISPLAY_HASH</div><div class='del'>-    displayHash("/D name[=def]"); displayHash("/I directory-list"); displayHash("/Oi");</div><div class='del'>-    displayHash("/Oic"); displayHash("/Oicf"); displayHash("/Oif"); displayHash("/Os");</div><div class='del'>-    displayHash("/U name"); displayHash("/WX"); displayHash("/W{0|1|2|3|4}");</div><div class='del'>-    displayHash("/Zp {N}"); displayHash("/Zs"); displayHash("/acf filename");</div><div class='del'>-    displayHash("/align {N}"); displayHash("/app_config"); displayHash("/c_ext");</div><div class='del'>-    displayHash("/char ascii7"); displayHash("/char signed"); displayHash("/char unsigned");</div><div class='del'>-    displayHash("/client none"); displayHash("/client stub"); displayHash("/confirm");</div><div class='del'>-    displayHash("/cpp_cmd cmd_line"); displayHash("/cpp_opt options");</div><div class='del'>-    displayHash("/cstub filename"); displayHash("/dlldata filename"); displayHash("/env win32");</div><div class='del'>-    displayHash("/env win64"); displayHash("/error all"); displayHash("/error allocation");</div><div class='del'>-    displayHash("/error bounds_check"); displayHash("/error enum"); displayHash("/error none");</div><div class='del'>-    displayHash("/error ref"); displayHash("/error stub_data"); displayHash("/h filename");</div><div class='del'>-    displayHash("/header filename"); displayHash("/iid filename"); displayHash("/lcid");</div><div class='del'>-    displayHash("/mktyplib203"); displayHash("/ms_ext"); displayHash("/ms_union");</div><div class='del'>-    displayHash("/msc_ver &lt;nnnn&gt;"); displayHash("/newtlb"); displayHash("/no_cpp");</div><div class='del'>-    displayHash("/no_def_idir"); displayHash("/no_default_epv"); displayHash("/no_format_opt");</div><div class='del'>-    displayHash("/no_warn"); displayHash("/nocpp"); displayHash("/nologo"); displayHash("/notlb");</div><div class='del'>-    displayHash("/o filename"); displayHash("/oldnames"); displayHash("/oldtlb");</div><div class='del'>-    displayHash("/osf"); displayHash("/out directory"); displayHash("/pack {N}");</div><div class='del'>-    displayHash("/prefix all"); displayHash("/prefix client"); displayHash("/prefix server");</div><div class='del'>-    displayHash("/prefix switch"); displayHash("/protocol all"); displayHash("/protocol dce");</div><div class='del'>-    displayHash("/protocol ndr64"); displayHash("/proxy filename"); displayHash("/robust");</div><div class='del'>-    displayHash("/rpcss"); displayHash("/savePP"); displayHash("/server none");</div><div class='del'>-    displayHash("/server stub"); displayHash("/sstub filename"); displayHash("/syntax_check");</div><div class='del'>-    displayHash("/target {system}"); displayHash("/tlb filename"); displayHash("/use_epv");</div><div class='del'>-    displayHash("/win32"); displayHash("/win64");</div><div class='del'>-#endif</div><div class='del'>-    bool found = true;</div><div class='del'>-    int offset = 0;</div><div class='del'>-    switch(elfHash(option)) {</div><div class='del'>-    case 0x0000334: // /D name[=def]</div><div class='del'>-        PreprocessorDefinitions += option+3;</div><div class='del'>-        break;</div><div class='del'>-    case 0x0000339: // /I directory-list</div><div class='del'>-        AdditionalIncludeDirectories += option+3;</div><div class='del'>-        break;</div><div class='del'>-    case 0x0345f96: // /Oicf</div><div class='del'>-    case 0x00345f6: // /Oif</div><div class='del'>-        GenerateStublessProxies = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x0000345: // /U name</div><div class='del'>-        UndefinePreprocessorDefinitions += option+3;</div><div class='del'>-        break;</div><div class='del'>-    case 0x00034c8: // /WX</div><div class='del'>-        WarnAsError = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x3582fde: // /align {N}</div><div class='del'>-        offset = 3;  // Fallthrough</div><div class='del'>-    case 0x0003510: // /Zp {N}</div><div class='del'>-        switch (*(option+offset+4)) {</div><div class='del'>-        case '1':</div><div class='del'>-            StructMemberAlignment = (*(option+offset+5) == '\0') ? "1" : "16";</div><div class='del'>-            break;</div><div class='del'>-        case '2':</div><div class='del'>-            StructMemberAlignment = "2";</div><div class='del'>-            break;</div><div class='del'>-        case '4':</div><div class='del'>-            StructMemberAlignment = "4";</div><div class='del'>-            break;</div><div class='del'>-        case '8':</div><div class='del'>-            StructMemberAlignment = "8";</div><div class='del'>-            break;</div><div class='del'>-        default:</div><div class='del'>-            found = false;</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 0x5b1cb97: // /app_config</div><div class='del'>-        ApplicationConfigurationMode = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x0359e82: // /char {ascii7|signed|unsigned}</div><div class='del'>-        switch(*(option+6)) {</div><div class='del'>-        case 'a':</div><div class='del'>-            DefaultCharType = "Ascii";</div><div class='del'>-            break;</div><div class='del'>-        case 's':</div><div class='del'>-            DefaultCharType = "Signed";</div><div class='del'>-            break;</div><div class='del'>-        case 'u':</div><div class='del'>-            DefaultCharType = "Unsigned";</div><div class='del'>-            break;</div><div class='del'>-        default:</div><div class='del'>-            found = false;</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 0x5a2fc64: // /client {none|stub}</div><div class='del'>-        if(*(option+8) == 's')</div><div class='del'>-            GenerateClientFiles = "Stub";</div><div class='del'>-        else</div><div class='del'>-            GenerateClientFiles = "None";</div><div class='del'>-        break;</div><div class='del'>-    case 0xa766524: // /cpp_opt options</div><div class='del'>-        CPreprocessOptions += option+9;</div><div class='del'>-        break;</div><div class='del'>-    case 0x35aabb2: // /cstub filename</div><div class='del'>-        ClientStubFile = option+7;</div><div class='del'>-        break;</div><div class='del'>-    case 0xb32abf1: // /dlldata filename</div><div class='del'>-        DLLDataFileName = option + 9;</div><div class='del'>-        break;</div><div class='del'>-    case 0x0035c56: // /env {win32|ia64|x64}</div><div class='del'>-        if(*(option+7) == 'w' &amp;&amp; *(option+10) == '3')</div><div class='del'>-            TargetEnvironment = "Win32";</div><div class='del'>-        else if(*(option+7) == 'i')</div><div class='del'>-            TargetEnvironment = "Itanium";</div><div class='del'>-        else if(*(option+7) == 'x')</div><div class='del'>-            TargetEnvironment = "X64";</div><div class='del'>-        else</div><div class='del'>-            AdditionalOptions += option;</div><div class='del'>-        break;</div><div class='del'>-    case 0x35c9962: // /error {all|allocation|bounds_check|enum|none|ref|stub_data}</div><div class='del'>-        EnableErrorChecks = midlEnableCustom;</div><div class='del'>-        switch (*(option+7)) {</div><div class='del'>-        case '\0':</div><div class='del'>-            EnableErrorChecks = "EnableCustom";</div><div class='del'>-            break;</div><div class='del'>-        case 'a':</div><div class='del'>-            if(*(option+10) == '\0')</div><div class='del'>-                EnableErrorChecks = "All";</div><div class='del'>-            else</div><div class='del'>-                ErrorCheckAllocations = _True;</div><div class='del'>-            break;</div><div class='del'>-        case 'b':</div><div class='del'>-            ErrorCheckBounds = _True;</div><div class='del'>-            break;</div><div class='del'>-        case 'e':</div><div class='del'>-            ErrorCheckEnumRange = _True;</div><div class='del'>-            break;</div><div class='del'>-        case 'n':</div><div class='del'>-            EnableErrorChecks = "None";</div><div class='del'>-            break;</div><div class='del'>-        case 'r':</div><div class='del'>-            ErrorCheckRefPointers = _True;</div><div class='del'>-            break;</div><div class='del'>-        case 's':</div><div class='del'>-            ErrorCheckStubData = _True;</div><div class='del'>-            break;</div><div class='del'>-        default:</div><div class='del'>-            found = false;</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    case 0x5eb7af2: // /header filename</div><div class='del'>-        offset = 5;</div><div class='del'>-    case 0x0000358: // /h filename</div><div class='del'>-        HeaderFileName = option + offset + 3;</div><div class='del'>-        break;</div><div class='del'>-    case 0x0035ff4: // /iid filename</div><div class='del'>-        InterfaceIdentifierFileName = option+5;</div><div class='del'>-        break;</div><div class='del'>-    case 0x64b7933: // /mktyplib203</div><div class='del'>-        MkTypLibCompatible = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x64ceb12: // /newtlb</div><div class='del'>-        TypeLibFormat = "NewFormat";</div><div class='del'>-        break;</div><div class='del'>-    case 0x8e0b0a2: // /no_def_idir</div><div class='del'>-        IgnoreStandardIncludePath = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x65635ef: // /nologo</div><div class='del'>-        SuppressStartupBanner = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x695e9f4: // /no_robust</div><div class='del'>-        ValidateAllParameters = _False;</div><div class='del'>-        break;</div><div class='del'>-    case 0x3656b22: // /notlb</div><div class='del'>-        GenerateTypeLibrary = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x556dbee: // /no_warn</div><div class='del'>-        SuppressCompilerWarnings = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x000035f: // /o filename</div><div class='del'>-        RedirectOutputAndErrors = option+3;</div><div class='del'>-        break;</div><div class='del'>-    case 0x662bb12: // /oldtlb</div><div class='del'>-        TypeLibFormat = "OldFormat";</div><div class='del'>-        break;</div><div class='del'>-    case 0x00366c4: // /out directory</div><div class='del'>-        OutputDirectory = option+5;</div><div class='del'>-        break;</div><div class='del'>-    case 0x36796f9: // /proxy filename</div><div class='del'>-        ProxyFileName = option+7;</div><div class='del'>-        break;</div><div class='del'>-    case 0x6959c94: // /robust</div><div class='del'>-        ValidateAllParameters = _True;</div><div class='del'>-        break;</div><div class='del'>-    case 0x69c9cf2: // /server {none|stub}</div><div class='del'>-        if(*(option+8) == 's')</div><div class='del'>-            GenerateServerFiles = "Stub";</div><div class='del'>-        else</div><div class='del'>-            GenerateServerFiles = "None";</div><div class='del'>-        break;</div><div class='del'>-    case 0x36aabb2: // /sstub filename</div><div class='del'>-        ServerStubFile = option+7;</div><div class='del'>-        break;</div><div class='del'>-    case 0x0036b22: // /tlb filename</div><div class='del'>-        TypeLibraryName = option+5;</div><div class='del'>-        break;</div><div class='del'>-    case 0x36e0162: // /win32</div><div class='del'>-        TargetEnvironment = "Win32";</div><div class='del'>-        break;</div><div class='del'>-    case 0x36e0194: // /win64</div><div class='del'>-        TargetEnvironment = "Itanium";</div><div class='del'>-        break;</div><div class='del'>-    case 0x0003459: // /Oi</div><div class='del'>-    case 0x00345f3: // /Oic</div><div class='del'>-    case 0x0003463: // /Os</div><div class='del'>-    case 0x0003513: // /Zs</div><div class='del'>-    case 0x0035796: // /acf filename</div><div class='del'>-    case 0x3595cf4: // /c_ext</div><div class='del'>-    case 0xa64d3dd: // /confirm</div><div class='del'>-    case 0xa765b64: // /cpp_cmd cmd_line</div><div class='del'>-    case 0x03629f4: // /lcid</div><div class='del'>-    case 0x6495cc4: // /ms_ext</div><div class='del'>-    case 0x96c7a1e: // /ms_union</div><div class='del'>-    case 0x4996fa2: // /msc_ver &lt;nnnn&gt;</div><div class='del'>-    case 0x6555a40: // /no_cpp</div><div class='del'>-    case 0xf64d6a6: // /no_default_epv</div><div class='del'>-    case 0x6dd9384: // /no_format_opt</div><div class='del'>-    case 0x3655a70: // /nocpp</div><div class='del'>-    case 0x2b455a3: // /oldnames</div><div class='del'>-    case 0x0036696: // /osf</div><div class='del'>-    case 0x036679b: // /pack {N}</div><div class='del'>-    case 0x678bd38: // /prefix {all|client|server|switch}</div><div class='del'>-    case 0x96b702c: // /protocol {all|dce|ndr64}</div><div class='del'>-    case 0x3696aa3: // /rpcss</div><div class='del'>-    case 0x698ca60: // /savePP</div><div class='del'>-    case 0xce9b12b: // /syntax_check</div><div class='del'>-    case 0xc9b5f16: // /use_epv</div><div class='del'>-        AdditionalOptions += option;</div><div class='del'>-        break;</div><div class='del'>-    default:</div><div class='del'>-        // /W{0|1|2|3|4} case</div><div class='del'>-        if(*(option+1) == 'W') {</div><div class='del'>-            switch (*(option+2)) {</div><div class='del'>-            case '0':</div><div class='del'>-                WarningLevel = "0";</div><div class='del'>-                break;</div><div class='del'>-            case '1':</div><div class='del'>-                WarningLevel = "1";</div><div class='del'>-                break;</div><div class='del'>-            case '2':</div><div class='del'>-                WarningLevel = "2";</div><div class='del'>-                break;</div><div class='del'>-            case '3':</div><div class='del'>-                WarningLevel = "3";</div><div class='del'>-                break;</div><div class='del'>-            case '4':</div><div class='del'>-                WarningLevel = "4";</div><div class='del'>-                break;</div><div class='del'>-            default:</div><div class='del'>-                found = false;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    }</div><div class='del'>-    if(!found)</div><div class='del'>-        warn_msg(WarnLogic, "Could not parse MIDL option: %s", option);</div><div class='del'>-    return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// VCLibrarianTool --------------------------------------------------</div><div class='del'>-VCXLibrarianTool::VCXLibrarianTool()</div><div class='del'>-    :        IgnoreAllDefaultLibraries(unset),</div><div class='del'>-        LinkTimeCodeGeneration(unset),</div><div class='del'>-        SuppressStartupBanner(_True),</div><div class='del'>-        TreatLibWarningAsErrors(unset),</div><div class='del'>-        Verbose(unset)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCXLibrarianTool &amp;tool)</div><div class='del'>-{</div><div class='del'>-    return xml</div><div class='del'>-        &lt;&lt; tag(_Link)</div><div class='del'>-            &lt;&lt; attrTagX(_AdditionalDependencies, tool.AdditionalDependencies, ";")</div><div class='del'>-            &lt;&lt; attrTagX(_AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories, ";")</div><div class='del'>-            &lt;&lt; attrTagX(_AdditionalOptions, tool.AdditionalOptions, " ")</div><div class='del'>-            &lt;&lt; attrTagS(_DisplayLibrary, tool.DisplayLibrary)</div><div class='del'>-            &lt;&lt; attrTagS(_ErrorReporting, tool.ErrorReporting)</div><div class='del'>-            &lt;&lt; attrTagX(_ExportNamedFunctions, tool.ExportNamedFunctions, ";")</div><div class='del'>-            &lt;&lt; attrTagX(_ForceSymbolReferences, tool.ForceSymbolReferences, ";")</div><div class='del'>-            &lt;&lt; attrTagT(_IgnoreAllDefaultLibraries, tool.IgnoreAllDefaultLibraries)</div><div class='del'>-            &lt;&lt; attrTagX(_IgnoreSpecificDefaultLibraries, tool.IgnoreSpecificDefaultLibraries, ";")</div><div class='del'>-            &lt;&lt; attrTagT(_LinkTimeCodeGeneration, tool.LinkTimeCodeGeneration)</div><div class='del'>-            &lt;&lt; attrTagS(_ModuleDefinitionFile, tool.ModuleDefinitionFile)</div><div class='del'>-            &lt;&lt; attrTagS(_Name, tool.Name)</div><div class='del'>-            &lt;&lt; attrTagS(_OutputFile, tool.OutputFile)</div><div class='del'>-            &lt;&lt; attrTagX(_RemoveObjects, tool.RemoveObjects, ";")</div><div class='del'>-            &lt;&lt; attrTagS(_SubSystem, tool.SubSystem)</div><div class='del'>-            &lt;&lt; attrTagT(_SuppressStartupBanner, tool.SuppressStartupBanner)</div><div class='del'>-            &lt;&lt; attrTagS(_TargetMachine, tool.TargetMachine)</div><div class='del'>-            &lt;&lt; attrTagT(_TreatLibWarningAsErrors, tool.TreatLibWarningAsErrors)</div><div class='del'>-            &lt;&lt; attrTagT(_Verbose, tool.Verbose)</div><div class='del'>-        &lt;&lt; closetag(_Link);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// VCCustomBuildTool ------------------------------------------------</div><div class='del'>-VCXCustomBuildTool::VCXCustomBuildTool()</div><div class='add'>+void VCXProjectWriter::write(XmlOutput &amp;xml, const VCCustomBuildTool &amp;tool)</div><div class='ctx'> {</div><div class='del'>-    ToolName = "VCXCustomBuildTool";</div><div class='del'>-}</div><div class='add'>+    const QString &amp;configName = tool.config-&gt;Name;</div><div class='ctx'> </div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCXCustomBuildTool &amp;tool)</div><div class='del'>-{</div><div class='ctx'>     if ( !tool.AdditionalDependencies.isEmpty() )</div><div class='ctx'>     {</div><div class='ctx'>         xml &lt;&lt; tag("AdditionalInputs")</div><div class='del'>-            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.ConfigName))</div><div class='add'>+            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(configName))</div><div class='ctx'>             &lt;&lt; valueTagDefX(tool.AdditionalDependencies, "AdditionalInputs", ";");</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if( !tool.CommandLine.isEmpty() )</div><div class='ctx'>     {</div><div class='ctx'>         xml &lt;&lt; tag("Command")</div><div class='del'>-            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.ConfigName))</div><div class='add'>+            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(configName))</div><div class='ctx'>             &lt;&lt; valueTag(tool.CommandLine.join(vcxCommandSeparator()));</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if ( !tool.Description.isEmpty() )</div><div class='ctx'>     {</div><div class='ctx'>         xml &lt;&lt; tag("Message")</div><div class='del'>-            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.ConfigName))</div><div class='add'>+            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(configName))</div><div class='ctx'>             &lt;&lt; valueTag(tool.Description);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if ( !tool.Outputs.isEmpty() )</div><div class='ctx'>     {</div><div class='ctx'>         xml &lt;&lt; tag("Outputs")</div><div class='del'>-            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.ConfigName))</div><div class='add'>+            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(configName))</div><div class='ctx'>             &lt;&lt; valueTagDefX(tool.Outputs, "Outputs", ";");</div><div class='ctx'>     }</div><div class='del'>-</div><div class='del'>-    return xml;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// VCResourceCompilerTool -------------------------------------------</div><div class='del'>-VCXResourceCompilerTool::VCXResourceCompilerTool()</div><div class='del'>-    :   IgnoreStandardIncludePath(unset),</div><div class='del'>-        NullTerminateStrings(unset),</div><div class='del'>-        ShowProgress(unset),</div><div class='del'>-        SuppressStartupBanner(unset)</div><div class='add'>+void VCXProjectWriter::write(XmlOutput &amp;xml, const VCLibrarianTool &amp;tool)</div><div class='ctx'> {</div><div class='del'>-    PreprocessorDefinitions = QStringList("NDEBUG");</div><div class='add'>+    xml</div><div class='add'>+        &lt;&lt; tag(_Link)</div><div class='add'>+            &lt;&lt; attrTagX(_AdditionalDependencies, tool.AdditionalDependencies, ";")</div><div class='add'>+            &lt;&lt; attrTagX(_AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories, ";")</div><div class='add'>+            &lt;&lt; attrTagX(_AdditionalOptions, tool.AdditionalOptions, " ")</div><div class='add'>+//unused    &lt;&lt; attrTagS(_DisplayLibrary, tool.DisplayLibrary)</div><div class='add'>+//unused    &lt;&lt; attrTagS(_ErrorReporting, tool.ErrorReporting)</div><div class='add'>+            &lt;&lt; attrTagX(_ExportNamedFunctions, tool.ExportNamedFunctions, ";")</div><div class='add'>+            &lt;&lt; attrTagX(_ForceSymbolReferences, tool.ForceSymbolReferences, ";")</div><div class='add'>+            &lt;&lt; attrTagT(_IgnoreAllDefaultLibraries, tool.IgnoreAllDefaultLibraries)</div><div class='add'>+            &lt;&lt; attrTagX(_IgnoreSpecificDefaultLibraries, tool.IgnoreDefaultLibraryNames, ";")</div><div class='add'>+//unused    &lt;&lt; attrTagT(_LinkTimeCodeGeneration, tool.LinkTimeCodeGeneration)</div><div class='add'>+            &lt;&lt; attrTagS(_ModuleDefinitionFile, tool.ModuleDefinitionFile)</div><div class='add'>+//unused    &lt;&lt; attrTagS(_Name, tool.Name)</div><div class='add'>+            &lt;&lt; attrTagS(_OutputFile, tool.OutputFile)</div><div class='add'>+//unused    &lt;&lt; attrTagX(_RemoveObjects, tool.RemoveObjects, ";")</div><div class='add'>+//unused    &lt;&lt; attrTagS(_SubSystem, tool.SubSystem)</div><div class='add'>+            &lt;&lt; attrTagT(_SuppressStartupBanner, tool.SuppressStartupBanner)</div><div class='add'>+//unused    &lt;&lt; attrTagS(_TargetMachine, tool.TargetMachine)</div><div class='add'>+//unused    &lt;&lt; attrTagT(_TreatLibWarningAsErrors, tool.TreatLibWarningAsErrors)</div><div class='add'>+//unused    &lt;&lt; attrTagT(_Verbose, tool.Verbose)</div><div class='add'>+        &lt;&lt; closetag(_Link);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCXResourceCompilerTool &amp;tool)</div><div class='add'>+void VCXProjectWriter::write(XmlOutput &amp;xml, const VCResourceCompilerTool &amp;tool)</div><div class='ctx'> {</div><div class='del'>-    return xml</div><div class='add'>+    xml</div><div class='ctx'>         &lt;&lt; tag(_ResourceCompile)</div><div class='ctx'>             &lt;&lt; attrTagX(_AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories, ";")</div><div class='del'>-            &lt;&lt; attrTagS(_AdditionalOptions, tool.AdditionalOptions)</div><div class='del'>-            &lt;&lt; attrTagS(_Culture, tool.Culture)</div><div class='add'>+            &lt;&lt; attrTagX(_AdditionalOptions, tool.AdditionalOptions, " ")</div><div class='add'>+            &lt;&lt; attrTagS(_Culture, toString(tool.Culture))</div><div class='ctx'>             &lt;&lt; attrTagT(_IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath)</div><div class='del'>-            &lt;&lt; attrTagT(_NullTerminateStrings, tool.NullTerminateStrings)</div><div class='add'>+//unused    &lt;&lt; attrTagT(_NullTerminateStrings, tool.NullTerminateStrings)</div><div class='ctx'>             &lt;&lt; attrTagX(_PreprocessorDefinitions, tool.PreprocessorDefinitions, ";")</div><div class='ctx'>             &lt;&lt; attrTagS(_ResourceOutputFileName, tool.ResourceOutputFileName)</div><div class='del'>-            &lt;&lt; attrTagT(_ShowProgress, tool.ShowProgress)</div><div class='add'>+            &lt;&lt; attrTagT(_ShowProgress, toTriState(tool.ShowProgress))</div><div class='ctx'>             &lt;&lt; attrTagT(_SuppressStartupBanner, tool.SuppressStartupBanner)</div><div class='del'>-            &lt;&lt; attrTagS(_TrackerLogDirectory, tool.TrackerLogDirectory)</div><div class='del'>-            &lt;&lt; attrTagS(_UndefinePreprocessorDefinitions, tool.UndefinePreprocessorDefinitions)</div><div class='add'>+//unused    &lt;&lt; attrTagS(_TrackerLogDirectory, tool.TrackerLogDirectory)</div><div class='add'>+//unused    &lt;&lt; attrTagS(_UndefinePreprocessorDefinitions, tool.UndefinePreprocessorDefinitions)</div><div class='ctx'>         &lt;&lt; closetag(_ResourceCompile);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// VCXDeploymentTool --------------------------------------------</div><div class='del'>-VCXDeploymentTool::VCXDeploymentTool()</div><div class='del'>-{</div><div class='del'>-    DeploymentTag = "DeploymentTool";</div><div class='del'>-    RemoteDirectory = "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// http://msdn.microsoft.com/en-us/library/sa69he4t.aspx</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCXDeploymentTool &amp;tool)</div><div class='del'>-{</div><div class='del'>-    if (tool.AdditionalFiles.isEmpty())</div><div class='del'>-        return xml;</div><div class='del'>-    return xml</div><div class='del'>-        &lt;&lt; tag(tool.DeploymentTag)</div><div class='del'>-        &lt;&lt; closetag(tool.DeploymentTag);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// VCEventTool -------------------------------------------------</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCXEventTool &amp;tool)</div><div class='add'>+void VCXProjectWriter::write(XmlOutput &amp;xml, const VCEventTool &amp;tool)</div><div class='ctx'> {</div><div class='del'>-    return xml</div><div class='add'>+    xml</div><div class='ctx'>         &lt;&lt; tag(tool.EventName)</div><div class='ctx'>         &lt;&lt; attrTagS(_Command, tool.CommandLine.join(vcxCommandSeparator()))</div><div class='ctx'>         &lt;&lt; attrTagS(_Message, tool.Description)</div><div class='ctx'>         &lt;&lt; closetag(tool.EventName);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// VCXPostBuildEventTool ---------------------------------------------</div><div class='del'>-VCXPostBuildEventTool::VCXPostBuildEventTool()</div><div class='del'>-{</div><div class='del'>-    EventName = "PostBuildEvent";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// VCXPreBuildEventTool ----------------------------------------------</div><div class='del'>-VCXPreBuildEventTool::VCXPreBuildEventTool()</div><div class='add'>+void VCXProjectWriter::write(XmlOutput &amp;xml, const VCDeploymentTool &amp;tool)</div><div class='ctx'> {</div><div class='del'>-    EventName = "PreBuildEvent";</div><div class='add'>+    Q_UNUSED(xml);</div><div class='add'>+    Q_UNUSED(tool);</div><div class='add'>+    // SmartDevice deployment not supported in VS 2010</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// VCXPreLinkEventTool -----------------------------------------------</div><div class='del'>-VCXPreLinkEventTool::VCXPreLinkEventTool()</div><div class='del'>-{</div><div class='del'>-    EventName = "PreLinkEvent";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// VCConfiguration --------------------------------------------------</div><div class='del'>-</div><div class='del'>-VCXConfiguration::VCXConfiguration()</div><div class='del'>-    :        ATLMinimizesCRunTimeLibraryUsage(unset),</div><div class='del'>-        BuildBrowserInformation(unset),</div><div class='del'>-        RegisterOutput(unset),</div><div class='del'>-        WholeProgramOptimization(unset)</div><div class='del'>-{</div><div class='del'>-    compiler.config = this;</div><div class='del'>-    linker.config = this;</div><div class='del'>-    idl.config = this;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCXConfiguration &amp;tool)</div><div class='add'>+void VCXProjectWriter::write(XmlOutput &amp;xml, const VCConfiguration &amp;tool)</div><div class='ctx'> {</div><div class='ctx'>         xml &lt;&lt; tag("PropertyGroup")</div><div class='ctx'>             &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Name))</div><div class='hunk'>@@ -2277,740 +1544,161 @@ XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCXConfiguration &amp;tool)</div><div class='ctx'>             &lt;&lt; attrTagS(_OutputDirectory, tool.OutputDirectory)</div><div class='ctx'>             &lt;&lt; attrTagT(_ATLMinimizesCRunTimeLibraryUsage, tool.ATLMinimizesCRunTimeLibraryUsage)</div><div class='ctx'>             &lt;&lt; attrTagT(_BuildBrowserInformation, tool.BuildBrowserInformation)</div><div class='del'>-            &lt;&lt; attrTagS(_CharacterSet, tool.CharacterSet)</div><div class='del'>-            &lt;&lt; attrTagS(_ConfigurationType, tool.ConfigurationType)</div><div class='add'>+            &lt;&lt; attrTagS(_CharacterSet, toString(tool.CharacterSet))</div><div class='add'>+            &lt;&lt; attrTagS(_ConfigurationType, toString(tool.ConfigurationType))</div><div class='ctx'>             &lt;&lt; attrTagS(_DeleteExtensionsOnClean, tool.DeleteExtensionsOnClean)</div><div class='ctx'>             &lt;&lt; attrTagS(_ImportLibrary, tool.ImportLibrary)</div><div class='ctx'>             &lt;&lt; attrTagS(_IntermediateDirectory, tool.IntermediateDirectory)</div><div class='ctx'>             &lt;&lt; attrTagS(_PrimaryOutput, tool.PrimaryOutput)</div><div class='ctx'>             &lt;&lt; attrTagS(_ProgramDatabase, tool.ProgramDatabase)</div><div class='ctx'>             &lt;&lt; attrTagT(_RegisterOutput, tool.RegisterOutput)</div><div class='del'>-            &lt;&lt; attrTagS(_UseOfATL, tool.UseOfATL)</div><div class='del'>-            &lt;&lt; attrTagS(_UseOfMfc, tool.UseOfMfc)</div><div class='add'>+            &lt;&lt; attrTagS(_UseOfATL, toString(tool.UseOfATL))</div><div class='add'>+            &lt;&lt; attrTagS(_UseOfMfc, toString(tool.UseOfMfc))</div><div class='ctx'>             &lt;&lt; attrTagT(_WholeProgramOptimization, tool.WholeProgramOptimization)</div><div class='ctx'>         &lt;&lt; closetag();</div><div class='del'>-    return xml;</div><div class='del'>-}</div><div class='del'>-// VCXFilter ---------------------------------------------------------</div><div class='del'>-VCXFilter::VCXFilter()</div><div class='del'>-    :   ParseFiles(unset),</div><div class='del'>-        Config(0)</div><div class='del'>-{</div><div class='del'>-    useCustomBuildTool = false;</div><div class='del'>-    useCompilerTool = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void VCXFilter::addFile(const QString&amp; filename)</div><div class='add'>+void VCXProjectWriter::write(XmlOutput &amp;xml, VCFilter &amp;tool)</div><div class='ctx'> {</div><div class='del'>-    Files += VCXFilterFile(filename);</div><div class='add'>+    Q_UNUSED(xml);</div><div class='add'>+    Q_UNUSED(tool);</div><div class='add'>+    // unused in this generator</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void VCXFilter::addFile(const VCXFilterFile&amp; fileInfo)</div><div class='add'>+void VCXProjectWriter::addFilters(VCProject &amp;project, XmlOutput &amp;xmlFilter, const QString &amp;filtername)</div><div class='ctx'> {</div><div class='del'>-    Files += VCXFilterFile(fileInfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void VCXFilter::addFiles(const QStringList&amp; fileList)</div><div class='del'>-{</div><div class='del'>-    for (int i = 0; i &lt; fileList.count(); ++i)</div><div class='del'>-        addFile(fileList.at(i));</div><div class='del'>-}</div><div class='add'>+    bool added = false;</div><div class='ctx'> </div><div class='del'>-void VCXFilter::modifyPCHstage(QString str)</div><div class='del'>-{</div><div class='del'>-    bool autogenSourceFile = Project-&gt;autogenPrecompCPP;</div><div class='del'>-    bool pchThroughSourceFile = !Project-&gt;precompCPP.isEmpty();</div><div class='del'>-    bool isCFile = false;</div><div class='del'>-    for (QStringList::Iterator it = Option::c_ext.begin(); it != Option::c_ext.end(); ++it) {</div><div class='del'>-        if (str.endsWith(*it)) {</div><div class='del'>-            isCFile = true;</div><div class='del'>-            break;</div><div class='add'>+    for (int i = 0; i &lt; project.SingleProjects.count(); ++i) {</div><div class='add'>+        VCFilter filter;</div><div class='add'>+        const VCProjectSingleConfig &amp;singleCfg = project.SingleProjects.at(i);</div><div class='add'>+        if (filtername == "Root Files") {</div><div class='add'>+            filter = singleCfg.RootFiles;</div><div class='add'>+        } else if (filtername == "Source Files") {</div><div class='add'>+            filter = singleCfg.SourceFiles;</div><div class='add'>+        } else if (filtername == "Header Files") {</div><div class='add'>+            filter = singleCfg.HeaderFiles;</div><div class='add'>+        } else if (filtername == "Generated Files") {</div><div class='add'>+            filter = singleCfg.GeneratedFiles;</div><div class='add'>+        } else if (filtername == "LexYacc Files") {</div><div class='add'>+            filter = singleCfg.LexYaccFiles;</div><div class='add'>+        } else if (filtername == "Translation Files") {</div><div class='add'>+            filter = singleCfg.TranslationFiles;</div><div class='add'>+        } else if (filtername == "Form Files") {</div><div class='add'>+            filter = singleCfg.FormFiles;</div><div class='add'>+        } else if (filtername == "Resource Files") {</div><div class='add'>+            filter = singleCfg.ResourceFiles;</div><div class='add'>+        } else {</div><div class='add'>+            // ExtraCompilers</div><div class='add'>+            filter = project.SingleProjects[i].filterForExtraCompiler(filtername);</div><div class='ctx'>         }</div><div class='del'>-    }</div><div class='del'>-    bool isHFile = str.endsWith(".h") &amp;&amp; (str == Project-&gt;precompH);</div><div class='del'>-    bool isCPPFile = pchThroughSourceFile &amp;&amp; (str == Project-&gt;precompCPP);</div><div class='ctx'> </div><div class='del'>-    if(!isCFile &amp;&amp; !isHFile &amp;&amp; !isCPPFile)</div><div class='del'>-        return;</div><div class='del'>-</div><div class='del'>-    if(isHFile &amp;&amp; pchThroughSourceFile) {</div><div class='del'>-        if (autogenSourceFile) {</div><div class='del'>-            useCustomBuildTool = true;</div><div class='del'>-            QString toFile(Project-&gt;precompCPP);</div><div class='del'>-            CustomBuildTool.Description = "Generating precompiled header source file '" + toFile + "' ...";</div><div class='del'>-            CustomBuildTool.Outputs += toFile;</div><div class='del'>-</div><div class='del'>-            QStringList lines;</div><div class='del'>-            CustomBuildTool.CommandLine +=</div><div class='del'>-                "echo /*-------------------------------------------------------------------- &gt;" + toFile;</div><div class='del'>-            lines &lt;&lt; "* Precompiled header source file used by Visual Studio.NET to generate";</div><div class='del'>-            lines &lt;&lt; "* the .pch file.";</div><div class='del'>-            lines &lt;&lt; "*";</div><div class='del'>-            lines &lt;&lt; "* Due to issues with the dependencies checker within the IDE, it";</div><div class='del'>-            lines &lt;&lt; "* sometimes fails to recompile the PCH file, if we force the IDE to";</div><div class='del'>-            lines &lt;&lt; "* create the PCH file directly from the header file.";</div><div class='del'>-            lines &lt;&lt; "*";</div><div class='del'>-            lines &lt;&lt; "* This file is auto-generated by qmake since no PRECOMPILED_SOURCE was";</div><div class='del'>-            lines &lt;&lt; "* specified, and is used as the common stdafx.cpp. The file is only";</div><div class='del'>-            lines &lt;&lt; "* generated when creating .vcxproj project files, and is not used for";</div><div class='del'>-            lines &lt;&lt; "* command line compilations by nmake.";</div><div class='del'>-            lines &lt;&lt; "*";</div><div class='del'>-            lines &lt;&lt; "* WARNING: All changes made in this file will be lost.";</div><div class='del'>-            lines &lt;&lt; "--------------------------------------------------------------------*/";</div><div class='del'>-            lines &lt;&lt; "#include \"" + Project-&gt;precompHFilename + "\"";</div><div class='del'>-            foreach(QString line, lines)</div><div class='del'>-                CustomBuildTool.CommandLine += "echo " + line + "&gt;&gt;" + toFile;</div><div class='add'>+        if(!filter.Files.isEmpty() &amp;&amp; !added) {</div><div class='add'>+            xmlFilter &lt;&lt; tag("Filter")</div><div class='add'>+                      &lt;&lt; attrTag("Include", filtername)</div><div class='add'>+                      &lt;&lt; attrTagS("UniqueIdentifier", filter.Guid)</div><div class='add'>+                      &lt;&lt; attrTagS("Extensions", filter.Filter)</div><div class='add'>+                      &lt;&lt; attrTagT("ParseFiles", filter.ParseFiles)</div><div class='add'>+                      &lt;&lt; closetag();</div><div class='ctx'>         }</div><div class='del'>-        return;</div><div class='ctx'>     }</div><div class='del'>-</div><div class='del'>-    useCompilerTool = true;</div><div class='del'>-    // Setup PCH options</div><div class='del'>-    CompilerTool.PrecompiledHeader     = (isCFile ? "NotUsing" : "Create" );</div><div class='del'>-    CompilerTool.PrecompiledHeaderFile = (isCPPFile ? QString("$(INHERIT)") : QString("$(NOINHERIT)"));</div><div class='del'>-    CompilerTool.ForcedIncludeFiles       = QStringList("$(NOINHERIT)");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool VCXFilter::addExtraCompiler(const VCXFilterFile &amp;info)</div><div class='add'>+// outputs a given filter for all existing configurations of a project</div><div class='add'>+void VCXProjectWriter::outputFilter(VCProject &amp;project, XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const QString &amp;filtername)</div><div class='ctx'> {</div><div class='del'>-    const QStringList &amp;extraCompilers = Project-&gt;extraCompilerSources.value(info.file);</div><div class='del'>-    if (extraCompilers.isEmpty())</div><div class='del'>-        return false;</div><div class='del'>-</div><div class='del'>-    QString inFile = info.file;</div><div class='del'>-</div><div class='del'>-    // is the extracompiler rule on a file with a built in compiler?</div><div class='del'>-    const QStringList &amp;objectMappedFile = Project-&gt;extraCompilerOutputs[inFile];</div><div class='del'>-    bool hasBuiltIn = false;</div><div class='del'>-    if (!objectMappedFile.isEmpty()) {</div><div class='del'>-        hasBuiltIn = Project-&gt;hasBuiltinCompiler(objectMappedFile.at(0));</div><div class='del'>-//        qDebug("*** Extra compiler file has object mapped file '%s' =&gt; '%s'", qPrintable(inFile), qPrintable(objectMappedFile.join(" ")));</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    CustomBuildTool.AdditionalDependencies.clear();</div><div class='del'>-    CustomBuildTool.CommandLine.clear();</div><div class='del'>-    CustomBuildTool.Description.clear();</div><div class='del'>-    CustomBuildTool.Outputs.clear();</div><div class='del'>-    CustomBuildTool.ToolPath.clear();</div><div class='del'>-    CustomBuildTool.ToolName = QLatin1String(_VCCustomBuildTool);</div><div class='del'>-</div><div class='del'>-    for (int x = 0; x &lt; extraCompilers.count(); ++x) {</div><div class='del'>-        const QString &amp;extraCompilerName = extraCompilers.at(x);</div><div class='del'>-</div><div class='del'>-        if (!Project-&gt;verifyExtraCompiler(extraCompilerName, inFile) &amp;&amp; !hasBuiltIn)</div><div class='del'>-            continue;</div><div class='del'>-</div><div class='del'>-        // All information about the extra compiler</div><div class='del'>-        QString tmp_out = Project-&gt;project-&gt;first(extraCompilerName + ".output");</div><div class='del'>-        QString tmp_cmd = Project-&gt;project-&gt;variables()[extraCompilerName + ".commands"].join(" ");</div><div class='del'>-        QString tmp_cmd_name = Project-&gt;project-&gt;variables()[extraCompilerName + ".name"].join(" ");</div><div class='del'>-        QStringList tmp_dep = Project-&gt;project-&gt;variables()[extraCompilerName + ".depends"];</div><div class='del'>-        QString tmp_dep_cmd = Project-&gt;project-&gt;variables()[extraCompilerName + ".depend_command"].join(" ");</div><div class='del'>-        QStringList vars = Project-&gt;project-&gt;variables()[extraCompilerName + ".variables"];</div><div class='del'>-        QStringList configs = Project-&gt;project-&gt;variables()[extraCompilerName + ".CONFIG"];</div><div class='del'>-        bool combined = configs.indexOf("combine") != -1;</div><div class='del'>-</div><div class='del'>-        QString cmd, cmd_name, out;</div><div class='del'>-        QStringList deps, inputs;</div><div class='del'>-        // Variabel replacement of output name</div><div class='del'>-        out = Option::fixPathToTargetOS(</div><div class='del'>-                    Project-&gt;replaceExtraCompilerVariables(tmp_out, inFile, QString()),</div><div class='del'>-                    false);</div><div class='del'>-</div><div class='del'>-        // If file has built-in compiler, we've swapped the input and output of</div><div class='del'>-        // the command, as we in Visual Studio cannot have a Custom Buildstep on</div><div class='del'>-        // a file which uses a built-in compiler. We would in this case only get</div><div class='del'>-        // the result from the extra compiler. If 'hasBuiltIn' is true, we know</div><div class='del'>-        // that we're actually on the _output_file_ of the result, and we</div><div class='del'>-        // therefore swap inFile and out below, since the extra-compiler still</div><div class='del'>-        // must see it as the original way. If the result also has a built-in</div><div class='del'>-        // compiler, too bad..</div><div class='del'>-        if (hasBuiltIn) {</div><div class='del'>-            out = inFile;</div><div class='del'>-            inFile = objectMappedFile.at(0);</div><div class='del'>-        }</div><div class='add'>+    XNode *root;</div><div class='add'>+    if (project.SingleProjects.at(0).flat_files)</div><div class='add'>+        root = new XFlatNode;</div><div class='add'>+    else</div><div class='add'>+        root = new XTreeNode;</div><div class='ctx'> </div><div class='del'>-        // Dependency for the output</div><div class='del'>-        if(!tmp_dep.isEmpty())</div><div class='del'>-            deps = tmp_dep;</div><div class='del'>-        if(!tmp_dep_cmd.isEmpty()) {</div><div class='del'>-            // Execute dependency command, and add every line as a dep</div><div class='del'>-            char buff[256];</div><div class='del'>-            QString dep_cmd = Project-&gt;replaceExtraCompilerVariables(tmp_dep_cmd, Option::fixPathToLocalOS(inFile, true, false), out);</div><div class='del'>-            if(Project-&gt;canExecute(dep_cmd)) {</div><div class='del'>-                dep_cmd.prepend(QLatin1String("cd ")</div><div class='del'>-                                + Project-&gt;escapeFilePath(Option::fixPathToLocalOS(Option::output_dir, false))</div><div class='del'>-                                + QLatin1String(" &amp;&amp; "));</div><div class='del'>-                if(FILE *proc = QT_POPEN(dep_cmd.toLatin1().constData(), "r")) {</div><div class='del'>-                    QString indeps;</div><div class='del'>-                    while(!feof(proc)) {</div><div class='del'>-                        int read_in = (int)fread(buff, 1, 255, proc);</div><div class='del'>-                        if(!read_in)</div><div class='del'>-                            break;</div><div class='del'>-                        indeps += QByteArray(buff, read_in);</div><div class='del'>-                    }</div><div class='del'>-                    QT_PCLOSE(proc);</div><div class='del'>-                    if(!indeps.isEmpty()) {</div><div class='del'>-                        QStringList extradeps = indeps.split(QLatin1Char('\n'));</div><div class='del'>-                        for (int i = 0; i &lt; extradeps.count(); ++i) {</div><div class='del'>-                            QString dd = extradeps.at(i).simplified();</div><div class='del'>-                            if (!dd.isEmpty())</div><div class='del'>-                                deps += Project-&gt;fileFixify(dd, QString(), Option::output_dir);</div><div class='del'>-                        }</div><div class='del'>-                    }</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        for (int i = 0; i &lt; deps.count(); ++i)</div><div class='del'>-            deps[i] = Option::fixPathToTargetOS(</div><div class='del'>-                        Project-&gt;replaceExtraCompilerVariables(deps.at(i), inFile, out),</div><div class='del'>-                        false).trimmed();</div><div class='del'>-        // Command for file</div><div class='del'>-        if (combined) {</div><div class='del'>-            // Add dependencies for each file</div><div class='del'>-            QStringList tmp_in = Project-&gt;project-&gt;variables()[extraCompilerName + ".input"];</div><div class='del'>-            for (int a = 0; a &lt; tmp_in.count(); ++a) {</div><div class='del'>-                const QStringList &amp;files = Project-&gt;project-&gt;variables()[tmp_in.at(a)];</div><div class='del'>-                for (int b = 0; b &lt; files.count(); ++b) {</div><div class='del'>-                    deps += Project-&gt;findDependencies(files.at(b));</div><div class='del'>-                    inputs += Option::fixPathToTargetOS(files.at(b), false);</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-            deps += inputs; // input files themselves too..</div><div class='add'>+    QString name, extfilter;</div><div class='add'>+    triState parse;</div><div class='ctx'> </div><div class='del'>-            // Replace variables for command w/all input files</div><div class='del'>-            // ### join gives path issues with directories containing spaces!</div><div class='del'>-            cmd = Project-&gt;replaceExtraCompilerVariables(tmp_cmd,</div><div class='del'>-                                                         inputs.join(" "),</div><div class='del'>-                                                         out);</div><div class='add'>+    for (int i = 0; i &lt; project.SingleProjects.count(); ++i) {</div><div class='add'>+        VCFilter filter;</div><div class='add'>+        const VCProjectSingleConfig &amp;singleCfg = project.SingleProjects.at(i);</div><div class='add'>+        if (filtername == "Root Files") {</div><div class='add'>+            filter = singleCfg.RootFiles;</div><div class='add'>+        } else if (filtername == "Source Files") {</div><div class='add'>+            filter = singleCfg.SourceFiles;</div><div class='add'>+        } else if (filtername == "Header Files") {</div><div class='add'>+            filter = singleCfg.HeaderFiles;</div><div class='add'>+        } else if (filtername == "Generated Files") {</div><div class='add'>+            filter = singleCfg.GeneratedFiles;</div><div class='add'>+        } else if (filtername == "LexYacc Files") {</div><div class='add'>+            filter = singleCfg.LexYaccFiles;</div><div class='add'>+        } else if (filtername == "Translation Files") {</div><div class='add'>+            filter = singleCfg.TranslationFiles;</div><div class='add'>+        } else if (filtername == "Form Files") {</div><div class='add'>+            filter = singleCfg.FormFiles;</div><div class='add'>+        } else if (filtername == "Resource Files") {</div><div class='add'>+            filter = singleCfg.ResourceFiles;</div><div class='ctx'>         } else {</div><div class='del'>-            deps += inFile; // input file itself too..</div><div class='del'>-            cmd = Project-&gt;replaceExtraCompilerVariables(tmp_cmd,</div><div class='del'>-                                                         inFile,</div><div class='del'>-                                                         out);</div><div class='del'>-        }</div><div class='del'>-        // Name for command</div><div class='del'>-    if(!tmp_cmd_name.isEmpty()) {</div><div class='del'>-        cmd_name = Project-&gt;replaceExtraCompilerVariables(tmp_cmd_name, inFile, out);</div><div class='del'>-	} else {</div><div class='del'>-        int space = cmd.indexOf(' ');</div><div class='del'>-        if(space != -1)</div><div class='del'>-        cmd_name = cmd.left(space);</div><div class='del'>-        else</div><div class='del'>-        cmd_name = cmd;</div><div class='del'>-        if((cmd_name[0] == '\'' || cmd_name[0] == '"') &amp;&amp;</div><div class='del'>-        cmd_name[0] == cmd_name[cmd_name.length()-1])</div><div class='del'>-        cmd_name = cmd_name.mid(1,cmd_name.length()-2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-        // Fixify paths</div><div class='del'>-        for (int i = 0; i &lt; deps.count(); ++i)</div><div class='del'>-            deps[i] = Option::fixPathToTargetOS(deps[i], false);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-        // Output in info.additionalFile -----------</div><div class='del'>-        if (!CustomBuildTool.Description.isEmpty())</div><div class='del'>-            CustomBuildTool.Description += ", ";</div><div class='del'>-        CustomBuildTool.Description += cmd_name;</div><div class='del'>-        CustomBuildTool.CommandLine += VCToolBase::fixCommandLine(cmd.trimmed());</div><div class='del'>-        int space = cmd.indexOf(' ');</div><div class='del'>-        QFileInfo finf(cmd.left(space));</div><div class='del'>-        if (CustomBuildTool.ToolPath.isEmpty())</div><div class='del'>-            CustomBuildTool.ToolPath += Option::fixPathToTargetOS(finf.path());</div><div class='del'>-        CustomBuildTool.Outputs += out;</div><div class='del'>-</div><div class='del'>-        deps += CustomBuildTool.AdditionalDependencies;</div><div class='del'>-        deps += cmd.left(cmd.indexOf(' '));</div><div class='del'>-        // Make sure that all deps are only once</div><div class='del'>-        QMap&lt;QString, bool&gt; uniqDeps;</div><div class='del'>-        for (int c = 0; c &lt; deps.count(); ++c) {</div><div class='del'>-            QString aDep = deps.at(c).trimmed();</div><div class='del'>-            if (!aDep.isEmpty())</div><div class='del'>-                uniqDeps[aDep] = false;</div><div class='del'>-        }</div><div class='del'>-        CustomBuildTool.AdditionalDependencies = uniqDeps.keys();</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    // Ensure that none of the output files are also dependencies. Or else, the custom buildstep</div><div class='del'>-    // will be rebuild every time, even if nothing has changed.</div><div class='del'>-    foreach(QString output, CustomBuildTool.Outputs) {</div><div class='del'>-        CustomBuildTool.AdditionalDependencies.removeAll(output);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    useCustomBuildTool = !CustomBuildTool.CommandLine.isEmpty();</div><div class='del'>-    return useCustomBuildTool;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool VCXFilter::outputFileConfig(XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const QString &amp;filename, const QString &amp;filtername, bool fileAllreadyAdded)</div><div class='del'>-{</div><div class='del'>-    bool fileAdded = false;</div><div class='del'>-</div><div class='del'>-    // Clearing each filter tool</div><div class='del'>-    useCustomBuildTool = false;</div><div class='del'>-    useCompilerTool = false;</div><div class='del'>-    CustomBuildTool = VCXCustomBuildTool();</div><div class='del'>-    CompilerTool = VCXCLCompilerTool();</div><div class='del'>-</div><div class='del'>-    // Unset some default options</div><div class='del'>-    CompilerTool.BufferSecurityCheck = unset;</div><div class='del'>-    CompilerTool.DebugInformationFormat = "";</div><div class='del'>-    CompilerTool.ExceptionHandling = "";</div><div class='del'>-    //CompilerTool.Optimization = optimizeDefault;</div><div class='del'>-    CompilerTool.ProgramDataBaseFileName.clear();</div><div class='del'>-    CompilerTool.RuntimeLibrary = "";</div><div class='del'>-    //CompilerTool.WarningLevel = warningLevelUnknown;</div><div class='del'>-    CompilerTool.config = Config;</div><div class='del'>-</div><div class='del'>-    bool inBuild = false;</div><div class='del'>-    VCXFilterFile info;</div><div class='del'>-    for (int i = 0; i &lt; Files.count(); ++i) {</div><div class='del'>-        if (Files.at(i).file == filename) {</div><div class='del'>-            info = Files.at(i);</div><div class='del'>-            inBuild = true;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    inBuild &amp;= !info.excludeFromBuild;</div><div class='del'>-</div><div class='del'>-    if (inBuild) {</div><div class='del'>-        addExtraCompiler(info);</div><div class='del'>-        if(Project-&gt;usePCH)</div><div class='del'>-            modifyPCHstage(info.file);</div><div class='del'>-    } else {</div><div class='del'>-        // Excluded files uses an empty compiler stage</div><div class='del'>-        if(info.excludeFromBuild)</div><div class='del'>-            useCompilerTool = true;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    // Actual XML output ----------------------------------</div><div class='del'>-    if(useCustomBuildTool || useCompilerTool || !inBuild) {</div><div class='del'>-</div><div class='del'>-        if (useCustomBuildTool)</div><div class='del'>-        {</div><div class='del'>-            CustomBuildTool.ConfigName = (*Config).Name;</div><div class='del'>-</div><div class='del'>-            if ( !fileAllreadyAdded ) {</div><div class='del'>-</div><div class='del'>-                fileAdded = true;</div><div class='del'>-</div><div class='del'>-                xmlFilter &lt;&lt; tag("CustomBuild")</div><div class='del'>-                    &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename))</div><div class='del'>-                    &lt;&lt; attrTagS("Filter", filtername);</div><div class='del'>-</div><div class='del'>-                xml &lt;&lt; tag("CustomBuild")</div><div class='del'>-                    &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='del'>-</div><div class='del'>-                if ( filtername == "Form Files" || filtername == "Generated Files" || filtername == "Resource Files" )</div><div class='del'>-                    xml &lt;&lt; attrTagS("FileType", "Document");</div><div class='del'>-            }</div><div class='del'>-</div><div class='del'>-            xml &lt;&lt; CustomBuildTool;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if ( !fileAdded &amp;&amp; !fileAllreadyAdded )</div><div class='del'>-        {</div><div class='del'>-            fileAdded = true;</div><div class='del'>-</div><div class='del'>-            if (filtername == "Source Files") {</div><div class='del'>-</div><div class='del'>-                xmlFilter &lt;&lt; tag("ClCompile")</div><div class='del'>-                          &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename))</div><div class='del'>-                          &lt;&lt; attrTagS("Filter", filtername);</div><div class='del'>-</div><div class='del'>-                xml &lt;&lt; tag("ClCompile")</div><div class='del'>-                    &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='del'>-</div><div class='del'>-            } else if(filtername == "Header Files") {</div><div class='del'>-</div><div class='del'>-                xmlFilter &lt;&lt; tag("ClInclude")</div><div class='del'>-                    &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename))</div><div class='del'>-                    &lt;&lt; attrTagS("Filter", filtername);</div><div class='del'>-</div><div class='del'>-                xml &lt;&lt; tag("ClInclude")</div><div class='del'>-                    &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='del'>-            } else if(filtername == "Generated Files" || filtername == "Form Files") {</div><div class='del'>-</div><div class='del'>-                if (filename.endsWith(".h")) {</div><div class='del'>-</div><div class='del'>-                    xmlFilter &lt;&lt; tag("ClInclude")</div><div class='del'>-                              &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename))</div><div class='del'>-                              &lt;&lt; attrTagS("Filter", filtername);</div><div class='del'>-</div><div class='del'>-                    xml &lt;&lt; tag("ClInclude")</div><div class='del'>-                        &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='del'>-                } else if(filename.endsWith(".cpp")) {</div><div class='del'>-</div><div class='del'>-                    xmlFilter &lt;&lt; tag("ClCompile")</div><div class='del'>-                              &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename))</div><div class='del'>-                              &lt;&lt; attrTagS("Filter", filtername);</div><div class='del'>-</div><div class='del'>-                    xml &lt;&lt; tag("ClCompile")</div><div class='del'>-                        &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='del'>-                } else if(filename.endsWith(".res")) {</div><div class='del'>-</div><div class='del'>-                    xmlFilter &lt;&lt; tag("CustomBuild")</div><div class='del'>-                              &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename))</div><div class='del'>-                              &lt;&lt; attrTagS("Filter", filtername);</div><div class='del'>-</div><div class='del'>-                    xml &lt;&lt; tag("CustomBuild")</div><div class='del'>-                        &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='del'>-                } else {</div><div class='del'>-</div><div class='del'>-                    xmlFilter &lt;&lt; tag("CustomBuild")</div><div class='del'>-                              &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename))</div><div class='del'>-                              &lt;&lt; attrTagS("Filter", filtername);</div><div class='del'>-</div><div class='del'>-                    xml &lt;&lt; tag("CustomBuild")</div><div class='del'>-                        &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='del'>-                }</div><div class='del'>-            } else if(filtername == "Root Files") {</div><div class='del'>-</div><div class='del'>-                if (filename.endsWith(".rc")) {</div><div class='del'>-</div><div class='del'>-                    xmlFilter &lt;&lt; tag("ResourceCompile")</div><div class='del'>-                              &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='del'>-</div><div class='del'>-                    xml &lt;&lt; tag("ResourceCompile")</div><div class='del'>-                        &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if(!inBuild) {</div><div class='del'>-</div><div class='del'>-            xml &lt;&lt; tag("ExcludedFromBuild")</div><div class='del'>-                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg((*Config).Name))</div><div class='del'>-                &lt;&lt; valueTag("true");</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if (useCompilerTool) {</div><div class='del'>-</div><div class='del'>-            if ( !CompilerTool.ForcedIncludeFiles.isEmpty() ) {</div><div class='del'>-                xml &lt;&lt; tag("ForcedIncludeFiles")</div><div class='del'>-                    &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg((*Config).Name))</div><div class='del'>-                    &lt;&lt; valueTagX(CompilerTool.ForcedIncludeFiles);</div><div class='del'>-            }</div><div class='del'>-</div><div class='del'>-            if ( !CompilerTool.PrecompiledHeaderFile.isEmpty() ) {</div><div class='del'>-</div><div class='del'>-                xml &lt;&lt; tag("PrecompiledHeaderFile")</div><div class='del'>-                    &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg((*Config).Name))</div><div class='del'>-                    &lt;&lt; valueTag(CompilerTool.PrecompiledHeaderFile);</div><div class='del'>-            }</div><div class='del'>-</div><div class='del'>-            if ( !CompilerTool.PrecompiledHeader.isEmpty() ) {</div><div class='del'>-</div><div class='del'>-                xml &lt;&lt; tag("PrecompiledHeader")</div><div class='del'>-                    &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg((*Config).Name))</div><div class='del'>-                    &lt;&lt; valueTag(CompilerTool.PrecompiledHeader);</div><div class='del'>-            }</div><div class='add'>+            // ExtraCompilers</div><div class='add'>+            filter = project.SingleProjects[i].filterForExtraCompiler(filtername);</div><div class='ctx'>         }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return fileAdded;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-// VCXProjectSingleConfig --------------------------------------------</div><div class='del'>-VCXFilter nullVCXFilter;</div><div class='del'>-VCXFilter&amp; VCXProjectSingleConfig::filterForExtraCompiler(const QString &amp;compilerName)</div><div class='del'>-{</div><div class='del'>-    for (int i = 0; i &lt; ExtraCompilersFiles.count(); ++i)</div><div class='del'>-        if (ExtraCompilersFiles.at(i).Name == compilerName)</div><div class='del'>-            return ExtraCompilersFiles[i];</div><div class='del'>-    return nullVCXFilter;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCXProjectSingleConfig &amp;tool)</div><div class='del'>-{</div><div class='del'>-    xml.setIndentString("  ");</div><div class='del'>-</div><div class='del'>-    xml &lt;&lt; decl("1.0", "utf-8")</div><div class='del'>-        &lt;&lt; tag("Project")</div><div class='del'>-        &lt;&lt; attrTag("DefaultTargets","Build")</div><div class='del'>-        &lt;&lt; attrTag("ToolsVersion", "4.0")</div><div class='del'>-        &lt;&lt; attrTag("xmlns", "http://schemas.microsoft.com/developer/msbuild/2003")</div><div class='del'>-        &lt;&lt; tag("ItemGroup")</div><div class='del'>-        &lt;&lt; attrTag("Label", "ProjectConfigurations");</div><div class='del'>-</div><div class='del'>-    xml &lt;&lt; tag("ProjectConfiguration")</div><div class='del'>-        &lt;&lt; attrTag("Include" , tool.Configuration.Name)</div><div class='del'>-        &lt;&lt; tagValue("Configuration", tool.Configuration.ConfigurationName)</div><div class='del'>-        &lt;&lt; tagValue("Platform", tool.PlatformName)</div><div class='del'>-        &lt;&lt; closetag();</div><div class='del'>-</div><div class='del'>-    xml &lt;&lt; closetag()</div><div class='del'>-        &lt;&lt; tag("PropertyGroup")</div><div class='del'>-        &lt;&lt; attrTag("Label", "Globals")</div><div class='del'>-        &lt;&lt; tagValue("ProjectGuid", tool.ProjectGUID)</div><div class='del'>-        &lt;&lt; tagValue("RootNamespace", tool.Name)</div><div class='del'>-        &lt;&lt; tagValue("Keyword", tool.Keyword)</div><div class='del'>-        &lt;&lt; closetag();</div><div class='del'>-</div><div class='del'>-    // config part.</div><div class='del'>-    xml &lt;&lt; import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.Default.props");</div><div class='del'>-</div><div class='del'>-    xml &lt;&lt; tool.Configuration;</div><div class='del'>-</div><div class='del'>-    xml &lt;&lt; import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.props");</div><div class='del'>-</div><div class='del'>-    // Extension settings</div><div class='del'>-    xml &lt;&lt; tag("ImportGroup")</div><div class='del'>-        &lt;&lt; attrTag("Label", "ExtensionSettings")</div><div class='del'>-        &lt;&lt; closetag();</div><div class='del'>-</div><div class='del'>-    // PropertySheets</div><div class='del'>-    xml &lt;&lt; tag("ImportGroup")</div><div class='del'>-        &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='del'>-        &lt;&lt; attrTag("Label", "PropertySheets");</div><div class='del'>-</div><div class='del'>-    xml &lt;&lt; tag("Import")</div><div class='del'>-        &lt;&lt; attrTag("Project", "$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props")</div><div class='del'>-        &lt;&lt; attrTag("Condition", "exists('$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props')")</div><div class='del'>-        &lt;&lt; closetag()</div><div class='del'>-        &lt;&lt; closetag();</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    // UserMacros</div><div class='del'>-    xml &lt;&lt; tag("PropertyGroup")</div><div class='del'>-        &lt;&lt; attrTag("Label", "UserMacros")</div><div class='del'>-        &lt;&lt; closetag();</div><div class='del'>-</div><div class='del'>-    xml &lt;&lt; tag("PropertyGroup");</div><div class='del'>-</div><div class='del'>-    if ( !tool.Configuration.OutputDirectory.isEmpty() ) {</div><div class='del'>-        xml&lt;&lt; tag("OutDir")</div><div class='del'>-            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='del'>-            &lt;&lt; valueTag(tool.Configuration.OutputDirectory);</div><div class='del'>-    }</div><div class='del'>-    if ( !tool.Configuration.IntermediateDirectory.isEmpty() ) {</div><div class='del'>-        xml&lt;&lt; tag("IntDir")</div><div class='del'>-            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='del'>-            &lt;&lt; valueTag(tool.Configuration.IntermediateDirectory);</div><div class='del'>-    }</div><div class='del'>-    if ( !tool.Configuration.TargetName.isEmpty() ) {</div><div class='del'>-        xml&lt;&lt; tag("TargetName")</div><div class='del'>-            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='del'>-            &lt;&lt; valueTag(tool.Configuration.TargetName);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if ( tool.Configuration.linker.IgnoreImportLibrary != unset) {</div><div class='del'>-        xml&lt;&lt; tag("IgnoreImportLibrary")</div><div class='del'>-            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='del'>-            &lt;&lt; valueTagT(tool.Configuration.linker.IgnoreImportLibrary);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if ( tool.Configuration.linker.LinkIncremental != unset) {</div><div class='del'>-        xml&lt;&lt; tag("LinkIncremental")</div><div class='del'>-            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='del'>-            &lt;&lt; valueTagT(tool.Configuration.linker.LinkIncremental);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if ( tool.Configuration.preBuild.UseInBuild != unset )</div><div class='del'>-    {</div><div class='del'>-        xml&lt;&lt; tag("PreBuildEventUseInBuild")</div><div class='del'>-            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='del'>-            &lt;&lt; valueTagT(tool.Configuration.preBuild.UseInBuild);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if ( tool.Configuration.preLink.UseInBuild != unset )</div><div class='del'>-    {</div><div class='del'>-        xml&lt;&lt; tag("PreLinkEventUseInBuild")</div><div class='del'>-            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='del'>-            &lt;&lt; valueTagT(tool.Configuration.preLink.UseInBuild);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if ( tool.Configuration.postBuild.UseInBuild != unset )</div><div class='del'>-    {</div><div class='del'>-        xml&lt;&lt; tag("PostBuildEventUseInBuild")</div><div class='del'>-            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name))</div><div class='del'>-            &lt;&lt; valueTagT(tool.Configuration.postBuild.UseInBuild);</div><div class='del'>-    }</div><div class='del'>-    xml &lt;&lt; closetag();</div><div class='del'>-</div><div class='del'>-    xml &lt;&lt; tag("ItemDefinitionGroup")</div><div class='del'>-        &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.Configuration.Name));</div><div class='del'>-</div><div class='del'>-    // ClCompile</div><div class='del'>-    xml &lt;&lt; tool.Configuration.compiler;</div><div class='del'>-</div><div class='del'>-    // Link</div><div class='del'>-    xml &lt;&lt; tool.Configuration.linker;</div><div class='del'>-</div><div class='del'>-    // Midl</div><div class='del'>-    xml &lt;&lt; tool.Configuration.idl;</div><div class='del'>-</div><div class='del'>-    // ResourceCompiler</div><div class='del'>-    xml &lt;&lt; tool.Configuration.resource;</div><div class='del'>-</div><div class='del'>-    // Post build event</div><div class='del'>-    if ( tool.Configuration.postBuild.UseInBuild != unset )</div><div class='del'>-        xml &lt;&lt; tool.Configuration.postBuild;</div><div class='del'>-    </div><div class='del'>-    // Pre build event</div><div class='del'>-    if ( tool.Configuration.preBuild.UseInBuild != unset )</div><div class='del'>-        xml &lt;&lt; tool.Configuration.preBuild;</div><div class='del'>-</div><div class='del'>-    // Pre link event</div><div class='del'>-    if ( tool.Configuration.preLink.UseInBuild != unset )</div><div class='del'>-        xml &lt;&lt; tool.Configuration.preLink;</div><div class='del'>-</div><div class='del'>-    xml &lt;&lt; closetag();</div><div class='del'>-</div><div class='del'>-    QFile filterFile;</div><div class='del'>-    filterFile.setFileName(Option::output.fileName().append(".filters"));</div><div class='del'>-    filterFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);</div><div class='del'>-    QTextStream ts(&amp;filterFile);</div><div class='del'>-    XmlOutput xmlFilter(ts, XmlOutput::NoConversion);</div><div class='del'>-</div><div class='del'>-    xmlFilter.setIndentString("  ");</div><div class='del'>-</div><div class='del'>-    xmlFilter &lt;&lt; decl("1.0", "utf-8")</div><div class='del'>-              &lt;&lt; tag("Project")</div><div class='del'>-              &lt;&lt; attrTag("ToolsVersion", "4.0")</div><div class='del'>-              &lt;&lt; attrTag("xmlns", "http://schemas.microsoft.com/developer/msbuild/2003");</div><div class='del'>-</div><div class='del'>-    xmlFilter &lt;&lt; tag("ItemGroup");</div><div class='del'>-</div><div class='del'>-    VCXProject tempProj;</div><div class='del'>-    tempProj.SingleProjects += tool;</div><div class='del'>-</div><div class='del'>-    tempProj.addFilters(xmlFilter, "Form Files");</div><div class='del'>-    tempProj.addFilters(xmlFilter, "Generated Files");</div><div class='del'>-    tempProj.addFilters(xmlFilter, "Header Files");</div><div class='del'>-    tempProj.addFilters(xmlFilter, "LexYacc Files");</div><div class='del'>-    tempProj.addFilters(xmlFilter, "Resource Files");</div><div class='del'>-    tempProj.addFilters(xmlFilter, "Source Files");</div><div class='del'>-    tempProj.addFilters(xmlFilter, "Translation Files");</div><div class='del'>-    xmlFilter &lt;&lt; closetag();</div><div class='del'>-</div><div class='del'>-    tempProj.outputFilter(xml, xmlFilter, "Source Files");</div><div class='del'>-    tempProj.outputFilter(xml, xmlFilter, "Header Files");</div><div class='del'>-    tempProj.outputFilter(xml, xmlFilter, "Generated Files");</div><div class='del'>-    tempProj.outputFilter(xml, xmlFilter, "LexYacc Files");</div><div class='del'>-    tempProj.outputFilter(xml, xmlFilter, "Translation Files");</div><div class='del'>-    tempProj.outputFilter(xml, xmlFilter, "Form Files");</div><div class='del'>-    tempProj.outputFilter(xml, xmlFilter, "Resource Files");</div><div class='del'>-</div><div class='del'>-    for (int x = 0; x &lt; tempProj.ExtraCompilers.count(); ++x) {</div><div class='del'>-        tempProj.outputFilter(xml, xmlFilter, tempProj.ExtraCompilers.at(x));</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    xml &lt;&lt; import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.targets");</div><div class='del'>-</div><div class='del'>-    xml &lt;&lt; tag("ImportGroup")</div><div class='del'>-        &lt;&lt; attrTag("Label", "ExtensionTargets")</div><div class='del'>-        &lt;&lt; closetag();</div><div class='ctx'> </div><div class='del'>-    return xml;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-// Tree file generation ---------------------------------------------</div><div class='del'>-void XTreeNode::generateXML(XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const QString &amp;tagName, VCXProject &amp;tool, const QString &amp;filter) {</div><div class='add'>+        // Merge all files in this filter to root tree</div><div class='add'>+        for (int x = 0; x &lt; filter.Files.count(); ++x)</div><div class='add'>+            root-&gt;addElement(filter.Files.at(x));</div><div class='ctx'> </div><div class='del'>-    if (children.size()) {</div><div class='del'>-        // Filter</div><div class='del'>-        QString tempFilterName;</div><div class='del'>-        ChildrenMap::ConstIterator it, end = children.constEnd();</div><div class='del'>-        if (!tagName.isEmpty()) {</div><div class='del'>-            tempFilterName.append(filter);</div><div class='del'>-            tempFilterName.append("\\");</div><div class='del'>-            tempFilterName.append(tagName);</div><div class='del'>-            xmlFilter &lt;&lt; tag(_ItemGroup);</div><div class='del'>-            xmlFilter &lt;&lt; tag("Filter")</div><div class='del'>-                      &lt;&lt; attrTag("Include", tempFilterName)</div><div class='del'>-                      &lt;&lt; closetag();</div><div class='del'>-            xmlFilter &lt;&lt; closetag();</div><div class='add'>+        // Save filter setting from first filter. Next filters</div><div class='add'>+        // may differ but we cannot handle that. (ex. extfilter)</div><div class='add'>+        if (name.isEmpty()) {</div><div class='add'>+            name = filter.Name;</div><div class='add'>+            extfilter = filter.Filter;</div><div class='add'>+            parse = filter.ParseFiles;</div><div class='ctx'>         }</div><div class='del'>-        // First round, do nested filters</div><div class='del'>-        for (it = children.constBegin(); it != end; ++it)</div><div class='del'>-            if ((*it)-&gt;children.size())</div><div class='del'>-            {</div><div class='del'>-                if ( !tempFilterName.isEmpty() )</div><div class='del'>-                    (*it)-&gt;generateXML(xml, xmlFilter, it.key(), tool, tempFilterName);</div><div class='del'>-                else</div><div class='del'>-                    (*it)-&gt;generateXML(xml, xmlFilter, it.key(), tool, filter);</div><div class='del'>-            }</div><div class='del'>-        // Second round, do leafs</div><div class='del'>-        for (it = children.constBegin(); it != end; ++it)</div><div class='del'>-            if (!(*it)-&gt;children.size())</div><div class='del'>-            {</div><div class='del'>-                if ( !tempFilterName.isEmpty() )</div><div class='del'>-                    (*it)-&gt;generateXML(xml, xmlFilter, it.key(), tool, tempFilterName);</div><div class='del'>-                else</div><div class='del'>-                    (*it)-&gt;generateXML(xml, xmlFilter, it.key(), tool, filter);</div><div class='del'>-            }</div><div class='del'>-    } else {</div><div class='del'>-        // Leaf</div><div class='del'>-        xml &lt;&lt; tag(_ItemGroup);</div><div class='del'>-        xmlFilter &lt;&lt; tag(_ItemGroup);        </div><div class='del'>-        tool.outputFileConfigs(xml, xmlFilter, info, filter);</div><div class='del'>-        xmlFilter &lt;&lt; closetag();</div><div class='del'>-        xml &lt;&lt; closetag();</div><div class='ctx'>     }</div><div class='del'>-}</div><div class='ctx'> </div><div class='add'>+    if (!root-&gt;hasElements())</div><div class='add'>+        return;</div><div class='ctx'> </div><div class='del'>-// Flat file generation ---------------------------------------------</div><div class='del'>-void XFlatNode::generateXML(XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const QString &amp;/*tagName*/, VCXProject &amp;tool, const QString &amp;filter) {</div><div class='del'>-    if (children.size()) {</div><div class='del'>-        ChildrenMapFlat::ConstIterator it = children.constBegin();</div><div class='del'>-        ChildrenMapFlat::ConstIterator end = children.constEnd();</div><div class='del'>-        xml &lt;&lt; tag(_ItemGroup);</div><div class='del'>-        xmlFilter &lt;&lt; tag(_ItemGroup);</div><div class='del'>-        for (; it != end; ++it) {</div><div class='del'>-            tool.outputFileConfigs(xml, xmlFilter, (*it), filter);</div><div class='del'>-        }</div><div class='del'>-        xml &lt;&lt; closetag();</div><div class='del'>-        xmlFilter &lt;&lt; closetag();</div><div class='del'>-    }</div><div class='add'>+    root-&gt;generateXML(xml, xmlFilter, "", project, filtername); // output root tree</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-// VCXProject --------------------------------------------------------</div><div class='ctx'> // Output all configurations (by filtername) for a file (by info)</div><div class='del'>-// A filters config output is in VCXFilter.outputFileConfig()</div><div class='del'>-void VCXProject::outputFileConfigs(XmlOutput &amp;xml,</div><div class='del'>-                                  XmlOutput &amp;xmlFilter,</div><div class='del'>-                                  const VCXFilterFile &amp;info,</div><div class='del'>-                                  const QString &amp;filtername)</div><div class='add'>+// A filters config output is in VCFilter.outputFileConfig()</div><div class='add'>+void VCXProjectWriter::outputFileConfigs(VCProject &amp;project, XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const VCFilterFile &amp;info, const QString &amp;filtername)</div><div class='ctx'> {</div><div class='ctx'>     // We need to check if the file has any custom build step.</div><div class='ctx'>     // If there is one then it has to be included with "CustomBuild Include"</div><div class='ctx'>     bool fileAdded = false;</div><div class='ctx'> </div><div class='del'>-    for (int i = 0; i &lt; SingleProjects.count(); ++i) {</div><div class='del'>-        VCXFilter filter;</div><div class='del'>-        if (filtername == "Root Files") {</div><div class='del'>-            filter = SingleProjects.at(i).RootFiles;</div><div class='del'>-        } else if (filtername == "Source Files") {</div><div class='del'>-            filter = SingleProjects.at(i).SourceFiles;</div><div class='del'>-        } else if (filtername == "Header Files") {</div><div class='del'>-            filter = SingleProjects.at(i).HeaderFiles;</div><div class='del'>-        } else if (filtername == "Generated Files") {</div><div class='del'>-            filter = SingleProjects.at(i).GeneratedFiles;</div><div class='del'>-        } else if (filtername == "LexYacc Files") {</div><div class='del'>-            filter = SingleProjects.at(i).LexYaccFiles;</div><div class='del'>-        } else if (filtername == "Translation Files") {</div><div class='del'>-            filter = SingleProjects.at(i).TranslationFiles;</div><div class='del'>-        } else if (filtername == "Form Files") {</div><div class='del'>-            filter = SingleProjects.at(i).FormFiles;</div><div class='del'>-        } else if (filtername == "Resource Files") {</div><div class='del'>-            filter = SingleProjects.at(i).ResourceFiles;</div><div class='add'>+    for (int i = 0; i &lt; project.SingleProjects.count(); ++i) {</div><div class='add'>+        VCFilter filter;</div><div class='add'>+        const VCProjectSingleConfig &amp;singleCfg = project.SingleProjects.at(i);</div><div class='add'>+        if (filtername.startsWith("Root Files")) {</div><div class='add'>+            filter = singleCfg.RootFiles;</div><div class='add'>+        } else if (filtername.startsWith("Source Files")) {</div><div class='add'>+            filter = singleCfg.SourceFiles;</div><div class='add'>+        } else if (filtername.startsWith("Header Files")) {</div><div class='add'>+            filter = singleCfg.HeaderFiles;</div><div class='add'>+        } else if (filtername.startsWith("Generated Files")) {</div><div class='add'>+            filter = singleCfg.GeneratedFiles;</div><div class='add'>+        } else if (filtername.startsWith("LexYacc Files")) {</div><div class='add'>+            filter = singleCfg.LexYaccFiles;</div><div class='add'>+        } else if (filtername.startsWith("Translation Files")) {</div><div class='add'>+            filter = singleCfg.TranslationFiles;</div><div class='add'>+        } else if (filtername.startsWith("Form Files")) {</div><div class='add'>+            filter = singleCfg.FormFiles;</div><div class='add'>+        } else if (filtername.startsWith("Resource Files")) {</div><div class='add'>+            filter = singleCfg.ResourceFiles;</div><div class='ctx'>         } else {</div><div class='ctx'>             // ExtraCompilers</div><div class='del'>-            filter = SingleProjects[i].filterForExtraCompiler(filtername);</div><div class='add'>+            filter = project.SingleProjects[i].filterForExtraCompiler(filtername);</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         if (filter.Config) // only if the filter is not empty</div><div class='del'>-            if (filter.outputFileConfig(xml, xmlFilter, info.file, filtername, fileAdded)) // only add it once.</div><div class='add'>+            if (outputFileConfig(filter, xml, xmlFilter, info.file, filtername, fileAdded)) // only add it once.</div><div class='ctx'>                 fileAdded = true;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if ( !fileAdded )</div><div class='ctx'>     {</div><div class='del'>-        if (filtername == "Source Files") {</div><div class='add'>+        if (filtername.startsWith("Source Files")) {</div><div class='ctx'> </div><div class='ctx'>             xmlFilter &lt;&lt; tag("ClCompile")</div><div class='ctx'>                       &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(info.file))</div><div class='hunk'>@@ -3019,7 +1707,7 @@ void VCXProject::outputFileConfigs(XmlOutput &amp;xml,</div><div class='ctx'>             xml &lt;&lt; tag("ClCompile")</div><div class='ctx'>                 &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(info.file));</div><div class='ctx'> </div><div class='del'>-        } else if(filtername == "Header Files") {</div><div class='add'>+        } else if(filtername.startsWith("Header Files")) {</div><div class='ctx'> </div><div class='ctx'>             xmlFilter &lt;&lt; tag("ClInclude")</div><div class='ctx'>                 &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(info.file))</div><div class='hunk'>@@ -3027,7 +1715,7 @@ void VCXProject::outputFileConfigs(XmlOutput &amp;xml,</div><div class='ctx'> </div><div class='ctx'>             xml &lt;&lt; tag("ClInclude")</div><div class='ctx'>                 &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(info.file));</div><div class='del'>-        } else if(filtername == "Generated Files" || filtername == "Form Files") {</div><div class='add'>+        } else if(filtername.startsWith("Generated Files") || filtername.startsWith("Form Files")) {</div><div class='ctx'> </div><div class='ctx'>             if (info.file.endsWith(".h")) {</div><div class='ctx'> </div><div class='hunk'>@@ -3063,7 +1751,7 @@ void VCXProject::outputFileConfigs(XmlOutput &amp;xml,</div><div class='ctx'>                     &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(info.file));</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='del'>-        } else if(filtername == "Root Files") {</div><div class='add'>+        } else if(filtername.startsWith("Root Files")) {</div><div class='ctx'> </div><div class='ctx'>             if (info.file.endsWith(".rc")) {</div><div class='ctx'> </div><div class='hunk'>@@ -3088,296 +1776,165 @@ void VCXProject::outputFileConfigs(XmlOutput &amp;xml,</div><div class='ctx'>     xmlFilter &lt;&lt; closetag();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// outputs a given filter for all existing configurations of a project</div><div class='del'>-void VCXProject::outputFilter(XmlOutput &amp;xml,</div><div class='del'>-                              XmlOutput &amp;xmlFilter,</div><div class='del'>-                              const QString &amp;filtername)</div><div class='add'>+bool VCXProjectWriter::outputFileConfig(VCFilter &amp;filter, XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const QString &amp;filename, const QString &amp;filtername, bool fileAllreadyAdded)</div><div class='ctx'> {</div><div class='del'>-    XNode *root;</div><div class='del'>-    if (SingleProjects.at(0).flat_files)</div><div class='del'>-        root = new XFlatNode;</div><div class='del'>-    else</div><div class='del'>-        root = new XTreeNode;</div><div class='del'>-</div><div class='del'>-    QString name, extfilter;</div><div class='del'>-    triState parse;</div><div class='add'>+    bool fileAdded = false;</div><div class='ctx'> </div><div class='del'>-    for (int i = 0; i &lt; SingleProjects.count(); ++i) {</div><div class='del'>-        VCXFilter filter;</div><div class='del'>-        if (filtername == "Root Files") {</div><div class='del'>-            filter = SingleProjects.at(i).RootFiles;</div><div class='del'>-        } else if (filtername == "Source Files") {</div><div class='del'>-            filter = SingleProjects.at(i).SourceFiles;</div><div class='del'>-        } else if (filtername == "Header Files") {</div><div class='del'>-            filter = SingleProjects.at(i).HeaderFiles;</div><div class='del'>-        } else if (filtername == "Generated Files") {</div><div class='del'>-            filter = SingleProjects.at(i).GeneratedFiles;</div><div class='del'>-        } else if (filtername == "LexYacc Files") {</div><div class='del'>-            filter = SingleProjects.at(i).LexYaccFiles;</div><div class='del'>-        } else if (filtername == "Translation Files") {</div><div class='del'>-            filter = SingleProjects.at(i).TranslationFiles;</div><div class='del'>-        } else if (filtername == "Form Files") {</div><div class='del'>-            filter = SingleProjects.at(i).FormFiles;</div><div class='del'>-        } else if (filtername == "Resource Files") {</div><div class='del'>-            filter = SingleProjects.at(i).ResourceFiles;</div><div class='del'>-        } else {</div><div class='del'>-            // ExtraCompilers</div><div class='del'>-            filter = SingleProjects[i].filterForExtraCompiler(filtername);</div><div class='del'>-        }</div><div class='add'>+    // Clearing each filter tool</div><div class='add'>+    filter.useCustomBuildTool = false;</div><div class='add'>+    filter.useCompilerTool = false;</div><div class='add'>+    filter.CustomBuildTool = VCCustomBuildTool();</div><div class='add'>+    filter.CompilerTool = VCCLCompilerTool();</div><div class='ctx'> </div><div class='del'>-        // Merge all files in this filter to root tree</div><div class='del'>-        for (int x = 0; x &lt; filter.Files.count(); ++x)</div><div class='del'>-            root-&gt;addElement(filter.Files.at(x));</div><div class='add'>+    // Unset some default options</div><div class='add'>+    filter.CustomBuildTool.config = filter.Config;</div><div class='add'>+    filter.CompilerTool.BufferSecurityCheck = unset;</div><div class='add'>+    filter.CompilerTool.DebugInformationFormat = debugUnknown;</div><div class='add'>+    filter.CompilerTool.ExceptionHandling = ehDefault;</div><div class='add'>+    filter.CompilerTool.ProgramDataBaseFileName.clear();</div><div class='add'>+    filter.CompilerTool.RuntimeLibrary = rtUnknown;</div><div class='add'>+    filter.CompilerTool.config = filter.Config;</div><div class='ctx'> </div><div class='del'>-        // Save filter setting from first filter. Next filters</div><div class='del'>-        // may differ but we cannot handle that. (ex. extfilter)</div><div class='del'>-        if (name.isEmpty()) {</div><div class='del'>-            name = filter.Name;</div><div class='del'>-            extfilter = filter.Filter;</div><div class='del'>-            parse = filter.ParseFiles;</div><div class='add'>+    bool inBuild = false;</div><div class='add'>+    VCFilterFile info;</div><div class='add'>+    for (int i = 0; i &lt; filter.Files.count(); ++i) {</div><div class='add'>+        if (filter.Files.at(i).file == filename) {</div><div class='add'>+            info = filter.Files.at(i);</div><div class='add'>+            inBuild = true;</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='add'>+    inBuild &amp;= !info.excludeFromBuild;</div><div class='ctx'> </div><div class='del'>-    if (!root-&gt;hasElements())</div><div class='del'>-        return;</div><div class='del'>-</div><div class='del'>-    root-&gt;generateXML(xml, xmlFilter, "", *this, filtername); // output root tree</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void VCXProject::addFilters(XmlOutput &amp;xmlFilter,</div><div class='del'>-                            const QString &amp;filtername)</div><div class='del'>-{</div><div class='del'>-    bool added = false;</div><div class='del'>-</div><div class='del'>-    for (int i = 0; i &lt; SingleProjects.count(); ++i) {</div><div class='del'>-        VCXFilter filter;</div><div class='del'>-        if (filtername == "Root Files") {</div><div class='del'>-            filter = SingleProjects.at(i).RootFiles;</div><div class='del'>-        } else if (filtername == "Source Files") {</div><div class='del'>-            filter = SingleProjects.at(i).SourceFiles;</div><div class='del'>-        } else if (filtername == "Header Files") {</div><div class='del'>-            filter = SingleProjects.at(i).HeaderFiles;</div><div class='del'>-        } else if (filtername == "Generated Files") {</div><div class='del'>-            filter = SingleProjects.at(i).GeneratedFiles;</div><div class='del'>-        } else if (filtername == "LexYacc Files") {</div><div class='del'>-            filter = SingleProjects.at(i).LexYaccFiles;</div><div class='del'>-        } else if (filtername == "Translation Files") {</div><div class='del'>-            filter = SingleProjects.at(i).TranslationFiles;</div><div class='del'>-        } else if (filtername == "Form Files") {</div><div class='del'>-            filter = SingleProjects.at(i).FormFiles;</div><div class='del'>-        } else if (filtername == "Resource Files") {</div><div class='del'>-            filter = SingleProjects.at(i).ResourceFiles;</div><div class='del'>-        } else {</div><div class='del'>-            // ExtraCompilers</div><div class='del'>-            filter = SingleProjects[i].filterForExtraCompiler(filtername);</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if(!filter.Files.isEmpty() &amp;&amp; !added) {</div><div class='del'>-            added = true;</div><div class='del'>-            xmlFilter &lt;&lt; tag("Filter")</div><div class='del'>-                      &lt;&lt; attrTag("Include", filtername)</div><div class='del'>-                      &lt;&lt; attrTagS("UniqueIdentifier", filter.Guid)</div><div class='del'>-                      &lt;&lt; attrTagS("Extensions", filter.Filter)</div><div class='del'>-                      &lt;&lt; attrTagT("ParseFiles", filter.ParseFiles)</div><div class='del'>-                      &lt;&lt; closetag();</div><div class='del'>-        }</div><div class='add'>+    if (inBuild) {</div><div class='add'>+        filter.addExtraCompiler(info);</div><div class='add'>+        if (filter.Project-&gt;usePCH)</div><div class='add'>+            filter.modifyPCHstage(info.file);</div><div class='add'>+    } else {</div><div class='add'>+        // Excluded files uses an empty compiler stage</div><div class='add'>+        if(info.excludeFromBuild)</div><div class='add'>+            filter.useCompilerTool = true;</div><div class='ctx'>     }</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> </div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, VCXProject &amp;tool)</div><div class='del'>-{</div><div class='add'>+    // Actual XML output ----------------------------------</div><div class='add'>+    if (filter.useCustomBuildTool || filter.useCompilerTool || !inBuild) {</div><div class='ctx'> </div><div class='del'>-    if (tool.SingleProjects.count() == 0) {</div><div class='del'>-        warn_msg(WarnLogic, "Generator: .NET: no single project in merge project, no output");</div><div class='del'>-        return xml;</div><div class='del'>-    }</div><div class='add'>+        if (filter.useCustomBuildTool)</div><div class='add'>+        {</div><div class='add'>+            if ( !fileAllreadyAdded ) {</div><div class='ctx'> </div><div class='del'>-    xml.setIndentString("  ");</div><div class='add'>+                fileAdded = true;</div><div class='ctx'> </div><div class='del'>-    xml &lt;&lt; decl("1.0", "utf-8")</div><div class='del'>-        &lt;&lt; tag("Project")</div><div class='del'>-        &lt;&lt; attrTag("DefaultTargets","Build")</div><div class='del'>-        &lt;&lt; attrTag("ToolsVersion", "4.0")</div><div class='del'>-        &lt;&lt; attrTag("xmlns", "http://schemas.microsoft.com/developer/msbuild/2003")</div><div class='del'>-        &lt;&lt; tag("ItemGroup")</div><div class='del'>-        &lt;&lt; attrTag("Label", "ProjectConfigurations");</div><div class='add'>+                xmlFilter &lt;&lt; tag("CustomBuild")</div><div class='add'>+                    &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename))</div><div class='add'>+                    &lt;&lt; attrTagS("Filter", filtername);</div><div class='ctx'> </div><div class='del'>-    for (int i = 0; i &lt; tool.SingleProjects.count(); ++i) {</div><div class='del'>-        xml &lt;&lt; tag("ProjectConfiguration")</div><div class='del'>-            &lt;&lt; attrTag("Include" , tool.SingleProjects.at(i).Configuration.Name)</div><div class='del'>-            &lt;&lt; tagValue("Configuration", tool.SingleProjects.at(i).Configuration.ConfigurationName)</div><div class='del'>-            &lt;&lt; tagValue("Platform", tool.SingleProjects.at(i).PlatformName)</div><div class='del'>-            &lt;&lt; closetag();</div><div class='del'>-    }</div><div class='add'>+                xml &lt;&lt; tag("CustomBuild")</div><div class='add'>+                    &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='ctx'> </div><div class='del'>-    xml &lt;&lt; closetag()</div><div class='del'>-        &lt;&lt; tag("PropertyGroup")</div><div class='del'>-        &lt;&lt; attrTag("Label", "Globals")</div><div class='del'>-        &lt;&lt; tagValue("ProjectGuid", tool.ProjectGUID)</div><div class='del'>-        &lt;&lt; tagValue("RootNamespace", tool.Name)</div><div class='del'>-        &lt;&lt; tagValue("Keyword", tool.Keyword)</div><div class='del'>-        &lt;&lt; closetag();</div><div class='add'>+                if ( filtername.startsWith("Form Files") || filtername.startsWith("Generated Files") || filtername.startsWith("Resource Files") )</div><div class='add'>+                    xml &lt;&lt; attrTagS("FileType", "Document");</div><div class='add'>+            }</div><div class='ctx'> </div><div class='del'>-    // config part.</div><div class='del'>-    xml &lt;&lt; import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.Default.props");</div><div class='del'>-    for (int i = 0; i &lt; tool.SingleProjects.count(); ++i)</div><div class='del'>-        xml &lt;&lt; tool.SingleProjects.at(i).Configuration;</div><div class='del'>-    xml &lt;&lt; import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.props");</div><div class='add'>+            filter.Project-&gt;projectWriter-&gt;write(xml, filter.CustomBuildTool);</div><div class='add'>+        }</div><div class='ctx'> </div><div class='del'>-    // Extension settings</div><div class='del'>-    xml &lt;&lt; tag("ImportGroup")</div><div class='del'>-        &lt;&lt; attrTag("Label", "ExtensionSettings")</div><div class='del'>-        &lt;&lt; closetag();</div><div class='add'>+        if ( !fileAdded &amp;&amp; !fileAllreadyAdded )</div><div class='add'>+        {</div><div class='add'>+            fileAdded = true;</div><div class='ctx'> </div><div class='del'>-    // PropertySheets</div><div class='del'>-    for (int i = 0; i &lt; tool.SingleProjects.count(); ++i) {</div><div class='del'>-        xml &lt;&lt; tag("ImportGroup")</div><div class='del'>-            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='del'>-            &lt;&lt; attrTag("Label", "PropertySheets");</div><div class='add'>+            if (filtername.startsWith("Source Files")) {</div><div class='ctx'> </div><div class='del'>-        xml &lt;&lt; tag("Import")</div><div class='del'>-            &lt;&lt; attrTag("Project", "$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props")</div><div class='del'>-            &lt;&lt; attrTag("Condition", "exists('$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props')")</div><div class='del'>-            &lt;&lt; closetag()</div><div class='del'>-            &lt;&lt; closetag();</div><div class='del'>-    }</div><div class='add'>+                xmlFilter &lt;&lt; tag("ClCompile")</div><div class='add'>+                          &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename))</div><div class='add'>+                          &lt;&lt; attrTagS("Filter", filtername);</div><div class='ctx'> </div><div class='del'>-    // UserMacros</div><div class='del'>-    xml &lt;&lt; tag("PropertyGroup")</div><div class='del'>-        &lt;&lt; attrTag("Label", "UserMacros")</div><div class='del'>-        &lt;&lt; closetag();</div><div class='add'>+                xml &lt;&lt; tag("ClCompile")</div><div class='add'>+                    &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='ctx'> </div><div class='del'>-    xml &lt;&lt; tag("PropertyGroup");</div><div class='del'>-    for (int i = 0; i &lt; tool.SingleProjects.count(); ++i) {</div><div class='add'>+            } else if(filtername.startsWith("Header Files")) {</div><div class='ctx'> </div><div class='del'>-        if ( !tool.SingleProjects.at(i).Configuration.OutputDirectory.isEmpty() ) {</div><div class='del'>-            xml &lt;&lt; tag("OutDir")</div><div class='del'>-                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='del'>-                &lt;&lt; valueTag(tool.SingleProjects.at(i).Configuration.OutputDirectory);</div><div class='del'>-        }</div><div class='del'>-        if ( !tool.SingleProjects.at(i).Configuration.IntermediateDirectory.isEmpty() ) {</div><div class='del'>-            xml &lt;&lt; tag("IntDir")</div><div class='del'>-                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='del'>-                &lt;&lt; valueTag(tool.SingleProjects.at(i).Configuration.IntermediateDirectory);</div><div class='del'>-        }</div><div class='del'>-        if ( !tool.SingleProjects.at(i).Configuration.TargetName.isEmpty() ) {</div><div class='del'>-            xml &lt;&lt; tag("TargetName")</div><div class='del'>-                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='del'>-                &lt;&lt; valueTag(tool.SingleProjects.at(i).Configuration.TargetName);</div><div class='del'>-        }</div><div class='add'>+                xmlFilter &lt;&lt; tag("ClInclude")</div><div class='add'>+                    &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename))</div><div class='add'>+                    &lt;&lt; attrTagS("Filter", filtername);</div><div class='ctx'> </div><div class='del'>-        if ( tool.SingleProjects.at(i).Configuration.linker.IgnoreImportLibrary != unset) {</div><div class='del'>-            xml &lt;&lt; tag("IgnoreImportLibrary")</div><div class='del'>-                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='del'>-                &lt;&lt; valueTagT(tool.SingleProjects.at(i).Configuration.linker.IgnoreImportLibrary);</div><div class='del'>-        }</div><div class='add'>+                xml &lt;&lt; tag("ClInclude")</div><div class='add'>+                    &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='add'>+            } else if(filtername.startsWith("Generated Files") || filtername.startsWith("Form Files")) {</div><div class='ctx'> </div><div class='del'>-        if ( tool.SingleProjects.at(i).Configuration.linker.LinkIncremental != unset) {</div><div class='del'>-            xml &lt;&lt; tag("LinkIncremental")</div><div class='del'>-                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='del'>-                &lt;&lt; valueTagT(tool.SingleProjects.at(i).Configuration.linker.LinkIncremental);</div><div class='del'>-        }</div><div class='add'>+                if (filename.endsWith(".h")) {</div><div class='ctx'> </div><div class='del'>-        if ( tool.SingleProjects.at(i).Configuration.preBuild.UseInBuild != unset )</div><div class='del'>-        {</div><div class='del'>-            xml &lt;&lt; tag("PreBuildEventUseInBuild")</div><div class='del'>-                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='del'>-                &lt;&lt; valueTagT(tool.SingleProjects.at(i).Configuration.preBuild.UseInBuild);</div><div class='del'>-        }</div><div class='add'>+                    xmlFilter &lt;&lt; tag("ClInclude")</div><div class='add'>+                              &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename))</div><div class='add'>+                              &lt;&lt; attrTagS("Filter", filtername);</div><div class='ctx'> </div><div class='del'>-        if ( tool.SingleProjects.at(i).Configuration.preLink.UseInBuild != unset )</div><div class='del'>-        {</div><div class='del'>-            xml &lt;&lt; tag("PreLinkEventUseInBuild")</div><div class='del'>-                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='del'>-                &lt;&lt; valueTagT(tool.SingleProjects.at(i).Configuration.preLink.UseInBuild);</div><div class='del'>-        }</div><div class='add'>+                    xml &lt;&lt; tag("ClInclude")</div><div class='add'>+                        &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='add'>+                } else if(filename.endsWith(".cpp")) {</div><div class='ctx'> </div><div class='del'>-        if ( tool.SingleProjects.at(i).Configuration.postBuild.UseInBuild != unset )</div><div class='del'>-        {</div><div class='del'>-            xml &lt;&lt; tag("PostBuildEventUseInBuild")</div><div class='del'>-                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name))</div><div class='del'>-                &lt;&lt; valueTagT(tool.SingleProjects.at(i).Configuration.postBuild.UseInBuild);</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    xml &lt;&lt; closetag();</div><div class='add'>+                    xmlFilter &lt;&lt; tag("ClCompile")</div><div class='add'>+                              &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename))</div><div class='add'>+                              &lt;&lt; attrTagS("Filter", filtername);</div><div class='ctx'> </div><div class='del'>-    for (int i = 0; i &lt; tool.SingleProjects.count(); ++i) {</div><div class='del'>-        xml &lt;&lt; tag("ItemDefinitionGroup")</div><div class='del'>-            &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(tool.SingleProjects.at(i).Configuration.Name));</div><div class='add'>+                    xml &lt;&lt; tag("ClCompile")</div><div class='add'>+                        &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='add'>+                } else if(filename.endsWith(".res")) {</div><div class='ctx'> </div><div class='del'>-        // ClCompile</div><div class='del'>-        xml &lt;&lt; tool.SingleProjects.at(i).Configuration.compiler;</div><div class='add'>+                    xmlFilter &lt;&lt; tag("CustomBuild")</div><div class='add'>+                              &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename))</div><div class='add'>+                              &lt;&lt; attrTagS("Filter", filtername);</div><div class='ctx'> </div><div class='del'>-        // Link</div><div class='del'>-        xml &lt;&lt; tool.SingleProjects.at(i).Configuration.linker;</div><div class='add'>+                    xml &lt;&lt; tag("CustomBuild")</div><div class='add'>+                        &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='add'>+                } else {</div><div class='ctx'> </div><div class='del'>-        // Midl</div><div class='del'>-        xml &lt;&lt; tool.SingleProjects.at(i).Configuration.idl;</div><div class='add'>+                    xmlFilter &lt;&lt; tag("CustomBuild")</div><div class='add'>+                              &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename))</div><div class='add'>+                              &lt;&lt; attrTagS("Filter", filtername);</div><div class='ctx'> </div><div class='del'>-        // ResourceCompiler</div><div class='del'>-        xml &lt;&lt; tool.SingleProjects.at(i).Configuration.resource;</div><div class='add'>+                    xml &lt;&lt; tag("CustomBuild")</div><div class='add'>+                        &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='add'>+                }</div><div class='add'>+            } else if(filtername.startsWith("Root Files")) {</div><div class='ctx'> </div><div class='del'>-        // Post build event</div><div class='del'>-        if ( tool.SingleProjects.at(i).Configuration.postBuild.UseInBuild != unset )</div><div class='del'>-            xml &lt;&lt; tool.SingleProjects.at(i).Configuration.postBuild;</div><div class='del'>-        </div><div class='del'>-        // Pre build event</div><div class='del'>-        if ( tool.SingleProjects.at(i).Configuration.preBuild.UseInBuild != unset )</div><div class='del'>-            xml &lt;&lt; tool.SingleProjects.at(i).Configuration.preBuild;</div><div class='add'>+                if (filename.endsWith(".rc")) {</div><div class='ctx'> </div><div class='del'>-        // Pre link event</div><div class='del'>-        if ( tool.SingleProjects.at(i).Configuration.preLink.UseInBuild != unset )</div><div class='del'>-            xml &lt;&lt; tool.SingleProjects.at(i).Configuration.preLink;</div><div class='add'>+                    xmlFilter &lt;&lt; tag("ResourceCompile")</div><div class='add'>+                              &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='ctx'> </div><div class='del'>-        xml &lt;&lt; closetag();</div><div class='del'>-    }</div><div class='add'>+                    xml &lt;&lt; tag("ResourceCompile")</div><div class='add'>+                        &lt;&lt; attrTag("Include",Option::fixPathToLocalOS(filename));</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='ctx'> </div><div class='del'>-    // The file filters are added in a separate file for MSBUILD.</div><div class='del'>-    QFile filterFile;</div><div class='del'>-    filterFile.setFileName(Option::output.fileName().append(".filters"));</div><div class='del'>-    filterFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);</div><div class='del'>-    QTextStream ts(&amp;filterFile);</div><div class='del'>-    XmlOutput xmlFilter(ts, XmlOutput::NoConversion);</div><div class='add'>+        if(!inBuild) {</div><div class='ctx'> </div><div class='del'>-    xmlFilter.setIndentString("  ");</div><div class='add'>+            xml &lt;&lt; tag("ExcludedFromBuild")</div><div class='add'>+                &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(filter.Config-&gt;Name))</div><div class='add'>+                &lt;&lt; valueTag("true");</div><div class='add'>+        }</div><div class='ctx'> </div><div class='del'>-    xmlFilter &lt;&lt; decl("1.0", "utf-8")</div><div class='del'>-              &lt;&lt; tag("Project")</div><div class='del'>-              &lt;&lt; attrTag("ToolsVersion", "4.0")</div><div class='del'>-              &lt;&lt; attrTag("xmlns", "http://schemas.microsoft.com/developer/msbuild/2003");</div><div class='add'>+        if (filter.useCompilerTool) {</div><div class='ctx'> </div><div class='del'>-    xmlFilter &lt;&lt; tag("ItemGroup");</div><div class='add'>+            if ( !filter.CompilerTool.ForcedIncludeFiles.isEmpty() ) {</div><div class='add'>+                xml &lt;&lt; tag("ForcedIncludeFiles")</div><div class='add'>+                    &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(filter.Config-&gt;Name))</div><div class='add'>+                    &lt;&lt; valueTagX(filter.CompilerTool.ForcedIncludeFiles);</div><div class='add'>+            }</div><div class='ctx'> </div><div class='del'>-    tool.addFilters(xmlFilter, "Form Files");</div><div class='del'>-    tool.addFilters(xmlFilter, "Generated Files");</div><div class='del'>-    tool.addFilters(xmlFilter, "Header Files");</div><div class='del'>-    tool.addFilters(xmlFilter, "LexYacc Files");</div><div class='del'>-    tool.addFilters(xmlFilter, "Resource Files");</div><div class='del'>-    tool.addFilters(xmlFilter, "Source Files");</div><div class='del'>-    tool.addFilters(xmlFilter, "Translation Files");</div><div class='del'>-    xmlFilter &lt;&lt; closetag();</div><div class='add'>+            if ( !filter.CompilerTool.PrecompiledHeaderThrough.isEmpty() ) {</div><div class='ctx'> </div><div class='del'>-    tool.outputFilter(xml, xmlFilter, "Source Files");</div><div class='del'>-    tool.outputFilter(xml, xmlFilter, "Header Files");</div><div class='del'>-    tool.outputFilter(xml, xmlFilter, "Generated Files");</div><div class='del'>-    tool.outputFilter(xml, xmlFilter, "LexYacc Files");</div><div class='del'>-    tool.outputFilter(xml, xmlFilter, "Translation Files");</div><div class='del'>-    tool.outputFilter(xml, xmlFilter, "Form Files");</div><div class='del'>-    tool.outputFilter(xml, xmlFilter, "Resource Files");</div><div class='del'>-    for (int x = 0; x &lt; tool.ExtraCompilers.count(); ++x) {</div><div class='del'>-        tool.outputFilter(xml, xmlFilter, tool.ExtraCompilers.at(x));</div><div class='add'>+                xml &lt;&lt; tag("PrecompiledHeaderFile")</div><div class='add'>+                    &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(filter.Config-&gt;Name))</div><div class='add'>+                    &lt;&lt; valueTag(filter.CompilerTool.PrecompiledHeaderThrough)</div><div class='add'>+                    &lt;&lt; tag("PrecompiledHeader")</div><div class='add'>+                    &lt;&lt; attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg(filter.Config-&gt;Name))</div><div class='add'>+                    &lt;&lt; valueTag(toString(filter.CompilerTool.UsePrecompiledHeader));</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='del'>-    tool.outputFilter(xml, xmlFilter, "Root Files");</div><div class='del'>-</div><div class='del'>-    xml &lt;&lt; import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.targets");</div><div class='ctx'> </div><div class='del'>-    xml &lt;&lt; tag("ImportGroup")</div><div class='del'>-        &lt;&lt; attrTag("Label", "ExtensionTargets")</div><div class='del'>-        &lt;&lt; closetag();</div><div class='del'>-</div><div class='del'>-    return xml;</div><div class='add'>+    return fileAdded;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/qmake/generators/win32/msbuild_objectmodel.h b/qmake/generators/win32/msbuild_objectmodel.h<br/>index a884ad4..bd5e5d1 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msbuild_objectmodel.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msbuild_objectmodel.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msbuild_objectmodel.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/win32/msbuild_objectmodel.h</a></div><div class='hunk'>@@ -54,519 +54,24 @@</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-class VCXConfiguration;</div><div class='del'>-class VCXProject;</div><div class='del'>-</div><div class='del'>-class VCXCLCompilerTool : public VCToolBase</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    // Functions</div><div class='del'>-    VCXCLCompilerTool();</div><div class='del'>-    virtual ~VCXCLCompilerTool(){}</div><div class='del'>-    bool parseOption(const char* option);</div><div class='del'>-</div><div class='del'>-    // Variables</div><div class='del'>-    QStringList             AdditionalIncludeDirectories;</div><div class='del'>-    QStringList             AdditionalOptions;</div><div class='del'>-    QStringList             AdditionalUsingDirectories;</div><div class='del'>-    QString                 AlwaysAppend;</div><div class='del'>-    QString                 AssemblerListingLocation;</div><div class='del'>-    QString                 AssemblerOutput;</div><div class='del'>-    QString                 BasicRuntimeChecks;</div><div class='del'>-    triState                BrowseInformation;</div><div class='del'>-    QString                 BrowseInformationFile;</div><div class='del'>-    triState                BufferSecurityCheck;</div><div class='del'>-    QString                 CallingConvention;</div><div class='del'>-    QString                 CompileAs;</div><div class='del'>-    QString                 CompileAsManaged;</div><div class='del'>-    triState                CreateHotpatchableImage;</div><div class='del'>-    QString                 DebugInformationFormat;</div><div class='del'>-    triState                DisableLanguageExtensions;</div><div class='del'>-    QStringList             DisableSpecificWarnings;</div><div class='del'>-    QString                 EnableEnhancedInstructionSet;</div><div class='del'>-    triState                EnableFiberSafeOptimizations;</div><div class='del'>-    triState                EnablePREfast;</div><div class='del'>-    QString                 ErrorReporting;</div><div class='del'>-    QString                 ExceptionHandling;</div><div class='del'>-    triState                ExpandAttributedSource;</div><div class='del'>-    QString                 FavorSizeOrSpeed;</div><div class='del'>-    triState                FloatingPointExceptions;</div><div class='del'>-    QString                 FloatingPointModel;</div><div class='del'>-    triState                ForceConformanceInForLoopScope;</div><div class='del'>-    QStringList             ForcedIncludeFiles;</div><div class='del'>-    QStringList             ForcedUsingFiles;</div><div class='del'>-    triState                FunctionLevelLinking;</div><div class='del'>-    triState                GenerateXMLDocumentationFiles;</div><div class='del'>-    triState                IgnoreStandardIncludePath;</div><div class='del'>-    QString                 InlineFunctionExpansion;</div><div class='del'>-    triState                IntrinsicFunctions;</div><div class='del'>-    triState                MinimalRebuild;</div><div class='del'>-    triState                MultiProcessorCompilation;</div><div class='del'>-    QString                 ObjectFileName;</div><div class='del'>-    QStringList             ObjectFiles;</div><div class='del'>-    triState                OmitDefaultLibName;</div><div class='del'>-    triState                OmitFramePointers;</div><div class='del'>-    triState                OpenMPSupport;</div><div class='del'>-    QString                 Optimization;</div><div class='del'>-    QString                 PrecompiledHeader;</div><div class='del'>-    QString                 PrecompiledHeaderFile;</div><div class='del'>-    QString                 PrecompiledHeaderOutputFile;</div><div class='del'>-    triState                PreprocessKeepComments;</div><div class='del'>-    QStringList             PreprocessorDefinitions;</div><div class='del'>-    QString                 PreprocessOutputPath;</div><div class='del'>-    triState                PreprocessSuppressLineNumbers;</div><div class='del'>-    triState                PreprocessToFile;</div><div class='del'>-    QString                 ProgramDataBaseFileName;</div><div class='del'>-    QString                 ProcessorNumber;</div><div class='del'>-    QString                 RuntimeLibrary;</div><div class='del'>-    triState                RuntimeTypeInfo;</div><div class='del'>-    triState                ShowIncludes;</div><div class='del'>-    triState                SmallerTypeCheck;</div><div class='del'>-    triState                StringPooling;</div><div class='del'>-    QString                 StructMemberAlignment;</div><div class='del'>-    triState                SuppressStartupBanner;</div><div class='del'>-    QString                 TreatSpecificWarningsAsErrors;</div><div class='del'>-    triState                TreatWarningAsError;</div><div class='del'>-    triState                TreatWChar_tAsBuiltInType;</div><div class='del'>-    triState                UndefineAllPreprocessorDefinitions;</div><div class='del'>-    QStringList             UndefinePreprocessorDefinitions;</div><div class='del'>-    triState                UseFullPaths;</div><div class='del'>-    triState                UseUnicodeForAssemblerListing;</div><div class='del'>-    QString                 WarningLevel;</div><div class='del'>-    triState                WholeProgramOptimization;</div><div class='del'>-    QString                 XMLDocumentationFileName;</div><div class='del'>-</div><div class='del'>-    VCXConfiguration*       config;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-class VCXLinkerTool : public VCToolBase</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    // Functions</div><div class='del'>-    VCXLinkerTool();</div><div class='del'>-    virtual ~VCXLinkerTool(){}</div><div class='del'>-    bool parseOption(const char* option);</div><div class='del'>-</div><div class='del'>-    // Variables</div><div class='del'>-    QStringList             AdditionalDependencies;</div><div class='del'>-    QStringList             AdditionalLibraryDirectories;</div><div class='del'>-    QStringList             AdditionalManifestDependencies;</div><div class='del'>-    QStringList             AdditionalOptions;</div><div class='del'>-    QStringList             AddModuleNamesToAssembly;</div><div class='del'>-    triState                AllowIsolation;</div><div class='del'>-    triState                AssemblyDebug;</div><div class='del'>-    QStringList             AssemblyLinkResource;</div><div class='del'>-    QString                 BaseAddress;</div><div class='del'>-    QString                 CLRImageType;</div><div class='del'>-    QString                 CLRSupportLastError;</div><div class='del'>-    QString                 CLRThreadAttribute;</div><div class='del'>-    QString                 CLRUnmanagedCodeCheck;</div><div class='del'>-    QString                 CreateHotPatchableImage;</div><div class='del'>-    triState                DataExecutionPrevention;</div><div class='del'>-    QStringList             DelayLoadDLLs;</div><div class='del'>-    triState                DelaySign;</div><div class='del'>-    QString                 Driver;</div><div class='del'>-    QStringList             EmbedManagedResourceFile;</div><div class='del'>-    triState                EnableCOMDATFolding;</div><div class='del'>-    triState                EnableUAC;</div><div class='del'>-    QString                 EntryPointSymbol;</div><div class='del'>-    triState                FixedBaseAddress;</div><div class='del'>-    QString                 ForceFileOutput;</div><div class='del'>-    QStringList             ForceSymbolReferences;</div><div class='del'>-    QString                 FunctionOrder;</div><div class='del'>-    triState                GenerateDebugInformation;</div><div class='del'>-    triState                GenerateManifest;</div><div class='del'>-    triState                GenerateMapFile;</div><div class='del'>-    qlonglong               HeapCommitSize;</div><div class='del'>-    qlonglong               HeapReserveSize;</div><div class='del'>-    triState                IgnoreAllDefaultLibraries;</div><div class='del'>-    triState                IgnoreEmbeddedIDL;</div><div class='del'>-    triState                IgnoreImportLibrary;</div><div class='del'>-    QStringList             IgnoreSpecificDefaultLibraries;</div><div class='del'>-    triState                ImageHasSafeExceptionHandlers;</div><div class='del'>-    QString                 ImportLibrary;</div><div class='del'>-    QString                 KeyContainer;</div><div class='del'>-    QString                 KeyFile;</div><div class='del'>-    triState                LargeAddressAware;</div><div class='del'>-    triState                LinkDLL;</div><div class='del'>-    QString                 LinkErrorReporting;</div><div class='del'>-    triState                LinkIncremental;</div><div class='del'>-    triState                LinkStatus;</div><div class='del'>-    QString                 LinkTimeCodeGeneration;</div><div class='del'>-    QString                 ManifestFile;</div><div class='del'>-    triState                MapExports;</div><div class='del'>-    QString                 MapFileName;</div><div class='del'>-    QString                 MergedIDLBaseFileName;</div><div class='del'>-    QString                 MergeSections;</div><div class='del'>-    QString                 MidlCommandFile;</div><div class='del'>-    QString                 ModuleDefinitionFile;</div><div class='del'>-    QString                 MSDOSStubFileName;</div><div class='del'>-    triState                NoEntryPoint;</div><div class='del'>-    triState                OptimizeReferences;</div><div class='del'>-    QString                 OutputFile;</div><div class='del'>-    triState                PreventDllBinding;</div><div class='del'>-    QString                 Profile;</div><div class='del'>-    QString                 ProfileGuidedDatabase;</div><div class='del'>-    QString                 ProgramDatabaseFile;</div><div class='del'>-    triState                RandomizedBaseAddress;</div><div class='del'>-    triState                RegisterOutput;</div><div class='del'>-    qlonglong               SectionAlignment;</div><div class='del'>-    triState                SetChecksum;</div><div class='del'>-    QString                 ShowProgress;</div><div class='del'>-    QString                 SpecifySectionAttributes;</div><div class='del'>-    QString                 StackCommitSize;</div><div class='del'>-    QString                 StackReserveSize;</div><div class='del'>-    QString                 StripPrivateSymbols;</div><div class='del'>-    QString                 SubSystem;</div><div class='del'>-    triState                SupportNobindOfDelayLoadedDLL;</div><div class='del'>-    triState                SupportUnloadOfDelayLoadedDLL;</div><div class='del'>-    triState                SuppressStartupBanner;</div><div class='del'>-    triState                SwapRunFromCD;</div><div class='del'>-    triState                SwapRunFromNet;</div><div class='del'>-    QString                 TargetMachine;</div><div class='del'>-    triState                TerminalServerAware;</div><div class='del'>-    triState                TreatLinkerWarningAsErrors;</div><div class='del'>-    triState                TurnOffAssemblyGeneration;</div><div class='del'>-    QString                 TypeLibraryFile;</div><div class='del'>-    qlonglong               TypeLibraryResourceID;</div><div class='del'>-    QString                 UACExecutionLevel;</div><div class='del'>-    triState                UACUIAccess;</div><div class='del'>-    QString                 Version;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    VCXConfiguration*       config;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-class VCXMIDLTool : public VCToolBase</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    // Functions</div><div class='del'>-    VCXMIDLTool();</div><div class='del'>-    virtual ~VCXMIDLTool(){}</div><div class='del'>-    bool parseOption(const char* option);</div><div class='del'>-</div><div class='del'>-    // Variables</div><div class='del'>-    QStringList             AdditionalIncludeDirectories;</div><div class='del'>-    QStringList             AdditionalOptions;</div><div class='del'>-    triState                ApplicationConfigurationMode;</div><div class='del'>-    QString                 ClientStubFile;</div><div class='del'>-    QString                 CPreprocessOptions;</div><div class='del'>-    QString                 DefaultCharType;</div><div class='del'>-    QString                 DLLDataFileName;</div><div class='del'>-    QString                 EnableErrorChecks;</div><div class='del'>-    triState                ErrorCheckAllocations;</div><div class='del'>-    triState                ErrorCheckBounds;</div><div class='del'>-    triState                ErrorCheckEnumRange;</div><div class='del'>-    triState                ErrorCheckRefPointers;</div><div class='del'>-    triState                ErrorCheckStubData;</div><div class='del'>-    QString                 GenerateClientFiles;</div><div class='del'>-    QString                 GenerateServerFiles;</div><div class='del'>-    triState                GenerateStublessProxies;</div><div class='del'>-    triState                GenerateTypeLibrary;</div><div class='del'>-    QString                 HeaderFileName;</div><div class='del'>-    triState                IgnoreStandardIncludePath;</div><div class='del'>-    QString                 InterfaceIdentifierFileName;</div><div class='del'>-    qlonglong               LocaleID;</div><div class='del'>-    triState                MkTypLibCompatible;</div><div class='del'>-    QString                 OutputDirectory;</div><div class='del'>-    QStringList             PreprocessorDefinitions;</div><div class='del'>-    QString                 ProxyFileName;</div><div class='del'>-    QString                 RedirectOutputAndErrors;</div><div class='del'>-    QString                 ServerStubFile;</div><div class='del'>-    QString                 StructMemberAlignment;</div><div class='del'>-    triState                SuppressCompilerWarnings;</div><div class='del'>-    triState                SuppressStartupBanner;</div><div class='del'>-    QString                 TargetEnvironment;</div><div class='del'>-    QString                 TypeLibFormat;</div><div class='del'>-    QString                 TypeLibraryName;</div><div class='del'>-    QStringList             UndefinePreprocessorDefinitions;</div><div class='del'>-    triState                ValidateAllParameters;</div><div class='del'>-    triState                WarnAsError;</div><div class='del'>-    QString                 WarningLevel;</div><div class='del'>-</div><div class='del'>-    VCXConfiguration*       config;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-class VCXLibrarianTool : public VCToolBase</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    // Functions</div><div class='del'>-    VCXLibrarianTool();</div><div class='del'>-    virtual ~VCXLibrarianTool(){}</div><div class='del'>-    bool parseOption(const char*){ return false; };</div><div class='del'>-</div><div class='del'>-    // Variables</div><div class='del'>-    QStringList             AdditionalDependencies;</div><div class='del'>-    QStringList             AdditionalLibraryDirectories;</div><div class='del'>-    QStringList             AdditionalOptions;</div><div class='del'>-    QString                 DisplayLibrary;</div><div class='del'>-    QString                 ErrorReporting;</div><div class='del'>-    QStringList             ExportNamedFunctions;</div><div class='del'>-    QStringList             ForceSymbolReferences;</div><div class='del'>-    triState                IgnoreAllDefaultLibraries;</div><div class='del'>-    QStringList             IgnoreSpecificDefaultLibraries;</div><div class='del'>-    triState                LinkTimeCodeGeneration;</div><div class='del'>-    QString                 ModuleDefinitionFile;</div><div class='del'>-    QString                 Name;</div><div class='del'>-    QString                 OutputFile;</div><div class='del'>-    QStringList             RemoveObjects;</div><div class='del'>-    QString                 SubSystem;</div><div class='del'>-    triState                SuppressStartupBanner;</div><div class='del'>-    QString                 TargetMachine;</div><div class='del'>-    triState                TreatLibWarningAsErrors;</div><div class='del'>-    triState                Verbose;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-class VCXCustomBuildTool : public VCToolBase</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    // Functions</div><div class='del'>-    VCXCustomBuildTool();</div><div class='del'>-    virtual ~VCXCustomBuildTool(){}</div><div class='del'>-    bool parseOption(const char*){ return false; };</div><div class='del'>-</div><div class='del'>-    // Variables</div><div class='del'>-    QStringList             AdditionalDependencies;</div><div class='del'>-    QStringList             CommandLine;</div><div class='del'>-    QString                 Description;</div><div class='del'>-    QStringList             Outputs;</div><div class='del'>-    QString                 ToolName;</div><div class='del'>-    QString                 ToolPath;</div><div class='del'>-    QString                 ConfigName;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-class VCXResourceCompilerTool : public VCToolBase</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    // Functions</div><div class='del'>-    VCXResourceCompilerTool();</div><div class='del'>-    virtual ~VCXResourceCompilerTool(){}</div><div class='del'>-    bool parseOption(const char*){ return false; };</div><div class='del'>-</div><div class='del'>-    // Variables</div><div class='del'>-    QStringList             AdditionalIncludeDirectories;</div><div class='del'>-    QString                 AdditionalOptions;</div><div class='del'>-    QString                 Culture;</div><div class='del'>-    triState                IgnoreStandardIncludePath;</div><div class='del'>-    triState                NullTerminateStrings;</div><div class='del'>-    QStringList             PreprocessorDefinitions;</div><div class='del'>-    QString                 ResourceOutputFileName;</div><div class='del'>-    triState                ShowProgress;</div><div class='del'>-    triState                SuppressStartupBanner;</div><div class='del'>-    QString                 TrackerLogDirectory;</div><div class='del'>-    QString                 UndefinePreprocessorDefinitions;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-class VCXDeploymentTool</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    // Functions</div><div class='del'>-    VCXDeploymentTool();</div><div class='del'>-    virtual ~VCXDeploymentTool() {}</div><div class='del'>-</div><div class='del'>-    // Variables</div><div class='del'>-    QString                 DeploymentTag;</div><div class='del'>-    QString                 RemoteDirectory;</div><div class='del'>-    QString                 AdditionalFiles;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-class VCXEventTool : public VCToolBase</div><div class='del'>-{</div><div class='del'>-protected:</div><div class='del'>-    // Functions</div><div class='del'>-    VCXEventTool() : UseInBuild(unset){};</div><div class='del'>-    virtual ~VCXEventTool(){}</div><div class='del'>-    bool parseOption(const char*){ return false; };</div><div class='del'>-</div><div class='del'>-public:</div><div class='del'>-    // Variables</div><div class='del'>-    QStringList             CommandLine;</div><div class='del'>-    QString                 Description;</div><div class='del'>-    triState                UseInBuild;</div><div class='del'>-    QString                 EventName;</div><div class='del'>-    QString                 ToolPath;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-class VCXPostBuildEventTool : public VCXEventTool</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    VCXPostBuildEventTool();</div><div class='del'>-    ~VCXPostBuildEventTool(){}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-class VCXPreBuildEventTool : public VCXEventTool</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    VCXPreBuildEventTool();</div><div class='del'>-    ~VCXPreBuildEventTool(){}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-class VCXPreLinkEventTool : public VCXEventTool</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    VCXPreLinkEventTool();</div><div class='del'>-    ~VCXPreLinkEventTool(){}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-class VCXConfiguration</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    // Functions</div><div class='del'>-    VCXConfiguration();</div><div class='del'>-    ~VCXConfiguration(){}</div><div class='del'>-</div><div class='del'>-    // Variables</div><div class='del'>-    triState                ATLMinimizesCRunTimeLibraryUsage;</div><div class='del'>-    triState                BuildBrowserInformation;</div><div class='del'>-    QString                 CharacterSet;</div><div class='del'>-    QString                 ConfigurationType;</div><div class='del'>-    QString                 DeleteExtensionsOnClean;</div><div class='del'>-    QString                 ImportLibrary;</div><div class='del'>-    QString                 IntermediateDirectory;</div><div class='del'>-    QString                 Name;</div><div class='del'>-    QString                 ConfigurationName;</div><div class='del'>-    QString                 OutputDirectory;</div><div class='del'>-    QString                 PrimaryOutput;</div><div class='del'>-    QString                 ProgramDatabase;</div><div class='del'>-    triState                RegisterOutput;</div><div class='del'>-    QString                 TargetName;</div><div class='del'>-    QString                 UseOfATL;</div><div class='del'>-    QString                 UseOfMfc;</div><div class='del'>-    triState                WholeProgramOptimization;</div><div class='del'>-</div><div class='del'>-    // XML sub-parts</div><div class='del'>-    VCXCLCompilerTool        compiler;</div><div class='del'>-    VCXLibrarianTool         librarian;</div><div class='del'>-    VCXLinkerTool            linker;</div><div class='del'>-    VCXMIDLTool              idl;</div><div class='del'>-    VCXResourceCompilerTool  resource;</div><div class='del'>-    VCXCustomBuildTool       custom;</div><div class='del'>-    VCXDeploymentTool        deployment;     // Not likely to be supported: http://msdn.microsoft.com/en-us/library/sa69he4t.aspx</div><div class='del'>-    VCXPostBuildEventTool    postBuild;</div><div class='del'>-    VCXPreBuildEventTool     preBuild;</div><div class='del'>-    VCXPreLinkEventTool      preLink;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct VCXFilterFile</div><div class='del'>-{</div><div class='del'>-    VCXFilterFile()</div><div class='del'>-    { excludeFromBuild = false; }</div><div class='del'>-    VCXFilterFile(const QString &amp;filename, bool exclude = false )</div><div class='del'>-    { file = filename; excludeFromBuild = exclude; }</div><div class='del'>-    VCXFilterFile(const QString &amp;filename, const QString &amp;additional, bool exclude = false )</div><div class='del'>-    { file = filename; excludeFromBuild = exclude; additionalFile = additional; }</div><div class='del'>-    bool operator==(const VCXFilterFile &amp;other){</div><div class='del'>-        return file == other.file</div><div class='del'>-               &amp;&amp; additionalFile == other.additionalFile</div><div class='del'>-               &amp;&amp; excludeFromBuild == other.excludeFromBuild;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    bool                    excludeFromBuild;</div><div class='del'>-    QString                 file;</div><div class='del'>-    QString                 additionalFile; // For tools like MOC</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-class VcxprojGenerator;</div><div class='del'>-class VCXFilter</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    // Functions</div><div class='del'>-    VCXFilter();</div><div class='del'>-    ~VCXFilter(){};</div><div class='del'>-</div><div class='del'>-    void addFile(const QString&amp; filename);</div><div class='del'>-    void addFile(const VCXFilterFile&amp; fileInfo);</div><div class='del'>-    void addFiles(const QStringList&amp; fileList);</div><div class='del'>-    bool addExtraCompiler(const VCXFilterFile &amp;info);</div><div class='del'>-    void modifyPCHstage(QString str);</div><div class='del'>-    bool outputFileConfig(XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const QString &amp;filename, const QString &amp;filtername, bool fileAllreadyAdded);</div><div class='del'>-</div><div class='del'>-    // Variables</div><div class='del'>-    QString                 Name;</div><div class='del'>-    QString                 Filter;</div><div class='del'>-    QString                 Guid;</div><div class='del'>-    triState                ParseFiles;</div><div class='del'>-    VcxprojGenerator*       Project;</div><div class='del'>-    VCXConfiguration*       Config;</div><div class='del'>-    QList&lt;VCXFilterFile&gt;    Files;</div><div class='del'>-</div><div class='del'>-    customBuildCheck        CustomBuild;</div><div class='del'>-</div><div class='del'>-    bool                    useCustomBuildTool;</div><div class='del'>-    VCXCustomBuildTool      CustomBuildTool;</div><div class='del'>-</div><div class='del'>-    bool                    useCompilerTool;</div><div class='del'>-    VCXCLCompilerTool       CompilerTool;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef QList&lt;VCXFilter&gt; VCXFilterList;</div><div class='del'>-class VCXProjectSingleConfig</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    enum FilterTypes {</div><div class='del'>-        None,</div><div class='del'>-        Source,</div><div class='del'>-        Header,</div><div class='del'>-        Generated,</div><div class='del'>-        LexYacc,</div><div class='del'>-        Translation,</div><div class='del'>-        Resources,</div><div class='del'>-        Extras</div><div class='del'>-    };</div><div class='del'>-    // Functions</div><div class='del'>-    VCXProjectSingleConfig(){};</div><div class='del'>-    ~VCXProjectSingleConfig(){}</div><div class='del'>-</div><div class='del'>-    // Variables</div><div class='del'>-    QString                 Name;</div><div class='del'>-    QString                 Version;</div><div class='del'>-    QString                 ProjectGUID;</div><div class='del'>-    QString                 Keyword;</div><div class='del'>-    QString                 SccProjectName;</div><div class='del'>-    QString                 SccLocalPath;</div><div class='del'>-    QString                 PlatformName;</div><div class='del'>-</div><div class='del'>-    // XML sub-parts</div><div class='del'>-    VCXConfiguration        Configuration;</div><div class='del'>-    VCXFilter               RootFiles;</div><div class='del'>-    VCXFilter               SourceFiles;</div><div class='del'>-    VCXFilter               HeaderFiles;</div><div class='del'>-    VCXFilter               GeneratedFiles;</div><div class='del'>-    VCXFilter               LexYaccFiles;</div><div class='del'>-    VCXFilter               TranslationFiles;</div><div class='del'>-    VCXFilter               FormFiles;</div><div class='del'>-    VCXFilter               ResourceFiles;</div><div class='del'>-    VCXFilterList           ExtraCompilersFiles;</div><div class='del'>-</div><div class='del'>-    bool                    flat_files;</div><div class='del'>-</div><div class='del'>-    // Accessor for extracompilers</div><div class='del'>-    VCXFilter               &amp;filterForExtraCompiler(const QString &amp;compilerName);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> // Tree &amp; Flat view of files --------------------------------------------------</div><div class='del'>-class VCXFilter;</div><div class='ctx'> class XNode</div><div class='ctx'> {</div><div class='ctx'> public:</div><div class='ctx'>     virtual ~XNode() { }</div><div class='del'>-    void addElement(const VCXFilterFile &amp;file) {</div><div class='add'>+    void addElement(const VCFilterFile &amp;file) {</div><div class='ctx'>         addElement(file.file, file);</div><div class='ctx'>     }</div><div class='del'>-    virtual void addElement(const QString &amp;filepath, const VCXFilterFile &amp;allInfo) = 0;</div><div class='add'>+    virtual void addElement(const QString &amp;filepath, const VCFilterFile &amp;allInfo) = 0;</div><div class='ctx'>     virtual void removeElements()= 0;</div><div class='del'>-    virtual void generateXML(XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const QString &amp;tagName, VCXProject &amp;tool, const QString &amp;filter) = 0;</div><div class='add'>+    virtual void generateXML(XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const QString &amp;tagName, VCProject &amp;tool, const QString &amp;filter) = 0;</div><div class='ctx'>     virtual bool hasElements() = 0;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> class XTreeNode : public XNode</div><div class='ctx'> {</div><div class='ctx'>     typedef QMap&lt;QString, XTreeNode*&gt; ChildrenMap;</div><div class='del'>-    VCXFilterFile info;</div><div class='add'>+    VCFilterFile info;</div><div class='ctx'>     ChildrenMap children;</div><div class='ctx'> </div><div class='ctx'> public:</div><div class='hunk'>@@ -582,7 +87,7 @@ public:</div><div class='ctx'>         return Uindex;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    void addElement(const QString &amp;filepath, const VCXFilterFile &amp;allInfo){</div><div class='add'>+    void addElement(const QString &amp;filepath, const VCFilterFile &amp;allInfo){</div><div class='ctx'>         QString newNodeName(filepath);</div><div class='ctx'> </div><div class='ctx'>         int index = pathIndex(filepath);</div><div class='hunk'>@@ -609,7 +114,7 @@ public:</div><div class='ctx'>         children.clear();</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    void generateXML(XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const QString &amp;tagName, VCXProject &amp;tool, const QString &amp;filter);</div><div class='add'>+    void generateXML(XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const QString &amp;tagName, VCProject &amp;tool, const QString &amp;filter);</div><div class='ctx'>     bool hasElements() {</div><div class='ctx'>         return children.size() != 0;</div><div class='ctx'>     }</div><div class='hunk'>@@ -617,7 +122,7 @@ public:</div><div class='ctx'> </div><div class='ctx'> class XFlatNode : public XNode</div><div class='ctx'> {</div><div class='del'>-    typedef QMap&lt;QString, VCXFilterFile&gt; ChildrenMapFlat;</div><div class='add'>+    typedef QMap&lt;QString, VCFilterFile&gt; ChildrenMapFlat;</div><div class='ctx'>     ChildrenMapFlat children;</div><div class='ctx'> </div><div class='ctx'> public:</div><div class='hunk'>@@ -633,7 +138,7 @@ public:</div><div class='ctx'>         return Uindex;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    void addElement(const QString &amp;filepath, const VCXFilterFile &amp;allInfo){</div><div class='add'>+    void addElement(const QString &amp;filepath, const VCFilterFile &amp;allInfo){</div><div class='ctx'>         QString newKey(filepath);</div><div class='ctx'> </div><div class='ctx'>         int index = pathIndex(filepath);</div><div class='hunk'>@@ -649,60 +154,39 @@ public:</div><div class='ctx'>         children.clear();</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    void generateXML(XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const QString &amp;tagName, VCXProject &amp;proj, const QString &amp;filter);</div><div class='add'>+    void generateXML(XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const QString &amp;tagName, VCProject &amp;proj, const QString &amp;filter);</div><div class='ctx'>     bool hasElements() {</div><div class='ctx'>         return children.size() != 0;</div><div class='ctx'>     }</div><div class='ctx'> };</div><div class='del'>-// ----------------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-class VCXProject</div><div class='add'>+class VCXProjectWriter : public VCProjectWriter</div><div class='ctx'> {</div><div class='ctx'> public:</div><div class='del'>-    // Variables</div><div class='del'>-    QString                 Name;</div><div class='del'>-    QString                 Version;</div><div class='del'>-    QString                 ProjectGUID;</div><div class='del'>-    QString                 Keyword;</div><div class='del'>-    QString                 SccProjectName;</div><div class='del'>-    QString                 SccLocalPath;</div><div class='del'>-    QString                 PlatformName;</div><div class='del'>-</div><div class='del'>-    // Single projects</div><div class='del'>-    QList&lt;VCXProjectSingleConfig&gt;  SingleProjects;</div><div class='add'>+    void write(XmlOutput &amp;, VCProjectSingleConfig &amp;);</div><div class='add'>+    void write(XmlOutput &amp;, VCProject &amp;);</div><div class='ctx'> </div><div class='del'>-    // List of all extracompilers</div><div class='del'>-    QStringList             ExtraCompilers;</div><div class='add'>+    void write(XmlOutput &amp;, const VCCLCompilerTool &amp;);</div><div class='add'>+    void write(XmlOutput &amp;, const VCLinkerTool &amp;);</div><div class='add'>+    void write(XmlOutput &amp;, const VCMIDLTool &amp;);</div><div class='add'>+    void write(XmlOutput &amp;, const VCCustomBuildTool &amp;);</div><div class='add'>+    void write(XmlOutput &amp;, const VCLibrarianTool &amp;);</div><div class='add'>+    void write(XmlOutput &amp;, const VCResourceCompilerTool &amp;);</div><div class='add'>+    void write(XmlOutput &amp;, const VCEventTool &amp;);</div><div class='add'>+    void write(XmlOutput &amp;, const VCDeploymentTool &amp;);</div><div class='add'>+    void write(XmlOutput &amp;, const VCConfiguration &amp;);</div><div class='add'>+    void write(XmlOutput &amp;, VCFilter &amp;);</div><div class='ctx'> </div><div class='del'>-    // Functions</div><div class='del'>-    void                    outputFilter(XmlOutput &amp;xml,</div><div class='del'>-                                         XmlOutput &amp;xmlFilter,</div><div class='del'>-                                         const QString &amp;filtername);</div><div class='del'>-</div><div class='del'>-    void                    outputFileConfigs(XmlOutput &amp;xml,</div><div class='del'>-                                              XmlOutput &amp;xmlFilter,</div><div class='del'>-                                              const VCXFilterFile &amp;info,</div><div class='del'>-                                              const QString &amp;filtername);</div><div class='del'>-</div><div class='del'>-    void                    addFilters(XmlOutput &amp;xmlFilter,</div><div class='del'>-                                       const QString &amp;filtername);</div><div class='add'>+private:</div><div class='add'>+    static void addFilters(VCProject &amp;project, XmlOutput &amp;xmlFilter, const QString &amp;filterName);</div><div class='add'>+    static void outputFilter(VCProject &amp;project, XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const QString &amp;filtername);</div><div class='add'>+    static void outputFileConfigs(VCProject &amp;project, XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const VCFilterFile &amp;info, const QString &amp;filtername);</div><div class='add'>+    static bool outputFileConfig(VCFilter &amp;filter, XmlOutput &amp;xml, XmlOutput &amp;xmlFilter, const QString &amp;filename, const QString &amp;filtername, bool fileAllreadyAdded);</div><div class='ctx'> </div><div class='add'>+    friend class XTreeNode;</div><div class='add'>+    friend class XFlatNode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCXCLCompilerTool &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCXLinkerTool &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCXMIDLTool &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCXCustomBuildTool &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCXLibrarianTool &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCXResourceCompilerTool &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCXEventTool &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCXDeploymentTool &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCXConfiguration &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCXProjectSingleConfig &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, VCXProject &amp;);</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> #endif // MSVC_OBJECTMODEL_H</div><div class='head'>diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp<br/>index 6129fb6..dd4e34d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msvc_nmake.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msvc_nmake.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msvc_nmake.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/win32/msvc_nmake.cpp</a></div><div class='hunk'>@@ -70,7 +70,8 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &amp;t)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if(project-&gt;first("TEMPLATE") == "app" ||</div><div class='del'>-       project-&gt;first("TEMPLATE") == "lib") {</div><div class='add'>+       project-&gt;first("TEMPLATE") == "lib" ||</div><div class='add'>+       project-&gt;first("TEMPLATE") == "aux") {</div><div class='ctx'> #if 0</div><div class='ctx'>         if(Option::mkfile::do_stub_makefile)</div><div class='ctx'>             return MakefileGenerator::writeStubMakefile(t);</div><div class='hunk'>@@ -85,6 +86,54 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &amp;t)</div><div class='ctx'>     return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void NmakeMakefileGenerator::writeSubMakeCall(QTextStream &amp;t, const QString &amp;callPrefix,</div><div class='add'>+                                              const QString &amp;makeArguments, const QString &amp;callPostfix)</div><div class='add'>+{</div><div class='add'>+    // Pass MAKEFLAGS as environment variable to sub-make calls.</div><div class='add'>+    // Unlike other make tools nmake doesn't do this automatically.</div><div class='add'>+    t &lt;&lt; "\n\t@set MAKEFLAGS=$(MAKEFLAGS)";</div><div class='add'>+    Win32MakefileGenerator::writeSubMakeCall(t, callPrefix, makeArguments, callPostfix);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString NmakeMakefileGenerator::getPdbTarget()</div><div class='add'>+{</div><div class='add'>+    return QString(project-&gt;first("TARGET") + project-&gt;first("TARGET_VERSION_EXT") + ".pdb");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString NmakeMakefileGenerator::defaultInstall(const QString &amp;t)</div><div class='add'>+{</div><div class='add'>+    if((t != "target" &amp;&amp; t != "dlltarget") ||</div><div class='add'>+       (t == "dlltarget" &amp;&amp; (project-&gt;first("TEMPLATE") != "lib" || !project-&gt;isActiveConfig("shared"))) ||</div><div class='add'>+        project-&gt;first("TEMPLATE") == "subdirs")</div><div class='add'>+       return QString();</div><div class='add'>+</div><div class='add'>+    QString ret = Win32MakefileGenerator::defaultInstall(t);</div><div class='add'>+</div><div class='add'>+    const QString root = "$(INSTALL_ROOT)";</div><div class='add'>+    QStringList &amp;uninst = project-&gt;values(t + ".uninstall");</div><div class='add'>+    QString targetdir = Option::fixPathToTargetOS(project-&gt;first(t + ".path"), false);</div><div class='add'>+    targetdir = fileFixify(targetdir, FileFixifyAbsolute);</div><div class='add'>+    if(targetdir.right(1) != Option::dir_sep)</div><div class='add'>+        targetdir += Option::dir_sep;</div><div class='add'>+</div><div class='add'>+    if(t == "target" &amp;&amp; project-&gt;first("TEMPLATE") == "lib") {</div><div class='add'>+        if(project-&gt;isActiveConfig("shared") &amp;&amp; project-&gt;isActiveConfig("debug")) {</div><div class='add'>+            QString pdb_target = getPdbTarget();</div><div class='add'>+            pdb_target.remove('"');</div><div class='add'>+            QString src_targ = (project-&gt;isEmpty("DESTDIR") ? QString("$(DESTDIR)") : project-&gt;first("DESTDIR")) + pdb_target;</div><div class='add'>+            QString dst_targ = filePrefixRoot(root, fileFixify(targetdir + pdb_target, FileFixifyAbsolute));</div><div class='add'>+            if(!ret.isEmpty())</div><div class='add'>+                ret += "\n\t";</div><div class='add'>+            ret += QString("-$(INSTALL_FILE)") + " \"" + src_targ + "\" \"" + dst_targ + "\"";</div><div class='add'>+            if(!uninst.isEmpty())</div><div class='add'>+                uninst.append("\n\t");</div><div class='add'>+            uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> QStringList &amp;NmakeMakefileGenerator::findDependencies(const QString &amp;file)</div><div class='ctx'> {</div><div class='ctx'>     QStringList &amp;aList = MakefileGenerator::findDependencies(file);</div><div class='hunk'>@@ -129,10 +178,12 @@ QString NmakeMakefileGenerator::var(const QString &amp;value)</div><div class='ctx'>             p.replace("-c", precompRule);</div><div class='ctx'>             // Cannot use -Gm with -FI &amp; -Yu, as this gives an</div><div class='ctx'>             // internal compiler error, on the newer compilers</div><div class='add'>+            // ### work-around for a VS 2003 bug. Move to some prf file or remove completely.</div><div class='ctx'>             p.remove("-Gm");</div><div class='ctx'>             return p;</div><div class='ctx'>         } else if (value == "QMAKE_CXXFLAGS") {</div><div class='ctx'>             // Remove internal compiler error option</div><div class='add'>+            // ### work-around for a VS 2003 bug. Move to some prf file or remove completely.</div><div class='ctx'>             return MakefileGenerator::var(value).remove("-Gm");</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='hunk'>@@ -177,8 +228,10 @@ void NmakeMakefileGenerator::init()</div><div class='ctx'>         project-&gt;values("QMAKE_LIBS") += escapeFilePaths(project-&gt;values("RES_FILE"));</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    if(!project-&gt;values("DEF_FILE").isEmpty())</div><div class='del'>-        project-&gt;values("QMAKE_LFLAGS").append(QString("/DEF:") + escapeFilePath(project-&gt;first("DEF_FILE")));</div><div class='add'>+    if (!project-&gt;values("DEF_FILE").isEmpty()) {</div><div class='add'>+        QString defFileName = fileFixify(project-&gt;values("DEF_FILE")).first();</div><div class='add'>+        project-&gt;values("QMAKE_LFLAGS").append(QString("/DEF:") + escapeFilePath(defFileName));</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     if(!project-&gt;values("VERSION").isEmpty()) {</div><div class='ctx'>         QString version = project-&gt;values("VERSION")[0];</div><div class='hunk'>@@ -289,6 +342,11 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &amp;t)</div><div class='ctx'> </div><div class='ctx'> void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &amp;t)</div><div class='ctx'> {</div><div class='add'>+    if (project-&gt;first("TEMPLATE") == "aux") {</div><div class='add'>+        t &lt;&lt; "first:" &lt;&lt; endl;</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     t &lt;&lt; "first: all" &lt;&lt; endl;</div><div class='ctx'>     t &lt;&lt; "all: " &lt;&lt; fileFixify(Option::output.fileName()) &lt;&lt; " " &lt;&lt; varGlue("ALL_DEPS"," "," "," ") &lt;&lt; "$(DESTDIR_TARGET)" &lt;&lt; endl &lt;&lt; endl;</div><div class='ctx'>     t &lt;&lt; "$(DESTDIR_TARGET): " &lt;&lt; var("PRE_TARGETDEPS") &lt;&lt; " $(OBJECTS) " &lt;&lt; var("POST_TARGETDEPS");</div><div class='head'>diff --git a/qmake/generators/win32/msvc_nmake.h b/qmake/generators/win32/msvc_nmake.h<br/>index b8abaf6..99f7279 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msvc_nmake.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msvc_nmake.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msvc_nmake.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/win32/msvc_nmake.h</a></div><div class='hunk'>@@ -57,6 +57,10 @@ class NmakeMakefileGenerator : public Win32MakefileGenerator</div><div class='ctx'>     void init();</div><div class='ctx'> </div><div class='ctx'> protected:</div><div class='add'>+    virtual void writeSubMakeCall(QTextStream &amp;t, const QString &amp;callPrefix,</div><div class='add'>+                                  const QString &amp;makeArguments, const QString &amp;callPostfix);</div><div class='add'>+    virtual QString getPdbTarget();</div><div class='add'>+    virtual QString defaultInstall(const QString &amp;t);</div><div class='ctx'>     virtual QStringList &amp;findDependencies(const QString &amp;file);</div><div class='ctx'>     QString var(const QString &amp;value);</div><div class='ctx'>     QString precompH, precompObj, precompPch;</div><div class='head'>diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp<br/>index 7e50c0a..85a642b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msvc_objectmodel.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msvc_objectmodel.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msvc_objectmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/win32/msvc_objectmodel.cpp</a></div><div class='hunk'>@@ -280,6 +280,14 @@ inline XmlOutput::xml_output attrX(const char *name, const QStringList &amp;v, const</div><div class='ctx'>     return attr(name, v.join(s));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+triState operator!(const triState &amp;rhs)</div><div class='add'>+{</div><div class='add'>+    if (rhs == unset)</div><div class='add'>+        return rhs;</div><div class='add'>+    triState lhs = (rhs == _True ? _False : _True);</div><div class='add'>+    return lhs;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> // VCToolBase -------------------------------------------------</div><div class='ctx'> QStringList VCToolBase::fixCommandLine(const QString &amp;input)</div><div class='ctx'> {</div><div class='hunk'>@@ -294,7 +302,7 @@ static QString vcCommandSeparator()</div><div class='ctx'>     // As we want every sub-command to be error-checked (as is done by makefile-based</div><div class='ctx'>     // backends), we insert the checks ourselves, using the undocumented jump target.</div><div class='ctx'>     static QString cmdSep =</div><div class='del'>-            QLatin1String("&amp;#x000D;&amp;#x000A;if errorlevel 1 goto VCReportError&amp;#x000D;&amp;#x000A;");</div><div class='add'>+    QLatin1String("&amp;#x000D;&amp;#x000A;if errorlevel 1 goto VCReportError&amp;#x000D;&amp;#x000A;");</div><div class='ctx'>     return cmdSep;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -323,12 +331,14 @@ VCCLCompilerTool::VCCLCompilerTool()</div><div class='ctx'>         FloatingPointExceptions(unset),</div><div class='ctx'>         ForceConformanceInForLoopScope(unset),</div><div class='ctx'>         GeneratePreprocessedFile(preprocessNo),</div><div class='add'>+        PreprocessSuppressLineNumbers(unset),</div><div class='ctx'>         GlobalOptimizations(unset),</div><div class='ctx'>         IgnoreStandardIncludePath(unset),</div><div class='ctx'>         ImproveFloatingPointConsistency(unset),</div><div class='ctx'>         InlineFunctionExpansion(expandDefault),</div><div class='ctx'>         KeepComments(unset),</div><div class='ctx'>         MinimalRebuild(unset),</div><div class='add'>+        OmitDefaultLibName(unset),</div><div class='ctx'>         OmitFramePointers(unset),</div><div class='ctx'>         OpenMP(unset),</div><div class='ctx'>         Optimization(optimizeCustom),</div><div class='hunk'>@@ -345,12 +355,18 @@ VCCLCompilerTool::VCCLCompilerTool()</div><div class='ctx'>         TreatWChar_tAsBuiltInType(unset),</div><div class='ctx'>         TurnOffAssemblyGeneration(unset),</div><div class='ctx'>         UndefineAllPreprocessorDefinitions(unset),</div><div class='del'>-        UsePrecompiledHeader(pchNone),</div><div class='add'>+        UsePrecompiledHeader(pchUnset),</div><div class='add'>+        UseUnicodeForAssemblerListing(unset),</div><div class='ctx'>         WarnAsError(unset),</div><div class='ctx'>         WarningLevel(warningLevel_0),</div><div class='ctx'>         WholeProgramOptimization(unset),</div><div class='ctx'>         CompileForArchitecture(archUnknown),</div><div class='del'>-        InterworkCalls(unset)</div><div class='add'>+        InterworkCalls(unset),</div><div class='add'>+        EnablePREfast(unset),</div><div class='add'>+        DisplayFullPaths(unset),</div><div class='add'>+        MultiProcessorCompilation(unset),</div><div class='add'>+        GenerateXMLDocumentationFiles(unset),</div><div class='add'>+        CreateHotpatchableImage(unset)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -373,7 +389,7 @@ inline XmlOutput::xml_output xformUsePrecompiledHeaderForNET2005(pchOption whatP</div><div class='ctx'>         if (whatPch ==  pchGenerateAuto) whatPch = (pchOption)0;</div><div class='ctx'>         if (whatPch ==  pchUseUsingSpecific) whatPch = (pchOption)2;</div><div class='ctx'>     }</div><div class='del'>-    return attrE(_UsePrecompiledHeader, whatPch);</div><div class='add'>+    return attrE(_UsePrecompiledHeader, whatPch, /*ifNot*/ pchUnset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> inline XmlOutput::xml_output xformExceptionHandlingNET2005(exceptionHandling eh, DotNET compilerVersion)</div><div class='hunk'>@@ -387,82 +403,6 @@ inline XmlOutput::xml_output xformExceptionHandlingNET2005(exceptionHandling eh,</div><div class='ctx'>     return attrS(_ExceptionHandling, (eh == ehNoSEH ? "true" : "false"));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCCLCompilerTool &amp;tool)</div><div class='del'>-{</div><div class='del'>-    return xml</div><div class='del'>-        &lt;&lt; tag(_Tool)</div><div class='del'>-            &lt;&lt; attrS(_Name, _VCCLCompilerTool)</div><div class='del'>-            &lt;&lt; attrX(_AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories)</div><div class='del'>-            &lt;&lt; attrX(_AdditionalOptions, tool.AdditionalOptions, " ")</div><div class='del'>-            &lt;&lt; attrX(_AdditionalUsingDirectories, tool.AdditionalUsingDirectories)</div><div class='del'>-            &lt;&lt; attrS(_AssemblerListingLocation, tool.AssemblerListingLocation)</div><div class='del'>-            &lt;&lt; attrE(_AssemblerOutput, tool.AssemblerOutput, /*ifNot*/ asmListingNone)</div><div class='del'>-            &lt;&lt; attrE(_BasicRuntimeChecks, tool.BasicRuntimeChecks, /*ifNot*/ runtimeBasicCheckNone)</div><div class='del'>-            &lt;&lt; attrE(_BrowseInformation, tool.BrowseInformation, /*ifNot*/ brInfoNone)</div><div class='del'>-            &lt;&lt; attrS(_BrowseInformationFile, tool.BrowseInformationFile)</div><div class='del'>-            &lt;&lt; attrT(_BufferSecurityCheck, tool.BufferSecurityCheck)</div><div class='del'>-            &lt;&lt; attrE(_CallingConvention, tool.CallingConvention, /*ifNot*/ callConventionDefault)</div><div class='del'>-            &lt;&lt; attrE(_CompileAs, tool.CompileAs, compileAsDefault)</div><div class='del'>-            &lt;&lt; attrE(_CompileAsManaged, tool.CompileAsManaged, /*ifNot*/ managedDefault)</div><div class='del'>-            &lt;&lt; attrT(_CompileOnly, tool.CompileOnly)</div><div class='del'>-            &lt;&lt; attrE(_DebugInformationFormat, tool.DebugInformationFormat, /*ifNot*/ debugUnknown)</div><div class='del'>-            &lt;&lt; attrT(_DefaultCharIsUnsigned, tool.DefaultCharIsUnsigned)</div><div class='del'>-            &lt;&lt; attrT(_Detect64BitPortabilityProblems, tool.Detect64BitPortabilityProblems)</div><div class='del'>-            &lt;&lt; attrT(_DisableLanguageExtensions, tool.DisableLanguageExtensions)</div><div class='del'>-            &lt;&lt; attrX(_DisableSpecificWarnings, tool.DisableSpecificWarnings)</div><div class='del'>-            &lt;&lt; attrE(_EnableEnhancedInstructionSet, tool.EnableEnhancedInstructionSet, /*ifnot*/ archNotSet)</div><div class='del'>-            &lt;&lt; attrT(_EnableFiberSafeOptimizations, tool.EnableFiberSafeOptimizations)</div><div class='del'>-            &lt;&lt; attrT(_EnableFunctionLevelLinking, tool.EnableFunctionLevelLinking)</div><div class='del'>-            &lt;&lt; attrT(_EnableIntrinsicFunctions, tool.EnableIntrinsicFunctions)</div><div class='del'>-            &lt;&lt; xformExceptionHandlingNET2005(tool.ExceptionHandling, tool.config-&gt;CompilerVersion)</div><div class='del'>-            &lt;&lt; attrT(_ExpandAttributedSource, tool.ExpandAttributedSource)</div><div class='del'>-            &lt;&lt; attrE(_FavorSizeOrSpeed, tool.FavorSizeOrSpeed, /*ifNot*/ favorNone)</div><div class='del'>-</div><div class='del'>-            &lt;&lt; attrE(_FloatingPointModel, tool.FloatingPointModel, /*ifNot*/ floatingPointNotSet)</div><div class='del'>-            &lt;&lt; attrT(_FloatingPointExceptions, tool.FloatingPointExceptions)</div><div class='del'>-</div><div class='del'>-            &lt;&lt; attrT(_ForceConformanceInForLoopScope, tool.ForceConformanceInForLoopScope)</div><div class='del'>-            &lt;&lt; attrX(_ForcedIncludeFiles, tool.ForcedIncludeFiles)</div><div class='del'>-            &lt;&lt; attrX(_ForcedUsingFiles, tool.ForcedUsingFiles)</div><div class='del'>-            &lt;&lt; attrE(_GeneratePreprocessedFile, tool.GeneratePreprocessedFile, /*ifNot*/ preprocessUnknown)</div><div class='del'>-            &lt;&lt; attrT(_GlobalOptimizations, tool.GlobalOptimizations)</div><div class='del'>-            &lt;&lt; attrT(_IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath)</div><div class='del'>-            &lt;&lt; attrT(_ImproveFloatingPointConsistency, tool.ImproveFloatingPointConsistency)</div><div class='del'>-            &lt;&lt; attrE(_InlineFunctionExpansion, tool.InlineFunctionExpansion, /*ifNot*/ expandDefault)</div><div class='del'>-            &lt;&lt; attrT(_KeepComments, tool.KeepComments)</div><div class='del'>-            &lt;&lt; attrT(_MinimalRebuild, tool.MinimalRebuild)</div><div class='del'>-            &lt;&lt; attrS(_ObjectFile, tool.ObjectFile)</div><div class='del'>-            &lt;&lt; attrT(_OmitFramePointers, tool.OmitFramePointers)</div><div class='del'>-            &lt;&lt; attrT(_OpenMP, tool.OpenMP)</div><div class='del'>-            &lt;&lt; attrE(_Optimization, tool.Optimization, /*ifNot*/ optimizeDefault)</div><div class='del'>-            &lt;&lt; attrE(_OptimizeForProcessor, tool.OptimizeForProcessor, /*ifNot*/ procOptimizeBlended)</div><div class='del'>-            &lt;&lt; attrT(_OptimizeForWindowsApplication, tool.OptimizeForWindowsApplication)</div><div class='del'>-            &lt;&lt; attrS(_OutputFile, tool.OutputFile)</div><div class='del'>-            &lt;&lt; attrS(_PrecompiledHeaderFile, tool.PrecompiledHeaderFile)</div><div class='del'>-            &lt;&lt; attrS(_PrecompiledHeaderThrough, tool.PrecompiledHeaderThrough)</div><div class='del'>-            &lt;&lt; attrX(_PreprocessorDefinitions, tool.PreprocessorDefinitions)</div><div class='del'>-            &lt;&lt; (tool.ProgramDataBaseFileName.isNull() ? noxml() : attr(_ProgramDataBaseFileName, tool.ProgramDataBaseFileName))</div><div class='del'>-            &lt;&lt; attrE(_RuntimeLibrary, tool.RuntimeLibrary, /*ifNot*/ rtUnknown)</div><div class='del'>-            &lt;&lt; attrT(_RuntimeTypeInfo, tool.RuntimeTypeInfo)</div><div class='del'>-            &lt;&lt; attrT(_ShowIncludes, tool.ShowIncludes)</div><div class='del'>-            &lt;&lt; attrT(_SmallerTypeCheck, tool.SmallerTypeCheck)</div><div class='del'>-            &lt;&lt; attrT(_StringPooling, tool.StringPooling)</div><div class='del'>-            &lt;&lt; attrE(_StructMemberAlignment, tool.StructMemberAlignment, /*ifNot*/ alignNotSet)</div><div class='del'>-            &lt;&lt; attrT(_SuppressStartupBanner, tool.SuppressStartupBanner)</div><div class='del'>-            &lt;&lt; attrT(_TreatWChar_tAsBuiltInType, tool.TreatWChar_tAsBuiltInType)</div><div class='del'>-            &lt;&lt; attrT(_TurnOffAssemblyGeneration, tool.TurnOffAssemblyGeneration)</div><div class='del'>-            &lt;&lt; attrT(_UndefineAllPreprocessorDefinitions, tool.UndefineAllPreprocessorDefinitions)</div><div class='del'>-            &lt;&lt; attrX(_UndefinePreprocessorDefinitions, tool.UndefinePreprocessorDefinitions)</div><div class='del'>-            &lt;&lt; (!tool.PrecompiledHeaderFile.isEmpty() || !tool.PrecompiledHeaderThrough.isEmpty() ? xformUsePrecompiledHeaderForNET2005(tool.UsePrecompiledHeader, tool.config-&gt;CompilerVersion) : noxml())</div><div class='del'>-            &lt;&lt; attrT(_WarnAsError, tool.WarnAsError)</div><div class='del'>-            &lt;&lt; attrE(_WarningLevel, tool.WarningLevel, /*ifNot*/ warningLevelUnknown)</div><div class='del'>-            &lt;&lt; attrT(_WholeProgramOptimization, tool.WholeProgramOptimization)</div><div class='del'>-            &lt;&lt; attrE(_CompileForArchitecture, tool.CompileForArchitecture, /*ifNot*/ archUnknown)</div><div class='del'>-            &lt;&lt; attrT(_InterworkCalls, tool.InterworkCalls)</div><div class='del'>-</div><div class='del'>-        &lt;&lt; closetag(_Tool);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> bool VCCLCompilerTool::parseOption(const char* option)</div><div class='ctx'> {</div><div class='ctx'>     // skip index 0 ('/' or '-')</div><div class='hunk'>@@ -475,6 +415,10 @@ bool VCCLCompilerTool::parseOption(const char* option)</div><div class='ctx'>     switch (first) {</div><div class='ctx'>     case '?':</div><div class='ctx'>     case 'h':</div><div class='add'>+        if(second == 'o' &amp;&amp; third == 't' &amp;&amp; fourth == 'p') {</div><div class='add'>+            CreateHotpatchableImage = _True;</div><div class='add'>+            break;</div><div class='add'>+        }</div><div class='ctx'>         qWarning("Generator: Option '/?', '/help': MSVC.NET projects do not support outputting help info");</div><div class='ctx'>         found = false;</div><div class='ctx'>         break;</div><div class='hunk'>@@ -500,7 +444,7 @@ bool VCCLCompilerTool::parseOption(const char* option)</div><div class='ctx'>         break;</div><div class='ctx'>     case 'E':</div><div class='ctx'>         if(second == 'H') {</div><div class='del'>-            QString opt(option);</div><div class='add'>+            QByteArray opt(option + 2);</div><div class='ctx'>             if (opt.contains('a') &amp;&amp; !opt.contains('s') &amp;&amp; !opt.contains('c'))</div><div class='ctx'>                 ExceptionHandling = ehSEH;</div><div class='ctx'>             else if (!opt.contains('a') &amp;&amp; opt.contains("s-") &amp;&amp; opt.contains("c-"))</div><div class='hunk'>@@ -519,6 +463,8 @@ bool VCCLCompilerTool::parseOption(const char* option)</div><div class='ctx'>                 AdditionalOptions += option;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='add'>+        } else if (second == 'P') {</div><div class='add'>+            PreprocessSuppressLineNumbers = _True;</div><div class='ctx'>         }</div><div class='ctx'>         GeneratePreprocessedFile = preprocessYes;</div><div class='ctx'>         break;</div><div class='hunk'>@@ -535,16 +481,24 @@ bool VCCLCompilerTool::parseOption(const char* option)</div><div class='ctx'>                         AssemblerOutput = asmListingAsmMachineSrc;</div><div class='ctx'>                 } else if(third == 's') {</div><div class='ctx'>                     AssemblerOutput = asmListingAsmSrc;</div><div class='add'>+                } else if (third == 'u') {</div><div class='add'>+                    UseUnicodeForAssemblerListing = _True;</div><div class='ctx'>                 } else {</div><div class='ctx'>                     AssemblerOutput = asmListingAssemblyOnly;</div><div class='ctx'>                 }</div><div class='ctx'>                 break;</div><div class='add'>+            case 'C':</div><div class='add'>+                DisplayFullPaths = _True;</div><div class='add'>+                break;</div><div class='ctx'>             case 'a':</div><div class='ctx'>                 AssemblerListingLocation = option+3;</div><div class='ctx'>                 break;</div><div class='ctx'>             case 'I':</div><div class='ctx'>                 ForcedIncludeFiles += option+3;</div><div class='ctx'>                 break;</div><div class='add'>+            case 'i':</div><div class='add'>+                PreprocessOutputPath += option+3;</div><div class='add'>+                break;</div><div class='ctx'>             case 'R':</div><div class='ctx'>                 BrowseInformation = brAllInfo;</div><div class='ctx'>                 BrowseInformationFile = option+3;</div><div class='hunk'>@@ -616,6 +570,8 @@ bool VCCLCompilerTool::parseOption(const char* option)</div><div class='ctx'>             break;</div><div class='ctx'>         case 'S':</div><div class='ctx'>             BufferSecurityCheck = _True;</div><div class='add'>+            if(third == '-')</div><div class='add'>+                BufferSecurityCheck = _False;</div><div class='ctx'>             break;</div><div class='ctx'>         case 'T':</div><div class='ctx'>             EnableFiberSafeOptimizations = _True;</div><div class='hunk'>@@ -693,10 +649,14 @@ bool VCCLCompilerTool::parseOption(const char* option)</div><div class='ctx'>                 RuntimeLibrary = rtMultiThreadedDebug;</div><div class='ctx'>             break;</div><div class='ctx'>         } else if (second == 'P') {</div><div class='del'>-            if (config-&gt;CompilerVersion &gt;= NET2005)</div><div class='add'>+            if (config-&gt;CompilerVersion &gt;= NET2005) {</div><div class='ctx'>                 AdditionalOptions += option;</div><div class='del'>-            else</div><div class='add'>+            } else if (config-&gt;CompilerVersion &gt;= NET2010) {</div><div class='add'>+                MultiProcessorCompilation = _True;</div><div class='add'>+                MultiProcessorCompilationProcessorCount = option+3;</div><div class='add'>+            } else {</div><div class='ctx'>                 warn_msg(WarnLogic, "/MP option is not supported in Visual C++ &lt; 2005, ignoring.");</div><div class='add'>+            }</div><div class='ctx'>             break;</div><div class='ctx'>         }</div><div class='ctx'>         found = false; break;</div><div class='hunk'>@@ -873,7 +833,12 @@ bool VCCLCompilerTool::parseOption(const char* option)</div><div class='ctx'>             break;</div><div class='ctx'>         case 'p':</div><div class='ctx'>             if(third == '6' &amp;&amp; fourth == '4') {</div><div class='del'>-                Detect64BitPortabilityProblems = _True;</div><div class='add'>+                if (config-&gt;CompilerVersion &gt;= NET2010) {</div><div class='add'>+                     // Deprecated for VS2010 but can be used under Additional Options.</div><div class='add'>+                    AdditionalOptions += option;</div><div class='add'>+                } else {</div><div class='add'>+                   Detect64BitPortabilityProblems = _True;</div><div class='add'>+                }</div><div class='ctx'>                 break;</div><div class='ctx'>             }</div><div class='ctx'>             // Fallthrough</div><div class='hunk'>@@ -892,11 +857,11 @@ bool VCCLCompilerTool::parseOption(const char* option)</div><div class='ctx'>             break;</div><div class='ctx'>         case 'X':</div><div class='ctx'>             UsePrecompiledHeader = pchGenerateAuto;</div><div class='del'>-            PrecompiledHeaderFile = option+3;</div><div class='add'>+            PrecompiledHeaderThrough = option+3;</div><div class='ctx'>             break;</div><div class='ctx'>         case 'c':</div><div class='ctx'>             UsePrecompiledHeader = pchCreateUsingSpecific;</div><div class='del'>-            PrecompiledHeaderFile = option+3;</div><div class='add'>+            PrecompiledHeaderThrough = option+3;</div><div class='ctx'>             break;</div><div class='ctx'>         case 'd':</div><div class='ctx'>         case 'l':</div><div class='hunk'>@@ -904,7 +869,7 @@ bool VCCLCompilerTool::parseOption(const char* option)</div><div class='ctx'>             break;</div><div class='ctx'>         case 'u':</div><div class='ctx'>             UsePrecompiledHeader = pchUseUsingSpecific;</div><div class='del'>-            PrecompiledHeaderFile = option+3;</div><div class='add'>+            PrecompiledHeaderThrough = option+3;</div><div class='ctx'>             break;</div><div class='ctx'>         default:</div><div class='ctx'>             found = false; break;</div><div class='hunk'>@@ -925,7 +890,7 @@ bool VCCLCompilerTool::parseOption(const char* option)</div><div class='ctx'>             DebugInformationFormat = debugEnabled;</div><div class='ctx'>             break;</div><div class='ctx'>         case 'l':</div><div class='del'>-            DebugInformationFormat = debugEditAndContinue;</div><div class='add'>+            OmitDefaultLibName = _True;</div><div class='ctx'>             break;</div><div class='ctx'>         case 'a':</div><div class='ctx'>             DisableLanguageExtensions = _True;</div><div class='hunk'>@@ -989,6 +954,9 @@ bool VCCLCompilerTool::parseOption(const char* option)</div><div class='ctx'>                     break;</div><div class='ctx'>                 }</div><div class='ctx'>             }</div><div class='add'>+        } else if (second == 'n' &amp;&amp; third == 'a' &amp;&amp; fourth == 'l') {</div><div class='add'>+            EnablePREfast = _True;</div><div class='add'>+            break;</div><div class='ctx'>         }</div><div class='ctx'>         found = false;</div><div class='ctx'>         break;</div><div class='hunk'>@@ -1047,10 +1015,34 @@ bool VCCLCompilerTool::parseOption(const char* option)</div><div class='ctx'>         }</div><div class='ctx'>         break;</div><div class='ctx'>     case 'd':</div><div class='del'>-        if(second != 'r') {</div><div class='del'>-            found = false; break;</div><div class='add'>+        if (second == 'r') {</div><div class='add'>+            CompileAsManaged = managedAssembly;</div><div class='add'>+            break;</div><div class='add'>+        } else if (second != 'o' &amp;&amp; third == 'c') {</div><div class='add'>+            GenerateXMLDocumentationFiles = _True;</div><div class='add'>+            XMLDocumentationFileName += option+4;</div><div class='add'>+            break;</div><div class='ctx'>         }</div><div class='del'>-        CompileAsManaged = managedAssembly;</div><div class='add'>+        found = false;</div><div class='add'>+        break;</div><div class='add'>+    case 'e':</div><div class='add'>+        if (second == 'r' &amp;&amp; third == 'r' &amp;&amp; fourth == 'o') {</div><div class='add'>+            if (option[12] == ':') {</div><div class='add'>+                if ( option[13] == 'n') {</div><div class='add'>+                    ErrorReporting = "None";</div><div class='add'>+                } else if (option[13] == 'p') {</div><div class='add'>+                    ErrorReporting = "Prompt";</div><div class='add'>+                } else if (option[13] == 'q') {</div><div class='add'>+                    ErrorReporting = "Queue";</div><div class='add'>+                } else if (option[13] == 's') {</div><div class='add'>+                    ErrorReporting = "Send";</div><div class='add'>+                } else {</div><div class='add'>+                    found = false;</div><div class='add'>+                }</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        found = false;</div><div class='ctx'>         break;</div><div class='ctx'>     case 'f':</div><div class='ctx'>         if(second == 'p' &amp;&amp; third == ':') {</div><div class='hunk'>@@ -1133,7 +1125,8 @@ bool VCCLCompilerTool::parseOption(const char* option)</div><div class='ctx'> </div><div class='ctx'> // VCLinkerTool -----------------------------------------------------</div><div class='ctx'> VCLinkerTool::VCLinkerTool()</div><div class='del'>-    :        EnableCOMDATFolding(optFoldingDefault),</div><div class='add'>+    :   DataExecutionPrevention(unset),</div><div class='add'>+        EnableCOMDATFolding(optFoldingDefault),</div><div class='ctx'>         GenerateDebugInformation(unset),</div><div class='ctx'>         GenerateMapFile(unset),</div><div class='ctx'>         HeapCommitSize(-1),</div><div class='hunk'>@@ -1149,6 +1142,7 @@ VCLinkerTool::VCLinkerTool()</div><div class='ctx'>         MapLines(unset),</div><div class='ctx'>         OptimizeForWindows98(optWin98Default),</div><div class='ctx'>         OptimizeReferences(optReferencesDefault),</div><div class='add'>+        RandomizedBaseAddress(unset),</div><div class='ctx'>         RegisterOutput(unset),</div><div class='ctx'>         ResourceOnlyDLL(unset),</div><div class='ctx'>         SetChecksum(unset),</div><div class='hunk'>@@ -1162,72 +1156,21 @@ VCLinkerTool::VCLinkerTool()</div><div class='ctx'>         SwapRunFromNet(unset),</div><div class='ctx'>         TargetMachine(machineNotSet),</div><div class='ctx'>         TerminalServerAware(termSvrAwareDefault),</div><div class='add'>+        TreatWarningsAsErrors(unset),</div><div class='ctx'>         TurnOffAssemblyGeneration(unset),</div><div class='del'>-        TypeLibraryResourceID(0)</div><div class='add'>+        TypeLibraryResourceID(0),</div><div class='add'>+        GenerateManifest(unset),</div><div class='add'>+        EnableUAC(unset),</div><div class='add'>+        UACUIAccess(unset),</div><div class='add'>+        SectionAlignment(-1),</div><div class='add'>+        PreventDllBinding(unset),</div><div class='add'>+        AllowIsolation(unset),</div><div class='add'>+        AssemblyDebug(unset),</div><div class='add'>+        CLRUnmanagedCodeCheck(unset),</div><div class='add'>+        DelaySign(unset)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCLinkerTool &amp;tool)</div><div class='del'>-{</div><div class='del'>-    return xml</div><div class='del'>-        &lt;&lt; tag(_Tool)</div><div class='del'>-            &lt;&lt; attrS(_Name, _VCLinkerTool)</div><div class='del'>-            &lt;&lt; attrX(_AdditionalDependencies, tool.AdditionalDependencies, " ")</div><div class='del'>-            &lt;&lt; attrX(_AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories)</div><div class='del'>-            &lt;&lt; attrX(_AdditionalOptions, tool.AdditionalOptions, " ")</div><div class='del'>-            &lt;&lt; attrX(_AddModuleNamesToAssembly, tool.AddModuleNamesToAssembly)</div><div class='del'>-            &lt;&lt; attrS(_BaseAddress, tool.BaseAddress)</div><div class='del'>-            &lt;&lt; attrX(_DelayLoadDLLs, tool.DelayLoadDLLs)</div><div class='del'>-            &lt;&lt; attrE(_EnableCOMDATFolding, tool.EnableCOMDATFolding, /*ifNot*/ optFoldingDefault)</div><div class='del'>-            &lt;&lt; attrS(_EntryPointSymbol, tool.EntryPointSymbol)</div><div class='del'>-            &lt;&lt; attrX(_ForceSymbolReferences, tool.ForceSymbolReferences)</div><div class='del'>-            &lt;&lt; attrS(_FunctionOrder, tool.FunctionOrder)</div><div class='del'>-            &lt;&lt; attrT(_GenerateDebugInformation, tool.GenerateDebugInformation)</div><div class='del'>-            &lt;&lt; attrT(_GenerateMapFile, tool.GenerateMapFile)</div><div class='del'>-            &lt;&lt; attrL(_HeapCommitSize, tool.HeapCommitSize, /*ifNot*/ -1)</div><div class='del'>-            &lt;&lt; attrL(_HeapReserveSize, tool.HeapReserveSize, /*ifNot*/ -1)</div><div class='del'>-            &lt;&lt; attrT(_IgnoreAllDefaultLibraries, tool.IgnoreAllDefaultLibraries)</div><div class='del'>-            &lt;&lt; attrX(_IgnoreDefaultLibraryNames, tool.IgnoreDefaultLibraryNames)</div><div class='del'>-            &lt;&lt; attrT(_IgnoreEmbeddedIDL, tool.IgnoreEmbeddedIDL)</div><div class='del'>-            &lt;&lt; attrT(_IgnoreImportLibrary, tool.IgnoreImportLibrary)</div><div class='del'>-            &lt;&lt; attrS(_ImportLibrary, tool.ImportLibrary)</div><div class='del'>-            &lt;&lt; attrE(_LargeAddressAware, tool.LargeAddressAware, /*ifNot*/ addrAwareDefault)</div><div class='del'>-            &lt;&lt; attrT(_LinkDLL, tool.LinkDLL)</div><div class='del'>-            &lt;&lt; attrE(_LinkIncremental, tool.LinkIncremental, /*ifNot*/ linkIncrementalDefault)</div><div class='del'>-            &lt;&lt; attrE(_LinkTimeCodeGeneration, tool.LinkTimeCodeGeneration)</div><div class='del'>-            &lt;&lt; attrS(_LinkToManagedResourceFile, tool.LinkToManagedResourceFile)</div><div class='del'>-            &lt;&lt; attrT(_MapExports, tool.MapExports)</div><div class='del'>-            &lt;&lt; attrS(_MapFileName, tool.MapFileName)</div><div class='del'>-            &lt;&lt; attrT(_MapLines, tool.MapLines)</div><div class='del'>-            &lt;&lt; attrS(_MergedIDLBaseFileName, tool.MergedIDLBaseFileName)</div><div class='del'>-            &lt;&lt; attrS(_MergeSections, tool.MergeSections)</div><div class='del'>-            &lt;&lt; attrS(_MidlCommandFile, tool.MidlCommandFile)</div><div class='del'>-            &lt;&lt; attrS(_ModuleDefinitionFile, tool.ModuleDefinitionFile)</div><div class='del'>-            &lt;&lt; attrE(_OptimizeForWindows98, tool.OptimizeForWindows98, /*ifNot*/ optWin98Default)</div><div class='del'>-            &lt;&lt; attrE(_OptimizeReferences, tool.OptimizeReferences, /*ifNot*/ optReferencesDefault)</div><div class='del'>-            &lt;&lt; attrS(_OutputFile, tool.OutputFile)</div><div class='del'>-            &lt;&lt; attr(_ProgramDatabaseFile, tool.ProgramDatabaseFile)</div><div class='del'>-            &lt;&lt; attrT(_RegisterOutput, tool.RegisterOutput)</div><div class='del'>-            &lt;&lt; attrT(_ResourceOnlyDLL, tool.ResourceOnlyDLL)</div><div class='del'>-            &lt;&lt; attrT(_SetChecksum, tool.SetChecksum)</div><div class='del'>-            &lt;&lt; attrE(_ShowProgress, tool.ShowProgress, /*ifNot*/ linkProgressNotSet)</div><div class='del'>-            &lt;&lt; attrL(_StackCommitSize, tool.StackCommitSize, /*ifNot*/ -1)</div><div class='del'>-            &lt;&lt; attrL(_StackReserveSize, tool.StackReserveSize, /*ifNot*/ -1)</div><div class='del'>-            &lt;&lt; attrS(_StripPrivateSymbols, tool.StripPrivateSymbols)</div><div class='del'>-            &lt;&lt; attrE(_SubSystem, tool.SubSystem)</div><div class='del'>-            &lt;&lt; attrT(_SupportUnloadOfDelayLoadedDLL, tool.SupportUnloadOfDelayLoadedDLL)</div><div class='del'>-            &lt;&lt; attrT(_SuppressStartupBanner, tool.SuppressStartupBanner)</div><div class='del'>-            &lt;&lt; attrT(_SwapRunFromCD, tool.SwapRunFromCD)</div><div class='del'>-            &lt;&lt; attrT(_SwapRunFromNet, tool.SwapRunFromNet)</div><div class='del'>-            &lt;&lt; attrE(_TargetMachine, tool.TargetMachine, /*ifNot*/ machineNotSet)</div><div class='del'>-            &lt;&lt; attrE(_TerminalServerAware, tool.TerminalServerAware, /*ifNot*/ termSvrAwareDefault)</div><div class='del'>-            &lt;&lt; attrT(_TurnOffAssemblyGeneration, tool.TurnOffAssemblyGeneration)</div><div class='del'>-            &lt;&lt; attrS(_TypeLibraryFile, tool.TypeLibraryFile)</div><div class='del'>-            &lt;&lt; attrL(_TypeLibraryResourceID, tool.TypeLibraryResourceID, /*ifNot*/ rcUseDefault)</div><div class='del'>-            &lt;&lt; attrS(_Version, tool.Version)</div><div class='del'>-        &lt;&lt; closetag(_Tool);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> // Hashing routine to do fast option lookups ----</div><div class='ctx'> // Slightly rewritten to stop on ':' ',' and '\0'</div><div class='ctx'> // Original routine in qtranslator.cpp ----------</div><div class='hunk'>@@ -1297,26 +1240,57 @@ bool VCLinkerTool::parseOption(const char* option)</div><div class='ctx'>     displayHash("POSIX"); displayHash("WINDOWS"); displayHash("WINDOWSCE"); displayHash("NET"); displayHash("CD"); displayHash("NO");</div><div class='ctx'> #endif</div><div class='ctx'>     bool found = true;</div><div class='del'>-    switch (elfHash(option)) {</div><div class='del'>-    case 0x3360dbe: // /ALIGN[:number]</div><div class='del'>-    case 0x1485c34: // /ALLOWBIND[:NO]</div><div class='add'>+    const uint optionHash = elfHash(option);</div><div class='add'>+    if (config-&gt;CompilerVersion &lt; NET2010) {</div><div class='add'>+        switch (optionHash) {</div><div class='add'>+        case 0x3360dbe: // /ALIGN[:number]</div><div class='add'>+        case 0x1485c34: // /ALLOWBIND[:NO]</div><div class='add'>+        case 0x33aec94: // /FIXED[:NO]</div><div class='add'>+        case 0x7988f7e: // /SECTION:name,[E][R][W][S][D][K][L][P][X][,ALIGN=#]</div><div class='add'>+        case 0x0348992: // /STUB:filename</div><div class='add'>+            AdditionalOptions += option;</div><div class='add'>+            return true;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    switch (optionHash) {</div><div class='ctx'>     case 0x6b21972: // /DEFAULTLIB:library</div><div class='ctx'>     case 0x396ea92: // /DRIVER[:UPONLY | :WDM]</div><div class='ctx'>     case 0xaca9d75: // /EXETYPE[:DYNAMIC | :DEV386]</div><div class='ctx'>     case 0x3ad5444: // /EXPORT:entryname[,@ordinal[,NONAME]][,DATA]</div><div class='del'>-    case 0x33aec94: // /FIXED[:NO]</div><div class='ctx'>     case 0x33b4675: // /FORCE:[MULTIPLE|UNRESOLVED]</div><div class='ctx'>     case 0x3dc3455: // /IGNORE:number,number,number,number  ### NOTE: This one is undocumented, but it is even used by Microsoft.</div><div class='ctx'>                     //                                      In recent versions of the Microsoft linker they have disabled this undocumented feature.</div><div class='del'>-    case 0x7988f7e: // /SECTION:name,[E][R][W][S][D][K][L][P][X][,ALIGN=#]</div><div class='del'>-    case 0x0348992: // /STUB:filename</div><div class='ctx'>     case 0x0034bc4: // /VXD</div><div class='del'>-    case 0x0034c50: // /WS</div><div class='ctx'>         AdditionalOptions += option;</div><div class='ctx'>         break;</div><div class='add'>+    case 0x3360dbe: // /ALIGN[:number]</div><div class='add'>+        SectionAlignment = QString(option+7).toLongLong();</div><div class='add'>+        break;</div><div class='add'>+    case 0x1485c34: // /ALLOWBIND[:NO]</div><div class='add'>+        if(*(option+10) == ':' &amp;&amp; (*(option+11) == 'n' || *(option+11) == 'N'))</div><div class='add'>+            PreventDllBinding = _False;</div><div class='add'>+        else</div><div class='add'>+            PreventDllBinding = _True;</div><div class='add'>+        break;</div><div class='add'>+    case 0x312011e: // /ALLOWISOLATION[:NO]</div><div class='add'>+        if(*(option+15) == ':' &amp;&amp; (*(option+16) == 'n' || *(option+16) == 'N'))</div><div class='add'>+            AllowIsolation = _False;</div><div class='add'>+        else</div><div class='add'>+            AllowIsolation = _True;</div><div class='add'>+        break;</div><div class='ctx'>     case 0x679c075: // /ASSEMBLYMODULE:filename</div><div class='ctx'>         AddModuleNamesToAssembly += option+15;</div><div class='ctx'>         break;</div><div class='add'>+    case 0x75f35f7: // /ASSEMBLYDEBUG[:DISABLE]</div><div class='add'>+        if(*(option+14) == ':' &amp;&amp; (*(option+15) == 'D'))</div><div class='add'>+            AssemblyDebug = _False;</div><div class='add'>+        else</div><div class='add'>+            AssemblyDebug = _True;</div><div class='add'>+        break;</div><div class='add'>+    case 0x43294a5: // /ASSEMBLYLINKRESOURCE:filename</div><div class='add'>+            AssemblyLinkResource += option+22;</div><div class='add'>+        break;</div><div class='ctx'>     case 0x062d065: // /ASSEMBLYRESOURCE:filename</div><div class='ctx'>         LinkToManagedResourceFile = option+18;</div><div class='ctx'>         break;</div><div class='hunk'>@@ -1326,6 +1300,71 @@ bool VCLinkerTool::parseOption(const char* option)</div><div class='ctx'>         // We don't use it in Qt, so keep it simple for now</div><div class='ctx'>         BaseAddress = option+6;</div><div class='ctx'>         break;</div><div class='add'>+    case 0x63bf065: // /CLRIMAGETYPE:{IJW|PURE|SAFE}</div><div class='add'>+        if(*(option+14) == 'I')</div><div class='add'>+            CLRImageType = "ForceIJWImage";</div><div class='add'>+        else if(*(option+14) == 'P')</div><div class='add'>+            CLRImageType = "ForcePureILImage";</div><div class='add'>+        else if(*(option+14) == 'S')</div><div class='add'>+            CLRImageType = "ForceSafeILImage";</div><div class='add'>+        break;</div><div class='add'>+    case 0x5f2a6a2: // /CLRSUPPORTLASTERROR{:NO | SYSTEMDLL}</div><div class='add'>+        if(*(option+20) == ':') {</div><div class='add'>+            if(*(option+21) == 'N') {</div><div class='add'>+                CLRSupportLastError = "Disabled";</div><div class='add'>+            } else if(*(option+21) == 'S') {</div><div class='add'>+                CLRSupportLastError = "SystemDlls";</div><div class='add'>+            }</div><div class='add'>+        } else {</div><div class='add'>+            CLRSupportLastError = "Enabled";</div><div class='add'>+        }</div><div class='add'>+        break;</div><div class='add'>+    case 0xc7984f5: // /CLRTHREADATTRIBUTE:{STA|MTA|NONE}</div><div class='add'>+        if(*(option+20) == 'N')</div><div class='add'>+            CLRThreadAttribute = "DefaultThreadingAttribute";</div><div class='add'>+        else if(*(option+20) == 'M')</div><div class='add'>+            CLRThreadAttribute = "MTAThreadingAttribute";</div><div class='add'>+        else if(*(option+20) == 'S')</div><div class='add'>+            CLRThreadAttribute = "STAThreadingAttribute";</div><div class='add'>+        break;</div><div class='add'>+    case 0xa8c637b: // /CLRUNMANAGEDCODECHECK[:NO]</div><div class='add'>+        if(*(option+23) == 'N')</div><div class='add'>+            CLRUnmanagedCodeCheck = _False;</div><div class='add'>+        else</div><div class='add'>+            CLRUnmanagedCodeCheck = _True;</div><div class='add'>+        break;</div><div class='add'>+    case 0x62d9e94: // /MANIFEST[:NO]</div><div class='add'>+        if ((*(option+9) == ':' &amp;&amp; (*(option+10) == 'N' || *(option+10) == 'n')))</div><div class='add'>+            GenerateManifest = _False;</div><div class='add'>+        else</div><div class='add'>+            GenerateManifest = _True;</div><div class='add'>+        break;</div><div class='add'>+    case 0x8b64559: // /MANIFESTDEPENDENCY:manifest_dependency</div><div class='add'>+        AdditionalManifestDependencies += option+20;</div><div class='add'>+        break;</div><div class='add'>+    case 0xe9e8195: // /MANIFESTFILE:filename</div><div class='add'>+        ManifestFile = option+14;</div><div class='add'>+        break;</div><div class='add'>+    case 0x9e9fb83: // /MANIFESTUAC http://msdn.microsoft.com/en-us/library/bb384691%28VS.100%29.aspx</div><div class='add'>+        if ((*(option+12) == ':' &amp;&amp; (*(option+13) == 'N' || *(option+13) == 'n')))</div><div class='add'>+            EnableUAC = _False;</div><div class='add'>+        else if((*(option+12) == ':' &amp;&amp; (*(option+13) == 'l' || *(option+14) == 'e'))) { // level</div><div class='add'>+            if(*(option+20) == 'a')</div><div class='add'>+                UACExecutionLevel = "AsInvoker";</div><div class='add'>+            else if(*(option+20) == 'h')</div><div class='add'>+                UACExecutionLevel = "HighestAvailable";</div><div class='add'>+            else if(*(option+20) == 'r')</div><div class='add'>+                UACExecutionLevel = "RequireAdministrator";</div><div class='add'>+        } else if((*(option+12) == ':' &amp;&amp; (*(option+13) == 'u' || *(option+14) == 'i'))) { // uiAccess</div><div class='add'>+            if(*(option+22) == 't')</div><div class='add'>+                UACUIAccess = _True;</div><div class='add'>+            else</div><div class='add'>+                UACUIAccess = _False;</div><div class='add'>+        } else if((*(option+12) == ':' &amp;&amp; (*(option+13) == 'f' || *(option+14) == 'r'))) { // fragment</div><div class='add'>+            AdditionalOptions += option;</div><div class='add'>+        }else</div><div class='add'>+            EnableUAC = _True;</div><div class='add'>+        break;</div><div class='ctx'>     case 0x3389797: // /DEBUG</div><div class='ctx'>         GenerateDebugInformation = _True;</div><div class='ctx'>         break;</div><div class='hunk'>@@ -1340,12 +1379,36 @@ bool VCLinkerTool::parseOption(const char* option)</div><div class='ctx'>     case 0x06f4bf4: // /DELAYLOAD:dllname</div><div class='ctx'>         DelayLoadDLLs += option+11;</div><div class='ctx'>         break;</div><div class='add'>+    case 0x06d451e: // /DELAYSIGN[:NO]</div><div class='add'>+        if(*(option+10) == ':' &amp;&amp; (*(option+11) == 'n' || *(option+11) == 'N'))</div><div class='add'>+            DelaySign = _False;</div><div class='add'>+        else</div><div class='add'>+            DelaySign = _True;</div><div class='add'>+        break;</div><div class='ctx'>     case 0x003390c: // /DLL</div><div class='ctx'>         // This option is not used for vcproj files</div><div class='ctx'>         break;</div><div class='add'>+    case 0x2ee8415: // /DYNAMICBASE[:NO]</div><div class='add'>+        if(*(option+12) == ':' &amp;&amp; (*(option+13) == 'n' || *(option+13) == 'N'))</div><div class='add'>+            RandomizedBaseAddress = _False;</div><div class='add'>+        else</div><div class='add'>+            RandomizedBaseAddress = _True;</div><div class='add'>+        break;</div><div class='ctx'>     case 0x33a3979: // /ENTRY:function</div><div class='ctx'>         EntryPointSymbol = option+7;</div><div class='ctx'>         break;</div><div class='add'>+    case 0x4504334: // /ERRORREPORT:[ NONE | PROMPT | QUEUE | SEND ]</div><div class='add'>+        if(*(option+12) == ':' ) {</div><div class='add'>+            if(*(option+13) == 'N')</div><div class='add'>+                LinkErrorReporting = "NoErrorReport";</div><div class='add'>+            else if(*(option+13) == 'P')</div><div class='add'>+                LinkErrorReporting = "PromptImmediately";</div><div class='add'>+            else if(*(option+13) == 'Q')</div><div class='add'>+                LinkErrorReporting = "QueueForNextLogin";</div><div class='add'>+            else if(*(option+13) == 'S')</div><div class='add'>+                LinkErrorReporting = "SendErrorReport";</div><div class='add'>+        }</div><div class='add'>+        break;</div><div class='ctx'>     case 0x033c960: // /HEAP:reserve[,commit]</div><div class='ctx'>         {</div><div class='ctx'>             QStringList both = QString(option+6).split(",");</div><div class='hunk'>@@ -1373,6 +1436,12 @@ bool VCLinkerTool::parseOption(const char* option)</div><div class='ctx'>         else</div><div class='ctx'>             LinkIncremental = linkIncrementalYes;</div><div class='ctx'>         break;</div><div class='add'>+    case 0x07f1ab2: // /KEYCONTAINER:name</div><div class='add'>+        KeyContainer = option+14;</div><div class='add'>+        break;</div><div class='add'>+    case 0xfadaf35: // /KEYFILE:filename</div><div class='add'>+        KeyFile = option+9;</div><div class='add'>+        break;</div><div class='ctx'>     case 0x26e4675: // /LARGEADDRESSAWARE[:no]</div><div class='ctx'>         if(*(option+18) == ':' &amp;&amp;</div><div class='ctx'>              *(option+19) == 'n')</div><div class='hunk'>@@ -1478,6 +1547,12 @@ bool VCLinkerTool::parseOption(const char* option)</div><div class='ctx'>     case 0x434138f: // /NOLOGO</div><div class='ctx'>         SuppressStartupBanner = _True;</div><div class='ctx'>         break;</div><div class='add'>+    case 0xc841054: // /NXCOMPAT[:NO]</div><div class='add'>+        if ((*(option+9) == ':' &amp;&amp; (*(option+10) == 'N' || *(option+10) == 'n')))</div><div class='add'>+            DataExecutionPrevention = _False;</div><div class='add'>+        else</div><div class='add'>+            DataExecutionPrevention = _True;</div><div class='add'>+        break;</div><div class='ctx'>     case 0x0034454: // /OPT:{REF | NOREF | ICF[=iterations] | NOICF | WIN98 | NOWIN98}</div><div class='ctx'>         {</div><div class='ctx'>             char third = *(option+7);</div><div class='hunk'>@@ -1555,7 +1630,7 @@ bool VCLinkerTool::parseOption(const char* option)</div><div class='ctx'>             case 0x5268ea5: // NATIVE</div><div class='ctx'>             case 0x05547e8: // POSIX</div><div class='ctx'>             case 0x2949c95: // WINDOWSCE</div><div class='del'>-			case 0x4B69795: // windowsce</div><div class='add'>+            case 0x4B69795: // windowsce</div><div class='ctx'>                 AdditionalOptions += option;</div><div class='ctx'>                 break;</div><div class='ctx'>             default:</div><div class='hunk'>@@ -1594,6 +1669,16 @@ bool VCLinkerTool::parseOption(const char* option)</div><div class='ctx'>     case 0xaa77f7e: // /VERSION:major[.minor]</div><div class='ctx'>         Version = option+9;</div><div class='ctx'>         break;</div><div class='add'>+    case 0x0034c50: // /WS[:NO]</div><div class='add'>+        if (config-&gt;CompilerVersion &gt;= NET2010) {</div><div class='add'>+            if(*(option+3) == ':')</div><div class='add'>+                TreatWarningsAsErrors = _False;</div><div class='add'>+            else</div><div class='add'>+                TreatWarningsAsErrors = _True;</div><div class='add'>+        } else {</div><div class='add'>+            AdditionalOptions += option;</div><div class='add'>+        }</div><div class='add'>+        break;</div><div class='ctx'>     default:</div><div class='ctx'>         AdditionalOptions += option;</div><div class='ctx'>         break;</div><div class='hunk'>@@ -1623,48 +1708,14 @@ VCMIDLTool::VCMIDLTool()</div><div class='ctx'>         TargetEnvironment(midlTargetNotSet),</div><div class='ctx'>         ValidateParameters(unset),</div><div class='ctx'>         WarnAsError(unset),</div><div class='del'>-        WarningLevel(midlWarningLevel_0)</div><div class='add'>+        WarningLevel(midlWarningLevel_0),</div><div class='add'>+        ApplicationConfigurationMode(unset),</div><div class='add'>+        ValidateAllParameters(unset),</div><div class='add'>+        SuppressCompilerWarnings(unset),</div><div class='add'>+        LocaleID(-1)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCMIDLTool &amp;tool)</div><div class='del'>-{</div><div class='del'>-    return xml</div><div class='del'>-        &lt;&lt; tag(_Tool)</div><div class='del'>-            &lt;&lt; attrS(_Name, _VCMIDLTool)</div><div class='del'>-            &lt;&lt; attrX(_AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories)</div><div class='del'>-            &lt;&lt; attrX(_AdditionalOptions, tool.AdditionalOptions, " ")</div><div class='del'>-            &lt;&lt; attrX(_CPreprocessOptions, tool.CPreprocessOptions)</div><div class='del'>-            &lt;&lt; attrE(_DefaultCharType, tool.DefaultCharType)</div><div class='del'>-            &lt;&lt; attrS(_DLLDataFileName, tool.DLLDataFileName)</div><div class='del'>-            &lt;&lt; attrE(_EnableErrorChecks, tool.EnableErrorChecks)</div><div class='del'>-            &lt;&lt; attrT(_ErrorCheckAllocations, tool.ErrorCheckAllocations)</div><div class='del'>-            &lt;&lt; attrT(_ErrorCheckBounds, tool.ErrorCheckBounds)</div><div class='del'>-            &lt;&lt; attrT(_ErrorCheckEnumRange, tool.ErrorCheckEnumRange)</div><div class='del'>-            &lt;&lt; attrT(_ErrorCheckRefPointers, tool.ErrorCheckRefPointers)</div><div class='del'>-            &lt;&lt; attrT(_ErrorCheckStubData, tool.ErrorCheckStubData)</div><div class='del'>-            &lt;&lt; attrX(_FullIncludePath, tool.FullIncludePath)</div><div class='del'>-            &lt;&lt; attrT(_GenerateStublessProxies, tool.GenerateStublessProxies)</div><div class='del'>-            &lt;&lt; attrT(_GenerateTypeLibrary, tool.GenerateTypeLibrary)</div><div class='del'>-            &lt;&lt; attrS(_HeaderFileName, tool.HeaderFileName)</div><div class='del'>-            &lt;&lt; attrT(_IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath)</div><div class='del'>-            &lt;&lt; attrS(_InterfaceIdentifierFileName, tool.InterfaceIdentifierFileName)</div><div class='del'>-            &lt;&lt; attrT(_MkTypLibCompatible, tool.MkTypLibCompatible)</div><div class='del'>-            &lt;&lt; attrS(_OutputDirectory, tool.OutputDirectory)</div><div class='del'>-            &lt;&lt; attrX(_PreprocessorDefinitions, tool.PreprocessorDefinitions)</div><div class='del'>-            &lt;&lt; attrS(_ProxyFileName, tool.ProxyFileName)</div><div class='del'>-            &lt;&lt; attrS(_RedirectOutputAndErrors, tool.RedirectOutputAndErrors)</div><div class='del'>-            &lt;&lt; attrE(_StructMemberAlignment, tool.StructMemberAlignment, /*ifNot*/ midlAlignNotSet)</div><div class='del'>-            &lt;&lt; attrT(_SuppressStartupBanner, tool.SuppressStartupBanner)</div><div class='del'>-            &lt;&lt; attrE(_TargetEnvironment, tool.TargetEnvironment, /*ifNot*/ midlTargetNotSet)</div><div class='del'>-            &lt;&lt; attrS(_TypeLibraryName, tool.TypeLibraryName)</div><div class='del'>-            &lt;&lt; attrX(_UndefinePreprocessorDefinitions, tool.UndefinePreprocessorDefinitions)</div><div class='del'>-            &lt;&lt; attrT(_ValidateParameters, tool.ValidateParameters)</div><div class='del'>-            &lt;&lt; attrT(_WarnAsError, tool.WarnAsError)</div><div class='del'>-            &lt;&lt; attrE(_WarningLevel, tool.WarningLevel)</div><div class='del'>-        &lt;&lt; closetag(_Tool);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> bool VCMIDLTool::parseOption(const char* option)</div><div class='ctx'> {</div><div class='ctx'> #ifdef USE_DISPLAY_HASH</div><div class='hunk'>@@ -1697,7 +1748,25 @@ bool VCMIDLTool::parseOption(const char* option)</div><div class='ctx'> #endif</div><div class='ctx'>     bool found = true;</div><div class='ctx'>     int offset = 0;</div><div class='del'>-    switch(elfHash(option)) {</div><div class='add'>+</div><div class='add'>+    const uint optionHash = elfHash(option);</div><div class='add'>+</div><div class='add'>+    if (config-&gt;CompilerVersion &lt; NET2010) {</div><div class='add'>+        switch (optionHash) {</div><div class='add'>+        case 0x5b1cb97: // /app_config</div><div class='add'>+        case 0x5a2fc64: // /client {none|stub}</div><div class='add'>+        case 0x35aabb2: // /cstub filename</div><div class='add'>+        case 0x64ceb12: // /newtlb</div><div class='add'>+        case 0x556dbee: // /no_warn</div><div class='add'>+        case 0x662bb12: // /oldtlb</div><div class='add'>+        case 0x69c9cf2: // /server {none|stub}</div><div class='add'>+        case 0x36aabb2: // /sstub filename</div><div class='add'>+            AdditionalOptions += option;</div><div class='add'>+            return true;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    switch(optionHash) {</div><div class='ctx'>     case 0x0000334: // /D name[=def]</div><div class='ctx'>         PreprocessorDefinitions += option+3;</div><div class='ctx'>         break;</div><div class='hunk'>@@ -1734,6 +1803,9 @@ bool VCMIDLTool::parseOption(const char* option)</div><div class='ctx'>             found = false;</div><div class='ctx'>         }</div><div class='ctx'>         break;</div><div class='add'>+    case 0x5b1cb97: // /app_config</div><div class='add'>+        ApplicationConfigurationMode = _True;</div><div class='add'>+        break;</div><div class='ctx'>     case 0x0359e82: // /char {ascii7|signed|unsigned}</div><div class='ctx'>         switch(*(option+6)) {</div><div class='ctx'>         case 'a':</div><div class='hunk'>@@ -1749,9 +1821,18 @@ bool VCMIDLTool::parseOption(const char* option)</div><div class='ctx'>             found = false;</div><div class='ctx'>         }</div><div class='ctx'>         break;</div><div class='add'>+    case 0x5a2fc64: // /client {none|stub}</div><div class='add'>+        if(*(option+8) == 's')</div><div class='add'>+            GenerateClientFiles = "Stub";</div><div class='add'>+        else</div><div class='add'>+            GenerateClientFiles = "None";</div><div class='add'>+        break;</div><div class='ctx'>     case 0xa766524: // /cpp_opt options</div><div class='ctx'>         CPreprocessOptions += option+9;</div><div class='ctx'>         break;</div><div class='add'>+    case 0x35aabb2: // /cstub filename</div><div class='add'>+        ClientStubFile = option+7;</div><div class='add'>+        break;</div><div class='ctx'>     case 0xb32abf1: // /dlldata filename</div><div class='ctx'>         DLLDataFileName = option + 9;</div><div class='ctx'>         break;</div><div class='hunk'>@@ -1797,18 +1878,30 @@ bool VCMIDLTool::parseOption(const char* option)</div><div class='ctx'>     case 0x64b7933: // /mktyplib203</div><div class='ctx'>         MkTypLibCompatible = _True;</div><div class='ctx'>         break;</div><div class='add'>+    case 0x64ceb12: // /newtlb</div><div class='add'>+        TypeLibFormat = "NewFormat";</div><div class='add'>+        break;</div><div class='ctx'>     case 0x8e0b0a2: // /no_def_idir</div><div class='ctx'>         IgnoreStandardIncludePath = _True;</div><div class='ctx'>         break;</div><div class='ctx'>     case 0x65635ef: // /nologo</div><div class='ctx'>         SuppressStartupBanner = _True;</div><div class='ctx'>         break;</div><div class='add'>+    case 0x695e9f4: // /no_robust</div><div class='add'>+        ValidateAllParameters = _False;</div><div class='add'>+        break;</div><div class='ctx'>     case 0x3656b22: // /notlb</div><div class='ctx'>         GenerateTypeLibrary = _True;</div><div class='ctx'>         break;</div><div class='add'>+    case 0x556dbee: // /no_warn</div><div class='add'>+        SuppressCompilerWarnings = _True;</div><div class='add'>+        break;</div><div class='ctx'>     case 0x000035f: // /o filename</div><div class='ctx'>         RedirectOutputAndErrors = option+3;</div><div class='ctx'>         break;</div><div class='add'>+    case 0x662bb12: // /oldtlb</div><div class='add'>+        TypeLibFormat = "OldFormat";</div><div class='add'>+        break;</div><div class='ctx'>     case 0x00366c4: // /out directory</div><div class='ctx'>         OutputDirectory = option+5;</div><div class='ctx'>         break;</div><div class='hunk'>@@ -1824,6 +1917,15 @@ bool VCMIDLTool::parseOption(const char* option)</div><div class='ctx'>         else</div><div class='ctx'>             TargetEnvironment = midlTargetWin32;</div><div class='ctx'>         break;</div><div class='add'>+    case 0x69c9cf2: // /server {none|stub}</div><div class='add'>+        if(*(option+8) == 's')</div><div class='add'>+            GenerateServerFiles = "Stub";</div><div class='add'>+        else</div><div class='add'>+            GenerateServerFiles = "None";</div><div class='add'>+        break;</div><div class='add'>+    case 0x36aabb2: // /sstub filename</div><div class='add'>+        ServerStubFile = option+7;</div><div class='add'>+        break;</div><div class='ctx'>     case 0x0036b22: // /tlb filename</div><div class='ctx'>         TypeLibraryName = option+5;</div><div class='ctx'>         break;</div><div class='hunk'>@@ -1838,32 +1940,24 @@ bool VCMIDLTool::parseOption(const char* option)</div><div class='ctx'>     case 0x0003463: // /Os</div><div class='ctx'>     case 0x0003513: // /Zs</div><div class='ctx'>     case 0x0035796: // /acf filename</div><div class='del'>-    case 0x5b1cb97: // /app_config</div><div class='ctx'>     case 0x3595cf4: // /c_ext</div><div class='del'>-    case 0x5a2fc64: // /client {none|stub}</div><div class='ctx'>     case 0xa64d3dd: // /confirm</div><div class='ctx'>     case 0xa765b64: // /cpp_cmd cmd_line</div><div class='del'>-    case 0x35aabb2: // /cstub filename</div><div class='ctx'>     case 0x03629f4: // /lcid</div><div class='ctx'>     case 0x6495cc4: // /ms_ext</div><div class='ctx'>     case 0x96c7a1e: // /ms_union</div><div class='ctx'>     case 0x4996fa2: // /msc_ver &lt;nnnn&gt;</div><div class='del'>-    case 0x64ceb12: // /newtlb</div><div class='ctx'>     case 0x6555a40: // /no_cpp</div><div class='ctx'>     case 0xf64d6a6: // /no_default_epv</div><div class='ctx'>     case 0x6dd9384: // /no_format_opt</div><div class='del'>-    case 0x556dbee: // /no_warn</div><div class='ctx'>     case 0x3655a70: // /nocpp</div><div class='ctx'>     case 0x2b455a3: // /oldnames</div><div class='del'>-    case 0x662bb12: // /oldtlb</div><div class='ctx'>     case 0x0036696: // /osf</div><div class='ctx'>     case 0x036679b: // /pack {N}</div><div class='ctx'>     case 0x678bd38: // /prefix {all|client|server|switch}</div><div class='ctx'>     case 0x96b702c: // /protocol {all|dce|ndr64}</div><div class='ctx'>     case 0x3696aa3: // /rpcss</div><div class='ctx'>     case 0x698ca60: // /savePP</div><div class='del'>-    case 0x69c9cf2: // /server {none|stub}</div><div class='del'>-    case 0x36aabb2: // /sstub filename</div><div class='ctx'>     case 0xce9b12b: // /syntax_check</div><div class='ctx'>     case 0xc9b5f16: // /use_epv</div><div class='ctx'>         AdditionalOptions += option;</div><div class='hunk'>@@ -1905,69 +1999,22 @@ VCLibrarianTool::VCLibrarianTool()</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCLibrarianTool &amp;tool)</div><div class='del'>-{</div><div class='del'>-    return xml</div><div class='del'>-        &lt;&lt; tag(_Tool)</div><div class='del'>-            &lt;&lt; attrS(_Name, _VCLibrarianTool)</div><div class='del'>-            &lt;&lt; attrX(_AdditionalDependencies, tool.AdditionalDependencies)</div><div class='del'>-            &lt;&lt; attrX(_AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories)</div><div class='del'>-            &lt;&lt; attrX(_AdditionalOptions, tool.AdditionalOptions, " ")</div><div class='del'>-            &lt;&lt; attrX(_ExportNamedFunctions, tool.ExportNamedFunctions)</div><div class='del'>-            &lt;&lt; attrX(_ForceSymbolReferences, tool.ForceSymbolReferences)</div><div class='del'>-            &lt;&lt; attrT(_IgnoreAllDefaultLibraries, tool.IgnoreAllDefaultLibraries)</div><div class='del'>-            &lt;&lt; attrX(_IgnoreDefaultLibraryNames, tool.IgnoreDefaultLibraryNames)</div><div class='del'>-            &lt;&lt; attrS(_ModuleDefinitionFile, tool.ModuleDefinitionFile)</div><div class='del'>-            &lt;&lt; attrS(_OutputFile, tool.OutputFile)</div><div class='del'>-            &lt;&lt; attrT(_SuppressStartupBanner, tool.SuppressStartupBanner)</div><div class='del'>-        &lt;&lt; closetag(_Tool);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> // VCCustomBuildTool ------------------------------------------------</div><div class='ctx'> VCCustomBuildTool::VCCustomBuildTool()</div><div class='ctx'> {</div><div class='ctx'>     ToolName = "VCCustomBuildTool";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCCustomBuildTool &amp;tool)</div><div class='del'>-{</div><div class='del'>-    return xml</div><div class='del'>-        &lt;&lt; tag(_Tool)</div><div class='del'>-            &lt;&lt; attrS(_Name, tool.ToolName)</div><div class='del'>-            &lt;&lt; attrX(_AdditionalDependencies, tool.AdditionalDependencies, ";")</div><div class='del'>-            &lt;&lt; attrS(_CommandLine, tool.CommandLine.join(vcCommandSeparator()))</div><div class='del'>-            &lt;&lt; attrS(_Description, tool.Description)</div><div class='del'>-            &lt;&lt; attrX(_Outputs, tool.Outputs, ";")</div><div class='del'>-            &lt;&lt; attrS(_Path, tool.ToolPath)</div><div class='del'>-        &lt;&lt; closetag(_Tool);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> // VCResourceCompilerTool -------------------------------------------</div><div class='ctx'> VCResourceCompilerTool::VCResourceCompilerTool()</div><div class='ctx'>     :   Culture(rcUseDefault),</div><div class='ctx'>         IgnoreStandardIncludePath(unset),</div><div class='del'>-        ShowProgress(linkProgressNotSet)</div><div class='add'>+        ShowProgress(linkProgressNotSet),</div><div class='add'>+        SuppressStartupBanner(unset)</div><div class='ctx'> {</div><div class='ctx'>     PreprocessorDefinitions = QStringList("NDEBUG");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCResourceCompilerTool &amp;tool)</div><div class='del'>-{</div><div class='del'>-    return xml</div><div class='del'>-        &lt;&lt; tag(_Tool)</div><div class='del'>-            &lt;&lt; attrS(_Name, _VCResourceCompilerTool)</div><div class='del'>-            &lt;&lt; attrS(_Path, tool.ToolPath)</div><div class='del'>-            &lt;&lt; attrX(_AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories)</div><div class='del'>-            &lt;&lt; attrX(_AdditionalOptions, tool.AdditionalOptions, " ")</div><div class='del'>-            &lt;&lt; attrE(_Culture, tool.Culture, /*ifNot*/ rcUseDefault)</div><div class='del'>-            &lt;&lt; attrX(_FullIncludePath, tool.FullIncludePath)</div><div class='del'>-            &lt;&lt; attrT(_IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath)</div><div class='del'>-            &lt;&lt; attrX(_PreprocessorDefinitions, tool.PreprocessorDefinitions)</div><div class='del'>-            &lt;&lt; attrS(_ResourceOutputFileName, tool.ResourceOutputFileName)</div><div class='del'>-            &lt;&lt; attrE(_ShowProgress, tool.ShowProgress, /*ifNot*/ linkProgressNotSet)</div><div class='del'>-        &lt;&lt; closetag(_Tool);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> // VCDeploymentTool --------------------------------------------</div><div class='ctx'> VCDeploymentTool::VCDeploymentTool()</div><div class='ctx'>     :   RegisterOutput(registerNo)</div><div class='hunk'>@@ -1976,47 +2023,31 @@ VCDeploymentTool::VCDeploymentTool()</div><div class='ctx'>     RemoteDirectory = "";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCDeploymentTool &amp;tool)</div><div class='add'>+VCEventTool::VCEventTool(const QString &amp;eventName)</div><div class='add'>+    : ExcludedFromBuild(unset)</div><div class='ctx'> {</div><div class='del'>-    if (tool.AdditionalFiles.isEmpty())</div><div class='del'>-        return xml;</div><div class='del'>-    return xml</div><div class='del'>-        &lt;&lt; tag(tool.DeploymentTag)</div><div class='del'>-        &lt;&lt; attrS(_RemoteDirectory, tool.RemoteDirectory)</div><div class='del'>-        &lt;&lt; attrE(_RegisterOutput, tool.RegisterOutput)</div><div class='del'>-        &lt;&lt; attrS(_AdditionalFiles, tool.AdditionalFiles)</div><div class='del'>-        &lt;&lt; closetag(tool.DeploymentTag);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// VCEventTool -------------------------------------------------</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCEventTool &amp;tool)</div><div class='del'>-{</div><div class='del'>-    return xml</div><div class='del'>-        &lt;&lt; tag(_Tool)</div><div class='del'>-            &lt;&lt; attrS(_Name, tool.ToolName)</div><div class='del'>-            &lt;&lt; attrS(_Path, tool.ToolPath)</div><div class='del'>-            &lt;&lt; attrS(_CommandLine, tool.CommandLine.join(vcCommandSeparator()))</div><div class='del'>-            &lt;&lt; attrS(_Description, tool.Description)</div><div class='del'>-            &lt;&lt; attrT(_ExcludedFromBuild, tool.ExcludedFromBuild)</div><div class='del'>-        &lt;&lt; closetag(_Tool);</div><div class='add'>+    EventName = eventName;</div><div class='add'>+    ToolName = "VC";</div><div class='add'>+    ToolName += eventName;</div><div class='add'>+    ToolName += "Tool";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // VCPostBuildEventTool ---------------------------------------------</div><div class='ctx'> VCPostBuildEventTool::VCPostBuildEventTool()</div><div class='add'>+    : VCEventTool("PostBuildEvent")</div><div class='ctx'> {</div><div class='del'>-    ToolName = "VCPostBuildEventTool";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // VCPreBuildEventTool ----------------------------------------------</div><div class='ctx'> VCPreBuildEventTool::VCPreBuildEventTool()</div><div class='add'>+    : VCEventTool("PreBuildEvent")</div><div class='ctx'> {</div><div class='del'>-    ToolName = "VCPreBuildEventTool";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // VCPreLinkEventTool -----------------------------------------------</div><div class='ctx'> VCPreLinkEventTool::VCPreLinkEventTool()</div><div class='add'>+    : VCEventTool("PreLinkEvent")</div><div class='ctx'> {</div><div class='del'>-    ToolName = "VCPreLinkEventTool";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // VCConfiguration --------------------------------------------------</div><div class='hunk'>@@ -2034,41 +2065,9 @@ VCConfiguration::VCConfiguration()</div><div class='ctx'>     compiler.config = this;</div><div class='ctx'>     linker.config = this;</div><div class='ctx'>     idl.config = this;</div><div class='add'>+    custom.config = this;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCConfiguration &amp;tool)</div><div class='del'>-{</div><div class='del'>-    xml &lt;&lt; tag(_Configuration)</div><div class='del'>-            &lt;&lt; attrS(_Name, tool.Name)</div><div class='del'>-            &lt;&lt; attrS(_OutputDirectory, tool.OutputDirectory)</div><div class='del'>-            &lt;&lt; attrT(_ATLMinimizesCRunTimeLibraryUsage, tool.ATLMinimizesCRunTimeLibraryUsage)</div><div class='del'>-            &lt;&lt; attrT(_BuildBrowserInformation, tool.BuildBrowserInformation)</div><div class='del'>-            &lt;&lt; attrE(_CharacterSet, tool.CharacterSet, /*ifNot*/ charSetNotSet)</div><div class='del'>-            &lt;&lt; attrE(_ConfigurationType, tool.ConfigurationType)</div><div class='del'>-            &lt;&lt; attrS(_DeleteExtensionsOnClean, tool.DeleteExtensionsOnClean)</div><div class='del'>-            &lt;&lt; attrS(_ImportLibrary, tool.ImportLibrary)</div><div class='del'>-            &lt;&lt; attrS(_IntermediateDirectory, tool.IntermediateDirectory)</div><div class='del'>-            &lt;&lt; attrS(_PrimaryOutput, tool.PrimaryOutput)</div><div class='del'>-            &lt;&lt; attrS(_ProgramDatabase, tool.ProgramDatabase)</div><div class='del'>-            &lt;&lt; attrT(_RegisterOutput, tool.RegisterOutput)</div><div class='del'>-            &lt;&lt; attrE(_UseOfATL, tool.UseOfATL, /*ifNot*/ useATLNotSet)</div><div class='del'>-            &lt;&lt; attrE(_UseOfMfc, tool.UseOfMfc)</div><div class='del'>-            &lt;&lt; attrT(_WholeProgramOptimization, tool.WholeProgramOptimization)</div><div class='del'>-            &lt;&lt; tool.compiler</div><div class='del'>-            &lt;&lt; tool.custom;</div><div class='del'>-    if (tool.ConfigurationType == typeStaticLibrary)</div><div class='del'>-        xml &lt;&lt; tool.librarian;</div><div class='del'>-    else</div><div class='del'>-        xml &lt;&lt; tool.linker;</div><div class='del'>-    xml     &lt;&lt; tool.idl</div><div class='del'>-            &lt;&lt; tool.postBuild</div><div class='del'>-            &lt;&lt; tool.preBuild</div><div class='del'>-            &lt;&lt; tool.preLink</div><div class='del'>-            &lt;&lt; tool.resource</div><div class='del'>-            &lt;&lt; tool.deployment</div><div class='del'>-        &lt;&lt; closetag(_Configuration);</div><div class='del'>-    return xml;</div><div class='del'>-}</div><div class='ctx'> // VCFilter ---------------------------------------------------------</div><div class='ctx'> VCFilter::VCFilter()</div><div class='ctx'>     :   ParseFiles(unset),</div><div class='hunk'>@@ -2105,7 +2104,7 @@ void VCFilter::modifyPCHstage(QString str)</div><div class='ctx'>             break;</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='del'>-    bool isHFile = str.endsWith(".h") &amp;&amp; (str == Project-&gt;precompH);</div><div class='add'>+    bool isHFile = Option::hasFileExtension(str, Option::h_ext) &amp;&amp; (str == Project-&gt;precompH);</div><div class='ctx'>     bool isCPPFile = pchThroughSourceFile &amp;&amp; (str == Project-&gt;precompCPP);</div><div class='ctx'> </div><div class='ctx'>     if(!isCFile &amp;&amp; !isHFile &amp;&amp; !isCPPFile)</div><div class='hunk'>@@ -2130,7 +2129,9 @@ void VCFilter::modifyPCHstage(QString str)</div><div class='ctx'>             lines &lt;&lt; "*";</div><div class='ctx'>             lines &lt;&lt; "* This file is auto-generated by qmake since no PRECOMPILED_SOURCE was";</div><div class='ctx'>             lines &lt;&lt; "* specified, and is used as the common stdafx.cpp. The file is only";</div><div class='del'>-            lines &lt;&lt; "* generated when creating .vcproj project files, and is not used for";</div><div class='add'>+            lines &lt;&lt; QLatin1String("* generated when creating ")</div><div class='add'>+                     + (Config-&gt;CompilerVersion &lt; NET2010 ? ".vcproj" : ".vcxproj")</div><div class='add'>+                     + " project files, and is not used for";</div><div class='ctx'>             lines &lt;&lt; "* command line compilations by nmake.";</div><div class='ctx'>             lines &lt;&lt; "*";</div><div class='ctx'>             lines &lt;&lt; "* WARNING: All changes made in this file will be lost.";</div><div class='hunk'>@@ -2145,7 +2146,7 @@ void VCFilter::modifyPCHstage(QString str)</div><div class='ctx'>     useCompilerTool = true;</div><div class='ctx'>     // Setup PCH options</div><div class='ctx'>     CompilerTool.UsePrecompiledHeader     = (isCFile ? pchNone : pchCreateUsingSpecific);</div><div class='del'>-    CompilerTool.PrecompiledHeaderThrough = (isCPPFile ? QString("$(INHERIT)") : QString("$(NOINHERIT)"));</div><div class='add'>+    CompilerTool.PrecompiledHeaderThrough = (isCPPFile ? Project-&gt;precompHFilename : QString("$(NOINHERIT)"));</div><div class='ctx'>     CompilerTool.ForcedIncludeFiles       = QStringList("$(NOINHERIT)");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2290,7 +2291,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &amp;info)</div><div class='ctx'> </div><div class='ctx'>         // Output in info.additionalFile -----------</div><div class='ctx'>         if (!CustomBuildTool.Description.isEmpty())</div><div class='del'>-            CustomBuildTool.Description += " &amp; ";</div><div class='add'>+            CustomBuildTool.Description += ", ";</div><div class='ctx'>         CustomBuildTool.Description += cmd_name;</div><div class='ctx'>         CustomBuildTool.CommandLine += VCToolBase::fixCommandLine(cmd.trimmed());</div><div class='ctx'>         int space = cmd.indexOf(' ');</div><div class='hunk'>@@ -2321,135 +2322,17 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &amp;info)</div><div class='ctx'>     return useCustomBuildTool;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void VCFilter::outputFileConfig(XmlOutput &amp;xml, const QString &amp;filename)</div><div class='del'>-{</div><div class='del'>-    // Clearing each filter tool</div><div class='del'>-    useCustomBuildTool = false;</div><div class='del'>-    useCompilerTool = false;</div><div class='del'>-    CustomBuildTool = VCCustomBuildTool();</div><div class='del'>-    CompilerTool = VCCLCompilerTool();</div><div class='del'>-</div><div class='del'>-    // Unset some default options</div><div class='del'>-    CompilerTool.BufferSecurityCheck = unset;</div><div class='del'>-    CompilerTool.DebugInformationFormat = debugUnknown;</div><div class='del'>-    CompilerTool.ExceptionHandling = ehDefault;</div><div class='del'>-    CompilerTool.GeneratePreprocessedFile = preprocessUnknown;</div><div class='del'>-    CompilerTool.Optimization = optimizeDefault;</div><div class='del'>-    CompilerTool.ProgramDataBaseFileName.clear();</div><div class='del'>-    CompilerTool.RuntimeLibrary = rtUnknown;</div><div class='del'>-    CompilerTool.WarningLevel = warningLevelUnknown;</div><div class='del'>-    CompilerTool.config = Config;</div><div class='del'>-</div><div class='del'>-    bool inBuild = false;</div><div class='del'>-    VCFilterFile info;</div><div class='del'>-    for (int i = 0; i &lt; Files.count(); ++i) {</div><div class='del'>-        if (Files.at(i).file == filename) {</div><div class='del'>-            info = Files.at(i);</div><div class='del'>-            inBuild = true;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    inBuild &amp;= !info.excludeFromBuild;</div><div class='del'>-</div><div class='del'>-    if (inBuild) {</div><div class='del'>-        addExtraCompiler(info);</div><div class='del'>-        if(Project-&gt;usePCH)</div><div class='del'>-            modifyPCHstage(info.file);</div><div class='del'>-    } else {</div><div class='del'>-        // Excluded files uses an empty compiler stage</div><div class='del'>-        if(info.excludeFromBuild)</div><div class='del'>-            useCompilerTool = true;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    // Actual XML output ----------------------------------</div><div class='del'>-    if(useCustomBuildTool || useCompilerTool || !inBuild) {</div><div class='del'>-        xml &lt;&lt; tag(_FileConfiguration)</div><div class='del'>-                &lt;&lt; attr(_Name, (*Config).Name)</div><div class='del'>-                &lt;&lt; (!inBuild ? attrS(_ExcludedFromBuild, "true") : noxml());</div><div class='del'>-        if (useCustomBuildTool)</div><div class='del'>-            xml &lt;&lt; CustomBuildTool;</div><div class='del'>-        if (useCompilerTool)</div><div class='del'>-            xml &lt;&lt; CompilerTool;</div><div class='del'>-        xml &lt;&lt; closetag(_FileConfiguration);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, VCFilter &amp;tool)</div><div class='del'>-{</div><div class='del'>-    if(!tool.Files.count())</div><div class='del'>-        return xml;</div><div class='del'>-</div><div class='del'>-    if (!tool.Name.isEmpty()) {</div><div class='del'>-        xml &lt;&lt; tag(_Filter)</div><div class='del'>-                &lt;&lt; attrS(_Name, tool.Name)</div><div class='del'>-                &lt;&lt; attrS(_Filter, tool.Filter)</div><div class='del'>-                &lt;&lt; attrS(_UniqueIdentifier, tool.Guid)</div><div class='del'>-                &lt;&lt; attrT(_ParseFiles, tool.ParseFiles);</div><div class='del'>-    }</div><div class='del'>-    for (int i = 0; i &lt; tool.Files.count(); ++i) {</div><div class='del'>-        const VCFilterFile &amp;info = tool.Files.at(i);</div><div class='del'>-        xml &lt;&lt; tag(q_File)</div><div class='del'>-                &lt;&lt; attrS(_RelativePath, Option::fixPathToLocalOS(info.file))</div><div class='del'>-            &lt;&lt; data(); // In case no custom builds, to avoid "/&gt;" endings</div><div class='del'>-        tool.outputFileConfig(xml, tool.Files.at(i).file);</div><div class='del'>-        xml &lt;&lt; closetag(q_File);</div><div class='del'>-    }</div><div class='del'>-    if (!tool.Name.isEmpty())</div><div class='del'>-        xml &lt;&lt; closetag(_Filter);</div><div class='del'>-    return xml;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> // VCProjectSingleConfig --------------------------------------------</div><div class='del'>-VCFilter nullFilter;</div><div class='ctx'> VCFilter&amp; VCProjectSingleConfig::filterForExtraCompiler(const QString &amp;compilerName)</div><div class='ctx'> {</div><div class='ctx'>     for (int i = 0; i &lt; ExtraCompilersFiles.count(); ++i)</div><div class='ctx'>         if (ExtraCompilersFiles.at(i).Name == compilerName)</div><div class='ctx'>             return ExtraCompilersFiles[i];</div><div class='del'>-    return nullFilter;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> </div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, const VCProjectSingleConfig &amp;tool)</div><div class='del'>-{</div><div class='del'>-    xml &lt;&lt; decl("1.0", "Windows-1252")</div><div class='del'>-        &lt;&lt; tag(_VisualStudioProject)</div><div class='del'>-            &lt;&lt; attrS(_ProjectType, "Visual C++")</div><div class='del'>-            &lt;&lt; attrS(_Version, tool.Version)</div><div class='del'>-            &lt;&lt; attrS(_Name, tool.Name)</div><div class='del'>-            &lt;&lt; attrS(_ProjectGUID, tool.ProjectGUID)</div><div class='del'>-            &lt;&lt; attrS(_Keyword, tool.Keyword)</div><div class='del'>-            &lt;&lt; attrS(_SccProjectName, tool.SccProjectName)</div><div class='del'>-            &lt;&lt; attrS(_SccLocalPath, tool.SccLocalPath)</div><div class='del'>-            &lt;&lt; tag(_Platforms)</div><div class='del'>-                &lt;&lt; tag(_Platform)</div><div class='del'>-                    &lt;&lt; attrS(_Name, tool.PlatformName)</div><div class='del'>-            &lt;&lt; closetag(_Platforms)</div><div class='del'>-            &lt;&lt; tag(_Configurations)</div><div class='del'>-            &lt;&lt; tool.Configuration;</div><div class='del'>-    xml     &lt;&lt; closetag(_Configurations)</div><div class='del'>-            &lt;&lt; tag(q_Files);</div><div class='del'>-    // Add this configuration into a multi-config project, since that's where we have the flat/tree</div><div class='del'>-    // XML output functionality</div><div class='del'>-    VCProject tempProj;</div><div class='del'>-    tempProj.SingleProjects += tool;</div><div class='del'>-    tempProj.outputFilter(xml, "Sources");</div><div class='del'>-    tempProj.outputFilter(xml, "Headers");</div><div class='del'>-    tempProj.outputFilter(xml, "GeneratedFiles");</div><div class='del'>-    tempProj.outputFilter(xml, "LexYaccFiles");</div><div class='del'>-    tempProj.outputFilter(xml, "TranslationFiles");</div><div class='del'>-    tempProj.outputFilter(xml, "FormFiles");</div><div class='del'>-    tempProj.outputFilter(xml, "ResourceFiles");</div><div class='del'>-    for (int x = 0; x &lt; tempProj.ExtraCompilers.count(); ++x) {</div><div class='del'>-        tempProj.outputFilter(xml, tempProj.ExtraCompilers.at(x));</div><div class='del'>-    }</div><div class='del'>-    tempProj.outputFilter(xml, "RootFiles");</div><div class='del'>-    xml     &lt;&lt; closetag(q_Files)</div><div class='del'>-            &lt;&lt; tag(_Globals)</div><div class='del'>-                &lt;&lt; data(); // No "/&gt;" end tag</div><div class='del'>-    return xml;</div><div class='add'>+    static VCFilter nullFilter;</div><div class='add'>+    return nullFilter;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> // Tree file generation ---------------------------------------------</div><div class='ctx'> void TreeNode::generateXML(XmlOutput &amp;xml, const QString &amp;tagName, VCProject &amp;tool, const QString &amp;filter) {</div><div class='ctx'>     if (children.size()) {</div><div class='hunk'>@@ -2473,69 +2356,406 @@ void TreeNode::generateXML(XmlOutput &amp;xml, const QString &amp;tagName, VCProject &amp;to</div><div class='ctx'>             xml &lt;&lt; closetag("Filter");</div><div class='ctx'>     } else {</div><div class='ctx'>         // Leaf</div><div class='del'>-        tool.outputFileConfigs(xml, info, filter);</div><div class='add'>+        VCProjectWriter::outputFileConfigs(tool, xml, info, filter);</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> // Flat file generation ---------------------------------------------</div><div class='ctx'> void FlatNode::generateXML(XmlOutput &amp;xml, const QString &amp;/*tagName*/, VCProject &amp;tool, const QString &amp;filter) {</div><div class='ctx'>     if (children.size()) {</div><div class='ctx'>         ChildrenMapFlat::ConstIterator it = children.constBegin();</div><div class='ctx'>         ChildrenMapFlat::ConstIterator end = children.constEnd();</div><div class='ctx'>         for (; it != end; ++it) {</div><div class='del'>-            tool.outputFileConfigs(xml, (*it), filter);</div><div class='add'>+            VCProjectWriter::outputFileConfigs(tool, xml, (*it), filter);</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void VCProjectWriter::write(XmlOutput &amp;xml, VCProjectSingleConfig &amp;tool)</div><div class='add'>+{</div><div class='add'>+    xml &lt;&lt; decl("1.0", "Windows-1252")</div><div class='add'>+        &lt;&lt; tag(_VisualStudioProject)</div><div class='add'>+        &lt;&lt; attrS(_ProjectType, "Visual C++")</div><div class='add'>+        &lt;&lt; attrS(_Version, tool.Version)</div><div class='add'>+        &lt;&lt; attrS(_Name, tool.Name)</div><div class='add'>+        &lt;&lt; attrS(_ProjectGUID, tool.ProjectGUID)</div><div class='add'>+        &lt;&lt; attrS(_Keyword, tool.Keyword)</div><div class='add'>+        &lt;&lt; attrS(_SccProjectName, tool.SccProjectName)</div><div class='add'>+        &lt;&lt; attrS(_SccLocalPath, tool.SccLocalPath)</div><div class='add'>+        &lt;&lt; tag(_Platforms)</div><div class='add'>+        &lt;&lt; tag(_Platform)</div><div class='add'>+        &lt;&lt; attrS(_Name, tool.PlatformName)</div><div class='add'>+        &lt;&lt; closetag(_Platforms)</div><div class='add'>+        &lt;&lt; tag(_Configurations);</div><div class='add'>+    write(xml, tool.Configuration);</div><div class='add'>+    xml &lt;&lt; closetag(_Configurations)</div><div class='add'>+        &lt;&lt; tag(q_Files);</div><div class='add'>+    // Add this configuration into a multi-config project, since that's where we have the flat/tree</div><div class='add'>+    // XML output functionality</div><div class='add'>+    VCProject tempProj;</div><div class='add'>+    tempProj.SingleProjects += tool;</div><div class='add'>+    outputFilter(tempProj, xml, "Sources");</div><div class='add'>+    outputFilter(tempProj, xml, "Headers");</div><div class='add'>+    outputFilter(tempProj, xml, "GeneratedFiles");</div><div class='add'>+    outputFilter(tempProj, xml, "LexYaccFiles");</div><div class='add'>+    outputFilter(tempProj, xml, "TranslationFiles");</div><div class='add'>+    outputFilter(tempProj, xml, "FormFiles");</div><div class='add'>+    outputFilter(tempProj, xml, "ResourceFiles");</div><div class='add'>+    for (int x = 0; x &lt; tempProj.ExtraCompilers.count(); ++x) {</div><div class='add'>+        outputFilter(tempProj, xml, tempProj.ExtraCompilers.at(x));</div><div class='add'>+    }</div><div class='add'>+    outputFilter(tempProj, xml, "RootFiles");</div><div class='add'>+    xml     &lt;&lt; closetag(q_Files)</div><div class='add'>+            &lt;&lt; tag(_Globals)</div><div class='add'>+                &lt;&lt; data(); // No "/&gt;" end tag</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-// VCProject --------------------------------------------------------</div><div class='del'>-// Output all configurations (by filtername) for a file (by info)</div><div class='del'>-// A filters config output is in VCFilter.outputFileConfig()</div><div class='del'>-void VCProject::outputFileConfigs(XmlOutput &amp;xml,</div><div class='del'>-//                                  VCProjectSingleConfig::FilterTypes type</div><div class='del'>-                                  const VCFilterFile &amp;info,</div><div class='del'>-                                  const QString &amp;filtername)</div><div class='add'>+void VCProjectWriter::write(XmlOutput &amp;xml, VCProject &amp;tool)</div><div class='ctx'> {</div><div class='del'>-    xml &lt;&lt; tag(q_File)</div><div class='del'>-            &lt;&lt; attrS(_RelativePath, Option::fixPathToLocalOS(info.file));</div><div class='del'>-    for (int i = 0; i &lt; SingleProjects.count(); ++i) {</div><div class='del'>-        VCFilter filter;</div><div class='del'>-        if (filtername == "RootFiles") {</div><div class='del'>-            filter = SingleProjects.at(i).RootFiles;</div><div class='del'>-        } else if (filtername == "Sources") {</div><div class='del'>-            filter = SingleProjects.at(i).SourceFiles;</div><div class='del'>-        } else if (filtername == "Headers") {</div><div class='del'>-            filter = SingleProjects.at(i).HeaderFiles;</div><div class='del'>-        } else if (filtername == "GeneratedFiles") {</div><div class='del'>-            filter = SingleProjects.at(i).GeneratedFiles;</div><div class='del'>-        } else if (filtername == "LexYaccFiles") {</div><div class='del'>-            filter = SingleProjects.at(i).LexYaccFiles;</div><div class='del'>-        } else if (filtername == "TranslationFiles") {</div><div class='del'>-            filter = SingleProjects.at(i).TranslationFiles;</div><div class='del'>-        } else if (filtername == "FormFiles") {</div><div class='del'>-            filter = SingleProjects.at(i).FormFiles;</div><div class='del'>-        } else if (filtername == "ResourceFiles") {</div><div class='del'>-            filter = SingleProjects.at(i).ResourceFiles;</div><div class='del'>-        } else {</div><div class='del'>-            // ExtraCompilers</div><div class='del'>-            filter = SingleProjects[i].filterForExtraCompiler(filtername);</div><div class='del'>-        }</div><div class='add'>+    if (tool.SingleProjects.count() == 0) {</div><div class='add'>+        warn_msg(WarnLogic, "Generator: .NET: no single project in merge project, no output");</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='ctx'> </div><div class='del'>-        if (filter.Config) // only if the filter is not empty</div><div class='del'>-            filter.outputFileConfig(xml, info.file);</div><div class='add'>+    xml &lt;&lt; decl("1.0", "Windows-1252")</div><div class='add'>+        &lt;&lt; tag(_VisualStudioProject)</div><div class='add'>+            &lt;&lt; attrS(_ProjectType, "Visual C++")</div><div class='add'>+            &lt;&lt; attrS(_Version, tool.Version)</div><div class='add'>+            &lt;&lt; attrS(_Name, tool.Name)</div><div class='add'>+            &lt;&lt; attrS(_ProjectGUID, tool.ProjectGUID)</div><div class='add'>+            &lt;&lt; attrS(_Keyword, tool.Keyword)</div><div class='add'>+            &lt;&lt; attrS(_SccProjectName, tool.SccProjectName)</div><div class='add'>+            &lt;&lt; attrS(_SccLocalPath, tool.SccLocalPath)</div><div class='add'>+            &lt;&lt; tag(_Platforms)</div><div class='add'>+                &lt;&lt; tag(_Platform)</div><div class='add'>+                    &lt;&lt; attrS(_Name, tool.PlatformName)</div><div class='add'>+            &lt;&lt; closetag(_Platforms)</div><div class='add'>+            &lt;&lt; tag(_Configurations);</div><div class='add'>+    // Output each configuration</div><div class='add'>+    for (int i = 0; i &lt; tool.SingleProjects.count(); ++i)</div><div class='add'>+        write(xml, tool.SingleProjects.at(i).Configuration);</div><div class='add'>+    xml     &lt;&lt; closetag(_Configurations)</div><div class='add'>+            &lt;&lt; tag(q_Files);</div><div class='add'>+    outputFilter(tool, xml, "Sources");</div><div class='add'>+    outputFilter(tool, xml, "Headers");</div><div class='add'>+    outputFilter(tool, xml, "GeneratedFiles");</div><div class='add'>+    outputFilter(tool, xml, "LexYaccFiles");</div><div class='add'>+    outputFilter(tool, xml, "TranslationFiles");</div><div class='add'>+    outputFilter(tool, xml, "FormFiles");</div><div class='add'>+    outputFilter(tool, xml, "ResourceFiles");</div><div class='add'>+    for (int x = 0; x &lt; tool.ExtraCompilers.count(); ++x) {</div><div class='add'>+        outputFilter(tool, xml, tool.ExtraCompilers.at(x));</div><div class='ctx'>     }</div><div class='del'>-    xml &lt;&lt; closetag(q_File);</div><div class='add'>+    outputFilter(tool, xml, "RootFiles");</div><div class='add'>+    xml     &lt;&lt; closetag(q_Files)</div><div class='add'>+            &lt;&lt; tag(_Globals)</div><div class='add'>+            &lt;&lt; data(); // No "/&gt;" end tag</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void VCProjectWriter::write(XmlOutput &amp;xml, const VCCLCompilerTool &amp;tool)</div><div class='add'>+{</div><div class='add'>+    xml &lt;&lt; tag(_Tool)</div><div class='add'>+        &lt;&lt; attrS(_Name, _VCCLCompilerTool)</div><div class='add'>+        &lt;&lt; attrX(_AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories)</div><div class='add'>+        &lt;&lt; attrX(_AdditionalOptions, tool.AdditionalOptions, " ")</div><div class='add'>+        &lt;&lt; attrX(_AdditionalUsingDirectories, tool.AdditionalUsingDirectories)</div><div class='add'>+        &lt;&lt; attrS(_AssemblerListingLocation, tool.AssemblerListingLocation)</div><div class='add'>+        &lt;&lt; attrE(_AssemblerOutput, tool.AssemblerOutput, /*ifNot*/ asmListingNone)</div><div class='add'>+        &lt;&lt; attrE(_BasicRuntimeChecks, tool.BasicRuntimeChecks, /*ifNot*/ runtimeBasicCheckNone)</div><div class='add'>+        &lt;&lt; attrE(_BrowseInformation, tool.BrowseInformation, /*ifNot*/ brInfoNone)</div><div class='add'>+        &lt;&lt; attrS(_BrowseInformationFile, tool.BrowseInformationFile)</div><div class='add'>+        &lt;&lt; attrT(_BufferSecurityCheck, tool.BufferSecurityCheck)</div><div class='add'>+        &lt;&lt; attrE(_CallingConvention, tool.CallingConvention, /*ifNot*/ callConventionDefault)</div><div class='add'>+        &lt;&lt; attrE(_CompileAs, tool.CompileAs, compileAsDefault)</div><div class='add'>+        &lt;&lt; attrE(_CompileAsManaged, tool.CompileAsManaged, /*ifNot*/ managedDefault)</div><div class='add'>+        &lt;&lt; attrT(_CompileOnly, tool.CompileOnly)</div><div class='add'>+        &lt;&lt; attrE(_DebugInformationFormat, tool.DebugInformationFormat, /*ifNot*/ debugUnknown)</div><div class='add'>+        &lt;&lt; attrT(_DefaultCharIsUnsigned, tool.DefaultCharIsUnsigned)</div><div class='add'>+        &lt;&lt; attrT(_Detect64BitPortabilityProblems, tool.Detect64BitPortabilityProblems)</div><div class='add'>+        &lt;&lt; attrT(_DisableLanguageExtensions, tool.DisableLanguageExtensions)</div><div class='add'>+        &lt;&lt; attrX(_DisableSpecificWarnings, tool.DisableSpecificWarnings)</div><div class='add'>+        &lt;&lt; attrE(_EnableEnhancedInstructionSet, tool.EnableEnhancedInstructionSet, /*ifnot*/ archNotSet)</div><div class='add'>+        &lt;&lt; attrT(_EnableFiberSafeOptimizations, tool.EnableFiberSafeOptimizations)</div><div class='add'>+        &lt;&lt; attrT(_EnableFunctionLevelLinking, tool.EnableFunctionLevelLinking)</div><div class='add'>+        &lt;&lt; attrT(_EnableIntrinsicFunctions, tool.EnableIntrinsicFunctions)</div><div class='add'>+        &lt;&lt; xformExceptionHandlingNET2005(tool.ExceptionHandling, tool.config-&gt;CompilerVersion)</div><div class='add'>+        &lt;&lt; attrT(_ExpandAttributedSource, tool.ExpandAttributedSource)</div><div class='add'>+        &lt;&lt; attrE(_FavorSizeOrSpeed, tool.FavorSizeOrSpeed, /*ifNot*/ favorNone)</div><div class='add'>+</div><div class='add'>+        &lt;&lt; attrE(_FloatingPointModel, tool.FloatingPointModel, /*ifNot*/ floatingPointNotSet)</div><div class='add'>+        &lt;&lt; attrT(_FloatingPointExceptions, tool.FloatingPointExceptions)</div><div class='add'>+</div><div class='add'>+        &lt;&lt; attrT(_ForceConformanceInForLoopScope, tool.ForceConformanceInForLoopScope)</div><div class='add'>+        &lt;&lt; attrX(_ForcedIncludeFiles, tool.ForcedIncludeFiles)</div><div class='add'>+        &lt;&lt; attrX(_ForcedUsingFiles, tool.ForcedUsingFiles)</div><div class='add'>+        &lt;&lt; attrE(_GeneratePreprocessedFile, tool.GeneratePreprocessedFile, /*ifNot*/ preprocessUnknown)</div><div class='add'>+        &lt;&lt; attrT(_GlobalOptimizations, tool.GlobalOptimizations)</div><div class='add'>+        &lt;&lt; attrT(_IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath)</div><div class='add'>+        &lt;&lt; attrT(_ImproveFloatingPointConsistency, tool.ImproveFloatingPointConsistency)</div><div class='add'>+        &lt;&lt; attrE(_InlineFunctionExpansion, tool.InlineFunctionExpansion, /*ifNot*/ expandDefault)</div><div class='add'>+        &lt;&lt; attrT(_KeepComments, tool.KeepComments)</div><div class='add'>+        &lt;&lt; attrT(_MinimalRebuild, tool.MinimalRebuild)</div><div class='add'>+        &lt;&lt; attrS(_ObjectFile, tool.ObjectFile)</div><div class='add'>+        &lt;&lt; attrT(_OmitFramePointers, tool.OmitFramePointers)</div><div class='add'>+        &lt;&lt; attrT(_OpenMP, tool.OpenMP)</div><div class='add'>+        &lt;&lt; attrE(_Optimization, tool.Optimization, /*ifNot*/ optimizeDefault)</div><div class='add'>+        &lt;&lt; attrE(_OptimizeForProcessor, tool.OptimizeForProcessor, /*ifNot*/ procOptimizeBlended)</div><div class='add'>+        &lt;&lt; attrT(_OptimizeForWindowsApplication, tool.OptimizeForWindowsApplication)</div><div class='add'>+        &lt;&lt; attrS(_OutputFile, tool.OutputFile)</div><div class='add'>+        &lt;&lt; attrS(_PrecompiledHeaderFile, tool.PrecompiledHeaderFile)</div><div class='add'>+        &lt;&lt; attrS(_PrecompiledHeaderThrough, tool.PrecompiledHeaderThrough)</div><div class='add'>+        &lt;&lt; attrX(_PreprocessorDefinitions, tool.PreprocessorDefinitions)</div><div class='add'>+        &lt;&lt; (tool.ProgramDataBaseFileName.isNull() ? noxml() : attr(_ProgramDataBaseFileName, tool.ProgramDataBaseFileName))</div><div class='add'>+        &lt;&lt; attrE(_RuntimeLibrary, tool.RuntimeLibrary, /*ifNot*/ rtUnknown)</div><div class='add'>+        &lt;&lt; attrT(_RuntimeTypeInfo, tool.RuntimeTypeInfo)</div><div class='add'>+        &lt;&lt; attrT(_ShowIncludes, tool.ShowIncludes)</div><div class='add'>+        &lt;&lt; attrT(_SmallerTypeCheck, tool.SmallerTypeCheck)</div><div class='add'>+        &lt;&lt; attrT(_StringPooling, tool.StringPooling)</div><div class='add'>+        &lt;&lt; attrE(_StructMemberAlignment, tool.StructMemberAlignment, /*ifNot*/ alignNotSet)</div><div class='add'>+        &lt;&lt; attrT(_SuppressStartupBanner, tool.SuppressStartupBanner)</div><div class='add'>+        &lt;&lt; attrT(_TreatWChar_tAsBuiltInType, tool.TreatWChar_tAsBuiltInType)</div><div class='add'>+        &lt;&lt; attrT(_TurnOffAssemblyGeneration, tool.TurnOffAssemblyGeneration)</div><div class='add'>+        &lt;&lt; attrT(_UndefineAllPreprocessorDefinitions, tool.UndefineAllPreprocessorDefinitions)</div><div class='add'>+        &lt;&lt; attrX(_UndefinePreprocessorDefinitions, tool.UndefinePreprocessorDefinitions)</div><div class='add'>+        &lt;&lt; xformUsePrecompiledHeaderForNET2005(tool.UsePrecompiledHeader, tool.config-&gt;CompilerVersion)</div><div class='add'>+        &lt;&lt; attrT(_WarnAsError, tool.WarnAsError)</div><div class='add'>+        &lt;&lt; attrE(_WarningLevel, tool.WarningLevel, /*ifNot*/ warningLevelUnknown)</div><div class='add'>+        &lt;&lt; attrT(_WholeProgramOptimization, tool.WholeProgramOptimization)</div><div class='add'>+        &lt;&lt; attrE(_CompileForArchitecture, tool.CompileForArchitecture, /*ifNot*/ archUnknown)</div><div class='add'>+        &lt;&lt; attrT(_InterworkCalls, tool.InterworkCalls)</div><div class='add'>+</div><div class='add'>+        &lt;&lt; closetag(_Tool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void VCProjectWriter::write(XmlOutput &amp;xml, const VCLinkerTool &amp;tool)</div><div class='add'>+{</div><div class='add'>+    xml &lt;&lt; tag(_Tool)</div><div class='add'>+        &lt;&lt; attrS(_Name, _VCLinkerTool)</div><div class='add'>+        &lt;&lt; attrX(_AdditionalDependencies, tool.AdditionalDependencies, " ")</div><div class='add'>+        &lt;&lt; attrX(_AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories)</div><div class='add'>+        &lt;&lt; attrX(_AdditionalOptions, tool.AdditionalOptions, " ")</div><div class='add'>+        &lt;&lt; attrX(_AddModuleNamesToAssembly, tool.AddModuleNamesToAssembly)</div><div class='add'>+        &lt;&lt; attrS(_BaseAddress, tool.BaseAddress)</div><div class='add'>+        &lt;&lt; attrX(_DelayLoadDLLs, tool.DelayLoadDLLs)</div><div class='add'>+        &lt;&lt; attrE(_EnableCOMDATFolding, tool.EnableCOMDATFolding, /*ifNot*/ optFoldingDefault)</div><div class='add'>+        &lt;&lt; attrS(_EntryPointSymbol, tool.EntryPointSymbol)</div><div class='add'>+        &lt;&lt; attrX(_ForceSymbolReferences, tool.ForceSymbolReferences)</div><div class='add'>+        &lt;&lt; attrS(_FunctionOrder, tool.FunctionOrder)</div><div class='add'>+        &lt;&lt; attrT(_GenerateDebugInformation, tool.GenerateDebugInformation)</div><div class='add'>+        &lt;&lt; attrT(_GenerateMapFile, tool.GenerateMapFile)</div><div class='add'>+        &lt;&lt; attrL(_HeapCommitSize, tool.HeapCommitSize, /*ifNot*/ -1)</div><div class='add'>+        &lt;&lt; attrL(_HeapReserveSize, tool.HeapReserveSize, /*ifNot*/ -1)</div><div class='add'>+        &lt;&lt; attrT(_IgnoreAllDefaultLibraries, tool.IgnoreAllDefaultLibraries)</div><div class='add'>+        &lt;&lt; attrX(_IgnoreDefaultLibraryNames, tool.IgnoreDefaultLibraryNames)</div><div class='add'>+        &lt;&lt; attrT(_IgnoreEmbeddedIDL, tool.IgnoreEmbeddedIDL)</div><div class='add'>+        &lt;&lt; attrT(_IgnoreImportLibrary, tool.IgnoreImportLibrary)</div><div class='add'>+        &lt;&lt; attrS(_ImportLibrary, tool.ImportLibrary)</div><div class='add'>+        &lt;&lt; attrE(_LargeAddressAware, tool.LargeAddressAware, /*ifNot*/ addrAwareDefault)</div><div class='add'>+        &lt;&lt; attrT(_LinkDLL, tool.LinkDLL)</div><div class='add'>+        &lt;&lt; attrE(_LinkIncremental, tool.LinkIncremental, /*ifNot*/ linkIncrementalDefault)</div><div class='add'>+        &lt;&lt; attrE(_LinkTimeCodeGeneration, tool.LinkTimeCodeGeneration)</div><div class='add'>+        &lt;&lt; attrS(_LinkToManagedResourceFile, tool.LinkToManagedResourceFile)</div><div class='add'>+        &lt;&lt; attrT(_MapExports, tool.MapExports)</div><div class='add'>+        &lt;&lt; attrS(_MapFileName, tool.MapFileName)</div><div class='add'>+        &lt;&lt; attrT(_MapLines, tool.MapLines)</div><div class='add'>+        &lt;&lt; attrS(_MergedIDLBaseFileName, tool.MergedIDLBaseFileName)</div><div class='add'>+        &lt;&lt; attrS(_MergeSections, tool.MergeSections)</div><div class='add'>+        &lt;&lt; attrS(_MidlCommandFile, tool.MidlCommandFile)</div><div class='add'>+        &lt;&lt; attrS(_ModuleDefinitionFile, tool.ModuleDefinitionFile)</div><div class='add'>+        &lt;&lt; attrE(_OptimizeForWindows98, tool.OptimizeForWindows98, /*ifNot*/ optWin98Default)</div><div class='add'>+        &lt;&lt; attrE(_OptimizeReferences, tool.OptimizeReferences, /*ifNot*/ optReferencesDefault)</div><div class='add'>+        &lt;&lt; attrS(_OutputFile, tool.OutputFile)</div><div class='add'>+        &lt;&lt; attr(_ProgramDatabaseFile, tool.ProgramDatabaseFile)</div><div class='add'>+        &lt;&lt; attrT(_RegisterOutput, tool.RegisterOutput)</div><div class='add'>+        &lt;&lt; attrT(_ResourceOnlyDLL, tool.ResourceOnlyDLL)</div><div class='add'>+        &lt;&lt; attrT(_SetChecksum, tool.SetChecksum)</div><div class='add'>+        &lt;&lt; attrE(_ShowProgress, tool.ShowProgress, /*ifNot*/ linkProgressNotSet)</div><div class='add'>+        &lt;&lt; attrL(_StackCommitSize, tool.StackCommitSize, /*ifNot*/ -1)</div><div class='add'>+        &lt;&lt; attrL(_StackReserveSize, tool.StackReserveSize, /*ifNot*/ -1)</div><div class='add'>+        &lt;&lt; attrS(_StripPrivateSymbols, tool.StripPrivateSymbols)</div><div class='add'>+        &lt;&lt; attrE(_SubSystem, tool.SubSystem)</div><div class='add'>+        &lt;&lt; attrT(_SupportUnloadOfDelayLoadedDLL, tool.SupportUnloadOfDelayLoadedDLL)</div><div class='add'>+        &lt;&lt; attrT(_SuppressStartupBanner, tool.SuppressStartupBanner)</div><div class='add'>+        &lt;&lt; attrT(_SwapRunFromCD, tool.SwapRunFromCD)</div><div class='add'>+        &lt;&lt; attrT(_SwapRunFromNet, tool.SwapRunFromNet)</div><div class='add'>+        &lt;&lt; attrE(_TargetMachine, tool.TargetMachine, /*ifNot*/ machineNotSet)</div><div class='add'>+        &lt;&lt; attrE(_TerminalServerAware, tool.TerminalServerAware, /*ifNot*/ termSvrAwareDefault)</div><div class='add'>+        &lt;&lt; attrT(_TurnOffAssemblyGeneration, tool.TurnOffAssemblyGeneration)</div><div class='add'>+        &lt;&lt; attrS(_TypeLibraryFile, tool.TypeLibraryFile)</div><div class='add'>+        &lt;&lt; attrL(_TypeLibraryResourceID, tool.TypeLibraryResourceID, /*ifNot*/ rcUseDefault)</div><div class='add'>+        &lt;&lt; attrS(_Version, tool.Version)</div><div class='add'>+        &lt;&lt; closetag(_Tool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void VCProjectWriter::write(XmlOutput &amp;xml, const VCMIDLTool &amp;tool)</div><div class='add'>+{</div><div class='add'>+    xml &lt;&lt; tag(_Tool)</div><div class='add'>+        &lt;&lt; attrS(_Name, _VCMIDLTool)</div><div class='add'>+        &lt;&lt; attrX(_AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories)</div><div class='add'>+        &lt;&lt; attrX(_AdditionalOptions, tool.AdditionalOptions, " ")</div><div class='add'>+        &lt;&lt; attrX(_CPreprocessOptions, tool.CPreprocessOptions)</div><div class='add'>+        &lt;&lt; attrE(_DefaultCharType, tool.DefaultCharType)</div><div class='add'>+        &lt;&lt; attrS(_DLLDataFileName, tool.DLLDataFileName)</div><div class='add'>+        &lt;&lt; attrE(_EnableErrorChecks, tool.EnableErrorChecks)</div><div class='add'>+        &lt;&lt; attrT(_ErrorCheckAllocations, tool.ErrorCheckAllocations)</div><div class='add'>+        &lt;&lt; attrT(_ErrorCheckBounds, tool.ErrorCheckBounds)</div><div class='add'>+        &lt;&lt; attrT(_ErrorCheckEnumRange, tool.ErrorCheckEnumRange)</div><div class='add'>+        &lt;&lt; attrT(_ErrorCheckRefPointers, tool.ErrorCheckRefPointers)</div><div class='add'>+        &lt;&lt; attrT(_ErrorCheckStubData, tool.ErrorCheckStubData)</div><div class='add'>+        &lt;&lt; attrX(_FullIncludePath, tool.FullIncludePath)</div><div class='add'>+        &lt;&lt; attrT(_GenerateStublessProxies, tool.GenerateStublessProxies)</div><div class='add'>+        &lt;&lt; attrT(_GenerateTypeLibrary, tool.GenerateTypeLibrary)</div><div class='add'>+        &lt;&lt; attrS(_HeaderFileName, tool.HeaderFileName)</div><div class='add'>+        &lt;&lt; attrT(_IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath)</div><div class='add'>+        &lt;&lt; attrS(_InterfaceIdentifierFileName, tool.InterfaceIdentifierFileName)</div><div class='add'>+        &lt;&lt; attrT(_MkTypLibCompatible, tool.MkTypLibCompatible)</div><div class='add'>+        &lt;&lt; attrS(_OutputDirectory, tool.OutputDirectory)</div><div class='add'>+        &lt;&lt; attrX(_PreprocessorDefinitions, tool.PreprocessorDefinitions)</div><div class='add'>+        &lt;&lt; attrS(_ProxyFileName, tool.ProxyFileName)</div><div class='add'>+        &lt;&lt; attrS(_RedirectOutputAndErrors, tool.RedirectOutputAndErrors)</div><div class='add'>+        &lt;&lt; attrE(_StructMemberAlignment, tool.StructMemberAlignment, /*ifNot*/ midlAlignNotSet)</div><div class='add'>+        &lt;&lt; attrT(_SuppressStartupBanner, tool.SuppressStartupBanner)</div><div class='add'>+        &lt;&lt; attrE(_TargetEnvironment, tool.TargetEnvironment, /*ifNot*/ midlTargetNotSet)</div><div class='add'>+        &lt;&lt; attrS(_TypeLibraryName, tool.TypeLibraryName)</div><div class='add'>+        &lt;&lt; attrX(_UndefinePreprocessorDefinitions, tool.UndefinePreprocessorDefinitions)</div><div class='add'>+        &lt;&lt; attrT(_ValidateParameters, tool.ValidateParameters)</div><div class='add'>+        &lt;&lt; attrT(_WarnAsError, tool.WarnAsError)</div><div class='add'>+        &lt;&lt; attrE(_WarningLevel, tool.WarningLevel)</div><div class='add'>+        &lt;&lt; closetag(_Tool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void VCProjectWriter::write(XmlOutput &amp;xml, const VCCustomBuildTool &amp;tool)</div><div class='add'>+{</div><div class='add'>+    xml &lt;&lt; tag(_Tool)</div><div class='add'>+            &lt;&lt; attrS(_Name, tool.ToolName)</div><div class='add'>+            &lt;&lt; attrX(_AdditionalDependencies, tool.AdditionalDependencies, ";")</div><div class='add'>+            &lt;&lt; attrS(_CommandLine, tool.CommandLine.join(vcCommandSeparator()))</div><div class='add'>+            &lt;&lt; attrS(_Description, tool.Description)</div><div class='add'>+            &lt;&lt; attrX(_Outputs, tool.Outputs, ";")</div><div class='add'>+            &lt;&lt; attrS(_Path, tool.ToolPath)</div><div class='add'>+        &lt;&lt; closetag(_Tool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void VCProjectWriter::write(XmlOutput &amp;xml, const VCLibrarianTool &amp;tool)</div><div class='add'>+{</div><div class='add'>+    xml</div><div class='add'>+        &lt;&lt; tag(_Tool)</div><div class='add'>+            &lt;&lt; attrS(_Name, _VCLibrarianTool)</div><div class='add'>+            &lt;&lt; attrX(_AdditionalDependencies, tool.AdditionalDependencies)</div><div class='add'>+            &lt;&lt; attrX(_AdditionalLibraryDirectories, tool.AdditionalLibraryDirectories)</div><div class='add'>+            &lt;&lt; attrX(_AdditionalOptions, tool.AdditionalOptions, " ")</div><div class='add'>+            &lt;&lt; attrX(_ExportNamedFunctions, tool.ExportNamedFunctions)</div><div class='add'>+            &lt;&lt; attrX(_ForceSymbolReferences, tool.ForceSymbolReferences)</div><div class='add'>+            &lt;&lt; attrT(_IgnoreAllDefaultLibraries, tool.IgnoreAllDefaultLibraries)</div><div class='add'>+            &lt;&lt; attrX(_IgnoreDefaultLibraryNames, tool.IgnoreDefaultLibraryNames)</div><div class='add'>+            &lt;&lt; attrS(_ModuleDefinitionFile, tool.ModuleDefinitionFile)</div><div class='add'>+            &lt;&lt; attrS(_OutputFile, tool.OutputFile)</div><div class='add'>+            &lt;&lt; attrT(_SuppressStartupBanner, tool.SuppressStartupBanner)</div><div class='add'>+        &lt;&lt; closetag(_Tool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void VCProjectWriter::write(XmlOutput &amp;xml, const VCResourceCompilerTool &amp;tool)</div><div class='add'>+{</div><div class='add'>+    xml</div><div class='add'>+        &lt;&lt; tag(_Tool)</div><div class='add'>+            &lt;&lt; attrS(_Name, _VCResourceCompilerTool)</div><div class='add'>+            &lt;&lt; attrS(_Path, tool.ToolPath)</div><div class='add'>+            &lt;&lt; attrX(_AdditionalIncludeDirectories, tool.AdditionalIncludeDirectories)</div><div class='add'>+            &lt;&lt; attrX(_AdditionalOptions, tool.AdditionalOptions, " ")</div><div class='add'>+            &lt;&lt; attrE(_Culture, tool.Culture, /*ifNot*/ rcUseDefault)</div><div class='add'>+            &lt;&lt; attrX(_FullIncludePath, tool.FullIncludePath)</div><div class='add'>+            &lt;&lt; attrT(_IgnoreStandardIncludePath, tool.IgnoreStandardIncludePath)</div><div class='add'>+            &lt;&lt; attrX(_PreprocessorDefinitions, tool.PreprocessorDefinitions)</div><div class='add'>+            &lt;&lt; attrS(_ResourceOutputFileName, tool.ResourceOutputFileName)</div><div class='add'>+            &lt;&lt; attrE(_ShowProgress, tool.ShowProgress, /*ifNot*/ linkProgressNotSet)</div><div class='add'>+        &lt;&lt; closetag(_Tool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void VCProjectWriter::write(XmlOutput &amp;xml, const VCEventTool &amp;tool)</div><div class='add'>+{</div><div class='add'>+    xml</div><div class='add'>+        &lt;&lt; tag(_Tool)</div><div class='add'>+            &lt;&lt; attrS(_Name, tool.ToolName)</div><div class='add'>+            &lt;&lt; attrS(_Path, tool.ToolPath)</div><div class='add'>+            &lt;&lt; attrS(_CommandLine, tool.CommandLine.join(vcCommandSeparator()))</div><div class='add'>+            &lt;&lt; attrS(_Description, tool.Description)</div><div class='add'>+            &lt;&lt; attrT(_ExcludedFromBuild, tool.ExcludedFromBuild)</div><div class='add'>+        &lt;&lt; closetag(_Tool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void VCProjectWriter::write(XmlOutput &amp;xml, const VCDeploymentTool &amp;tool)</div><div class='add'>+{</div><div class='add'>+    if (tool.AdditionalFiles.isEmpty())</div><div class='add'>+        return;</div><div class='add'>+    xml &lt;&lt; tag(tool.DeploymentTag)</div><div class='add'>+        &lt;&lt; attrS(_RemoteDirectory, tool.RemoteDirectory)</div><div class='add'>+        &lt;&lt; attrE(_RegisterOutput, tool.RegisterOutput)</div><div class='add'>+        &lt;&lt; attrS(_AdditionalFiles, tool.AdditionalFiles)</div><div class='add'>+        &lt;&lt; closetag(tool.DeploymentTag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void VCProjectWriter::write(XmlOutput &amp;xml, const VCConfiguration &amp;tool)</div><div class='add'>+{</div><div class='add'>+    xml &lt;&lt; tag(_Configuration)</div><div class='add'>+            &lt;&lt; attrS(_Name, tool.Name)</div><div class='add'>+            &lt;&lt; attrS(_OutputDirectory, tool.OutputDirectory)</div><div class='add'>+            &lt;&lt; attrT(_ATLMinimizesCRunTimeLibraryUsage, tool.ATLMinimizesCRunTimeLibraryUsage)</div><div class='add'>+            &lt;&lt; attrT(_BuildBrowserInformation, tool.BuildBrowserInformation)</div><div class='add'>+            &lt;&lt; attrE(_CharacterSet, tool.CharacterSet, /*ifNot*/ charSetNotSet)</div><div class='add'>+            &lt;&lt; attrE(_ConfigurationType, tool.ConfigurationType)</div><div class='add'>+            &lt;&lt; attrS(_DeleteExtensionsOnClean, tool.DeleteExtensionsOnClean)</div><div class='add'>+            &lt;&lt; attrS(_ImportLibrary, tool.ImportLibrary)</div><div class='add'>+            &lt;&lt; attrS(_IntermediateDirectory, tool.IntermediateDirectory)</div><div class='add'>+            &lt;&lt; attrS(_PrimaryOutput, tool.PrimaryOutput)</div><div class='add'>+            &lt;&lt; attrS(_ProgramDatabase, tool.ProgramDatabase)</div><div class='add'>+            &lt;&lt; attrT(_RegisterOutput, tool.RegisterOutput)</div><div class='add'>+            &lt;&lt; attrE(_UseOfATL, tool.UseOfATL, /*ifNot*/ useATLNotSet)</div><div class='add'>+            &lt;&lt; attrE(_UseOfMfc, tool.UseOfMfc)</div><div class='add'>+            &lt;&lt; attrT(_WholeProgramOptimization, tool.WholeProgramOptimization);</div><div class='add'>+    write(xml, tool.compiler);</div><div class='add'>+    write(xml, tool.custom);</div><div class='add'>+    if (tool.ConfigurationType == typeStaticLibrary)</div><div class='add'>+        write(xml, tool.librarian);</div><div class='add'>+    else</div><div class='add'>+        write(xml, tool.linker);</div><div class='add'>+    write(xml, tool.idl);</div><div class='add'>+    write(xml, tool.postBuild);</div><div class='add'>+    write(xml, tool.preBuild);</div><div class='add'>+    write(xml, tool.preLink);</div><div class='add'>+    write(xml, tool.resource);</div><div class='add'>+    write(xml, tool.deployment);</div><div class='add'>+    xml &lt;&lt; closetag(_Configuration);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void VCProjectWriter::write(XmlOutput &amp;xml, VCFilter &amp;tool)</div><div class='add'>+{</div><div class='add'>+    if(!tool.Files.count())</div><div class='add'>+        return;</div><div class='add'>+</div><div class='add'>+    if (!tool.Name.isEmpty()) {</div><div class='add'>+        xml &lt;&lt; tag(_Filter)</div><div class='add'>+                &lt;&lt; attrS(_Name, tool.Name)</div><div class='add'>+                &lt;&lt; attrS(_Filter, tool.Filter)</div><div class='add'>+                &lt;&lt; attrS(_UniqueIdentifier, tool.Guid)</div><div class='add'>+                &lt;&lt; attrT(_ParseFiles, tool.ParseFiles);</div><div class='add'>+    }</div><div class='add'>+    for (int i = 0; i &lt; tool.Files.count(); ++i) {</div><div class='add'>+        const VCFilterFile &amp;info = tool.Files.at(i);</div><div class='add'>+        xml &lt;&lt; tag(q_File)</div><div class='add'>+                &lt;&lt; attrS(_RelativePath, Option::fixPathToLocalOS(info.file))</div><div class='add'>+            &lt;&lt; data(); // In case no custom builds, to avoid "/&gt;" endings</div><div class='add'>+        outputFileConfig(tool, xml, tool.Files.at(i).file);</div><div class='add'>+        xml &lt;&lt; closetag(q_File);</div><div class='add'>+    }</div><div class='add'>+    if (!tool.Name.isEmpty())</div><div class='add'>+        xml &lt;&lt; closetag(_Filter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // outputs a given filter for all existing configurations of a project</div><div class='del'>-void VCProject::outputFilter(XmlOutput &amp;xml,</div><div class='del'>-//                             VCProjectSingleConfig::FilterTypes type</div><div class='del'>-                             const QString &amp;filtername)</div><div class='add'>+void VCProjectWriter::outputFilter(VCProject &amp;project, XmlOutput &amp;xml, const QString &amp;filtername)</div><div class='ctx'> {</div><div class='ctx'>     Node *root;</div><div class='del'>-    if (SingleProjects.at(0).flat_files)</div><div class='add'>+    if (project.SingleProjects.at(0).flat_files)</div><div class='ctx'>         root = new FlatNode;</div><div class='ctx'>     else</div><div class='ctx'>         root = new TreeNode;</div><div class='hunk'>@@ -2543,27 +2763,28 @@ void VCProject::outputFilter(XmlOutput &amp;xml,</div><div class='ctx'>     QString name, extfilter, guid;</div><div class='ctx'>     triState parse;</div><div class='ctx'> </div><div class='del'>-    for (int i = 0; i &lt; SingleProjects.count(); ++i) {</div><div class='add'>+    for (int i = 0; i &lt; project.SingleProjects.count(); ++i) {</div><div class='ctx'>         VCFilter filter;</div><div class='add'>+        const VCProjectSingleConfig &amp;projectSingleConfig = project.SingleProjects.at(i);</div><div class='ctx'>         if (filtername == "RootFiles") {</div><div class='del'>-            filter = SingleProjects.at(i).RootFiles;</div><div class='add'>+            filter = projectSingleConfig.RootFiles;</div><div class='ctx'>         } else if (filtername == "Sources") {</div><div class='del'>-            filter = SingleProjects.at(i).SourceFiles;</div><div class='add'>+            filter = projectSingleConfig.SourceFiles;</div><div class='ctx'>         } else if (filtername == "Headers") {</div><div class='del'>-            filter = SingleProjects.at(i).HeaderFiles;</div><div class='add'>+            filter = projectSingleConfig.HeaderFiles;</div><div class='ctx'>         } else if (filtername == "GeneratedFiles") {</div><div class='del'>-            filter = SingleProjects.at(i).GeneratedFiles;</div><div class='add'>+            filter = projectSingleConfig.GeneratedFiles;</div><div class='ctx'>         } else if (filtername == "LexYaccFiles") {</div><div class='del'>-            filter = SingleProjects.at(i).LexYaccFiles;</div><div class='add'>+            filter = projectSingleConfig.LexYaccFiles;</div><div class='ctx'>         } else if (filtername == "TranslationFiles") {</div><div class='del'>-            filter = SingleProjects.at(i).TranslationFiles;</div><div class='add'>+            filter = projectSingleConfig.TranslationFiles;</div><div class='ctx'>         } else if (filtername == "FormFiles") {</div><div class='del'>-            filter = SingleProjects.at(i).FormFiles;</div><div class='add'>+            filter = projectSingleConfig.FormFiles;</div><div class='ctx'>         } else if (filtername == "ResourceFiles") {</div><div class='del'>-            filter = SingleProjects.at(i).ResourceFiles;</div><div class='add'>+            filter = projectSingleConfig.ResourceFiles;</div><div class='ctx'>         } else {</div><div class='ctx'>             // ExtraCompilers</div><div class='del'>-            filter = SingleProjects[i].filterForExtraCompiler(filtername);</div><div class='add'>+            filter = project.SingleProjects[i].filterForExtraCompiler(filtername);</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         // Merge all files in this filter to root tree</div><div class='hunk'>@@ -2591,52 +2812,98 @@ void VCProject::outputFilter(XmlOutput &amp;xml,</div><div class='ctx'>                 &lt;&lt; attrS(_UniqueIdentifier, guid)</div><div class='ctx'>                 &lt;&lt; attrT(_ParseFiles, parse);</div><div class='ctx'>     }</div><div class='del'>-    root-&gt;generateXML(xml, "", *this, filtername); // output root tree</div><div class='add'>+    root-&gt;generateXML(xml, "", project, filtername); // output root tree</div><div class='ctx'>     if (!name.isEmpty())</div><div class='ctx'>         xml &lt;&lt; closetag(_Filter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, VCProject &amp;tool)</div><div class='add'>+// Output all configurations (by filtername) for a file (by info)</div><div class='add'>+// A filters config output is in VCFilter.outputFileConfig()</div><div class='add'>+void VCProjectWriter::outputFileConfigs(VCProject &amp;project, XmlOutput &amp;xml, const VCFilterFile &amp;info, const QString &amp;filtername)</div><div class='ctx'> {</div><div class='del'>-    if (tool.SingleProjects.count() == 0) {</div><div class='del'>-        warn_msg(WarnLogic, "Generator: .NET: no single project in merge project, no output");</div><div class='del'>-        return xml;</div><div class='add'>+    xml &lt;&lt; tag(q_File)</div><div class='add'>+            &lt;&lt; attrS(_RelativePath, Option::fixPathToLocalOS(info.file));</div><div class='add'>+    for (int i = 0; i &lt; project.SingleProjects.count(); ++i) {</div><div class='add'>+        VCFilter filter;</div><div class='add'>+        const VCProjectSingleConfig &amp;projectSingleConfig = project.SingleProjects.at(i);</div><div class='add'>+        if (filtername == "RootFiles") {</div><div class='add'>+            filter = projectSingleConfig.RootFiles;</div><div class='add'>+        } else if (filtername == "Sources") {</div><div class='add'>+            filter = projectSingleConfig.SourceFiles;</div><div class='add'>+        } else if (filtername == "Headers") {</div><div class='add'>+            filter = projectSingleConfig.HeaderFiles;</div><div class='add'>+        } else if (filtername == "GeneratedFiles") {</div><div class='add'>+            filter = projectSingleConfig.GeneratedFiles;</div><div class='add'>+        } else if (filtername == "LexYaccFiles") {</div><div class='add'>+            filter = projectSingleConfig.LexYaccFiles;</div><div class='add'>+        } else if (filtername == "TranslationFiles") {</div><div class='add'>+            filter = projectSingleConfig.TranslationFiles;</div><div class='add'>+        } else if (filtername == "FormFiles") {</div><div class='add'>+            filter = projectSingleConfig.FormFiles;</div><div class='add'>+        } else if (filtername == "ResourceFiles") {</div><div class='add'>+            filter = projectSingleConfig.ResourceFiles;</div><div class='add'>+        } else {</div><div class='add'>+            // ExtraCompilers</div><div class='add'>+            filter = project.SingleProjects[i].filterForExtraCompiler(filtername);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if (filter.Config) // only if the filter is not empty</div><div class='add'>+            outputFileConfig(filter, xml, info.file);</div><div class='ctx'>     }</div><div class='add'>+    xml &lt;&lt; closetag(q_File);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-    xml &lt;&lt; decl("1.0", "Windows-1252")</div><div class='del'>-        &lt;&lt; tag(_VisualStudioProject)</div><div class='del'>-            &lt;&lt; attrS(_ProjectType, "Visual C++")</div><div class='del'>-            &lt;&lt; attrS(_Version, tool.Version)</div><div class='del'>-            &lt;&lt; attrS(_Name, tool.Name)</div><div class='del'>-            &lt;&lt; attrS(_ProjectGUID, tool.ProjectGUID)</div><div class='del'>-            &lt;&lt; attrS(_Keyword, tool.Keyword)</div><div class='del'>-            &lt;&lt; attrS(_SccProjectName, tool.SccProjectName)</div><div class='del'>-            &lt;&lt; attrS(_SccLocalPath, tool.SccLocalPath)</div><div class='del'>-            &lt;&lt; tag(_Platforms)</div><div class='del'>-                &lt;&lt; tag(_Platform)</div><div class='del'>-                    &lt;&lt; attrS(_Name, tool.PlatformName)</div><div class='del'>-            &lt;&lt; closetag(_Platforms)</div><div class='del'>-            &lt;&lt; tag(_Configurations);</div><div class='del'>-    // Output each configuration</div><div class='del'>-    for (int i = 0; i &lt; tool.SingleProjects.count(); ++i)</div><div class='del'>-        xml     &lt;&lt; tool.SingleProjects.at(i).Configuration;</div><div class='del'>-    xml     &lt;&lt; closetag(_Configurations)</div><div class='del'>-            &lt;&lt; tag(q_Files);</div><div class='del'>-    tool.outputFilter(xml, "Sources");</div><div class='del'>-    tool.outputFilter(xml, "Headers");</div><div class='del'>-    tool.outputFilter(xml, "GeneratedFiles");</div><div class='del'>-    tool.outputFilter(xml, "LexYaccFiles");</div><div class='del'>-    tool.outputFilter(xml, "TranslationFiles");</div><div class='del'>-    tool.outputFilter(xml, "FormFiles");</div><div class='del'>-    tool.outputFilter(xml, "ResourceFiles");</div><div class='del'>-    for (int x = 0; x &lt; tool.ExtraCompilers.count(); ++x) {</div><div class='del'>-        tool.outputFilter(xml, tool.ExtraCompilers.at(x));</div><div class='add'>+void VCProjectWriter::outputFileConfig(VCFilter &amp;filter, XmlOutput &amp;xml, const QString &amp;filename)</div><div class='add'>+{</div><div class='add'>+    // Clearing each filter tool</div><div class='add'>+    filter.useCustomBuildTool = false;</div><div class='add'>+    filter.useCompilerTool = false;</div><div class='add'>+    filter.CustomBuildTool = VCCustomBuildTool();</div><div class='add'>+    filter.CompilerTool = VCCLCompilerTool();</div><div class='add'>+</div><div class='add'>+    // Unset some default options</div><div class='add'>+    filter.CustomBuildTool.config = filter.Config;</div><div class='add'>+    filter.CompilerTool.BufferSecurityCheck = unset;</div><div class='add'>+    filter.CompilerTool.DebugInformationFormat = debugUnknown;</div><div class='add'>+    filter.CompilerTool.ExceptionHandling = ehDefault;</div><div class='add'>+    filter.CompilerTool.GeneratePreprocessedFile = preprocessUnknown;</div><div class='add'>+    filter.CompilerTool.Optimization = optimizeDefault;</div><div class='add'>+    filter.CompilerTool.ProgramDataBaseFileName.clear();</div><div class='add'>+    filter.CompilerTool.RuntimeLibrary = rtUnknown;</div><div class='add'>+    filter.CompilerTool.WarningLevel = warningLevelUnknown;</div><div class='add'>+    filter.CompilerTool.config = filter.Config;</div><div class='add'>+</div><div class='add'>+    bool inBuild = false;</div><div class='add'>+    VCFilterFile info;</div><div class='add'>+    for (int i = 0; i &lt; filter.Files.count(); ++i) {</div><div class='add'>+        if (filter.Files.at(i).file == filename) {</div><div class='add'>+            info = filter.Files.at(i);</div><div class='add'>+            inBuild = true;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    inBuild &amp;= !info.excludeFromBuild;</div><div class='add'>+</div><div class='add'>+    if (inBuild) {</div><div class='add'>+        filter.addExtraCompiler(info);</div><div class='add'>+        if(filter.Project-&gt;usePCH)</div><div class='add'>+            filter.modifyPCHstage(info.file);</div><div class='add'>+    } else {</div><div class='add'>+        // Excluded files uses an empty compiler stage</div><div class='add'>+        if(info.excludeFromBuild)</div><div class='add'>+            filter.useCompilerTool = true;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    // Actual XML output ----------------------------------</div><div class='add'>+    if (filter.useCustomBuildTool || filter.useCompilerTool || !inBuild) {</div><div class='add'>+        xml &lt;&lt; tag(_FileConfiguration)</div><div class='add'>+                &lt;&lt; attr(_Name, filter.Config-&gt;Name)</div><div class='add'>+                &lt;&lt; (!inBuild ? attrS(_ExcludedFromBuild, "true") : noxml());</div><div class='add'>+        if (filter.useCustomBuildTool)</div><div class='add'>+            filter.Project-&gt;projectWriter-&gt;write(xml, filter.CustomBuildTool);</div><div class='add'>+        if (filter.useCompilerTool)</div><div class='add'>+            filter.Project-&gt;projectWriter-&gt;write(xml, filter.CompilerTool);</div><div class='add'>+        xml &lt;&lt; closetag(_FileConfiguration);</div><div class='ctx'>     }</div><div class='del'>-    tool.outputFilter(xml, "RootFiles");</div><div class='del'>-    xml     &lt;&lt; closetag(q_Files)</div><div class='del'>-            &lt;&lt; tag(_Globals)</div><div class='del'>-            &lt;&lt; data(); // No "/&gt;" end tag</div><div class='del'>-    return xml;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h<br/>index 7fdae01..950176d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msvc_objectmodel.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msvc_objectmodel.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msvc_objectmodel.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/win32/msvc_objectmodel.h</a></div><div class='hunk'>@@ -86,6 +86,9 @@ enum triState {</div><div class='ctx'>     _False = 0,</div><div class='ctx'>     _True = 1</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+triState operator!(const triState &amp;rhs);</div><div class='add'>+</div><div class='ctx'> enum addressAwarenessType {</div><div class='ctx'>     addrAwareDefault,</div><div class='ctx'>     addrAwareNoLarge,</div><div class='hunk'>@@ -363,6 +366,7 @@ enum optLinkTimeCodeGenType {</div><div class='ctx'>     optLTCGUpdate</div><div class='ctx'> };</div><div class='ctx'> enum pchOption {</div><div class='add'>+    pchUnset = -1,</div><div class='ctx'>     pchNone,</div><div class='ctx'>     pchCreateUsingSpecific,</div><div class='ctx'>     pchGenerateAuto,</div><div class='hunk'>@@ -467,7 +471,7 @@ enum warningLevelOption {</div><div class='ctx'> class VCToolBase {</div><div class='ctx'> protected:</div><div class='ctx'>     // Functions</div><div class='del'>-    VCToolBase(){};</div><div class='add'>+    VCToolBase(){}</div><div class='ctx'>     virtual ~VCToolBase(){}</div><div class='ctx'>     virtual bool parseOption(const char* option) = 0;</div><div class='ctx'> public:</div><div class='hunk'>@@ -521,6 +525,7 @@ public:</div><div class='ctx'>     QStringList             ForcedIncludeFiles;</div><div class='ctx'>     QStringList             ForcedUsingFiles;</div><div class='ctx'>     preprocessOption        GeneratePreprocessedFile;</div><div class='add'>+    triState                PreprocessSuppressLineNumbers;</div><div class='ctx'>     triState                GlobalOptimizations;</div><div class='ctx'>     triState                IgnoreStandardIncludePath;</div><div class='ctx'>     triState                ImproveFloatingPointConsistency;</div><div class='hunk'>@@ -528,6 +533,7 @@ public:</div><div class='ctx'>     triState                KeepComments;</div><div class='ctx'>     triState                MinimalRebuild;</div><div class='ctx'>     QString                 ObjectFile;</div><div class='add'>+    triState                OmitDefaultLibName;</div><div class='ctx'>     triState                OmitFramePointers;</div><div class='ctx'>     triState                OpenMP;</div><div class='ctx'>     optimizeOption          Optimization;</div><div class='hunk'>@@ -550,11 +556,24 @@ public:</div><div class='ctx'>     triState                UndefineAllPreprocessorDefinitions;</div><div class='ctx'>     QStringList             UndefinePreprocessorDefinitions;</div><div class='ctx'>     pchOption               UsePrecompiledHeader;</div><div class='add'>+    triState                UseUnicodeForAssemblerListing;</div><div class='ctx'>     triState                WarnAsError;</div><div class='ctx'>     warningLevelOption      WarningLevel;</div><div class='ctx'>     triState                WholeProgramOptimization;</div><div class='ctx'>     useOfArchitecture       CompileForArchitecture;</div><div class='ctx'>     triState                InterworkCalls;</div><div class='add'>+</div><div class='add'>+    // VS2010</div><div class='add'>+    triState                EnablePREfast;</div><div class='add'>+    triState                DisplayFullPaths;</div><div class='add'>+    triState                MultiProcessorCompilation;</div><div class='add'>+    QString                 MultiProcessorCompilationProcessorCount;</div><div class='add'>+    triState                GenerateXMLDocumentationFiles;</div><div class='add'>+    QString                 XMLDocumentationFileName;</div><div class='add'>+    QString                 ErrorReporting;</div><div class='add'>+    triState                CreateHotpatchableImage;</div><div class='add'>+    QString                 PreprocessOutputPath;</div><div class='add'>+</div><div class='ctx'>     VCConfiguration*        config;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -572,6 +591,7 @@ public:</div><div class='ctx'>     QStringList             AdditionalOptions;</div><div class='ctx'>     QStringList             AddModuleNamesToAssembly;</div><div class='ctx'>     QString                 BaseAddress;</div><div class='add'>+    triState                DataExecutionPrevention;</div><div class='ctx'>     QStringList             DelayLoadDLLs;</div><div class='ctx'>     optFoldingType          EnableCOMDATFolding;</div><div class='ctx'>     QString                 EntryPointSymbol;</div><div class='hunk'>@@ -602,6 +622,7 @@ public:</div><div class='ctx'>     optRefType              OptimizeReferences;</div><div class='ctx'>     QString                 OutputFile;</div><div class='ctx'>     QString                 ProgramDatabaseFile;</div><div class='add'>+    triState                RandomizedBaseAddress;</div><div class='ctx'>     triState                RegisterOutput;</div><div class='ctx'>     triState                ResourceOnlyDLL;</div><div class='ctx'>     triState                SetChecksum;</div><div class='hunk'>@@ -616,10 +637,33 @@ public:</div><div class='ctx'>     triState                SwapRunFromNet;</div><div class='ctx'>     machineTypeOption       TargetMachine;</div><div class='ctx'>     termSvrAwarenessType    TerminalServerAware;</div><div class='add'>+    triState                TreatWarningsAsErrors;</div><div class='ctx'>     triState                TurnOffAssemblyGeneration;</div><div class='ctx'>     QString                 TypeLibraryFile;</div><div class='ctx'>     qlonglong               TypeLibraryResourceID;</div><div class='ctx'>     QString                 Version;</div><div class='add'>+</div><div class='add'>+    // VS2010</div><div class='add'>+    triState                GenerateManifest;</div><div class='add'>+    QStringList             AdditionalManifestDependencies;</div><div class='add'>+    QString                 ManifestFile;</div><div class='add'>+    triState                EnableUAC;</div><div class='add'>+    QString                 UACExecutionLevel;</div><div class='add'>+    triState                UACUIAccess;</div><div class='add'>+    qlonglong               SectionAlignment;</div><div class='add'>+    triState                PreventDllBinding;</div><div class='add'>+    triState                AllowIsolation;</div><div class='add'>+    triState                AssemblyDebug;</div><div class='add'>+    QStringList             AssemblyLinkResource;</div><div class='add'>+    QString                 CLRImageType;</div><div class='add'>+    QString                 CLRSupportLastError;</div><div class='add'>+    QString                 CLRThreadAttribute;</div><div class='add'>+    triState                CLRUnmanagedCodeCheck;</div><div class='add'>+    triState                DelaySign;</div><div class='add'>+    QString                 KeyContainer;</div><div class='add'>+    QString                 KeyFile;</div><div class='add'>+    QString                 LinkErrorReporting;</div><div class='add'>+</div><div class='ctx'>     VCConfiguration*        config;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -662,6 +706,18 @@ public:</div><div class='ctx'>     triState                ValidateParameters;</div><div class='ctx'>     triState                WarnAsError;</div><div class='ctx'>     midlWarningLevelOption  WarningLevel;</div><div class='add'>+</div><div class='add'>+    // VS 2010</div><div class='add'>+    triState                ApplicationConfigurationMode;</div><div class='add'>+    QString                 GenerateClientFiles;</div><div class='add'>+    QString                 ClientStubFile;</div><div class='add'>+    QString                 TypeLibFormat;</div><div class='add'>+    triState                ValidateAllParameters;</div><div class='add'>+    triState                SuppressCompilerWarnings;</div><div class='add'>+    QString                 GenerateServerFiles;</div><div class='add'>+    QString                 ServerStubFile;</div><div class='add'>+    qlonglong               LocaleID;</div><div class='add'>+</div><div class='ctx'>     VCConfiguration*        config;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -671,7 +727,7 @@ public:</div><div class='ctx'>     // Functions</div><div class='ctx'>     VCLibrarianTool();</div><div class='ctx'>     virtual ~VCLibrarianTool(){}</div><div class='del'>-    bool parseOption(const char*){ return false; };</div><div class='add'>+    bool parseOption(const char*){ return false; }</div><div class='ctx'> </div><div class='ctx'>     // Variables</div><div class='ctx'>     QStringList             AdditionalDependencies;</div><div class='hunk'>@@ -692,7 +748,7 @@ public:</div><div class='ctx'>     // Functions</div><div class='ctx'>     VCCustomBuildTool();</div><div class='ctx'>     virtual ~VCCustomBuildTool(){}</div><div class='del'>-    bool parseOption(const char*){ return false; };</div><div class='add'>+    bool parseOption(const char*){ return false; }</div><div class='ctx'> </div><div class='ctx'>     // Variables</div><div class='ctx'>     QStringList             AdditionalDependencies;</div><div class='hunk'>@@ -701,6 +757,8 @@ public:</div><div class='ctx'>     QStringList             Outputs;</div><div class='ctx'>     QString                 ToolName;</div><div class='ctx'>     QString                 ToolPath;</div><div class='add'>+</div><div class='add'>+    VCConfiguration*        config;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> class VCResourceCompilerTool : public VCToolBase</div><div class='hunk'>@@ -709,7 +767,7 @@ public:</div><div class='ctx'>     // Functions</div><div class='ctx'>     VCResourceCompilerTool();</div><div class='ctx'>     virtual ~VCResourceCompilerTool(){}</div><div class='del'>-    bool parseOption(const char*){ return false; };</div><div class='add'>+    bool parseOption(const char*){ return false; }</div><div class='ctx'> </div><div class='ctx'>     // Variables</div><div class='ctx'>     QStringList             AdditionalIncludeDirectories;</div><div class='hunk'>@@ -721,6 +779,7 @@ public:</div><div class='ctx'>     QString                 ResourceOutputFileName;</div><div class='ctx'>     linkProgressOption      ShowProgress;</div><div class='ctx'>     QString                 ToolPath;</div><div class='add'>+    triState                SuppressStartupBanner;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> class VCDeploymentTool</div><div class='hunk'>@@ -741,15 +800,16 @@ class VCEventTool : public VCToolBase</div><div class='ctx'> {</div><div class='ctx'> protected:</div><div class='ctx'>     // Functions</div><div class='del'>-    VCEventTool() : ExcludedFromBuild(unset){};</div><div class='add'>+    VCEventTool(const QString &amp;eventName);</div><div class='ctx'>     virtual ~VCEventTool(){}</div><div class='del'>-    bool parseOption(const char*){ return false; };</div><div class='add'>+    bool parseOption(const char*){ return false; }</div><div class='ctx'> </div><div class='ctx'> public:</div><div class='ctx'>     // Variables</div><div class='ctx'>     QStringList             CommandLine;</div><div class='ctx'>     QString                 Description;</div><div class='ctx'>     triState                ExcludedFromBuild;</div><div class='add'>+    QString                 EventName;</div><div class='ctx'>     QString                 ToolName;</div><div class='ctx'>     QString                 ToolPath;</div><div class='ctx'> };</div><div class='hunk'>@@ -792,7 +852,8 @@ public:</div><div class='ctx'>     QString                 DeleteExtensionsOnClean;</div><div class='ctx'>     QString                 ImportLibrary;</div><div class='ctx'>     QString                 IntermediateDirectory;</div><div class='del'>-    QString                 Name;</div><div class='add'>+    QString                 Name;   // "ConfigurationName|PlatformName"</div><div class='add'>+    QString                 ConfigurationName;</div><div class='ctx'>     QString                 OutputDirectory;</div><div class='ctx'>     QString                 PrimaryOutput;</div><div class='ctx'>     QString                 ProgramDatabase;</div><div class='hunk'>@@ -849,14 +910,13 @@ class VCFilter</div><div class='ctx'> public:</div><div class='ctx'>     // Functions</div><div class='ctx'>     VCFilter();</div><div class='del'>-    ~VCFilter(){};</div><div class='add'>+    ~VCFilter(){}</div><div class='ctx'> </div><div class='ctx'>     void addFile(const QString&amp; filename);</div><div class='ctx'>     void addFile(const VCFilterFile&amp; fileInfo);</div><div class='ctx'>     void addFiles(const QStringList&amp; fileList);</div><div class='ctx'>     bool addExtraCompiler(const VCFilterFile &amp;info);</div><div class='ctx'>     void modifyPCHstage(QString str);</div><div class='del'>-    void outputFileConfig(XmlOutput &amp;xml, const QString &amp;filename);</div><div class='ctx'> </div><div class='ctx'>     // Variables</div><div class='ctx'>     QString                 Name;</div><div class='hunk'>@@ -874,9 +934,6 @@ public:</div><div class='ctx'> </div><div class='ctx'>     bool                    useCompilerTool;</div><div class='ctx'>     VCCLCompilerTool        CompilerTool;</div><div class='del'>-</div><div class='del'>-private:</div><div class='del'>-    friend XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;xml, VCFilter &amp;tool);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef QList&lt;VCFilter&gt; VCFilterList;</div><div class='hunk'>@@ -894,7 +951,7 @@ public:</div><div class='ctx'>         Extras</div><div class='ctx'>     };</div><div class='ctx'>     // Functions</div><div class='del'>-    VCProjectSingleConfig(){};</div><div class='add'>+    VCProjectSingleConfig(){}</div><div class='ctx'>     ~VCProjectSingleConfig(){}</div><div class='ctx'> </div><div class='ctx'>     // Variables</div><div class='hunk'>@@ -924,8 +981,6 @@ public:</div><div class='ctx'>     VCFilter               &amp;filterForExtraCompiler(const QString &amp;compilerName);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> // Tree &amp; Flat view of files --------------------------------------------------</div><div class='ctx'> class VCFilter;</div><div class='ctx'> class Node</div><div class='hunk'>@@ -1051,30 +1106,35 @@ public:</div><div class='ctx'> </div><div class='ctx'>     // List of all extracompilers</div><div class='ctx'>     QStringList             ExtraCompilers;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-    // Functions</div><div class='del'>-    void                    outputFilter(XmlOutput &amp;xml,</div><div class='del'>-//                                         VCProjectSingleConfig::FilterTypes type,</div><div class='del'>-                                         const QString &amp;filtername);</div><div class='del'>-</div><div class='del'>-    void                    outputFileConfigs(XmlOutput &amp;xml,</div><div class='del'>-//                                              VCProjectSingleConfig::FilterTypes type,</div><div class='del'>-                                              const VCFilterFile &amp;info,</div><div class='del'>-                                              const QString &amp;filtername);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCCLCompilerTool &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCLinkerTool &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCMIDLTool &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCCustomBuildTool &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCLibrarianTool &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCResourceCompilerTool &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCEventTool &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCDeploymentTool &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCConfiguration &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, VCFilter &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, const VCProjectSingleConfig &amp;);</div><div class='del'>-XmlOutput &amp;operator&lt;&lt;(XmlOutput &amp;, VCProject &amp;);</div><div class='add'>+class VCProjectWriter</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    virtual ~VCProjectWriter() {}</div><div class='add'>+</div><div class='add'>+    virtual void write(XmlOutput &amp;, VCProjectSingleConfig &amp;);</div><div class='add'>+    virtual void write(XmlOutput &amp;, VCProject &amp;);</div><div class='add'>+</div><div class='add'>+    virtual void write(XmlOutput &amp;, const VCCLCompilerTool &amp;);</div><div class='add'>+    virtual void write(XmlOutput &amp;, const VCLinkerTool &amp;);</div><div class='add'>+    virtual void write(XmlOutput &amp;, const VCMIDLTool &amp;);</div><div class='add'>+    virtual void write(XmlOutput &amp;, const VCCustomBuildTool &amp;);</div><div class='add'>+    virtual void write(XmlOutput &amp;, const VCLibrarianTool &amp;);</div><div class='add'>+    virtual void write(XmlOutput &amp;, const VCResourceCompilerTool &amp;);</div><div class='add'>+    virtual void write(XmlOutput &amp;, const VCEventTool &amp;);</div><div class='add'>+    virtual void write(XmlOutput &amp;, const VCDeploymentTool &amp;);</div><div class='add'>+    virtual void write(XmlOutput &amp;, const VCConfiguration &amp;);</div><div class='add'>+    virtual void write(XmlOutput &amp;, VCFilter &amp;);</div><div class='add'>+</div><div class='add'>+private:</div><div class='add'>+    static void outputFilter(VCProject &amp;project, XmlOutput &amp;xml, const QString &amp;filtername);</div><div class='add'>+    static void outputFileConfigs(VCProject &amp;project, XmlOutput &amp;xml, const VCFilterFile &amp;info, const QString &amp;filtername);</div><div class='add'>+    static void outputFileConfig(VCFilter &amp;filter, XmlOutput &amp;xml, const QString &amp;filename);</div><div class='add'>+</div><div class='add'>+    friend class TreeNode;</div><div class='add'>+    friend class FlatNode;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='head'>diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp<br/>index 4930779..9427970 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msvc_vcproj.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msvc_vcproj.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msvc_vcproj.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/win32/msvc_vcproj.cpp</a></div><div class='hunk'>@@ -51,7 +51,6 @@</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> </div><div class='ctx'> //#define DEBUG_SOLUTION_GEN</div><div class='del'>-//#define DEBUG_PROJECT_GEN</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> // Filter GUIDs (Do NOT change these!) ------------------------------</div><div class='hunk'>@@ -206,9 +205,19 @@ const char _slnExtSections[]    = "\n\tGlobalSection(ExtensibilityGlobals) = pos</div><div class='ctx'>                                   "\n\tEndGlobalSection";</div><div class='ctx'> // ------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-VcprojGenerator::VcprojGenerator() : Win32MakefileGenerator(), init_flag(false)</div><div class='add'>+VcprojGenerator::VcprojGenerator()</div><div class='add'>+    : Win32MakefileGenerator(),</div><div class='add'>+      init_flag(false),</div><div class='add'>+      is64Bit(false),</div><div class='add'>+      projectWriter(0)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+VcprojGenerator::~VcprojGenerator()</div><div class='add'>+{</div><div class='add'>+    delete projectWriter;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> bool VcprojGenerator::writeMakefile(QTextStream &amp;t)</div><div class='ctx'> {</div><div class='ctx'>     initProject(); // Fills the whole project with proper data</div><div class='hunk'>@@ -229,7 +238,7 @@ bool VcprojGenerator::writeMakefile(QTextStream &amp;t)</div><div class='ctx'>         if(!project-&gt;isActiveConfig("build_pass")) {</div><div class='ctx'>             debug_msg(1, "Generator: MSVC.NET: Writing single configuration project file");</div><div class='ctx'>             XmlOutput xmlOut(t);</div><div class='del'>-            xmlOut &lt;&lt; vcProject;</div><div class='add'>+            projectWriter-&gt;write(xmlOut, vcProject);</div><div class='ctx'>         }</div><div class='ctx'>         return true;</div><div class='ctx'>     }</div><div class='hunk'>@@ -272,7 +281,7 @@ bool VcprojGenerator::writeProjectMakefile()</div><div class='ctx'>            mergedProjects.at(0)-&gt;vcProject.Name ==</div><div class='ctx'>            mergedProjects.at(1)-&gt;vcProject.Name)</div><div class='ctx'>             mergedProjects.at(0)-&gt;writePrlFile();</div><div class='del'>-        mergedProject.Name = unescapeFilePath(project-&gt;first("QMAKE_ORIG_TARGET"));</div><div class='add'>+        mergedProject.Name = project-&gt;first("QMAKE_PROJECT_NAME");</div><div class='ctx'>         mergedProject.Version = mergedProjects.at(0)-&gt;vcProject.Version;</div><div class='ctx'>         mergedProject.ProjectGUID = project-&gt;isEmpty("QMAKE_UUID") ? getProjectUUID().toString().toUpper() : project-&gt;first("QMAKE_UUID");</div><div class='ctx'>         mergedProject.Keyword = project-&gt;first("VCPROJ_KEYWORD");</div><div class='hunk'>@@ -281,7 +290,7 @@ bool VcprojGenerator::writeProjectMakefile()</div><div class='ctx'>         mergedProject.PlatformName = mergedProjects.at(0)-&gt;vcProject.PlatformName;</div><div class='ctx'> </div><div class='ctx'>         XmlOutput xmlOut(t);</div><div class='del'>-        xmlOut &lt;&lt; mergedProject;</div><div class='add'>+        projectWriter-&gt;write(xmlOut, mergedProject);</div><div class='ctx'>         return true;</div><div class='ctx'>     } else if(project-&gt;first("TEMPLATE") == "vcsubdirs") {</div><div class='ctx'>         return writeMakefile(t);</div><div class='hunk'>@@ -451,6 +460,7 @@ void VcprojGenerator::writeSubDirs(QTextStream &amp;t)</div><div class='ctx'>                         tmp_vcproj.setProjectFile(&amp;tmp_proj);</div><div class='ctx'>                         Option::qmake_mode = old_mode;</div><div class='ctx'>                         if(Option::debug_level) {</div><div class='add'>+                            debug_msg(1, "Dumping all variables:");</div><div class='ctx'>                             QMap&lt;QString, QStringList&gt; &amp;vars = tmp_proj.variables();</div><div class='ctx'>                             for(QMap&lt;QString, QStringList&gt;::Iterator it = vars.begin();</div><div class='ctx'>                                 it != vars.end(); ++it) {</div><div class='hunk'>@@ -460,8 +470,8 @@ void VcprojGenerator::writeSubDirs(QTextStream &amp;t)</div><div class='ctx'>                             }</div><div class='ctx'>                         }</div><div class='ctx'> </div><div class='del'>-                        // We assume project filename is [QMAKE_ORIG_TARGET].vcproj</div><div class='del'>-                        QString vcproj = unescapeFilePath(tmp_vcproj.project-&gt;first("QMAKE_ORIG_TARGET") + project-&gt;first("VCPROJ_EXTENSION"));</div><div class='add'>+                        // We assume project filename is [QMAKE_PROJECT_NAME].vcproj</div><div class='add'>+                        QString vcproj = unescapeFilePath(tmp_vcproj.project-&gt;first("QMAKE_PROJECT_NAME") + project-&gt;first("VCPROJ_EXTENSION"));</div><div class='ctx'>                         QString vcprojDir = qmake_getpwd();</div><div class='ctx'> </div><div class='ctx'>                         // If file doesn't exsist, then maybe the users configuration</div><div class='hunk'>@@ -588,14 +598,16 @@ nextfile:</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'>     t &lt;&lt; _slnGlobalBeg;</div><div class='add'>+</div><div class='add'>+    QString slnConf = _slnSolutionConf;</div><div class='ctx'>     if (!project-&gt;isEmpty("CE_SDK") &amp;&amp; !project-&gt;isEmpty("CE_ARCH")) {</div><div class='del'>-        QString slnConfCE = _slnSolutionConf;</div><div class='del'>-        QString platform = QString("|") + project-&gt;values("CE_SDK").join(" ") + " (" + project-&gt;first("CE_ARCH") + ")";</div><div class='del'>-        slnConfCE.replace(QString("|Win32"), platform);</div><div class='del'>-        t &lt;&lt; slnConfCE;</div><div class='del'>-    } else {</div><div class='del'>-        t &lt;&lt; _slnSolutionConf;</div><div class='add'>+        QString slnPlatform = QString("|") + project-&gt;values("CE_SDK").join(" ") + " (" + project-&gt;first("CE_ARCH") + ")";</div><div class='add'>+        slnConf.replace(QString("|Win32"), slnPlatform);</div><div class='add'>+    } else if (is64Bit) {</div><div class='add'>+        slnConf.replace(QString("|Win32"), "|x64");</div><div class='ctx'>     }</div><div class='add'>+    t &lt;&lt; slnConf;</div><div class='add'>+</div><div class='ctx'>     t &lt;&lt; _slnProjDepBeg;</div><div class='ctx'> </div><div class='ctx'>     // Restore previous after_user_var options</div><div class='hunk'>@@ -612,7 +624,7 @@ nextfile:</div><div class='ctx'>     t &lt;&lt; _slnProjDepEnd;</div><div class='ctx'>     t &lt;&lt; _slnProjConfBeg;</div><div class='ctx'>     for(QList&lt;VcsolutionDepend*&gt;::Iterator it = solution_cleanup.begin(); it != solution_cleanup.end(); ++it) {</div><div class='del'>-        QString platform = "Win32";</div><div class='add'>+        QString platform = is64Bit ? "x64" : "Win32";</div><div class='ctx'>         if (!project-&gt;isEmpty("CE_SDK") &amp;&amp; !project-&gt;isEmpty("CE_ARCH"))</div><div class='ctx'>             platform = project-&gt;values("CE_SDK").join(" ") + " (" + project-&gt;first("CE_ARCH") + ")";</div><div class='ctx'>         t &lt;&lt; "\n\t\t" &lt;&lt; (*it)-&gt;uuid &lt;&lt; QString(_slnProjDbgConfTag1).arg(platform) &lt;&lt; platform;</div><div class='hunk'>@@ -649,12 +661,14 @@ bool VcprojGenerator::hasBuiltinCompiler(const QString &amp;file)</div><div class='ctx'> </div><div class='ctx'> void VcprojGenerator::init()</div><div class='ctx'> {</div><div class='del'>-    if(init_flag)</div><div class='add'>+    if (init_flag)</div><div class='ctx'>         return;</div><div class='del'>-    if(project-&gt;first("TEMPLATE") == "vcsubdirs") { //too much work for subdirs</div><div class='del'>-        init_flag = true;</div><div class='add'>+    init_flag = true;</div><div class='add'>+    is64Bit = (project-&gt;first("QMAKE_TARGET.arch") == "x86_64");</div><div class='add'>+    projectWriter = createProjectWriter();</div><div class='add'>+</div><div class='add'>+    if(project-&gt;first("TEMPLATE") == "vcsubdirs") //too much work for subdirs</div><div class='ctx'>         return;</div><div class='del'>-    }</div><div class='ctx'> </div><div class='ctx'>     debug_msg(1, "Generator: MSVC.NET: Initializing variables");</div><div class='ctx'> </div><div class='hunk'>@@ -667,6 +681,20 @@ void VcprojGenerator::init()</div><div class='ctx'>         project-&gt;values("QMAKESPEC").append(qgetenv("QMAKESPEC"));</div><div class='ctx'> </div><div class='ctx'>     processVars();</div><div class='add'>+</div><div class='add'>+    project-&gt;values("QMAKE_LIBS") += escapeFilePaths(project-&gt;values("LIBS"));</div><div class='add'>+    project-&gt;values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project-&gt;values("LIBS_PRIVATE"));</div><div class='add'>+</div><div class='add'>+    if(!project-&gt;values("VERSION").isEmpty()) {</div><div class='add'>+        QString version = project-&gt;values("VERSION")[0];</div><div class='add'>+        int firstDot = version.indexOf(".");</div><div class='add'>+        QString major = version.left(firstDot);</div><div class='add'>+        QString minor = version.right(version.length() - firstDot - 1);</div><div class='add'>+        minor.replace(QRegExp("\\."), "");</div><div class='add'>+        project-&gt;values("QMAKE_LFLAGS").append("/VERSION:" + major + "." + minor);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    MakefileGenerator::init();</div><div class='ctx'>     initOld();           // Currently calling old DSP code to set variables. CLEAN UP!</div><div class='ctx'> </div><div class='ctx'>     // Figure out what we're trying to build</div><div class='hunk'>@@ -749,11 +777,16 @@ void VcprojGenerator::init()</div><div class='ctx'> </div><div class='ctx'> bool VcprojGenerator::mergeBuildProject(MakefileGenerator *other)</div><div class='ctx'> {</div><div class='del'>-    VcprojGenerator *otherVC = static_cast&lt;VcprojGenerator*&gt;(other);</div><div class='del'>-    if (!otherVC) {</div><div class='add'>+    if (!other || !other-&gt;projectFile()) {</div><div class='add'>+        warn_msg(WarnLogic, "VcprojGenerator: Cannot merge null project.");</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+    if (other-&gt;projectFile()-&gt;first("MAKEFILE_GENERATOR") != project-&gt;first("MAKEFILE_GENERATOR")) {</div><div class='ctx'>         warn_msg(WarnLogic, "VcprojGenerator: Cannot merge other types of projects! (ignored)");</div><div class='ctx'>         return false;</div><div class='ctx'>     }</div><div class='add'>+</div><div class='add'>+    VcprojGenerator *otherVC = static_cast&lt;VcprojGenerator*&gt;(other);</div><div class='ctx'>     mergedProjects += otherVC;</div><div class='ctx'>     return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -777,6 +810,9 @@ void VcprojGenerator::initProject()</div><div class='ctx'>     // Own elements -----------------------------</div><div class='ctx'>     vcProject.Name = unescapeFilePath(project-&gt;first("QMAKE_ORIG_TARGET"));</div><div class='ctx'>     switch(which_dotnet_version()) {</div><div class='add'>+    case NET2010:</div><div class='add'>+        vcProject.Version = "10.00";</div><div class='add'>+        break;</div><div class='ctx'>     case NET2008:</div><div class='ctx'>         vcProject.Version = "9,00";</div><div class='ctx'>         break;</div><div class='hunk'>@@ -799,7 +835,7 @@ void VcprojGenerator::initProject()</div><div class='ctx'> </div><div class='ctx'>     vcProject.Keyword = project-&gt;first("VCPROJ_KEYWORD");</div><div class='ctx'>     if (project-&gt;isEmpty("CE_SDK") || project-&gt;isEmpty("CE_ARCH")) {</div><div class='del'>-        vcProject.PlatformName = (vcProject.Configuration.idl.TargetEnvironment == midlTargetWin64 ? "Win64" : "Win32");</div><div class='add'>+        vcProject.PlatformName = (is64Bit ? "x64" : "Win32");</div><div class='ctx'>     } else {</div><div class='ctx'>         vcProject.PlatformName = project-&gt;values("CE_SDK").join(" ") + " (" + project-&gt;first("CE_ARCH") + ")";</div><div class='ctx'>     }</div><div class='hunk'>@@ -846,11 +882,24 @@ void VcprojGenerator::initConfiguration()</div><div class='ctx'>         break;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='add'>+    conf.OutputDirectory = project-&gt;first("DESTDIR");</div><div class='add'>+    if (conf.OutputDirectory.isEmpty())</div><div class='add'>+        conf.OutputDirectory = ".\\";</div><div class='add'>+    if (!conf.OutputDirectory.endsWith("\\"))</div><div class='add'>+        conf.OutputDirectory += '\\';</div><div class='add'>+    if (conf.CompilerVersion &gt;= NET2010) {</div><div class='add'>+        // The target name could have been changed.</div><div class='add'>+        conf.PrimaryOutput = project-&gt;first("TARGET");</div><div class='add'>+        if ( !conf.PrimaryOutput.isEmpty() &amp;&amp; !project-&gt;first("TARGET_VERSION_EXT").isEmpty() &amp;&amp; project-&gt;isActiveConfig("shared"))</div><div class='add'>+            conf.PrimaryOutput.append(project-&gt;first("TARGET_VERSION_EXT"));</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     conf.Name = project-&gt;values("BUILD_NAME").join(" ");</div><div class='ctx'>     if (conf.Name.isEmpty())</div><div class='ctx'>         conf.Name = isDebug ? "Debug" : "Release";</div><div class='add'>+    conf.ConfigurationName = conf.Name;</div><div class='ctx'>     if (project-&gt;isEmpty("CE_SDK") || project-&gt;isEmpty("CE_ARCH")) {</div><div class='del'>-        conf.Name += (conf.idl.TargetEnvironment == midlTargetWin64 ? "|Win64" : "|Win32");</div><div class='add'>+        conf.Name += (is64Bit ? "|x64" : "|Win32");</div><div class='ctx'>     } else {</div><div class='ctx'>         conf.Name += "|" + project-&gt;values("CE_SDK").join(" ") + " (" + project-&gt;first("CE_ARCH") + ")";</div><div class='ctx'>     }</div><div class='hunk'>@@ -861,8 +910,6 @@ void VcprojGenerator::initConfiguration()</div><div class='ctx'>     conf.DeleteExtensionsOnClean = project-&gt;first("DeleteExtensionsOnClean");</div><div class='ctx'>     conf.ImportLibrary = conf.linker.ImportLibrary;</div><div class='ctx'>     conf.IntermediateDirectory = project-&gt;first("OBJECTS_DIR");</div><div class='del'>-    conf.OutputDirectory = ".";</div><div class='del'>-    conf.PrimaryOutput = project-&gt;first("PrimaryOutput");</div><div class='ctx'>     conf.WholeProgramOptimization = conf.compiler.WholeProgramOptimization;</div><div class='ctx'>     temp = project-&gt;first("UseOfATL");</div><div class='ctx'>     if(!temp.isEmpty())</div><div class='hunk'>@@ -887,7 +934,6 @@ void VcprojGenerator::initConfiguration()</div><div class='ctx'>     } else {</div><div class='ctx'>         conf.compiler.PreprocessorDefinitions += "NDEBUG";</div><div class='ctx'>     }</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void VcprojGenerator::initCompilerTool()</div><div class='hunk'>@@ -907,39 +953,24 @@ void VcprojGenerator::initCompilerTool()</div><div class='ctx'>         conf.compiler.PrecompiledHeaderFile    = "$(IntDir)\\" + precompPch;</div><div class='ctx'>         conf.compiler.PrecompiledHeaderThrough = project-&gt;first("PRECOMPILED_HEADER");</div><div class='ctx'>         conf.compiler.ForcedIncludeFiles       = project-&gt;values("PRECOMPILED_HEADER");</div><div class='del'>-        // Minimal build option triggers an Internal Compiler Error</div><div class='del'>-        // when used in conjunction with /FI and /Yu, so remove it</div><div class='del'>-        project-&gt;values("QMAKE_CFLAGS_DEBUG").removeAll("-Gm");</div><div class='del'>-        project-&gt;values("QMAKE_CFLAGS_DEBUG").removeAll("/Gm");</div><div class='del'>-        project-&gt;values("QMAKE_CXXFLAGS_DEBUG").removeAll("-Gm");</div><div class='del'>-        project-&gt;values("QMAKE_CXXFLAGS_DEBUG").removeAll("/Gm");</div><div class='del'>-    }</div><div class='ctx'> </div><div class='del'>-    conf.compiler.parseOptions(project-&gt;values("QMAKE_CXXFLAGS"));</div><div class='del'>-    if(project-&gt;isActiveConfig("debug")){</div><div class='del'>-        // Debug version</div><div class='del'>-        if((projectTarget == Application) || (projectTarget == StaticLib))</div><div class='del'>-            conf.compiler.parseOptions(project-&gt;values("QMAKE_CXXFLAGS_MT_DBG"));</div><div class='del'>-        else</div><div class='del'>-            conf.compiler.parseOptions(project-&gt;values("QMAKE_CXXFLAGS_MT_DLLDBG"));</div><div class='del'>-    } else {</div><div class='del'>-        // Release version</div><div class='del'>-        conf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG";</div><div class='del'>-        conf.compiler.PreprocessorDefinitions += "NDEBUG";</div><div class='del'>-        if((projectTarget == Application) || (projectTarget == StaticLib))</div><div class='del'>-            conf.compiler.parseOptions(project-&gt;values("QMAKE_CXXFLAGS_MT"));</div><div class='del'>-        else</div><div class='del'>-            conf.compiler.parseOptions(project-&gt;values("QMAKE_CXXFLAGS_MT_DLL"));</div><div class='add'>+        if (conf.CompilerVersion &lt;= NET2003) {</div><div class='add'>+            // Minimal build option triggers an Internal Compiler Error</div><div class='add'>+            // when used in conjunction with /FI and /Yu, so remove it</div><div class='add'>+            // ### work-around for a VS 2003 bug. Move to some prf file or remove completely.</div><div class='add'>+            project-&gt;values("QMAKE_CFLAGS_DEBUG").removeAll("-Gm");</div><div class='add'>+            project-&gt;values("QMAKE_CFLAGS_DEBUG").removeAll("/Gm");</div><div class='add'>+            project-&gt;values("QMAKE_CXXFLAGS_DEBUG").removeAll("-Gm");</div><div class='add'>+            project-&gt;values("QMAKE_CXXFLAGS_DEBUG").removeAll("/Gm");</div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    // Common for both release and debug</div><div class='del'>-    if(project-&gt;isActiveConfig("windows"))</div><div class='del'>-        conf.compiler.PreprocessorDefinitions += project-&gt;values("MSVCPROJ_WINCONDEF");</div><div class='add'>+    conf.compiler.parseOptions(project-&gt;values("QMAKE_CXXFLAGS"));</div><div class='ctx'> </div><div class='del'>-    // Can this be set for ALL configs?</div><div class='del'>-    // If so, use qmake.conf!</div><div class='del'>-    if(projectTarget == SharedLib)</div><div class='add'>+    if (project-&gt;isActiveConfig("windows"))</div><div class='ctx'>         conf.compiler.PreprocessorDefinitions += "_WINDOWS";</div><div class='add'>+    else if (project-&gt;isActiveConfig("console"))</div><div class='add'>+        conf.compiler.PreprocessorDefinitions += "_CONSOLE";</div><div class='ctx'> </div><div class='ctx'>     conf.compiler.PreprocessorDefinitions += project-&gt;values("DEFINES");</div><div class='ctx'>     conf.compiler.PreprocessorDefinitions += project-&gt;values("PRL_EXPORT_DEFINES");</div><div class='hunk'>@@ -949,13 +980,7 @@ void VcprojGenerator::initCompilerTool()</div><div class='ctx'> void VcprojGenerator::initLibrarianTool()</div><div class='ctx'> {</div><div class='ctx'>     VCConfiguration &amp;conf = vcProject.Configuration;</div><div class='del'>-    conf.librarian.OutputFile = project-&gt;first("DESTDIR");</div><div class='del'>-    if(conf.librarian.OutputFile.isEmpty())</div><div class='del'>-        conf.librarian.OutputFile = ".\\";</div><div class='del'>-</div><div class='del'>-    if(!conf.librarian.OutputFile.endsWith("\\"))</div><div class='del'>-        conf.librarian.OutputFile += '\\';</div><div class='del'>-</div><div class='add'>+    conf.librarian.OutputFile = "$(OutDir)\\";</div><div class='ctx'>     conf.librarian.OutputFile += project-&gt;first("MSVCPROJ_TARGET");</div><div class='ctx'>     conf.librarian.AdditionalOptions += project-&gt;values("QMAKE_LIBFLAGS");</div><div class='ctx'> }</div><div class='hunk'>@@ -964,7 +989,17 @@ void VcprojGenerator::initLinkerTool()</div><div class='ctx'> {</div><div class='ctx'>     findLibraries(); // Need to add the highest version of the libs</div><div class='ctx'>     VCConfiguration &amp;conf = vcProject.Configuration;</div><div class='del'>-    conf.linker.parseOptions(project-&gt;values("MSVCPROJ_LFLAGS"));</div><div class='add'>+    conf.linker.parseOptions(project-&gt;values("QMAKE_LFLAGS"));</div><div class='add'>+</div><div class='add'>+    foreach (const QString &amp;libDir, project-&gt;values("QMAKE_LIBDIR")) {</div><div class='add'>+        if (libDir.startsWith("/LIBPATH:"))</div><div class='add'>+            conf.linker.AdditionalLibraryDirectories += libDir.mid(9);</div><div class='add'>+        else</div><div class='add'>+            conf.linker.AdditionalLibraryDirectories += libDir;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (!project-&gt;values("DEF_FILE").isEmpty())</div><div class='add'>+        conf.linker.ModuleDefinitionFile = project-&gt;first("DEF_FILE");</div><div class='ctx'> </div><div class='ctx'>     foreach(QString libs, project-&gt;values("MSVCPROJ_LIBS")) {</div><div class='ctx'>         if (libs.left(9).toUpper() == "/LIBPATH:") {</div><div class='hunk'>@@ -975,24 +1010,7 @@ void VcprojGenerator::initLinkerTool()</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    switch (projectTarget) {</div><div class='del'>-    case Application:</div><div class='del'>-        conf.linker.OutputFile = project-&gt;first("DESTDIR");</div><div class='del'>-        break;</div><div class='del'>-    case SharedLib:</div><div class='del'>-        conf.linker.parseOptions(project-&gt;values("MSVCPROJ_LIBOPTIONS"));</div><div class='del'>-        conf.linker.OutputFile = project-&gt;first("DESTDIR");</div><div class='del'>-        break;</div><div class='del'>-    case StaticLib: //unhandled - added to remove warnings..</div><div class='del'>-        break;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if(conf.linker.OutputFile.isEmpty())</div><div class='del'>-        conf.linker.OutputFile = ".\\";</div><div class='del'>-</div><div class='del'>-    if(!conf.linker.OutputFile.endsWith("\\"))</div><div class='del'>-        conf.linker.OutputFile += '\\';</div><div class='del'>-</div><div class='add'>+    conf.linker.OutputFile = "$(OutDir)\\";</div><div class='ctx'>     conf.linker.OutputFile += project-&gt;first("MSVCPROJ_TARGET");</div><div class='ctx'> </div><div class='ctx'>     if(project-&gt;isActiveConfig("dll")){</div><div class='hunk'>@@ -1011,10 +1029,9 @@ void VcprojGenerator::initResourceTool()</div><div class='ctx'>     if(project-&gt;isActiveConfig("debug"))</div><div class='ctx'>         conf.resource.PreprocessorDefinitions += "_DEBUG";</div><div class='ctx'>     if(project-&gt;isActiveConfig("staticlib"))</div><div class='del'>-        conf.resource.ResourceOutputFileName = project-&gt;first("DESTDIR") + "/$(InputName).res";</div><div class='add'>+        conf.resource.ResourceOutputFileName = "$(OutDir)\\$(InputName).res";</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> void VcprojGenerator::initIDLTool()</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -1030,22 +1047,26 @@ void VcprojGenerator::initPreBuildEventTools()</div><div class='ctx'> void VcprojGenerator::initPostBuildEventTools()</div><div class='ctx'> {</div><div class='ctx'>     VCConfiguration &amp;conf = vcProject.Configuration;</div><div class='del'>-    if(!project-&gt;values("QMAKE_POST_LINK").isEmpty()) {</div><div class='add'>+    if (!project-&gt;values("QMAKE_POST_LINK").isEmpty()) {</div><div class='ctx'>         QStringList cmdline = VCToolBase::fixCommandLine(var("QMAKE_POST_LINK"));</div><div class='ctx'>         conf.postBuild.CommandLine = cmdline;</div><div class='ctx'>         conf.postBuild.Description = cmdline.join(QLatin1String("\r\n"));</div><div class='add'>+        conf.postBuild.ExcludedFromBuild = _False;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     QString signature = !project-&gt;isEmpty("SIGNATURE_FILE") ? var("SIGNATURE_FILE") : var("DEFAULT_SIGNATURE");</div><div class='ctx'>     bool useSignature = !signature.isEmpty() &amp;&amp; !project-&gt;isActiveConfig("staticlib") &amp;&amp;</div><div class='ctx'>                         !project-&gt;isEmpty("CE_SDK") &amp;&amp; !project-&gt;isEmpty("CE_ARCH");</div><div class='del'>-    if(useSignature)</div><div class='add'>+    if (useSignature) {</div><div class='ctx'>         conf.postBuild.CommandLine.prepend(</div><div class='ctx'>                 QLatin1String("signtool sign /F ") + signature + QLatin1String(" \"$(TargetPath)\""));</div><div class='add'>+        conf.postBuild.ExcludedFromBuild = _False;</div><div class='add'>+    }</div><div class='ctx'> </div><div class='del'>-    if(!project-&gt;values("MSVCPROJ_COPY_DLL").isEmpty()) {</div><div class='add'>+    if (!project-&gt;values("MSVCPROJ_COPY_DLL").isEmpty()) {</div><div class='ctx'>         conf.postBuild.Description += var("MSVCPROJ_COPY_DLL_DESC");</div><div class='ctx'>         conf.postBuild.CommandLine += var("MSVCPROJ_COPY_DLL");</div><div class='add'>+        conf.postBuild.ExcludedFromBuild = _False;</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1133,7 +1154,8 @@ void VcprojGenerator::initDeploymentTool()</div><div class='ctx'>             devicePath = Option::fixPathToLocalOS(QDir::cleanPath(targetPath + QLatin1Char('\\') + devicePath));</div><div class='ctx'>         }</div><div class='ctx'>         // foreach d in item.sources</div><div class='del'>-        foreach(QString source, project-&gt;values(item + ".sources")) {</div><div class='add'>+        // ### Qt 5: remove .sources, inconsistent with INSTALLS</div><div class='add'>+        foreach(QString source, project-&gt;values(item + ".sources") + project-&gt;values(item + ".files")) {</div><div class='ctx'>             QString itemDevicePath = devicePath;</div><div class='ctx'>             source = Option::fixPathToLocalOS(source);</div><div class='ctx'>             QString nameFilter;</div><div class='hunk'>@@ -1175,6 +1197,7 @@ void VcprojGenerator::initPreLinkEventTools()</div><div class='ctx'>         QStringList cmdline = VCToolBase::fixCommandLine(var("QMAKE_PRE_LINK"));</div><div class='ctx'>         conf.preLink.CommandLine = cmdline;</div><div class='ctx'>         conf.preLink.Description = cmdline.join(QLatin1String("\r\n"));</div><div class='add'>+        conf.preLink.ExcludedFromBuild = _False;</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1266,7 +1289,6 @@ void VcprojGenerator::initTranslationFiles()</div><div class='ctx'>     vcProject.TranslationFiles.CustomBuild = none;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> void VcprojGenerator::initFormFiles()</div><div class='ctx'> {</div><div class='ctx'>     vcProject.FormFiles.Name = "Form Files";</div><div class='hunk'>@@ -1282,7 +1304,6 @@ void VcprojGenerator::initFormFiles()</div><div class='ctx'>     vcProject.FormFiles.CustomBuild = none;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> void VcprojGenerator::initResourceFiles()</div><div class='ctx'> {</div><div class='ctx'>     vcProject.ResourceFiles.Name = "Resource Files";</div><div class='hunk'>@@ -1414,86 +1435,11 @@ void VcprojGenerator::initExtraCompilerOutputs()</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* \internal</div><div class='del'>-    Sets up all needed variables from the environment and all the different caches and .conf files</div><div class='del'>-*/</div><div class='del'>-</div><div class='ctx'> void VcprojGenerator::initOld()</div><div class='ctx'> {</div><div class='del'>-    if(init_flag)</div><div class='del'>-        return;</div><div class='del'>-</div><div class='del'>-    init_flag = true;</div><div class='del'>-    QStringList::Iterator it;</div><div class='del'>-</div><div class='del'>-    // Decode version, and add it to $$MSVCPROJ_VERSION --------------</div><div class='del'>-    if(!project-&gt;values("VERSION").isEmpty()) {</div><div class='del'>-        QString version = project-&gt;values("VERSION")[0];</div><div class='del'>-        int firstDot = version.indexOf(".");</div><div class='del'>-        QString major = version.left(firstDot);</div><div class='del'>-        QString minor = version.right(version.length() - firstDot - 1);</div><div class='del'>-        minor.replace(QRegExp("\\."), "");</div><div class='del'>-        project-&gt;values("MSVCPROJ_VERSION").append("/VERSION:" + major + "." + minor);</div><div class='del'>-        project-&gt;values("QMAKE_LFLAGS").append("/VERSION:" + major + "." + minor);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    project-&gt;values("QMAKE_LIBS") += escapeFilePaths(project-&gt;values("LIBS"));</div><div class='del'>-    project-&gt;values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project-&gt;values("LIBS_PRIVATE"));</div><div class='del'>-</div><div class='del'>-     // Get filename w/o extension -----------------------------------</div><div class='del'>-    QString msvcproj_project = "";</div><div class='del'>-    QString targetfilename = "";</div><div class='del'>-    if(!project-&gt;isEmpty("TARGET")) {</div><div class='del'>-        project-&gt;values("TARGET") = unescapeFilePaths(project-&gt;values("TARGET"));</div><div class='del'>-        targetfilename = msvcproj_project = project-&gt;first("TARGET");</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    // Init base class too -------------------------------------------</div><div class='del'>-    MakefileGenerator::init();</div><div class='del'>-</div><div class='del'>-    if(msvcproj_project.isEmpty())</div><div class='del'>-        msvcproj_project = Option::output.fileName();</div><div class='del'>-</div><div class='del'>-    msvcproj_project = msvcproj_project.right(msvcproj_project.length() - msvcproj_project.lastIndexOf("\\") - 1);</div><div class='del'>-    msvcproj_project = msvcproj_project.left(msvcproj_project.lastIndexOf("."));</div><div class='del'>-    msvcproj_project.replace(QRegExp("-"), "");</div><div class='del'>-</div><div class='del'>-    project-&gt;values("MSVCPROJ_PROJECT").append(msvcproj_project);</div><div class='del'>-    QStringList &amp;proj = project-&gt;values("MSVCPROJ_PROJECT");</div><div class='del'>-</div><div class='del'>-    for(it = proj.begin(); it != proj.end(); ++it)</div><div class='del'>-        (*it).replace(QRegExp("\\.[a-zA-Z0-9_]*$"), "");</div><div class='del'>-</div><div class='del'>-    // SUBSYSTEM -----------------------------------------------------</div><div class='del'>-    if(!project-&gt;values("QMAKE_APP_FLAG").isEmpty()) {</div><div class='del'>-            project-&gt;values("MSVCPROJ_TEMPLATE").append("win32app" + project-&gt;first("VCPROJ_EXTENSION"));</div><div class='del'>-            if(project-&gt;isActiveConfig("console")) {</div><div class='del'>-                project-&gt;values("MSVCPROJ_CONSOLE").append("CONSOLE");</div><div class='del'>-                project-&gt;values("MSVCPROJ_WINCONDEF").append("_CONSOLE");</div><div class='del'>-                project-&gt;values("MSVCPROJ_VCPROJTYPE").append("0x0103");</div><div class='del'>-                project-&gt;values("MSVCPROJ_SUBSYSTEM").append("CONSOLE");</div><div class='del'>-            } else {</div><div class='del'>-                project-&gt;values("MSVCPROJ_CONSOLE").clear();</div><div class='del'>-                project-&gt;values("MSVCPROJ_WINCONDEF").append("_WINDOWS");</div><div class='del'>-                project-&gt;values("MSVCPROJ_VCPROJTYPE").append("0x0101");</div><div class='del'>-                project-&gt;values("MSVCPROJ_SUBSYSTEM").append("WINDOWS");</div><div class='del'>-            }</div><div class='del'>-    }</div><div class='del'>-</div><div class='ctx'>     // $$QMAKE.. -&gt; $$MSVCPROJ.. -------------------------------------</div><div class='ctx'>     project-&gt;values("MSVCPROJ_LIBS") += project-&gt;values("QMAKE_LIBS");</div><div class='ctx'>     project-&gt;values("MSVCPROJ_LIBS") += project-&gt;values("QMAKE_LIBS_PRIVATE");</div><div class='del'>-    project-&gt;values("MSVCPROJ_LFLAGS") += project-&gt;values("QMAKE_LFLAGS");</div><div class='del'>-    if(!project-&gt;values("QMAKE_LIBDIR").isEmpty()) {</div><div class='del'>-        QStringList strl = project-&gt;values("QMAKE_LIBDIR");</div><div class='del'>-        QStringList::iterator stri;</div><div class='del'>-        for(stri = strl.begin(); stri != strl.end(); ++stri) {</div><div class='del'>-            if(!(*stri).startsWith("/LIBPATH:"))</div><div class='del'>-                (*stri).prepend("/LIBPATH:");</div><div class='del'>-        }</div><div class='del'>-        project-&gt;values("MSVCPROJ_LFLAGS") += strl;</div><div class='del'>-    }</div><div class='del'>-    project-&gt;values("MSVCPROJ_CXXFLAGS") += project-&gt;values("QMAKE_CXXFLAGS");</div><div class='ctx'>     QStringList &amp;incs = project-&gt;values("INCLUDEPATH");</div><div class='ctx'>     for(QStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) {</div><div class='ctx'>         QString inc = (*incit);</div><div class='hunk'>@@ -1532,9 +1478,6 @@ void VcprojGenerator::initOld()</div><div class='ctx'>         project-&gt;values("MSVCPROJ_COPY_DLL_DESC").append(deststr);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    if (!project-&gt;values("DEF_FILE").isEmpty())</div><div class='del'>-        project-&gt;values("MSVCPROJ_LFLAGS").append("/DEF:"+project-&gt;first("DEF_FILE"));</div><div class='del'>-</div><div class='ctx'>     project-&gt;values("QMAKE_INTERNAL_PRL_LIBS") &lt;&lt; "MSVCPROJ_LIBS";</div><div class='ctx'> </div><div class='ctx'>     // Verbose output if "-d -d"...</div><div class='hunk'>@@ -1544,6 +1487,11 @@ void VcprojGenerator::initOld()</div><div class='ctx'> // ------------------------------------------------------------------------------------------------</div><div class='ctx'> // ------------------------------------------------------------------------------------------------</div><div class='ctx'> </div><div class='add'>+VCProjectWriter *VcprojGenerator::createProjectWriter()</div><div class='add'>+{</div><div class='add'>+    return new VCProjectWriter;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> QString VcprojGenerator::replaceExtraCompilerVariables(const QString &amp;var, const QStringList &amp;in, const QStringList &amp;out)</div><div class='ctx'> {</div><div class='ctx'>     QString ret = MakefileGenerator::replaceExtraCompilerVariables(var, in, out);</div><div class='hunk'>@@ -1562,8 +1510,6 @@ QString VcprojGenerator::replaceExtraCompilerVariables(const QString &amp;var, const</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> bool VcprojGenerator::openOutput(QFile &amp;file, const QString &amp;/*build*/) const</div><div class='ctx'> {</div><div class='ctx'>     QString outdir;</div><div class='hunk'>@@ -1615,28 +1561,13 @@ QString VcprojGenerator::findTemplate(QString file)</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-void VcprojGenerator::processPrlVariable(const QString &amp;var, const QStringList &amp;l)</div><div class='del'>-{</div><div class='del'>-    if(var == "QMAKE_PRL_DEFINES") {</div><div class='del'>-        QStringList &amp;out = project-&gt;values("MSVCPROJ_DEFINES");</div><div class='del'>-        for(QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {</div><div class='del'>-            if(out.indexOf((*it)) == -1)</div><div class='del'>-                out.append((" /D " + *it));</div><div class='del'>-        }</div><div class='del'>-    } else {</div><div class='del'>-        MakefileGenerator::processPrlVariable(var, l);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void VcprojGenerator::outputVariables()</div><div class='ctx'> {</div><div class='ctx'> #if 0</div><div class='ctx'>     qDebug("Generator: MSVC.NET: List of current variables:");</div><div class='ctx'>     for(QMap&lt;QString, QStringList&gt;::ConstIterator it = project-&gt;variables().begin(); it != project-&gt;variables().end(); ++it)</div><div class='del'>-        qDebug("Generator: MSVC.NET: %s =&gt; %s", it.key().toLatin1().constData(), it.data().join(" | ").toLatin1().constData());</div><div class='add'>+        qDebug("Generator: MSVC.NET: %s =&gt; %s", qPrintable(it.key()), qPrintable(it.value().join(" | ")));</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='del'>-</div><div class='head'>diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h<br/>index bb7a323..5c3cb89 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msvc_vcproj.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msvc_vcproj.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msvc_vcproj.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/win32/msvc_vcproj.h</a></div><div class='hunk'>@@ -57,6 +57,7 @@ struct QUuid;</div><div class='ctx'> class VcprojGenerator : public Win32MakefileGenerator</div><div class='ctx'> {</div><div class='ctx'>     bool init_flag;</div><div class='add'>+    bool is64Bit;</div><div class='ctx'>     bool writeVcprojParts(QTextStream &amp;);</div><div class='ctx'> </div><div class='ctx'>     bool writeMakefile(QTextStream &amp;);</div><div class='hunk'>@@ -78,8 +79,10 @@ public:</div><div class='ctx'>     QMap&lt;QString, QStringList&gt; extraCompilerSources;</div><div class='ctx'>     QMap&lt;QString, QStringList&gt; extraCompilerOutputs;</div><div class='ctx'>     bool usePCH;</div><div class='add'>+    VCProjectWriter *projectWriter;</div><div class='ctx'> </div><div class='ctx'> protected:</div><div class='add'>+    virtual VCProjectWriter *createProjectWriter();</div><div class='ctx'>     virtual bool doDepends() const { return false; } //never necesary</div><div class='ctx'>     virtual void processSources() { filterIncludedFiles("SOURCES"); filterIncludedFiles("GENERATED_SOURCES"); }</div><div class='ctx'>     virtual QString replaceExtraCompilerVariables(const QString &amp;, const QStringList &amp;, const QStringList &amp;);</div><div class='hunk'>@@ -90,7 +93,6 @@ protected:</div><div class='ctx'>     virtual bool mergeBuildProject(MakefileGenerator *other);</div><div class='ctx'> </div><div class='ctx'>     virtual bool openOutput(QFile &amp;file, const QString &amp;build) const;</div><div class='del'>-    virtual void processPrlVariable(const QString &amp;, const QStringList &amp;);</div><div class='ctx'>     virtual bool findLibraries();</div><div class='ctx'>     virtual void outputVariables();</div><div class='ctx'>     QString fixFilename(QString ofile) const;</div><div class='hunk'>@@ -135,9 +137,6 @@ private:</div><div class='ctx'>     friend class VCFilter;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-inline VcprojGenerator::~VcprojGenerator()</div><div class='del'>-{ }</div><div class='del'>-</div><div class='ctx'> inline QString VcprojGenerator::defaultMakefile() const</div><div class='ctx'> {</div><div class='ctx'>     return project-&gt;first("TARGET") + project-&gt;first("VCPROJ_EXTENSION");</div><div class='head'>diff --git a/qmake/generators/win32/msvc_vcxproj.cpp b/qmake/generators/win32/msvc_vcxproj.cpp<br/>index 685d6f3..429025f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msvc_vcxproj.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msvc_vcxproj.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msvc_vcxproj.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/win32/msvc_vcxproj.cpp</a></div><div class='hunk'>@@ -41,798 +41,16 @@</div><div class='ctx'> </div><div class='ctx'> #include "msvc_vcxproj.h"</div><div class='ctx'> #include "msbuild_objectmodel.h"</div><div class='del'>-#include &lt;qdir.h&gt;</div><div class='del'>-#include &lt;qdiriterator.h&gt;</div><div class='del'>-#include &lt;quuid.h&gt;</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='del'>-// Filter GUIDs (Do NOT change these!) ------------------------------</div><div class='del'>-const char _GUIDSourceFiles[]          = "{4FC737F1-C7A5-4376-A066-2A32D752A2FF}";</div><div class='del'>-const char _GUIDHeaderFiles[]          = "{93995380-89BD-4b04-88EB-625FBE52EBFB}";</div><div class='del'>-const char _GUIDGeneratedFiles[]       = "{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}";</div><div class='del'>-const char _GUIDResourceFiles[]        = "{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}";</div><div class='del'>-const char _GUIDLexYaccFiles[]         = "{E12AE0D2-192F-4d59-BD23-7D3FA58D3183}";</div><div class='del'>-const char _GUIDTranslationFiles[]     = "{639EADAA-A684-42e4-A9AD-28FC9BCB8F7C}";</div><div class='del'>-const char _GUIDFormFiles[]            = "{99349809-55BA-4b9d-BF79-8FDBB0286EB3}";</div><div class='del'>-const char _GUIDExtraCompilerFiles[]   = "{E0D8C965-CC5F-43d7-AD63-FAEF0BBC0F85}";</div><div class='del'>-QT_END_NAMESPACE</div><div class='del'>-</div><div class='del'>-QT_BEGIN_NAMESPACE</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> VcxprojGenerator::VcxprojGenerator() : VcprojGenerator()</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-bool VcxprojGenerator::writeMakefile(QTextStream &amp;t)</div><div class='del'>-{</div><div class='del'>-    initProject(); // Fills the whole project with proper data</div><div class='del'>-</div><div class='del'>-    // Generate solution file</div><div class='del'>-    if(project-&gt;first("TEMPLATE") == "vcsubdirs") {</div><div class='del'>-        if (!project-&gt;isActiveConfig("build_pass")) {</div><div class='del'>-            debug_msg(1, "Generator: MSVC.NET: Writing solution file");</div><div class='del'>-            writeSubDirs(t);</div><div class='del'>-        } else {</div><div class='del'>-            debug_msg(1, "Generator: MSVC.NET: Not writing solution file for build_pass configs");</div><div class='del'>-        }</div><div class='del'>-        return true;</div><div class='del'>-    } else</div><div class='del'>-    // Generate single configuration project file</div><div class='del'>-    if (project-&gt;first("TEMPLATE") == "vcapp" ||</div><div class='del'>-        project-&gt;first("TEMPLATE") == "vclib") {</div><div class='del'>-        if(!project-&gt;isActiveConfig("build_pass")) {</div><div class='del'>-            debug_msg(1, "Generator: MSVC.NET: Writing single configuration project file");</div><div class='del'>-            XmlOutput xmlOut(t);</div><div class='del'>-            xmlOut &lt;&lt; vcxProject;</div><div class='del'>-        }</div><div class='del'>-        return true;</div><div class='del'>-    }</div><div class='del'>-    return project-&gt;isActiveConfig("build_pass");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void VcxprojGenerator::initProject()</div><div class='del'>-{</div><div class='del'>-    // Initialize XML sub elements</div><div class='del'>-    // - Do this first since project elements may need</div><div class='del'>-    // - to know of certain configuration options</div><div class='del'>-    initConfiguration();</div><div class='del'>-    initRootFiles();</div><div class='del'>-    initSourceFiles();</div><div class='del'>-    initHeaderFiles();</div><div class='del'>-    initGeneratedFiles();</div><div class='del'>-    initLexYaccFiles();</div><div class='del'>-    initTranslationFiles();</div><div class='del'>-    initFormFiles();</div><div class='del'>-    initResourceFiles();</div><div class='del'>-    initExtraCompilerOutputs();</div><div class='del'>-</div><div class='del'>-    // Own elements -----------------------------</div><div class='del'>-    vcxProject.Name = unescapeFilePath(project-&gt;first("QMAKE_ORIG_TARGET"));</div><div class='del'>-</div><div class='del'>-    vcxProject.Keyword = project-&gt;first("VCPROJ_KEYWORD");</div><div class='del'>-    if (project-&gt;isEmpty("CE_SDK") || project-&gt;isEmpty("CE_ARCH")) {</div><div class='del'>-        vcxProject.PlatformName = vcxProject.Configuration.idl.TargetEnvironment;</div><div class='del'>-        if ( vcxProject.Configuration.idl.TargetEnvironment.isEmpty() )</div><div class='del'>-            vcxProject.PlatformName = "Win32";</div><div class='del'>-    } else {</div><div class='del'>-        vcxProject.PlatformName = project-&gt;values("CE_SDK").join(" ") + " (" + project-&gt;first("CE_ARCH") + ")";</div><div class='del'>-    }</div><div class='del'>-    // These are not used by Qt, but may be used by customers</div><div class='del'>-    vcxProject.SccProjectName = project-&gt;first("SCCPROJECTNAME");</div><div class='del'>-    vcxProject.SccLocalPath = project-&gt;first("SCCLOCALPATH");</div><div class='del'>-    vcxProject.flat_files = project-&gt;isActiveConfig("flat");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void VcxprojGenerator::initConfiguration()</div><div class='del'>-{</div><div class='del'>-    // Initialize XML sub elements</div><div class='del'>-    // - Do this first since main configuration elements may need</div><div class='del'>-    // - to know of certain compiler/linker options</div><div class='del'>-    VCXConfiguration &amp;conf = vcxProject.Configuration;</div><div class='del'>-</div><div class='del'>-    initCompilerTool();</div><div class='del'>-</div><div class='del'>-    // Only on configuration per build</div><div class='del'>-    bool isDebug = project-&gt;isActiveConfig("debug");</div><div class='del'>-</div><div class='del'>-    if(projectTarget == StaticLib)</div><div class='del'>-        initLibrarianTool();</div><div class='del'>-    else {</div><div class='del'>-        conf.linker.GenerateDebugInformation = isDebug ? _True : _False;</div><div class='del'>-        initLinkerTool();</div><div class='del'>-    }</div><div class='del'>-    initResourceTool();</div><div class='del'>-    initIDLTool();</div><div class='del'>-</div><div class='del'>-    // Own elements -----------------------------</div><div class='del'>-    QString temp = project-&gt;first("BuildBrowserInformation");</div><div class='del'>-    switch (projectTarget) {</div><div class='del'>-    case SharedLib:</div><div class='del'>-        conf.ConfigurationType = "DynamicLibrary";</div><div class='del'>-        break;</div><div class='del'>-    case StaticLib:</div><div class='del'>-        conf.ConfigurationType = "StaticLibrary";</div><div class='del'>-        break;</div><div class='del'>-    case Application:</div><div class='del'>-    default:</div><div class='del'>-        conf.ConfigurationType = "Application";</div><div class='del'>-        break;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    conf.OutputDirectory = project-&gt;first("DESTDIR");</div><div class='del'>-</div><div class='del'>-    if(conf.OutputDirectory.isEmpty())</div><div class='del'>-        conf.OutputDirectory = ".\\";</div><div class='del'>-</div><div class='del'>-    if(!conf.OutputDirectory.endsWith("\\"))</div><div class='del'>-        conf.OutputDirectory += '\\';</div><div class='del'>-</div><div class='del'>-    // The target name could have been changed.</div><div class='del'>-    conf.TargetName = project-&gt;first("TARGET");</div><div class='del'>-    if ( !conf.TargetName.isEmpty() &amp;&amp; !project-&gt;first("TARGET_VERSION_EXT").isEmpty() &amp;&amp; project-&gt;isActiveConfig("shared"))</div><div class='del'>-        conf.TargetName.append(project-&gt;first("TARGET_VERSION_EXT"));</div><div class='del'>-</div><div class='del'>-    conf.Name = project-&gt;values("BUILD_NAME").join(" ");</div><div class='del'>-    if (conf.Name.isEmpty())</div><div class='del'>-        conf.Name = isDebug ? "Debug" : "Release";</div><div class='del'>-    conf.ConfigurationName = conf.Name;</div><div class='del'>-    if (project-&gt;isEmpty("CE_SDK") || project-&gt;isEmpty("CE_ARCH")) {</div><div class='del'>-        conf.Name += (conf.idl.TargetEnvironment == "Win64" ? "|Win64" : "|Win32");</div><div class='del'>-    } else {</div><div class='del'>-        conf.Name += "|" + project-&gt;values("CE_SDK").join(" ") + " (" + project-&gt;first("CE_ARCH") + ")";</div><div class='del'>-    }</div><div class='del'>-    conf.ATLMinimizesCRunTimeLibraryUsage = (project-&gt;first("ATLMinimizesCRunTimeLibraryUsage").isEmpty() ? _False : _True);</div><div class='del'>-    conf.BuildBrowserInformation = triState(temp.isEmpty() ? (short)unset : temp.toShort());</div><div class='del'>-    temp = project-&gt;first("CharacterSet");</div><div class='del'>-    if (!temp.isEmpty())</div><div class='del'>-    {</div><div class='del'>-        switch (charSet(temp.toShort())) {</div><div class='del'>-</div><div class='del'>-            case charSetMBCS:</div><div class='del'>-                conf.CharacterSet = "MultiByte";</div><div class='del'>-                break;</div><div class='del'>-            case charSetUnicode:</div><div class='del'>-                conf.CharacterSet = "Unicode";</div><div class='del'>-                break;</div><div class='del'>-            case charSetNotSet:</div><div class='del'>-            default:</div><div class='del'>-                conf.CharacterSet = "NotSet";</div><div class='del'>-                break;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    conf.DeleteExtensionsOnClean = project-&gt;first("DeleteExtensionsOnClean");</div><div class='del'>-    conf.ImportLibrary = conf.linker.ImportLibrary;</div><div class='del'>-    conf.IntermediateDirectory = project-&gt;first("OBJECTS_DIR");</div><div class='del'>-    //conf.OutputDirectory = ".";</div><div class='del'>-    conf.PrimaryOutput = project-&gt;first("PrimaryOutput");</div><div class='del'>-    conf.WholeProgramOptimization = conf.compiler.WholeProgramOptimization;</div><div class='del'>-    temp = project-&gt;first("UseOfATL");</div><div class='del'>-    if(!temp.isEmpty())</div><div class='del'>-    {</div><div class='del'>-        switch (useOfATL(temp.toShort())) {</div><div class='del'>-</div><div class='del'>-            case useATLStatic:</div><div class='del'>-                conf.UseOfATL = "Static";</div><div class='del'>-                break;</div><div class='del'>-            case useATLDynamic:</div><div class='del'>-                conf.UseOfATL = "Dynamic";</div><div class='del'>-                break;</div><div class='del'>-            case useATLNotSet:</div><div class='del'>-            default:</div><div class='del'>-                conf.UseOfATL = "false";</div><div class='del'>-                break;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    temp = project-&gt;first("UseOfMfc");</div><div class='del'>-    if(!temp.isEmpty())</div><div class='del'>-    {</div><div class='del'>-        switch (useOfMfc(temp.toShort())) {</div><div class='del'>-</div><div class='del'>-            case useMfcStatic:</div><div class='del'>-                conf.UseOfMfc = "Static";</div><div class='del'>-                break;</div><div class='del'>-            case useMfcDynamic:</div><div class='del'>-                conf.UseOfMfc = "Dynamic";</div><div class='del'>-                break;</div><div class='del'>-            case useMfcStdWin:</div><div class='del'>-            default:</div><div class='del'>-                conf.UseOfMfc = "false";</div><div class='del'>-                break;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    // Configuration does not need parameters from</div><div class='del'>-    // these sub XML items;</div><div class='del'>-    initCustomBuildTool();</div><div class='del'>-    initPreBuildEventTools();</div><div class='del'>-    initPostBuildEventTools();</div><div class='del'>-    // Only deploy for CE projects</div><div class='del'>-    if (!project-&gt;isEmpty("CE_SDK") &amp;&amp; !project-&gt;isEmpty("CE_ARCH"))</div><div class='del'>-        initDeploymentTool();</div><div class='del'>-    initPreLinkEventTools();</div><div class='del'>-</div><div class='del'>-    // Set definite values in both configurations</div><div class='del'>-    if (isDebug) {</div><div class='del'>-        conf.compiler.PreprocessorDefinitions.removeAll("NDEBUG");</div><div class='del'>-    } else {</div><div class='del'>-        conf.compiler.PreprocessorDefinitions += "NDEBUG";</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void VcxprojGenerator::initCompilerTool()</div><div class='del'>-{</div><div class='del'>-    QString placement = project-&gt;first("OBJECTS_DIR");</div><div class='del'>-    if(placement.isEmpty())</div><div class='del'>-        placement = ".\\";</div><div class='del'>-</div><div class='del'>-    VCXConfiguration &amp;conf = vcxProject.Configuration;</div><div class='del'>-    conf.compiler.AssemblerListingLocation = placement ;</div><div class='del'>-    conf.compiler.ProgramDataBaseFileName = ".\\" ;</div><div class='del'>-    conf.compiler.ObjectFileName = placement ;</div><div class='del'>-    conf.compiler.ExceptionHandling = "false";</div><div class='del'>-    // PCH</div><div class='del'>-    if (usePCH) {</div><div class='del'>-        conf.compiler.PrecompiledHeader             = "Use";</div><div class='del'>-        conf.compiler.PrecompiledHeaderOutputFile   = "$(IntDir)\\" + precompPch;</div><div class='del'>-        conf.compiler.PrecompiledHeaderFile         = project-&gt;first("PRECOMPILED_HEADER");</div><div class='del'>-        conf.compiler.ForcedIncludeFiles            = project-&gt;values("PRECOMPILED_HEADER");</div><div class='del'>-        conf.compiler.PreprocessToFile              = _False;</div><div class='del'>-        conf.compiler.PreprocessSuppressLineNumbers = _False;</div><div class='del'>-        // Minimal build option triggers an Internal Compiler Error</div><div class='del'>-        // when used in conjunction with /FI and /Yu, so remove it</div><div class='del'>-        project-&gt;values("QMAKE_CFLAGS_DEBUG").removeAll("-Gm");</div><div class='del'>-        project-&gt;values("QMAKE_CFLAGS_DEBUG").removeAll("/Gm");</div><div class='del'>-        project-&gt;values("QMAKE_CXXFLAGS_DEBUG").removeAll("-Gm");</div><div class='del'>-        project-&gt;values("QMAKE_CXXFLAGS_DEBUG").removeAll("/Gm");</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    conf.compiler.parseOptions(project-&gt;values("QMAKE_CXXFLAGS"));</div><div class='del'>-    if(project-&gt;isActiveConfig("debug")){</div><div class='del'>-        // Debug version</div><div class='del'>-        if((projectTarget == Application) || (projectTarget == StaticLib))</div><div class='del'>-            conf.compiler.parseOptions(project-&gt;values("QMAKE_CXXFLAGS_MT_DBG"));</div><div class='del'>-        else</div><div class='del'>-            conf.compiler.parseOptions(project-&gt;values("QMAKE_CXXFLAGS_MT_DLLDBG"));</div><div class='del'>-    } else {</div><div class='del'>-        // Release version</div><div class='del'>-        conf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG";</div><div class='del'>-        conf.compiler.PreprocessorDefinitions += "NDEBUG";</div><div class='del'>-        if((projectTarget == Application) || (projectTarget == StaticLib))</div><div class='del'>-            conf.compiler.parseOptions(project-&gt;values("QMAKE_CXXFLAGS_MT"));</div><div class='del'>-        else</div><div class='del'>-            conf.compiler.parseOptions(project-&gt;values("QMAKE_CXXFLAGS_MT_DLL"));</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    // Common for both release and debug</div><div class='del'>-    if(project-&gt;isActiveConfig("windows"))</div><div class='del'>-        conf.compiler.PreprocessorDefinitions += project-&gt;values("MSVCPROJ_WINCONDEF");</div><div class='del'>-</div><div class='del'>-    // Can this be set for ALL configs?</div><div class='del'>-    // If so, use qmake.conf!</div><div class='del'>-    if(projectTarget == SharedLib)</div><div class='del'>-        conf.compiler.PreprocessorDefinitions += "_WINDOWS";</div><div class='del'>-</div><div class='del'>-    conf.compiler.PreprocessorDefinitions += project-&gt;values("DEFINES");</div><div class='del'>-    conf.compiler.PreprocessorDefinitions += project-&gt;values("PRL_EXPORT_DEFINES");</div><div class='del'>-    conf.compiler.parseOptions(project-&gt;values("MSVCPROJ_INCPATH"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void VcxprojGenerator::initLinkerTool()</div><div class='del'>-{</div><div class='del'>-    findLibraries(); // Need to add the highest version of the libs</div><div class='del'>-    VCXConfiguration &amp;conf = vcxProject.Configuration;</div><div class='del'>-    conf.linker.parseOptions(project-&gt;values("MSVCPROJ_LFLAGS"));</div><div class='del'>-</div><div class='del'>-    foreach(QString libs, project-&gt;values("MSVCPROJ_LIBS")) {</div><div class='del'>-        if (libs.left(9).toUpper() == "/LIBPATH:") {</div><div class='del'>-            QStringList l = QStringList(libs);</div><div class='del'>-            conf.linker.parseOptions(l);</div><div class='del'>-        } else {</div><div class='del'>-            conf.linker.AdditionalDependencies += libs;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    switch (projectTarget) {</div><div class='del'>-    case Application:</div><div class='del'>-        conf.linker.OutputFile = project-&gt;first("DESTDIR");</div><div class='del'>-        break;</div><div class='del'>-    case SharedLib:</div><div class='del'>-        conf.linker.parseOptions(project-&gt;values("MSVCPROJ_LIBOPTIONS"));</div><div class='del'>-        conf.linker.OutputFile = project-&gt;first("DESTDIR");</div><div class='del'>-        break;</div><div class='del'>-    case StaticLib: //unhandled - added to remove warnings..</div><div class='del'>-        break;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if(conf.linker.OutputFile.isEmpty())</div><div class='del'>-        conf.linker.OutputFile = ".\\";</div><div class='del'>-</div><div class='del'>-    if(!conf.linker.OutputFile.endsWith("\\"))</div><div class='del'>-        conf.linker.OutputFile += '\\';</div><div class='del'>-</div><div class='del'>-    conf.linker.OutputFile += project-&gt;first("MSVCPROJ_TARGET");</div><div class='del'>-</div><div class='del'>-    if(project-&gt;isActiveConfig("dll")){</div><div class='del'>-        conf.linker.parseOptions(project-&gt;values("QMAKE_LFLAGS_QT_DLL"));</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void VcxprojGenerator::initResourceTool()</div><div class='del'>-{</div><div class='del'>-    VCXConfiguration &amp;conf = vcxProject.Configuration;</div><div class='del'>-    conf.resource.PreprocessorDefinitions = conf.compiler.PreprocessorDefinitions;</div><div class='del'>-</div><div class='del'>-    // We need to add _DEBUG for the debug version of the project, since the normal compiler defines</div><div class='del'>-    // do not contain it. (The compiler defines this symbol automatically, which is wy we don't need</div><div class='del'>-    // to add it for the compiler) However, the resource tool does not do this.</div><div class='del'>-    if(project-&gt;isActiveConfig("debug"))</div><div class='del'>-        conf.resource.PreprocessorDefinitions += "_DEBUG";</div><div class='del'>-    if(project-&gt;isActiveConfig("staticlib"))</div><div class='del'>-        conf.resource.ResourceOutputFileName = project-&gt;first("DESTDIR") + "/$(InputName).res";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void VcxprojGenerator::initPostBuildEventTools()</div><div class='del'>-{</div><div class='del'>-    VCXConfiguration &amp;conf = vcxProject.Configuration;</div><div class='del'>-    if(!project-&gt;values("QMAKE_POST_LINK").isEmpty()) {</div><div class='del'>-        QStringList cmdline = VCToolBase::fixCommandLine(var("QMAKE_POST_LINK"));</div><div class='del'>-        conf.postBuild.CommandLine = cmdline;</div><div class='del'>-        conf.postBuild.Description = cmdline.join(QLatin1String("\r\n"));</div><div class='del'>-        conf.postBuild.UseInBuild = _True;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    QString signature = !project-&gt;isEmpty("SIGNATURE_FILE") ? var("SIGNATURE_FILE") : var("DEFAULT_SIGNATURE");</div><div class='del'>-    bool useSignature = !signature.isEmpty() &amp;&amp; !project-&gt;isActiveConfig("staticlib") &amp;&amp;</div><div class='del'>-                        !project-&gt;isEmpty("CE_SDK") &amp;&amp; !project-&gt;isEmpty("CE_ARCH");</div><div class='del'>-    if(useSignature) {</div><div class='del'>-        conf.postBuild.CommandLine.prepend(</div><div class='del'>-                QLatin1String("signtool sign /F ") + signature + QLatin1String(" \"$(TargetPath)\""));</div><div class='del'>-        conf.postBuild.UseInBuild = _True;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if(!project-&gt;values("MSVCPROJ_COPY_DLL").isEmpty()) {</div><div class='del'>-        conf.postBuild.Description += var("MSVCPROJ_COPY_DLL_DESC");</div><div class='del'>-        conf.postBuild.CommandLine += var("MSVCPROJ_COPY_DLL");</div><div class='del'>-        conf.postBuild.UseInBuild = _True;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void VcxprojGenerator::initDeploymentTool()</div><div class='del'>-{</div><div class='del'>-    VCXConfiguration &amp;conf = vcxProject.Configuration;</div><div class='del'>-    QString targetPath = project-&gt;values("deploy.path").join(" ");</div><div class='del'>-    if (targetPath.isEmpty())</div><div class='del'>-        targetPath = QString("%CSIDL_PROGRAM_FILES%\\") + project-&gt;first("TARGET");</div><div class='del'>-    if (targetPath.endsWith("/") || targetPath.endsWith("\\"))</div><div class='del'>-        targetPath.chop(1);</div><div class='del'>-</div><div class='del'>-    // Only deploy Qt libs for shared build</div><div class='del'>-    if (!project-&gt;values("QMAKE_QT_DLL").isEmpty()) {</div><div class='del'>-        QStringList&amp; arg = project-&gt;values("MSVCPROJ_LIBS");</div><div class='del'>-        for (QStringList::ConstIterator it = arg.constBegin(); it != arg.constEnd(); ++it) {</div><div class='del'>-            if (it-&gt;contains(project-&gt;first("QMAKE_LIBDIR"))) {</div><div class='del'>-                QString dllName = *it;</div><div class='del'>-</div><div class='del'>-                if (dllName.contains(QLatin1String("QAxContainer"))</div><div class='del'>-                    || dllName.contains(QLatin1String("qtmain"))</div><div class='del'>-                    || dllName.contains(QLatin1String("QtUiTools")))</div><div class='del'>-                    continue;</div><div class='del'>-                dllName.replace(QLatin1String(".lib") , QLatin1String(".dll"));</div><div class='del'>-                QFileInfo info(dllName);</div><div class='del'>-                conf.deployment.AdditionalFiles += info.fileName()</div><div class='del'>-                                                + "|" + QDir::toNativeSeparators(info.absolutePath())</div><div class='del'>-                                                + "|" + targetPath</div><div class='del'>-                                                + "|0;";</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    // C-runtime deployment</div><div class='del'>-    QString runtime = project-&gt;values("QT_CE_C_RUNTIME").join(QLatin1String(" "));</div><div class='del'>-    if (!runtime.isEmpty() &amp;&amp; (runtime != QLatin1String("no"))) {</div><div class='del'>-        QString runtimeVersion = QLatin1String("msvcr");</div><div class='del'>-        QString mkspec = project-&gt;first("QMAKESPEC");</div><div class='del'>-        // If no .qmake.cache has been found, we fallback to the original mkspec</div><div class='del'>-        if (mkspec.isEmpty())</div><div class='del'>-            mkspec = project-&gt;first("QMAKESPEC_ORIGINAL");</div><div class='del'>-</div><div class='del'>-        if (!mkspec.isEmpty()) {</div><div class='del'>-            if (mkspec.endsWith("2010"))</div><div class='del'>-                runtimeVersion.append("100");</div><div class='del'>-            else if (mkspec.endsWith("2008"))</div><div class='del'>-                runtimeVersion.append("90");</div><div class='del'>-            else</div><div class='del'>-                runtimeVersion.append("80");</div><div class='del'>-            if (project-&gt;isActiveConfig("debug"))</div><div class='del'>-                runtimeVersion.append("d");</div><div class='del'>-            runtimeVersion.append(".dll");</div><div class='del'>-</div><div class='del'>-            if (runtime == "yes") {</div><div class='del'>-                // Auto-find C-runtime</div><div class='del'>-                QString vcInstallDir = qgetenv("VCINSTALLDIR");</div><div class='del'>-                if (!vcInstallDir.isEmpty()) {</div><div class='del'>-                    vcInstallDir += "\\ce\\dll\\";</div><div class='del'>-                    vcInstallDir += project-&gt;values("CE_ARCH").join(QLatin1String(" "));</div><div class='del'>-                    if (!QFileInfo(vcInstallDir + QDir::separator() + runtimeVersion).exists())</div><div class='del'>-                        runtime.clear();</div><div class='del'>-                    else</div><div class='del'>-                        runtime = vcInstallDir;</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if (!runtime.isEmpty() &amp;&amp; runtime != QLatin1String("yes")) {</div><div class='del'>-            conf.deployment.AdditionalFiles += runtimeVersion</div><div class='del'>-                                            + "|" + QDir::toNativeSeparators(runtime)</div><div class='del'>-                                            + "|" + targetPath</div><div class='del'>-                                            + "|0;";</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    // foreach item in DEPLOYMENT</div><div class='del'>-    foreach(QString item, project-&gt;values("DEPLOYMENT")) {</div><div class='del'>-        // get item.path</div><div class='del'>-        QString devicePath = project-&gt;first(item + ".path");</div><div class='del'>-        if (devicePath.isEmpty())</div><div class='del'>-            devicePath = targetPath;</div><div class='del'>-        // check if item.path is relative (! either /,\ or %)</div><div class='del'>-        if (!(devicePath.at(0) == QLatin1Char('/')</div><div class='del'>-            || devicePath.at(0) == QLatin1Char('\\')</div><div class='del'>-            || devicePath.at(0) == QLatin1Char('%'))) {</div><div class='del'>-            // create output path</div><div class='del'>-            devicePath = Option::fixPathToLocalOS(QDir::cleanPath(targetPath + QLatin1Char('\\') + devicePath));</div><div class='del'>-        }</div><div class='del'>-        // foreach d in item.sources</div><div class='del'>-        foreach(QString source, project-&gt;values(item + ".sources")) {</div><div class='del'>-            QString itemDevicePath = devicePath;</div><div class='del'>-            source = Option::fixPathToLocalOS(source);</div><div class='del'>-            QString nameFilter;</div><div class='del'>-            QFileInfo info(source);</div><div class='del'>-            QString searchPath;</div><div class='del'>-            if (info.isDir()) {</div><div class='del'>-                nameFilter = QLatin1String("*");</div><div class='del'>-                itemDevicePath += "\\" + info.fileName();</div><div class='del'>-                searchPath = info.absoluteFilePath();</div><div class='del'>-            } else {</div><div class='del'>-                nameFilter = source.split('\\').last();</div><div class='del'>-                searchPath = info.absolutePath();</div><div class='del'>-            }</div><div class='del'>-</div><div class='del'>-            int pathSize = searchPath.size();</div><div class='del'>-            QDirIterator iterator(searchPath, QStringList() &lt;&lt; nameFilter</div><div class='del'>-                                  , QDir::Files | QDir::NoDotAndDotDot | QDir::NoSymLinks</div><div class='del'>-                                  , QDirIterator::Subdirectories);</div><div class='del'>-            // foreach dirIterator-entry in d</div><div class='del'>-            while(iterator.hasNext()) {</div><div class='del'>-                iterator.next();</div><div class='del'>-                QString absoluteItemPath = Option::fixPathToLocalOS(QFileInfo(iterator.filePath()).absolutePath());</div><div class='del'>-                // Identify if it is just another subdir</div><div class='del'>-                int diffSize = absoluteItemPath.size() - pathSize;</div><div class='del'>-                // write out rules</div><div class='del'>-                conf.deployment.AdditionalFiles += iterator.fileName()</div><div class='del'>-                    + "|" + absoluteItemPath</div><div class='del'>-                    + "|" + itemDevicePath + (diffSize ? (absoluteItemPath.right(diffSize)) : QLatin1String(""))</div><div class='del'>-                    + "|0;";</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void VcxprojGenerator::initPreLinkEventTools()</div><div class='del'>-{</div><div class='del'>-    VCXConfiguration &amp;conf = vcxProject.Configuration;</div><div class='del'>-    if(!project-&gt;values("QMAKE_PRE_LINK").isEmpty()) {</div><div class='del'>-        QStringList cmdline = VCToolBase::fixCommandLine(var("QMAKE_PRE_LINK"));</div><div class='del'>-        conf.preLink.CommandLine = cmdline;</div><div class='del'>-        conf.preLink.Description = cmdline.join(QLatin1String("\r\n"));</div><div class='del'>-        conf.preLink.UseInBuild = _True;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void VcxprojGenerator::initRootFiles()</div><div class='del'>-{</div><div class='del'>-    vcxProject.RootFiles.addFiles(project-&gt;values("RC_FILE"));</div><div class='del'>-    vcxProject.RootFiles.Project = this;</div><div class='del'>-    vcxProject.RootFiles.Config = &amp;(vcxProject.Configuration);</div><div class='del'>-    vcxProject.RootFiles.CustomBuild = none;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-void VcxprojGenerator::initSourceFiles()</div><div class='add'>+VCProjectWriter *VcxprojGenerator::createProjectWriter()</div><div class='ctx'> {</div><div class='del'>-    vcxProject.SourceFiles.Name = "Source Files";</div><div class='del'>-    vcxProject.SourceFiles.Filter = "cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx";</div><div class='del'>-    vcxProject.SourceFiles.Guid = _GUIDSourceFiles;</div><div class='del'>-</div><div class='del'>-    vcxProject.SourceFiles.addFiles(project-&gt;values("SOURCES"));</div><div class='del'>-</div><div class='del'>-    vcxProject.SourceFiles.Project = this;</div><div class='del'>-    vcxProject.SourceFiles.Config = &amp;(vcxProject.Configuration);</div><div class='del'>-    vcxProject.SourceFiles.CustomBuild = none;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void VcxprojGenerator::initHeaderFiles()</div><div class='del'>-{</div><div class='del'>-    vcxProject.HeaderFiles.Name = "Header Files";</div><div class='del'>-    vcxProject.HeaderFiles.Filter = "h;hpp;hxx;hm;inl;inc;xsd";</div><div class='del'>-    vcxProject.HeaderFiles.Guid = _GUIDHeaderFiles;</div><div class='del'>-</div><div class='del'>-    vcxProject.HeaderFiles.addFiles(project-&gt;values("HEADERS"));</div><div class='del'>-    if (usePCH) // Generated PCH cpp file</div><div class='del'>-        vcxProject.HeaderFiles.addFile(precompH);</div><div class='del'>-</div><div class='del'>-    vcxProject.HeaderFiles.Project = this;</div><div class='del'>-    vcxProject.HeaderFiles.Config = &amp;(vcxProject.Configuration);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void VcxprojGenerator::initGeneratedFiles()</div><div class='del'>-{</div><div class='del'>-    vcxProject.GeneratedFiles.Name = "Generated Files";</div><div class='del'>-    vcxProject.GeneratedFiles.Filter = "cpp;c;cxx;moc;h;def;odl;idl;res";</div><div class='del'>-    vcxProject.GeneratedFiles.Guid = _GUIDGeneratedFiles;</div><div class='del'>-</div><div class='del'>-    // ### These cannot have CustomBuild (mocSrc)!!</div><div class='del'>-    vcxProject.GeneratedFiles.addFiles(project-&gt;values("GENERATED_SOURCES"));</div><div class='del'>-    vcxProject.GeneratedFiles.addFiles(project-&gt;values("GENERATED_FILES"));</div><div class='del'>-    vcxProject.GeneratedFiles.addFiles(project-&gt;values("IDLSOURCES"));</div><div class='del'>-    vcxProject.GeneratedFiles.addFiles(project-&gt;values("RES_FILE"));</div><div class='del'>-    vcxProject.GeneratedFiles.addFiles(project-&gt;values("QMAKE_IMAGE_COLLECTION"));   // compat</div><div class='del'>-    if(!extraCompilerOutputs.isEmpty())</div><div class='del'>-        vcxProject.GeneratedFiles.addFiles(extraCompilerOutputs.keys());</div><div class='del'>-</div><div class='del'>-    vcxProject.GeneratedFiles.Project = this;</div><div class='del'>-    vcxProject.GeneratedFiles.Config = &amp;(vcxProject.Configuration);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void VcxprojGenerator::initLexYaccFiles()</div><div class='del'>-{</div><div class='del'>-    vcxProject.LexYaccFiles.Name = "Lex / Yacc Files";</div><div class='del'>-    vcxProject.LexYaccFiles.ParseFiles = _False;</div><div class='del'>-    vcxProject.LexYaccFiles.Filter = "l;y";</div><div class='del'>-    vcxProject.LexYaccFiles.Guid = _GUIDLexYaccFiles;</div><div class='del'>-</div><div class='del'>-    vcxProject.LexYaccFiles.addFiles(project-&gt;values("LEXSOURCES"));</div><div class='del'>-    vcxProject.LexYaccFiles.addFiles(project-&gt;values("YACCSOURCES"));</div><div class='del'>-</div><div class='del'>-    vcxProject.LexYaccFiles.Project = this;</div><div class='del'>-    vcxProject.LexYaccFiles.Config = &amp;(vcxProject.Configuration);</div><div class='del'>-    vcxProject.LexYaccFiles.CustomBuild = lexyacc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void VcxprojGenerator::initTranslationFiles()</div><div class='del'>-{</div><div class='del'>-    vcxProject.TranslationFiles.Name = "Translation Files";</div><div class='del'>-    vcxProject.TranslationFiles.ParseFiles = _False;</div><div class='del'>-    vcxProject.TranslationFiles.Filter = "ts;xlf";</div><div class='del'>-    vcxProject.TranslationFiles.Guid = _GUIDTranslationFiles;</div><div class='del'>-</div><div class='del'>-    vcxProject.TranslationFiles.addFiles(project-&gt;values("TRANSLATIONS"));</div><div class='del'>-</div><div class='del'>-    vcxProject.TranslationFiles.Project = this;</div><div class='del'>-    vcxProject.TranslationFiles.Config = &amp;(vcxProject.Configuration);</div><div class='del'>-    vcxProject.TranslationFiles.CustomBuild = none;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void VcxprojGenerator::initFormFiles()</div><div class='del'>-{</div><div class='del'>-    vcxProject.FormFiles.Name = "Form Files";</div><div class='del'>-    vcxProject.FormFiles.ParseFiles = _False;</div><div class='del'>-    vcxProject.FormFiles.Filter = "ui";</div><div class='del'>-    vcxProject.FormFiles.Guid = _GUIDFormFiles;</div><div class='del'>-</div><div class='del'>-    vcxProject.FormFiles.addFiles(project-&gt;values("FORMS"));</div><div class='del'>-    vcxProject.FormFiles.addFiles(project-&gt;values("FORMS3"));</div><div class='del'>-</div><div class='del'>-    vcxProject.FormFiles.Project = this;</div><div class='del'>-    vcxProject.FormFiles.Config = &amp;(vcxProject.Configuration);</div><div class='del'>-    vcxProject.FormFiles.CustomBuild = none;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void VcxprojGenerator::initResourceFiles()</div><div class='del'>-{</div><div class='del'>-    vcxProject.ResourceFiles.Name = "Resource Files";</div><div class='del'>-    vcxProject.ResourceFiles.ParseFiles = _False;</div><div class='del'>-    vcxProject.ResourceFiles.Filter = "qrc;*"; //"rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;ts;xlf;qrc";</div><div class='del'>-    vcxProject.ResourceFiles.Guid = _GUIDResourceFiles;</div><div class='del'>-</div><div class='del'>-    // Bad hack, please look away -------------------------------------</div><div class='del'>-    QString rcc_dep_cmd = project-&gt;values("rcc.depend_command").join(" ");</div><div class='del'>-    if(!rcc_dep_cmd.isEmpty()) {</div><div class='del'>-        QStringList qrc_files = project-&gt;values("RESOURCES");</div><div class='del'>-        QStringList deps;</div><div class='del'>-        if(!qrc_files.isEmpty()) {</div><div class='del'>-            for (int i = 0; i &lt; qrc_files.count(); ++i) {</div><div class='del'>-                char buff[256];</div><div class='del'>-                QString dep_cmd = replaceExtraCompilerVariables(rcc_dep_cmd, qrc_files.at(i),"");</div><div class='del'>-</div><div class='del'>-                dep_cmd = Option::fixPathToLocalOS(dep_cmd, true, false);</div><div class='del'>-                if(canExecute(dep_cmd)) {</div><div class='del'>-                    dep_cmd.prepend(QLatin1String("cd ")</div><div class='del'>-                                    + escapeFilePath(Option::fixPathToLocalOS(Option::output_dir, false))</div><div class='del'>-                                    + QLatin1String(" &amp;&amp; "));</div><div class='del'>-                    if(FILE *proc = QT_POPEN(dep_cmd.toLatin1().constData(), "r")) {</div><div class='del'>-                        QString indeps;</div><div class='del'>-                        while(!feof(proc)) {</div><div class='del'>-                            int read_in = (int)fread(buff, 1, 255, proc);</div><div class='del'>-                            if(!read_in)</div><div class='del'>-                                break;</div><div class='del'>-                            indeps += QByteArray(buff, read_in);</div><div class='del'>-                        }</div><div class='del'>-                        QT_PCLOSE(proc);</div><div class='del'>-                        if(!indeps.isEmpty())</div><div class='del'>-                            deps += fileFixify(indeps.replace('\n', ' ').simplified().split(' '),</div><div class='del'>-                                               QString(), Option::output_dir);</div><div class='del'>-                    }</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-            vcxProject.ResourceFiles.addFiles(deps);</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    // You may look again --------------------------------------------</div><div class='del'>-</div><div class='del'>-    vcxProject.ResourceFiles.addFiles(project-&gt;values("RESOURCES"));</div><div class='del'>-    vcxProject.ResourceFiles.addFiles(project-&gt;values("IMAGES"));</div><div class='del'>-</div><div class='del'>-    vcxProject.ResourceFiles.Project = this;</div><div class='del'>-    vcxProject.ResourceFiles.Config = &amp;(vcxProject.Configuration);</div><div class='del'>-    vcxProject.ResourceFiles.CustomBuild = none;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void VcxprojGenerator::initExtraCompilerOutputs()</div><div class='del'>-{</div><div class='del'>-    QStringList otherFilters;</div><div class='del'>-    otherFilters &lt;&lt; "FORMS"</div><div class='del'>-                 &lt;&lt; "FORMS3"</div><div class='del'>-                 &lt;&lt; "GENERATED_FILES"</div><div class='del'>-                 &lt;&lt; "GENERATED_SOURCES"</div><div class='del'>-                 &lt;&lt; "HEADERS"</div><div class='del'>-                 &lt;&lt; "IDLSOURCES"</div><div class='del'>-                 &lt;&lt; "IMAGES"</div><div class='del'>-                 &lt;&lt; "LEXSOURCES"</div><div class='del'>-                 &lt;&lt; "QMAKE_IMAGE_COLLECTION"</div><div class='del'>-                 &lt;&lt; "RC_FILE"</div><div class='del'>-                 &lt;&lt; "RESOURCES"</div><div class='del'>-                 &lt;&lt; "RES_FILE"</div><div class='del'>-                 &lt;&lt; "SOURCES"</div><div class='del'>-                 &lt;&lt; "TRANSLATIONS"</div><div class='del'>-                 &lt;&lt; "YACCSOURCES";</div><div class='del'>-    const QStringList &amp;quc = project-&gt;values("QMAKE_EXTRA_COMPILERS");</div><div class='del'>-    for(QStringList::ConstIterator it = quc.begin(); it != quc.end(); ++it) {</div><div class='del'>-        QString extracompilerName = project-&gt;first((*it) + ".name");</div><div class='del'>-        if (extracompilerName.isEmpty())</div><div class='del'>-            extracompilerName = (*it);</div><div class='del'>-</div><div class='del'>-        // Create an extra compiler filter and add the files</div><div class='del'>-        VCXFilter extraCompile;</div><div class='del'>-        extraCompile.Name = extracompilerName;</div><div class='del'>-        extraCompile.ParseFiles = _False;</div><div class='del'>-        extraCompile.Filter = "";</div><div class='del'>-        extraCompile.Guid = QString(_GUIDExtraCompilerFiles) + "-" + (*it);</div><div class='del'>-</div><div class='del'>-        // If the extra compiler has a variable_out set the output file</div><div class='del'>-        // is added to an other file list, and does not need its own..</div><div class='del'>-        bool addOnInput = hasBuiltinCompiler(project-&gt;first((*it) + ".output"));</div><div class='del'>-        QString tmp_other_out = project-&gt;first((*it) + ".variable_out");</div><div class='del'>-        if (!tmp_other_out.isEmpty() &amp;&amp; !addOnInput)</div><div class='del'>-            continue;</div><div class='del'>-</div><div class='del'>-        if (!addOnInput) {</div><div class='del'>-            QString tmp_out = project-&gt;first((*it) + ".output");</div><div class='del'>-            if (project-&gt;values((*it) + ".CONFIG").indexOf("combine") != -1) {</div><div class='del'>-                // Combined output, only one file result</div><div class='del'>-                extraCompile.addFile(</div><div class='del'>-                    Option::fixPathToTargetOS(replaceExtraCompilerVariables(tmp_out, QString(), QString()), false));</div><div class='del'>-            } else {</div><div class='del'>-                // One output file per input</div><div class='del'>-                QStringList tmp_in = project-&gt;values(project-&gt;first((*it) + ".input"));</div><div class='del'>-                for (int i = 0; i &lt; tmp_in.count(); ++i) {</div><div class='del'>-                    const QString &amp;filename = tmp_in.at(i);</div><div class='del'>-                    if (extraCompilerSources.contains(filename))</div><div class='del'>-                        extraCompile.addFile(</div><div class='del'>-                            Option::fixPathToTargetOS(replaceExtraCompilerVariables(filename, tmp_out, QString()), false));</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        } else {</div><div class='del'>-            // In this case we the outputs have a built-in compiler, so we cannot add the custom</div><div class='del'>-            // build steps there. So, we turn it around and add it to the input files instead,</div><div class='del'>-            // provided that the input file variable is not handled already (those in otherFilters</div><div class='del'>-            // are handled, so we avoid them).</div><div class='del'>-            QStringList inputVars = project-&gt;values((*it) + ".input");</div><div class='del'>-            foreach(QString inputVar, inputVars) {</div><div class='del'>-                if (!otherFilters.contains(inputVar)) {</div><div class='del'>-                    QStringList tmp_in = project-&gt;values(inputVar);</div><div class='del'>-                    for (int i = 0; i &lt; tmp_in.count(); ++i) {</div><div class='del'>-                        const QString &amp;filename = tmp_in.at(i);</div><div class='del'>-                        if (extraCompilerSources.contains(filename))</div><div class='del'>-                            extraCompile.addFile(</div><div class='del'>-                                Option::fixPathToTargetOS(replaceExtraCompilerVariables(filename, QString(), QString()), false));</div><div class='del'>-                    }</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        extraCompile.Project = this;</div><div class='del'>-        extraCompile.Config = &amp;(vcxProject.Configuration);</div><div class='del'>-        extraCompile.CustomBuild = none;</div><div class='del'>-</div><div class='del'>-        vcxProject.ExtraCompilersFiles.append(extraCompile);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-bool VcxprojGenerator::writeProjectMakefile()</div><div class='del'>-{</div><div class='del'>-    usePlatformDir();</div><div class='del'>-    QTextStream t(&amp;Option::output);</div><div class='del'>-</div><div class='del'>-    // Check if all requirements are fulfilled</div><div class='del'>-    if(!project-&gt;values("QMAKE_FAILED_REQUIREMENTS").isEmpty()) {</div><div class='del'>-        fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n",</div><div class='del'>-                var("QMAKE_FAILED_REQUIREMENTS").toLatin1().constData());</div><div class='del'>-        return true;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    // Generate project file</div><div class='del'>-    if(project-&gt;first("TEMPLATE") == "vcapp" ||</div><div class='del'>-       project-&gt;first("TEMPLATE") == "vclib") {</div><div class='del'>-        if (!mergedProjects.count()) {</div><div class='del'>-            warn_msg(WarnLogic, "Generator: MSVC.NET: no single configuration created, cannot output project!");</div><div class='del'>-            return false;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        debug_msg(1, "Generator: MSVC.NET: Writing project file");</div><div class='del'>-        VCXProject mergedProject;</div><div class='del'>-        for (int i = 0; i &lt; mergedProjects.count(); ++i) {</div><div class='del'>-            VCXProjectSingleConfig *singleProject = &amp;(mergedProjects.at(i)-&gt;vcxProject);</div><div class='del'>-            mergedProject.SingleProjects += *singleProject;</div><div class='del'>-            for (int j = 0; j &lt; singleProject-&gt;ExtraCompilersFiles.count(); ++j) {</div><div class='del'>-                const QString &amp;compilerName = singleProject-&gt;ExtraCompilersFiles.at(j).Name;</div><div class='del'>-                if (!mergedProject.ExtraCompilers.contains(compilerName))</div><div class='del'>-                    mergedProject.ExtraCompilers += compilerName;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if(mergedProjects.count() &gt; 1 &amp;&amp;</div><div class='del'>-           mergedProjects.at(0)-&gt;vcxProject.Name ==</div><div class='del'>-           mergedProjects.at(1)-&gt;vcxProject.Name)</div><div class='del'>-            mergedProjects.at(0)-&gt;writePrlFile();</div><div class='del'>-        mergedProject.Name = unescapeFilePath(project-&gt;first("QMAKE_ORIG_TARGET"));</div><div class='del'>-        mergedProject.Version = mergedProjects.at(0)-&gt;vcxProject.Version;</div><div class='del'>-        mergedProject.ProjectGUID = project-&gt;isEmpty("QMAKE_UUID") ? getProjectUUID().toString().toUpper() : project-&gt;first("QMAKE_UUID");</div><div class='del'>-        mergedProject.Keyword = project-&gt;first("VCPROJ_KEYWORD");</div><div class='del'>-        mergedProject.SccProjectName = mergedProjects.at(0)-&gt;vcxProject.SccProjectName;</div><div class='del'>-        mergedProject.SccLocalPath = mergedProjects.at(0)-&gt;vcxProject.SccLocalPath;</div><div class='del'>-        mergedProject.PlatformName = mergedProjects.at(0)-&gt;vcxProject.PlatformName;</div><div class='del'>-</div><div class='del'>-        XmlOutput xmlOut(t);</div><div class='del'>-        xmlOut &lt;&lt; mergedProject;</div><div class='del'>-        return true;</div><div class='del'>-    } else if(project-&gt;first("TEMPLATE") == "vcsubdirs") {</div><div class='del'>-        return writeMakefile(t);</div><div class='del'>-    }</div><div class='del'>-    return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-bool VcxprojGenerator::mergeBuildProject(MakefileGenerator *other)</div><div class='del'>-{</div><div class='del'>-    VcxprojGenerator *otherVC = static_cast&lt;VcxprojGenerator*&gt;(other);</div><div class='del'>-    if (!otherVC) {</div><div class='del'>-        warn_msg(WarnLogic, "VcxprojGenerator: Cannot merge other types of projects! (ignored)");</div><div class='del'>-        return false;</div><div class='del'>-    }</div><div class='del'>-    mergedProjects += otherVC;</div><div class='del'>-    return true;</div><div class='add'>+    return new VCXProjectWriter;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='del'>-</div><div class='head'>diff --git a/qmake/generators/win32/msvc_vcxproj.h b/qmake/generators/win32/msvc_vcxproj.h<br/>index 08b90d8..702dca3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msvc_vcxproj.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/msvc_vcxproj.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/msvc_vcxproj.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/win32/msvc_vcxproj.h</a></div><div class='hunk'>@@ -42,59 +42,19 @@</div><div class='ctx'> #ifndef MSVC_VCXPROJ_H</div><div class='ctx'> #define MSVC_VCXPROJ_H</div><div class='ctx'> </div><div class='del'>-#include "winmakefile.h"</div><div class='del'>-#include "msbuild_objectmodel.h"</div><div class='ctx'> #include "msvc_vcproj.h"</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> class VcxprojGenerator : public VcprojGenerator</div><div class='ctx'> {</div><div class='del'>-    bool writeMakefile(QTextStream &amp;);</div><div class='del'>-    bool writeProjectMakefile();</div><div class='del'>-</div><div class='ctx'> public:</div><div class='ctx'>     VcxprojGenerator();</div><div class='del'>-    ~VcxprojGenerator();</div><div class='ctx'> </div><div class='ctx'> protected:</div><div class='del'>-    virtual bool supportsMetaBuild() { return true; }</div><div class='del'>-    virtual bool supportsMergedBuilds() { return true; }</div><div class='del'>-    virtual bool mergeBuildProject(MakefileGenerator *other);</div><div class='del'>-</div><div class='del'>-    virtual void initProject();</div><div class='del'>-</div><div class='del'>-    void initConfiguration();</div><div class='del'>-    void initCompilerTool();</div><div class='del'>-    void initDeploymentTool();</div><div class='del'>-    void initLinkerTool();</div><div class='del'>-    void initPreLinkEventTools();</div><div class='del'>-    void initPostBuildEventTools();</div><div class='del'>-    void initRootFiles();</div><div class='del'>-    void initResourceTool();</div><div class='del'>-    void initSourceFiles();</div><div class='del'>-    void initHeaderFiles();</div><div class='del'>-    void initGeneratedFiles();</div><div class='del'>-    void initTranslationFiles();</div><div class='del'>-    void initFormFiles();</div><div class='del'>-    void initResourceFiles();</div><div class='del'>-    void initLexYaccFiles();</div><div class='del'>-    void initExtraCompilerOutputs();</div><div class='del'>-</div><div class='del'>-    // Used for single project</div><div class='del'>-    VCXProjectSingleConfig vcxProject;</div><div class='del'>-</div><div class='del'>-    // Holds all configurations for glue (merged) project</div><div class='del'>-    QList&lt;VcxprojGenerator*&gt; mergedProjects;</div><div class='del'>-</div><div class='del'>-private:</div><div class='del'>-    friend class VCXFilter;</div><div class='del'>-</div><div class='add'>+    virtual VCProjectWriter *createProjectWriter();</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-inline VcxprojGenerator::~VcxprojGenerator()</div><div class='del'>-{ }</div><div class='del'>-</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> #endif // MSVC_VCXPROJ_H</div><div class='head'>diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp<br/>index e3fc467..0283cd4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/winmakefile.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/winmakefile.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/winmakefile.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/win32/winmakefile.cpp</a></div><div class='hunk'>@@ -78,8 +78,14 @@ Win32MakefileGenerator::findHighestVersion(const QString &amp;d, const QString &amp;stem</div><div class='ctx'> </div><div class='ctx'>     int biggest=-1;</div><div class='ctx'>     if(!project-&gt;isActiveConfig("no_versionlink")) {</div><div class='del'>-        QDir dir(bd);</div><div class='del'>-        QStringList entries = dir.entryList();</div><div class='add'>+        static QHash&lt;QString, QStringList&gt; dirEntryListCache;</div><div class='add'>+        QStringList entries = dirEntryListCache.value(bd);</div><div class='add'>+        if (entries.isEmpty()) {</div><div class='add'>+            QDir dir(bd);</div><div class='add'>+            entries = dir.entryList();</div><div class='add'>+            dirEntryListCache.insert(bd, entries);</div><div class='add'>+        }</div><div class='add'>+</div><div class='ctx'>         QRegExp regx(QString("((lib)?%1([0-9]*)).(%2|prl)$").arg(dllStem).arg(ext), Qt::CaseInsensitive);</div><div class='ctx'>         for(QStringList::Iterator it = entries.begin(); it != entries.end(); ++it) {</div><div class='ctx'>             if(regx.exactMatch((*it))) {</div><div class='hunk'>@@ -290,6 +296,11 @@ void Win32MakefileGenerator::processVars()</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     project-&gt;values("QMAKE_ORIG_TARGET") = project-&gt;values("TARGET");</div><div class='add'>+    if (project-&gt;isEmpty("QMAKE_PROJECT_NAME"))</div><div class='add'>+        project-&gt;values("QMAKE_PROJECT_NAME") = project-&gt;values("QMAKE_ORIG_TARGET");</div><div class='add'>+    else if (project-&gt;first("TEMPLATE").startsWith("vc"))</div><div class='add'>+        project-&gt;values("MAKEFILE") = project-&gt;values("QMAKE_PROJECT_NAME");</div><div class='add'>+</div><div class='ctx'>     if (!project-&gt;values("QMAKE_INCDIR").isEmpty())</div><div class='ctx'>         project-&gt;values("INCLUDEPATH") += project-&gt;values("QMAKE_INCDIR");</div><div class='ctx'> </div><div class='hunk'>@@ -445,6 +456,10 @@ void Win32MakefileGenerator::processRcFileVar()</div><div class='ctx'>         ts &lt;&lt; "\t\t\t\tVALUE \"ProductName\", \"" &lt;&lt; productName &lt;&lt; "\\0\"" &lt;&lt; endl;</div><div class='ctx'>         ts &lt;&lt; "\t\t\tEND" &lt;&lt; endl;</div><div class='ctx'>         ts &lt;&lt; "\t\tEND" &lt;&lt; endl;</div><div class='add'>+        ts &lt;&lt; "\t\tBLOCK \"VarFileInfo\"" &lt;&lt; endl;</div><div class='add'>+        ts &lt;&lt; "\t\tBEGIN" &lt;&lt; endl;</div><div class='add'>+        ts &lt;&lt; "\t\t\tVALUE \"Translation\", 0x409, 1200" &lt;&lt; endl;</div><div class='add'>+        ts &lt;&lt; "\t\tEND" &lt;&lt; endl;</div><div class='ctx'>         ts &lt;&lt; "\tEND" &lt;&lt; endl;</div><div class='ctx'>         ts &lt;&lt; "/* End of Version info */" &lt;&lt; endl;</div><div class='ctx'>         ts &lt;&lt; endl;</div><div class='hunk'>@@ -798,11 +813,6 @@ QString Win32MakefileGenerator::getLibTarget()</div><div class='ctx'>     return QString(project-&gt;first("TARGET") + project-&gt;first("TARGET_VERSION_EXT") + ".lib");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-QString Win32MakefileGenerator::getPdbTarget()</div><div class='del'>-{</div><div class='del'>-    return QString(project-&gt;first("TARGET") + project-&gt;first("TARGET_VERSION_EXT") + ".pdb");</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> QString Win32MakefileGenerator::defaultInstall(const QString &amp;t)</div><div class='ctx'> {</div><div class='ctx'>     if((t != "target" &amp;&amp; t != "dlltarget") ||</div><div class='hunk'>@@ -831,6 +841,18 @@ QString Win32MakefileGenerator::defaultInstall(const QString &amp;t)</div><div class='ctx'>                 uninst.append("\n\t");</div><div class='ctx'>             uninst.append("-$(DEL_FILE) \"" + dst_prl + "\"");</div><div class='ctx'>         }</div><div class='add'>+        if(project-&gt;isActiveConfig("create_pc")) {</div><div class='add'>+            QString dst_pc = pkgConfigFileName(false);</div><div class='add'>+            if (!dst_pc.isEmpty()) {</div><div class='add'>+                dst_pc = filePrefixRoot(root, targetdir + dst_pc);</div><div class='add'>+                if(!ret.isEmpty())</div><div class='add'>+                    ret += "\n\t";</div><div class='add'>+                ret += "-$(INSTALL_FILE) \"" + pkgConfigFileName(true) + "\" \"" + dst_pc + "\"";</div><div class='add'>+                if(!uninst.isEmpty())</div><div class='add'>+                    uninst.append("\n\t");</div><div class='add'>+                uninst.append("-$(DEL_FILE) \"" + dst_pc + "\"");</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='ctx'>         if(project-&gt;isActiveConfig("shared") &amp;&amp; !project-&gt;isActiveConfig("plugin")) {</div><div class='ctx'>             QString lib_target = getLibTarget();</div><div class='ctx'>             lib_target.remove('"');</div><div class='hunk'>@@ -843,18 +865,6 @@ QString Win32MakefileGenerator::defaultInstall(const QString &amp;t)</div><div class='ctx'>                 uninst.append("\n\t");</div><div class='ctx'>             uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");</div><div class='ctx'>         }</div><div class='del'>-        if(project-&gt;isActiveConfig("shared") &amp;&amp; project-&gt;isActiveConfig("debug")) {</div><div class='del'>-            QString pdb_target = getPdbTarget();</div><div class='del'>-            pdb_target.remove('"');</div><div class='del'>-            QString src_targ = (project-&gt;isEmpty("DESTDIR") ? QString("$(DESTDIR)") : project-&gt;first("DESTDIR")) + pdb_target;</div><div class='del'>-            QString dst_targ = filePrefixRoot(root, fileFixify(targetdir + pdb_target, FileFixifyAbsolute));</div><div class='del'>-            if(!ret.isEmpty())</div><div class='del'>-                ret += "\n\t";</div><div class='del'>-            ret += QString("-$(INSTALL_FILE)") + " \"" + src_targ + "\" \"" + dst_targ + "\"";</div><div class='del'>-            if(!uninst.isEmpty())</div><div class='del'>-                uninst.append("\n\t");</div><div class='del'>-            uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");</div><div class='del'>-        }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if(t == "dlltarget" || project-&gt;values(t + ".CONFIG").indexOf("no_dll") == -1) {</div><div class='head'>diff --git a/qmake/generators/win32/winmakefile.h b/qmake/generators/win32/winmakefile.h<br/>index 4160185..d3513aa 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/winmakefile.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/generators/win32/winmakefile.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/generators/win32/winmakefile.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/generators/win32/winmakefile.h</a></div><div class='hunk'>@@ -83,7 +83,6 @@ protected:</div><div class='ctx'>     virtual void processRcFileVar();</div><div class='ctx'>     virtual void processFileTagsVar();</div><div class='ctx'>     virtual QString getLibTarget();</div><div class='del'>-    virtual QString getPdbTarget();</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> inline Win32MakefileGenerator::~Win32MakefileGenerator()</div><div class='head'>diff --git a/qmake/main.cpp b/qmake/main.cpp<br/>index ef56aca..ad31bef 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/main.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/main.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/main.cpp</a></div><div class='hunk'>@@ -126,7 +126,9 @@ int runQMake(int argc, char **argv)</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     QMakeProperty prop;</div><div class='del'>-    if(Option::qmake_mode == Option::QMAKE_QUERY_PROPERTY || Option::qmake_mode == Option::QMAKE_SET_PROPERTY)</div><div class='add'>+    if(Option::qmake_mode == Option::QMAKE_QUERY_PROPERTY ||</div><div class='add'>+       Option::qmake_mode == Option::QMAKE_SET_PROPERTY ||</div><div class='add'>+       Option::qmake_mode == Option::QMAKE_UNSET_PROPERTY)</div><div class='ctx'>         return prop.exec() ? 0 : 101;</div><div class='ctx'> </div><div class='ctx'>     QMakeProject project(&amp;prop);</div><div class='head'>diff --git a/qmake/option.cpp b/qmake/option.cpp<br/>index 3ff8345..31372ab 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/option.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/option.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/option.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/option.cpp</a></div><div class='hunk'>@@ -192,6 +192,7 @@ bool usage(const char *a0)</div><div class='ctx'>             "  -norecursive   Don't do a recursive search\n"</div><div class='ctx'>             "  -recursive     Do a recursive search\n"</div><div class='ctx'>             "  -set &lt;prop&gt; &lt;value&gt; Set persistent property\n"</div><div class='add'>+            "  -unset &lt;prop&gt;  Unset persistent property\n"</div><div class='ctx'>             "  -query &lt;prop&gt;  Query persistent property. Show all if &lt;prop&gt; is empty.\n"</div><div class='ctx'>             "  -cache file    Use file as cache           [makefile mode only]\n"</div><div class='ctx'>             "  -spec spec     Use spec as QMAKESPEC       [makefile mode only]\n"</div><div class='hunk'>@@ -226,6 +227,8 @@ Option::parseCommandLine(int argc, char **argv, int skip)</div><div class='ctx'>                     Option::qmake_mode = Option::QMAKE_GENERATE_PRL;</div><div class='ctx'>                 } else if(opt == "set") {</div><div class='ctx'>                     Option::qmake_mode = Option::QMAKE_SET_PROPERTY;</div><div class='add'>+                } else if(opt == "unset") {</div><div class='add'>+                    Option::qmake_mode = Option::QMAKE_UNSET_PROPERTY;</div><div class='ctx'>                 } else if(opt == "query") {</div><div class='ctx'>                     Option::qmake_mode = Option::QMAKE_QUERY_PROPERTY;</div><div class='ctx'>                 } else if(opt == "makefile") {</div><div class='hunk'>@@ -260,6 +263,8 @@ Option::parseCommandLine(int argc, char **argv, int skip)</div><div class='ctx'>                 Option::host_mode = HOST_WIN_MODE;</div><div class='ctx'>                 Option::target_mode = TARG_WIN_MODE;</div><div class='ctx'>                 Option::target_mode_overridden = true;</div><div class='add'>+            } else if(opt == "integrity") {</div><div class='add'>+                Option::target_mode = TARG_INTEGRITY_MODE;</div><div class='ctx'>             } else if(opt == "d") {</div><div class='ctx'>                 Option::debug_level++;</div><div class='ctx'>             } else if(opt == "version" || opt == "v" || opt == "-version") {</div><div class='hunk'>@@ -334,7 +339,8 @@ Option::parseCommandLine(int argc, char **argv, int skip)</div><div class='ctx'>             } else {</div><div class='ctx'>                 bool handled = true;</div><div class='ctx'>                 if(Option::qmake_mode == Option::QMAKE_QUERY_PROPERTY ||</div><div class='del'>-                    Option::qmake_mode == Option::QMAKE_SET_PROPERTY) {</div><div class='add'>+                    Option::qmake_mode == Option::QMAKE_SET_PROPERTY ||</div><div class='add'>+                    Option::qmake_mode == Option::QMAKE_UNSET_PROPERTY) {</div><div class='ctx'>                     Option::prop::properties.append(arg);</div><div class='ctx'>                 } else {</div><div class='ctx'>                     QFileInfo fi(arg);</div><div class='hunk'>@@ -621,19 +627,21 @@ Option::fixString(QString string, uchar flags)</div><div class='ctx'>     static QHash&lt;FixStringCacheKey, QString&gt; *cache = 0;</div><div class='ctx'>     if(!cache) {</div><div class='ctx'>         cache = new QHash&lt;FixStringCacheKey, QString&gt;;</div><div class='del'>-        qmakeAddCacheClear(qmakeDeleteCacheClear_QHashFixStringCacheKeyQString, (void**)&amp;cache);</div><div class='add'>+        qmakeAddCacheClear(qmakeDeleteCacheClear&lt;QHash&lt;FixStringCacheKey, QString&gt; &gt;, (void**)&amp;cache);</div><div class='ctx'>     }</div><div class='ctx'>     FixStringCacheKey cacheKey(string, flags);</div><div class='del'>-    if(cache-&gt;contains(cacheKey)) {</div><div class='del'>-	const QString ret = cache-&gt;value(cacheKey);</div><div class='del'>-	//qDebug() &lt;&lt; "Fix (cached) " &lt;&lt; orig_string &lt;&lt; "-&gt;" &lt;&lt; ret;</div><div class='del'>-        return ret;</div><div class='add'>+</div><div class='add'>+    QHash&lt;FixStringCacheKey, QString&gt;::const_iterator it = cache-&gt;constFind(cacheKey);</div><div class='add'>+</div><div class='add'>+    if (it != cache-&gt;constEnd()) {</div><div class='add'>+        //qDebug() &lt;&lt; "Fix (cached) " &lt;&lt; orig_string &lt;&lt; "-&gt;" &lt;&lt; it.value();</div><div class='add'>+        return it.value();</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     //fix the environment variables</div><div class='ctx'>     if(flags &amp; Option::FixEnvVars) {</div><div class='ctx'>         int rep;</div><div class='del'>-        QRegExp reg_var("\\$\\(.*\\)");</div><div class='add'>+        static QRegExp reg_var("\\$\\(.*\\)");</div><div class='ctx'>         reg_var.setMinimal(true);</div><div class='ctx'>         while((rep = reg_var.indexIn(string)) != -1)</div><div class='ctx'>             string.replace(rep, reg_var.matchedLength(),</div><div class='head'>diff --git a/qmake/option.h b/qmake/option.h<br/>index 7f09bbb..83e9687 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/option.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/option.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/option.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/option.h</a></div><div class='hunk'>@@ -139,9 +139,18 @@ struct Option</div><div class='ctx'>         return fixString(in, flags);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='add'>+    inline static bool hasFileExtension(const QString &amp;str, const QStringList &amp;extensions)</div><div class='add'>+    {</div><div class='add'>+        foreach (const QString &amp;ext, extensions)</div><div class='add'>+            if (str.endsWith(ext))</div><div class='add'>+                return true;</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     //global qmake mode, can only be in one mode per invocation!</div><div class='del'>-    enum QMAKE_MODE { QMAKE_GENERATE_NOTHING, QMAKE_GENERATE_PROJECT, QMAKE_GENERATE_MAKEFILE,</div><div class='del'>-                      QMAKE_GENERATE_PRL, QMAKE_SET_PROPERTY, QMAKE_QUERY_PROPERTY };</div><div class='add'>+    enum QMAKE_MODE { QMAKE_GENERATE_NOTHING,</div><div class='add'>+                      QMAKE_GENERATE_PROJECT, QMAKE_GENERATE_MAKEFILE, QMAKE_GENERATE_PRL,</div><div class='add'>+                      QMAKE_SET_PROPERTY, QMAKE_UNSET_PROPERTY, QMAKE_QUERY_PROPERTY };</div><div class='ctx'>     static QMAKE_MODE qmake_mode;</div><div class='ctx'> </div><div class='ctx'>     //all modes</div><div class='hunk'>@@ -156,7 +165,7 @@ struct Option</div><div class='ctx'>     enum HOST_MODE { HOST_UNKNOWN_MODE, HOST_UNIX_MODE, HOST_WIN_MODE, HOST_MACX_MODE };</div><div class='ctx'>     static HOST_MODE host_mode;</div><div class='ctx'>     enum TARG_MODE { TARG_UNKNOWN_MODE, TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE,</div><div class='del'>-                     TARG_SYMBIAN_MODE };</div><div class='add'>+                     TARG_SYMBIAN_MODE, TARG_INTEGRITY_MODE };</div><div class='ctx'>     static TARG_MODE target_mode;</div><div class='ctx'>     static bool target_mode_overridden;</div><div class='ctx'>     static QString user_template, user_template_prefix;</div><div class='hunk'>@@ -195,7 +204,6 @@ private:</div><div class='ctx'> inline QString fixEnvVariables(const QString &amp;x) { return Option::fixString(x, Option::FixEnvVars); }</div><div class='ctx'> inline QStringList splitPathList(const QString &amp;paths) { return paths.split(Option::dirlist_sep); }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> // this is a stripped down version of the one found in QtCore</div><div class='ctx'> class QLibraryInfo</div><div class='ctx'> {</div><div class='head'>diff --git a/qmake/project.cpp b/qmake/project.cpp<br/>index 683be5d..28a10d4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/project.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/project.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/project.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/project.cpp</a></div><div class='hunk'>@@ -87,7 +87,7 @@ QMap&lt;QString, ExpandFunc&gt; qmake_expandFunctions()</div><div class='ctx'>     static QMap&lt;QString, ExpandFunc&gt; *qmake_expand_functions = 0;</div><div class='ctx'>     if(!qmake_expand_functions) {</div><div class='ctx'>         qmake_expand_functions = new QMap&lt;QString, ExpandFunc&gt;;</div><div class='del'>-        qmakeAddCacheClear(qmakeDeleteCacheClear_QMapStringInt, (void**)&amp;qmake_expand_functions);</div><div class='add'>+        qmakeAddCacheClear(qmakeDeleteCacheClear&lt;QMap&lt;QString, ExpandFunc&gt; &gt;, (void**)&amp;qmake_expand_functions);</div><div class='ctx'>         qmake_expand_functions-&gt;insert("member", E_MEMBER);</div><div class='ctx'>         qmake_expand_functions-&gt;insert("first", E_FIRST);</div><div class='ctx'>         qmake_expand_functions-&gt;insert("last", E_LAST);</div><div class='hunk'>@@ -237,59 +237,56 @@ static QStringList split_arg_list(const QString &amp;params)</div><div class='ctx'>     const ushort RPAREN = ')';</div><div class='ctx'>     const ushort SINGLEQUOTE = '\'';</div><div class='ctx'>     const ushort DOUBLEQUOTE = '"';</div><div class='add'>+    const ushort BACKSLASH = '\\';</div><div class='ctx'>     const ushort COMMA = ',';</div><div class='ctx'>     const ushort SPACE = ' ';</div><div class='ctx'>     //const ushort TAB = '\t';</div><div class='ctx'> </div><div class='del'>-    ushort unicode;</div><div class='ctx'>     const QChar *params_data = params.data();</div><div class='ctx'>     const int params_len = params.length();</div><div class='del'>-    int last = 0;</div><div class='del'>-    while(last &lt; params_len &amp;&amp; (params_data[last].unicode() == SPACE</div><div class='del'>-                                /*|| params_data[last].unicode() == TAB*/))</div><div class='del'>-        ++last;</div><div class='del'>-    for(int x = last, parens = 0; x &lt;= params_len; x++) {</div><div class='del'>-        unicode = params_data[x].unicode();</div><div class='del'>-        if(x == params_len) {</div><div class='del'>-            while(x &amp;&amp; params_data[x-1].unicode() == SPACE)</div><div class='del'>-                --x;</div><div class='del'>-            QString mid(params_data+last, x-last);</div><div class='del'>-            if(quote) {</div><div class='del'>-                if(mid[0] == quote &amp;&amp; mid[(int)mid.length()-1] == quote)</div><div class='del'>-                    mid = mid.mid(1, mid.length()-2);</div><div class='add'>+    for(int last = 0; ;) {</div><div class='add'>+        while(last &lt; params_len &amp;&amp; (params_data[last].unicode() == SPACE</div><div class='add'>+                                    /*|| params_data[last].unicode() == TAB*/))</div><div class='add'>+            ++last;</div><div class='add'>+        for(int x = last, parens = 0; ; x++) {</div><div class='add'>+            if(x == params_len) {</div><div class='add'>+                while(x &gt; last &amp;&amp; params_data[x-1].unicode() == SPACE)</div><div class='add'>+                    --x;</div><div class='add'>+                args &lt;&lt; params.mid(last, x - last);</div><div class='add'>+                // Could do a check for unmatched parens here, but split_value_list()</div><div class='add'>+                // is called on all our output, so mistakes will be caught anyway.</div><div class='add'>+                return args;</div><div class='add'>+            }</div><div class='add'>+            ushort unicode = params_data[x].unicode();</div><div class='add'>+            if(x != (int)params_len-1 &amp;&amp; unicode == BACKSLASH &amp;&amp;</div><div class='add'>+                (params_data[x+1].unicode() == SINGLEQUOTE || params_data[x+1].unicode() == DOUBLEQUOTE)) {</div><div class='add'>+                x++; //get that 'escape'</div><div class='add'>+            } else if(quote &amp;&amp; unicode == quote) {</div><div class='ctx'>                 quote = 0;</div><div class='add'>+            } else if(!quote &amp;&amp; (unicode == SINGLEQUOTE || unicode == DOUBLEQUOTE)) {</div><div class='add'>+                quote = unicode;</div><div class='add'>+            } else if(unicode == RPAREN) {</div><div class='add'>+                --parens;</div><div class='add'>+            } else if(unicode == LPAREN) {</div><div class='add'>+                ++parens;</div><div class='add'>+            }</div><div class='add'>+            if(!parens &amp;&amp; !quote &amp;&amp; unicode == COMMA) {</div><div class='add'>+                int prev = last;</div><div class='add'>+                last = x+1;</div><div class='add'>+                while(x &gt; prev &amp;&amp; params_data[x-1].unicode() == SPACE)</div><div class='add'>+                    --x;</div><div class='add'>+                args &lt;&lt; params.mid(prev, x - prev);</div><div class='add'>+                break;</div><div class='ctx'>             }</div><div class='del'>-            args &lt;&lt; mid;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        if(unicode == LPAREN) {</div><div class='del'>-            --parens;</div><div class='del'>-        } else if(unicode == RPAREN) {</div><div class='del'>-            ++parens;</div><div class='del'>-        } else if(quote &amp;&amp; unicode == quote) {</div><div class='del'>-            quote = 0;</div><div class='del'>-        } else if(!quote &amp;&amp; (unicode == SINGLEQUOTE || unicode == DOUBLEQUOTE)) {</div><div class='del'>-            quote = unicode;</div><div class='del'>-        }</div><div class='del'>-        if(!parens &amp;&amp; !quote &amp;&amp; unicode == COMMA) {</div><div class='del'>-            QString mid = params.mid(last, x - last).trimmed();</div><div class='del'>-            args &lt;&lt; mid;</div><div class='del'>-            last = x+1;</div><div class='del'>-            while(last &lt; params_len &amp;&amp; (params_data[last].unicode() == SPACE</div><div class='del'>-                                        /*|| params_data[last].unicode() == TAB*/))</div><div class='del'>-                ++last;</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='del'>-    // Could do a check for unmatched parens here, but split_value_list()</div><div class='del'>-    // is called on all our output, so mistakes will be caught anyway.</div><div class='del'>-    return args;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static QStringList split_value_list(const QString &amp;vals)</div><div class='ctx'> {</div><div class='ctx'>     QString build;</div><div class='ctx'>     QStringList ret;</div><div class='del'>-    QStack&lt;char&gt; quote;</div><div class='add'>+    ushort quote = 0;</div><div class='ctx'>     int parens = 0;</div><div class='ctx'> </div><div class='ctx'>     const ushort LPAREN = '(';</div><div class='hunk'>@@ -306,17 +303,17 @@ static QStringList split_value_list(const QString &amp;vals)</div><div class='ctx'>         if(x != (int)vals_len-1 &amp;&amp; unicode == BACKSLASH &amp;&amp;</div><div class='ctx'>             (vals_data[x+1].unicode() == SINGLEQUOTE || vals_data[x+1].unicode() == DOUBLEQUOTE)) {</div><div class='ctx'>             build += vals_data[x++]; //get that 'escape'</div><div class='del'>-        } else if(!quote.isEmpty() &amp;&amp; unicode == quote.top()) {</div><div class='del'>-            quote.pop();</div><div class='del'>-        } else if(unicode == SINGLEQUOTE || unicode == DOUBLEQUOTE) {</div><div class='del'>-            quote.push(unicode);</div><div class='add'>+        } else if(quote &amp;&amp; unicode == quote) {</div><div class='add'>+            quote = 0;</div><div class='add'>+        } else if(!quote &amp;&amp; (unicode == SINGLEQUOTE || unicode == DOUBLEQUOTE)) {</div><div class='add'>+            quote = unicode;</div><div class='ctx'>         } else if(unicode == RPAREN) {</div><div class='ctx'>             --parens;</div><div class='ctx'>         } else if(unicode == LPAREN) {</div><div class='ctx'>             ++parens;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-        if(!parens &amp;&amp; quote.isEmpty() &amp;&amp; (vals_data[x] == Option::field_sep)) {</div><div class='add'>+        if(!parens &amp;&amp; !quote &amp;&amp; (vals_data[x] == Option::field_sep)) {</div><div class='ctx'>             ret &lt;&lt; build;</div><div class='ctx'>             build.clear();</div><div class='ctx'>         } else {</div><div class='hunk'>@@ -1655,7 +1652,7 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QMap&lt;QString, QStringL</div><div class='ctx'>             static QStringList *feature_roots = 0;</div><div class='ctx'>             if(!feature_roots) {</div><div class='ctx'>                 feature_roots = new QStringList(qmake_feature_paths(prop));</div><div class='del'>-                qmakeAddCacheClear(qmakeDeleteCacheClear_QStringList, (void**)&amp;feature_roots);</div><div class='add'>+                qmakeAddCacheClear(qmakeDeleteCacheClear&lt;QStringList&gt;, (void**)&amp;feature_roots);</div><div class='ctx'>             }</div><div class='ctx'>             debug_msg(2, "Looking for feature '%s' in (%s)", file.toLatin1().constData(),</div><div class='ctx'> 			feature_roots-&gt;join("::").toLatin1().constData());</div><div class='head'>diff --git a/qmake/property.cpp b/qmake/property.cpp<br/>index 68bb725..33e5fa5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/property.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/property.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/property.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/property.cpp</a></div><div class='hunk'>@@ -160,6 +160,13 @@ QMakeProperty::setValue(QString var, const QString &amp;val)</div><div class='ctx'>     settings-&gt;setValue(keyBase() + var, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void</div><div class='add'>+QMakeProperty::remove(const QString &amp;var)</div><div class='add'>+{</div><div class='add'>+    initSettings();</div><div class='add'>+    settings-&gt;remove(keyBase() + var);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> bool</div><div class='ctx'> QMakeProperty::exec()</div><div class='ctx'> {</div><div class='hunk'>@@ -230,6 +237,13 @@ QMakeProperty::exec()</div><div class='ctx'>             if(!var.startsWith("."))</div><div class='ctx'>                 setValue(var, (*it));</div><div class='ctx'>         }</div><div class='add'>+    } else if(Option::qmake_mode == Option::QMAKE_UNSET_PROPERTY) {</div><div class='add'>+        for(QStringList::ConstIterator it = Option::prop::properties.begin();</div><div class='add'>+            it != Option::prop::properties.end(); it++) {</div><div class='add'>+            QString var = (*it);</div><div class='add'>+            if(!var.startsWith("."))</div><div class='add'>+                remove(var);</div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/qmake/property.h b/qmake/property.h<br/>index 3d45f98..5c1c28f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/property.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/property.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/property.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/property.h</a></div><div class='hunk'>@@ -62,6 +62,7 @@ public:</div><div class='ctx'>     bool hasValue(QString);</div><div class='ctx'>     QString value(QString v) { return value(v, false); }</div><div class='ctx'>     void setValue(QString, const QString &amp;);</div><div class='add'>+    void remove(const QString &amp;);</div><div class='ctx'> </div><div class='ctx'>     bool exec();</div><div class='ctx'> };</div><div class='head'>diff --git a/qmake/qmake.pri b/qmake/qmake.pri<br/>index 3a0ab12..d6c5f09 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/qmake/qmake.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>qmake/qmake.pri</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/qmake/qmake.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>qmake/qmake.pri</a></div><div class='hunk'>@@ -57,6 +57,8 @@ bootstrap { #Qt code</div><div class='ctx'>         qfile.cpp \</div><div class='ctx'>         qabstractfileengine.cpp \</div><div class='ctx'>         qfileinfo.cpp \</div><div class='add'>+        qfilesystementry.cpp \</div><div class='add'>+        qfilesystemengine.cpp \</div><div class='ctx'>         qfsfileengine.cpp \</div><div class='ctx'>         qfsfileengine_iterator.cpp \</div><div class='ctx'>         qglobal.cpp \</div><div class='hunk'>@@ -80,6 +82,7 @@ bootstrap { #Qt code</div><div class='ctx'>         quuid.cpp \</div><div class='ctx'>         qsettings.cpp \</div><div class='ctx'>         qlibraryinfo.cpp \</div><div class='add'>+        qsystemerror.cpp \</div><div class='ctx'>         qvariant.cpp \</div><div class='ctx'>         qvector.cpp \</div><div class='ctx'>         qvsnprintf.cpp \</div><div class='hunk'>@@ -96,6 +99,7 @@ bootstrap { #Qt code</div><div class='ctx'>         qdatetime.h \</div><div class='ctx'>         qdatetime_p.h \</div><div class='ctx'>         qdir.h \</div><div class='add'>+        qdir_p.h \</div><div class='ctx'>         qdiriterator.h \</div><div class='ctx'>         qfile.h \</div><div class='ctx'>         qabstractfileengine.h \</div><div class='hunk'>@@ -116,6 +120,7 @@ bootstrap { #Qt code</div><div class='ctx'>         qstring.h \</div><div class='ctx'>         qstringlist.h \</div><div class='ctx'>         qstringmatcher.h \</div><div class='add'>+        qsystemerror_p.h \</div><div class='ctx'>         qtemporaryfile.h \</div><div class='ctx'>         qtextstream.h \</div><div class='ctx'>         qurl.h \</div><div class='hunk'>@@ -125,14 +130,15 @@ bootstrap { #Qt code</div><div class='ctx'>         qxmlutils.h</div><div class='ctx'> </div><div class='ctx'>     unix {</div><div class='del'>-        SOURCES += qfsfileengine_unix.cpp qfsfileengine_iterator_unix.cpp</div><div class='add'>+        SOURCES += qfilesystemengine_unix.cpp qfilesystemiterator_unix.cpp qfsfileengine_unix.cpp</div><div class='ctx'>         mac {</div><div class='add'>+          SOURCES += qfilesystemengine_mac.cpp</div><div class='ctx'>           SOURCES += qcore_mac.cpp qsettings_mac.cpp</div><div class='ctx'>           QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported)</div><div class='ctx'>           LIBS += -framework ApplicationServices</div><div class='ctx'>         }</div><div class='ctx'>     } else:win32 {</div><div class='del'>-	SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp \</div><div class='add'>+        SOURCES += qfilesystemengine_win.cpp qfsfileengine_win.cpp qfilesystemiterator_win.cpp qsettings_win.cpp \</div><div class='ctx'>             qsystemlibrary.cpp</div><div class='ctx'>         win32-msvc*:LIBS += ole32.lib advapi32.lib</div><div class='ctx'>         win32-g++*:LIBS += -lole32 -luuid -ladvapi32 -lkernel32</div><div class='head'>diff --git a/src/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h b/src/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h<br/>index 82ff9aa..0021ea3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h</a></div><div class='hunk'>@@ -22,7 +22,9 @@</div><div class='ctx'> 	# pragma warning(disable: 4512) // This would be very annoying</div><div class='ctx'> 	# pragma warning(disable: 4290) // Ignore exception specification warning</div><div class='ctx'>     # pragma warning(disable: 4250) // Ignore 'class1' : inherits 'class2::member' via dominance (e.g. in MultiReader)</div><div class='del'>-	#if (_MSC_VER &lt; 1310)</div><div class='add'>+	// Check for STLport presence</div><div class='add'>+	#include &lt;string&gt;</div><div class='add'>+	#if (_MSC_VER &lt; 1310) || defined(_STLPORT_VERSION)</div><div class='ctx'> 		#define CL_NS_HASHING(func) std::func //the namespace is different on VC 7.0</div><div class='ctx'> 	#else</div><div class='ctx'> 		#define CL_NS_HASHING(func) stdext::func</div><div class='head'>diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c b/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c<br/>index 67029be..b5431a5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c</a></div><div class='hunk'>@@ -84,7 +84,7 @@ HB_Bool HB_HebrewShape(HB_ShaperItem *shaper_item)</div><div class='ctx'>         logClusters[0] = 0;</div><div class='ctx'> </div><div class='ctx'>         for (i = 1; i &lt; shaper_item-&gt;item.length; ++i) {</div><div class='del'>-            hb_uint16 base = shapedChars[slen-1];</div><div class='add'>+            hb_uint16 base = shapedChars[cluster_start];</div><div class='ctx'>             hb_uint16 shaped = 0;</div><div class='ctx'>             HB_Bool invalid = FALSE;</div><div class='ctx'>             if (uc[i] == Dagesh) {</div><div class='hunk'>@@ -143,7 +143,7 @@ HB_Bool HB_HebrewShape(HB_ShaperItem *shaper_item)</div><div class='ctx'>             }</div><div class='ctx'>             if (shaped) {</div><div class='ctx'>                 if (shaper_item-&gt;font-&gt;klass-&gt;canRender(shaper_item-&gt;font, (HB_UChar16 *)&amp;shaped, 1)) {</div><div class='del'>-                    shapedChars[slen-1] = shaped;</div><div class='add'>+                    shapedChars[cluster_start] = shaped;</div><div class='ctx'>                 } else</div><div class='ctx'>                     shaped = 0;</div><div class='ctx'>             }</div><div class='head'>diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp<br/>index 237c9ae..bbf479e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp</a></div><div class='hunk'>@@ -37,7 +37,7 @@ static HB_Bool isLetter(HB_UChar16 ucs)</div><div class='ctx'>                      FLAG(HB_Letter_Titlecase) |</div><div class='ctx'>                      FLAG(HB_Letter_Modifier) |</div><div class='ctx'>                      FLAG(HB_Letter_Other);</div><div class='del'>-    return FLAG(HB_GetUnicodeCharCategory(ucs)) &amp; test;</div><div class='add'>+    return (FLAG(HB_GetUnicodeCharCategory(ucs)) &amp;  test) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static HB_Bool isMark(HB_UChar16 ucs)</div><div class='hunk'>@@ -660,18 +660,18 @@ static const unsigned char indicPosition[0xe00-0x900] = {</div><div class='ctx'>     None, None, None, None,</div><div class='ctx'> </div><div class='ctx'>     None, None, None, None,</div><div class='del'>-    None, None, None, None,</div><div class='del'>-    None, None, None, None,</div><div class='del'>-    None, None, None, None,</div><div class='add'>+    None, Below, Below, Below,</div><div class='add'>+    Below, Below, Below, Below,</div><div class='add'>+    Below, Below, None, Below,</div><div class='ctx'> </div><div class='del'>-    None, None, None, None,</div><div class='del'>-    Below, None, None, None,</div><div class='del'>-    Below, None, None, None,</div><div class='add'>+    Below, Below, Below, Below,</div><div class='add'>+    Below, Below, Below, Below,</div><div class='add'>+    Below, None, Below, Below,</div><div class='ctx'>     Below, Below, Below, Post,</div><div class='ctx'> </div><div class='ctx'>     Below, None, Below, Below,</div><div class='del'>-    None, None, None, None,</div><div class='del'>-    None, None, None, None,</div><div class='add'>+    None, Below, Below, Below,</div><div class='add'>+    Below, Below, None, None,</div><div class='ctx'>     None, None, Post, Above,</div><div class='ctx'> </div><div class='ctx'>     Post, Below, Below, Below,</div><div class='hunk'>@@ -1683,6 +1683,7 @@ static bool indic_shape_syllable(HB_Bool openType, HB_ShaperItem *item, bool inv</div><div class='ctx'>                 }</div><div class='ctx'>                 item-&gt;glyphs[j] = item-&gt;glyphs[i];</div><div class='ctx'>                 item-&gt;attributes[j] = item-&gt;attributes[i];</div><div class='add'>+                item-&gt;advances[j] = item-&gt;advances[i];</div><div class='ctx'>                 ++i;</div><div class='ctx'>                 ++j;</div><div class='ctx'>             }</div><div class='hunk'>@@ -1741,6 +1742,11 @@ static int indic_nextSyllableBoundary(HB_Script script, const HB_UChar16 *s, int</div><div class='ctx'>  	    if (state == Halant &amp;&amp; uc[pos] == 0x200d /* ZWJ */)</div><div class='ctx'>   		break;</div><div class='ctx'>             // the control character should be the last char in the item</div><div class='add'>+ 	    if (state == Consonant &amp;&amp; script == HB_Script_Bengali &amp;&amp; uc[pos-1] == 0x09B0 &amp;&amp; uc[pos] == 0x200d /* ZWJ */)</div><div class='add'>+  		break;</div><div class='add'>+ 	    if (state == Consonant &amp;&amp; script == HB_Script_Kannada &amp;&amp; uc[pos-1] == 0x0CB0 &amp;&amp; uc[pos] == 0x200d /* ZWJ */)</div><div class='add'>+  		break;</div><div class='add'>+            // Bengali and Kannada has a special exception for rendering yaphala with ra (to avoid reph) see http://www.unicode.org/faq/indic.html#15</div><div class='ctx'>             ++pos;</div><div class='ctx'>             goto finish;</div><div class='ctx'>         case Consonant:</div><div class='head'>diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c b/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c<br/>index 7cd82bb..4b68e64 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c</a></div><div class='hunk'>@@ -424,12 +424,8 @@ static HB_Bool myanmar_shape_syllable(HB_Bool openType, HB_ShaperItem *item, HB_</div><div class='ctx'> </div><div class='ctx'> #ifndef NO_OPENTYPE</div><div class='ctx'>     if (openType) {</div><div class='del'>-	unsigned short logClusters[32];</div><div class='ctx'>  	hb_uint32 where[32];</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; len; ++i)</div><div class='del'>-	    logClusters[i] = i;</div><div class='del'>-</div><div class='ctx'>         for (i = 0; i &lt; len; ++i) {</div><div class='ctx'>             where[i] = ~(PreSubstProperty</div><div class='ctx'>                          | BelowSubstProperty</div><div class='head'>diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp<br/>index 1021b02..3410782 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp</a></div><div class='hunk'>@@ -538,8 +538,20 @@ void HB_HeuristicSetGlyphAttributes(HB_ShaperItem *item)</div><div class='ctx'> #ifndef NO_OPENTYPE</div><div class='ctx'> static const HB_OpenTypeFeature basic_features[] = {</div><div class='ctx'>     { HB_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty },</div><div class='del'>-    { HB_MAKE_TAG('l', 'i', 'g', 'a'), CcmpProperty },</div><div class='del'>-    { HB_MAKE_TAG('c', 'l', 'i', 'g'), CcmpProperty },</div><div class='add'>+    { HB_MAKE_TAG('l', 'i', 'g', 'a'), LigaProperty },</div><div class='add'>+    { HB_MAKE_TAG('c', 'l', 'i', 'g'), CligProperty },</div><div class='add'>+    {0, 0}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const HB_OpenTypeFeature disabled_features[] = {</div><div class='add'>+    { HB_MAKE_TAG('c', 'p', 'c', 't'), PositioningProperties },</div><div class='add'>+    { HB_MAKE_TAG('h', 'a', 'l', 't'), PositioningProperties },</div><div class='add'>+    // TODO: we need to add certain HB_ShaperFlag for vertical</div><div class='add'>+    // writing mode to enable these vertical writing features:</div><div class='add'>+    { HB_MAKE_TAG('v', 'a', 'l', 't'), PositioningProperties },</div><div class='add'>+    { HB_MAKE_TAG('v', 'h', 'a', 'l'), PositioningProperties },</div><div class='add'>+    { HB_MAKE_TAG('v', 'k', 'r', 'n'), PositioningProperties },</div><div class='add'>+    { HB_MAKE_TAG('v', 'p', 'a', 'l'), PositioningProperties },</div><div class='ctx'>     {0, 0}</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1041,16 +1053,16 @@ HB_Bool HB_SelectScript(HB_ShaperItem *shaper_item, const HB_OpenTypeFeature *fe</div><div class='ctx'> {</div><div class='ctx'>     HB_Script script = shaper_item-&gt;item.script;</div><div class='ctx'> </div><div class='del'>-    if (!shaper_item-&gt;face-&gt;supported_scripts[script])</div><div class='del'>-        return false;</div><div class='del'>-</div><div class='ctx'>     HB_Face face = shaper_item-&gt;face;</div><div class='ctx'>     if (face-&gt;current_script == script &amp;&amp; face-&gt;current_flags == shaper_item-&gt;shaperFlags)</div><div class='del'>-        return true;</div><div class='add'>+        return shaper_item-&gt;face-&gt;supported_scripts[script] ? true : false;</div><div class='ctx'> </div><div class='ctx'>     face-&gt;current_script = script;</div><div class='ctx'>     face-&gt;current_flags = shaper_item-&gt;shaperFlags;</div><div class='ctx'> </div><div class='add'>+    if (!shaper_item-&gt;face-&gt;supported_scripts[script])</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='ctx'>     assert(script &lt; HB_ScriptCount);</div><div class='ctx'>     // find script in our list of supported scripts.</div><div class='ctx'>     unsigned int tag = ot_scripts[script].tag;</div><div class='hunk'>@@ -1111,12 +1123,29 @@ HB_Bool HB_SelectScript(HB_ShaperItem *shaper_item, const HB_OpenTypeFeature *fe</div><div class='ctx'>                 HB_UInt *feature_tag_list = feature_tag_list_buffer;</div><div class='ctx'>                 while (*feature_tag_list) {</div><div class='ctx'>                     HB_UShort feature_index;</div><div class='add'>+                    bool skip = false;</div><div class='ctx'>                     if (*feature_tag_list == HB_MAKE_TAG('k', 'e', 'r', 'n')) {</div><div class='del'>-                        if (face-&gt;current_flags &amp; HB_ShaperFlag_NoKerning) {</div><div class='del'>-                            ++feature_tag_list;</div><div class='del'>-                            continue;</div><div class='add'>+                        if (face-&gt;current_flags &amp; HB_ShaperFlag_NoKerning)</div><div class='add'>+                            skip = true;</div><div class='add'>+                        else</div><div class='add'>+                            face-&gt;has_opentype_kerning = true;</div><div class='add'>+                    }</div><div class='add'>+                    features = disabled_features;</div><div class='add'>+                    while (features-&gt;tag) {</div><div class='add'>+                        if (*feature_tag_list == features-&gt;tag) {</div><div class='add'>+                            skip = true;</div><div class='add'>+                            break;</div><div class='ctx'>                         }</div><div class='del'>-                        face-&gt;has_opentype_kerning = true;</div><div class='add'>+                        ++features;</div><div class='add'>+                    }</div><div class='add'>+                    // 'palt' should be turned off by default unless 'kern' is on</div><div class='add'>+                    if (!face-&gt;has_opentype_kerning &amp;&amp;</div><div class='add'>+                        *feature_tag_list == HB_MAKE_TAG('p', 'a', 'l', 't'))</div><div class='add'>+                        skip = true;</div><div class='add'>+</div><div class='add'>+                    if (skip) {</div><div class='add'>+                        ++feature_tag_list;</div><div class='add'>+                        continue;</div><div class='ctx'>                     }</div><div class='ctx'>                     error = HB_GPOS_Select_Feature(face-&gt;gpos, *feature_tag_list, script_index, 0xffff, &amp;feature_index);</div><div class='ctx'>                     if (!error)</div><div class='hunk'>@@ -1204,7 +1233,7 @@ HB_Bool HB_OpenTypePosition(HB_ShaperItem *item, int availableGlyphs, HB_Bool do</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if (!face-&gt;glyphs_substituted &amp;&amp; !glyphs_positioned) {</div><div class='del'>-        HB_GetGlyphAdvances(item);</div><div class='add'>+        HB_HeuristicPosition(item);</div><div class='ctx'>         return true; // nothing to do for us</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='head'>diff --git a/src/3rdparty/harfbuzz/tests/shaping/main.cpp b/src/3rdparty/harfbuzz/tests/shaping/main.cpp<br/>index 28f8e07..73760a8 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/harfbuzz/tests/shaping/main.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/harfbuzz/tests/shaping/main.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/harfbuzz/tests/shaping/main.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/harfbuzz/tests/shaping/main.cpp</a></div><div class='hunk'>@@ -642,6 +642,10 @@ void tst_QScriptEngine::bengali()</div><div class='ctx'>                 { { 0x9f1, 0x9cd, 0x9ad, 0x0 },</div><div class='ctx'>                   { 0x191, 0x17d, 0x168, 0x0 } },</div><div class='ctx'> </div><div class='add'>+                // Ra ZWJ Halant Ya</div><div class='add'>+                { { 0x09b0, 0x200d, 0x09cd, 0x09af, 0x0 },</div><div class='add'>+                  { 0x016b, 0x01cf, 0x0 } },</div><div class='add'>+</div><div class='ctx'> 		{ {0}, {0} }</div><div class='ctx'> 	    };</div><div class='ctx'> </div><div class='hunk'>@@ -749,6 +753,13 @@ void tst_QScriptEngine::bengali()</div><div class='ctx'> 		{ { 0x09b0, 0x09cd, 0x09ac, 0x09cd, 0x09ac, 0x0 },</div><div class='ctx'> 		  { 0x013b, 0x00e1, 0x0 } },</div><div class='ctx'> </div><div class='add'>+                // Init feature for vowel sign E should only be</div><div class='add'>+                // applied when it's initial character (QTBUG-13620)</div><div class='add'>+                { { 0x09a8, 0x09c7, 0x0 },</div><div class='add'>+                  { 0x0232, 0x0086, 0x0 } },</div><div class='add'>+                { { 0x09a8, 0x09a8, 0x09c7, 0x0 },</div><div class='add'>+                  { 0x0086, 0x009b, 0x0086, 0x0 } },</div><div class='add'>+</div><div class='ctx'> 		{ {0}, {0} }</div><div class='ctx'> 	    };</div><div class='ctx'> </div><div class='hunk'>@@ -847,6 +858,19 @@ void tst_QScriptEngine::oriya()</div><div class='ctx'>                   { 0x177, 0x0 } }, </div><div class='ctx'>                 { { 0xb28, 0xb4d, 0xb24, 0xb4d, 0xb30, 0xb4d, 0xb2f, 0x0 },</div><div class='ctx'>                   { 0x176, 0x124, 0x0 } }, </div><div class='add'>+</div><div class='add'>+                // QTBUG-13542</div><div class='add'>+                { { 0x0b2c, 0x0b4d, 0x0b21, 0x0 },</div><div class='add'>+                  { 0x0089, 0x00fc, 0x0 } },</div><div class='add'>+                { { 0x0b36, 0x0b4d, 0x0b2b, 0x0 },</div><div class='add'>+                  { 0x0092, 0x0105, 0x0 } },</div><div class='add'>+                { { 0x0b36, 0x0b4d, 0x0b1f, 0x0 },</div><div class='add'>+                  { 0x0092, 0x00fa, 0x0 } },</div><div class='add'>+                { { 0x0b39, 0x0b4d, 0x0b1f, 0x0 },</div><div class='add'>+                  { 0x0095, 0x00fa, 0x0 } },</div><div class='add'>+                { { 0x0b15, 0x0b4d, 0x0b16, 0x0 },</div><div class='add'>+                  { 0x0073, 0x00f1, 0x0 } },</div><div class='add'>+</div><div class='ctx'>                 { {0}, {0} }</div><div class='ctx'> </div><div class='ctx'>             };</div><div class='hunk'>@@ -1005,6 +1029,11 @@ void tst_QScriptEngine::kannada()</div><div class='ctx'> 		  { 0x0036, 0x00c1, 0x0 } },</div><div class='ctx'> 		{ { 0x0cb0, 0x0ccd, 0x200d, 0x0c95, 0x0 },</div><div class='ctx'> 		  { 0x0050, 0x00a7, 0x0 } },</div><div class='add'>+</div><div class='add'>+                // Kaphala</div><div class='add'>+                { { 0x0cb0, 0x200d, 0x0ccd, 0x0c95, 0x0 },</div><div class='add'>+                  { 0x0050, 0x00a7, 0x0 } },</div><div class='add'>+</div><div class='ctx'> 		{ {0}, {0} }</div><div class='ctx'> 	    };</div><div class='ctx'> </div><div class='head'>diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp<br/>index b3c229e..d8027ff 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp</a></div><div class='hunk'>@@ -1168,8 +1168,17 @@ DEFINE_STUB_FUNCTION(int, timeout_check)</div><div class='ctx'>         globalData-&gt;exception = createInterruptedExecutionException(globalData);</div><div class='ctx'>         VM_THROW_EXCEPTION_AT_END();</div><div class='ctx'>     }</div><div class='del'>-    </div><div class='del'>-    CHECK_FOR_EXCEPTION_AT_END();</div><div class='add'>+#ifdef QT_BUILD_SCRIPT_LIB</div><div class='add'>+    else {</div><div class='add'>+        // It's possible that the call to QtScript's implementation of</div><div class='add'>+        // TimeoutChecker::didTimeOut() caused an error to be thrown.</div><div class='add'>+        // In that case, didTimeOut() should still return false, since</div><div class='add'>+        // we don't want the interrupted-exception to override the</div><div class='add'>+        // user-thrown error. But we need to check for exception here,</div><div class='add'>+        // otherwise JSC would continue normal execution.</div><div class='add'>+        CHECK_FOR_EXCEPTION_AT_END();</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='ctx'>     return timeoutChecker-&gt;ticksUntilNextCheck();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h<br/>index 5abe9a1..cb4a963 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h</a></div><div class='hunk'>@@ -635,6 +635,9 @@</div><div class='ctx'> #define ENABLE_REPAINT_THROTTLING 1</div><div class='ctx'> #define HAVE_READLINE 1</div><div class='ctx'> #define WTF_PLATFORM_CF 1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if OS(IPHONE_OS) &amp;&amp; !PLATFORM(QT)</div><div class='ctx'> #define WTF_USE_PTHREADS 1</div><div class='ctx'> #define HAVE_PTHREAD_RWLOCK 1</div><div class='ctx'> #endif</div><div class='head'>diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp<br/>index fcb8d86..1015923 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.cpp</a></div><div class='hunk'>@@ -1312,6 +1312,9 @@ class RegexGenerator : private MacroAssembler {</div><div class='ctx'>         push(ARMRegisters::r4);</div><div class='ctx'>         push(ARMRegisters::r5);</div><div class='ctx'>         push(ARMRegisters::r6);</div><div class='add'>+#if CPU(ARM_TRADITIONAL)</div><div class='add'>+        push(ARMRegisters::r8); // scratch register</div><div class='add'>+#endif</div><div class='ctx'>         move(ARMRegisters::r3, output);</div><div class='ctx'> #endif</div><div class='ctx'>     }</div><div class='hunk'>@@ -1327,6 +1330,9 @@ class RegexGenerator : private MacroAssembler {</div><div class='ctx'>         pop(X86Registers::ebx);</div><div class='ctx'>         pop(X86Registers::ebp);</div><div class='ctx'> #elif CPU(ARM)</div><div class='add'>+#if CPU(ARM_TRADITIONAL)</div><div class='add'>+        pop(ARMRegisters::r8); // scratch register</div><div class='add'>+#endif</div><div class='ctx'>         pop(ARMRegisters::r6);</div><div class='ctx'>         pop(ARMRegisters::r5);</div><div class='ctx'>         pop(ARMRegisters::r4);</div><div class='head'>diff --git a/src/3rdparty/libjpeg/README b/src/3rdparty/libjpeg/README<br/>index 7bc588f..451265d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/README?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/README</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/README?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/README</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> The Independent JPEG Group's JPEG software</div><div class='ctx'> ==========================================</div><div class='ctx'> </div><div class='del'>-README for release 8 of 10-Jan-2010</div><div class='del'>-===================================</div><div class='add'>+README for release 8c of 16-Jan-2011</div><div class='add'>+====================================</div><div class='ctx'> </div><div class='ctx'> This distribution contains the eighth public release of the Independent JPEG</div><div class='ctx'> Group's free JPEG software.  You are welcome to redistribute this software and</div><div class='hunk'>@@ -114,7 +114,7 @@ with respect to this software, its quality, accuracy, merchantability, or</div><div class='ctx'> fitness for a particular purpose.  This software is provided "AS IS", and you,</div><div class='ctx'> its user, assume the entire risk as to its quality and accuracy.</div><div class='ctx'> </div><div class='del'>-This software is copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding.</div><div class='add'>+This software is copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding.</div><div class='ctx'> All Rights Reserved except as specified below.</div><div class='ctx'> </div><div class='ctx'> Permission is hereby granted to use, copy, modify, and distribute this</div><div class='hunk'>@@ -254,8 +254,8 @@ ARCHIVE LOCATIONS</div><div class='ctx'> The "official" archive site for this software is www.ijg.org.</div><div class='ctx'> The most recent released version can always be found there in</div><div class='ctx'> directory "files".  This particular version will be archived as</div><div class='del'>-http://www.ijg.org/files/jpegsrc.v8.tar.gz, and in Windows-compatible</div><div class='del'>-"zip" archive format as http://www.ijg.org/files/jpegsr8.zip.</div><div class='add'>+http://www.ijg.org/files/jpegsrc.v8c.tar.gz, and in Windows-compatible</div><div class='add'>+"zip" archive format as http://www.ijg.org/files/jpegsr8c.zip.</div><div class='ctx'> </div><div class='ctx'> The JPEG FAQ (Frequently Asked Questions) article is a source of some</div><div class='ctx'> general information about JPEG.</div><div class='hunk'>@@ -285,7 +285,8 @@ Thank to John Korejwa and Massimo Ballerini for inviting me to</div><div class='ctx'> fruitful consultations in Boston, MA and Milan, Italy.</div><div class='ctx'> </div><div class='ctx'> Thank to Hendrik Elstner, Roland Fassauer, Simone Zuck, Guenther</div><div class='del'>-Maier-Gerber, and Walter Stoeber for corresponding business development.</div><div class='add'>+Maier-Gerber, Walter Stoeber, Fred Schmitz, and Norbert Braunagel</div><div class='add'>+for corresponding business development.</div><div class='ctx'> </div><div class='ctx'> Thank to Nico Zschach and Dirk Stelling of the technical support team</div><div class='ctx'> at the Digital Images company in Halle for providing me with extra</div><div class='hunk'>@@ -318,7 +319,7 @@ image files indefinitely.)</div><div class='ctx'> TO DO</div><div class='ctx'> =====</div><div class='ctx'> </div><div class='del'>-Version 8.0 is the first release of a new generation JPEG standard</div><div class='add'>+Version 8 is the first release of a new generation JPEG standard</div><div class='ctx'> to overcome the limitations of the original JPEG specification.</div><div class='ctx'> More features are being prepared for coming releases...</div><div class='ctx'> </div><div class='head'>diff --git a/src/3rdparty/libjpeg/change.log b/src/3rdparty/libjpeg/change.log<br/>index 58ea3eb..94865b3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/change.log?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/change.log</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/change.log?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/change.log</a></div><div class='hunk'>@@ -1,6 +1,42 @@</div><div class='ctx'> CHANGE LOG for Independent JPEG Group's JPEG software</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+Version 8c  16-Jan-2011</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+Add option to compression library and cjpeg (-block N) to use</div><div class='add'>+different DCT block size.</div><div class='add'>+All N from 1 to 16 are possible.  Default is 8 (baseline format).</div><div class='add'>+Larger values produce higher compression,</div><div class='add'>+smaller values produce higher quality.</div><div class='add'>+SmartScale capable decoder (introduced with IJG JPEG 8) required.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Version 8b  16-May-2010</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+Repair problem in new memory source manager with corrupt JPEG data.</div><div class='add'>+Thank to Ted Campbell and Samuel Chun for the report.</div><div class='add'>+</div><div class='add'>+Repair problem in Makefile.am test target.</div><div class='add'>+Thank to anonymous user for the report.</div><div class='add'>+</div><div class='add'>+Support MinGW installation with automatic configure.</div><div class='add'>+Thank to Volker Grabsch for the suggestion.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Version 8a  28-Feb-2010</div><div class='add'>+-----------------------</div><div class='add'>+</div><div class='add'>+Writing tables-only datastreams via jpeg_write_tables works again.</div><div class='add'>+</div><div class='add'>+Support 32-bit BMPs (RGB image with Alpha channel) for read in cjpeg.</div><div class='add'>+Thank to Brett Blackham for the suggestion.</div><div class='add'>+</div><div class='add'>+Improve accuracy in floating point IDCT calculation.</div><div class='add'>+Thank to Robert Hooke for the hint.</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> Version 8  10-Jan-2010</div><div class='ctx'> ----------------------</div><div class='ctx'> </div><div class='head'>diff --git a/src/3rdparty/libjpeg/cjpeg.1 b/src/3rdparty/libjpeg/cjpeg.1<br/>deleted file mode 100644<br/>index 01bfa25..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/cjpeg.1?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/cjpeg.1</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,325 +0,0 @@</div><div class='del'>-.TH CJPEG 1 "30 December 2009"</div><div class='del'>-.SH NAME</div><div class='del'>-cjpeg \- compress an image file to a JPEG file</div><div class='del'>-.SH SYNOPSIS</div><div class='del'>-.B cjpeg</div><div class='del'>-[</div><div class='del'>-.I options</div><div class='del'>-]</div><div class='del'>-[</div><div class='del'>-.I filename</div><div class='del'>-]</div><div class='del'>-.LP</div><div class='del'>-.SH DESCRIPTION</div><div class='del'>-.LP</div><div class='del'>-.B cjpeg</div><div class='del'>-compresses the named image file, or the standard input if no file is</div><div class='del'>-named, and produces a JPEG/JFIF file on the standard output.</div><div class='del'>-The currently supported input file formats are: PPM (PBMPLUS color</div><div class='del'>-format), PGM (PBMPLUS gray-scale format), BMP, Targa, and RLE (Utah Raster</div><div class='del'>-Toolkit format).  (RLE is supported only if the URT library is available.)</div><div class='del'>-.SH OPTIONS</div><div class='del'>-All switch names may be abbreviated; for example,</div><div class='del'>-.B \-grayscale</div><div class='del'>-may be written</div><div class='del'>-.B \-gray</div><div class='del'>-or</div><div class='del'>-.BR \-gr .</div><div class='del'>-Most of the "basic" switches can be abbreviated to as little as one letter.</div><div class='del'>-Upper and lower case are equivalent (thus</div><div class='del'>-.B \-BMP</div><div class='del'>-is the same as</div><div class='del'>-.BR \-bmp ).</div><div class='del'>-British spellings are also accepted (e.g.,</div><div class='del'>-.BR \-greyscale ),</div><div class='del'>-though for brevity these are not mentioned below.</div><div class='del'>-.PP</div><div class='del'>-The basic switches are:</div><div class='del'>-.TP</div><div class='del'>-.BI \-quality " N[,...]"</div><div class='del'>-Scale quantization tables to adjust image quality.  Quality is 0 (worst) to</div><div class='del'>-100 (best); default is 75.  (See below for more info.)</div><div class='del'>-.TP</div><div class='del'>-.B \-grayscale</div><div class='del'>-Create monochrome JPEG file from color input.  Be sure to use this switch when</div><div class='del'>-compressing a grayscale BMP file, because</div><div class='del'>-.B cjpeg</div><div class='del'>-isn't bright enough to notice whether a BMP file uses only shades of gray.</div><div class='del'>-By saying</div><div class='del'>-.BR \-grayscale ,</div><div class='del'>-you'll get a smaller JPEG file that takes less time to process.</div><div class='del'>-.TP</div><div class='del'>-.B \-optimize</div><div class='del'>-Perform optimization of entropy encoding parameters.  Without this, default</div><div class='del'>-encoding parameters are used.</div><div class='del'>-.B \-optimize</div><div class='del'>-usually makes the JPEG file a little smaller, but</div><div class='del'>-.B cjpeg</div><div class='del'>-runs somewhat slower and needs much more memory.  Image quality and speed of</div><div class='del'>-decompression are unaffected by</div><div class='del'>-.BR \-optimize .</div><div class='del'>-.TP</div><div class='del'>-.B \-progressive</div><div class='del'>-Create progressive JPEG file (see below).</div><div class='del'>-.TP</div><div class='del'>-.BI \-scale " M/N"</div><div class='del'>-Scale the output image by a factor M/N.  Currently supported scale factors are</div><div class='del'>-8/N with all N from 1 to 16.</div><div class='del'>-.TP</div><div class='del'>-.B \-targa</div><div class='del'>-Input file is Targa format.  Targa files that contain an "identification"</div><div class='del'>-field will not be automatically recognized by</div><div class='del'>-.BR cjpeg ;</div><div class='del'>-for such files you must specify</div><div class='del'>-.B \-targa</div><div class='del'>-to make</div><div class='del'>-.B cjpeg</div><div class='del'>-treat the input as Targa format.</div><div class='del'>-For most Targa files, you won't need this switch.</div><div class='del'>-.PP</div><div class='del'>-The</div><div class='del'>-.B \-quality</div><div class='del'>-switch lets you trade off compressed file size against quality of the</div><div class='del'>-reconstructed image: the higher the quality setting, the larger the JPEG file,</div><div class='del'>-and the closer the output image will be to the original input.  Normally you</div><div class='del'>-want to use the lowest quality setting (smallest file) that decompresses into</div><div class='del'>-something visually indistinguishable from the original image.  For this</div><div class='del'>-purpose the quality setting should be between 50 and 95; the default of 75 is</div><div class='del'>-often about right.  If you see defects at</div><div class='del'>-.B \-quality</div><div class='del'>-75, then go up 5 or 10 counts at a time until you are happy with the output</div><div class='del'>-image.  (The optimal setting will vary from one image to another.)</div><div class='del'>-.PP</div><div class='del'>-.B \-quality</div><div class='del'>-100 will generate a quantization table of all 1's, minimizing loss in the</div><div class='del'>-quantization step (but there is still information loss in subsampling, as well</div><div class='del'>-as roundoff error).  This setting is mainly of interest for experimental</div><div class='del'>-purposes.  Quality values above about 95 are</div><div class='del'>-.B not</div><div class='del'>-recommended for normal use; the compressed file size goes up dramatically for</div><div class='del'>-hardly any gain in output image quality.</div><div class='del'>-.PP</div><div class='del'>-In the other direction, quality values below 50 will produce very small files</div><div class='del'>-of low image quality.  Settings around 5 to 10 might be useful in preparing an</div><div class='del'>-index of a large image library, for example.  Try</div><div class='del'>-.B \-quality</div><div class='del'>-2 (or so) for some amusing Cubist effects.  (Note: quality</div><div class='del'>-values below about 25 generate 2-byte quantization tables, which are</div><div class='del'>-considered optional in the JPEG standard.</div><div class='del'>-.B cjpeg</div><div class='del'>-emits a warning message when you give such a quality value, because some</div><div class='del'>-other JPEG programs may be unable to decode the resulting file.  Use</div><div class='del'>-.B \-baseline</div><div class='del'>-if you need to ensure compatibility at low quality values.)</div><div class='del'>-.PP</div><div class='del'>-The</div><div class='del'>-.B \-quality</div><div class='del'>-option has been extended in IJG version 7 for support of separate quality</div><div class='del'>-settings for luminance and chrominance (or in general, for every provided</div><div class='del'>-quantization table slot).  This feature is useful for high-quality</div><div class='del'>-applications which cannot accept the damage of color data by coarse</div><div class='del'>-subsampling settings.  You can now easily reduce the color data amount more</div><div class='del'>-smoothly with finer control without separate subsampling.  The resulting file</div><div class='del'>-is fully compliant with standard JPEG decoders.</div><div class='del'>-Note that the</div><div class='del'>-.B \-quality</div><div class='del'>-ratings refer to the quantization table slots, and that the last value is</div><div class='del'>-replicated if there are more q-table slots than parameters.  The default</div><div class='del'>-q-table slots are 0 for luminance and 1 for chrominance with default tables as</div><div class='del'>-given in the JPEG standard.  This is compatible with the old behaviour in case</div><div class='del'>-that only one parameter is given, which is then used for both luminance and</div><div class='del'>-chrominance (slots 0 and 1).  More or custom quantization tables can be set</div><div class='del'>-with</div><div class='del'>-.B \-qtables</div><div class='del'>-and assigned to components with</div><div class='del'>-.B \-qslots</div><div class='del'>-parameter (see the "wizard" switches below).</div><div class='del'>-.B Caution:</div><div class='del'>-You must explicitly add</div><div class='del'>-.BI \-sample " 1x1"</div><div class='del'>-for efficient separate color</div><div class='del'>-quality selection, since the default value used by library is 2x2!</div><div class='del'>-.PP</div><div class='del'>-The</div><div class='del'>-.B \-progressive</div><div class='del'>-switch creates a "progressive JPEG" file.  In this type of JPEG file, the data</div><div class='del'>-is stored in multiple scans of increasing quality.  If the file is being</div><div class='del'>-transmitted over a slow communications link, the decoder can use the first</div><div class='del'>-scan to display a low-quality image very quickly, and can then improve the</div><div class='del'>-display with each subsequent scan.  The final image is exactly equivalent to a</div><div class='del'>-standard JPEG file of the same quality setting, and the total file size is</div><div class='del'>-about the same --- often a little smaller.</div><div class='del'>-.PP</div><div class='del'>-Switches for advanced users:</div><div class='del'>-.TP</div><div class='del'>-.B \-dct int</div><div class='del'>-Use integer DCT method (default).</div><div class='del'>-.TP</div><div class='del'>-.B \-dct fast</div><div class='del'>-Use fast integer DCT (less accurate).</div><div class='del'>-.TP</div><div class='del'>-.B \-dct float</div><div class='del'>-Use floating-point DCT method.</div><div class='del'>-The float method is very slightly more accurate than the int method, but is</div><div class='del'>-much slower unless your machine has very fast floating-point hardware.  Also</div><div class='del'>-note that results of the floating-point method may vary slightly across</div><div class='del'>-machines, while the integer methods should give the same results everywhere.</div><div class='del'>-The fast integer method is much less accurate than the other two.</div><div class='del'>-.TP</div><div class='del'>-.B \-nosmooth</div><div class='del'>-Don't use high-quality downsampling.</div><div class='del'>-.TP</div><div class='del'>-.BI \-restart " N"</div><div class='del'>-Emit a JPEG restart marker every N MCU rows, or every N MCU blocks if "B" is</div><div class='del'>-attached to the number.</div><div class='del'>-.B \-restart 0</div><div class='del'>-(the default) means no restart markers.</div><div class='del'>-.TP</div><div class='del'>-.BI \-smooth " N"</div><div class='del'>-Smooth the input image to eliminate dithering noise.  N, ranging from 1 to</div><div class='del'>-100, indicates the strength of smoothing.  0 (the default) means no smoothing.</div><div class='del'>-.TP</div><div class='del'>-.BI \-maxmemory " N"</div><div class='del'>-Set limit for amount of memory to use in processing large images.  Value is</div><div class='del'>-in thousands of bytes, or millions of bytes if "M" is attached to the</div><div class='del'>-number.  For example,</div><div class='del'>-.B \-max 4m</div><div class='del'>-selects 4000000 bytes.  If more space is needed, temporary files will be used.</div><div class='del'>-.TP</div><div class='del'>-.BI \-outfile " name"</div><div class='del'>-Send output image to the named file, not to standard output.</div><div class='del'>-.TP</div><div class='del'>-.B \-verbose</div><div class='del'>-Enable debug printout.  More</div><div class='del'>-.BR \-v 's</div><div class='del'>-give more output.  Also, version information is printed at startup.</div><div class='del'>-.TP</div><div class='del'>-.B \-debug</div><div class='del'>-Same as</div><div class='del'>-.BR \-verbose .</div><div class='del'>-.PP</div><div class='del'>-The</div><div class='del'>-.B \-restart</div><div class='del'>-option inserts extra markers that allow a JPEG decoder to resynchronize after</div><div class='del'>-a transmission error.  Without restart markers, any damage to a compressed</div><div class='del'>-file will usually ruin the image from the point of the error to the end of the</div><div class='del'>-image; with restart markers, the damage is usually confined to the portion of</div><div class='del'>-the image up to the next restart marker.  Of course, the restart markers</div><div class='del'>-occupy extra space.  We recommend</div><div class='del'>-.B \-restart 1</div><div class='del'>-for images that will be transmitted across unreliable networks such as Usenet.</div><div class='del'>-.PP</div><div class='del'>-The</div><div class='del'>-.B \-smooth</div><div class='del'>-option filters the input to eliminate fine-scale noise.  This is often useful</div><div class='del'>-when converting dithered images to JPEG: a moderate smoothing factor of 10 to</div><div class='del'>-50 gets rid of dithering patterns in the input file, resulting in a smaller</div><div class='del'>-JPEG file and a better-looking image.  Too large a smoothing factor will</div><div class='del'>-visibly blur the image, however.</div><div class='del'>-.PP</div><div class='del'>-Switches for wizards:</div><div class='del'>-.TP</div><div class='del'>-.B \-arithmetic</div><div class='del'>-Use arithmetic coding.</div><div class='del'>-.B Caution:</div><div class='del'>-arithmetic coded JPEG is not yet widely implemented, so many decoders will be</div><div class='del'>-unable to view an arithmetic coded JPEG file at all.</div><div class='del'>-.TP</div><div class='del'>-.B \-baseline</div><div class='del'>-Force baseline-compatible quantization tables to be generated.  This clamps</div><div class='del'>-quantization values to 8 bits even at low quality settings.  (This switch is</div><div class='del'>-poorly named, since it does not ensure that the output is actually baseline</div><div class='del'>-JPEG.  For example, you can use</div><div class='del'>-.B \-baseline</div><div class='del'>-and</div><div class='del'>-.B \-progressive</div><div class='del'>-together.)</div><div class='del'>-.TP</div><div class='del'>-.BI \-qtables " file"</div><div class='del'>-Use the quantization tables given in the specified text file.</div><div class='del'>-.TP</div><div class='del'>-.BI \-qslots " N[,...]"</div><div class='del'>-Select which quantization table to use for each color component.</div><div class='del'>-.TP</div><div class='del'>-.BI \-sample " HxV[,...]"</div><div class='del'>-Set JPEG sampling factors for each color component.</div><div class='del'>-.TP</div><div class='del'>-.BI \-scans " file"</div><div class='del'>-Use the scan script given in the specified text file.</div><div class='del'>-.PP</div><div class='del'>-The "wizard" switches are intended for experimentation with JPEG.  If you</div><div class='del'>-don't know what you are doing, \fBdon't use them\fR.  These switches are</div><div class='del'>-documented further in the file wizard.txt.</div><div class='del'>-.SH EXAMPLES</div><div class='del'>-.LP</div><div class='del'>-This example compresses the PPM file foo.ppm with a quality factor of</div><div class='del'>-60 and saves the output as foo.jpg:</div><div class='del'>-.IP</div><div class='del'>-.B cjpeg \-quality</div><div class='del'>-.I 60 foo.ppm</div><div class='del'>-.B &gt;</div><div class='del'>-.I foo.jpg</div><div class='del'>-.SH HINTS</div><div class='del'>-Color GIF files are not the ideal input for JPEG; JPEG is really intended for</div><div class='del'>-compressing full-color (24-bit) images.  In particular, don't try to convert</div><div class='del'>-cartoons, line drawings, and other images that have only a few distinct</div><div class='del'>-colors.  GIF works great on these, JPEG does not.  If you want to convert a</div><div class='del'>-GIF to JPEG, you should experiment with</div><div class='del'>-.BR cjpeg 's</div><div class='del'>-.B \-quality</div><div class='del'>-and</div><div class='del'>-.B \-smooth</div><div class='del'>-options to get a satisfactory conversion.</div><div class='del'>-.B \-smooth 10</div><div class='del'>-or so is often helpful.</div><div class='del'>-.PP</div><div class='del'>-Avoid running an image through a series of JPEG compression/decompression</div><div class='del'>-cycles.  Image quality loss will accumulate; after ten or so cycles the image</div><div class='del'>-may be noticeably worse than it was after one cycle.  It's best to use a</div><div class='del'>-lossless format while manipulating an image, then convert to JPEG format when</div><div class='del'>-you are ready to file the image away.</div><div class='del'>-.PP</div><div class='del'>-The</div><div class='del'>-.B \-optimize</div><div class='del'>-option to</div><div class='del'>-.B cjpeg</div><div class='del'>-is worth using when you are making a "final" version for posting or archiving.</div><div class='del'>-It's also a win when you are using low quality settings to make very small</div><div class='del'>-JPEG files; the percentage improvement is often a lot more than it is on</div><div class='del'>-larger files.  (At present,</div><div class='del'>-.B \-optimize</div><div class='del'>-mode is always selected when generating progressive JPEG files.)</div><div class='del'>-.SH ENVIRONMENT</div><div class='del'>-.TP</div><div class='del'>-.B JPEGMEM</div><div class='del'>-If this environment variable is set, its value is the default memory limit.</div><div class='del'>-The value is specified as described for the</div><div class='del'>-.B \-maxmemory</div><div class='del'>-switch.</div><div class='del'>-.B JPEGMEM</div><div class='del'>-overrides the default value specified when the program was compiled, and</div><div class='del'>-itself is overridden by an explicit</div><div class='del'>-.BR \-maxmemory .</div><div class='del'>-.SH SEE ALSO</div><div class='del'>-.BR djpeg (1),</div><div class='del'>-.BR jpegtran (1),</div><div class='del'>-.BR rdjpgcom (1),</div><div class='del'>-.BR wrjpgcom (1)</div><div class='del'>-.br</div><div class='del'>-.BR ppm (5),</div><div class='del'>-.BR pgm (5)</div><div class='del'>-.br</div><div class='del'>-Wallace, Gregory K.  "The JPEG Still Picture Compression Standard",</div><div class='del'>-Communications of the ACM, April 1991 (vol. 34, no. 4), pp. 30-44.</div><div class='del'>-.SH AUTHOR</div><div class='del'>-Independent JPEG Group</div><div class='del'>-.SH BUGS</div><div class='del'>-GIF input files are no longer supported, to avoid the Unisys LZW patent.</div><div class='del'>-(Conversion of GIF files to JPEG is usually a bad idea anyway.)</div><div class='del'>-.PP</div><div class='del'>-Not all variants of BMP and Targa file formats are supported.</div><div class='del'>-.PP</div><div class='del'>-The</div><div class='del'>-.B \-targa</div><div class='del'>-switch is not a bug, it's a feature.  (It would be a bug if the Targa format</div><div class='del'>-designers had not been clueless.)</div><div class='head'>diff --git a/src/3rdparty/libjpeg/djpeg.1 b/src/3rdparty/libjpeg/djpeg.1<br/>deleted file mode 100644<br/>index f3722d1..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/djpeg.1?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/djpeg.1</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,252 +0,0 @@</div><div class='del'>-.TH DJPEG 1 "3 October 2009"</div><div class='del'>-.SH NAME</div><div class='del'>-djpeg \- decompress a JPEG file to an image file</div><div class='del'>-.SH SYNOPSIS</div><div class='del'>-.B djpeg</div><div class='del'>-[</div><div class='del'>-.I options</div><div class='del'>-]</div><div class='del'>-[</div><div class='del'>-.I filename</div><div class='del'>-]</div><div class='del'>-.LP</div><div class='del'>-.SH DESCRIPTION</div><div class='del'>-.LP</div><div class='del'>-.B djpeg</div><div class='del'>-decompresses the named JPEG file, or the standard input if no file is named,</div><div class='del'>-and produces an image file on the standard output.  PBMPLUS (PPM/PGM), BMP,</div><div class='del'>-GIF, Targa, or RLE (Utah Raster Toolkit) output format can be selected.</div><div class='del'>-(RLE is supported only if the URT library is available.)</div><div class='del'>-.SH OPTIONS</div><div class='del'>-All switch names may be abbreviated; for example,</div><div class='del'>-.B \-grayscale</div><div class='del'>-may be written</div><div class='del'>-.B \-gray</div><div class='del'>-or</div><div class='del'>-.BR \-gr .</div><div class='del'>-Most of the "basic" switches can be abbreviated to as little as one letter.</div><div class='del'>-Upper and lower case are equivalent (thus</div><div class='del'>-.B \-BMP</div><div class='del'>-is the same as</div><div class='del'>-.BR \-bmp ).</div><div class='del'>-British spellings are also accepted (e.g.,</div><div class='del'>-.BR \-greyscale ),</div><div class='del'>-though for brevity these are not mentioned below.</div><div class='del'>-.PP</div><div class='del'>-The basic switches are:</div><div class='del'>-.TP</div><div class='del'>-.BI \-colors " N"</div><div class='del'>-Reduce image to at most N colors.  This reduces the number of colors used in</div><div class='del'>-the output image, so that it can be displayed on a colormapped display or</div><div class='del'>-stored in a colormapped file format.  For example, if you have an 8-bit</div><div class='del'>-display, you'd need to reduce to 256 or fewer colors.</div><div class='del'>-.TP</div><div class='del'>-.BI \-quantize " N"</div><div class='del'>-Same as</div><div class='del'>-.BR \-colors .</div><div class='del'>-.B \-colors</div><div class='del'>-is the recommended name,</div><div class='del'>-.B \-quantize</div><div class='del'>-is provided only for backwards compatibility.</div><div class='del'>-.TP</div><div class='del'>-.B \-fast</div><div class='del'>-Select recommended processing options for fast, low quality output.  (The</div><div class='del'>-default options are chosen for highest quality output.)  Currently, this is</div><div class='del'>-equivalent to \fB\-dct fast \-nosmooth \-onepass \-dither ordered\fR.</div><div class='del'>-.TP</div><div class='del'>-.B \-grayscale</div><div class='del'>-Force gray-scale output even if JPEG file is color.  Useful for viewing on</div><div class='del'>-monochrome displays; also,</div><div class='del'>-.B djpeg</div><div class='del'>-runs noticeably faster in this mode.</div><div class='del'>-.TP</div><div class='del'>-.BI \-scale " M/N"</div><div class='del'>-Scale the output image by a factor M/N.  Currently supported scale factors are</div><div class='del'>-M/N with all M from 1 to 16, where N is the source DCT size, which is 8 for</div><div class='del'>-baseline JPEG.  If the /N part is omitted, then M specifies the DCT scaled</div><div class='del'>-size to be applied on the given input.  For baseline JPEG this is equivalent</div><div class='del'>-to M/8 scaling, since the source DCT size for baseline JPEG is 8.</div><div class='del'>-Scaling is handy if the image is larger than your screen; also,</div><div class='del'>-.B djpeg</div><div class='del'>-runs much faster when scaling down the output.</div><div class='del'>-.TP</div><div class='del'>-.B \-bmp</div><div class='del'>-Select BMP output format (Windows flavor).  8-bit colormapped format is</div><div class='del'>-emitted if</div><div class='del'>-.B \-colors</div><div class='del'>-or</div><div class='del'>-.B \-grayscale</div><div class='del'>-is specified, or if the JPEG file is gray-scale; otherwise, 24-bit full-color</div><div class='del'>-format is emitted.</div><div class='del'>-.TP</div><div class='del'>-.B \-gif</div><div class='del'>-Select GIF output format.  Since GIF does not support more than 256 colors,</div><div class='del'>-.B \-colors 256</div><div class='del'>-is assumed (unless you specify a smaller number of colors).</div><div class='del'>-.TP</div><div class='del'>-.B \-os2</div><div class='del'>-Select BMP output format (OS/2 1.x flavor).  8-bit colormapped format is</div><div class='del'>-emitted if</div><div class='del'>-.B \-colors</div><div class='del'>-or</div><div class='del'>-.B \-grayscale</div><div class='del'>-is specified, or if the JPEG file is gray-scale; otherwise, 24-bit full-color</div><div class='del'>-format is emitted.</div><div class='del'>-.TP</div><div class='del'>-.B \-pnm</div><div class='del'>-Select PBMPLUS (PPM/PGM) output format (this is the default format).</div><div class='del'>-PGM is emitted if the JPEG file is gray-scale or if</div><div class='del'>-.B \-grayscale</div><div class='del'>-is specified; otherwise PPM is emitted.</div><div class='del'>-.TP</div><div class='del'>-.B \-rle</div><div class='del'>-Select RLE output format.  (Requires URT library.)</div><div class='del'>-.TP</div><div class='del'>-.B \-targa</div><div class='del'>-Select Targa output format.  Gray-scale format is emitted if the JPEG file is</div><div class='del'>-gray-scale or if</div><div class='del'>-.B \-grayscale</div><div class='del'>-is specified; otherwise, colormapped format is emitted if</div><div class='del'>-.B \-colors</div><div class='del'>-is specified; otherwise, 24-bit full-color format is emitted.</div><div class='del'>-.PP</div><div class='del'>-Switches for advanced users:</div><div class='del'>-.TP</div><div class='del'>-.B \-dct int</div><div class='del'>-Use integer DCT method (default).</div><div class='del'>-.TP</div><div class='del'>-.B \-dct fast</div><div class='del'>-Use fast integer DCT (less accurate).</div><div class='del'>-.TP</div><div class='del'>-.B \-dct float</div><div class='del'>-Use floating-point DCT method.</div><div class='del'>-The float method is very slightly more accurate than the int method, but is</div><div class='del'>-much slower unless your machine has very fast floating-point hardware.  Also</div><div class='del'>-note that results of the floating-point method may vary slightly across</div><div class='del'>-machines, while the integer methods should give the same results everywhere.</div><div class='del'>-The fast integer method is much less accurate than the other two.</div><div class='del'>-.TP</div><div class='del'>-.B \-dither fs</div><div class='del'>-Use Floyd-Steinberg dithering in color quantization.</div><div class='del'>-.TP</div><div class='del'>-.B \-dither ordered</div><div class='del'>-Use ordered dithering in color quantization.</div><div class='del'>-.TP</div><div class='del'>-.B \-dither none</div><div class='del'>-Do not use dithering in color quantization.</div><div class='del'>-By default, Floyd-Steinberg dithering is applied when quantizing colors; this</div><div class='del'>-is slow but usually produces the best results.  Ordered dither is a compromise</div><div class='del'>-between speed and quality; no dithering is fast but usually looks awful.  Note</div><div class='del'>-that these switches have no effect unless color quantization is being done.</div><div class='del'>-Ordered dither is only available in</div><div class='del'>-.B \-onepass</div><div class='del'>-mode.</div><div class='del'>-.TP</div><div class='del'>-.BI \-map " file"</div><div class='del'>-Quantize to the colors used in the specified image file.  This is useful for</div><div class='del'>-producing multiple files with identical color maps, or for forcing a</div><div class='del'>-predefined set of colors to be used.  The</div><div class='del'>-.I file</div><div class='del'>-must be a GIF or PPM file. This option overrides</div><div class='del'>-.B \-colors</div><div class='del'>-and</div><div class='del'>-.BR \-onepass .</div><div class='del'>-.TP</div><div class='del'>-.B \-nosmooth</div><div class='del'>-Don't use high-quality upsampling.</div><div class='del'>-.TP</div><div class='del'>-.B \-onepass</div><div class='del'>-Use one-pass instead of two-pass color quantization.  The one-pass method is</div><div class='del'>-faster and needs less memory, but it produces a lower-quality image.</div><div class='del'>-.B \-onepass</div><div class='del'>-is ignored unless you also say</div><div class='del'>-.B \-colors</div><div class='del'>-.IR N .</div><div class='del'>-Also, the one-pass method is always used for gray-scale output (the two-pass</div><div class='del'>-method is no improvement then).</div><div class='del'>-.TP</div><div class='del'>-.BI \-maxmemory " N"</div><div class='del'>-Set limit for amount of memory to use in processing large images.  Value is</div><div class='del'>-in thousands of bytes, or millions of bytes if "M" is attached to the</div><div class='del'>-number.  For example,</div><div class='del'>-.B \-max 4m</div><div class='del'>-selects 4000000 bytes.  If more space is needed, temporary files will be used.</div><div class='del'>-.TP</div><div class='del'>-.BI \-outfile " name"</div><div class='del'>-Send output image to the named file, not to standard output.</div><div class='del'>-.TP</div><div class='del'>-.B \-verbose</div><div class='del'>-Enable debug printout.  More</div><div class='del'>-.BR \-v 's</div><div class='del'>-give more output.  Also, version information is printed at startup.</div><div class='del'>-.TP</div><div class='del'>-.B \-debug</div><div class='del'>-Same as</div><div class='del'>-.BR \-verbose .</div><div class='del'>-.SH EXAMPLES</div><div class='del'>-.LP</div><div class='del'>-This example decompresses the JPEG file foo.jpg, quantizes it to</div><div class='del'>-256 colors, and saves the output in 8-bit BMP format in foo.bmp:</div><div class='del'>-.IP</div><div class='del'>-.B djpeg \-colors 256 \-bmp</div><div class='del'>-.I foo.jpg</div><div class='del'>-.B &gt;</div><div class='del'>-.I foo.bmp</div><div class='del'>-.SH HINTS</div><div class='del'>-To get a quick preview of an image, use the</div><div class='del'>-.B \-grayscale</div><div class='del'>-and/or</div><div class='del'>-.B \-scale</div><div class='del'>-switches.</div><div class='del'>-.B \-grayscale \-scale 1/8</div><div class='del'>-is the fastest case.</div><div class='del'>-.PP</div><div class='del'>-Several options are available that trade off image quality to gain speed.</div><div class='del'>-.B \-fast</div><div class='del'>-turns on the recommended settings.</div><div class='del'>-.PP</div><div class='del'>-.B \-dct fast</div><div class='del'>-and/or</div><div class='del'>-.B \-nosmooth</div><div class='del'>-gain speed at a small sacrifice in quality.</div><div class='del'>-When producing a color-quantized image,</div><div class='del'>-.B \-onepass \-dither ordered</div><div class='del'>-is fast but much lower quality than the default behavior.</div><div class='del'>-.B \-dither none</div><div class='del'>-may give acceptable results in two-pass mode, but is seldom tolerable in</div><div class='del'>-one-pass mode.</div><div class='del'>-.PP</div><div class='del'>-If you are fortunate enough to have very fast floating point hardware,</div><div class='del'>-\fB\-dct float\fR may be even faster than \fB\-dct fast\fR.  But on most</div><div class='del'>-machines \fB\-dct float\fR is slower than \fB\-dct int\fR; in this case it is</div><div class='del'>-not worth using, because its theoretical accuracy advantage is too small to be</div><div class='del'>-significant in practice.</div><div class='del'>-.SH ENVIRONMENT</div><div class='del'>-.TP</div><div class='del'>-.B JPEGMEM</div><div class='del'>-If this environment variable is set, its value is the default memory limit.</div><div class='del'>-The value is specified as described for the</div><div class='del'>-.B \-maxmemory</div><div class='del'>-switch.</div><div class='del'>-.B JPEGMEM</div><div class='del'>-overrides the default value specified when the program was compiled, and</div><div class='del'>-itself is overridden by an explicit</div><div class='del'>-.BR \-maxmemory .</div><div class='del'>-.SH SEE ALSO</div><div class='del'>-.BR cjpeg (1),</div><div class='del'>-.BR jpegtran (1),</div><div class='del'>-.BR rdjpgcom (1),</div><div class='del'>-.BR wrjpgcom (1)</div><div class='del'>-.br</div><div class='del'>-.BR ppm (5),</div><div class='del'>-.BR pgm (5)</div><div class='del'>-.br</div><div class='del'>-Wallace, Gregory K.  "The JPEG Still Picture Compression Standard",</div><div class='del'>-Communications of the ACM, April 1991 (vol. 34, no. 4), pp. 30-44.</div><div class='del'>-.SH AUTHOR</div><div class='del'>-Independent JPEG Group</div><div class='del'>-.SH BUGS</div><div class='del'>-To avoid the Unisys LZW patent,</div><div class='del'>-.B djpeg</div><div class='del'>-produces uncompressed GIF files.  These are larger than they should be, but</div><div class='del'>-are readable by standard GIF decoders.</div><div class='head'>diff --git a/src/3rdparty/libjpeg/jcapimin.c b/src/3rdparty/libjpeg/jcapimin.c<br/>index 563ab42..639ce86 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jcapimin.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jcapimin.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jcapimin.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/jcapimin.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  * jcapimin.c</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1994-1998, Thomas G. Lane.</div><div class='add'>+ * Modified 2003-2010 by Guido Vollbeding.</div><div class='ctx'>  * This file is part of the Independent JPEG Group's software.</div><div class='ctx'>  * For conditions of distribution and use, see the accompanying README file.</div><div class='ctx'>  *</div><div class='hunk'>@@ -73,6 +74,11 @@ jpeg_CreateCompress (j_compress_ptr cinfo, int version, size_t structsize)</div><div class='ctx'>     cinfo-&gt;ac_huff_tbl_ptrs[i] = NULL;</div><div class='ctx'>   }</div><div class='ctx'> </div><div class='add'>+  /* Must do it here for emit_dqt in case jpeg_write_tables is used */</div><div class='add'>+  cinfo-&gt;block_size = DCTSIZE;</div><div class='add'>+  cinfo-&gt;natural_order = jpeg_natural_order;</div><div class='add'>+  cinfo-&gt;lim_Se = DCTSIZE2-1;</div><div class='add'>+</div><div class='ctx'>   cinfo-&gt;script_space = NULL;</div><div class='ctx'> </div><div class='ctx'>   cinfo-&gt;input_gamma = 1.0;	/* in case application forgets */</div><div class='head'>diff --git a/src/3rdparty/libjpeg/jcmarker.c b/src/3rdparty/libjpeg/jcmarker.c<br/>index 2e28983..606c19a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jcmarker.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jcmarker.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jcmarker.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/jcmarker.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  * jcmarker.c</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1991-1998, Thomas G. Lane.</div><div class='del'>- * Modified 2003-2009 by Guido Vollbeding.</div><div class='add'>+ * Modified 2003-2010 by Guido Vollbeding.</div><div class='ctx'>  * This file is part of the Independent JPEG Group's software.</div><div class='ctx'>  * For conditions of distribution and use, see the accompanying README file.</div><div class='ctx'>  *</div><div class='hunk'>@@ -231,10 +231,10 @@ emit_dac (j_compress_ptr cinfo)</div><div class='ctx'>   char ac_in_use[NUM_ARITH_TBLS];</div><div class='ctx'>   int length, i;</div><div class='ctx'>   jpeg_component_info *compptr;</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>   for (i = 0; i &lt; NUM_ARITH_TBLS; i++)</div><div class='ctx'>     dc_in_use[i] = ac_in_use[i] = 0;</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>   for (i = 0; i &lt; cinfo-&gt;comps_in_scan; i++) {</div><div class='ctx'>     compptr = cinfo-&gt;cur_comp_info[i];</div><div class='ctx'>     /* DC needs no table for refinement scan */</div><div class='hunk'>@@ -244,23 +244,25 @@ emit_dac (j_compress_ptr cinfo)</div><div class='ctx'>     if (cinfo-&gt;Se)</div><div class='ctx'>       ac_in_use[compptr-&gt;ac_tbl_no] = 1;</div><div class='ctx'>   }</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>   length = 0;</div><div class='ctx'>   for (i = 0; i &lt; NUM_ARITH_TBLS; i++)</div><div class='ctx'>     length += dc_in_use[i] + ac_in_use[i];</div><div class='del'>-  </div><div class='del'>-  emit_marker(cinfo, M_DAC);</div><div class='del'>-  </div><div class='del'>-  emit_2bytes(cinfo, length*2 + 2);</div><div class='del'>-  </div><div class='del'>-  for (i = 0; i &lt; NUM_ARITH_TBLS; i++) {</div><div class='del'>-    if (dc_in_use[i]) {</div><div class='del'>-      emit_byte(cinfo, i);</div><div class='del'>-      emit_byte(cinfo, cinfo-&gt;arith_dc_L[i] + (cinfo-&gt;arith_dc_U[i]&lt;&lt;4));</div><div class='del'>-    }</div><div class='del'>-    if (ac_in_use[i]) {</div><div class='del'>-      emit_byte(cinfo, i + 0x10);</div><div class='del'>-      emit_byte(cinfo, cinfo-&gt;arith_ac_K[i]);</div><div class='add'>+</div><div class='add'>+  if (length) {</div><div class='add'>+    emit_marker(cinfo, M_DAC);</div><div class='add'>+</div><div class='add'>+    emit_2bytes(cinfo, length*2 + 2);</div><div class='add'>+</div><div class='add'>+    for (i = 0; i &lt; NUM_ARITH_TBLS; i++) {</div><div class='add'>+      if (dc_in_use[i]) {</div><div class='add'>+	emit_byte(cinfo, i);</div><div class='add'>+	emit_byte(cinfo, cinfo-&gt;arith_dc_L[i] + (cinfo-&gt;arith_dc_U[i]&lt;&lt;4));</div><div class='add'>+      }</div><div class='add'>+      if (ac_in_use[i]) {</div><div class='add'>+	emit_byte(cinfo, i + 0x10);</div><div class='add'>+	emit_byte(cinfo, cinfo-&gt;arith_ac_K[i]);</div><div class='add'>+      }</div><div class='ctx'>     }</div><div class='ctx'>   }</div><div class='ctx'> #endif /* C_ARITH_CODING_SUPPORTED */</div><div class='head'>diff --git a/src/3rdparty/libjpeg/jcmaster.c b/src/3rdparty/libjpeg/jcmaster.c<br/>index 5284e58..caf80a5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jcmaster.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jcmaster.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jcmaster.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/jcmaster.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  * jcmaster.c</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1991-1997, Thomas G. Lane.</div><div class='del'>- * Modified 2003-2010 by Guido Vollbeding.</div><div class='add'>+ * Modified 2003-2011 by Guido Vollbeding.</div><div class='ctx'>  * This file is part of the Independent JPEG Group's software.</div><div class='ctx'>  * For conditions of distribution and use, see the accompanying README file.</div><div class='ctx'>  *</div><div class='hunk'>@@ -55,125 +55,140 @@ jpeg_calc_jpeg_dimensions (j_compress_ptr cinfo)</div><div class='ctx'> {</div><div class='ctx'> #ifdef DCT_SCALING_SUPPORTED</div><div class='ctx'> </div><div class='add'>+  /* Sanity check on input image dimensions to prevent overflow in</div><div class='add'>+   * following calculation.</div><div class='add'>+   * We do check jpeg_width and jpeg_height in initial_setup below,</div><div class='add'>+   * but image_width and image_height can come from arbitrary data,</div><div class='add'>+   * and we need some space for multiplication by block_size.</div><div class='add'>+   */</div><div class='add'>+  if (((long) cinfo-&gt;image_width &gt;&gt; 24) || ((long) cinfo-&gt;image_height &gt;&gt; 24))</div><div class='add'>+    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) JPEG_MAX_DIMENSION);</div><div class='add'>+</div><div class='ctx'>   /* Compute actual JPEG image dimensions and DCT scaling choices. */</div><div class='del'>-  if (cinfo-&gt;scale_num &gt;= cinfo-&gt;scale_denom * 8) {</div><div class='del'>-    /* Provide 8/1 scaling */</div><div class='del'>-    cinfo-&gt;jpeg_width = cinfo-&gt;image_width &lt;&lt; 3;</div><div class='del'>-    cinfo-&gt;jpeg_height = cinfo-&gt;image_height &lt;&lt; 3;</div><div class='add'>+  if (cinfo-&gt;scale_num &gt;= cinfo-&gt;scale_denom * cinfo-&gt;block_size) {</div><div class='add'>+    /* Provide block_size/1 scaling */</div><div class='add'>+    cinfo-&gt;jpeg_width = cinfo-&gt;image_width * cinfo-&gt;block_size;</div><div class='add'>+    cinfo-&gt;jpeg_height = cinfo-&gt;image_height * cinfo-&gt;block_size;</div><div class='ctx'>     cinfo-&gt;min_DCT_h_scaled_size = 1;</div><div class='ctx'>     cinfo-&gt;min_DCT_v_scaled_size = 1;</div><div class='del'>-  } else if (cinfo-&gt;scale_num &gt;= cinfo-&gt;scale_denom * 4) {</div><div class='del'>-    /* Provide 4/1 scaling */</div><div class='del'>-    cinfo-&gt;jpeg_width = cinfo-&gt;image_width &lt;&lt; 2;</div><div class='del'>-    cinfo-&gt;jpeg_height = cinfo-&gt;image_height &lt;&lt; 2;</div><div class='add'>+  } else if (cinfo-&gt;scale_num * 2 &gt;= cinfo-&gt;scale_denom * cinfo-&gt;block_size) {</div><div class='add'>+    /* Provide block_size/2 scaling */</div><div class='add'>+    cinfo-&gt;jpeg_width = (JDIMENSION)</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_width * cinfo-&gt;block_size, 2L);</div><div class='add'>+    cinfo-&gt;jpeg_height = (JDIMENSION)</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_height * cinfo-&gt;block_size, 2L);</div><div class='ctx'>     cinfo-&gt;min_DCT_h_scaled_size = 2;</div><div class='ctx'>     cinfo-&gt;min_DCT_v_scaled_size = 2;</div><div class='del'>-  } else if (cinfo-&gt;scale_num * 3 &gt;= cinfo-&gt;scale_denom * 8) {</div><div class='del'>-    /* Provide 8/3 scaling */</div><div class='del'>-    cinfo-&gt;jpeg_width = (cinfo-&gt;image_width &lt;&lt; 1) + (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_width * 2, 3L);</div><div class='del'>-    cinfo-&gt;jpeg_height = (cinfo-&gt;image_height &lt;&lt; 1) + (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_height * 2, 3L);</div><div class='add'>+  } else if (cinfo-&gt;scale_num * 3 &gt;= cinfo-&gt;scale_denom * cinfo-&gt;block_size) {</div><div class='add'>+    /* Provide block_size/3 scaling */</div><div class='add'>+    cinfo-&gt;jpeg_width = (JDIMENSION)</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_width * cinfo-&gt;block_size, 3L);</div><div class='add'>+    cinfo-&gt;jpeg_height = (JDIMENSION)</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_height * cinfo-&gt;block_size, 3L);</div><div class='ctx'>     cinfo-&gt;min_DCT_h_scaled_size = 3;</div><div class='ctx'>     cinfo-&gt;min_DCT_v_scaled_size = 3;</div><div class='del'>-  } else if (cinfo-&gt;scale_num &gt;= cinfo-&gt;scale_denom * 2) {</div><div class='del'>-    /* Provide 2/1 scaling */</div><div class='del'>-    cinfo-&gt;jpeg_width = cinfo-&gt;image_width &lt;&lt; 1;</div><div class='del'>-    cinfo-&gt;jpeg_height = cinfo-&gt;image_height &lt;&lt; 1;</div><div class='add'>+  } else if (cinfo-&gt;scale_num * 4 &gt;= cinfo-&gt;scale_denom * cinfo-&gt;block_size) {</div><div class='add'>+    /* Provide block_size/4 scaling */</div><div class='add'>+    cinfo-&gt;jpeg_width = (JDIMENSION)</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_width * cinfo-&gt;block_size, 4L);</div><div class='add'>+    cinfo-&gt;jpeg_height = (JDIMENSION)</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_height * cinfo-&gt;block_size, 4L);</div><div class='ctx'>     cinfo-&gt;min_DCT_h_scaled_size = 4;</div><div class='ctx'>     cinfo-&gt;min_DCT_v_scaled_size = 4;</div><div class='del'>-  } else if (cinfo-&gt;scale_num * 5 &gt;= cinfo-&gt;scale_denom * 8) {</div><div class='del'>-    /* Provide 8/5 scaling */</div><div class='del'>-    cinfo-&gt;jpeg_width = cinfo-&gt;image_width + (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_width * 3, 5L);</div><div class='del'>-    cinfo-&gt;jpeg_height = cinfo-&gt;image_height + (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_height * 3, 5L);</div><div class='add'>+  } else if (cinfo-&gt;scale_num * 5 &gt;= cinfo-&gt;scale_denom * cinfo-&gt;block_size) {</div><div class='add'>+    /* Provide block_size/5 scaling */</div><div class='add'>+    cinfo-&gt;jpeg_width = (JDIMENSION)</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_width * cinfo-&gt;block_size, 5L);</div><div class='add'>+    cinfo-&gt;jpeg_height = (JDIMENSION)</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_height * cinfo-&gt;block_size, 5L);</div><div class='ctx'>     cinfo-&gt;min_DCT_h_scaled_size = 5;</div><div class='ctx'>     cinfo-&gt;min_DCT_v_scaled_size = 5;</div><div class='del'>-  } else if (cinfo-&gt;scale_num * 3 &gt;= cinfo-&gt;scale_denom * 4) {</div><div class='del'>-    /* Provide 4/3 scaling */</div><div class='del'>-    cinfo-&gt;jpeg_width = cinfo-&gt;image_width + (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_width, 3L);</div><div class='del'>-    cinfo-&gt;jpeg_height = cinfo-&gt;image_height + (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_height, 3L);</div><div class='add'>+  } else if (cinfo-&gt;scale_num * 6 &gt;= cinfo-&gt;scale_denom * cinfo-&gt;block_size) {</div><div class='add'>+    /* Provide block_size/6 scaling */</div><div class='add'>+    cinfo-&gt;jpeg_width = (JDIMENSION)</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_width * cinfo-&gt;block_size, 6L);</div><div class='add'>+    cinfo-&gt;jpeg_height = (JDIMENSION)</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_height * cinfo-&gt;block_size, 6L);</div><div class='ctx'>     cinfo-&gt;min_DCT_h_scaled_size = 6;</div><div class='ctx'>     cinfo-&gt;min_DCT_v_scaled_size = 6;</div><div class='del'>-  } else if (cinfo-&gt;scale_num * 7 &gt;= cinfo-&gt;scale_denom * 8) {</div><div class='del'>-    /* Provide 8/7 scaling */</div><div class='del'>-    cinfo-&gt;jpeg_width = cinfo-&gt;image_width + (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_width, 7L);</div><div class='del'>-    cinfo-&gt;jpeg_height = cinfo-&gt;image_height + (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_height, 7L);</div><div class='add'>+  } else if (cinfo-&gt;scale_num * 7 &gt;= cinfo-&gt;scale_denom * cinfo-&gt;block_size) {</div><div class='add'>+    /* Provide block_size/7 scaling */</div><div class='add'>+    cinfo-&gt;jpeg_width = (JDIMENSION)</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_width * cinfo-&gt;block_size, 7L);</div><div class='add'>+    cinfo-&gt;jpeg_height = (JDIMENSION)</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_height * cinfo-&gt;block_size, 7L);</div><div class='ctx'>     cinfo-&gt;min_DCT_h_scaled_size = 7;</div><div class='ctx'>     cinfo-&gt;min_DCT_v_scaled_size = 7;</div><div class='del'>-  } else if (cinfo-&gt;scale_num &gt;= cinfo-&gt;scale_denom) {</div><div class='del'>-    /* Provide 1/1 scaling */</div><div class='del'>-    cinfo-&gt;jpeg_width = cinfo-&gt;image_width;</div><div class='del'>-    cinfo-&gt;jpeg_height = cinfo-&gt;image_height;</div><div class='add'>+  } else if (cinfo-&gt;scale_num * 8 &gt;= cinfo-&gt;scale_denom * cinfo-&gt;block_size) {</div><div class='add'>+    /* Provide block_size/8 scaling */</div><div class='add'>+    cinfo-&gt;jpeg_width = (JDIMENSION)</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_width * cinfo-&gt;block_size, 8L);</div><div class='add'>+    cinfo-&gt;jpeg_height = (JDIMENSION)</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_height * cinfo-&gt;block_size, 8L);</div><div class='ctx'>     cinfo-&gt;min_DCT_h_scaled_size = 8;</div><div class='ctx'>     cinfo-&gt;min_DCT_v_scaled_size = 8;</div><div class='del'>-  } else if (cinfo-&gt;scale_num * 9 &gt;= cinfo-&gt;scale_denom * 8) {</div><div class='del'>-    /* Provide 8/9 scaling */</div><div class='add'>+  } else if (cinfo-&gt;scale_num * 9 &gt;= cinfo-&gt;scale_denom * cinfo-&gt;block_size) {</div><div class='add'>+    /* Provide block_size/9 scaling */</div><div class='ctx'>     cinfo-&gt;jpeg_width = (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_width * 8, 9L);</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_width * cinfo-&gt;block_size, 9L);</div><div class='ctx'>     cinfo-&gt;jpeg_height = (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_height * 8, 9L);</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_height * cinfo-&gt;block_size, 9L);</div><div class='ctx'>     cinfo-&gt;min_DCT_h_scaled_size = 9;</div><div class='ctx'>     cinfo-&gt;min_DCT_v_scaled_size = 9;</div><div class='del'>-  } else if (cinfo-&gt;scale_num * 5 &gt;= cinfo-&gt;scale_denom * 4) {</div><div class='del'>-    /* Provide 4/5 scaling */</div><div class='add'>+  } else if (cinfo-&gt;scale_num * 10 &gt;= cinfo-&gt;scale_denom * cinfo-&gt;block_size) {</div><div class='add'>+    /* Provide block_size/10 scaling */</div><div class='ctx'>     cinfo-&gt;jpeg_width = (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_width * 4, 5L);</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_width * cinfo-&gt;block_size, 10L);</div><div class='ctx'>     cinfo-&gt;jpeg_height = (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_height * 4, 5L);</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_height * cinfo-&gt;block_size, 10L);</div><div class='ctx'>     cinfo-&gt;min_DCT_h_scaled_size = 10;</div><div class='ctx'>     cinfo-&gt;min_DCT_v_scaled_size = 10;</div><div class='del'>-  } else if (cinfo-&gt;scale_num * 11 &gt;= cinfo-&gt;scale_denom * 8) {</div><div class='del'>-    /* Provide 8/11 scaling */</div><div class='add'>+  } else if (cinfo-&gt;scale_num * 11 &gt;= cinfo-&gt;scale_denom * cinfo-&gt;block_size) {</div><div class='add'>+    /* Provide block_size/11 scaling */</div><div class='ctx'>     cinfo-&gt;jpeg_width = (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_width * 8, 11L);</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_width * cinfo-&gt;block_size, 11L);</div><div class='ctx'>     cinfo-&gt;jpeg_height = (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_height * 8, 11L);</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_height * cinfo-&gt;block_size, 11L);</div><div class='ctx'>     cinfo-&gt;min_DCT_h_scaled_size = 11;</div><div class='ctx'>     cinfo-&gt;min_DCT_v_scaled_size = 11;</div><div class='del'>-  } else if (cinfo-&gt;scale_num * 3 &gt;= cinfo-&gt;scale_denom * 2) {</div><div class='del'>-    /* Provide 2/3 scaling */</div><div class='add'>+  } else if (cinfo-&gt;scale_num * 12 &gt;= cinfo-&gt;scale_denom * cinfo-&gt;block_size) {</div><div class='add'>+    /* Provide block_size/12 scaling */</div><div class='ctx'>     cinfo-&gt;jpeg_width = (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_width * 2, 3L);</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_width * cinfo-&gt;block_size, 12L);</div><div class='ctx'>     cinfo-&gt;jpeg_height = (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_height * 2, 3L);</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_height * cinfo-&gt;block_size, 12L);</div><div class='ctx'>     cinfo-&gt;min_DCT_h_scaled_size = 12;</div><div class='ctx'>     cinfo-&gt;min_DCT_v_scaled_size = 12;</div><div class='del'>-  } else if (cinfo-&gt;scale_num * 13 &gt;= cinfo-&gt;scale_denom * 8) {</div><div class='del'>-    /* Provide 8/13 scaling */</div><div class='add'>+  } else if (cinfo-&gt;scale_num * 13 &gt;= cinfo-&gt;scale_denom * cinfo-&gt;block_size) {</div><div class='add'>+    /* Provide block_size/13 scaling */</div><div class='ctx'>     cinfo-&gt;jpeg_width = (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_width * 8, 13L);</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_width * cinfo-&gt;block_size, 13L);</div><div class='ctx'>     cinfo-&gt;jpeg_height = (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_height * 8, 13L);</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_height * cinfo-&gt;block_size, 13L);</div><div class='ctx'>     cinfo-&gt;min_DCT_h_scaled_size = 13;</div><div class='ctx'>     cinfo-&gt;min_DCT_v_scaled_size = 13;</div><div class='del'>-  } else if (cinfo-&gt;scale_num * 7 &gt;= cinfo-&gt;scale_denom * 4) {</div><div class='del'>-    /* Provide 4/7 scaling */</div><div class='add'>+  } else if (cinfo-&gt;scale_num * 14 &gt;= cinfo-&gt;scale_denom * cinfo-&gt;block_size) {</div><div class='add'>+    /* Provide block_size/14 scaling */</div><div class='ctx'>     cinfo-&gt;jpeg_width = (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_width * 4, 7L);</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_width * cinfo-&gt;block_size, 14L);</div><div class='ctx'>     cinfo-&gt;jpeg_height = (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_height * 4, 7L);</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_height * cinfo-&gt;block_size, 14L);</div><div class='ctx'>     cinfo-&gt;min_DCT_h_scaled_size = 14;</div><div class='ctx'>     cinfo-&gt;min_DCT_v_scaled_size = 14;</div><div class='del'>-  } else if (cinfo-&gt;scale_num * 15 &gt;= cinfo-&gt;scale_denom * 8) {</div><div class='del'>-    /* Provide 8/15 scaling */</div><div class='add'>+  } else if (cinfo-&gt;scale_num * 15 &gt;= cinfo-&gt;scale_denom * cinfo-&gt;block_size) {</div><div class='add'>+    /* Provide block_size/15 scaling */</div><div class='ctx'>     cinfo-&gt;jpeg_width = (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_width * 8, 15L);</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_width * cinfo-&gt;block_size, 15L);</div><div class='ctx'>     cinfo-&gt;jpeg_height = (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_height * 8, 15L);</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_height * cinfo-&gt;block_size, 15L);</div><div class='ctx'>     cinfo-&gt;min_DCT_h_scaled_size = 15;</div><div class='ctx'>     cinfo-&gt;min_DCT_v_scaled_size = 15;</div><div class='ctx'>   } else {</div><div class='del'>-    /* Provide 1/2 scaling */</div><div class='add'>+    /* Provide block_size/16 scaling */</div><div class='ctx'>     cinfo-&gt;jpeg_width = (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_width, 2L);</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_width * cinfo-&gt;block_size, 16L);</div><div class='ctx'>     cinfo-&gt;jpeg_height = (JDIMENSION)</div><div class='del'>-      jdiv_round_up((long) cinfo-&gt;image_height, 2L);</div><div class='add'>+      jdiv_round_up((long) cinfo-&gt;image_height * cinfo-&gt;block_size, 16L);</div><div class='ctx'>     cinfo-&gt;min_DCT_h_scaled_size = 16;</div><div class='ctx'>     cinfo-&gt;min_DCT_v_scaled_size = 16;</div><div class='ctx'>   }</div><div class='hunk'>@@ -187,35 +202,17 @@ jpeg_calc_jpeg_dimensions (j_compress_ptr cinfo)</div><div class='ctx'>   cinfo-&gt;min_DCT_v_scaled_size = DCTSIZE;</div><div class='ctx'> </div><div class='ctx'> #endif /* DCT_SCALING_SUPPORTED */</div><div class='del'>-</div><div class='del'>-  cinfo-&gt;block_size = DCTSIZE;</div><div class='del'>-  cinfo-&gt;natural_order = jpeg_natural_order;</div><div class='del'>-  cinfo-&gt;lim_Se = DCTSIZE2-1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> LOCAL(void)</div><div class='ctx'> jpeg_calc_trans_dimensions (j_compress_ptr cinfo)</div><div class='ctx'> {</div><div class='del'>-  if (cinfo-&gt;min_DCT_h_scaled_size &lt; 1 || cinfo-&gt;min_DCT_h_scaled_size &gt; 16</div><div class='del'>-      || cinfo-&gt;min_DCT_h_scaled_size != cinfo-&gt;min_DCT_v_scaled_size)</div><div class='add'>+  if (cinfo-&gt;min_DCT_h_scaled_size != cinfo-&gt;min_DCT_v_scaled_size)</div><div class='ctx'>     ERREXIT2(cinfo, JERR_BAD_DCTSIZE,</div><div class='ctx'> 	     cinfo-&gt;min_DCT_h_scaled_size, cinfo-&gt;min_DCT_v_scaled_size);</div><div class='ctx'> </div><div class='ctx'>   cinfo-&gt;block_size = cinfo-&gt;min_DCT_h_scaled_size;</div><div class='del'>-</div><div class='del'>-  switch (cinfo-&gt;block_size) {</div><div class='del'>-  case 2: cinfo-&gt;natural_order = jpeg_natural_order2; break;</div><div class='del'>-  case 3: cinfo-&gt;natural_order = jpeg_natural_order3; break;</div><div class='del'>-  case 4: cinfo-&gt;natural_order = jpeg_natural_order4; break;</div><div class='del'>-  case 5: cinfo-&gt;natural_order = jpeg_natural_order5; break;</div><div class='del'>-  case 6: cinfo-&gt;natural_order = jpeg_natural_order6; break;</div><div class='del'>-  case 7: cinfo-&gt;natural_order = jpeg_natural_order7; break;</div><div class='del'>-  default: cinfo-&gt;natural_order = jpeg_natural_order; break;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  cinfo-&gt;lim_Se = cinfo-&gt;block_size &lt; DCTSIZE ?</div><div class='del'>-    cinfo-&gt;block_size * cinfo-&gt;block_size - 1 : DCTSIZE2-1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -233,6 +230,25 @@ initial_setup (j_compress_ptr cinfo, boolean transcode_only)</div><div class='ctx'>   else</div><div class='ctx'>     jpeg_calc_jpeg_dimensions(cinfo);</div><div class='ctx'> </div><div class='add'>+  /* Sanity check on block_size */</div><div class='add'>+  if (cinfo-&gt;block_size &lt; 1 || cinfo-&gt;block_size &gt; 16)</div><div class='add'>+    ERREXIT2(cinfo, JERR_BAD_DCTSIZE, cinfo-&gt;block_size, cinfo-&gt;block_size);</div><div class='add'>+</div><div class='add'>+  /* Derive natural_order from block_size */</div><div class='add'>+  switch (cinfo-&gt;block_size) {</div><div class='add'>+  case 2: cinfo-&gt;natural_order = jpeg_natural_order2; break;</div><div class='add'>+  case 3: cinfo-&gt;natural_order = jpeg_natural_order3; break;</div><div class='add'>+  case 4: cinfo-&gt;natural_order = jpeg_natural_order4; break;</div><div class='add'>+  case 5: cinfo-&gt;natural_order = jpeg_natural_order5; break;</div><div class='add'>+  case 6: cinfo-&gt;natural_order = jpeg_natural_order6; break;</div><div class='add'>+  case 7: cinfo-&gt;natural_order = jpeg_natural_order7; break;</div><div class='add'>+  default: cinfo-&gt;natural_order = jpeg_natural_order; break;</div><div class='add'>+  }</div><div class='add'>+</div><div class='add'>+  /* Derive lim_Se from block_size */</div><div class='add'>+  cinfo-&gt;lim_Se = cinfo-&gt;block_size &lt; DCTSIZE ?</div><div class='add'>+    cinfo-&gt;block_size * cinfo-&gt;block_size - 1 : DCTSIZE2-1;</div><div class='add'>+</div><div class='ctx'>   /* Sanity check on image dimensions */</div><div class='ctx'>   if (cinfo-&gt;jpeg_height &lt;= 0 || cinfo-&gt;jpeg_width &lt;= 0 ||</div><div class='ctx'>       cinfo-&gt;num_components &lt;= 0 || cinfo-&gt;input_components &lt;= 0)</div><div class='head'>diff --git a/src/3rdparty/libjpeg/jconfig.cfg b/src/3rdparty/libjpeg/jconfig.cfg<br/>index a23758a..bb7435c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jconfig.cfg?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jconfig.cfg</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jconfig.cfg?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/jconfig.cfg</a></div><div class='hunk'>@@ -17,6 +17,14 @@</div><div class='ctx'> /* Define this if you get warnings about undefined structures. */</div><div class='ctx'> #undef INCOMPLETE_TYPES_BROKEN</div><div class='ctx'> </div><div class='add'>+/* Define "boolean" as unsigned char, not int, on Windows systems. */</div><div class='add'>+#ifdef _WIN32</div><div class='add'>+#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */</div><div class='add'>+typedef unsigned char boolean;</div><div class='add'>+#endif</div><div class='add'>+#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef JPEG_INTERNALS</div><div class='ctx'> </div><div class='ctx'> #undef RIGHT_SHIFT_IS_UNSIGNED</div><div class='head'>diff --git a/src/3rdparty/libjpeg/jconfig.h b/src/3rdparty/libjpeg/jconfig.h<br/>index 7e10d1b..b96d312 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jconfig.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jconfig.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jconfig.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/jconfig.h</a></div><div class='hunk'>@@ -1,21 +1,99 @@</div><div class='del'>-/* see jconfig.txt for explanations */</div><div class='add'>+/*</div><div class='add'>+ * jconfig.txt</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 1991-1994, Thomas G. Lane.</div><div class='add'>+ * This file is part of the Independent JPEG Group's software.</div><div class='add'>+ * For conditions of distribution and use, see the accompanying README file.</div><div class='add'>+ *</div><div class='add'>+ * This file documents the configuration options that are required to</div><div class='add'>+ * customize the JPEG software for a particular system.</div><div class='add'>+ *</div><div class='add'>+ * The actual configuration options for a particular installation are stored</div><div class='add'>+ * in jconfig.h.  On many machines, jconfig.h can be generated automatically</div><div class='add'>+ * or copied from one of the "canned" jconfig files that we supply.  But if</div><div class='add'>+ * you need to generate a jconfig.h file by hand, this file tells you how.</div><div class='add'>+ *</div><div class='add'>+ * DO NOT EDIT THIS FILE --- IT WON'T ACCOMPLISH ANYTHING.</div><div class='add'>+ * EDIT A COPY NAMED JCONFIG.H.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * These symbols indicate the properties of your machine or compiler.</div><div class='add'>+ * #define the symbol if yes, #undef it if no.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Does your compiler support function prototypes?</div><div class='add'>+ * (If not, you also need to use ansi2knr, see install.txt)</div><div class='add'>+ */</div><div class='ctx'> #define HAVE_PROTOTYPES</div><div class='add'>+</div><div class='add'>+/* Does your compiler support the declaration "unsigned char" ?</div><div class='add'>+ * How about "unsigned short" ?</div><div class='add'>+ */</div><div class='ctx'> #define HAVE_UNSIGNED_CHAR</div><div class='ctx'> #define HAVE_UNSIGNED_SHORT</div><div class='add'>+</div><div class='add'>+/* Define "void" as "char" if your compiler doesn't know about type void.</div><div class='add'>+ * NOTE: be sure to define void such that "void *" represents the most general</div><div class='add'>+ * pointer type, e.g., that returned by malloc().</div><div class='add'>+ */</div><div class='ctx'> /* #define void char */</div><div class='add'>+</div><div class='add'>+/* Define "const" as empty if your compiler doesn't know the "const" keyword.</div><div class='add'>+ */</div><div class='ctx'> /* #define const */</div><div class='add'>+</div><div class='add'>+/* Define this if an ordinary "char" type is unsigned.</div><div class='add'>+ * If you're not sure, leaving it undefined will work at some cost in speed.</div><div class='add'>+ * If you defined HAVE_UNSIGNED_CHAR then the speed difference is minimal.</div><div class='add'>+ */</div><div class='ctx'> #undef CHAR_IS_UNSIGNED</div><div class='add'>+</div><div class='add'>+/* Define this if your system has an ANSI-conforming &lt;stddef.h&gt; file.</div><div class='add'>+ */</div><div class='ctx'> #define HAVE_STDDEF_H</div><div class='add'>+</div><div class='add'>+/* Define this if your system has an ANSI-conforming &lt;stdlib.h&gt; file.</div><div class='add'>+ */</div><div class='ctx'> #define HAVE_STDLIB_H</div><div class='add'>+</div><div class='add'>+/* Define this if your system does not have an ANSI/SysV &lt;string.h&gt;,</div><div class='add'>+ * but does have a BSD-style &lt;strings.h&gt;.</div><div class='add'>+ */</div><div class='ctx'> #undef NEED_BSD_STRINGS</div><div class='add'>+</div><div class='add'>+/* Define this if your system does not provide typedef size_t in any of the</div><div class='add'>+ * ANSI-standard places (stddef.h, stdlib.h, or stdio.h), but places it in</div><div class='add'>+ * &lt;sys/types.h&gt; instead.</div><div class='add'>+ */</div><div class='ctx'> #undef NEED_SYS_TYPES_H</div><div class='del'>-#undef NEED_FAR_POINTERS	/* we presume a 32-bit flat memory model */</div><div class='add'>+</div><div class='add'>+/* For 80x86 machines, you need to define NEED_FAR_POINTERS,</div><div class='add'>+ * unless you are using a large-data memory model or 80386 flat-memory mode.</div><div class='add'>+ * On less brain-damaged CPUs this symbol must not be defined.</div><div class='add'>+ * (Defining this symbol causes large data structures to be referenced through</div><div class='add'>+ * "far" pointers and to be allocated with a special version of malloc.)</div><div class='add'>+ */</div><div class='add'>+#undef NEED_FAR_POINTERS</div><div class='add'>+</div><div class='add'>+/* Define this if your linker needs global names to be unique in less</div><div class='add'>+ * than the first 15 characters.</div><div class='add'>+ */</div><div class='ctx'> #undef NEED_SHORT_EXTERNAL_NAMES</div><div class='add'>+</div><div class='add'>+/* Although a real ANSI C compiler can deal perfectly well with pointers to</div><div class='add'>+ * unspecified structures (see "incomplete types" in the spec), a few pre-ANSI</div><div class='add'>+ * and pseudo-ANSI compilers get confused.  To keep one of these bozos happy,</div><div class='add'>+ * define INCOMPLETE_TYPES_BROKEN.  This is not recommended unless you</div><div class='add'>+ * actually get "missing structure definition" warnings or errors while</div><div class='add'>+ * compiling the JPEG code.</div><div class='add'>+ */</div><div class='ctx'> #undef INCOMPLETE_TYPES_BROKEN</div><div class='ctx'> </div><div class='del'>-#if defined(_WIN32)</div><div class='del'>-/* Define "boolean" as unsigned char, not int, per Windows custom */</div><div class='add'>+/* Define "boolean" as unsigned char, not int, on Windows systems.</div><div class='add'>+ */</div><div class='add'>+#ifdef _WIN32</div><div class='ctx'> #ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */</div><div class='ctx'> typedef unsigned char boolean;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -23,24 +101,64 @@ typedef unsigned char boolean;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * The following options affect code selection within the JPEG library,</div><div class='add'>+ * but they don't need to be visible to applications using the library.</div><div class='add'>+ * To minimize application namespace pollution, the symbols won't be</div><div class='add'>+ * defined unless JPEG_INTERNALS has been defined.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> #ifdef JPEG_INTERNALS</div><div class='ctx'> </div><div class='add'>+/* Define this if your compiler implements "&gt;&gt;" on signed values as a logical</div><div class='add'>+ * (unsigned) shift; leave it undefined if "&gt;&gt;" is a signed (arithmetic) shift,</div><div class='add'>+ * which is the normal and rational definition.</div><div class='add'>+ */</div><div class='ctx'> #undef RIGHT_SHIFT_IS_UNSIGNED</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> #endif /* JPEG_INTERNALS */</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * The remaining options do not affect the JPEG library proper,</div><div class='add'>+ * but only the sample applications cjpeg/djpeg (see cjpeg.c, djpeg.c).</div><div class='add'>+ * Other applications can ignore these.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> #ifdef JPEG_CJPEG_DJPEG</div><div class='ctx'> </div><div class='add'>+/* These defines indicate which image (non-JPEG) file formats are allowed. */</div><div class='add'>+</div><div class='ctx'> #define BMP_SUPPORTED		/* BMP image file format */</div><div class='ctx'> #define GIF_SUPPORTED		/* GIF image file format */</div><div class='ctx'> #define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */</div><div class='ctx'> #undef RLE_SUPPORTED		/* Utah RLE image file format */</div><div class='ctx'> #define TARGA_SUPPORTED		/* Targa image file format */</div><div class='ctx'> </div><div class='del'>-#define TWO_FILE_COMMANDLINE	/* optional */</div><div class='del'>-#define USE_SETMODE		/* Microsoft has setmode() */</div><div class='add'>+/* Define this if you want to name both input and output files on the command</div><div class='add'>+ * line, rather than using stdout and optionally stdin.  You MUST do this if</div><div class='add'>+ * your system can't cope with binary I/O to stdin/stdout.  See comments at</div><div class='add'>+ * head of cjpeg.c or djpeg.c.</div><div class='add'>+ */</div><div class='add'>+#undef TWO_FILE_COMMANDLINE</div><div class='add'>+</div><div class='add'>+/* Define this if your system needs explicit cleanup of temporary files.</div><div class='add'>+ * This is crucial under MS-DOS, where the temporary "files" may be areas</div><div class='add'>+ * of extended memory; on most other systems it's not as important.</div><div class='add'>+ */</div><div class='ctx'> #undef NEED_SIGNAL_CATCHER</div><div class='add'>+</div><div class='add'>+/* By default, we open image files with fopen(...,"rb") or fopen(...,"wb").</div><div class='add'>+ * This is necessary on systems that distinguish text files from binary files,</div><div class='add'>+ * and is harmless on most systems that don't.  If you have one of the rare</div><div class='add'>+ * systems that complains about the "b" spec, define this symbol.</div><div class='add'>+ */</div><div class='ctx'> #undef DONT_USE_B_MODE</div><div class='del'>-#undef PROGRESS_REPORT		/* optional */</div><div class='add'>+</div><div class='add'>+/* Define this if you want percent-done progress reports from cjpeg/djpeg.</div><div class='add'>+ */</div><div class='add'>+#undef PROGRESS_REPORT</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #endif /* JPEG_CJPEG_DJPEG */</div><div class='head'>diff --git a/src/3rdparty/libjpeg/jconfig.mc6 b/src/3rdparty/libjpeg/jconfig.mc6<br/>index 1b18523..ad5651b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jconfig.mc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jconfig.mc6</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jconfig.mc6?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/jconfig.mc6</a></div><div class='hunk'>@@ -30,7 +30,7 @@</div><div class='ctx'> #define SHORTxLCONST_32		/* enable compiler-specific DCT optimization */</div><div class='ctx'> /* Note: the above define is known to improve the code with Microsoft C 6.00A.</div><div class='ctx'>  * I do not know whether it is good for later compiler versions.</div><div class='del'>- * Please report any info on this point to jpeg-info@uunet.uu.net.</div><div class='add'>+ * Please report any info on this point to jpeg-info@uc.ag.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #endif /* JPEG_INTERNALS */</div><div class='head'>diff --git a/src/3rdparty/libjpeg/jconfig.txt b/src/3rdparty/libjpeg/jconfig.txt<br/>index 8819e79..b96d312 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jconfig.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jconfig.txt</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jconfig.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/jconfig.txt</a></div><div class='hunk'>@@ -91,6 +91,15 @@</div><div class='ctx'>  */</div><div class='ctx'> #undef INCOMPLETE_TYPES_BROKEN</div><div class='ctx'> </div><div class='add'>+/* Define "boolean" as unsigned char, not int, on Windows systems.</div><div class='add'>+ */</div><div class='add'>+#ifdef _WIN32</div><div class='add'>+#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */</div><div class='add'>+typedef unsigned char boolean;</div><div class='add'>+#endif</div><div class='add'>+#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The following options affect code selection within the JPEG library,</div><div class='head'>diff --git a/src/3rdparty/libjpeg/jdatasrc.c b/src/3rdparty/libjpeg/jdatasrc.c<br/>index d3136db..c8fe3da 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jdatasrc.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jdatasrc.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jdatasrc.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/jdatasrc.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  * jdatasrc.c</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1994-1996, Thomas G. Lane.</div><div class='del'>- * Modified 2009 by Guido Vollbeding.</div><div class='add'>+ * Modified 2009-2010 by Guido Vollbeding.</div><div class='ctx'>  * This file is part of the Independent JPEG Group's software.</div><div class='ctx'>  * For conditions of distribution and use, see the accompanying README file.</div><div class='ctx'>  *</div><div class='hunk'>@@ -163,7 +163,7 @@ skip_input_data (j_decompress_ptr cinfo, long num_bytes)</div><div class='ctx'>   if (num_bytes &gt; 0) {</div><div class='ctx'>     while (num_bytes &gt; (long) src-&gt;bytes_in_buffer) {</div><div class='ctx'>       num_bytes -= (long) src-&gt;bytes_in_buffer;</div><div class='del'>-      (void) fill_input_buffer(cinfo);</div><div class='add'>+      (void) (*src-&gt;fill_input_buffer) (cinfo);</div><div class='ctx'>       /* note we assume that fill_input_buffer will never return FALSE,</div><div class='ctx'>        * so suspension need not be handled.</div><div class='ctx'>        */</div><div class='head'>diff --git a/src/3rdparty/libjpeg/jddctmgr.c b/src/3rdparty/libjpeg/jddctmgr.c<br/>index bdbde34..0ded9d5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jddctmgr.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jddctmgr.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jddctmgr.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/jddctmgr.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  * jddctmgr.c</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1994-1996, Thomas G. Lane.</div><div class='add'>+ * Modified 2002-2010 by Guido Vollbeding.</div><div class='ctx'>  * This file is part of the Independent JPEG Group's software.</div><div class='ctx'>  * For conditions of distribution and use, see the accompanying README file.</div><div class='ctx'>  *</div><div class='hunk'>@@ -324,6 +325,7 @@ start_pass (j_decompress_ptr cinfo)</div><div class='ctx'> 	 * coefficients scaled by scalefactor[row]*scalefactor[col], where</div><div class='ctx'> 	 *   scalefactor[0] = 1</div><div class='ctx'> 	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7</div><div class='add'>+	 * We apply a further scale factor of 1/8.</div><div class='ctx'> 	 */</div><div class='ctx'> 	FLOAT_MULT_TYPE * fmtbl = (FLOAT_MULT_TYPE *) compptr-&gt;dct_table;</div><div class='ctx'> 	int row, col;</div><div class='hunk'>@@ -337,7 +339,7 @@ start_pass (j_decompress_ptr cinfo)</div><div class='ctx'> 	  for (col = 0; col &lt; DCTSIZE; col++) {</div><div class='ctx'> 	    fmtbl[i] = (FLOAT_MULT_TYPE)</div><div class='ctx'> 	      ((double) qtbl-&gt;quantval[i] *</div><div class='del'>-	       aanscalefactor[row] * aanscalefactor[col]);</div><div class='add'>+	       aanscalefactor[row] * aanscalefactor[col] * 0.125);</div><div class='ctx'> 	    i++;</div><div class='ctx'> 	  }</div><div class='ctx'> 	}</div><div class='head'>diff --git a/src/3rdparty/libjpeg/jidctflt.c b/src/3rdparty/libjpeg/jidctflt.c<br/>index 0188ce3..23ae9d3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jidctflt.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jidctflt.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jidctflt.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/jidctflt.c</a></div><div class='hunk'>@@ -2,6 +2,7 @@</div><div class='ctx'>  * jidctflt.c</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1994-1998, Thomas G. Lane.</div><div class='add'>+ * Modified 2010 by Guido Vollbeding.</div><div class='ctx'>  * This file is part of the Independent JPEG Group's software.</div><div class='ctx'>  * For conditions of distribution and use, see the accompanying README file.</div><div class='ctx'>  *</div><div class='hunk'>@@ -76,10 +77,9 @@ jpeg_idct_float (j_decompress_ptr cinfo, jpeg_component_info * compptr,</div><div class='ctx'>   FLOAT_MULT_TYPE * quantptr;</div><div class='ctx'>   FAST_FLOAT * wsptr;</div><div class='ctx'>   JSAMPROW outptr;</div><div class='del'>-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);</div><div class='add'>+  JSAMPLE *range_limit = cinfo-&gt;sample_range_limit;</div><div class='ctx'>   int ctr;</div><div class='ctx'>   FAST_FLOAT workspace[DCTSIZE2]; /* buffers data between passes */</div><div class='del'>-  SHIFT_TEMPS</div><div class='ctx'> </div><div class='ctx'>   /* Pass 1: process columns from input, store into work array. */</div><div class='ctx'> </div><div class='hunk'>@@ -152,12 +152,12 @@ jpeg_idct_float (j_decompress_ptr cinfo, jpeg_component_info * compptr,</div><div class='ctx'>     tmp11 = (z11 - z13) * ((FAST_FLOAT) 1.414213562); /* 2*c4 */</div><div class='ctx'> </div><div class='ctx'>     z5 = (z10 + z12) * ((FAST_FLOAT) 1.847759065); /* 2*c2 */</div><div class='del'>-    tmp10 = ((FAST_FLOAT) 1.082392200) * z12 - z5; /* 2*(c2-c6) */</div><div class='del'>-    tmp12 = ((FAST_FLOAT) -2.613125930) * z10 + z5; /* -2*(c2+c6) */</div><div class='add'>+    tmp10 = z5 - z12 * ((FAST_FLOAT) 1.082392200); /* 2*(c2-c6) */</div><div class='add'>+    tmp12 = z5 - z10 * ((FAST_FLOAT) 2.613125930); /* 2*(c2+c6) */</div><div class='ctx'> </div><div class='ctx'>     tmp6 = tmp12 - tmp7;	/* phase 2 */</div><div class='ctx'>     tmp5 = tmp11 - tmp6;</div><div class='del'>-    tmp4 = tmp10 + tmp5;</div><div class='add'>+    tmp4 = tmp10 - tmp5;</div><div class='ctx'> </div><div class='ctx'>     wsptr[DCTSIZE*0] = tmp0 + tmp7;</div><div class='ctx'>     wsptr[DCTSIZE*7] = tmp0 - tmp7;</div><div class='hunk'>@@ -165,8 +165,8 @@ jpeg_idct_float (j_decompress_ptr cinfo, jpeg_component_info * compptr,</div><div class='ctx'>     wsptr[DCTSIZE*6] = tmp1 - tmp6;</div><div class='ctx'>     wsptr[DCTSIZE*2] = tmp2 + tmp5;</div><div class='ctx'>     wsptr[DCTSIZE*5] = tmp2 - tmp5;</div><div class='del'>-    wsptr[DCTSIZE*4] = tmp3 + tmp4;</div><div class='del'>-    wsptr[DCTSIZE*3] = tmp3 - tmp4;</div><div class='add'>+    wsptr[DCTSIZE*3] = tmp3 + tmp4;</div><div class='add'>+    wsptr[DCTSIZE*4] = tmp3 - tmp4;</div><div class='ctx'> </div><div class='ctx'>     inptr++;			/* advance pointers to next column */</div><div class='ctx'>     quantptr++;</div><div class='hunk'>@@ -174,7 +174,6 @@ jpeg_idct_float (j_decompress_ptr cinfo, jpeg_component_info * compptr,</div><div class='ctx'>   }</div><div class='ctx'>   </div><div class='ctx'>   /* Pass 2: process rows from work array, store into output array. */</div><div class='del'>-  /* Note that we must descale the results by a factor of 8 == 2**3. */</div><div class='ctx'> </div><div class='ctx'>   wsptr = workspace;</div><div class='ctx'>   for (ctr = 0; ctr &lt; DCTSIZE; ctr++) {</div><div class='hunk'>@@ -187,8 +186,10 @@ jpeg_idct_float (j_decompress_ptr cinfo, jpeg_component_info * compptr,</div><div class='ctx'>     </div><div class='ctx'>     /* Even part */</div><div class='ctx'> </div><div class='del'>-    tmp10 = wsptr[0] + wsptr[4];</div><div class='del'>-    tmp11 = wsptr[0] - wsptr[4];</div><div class='add'>+    /* Apply signed-&gt;unsigned and prepare float-&gt;int conversion */</div><div class='add'>+    z5 = wsptr[0] + ((FAST_FLOAT) CENTERJSAMPLE + (FAST_FLOAT) 0.5);</div><div class='add'>+    tmp10 = z5 + wsptr[4];</div><div class='add'>+    tmp11 = z5 - wsptr[4];</div><div class='ctx'> </div><div class='ctx'>     tmp13 = wsptr[2] + wsptr[6];</div><div class='ctx'>     tmp12 = (wsptr[2] - wsptr[6]) * ((FAST_FLOAT) 1.414213562) - tmp13;</div><div class='hunk'>@@ -209,31 +210,23 @@ jpeg_idct_float (j_decompress_ptr cinfo, jpeg_component_info * compptr,</div><div class='ctx'>     tmp11 = (z11 - z13) * ((FAST_FLOAT) 1.414213562);</div><div class='ctx'> </div><div class='ctx'>     z5 = (z10 + z12) * ((FAST_FLOAT) 1.847759065); /* 2*c2 */</div><div class='del'>-    tmp10 = ((FAST_FLOAT) 1.082392200) * z12 - z5; /* 2*(c2-c6) */</div><div class='del'>-    tmp12 = ((FAST_FLOAT) -2.613125930) * z10 + z5; /* -2*(c2+c6) */</div><div class='add'>+    tmp10 = z5 - z12 * ((FAST_FLOAT) 1.082392200); /* 2*(c2-c6) */</div><div class='add'>+    tmp12 = z5 - z10 * ((FAST_FLOAT) 2.613125930); /* 2*(c2+c6) */</div><div class='ctx'> </div><div class='ctx'>     tmp6 = tmp12 - tmp7;</div><div class='ctx'>     tmp5 = tmp11 - tmp6;</div><div class='del'>-    tmp4 = tmp10 + tmp5;</div><div class='del'>-</div><div class='del'>-    /* Final output stage: scale down by a factor of 8 and range-limit */</div><div class='del'>-</div><div class='del'>-    outptr[0] = range_limit[(int) DESCALE((INT32) (tmp0 + tmp7), 3)</div><div class='del'>-			    &amp; RANGE_MASK];</div><div class='del'>-    outptr[7] = range_limit[(int) DESCALE((INT32) (tmp0 - tmp7), 3)</div><div class='del'>-			    &amp; RANGE_MASK];</div><div class='del'>-    outptr[1] = range_limit[(int) DESCALE((INT32) (tmp1 + tmp6), 3)</div><div class='del'>-			    &amp; RANGE_MASK];</div><div class='del'>-    outptr[6] = range_limit[(int) DESCALE((INT32) (tmp1 - tmp6), 3)</div><div class='del'>-			    &amp; RANGE_MASK];</div><div class='del'>-    outptr[2] = range_limit[(int) DESCALE((INT32) (tmp2 + tmp5), 3)</div><div class='del'>-			    &amp; RANGE_MASK];</div><div class='del'>-    outptr[5] = range_limit[(int) DESCALE((INT32) (tmp2 - tmp5), 3)</div><div class='del'>-			    &amp; RANGE_MASK];</div><div class='del'>-    outptr[4] = range_limit[(int) DESCALE((INT32) (tmp3 + tmp4), 3)</div><div class='del'>-			    &amp; RANGE_MASK];</div><div class='del'>-    outptr[3] = range_limit[(int) DESCALE((INT32) (tmp3 - tmp4), 3)</div><div class='del'>-			    &amp; RANGE_MASK];</div><div class='add'>+    tmp4 = tmp10 - tmp5;</div><div class='add'>+</div><div class='add'>+    /* Final output stage: float-&gt;int conversion and range-limit */</div><div class='add'>+</div><div class='add'>+    outptr[0] = range_limit[((int) (tmp0 + tmp7)) &amp; RANGE_MASK];</div><div class='add'>+    outptr[7] = range_limit[((int) (tmp0 - tmp7)) &amp; RANGE_MASK];</div><div class='add'>+    outptr[1] = range_limit[((int) (tmp1 + tmp6)) &amp; RANGE_MASK];</div><div class='add'>+    outptr[6] = range_limit[((int) (tmp1 - tmp6)) &amp; RANGE_MASK];</div><div class='add'>+    outptr[2] = range_limit[((int) (tmp2 + tmp5)) &amp; RANGE_MASK];</div><div class='add'>+    outptr[5] = range_limit[((int) (tmp2 - tmp5)) &amp; RANGE_MASK];</div><div class='add'>+    outptr[3] = range_limit[((int) (tmp3 + tmp4)) &amp; RANGE_MASK];</div><div class='add'>+    outptr[4] = range_limit[((int) (tmp3 - tmp4)) &amp; RANGE_MASK];</div><div class='ctx'>     </div><div class='ctx'>     wsptr += DCTSIZE;		/* advance pointer to next row */</div><div class='ctx'>   }</div><div class='head'>diff --git a/src/3rdparty/libjpeg/jinclude.h b/src/3rdparty/libjpeg/jinclude.h<br/>index 0a4f151..a61939d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jinclude.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jinclude.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jinclude.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/jinclude.h</a></div><div class='hunk'>@@ -20,6 +20,10 @@</div><div class='ctx'> #include "jconfig.h"		/* auto configuration options */</div><div class='ctx'> #define JCONFIG_INCLUDED	/* so that jpeglib.h doesn't do it again */</div><div class='ctx'> </div><div class='add'>+#ifdef _MSC_VER</div><div class='add'>+#  define _CRT_SECURE_NO_DEPRECATE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * We need the NULL macro and size_t typedef.</div><div class='ctx'>  * On an ANSI-conforming system it is sufficient to include &lt;stddef.h&gt;.</div><div class='head'>diff --git a/src/3rdparty/libjpeg/jmorecfg.h b/src/3rdparty/libjpeg/jmorecfg.h<br/>index 4c56cf3..8365392 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jmorecfg.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jmorecfg.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jmorecfg.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/jmorecfg.h</a></div><div class='hunk'>@@ -192,6 +192,7 @@ typedef unsigned int JDIMENSION;</div><div class='ctx'> #if defined(VXWORKS) &amp;&amp; defined(LOCAL)</div><div class='ctx'> #undef LOCAL</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> /* a function called through method pointers: */</div><div class='ctx'> #define METHODDEF(type)		static type</div><div class='ctx'> /* a function used only in its module: */</div><div class='hunk'>@@ -278,7 +279,7 @@ typedef int boolean;</div><div class='ctx'> </div><div class='ctx'> /* Encoder capability options: */</div><div class='ctx'> </div><div class='del'>-#undef  C_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */</div><div class='add'>+#define C_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */</div><div class='ctx'> #define C_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */</div><div class='ctx'> #define C_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/</div><div class='ctx'> #define DCT_SCALING_SUPPORTED	    /* Input rescaling via DCT? (Requires DCT_ISLOW)*/</div><div class='hunk'>@@ -295,7 +296,7 @@ typedef int boolean;</div><div class='ctx'> </div><div class='ctx'> /* Decoder capability options: */</div><div class='ctx'> </div><div class='del'>-#undef  D_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */</div><div class='add'>+#define D_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */</div><div class='ctx'> #define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */</div><div class='ctx'> #define D_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/</div><div class='ctx'> #define IDCT_SCALING_SUPPORTED	    /* Output rescaling via IDCT? */</div><div class='head'>diff --git a/src/3rdparty/libjpeg/jpeglib.h b/src/3rdparty/libjpeg/jpeglib.h<br/>index 5039d4b..1eb1fac 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jpeglib.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jpeglib.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jpeglib.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/jpeglib.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  * jpeglib.h</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 1991-1998, Thomas G. Lane.</div><div class='del'>- * Modified 2002-2009 by Guido Vollbeding.</div><div class='add'>+ * Modified 2002-2010 by Guido Vollbeding.</div><div class='ctx'>  * This file is part of the Independent JPEG Group's software.</div><div class='ctx'>  * For conditions of distribution and use, see the accompanying README file.</div><div class='ctx'>  *</div><div class='hunk'>@@ -33,11 +33,13 @@ extern "C" {</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Version ID for the JPEG library.</div><div class='add'>+/* Version IDs for the JPEG library.</div><div class='ctx'>  * Might be useful for tests like "#if JPEG_LIB_VERSION &gt;= 80".</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define JPEG_LIB_VERSION  80	/* Version 8.0 */</div><div class='add'>+#define JPEG_LIB_VERSION        80	/* Compatibility version 8.0 */</div><div class='add'>+#define JPEG_LIB_VERSION_MAJOR  8</div><div class='add'>+#define JPEG_LIB_VERSION_MINOR  3</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* Various constants determining the sizes of things.</div><div class='head'>diff --git a/src/3rdparty/libjpeg/jversion.h b/src/3rdparty/libjpeg/jversion.h<br/>index 0c4e6ea..e868538 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jversion.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/jversion.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/jversion.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/jversion.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * jversion.h</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding.</div><div class='add'>+ * Copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding.</div><div class='ctx'>  * This file is part of the Independent JPEG Group's software.</div><div class='ctx'>  * For conditions of distribution and use, see the accompanying README file.</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,6 +9,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#define JVERSION	"8  10-Jan-2010"</div><div class='add'>+#define JVERSION	"8c  16-Jan-2011"</div><div class='ctx'> </div><div class='del'>-#define JCOPYRIGHT	"Copyright (C) 2010, Thomas G. Lane, Guido Vollbeding"</div><div class='add'>+#define JCOPYRIGHT	"Copyright (C) 2011, Thomas G. Lane, Guido Vollbeding"</div><div class='head'>diff --git a/src/3rdparty/libjpeg/libjpeg.map b/src/3rdparty/libjpeg/libjpeg.map<br/>deleted file mode 100644<br/>index ac77dca..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/libjpeg.map?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/libjpeg.map</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-LIBJPEG_8.0 {</div><div class='del'>-  global:</div><div class='del'>-    *;</div><div class='del'>-};</div><div class='head'>diff --git a/src/3rdparty/libjpeg/libjpeg.txt b/src/3rdparty/libjpeg/libjpeg.txt<br/>index e5a85c0..2d98e22 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/libjpeg.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/libjpeg.txt</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/libjpeg.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/libjpeg.txt</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> USING THE IJG JPEG LIBRARY</div><div class='ctx'> </div><div class='del'>-Copyright (C) 1994-2009, Thomas G. Lane, Guido Vollbeding.</div><div class='add'>+Copyright (C) 1994-2010, Thomas G. Lane, Guido Vollbeding.</div><div class='ctx'> This file is part of the Independent JPEG Group's software.</div><div class='ctx'> For conditions of distribution and use, see the accompanying README file.</div><div class='ctx'> </div><div class='hunk'>@@ -876,6 +876,18 @@ jpeg_simple_progression (j_compress_ptr cinfo)</div><div class='ctx'> </div><div class='ctx'> Compression parameters (cinfo fields) include:</div><div class='ctx'> </div><div class='add'>+int block_size</div><div class='add'>+	Set DCT block size.  All N from 1 to 16 are possible.</div><div class='add'>+	Default is 8 (baseline format).</div><div class='add'>+	Larger values produce higher compression,</div><div class='add'>+	smaller values produce higher quality.</div><div class='add'>+	An exact DCT stage is possible with 1 or 2.</div><div class='add'>+	With the default quality of 75 and default Luminance qtable</div><div class='add'>+	the DCT+Quantization stage is lossless for value 1.</div><div class='add'>+	Note that values other than 8 require a SmartScale capable decoder,</div><div class='add'>+	introduced with IJG JPEG 8.  Setting the block_size parameter for</div><div class='add'>+	compression works with version 8c and later.</div><div class='add'>+</div><div class='ctx'> J_DCT_METHOD dct_method</div><div class='ctx'> 	Selects the algorithm used for the DCT step.  Choices are:</div><div class='ctx'> 		JDCT_ISLOW: slow but accurate integer algorithm</div><div class='hunk'>@@ -895,8 +907,10 @@ J_DCT_METHOD dct_method</div><div class='ctx'> unsigned int scale_num, scale_denom</div><div class='ctx'> 	Scale the image by the fraction scale_num/scale_denom.  Default is</div><div class='ctx'> 	1/1, or no scaling.  Currently, the supported scaling ratios are</div><div class='del'>-	8/N with all N from 1 to 16.  (The library design allows for arbitrary</div><div class='del'>-	scaling ratios but this is not likely to be implemented any time soon.)</div><div class='add'>+	M/N with all N from 1 to 16, where M is the destination DCT size,</div><div class='add'>+	which is 8 by default (see block_size parameter above).</div><div class='add'>+	(The library design allows for arbitrary scaling ratios but this</div><div class='add'>+	is not likely to be implemented any time soon.)</div><div class='ctx'> </div><div class='ctx'> J_COLOR_SPACE jpeg_color_space</div><div class='ctx'> int num_components</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makcjpeg.st b/src/3rdparty/libjpeg/makcjpeg.st<br/>deleted file mode 100644<br/>index 628f533..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makcjpeg.st?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makcjpeg.st</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-; Project file for Independent JPEG Group's software</div><div class='del'>-;</div><div class='del'>-; This project file is for Atari ST/STE/TT systems using Pure C or Turbo C.</div><div class='del'>-; Thanks to Frank Moehle, B. Setzepfandt, and Guido Vollbeding.</div><div class='del'>-;</div><div class='del'>-; To use this file, rename it to cjpeg.prj.</div><div class='del'>-; If you are using Turbo C, change filenames beginning with "pc..." to "tc..."</div><div class='del'>-; Read installation instructions before trying to make the program!</div><div class='del'>-;</div><div class='del'>-;</div><div class='del'>-;      * * * Output file * * *</div><div class='del'>-cjpeg.ttp</div><div class='del'>-;</div><div class='del'>-; * * * COMPILER OPTIONS * * *  </div><div class='del'>-.C[-P]        ; absolute calls</div><div class='del'>-.C[-M]        ; and no string merging, folks</div><div class='del'>-.C[-w-cln]    ; no "constant is long" warnings</div><div class='del'>-.C[-w-par]    ; no "parameter xxxx unused"</div><div class='del'>-.C[-w-rch]    ; no "unreachable code"</div><div class='del'>-.C[-wsig]     ; warn if significant digits may be lost</div><div class='del'>-=</div><div class='del'>-; * * * * List of modules * * * * </div><div class='del'>-pcstart.o</div><div class='del'>-cjpeg.c		(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h,jversion.h)</div><div class='del'>-cdjpeg.c	(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h)</div><div class='del'>-rdswitch.c	(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h)</div><div class='del'>-rdppm.c		(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h)</div><div class='del'>-rdgif.c		(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h)</div><div class='del'>-rdtarga.c	(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h)</div><div class='del'>-rdbmp.c		(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h)</div><div class='del'>-rdrle.c		(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h)</div><div class='del'>-libjpeg.lib        ; built by libjpeg.prj</div><div class='del'>-pcfltlib.lib       ; floating point library</div><div class='del'>-; the float library can be omitted if you've turned off DCT_FLOAT_SUPPORTED</div><div class='del'>-pcstdlib.lib       ; standard library</div><div class='del'>-pcextlib.lib       ; extended library</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makdjpeg.st b/src/3rdparty/libjpeg/makdjpeg.st<br/>deleted file mode 100644<br/>index 4b61404..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makdjpeg.st?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makdjpeg.st</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-; Project file for Independent JPEG Group's software</div><div class='del'>-;</div><div class='del'>-; This project file is for Atari ST/STE/TT systems using Pure C or Turbo C.</div><div class='del'>-; Thanks to Frank Moehle, B. Setzepfandt, and Guido Vollbeding.</div><div class='del'>-;</div><div class='del'>-; To use this file, rename it to djpeg.prj.</div><div class='del'>-; If you are using Turbo C, change filenames beginning with "pc..." to "tc..."</div><div class='del'>-; Read installation instructions before trying to make the program!</div><div class='del'>-;</div><div class='del'>-;</div><div class='del'>-;      * * * Output file * * *</div><div class='del'>-djpeg.ttp</div><div class='del'>-;</div><div class='del'>-; * * * COMPILER OPTIONS * * *  </div><div class='del'>-.C[-P]        ; absolute calls</div><div class='del'>-.C[-M]        ; and no string merging, folks</div><div class='del'>-.C[-w-cln]    ; no "constant is long" warnings</div><div class='del'>-.C[-w-par]    ; no "parameter xxxx unused"</div><div class='del'>-.C[-w-rch]    ; no "unreachable code"</div><div class='del'>-.C[-wsig]     ; warn if significant digits may be lost</div><div class='del'>-=</div><div class='del'>-; * * * * List of modules * * * * </div><div class='del'>-pcstart.o</div><div class='del'>-djpeg.c		(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h,jversion.h)</div><div class='del'>-cdjpeg.c	(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h)</div><div class='del'>-rdcolmap.c	(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h)</div><div class='del'>-wrppm.c		(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h)</div><div class='del'>-wrgif.c		(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h)</div><div class='del'>-wrtarga.c	(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h)</div><div class='del'>-wrbmp.c		(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h)</div><div class='del'>-wrrle.c		(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h)</div><div class='del'>-libjpeg.lib        ; built by libjpeg.prj</div><div class='del'>-pcfltlib.lib       ; floating point library</div><div class='del'>-; the float library can be omitted if you've turned off DCT_FLOAT_SUPPORTED</div><div class='del'>-pcstdlib.lib       ; standard library</div><div class='del'>-pcextlib.lib       ; extended library</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makeadsw.vc6 b/src/3rdparty/libjpeg/makeadsw.vc6<br/>deleted file mode 100644<br/>index 80459c5..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makeadsw.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makeadsw.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-Microsoft Developer Studio Workspace File, Format Version 6.00</div><div class='del'>-# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GEL™SCHT WERDEN!</div><div class='del'>-</div><div class='del'>-###############################################################################</div><div class='del'>-</div><div class='del'>-Project: "cjpeg"=".\cjpeg.dsp" - Package Owner=&lt;4&gt;</div><div class='del'>-</div><div class='del'>-Package=&lt;5&gt;</div><div class='del'>-{{{</div><div class='del'>-}}}</div><div class='del'>-</div><div class='del'>-Package=&lt;4&gt;</div><div class='del'>-{{{</div><div class='del'>-}}}</div><div class='del'>-</div><div class='del'>-###############################################################################</div><div class='del'>-</div><div class='del'>-Project: "djpeg"=".\djpeg.dsp" - Package Owner=&lt;4&gt;</div><div class='del'>-</div><div class='del'>-Package=&lt;5&gt;</div><div class='del'>-{{{</div><div class='del'>-}}}</div><div class='del'>-</div><div class='del'>-Package=&lt;4&gt;</div><div class='del'>-{{{</div><div class='del'>-}}}</div><div class='del'>-</div><div class='del'>-###############################################################################</div><div class='del'>-</div><div class='del'>-Project: "jpegtran"=".\jpegtran.dsp" - Package Owner=&lt;4&gt;</div><div class='del'>-</div><div class='del'>-Package=&lt;5&gt;</div><div class='del'>-{{{</div><div class='del'>-}}}</div><div class='del'>-</div><div class='del'>-Package=&lt;4&gt;</div><div class='del'>-{{{</div><div class='del'>-}}}</div><div class='del'>-</div><div class='del'>-###############################################################################</div><div class='del'>-</div><div class='del'>-Project: "rdjpgcom"=".\rdjpgcom.dsp" - Package Owner=&lt;4&gt;</div><div class='del'>-</div><div class='del'>-Package=&lt;5&gt;</div><div class='del'>-{{{</div><div class='del'>-}}}</div><div class='del'>-</div><div class='del'>-Package=&lt;4&gt;</div><div class='del'>-{{{</div><div class='del'>-}}}</div><div class='del'>-</div><div class='del'>-###############################################################################</div><div class='del'>-</div><div class='del'>-Project: "wrjpgcom"=".\wrjpgcom.dsp" - Package Owner=&lt;4&gt;</div><div class='del'>-</div><div class='del'>-Package=&lt;5&gt;</div><div class='del'>-{{{</div><div class='del'>-}}}</div><div class='del'>-</div><div class='del'>-Package=&lt;4&gt;</div><div class='del'>-{{{</div><div class='del'>-}}}</div><div class='del'>-</div><div class='del'>-###############################################################################</div><div class='del'>-</div><div class='del'>-Global:</div><div class='del'>-</div><div class='del'>-Package=&lt;5&gt;</div><div class='del'>-{{{</div><div class='del'>-}}}</div><div class='del'>-</div><div class='del'>-Package=&lt;3&gt;</div><div class='del'>-{{{</div><div class='del'>-}}}</div><div class='del'>-</div><div class='del'>-###############################################################################</div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makeasln.vc9 b/src/3rdparty/libjpeg/makeasln.vc9<br/>deleted file mode 100644<br/>index c88ba8d..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makeasln.vc9?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makeasln.vc9</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-‹¯¨</div><div class='del'>-Microsoft Visual Studio Solution File, Format Version 10.00</div><div class='del'>-# Visual C++ Express 2008</div><div class='del'>-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cjpeg", "cjpeg.vcproj", "{B4F61778-C45D-45C6-9E87-06F03F50519F}"</div><div class='del'>-EndProject</div><div class='del'>-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "djpeg", "djpeg.vcproj", "{9B7E57AE-31CD-405E-8070-26A8303B9DC9}"</div><div class='del'>-EndProject</div><div class='del'>-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpegtran", "jpegtran.vcproj", "{813C33AF-9031-49D2-BA19-93D600CDD404}"</div><div class='del'>-EndProject</div><div class='del'>-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rdjpgcom", "rdjpgcom.vcproj", "{EB107F86-A8CC-4507-8115-88D31DDE4CDF}"</div><div class='del'>-EndProject</div><div class='del'>-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wrjpgcom", "wrjpgcom.vcproj", "{178670D7-FA7F-44A8-96C7-11B1CA14269C}"</div><div class='del'>-EndProject</div><div class='del'>-Global</div><div class='del'>-	GlobalSection(SolutionConfigurationPlatforms) = preSolution</div><div class='del'>-		Release|Win32 = Release|Win32</div><div class='del'>-	EndGlobalSection</div><div class='del'>-	GlobalSection(ProjectConfigurationPlatforms) = postSolution</div><div class='del'>-		{B4F61778-C45D-45C6-9E87-06F03F50519F}.Release|Win32.ActiveCfg = Release|Win32</div><div class='del'>-		{B4F61778-C45D-45C6-9E87-06F03F50519F}.Release|Win32.Build.0 = Release|Win32</div><div class='del'>-		{9B7E57AE-31CD-405E-8070-26A8303B9DC9}.Release|Win32.ActiveCfg = Release|Win32</div><div class='del'>-		{9B7E57AE-31CD-405E-8070-26A8303B9DC9}.Release|Win32.Build.0 = Release|Win32</div><div class='del'>-		{813C33AF-9031-49D2-BA19-93D600CDD404}.Release|Win32.ActiveCfg = Release|Win32</div><div class='del'>-		{813C33AF-9031-49D2-BA19-93D600CDD404}.Release|Win32.Build.0 = Release|Win32</div><div class='del'>-		{EB107F86-A8CC-4507-8115-88D31DDE4CDF}.Release|Win32.ActiveCfg = Release|Win32</div><div class='del'>-		{EB107F86-A8CC-4507-8115-88D31DDE4CDF}.Release|Win32.Build.0 = Release|Win32</div><div class='del'>-		{178670D7-FA7F-44A8-96C7-11B1CA14269C}.Release|Win32.ActiveCfg = Release|Win32</div><div class='del'>-		{178670D7-FA7F-44A8-96C7-11B1CA14269C}.Release|Win32.Build.0 = Release|Win32</div><div class='del'>-	EndGlobalSection</div><div class='del'>-	GlobalSection(SolutionProperties) = preSolution</div><div class='del'>-		HideSolutionNode = FALSE</div><div class='del'>-	EndGlobalSection</div><div class='del'>-EndGlobal</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makecdep.vc6 b/src/3rdparty/libjpeg/makecdep.vc6<br/>deleted file mode 100644<br/>index 11dff77..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makecdep.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makecdep.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,82 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio erstellte Abh„ngigkeitsdatei, einbezogen von cjpeg.mak</div><div class='del'>-</div><div class='del'>-.\cdjpeg.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\cjpeg.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	".\jversion.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\rdbmp.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\rdgif.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\rdppm.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\rdrle.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\rdswitch.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\rdtarga.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makecdsp.vc6 b/src/3rdparty/libjpeg/makecdsp.vc6<br/>deleted file mode 100644<br/>index 3ab5965..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makecdsp.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makecdsp.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,130 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Project File - Name="cjpeg" - Package Owner=&lt;4&gt;</div><div class='del'>-# Microsoft Developer Studio Generated Build File, Format Version 6.00</div><div class='del'>-# ** NICHT BEARBEITEN **</div><div class='del'>-</div><div class='del'>-# TARGTYPE "Win32 (x86) Console Application" 0x0103</div><div class='del'>-</div><div class='del'>-CFG=cjpeg - Win32</div><div class='del'>-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE</div><div class='del'>-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "cjpeg.mak".</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE Sie k÷nnen beim Ausf�hren von NMAKE eine Konfiguration angeben</div><div class='del'>-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "cjpeg.mak" CFG="cjpeg - Win32"</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE F�r die Konfiguration stehen zur Auswahl:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE "cjpeg - Win32" (basierend auf  "Win32 (x86) Console Application")</div><div class='del'>-!MESSAGE </div><div class='del'>-</div><div class='del'>-# Begin Project</div><div class='del'>-# PROP AllowPerConfigDependencies 0</div><div class='del'>-# PROP Scc_ProjName ""</div><div class='del'>-# PROP Scc_LocalPath ""</div><div class='del'>-CPP=cl.exe</div><div class='del'>-RSC=rc.exe</div><div class='del'>-# PROP BASE Use_MFC 0</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0</div><div class='del'>-# PROP BASE Output_Dir ".\cjpeg\Release"</div><div class='del'>-# PROP BASE Intermediate_Dir ".\cjpeg\Release"</div><div class='del'>-# PROP BASE Target_Dir ".\cjpeg"</div><div class='del'>-# PROP Use_MFC 0</div><div class='del'>-# PROP Use_Debug_Libraries 0</div><div class='del'>-# PROP Output_Dir ".\cjpeg\Release"</div><div class='del'>-# PROP Intermediate_Dir ".\cjpeg\Release"</div><div class='del'>-# PROP Ignore_Export_Lib 0</div><div class='del'>-# PROP Target_Dir ".\cjpeg"</div><div class='del'>-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c</div><div class='del'>-# ADD CPP /nologo /G6 /MT /W3 /GX /Ox /Oa /Ob2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"</div><div class='del'>-BSC32=bscmake.exe</div><div class='del'>-# ADD BASE BSC32 /nologo</div><div class='del'>-# ADD BSC32 /nologo</div><div class='del'>-LINK32=link.exe</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386</div><div class='del'>-# ADD LINK32 Release\jpeg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386</div><div class='del'>-# Begin Target</div><div class='del'>-</div><div class='del'>-# Name "cjpeg - Win32"</div><div class='del'>-# Begin Group "Quellcodedateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\cdjpeg.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\cjpeg.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdbmp.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdgif.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdppm.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdrle.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdswitch.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdtarga.c</div><div class='del'>-# End Source File</div><div class='del'>-# End Group</div><div class='del'>-# Begin Group "Header-Dateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\cderror.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\cdjpeg.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jconfig.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jerror.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jinclude.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jmorecfg.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jpeglib.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jversion.h</div><div class='del'>-# End Source File</div><div class='del'>-# End Group</div><div class='del'>-# Begin Group "Ressourcendateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"</div><div class='del'>-# End Group</div><div class='del'>-# End Target</div><div class='del'>-# End Project</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makecmak.vc6 b/src/3rdparty/libjpeg/makecmak.vc6<br/>deleted file mode 100644<br/>index bee03bf..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makecmak.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makecmak.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,159 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Generated NMAKE File, Based on cjpeg.dsp</div><div class='del'>-!IF "$(CFG)" == ""</div><div class='del'>-CFG=cjpeg - Win32</div><div class='del'>-!MESSAGE Keine Konfiguration angegeben. cjpeg - Win32 wird als Standard verwendet.</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-!IF "$(CFG)" != "cjpeg - Win32"</div><div class='del'>-!MESSAGE Ungültige Konfiguration "$(CFG)" angegeben.</div><div class='del'>-!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben</div><div class='del'>-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "cjpeg.mak" CFG="cjpeg - Win32"</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE Für die Konfiguration stehen zur Auswahl:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE "cjpeg - Win32" (basierend auf  "Win32 (x86) Console Application")</div><div class='del'>-!MESSAGE </div><div class='del'>-!ERROR Eine ungültige Konfiguration wurde angegeben.</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-!IF "$(OS)" == "Windows_NT"</div><div class='del'>-NULL=</div><div class='del'>-!ELSE </div><div class='del'>-NULL=nul</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-CPP=cl.exe</div><div class='del'>-RSC=rc.exe</div><div class='del'>-OUTDIR=.\cjpeg\Release</div><div class='del'>-INTDIR=.\cjpeg\Release</div><div class='del'>-# Begin Custom Macros</div><div class='del'>-OutDir=.\cjpeg\Release</div><div class='del'>-# End Custom Macros</div><div class='del'>-</div><div class='del'>-ALL : "$(OUTDIR)\cjpeg.exe"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CLEAN :</div><div class='del'>-	-@erase "$(INTDIR)\cdjpeg.obj"</div><div class='del'>-	-@erase "$(INTDIR)\cjpeg.obj"</div><div class='del'>-	-@erase "$(INTDIR)\rdbmp.obj"</div><div class='del'>-	-@erase "$(INTDIR)\rdgif.obj"</div><div class='del'>-	-@erase "$(INTDIR)\rdppm.obj"</div><div class='del'>-	-@erase "$(INTDIR)\rdrle.obj"</div><div class='del'>-	-@erase "$(INTDIR)\rdswitch.obj"</div><div class='del'>-	-@erase "$(INTDIR)\rdtarga.obj"</div><div class='del'>-	-@erase "$(INTDIR)\vc60.idb"</div><div class='del'>-	-@erase "$(OUTDIR)\cjpeg.exe"</div><div class='del'>-</div><div class='del'>-"$(OUTDIR)" :</div><div class='del'>-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"</div><div class='del'>-</div><div class='del'>-BSC32=bscmake.exe</div><div class='del'>-BSC32_FLAGS=/nologo /o"$(OUTDIR)\cjpeg.bsc" </div><div class='del'>-BSC32_SBRS= \</div><div class='del'>-	</div><div class='del'>-LINK32=link.exe</div><div class='del'>-LINK32_FLAGS=Release\jpeg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\cjpeg.pdb" /machine:I386 /out:"$(OUTDIR)\cjpeg.exe" </div><div class='del'>-LINK32_OBJS= \</div><div class='del'>-	"$(INTDIR)\cdjpeg.obj" \</div><div class='del'>-	"$(INTDIR)\cjpeg.obj" \</div><div class='del'>-	"$(INTDIR)\rdbmp.obj" \</div><div class='del'>-	"$(INTDIR)\rdgif.obj" \</div><div class='del'>-	"$(INTDIR)\rdppm.obj" \</div><div class='del'>-	"$(INTDIR)\rdrle.obj" \</div><div class='del'>-	"$(INTDIR)\rdswitch.obj" \</div><div class='del'>-	"$(INTDIR)\rdtarga.obj"</div><div class='del'>-</div><div class='del'>-"$(OUTDIR)\cjpeg.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)</div><div class='del'>-    $(LINK32) @&lt;&lt;</div><div class='del'>-  $(LINK32_FLAGS) $(LINK32_OBJS)</div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-CPP_PROJ=/nologo /G6 /MT /W3 /GX /Ox /Oa /Ob2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /Fp"$(INTDIR)\cjpeg.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c </div><div class='del'>-</div><div class='del'>-.c{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cpp{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cxx{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.c{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cpp{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cxx{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!IF "$(NO_EXTERNAL_DEPS)" != "1"</div><div class='del'>-!IF EXISTS("cjpeg.dep")</div><div class='del'>-!INCLUDE "cjpeg.dep"</div><div class='del'>-!ELSE </div><div class='del'>-!MESSAGE Warning: cannot find "cjpeg.dep"</div><div class='del'>-!ENDIF </div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!IF "$(CFG)" == "cjpeg - Win32"</div><div class='del'>-SOURCE=.\cdjpeg.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\cdjpeg.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\cjpeg.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\cjpeg.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdbmp.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\rdbmp.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdgif.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\rdgif.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdppm.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\rdppm.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdrle.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\rdrle.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdswitch.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\rdswitch.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdtarga.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\rdtarga.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makecvcp.vc9 b/src/3rdparty/libjpeg/makecvcp.vc9<br/>deleted file mode 100644<br/>index b38e6a1..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makecvcp.vc9?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makecvcp.vc9</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,186 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="Windows-1252"?&gt;</div><div class='del'>-&lt;VisualStudioProject</div><div class='del'>-	ProjectType="Visual C++"</div><div class='del'>-	Version="9,00"</div><div class='del'>-	Name="cjpeg"</div><div class='del'>-	ProjectGUID="{B4F61778-C45D-45C6-9E87-06F03F50519F}"</div><div class='del'>-	RootNamespace="cjpeg"</div><div class='del'>-	Keyword="Win32Proj"</div><div class='del'>-	TargetFrameworkVersion="196613"</div><div class='del'>-	&gt;</div><div class='del'>-	&lt;Platforms&gt;</div><div class='del'>-		&lt;Platform</div><div class='del'>-			Name="Win32"</div><div class='del'>-		/&gt;</div><div class='del'>-	&lt;/Platforms&gt;</div><div class='del'>-	&lt;ToolFiles&gt;</div><div class='del'>-	&lt;/ToolFiles&gt;</div><div class='del'>-	&lt;Configurations&gt;</div><div class='del'>-		&lt;Configuration</div><div class='del'>-			Name="Release|Win32"</div><div class='del'>-			OutputDirectory="$(ProjectName)\$(ConfigurationName)"</div><div class='del'>-			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"</div><div class='del'>-			ConfigurationType="1"</div><div class='del'>-			CharacterSet="0"</div><div class='del'>-			WholeProgramOptimization="1"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPreBuildEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCCustomBuildTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCXMLDataGeneratorTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCMIDLTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCCLCompilerTool"</div><div class='del'>-				Optimization="3"</div><div class='del'>-				EnableIntrinsicFunctions="false"</div><div class='del'>-				EnableFiberSafeOptimizations="true"</div><div class='del'>-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"</div><div class='del'>-				RuntimeLibrary="2"</div><div class='del'>-				EnableFunctionLevelLinking="true"</div><div class='del'>-				UsePrecompiledHeader="0"</div><div class='del'>-				WarningLevel="3"</div><div class='del'>-				DebugInformationFormat="3"</div><div class='del'>-				CompileAs="0"</div><div class='del'>-				DisableSpecificWarnings="4996"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCManagedResourceCompilerTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCResourceCompilerTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPreLinkEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCLinkerTool"</div><div class='del'>-				AdditionalDependencies="Release\jpeg.lib"</div><div class='del'>-				LinkIncremental="1"</div><div class='del'>-				GenerateDebugInformation="true"</div><div class='del'>-				SubSystem="1"</div><div class='del'>-				OptimizeReferences="2"</div><div class='del'>-				EnableCOMDATFolding="2"</div><div class='del'>-				TargetMachine="1"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCALinkTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCManifestTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCXDCMakeTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCBscMakeTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCFxCopTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCAppVerifierTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPostBuildEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-		&lt;/Configuration&gt;</div><div class='del'>-	&lt;/Configurations&gt;</div><div class='del'>-	&lt;References&gt;</div><div class='del'>-	&lt;/References&gt;</div><div class='del'>-	&lt;Files&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Quelldateien"</div><div class='del'>-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"</div><div class='del'>-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\cdjpeg.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\cjpeg.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\rdbmp.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\rdgif.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\rdppm.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\rdrle.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\rdswitch.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\rdtarga.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Headerdateien"</div><div class='del'>-			Filter="h;hpp;hxx;hm;inl;inc;xsd"</div><div class='del'>-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\cderror.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\cdjpeg.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jconfig.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jerror.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jinclude.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jmorecfg.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jpeglib.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jversion.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Ressourcendateien"</div><div class='del'>-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"</div><div class='del'>-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"</div><div class='del'>-			&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-	&lt;/Files&gt;</div><div class='del'>-	&lt;Globals&gt;</div><div class='del'>-	&lt;/Globals&gt;</div><div class='del'>-&lt;/VisualStudioProject&gt;</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makeddep.vc6 b/src/3rdparty/libjpeg/makeddep.vc6<br/>deleted file mode 100644<br/>index f911eba..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makeddep.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makeddep.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,82 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio erstellte Abh„ngigkeitsdatei, einbezogen von djpeg.mak</div><div class='del'>-</div><div class='del'>-.\cdjpeg.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\djpeg.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	".\jversion.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\rdcolmap.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\wrbmp.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\wrgif.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\wrppm.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\wrrle.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\wrtarga.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makeddsp.vc6 b/src/3rdparty/libjpeg/makeddsp.vc6<br/>deleted file mode 100644<br/>index f583a0f..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makeddsp.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makeddsp.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,130 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Project File - Name="djpeg" - Package Owner=&lt;4&gt;</div><div class='del'>-# Microsoft Developer Studio Generated Build File, Format Version 6.00</div><div class='del'>-# ** NICHT BEARBEITEN **</div><div class='del'>-</div><div class='del'>-# TARGTYPE "Win32 (x86) Console Application" 0x0103</div><div class='del'>-</div><div class='del'>-CFG=djpeg - Win32</div><div class='del'>-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE</div><div class='del'>-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "djpeg.mak".</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE Sie k÷nnen beim Ausf�hren von NMAKE eine Konfiguration angeben</div><div class='del'>-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "djpeg.mak" CFG="djpeg - Win32"</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE F�r die Konfiguration stehen zur Auswahl:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE "djpeg - Win32" (basierend auf  "Win32 (x86) Console Application")</div><div class='del'>-!MESSAGE </div><div class='del'>-</div><div class='del'>-# Begin Project</div><div class='del'>-# PROP AllowPerConfigDependencies 0</div><div class='del'>-# PROP Scc_ProjName ""</div><div class='del'>-# PROP Scc_LocalPath ""</div><div class='del'>-CPP=cl.exe</div><div class='del'>-RSC=rc.exe</div><div class='del'>-# PROP BASE Use_MFC 0</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0</div><div class='del'>-# PROP BASE Output_Dir ".\djpeg\Release"</div><div class='del'>-# PROP BASE Intermediate_Dir ".\djpeg\Release"</div><div class='del'>-# PROP BASE Target_Dir ".\djpeg"</div><div class='del'>-# PROP Use_MFC 0</div><div class='del'>-# PROP Use_Debug_Libraries 0</div><div class='del'>-# PROP Output_Dir ".\djpeg\Release"</div><div class='del'>-# PROP Intermediate_Dir ".\djpeg\Release"</div><div class='del'>-# PROP Ignore_Export_Lib 0</div><div class='del'>-# PROP Target_Dir ".\djpeg"</div><div class='del'>-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c</div><div class='del'>-# ADD CPP /nologo /G6 /MT /W3 /GX /Ox /Oa /Ob2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"</div><div class='del'>-BSC32=bscmake.exe</div><div class='del'>-# ADD BASE BSC32 /nologo</div><div class='del'>-# ADD BSC32 /nologo</div><div class='del'>-LINK32=link.exe</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386</div><div class='del'>-# ADD LINK32 Release\jpeg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386</div><div class='del'>-# Begin Target</div><div class='del'>-</div><div class='del'>-# Name "djpeg - Win32"</div><div class='del'>-# Begin Group "Quellcodedateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\cdjpeg.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\djpeg.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdcolmap.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\wrbmp.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\wrgif.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\wrppm.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\wrrle.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\wrtarga.c</div><div class='del'>-# End Source File</div><div class='del'>-# End Group</div><div class='del'>-# Begin Group "Header-Dateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\cderror.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\cdjpeg.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jconfig.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jerror.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jinclude.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jmorecfg.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jpeglib.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jversion.h</div><div class='del'>-# End Source File</div><div class='del'>-# End Group</div><div class='del'>-# Begin Group "Ressourcendateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"</div><div class='del'>-# End Group</div><div class='del'>-# End Target</div><div class='del'>-# End Project</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makedmak.vc6 b/src/3rdparty/libjpeg/makedmak.vc6<br/>deleted file mode 100644<br/>index e16487f..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makedmak.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makedmak.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,159 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Generated NMAKE File, Based on djpeg.dsp</div><div class='del'>-!IF "$(CFG)" == ""</div><div class='del'>-CFG=djpeg - Win32</div><div class='del'>-!MESSAGE Keine Konfiguration angegeben. djpeg - Win32 wird als Standard verwendet.</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-!IF "$(CFG)" != "djpeg - Win32"</div><div class='del'>-!MESSAGE Ungültige Konfiguration "$(CFG)" angegeben.</div><div class='del'>-!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben</div><div class='del'>-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "djpeg.mak" CFG="djpeg - Win32"</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE Für die Konfiguration stehen zur Auswahl:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE "djpeg - Win32" (basierend auf  "Win32 (x86) Console Application")</div><div class='del'>-!MESSAGE </div><div class='del'>-!ERROR Eine ungültige Konfiguration wurde angegeben.</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-!IF "$(OS)" == "Windows_NT"</div><div class='del'>-NULL=</div><div class='del'>-!ELSE </div><div class='del'>-NULL=nul</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-CPP=cl.exe</div><div class='del'>-RSC=rc.exe</div><div class='del'>-OUTDIR=.\djpeg\Release</div><div class='del'>-INTDIR=.\djpeg\Release</div><div class='del'>-# Begin Custom Macros</div><div class='del'>-OutDir=.\djpeg\Release</div><div class='del'>-# End Custom Macros</div><div class='del'>-</div><div class='del'>-ALL : "$(OUTDIR)\djpeg.exe"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CLEAN :</div><div class='del'>-	-@erase "$(INTDIR)\cdjpeg.obj"</div><div class='del'>-	-@erase "$(INTDIR)\djpeg.obj"</div><div class='del'>-	-@erase "$(INTDIR)\rdcolmap.obj"</div><div class='del'>-	-@erase "$(INTDIR)\vc60.idb"</div><div class='del'>-	-@erase "$(INTDIR)\wrbmp.obj"</div><div class='del'>-	-@erase "$(INTDIR)\wrgif.obj"</div><div class='del'>-	-@erase "$(INTDIR)\wrppm.obj"</div><div class='del'>-	-@erase "$(INTDIR)\wrrle.obj"</div><div class='del'>-	-@erase "$(INTDIR)\wrtarga.obj"</div><div class='del'>-	-@erase "$(OUTDIR)\djpeg.exe"</div><div class='del'>-</div><div class='del'>-"$(OUTDIR)" :</div><div class='del'>-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"</div><div class='del'>-</div><div class='del'>-BSC32=bscmake.exe</div><div class='del'>-BSC32_FLAGS=/nologo /o"$(OUTDIR)\djpeg.bsc" </div><div class='del'>-BSC32_SBRS= \</div><div class='del'>-	</div><div class='del'>-LINK32=link.exe</div><div class='del'>-LINK32_FLAGS=Release\jpeg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\djpeg.pdb" /machine:I386 /out:"$(OUTDIR)\djpeg.exe" </div><div class='del'>-LINK32_OBJS= \</div><div class='del'>-	"$(INTDIR)\cdjpeg.obj" \</div><div class='del'>-	"$(INTDIR)\djpeg.obj" \</div><div class='del'>-	"$(INTDIR)\rdcolmap.obj" \</div><div class='del'>-	"$(INTDIR)\wrbmp.obj" \</div><div class='del'>-	"$(INTDIR)\wrgif.obj" \</div><div class='del'>-	"$(INTDIR)\wrppm.obj" \</div><div class='del'>-	"$(INTDIR)\wrrle.obj" \</div><div class='del'>-	"$(INTDIR)\wrtarga.obj"</div><div class='del'>-</div><div class='del'>-"$(OUTDIR)\djpeg.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)</div><div class='del'>-    $(LINK32) @&lt;&lt;</div><div class='del'>-  $(LINK32_FLAGS) $(LINK32_OBJS)</div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-CPP_PROJ=/nologo /G6 /MT /W3 /GX /Ox /Oa /Ob2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /Fp"$(INTDIR)\djpeg.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c </div><div class='del'>-</div><div class='del'>-.c{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cpp{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cxx{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.c{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cpp{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cxx{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!IF "$(NO_EXTERNAL_DEPS)" != "1"</div><div class='del'>-!IF EXISTS("djpeg.dep")</div><div class='del'>-!INCLUDE "djpeg.dep"</div><div class='del'>-!ELSE </div><div class='del'>-!MESSAGE Warning: cannot find "djpeg.dep"</div><div class='del'>-!ENDIF </div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!IF "$(CFG)" == "djpeg - Win32"</div><div class='del'>-SOURCE=.\cdjpeg.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\cdjpeg.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\djpeg.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\djpeg.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdcolmap.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\rdcolmap.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\wrbmp.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\wrbmp.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\wrgif.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\wrgif.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\wrppm.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\wrppm.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\wrrle.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\wrrle.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\wrtarga.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\wrtarga.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makedvcp.vc9 b/src/3rdparty/libjpeg/makedvcp.vc9<br/>deleted file mode 100644<br/>index 6f5bb1e..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makedvcp.vc9?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makedvcp.vc9</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,186 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="Windows-1252"?&gt;</div><div class='del'>-&lt;VisualStudioProject</div><div class='del'>-	ProjectType="Visual C++"</div><div class='del'>-	Version="9,00"</div><div class='del'>-	Name="djpeg"</div><div class='del'>-	ProjectGUID="{9B7E57AE-31CD-405E-8070-26A8303B9DC9}"</div><div class='del'>-	RootNamespace="djpeg"</div><div class='del'>-	Keyword="Win32Proj"</div><div class='del'>-	TargetFrameworkVersion="196613"</div><div class='del'>-	&gt;</div><div class='del'>-	&lt;Platforms&gt;</div><div class='del'>-		&lt;Platform</div><div class='del'>-			Name="Win32"</div><div class='del'>-		/&gt;</div><div class='del'>-	&lt;/Platforms&gt;</div><div class='del'>-	&lt;ToolFiles&gt;</div><div class='del'>-	&lt;/ToolFiles&gt;</div><div class='del'>-	&lt;Configurations&gt;</div><div class='del'>-		&lt;Configuration</div><div class='del'>-			Name="Release|Win32"</div><div class='del'>-			OutputDirectory="$(ProjectName)\$(ConfigurationName)"</div><div class='del'>-			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"</div><div class='del'>-			ConfigurationType="1"</div><div class='del'>-			CharacterSet="0"</div><div class='del'>-			WholeProgramOptimization="1"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPreBuildEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCCustomBuildTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCXMLDataGeneratorTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCMIDLTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCCLCompilerTool"</div><div class='del'>-				Optimization="3"</div><div class='del'>-				EnableIntrinsicFunctions="false"</div><div class='del'>-				EnableFiberSafeOptimizations="true"</div><div class='del'>-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"</div><div class='del'>-				RuntimeLibrary="2"</div><div class='del'>-				EnableFunctionLevelLinking="true"</div><div class='del'>-				UsePrecompiledHeader="0"</div><div class='del'>-				WarningLevel="3"</div><div class='del'>-				DebugInformationFormat="3"</div><div class='del'>-				CompileAs="0"</div><div class='del'>-				DisableSpecificWarnings="4996"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCManagedResourceCompilerTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCResourceCompilerTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPreLinkEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCLinkerTool"</div><div class='del'>-				AdditionalDependencies="Release\jpeg.lib"</div><div class='del'>-				LinkIncremental="1"</div><div class='del'>-				GenerateDebugInformation="true"</div><div class='del'>-				SubSystem="1"</div><div class='del'>-				OptimizeReferences="2"</div><div class='del'>-				EnableCOMDATFolding="2"</div><div class='del'>-				TargetMachine="1"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCALinkTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCManifestTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCXDCMakeTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCBscMakeTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCFxCopTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCAppVerifierTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPostBuildEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-		&lt;/Configuration&gt;</div><div class='del'>-	&lt;/Configurations&gt;</div><div class='del'>-	&lt;References&gt;</div><div class='del'>-	&lt;/References&gt;</div><div class='del'>-	&lt;Files&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Quelldateien"</div><div class='del'>-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"</div><div class='del'>-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\cdjpeg.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\djpeg.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\rdcolmap.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\wrbmp.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\wrgif.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\wrppm.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\wrrle.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\wrtarga.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Headerdateien"</div><div class='del'>-			Filter="h;hpp;hxx;hm;inl;inc;xsd"</div><div class='del'>-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\cderror.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\cdjpeg.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jconfig.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jerror.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jinclude.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jmorecfg.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jpeglib.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jversion.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Ressourcendateien"</div><div class='del'>-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"</div><div class='del'>-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"</div><div class='del'>-			&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-	&lt;/Files&gt;</div><div class='del'>-	&lt;Globals&gt;</div><div class='del'>-	&lt;/Globals&gt;</div><div class='del'>-&lt;/VisualStudioProject&gt;</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makefile.ansi b/src/3rdparty/libjpeg/makefile.ansi<br/>deleted file mode 100644<br/>index 30e41c9..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makefile.ansi?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.ansi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,220 +0,0 @@</div><div class='del'>-# Makefile for Independent JPEG Group's software</div><div class='del'>-</div><div class='del'>-# This makefile is suitable for Unix-like systems with ANSI-capable compilers.</div><div class='del'>-# If you have a non-ANSI compiler, makefile.unix is a better starting point.</div><div class='del'>-</div><div class='del'>-# Read installation instructions before saying "make" !!</div><div class='del'>-</div><div class='del'>-# The name of your C compiler:</div><div class='del'>-CC= cc</div><div class='del'>-</div><div class='del'>-# You may need to adjust these cc options:</div><div class='del'>-CFLAGS= -O</div><div class='del'>-# Generally, we recommend defining any configuration symbols in jconfig.h,</div><div class='del'>-# NOT via -D switches here.</div><div class='del'>-</div><div class='del'>-# Link-time cc options:</div><div class='del'>-LDFLAGS= </div><div class='del'>-</div><div class='del'>-# To link any special libraries, add the necessary -l commands here.</div><div class='del'>-LDLIBS= </div><div class='del'>-</div><div class='del'>-# Put here the object file name for the correct system-dependent memory</div><div class='del'>-# manager file.  For Unix this is usually jmemnobs.o, but you may want</div><div class='del'>-# to use jmemansi.o or jmemname.o if you have limited swap space.</div><div class='del'>-SYSDEPMEM= jmemnobs.o</div><div class='del'>-</div><div class='del'>-# miscellaneous OS-dependent stuff</div><div class='del'>-# linker</div><div class='del'>-LN= $(CC)</div><div class='del'>-# file deletion command</div><div class='del'>-RM= rm -f</div><div class='del'>-# library (.a) file creation command</div><div class='del'>-AR= ar rc</div><div class='del'>-# second step in .a creation (use "touch" if not needed)</div><div class='del'>-AR2= ranlib</div><div class='del'>-</div><div class='del'>-# End of configurable options.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# source files: JPEG library proper</div><div class='del'>-LIBSOURCES= jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c \</div><div class='del'>-        jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c \</div><div class='del'>-        jcomapi.c jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c \</div><div class='del'>-        jdapistd.c jdarith.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c \</div><div class='del'>-        jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c \</div><div class='del'>-        jdmerge.c jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c \</div><div class='del'>-        jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c jquant1.c \</div><div class='del'>-        jquant2.c jutils.c jmemmgr.c</div><div class='del'>-# memmgr back ends: compile only one of these into a working library</div><div class='del'>-SYSDEPSOURCES= jmemansi.c jmemname.c jmemnobs.c jmemdos.c jmemmac.c</div><div class='del'>-# source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom</div><div class='del'>-APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c \</div><div class='del'>-        rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c \</div><div class='del'>-        rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c</div><div class='del'>-SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES)</div><div class='del'>-# files included by source files</div><div class='del'>-INCLUDES= jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h jpegint.h \</div><div class='del'>-        jpeglib.h jversion.h cdjpeg.h cderror.h transupp.h</div><div class='del'>-# documentation, test, and support files</div><div class='del'>-DOCS= README install.txt usage.txt cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \</div><div class='del'>-        wrjpgcom.1 wizard.txt example.c libjpeg.txt structure.txt \</div><div class='del'>-        coderules.txt filelist.txt change.log</div><div class='del'>-MKFILES= configure Makefile.in makefile.ansi makefile.unix makefile.bcc \</div><div class='del'>-        makefile.mc6 makefile.dj makefile.wat makefile.vc makejdsw.vc6 \</div><div class='del'>-        makeadsw.vc6 makejdep.vc6 makejdsp.vc6 makejmak.vc6 makecdep.vc6 \</div><div class='del'>-        makecdsp.vc6 makecmak.vc6 makeddep.vc6 makeddsp.vc6 makedmak.vc6 \</div><div class='del'>-        maketdep.vc6 maketdsp.vc6 maketmak.vc6 makerdep.vc6 makerdsp.vc6 \</div><div class='del'>-        makermak.vc6 makewdep.vc6 makewdsp.vc6 makewmak.vc6 makejsln.vc9 \</div><div class='del'>-        makeasln.vc9 makejvcp.vc9 makecvcp.vc9 makedvcp.vc9 maketvcp.vc9 \</div><div class='del'>-        makervcp.vc9 makewvcp.vc9 makeproj.mac makcjpeg.st makdjpeg.st \</div><div class='del'>-        makljpeg.st maktjpeg.st makefile.manx makefile.sas makefile.mms \</div><div class='del'>-        makefile.vms makvms.opt</div><div class='del'>-CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat \</div><div class='del'>-        jconfig.vc jconfig.mac jconfig.st jconfig.manx jconfig.sas \</div><div class='del'>-        jconfig.vms</div><div class='del'>-CONFIGUREFILES= config.guess config.sub install-sh ltmain.sh depcomp missing</div><div class='del'>-OTHERFILES= jconfig.txt ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm \</div><div class='del'>-        libjpeg.map</div><div class='del'>-TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \</div><div class='del'>-        testimgp.jpg</div><div class='del'>-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \</div><div class='del'>-        $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)</div><div class='del'>-# library object files common to compression and decompression</div><div class='del'>-COMOBJECTS= jaricom.o jcomapi.o jutils.o jerror.o jmemmgr.o $(SYSDEPMEM)</div><div class='del'>-# compression library object files</div><div class='del'>-CLIBOBJECTS= jcapimin.o jcapistd.o jcarith.o jctrans.o jcparam.o \</div><div class='del'>-        jdatadst.o jcinit.o jcmaster.o jcmarker.o jcmainct.o jcprepct.o \</div><div class='del'>-        jccoefct.o jccolor.o jcsample.o jchuff.o jcdctmgr.o jfdctfst.o \</div><div class='del'>-        jfdctflt.o jfdctint.o</div><div class='del'>-# decompression library object files</div><div class='del'>-DLIBOBJECTS= jdapimin.o jdapistd.o jdarith.o jdtrans.o jdatasrc.o \</div><div class='del'>-        jdmaster.o jdinput.o jdmarker.o jdhuff.o jdmainct.o \</div><div class='del'>-        jdcoefct.o jdpostct.o jddctmgr.o jidctfst.o jidctflt.o \</div><div class='del'>-        jidctint.o jdsample.o jdcolor.o jquant1.o jquant2.o jdmerge.o</div><div class='del'>-# These objectfiles are included in libjpeg.a</div><div class='del'>-LIBOBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)</div><div class='del'>-# object files for sample applications (excluding library files)</div><div class='del'>-COBJECTS= cjpeg.o rdppm.o rdgif.o rdtarga.o rdrle.o rdbmp.o rdswitch.o \</div><div class='del'>-        cdjpeg.o</div><div class='del'>-DOBJECTS= djpeg.o wrppm.o wrgif.o wrtarga.o wrrle.o wrbmp.o rdcolmap.o \</div><div class='del'>-        cdjpeg.o</div><div class='del'>-TROBJECTS= jpegtran.o rdswitch.o cdjpeg.o transupp.o</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-all: libjpeg.a cjpeg djpeg jpegtran rdjpgcom wrjpgcom</div><div class='del'>-</div><div class='del'>-libjpeg.a: $(LIBOBJECTS)</div><div class='del'>-	$(RM) libjpeg.a</div><div class='del'>-	$(AR) libjpeg.a  $(LIBOBJECTS)</div><div class='del'>-	$(AR2) libjpeg.a</div><div class='del'>-</div><div class='del'>-cjpeg: $(COBJECTS) libjpeg.a</div><div class='del'>-	$(LN) $(LDFLAGS) -o cjpeg $(COBJECTS) libjpeg.a $(LDLIBS)</div><div class='del'>-</div><div class='del'>-djpeg: $(DOBJECTS) libjpeg.a</div><div class='del'>-	$(LN) $(LDFLAGS) -o djpeg $(DOBJECTS) libjpeg.a $(LDLIBS)</div><div class='del'>-</div><div class='del'>-jpegtran: $(TROBJECTS) libjpeg.a</div><div class='del'>-	$(LN) $(LDFLAGS) -o jpegtran $(TROBJECTS) libjpeg.a $(LDLIBS)</div><div class='del'>-</div><div class='del'>-rdjpgcom: rdjpgcom.o</div><div class='del'>-	$(LN) $(LDFLAGS) -o rdjpgcom rdjpgcom.o $(LDLIBS)</div><div class='del'>-</div><div class='del'>-wrjpgcom: wrjpgcom.o</div><div class='del'>-	$(LN) $(LDFLAGS) -o wrjpgcom wrjpgcom.o $(LDLIBS)</div><div class='del'>-</div><div class='del'>-jconfig.h: jconfig.txt</div><div class='del'>-	echo You must prepare a system-dependent jconfig.h file.</div><div class='del'>-	echo Please read the installation directions in install.txt.</div><div class='del'>-	exit 1</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM) *.o cjpeg djpeg jpegtran libjpeg.a rdjpgcom wrjpgcom</div><div class='del'>-	$(RM) core testout*</div><div class='del'>-</div><div class='del'>-test: cjpeg djpeg jpegtran</div><div class='del'>-	$(RM) testout*</div><div class='del'>-	./djpeg -dct int -ppm -outfile testout.ppm  testorig.jpg</div><div class='del'>-	./djpeg -dct int -bmp -colors 256 -outfile testout.bmp  testorig.jpg</div><div class='del'>-	./cjpeg -dct int -outfile testout.jpg  testimg.ppm</div><div class='del'>-	./djpeg -dct int -ppm -outfile testoutp.ppm testprog.jpg</div><div class='del'>-	./cjpeg -dct int -progressive -opt -outfile testoutp.jpg testimg.ppm</div><div class='del'>-	./jpegtran -outfile testoutt.jpg testprog.jpg</div><div class='del'>-	cmp testimg.ppm testout.ppm</div><div class='del'>-	cmp testimg.bmp testout.bmp</div><div class='del'>-	cmp testimg.jpg testout.jpg</div><div class='del'>-	cmp testimg.ppm testoutp.ppm</div><div class='del'>-	cmp testimgp.jpg testoutp.jpg</div><div class='del'>-	cmp testorig.jpg testoutt.jpg</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-jaricom.o: jaricom.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapimin.o: jcapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapistd.o: jcapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcarith.o: jcarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccoefct.o: jccoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccolor.o: jccolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcdctmgr.o: jcdctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jchuff.o: jchuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcinit.o: jcinit.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmainct.o: jcmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmarker.o: jcmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmaster.o: jcmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcomapi.o: jcomapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcparam.o: jcparam.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcprepct.o: jcprepct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcsample.o: jcsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jctrans.o: jctrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapimin.o: jdapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapistd.o: jdapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdarith.o: jdarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdatadst.o: jdatadst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdatasrc.o: jdatasrc.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdcoefct.o: jdcoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdcolor.o: jdcolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jddctmgr.o: jddctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jdhuff.o: jdhuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdinput.o: jdinput.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmainct.o: jdmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmarker.o: jdmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmaster.o: jdmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmerge.o: jdmerge.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdpostct.o: jdpostct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdsample.o: jdsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdtrans.o: jdtrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jerror.o: jerror.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jversion.h jerror.h</div><div class='del'>-jfdctflt.o: jfdctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctfst.o: jfdctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctint.o: jfdctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctflt.o: jidctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctfst.o: jidctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctint.o: jidctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jquant1.o: jquant1.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jquant2.o: jquant2.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jutils.o: jutils.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jmemmgr.o: jmemmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemansi.o: jmemansi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemname.o: jmemname.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemnobs.o: jmemnobs.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemdos.o: jmemdos.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemmac.o: jmemmac.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-cjpeg.o: cjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-djpeg.o: djpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-jpegtran.o: jpegtran.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h transupp.h jversion.h</div><div class='del'>-rdjpgcom.o: rdjpgcom.c jinclude.h jconfig.h</div><div class='del'>-wrjpgcom.o: wrjpgcom.c jinclude.h jconfig.h</div><div class='del'>-cdjpeg.o: cdjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdcolmap.o: rdcolmap.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdswitch.o: rdswitch.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-transupp.o: transupp.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h transupp.h</div><div class='del'>-rdppm.o: rdppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrppm.o: wrppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdgif.o: rdgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrgif.o: wrgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdtarga.o: rdtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrtarga.o: wrtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdbmp.o: rdbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrbmp.o: wrbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdrle.o: rdrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrrle.o: wrrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makefile.bcc b/src/3rdparty/libjpeg/makefile.bcc<br/>deleted file mode 100644<br/>index c9e2311..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makefile.bcc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.bcc</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,291 +0,0 @@</div><div class='del'>-# Makefile for Independent JPEG Group's software</div><div class='del'>-</div><div class='del'>-# This makefile is suitable for Borland C on MS-DOS or OS/2.</div><div class='del'>-# It works with Borland C++ for DOS, revision 3.0 or later,</div><div class='del'>-# and has been tested with Borland C++ for OS/2.</div><div class='del'>-# Watch out for optimization bugs in the OS/2 compilers --- see notes below!</div><div class='del'>-# Thanks to Tom Wright and Ge' Weijers (original DOS) and</div><div class='del'>-# Ken Porter (OS/2) for this file.</div><div class='del'>-</div><div class='del'>-# Read installation instructions before saying "make" !!</div><div class='del'>-</div><div class='del'>-# Are we under DOS or OS/2?</div><div class='del'>-!if !$d(DOS) &amp;&amp; !$d(OS2)</div><div class='del'>-!if $d(__OS2__)</div><div class='del'>-OS2=1</div><div class='del'>-!else</div><div class='del'>-DOS=1</div><div class='del'>-!endif</div><div class='del'>-!endif</div><div class='del'>-</div><div class='del'>-# The name of your C compiler:</div><div class='del'>-CC= bcc</div><div class='del'>-</div><div class='del'>-# You may need to adjust these cc options:</div><div class='del'>-!if $d(DOS)</div><div class='del'>-CFLAGS= -O2 -mm -w-par -w-stu -w-ccc -w-rch</div><div class='del'>-!else</div><div class='del'>-CFLAGS= -O1 -w-par -w-stu -w-ccc -w-rch</div><div class='del'>-!endif</div><div class='del'>-# -O2 enables full code optimization (for pre-3.0 Borland C++, use -O -G -Z).</div><div class='del'>-# -O2 is buggy in Borland OS/2 C++ revision 2.0, so use -O1 there for now.</div><div class='del'>-# If you have Borland OS/2 C++ revision 1.0, use -O or no optimization at all.</div><div class='del'>-# -mm selects medium memory model (near data, far code pointers; DOS only!)</div><div class='del'>-# -w-par suppresses warnings about unused function parameters</div><div class='del'>-# -w-stu suppresses warnings about incomplete structures</div><div class='del'>-# -w-ccc suppresses warnings about compile-time-constant conditions</div><div class='del'>-# -w-rch suppresses warnings about unreachable code</div><div class='del'>-# Generally, we recommend defining any configuration symbols in jconfig.h,</div><div class='del'>-# NOT via -D switches here.</div><div class='del'>-</div><div class='del'>-# Link-time cc options:</div><div class='del'>-!if $d(DOS)</div><div class='del'>-LDFLAGS= -mm</div><div class='del'>-# memory model option here must match CFLAGS!</div><div class='del'>-!else</div><div class='del'>-LDFLAGS=</div><div class='del'>-# -lai full-screen app</div><div class='del'>-# -lc case-significant link</div><div class='del'>-!endif</div><div class='del'>-</div><div class='del'>-# Put here the object file name for the correct system-dependent memory</div><div class='del'>-# manager file.</div><div class='del'>-# For DOS, we recommend jmemdos.c and jmemdosa.asm.</div><div class='del'>-# For OS/2, we recommend jmemnobs.c (flat memory!)</div><div class='del'>-# SYSDEPMEMLIB must list the same files with "+" signs for the librarian.</div><div class='del'>-!if $d(DOS)</div><div class='del'>-SYSDEPMEM= jmemdos.obj jmemdosa.obj</div><div class='del'>-SYSDEPMEMLIB= +jmemdos.obj +jmemdosa.obj</div><div class='del'>-!else</div><div class='del'>-SYSDEPMEM= jmemnobs.obj</div><div class='del'>-SYSDEPMEMLIB= +jmemnobs.obj</div><div class='del'>-!endif</div><div class='del'>-</div><div class='del'>-# End of configurable options.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# source files: JPEG library proper</div><div class='del'>-LIBSOURCES= jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c \</div><div class='del'>-        jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c \</div><div class='del'>-        jcomapi.c jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c \</div><div class='del'>-        jdapistd.c jdarith.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c \</div><div class='del'>-        jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c \</div><div class='del'>-        jdmerge.c jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c \</div><div class='del'>-        jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c jquant1.c \</div><div class='del'>-        jquant2.c jutils.c jmemmgr.c</div><div class='del'>-# memmgr back ends: compile only one of these into a working library</div><div class='del'>-SYSDEPSOURCES= jmemansi.c jmemname.c jmemnobs.c jmemdos.c jmemmac.c</div><div class='del'>-# source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom</div><div class='del'>-APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c \</div><div class='del'>-        rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c \</div><div class='del'>-        rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c</div><div class='del'>-SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES)</div><div class='del'>-# files included by source files</div><div class='del'>-INCLUDES= jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h jpegint.h \</div><div class='del'>-        jpeglib.h jversion.h cdjpeg.h cderror.h transupp.h</div><div class='del'>-# documentation, test, and support files</div><div class='del'>-DOCS= README install.txt usage.txt cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \</div><div class='del'>-        wrjpgcom.1 wizard.txt example.c libjpeg.txt structure.txt \</div><div class='del'>-        coderules.txt filelist.txt change.log</div><div class='del'>-MKFILES= configure Makefile.in makefile.ansi makefile.unix makefile.bcc \</div><div class='del'>-        makefile.mc6 makefile.dj makefile.wat makefile.vc makejdsw.vc6 \</div><div class='del'>-        makeadsw.vc6 makejdep.vc6 makejdsp.vc6 makejmak.vc6 makecdep.vc6 \</div><div class='del'>-        makecdsp.vc6 makecmak.vc6 makeddep.vc6 makeddsp.vc6 makedmak.vc6 \</div><div class='del'>-        maketdep.vc6 maketdsp.vc6 maketmak.vc6 makerdep.vc6 makerdsp.vc6 \</div><div class='del'>-        makermak.vc6 makewdep.vc6 makewdsp.vc6 makewmak.vc6 makejsln.vc9 \</div><div class='del'>-        makeasln.vc9 makejvcp.vc9 makecvcp.vc9 makedvcp.vc9 maketvcp.vc9 \</div><div class='del'>-        makervcp.vc9 makewvcp.vc9 makeproj.mac makcjpeg.st makdjpeg.st \</div><div class='del'>-        makljpeg.st maktjpeg.st makefile.manx makefile.sas makefile.mms \</div><div class='del'>-        makefile.vms makvms.opt</div><div class='del'>-CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat \</div><div class='del'>-        jconfig.vc jconfig.mac jconfig.st jconfig.manx jconfig.sas \</div><div class='del'>-        jconfig.vms</div><div class='del'>-CONFIGUREFILES= config.guess config.sub install-sh ltmain.sh depcomp missing</div><div class='del'>-OTHERFILES= jconfig.txt ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm \</div><div class='del'>-        libjpeg.map</div><div class='del'>-TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \</div><div class='del'>-        testimgp.jpg</div><div class='del'>-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \</div><div class='del'>-        $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)</div><div class='del'>-# library object files common to compression and decompression</div><div class='del'>-COMOBJECTS= jaricom.obj jcomapi.obj jutils.obj jerror.obj jmemmgr.obj $(SYSDEPMEM)</div><div class='del'>-# compression library object files</div><div class='del'>-CLIBOBJECTS= jcapimin.obj jcapistd.obj jcarith.obj jctrans.obj jcparam.obj \</div><div class='del'>-        jdatadst.obj jcinit.obj jcmaster.obj jcmarker.obj jcmainct.obj \</div><div class='del'>-        jcprepct.obj jccoefct.obj jccolor.obj jcsample.obj jchuff.obj \</div><div class='del'>-        jcdctmgr.obj jfdctfst.obj jfdctflt.obj jfdctint.obj</div><div class='del'>-# decompression library object files</div><div class='del'>-DLIBOBJECTS= jdapimin.obj jdapistd.obj jdarith.obj jdtrans.obj jdatasrc.obj \</div><div class='del'>-        jdmaster.obj jdinput.obj jdmarker.obj jdhuff.obj jdmainct.obj \</div><div class='del'>-        jdcoefct.obj jdpostct.obj jddctmgr.obj jidctfst.obj jidctflt.obj \</div><div class='del'>-        jidctint.obj jdsample.obj jdcolor.obj jquant1.obj jquant2.obj \</div><div class='del'>-        jdmerge.obj</div><div class='del'>-# These objectfiles are included in libjpeg.lib</div><div class='del'>-LIBOBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)</div><div class='del'>-# object files for sample applications (excluding library files)</div><div class='del'>-COBJECTS= cjpeg.obj rdppm.obj rdgif.obj rdtarga.obj rdrle.obj rdbmp.obj \</div><div class='del'>-        rdswitch.obj cdjpeg.obj</div><div class='del'>-DOBJECTS= djpeg.obj wrppm.obj wrgif.obj wrtarga.obj wrrle.obj wrbmp.obj \</div><div class='del'>-        rdcolmap.obj cdjpeg.obj</div><div class='del'>-TROBJECTS= jpegtran.obj rdswitch.obj cdjpeg.obj transupp.obj</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-all: libjpeg.lib cjpeg.exe djpeg.exe jpegtran.exe rdjpgcom.exe wrjpgcom.exe</div><div class='del'>-</div><div class='del'>-libjpeg.lib: $(LIBOBJECTS)</div><div class='del'>-	- del libjpeg.lib</div><div class='del'>-	tlib libjpeg.lib /E /C @&amp;&amp;|</div><div class='del'>-+jcapimin.obj +jcapistd.obj +jcarith.obj +jctrans.obj +jcparam.obj &amp;</div><div class='del'>-+jdatadst.obj +jcinit.obj +jcmaster.obj +jcmarker.obj +jcmainct.obj &amp;</div><div class='del'>-+jcprepct.obj +jccoefct.obj +jccolor.obj +jcsample.obj +jchuff.obj &amp;</div><div class='del'>-+jcdctmgr.obj +jfdctfst.obj +jfdctflt.obj +jfdctint.obj +jdapimin.obj &amp;</div><div class='del'>-+jdapistd.obj +jdarith.obj +jdtrans.obj +jdatasrc.obj +jdmaster.obj &amp;</div><div class='del'>-+jdinput.obj +jdmarker.obj +jdhuff.obj +jdmainct.obj +jdcoefct.obj &amp;</div><div class='del'>-+jdpostct.obj +jddctmgr.obj +jidctfst.obj +jidctflt.obj +jidctint.obj &amp;</div><div class='del'>-+jdsample.obj +jdcolor.obj +jquant1.obj +jquant2.obj +jdmerge.obj &amp;</div><div class='del'>-+jaricom.obj +jcomapi.obj +jutils.obj +jerror.obj +jmemmgr.obj &amp;</div><div class='del'>-$(SYSDEPMEMLIB)</div><div class='del'>-|</div><div class='del'>-</div><div class='del'>-cjpeg.exe: $(COBJECTS) libjpeg.lib</div><div class='del'>-	$(CC) $(LDFLAGS) -ecjpeg.exe $(COBJECTS) libjpeg.lib</div><div class='del'>-</div><div class='del'>-djpeg.exe: $(DOBJECTS) libjpeg.lib</div><div class='del'>-	$(CC) $(LDFLAGS) -edjpeg.exe $(DOBJECTS) libjpeg.lib</div><div class='del'>-</div><div class='del'>-jpegtran.exe: $(TROBJECTS) libjpeg.lib</div><div class='del'>-	$(CC) $(LDFLAGS) -ejpegtran.exe $(TROBJECTS) libjpeg.lib</div><div class='del'>-</div><div class='del'>-rdjpgcom.exe: rdjpgcom.c</div><div class='del'>-!if $d(DOS)</div><div class='del'>-	$(CC) -ms -O rdjpgcom.c</div><div class='del'>-!else</div><div class='del'>-	$(CC) $(CFLAGS) rdjpgcom.c</div><div class='del'>-!endif</div><div class='del'>-</div><div class='del'>-# On DOS, wrjpgcom needs large model so it can malloc a 64K chunk</div><div class='del'>-wrjpgcom.exe: wrjpgcom.c</div><div class='del'>-!if $d(DOS)</div><div class='del'>-	$(CC) -ml -O wrjpgcom.c</div><div class='del'>-!else</div><div class='del'>-	$(CC) $(CFLAGS) wrjpgcom.c</div><div class='del'>-!endif</div><div class='del'>-</div><div class='del'>-# This "{}" syntax allows Borland Make to "batch" source files.</div><div class='del'>-# In this way, each run of the compiler can build many modules.</div><div class='del'>-.c.obj:</div><div class='del'>-	$(CC) $(CFLAGS) -c{ $&lt;}</div><div class='del'>-</div><div class='del'>-jconfig.h: jconfig.txt</div><div class='del'>-	echo You must prepare a system-dependent jconfig.h file.</div><div class='del'>-	echo Please read the installation directions in install.txt.</div><div class='del'>-	exit 1</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	- del *.obj</div><div class='del'>-	- del libjpeg.lib</div><div class='del'>-	- del cjpeg.exe</div><div class='del'>-	- del djpeg.exe</div><div class='del'>-	- del jpegtran.exe</div><div class='del'>-	- del rdjpgcom.exe</div><div class='del'>-	- del wrjpgcom.exe</div><div class='del'>-	- del testout*.*</div><div class='del'>-</div><div class='del'>-test: cjpeg.exe djpeg.exe jpegtran.exe</div><div class='del'>-	- del testout*.*</div><div class='del'>-	djpeg -dct int -ppm -outfile testout.ppm  testorig.jpg</div><div class='del'>-	djpeg -dct int -bmp -colors 256 -outfile testout.bmp  testorig.jpg</div><div class='del'>-	cjpeg -dct int -outfile testout.jpg  testimg.ppm</div><div class='del'>-	djpeg -dct int -ppm -outfile testoutp.ppm testprog.jpg</div><div class='del'>-	cjpeg -dct int -progressive -opt -outfile testoutp.jpg testimg.ppm</div><div class='del'>-	jpegtran -outfile testoutt.jpg testprog.jpg</div><div class='del'>-!if $d(DOS)</div><div class='del'>-	fc /b testimg.ppm testout.ppm</div><div class='del'>-	fc /b testimg.bmp testout.bmp</div><div class='del'>-	fc /b testimg.jpg testout.jpg</div><div class='del'>-	fc /b testimg.ppm testoutp.ppm</div><div class='del'>-	fc /b testimgp.jpg testoutp.jpg</div><div class='del'>-	fc /b testorig.jpg testoutt.jpg</div><div class='del'>-!else</div><div class='del'>-	echo n &gt; n.tmp</div><div class='del'>-	comp testimg.ppm testout.ppm &lt; n.tmp</div><div class='del'>-	comp testimg.bmp testout.bmp &lt; n.tmp</div><div class='del'>-	comp testimg.jpg testout.jpg &lt; n.tmp</div><div class='del'>-	comp testimg.ppm testoutp.ppm &lt; n.tmp</div><div class='del'>-	comp testimgp.jpg testoutp.jpg &lt; n.tmp</div><div class='del'>-	comp testorig.jpg testoutt.jpg &lt; n.tmp</div><div class='del'>-	del n.tmp</div><div class='del'>-!endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-jaricom.obj: jaricom.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapimin.obj: jcapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapistd.obj: jcapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcarith.obj: jcarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccoefct.obj: jccoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccolor.obj: jccolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcdctmgr.obj: jcdctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jchuff.obj: jchuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcinit.obj: jcinit.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmainct.obj: jcmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmarker.obj: jcmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmaster.obj: jcmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcomapi.obj: jcomapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcparam.obj: jcparam.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcprepct.obj: jcprepct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcsample.obj: jcsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jctrans.obj: jctrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapimin.obj: jdapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapistd.obj: jdapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdarith.obj: jdarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdatadst.obj: jdatadst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdatasrc.obj: jdatasrc.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdcoefct.obj: jdcoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdcolor.obj: jdcolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jddctmgr.obj: jddctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jdhuff.obj: jdhuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdinput.obj: jdinput.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmainct.obj: jdmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmarker.obj: jdmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmaster.obj: jdmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmerge.obj: jdmerge.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdpostct.obj: jdpostct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdsample.obj: jdsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdtrans.obj: jdtrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jerror.obj: jerror.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jversion.h jerror.h</div><div class='del'>-jfdctflt.obj: jfdctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctfst.obj: jfdctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctint.obj: jfdctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctflt.obj: jidctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctfst.obj: jidctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctint.obj: jidctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jquant1.obj: jquant1.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jquant2.obj: jquant2.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jutils.obj: jutils.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jmemmgr.obj: jmemmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemansi.obj: jmemansi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemname.obj: jmemname.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemnobs.obj: jmemnobs.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemdos.obj: jmemdos.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemmac.obj: jmemmac.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-cjpeg.obj: cjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-djpeg.obj: djpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-jpegtran.obj: jpegtran.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h transupp.h jversion.h</div><div class='del'>-rdjpgcom.obj: rdjpgcom.c jinclude.h jconfig.h</div><div class='del'>-wrjpgcom.obj: wrjpgcom.c jinclude.h jconfig.h</div><div class='del'>-cdjpeg.obj: cdjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdcolmap.obj: rdcolmap.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdswitch.obj: rdswitch.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-transupp.obj: transupp.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h transupp.h</div><div class='del'>-rdppm.obj: rdppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrppm.obj: wrppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdgif.obj: rdgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrgif.obj: wrgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdtarga.obj: rdtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrtarga.obj: wrtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdbmp.obj: rdbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrbmp.obj: wrbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdrle.obj: rdrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrrle.obj: wrrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-jmemdosa.obj: jmemdosa.asm</div><div class='del'>-	tasm /mx jmemdosa.asm</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makefile.dj b/src/3rdparty/libjpeg/makefile.dj<br/>deleted file mode 100644<br/>index 14d0ee6..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makefile.dj?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.dj</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,226 +0,0 @@</div><div class='del'>-# Makefile for Independent JPEG Group's software</div><div class='del'>-</div><div class='del'>-# This makefile is for DJGPP (Delorie's GNU C port on MS-DOS), v2.0 or later.</div><div class='del'>-# Thanks to Frank J. Donahoe for this version.</div><div class='del'>-</div><div class='del'>-# Read installation instructions before saying "make" !!</div><div class='del'>-</div><div class='del'>-# The name of your C compiler:</div><div class='del'>-CC= gcc</div><div class='del'>-</div><div class='del'>-# You may need to adjust these cc options:</div><div class='del'>-CFLAGS= -O2 -Wall -I.</div><div class='del'>-# Generally, we recommend defining any configuration symbols in jconfig.h,</div><div class='del'>-# NOT via -D switches here.</div><div class='del'>-</div><div class='del'>-# Link-time cc options:</div><div class='del'>-LDFLAGS= -s</div><div class='del'>-</div><div class='del'>-# To link any special libraries, add the necessary -l commands here.</div><div class='del'>-LDLIBS= </div><div class='del'>-</div><div class='del'>-# Put here the object file name for the correct system-dependent memory</div><div class='del'>-# manager file.  For DJGPP this is usually jmemnobs.o, but you could</div><div class='del'>-# use jmemname.o if you want to use named temp files instead of swap space.</div><div class='del'>-SYSDEPMEM= jmemnobs.o</div><div class='del'>-</div><div class='del'>-# miscellaneous OS-dependent stuff</div><div class='del'>-# linker</div><div class='del'>-LN= $(CC)</div><div class='del'>-# file deletion command</div><div class='del'>-RM= del</div><div class='del'>-# library (.a) file creation command</div><div class='del'>-AR= ar rc</div><div class='del'>-# second step in .a creation (use "touch" if not needed)</div><div class='del'>-AR2= ranlib</div><div class='del'>-</div><div class='del'>-# End of configurable options.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# source files: JPEG library proper</div><div class='del'>-LIBSOURCES= jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c \</div><div class='del'>-        jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c \</div><div class='del'>-        jcomapi.c jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c \</div><div class='del'>-        jdapistd.c jdarith.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c \</div><div class='del'>-        jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c \</div><div class='del'>-        jdmerge.c jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c \</div><div class='del'>-        jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c jquant1.c \</div><div class='del'>-        jquant2.c jutils.c jmemmgr.c</div><div class='del'>-# memmgr back ends: compile only one of these into a working library</div><div class='del'>-SYSDEPSOURCES= jmemansi.c jmemname.c jmemnobs.c jmemdos.c jmemmac.c</div><div class='del'>-# source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom</div><div class='del'>-APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c \</div><div class='del'>-        rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c \</div><div class='del'>-        rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c</div><div class='del'>-SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES)</div><div class='del'>-# files included by source files</div><div class='del'>-INCLUDES= jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h jpegint.h \</div><div class='del'>-        jpeglib.h jversion.h cdjpeg.h cderror.h transupp.h</div><div class='del'>-# documentation, test, and support files</div><div class='del'>-DOCS= README install.txt usage.txt cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \</div><div class='del'>-        wrjpgcom.1 wizard.txt example.c libjpeg.txt structure.txt \</div><div class='del'>-        coderules.txt filelist.txt change.log</div><div class='del'>-MKFILES= configure Makefile.in makefile.ansi makefile.unix makefile.bcc \</div><div class='del'>-        makefile.mc6 makefile.dj makefile.wat makefile.vc makejdsw.vc6 \</div><div class='del'>-        makeadsw.vc6 makejdep.vc6 makejdsp.vc6 makejmak.vc6 makecdep.vc6 \</div><div class='del'>-        makecdsp.vc6 makecmak.vc6 makeddep.vc6 makeddsp.vc6 makedmak.vc6 \</div><div class='del'>-        maketdep.vc6 maketdsp.vc6 maketmak.vc6 makerdep.vc6 makerdsp.vc6 \</div><div class='del'>-        makermak.vc6 makewdep.vc6 makewdsp.vc6 makewmak.vc6 makejsln.vc9 \</div><div class='del'>-        makeasln.vc9 makejvcp.vc9 makecvcp.vc9 makedvcp.vc9 maketvcp.vc9 \</div><div class='del'>-        makervcp.vc9 makewvcp.vc9 makeproj.mac makcjpeg.st makdjpeg.st \</div><div class='del'>-        makljpeg.st maktjpeg.st makefile.manx makefile.sas makefile.mms \</div><div class='del'>-        makefile.vms makvms.opt</div><div class='del'>-CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat \</div><div class='del'>-        jconfig.vc jconfig.mac jconfig.st jconfig.manx jconfig.sas \</div><div class='del'>-        jconfig.vms</div><div class='del'>-CONFIGUREFILES= config.guess config.sub install-sh ltmain.sh depcomp missing</div><div class='del'>-OTHERFILES= jconfig.txt ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm \</div><div class='del'>-        libjpeg.map</div><div class='del'>-TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \</div><div class='del'>-        testimgp.jpg</div><div class='del'>-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \</div><div class='del'>-        $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)</div><div class='del'>-# library object files common to compression and decompression</div><div class='del'>-COMOBJECTS= jaricom.o jcomapi.o jutils.o jerror.o jmemmgr.o $(SYSDEPMEM)</div><div class='del'>-# compression library object files</div><div class='del'>-CLIBOBJECTS= jcapimin.o jcapistd.o jcarith.o jctrans.o jcparam.o \</div><div class='del'>-        jdatadst.o jcinit.o jcmaster.o jcmarker.o jcmainct.o jcprepct.o \</div><div class='del'>-        jccoefct.o jccolor.o jcsample.o jchuff.o jcdctmgr.o jfdctfst.o \</div><div class='del'>-        jfdctflt.o jfdctint.o</div><div class='del'>-# decompression library object files</div><div class='del'>-DLIBOBJECTS= jdapimin.o jdapistd.o jdarith.o jdtrans.o jdatasrc.o \</div><div class='del'>-        jdmaster.o jdinput.o jdmarker.o jdhuff.o jdmainct.o \</div><div class='del'>-        jdcoefct.o jdpostct.o jddctmgr.o jidctfst.o jidctflt.o \</div><div class='del'>-        jidctint.o jdsample.o jdcolor.o jquant1.o jquant2.o jdmerge.o</div><div class='del'>-# These objectfiles are included in libjpeg.a</div><div class='del'>-LIBOBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)</div><div class='del'>-# object files for sample applications (excluding library files)</div><div class='del'>-COBJECTS= cjpeg.o rdppm.o rdgif.o rdtarga.o rdrle.o rdbmp.o rdswitch.o \</div><div class='del'>-        cdjpeg.o</div><div class='del'>-DOBJECTS= djpeg.o wrppm.o wrgif.o wrtarga.o wrrle.o wrbmp.o rdcolmap.o \</div><div class='del'>-        cdjpeg.o</div><div class='del'>-TROBJECTS= jpegtran.o rdswitch.o cdjpeg.o transupp.o</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-all: libjpeg.a cjpeg.exe djpeg.exe jpegtran.exe rdjpgcom.exe wrjpgcom.exe</div><div class='del'>-</div><div class='del'>-libjpeg.a: $(LIBOBJECTS)</div><div class='del'>-	$(RM) libjpeg.a</div><div class='del'>-	$(AR) libjpeg.a  $(LIBOBJECTS)</div><div class='del'>-	$(AR2) libjpeg.a</div><div class='del'>-</div><div class='del'>-cjpeg.exe: $(COBJECTS) libjpeg.a</div><div class='del'>-	$(LN) $(LDFLAGS) -o cjpeg.exe $(COBJECTS) libjpeg.a $(LDLIBS)</div><div class='del'>-</div><div class='del'>-djpeg.exe: $(DOBJECTS) libjpeg.a</div><div class='del'>-	$(LN) $(LDFLAGS) -o djpeg.exe $(DOBJECTS) libjpeg.a $(LDLIBS)</div><div class='del'>-</div><div class='del'>-jpegtran.exe: $(TROBJECTS) libjpeg.a</div><div class='del'>-	$(LN) $(LDFLAGS) -o jpegtran.exe $(TROBJECTS) libjpeg.a $(LDLIBS)</div><div class='del'>-</div><div class='del'>-rdjpgcom.exe: rdjpgcom.o</div><div class='del'>-	$(LN) $(LDFLAGS) -o rdjpgcom.exe rdjpgcom.o $(LDLIBS)</div><div class='del'>-</div><div class='del'>-wrjpgcom.exe: wrjpgcom.o</div><div class='del'>-	$(LN) $(LDFLAGS) -o wrjpgcom.exe wrjpgcom.o $(LDLIBS)</div><div class='del'>-</div><div class='del'>-jconfig.h: jconfig.txt</div><div class='del'>-	echo You must prepare a system-dependent jconfig.h file.</div><div class='del'>-	echo Please read the installation directions in install.txt.</div><div class='del'>-	exit 1</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM) *.o</div><div class='del'>-	$(RM) cjpeg.exe</div><div class='del'>-	$(RM) djpeg.exe</div><div class='del'>-	$(RM) jpegtran.exe</div><div class='del'>-	$(RM) rdjpgcom.exe</div><div class='del'>-	$(RM) wrjpgcom.exe</div><div class='del'>-	$(RM) libjpeg.a</div><div class='del'>-	$(RM) testout*.*</div><div class='del'>-</div><div class='del'>-test: cjpeg.exe djpeg.exe jpegtran.exe</div><div class='del'>-	$(RM) testout*.*</div><div class='del'>-	./djpeg -dct int -ppm -outfile testout.ppm  testorig.jpg</div><div class='del'>-	./djpeg -dct int -bmp -colors 256 -outfile testout.bmp  testorig.jpg</div><div class='del'>-	./cjpeg -dct int -outfile testout.jpg  testimg.ppm</div><div class='del'>-	./djpeg -dct int -ppm -outfile testoutp.ppm testprog.jpg</div><div class='del'>-	./cjpeg -dct int -progressive -opt -outfile testoutp.jpg testimg.ppm</div><div class='del'>-	./jpegtran -outfile testoutt.jpg testprog.jpg</div><div class='del'>-	fc /b testimg.ppm testout.ppm</div><div class='del'>-	fc /b testimg.bmp testout.bmp</div><div class='del'>-	fc /b testimg.jpg testout.jpg</div><div class='del'>-	fc /b testimg.ppm testoutp.ppm</div><div class='del'>-	fc /b testimgp.jpg testoutp.jpg</div><div class='del'>-	fc /b testorig.jpg testoutt.jpg</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-jaricom.o: jaricom.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapimin.o: jcapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapistd.o: jcapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcarith.o: jcarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccoefct.o: jccoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccolor.o: jccolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcdctmgr.o: jcdctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jchuff.o: jchuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcinit.o: jcinit.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmainct.o: jcmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmarker.o: jcmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmaster.o: jcmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcomapi.o: jcomapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcparam.o: jcparam.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcprepct.o: jcprepct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcsample.o: jcsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jctrans.o: jctrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapimin.o: jdapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapistd.o: jdapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdarith.o: jdarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdatadst.o: jdatadst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdatasrc.o: jdatasrc.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdcoefct.o: jdcoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdcolor.o: jdcolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jddctmgr.o: jddctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jdhuff.o: jdhuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdinput.o: jdinput.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmainct.o: jdmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmarker.o: jdmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmaster.o: jdmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmerge.o: jdmerge.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdpostct.o: jdpostct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdsample.o: jdsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdtrans.o: jdtrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jerror.o: jerror.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jversion.h jerror.h</div><div class='del'>-jfdctflt.o: jfdctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctfst.o: jfdctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctint.o: jfdctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctflt.o: jidctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctfst.o: jidctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctint.o: jidctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jquant1.o: jquant1.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jquant2.o: jquant2.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jutils.o: jutils.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jmemmgr.o: jmemmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemansi.o: jmemansi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemname.o: jmemname.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemnobs.o: jmemnobs.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemdos.o: jmemdos.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemmac.o: jmemmac.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-cjpeg.o: cjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-djpeg.o: djpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-jpegtran.o: jpegtran.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h transupp.h jversion.h</div><div class='del'>-rdjpgcom.o: rdjpgcom.c jinclude.h jconfig.h</div><div class='del'>-wrjpgcom.o: wrjpgcom.c jinclude.h jconfig.h</div><div class='del'>-cdjpeg.o: cdjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdcolmap.o: rdcolmap.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdswitch.o: rdswitch.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-transupp.o: transupp.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h transupp.h</div><div class='del'>-rdppm.o: rdppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrppm.o: wrppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdgif.o: rdgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrgif.o: wrgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdtarga.o: rdtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrtarga.o: wrtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdbmp.o: rdbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrbmp.o: wrbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdrle.o: rdrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrrle.o: wrrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makefile.manx b/src/3rdparty/libjpeg/makefile.manx<br/>deleted file mode 100644<br/>index d1af57c..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makefile.manx?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.manx</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,220 +0,0 @@</div><div class='del'>-# Makefile for Independent JPEG Group's software</div><div class='del'>-</div><div class='del'>-# This makefile is for Amiga systems using Manx Aztec C ver 5.x.</div><div class='del'>-# Thanks to D.J. James (djjames@cup.portal.com) for this version.</div><div class='del'>-</div><div class='del'>-# Read installation instructions before saying "make" !!</div><div class='del'>-</div><div class='del'>-# The name of your C compiler:</div><div class='del'>-CC= cc</div><div class='del'>-</div><div class='del'>-# You may need to adjust these cc options:</div><div class='del'>-# Uncomment for generic 68000 code (will work on any Amiga)</div><div class='del'>-ARCHFLAGS= -sn</div><div class='del'>-</div><div class='del'>-# Uncomment for 68020/68030 code (faster, but won't run on 68000 CPU)</div><div class='del'>-#ARCHFLAGS= -c2</div><div class='del'>-</div><div class='del'>-CFLAGS= -MC -MD $(ARCHFLAGS) -spfam -r4</div><div class='del'>-</div><div class='del'>-# Link-time cc options:</div><div class='del'>-LDFLAGS= -g</div><div class='del'>-</div><div class='del'>-# To link any special libraries, add the necessary -l commands here.</div><div class='del'>-LDLIBS= -lml -lcl</div><div class='del'>-</div><div class='del'>-# Put here the object file name for the correct system-dependent memory</div><div class='del'>-# manager file.  For Amiga we recommend jmemname.o.</div><div class='del'>-SYSDEPMEM= jmemname.o</div><div class='del'>-</div><div class='del'>-# miscellaneous OS-dependent stuff</div><div class='del'>-# linker</div><div class='del'>-LN= ln</div><div class='del'>-# file deletion command</div><div class='del'>-RM= delete quiet</div><div class='del'>-# library (.lib) file creation command</div><div class='del'>-AR= lb</div><div class='del'>-</div><div class='del'>-# End of configurable options.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# source files: JPEG library proper</div><div class='del'>-LIBSOURCES= jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c \</div><div class='del'>-        jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c \</div><div class='del'>-        jcomapi.c jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c \</div><div class='del'>-        jdapistd.c jdarith.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c \</div><div class='del'>-        jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c \</div><div class='del'>-        jdmerge.c jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c \</div><div class='del'>-        jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c jquant1.c \</div><div class='del'>-        jquant2.c jutils.c jmemmgr.c</div><div class='del'>-# memmgr back ends: compile only one of these into a working library</div><div class='del'>-SYSDEPSOURCES= jmemansi.c jmemname.c jmemnobs.c jmemdos.c jmemmac.c</div><div class='del'>-# source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom</div><div class='del'>-APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c \</div><div class='del'>-        rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c \</div><div class='del'>-        rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c</div><div class='del'>-SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES)</div><div class='del'>-# files included by source files</div><div class='del'>-INCLUDES= jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h jpegint.h \</div><div class='del'>-        jpeglib.h jversion.h cdjpeg.h cderror.h transupp.h</div><div class='del'>-# documentation, test, and support files</div><div class='del'>-DOCS= README install.txt usage.txt cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \</div><div class='del'>-        wrjpgcom.1 wizard.txt example.c libjpeg.txt structure.txt \</div><div class='del'>-        coderules.txt filelist.txt change.log</div><div class='del'>-MKFILES= configure Makefile.in makefile.ansi makefile.unix makefile.bcc \</div><div class='del'>-        makefile.mc6 makefile.dj makefile.wat makefile.vc makejdsw.vc6 \</div><div class='del'>-        makeadsw.vc6 makejdep.vc6 makejdsp.vc6 makejmak.vc6 makecdep.vc6 \</div><div class='del'>-        makecdsp.vc6 makecmak.vc6 makeddep.vc6 makeddsp.vc6 makedmak.vc6 \</div><div class='del'>-        maketdep.vc6 maketdsp.vc6 maketmak.vc6 makerdep.vc6 makerdsp.vc6 \</div><div class='del'>-        makermak.vc6 makewdep.vc6 makewdsp.vc6 makewmak.vc6 makejsln.vc9 \</div><div class='del'>-        makeasln.vc9 makejvcp.vc9 makecvcp.vc9 makedvcp.vc9 maketvcp.vc9 \</div><div class='del'>-        makervcp.vc9 makewvcp.vc9 makeproj.mac makcjpeg.st makdjpeg.st \</div><div class='del'>-        makljpeg.st maktjpeg.st makefile.manx makefile.sas makefile.mms \</div><div class='del'>-        makefile.vms makvms.opt</div><div class='del'>-CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat \</div><div class='del'>-        jconfig.vc jconfig.mac jconfig.st jconfig.manx jconfig.sas \</div><div class='del'>-        jconfig.vms</div><div class='del'>-CONFIGUREFILES= config.guess config.sub install-sh ltmain.sh depcomp missing</div><div class='del'>-OTHERFILES= jconfig.txt ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm \</div><div class='del'>-        libjpeg.map</div><div class='del'>-TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \</div><div class='del'>-        testimgp.jpg</div><div class='del'>-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \</div><div class='del'>-        $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)</div><div class='del'>-# library object files common to compression and decompression</div><div class='del'>-COMOBJECTS= jaricom.o jcomapi.o jutils.o jerror.o jmemmgr.o $(SYSDEPMEM)</div><div class='del'>-# compression library object files</div><div class='del'>-CLIBOBJECTS= jcapimin.o jcapistd.o jcarith.o jctrans.o jcparam.o \</div><div class='del'>-        jdatadst.o jcinit.o jcmaster.o jcmarker.o jcmainct.o jcprepct.o \</div><div class='del'>-        jccoefct.o jccolor.o jcsample.o jchuff.o jcdctmgr.o jfdctfst.o \</div><div class='del'>-        jfdctflt.o jfdctint.o</div><div class='del'>-# decompression library object files</div><div class='del'>-DLIBOBJECTS= jdapimin.o jdapistd.o jdarith.o jdtrans.o jdatasrc.o \</div><div class='del'>-        jdmaster.o jdinput.o jdmarker.o jdhuff.o jdmainct.o \</div><div class='del'>-        jdcoefct.o jdpostct.o jddctmgr.o jidctfst.o jidctflt.o \</div><div class='del'>-        jidctint.o jdsample.o jdcolor.o jquant1.o jquant2.o jdmerge.o</div><div class='del'>-# These objectfiles are included in libjpeg.lib</div><div class='del'>-LIBOBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)</div><div class='del'>-# object files for sample applications (excluding library files)</div><div class='del'>-COBJECTS= cjpeg.o rdppm.o rdgif.o rdtarga.o rdrle.o rdbmp.o rdswitch.o \</div><div class='del'>-        cdjpeg.o</div><div class='del'>-DOBJECTS= djpeg.o wrppm.o wrgif.o wrtarga.o wrrle.o wrbmp.o rdcolmap.o \</div><div class='del'>-        cdjpeg.o</div><div class='del'>-TROBJECTS= jpegtran.o rdswitch.o cdjpeg.o transupp.o</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-all: libjpeg.lib cjpeg djpeg jpegtran rdjpgcom wrjpgcom</div><div class='del'>-</div><div class='del'>-libjpeg.lib: $(LIBOBJECTS)</div><div class='del'>-	-$(RM) libjpeg.lib</div><div class='del'>-	$(AR) libjpeg.lib  $(LIBOBJECTS)</div><div class='del'>-</div><div class='del'>-cjpeg: $(COBJECTS) libjpeg.lib</div><div class='del'>-	$(LN) $(LDFLAGS) -o cjpeg $(COBJECTS) libjpeg.lib $(LDLIBS)</div><div class='del'>-</div><div class='del'>-djpeg: $(DOBJECTS) libjpeg.lib</div><div class='del'>-	$(LN) $(LDFLAGS) -o djpeg $(DOBJECTS) libjpeg.lib $(LDLIBS)</div><div class='del'>-</div><div class='del'>-jpegtran: $(TROBJECTS) libjpeg.lib</div><div class='del'>-	$(LN) $(LDFLAGS) -o jpegtran $(TROBJECTS) libjpeg.lib $(LDLIBS)</div><div class='del'>-</div><div class='del'>-rdjpgcom: rdjpgcom.o</div><div class='del'>-	$(LN) $(LDFLAGS) -o rdjpgcom rdjpgcom.o $(LDLIBS)</div><div class='del'>-</div><div class='del'>-wrjpgcom: wrjpgcom.o</div><div class='del'>-	$(LN) $(LDFLAGS) -o wrjpgcom wrjpgcom.o $(LDLIBS)</div><div class='del'>-</div><div class='del'>-jconfig.h: jconfig.txt</div><div class='del'>-	echo You must prepare a system-dependent jconfig.h file.</div><div class='del'>-	echo Please read the installation directions in install.txt.</div><div class='del'>-	exit 1</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	-$(RM) *.o cjpeg djpeg jpegtran libjpeg.lib rdjpgcom wrjpgcom</div><div class='del'>-	-$(RM) core testout*.*</div><div class='del'>-</div><div class='del'>-test: cjpeg djpeg jpegtran</div><div class='del'>-	-$(RM) testout*.*</div><div class='del'>-	djpeg -dct int -ppm -outfile testout.ppm  testorig.jpg</div><div class='del'>-	djpeg -dct int -bmp -colors 256 -outfile testout.bmp  testorig.jpg</div><div class='del'>-	cjpeg -dct int -outfile testout.jpg  testimg.ppm</div><div class='del'>-	djpeg -dct int -ppm -outfile testoutp.ppm testprog.jpg</div><div class='del'>-	cjpeg -dct int -progressive -opt -outfile testoutp.jpg testimg.ppm</div><div class='del'>-	jpegtran -outfile testoutt.jpg testprog.jpg</div><div class='del'>-	cmp testimg.ppm testout.ppm</div><div class='del'>-	cmp testimg.bmp testout.bmp</div><div class='del'>-	cmp testimg.jpg testout.jpg</div><div class='del'>-	cmp testimg.ppm testoutp.ppm</div><div class='del'>-	cmp testimgp.jpg testoutp.jpg</div><div class='del'>-	cmp testorig.jpg testoutt.jpg</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-jaricom.o: jaricom.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapimin.o: jcapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapistd.o: jcapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcarith.o: jcarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccoefct.o: jccoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccolor.o: jccolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcdctmgr.o: jcdctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jchuff.o: jchuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcinit.o: jcinit.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmainct.o: jcmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmarker.o: jcmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmaster.o: jcmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcomapi.o: jcomapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcparam.o: jcparam.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcprepct.o: jcprepct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcsample.o: jcsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jctrans.o: jctrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapimin.o: jdapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapistd.o: jdapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdarith.o: jdarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdatadst.o: jdatadst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdatasrc.o: jdatasrc.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdcoefct.o: jdcoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdcolor.o: jdcolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jddctmgr.o: jddctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jdhuff.o: jdhuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdinput.o: jdinput.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmainct.o: jdmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmarker.o: jdmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmaster.o: jdmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmerge.o: jdmerge.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdpostct.o: jdpostct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdsample.o: jdsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdtrans.o: jdtrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jerror.o: jerror.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jversion.h jerror.h</div><div class='del'>-jfdctflt.o: jfdctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctfst.o: jfdctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctint.o: jfdctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctflt.o: jidctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctfst.o: jidctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctint.o: jidctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jquant1.o: jquant1.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jquant2.o: jquant2.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jutils.o: jutils.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jmemmgr.o: jmemmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemansi.o: jmemansi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemname.o: jmemname.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemnobs.o: jmemnobs.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemdos.o: jmemdos.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemmac.o: jmemmac.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-cjpeg.o: cjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-djpeg.o: djpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-jpegtran.o: jpegtran.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h transupp.h jversion.h</div><div class='del'>-rdjpgcom.o: rdjpgcom.c jinclude.h jconfig.h</div><div class='del'>-wrjpgcom.o: wrjpgcom.c jinclude.h jconfig.h</div><div class='del'>-cdjpeg.o: cdjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdcolmap.o: rdcolmap.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdswitch.o: rdswitch.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-transupp.o: transupp.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h transupp.h</div><div class='del'>-rdppm.o: rdppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrppm.o: wrppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdgif.o: rdgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrgif.o: wrgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdtarga.o: rdtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrtarga.o: wrtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdbmp.o: rdbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrbmp.o: wrbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdrle.o: rdrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrrle.o: wrrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makefile.mc6 b/src/3rdparty/libjpeg/makefile.mc6<br/>deleted file mode 100644<br/>index 2e0c747..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makefile.mc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.mc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,255 +0,0 @@</div><div class='del'>-# Makefile for Independent JPEG Group's software</div><div class='del'>-</div><div class='del'>-# This makefile is for Microsoft C for MS-DOS, version 6.00A and up.</div><div class='del'>-# Use NMAKE, not Microsoft's brain-damaged MAKE.</div><div class='del'>-# Thanks to Alan Wright and Chris Turner of Olivetti Research Ltd.</div><div class='del'>-</div><div class='del'>-# Read installation instructions before saying "nmake" !!</div><div class='del'>-</div><div class='del'>-# You may need to adjust these compiler options:</div><div class='del'>-CFLAGS = -AM -Oecigt -Gs -W3</div><div class='del'>-# -AM medium memory model (or use -AS for small model, if you remove features)</div><div class='del'>-# -Oecigt -Gs  maximum safe optimisation (-Ol has bugs in MSC 6.00A)</div><div class='del'>-# -W3 warning level 3</div><div class='del'>-# You might also want to add -G2 if you have an 80286, etc.</div><div class='del'>-# Generally, we recommend defining any configuration symbols in jconfig.h,</div><div class='del'>-# NOT via -D switches here.</div><div class='del'>-</div><div class='del'>-# Jan-Herman Buining suggests the following switches for MS C 8.0 and a 486:</div><div class='del'>-# CFLAGS = /AM /f- /FPi87 /G3 /Gs /Gy /Ob1 /Oc /Oe /Og /Oi /Ol /On /Oo /Ot \</div><div class='del'>-#          /OV4 /W3</div><div class='del'>-# except for jquant1.c, which must be compiled with /Oo- to avoid a compiler</div><div class='del'>-# crash.</div><div class='del'>-</div><div class='del'>-# Ingar Steinsland suggests the following switches when building</div><div class='del'>-# a 16-bit Windows DLL:</div><div class='del'>-# CFLAGS = -ALw -Gsw -Zpe -W3 -O2 -Zi -Zd</div><div class='del'>-</div><div class='del'>-# Put here the object file name for the correct system-dependent memory</div><div class='del'>-# manager file.  For DOS, we recommend jmemdos.c and jmemdosa.asm.</div><div class='del'>-# (But not for Windows; see install.txt if you use this makefile for Windows.)</div><div class='del'>-SYSDEPMEM= jmemdos.obj jmemdosa.obj</div><div class='del'>-# SYSDEPMEMLIB must list the same files with "+" signs for the librarian.</div><div class='del'>-SYSDEPMEMLIB= +jmemdos.obj +jmemdosa.obj</div><div class='del'>-</div><div class='del'>-# End of configurable options.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# source files: JPEG library proper</div><div class='del'>-LIBSOURCES= jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c \</div><div class='del'>-        jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c \</div><div class='del'>-        jcomapi.c jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c \</div><div class='del'>-        jdapistd.c jdarith.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c \</div><div class='del'>-        jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c \</div><div class='del'>-        jdmerge.c jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c \</div><div class='del'>-        jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c jquant1.c \</div><div class='del'>-        jquant2.c jutils.c jmemmgr.c</div><div class='del'>-# memmgr back ends: compile only one of these into a working library</div><div class='del'>-SYSDEPSOURCES= jmemansi.c jmemname.c jmemnobs.c jmemdos.c jmemmac.c</div><div class='del'>-# source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom</div><div class='del'>-APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c \</div><div class='del'>-        rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c \</div><div class='del'>-        rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c</div><div class='del'>-SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES)</div><div class='del'>-# files included by source files</div><div class='del'>-INCLUDES= jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h jpegint.h \</div><div class='del'>-        jpeglib.h jversion.h cdjpeg.h cderror.h transupp.h</div><div class='del'>-# documentation, test, and support files</div><div class='del'>-DOCS= README install.txt usage.txt cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \</div><div class='del'>-        wrjpgcom.1 wizard.txt example.c libjpeg.txt structure.txt \</div><div class='del'>-        coderules.txt filelist.txt change.log</div><div class='del'>-MKFILES= configure Makefile.in makefile.ansi makefile.unix makefile.bcc \</div><div class='del'>-        makefile.mc6 makefile.dj makefile.wat makefile.vc makejdsw.vc6 \</div><div class='del'>-        makeadsw.vc6 makejdep.vc6 makejdsp.vc6 makejmak.vc6 makecdep.vc6 \</div><div class='del'>-        makecdsp.vc6 makecmak.vc6 makeddep.vc6 makeddsp.vc6 makedmak.vc6 \</div><div class='del'>-        maketdep.vc6 maketdsp.vc6 maketmak.vc6 makerdep.vc6 makerdsp.vc6 \</div><div class='del'>-        makermak.vc6 makewdep.vc6 makewdsp.vc6 makewmak.vc6 makejsln.vc9 \</div><div class='del'>-        makeasln.vc9 makejvcp.vc9 makecvcp.vc9 makedvcp.vc9 maketvcp.vc9 \</div><div class='del'>-        makervcp.vc9 makewvcp.vc9 makeproj.mac makcjpeg.st makdjpeg.st \</div><div class='del'>-        makljpeg.st maktjpeg.st makefile.manx makefile.sas makefile.mms \</div><div class='del'>-        makefile.vms makvms.opt</div><div class='del'>-CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat \</div><div class='del'>-        jconfig.vc jconfig.mac jconfig.st jconfig.manx jconfig.sas \</div><div class='del'>-        jconfig.vms</div><div class='del'>-CONFIGUREFILES= config.guess config.sub install-sh ltmain.sh depcomp missing</div><div class='del'>-OTHERFILES= jconfig.txt ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm \</div><div class='del'>-        libjpeg.map</div><div class='del'>-TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \</div><div class='del'>-        testimgp.jpg</div><div class='del'>-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \</div><div class='del'>-        $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)</div><div class='del'>-# library object files common to compression and decompression</div><div class='del'>-COMOBJECTS= jaricom.obj jcomapi.obj jutils.obj jerror.obj jmemmgr.obj $(SYSDEPMEM)</div><div class='del'>-# compression library object files</div><div class='del'>-CLIBOBJECTS= jcapimin.obj jcapistd.obj jcarith.obj jctrans.obj jcparam.obj \</div><div class='del'>-        jdatadst.obj jcinit.obj jcmaster.obj jcmarker.obj jcmainct.obj \</div><div class='del'>-        jcprepct.obj jccoefct.obj jccolor.obj jcsample.obj jchuff.obj \</div><div class='del'>-        jcdctmgr.obj jfdctfst.obj jfdctflt.obj jfdctint.obj</div><div class='del'>-# decompression library object files</div><div class='del'>-DLIBOBJECTS= jdapimin.obj jdapistd.obj jdarith.obj jdtrans.obj jdatasrc.obj \</div><div class='del'>-        jdmaster.obj jdinput.obj jdmarker.obj jdhuff.obj jdmainct.obj \</div><div class='del'>-        jdcoefct.obj jdpostct.obj jddctmgr.obj jidctfst.obj jidctflt.obj \</div><div class='del'>-        jidctint.obj jdsample.obj jdcolor.obj jquant1.obj jquant2.obj \</div><div class='del'>-        jdmerge.obj</div><div class='del'>-# These objectfiles are included in libjpeg.lib</div><div class='del'>-LIBOBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)</div><div class='del'>-# object files for sample applications (excluding library files)</div><div class='del'>-COBJECTS= cjpeg.obj rdppm.obj rdgif.obj rdtarga.obj rdrle.obj rdbmp.obj \</div><div class='del'>-        rdswitch.obj cdjpeg.obj</div><div class='del'>-DOBJECTS= djpeg.obj wrppm.obj wrgif.obj wrtarga.obj wrrle.obj wrbmp.obj \</div><div class='del'>-        rdcolmap.obj cdjpeg.obj</div><div class='del'>-TROBJECTS= jpegtran.obj rdswitch.obj cdjpeg.obj transupp.obj</div><div class='del'>-</div><div class='del'>-# need linker response file because file list &gt; 128 chars</div><div class='del'>-RFILE = libjpeg.ans</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-all: libjpeg.lib cjpeg.exe djpeg.exe jpegtran.exe rdjpgcom.exe wrjpgcom.exe</div><div class='del'>-</div><div class='del'>-libjpeg.lib: $(LIBOBJECTS) $(RFILE)</div><div class='del'>-	del libjpeg.lib</div><div class='del'>-	lib @$(RFILE)</div><div class='del'>-</div><div class='del'>-# linker response file for building libjpeg.lib</div><div class='del'>-$(RFILE) : makefile</div><div class='del'>-	del $(RFILE)</div><div class='del'>-	echo libjpeg.lib &gt;$(RFILE)</div><div class='del'>-# silly want-to-create-it prompt:</div><div class='del'>-	echo y &gt;&gt;$(RFILE)</div><div class='del'>-	echo +jcapimin.obj +jcapistd.obj +jcarith.obj +jctrans.obj &amp; &gt;&gt;$(RFILE)</div><div class='del'>-	echo +jcparam.obj +jdatadst.obj +jcinit.obj +jcmaster.obj &amp; &gt;&gt;$(RFILE)</div><div class='del'>-	echo +jcmarker.obj +jcmainct.obj +jcprepct.obj &amp; &gt;&gt;$(RFILE)</div><div class='del'>-	echo +jccoefct.obj +jccolor.obj +jcsample.obj +jchuff.obj &amp; &gt;&gt;$(RFILE)</div><div class='del'>-	echo +jcdctmgr.obj +jfdctfst.obj +jfdctflt.obj &amp; &gt;&gt;$(RFILE)</div><div class='del'>-	echo +jfdctint.obj +jdapimin.obj +jdapistd.obj &amp; &gt;&gt;$(RFILE)</div><div class='del'>-	echo +jdarith.obj +jdtrans.obj +jdatasrc.obj +jdmaster.obj &amp; &gt;&gt;$(RFILE)</div><div class='del'>-	echo +jdinput.obj +jdmarker.obj +jdhuff.obj +jdmainct.obj &amp; &gt;&gt;$(RFILE)</div><div class='del'>-	echo +jdcoefct.obj +jdpostct.obj +jddctmgr.obj &amp; &gt;&gt;$(RFILE)</div><div class='del'>-	echo +jidctfst.obj +jidctflt.obj +jidctint.obj &amp; &gt;&gt;$(RFILE)</div><div class='del'>-	echo +jdsample.obj +jdcolor.obj +jquant1.obj &amp; &gt;&gt;$(RFILE)</div><div class='del'>-	echo +jquant2.obj +jdmerge.obj +jaricom.obj +jcomapi.obj &amp; &gt;&gt;$(RFILE)</div><div class='del'>-	echo +jutils.obj +jerror.obj +jmemmgr.obj &amp; &gt;&gt;$(RFILE)</div><div class='del'>-	echo $(SYSDEPMEMLIB) ; &gt;&gt;$(RFILE)</div><div class='del'>-</div><div class='del'>-cjpeg.exe: $(COBJECTS) libjpeg.lib</div><div class='del'>-	echo $(COBJECTS) &gt;cjpeg.lst</div><div class='del'>-	link /STACK:4096 /EXEPACK @cjpeg.lst, cjpeg.exe, , libjpeg.lib, ;</div><div class='del'>-	del cjpeg.lst</div><div class='del'>-</div><div class='del'>-djpeg.exe: $(DOBJECTS) libjpeg.lib</div><div class='del'>-	echo $(DOBJECTS) &gt;djpeg.lst</div><div class='del'>-	link /STACK:4096 /EXEPACK @djpeg.lst, djpeg.exe, , libjpeg.lib, ;</div><div class='del'>-	del djpeg.lst</div><div class='del'>-</div><div class='del'>-jpegtran.exe: $(TROBJECTS) libjpeg.lib</div><div class='del'>-	link /STACK:4096 /EXEPACK $(TROBJECTS), jpegtran.exe, , libjpeg.lib, ;</div><div class='del'>-</div><div class='del'>-rdjpgcom.exe: rdjpgcom.c</div><div class='del'>-	$(CC) -AS -O -W3 rdjpgcom.c</div><div class='del'>-</div><div class='del'>-# wrjpgcom needs large model so it can malloc a 64K chunk</div><div class='del'>-wrjpgcom.exe: wrjpgcom.c</div><div class='del'>-	$(CC) -AL -O -W3 wrjpgcom.c</div><div class='del'>-</div><div class='del'>-jconfig.h: jconfig.txt</div><div class='del'>-	echo You must prepare a system-dependent jconfig.h file.</div><div class='del'>-	echo Please read the installation directions in install.txt.</div><div class='del'>-	exit 1</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	del *.obj</div><div class='del'>-	del libjpeg.lib</div><div class='del'>-	del cjpeg.exe</div><div class='del'>-	del djpeg.exe</div><div class='del'>-	del jpegtran.exe</div><div class='del'>-	del rdjpgcom.exe</div><div class='del'>-	del wrjpgcom.exe</div><div class='del'>-	del testout*.*</div><div class='del'>-</div><div class='del'>-test: cjpeg.exe djpeg.exe jpegtran.exe</div><div class='del'>-	del testout*.*</div><div class='del'>-	djpeg -dct int -ppm -outfile testout.ppm  testorig.jpg</div><div class='del'>-	djpeg -dct int -bmp -colors 256 -outfile testout.bmp  testorig.jpg</div><div class='del'>-	cjpeg -dct int -outfile testout.jpg  testimg.ppm</div><div class='del'>-	djpeg -dct int -ppm -outfile testoutp.ppm testprog.jpg</div><div class='del'>-	cjpeg -dct int -progressive -opt -outfile testoutp.jpg testimg.ppm</div><div class='del'>-	jpegtran -outfile testoutt.jpg testprog.jpg</div><div class='del'>-	fc /b testimg.ppm testout.ppm</div><div class='del'>-	fc /b testimg.bmp testout.bmp</div><div class='del'>-	fc /b testimg.jpg testout.jpg</div><div class='del'>-	fc /b testimg.ppm testoutp.ppm</div><div class='del'>-	fc /b testimgp.jpg testoutp.jpg</div><div class='del'>-	fc /b testorig.jpg testoutt.jpg</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-jaricom.obj: jaricom.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapimin.obj: jcapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapistd.obj: jcapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcarith.obj: jcarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccoefct.obj: jccoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccolor.obj: jccolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcdctmgr.obj: jcdctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jchuff.obj: jchuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcinit.obj: jcinit.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmainct.obj: jcmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmarker.obj: jcmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmaster.obj: jcmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcomapi.obj: jcomapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcparam.obj: jcparam.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcprepct.obj: jcprepct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcsample.obj: jcsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jctrans.obj: jctrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapimin.obj: jdapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapistd.obj: jdapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdarith.obj: jdarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdatadst.obj: jdatadst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdatasrc.obj: jdatasrc.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdcoefct.obj: jdcoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdcolor.obj: jdcolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jddctmgr.obj: jddctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jdhuff.obj: jdhuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdinput.obj: jdinput.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmainct.obj: jdmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmarker.obj: jdmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmaster.obj: jdmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmerge.obj: jdmerge.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdpostct.obj: jdpostct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdsample.obj: jdsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdtrans.obj: jdtrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jerror.obj: jerror.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jversion.h jerror.h</div><div class='del'>-jfdctflt.obj: jfdctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctfst.obj: jfdctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctint.obj: jfdctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctflt.obj: jidctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctfst.obj: jidctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctint.obj: jidctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jquant1.obj: jquant1.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jquant2.obj: jquant2.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jutils.obj: jutils.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jmemmgr.obj: jmemmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemansi.obj: jmemansi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemname.obj: jmemname.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemnobs.obj: jmemnobs.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemdos.obj: jmemdos.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemmac.obj: jmemmac.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-cjpeg.obj: cjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-djpeg.obj: djpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-jpegtran.obj: jpegtran.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h transupp.h jversion.h</div><div class='del'>-rdjpgcom.obj: rdjpgcom.c jinclude.h jconfig.h</div><div class='del'>-wrjpgcom.obj: wrjpgcom.c jinclude.h jconfig.h</div><div class='del'>-cdjpeg.obj: cdjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdcolmap.obj: rdcolmap.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdswitch.obj: rdswitch.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-transupp.obj: transupp.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h transupp.h</div><div class='del'>-rdppm.obj: rdppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrppm.obj: wrppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdgif.obj: rdgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrgif.obj: wrgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdtarga.obj: rdtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrtarga.obj: wrtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdbmp.obj: rdbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrbmp.obj: wrbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdrle.obj: rdrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrrle.obj: wrrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-jmemdosa.obj : jmemdosa.asm</div><div class='del'>-	masm /mx $*;</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makefile.mms b/src/3rdparty/libjpeg/makefile.mms<br/>deleted file mode 100644<br/>index 992c25f..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makefile.mms?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.mms</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,224 +0,0 @@</div><div class='del'>-# Makefile for Independent JPEG Group's software</div><div class='del'>-</div><div class='del'>-# This makefile is for use with MMS on Digital VMS systems.</div><div class='del'>-# Thanks to Rick Dyson (dyson@iowasp.physics.uiowa.edu)</div><div class='del'>-# and Tim Bell (tbell@netcom.com) for their help.</div><div class='del'>-</div><div class='del'>-# Read installation instructions before saying "MMS" !!</div><div class='del'>-</div><div class='del'>-# You may need to adjust these cc options:</div><div class='del'>-CFLAGS= $(CFLAGS) /NoDebug /Optimize</div><div class='del'>-# Generally, we recommend defining any configuration symbols in jconfig.h,</div><div class='del'>-# NOT via /Define switches here.</div><div class='del'>-.ifdef ALPHA</div><div class='del'>-OPT=</div><div class='del'>-.else</div><div class='del'>-OPT= ,Sys$Disk:[]MAKVMS.OPT/Option</div><div class='del'>-.endif</div><div class='del'>-</div><div class='del'>-# Put here the object file name for the correct system-dependent memory</div><div class='del'>-# manager file.  For Unix this is usually jmemnobs.o, but you may want</div><div class='del'>-# to use jmemansi.o or jmemname.o if you have limited swap space.</div><div class='del'>-SYSDEPMEM= jmemnobs.obj</div><div class='del'>-</div><div class='del'>-# End of configurable options.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# source files: JPEG library proper</div><div class='del'>-LIBSOURCES= jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c \</div><div class='del'>-        jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c \</div><div class='del'>-        jcomapi.c jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c \</div><div class='del'>-        jdapistd.c jdarith.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c \</div><div class='del'>-        jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c \</div><div class='del'>-        jdmerge.c jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c \</div><div class='del'>-        jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c jquant1.c \</div><div class='del'>-        jquant2.c jutils.c jmemmgr.c</div><div class='del'>-# memmgr back ends: compile only one of these into a working library</div><div class='del'>-SYSDEPSOURCES= jmemansi.c jmemname.c jmemnobs.c jmemdos.c jmemmac.c</div><div class='del'>-# source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom</div><div class='del'>-APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c \</div><div class='del'>-        rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c \</div><div class='del'>-        rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c</div><div class='del'>-SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES)</div><div class='del'>-# files included by source files</div><div class='del'>-INCLUDES= jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h jpegint.h \</div><div class='del'>-        jpeglib.h jversion.h cdjpeg.h cderror.h transupp.h</div><div class='del'>-# documentation, test, and support files</div><div class='del'>-DOCS= README install.txt usage.txt cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \</div><div class='del'>-        wrjpgcom.1 wizard.txt example.c libjpeg.txt structure.txt \</div><div class='del'>-        coderules.txt filelist.txt change.log</div><div class='del'>-MKFILES= configure Makefile.in makefile.ansi makefile.unix makefile.bcc \</div><div class='del'>-        makefile.mc6 makefile.dj makefile.wat makefile.vc makejdsw.vc6 \</div><div class='del'>-        makeadsw.vc6 makejdep.vc6 makejdsp.vc6 makejmak.vc6 makecdep.vc6 \</div><div class='del'>-        makecdsp.vc6 makecmak.vc6 makeddep.vc6 makeddsp.vc6 makedmak.vc6 \</div><div class='del'>-        maketdep.vc6 maketdsp.vc6 maketmak.vc6 makerdep.vc6 makerdsp.vc6 \</div><div class='del'>-        makermak.vc6 makewdep.vc6 makewdsp.vc6 makewmak.vc6 makejsln.vc9 \</div><div class='del'>-        makeasln.vc9 makejvcp.vc9 makecvcp.vc9 makedvcp.vc9 maketvcp.vc9 \</div><div class='del'>-        makervcp.vc9 makewvcp.vc9 makeproj.mac makcjpeg.st makdjpeg.st \</div><div class='del'>-        makljpeg.st maktjpeg.st makefile.manx makefile.sas makefile.mms \</div><div class='del'>-        makefile.vms makvms.opt</div><div class='del'>-CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat \</div><div class='del'>-        jconfig.vc jconfig.mac jconfig.st jconfig.manx jconfig.sas \</div><div class='del'>-        jconfig.vms</div><div class='del'>-CONFIGUREFILES= config.guess config.sub install-sh ltmain.sh depcomp missing</div><div class='del'>-OTHERFILES= jconfig.txt ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm \</div><div class='del'>-        libjpeg.map</div><div class='del'>-TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \</div><div class='del'>-        testimgp.jpg</div><div class='del'>-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \</div><div class='del'>-        $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)</div><div class='del'>-# library object files common to compression and decompression</div><div class='del'>-COMOBJECTS= jaricom.obj jcomapi.obj jutils.obj jerror.obj jmemmgr.obj $(SYSDEPMEM)</div><div class='del'>-# compression library object files</div><div class='del'>-CLIBOBJECTS= jcapimin.obj jcapistd.obj jcarith.obj jctrans.obj jcparam.obj \</div><div class='del'>-        jdatadst.obj jcinit.obj jcmaster.obj jcmarker.obj jcmainct.obj \</div><div class='del'>-        jcprepct.obj jccoefct.obj jccolor.obj jcsample.obj jchuff.obj \</div><div class='del'>-        jcdctmgr.obj jfdctfst.obj jfdctflt.obj jfdctint.obj</div><div class='del'>-# decompression library object files</div><div class='del'>-DLIBOBJECTS= jdapimin.obj jdapistd.obj jdarith.obj jdtrans.obj jdatasrc.obj \</div><div class='del'>-        jdmaster.obj jdinput.obj jdmarker.obj jdhuff.obj jdmainct.obj \</div><div class='del'>-        jdcoefct.obj jdpostct.obj jddctmgr.obj jidctfst.obj jidctflt.obj \</div><div class='del'>-        jidctint.obj jdsample.obj jdcolor.obj jquant1.obj jquant2.obj \</div><div class='del'>-        jdmerge.obj</div><div class='del'>-# These objectfiles are included in libjpeg.olb</div><div class='del'>-LIBOBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)</div><div class='del'>-# object files for sample applications (excluding library files)</div><div class='del'>-COBJECTS= cjpeg.obj rdppm.obj rdgif.obj rdtarga.obj rdrle.obj rdbmp.obj \</div><div class='del'>-        rdswitch.obj cdjpeg.obj</div><div class='del'>-DOBJECTS= djpeg.obj wrppm.obj wrgif.obj wrtarga.obj wrrle.obj wrbmp.obj \</div><div class='del'>-        rdcolmap.obj cdjpeg.obj</div><div class='del'>-TROBJECTS= jpegtran.obj rdswitch.obj cdjpeg.obj transupp.obj</div><div class='del'>-# objectfile lists with commas --- what a crock</div><div class='del'>-COBJLIST= cjpeg.obj,rdppm.obj,rdgif.obj,rdtarga.obj,rdrle.obj,rdbmp.obj,\</div><div class='del'>-          rdswitch.obj,cdjpeg.obj</div><div class='del'>-DOBJLIST= djpeg.obj,wrppm.obj,wrgif.obj,wrtarga.obj,wrrle.obj,wrbmp.obj,\</div><div class='del'>-          rdcolmap.obj,cdjpeg.obj</div><div class='del'>-TROBJLIST= jpegtran.obj,rdswitch.obj,cdjpeg.obj,transupp.obj</div><div class='del'>-LIBOBJLIST= jaricom.obj,jcapimin.obj,jcapistd.obj,jcarith.obj,jctrans.obj,\</div><div class='del'>-          jcparam.obj,jdatadst.obj,jcinit.obj,jcmaster.obj,jcmarker.obj,\</div><div class='del'>-          jcmainct.obj,jcprepct.obj,jccoefct.obj,jccolor.obj,jcsample.obj,\</div><div class='del'>-          jchuff.obj,jcdctmgr.obj,jfdctfst.obj,jfdctflt.obj,jfdctint.obj,\</div><div class='del'>-          jdapimin.obj,jdapistd.obj,jdarith.obj,jdtrans.obj,jdatasrc.obj,\</div><div class='del'>-          jdmaster.obj,jdinput.obj,jdmarker.obj,jdhuff.obj,jdmainct.obj,\</div><div class='del'>-          jdcoefct.obj,jdpostct.obj,jddctmgr.obj,jidctfst.obj,jidctflt.obj,\</div><div class='del'>-          jidctint.obj,jdsample.obj,jdcolor.obj,jquant1.obj,jquant2.obj,\</div><div class='del'>-          jdmerge.obj,jcomapi.obj,jutils.obj,jerror.obj,jmemmgr.obj,$(SYSDEPMEM)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-.first</div><div class='del'>-	@- Define /NoLog Sys Sys$Library</div><div class='del'>-</div><div class='del'>-ALL : libjpeg.olb cjpeg.exe djpeg.exe jpegtran.exe rdjpgcom.exe wrjpgcom.exe</div><div class='del'>-	@ Continue</div><div class='del'>-</div><div class='del'>-libjpeg.olb : $(LIBOBJECTS)</div><div class='del'>-	Library /Create libjpeg.olb $(LIBOBJLIST)</div><div class='del'>-</div><div class='del'>-cjpeg.exe : $(COBJECTS) libjpeg.olb</div><div class='del'>-	$(LINK) $(LFLAGS) /Executable = cjpeg.exe $(COBJLIST),libjpeg.olb/Library$(OPT)</div><div class='del'>-</div><div class='del'>-djpeg.exe : $(DOBJECTS) libjpeg.olb</div><div class='del'>-	$(LINK) $(LFLAGS) /Executable = djpeg.exe $(DOBJLIST),libjpeg.olb/Library$(OPT)</div><div class='del'>-</div><div class='del'>-jpegtran.exe : $(TROBJECTS) libjpeg.olb</div><div class='del'>-	$(LINK) $(LFLAGS) /Executable = jpegtran.exe $(TROBJLIST),libjpeg.olb/Library$(OPT)</div><div class='del'>-</div><div class='del'>-rdjpgcom.exe : rdjpgcom.obj</div><div class='del'>-	$(LINK) $(LFLAGS) /Executable = rdjpgcom.exe rdjpgcom.obj$(OPT)</div><div class='del'>-</div><div class='del'>-wrjpgcom.exe : wrjpgcom.obj</div><div class='del'>-	$(LINK) $(LFLAGS) /Executable = wrjpgcom.exe wrjpgcom.obj$(OPT)</div><div class='del'>-</div><div class='del'>-jconfig.h : jconfig.vms</div><div class='del'>-	@- Copy jconfig.vms jconfig.h</div><div class='del'>-</div><div class='del'>-clean :</div><div class='del'>-	@- Set Protection = Owner:RWED *.*;-1</div><div class='del'>-	@- Set Protection = Owner:RWED *.OBJ</div><div class='del'>-	- Purge /NoLog /NoConfirm *.*</div><div class='del'>-	- Delete /NoLog /NoConfirm *.OBJ;</div><div class='del'>-</div><div class='del'>-test : cjpeg.exe djpeg.exe jpegtran.exe</div><div class='del'>-	mcr sys$disk:[]djpeg -dct int -ppm -outfile testout.ppm testorig.jpg</div><div class='del'>-	mcr sys$disk:[]djpeg -dct int -bmp -colors 256 -outfile testout.bmp testorig.jpg</div><div class='del'>-	mcr sys$disk:[]cjpeg -dct int      -outfile testout.jpg testimg.ppm</div><div class='del'>-	mcr sys$disk:[]djpeg -dct int -ppm -outfile testoutp.ppm testprog.jpg</div><div class='del'>-	mcr sys$disk:[]cjpeg -dct int -progressive -opt -outfile testoutp.jpg testimg.ppm</div><div class='del'>-	mcr sys$disk:[]jpegtran -outfile testoutt.jpg testprog.jpg</div><div class='del'>-	- Backup /Compare/Log	  testimg.ppm testout.ppm</div><div class='del'>-	- Backup /Compare/Log	  testimg.bmp testout.bmp</div><div class='del'>-	- Backup /Compare/Log	  testimg.jpg testout.jpg</div><div class='del'>-	- Backup /Compare/Log	  testimg.ppm testoutp.ppm</div><div class='del'>-	- Backup /Compare/Log	  testimgp.jpg testoutp.jpg</div><div class='del'>-	- Backup /Compare/Log	  testorig.jpg testoutt.jpg</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-jaricom.obj : jaricom.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapimin.obj : jcapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapistd.obj : jcapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcarith.obj : jcarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccoefct.obj : jccoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccolor.obj : jccolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcdctmgr.obj : jcdctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jchuff.obj : jchuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcinit.obj : jcinit.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmainct.obj : jcmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmarker.obj : jcmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmaster.obj : jcmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcomapi.obj : jcomapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcparam.obj : jcparam.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcprepct.obj : jcprepct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcsample.obj : jcsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jctrans.obj : jctrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapimin.obj : jdapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapistd.obj : jdapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdarith.obj : jdarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdatadst.obj : jdatadst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdatasrc.obj : jdatasrc.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdcoefct.obj : jdcoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdcolor.obj : jdcolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jddctmgr.obj : jddctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jdhuff.obj : jdhuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdinput.obj : jdinput.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmainct.obj : jdmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmarker.obj : jdmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmaster.obj : jdmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmerge.obj : jdmerge.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdpostct.obj : jdpostct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdsample.obj : jdsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdtrans.obj : jdtrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jerror.obj : jerror.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jversion.h jerror.h</div><div class='del'>-jfdctflt.obj : jfdctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctfst.obj : jfdctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctint.obj : jfdctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctflt.obj : jidctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctfst.obj : jidctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctint.obj : jidctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jquant1.obj : jquant1.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jquant2.obj : jquant2.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jutils.obj : jutils.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jmemmgr.obj : jmemmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemansi.obj : jmemansi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemname.obj : jmemname.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemnobs.obj : jmemnobs.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemdos.obj : jmemdos.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemmac.obj : jmemmac.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-cjpeg.obj : cjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-djpeg.obj : djpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-jpegtran.obj : jpegtran.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h transupp.h jversion.h</div><div class='del'>-rdjpgcom.obj : rdjpgcom.c jinclude.h jconfig.h</div><div class='del'>-wrjpgcom.obj : wrjpgcom.c jinclude.h jconfig.h</div><div class='del'>-cdjpeg.obj : cdjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdcolmap.obj : rdcolmap.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdswitch.obj : rdswitch.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-transupp.obj : transupp.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h transupp.h</div><div class='del'>-rdppm.obj : rdppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrppm.obj : wrppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdgif.obj : rdgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrgif.obj : wrgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdtarga.obj : rdtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrtarga.obj : wrtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdbmp.obj : rdbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrbmp.obj : wrbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdrle.obj : rdrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrrle.obj : wrrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makefile.sas b/src/3rdparty/libjpeg/makefile.sas<br/>deleted file mode 100644<br/>index c7a030c..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makefile.sas?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.sas</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,258 +0,0 @@</div><div class='del'>-# Makefile for Independent JPEG Group's software</div><div class='del'>-</div><div class='del'>-# This makefile is for Amiga systems using SAS C 6.0 and up.</div><div class='del'>-# Thanks to Ed Hanway, Mark Rinfret, and Jim Zepeda.</div><div class='del'>-</div><div class='del'>-# Read installation instructions before saying "make" !!</div><div class='del'>-</div><div class='del'>-# The name of your C compiler:</div><div class='del'>-CC= sc</div><div class='del'>-</div><div class='del'>-# You may need to adjust these cc options:</div><div class='del'>-# Uncomment the following lines for generic 680x0 version</div><div class='del'>-ARCHFLAGS= cpu=any</div><div class='del'>-SUFFIX=</div><div class='del'>-</div><div class='del'>-# Uncomment the following lines for 68030-only version</div><div class='del'>-#ARCHFLAGS= cpu=68030</div><div class='del'>-#SUFFIX=.030</div><div class='del'>-</div><div class='del'>-CFLAGS= nostackcheck data=near parms=register optimize $(ARCHFLAGS) \</div><div class='del'>-	ignore=104 ignore=304 ignore=306</div><div class='del'>-# ignore=104 disables warnings for mismatched const qualifiers</div><div class='del'>-# ignore=304 disables warnings for variables being optimized out</div><div class='del'>-# ignore=306 disables warnings for the inlining of functions</div><div class='del'>-# Generally, we recommend defining any configuration symbols in jconfig.h,</div><div class='del'>-# NOT via define switches here.</div><div class='del'>-</div><div class='del'>-# Link-time cc options:</div><div class='del'>-LDFLAGS= SC SD ND BATCH</div><div class='del'>-</div><div class='del'>-# To link any special libraries, add the necessary commands here.</div><div class='del'>-LDLIBS= LIB:scm.lib LIB:sc.lib</div><div class='del'>-</div><div class='del'>-# Put here the object file name for the correct system-dependent memory</div><div class='del'>-# manager file.  For Amiga we recommend jmemname.o.</div><div class='del'>-SYSDEPMEM= jmemname.o</div><div class='del'>-</div><div class='del'>-# miscellaneous OS-dependent stuff</div><div class='del'>-# linker</div><div class='del'>-LN= slink</div><div class='del'>-# file deletion command</div><div class='del'>-RM= delete quiet</div><div class='del'>-# library (.lib) file creation command</div><div class='del'>-AR= oml</div><div class='del'>-</div><div class='del'>-# End of configurable options.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# source files: JPEG library proper</div><div class='del'>-LIBSOURCES= jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c \</div><div class='del'>-        jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c \</div><div class='del'>-        jcomapi.c jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c \</div><div class='del'>-        jdapistd.c jdarith.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c \</div><div class='del'>-        jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c \</div><div class='del'>-        jdmerge.c jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c \</div><div class='del'>-        jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c jquant1.c \</div><div class='del'>-        jquant2.c jutils.c jmemmgr.c</div><div class='del'>-# memmgr back ends: compile only one of these into a working library</div><div class='del'>-SYSDEPSOURCES= jmemansi.c jmemname.c jmemnobs.c jmemdos.c jmemmac.c</div><div class='del'>-# source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom</div><div class='del'>-APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c \</div><div class='del'>-        rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c \</div><div class='del'>-        rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c</div><div class='del'>-SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES)</div><div class='del'>-# files included by source files</div><div class='del'>-INCLUDES= jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h jpegint.h \</div><div class='del'>-        jpeglib.h jversion.h cdjpeg.h cderror.h transupp.h</div><div class='del'>-# documentation, test, and support files</div><div class='del'>-DOCS= README install.txt usage.txt cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \</div><div class='del'>-        wrjpgcom.1 wizard.txt example.c libjpeg.txt structure.txt \</div><div class='del'>-        coderules.txt filelist.txt change.log</div><div class='del'>-MKFILES= configure Makefile.in makefile.ansi makefile.unix makefile.bcc \</div><div class='del'>-        makefile.mc6 makefile.dj makefile.wat makefile.vc makejdsw.vc6 \</div><div class='del'>-        makeadsw.vc6 makejdep.vc6 makejdsp.vc6 makejmak.vc6 makecdep.vc6 \</div><div class='del'>-        makecdsp.vc6 makecmak.vc6 makeddep.vc6 makeddsp.vc6 makedmak.vc6 \</div><div class='del'>-        maketdep.vc6 maketdsp.vc6 maketmak.vc6 makerdep.vc6 makerdsp.vc6 \</div><div class='del'>-        makermak.vc6 makewdep.vc6 makewdsp.vc6 makewmak.vc6 makejsln.vc9 \</div><div class='del'>-        makeasln.vc9 makejvcp.vc9 makecvcp.vc9 makedvcp.vc9 maketvcp.vc9 \</div><div class='del'>-        makervcp.vc9 makewvcp.vc9 makeproj.mac makcjpeg.st makdjpeg.st \</div><div class='del'>-        makljpeg.st maktjpeg.st makefile.manx makefile.sas makefile.mms \</div><div class='del'>-        makefile.vms makvms.opt</div><div class='del'>-CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat \</div><div class='del'>-        jconfig.vc jconfig.mac jconfig.st jconfig.manx jconfig.sas \</div><div class='del'>-        jconfig.vms</div><div class='del'>-CONFIGUREFILES= config.guess config.sub install-sh ltmain.sh depcomp missing</div><div class='del'>-OTHERFILES= jconfig.txt ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm \</div><div class='del'>-        libjpeg.map</div><div class='del'>-TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \</div><div class='del'>-        testimgp.jpg</div><div class='del'>-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \</div><div class='del'>-        $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)</div><div class='del'>-# library object files common to compression and decompression</div><div class='del'>-COMOBJECTS= jaricom.o jcomapi.o jutils.o jerror.o jmemmgr.o $(SYSDEPMEM)</div><div class='del'>-# compression library object files</div><div class='del'>-CLIBOBJECTS= jcapimin.o jcapistd.o jcarith.o jctrans.o jcparam.o \</div><div class='del'>-        jdatadst.o jcinit.o jcmaster.o jcmarker.o jcmainct.o jcprepct.o \</div><div class='del'>-        jccoefct.o jccolor.o jcsample.o jchuff.o jcdctmgr.o jfdctfst.o \</div><div class='del'>-        jfdctflt.o jfdctint.o</div><div class='del'>-# decompression library object files</div><div class='del'>-DLIBOBJECTS= jdapimin.o jdapistd.o jdarith.o jdtrans.o jdatasrc.o \</div><div class='del'>-        jdmaster.o jdinput.o jdmarker.o jdhuff.o jdmainct.o \</div><div class='del'>-        jdcoefct.o jdpostct.o jddctmgr.o jidctfst.o jidctflt.o \</div><div class='del'>-        jidctint.o jdsample.o jdcolor.o jquant1.o jquant2.o jdmerge.o</div><div class='del'>-# These objectfiles are included in libjpeg.lib</div><div class='del'>-LIBOBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)</div><div class='del'>-# object files for sample applications (excluding library files)</div><div class='del'>-COBJECTS= cjpeg.o rdppm.o rdgif.o rdtarga.o rdrle.o rdbmp.o rdswitch.o \</div><div class='del'>-        cdjpeg.o</div><div class='del'>-DOBJECTS= djpeg.o wrppm.o wrgif.o wrtarga.o wrrle.o wrbmp.o rdcolmap.o \</div><div class='del'>-        cdjpeg.o</div><div class='del'>-TROBJECTS= jpegtran.o rdswitch.o cdjpeg.o transupp.o</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-all: libjpeg.lib cjpeg$(SUFFIX) djpeg$(SUFFIX) jpegtran$(SUFFIX) rdjpgcom$(SUFFIX) wrjpgcom$(SUFFIX)</div><div class='del'>-</div><div class='del'>-# note: do several AR steps to avoid command line length limitations</div><div class='del'>-</div><div class='del'>-libjpeg.lib: $(LIBOBJECTS)</div><div class='del'>-	-$(RM) libjpeg.lib</div><div class='del'>-	$(AR) libjpeg.lib r $(CLIBOBJECTS)</div><div class='del'>-	$(AR) libjpeg.lib r $(DLIBOBJECTS)</div><div class='del'>-	$(AR) libjpeg.lib r $(COMOBJECTS)</div><div class='del'>-</div><div class='del'>-cjpeg$(SUFFIX): $(COBJECTS) libjpeg.lib</div><div class='del'>-	$(LN) &lt;WITH &lt;</div><div class='del'>-$(LDFLAGS)</div><div class='del'>-TO cjpeg$(SUFFIX)</div><div class='del'>-FROM LIB:c.o $(COBJECTS)</div><div class='del'>-LIB libjpeg.lib $(LDLIBS)</div><div class='del'>-&lt;</div><div class='del'>-</div><div class='del'>-djpeg$(SUFFIX): $(DOBJECTS) libjpeg.lib</div><div class='del'>-	$(LN) &lt;WITH &lt;</div><div class='del'>-$(LDFLAGS)</div><div class='del'>-TO djpeg$(SUFFIX)</div><div class='del'>-FROM LIB:c.o $(DOBJECTS)</div><div class='del'>-LIB libjpeg.lib $(LDLIBS)</div><div class='del'>-&lt;</div><div class='del'>-</div><div class='del'>-jpegtran$(SUFFIX): $(TROBJECTS) libjpeg.lib</div><div class='del'>-	$(LN) &lt;WITH &lt;</div><div class='del'>-$(LDFLAGS)</div><div class='del'>-TO jpegtran$(SUFFIX)</div><div class='del'>-FROM LIB:c.o $(TROBJECTS)</div><div class='del'>-LIB libjpeg.lib $(LDLIBS)</div><div class='del'>-&lt;</div><div class='del'>-</div><div class='del'>-rdjpgcom$(SUFFIX): rdjpgcom.o</div><div class='del'>-	$(LN) &lt;WITH &lt;</div><div class='del'>-$(LDFLAGS)</div><div class='del'>-TO rdjpgcom$(SUFFIX)</div><div class='del'>-FROM LIB:c.o rdjpgcom.o</div><div class='del'>-LIB $(LDLIBS)</div><div class='del'>-&lt;</div><div class='del'>-</div><div class='del'>-wrjpgcom$(SUFFIX): wrjpgcom.o</div><div class='del'>-	$(LN) &lt;WITH &lt;</div><div class='del'>-$(LDFLAGS)</div><div class='del'>-TO wrjpgcom$(SUFFIX)</div><div class='del'>-FROM LIB:c.o wrjpgcom.o</div><div class='del'>-LIB $(LDLIBS)</div><div class='del'>-&lt;</div><div class='del'>-</div><div class='del'>-jconfig.h: jconfig.txt</div><div class='del'>-	echo You must prepare a system-dependent jconfig.h file.</div><div class='del'>-	echo Please read the installation directions in install.txt.</div><div class='del'>-	exit 1</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	-$(RM) *.o cjpeg djpeg jpegtran cjpeg.030 djpeg.030 jpegtran.030</div><div class='del'>-	-$(RM) rdjpgcom wrjpgcom rdjpgcom.030 wrjpgcom.030</div><div class='del'>-	-$(RM) libjpeg.lib core testout*.*</div><div class='del'>-</div><div class='del'>-test: cjpeg djpeg jpegtran</div><div class='del'>-	-$(RM) testout*.*</div><div class='del'>-	djpeg -dct int -ppm -outfile testout.ppm  testorig.jpg</div><div class='del'>-	djpeg -dct int -bmp -colors 256 -outfile testout.bmp  testorig.jpg</div><div class='del'>-	cjpeg -dct int -outfile testout.jpg  testimg.ppm</div><div class='del'>-	djpeg -dct int -ppm -outfile testoutp.ppm testprog.jpg</div><div class='del'>-	cjpeg -dct int -progressive -opt -outfile testoutp.jpg testimg.ppm</div><div class='del'>-	jpegtran -outfile testoutt.jpg testprog.jpg</div><div class='del'>-	cmp testimg.ppm testout.ppm</div><div class='del'>-	cmp testimg.bmp testout.bmp</div><div class='del'>-	cmp testimg.jpg testout.jpg</div><div class='del'>-	cmp testimg.ppm testoutp.ppm</div><div class='del'>-	cmp testimgp.jpg testoutp.jpg</div><div class='del'>-	cmp testorig.jpg testoutt.jpg</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-jaricom.o: jaricom.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapimin.o: jcapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapistd.o: jcapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcarith.o: jcarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccoefct.o: jccoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccolor.o: jccolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcdctmgr.o: jcdctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jchuff.o: jchuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcinit.o: jcinit.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmainct.o: jcmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmarker.o: jcmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmaster.o: jcmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcomapi.o: jcomapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcparam.o: jcparam.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcprepct.o: jcprepct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcsample.o: jcsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jctrans.o: jctrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapimin.o: jdapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapistd.o: jdapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdarith.o: jdarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdatadst.o: jdatadst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdatasrc.o: jdatasrc.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdcoefct.o: jdcoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdcolor.o: jdcolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jddctmgr.o: jddctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jdhuff.o: jdhuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdinput.o: jdinput.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmainct.o: jdmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmarker.o: jdmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmaster.o: jdmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmerge.o: jdmerge.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdpostct.o: jdpostct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdsample.o: jdsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdtrans.o: jdtrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jerror.o: jerror.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jversion.h jerror.h</div><div class='del'>-jfdctflt.o: jfdctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctfst.o: jfdctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctint.o: jfdctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctflt.o: jidctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctfst.o: jidctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctint.o: jidctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jquant1.o: jquant1.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jquant2.o: jquant2.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jutils.o: jutils.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jmemmgr.o: jmemmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemansi.o: jmemansi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemname.o: jmemname.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemnobs.o: jmemnobs.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemdos.o: jmemdos.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemmac.o: jmemmac.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-cjpeg.o: cjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-djpeg.o: djpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-jpegtran.o: jpegtran.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h transupp.h jversion.h</div><div class='del'>-rdjpgcom.o: rdjpgcom.c jinclude.h jconfig.h</div><div class='del'>-wrjpgcom.o: wrjpgcom.c jinclude.h jconfig.h</div><div class='del'>-cdjpeg.o: cdjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdcolmap.o: rdcolmap.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdswitch.o: rdswitch.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-transupp.o: transupp.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h transupp.h</div><div class='del'>-rdppm.o: rdppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrppm.o: wrppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdgif.o: rdgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrgif.o: wrgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdtarga.o: rdtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrtarga.o: wrtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdbmp.o: rdbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrbmp.o: wrbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdrle.o: rdrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrrle.o: wrrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makefile.unix b/src/3rdparty/libjpeg/makefile.unix<br/>deleted file mode 100644<br/>index 90332e3..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makefile.unix?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.unix</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,234 +0,0 @@</div><div class='del'>-# Makefile for Independent JPEG Group's software</div><div class='del'>-</div><div class='del'>-# This makefile is suitable for Unix-like systems with non-ANSI compilers.</div><div class='del'>-# If you have an ANSI compiler, makefile.ansi is a better starting point.</div><div class='del'>-</div><div class='del'>-# Read installation instructions before saying "make" !!</div><div class='del'>-</div><div class='del'>-# The name of your C compiler:</div><div class='del'>-CC= cc</div><div class='del'>-</div><div class='del'>-# You may need to adjust these cc options:</div><div class='del'>-CFLAGS= -O</div><div class='del'>-# Generally, we recommend defining any configuration symbols in jconfig.h,</div><div class='del'>-# NOT via -D switches here.</div><div class='del'>-# However, any special defines for ansi2knr.c may be included here:</div><div class='del'>-ANSI2KNRFLAGS= </div><div class='del'>-</div><div class='del'>-# Link-time cc options:</div><div class='del'>-LDFLAGS= </div><div class='del'>-</div><div class='del'>-# To link any special libraries, add the necessary -l commands here.</div><div class='del'>-LDLIBS= </div><div class='del'>-</div><div class='del'>-# Put here the object file name for the correct system-dependent memory</div><div class='del'>-# manager file.  For Unix this is usually jmemnobs.o, but you may want</div><div class='del'>-# to use jmemansi.o or jmemname.o if you have limited swap space.</div><div class='del'>-SYSDEPMEM= jmemnobs.o</div><div class='del'>-</div><div class='del'>-# miscellaneous OS-dependent stuff</div><div class='del'>-# linker</div><div class='del'>-LN= $(CC)</div><div class='del'>-# file deletion command</div><div class='del'>-RM= rm -f</div><div class='del'>-# file rename command</div><div class='del'>-MV= mv</div><div class='del'>-# library (.a) file creation command</div><div class='del'>-AR= ar rc</div><div class='del'>-# second step in .a creation (use "touch" if not needed)</div><div class='del'>-AR2= ranlib</div><div class='del'>-</div><div class='del'>-# End of configurable options.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# source files: JPEG library proper</div><div class='del'>-LIBSOURCES= jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c \</div><div class='del'>-        jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c \</div><div class='del'>-        jcomapi.c jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c \</div><div class='del'>-        jdapistd.c jdarith.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c \</div><div class='del'>-        jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c \</div><div class='del'>-        jdmerge.c jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c \</div><div class='del'>-        jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c jquant1.c \</div><div class='del'>-        jquant2.c jutils.c jmemmgr.c</div><div class='del'>-# memmgr back ends: compile only one of these into a working library</div><div class='del'>-SYSDEPSOURCES= jmemansi.c jmemname.c jmemnobs.c jmemdos.c jmemmac.c</div><div class='del'>-# source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom</div><div class='del'>-APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c \</div><div class='del'>-        rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c \</div><div class='del'>-        rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c</div><div class='del'>-SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES)</div><div class='del'>-# files included by source files</div><div class='del'>-INCLUDES= jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h jpegint.h \</div><div class='del'>-        jpeglib.h jversion.h cdjpeg.h cderror.h transupp.h</div><div class='del'>-# documentation, test, and support files</div><div class='del'>-DOCS= README install.txt usage.txt cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \</div><div class='del'>-        wrjpgcom.1 wizard.txt example.c libjpeg.txt structure.txt \</div><div class='del'>-        coderules.txt filelist.txt change.log</div><div class='del'>-MKFILES= configure Makefile.in makefile.ansi makefile.unix makefile.bcc \</div><div class='del'>-        makefile.mc6 makefile.dj makefile.wat makefile.vc makejdsw.vc6 \</div><div class='del'>-        makeadsw.vc6 makejdep.vc6 makejdsp.vc6 makejmak.vc6 makecdep.vc6 \</div><div class='del'>-        makecdsp.vc6 makecmak.vc6 makeddep.vc6 makeddsp.vc6 makedmak.vc6 \</div><div class='del'>-        maketdep.vc6 maketdsp.vc6 maketmak.vc6 makerdep.vc6 makerdsp.vc6 \</div><div class='del'>-        makermak.vc6 makewdep.vc6 makewdsp.vc6 makewmak.vc6 makejsln.vc9 \</div><div class='del'>-        makeasln.vc9 makejvcp.vc9 makecvcp.vc9 makedvcp.vc9 maketvcp.vc9 \</div><div class='del'>-        makervcp.vc9 makewvcp.vc9 makeproj.mac makcjpeg.st makdjpeg.st \</div><div class='del'>-        makljpeg.st maktjpeg.st makefile.manx makefile.sas makefile.mms \</div><div class='del'>-        makefile.vms makvms.opt</div><div class='del'>-CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat \</div><div class='del'>-        jconfig.vc jconfig.mac jconfig.st jconfig.manx jconfig.sas \</div><div class='del'>-        jconfig.vms</div><div class='del'>-CONFIGUREFILES= config.guess config.sub install-sh ltmain.sh depcomp missing</div><div class='del'>-OTHERFILES= jconfig.txt ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm \</div><div class='del'>-        libjpeg.map</div><div class='del'>-TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \</div><div class='del'>-        testimgp.jpg</div><div class='del'>-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \</div><div class='del'>-        $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)</div><div class='del'>-# library object files common to compression and decompression</div><div class='del'>-COMOBJECTS= jaricom.o jcomapi.o jutils.o jerror.o jmemmgr.o $(SYSDEPMEM)</div><div class='del'>-# compression library object files</div><div class='del'>-CLIBOBJECTS= jcapimin.o jcapistd.o jcarith.o jctrans.o jcparam.o \</div><div class='del'>-        jdatadst.o jcinit.o jcmaster.o jcmarker.o jcmainct.o jcprepct.o \</div><div class='del'>-        jccoefct.o jccolor.o jcsample.o jchuff.o jcdctmgr.o jfdctfst.o \</div><div class='del'>-        jfdctflt.o jfdctint.o</div><div class='del'>-# decompression library object files</div><div class='del'>-DLIBOBJECTS= jdapimin.o jdapistd.o jdarith.o jdtrans.o jdatasrc.o \</div><div class='del'>-        jdmaster.o jdinput.o jdmarker.o jdhuff.o jdmainct.o \</div><div class='del'>-        jdcoefct.o jdpostct.o jddctmgr.o jidctfst.o jidctflt.o \</div><div class='del'>-        jidctint.o jdsample.o jdcolor.o jquant1.o jquant2.o jdmerge.o</div><div class='del'>-# These objectfiles are included in libjpeg.a</div><div class='del'>-LIBOBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)</div><div class='del'>-# object files for sample applications (excluding library files)</div><div class='del'>-COBJECTS= cjpeg.o rdppm.o rdgif.o rdtarga.o rdrle.o rdbmp.o rdswitch.o \</div><div class='del'>-        cdjpeg.o</div><div class='del'>-DOBJECTS= djpeg.o wrppm.o wrgif.o wrtarga.o wrrle.o wrbmp.o rdcolmap.o \</div><div class='del'>-        cdjpeg.o</div><div class='del'>-TROBJECTS= jpegtran.o rdswitch.o cdjpeg.o transupp.o</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-all: ansi2knr libjpeg.a cjpeg djpeg jpegtran rdjpgcom wrjpgcom</div><div class='del'>-</div><div class='del'>-# This rule causes ansi2knr to be invoked.</div><div class='del'>-.c.o:</div><div class='del'>-	./ansi2knr $*.c T$*.c</div><div class='del'>-	$(CC) $(CFLAGS) -c T$*.c</div><div class='del'>-	$(RM) T$*.c $*.o</div><div class='del'>-	$(MV) T$*.o $*.o</div><div class='del'>-</div><div class='del'>-ansi2knr: ansi2knr.c</div><div class='del'>-	$(CC) $(CFLAGS) $(ANSI2KNRFLAGS) -o ansi2knr ansi2knr.c</div><div class='del'>-</div><div class='del'>-libjpeg.a: ansi2knr $(LIBOBJECTS)</div><div class='del'>-	$(RM) libjpeg.a</div><div class='del'>-	$(AR) libjpeg.a  $(LIBOBJECTS)</div><div class='del'>-	$(AR2) libjpeg.a</div><div class='del'>-</div><div class='del'>-cjpeg: ansi2knr $(COBJECTS) libjpeg.a</div><div class='del'>-	$(LN) $(LDFLAGS) -o cjpeg $(COBJECTS) libjpeg.a $(LDLIBS)</div><div class='del'>-</div><div class='del'>-djpeg: ansi2knr $(DOBJECTS) libjpeg.a</div><div class='del'>-	$(LN) $(LDFLAGS) -o djpeg $(DOBJECTS) libjpeg.a $(LDLIBS)</div><div class='del'>-</div><div class='del'>-jpegtran: ansi2knr $(TROBJECTS) libjpeg.a</div><div class='del'>-	$(LN) $(LDFLAGS) -o jpegtran $(TROBJECTS) libjpeg.a $(LDLIBS)</div><div class='del'>-</div><div class='del'>-rdjpgcom: rdjpgcom.o</div><div class='del'>-	$(LN) $(LDFLAGS) -o rdjpgcom rdjpgcom.o $(LDLIBS)</div><div class='del'>-</div><div class='del'>-wrjpgcom: wrjpgcom.o</div><div class='del'>-	$(LN) $(LDFLAGS) -o wrjpgcom wrjpgcom.o $(LDLIBS)</div><div class='del'>-</div><div class='del'>-jconfig.h: jconfig.txt</div><div class='del'>-	echo You must prepare a system-dependent jconfig.h file.</div><div class='del'>-	echo Please read the installation directions in install.txt.</div><div class='del'>-	exit 1</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM) *.o cjpeg djpeg jpegtran libjpeg.a rdjpgcom wrjpgcom</div><div class='del'>-	$(RM) ansi2knr core testout*</div><div class='del'>-</div><div class='del'>-test: cjpeg djpeg jpegtran</div><div class='del'>-	$(RM) testout*</div><div class='del'>-	./djpeg -dct int -ppm -outfile testout.ppm  testorig.jpg</div><div class='del'>-	./djpeg -dct int -bmp -colors 256 -outfile testout.bmp  testorig.jpg</div><div class='del'>-	./cjpeg -dct int -outfile testout.jpg  testimg.ppm</div><div class='del'>-	./djpeg -dct int -ppm -outfile testoutp.ppm testprog.jpg</div><div class='del'>-	./cjpeg -dct int -progressive -opt -outfile testoutp.jpg testimg.ppm</div><div class='del'>-	./jpegtran -outfile testoutt.jpg testprog.jpg</div><div class='del'>-	cmp testimg.ppm testout.ppm</div><div class='del'>-	cmp testimg.bmp testout.bmp</div><div class='del'>-	cmp testimg.jpg testout.jpg</div><div class='del'>-	cmp testimg.ppm testoutp.ppm</div><div class='del'>-	cmp testimgp.jpg testoutp.jpg</div><div class='del'>-	cmp testorig.jpg testoutt.jpg</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-jaricom.o: jaricom.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapimin.o: jcapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapistd.o: jcapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcarith.o: jcarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccoefct.o: jccoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccolor.o: jccolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcdctmgr.o: jcdctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jchuff.o: jchuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcinit.o: jcinit.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmainct.o: jcmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmarker.o: jcmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmaster.o: jcmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcomapi.o: jcomapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcparam.o: jcparam.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcprepct.o: jcprepct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcsample.o: jcsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jctrans.o: jctrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapimin.o: jdapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapistd.o: jdapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdarith.o: jdarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdatadst.o: jdatadst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdatasrc.o: jdatasrc.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdcoefct.o: jdcoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdcolor.o: jdcolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jddctmgr.o: jddctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jdhuff.o: jdhuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdinput.o: jdinput.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmainct.o: jdmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmarker.o: jdmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmaster.o: jdmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmerge.o: jdmerge.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdpostct.o: jdpostct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdsample.o: jdsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdtrans.o: jdtrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jerror.o: jerror.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jversion.h jerror.h</div><div class='del'>-jfdctflt.o: jfdctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctfst.o: jfdctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctint.o: jfdctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctflt.o: jidctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctfst.o: jidctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctint.o: jidctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jquant1.o: jquant1.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jquant2.o: jquant2.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jutils.o: jutils.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jmemmgr.o: jmemmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemansi.o: jmemansi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemname.o: jmemname.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemnobs.o: jmemnobs.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemdos.o: jmemdos.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemmac.o: jmemmac.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-cjpeg.o: cjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-djpeg.o: djpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-jpegtran.o: jpegtran.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h transupp.h jversion.h</div><div class='del'>-rdjpgcom.o: rdjpgcom.c jinclude.h jconfig.h</div><div class='del'>-wrjpgcom.o: wrjpgcom.c jinclude.h jconfig.h</div><div class='del'>-cdjpeg.o: cdjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdcolmap.o: rdcolmap.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdswitch.o: rdswitch.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-transupp.o: transupp.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h transupp.h</div><div class='del'>-rdppm.o: rdppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrppm.o: wrppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdgif.o: rdgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrgif.o: wrgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdtarga.o: rdtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrtarga.o: wrtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdbmp.o: rdbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrbmp.o: wrbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdrle.o: rdrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrrle.o: wrrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makefile.vc b/src/3rdparty/libjpeg/makefile.vc<br/>deleted file mode 100644<br/>index 41b998f..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makefile.vc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.vc</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,217 +0,0 @@</div><div class='del'>-# Makefile for Independent JPEG Group's software</div><div class='del'>-</div><div class='del'>-# This makefile is for Microsoft Visual C++ on Windows NT (and 95?).</div><div class='del'>-# It builds the IJG library as a statically linkable library (.LIB),</div><div class='del'>-# and builds the sample applications as console-mode apps.</div><div class='del'>-# Thanks to Xingong Chang, Raymond Everly and others.</div><div class='del'>-</div><div class='del'>-# Read installation instructions before saying "nmake" !!</div><div class='del'>-# To build an optimized library without debug info, say "nmake nodebug=1".</div><div class='del'>-</div><div class='del'>-# Pull in standard variable definitions</div><div class='del'>-!include &lt;win32.mak&gt;</div><div class='del'>-</div><div class='del'>-# You may want to adjust these compiler options:</div><div class='del'>-CFLAGS= $(cflags) $(cdebug) $(cvars) -I.</div><div class='del'>-# Generally, we recommend defining any configuration symbols in jconfig.h,</div><div class='del'>-# NOT via -D switches here.</div><div class='del'>-</div><div class='del'>-# Link-time options:</div><div class='del'>-LDFLAGS= $(ldebug) $(conlflags)</div><div class='del'>-</div><div class='del'>-# To link any special libraries, add the necessary commands here.</div><div class='del'>-LDLIBS= $(conlibs)</div><div class='del'>-</div><div class='del'>-# Put here the object file name for the correct system-dependent memory</div><div class='del'>-# manager file.  For NT we suggest jmemnobs.obj, which expects the OS to</div><div class='del'>-# provide adequate virtual memory.</div><div class='del'>-SYSDEPMEM= jmemnobs.obj</div><div class='del'>-</div><div class='del'>-# miscellaneous OS-dependent stuff</div><div class='del'>-# file deletion command</div><div class='del'>-RM= del</div><div class='del'>-</div><div class='del'>-# End of configurable options.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# source files: JPEG library proper</div><div class='del'>-LIBSOURCES= jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c \</div><div class='del'>-        jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c \</div><div class='del'>-        jcomapi.c jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c \</div><div class='del'>-        jdapistd.c jdarith.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c \</div><div class='del'>-        jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c \</div><div class='del'>-        jdmerge.c jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c \</div><div class='del'>-        jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c jquant1.c \</div><div class='del'>-        jquant2.c jutils.c jmemmgr.c</div><div class='del'>-# memmgr back ends: compile only one of these into a working library</div><div class='del'>-SYSDEPSOURCES= jmemansi.c jmemname.c jmemnobs.c jmemdos.c jmemmac.c</div><div class='del'>-# source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom</div><div class='del'>-APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c \</div><div class='del'>-        rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c \</div><div class='del'>-        rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c</div><div class='del'>-SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES)</div><div class='del'>-# files included by source files</div><div class='del'>-INCLUDES= jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h jpegint.h \</div><div class='del'>-        jpeglib.h jversion.h cdjpeg.h cderror.h transupp.h</div><div class='del'>-# documentation, test, and support files</div><div class='del'>-DOCS= README install.txt usage.txt cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \</div><div class='del'>-        wrjpgcom.1 wizard.txt example.c libjpeg.txt structure.txt \</div><div class='del'>-        coderules.txt filelist.txt change.log</div><div class='del'>-MKFILES= configure Makefile.in makefile.ansi makefile.unix makefile.bcc \</div><div class='del'>-        makefile.mc6 makefile.dj makefile.wat makefile.vc makejdsw.vc6 \</div><div class='del'>-        makeadsw.vc6 makejdep.vc6 makejdsp.vc6 makejmak.vc6 makecdep.vc6 \</div><div class='del'>-        makecdsp.vc6 makecmak.vc6 makeddep.vc6 makeddsp.vc6 makedmak.vc6 \</div><div class='del'>-        maketdep.vc6 maketdsp.vc6 maketmak.vc6 makerdep.vc6 makerdsp.vc6 \</div><div class='del'>-        makermak.vc6 makewdep.vc6 makewdsp.vc6 makewmak.vc6 makejsln.vc9 \</div><div class='del'>-        makeasln.vc9 makejvcp.vc9 makecvcp.vc9 makedvcp.vc9 maketvcp.vc9 \</div><div class='del'>-        makervcp.vc9 makewvcp.vc9 makeproj.mac makcjpeg.st makdjpeg.st \</div><div class='del'>-        makljpeg.st maktjpeg.st makefile.manx makefile.sas makefile.mms \</div><div class='del'>-        makefile.vms makvms.opt</div><div class='del'>-CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat \</div><div class='del'>-        jconfig.vc jconfig.mac jconfig.st jconfig.manx jconfig.sas \</div><div class='del'>-        jconfig.vms</div><div class='del'>-CONFIGUREFILES= config.guess config.sub install-sh ltmain.sh depcomp missing</div><div class='del'>-OTHERFILES= jconfig.txt ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm \</div><div class='del'>-        libjpeg.map</div><div class='del'>-TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \</div><div class='del'>-        testimgp.jpg</div><div class='del'>-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \</div><div class='del'>-        $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)</div><div class='del'>-# library object files common to compression and decompression</div><div class='del'>-COMOBJECTS= jaricom.obj jcomapi.obj jutils.obj jerror.obj jmemmgr.obj $(SYSDEPMEM)</div><div class='del'>-# compression library object files</div><div class='del'>-CLIBOBJECTS= jcapimin.obj jcapistd.obj jcarith.obj jctrans.obj jcparam.obj \</div><div class='del'>-        jdatadst.obj jcinit.obj jcmaster.obj jcmarker.obj jcmainct.obj \</div><div class='del'>-        jcprepct.obj jccoefct.obj jccolor.obj jcsample.obj jchuff.obj \</div><div class='del'>-        jcdctmgr.obj jfdctfst.obj jfdctflt.obj jfdctint.obj</div><div class='del'>-# decompression library object files</div><div class='del'>-DLIBOBJECTS= jdapimin.obj jdapistd.obj jdarith.obj jdtrans.obj jdatasrc.obj \</div><div class='del'>-        jdmaster.obj jdinput.obj jdmarker.obj jdhuff.obj jdmainct.obj \</div><div class='del'>-        jdcoefct.obj jdpostct.obj jddctmgr.obj jidctfst.obj jidctflt.obj \</div><div class='del'>-        jidctint.obj jdsample.obj jdcolor.obj jquant1.obj jquant2.obj \</div><div class='del'>-        jdmerge.obj</div><div class='del'>-# These objectfiles are included in libjpeg.lib</div><div class='del'>-LIBOBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)</div><div class='del'>-# object files for sample applications (excluding library files)</div><div class='del'>-COBJECTS= cjpeg.obj rdppm.obj rdgif.obj rdtarga.obj rdrle.obj rdbmp.obj \</div><div class='del'>-        rdswitch.obj cdjpeg.obj</div><div class='del'>-DOBJECTS= djpeg.obj wrppm.obj wrgif.obj wrtarga.obj wrrle.obj wrbmp.obj \</div><div class='del'>-        rdcolmap.obj cdjpeg.obj</div><div class='del'>-TROBJECTS= jpegtran.obj rdswitch.obj cdjpeg.obj transupp.obj</div><div class='del'>-</div><div class='del'>-# Template command for compiling .c to .obj</div><div class='del'>-.c.obj:</div><div class='del'>-	$(cc) $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-all: libjpeg.lib cjpeg.exe djpeg.exe jpegtran.exe rdjpgcom.exe wrjpgcom.exe</div><div class='del'>-</div><div class='del'>-libjpeg.lib: $(LIBOBJECTS)</div><div class='del'>-	$(RM) libjpeg.lib</div><div class='del'>-	lib -out:libjpeg.lib  $(LIBOBJECTS)</div><div class='del'>-</div><div class='del'>-cjpeg.exe: $(COBJECTS) libjpeg.lib</div><div class='del'>-	$(link) $(LDFLAGS) -out:cjpeg.exe $(COBJECTS) libjpeg.lib $(LDLIBS)</div><div class='del'>-</div><div class='del'>-djpeg.exe: $(DOBJECTS) libjpeg.lib</div><div class='del'>-	$(link) $(LDFLAGS) -out:djpeg.exe $(DOBJECTS) libjpeg.lib $(LDLIBS)</div><div class='del'>-</div><div class='del'>-jpegtran.exe: $(TROBJECTS) libjpeg.lib</div><div class='del'>-	$(link) $(LDFLAGS) -out:jpegtran.exe $(TROBJECTS) libjpeg.lib $(LDLIBS)</div><div class='del'>-</div><div class='del'>-rdjpgcom.exe: rdjpgcom.obj</div><div class='del'>-	$(link) $(LDFLAGS) -out:rdjpgcom.exe rdjpgcom.obj $(LDLIBS)</div><div class='del'>-</div><div class='del'>-wrjpgcom.exe: wrjpgcom.obj</div><div class='del'>-	$(link) $(LDFLAGS) -out:wrjpgcom.exe wrjpgcom.obj $(LDLIBS)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM) *.obj *.exe libjpeg.lib</div><div class='del'>-	$(RM) testout*</div><div class='del'>-</div><div class='del'>-test: cjpeg.exe djpeg.exe jpegtran.exe</div><div class='del'>-	$(RM) testout*</div><div class='del'>-	.\djpeg -dct int -ppm -outfile testout.ppm  testorig.jpg</div><div class='del'>-	.\djpeg -dct int -bmp -colors 256 -outfile testout.bmp  testorig.jpg</div><div class='del'>-	.\cjpeg -dct int -outfile testout.jpg  testimg.ppm</div><div class='del'>-	.\djpeg -dct int -ppm -outfile testoutp.ppm testprog.jpg</div><div class='del'>-	.\cjpeg -dct int -progressive -opt -outfile testoutp.jpg testimg.ppm</div><div class='del'>-	.\jpegtran -outfile testoutt.jpg testprog.jpg</div><div class='del'>-	fc /b testimg.ppm testout.ppm</div><div class='del'>-	fc /b testimg.bmp testout.bmp</div><div class='del'>-	fc /b testimg.jpg testout.jpg</div><div class='del'>-	fc /b testimg.ppm testoutp.ppm</div><div class='del'>-	fc /b testimgp.jpg testoutp.jpg</div><div class='del'>-	fc /b testorig.jpg testoutt.jpg</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-jaricom.obj: jaricom.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapimin.obj: jcapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapistd.obj: jcapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcarith.obj: jcarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccoefct.obj: jccoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccolor.obj: jccolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcdctmgr.obj: jcdctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jchuff.obj: jchuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcinit.obj: jcinit.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmainct.obj: jcmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmarker.obj: jcmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmaster.obj: jcmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcomapi.obj: jcomapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcparam.obj: jcparam.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcprepct.obj: jcprepct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcsample.obj: jcsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jctrans.obj: jctrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapimin.obj: jdapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapistd.obj: jdapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdarith.obj: jdarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdatadst.obj: jdatadst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdatasrc.obj: jdatasrc.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdcoefct.obj: jdcoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdcolor.obj: jdcolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jddctmgr.obj: jddctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jdhuff.obj: jdhuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdinput.obj: jdinput.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmainct.obj: jdmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmarker.obj: jdmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmaster.obj: jdmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmerge.obj: jdmerge.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdpostct.obj: jdpostct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdsample.obj: jdsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdtrans.obj: jdtrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jerror.obj: jerror.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jversion.h jerror.h</div><div class='del'>-jfdctflt.obj: jfdctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctfst.obj: jfdctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctint.obj: jfdctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctflt.obj: jidctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctfst.obj: jidctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctint.obj: jidctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jquant1.obj: jquant1.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jquant2.obj: jquant2.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jutils.obj: jutils.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jmemmgr.obj: jmemmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemansi.obj: jmemansi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemname.obj: jmemname.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemnobs.obj: jmemnobs.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemdos.obj: jmemdos.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemmac.obj: jmemmac.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-cjpeg.obj: cjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-djpeg.obj: djpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-jpegtran.obj: jpegtran.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h transupp.h jversion.h</div><div class='del'>-rdjpgcom.obj: rdjpgcom.c jinclude.h jconfig.h</div><div class='del'>-wrjpgcom.obj: wrjpgcom.c jinclude.h jconfig.h</div><div class='del'>-cdjpeg.obj: cdjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdcolmap.obj: rdcolmap.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdswitch.obj: rdswitch.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-transupp.obj: transupp.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h transupp.h</div><div class='del'>-rdppm.obj: rdppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrppm.obj: wrppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdgif.obj: rdgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrgif.obj: wrgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdtarga.obj: rdtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrtarga.obj: wrtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdbmp.obj: rdbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrbmp.obj: wrbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdrle.obj: rdrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrrle.obj: wrrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makefile.vms b/src/3rdparty/libjpeg/makefile.vms<br/>deleted file mode 100644<br/>index a07d070..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makefile.vms?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.vms</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,142 +0,0 @@</div><div class='del'>-$! Makefile for Independent JPEG Group's software</div><div class='del'>-$!</div><div class='del'>-$! This is a command procedure for Digital VMS systems that do not have MMS.</div><div class='del'>-$! It builds the JPEG software by brute force, recompiling everything whether</div><div class='del'>-$! or not it is necessary.  It then runs the basic self-test.</div><div class='del'>-$! Thanks to Rick Dyson (dyson@iowasp.physics.uiowa.edu)</div><div class='del'>-$! and Tim Bell (tbell@netcom.com) for their help.</div><div class='del'>-$!</div><div class='del'>-$! Read installation instructions before running this!!</div><div class='del'>-$!</div><div class='del'>-$ If F$Mode () .eqs. "INTERACTIVE"</div><div class='del'>-$   Then</div><div class='del'>-$       VERIFY = F$Verify (0)</div><div class='del'>-$   Else</div><div class='del'>-$       VERIFY = F$Verify (1)</div><div class='del'>-$ EndIf</div><div class='del'>-$ On Control_Y Then GoTo End</div><div class='del'>-$ On Error     Then GoTo End</div><div class='del'>-$</div><div class='del'>-$ If F$GetSyi ("HW_MODEL") .gt. 1023 </div><div class='del'>-$   Then</div><div class='del'>-$       OPT = ""</div><div class='del'>-$   Else</div><div class='del'>-$       OPT = ",Sys$Disk:[]makvms.opt/Option"</div><div class='del'>-$ EndIf</div><div class='del'>-$ </div><div class='del'>-$ DoCompile := CC /NoDebug /Optimize /NoList</div><div class='del'>-$!</div><div class='del'>-$ DoCompile jaricom.c</div><div class='del'>-$ DoCompile jcapimin.c</div><div class='del'>-$ DoCompile jcapistd.c</div><div class='del'>-$ DoCompile jcarith.c</div><div class='del'>-$ DoCompile jctrans.c</div><div class='del'>-$ DoCompile jcparam.c</div><div class='del'>-$ DoCompile jdatadst.c</div><div class='del'>-$ DoCompile jcinit.c</div><div class='del'>-$ DoCompile jcmaster.c</div><div class='del'>-$ DoCompile jcmarker.c</div><div class='del'>-$ DoCompile jcmainct.c</div><div class='del'>-$ DoCompile jcprepct.c</div><div class='del'>-$ DoCompile jccoefct.c</div><div class='del'>-$ DoCompile jccolor.c</div><div class='del'>-$ DoCompile jcsample.c</div><div class='del'>-$ DoCompile jchuff.c</div><div class='del'>-$ DoCompile jcdctmgr.c</div><div class='del'>-$ DoCompile jfdctfst.c</div><div class='del'>-$ DoCompile jfdctflt.c</div><div class='del'>-$ DoCompile jfdctint.c</div><div class='del'>-$ DoCompile jdapimin.c</div><div class='del'>-$ DoCompile jdapistd.c</div><div class='del'>-$ DoCompile jdarith.c</div><div class='del'>-$ DoCompile jdtrans.c</div><div class='del'>-$ DoCompile jdatasrc.c</div><div class='del'>-$ DoCompile jdmaster.c</div><div class='del'>-$ DoCompile jdinput.c</div><div class='del'>-$ DoCompile jdmarker.c</div><div class='del'>-$ DoCompile jdhuff.c</div><div class='del'>-$ DoCompile jdmainct.c</div><div class='del'>-$ DoCompile jdcoefct.c</div><div class='del'>-$ DoCompile jdpostct.c</div><div class='del'>-$ DoCompile jddctmgr.c</div><div class='del'>-$ DoCompile jidctfst.c</div><div class='del'>-$ DoCompile jidctflt.c</div><div class='del'>-$ DoCompile jidctint.c</div><div class='del'>-$ DoCompile jdsample.c</div><div class='del'>-$ DoCompile jdcolor.c</div><div class='del'>-$ DoCompile jquant1.c</div><div class='del'>-$ DoCompile jquant2.c</div><div class='del'>-$ DoCompile jdmerge.c</div><div class='del'>-$ DoCompile jcomapi.c</div><div class='del'>-$ DoCompile jutils.c</div><div class='del'>-$ DoCompile jerror.c</div><div class='del'>-$ DoCompile jmemmgr.c</div><div class='del'>-$ DoCompile jmemnobs.c</div><div class='del'>-$!</div><div class='del'>-$ Library /Create libjpeg.olb  jaricom.obj,jcapimin.obj,jcapistd.obj, -</div><div class='del'>-          jcarith.obj,jctrans.obj,jcparam.obj,jdatadst.obj,jcinit.obj, -</div><div class='del'>-          jcmaster.obj,jcmarker.obj,jcmainct.obj,jcprepct.obj,jccoefct.obj, -</div><div class='del'>-          jccolor.obj,jcsample.obj,jchuff.obj,jcdctmgr.obj,jfdctfst.obj, -</div><div class='del'>-          jfdctflt.obj,jfdctint.obj,jdapimin.obj,jdapistd.obj,jdarith.obj, -</div><div class='del'>-          jdtrans.obj,jdatasrc.obj,jdmaster.obj,jdinput.obj,jdmarker.obj, -</div><div class='del'>-          jdhuff.obj,jdmainct.obj,jdcoefct.obj,jdpostct.obj,jddctmgr.obj, -</div><div class='del'>-          jidctfst.obj,jidctflt.obj,jidctint.obj,jdsample.obj,jdcolor.obj, -</div><div class='del'>-          jquant1.obj,jquant2.obj,jdmerge.obj,jcomapi.obj,jutils.obj, -</div><div class='del'>-          jerror.obj,jmemmgr.obj,jmemnobs.obj</div><div class='del'>-$!</div><div class='del'>-$ DoCompile cjpeg.c</div><div class='del'>-$ DoCompile rdppm.c</div><div class='del'>-$ DoCompile rdgif.c</div><div class='del'>-$ DoCompile rdtarga.c</div><div class='del'>-$ DoCompile rdrle.c</div><div class='del'>-$ DoCompile rdbmp.c</div><div class='del'>-$ DoCompile rdswitch.c</div><div class='del'>-$ DoCompile cdjpeg.c</div><div class='del'>-$!</div><div class='del'>-$ Link /NoMap /Executable = cjpeg.exe  cjpeg.obj,rdppm.obj,rdgif.obj, -</div><div class='del'>-          rdtarga.obj,rdrle.obj,rdbmp.obj,rdswitch.obj,cdjpeg.obj,libjpeg.olb/Library'OPT'</div><div class='del'>-$!</div><div class='del'>-$ DoCompile djpeg.c</div><div class='del'>-$ DoCompile wrppm.c</div><div class='del'>-$ DoCompile wrgif.c</div><div class='del'>-$ DoCompile wrtarga.c</div><div class='del'>-$ DoCompile wrrle.c</div><div class='del'>-$ DoCompile wrbmp.c</div><div class='del'>-$ DoCompile rdcolmap.c</div><div class='del'>-$ DoCompile cdjpeg.c</div><div class='del'>-$!</div><div class='del'>-$ Link /NoMap /Executable = djpeg.exe  djpeg.obj,wrppm.obj,wrgif.obj, -</div><div class='del'>-          wrtarga.obj,wrrle.obj,wrbmp.obj,rdcolmap.obj,cdjpeg.obj,libjpeg.olb/Library'OPT'</div><div class='del'>-$!</div><div class='del'>-$ DoCompile jpegtran.c</div><div class='del'>-$ DoCompile rdswitch.c</div><div class='del'>-$ DoCompile cdjpeg.c</div><div class='del'>-$ DoCompile transupp.c</div><div class='del'>-$!</div><div class='del'>-$ Link /NoMap /Executable = jpegtran.exe  jpegtran.obj,rdswitch.obj, -</div><div class='del'>-          cdjpeg.obj,transupp.obj,libjpeg.olb/Library'OPT'</div><div class='del'>-$!</div><div class='del'>-$ DoCompile rdjpgcom.c</div><div class='del'>-$ Link /NoMap /Executable = rdjpgcom.exe  rdjpgcom.obj'OPT'</div><div class='del'>-$!</div><div class='del'>-$ DoCompile wrjpgcom.c</div><div class='del'>-$ Link /NoMap /Executable = wrjpgcom.exe  wrjpgcom.obj'OPT'</div><div class='del'>-$!</div><div class='del'>-$! Run the self-test</div><div class='del'>-$!</div><div class='del'>-$ mcr sys$disk:[]djpeg -dct int -ppm -outfile testout.ppm testorig.jpg</div><div class='del'>-$ mcr sys$disk:[]djpeg -dct int -bmp -colors 256 -outfile testout.bmp testorig.jpg</div><div class='del'>-$ mcr sys$disk:[]cjpeg -dct int      -outfile testout.jpg testimg.ppm</div><div class='del'>-$ mcr sys$disk:[]djpeg -dct int -ppm -outfile testoutp.ppm testprog.jpg</div><div class='del'>-$ mcr sys$disk:[]cjpeg -dct int -progressive -opt -outfile testoutp.jpg testimg.ppm</div><div class='del'>-$ mcr sys$disk:[]jpegtran -outfile testoutt.jpg testprog.jpg</div><div class='del'>-$ Backup /Compare/Log testimg.ppm testout.ppm</div><div class='del'>-$ Backup /Compare/Log testimg.bmp testout.bmp</div><div class='del'>-$ Backup /Compare/Log testimg.jpg testout.jpg</div><div class='del'>-$ Backup /Compare/Log testimg.ppm testoutp.ppm</div><div class='del'>-$ Backup /Compare/Log testimgp.jpg testoutp.jpg</div><div class='del'>-$ Backup /Compare/Log testorig.jpg testoutt.jpg</div><div class='del'>-$!</div><div class='del'>-$End:</div><div class='del'>-$   If Verify Then Set Verify</div><div class='del'>-$ Exit</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makefile.wat b/src/3rdparty/libjpeg/makefile.wat<br/>deleted file mode 100644<br/>index f7ef6e6..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makefile.wat?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makefile.wat</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,239 +0,0 @@</div><div class='del'>-# Makefile for Independent JPEG Group's software</div><div class='del'>-</div><div class='del'>-# This makefile is suitable for Watcom C/C++ 10.0 on MS-DOS (using</div><div class='del'>-# dos4g extender), OS/2, and Windows NT console mode.</div><div class='del'>-# Thanks to Janos Haide, jhaide@btrvtech.com.</div><div class='del'>-</div><div class='del'>-# Read installation instructions before saying "wmake" !!</div><div class='del'>-</div><div class='del'>-# Uncomment line for desired system</div><div class='del'>-SYSTEM=DOS</div><div class='del'>-#SYSTEM=OS2</div><div class='del'>-#SYSTEM=NT</div><div class='del'>-</div><div class='del'>-# The name of your C compiler:</div><div class='del'>-CC= wcl386</div><div class='del'>-</div><div class='del'>-# You may need to adjust these cc options:</div><div class='del'>-CFLAGS= -4r -ort -wx -zq -bt=$(SYSTEM)</div><div class='del'>-# Caution: avoid -ol or -ox; these generate bad code with 10.0 or 10.0a.</div><div class='del'>-# Generally, we recommend defining any configuration symbols in jconfig.h,</div><div class='del'>-# NOT via -D switches here.</div><div class='del'>-</div><div class='del'>-# Link-time cc options:</div><div class='del'>-!ifeq SYSTEM DOS</div><div class='del'>-LDFLAGS= -zq -l=dos4g</div><div class='del'>-!else ifeq SYSTEM OS2</div><div class='del'>-LDFLAGS= -zq -l=os2v2</div><div class='del'>-!else ifeq SYSTEM NT</div><div class='del'>-LDFLAGS= -zq -l=nt</div><div class='del'>-!endif</div><div class='del'>-</div><div class='del'>-# Put here the object file name for the correct system-dependent memory</div><div class='del'>-# manager file.  jmemnobs should work fine for dos4g or OS/2 environment.</div><div class='del'>-SYSDEPMEM= jmemnobs.obj</div><div class='del'>-</div><div class='del'>-# End of configurable options.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# source files: JPEG library proper</div><div class='del'>-LIBSOURCES= jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c &amp;</div><div class='del'>-        jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c &amp;</div><div class='del'>-        jcomapi.c jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c &amp;</div><div class='del'>-        jdapistd.c jdarith.c jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c &amp;</div><div class='del'>-        jddctmgr.c jdhuff.c jdinput.c jdmainct.c jdmarker.c jdmaster.c &amp;</div><div class='del'>-        jdmerge.c jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c &amp;</div><div class='del'>-        jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c jquant1.c &amp;</div><div class='del'>-        jquant2.c jutils.c jmemmgr.c</div><div class='del'>-# memmgr back ends: compile only one of these into a working library</div><div class='del'>-SYSDEPSOURCES= jmemansi.c jmemname.c jmemnobs.c jmemdos.c jmemmac.c</div><div class='del'>-# source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom</div><div class='del'>-APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c &amp;</div><div class='del'>-        rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c &amp;</div><div class='del'>-        rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c</div><div class='del'>-SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES)</div><div class='del'>-# files included by source files</div><div class='del'>-INCLUDES= jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h jpegint.h &amp;</div><div class='del'>-        jpeglib.h jversion.h cdjpeg.h cderror.h transupp.h</div><div class='del'>-# documentation, test, and support files</div><div class='del'>-DOCS= README install.txt usage.txt cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 &amp;</div><div class='del'>-        wrjpgcom.1 wizard.txt example.c libjpeg.txt structure.txt &amp;</div><div class='del'>-        coderules.txt filelist.txt change.log</div><div class='del'>-MKFILES= configure Makefile.in makefile.ansi makefile.unix makefile.bcc &amp;</div><div class='del'>-        makefile.mc6 makefile.dj makefile.wat makefile.vc makejdsw.vc6 &amp;</div><div class='del'>-        makeadsw.vc6 makejdep.vc6 makejdsp.vc6 makejmak.vc6 makecdep.vc6 &amp;</div><div class='del'>-        makecdsp.vc6 makecmak.vc6 makeddep.vc6 makeddsp.vc6 makedmak.vc6 &amp;</div><div class='del'>-        maketdep.vc6 maketdsp.vc6 maketmak.vc6 makerdep.vc6 makerdsp.vc6 &amp;</div><div class='del'>-        makermak.vc6 makewdep.vc6 makewdsp.vc6 makewmak.vc6 makejsln.vc9 &amp;</div><div class='del'>-        makeasln.vc9 makejvcp.vc9 makecvcp.vc9 makedvcp.vc9 maketvcp.vc9 &amp;</div><div class='del'>-        makervcp.vc9 makewvcp.vc9 makeproj.mac makcjpeg.st makdjpeg.st &amp;</div><div class='del'>-        makljpeg.st maktjpeg.st makefile.manx makefile.sas makefile.mms &amp;</div><div class='del'>-        makefile.vms makvms.opt</div><div class='del'>-CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat &amp;</div><div class='del'>-        jconfig.vc jconfig.mac jconfig.st jconfig.manx jconfig.sas &amp;</div><div class='del'>-        jconfig.vms</div><div class='del'>-CONFIGUREFILES= config.guess config.sub install-sh ltmain.sh depcomp missing</div><div class='del'>-OTHERFILES= jconfig.txt ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm &amp;</div><div class='del'>-        libjpeg.map</div><div class='del'>-TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg &amp;</div><div class='del'>-        testimgp.jpg</div><div class='del'>-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) &amp;</div><div class='del'>-        $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)</div><div class='del'>-# library object files common to compression and decompression</div><div class='del'>-COMOBJECTS= jaricom.obj jcomapi.obj jutils.obj jerror.obj jmemmgr.obj $(SYSDEPMEM)</div><div class='del'>-# compression library object files</div><div class='del'>-CLIBOBJECTS= jcapimin.obj jcapistd.obj jcarith.obj jctrans.obj jcparam.obj &amp;</div><div class='del'>-        jdatadst.obj jcinit.obj jcmaster.obj jcmarker.obj jcmainct.obj &amp;</div><div class='del'>-        jcprepct.obj jccoefct.obj jccolor.obj jcsample.obj jchuff.obj &amp;</div><div class='del'>-        jcdctmgr.obj jfdctfst.obj jfdctflt.obj jfdctint.obj</div><div class='del'>-# decompression library object files</div><div class='del'>-DLIBOBJECTS= jdapimin.obj jdapistd.obj jdarith.obj jdtrans.obj jdatasrc.obj &amp;</div><div class='del'>-        jdmaster.obj jdinput.obj jdmarker.obj jdhuff.obj jdmainct.obj &amp;</div><div class='del'>-        jdcoefct.obj jdpostct.obj jddctmgr.obj jidctfst.obj jidctflt.obj &amp;</div><div class='del'>-        jidctint.obj jdsample.obj jdcolor.obj jquant1.obj jquant2.obj &amp;</div><div class='del'>-        jdmerge.obj</div><div class='del'>-# These objectfiles are included in libjpeg.lib</div><div class='del'>-LIBOBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)</div><div class='del'>-# object files for sample applications (excluding library files)</div><div class='del'>-COBJECTS= cjpeg.obj rdppm.obj rdgif.obj rdtarga.obj rdrle.obj rdbmp.obj &amp;</div><div class='del'>-        rdswitch.obj cdjpeg.obj</div><div class='del'>-DOBJECTS= djpeg.obj wrppm.obj wrgif.obj wrtarga.obj wrrle.obj wrbmp.obj &amp;</div><div class='del'>-        rdcolmap.obj cdjpeg.obj</div><div class='del'>-TROBJECTS= jpegtran.obj rdswitch.obj cdjpeg.obj transupp.obj</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-all: libjpeg.lib cjpeg.exe djpeg.exe jpegtran.exe rdjpgcom.exe wrjpgcom.exe</div><div class='del'>-</div><div class='del'>-libjpeg.lib: $(LIBOBJECTS)</div><div class='del'>-	- del libjpeg.lib</div><div class='del'>-	* wlib -n libjpeg.lib $(LIBOBJECTS)</div><div class='del'>-</div><div class='del'>-cjpeg.exe: $(COBJECTS) libjpeg.lib</div><div class='del'>-	$(CC) $(LDFLAGS) $(COBJECTS) libjpeg.lib</div><div class='del'>-</div><div class='del'>-djpeg.exe: $(DOBJECTS) libjpeg.lib</div><div class='del'>-	$(CC) $(LDFLAGS) $(DOBJECTS) libjpeg.lib</div><div class='del'>-</div><div class='del'>-jpegtran.exe: $(TROBJECTS) libjpeg.lib</div><div class='del'>-	$(CC) $(LDFLAGS) $(TROBJECTS) libjpeg.lib</div><div class='del'>-</div><div class='del'>-rdjpgcom.exe: rdjpgcom.c</div><div class='del'>-	$(CC) $(CFLAGS) $(LDFLAGS) rdjpgcom.c</div><div class='del'>-</div><div class='del'>-wrjpgcom.exe: wrjpgcom.c</div><div class='del'>-	$(CC) $(CFLAGS) $(LDFLAGS) wrjpgcom.c</div><div class='del'>-</div><div class='del'>-.c.obj:</div><div class='del'>-	$(CC) $(CFLAGS) -c $&lt;</div><div class='del'>-</div><div class='del'>-jconfig.h: jconfig.txt</div><div class='del'>-	echo You must prepare a system-dependent jconfig.h file.</div><div class='del'>-	echo Please read the installation directions in install.txt.</div><div class='del'>-	exit 1</div><div class='del'>-</div><div class='del'>-clean: .SYMBOLIC</div><div class='del'>-	- del *.obj</div><div class='del'>-	- del libjpeg.lib</div><div class='del'>-	- del cjpeg.exe</div><div class='del'>-	- del djpeg.exe</div><div class='del'>-	- del jpegtran.exe</div><div class='del'>-	- del rdjpgcom.exe</div><div class='del'>-	- del wrjpgcom.exe</div><div class='del'>-	- del testout*.*</div><div class='del'>-</div><div class='del'>-test: cjpeg.exe djpeg.exe jpegtran.exe  .SYMBOLIC</div><div class='del'>-	- del testout*.*</div><div class='del'>-	djpeg -dct int -ppm -outfile testout.ppm  testorig.jpg</div><div class='del'>-	djpeg -dct int -bmp -colors 256 -outfile testout.bmp  testorig.jpg</div><div class='del'>-	cjpeg -dct int -outfile testout.jpg  testimg.ppm</div><div class='del'>-	djpeg -dct int -ppm -outfile testoutp.ppm testprog.jpg</div><div class='del'>-	cjpeg -dct int -progressive -opt -outfile testoutp.jpg testimg.ppm</div><div class='del'>-	jpegtran -outfile testoutt.jpg testprog.jpg</div><div class='del'>-!ifeq SYSTEM DOS</div><div class='del'>-	fc /b testimg.ppm testout.ppm</div><div class='del'>-	fc /b testimg.bmp testout.bmp</div><div class='del'>-	fc /b testimg.jpg testout.jpg</div><div class='del'>-	fc /b testimg.ppm testoutp.ppm</div><div class='del'>-	fc /b testimgp.jpg testoutp.jpg</div><div class='del'>-	fc /b testorig.jpg testoutt.jpg</div><div class='del'>-!else</div><div class='del'>-	echo n &gt; n.tmp</div><div class='del'>-	comp testimg.ppm testout.ppm &lt; n.tmp</div><div class='del'>-	comp testimg.bmp testout.bmp &lt; n.tmp</div><div class='del'>-	comp testimg.jpg testout.jpg &lt; n.tmp</div><div class='del'>-	comp testimg.ppm testoutp.ppm &lt; n.tmp</div><div class='del'>-	comp testimgp.jpg testoutp.jpg &lt; n.tmp</div><div class='del'>-	comp testorig.jpg testoutt.jpg &lt; n.tmp</div><div class='del'>-	del n.tmp</div><div class='del'>-!endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-jaricom.obj: jaricom.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapimin.obj: jcapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcapistd.obj: jcapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcarith.obj: jcarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccoefct.obj: jccoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jccolor.obj: jccolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcdctmgr.obj: jcdctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jchuff.obj: jchuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcinit.obj: jcinit.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmainct.obj: jcmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmarker.obj: jcmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcmaster.obj: jcmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcomapi.obj: jcomapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcparam.obj: jcparam.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcprepct.obj: jcprepct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jcsample.obj: jcsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jctrans.obj: jctrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapimin.obj: jdapimin.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdapistd.obj: jdapistd.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdarith.obj: jdarith.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdatadst.obj: jdatadst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdatasrc.obj: jdatasrc.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h</div><div class='del'>-jdcoefct.obj: jdcoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdcolor.obj: jdcolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jddctmgr.obj: jddctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jdhuff.obj: jdhuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdinput.obj: jdinput.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmainct.obj: jdmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmarker.obj: jdmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmaster.obj: jdmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdmerge.obj: jdmerge.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdpostct.obj: jdpostct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdsample.obj: jdsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jdtrans.obj: jdtrans.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jerror.obj: jerror.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jversion.h jerror.h</div><div class='del'>-jfdctflt.obj: jfdctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctfst.obj: jfdctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jfdctint.obj: jfdctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctflt.obj: jidctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctfst.obj: jidctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jidctint.obj: jidctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jdct.h</div><div class='del'>-jquant1.obj: jquant1.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jquant2.obj: jquant2.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jutils.obj: jutils.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h</div><div class='del'>-jmemmgr.obj: jmemmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemansi.obj: jmemansi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemname.obj: jmemname.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemnobs.obj: jmemnobs.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemdos.obj: jmemdos.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-jmemmac.obj: jmemmac.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h jmemsys.h</div><div class='del'>-cjpeg.obj: cjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-djpeg.obj: djpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h</div><div class='del'>-jpegtran.obj: jpegtran.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h transupp.h jversion.h</div><div class='del'>-rdjpgcom.obj: rdjpgcom.c jinclude.h jconfig.h</div><div class='del'>-wrjpgcom.obj: wrjpgcom.c jinclude.h jconfig.h</div><div class='del'>-cdjpeg.obj: cdjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdcolmap.obj: rdcolmap.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdswitch.obj: rdswitch.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-transupp.obj: transupp.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h jerror.h transupp.h</div><div class='del'>-rdppm.obj: rdppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrppm.obj: wrppm.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdgif.obj: rdgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrgif.obj: wrgif.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdtarga.obj: rdtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrtarga.obj: wrtarga.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdbmp.obj: rdbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrbmp.obj: wrbmp.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-rdrle.obj: rdrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='del'>-wrrle.obj: wrrle.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makejdep.vc6 b/src/3rdparty/libjpeg/makejdep.vc6<br/>deleted file mode 100644<br/>index 1065b21..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makejdep.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makejdep.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,423 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio erstellte Abh„ngigkeitsdatei, einbezogen von jpeg.mak</div><div class='del'>-</div><div class='del'>-.\jaricom.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jcapimin.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jcapistd.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jcarith.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jccoefct.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jccolor.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jcdctmgr.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jdct.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jchuff.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jcinit.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jcmainct.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jcmarker.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jcmaster.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jcomapi.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jcparam.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jcprepct.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jcsample.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jctrans.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jdapimin.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jdapistd.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jdarith.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jdatadst.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jdatasrc.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jdcoefct.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jdcolor.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jddctmgr.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jdct.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jdhuff.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jdinput.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jdmainct.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jdmarker.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jdmaster.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jdmerge.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jdpostct.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jdsample.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jdtrans.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jerror.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	".\jversion.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jfdctflt.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jdct.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jfdctfst.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jdct.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jfdctint.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jdct.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jidctflt.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jdct.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jidctfst.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jdct.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jidctint.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jdct.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jmemmgr.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmemsys.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jmemnobs.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmemsys.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jquant1.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jquant2.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jutils.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makejdsp.vc6 b/src/3rdparty/libjpeg/makejdsp.vc6<br/>deleted file mode 100644<br/>index 738f1ab..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makejdsp.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makejdsp.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,285 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Project File - Name="jpeg" - Package Owner=&lt;4&gt;</div><div class='del'>-# Microsoft Developer Studio Generated Build File, Format Version 6.00</div><div class='del'>-# ** NICHT BEARBEITEN **</div><div class='del'>-</div><div class='del'>-# TARGTYPE "Win32 (x86) Static Library" 0x0104</div><div class='del'>-</div><div class='del'>-CFG=jpeg - Win32</div><div class='del'>-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE</div><div class='del'>-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "jpeg.mak".</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE Sie k÷nnen beim Ausf�hren von NMAKE eine Konfiguration angeben</div><div class='del'>-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "jpeg.mak" CFG="jpeg - Win32"</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE F�r die Konfiguration stehen zur Auswahl:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE "jpeg - Win32" (basierend auf  "Win32 (x86) Static Library")</div><div class='del'>-!MESSAGE </div><div class='del'>-</div><div class='del'>-# Begin Project</div><div class='del'>-# PROP AllowPerConfigDependencies 0</div><div class='del'>-# PROP Scc_ProjName ""</div><div class='del'>-# PROP Scc_LocalPath ""</div><div class='del'>-CPP=cl.exe</div><div class='del'>-RSC=rc.exe</div><div class='del'>-# PROP BASE Use_MFC 0</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0</div><div class='del'>-# PROP BASE Output_Dir ".\Release"</div><div class='del'>-# PROP BASE Intermediate_Dir ".\Release"</div><div class='del'>-# PROP BASE Target_Dir ""</div><div class='del'>-# PROP Use_MFC 0</div><div class='del'>-# PROP Use_Debug_Libraries 0</div><div class='del'>-# PROP Output_Dir ".\Release"</div><div class='del'>-# PROP Intermediate_Dir ".\Release"</div><div class='del'>-# PROP Target_Dir ""</div><div class='del'>-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c</div><div class='del'>-# ADD CPP /nologo /G6 /MT /W3 /GX /Ox /Oa /Ob2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c</div><div class='del'>-# ADD BASE RSC /l 0x407</div><div class='del'>-# ADD RSC /l 0x407</div><div class='del'>-BSC32=bscmake.exe</div><div class='del'>-# ADD BASE BSC32 /nologo</div><div class='del'>-# ADD BSC32 /nologo</div><div class='del'>-LIB32=link.exe -lib</div><div class='del'>-# ADD BASE LIB32 /nologo</div><div class='del'>-# ADD LIB32 /nologo</div><div class='del'>-# Begin Target</div><div class='del'>-</div><div class='del'>-# Name "jpeg - Win32"</div><div class='del'>-# Begin Group "Quellcodedateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jaricom.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcapimin.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcapistd.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcarith.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jccoefct.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jccolor.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcdctmgr.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jchuff.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcinit.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcmainct.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcmarker.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcmaster.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcomapi.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcparam.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcprepct.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcsample.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jctrans.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdapimin.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdapistd.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdarith.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdatadst.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdatasrc.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdcoefct.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdcolor.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jddctmgr.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdhuff.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdinput.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdmainct.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdmarker.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdmaster.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdmerge.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdpostct.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdsample.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdtrans.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jerror.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jfdctflt.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jfdctfst.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jfdctint.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jidctflt.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jidctfst.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jidctint.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jmemmgr.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jmemnobs.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jquant1.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jquant2.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jutils.c</div><div class='del'>-# End Source File</div><div class='del'>-# End Group</div><div class='del'>-# Begin Group "Header-Dateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jconfig.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdct.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jerror.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jinclude.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jmemsys.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jmorecfg.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jpegint.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jpeglib.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jversion.h</div><div class='del'>-# End Source File</div><div class='del'>-# End Group</div><div class='del'>-# Begin Group "Ressourcendateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"</div><div class='del'>-# End Group</div><div class='del'>-# End Target</div><div class='del'>-# End Project</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makejdsw.vc6 b/src/3rdparty/libjpeg/makejdsw.vc6<br/>deleted file mode 100644<br/>index d11fab1..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makejdsw.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makejdsw.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-Microsoft Developer Studio Workspace File, Format Version 6.00</div><div class='del'>-# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GEL™SCHT WERDEN!</div><div class='del'>-</div><div class='del'>-###############################################################################</div><div class='del'>-</div><div class='del'>-Project: "jpeg"=".\jpeg.dsp" - Package Owner=&lt;4&gt;</div><div class='del'>-</div><div class='del'>-Package=&lt;5&gt;</div><div class='del'>-{{{</div><div class='del'>-}}}</div><div class='del'>-</div><div class='del'>-Package=&lt;4&gt;</div><div class='del'>-{{{</div><div class='del'>-}}}</div><div class='del'>-</div><div class='del'>-###############################################################################</div><div class='del'>-</div><div class='del'>-Global:</div><div class='del'>-</div><div class='del'>-Package=&lt;5&gt;</div><div class='del'>-{{{</div><div class='del'>-}}}</div><div class='del'>-</div><div class='del'>-Package=&lt;3&gt;</div><div class='del'>-{{{</div><div class='del'>-}}}</div><div class='del'>-</div><div class='del'>-###############################################################################</div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makejmak.vc6 b/src/3rdparty/libjpeg/makejmak.vc6<br/>deleted file mode 100644<br/>index 1107336..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makejmak.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makejmak.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,425 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Generated NMAKE File, Based on jpeg.dsp</div><div class='del'>-!IF "$(CFG)" == ""</div><div class='del'>-CFG=jpeg - Win32</div><div class='del'>-!MESSAGE Keine Konfiguration angegeben. jpeg - Win32 wird als Standard verwendet.</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-!IF "$(CFG)" != "jpeg - Win32"</div><div class='del'>-!MESSAGE Ungültige Konfiguration "$(CFG)" angegeben.</div><div class='del'>-!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben</div><div class='del'>-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "jpeg.mak" CFG="jpeg - Win32"</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE Für die Konfiguration stehen zur Auswahl:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE "jpeg - Win32" (basierend auf  "Win32 (x86) Static Library")</div><div class='del'>-!MESSAGE </div><div class='del'>-!ERROR Eine ungültige Konfiguration wurde angegeben.</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-!IF "$(OS)" == "Windows_NT"</div><div class='del'>-NULL=</div><div class='del'>-!ELSE </div><div class='del'>-NULL=nul</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-OUTDIR=.\Release</div><div class='del'>-INTDIR=.\Release</div><div class='del'>-# Begin Custom Macros</div><div class='del'>-OutDir=.\Release</div><div class='del'>-# End Custom Macros</div><div class='del'>-</div><div class='del'>-ALL : "$(OUTDIR)\jpeg.lib"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CLEAN :</div><div class='del'>-	-@erase "$(INTDIR)\jaricom.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jcapimin.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jcapistd.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jcarith.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jccoefct.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jccolor.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jcdctmgr.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jchuff.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jcinit.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jcmainct.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jcmarker.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jcmaster.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jcomapi.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jcparam.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jcprepct.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jcsample.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jctrans.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jdapimin.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jdapistd.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jdarith.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jdatadst.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jdatasrc.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jdcoefct.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jdcolor.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jddctmgr.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jdhuff.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jdinput.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jdmainct.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jdmarker.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jdmaster.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jdmerge.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jdpostct.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jdsample.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jdtrans.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jerror.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jfdctflt.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jfdctfst.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jfdctint.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jidctflt.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jidctfst.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jidctint.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jmemmgr.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jmemnobs.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jquant1.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jquant2.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jutils.obj"</div><div class='del'>-	-@erase "$(INTDIR)\vc60.idb"</div><div class='del'>-	-@erase "$(OUTDIR)\jpeg.lib"</div><div class='del'>-</div><div class='del'>-"$(OUTDIR)" :</div><div class='del'>-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"</div><div class='del'>-</div><div class='del'>-CPP=cl.exe</div><div class='del'>-CPP_PROJ=/nologo /G6 /MT /W3 /GX /Ox /Oa /Ob2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\jpeg.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c </div><div class='del'>-</div><div class='del'>-.c{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cpp{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cxx{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.c{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cpp{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cxx{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-RSC=rc.exe</div><div class='del'>-BSC32=bscmake.exe</div><div class='del'>-BSC32_FLAGS=/nologo /o"$(OUTDIR)\jpeg.bsc" </div><div class='del'>-BSC32_SBRS= \</div><div class='del'>-	</div><div class='del'>-LIB32=link.exe -lib</div><div class='del'>-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\jpeg.lib" </div><div class='del'>-LIB32_OBJS= \</div><div class='del'>-	"$(INTDIR)\jaricom.obj" \</div><div class='del'>-	"$(INTDIR)\jcapimin.obj" \</div><div class='del'>-	"$(INTDIR)\jcapistd.obj" \</div><div class='del'>-	"$(INTDIR)\jcarith.obj" \</div><div class='del'>-	"$(INTDIR)\jccoefct.obj" \</div><div class='del'>-	"$(INTDIR)\jccolor.obj" \</div><div class='del'>-	"$(INTDIR)\jcdctmgr.obj" \</div><div class='del'>-	"$(INTDIR)\jchuff.obj" \</div><div class='del'>-	"$(INTDIR)\jcinit.obj" \</div><div class='del'>-	"$(INTDIR)\jcmainct.obj" \</div><div class='del'>-	"$(INTDIR)\jcmarker.obj" \</div><div class='del'>-	"$(INTDIR)\jcmaster.obj" \</div><div class='del'>-	"$(INTDIR)\jcomapi.obj" \</div><div class='del'>-	"$(INTDIR)\jcparam.obj" \</div><div class='del'>-	"$(INTDIR)\jcprepct.obj" \</div><div class='del'>-	"$(INTDIR)\jcsample.obj" \</div><div class='del'>-	"$(INTDIR)\jctrans.obj" \</div><div class='del'>-	"$(INTDIR)\jdapimin.obj" \</div><div class='del'>-	"$(INTDIR)\jdapistd.obj" \</div><div class='del'>-	"$(INTDIR)\jdarith.obj" \</div><div class='del'>-	"$(INTDIR)\jdatadst.obj" \</div><div class='del'>-	"$(INTDIR)\jdatasrc.obj" \</div><div class='del'>-	"$(INTDIR)\jdcoefct.obj" \</div><div class='del'>-	"$(INTDIR)\jdcolor.obj" \</div><div class='del'>-	"$(INTDIR)\jddctmgr.obj" \</div><div class='del'>-	"$(INTDIR)\jdhuff.obj" \</div><div class='del'>-	"$(INTDIR)\jdinput.obj" \</div><div class='del'>-	"$(INTDIR)\jdmainct.obj" \</div><div class='del'>-	"$(INTDIR)\jdmarker.obj" \</div><div class='del'>-	"$(INTDIR)\jdmaster.obj" \</div><div class='del'>-	"$(INTDIR)\jdmerge.obj" \</div><div class='del'>-	"$(INTDIR)\jdpostct.obj" \</div><div class='del'>-	"$(INTDIR)\jdsample.obj" \</div><div class='del'>-	"$(INTDIR)\jdtrans.obj" \</div><div class='del'>-	"$(INTDIR)\jerror.obj" \</div><div class='del'>-	"$(INTDIR)\jfdctflt.obj" \</div><div class='del'>-	"$(INTDIR)\jfdctfst.obj" \</div><div class='del'>-	"$(INTDIR)\jfdctint.obj" \</div><div class='del'>-	"$(INTDIR)\jidctflt.obj" \</div><div class='del'>-	"$(INTDIR)\jidctfst.obj" \</div><div class='del'>-	"$(INTDIR)\jidctint.obj" \</div><div class='del'>-	"$(INTDIR)\jmemmgr.obj" \</div><div class='del'>-	"$(INTDIR)\jmemnobs.obj" \</div><div class='del'>-	"$(INTDIR)\jquant1.obj" \</div><div class='del'>-	"$(INTDIR)\jquant2.obj" \</div><div class='del'>-	"$(INTDIR)\jutils.obj"</div><div class='del'>-</div><div class='del'>-"$(OUTDIR)\jpeg.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)</div><div class='del'>-    $(LIB32) @&lt;&lt;</div><div class='del'>-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)</div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!IF "$(NO_EXTERNAL_DEPS)" != "1"</div><div class='del'>-!IF EXISTS("jpeg.dep")</div><div class='del'>-!INCLUDE "jpeg.dep"</div><div class='del'>-!ELSE </div><div class='del'>-!MESSAGE Warning: cannot find "jpeg.dep"</div><div class='del'>-!ENDIF </div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!IF "$(CFG)" == "jpeg - Win32"</div><div class='del'>-SOURCE=.\jaricom.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jaricom.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcapimin.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jcapimin.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcapistd.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jcapistd.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcarith.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jcarith.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jccoefct.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jccoefct.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jccolor.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jccolor.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcdctmgr.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jcdctmgr.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jchuff.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jchuff.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcinit.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jcinit.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcmainct.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jcmainct.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcmarker.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jcmarker.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcmaster.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jcmaster.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcomapi.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jcomapi.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcparam.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jcparam.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcprepct.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jcprepct.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jcsample.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jcsample.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jctrans.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jctrans.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdapimin.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jdapimin.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdapistd.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jdapistd.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdarith.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jdarith.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdatadst.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jdatadst.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdatasrc.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jdatasrc.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdcoefct.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jdcoefct.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdcolor.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jdcolor.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jddctmgr.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jddctmgr.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdhuff.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jdhuff.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdinput.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jdinput.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdmainct.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jdmainct.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdmarker.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jdmarker.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdmaster.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jdmaster.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdmerge.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jdmerge.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdpostct.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jdpostct.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdsample.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jdsample.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jdtrans.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jdtrans.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jerror.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jerror.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jfdctflt.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jfdctflt.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jfdctfst.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jfdctfst.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jfdctint.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jfdctint.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jidctflt.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jidctflt.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jidctfst.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jidctfst.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jidctint.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jidctint.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jmemmgr.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jmemmgr.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jmemnobs.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jmemnobs.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jquant1.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jquant1.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jquant2.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jquant2.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jutils.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jutils.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makejsln.vc9 b/src/3rdparty/libjpeg/makejsln.vc9<br/>deleted file mode 100644<br/>index ddb6a30..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makejsln.vc9?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makejsln.vc9</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,17 +0,0 @@</div><div class='del'>-‹¯¨</div><div class='del'>-Microsoft Visual Studio Solution File, Format Version 10.00</div><div class='del'>-# Visual C++ Express 2008</div><div class='del'>-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "jpeg.vcproj", "{E61592E1-28F4-4AFC-9EE1-9BE833A061C1}"</div><div class='del'>-EndProject</div><div class='del'>-Global</div><div class='del'>-	GlobalSection(SolutionConfigurationPlatforms) = preSolution</div><div class='del'>-		Release|Win32 = Release|Win32</div><div class='del'>-	EndGlobalSection</div><div class='del'>-	GlobalSection(ProjectConfigurationPlatforms) = postSolution</div><div class='del'>-		{E61592E1-28F4-4AFC-9EE1-9BE833A061C1}.Release|Win32.ActiveCfg = Release|Win32</div><div class='del'>-		{E61592E1-28F4-4AFC-9EE1-9BE833A061C1}.Release|Win32.Build.0 = Release|Win32</div><div class='del'>-	EndGlobalSection</div><div class='del'>-	GlobalSection(SolutionProperties) = preSolution</div><div class='del'>-		HideSolutionNode = FALSE</div><div class='del'>-	EndGlobalSection</div><div class='del'>-EndGlobal</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makejvcp.vc9 b/src/3rdparty/libjpeg/makejvcp.vc9<br/>deleted file mode 100644<br/>index b08809b..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makejvcp.vc9?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makejvcp.vc9</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,328 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="Windows-1252"?&gt;</div><div class='del'>-&lt;VisualStudioProject</div><div class='del'>-	ProjectType="Visual C++"</div><div class='del'>-	Version="9,00"</div><div class='del'>-	Name="jpeg"</div><div class='del'>-	ProjectGUID="{E61592E1-28F4-4AFC-9EE1-9BE833A061C1}"</div><div class='del'>-	RootNamespace="jpeg"</div><div class='del'>-	Keyword="Win32Proj"</div><div class='del'>-	TargetFrameworkVersion="196613"</div><div class='del'>-	&gt;</div><div class='del'>-	&lt;Platforms&gt;</div><div class='del'>-		&lt;Platform</div><div class='del'>-			Name="Win32"</div><div class='del'>-		/&gt;</div><div class='del'>-	&lt;/Platforms&gt;</div><div class='del'>-	&lt;ToolFiles&gt;</div><div class='del'>-	&lt;/ToolFiles&gt;</div><div class='del'>-	&lt;Configurations&gt;</div><div class='del'>-		&lt;Configuration</div><div class='del'>-			Name="Release|Win32"</div><div class='del'>-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"</div><div class='del'>-			IntermediateDirectory="$(ConfigurationName)"</div><div class='del'>-			ConfigurationType="4"</div><div class='del'>-			CharacterSet="0"</div><div class='del'>-			WholeProgramOptimization="1"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPreBuildEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCCustomBuildTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCXMLDataGeneratorTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCMIDLTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCCLCompilerTool"</div><div class='del'>-				Optimization="3"</div><div class='del'>-				EnableIntrinsicFunctions="false"</div><div class='del'>-				EnableFiberSafeOptimizations="true"</div><div class='del'>-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"</div><div class='del'>-				RuntimeLibrary="2"</div><div class='del'>-				EnableFunctionLevelLinking="true"</div><div class='del'>-				UsePrecompiledHeader="0"</div><div class='del'>-				WarningLevel="3"</div><div class='del'>-				DebugInformationFormat="3"</div><div class='del'>-				CompileAs="0"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCManagedResourceCompilerTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCResourceCompilerTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPreLinkEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCLibrarianTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCALinkTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCXDCMakeTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCBscMakeTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCFxCopTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPostBuildEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-		&lt;/Configuration&gt;</div><div class='del'>-	&lt;/Configurations&gt;</div><div class='del'>-	&lt;References&gt;</div><div class='del'>-	&lt;/References&gt;</div><div class='del'>-	&lt;Files&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Quelldateien"</div><div class='del'>-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"</div><div class='del'>-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jaricom.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jcapimin.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jcapistd.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jcarith.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jccoefct.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jccolor.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jcdctmgr.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jchuff.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jcinit.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jcmainct.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jcmarker.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jcmaster.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jcomapi.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jcparam.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jcprepct.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jcsample.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jctrans.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdapimin.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdapistd.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdarith.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdatadst.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdatasrc.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdcoefct.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdcolor.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jddctmgr.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdhuff.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdinput.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdmainct.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdmarker.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdmaster.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdmerge.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdpostct.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdsample.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdtrans.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jerror.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jfdctflt.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jfdctfst.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jfdctint.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jidctflt.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jidctfst.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jidctint.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jmemmgr.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jmemnobs.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jquant1.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jquant2.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jutils.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Headerdateien"</div><div class='del'>-			Filter="h;hpp;hxx;hm;inl;inc;xsd"</div><div class='del'>-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jconfig.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jdct.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jerror.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jinclude.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jmemsys.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jmorecfg.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jpegint.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jpeglib.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jversion.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Ressourcendateien"</div><div class='del'>-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"</div><div class='del'>-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"</div><div class='del'>-			&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-	&lt;/Files&gt;</div><div class='del'>-	&lt;Globals&gt;</div><div class='del'>-	&lt;/Globals&gt;</div><div class='del'>-&lt;/VisualStudioProject&gt;</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makeproj.mac b/src/3rdparty/libjpeg/makeproj.mac<br/>deleted file mode 100644<br/>index e5b5102..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makeproj.mac?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makeproj.mac</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,213 +0,0 @@</div><div class='del'>---</div><div class='del'>--- makeproj.mac</div><div class='del'>---</div><div class='del'>--- This AppleScript builds Code Warrior PRO Release 2 project files for the</div><div class='del'>--- libjpeg library as well as the test programs 'cjpeg', 'djpeg', 'jpegtran'.</div><div class='del'>--- (We'd distribute real project files, except they're not text</div><div class='del'>--- and would create maintenance headaches.)</div><div class='del'>---</div><div class='del'>--- The script then compiles and links the library and the test programs.</div><div class='del'>--- NOTE: if you haven't already created a 'jconfig.h' file, the script</div><div class='del'>--- automatically copies 'jconfig.mac' to 'jconfig.h'.</div><div class='del'>---</div><div class='del'>--- To use this script, you must have AppleScript 1.1 or later installed</div><div class='del'>--- and a suitable AppleScript editor like Script Editor or Script Debugger</div><div class='del'>--- (http://www.latenightsw.com). Open this file with your AppleScript</div><div class='del'>--- editor and execute the "run" command to build the projects.</div><div class='del'>---</div><div class='del'>--- Thanks to Dan Sears and Don Agro for this script.</div><div class='del'>--- Questions about this script can be addressed to dogpark@interlog.com</div><div class='del'>---</div><div class='del'>-</div><div class='del'>-on run</div><div class='del'>-</div><div class='del'>-	choose folder with prompt "&gt;&gt;&gt; Select IJG source folder &lt;&lt;&lt;"</div><div class='del'>-	set ijg_folder to result</div><div class='del'>-</div><div class='del'>-	choose folder with prompt "&gt;&gt;&gt; Select MetroWerks folder &lt;&lt;&lt;"</div><div class='del'>-	set cw_folder to result</div><div class='del'>-</div><div class='del'>-	-- if jconfig.h doesn't already exist, copy jconfig.mac</div><div class='del'>-</div><div class='del'>-	tell application "Finder"</div><div class='del'>-		if not (exists file "jconfig.h" of ijg_folder) then</div><div class='del'>-			duplicate {file "jconfig.mac" of folder ijg_folder}</div><div class='del'>-			select file "jconfig.mac copy" of folder ijg_folder</div><div class='del'>-			set name of selection to "jconfig.h"</div><div class='del'>-		end if</div><div class='del'>-	end tell</div><div class='del'>-</div><div class='del'>-	tell application "CodeWarrior IDE 2.1"</div><div class='del'>-	  with timeout of 10000 seconds</div><div class='del'>-</div><div class='del'>-		-- create libjpeg project</div><div class='del'>-</div><div class='del'>-		activate</div><div class='del'>-		Create Project (ijg_folder as string) &amp; "libjpeg.proj"</div><div class='del'>-		Set Preferences of panel "Target Settings" to {Target Name:"libjpeg"}</div><div class='del'>-		Set Preferences of panel "PPC Project" to {File Name:"libjpeg"}</div><div class='del'>-		Set Preferences of panel "Target Settings" to {Linker:"MacOS PPC Linker"}</div><div class='del'>-		Set Preferences of panel "PPC Project" to {Project Type:library}</div><div class='del'>-		Set Preferences of panel "C/C++ Compiler" to {ANSI Strict:true}</div><div class='del'>-		Set Preferences of panel "C/C++ Compiler" to {Enums Always Ints:true}</div><div class='del'>-		Set Preferences of panel "PPC Codegen" to {Struct Alignment:PowerPC}</div><div class='del'>-		Set Preferences of panel "PPC Linker" to {Generate SYM File:false}</div><div class='del'>-</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jaricom.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jcapimin.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jcapistd.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jcarith.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jctrans.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jcparam.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jdatadst.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jcinit.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jcmaster.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jcmarker.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jcmainct.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jcprepct.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jccoefct.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jccolor.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jcsample.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jchuff.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jcdctmgr.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jfdctfst.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jfdctflt.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jfdctint.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jdapimin.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jdapistd.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jdarith.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jdtrans.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jdatasrc.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jdmaster.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jdinput.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jdmarker.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jdhuff.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jdmainct.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jdcoefct.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jdpostct.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jddctmgr.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jidctfst.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jidctflt.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jidctint.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jdsample.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jdcolor.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jquant1.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jquant2.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jdmerge.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jcomapi.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jutils.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jerror.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jmemmgr.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jmemmac.c" To Segment 1</div><div class='del'>-</div><div class='del'>-		-- compile and link the library</div><div class='del'>-</div><div class='del'>-		Make Project</div><div class='del'>-		Close Project</div><div class='del'>-</div><div class='del'>-		-- create cjpeg project</div><div class='del'>-</div><div class='del'>-		activate</div><div class='del'>-		Create Project (ijg_folder as string) &amp; "cjpeg.proj"</div><div class='del'>-		Set Preferences of panel "Target Settings" to {Target Name:"cjpeg"}</div><div class='del'>-		Set Preferences of panel "PPC Project" to {File Name:"cjpeg"}</div><div class='del'>-		Set Preferences of panel "Target Settings" to {Linker:"MacOS PPC Linker"}</div><div class='del'>-		Set Preferences of panel "C/C++ Compiler" to {ANSI Strict:true}</div><div class='del'>-		Set Preferences of panel "C/C++ Compiler" to {Enums Always Ints:true}</div><div class='del'>-		Set Preferences of panel "PPC Codegen" to {Struct Alignment:PowerPC}</div><div class='del'>-		Set Preferences of panel "PPC Linker" to {Generate SYM File:false}</div><div class='del'>-</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "cjpeg.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "rdppm.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "rdgif.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "rdtarga.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "rdrle.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "rdbmp.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "rdswitch.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "cdjpeg.c" To Segment 1</div><div class='del'>-</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "libjpeg" To Segment 2</div><div class='del'>-</div><div class='del'>-		Add Files (cw_folder as string) &amp; "Metrowerks CodeWarrior:Metrowerks Standard Library:MSL C:Bin:MSL C.PPC.Lib" To Segment 3</div><div class='del'>-		Add Files (cw_folder as string) &amp; "Metrowerks CodeWarrior:Metrowerks Standard Library:MSL C:Bin:MSL SIOUX.PPC.Lib" To Segment 3</div><div class='del'>-		Add Files (cw_folder as string) &amp; "Metrowerks CodeWarrior:MacOS Support:Libraries:Runtime:Runtime PPC:MSL RuntimePPC.Lib" To Segment 3</div><div class='del'>-</div><div class='del'>-		Add Files (cw_folder as string) &amp; "Metrowerks CodeWarrior:MacOS Support:Libraries:MacOS Common:InterfaceLib" To Segment 4</div><div class='del'>-		Add Files (cw_folder as string) &amp; "Metrowerks CodeWarrior:MacOS Support:Libraries:MacOS Common:MathLib" To Segment 4</div><div class='del'>-</div><div class='del'>-		-- compile and link cjpeg</div><div class='del'>-</div><div class='del'>-		Make Project</div><div class='del'>-		Close Project</div><div class='del'>-</div><div class='del'>-		-- create djpeg project</div><div class='del'>-</div><div class='del'>-		activate</div><div class='del'>-		Create Project (ijg_folder as string) &amp; "djpeg.proj"</div><div class='del'>-		Set Preferences of panel "Target Settings" to {Target Name:"djpeg"}</div><div class='del'>-		Set Preferences of panel "PPC Project" to {File Name:"djpeg"}</div><div class='del'>-		Set Preferences of panel "Target Settings" to {Linker:"MacOS PPC Linker"}</div><div class='del'>-		Set Preferences of panel "C/C++ Compiler" to {ANSI Strict:true}</div><div class='del'>-		Set Preferences of panel "C/C++ Compiler" to {Enums Always Ints:true}</div><div class='del'>-		Set Preferences of panel "PPC Codegen" to {Struct Alignment:PowerPC}</div><div class='del'>-		Set Preferences of panel "PPC Linker" to {Generate SYM File:false}</div><div class='del'>-</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "djpeg.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "wrppm.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "wrgif.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "wrtarga.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "wrrle.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "wrbmp.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "rdcolmap.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "cdjpeg.c" To Segment 1</div><div class='del'>-</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "libjpeg" To Segment 2</div><div class='del'>-</div><div class='del'>-		Add Files (cw_folder as string) &amp; "Metrowerks CodeWarrior:Metrowerks Standard Library:MSL C:Bin:MSL C.PPC.Lib" To Segment 3</div><div class='del'>-		Add Files (cw_folder as string) &amp; "Metrowerks CodeWarrior:Metrowerks Standard Library:MSL C:Bin:MSL SIOUX.PPC.Lib" To Segment 3</div><div class='del'>-		Add Files (cw_folder as string) &amp; "Metrowerks CodeWarrior:MacOS Support:Libraries:Runtime:Runtime PPC:MSL RuntimePPC.Lib" To Segment 3</div><div class='del'>-</div><div class='del'>-		Add Files (cw_folder as string) &amp; "Metrowerks CodeWarrior:MacOS Support:Libraries:MacOS Common:InterfaceLib" To Segment 4</div><div class='del'>-		Add Files (cw_folder as string) &amp; "Metrowerks CodeWarrior:MacOS Support:Libraries:MacOS Common:MathLib" To Segment 4</div><div class='del'>-</div><div class='del'>-		-- compile and link djpeg</div><div class='del'>-</div><div class='del'>-		Make Project</div><div class='del'>-		Close Project</div><div class='del'>-</div><div class='del'>-		-- create jpegtran project</div><div class='del'>-</div><div class='del'>-		activate</div><div class='del'>-		Create Project (ijg_folder as string) &amp; "jpegtran.proj"</div><div class='del'>-		Set Preferences of panel "Target Settings" to {Target Name:"jpegtran"}</div><div class='del'>-		Set Preferences of panel "PPC Project" to {File Name:"jpegtran"}</div><div class='del'>-		Set Preferences of panel "Target Settings" to {Linker:"MacOS PPC Linker"}</div><div class='del'>-		Set Preferences of panel "C/C++ Compiler" to {ANSI Strict:true}</div><div class='del'>-		Set Preferences of panel "C/C++ Compiler" to {Enums Always Ints:true}</div><div class='del'>-		Set Preferences of panel "PPC Codegen" to {Struct Alignment:PowerPC}</div><div class='del'>-		Set Preferences of panel "PPC Linker" to {Generate SYM File:false}</div><div class='del'>-</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "jpegtran.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "rdswitch.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "cdjpeg.c" To Segment 1</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "transupp.c" To Segment 1</div><div class='del'>-</div><div class='del'>-		Add Files (ijg_folder as string) &amp; "libjpeg" To Segment 2</div><div class='del'>-</div><div class='del'>-		Add Files (cw_folder as string) &amp; "Metrowerks CodeWarrior:Metrowerks Standard Library:MSL C:Bin:MSL C.PPC.Lib" To Segment 3</div><div class='del'>-		Add Files (cw_folder as string) &amp; "Metrowerks CodeWarrior:Metrowerks Standard Library:MSL C:Bin:MSL SIOUX.PPC.Lib" To Segment 3</div><div class='del'>-		Add Files (cw_folder as string) &amp; "Metrowerks CodeWarrior:MacOS Support:Libraries:Runtime:Runtime PPC:MSL RuntimePPC.Lib" To Segment 3</div><div class='del'>-</div><div class='del'>-		Add Files (cw_folder as string) &amp; "Metrowerks CodeWarrior:MacOS Support:Libraries:MacOS Common:InterfaceLib" To Segment 4</div><div class='del'>-		Add Files (cw_folder as string) &amp; "Metrowerks CodeWarrior:MacOS Support:Libraries:MacOS Common:MathLib" To Segment 4</div><div class='del'>-</div><div class='del'>-		-- compile and link jpegtran</div><div class='del'>-</div><div class='del'>-		Make Project</div><div class='del'>-		Close Project</div><div class='del'>-</div><div class='del'>-		quit</div><div class='del'>-</div><div class='del'>-	  end timeout</div><div class='del'>-	end tell</div><div class='del'>-end run</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makerdep.vc6 b/src/3rdparty/libjpeg/makerdep.vc6<br/>deleted file mode 100644<br/>index 94748d0..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makerdep.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makerdep.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio erstellte Abh„ngigkeitsdatei, einbezogen von rdjpgcom.mak</div><div class='del'>-</div><div class='del'>-.\rdjpgcom.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makerdsp.vc6 b/src/3rdparty/libjpeg/makerdsp.vc6<br/>deleted file mode 100644<br/>index 60de09a..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makerdsp.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makerdsp.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,78 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Project File - Name="rdjpgcom" - Package Owner=&lt;4&gt;</div><div class='del'>-# Microsoft Developer Studio Generated Build File, Format Version 6.00</div><div class='del'>-# ** NICHT BEARBEITEN **</div><div class='del'>-</div><div class='del'>-# TARGTYPE "Win32 (x86) Console Application" 0x0103</div><div class='del'>-</div><div class='del'>-CFG=rdjpgcom - Win32</div><div class='del'>-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE</div><div class='del'>-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "rdjpgcom.mak".</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE Sie k÷nnen beim Ausf�hren von NMAKE eine Konfiguration angeben</div><div class='del'>-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "rdjpgcom.mak" CFG="rdjpgcom - Win32"</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE F�r die Konfiguration stehen zur Auswahl:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE "rdjpgcom - Win32" (basierend auf  "Win32 (x86) Console Application")</div><div class='del'>-!MESSAGE </div><div class='del'>-</div><div class='del'>-# Begin Project</div><div class='del'>-# PROP AllowPerConfigDependencies 0</div><div class='del'>-# PROP Scc_ProjName ""</div><div class='del'>-# PROP Scc_LocalPath ""</div><div class='del'>-CPP=cl.exe</div><div class='del'>-RSC=rc.exe</div><div class='del'>-# PROP BASE Use_MFC 0</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0</div><div class='del'>-# PROP BASE Output_Dir ".\rdjpgcom\Release"</div><div class='del'>-# PROP BASE Intermediate_Dir ".\rdjpgcom\Release"</div><div class='del'>-# PROP BASE Target_Dir ".\rdjpgcom"</div><div class='del'>-# PROP Use_MFC 0</div><div class='del'>-# PROP Use_Debug_Libraries 0</div><div class='del'>-# PROP Output_Dir ".\rdjpgcom\Release"</div><div class='del'>-# PROP Intermediate_Dir ".\rdjpgcom\Release"</div><div class='del'>-# PROP Ignore_Export_Lib 0</div><div class='del'>-# PROP Target_Dir ".\rdjpgcom"</div><div class='del'>-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c</div><div class='del'>-# ADD CPP /nologo /G6 /MT /W3 /GX /Ox /Oa /Ob2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"</div><div class='del'>-BSC32=bscmake.exe</div><div class='del'>-# ADD BASE BSC32 /nologo</div><div class='del'>-# ADD BSC32 /nologo</div><div class='del'>-LINK32=link.exe</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386</div><div class='del'>-# ADD LINK32 Release\jpeg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386</div><div class='del'>-# Begin Target</div><div class='del'>-</div><div class='del'>-# Name "rdjpgcom - Win32"</div><div class='del'>-# Begin Group "Quellcodedateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdjpgcom.c</div><div class='del'>-# End Source File</div><div class='del'>-# End Group</div><div class='del'>-# Begin Group "Header-Dateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jconfig.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jinclude.h</div><div class='del'>-# End Source File</div><div class='del'>-# End Group</div><div class='del'>-# Begin Group "Ressourcendateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"</div><div class='del'>-# End Group</div><div class='del'>-# End Target</div><div class='del'>-# End Project</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makermak.vc6 b/src/3rdparty/libjpeg/makermak.vc6<br/>deleted file mode 100644<br/>index 6d2d4c7..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makermak.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makermak.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,110 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Generated NMAKE File, Based on rdjpgcom.dsp</div><div class='del'>-!IF "$(CFG)" == ""</div><div class='del'>-CFG=rdjpgcom - Win32</div><div class='del'>-!MESSAGE Keine Konfiguration angegeben. rdjpgcom - Win32 wird als Standard verwendet.</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-!IF "$(CFG)" != "rdjpgcom - Win32"</div><div class='del'>-!MESSAGE Ungültige Konfiguration "$(CFG)" angegeben.</div><div class='del'>-!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben</div><div class='del'>-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "rdjpgcom.mak" CFG="rdjpgcom - Win32"</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE Für die Konfiguration stehen zur Auswahl:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE "rdjpgcom - Win32" (basierend auf  "Win32 (x86) Console Application")</div><div class='del'>-!MESSAGE </div><div class='del'>-!ERROR Eine ungültige Konfiguration wurde angegeben.</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-!IF "$(OS)" == "Windows_NT"</div><div class='del'>-NULL=</div><div class='del'>-!ELSE </div><div class='del'>-NULL=nul</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-CPP=cl.exe</div><div class='del'>-RSC=rc.exe</div><div class='del'>-OUTDIR=.\rdjpgcom\Release</div><div class='del'>-INTDIR=.\rdjpgcom\Release</div><div class='del'>-# Begin Custom Macros</div><div class='del'>-OutDir=.\rdjpgcom\Release</div><div class='del'>-# End Custom Macros</div><div class='del'>-</div><div class='del'>-ALL : "$(OUTDIR)\rdjpgcom.exe"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CLEAN :</div><div class='del'>-	-@erase "$(INTDIR)\rdjpgcom.obj"</div><div class='del'>-	-@erase "$(INTDIR)\vc60.idb"</div><div class='del'>-	-@erase "$(OUTDIR)\rdjpgcom.exe"</div><div class='del'>-</div><div class='del'>-"$(OUTDIR)" :</div><div class='del'>-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"</div><div class='del'>-</div><div class='del'>-BSC32=bscmake.exe</div><div class='del'>-BSC32_FLAGS=/nologo /o"$(OUTDIR)\rdjpgcom.bsc" </div><div class='del'>-BSC32_SBRS= \</div><div class='del'>-	</div><div class='del'>-LINK32=link.exe</div><div class='del'>-LINK32_FLAGS=Release\jpeg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\rdjpgcom.pdb" /machine:I386 /out:"$(OUTDIR)\rdjpgcom.exe" </div><div class='del'>-LINK32_OBJS= \</div><div class='del'>-	"$(INTDIR)\rdjpgcom.obj"</div><div class='del'>-</div><div class='del'>-"$(OUTDIR)\rdjpgcom.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)</div><div class='del'>-    $(LINK32) @&lt;&lt;</div><div class='del'>-  $(LINK32_FLAGS) $(LINK32_OBJS)</div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-CPP_PROJ=/nologo /G6 /MT /W3 /GX /Ox /Oa /Ob2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /Fp"$(INTDIR)\rdjpgcom.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c </div><div class='del'>-</div><div class='del'>-.c{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cpp{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cxx{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.c{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cpp{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cxx{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!IF "$(NO_EXTERNAL_DEPS)" != "1"</div><div class='del'>-!IF EXISTS("rdjpgcom.dep")</div><div class='del'>-!INCLUDE "rdjpgcom.dep"</div><div class='del'>-!ELSE </div><div class='del'>-!MESSAGE Warning: cannot find "rdjpgcom.dep"</div><div class='del'>-!ENDIF </div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!IF "$(CFG)" == "rdjpgcom - Win32"</div><div class='del'>-SOURCE=.\rdjpgcom.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\rdjpgcom.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makervcp.vc9 b/src/3rdparty/libjpeg/makervcp.vc9<br/>deleted file mode 100644<br/>index 2f73ffc..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makervcp.vc9?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makervcp.vc9</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,133 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="Windows-1252"?&gt;</div><div class='del'>-&lt;VisualStudioProject</div><div class='del'>-	ProjectType="Visual C++"</div><div class='del'>-	Version="9,00"</div><div class='del'>-	Name="rdjpgcom"</div><div class='del'>-	ProjectGUID="{EB107F86-A8CC-4507-8115-88D31DDE4CDF}"</div><div class='del'>-	RootNamespace="rdjpgcom"</div><div class='del'>-	Keyword="Win32Proj"</div><div class='del'>-	TargetFrameworkVersion="196613"</div><div class='del'>-	&gt;</div><div class='del'>-	&lt;Platforms&gt;</div><div class='del'>-		&lt;Platform</div><div class='del'>-			Name="Win32"</div><div class='del'>-		/&gt;</div><div class='del'>-	&lt;/Platforms&gt;</div><div class='del'>-	&lt;ToolFiles&gt;</div><div class='del'>-	&lt;/ToolFiles&gt;</div><div class='del'>-	&lt;Configurations&gt;</div><div class='del'>-		&lt;Configuration</div><div class='del'>-			Name="Release|Win32"</div><div class='del'>-			OutputDirectory="$(ProjectName)\$(ConfigurationName)"</div><div class='del'>-			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"</div><div class='del'>-			ConfigurationType="1"</div><div class='del'>-			CharacterSet="0"</div><div class='del'>-			WholeProgramOptimization="1"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPreBuildEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCCustomBuildTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCXMLDataGeneratorTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCMIDLTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCCLCompilerTool"</div><div class='del'>-				Optimization="3"</div><div class='del'>-				EnableIntrinsicFunctions="false"</div><div class='del'>-				EnableFiberSafeOptimizations="true"</div><div class='del'>-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"</div><div class='del'>-				RuntimeLibrary="2"</div><div class='del'>-				EnableFunctionLevelLinking="true"</div><div class='del'>-				UsePrecompiledHeader="0"</div><div class='del'>-				WarningLevel="3"</div><div class='del'>-				DebugInformationFormat="3"</div><div class='del'>-				CompileAs="0"</div><div class='del'>-				DisableSpecificWarnings="4996"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCManagedResourceCompilerTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCResourceCompilerTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPreLinkEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCLinkerTool"</div><div class='del'>-				LinkIncremental="1"</div><div class='del'>-				GenerateDebugInformation="true"</div><div class='del'>-				SubSystem="1"</div><div class='del'>-				OptimizeReferences="2"</div><div class='del'>-				EnableCOMDATFolding="2"</div><div class='del'>-				TargetMachine="1"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCALinkTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCManifestTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCXDCMakeTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCBscMakeTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCFxCopTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCAppVerifierTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPostBuildEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-		&lt;/Configuration&gt;</div><div class='del'>-	&lt;/Configurations&gt;</div><div class='del'>-	&lt;References&gt;</div><div class='del'>-	&lt;/References&gt;</div><div class='del'>-	&lt;Files&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Quelldateien"</div><div class='del'>-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"</div><div class='del'>-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\rdjpgcom.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Headerdateien"</div><div class='del'>-			Filter="h;hpp;hxx;hm;inl;inc;xsd"</div><div class='del'>-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jconfig.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jinclude.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Ressourcendateien"</div><div class='del'>-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"</div><div class='del'>-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"</div><div class='del'>-			&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-	&lt;/Files&gt;</div><div class='del'>-	&lt;Globals&gt;</div><div class='del'>-	&lt;/Globals&gt;</div><div class='del'>-&lt;/VisualStudioProject&gt;</div><div class='head'>diff --git a/src/3rdparty/libjpeg/maketdep.vc6 b/src/3rdparty/libjpeg/maketdep.vc6<br/>deleted file mode 100644<br/>index e177ecb..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/maketdep.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/maketdep.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio erstellte Abh„ngigkeitsdatei, einbezogen von jpegtran.mak</div><div class='del'>-</div><div class='del'>-.\cdjpeg.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\jpegtran.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	".\jversion.h"\</div><div class='del'>-	".\transupp.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\rdswitch.c : \</div><div class='del'>-	".\cderror.h"\</div><div class='del'>-	".\cdjpeg.h"\</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-.\transupp.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jerror.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	".\jmorecfg.h"\</div><div class='del'>-	".\jpegint.h"\</div><div class='del'>-	".\jpeglib.h"\</div><div class='del'>-	".\transupp.h"\</div><div class='del'>-	</div><div class='head'>diff --git a/src/3rdparty/libjpeg/maketdsp.vc6 b/src/3rdparty/libjpeg/maketdsp.vc6<br/>deleted file mode 100644<br/>index fe1ae9a..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/maketdsp.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/maketdsp.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,122 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Project File - Name="jpegtran" - Package Owner=&lt;4&gt;</div><div class='del'>-# Microsoft Developer Studio Generated Build File, Format Version 6.00</div><div class='del'>-# ** NICHT BEARBEITEN **</div><div class='del'>-</div><div class='del'>-# TARGTYPE "Win32 (x86) Console Application" 0x0103</div><div class='del'>-</div><div class='del'>-CFG=jpegtran - Win32</div><div class='del'>-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE</div><div class='del'>-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "jpegtran.mak".</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE Sie k÷nnen beim Ausf�hren von NMAKE eine Konfiguration angeben</div><div class='del'>-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "jpegtran.mak" CFG="jpegtran - Win32"</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE F�r die Konfiguration stehen zur Auswahl:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE "jpegtran - Win32" (basierend auf  "Win32 (x86) Console Application")</div><div class='del'>-!MESSAGE </div><div class='del'>-</div><div class='del'>-# Begin Project</div><div class='del'>-# PROP AllowPerConfigDependencies 0</div><div class='del'>-# PROP Scc_ProjName ""</div><div class='del'>-# PROP Scc_LocalPath ""</div><div class='del'>-CPP=cl.exe</div><div class='del'>-RSC=rc.exe</div><div class='del'>-# PROP BASE Use_MFC 0</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0</div><div class='del'>-# PROP BASE Output_Dir ".\jpegtran\Release"</div><div class='del'>-# PROP BASE Intermediate_Dir ".\jpegtran\Release"</div><div class='del'>-# PROP BASE Target_Dir ".\jpegtran"</div><div class='del'>-# PROP Use_MFC 0</div><div class='del'>-# PROP Use_Debug_Libraries 0</div><div class='del'>-# PROP Output_Dir ".\jpegtran\Release"</div><div class='del'>-# PROP Intermediate_Dir ".\jpegtran\Release"</div><div class='del'>-# PROP Ignore_Export_Lib 0</div><div class='del'>-# PROP Target_Dir ".\jpegtran"</div><div class='del'>-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c</div><div class='del'>-# ADD CPP /nologo /G6 /MT /W3 /GX /Ox /Oa /Ob2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"</div><div class='del'>-BSC32=bscmake.exe</div><div class='del'>-# ADD BASE BSC32 /nologo</div><div class='del'>-# ADD BSC32 /nologo</div><div class='del'>-LINK32=link.exe</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386</div><div class='del'>-# ADD LINK32 Release\jpeg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386</div><div class='del'>-# Begin Target</div><div class='del'>-</div><div class='del'>-# Name "jpegtran - Win32"</div><div class='del'>-# Begin Group "Quellcodedateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\cdjpeg.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jpegtran.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdswitch.c</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\transupp.c</div><div class='del'>-# End Source File</div><div class='del'>-# End Group</div><div class='del'>-# Begin Group "Header-Dateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\cderror.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\cdjpeg.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jconfig.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jerror.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jinclude.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jmorecfg.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jpegint.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jpeglib.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jversion.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\transupp.h</div><div class='del'>-# End Source File</div><div class='del'>-# End Group</div><div class='del'>-# Begin Group "Ressourcendateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"</div><div class='del'>-# End Group</div><div class='del'>-# End Target</div><div class='del'>-# End Project</div><div class='head'>diff --git a/src/3rdparty/libjpeg/maketmak.vc6 b/src/3rdparty/libjpeg/maketmak.vc6<br/>deleted file mode 100644<br/>index a0de38c..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/maketmak.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/maketmak.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,131 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Generated NMAKE File, Based on jpegtran.dsp</div><div class='del'>-!IF "$(CFG)" == ""</div><div class='del'>-CFG=jpegtran - Win32</div><div class='del'>-!MESSAGE Keine Konfiguration angegeben. jpegtran - Win32 wird als Standard verwendet.</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-!IF "$(CFG)" != "jpegtran - Win32"</div><div class='del'>-!MESSAGE Ungültige Konfiguration "$(CFG)" angegeben.</div><div class='del'>-!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben</div><div class='del'>-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "jpegtran.mak" CFG="jpegtran - Win32"</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE Für die Konfiguration stehen zur Auswahl:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE "jpegtran - Win32" (basierend auf  "Win32 (x86) Console Application")</div><div class='del'>-!MESSAGE </div><div class='del'>-!ERROR Eine ungültige Konfiguration wurde angegeben.</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-!IF "$(OS)" == "Windows_NT"</div><div class='del'>-NULL=</div><div class='del'>-!ELSE </div><div class='del'>-NULL=nul</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-CPP=cl.exe</div><div class='del'>-RSC=rc.exe</div><div class='del'>-OUTDIR=.\jpegtran\Release</div><div class='del'>-INTDIR=.\jpegtran\Release</div><div class='del'>-# Begin Custom Macros</div><div class='del'>-OutDir=.\jpegtran\Release</div><div class='del'>-# End Custom Macros</div><div class='del'>-</div><div class='del'>-ALL : "$(OUTDIR)\jpegtran.exe"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CLEAN :</div><div class='del'>-	-@erase "$(INTDIR)\cdjpeg.obj"</div><div class='del'>-	-@erase "$(INTDIR)\jpegtran.obj"</div><div class='del'>-	-@erase "$(INTDIR)\rdswitch.obj"</div><div class='del'>-	-@erase "$(INTDIR)\transupp.obj"</div><div class='del'>-	-@erase "$(INTDIR)\vc60.idb"</div><div class='del'>-	-@erase "$(OUTDIR)\jpegtran.exe"</div><div class='del'>-</div><div class='del'>-"$(OUTDIR)" :</div><div class='del'>-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"</div><div class='del'>-</div><div class='del'>-BSC32=bscmake.exe</div><div class='del'>-BSC32_FLAGS=/nologo /o"$(OUTDIR)\jpegtran.bsc" </div><div class='del'>-BSC32_SBRS= \</div><div class='del'>-	</div><div class='del'>-LINK32=link.exe</div><div class='del'>-LINK32_FLAGS=Release\jpeg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\jpegtran.pdb" /machine:I386 /out:"$(OUTDIR)\jpegtran.exe" </div><div class='del'>-LINK32_OBJS= \</div><div class='del'>-	"$(INTDIR)\cdjpeg.obj" \</div><div class='del'>-	"$(INTDIR)\jpegtran.obj" \</div><div class='del'>-	"$(INTDIR)\rdswitch.obj" \</div><div class='del'>-	"$(INTDIR)\transupp.obj"</div><div class='del'>-</div><div class='del'>-"$(OUTDIR)\jpegtran.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)</div><div class='del'>-    $(LINK32) @&lt;&lt;</div><div class='del'>-  $(LINK32_FLAGS) $(LINK32_OBJS)</div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-CPP_PROJ=/nologo /G6 /MT /W3 /GX /Ox /Oa /Ob2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /Fp"$(INTDIR)\jpegtran.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c </div><div class='del'>-</div><div class='del'>-.c{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cpp{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cxx{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.c{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cpp{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cxx{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!IF "$(NO_EXTERNAL_DEPS)" != "1"</div><div class='del'>-!IF EXISTS("jpegtran.dep")</div><div class='del'>-!INCLUDE "jpegtran.dep"</div><div class='del'>-!ELSE </div><div class='del'>-!MESSAGE Warning: cannot find "jpegtran.dep"</div><div class='del'>-!ENDIF </div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!IF "$(CFG)" == "jpegtran - Win32"</div><div class='del'>-SOURCE=.\cdjpeg.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\cdjpeg.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\jpegtran.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\jpegtran.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\rdswitch.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\rdswitch.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SOURCE=.\transupp.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\transupp.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libjpeg/maketvcp.vc9 b/src/3rdparty/libjpeg/maketvcp.vc9<br/>deleted file mode 100644<br/>index af0348d..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/maketvcp.vc9?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/maketvcp.vc9</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,178 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="Windows-1252"?&gt;</div><div class='del'>-&lt;VisualStudioProject</div><div class='del'>-	ProjectType="Visual C++"</div><div class='del'>-	Version="9,00"</div><div class='del'>-	Name="jpegtran"</div><div class='del'>-	ProjectGUID="{813C33AF-9031-49D2-BA19-93D600CDD404}"</div><div class='del'>-	RootNamespace="jpegtran"</div><div class='del'>-	Keyword="Win32Proj"</div><div class='del'>-	TargetFrameworkVersion="196613"</div><div class='del'>-	&gt;</div><div class='del'>-	&lt;Platforms&gt;</div><div class='del'>-		&lt;Platform</div><div class='del'>-			Name="Win32"</div><div class='del'>-		/&gt;</div><div class='del'>-	&lt;/Platforms&gt;</div><div class='del'>-	&lt;ToolFiles&gt;</div><div class='del'>-	&lt;/ToolFiles&gt;</div><div class='del'>-	&lt;Configurations&gt;</div><div class='del'>-		&lt;Configuration</div><div class='del'>-			Name="Release|Win32"</div><div class='del'>-			OutputDirectory="$(ProjectName)\$(ConfigurationName)"</div><div class='del'>-			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"</div><div class='del'>-			ConfigurationType="1"</div><div class='del'>-			CharacterSet="0"</div><div class='del'>-			WholeProgramOptimization="1"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPreBuildEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCCustomBuildTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCXMLDataGeneratorTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCMIDLTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCCLCompilerTool"</div><div class='del'>-				Optimization="3"</div><div class='del'>-				EnableIntrinsicFunctions="false"</div><div class='del'>-				EnableFiberSafeOptimizations="true"</div><div class='del'>-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"</div><div class='del'>-				RuntimeLibrary="2"</div><div class='del'>-				EnableFunctionLevelLinking="true"</div><div class='del'>-				UsePrecompiledHeader="0"</div><div class='del'>-				WarningLevel="3"</div><div class='del'>-				DebugInformationFormat="3"</div><div class='del'>-				CompileAs="0"</div><div class='del'>-				DisableSpecificWarnings="4996"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCManagedResourceCompilerTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCResourceCompilerTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPreLinkEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCLinkerTool"</div><div class='del'>-				AdditionalDependencies="Release\jpeg.lib"</div><div class='del'>-				LinkIncremental="1"</div><div class='del'>-				GenerateDebugInformation="true"</div><div class='del'>-				SubSystem="1"</div><div class='del'>-				OptimizeReferences="2"</div><div class='del'>-				EnableCOMDATFolding="2"</div><div class='del'>-				TargetMachine="1"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCALinkTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCManifestTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCXDCMakeTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCBscMakeTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCFxCopTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCAppVerifierTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPostBuildEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-		&lt;/Configuration&gt;</div><div class='del'>-	&lt;/Configurations&gt;</div><div class='del'>-	&lt;References&gt;</div><div class='del'>-	&lt;/References&gt;</div><div class='del'>-	&lt;Files&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Quelldateien"</div><div class='del'>-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"</div><div class='del'>-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\cdjpeg.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jpegtran.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\rdswitch.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\transupp.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Headerdateien"</div><div class='del'>-			Filter="h;hpp;hxx;hm;inl;inc;xsd"</div><div class='del'>-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\cderror.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\cdjpeg.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jconfig.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jerror.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jinclude.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jmorecfg.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jpegint.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jpeglib.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jversion.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\transupp.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Ressourcendateien"</div><div class='del'>-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"</div><div class='del'>-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"</div><div class='del'>-			&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-	&lt;/Files&gt;</div><div class='del'>-	&lt;Globals&gt;</div><div class='del'>-	&lt;/Globals&gt;</div><div class='del'>-&lt;/VisualStudioProject&gt;</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makewdep.vc6 b/src/3rdparty/libjpeg/makewdep.vc6<br/>deleted file mode 100644<br/>index 15929bf..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makewdep.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makewdep.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio erstellte Abh„ngigkeitsdatei, einbezogen von wrjpgcom.mak</div><div class='del'>-</div><div class='del'>-.\wrjpgcom.c : \</div><div class='del'>-	".\jconfig.h"\</div><div class='del'>-	".\jinclude.h"\</div><div class='del'>-	</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makewdsp.vc6 b/src/3rdparty/libjpeg/makewdsp.vc6<br/>deleted file mode 100644<br/>index 2063b1a..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makewdsp.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makewdsp.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,78 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Project File - Name="wrjpgcom" - Package Owner=&lt;4&gt;</div><div class='del'>-# Microsoft Developer Studio Generated Build File, Format Version 6.00</div><div class='del'>-# ** NICHT BEARBEITEN **</div><div class='del'>-</div><div class='del'>-# TARGTYPE "Win32 (x86) Console Application" 0x0103</div><div class='del'>-</div><div class='del'>-CFG=wrjpgcom - Win32</div><div class='del'>-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE</div><div class='del'>-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "wrjpgcom.mak".</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE Sie k÷nnen beim Ausf�hren von NMAKE eine Konfiguration angeben</div><div class='del'>-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "wrjpgcom.mak" CFG="wrjpgcom - Win32"</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE F�r die Konfiguration stehen zur Auswahl:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE "wrjpgcom - Win32" (basierend auf  "Win32 (x86) Console Application")</div><div class='del'>-!MESSAGE </div><div class='del'>-</div><div class='del'>-# Begin Project</div><div class='del'>-# PROP AllowPerConfigDependencies 0</div><div class='del'>-# PROP Scc_ProjName ""</div><div class='del'>-# PROP Scc_LocalPath ""</div><div class='del'>-CPP=cl.exe</div><div class='del'>-RSC=rc.exe</div><div class='del'>-# PROP BASE Use_MFC 0</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0</div><div class='del'>-# PROP BASE Output_Dir ".\wrjpgcom\Release"</div><div class='del'>-# PROP BASE Intermediate_Dir ".\wrjpgcom\Release"</div><div class='del'>-# PROP BASE Target_Dir ".\wrjpgcom"</div><div class='del'>-# PROP Use_MFC 0</div><div class='del'>-# PROP Use_Debug_Libraries 0</div><div class='del'>-# PROP Output_Dir ".\wrjpgcom\Release"</div><div class='del'>-# PROP Intermediate_Dir ".\wrjpgcom\Release"</div><div class='del'>-# PROP Ignore_Export_Lib 0</div><div class='del'>-# PROP Target_Dir ".\wrjpgcom"</div><div class='del'>-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c</div><div class='del'>-# ADD CPP /nologo /G6 /MT /W3 /GX /Ox /Oa /Ob2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"</div><div class='del'>-BSC32=bscmake.exe</div><div class='del'>-# ADD BASE BSC32 /nologo</div><div class='del'>-# ADD BSC32 /nologo</div><div class='del'>-LINK32=link.exe</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386</div><div class='del'>-# ADD LINK32 Release\jpeg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386</div><div class='del'>-# Begin Target</div><div class='del'>-</div><div class='del'>-# Name "wrjpgcom - Win32"</div><div class='del'>-# Begin Group "Quellcodedateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\wrjpgcom.c</div><div class='del'>-# End Source File</div><div class='del'>-# End Group</div><div class='del'>-# Begin Group "Header-Dateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jconfig.h</div><div class='del'>-# End Source File</div><div class='del'>-# Begin Source File</div><div class='del'>-</div><div class='del'>-SOURCE=.\jinclude.h</div><div class='del'>-# End Source File</div><div class='del'>-# End Group</div><div class='del'>-# Begin Group "Ressourcendateien"</div><div class='del'>-</div><div class='del'>-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"</div><div class='del'>-# End Group</div><div class='del'>-# End Target</div><div class='del'>-# End Project</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makewmak.vc6 b/src/3rdparty/libjpeg/makewmak.vc6<br/>deleted file mode 100644<br/>index 22b9086..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makewmak.vc6?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makewmak.vc6</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,110 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Generated NMAKE File, Based on wrjpgcom.dsp</div><div class='del'>-!IF "$(CFG)" == ""</div><div class='del'>-CFG=wrjpgcom - Win32</div><div class='del'>-!MESSAGE Keine Konfiguration angegeben. wrjpgcom - Win32 wird als Standard verwendet.</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-!IF "$(CFG)" != "wrjpgcom - Win32"</div><div class='del'>-!MESSAGE Ungültige Konfiguration "$(CFG)" angegeben.</div><div class='del'>-!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben</div><div class='del'>-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE NMAKE /f "wrjpgcom.mak" CFG="wrjpgcom - Win32"</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE Für die Konfiguration stehen zur Auswahl:</div><div class='del'>-!MESSAGE </div><div class='del'>-!MESSAGE "wrjpgcom - Win32" (basierend auf  "Win32 (x86) Console Application")</div><div class='del'>-!MESSAGE </div><div class='del'>-!ERROR Eine ungültige Konfiguration wurde angegeben.</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-!IF "$(OS)" == "Windows_NT"</div><div class='del'>-NULL=</div><div class='del'>-!ELSE </div><div class='del'>-NULL=nul</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-CPP=cl.exe</div><div class='del'>-RSC=rc.exe</div><div class='del'>-OUTDIR=.\wrjpgcom\Release</div><div class='del'>-INTDIR=.\wrjpgcom\Release</div><div class='del'>-# Begin Custom Macros</div><div class='del'>-OutDir=.\wrjpgcom\Release</div><div class='del'>-# End Custom Macros</div><div class='del'>-</div><div class='del'>-ALL : "$(OUTDIR)\wrjpgcom.exe"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CLEAN :</div><div class='del'>-	-@erase "$(INTDIR)\vc60.idb"</div><div class='del'>-	-@erase "$(INTDIR)\wrjpgcom.obj"</div><div class='del'>-	-@erase "$(OUTDIR)\wrjpgcom.exe"</div><div class='del'>-</div><div class='del'>-"$(OUTDIR)" :</div><div class='del'>-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"</div><div class='del'>-</div><div class='del'>-BSC32=bscmake.exe</div><div class='del'>-BSC32_FLAGS=/nologo /o"$(OUTDIR)\wrjpgcom.bsc" </div><div class='del'>-BSC32_SBRS= \</div><div class='del'>-	</div><div class='del'>-LINK32=link.exe</div><div class='del'>-LINK32_FLAGS=Release\jpeg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\wrjpgcom.pdb" /machine:I386 /out:"$(OUTDIR)\wrjpgcom.exe" </div><div class='del'>-LINK32_OBJS= \</div><div class='del'>-	"$(INTDIR)\wrjpgcom.obj"</div><div class='del'>-</div><div class='del'>-"$(OUTDIR)\wrjpgcom.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)</div><div class='del'>-    $(LINK32) @&lt;&lt;</div><div class='del'>-  $(LINK32_FLAGS) $(LINK32_OBJS)</div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-CPP_PROJ=/nologo /G6 /MT /W3 /GX /Ox /Oa /Ob2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /Fp"$(INTDIR)\wrjpgcom.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c </div><div class='del'>-</div><div class='del'>-.c{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cpp{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cxx{$(INTDIR)}.obj::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.c{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cpp{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-.cxx{$(INTDIR)}.sbr::</div><div class='del'>-   $(CPP) @&lt;&lt;</div><div class='del'>-   $(CPP_PROJ) $&lt; </div><div class='del'>-&lt;&lt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!IF "$(NO_EXTERNAL_DEPS)" != "1"</div><div class='del'>-!IF EXISTS("wrjpgcom.dep")</div><div class='del'>-!INCLUDE "wrjpgcom.dep"</div><div class='del'>-!ELSE </div><div class='del'>-!MESSAGE Warning: cannot find "wrjpgcom.dep"</div><div class='del'>-!ENDIF </div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!IF "$(CFG)" == "wrjpgcom - Win32"</div><div class='del'>-SOURCE=.\wrjpgcom.c</div><div class='del'>-</div><div class='del'>-"$(INTDIR)\wrjpgcom.obj" : $(SOURCE) "$(INTDIR)"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-!ENDIF </div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makewvcp.vc9 b/src/3rdparty/libjpeg/makewvcp.vc9<br/>deleted file mode 100644<br/>index 196de0c..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makewvcp.vc9?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makewvcp.vc9</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,133 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="Windows-1252"?&gt;</div><div class='del'>-&lt;VisualStudioProject</div><div class='del'>-	ProjectType="Visual C++"</div><div class='del'>-	Version="9,00"</div><div class='del'>-	Name="wrjpgcom"</div><div class='del'>-	ProjectGUID="{178670D7-FA7F-44A8-96C7-11B1CA14269C}"</div><div class='del'>-	RootNamespace="wrjpgcom"</div><div class='del'>-	Keyword="Win32Proj"</div><div class='del'>-	TargetFrameworkVersion="196613"</div><div class='del'>-	&gt;</div><div class='del'>-	&lt;Platforms&gt;</div><div class='del'>-		&lt;Platform</div><div class='del'>-			Name="Win32"</div><div class='del'>-		/&gt;</div><div class='del'>-	&lt;/Platforms&gt;</div><div class='del'>-	&lt;ToolFiles&gt;</div><div class='del'>-	&lt;/ToolFiles&gt;</div><div class='del'>-	&lt;Configurations&gt;</div><div class='del'>-		&lt;Configuration</div><div class='del'>-			Name="Release|Win32"</div><div class='del'>-			OutputDirectory="$(ProjectName)\$(ConfigurationName)"</div><div class='del'>-			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"</div><div class='del'>-			ConfigurationType="1"</div><div class='del'>-			CharacterSet="0"</div><div class='del'>-			WholeProgramOptimization="1"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPreBuildEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCCustomBuildTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCXMLDataGeneratorTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCMIDLTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCCLCompilerTool"</div><div class='del'>-				Optimization="3"</div><div class='del'>-				EnableIntrinsicFunctions="false"</div><div class='del'>-				EnableFiberSafeOptimizations="true"</div><div class='del'>-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"</div><div class='del'>-				RuntimeLibrary="2"</div><div class='del'>-				EnableFunctionLevelLinking="true"</div><div class='del'>-				UsePrecompiledHeader="0"</div><div class='del'>-				WarningLevel="3"</div><div class='del'>-				DebugInformationFormat="3"</div><div class='del'>-				CompileAs="0"</div><div class='del'>-				DisableSpecificWarnings="4996"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCManagedResourceCompilerTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCResourceCompilerTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPreLinkEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCLinkerTool"</div><div class='del'>-				LinkIncremental="1"</div><div class='del'>-				GenerateDebugInformation="true"</div><div class='del'>-				SubSystem="1"</div><div class='del'>-				OptimizeReferences="2"</div><div class='del'>-				EnableCOMDATFolding="2"</div><div class='del'>-				TargetMachine="1"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCALinkTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCManifestTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCXDCMakeTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCBscMakeTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCFxCopTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCAppVerifierTool"</div><div class='del'>-			/&gt;</div><div class='del'>-			&lt;Tool</div><div class='del'>-				Name="VCPostBuildEventTool"</div><div class='del'>-			/&gt;</div><div class='del'>-		&lt;/Configuration&gt;</div><div class='del'>-	&lt;/Configurations&gt;</div><div class='del'>-	&lt;References&gt;</div><div class='del'>-	&lt;/References&gt;</div><div class='del'>-	&lt;Files&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Quelldateien"</div><div class='del'>-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"</div><div class='del'>-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\wrjpgcom.c"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Headerdateien"</div><div class='del'>-			Filter="h;hpp;hxx;hm;inl;inc;xsd"</div><div class='del'>-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"</div><div class='del'>-			&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jconfig.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-			&lt;File</div><div class='del'>-				RelativePath=".\jinclude.h"</div><div class='del'>-				&gt;</div><div class='del'>-			&lt;/File&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-		&lt;Filter</div><div class='del'>-			Name="Ressourcendateien"</div><div class='del'>-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"</div><div class='del'>-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"</div><div class='del'>-			&gt;</div><div class='del'>-		&lt;/Filter&gt;</div><div class='del'>-	&lt;/Files&gt;</div><div class='del'>-	&lt;Globals&gt;</div><div class='del'>-	&lt;/Globals&gt;</div><div class='del'>-&lt;/VisualStudioProject&gt;</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makljpeg.st b/src/3rdparty/libjpeg/makljpeg.st<br/>deleted file mode 100644<br/>index cc1ba01..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makljpeg.st?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makljpeg.st</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-; Project file for Independent JPEG Group's software</div><div class='del'>-;</div><div class='del'>-; This project file is for Atari ST/STE/TT systems using Pure C or Turbo C.</div><div class='del'>-; Thanks to Frank Moehle, B. Setzepfandt, and Guido Vollbeding.</div><div class='del'>-;</div><div class='del'>-; To use this file, rename it to libjpeg.prj.</div><div class='del'>-; Read installation instructions before trying to make the program!</div><div class='del'>-;</div><div class='del'>-;</div><div class='del'>-;      * * * Output file * * *</div><div class='del'>-libjpeg.lib</div><div class='del'>-;</div><div class='del'>-; * * * COMPILER OPTIONS * * *  </div><div class='del'>-.C[-P]        ; absolute calls</div><div class='del'>-.C[-M]        ; and no string merging, folks</div><div class='del'>-.C[-w-cln]    ; no "constant is long" warnings</div><div class='del'>-.C[-w-par]    ; no "parameter xxxx unused"</div><div class='del'>-.C[-w-rch]    ; no "unreachable code"</div><div class='del'>-.C[-wsig]     ; warn if significant digits may be lost</div><div class='del'>-.L[-J]        ; link new Obj-format (so we get a library)</div><div class='del'>-=</div><div class='del'>-; * * * * List of modules * * * * </div><div class='del'>-jaricom.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jcapimin.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jcapistd.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jcarith.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jccoefct.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jccolor.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jcdctmgr.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h,jdct.h)</div><div class='del'>-jchuff.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jcinit.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jcmainct.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jcmarker.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jcmaster.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jcomapi.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jcparam.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jcprepct.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jcsample.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jctrans.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jdapimin.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jdapistd.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jdarith.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jdatadst.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h)</div><div class='del'>-jdatasrc.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h)</div><div class='del'>-jdcoefct.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jdcolor.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jddctmgr.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h,jdct.h)</div><div class='del'>-jdhuff.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jdinput.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jdmainct.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jdmarker.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jdmaster.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jdmerge.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jdpostct.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jdsample.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jdtrans.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jerror.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jversion.h,jerror.h)</div><div class='del'>-jfdctflt.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h,jdct.h)</div><div class='del'>-jfdctfst.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h,jdct.h)</div><div class='del'>-jfdctint.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h,jdct.h)</div><div class='del'>-jidctflt.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h,jdct.h)</div><div class='del'>-jidctfst.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h,jdct.h)</div><div class='del'>-jidctint.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h,jdct.h)</div><div class='del'>-jquant1.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jquant2.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jutils.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h)</div><div class='del'>-jmemmgr.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h,jmemsys.h)</div><div class='del'>-jmemansi.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h,jmemsys.h)</div><div class='head'>diff --git a/src/3rdparty/libjpeg/maktjpeg.st b/src/3rdparty/libjpeg/maktjpeg.st<br/>deleted file mode 100644<br/>index 43f078a..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/maktjpeg.st?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/maktjpeg.st</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-; Project file for Independent JPEG Group's software</div><div class='del'>-;</div><div class='del'>-; This project file is for Atari ST/STE/TT systems using Pure C or Turbo C.</div><div class='del'>-; Thanks to Frank Moehle, B. Setzepfandt, and Guido Vollbeding.</div><div class='del'>-;</div><div class='del'>-; To use this file, rename it to jpegtran.prj.</div><div class='del'>-; If you are using Turbo C, change filenames beginning with "pc..." to "tc..."</div><div class='del'>-; Read installation instructions before trying to make the program!</div><div class='del'>-;</div><div class='del'>-;</div><div class='del'>-;      * * * Output file * * *</div><div class='del'>-jpegtran.ttp</div><div class='del'>-;</div><div class='del'>-; * * * COMPILER OPTIONS * * *  </div><div class='del'>-.C[-P]        ; absolute calls</div><div class='del'>-.C[-M]        ; and no string merging, folks</div><div class='del'>-.C[-w-cln]    ; no "constant is long" warnings</div><div class='del'>-.C[-w-par]    ; no "parameter xxxx unused"</div><div class='del'>-.C[-w-rch]    ; no "unreachable code"</div><div class='del'>-.C[-wsig]     ; warn if significant digits may be lost</div><div class='del'>-=</div><div class='del'>-; * * * * List of modules * * * * </div><div class='del'>-pcstart.o</div><div class='del'>-jpegtran.c	(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h,transupp.h,jversion.h)</div><div class='del'>-cdjpeg.c	(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h)</div><div class='del'>-rdswitch.c	(cdjpeg.h,jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jerror.h,cderror.h)</div><div class='del'>-transupp.c	(jinclude.h,jconfig.h,jpeglib.h,jmorecfg.h,jpegint.h,jerror.h,transupp.h)</div><div class='del'>-libjpeg.lib        ; built by libjpeg.prj</div><div class='del'>-pcstdlib.lib       ; standard library</div><div class='del'>-pcextlib.lib       ; extended library</div><div class='head'>diff --git a/src/3rdparty/libjpeg/makvms.opt b/src/3rdparty/libjpeg/makvms.opt<br/>deleted file mode 100644<br/>index 675e8fe..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/makvms.opt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/makvms.opt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-! A pointer to the VAX/VMS C Run-Time Shareable Library.</div><div class='del'>-! This file is needed by makefile.mms and makefile.vms,</div><div class='del'>-! but only for the older VAX C compiler.  DEC C does not need it.</div><div class='del'>-Sys$Library:VAXCRTL.EXE /Share</div><div class='head'>diff --git a/src/3rdparty/libjpeg/usage.txt b/src/3rdparty/libjpeg/usage.txt<br/>index 6e8546a..eae5842 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/usage.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libjpeg/usage.txt</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libjpeg/usage.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libjpeg/usage.txt</a></div><div class='hunk'>@@ -87,8 +87,9 @@ The basic command line switches for cjpeg are:</div><div class='ctx'> 	-progressive	Create progressive JPEG file (see below).</div><div class='ctx'> </div><div class='ctx'> 	-scale M/N	Scale the output image by a factor M/N.  Currently</div><div class='del'>-			supported scale factors are 8/N with all N from 1 to</div><div class='del'>-			16.</div><div class='add'>+			supported scale factors are M/N with all N from 1 to</div><div class='add'>+			16, where M is the destination DCT size, which is 8 by</div><div class='add'>+			default (see -block N switch below).</div><div class='ctx'> </div><div class='ctx'> 	-targa		Input file is Targa format.  Targa files that contain</div><div class='ctx'> 			an "identification" field will not be automatically</div><div class='hunk'>@@ -150,6 +151,19 @@ file size is about the same --- often a little smaller.</div><div class='ctx'> </div><div class='ctx'> Switches for advanced users:</div><div class='ctx'> </div><div class='add'>+	-block N	Set DCT block size.  All N from 1 to 16 are possible.</div><div class='add'>+			Default is 8 (baseline format).</div><div class='add'>+			Larger values produce higher compression,</div><div class='add'>+			smaller values produce higher quality</div><div class='add'>+			(exact DCT stage possible with 1 or 2; with the</div><div class='add'>+			default quality of 75 and default Luminance qtable</div><div class='add'>+			the DCT+Quantization stage is lossless for N=1).</div><div class='add'>+			CAUTION: An implementation of the JPEG SmartScale</div><div class='add'>+			extension is required for this feature.  SmartScale</div><div class='add'>+			enabled JPEG is not yet widely implemented, so many</div><div class='add'>+			decoders will be unable to view a SmartScale extended</div><div class='add'>+			JPEG file at all.</div><div class='add'>+</div><div class='ctx'> 	-dct int	Use integer DCT method (default).</div><div class='ctx'> 	-dct fast	Use fast integer DCT (less accurate).</div><div class='ctx'> 	-dct float	Use floating-point DCT method.</div><div class='head'>diff --git a/src/3rdparty/libpng/ANNOUNCE b/src/3rdparty/libpng/ANNOUNCE<br/>index 8bb11d2..4a3b018 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/ANNOUNCE?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/ANNOUNCE</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/ANNOUNCE?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/ANNOUNCE</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> </div><div class='del'>-Libpng 1.4.0 - January 3, 2010</div><div class='add'>+Libpng 1.5.1 - February 3, 2011</div><div class='ctx'> </div><div class='ctx'> This is a public release of libpng, intended for use in production codes.</div><div class='ctx'> </div><div class='hunk'>@@ -8,352 +8,88 @@ Files available for download:</div><div class='ctx'> Source files with LF line endings (for Unix/Linux) and with a</div><div class='ctx'> "configure" script</div><div class='ctx'> </div><div class='del'>-   libpng-1.4.0.tar.xz (LZMA-compressed, recommended)</div><div class='del'>-   libpng-1.4.0.tar.gz</div><div class='del'>-   libpng-1.4.0.tar.bz2</div><div class='add'>+   libpng-1.5.1.tar.xz (LZMA-compressed, recommended)</div><div class='add'>+   libpng-1.5.1.tar.gz</div><div class='add'>+   libpng-1.5.1.tar.bz2</div><div class='ctx'> </div><div class='ctx'> Source files with CRLF line endings (for Windows), without the</div><div class='ctx'> "configure" script</div><div class='ctx'> </div><div class='del'>-   lpng140.zip</div><div class='del'>-   lpng140.7z</div><div class='add'>+   lpng151.7z  (LZMA-compressed, recommended)</div><div class='add'>+   lpng151.zip</div><div class='ctx'> </div><div class='ctx'> Other information:</div><div class='ctx'> </div><div class='del'>-   libpng-1.4.0-README.txt</div><div class='del'>-   libpng-1.4.0-LICENSE.txt</div><div class='add'>+   libpng-1.5.1-README.txt</div><div class='add'>+   libpng-1.5.1-LICENSE.txt</div><div class='ctx'> </div><div class='del'>-Changes since the last public release (1.2.10):</div><div class='add'>+Changes since the last public release (1.5.0):</div><div class='ctx'> </div><div class='del'>-version 1.4.0 [January 3, 2010]</div><div class='del'>-</div><div class='del'>-  Enabled iTXt support (changes png_struct, thus requires so-number change).</div><div class='del'>-  Cleaned up PNG_ASSEMBLER_CODE_SUPPORTED vs PNG_MMX_CODE_SUPPORTED</div><div class='del'>-  Eliminated PNG_1_0_X and PNG_1_2_X macros.</div><div class='del'>-  Removed deprecated functions png_read_init, png_write_init, png_info_init,</div><div class='del'>-    png_permit_empty_plte, png_set_gray_1_2_4_to_8, and removed the</div><div class='del'>-    deprecated macro PNG_MAX_UINT.</div><div class='del'>-  Moved "PNG_INTERNAL" parts of png.h and pngconf.h into pngintrn.h</div><div class='del'>-  Removed all  WIN32_WCE #ifdefs except those involving the</div><div class='del'>-    time.h "tm" structure (Cosmin)</div><div class='del'>-  Reduced dependency on C-runtime library when on Windows (Simon-Pierre)</div><div class='del'>-  Replaced sprintf() with png_sprintf() (Simon-Pierre)</div><div class='del'>-  Revised makefiles to avoid making links to libpng.so.*</div><div class='del'>-  Added a note in libpng.txt that png_set_sig_bytes(8) can be used when</div><div class='del'>-    writing an embedded PNG without the 8-byte signature.</div><div class='del'>-  Updated scripts/pngos2.def, pngw32.def, and projects/wince/png32ce.def</div><div class='del'>-  Added PNG_NO_GET_INT_32 and PNG_NO_SAVE_INT_32 macros.</div><div class='del'>-  Scripts/libpng.pc.in contained "configure" style version info and would</div><div class='del'>-    not work with makefiles.</div><div class='del'>-  Increased sprintf buffer from 50 to 52 chars in pngrutil.c to avoid</div><div class='del'>-    buffer overflow.</div><div class='del'>-  Fixed bug in example.c (png_set_palette_rgb -&gt; png_set_palette_to_rgb))</div><div class='del'>-  Changed sonum from 0 to 1.</div><div class='del'>-  Removed unused prototype for png_check_sig() from png.h</div><div class='del'>-  Prepended "#! /bin/sh" to ltmail.sh and contrib/pngminus/*.sh (Cosmin).</div><div class='del'>-  Avoided potential buffer overflow and optimized buffer in</div><div class='del'>-    png_write_sCAL(), png_write_sCAL_s() (Cosmin).</div><div class='del'>-  Removed the include directories and libraries from CFLAGS and LDFLAGS</div><div class='del'>-    in scripts/makefile.gcc (Nelson A. de Oliveira, Cosmin).</div><div class='del'>-  Exported png_write_sig (Cosmin).</div><div class='del'>-  Optimized buffer in png_handle_cHRM() (Cosmin).</div><div class='del'>-  Allow zero-length IDAT chunks after the entire zlib datastream, but not</div><div class='del'>-    after another intervening chunk type.</div><div class='del'>-  Set pHYs = 2835 x 2835 pixels per meter, and added</div><div class='del'>-    pngtest now produces, and made some cosmetic changes to pngtest output.</div><div class='del'>-    sCAL = 0.352778e-3 x 0.352778e-3 meters, in pngtest.png (Cosmin).</div><div class='del'>-  Added png_set_benign_errors(), png_benign_error(), png_chunk_benign_error().</div><div class='del'>-  Revised INSTALL and autogen.sh</div><div class='del'>-  Fixed typo in several makefiles (-W1 should be -Wl)</div><div class='del'>-  Added typedef for png_int_32 and png_uint_32 on 64-bit systems.</div><div class='del'>-  Added one zero element to png_gamma_shift[] array in pngrtran.c to avoid</div><div class='del'>-    reading out of bounds.</div><div class='del'>-  Added demonstration of user chunk support in pngtest.c, to support the</div><div class='del'>-    public sTER chunk and a private vpAg chunk.</div><div class='del'>-  Removed ordinals from scripts/pngw32.def and removed png_info_int and</div><div class='del'>-    png_set_gray_1_2_4_to_8 entries.</div><div class='del'>-  Inline call of png_get_uint_32() in png_get_uint_31().</div><div class='del'>-  Removed WINCE and Netware projects.</div><div class='del'>-  Removed standalone Y2KINFO file.</div><div class='del'>-  Removed AC_FUNC_MALLOC from configure.ac.</div><div class='del'>-  Added a warning when writing iCCP profile with mismatched profile length.</div><div class='del'>-  Patched pnggccrd.c to assemble on x86_64 platforms.</div><div class='del'>-  Moved chunk header reading into a separate function png_read_chunk_header()</div><div class='del'>-    in pngrutil.c.  The chunk header (len+sig) is now serialized in a single</div><div class='del'>-    operation (Cosmin).</div><div class='del'>-  Implemented support for I/O states. Added png_ptr member io_state, and</div><div class='del'>-    functions png_get_io_chunk_name() and png_get_io_state() in pngget.c</div><div class='del'>-    (Cosmin).</div><div class='del'>-  Added png_get_io_chunk_name and png_get_io_state to scripts/*.def (Cosmin).</div><div class='del'>-  Renamed scripts/pngw32.* to scripts/pngwin.* (Cosmin).</div><div class='del'>-  Removed the include directories and libraries from CFLAGS and LDFLAGS</div><div class='del'>-    in scripts/makefile.gcc (Cosmin).</div><div class='del'>-  Used png_save_uint_32() to set vpAg width and height in pngtest.c (Cosmin).</div><div class='del'>-  Cast to proper type when getting/setting vpAg units in pngtest.c (Cosmin).</div><div class='del'>-  Added pngintrn.h to the Visual C++ projects (Cosmin).</div><div class='del'>-  Removed scripts/list (Cosmin).</div><div class='del'>-  Updated copyright year in scripts/pngwin.def (Cosmin).</div><div class='del'>-  Removed PNG_TYPECAST_NULL and used standard NULL consistently (Cosmin).</div><div class='del'>-  Disallowed the user to redefine png_size_t, and enforced a consistent use</div><div class='del'>-    of png_size_t across libpng (Cosmin).</div><div class='del'>-  Changed the type of png_ptr-&gt;rowbytes, PNG_ROWBYTES() and friends</div><div class='del'>-    to png_size_t (Cosmin).</div><div class='del'>-  Removed png_convert_size() and replaced png_sizeof with sizeof (Cosmin).</div><div class='del'>-  Removed some unnecessary type casts (Cosmin).</div><div class='del'>-  Changed prototype of png_get_compression_buffer_size() and</div><div class='del'>-    png_set_compression_buffer_size() to work with png_size_t instead of</div><div class='del'>-    png_uint_32 (Cosmin).</div><div class='del'>-  Removed png_memcpy_check() and png_memset_check() (Cosmin).</div><div class='del'>-  Fixed a typo (png_byte --&gt; png_bytep) in libpng.3 and libpng.txt (Cosmin).</div><div class='del'>-  Clarified that png_zalloc() does not clear the allocated memory,</div><div class='del'>-    and png_zalloc() and png_zfree() cannot be PNGAPI (Cosmin).</div><div class='del'>-  Renamed png_mem_size_t to png_alloc_size_t, fixed its definition in</div><div class='del'>-    pngconf.h, and used it in all memory allocation functions (Cosmin).</div><div class='del'>-  Renamed pngintrn.h to pngpriv.h, added a comment at the top of the file</div><div class='del'>-    mentioning that the symbols declared in that file are private, and</div><div class='del'>-    updated the scripts and the Visual C++ projects accordingly (Cosmin).</div><div class='del'>-  Removing trailing '.' from the warning and error messages (Cosmin).</div><div class='del'>-  Revised many of the makefiles to write their defines in pngdefs.h.</div><div class='del'>-  Changed "logical" to "bitwise" in the documentation.</div><div class='del'>-  Work around Intel-Mac compiler bug by setting PNG_NO_MMX_CODE in pngconf.h</div><div class='del'>-  Add a typecast to stifle compiler warning in pngrutil.c</div><div class='del'>-  Detect and fix attempt to write wrong iCCP profile length.</div><div class='del'>-  Fix potential buffer overflow in sPLT chunk handler.</div><div class='del'>-  Fix Makefile.am to not try to link to noexistent files.</div><div class='del'>-  Check all exported functions for NULL png_ptr.</div><div class='del'>-  Built Makefile.in with automake-1.9.6 instead of 1.9.2.</div><div class='del'>-  Add "install: all" in Makefile.am so "configure; make install" will work.</div><div class='del'>-  Added a typecast in png_zalloc().</div><div class='del'>-  Changed "new_key[79] = '\0';" to "(*new_key)[79] = '\0';" in pngwutil.c</div><div class='del'>-  Add "png_bytep" typecast to profile while calculating length in pngwutil.c</div><div class='del'>-  Added scripts/CMakeLists.txt</div><div class='del'>-  Added "png_ptr-&gt;num_trans=0" before error return in png_handle_tRNS,</div><div class='del'>-    to eliminate a vulnerability (CVE-2007-2554, CERT VU#684664)</div><div class='del'>-  Added png_ptr-&gt;unknown_chunk to hold working unknown chunk data, so it</div><div class='del'>-    can be free'ed in case of error.  Revised unknown chunk handling in</div><div class='del'>-    pngrutil.c and pngpread.c to use this structure.</div><div class='del'>-  Prefer PNG_USE_PNGVCRD when _MSC_VER is defined in pngconf.h</div><div class='del'>-  Revised pngvcrd.c for improved efficiency.</div><div class='del'>-  Moved local array "chunkdata" from pngrutil.c to the png_struct, so</div><div class='del'>-    it will be freed by png_read_destroy() in case of a read error (Kurt</div><div class='del'>-    Christensen).</div><div class='del'>-  Change "purpose" and "buffer" to png_ptr-&gt;chunkdata to avoid memory leaking.</div><div class='del'>-  Change all  "chunkdata" to "png_ptr-&gt;chunkdata" in png_decompress_chunk(),</div><div class='del'>-    and remove "chunkdata" from parameter list.</div><div class='del'>-  Put a call to png_check_chunk_name() in png_read_chunk_header().</div><div class='del'>-  Removed two calls to png_check_chunk_name() occuring later in the process.</div><div class='del'>-  Define PNG_NO_ERROR_NUMBERS by default in pngconf.h</div><div class='del'>-  Added png_push_have_buffer() function to pngpread.c</div><div class='del'>-  Eliminated PNG_BIG_ENDIAN_SUPPORTED and associated png_get_* macros.</div><div class='del'>-  Made inline expansion of png_get_*() optional with PNG_USE_READ_MACROS.</div><div class='del'>-  Eliminated all PNG_USELESS_TESTS and PNG_CORRECT_PALETTE_SUPPORTED code.</div><div class='del'>-  Synced contrib directory and configure files with libpng-1.2.30beta06.</div><div class='del'>-  Changed "-Wall" to "-W -Wall" in the CFLAGS in all makefiles (Cosmin Truta)</div><div class='del'>-  Declared png_ptr "volatile" in pngread.c and pngwrite.c to avoid warnings.</div><div class='del'>-  Updated contrib/visupng/cexcept.h to version 2.0.1</div><div class='del'>-  Added PNG_LITERAL_CHARACTER macros for #, [, and ].</div><div class='del'>-  Moved newline character from individual png_debug messages into the</div><div class='del'>-    png_debug macros.</div><div class='del'>-  Allow user to #define their own png_debug, png_debug1, and png_debug2.</div><div class='del'>-  Added PNG_STRING_NEWLINE macro</div><div class='del'>-  Added PNG_STRING_COPYRIGHT macro.</div><div class='del'>-  Added non-ISO versions of png_debug macros.</div><div class='del'>-  Added PNG_WRITE_FLUSH_SUPPORTED and PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED</div><div class='del'>-    blocks around new png_flush() call.</div><div class='del'>-  Revised PNG_NO_STDIO version of png_write_flush()</div><div class='del'>-  Added png_get|set_chunk_cache_max() to limit the total number of sPLT,</div><div class='del'>-    text, and unknown chunks that can be stored.</div><div class='del'>-  Shortened tIME_string to 29 bytes in pngtest.c</div><div class='del'>-  Revised makefile.darwin to fix shared library numbering.</div><div class='del'>-  Change png_set_gray_1_2_4_to_8() to png_set_expand_gray_1_2_4_to_8()</div><div class='del'>-    in example.c (debian bug report)</div><div class='del'>-  Sync with tEXt vulnerability fix in libpng-1.2.33rc02.</div><div class='del'>-  Added png_check_cHRM in png.c and moved checking from pngget.c, pngrutil.c,</div><div class='del'>-    and pngwrite.c</div><div class='del'>-  Added check for zero-area RGB cHRM triange in png_check_cHRM() and</div><div class='del'>-    png_check_cHRM_fixed().</div><div class='del'>-  Revised png_warning() to write its message on standard output by default</div><div class='del'>-    when warning_fn is NULL.</div><div class='del'>-  Eliminated png_check_cHRM().  Instead, always use png_check_cHRM_fixed().</div><div class='del'>-  In png_check_cHRM_fixed(), ensure white_y is &gt; 0, and removed redundant</div><div class='del'>-    check for all-zero coordinates that is detected by the triangle check.</div><div class='del'>-  Rearranged test expressions in png_check_cHRM_fixed() to avoid internal</div><div class='del'>-    overflows.</div><div class='del'>-  Added PNG_NO_CHECK_cHRM conditional.</div><div class='del'>-  Fixed string vs pointer-to-string error in png_check_keyword().</div><div class='del'>-  Added PNG_NO_CHECK_cHRM conditional.</div><div class='del'>-  Merge png_debug with version 1.2.34beta04.</div><div class='del'>-  Removed redundant check for key==NULL before calling png_check_keyword()</div><div class='del'>-    to ensure that new_key gets initialized and removed extra warning</div><div class='del'>-    (Merge with version 1.2.34beta05 -- Arvan Pritchard).</div><div class='del'>-  Added PNG_TRANSFORM_STRIP_FILLER_BEFORE and PNG_TRANSFORM_STRIP_FILLER_AFTER</div><div class='del'>-    conditionals and deprecated PNG_TRANSFORM_STRIP_FILLER (Jim Barry).</div><div class='del'>-  Turned off PNG_READ_DITHER_SUPPORTED by default.</div><div class='del'>-  Combined several instances of png_malloc(); png_memset() into png_calloc().</div><div class='del'>-  Fixed order of #ifdef directives in the png_debug defines in png.h</div><div class='del'>-    (bug introduced in libpng-1.2.34).</div><div class='del'>-  Revised comments in png_set_read_fn() and png_set_write_fn().</div><div class='del'>-  Use png_calloc() instead of png_malloc() to allocate big_row_buf when</div><div class='del'>-    reading an interlaced file, to avoid a possible UMR.</div><div class='del'>-  Revised libpng*.txt and png.h documentation about use of png_write_flush()</div><div class='del'>-    and png_set_write_fn().</div><div class='del'>-  Removed fflush() from pngtest.c.</div><div class='del'>-  Added "#define PNG_NO_WRITE_FLUSH" to contrib/pngminim/encoder/pngusr.h</div><div class='del'>-  Removed fflush() from pngtest.c.</div><div class='del'>-  Added "#define PNG_NO_WRITE_FLUSH" to contrib/pngminim/encoder/pngusr.h</div><div class='del'>-  Added a section on differences between 1.0.x and 1.2.x to libpng.3/libpng.txt</div><div class='del'>-  Fixed potential memory leak of "new_name" in png_write_iCCP() (Ralph Giles)</div><div class='del'>-  Added "ifndef PNG_SKIP_SETJMP_CHECK" block in pngconf.h to allow</div><div class='del'>-    application code writers to bypass the check for multiple inclusion</div><div class='del'>-    of setjmp.h when they know that it is safe to ignore the situation.</div><div class='del'>-  Eliminated internal use of setjmp() in pngread.c and pngwrite.c</div><div class='del'>-  Eliminated deprecated png_read_init_3() and png_write_init_3() functions.</div><div class='del'>-  Renamed "user_chunk_data" to "my_user_chunk_data" in pngtest.c to suppress</div><div class='del'>-    "shadowed declaration" warning from gcc-4.3.3.</div><div class='del'>-  Renamed "gamma" to "png_gamma" in pngset.c to avoid "shadowed declaration"</div><div class='del'>-    warning about a global "gamma" variable in math.h on some platforms.</div><div class='del'>-  Removed pngprefs.h and MMX from makefiles</div><div class='del'>-  Rebuilt configure scripts with autoconf-2.63 instead of 2.62</div><div class='del'>-  Clarified usage of sig_bit versus sig_bit_p in example.c (Vincent Torri)</div><div class='del'>-  Reformated sources in libpng style (3-space intentation, comment format)</div><div class='del'>-  Fixed typo in libpng docs (PNG_FILTER_AVE should be PNG_FILTER_AVG)</div><div class='del'>-  Added sections about the git repository and our coding style to the</div><div class='del'>-    documentation</div><div class='del'>-  Relocated misplaced #endif in pngwrite.c, sCAL chunk handler.</div><div class='del'>-  Conditionally compile png_read_finish_row() which is not used by</div><div class='del'>-    progressive readers.</div><div class='del'>-  Added contrib/pngminim/preader to demonstrate building minimal progressive</div><div class='del'>-    decoder, based on contrib/gregbook with embedded libpng and zlib.</div><div class='del'>-  In contrib/pngminim/*, renamed "makefile.std" to "makefile", since there</div><div class='del'>-    is only one makefile in those directories, and revised the README files</div><div class='del'>-    accordingly.</div><div class='del'>-  Added "#define PNG_NO_WRITE_SWAP" to contrib/pngminim/encoder/pngusr.h</div><div class='del'>-    and "define PNG_NO_READ_SWAP" to decoder/pngusr.h and preader/pngusr.h</div><div class='del'>-  Added a section in the documentation about using png_get_io_ptr() in</div><div class='del'>-    configure scripts to detect the presence of libpng.</div><div class='del'>-  Revised libpng*.txt and libpng.3 to mention calling png_set_IHDR()</div><div class='del'>-    multiple times and to specify the sample order in the tRNS chunk,</div><div class='del'>-    because the ISO PNG specification has a typo in the tRNS table.</div><div class='del'>-  Changed several PNG_UNKNOWN_CHUNK_SUPPORTED to</div><div class='del'>-    PNG_HANDLE_AS_UNKNOWN_SUPPORTED, to make the png_set_keep mechanism</div><div class='del'>-    available for ignoring known chunks even when not saving unknown chunks.</div><div class='del'>-  Adopted preference for consistent use of "#ifdef" and "#ifndef" versus</div><div class='del'>-    "#if defined()" and "if !defined()" where possible.</div><div class='del'>-  Eliminated PNG_LEGACY_SUPPORTED code.</div><div class='del'>-  Moved the various unknown chunk macro definitions outside of the</div><div class='del'>-     PNG_READ|WRITE_ANCILLARY_CHUNK_SUPPORTED blocks.</div><div class='del'>-  Added a reference to the libpng license in each file.</div><div class='del'>-  Relocated INVERT_ALPHA within png_read_png() and png_write_png().</div><div class='del'>-  Added high-level API transform PNG_TRANSFORM_GRAY_TO_RGB.</div><div class='del'>-  Added an "xcode" project to the projects directory (Alam Arias).</div><div class='del'>-  Avoid some tests in filter selection in pngwutil.c</div><div class='del'>-  Avoid a possible NULL dereference in debug build, in png_set_text_2().</div><div class='del'>-    (bug introduced in libpng-0.95, discovered by Evan Rouault)</div><div class='del'>-  Rebuilt configure scripts with autoconf-2.65</div><div class='del'>-  Replaced *.tar.lzma with *.tar.xz in distribution.  Get the xz codec</div><div class='del'>-    from &lt;http://tukaani.org/xz&gt;.</div><div class='del'>-  Reject attempt to write iCCP chunk with negative embedded profile length</div><div class='del'>-    (JD Chen)</div><div class='del'>-  Changed "trans" to "trans_alpha" and changed "trans_values" to "trans_color".</div><div class='del'>-  Removed lpXYZ.tar.bz2 (with CRLF), KNOWNBUG, libpng-x.y.z-KNOWNBUG.txt,</div><div class='del'>-    and the "noconfig" files from the distribution.</div><div class='del'>-  Moved CMakeLists.txt from scripts into the main libpng directory.</div><div class='del'>-  Various bugfixes and improvements to CMakeLists.txt (Philip Lowman)</div><div class='del'>-  Converted all PNG_NO_* tests to PNG_*_SUPPORTED everywhere except pngconf.h</div><div class='del'>-  Eliminated PNG_NO_FREE_ME and PNG_FREE_ME_SUPPORTED macros.</div><div class='del'>-  Use png_malloc plus a loop instead of png_calloc() to initialize</div><div class='del'>-    row_pointers in png_read_png().</div><div class='del'>-  Eliminated PNG_GLOBAL_ARRAYS and PNG_LOCAL_ARRAYS; always use local arrays.</div><div class='del'>-  Eliminated PNG_CALLOC_SUPPORTED macro and always provide png_calloc().</div><div class='del'>-  Removed scripts/libpng.icc</div><div class='del'>-  Changed typecast of filler from png_byte to png_uint_16 in png_set_filler().</div><div class='del'>-    (Dennis Gustafsson)</div><div class='del'>-  Eliminated unused PNG_FLAG_FREE_* defines from pngpriv.h</div><div class='del'>-  Expanded TAB characters in pngrtran.c</div><div class='del'>-  Removed PNG_CONST from all "PNG_CONST PNG_CHNK" declarations to avoid</div><div class='del'>-    compiler complaints about doubly declaring things "const".</div><div class='del'>-  Eliminated unused png_ptr-&gt;row_buf_size</div><div class='del'>-  Changed all "#if [!]defined(X)" to "if[n]def X" where possible.</div><div class='del'>-  Moved redundant IHDR checking into new png_check_IHDR() in png.c</div><div class='del'>-    and report all errors found in the IHDR data.</div><div class='del'>-  Eliminated useless call to png_check_cHRM() from pngset.c</div><div class='del'>-  Eliminated a shadowed declaration of "pp" in png_handle_sPLT().</div><div class='del'>-  Patched ltmain.sh for wince support.</div><div class='del'>-  Added PNG_CONVERT_tIME_SUPPORTED macro.</div><div class='del'>-  Make inclusion of time.h in pngconf.h depend on PNG_CONVERT_tIME_SUPPORTED</div><div class='del'>-  Make #define PNG_CONVERT_tIME_SUPPORTED depend on PNG_WRITE_tIME_SUPPORTED</div><div class='del'>-  Updated scripts/pngw32.def and projects/wince/png32ce.def</div><div class='del'>-  Copied projects/wince/png32ce.def to the scripts directory.</div><div class='del'>-  Added scripts/makefile.cegcc</div><div class='del'>-  Revised libpng*.txt to describe differences from 1.2.40 to 1.4.0</div><div class='del'>-  Added PNG_DEPSTRUCT, PNG_DEPRECATED, PNG_USE_RESULT, PNG_NORETURN, and</div><div class='del'>-    PNG_ALLOCATED macros to detect deprecated direct access to the</div><div class='del'>-    png_struct or info_struct members and other deprecated usage in</div><div class='del'>-    applications (John Bowler).</div><div class='del'>-  Updated scripts/makefile* to add "-DPNG_CONFIGURE_LIBPNG" to CFLAGS,</div><div class='del'>-    to prevent warnings about direct access to png structs by libpng</div><div class='del'>-    functions while building libpng.  They need to be tested, especially</div><div class='del'>-    those using compilers other than gcc.</div><div class='del'>-  Updated CMakeLists.txt to add "-DPNG_CONFIGURE_LIBPNG" to the definitions.</div><div class='del'>-  Updated projects/visualc6 and visualc71 with "/d PNG_CONFIGURE_LIBPNG".</div><div class='del'>-    They should work but still need to be updated to remove</div><div class='del'>-    references to pnggccrd.c or pngvcrd.c and ASM building.</div><div class='del'>-  Added README.txt to the beos, cbuilder5, netware, and xcode projects warning</div><div class='del'>-    that they need to be updated, to remove references to pnggccrd.c and</div><div class='del'>-    pngvcrd.c and to depend on pngpriv.h</div><div class='del'>-  Removed three direct references to read_info_ptr members in pngtest.c</div><div class='del'>-    that were detected by the new PNG_DEPSTRUCT macro.</div><div class='del'>-  Moved the png_debug macro definitions and the png_read_destroy(),</div><div class='del'>-    png_write_destroy() and png_far_to_near() prototypes from png.h</div><div class='del'>-    to pngpriv.h (John Bowler)</div><div class='del'>-  Moved the synopsis lines for png_read_destroy(), png_write_destroy()</div><div class='del'>-    png_debug(), png_debug1(), and png_debug2() from libpng.3 to libpngpf.3.</div><div class='del'>-  Removed the obsolete, unused pnggccrd.c and pngvcrd.c files.</div><div class='del'>-  Removed dependency of pngtest.o on pngpriv.h in the makefiles.</div><div class='del'>-  Added -DPNG_CONFIGURE_LIBPNG to contrib/pngminm/*/makefile</div><div class='del'>-  Changed png_check_sig() to !png_sig_cmp() in contrib programs.</div><div class='del'>-  Corrected the png_get_IHDR() call in contrib/gregbook/readpng2.c</div><div class='del'>-  Changed pngminim/*/gather.sh to stop trying to remove pnggccrd.c and pngvcrd.c</div><div class='del'>-  Added dependency on pngpriv.h in contrib/pngminim/*/makefile</div><div class='del'>-  Revised Makefile.am to use libpng.sys while building libpng.so</div><div class='del'>-    so that only PNG_EXPORT functions are exported.</div><div class='del'>-  Removed the deprecated png_check_sig() function/macro.</div><div class='del'>-  Removed recently removed function names from scripts/*.def</div><div class='del'>-  Added PNG_PRIVATE macro definition in pngconf.h for possible future use.</div><div class='del'>-  Removed projects/beos and netware.txt; no one seems to be supporting them.</div><div class='del'>-  Moved libpng-config.in and libpng.pc-configure.in out of the scripts</div><div class='del'>-    directory, to libpng-config.in and libpng.pc.in, respectively, and</div><div class='del'>-    modified Makefile.am and configure.ac accordingly.  Now "configure"</div><div class='del'>-    needs nothing from the "scripts" directory.</div><div class='del'>-  Removed ASM builds from projects/visualc6 and projects/visualc71</div><div class='del'>-  Removed scripts/makefile.nommx and makefile.vcawin32</div><div class='del'>-  Revised CMakeLists.txt to account for new location of libpng-config.in</div><div class='del'>-    and libpng.pc.in</div><div class='del'>-  Updated INSTALL to reflect removal and relocation of files.</div><div class='del'>-  Moved descriptions of makefiles and other scripts out of INSTALL into</div><div class='del'>-    scripts/README.txt</div><div class='del'>-  Updated the copyright year in scripts/pngwin.rc from 2006 to 2009.</div><div class='del'>-  Removed obsolete comments about ASM from projects/visualc71/README_zlib.txt</div><div class='del'>-  Align row_buf on 16-byte boundary in memory.</div><div class='del'>-  Make the 'png_jmpbuf' macro expand to a call that records the correct</div><div class='del'>-    longjmp function as well as returning a pointer to the setjmp</div><div class='del'>-    jmp_buf buffer, and marked direct access to jmpbuf 'deprecated'.</div><div class='del'>-    (John Bowler)</div><div class='del'>-  Changed "/255" to "/255.0" in background calculations to make it clear</div><div class='del'>-    that the 255 is used as a double.</div><div class='del'>-  Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files.</div><div class='del'>-  Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco</div><div class='del'>-    to put png.h and pngconf.h in $prefix/include, like the other scripts,</div><div class='del'>-    instead of in $prefix/include/libpng.  Also revised makefile.sco</div><div class='del'>-    to put them in $prefix/include/libpng14 instead of in</div><div class='del'>-    $prefix/include/libpng/libpng14.</div><div class='del'>-  Added "bit_depth" parameter to the private png_build_gamma_table() function.</div><div class='del'>-  Use png_calloc() instead of png_malloc(); png_memset() in pngrutil.c</div><div class='del'>-  Avoid deprecated references to png_ptr-io_ptr and png_ptr-&gt;error_ptr</div><div class='del'>-    in pngtest.c</div><div class='add'>+  Added description of png_set_crc_action() to the manual.</div><div class='add'>+  Added a note in the manual that the type of the iCCP profile was changed</div><div class='add'>+    from png_charpp to png_bytepp in png_get_iCCP().  Similarly,</div><div class='add'>+    it was changed from png_charpp to png_const_bytepp in png_set_iCCP().</div><div class='add'>+  Ensure that png_rgb_to_gray ignores palette mapped images, if libpng</div><div class='add'>+    internally happens to call it with one.</div><div class='add'>+  Fixed the failure to handle palette mapped images correctly.</div><div class='add'>+  Fixed a bug in handling of interlaced images (bero at arklinux.org).</div><div class='add'>+  Updated CMakeLists.txt (Clifford Yapp)</div><div class='add'>+  Fixed typecasting of some png_debug() statements (Cosmin)</div><div class='add'>+  Updated documentation of png_set|get_tRNS() (Thomas Klausner).</div><div class='add'>+  Mentioned in the documentation that applications must #include "zlib.h"</div><div class='add'>+    if they need access to anything in zlib.h, and that a number of</div><div class='add'>+    macros such as png_memset() are no longer accessible by applications.</div><div class='add'>+  Corrected pngvalid gamma test "sample" function to access all of the color</div><div class='add'>+    samples of each pixel, instead of sampling the red channel three times.</div><div class='add'>+  Changed variable names index, div, exp, and gamma to char_index, divisor,</div><div class='add'>+    exp_b10, and gamma_val, respectively, to avoid "shadow" warnings.</div><div class='add'>+  Prevent png_push_crc_skip() from hanging while reading an unknown chunk</div><div class='add'>+    or an over-large compressed zTXt chunk with the progressive reader.</div><div class='add'>+  Eliminated more GCC "shadow" warnings.</div><div class='add'>+  Revised png_fixed() in png.c to avoid compiler warning about reaching the</div><div class='add'>+    end without returning anything.</div><div class='add'>+  In the manual, describe the png_get_IHDR() arguments in the correct order.</div><div class='add'>+  Added const_png_structp and const_png_infop types, and used them in</div><div class='add'>+    prototypes for most png_get_*() functions.</div><div class='add'>+  Added png_get_io_chunk_type() and deprecated png_get_io_chunk_name()</div><div class='add'>+  Added synopses for the IO_STATE functions and other missing synopses</div><div class='add'>+    to the manual. Removed the synopses from libpngpf.3 because they</div><div class='add'>+    were out of date and no longer useful.  Better information can be</div><div class='add'>+    obtained by reading the prototypes and comments in pngpriv.h</div><div class='add'>+  Attempted to fix cpp on Solaris with S. Studio 12 cc, fix build</div><div class='add'>+    Added a make macro DFNCPP that is a CPP that will accept the tokens in</div><div class='add'>+    a .dfn file and adds configure stuff to test for such a CPP.  ./configure</div><div class='add'>+    should fail if one is not available.</div><div class='add'>+  Corrected const_png_ in png.h to png_const_ to avoid polluting the namespace.</div><div class='add'>+  Added png_get_current_row_number and png_get_current_pass_number for the</div><div class='add'>+    benefit of the user transform callback.</div><div class='add'>+  Added png_process_data_pause and png_process_data_skip for the benefit of</div><div class='add'>+    progressive readers that need to stop data processing or want to optimize</div><div class='add'>+    skipping of unread data (e.g. if the reader marks a chunk to be skipped.)</div><div class='add'>+  Enhanced pngvalid, corrected an error in gray_to_rgb, corrected doc error.</div><div class='add'>+    pngvalid contains tests of transforms, which tests are currently disabled</div><div class='add'>+    because they are incompletely tested.  gray_to_rgb was failing to expand</div><div class='add'>+    the bit depth for smaller bit depth images; this seems to be a long</div><div class='add'>+    standing error and resulted, apparently, in invalid output.  The</div><div class='add'>+    documentation did not accurately describe what libpng really does when</div><div class='add'>+    converting RGB to gray.</div><div class='add'>+  Fixed incorrect examples of callback prototypes in the manual, that were</div><div class='add'>+    introduced in libpng-1.0.0.</div><div class='add'>+  In addition the order of the png_get_uint macros with respect to the</div><div class='add'>+    relevant function definitions has been reversed.  This helps the</div><div class='add'>+    preprocessing of the symbol files be more robust.  Furthermore, the</div><div class='add'>+    symbol file preprocessing now uses -DPNG_NO_USE_READ_MACROS even when</div><div class='add'>+    the library may actually be built with PNG_USE_READ_MACROS; this stops</div><div class='add'>+    the read macros interfering with the symbol file format.</div><div class='add'>+  Made the manual, synopses, and function prototypes use the function</div><div class='add'>+    argument names file_gamma, int_file_gamma, and srgb_intent consistently.</div><div class='add'>+  Changed PNG_UNUSED from "param=param;" to "(void)param;".</div><div class='add'>+  Added transform tests to pngvalid and simplified the arguments.</div><div class='add'>+  Added a request in the manual that applications do not use "png_" or</div><div class='add'>+    "PNG_" to begin any of their own symbols.</div><div class='ctx'> </div><div class='ctx'> Send comments/corrections/commendations to png-mng-implement at lists.sf.net</div><div class='del'>-(subscription required; visit </div><div class='add'>+(subscription required; visit</div><div class='ctx'> https://lists.sourceforge.net/lists/listinfo/png-mng-implement</div><div class='ctx'> to subscribe) or to glennrp at users.sourceforge.net</div><div class='ctx'> </div><div class='head'>diff --git a/src/3rdparty/libpng/CHANGES b/src/3rdparty/libpng/CHANGES<br/>index df44f16..fa5f2aa 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/CHANGES?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/CHANGES</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/CHANGES?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/CHANGES</a></div><div class='hunk'>@@ -2,11 +2,11 @@</div><div class='ctx'> libpng_changes(){ /*</div><div class='ctx'> CHANGES - changes for libpng</div><div class='ctx'> </div><div class='del'>-version 0.2</div><div class='add'>+Version 0.2</div><div class='ctx'>   added reader into png.h</div><div class='ctx'>   fixed small problems in stub file</div><div class='ctx'> </div><div class='del'>-version 0.3</div><div class='add'>+Version 0.3</div><div class='ctx'>   added pull reader</div><div class='ctx'>   split up pngwrite.c to several files</div><div class='ctx'>   added pnglib.txt</div><div class='hunk'>@@ -17,7 +17,7 @@ version 0.3</div><div class='ctx'>   added K&amp;R support</div><div class='ctx'>   added check for 64 KB blocks for 16 bit machines</div><div class='ctx'> </div><div class='del'>-version 0.4</div><div class='add'>+Version 0.4</div><div class='ctx'>   cleaned up code and commented code</div><div class='ctx'>   simplified time handling into png_time</div><div class='ctx'>   created png_color_16 and png_color_8 to handle color needs</div><div class='hunk'>@@ -28,28 +28,28 @@ version 0.4</div><div class='ctx'>   cleaned up zTXt reader and writer (using zlib's Reset functions)</div><div class='ctx'>   split transformations into pngrtran.c and pngwtran.c</div><div class='ctx'> </div><div class='del'>-version 0.5</div><div class='add'>+Version 0.5</div><div class='ctx'>   interfaced with zlib 0.8</div><div class='ctx'>   fixed many reading and writing bugs</div><div class='ctx'>   saved using 3 spaces instead of tabs</div><div class='ctx'> </div><div class='del'>-version 0.6</div><div class='add'>+Version 0.6</div><div class='ctx'>   added png_large_malloc() and png_large_free()</div><div class='ctx'>   added png_size_t</div><div class='ctx'>   cleaned up some compiler warnings</div><div class='ctx'>   added png_start_read_image()</div><div class='ctx'> </div><div class='del'>-version 0.7</div><div class='add'>+Version 0.7</div><div class='ctx'>   cleaned up lots of bugs</div><div class='ctx'>   finished dithering and other stuff</div><div class='ctx'>   added test program</div><div class='ctx'>   changed name from pnglib to libpng</div><div class='ctx'> </div><div class='del'>-version 0.71 [June, 1995]</div><div class='add'>+Version 0.71 [June, 1995]</div><div class='ctx'>   changed pngtest.png for zlib 0.93</div><div class='ctx'>   fixed error in libpng.txt and example.c</div><div class='ctx'> </div><div class='del'>-version 0.8</div><div class='add'>+Version 0.8</div><div class='ctx'>   cleaned up some bugs</div><div class='ctx'>   added png_set_filler()</div><div class='ctx'>   split up pngstub.c into pngmem.c, pngio.c, and pngerror.c</div><div class='hunk'>@@ -63,191 +63,194 @@ version 0.8</div><div class='ctx'>   changed external functions passing floats to doubles (k&amp;r problems?)</div><div class='ctx'>   put all the configurable stuff in pngconf.h</div><div class='ctx'>   enabled png_set_shift to work with paletted images on read</div><div class='del'>-  added png_read_update_info() - updates info structure with</div><div class='del'>-     transformations</div><div class='add'>+  added png_read_update_info() - updates info structure with transformations</div><div class='ctx'> </div><div class='del'>-version 0.81 [August, 1995]</div><div class='add'>+Version 0.81 [August, 1995]</div><div class='ctx'>   incorporated Tim Wegner's medium model code (thanks, Tim)</div><div class='ctx'> </div><div class='del'>-version 0.82 [September, 1995]</div><div class='add'>+Version 0.82 [September, 1995]</div><div class='ctx'>   [unspecified changes]</div><div class='ctx'> </div><div class='del'>-version 0.85 [December, 1995]</div><div class='add'>+Version 0.85 [December, 1995]</div><div class='ctx'>   added more medium model code (almost everything's a far)</div><div class='ctx'>   added i/o, error, and memory callback functions</div><div class='ctx'>   fixed some bugs (16 bit, 4 bit interlaced, etc.)</div><div class='ctx'>   added first run progressive reader (barely tested)</div><div class='ctx'> </div><div class='del'>-version 0.86 [January, 1996]</div><div class='add'>+Version 0.86 [January, 1996]</div><div class='ctx'>   fixed bugs</div><div class='ctx'>   improved documentation</div><div class='ctx'> </div><div class='del'>-version 0.87 [January, 1996]</div><div class='add'>+Version 0.87 [January, 1996]</div><div class='ctx'>   fixed medium model bugs</div><div class='ctx'>   fixed other bugs introduced in 0.85 and 0.86</div><div class='ctx'>   added some minor documentation</div><div class='ctx'> </div><div class='del'>-version 0.88 [January, 1996]</div><div class='add'>+Version 0.88 [January, 1996]</div><div class='ctx'>   fixed progressive bugs</div><div class='ctx'>   replaced tabs with spaces</div><div class='ctx'>   cleaned up documentation</div><div class='ctx'>   added callbacks for read/write and warning/error functions</div><div class='ctx'> </div><div class='del'>-version 0.89 [July, 1996]</div><div class='del'>-  added new initialization API to make libpng work better with shared libs</div><div class='del'>-     we now have png_create_read_struct(), png_create_write_struct(),</div><div class='del'>-     png_create_info_struct(), png_destroy_read_struct(), and</div><div class='del'>-     png_destroy_write_struct() instead of the separate calls to</div><div class='del'>-     malloc and png_read_init(), png_info_init(), and png_write_init()</div><div class='del'>-  changed warning/error callback functions to fix bug - this means you</div><div class='del'>-     should use the new initialization API if you were using the old</div><div class='del'>-     png_set_message_fn() calls, and that the old API no longer exists</div><div class='del'>-     so that people are aware that they need to change their code</div><div class='del'>-  changed filter selection API to allow selection of multiple filters</div><div class='del'>-     since it didn't work in previous versions of libpng anyways</div><div class='del'>-  optimized filter selection code</div><div class='del'>-  fixed png_set_background() to allow using an arbitrary RGB color for</div><div class='del'>-     paletted images</div><div class='del'>-  fixed gamma and background correction for paletted images, so</div><div class='del'>-     png_correct_palette is not needed unless you are correcting an</div><div class='del'>-     external palette (you will need to #define PNG_CORRECT_PALETTE_SUPPORTED</div><div class='del'>-     in pngconf.h) - if nobody uses this, it may disappear in the future.</div><div class='del'>-  fixed bug with Borland 64K memory allocation (Alexander Lehmann)</div><div class='del'>-  fixed bug in interlace handling (Smarasderagd, I think)</div><div class='del'>-  added more error checking for writing and image to reduce invalid files</div><div class='del'>-  separated read and write functions so that they won't both be linked</div><div class='del'>-     into a binary when only reading or writing functionality is used</div><div class='del'>-  new pngtest image also has interlacing and zTXt</div><div class='del'>-  updated documentation to reflect new API</div><div class='del'>-</div><div class='del'>-version 0.90 [January, 1997]</div><div class='del'>-  made CRC errors/warnings on critical and ancillary chunks configurable</div><div class='add'>+Version 0.89 [July, 1996]</div><div class='add'>+  Added new initialization API to make libpng work better with shared libs</div><div class='add'>+    we now have png_create_read_struct(), png_create_write_struct(),</div><div class='add'>+    png_create_info_struct(), png_destroy_read_struct(), and</div><div class='add'>+    png_destroy_write_struct() instead of the separate calls to</div><div class='add'>+    malloc and png_read_init(), png_info_init(), and png_write_init()</div><div class='add'>+  Changed warning/error callback functions to fix bug - this means you</div><div class='add'>+    should use the new initialization API if you were using the old</div><div class='add'>+    png_set_message_fn() calls, and that the old API no longer exists</div><div class='add'>+    so that people are aware that they need to change their code</div><div class='add'>+  Changed filter selection API to allow selection of multiple filters</div><div class='add'>+    since it didn't work in previous versions of libpng anyways</div><div class='add'>+  Optimized filter selection code</div><div class='add'>+  Fixed png_set_background() to allow using an arbitrary RGB color for</div><div class='add'>+    paletted images</div><div class='add'>+  Fixed gamma and background correction for paletted images, so</div><div class='add'>+    png_correct_palette is not needed unless you are correcting an</div><div class='add'>+    external palette (you will need to #define PNG_CORRECT_PALETTE_SUPPORTED</div><div class='add'>+    in pngconf.h) - if nobody uses this, it may disappear in the future.</div><div class='add'>+  Fixed bug with Borland 64K memory allocation (Alexander Lehmann)</div><div class='add'>+  Fixed bug in interlace handling (Smarasderagd, I think)</div><div class='add'>+  Added more error checking for writing and image to reduce invalid files</div><div class='add'>+  Separated read and write functions so that they won't both be linked</div><div class='add'>+    into a binary when only reading or writing functionality is used</div><div class='add'>+  New pngtest image also has interlacing and zTXt</div><div class='add'>+  Updated documentation to reflect new API</div><div class='add'>+</div><div class='add'>+Version 0.90 [January, 1997]</div><div class='add'>+  Made CRC errors/warnings on critical and ancillary chunks configurable</div><div class='ctx'>   libpng will use the zlib CRC routines by (compile-time) default</div><div class='del'>-  changed DOS small/medium model memory support - needs zlib 1.04 (Tim Wegner)</div><div class='del'>-  added external C++ wrapper statements to png.h (Gilles Dauphin)</div><div class='del'>-  allow PNG file to be read when some or all of file signature has already</div><div class='del'>-     been read from the beginning of the stream.  ****This affects the size</div><div class='del'>-     of info_struct and invalidates all programs that use a shared libpng****</div><div class='del'>-  fixed png_filler() declarations</div><div class='del'>-  fixed? background color conversions</div><div class='del'>-  fixed order of error function pointers to match documentation</div><div class='del'>-  current chunk name is now available in png_struct to reduce the number</div><div class='del'>-     of nearly identical error messages (will simplify multi-lingual</div><div class='del'>-     support when available)</div><div class='del'>-  try to get ready for unknown-chunk callback functions:</div><div class='del'>-     - previously read critical chunks are flagged, so the chunk handling</div><div class='del'>-       routines can determine if the chunk is in the right place</div><div class='del'>-     - all chunk handling routines have the same prototypes, so we will</div><div class='del'>-       be able to handle all chunks via a callback mechanism</div><div class='del'>-  try to fix Linux "setjmp" buffer size problems</div><div class='del'>-  removed png_large_malloc, png_large_free, and png_realloc functions.</div><div class='del'>-</div><div class='del'>-version 0.95 [March, 1997]</div><div class='del'>-  fixed bug in pngwutil.c allocating "up_row" twice and "avg_row" never</div><div class='del'>-  fixed bug in PNG file signature compares when start != 0</div><div class='del'>-  changed parameter type of png_set_filler(...filler...) from png_byte</div><div class='del'>-     to png_uint_32</div><div class='del'>-  added test for MACOS to ensure that both math.h and fp.h are not #included</div><div class='del'>-  added macros for libpng to be compiled as a Windows DLL (Andreas Kupries)</div><div class='del'>-  added "packswap" transformation, which changes the endianness of</div><div class='del'>-     packed-pixel bytes (Kevin Bracey)</div><div class='del'>-  added "strip_alpha" transformation, which removes the alpha channel of</div><div class='del'>-     input images without using it (not necessarily a good idea)</div><div class='del'>-  added "swap_alpha" transformation, which puts the alpha channel in front</div><div class='del'>-     of the color bytes instead of after</div><div class='del'>-  removed all implicit variable tests which assume NULL == 0 (I think)</div><div class='del'>-  changed several variables to "png_size_t" to show 16/32-bit limitations</div><div class='del'>-  added new pCAL chunk read/write support</div><div class='del'>-  added experimental filter selection weighting (Greg Roelofs)</div><div class='del'>-  removed old png_set_rgbx() and png_set_xrgb() functions that have been</div><div class='add'>+  Changed DOS small/medium model memory support - needs zlib 1.04 (Tim Wegner)</div><div class='add'>+  Added external C++ wrapper statements to png.h (Gilles Dauphin)</div><div class='add'>+  Allow PNG file to be read when some or all of file signature has already</div><div class='add'>+    been read from the beginning of the stream.  ****This affects the size</div><div class='add'>+    of info_struct and invalidates all programs that use a shared libpng****</div><div class='add'>+  Fixed png_filler() declarations</div><div class='add'>+  Fixed? background color conversions</div><div class='add'>+  Fixed order of error function pointers to match documentation</div><div class='add'>+  Current chunk name is now available in png_struct to reduce the number</div><div class='add'>+    of nearly identical error messages (will simplify multi-lingual</div><div class='add'>+    support when available)</div><div class='add'>+  Try to get ready for unknown-chunk callback functions:</div><div class='add'>+    - previously read critical chunks are flagged, so the chunk handling</div><div class='add'>+      routines can determine if the chunk is in the right place</div><div class='add'>+    - all chunk handling routines have the same prototypes, so we will</div><div class='add'>+      be able to handle all chunks via a callback mechanism</div><div class='add'>+  Try to fix Linux "setjmp" buffer size problems</div><div class='add'>+  Removed png_large_malloc, png_large_free, and png_realloc functions.</div><div class='add'>+</div><div class='add'>+Version 0.95 [March, 1997]</div><div class='add'>+  Fixed bug in pngwutil.c allocating "up_row" twice and "avg_row" never</div><div class='add'>+  Fixed bug in PNG file signature compares when start != 0</div><div class='add'>+  Changed parameter type of png_set_filler(...filler...) from png_byte</div><div class='add'>+    to png_uint_32</div><div class='add'>+  Added test for MACOS to ensure that both math.h and fp.h are not #included</div><div class='add'>+  Added macros for libpng to be compiled as a Windows DLL (Andreas Kupries)</div><div class='add'>+  Added "packswap" transformation, which changes the endianness of</div><div class='add'>+    packed-pixel bytes (Kevin Bracey)</div><div class='add'>+  Added "strip_alpha" transformation, which removes the alpha channel of</div><div class='add'>+    input images without using it (not necessarily a good idea)</div><div class='add'>+  Added "swap_alpha" transformation, which puts the alpha channel in front</div><div class='add'>+    of the color bytes instead of after</div><div class='add'>+  Removed all implicit variable tests which assume NULL == 0 (I think)</div><div class='add'>+  Changed several variables to "png_size_t" to show 16/32-bit limitations</div><div class='add'>+  Added new pCAL chunk read/write support</div><div class='add'>+  Added experimental filter selection weighting (Greg Roelofs)</div><div class='add'>+  Removed old png_set_rgbx() and png_set_xrgb() functions that have been</div><div class='ctx'>      obsolete for about 2 years now (use png_set_filler() instead)</div><div class='del'>-  added macros to read 16- and 32-bit ints directly from buffer, to be</div><div class='del'>-     used only on those systems that support it (namely PowerPC and 680x0)</div><div class='del'>-     With some testing, this may become the default for MACOS/PPC systems.</div><div class='del'>-  only calculate CRC on data if we are going to use it</div><div class='del'>-  added macros for zTXt compression type PNG_zTXt_COMPRESSION_???</div><div class='del'>-  added macros for simple libpng debugging output selectable at compile time</div><div class='del'>-  removed PNG_READ_END_MODE in progressive reader (Smarasderagd)</div><div class='del'>-  more description of info_struct in libpng.txt and png.h</div><div class='del'>-  more instructions in example.c</div><div class='del'>-  more chunk types tested in pngtest.c</div><div class='del'>-  renamed pngrcb.c to pngset.c, and all png_read_&lt;chunk&gt; functions to be</div><div class='del'>-     png_set_&lt;chunk&gt;.  We now have corresponding png_get_&lt;chunk&gt;</div><div class='del'>-     functions in pngget.c to get information in info_ptr.  This isolates</div><div class='del'>-     the application from the internal organization of png_info_struct</div><div class='del'>-     (good for shared library implementations).</div><div class='del'>-</div><div class='del'>-version 0.96 [May, 1997]</div><div class='del'>-  fixed serious bug with &lt; 8bpp images introduced in 0.95</div><div class='del'>-  fixed 256-color transparency bug (Greg Roelofs)</div><div class='del'>-  fixed up documentation (Greg Roelofs, Laszlo Nyul)</div><div class='del'>-  fixed "error" in pngconf.h for Linux setjmp() behaviour</div><div class='del'>-  fixed DOS medium model support (Tim Wegner)</div><div class='del'>-  fixed png_check_keyword() for case with error in static string text</div><div class='del'>-  added read of CRC after IEND chunk for embedded PNGs (Laszlo Nyul)</div><div class='del'>-  added typecasts to quiet compiler errors</div><div class='del'>-  added more debugging info</div><div class='del'>-</div><div class='del'>-version 0.97 [January, 1998]</div><div class='del'>-  removed PNG_USE_OWN_CRC capability</div><div class='del'>-  relocated png_set_crc_action from pngrutil.c to pngrtran.c</div><div class='del'>-  fixed typecasts of "new_key", etc. (Andreas Dilger)</div><div class='del'>-  added RFC 1152 [sic] date support</div><div class='del'>-  fixed bug in gamma handling of 4-bit grayscale</div><div class='del'>-  added 2-bit grayscale gamma handling (Glenn R-P)</div><div class='del'>-  added more typecasts. 65536L becomes (png_uint_32)65536L, etc. (Glenn R-P)</div><div class='del'>-  minor corrections in libpng.txt</div><div class='del'>-  added simple sRGB support (Glenn R-P)</div><div class='del'>-  easier conditional compiling, e.g. define PNG_READ/WRITE_NOT_FULLY_SUPPORTED;</div><div class='del'>-     all configurable options can be selected from command-line instead</div><div class='del'>-     of having to edit pngconf.h (Glenn R-P)</div><div class='del'>-  fixed memory leak in pngwrite.c (free info_ptr-&gt;text) (Glenn R-P)</div><div class='del'>-  added more conditions for png_do_background, to avoid changing</div><div class='del'>-     black pixels to background when a background is supplied and</div><div class='del'>-     no pixels are transparent</div><div class='del'>-  repaired PNG_NO_STDIO behaviour</div><div class='del'>-  tested NODIV support and made it default behaviour (Greg Roelofs)</div><div class='del'>-  added "-m" option and PNGTEST_DEBUG_MEMORY to pngtest (John Bowler)</div><div class='del'>-  regularized version numbering scheme and bumped shared-library major</div><div class='add'>+  Added macros to read 16- and 32-bit ints directly from buffer, to be</div><div class='add'>+    used only on those systems that support it (namely PowerPC and 680x0)</div><div class='add'>+    With some testing, this may become the default for MACOS/PPC systems.</div><div class='add'>+  Only calculate CRC on data if we are going to use it</div><div class='add'>+  Added macros for zTXt compression type PNG_zTXt_COMPRESSION_???</div><div class='add'>+  Added macros for simple libpng debugging output selectable at compile time</div><div class='add'>+  Removed PNG_READ_END_MODE in progressive reader (Smarasderagd)</div><div class='add'>+  More description of info_struct in libpng.txt and png.h</div><div class='add'>+  More instructions in example.c</div><div class='add'>+  More chunk types tested in pngtest.c</div><div class='add'>+  Renamed pngrcb.c to pngset.c, and all png_read_&lt;chunk&gt; functions to be</div><div class='add'>+    png_set_&lt;chunk&gt;.  We now have corresponding png_get_&lt;chunk&gt;</div><div class='add'>+    functions in pngget.c to get information in info_ptr.  This isolates</div><div class='add'>+    the application from the internal organization of png_info_struct</div><div class='add'>+    (good for shared library implementations).</div><div class='add'>+</div><div class='add'>+Version 0.96 [May, 1997]</div><div class='add'>+  Fixed serious bug with &lt; 8bpp images introduced in 0.95</div><div class='add'>+  Fixed 256-color transparency bug (Greg Roelofs)</div><div class='add'>+  Fixed up documentation (Greg Roelofs, Laszlo Nyul)</div><div class='add'>+  Fixed "error" in pngconf.h for Linux setjmp() behaviour</div><div class='add'>+  Fixed DOS medium model support (Tim Wegner)</div><div class='add'>+  Fixed png_check_keyword() for case with error in static string text</div><div class='add'>+  Added read of CRC after IEND chunk for embedded PNGs (Laszlo Nyul)</div><div class='add'>+  Added typecasts to quiet compiler errors</div><div class='add'>+  Added more debugging info</div><div class='add'>+</div><div class='add'>+Version 0.97 [January, 1998]</div><div class='add'>+  Removed PNG_USE_OWN_CRC capability</div><div class='add'>+  Relocated png_set_crc_action from pngrutil.c to pngrtran.c</div><div class='add'>+  Fixed typecasts of "new_key", etc. (Andreas Dilger)</div><div class='add'>+  Added RFC 1152 [sic] date support</div><div class='add'>+  Fixed bug in gamma handling of 4-bit grayscale</div><div class='add'>+  Added 2-bit grayscale gamma handling (Glenn R-P)</div><div class='add'>+  Added more typecasts. 65536L becomes (png_uint_32)65536L, etc. (Glenn R-P)</div><div class='add'>+  Minor corrections in libpng.txt</div><div class='add'>+  Added simple sRGB support (Glenn R-P)</div><div class='add'>+  Easier conditional compiling, e.g. define PNG_READ/WRITE_NOT_FULLY_SUPPORTED;</div><div class='add'>+    all configurable options can be selected from command-line instead</div><div class='add'>+    of having to edit pngconf.h (Glenn R-P)</div><div class='add'>+  Fixed memory leak in pngwrite.c (free info_ptr-&gt;text) (Glenn R-P)</div><div class='add'>+  Added more conditions for png_do_background, to avoid changing</div><div class='add'>+    black pixels to background when a background is supplied and</div><div class='add'>+    no pixels are transparent</div><div class='add'>+  Repaired PNG_NO_STDIO behaviour</div><div class='add'>+  Tested NODIV support and made it default behaviour (Greg Roelofs)</div><div class='add'>+  Added "-m" option and PNGTEST_DEBUG_MEMORY to pngtest (John Bowler)</div><div class='add'>+  Regularized version numbering scheme and bumped shared-library major</div><div class='ctx'>      version number to 2 to avoid problems with libpng 0.89 apps (Greg Roelofs)</div><div class='ctx'> </div><div class='del'>-version 0.98 [January, 1998]</div><div class='del'>-  cleaned up some typos in libpng.txt and in code documentation</div><div class='del'>-  fixed memory leaks in pCAL chunk processing (Glenn R-P and John Bowler)</div><div class='del'>-  cosmetic change "display_gamma" to "screen_gamma" in pngrtran.c</div><div class='del'>-  changed recommendation about file_gamma for PC images to .51 from .45,</div><div class='del'>-     in example.c and libpng.txt, added comments to distinguish between</div><div class='del'>-     screen_gamma, viewing_gamma, and display_gamma.</div><div class='del'>-  changed all references to RFC1152 to read RFC1123 and changed the</div><div class='del'>-     PNG_TIME_RFC1152_SUPPORTED macro to PNG_TIME_RFC1123_SUPPORTED</div><div class='del'>-  added png_invert_alpha capability (Glenn R-P -- suggestion by Jon Vincent)</div><div class='del'>-  changed srgb_intent from png_byte to int to avoid compiler bugs</div><div class='del'>-</div><div class='del'>-version 0.99 [January 30, 1998]</div><div class='del'>-  free info_ptr-&gt;text instead of end_info_ptr-&gt;text in pngread.c (John Bowler)</div><div class='del'>-  fixed a longstanding "packswap" bug in pngtrans.c</div><div class='del'>-  fixed some inconsistencies in pngconf.h that prevented compiling with</div><div class='del'>-     PNG_READ_GAMMA_SUPPORTED and PNG_READ_hIST_SUPPORTED undefined</div><div class='del'>-  fixed some typos and made other minor rearrangement of libpng.txt (Andreas)</div><div class='del'>-  changed recommendation about file_gamma for PC images to .50 from .51 in</div><div class='del'>-     example.c and libpng.txt, and changed file_gamma for sRGB images to .45</div><div class='del'>-  added a number of functions to access information from the png structure</div><div class='del'>-     png_get_image_height(), etc. (Glenn R-P, suggestion by Brad Pettit)</div><div class='del'>-  added TARGET_MACOS similar to zlib-1.0.8</div><div class='del'>-  define PNG_ALWAYS_EXTERN when __MWERKS__ &amp;&amp; WIN32 are defined</div><div class='del'>-  added type casting to all png_malloc() function calls</div><div class='del'>-version 0.99a [January 31, 1998]</div><div class='add'>+Version 0.98 [January, 1998]</div><div class='add'>+  Cleaned up some typos in libpng.txt and in code documentation</div><div class='add'>+  Fixed memory leaks in pCAL chunk processing (Glenn R-P and John Bowler)</div><div class='add'>+  Cosmetic change "display_gamma" to "screen_gamma" in pngrtran.c</div><div class='add'>+  Changed recommendation about file_gamma for PC images to .51 from .45,</div><div class='add'>+    in example.c and libpng.txt, added comments to distinguish between</div><div class='add'>+    screen_gamma, viewing_gamma, and display_gamma.</div><div class='add'>+  Changed all references to RFC1152 to read RFC1123 and changed the</div><div class='add'>+    PNG_TIME_RFC1152_SUPPORTED macro to PNG_TIME_RFC1123_SUPPORTED</div><div class='add'>+  Added png_invert_alpha capability (Glenn R-P -- suggestion by Jon Vincent)</div><div class='add'>+  Changed srgb_intent from png_byte to int to avoid compiler bugs</div><div class='add'>+</div><div class='add'>+Version 0.99 [January 30, 1998]</div><div class='add'>+  Free info_ptr-&gt;text instead of end_info_ptr-&gt;text in pngread.c (John Bowler)</div><div class='add'>+  Fixed a longstanding "packswap" bug in pngtrans.c</div><div class='add'>+  Fixed some inconsistencies in pngconf.h that prevented compiling with</div><div class='add'>+    PNG_READ_GAMMA_SUPPORTED and PNG_READ_hIST_SUPPORTED undefined</div><div class='add'>+  Fixed some typos and made other minor rearrangement of libpng.txt (Andreas)</div><div class='add'>+  Changed recommendation about file_gamma for PC images to .50 from .51 in</div><div class='add'>+    example.c and libpng.txt, and changed file_gamma for sRGB images to .45</div><div class='add'>+  Added a number of functions to access information from the png structure</div><div class='add'>+    png_get_image_height(), etc. (Glenn R-P, suggestion by Brad Pettit)</div><div class='add'>+  Added TARGET_MACOS similar to zlib-1.0.8</div><div class='add'>+  Define PNG_ALWAYS_EXTERN when __MWERKS__ &amp;&amp; WIN32 are defined</div><div class='add'>+  Added type casting to all png_malloc() function calls</div><div class='add'>+</div><div class='add'>+Version 0.99a [January 31, 1998]</div><div class='ctx'>   Added type casts and parentheses to all returns that return a value.(Tim W.)</div><div class='del'>-version 0.99b [February 4, 1998]</div><div class='add'>+</div><div class='add'>+Version 0.99b [February 4, 1998]</div><div class='ctx'>   Added type cast png_uint_32 on malloc function calls where needed.</div><div class='ctx'>   Changed type of num_hist from png_uint_32 to int (same as num_palette).</div><div class='ctx'>   Added checks for rowbytes overflow, in case png_size_t is less than 32 bits.</div><div class='ctx'>   Renamed makefile.elf to makefile.lnx.</div><div class='del'>-version 0.99c [February 7, 1998]</div><div class='add'>+</div><div class='add'>+Version 0.99c [February 7, 1998]</div><div class='ctx'>   More type casting.  Removed erroneous overflow test in pngmem.c.</div><div class='ctx'>   Added png_buffered_memcpy() and png_buffered_memset(), apply them to rowbytes.</div><div class='ctx'>   Added UNIX manual pages libpng.3 (incorporating libpng.txt) and  png.5.</div><div class='del'>-version 0.99d [February 11, 1998]</div><div class='add'>+</div><div class='add'>+Version 0.99d [February 11, 1998]</div><div class='ctx'>   Renamed "far_to_near()" "png_far_to_near()"</div><div class='ctx'>   Revised libpng.3</div><div class='ctx'>   Version 99c "buffered" operations didn't work as intended.  Replaced them</div><div class='hunk'>@@ -257,7 +260,8 @@ version 0.99d [February 11, 1998]</div><div class='ctx'>   Check for overlength tRNS chunk present when indexed-color PLTE is read.</div><div class='ctx'>   Cleaned up spelling errors in libpng.3/libpng.txt</div><div class='ctx'>   Corrected a problem with png_get_tRNS() which returned undefined trans array</div><div class='del'>-version 0.99e [February 28, 1998]</div><div class='add'>+</div><div class='add'>+Version 0.99e [February 28, 1998]</div><div class='ctx'>   Corrected png_get_tRNS() again.</div><div class='ctx'>   Add parentheses for easier reading of pngget.c, fixed "||" should be "&amp;&amp;".</div><div class='ctx'>   Touched up example.c to make more of it compileable, although the entire</div><div class='hunk'>@@ -267,53 +271,59 @@ version 0.99e [February 28, 1998]</div><div class='ctx'>   Replaced pngtest.png with one created with zlib 1.1.1</div><div class='ctx'>   Changed pngtest to report PASS even when file size is different (Jean-loup G.)</div><div class='ctx'>   Corrected some logic errors in png_do_invert_alpha() (Chris Patterson)</div><div class='del'>-version 0.99f [March 5, 1998]</div><div class='add'>+</div><div class='add'>+Version 0.99f [March 5, 1998]</div><div class='ctx'>   Corrected a bug in pngpread() introduced in version 99c (Kevin Bracey)</div><div class='ctx'>   Moved makefiles into a "scripts" directory, and added INSTALL instruction file</div><div class='ctx'>   Added makefile.os2 and pngos2.def (A. Zabolotny) and makefile.s2x (W. Sebok)</div><div class='ctx'>   Added pointers to "note on libpng versions" in makefile.lnx and README</div><div class='ctx'>   Added row callback feature when reading and writing nonprogressive rows</div><div class='del'>-     and added a test of this feature in pngtest.c</div><div class='add'>+    and added a test of this feature in pngtest.c</div><div class='ctx'>   Added user transform callbacks, with test of the feature in pngtest.c</div><div class='del'>-version 0.99g [March 6, 1998, morning]</div><div class='add'>+</div><div class='add'>+Version 0.99g [March 6, 1998, morning]</div><div class='ctx'>   Minor changes to pngtest.c to suppress compiler warnings.</div><div class='ctx'>   Removed "beta" language from documentation.</div><div class='del'>-version 0.99h [March 6, 1998, evening]</div><div class='add'>+</div><div class='add'>+Version 0.99h [March 6, 1998, evening]</div><div class='ctx'>   Minor changes to previous minor changes to pngtest.c</div><div class='ctx'>   Changed PNG_READ_NOT_FULLY_SUPPORTED to PNG_READ_TRANSFORMS_NOT_SUPPORTED</div><div class='del'>-  and added PNG_PROGRESSIVE_READ_NOT_SUPPORTED macro</div><div class='add'>+    and added PNG_PROGRESSIVE_READ_NOT_SUPPORTED macro</div><div class='ctx'>   Added user transform capability</div><div class='ctx'> </div><div class='del'>-version 1.00 [March 7, 1998]</div><div class='add'>+Version 1.00 [March 7, 1998]</div><div class='ctx'>   Changed several typedefs in pngrutil.c</div><div class='ctx'>   Added makefile.wat (Pawel Mrochen), updated makefile.tc3 (Willem van Schaik)</div><div class='del'>-  replaced "while(1)" with "for(;;)"</div><div class='del'>-  added PNGARG() to prototypes in pngtest.c and removed some prototypes</div><div class='del'>-  updated some of the makefiles (Tom Lane)</div><div class='del'>-  changed some typedefs (s_start, etc.) in pngrutil.c</div><div class='del'>-  fixed dimensions of "short_months" array in pngwrite.c</div><div class='add'>+  Replaced "while(1)" with "for(;;)"</div><div class='add'>+  Added PNGARG() to prototypes in pngtest.c and removed some prototypes</div><div class='add'>+  Updated some of the makefiles (Tom Lane)</div><div class='add'>+  Changed some typedefs (s_start, etc.) in pngrutil.c</div><div class='add'>+  Fixed dimensions of "short_months" array in pngwrite.c</div><div class='ctx'>   Replaced ansi2knr.c with the one from jpeg-v6</div><div class='ctx'> </div><div class='del'>-version 1.0.0 [March 8, 1998]</div><div class='add'>+Version 1.0.0 [March 8, 1998]</div><div class='ctx'>   Changed name from 1.00 to 1.0.0 (Adam Costello)</div><div class='ctx'>   Added smakefile.ppc (with SCOPTIONS.ppc) for Amiga PPC (Andreas Kleinert)</div><div class='del'>-version 1.0.0a [March 9, 1998]</div><div class='add'>+</div><div class='add'>+Version 1.0.0a [March 9, 1998]</div><div class='ctx'>   Fixed three bugs in pngrtran.c to make gamma+background handling consistent</div><div class='del'>-  (Greg Roelofs)</div><div class='add'>+    (Greg Roelofs)</div><div class='ctx'>   Changed format of the PNG_LIBPNG_VER integer to xyyzz instead of xyz</div><div class='del'>-  for major, minor, and bugfix releases.  This is 10001. (Adam Costello,</div><div class='del'>-  Tom Lane)</div><div class='add'>+    for major, minor, and bugfix releases.  This is 10001. (Adam Costello,</div><div class='add'>+    Tom Lane)</div><div class='ctx'>   Make months range from 1-12 in png_convert_to_rfc1123</div><div class='del'>-version 1.0.0b [March 13, 1998]</div><div class='add'>+</div><div class='add'>+Version 1.0.0b [March 13, 1998]</div><div class='ctx'>   Quieted compiler complaints about two empty "for" loops in pngrutil.c</div><div class='ctx'>   Minor changes to makefile.s2x</div><div class='ctx'>   Removed #ifdef/#endif around a png_free() in pngread.c</div><div class='ctx'> </div><div class='del'>-version 1.0.1 [March 14, 1998]</div><div class='add'>+Version 1.0.1 [March 14, 1998]</div><div class='ctx'>   Changed makefile.s2x to reduce security risk of using a relative pathname</div><div class='ctx'>   Fixed some typos in the documentation (Greg).</div><div class='ctx'>   Fixed a problem with value of "channels" returned by png_read_update_info()</div><div class='del'>-version 1.0.1a [April 21, 1998]</div><div class='add'>+</div><div class='add'>+Version 1.0.1a [April 21, 1998]</div><div class='ctx'>   Optimized Paeth calculations by replacing abs() function calls with intrinsics</div><div class='ctx'>   plus other loop optimizations. Improves avg decoding speed by about 20%.</div><div class='ctx'>   Commented out i386istic "align" compiler flags in makefile.lnx.</div><div class='hunk'>@@ -327,19 +337,24 @@ version 1.0.1a [April 21, 1998]</div><div class='ctx'>   Moved a misplaced pngrutil code block that truncates tRNS if it has more</div><div class='ctx'>     than num_palette entries -- test was done before num_palette was defined.</div><div class='ctx'>   Fixed a png_convert_to_rfc1123() bug that converts day 31 to 0 (Steve Eddins).</div><div class='del'>-  Changed compiler flags in makefile.wat for better optimization (Pawel Mrochen).</div><div class='del'>-version 1.0.1b [May 2, 1998]</div><div class='add'>+  Changed compiler flags in makefile.wat for better optimization</div><div class='add'>+    (Pawel Mrochen).</div><div class='add'>+</div><div class='add'>+Version 1.0.1b [May 2, 1998]</div><div class='ctx'>   Relocated png_do_gray_to_rgb() within png_do_read_transformations() (Greg).</div><div class='ctx'>   Relocated the png_composite macros from pngrtran.c to png.h (Greg).</div><div class='ctx'>   Added makefile.sco (contributed by Mike Hopkirk).</div><div class='ctx'>   Fixed two bugs (missing definitions of "istop") introduced in libpng-1.0.1a.</div><div class='ctx'>   Fixed a bug in pngrtran.c that would set channels=5 under some circumstances.</div><div class='del'>-  More work on the Paeth-filtering, achieving imperceptible speedup (A Kleinert).</div><div class='del'>-  More work on loop optimization which may help when compiled with C++ compilers.</div><div class='add'>+  More work on the Paeth-filtering, achieving imperceptible speedup</div><div class='add'>+    (A Kleinert).</div><div class='add'>+  More work on loop optimization which may help when compiled with C++</div><div class='add'>+    compilers.</div><div class='ctx'>   Added warnings when people try to use transforms they've defined out.</div><div class='ctx'>   Collapsed 4 "i" and "c" loops into single "i" loops in pngrtran and pngwtran.</div><div class='ctx'>   Revised paragraph about png_set_expand() in libpng.txt and libpng.3 (Greg)</div><div class='del'>-version 1.0.1c [May 11, 1998]</div><div class='add'>+</div><div class='add'>+Version 1.0.1c [May 11, 1998]</div><div class='ctx'>   Fixed a bug in pngrtran.c (introduced in libpng-1.0.1a) where the masks for</div><div class='ctx'>     filler bytes should have been 0xff instead of 0xf.</div><div class='ctx'>   Added max_pixel_depth=32 in pngrutil.c when using FILLER with palette images.</div><div class='hunk'>@@ -351,7 +366,8 @@ version 1.0.1c [May 11, 1998]</div><div class='ctx'>     to remove unwanted capabilities via the compile line</div><div class='ctx'>   Made some corrections to grammar (which, it's) in documentation (Greg).</div><div class='ctx'>   Corrected example.c, use of row_pointers in png_write_image().</div><div class='del'>-version 1.0.1d [May 24, 1998]</div><div class='add'>+</div><div class='add'>+Version 1.0.1d [May 24, 1998]</div><div class='ctx'>   Corrected several statements that used side effects illegally in pngrutil.c</div><div class='ctx'>     and pngtrans.c, that were introduced in version 1.0.1b</div><div class='ctx'>   Revised png_read_rows() to avoid repeated if-testing for NULL (A Kleinert)</div><div class='hunk'>@@ -361,7 +377,8 @@ version 1.0.1d [May 24, 1998]</div><div class='ctx'>     Bob Dellaca, to make a png32bd.dll with Borland C++ 4.5</div><div class='ctx'>   Fixed error in example.c with png_set_text: num_text is 3, not 2 (Guido V.)</div><div class='ctx'>   Changed several loops from count-down to count-up, for consistency.</div><div class='del'>-version 1.0.1e [June 6, 1998]</div><div class='add'>+</div><div class='add'>+Version 1.0.1e [June 6, 1998]</div><div class='ctx'>   Revised libpng.txt and libpng.3 description of png_set_read|write_fn(), and</div><div class='ctx'>     added warnings when people try to set png_read_fn and png_write_fn in</div><div class='ctx'>     the same structure.</div><div class='hunk'>@@ -378,9 +395,10 @@ version 1.0.1e [June 6, 1998]</div><div class='ctx'>     PNGTEST_DEBUG_MEM feature.</div><div class='ctx'>   Added makefile.w32, for Microsoft C++ 4.0 and later (Tim Wegner).</div><div class='ctx'> </div><div class='del'>-version 1.0.2 [June 14, 1998]</div><div class='add'>+Version 1.0.2 [June 14, 1998]</div><div class='ctx'>   Fixed two bugs in makefile.bor .</div><div class='del'>-version 1.0.2a [December 30, 1998]</div><div class='add'>+</div><div class='add'>+Version 1.0.2a [December 30, 1998]</div><div class='ctx'>   Replaced and extended code that was removed from png_set_filler() in 1.0.1a.</div><div class='ctx'>   Fixed a bug in png_do_filler() that made it fail to write filler bytes in</div><div class='ctx'>     the left-most pixel of each row (Kevin Bracey).</div><div class='hunk'>@@ -402,21 +420,24 @@ version 1.0.2a [December 30, 1998]</div><div class='ctx'>   Added png_get_copyright() and png_get_header_version() functions.</div><div class='ctx'>   Revised comments on png_set_progressive_read_fn() in libpng.txt and example.c</div><div class='ctx'>   Added information about debugging in libpng.txt and libpng.3 .</div><div class='del'>-  Changed "ln -sf" to "ln -s -f" in makefile.s2x, makefile.lnx, and makefile.sco.</div><div class='add'>+  Changed "ln -sf" to "ln -s -f" in makefile.s2x, makefile.lnx, and</div><div class='add'>+    makefile.sco.</div><div class='ctx'>   Removed lines after Dynamic Dependencies" in makefile.aco .</div><div class='ctx'>   Revised makefile.dec to make a shared library (Jeremie Petit).</div><div class='ctx'>   Removed trailing blanks from all files.</div><div class='del'>-version 1.0.2a [January 6, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.2a [January 6, 1999]</div><div class='ctx'>   Removed misplaced #endif and #ifdef PNG_NO_EXTERN near the end of png.h</div><div class='ctx'>   Added "if" tests to silence complaints about unused png_ptr in png.h and png.c</div><div class='ctx'>   Changed "check_if_png" function in example.c to return true (nonzero) if PNG.</div><div class='ctx'>   Changed libpng.txt to demonstrate png_sig_cmp() instead of png_check_sig()</div><div class='ctx'>     which is obsolete.</div><div class='ctx'> </div><div class='del'>-version 1.0.3 [January 14, 1999]</div><div class='add'>+Version 1.0.3 [January 14, 1999]</div><div class='ctx'>   Added makefile.hux, for Hewlett Packard HPUX 10.20 and 11.00 (Jim Rice)</div><div class='ctx'>   Added a statement of Y2K compliance in png.h, libpng.3, and Y2KINFO.</div><div class='del'>-version 1.0.3a [August 12, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.3a [August 12, 1999]</div><div class='ctx'>   Added check for PNG_READ_INTERLACE_SUPPORTED in pngread.c; issue a warning</div><div class='ctx'>      if an attempt is made to read an interlaced image when it's not supported.</div><div class='ctx'>   Added check if png_ptr-&gt;trans is defined before freeing it in pngread.c</div><div class='hunk'>@@ -443,13 +464,15 @@ version 1.0.3a [August 12, 1999]</div><div class='ctx'>   Correct gamma with srgb is 45455 instead of 45000 in pngrutil.c, to be</div><div class='ctx'>     consistent with PNG-1.2, and allow variance of 500 before complaining.</div><div class='ctx'>   Added assembler code contributed by Intel in file pngvcrd.c and modified</div><div class='del'>-    makefile.w32 to use it (Nirav Chhatrapati, INTEL Corporation, Gilles Vollant)</div><div class='add'>+    makefile.w32 to use it (Nirav Chhatrapati, INTEL Corporation,</div><div class='add'>+    Gilles Vollant)</div><div class='ctx'>   Changed "ln -s -f" to "ln -f -s" in the makefiles to make Solaris happy.</div><div class='ctx'>   Added some aliases for png_set_expand() in pngrtran.c, namely</div><div class='ctx'>     png_set_expand_PLTE(), png_set_expand_depth(), and png_set_expand_tRNS()</div><div class='ctx'>     (Greg Roelofs, in "PNG: The Definitive Guide").</div><div class='ctx'>   Added makefile.beo for BEOS on X86, contributed by Sander Stok.</div><div class='del'>-version 1.0.3b [August 26, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.3b [August 26, 1999]</div><div class='ctx'>   Replaced 2147483647L several places with PNG_MAX_UINT macro, defined in png.h</div><div class='ctx'>   Changed leading blanks to tabs in all makefiles.</div><div class='ctx'>   Define PNG_USE_PNGVCRD in makefile.w32, to get MMX assembler code.</div><div class='hunk'>@@ -461,12 +484,13 @@ version 1.0.3b [August 26, 1999]</div><div class='ctx'>     negative shift distance, whose results are undefined in the C language.</div><div class='ctx'>   Added a check in pngset.c to prevent writing multiple tIME chunks.</div><div class='ctx'>   Added a check in pngwrite.c to detect invalid small window_bits sizes.</div><div class='del'>-version 1.0.3d [September 4, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.3d [September 4, 1999]</div><div class='ctx'>   Fixed type casting of igamma in pngrutil.c</div><div class='ctx'>   Added new png_expand functions to scripts/pngdef.pas and pngos2.def</div><div class='ctx'>   Added a demo read_user_transform_fn that examines the row filters in pngtest.c</div><div class='ctx'> </div><div class='del'>-version 1.0.4 [September 24, 1999]</div><div class='add'>+Version 1.0.4 [September 24, 1999]</div><div class='ctx'>   Define PNG_ALWAYS_EXTERN in pngconf.h if __STDC__ is defined</div><div class='ctx'>   Delete #define PNG_INTERNAL and include "png.h" from pngasmrd.h</div><div class='ctx'>   Made several minor corrections to pngtest.c</div><div class='hunk'>@@ -480,24 +504,30 @@ version 1.0.4 [September 24, 1999]</div><div class='ctx'>     assembler code) and makefile.vcwin32 (doesn't).</div><div class='ctx'>   Added a CPU timing report to pngtest.c (enabled by defining PNGTEST_TIMING)</div><div class='ctx'>   Added a copy of pngnow.png to the distribution.</div><div class='del'>-version 1.0.4a [September 25, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.4a [September 25, 1999]</div><div class='ctx'>   Increase max_pixel_depth in pngrutil.c if a user transform needs it.</div><div class='ctx'>   Changed several division operations to right-shifts in pngvcrd.c</div><div class='del'>-version 1.0.4b [September 30, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.4b [September 30, 1999]</div><div class='ctx'>   Added parentheses in line 3732 of pngvcrd.c</div><div class='ctx'>   Added a comment in makefile.linux warning about buggy -O3 in pgcc 2.95.1</div><div class='del'>-version 1.0.4c [October 1, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.4c [October 1, 1999]</div><div class='ctx'>   Added a "png_check_version" function in png.c and pngtest.c that will generate</div><div class='ctx'>     a helpful compiler error if an old png.h is found in the search path.</div><div class='ctx'>   Changed type of png_user_transform_depth|channels from int to png_byte.</div><div class='del'>-version 1.0.4d [October 6, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.4d [October 6, 1999]</div><div class='ctx'>   Changed 0.45 to 0.45455 in png_set_sRGB()</div><div class='ctx'>   Removed unused PLTE entries from pngnow.png</div><div class='ctx'>   Re-enabled some parts of pngvcrd.c (png_combine_row) that work properly.</div><div class='del'>-version 1.0.4e [October 10, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.4e [October 10, 1999]</div><div class='ctx'>   Fixed sign error in pngvcrd.c (Greg Roelofs)</div><div class='ctx'>   Replaced some instances of memcpy with simple assignments in pngvcrd (GR-P)</div><div class='del'>-version 1.0.4f [October 15, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.4f [October 15, 1999]</div><div class='ctx'>   Surrounded example.c code with #if 0 .. #endif to prevent people from</div><div class='ctx'>     inadvertently trying to compile it.</div><div class='ctx'>   Changed png_get_header_version() from a function to a macro in png.h</div><div class='hunk'>@@ -505,9 +535,10 @@ version 1.0.4f [October 15, 1999]</div><div class='ctx'>   Removed some pointless "ptr = NULL" in pngmem.c</div><div class='ctx'>   Added a "contrib" directory containing the source code from Greg's book.</div><div class='ctx'> </div><div class='del'>-version 1.0.5 [October 15, 1999]</div><div class='add'>+Version 1.0.5 [October 15, 1999]</div><div class='ctx'>   Minor editing of the INSTALL and README files.</div><div class='del'>-version 1.0.5a [October 23, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.5a [October 23, 1999]</div><div class='ctx'>   Added contrib/pngsuite and contrib/pngminus (Willem van Schaik)</div><div class='ctx'>   Fixed a typo in the png_set_sRGB() function call in example.c (Jan Nijtmans)</div><div class='ctx'>   Further optimization and bugfix of pngvcrd.c</div><div class='hunk'>@@ -515,14 +546,16 @@ version 1.0.5a [October 23, 1999]</div><div class='ctx'>     text_ptr structure.  Instead, it makes its own copy.</div><div class='ctx'>   Created separate write_end_info_struct in pngtest.c for a more severe test.</div><div class='ctx'>   Added code in pngwrite.c to free info_ptr-&gt;text[i].key to stop a memory leak.</div><div class='del'>-version 1.0.5b [November 23, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.5b [November 23, 1999]</div><div class='ctx'>   Moved PNG_FLAG_HAVE_CHUNK_HEADER, PNG_FLAG_BACKGROUND_IS_GRAY and</div><div class='ctx'>     PNG_FLAG_WROTE_tIME from flags to mode.</div><div class='ctx'>   Added png_write_info_before_PLTE() function.</div><div class='ctx'>   Fixed some typecasting in contrib/gregbook/*.c</div><div class='ctx'>   Updated scripts/makevms.com and added makevms.com to contrib/gregbook</div><div class='ctx'>     and contrib/pngminus (Martin Zinser)</div><div class='del'>-version 1.0.5c [November 26, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.5c [November 26, 1999]</div><div class='ctx'>   Moved png_get_header_version from png.h to png.c, to accommodate ansi2knr.</div><div class='ctx'>   Removed all global arrays (according to PNG_NO_GLOBAL_ARRAYS macro), to</div><div class='ctx'>     accommodate making DLL's: Moved usr_png_ver from global variable to function</div><div class='hunk'>@@ -535,7 +568,8 @@ version 1.0.5c [November 26, 1999]</div><div class='ctx'>   Removed some extraneous "-I" from contrib/pngminus/makefile.std</div><div class='ctx'>   Changed the PNG_sRGB_INTENT macros in png.h to be consistent with PNG-1.2.</div><div class='ctx'>   Change PNG_SRGB_INTENT to PNG_sRGB_INTENT in libpng.txt and libpng.3</div><div class='del'>-version 1.0.5d [November 29, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.5d [November 29, 1999]</div><div class='ctx'>   Add type cast (png_const_charp) two places in png.c</div><div class='ctx'>   Eliminated pngtypes.h; use macros instead to declare PNG_CHNK arrays.</div><div class='ctx'>   Renamed "PNG_GLOBAL_ARRAYS" to "PNG_USE_GLOBAL_ARRAYS" and made available</div><div class='hunk'>@@ -543,7 +577,8 @@ version 1.0.5d [November 29, 1999]</div><div class='ctx'>   comment out (with #ifdef) all the new declarations when</div><div class='ctx'>     PNG_USE_GLOBAL_ARRAYS is defined.</div><div class='ctx'>   Added PNG_EXPORT_VAR macro to accommodate making DLL's.</div><div class='del'>-version 1.0.5e [November 30, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.5e [November 30, 1999]</div><div class='ctx'>   Added iCCP, iTXt, and sPLT support; added "lang" member to the png_text</div><div class='ctx'>     structure; refactored the inflate/deflate support to make adding new chunks</div><div class='ctx'>     with trailing compressed parts easier in the future, and added new functions</div><div class='hunk'>@@ -564,18 +599,21 @@ version 1.0.5e [November 30, 1999]</div><div class='ctx'>     PNG_cHNK_SUPPORTED and combined the three types of PNG_text_SUPPORTED</div><div class='ctx'>     macros, leaving the separate macros also available.</div><div class='ctx'>   Removed comments on #endifs at the end of many short, non-nested #if-blocks.</div><div class='del'>-version 1.0.5f [December 6, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.5f [December 6, 1999]</div><div class='ctx'>   Changed makefile.solaris to issue a warning about potential problems when</div><div class='ctx'>     the ucb "ld" is in the path ahead of the ccs "ld".</div><div class='ctx'>   Removed "- [date]" from the "synopsis" line in libpng.3 and libpngpf.3.</div><div class='ctx'>   Added sCAL chunk support (Eric S. Raymond).</div><div class='del'>-version 1.0.5g [December 7, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.5g [December 7, 1999]</div><div class='ctx'>   Fixed "png_free_spallettes" typo in png.h</div><div class='ctx'>   Added code to handle new chunks in pngpread.c</div><div class='ctx'>   Moved PNG_CHNK string macro definitions outside of PNG_NO_EXTERN block</div><div class='ctx'>   Added "translated_key" to png_text structure and png_write_iTXt().</div><div class='ctx'>   Added code in pngwrite.c to work around a newly discovered zlib bug.</div><div class='del'>-version 1.0.5h [December 10, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.5h [December 10, 1999]</div><div class='ctx'>   NOTE: regarding the note for version 1.0.5e, the following must also</div><div class='ctx'>     be included in your code:</div><div class='ctx'>         png_text[i].translated_key = NULL;</div><div class='hunk'>@@ -583,7 +621,8 @@ version 1.0.5h [December 10, 1999]</div><div class='ctx'>   Option to eliminate all floating point support was added.  Some new</div><div class='ctx'>     fixed-point functions such as png_set_gAMA_fixed() were added.</div><div class='ctx'>   Expanded tabs and removed trailing blanks in source files.</div><div class='del'>-version 1.0.5i [December 13, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.5i [December 13, 1999]</div><div class='ctx'>   Added some type casts to silence compiler warnings.</div><div class='ctx'>   Renamed "png_free_spalette" to "png_free_spalettes" for consistency.</div><div class='ctx'>   Removed leading blanks from a #define in pngvcrd.c</div><div class='hunk'>@@ -595,7 +634,8 @@ version 1.0.5i [December 13, 1999]</div><div class='ctx'>   Added png_free_hIST() function.</div><div class='ctx'>   Various patches to fix bugs in the sCAL and integer cHRM processing,</div><div class='ctx'>     and to add some convenience macros for use with sCAL.</div><div class='del'>-version 1.0.5j [December 21, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.5j [December 21, 1999]</div><div class='ctx'>   Changed "unit" parameter of png_write_sCAL from png_byte to int, to work</div><div class='ctx'>     around buggy compilers.</div><div class='ctx'>   Added new type "png_fixed_point" for integers that hold float*100000 values</div><div class='hunk'>@@ -611,7 +651,8 @@ version 1.0.5j [December 21, 1999]</div><div class='ctx'>     and to write the iTXt chunk after IDAT if it appears in the end_ptr.</div><div class='ctx'>   Added pnggccrd.c, version of pngvcrd.c Intel assembler for gcc (Greg Roelofs)</div><div class='ctx'>   Reversed the order of trying to write floating-point and fixed-point gAMA.</div><div class='del'>-version 1.0.5k [December 27, 1999]</div><div class='add'>+</div><div class='add'>+Version 1.0.5k [December 27, 1999]</div><div class='ctx'>   Added many parentheses, e.g., "if (a &amp;&amp; b &amp; c)" becomes "if (a &amp;&amp; (b &amp; c))"</div><div class='ctx'>   Added png_handle_as_unknown() function (Glenn)</div><div class='ctx'>   Added png_free_chunk_list() function and chunk_list and num_chunk_list members</div><div class='hunk'>@@ -622,33 +663,41 @@ version 1.0.5k [December 27, 1999]</div><div class='ctx'>   Added png_free_tRNS(); png_set_tRNS() now malloc's its own trans array (ESR).</div><div class='ctx'>   Define png_get_int_32 when oFFs chunk is supported as well as when pCAL is.</div><div class='ctx'>   Changed type of proflen from png_int_32 to png_uint_32 in png_get_iCCP().</div><div class='del'>-version 1.0.5l [January 1, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.5l [January 1, 2000]</div><div class='ctx'>   Added functions png_set_read_user_chunk_fn() and png_get_user_chunk_ptr()</div><div class='ctx'>     for setting a callback function to handle unknown chunks and for</div><div class='ctx'>     retrieving the associated user pointer (Glenn).</div><div class='del'>-version 1.0.5m [January 7, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.5m [January 7, 2000]</div><div class='ctx'>   Added high-level functions png_read_png(), png_write_png(), png_free_pixels().</div><div class='del'>-version 1.0.5n [January 9, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.5n [January 9, 2000]</div><div class='ctx'>   Added png_free_PLTE() function, and modified png_set_PLTE() to malloc its</div><div class='ctx'>     own memory for info_ptr-&gt;palette.  This makes it safe for the calling</div><div class='ctx'>     application to free its copy of the palette any time after it calls</div><div class='ctx'>     png_set_PLTE().</div><div class='del'>-version 1.0.5o [January 20, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.5o [January 20, 2000]</div><div class='ctx'>   Cosmetic changes only (removed some trailing blanks and TABs)</div><div class='del'>-version 1.0.5p [January 31, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.5p [January 31, 2000]</div><div class='ctx'>   Renamed pngdll.mak to makefile.bd32</div><div class='ctx'>   Cosmetic changes in pngtest.c</div><div class='del'>-version 1.0.5q [February 5, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.5q [February 5, 2000]</div><div class='ctx'>   Relocated the makefile.solaris warning about PATH problems.</div><div class='ctx'>   Fixed pngvcrd.c bug by pushing/popping registers in mmxsupport (Bruce Oberg)</div><div class='ctx'>   Revised makefile.gcmmx</div><div class='ctx'>   Added PNG_SETJMP_SUPPORTED, PNG_SETJMP_NOT_SUPPORTED, and PNG_ABORT() macros</div><div class='del'>-version 1.0.5r [February 7, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.5r [February 7, 2000]</div><div class='ctx'>   Removed superfluous prototype for png_get_itxt from png.h</div><div class='ctx'>   Fixed a bug in pngrtran.c that improperly expanded the background color.</div><div class='ctx'>   Return *num_text=0 from png_get_text() when appropriate, and fix documentation</div><div class='ctx'>     of png_get_text() in libpng.txt/libpng.3.</div><div class='del'>-version 1.0.5s [February 18, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.5s [February 18, 2000]</div><div class='ctx'>   Added "png_jmp_env()" macro to pngconf.h, to help people migrate to the</div><div class='ctx'>     new error handler that's planned for the next libpng release, and changed</div><div class='ctx'>     example.c, pngtest.c, and contrib programs to use this macro.</div><div class='hunk'>@@ -667,7 +716,8 @@ version 1.0.5s [February 18, 2000]</div><div class='ctx'>   Added png_set_rows() and png_get_rows(), for use with png_read|write_png().</div><div class='ctx'>   Modified png_read_png() to allocate info_ptr-&gt;row_pointers only if it</div><div class='ctx'>     hasn't already been allocated.</div><div class='del'>-version 1.0.5t [March 4, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.5t [March 4, 2000]</div><div class='ctx'>   Changed png_jmp_env() migration aiding macro to png_jmpbuf().</div><div class='ctx'>   Fixed "interlace" typo (should be "interlaced") in contrib/gregbook/read2-x.c</div><div class='ctx'>   Fixed bug with use of PNG_BEFORE_IHDR bit in png_ptr-&gt;mode, introduced when</div><div class='hunk'>@@ -676,13 +726,15 @@ version 1.0.5t [March 4, 2000]</div><div class='ctx'>     a 24-bit visual if one is available, and to allow abbreviated options.</div><div class='ctx'>   Files in contrib/pngminus were revised to use the png_jmpbuf() macro.</div><div class='ctx'>   Removed spaces in makefile.linux and makefile.gcmmx, introduced in 1.0.5s</div><div class='del'>-version 1.0.5u [March 5, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.5u [March 5, 2000]</div><div class='ctx'>   Simplified the code that detects old png.h in png.c and pngtest.c</div><div class='ctx'>   Renamed png_spalette (_p, _pp) to png_sPLT_t (_tp, _tpp)</div><div class='ctx'>   Increased precision of rgb_to_gray calculations from 8 to 15 bits and</div><div class='ctx'>     added png_set_rgb_to_gray_fixed() function.</div><div class='ctx'>   Added makefile.bc32 (32-bit Borland C++, C mode)</div><div class='del'>-version 1.0.5v [March 11, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.5v [March 11, 2000]</div><div class='ctx'>   Added some parentheses to the png_jmpbuf macro definition.</div><div class='ctx'>   Updated references to the zlib home page, which has moved to freesoftware.com.</div><div class='ctx'>   Corrected bugs in documentation regarding png_read_row() and png_write_row().</div><div class='hunk'>@@ -690,10 +742,11 @@ version 1.0.5v [March 11, 2000]</div><div class='ctx'>   Renamed makefile.borland,turboc3 back to makefile.bor,tc3 as in version 1.0.3,</div><div class='ctx'>     revised borland makefiles; added makefile.ibmvac3 and makefile.gcc (Cosmin)</div><div class='ctx'> </div><div class='del'>-version 1.0.6 [March 20, 2000]</div><div class='add'>+Version 1.0.6 [March 20, 2000]</div><div class='ctx'>   Minor revisions of makefile.bor, libpng.txt, and gregbook/rpng2-win.c</div><div class='ctx'>   Added makefile.sggcc (SGI IRIX with gcc)</div><div class='del'>-version 1.0.6d [April 7, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.6d [April 7, 2000]</div><div class='ctx'>   Changed sprintf() to strcpy() in png_write_sCAL_s() to work without STDIO</div><div class='ctx'>   Added data_length parameter to png_decompress_chunk() function</div><div class='ctx'>   Revised documentation to remove reference to abandoned png_free_chnk functions</div><div class='hunk'>@@ -702,7 +755,8 @@ version 1.0.6d [April 7, 2000]</div><div class='ctx'>   Renamed makefile.ibmvac3 to makefile.ibmc, added libpng.icc IBM project file</div><div class='ctx'>   Added a check for info_ptr-&gt;free_me&amp;PNG_FREE_TEXT when freeing text in png.c</div><div class='ctx'>   Simplify png_sig_bytes() function to remove use of non-ISO-C strdup().</div><div class='del'>-version 1.0.6e [April 9, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.6e [April 9, 2000]</div><div class='ctx'>   Added png_data_freer() function.</div><div class='ctx'>   In the code that checks for over-length tRNS chunks, added check of</div><div class='ctx'>     info_ptr-&gt;num_trans as well as png_ptr-&gt;num_trans (Matthias Benckmann)</div><div class='hunk'>@@ -713,25 +767,29 @@ version 1.0.6e [April 9, 2000]</div><div class='ctx'>     is defined.</div><div class='ctx'>   Changed several instances of PNG_NO_CONSOLE_ID to PNG_NO_STDIO in pngrutil.c</div><div class='ctx'>     and mentioned the purposes of the two macros in libpng.txt/libpng.3.</div><div class='del'>-version 1.0.6f [April 14, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.6f [April 14, 2000]</div><div class='ctx'>   Revised png_set_iCCP() and png_set_rows() to avoid prematurely freeing data.</div><div class='ctx'>   Add checks in png_set_text() for NULL members of the input text structure.</div><div class='ctx'>   Revised libpng.txt/libpng.3.</div><div class='del'>-  Removed superfluous prototype for png_set_itxt from png.h</div><div class='add'>+  Removed superfluous prototype for png_set_iTXt from png.h</div><div class='ctx'>   Removed "else" from pngread.c, after png_error(), and changed "0" to "length".</div><div class='ctx'>   Changed several png_errors about malformed ancillary chunks to png_warnings.</div><div class='del'>-version 1.0.6g [April 24, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.6g [April 24, 2000]</div><div class='ctx'>   Added png_pass-* arrays to pnggccrd.c when PNG_USE_LOCAL_ARRAYS is defined.</div><div class='ctx'>   Relocated paragraph about png_set_background() in libpng.3/libpng.txt</div><div class='ctx'>     and other revisions (Matthias Benckmann)</div><div class='ctx'>   Relocated info_ptr-&gt;free_me, png_ptr-&gt;free_me, and other info_ptr and</div><div class='ctx'>     png_ptr members to restore binary compatibility with libpng-1.0.5</div><div class='ctx'>     (breaks compatibility with libpng-1.0.6).</div><div class='del'>-version 1.0.6h [April 24, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.6h [April 24, 2000]</div><div class='ctx'>   Changed shared library so-number pattern from 2.x.y.z to xy.z (this builds</div><div class='ctx'>     libpng.so.10 &amp; libpng.so.10.6h instead of libpng.so.2 &amp; libpng.so.2.1.0.6h)</div><div class='ctx'>     This is a temporary change for test purposes.</div><div class='del'>-version 1.0.6i [May 2, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.6i [May 2, 2000]</div><div class='ctx'>   Rearranged some members at the end of png_info and png_struct, to put</div><div class='ctx'>     unknown_chunks_num and free_me within the original size of the png_structs</div><div class='ctx'>     and free_me, png_read_user_fn, and png_free_fn within the original png_info,</div><div class='hunk'>@@ -756,11 +814,13 @@ version 1.0.6i [May 2, 2000]</div><div class='ctx'>     generate a libpng error if the modes aren't set and PNG_LEGACY_SUPPORTED</div><div class='ctx'>     was not defined.</div><div class='ctx'>   Added makefile.intel and updated makefile.watcom (Pawel Mrochen)</div><div class='del'>-version 1.0.6j [May 3, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.6j [May 3, 2000]</div><div class='ctx'>   Overloaded png_read_init() and png_write_init() with macros that convert</div><div class='ctx'>     calls to png_read_init_2() or png_write_init_2() that check the version</div><div class='ctx'>     and structure sizes.</div><div class='del'>-version 1.0.7beta11 [May 7, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.7beta11 [May 7, 2000]</div><div class='ctx'>   Removed the new PNG_CREATED_READ_STRUCT and PNG_CREATED_WRITE_STRUCT modes</div><div class='ctx'>     which are no longer used.</div><div class='ctx'>   Eliminated the three new members of png_text when PNG_LEGACY_SUPPORTED is</div><div class='hunk'>@@ -771,7 +831,8 @@ version 1.0.7beta11 [May 7, 2000]</div><div class='ctx'>   Added PNGAPI macro, and added it to the definitions of all exported functions.</div><div class='ctx'>   Relocated version macro definitions ahead of the includes of zlib.h and</div><div class='ctx'>     pngconf.h in png.h.</div><div class='del'>-version 1.0.7beta12 [May 12, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.7beta12 [May 12, 2000]</div><div class='ctx'>   Revised pngset.c to avoid a problem with expanding the png_debug macro.</div><div class='ctx'>   Deleted some extraneous defines from pngconf.h</div><div class='ctx'>   Made PNG_NO_CONSOLE_IO the default condition when PNG_BUILD_DLL is defined.</div><div class='hunk'>@@ -779,7 +840,8 @@ version 1.0.7beta12 [May 12, 2000]</div><div class='ctx'>   Added png_access_version_number() function.</div><div class='ctx'>   Check for mask&amp;PNG_FREE_CHNK (for TEXT, SCAL, PCAL) in png_free_data().</div><div class='ctx'>   Expanded libpng.3/libpng.txt information about png_data_freer().</div><div class='del'>-version 1.0.7beta14 [May 17, 2000] (beta13 was not published)</div><div class='add'>+</div><div class='add'>+Version 1.0.7beta14 [May 17, 2000] (beta13 was not published)</div><div class='ctx'>   Changed pnggccrd.c and pngvcrd.c to handle bad adaptive filter types as</div><div class='ctx'>     warnings instead of errors, as pngrutil.c does.</div><div class='ctx'>   Set the PNG_INFO_IDAT valid flag in png_set_rows() so png_write_png()</div><div class='hunk'>@@ -791,7 +853,8 @@ version 1.0.7beta14 [May 17, 2000] (beta13 was not published)</div><div class='ctx'>   Removed info_ptr-&gt;valid tests from png_free_data(), as in version 1.0.5.</div><div class='ctx'>   Added png_set_invalid() function.</div><div class='ctx'>   Fixed incorrect illustrations of png_destroy_write_struct() in example.c.</div><div class='del'>-version 1.0.7beta15 [May 30, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.7beta15 [May 30, 2000]</div><div class='ctx'>   Revised the deliberately erroneous Linux setjmp code in pngconf.h to produce</div><div class='ctx'>     fewer error messages.</div><div class='ctx'>   Rearranged checks for Z_OK to check the most likely path first in pngpread.c</div><div class='hunk'>@@ -803,9 +866,11 @@ version 1.0.7beta15 [May 30, 2000]</div><div class='ctx'>   Fixed some bugs in the unused PNG_INCH_CONVERSIONS functions in pngget.c</div><div class='ctx'>   Set each pointer to NULL after freeing it in png_free_data().</div><div class='ctx'>   Worked around a problem in pngconf.h; AIX's strings.h defines an "index"</div><div class='del'>-    macro that conflicts with libpng's png_color_16.index. (Dimitri Papadapoulos)</div><div class='add'>+    macro that conflicts with libpng's png_color_16.index. (Dimitri</div><div class='add'>+    Papadapoulos)</div><div class='ctx'>   Added "msvc" directory with MSVC++ project files (Simon-Pierre Cadieux).</div><div class='del'>-version 1.0.7beta16 [June 4, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.7beta16 [June 4, 2000]</div><div class='ctx'>   Revised the workaround of AIX string.h "index" bug.</div><div class='ctx'>   Added a check for overlength PLTE chunk in pngrutil.c.</div><div class='ctx'>   Added PNG_NO_POINTER_INDEXING macro to use array-indexing instead of pointer</div><div class='hunk'>@@ -815,23 +880,27 @@ version 1.0.7beta16 [June 4, 2000]</div><div class='ctx'>   Added PNG_USE_DLL macro.</div><div class='ctx'>   Revised the copyright/disclaimer/license notice.</div><div class='ctx'>   Added contrib/msvctest directory</div><div class='del'>-version 1.0.7rc1 [June 9, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.7rc1 [June 9, 2000]</div><div class='ctx'>   Corrected the definition of PNG_TRANSFORM_INVERT_ALPHA  (0x0400 not 0x0200)</div><div class='ctx'>   Added contrib/visupng directory (Willem van Schaik)</div><div class='del'>-version 1.0.7beta18 [June 23, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.7beta18 [June 23, 2000]</div><div class='ctx'>   Revised PNGAPI definition, and pngvcrd.c to work with __GCC__</div><div class='ctx'>     and do not redefine PNGAPI if it is passed in via a compiler directive.</div><div class='ctx'>   Revised visupng/PngFile.c to remove returns from within the Try block.</div><div class='ctx'>   Removed leading underscores from "_PNG_H" and "_PNG_SAVE_BSD_SOURCE" macros.</div><div class='ctx'>   Updated contrib/visupng/cexcept.h to version 1.0.0.</div><div class='ctx'>   Fixed bugs in pngwrite.c and pngwutil.c that prevented writing iCCP chunks.</div><div class='del'>-version 1.0.7rc2 [June 28, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.7rc2 [June 28, 2000]</div><div class='ctx'>   Updated license to include disclaimers required by UCITA.</div><div class='ctx'>   Fixed "DJBPP" typo in pnggccrd.c introduced in beta18.</div><div class='ctx'> </div><div class='del'>-version 1.0.7 [July 1, 2000]</div><div class='add'>+Version 1.0.7 [July 1, 2000]</div><div class='ctx'>   Revised the definition of "trans_values" in libpng.3/libpng.txt</div><div class='del'>-version 1.0.8beta1 [July 8, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.8beta1 [July 8, 2000]</div><div class='ctx'>   Added png_free(png_ptr, key) two places in pngpread.c to stop memory leaks.</div><div class='ctx'>   Changed PNG_NO_STDIO to PNG_NO_CONSOLE_IO, several places in pngrutil.c and</div><div class='ctx'>      pngwutil.c.</div><div class='hunk'>@@ -839,25 +908,30 @@ version 1.0.8beta1 [July 8, 2000]</div><div class='ctx'>   Removed unused "#include &lt;assert.h&gt;" from png.c</div><div class='ctx'>   Added WindowsCE support.</div><div class='ctx'>   Revised pnggccrd.c to work with gcc-2.95.2 and in the Cygwin environment.</div><div class='del'>-version 1.0.8beta2 [July 10, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.8beta2 [July 10, 2000]</div><div class='ctx'>   Added project files to the wince directory and made further revisions</div><div class='ctx'>      of pngtest.c, pngrio.c, and pngwio.c in support of WindowsCE.</div><div class='del'>-version 1.0.8beta3 [July 11, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.8beta3 [July 11, 2000]</div><div class='ctx'>   Only set the PNG_FLAG_FREE_TRNS or PNG_FREE_TRNS flag in png_handle_tRNS()</div><div class='ctx'>      for indexed-color input files to avoid potential double-freeing trans array</div><div class='ctx'>      under some unusual conditions; problem was introduced in version 1.0.6f.</div><div class='ctx'>   Further revisions to pngtest.c and files in the wince subdirectory.</div><div class='del'>-version 1.0.8beta4 [July 14, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.8beta4 [July 14, 2000]</div><div class='ctx'>   Added the files pngbar.png and pngbar.jpg to the distribution.</div><div class='ctx'>   Added makefile.cygwin, and cygwin support in pngconf.h</div><div class='ctx'>   Added PNG_NO_ZALLOC_ZERO macro (makes png_zalloc skip zeroing memory)</div><div class='del'>-version 1.0.8rc1 [July 16, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.8rc1 [July 16, 2000]</div><div class='ctx'>   Revised png_debug() macros and statements to eliminate compiler warnings.</div><div class='ctx'> </div><div class='del'>-version 1.0.8 [July 24, 2000]</div><div class='add'>+Version 1.0.8 [July 24, 2000]</div><div class='ctx'>   Added png_flush() in pngwrite.c, after png_write_IEND().</div><div class='ctx'>   Updated makefile.hpux to build a shared library.</div><div class='del'>-version 1.0.9beta1 [November 10, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.9beta1 [November 10, 2000]</div><div class='ctx'>   Fixed typo in scripts/makefile.hpux</div><div class='ctx'>   Updated makevms.com in scripts and contrib/* and contrib/* (Martin Zinser)</div><div class='ctx'>   Fixed seqence-point bug in contrib/pngminus/png2pnm (Martin Zinser)</div><div class='hunk'>@@ -876,59 +950,72 @@ version 1.0.9beta1 [November 10, 2000]</div><div class='ctx'>   Revised makefile.cygwin</div><div class='ctx'>   Fixed bugs in iCCP support in pngrutil.c and pngwutil.c.</div><div class='ctx'>   Replaced png_set_empty_plte_permitted() with png_permit_mng_features().</div><div class='del'>-version 1.0.9beta2 [November 19, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.9beta2 [November 19, 2000]</div><div class='ctx'>   Renamed the "dll" subdirectory "projects".</div><div class='ctx'>   Added borland project files to "projects" subdirectory.</div><div class='ctx'>   Set VS_FF_PRERELEASE and VS_FF_PATCHED flags in msvc/png.rc when appropriate.</div><div class='ctx'>   Add error message in png_set_compression_buffer_size() when malloc fails.</div><div class='del'>-version 1.0.9beta3 [November 23, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.9beta3 [November 23, 2000]</div><div class='ctx'>   Revised PNG_LIBPNG_BUILD_TYPE macro in png.h, used in the msvc project.</div><div class='ctx'>   Removed the png_flush() in pngwrite.c that crashes some applications</div><div class='ctx'>     that don't set png_output_flush_fn.</div><div class='ctx'>   Added makefile.macosx and makefile.aix to scripts directory.</div><div class='del'>-version 1.0.9beta4 [December 1, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.9beta4 [December 1, 2000]</div><div class='ctx'>   Change png_chunk_warning to png_warning in png_check_keyword().</div><div class='ctx'>   Increased the first part of msg buffer from 16 to 18 in png_chunk_error().</div><div class='del'>-version 1.0.9beta5 [December 15, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.9beta5 [December 15, 2000]</div><div class='ctx'>   Added support for filter method 64 (for PNG datastreams embedded in MNG).</div><div class='del'>-version 1.0.9beta6 [December 18, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.9beta6 [December 18, 2000]</div><div class='ctx'>   Revised png_set_filter() to accept filter method 64 when appropriate.</div><div class='ctx'>   Added new PNG_HAVE_PNG_SIGNATURE bit to png_ptr-&gt;mode and use it to</div><div class='ctx'>     help prevent applications from using MNG features in PNG datastreams.</div><div class='ctx'>   Added png_permit_mng_features() function.</div><div class='ctx'>   Revised libpng.3/libpng.txt.  Changed "filter type" to "filter method".</div><div class='del'>-version 1.0.9rc1 [December 23, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.9rc1 [December 23, 2000]</div><div class='ctx'>   Revised test for PNG_HAVE_PNG_SIGNATURE in pngrutil.c</div><div class='ctx'>   Fixed error handling of unknown compression type in png_decompress_chunk().</div><div class='ctx'>   In pngconf.h, define __cdecl when _MSC_VER is defined.</div><div class='del'>-version 1.0.9beta7 [December 28, 2000]</div><div class='add'>+</div><div class='add'>+Version 1.0.9beta7 [December 28, 2000]</div><div class='ctx'>   Changed PNG_TEXT_COMPRESSION_zTXt to PNG_COMPRESSION_TYPE_BASE several places.</div><div class='ctx'>   Revised memory management in png_set_hIST and png_handle_hIST in a backward</div><div class='ctx'>     compatible manner.  PLTE and tRNS were revised similarly.</div><div class='ctx'>   Revised the iCCP chunk reader to ignore trailing garbage.</div><div class='del'>-version 1.0.9beta8 [January 12, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.0.9beta8 [January 12, 2001]</div><div class='ctx'>   Moved pngasmrd.h into pngconf.h.</div><div class='ctx'>   Improved handling of out-of-spec garbage iCCP chunks generated by PhotoShop.</div><div class='del'>-version 1.0.9beta9 [January 15, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.0.9beta9 [January 15, 2001]</div><div class='ctx'>   Added png_set_invalid, png_permit_mng_features, and png_mmx_supported to</div><div class='ctx'>     wince and msvc project module definition files.</div><div class='ctx'>   Minor revision of makefile.cygwin.</div><div class='ctx'>   Fixed bug with progressive reading of narrow interlaced images in pngpread.c</div><div class='del'>-version 1.0.9beta10 [January 16, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.0.9beta10 [January 16, 2001]</div><div class='ctx'>   Do not typedef png_FILE_p in pngconf.h when PNG_NO_STDIO is defined.</div><div class='ctx'>   Fixed "png_mmx_supported" typo in project definition files.</div><div class='del'>-version 1.0.9beta11 [January 19, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.0.9beta11 [January 19, 2001]</div><div class='ctx'>   Updated makefile.sgi to make shared library.</div><div class='ctx'>   Removed png_mmx_support() function and disabled PNG_MNG_FEATURES_SUPPORTED</div><div class='ctx'>     by default, for the benefit of DLL forward compatibility.  These will</div><div class='ctx'>     be re-enabled in version 1.2.0.</div><div class='del'>-version 1.0.9rc2 [January 22, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.0.9rc2 [January 22, 2001]</div><div class='ctx'>   Revised cygwin support.</div><div class='ctx'> </div><div class='del'>-version 1.0.9 [January 31, 2001]</div><div class='add'>+Version 1.0.9 [January 31, 2001]</div><div class='ctx'>   Added check of cygwin's ALL_STATIC in pngconf.h</div><div class='ctx'>   Added "-nommx" parameter to contrib/gregbook/rpng2-win and rpng2-x demos.</div><div class='del'>-version 1.0.10beta1 [March 14, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.0.10beta1 [March 14, 2001]</div><div class='ctx'>   Revised makefile.dec, makefile.sgi, and makefile.sggcc; added makefile.hpgcc.</div><div class='ctx'>   Reformatted libpng.3 to eliminate bad line breaks.</div><div class='ctx'>   Added checks for _mmx_supported in the read_filter_row function of pnggccrd.c</div><div class='hunk'>@@ -941,33 +1028,39 @@ version 1.0.10beta1 [March 14, 2001]</div><div class='ctx'>   Fixed bugs in png_combine_row() in pnggccrd.c and pngvcrd.c (C version)</div><div class='ctx'>   Added warnings when retrieving or setting gamma=0.</div><div class='ctx'>   Increased the first part of msg buffer from 16 to 18 in png_chunk_warning().</div><div class='del'>-version 1.0.10rc1 [March 23, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.0.10rc1 [March 23, 2001]</div><div class='ctx'>   Changed all instances of memcpy, strcpy, and strlen to png_memcpy, png_strcpy,</div><div class='ctx'>     and png_strlen.</div><div class='ctx'>   Revised png_mmx_supported() function in pnggccrd.c to return proper value.</div><div class='ctx'>   Fixed bug in progressive reading (pngpread.c) with small images (height &lt; 8).</div><div class='ctx'> </div><div class='del'>-version 1.0.10 [March 30, 2001]</div><div class='add'>+Version 1.0.10 [March 30, 2001]</div><div class='ctx'>   Deleted extraneous space (introduced in 1.0.9) from line 42 of makefile.cygwin</div><div class='ctx'>   Added beos project files (Chris Herborth)</div><div class='del'>-version 1.0.11beta1 [April 3, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.0.11beta1 [April 3, 2001]</div><div class='ctx'>   Added type casts on several png_malloc() calls (Dimitri Papadapoulos).</div><div class='ctx'>   Removed a no-longer needed AIX work-around from pngconf.h</div><div class='ctx'>   Changed several "//" single-line comments to C-style in pnggccrd.c</div><div class='del'>-version 1.0.11beta2 [April 11, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.0.11beta2 [April 11, 2001]</div><div class='ctx'>   Removed PNGAPI from several functions whose prototypes did not have PNGAPI.</div><div class='ctx'>   Updated scripts/pngos2.def</div><div class='del'>-version 1.0.11beta3 [April 14, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.0.11beta3 [April 14, 2001]</div><div class='ctx'>   Added checking the results of many instances of png_malloc() for NULL</div><div class='del'>-version 1.0.11beta4 [April 20, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.0.11beta4 [April 20, 2001]</div><div class='ctx'>   Undid the changes from version 1.0.11beta3.  Added a check for NULL return</div><div class='ctx'>     from user's malloc_fn().</div><div class='ctx'>   Removed some useless type casts of the NULL pointer.</div><div class='ctx'>   Added makefile.netbsd</div><div class='ctx'> </div><div class='del'>-version 1.0.11 [April 27, 2001]</div><div class='add'>+Version 1.0.11 [April 27, 2001]</div><div class='ctx'>   Revised makefile.netbsd</div><div class='del'>-version 1.0.12beta1 [May 14, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.0.12beta1 [May 14, 2001]</div><div class='ctx'>   Test for Windows platform in pngconf.h when including malloc.h (Emmanuel Blot)</div><div class='ctx'>   Updated makefile.cygwin and handling of Cygwin's ALL_STATIC in pngconf.h</div><div class='ctx'>   Added some never-to-be-executed code in pnggccrd.c to quiet compiler warnings.</div><div class='hunk'>@@ -975,21 +1068,25 @@ version 1.0.12beta1 [May 14, 2001]</div><div class='ctx'>     libpng will reallocate the png_struct and info_struct if they are too small.</div><div class='ctx'>     This retains future binary compatibility for old applications written for</div><div class='ctx'>     libpng-0.88 and earlier.</div><div class='del'>-version 1.2.0beta1 [May 6, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.2.0beta1 [May 6, 2001]</div><div class='ctx'>   Bumped DLLNUM to 2.</div><div class='ctx'>   Re-enabled PNG_MNG_FEATURES_SUPPORTED and enabled PNG_ASSEMBLER_CODE_SUPPORTED</div><div class='ctx'>     by default.</div><div class='ctx'>   Added runtime selection of MMX features.</div><div class='ctx'>   Added png_set_strip_error_numbers function and related macros.</div><div class='del'>-version 1.2.0beta2 [May 7, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.2.0beta2 [May 7, 2001]</div><div class='ctx'>   Finished merging 1.2.0beta1 with version 1.0.11</div><div class='ctx'>   Added a check for attempts to read or write PLTE in grayscale PNG datastreams.</div><div class='del'>-version 1.2.0beta3 [May 17, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.2.0beta3 [May 17, 2001]</div><div class='ctx'>   Enabled user memory function by default.</div><div class='ctx'>   Modified png_create_struct so it passes user mem_ptr to user memory allocator.</div><div class='ctx'>   Increased png_mng_features flag from png_byte to png_uint_32.</div><div class='ctx'>   Bumped shared-library (so-number) and dll-number to 3.</div><div class='del'>-version 1.2.0beta4 [June 23, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.2.0beta4 [June 23, 2001]</div><div class='ctx'>   Check for missing profile length field in iCCP chunk and free chunk_data</div><div class='ctx'>      in case of truncated iCCP chunk.</div><div class='ctx'>   Bumped shared-library number to 3 in makefile.sgi and makefile.sggcc</div><div class='hunk'>@@ -1003,7 +1100,8 @@ version 1.2.0beta4 [June 23, 2001]</div><div class='ctx'>      of png_write_oFFS width and height from png_uint_32 to png_int_32.</div><div class='ctx'>   Updated example.c</div><div class='ctx'>   Revised prototypes for png_debug_malloc and png_debug_free in pngtest.c</div><div class='del'>-version 1.2.0beta5 [August 8, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.2.0beta5 [August 8, 2001]</div><div class='ctx'>   Revised contrib/gregbook</div><div class='ctx'>   Revised makefile.gcmmx</div><div class='ctx'>   Revised pnggccrd.c to conditionally compile some thread-unsafe code only</div><div class='hunk'>@@ -1014,27 +1112,32 @@ version 1.2.0beta5 [August 8, 2001]</div><div class='ctx'>   Replaced calls to fprintf(stderr,...) with png_warning() in pnggccrd.c</div><div class='ctx'>   Removed restriction that do_invert_mono only operate on 1-bit opaque files</div><div class='ctx'> </div><div class='del'>-version 1.2.0 [September 1, 2001]</div><div class='add'>+Version 1.2.0 [September 1, 2001]</div><div class='ctx'>   Changed a png_warning() to png_debug() in pnggccrd.c</div><div class='ctx'>   Fixed contrib/gregbook/rpng-x.c, rpng2-x.c to avoid crash with XFreeGC().</div><div class='del'>-version 1.2.1beta1 [October 19, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.2.1beta1 [October 19, 2001]</div><div class='ctx'>   Revised makefile.std in contrib/pngminus</div><div class='ctx'>   Include background_1 in png_struct regardless of gamma support.</div><div class='ctx'>   Revised makefile.netbsd and makefile.macosx, added makefile.darwin.</div><div class='ctx'>   Revised example.c to provide more details about using row_callback().</div><div class='del'>-version 1.2.1beta2 [October 25, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.2.1beta2 [October 25, 2001]</div><div class='ctx'>   Added type cast to each NULL appearing in a function call, except for</div><div class='ctx'>     WINCE functions.</div><div class='ctx'>   Added makefile.so9.</div><div class='del'>-version 1.2.1beta3 [October 27, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.2.1beta3 [October 27, 2001]</div><div class='ctx'>   Removed type casts from all NULLs.</div><div class='ctx'>   Simplified png_create_struct_2().</div><div class='del'>-version 1.2.1beta4 [November 7, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.2.1beta4 [November 7, 2001]</div><div class='ctx'>   Revised png_create_info_struct() and png_creat_struct_2().</div><div class='ctx'>   Added error message if png_write_info() was omitted.</div><div class='ctx'>   Type cast NULLs appearing in function calls when _NO_PROTO or</div><div class='ctx'>     PNG_TYPECAST_NULL is defined.</div><div class='del'>-version 1.2.1rc1 [November 24, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.2.1rc1 [November 24, 2001]</div><div class='ctx'>   Type cast NULLs appearing in function calls except when PNG_NO_TYPECAST_NULL</div><div class='ctx'>     is defined.</div><div class='ctx'>   Changed typecast of "size" argument to png_size_t in pngmem.c calls to</div><div class='hunk'>@@ -1043,14 +1146,16 @@ version 1.2.1rc1 [November 24, 2001]</div><div class='ctx'>   Updated makefile.sgi to recognize LIBPATH and INCPATH.</div><div class='ctx'>   Updated various makefiles so "make clean" does not remove previous major</div><div class='ctx'>     version of the shared library.</div><div class='del'>-version 1.2.1rc2 [December 4, 2001]</div><div class='add'>+</div><div class='add'>+Version 1.2.1rc2 [December 4, 2001]</div><div class='ctx'>   Always allocate 256-entry internal palette, hist, and trans arrays, to</div><div class='ctx'>     avoid out-of-bounds memory reference caused by invalid PNG datastreams.</div><div class='ctx'>   Added a check for prefix_length &gt; data_length in iCCP chunk handler.</div><div class='ctx'> </div><div class='del'>-version 1.2.1 [December 7, 2001]</div><div class='add'>+Version 1.2.1 [December 7, 2001]</div><div class='ctx'>   None.</div><div class='del'>-version 1.2.2beta1 [February 22, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.2beta1 [February 22, 2002]</div><div class='ctx'>   Fixed a bug with reading the length of iCCP profiles (Larry Reeves).</div><div class='ctx'>   Revised makefile.linux, makefile.gcmmx, and makefile.sgi to generate</div><div class='ctx'>     libpng.a, libpng12.so (not libpng.so.3), and libpng12/png.h</div><div class='hunk'>@@ -1060,13 +1165,15 @@ version 1.2.2beta1 [February 22, 2002]</div><div class='ctx'>   Revised calls to png_create_read_struct() and png_create_write_struct()</div><div class='ctx'>     for simpler debugging.</div><div class='ctx'>   Revised png_zalloc() so zlib handles errors (uses PNG_FLAG_MALLOC_NULL_MEM_OK)</div><div class='del'>-version 1.2.2beta2 [February 23, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.2beta2 [February 23, 2002]</div><div class='ctx'>   Check chunk_length and idat_size for invalid (over PNG_MAX_UINT) lengths.</div><div class='ctx'>   Check for invalid image dimensions in png_get_IHDR.</div><div class='ctx'>   Added missing "fi;" in the install target of the SGI makefiles.</div><div class='ctx'>   Added install-static to all makefiles that make shared libraries.</div><div class='ctx'>   Always do gamma compensation when image is partially transparent.</div><div class='del'>-version 1.2.2beta3 [March 7, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.2beta3 [March 7, 2002]</div><div class='ctx'>   Compute background.gray and background_1.gray even when color_type is RGB</div><div class='ctx'>     in case image gets reduced to gray later.</div><div class='ctx'>   Modified shared-library makefiles to install pkgconfig/libpngNN.pc.</div><div class='hunk'>@@ -1076,12 +1183,14 @@ version 1.2.2beta3 [March 7, 2002]</div><div class='ctx'>   Added install-shared target to all makefiles that make shared libraries.</div><div class='ctx'>   Stopped a double free of palette, hist, and trans when not using free_me.</div><div class='ctx'>   Added makefile.32sunu for Sun Ultra 32 and makefile.64sunu for Sun Ultra 64.</div><div class='del'>-version 1.2.2beta4 [March 8, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.2beta4 [March 8, 2002]</div><div class='ctx'>   Compute background.gray and background_1.gray even when color_type is RGB</div><div class='ctx'>     in case image gets reduced to gray later (Jason Summers).</div><div class='ctx'>   Relocated a misplaced /bin/rm in the "install-shared" makefile targets</div><div class='ctx'>   Added PNG_1_0_X macro which can be used to build a 1.0.x-compatible library.</div><div class='del'>-version 1.2.2beta5 [March 26, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.2beta5 [March 26, 2002]</div><div class='ctx'>   Added missing PNGAPI to several function definitions.</div><div class='ctx'>   Check for invalid bit_depth or color_type in png_get_IHDR(), and</div><div class='ctx'>     check for missing PLTE or IHDR in png_push_read_chunk() (Matthias Clasen).</div><div class='hunk'>@@ -1090,33 +1199,45 @@ version 1.2.2beta5 [March 26, 2002]</div><div class='ctx'>   Changed "()" to "{}" in scripts/libpng.pc.in.</div><div class='ctx'>   Revised makefiles to put png.h and pngconf.h only in $prefix/include/libpngNN</div><div class='ctx'>   Revised makefiles to make symlink to libpng.so.NN in addition to libpngNN.so</div><div class='del'>-version 1.2.2beta6 [March 31, 2002]</div><div class='del'>-version 1.0.13beta1 [March 31, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.2beta6 [March 31, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.0.13beta1 [March 31, 2002]</div><div class='ctx'>   Prevent png_zalloc() from trying to memset memory that it failed to acquire.</div><div class='ctx'>   Add typecasts of PNG_MAX_UINT in pngset_cHRM_fixed() (Matt Holgate).</div><div class='ctx'>   Ensure that the right function (user or default) is used to free the</div><div class='ctx'>     png_struct after an error in png_create_read_struct_2().</div><div class='del'>-version 1.2.2rc1 [April 7, 2002]</div><div class='del'>-version 1.0.13rc1 [April 7, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.2rc1 [April 7, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.0.13rc1 [April 7, 2002]</div><div class='ctx'>   Save the ebx register in pnggccrd.c (Sami Farin)</div><div class='ctx'>   Add "mem_ptr = png_ptr-&gt;mem_ptr" in png_destroy_write_struct() (Paul Gardner).</div><div class='ctx'>   Updated makefiles to put headers in include/libpng and remove old include/*.h.</div><div class='ctx'> </div><div class='del'>-version 1.2.2 [April 15, 2002]</div><div class='del'>-version 1.0.13 [April 15, 2002]</div><div class='add'>+Version 1.2.2 [April 15, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.0.13 [April 15, 2002]</div><div class='ctx'>   Revised description of png_set_filter() in libpng.3/libpng.txt.</div><div class='ctx'>   Revised makefile.netbsd and added makefile.neNNbsd and makefile.freebsd</div><div class='del'>-version 1.0.13patch01 [April 17, 2002]</div><div class='del'>-version 1.2.2patch01 [April 17, 2002]</div><div class='del'>-  Changed ${PNGMAJ}.${PNGVER} bug to ${PNGVER} in makefile.sgi and makefile.sggcc</div><div class='del'>-  Fixed VER -&gt; PNGVER typo in makefile.macosx and added install-static to install</div><div class='add'>+</div><div class='add'>+Version 1.0.13patch01 [April 17, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.2patch01 [April 17, 2002]</div><div class='add'>+  Changed ${PNGMAJ}.${PNGVER} bug to ${PNGVER} in makefile.sgi and</div><div class='add'>+    makefile.sggcc</div><div class='add'>+  Fixed VER -&gt; PNGVER typo in makefile.macosx and added install-static to</div><div class='add'>+    install</div><div class='ctx'>   Added install: target to makefile.32sunu and makefile.64sunu</div><div class='del'>-version 1.0.13patch03 [April 18, 2002]</div><div class='del'>-version 1.2.2patch03 [April 18, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.0.13patch03 [April 18, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.2patch03 [April 18, 2002]</div><div class='ctx'>   Revised 15 makefiles to link libpng.a to libpngNN.a and the include libpng</div><div class='ctx'>   subdirectory to libpngNN subdirectory without the full pathname.</div><div class='ctx'>   Moved generation of libpng.pc from "install" to "all" in 15 makefiles.</div><div class='del'>-version 1.2.3rc1 [April 28, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.3rc1 [April 28, 2002]</div><div class='ctx'>   Added install-man target to 15 makefiles (Dimitri Papadopolous-Orfanos).</div><div class='ctx'>   Added $(DESTDIR) feature to 24 makefiles (Tim Mooney)</div><div class='ctx'>   Fixed bug with $prefix, should be $(prefix) in makefile.hpux.</div><div class='hunk'>@@ -1128,70 +1249,83 @@ version 1.2.3rc1 [April 28, 2002]</div><div class='ctx'>     to put one in their application.</div><div class='ctx'>   Restored png_zalloc() and png_zfree() prototypes to version 1.2.1 and</div><div class='ctx'>     removed them from module definition files.</div><div class='del'>-version 1.2.3rc2 [May 1, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.3rc2 [May 1, 2002]</div><div class='ctx'>   Fixed bug in reporting number of channels in pngget.c and pngset.c,</div><div class='ctx'>     that was introduced in version 1.2.2beta5.</div><div class='ctx'>   Exported png_zalloc(), png_zfree(), png_default_read(), png_default_write(),</div><div class='ctx'>     png_default_flush(), and png_push_fill_buffer() and included them in</div><div class='ctx'>     module definition files.</div><div class='ctx'>   Added "libpng.pc" dependency to the "install-shared" target in 15 makefiles.</div><div class='del'>-version 1.2.3rc3 [May 1, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.3rc3 [May 1, 2002]</div><div class='ctx'>   Revised prototype for png_default_flush()</div><div class='ctx'>   Remove old libpng.pc and libpngNN.pc before installing new ones.</div><div class='del'>-version 1.2.3rc4 [May 2, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.3rc4 [May 2, 2002]</div><div class='ctx'>   Typos in *.def files (png_default_read|write -&gt; png_default_read|write_data)</div><div class='ctx'>   In makefiles, changed rm libpng.NN.pc to rm libpngNN.pc</div><div class='del'>-  Added libpng-config and libpngNN-config and modified makefiles to install them.</div><div class='add'>+  Added libpng-config and libpngNN-config and modified makefiles to install</div><div class='add'>+    them.</div><div class='ctx'>   Changed $(MANPATH) to $(DESTDIR)$(MANPATH) in makefiles</div><div class='ctx'>   Added "Win32 DLL VB" configuration to projects/msvc/libpng.dsp</div><div class='del'>-version 1.2.3rc5 [May 11, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.3rc5 [May 11, 2002]</div><div class='ctx'>   Changed "error" and "message" in prototypes to "error_message" and</div><div class='ctx'>     "warning_message" to avoid namespace conflict.</div><div class='ctx'>   Revised 15 makefiles to build libpng-config from libpng-config-*.in</div><div class='ctx'>   Once more restored png_zalloc and png_zfree to regular nonexported form.</div><div class='ctx'>   Restored png_default_read|write_data, png_default_flush, png_read_fill_buffer</div><div class='del'>-    to nonexported form, but with PNGAPI, and removed them from module def files.</div><div class='del'>-version 1.2.3rc6 [May 14, 2002]</div><div class='add'>+    to nonexported form, but with PNGAPI, and removed them from module def</div><div class='add'>+    files.</div><div class='add'>+</div><div class='add'>+Version 1.2.3rc6 [May 14, 2002]</div><div class='ctx'>   Removed "PNGAPI" from png_zalloc() and png_zfree() in png.c</div><div class='ctx'>   Changed "Gz" to "Gd" in projects/msvc/libpng.dsp and zlib.dsp.</div><div class='ctx'>   Removed leftover libpng-config "sed" script from four makefiles.</div><div class='ctx'>   Revised libpng-config creating script in 16 makefiles.</div><div class='ctx'> </div><div class='del'>-version 1.2.3 [May 22, 2002]</div><div class='add'>+Version 1.2.3 [May 22, 2002]</div><div class='ctx'>   Revised libpng-config target in makefile.cygwin.</div><div class='ctx'>   Removed description of png_set_mem_fn() from documentation.</div><div class='ctx'>   Revised makefile.freebsd.</div><div class='ctx'>   Minor cosmetic changes to 15 makefiles, e.g., $(DI) = $(DESTDIR)/$(INCDIR).</div><div class='ctx'>   Revised projects/msvc/README.txt</div><div class='ctx'>   Changed -lpng to -lpngNN in LDFLAGS in several makefiles.</div><div class='del'>-version 1.2.4beta1 [May 24, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.4beta1 [May 24, 2002]</div><div class='ctx'>   Added libpng.pc and libpng-config to "all:" target in 16 makefiles.</div><div class='ctx'>   Fixed bug in 16 makefiles: $(DESTDIR)/$(LIBPATH) to $(DESTDIR)$(LIBPATH)</div><div class='ctx'>   Added missing "\" before closing double quote in makefile.gcmmx.</div><div class='ctx'>   Plugged various memory leaks; added png_malloc_warn() and png_set_text_2()</div><div class='ctx'>     functions.</div><div class='del'>-version 1.2.4beta2 [June 25, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.4beta2 [June 25, 2002]</div><div class='ctx'>   Plugged memory leak of png_ptr-&gt;current_text (Matt Holgate).</div><div class='ctx'>   Check for buffer overflow before reading CRC in pngpread.c (Warwick Allison)</div><div class='ctx'>   Added -soname to the loader flags in makefile.dec, makefile.sgi, and</div><div class='ctx'>     makefile.sggcc.</div><div class='ctx'>   Added "test-installed" target to makefile.linux, makefile.gcmmx,</div><div class='ctx'>     makefile.sgi, and makefile.sggcc.</div><div class='del'>-version 1.2.4beta3 [June 28, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.4beta3 [June 28, 2002]</div><div class='ctx'>   Plugged memory leak of row_buf in pngtest.c when there is a png_error().</div><div class='ctx'>   Detect buffer overflow in pngpread.c when IDAT is corrupted with extra data.</div><div class='ctx'>   Added "test-installed" target to makefile.32sunu, makefile.64sunu,</div><div class='ctx'>     makefile.beos, makefile.darwin, makefile.dec, makefile.macosx,</div><div class='ctx'>     makefile.solaris, makefile.hpux, makefile.hpgcc, and makefile.so9.</div><div class='del'>-version 1.2.4rc1 and 1.0.14rc1 [July 2, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.4rc1 and 1.0.14rc1 [July 2, 2002]</div><div class='ctx'>   Added "test-installed" target to makefile.cygwin and makefile.sco.</div><div class='ctx'>   Revised pnggccrd.c to be able to back out version 1.0.x via PNG_1_0_X macro.</div><div class='ctx'> </div><div class='del'>-version 1.2.4 and 1.0.14 [July 8, 2002]</div><div class='add'>+Version 1.2.4 and 1.0.14 [July 8, 2002]</div><div class='ctx'>   Changed png_warning() to png_error() when width is too large to process.</div><div class='del'>-version 1.2.4patch01 [July 20, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.4patch01 [July 20, 2002]</div><div class='ctx'>   Revised makefile.cygwin to use DLL number 12 instead of 13.</div><div class='del'>-version 1.2.5beta1 [August 6, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.5beta1 [August 6, 2002]</div><div class='ctx'>   Added code to contrib/gregbook/readpng2.c to ignore unused chunks.</div><div class='ctx'>   Replaced toucan.png in contrib/gregbook (it has been corrupt since 1.0.11)</div><div class='ctx'>   Removed some stray *.o files from contrib/gregbook.</div><div class='hunk'>@@ -1200,36 +1334,43 @@ version 1.2.5beta1 [August 6, 2002]</div><div class='ctx'>   Prevent png_ptr-&gt;pass from exceeding 7 in png_push_finish_row().</div><div class='ctx'>   Updated makefile.hpgcc</div><div class='ctx'>   Updated png.c and pnggccrd.c handling of return from png_mmx_support()</div><div class='del'>-version 1.2.5beta2 [August 15, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.5beta2 [August 15, 2002]</div><div class='ctx'>   Only issue png_warning() about "Too much data" in pngpread.c when avail_in</div><div class='ctx'>     is nonzero.</div><div class='ctx'>   Updated makefiles to install a separate libpng.so.3 with its own rpath.</div><div class='del'>-version 1.2.5rc1 and 1.0.15rc1 [August 24, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.5rc1 and 1.0.15rc1 [August 24, 2002]</div><div class='ctx'>   Revised makefiles to not remove previous minor versions of shared libraries.</div><div class='del'>-version 1.2.5rc2 and 1.0.15rc2 [September 16, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.5rc2 and 1.0.15rc2 [September 16, 2002]</div><div class='ctx'>   Revised 13 makefiles to remove "-lz" and "-L$(ZLIBLIB)", etc., from shared</div><div class='ctx'>     library loader directive.</div><div class='ctx'>   Added missing "$OBJSDLL" line to makefile.gcmmx.</div><div class='ctx'>   Added missing "; fi" to makefile.32sunu.</div><div class='del'>-version 1.2.5rc3 and 1.0.15rc3 [September 18, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.5rc3 and 1.0.15rc3 [September 18, 2002]</div><div class='ctx'>   Revised libpng-config script.</div><div class='ctx'> </div><div class='del'>-version 1.2.5 and 1.0.15 [October 3, 2002]</div><div class='add'>+Version 1.2.5 and 1.0.15 [October 3, 2002]</div><div class='ctx'>   Revised makefile.macosx, makefile.darwin, makefile.hpgcc, and makefile.hpux,</div><div class='ctx'>     and makefile.aix.</div><div class='ctx'>   Relocated two misplaced PNGAPI lines in pngtest.c</div><div class='del'>-version 1.2.6beta1 [October 22, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.6beta1 [October 22, 2002]</div><div class='ctx'>   Commented out warning about uninitialized mmx_support in pnggccrd.c.</div><div class='ctx'>   Changed "IBMCPP__" flag to "__IBMCPP__" in pngconf.h.</div><div class='ctx'>   Relocated two more misplaced PNGAPI lines in pngtest.c</div><div class='ctx'>   Fixed memory overrun bug in png_do_read_filler() with 16-bit datastreams,</div><div class='ctx'>     introduced in version 1.0.2.</div><div class='ctx'>   Revised makefile.macosx, makefile.dec, makefile.aix, and makefile.32sunu.</div><div class='del'>-version 1.2.6beta2 [November 1, 2002]</div><div class='add'>+</div><div class='add'>+Version 1.2.6beta2 [November 1, 2002]</div><div class='ctx'>   Added libpng-config "--ldopts" output.</div><div class='ctx'>   Added "AR=ar" and "ARFLAGS=rc" and changed "ar rc" to "$(AR) $(ARFLAGS)"</div><div class='ctx'>     in makefiles.</div><div class='del'>-version 1.2.6beta3 [July 18, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.2.6beta3 [July 18, 2004]</div><div class='ctx'>   Reverted makefile changes from version 1.2.6beta2 and some of the changes</div><div class='ctx'>     from version 1.2.6beta1; these will be postponed until version 1.2.7.</div><div class='ctx'>     Version 1.2.6 is going to be a simple bugfix release.</div><div class='hunk'>@@ -1282,7 +1423,8 @@ version 1.2.6beta3 [July 18, 2004]</div><div class='ctx'>   Updated contrib/visupng/VisualPng.dsp (Cosmin).</div><div class='ctx'>   Updated contrib/visupng/cexcept.h to version 2.0.0 (Cosmin).</div><div class='ctx'>   Added a separate distribution with "configure" and supporting files (Junichi).</div><div class='del'>-version 1.2.6beta4 [July 28, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.2.6beta4 [July 28, 2004]</div><div class='ctx'>   Added user ability to change png_size_t via a PNG_SIZE_T macro.</div><div class='ctx'>   Added png_sizeof() and png_convert_size() functions.</div><div class='ctx'>   Added PNG_SIZE_MAX (maximum value of a png_size_t variable.</div><div class='hunk'>@@ -1304,7 +1446,8 @@ version 1.2.6beta4 [July 28, 2004]</div><div class='ctx'>   Added some "#if PNG_WRITE_SUPPORTED" blocks.</div><div class='ctx'>   Added #ifdef to remove some redundancy in png_malloc_default().</div><div class='ctx'>   Use png_malloc instead of png_zalloc to allocate the pallete.</div><div class='del'>-version 1.0.16rc1 and 1.2.6rc1 [August 4, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.0.16rc1 and 1.2.6rc1 [August 4, 2004]</div><div class='ctx'>   Fixed buffer overflow vulnerability in png_handle_tRNS()</div><div class='ctx'>   Fixed integer arithmetic overflow vulnerability in png_read_png().</div><div class='ctx'>   Fixed some harmless bugs in png_handle_sBIT, etc, that would cause</div><div class='hunk'>@@ -1319,7 +1462,8 @@ version 1.0.16rc1 and 1.2.6rc1 [August 4, 2004]</div><div class='ctx'>   Fixed wrong cast of returns from png_get_user_width|height_max().</div><div class='ctx'>   Changed some "keep the compiler happy" from empty statements to returns,</div><div class='ctx'>   Revised libpng.txt to remove 1.2.x stuff from the 1.0.x distribution</div><div class='del'>-version 1.0.16rc2 and 1.2.6rc2 [August 7, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.0.16rc2 and 1.2.6rc2 [August 7, 2004]</div><div class='ctx'>   Revised makefile.darwin and makefile.solaris.  Removed makefile.macosx.</div><div class='ctx'>   Revised pngtest's png_debug_malloc() to use png_malloc() instead of</div><div class='ctx'>     png_malloc_default() which is not supposed to be exported.</div><div class='hunk'>@@ -1333,91 +1477,106 @@ version 1.0.16rc2 and 1.2.6rc2 [August 7, 2004]</div><div class='ctx'>   Changed "HANDLE_CHUNK_*" to "PNG_HANDLE_CHUNK_*" (Cosmin)</div><div class='ctx'>   Added "-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)" to 15 *NIX makefiles.</div><div class='ctx'>   Added code to update the row_info-&gt;colortype in png_do_read_filler() (MSB).</div><div class='del'>-version 1.0.16rc3 and 1.2.6rc3 [August 9, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.0.16rc3 and 1.2.6rc3 [August 9, 2004]</div><div class='ctx'>   Eliminated use of "abs()" in testing cHRM and gAMA values, to avoid</div><div class='ctx'>     trouble with some 64-bit compilers.  Created PNG_OUT_OF_RANGE() macro.</div><div class='ctx'>   Revised documentation of png_set_keep_unknown_chunks().</div><div class='ctx'>   Check handle_as_unknown status in pngpread.c, as in pngread.c previously.</div><div class='ctx'>   Moved  "PNG_HANDLE_CHUNK_*" macros out of PNG_INTERNAL section of png.h</div><div class='ctx'>   Added "rim" definitions for CONST4 and CONST6 in pnggccrd.c</div><div class='del'>-version 1.0.16rc4 and 1.2.6rc4 [August 10, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.0.16rc4 and 1.2.6rc4 [August 10, 2004]</div><div class='ctx'>   Fixed mistake in pngtest.c introduced in 1.2.6rc2 (declaration of</div><div class='ctx'>     "pinfo" was out of place).</div><div class='del'>-version 1.0.16rc5 and 1.2.6rc5 [August 10, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.0.16rc5 and 1.2.6rc5 [August 10, 2004]</div><div class='ctx'>   Moved  "PNG_HANDLE_CHUNK_*" macros out of PNG_ASSEMBLER_CODE_SUPPORTED</div><div class='ctx'>      section of png.h where they were inadvertently placed in version rc3.</div><div class='ctx'> </div><div class='del'>-version 1.2.6 and 1.0.16 [August 15, 2004]</div><div class='add'>+Version 1.2.6 and 1.0.16 [August 15, 2004]</div><div class='ctx'>   Revised pngtest so memory allocation testing is only done when PNG_DEBUG==1.</div><div class='del'>-version 1.2.7beta1 [August 26, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.2.7beta1 [August 26, 2004]</div><div class='ctx'>   Removed unused pngasmrd.h file.</div><div class='ctx'>   Removed references to uu.net for archived files.  Added references to</div><div class='ctx'>     PNG Spec (second edition) and the PNG ISO/IEC Standard.</div><div class='ctx'>   Added "test-dd" target in 15 makefiles, to run pngtest in DESTDIR.</div><div class='ctx'>   Fixed bug with "optimized window size" in the IDAT datastream, that</div><div class='ctx'>     causes libpng to write PNG files with incorrect zlib header bytes.</div><div class='del'>-version 1.2.7beta2 [August 28, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.2.7beta2 [August 28, 2004]</div><div class='ctx'>   Fixed bug with sCAL chunk and big-endian machines (David Munro).</div><div class='ctx'>   Undid new code added in 1.2.6rc2 to update the color_type in</div><div class='ctx'>     png_set_filler().</div><div class='ctx'>   Added png_set_add_alpha() that updates color type.</div><div class='del'>-version 1.0.17rc1 and 1.2.7rc1 [September 4, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.0.17rc1 and 1.2.7rc1 [September 4, 2004]</div><div class='ctx'>   Revised png_set_strip_filler() to not remove alpha if color_type has alpha.</div><div class='ctx'> </div><div class='del'>-version 1.2.7 and 1.0.17 [September 12, 2004]</div><div class='add'>+Version 1.2.7 and 1.0.17 [September 12, 2004]</div><div class='ctx'>   Added makefile.hp64</div><div class='ctx'>   Changed projects/msvc/png32ms.def to scripts/png32ms.def in makefile.cygwin</div><div class='del'>-version 1.2.8beta1 [November 1, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.2.8beta1 [November 1, 2004]</div><div class='ctx'>   Fixed bug in png_text_compress() that would fail to complete a large block.</div><div class='ctx'>   Fixed bug, introduced in libpng-1.2.7, that overruns a buffer during</div><div class='ctx'>     strip alpha operation in png_do_strip_filler().</div><div class='ctx'>   Added PNG_1_2_X definition in pngconf.h</div><div class='ctx'>   Use #ifdef to comment out png_info_init in png.c and png_read_init in</div><div class='ctx'>     pngread.c (as of 1.3.0)</div><div class='del'>-version 1.2.8beta2 [November 2, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.2.8beta2 [November 2, 2004]</div><div class='ctx'>   Reduce color_type to a nonalpha type after strip alpha operation in</div><div class='ctx'>     png_do_strip_filler().</div><div class='del'>-version 1.2.8beta3 [November 3, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.2.8beta3 [November 3, 2004]</div><div class='ctx'>   Revised definitions of PNG_MAX_UINT_32, PNG_MAX_SIZE, and PNG_MAXSUM</div><div class='del'>-version 1.2.8beta4 [November 12, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.2.8beta4 [November 12, 2004]</div><div class='ctx'>   Fixed (again) definition of PNG_LIBPNG_VER_DLLNUM in png.h (Cosmin).</div><div class='ctx'>   Added PNG_LIBPNG_BUILD_PRIVATE in png.h (Cosmin).</div><div class='ctx'>   Set png_ptr-&gt;zstream.data_type to Z_BINARY, to avoid unnecessary detection</div><div class='ctx'>     of data type in deflate (Cosmin).</div><div class='ctx'>   Deprecated but continue to support SPECIALBUILD and PRIVATEBUILD in favor of</div><div class='ctx'>     PNG_LIBPNG_BUILD_SPECIAL_STRING and PNG_LIBPNG_BUILD_PRIVATE_STRING.</div><div class='del'>-version 1.2.8beta5 [November 20, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.2.8beta5 [November 20, 2004]</div><div class='ctx'>   Use png_ptr-&gt;flags instead of png_ptr-&gt;transformations to pass</div><div class='ctx'>     PNG_STRIP_ALPHA info to png_do_strip_filler(), to preserve ABI</div><div class='ctx'>     compatibility.</div><div class='ctx'>   Revised handling of SPECIALBUILD, PRIVATEBUILD,</div><div class='ctx'>     PNG_LIBPNG_BUILD_SPECIAL_STRING and PNG_LIBPNG_BUILD_PRIVATE_STRING.</div><div class='del'>-version 1.2.8rc1 [November 24, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.2.8rc1 [November 24, 2004]</div><div class='ctx'>   Moved handling of BUILD macros from pngconf.h to png.h</div><div class='ctx'>   Added definition of PNG_LIBPNG_BASE_TYPE in png.h, inadvertently</div><div class='ctx'>     omitted from beta5.</div><div class='ctx'>   Revised scripts/pngw32.rc</div><div class='ctx'>   Despammed mailing addresses by masking "@" with "at".</div><div class='ctx'>   Inadvertently installed a supposedly faster test version of pngrutil.c</div><div class='del'>-version 1.2.8rc2 [November 26, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.2.8rc2 [November 26, 2004]</div><div class='ctx'>   Added two missing "\" in png.h</div><div class='ctx'>   Change tests in pngread.c and pngpread.c to</div><div class='ctx'>     if (png_ptr-&gt;transformations || (png_ptr-&gt;flags&amp;PNG_FLAG_STRIP_ALPHA))</div><div class='ctx'>        png_do_read_transformations(png_ptr);</div><div class='del'>-version 1.2.8rc3 [November 28, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.2.8rc3 [November 28, 2004]</div><div class='ctx'>   Reverted pngrutil.c to version libpng-1.2.8beta5.</div><div class='ctx'>   Added scripts/makefile.elf with supporting code in pngconf.h for symbol</div><div class='ctx'>     versioning (John Bowler).</div><div class='del'>-version 1.2.8rc4 [November 29, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.2.8rc4 [November 29, 2004]</div><div class='ctx'>   Added projects/visualc7 (Simon-pierre).</div><div class='del'>-version 1.2.8rc5 [November 29, 2004]</div><div class='add'>+</div><div class='add'>+Version 1.2.8rc5 [November 29, 2004]</div><div class='ctx'>   Fixed new typo in scripts/pngw32.rc</div><div class='ctx'> </div><div class='del'>-version 1.2.8 [December 3, 2004]</div><div class='add'>+Version 1.2.8 [December 3, 2004]</div><div class='ctx'>   Removed projects/visualc7, added projects/visualc71.</div><div class='ctx'> </div><div class='del'>-version 1.2.9beta1 [February 21, 2006]</div><div class='del'>-</div><div class='add'>+Version 1.2.9beta1 [February 21, 2006]</div><div class='ctx'>   Initialized some structure members in pngwutil.c to avoid gcc-4.0.0 complaints</div><div class='ctx'>   Revised man page and libpng.txt to make it clear that one should not call</div><div class='ctx'>     png_read_end or png_write_end after png_read_png or png_write_png.</div><div class='hunk'>@@ -1439,8 +1598,7 @@ version 1.2.9beta1 [February 21, 2006]</div><div class='ctx'>   Fixed scripts/makefile.cygwin (Christian Biesinger, Cosmin).</div><div class='ctx'>   Default iTXt support was inadvertently enabled.</div><div class='ctx'> </div><div class='del'>-version 1.2.9beta2 [February 21, 2006]</div><div class='del'>-</div><div class='add'>+Version 1.2.9beta2 [February 21, 2006]</div><div class='ctx'>   Check for png_rgb_to_gray and png_gray_to_rgb read transformations before</div><div class='ctx'>     checking for png_read_dither in pngrtran.c</div><div class='ctx'>   Revised checking of chromaticity limits to accommodate extended RGB</div><div class='hunk'>@@ -1453,8 +1611,7 @@ version 1.2.9beta2 [February 21, 2006]</div><div class='ctx'>   Eliminated distributions without the "configure" script.</div><div class='ctx'>   Updated INSTALL instructions.</div><div class='ctx'> </div><div class='del'>-version 1.2.9beta3 [February 24, 2006]</div><div class='del'>-</div><div class='add'>+Version 1.2.9beta3 [February 24, 2006]</div><div class='ctx'>   Fixed CRCRLF line endings in contrib/visupng/VisualPng.dsp</div><div class='ctx'>   Made libpng.pc respect EXEC_PREFIX (D. P. Kreil, J. Bowler)</div><div class='ctx'>   Removed reference to pngasmrd.h from Makefile.am</div><div class='hunk'>@@ -1463,8 +1620,7 @@ version 1.2.9beta3 [February 24, 2006]</div><div class='ctx'>   Renamed ANNOUNCE to NEWS.</div><div class='ctx'>   Created AUTHORS file.</div><div class='ctx'> </div><div class='del'>-version 1.2.9beta4 [March 3, 2006]</div><div class='del'>-</div><div class='add'>+Version 1.2.9beta4 [March 3, 2006]</div><div class='ctx'>   Changed definition of PKGCONFIG from $prefix/lib to $libdir in configure.ac</div><div class='ctx'>   Reverted to filenames LICENSE and ANNOUNCE; removed AUTHORS and COPYING.</div><div class='ctx'>   Removed newline from the end of some error and warning messages.</div><div class='hunk'>@@ -1475,17 +1631,17 @@ version 1.2.9beta4 [March 3, 2006]</div><div class='ctx'>   Added "OS2" to list of systems that don't need underscores, in pnggccrd.c</div><div class='ctx'>   Removed libpng version and date from *.c files.</div><div class='ctx'> </div><div class='del'>-version 1.2.9beta5 [March 4, 2006]</div><div class='add'>+Version 1.2.9beta5 [March 4, 2006]</div><div class='ctx'>   Removed trailing blanks from source files.</div><div class='ctx'>   Put version and date of latest change in each source file, and changed</div><div class='ctx'>     copyright year accordingly.</div><div class='del'>-  More cleanup of configure.ac, Makefile.ac, and associated scripts.</div><div class='add'>+  More cleanup of configure.ac, Makefile.am, and associated scripts.</div><div class='ctx'>   Restored scripts/makefile.elf which was inadvertently deleted.</div><div class='ctx'> </div><div class='del'>-version 1.2.9beta6 [March 6, 2006]</div><div class='add'>+Version 1.2.9beta6 [March 6, 2006]</div><div class='ctx'>   Fixed typo (RELEASE) in configuration files.</div><div class='ctx'> </div><div class='del'>-version 1.2.9beta7 [March 7, 2006]</div><div class='add'>+Version 1.2.9beta7 [March 7, 2006]</div><div class='ctx'>   Removed libpng.vers and libpng.sym from libpng12_la_SOURCES in Makefile.am</div><div class='ctx'>   Fixed inconsistent #ifdef's around png_sig_bytes() and png_set_sCAL_s()</div><div class='ctx'>     in png.h.</div><div class='hunk'>@@ -1493,7 +1649,7 @@ version 1.2.9beta7 [March 7, 2006]</div><div class='ctx'>   Made cosmetic changes to some makefiles, adding LN_SF and other macros.</div><div class='ctx'>   Made some makefiles accept "exec_prefix".</div><div class='ctx'> </div><div class='del'>-version 1.2.9beta8 [March 9, 2006]</div><div class='add'>+Version 1.2.9beta8 [March 9, 2006]</div><div class='ctx'>   Fixed some "#if defined (..." which should be "#if defined(..."</div><div class='ctx'>     Bug introduced in libpng-1.2.8.</div><div class='ctx'>   Fixed inconsistency in definition of png_default_read_data()</div><div class='hunk'>@@ -1504,82 +1660,82 @@ version 1.2.9beta8 [March 9, 2006]</div><div class='ctx'>   Added png_set_expand_gray_1_2_4_to_8() and deprecated</div><div class='ctx'>     png_set_gray_1_2_4_to_8() which also expands tRNS to alpha.</div><div class='ctx'> </div><div class='del'>-version 1.2.9beta9 [March 10, 2006]</div><div class='add'>+Version 1.2.9beta9 [March 10, 2006]</div><div class='ctx'>   Include "config.h" in pngconf.h when available.</div><div class='ctx'>   Added some checks for NULL png_ptr or NULL info_ptr (timeless)</div><div class='ctx'> </div><div class='del'>-version 1.2.9beta10 [March 20, 2006]</div><div class='add'>+Version 1.2.9beta10 [March 20, 2006]</div><div class='ctx'>   Removed extra CR from contrib/visualpng/VisualPng.dsw (Cosmin)</div><div class='ctx'>   Made pnggccrd.c PIC-compliant (Christian Aichinger).</div><div class='ctx'>   Added makefile.mingw (Wolfgang Glas).</div><div class='ctx'>   Revised pngconf.h MMX checking.</div><div class='ctx'> </div><div class='del'>-version 1.2.9beta11 [March 22, 2006]</div><div class='add'>+Version 1.2.9beta11 [March 22, 2006]</div><div class='ctx'>   Fixed out-of-order declaration in pngwrite.c that was introduced in beta9</div><div class='ctx'>   Simplified some makefiles by using LIBSO, LIBSOMAJ, and LIBSOVER macros.</div><div class='ctx'> </div><div class='del'>-version 1.2.9rc1 [March 31, 2006]</div><div class='add'>+Version 1.2.9rc1 [March 31, 2006]</div><div class='ctx'>   Defined PNG_USER_PRIVATEBUILD when including "pngusr.h" (Cosmin).</div><div class='ctx'>   Removed nonsensical assertion check from pngtest.c (Cosmin).</div><div class='ctx'> </div><div class='del'>-version 1.2.9 [April 14, 2006]</div><div class='add'>+Version 1.2.9 [April 14, 2006]</div><div class='ctx'>   Revised makefile.beos and added "none" selector in ltmain.sh</div><div class='ctx'> </div><div class='del'>-version 1.2.10beta1 [April 15, 2006]</div><div class='add'>+Version 1.2.10beta1 [April 15, 2006]</div><div class='ctx'>   Renamed "config.h" to "png_conf.h" and revised Makefile.am to add</div><div class='ctx'>     -DPNG_BUILDING_LIBPNG to compile directive, and modified pngconf.h</div><div class='ctx'>     to include png_conf.h only when PNG_BUILDING_LIBPNG is defined.</div><div class='ctx'> </div><div class='del'>-version 1.2.10beta2 [April 15, 2006]</div><div class='add'>+Version 1.2.10beta2 [April 15, 2006]</div><div class='ctx'>   Manually updated Makefile.in and configure.  Changed png_conf.h.in</div><div class='ctx'>     back to config.h.</div><div class='ctx'> </div><div class='del'>-version 1.2.10beta3 [April 15, 2006]</div><div class='add'>+Version 1.2.10beta3 [April 15, 2006]</div><div class='ctx'>   Change png_conf.h back to config.h in pngconf.h.</div><div class='ctx'> </div><div class='del'>-version 1.2.10beta4 [April 16, 2006]</div><div class='add'>+Version 1.2.10beta4 [April 16, 2006]</div><div class='ctx'>   Change PNG_BUILDING_LIBPNG to PNG_CONFIGURE_LIBPNG in config/Makefile*.</div><div class='ctx'> </div><div class='del'>-version 1.2.10beta5 [April 16, 2006]</div><div class='add'>+Version 1.2.10beta5 [April 16, 2006]</div><div class='ctx'>   Added a configure check for compiling assembler code in pnggccrd.c</div><div class='ctx'> </div><div class='del'>-version 1.2.10beta6 [April 17, 2006]</div><div class='add'>+Version 1.2.10beta6 [April 17, 2006]</div><div class='ctx'>   Revised the configure check for pnggccrd.c</div><div class='ctx'>   Moved -DPNG_CONFIGURE_LIBPNG into @LIBPNG_DEFINES@</div><div class='ctx'>   Added @LIBPNG_DEFINES@ to arguments when building libpng.sym</div><div class='ctx'> </div><div class='del'>-version 1.2.10beta7 [April 18, 2006]</div><div class='add'>+Version 1.2.10beta7 [April 18, 2006]</div><div class='ctx'>   Change "exec_prefix=$prefix" to "exec_prefix=$(prefix)" in makefiles.</div><div class='ctx'> </div><div class='del'>-version 1.2.10rc1 [April 19, 2006]</div><div class='add'>+Version 1.2.10rc1 [April 19, 2006]</div><div class='ctx'>   Ensure pngconf.h doesn't define both PNG_USE_PNGGCCRD and PNG_USE_PNGVCRD</div><div class='ctx'>   Fixed "LN_FS" typo in makefile.sco and makefile.solaris.</div><div class='ctx'> </div><div class='del'>-version 1.2.10rc2 [April 20, 2006]</div><div class='add'>+Version 1.2.10rc2 [April 20, 2006]</div><div class='ctx'>   Added a backslash between -DPNG_CONFIGURE_LIBPNG and -DPNG_NO_ASSEMBLER_CODE</div><div class='ctx'>    in configure.ac and configure</div><div class='ctx'>   Made the configure warning about versioned symbols less arrogant.</div><div class='ctx'> </div><div class='del'>-version 1.2.10rc3 [April 21, 2006]</div><div class='add'>+Version 1.2.10rc3 [April 21, 2006]</div><div class='ctx'>   Added a note in libpng.txt that png_set_sig_bytes(8) can be used when</div><div class='ctx'>     writing an embedded PNG without the 8-byte signature.</div><div class='ctx'>   Revised makefiles and configure to avoid making links to libpng.so.*</div><div class='ctx'> </div><div class='del'>-version 1.2.10 [April 23, 2006]</div><div class='add'>+Version 1.2.10 [April 23, 2006]</div><div class='ctx'>   Reverted configure to "rc2" state.</div><div class='ctx'> </div><div class='del'>-version 1.2.11beta1 [May 31, 2006]</div><div class='add'>+Version 1.2.11beta1 [May 31, 2006]</div><div class='ctx'>   scripts/libpng.pc.in contained "configure" style version info and would</div><div class='ctx'>     not work with makefiles.</div><div class='ctx'>   The shared-library makefiles were linking to libpng.so.0 instead of</div><div class='ctx'>     libpng.so.3 compatibility as the library.</div><div class='ctx'> </div><div class='del'>-version 1.2.11beta2 [June 2, 2006]</div><div class='add'>+Version 1.2.11beta2 [June 2, 2006]</div><div class='ctx'>   Increased sprintf buffer from 50 to 52 chars in pngrutil.c to avoid</div><div class='ctx'>     buffer overflow.</div><div class='ctx'>   Fixed bug in example.c (png_set_palette_rgb -&gt; png_set_palette_to_rgb)</div><div class='ctx'> </div><div class='del'>-version 1.2.11beta3 [June 5, 2006]</div><div class='add'>+Version 1.2.11beta3 [June 5, 2006]</div><div class='ctx'>   Prepended "#! /bin/sh" to ltmail.sh and contrib/pngminus/*.sh (Cosmin).</div><div class='ctx'>   Removed the accidental leftover Makefile.in~ (Cosmin).</div><div class='ctx'>   Avoided potential buffer overflow and optimized buffer in</div><div class='hunk'>@@ -1587,116 +1743,116 @@ version 1.2.11beta3 [June 5, 2006]</div><div class='ctx'>   Removed the include directories and libraries from CFLAGS and LDFLAGS</div><div class='ctx'>     in scripts/makefile.gcc (Nelson A. de Oliveira, Cosmin).</div><div class='ctx'> </div><div class='del'>-version 1.2.11beta4 [June 6, 2006]</div><div class='add'>+Version 1.2.11beta4 [June 6, 2006]</div><div class='ctx'>   Allow zero-length IDAT chunks after the entire zlib datastream, but not</div><div class='ctx'>     after another intervening chunk type.</div><div class='ctx'> </div><div class='del'>-version 1.0.19rc1, 1.2.11rc1 [June 13, 2006]</div><div class='add'>+Version 1.0.19rc1, 1.2.11rc1 [June 13, 2006]</div><div class='ctx'>   Deleted extraneous square brackets from [config.h] in configure.ac</div><div class='ctx'> </div><div class='del'>-version 1.0.19rc2, 1.2.11rc2 [June 14, 2006]</div><div class='add'>+Version 1.0.19rc2, 1.2.11rc2 [June 14, 2006]</div><div class='ctx'>   Added prototypes for PNG_INCH_CONVERSIONS functions to png.h</div><div class='ctx'>   Revised INSTALL and autogen.sh</div><div class='ctx'>   Fixed typo in several makefiles (-W1 should be -Wl)</div><div class='ctx'>   Added typedef for png_int_32 and png_uint_32 on 64-bit systems.</div><div class='ctx'> </div><div class='del'>-version 1.0.19rc3, 1.2.11rc3 [June 15, 2006]</div><div class='add'>+Version 1.0.19rc3, 1.2.11rc3 [June 15, 2006]</div><div class='ctx'>   Removed the new typedefs for 64-bit systems (delay until version 1.4.0)</div><div class='ctx'>   Added one zero element to png_gamma_shift[] array in pngrtran.c to avoid</div><div class='ctx'>     reading out of bounds.</div><div class='ctx'> </div><div class='del'>-version 1.0.19rc4, 1.2.11rc4 [June 15, 2006]</div><div class='add'>+Version 1.0.19rc4, 1.2.11rc4 [June 15, 2006]</div><div class='ctx'>   Really removed the new typedefs for 64-bit systems.</div><div class='ctx'> </div><div class='del'>-version 1.0.19rc5, 1.2.11rc5 [June 22, 2006]</div><div class='add'>+Version 1.0.19rc5, 1.2.11rc5 [June 22, 2006]</div><div class='ctx'>   Removed png_sig_bytes entry from scripts/pngw32.def</div><div class='ctx'> </div><div class='del'>-version 1.0.19, 1.2.11 [June 26, 2006]</div><div class='add'>+Version 1.0.19, 1.2.11 [June 26, 2006]</div><div class='ctx'>   None.</div><div class='ctx'> </div><div class='del'>-version 1.0.20, 1.2.12 [June 27, 2006]</div><div class='add'>+Version 1.0.20, 1.2.12 [June 27, 2006]</div><div class='ctx'>   Really increased sprintf buffer from 50 to 52 chars in pngrutil.c to avoid</div><div class='ctx'>     buffer overflow.</div><div class='ctx'> </div><div class='del'>-version 1.2.13beta1 [October 2, 2006]</div><div class='add'>+Version 1.2.13beta1 [October 2, 2006]</div><div class='ctx'>   Removed AC_FUNC_MALLOC from configure.ac</div><div class='ctx'>   Work around Intel-Mac compiler bug by setting PNG_NO_MMX_CODE in pngconf.h</div><div class='ctx'>   Change "logical" to "bitwise" throughout documentation.</div><div class='ctx'>   Detect and fix attempt to write wrong iCCP profile length.</div><div class='ctx'> </div><div class='del'>-version 1.0.21, 1.2.13 [November 14, 2006]</div><div class='add'>+Version 1.0.21, 1.2.13 [November 14, 2006]</div><div class='ctx'>   Fix potential buffer overflow in sPLT chunk handler.</div><div class='ctx'>   Fix Makefile.am to not try to link to noexistent files.</div><div class='ctx'>   Check all exported functions for NULL png_ptr.</div><div class='ctx'> </div><div class='del'>-version 1.2.14beta1 [November 17, 2006]</div><div class='add'>+Version 1.2.14beta1 [November 17, 2006]</div><div class='ctx'>   Relocated three misplaced tests for NULL png_ptr.</div><div class='ctx'>   Built Makefile.in with automake-1.9.6 instead of 1.9.2.</div><div class='ctx'>   Build configure with autoconf-2.60 instead of 2.59</div><div class='ctx'> </div><div class='del'>-version 1.2.14beta2 [November 17, 2006]</div><div class='add'>+Version 1.2.14beta2 [November 17, 2006]</div><div class='ctx'>   Added some typecasts in png_zalloc().</div><div class='ctx'> </div><div class='del'>-version 1.2.14rc1 [November 20, 2006]</div><div class='add'>+Version 1.2.14rc1 [November 20, 2006]</div><div class='ctx'>   Changed "strtod" to "png_strtod" in pngrutil.c</div><div class='ctx'> </div><div class='del'>-version 1.0.22, 1.2.14    [November 27, 2006]</div><div class='add'>+Version 1.0.22, 1.2.14    [November 27, 2006]</div><div class='ctx'>   Added missing "$(srcdir)" in Makefile.am and Makefile.in</div><div class='ctx'> </div><div class='del'>-version 1.2.15beta1 [December 3, 2006]</div><div class='add'>+Version 1.2.15beta1 [December 3, 2006]</div><div class='ctx'>   Generated configure with autoconf-2.61 instead of 2.60</div><div class='ctx'>   Revised configure.ac to update libpng.pc and libpng-config.</div><div class='ctx'> </div><div class='del'>-version 1.2.15beta2 [December 3, 2006]</div><div class='add'>+Version 1.2.15beta2 [December 3, 2006]</div><div class='ctx'>   Always export MMX asm functions, just stubs if not building pnggccrd.c</div><div class='ctx'> </div><div class='del'>-version 1.2.15beta3 [December 4, 2006]</div><div class='add'>+Version 1.2.15beta3 [December 4, 2006]</div><div class='ctx'>   Add "png_bytep" typecast to profile while calculating length in pngwutil.c</div><div class='ctx'> </div><div class='del'>-version 1.2.15beta4 [December 7, 2006]</div><div class='add'>+Version 1.2.15beta4 [December 7, 2006]</div><div class='ctx'>   Added scripts/CMakeLists.txt</div><div class='ctx'>   Changed PNG_NO_ASSEMBLER_CODE to PNG_NO_MMX_CODE in scripts, like 1.4.0beta</div><div class='ctx'> </div><div class='del'>-version 1.2.15beta5 [December 7, 2006]</div><div class='add'>+Version 1.2.15beta5 [December 7, 2006]</div><div class='ctx'>   Changed some instances of PNG_ASSEMBLER_* to PNG_MMX_* in pnggccrd.c</div><div class='ctx'>   Revised scripts/CMakeLists.txt</div><div class='ctx'> </div><div class='del'>-version 1.2.15beta6 [December 13, 2006]</div><div class='add'>+Version 1.2.15beta6 [December 13, 2006]</div><div class='ctx'>   Revised scripts/CMakeLists.txt and configure.ac</div><div class='ctx'> </div><div class='del'>-version 1.2.15rc1 [December 18, 2006]</div><div class='add'>+Version 1.2.15rc1 [December 18, 2006]</div><div class='ctx'>   Revised scripts/CMakeLists.txt</div><div class='ctx'> </div><div class='del'>-version 1.2.15rc2 [December 21, 2006]</div><div class='add'>+Version 1.2.15rc2 [December 21, 2006]</div><div class='ctx'>   Added conditional #undef jmpbuf in pngtest.c to undo #define in AIX headers.</div><div class='ctx'>   Added scripts/makefile.nommx</div><div class='ctx'> </div><div class='del'>-version 1.2.15rc3 [December 25, 2006]</div><div class='del'>-  Fixed shared library numbering error that was intruduced in 1.2.15beta6.</div><div class='add'>+Version 1.2.15rc3 [December 25, 2006]</div><div class='add'>+  Fixed shared library numbering error that was introduced in 1.2.15beta6.</div><div class='ctx'> </div><div class='del'>-version 1.2.15rc4 [December 27, 2006]</div><div class='add'>+Version 1.2.15rc4 [December 27, 2006]</div><div class='ctx'>   Fixed handling of rgb_to_gray when png_ptr-&gt;color.gray isn't set.</div><div class='ctx'> </div><div class='del'>-version 1.2.15rc5 [December 31, 2006]</div><div class='add'>+Version 1.2.15rc5 [December 31, 2006]</div><div class='ctx'>   Revised handling of rgb_to_gray.</div><div class='ctx'> </div><div class='del'>-version 1.2.15 [January 5, 2007]</div><div class='add'>+Version 1.2.15 [January 5, 2007]</div><div class='ctx'>   Added some (unsigned long) typecasts in pngtest.c to avoid printing errors.</div><div class='ctx'> </div><div class='del'>-version 1.2.16beta1 [January 6, 2007]</div><div class='add'>+Version 1.2.16beta1 [January 6, 2007]</div><div class='ctx'>   Fix bugs in makefile.nommx</div><div class='ctx'> </div><div class='del'>-version 1.2.16beta2 [January 16, 2007]</div><div class='add'>+Version 1.2.16beta2 [January 16, 2007]</div><div class='ctx'>   Revised scripts/CMakeLists.txt</div><div class='ctx'> </div><div class='del'>-version 1.2.16 [January 31, 2007]</div><div class='add'>+Version 1.2.16 [January 31, 2007]</div><div class='ctx'>   No changes.</div><div class='ctx'> </div><div class='del'>-version 1.2.17beta1 [March 6, 2007]</div><div class='add'>+Version 1.2.17beta1 [March 6, 2007]</div><div class='ctx'>   Revised scripts/CMakeLists.txt to install both shared and static libraries.</div><div class='ctx'>   Deleted a redundant line from pngset.c.</div><div class='ctx'> </div><div class='del'>-version 1.2.17beta2 [April 26, 2007]</div><div class='add'>+Version 1.2.17beta2 [April 26, 2007]</div><div class='ctx'>   Relocated misplaced test for png_ptr == NULL in pngpread.c</div><div class='ctx'>   Change "==" to "&amp;" for testing PNG_RGB_TO_GRAY_ERR &amp; PNG_RGB_TO_GRAY_WARN</div><div class='ctx'>     flags.</div><div class='hunk'>@@ -1705,10 +1861,10 @@ version 1.2.17beta2 [April 26, 2007]</div><div class='ctx'>   Added "const" to some array declarations.</div><div class='ctx'>   Mention examples of libpng usage in the libpng*.txt and libpng.3 documents.</div><div class='ctx'> </div><div class='del'>-version 1.2.17rc1 [May 4, 2007]</div><div class='add'>+Version 1.2.17rc1 [May 4, 2007]</div><div class='ctx'>   No changes.</div><div class='ctx'> </div><div class='del'>-version 1.2.17rc2 [May 8, 2007]</div><div class='add'>+Version 1.2.17rc2 [May 8, 2007]</div><div class='ctx'>   Moved several PNG_HAVE_* macros out of PNG_INTERNAL because applications</div><div class='ctx'>     calling set_unknown_chunk_location() need them.</div><div class='ctx'>   Changed transformation flag from PNG_EXPAND_tRNS to PNG_EXPAND in</div><div class='hunk'>@@ -1717,64 +1873,64 @@ version 1.2.17rc2 [May 8, 2007]</div><div class='ctx'>     can be free'ed in case of error.  Revised unknown chunk handling in</div><div class='ctx'>     pngrutil.c and pngpread.c to use this structure.</div><div class='ctx'> </div><div class='del'>-version 1.2.17rc3 [May 8, 2007]</div><div class='add'>+Version 1.2.17rc3 [May 8, 2007]</div><div class='ctx'>   Revised symbol-handling in configure script.</div><div class='ctx'> </div><div class='del'>-version 1.2.17rc4 [May 10, 2007]</div><div class='add'>+Version 1.2.17rc4 [May 10, 2007]</div><div class='ctx'>   Revised unknown chunk handling to avoid storing unknown critical chunks.</div><div class='ctx'> </div><div class='del'>-version 1.0.25 [May 15, 2007]</div><div class='del'>-version 1.2.17 [May 15, 2007]</div><div class='add'>+Version 1.0.25 [May 15, 2007]</div><div class='add'>+Version 1.2.17 [May 15, 2007]</div><div class='ctx'>   Added "png_ptr-&gt;num_trans=0" before error return in png_handle_tRNS,</div><div class='ctx'>     to eliminate a vulnerability (CVE-2007-2445, CERT VU#684664)</div><div class='ctx'> </div><div class='del'>-version 1.0.26 [May 15, 2007]</div><div class='del'>-version 1.2.18 [May 15, 2007]</div><div class='add'>+Version 1.0.26 [May 15, 2007]</div><div class='add'>+Version 1.2.18 [May 15, 2007]</div><div class='ctx'>   Reverted the libpng-1.2.17rc3 change to symbol-handling in configure script</div><div class='ctx'> </div><div class='del'>-version 1.2.19beta1 [May 18, 2007]</div><div class='add'>+Version 1.2.19beta1 [May 18, 2007]</div><div class='ctx'>   Changed "const static" to "static PNG_CONST" everywhere, mostly undoing</div><div class='ctx'>     change of libpng-1.2.17beta2.  Changed other "const" to "PNG_CONST"</div><div class='ctx'>   Changed some handling of unused parameters, to avoid compiler warnings.</div><div class='ctx'>     "if (unused == NULL) return;" becomes "unused = unused".</div><div class='ctx'> </div><div class='del'>-version 1.2.19beta2 [May 18, 2007]</div><div class='add'>+Version 1.2.19beta2 [May 18, 2007]</div><div class='ctx'>   Only use the valid bits of tRNS value in png_do_expand() (Brian Cartier)</div><div class='ctx'> </div><div class='del'>-version 1.2.19beta3 [May 19, 2007]</div><div class='add'>+Version 1.2.19beta3 [May 19, 2007]</div><div class='ctx'>   Add some "png_byte" typecasts in png_check_keyword() and write new_key</div><div class='ctx'>   instead of key in zTXt chunk (Kevin Ryde).</div><div class='ctx'> </div><div class='del'>-version 1.2.19beta4 [May 21, 2007]</div><div class='add'>+Version 1.2.19beta4 [May 21, 2007]</div><div class='ctx'>   Add png_snprintf() function and use it in place of sprint() for improved</div><div class='ctx'>     defense against buffer overflows.</div><div class='ctx'> </div><div class='del'>-version 1.2.19beta5 [May 21, 2007]</div><div class='add'>+Version 1.2.19beta5 [May 21, 2007]</div><div class='ctx'>   Fixed png_handle_tRNS() to only use the valid bits of tRNS value.</div><div class='ctx'>   Changed handling of more unused parameters, to avoid compiler warnings.</div><div class='ctx'>   Removed some PNG_CONST in pngwutil.c to avoid compiler warnings.</div><div class='ctx'> </div><div class='del'>-version 1.2.19beta6 [May 22, 2007]</div><div class='add'>+Version 1.2.19beta6 [May 22, 2007]</div><div class='ctx'>   Added some #ifdef PNG_MMX_CODE_SUPPORTED where needed in pngvcrd.c</div><div class='ctx'>   Added a special "_MSC_VER" case that defines png_snprintf to _snprintf</div><div class='ctx'> </div><div class='del'>-version 1.2.19beta7 [May 22, 2007]</div><div class='add'>+Version 1.2.19beta7 [May 22, 2007]</div><div class='ctx'>   Squelched png_squelch_warnings() in pnggccrd.c and added</div><div class='ctx'>     an #ifdef PNG_MMX_CODE_SUPPORTED block around the declarations that caused</div><div class='ctx'>     the warnings that png_squelch_warnings was squelching.</div><div class='ctx'> </div><div class='del'>-version 1.2.19beta8 [May 22, 2007]</div><div class='add'>+Version 1.2.19beta8 [May 22, 2007]</div><div class='ctx'>   Removed __MMX__ from test in pngconf.h.</div><div class='ctx'> </div><div class='del'>-version 1.2.19beta9 [May 23, 2007]</div><div class='add'>+Version 1.2.19beta9 [May 23, 2007]</div><div class='ctx'>   Made png_squelch_warnings() available via PNG_SQUELCH_WARNINGS macro.</div><div class='ctx'>   Revised png_squelch_warnings() so it might work.</div><div class='ctx'>   Updated makefile.sgcc and makefile.solaris; added makefile.solaris-x86.</div><div class='ctx'> </div><div class='del'>-version 1.2.19beta10 [May 24, 2007]</div><div class='add'>+Version 1.2.19beta10 [May 24, 2007]</div><div class='ctx'>   Resquelched png_squelch_warnings(), use "__attribute__((used))" instead.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta1 [April 20, 2006]</div><div class='add'>+Version 1.4.0beta1 [April 20, 2006]</div><div class='ctx'>   Enabled iTXt support (changes png_struct, thus requires so-number change).</div><div class='ctx'>   Cleaned up PNG_ASSEMBLER_CODE_SUPPORTED vs PNG_MMX_CODE_SUPPORTED</div><div class='ctx'>   Eliminated PNG_1_0_X and PNG_1_2_X macros.</div><div class='hunk'>@@ -1786,12 +1942,12 @@ version 1.4.0beta1 [April 20, 2006]</div><div class='ctx'>   Reduced dependency on C-runtime library when on Windows (Simon-Pierre)</div><div class='ctx'>   Replaced sprintf() with png_sprintf() (Simon-Pierre)</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta2 [April 20, 2006]</div><div class='add'>+Version 1.4.0beta2 [April 20, 2006]</div><div class='ctx'>   Revised makefiles and configure to avoid making links to libpng.so.*</div><div class='ctx'>   Moved some leftover MMX-related defines from pngconf.h to pngintrn.h</div><div class='ctx'>   Updated scripts/pngos2.def, pngw32.def, and projects/wince/png32ce.def</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta3 [May 10, 2006]</div><div class='add'>+Version 1.4.0beta3 [May 10, 2006]</div><div class='ctx'>   Updated scripts/pngw32.def to comment out MMX functions.</div><div class='ctx'>   Added PNG_NO_GET_INT_32 and PNG_NO_SAVE_INT_32 macros.</div><div class='ctx'>   Scripts/libpng.pc.in contained "configure" style version info and would</div><div class='hunk'>@@ -1799,21 +1955,21 @@ version 1.4.0beta3 [May 10, 2006]</div><div class='ctx'>   Revised pngconf.h and added pngconf.h.in, so makefiles and configure can</div><div class='ctx'>     pass defines to libpng and applications.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta4 [May 11, 2006]</div><div class='add'>+Version 1.4.0beta4 [May 11, 2006]</div><div class='ctx'>   Revised configure.ac, Makefile.am, and many of the makefiles to write</div><div class='ctx'>     their defines in pngconf.h.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta5 [May 15, 2006]</div><div class='add'>+Version 1.4.0beta5 [May 15, 2006]</div><div class='ctx'>   Added a missing semicolon in Makefile.am and Makefile.in</div><div class='ctx'>   Deleted extraneous square brackets from configure.ac</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta6 [June 2, 2006]</div><div class='add'>+Version 1.4.0beta6 [June 2, 2006]</div><div class='ctx'>   Increased sprintf buffer from 50 to 52 chars in pngrutil.c to avoid</div><div class='ctx'>     buffer overflow.</div><div class='ctx'>   Changed sonum from 0 to 1.</div><div class='ctx'>   Removed unused prototype for png_check_sig() from png.h</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta7 [June 16, 2006]</div><div class='add'>+Version 1.4.0beta7 [June 16, 2006]</div><div class='ctx'>   Exported png_write_sig (Cosmin).</div><div class='ctx'>   Optimized buffer in png_handle_cHRM() (Cosmin).</div><div class='ctx'>   Set pHYs = 2835 x 2835 pixels per meter, and added</div><div class='hunk'>@@ -1822,11 +1978,11 @@ version 1.4.0beta7 [June 16, 2006]</div><div class='ctx'>   Added typedef for png_int_32 and png_uint_32 on 64-bit systems.</div><div class='ctx'>   Added "(unsigned long)" typecast on png_uint_32 variables in printf lists.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta8 [June 22, 2006]</div><div class='add'>+Version 1.4.0beta8 [June 22, 2006]</div><div class='ctx'>   Added demonstration of user chunk support in pngtest.c, to support the</div><div class='ctx'>     public sTER chunk and a private vpAg chunk.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta9 [July 3, 2006]</div><div class='add'>+Version 1.4.0beta9 [July 3, 2006]</div><div class='ctx'>   Removed ordinals from scripts/pngw32.def and removed png_info_int and</div><div class='ctx'>     png_set_gray_1_2_4_to_8 entries.</div><div class='ctx'>   Inline call of png_get_uint_32() in png_get_uint_31().</div><div class='hunk'>@@ -1834,14 +1990,14 @@ version 1.4.0beta9 [July 3, 2006]</div><div class='ctx'>   Removed WINCE and Netware projects.</div><div class='ctx'>   Removed standalone Y2KINFO file.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta10 [July 12, 2006]</div><div class='add'>+Version 1.4.0beta10 [July 12, 2006]</div><div class='ctx'>   Eliminated automatic copy of pngconf.h to pngconf.h.in from configure and</div><div class='ctx'>     some makefiles, because it was not working reliably.  Instead, distribute</div><div class='ctx'>     pngconf.h.in along with pngconf.h and cause configure and some of the</div><div class='ctx'>     makefiles to update pngconf.h from pngconf.h.in.</div><div class='ctx'>   Added pngconf.h to DEPENDENCIES in Makefile.am</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta11 [August 19, 2006]</div><div class='add'>+Version 1.4.0beta11 [August 19, 2006]</div><div class='ctx'>   Removed AC_FUNC_MALLOC from configure.ac.</div><div class='ctx'>   Added a warning when writing iCCP profile with mismatched profile length.</div><div class='ctx'>   Patched pnggccrd.c to assemble on x86_64 platforms.</div><div class='hunk'>@@ -1886,41 +2042,41 @@ version 1.4.0beta11 [August 19, 2006]</div><div class='ctx'>     pngconf.h.in (Glenn).</div><div class='ctx'>   Detect and fix attempt to write wrong iCCP profile length.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta12 [October 19, 2006]</div><div class='add'>+Version 1.4.0beta12 [October 19, 2006]</div><div class='ctx'>   Changed "logical" to "bitwise" in the documentation.</div><div class='ctx'>   Work around Intel-Mac compiler bug by setting PNG_NO_MMX_CODE in pngconf.h</div><div class='ctx'>   Add a typecast to stifle compiler warning in pngrutil.c</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta13 [November 10, 2006]</div><div class='add'>+Version 1.4.0beta13 [November 10, 2006]</div><div class='ctx'>   Fix potential buffer overflow in sPLT chunk handler.</div><div class='ctx'>   Fix Makefile.am to not try to link to noexistent files.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta14 [November 15, 2006]</div><div class='add'>+Version 1.4.0beta14 [November 15, 2006]</div><div class='ctx'>   Check all exported functions for NULL png_ptr.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta15 [November 17, 2006]</div><div class='add'>+Version 1.4.0beta15 [November 17, 2006]</div><div class='ctx'>   Relocated two misplaced tests for NULL png_ptr.</div><div class='ctx'>   Built Makefile.in with automake-1.9.6 instead of 1.9.2.</div><div class='ctx'>   Build configure with autoconf-2.60 instead of 2.59</div><div class='ctx'>   Add "install: all" in Makefile.am so "configure; make install" will work.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta16 [November 17, 2006]</div><div class='add'>+Version 1.4.0beta16 [November 17, 2006]</div><div class='ctx'>   Added a typecast in png_zalloc().</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta17 [December 4, 2006]</div><div class='add'>+Version 1.4.0beta17 [December 4, 2006]</div><div class='ctx'>   Changed "new_key[79] = '\0';" to "(*new_key)[79] = '\0';" in pngwutil.c</div><div class='ctx'>   Add "png_bytep" typecast to profile while calculating length in pngwutil.c</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta18 [December 7, 2006]</div><div class='add'>+Version 1.4.0beta18 [December 7, 2006]</div><div class='ctx'>   Added scripts/CMakeLists.txt</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta19 [May 16, 2007]</div><div class='add'>+Version 1.4.0beta19 [May 16, 2007]</div><div class='ctx'>   Revised scripts/CMakeLists.txt</div><div class='ctx'>   Rebuilt configure and Makefile.in with newer tools.</div><div class='ctx'>   Added conditional #undef jmpbuf in pngtest.c to undo #define in AIX headers.</div><div class='ctx'>   Added scripts/makefile.nommx</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta20 [July 9, 2008]</div><div class='add'>+Version 1.4.0beta20 [July 9, 2008]</div><div class='ctx'>   Moved several PNG_HAVE_* macros from pngpriv.h to png.h because applications</div><div class='ctx'>     calling set_unknown_chunk_location() need them.</div><div class='ctx'>   Moved several macro definitions from pngpriv.h to pngconf.h</div><div class='hunk'>@@ -1928,19 +2084,19 @@ version 1.4.0beta20 [July 9, 2008]</div><div class='ctx'>   Deleted all use of the MMX assembler code and Intel-licensed optimizations.</div><div class='ctx'>   Revised makefile.mingw</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta21 [July 21, 2008]</div><div class='add'>+Version 1.4.0beta21 [July 21, 2008]</div><div class='ctx'>   Moved local array "chunkdata" from pngrutil.c to the png_struct, so</div><div class='ctx'>     it will be freed by png_read_destroy() in case of a read error (Kurt</div><div class='ctx'>     Christensen).</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta22 [July 21, 2008]</div><div class='add'>+Version 1.4.0beta22 [July 21, 2008]</div><div class='ctx'>   Change "purpose" and "buffer" to png_ptr-&gt;chunkdata to avoid memory leaking.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta23 [July 22, 2008]</div><div class='add'>+Version 1.4.0beta23 [July 22, 2008]</div><div class='ctx'>   Change "chunkdata = NULL" to "png_ptr-&gt;chunkdata = NULL" several places in</div><div class='ctx'>     png_decompress_chunk().</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta24 [July 25, 2008]</div><div class='add'>+Version 1.4.0beta24 [July 25, 2008]</div><div class='ctx'>   Change all remaining "chunkdata" to "png_ptr-&gt;chunkdata" in</div><div class='ctx'>     png_decompress_chunk(), and remove "chunkdata" from parameter list.</div><div class='ctx'>   Put a call to png_check_chunk_name() in png_read_chunk_header().</div><div class='hunk'>@@ -1948,7 +2104,7 @@ version 1.4.0beta24 [July 25, 2008]</div><div class='ctx'>   Removed two calls to png_check_chunk_name() occuring later in the process.</div><div class='ctx'>   Define PNG_NO_ERROR_NUMBERS by default in pngconf.h</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta25 [July 30, 2008]</div><div class='add'>+Version 1.4.0beta25 [July 30, 2008]</div><div class='ctx'>   Added a call to png_check_chunk_name() in pngpread.c</div><div class='ctx'>   Reverted png_check_chunk_name() to accept a name with a lowercase 3rd byte.</div><div class='ctx'>   Added png_push_have_buffer() function to pngpread.c</div><div class='hunk'>@@ -1959,7 +2115,7 @@ version 1.4.0beta25 [July 30, 2008]</div><div class='ctx'>   Eliminated no-longer-used pngdefs.h (but it's still built in the makefiles)</div><div class='ctx'>   Relocated a misplaced "#endif /* PNG_NO_WRITE_FILTER */" in pngwutil.c</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta26 [August 4, 2008]</div><div class='add'>+Version 1.4.0beta26 [August 4, 2008]</div><div class='ctx'>   Removed png_push_have_buffer() function in pngpread.c.  It increased the</div><div class='ctx'>     compiled library size slightly.</div><div class='ctx'>   Changed "-Wall" to "-W -Wall" in the CFLAGS in all makefiles (Cosmin Truta)</div><div class='hunk'>@@ -1967,102 +2123,105 @@ version 1.4.0beta26 [August 4, 2008]</div><div class='ctx'>   Updated contrib/visupng/cexcept.h to version 2.0.1</div><div class='ctx'>   Added PNG_LITERAL_CHARACTER macros for #, [, and ].</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta27 [August 5, 2008]</div><div class='add'>+Version 1.4.0beta27 [August 5, 2008]</div><div class='ctx'>   Revised usage of PNG_LITERAL_SHARP in pngerror.c.</div><div class='ctx'>   Moved newline character from individual png_debug messages into the</div><div class='ctx'>     png_debug macros.</div><div class='ctx'>   Allow user to #define their own png_debug, png_debug1, and png_debug2.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta28 [August 5, 2008]</div><div class='add'>+Version 1.4.0beta28 [August 5, 2008]</div><div class='ctx'>   Revised usage of PNG_LITERAL_SHARP in pngerror.c.</div><div class='ctx'>   Added PNG_STRING_NEWLINE macro</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta29 [August 9, 2008]</div><div class='add'>+Version 1.4.0beta29 [August 9, 2008]</div><div class='ctx'>   Revised usage of PNG_STRING_NEWLINE to work on non-ISO compilers.</div><div class='ctx'>   Added PNG_STRING_COPYRIGHT macro.</div><div class='ctx'>   Added non-ISO versions of png_debug macros.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta30 [August 14, 2008]</div><div class='add'>+Version 1.4.0beta30 [August 14, 2008]</div><div class='ctx'>   Added premultiplied alpha feature (Volker Wiendl).</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta31 [August 18, 2008]</div><div class='add'>+Version 1.4.0beta31 [August 18, 2008]</div><div class='ctx'>   Moved png_set_premultiply_alpha from pngtrans.c to pngrtran.c</div><div class='ctx'>   Removed extra crc check at the end of png_handle_cHRM().  Bug introduced</div><div class='ctx'>     in libpng-1.4.0beta20.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta32 [August 19, 2008]</div><div class='add'>+Version 1.4.0beta32 [August 19, 2008]</div><div class='ctx'>   Added PNG_WRITE_FLUSH_SUPPORTED block around new png_flush() call.</div><div class='ctx'>   Revised PNG_NO_STDIO version of png_write_flush()</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta33 [August 20, 2008]</div><div class='add'>+Version 1.4.0beta33 [August 20, 2008]</div><div class='ctx'>   Added png_get|set_chunk_cache_max() to limit the total number of sPLT,</div><div class='ctx'>     text, and unknown chunks that can be stored.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta34 [September 6, 2008]</div><div class='add'>+Version 1.4.0beta34 [September 6, 2008]</div><div class='ctx'>   Shortened tIME_string to 29 bytes in pngtest.c</div><div class='ctx'>   Fixed off-by-one error introduced in png_push_read_zTXt() function in</div><div class='ctx'>     libpng-1.2.30beta04/pngpread.c (Harald van Dijk)</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta35 [October 6, 2008]</div><div class='add'>+Version 1.4.0beta35 [October 6, 2008]</div><div class='ctx'>   Changed "trans_values" to "trans_color".</div><div class='ctx'>   Changed so-number from 0 to 14.  Some OS do not like 0.</div><div class='ctx'>   Revised makefile.darwin to fix shared library numbering.</div><div class='ctx'>   Change png_set_gray_1_2_4_to_8() to png_set_expand_gray_1_2_4_to_8()</div><div class='ctx'>     in example.c (debian bug report)</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta36 [October 25, 2008]</div><div class='add'>+Version 1.4.0beta36 [October 25, 2008]</div><div class='ctx'>   Sync with tEXt vulnerability fix in libpng-1.2.33rc02.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta37 [November 13, 2008]</div><div class='add'>+Version 1.4.0beta37 [November 13, 2008]</div><div class='ctx'>   Added png_check_cHRM in png.c and moved checking from pngget.c, pngrutil.c,</div><div class='ctx'>     and pngwrite.c</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta38 [November 22, 2008]</div><div class='add'>+Version 1.4.0beta38 [November 22, 2008]</div><div class='ctx'>   Added check for zero-area RGB cHRM triangle in png_check_cHRM() and</div><div class='ctx'>     png_check_cHRM_fixed().</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta39 [November 23, 2008]</div><div class='add'>+Version 1.4.0beta39 [November 23, 2008]</div><div class='ctx'>   Revised png_warning() to write its message on standard output by default</div><div class='ctx'>     when warning_fn is NULL.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta40 [November 24, 2008]</div><div class='add'>+Version 1.4.0beta40 [November 24, 2008]</div><div class='ctx'>   Eliminated png_check_cHRM().  Instead, always use png_check_cHRM_fixed().</div><div class='ctx'>   In png_check_cHRM_fixed(), ensure white_y is &gt; 0, and removed redundant</div><div class='ctx'>     check for all-zero coordinates that is detected by the triangle check.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta41 [November 26, 2008]</div><div class='add'>+Version 1.4.0beta41 [November 26, 2008]</div><div class='ctx'>   Fixed string vs pointer-to-string error in png_check_keyword().</div><div class='ctx'>   Rearranged test expressions in png_check_cHRM_fixed() to avoid internal</div><div class='ctx'>     overflows.</div><div class='ctx'>   Added PNG_NO_CHECK_cHRM conditional.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta42, 43 [December 1, 2008]</div><div class='add'>+Version 1.4.0beta42, 43 [December 1, 2008]</div><div class='ctx'>   Merge png_debug with version 1.2.34beta04.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta44 [December 6, 2008]</div><div class='add'>+Version 1.4.0beta44 [December 6, 2008]</div><div class='ctx'>   Removed redundant check for key==NULL before calling png_check_keyword()</div><div class='ctx'>     to ensure that new_key gets initialized and removed extra warning</div><div class='ctx'>     (Merge with version 1.2.34beta05 -- Arvan Pritchard).</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta45 [December 9, 2008]</div><div class='add'>+Version 1.4.0beta45 [December 9, 2008]</div><div class='ctx'>   In png_write_png(), respect the placement of the filler bytes in an earlier</div><div class='ctx'>     call to png_set_filler() (Jim Barry).</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta46 [December 10, 2008]</div><div class='add'>+Version 1.4.0beta46 [December 10, 2008]</div><div class='ctx'>   Undid previous change and added PNG_TRANSFORM_STRIP_FILLER_BEFORE and</div><div class='ctx'>     PNG_TRANSFORM_STRIP_FILLER_AFTER conditionals and deprecated</div><div class='ctx'>     PNG_TRANSFORM_STRIP_FILLER (Jim Barry).</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta47 [December 15, 2008]</div><div class='del'>-  Turned off PNG_READ_DITHER_SUPPORTED by default.</div><div class='add'>+Version 1.4.0beta47 [December 15, 2008]</div><div class='add'>+  Support for dithering was disabled by default, because it has never</div><div class='add'>+    been well tested and doesn't work very well.  The code has not</div><div class='add'>+    been removed, however, and can be enabled by building libpng with</div><div class='add'>+    PNG_READ_DITHER_SUPPORTED defined.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta48 [February 14, 2009]</div><div class='add'>+Version 1.4.0beta48 [February 14, 2009]</div><div class='ctx'>   Added new exported function png_calloc().</div><div class='ctx'>   Combined several instances of png_malloc(); png_memset() into png_calloc().</div><div class='ctx'>   Removed prototype for png_freeptr() that was added in libpng-1.4.0beta24</div><div class='ctx'>     but was never defined.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta49 [February 28, 2009]</div><div class='add'>+Version 1.4.0beta49 [February 28, 2009]</div><div class='ctx'>   Added png_fileno() macro to pngconf.h, used in pngwio.c</div><div class='ctx'>   Corrected order of #ifdef's in png_debug definition in png.h</div><div class='ctx'>   Fixed bug introduced in libpng-1.4.0beta48 with the memset arguments</div><div class='hunk'>@@ -2071,7 +2230,7 @@ version 1.4.0beta49 [February 28, 2009]</div><div class='ctx'>     (bug introduced in libpng-1.2.34/1.4.0beta29).</div><div class='ctx'>   Revised comments in png_set_read_fn() and png_set_write_fn().</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta50 [March 18, 2009]</div><div class='add'>+Version 1.4.0beta50 [March 18, 2009]</div><div class='ctx'>   Use png_calloc() instead of png_malloc() to allocate big_row_buf when</div><div class='ctx'>     reading an interlaced file, to avoid a possible UMR.</div><div class='ctx'>   Undid revision of PNG_NO_STDIO version of png_write_flush().  Users</div><div class='hunk'>@@ -2082,21 +2241,21 @@ version 1.4.0beta50 [March 18, 2009]</div><div class='ctx'>   Removed fflush() from pngtest.c.</div><div class='ctx'>   Added "#define PNG_NO_WRITE_FLUSH" to contrib/pngminim/encoder/pngusr.h</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta51 [March 21, 2009]</div><div class='add'>+Version 1.4.0beta51 [March 21, 2009]</div><div class='ctx'>   Removed new png_fileno() macro from pngconf.h .</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta52 [March 27, 2009]</div><div class='add'>+Version 1.4.0beta52 [March 27, 2009]</div><div class='ctx'>   Relocated png_do_chop() ahead of building gamma tables in pngrtran.c</div><div class='ctx'>     This avoids building 16-bit gamma tables unnecessarily.</div><div class='ctx'>   Removed fflush() from pngtest.c.</div><div class='ctx'>   Added "#define PNG_NO_WRITE_FLUSH" to contrib/pngminim/encoder/pngusr.h</div><div class='ctx'>   Added a section on differences between 1.0.x and 1.2.x to libpng.3/libpng.txt</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta53 [April 1, 2009]</div><div class='add'>+Version 1.4.0beta53 [April 1, 2009]</div><div class='ctx'>   Removed some remaining MMX macros from pngpriv.h</div><div class='ctx'>   Fixed potential memory leak of "new_name" in png_write_iCCP() (Ralph Giles)</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta54 [April 13, 2009]</div><div class='add'>+Version 1.4.0beta54 [April 13, 2009]</div><div class='ctx'>   Added "ifndef PNG_SKIP_SETJMP_CHECK" block in pngconf.h to allow</div><div class='ctx'>     application code writers to bypass the check for multiple inclusion</div><div class='ctx'>     of setjmp.h when they know that it is safe to ignore the situation.</div><div class='hunk'>@@ -2105,54 +2264,54 @@ version 1.4.0beta54 [April 13, 2009]</div><div class='ctx'>     pngtest now produces, and made some cosmetic changes to pngtest output.</div><div class='ctx'>   Eliminated deprecated png_read_init_3() and png_write_init_3() functions.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta55 [April 15, 2009]</div><div class='add'>+Version 1.4.0beta55 [April 15, 2009]</div><div class='ctx'>   Simplified error handling in pngread.c and pngwrite.c by putting</div><div class='ctx'>     the new png_read_cleanup() and png_write_cleanup() functions inline.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta56 [April 25, 2009]</div><div class='add'>+Version 1.4.0beta56 [April 25, 2009]</div><div class='ctx'>   Renamed "user_chunk_data" to "my_user_chunk_data" in pngtest.c to suppress</div><div class='ctx'>     "shadowed declaration" warning from gcc-4.3.3.</div><div class='ctx'>   Renamed "gamma" to "png_gamma" in pngset.c to avoid "shadowed declaration"</div><div class='ctx'>     warning about a global "gamma" variable in math.h on some platforms.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta57 [May 2, 2009]</div><div class='add'>+Version 1.4.0beta57 [May 2, 2009]</div><div class='ctx'>   Removed prototype for png_freeptr() that was added in libpng-1.4.0beta24</div><div class='ctx'>     but was never defined (again).</div><div class='ctx'>   Rebuilt configure scripts with autoconf-2.63 instead of 2.62</div><div class='ctx'>   Removed pngprefs.h and MMX from makefiles</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta58 [May 14, 2009]</div><div class='del'>-  Changed pngw32.def to pngwin.def in makefile.mingw (typo was intruduced</div><div class='add'>+Version 1.4.0beta58 [May 14, 2009]</div><div class='add'>+  Changed pngw32.def to pngwin.def in makefile.mingw (typo was introduced</div><div class='ctx'>     in beta57).</div><div class='ctx'>   Clarified usage of sig_bit versus sig_bit_p in example.c (Vincent Torri)</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta59 [May 15, 2009]</div><div class='add'>+Version 1.4.0beta59 [May 15, 2009]</div><div class='ctx'>   Reformated sources in libpng style (3-space intentation, comment format)</div><div class='ctx'>   Fixed typo in libpng docs (PNG_FILTER_AVE should be PNG_FILTER_AVG)</div><div class='ctx'>   Added sections about the git repository and our coding style to the</div><div class='ctx'>     documentation</div><div class='ctx'>   Relocated misplaced #endif in pngwrite.c, sCAL chunk handler.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta60 [May 19, 2009]</div><div class='add'>+Version 1.4.0beta60 [May 19, 2009]</div><div class='ctx'>   Conditionally compile png_read_finish_row() which is not used by</div><div class='ctx'>     progressive readers.</div><div class='ctx'>   Added contrib/pngminim/preader to demonstrate building minimal progressive</div><div class='ctx'>     decoder, based on contrib/gregbook with embedded libpng and zlib.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta61 [May 20, 2009]</div><div class='add'>+Version 1.4.0beta61 [May 20, 2009]</div><div class='ctx'>   In contrib/pngminim/*, renamed "makefile.std" to "makefile", since there</div><div class='ctx'>     is only one makefile in those directories, and revised the README files</div><div class='ctx'>     accordingly.</div><div class='ctx'>   More reformatting of comments, mostly to capitalize sentences.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta62 [June 2, 2009]</div><div class='add'>+Version 1.4.0beta62 [June 2, 2009]</div><div class='ctx'>   Added "#define PNG_NO_WRITE_SWAP" to contrib/pngminim/encoder/pngusr.h</div><div class='ctx'>     and "define PNG_NO_READ_SWAP" to decoder/pngusr.h and preader/pngusr.h</div><div class='ctx'>   Reformatted several remaining "else statement" into two lines.</div><div class='ctx'>   Added a section to the libpng documentation about using png_get_io_ptr()</div><div class='ctx'>     in configure scripts to detect the presence of libpng.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta63 [June 15, 2009]</div><div class='add'>+Version 1.4.0beta63 [June 15, 2009]</div><div class='ctx'>   Revised libpng*.txt and libpng.3 to mention calling png_set_IHDR()</div><div class='ctx'>     multiple times and to specify the sample order in the tRNS chunk,</div><div class='ctx'>     because the ISO PNG specification has a typo in the tRNS table.</div><div class='hunk'>@@ -2162,26 +2321,26 @@ version 1.4.0beta63 [June 15, 2009]</div><div class='ctx'>   Adopted preference for consistent use of "#ifdef" and "#ifndef" versus</div><div class='ctx'>     "#if defined()" and "if !defined()" where possible.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta64 [June 24, 2009]</div><div class='add'>+Version 1.4.0beta64 [June 24, 2009]</div><div class='ctx'>   Eliminated PNG_LEGACY_SUPPORTED code.</div><div class='ctx'>   Moved the various unknown chunk macro definitions outside of the</div><div class='ctx'>      PNG_READ|WRITE_ANCILLARY_CHUNK_SUPPORTED blocks.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta65 [June 26, 2009]</div><div class='add'>+Version 1.4.0beta65 [June 26, 2009]</div><div class='ctx'>   Added a reference to the libpng license in each file.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta66 [June 27, 2009]</div><div class='add'>+Version 1.4.0beta66 [June 27, 2009]</div><div class='ctx'>   Refer to the libpng license instead of the libpng license in each file.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta67 [July 6, 2009]</div><div class='add'>+Version 1.4.0beta67 [July 6, 2009]</div><div class='ctx'>   Relocated INVERT_ALPHA within png_read_png() and png_write_png().</div><div class='ctx'>   Added high-level API transform PNG_TRANSFORM_GRAY_TO_RGB.</div><div class='ctx'>   Added an "xcode" project to the projects directory (Alam Arias).</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta68 [July 19, 2009]</div><div class='add'>+Version 1.4.0beta68 [July 19, 2009]</div><div class='ctx'>   Avoid some tests in filter selection in pngwutil.c</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta69 [July 25, 2009]</div><div class='add'>+Version 1.4.0beta69 [July 25, 2009]</div><div class='ctx'>   Simplified the new filter-selection test.  This runs faster in the</div><div class='ctx'>     common "PNG_ALL_FILTERS" and PNG_FILTER_NONE cases.</div><div class='ctx'>   Removed extraneous declaration from the new call to png_read_gray_to_rgb()</div><div class='hunk'>@@ -2189,54 +2348,54 @@ version 1.4.0beta69 [July 25, 2009]</div><div class='ctx'>   Fixed up xcode project (Alam Arias)</div><div class='ctx'>   Added a prototype for png_64bit_product() in png.c</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta70 [July 27, 2009]</div><div class='add'>+Version 1.4.0beta70 [July 27, 2009]</div><div class='ctx'>   Avoid a possible NULL dereference in debug build, in png_set_text_2().</div><div class='ctx'>     (bug introduced in libpng-0.95, discovered by Evan Rouault)</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta71 [July 29, 2009]</div><div class='add'>+Version 1.4.0beta71 [July 29, 2009]</div><div class='ctx'>   Rebuilt configure scripts with autoconf-2.64.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta72 [August 1, 2009]</div><div class='add'>+Version 1.4.0beta72 [August 1, 2009]</div><div class='ctx'>   Replaced *.tar.lzma with *.tar.xz in distribution.  Get the xz codec</div><div class='ctx'>     from &lt;http://tukaani.org/xz&gt;.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta73 [August 1, 2009]</div><div class='add'>+Version 1.4.0beta73 [August 1, 2009]</div><div class='ctx'>   Reject attempt to write iCCP chunk with negative embedded profile length</div><div class='ctx'>     (JD Chen)</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta74 [August 8, 2009]</div><div class='add'>+Version 1.4.0beta74 [August 8, 2009]</div><div class='ctx'>   Changed png_ptr and info_ptr member "trans" to "trans_alpha".</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta75 [August 21, 2009]</div><div class='add'>+Version 1.4.0beta75 [August 21, 2009]</div><div class='ctx'>   Removed an extra png_debug() recently added to png_write_find_filter().</div><div class='ctx'>   Fixed incorrect #ifdef in pngset.c regarding unknown chunk support.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta76 [August 22, 2009]</div><div class='add'>+Version 1.4.0beta76 [August 22, 2009]</div><div class='ctx'>   Moved an incorrectly located test in png_read_row() in pngread.c</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta77 [August 27, 2009]</div><div class='add'>+Version 1.4.0beta77 [August 27, 2009]</div><div class='ctx'>   Removed lpXYZ.tar.bz2 (with CRLF), KNOWNBUG, libpng-x.y.z-KNOWNBUG.txt,</div><div class='ctx'>     and the "noconfig" files from the distribution.</div><div class='ctx'>   Moved CMakeLists.txt from scripts into the main libpng directory.</div><div class='ctx'>   Various bugfixes and improvements to CMakeLists.txt (Philip Lowman)</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta78 [August 31, 2009]</div><div class='add'>+Version 1.4.0beta78 [August 31, 2009]</div><div class='ctx'>   Converted all PNG_NO_* tests to PNG_*_SUPPORTED everywhere except pngconf.h</div><div class='ctx'>   Eliminated PNG_NO_FREE_ME and PNG_FREE_ME_SUPPORTED macros.</div><div class='ctx'>   Use png_malloc plus a loop instead of png_calloc() to initialize</div><div class='ctx'>     row_pointers in png_read_png().</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta79 [September 1, 2009]</div><div class='add'>+Version 1.4.0beta79 [September 1, 2009]</div><div class='ctx'>   Eliminated PNG_GLOBAL_ARRAYS and PNG_LOCAL_ARRAYS; always use local arrays.</div><div class='ctx'>   Eliminated PNG_CALLOC_SUPPORTED macro and always provide png_calloc().</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta80 [September 17, 2009]</div><div class='add'>+Version 1.4.0beta80 [September 17, 2009]</div><div class='ctx'>   Removed scripts/libpng.icc</div><div class='ctx'>   Changed typecast of filler from png_byte to png_uint_16 in png_set_filler().</div><div class='ctx'>     (Dennis Gustafsson)</div><div class='ctx'>   Fixed typo introduced in beta78 in pngtest.c ("#if def " should be "#ifdef ")</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta81 [September 23, 2009]</div><div class='add'>+Version 1.4.0beta81 [September 23, 2009]</div><div class='ctx'>   Eliminated unused PNG_FLAG_FREE_* defines from pngpriv.h</div><div class='ctx'>   Expanded TAB characters in pngrtran.c</div><div class='ctx'>   Removed PNG_CONST from all "PNG_CONST PNG_CHNK" declarations to avoid</div><div class='hunk'>@@ -2244,60 +2403,60 @@ version 1.4.0beta81 [September 23, 2009]</div><div class='ctx'>   Changed all "#if [!]defined(X)" to "if[n]def X" where possible.</div><div class='ctx'>   Eliminated unused png_ptr-&gt;row_buf_size</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta82 [September 25, 2009]</div><div class='add'>+Version 1.4.0beta82 [September 25, 2009]</div><div class='ctx'>   Moved redundant IHDR checking into new png_check_IHDR() in png.c</div><div class='ctx'>     and report all errors found in the IHDR data.</div><div class='ctx'>   Eliminated useless call to png_check_cHRM() from pngset.c</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta83 [September 25, 2009]</div><div class='add'>+Version 1.4.0beta83 [September 25, 2009]</div><div class='ctx'>   Revised png_check_IHDR() to eliminate bogus complaint about filter_type.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta84 [September 30, 2009]</div><div class='add'>+Version 1.4.0beta84 [September 30, 2009]</div><div class='ctx'>   Fixed some inconsistent indentation in pngconf.h</div><div class='ctx'>   Revised png_check_IHDR() to add a test for width variable less than 32-bit.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta85 [October 1, 2009]</div><div class='add'>+Version 1.4.0beta85 [October 1, 2009]</div><div class='ctx'>   Revised png_check_IHDR() again, to check info_ptr members instead of</div><div class='ctx'>     the contents of the returned parameters.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta86 [October 9, 2009]</div><div class='add'>+Version 1.4.0beta86 [October 9, 2009]</div><div class='ctx'>   Updated the "xcode" project (Alam Arias).</div><div class='ctx'>   Eliminated a shadowed declaration of "pp" in png_handle_sPLT().</div><div class='ctx'> </div><div class='del'>-version 1.4.0rc01 [October 19, 2009]</div><div class='add'>+Version 1.4.0rc01 [October 19, 2009]</div><div class='ctx'>   Trivial cosmetic changes.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta87 [October 30, 2009]</div><div class='add'>+Version 1.4.0beta87 [October 30, 2009]</div><div class='ctx'>   Moved version 1.4.0 back into beta.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta88 [October 30, 2009]</div><div class='add'>+Version 1.4.0beta88 [October 30, 2009]</div><div class='ctx'>   Revised libpng*.txt section about differences between 1.2.x and 1.4.0</div><div class='ctx'>     because most of the new features have now been ported back to 1.2.41</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta89 [November 1, 2009]</div><div class='add'>+Version 1.4.0beta89 [November 1, 2009]</div><div class='ctx'>   More bugfixes and improvements to CMakeLists.txt (Philip Lowman)</div><div class='ctx'>   Removed a harmless extra png_set_invert_alpha() from pngwrite.c</div><div class='ctx'>   Apply png_user_chunk_cache_max within png_decompress_chunk().</div><div class='ctx'>   Merged libpng-1.2.41.txt with libpng-1.4.0.txt where appropriate.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta90 [November 2, 2009]</div><div class='add'>+Version 1.4.0beta90 [November 2, 2009]</div><div class='ctx'>   Removed all remaining WIN32_WCE #ifdefs except those involving the</div><div class='ctx'>     time.h "tm" structure</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta91 [November 3, 2009]</div><div class='add'>+Version 1.4.0beta91 [November 3, 2009]</div><div class='ctx'>   Updated scripts/pngw32.def and projects/wince/png32ce.def</div><div class='ctx'>   Copied projects/wince/png32ce.def to the scripts directory.</div><div class='ctx'>   Added scripts/makefile.wce</div><div class='ctx'>   Patched ltmain.sh for wince support.</div><div class='ctx'>   Added PNG_CONVERT_tIME_SUPPORTED macro.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta92 [November 4, 2009]</div><div class='add'>+Version 1.4.0beta92 [November 4, 2009]</div><div class='ctx'>   Make inclusion of time.h in pngconf.h depend on PNG_CONVERT_tIME_SUPPORTED</div><div class='ctx'>   Make #define PNG_CONVERT_tIME_SUPPORTED depend on PNG_WRITE_tIME_SUPPORTED</div><div class='ctx'>   Revised libpng*.txt to describe differences from 1.2.40 to 1.4.0 (instead</div><div class='ctx'>     of differences from 1.2.41 to 1.4.0)</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta93 [November 7, 2009]</div><div class='add'>+Version 1.4.0beta93 [November 7, 2009]</div><div class='ctx'>   Added PNG_DEPSTRUCT, PNG_DEPRECATED, PNG_USE_RESULT, PNG_NORETURN, and</div><div class='ctx'>     PNG_ALLOCATED macros to detect deprecated direct access to the</div><div class='ctx'>     png_struct or info_struct members and other deprecated usage in</div><div class='hunk'>@@ -2320,13 +2479,13 @@ version 1.4.0beta93 [November 7, 2009]</div><div class='ctx'>   Moved the synopsis lines for png_read_destroy(), png_write_destroy()</div><div class='ctx'>     png_debug(), png_debug1(), and png_debug2() from libpng.3 to libpngpf.3.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta94 [November 9, 2009]</div><div class='add'>+Version 1.4.0beta94 [November 9, 2009]</div><div class='ctx'>   Removed the obsolete, unused pnggccrd.c and pngvcrd.c files.</div><div class='ctx'>   Updated CMakeLists.txt to add "-DPNG_CONFIGURE_LIBPNG" to the definitions.</div><div class='ctx'>   Removed dependency of pngtest.o on pngpriv.h in the makefiles.</div><div class='ctx'>   Only #define PNG_DEPSTRUCT, etc. in pngconf.h if not already defined.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta95 [November 10, 2009]</div><div class='add'>+Version 1.4.0beta95 [November 10, 2009]</div><div class='ctx'>   Changed png_check_sig() to !png_sig_cmp() in contrib programs.</div><div class='ctx'>   Added -DPNG_CONFIGURE_LIBPNG to contrib/pngminm/*/makefile</div><div class='ctx'>   Changed png_check_sig() to !png_sig_cmp() in contrib programs.</div><div class='hunk'>@@ -2334,7 +2493,7 @@ version 1.4.0beta95 [November 10, 2009]</div><div class='ctx'>   Changed pngminim/*/gather.sh to stop trying to remove pnggccrd.c and pngvcrd.c</div><div class='ctx'>   Added dependency on pngpriv.h in contrib/pngminim/*/makefile</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta96 [November 12, 2009]</div><div class='add'>+Version 1.4.0beta96 [November 12, 2009]</div><div class='ctx'>   Renamed scripts/makefile.wce to scripts/makefile.cegcc</div><div class='ctx'>   Revised Makefile.am to use libpng.sys while building libpng.so</div><div class='ctx'>     so that only PNG_EXPORT functions are exported.</div><div class='hunk'>@@ -2344,42 +2503,42 @@ version 1.4.0beta96 [November 12, 2009]</div><div class='ctx'>     (evidently the same change made in libpng-1.0beta54 was lost).</div><div class='ctx'>   Added PNG_PRIVATE macro definition in pngconf.h for possible future use.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta97 [November 13, 2009]</div><div class='add'>+Version 1.4.0beta97 [November 13, 2009]</div><div class='ctx'>   Restored pngtest.png to the libpng-1.4.0beta7 version.</div><div class='ctx'>   Removed projects/beos and netware.txt; no one seems to be supporting them.</div><div class='ctx'>   Revised Makefile.in</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta98 [November 13, 2009]</div><div class='add'>+Version 1.4.0beta98 [November 13, 2009]</div><div class='ctx'>   Added the "xcode" project to zip distributions,</div><div class='ctx'>   Fixed a typo in scripts/pngwin.def introduced in beta97.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta99 [November 14, 2009]</div><div class='add'>+Version 1.4.0beta99 [November 14, 2009]</div><div class='ctx'>   Moved libpng-config.in and libpng.pc-configure.in out of the scripts</div><div class='ctx'>     directory, to libpng-config.in and libpng-pc.in, respectively, and</div><div class='ctx'>     modified Makefile.am and configure.ac accordingly.  Now "configure"</div><div class='ctx'>     needs nothing from the "scripts" directory.</div><div class='ctx'>   Avoid redefining PNG_CONST in pngconf.h</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta100 [November 14, 2009]</div><div class='add'>+Version 1.4.0beta100 [November 14, 2009]</div><div class='ctx'>   Removed ASM builds from projects/visualc6 and projects/visualc71</div><div class='ctx'>   Removed scripts/makefile.nommx and makefile.vcawin32</div><div class='ctx'>   Revised CMakeLists.txt to account for new location of libpng-config.in</div><div class='ctx'>     and libpng-pc.in</div><div class='ctx'>   Updated INSTALL to reflect removal and relocation of files.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta101 [November 14, 2009]</div><div class='add'>+Version 1.4.0beta101 [November 14, 2009]</div><div class='ctx'>   Restored the binary files (*.jpg, *.png, some project files) that were</div><div class='ctx'>     accidentally deleted from the zip and 7z distributions when the xcode</div><div class='ctx'>     project was added.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta102 [November 18, 2009]</div><div class='add'>+Version 1.4.0beta102 [November 18, 2009]</div><div class='ctx'>   Added libpng-config.in and libpng-pc.in to the zip and 7z distributions.</div><div class='ctx'>   Fixed a typo in projects/visualc6/pngtest.dsp, introduced in beta100.</div><div class='ctx'>   Moved descriptions of makefiles and other scripts out of INSTALL into</div><div class='ctx'>     scripts/README.txt</div><div class='ctx'>   Updated the copyright year in scripts/pngwin.rc from 2006 to 2009.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta103 [November 21, 2009]</div><div class='add'>+Version 1.4.0beta103 [November 21, 2009]</div><div class='ctx'>   Removed obsolete comments about ASM from projects/visualc71/README_zlib.txt</div><div class='ctx'>   Align row_buf on 16-byte boundary in memory.</div><div class='ctx'>   Restored the PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED guard around the call</div><div class='hunk'>@@ -2391,71 +2550,696 @@ version 1.4.0beta103 [November 21, 2009]</div><div class='ctx'>     jmp_buf buffer, and marked direct access to jmpbuf 'deprecated'.</div><div class='ctx'>     (John Bowler)</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta104 [November 22, 2009]</div><div class='add'>+Version 1.4.0beta104 [November 22, 2009]</div><div class='ctx'>   Removed png_longjmp_ptr from scripts/*.def and libpng.3</div><div class='ctx'>   Rebuilt configure scripts with autoconf-2.65</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta105 [November 25, 2009]</div><div class='add'>+Version 1.4.0beta105 [November 25, 2009]</div><div class='ctx'>   Use fast integer PNG_DIVIDE_BY_255() or PNG_DIVIDE_BY_65535()</div><div class='ctx'>     to accomplish alpha premultiplication when</div><div class='ctx'>     PNG_READ_COMPOSITE_NODIV_SUPPORTED is defined.</div><div class='ctx'>   Changed "/255" to "/255.0" in background calculations to make it clear</div><div class='ctx'>     that the 255 is used as a double.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta106 [November 27, 2009]</div><div class='add'>+Version 1.4.0beta106 [November 27, 2009]</div><div class='ctx'>   Removed premultiplied alpha feature.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta107 [December 4, 2009]</div><div class='add'>+Version 1.4.0beta107 [December 4, 2009]</div><div class='ctx'>   Updated README</div><div class='ctx'>   Added "#define PNG_NO_PEDANTIC_WARNINGS" in the libpng source files.</div><div class='ctx'>   Removed "-DPNG_CONFIGURE_LIBPNG" from the makefiles and projects.</div><div class='ctx'>   Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco</div><div class='ctx'>     to put png.h and pngconf.h in $prefix/include, like the other scripts,</div><div class='ctx'>     instead of in $prefix/include/libpng.  Also revised makefile.sco</div><div class='del'>-    to put them in $prefix/include/libpng14 instead of in</div><div class='del'>-    $prefix/include/libpng/libpng14.</div><div class='add'>+    to put them in $prefix/include/libpng15 instead of in</div><div class='add'>+    $prefix/include/libpng/libpng15.</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta108 [December 11, 2009]</div><div class='add'>+Version 1.4.0beta108 [December 11, 2009]</div><div class='ctx'>   Removed leftover "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile</div><div class='ctx'>   Relocated png_do_chop() to its original position in pngrtran.c; the</div><div class='ctx'>     change in version 1.2.41beta08 caused transparency to be handled wrong</div><div class='ctx'>     in some 16-bit datastreams (Yusaku Sugai).</div><div class='ctx'> </div><div class='del'>-version 1.4.0beta109 [December 13, 2009]</div><div class='add'>+Version 1.4.0beta109 [December 13, 2009]</div><div class='ctx'>   Added "bit_depth" parameter to the private png_build_gamma_table() function.</div><div class='ctx'>   Pass bit_depth=8 to png_build_gamma_table() when bit_depth is 16 but the</div><div class='ctx'>     PNG_16_TO_8 transform has been set, to avoid unnecessary build of 16-bit</div><div class='ctx'>     tables.</div><div class='ctx'> </div><div class='del'>-version 1.4.0rc02 [December 20, 2009]</div><div class='add'>+Version 1.4.0rc02 [December 20, 2009]</div><div class='ctx'>   Declared png_cleanup_needed "volatile" in pngread.c and pngwrite.c</div><div class='ctx'> </div><div class='del'>-version 1.4.0rc03 [December 22, 2009]</div><div class='add'>+Version 1.4.0rc03 [December 22, 2009]</div><div class='ctx'>   Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt</div><div class='ctx'>     (revising the change in 1.4.0beta99)</div><div class='ctx'> </div><div class='del'>-version 1.4.0rc04 [December 25, 2009]</div><div class='add'>+Version 1.4.0rc04 [December 25, 2009]</div><div class='ctx'>   Swapped PNG_UNKNOWN_CHUNKS_SUPPORTED and PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='ctx'>     in pngset.c to be consistent with other changes in version 1.2.38.</div><div class='ctx'> </div><div class='del'>-version 1.4.0rc05 [December 25, 2009]</div><div class='add'>+Version 1.4.0rc05 [December 25, 2009]</div><div class='ctx'>   Changed "libpng-pc.in" to "libpng.pc.in" in configure.ac, configure, and</div><div class='ctx'>     Makefile.in to be consistent with changes in libpng-1.4.0rc03</div><div class='ctx'> </div><div class='del'>-version 1.4.0rc06 [December 29, 2009]</div><div class='add'>+Version 1.4.0rc06 [December 29, 2009]</div><div class='ctx'>   Reverted the gamma_table changes from libpng-1.4.0beta109.</div><div class='ctx'>   Fixed some indentation errors.</div><div class='ctx'> </div><div class='del'>-version 1.4.0rc07 [January 1, 2010]</div><div class='add'>+Version 1.4.0rc07 [January 1, 2010]</div><div class='ctx'>   Revised libpng*.txt and libpng.3 about 1.2.x-&gt;1.4.x differences.</div><div class='ctx'>   Use png_calloc() instead of png_malloc(); png_memset() in pngrutil.c</div><div class='ctx'>   Update copyright year to 2010.</div><div class='ctx'> </div><div class='del'>-version 1.4.0rc08 [January 2, 2010]</div><div class='add'>+Version 1.4.0rc08 [January 2, 2010]</div><div class='ctx'>   Avoid deprecated references to png_ptr-io_ptr and png_ptr-&gt;error_ptr</div><div class='ctx'>     in pngtest.c</div><div class='ctx'> </div><div class='del'>-version 1.4.0 [January 3, 2010]</div><div class='add'>+Version 1.4.0 [January 3, 2010]</div><div class='add'>+  No changes.</div><div class='add'>+</div><div class='add'>+Version 1.4.1beta01 [January 8, 2010]</div><div class='add'>+  Updated CMakeLists.txt for consistent indentation and to avoid an</div><div class='add'>+    unclosed if-statement warning (Philip Lowman).</div><div class='add'>+  Revised Makefile.am and Makefile.in to remove references to Y2KINFO,</div><div class='add'>+    KNOWNBUG, and libpng.la (Robert Schwebel).</div><div class='add'>+  Revised the makefiles to install the same files and symbolic</div><div class='add'>+    links as configure, except for libpng.la and libpng14.la.</div><div class='add'>+  Make png_set|get_compression_buffer_size() available even when</div><div class='add'>+    PNG_WRITE_SUPPORTED is not enabled.</div><div class='add'>+  Revised Makefile.am and Makefile.in to simplify their maintenance.</div><div class='add'>+  Revised scripts/makefile.linux to install a link to libpng14.so.14.1</div><div class='add'>+</div><div class='add'>+Version 1.4.1beta02 [January 9, 2010]</div><div class='add'>+  Revised the rest of the makefiles to install a link to libpng14.so.14.1</div><div class='add'>+</div><div class='add'>+Version 1.4.1beta03 [January 10, 2010]</div><div class='add'>+  Removed png_set_premultiply_alpha() from scripts/*.def</div><div class='add'>+</div><div class='add'>+Version 1.4.1rc01 [January 16, 2010]</div><div class='add'>+  No changes.</div><div class='add'>+</div><div class='add'>+Version 1.4.1beta04 [January 23, 2010]</div><div class='add'>+  Revised png_decompress_chunk() to improve speed and memory usage when</div><div class='add'>+    decoding large chunks.</div><div class='add'>+  Added png_set|get_chunk_malloc_max() functions.</div><div class='add'>+</div><div class='add'>+Version 1.4.1beta05 [January 26, 2010]</div><div class='add'>+  Relocated "int k" declaration in pngtest.c to minimize its scope.</div><div class='add'>+</div><div class='add'>+Version 1.4.1beta06 [January 28, 2010]</div><div class='add'>+  Revised png_decompress_chunk() to use a two-pass method suggested by</div><div class='add'>+    John Bowler.</div><div class='add'>+</div><div class='add'>+Version 1.4.1beta07 [February 6, 2010]</div><div class='add'>+  Folded some long lines in the source files.</div><div class='add'>+  Added defineable PNG_USER_CHUNK_CACHE_MAX, PNG_USER_CHUNK_MALLOC_MAX,</div><div class='add'>+    and a PNG_USER_LIMITS_SUPPORTED flag.</div><div class='add'>+  Eliminated use of png_ptr-&gt;irowbytes and reused the slot in png_ptr as</div><div class='add'>+    png_ptr-&gt;png_user_chunk_malloc_max.</div><div class='add'>+  Revised png_push_save_buffer() to do fewer but larger png_malloc() calls.</div><div class='add'>+</div><div class='add'>+Version 1.4.1beta08 [February 6, 2010]</div><div class='add'>+  Minor cleanup and updating of dates and copyright year.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta01 [February 7, 2010]</div><div class='add'>+  Moved declaration of png_struct into private pngstruct.h and png_info</div><div class='add'>+    into pnginfo.h</div><div class='add'>+</div><div class='add'>+Version 1.4.1beta09 and 1.5.0beta02 [February 7, 2010]</div><div class='add'>+  Reverted to original png_push_save_buffer() code.</div><div class='add'>+</div><div class='add'>+Version 1.4.1beta10 and 1.5.0beta03 [February 8, 2010]</div><div class='add'>+  Return allocated "old_buffer" in png_push_save_buffer() before</div><div class='add'>+    calling png_error(), to avoid a potential memory leak.</div><div class='add'>+  Updated configure script to use SO number 15.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta04 [February 9, 2010]</div><div class='add'>+  Removed malformed "incomplete struct declaration" of png_info from png.h</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta05 [February 12, 2010]</div><div class='add'>+  Removed PNG_DEPSTRUCT markup in pngstruct.h and pnginfo.h, and undid the</div><div class='add'>+    linewrapping that it entailed.</div><div class='add'>+  Revised comments in pngstruct.h and pnginfo.h and added pointers to</div><div class='add'>+    the libpng license.</div><div class='add'>+  Changed PNG_INTERNAL to PNG_EXPOSE_INTERNAL_STRUCTURES</div><div class='add'>+  Removed the cbuilder5 project, which has not been updated to 1.4.0.</div><div class='add'>+</div><div class='add'>+Version 1.4.1beta12 and 1.5.0beta06 [February 14, 2010]</div><div class='add'>+  Fixed type declaration of png_get_chunk_malloc_max() in pngget.c (Daisuke</div><div class='add'>+    Nishikawa)</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta07 [omitted]</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta08 [February 19, 2010]</div><div class='add'>+  Changed #ifdef PNG_NO_STDIO_SUPPORTED to #ifdef PNG_NO_CONSOLE_IO_SUPPORTED</div><div class='add'>+    wherever png_snprintf() is used to construct error and warning messages.</div><div class='add'>+  Noted in scripts/makefile.mingw that it expects to be run under MSYS.</div><div class='add'>+  Removed obsolete unused MMX-querying support from contrib/gregbook</div><div class='add'>+  Added exported png_longjmp() function.</div><div class='add'>+  Removed the AIX redefinition of jmpbuf in png.h</div><div class='add'>+  Added -D_ALLSOURCE in configure.ac, makefile.aix, and CMakeLists.txt</div><div class='add'>+    when building on AIX.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta09 [February 19, 2010]</div><div class='add'>+  Removed -D_ALLSOURCE from configure.ac, makefile.aix, and CMakeLists.txt.</div><div class='add'>+  Changed the name of png_ptr-&gt;jmpbuf to png_ptr-&gt;png_jmpbuf in pngstruct.h</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta10 [February 25, 2010]</div><div class='add'>+  Removed unused gzio.c from contrib/pngminim gather and makefile scripts</div><div class='add'>+  Removed replacement error handlers from contrib/gregbook.  Because of</div><div class='add'>+    the new png_longjmp() function they are no longer needed.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta11 [March 6, 2010]</div><div class='add'>+  Removed checking for already-included setjmp.h from pngconf.h</div><div class='add'>+  Fixed inconsistent indentations and made numerous cosmetic changes.</div><div class='add'>+  Revised the "SEE ALSO" style of libpng.3, libpngpf.3, and png.5</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta12 [March 9, 2010]</div><div class='add'>+  Moved "#include png.h" inside pngpriv.h and removed "#include png.h" from</div><div class='add'>+    the source files, along with "#define PNG_EXPOSE_INTERNAL_STRUCTURES"</div><div class='add'>+    and "#define PNG_NO_PEDANTIC_WARNINGS" (John Bowler).</div><div class='add'>+  Created new pngdebug.h and moved debug definitions there.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta13 [March 10, 2010]</div><div class='add'>+  Protect pngstruct.h, pnginfo.h, and pngdebug.h from being included twice.</div><div class='add'>+  Revise the "#ifdef" blocks in png_inflate() so it will compile when neither</div><div class='add'>+    PNG_USER_CHUNK_MALLOC_MAX nor PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED</div><div class='add'>+    is defined.</div><div class='add'>+  Removed unused png_measure_compressed_chunk() from pngpriv.h and libpngpf.3</div><div class='add'>+  Moved the 'config.h' support from pngconf.h to pngpriv.h</div><div class='add'>+  Removed PNGAPI from the png_longjmp_ptr typedef.</div><div class='add'>+  Eliminated dependence of pngtest.c on the private pngdebug.h file.</div><div class='add'>+  Make all png_debug macros into *unterminated* statements or</div><div class='add'>+    expressions (i.e. a trailing ';' must always be added) and correct</div><div class='add'>+    the format statements in various png_debug messages.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta14 [March 14, 2010]</div><div class='add'>+  Removed direct access to png_ptr-&gt;io_ptr from the Windows code in pngtest.c</div><div class='add'>+  Revised Makefile.am to account for recent additions and replacements.</div><div class='add'>+  Corrected CE and OS/2 DEF files (scripts/png*def) for symbols removed and</div><div class='add'>+    added ordinal numbers to the Windows DEF file and corrected the duplicated</div><div class='add'>+    ordinal numbers on CE symbols that are commented out.</div><div class='add'>+  Added back in export symbols that can be present in the Windows build but</div><div class='add'>+    are disabled by default.</div><div class='add'>+  PNG_EXPORT changed to include an 'ordinal' field for DEF file generation.</div><div class='add'>+    PNG_CALLBACK added to make callback definitions uniform.  PNGAPI split</div><div class='add'>+    into PNGCAPI (base C form), PNGAPI (exports) and PNGCBAPI (callbacks),</div><div class='add'>+    and appropriate changes made to all files.  Cygwin builds re-hinged to</div><div class='add'>+    allow procedure call standard changes and to remove the need for the DEF</div><div class='add'>+    file (fixes build on Cygwin).</div><div class='add'>+  Enabled 'attribute' warnings that are relevant to library APIs and callbacks.</div><div class='add'>+  Changed rules for generation of the various symbol files and added a new</div><div class='add'>+    rule for a DEF file (which is also added to the distribution).</div><div class='add'>+  Updated the symbol file generation to stop it adding spurious spaces</div><div class='add'>+    to EOL (coming from preprocessor macro expansion).  Added a facility</div><div class='add'>+    to join tokens in the output and rewrite *.dfn to use this.</div><div class='add'>+  Eliminated scripts/*.def in favor of libpng.def; updated projects/visualc71</div><div class='add'>+    and removed scripts/makefile.cygwin.</div><div class='add'>+  Made PNG_BUILD_DLL safe: it can be set whenever a DLL is being built.</div><div class='add'>+  Removed the include of sys/types.h - apparently unnecessary now on the</div><div class='add'>+    platforms on which it happened (all but Mac OS and RISC OS).</div><div class='add'>+  Moved the Mac OS test into pngpriv.h (the only place it is used.)</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta15 [March 17, 2010]</div><div class='add'>+  Added symbols.chk target to Makefile.am to validate the symbols in png.h</div><div class='add'>+    against the new DEF file scripts/symbols.def.</div><div class='add'>+  Changed the default DEF file back to pngwin.def.</div><div class='add'>+  Removed makefile.mingw.</div><div class='add'>+  Eliminated PNG_NO_EXTERN and PNG_ALL_EXTERN</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta16 [April 1, 2010]</div><div class='add'>+  Make png_text_struct independent of PNG_iTXt_SUPPORTED, so that</div><div class='add'>+    fields are initialized in all configurations.  The READ/WRITE</div><div class='add'>+    macros (PNG_(READ|WRITE)_iTXt_SUPPORTED) still function as</div><div class='add'>+    before to disable code to actually read or write iTXt chunks</div><div class='add'>+    and iTXt_SUPPORTED can be used to detect presence of either</div><div class='add'>+    read or write support (but it is probably better to check for</div><div class='add'>+    the one actually required - read or write.)</div><div class='add'>+  Combined multiple png_warning() calls for a single error.</div><div class='add'>+  Restored the macro definition of png_check_sig().</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta17 [April 17, 2010]</div><div class='add'>+  Added some "(long)" typecasts to printf calls in png_handle_cHRM().</div><div class='add'>+  Documented the fact that png_set_dither() was disabled since libpng-1.4.0.</div><div class='add'>+  Reenabled png_set_dither() but renamed it to png_set_quantize() to reflect</div><div class='add'>+    more accurately what it actually does.  At the same time, renamed</div><div class='add'>+    the PNG_DITHER_[RED,GREEN_BLUE]_BITS macros to</div><div class='add'>+    PNG_QUANTIZE_[RED,GREEN,BLUE]_BITS.</div><div class='add'>+  Added some "(long)" typecasts to printf calls in png_handle_cHRM().</div><div class='add'>+  Freeze build-time only configuration in the build.</div><div class='add'>+    In all prior versions of libpng most configuration options</div><div class='add'>+    controlled by compiler #defines had to be repeated by the</div><div class='add'>+    application code that used libpng.  This patch changes this</div><div class='add'>+    so that compilation options that can only be changed at build</div><div class='add'>+    time are frozen in the build.  Options that are compiler</div><div class='add'>+    dependent (and those that are system dependent) are evaluated</div><div class='add'>+    each time - pngconf.h holds these.  Options that can be changed</div><div class='add'>+    per-file in the application are in png.h.  Frozen options are</div><div class='add'>+    in the new installed header file pnglibconf.h (John Bowler)</div><div class='add'>+  Removed the xcode project because it has not been updated to work</div><div class='add'>+    with libpng-1.5.0.</div><div class='add'>+  Removed the ability to include optional pngusr.h</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta18 [April 17, 2010]</div><div class='add'>+  Restored the ability to include optional pngusr.h</div><div class='add'>+  Moved replacements for png_error() and png_warning() from the</div><div class='add'>+    contrib/pngminim project to pngerror.c, for use when warnings or</div><div class='add'>+    errors are disabled via PNG_NO_WARN or PNG_NO_ERROR_TEXT, to avoid</div><div class='add'>+    storing unneeded error/warning text.</div><div class='add'>+  Updated contrib/pngminim project to work with the new pnglibconf.h</div><div class='add'>+  Added some PNG_NO_* defines to contrib/pngminim/*/pngusr.h to save space.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta19 [April 24, 2010]</div><div class='add'>+  Added PNG_{READ,WRITE}_INT_FUNCTIONS_SUPPORTED.  This allows the functions</div><div class='add'>+    to read and write ints to be disabled independently of PNG_USE_READ_MACROS,</div><div class='add'>+    which allows libpng to be built with the functions even though the default</div><div class='add'>+    is to use the macros - this allows applications to choose at app build</div><div class='add'>+    time whether or not to use macros (previously impossible because the</div><div class='add'>+    functions weren't in the default build.)</div><div class='add'>+  Changed Windows calling convention back to __cdecl for API functions.</div><div class='add'>+    For Windows/x86 platforms only:</div><div class='add'>+      __stdcall is no longer needed for Visual Basic, so libpng-1.5.0 uses</div><div class='add'>+      __cdecl throughout (both API functions and callbacks) on Windows/x86</div><div class='add'>+      platforms.</div><div class='add'>+  Replaced visualc6 and visualc71 projects with new vstudio project</div><div class='add'>+  Relaxed the overly-restrictive permissions of some files.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta20 [April 24, 2010]</div><div class='add'>+  Relaxed more overly-restrictive permissions of some files.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta21 [April 27, 2010]</div><div class='add'>+  Removed some unwanted binary bytes and changed CRLF to NEWLINE in the new</div><div class='add'>+    vstudio project files, and some trivial editing of some files in the</div><div class='add'>+    scripts directory.</div><div class='add'>+  Set PNG_NO_READ_BGR, PNG_NO_IO_STATE, and PNG_NO_TIME_RFC1123 in</div><div class='add'>+    contrib/pngminim/decoder/pngusr.h to make a smaller decoder application.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta22 [April 28, 2010]</div><div class='add'>+  Fixed dependencies of GET_INT_32 - it does not require READ_INT_FUNCTIONS</div><div class='add'>+    because it has a macro equivalent.</div><div class='add'>+  Improved the options.awk script; added an "everything off" option.</div><div class='add'>+  Revised contrib/pngminim to use the "everything off" option in pngusr.dfa.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta23 [April 29, 2010]</div><div class='add'>+  Corrected PNG_REMOVED macro to take five arguments.</div><div class='add'>+    The macro was documented with two arguments (name,ordinal), however</div><div class='add'>+    the symbol checking .dfn files assumed five arguments.  The five</div><div class='add'>+    argument form seems more useful so it is changed to that.</div><div class='add'>+  Corrected PNG_UNKNOWN_CHUNKS_SUPPORTED to PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='add'>+    in gregbook/readpng2.c</div><div class='add'>+  Corrected protection of png_get_user_transform_ptr. The API declaration in</div><div class='add'>+    png.h is removed if both READ and WRITE USER_TRANSFORM are turned off</div><div class='add'>+    but was left defined in pngtrans.c</div><div class='add'>+  Added logunsupported=1 to cause pnglibconf.h to document disabled options.</div><div class='add'>+    This makes the installed pnglibconf.h more readable but causes no</div><div class='add'>+    other change.  The intention is that users of libpng will find it</div><div class='add'>+    easier to understand if an API they need is missing.</div><div class='add'>+  Include png_reset_zstream() in png.c only when PNG_READ_SUPPORTED is defined.</div><div class='add'>+  Removed dummy_inflate.c from contrib/pngminim/encoder</div><div class='add'>+  Removed contrib/pngminim/*/gather.sh; gathering is now done in the makefile.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta24 [May 7, 2010]</div><div class='add'>+  Use bitwise "&amp;" instead of arithmetic mod in pngrutil.c calculation of the</div><div class='add'>+    offset of the png_ptr-&gt;rowbuf pointer into png_ptr-&gt;big_row_buf.</div><div class='add'>+  Added more blank lines for readability.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta25 [June 18, 2010]</div><div class='add'>+  In pngpread.c: png_push_have_row() add check for new_row &gt; height</div><div class='add'>+  Removed the now-redundant check for out-of-bounds new_row from example.c</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta26 [June 18, 2010]</div><div class='add'>+  In pngpread.c: png_push_process_row() add check for too many rows.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta27 [June 18, 2010]</div><div class='add'>+  Removed the check added in beta25 as it is now redundant.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta28 [June 20, 2010]</div><div class='add'>+  Rewrote png_process_IDAT_data to consistently treat extra data as warnings</div><div class='add'>+    and handle end conditions more cleanly.</div><div class='add'>+  Removed the new (beta26) check in png_push_process_row().</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta29 [June 21, 2010]</div><div class='add'>+  Revised scripts/options.awk to work on Sunos (but still doesn't work)</div><div class='add'>+  Added comment to options.awk and contrib/pngminim/*/makefile to try nawk.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta30 [June 22, 2010]</div><div class='add'>+  Stop memory leak when reading a malformed sCAL chunk.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta31 [June 26, 2010]</div><div class='add'>+  Revised pngpread.c patch of beta28 to avoid an endless loop.</div><div class='add'>+  Removed some trailing blanks.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta32 [June 26, 2010]</div><div class='add'>+  Removed leftover scripts/options.patch and scripts/options.rej</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta33 [July 6, 3010]</div><div class='add'>+  Made FIXED and FLOATING options consistent in the APIs they enable and</div><div class='add'>+    disable.  Corrected scripts/options.awk to handle both command line</div><div class='add'>+    options and options specified in the .dfa files.</div><div class='add'>+  Changed char *msg to PNG_CONST char *msg in pngrutil.c</div><div class='add'>+  Make png_set_sRGB_gAMA_and_cHRM set values using either the fixed or</div><div class='add'>+    floating point APIs, but not both.</div><div class='add'>+  Reversed patch to remove error handler when the jmp_buf is stored in the</div><div class='add'>+    main program structure, not the png_struct.</div><div class='add'>+    The error handler is needed because the default handler in libpng will</div><div class='add'>+    always use the jmp_buf in the library control structure; this is never</div><div class='add'>+    set.  The gregbook code is a useful example because, even though it</div><div class='add'>+    uses setjmp/longjmp, it shows how error handling can be implemented</div><div class='add'>+    using control mechanisms not directly supported by libpng.  The</div><div class='add'>+    technique will work correctly with mechanisms such as Microsoft</div><div class='add'>+    Structure Exceptions or C++ exceptions (compiler willing - note that gcc</div><div class='add'>+    does not by default support interworking of C and C++ error handling.)</div><div class='add'>+  Reverted changes to call png_longjmp in contrib/gregbook where it is not</div><div class='add'>+    appropriate.  If mainprog-&gt;jmpbuf is used by setjmp, then png_longjmp</div><div class='add'>+    cannot be used.</div><div class='add'>+  Changed "extern PNG_EXPORT" to "PNG_EXPORT" in png.h (Jan Nijtmans)</div><div class='add'>+  Changed "extern" to "PNG_EXTERN" in pngpriv.h (except for the 'extern "C" {')</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta34 [July 12, 2010]</div><div class='add'>+  Put #ifndef PNG_EXTERN, #endif around the define PNG_EXTERN in pngpriv.h</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta35 [July 24, 2010]</div><div class='add'>+  Removed some newly-added TAB characters.</div><div class='add'>+  Added -DNO_PNG_SNPRINTF to CFLAGS in scripts/makefile.dj2</div><div class='add'>+  Moved the definition of png_snprintf() outside of the enclosing</div><div class='add'>+    #ifdef blocks in pngconf.h</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta36 [July 29, 2010]</div><div class='add'>+  Patches by John Bowler:</div><div class='add'>+  Fixed point APIs are now supported throughout (no missing APIs).</div><div class='add'>+  Internal fixed point arithmetic support exists for all internal floating</div><div class='add'>+    point operations.</div><div class='add'>+  sCAL validates the floating point strings it is passed.</div><div class='add'>+  Safe, albeit rudimentary, Watcom support is provided by PNG_API_RULE==2</div><div class='add'>+  Two new APIs exist to get the number of passes without turning on the</div><div class='add'>+    PNG_INTERLACE transform and to get the number of rows in the current</div><div class='add'>+    pass.</div><div class='add'>+  A new test program, pngvalid.c, validates the gamma code.</div><div class='add'>+  Errors in the 16 bit gamma correction (overflows) have been corrected.</div><div class='add'>+  cHRM chunk testing is done consistently (previously the floating point</div><div class='add'>+    API bypassed it, because the test really didn't work on FP, now the test</div><div class='add'>+    is performed on the actual values to be stored in the PNG file so it</div><div class='add'>+    works in the FP case too.)</div><div class='add'>+  Most floating point APIs now simply call the fixed point APIs after</div><div class='add'>+    converting the values to the fixed point form used in the PNG file.</div><div class='add'>+  The standard headers no longer include zlib.h, which is currently only</div><div class='add'>+    required for pngstruct.h and can therefore be internal.</div><div class='add'>+  Revised png_get_int_32 to undo the PNG two's complement representation of</div><div class='add'>+    negative numbers.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta37 [July 30, 2010]</div><div class='add'>+  Added a typecast in png_get_int_32() in png.h and pngrutil.h to avoid</div><div class='add'>+    a compiler warning.</div><div class='add'>+  Replaced oFFs 0,0 with oFFs -10,20 in pngtest.png</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta38 [July 31, 2010]</div><div class='add'>+  Implemented remaining "_fixed" functions.</div><div class='add'>+  Corrected a number of recently introduced warnings mostly resulting from</div><div class='add'>+    safe but uncast assignments to shorter integers.  Also added a zlib</div><div class='add'>+    VStudio release library project because the latest zlib Official Windows</div><div class='add'>+    build does not include such a thing.</div><div class='add'>+  Revised png_get_int_16() to be similar to png_get_int_32().</div><div class='add'>+  Restored projects/visualc71.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta39 [August 2, 2010]</div><div class='add'>+  VisualC/GCC warning fixes, VisualC build fixes</div><div class='add'>+  The changes include support for function attributes in VC in addition to</div><div class='add'>+    those already present in GCC - necessary because without these some</div><div class='add'>+    warnings are unavoidable.  Fixes include signed/unsigned fixes in</div><div class='add'>+    pngvalid and checks with gcc -Wall -Wextra -Wunused.</div><div class='add'>+  VC requires function attributes on function definitions as well as</div><div class='add'>+    declarations, PNG_FUNCTION has been added to enable this and the</div><div class='add'>+    relevant function definitions changed.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta40 [August 6, 2010]</div><div class='add'>+  Correct use of _WINDOWS_ in pngconf.h</div><div class='add'>+  Removed png_mem_ #defines; they are no longer used.</div><div class='add'>+  Added the sRGB chunk to pngtest.png</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta41 [August 11, 2010]</div><div class='add'>+  Added the cHRM chunk to pngtest.png</div><div class='add'>+  Don't try to use version-script with cygwin/mingw.</div><div class='add'>+  Revised contrib/gregbook to work under cygwin/mingw.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta42 [August 18, 2010]</div><div class='add'>+  Add .dll.a to the list of extensions to be symlinked by Makefile.am (Yaakov)</div><div class='add'>+  Made all API functions that have const arguments and constant string</div><div class='add'>+    literal pointers declare them (John Bowler).</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta43 [August 20, 2010]</div><div class='add'>+  Removed spurious tabs, shorten long lines (no source change)</div><div class='add'>+    Also added scripts/chkfmt to validate the format of all the files that can</div><div class='add'>+    reasonably be validated (it is suggested to run "make distclean" before</div><div class='add'>+    checking, because some machine generated files have long lines.)</div><div class='add'>+  Reformatted the CHANGES file to be more consistent throughout.</div><div class='add'>+  Made changes to address various issues identified by GCC, mostly</div><div class='add'>+    signed/unsigned and shortening problems on assignment but also a few</div><div class='add'>+    difficult to optimize (for GCC) loops.</div><div class='add'>+  Fixed non-GCC fixed point builds.  In png.c a declaration was misplaced</div><div class='add'>+    in an earlier update.  Fixed to declare the auto variables at the head.</div><div class='add'>+  Use cexcept.h in pngvalid.c.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta44 [August 24, 2010]</div><div class='add'>+  Updated CMakeLists.txt to use CMAKE_INSTALL_LIBDIR variable; useful for</div><div class='add'>+    installing libpng in /usr/lib64 (Funda Wang).</div><div class='add'>+  Revised CMakeLists.txt to put the man pages in share/man/man* not man/man*</div><div class='add'>+  Revised CMakeLists.txt to make symlinks instead of copies when installing.</div><div class='add'>+  Changed PNG_LIB_NAME from pngNN to libpngNN in CMakeLists.txt (Philip Lowman)</div><div class='add'>+  Implemented memory checks within pngvalid</div><div class='add'>+  Reformatted/rearranged pngvalid.c to assist use of progressive reader.</div><div class='add'>+  Check interlaced images in pngvalid</div><div class='add'>+  Clarified pngusr.h comments in pnglibconf.dfa</div><div class='add'>+  Simplified the pngvalid error-handling code now that cexcept.h is in place.</div><div class='add'>+  Implemented progressive reader in pngvalid.c for standard tests</div><div class='add'>+  Implemented progressive read in pngvalid.c gamma tests</div><div class='add'>+  Turn on progressive reader in pngvalid.c by default and tidy code.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta45 [August 26, 2010]</div><div class='add'>+  Added an explicit make step to projects/vstudio for pnglibconf.h</div><div class='add'>+    Also corrected zlib.vcxproj into which Visual Studio had introduced</div><div class='add'>+    what it calls an "authoring error".  The change to make pnglibconf.h</div><div class='add'>+    simply copies the file; in the future it may actually generate the</div><div class='add'>+    file from scripts/pnglibconf.dfa as the other build systems do.</div><div class='add'>+  Changed pngvalid to work when floating point APIs are disabled</div><div class='add'>+  Renamed the prebuilt scripts/pnglibconf.h to scripts/pnglibconf.h.prebuilt</div><div class='add'>+  Supply default values for PNG_USER_PRIVATEBUILD and PNG_USER_DLLFNAME_POSTFIX</div><div class='add'>+    in pngpriv.h in case the user neglected to define them in their pngusr.h</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta46 [August 28, 2010]</div><div class='add'>+  Added new private header files to libpng_sources in CMakeLists.txt</div><div class='add'>+  Added PNG_READ_16BIT, PNG_WRITE_16BIT, and PNG_16BIT options.</div><div class='add'>+  Added reference to scripts/pnglibconf.h.prebuilt in the visualc71 project.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta47 [September 11, 2010]</div><div class='add'>+  Fixed a number of problems with 64-bit compilation reported by Visual</div><div class='add'>+    Studio 2010 (John Bowler).</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta48 [October 4, 2010]</div><div class='add'>+  Updated CMakeLists.txt (Philip Lowman).</div><div class='add'>+  Revised autogen.sh to recognize and use $AUTOCONF, $AUTOMAKE, $AUTOHEADER,</div><div class='add'>+    $AUTOPOINT, $ACLOCAL and $LIBTOOLIZE</div><div class='add'>+  Fixed problem with symbols creation in Makefile.am which was assuming that</div><div class='add'>+    all versions of ccp write to standard output by default (Martin Banky). The</div><div class='add'>+    bug was introduced in libpng-1.2.9beta5.</div><div class='add'>+  Removed unused mkinstalldirs.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta49 [October 8, 2010]</div><div class='add'>+  Undid Makefile.am revision of 1.5.0beta48.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta50 [October 14, 2010]</div><div class='add'>+  Revised Makefile.in to account for mkinstalldirs being removed.</div><div class='add'>+  Added some "(unsigned long)" typecasts in printf statements in pngvalid.c.</div><div class='add'>+  Suppressed a compiler warning in png_handle_sPLT().</div><div class='add'>+  Check for out-of-range text compression mode in png_set_text().</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta51 [October 15, 2010]</div><div class='add'>+  Changed embedded dates to "(PENDING RELEASE) in beta releases (and future</div><div class='add'>+    rc releases) to minimize the difference between releases.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta52 [October 16, 2010]</div><div class='add'>+  Restored some of the embedded dates (in png.h, png.c, documentation, etc.)</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta53 [October 18, 2010]</div><div class='add'>+  Updated INSTALL to mention using "make maintainer-clean" and to remove</div><div class='add'>+    obsolete statement about a custom ltmain.sh</div><div class='add'>+  Disabled "color-tests" by default in Makefile.am so it will work with</div><div class='add'>+    automake versions earlier than 1.11.1</div><div class='add'>+  Use document name "libpng-manual.txt" instead of "libpng-&lt;version&gt;.txt"</div><div class='add'>+    to simplify version differences.</div><div class='add'>+  Removed obsolete remarks about setjmp handling from INSTALL.</div><div class='add'>+  Revised and renamed the typedef in png.h and png.c that was designed</div><div class='add'>+    to catch library and header mismatch.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta54 [November 10, 2010]</div><div class='add'>+  Require 48 bytes, not 64 bytes, for big_row_buf in overflow checks.</div><div class='add'>+  Used a consistent structure for the pngget.c functions.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta55 [November 21, 2010]</div><div class='add'>+  Revised png_get_uint_32, png_get_int_32, png_get_uint_16 (Cosmin)</div><div class='add'>+  Moved reading of file signature into png_read_sig (Cosmin)</div><div class='add'>+  Fixed atomicity of chunk header serialization (Cosmin)</div><div class='add'>+  Added test for io_state in pngtest.c (Cosmin)</div><div class='add'>+  Added "#!/bin/sh" at the top of contrib/pngminim/*/gather.sh scripts.</div><div class='add'>+  Changes to remove gcc warnings (John Bowler)</div><div class='add'>+    Certain optional gcc warning flags resulted in warnings in libpng code.</div><div class='add'>+    With these changes only -Wconversion and -Wcast-qual cannot be turned on.</div><div class='add'>+    Changes are trivial rearrangements of code.  -Wconversion is not possible</div><div class='add'>+    for pngrutil.c (because of the widespread use of += et al on variables</div><div class='add'>+    smaller than (int) or (unsigned int)) and -Wcast-qual is not possible</div><div class='add'>+    with pngwio.c and pngwutil.c because the 'write' callback and zlib</div><div class='add'>+    compression both fail to declare their input buffers with 'const'.</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta56 [December 7, 2010]</div><div class='add'>+  Added the private PNG_UNUSED() macro definition in pngpriv.h.</div><div class='add'>+  Added some commentary about PNG_EXPORT in png.h and pngconf.h</div><div class='add'>+  Revised PNG_EXPORT() macro and added PNG_EXPORTA() macro, with the</div><div class='add'>+    objective of simplifying and improving the cosmetic appearance of png.h.</div><div class='add'>+  Fixed some incorrect "=" macro names in pnglibconf.dfa</div><div class='add'>+  Included documentation of changes in 1.5.0 from 1.4.x in libpng-manual.txt</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta57 [December 9, 2010]</div><div class='add'>+  Documented the pngvalid gamma error summary with additional comments and</div><div class='add'>+    print statements.</div><div class='add'>+  Improved missing symbol handling in checksym.awk; symbols missing in both</div><div class='add'>+    the old and new files can now be optionally ignored, treated as errors</div><div class='add'>+    or warnings.</div><div class='add'>+  Removed references to pngvcrd.c and pnggccrd.c from the vstudio project.</div><div class='add'>+  Updated "libpng14" to "libpng15" in the visualc71 project.</div><div class='add'>+  Enabled the strip16 tests in pngvalid.`</div><div class='add'>+  Don't display test results (except PASS/FAIL) when running "make test".</div><div class='add'>+    Instead put them in pngtest-log.txt</div><div class='add'>+  Added "--with-zprefix=&lt;string&gt;" to configure.ac</div><div class='add'>+  Updated the prebuilt configuration files to autoconf version 2.68</div><div class='add'>+</div><div class='add'>+Version 1.5.0beta58 [December 19, 2010]</div><div class='add'>+  Fixed interlace image handling and add test cases (John Bowler)</div><div class='add'>+  Fixed the clean rule in Makefile.am to remove pngtest-log.txt</div><div class='add'>+  Made minor changes to work around warnings in gcc 3.4</div><div class='add'>+</div><div class='add'>+Version 1.5.0rc01 [December 27, 2010]</div><div class='add'>+  No changes.</div><div class='add'>+</div><div class='add'>+Version 1.5.0rc02 [December 27, 2010]</div><div class='add'>+  Eliminated references to the scripts/*.def files in project/visualc71.</div><div class='add'>+</div><div class='add'>+Version 1.5.0rc03 [December 28, 2010]</div><div class='add'>+  Eliminated scripts/*.def and revised Makefile.am accordingly</div><div class='add'>+</div><div class='add'>+Version 1.5.0rc04 [December 29, 2010]</div><div class='add'>+  Fixed bug in background transformation handling in pngrtran.c (it was</div><div class='add'>+    looking for the flag in png_ptr-&gt;transformations instead of in</div><div class='add'>+    png_ptr-&gt;flags) (David Raymond).</div><div class='add'>+</div><div class='add'>+Version 1.5.0rc05 [December 31, 2010]</div><div class='add'>+  Fixed typo in a comment in CMakeLists.txt (libpng14 =&gt; libpng15) (Cosmin)</div><div class='add'>+</div><div class='add'>+Version 1.5.0rc06 [January 4, 2011]</div><div class='add'>+  Changed the new configure option "zprefix=string" to "zlib-prefix=string"</div><div class='add'>+</div><div class='add'>+Version 1.5.0rc07 [January 4, 2011]</div><div class='add'>+  Updated copyright year.</div><div class='add'>+</div><div class='add'>+Version 1.5.0 [January 6, 2011]</div><div class='add'>+  No changes.</div><div class='add'>+</div><div class='add'>+version 1.5.1beta01 [January 8, 2011]</div><div class='add'>+  Added description of png_set_crc_action() to the manual.</div><div class='add'>+  Added a note in the manual that the type of the iCCP profile was changed</div><div class='add'>+    from png_charpp to png_bytepp in png_get_iCCP().  This change happened</div><div class='add'>+    in version 1.5.0beta36 but is not noted in the CHANGES.  Similarly,</div><div class='add'>+    it was changed from png_charpp to png_const_bytepp in png_set_iCCP().</div><div class='add'>+  Ensure that png_rgb_to_gray ignores palette mapped images, if libpng</div><div class='add'>+    internally happens to call it with one.</div><div class='add'>+  Fixed a failure to handle palette mapped images correctly.</div><div class='add'>+</div><div class='add'>+Version 1.5.1beta02 [January 14, 2011]</div><div class='add'>+  Fixed a bug in handling of interlaced images (bero at arklinux.org).</div><div class='add'>+  Updated CMakeLists.txt (Clifford Yapp)</div><div class='add'>+</div><div class='add'>+Version 1.5.1beta03 [January 14, 2011]</div><div class='add'>+  Fixed typecasting of some png_debug() statements (Cosmin)</div><div class='add'>+</div><div class='add'>+Version 1.5.1beta04 [January 16, 2011]</div><div class='add'>+  Updated documentation of png_set|get_tRNS() (Thomas Klausner).</div><div class='add'>+  Mentioned in the documentation that applications must #include "zlib.h"</div><div class='add'>+    if they need access to anything in zlib.h, and that a number of</div><div class='add'>+    macros such as png_memset() are no longer accessible by applications.</div><div class='add'>+  Corrected pngvalid gamma test "sample" function to access all of the color</div><div class='add'>+    samples of each pixel, instead of sampling the red channel three times.</div><div class='add'>+  Prefixed variable names index, div, exp, gamma with "png_" to avoid "shadow"</div><div class='add'>+    warnings, and (mistakenly) changed png_exp() to exp().</div><div class='add'>+</div><div class='add'>+Version 1.5.1beta05 [January 16, 2011]</div><div class='add'>+  Changed variable names png_index, png_div, png_exp, and png_gamma to</div><div class='add'>+    char_index, divisor, exp_b10, and gamma_val, respectively, and</div><div class='add'>+    changed exp() back to png_exp().</div><div class='add'>+</div><div class='add'>+Version 1.5.1beta06 [January 20, 2011]</div><div class='add'>+  Prevent png_push_crc_skip() from hanging while reading an unknown chunk</div><div class='add'>+    or an over-large compressed zTXt chunk with the progressive reader.</div><div class='add'>+  Eliminated more GCC "shadow" warnings.</div><div class='add'>+  Revised png_fixed() in png.c to avoid compiler warning about reaching the</div><div class='add'>+    end without returning anything.</div><div class='add'>+</div><div class='add'>+Version 1.5.1beta07 [January 22, 2011]</div><div class='add'>+  In the manual, describe the png_get_IHDR() arguments in the correct order.</div><div class='add'>+  Added const_png_structp and const_png_infop types, and used them in</div><div class='add'>+    prototypes for most png_get_*() functions.</div><div class='add'>+</div><div class='add'>+Version 1.5.1beta08 [January 23, 2011]</div><div class='add'>+  Added png_get_io_chunk_type() and deprecated png_get_io_chunk_name()</div><div class='add'>+  Added synopses for the IO_STATE functions and other missing synopses</div><div class='add'>+    to the manual. Removed the synopses from libpngpf.3 because they</div><div class='add'>+    were out of date and no longer useful.  Better information can be</div><div class='add'>+    obtained by reading the prototypes and comments in pngpriv.h</div><div class='add'>+  Attempted to fix cpp on Solaris with S. Studio 12 cc, fix build</div><div class='add'>+    Added a make macro DFNCPP that is a CPP that will accept the tokens in</div><div class='add'>+    a .dfn file and adds configure stuff to test for such a CPP.  ./configure</div><div class='add'>+    should fail if one is not available.</div><div class='add'>+  Corrected const_png_ in png.h to png_const_ to avoid polluting the namespace.</div><div class='add'>+  Added png_get_current_row_number and png_get_current_pass_number for the</div><div class='add'>+    benefit of the user transform callback.</div><div class='add'>+  Added png_process_data_pause and png_process_data_skip for the benefit of</div><div class='add'>+    progressive readers that need to stop data processing or want to optimize</div><div class='add'>+    skipping of unread data (e.g., if the reader marks a chunk to be skipped.)</div><div class='add'>+</div><div class='add'>+Version 1.5.1beta09 [January 24, 2011]</div><div class='add'>+  Enhanced pngvalid, corrected an error in gray_to_rgb, corrected doc error.</div><div class='add'>+    pngvalid contains tests of transforms, which tests are currently disabled</div><div class='add'>+    because they are incompletely tested.  gray_to_rgb was failing to expand</div><div class='add'>+    the bit depth for smaller bit depth images; this seems to be a long</div><div class='add'>+    standing error and resulted, apparently, in invalid output.  The</div><div class='add'>+    documentation did not accurately describe what libpng really does when</div><div class='add'>+    converting RGB to gray.</div><div class='add'>+</div><div class='add'>+Version 1.5.1beta10 [January 27, 2010]</div><div class='add'>+  Fixed incorrect examples of callback prototypes in the manual, that were</div><div class='add'>+    introduced in libpng-1.0.0.</div><div class='add'>+  In addition the order of the png_get_uint macros with respect to the</div><div class='add'>+    relevant function definitions has been reversed.  This helps the</div><div class='add'>+    preprocessing of the symbol files be more robust.  Furthermore, the</div><div class='add'>+    symbol file preprocessing now uses -DPNG_NO_USE_READ_MACROS even when</div><div class='add'>+    the library may actually be built with PNG_USE_READ_MACROS; this stops</div><div class='add'>+    the read macros interfering with the symbol file format.</div><div class='add'>+  Made the manual, synopses, and function prototypes use the function</div><div class='add'>+    argument names file_gamma, int_file_gamma, and srgb_intent consistently.</div><div class='add'>+</div><div class='add'>+Version 1.5.1beta11 [January 28, 2011]</div><div class='add'>+  Changed PNG_UNUSED from "param=param;" to "{if(param){}}".</div><div class='add'>+  Corrected local variable type in new API png_process_data_skip()</div><div class='add'>+    The type was self-evidently incorrect but only causes problems on 64 bit</div><div class='add'>+    architectures.</div><div class='add'>+  Added transform tests to pngvalid and simplified the arguments.</div><div class='add'>+</div><div class='add'>+Version 1.5.1rc01 [January 29, 2011]</div><div class='add'>+  No changes.</div><div class='add'>+</div><div class='add'>+Version 1.5.1rc02 [January 31, 2011]</div><div class='add'>+  Added a request in the manual that applications do not use "png_" or</div><div class='add'>+    "PNG_" to begin any of their own symbols.</div><div class='add'>+  Changed PNG_UNUSED to "(void)param;" and updated the commentary in pngpriv.h</div><div class='add'>+</div><div class='add'>+Version 1.5.1 [February 3, 2011]</div><div class='ctx'>   No changes.</div><div class='ctx'> </div><div class='ctx'> Send comments/corrections/commendations to png-mng-implement at lists.sf.net</div><div class='head'>diff --git a/src/3rdparty/libpng/CMakeLists.txt b/src/3rdparty/libpng/CMakeLists.txt<br/>index a95e0ec..2ee5bf3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/CMakeLists.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/CMakeLists.txt</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/CMakeLists.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/CMakeLists.txt</a></div><div class='hunk'>@@ -1,43 +1,58 @@</div><div class='del'>-cmake_minimum_required(VERSION 2.4.3)</div><div class='add'>+cmake_minimum_required(VERSION 2.4.4)</div><div class='add'>+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)</div><div class='add'>+</div><div class='ctx'> if(UNIX AND NOT DEFINED CMAKE_BUILD_TYPE)</div><div class='del'>-   set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of</div><div class='del'>-   build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug</div><div class='del'>-   Release RelWithDebInfo MinSizeRel.")</div><div class='add'>+  if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)</div><div class='add'>+    # workaround CMake 2.4.x bug</div><div class='add'>+    set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING</div><div class='add'>+        "Choose the type of build, options are:</div><div class='add'>+           None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used)</div><div class='add'>+           Debug</div><div class='add'>+           Release</div><div class='add'>+           RelWithDebInfo</div><div class='add'>+           MinSizeRel.")</div><div class='add'>+  else()</div><div class='add'>+    set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING</div><div class='add'>+        "Choose the type of build, options are:</div><div class='add'>+           None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used)</div><div class='add'>+           Debug</div><div class='add'>+           Release</div><div class='add'>+           RelWithDebInfo</div><div class='add'>+           MinSizeRel.")</div><div class='add'>+  endif()</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='del'>-project(PNG C)</div><div class='add'>+project(libpng C)</div><div class='ctx'> enable_testing()</div><div class='ctx'> </div><div class='del'>-# Copyright (C) 2007-2010 Glenn Randers-Pehrson</div><div class='add'>+# Copyright (C) 2007-2011 Glenn Randers-Pehrson</div><div class='ctx'> </div><div class='ctx'> # This code is released under the libpng license.</div><div class='ctx'> # For conditions of distribution and use, see the disclaimer</div><div class='ctx'> # and license in png.h</div><div class='ctx'> </div><div class='ctx'> set(PNGLIB_MAJOR 1)</div><div class='del'>-set(PNGLIB_MINOR 4)</div><div class='del'>-set(PNGLIB_RELEASE 0)</div><div class='add'>+set(PNGLIB_MINOR 5)</div><div class='add'>+set(PNGLIB_RELEASE 1)</div><div class='ctx'> set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})</div><div class='ctx'> set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})</div><div class='ctx'> </div><div class='del'>-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)</div><div class='del'>-</div><div class='ctx'> # needed packages</div><div class='ctx'> find_package(ZLIB REQUIRED)</div><div class='ctx'> include_directories(${ZLIB_INCLUDE_DIR})</div><div class='ctx'> </div><div class='ctx'> if(NOT WIN32)</div><div class='del'>- find_library(M_LIBRARY</div><div class='del'>-     NAMES m</div><div class='del'>-     PATHS /usr/lib /usr/local/lib</div><div class='del'>- )</div><div class='del'>- if(NOT M_LIBRARY)</div><div class='del'>-   message(STATUS</div><div class='del'>-     "math library 'libm' not found - floating point support disabled")</div><div class='del'>- endif()</div><div class='add'>+  find_library(M_LIBRARY</div><div class='add'>+    NAMES m</div><div class='add'>+    PATHS /usr/lib /usr/local/lib</div><div class='add'>+  )</div><div class='add'>+  if(NOT M_LIBRARY)</div><div class='add'>+    message(STATUS</div><div class='add'>+      "math library 'libm' not found - floating point support disabled")</div><div class='add'>+  endif()</div><div class='ctx'> else()</div><div class='del'>- # not needed on windows</div><div class='del'>- set(M_LIBRARY "")</div><div class='add'>+  # not needed on windows</div><div class='add'>+  set(M_LIBRARY "")</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='ctx'> # COMMAND LINE OPTIONS</div><div class='hunk'>@@ -54,9 +69,9 @@ endif()</div><div class='ctx'> </div><div class='ctx'> if(MINGW)</div><div class='ctx'>   option(PNG_TESTS  "Build pngtest" NO)</div><div class='del'>-else(MINGW)</div><div class='add'>+else()</div><div class='ctx'>   option(PNG_TESTS  "Build pngtest" YES)</div><div class='del'>-endif(MINGW)</div><div class='add'>+endif()</div><div class='ctx'> </div><div class='ctx'> option(PNG_NO_CONSOLE_IO "FIXME" YES)</div><div class='ctx'> option(PNG_NO_STDIO      "FIXME" YES)</div><div class='hunk'>@@ -68,21 +83,22 @@ option(PNGARG            "FIXME" YES)</div><div class='ctx'> # maybe needs improving, but currently I don't know when we can enable what :)</div><div class='ctx'> set(png_asm_tmp "OFF")</div><div class='ctx'> if(NOT WIN32)</div><div class='del'>- find_program(uname_executable NAMES uname PATHS /bin /usr/bin /usr/local/bin)</div><div class='del'>- if(uname_executable)</div><div class='del'>-   EXEC_PROGRAM(${uname_executable} ARGS --machine OUTPUT_VARIABLE uname_output)</div><div class='del'>-   if("uname_output" MATCHES "^.*i[1-9]86.*$")</div><div class='add'>+  find_program(uname_executable NAMES uname PATHS /bin /usr/bin /usr/local/bin)</div><div class='add'>+  if(uname_executable)</div><div class='add'>+    exec_program(${uname_executable}</div><div class='add'>+                 ARGS --machine OUTPUT_VARIABLE uname_output)</div><div class='add'>+    if("uname_output" MATCHES "^.*i[1-9]86.*$")</div><div class='ctx'>       set(png_asm_tmp "ON")</div><div class='del'>-   else("uname_output" MATCHES "^.*i[1-9]86.*$")</div><div class='add'>+    else("uname_output" MATCHES "^.*i[1-9]86.*$")</div><div class='ctx'>       set(png_asm_tmp "OFF")</div><div class='del'>-   endif("uname_output" MATCHES "^.*i[1-9]86.*$")</div><div class='del'>- endif(uname_executable)</div><div class='add'>+    endif("uname_output" MATCHES "^.*i[1-9]86.*$")</div><div class='add'>+  endif(uname_executable)</div><div class='ctx'> else()</div><div class='del'>- # this env var is normally only set on win64</div><div class='del'>- SET(TEXT "ProgramFiles(x86)")</div><div class='del'>- if("$ENV{${TEXT}}" STREQUAL "")</div><div class='del'>-  set(png_asm_tmp "ON")</div><div class='del'>- endif("$ENV{${TEXT}}" STREQUAL "")</div><div class='add'>+  # this env var is normally only set on win64</div><div class='add'>+  set(TEXT "ProgramFiles(x86)")</div><div class='add'>+  if("$ENV{${TEXT}}" STREQUAL "")</div><div class='add'>+    set(png_asm_tmp "ON")</div><div class='add'>+  endif("$ENV{${TEXT}}" STREQUAL "")</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='ctx'> # SET LIBNAME</div><div class='hunk'>@@ -91,165 +107,290 @@ set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})</div><div class='ctx'> # to distinguish between debug and release lib</div><div class='ctx'> set(CMAKE_DEBUG_POSTFIX "d")</div><div class='ctx'> </div><div class='add'>+# Use the prebuilt pnglibconf.h file from the scripts folder</div><div class='add'>+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt</div><div class='add'>+               ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h)</div><div class='add'>+include_directories(${CMAKE_CURRENT_BINARY_DIR})</div><div class='ctx'> </div><div class='ctx'> # OUR SOURCES</div><div class='add'>+set(libpng_public_hdrs</div><div class='add'>+  png.h</div><div class='add'>+  pngconf.h</div><div class='add'>+  ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h</div><div class='add'>+)</div><div class='ctx'> set(libpng_sources</div><div class='del'>- png.h</div><div class='del'>- pngconf.h</div><div class='del'>- pngpriv.h</div><div class='del'>- png.c</div><div class='del'>- pngerror.c</div><div class='del'>- pngget.c</div><div class='del'>- pngmem.c</div><div class='del'>- pngpread.c</div><div class='del'>- pngread.c</div><div class='del'>- pngrio.c</div><div class='del'>- pngrtran.c</div><div class='del'>- pngrutil.c</div><div class='del'>- pngset.c</div><div class='del'>- pngtrans.c</div><div class='del'>- pngwio.c</div><div class='del'>- pngwrite.c</div><div class='del'>- pngwtran.c</div><div class='del'>- pngwutil.c</div><div class='add'>+  ${libpng_public_hdrs}</div><div class='add'>+  pngdebug.h</div><div class='add'>+  pnginfo.h</div><div class='add'>+  pngpriv.h</div><div class='add'>+  pngstruct.h</div><div class='add'>+  png.c</div><div class='add'>+  pngerror.c</div><div class='add'>+  pngget.c</div><div class='add'>+  pngmem.c</div><div class='add'>+  pngpread.c</div><div class='add'>+  pngread.c</div><div class='add'>+  pngrio.c</div><div class='add'>+  pngrtran.c</div><div class='add'>+  pngrutil.c</div><div class='add'>+  pngset.c</div><div class='add'>+  pngtrans.c</div><div class='add'>+  pngwio.c</div><div class='add'>+  pngwrite.c</div><div class='add'>+  pngwtran.c</div><div class='add'>+  pngwutil.c</div><div class='ctx'> )</div><div class='ctx'> set(pngtest_sources</div><div class='del'>-       pngtest.c</div><div class='add'>+  pngtest.c</div><div class='ctx'> )</div><div class='ctx'> # SOME NEEDED DEFINITIONS</div><div class='ctx'> </div><div class='ctx'> add_definitions(-DPNG_CONFIGURE_LIBPNG)</div><div class='ctx'> </div><div class='add'>+if(_AIX)</div><div class='add'>+  add_definitions(-D_ALL_SOURCE)</div><div class='add'>+endif(_AIX)</div><div class='add'>+</div><div class='ctx'> if(MSVC)</div><div class='ctx'>   add_definitions(-DPNG_NO_MODULEDEF -D_CRT_SECURE_NO_DEPRECATE)</div><div class='ctx'> endif(MSVC)</div><div class='ctx'> </div><div class='ctx'> if(PNG_SHARED OR  NOT MSVC)</div><div class='del'>-	#if building msvc static this has NOT to be defined</div><div class='del'>-	add_definitions(-DZLIB_DLL)</div><div class='add'>+  #if building msvc static this has NOT to be defined</div><div class='add'>+  add_definitions(-DZLIB_DLL)</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> if(PNG_CONSOLE_IO_SUPPORTED)</div><div class='del'>- add_definitions(-DPNG_CONSOLE_IO_SUPPORTED)</div><div class='add'>+  add_definitions(-DPNG_CONSOLE_IO_SUPPORTED)</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='ctx'> if(PNG_NO_CONSOLE_IO)</div><div class='del'>- add_definitions(-DPNG_NO_CONSOLE_IO)</div><div class='add'>+  add_definitions(-DPNG_NO_CONSOLE_IO)</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='ctx'> if(PNG_NO_STDIO)</div><div class='del'>- add_definitions(-DPNG_NO_STDIO)</div><div class='add'>+  add_definitions(-DPNG_NO_STDIO)</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='ctx'> if(PNG_DEBUG)</div><div class='del'>- add_definitions(-DPNG_DEBUG)</div><div class='add'>+  add_definitions(-DPNG_DEBUG)</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='ctx'> if(NOT M_LIBRARY AND NOT WIN32)</div><div class='del'>- add_definitions(-DPNG_NO_FLOATING_POINT_SUPPORTED)</div><div class='add'>+  add_definitions(-DPNG_NO_FLOATING_POINT_SUPPORTED)</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='ctx'> # NOW BUILD OUR TARGET</div><div class='del'>-include_directories(${PNG_SOURCE_DIR} ${ZLIB_INCLUDE_DIR})</div><div class='add'>+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${ZLIB_INCLUDE_DIR})</div><div class='ctx'> </div><div class='ctx'> if(PNG_SHARED)</div><div class='del'>- add_library(${PNG_LIB_NAME} SHARED ${libpng_sources})</div><div class='del'>- if(MSVC)</div><div class='del'>-   # msvc does not append 'lib' - do it here to have consistent name</div><div class='del'>-   set_target_properties(${PNG_LIB_NAME} PROPERTIES PREFIX "lib")</div><div class='del'>- endif()</div><div class='del'>- target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY})</div><div class='add'>+  add_library(${PNG_LIB_NAME} SHARED ${libpng_sources})</div><div class='add'>+  if(MSVC)</div><div class='add'>+    # msvc does not append 'lib' - do it here to have consistent name</div><div class='add'>+    set_target_properties(${PNG_LIB_NAME} PROPERTIES PREFIX "lib")</div><div class='add'>+    set_target_properties(${PNG_LIB_NAME} PROPERTIES IMPORT_PREFIX "lib")</div><div class='add'>+  endif()</div><div class='add'>+  target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY})</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='ctx'> if(PNG_STATIC)</div><div class='ctx'> # does not work without changing name</div><div class='del'>- set(PNG_LIB_NAME_STATIC ${PNG_LIB_NAME}_static)</div><div class='del'>- add_library(${PNG_LIB_NAME_STATIC} STATIC ${libpng_sources})</div><div class='del'>- if(MSVC)</div><div class='del'>-   # msvc does not append 'lib' - do it here to have consistent name</div><div class='del'>-   set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES PREFIX "lib")</div><div class='del'>- endif()</div><div class='add'>+  set(PNG_LIB_NAME_STATIC ${PNG_LIB_NAME}_static)</div><div class='add'>+  add_library(${PNG_LIB_NAME_STATIC} STATIC ${libpng_sources})</div><div class='add'>+  if(MSVC)</div><div class='add'>+    # msvc does not append 'lib' - do it here to have consistent name</div><div class='add'>+    set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES PREFIX "lib")</div><div class='add'>+  endif()</div><div class='add'>+  target_link_libraries(${PNG_LIB_NAME_STATIC} ${ZLIB_LIBRARY} ${M_LIBRARY})</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> if(PNG_SHARED AND WIN32)</div><div class='del'>- set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL)</div><div class='add'>+  set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL)</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='ctx'> if(PNG_TESTS AND PNG_SHARED)</div><div class='del'>-# does not work with msvc due to png_lib_ver issue</div><div class='del'>- add_executable(pngtest ${pngtest_sources})</div><div class='del'>- target_link_libraries(pngtest ${PNG_LIB_NAME})</div><div class='del'>- add_test(pngtest pngtest ${PNG_SOURCE_DIR}/pngtest.png)</div><div class='add'>+  # does not work with msvc due to png_lib_ver issue</div><div class='add'>+  add_executable(pngtest ${pngtest_sources})</div><div class='add'>+  target_link_libraries(pngtest ${PNG_LIB_NAME})</div><div class='add'>+  add_test(pngtest ./pngtest ${CMAKE_CURRENT_SOURCE_DIR}/pngtest.png)</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='add'>+#</div><div class='add'>+# Set a variable with CMake code which:</div><div class='add'>+# Creates a symlink from src to dest (if possible) or alternatively</div><div class='add'>+# copies if different.</div><div class='add'>+macro(_png_generate_symlink_code CODE SRC DEST)</div><div class='add'>+  if(WIN32 AND NOT CYGWIN)</div><div class='add'>+    set(_png_gsc_message "Copying ${SRC} to ${DEST} if needed")</div><div class='add'>+    set(_png_gsc_operation "copy_if_different")</div><div class='add'>+  else()</div><div class='add'>+    set(_png_gsc_message "Symlinking ${SRC} to ${DEST}")</div><div class='add'>+    set(_png_gsc_operation "create_symlink")</div><div class='add'>+  endif()</div><div class='add'>+</div><div class='add'>+  set(${CODE} "</div><div class='add'>+    message(STATUS \"${_png_gsc_message}\")</div><div class='add'>+    execute_process(COMMAND \${CMAKE_COMMAND} -E ${_png_gsc_operation}</div><div class='add'>+      \"${SRC}\" \"${DEST}\")</div><div class='add'>+    ")</div><div class='add'>+endmacro()</div><div class='ctx'> </div><div class='ctx'> # CREATE PKGCONFIG FILES</div><div class='ctx'> # we use the same files like ./configure, so we have to set its vars</div><div class='add'>+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)</div><div class='add'>+  set(CMAKE_INSTALL_LIBDIR lib)</div><div class='add'>+endif(NOT DEFINED CMAKE_INSTALL_LIBDIR)</div><div class='ctx'> set(prefix      ${CMAKE_INSTALL_PREFIX})</div><div class='ctx'> set(exec_prefix ${CMAKE_INSTALL_PREFIX})</div><div class='del'>-set(libdir      ${CMAKE_INSTALL_PREFIX}/lib)</div><div class='add'>+set(libdir      ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})</div><div class='ctx'> set(includedir  ${CMAKE_INSTALL_PREFIX}/include)</div><div class='del'>-</div><div class='del'>-configure_file(${PNG_SOURCE_DIR}/libpng.pc.in</div><div class='del'>-  ${PNG_BINARY_DIR}/libpng.pc)</div><div class='del'>-configure_file(${PNG_SOURCE_DIR}/libpng-config.in</div><div class='del'>-  ${PNG_BINARY_DIR}/libpng-config)</div><div class='del'>-configure_file(${PNG_SOURCE_DIR}/libpng.pc.in</div><div class='del'>-  ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc)</div><div class='del'>-configure_file(${PNG_SOURCE_DIR}/libpng-config.in</div><div class='del'>-  ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config)</div><div class='add'>+set(LIBS        "-lz -lm")</div><div class='add'>+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in</div><div class='add'>+  ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY)</div><div class='add'>+_png_generate_symlink_code(PNG_PC_INSTALL_CODE</div><div class='add'>+  ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc</div><div class='add'>+  ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc)</div><div class='add'>+install(CODE ${PNG_PC_INSTALL_CODE})</div><div class='add'>+</div><div class='add'>+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in</div><div class='add'>+  ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY)</div><div class='add'>+_png_generate_symlink_code(PNG_CONFIG_INSTALL_CODE</div><div class='add'>+  ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config</div><div class='add'>+  ${CMAKE_CURRENT_BINARY_DIR}/libpng-config)</div><div class='add'>+install(CODE ${PNG_CONFIG_INSTALL_CODE})</div><div class='ctx'> </div><div class='ctx'> # SET UP LINKS</div><div class='ctx'> if(PNG_SHARED)</div><div class='ctx'>   set_target_properties(${PNG_LIB_NAME} PROPERTIES</div><div class='del'>-#    VERSION 14.${PNGLIB_RELEASE}.1.4.0</div><div class='del'>-     VERSION 14.${PNGLIB_RELEASE}.0</div><div class='del'>-     SOVERSION 14</div><div class='del'>-     CLEAN_DIRECT_OUTPUT 1)</div><div class='add'>+#   VERSION 15.${PNGLIB_RELEASE}.1.5.1</div><div class='add'>+    VERSION 15.${PNGLIB_RELEASE}.0</div><div class='add'>+    SOVERSION 15</div><div class='add'>+    CLEAN_DIRECT_OUTPUT 1)</div><div class='ctx'> endif()</div><div class='ctx'> if(PNG_STATIC)</div><div class='del'>-  if(NOT WIN32)</div><div class='del'>-    # that's uncool on win32 - it overwrites our static import lib...</div><div class='add'>+  # MSVC doesn't use a different file extension for shared vs. static</div><div class='add'>+  # libs.  We are able to change OUTPUT_NAME to remove the _static</div><div class='add'>+  # for all other platforms.</div><div class='add'>+  if(NOT MSVC)</div><div class='ctx'>     set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES</div><div class='del'>-       OUTPUT_NAME ${PNG_LIB_NAME}</div><div class='del'>-       CLEAN_DIRECT_OUTPUT 1)</div><div class='add'>+      OUTPUT_NAME ${PNG_LIB_NAME}</div><div class='add'>+      CLEAN_DIRECT_OUTPUT 1)</div><div class='ctx'>   endif()</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='add'>+# If CMake &gt; 2.4.x, we set a variable used below to export</div><div class='add'>+# targets to an export file.</div><div class='add'>+# TODO: Use VERSION_GREATER after our cmake_minimum_required &gt;= 2.6.2</div><div class='add'>+if(CMAKE_MAJOR_VERSION GREATER 1 AND CMAKE_MINOR_VERSION GREATER 4)</div><div class='add'>+  set(PNG_EXPORT_RULE EXPORT libpng)</div><div class='add'>+elseif(CMAKE_MAJOR_VERSION GREATER 2) # future proof</div><div class='add'>+  set(PNG_EXPORT_RULE EXPORT libpng)</div><div class='add'>+endif()</div><div class='add'>+</div><div class='ctx'> # INSTALL</div><div class='ctx'> if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )</div><div class='del'>-    if(PNG_SHARED)</div><div class='del'>-        install(TARGETS ${PNG_LIB_NAME}</div><div class='del'>-            RUNTIME DESTINATION bin</div><div class='del'>-            LIBRARY DESTINATION lib</div><div class='del'>-            ARCHIVE DESTINATION lib)</div><div class='add'>+  if(PNG_SHARED)</div><div class='add'>+    install(TARGETS ${PNG_LIB_NAME}</div><div class='add'>+        ${PNG_EXPORT_RULE}</div><div class='add'>+        RUNTIME DESTINATION bin</div><div class='add'>+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}</div><div class='add'>+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})</div><div class='add'>+</div><div class='add'>+    # Create a symlink for libpng.dll.a =&gt; libpng15.dll.a on Cygwin</div><div class='add'>+    if(CYGWIN)</div><div class='add'>+      _png_generate_symlink_code(PNG_SHARED_IMPLIB_INSTALL_CODE</div><div class='add'>+        ${PNGLIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}</div><div class='add'>+        libpng${CMAKE_IMPORT_LIBRARY_SUFFIX})</div><div class='add'>+      install(CODE ${PNG_SHARED_IMPLIB_INSTALL_CODE})</div><div class='add'>+      install(FILES</div><div class='add'>+        ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_IMPORT_LIBRARY_SUFFIX}</div><div class='add'>+        DESTINATION ${CMAKE_INSTALL_LIBDIR})</div><div class='ctx'>     endif()</div><div class='del'>-    if(PNG_STATIC)</div><div class='del'>-        install(TARGETS ${PNG_LIB_NAME_STATIC}</div><div class='del'>-            LIBRARY DESTINATION lib</div><div class='del'>-            ARCHIVE DESTINATION lib)</div><div class='add'>+</div><div class='add'>+    if(NOT WIN32)</div><div class='add'>+      IF(CMAKE_LIBRARY_OUTPUT_DIRECTORY)</div><div class='add'>+        _png_generate_symlink_code(PNG_SHARED_INSTALL_CODE</div><div class='add'>+ ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${PNGLIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}</div><div class='add'>+ ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX})</div><div class='add'>+                install(CODE ${PNG_SHARED_INSTALL_CODE})</div><div class='add'>+                install(FILES</div><div class='add'>+ ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}</div><div class='add'>+                DESTINATION ${CMAKE_INSTALL_LIBDIR})</div><div class='add'>+      ELSE(CMAKE_LIBRARY_OUTPUT_DIRECTORY)</div><div class='add'>+        _png_generate_symlink_code(PNG_SHARED_INSTALL_CODE</div><div class='add'>+           ${PNGLIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}</div><div class='add'>+           libpng${CMAKE_SHARED_LIBRARY_SUFFIX})</div><div class='add'>+        install(CODE ${PNG_SHARED_INSTALL_CODE})</div><div class='add'>+        install(FILES</div><div class='add'>+           ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}</div><div class='add'>+                DESTINATION ${CMAKE_INSTALL_LIBDIR})</div><div class='add'>+      ENDIF(CMAKE_LIBRARY_OUTPUT_DIRECTORY)</div><div class='ctx'>     endif()</div><div class='add'>+  endif()</div><div class='add'>+</div><div class='add'>+  if(PNG_STATIC)</div><div class='add'>+    install(TARGETS ${PNG_LIB_NAME_STATIC}</div><div class='add'>+        ${PNG_EXPORT_RULE}</div><div class='add'>+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}</div><div class='add'>+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})</div><div class='add'>+    if(NOT WIN32 OR CYGWIN)</div><div class='add'>+      IF(CMAKE_ARCHIVE_OUTPUT_DIRECTORY)</div><div class='add'>+         _png_generate_symlink_code(PNG_STATIC_INSTALL_CODE</div><div class='add'>+${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${PNGLIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}</div><div class='add'>+        ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX})</div><div class='add'>+        install(CODE ${PNG_STATIC_INSTALL_CODE})</div><div class='add'>+        install(FILES</div><div class='add'>+          ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}</div><div class='add'>+             DESTINATION ${CMAKE_INSTALL_LIBDIR})</div><div class='add'>+      ELSE(CMAKE_ARCHIVE_OUTPUT_DIRECTORY)</div><div class='add'>+        _png_generate_symlink_code(PNG_STATIC_INSTALL_CODE</div><div class='add'>+           ${PNGLIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}</div><div class='add'>+           libpng${CMAKE_STATIC_LIBRARY_SUFFIX})</div><div class='add'>+        install(CODE ${PNG_STATIC_INSTALL_CODE})</div><div class='add'>+        install(FILES</div><div class='add'>+          ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}</div><div class='add'>+                     DESTINATION ${CMAKE_INSTALL_LIBDIR})</div><div class='add'>+      ENDIF(CMAKE_ARCHIVE_OUTPUT_DIRECTORY)</div><div class='add'>+    endif()</div><div class='add'>+  endif()</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='ctx'> if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )</div><div class='del'>-    install(FILES png.h pngconf.h pngpriv.h         DESTINATION include)</div><div class='del'>-    install(FILES png.h pngconf.h pngpriv.h         DESTINATION include/${PNGLIB_NAME})</div><div class='add'>+  install(FILES ${libpng_public_hdrs}   DESTINATION include)</div><div class='add'>+  install(FILES ${libpng_public_hdrs}   DESTINATION include/${PNGLIB_NAME})</div><div class='ctx'> endif()</div><div class='ctx'> if(NOT SKIP_INSTALL_EXECUTABLES AND NOT SKIP_INSTALL_ALL )</div><div class='del'>-    install(PROGRAMS ${PNG_BINARY_DIR}/libpng-config      DESTINATION bin)</div><div class='del'>-    install(PROGRAMS ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config DESTINATION bin)</div><div class='add'>+  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config DESTINATION bin)</div><div class='add'>+  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config</div><div class='add'>+          DESTINATION bin)</div><div class='ctx'> endif()</div><div class='ctx'> if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )</div><div class='del'>-    install(FILES libpng.3 libpngpf.3             DESTINATION man/man3)</div><div class='del'>-    install(FILES png.5                           DESTINATION man/man5)</div><div class='del'>-    install(FILES ${PNG_BINARY_DIR}/libpng.pc     DESTINATION lib/pkgconfig)</div><div class='del'>-    install(FILES ${PNG_BINARY_DIR}/libpng-config      DESTINATION bin)</div><div class='del'>-    install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc  DESTINATION lib/pkgconfig)</div><div class='del'>-    install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config DESTINATION bin)</div><div class='add'>+  # Install man pages</div><div class='add'>+  if(NOT PNG_MAN_DIR)</div><div class='add'>+    set(PNG_MAN_DIR "share/man")</div><div class='add'>+  endif()</div><div class='add'>+  install(FILES libpng.3 libpngpf.3      DESTINATION ${PNG_MAN_DIR}/man3)</div><div class='add'>+  install(FILES png.5                    DESTINATION ${PNG_MAN_DIR}/man5)</div><div class='add'>+  # Install pkg-config files</div><div class='add'>+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc</div><div class='add'>+          DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)</div><div class='add'>+  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config</div><div class='add'>+          DESTINATION bin)</div><div class='add'>+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc</div><div class='add'>+          DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)</div><div class='add'>+  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config</div><div class='add'>+          DESTINATION bin)</div><div class='add'>+endif()</div><div class='add'>+</div><div class='add'>+# On versions of CMake that support it, create an export file CMake</div><div class='add'>+# users can include() to import our targets</div><div class='add'>+if(PNG_EXPORT_RULE AND NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL )</div><div class='add'>+  install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake)</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='del'>-# what's with libpng.txt and all the extra files?</div><div class='add'>+# what's with libpng-$VER%.txt and all the extra files?</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> # UNINSTALL</div><div class='head'>diff --git a/src/3rdparty/libpng/INSTALL b/src/3rdparty/libpng/INSTALL<br/>index 79f02e77..353bfff 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/INSTALL?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/INSTALL</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/INSTALL?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/INSTALL</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> </div><div class='del'>-Installing libpng version 1.4.0 - January 3, 2010</div><div class='add'>+Installing libpng</div><div class='ctx'> </div><div class='ctx'> On Unix/Linux and similar systems, you can simply type</div><div class='ctx'> </div><div class='hunk'>@@ -13,10 +13,16 @@ If configure does not work on your system and you have a reasonably</div><div class='ctx'> up-to-date set of tools, running ./autogen.sh before running ./configure</div><div class='ctx'> may fix the problem.  You can also run the individual commands in</div><div class='ctx'> autogen.sh with the --force option, if supported by your version of</div><div class='del'>-the tools.  If you run 'libtoolize --force', though, this will replace</div><div class='del'>-the distributed, patched, version of ltmain.sh with an unpatched version</div><div class='del'>-and your shared library builds may fail to produce libraries with the</div><div class='del'>-correct version numbers.</div><div class='add'>+the tools.  To be really sure that you aren't using any of the included</div><div class='add'>+pre-built scripts, you can do this:</div><div class='add'>+</div><div class='add'>+    ./configure --enable-maintainer-mode</div><div class='add'>+    make maintainer-clean</div><div class='add'>+    ./autogen.sh</div><div class='add'>+    ./configure [--prefix=/path] [other options]</div><div class='add'>+    make</div><div class='add'>+    make install</div><div class='add'>+    make check</div><div class='ctx'> </div><div class='ctx'> Instead, you can use one of the custom-built makefiles in the</div><div class='ctx'> "scripts" directory</div><div class='hunk'>@@ -46,8 +52,8 @@ to have access to the zlib.h and zconf.h include files that</div><div class='ctx'> correspond to the version of zlib that's installed.</div><div class='ctx'> </div><div class='ctx'> You can rename the directories that you downloaded (they</div><div class='del'>-might be called "libpng-1.4.0" or "libpng14" and "zlib-1.2.3"</div><div class='del'>-or "zlib123") so that you have directories called "zlib" and "libpng".</div><div class='add'>+might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.5"</div><div class='add'>+or "zlib125") so that you have directories called "zlib" and "libpng".</div><div class='ctx'> </div><div class='ctx'> Your directory structure should look like this:</div><div class='ctx'> </div><div class='hunk'>@@ -60,8 +66,8 @@ Your directory structure should look like this:</div><div class='ctx'>           CMakeLists.txt    =&gt;  "cmake" script</div><div class='ctx'>           configuration files:</div><div class='ctx'>              configure.ac, configure, Makefile.am, Makefile.in,</div><div class='del'>-             autogen.sh, config.guess, ltmain.sh, missing,</div><div class='del'>-             aclocal.m4, config.h.in, config.sub,</div><div class='add'>+             autogen.sh, config.guess, ltmain.sh, missing, libpng.pc.in,</div><div class='add'>+             libpng-config.in, aclocal.m4, config.h.in, config.sub,</div><div class='ctx'>              depcomp, install-sh, mkinstalldirs, test-pngtest.sh</div><div class='ctx'>           contrib</div><div class='ctx'>              gregbook</div><div class='hunk'>@@ -70,13 +76,12 @@ Your directory structure should look like this:</div><div class='ctx'>              pngsuite</div><div class='ctx'>              visupng</div><div class='ctx'>           projects</div><div class='del'>-             cbuilder5 (Borland)</div><div class='del'>-             visualc6 (msvc)</div><div class='ctx'>              visualc71</div><div class='del'>-             xcode</div><div class='add'>+             vstudio</div><div class='ctx'>           scripts</div><div class='ctx'>              makefile.*</div><div class='ctx'>              *.def (module definition files)</div><div class='add'>+             etc.</div><div class='ctx'>           pngtest.png</div><div class='ctx'>           etc.</div><div class='ctx'>       zlib</div><div class='hunk'>@@ -107,7 +112,7 @@ scripts directory into this directory, for example</div><div class='ctx'> Read the makefile to see if you need to change any source or</div><div class='ctx'> target directories to match your preferences.</div><div class='ctx'> </div><div class='del'>-Then read pngconf.h to see if you want to make any configuration</div><div class='add'>+Then read pnglibconf.dfa to see if you want to make any configuration</div><div class='ctx'> changes.</div><div class='ctx'> </div><div class='ctx'> Then just run "make" which will create the libpng library in</div><div class='hunk'>@@ -125,19 +130,6 @@ do that, run "make install" in the zlib directory first if necessary).</div><div class='ctx'> Some also allow you to run "make test-installed" after you have</div><div class='ctx'> run "make install".</div><div class='ctx'> </div><div class='del'>-If you encounter a compiler error message complaining about the</div><div class='del'>-lines</div><div class='del'>-</div><div class='del'>-      __png.h__ already includes setjmp.h;</div><div class='del'>-      __dont__ include it again.;</div><div class='del'>-</div><div class='del'>-this means you have compiled another module that includes setjmp.h,</div><div class='del'>-which is hazardous because the two modules might not include exactly</div><div class='del'>-the same setjmp.h.  If you are sure that you know what you are doing</div><div class='del'>-and that they are exactly the same, then you can comment out or</div><div class='del'>-delete the two lines.  Better yet, use the cexcept interface</div><div class='del'>-instead, as demonstrated in contrib/visupng of the libpng distribution.</div><div class='del'>-</div><div class='del'>-Further information can be found in the README and libpng.txt</div><div class='add'>+Further information can be found in the README and libpng-manual.txt</div><div class='ctx'> files, in the individual makefiles, in png.h, and the manual pages</div><div class='ctx'> libpng.3 and png.5.</div><div class='head'>diff --git a/src/3rdparty/libpng/LICENSE b/src/3rdparty/libpng/LICENSE<br/>index 7462ec3..b28f15c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/LICENSE?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/LICENSE</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/LICENSE?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/LICENSE</a></div><div class='hunk'>@@ -10,8 +10,8 @@ this sentence.</div><div class='ctx'> </div><div class='ctx'> This code is released under the libpng license.</div><div class='ctx'> </div><div class='del'>-libpng versions 1.2.6, August 15, 2004, through 1.4.0, January 3, 2010, are</div><div class='del'>-Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are</div><div class='add'>+libpng versions 1.2.6, August 15, 2004, through 1.5.1, February 3, 2011, are</div><div class='add'>+Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are</div><div class='ctx'> distributed according to the same disclaimer and license as libpng-1.2.5</div><div class='ctx'> with the following individual added to the list of Contributing Authors</div><div class='ctx'> </div><div class='hunk'>@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.</div><div class='ctx'> </div><div class='ctx'> Glenn Randers-Pehrson</div><div class='ctx'> glennrp at users.sourceforge.net</div><div class='del'>-January 3, 2010</div><div class='add'>+February 3, 2011</div><div class='head'>diff --git a/src/3rdparty/libpng/README b/src/3rdparty/libpng/README<br/>index 68d7a8e..9dd6745 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/README?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/README</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/README?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/README</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-README for libpng version 1.4.0 - January 3, 2010 (shared library 14.0)</div><div class='add'>+README for libpng version 1.5.1 - February 3, 2011 (shared library 15.0)</div><div class='ctx'> See the note about version numbers near the top of png.h</div><div class='ctx'> </div><div class='ctx'> See INSTALL for instructions on how to install libpng.</div><div class='hunk'>@@ -58,7 +58,7 @@ on the PNG-implement mailing list and not on material submitted</div><div class='ctx'> privately to Guy, Andreas, or Glenn.  They will forward any good</div><div class='ctx'> suggestions to the list.</div><div class='ctx'> </div><div class='del'>-For a detailed description on using libpng, read libpng.txt.  For</div><div class='add'>+For a detailed description on using libpng, read libpng-manual.txt.  For</div><div class='ctx'> examples of libpng in a program, see example.c and pngtest.c.  For usage</div><div class='ctx'> information and restrictions (what little they are) on libpng, see</div><div class='ctx'> png.h.  For a description on using zlib (the compression library used by</div><div class='hunk'>@@ -141,13 +141,17 @@ Files in this distribution:</div><div class='ctx'>       TODO          =&gt;  Things not implemented in the current library</div><div class='ctx'>       Y2KINFO       =&gt;  Statement of Y2K compliance</div><div class='ctx'>       example.c     =&gt;  Example code for using libpng functions</div><div class='del'>-      libpng.3      =&gt;  manual page for libpng (includes libpng.txt)</div><div class='del'>-      libpng.txt    =&gt;  Description of libpng and its functions</div><div class='add'>+      libpng.3      =&gt;  manual page for libpng (includes libpng-manual.txt)</div><div class='add'>+      libpng-manual.txt  =&gt;  Description of libpng and its functions</div><div class='ctx'>       libpngpf.3    =&gt;  manual page for libpng's private functions</div><div class='ctx'>       png.5         =&gt;  manual page for the PNG format</div><div class='ctx'>       png.c         =&gt;  Basic interface functions common to library</div><div class='del'>-      png.h         =&gt;  Library function and interface declarations</div><div class='del'>-      pngconf.h     =&gt;  System specific library configuration</div><div class='add'>+      png.h         =&gt;  Library function and interface declarations (public)</div><div class='add'>+      pngpriv.h     =&gt;  Library function and interface declarations (private)</div><div class='add'>+      pngconf.h     =&gt;  System specific library configuration (public)</div><div class='add'>+      pngstruct.h   =&gt;  png_struct declaration (private)</div><div class='add'>+      pnginfo.h     =&gt;  png_info struct declaration (private)</div><div class='add'>+      pngdebug.h    =&gt;  debugging macros (private)</div><div class='ctx'>       pngerror.c    =&gt;  Error/warning message I/O functions</div><div class='ctx'>       pngget.c      =&gt;  Functions for retrieving info from struct</div><div class='ctx'>       pngmem.c      =&gt;  Memory handling functions</div><div class='hunk'>@@ -176,72 +180,16 @@ Files in this distribution:</div><div class='ctx'>        visupng      =&gt;  Contains a MSVC workspace for VisualPng</div><div class='ctx'>       projects      =&gt;  Contains project files and workspaces for</div><div class='ctx'>                         building a DLL</div><div class='del'>-       c5builder        =&gt;  Contains a Borland workspace for building</div><div class='add'>+       cbuilder5        =&gt;  Contains a Borland workspace for building</div><div class='ctx'>                             libpng and zlib</div><div class='ctx'>        visualc6         =&gt;  Contains a Microsoft Visual C++ (MSVC)</div><div class='ctx'>                             workspace for building libpng and zlib</div><div class='add'>+       visualc71        =&gt;  Contains a Microsoft Visual C++ (MSVC)</div><div class='add'>+                            workspace for building libpng and zlib</div><div class='add'>+       xcode            =&gt;  Contains an Apple xcode</div><div class='add'>+                            workspace for building libpng and zlib</div><div class='ctx'>       scripts       =&gt;  Directory containing scripts for building libpng:</div><div class='del'>-       descrip.mms      =&gt;  VMS makefile for MMS or MMK</div><div class='del'>-       makefile.std     =&gt;  Generic UNIX makefile (cc, creates static</div><div class='del'>-                            libpng.a)</div><div class='del'>-       makefile.elf     =&gt;  Linux/ELF makefile symbol versioning,</div><div class='del'>-                            gcc, creates libpng14.so.14.1.4.0)</div><div class='del'>-       makefile.linux   =&gt;  Linux/ELF makefile</div><div class='del'>-                            (gcc, creates libpng14.so.14.1.4.0)</div><div class='del'>-       makefile.gcc     =&gt;  Generic makefile (gcc, creates static libpng.a)</div><div class='del'>-       makefile.knr     =&gt;  Archaic UNIX Makefile that converts files with</div><div class='del'>-                            ansi2knr (Requires ansi2knr.c from</div><div class='del'>-                            ftp://ftp.cs.wisc.edu/ghost)</div><div class='del'>-       makefile.aix     =&gt;  AIX makefile</div><div class='del'>-       makefile.cygwin  =&gt;  Cygwin/gcc makefile</div><div class='del'>-       makefile.darwin  =&gt;  Darwin makefile</div><div class='del'>-       makefile.dec     =&gt;  DEC Alpha UNIX makefile</div><div class='del'>-       makefile.freebsd =&gt;  FreeBSD makefile</div><div class='del'>-       makefile.hpgcc   =&gt;  HPUX makefile using gcc</div><div class='del'>-       makefile.hpux    =&gt;  HPUX (10.20 and 11.00) makefile</div><div class='del'>-       makefile.hp64    =&gt;  HPUX (10.20 and 11.00) makefile, 64 bit</div><div class='del'>-       makefile.ibmc    =&gt;  IBM C/C++ version 3.x for Win32 and OS/2 (static)</div><div class='del'>-       makefile.intel   =&gt;  Intel C/C++ version 4.0 and later</div><div class='del'>-       makefile.mingw   =&gt;  Mingw/gcc makefile</div><div class='del'>-       makefile.netbsd  =&gt;  NetBSD/cc makefile, makes libpng.so.</div><div class='del'>-       makefile.ne14bsd  =&gt;  NetBSD/cc makefile, makes</div><div class='del'>-                            libpng14.so</div><div class='del'>-       makefile.openbsd =&gt;  OpenBSD makefile</div><div class='del'>-       makefile.sgi     =&gt;  Silicon Graphics IRIX (cc, creates static lib)</div><div class='del'>-       makefile.sggcc   =&gt;  Silicon Graphics</div><div class='del'>-                            (gcc, creates libpng14.so.14.1.4.0)</div><div class='del'>-       makefile.sunos   =&gt;  Sun makefile</div><div class='del'>-       makefile.solaris =&gt;  Solaris 2.X makefile</div><div class='del'>-                            (gcc, creates libpng14.so.14.1.4.0)</div><div class='del'>-       makefile.so9     =&gt;  Solaris 9 makefile</div><div class='del'>-                            (gcc, creates libpng14.so.14.1.4.0)</div><div class='del'>-       makefile.32sunu  =&gt;  Sun Ultra 32-bit makefile</div><div class='del'>-       makefile.64sunu  =&gt;  Sun Ultra 64-bit makefile</div><div class='del'>-       makefile.sco     =&gt;  For SCO OSr5  ELF and Unixware 7 with Native cc</div><div class='del'>-       makefile.mips    =&gt;  MIPS makefile</div><div class='del'>-       makefile.acorn   =&gt;  Acorn makefile</div><div class='del'>-       makefile.amiga   =&gt;  Amiga makefile</div><div class='del'>-       smakefile.ppc    =&gt;  AMIGA smakefile for SAS C V6.58/7.00 PPC</div><div class='del'>-                            compiler (Requires SCOPTIONS, copied from</div><div class='del'>-                            scripts/SCOPTIONS.ppc)</div><div class='del'>-       makefile.atari   =&gt;  Atari makefile</div><div class='del'>-       makefile.beos    =&gt;  BEOS makefile for X86</div><div class='del'>-       makefile.bor     =&gt;  Borland makefile (uses bcc)</div><div class='del'>-       makefile.bc32    =&gt;  32-bit Borland C++ (all modules compiled in C mode)</div><div class='del'>-       makefile.tc3     =&gt;  Turbo C 3.0 makefile</div><div class='del'>-       makefile.dj2     =&gt;  DJGPP 2 makefile</div><div class='del'>-       makefile.msc     =&gt;  Microsoft C makefile</div><div class='del'>-       makefile.vcwin32 =&gt;  makefile for Microsoft Visual C++ 4.0 and</div><div class='del'>-                            later (does not use assembler code)</div><div class='del'>-       makefile.os2     =&gt;  OS/2 Makefile (gcc and emx, requires pngos2.def)</div><div class='del'>-       png32ce.def      =&gt;  module definition for makefile.cegccg</div><div class='del'>-       pngos2.def       =&gt;  OS/2 module definition file used by</div><div class='del'>-                            makefile.os2</div><div class='del'>-       pngwin.def       =&gt;  module definition file used by</div><div class='del'>-                            makefile.cygwin and makefile.mingw</div><div class='del'>-       makefile.watcom  =&gt;  Watcom 10a+ Makefile, 32-bit flat memory model</div><div class='del'>-       makevms.com      =&gt;  VMS build script</div><div class='del'>-       SCOPTIONS.ppc    =&gt;  Used with smakefile.ppc</div><div class='add'>+                            (see scripts/README.txt for the list of scripts)</div><div class='ctx'> </div><div class='ctx'> Good luck, and happy coding.</div><div class='ctx'> </div><div class='head'>diff --git a/src/3rdparty/libpng/TODO b/src/3rdparty/libpng/TODO<br/>index 7fe1ddf..6e1f028 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/TODO?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/TODO</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/TODO?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/TODO</a></div><div class='hunk'>@@ -2,12 +2,10 @@</div><div class='ctx'> TODO - list of things to do for libpng:</div><div class='ctx'> </div><div class='ctx'> Final bug fixes.</div><div class='del'>-Improve API by hiding the png_struct and png_info structs.</div><div class='del'>-Finish work on the no-floating-point version (including gamma compensation)</div><div class='ctx'> Better C++ wrapper/full C++ implementation?</div><div class='ctx'> Fix problem with C++ and EXTERN "C".</div><div class='ctx'> cHRM transformation.</div><div class='del'>-Improve setjmp/longjmp usage or remove it in favor of returning error codes.</div><div class='add'>+Remove setjmp/longjmp usage in favor of returning error codes.</div><div class='ctx'> Add "grayscale-&gt;palette" transformation and "palette-&gt;grayscale" detection.</div><div class='ctx'> Improved dithering.</div><div class='ctx'> Multi-lingual error and warning message support.</div><div class='hunk'>@@ -18,14 +16,12 @@ Better filter selection</div><div class='ctx'>    (counting huffman bits/precompression?  filter inertia?  filter costs?).</div><div class='ctx'> Histogram creation.</div><div class='ctx'> Text conversion between different code pages (Latin-1 -&gt; Mac and DOS).</div><div class='del'>-Build gamma tables using fixed point (and do away with floating point entirely).</div><div class='ctx'> Avoid building gamma tables whenever possible.</div><div class='ctx'> Use greater precision when changing to linear gamma for compositing against</div><div class='ctx'>   background and doing rgb-to-gray transformation.</div><div class='ctx'> Investigate pre-incremented loop counters and other loop constructions.</div><div class='ctx'> Add interpolated method of handling interlacing.</div><div class='del'>-Provide for conditional compilation of 16-bit support (except for the</div><div class='del'>-  initial stripping down to 8-bits when reading a 16-bit PNG datastream).</div><div class='ctx'> Switch to the simpler zlib (zlib/libpng) license if legally possible.</div><div class='add'>+Extend pngvalid.c to validate more of the libpng transformations.</div><div class='ctx'> </div><div class='ctx'> */</div><div class='head'>diff --git a/src/3rdparty/libpng/aclocal.m4 b/src/3rdparty/libpng/aclocal.m4<br/>deleted file mode 100644<br/>index 27bc57c..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/aclocal.m4?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/aclocal.m4</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8949 +0,0 @@</div><div class='del'>-# generated automatically by aclocal 1.11 -*- Autoconf -*-</div><div class='del'>-</div><div class='del'>-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,</div><div class='del'>-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# This program is distributed in the hope that it will be useful,</div><div class='del'>-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without</div><div class='del'>-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A</div><div class='del'>-# PARTICULAR PURPOSE.</div><div class='del'>-</div><div class='del'>-m4_ifndef([AC_AUTOCONF_VERSION],</div><div class='del'>-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl</div><div class='del'>-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,</div><div class='del'>-[m4_warning([this file was generated for autoconf 2.65.</div><div class='del'>-You have another version of autoconf.  It may work, but is not guaranteed to.</div><div class='del'>-If you have problems, you may need to regenerate the build system entirely.</div><div class='del'>-To do so, use the procedure documented by the package, typically `autoreconf'.])])</div><div class='del'>-</div><div class='del'>-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-</div><div class='del'>-#</div><div class='del'>-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,</div><div class='del'>-#                 2006, 2007, 2008 Free Software Foundation, Inc.</div><div class='del'>-#   Written by Gordon Matzigkeit, 1996</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation gives</div><div class='del'>-# unlimited permission to copy and/or distribute it, with or without</div><div class='del'>-# modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-m4_define([_LT_COPYING], [dnl</div><div class='del'>-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,</div><div class='del'>-#                 2006, 2007, 2008 Free Software Foundation, Inc.</div><div class='del'>-#   Written by Gordon Matzigkeit, 1996</div><div class='del'>-#</div><div class='del'>-#   This file is part of GNU Libtool.</div><div class='del'>-#</div><div class='del'>-# GNU Libtool is free software; you can redistribute it and/or</div><div class='del'>-# modify it under the terms of the GNU General Public License as</div><div class='del'>-# published by the Free Software Foundation; either version 2 of</div><div class='del'>-# the License, or (at your option) any later version.</div><div class='del'>-#</div><div class='del'>-# As a special exception to the GNU General Public License,</div><div class='del'>-# if you distribute this file as part of a program or library that</div><div class='del'>-# is built using GNU Libtool, you may include this file under the</div><div class='del'>-# same distribution terms that you use for the rest of that program.</div><div class='del'>-#</div><div class='del'>-# GNU Libtool is distributed in the hope that it will be useful,</div><div class='del'>-# but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-# GNU General Public License for more details.</div><div class='del'>-#</div><div class='del'>-# You should have received a copy of the GNU General Public License</div><div class='del'>-# along with GNU Libtool; see the file COPYING.  If not, a copy</div><div class='del'>-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or</div><div class='del'>-# obtained by writing to the Free Software Foundation, Inc.,</div><div class='del'>-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-# serial 56 LT_INIT</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# LT_PREREQ(VERSION)</div><div class='del'>-# ------------------</div><div class='del'>-# Complain and exit if this libtool version is less that VERSION.</div><div class='del'>-m4_defun([LT_PREREQ],</div><div class='del'>-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,</div><div class='del'>-       [m4_default([$3],</div><div class='del'>-		   [m4_fatal([Libtool version $1 or higher is required],</div><div class='del'>-		             63)])],</div><div class='del'>-       [$2])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_CHECK_BUILDDIR</div><div class='del'>-# ------------------</div><div class='del'>-# Complain if the absolute build directory name contains unusual characters</div><div class='del'>-m4_defun([_LT_CHECK_BUILDDIR],</div><div class='del'>-[case `pwd` in</div><div class='del'>-  *\ * | *\	*)</div><div class='del'>-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;</div><div class='del'>-esac</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# LT_INIT([OPTIONS])</div><div class='del'>-# ------------------</div><div class='del'>-AC_DEFUN([LT_INIT],</div><div class='del'>-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT</div><div class='del'>-AC_BEFORE([$0], [LT_LANG])dnl</div><div class='del'>-AC_BEFORE([$0], [LT_OUTPUT])dnl</div><div class='del'>-AC_BEFORE([$0], [LTDL_INIT])dnl</div><div class='del'>-m4_require([_LT_CHECK_BUILDDIR])dnl</div><div class='del'>-</div><div class='del'>-dnl Autoconf doesn't catch unexpanded LT_ macros by default:</div><div class='del'>-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl</div><div class='del'>-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl</div><div class='del'>-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4</div><div class='del'>-dnl unless we require an AC_DEFUNed macro:</div><div class='del'>-AC_REQUIRE([LTOPTIONS_VERSION])dnl</div><div class='del'>-AC_REQUIRE([LTSUGAR_VERSION])dnl</div><div class='del'>-AC_REQUIRE([LTVERSION_VERSION])dnl</div><div class='del'>-AC_REQUIRE([LTOBSOLETE_VERSION])dnl</div><div class='del'>-m4_require([_LT_PROG_LTMAIN])dnl</div><div class='del'>-</div><div class='del'>-dnl Parse OPTIONS</div><div class='del'>-_LT_SET_OPTIONS([$0], [$1])</div><div class='del'>-</div><div class='del'>-# This can be used to rebuild libtool when needed</div><div class='del'>-LIBTOOL_DEPS="$ltmain"</div><div class='del'>-</div><div class='del'>-# Always use our own libtool.</div><div class='del'>-LIBTOOL='$(SHELL) $(top_builddir)/libtool'</div><div class='del'>-AC_SUBST(LIBTOOL)dnl</div><div class='del'>-</div><div class='del'>-_LT_SETUP</div><div class='del'>-</div><div class='del'>-# Only expand once:</div><div class='del'>-m4_define([LT_INIT])</div><div class='del'>-])# LT_INIT</div><div class='del'>-</div><div class='del'>-# Old names:</div><div class='del'>-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])</div><div class='del'>-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])</div><div class='del'>-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_CC_BASENAME(CC)</div><div class='del'>-# -------------------</div><div class='del'>-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.</div><div class='del'>-m4_defun([_LT_CC_BASENAME],</div><div class='del'>-[for cc_temp in $1""; do</div><div class='del'>-  case $cc_temp in</div><div class='del'>-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;</div><div class='del'>-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;</div><div class='del'>-    \-*) ;;</div><div class='del'>-    *) break;;</div><div class='del'>-  esac</div><div class='del'>-done</div><div class='del'>-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_FILEUTILS_DEFAULTS</div><div class='del'>-# ----------------------</div><div class='del'>-# It is okay to use these file commands and assume they have been set</div><div class='del'>-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.</div><div class='del'>-m4_defun([_LT_FILEUTILS_DEFAULTS],</div><div class='del'>-[: ${CP="cp -f"}</div><div class='del'>-: ${MV="mv -f"}</div><div class='del'>-: ${RM="rm -f"}</div><div class='del'>-])# _LT_FILEUTILS_DEFAULTS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_SETUP</div><div class='del'>-# ---------</div><div class='del'>-m4_defun([_LT_SETUP],</div><div class='del'>-[AC_REQUIRE([AC_CANONICAL_HOST])dnl</div><div class='del'>-AC_REQUIRE([AC_CANONICAL_BUILD])dnl</div><div class='del'>-_LT_DECL([], [host_alias], [0], [The host system])dnl</div><div class='del'>-_LT_DECL([], [host], [0])dnl</div><div class='del'>-_LT_DECL([], [host_os], [0])dnl</div><div class='del'>-dnl</div><div class='del'>-_LT_DECL([], [build_alias], [0], [The build system])dnl</div><div class='del'>-_LT_DECL([], [build], [0])dnl</div><div class='del'>-_LT_DECL([], [build_os], [0])dnl</div><div class='del'>-dnl</div><div class='del'>-AC_REQUIRE([AC_PROG_CC])dnl</div><div class='del'>-AC_REQUIRE([LT_PATH_LD])dnl</div><div class='del'>-AC_REQUIRE([LT_PATH_NM])dnl</div><div class='del'>-dnl</div><div class='del'>-AC_REQUIRE([AC_PROG_LN_S])dnl</div><div class='del'>-test -z "$LN_S" &amp;&amp; LN_S="ln -s"</div><div class='del'>-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl</div><div class='del'>-dnl</div><div class='del'>-AC_REQUIRE([LT_CMD_MAX_LEN])dnl</div><div class='del'>-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl</div><div class='del'>-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl</div><div class='del'>-dnl</div><div class='del'>-m4_require([_LT_FILEUTILS_DEFAULTS])dnl</div><div class='del'>-m4_require([_LT_CHECK_SHELL_FEATURES])dnl</div><div class='del'>-m4_require([_LT_CMD_RELOAD])dnl</div><div class='del'>-m4_require([_LT_CHECK_MAGIC_METHOD])dnl</div><div class='del'>-m4_require([_LT_CMD_OLD_ARCHIVE])dnl</div><div class='del'>-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl</div><div class='del'>-</div><div class='del'>-_LT_CONFIG_LIBTOOL_INIT([</div><div class='del'>-# See if we are running on zsh, and set the options which allow our</div><div class='del'>-# commands through without removal of \ escapes INIT.</div><div class='del'>-if test -n "\${ZSH_VERSION+set}" ; then</div><div class='del'>-   setopt NO_GLOB_SUBST</div><div class='del'>-fi</div><div class='del'>-])</div><div class='del'>-if test -n "${ZSH_VERSION+set}" ; then</div><div class='del'>-   setopt NO_GLOB_SUBST</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-_LT_CHECK_OBJDIR</div><div class='del'>-</div><div class='del'>-m4_require([_LT_TAG_COMPILER])dnl</div><div class='del'>-_LT_PROG_ECHO_BACKSLASH</div><div class='del'>-</div><div class='del'>-case $host_os in</div><div class='del'>-aix3*)</div><div class='del'>-  # AIX sometimes has problems with the GCC collect2 program.  For some</div><div class='del'>-  # reason, if we set the COLLECT_NAMES environment variable, the problems</div><div class='del'>-  # vanish in a puff of smoke.</div><div class='del'>-  if test "X${COLLECT_NAMES+set}" != Xset; then</div><div class='del'>-    COLLECT_NAMES=</div><div class='del'>-    export COLLECT_NAMES</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# Sed substitution that helps us do robust quoting.  It backslashifies</div><div class='del'>-# metacharacters that are still active within double-quoted strings.</div><div class='del'>-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'</div><div class='del'>-</div><div class='del'>-# Same as above, but do not quote variable references.</div><div class='del'>-double_quote_subst='s/\([["`\\]]\)/\\\1/g'</div><div class='del'>-</div><div class='del'>-# Sed substitution to delay expansion of an escaped shell variable in a</div><div class='del'>-# double_quote_subst'ed string.</div><div class='del'>-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'</div><div class='del'>-</div><div class='del'>-# Sed substitution to delay expansion of an escaped single quote.</div><div class='del'>-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'</div><div class='del'>-</div><div class='del'>-# Sed substitution to avoid accidental globbing in evaled expressions</div><div class='del'>-no_glob_subst='s/\*/\\\*/g'</div><div class='del'>-</div><div class='del'>-# Global variables:</div><div class='del'>-ofile=libtool</div><div class='del'>-can_build_shared=yes</div><div class='del'>-</div><div class='del'>-# All known linkers require a `.a' archive for static linking (except MSVC,</div><div class='del'>-# which needs '.lib').</div><div class='del'>-libext=a</div><div class='del'>-</div><div class='del'>-with_gnu_ld="$lt_cv_prog_gnu_ld"</div><div class='del'>-</div><div class='del'>-old_CC="$CC"</div><div class='del'>-old_CFLAGS="$CFLAGS"</div><div class='del'>-</div><div class='del'>-# Set sane defaults for various variables</div><div class='del'>-test -z "$CC" &amp;&amp; CC=cc</div><div class='del'>-test -z "$LTCC" &amp;&amp; LTCC=$CC</div><div class='del'>-test -z "$LTCFLAGS" &amp;&amp; LTCFLAGS=$CFLAGS</div><div class='del'>-test -z "$LD" &amp;&amp; LD=ld</div><div class='del'>-test -z "$ac_objext" &amp;&amp; ac_objext=o</div><div class='del'>-</div><div class='del'>-_LT_CC_BASENAME([$compiler])</div><div class='del'>-</div><div class='del'>-# Only perform the check for file, if the check method requires it</div><div class='del'>-test -z "$MAGIC_CMD" &amp;&amp; MAGIC_CMD=file</div><div class='del'>-case $deplibs_check_method in</div><div class='del'>-file_magic*)</div><div class='del'>-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then</div><div class='del'>-    _LT_PATH_MAGIC</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# Use C for the default configuration in the libtool script</div><div class='del'>-LT_SUPPORTED_TAG([CC])</div><div class='del'>-_LT_LANG_C_CONFIG</div><div class='del'>-_LT_LANG_DEFAULT_CONFIG</div><div class='del'>-_LT_CONFIG_COMMANDS</div><div class='del'>-])# _LT_SETUP</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_PROG_LTMAIN</div><div class='del'>-# ---------------</div><div class='del'>-# Note that this code is called both from `configure', and `config.status'</div><div class='del'>-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,</div><div class='del'>-# `config.status' has no value for ac_aux_dir unless we are using Automake,</div><div class='del'>-# so we pass a copy along to make sure it has a sensible value anyway.</div><div class='del'>-m4_defun([_LT_PROG_LTMAIN],</div><div class='del'>-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl</div><div class='del'>-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])</div><div class='del'>-ltmain="$ac_aux_dir/ltmain.sh"</div><div class='del'>-])# _LT_PROG_LTMAIN</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# So that we can recreate a full libtool script including additional</div><div class='del'>-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS</div><div class='del'>-# in macros and then make a single call at the end using the `libtool'</div><div class='del'>-# label.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])</div><div class='del'>-# ----------------------------------------</div><div class='del'>-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.</div><div class='del'>-m4_define([_LT_CONFIG_LIBTOOL_INIT],</div><div class='del'>-[m4_ifval([$1],</div><div class='del'>-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],</div><div class='del'>-                     [$1</div><div class='del'>-])])])</div><div class='del'>-</div><div class='del'>-# Initialize.</div><div class='del'>-m4_define([_LT_OUTPUT_LIBTOOL_INIT])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_CONFIG_LIBTOOL([COMMANDS])</div><div class='del'>-# ------------------------------</div><div class='del'>-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.</div><div class='del'>-m4_define([_LT_CONFIG_LIBTOOL],</div><div class='del'>-[m4_ifval([$1],</div><div class='del'>-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],</div><div class='del'>-                     [$1</div><div class='del'>-])])])</div><div class='del'>-</div><div class='del'>-# Initialize.</div><div class='del'>-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])</div><div class='del'>-# -----------------------------------------------------</div><div class='del'>-m4_defun([_LT_CONFIG_SAVE_COMMANDS],</div><div class='del'>-[_LT_CONFIG_LIBTOOL([$1])</div><div class='del'>-_LT_CONFIG_LIBTOOL_INIT([$2])</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_FORMAT_COMMENT([COMMENT])</div><div class='del'>-# -----------------------------</div><div class='del'>-# Add leading comment marks to the start of each line, and a trailing</div><div class='del'>-# full-stop to the whole comment if one is not present already.</div><div class='del'>-m4_define([_LT_FORMAT_COMMENT],</div><div class='del'>-[m4_ifval([$1], [</div><div class='del'>-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],</div><div class='del'>-              [['`$\]], [\\\&amp;])]m4_bmatch([$1], [[!?.]$], [], [.])</div><div class='del'>-)])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])</div><div class='del'>-# -------------------------------------------------------------------</div><div class='del'>-# CONFIGNAME is the name given to the value in the libtool script.</div><div class='del'>-# VARNAME is the (base) name used in the configure script.</div><div class='del'>-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on</div><div class='del'>-# VARNAME.  Any other value will be used directly.</div><div class='del'>-m4_define([_LT_DECL],</div><div class='del'>-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],</div><div class='del'>-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],</div><div class='del'>-	[m4_ifval([$1], [$1], [$2])])</div><div class='del'>-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])</div><div class='del'>-    m4_ifval([$4],</div><div class='del'>-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])</div><div class='del'>-    lt_dict_add_subkey([lt_decl_dict], [$2],</div><div class='del'>-	[tagged?], [m4_ifval([$5], [yes], [no])])])</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])</div><div class='del'>-# --------------------------------------------------------</div><div class='del'>-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])</div><div class='del'>-# ------------------------------------------------</div><div class='del'>-m4_define([lt_decl_tag_varnames],</div><div class='del'>-[_lt_decl_filter([tagged?], [yes], $@)])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])</div><div class='del'>-# ---------------------------------------------------------</div><div class='del'>-m4_define([_lt_decl_filter],</div><div class='del'>-[m4_case([$#],</div><div class='del'>-  [0], [m4_fatal([$0: too few arguments: $#])],</div><div class='del'>-  [1], [m4_fatal([$0: too few arguments: $#: $1])],</div><div class='del'>-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],</div><div class='del'>-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],</div><div class='del'>-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])</div><div class='del'>-# --------------------------------------------------</div><div class='del'>-m4_define([lt_decl_quote_varnames],</div><div class='del'>-[_lt_decl_filter([value], [1], $@)])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])</div><div class='del'>-# ---------------------------------------------------</div><div class='del'>-m4_define([lt_decl_dquote_varnames],</div><div class='del'>-[_lt_decl_filter([value], [2], $@)])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])</div><div class='del'>-# ---------------------------------------------------</div><div class='del'>-m4_define([lt_decl_varnames_tagged],</div><div class='del'>-[m4_assert([$# &lt;= 2])dnl</div><div class='del'>-_$0(m4_quote(m4_default([$1], [[, ]])),</div><div class='del'>-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),</div><div class='del'>-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])</div><div class='del'>-m4_define([_lt_decl_varnames_tagged],</div><div class='del'>-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])</div><div class='del'>-# ------------------------------------------------</div><div class='del'>-m4_define([lt_decl_all_varnames],</div><div class='del'>-[_$0(m4_quote(m4_default([$1], [[, ]])),</div><div class='del'>-     m4_if([$2], [],</div><div class='del'>-	   m4_quote(lt_decl_varnames),</div><div class='del'>-	m4_quote(m4_shift($@))))[]dnl</div><div class='del'>-])</div><div class='del'>-m4_define([_lt_decl_all_varnames],</div><div class='del'>-[lt_join($@, lt_decl_varnames_tagged([$1],</div><div class='del'>-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_CONFIG_STATUS_DECLARE([VARNAME])</div><div class='del'>-# ------------------------------------</div><div class='del'>-# Quote a variable value, and forward it to `config.status' so that its</div><div class='del'>-# declaration there will have the same value as in `configure'.  VARNAME</div><div class='del'>-# must have a single quote delimited value for this to work.</div><div class='del'>-m4_define([_LT_CONFIG_STATUS_DECLARE],</div><div class='del'>-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_CONFIG_STATUS_DECLARATIONS</div><div class='del'>-# ------------------------------</div><div class='del'>-# We delimit libtool config variables with single quotes, so when</div><div class='del'>-# we write them to config.status, we have to be sure to quote all</div><div class='del'>-# embedded single quotes properly.  In configure, this macro expands</div><div class='del'>-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:</div><div class='del'>-#</div><div class='del'>-#    &lt;var&gt;='`$ECHO "X$&lt;var&gt;" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],</div><div class='del'>-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),</div><div class='del'>-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_LIBTOOL_TAGS</div><div class='del'>-# ----------------</div><div class='del'>-# Output comment and list of tags supported by the script</div><div class='del'>-m4_defun([_LT_LIBTOOL_TAGS],</div><div class='del'>-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl</div><div class='del'>-available_tags="_LT_TAGS"dnl</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])</div><div class='del'>-# -----------------------------------</div><div class='del'>-# Extract the dictionary values for VARNAME (optionally with TAG) and</div><div class='del'>-# expand to a commented shell variable setting:</div><div class='del'>-#</div><div class='del'>-#    # Some comment about what VAR is for.</div><div class='del'>-#    visible_name=$lt_internal_name</div><div class='del'>-m4_define([_LT_LIBTOOL_DECLARE],</div><div class='del'>-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],</div><div class='del'>-					   [description])))[]dnl</div><div class='del'>-m4_pushdef([_libtool_name],</div><div class='del'>-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl</div><div class='del'>-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),</div><div class='del'>-    [0], [_libtool_name=[$]$1],</div><div class='del'>-    [1], [_libtool_name=$lt_[]$1],</div><div class='del'>-    [2], [_libtool_name=$lt_[]$1],</div><div class='del'>-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl</div><div class='del'>-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_LIBTOOL_CONFIG_VARS</div><div class='del'>-# -----------------------</div><div class='del'>-# Produce commented declarations of non-tagged libtool config variables</div><div class='del'>-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'</div><div class='del'>-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG</div><div class='del'>-# section) are produced by _LT_LIBTOOL_TAG_VARS.</div><div class='del'>-m4_defun([_LT_LIBTOOL_CONFIG_VARS],</div><div class='del'>-[m4_foreach([_lt_var],</div><div class='del'>-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),</div><div class='del'>-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_LIBTOOL_TAG_VARS(TAG)</div><div class='del'>-# -------------------------</div><div class='del'>-m4_define([_LT_LIBTOOL_TAG_VARS],</div><div class='del'>-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),</div><div class='del'>-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_TAGVAR(VARNAME, [TAGNAME])</div><div class='del'>-# ------------------------------</div><div class='del'>-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_CONFIG_COMMANDS</div><div class='del'>-# -------------------</div><div class='del'>-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of</div><div class='del'>-# variables for single and double quote escaping we saved from calls</div><div class='del'>-# to _LT_DECL, we can put quote escaped variables declarations</div><div class='del'>-# into `config.status', and then the shell code to quote escape them in</div><div class='del'>-# for loops in `config.status'.  Finally, any additional code accumulated</div><div class='del'>-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.</div><div class='del'>-m4_defun([_LT_CONFIG_COMMANDS],</div><div class='del'>-[AC_PROVIDE_IFELSE([LT_OUTPUT],</div><div class='del'>-	dnl If the libtool generation code has been placed in $CONFIG_LT,</div><div class='del'>-	dnl instead of duplicating it all over again into config.status,</div><div class='del'>-	dnl then we will have config.status run $CONFIG_LT later, so it</div><div class='del'>-	dnl needs to know what name is stored there:</div><div class='del'>-        [AC_CONFIG_COMMANDS([libtool],</div><div class='del'>-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],</div><div class='del'>-    dnl If the libtool generation code is destined for config.status,</div><div class='del'>-    dnl expand the accumulated commands and init code now:</div><div class='del'>-    [AC_CONFIG_COMMANDS([libtool],</div><div class='del'>-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])</div><div class='del'>-])#_LT_CONFIG_COMMANDS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Initialize.</div><div class='del'>-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],</div><div class='del'>-[</div><div class='del'>-</div><div class='del'>-# The HP-UX ksh and POSIX shell print the target directory to stdout</div><div class='del'>-# if CDPATH is set.</div><div class='del'>-(unset CDPATH) &gt;/dev/null 2&gt;&amp;1 &amp;&amp; unset CDPATH</div><div class='del'>-</div><div class='del'>-sed_quote_subst='$sed_quote_subst'</div><div class='del'>-double_quote_subst='$double_quote_subst'</div><div class='del'>-delay_variable_subst='$delay_variable_subst'</div><div class='del'>-_LT_CONFIG_STATUS_DECLARATIONS</div><div class='del'>-LTCC='$LTCC'</div><div class='del'>-LTCFLAGS='$LTCFLAGS'</div><div class='del'>-compiler='$compiler_DEFAULT'</div><div class='del'>-</div><div class='del'>-# Quote evaled strings.</div><div class='del'>-for var in lt_decl_all_varnames([[ \</div><div class='del'>-]], lt_decl_quote_varnames); do</div><div class='del'>-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in</div><div class='del'>-    *[[\\\\\\\`\\"\\\$]]*)</div><div class='del'>-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""</div><div class='del'>-      ;;</div><div class='del'>-    *)</div><div class='del'>-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-# Double-quote double-evaled strings.</div><div class='del'>-for var in lt_decl_all_varnames([[ \</div><div class='del'>-]], lt_decl_dquote_varnames); do</div><div class='del'>-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in</div><div class='del'>-    *[[\\\\\\\`\\"\\\$]]*)</div><div class='del'>-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""</div><div class='del'>-      ;;</div><div class='del'>-    *)</div><div class='del'>-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-# Fix-up fallback echo if it was mangled by the above quoting rules.</div><div class='del'>-case \$lt_ECHO in</div><div class='del'>-*'\\\[$]0 --fallback-echo"')dnl "</div><div class='del'>-  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-_LT_OUTPUT_LIBTOOL_INIT</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# LT_OUTPUT</div><div class='del'>-# ---------</div><div class='del'>-# This macro allows early generation of the libtool script (before</div><div class='del'>-# AC_OUTPUT is called), incase it is used in configure for compilation</div><div class='del'>-# tests.</div><div class='del'>-AC_DEFUN([LT_OUTPUT],</div><div class='del'>-[: ${CONFIG_LT=./config.lt}</div><div class='del'>-AC_MSG_NOTICE([creating $CONFIG_LT])</div><div class='del'>-cat &gt;"$CONFIG_LT" &lt;&lt;_LTEOF</div><div class='del'>-#! $SHELL</div><div class='del'>-# Generated by $as_me.</div><div class='del'>-# Run this file to recreate a libtool stub with the current configuration.</div><div class='del'>-</div><div class='del'>-lt_cl_silent=false</div><div class='del'>-SHELL=\${CONFIG_SHELL-$SHELL}</div><div class='del'>-_LTEOF</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;"$CONFIG_LT" &lt;&lt;\_LTEOF</div><div class='del'>-AS_SHELL_SANITIZE</div><div class='del'>-_AS_PREPARE</div><div class='del'>-</div><div class='del'>-exec AS_MESSAGE_FD&gt;&amp;1</div><div class='del'>-exec AS_MESSAGE_LOG_FD&gt;&gt;config.log</div><div class='del'>-{</div><div class='del'>-  echo</div><div class='del'>-  AS_BOX([Running $as_me.])</div><div class='del'>-} &gt;&amp;AS_MESSAGE_LOG_FD</div><div class='del'>-</div><div class='del'>-lt_cl_help="\</div><div class='del'>-\`$as_me' creates a local libtool stub from the current configuration,</div><div class='del'>-for use in further configure time tests before the real libtool is</div><div class='del'>-generated.</div><div class='del'>-</div><div class='del'>-Usage: $[0] [[OPTIONS]]</div><div class='del'>-</div><div class='del'>-  -h, --help      print this help, then exit</div><div class='del'>-  -V, --version   print version number, then exit</div><div class='del'>-  -q, --quiet     do not print progress messages</div><div class='del'>-  -d, --debug     don't remove temporary files</div><div class='del'>-</div><div class='del'>-Report bugs to &lt;bug-libtool@gnu.org&gt;."</div><div class='del'>-</div><div class='del'>-lt_cl_version="\</div><div class='del'>-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl</div><div class='del'>-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])</div><div class='del'>-configured by $[0], generated by m4_PACKAGE_STRING.</div><div class='del'>-</div><div class='del'>-Copyright (C) 2008 Free Software Foundation, Inc.</div><div class='del'>-This config.lt script is free software; the Free Software Foundation</div><div class='del'>-gives unlimited permision to copy, distribute and modify it."</div><div class='del'>-</div><div class='del'>-while test $[#] != 0</div><div class='del'>-do</div><div class='del'>-  case $[1] in</div><div class='del'>-    --version | --v* | -V )</div><div class='del'>-      echo "$lt_cl_version"; exit 0 ;;</div><div class='del'>-    --help | --h* | -h )</div><div class='del'>-      echo "$lt_cl_help"; exit 0 ;;</div><div class='del'>-    --debug | --d* | -d )</div><div class='del'>-      debug=: ;;</div><div class='del'>-    --quiet | --q* | --silent | --s* | -q )</div><div class='del'>-      lt_cl_silent=: ;;</div><div class='del'>-</div><div class='del'>-    -*) AC_MSG_ERROR([unrecognized option: $[1]</div><div class='del'>-Try \`$[0] --help' for more information.]) ;;</div><div class='del'>-</div><div class='del'>-    *) AC_MSG_ERROR([unrecognized argument: $[1]</div><div class='del'>-Try \`$[0] --help' for more information.]) ;;</div><div class='del'>-  esac</div><div class='del'>-  shift</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-if $lt_cl_silent; then</div><div class='del'>-  exec AS_MESSAGE_FD&gt;/dev/null</div><div class='del'>-fi</div><div class='del'>-_LTEOF</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;"$CONFIG_LT" &lt;&lt;_LTEOF</div><div class='del'>-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT</div><div class='del'>-_LTEOF</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;"$CONFIG_LT" &lt;&lt;\_LTEOF</div><div class='del'>-AC_MSG_NOTICE([creating $ofile])</div><div class='del'>-_LT_OUTPUT_LIBTOOL_COMMANDS</div><div class='del'>-AS_EXIT(0)</div><div class='del'>-_LTEOF</div><div class='del'>-chmod +x "$CONFIG_LT"</div><div class='del'>-</div><div class='del'>-# configure is writing to config.log, but config.lt does its own redirection,</div><div class='del'>-# appending to config.log, which fails on DOS, as config.log is still kept</div><div class='del'>-# open by configure.  Here we exec the FD to /dev/null, effectively closing</div><div class='del'>-# config.log, so it can be properly (re)opened and appended to by config.lt.</div><div class='del'>-if test "$no_create" != yes; then</div><div class='del'>-  lt_cl_success=:</div><div class='del'>-  test "$silent" = yes &amp;&amp;</div><div class='del'>-    lt_config_lt_args="$lt_config_lt_args --quiet"</div><div class='del'>-  exec AS_MESSAGE_LOG_FD&gt;/dev/null</div><div class='del'>-  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false</div><div class='del'>-  exec AS_MESSAGE_LOG_FD&gt;&gt;config.log</div><div class='del'>-  $lt_cl_success || AS_EXIT(1)</div><div class='del'>-fi</div><div class='del'>-])# LT_OUTPUT</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_CONFIG(TAG)</div><div class='del'>-# ---------------</div><div class='del'>-# If TAG is the built-in tag, create an initial libtool script with a</div><div class='del'>-# default configuration from the untagged config vars.  Otherwise add code</div><div class='del'>-# to config.status for appending the configuration named by TAG from the</div><div class='del'>-# matching tagged config vars.</div><div class='del'>-m4_defun([_LT_CONFIG],</div><div class='del'>-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl</div><div class='del'>-_LT_CONFIG_SAVE_COMMANDS([</div><div class='del'>-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl</div><div class='del'>-  m4_if(_LT_TAG, [C], [</div><div class='del'>-    # See if we are running on zsh, and set the options which allow our</div><div class='del'>-    # commands through without removal of \ escapes.</div><div class='del'>-    if test -n "${ZSH_VERSION+set}" ; then</div><div class='del'>-      setopt NO_GLOB_SUBST</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    cfgfile="${ofile}T"</div><div class='del'>-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15</div><div class='del'>-    $RM "$cfgfile"</div><div class='del'>-</div><div class='del'>-    cat &lt;&lt;_LT_EOF &gt;&gt; "$cfgfile"</div><div class='del'>-#! $SHELL</div><div class='del'>-</div><div class='del'>-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.</div><div class='del'>-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION</div><div class='del'>-# Libtool was configured on host `(hostname || uname -n) 2&gt;/dev/null | sed 1q`:</div><div class='del'>-# NOTE: Changes made to this file will be lost: look at ltmain.sh.</div><div class='del'>-#</div><div class='del'>-_LT_COPYING</div><div class='del'>-_LT_LIBTOOL_TAGS</div><div class='del'>-</div><div class='del'>-# ### BEGIN LIBTOOL CONFIG</div><div class='del'>-_LT_LIBTOOL_CONFIG_VARS</div><div class='del'>-_LT_LIBTOOL_TAG_VARS</div><div class='del'>-# ### END LIBTOOL CONFIG</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-</div><div class='del'>-  case $host_os in</div><div class='del'>-  aix3*)</div><div class='del'>-    cat &lt;&lt;\_LT_EOF &gt;&gt; "$cfgfile"</div><div class='del'>-# AIX sometimes has problems with the GCC collect2 program.  For some</div><div class='del'>-# reason, if we set the COLLECT_NAMES environment variable, the problems</div><div class='del'>-# vanish in a puff of smoke.</div><div class='del'>-if test "X${COLLECT_NAMES+set}" != Xset; then</div><div class='del'>-  COLLECT_NAMES=</div><div class='del'>-  export COLLECT_NAMES</div><div class='del'>-fi</div><div class='del'>-_LT_EOF</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  _LT_PROG_LTMAIN</div><div class='del'>-</div><div class='del'>-  # We use sed instead of cat because bash on DJGPP gets confused if</div><div class='del'>-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in</div><div class='del'>-  # text mode, it properly converts lines to CR/LF.  This bash problem</div><div class='del'>-  # is reportedly fixed, but why not run on old versions too?</div><div class='del'>-  sed '/^# Generated shell functions inserted here/q' "$ltmain" &gt;&gt; "$cfgfile" \</div><div class='del'>-    || (rm -f "$cfgfile"; exit 1)</div><div class='del'>-</div><div class='del'>-  _LT_PROG_XSI_SHELLFNS</div><div class='del'>-</div><div class='del'>-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" &gt;&gt; "$cfgfile" \</div><div class='del'>-    || (rm -f "$cfgfile"; exit 1)</div><div class='del'>-</div><div class='del'>-  mv -f "$cfgfile" "$ofile" ||</div><div class='del'>-    (rm -f "$ofile" &amp;&amp; cp "$cfgfile" "$ofile" &amp;&amp; rm -f "$cfgfile")</div><div class='del'>-  chmod +x "$ofile"</div><div class='del'>-],</div><div class='del'>-[cat &lt;&lt;_LT_EOF &gt;&gt; "$ofile"</div><div class='del'>-</div><div class='del'>-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded</div><div class='del'>-dnl in a comment (ie after a #).</div><div class='del'>-# ### BEGIN LIBTOOL TAG CONFIG: $1</div><div class='del'>-_LT_LIBTOOL_TAG_VARS(_LT_TAG)</div><div class='del'>-# ### END LIBTOOL TAG CONFIG: $1</div><div class='del'>-_LT_EOF</div><div class='del'>-])dnl /m4_if</div><div class='del'>-],</div><div class='del'>-[m4_if([$1], [], [</div><div class='del'>-    PACKAGE='$PACKAGE'</div><div class='del'>-    VERSION='$VERSION'</div><div class='del'>-    TIMESTAMP='$TIMESTAMP'</div><div class='del'>-    RM='$RM'</div><div class='del'>-    ofile='$ofile'], [])</div><div class='del'>-])dnl /_LT_CONFIG_SAVE_COMMANDS</div><div class='del'>-])# _LT_CONFIG</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# LT_SUPPORTED_TAG(TAG)</div><div class='del'>-# ---------------------</div><div class='del'>-# Trace this macro to discover what tags are supported by the libtool</div><div class='del'>-# --tag option, using:</div><div class='del'>-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'</div><div class='del'>-AC_DEFUN([LT_SUPPORTED_TAG], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# C support is built-in for now</div><div class='del'>-m4_define([_LT_LANG_C_enabled], [])</div><div class='del'>-m4_define([_LT_TAGS], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# LT_LANG(LANG)</div><div class='del'>-# -------------</div><div class='del'>-# Enable libtool support for the given language if not already enabled.</div><div class='del'>-AC_DEFUN([LT_LANG],</div><div class='del'>-[AC_BEFORE([$0], [LT_OUTPUT])dnl</div><div class='del'>-m4_case([$1],</div><div class='del'>-  [C],			[_LT_LANG(C)],</div><div class='del'>-  [C++],		[_LT_LANG(CXX)],</div><div class='del'>-  [Java],		[_LT_LANG(GCJ)],</div><div class='del'>-  [Fortran 77],		[_LT_LANG(F77)],</div><div class='del'>-  [Fortran],		[_LT_LANG(FC)],</div><div class='del'>-  [Windows Resource],	[_LT_LANG(RC)],</div><div class='del'>-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],</div><div class='del'>-    [_LT_LANG($1)],</div><div class='del'>-    [m4_fatal([$0: unsupported language: "$1"])])])dnl</div><div class='del'>-])# LT_LANG</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_LANG(LANGNAME)</div><div class='del'>-# ------------------</div><div class='del'>-m4_defun([_LT_LANG],</div><div class='del'>-[m4_ifdef([_LT_LANG_]$1[_enabled], [],</div><div class='del'>-  [LT_SUPPORTED_TAG([$1])dnl</div><div class='del'>-  m4_append([_LT_TAGS], [$1 ])dnl</div><div class='del'>-  m4_define([_LT_LANG_]$1[_enabled], [])dnl</div><div class='del'>-  _LT_LANG_$1_CONFIG($1)])dnl</div><div class='del'>-])# _LT_LANG</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_LANG_DEFAULT_CONFIG</div><div class='del'>-# -----------------------</div><div class='del'>-m4_defun([_LT_LANG_DEFAULT_CONFIG],</div><div class='del'>-[AC_PROVIDE_IFELSE([AC_PROG_CXX],</div><div class='del'>-  [LT_LANG(CXX)],</div><div class='del'>-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])</div><div class='del'>-</div><div class='del'>-AC_PROVIDE_IFELSE([AC_PROG_F77],</div><div class='del'>-  [LT_LANG(F77)],</div><div class='del'>-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])</div><div class='del'>-</div><div class='del'>-AC_PROVIDE_IFELSE([AC_PROG_FC],</div><div class='del'>-  [LT_LANG(FC)],</div><div class='del'>-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])</div><div class='del'>-</div><div class='del'>-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal</div><div class='del'>-dnl pulling things in needlessly.</div><div class='del'>-AC_PROVIDE_IFELSE([AC_PROG_GCJ],</div><div class='del'>-  [LT_LANG(GCJ)],</div><div class='del'>-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],</div><div class='del'>-    [LT_LANG(GCJ)],</div><div class='del'>-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],</div><div class='del'>-      [LT_LANG(GCJ)],</div><div class='del'>-      [m4_ifdef([AC_PROG_GCJ],</div><div class='del'>-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])</div><div class='del'>-       m4_ifdef([A][M_PROG_GCJ],</div><div class='del'>-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])</div><div class='del'>-       m4_ifdef([LT_PROG_GCJ],</div><div class='del'>-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])</div><div class='del'>-</div><div class='del'>-AC_PROVIDE_IFELSE([LT_PROG_RC],</div><div class='del'>-  [LT_LANG(RC)],</div><div class='del'>-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])</div><div class='del'>-])# _LT_LANG_DEFAULT_CONFIG</div><div class='del'>-</div><div class='del'>-# Obsolete macros:</div><div class='del'>-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])</div><div class='del'>-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])</div><div class='del'>-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])</div><div class='del'>-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])</div><div class='del'>-dnl AC_DEFUN([AC_LIBTOOL_F77], [])</div><div class='del'>-dnl AC_DEFUN([AC_LIBTOOL_FC], [])</div><div class='del'>-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_TAG_COMPILER</div><div class='del'>-# ----------------</div><div class='del'>-m4_defun([_LT_TAG_COMPILER],</div><div class='del'>-[AC_REQUIRE([AC_PROG_CC])dnl</div><div class='del'>-</div><div class='del'>-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl</div><div class='del'>-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl</div><div class='del'>-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl</div><div class='del'>-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl</div><div class='del'>-</div><div class='del'>-# If no C compiler was specified, use CC.</div><div class='del'>-LTCC=${LTCC-"$CC"}</div><div class='del'>-</div><div class='del'>-# If no C compiler flags were specified, use CFLAGS.</div><div class='del'>-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}</div><div class='del'>-</div><div class='del'>-# Allow CC to be a program name with arguments.</div><div class='del'>-compiler=$CC</div><div class='del'>-])# _LT_TAG_COMPILER</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_COMPILER_BOILERPLATE</div><div class='del'>-# ------------------------</div><div class='del'>-# Check for compiler boilerplate output or warnings with</div><div class='del'>-# the simple compiler test code.</div><div class='del'>-m4_defun([_LT_COMPILER_BOILERPLATE],</div><div class='del'>-[m4_require([_LT_DECL_SED])dnl</div><div class='del'>-ac_outfile=conftest.$ac_objext</div><div class='del'>-echo "$lt_simple_compile_test_code" &gt;conftest.$ac_ext</div><div class='del'>-eval "$ac_compile" 2&gt;&amp;1 &gt;/dev/null | $SED '/^$/d; /^ *+/d' &gt;conftest.err</div><div class='del'>-_lt_compiler_boilerplate=`cat conftest.err`</div><div class='del'>-$RM conftest*</div><div class='del'>-])# _LT_COMPILER_BOILERPLATE</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_LINKER_BOILERPLATE</div><div class='del'>-# ----------------------</div><div class='del'>-# Check for linker boilerplate output or warnings with</div><div class='del'>-# the simple link test code.</div><div class='del'>-m4_defun([_LT_LINKER_BOILERPLATE],</div><div class='del'>-[m4_require([_LT_DECL_SED])dnl</div><div class='del'>-ac_outfile=conftest.$ac_objext</div><div class='del'>-echo "$lt_simple_link_test_code" &gt;conftest.$ac_ext</div><div class='del'>-eval "$ac_link" 2&gt;&amp;1 &gt;/dev/null | $SED '/^$/d; /^ *+/d' &gt;conftest.err</div><div class='del'>-_lt_linker_boilerplate=`cat conftest.err`</div><div class='del'>-$RM -r conftest*</div><div class='del'>-])# _LT_LINKER_BOILERPLATE</div><div class='del'>-</div><div class='del'>-# _LT_REQUIRED_DARWIN_CHECKS</div><div class='del'>-# -------------------------</div><div class='del'>-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[</div><div class='del'>-  case $host_os in</div><div class='del'>-    rhapsody* | darwin*)</div><div class='del'>-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])</div><div class='del'>-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])</div><div class='del'>-    AC_CHECK_TOOL([LIPO], [lipo], [:])</div><div class='del'>-    AC_CHECK_TOOL([OTOOL], [otool], [:])</div><div class='del'>-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])</div><div class='del'>-    _LT_DECL([], [DSYMUTIL], [1],</div><div class='del'>-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])</div><div class='del'>-    _LT_DECL([], [NMEDIT], [1],</div><div class='del'>-      [Tool to change global to local symbols on Mac OS X])</div><div class='del'>-    _LT_DECL([], [LIPO], [1],</div><div class='del'>-      [Tool to manipulate fat objects and archives on Mac OS X])</div><div class='del'>-    _LT_DECL([], [OTOOL], [1],</div><div class='del'>-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])</div><div class='del'>-    _LT_DECL([], [OTOOL64], [1],</div><div class='del'>-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])</div><div class='del'>-</div><div class='del'>-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],</div><div class='del'>-      [lt_cv_apple_cc_single_mod=no</div><div class='del'>-      if test -z "${LT_MULTI_MODULE}"; then</div><div class='del'>-	# By default we will add the -single_module flag. You can override</div><div class='del'>-	# by either setting the environment variable LT_MULTI_MODULE</div><div class='del'>-	# non-empty at configure time, or by adding -multi_module to the</div><div class='del'>-	# link flags.</div><div class='del'>-	rm -rf libconftest.dylib*</div><div class='del'>-	echo "int foo(void){return 1;}" &gt; conftest.c</div><div class='del'>-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \</div><div class='del'>--dynamiclib -Wl,-single_module conftest.c" &gt;&amp;AS_MESSAGE_LOG_FD</div><div class='del'>-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \</div><div class='del'>-	  -dynamiclib -Wl,-single_module conftest.c 2&gt;conftest.err</div><div class='del'>-        _lt_result=$?</div><div class='del'>-	if test -f libconftest.dylib &amp;&amp; test ! -s conftest.err &amp;&amp; test $_lt_result = 0; then</div><div class='del'>-	  lt_cv_apple_cc_single_mod=yes</div><div class='del'>-	else</div><div class='del'>-	  cat conftest.err &gt;&amp;AS_MESSAGE_LOG_FD</div><div class='del'>-	fi</div><div class='del'>-	rm -rf libconftest.dylib*</div><div class='del'>-	rm -f conftest.*</div><div class='del'>-      fi])</div><div class='del'>-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],</div><div class='del'>-      [lt_cv_ld_exported_symbols_list],</div><div class='del'>-      [lt_cv_ld_exported_symbols_list=no</div><div class='del'>-      save_LDFLAGS=$LDFLAGS</div><div class='del'>-      echo "_main" &gt; conftest.sym</div><div class='del'>-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"</div><div class='del'>-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],</div><div class='del'>-	[lt_cv_ld_exported_symbols_list=yes],</div><div class='del'>-	[lt_cv_ld_exported_symbols_list=no])</div><div class='del'>-	LDFLAGS="$save_LDFLAGS"</div><div class='del'>-    ])</div><div class='del'>-    case $host_os in</div><div class='del'>-    rhapsody* | darwin1.[[012]])</div><div class='del'>-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;</div><div class='del'>-    darwin1.*)</div><div class='del'>-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;</div><div class='del'>-    darwin*) # darwin 5.x on</div><div class='del'>-      # if running on 10.5 or later, the deployment target defaults</div><div class='del'>-      # to the OS version, if on x86, and 10.4, the deployment</div><div class='del'>-      # target defaults to 10.4. Don't you love it?</div><div class='del'>-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in</div><div class='del'>-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)</div><div class='del'>-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;</div><div class='del'>-	10.[[012]]*)</div><div class='del'>-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;</div><div class='del'>-	10.*)</div><div class='del'>-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;</div><div class='del'>-      esac</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then</div><div class='del'>-      _lt_dar_single_mod='$single_module'</div><div class='del'>-    fi</div><div class='del'>-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then</div><div class='del'>-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'</div><div class='del'>-    else</div><div class='del'>-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'</div><div class='del'>-    fi</div><div class='del'>-    if test "$DSYMUTIL" != ":"; then</div><div class='del'>-      _lt_dsymutil='~$DSYMUTIL $lib || :'</div><div class='del'>-    else</div><div class='del'>-      _lt_dsymutil=</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_DARWIN_LINKER_FEATURES</div><div class='del'>-# --------------------------</div><div class='del'>-# Checks for linker and compiler features on darwin</div><div class='del'>-m4_defun([_LT_DARWIN_LINKER_FEATURES],</div><div class='del'>-[</div><div class='del'>-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])</div><div class='del'>-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no</div><div class='del'>-  _LT_TAGVAR(hardcode_direct, $1)=no</div><div class='del'>-  _LT_TAGVAR(hardcode_automatic, $1)=yes</div><div class='del'>-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported</div><div class='del'>-  _LT_TAGVAR(whole_archive_flag_spec, $1)=''</div><div class='del'>-  _LT_TAGVAR(link_all_deplibs, $1)=yes</div><div class='del'>-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"</div><div class='del'>-  case $cc_basename in</div><div class='del'>-     ifort*) _lt_dar_can_shared=yes ;;</div><div class='del'>-     *) _lt_dar_can_shared=$GCC ;;</div><div class='del'>-  esac</div><div class='del'>-  if test "$_lt_dar_can_shared" = "yes"; then</div><div class='del'>-    output_verbose_link_cmd=echo</div><div class='del'>-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"</div><div class='del'>-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"</div><div class='del'>-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' &lt; \$export_symbols &gt; \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"</div><div class='del'>-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' &lt; \$export_symbols &gt; \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"</div><div class='del'>-    m4_if([$1], [CXX],</div><div class='del'>-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then</div><div class='del'>-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"</div><div class='del'>-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' &lt; \$export_symbols &gt; \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"</div><div class='del'>-    fi</div><div class='del'>-],[])</div><div class='del'>-  else</div><div class='del'>-  _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-  fi</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-# _LT_SYS_MODULE_PATH_AIX</div><div class='del'>-# -----------------------</div><div class='del'>-# Links a minimal program and checks the executable</div><div class='del'>-# for the system default hardcoded library path. In most cases,</div><div class='del'>-# this is /usr/lib:/lib, but when the MPI compilers are used</div><div class='del'>-# the location of the communication and MPI libs are included too.</div><div class='del'>-# If we don't find anything, use the default library path according</div><div class='del'>-# to the aix ld manual.</div><div class='del'>-m4_defun([_LT_SYS_MODULE_PATH_AIX],</div><div class='del'>-[m4_require([_LT_DECL_SED])dnl</div><div class='del'>-AC_LINK_IFELSE(AC_LANG_PROGRAM,[</div><div class='del'>-lt_aix_libpath_sed='</div><div class='del'>-    /Import File Strings/,/^$/ {</div><div class='del'>-	/^0/ {</div><div class='del'>-	    s/^0  *\(.*\)$/\1/</div><div class='del'>-	    p</div><div class='del'>-	}</div><div class='del'>-    }'</div><div class='del'>-aix_libpath=`dump -H conftest$ac_exeext 2&gt;/dev/null | $SED -n -e "$lt_aix_libpath_sed"`</div><div class='del'>-# Check for a 64-bit object if we didn't find anything.</div><div class='del'>-if test -z "$aix_libpath"; then</div><div class='del'>-  aix_libpath=`dump -HX64 conftest$ac_exeext 2&gt;/dev/null | $SED -n -e "$lt_aix_libpath_sed"`</div><div class='del'>-fi],[])</div><div class='del'>-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi</div><div class='del'>-])# _LT_SYS_MODULE_PATH_AIX</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_SHELL_INIT(ARG)</div><div class='del'>-# -------------------</div><div class='del'>-m4_define([_LT_SHELL_INIT],</div><div class='del'>-[ifdef([AC_DIVERSION_NOTICE],</div><div class='del'>-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],</div><div class='del'>-	 [AC_DIVERT_PUSH(NOTICE)])</div><div class='del'>-$1</div><div class='del'>-AC_DIVERT_POP</div><div class='del'>-])# _LT_SHELL_INIT</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_PROG_ECHO_BACKSLASH</div><div class='del'>-# -----------------------</div><div class='del'>-# Add some code to the start of the generated configure script which</div><div class='del'>-# will find an echo command which doesn't interpret backslashes.</div><div class='del'>-m4_defun([_LT_PROG_ECHO_BACKSLASH],</div><div class='del'>-[_LT_SHELL_INIT([</div><div class='del'>-# Check that we are running under the correct shell.</div><div class='del'>-SHELL=${CONFIG_SHELL-/bin/sh}</div><div class='del'>-</div><div class='del'>-case X$lt_ECHO in</div><div class='del'>-X*--fallback-echo)</div><div class='del'>-  # Remove one level of quotation (which was required for Make).</div><div class='del'>-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-ECHO=${lt_ECHO-echo}</div><div class='del'>-if test "X[$]1" = X--no-reexec; then</div><div class='del'>-  # Discard the --no-reexec flag, and continue.</div><div class='del'>-  shift</div><div class='del'>-elif test "X[$]1" = X--fallback-echo; then</div><div class='del'>-  # Avoid inline document here, it may be left over</div><div class='del'>-  :</div><div class='del'>-elif test "X`{ $ECHO '\t'; } 2&gt;/dev/null`" = 'X\t' ; then</div><div class='del'>-  # Yippee, $ECHO works!</div><div class='del'>-  :</div><div class='del'>-else</div><div class='del'>-  # Restart under the correct shell.</div><div class='del'>-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test "X[$]1" = X--fallback-echo; then</div><div class='del'>-  # used as fallback echo</div><div class='del'>-  shift</div><div class='del'>-  cat &lt;&lt;_LT_EOF</div><div class='del'>-[$]*</div><div class='del'>-_LT_EOF</div><div class='del'>-  exit 0</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# The HP-UX ksh and POSIX shell print the target directory to stdout</div><div class='del'>-# if CDPATH is set.</div><div class='del'>-(unset CDPATH) &gt;/dev/null 2&gt;&amp;1 &amp;&amp; unset CDPATH</div><div class='del'>-</div><div class='del'>-if test -z "$lt_ECHO"; then</div><div class='del'>-  if test "X${echo_test_string+set}" != Xset; then</div><div class='del'>-    # find a string as large as possible, as long as the shell can cope with it</div><div class='del'>-    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do</div><div class='del'>-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...</div><div class='del'>-      if { echo_test_string=`eval $cmd`; } 2&gt;/dev/null &amp;&amp;</div><div class='del'>-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2&gt;/dev/null</div><div class='del'>-      then</div><div class='del'>-        break</div><div class='del'>-      fi</div><div class='del'>-    done</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  if test "X`{ $ECHO '\t'; } 2&gt;/dev/null`" = 'X\t' &amp;&amp;</div><div class='del'>-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-     test "X$echo_testing_string" = "X$echo_test_string"; then</div><div class='del'>-    :</div><div class='del'>-  else</div><div class='del'>-    # The Solaris, AIX, and Digital Unix default echo programs unquote</div><div class='del'>-    # backslashes.  This makes it impossible to quote backslashes using</div><div class='del'>-    #   echo "$something" | sed 's/\\/\\\\/g'</div><div class='del'>-    #</div><div class='del'>-    # So, first we look for a working echo in the user's PATH.</div><div class='del'>-</div><div class='del'>-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR</div><div class='del'>-    for dir in $PATH /usr/ucb; do</div><div class='del'>-      IFS="$lt_save_ifs"</div><div class='del'>-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &amp;&amp;</div><div class='del'>-         test "X`($dir/echo '\t') 2&gt;/dev/null`" = 'X\t' &amp;&amp;</div><div class='del'>-         echo_testing_string=`($dir/echo "$echo_test_string") 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-         test "X$echo_testing_string" = "X$echo_test_string"; then</div><div class='del'>-        ECHO="$dir/echo"</div><div class='del'>-        break</div><div class='del'>-      fi</div><div class='del'>-    done</div><div class='del'>-    IFS="$lt_save_ifs"</div><div class='del'>-</div><div class='del'>-    if test "X$ECHO" = Xecho; then</div><div class='del'>-      # We didn't find a better echo, so look for alternatives.</div><div class='del'>-      if test "X`{ print -r '\t'; } 2&gt;/dev/null`" = 'X\t' &amp;&amp;</div><div class='del'>-         echo_testing_string=`{ print -r "$echo_test_string"; } 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-         test "X$echo_testing_string" = "X$echo_test_string"; then</div><div class='del'>-        # This shell has a builtin print -r that does the trick.</div><div class='del'>-        ECHO='print -r'</div><div class='del'>-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &amp;&amp;</div><div class='del'>-	   test "X$CONFIG_SHELL" != X/bin/ksh; then</div><div class='del'>-        # If we have ksh, try running configure again with it.</div><div class='del'>-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}</div><div class='del'>-        export ORIGINAL_CONFIG_SHELL</div><div class='del'>-        CONFIG_SHELL=/bin/ksh</div><div class='del'>-        export CONFIG_SHELL</div><div class='del'>-        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}</div><div class='del'>-      else</div><div class='del'>-        # Try using printf.</div><div class='del'>-        ECHO='printf %s\n'</div><div class='del'>-        if test "X`{ $ECHO '\t'; } 2&gt;/dev/null`" = 'X\t' &amp;&amp;</div><div class='del'>-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-	   test "X$echo_testing_string" = "X$echo_test_string"; then</div><div class='del'>-	  # Cool, printf works</div><div class='del'>-	  :</div><div class='del'>-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-	     test "X$echo_testing_string" = 'X\t' &amp;&amp;</div><div class='del'>-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-	     test "X$echo_testing_string" = "X$echo_test_string"; then</div><div class='del'>-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL</div><div class='del'>-	  export CONFIG_SHELL</div><div class='del'>-	  SHELL="$CONFIG_SHELL"</div><div class='del'>-	  export SHELL</div><div class='del'>-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"</div><div class='del'>-        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-	     test "X$echo_testing_string" = 'X\t' &amp;&amp;</div><div class='del'>-	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-	     test "X$echo_testing_string" = "X$echo_test_string"; then</div><div class='del'>-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"</div><div class='del'>-        else</div><div class='del'>-	  # maybe with a smaller string...</div><div class='del'>-	  prev=:</div><div class='del'>-</div><div class='del'>-	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do</div><div class='del'>-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2&gt;/dev/null</div><div class='del'>-	    then</div><div class='del'>-	      break</div><div class='del'>-	    fi</div><div class='del'>-	    prev="$cmd"</div><div class='del'>-	  done</div><div class='del'>-</div><div class='del'>-	  if test "$prev" != 'sed 50q "[$]0"'; then</div><div class='del'>-	    echo_test_string=`eval $prev`</div><div class='del'>-	    export echo_test_string</div><div class='del'>-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}</div><div class='del'>-	  else</div><div class='del'>-	    # Oops.  We lost completely, so just stick with echo.</div><div class='del'>-	    ECHO=echo</div><div class='del'>-	  fi</div><div class='del'>-        fi</div><div class='del'>-      fi</div><div class='del'>-    fi</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Copy echo and quote the copy suitably for passing to libtool from</div><div class='del'>-# the Makefile, instead of quoting the original, which is used later.</div><div class='del'>-lt_ECHO=$ECHO</div><div class='del'>-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then</div><div class='del'>-   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AC_SUBST(lt_ECHO)</div><div class='del'>-])</div><div class='del'>-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])</div><div class='del'>-_LT_DECL([], [ECHO], [1],</div><div class='del'>-    [An echo program that does not interpret backslashes])</div><div class='del'>-])# _LT_PROG_ECHO_BACKSLASH</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_ENABLE_LOCK</div><div class='del'>-# ---------------</div><div class='del'>-m4_defun([_LT_ENABLE_LOCK],</div><div class='del'>-[AC_ARG_ENABLE([libtool-lock],</div><div class='del'>-  [AS_HELP_STRING([--disable-libtool-lock],</div><div class='del'>-    [avoid locking (might break parallel builds)])])</div><div class='del'>-test "x$enable_libtool_lock" != xno &amp;&amp; enable_libtool_lock=yes</div><div class='del'>-</div><div class='del'>-# Some flags need to be propagated to the compiler or linker for good</div><div class='del'>-# libtool support.</div><div class='del'>-case $host in</div><div class='del'>-ia64-*-hpux*)</div><div class='del'>-  # Find out which ABI we are using.</div><div class='del'>-  echo 'int i;' &gt; conftest.$ac_ext</div><div class='del'>-  if AC_TRY_EVAL(ac_compile); then</div><div class='del'>-    case `/usr/bin/file conftest.$ac_objext` in</div><div class='del'>-      *ELF-32*)</div><div class='del'>-	HPUX_IA64_MODE="32"</div><div class='del'>-	;;</div><div class='del'>-      *ELF-64*)</div><div class='del'>-	HPUX_IA64_MODE="64"</div><div class='del'>-	;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-  rm -rf conftest*</div><div class='del'>-  ;;</div><div class='del'>-*-*-irix6*)</div><div class='del'>-  # Find out which ABI we are using.</div><div class='del'>-  echo '[#]line __oline__ "configure"' &gt; conftest.$ac_ext</div><div class='del'>-  if AC_TRY_EVAL(ac_compile); then</div><div class='del'>-    if test "$lt_cv_prog_gnu_ld" = yes; then</div><div class='del'>-      case `/usr/bin/file conftest.$ac_objext` in</div><div class='del'>-	*32-bit*)</div><div class='del'>-	  LD="${LD-ld} -melf32bsmip"</div><div class='del'>-	  ;;</div><div class='del'>-	*N32*)</div><div class='del'>-	  LD="${LD-ld} -melf32bmipn32"</div><div class='del'>-	  ;;</div><div class='del'>-	*64-bit*)</div><div class='del'>-	  LD="${LD-ld} -melf64bmip"</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-    else</div><div class='del'>-      case `/usr/bin/file conftest.$ac_objext` in</div><div class='del'>-	*32-bit*)</div><div class='del'>-	  LD="${LD-ld} -32"</div><div class='del'>-	  ;;</div><div class='del'>-	*N32*)</div><div class='del'>-	  LD="${LD-ld} -n32"</div><div class='del'>-	  ;;</div><div class='del'>-	*64-bit*)</div><div class='del'>-	  LD="${LD-ld} -64"</div><div class='del'>-	  ;;</div><div class='del'>-      esac</div><div class='del'>-    fi</div><div class='del'>-  fi</div><div class='del'>-  rm -rf conftest*</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \</div><div class='del'>-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)</div><div class='del'>-  # Find out which ABI we are using.</div><div class='del'>-  echo 'int i;' &gt; conftest.$ac_ext</div><div class='del'>-  if AC_TRY_EVAL(ac_compile); then</div><div class='del'>-    case `/usr/bin/file conftest.o` in</div><div class='del'>-      *32-bit*)</div><div class='del'>-	case $host in</div><div class='del'>-	  x86_64-*kfreebsd*-gnu)</div><div class='del'>-	    LD="${LD-ld} -m elf_i386_fbsd"</div><div class='del'>-	    ;;</div><div class='del'>-	  x86_64-*linux*)</div><div class='del'>-	    LD="${LD-ld} -m elf_i386"</div><div class='del'>-	    ;;</div><div class='del'>-	  ppc64-*linux*|powerpc64-*linux*)</div><div class='del'>-	    LD="${LD-ld} -m elf32ppclinux"</div><div class='del'>-	    ;;</div><div class='del'>-	  s390x-*linux*)</div><div class='del'>-	    LD="${LD-ld} -m elf_s390"</div><div class='del'>-	    ;;</div><div class='del'>-	  sparc64-*linux*)</div><div class='del'>-	    LD="${LD-ld} -m elf32_sparc"</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      *64-bit*)</div><div class='del'>-	case $host in</div><div class='del'>-	  x86_64-*kfreebsd*-gnu)</div><div class='del'>-	    LD="${LD-ld} -m elf_x86_64_fbsd"</div><div class='del'>-	    ;;</div><div class='del'>-	  x86_64-*linux*)</div><div class='del'>-	    LD="${LD-ld} -m elf_x86_64"</div><div class='del'>-	    ;;</div><div class='del'>-	  ppc*-*linux*|powerpc*-*linux*)</div><div class='del'>-	    LD="${LD-ld} -m elf64ppc"</div><div class='del'>-	    ;;</div><div class='del'>-	  s390*-*linux*|s390*-*tpf*)</div><div class='del'>-	    LD="${LD-ld} -m elf64_s390"</div><div class='del'>-	    ;;</div><div class='del'>-	  sparc*-*linux*)</div><div class='del'>-	    LD="${LD-ld} -m elf64_sparc"</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-  rm -rf conftest*</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-*-*-sco3.2v5*)</div><div class='del'>-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.</div><div class='del'>-  SAVE_CFLAGS="$CFLAGS"</div><div class='del'>-  CFLAGS="$CFLAGS -belf"</div><div class='del'>-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,</div><div class='del'>-    [AC_LANG_PUSH(C)</div><div class='del'>-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])</div><div class='del'>-     AC_LANG_POP])</div><div class='del'>-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then</div><div class='del'>-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf</div><div class='del'>-    CFLAGS="$SAVE_CFLAGS"</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-sparc*-*solaris*)</div><div class='del'>-  # Find out which ABI we are using.</div><div class='del'>-  echo 'int i;' &gt; conftest.$ac_ext</div><div class='del'>-  if AC_TRY_EVAL(ac_compile); then</div><div class='del'>-    case `/usr/bin/file conftest.o` in</div><div class='del'>-    *64-bit*)</div><div class='del'>-      case $lt_cv_prog_gnu_ld in</div><div class='del'>-      yes*) LD="${LD-ld} -m elf64_sparc" ;;</div><div class='del'>-      *)</div><div class='del'>-	if ${LD-ld} -64 -r -o conftest2.o conftest.o &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-	  LD="${LD-ld} -64"</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-  rm -rf conftest*</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-need_locks="$enable_libtool_lock"</div><div class='del'>-])# _LT_ENABLE_LOCK</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_CMD_OLD_ARCHIVE</div><div class='del'>-# -------------------</div><div class='del'>-m4_defun([_LT_CMD_OLD_ARCHIVE],</div><div class='del'>-[AC_CHECK_TOOL(AR, ar, false)</div><div class='del'>-test -z "$AR" &amp;&amp; AR=ar</div><div class='del'>-test -z "$AR_FLAGS" &amp;&amp; AR_FLAGS=cru</div><div class='del'>-_LT_DECL([], [AR], [1], [The archiver])</div><div class='del'>-_LT_DECL([], [AR_FLAGS], [1])</div><div class='del'>-</div><div class='del'>-AC_CHECK_TOOL(STRIP, strip, :)</div><div class='del'>-test -z "$STRIP" &amp;&amp; STRIP=:</div><div class='del'>-_LT_DECL([], [STRIP], [1], [A symbol stripping program])</div><div class='del'>-</div><div class='del'>-AC_CHECK_TOOL(RANLIB, ranlib, :)</div><div class='del'>-test -z "$RANLIB" &amp;&amp; RANLIB=:</div><div class='del'>-_LT_DECL([], [RANLIB], [1],</div><div class='del'>-    [Commands used to install an old-style archive])</div><div class='del'>-</div><div class='del'>-# Determine commands to create old-style static archives.</div><div class='del'>-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'</div><div class='del'>-old_postinstall_cmds='chmod 644 $oldlib'</div><div class='del'>-old_postuninstall_cmds=</div><div class='del'>-</div><div class='del'>-if test -n "$RANLIB"; then</div><div class='del'>-  case $host_os in</div><div class='del'>-  openbsd*)</div><div class='del'>-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"</div><div class='del'>-fi</div><div class='del'>-_LT_DECL([], [old_postinstall_cmds], [2])</div><div class='del'>-_LT_DECL([], [old_postuninstall_cmds], [2])</div><div class='del'>-_LT_TAGDECL([], [old_archive_cmds], [2],</div><div class='del'>-    [Commands used to build an old-style archive])</div><div class='del'>-])# _LT_CMD_OLD_ARCHIVE</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,</div><div class='del'>-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])</div><div class='del'>-# ----------------------------------------------------------------</div><div class='del'>-# Check whether the given compiler option works</div><div class='del'>-AC_DEFUN([_LT_COMPILER_OPTION],</div><div class='del'>-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl</div><div class='del'>-m4_require([_LT_DECL_SED])dnl</div><div class='del'>-AC_CACHE_CHECK([$1], [$2],</div><div class='del'>-  [$2=no</div><div class='del'>-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])</div><div class='del'>-   echo "$lt_simple_compile_test_code" &gt; conftest.$ac_ext</div><div class='del'>-   lt_compiler_flag="$3"</div><div class='del'>-   # Insert the option either (1) after the last *FLAGS variable, or</div><div class='del'>-   # (2) before a word containing "conftest.", or (3) at the end.</div><div class='del'>-   # Note that $ac_compile itself does not contain backslashes and begins</div><div class='del'>-   # with a dollar sign (not a hyphen), so the echo should work correctly.</div><div class='del'>-   # The option is referenced via a variable to avoid confusing sed.</div><div class='del'>-   lt_compile=`echo "$ac_compile" | $SED \</div><div class='del'>-   -e 's:.*FLAGS}\{0,1\} :&amp;$lt_compiler_flag :; t' \</div><div class='del'>-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&amp;:; t' \</div><div class='del'>-   -e 's:$: $lt_compiler_flag:'`</div><div class='del'>-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" &gt;&amp;AS_MESSAGE_LOG_FD)</div><div class='del'>-   (eval "$lt_compile" 2&gt;conftest.err)</div><div class='del'>-   ac_status=$?</div><div class='del'>-   cat conftest.err &gt;&amp;AS_MESSAGE_LOG_FD</div><div class='del'>-   echo "$as_me:__oline__: \$? = $ac_status" &gt;&amp;AS_MESSAGE_LOG_FD</div><div class='del'>-   if (exit $ac_status) &amp;&amp; test -s "$ac_outfile"; then</div><div class='del'>-     # The compiler can only warn and ignore the option if not recognized</div><div class='del'>-     # So say no if there are warnings other than the usual output.</div><div class='del'>-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' &gt;conftest.exp</div><div class='del'>-     $SED '/^$/d; /^ *+/d' conftest.err &gt;conftest.er2</div><div class='del'>-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 &gt;/dev/null; then</div><div class='del'>-       $2=yes</div><div class='del'>-     fi</div><div class='del'>-   fi</div><div class='del'>-   $RM conftest*</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-if test x"[$]$2" = xyes; then</div><div class='del'>-    m4_if([$5], , :, [$5])</div><div class='del'>-else</div><div class='del'>-    m4_if([$6], , :, [$6])</div><div class='del'>-fi</div><div class='del'>-])# _LT_COMPILER_OPTION</div><div class='del'>-</div><div class='del'>-# Old name:</div><div class='del'>-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,</div><div class='del'>-#                  [ACTION-SUCCESS], [ACTION-FAILURE])</div><div class='del'>-# ----------------------------------------------------</div><div class='del'>-# Check whether the given linker option works</div><div class='del'>-AC_DEFUN([_LT_LINKER_OPTION],</div><div class='del'>-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl</div><div class='del'>-m4_require([_LT_DECL_SED])dnl</div><div class='del'>-AC_CACHE_CHECK([$1], [$2],</div><div class='del'>-  [$2=no</div><div class='del'>-   save_LDFLAGS="$LDFLAGS"</div><div class='del'>-   LDFLAGS="$LDFLAGS $3"</div><div class='del'>-   echo "$lt_simple_link_test_code" &gt; conftest.$ac_ext</div><div class='del'>-   if (eval $ac_link 2&gt;conftest.err) &amp;&amp; test -s conftest$ac_exeext; then</div><div class='del'>-     # The linker can only warn and ignore the option if not recognized</div><div class='del'>-     # So say no if there are warnings</div><div class='del'>-     if test -s conftest.err; then</div><div class='del'>-       # Append any errors to the config.log.</div><div class='del'>-       cat conftest.err 1&gt;&amp;AS_MESSAGE_LOG_FD</div><div class='del'>-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' &gt; conftest.exp</div><div class='del'>-       $SED '/^$/d; /^ *+/d' conftest.err &gt;conftest.er2</div><div class='del'>-       if diff conftest.exp conftest.er2 &gt;/dev/null; then</div><div class='del'>-         $2=yes</div><div class='del'>-       fi</div><div class='del'>-     else</div><div class='del'>-       $2=yes</div><div class='del'>-     fi</div><div class='del'>-   fi</div><div class='del'>-   $RM -r conftest*</div><div class='del'>-   LDFLAGS="$save_LDFLAGS"</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-if test x"[$]$2" = xyes; then</div><div class='del'>-    m4_if([$4], , :, [$4])</div><div class='del'>-else</div><div class='del'>-    m4_if([$5], , :, [$5])</div><div class='del'>-fi</div><div class='del'>-])# _LT_LINKER_OPTION</div><div class='del'>-</div><div class='del'>-# Old name:</div><div class='del'>-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# LT_CMD_MAX_LEN</div><div class='del'>-#---------------</div><div class='del'>-AC_DEFUN([LT_CMD_MAX_LEN],</div><div class='del'>-[AC_REQUIRE([AC_CANONICAL_HOST])dnl</div><div class='del'>-# find the maximum length of command line arguments</div><div class='del'>-AC_MSG_CHECKING([the maximum length of command line arguments])</div><div class='del'>-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl</div><div class='del'>-  i=0</div><div class='del'>-  teststring="ABCD"</div><div class='del'>-</div><div class='del'>-  case $build_os in</div><div class='del'>-  msdosdjgpp*)</div><div class='del'>-    # On DJGPP, this test can blow up pretty badly due to problems in libc</div><div class='del'>-    # (any single argument exceeding 2000 bytes causes a buffer overrun</div><div class='del'>-    # during glob expansion).  Even if it were fixed, the result of this</div><div class='del'>-    # check would be larger than it should be.</div><div class='del'>-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  gnu*)</div><div class='del'>-    # Under GNU Hurd, this test is not required because there is</div><div class='del'>-    # no limit to the length of command line arguments.</div><div class='del'>-    # Libtool will interpret -1 as no limit whatsoever</div><div class='del'>-    lt_cv_sys_max_cmd_len=-1;</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  cygwin* | mingw* | cegcc*)</div><div class='del'>-    # On Win9x/ME, this test blows up -- it succeeds, but takes</div><div class='del'>-    # about 5 minutes as the teststring grows exponentially.</div><div class='del'>-    # Worse, since 9x/ME are not pre-emptively multitasking,</div><div class='del'>-    # you end up with a "frozen" computer, even though with patience</div><div class='del'>-    # the test eventually succeeds (with a max line length of 256k).</div><div class='del'>-    # Instead, let's just punt: use the minimum linelength reported by</div><div class='del'>-    # all of the supported platforms: 8192 (on NT/2K/XP).</div><div class='del'>-    lt_cv_sys_max_cmd_len=8192;</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  amigaos*)</div><div class='del'>-    # On AmigaOS with pdksh, this test takes hours, literally.</div><div class='del'>-    # So we just punt and use a minimum line length of 8192.</div><div class='del'>-    lt_cv_sys_max_cmd_len=8192;</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)</div><div class='del'>-    # This has been around since 386BSD, at least.  Likely further.</div><div class='del'>-    if test -x /sbin/sysctl; then</div><div class='del'>-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`</div><div class='del'>-    elif test -x /usr/sbin/sysctl; then</div><div class='del'>-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`</div><div class='del'>-    else</div><div class='del'>-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs</div><div class='del'>-    fi</div><div class='del'>-    # And add a safety zone</div><div class='del'>-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`</div><div class='del'>-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  interix*)</div><div class='del'>-    # We know the value 262144 and hardcode it with a safety zone (like BSD)</div><div class='del'>-    lt_cv_sys_max_cmd_len=196608</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  osf*)</div><div class='del'>-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure</div><div class='del'>-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not</div><div class='del'>-    # nice to cause kernel panics so lets avoid the loop below.</div><div class='del'>-    # First set a reasonable default.</div><div class='del'>-    lt_cv_sys_max_cmd_len=16384</div><div class='del'>-    #</div><div class='del'>-    if test -x /sbin/sysconfig; then</div><div class='del'>-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in</div><div class='del'>-        *1*) lt_cv_sys_max_cmd_len=-1 ;;</div><div class='del'>-      esac</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  sco3.2v5*)</div><div class='del'>-    lt_cv_sys_max_cmd_len=102400</div><div class='del'>-    ;;</div><div class='del'>-  sysv5* | sco5v6* | sysv4.2uw2*)</div><div class='del'>-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2&gt;/dev/null`</div><div class='del'>-    if test -n "$kargmax"; then</div><div class='del'>-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`</div><div class='del'>-    else</div><div class='del'>-      lt_cv_sys_max_cmd_len=32768</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2&gt; /dev/null`</div><div class='del'>-    if test -n "$lt_cv_sys_max_cmd_len"; then</div><div class='del'>-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`</div><div class='del'>-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`</div><div class='del'>-    else</div><div class='del'>-      # Make teststring a little bigger before we do anything with it.</div><div class='del'>-      # a 1K string should be a reasonable start.</div><div class='del'>-      for i in 1 2 3 4 5 6 7 8 ; do</div><div class='del'>-        teststring=$teststring$teststring</div><div class='del'>-      done</div><div class='del'>-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}</div><div class='del'>-      # If test is not a shell built-in, we'll probably end up computing a</div><div class='del'>-      # maximum length that is only half of the actual maximum length, but</div><div class='del'>-      # we can't tell.</div><div class='del'>-      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2&gt;/dev/null` \</div><div class='del'>-	         = "XX$teststring$teststring"; } &gt;/dev/null 2&gt;&amp;1 &amp;&amp;</div><div class='del'>-	      test $i != 17 # 1/2 MB should be enough</div><div class='del'>-      do</div><div class='del'>-        i=`expr $i + 1`</div><div class='del'>-        teststring=$teststring$teststring</div><div class='del'>-      done</div><div class='del'>-      # Only check the string length outside the loop.</div><div class='del'>-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2&gt;&amp;1`</div><div class='del'>-      teststring=</div><div class='del'>-      # Add a significant safety factor because C++ compilers can tack on</div><div class='del'>-      # massive amounts of additional arguments before passing them to the</div><div class='del'>-      # linker.  It appears as though 1/2 is a usable value.</div><div class='del'>-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-])</div><div class='del'>-if test -n $lt_cv_sys_max_cmd_len ; then</div><div class='del'>-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)</div><div class='del'>-else</div><div class='del'>-  AC_MSG_RESULT(none)</div><div class='del'>-fi</div><div class='del'>-max_cmd_len=$lt_cv_sys_max_cmd_len</div><div class='del'>-_LT_DECL([], [max_cmd_len], [0],</div><div class='del'>-    [What is the maximum length of a command?])</div><div class='del'>-])# LT_CMD_MAX_LEN</div><div class='del'>-</div><div class='del'>-# Old name:</div><div class='del'>-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_HEADER_DLFCN</div><div class='del'>-# ----------------</div><div class='del'>-m4_defun([_LT_HEADER_DLFCN],</div><div class='del'>-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl</div><div class='del'>-])# _LT_HEADER_DLFCN</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,</div><div class='del'>-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)</div><div class='del'>-# ----------------------------------------------------------------</div><div class='del'>-m4_defun([_LT_TRY_DLOPEN_SELF],</div><div class='del'>-[m4_require([_LT_HEADER_DLFCN])dnl</div><div class='del'>-if test "$cross_compiling" = yes; then :</div><div class='del'>-  [$4]</div><div class='del'>-else</div><div class='del'>-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2</div><div class='del'>-  lt_status=$lt_dlunknown</div><div class='del'>-  cat &gt; conftest.$ac_ext &lt;&lt;_LT_EOF</div><div class='del'>-[#line __oline__ "configure"</div><div class='del'>-#include "confdefs.h"</div><div class='del'>-</div><div class='del'>-#if HAVE_DLFCN_H</div><div class='del'>-#include &lt;dlfcn.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef RTLD_GLOBAL</div><div class='del'>-#  define LT_DLGLOBAL		RTLD_GLOBAL</div><div class='del'>-#else</div><div class='del'>-#  ifdef DL_GLOBAL</div><div class='del'>-#    define LT_DLGLOBAL		DL_GLOBAL</div><div class='del'>-#  else</div><div class='del'>-#    define LT_DLGLOBAL		0</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we</div><div class='del'>-   find out it does not work in some platform. */</div><div class='del'>-#ifndef LT_DLLAZY_OR_NOW</div><div class='del'>-#  ifdef RTLD_LAZY</div><div class='del'>-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY</div><div class='del'>-#  else</div><div class='del'>-#    ifdef DL_LAZY</div><div class='del'>-#      define LT_DLLAZY_OR_NOW		DL_LAZY</div><div class='del'>-#    else</div><div class='del'>-#      ifdef RTLD_NOW</div><div class='del'>-#        define LT_DLLAZY_OR_NOW	RTLD_NOW</div><div class='del'>-#      else</div><div class='del'>-#        ifdef DL_NOW</div><div class='del'>-#          define LT_DLLAZY_OR_NOW	DL_NOW</div><div class='del'>-#        else</div><div class='del'>-#          define LT_DLLAZY_OR_NOW	0</div><div class='del'>-#        endif</div><div class='del'>-#      endif</div><div class='del'>-#    endif</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void fnord() { int i=42;}</div><div class='del'>-int main ()</div><div class='del'>-{</div><div class='del'>-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);</div><div class='del'>-  int status = $lt_dlunknown;</div><div class='del'>-</div><div class='del'>-  if (self)</div><div class='del'>-    {</div><div class='del'>-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;</div><div class='del'>-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;</div><div class='del'>-      /* dlclose (self); */</div><div class='del'>-    }</div><div class='del'>-  else</div><div class='del'>-    puts (dlerror ());</div><div class='del'>-</div><div class='del'>-  return status;</div><div class='del'>-}]</div><div class='del'>-_LT_EOF</div><div class='del'>-  if AC_TRY_EVAL(ac_link) &amp;&amp; test -s conftest${ac_exeext} 2&gt;/dev/null; then</div><div class='del'>-    (./conftest; exit; ) &gt;&amp;AS_MESSAGE_LOG_FD 2&gt;/dev/null</div><div class='del'>-    lt_status=$?</div><div class='del'>-    case x$lt_status in</div><div class='del'>-      x$lt_dlno_uscore) $1 ;;</div><div class='del'>-      x$lt_dlneed_uscore) $2 ;;</div><div class='del'>-      x$lt_dlunknown|x*) $3 ;;</div><div class='del'>-    esac</div><div class='del'>-  else :</div><div class='del'>-    # compilation failed</div><div class='del'>-    $3</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-rm -fr conftest*</div><div class='del'>-])# _LT_TRY_DLOPEN_SELF</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# LT_SYS_DLOPEN_SELF</div><div class='del'>-# ------------------</div><div class='del'>-AC_DEFUN([LT_SYS_DLOPEN_SELF],</div><div class='del'>-[m4_require([_LT_HEADER_DLFCN])dnl</div><div class='del'>-if test "x$enable_dlopen" != xyes; then</div><div class='del'>-  enable_dlopen=unknown</div><div class='del'>-  enable_dlopen_self=unknown</div><div class='del'>-  enable_dlopen_self_static=unknown</div><div class='del'>-else</div><div class='del'>-  lt_cv_dlopen=no</div><div class='del'>-  lt_cv_dlopen_libs=</div><div class='del'>-</div><div class='del'>-  case $host_os in</div><div class='del'>-  beos*)</div><div class='del'>-    lt_cv_dlopen="load_add_on"</div><div class='del'>-    lt_cv_dlopen_libs=</div><div class='del'>-    lt_cv_dlopen_self=yes</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  mingw* | pw32* | cegcc*)</div><div class='del'>-    lt_cv_dlopen="LoadLibrary"</div><div class='del'>-    lt_cv_dlopen_libs=</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  cygwin*)</div><div class='del'>-    lt_cv_dlopen="dlopen"</div><div class='del'>-    lt_cv_dlopen_libs=</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  darwin*)</div><div class='del'>-  # if libdl is installed we need to link against it</div><div class='del'>-    AC_CHECK_LIB([dl], [dlopen],</div><div class='del'>-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[</div><div class='del'>-    lt_cv_dlopen="dyld"</div><div class='del'>-    lt_cv_dlopen_libs=</div><div class='del'>-    lt_cv_dlopen_self=yes</div><div class='del'>-    ])</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  *)</div><div class='del'>-    AC_CHECK_FUNC([shl_load],</div><div class='del'>-	  [lt_cv_dlopen="shl_load"],</div><div class='del'>-      [AC_CHECK_LIB([dld], [shl_load],</div><div class='del'>-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],</div><div class='del'>-	[AC_CHECK_FUNC([dlopen],</div><div class='del'>-	      [lt_cv_dlopen="dlopen"],</div><div class='del'>-	  [AC_CHECK_LIB([dl], [dlopen],</div><div class='del'>-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],</div><div class='del'>-	    [AC_CHECK_LIB([svld], [dlopen],</div><div class='del'>-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],</div><div class='del'>-	      [AC_CHECK_LIB([dld], [dld_link],</div><div class='del'>-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])</div><div class='del'>-	      ])</div><div class='del'>-	    ])</div><div class='del'>-	  ])</div><div class='del'>-	])</div><div class='del'>-      ])</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  if test "x$lt_cv_dlopen" != xno; then</div><div class='del'>-    enable_dlopen=yes</div><div class='del'>-  else</div><div class='del'>-    enable_dlopen=no</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  case $lt_cv_dlopen in</div><div class='del'>-  dlopen)</div><div class='del'>-    save_CPPFLAGS="$CPPFLAGS"</div><div class='del'>-    test "x$ac_cv_header_dlfcn_h" = xyes &amp;&amp; CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"</div><div class='del'>-</div><div class='del'>-    save_LDFLAGS="$LDFLAGS"</div><div class='del'>-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"</div><div class='del'>-</div><div class='del'>-    save_LIBS="$LIBS"</div><div class='del'>-    LIBS="$lt_cv_dlopen_libs $LIBS"</div><div class='del'>-</div><div class='del'>-    AC_CACHE_CHECK([whether a program can dlopen itself],</div><div class='del'>-	  lt_cv_dlopen_self, [dnl</div><div class='del'>-	  _LT_TRY_DLOPEN_SELF(</div><div class='del'>-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,</div><div class='del'>-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)</div><div class='del'>-    ])</div><div class='del'>-</div><div class='del'>-    if test "x$lt_cv_dlopen_self" = xyes; then</div><div class='del'>-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"</div><div class='del'>-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],</div><div class='del'>-	  lt_cv_dlopen_self_static, [dnl</div><div class='del'>-	  _LT_TRY_DLOPEN_SELF(</div><div class='del'>-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,</div><div class='del'>-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)</div><div class='del'>-      ])</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    CPPFLAGS="$save_CPPFLAGS"</div><div class='del'>-    LDFLAGS="$save_LDFLAGS"</div><div class='del'>-    LIBS="$save_LIBS"</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  case $lt_cv_dlopen_self in</div><div class='del'>-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;</div><div class='del'>-  *) enable_dlopen_self=unknown ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  case $lt_cv_dlopen_self_static in</div><div class='del'>-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;</div><div class='del'>-  *) enable_dlopen_self_static=unknown ;;</div><div class='del'>-  esac</div><div class='del'>-fi</div><div class='del'>-_LT_DECL([dlopen_support], [enable_dlopen], [0],</div><div class='del'>-	 [Whether dlopen is supported])</div><div class='del'>-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],</div><div class='del'>-	 [Whether dlopen of programs is supported])</div><div class='del'>-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],</div><div class='del'>-	 [Whether dlopen of statically linked programs is supported])</div><div class='del'>-])# LT_SYS_DLOPEN_SELF</div><div class='del'>-</div><div class='del'>-# Old name:</div><div class='del'>-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_COMPILER_C_O([TAGNAME])</div><div class='del'>-# ---------------------------</div><div class='del'>-# Check to see if options -c and -o are simultaneously supported by compiler.</div><div class='del'>-# This macro does not hard code the compiler like AC_PROG_CC_C_O.</div><div class='del'>-m4_defun([_LT_COMPILER_C_O],</div><div class='del'>-[m4_require([_LT_DECL_SED])dnl</div><div class='del'>-m4_require([_LT_FILEUTILS_DEFAULTS])dnl</div><div class='del'>-m4_require([_LT_TAG_COMPILER])dnl</div><div class='del'>-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],</div><div class='del'>-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],</div><div class='del'>-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no</div><div class='del'>-   $RM -r conftest 2&gt;/dev/null</div><div class='del'>-   mkdir conftest</div><div class='del'>-   cd conftest</div><div class='del'>-   mkdir out</div><div class='del'>-   echo "$lt_simple_compile_test_code" &gt; conftest.$ac_ext</div><div class='del'>-</div><div class='del'>-   lt_compiler_flag="-o out/conftest2.$ac_objext"</div><div class='del'>-   # Insert the option either (1) after the last *FLAGS variable, or</div><div class='del'>-   # (2) before a word containing "conftest.", or (3) at the end.</div><div class='del'>-   # Note that $ac_compile itself does not contain backslashes and begins</div><div class='del'>-   # with a dollar sign (not a hyphen), so the echo should work correctly.</div><div class='del'>-   lt_compile=`echo "$ac_compile" | $SED \</div><div class='del'>-   -e 's:.*FLAGS}\{0,1\} :&amp;$lt_compiler_flag :; t' \</div><div class='del'>-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&amp;:; t' \</div><div class='del'>-   -e 's:$: $lt_compiler_flag:'`</div><div class='del'>-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" &gt;&amp;AS_MESSAGE_LOG_FD)</div><div class='del'>-   (eval "$lt_compile" 2&gt;out/conftest.err)</div><div class='del'>-   ac_status=$?</div><div class='del'>-   cat out/conftest.err &gt;&amp;AS_MESSAGE_LOG_FD</div><div class='del'>-   echo "$as_me:__oline__: \$? = $ac_status" &gt;&amp;AS_MESSAGE_LOG_FD</div><div class='del'>-   if (exit $ac_status) &amp;&amp; test -s out/conftest2.$ac_objext</div><div class='del'>-   then</div><div class='del'>-     # The compiler can only warn and ignore the option if not recognized</div><div class='del'>-     # So say no if there are warnings</div><div class='del'>-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' &gt; out/conftest.exp</div><div class='del'>-     $SED '/^$/d; /^ *+/d' out/conftest.err &gt;out/conftest.er2</div><div class='del'>-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 &gt;/dev/null; then</div><div class='del'>-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes</div><div class='del'>-     fi</div><div class='del'>-   fi</div><div class='del'>-   chmod u+w . 2&gt;&amp;AS_MESSAGE_LOG_FD</div><div class='del'>-   $RM conftest*</div><div class='del'>-   # SGI C++ compiler will create directory out/ii_files/ for</div><div class='del'>-   # template instantiation</div><div class='del'>-   test -d out/ii_files &amp;&amp; $RM out/ii_files/* &amp;&amp; rmdir out/ii_files</div><div class='del'>-   $RM out/* &amp;&amp; rmdir out</div><div class='del'>-   cd ..</div><div class='del'>-   $RM -r conftest</div><div class='del'>-   $RM conftest*</div><div class='del'>-])</div><div class='del'>-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],</div><div class='del'>-	[Does compiler simultaneously support -c and -o options?])</div><div class='del'>-])# _LT_COMPILER_C_O</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_COMPILER_FILE_LOCKS([TAGNAME])</div><div class='del'>-# ----------------------------------</div><div class='del'>-# Check to see if we can do hard links to lock some files if needed</div><div class='del'>-m4_defun([_LT_COMPILER_FILE_LOCKS],</div><div class='del'>-[m4_require([_LT_ENABLE_LOCK])dnl</div><div class='del'>-m4_require([_LT_FILEUTILS_DEFAULTS])dnl</div><div class='del'>-_LT_COMPILER_C_O([$1])</div><div class='del'>-</div><div class='del'>-hard_links="nottested"</div><div class='del'>-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no &amp;&amp; test "$need_locks" != no; then</div><div class='del'>-  # do not overwrite the value of need_locks provided by the user</div><div class='del'>-  AC_MSG_CHECKING([if we can lock with hard links])</div><div class='del'>-  hard_links=yes</div><div class='del'>-  $RM conftest*</div><div class='del'>-  ln conftest.a conftest.b 2&gt;/dev/null &amp;&amp; hard_links=no</div><div class='del'>-  touch conftest.a</div><div class='del'>-  ln conftest.a conftest.b 2&gt;&amp;5 || hard_links=no</div><div class='del'>-  ln conftest.a conftest.b 2&gt;/dev/null &amp;&amp; hard_links=no</div><div class='del'>-  AC_MSG_RESULT([$hard_links])</div><div class='del'>-  if test "$hard_links" = no; then</div><div class='del'>-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])</div><div class='del'>-    need_locks=warn</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  need_locks=no</div><div class='del'>-fi</div><div class='del'>-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])</div><div class='del'>-])# _LT_COMPILER_FILE_LOCKS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_CHECK_OBJDIR</div><div class='del'>-# ----------------</div><div class='del'>-m4_defun([_LT_CHECK_OBJDIR],</div><div class='del'>-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],</div><div class='del'>-[rm -f .libs 2&gt;/dev/null</div><div class='del'>-mkdir .libs 2&gt;/dev/null</div><div class='del'>-if test -d .libs; then</div><div class='del'>-  lt_cv_objdir=.libs</div><div class='del'>-else</div><div class='del'>-  # MS-DOS does not allow filenames that begin with a dot.</div><div class='del'>-  lt_cv_objdir=_libs</div><div class='del'>-fi</div><div class='del'>-rmdir .libs 2&gt;/dev/null])</div><div class='del'>-objdir=$lt_cv_objdir</div><div class='del'>-_LT_DECL([], [objdir], [0],</div><div class='del'>-         [The name of the directory that contains temporary libtool files])dnl</div><div class='del'>-m4_pattern_allow([LT_OBJDIR])dnl</div><div class='del'>-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",</div><div class='del'>-  [Define to the sub-directory in which libtool stores uninstalled libraries.])</div><div class='del'>-])# _LT_CHECK_OBJDIR</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])</div><div class='del'>-# --------------------------------------</div><div class='del'>-# Check hardcoding attributes.</div><div class='del'>-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],</div><div class='del'>-[AC_MSG_CHECKING([how to hardcode library paths into programs])</div><div class='del'>-_LT_TAGVAR(hardcode_action, $1)=</div><div class='del'>-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||</div><div class='del'>-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||</div><div class='del'>-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then</div><div class='del'>-</div><div class='del'>-  # We can hardcode non-existent directories.</div><div class='del'>-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &amp;&amp;</div><div class='del'>-     # If the only mechanism to avoid hardcoding is shlibpath_var, we</div><div class='del'>-     # have to relink, otherwise we might link with an installed library</div><div class='del'>-     # when we should be linking with a yet-to-be-installed one</div><div class='del'>-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &amp;&amp;</div><div class='del'>-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then</div><div class='del'>-    # Linking always hardcodes the temporary library directory.</div><div class='del'>-    _LT_TAGVAR(hardcode_action, $1)=relink</div><div class='del'>-  else</div><div class='del'>-    # We can link without hardcoding, and we can hardcode nonexisting dirs.</div><div class='del'>-    _LT_TAGVAR(hardcode_action, $1)=immediate</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  # We cannot hardcode anything, or else we can only hardcode existing</div><div class='del'>-  # directories.</div><div class='del'>-  _LT_TAGVAR(hardcode_action, $1)=unsupported</div><div class='del'>-fi</div><div class='del'>-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])</div><div class='del'>-</div><div class='del'>-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||</div><div class='del'>-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then</div><div class='del'>-  # Fast installation is not supported</div><div class='del'>-  enable_fast_install=no</div><div class='del'>-elif test "$shlibpath_overrides_runpath" = yes ||</div><div class='del'>-     test "$enable_shared" = no; then</div><div class='del'>-  # Fast installation is not necessary</div><div class='del'>-  enable_fast_install=needless</div><div class='del'>-fi</div><div class='del'>-_LT_TAGDECL([], [hardcode_action], [0],</div><div class='del'>-    [How to hardcode a shared library path into an executable])</div><div class='del'>-])# _LT_LINKER_HARDCODE_LIBPATH</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_CMD_STRIPLIB</div><div class='del'>-# ----------------</div><div class='del'>-m4_defun([_LT_CMD_STRIPLIB],</div><div class='del'>-[m4_require([_LT_DECL_EGREP])</div><div class='del'>-striplib=</div><div class='del'>-old_striplib=</div><div class='del'>-AC_MSG_CHECKING([whether stripping libraries is possible])</div><div class='del'>-if test -n "$STRIP" &amp;&amp; $STRIP -V 2&gt;&amp;1 | $GREP "GNU strip" &gt;/dev/null; then</div><div class='del'>-  test -z "$old_striplib" &amp;&amp; old_striplib="$STRIP --strip-debug"</div><div class='del'>-  test -z "$striplib" &amp;&amp; striplib="$STRIP --strip-unneeded"</div><div class='del'>-  AC_MSG_RESULT([yes])</div><div class='del'>-else</div><div class='del'>-# FIXME - insert some real tests, host_os isn't really good enough</div><div class='del'>-  case $host_os in</div><div class='del'>-  darwin*)</div><div class='del'>-    if test -n "$STRIP" ; then</div><div class='del'>-      striplib="$STRIP -x"</div><div class='del'>-      old_striplib="$STRIP -S"</div><div class='del'>-      AC_MSG_RESULT([yes])</div><div class='del'>-    else</div><div class='del'>-      AC_MSG_RESULT([no])</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    AC_MSG_RESULT([no])</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-fi</div><div class='del'>-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])</div><div class='del'>-_LT_DECL([], [striplib], [1])</div><div class='del'>-])# _LT_CMD_STRIPLIB</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_SYS_DYNAMIC_LINKER([TAG])</div><div class='del'>-# -----------------------------</div><div class='del'>-# PORTME Fill in your ld.so characteristics</div><div class='del'>-m4_defun([_LT_SYS_DYNAMIC_LINKER],</div><div class='del'>-[AC_REQUIRE([AC_CANONICAL_HOST])dnl</div><div class='del'>-m4_require([_LT_DECL_EGREP])dnl</div><div class='del'>-m4_require([_LT_FILEUTILS_DEFAULTS])dnl</div><div class='del'>-m4_require([_LT_DECL_OBJDUMP])dnl</div><div class='del'>-m4_require([_LT_DECL_SED])dnl</div><div class='del'>-AC_MSG_CHECKING([dynamic linker characteristics])</div><div class='del'>-m4_if([$1],</div><div class='del'>-	[], [</div><div class='del'>-if test "$GCC" = yes; then</div><div class='del'>-  case $host_os in</div><div class='del'>-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;</div><div class='del'>-    *) lt_awk_arg="/^libraries:/" ;;</div><div class='del'>-  esac</div><div class='del'>-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`</div><div class='del'>-  if $ECHO "$lt_search_path_spec" | $GREP ';' &gt;/dev/null ; then</div><div class='del'>-    # if the path contains ";" then we assume it to be the separator</div><div class='del'>-    # otherwise default to the standard path separator (i.e. ":") - it is</div><div class='del'>-    # assumed that no part of a normal pathname contains ";" but that should</div><div class='del'>-    # okay in the real world where ";" in dirpaths is itself problematic.</div><div class='del'>-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`</div><div class='del'>-  else</div><div class='del'>-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`</div><div class='del'>-  fi</div><div class='del'>-  # Ok, now we have the path, separated by spaces, we can step through it</div><div class='del'>-  # and add multilib dir if necessary.</div><div class='del'>-  lt_tmp_lt_search_path_spec=</div><div class='del'>-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2&gt;/dev/null`</div><div class='del'>-  for lt_sys_path in $lt_search_path_spec; do</div><div class='del'>-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then</div><div class='del'>-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"</div><div class='del'>-    else</div><div class='del'>-      test -d "$lt_sys_path" &amp;&amp; \</div><div class='del'>-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"</div><div class='del'>-    fi</div><div class='del'>-  done</div><div class='del'>-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '</div><div class='del'>-BEGIN {RS=" "; FS="/|\n";} {</div><div class='del'>-  lt_foo="";</div><div class='del'>-  lt_count=0;</div><div class='del'>-  for (lt_i = NF; lt_i &gt; 0; lt_i--) {</div><div class='del'>-    if ($lt_i != "" &amp;&amp; $lt_i != ".") {</div><div class='del'>-      if ($lt_i == "..") {</div><div class='del'>-        lt_count++;</div><div class='del'>-      } else {</div><div class='del'>-        if (lt_count == 0) {</div><div class='del'>-          lt_foo="/" $lt_i lt_foo;</div><div class='del'>-        } else {</div><div class='del'>-          lt_count--;</div><div class='del'>-        }</div><div class='del'>-      }</div><div class='del'>-    }</div><div class='del'>-  }</div><div class='del'>-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }</div><div class='del'>-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }</div><div class='del'>-}'`</div><div class='del'>-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`</div><div class='del'>-else</div><div class='del'>-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"</div><div class='del'>-fi])</div><div class='del'>-library_names_spec=</div><div class='del'>-libname_spec='lib$name'</div><div class='del'>-soname_spec=</div><div class='del'>-shrext_cmds=".so"</div><div class='del'>-postinstall_cmds=</div><div class='del'>-postuninstall_cmds=</div><div class='del'>-finish_cmds=</div><div class='del'>-finish_eval=</div><div class='del'>-shlibpath_var=</div><div class='del'>-shlibpath_overrides_runpath=unknown</div><div class='del'>-version_type=none</div><div class='del'>-dynamic_linker="$host_os ld.so"</div><div class='del'>-sys_lib_dlsearch_path_spec="/lib /usr/lib"</div><div class='del'>-need_lib_prefix=unknown</div><div class='del'>-hardcode_into_libs=no</div><div class='del'>-</div><div class='del'>-# when you set need_version to no, make sure it does not cause -set_version</div><div class='del'>-# flags to be left without arguments</div><div class='del'>-need_version=unknown</div><div class='del'>-</div><div class='del'>-case $host_os in</div><div class='del'>-aix3*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'</div><div class='del'>-  shlibpath_var=LIBPATH</div><div class='del'>-</div><div class='del'>-  # AIX 3 has no versioning support, so we append a major version to the name.</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-aix[[4-9]]*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  if test "$host_cpu" = ia64; then</div><div class='del'>-    # AIX 5 supports IA64</div><div class='del'>-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'</div><div class='del'>-    shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  else</div><div class='del'>-    # With GCC up to 2.95.x, collect2 would create an import file</div><div class='del'>-    # for dependence libraries.  The import file would start with</div><div class='del'>-    # the line `#! .'.  This would cause the generated library to</div><div class='del'>-    # depend on `.', always an invalid library.  This was fixed in</div><div class='del'>-    # development snapshots of GCC prior to 3.0.</div><div class='del'>-    case $host_os in</div><div class='del'>-      aix4 | aix4.[[01]] | aix4.[[01]].*)</div><div class='del'>-      if { echo '#if __GNUC__ &gt; 2 || (__GNUC__ == 2 &amp;&amp; __GNUC_MINOR__ &gt;= 97)'</div><div class='del'>-	   echo ' yes '</div><div class='del'>-	   echo '#endif'; } | ${CC} -E - | $GREP yes &gt; /dev/null; then</div><div class='del'>-	:</div><div class='del'>-      else</div><div class='del'>-	can_build_shared=no</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct</div><div class='del'>-    # soname into executable. Probably we can add versioning support to</div><div class='del'>-    # collect2, so additional links can be useful in future.</div><div class='del'>-    if test "$aix_use_runtimelinking" = yes; then</div><div class='del'>-      # If using run time linking (on AIX 4.2 or later) use lib&lt;name&gt;.so</div><div class='del'>-      # instead of lib&lt;name&gt;.a to let people know that these are not</div><div class='del'>-      # typical AIX shared libraries.</div><div class='del'>-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-    else</div><div class='del'>-      # We preserve .a as extension for shared libraries through AIX4.2</div><div class='del'>-      # and later when we are not doing run time linking.</div><div class='del'>-      library_names_spec='${libname}${release}.a $libname.a'</div><div class='del'>-      soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-    fi</div><div class='del'>-    shlibpath_var=LIBPATH</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-amigaos*)</div><div class='del'>-  case $host_cpu in</div><div class='del'>-  powerpc)</div><div class='del'>-    # Since July 2007 AmigaOS4 officially supports .so libraries.</div><div class='del'>-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.</div><div class='del'>-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-    ;;</div><div class='del'>-  m68k)</div><div class='del'>-    library_names_spec='$libname.ixlibrary $libname.a'</div><div class='del'>-    # Create ${libname}_ixlibrary.a entries in /sys/libs.</div><div class='del'>-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2&gt;/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs &amp;&amp; $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs &amp;&amp; $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-beos*)</div><div class='del'>-  library_names_spec='${libname}${shared_ext}'</div><div class='del'>-  dynamic_linker="$host_os ld.so"</div><div class='del'>-  shlibpath_var=LIBRARY_PATH</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-bsdi[[45]]*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"</div><div class='del'>-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"</div><div class='del'>-  # the default ld.so.conf also contains /usr/contrib/lib and</div><div class='del'>-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow</div><div class='del'>-  # libtool to hard-code these into programs</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-cygwin* | mingw* | pw32* | cegcc*)</div><div class='del'>-  version_type=windows</div><div class='del'>-  shrext_cmds=".dll"</div><div class='del'>-  need_version=no</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-</div><div class='del'>-  case $GCC,$host_os in</div><div class='del'>-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)</div><div class='del'>-    library_names_spec='$libname.dll.a'</div><div class='del'>-    # DLL is installed to $(libdir)/../bin by postinstall_cmds</div><div class='del'>-    postinstall_cmds='base_file=`basename \${file}`~</div><div class='del'>-      dlpath=`$SHELL 2&gt;&amp;1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~</div><div class='del'>-      dldir=$destdir/`dirname \$dlpath`~</div><div class='del'>-      test -d \$dldir || mkdir -p \$dldir~</div><div class='del'>-      $install_prog $dir/$dlname \$dldir/$dlname~</div><div class='del'>-      chmod a+x \$dldir/$dlname~</div><div class='del'>-      if test -n '\''$stripme'\'' &amp;&amp; test -n '\''$striplib'\''; then</div><div class='del'>-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;</div><div class='del'>-      fi'</div><div class='del'>-    postuninstall_cmds='dldll=`$SHELL 2&gt;&amp;1 -c '\''. $file; echo \$dlname'\''`~</div><div class='del'>-      dlpath=$dir/\$dldll~</div><div class='del'>-       $RM \$dlpath'</div><div class='del'>-    shlibpath_overrides_runpath=yes</div><div class='del'>-</div><div class='del'>-    case $host_os in</div><div class='del'>-    cygwin*)</div><div class='del'>-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'</div><div class='del'>-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'</div><div class='del'>-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"</div><div class='del'>-      ;;</div><div class='del'>-    mingw* | cegcc*)</div><div class='del'>-      # MinGW DLLs use traditional 'lib' prefix</div><div class='del'>-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'</div><div class='del'>-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`</div><div class='del'>-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' &gt;/dev/null]; then</div><div class='del'>-        # It is most probably a Windows format PATH printed by</div><div class='del'>-        # mingw gcc, but we are running on Cygwin. Gcc prints its search</div><div class='del'>-        # path with ; separators, and with drive letters. We can handle the</div><div class='del'>-        # drive letters (cygwin fileutils understands them), so leave them,</div><div class='del'>-        # especially as we might pass files found there to a mingw objdump,</div><div class='del'>-        # which wouldn't understand a cygwinified path. Ahh.</div><div class='del'>-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`</div><div class='del'>-      else</div><div class='del'>-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-    pw32*)</div><div class='del'>-      # pw32 DLLs use 'pw' prefix rather than 'lib'</div><div class='del'>-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  *)</div><div class='del'>-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  dynamic_linker='Win32 ld.exe'</div><div class='del'>-  # FIXME: first we should search . and the directory the executable is in</div><div class='del'>-  shlibpath_var=PATH</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-darwin* | rhapsody*)</div><div class='del'>-  dynamic_linker="$host_os dyld"</div><div class='del'>-  version_type=darwin</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'</div><div class='del'>-  soname_spec='${libname}${release}${major}$shared_ext'</div><div class='del'>-  shlibpath_overrides_runpath=yes</div><div class='del'>-  shlibpath_var=DYLD_LIBRARY_PATH</div><div class='del'>-  shrext_cmds='`test .$module = .yes &amp;&amp; echo .so || echo .dylib`'</div><div class='del'>-m4_if([$1], [],[</div><div class='del'>-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])</div><div class='del'>-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-dgux*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-freebsd1*)</div><div class='del'>-  dynamic_linker=no</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-freebsd* | dragonfly*)</div><div class='del'>-  # DragonFly does not have aout.  When/if they implement a new</div><div class='del'>-  # versioning mechanism, adjust this.</div><div class='del'>-  if test -x /usr/bin/objformat; then</div><div class='del'>-    objformat=`/usr/bin/objformat`</div><div class='del'>-  else</div><div class='del'>-    case $host_os in</div><div class='del'>-    freebsd[[123]]*) objformat=aout ;;</div><div class='del'>-    *) objformat=elf ;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-  version_type=freebsd-$objformat</div><div class='del'>-  case $version_type in</div><div class='del'>-    freebsd-elf*)</div><div class='del'>-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'</div><div class='del'>-      need_version=no</div><div class='del'>-      need_lib_prefix=no</div><div class='del'>-      ;;</div><div class='del'>-    freebsd-*)</div><div class='del'>-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'</div><div class='del'>-      need_version=yes</div><div class='del'>-      ;;</div><div class='del'>-  esac</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  case $host_os in</div><div class='del'>-  freebsd2*)</div><div class='del'>-    shlibpath_overrides_runpath=yes</div><div class='del'>-    ;;</div><div class='del'>-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)</div><div class='del'>-    shlibpath_overrides_runpath=yes</div><div class='del'>-    hardcode_into_libs=yes</div><div class='del'>-    ;;</div><div class='del'>-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \</div><div class='del'>-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)</div><div class='del'>-    shlibpath_overrides_runpath=no</div><div class='del'>-    hardcode_into_libs=yes</div><div class='del'>-    ;;</div><div class='del'>-  *) # from 4.6 on, and DragonFly</div><div class='del'>-    shlibpath_overrides_runpath=yes</div><div class='del'>-    hardcode_into_libs=yes</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-gnu*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-hpux9* | hpux10* | hpux11*)</div><div class='del'>-  # Give a soname corresponding to the major version so that dld.sl refuses to</div><div class='del'>-  # link against other versions.</div><div class='del'>-  version_type=sunos</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  case $host_cpu in</div><div class='del'>-  ia64*)</div><div class='del'>-    shrext_cmds='.so'</div><div class='del'>-    hardcode_into_libs=yes</div><div class='del'>-    dynamic_linker="$host_os dld.so"</div><div class='del'>-    shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.</div><div class='del'>-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-    soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-    if test "X$HPUX_IA64_MODE" = X32; then</div><div class='del'>-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"</div><div class='del'>-    else</div><div class='del'>-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"</div><div class='del'>-    fi</div><div class='del'>-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec</div><div class='del'>-    ;;</div><div class='del'>-  hppa*64*)</div><div class='del'>-    shrext_cmds='.sl'</div><div class='del'>-    hardcode_into_libs=yes</div><div class='del'>-    dynamic_linker="$host_os dld.sl"</div><div class='del'>-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH</div><div class='del'>-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.</div><div class='del'>-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-    soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"</div><div class='del'>-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    shrext_cmds='.sl'</div><div class='del'>-    dynamic_linker="$host_os dld.sl"</div><div class='del'>-    shlibpath_var=SHLIB_PATH</div><div class='del'>-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH</div><div class='del'>-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-    soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  # HP-UX runs *really* slowly unless shared libraries are mode 555.</div><div class='del'>-  postinstall_cmds='chmod 555 $lib'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-interix[[3-9]]*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=no</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-irix5* | irix6* | nonstopux*)</div><div class='del'>-  case $host_os in</div><div class='del'>-    nonstopux*) version_type=nonstopux ;;</div><div class='del'>-    *)</div><div class='del'>-	if test "$lt_cv_prog_gnu_ld" = yes; then</div><div class='del'>-		version_type=linux</div><div class='del'>-	else</div><div class='del'>-		version_type=irix</div><div class='del'>-	fi ;;</div><div class='del'>-  esac</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'</div><div class='del'>-  case $host_os in</div><div class='del'>-  irix5* | nonstopux*)</div><div class='del'>-    libsuff= shlibsuff=</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    case $LD in # libtool.m4 will add one of these switches to LD</div><div class='del'>-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")</div><div class='del'>-      libsuff= shlibsuff= libmagic=32-bit;;</div><div class='del'>-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")</div><div class='del'>-      libsuff=32 shlibsuff=N32 libmagic=N32;;</div><div class='del'>-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")</div><div class='del'>-      libsuff=64 shlibsuff=64 libmagic=64-bit;;</div><div class='del'>-    *) libsuff= shlibsuff= libmagic=never-match;;</div><div class='del'>-    esac</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH</div><div class='del'>-  shlibpath_overrides_runpath=no</div><div class='del'>-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"</div><div class='del'>-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-# No shared lib support for Linux oldld, aout, or coff.</div><div class='del'>-linux*oldld* | linux*aout* | linux*coff*)</div><div class='del'>-  dynamic_linker=no</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-# This must be Linux ELF.</div><div class='del'>-linux* | k*bsd*-gnu)</div><div class='del'>-  version_type=linux</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=no</div><div class='del'>-  # Some binutils ld are patched to set DT_RUNPATH</div><div class='del'>-  save_LDFLAGS=$LDFLAGS</div><div class='del'>-  save_libdir=$libdir</div><div class='del'>-  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \</div><div class='del'>-       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""</div><div class='del'>-  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],</div><div class='del'>-    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2&gt;/dev/null | grep "RUNPATH.*$libdir" &gt;/dev/null],</div><div class='del'>-       [shlibpath_overrides_runpath=yes])])</div><div class='del'>-  LDFLAGS=$save_LDFLAGS</div><div class='del'>-  libdir=$save_libdir</div><div class='del'>-</div><div class='del'>-  # This implies no fast_install, which is unacceptable.</div><div class='del'>-  # Some rework will be needed to allow for fast_install</div><div class='del'>-  # before this can be enabled.</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-</div><div class='del'>-  # Append ld.so.conf contents to the search path</div><div class='del'>-  if test -f /etc/ld.so.conf; then</div><div class='del'>-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2&gt;/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' &lt; /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`</div><div class='del'>-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  # We used to test for /lib/ld.so.1 and disable shared libraries on</div><div class='del'>-  # powerpc, because MkLinux only supported shared libraries with the</div><div class='del'>-  # GNU dynamic linker.  Since this was broken with cross compilers,</div><div class='del'>-  # most powerpc-linux boxes support dynamic linking these days and</div><div class='del'>-  # people can always --disable-shared, the test was removed, and we</div><div class='del'>-  # assume the GNU/Linux dynamic linker is in use.</div><div class='del'>-  dynamic_linker='GNU/Linux ld.so'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-netbsd*)</div><div class='del'>-  version_type=sunos</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  if echo __ELF__ | $CC -E - | $GREP __ELF__ &gt;/dev/null; then</div><div class='del'>-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'</div><div class='del'>-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'</div><div class='del'>-    dynamic_linker='NetBSD (a.out) ld.so'</div><div class='del'>-  else</div><div class='del'>-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'</div><div class='del'>-    soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-    dynamic_linker='NetBSD ld.elf_so'</div><div class='del'>-  fi</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=yes</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-newsos6)</div><div class='del'>-  version_type=linux</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=yes</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-*nto* | *qnx*)</div><div class='del'>-  version_type=qnx</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=no</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  dynamic_linker='ldqnx.so'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-openbsd*)</div><div class='del'>-  version_type=sunos</div><div class='del'>-  sys_lib_dlsearch_path_spec="/usr/lib"</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.</div><div class='del'>-  case $host_os in</div><div class='del'>-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;</div><div class='del'>-    *)				need_version=no  ;;</div><div class='del'>-  esac</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'</div><div class='del'>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then</div><div class='del'>-    case $host_os in</div><div class='del'>-      openbsd2.[[89]] | openbsd2.[[89]].*)</div><div class='del'>-	shlibpath_overrides_runpath=no</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-	shlibpath_overrides_runpath=yes</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-  else</div><div class='del'>-    shlibpath_overrides_runpath=yes</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-os2*)</div><div class='del'>-  libname_spec='$name'</div><div class='del'>-  shrext_cmds=".dll"</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  library_names_spec='$libname${shared_ext} $libname.a'</div><div class='del'>-  dynamic_linker='OS/2 ld.exe'</div><div class='del'>-  shlibpath_var=LIBPATH</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-osf3* | osf4* | osf5*)</div><div class='del'>-  version_type=osf</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"</div><div class='del'>-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-rdos*)</div><div class='del'>-  dynamic_linker=no</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-solaris*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=yes</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  # ldd complains unless libraries are executable</div><div class='del'>-  postinstall_cmds='chmod +x $lib'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-sunos4*)</div><div class='del'>-  version_type=sunos</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'</div><div class='del'>-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=yes</div><div class='del'>-  if test "$with_gnu_ld" = yes; then</div><div class='del'>-    need_lib_prefix=no</div><div class='del'>-  fi</div><div class='del'>-  need_version=yes</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-sysv4 | sysv4.3*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  case $host_vendor in</div><div class='del'>-    sni)</div><div class='del'>-      shlibpath_overrides_runpath=no</div><div class='del'>-      need_lib_prefix=no</div><div class='del'>-      runpath_var=LD_RUN_PATH</div><div class='del'>-      ;;</div><div class='del'>-    siemens)</div><div class='del'>-      need_lib_prefix=no</div><div class='del'>-      ;;</div><div class='del'>-    motorola)</div><div class='del'>-      need_lib_prefix=no</div><div class='del'>-      need_version=no</div><div class='del'>-      shlibpath_overrides_runpath=no</div><div class='del'>-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'</div><div class='del'>-      ;;</div><div class='del'>-  esac</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-sysv4*MP*)</div><div class='del'>-  if test -d /usr/nec ;then</div><div class='del'>-    version_type=linux</div><div class='del'>-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'</div><div class='del'>-    soname_spec='$libname${shared_ext}.$major'</div><div class='del'>-    shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)</div><div class='del'>-  version_type=freebsd-elf</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=yes</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  if test "$with_gnu_ld" = yes; then</div><div class='del'>-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'</div><div class='del'>-  else</div><div class='del'>-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'</div><div class='del'>-    case $host_os in</div><div class='del'>-      sco3.2v5*)</div><div class='del'>-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"</div><div class='del'>-	;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-  sys_lib_dlsearch_path_spec='/usr/lib'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-tpf*)</div><div class='del'>-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.</div><div class='del'>-  version_type=linux</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=no</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-uts4*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-*)</div><div class='del'>-  dynamic_linker=no</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-AC_MSG_RESULT([$dynamic_linker])</div><div class='del'>-test "$dynamic_linker" = no &amp;&amp; can_build_shared=no</div><div class='del'>-</div><div class='del'>-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"</div><div class='del'>-if test "$GCC" = yes; then</div><div class='del'>-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then</div><div class='del'>-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"</div><div class='del'>-fi</div><div class='del'>-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then</div><div class='del'>-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-_LT_DECL([], [variables_saved_for_relink], [1],</div><div class='del'>-    [Variables whose values should be saved in libtool wrapper scripts and</div><div class='del'>-    restored at link time])</div><div class='del'>-_LT_DECL([], [need_lib_prefix], [0],</div><div class='del'>-    [Do we need the "lib" prefix for modules?])</div><div class='del'>-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])</div><div class='del'>-_LT_DECL([], [version_type], [0], [Library versioning type])</div><div class='del'>-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])</div><div class='del'>-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])</div><div class='del'>-_LT_DECL([], [shlibpath_overrides_runpath], [0],</div><div class='del'>-    [Is shlibpath searched before the hard-coded library search path?])</div><div class='del'>-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])</div><div class='del'>-_LT_DECL([], [library_names_spec], [1],</div><div class='del'>-    [[List of archive names.  First name is the real one, the rest are links.</div><div class='del'>-    The last name is the one that the linker finds with -lNAME]])</div><div class='del'>-_LT_DECL([], [soname_spec], [1],</div><div class='del'>-    [[The coded name of the library, if different from the real name]])</div><div class='del'>-_LT_DECL([], [postinstall_cmds], [2],</div><div class='del'>-    [Command to use after installation of a shared archive])</div><div class='del'>-_LT_DECL([], [postuninstall_cmds], [2],</div><div class='del'>-    [Command to use after uninstallation of a shared archive])</div><div class='del'>-_LT_DECL([], [finish_cmds], [2],</div><div class='del'>-    [Commands used to finish a libtool library installation in a directory])</div><div class='del'>-_LT_DECL([], [finish_eval], [1],</div><div class='del'>-    [[As "finish_cmds", except a single script fragment to be evaled but</div><div class='del'>-    not shown]])</div><div class='del'>-_LT_DECL([], [hardcode_into_libs], [0],</div><div class='del'>-    [Whether we should hardcode library paths into libraries])</div><div class='del'>-_LT_DECL([], [sys_lib_search_path_spec], [2],</div><div class='del'>-    [Compile-time system search path for libraries])</div><div class='del'>-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],</div><div class='del'>-    [Run-time system search path for libraries])</div><div class='del'>-])# _LT_SYS_DYNAMIC_LINKER</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_PATH_TOOL_PREFIX(TOOL)</div><div class='del'>-# --------------------------</div><div class='del'>-# find a file program which can recognize shared library</div><div class='del'>-AC_DEFUN([_LT_PATH_TOOL_PREFIX],</div><div class='del'>-[m4_require([_LT_DECL_EGREP])dnl</div><div class='del'>-AC_MSG_CHECKING([for $1])</div><div class='del'>-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,</div><div class='del'>-[case $MAGIC_CMD in</div><div class='del'>-[[\\/*] |  ?:[\\/]*])</div><div class='del'>-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.</div><div class='del'>-  ;;</div><div class='del'>-*)</div><div class='del'>-  lt_save_MAGIC_CMD="$MAGIC_CMD"</div><div class='del'>-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR</div><div class='del'>-dnl $ac_dummy forces splitting on constant user-supplied paths.</div><div class='del'>-dnl POSIX.2 word splitting is done only on the output of word expansions,</div><div class='del'>-dnl not every word.  This closes a longstanding sh security hole.</div><div class='del'>-  ac_dummy="m4_if([$2], , $PATH, [$2])"</div><div class='del'>-  for ac_dir in $ac_dummy; do</div><div class='del'>-    IFS="$lt_save_ifs"</div><div class='del'>-    test -z "$ac_dir" &amp;&amp; ac_dir=.</div><div class='del'>-    if test -f $ac_dir/$1; then</div><div class='del'>-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"</div><div class='del'>-      if test -n "$file_magic_test_file"; then</div><div class='del'>-	case $deplibs_check_method in</div><div class='del'>-	"file_magic "*)</div><div class='del'>-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`</div><div class='del'>-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"</div><div class='del'>-	  if eval $file_magic_cmd \$file_magic_test_file 2&gt; /dev/null |</div><div class='del'>-	    $EGREP "$file_magic_regex" &gt; /dev/null; then</div><div class='del'>-	    :</div><div class='del'>-	  else</div><div class='del'>-	    cat &lt;&lt;_LT_EOF 1&gt;&amp;2</div><div class='del'>-</div><div class='del'>-*** Warning: the command libtool uses to detect shared libraries,</div><div class='del'>-*** $file_magic_cmd, produces output that libtool cannot recognize.</div><div class='del'>-*** The result is that libtool may fail to recognize shared libraries</div><div class='del'>-*** as such.  This will affect the creation of libtool libraries that</div><div class='del'>-*** depend on shared libraries, but programs linked with such libtool</div><div class='del'>-*** libraries will work regardless of this problem.  Nevertheless, you</div><div class='del'>-*** may want to report the problem to your system manager and/or to</div><div class='del'>-*** bug-libtool@gnu.org</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-	  fi ;;</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-      break</div><div class='del'>-    fi</div><div class='del'>-  done</div><div class='del'>-  IFS="$lt_save_ifs"</div><div class='del'>-  MAGIC_CMD="$lt_save_MAGIC_CMD"</div><div class='del'>-  ;;</div><div class='del'>-esac])</div><div class='del'>-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"</div><div class='del'>-if test -n "$MAGIC_CMD"; then</div><div class='del'>-  AC_MSG_RESULT($MAGIC_CMD)</div><div class='del'>-else</div><div class='del'>-  AC_MSG_RESULT(no)</div><div class='del'>-fi</div><div class='del'>-_LT_DECL([], [MAGIC_CMD], [0],</div><div class='del'>-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl</div><div class='del'>-])# _LT_PATH_TOOL_PREFIX</div><div class='del'>-</div><div class='del'>-# Old name:</div><div class='del'>-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_PATH_MAGIC</div><div class='del'>-# --------------</div><div class='del'>-# find a file program which can recognize a shared library</div><div class='del'>-m4_defun([_LT_PATH_MAGIC],</div><div class='del'>-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)</div><div class='del'>-if test -z "$lt_cv_path_MAGIC_CMD"; then</div><div class='del'>-  if test -n "$ac_tool_prefix"; then</div><div class='del'>-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)</div><div class='del'>-  else</div><div class='del'>-    MAGIC_CMD=:</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-])# _LT_PATH_MAGIC</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# LT_PATH_LD</div><div class='del'>-# ----------</div><div class='del'>-# find the pathname to the GNU or non-GNU linker</div><div class='del'>-AC_DEFUN([LT_PATH_LD],</div><div class='del'>-[AC_REQUIRE([AC_PROG_CC])dnl</div><div class='del'>-AC_REQUIRE([AC_CANONICAL_HOST])dnl</div><div class='del'>-AC_REQUIRE([AC_CANONICAL_BUILD])dnl</div><div class='del'>-m4_require([_LT_DECL_SED])dnl</div><div class='del'>-m4_require([_LT_DECL_EGREP])dnl</div><div class='del'>-</div><div class='del'>-AC_ARG_WITH([gnu-ld],</div><div class='del'>-    [AS_HELP_STRING([--with-gnu-ld],</div><div class='del'>-	[assume the C compiler uses GNU ld @&lt;:@default=no@:&gt;@])],</div><div class='del'>-    [test "$withval" = no || with_gnu_ld=yes],</div><div class='del'>-    [with_gnu_ld=no])dnl</div><div class='del'>-</div><div class='del'>-ac_prog=ld</div><div class='del'>-if test "$GCC" = yes; then</div><div class='del'>-  # Check if gcc -print-prog-name=ld gives a path.</div><div class='del'>-  AC_MSG_CHECKING([for ld used by $CC])</div><div class='del'>-  case $host in</div><div class='del'>-  *-*-mingw*)</div><div class='del'>-    # gcc leaves a trailing carriage return which upsets mingw</div><div class='del'>-    ac_prog=`($CC -print-prog-name=ld) 2&gt;&amp;5 | tr -d '\015'` ;;</div><div class='del'>-  *)</div><div class='del'>-    ac_prog=`($CC -print-prog-name=ld) 2&gt;&amp;5` ;;</div><div class='del'>-  esac</div><div class='del'>-  case $ac_prog in</div><div class='del'>-    # Accept absolute paths.</div><div class='del'>-    [[\\/]]* | ?:[[\\/]]*)</div><div class='del'>-      re_direlt='/[[^/]][[^/]]*/\.\./'</div><div class='del'>-      # Canonicalize the pathname of ld</div><div class='del'>-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`</div><div class='del'>-      while $ECHO "$ac_prog" | $GREP "$re_direlt" &gt; /dev/null 2&gt;&amp;1; do</div><div class='del'>-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`</div><div class='del'>-      done</div><div class='del'>-      test -z "$LD" &amp;&amp; LD="$ac_prog"</div><div class='del'>-      ;;</div><div class='del'>-  "")</div><div class='del'>-    # If it fails, then pretend we aren't using GCC.</div><div class='del'>-    ac_prog=ld</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    # If it is relative, then search for the first ld in PATH.</div><div class='del'>-    with_gnu_ld=unknown</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-elif test "$with_gnu_ld" = yes; then</div><div class='del'>-  AC_MSG_CHECKING([for GNU ld])</div><div class='del'>-else</div><div class='del'>-  AC_MSG_CHECKING([for non-GNU ld])</div><div class='del'>-fi</div><div class='del'>-AC_CACHE_VAL(lt_cv_path_LD,</div><div class='del'>-[if test -z "$LD"; then</div><div class='del'>-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR</div><div class='del'>-  for ac_dir in $PATH; do</div><div class='del'>-    IFS="$lt_save_ifs"</div><div class='del'>-    test -z "$ac_dir" &amp;&amp; ac_dir=.</div><div class='del'>-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then</div><div class='del'>-      lt_cv_path_LD="$ac_dir/$ac_prog"</div><div class='del'>-      # Check to see if the program is GNU ld.  I'd rather use --version,</div><div class='del'>-      # but apparently some variants of GNU ld only accept -v.</div><div class='del'>-      # Break only if it was the GNU/non-GNU ld that we prefer.</div><div class='del'>-      case `"$lt_cv_path_LD" -v 2&gt;&amp;1 &lt;/dev/null` in</div><div class='del'>-      *GNU* | *'with BFD'*)</div><div class='del'>-	test "$with_gnu_ld" != no &amp;&amp; break</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-	test "$with_gnu_ld" != yes &amp;&amp; break</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-    fi</div><div class='del'>-  done</div><div class='del'>-  IFS="$lt_save_ifs"</div><div class='del'>-else</div><div class='del'>-  lt_cv_path_LD="$LD" # Let the user override the test with a path.</div><div class='del'>-fi])</div><div class='del'>-LD="$lt_cv_path_LD"</div><div class='del'>-if test -n "$LD"; then</div><div class='del'>-  AC_MSG_RESULT($LD)</div><div class='del'>-else</div><div class='del'>-  AC_MSG_RESULT(no)</div><div class='del'>-fi</div><div class='del'>-test -z "$LD" &amp;&amp; AC_MSG_ERROR([no acceptable ld found in \$PATH])</div><div class='del'>-_LT_PATH_LD_GNU</div><div class='del'>-AC_SUBST([LD])</div><div class='del'>-</div><div class='del'>-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])</div><div class='del'>-])# LT_PATH_LD</div><div class='del'>-</div><div class='del'>-# Old names:</div><div class='del'>-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])</div><div class='del'>-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([AM_PROG_LD], [])</div><div class='del'>-dnl AC_DEFUN([AC_PROG_LD], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_PATH_LD_GNU</div><div class='del'>-#- --------------</div><div class='del'>-m4_defun([_LT_PATH_LD_GNU],</div><div class='del'>-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,</div><div class='del'>-[# I'd rather use --version here, but apparently some GNU lds only accept -v.</div><div class='del'>-case `$LD -v 2&gt;&amp;1 &lt;/dev/null` in</div><div class='del'>-*GNU* | *'with BFD'*)</div><div class='del'>-  lt_cv_prog_gnu_ld=yes</div><div class='del'>-  ;;</div><div class='del'>-*)</div><div class='del'>-  lt_cv_prog_gnu_ld=no</div><div class='del'>-  ;;</div><div class='del'>-esac])</div><div class='del'>-with_gnu_ld=$lt_cv_prog_gnu_ld</div><div class='del'>-])# _LT_PATH_LD_GNU</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_CMD_RELOAD</div><div class='del'>-# --------------</div><div class='del'>-# find reload flag for linker</div><div class='del'>-#   -- PORTME Some linkers may need a different reload flag.</div><div class='del'>-m4_defun([_LT_CMD_RELOAD],</div><div class='del'>-[AC_CACHE_CHECK([for $LD option to reload object files],</div><div class='del'>-  lt_cv_ld_reload_flag,</div><div class='del'>-  [lt_cv_ld_reload_flag='-r'])</div><div class='del'>-reload_flag=$lt_cv_ld_reload_flag</div><div class='del'>-case $reload_flag in</div><div class='del'>-"" | " "*) ;;</div><div class='del'>-*) reload_flag=" $reload_flag" ;;</div><div class='del'>-esac</div><div class='del'>-reload_cmds='$LD$reload_flag -o $output$reload_objs'</div><div class='del'>-case $host_os in</div><div class='del'>-  darwin*)</div><div class='del'>-    if test "$GCC" = yes; then</div><div class='del'>-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'</div><div class='del'>-    else</div><div class='del'>-      reload_cmds='$LD$reload_flag -o $output$reload_objs'</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-esac</div><div class='del'>-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl</div><div class='del'>-_LT_DECL([], [reload_cmds], [2])dnl</div><div class='del'>-])# _LT_CMD_RELOAD</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_CHECK_MAGIC_METHOD</div><div class='del'>-# ----------------------</div><div class='del'>-# how to check for library dependencies</div><div class='del'>-#  -- PORTME fill in with the dynamic library characteristics</div><div class='del'>-m4_defun([_LT_CHECK_MAGIC_METHOD],</div><div class='del'>-[m4_require([_LT_DECL_EGREP])</div><div class='del'>-m4_require([_LT_DECL_OBJDUMP])</div><div class='del'>-AC_CACHE_CHECK([how to recognize dependent libraries],</div><div class='del'>-lt_cv_deplibs_check_method,</div><div class='del'>-[lt_cv_file_magic_cmd='$MAGIC_CMD'</div><div class='del'>-lt_cv_file_magic_test_file=</div><div class='del'>-lt_cv_deplibs_check_method='unknown'</div><div class='del'>-# Need to set the preceding variable on all platforms that support</div><div class='del'>-# interlibrary dependencies.</div><div class='del'>-# 'none' -- dependencies not supported.</div><div class='del'>-# `unknown' -- same as none, but documents that we really don't know.</div><div class='del'>-# 'pass_all' -- all dependencies passed with no checks.</div><div class='del'>-# 'test_compile' -- check by making test program.</div><div class='del'>-# 'file_magic [[regex]]' -- check by looking for files in library path</div><div class='del'>-# which responds to the $file_magic_cmd with a given extended regex.</div><div class='del'>-# If you have `file' or equivalent on your system and you're not sure</div><div class='del'>-# whether `pass_all' will *always* work, you probably want this one.</div><div class='del'>-</div><div class='del'>-case $host_os in</div><div class='del'>-aix[[4-9]]*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-beos*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-bsdi[[45]]*)</div><div class='del'>-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'</div><div class='del'>-  lt_cv_file_magic_cmd='/usr/bin/file -L'</div><div class='del'>-  lt_cv_file_magic_test_file=/shlib/libc.so</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-cygwin*)</div><div class='del'>-  # func_win32_libid is a shell function defined in ltmain.sh</div><div class='del'>-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'</div><div class='del'>-  lt_cv_file_magic_cmd='func_win32_libid'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-mingw* | pw32*)</div><div class='del'>-  # Base MSYS/MinGW do not provide the 'file' command needed by</div><div class='del'>-  # func_win32_libid shell function, so use a weaker test based on 'objdump',</div><div class='del'>-  # unless we find 'file', for example because we are cross-compiling.</div><div class='del'>-  if ( file / ) &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'</div><div class='del'>-    lt_cv_file_magic_cmd='func_win32_libid'</div><div class='del'>-  else</div><div class='del'>-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'</div><div class='del'>-    lt_cv_file_magic_cmd='$OBJDUMP -f'</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-cegcc)</div><div class='del'>-  # use the weaker test based on 'objdump'. See mingw*.</div><div class='del'>-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'</div><div class='del'>-  lt_cv_file_magic_cmd='$OBJDUMP -f'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-darwin* | rhapsody*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-freebsd* | dragonfly*)</div><div class='del'>-  if echo __ELF__ | $CC -E - | $GREP __ELF__ &gt; /dev/null; then</div><div class='del'>-    case $host_cpu in</div><div class='del'>-    i*86 )</div><div class='del'>-      # Not sure whether the presence of OpenBSD here was a mistake.</div><div class='del'>-      # Let's accept both of them until this is cleared up.</div><div class='del'>-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'</div><div class='del'>-      lt_cv_file_magic_cmd=/usr/bin/file</div><div class='del'>-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-  else</div><div class='del'>-    lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-gnu*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-hpux10.20* | hpux11*)</div><div class='del'>-  lt_cv_file_magic_cmd=/usr/bin/file</div><div class='del'>-  case $host_cpu in</div><div class='del'>-  ia64*)</div><div class='del'>-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'</div><div class='del'>-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so</div><div class='del'>-    ;;</div><div class='del'>-  hppa*64*)</div><div class='del'>-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']</div><div class='del'>-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'</div><div class='del'>-    lt_cv_file_magic_test_file=/usr/lib/libc.sl</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-interix[[3-9]]*)</div><div class='del'>-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here</div><div class='del'>-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-irix5* | irix6* | nonstopux*)</div><div class='del'>-  case $LD in</div><div class='del'>-  *-32|*"-32 ") libmagic=32-bit;;</div><div class='del'>-  *-n32|*"-n32 ") libmagic=N32;;</div><div class='del'>-  *-64|*"-64 ") libmagic=64-bit;;</div><div class='del'>-  *) libmagic=never-match;;</div><div class='del'>-  esac</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-# This must be Linux ELF.</div><div class='del'>-linux* | k*bsd*-gnu)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-netbsd*)</div><div class='del'>-  if echo __ELF__ | $CC -E - | $GREP __ELF__ &gt; /dev/null; then</div><div class='del'>-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'</div><div class='del'>-  else</div><div class='del'>-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-newos6*)</div><div class='del'>-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'</div><div class='del'>-  lt_cv_file_magic_cmd=/usr/bin/file</div><div class='del'>-  lt_cv_file_magic_test_file=/usr/lib/libnls.so</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-*nto* | *qnx*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-openbsd*)</div><div class='del'>-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then</div><div class='del'>-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'</div><div class='del'>-  else</div><div class='del'>-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-osf3* | osf4* | osf5*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-rdos*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-solaris*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-sysv4 | sysv4.3*)</div><div class='del'>-  case $host_vendor in</div><div class='del'>-  motorola)</div><div class='del'>-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'</div><div class='del'>-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`</div><div class='del'>-    ;;</div><div class='del'>-  ncr)</div><div class='del'>-    lt_cv_deplibs_check_method=pass_all</div><div class='del'>-    ;;</div><div class='del'>-  sequent)</div><div class='del'>-    lt_cv_file_magic_cmd='/bin/file'</div><div class='del'>-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'</div><div class='del'>-    ;;</div><div class='del'>-  sni)</div><div class='del'>-    lt_cv_file_magic_cmd='/bin/file'</div><div class='del'>-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"</div><div class='del'>-    lt_cv_file_magic_test_file=/lib/libc.so</div><div class='del'>-    ;;</div><div class='del'>-  siemens)</div><div class='del'>-    lt_cv_deplibs_check_method=pass_all</div><div class='del'>-    ;;</div><div class='del'>-  pc)</div><div class='del'>-    lt_cv_deplibs_check_method=pass_all</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-tpf*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-])</div><div class='del'>-file_magic_cmd=$lt_cv_file_magic_cmd</div><div class='del'>-deplibs_check_method=$lt_cv_deplibs_check_method</div><div class='del'>-test -z "$deplibs_check_method" &amp;&amp; deplibs_check_method=unknown</div><div class='del'>-</div><div class='del'>-_LT_DECL([], [deplibs_check_method], [1],</div><div class='del'>-    [Method to check whether dependent libraries are shared objects])</div><div class='del'>-_LT_DECL([], [file_magic_cmd], [1],</div><div class='del'>-    [Command to use when deplibs_check_method == "file_magic"])</div><div class='del'>-])# _LT_CHECK_MAGIC_METHOD</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# LT_PATH_NM</div><div class='del'>-# ----------</div><div class='del'>-# find the pathname to a BSD- or MS-compatible name lister</div><div class='del'>-AC_DEFUN([LT_PATH_NM],</div><div class='del'>-[AC_REQUIRE([AC_PROG_CC])dnl</div><div class='del'>-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,</div><div class='del'>-[if test -n "$NM"; then</div><div class='del'>-  # Let the user override the test.</div><div class='del'>-  lt_cv_path_NM="$NM"</div><div class='del'>-else</div><div class='del'>-  lt_nm_to_check="${ac_tool_prefix}nm"</div><div class='del'>-  if test -n "$ac_tool_prefix" &amp;&amp; test "$build" = "$host"; then</div><div class='del'>-    lt_nm_to_check="$lt_nm_to_check nm"</div><div class='del'>-  fi</div><div class='del'>-  for lt_tmp_nm in $lt_nm_to_check; do</div><div class='del'>-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR</div><div class='del'>-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do</div><div class='del'>-      IFS="$lt_save_ifs"</div><div class='del'>-      test -z "$ac_dir" &amp;&amp; ac_dir=.</div><div class='del'>-      tmp_nm="$ac_dir/$lt_tmp_nm"</div><div class='del'>-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then</div><div class='del'>-	# Check to see if the nm accepts a BSD-compat flag.</div><div class='del'>-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:</div><div class='del'>-	#   nm: unknown option "B" ignored</div><div class='del'>-	# Tru64's nm complains that /dev/null is an invalid object file</div><div class='del'>-	case `"$tmp_nm" -B /dev/null 2&gt;&amp;1 | sed '1q'` in</div><div class='del'>-	*/dev/null* | *'Invalid file or object type'*)</div><div class='del'>-	  lt_cv_path_NM="$tmp_nm -B"</div><div class='del'>-	  break</div><div class='del'>-	  ;;</div><div class='del'>-	*)</div><div class='del'>-	  case `"$tmp_nm" -p /dev/null 2&gt;&amp;1 | sed '1q'` in</div><div class='del'>-	  */dev/null*)</div><div class='del'>-	    lt_cv_path_NM="$tmp_nm -p"</div><div class='del'>-	    break</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but</div><div class='del'>-	    continue # so that we can try to find one that supports BSD flags</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-    done</div><div class='del'>-    IFS="$lt_save_ifs"</div><div class='del'>-  done</div><div class='del'>-  : ${lt_cv_path_NM=no}</div><div class='del'>-fi])</div><div class='del'>-if test "$lt_cv_path_NM" != "no"; then</div><div class='del'>-  NM="$lt_cv_path_NM"</div><div class='del'>-else</div><div class='del'>-  # Didn't find any BSD compatible name lister, look for dumpbin.</div><div class='del'>-  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)</div><div class='del'>-  AC_SUBST([DUMPBIN])</div><div class='del'>-  if test "$DUMPBIN" != ":"; then</div><div class='del'>-    NM="$DUMPBIN"</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-test -z "$NM" &amp;&amp; NM=nm</div><div class='del'>-AC_SUBST([NM])</div><div class='del'>-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl</div><div class='del'>-</div><div class='del'>-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],</div><div class='del'>-  [lt_cv_nm_interface="BSD nm"</div><div class='del'>-  echo "int some_variable = 0;" &gt; conftest.$ac_ext</div><div class='del'>-  (eval echo "\"\$as_me:__oline__: $ac_compile\"" &gt;&amp;AS_MESSAGE_LOG_FD)</div><div class='del'>-  (eval "$ac_compile" 2&gt;conftest.err)</div><div class='del'>-  cat conftest.err &gt;&amp;AS_MESSAGE_LOG_FD</div><div class='del'>-  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" &gt;&amp;AS_MESSAGE_LOG_FD)</div><div class='del'>-  (eval "$NM \"conftest.$ac_objext\"" 2&gt;conftest.err &gt; conftest.out)</div><div class='del'>-  cat conftest.err &gt;&amp;AS_MESSAGE_LOG_FD</div><div class='del'>-  (eval echo "\"\$as_me:__oline__: output\"" &gt;&amp;AS_MESSAGE_LOG_FD)</div><div class='del'>-  cat conftest.out &gt;&amp;AS_MESSAGE_LOG_FD</div><div class='del'>-  if $GREP 'External.*some_variable' conftest.out &gt; /dev/null; then</div><div class='del'>-    lt_cv_nm_interface="MS dumpbin"</div><div class='del'>-  fi</div><div class='del'>-  rm -f conftest*])</div><div class='del'>-])# LT_PATH_NM</div><div class='del'>-</div><div class='del'>-# Old names:</div><div class='del'>-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])</div><div class='del'>-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([AM_PROG_NM], [])</div><div class='del'>-dnl AC_DEFUN([AC_PROG_NM], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# LT_LIB_M</div><div class='del'>-# --------</div><div class='del'>-# check for math library</div><div class='del'>-AC_DEFUN([LT_LIB_M],</div><div class='del'>-[AC_REQUIRE([AC_CANONICAL_HOST])dnl</div><div class='del'>-LIBM=</div><div class='del'>-case $host in</div><div class='del'>-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)</div><div class='del'>-  # These system don't have libm, or don't need it</div><div class='del'>-  ;;</div><div class='del'>-*-ncr-sysv4.3*)</div><div class='del'>-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")</div><div class='del'>-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")</div><div class='del'>-  ;;</div><div class='del'>-*)</div><div class='del'>-  AC_CHECK_LIB(m, cos, LIBM="-lm")</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-AC_SUBST([LIBM])</div><div class='del'>-])# LT_LIB_M</div><div class='del'>-</div><div class='del'>-# Old name:</div><div class='del'>-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([AC_CHECK_LIBM], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_COMPILER_NO_RTTI([TAGNAME])</div><div class='del'>-# -------------------------------</div><div class='del'>-m4_defun([_LT_COMPILER_NO_RTTI],</div><div class='del'>-[m4_require([_LT_TAG_COMPILER])dnl</div><div class='del'>-</div><div class='del'>-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=</div><div class='del'>-</div><div class='del'>-if test "$GCC" = yes; then</div><div class='del'>-  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'</div><div class='del'>-</div><div class='del'>-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],</div><div class='del'>-    lt_cv_prog_compiler_rtti_exceptions,</div><div class='del'>-    [-fno-rtti -fno-exceptions], [],</div><div class='del'>-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])</div><div class='del'>-fi</div><div class='del'>-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],</div><div class='del'>-	[Compiler flag to turn off builtin functions])</div><div class='del'>-])# _LT_COMPILER_NO_RTTI</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_CMD_GLOBAL_SYMBOLS</div><div class='del'>-# ----------------------</div><div class='del'>-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],</div><div class='del'>-[AC_REQUIRE([AC_CANONICAL_HOST])dnl</div><div class='del'>-AC_REQUIRE([AC_PROG_CC])dnl</div><div class='del'>-AC_REQUIRE([LT_PATH_NM])dnl</div><div class='del'>-AC_REQUIRE([LT_PATH_LD])dnl</div><div class='del'>-m4_require([_LT_DECL_SED])dnl</div><div class='del'>-m4_require([_LT_DECL_EGREP])dnl</div><div class='del'>-m4_require([_LT_TAG_COMPILER])dnl</div><div class='del'>-</div><div class='del'>-# Check for command to grab the raw symbol name followed by C symbol from nm.</div><div class='del'>-AC_MSG_CHECKING([command to parse $NM output from $compiler object])</div><div class='del'>-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],</div><div class='del'>-[</div><div class='del'>-# These are sane defaults that work on at least a few old systems.</div><div class='del'>-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]</div><div class='del'>-</div><div class='del'>-# Character class describing NM global symbol codes.</div><div class='del'>-symcode='[[BCDEGRST]]'</div><div class='del'>-</div><div class='del'>-# Regexp to match symbols that can be accessed directly from C.</div><div class='del'>-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'</div><div class='del'>-</div><div class='del'>-# Define system-specific variables.</div><div class='del'>-case $host_os in</div><div class='del'>-aix*)</div><div class='del'>-  symcode='[[BCDT]]'</div><div class='del'>-  ;;</div><div class='del'>-cygwin* | mingw* | pw32* | cegcc*)</div><div class='del'>-  symcode='[[ABCDGISTW]]'</div><div class='del'>-  ;;</div><div class='del'>-hpux*)</div><div class='del'>-  if test "$host_cpu" = ia64; then</div><div class='del'>-    symcode='[[ABCDEGRST]]'</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-irix* | nonstopux*)</div><div class='del'>-  symcode='[[BCDEGRST]]'</div><div class='del'>-  ;;</div><div class='del'>-osf*)</div><div class='del'>-  symcode='[[BCDEGQRST]]'</div><div class='del'>-  ;;</div><div class='del'>-solaris*)</div><div class='del'>-  symcode='[[BDRT]]'</div><div class='del'>-  ;;</div><div class='del'>-sco3.2v5*)</div><div class='del'>-  symcode='[[DT]]'</div><div class='del'>-  ;;</div><div class='del'>-sysv4.2uw2*)</div><div class='del'>-  symcode='[[DT]]'</div><div class='del'>-  ;;</div><div class='del'>-sysv5* | sco5v6* | unixware* | OpenUNIX*)</div><div class='del'>-  symcode='[[ABDT]]'</div><div class='del'>-  ;;</div><div class='del'>-sysv4)</div><div class='del'>-  symcode='[[DFNSTU]]'</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# If we're using GNU nm, then use its standard symbol codes.</div><div class='del'>-case `$NM -V 2&gt;&amp;1` in</div><div class='del'>-*GNU* | *'with BFD'*)</div><div class='del'>-  symcode='[[ABCDGIRSTW]]' ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# Transform an extracted symbol line into a proper C declaration.</div><div class='del'>-# Some systems (esp. on ia64) link data and code symbols differently,</div><div class='del'>-# so use this general approach.</div><div class='del'>-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"</div><div class='del'>-</div><div class='del'>-# Transform an extracted symbol line into symbol name and symbol address</div><div class='del'>-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&amp;\2},/p'"</div><div class='del'>-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&amp;\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&amp;\2},/p'"</div><div class='del'>-</div><div class='del'>-# Handle CRLF in mingw tool chain</div><div class='del'>-opt_cr=</div><div class='del'>-case $build_os in</div><div class='del'>-mingw*)</div><div class='del'>-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# Try without a prefix underscore, then with it.</div><div class='del'>-for ac_symprfx in "" "_"; do</div><div class='del'>-</div><div class='del'>-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.</div><div class='del'>-  symxfrm="\\1 $ac_symprfx\\2 \\2"</div><div class='del'>-</div><div class='del'>-  # Write the raw and C identifiers.</div><div class='del'>-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then</div><div class='del'>-    # Fake it for dumpbin and say T for any non-static function</div><div class='del'>-    # and D for any global variable.</div><div class='del'>-    # Also find C++ and __fastcall symbols from MSVC++,</div><div class='del'>-    # which start with @ or ?.</div><div class='del'>-    lt_cv_sys_global_symbol_pipe="$AWK ['"\</div><div class='del'>-"     {last_section=section; section=\$ 3};"\</div><div class='del'>-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\</div><div class='del'>-"     \$ 0!~/External *\|/{next};"\</div><div class='del'>-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\</div><div class='del'>-"     {if(hide[section]) next};"\</div><div class='del'>-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\</div><div class='del'>-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\</div><div class='del'>-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\</div><div class='del'>-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\</div><div class='del'>-"     ' prfx=^$ac_symprfx]"</div><div class='del'>-  else</div><div class='del'>-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  # Check to see that the pipe works correctly.</div><div class='del'>-  pipe_works=no</div><div class='del'>-</div><div class='del'>-  rm -f conftest*</div><div class='del'>-  cat &gt; conftest.$ac_ext &lt;&lt;_LT_EOF</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif</div><div class='del'>-char nm_test_var;</div><div class='del'>-void nm_test_func(void);</div><div class='del'>-void nm_test_func(void){}</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-int main(){nm_test_var='a';nm_test_func();return(0);}</div><div class='del'>-_LT_EOF</div><div class='del'>-</div><div class='del'>-  if AC_TRY_EVAL(ac_compile); then</div><div class='del'>-    # Now try to grab the symbols.</div><div class='del'>-    nlist=conftest.nm</div><div class='del'>-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \&gt; $nlist) &amp;&amp; test -s "$nlist"; then</div><div class='del'>-      # Try sorting and uniquifying the output.</div><div class='del'>-      if sort "$nlist" | uniq &gt; "$nlist"T; then</div><div class='del'>-	mv -f "$nlist"T "$nlist"</div><div class='del'>-      else</div><div class='del'>-	rm -f "$nlist"T</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Make sure that we snagged all the symbols we need.</div><div class='del'>-      if $GREP ' nm_test_var$' "$nlist" &gt;/dev/null; then</div><div class='del'>-	if $GREP ' nm_test_func$' "$nlist" &gt;/dev/null; then</div><div class='del'>-	  cat &lt;&lt;_LT_EOF &gt; conftest.$ac_ext</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-	  # Now generate the symbol file.</div><div class='del'>-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' &lt; "$nlist" | $GREP -v main &gt;&gt; conftest.$ac_ext'</div><div class='del'>-</div><div class='del'>-	  cat &lt;&lt;_LT_EOF &gt;&gt; conftest.$ac_ext</div><div class='del'>-</div><div class='del'>-/* The mapping between symbol names and symbols.  */</div><div class='del'>-const struct {</div><div class='del'>-  const char *name;</div><div class='del'>-  void       *address;</div><div class='del'>-}</div><div class='del'>-lt__PROGRAM__LTX_preloaded_symbols[[]] =</div><div class='del'>-{</div><div class='del'>-  { "@PROGRAM@", (void *) 0 },</div><div class='del'>-_LT_EOF</div><div class='del'>-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&amp;\2},/" &lt; "$nlist" | $GREP -v main &gt;&gt; conftest.$ac_ext</div><div class='del'>-	  cat &lt;&lt;\_LT_EOF &gt;&gt; conftest.$ac_ext</div><div class='del'>-  {0, (void *) 0}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This works around a problem in FreeBSD linker */</div><div class='del'>-#ifdef FREEBSD_WORKAROUND</div><div class='del'>-static const void *lt_preloaded_setup() {</div><div class='del'>-  return lt__PROGRAM__LTX_preloaded_symbols;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-_LT_EOF</div><div class='del'>-	  # Now try linking the two files.</div><div class='del'>-	  mv conftest.$ac_objext conftstm.$ac_objext</div><div class='del'>-	  lt_save_LIBS="$LIBS"</div><div class='del'>-	  lt_save_CFLAGS="$CFLAGS"</div><div class='del'>-	  LIBS="conftstm.$ac_objext"</div><div class='del'>-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"</div><div class='del'>-	  if AC_TRY_EVAL(ac_link) &amp;&amp; test -s conftest${ac_exeext}; then</div><div class='del'>-	    pipe_works=yes</div><div class='del'>-	  fi</div><div class='del'>-	  LIBS="$lt_save_LIBS"</div><div class='del'>-	  CFLAGS="$lt_save_CFLAGS"</div><div class='del'>-	else</div><div class='del'>-	  echo "cannot find nm_test_func in $nlist" &gt;&amp;AS_MESSAGE_LOG_FD</div><div class='del'>-	fi</div><div class='del'>-      else</div><div class='del'>-	echo "cannot find nm_test_var in $nlist" &gt;&amp;AS_MESSAGE_LOG_FD</div><div class='del'>-      fi</div><div class='del'>-    else</div><div class='del'>-      echo "cannot run $lt_cv_sys_global_symbol_pipe" &gt;&amp;AS_MESSAGE_LOG_FD</div><div class='del'>-    fi</div><div class='del'>-  else</div><div class='del'>-    echo "$progname: failed program was:" &gt;&amp;AS_MESSAGE_LOG_FD</div><div class='del'>-    cat conftest.$ac_ext &gt;&amp;5</div><div class='del'>-  fi</div><div class='del'>-  rm -rf conftest* conftst*</div><div class='del'>-</div><div class='del'>-  # Do not use the global_symbol_pipe unless it works.</div><div class='del'>-  if test "$pipe_works" = yes; then</div><div class='del'>-    break</div><div class='del'>-  else</div><div class='del'>-    lt_cv_sys_global_symbol_pipe=</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-])</div><div class='del'>-if test -z "$lt_cv_sys_global_symbol_pipe"; then</div><div class='del'>-  lt_cv_sys_global_symbol_to_cdecl=</div><div class='del'>-fi</div><div class='del'>-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then</div><div class='del'>-  AC_MSG_RESULT(failed)</div><div class='del'>-else</div><div class='del'>-  AC_MSG_RESULT(ok)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],</div><div class='del'>-    [Take the output of nm and produce a listing of raw symbols and C names])</div><div class='del'>-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],</div><div class='del'>-    [Transform the output of nm in a proper C declaration])</div><div class='del'>-_LT_DECL([global_symbol_to_c_name_address],</div><div class='del'>-    [lt_cv_sys_global_symbol_to_c_name_address], [1],</div><div class='del'>-    [Transform the output of nm in a C name address pair])</div><div class='del'>-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],</div><div class='del'>-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],</div><div class='del'>-    [Transform the output of nm in a C name address pair when lib prefix is needed])</div><div class='del'>-]) # _LT_CMD_GLOBAL_SYMBOLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_COMPILER_PIC([TAGNAME])</div><div class='del'>-# ---------------------------</div><div class='del'>-m4_defun([_LT_COMPILER_PIC],</div><div class='del'>-[m4_require([_LT_TAG_COMPILER])dnl</div><div class='del'>-_LT_TAGVAR(lt_prog_compiler_wl, $1)=</div><div class='del'>-_LT_TAGVAR(lt_prog_compiler_pic, $1)=</div><div class='del'>-_LT_TAGVAR(lt_prog_compiler_static, $1)=</div><div class='del'>-</div><div class='del'>-AC_MSG_CHECKING([for $compiler option to produce PIC])</div><div class='del'>-m4_if([$1], [CXX], [</div><div class='del'>-  # C++ specific cases for pic, static, wl, etc.</div><div class='del'>-  if test "$GXX" = yes; then</div><div class='del'>-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'</div><div class='del'>-</div><div class='del'>-    case $host_os in</div><div class='del'>-    aix*)</div><div class='del'>-      # All AIX code is PIC.</div><div class='del'>-      if test "$host_cpu" = ia64; then</div><div class='del'>-	# AIX 5 now supports IA64 processor</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    amigaos*)</div><div class='del'>-      case $host_cpu in</div><div class='del'>-      powerpc)</div><div class='del'>-            # see comment about AmigaOS4 .so support</div><div class='del'>-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'</div><div class='del'>-        ;;</div><div class='del'>-      m68k)</div><div class='del'>-            # FIXME: we need at least 68020 code to build shared libraries, but</div><div class='del'>-            # adding the `-m68020' flag to GCC prevents building anything better,</div><div class='del'>-            # like `-m68040'.</div><div class='del'>-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'</div><div class='del'>-        ;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)</div><div class='del'>-      # PIC is the default for these OSes.</div><div class='del'>-      ;;</div><div class='del'>-    mingw* | cygwin* | os2* | pw32* | cegcc*)</div><div class='del'>-      # This hack is so that the source file can tell whether it is being</div><div class='del'>-      # built for inclusion in a dll (and should export symbols for example).</div><div class='del'>-      # Although the cygwin gcc ignores -fPIC, still need this for old-style</div><div class='del'>-      # (--disable-auto-import) libraries</div><div class='del'>-      m4_if([$1], [GCJ], [],</div><div class='del'>-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])</div><div class='del'>-      ;;</div><div class='del'>-    darwin* | rhapsody*)</div><div class='del'>-      # PIC is the default on this platform</div><div class='del'>-      # Common symbols not allowed in MH_DYLIB files</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'</div><div class='del'>-      ;;</div><div class='del'>-    *djgpp*)</div><div class='del'>-      # DJGPP does not support shared libraries at all</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=</div><div class='del'>-      ;;</div><div class='del'>-    interix[[3-9]]*)</div><div class='del'>-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.</div><div class='del'>-      # Instead, we relocate shared libraries at runtime.</div><div class='del'>-      ;;</div><div class='del'>-    sysv4*MP*)</div><div class='del'>-      if test -d /usr/nec; then</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-    hpux*)</div><div class='del'>-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit</div><div class='del'>-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag</div><div class='del'>-      # sets the default TLS model and affects inlining.</div><div class='del'>-      case $host_cpu in</div><div class='del'>-      hppa*64*)</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-    *qnx* | *nto*)</div><div class='del'>-      # QNX uses GNU C++, but need to define -shared option too, otherwise</div><div class='del'>-      # it will coredump.</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'</div><div class='del'>-      ;;</div><div class='del'>-    *)</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-  else</div><div class='del'>-    case $host_os in</div><div class='del'>-      aix[[4-9]]*)</div><div class='del'>-	# All AIX code is PIC.</div><div class='del'>-	if test "$host_cpu" = ia64; then</div><div class='del'>-	  # AIX 5 now supports IA64 processor</div><div class='del'>-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-	else</div><div class='del'>-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-      chorus*)</div><div class='del'>-	case $cc_basename in</div><div class='del'>-	cxch68*)</div><div class='del'>-	  # Green Hills C++ Compiler</div><div class='del'>-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      dgux*)</div><div class='del'>-	case $cc_basename in</div><div class='del'>-	  ec++*)</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'</div><div class='del'>-	    ;;</div><div class='del'>-	  ghcx*)</div><div class='del'>-	    # Green Hills C++ Compiler</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      freebsd* | dragonfly*)</div><div class='del'>-	# FreeBSD uses GNU C++</div><div class='del'>-	;;</div><div class='del'>-      hpux9* | hpux10* | hpux11*)</div><div class='del'>-	case $cc_basename in</div><div class='del'>-	  CC*)</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'</div><div class='del'>-	    if test "$host_cpu" != ia64; then</div><div class='del'>-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'</div><div class='del'>-	    fi</div><div class='del'>-	    ;;</div><div class='del'>-	  aCC*)</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'</div><div class='del'>-	    case $host_cpu in</div><div class='del'>-	    hppa*64*|ia64*)</div><div class='del'>-	      # +Z the default</div><div class='del'>-	      ;;</div><div class='del'>-	    *)</div><div class='del'>-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'</div><div class='del'>-	      ;;</div><div class='del'>-	    esac</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      interix*)</div><div class='del'>-	# This is c89, which is MS Visual C++ (no shared libs)</div><div class='del'>-	# Anyone wants to do a port?</div><div class='del'>-	;;</div><div class='del'>-      irix5* | irix6* | nonstopux*)</div><div class='del'>-	case $cc_basename in</div><div class='del'>-	  CC*)</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'</div><div class='del'>-	    # CC pic flag -KPIC is the default.</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      linux* | k*bsd*-gnu)</div><div class='del'>-	case $cc_basename in</div><div class='del'>-	  KCC*)</div><div class='del'>-	    # KAI C++ Compiler</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'</div><div class='del'>-	    ;;</div><div class='del'>-	  ecpc* )</div><div class='del'>-	    # old Intel C++ for x86_64 which still supported -KPIC.</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'</div><div class='del'>-	    ;;</div><div class='del'>-	  icpc* )</div><div class='del'>-	    # Intel C++, used to be incompatible with GCC.</div><div class='del'>-	    # ICC 10 doesn't accept -KPIC any more.</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'</div><div class='del'>-	    ;;</div><div class='del'>-	  pgCC* | pgcpp*)</div><div class='del'>-	    # Portland Group C++ compiler</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-	    ;;</div><div class='del'>-	  cxx*)</div><div class='del'>-	    # Compaq C++</div><div class='del'>-	    # Make sure the PIC flag is empty.  It appears that all Alpha</div><div class='del'>-	    # Linux and Compaq Tru64 Unix objects are PIC.</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'</div><div class='del'>-	    ;;</div><div class='del'>-	  xlc* | xlC*)</div><div class='del'>-	    # IBM XL 8.0 on PPC</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    case `$CC -V 2&gt;&amp;1 | sed 5q` in</div><div class='del'>-	    *Sun\ C*)</div><div class='del'>-	      # Sun C++ 5.9</div><div class='del'>-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'</div><div class='del'>-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '</div><div class='del'>-	      ;;</div><div class='del'>-	    esac</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      lynxos*)</div><div class='del'>-	;;</div><div class='del'>-      m88k*)</div><div class='del'>-	;;</div><div class='del'>-      mvs*)</div><div class='del'>-	case $cc_basename in</div><div class='del'>-	  cxx*)</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      netbsd*)</div><div class='del'>-	;;</div><div class='del'>-      *qnx* | *nto*)</div><div class='del'>-        # QNX uses GNU C++, but need to define -shared option too, otherwise</div><div class='del'>-        # it will coredump.</div><div class='del'>-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'</div><div class='del'>-        ;;</div><div class='del'>-      osf3* | osf4* | osf5*)</div><div class='del'>-	case $cc_basename in</div><div class='del'>-	  KCC*)</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'</div><div class='del'>-	    ;;</div><div class='del'>-	  RCC*)</div><div class='del'>-	    # Rational C++ 2.4.1</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'</div><div class='del'>-	    ;;</div><div class='del'>-	  cxx*)</div><div class='del'>-	    # Digital/Compaq C++</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-	    # Make sure the PIC flag is empty.  It appears that all Alpha</div><div class='del'>-	    # Linux and Compaq Tru64 Unix objects are PIC.</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      psos*)</div><div class='del'>-	;;</div><div class='del'>-      solaris*)</div><div class='del'>-	case $cc_basename in</div><div class='del'>-	  CC*)</div><div class='del'>-	    # Sun C++ 4.2, 5.x and Centerline C++</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '</div><div class='del'>-	    ;;</div><div class='del'>-	  gcx*)</div><div class='del'>-	    # Green Hills C++ Compiler</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      sunos4*)</div><div class='del'>-	case $cc_basename in</div><div class='del'>-	  CC*)</div><div class='del'>-	    # Sun C++ 4.x</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-	    ;;</div><div class='del'>-	  lcc*)</div><div class='del'>-	    # Lucid</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)</div><div class='del'>-	case $cc_basename in</div><div class='del'>-	  CC*)</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      tandem*)</div><div class='del'>-	case $cc_basename in</div><div class='del'>-	  NCC*)</div><div class='del'>-	    # NonStop-UX NCC 3.20</div><div class='del'>-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      vxworks*)</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no</div><div class='del'>-	;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-],</div><div class='del'>-[</div><div class='del'>-  if test "$GCC" = yes; then</div><div class='del'>-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'</div><div class='del'>-</div><div class='del'>-    case $host_os in</div><div class='del'>-      aix*)</div><div class='del'>-      # All AIX code is PIC.</div><div class='del'>-      if test "$host_cpu" = ia64; then</div><div class='del'>-	# AIX 5 now supports IA64 processor</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    amigaos*)</div><div class='del'>-      case $host_cpu in</div><div class='del'>-      powerpc)</div><div class='del'>-            # see comment about AmigaOS4 .so support</div><div class='del'>-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'</div><div class='del'>-        ;;</div><div class='del'>-      m68k)</div><div class='del'>-            # FIXME: we need at least 68020 code to build shared libraries, but</div><div class='del'>-            # adding the `-m68020' flag to GCC prevents building anything better,</div><div class='del'>-            # like `-m68040'.</div><div class='del'>-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'</div><div class='del'>-        ;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)</div><div class='del'>-      # PIC is the default for these OSes.</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    mingw* | cygwin* | pw32* | os2* | cegcc*)</div><div class='del'>-      # This hack is so that the source file can tell whether it is being</div><div class='del'>-      # built for inclusion in a dll (and should export symbols for example).</div><div class='del'>-      # Although the cygwin gcc ignores -fPIC, still need this for old-style</div><div class='del'>-      # (--disable-auto-import) libraries</div><div class='del'>-      m4_if([$1], [GCJ], [],</div><div class='del'>-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    darwin* | rhapsody*)</div><div class='del'>-      # PIC is the default on this platform</div><div class='del'>-      # Common symbols not allowed in MH_DYLIB files</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    hpux*)</div><div class='del'>-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit</div><div class='del'>-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag</div><div class='del'>-      # sets the default TLS model and affects inlining.</div><div class='del'>-      case $host_cpu in</div><div class='del'>-      hppa*64*)</div><div class='del'>-	# +Z the default</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    interix[[3-9]]*)</div><div class='del'>-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.</div><div class='del'>-      # Instead, we relocate shared libraries at runtime.</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    msdosdjgpp*)</div><div class='del'>-      # Just because we use GCC doesn't mean we suddenly get shared libraries</div><div class='del'>-      # on systems that don't support them.</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no</div><div class='del'>-      enable_shared=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    *nto* | *qnx*)</div><div class='del'>-      # QNX uses GNU C++, but need to define -shared option too, otherwise</div><div class='del'>-      # it will coredump.</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv4*MP*)</div><div class='del'>-      if test -d /usr/nec; then</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    *)</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-  else</div><div class='del'>-    # PORTME Check for flag to pass linker flags through the system compiler.</div><div class='del'>-    case $host_os in</div><div class='del'>-    aix*)</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-      if test "$host_cpu" = ia64; then</div><div class='del'>-	# AIX 5 now supports IA64 processor</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-      else</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    mingw* | cygwin* | pw32* | os2* | cegcc*)</div><div class='del'>-      # This hack is so that the source file can tell whether it is being</div><div class='del'>-      # built for inclusion in a dll (and should export symbols for example).</div><div class='del'>-      m4_if([$1], [GCJ], [],</div><div class='del'>-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    hpux9* | hpux10* | hpux11*)</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but</div><div class='del'>-      # not for PA HP-UX.</div><div class='del'>-      case $host_cpu in</div><div class='del'>-      hppa*64*|ia64*)</div><div class='del'>-	# +Z the default</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      # Is there a better lt_prog_compiler_static that works with the bundled CC?</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    irix5* | irix6* | nonstopux*)</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-      # PIC (with -KPIC) is the default.</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    linux* | k*bsd*-gnu)</div><div class='del'>-      case $cc_basename in</div><div class='del'>-      # old Intel for x86_64 which still supported -KPIC.</div><div class='del'>-      ecc*)</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'</div><div class='del'>-        ;;</div><div class='del'>-      # icc used to be incompatible with GCC.</div><div class='del'>-      # ICC 10 doesn't accept -KPIC any more.</div><div class='del'>-      icc* | ifort*)</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'</div><div class='del'>-        ;;</div><div class='del'>-      # Lahey Fortran 8.1.</div><div class='del'>-      lf95*)</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'</div><div class='del'>-	;;</div><div class='del'>-      pgcc* | pgf77* | pgf90* | pgf95*)</div><div class='del'>-        # Portland Group compilers (*not* the Pentium gcc compiler,</div><div class='del'>-	# which looks to be a dead project)</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-        ;;</div><div class='del'>-      ccc*)</div><div class='del'>-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-        # All Alpha code is PIC.</div><div class='del'>-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'</div><div class='del'>-        ;;</div><div class='del'>-      xl*)</div><div class='del'>-	# IBM XL C 8.0/Fortran 10.1 on PPC</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-	case `$CC -V 2&gt;&amp;1 | sed 5q` in</div><div class='del'>-	*Sun\ C*)</div><div class='del'>-	  # Sun C 5.9</div><div class='del'>-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'</div><div class='del'>-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-	  ;;</div><div class='del'>-	*Sun\ F*)</div><div class='del'>-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker</div><div class='del'>-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'</div><div class='del'>-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    newsos6)</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    *nto* | *qnx*)</div><div class='del'>-      # QNX uses GNU C++, but need to define -shared option too, otherwise</div><div class='del'>-      # it will coredump.</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    osf3* | osf4* | osf5*)</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-      # All OSF/1 code is PIC.</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    rdos*)</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    solaris*)</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-      case $cc_basename in</div><div class='del'>-      f77* | f90* | f95*)</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;</div><div class='del'>-      *)</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sunos4*)</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv4 | sysv4.2uw2* | sysv4.3*)</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv4*MP*)</div><div class='del'>-      if test -d /usr/nec ;then</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'</div><div class='del'>-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    unicos*)</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    uts4*)</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    *)</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-])</div><div class='del'>-case $host_os in</div><div class='del'>-  # For platforms which do not support PIC, -DPIC is meaningless:</div><div class='del'>-  *djgpp*)</div><div class='del'>-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&amp;t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"</div><div class='del'>-    ;;</div><div class='del'>-esac</div><div class='del'>-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])</div><div class='del'>-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],</div><div class='del'>-	[How to pass a linker flag through the compiler])</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Check to make sure the PIC flag actually works.</div><div class='del'>-#</div><div class='del'>-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then</div><div class='del'>-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],</div><div class='del'>-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],</div><div class='del'>-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&amp;t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],</div><div class='del'>-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in</div><div class='del'>-     "" | " "*) ;;</div><div class='del'>-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;</div><div class='del'>-     esac],</div><div class='del'>-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=</div><div class='del'>-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])</div><div class='del'>-fi</div><div class='del'>-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],</div><div class='del'>-	[Additional compiler flags for building library objects])</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Check to make sure the static flag actually works.</div><div class='del'>-#</div><div class='del'>-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"</div><div class='del'>-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],</div><div class='del'>-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),</div><div class='del'>-  $lt_tmp_static_flag,</div><div class='del'>-  [],</div><div class='del'>-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])</div><div class='del'>-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],</div><div class='del'>-	[Compiler flag to prevent dynamic linking])</div><div class='del'>-])# _LT_COMPILER_PIC</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_LINKER_SHLIBS([TAGNAME])</div><div class='del'>-# ----------------------------</div><div class='del'>-# See if the linker supports building shared libraries.</div><div class='del'>-m4_defun([_LT_LINKER_SHLIBS],</div><div class='del'>-[AC_REQUIRE([LT_PATH_LD])dnl</div><div class='del'>-AC_REQUIRE([LT_PATH_NM])dnl</div><div class='del'>-m4_require([_LT_FILEUTILS_DEFAULTS])dnl</div><div class='del'>-m4_require([_LT_DECL_EGREP])dnl</div><div class='del'>-m4_require([_LT_DECL_SED])dnl</div><div class='del'>-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl</div><div class='del'>-m4_require([_LT_TAG_COMPILER])dnl</div><div class='del'>-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])</div><div class='del'>-m4_if([$1], [CXX], [</div><div class='del'>-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq &gt; $export_symbols'</div><div class='del'>-  case $host_os in</div><div class='del'>-  aix[[4-9]]*)</div><div class='del'>-    # If we're using GNU nm, then we don't want the "-C" option.</div><div class='del'>-    # -C means demangle to AIX nm, but means don't demangle with GNU nm</div><div class='del'>-    if $NM -V 2&gt;&amp;1 | $GREP 'GNU' &gt; /dev/null; then</div><div class='del'>-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) &amp;&amp; ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u &gt; $export_symbols'</div><div class='del'>-    else</div><div class='del'>-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) &amp;&amp; ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u &gt; $export_symbols'</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  pw32*)</div><div class='del'>-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"</div><div class='del'>-  ;;</div><div class='del'>-  cygwin* | mingw* | cegcc*)</div><div class='del'>-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq &gt; $export_symbols'</div><div class='del'>-  ;;</div><div class='del'>-  *)</div><div class='del'>-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq &gt; $export_symbols'</div><div class='del'>-  ;;</div><div class='del'>-  esac</div><div class='del'>-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']</div><div class='del'>-], [</div><div class='del'>-  runpath_var=</div><div class='del'>-  _LT_TAGVAR(allow_undefined_flag, $1)=</div><div class='del'>-  _LT_TAGVAR(always_export_symbols, $1)=no</div><div class='del'>-  _LT_TAGVAR(archive_cmds, $1)=</div><div class='del'>-  _LT_TAGVAR(archive_expsym_cmds, $1)=</div><div class='del'>-  _LT_TAGVAR(compiler_needs_object, $1)=no</div><div class='del'>-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no</div><div class='del'>-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=</div><div class='del'>-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq &gt; $export_symbols'</div><div class='del'>-  _LT_TAGVAR(hardcode_automatic, $1)=no</div><div class='del'>-  _LT_TAGVAR(hardcode_direct, $1)=no</div><div class='del'>-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no</div><div class='del'>-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=</div><div class='del'>-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=</div><div class='del'>-  _LT_TAGVAR(hardcode_libdir_separator, $1)=</div><div class='del'>-  _LT_TAGVAR(hardcode_minus_L, $1)=no</div><div class='del'>-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported</div><div class='del'>-  _LT_TAGVAR(inherit_rpath, $1)=no</div><div class='del'>-  _LT_TAGVAR(link_all_deplibs, $1)=unknown</div><div class='del'>-  _LT_TAGVAR(module_cmds, $1)=</div><div class='del'>-  _LT_TAGVAR(module_expsym_cmds, $1)=</div><div class='del'>-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=</div><div class='del'>-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=</div><div class='del'>-  _LT_TAGVAR(thread_safe_flag_spec, $1)=</div><div class='del'>-  _LT_TAGVAR(whole_archive_flag_spec, $1)=</div><div class='del'>-  # include_expsyms should be a list of space-separated symbols to be *always*</div><div class='del'>-  # included in the symbol list</div><div class='del'>-  _LT_TAGVAR(include_expsyms, $1)=</div><div class='del'>-  # exclude_expsyms can be an extended regexp of symbols to exclude</div><div class='del'>-  # it will be wrapped by ` (' and `)$', so one must not match beginning or</div><div class='del'>-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',</div><div class='del'>-  # as well as any symbol that contains `d'.</div><div class='del'>-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']</div><div class='del'>-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out</div><div class='del'>-  # platforms (ab)use it in PIC code, but their linkers get confused if</div><div class='del'>-  # the symbol is explicitly referenced.  Since portable code cannot</div><div class='del'>-  # rely on this symbol name, it's probably fine to never include it in</div><div class='del'>-  # preloaded symbol tables.</div><div class='del'>-  # Exclude shared library initialization/finalization symbols.</div><div class='del'>-dnl Note also adjust exclude_expsyms for C++ above.</div><div class='del'>-  extract_expsyms_cmds=</div><div class='del'>-</div><div class='del'>-  case $host_os in</div><div class='del'>-  cygwin* | mingw* | pw32* | cegcc*)</div><div class='del'>-    # FIXME: the MSVC++ port hasn't been tested in a loooong time</div><div class='del'>-    # When not using gcc, we currently assume that we are using</div><div class='del'>-    # Microsoft Visual C++.</div><div class='del'>-    if test "$GCC" != yes; then</div><div class='del'>-      with_gnu_ld=no</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  interix*)</div><div class='del'>-    # we just hope/assume this is gcc and not c89 (= MSVC++)</div><div class='del'>-    with_gnu_ld=yes</div><div class='del'>-    ;;</div><div class='del'>-  openbsd*)</div><div class='del'>-    with_gnu_ld=no</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  _LT_TAGVAR(ld_shlibs, $1)=yes</div><div class='del'>-  if test "$with_gnu_ld" = yes; then</div><div class='del'>-    # If archive_cmds runs LD, not CC, wlarc should be empty</div><div class='del'>-    wlarc='${wl}'</div><div class='del'>-</div><div class='del'>-    # Set some defaults for GNU ld with shared library support. These</div><div class='del'>-    # are reset later if shared libraries are not supported. Putting them</div><div class='del'>-    # here allows them to be overridden if necessary.</div><div class='del'>-    runpath_var=LD_RUN_PATH</div><div class='del'>-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'</div><div class='del'>-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'</div><div class='del'>-    # ancient GNU ld didn't support --whole-archive et. al.</div><div class='del'>-    if $LD --help 2&gt;&amp;1 | $GREP 'no-whole-archive' &gt; /dev/null; then</div><div class='del'>-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'</div><div class='del'>-    else</div><div class='del'>-      _LT_TAGVAR(whole_archive_flag_spec, $1)=</div><div class='del'>-    fi</div><div class='del'>-    supports_anon_versioning=no</div><div class='del'>-    case `$LD -v 2&gt;&amp;1` in</div><div class='del'>-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions &lt; 2.11</div><div class='del'>-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...</div><div class='del'>-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...</div><div class='del'>-      *\ 2.11.*) ;; # other 2.11 versions</div><div class='del'>-      *) supports_anon_versioning=yes ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    # See if GNU ld supports shared libraries.</div><div class='del'>-    case $host_os in</div><div class='del'>-    aix[[3-9]]*)</div><div class='del'>-      # On AIX/PPC, the GNU linker is very broken</div><div class='del'>-      if test "$host_cpu" != ia64; then</div><div class='del'>-	_LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	cat &lt;&lt;_LT_EOF 1&gt;&amp;2</div><div class='del'>-</div><div class='del'>-*** Warning: the GNU linker, at least up to release 2.9.1, is reported</div><div class='del'>-*** to be unable to reliably create shared libraries on AIX.</div><div class='del'>-*** Therefore, libtool is disabling shared libraries support.  If you</div><div class='del'>-*** really care for shared libraries, you may want to modify your PATH</div><div class='del'>-*** so that a non-GNU linker is found, and then restart.</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    amigaos*)</div><div class='del'>-      case $host_cpu in</div><div class='del'>-      powerpc)</div><div class='del'>-            # see comment about AmigaOS4 .so support</div><div class='del'>-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-            _LT_TAGVAR(archive_expsym_cmds, $1)=''</div><div class='del'>-        ;;</div><div class='del'>-      m68k)</div><div class='del'>-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" &gt; $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" &gt;&gt; $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" &gt;&gt; $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" &gt;&gt; $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir &amp;&amp; a2ixlibrary -32)'</div><div class='del'>-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'</div><div class='del'>-            _LT_TAGVAR(hardcode_minus_L, $1)=yes</div><div class='del'>-        ;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    beos*)</div><div class='del'>-      if $LD --help 2&gt;&amp;1 | $GREP ': supported targets:.* elf' &gt; /dev/null; then</div><div class='del'>-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported</div><div class='del'>-	# Joseph Beckenbach &lt;jrb3@best.com&gt; says some releases of gcc</div><div class='del'>-	# support --undefined.  This deserves some investigation.  FIXME</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-      else</div><div class='del'>-	_LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    cygwin* | mingw* | pw32* | cegcc*)</div><div class='del'>-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,</div><div class='del'>-      # as there is no search path for DLLs.</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'</div><div class='del'>-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported</div><div class='del'>-      _LT_TAGVAR(always_export_symbols, $1)=no</div><div class='del'>-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes</div><div class='del'>-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq &gt; $export_symbols'</div><div class='del'>-</div><div class='del'>-      if $LD --help 2&gt;&amp;1 | $GREP 'auto-import' &gt; /dev/null; then</div><div class='del'>-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'</div><div class='del'>-	# If the export-symbols file already is a .def file (1st line</div><div class='del'>-	# is EXPORTS), use it as is; otherwise, prepend...</div><div class='del'>-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then</div><div class='del'>-	  cp $export_symbols $output_objdir/$soname.def;</div><div class='del'>-	else</div><div class='del'>-	  echo EXPORTS &gt; $output_objdir/$soname.def;</div><div class='del'>-	  cat $export_symbols &gt;&gt; $output_objdir/$soname.def;</div><div class='del'>-	fi~</div><div class='del'>-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'</div><div class='del'>-      else</div><div class='del'>-	_LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    interix[[3-9]]*)</div><div class='del'>-      _LT_TAGVAR(hardcode_direct, $1)=no</div><div class='del'>-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'</div><div class='del'>-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'</div><div class='del'>-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.</div><div class='del'>-      # Instead, shared libraries are loaded at an image base (0x10000000 by</div><div class='del'>-      # default) and relocated if they conflict, which is a slow very memory</div><div class='del'>-      # consuming and fragmenting process.  To avoid this, we pick a random,</div><div class='del'>-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link</div><div class='del'>-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.</div><div class='del'>-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'</div><div class='del'>-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols &gt;$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    gnu* | linux* | tpf* | k*bsd*-gnu)</div><div class='del'>-      tmp_diet=no</div><div class='del'>-      if test "$host_os" = linux-dietlibc; then</div><div class='del'>-	case $cc_basename in</div><div class='del'>-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-      if $LD --help 2&gt;&amp;1 | $EGREP ': supported targets:.* elf' &gt; /dev/null \</div><div class='del'>-	 &amp;&amp; test "$tmp_diet" = no</div><div class='del'>-      then</div><div class='del'>-	tmp_addflag=</div><div class='del'>-	tmp_sharedflag='-shared'</div><div class='del'>-	case $cc_basename,$host_cpu in</div><div class='del'>-        pgcc*)				# Portland Group C compiler</div><div class='del'>-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" &amp;&amp; new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'</div><div class='del'>-	  tmp_addflag=' $pic_flag'</div><div class='del'>-	  ;;</div><div class='del'>-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers</div><div class='del'>-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" &amp;&amp; new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'</div><div class='del'>-	  tmp_addflag=' $pic_flag -Mnomain' ;;</div><div class='del'>-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64</div><div class='del'>-	  tmp_addflag=' -i_dynamic' ;;</div><div class='del'>-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64</div><div class='del'>-	  tmp_addflag=' -i_dynamic -nofor_main' ;;</div><div class='del'>-	ifc* | ifort*)			# Intel Fortran compiler</div><div class='del'>-	  tmp_addflag=' -nofor_main' ;;</div><div class='del'>-	lf95*)				# Lahey Fortran 8.1</div><div class='del'>-	  _LT_TAGVAR(whole_archive_flag_spec, $1)=</div><div class='del'>-	  tmp_sharedflag='--shared' ;;</div><div class='del'>-	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)</div><div class='del'>-	  tmp_sharedflag='-qmkshrobj'</div><div class='del'>-	  tmp_addflag= ;;</div><div class='del'>-	esac</div><div class='del'>-	case `$CC -V 2&gt;&amp;1 | sed 5q` in</div><div class='del'>-	*Sun\ C*)			# Sun C 5.9</div><div class='del'>-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'</div><div class='del'>-	  _LT_TAGVAR(compiler_needs_object, $1)=yes</div><div class='del'>-	  tmp_sharedflag='-G' ;;</div><div class='del'>-	*Sun\ F*)			# Sun Fortran 8.3</div><div class='del'>-	  tmp_sharedflag='-G' ;;</div><div class='del'>-	esac</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-</div><div class='del'>-        if test "x$supports_anon_versioning" = xyes; then</div><div class='del'>-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" &gt; $output_objdir/$libname.ver~</div><div class='del'>-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" &gt;&gt; $output_objdir/$libname.ver~</div><div class='del'>-	    echo "local: *; };" &gt;&gt; $output_objdir/$libname.ver~</div><div class='del'>-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'</div><div class='del'>-        fi</div><div class='del'>-</div><div class='del'>-	case $cc_basename in</div><div class='del'>-	xlf*)</div><div class='del'>-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself</div><div class='del'>-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'</div><div class='del'>-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=</div><div class='del'>-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'</div><div class='del'>-	  if test "x$supports_anon_versioning" = xyes; then</div><div class='del'>-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" &gt; $output_objdir/$libname.ver~</div><div class='del'>-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" &gt;&gt; $output_objdir/$libname.ver~</div><div class='del'>-	      echo "local: *; };" &gt;&gt; $output_objdir/$libname.ver~</div><div class='del'>-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'</div><div class='del'>-	  fi</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      else</div><div class='del'>-        _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    netbsd*)</div><div class='del'>-      if echo __ELF__ | $CC -E - | $GREP __ELF__ &gt;/dev/null; then</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'</div><div class='del'>-	wlarc=</div><div class='del'>-      else</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    solaris*)</div><div class='del'>-      if $LD -v 2&gt;&amp;1 | $GREP 'BFD 2\.8' &gt; /dev/null; then</div><div class='del'>-	_LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	cat &lt;&lt;_LT_EOF 1&gt;&amp;2</div><div class='del'>-</div><div class='del'>-*** Warning: The releases 2.8.* of the GNU linker cannot reliably</div><div class='del'>-*** create shared libraries on Solaris systems.  Therefore, libtool</div><div class='del'>-*** is disabling shared libraries support.  We urge you to upgrade GNU</div><div class='del'>-*** binutils to release 2.9.1 or newer.  Another option is to modify</div><div class='del'>-*** your PATH or compiler configuration so that the native linker is</div><div class='del'>-*** used, and then restart.</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-      elif $LD --help 2&gt;&amp;1 | $GREP ': supported targets:.* elf' &gt; /dev/null; then</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'</div><div class='del'>-      else</div><div class='del'>-	_LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)</div><div class='del'>-      case `$LD -v 2&gt;&amp;1` in</div><div class='del'>-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)</div><div class='del'>-	_LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	cat &lt;&lt;_LT_EOF 1&gt;&amp;2</div><div class='del'>-</div><div class='del'>-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not</div><div class='del'>-*** reliably create shared libraries on SCO systems.  Therefore, libtool</div><div class='del'>-*** is disabling shared libraries support.  We urge you to upgrade GNU</div><div class='del'>-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify</div><div class='del'>-*** your PATH or compiler configuration so that the native linker is</div><div class='del'>-*** used, and then restart.</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-	;;</div><div class='del'>-	*)</div><div class='del'>-	  # For security reasons, it is highly recommended that you always</div><div class='del'>-	  # use absolute paths for naming shared libraries, and exclude the</div><div class='del'>-	  # DT_RUNPATH tag from executables and libraries.  But doing so</div><div class='del'>-	  # requires that you compile everything twice, which is a pain.</div><div class='del'>-	  if $LD --help 2&gt;&amp;1 | $GREP ': supported targets:.* elf' &gt; /dev/null; then</div><div class='del'>-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'</div><div class='del'>-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'</div><div class='del'>-	  else</div><div class='del'>-	    _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	  fi</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sunos4*)</div><div class='del'>-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-      wlarc=</div><div class='del'>-      _LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    *)</div><div class='del'>-      if $LD --help 2&gt;&amp;1 | $GREP ': supported targets:.* elf' &gt; /dev/null; then</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'</div><div class='del'>-      else</div><div class='del'>-	_LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then</div><div class='del'>-      runpath_var=</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=</div><div class='del'>-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=</div><div class='del'>-      _LT_TAGVAR(whole_archive_flag_spec, $1)=</div><div class='del'>-    fi</div><div class='del'>-  else</div><div class='del'>-    # PORTME fill in a description of your system's linker (not GNU ld)</div><div class='del'>-    case $host_os in</div><div class='del'>-    aix3*)</div><div class='del'>-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported</div><div class='del'>-      _LT_TAGVAR(always_export_symbols, $1)=yes</div><div class='del'>-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'</div><div class='del'>-      # Note: this linker hardcodes the directories in LIBPATH if there</div><div class='del'>-      # are no directories specified by -L.</div><div class='del'>-      _LT_TAGVAR(hardcode_minus_L, $1)=yes</div><div class='del'>-      if test "$GCC" = yes &amp;&amp; test -z "$lt_prog_compiler_static"; then</div><div class='del'>-	# Neither direct hardcoding nor static linking is supported with a</div><div class='del'>-	# broken collect2.</div><div class='del'>-	_LT_TAGVAR(hardcode_direct, $1)=unsupported</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    aix[[4-9]]*)</div><div class='del'>-      if test "$host_cpu" = ia64; then</div><div class='del'>-	# On IA64, the linker does run time linking by default, so we don't</div><div class='del'>-	# have to do anything special.</div><div class='del'>-	aix_use_runtimelinking=no</div><div class='del'>-	exp_sym_flag='-Bexport'</div><div class='del'>-	no_entry_flag=""</div><div class='del'>-      else</div><div class='del'>-	# If we're using GNU nm, then we don't want the "-C" option.</div><div class='del'>-	# -C means demangle to AIX nm, but means don't demangle with GNU nm</div><div class='del'>-	if $NM -V 2&gt;&amp;1 | $GREP 'GNU' &gt; /dev/null; then</div><div class='del'>-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) &amp;&amp; ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u &gt; $export_symbols'</div><div class='del'>-	else</div><div class='del'>-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) &amp;&amp; ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u &gt; $export_symbols'</div><div class='del'>-	fi</div><div class='del'>-	aix_use_runtimelinking=no</div><div class='del'>-</div><div class='del'>-	# Test if we are trying to use run time linking or normal</div><div class='del'>-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we</div><div class='del'>-	# need to do runtime linking.</div><div class='del'>-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)</div><div class='del'>-	  for ld_flag in $LDFLAGS; do</div><div class='del'>-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then</div><div class='del'>-	    aix_use_runtimelinking=yes</div><div class='del'>-	    break</div><div class='del'>-	  fi</div><div class='del'>-	  done</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-</div><div class='del'>-	exp_sym_flag='-bexport'</div><div class='del'>-	no_entry_flag='-bnoentry'</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # When large executables or shared objects are built, AIX ld can</div><div class='del'>-      # have problems creating the table of contents.  If linking a library</div><div class='del'>-      # or program results in "error TOC overflow" add -mminimal-toc to</div><div class='del'>-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not</div><div class='del'>-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.</div><div class='del'>-</div><div class='del'>-      _LT_TAGVAR(archive_cmds, $1)=''</div><div class='del'>-      _LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'</div><div class='del'>-      _LT_TAGVAR(link_all_deplibs, $1)=yes</div><div class='del'>-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'</div><div class='del'>-</div><div class='del'>-      if test "$GCC" = yes; then</div><div class='del'>-	case $host_os in aix4.[[012]]|aix4.[[012]].*)</div><div class='del'>-	# We only want to do this on AIX 4.2 and lower, the check</div><div class='del'>-	# below for broken collect2 doesn't work under 4.3+</div><div class='del'>-	  collect2name=`${CC} -print-prog-name=collect2`</div><div class='del'>-	  if test -f "$collect2name" &amp;&amp;</div><div class='del'>-	   strings "$collect2name" | $GREP resolve_lib_name &gt;/dev/null</div><div class='del'>-	  then</div><div class='del'>-	  # We have reworked collect2</div><div class='del'>-	  :</div><div class='del'>-	  else</div><div class='del'>-	  # We have old collect2</div><div class='del'>-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported</div><div class='del'>-	  # It fails to find uninstalled libraries when the uninstalled</div><div class='del'>-	  # path is not listed in the libpath.  Setting hardcode_minus_L</div><div class='del'>-	  # to unsupported forces relinking</div><div class='del'>-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes</div><div class='del'>-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'</div><div class='del'>-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=</div><div class='del'>-	  fi</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	shared_flag='-shared'</div><div class='del'>-	if test "$aix_use_runtimelinking" = yes; then</div><div class='del'>-	  shared_flag="$shared_flag "'${wl}-G'</div><div class='del'>-	fi</div><div class='del'>-      else</div><div class='del'>-	# not using gcc</div><div class='del'>-	if test "$host_cpu" = ia64; then</div><div class='del'>-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release</div><div class='del'>-	# chokes on -Wl,-G. The following line is correct:</div><div class='del'>-	  shared_flag='-G'</div><div class='del'>-	else</div><div class='del'>-	  if test "$aix_use_runtimelinking" = yes; then</div><div class='del'>-	    shared_flag='${wl}-G'</div><div class='del'>-	  else</div><div class='del'>-	    shared_flag='${wl}-bM:SRE'</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'</div><div class='del'>-      # It seems that -bexpall does not export symbols beginning with</div><div class='del'>-      # underscore (_), so it is better to generate a list of symbols to export.</div><div class='del'>-      _LT_TAGVAR(always_export_symbols, $1)=yes</div><div class='del'>-      if test "$aix_use_runtimelinking" = yes; then</div><div class='del'>-	# Warning - without using the other runtime loading flags (-brtl),</div><div class='del'>-	# -berok will link without error, but may produce a broken library.</div><div class='del'>-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'</div><div class='del'>-        # Determine the default libpath from the value encoded in an</div><div class='del'>-        # empty executable.</div><div class='del'>-        _LT_SYS_MODULE_PATH_AIX</div><div class='del'>-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"</div><div class='del'>-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"</div><div class='del'>-      else</div><div class='del'>-	if test "$host_cpu" = ia64; then</div><div class='del'>-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'</div><div class='del'>-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"</div><div class='del'>-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"</div><div class='del'>-	else</div><div class='del'>-	 # Determine the default libpath from the value encoded in an</div><div class='del'>-	 # empty executable.</div><div class='del'>-	 _LT_SYS_MODULE_PATH_AIX</div><div class='del'>-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"</div><div class='del'>-	  # Warning - without using the other run time loading flags,</div><div class='del'>-	  # -berok will link without error, but may produce a broken library.</div><div class='del'>-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'</div><div class='del'>-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'</div><div class='del'>-	  # Exported symbols can be pulled into shared objects from archives</div><div class='del'>-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'</div><div class='del'>-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes</div><div class='del'>-	  # This is similar to how AIX traditionally builds its shared libraries.</div><div class='del'>-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'</div><div class='del'>-	fi</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    amigaos*)</div><div class='del'>-      case $host_cpu in</div><div class='del'>-      powerpc)</div><div class='del'>-            # see comment about AmigaOS4 .so support</div><div class='del'>-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-            _LT_TAGVAR(archive_expsym_cmds, $1)=''</div><div class='del'>-        ;;</div><div class='del'>-      m68k)</div><div class='del'>-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" &gt; $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" &gt;&gt; $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" &gt;&gt; $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" &gt;&gt; $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir &amp;&amp; a2ixlibrary -32)'</div><div class='del'>-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'</div><div class='del'>-            _LT_TAGVAR(hardcode_minus_L, $1)=yes</div><div class='del'>-        ;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    bsdi[[45]]*)</div><div class='del'>-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    cygwin* | mingw* | pw32* | cegcc*)</div><div class='del'>-      # When not using gcc, we currently assume that we are using</div><div class='del'>-      # Microsoft Visual C++.</div><div class='del'>-      # hardcode_libdir_flag_spec is actually meaningless, as there is</div><div class='del'>-      # no search path for DLLs.</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '</div><div class='del'>-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported</div><div class='del'>-      # Tell ltmain to make .lib files, not .a files.</div><div class='del'>-      libext=lib</div><div class='del'>-      # Tell ltmain to make .dll files, not .so files.</div><div class='del'>-      shrext_cmds=".dll"</div><div class='del'>-      # FIXME: Setting linknames here is a bad hack.</div><div class='del'>-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='</div><div class='del'>-      # The linker will automatically build a .lib file if we build a DLL.</div><div class='del'>-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'</div><div class='del'>-      # FIXME: Should let the user specify the lib program.</div><div class='del'>-      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'</div><div class='del'>-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'</div><div class='del'>-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    darwin* | rhapsody*)</div><div class='del'>-      _LT_DARWIN_LINKER_FEATURES($1)</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    dgux*)</div><div class='del'>-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'</div><div class='del'>-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    freebsd1*)</div><div class='del'>-      _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor</div><div class='del'>-    # support.  Future versions do this automatically, but an explicit c++rt0.o</div><div class='del'>-    # does not break anything, and helps significantly (at the cost of a little</div><div class='del'>-    # extra space).</div><div class='del'>-    freebsd2.2*)</div><div class='del'>-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'</div><div class='del'>-      _LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.</div><div class='del'>-    freebsd2*)</div><div class='del'>-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-      _LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-      _LT_TAGVAR(hardcode_minus_L, $1)=yes</div><div class='del'>-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.</div><div class='del'>-    freebsd* | dragonfly*)</div><div class='del'>-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'</div><div class='del'>-      _LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    hpux9*)</div><div class='del'>-      if test "$GCC" = yes; then</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'</div><div class='del'>-      else</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'</div><div class='del'>-      fi</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:</div><div class='del'>-      _LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-</div><div class='del'>-      # hardcode_minus_L: Not really in the search PATH,</div><div class='del'>-      # but as the default location of the library.</div><div class='del'>-      _LT_TAGVAR(hardcode_minus_L, $1)=yes</div><div class='del'>-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    hpux10*)</div><div class='del'>-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-      else</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-      fi</div><div class='del'>-      if test "$with_gnu_ld" = no; then</div><div class='del'>-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'</div><div class='del'>-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'</div><div class='del'>-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:</div><div class='del'>-	_LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes</div><div class='del'>-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'</div><div class='del'>-	# hardcode_minus_L: Not really in the search PATH,</div><div class='del'>-	# but as the default location of the library.</div><div class='del'>-	_LT_TAGVAR(hardcode_minus_L, $1)=yes</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    hpux11*)</div><div class='del'>-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then</div><div class='del'>-	case $host_cpu in</div><div class='del'>-	hppa*64*)</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  ;;</div><div class='del'>-	ia64*)</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  ;;</div><div class='del'>-	*)</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      else</div><div class='del'>-	case $host_cpu in</div><div class='del'>-	hppa*64*)</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  ;;</div><div class='del'>-	ia64*)</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  ;;</div><div class='del'>-	*)</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-      if test "$with_gnu_ld" = no; then</div><div class='del'>-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'</div><div class='del'>-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:</div><div class='del'>-</div><div class='del'>-	case $host_cpu in</div><div class='del'>-	hppa*64*|ia64*)</div><div class='del'>-	  _LT_TAGVAR(hardcode_direct, $1)=no</div><div class='del'>-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-	  ;;</div><div class='del'>-	*)</div><div class='del'>-	  _LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes</div><div class='del'>-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'</div><div class='del'>-</div><div class='del'>-	  # hardcode_minus_L: Not really in the search PATH,</div><div class='del'>-	  # but as the default location of the library.</div><div class='del'>-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    irix5* | irix6* | nonstopux*)</div><div class='del'>-      if test "$GCC" = yes; then</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" &amp;&amp; $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'</div><div class='del'>-	# Try to use the -exported_symbol ld option, if it does not</div><div class='del'>-	# work, assume that -exports_file does not work either and</div><div class='del'>-	# implicitly export all symbols.</div><div class='del'>-        save_LDFLAGS="$LDFLAGS"</div><div class='del'>-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"</div><div class='del'>-        AC_LINK_IFELSE(int foo(void) {},</div><div class='del'>-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" &amp;&amp; $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'</div><div class='del'>-        )</div><div class='del'>-        LDFLAGS="$save_LDFLAGS"</div><div class='del'>-      else</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" &amp;&amp; $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'</div><div class='del'>-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" &amp;&amp; $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'</div><div class='del'>-      fi</div><div class='del'>-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:</div><div class='del'>-      _LT_TAGVAR(inherit_rpath, $1)=yes</div><div class='del'>-      _LT_TAGVAR(link_all_deplibs, $1)=yes</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    netbsd*)</div><div class='del'>-      if echo __ELF__ | $CC -E - | $GREP __ELF__ &gt;/dev/null; then</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out</div><div class='del'>-      else</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF</div><div class='del'>-      fi</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'</div><div class='del'>-      _LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    newsos6)</div><div class='del'>-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-      _LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:</div><div class='del'>-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    *nto* | *qnx*)</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    openbsd*)</div><div class='del'>-      if test -f /usr/libexec/ld.so; then</div><div class='del'>-	_LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes</div><div class='del'>-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'</div><div class='del'>-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'</div><div class='del'>-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'</div><div class='del'>-	else</div><div class='del'>-	  case $host_os in</div><div class='del'>-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)</div><div class='del'>-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'</div><div class='del'>-	     ;;</div><div class='del'>-	   *)</div><div class='del'>-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'</div><div class='del'>-	     ;;</div><div class='del'>-	  esac</div><div class='del'>-	fi</div><div class='del'>-      else</div><div class='del'>-	_LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    os2*)</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'</div><div class='del'>-      _LT_TAGVAR(hardcode_minus_L, $1)=yes</div><div class='del'>-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported</div><div class='del'>-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" &gt; $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" &gt;&gt; $output_objdir/$libname.def~$ECHO DATA &gt;&gt; $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" &gt;&gt; $output_objdir/$libname.def~$ECHO EXPORTS &gt;&gt; $output_objdir/$libname.def~emxexp $libobjs &gt;&gt; $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'</div><div class='del'>-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    osf3*)</div><div class='del'>-      if test "$GCC" = yes; then</div><div class='del'>-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" &amp;&amp; $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'</div><div class='del'>-      else</div><div class='del'>-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" &amp;&amp; $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'</div><div class='del'>-      fi</div><div class='del'>-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    osf4* | osf5*)	# as osf3* with the addition of -msym flag</div><div class='del'>-      if test "$GCC" = yes; then</div><div class='del'>-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" &amp;&amp; $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'</div><div class='del'>-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'</div><div class='del'>-      else</div><div class='del'>-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" &amp;&amp; $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'</div><div class='del'>-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" &gt;&gt; $lib.exp; done; printf "%s\\n" "-hidden"&gt;&gt; $lib.exp~</div><div class='del'>-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" &amp;&amp; $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'</div><div class='del'>-</div><div class='del'>-	# Both c and cxx compiler support -rpath directly</div><div class='del'>-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'</div><div class='del'>-      fi</div><div class='del'>-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    solaris*)</div><div class='del'>-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'</div><div class='del'>-      if test "$GCC" = yes; then</div><div class='del'>-	wlarc='${wl}'</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" &gt; $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" &gt;&gt; $lib.exp~echo "local: *; };" &gt;&gt; $lib.exp~</div><div class='del'>-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'</div><div class='del'>-      else</div><div class='del'>-	case `$CC -V 2&gt;&amp;1` in</div><div class='del'>-	*"Compilers 5.0"*)</div><div class='del'>-	  wlarc=''</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" &gt; $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" &gt;&gt; $lib.exp~echo "local: *; };" &gt;&gt; $lib.exp~</div><div class='del'>-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'</div><div class='del'>-	  ;;</div><div class='del'>-	*)</div><div class='del'>-	  wlarc='${wl}'</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" &gt; $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" &gt;&gt; $lib.exp~echo "local: *; };" &gt;&gt; $lib.exp~</div><div class='del'>-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'</div><div class='del'>-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-      case $host_os in</div><div class='del'>-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;</div><div class='del'>-      *)</div><div class='del'>-	# The compiler driver will combine and reorder linker options,</div><div class='del'>-	# but understands `-z linker_flag'.  GCC discards it without `$wl',</div><div class='del'>-	# but is careful enough not to reorder.</div><div class='del'>-	# Supported since Solaris 2.6 (maybe 2.5.1?)</div><div class='del'>-	if test "$GCC" = yes; then</div><div class='del'>-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'</div><div class='del'>-	else</div><div class='del'>-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      _LT_TAGVAR(link_all_deplibs, $1)=yes</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sunos4*)</div><div class='del'>-      if test "x$host_vendor" = xsequent; then</div><div class='del'>-	# Use $CC to link under sequent, because it throws in some extra .o</div><div class='del'>-	# files that make .init and .fini sections work.</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-      else</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-      fi</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'</div><div class='del'>-      _LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-      _LT_TAGVAR(hardcode_minus_L, $1)=yes</div><div class='del'>-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv4)</div><div class='del'>-      case $host_vendor in</div><div class='del'>-	sni)</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???</div><div class='del'>-	;;</div><div class='del'>-	siemens)</div><div class='del'>-	  ## LD is ld it makes a PLAMLIB</div><div class='del'>-	  ## CC just makes a GrossModule.</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'</div><div class='del'>-	  _LT_TAGVAR(hardcode_direct, $1)=no</div><div class='del'>-        ;;</div><div class='del'>-	motorola)</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      runpath_var='LD_RUN_PATH'</div><div class='del'>-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv4.3*)</div><div class='del'>-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv4*MP*)</div><div class='del'>-      if test -d /usr/nec; then</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-	runpath_var=LD_RUN_PATH</div><div class='del'>-	hardcode_runpath_var=yes</div><div class='del'>-	_LT_TAGVAR(ld_shlibs, $1)=yes</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)</div><div class='del'>-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'</div><div class='del'>-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no</div><div class='del'>-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-      runpath_var='LD_RUN_PATH'</div><div class='del'>-</div><div class='del'>-      if test "$GCC" = yes; then</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-      else</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv5* | sco3.2v5* | sco5v6*)</div><div class='del'>-      # Note: We can NOT use -z defs as we might desire, because we do not</div><div class='del'>-      # link with -lc, and that would cause any symbols used from libc to</div><div class='del'>-      # always be unresolved, which means just about no library would</div><div class='del'>-      # ever link correctly.  If we're not using GNU ld we use -z text</div><div class='del'>-      # though, which does catch some bad symbols but isn't as heavy-handed</div><div class='del'>-      # as -z defs.</div><div class='del'>-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'</div><div class='del'>-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'</div><div class='del'>-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no</div><div class='del'>-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'</div><div class='del'>-      _LT_TAGVAR(link_all_deplibs, $1)=yes</div><div class='del'>-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'</div><div class='del'>-      runpath_var='LD_RUN_PATH'</div><div class='del'>-</div><div class='del'>-      if test "$GCC" = yes; then</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-      else</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    uts4*)</div><div class='del'>-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'</div><div class='del'>-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    *)</div><div class='del'>-      _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    if test x$host_vendor = xsni; then</div><div class='del'>-      case $host in</div><div class='del'>-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)</div><div class='del'>-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-    fi</div><div class='del'>-  fi</div><div class='del'>-])</div><div class='del'>-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])</div><div class='del'>-test "$_LT_TAGVAR(ld_shlibs, $1)" = no &amp;&amp; can_build_shared=no</div><div class='del'>-</div><div class='del'>-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld</div><div class='del'>-</div><div class='del'>-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl</div><div class='del'>-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl</div><div class='del'>-_LT_DECL([], [extract_expsyms_cmds], [2],</div><div class='del'>-    [The commands to extract the exported symbol list from a shared archive])</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Do we need to explicitly link libc?</div><div class='del'>-#</div><div class='del'>-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in</div><div class='del'>-x|xyes)</div><div class='del'>-  # Assume -lc should be added</div><div class='del'>-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes</div><div class='del'>-</div><div class='del'>-  if test "$enable_shared" = yes &amp;&amp; test "$GCC" = yes; then</div><div class='del'>-    case $_LT_TAGVAR(archive_cmds, $1) in</div><div class='del'>-    *'~'*)</div><div class='del'>-      # FIXME: we may have to deal with multi-command sequences.</div><div class='del'>-      ;;</div><div class='del'>-    '$CC '*)</div><div class='del'>-      # Test whether the compiler implicitly links with -lc since on some</div><div class='del'>-      # systems, -lgcc has to come before -lc. If gcc already passes -lc</div><div class='del'>-      # to ld, don't add -lc before -lgcc.</div><div class='del'>-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])</div><div class='del'>-      $RM conftest*</div><div class='del'>-      echo "$lt_simple_compile_test_code" &gt; conftest.$ac_ext</div><div class='del'>-</div><div class='del'>-      if AC_TRY_EVAL(ac_compile) 2&gt;conftest.err; then</div><div class='del'>-        soname=conftest</div><div class='del'>-        lib=conftest</div><div class='del'>-        libobjs=conftest.$ac_objext</div><div class='del'>-        deplibs=</div><div class='del'>-        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)</div><div class='del'>-	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)</div><div class='del'>-        compiler_flags=-v</div><div class='del'>-        linker_flags=-v</div><div class='del'>-        verstring=</div><div class='del'>-        output_objdir=.</div><div class='del'>-        libname=conftest</div><div class='del'>-        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)</div><div class='del'>-        _LT_TAGVAR(allow_undefined_flag, $1)=</div><div class='del'>-        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\&gt;\&amp;1 \| $GREP \" -lc \" \&gt;/dev/null 2\&gt;\&amp;1)</div><div class='del'>-        then</div><div class='del'>-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no</div><div class='del'>-        else</div><div class='del'>-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes</div><div class='del'>-        fi</div><div class='del'>-        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag</div><div class='del'>-      else</div><div class='del'>-        cat conftest.err 1&gt;&amp;5</div><div class='del'>-      fi</div><div class='del'>-      $RM conftest*</div><div class='del'>-      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],</div><div class='del'>-    [Whether or not to add -lc for building shared libraries])</div><div class='del'>-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],</div><div class='del'>-    [enable_shared_with_static_runtimes], [0],</div><div class='del'>-    [Whether or not to disallow shared libs when runtime libs are static])</div><div class='del'>-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],</div><div class='del'>-    [Compiler flag to allow reflexive dlopens])</div><div class='del'>-_LT_TAGDECL([], [whole_archive_flag_spec], [1],</div><div class='del'>-    [Compiler flag to generate shared objects directly from archives])</div><div class='del'>-_LT_TAGDECL([], [compiler_needs_object], [1],</div><div class='del'>-    [Whether the compiler copes with passing no objects directly])</div><div class='del'>-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],</div><div class='del'>-    [Create an old-style archive from a shared archive])</div><div class='del'>-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],</div><div class='del'>-    [Create a temporary old-style archive to link instead of a shared archive])</div><div class='del'>-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])</div><div class='del'>-_LT_TAGDECL([], [archive_expsym_cmds], [2])</div><div class='del'>-_LT_TAGDECL([], [module_cmds], [2],</div><div class='del'>-    [Commands used to build a loadable module if different from building</div><div class='del'>-    a shared archive.])</div><div class='del'>-_LT_TAGDECL([], [module_expsym_cmds], [2])</div><div class='del'>-_LT_TAGDECL([], [with_gnu_ld], [1],</div><div class='del'>-    [Whether we are building with GNU ld or not])</div><div class='del'>-_LT_TAGDECL([], [allow_undefined_flag], [1],</div><div class='del'>-    [Flag that allows shared libraries with undefined symbols to be built])</div><div class='del'>-_LT_TAGDECL([], [no_undefined_flag], [1],</div><div class='del'>-    [Flag that enforces no undefined symbols])</div><div class='del'>-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],</div><div class='del'>-    [Flag to hardcode $libdir into a binary during linking.</div><div class='del'>-    This must work even if $libdir does not exist])</div><div class='del'>-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],</div><div class='del'>-    [[If ld is used when linking, flag to hardcode $libdir into a binary</div><div class='del'>-    during linking.  This must work even if $libdir does not exist]])</div><div class='del'>-_LT_TAGDECL([], [hardcode_libdir_separator], [1],</div><div class='del'>-    [Whether we need a single "-rpath" flag with a separated argument])</div><div class='del'>-_LT_TAGDECL([], [hardcode_direct], [0],</div><div class='del'>-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes</div><div class='del'>-    DIR into the resulting binary])</div><div class='del'>-_LT_TAGDECL([], [hardcode_direct_absolute], [0],</div><div class='del'>-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes</div><div class='del'>-    DIR into the resulting binary and the resulting library dependency is</div><div class='del'>-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the</div><div class='del'>-    library is relocated])</div><div class='del'>-_LT_TAGDECL([], [hardcode_minus_L], [0],</div><div class='del'>-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR</div><div class='del'>-    into the resulting binary])</div><div class='del'>-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],</div><div class='del'>-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR</div><div class='del'>-    into the resulting binary])</div><div class='del'>-_LT_TAGDECL([], [hardcode_automatic], [0],</div><div class='del'>-    [Set to "yes" if building a shared library automatically hardcodes DIR</div><div class='del'>-    into the library and all subsequent libraries and executables linked</div><div class='del'>-    against it])</div><div class='del'>-_LT_TAGDECL([], [inherit_rpath], [0],</div><div class='del'>-    [Set to yes if linker adds runtime paths of dependent libraries</div><div class='del'>-    to runtime path list])</div><div class='del'>-_LT_TAGDECL([], [link_all_deplibs], [0],</div><div class='del'>-    [Whether libtool must link a program against all its dependency libraries])</div><div class='del'>-_LT_TAGDECL([], [fix_srcfile_path], [1],</div><div class='del'>-    [Fix the shell variable $srcfile for the compiler])</div><div class='del'>-_LT_TAGDECL([], [always_export_symbols], [0],</div><div class='del'>-    [Set to "yes" if exported symbols are required])</div><div class='del'>-_LT_TAGDECL([], [export_symbols_cmds], [2],</div><div class='del'>-    [The commands to list exported symbols])</div><div class='del'>-_LT_TAGDECL([], [exclude_expsyms], [1],</div><div class='del'>-    [Symbols that should not be listed in the preloaded symbols])</div><div class='del'>-_LT_TAGDECL([], [include_expsyms], [1],</div><div class='del'>-    [Symbols that must always be exported])</div><div class='del'>-_LT_TAGDECL([], [prelink_cmds], [2],</div><div class='del'>-    [Commands necessary for linking programs (against libraries) with templates])</div><div class='del'>-_LT_TAGDECL([], [file_list_spec], [1],</div><div class='del'>-    [Specify filename containing input files])</div><div class='del'>-dnl FIXME: Not yet implemented</div><div class='del'>-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],</div><div class='del'>-dnl    [Compiler flag to generate thread safe objects])</div><div class='del'>-])# _LT_LINKER_SHLIBS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_LANG_C_CONFIG([TAG])</div><div class='del'>-# ------------------------</div><div class='del'>-# Ensure that the configuration variables for a C compiler are suitably</div><div class='del'>-# defined.  These variables are subsequently used by _LT_CONFIG to write</div><div class='del'>-# the compiler configuration to `libtool'.</div><div class='del'>-m4_defun([_LT_LANG_C_CONFIG],</div><div class='del'>-[m4_require([_LT_DECL_EGREP])dnl</div><div class='del'>-lt_save_CC="$CC"</div><div class='del'>-AC_LANG_PUSH(C)</div><div class='del'>-</div><div class='del'>-# Source file extension for C test sources.</div><div class='del'>-ac_ext=c</div><div class='del'>-</div><div class='del'>-# Object file extension for compiled C test sources.</div><div class='del'>-objext=o</div><div class='del'>-_LT_TAGVAR(objext, $1)=$objext</div><div class='del'>-</div><div class='del'>-# Code to be used in simple compile tests</div><div class='del'>-lt_simple_compile_test_code="int some_variable = 0;"</div><div class='del'>-</div><div class='del'>-# Code to be used in simple link tests</div><div class='del'>-lt_simple_link_test_code='int main(){return(0);}'</div><div class='del'>-</div><div class='del'>-_LT_TAG_COMPILER</div><div class='del'>-# Save the default compiler, since it gets overwritten when the other</div><div class='del'>-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.</div><div class='del'>-compiler_DEFAULT=$CC</div><div class='del'>-</div><div class='del'>-# save warnings/boilerplate of simple test code</div><div class='del'>-_LT_COMPILER_BOILERPLATE</div><div class='del'>-_LT_LINKER_BOILERPLATE</div><div class='del'>-</div><div class='del'>-if test -n "$compiler"; then</div><div class='del'>-  _LT_COMPILER_NO_RTTI($1)</div><div class='del'>-  _LT_COMPILER_PIC($1)</div><div class='del'>-  _LT_COMPILER_C_O($1)</div><div class='del'>-  _LT_COMPILER_FILE_LOCKS($1)</div><div class='del'>-  _LT_LINKER_SHLIBS($1)</div><div class='del'>-  _LT_SYS_DYNAMIC_LINKER($1)</div><div class='del'>-  _LT_LINKER_HARDCODE_LIBPATH($1)</div><div class='del'>-  LT_SYS_DLOPEN_SELF</div><div class='del'>-  _LT_CMD_STRIPLIB</div><div class='del'>-</div><div class='del'>-  # Report which library types will actually be built</div><div class='del'>-  AC_MSG_CHECKING([if libtool supports shared libraries])</div><div class='del'>-  AC_MSG_RESULT([$can_build_shared])</div><div class='del'>-</div><div class='del'>-  AC_MSG_CHECKING([whether to build shared libraries])</div><div class='del'>-  test "$can_build_shared" = "no" &amp;&amp; enable_shared=no</div><div class='del'>-</div><div class='del'>-  # On AIX, shared libraries and static libraries use the same namespace, and</div><div class='del'>-  # are all built from PIC.</div><div class='del'>-  case $host_os in</div><div class='del'>-  aix3*)</div><div class='del'>-    test "$enable_shared" = yes &amp;&amp; enable_static=no</div><div class='del'>-    if test -n "$RANLIB"; then</div><div class='del'>-      archive_cmds="$archive_cmds~\$RANLIB \$lib"</div><div class='del'>-      postinstall_cmds='$RANLIB $lib'</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  aix[[4-9]]*)</div><div class='del'>-    if test "$host_cpu" != ia64 &amp;&amp; test "$aix_use_runtimelinking" = no ; then</div><div class='del'>-      test "$enable_shared" = yes &amp;&amp; enable_static=no</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  AC_MSG_RESULT([$enable_shared])</div><div class='del'>-</div><div class='del'>-  AC_MSG_CHECKING([whether to build static libraries])</div><div class='del'>-  # Make sure either enable_shared or enable_static is yes.</div><div class='del'>-  test "$enable_shared" = yes || enable_static=yes</div><div class='del'>-  AC_MSG_RESULT([$enable_static])</div><div class='del'>-</div><div class='del'>-  _LT_CONFIG($1)</div><div class='del'>-fi</div><div class='del'>-AC_LANG_POP</div><div class='del'>-CC="$lt_save_CC"</div><div class='del'>-])# _LT_LANG_C_CONFIG</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_PROG_CXX</div><div class='del'>-# ------------</div><div class='del'>-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++</div><div class='del'>-# compiler, we have our own version here.</div><div class='del'>-m4_defun([_LT_PROG_CXX],</div><div class='del'>-[</div><div class='del'>-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])</div><div class='del'>-AC_PROG_CXX</div><div class='del'>-if test -n "$CXX" &amp;&amp; ( test "X$CXX" != "Xno" &amp;&amp;</div><div class='del'>-    ( (test "X$CXX" = "Xg++" &amp;&amp; `g++ -v &gt;/dev/null 2&gt;&amp;1` ) ||</div><div class='del'>-    (test "X$CXX" != "Xg++"))) ; then</div><div class='del'>-  AC_PROG_CXXCPP</div><div class='del'>-else</div><div class='del'>-  _lt_caught_CXX_error=yes</div><div class='del'>-fi</div><div class='del'>-popdef([AC_MSG_ERROR])</div><div class='del'>-])# _LT_PROG_CXX</div><div class='del'>-</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([_LT_PROG_CXX], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_LANG_CXX_CONFIG([TAG])</div><div class='del'>-# --------------------------</div><div class='del'>-# Ensure that the configuration variables for a C++ compiler are suitably</div><div class='del'>-# defined.  These variables are subsequently used by _LT_CONFIG to write</div><div class='del'>-# the compiler configuration to `libtool'.</div><div class='del'>-m4_defun([_LT_LANG_CXX_CONFIG],</div><div class='del'>-[AC_REQUIRE([_LT_PROG_CXX])dnl</div><div class='del'>-m4_require([_LT_FILEUTILS_DEFAULTS])dnl</div><div class='del'>-m4_require([_LT_DECL_EGREP])dnl</div><div class='del'>-</div><div class='del'>-AC_LANG_PUSH(C++)</div><div class='del'>-_LT_TAGVAR(archive_cmds_need_lc, $1)=no</div><div class='del'>-_LT_TAGVAR(allow_undefined_flag, $1)=</div><div class='del'>-_LT_TAGVAR(always_export_symbols, $1)=no</div><div class='del'>-_LT_TAGVAR(archive_expsym_cmds, $1)=</div><div class='del'>-_LT_TAGVAR(compiler_needs_object, $1)=no</div><div class='del'>-_LT_TAGVAR(export_dynamic_flag_spec, $1)=</div><div class='del'>-_LT_TAGVAR(hardcode_direct, $1)=no</div><div class='del'>-_LT_TAGVAR(hardcode_direct_absolute, $1)=no</div><div class='del'>-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=</div><div class='del'>-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=</div><div class='del'>-_LT_TAGVAR(hardcode_libdir_separator, $1)=</div><div class='del'>-_LT_TAGVAR(hardcode_minus_L, $1)=no</div><div class='del'>-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported</div><div class='del'>-_LT_TAGVAR(hardcode_automatic, $1)=no</div><div class='del'>-_LT_TAGVAR(inherit_rpath, $1)=no</div><div class='del'>-_LT_TAGVAR(module_cmds, $1)=</div><div class='del'>-_LT_TAGVAR(module_expsym_cmds, $1)=</div><div class='del'>-_LT_TAGVAR(link_all_deplibs, $1)=unknown</div><div class='del'>-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds</div><div class='del'>-_LT_TAGVAR(no_undefined_flag, $1)=</div><div class='del'>-_LT_TAGVAR(whole_archive_flag_spec, $1)=</div><div class='del'>-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no</div><div class='del'>-</div><div class='del'>-# Source file extension for C++ test sources.</div><div class='del'>-ac_ext=cpp</div><div class='del'>-</div><div class='del'>-# Object file extension for compiled C++ test sources.</div><div class='del'>-objext=o</div><div class='del'>-_LT_TAGVAR(objext, $1)=$objext</div><div class='del'>-</div><div class='del'>-# No sense in running all these tests if we already determined that</div><div class='del'>-# the CXX compiler isn't working.  Some variables (like enable_shared)</div><div class='del'>-# are currently assumed to apply to all compilers on this platform,</div><div class='del'>-# and will be corrupted by setting them based on a non-working compiler.</div><div class='del'>-if test "$_lt_caught_CXX_error" != yes; then</div><div class='del'>-  # Code to be used in simple compile tests</div><div class='del'>-  lt_simple_compile_test_code="int some_variable = 0;"</div><div class='del'>-</div><div class='del'>-  # Code to be used in simple link tests</div><div class='del'>-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'</div><div class='del'>-</div><div class='del'>-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.</div><div class='del'>-  _LT_TAG_COMPILER</div><div class='del'>-</div><div class='del'>-  # save warnings/boilerplate of simple test code</div><div class='del'>-  _LT_COMPILER_BOILERPLATE</div><div class='del'>-  _LT_LINKER_BOILERPLATE</div><div class='del'>-</div><div class='del'>-  # Allow CC to be a program name with arguments.</div><div class='del'>-  lt_save_CC=$CC</div><div class='del'>-  lt_save_LD=$LD</div><div class='del'>-  lt_save_GCC=$GCC</div><div class='del'>-  GCC=$GXX</div><div class='del'>-  lt_save_with_gnu_ld=$with_gnu_ld</div><div class='del'>-  lt_save_path_LD=$lt_cv_path_LD</div><div class='del'>-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then</div><div class='del'>-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx</div><div class='del'>-  else</div><div class='del'>-    $as_unset lt_cv_prog_gnu_ld</div><div class='del'>-  fi</div><div class='del'>-  if test -n "${lt_cv_path_LDCXX+set}"; then</div><div class='del'>-    lt_cv_path_LD=$lt_cv_path_LDCXX</div><div class='del'>-  else</div><div class='del'>-    $as_unset lt_cv_path_LD</div><div class='del'>-  fi</div><div class='del'>-  test -z "${LDCXX+set}" || LD=$LDCXX</div><div class='del'>-  CC=${CXX-"c++"}</div><div class='del'>-  compiler=$CC</div><div class='del'>-  _LT_TAGVAR(compiler, $1)=$CC</div><div class='del'>-  _LT_CC_BASENAME([$compiler])</div><div class='del'>-</div><div class='del'>-  if test -n "$compiler"; then</div><div class='del'>-    # We don't want -fno-exception when compiling C++ code, so set the</div><div class='del'>-    # no_builtin_flag separately</div><div class='del'>-    if test "$GXX" = yes; then</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'</div><div class='del'>-    else</div><div class='del'>-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    if test "$GXX" = yes; then</div><div class='del'>-      # Set up default GNU C++ configuration</div><div class='del'>-</div><div class='del'>-      LT_PATH_LD</div><div class='del'>-</div><div class='del'>-      # Check if GNU C++ uses GNU ld as the underlying linker, since the</div><div class='del'>-      # archiving commands below assume that GNU ld is being used.</div><div class='del'>-      if test "$with_gnu_ld" = yes; then</div><div class='del'>-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'</div><div class='del'>-</div><div class='del'>-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'</div><div class='del'>-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'</div><div class='del'>-</div><div class='del'>-        # If archive_cmds runs LD, not CC, wlarc should be empty</div><div class='del'>-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to</div><div class='del'>-        #     investigate it a little bit more. (MM)</div><div class='del'>-        wlarc='${wl}'</div><div class='del'>-</div><div class='del'>-        # ancient GNU ld didn't support --whole-archive et. al.</div><div class='del'>-        if eval "`$CC -print-prog-name=ld` --help 2&gt;&amp;1" |</div><div class='del'>-	  $GREP 'no-whole-archive' &gt; /dev/null; then</div><div class='del'>-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'</div><div class='del'>-        else</div><div class='del'>-          _LT_TAGVAR(whole_archive_flag_spec, $1)=</div><div class='del'>-        fi</div><div class='del'>-      else</div><div class='del'>-        with_gnu_ld=no</div><div class='del'>-        wlarc=</div><div class='del'>-</div><div class='del'>-        # A generic and very simple default shared library creation</div><div class='del'>-        # command for GNU C++ for the case where it uses the native</div><div class='del'>-        # linker, instead of GNU ld.  If possible, this setting should</div><div class='del'>-        # overridden to take advantage of the native linker features on</div><div class='del'>-        # the platform it is being used on.</div><div class='del'>-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Commands to make compiler produce verbose output that lists</div><div class='del'>-      # what "hidden" libraries, object files and flags are used when</div><div class='del'>-      # linking a shared library.</div><div class='del'>-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2&gt;&amp;1 | $GREP "\-L"'</div><div class='del'>-</div><div class='del'>-    else</div><div class='del'>-      GXX=no</div><div class='del'>-      with_gnu_ld=no</div><div class='del'>-      wlarc=</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    # PORTME: fill in a description of your system's C++ link characteristics</div><div class='del'>-    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])</div><div class='del'>-    _LT_TAGVAR(ld_shlibs, $1)=yes</div><div class='del'>-    case $host_os in</div><div class='del'>-      aix3*)</div><div class='del'>-        # FIXME: insert proper C++ library support</div><div class='del'>-        _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-        ;;</div><div class='del'>-      aix[[4-9]]*)</div><div class='del'>-        if test "$host_cpu" = ia64; then</div><div class='del'>-          # On IA64, the linker does run time linking by default, so we don't</div><div class='del'>-          # have to do anything special.</div><div class='del'>-          aix_use_runtimelinking=no</div><div class='del'>-          exp_sym_flag='-Bexport'</div><div class='del'>-          no_entry_flag=""</div><div class='del'>-        else</div><div class='del'>-          aix_use_runtimelinking=no</div><div class='del'>-</div><div class='del'>-          # Test if we are trying to use run time linking or normal</div><div class='del'>-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we</div><div class='del'>-          # need to do runtime linking.</div><div class='del'>-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)</div><div class='del'>-	    for ld_flag in $LDFLAGS; do</div><div class='del'>-	      case $ld_flag in</div><div class='del'>-	      *-brtl*)</div><div class='del'>-	        aix_use_runtimelinking=yes</div><div class='del'>-	        break</div><div class='del'>-	        ;;</div><div class='del'>-	      esac</div><div class='del'>-	    done</div><div class='del'>-	    ;;</div><div class='del'>-          esac</div><div class='del'>-</div><div class='del'>-          exp_sym_flag='-bexport'</div><div class='del'>-          no_entry_flag='-bnoentry'</div><div class='del'>-        fi</div><div class='del'>-</div><div class='del'>-        # When large executables or shared objects are built, AIX ld can</div><div class='del'>-        # have problems creating the table of contents.  If linking a library</div><div class='del'>-        # or program results in "error TOC overflow" add -mminimal-toc to</div><div class='del'>-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not</div><div class='del'>-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.</div><div class='del'>-</div><div class='del'>-        _LT_TAGVAR(archive_cmds, $1)=''</div><div class='del'>-        _LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes</div><div class='del'>-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'</div><div class='del'>-        _LT_TAGVAR(link_all_deplibs, $1)=yes</div><div class='del'>-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'</div><div class='del'>-</div><div class='del'>-        if test "$GXX" = yes; then</div><div class='del'>-          case $host_os in aix4.[[012]]|aix4.[[012]].*)</div><div class='del'>-          # We only want to do this on AIX 4.2 and lower, the check</div><div class='del'>-          # below for broken collect2 doesn't work under 4.3+</div><div class='del'>-	  collect2name=`${CC} -print-prog-name=collect2`</div><div class='del'>-	  if test -f "$collect2name" &amp;&amp;</div><div class='del'>-	     strings "$collect2name" | $GREP resolve_lib_name &gt;/dev/null</div><div class='del'>-	  then</div><div class='del'>-	    # We have reworked collect2</div><div class='del'>-	    :</div><div class='del'>-	  else</div><div class='del'>-	    # We have old collect2</div><div class='del'>-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported</div><div class='del'>-	    # It fails to find uninstalled libraries when the uninstalled</div><div class='del'>-	    # path is not listed in the libpath.  Setting hardcode_minus_L</div><div class='del'>-	    # to unsupported forces relinking</div><div class='del'>-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes</div><div class='del'>-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'</div><div class='del'>-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=</div><div class='del'>-	  fi</div><div class='del'>-          esac</div><div class='del'>-          shared_flag='-shared'</div><div class='del'>-	  if test "$aix_use_runtimelinking" = yes; then</div><div class='del'>-	    shared_flag="$shared_flag "'${wl}-G'</div><div class='del'>-	  fi</div><div class='del'>-        else</div><div class='del'>-          # not using gcc</div><div class='del'>-          if test "$host_cpu" = ia64; then</div><div class='del'>-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release</div><div class='del'>-	  # chokes on -Wl,-G. The following line is correct:</div><div class='del'>-	  shared_flag='-G'</div><div class='del'>-          else</div><div class='del'>-	    if test "$aix_use_runtimelinking" = yes; then</div><div class='del'>-	      shared_flag='${wl}-G'</div><div class='del'>-	    else</div><div class='del'>-	      shared_flag='${wl}-bM:SRE'</div><div class='del'>-	    fi</div><div class='del'>-          fi</div><div class='del'>-        fi</div><div class='del'>-</div><div class='del'>-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'</div><div class='del'>-        # It seems that -bexpall does not export symbols beginning with</div><div class='del'>-        # underscore (_), so it is better to generate a list of symbols to</div><div class='del'>-	# export.</div><div class='del'>-        _LT_TAGVAR(always_export_symbols, $1)=yes</div><div class='del'>-        if test "$aix_use_runtimelinking" = yes; then</div><div class='del'>-          # Warning - without using the other runtime loading flags (-brtl),</div><div class='del'>-          # -berok will link without error, but may produce a broken library.</div><div class='del'>-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'</div><div class='del'>-          # Determine the default libpath from the value encoded in an empty</div><div class='del'>-          # executable.</div><div class='del'>-          _LT_SYS_MODULE_PATH_AIX</div><div class='del'>-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"</div><div class='del'>-</div><div class='del'>-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"</div><div class='del'>-        else</div><div class='del'>-          if test "$host_cpu" = ia64; then</div><div class='del'>-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'</div><div class='del'>-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"</div><div class='del'>-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"</div><div class='del'>-          else</div><div class='del'>-	    # Determine the default libpath from the value encoded in an</div><div class='del'>-	    # empty executable.</div><div class='del'>-	    _LT_SYS_MODULE_PATH_AIX</div><div class='del'>-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"</div><div class='del'>-	    # Warning - without using the other run time loading flags,</div><div class='del'>-	    # -berok will link without error, but may produce a broken library.</div><div class='del'>-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'</div><div class='del'>-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'</div><div class='del'>-	    # Exported symbols can be pulled into shared objects from archives</div><div class='del'>-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'</div><div class='del'>-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes</div><div class='del'>-	    # This is similar to how AIX traditionally builds its shared</div><div class='del'>-	    # libraries.</div><div class='del'>-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'</div><div class='del'>-          fi</div><div class='del'>-        fi</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      beos*)</div><div class='del'>-	if $LD --help 2&gt;&amp;1 | $GREP ': supported targets:.* elf' &gt; /dev/null; then</div><div class='del'>-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported</div><div class='del'>-	  # Joseph Beckenbach &lt;jrb3@best.com&gt; says some releases of gcc</div><div class='del'>-	  # support --undefined.  This deserves some investigation.  FIXME</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-	else</div><div class='del'>-	  _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      chorus*)</div><div class='del'>-        case $cc_basename in</div><div class='del'>-          *)</div><div class='del'>-	  # FIXME: insert proper C++ library support</div><div class='del'>-	  _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	  ;;</div><div class='del'>-        esac</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      cygwin* | mingw* | pw32* | cegcc*)</div><div class='del'>-        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,</div><div class='del'>-        # as there is no search path for DLLs.</div><div class='del'>-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'</div><div class='del'>-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported</div><div class='del'>-        _LT_TAGVAR(always_export_symbols, $1)=no</div><div class='del'>-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes</div><div class='del'>-</div><div class='del'>-        if $LD --help 2&gt;&amp;1 | $GREP 'auto-import' &gt; /dev/null; then</div><div class='del'>-          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'</div><div class='del'>-          # If the export-symbols file already is a .def file (1st line</div><div class='del'>-          # is EXPORTS), use it as is; otherwise, prepend...</div><div class='del'>-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then</div><div class='del'>-	    cp $export_symbols $output_objdir/$soname.def;</div><div class='del'>-          else</div><div class='del'>-	    echo EXPORTS &gt; $output_objdir/$soname.def;</div><div class='del'>-	    cat $export_symbols &gt;&gt; $output_objdir/$soname.def;</div><div class='del'>-          fi~</div><div class='del'>-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'</div><div class='del'>-        else</div><div class='del'>-          _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-        fi</div><div class='del'>-        ;;</div><div class='del'>-      darwin* | rhapsody*)</div><div class='del'>-        _LT_DARWIN_LINKER_FEATURES($1)</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      dgux*)</div><div class='del'>-        case $cc_basename in</div><div class='del'>-          ec++*)</div><div class='del'>-	    # FIXME: insert proper C++ library support</div><div class='del'>-	    _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	    ;;</div><div class='del'>-          ghcx*)</div><div class='del'>-	    # Green Hills C++ Compiler</div><div class='del'>-	    # FIXME: insert proper C++ library support</div><div class='del'>-	    _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	    ;;</div><div class='del'>-          *)</div><div class='del'>-	    # FIXME: insert proper C++ library support</div><div class='del'>-	    _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	    ;;</div><div class='del'>-        esac</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      freebsd[[12]]*)</div><div class='del'>-        # C++ shared libraries reported to be fairly broken before</div><div class='del'>-	# switch to ELF</div><div class='del'>-        _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      freebsd-elf*)</div><div class='del'>-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      freebsd* | dragonfly*)</div><div class='del'>-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF</div><div class='del'>-        # conventions</div><div class='del'>-        _LT_TAGVAR(ld_shlibs, $1)=yes</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      gnu*)</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      hpux9*)</div><div class='del'>-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'</div><div class='del'>-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:</div><div class='del'>-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'</div><div class='del'>-        _LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,</div><div class='del'>-				             # but as the default</div><div class='del'>-				             # location of the library.</div><div class='del'>-</div><div class='del'>-        case $cc_basename in</div><div class='del'>-          CC*)</div><div class='del'>-            # FIXME: insert proper C++ library support</div><div class='del'>-            _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-            ;;</div><div class='del'>-          aCC*)</div><div class='del'>-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'</div><div class='del'>-            # Commands to make compiler produce verbose output that lists</div><div class='del'>-            # what "hidden" libraries, object files and flags are used when</div><div class='del'>-            # linking a shared library.</div><div class='del'>-            #</div><div class='del'>-            # There doesn't appear to be a way to prevent this compiler from</div><div class='del'>-            # explicitly linking system object files so we need to strip them</div><div class='del'>-            # from the output so that they don't get included in the library</div><div class='del'>-            # dependencies.</div><div class='del'>-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2&gt;&amp;1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'</div><div class='del'>-            ;;</div><div class='del'>-          *)</div><div class='del'>-            if test "$GXX" = yes; then</div><div class='del'>-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'</div><div class='del'>-            else</div><div class='del'>-              # FIXME: insert proper C++ library support</div><div class='del'>-              _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-            fi</div><div class='del'>-            ;;</div><div class='del'>-        esac</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      hpux10*|hpux11*)</div><div class='del'>-        if test $with_gnu_ld = no; then</div><div class='del'>-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'</div><div class='del'>-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:</div><div class='del'>-</div><div class='del'>-          case $host_cpu in</div><div class='del'>-            hppa*64*|ia64*)</div><div class='del'>-              ;;</div><div class='del'>-            *)</div><div class='del'>-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'</div><div class='del'>-              ;;</div><div class='del'>-          esac</div><div class='del'>-        fi</div><div class='del'>-        case $host_cpu in</div><div class='del'>-          hppa*64*|ia64*)</div><div class='del'>-            _LT_TAGVAR(hardcode_direct, $1)=no</div><div class='del'>-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-            ;;</div><div class='del'>-          *)</div><div class='del'>-            _LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes</div><div class='del'>-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,</div><div class='del'>-					         # but as the default</div><div class='del'>-					         # location of the library.</div><div class='del'>-            ;;</div><div class='del'>-        esac</div><div class='del'>-</div><div class='del'>-        case $cc_basename in</div><div class='del'>-          CC*)</div><div class='del'>-	    # FIXME: insert proper C++ library support</div><div class='del'>-	    _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	    ;;</div><div class='del'>-          aCC*)</div><div class='del'>-	    case $host_cpu in</div><div class='del'>-	      hppa*64*)</div><div class='del'>-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'</div><div class='del'>-	        ;;</div><div class='del'>-	      ia64*)</div><div class='del'>-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'</div><div class='del'>-	        ;;</div><div class='del'>-	      *)</div><div class='del'>-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'</div><div class='del'>-	        ;;</div><div class='del'>-	    esac</div><div class='del'>-	    # Commands to make compiler produce verbose output that lists</div><div class='del'>-	    # what "hidden" libraries, object files and flags are used when</div><div class='del'>-	    # linking a shared library.</div><div class='del'>-	    #</div><div class='del'>-	    # There doesn't appear to be a way to prevent this compiler from</div><div class='del'>-	    # explicitly linking system object files so we need to strip them</div><div class='del'>-	    # from the output so that they don't get included in the library</div><div class='del'>-	    # dependencies.</div><div class='del'>-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2&gt;&amp;1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'</div><div class='del'>-	    ;;</div><div class='del'>-          *)</div><div class='del'>-	    if test "$GXX" = yes; then</div><div class='del'>-	      if test $with_gnu_ld = no; then</div><div class='del'>-	        case $host_cpu in</div><div class='del'>-	          hppa*64*)</div><div class='del'>-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'</div><div class='del'>-	            ;;</div><div class='del'>-	          ia64*)</div><div class='del'>-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'</div><div class='del'>-	            ;;</div><div class='del'>-	          *)</div><div class='del'>-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'</div><div class='del'>-	            ;;</div><div class='del'>-	        esac</div><div class='del'>-	      fi</div><div class='del'>-	    else</div><div class='del'>-	      # FIXME: insert proper C++ library support</div><div class='del'>-	      _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	    fi</div><div class='del'>-	    ;;</div><div class='del'>-        esac</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      interix[[3-9]]*)</div><div class='del'>-	_LT_TAGVAR(hardcode_direct, $1)=no</div><div class='del'>-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'</div><div class='del'>-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'</div><div class='del'>-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.</div><div class='del'>-	# Instead, shared libraries are loaded at an image base (0x10000000 by</div><div class='del'>-	# default) and relocated if they conflict, which is a slow very memory</div><div class='del'>-	# consuming and fragmenting process.  To avoid this, we pick a random,</div><div class='del'>-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link</div><div class='del'>-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.</div><div class='del'>-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'</div><div class='del'>-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols &gt;$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'</div><div class='del'>-	;;</div><div class='del'>-      irix5* | irix6*)</div><div class='del'>-        case $cc_basename in</div><div class='del'>-          CC*)</div><div class='del'>-	    # SGI C++</div><div class='del'>-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" &amp;&amp; $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'</div><div class='del'>-</div><div class='del'>-	    # Archives containing C++ object files must be created using</div><div class='del'>-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is</div><div class='del'>-	    # necessary to make sure instantiated templates are included</div><div class='del'>-	    # in the archive.</div><div class='del'>-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'</div><div class='del'>-	    ;;</div><div class='del'>-          *)</div><div class='del'>-	    if test "$GXX" = yes; then</div><div class='del'>-	      if test "$with_gnu_ld" = no; then</div><div class='del'>-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" &amp;&amp; $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'</div><div class='del'>-	      else</div><div class='del'>-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" &amp;&amp; $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'</div><div class='del'>-	      fi</div><div class='del'>-	    fi</div><div class='del'>-	    _LT_TAGVAR(link_all_deplibs, $1)=yes</div><div class='del'>-	    ;;</div><div class='del'>-        esac</div><div class='del'>-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'</div><div class='del'>-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:</div><div class='del'>-        _LT_TAGVAR(inherit_rpath, $1)=yes</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      linux* | k*bsd*-gnu)</div><div class='del'>-        case $cc_basename in</div><div class='del'>-          KCC*)</div><div class='del'>-	    # Kuck and Associates, Inc. (KAI) C++ Compiler</div><div class='del'>-</div><div class='del'>-	    # KCC will only create a shared library if the output file</div><div class='del'>-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library</div><div class='del'>-	    # to its proper name (with version) after linking.</div><div class='del'>-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'</div><div class='del'>-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'</div><div class='del'>-	    # Commands to make compiler produce verbose output that lists</div><div class='del'>-	    # what "hidden" libraries, object files and flags are used when</div><div class='del'>-	    # linking a shared library.</div><div class='del'>-	    #</div><div class='del'>-	    # There doesn't appear to be a way to prevent this compiler from</div><div class='del'>-	    # explicitly linking system object files so we need to strip them</div><div class='del'>-	    # from the output so that they don't get included in the library</div><div class='del'>-	    # dependencies.</div><div class='del'>-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2&gt;&amp;1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'</div><div class='del'>-</div><div class='del'>-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'</div><div class='del'>-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'</div><div class='del'>-</div><div class='del'>-	    # Archives containing C++ object files must be created using</div><div class='del'>-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.</div><div class='del'>-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'</div><div class='del'>-	    ;;</div><div class='del'>-	  icpc* | ecpc* )</div><div class='del'>-	    # Intel C++</div><div class='del'>-	    with_gnu_ld=yes</div><div class='del'>-	    # version 8.0 and above of icpc choke on multiply defined symbols</div><div class='del'>-	    # if we add $predep_objects and $postdep_objects, however 7.1 and</div><div class='del'>-	    # earlier do not add the objects themselves.</div><div class='del'>-	    case `$CC -V 2&gt;&amp;1` in</div><div class='del'>-	      *"Version 7."*)</div><div class='del'>-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'</div><div class='del'>-		;;</div><div class='del'>-	      *)  # Version 8.0 or newer</div><div class='del'>-	        tmp_idyn=</div><div class='del'>-	        case $host_cpu in</div><div class='del'>-		  ia64*) tmp_idyn=' -i_dynamic';;</div><div class='del'>-		esac</div><div class='del'>-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'</div><div class='del'>-		;;</div><div class='del'>-	    esac</div><div class='del'>-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no</div><div class='del'>-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'</div><div class='del'>-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'</div><div class='del'>-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'</div><div class='del'>-	    ;;</div><div class='del'>-          pgCC* | pgcpp*)</div><div class='del'>-            # Portland Group C++ compiler</div><div class='del'>-	    case `$CC -V` in</div><div class='del'>-	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)</div><div class='del'>-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~</div><div class='del'>-		rm -rf $tpldir~</div><div class='del'>-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~</div><div class='del'>-		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'</div><div class='del'>-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~</div><div class='del'>-		rm -rf $tpldir~</div><div class='del'>-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~</div><div class='del'>-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~</div><div class='del'>-		$RANLIB $oldlib'</div><div class='del'>-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~</div><div class='del'>-		rm -rf $tpldir~</div><div class='del'>-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~</div><div class='del'>-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'</div><div class='del'>-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~</div><div class='del'>-		rm -rf $tpldir~</div><div class='del'>-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~</div><div class='del'>-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'</div><div class='del'>-	      ;;</div><div class='del'>-	    *) # Version 6 will use weak symbols</div><div class='del'>-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'</div><div class='del'>-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'</div><div class='del'>-	      ;;</div><div class='del'>-	    esac</div><div class='del'>-</div><div class='del'>-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'</div><div class='del'>-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'</div><div class='del'>-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" &amp;&amp; new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'</div><div class='del'>-            ;;</div><div class='del'>-	  cxx*)</div><div class='del'>-	    # Compaq C++</div><div class='del'>-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'</div><div class='del'>-</div><div class='del'>-	    runpath_var=LD_RUN_PATH</div><div class='del'>-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'</div><div class='del'>-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:</div><div class='del'>-</div><div class='del'>-	    # Commands to make compiler produce verbose output that lists</div><div class='del'>-	    # what "hidden" libraries, object files and flags are used when</div><div class='del'>-	    # linking a shared library.</div><div class='del'>-	    #</div><div class='del'>-	    # There doesn't appear to be a way to prevent this compiler from</div><div class='del'>-	    # explicitly linking system object files so we need to strip them</div><div class='del'>-	    # from the output so that they don't get included in the library</div><div class='del'>-	    # dependencies.</div><div class='del'>-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2&gt;&amp;1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'</div><div class='del'>-	    ;;</div><div class='del'>-	  xl*)</div><div class='del'>-	    # IBM XL 8.0 on PPC, with GNU ld</div><div class='del'>-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'</div><div class='del'>-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'</div><div class='del'>-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-	    if test "x$supports_anon_versioning" = xyes; then</div><div class='del'>-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" &gt; $output_objdir/$libname.ver~</div><div class='del'>-		cat $export_symbols | sed -e "s/\(.*\)/\1;/" &gt;&gt; $output_objdir/$libname.ver~</div><div class='del'>-		echo "local: *; };" &gt;&gt; $output_objdir/$libname.ver~</div><div class='del'>-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'</div><div class='del'>-	    fi</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    case `$CC -V 2&gt;&amp;1 | sed 5q` in</div><div class='del'>-	    *Sun\ C*)</div><div class='del'>-	      # Sun C++ 5.9</div><div class='del'>-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'</div><div class='del'>-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'</div><div class='del'>-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'</div><div class='del'>-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'</div><div class='del'>-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'</div><div class='del'>-	      _LT_TAGVAR(compiler_needs_object, $1)=yes</div><div class='del'>-</div><div class='del'>-	      # Not sure whether something based on</div><div class='del'>-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2&gt;&amp;1</div><div class='del'>-	      # would be better.</div><div class='del'>-	      output_verbose_link_cmd='echo'</div><div class='del'>-</div><div class='del'>-	      # Archives containing C++ object files must be created using</div><div class='del'>-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is</div><div class='del'>-	      # necessary to make sure instantiated templates are included</div><div class='del'>-	      # in the archive.</div><div class='del'>-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'</div><div class='del'>-	      ;;</div><div class='del'>-	    esac</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      lynxos*)</div><div class='del'>-        # FIXME: insert proper C++ library support</div><div class='del'>-	_LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      m88k*)</div><div class='del'>-        # FIXME: insert proper C++ library support</div><div class='del'>-        _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      mvs*)</div><div class='del'>-        case $cc_basename in</div><div class='del'>-          cxx*)</div><div class='del'>-	    # FIXME: insert proper C++ library support</div><div class='del'>-	    _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    # FIXME: insert proper C++ library support</div><div class='del'>-	    _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      netbsd*)</div><div class='del'>-        if echo __ELF__ | $CC -E - | $GREP __ELF__ &gt;/dev/null; then</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'</div><div class='del'>-	  wlarc=</div><div class='del'>-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'</div><div class='del'>-	  _LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-	fi</div><div class='del'>-	# Workaround some broken pre-1.5 toolchains</div><div class='del'>-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2&gt;&amp;1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      *nto* | *qnx*)</div><div class='del'>-        _LT_TAGVAR(ld_shlibs, $1)=yes</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      openbsd2*)</div><div class='del'>-        # C++ shared libraries are fairly broken</div><div class='del'>-	_LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      openbsd*)</div><div class='del'>-	if test -f /usr/libexec/ld.so; then</div><div class='del'>-	  _LT_TAGVAR(hardcode_direct, $1)=yes</div><div class='del'>-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'</div><div class='del'>-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'</div><div class='del'>-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then</div><div class='del'>-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'</div><div class='del'>-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'</div><div class='del'>-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'</div><div class='del'>-	  fi</div><div class='del'>-	  output_verbose_link_cmd=echo</div><div class='del'>-	else</div><div class='del'>-	  _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      osf3* | osf4* | osf5*)</div><div class='del'>-        case $cc_basename in</div><div class='del'>-          KCC*)</div><div class='del'>-	    # Kuck and Associates, Inc. (KAI) C++ Compiler</div><div class='del'>-</div><div class='del'>-	    # KCC will only create a shared library if the output file</div><div class='del'>-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library</div><div class='del'>-	    # to its proper name (with version) after linking.</div><div class='del'>-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'</div><div class='del'>-</div><div class='del'>-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'</div><div class='del'>-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:</div><div class='del'>-</div><div class='del'>-	    # Archives containing C++ object files must be created using</div><div class='del'>-	    # the KAI C++ compiler.</div><div class='del'>-	    case $host in</div><div class='del'>-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;</div><div class='del'>-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;</div><div class='del'>-	    esac</div><div class='del'>-	    ;;</div><div class='del'>-          RCC*)</div><div class='del'>-	    # Rational C++ 2.4.1</div><div class='del'>-	    # FIXME: insert proper C++ library support</div><div class='del'>-	    _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	    ;;</div><div class='del'>-          cxx*)</div><div class='del'>-	    case $host in</div><div class='del'>-	      osf3*)</div><div class='del'>-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'</div><div class='del'>-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" &amp;&amp; $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'</div><div class='del'>-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'</div><div class='del'>-		;;</div><div class='del'>-	      *)</div><div class='del'>-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'</div><div class='del'>-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" &amp;&amp; $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'</div><div class='del'>-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" &gt;&gt; $lib.exp; done~</div><div class='del'>-	          echo "-hidden"&gt;&gt; $lib.exp~</div><div class='del'>-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" &amp;&amp; $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~</div><div class='del'>-	          $RM $lib.exp'</div><div class='del'>-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'</div><div class='del'>-		;;</div><div class='del'>-	    esac</div><div class='del'>-</div><div class='del'>-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:</div><div class='del'>-</div><div class='del'>-	    # Commands to make compiler produce verbose output that lists</div><div class='del'>-	    # what "hidden" libraries, object files and flags are used when</div><div class='del'>-	    # linking a shared library.</div><div class='del'>-	    #</div><div class='del'>-	    # There doesn't appear to be a way to prevent this compiler from</div><div class='del'>-	    # explicitly linking system object files so we need to strip them</div><div class='del'>-	    # from the output so that they don't get included in the library</div><div class='del'>-	    # dependencies.</div><div class='del'>-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2&gt;&amp;1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    if test "$GXX" = yes &amp;&amp; test "$with_gnu_ld" = no; then</div><div class='del'>-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'</div><div class='del'>-	      case $host in</div><div class='del'>-	        osf3*)</div><div class='del'>-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" &amp;&amp; $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'</div><div class='del'>-		  ;;</div><div class='del'>-	        *)</div><div class='del'>-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" &amp;&amp; $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'</div><div class='del'>-		  ;;</div><div class='del'>-	      esac</div><div class='del'>-</div><div class='del'>-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'</div><div class='del'>-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:</div><div class='del'>-</div><div class='del'>-	      # Commands to make compiler produce verbose output that lists</div><div class='del'>-	      # what "hidden" libraries, object files and flags are used when</div><div class='del'>-	      # linking a shared library.</div><div class='del'>-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2&gt;&amp;1 | $GREP "\-L"'</div><div class='del'>-</div><div class='del'>-	    else</div><div class='del'>-	      # FIXME: insert proper C++ library support</div><div class='del'>-	      _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	    fi</div><div class='del'>-	    ;;</div><div class='del'>-        esac</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      psos*)</div><div class='del'>-        # FIXME: insert proper C++ library support</div><div class='del'>-        _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      sunos4*)</div><div class='del'>-        case $cc_basename in</div><div class='del'>-          CC*)</div><div class='del'>-	    # Sun C++ 4.x</div><div class='del'>-	    # FIXME: insert proper C++ library support</div><div class='del'>-	    _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	    ;;</div><div class='del'>-          lcc*)</div><div class='del'>-	    # Lucid</div><div class='del'>-	    # FIXME: insert proper C++ library support</div><div class='del'>-	    _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	    ;;</div><div class='del'>-          *)</div><div class='del'>-	    # FIXME: insert proper C++ library support</div><div class='del'>-	    _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	    ;;</div><div class='del'>-        esac</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      solaris*)</div><div class='del'>-        case $cc_basename in</div><div class='del'>-          CC*)</div><div class='del'>-	    # Sun C++ 4.2, 5.x and Centerline C++</div><div class='del'>-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes</div><div class='del'>-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'</div><div class='del'>-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'</div><div class='del'>-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" &gt; $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" &gt;&gt; $lib.exp~echo "local: *; };" &gt;&gt; $lib.exp~</div><div class='del'>-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'</div><div class='del'>-</div><div class='del'>-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'</div><div class='del'>-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-	    case $host_os in</div><div class='del'>-	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;</div><div class='del'>-	      *)</div><div class='del'>-		# The compiler driver will combine and reorder linker options,</div><div class='del'>-		# but understands `-z linker_flag'.</div><div class='del'>-	        # Supported since Solaris 2.6 (maybe 2.5.1?)</div><div class='del'>-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'</div><div class='del'>-	        ;;</div><div class='del'>-	    esac</div><div class='del'>-	    _LT_TAGVAR(link_all_deplibs, $1)=yes</div><div class='del'>-</div><div class='del'>-	    output_verbose_link_cmd='echo'</div><div class='del'>-</div><div class='del'>-	    # Archives containing C++ object files must be created using</div><div class='del'>-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is</div><div class='del'>-	    # necessary to make sure instantiated templates are included</div><div class='del'>-	    # in the archive.</div><div class='del'>-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'</div><div class='del'>-	    ;;</div><div class='del'>-          gcx*)</div><div class='del'>-	    # Green Hills C++ Compiler</div><div class='del'>-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'</div><div class='del'>-</div><div class='del'>-	    # The C++ compiler must be used to create the archive.</div><div class='del'>-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'</div><div class='del'>-	    ;;</div><div class='del'>-          *)</div><div class='del'>-	    # GNU C++ compiler with Solaris linker</div><div class='del'>-	    if test "$GXX" = yes &amp;&amp; test "$with_gnu_ld" = no; then</div><div class='del'>-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'</div><div class='del'>-	      if $CC --version | $GREP -v '^2\.7' &gt; /dev/null; then</div><div class='del'>-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'</div><div class='del'>-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" &gt; $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" &gt;&gt; $lib.exp~echo "local: *; };" &gt;&gt; $lib.exp~</div><div class='del'>-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'</div><div class='del'>-</div><div class='del'>-	        # Commands to make compiler produce verbose output that lists</div><div class='del'>-	        # what "hidden" libraries, object files and flags are used when</div><div class='del'>-	        # linking a shared library.</div><div class='del'>-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2&gt;&amp;1 | $GREP "\-L"'</div><div class='del'>-	      else</div><div class='del'>-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this</div><div class='del'>-	        # platform.</div><div class='del'>-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'</div><div class='del'>-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" &gt; $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" &gt;&gt; $lib.exp~echo "local: *; };" &gt;&gt; $lib.exp~</div><div class='del'>-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'</div><div class='del'>-</div><div class='del'>-	        # Commands to make compiler produce verbose output that lists</div><div class='del'>-	        # what "hidden" libraries, object files and flags are used when</div><div class='del'>-	        # linking a shared library.</div><div class='del'>-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2&gt;&amp;1 | $GREP "\-L"'</div><div class='del'>-	      fi</div><div class='del'>-</div><div class='del'>-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'</div><div class='del'>-	      case $host_os in</div><div class='del'>-		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;</div><div class='del'>-		*)</div><div class='del'>-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'</div><div class='del'>-		  ;;</div><div class='del'>-	      esac</div><div class='del'>-	    fi</div><div class='del'>-	    ;;</div><div class='del'>-        esac</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)</div><div class='del'>-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'</div><div class='del'>-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no</div><div class='del'>-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-      runpath_var='LD_RUN_PATH'</div><div class='del'>-</div><div class='del'>-      case $cc_basename in</div><div class='del'>-        CC*)</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  ;;</div><div class='del'>-	*)</div><div class='del'>-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  ;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-      sysv5* | sco3.2v5* | sco5v6*)</div><div class='del'>-	# Note: We can NOT use -z defs as we might desire, because we do not</div><div class='del'>-	# link with -lc, and that would cause any symbols used from libc to</div><div class='del'>-	# always be unresolved, which means just about no library would</div><div class='del'>-	# ever link correctly.  If we're not using GNU ld we use -z text</div><div class='del'>-	# though, which does catch some bad symbols but isn't as heavy-handed</div><div class='del'>-	# as -z defs.</div><div class='del'>-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'</div><div class='del'>-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'</div><div class='del'>-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no</div><div class='del'>-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no</div><div class='del'>-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'</div><div class='del'>-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'</div><div class='del'>-	_LT_TAGVAR(link_all_deplibs, $1)=yes</div><div class='del'>-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'</div><div class='del'>-	runpath_var='LD_RUN_PATH'</div><div class='del'>-</div><div class='del'>-	case $cc_basename in</div><div class='del'>-          CC*)</div><div class='del'>-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-      tandem*)</div><div class='del'>-        case $cc_basename in</div><div class='del'>-          NCC*)</div><div class='del'>-	    # NonStop-UX NCC 3.20</div><div class='del'>-	    # FIXME: insert proper C++ library support</div><div class='del'>-	    _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	    ;;</div><div class='del'>-          *)</div><div class='del'>-	    # FIXME: insert proper C++ library support</div><div class='del'>-	    _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-	    ;;</div><div class='del'>-        esac</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      vxworks*)</div><div class='del'>-        # FIXME: insert proper C++ library support</div><div class='del'>-        _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      *)</div><div class='del'>-        # FIXME: insert proper C++ library support</div><div class='del'>-        _LT_TAGVAR(ld_shlibs, $1)=no</div><div class='del'>-        ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])</div><div class='del'>-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no &amp;&amp; can_build_shared=no</div><div class='del'>-</div><div class='del'>-    _LT_TAGVAR(GCC, $1)="$GXX"</div><div class='del'>-    _LT_TAGVAR(LD, $1)="$LD"</div><div class='del'>-</div><div class='del'>-    ## CAVEAT EMPTOR:</div><div class='del'>-    ## There is no encapsulation within the following macros, do not change</div><div class='del'>-    ## the running order or otherwise move them around unless you know exactly</div><div class='del'>-    ## what you are doing...</div><div class='del'>-    _LT_SYS_HIDDEN_LIBDEPS($1)</div><div class='del'>-    _LT_COMPILER_PIC($1)</div><div class='del'>-    _LT_COMPILER_C_O($1)</div><div class='del'>-    _LT_COMPILER_FILE_LOCKS($1)</div><div class='del'>-    _LT_LINKER_SHLIBS($1)</div><div class='del'>-    _LT_SYS_DYNAMIC_LINKER($1)</div><div class='del'>-    _LT_LINKER_HARDCODE_LIBPATH($1)</div><div class='del'>-</div><div class='del'>-    _LT_CONFIG($1)</div><div class='del'>-  fi # test -n "$compiler"</div><div class='del'>-</div><div class='del'>-  CC=$lt_save_CC</div><div class='del'>-  LDCXX=$LD</div><div class='del'>-  LD=$lt_save_LD</div><div class='del'>-  GCC=$lt_save_GCC</div><div class='del'>-  with_gnu_ld=$lt_save_with_gnu_ld</div><div class='del'>-  lt_cv_path_LDCXX=$lt_cv_path_LD</div><div class='del'>-  lt_cv_path_LD=$lt_save_path_LD</div><div class='del'>-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld</div><div class='del'>-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld</div><div class='del'>-fi # test "$_lt_caught_CXX_error" != yes</div><div class='del'>-</div><div class='del'>-AC_LANG_POP</div><div class='del'>-])# _LT_LANG_CXX_CONFIG</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])</div><div class='del'>-# ---------------------------------</div><div class='del'>-# Figure out "hidden" library dependencies from verbose</div><div class='del'>-# compiler output when linking a shared library.</div><div class='del'>-# Parse the compiler output and extract the necessary</div><div class='del'>-# objects, libraries and library flags.</div><div class='del'>-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],</div><div class='del'>-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl</div><div class='del'>-# Dependencies to place before and after the object being linked:</div><div class='del'>-_LT_TAGVAR(predep_objects, $1)=</div><div class='del'>-_LT_TAGVAR(postdep_objects, $1)=</div><div class='del'>-_LT_TAGVAR(predeps, $1)=</div><div class='del'>-_LT_TAGVAR(postdeps, $1)=</div><div class='del'>-_LT_TAGVAR(compiler_lib_search_path, $1)=</div><div class='del'>-</div><div class='del'>-dnl we can't use the lt_simple_compile_test_code here,</div><div class='del'>-dnl because it contains code intended for an executable,</div><div class='del'>-dnl not a library.  It's possible we should let each</div><div class='del'>-dnl tag define a new lt_????_link_test_code variable,</div><div class='del'>-dnl but it's only used here...</div><div class='del'>-m4_if([$1], [], [cat &gt; conftest.$ac_ext &lt;&lt;_LT_EOF</div><div class='del'>-int a;</div><div class='del'>-void foo (void) { a = 0; }</div><div class='del'>-_LT_EOF</div><div class='del'>-], [$1], [CXX], [cat &gt; conftest.$ac_ext &lt;&lt;_LT_EOF</div><div class='del'>-class Foo</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-  Foo (void) { a = 0; }</div><div class='del'>-private:</div><div class='del'>-  int a;</div><div class='del'>-};</div><div class='del'>-_LT_EOF</div><div class='del'>-], [$1], [F77], [cat &gt; conftest.$ac_ext &lt;&lt;_LT_EOF</div><div class='del'>-      subroutine foo</div><div class='del'>-      implicit none</div><div class='del'>-      integer*4 a</div><div class='del'>-      a=0</div><div class='del'>-      return</div><div class='del'>-      end</div><div class='del'>-_LT_EOF</div><div class='del'>-], [$1], [FC], [cat &gt; conftest.$ac_ext &lt;&lt;_LT_EOF</div><div class='del'>-      subroutine foo</div><div class='del'>-      implicit none</div><div class='del'>-      integer a</div><div class='del'>-      a=0</div><div class='del'>-      return</div><div class='del'>-      end</div><div class='del'>-_LT_EOF</div><div class='del'>-], [$1], [GCJ], [cat &gt; conftest.$ac_ext &lt;&lt;_LT_EOF</div><div class='del'>-public class foo {</div><div class='del'>-  private int a;</div><div class='del'>-  public void bar (void) {</div><div class='del'>-    a = 0;</div><div class='del'>-  }</div><div class='del'>-};</div><div class='del'>-_LT_EOF</div><div class='del'>-])</div><div class='del'>-dnl Parse the compiler output and extract the necessary</div><div class='del'>-dnl objects, libraries and library flags.</div><div class='del'>-if AC_TRY_EVAL(ac_compile); then</div><div class='del'>-  # Parse the compiler output and extract the necessary</div><div class='del'>-  # objects, libraries and library flags.</div><div class='del'>-</div><div class='del'>-  # Sentinel used to keep track of whether or not we are before</div><div class='del'>-  # the conftest object file.</div><div class='del'>-  pre_test_object_deps_done=no</div><div class='del'>-</div><div class='del'>-  for p in `eval "$output_verbose_link_cmd"`; do</div><div class='del'>-    case $p in</div><div class='del'>-</div><div class='del'>-    -L* | -R* | -l*)</div><div class='del'>-       # Some compilers place space between "-{L,R}" and the path.</div><div class='del'>-       # Remove the space.</div><div class='del'>-       if test $p = "-L" ||</div><div class='del'>-          test $p = "-R"; then</div><div class='del'>-	 prev=$p</div><div class='del'>-	 continue</div><div class='del'>-       else</div><div class='del'>-	 prev=</div><div class='del'>-       fi</div><div class='del'>-</div><div class='del'>-       if test "$pre_test_object_deps_done" = no; then</div><div class='del'>-	 case $p in</div><div class='del'>-	 -L* | -R*)</div><div class='del'>-	   # Internal compiler library paths should come after those</div><div class='del'>-	   # provided the user.  The postdeps already come after the</div><div class='del'>-	   # user supplied libs so there is no need to process them.</div><div class='del'>-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then</div><div class='del'>-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"</div><div class='del'>-	   else</div><div class='del'>-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"</div><div class='del'>-	   fi</div><div class='del'>-	   ;;</div><div class='del'>-	 # The "-l" case would never come before the object being</div><div class='del'>-	 # linked, so don't bother handling this case.</div><div class='del'>-	 esac</div><div class='del'>-       else</div><div class='del'>-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then</div><div class='del'>-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"</div><div class='del'>-	 else</div><div class='del'>-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"</div><div class='del'>-	 fi</div><div class='del'>-       fi</div><div class='del'>-       ;;</div><div class='del'>-</div><div class='del'>-    *.$objext)</div><div class='del'>-       # This assumes that the test object file only shows up</div><div class='del'>-       # once in the compiler output.</div><div class='del'>-       if test "$p" = "conftest.$objext"; then</div><div class='del'>-	 pre_test_object_deps_done=yes</div><div class='del'>-	 continue</div><div class='del'>-       fi</div><div class='del'>-</div><div class='del'>-       if test "$pre_test_object_deps_done" = no; then</div><div class='del'>-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then</div><div class='del'>-	   _LT_TAGVAR(predep_objects, $1)="$p"</div><div class='del'>-	 else</div><div class='del'>-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"</div><div class='del'>-	 fi</div><div class='del'>-       else</div><div class='del'>-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then</div><div class='del'>-	   _LT_TAGVAR(postdep_objects, $1)="$p"</div><div class='del'>-	 else</div><div class='del'>-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"</div><div class='del'>-	 fi</div><div class='del'>-       fi</div><div class='del'>-       ;;</div><div class='del'>-</div><div class='del'>-    *) ;; # Ignore the rest.</div><div class='del'>-</div><div class='del'>-    esac</div><div class='del'>-  done</div><div class='del'>-</div><div class='del'>-  # Clean up.</div><div class='del'>-  rm -f a.out a.exe</div><div class='del'>-else</div><div class='del'>-  echo "libtool.m4: error: problem compiling $1 test program"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-$RM -f confest.$objext</div><div class='del'>-</div><div class='del'>-# PORTME: override above test on systems where it is broken</div><div class='del'>-m4_if([$1], [CXX],</div><div class='del'>-[case $host_os in</div><div class='del'>-interix[[3-9]]*)</div><div class='del'>-  # Interix 3.5 installs completely hosed .la files for C++, so rather than</div><div class='del'>-  # hack all around it, let's just trust "g++" to DTRT.</div><div class='del'>-  _LT_TAGVAR(predep_objects,$1)=</div><div class='del'>-  _LT_TAGVAR(postdep_objects,$1)=</div><div class='del'>-  _LT_TAGVAR(postdeps,$1)=</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-linux*)</div><div class='del'>-  case `$CC -V 2&gt;&amp;1 | sed 5q` in</div><div class='del'>-  *Sun\ C*)</div><div class='del'>-    # Sun C++ 5.9</div><div class='del'>-</div><div class='del'>-    # The more standards-conforming stlport4 library is</div><div class='del'>-    # incompatible with the Cstd library. Avoid specifying</div><div class='del'>-    # it if it's in CXXFLAGS. Ignore libCrun as</div><div class='del'>-    # -library=stlport4 depends on it.</div><div class='del'>-    case " $CXX $CXXFLAGS " in</div><div class='del'>-    *" -library=stlport4 "*)</div><div class='del'>-      solaris_use_stlport4=yes</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    if test "$solaris_use_stlport4" != yes; then</div><div class='del'>-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-solaris*)</div><div class='del'>-  case $cc_basename in</div><div class='del'>-  CC*)</div><div class='del'>-    # The more standards-conforming stlport4 library is</div><div class='del'>-    # incompatible with the Cstd library. Avoid specifying</div><div class='del'>-    # it if it's in CXXFLAGS. Ignore libCrun as</div><div class='del'>-    # -library=stlport4 depends on it.</div><div class='del'>-    case " $CXX $CXXFLAGS " in</div><div class='del'>-    *" -library=stlport4 "*)</div><div class='del'>-      solaris_use_stlport4=yes</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    # Adding this requires a known-good setup of shared libraries for</div><div class='del'>-    # Sun compiler versions before 5.6, else PIC objects from an old</div><div class='del'>-    # archive will be linked into the output, leading to subtle bugs.</div><div class='del'>-    if test "$solaris_use_stlport4" != yes; then</div><div class='del'>-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-case " $_LT_TAGVAR(postdeps, $1) " in</div><div class='del'>-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;</div><div class='del'>-esac</div><div class='del'>- _LT_TAGVAR(compiler_lib_search_dirs, $1)=</div><div class='del'>-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then</div><div class='del'>- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`</div><div class='del'>-fi</div><div class='del'>-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],</div><div class='del'>-    [The directories searched by this compiler when creating a shared library])</div><div class='del'>-_LT_TAGDECL([], [predep_objects], [1],</div><div class='del'>-    [Dependencies to place before and after the objects being linked to</div><div class='del'>-    create a shared library])</div><div class='del'>-_LT_TAGDECL([], [postdep_objects], [1])</div><div class='del'>-_LT_TAGDECL([], [predeps], [1])</div><div class='del'>-_LT_TAGDECL([], [postdeps], [1])</div><div class='del'>-_LT_TAGDECL([], [compiler_lib_search_path], [1],</div><div class='del'>-    [The library search path used internally by the compiler when linking</div><div class='del'>-    a shared library])</div><div class='del'>-])# _LT_SYS_HIDDEN_LIBDEPS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_PROG_F77</div><div class='del'>-# ------------</div><div class='del'>-# Since AC_PROG_F77 is broken, in that it returns the empty string</div><div class='del'>-# if there is no fortran compiler, we have our own version here.</div><div class='del'>-m4_defun([_LT_PROG_F77],</div><div class='del'>-[</div><div class='del'>-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])</div><div class='del'>-AC_PROG_F77</div><div class='del'>-if test -z "$F77" || test "X$F77" = "Xno"; then</div><div class='del'>-  _lt_disable_F77=yes</div><div class='del'>-fi</div><div class='del'>-popdef([AC_MSG_ERROR])</div><div class='del'>-])# _LT_PROG_F77</div><div class='del'>-</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([_LT_PROG_F77], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_LANG_F77_CONFIG([TAG])</div><div class='del'>-# --------------------------</div><div class='del'>-# Ensure that the configuration variables for a Fortran 77 compiler are</div><div class='del'>-# suitably defined.  These variables are subsequently used by _LT_CONFIG</div><div class='del'>-# to write the compiler configuration to `libtool'.</div><div class='del'>-m4_defun([_LT_LANG_F77_CONFIG],</div><div class='del'>-[AC_REQUIRE([_LT_PROG_F77])dnl</div><div class='del'>-AC_LANG_PUSH(Fortran 77)</div><div class='del'>-</div><div class='del'>-_LT_TAGVAR(archive_cmds_need_lc, $1)=no</div><div class='del'>-_LT_TAGVAR(allow_undefined_flag, $1)=</div><div class='del'>-_LT_TAGVAR(always_export_symbols, $1)=no</div><div class='del'>-_LT_TAGVAR(archive_expsym_cmds, $1)=</div><div class='del'>-_LT_TAGVAR(export_dynamic_flag_spec, $1)=</div><div class='del'>-_LT_TAGVAR(hardcode_direct, $1)=no</div><div class='del'>-_LT_TAGVAR(hardcode_direct_absolute, $1)=no</div><div class='del'>-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=</div><div class='del'>-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=</div><div class='del'>-_LT_TAGVAR(hardcode_libdir_separator, $1)=</div><div class='del'>-_LT_TAGVAR(hardcode_minus_L, $1)=no</div><div class='del'>-_LT_TAGVAR(hardcode_automatic, $1)=no</div><div class='del'>-_LT_TAGVAR(inherit_rpath, $1)=no</div><div class='del'>-_LT_TAGVAR(module_cmds, $1)=</div><div class='del'>-_LT_TAGVAR(module_expsym_cmds, $1)=</div><div class='del'>-_LT_TAGVAR(link_all_deplibs, $1)=unknown</div><div class='del'>-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds</div><div class='del'>-_LT_TAGVAR(no_undefined_flag, $1)=</div><div class='del'>-_LT_TAGVAR(whole_archive_flag_spec, $1)=</div><div class='del'>-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no</div><div class='del'>-</div><div class='del'>-# Source file extension for f77 test sources.</div><div class='del'>-ac_ext=f</div><div class='del'>-</div><div class='del'>-# Object file extension for compiled f77 test sources.</div><div class='del'>-objext=o</div><div class='del'>-_LT_TAGVAR(objext, $1)=$objext</div><div class='del'>-</div><div class='del'>-# No sense in running all these tests if we already determined that</div><div class='del'>-# the F77 compiler isn't working.  Some variables (like enable_shared)</div><div class='del'>-# are currently assumed to apply to all compilers on this platform,</div><div class='del'>-# and will be corrupted by setting them based on a non-working compiler.</div><div class='del'>-if test "$_lt_disable_F77" != yes; then</div><div class='del'>-  # Code to be used in simple compile tests</div><div class='del'>-  lt_simple_compile_test_code="\</div><div class='del'>-      subroutine t</div><div class='del'>-      return</div><div class='del'>-      end</div><div class='del'>-"</div><div class='del'>-</div><div class='del'>-  # Code to be used in simple link tests</div><div class='del'>-  lt_simple_link_test_code="\</div><div class='del'>-      program t</div><div class='del'>-      end</div><div class='del'>-"</div><div class='del'>-</div><div class='del'>-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.</div><div class='del'>-  _LT_TAG_COMPILER</div><div class='del'>-</div><div class='del'>-  # save warnings/boilerplate of simple test code</div><div class='del'>-  _LT_COMPILER_BOILERPLATE</div><div class='del'>-  _LT_LINKER_BOILERPLATE</div><div class='del'>-</div><div class='del'>-  # Allow CC to be a program name with arguments.</div><div class='del'>-  lt_save_CC="$CC"</div><div class='del'>-  lt_save_GCC=$GCC</div><div class='del'>-  CC=${F77-"f77"}</div><div class='del'>-  compiler=$CC</div><div class='del'>-  _LT_TAGVAR(compiler, $1)=$CC</div><div class='del'>-  _LT_CC_BASENAME([$compiler])</div><div class='del'>-  GCC=$G77</div><div class='del'>-  if test -n "$compiler"; then</div><div class='del'>-    AC_MSG_CHECKING([if libtool supports shared libraries])</div><div class='del'>-    AC_MSG_RESULT([$can_build_shared])</div><div class='del'>-</div><div class='del'>-    AC_MSG_CHECKING([whether to build shared libraries])</div><div class='del'>-    test "$can_build_shared" = "no" &amp;&amp; enable_shared=no</div><div class='del'>-</div><div class='del'>-    # On AIX, shared libraries and static libraries use the same namespace, and</div><div class='del'>-    # are all built from PIC.</div><div class='del'>-    case $host_os in</div><div class='del'>-      aix3*)</div><div class='del'>-        test "$enable_shared" = yes &amp;&amp; enable_static=no</div><div class='del'>-        if test -n "$RANLIB"; then</div><div class='del'>-          archive_cmds="$archive_cmds~\$RANLIB \$lib"</div><div class='del'>-          postinstall_cmds='$RANLIB $lib'</div><div class='del'>-        fi</div><div class='del'>-        ;;</div><div class='del'>-      aix[[4-9]]*)</div><div class='del'>-	if test "$host_cpu" != ia64 &amp;&amp; test "$aix_use_runtimelinking" = no ; then</div><div class='del'>-	  test "$enable_shared" = yes &amp;&amp; enable_static=no</div><div class='del'>-	fi</div><div class='del'>-        ;;</div><div class='del'>-    esac</div><div class='del'>-    AC_MSG_RESULT([$enable_shared])</div><div class='del'>-</div><div class='del'>-    AC_MSG_CHECKING([whether to build static libraries])</div><div class='del'>-    # Make sure either enable_shared or enable_static is yes.</div><div class='del'>-    test "$enable_shared" = yes || enable_static=yes</div><div class='del'>-    AC_MSG_RESULT([$enable_static])</div><div class='del'>-</div><div class='del'>-    _LT_TAGVAR(GCC, $1)="$G77"</div><div class='del'>-    _LT_TAGVAR(LD, $1)="$LD"</div><div class='del'>-</div><div class='del'>-    ## CAVEAT EMPTOR:</div><div class='del'>-    ## There is no encapsulation within the following macros, do not change</div><div class='del'>-    ## the running order or otherwise move them around unless you know exactly</div><div class='del'>-    ## what you are doing...</div><div class='del'>-    _LT_COMPILER_PIC($1)</div><div class='del'>-    _LT_COMPILER_C_O($1)</div><div class='del'>-    _LT_COMPILER_FILE_LOCKS($1)</div><div class='del'>-    _LT_LINKER_SHLIBS($1)</div><div class='del'>-    _LT_SYS_DYNAMIC_LINKER($1)</div><div class='del'>-    _LT_LINKER_HARDCODE_LIBPATH($1)</div><div class='del'>-</div><div class='del'>-    _LT_CONFIG($1)</div><div class='del'>-  fi # test -n "$compiler"</div><div class='del'>-</div><div class='del'>-  GCC=$lt_save_GCC</div><div class='del'>-  CC="$lt_save_CC"</div><div class='del'>-fi # test "$_lt_disable_F77" != yes</div><div class='del'>-</div><div class='del'>-AC_LANG_POP</div><div class='del'>-])# _LT_LANG_F77_CONFIG</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_PROG_FC</div><div class='del'>-# -----------</div><div class='del'>-# Since AC_PROG_FC is broken, in that it returns the empty string</div><div class='del'>-# if there is no fortran compiler, we have our own version here.</div><div class='del'>-m4_defun([_LT_PROG_FC],</div><div class='del'>-[</div><div class='del'>-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])</div><div class='del'>-AC_PROG_FC</div><div class='del'>-if test -z "$FC" || test "X$FC" = "Xno"; then</div><div class='del'>-  _lt_disable_FC=yes</div><div class='del'>-fi</div><div class='del'>-popdef([AC_MSG_ERROR])</div><div class='del'>-])# _LT_PROG_FC</div><div class='del'>-</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([_LT_PROG_FC], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_LANG_FC_CONFIG([TAG])</div><div class='del'>-# -------------------------</div><div class='del'>-# Ensure that the configuration variables for a Fortran compiler are</div><div class='del'>-# suitably defined.  These variables are subsequently used by _LT_CONFIG</div><div class='del'>-# to write the compiler configuration to `libtool'.</div><div class='del'>-m4_defun([_LT_LANG_FC_CONFIG],</div><div class='del'>-[AC_REQUIRE([_LT_PROG_FC])dnl</div><div class='del'>-AC_LANG_PUSH(Fortran)</div><div class='del'>-</div><div class='del'>-_LT_TAGVAR(archive_cmds_need_lc, $1)=no</div><div class='del'>-_LT_TAGVAR(allow_undefined_flag, $1)=</div><div class='del'>-_LT_TAGVAR(always_export_symbols, $1)=no</div><div class='del'>-_LT_TAGVAR(archive_expsym_cmds, $1)=</div><div class='del'>-_LT_TAGVAR(export_dynamic_flag_spec, $1)=</div><div class='del'>-_LT_TAGVAR(hardcode_direct, $1)=no</div><div class='del'>-_LT_TAGVAR(hardcode_direct_absolute, $1)=no</div><div class='del'>-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=</div><div class='del'>-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=</div><div class='del'>-_LT_TAGVAR(hardcode_libdir_separator, $1)=</div><div class='del'>-_LT_TAGVAR(hardcode_minus_L, $1)=no</div><div class='del'>-_LT_TAGVAR(hardcode_automatic, $1)=no</div><div class='del'>-_LT_TAGVAR(inherit_rpath, $1)=no</div><div class='del'>-_LT_TAGVAR(module_cmds, $1)=</div><div class='del'>-_LT_TAGVAR(module_expsym_cmds, $1)=</div><div class='del'>-_LT_TAGVAR(link_all_deplibs, $1)=unknown</div><div class='del'>-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds</div><div class='del'>-_LT_TAGVAR(no_undefined_flag, $1)=</div><div class='del'>-_LT_TAGVAR(whole_archive_flag_spec, $1)=</div><div class='del'>-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no</div><div class='del'>-</div><div class='del'>-# Source file extension for fc test sources.</div><div class='del'>-ac_ext=${ac_fc_srcext-f}</div><div class='del'>-</div><div class='del'>-# Object file extension for compiled fc test sources.</div><div class='del'>-objext=o</div><div class='del'>-_LT_TAGVAR(objext, $1)=$objext</div><div class='del'>-</div><div class='del'>-# No sense in running all these tests if we already determined that</div><div class='del'>-# the FC compiler isn't working.  Some variables (like enable_shared)</div><div class='del'>-# are currently assumed to apply to all compilers on this platform,</div><div class='del'>-# and will be corrupted by setting them based on a non-working compiler.</div><div class='del'>-if test "$_lt_disable_FC" != yes; then</div><div class='del'>-  # Code to be used in simple compile tests</div><div class='del'>-  lt_simple_compile_test_code="\</div><div class='del'>-      subroutine t</div><div class='del'>-      return</div><div class='del'>-      end</div><div class='del'>-"</div><div class='del'>-</div><div class='del'>-  # Code to be used in simple link tests</div><div class='del'>-  lt_simple_link_test_code="\</div><div class='del'>-      program t</div><div class='del'>-      end</div><div class='del'>-"</div><div class='del'>-</div><div class='del'>-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.</div><div class='del'>-  _LT_TAG_COMPILER</div><div class='del'>-</div><div class='del'>-  # save warnings/boilerplate of simple test code</div><div class='del'>-  _LT_COMPILER_BOILERPLATE</div><div class='del'>-  _LT_LINKER_BOILERPLATE</div><div class='del'>-</div><div class='del'>-  # Allow CC to be a program name with arguments.</div><div class='del'>-  lt_save_CC="$CC"</div><div class='del'>-  lt_save_GCC=$GCC</div><div class='del'>-  CC=${FC-"f95"}</div><div class='del'>-  compiler=$CC</div><div class='del'>-  GCC=$ac_cv_fc_compiler_gnu</div><div class='del'>-</div><div class='del'>-  _LT_TAGVAR(compiler, $1)=$CC</div><div class='del'>-  _LT_CC_BASENAME([$compiler])</div><div class='del'>-</div><div class='del'>-  if test -n "$compiler"; then</div><div class='del'>-    AC_MSG_CHECKING([if libtool supports shared libraries])</div><div class='del'>-    AC_MSG_RESULT([$can_build_shared])</div><div class='del'>-</div><div class='del'>-    AC_MSG_CHECKING([whether to build shared libraries])</div><div class='del'>-    test "$can_build_shared" = "no" &amp;&amp; enable_shared=no</div><div class='del'>-</div><div class='del'>-    # On AIX, shared libraries and static libraries use the same namespace, and</div><div class='del'>-    # are all built from PIC.</div><div class='del'>-    case $host_os in</div><div class='del'>-      aix3*)</div><div class='del'>-        test "$enable_shared" = yes &amp;&amp; enable_static=no</div><div class='del'>-        if test -n "$RANLIB"; then</div><div class='del'>-          archive_cmds="$archive_cmds~\$RANLIB \$lib"</div><div class='del'>-          postinstall_cmds='$RANLIB $lib'</div><div class='del'>-        fi</div><div class='del'>-        ;;</div><div class='del'>-      aix[[4-9]]*)</div><div class='del'>-	if test "$host_cpu" != ia64 &amp;&amp; test "$aix_use_runtimelinking" = no ; then</div><div class='del'>-	  test "$enable_shared" = yes &amp;&amp; enable_static=no</div><div class='del'>-	fi</div><div class='del'>-        ;;</div><div class='del'>-    esac</div><div class='del'>-    AC_MSG_RESULT([$enable_shared])</div><div class='del'>-</div><div class='del'>-    AC_MSG_CHECKING([whether to build static libraries])</div><div class='del'>-    # Make sure either enable_shared or enable_static is yes.</div><div class='del'>-    test "$enable_shared" = yes || enable_static=yes</div><div class='del'>-    AC_MSG_RESULT([$enable_static])</div><div class='del'>-</div><div class='del'>-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"</div><div class='del'>-    _LT_TAGVAR(LD, $1)="$LD"</div><div class='del'>-</div><div class='del'>-    ## CAVEAT EMPTOR:</div><div class='del'>-    ## There is no encapsulation within the following macros, do not change</div><div class='del'>-    ## the running order or otherwise move them around unless you know exactly</div><div class='del'>-    ## what you are doing...</div><div class='del'>-    _LT_SYS_HIDDEN_LIBDEPS($1)</div><div class='del'>-    _LT_COMPILER_PIC($1)</div><div class='del'>-    _LT_COMPILER_C_O($1)</div><div class='del'>-    _LT_COMPILER_FILE_LOCKS($1)</div><div class='del'>-    _LT_LINKER_SHLIBS($1)</div><div class='del'>-    _LT_SYS_DYNAMIC_LINKER($1)</div><div class='del'>-    _LT_LINKER_HARDCODE_LIBPATH($1)</div><div class='del'>-</div><div class='del'>-    _LT_CONFIG($1)</div><div class='del'>-  fi # test -n "$compiler"</div><div class='del'>-</div><div class='del'>-  GCC=$lt_save_GCC</div><div class='del'>-  CC="$lt_save_CC"</div><div class='del'>-fi # test "$_lt_disable_FC" != yes</div><div class='del'>-</div><div class='del'>-AC_LANG_POP</div><div class='del'>-])# _LT_LANG_FC_CONFIG</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_LANG_GCJ_CONFIG([TAG])</div><div class='del'>-# --------------------------</div><div class='del'>-# Ensure that the configuration variables for the GNU Java Compiler compiler</div><div class='del'>-# are suitably defined.  These variables are subsequently used by _LT_CONFIG</div><div class='del'>-# to write the compiler configuration to `libtool'.</div><div class='del'>-m4_defun([_LT_LANG_GCJ_CONFIG],</div><div class='del'>-[AC_REQUIRE([LT_PROG_GCJ])dnl</div><div class='del'>-AC_LANG_SAVE</div><div class='del'>-</div><div class='del'>-# Source file extension for Java test sources.</div><div class='del'>-ac_ext=java</div><div class='del'>-</div><div class='del'>-# Object file extension for compiled Java test sources.</div><div class='del'>-objext=o</div><div class='del'>-_LT_TAGVAR(objext, $1)=$objext</div><div class='del'>-</div><div class='del'>-# Code to be used in simple compile tests</div><div class='del'>-lt_simple_compile_test_code="class foo {}"</div><div class='del'>-</div><div class='del'>-# Code to be used in simple link tests</div><div class='del'>-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'</div><div class='del'>-</div><div class='del'>-# ltmain only uses $CC for tagged configurations so make sure $CC is set.</div><div class='del'>-_LT_TAG_COMPILER</div><div class='del'>-</div><div class='del'>-# save warnings/boilerplate of simple test code</div><div class='del'>-_LT_COMPILER_BOILERPLATE</div><div class='del'>-_LT_LINKER_BOILERPLATE</div><div class='del'>-</div><div class='del'>-# Allow CC to be a program name with arguments.</div><div class='del'>-lt_save_CC="$CC"</div><div class='del'>-lt_save_GCC=$GCC</div><div class='del'>-GCC=yes</div><div class='del'>-CC=${GCJ-"gcj"}</div><div class='del'>-compiler=$CC</div><div class='del'>-_LT_TAGVAR(compiler, $1)=$CC</div><div class='del'>-_LT_TAGVAR(LD, $1)="$LD"</div><div class='del'>-_LT_CC_BASENAME([$compiler])</div><div class='del'>-</div><div class='del'>-# GCJ did not exist at the time GCC didn't implicitly link libc in.</div><div class='del'>-_LT_TAGVAR(archive_cmds_need_lc, $1)=no</div><div class='del'>-</div><div class='del'>-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds</div><div class='del'>-</div><div class='del'>-if test -n "$compiler"; then</div><div class='del'>-  _LT_COMPILER_NO_RTTI($1)</div><div class='del'>-  _LT_COMPILER_PIC($1)</div><div class='del'>-  _LT_COMPILER_C_O($1)</div><div class='del'>-  _LT_COMPILER_FILE_LOCKS($1)</div><div class='del'>-  _LT_LINKER_SHLIBS($1)</div><div class='del'>-  _LT_LINKER_HARDCODE_LIBPATH($1)</div><div class='del'>-</div><div class='del'>-  _LT_CONFIG($1)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AC_LANG_RESTORE</div><div class='del'>-</div><div class='del'>-GCC=$lt_save_GCC</div><div class='del'>-CC="$lt_save_CC"</div><div class='del'>-])# _LT_LANG_GCJ_CONFIG</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_LANG_RC_CONFIG([TAG])</div><div class='del'>-# -------------------------</div><div class='del'>-# Ensure that the configuration variables for the Windows resource compiler</div><div class='del'>-# are suitably defined.  These variables are subsequently used by _LT_CONFIG</div><div class='del'>-# to write the compiler configuration to `libtool'.</div><div class='del'>-m4_defun([_LT_LANG_RC_CONFIG],</div><div class='del'>-[AC_REQUIRE([LT_PROG_RC])dnl</div><div class='del'>-AC_LANG_SAVE</div><div class='del'>-</div><div class='del'>-# Source file extension for RC test sources.</div><div class='del'>-ac_ext=rc</div><div class='del'>-</div><div class='del'>-# Object file extension for compiled RC test sources.</div><div class='del'>-objext=o</div><div class='del'>-_LT_TAGVAR(objext, $1)=$objext</div><div class='del'>-</div><div class='del'>-# Code to be used in simple compile tests</div><div class='del'>-lt_simple_compile_test_code='sample MENU { MENUITEM "&amp;Soup", 100, CHECKED }'</div><div class='del'>-</div><div class='del'>-# Code to be used in simple link tests</div><div class='del'>-lt_simple_link_test_code="$lt_simple_compile_test_code"</div><div class='del'>-</div><div class='del'>-# ltmain only uses $CC for tagged configurations so make sure $CC is set.</div><div class='del'>-_LT_TAG_COMPILER</div><div class='del'>-</div><div class='del'>-# save warnings/boilerplate of simple test code</div><div class='del'>-_LT_COMPILER_BOILERPLATE</div><div class='del'>-_LT_LINKER_BOILERPLATE</div><div class='del'>-</div><div class='del'>-# Allow CC to be a program name with arguments.</div><div class='del'>-lt_save_CC="$CC"</div><div class='del'>-lt_save_GCC=$GCC</div><div class='del'>-GCC=</div><div class='del'>-CC=${RC-"windres"}</div><div class='del'>-compiler=$CC</div><div class='del'>-_LT_TAGVAR(compiler, $1)=$CC</div><div class='del'>-_LT_CC_BASENAME([$compiler])</div><div class='del'>-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes</div><div class='del'>-</div><div class='del'>-if test -n "$compiler"; then</div><div class='del'>-  :</div><div class='del'>-  _LT_CONFIG($1)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-GCC=$lt_save_GCC</div><div class='del'>-AC_LANG_RESTORE</div><div class='del'>-CC="$lt_save_CC"</div><div class='del'>-])# _LT_LANG_RC_CONFIG</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# LT_PROG_GCJ</div><div class='del'>-# -----------</div><div class='del'>-AC_DEFUN([LT_PROG_GCJ],</div><div class='del'>-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],</div><div class='del'>-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],</div><div class='del'>-    [AC_CHECK_TOOL(GCJ, gcj,)</div><div class='del'>-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"</div><div class='del'>-      AC_SUBST(GCJFLAGS)])])[]dnl</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-# Old name:</div><div class='del'>-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# LT_PROG_RC</div><div class='del'>-# ----------</div><div class='del'>-AC_DEFUN([LT_PROG_RC],</div><div class='del'>-[AC_CHECK_TOOL(RC, windres,)</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-# Old name:</div><div class='del'>-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([LT_AC_PROG_RC], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_DECL_EGREP</div><div class='del'>-# --------------</div><div class='del'>-# If we don't have a new enough Autoconf to choose the best grep</div><div class='del'>-# available, choose the one first in the user's PATH.</div><div class='del'>-m4_defun([_LT_DECL_EGREP],</div><div class='del'>-[AC_REQUIRE([AC_PROG_EGREP])dnl</div><div class='del'>-AC_REQUIRE([AC_PROG_FGREP])dnl</div><div class='del'>-test -z "$GREP" &amp;&amp; GREP=grep</div><div class='del'>-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])</div><div class='del'>-_LT_DECL([], [EGREP], [1], [An ERE matcher])</div><div class='del'>-_LT_DECL([], [FGREP], [1], [A literal string matcher])</div><div class='del'>-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too</div><div class='del'>-AC_SUBST([GREP])</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_DECL_OBJDUMP</div><div class='del'>-# --------------</div><div class='del'>-# If we don't have a new enough Autoconf to choose the best objdump</div><div class='del'>-# available, choose the one first in the user's PATH.</div><div class='del'>-m4_defun([_LT_DECL_OBJDUMP],</div><div class='del'>-[AC_CHECK_TOOL(OBJDUMP, objdump, false)</div><div class='del'>-test -z "$OBJDUMP" &amp;&amp; OBJDUMP=objdump</div><div class='del'>-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])</div><div class='del'>-AC_SUBST([OBJDUMP])</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_DECL_SED</div><div class='del'>-# ------------</div><div class='del'>-# Check for a fully-functional sed program, that truncates</div><div class='del'>-# as few characters as possible.  Prefer GNU sed if found.</div><div class='del'>-m4_defun([_LT_DECL_SED],</div><div class='del'>-[AC_PROG_SED</div><div class='del'>-test -z "$SED" &amp;&amp; SED=sed</div><div class='del'>-Xsed="$SED -e 1s/^X//"</div><div class='del'>-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])</div><div class='del'>-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],</div><div class='del'>-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])</div><div class='del'>-])# _LT_DECL_SED</div><div class='del'>-</div><div class='del'>-m4_ifndef([AC_PROG_SED], [</div><div class='del'>-# NOTE: This macro has been submitted for inclusion into   #</div><div class='del'>-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #</div><div class='del'>-#  a released version of Autoconf we should remove this    #</div><div class='del'>-#  macro and use it instead.                               #</div><div class='del'>-</div><div class='del'>-m4_defun([AC_PROG_SED],</div><div class='del'>-[AC_MSG_CHECKING([for a sed that does not truncate output])</div><div class='del'>-AC_CACHE_VAL(lt_cv_path_SED,</div><div class='del'>-[# Loop through the user's path and test for sed and gsed.</div><div class='del'>-# Then use that list of sed's as ones to test for truncation.</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-  for lt_ac_prog in sed gsed; do</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then</div><div class='del'>-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"</div><div class='del'>-      fi</div><div class='del'>-    done</div><div class='del'>-  done</div><div class='del'>-done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-lt_ac_max=0</div><div class='del'>-lt_ac_count=0</div><div class='del'>-# Add /usr/xpg4/bin/sed as it is typically found on Solaris</div><div class='del'>-# along with /bin/sed that truncates output.</div><div class='del'>-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do</div><div class='del'>-  test ! -f $lt_ac_sed &amp;&amp; continue</div><div class='del'>-  cat /dev/null &gt; conftest.in</div><div class='del'>-  lt_ac_count=0</div><div class='del'>-  echo $ECHO_N "0123456789$ECHO_C" &gt;conftest.in</div><div class='del'>-  # Check for GNU sed and select it if it is found.</div><div class='del'>-  if "$lt_ac_sed" --version 2&gt;&amp;1 &lt; /dev/null | grep 'GNU' &gt; /dev/null; then</div><div class='del'>-    lt_cv_path_SED=$lt_ac_sed</div><div class='del'>-    break</div><div class='del'>-  fi</div><div class='del'>-  while true; do</div><div class='del'>-    cat conftest.in conftest.in &gt;conftest.tmp</div><div class='del'>-    mv conftest.tmp conftest.in</div><div class='del'>-    cp conftest.in conftest.nl</div><div class='del'>-    echo &gt;&gt;conftest.nl</div><div class='del'>-    $lt_ac_sed -e 's/a$//' &lt; conftest.nl &gt;conftest.out || break</div><div class='del'>-    cmp -s conftest.out conftest.nl || break</div><div class='del'>-    # 10000 chars as input seems more than enough</div><div class='del'>-    test $lt_ac_count -gt 10 &amp;&amp; break</div><div class='del'>-    lt_ac_count=`expr $lt_ac_count + 1`</div><div class='del'>-    if test $lt_ac_count -gt $lt_ac_max; then</div><div class='del'>-      lt_ac_max=$lt_ac_count</div><div class='del'>-      lt_cv_path_SED=$lt_ac_sed</div><div class='del'>-    fi</div><div class='del'>-  done</div><div class='del'>-done</div><div class='del'>-])</div><div class='del'>-SED=$lt_cv_path_SED</div><div class='del'>-AC_SUBST([SED])</div><div class='del'>-AC_MSG_RESULT([$SED])</div><div class='del'>-])#AC_PROG_SED</div><div class='del'>-])#m4_ifndef</div><div class='del'>-</div><div class='del'>-# Old name:</div><div class='del'>-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([LT_AC_PROG_SED], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_CHECK_SHELL_FEATURES</div><div class='del'>-# ------------------------</div><div class='del'>-# Find out whether the shell is Bourne or XSI compatible,</div><div class='del'>-# or has some other useful features.</div><div class='del'>-m4_defun([_LT_CHECK_SHELL_FEATURES],</div><div class='del'>-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])</div><div class='del'>-# Try some XSI features</div><div class='del'>-xsi_shell=no</div><div class='del'>-( _lt_dummy="a/b/c"</div><div class='del'>-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \</div><div class='del'>-      = c,a/b,, \</div><div class='del'>-    &amp;&amp; eval 'test $(( 1 + 1 )) -eq 2 \</div><div class='del'>-    &amp;&amp; test "${#_lt_dummy}" -eq 5' ) &gt;/dev/null 2&gt;&amp;1 \</div><div class='del'>-  &amp;&amp; xsi_shell=yes</div><div class='del'>-AC_MSG_RESULT([$xsi_shell])</div><div class='del'>-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])</div><div class='del'>-</div><div class='del'>-AC_MSG_CHECKING([whether the shell understands "+="])</div><div class='del'>-lt_shell_append=no</div><div class='del'>-( foo=bar; set foo baz; eval "$[1]+=\$[2]" &amp;&amp; test "$foo" = barbaz ) \</div><div class='del'>-    &gt;/dev/null 2&gt;&amp;1 \</div><div class='del'>-  &amp;&amp; lt_shell_append=yes</div><div class='del'>-AC_MSG_RESULT([$lt_shell_append])</div><div class='del'>-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])</div><div class='del'>-</div><div class='del'>-if ( (MAIL=60; unset MAIL) || exit) &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-  lt_unset=unset</div><div class='del'>-else</div><div class='del'>-  lt_unset=false</div><div class='del'>-fi</div><div class='del'>-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl</div><div class='del'>-</div><div class='del'>-# test EBCDIC or ASCII</div><div class='del'>-case `echo X|tr X '\101'` in</div><div class='del'>- A) # ASCII based system</div><div class='del'>-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr</div><div class='del'>-  lt_SP2NL='tr \040 \012'</div><div class='del'>-  lt_NL2SP='tr \015\012 \040\040'</div><div class='del'>-  ;;</div><div class='del'>- *) # EBCDIC based system</div><div class='del'>-  lt_SP2NL='tr \100 \n'</div><div class='del'>-  lt_NL2SP='tr \r\n \100\100'</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl</div><div class='del'>-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl</div><div class='del'>-])# _LT_CHECK_SHELL_FEATURES</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_PROG_XSI_SHELLFNS</div><div class='del'>-# ---------------------</div><div class='del'>-# Bourne and XSI compatible variants of some useful shell functions.</div><div class='del'>-m4_defun([_LT_PROG_XSI_SHELLFNS],</div><div class='del'>-[case $xsi_shell in</div><div class='del'>-  yes)</div><div class='del'>-    cat &lt;&lt; \_LT_EOF &gt;&gt; "$cfgfile"</div><div class='del'>-</div><div class='del'>-# func_dirname file append nondir_replacement</div><div class='del'>-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,</div><div class='del'>-# otherwise set result to NONDIR_REPLACEMENT.</div><div class='del'>-func_dirname ()</div><div class='del'>-{</div><div class='del'>-  case ${1} in</div><div class='del'>-    */*) func_dirname_result="${1%/*}${2}" ;;</div><div class='del'>-    *  ) func_dirname_result="${3}" ;;</div><div class='del'>-  esac</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_basename file</div><div class='del'>-func_basename ()</div><div class='del'>-{</div><div class='del'>-  func_basename_result="${1##*/}"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_dirname_and_basename file append nondir_replacement</div><div class='del'>-# perform func_basename and func_dirname in a single function</div><div class='del'>-# call:</div><div class='del'>-#   dirname:  Compute the dirname of FILE.  If nonempty,</div><div class='del'>-#             add APPEND to the result, otherwise set result</div><div class='del'>-#             to NONDIR_REPLACEMENT.</div><div class='del'>-#             value returned in "$func_dirname_result"</div><div class='del'>-#   basename: Compute filename of FILE.</div><div class='del'>-#             value retuned in "$func_basename_result"</div><div class='del'>-# Implementation must be kept synchronized with func_dirname</div><div class='del'>-# and func_basename. For efficiency, we do not delegate to</div><div class='del'>-# those functions but instead duplicate the functionality here.</div><div class='del'>-func_dirname_and_basename ()</div><div class='del'>-{</div><div class='del'>-  case ${1} in</div><div class='del'>-    */*) func_dirname_result="${1%/*}${2}" ;;</div><div class='del'>-    *  ) func_dirname_result="${3}" ;;</div><div class='del'>-  esac</div><div class='del'>-  func_basename_result="${1##*/}"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_stripname prefix suffix name</div><div class='del'>-# strip PREFIX and SUFFIX off of NAME.</div><div class='del'>-# PREFIX and SUFFIX must not contain globbing or regex special</div><div class='del'>-# characters, hashes, percent signs, but SUFFIX may contain a leading</div><div class='del'>-# dot (in which case that matches only a dot).</div><div class='del'>-func_stripname ()</div><div class='del'>-{</div><div class='del'>-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are</div><div class='del'>-  # positional parameters, so assign one to ordinary parameter first.</div><div class='del'>-  func_stripname_result=${3}</div><div class='del'>-  func_stripname_result=${func_stripname_result#"${1}"}</div><div class='del'>-  func_stripname_result=${func_stripname_result%"${2}"}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_opt_split</div><div class='del'>-func_opt_split ()</div><div class='del'>-{</div><div class='del'>-  func_opt_split_opt=${1%%=*}</div><div class='del'>-  func_opt_split_arg=${1#*=}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_lo2o object</div><div class='del'>-func_lo2o ()</div><div class='del'>-{</div><div class='del'>-  case ${1} in</div><div class='del'>-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;</div><div class='del'>-    *)    func_lo2o_result=${1} ;;</div><div class='del'>-  esac</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_xform libobj-or-source</div><div class='del'>-func_xform ()</div><div class='del'>-{</div><div class='del'>-  func_xform_result=${1%.*}.lo</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_arith arithmetic-term...</div><div class='del'>-func_arith ()</div><div class='del'>-{</div><div class='del'>-  func_arith_result=$(( $[*] ))</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_len string</div><div class='del'>-# STRING may not start with a hyphen.</div><div class='del'>-func_len ()</div><div class='del'>-{</div><div class='del'>-  func_len_result=${#1}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-    ;;</div><div class='del'>-  *) # Bourne compatible functions.</div><div class='del'>-    cat &lt;&lt; \_LT_EOF &gt;&gt; "$cfgfile"</div><div class='del'>-</div><div class='del'>-# func_dirname file append nondir_replacement</div><div class='del'>-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,</div><div class='del'>-# otherwise set result to NONDIR_REPLACEMENT.</div><div class='del'>-func_dirname ()</div><div class='del'>-{</div><div class='del'>-  # Extract subdirectory from the argument.</div><div class='del'>-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`</div><div class='del'>-  if test "X$func_dirname_result" = "X${1}"; then</div><div class='del'>-    func_dirname_result="${3}"</div><div class='del'>-  else</div><div class='del'>-    func_dirname_result="$func_dirname_result${2}"</div><div class='del'>-  fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_basename file</div><div class='del'>-func_basename ()</div><div class='del'>-{</div><div class='del'>-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-dnl func_dirname_and_basename</div><div class='del'>-dnl A portable version of this function is already defined in general.m4sh</div><div class='del'>-dnl so there is no need for it here.</div><div class='del'>-</div><div class='del'>-# func_stripname prefix suffix name</div><div class='del'>-# strip PREFIX and SUFFIX off of NAME.</div><div class='del'>-# PREFIX and SUFFIX must not contain globbing or regex special</div><div class='del'>-# characters, hashes, percent signs, but SUFFIX may contain a leading</div><div class='del'>-# dot (in which case that matches only a dot).</div><div class='del'>-# func_strip_suffix prefix name</div><div class='del'>-func_stripname ()</div><div class='del'>-{</div><div class='del'>-  case ${2} in</div><div class='del'>-    .*) func_stripname_result=`$ECHO "X${3}" \</div><div class='del'>-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;</div><div class='del'>-    *)  func_stripname_result=`$ECHO "X${3}" \</div><div class='del'>-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;</div><div class='del'>-  esac</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# sed scripts:</div><div class='del'>-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'</div><div class='del'>-my_sed_long_arg='1s/^-[[^=]]*=//'</div><div class='del'>-</div><div class='del'>-# func_opt_split</div><div class='del'>-func_opt_split ()</div><div class='del'>-{</div><div class='del'>-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`</div><div class='del'>-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_lo2o object</div><div class='del'>-func_lo2o ()</div><div class='del'>-{</div><div class='del'>-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_xform libobj-or-source</div><div class='del'>-func_xform ()</div><div class='del'>-{</div><div class='del'>-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_arith arithmetic-term...</div><div class='del'>-func_arith ()</div><div class='del'>-{</div><div class='del'>-  func_arith_result=`expr "$[@]"`</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_len string</div><div class='del'>-# STRING may not start with a hyphen.</div><div class='del'>-func_len ()</div><div class='del'>-{</div><div class='del'>-  func_len_result=`expr "$[1]" : ".*" 2&gt;/dev/null || echo $max_cmd_len`</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-case $lt_shell_append in</div><div class='del'>-  yes)</div><div class='del'>-    cat &lt;&lt; \_LT_EOF &gt;&gt; "$cfgfile"</div><div class='del'>-</div><div class='del'>-# func_append var value</div><div class='del'>-# Append VALUE to the end of shell variable VAR.</div><div class='del'>-func_append ()</div><div class='del'>-{</div><div class='del'>-  eval "$[1]+=\$[2]"</div><div class='del'>-}</div><div class='del'>-_LT_EOF</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    cat &lt;&lt; \_LT_EOF &gt;&gt; "$cfgfile"</div><div class='del'>-</div><div class='del'>-# func_append var value</div><div class='del'>-# Append VALUE to the end of shell variable VAR.</div><div class='del'>-func_append ()</div><div class='del'>-{</div><div class='del'>-  eval "$[1]=\$$[1]\$[2]"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-# Helper functions for option handling.                    -*- Autoconf -*-</div><div class='del'>-#</div><div class='del'>-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.</div><div class='del'>-#   Written by Gary V. Vaughan, 2004</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation gives</div><div class='del'>-# unlimited permission to copy and/or distribute it, with or without</div><div class='del'>-# modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# serial 6 ltoptions.m4</div><div class='del'>-</div><div class='del'>-# This is to help aclocal find these macros, as it can't see m4_define.</div><div class='del'>-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)</div><div class='del'>-# ------------------------------------------</div><div class='del'>-m4_define([_LT_MANGLE_OPTION],</div><div class='del'>-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)</div><div class='del'>-# ---------------------------------------</div><div class='del'>-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a</div><div class='del'>-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are</div><div class='del'>-# saved as a flag.</div><div class='del'>-m4_define([_LT_SET_OPTION],</div><div class='del'>-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl</div><div class='del'>-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),</div><div class='del'>-        _LT_MANGLE_DEFUN([$1], [$2]),</div><div class='del'>-    [m4_warning([Unknown $1 option `$2'])])[]dnl</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])</div><div class='del'>-# ------------------------------------------------------------</div><div class='del'>-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.</div><div class='del'>-m4_define([_LT_IF_OPTION],</div><div class='del'>-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)</div><div class='del'>-# -------------------------------------------------------</div><div class='del'>-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME</div><div class='del'>-# are set.</div><div class='del'>-m4_define([_LT_UNLESS_OPTIONS],</div><div class='del'>-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),</div><div class='del'>-	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),</div><div class='del'>-		      [m4_define([$0_found])])])[]dnl</div><div class='del'>-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3</div><div class='del'>-])[]dnl</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)</div><div class='del'>-# ----------------------------------------</div><div class='del'>-# OPTION-LIST is a space-separated list of Libtool options associated</div><div class='del'>-# with MACRO-NAME.  If any OPTION has a matching handler declared with</div><div class='del'>-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about</div><div class='del'>-# the unknown option and exit.</div><div class='del'>-m4_defun([_LT_SET_OPTIONS],</div><div class='del'>-[# Set options</div><div class='del'>-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),</div><div class='del'>-    [_LT_SET_OPTION([$1], _LT_Option)])</div><div class='del'>-</div><div class='del'>-m4_if([$1],[LT_INIT],[</div><div class='del'>-  dnl</div><div class='del'>-  dnl Simply set some default values (i.e off) if boolean options were not</div><div class='del'>-  dnl specified:</div><div class='del'>-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no</div><div class='del'>-  ])</div><div class='del'>-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no</div><div class='del'>-  ])</div><div class='del'>-  dnl</div><div class='del'>-  dnl If no reference was made to various pairs of opposing options, then</div><div class='del'>-  dnl we run the default mode handler for the pair.  For example, if neither</div><div class='del'>-  dnl `shared' nor `disable-shared' was passed, we enable building of shared</div><div class='del'>-  dnl archives by default:</div><div class='del'>-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])</div><div class='del'>-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])</div><div class='del'>-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])</div><div class='del'>-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],</div><div class='del'>-  		   [_LT_ENABLE_FAST_INSTALL])</div><div class='del'>-  ])</div><div class='del'>-])# _LT_SET_OPTIONS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)</div><div class='del'>-# -----------------------------------------</div><div class='del'>-m4_define([_LT_MANGLE_DEFUN],</div><div class='del'>-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)</div><div class='del'>-# -----------------------------------------------</div><div class='del'>-m4_define([LT_OPTION_DEFINE],</div><div class='del'>-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl</div><div class='del'>-])# LT_OPTION_DEFINE</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# dlopen</div><div class='del'>-# ------</div><div class='del'>-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-AU_DEFUN([AC_LIBTOOL_DLOPEN],</div><div class='del'>-[_LT_SET_OPTION([LT_INIT], [dlopen])</div><div class='del'>-AC_DIAGNOSE([obsolete],</div><div class='del'>-[$0: Remove this warning and the call to _LT_SET_OPTION when you</div><div class='del'>-put the `dlopen' option into LT_INIT's first parameter.])</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# win32-dll</div><div class='del'>-# ---------</div><div class='del'>-# Declare package support for building win32 dll's.</div><div class='del'>-LT_OPTION_DEFINE([LT_INIT], [win32-dll],</div><div class='del'>-[enable_win32_dll=yes</div><div class='del'>-</div><div class='del'>-case $host in</div><div class='del'>-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)</div><div class='del'>-  AC_CHECK_TOOL(AS, as, false)</div><div class='del'>-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)</div><div class='del'>-  AC_CHECK_TOOL(OBJDUMP, objdump, false)</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-test -z "$AS" &amp;&amp; AS=as</div><div class='del'>-_LT_DECL([], [AS],      [0], [Assembler program])dnl</div><div class='del'>-</div><div class='del'>-test -z "$DLLTOOL" &amp;&amp; DLLTOOL=dlltool</div><div class='del'>-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl</div><div class='del'>-</div><div class='del'>-test -z "$OBJDUMP" &amp;&amp; OBJDUMP=objdump</div><div class='del'>-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl</div><div class='del'>-])# win32-dll</div><div class='del'>-</div><div class='del'>-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],</div><div class='del'>-[AC_REQUIRE([AC_CANONICAL_HOST])dnl</div><div class='del'>-_LT_SET_OPTION([LT_INIT], [win32-dll])</div><div class='del'>-AC_DIAGNOSE([obsolete],</div><div class='del'>-[$0: Remove this warning and the call to _LT_SET_OPTION when you</div><div class='del'>-put the `win32-dll' option into LT_INIT's first parameter.])</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_ENABLE_SHARED([DEFAULT])</div><div class='del'>-# ----------------------------</div><div class='del'>-# implement the --enable-shared flag, and supports the `shared' and</div><div class='del'>-# `disable-shared' LT_INIT options.</div><div class='del'>-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.</div><div class='del'>-m4_define([_LT_ENABLE_SHARED],</div><div class='del'>-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl</div><div class='del'>-AC_ARG_ENABLE([shared],</div><div class='del'>-    [AS_HELP_STRING([--enable-shared@&lt;:@=PKGS@:&gt;@],</div><div class='del'>-	[build shared libraries @&lt;:@default=]_LT_ENABLE_SHARED_DEFAULT[@:&gt;@])],</div><div class='del'>-    [p=${PACKAGE-default}</div><div class='del'>-    case $enableval in</div><div class='del'>-    yes) enable_shared=yes ;;</div><div class='del'>-    no) enable_shared=no ;;</div><div class='del'>-    *)</div><div class='del'>-      enable_shared=no</div><div class='del'>-      # Look at the argument we got.  We use all the common list separators.</div><div class='del'>-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"</div><div class='del'>-      for pkg in $enableval; do</div><div class='del'>-	IFS="$lt_save_ifs"</div><div class='del'>-	if test "X$pkg" = "X$p"; then</div><div class='del'>-	  enable_shared=yes</div><div class='del'>-	fi</div><div class='del'>-      done</div><div class='del'>-      IFS="$lt_save_ifs"</div><div class='del'>-      ;;</div><div class='del'>-    esac],</div><div class='del'>-    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)</div><div class='del'>-</div><div class='del'>-    _LT_DECL([build_libtool_libs], [enable_shared], [0],</div><div class='del'>-	[Whether or not to build shared libraries])</div><div class='del'>-])# _LT_ENABLE_SHARED</div><div class='del'>-</div><div class='del'>-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])</div><div class='del'>-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])</div><div class='del'>-</div><div class='del'>-# Old names:</div><div class='del'>-AC_DEFUN([AC_ENABLE_SHARED],</div><div class='del'>-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-AC_DEFUN([AC_DISABLE_SHARED],</div><div class='del'>-[_LT_SET_OPTION([LT_INIT], [disable-shared])</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])</div><div class='del'>-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])</div><div class='del'>-</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([AM_ENABLE_SHARED], [])</div><div class='del'>-dnl AC_DEFUN([AM_DISABLE_SHARED], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_ENABLE_STATIC([DEFAULT])</div><div class='del'>-# ----------------------------</div><div class='del'>-# implement the --enable-static flag, and support the `static' and</div><div class='del'>-# `disable-static' LT_INIT options.</div><div class='del'>-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.</div><div class='del'>-m4_define([_LT_ENABLE_STATIC],</div><div class='del'>-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl</div><div class='del'>-AC_ARG_ENABLE([static],</div><div class='del'>-    [AS_HELP_STRING([--enable-static@&lt;:@=PKGS@:&gt;@],</div><div class='del'>-	[build static libraries @&lt;:@default=]_LT_ENABLE_STATIC_DEFAULT[@:&gt;@])],</div><div class='del'>-    [p=${PACKAGE-default}</div><div class='del'>-    case $enableval in</div><div class='del'>-    yes) enable_static=yes ;;</div><div class='del'>-    no) enable_static=no ;;</div><div class='del'>-    *)</div><div class='del'>-     enable_static=no</div><div class='del'>-      # Look at the argument we got.  We use all the common list separators.</div><div class='del'>-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"</div><div class='del'>-      for pkg in $enableval; do</div><div class='del'>-	IFS="$lt_save_ifs"</div><div class='del'>-	if test "X$pkg" = "X$p"; then</div><div class='del'>-	  enable_static=yes</div><div class='del'>-	fi</div><div class='del'>-      done</div><div class='del'>-      IFS="$lt_save_ifs"</div><div class='del'>-      ;;</div><div class='del'>-    esac],</div><div class='del'>-    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)</div><div class='del'>-</div><div class='del'>-    _LT_DECL([build_old_libs], [enable_static], [0],</div><div class='del'>-	[Whether or not to build static libraries])</div><div class='del'>-])# _LT_ENABLE_STATIC</div><div class='del'>-</div><div class='del'>-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])</div><div class='del'>-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])</div><div class='del'>-</div><div class='del'>-# Old names:</div><div class='del'>-AC_DEFUN([AC_ENABLE_STATIC],</div><div class='del'>-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-AC_DEFUN([AC_DISABLE_STATIC],</div><div class='del'>-[_LT_SET_OPTION([LT_INIT], [disable-static])</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])</div><div class='del'>-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])</div><div class='del'>-</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([AM_ENABLE_STATIC], [])</div><div class='del'>-dnl AC_DEFUN([AM_DISABLE_STATIC], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_ENABLE_FAST_INSTALL([DEFAULT])</div><div class='del'>-# ----------------------------------</div><div class='del'>-# implement the --enable-fast-install flag, and support the `fast-install'</div><div class='del'>-# and `disable-fast-install' LT_INIT options.</div><div class='del'>-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.</div><div class='del'>-m4_define([_LT_ENABLE_FAST_INSTALL],</div><div class='del'>-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl</div><div class='del'>-AC_ARG_ENABLE([fast-install],</div><div class='del'>-    [AS_HELP_STRING([--enable-fast-install@&lt;:@=PKGS@:&gt;@],</div><div class='del'>-    [optimize for fast installation @&lt;:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:&gt;@])],</div><div class='del'>-    [p=${PACKAGE-default}</div><div class='del'>-    case $enableval in</div><div class='del'>-    yes) enable_fast_install=yes ;;</div><div class='del'>-    no) enable_fast_install=no ;;</div><div class='del'>-    *)</div><div class='del'>-      enable_fast_install=no</div><div class='del'>-      # Look at the argument we got.  We use all the common list separators.</div><div class='del'>-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"</div><div class='del'>-      for pkg in $enableval; do</div><div class='del'>-	IFS="$lt_save_ifs"</div><div class='del'>-	if test "X$pkg" = "X$p"; then</div><div class='del'>-	  enable_fast_install=yes</div><div class='del'>-	fi</div><div class='del'>-      done</div><div class='del'>-      IFS="$lt_save_ifs"</div><div class='del'>-      ;;</div><div class='del'>-    esac],</div><div class='del'>-    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)</div><div class='del'>-</div><div class='del'>-_LT_DECL([fast_install], [enable_fast_install], [0],</div><div class='del'>-	 [Whether or not to optimize for fast installation])dnl</div><div class='del'>-])# _LT_ENABLE_FAST_INSTALL</div><div class='del'>-</div><div class='del'>-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])</div><div class='del'>-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])</div><div class='del'>-</div><div class='del'>-# Old names:</div><div class='del'>-AU_DEFUN([AC_ENABLE_FAST_INSTALL],</div><div class='del'>-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])</div><div class='del'>-AC_DIAGNOSE([obsolete],</div><div class='del'>-[$0: Remove this warning and the call to _LT_SET_OPTION when you put</div><div class='del'>-the `fast-install' option into LT_INIT's first parameter.])</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-AU_DEFUN([AC_DISABLE_FAST_INSTALL],</div><div class='del'>-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])</div><div class='del'>-AC_DIAGNOSE([obsolete],</div><div class='del'>-[$0: Remove this warning and the call to _LT_SET_OPTION when you put</div><div class='del'>-the `disable-fast-install' option into LT_INIT's first parameter.])</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])</div><div class='del'>-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _LT_WITH_PIC([MODE])</div><div class='del'>-# --------------------</div><div class='del'>-# implement the --with-pic flag, and support the `pic-only' and `no-pic'</div><div class='del'>-# LT_INIT options.</div><div class='del'>-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.</div><div class='del'>-m4_define([_LT_WITH_PIC],</div><div class='del'>-[AC_ARG_WITH([pic],</div><div class='del'>-    [AS_HELP_STRING([--with-pic],</div><div class='del'>-	[try to use only PIC/non-PIC objects @&lt;:@default=use both@:&gt;@])],</div><div class='del'>-    [pic_mode="$withval"],</div><div class='del'>-    [pic_mode=default])</div><div class='del'>-</div><div class='del'>-test -z "$pic_mode" &amp;&amp; pic_mode=m4_default([$1], [default])</div><div class='del'>-</div><div class='del'>-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl</div><div class='del'>-])# _LT_WITH_PIC</div><div class='del'>-</div><div class='del'>-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])</div><div class='del'>-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])</div><div class='del'>-</div><div class='del'>-# Old name:</div><div class='del'>-AU_DEFUN([AC_LIBTOOL_PICMODE],</div><div class='del'>-[_LT_SET_OPTION([LT_INIT], [pic-only])</div><div class='del'>-AC_DIAGNOSE([obsolete],</div><div class='del'>-[$0: Remove this warning and the call to _LT_SET_OPTION when you</div><div class='del'>-put the `pic-only' option into LT_INIT's first parameter.])</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-dnl aclocal-1.4 backwards compatibility:</div><div class='del'>-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-m4_define([_LTDL_MODE], [])</div><div class='del'>-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],</div><div class='del'>-		 [m4_define([_LTDL_MODE], [nonrecursive])])</div><div class='del'>-LT_OPTION_DEFINE([LTDL_INIT], [recursive],</div><div class='del'>-		 [m4_define([_LTDL_MODE], [recursive])])</div><div class='del'>-LT_OPTION_DEFINE([LTDL_INIT], [subproject],</div><div class='del'>-		 [m4_define([_LTDL_MODE], [subproject])])</div><div class='del'>-</div><div class='del'>-m4_define([_LTDL_TYPE], [])</div><div class='del'>-LT_OPTION_DEFINE([LTDL_INIT], [installable],</div><div class='del'>-		 [m4_define([_LTDL_TYPE], [installable])])</div><div class='del'>-LT_OPTION_DEFINE([LTDL_INIT], [convenience],</div><div class='del'>-		 [m4_define([_LTDL_TYPE], [convenience])])</div><div class='del'>-</div><div class='del'>-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-</div><div class='del'>-#</div><div class='del'>-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.</div><div class='del'>-# Written by Gary V. Vaughan, 2004</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation gives</div><div class='del'>-# unlimited permission to copy and/or distribute it, with or without</div><div class='del'>-# modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# serial 6 ltsugar.m4</div><div class='del'>-</div><div class='del'>-# This is to help aclocal find these macros, as it can't see m4_define.</div><div class='del'>-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# lt_join(SEP, ARG1, [ARG2...])</div><div class='del'>-# -----------------------------</div><div class='del'>-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their</div><div class='del'>-# associated separator.</div><div class='del'>-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier</div><div class='del'>-# versions in m4sugar had bugs.</div><div class='del'>-m4_define([lt_join],</div><div class='del'>-[m4_if([$#], [1], [],</div><div class='del'>-       [$#], [2], [[$2]],</div><div class='del'>-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])</div><div class='del'>-m4_define([_lt_join],</div><div class='del'>-[m4_if([$#$2], [2], [],</div><div class='del'>-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# lt_car(LIST)</div><div class='del'>-# lt_cdr(LIST)</div><div class='del'>-# ------------</div><div class='del'>-# Manipulate m4 lists.</div><div class='del'>-# These macros are necessary as long as will still need to support</div><div class='del'>-# Autoconf-2.59 which quotes differently.</div><div class='del'>-m4_define([lt_car], [[$1]])</div><div class='del'>-m4_define([lt_cdr],</div><div class='del'>-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],</div><div class='del'>-       [$#], 1, [],</div><div class='del'>-       [m4_dquote(m4_shift($@))])])</div><div class='del'>-m4_define([lt_unquote], $1)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# lt_append(MACRO-NAME, STRING, [SEPARATOR])</div><div class='del'>-# ------------------------------------------</div><div class='del'>-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.</div><div class='del'>-# Note that neither SEPARATOR nor STRING are expanded; they are appended</div><div class='del'>-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).</div><div class='del'>-# No SEPARATOR is output if MACRO-NAME was previously undefined (different</div><div class='del'>-# than defined and empty).</div><div class='del'>-#</div><div class='del'>-# This macro is needed until we can rely on Autoconf 2.62, since earlier</div><div class='del'>-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.</div><div class='del'>-m4_define([lt_append],</div><div class='del'>-[m4_define([$1],</div><div class='del'>-	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])</div><div class='del'>-# ----------------------------------------------------------</div><div class='del'>-# Produce a SEP delimited list of all paired combinations of elements of</div><div class='del'>-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list</div><div class='del'>-# has the form PREFIXmINFIXSUFFIXn.</div><div class='del'>-# Needed until we can rely on m4_combine added in Autoconf 2.62.</div><div class='del'>-m4_define([lt_combine],</div><div class='del'>-[m4_if(m4_eval([$# &gt; 3]), [1],</div><div class='del'>-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl</div><div class='del'>-[[m4_foreach([_Lt_prefix], [$2],</div><div class='del'>-	     [m4_foreach([_Lt_suffix],</div><div class='del'>-		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,</div><div class='del'>-	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])</div><div class='del'>-# -----------------------------------------------------------------------</div><div class='del'>-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited</div><div class='del'>-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.</div><div class='del'>-m4_define([lt_if_append_uniq],</div><div class='del'>-[m4_ifdef([$1],</div><div class='del'>-	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],</div><div class='del'>-		 [lt_append([$1], [$2], [$3])$4],</div><div class='del'>-		 [$5])],</div><div class='del'>-	  [lt_append([$1], [$2], [$3])$4])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# lt_dict_add(DICT, KEY, VALUE)</div><div class='del'>-# -----------------------------</div><div class='del'>-m4_define([lt_dict_add],</div><div class='del'>-[m4_define([$1($2)], [$3])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)</div><div class='del'>-# --------------------------------------------</div><div class='del'>-m4_define([lt_dict_add_subkey],</div><div class='del'>-[m4_define([$1($2:$3)], [$4])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# lt_dict_fetch(DICT, KEY, [SUBKEY])</div><div class='del'>-# ----------------------------------</div><div class='del'>-m4_define([lt_dict_fetch],</div><div class='del'>-[m4_ifval([$3],</div><div class='del'>-	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),</div><div class='del'>-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])</div><div class='del'>-# -----------------------------------------------------------------</div><div class='del'>-m4_define([lt_if_dict_fetch],</div><div class='del'>-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],</div><div class='del'>-	[$5],</div><div class='del'>-    [$6])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])</div><div class='del'>-# --------------------------------------------------------------</div><div class='del'>-m4_define([lt_dict_filter],</div><div class='del'>-[m4_if([$5], [], [],</div><div class='del'>-  [lt_join(m4_quote(m4_default([$4], [[, ]])),</div><div class='del'>-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),</div><div class='del'>-		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-# ltversion.m4 -- version numbers			-*- Autoconf -*-</div><div class='del'>-#</div><div class='del'>-#   Copyright (C) 2004 Free Software Foundation, Inc.</div><div class='del'>-#   Written by Scott James Remnant, 2004</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation gives</div><div class='del'>-# unlimited permission to copy and/or distribute it, with or without</div><div class='del'>-# modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# Generated from ltversion.in.</div><div class='del'>-</div><div class='del'>-# serial 3017 ltversion.m4</div><div class='del'>-# This file is part of GNU Libtool</div><div class='del'>-</div><div class='del'>-m4_define([LT_PACKAGE_VERSION], [2.2.6b])</div><div class='del'>-m4_define([LT_PACKAGE_REVISION], [1.3017])</div><div class='del'>-</div><div class='del'>-AC_DEFUN([LTVERSION_VERSION],</div><div class='del'>-[macro_version='2.2.6b'</div><div class='del'>-macro_revision='1.3017'</div><div class='del'>-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])</div><div class='del'>-_LT_DECL(, macro_revision, 0)</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-</div><div class='del'>-#</div><div class='del'>-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.</div><div class='del'>-#   Written by Scott James Remnant, 2004.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation gives</div><div class='del'>-# unlimited permission to copy and/or distribute it, with or without</div><div class='del'>-# modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# serial 4 lt~obsolete.m4</div><div class='del'>-</div><div class='del'>-# These exist entirely to fool aclocal when bootstrapping libtool.</div><div class='del'>-#</div><div class='del'>-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)</div><div class='del'>-# which have later been changed to m4_define as they aren't part of the</div><div class='del'>-# exported API, or moved to Autoconf or Automake where they belong.</div><div class='del'>-#</div><div class='del'>-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN</div><div class='del'>-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us</div><div class='del'>-# using a macro with the same name in our local m4/libtool.m4 it'll</div><div class='del'>-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define</div><div class='del'>-# and doesn't know about Autoconf macros at all.)</div><div class='del'>-#</div><div class='del'>-# So we provide this file, which has a silly filename so it's always</div><div class='del'>-# included after everything else.  This provides aclocal with the</div><div class='del'>-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything</div><div class='del'>-# because those macros already exist, or will be overwritten later.</div><div class='del'>-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. </div><div class='del'>-#</div><div class='del'>-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.</div><div class='del'>-# Yes, that means every name once taken will need to remain here until</div><div class='del'>-# we give up compatibility with versions before 1.7, at which point</div><div class='del'>-# we need to keep only those names which we still refer to.</div><div class='del'>-</div><div class='del'>-# This is to help aclocal find these macros, as it can't see m4_define.</div><div class='del'>-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])</div><div class='del'>-</div><div class='del'>-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])</div><div class='del'>-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])</div><div class='del'>-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])</div><div class='del'>-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])</div><div class='del'>-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])</div><div class='del'>-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])</div><div class='del'>-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])</div><div class='del'>-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])</div><div class='del'>-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])</div><div class='del'>-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])</div><div class='del'>-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])</div><div class='del'>-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])</div><div class='del'>-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])</div><div class='del'>-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])</div><div class='del'>-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])</div><div class='del'>-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])</div><div class='del'>-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])</div><div class='del'>-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])</div><div class='del'>-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])</div><div class='del'>-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])</div><div class='del'>-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])</div><div class='del'>-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])</div><div class='del'>-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])</div><div class='del'>-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])</div><div class='del'>-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])</div><div class='del'>-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])</div><div class='del'>-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])</div><div class='del'>-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])</div><div class='del'>-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])</div><div class='del'>-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])</div><div class='del'>-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])</div><div class='del'>-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])</div><div class='del'>-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])</div><div class='del'>-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])</div><div class='del'>-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])</div><div class='del'>-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])</div><div class='del'>-</div><div class='del'>-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# AM_AUTOMAKE_VERSION(VERSION)</div><div class='del'>-# ----------------------------</div><div class='del'>-# Automake X.Y traces this macro to ensure aclocal.m4 has been</div><div class='del'>-# generated from the m4 files accompanying Automake X.Y.</div><div class='del'>-# (This private macro should not be called outside this file.)</div><div class='del'>-AC_DEFUN([AM_AUTOMAKE_VERSION],</div><div class='del'>-[am__api_version='1.11'</div><div class='del'>-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to</div><div class='del'>-dnl require some minimum version.  Point them to the right macro.</div><div class='del'>-m4_if([$1], [1.11], [],</div><div class='del'>-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-# _AM_AUTOCONF_VERSION(VERSION)</div><div class='del'>-# -----------------------------</div><div class='del'>-# aclocal traces this macro to find the Autoconf version.</div><div class='del'>-# This is a private macro too.  Using m4_define simplifies</div><div class='del'>-# the logic in aclocal, which can simply ignore this definition.</div><div class='del'>-m4_define([_AM_AUTOCONF_VERSION], [])</div><div class='del'>-</div><div class='del'>-# AM_SET_CURRENT_AUTOMAKE_VERSION</div><div class='del'>-# -------------------------------</div><div class='del'>-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.</div><div class='del'>-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.</div><div class='del'>-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],</div><div class='del'>-[AM_AUTOMAKE_VERSION([1.11])dnl</div><div class='del'>-m4_ifndef([AC_AUTOCONF_VERSION],</div><div class='del'>-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl</div><div class='del'>-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])</div><div class='del'>-</div><div class='del'>-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-</div><div class='del'>-</div><div class='del'>-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets</div><div class='del'>-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to</div><div class='del'>-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.</div><div class='del'>-#</div><div class='del'>-# Of course, Automake must honor this variable whenever it calls a</div><div class='del'>-# tool from the auxiliary directory.  The problem is that $srcdir (and</div><div class='del'>-# therefore $ac_aux_dir as well) can be either absolute or relative,</div><div class='del'>-# depending on how configure is run.  This is pretty annoying, since</div><div class='del'>-# it makes $ac_aux_dir quite unusable in subdirectories: in the top</div><div class='del'>-# source directory, any form will work fine, but in subdirectories a</div><div class='del'>-# relative path needs to be adjusted first.</div><div class='del'>-#</div><div class='del'>-# $ac_aux_dir/missing</div><div class='del'>-#    fails when called from a subdirectory if $ac_aux_dir is relative</div><div class='del'>-# $top_srcdir/$ac_aux_dir/missing</div><div class='del'>-#    fails if $ac_aux_dir is absolute,</div><div class='del'>-#    fails when called from a subdirectory in a VPATH build with</div><div class='del'>-#          a relative $ac_aux_dir</div><div class='del'>-#</div><div class='del'>-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir</div><div class='del'>-# are both prefixed by $srcdir.  In an in-source build this is usually</div><div class='del'>-# harmless because $srcdir is `.', but things will broke when you</div><div class='del'>-# start a VPATH build or use an absolute $srcdir.</div><div class='del'>-#</div><div class='del'>-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,</div><div class='del'>-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:</div><div class='del'>-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`</div><div class='del'>-# and then we would define $MISSING as</div><div class='del'>-#   MISSING="\${SHELL} $am_aux_dir/missing"</div><div class='del'>-# This will work as long as MISSING is not called from configure, because</div><div class='del'>-# unfortunately $(top_srcdir) has no meaning in configure.</div><div class='del'>-# However there are other variables, like CC, which are often used in</div><div class='del'>-# configure, and could therefore not use this "fixed" $ac_aux_dir.</div><div class='del'>-#</div><div class='del'>-# Another solution, used here, is to always expand $ac_aux_dir to an</div><div class='del'>-# absolute PATH.  The drawback is that using absolute paths prevent a</div><div class='del'>-# configured tree to be moved without reconfiguration.</div><div class='del'>-</div><div class='del'>-AC_DEFUN([AM_AUX_DIR_EXPAND],</div><div class='del'>-[dnl Rely on autoconf to set up CDPATH properly.</div><div class='del'>-AC_PREREQ([2.50])dnl</div><div class='del'>-# expand $ac_aux_dir to an absolute path</div><div class='del'>-am_aux_dir=`cd $ac_aux_dir &amp;&amp; pwd`</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-# AM_CONDITIONAL                                            -*- Autoconf -*-</div><div class='del'>-</div><div class='del'>-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008</div><div class='del'>-# Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# serial 9</div><div class='del'>-</div><div class='del'>-# AM_CONDITIONAL(NAME, SHELL-CONDITION)</div><div class='del'>-# -------------------------------------</div><div class='del'>-# Define a conditional.</div><div class='del'>-AC_DEFUN([AM_CONDITIONAL],</div><div class='del'>-[AC_PREREQ(2.52)dnl</div><div class='del'>- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],</div><div class='del'>-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl</div><div class='del'>-AC_SUBST([$1_TRUE])dnl</div><div class='del'>-AC_SUBST([$1_FALSE])dnl</div><div class='del'>-_AM_SUBST_NOTMAKE([$1_TRUE])dnl</div><div class='del'>-_AM_SUBST_NOTMAKE([$1_FALSE])dnl</div><div class='del'>-m4_define([_AM_COND_VALUE_$1], [$2])dnl</div><div class='del'>-if $2; then</div><div class='del'>-  $1_TRUE=</div><div class='del'>-  $1_FALSE='#'</div><div class='del'>-else</div><div class='del'>-  $1_TRUE='#'</div><div class='del'>-  $1_FALSE=</div><div class='del'>-fi</div><div class='del'>-AC_CONFIG_COMMANDS_PRE(</div><div class='del'>-[if test -z "${$1_TRUE}" &amp;&amp; test -z "${$1_FALSE}"; then</div><div class='del'>-  AC_MSG_ERROR([[conditional "$1" was never defined.</div><div class='del'>-Usually this means the macro was only invoked conditionally.]])</div><div class='del'>-fi])])</div><div class='del'>-</div><div class='del'>-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009</div><div class='del'>-# Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# serial 10</div><div class='del'>-</div><div class='del'>-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be</div><div class='del'>-# written in clear, in which case automake, when reading aclocal.m4,</div><div class='del'>-# will think it sees a *use*, and therefore will trigger all it's</div><div class='del'>-# C support machinery.  Also note that it means that autoscan, seeing</div><div class='del'>-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# _AM_DEPENDENCIES(NAME)</div><div class='del'>-# ----------------------</div><div class='del'>-# See how the compiler implements dependency checking.</div><div class='del'>-# NAME is "CC", "CXX", "GCJ", or "OBJC".</div><div class='del'>-# We try a few techniques and use that to set a single cache variable.</div><div class='del'>-#</div><div class='del'>-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was</div><div class='del'>-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular</div><div class='del'>-# dependency, and given that the user is not expected to run this macro,</div><div class='del'>-# just rely on AC_PROG_CC.</div><div class='del'>-AC_DEFUN([_AM_DEPENDENCIES],</div><div class='del'>-[AC_REQUIRE([AM_SET_DEPDIR])dnl</div><div class='del'>-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl</div><div class='del'>-AC_REQUIRE([AM_MAKE_INCLUDE])dnl</div><div class='del'>-AC_REQUIRE([AM_DEP_TRACK])dnl</div><div class='del'>-</div><div class='del'>-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],</div><div class='del'>-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],</div><div class='del'>-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],</div><div class='del'>-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],</div><div class='del'>-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],</div><div class='del'>-                   [depcc="$$1"   am_compiler_list=])</div><div class='del'>-</div><div class='del'>-AC_CACHE_CHECK([dependency style of $depcc],</div><div class='del'>-               [am_cv_$1_dependencies_compiler_type],</div><div class='del'>-[if test -z "$AMDEP_TRUE" &amp;&amp; test -f "$am_depcomp"; then</div><div class='del'>-  # We make a subdir and do the tests there.  Otherwise we can end up</div><div class='del'>-  # making bogus files that we don't know about and never remove.  For</div><div class='del'>-  # instance it was reported that on HP-UX the gcc test will end up</div><div class='del'>-  # making a dummy file named `D' -- because `-MD' means `put the output</div><div class='del'>-  # in D'.</div><div class='del'>-  mkdir conftest.dir</div><div class='del'>-  # Copy depcomp to subdir because otherwise we won't find it if we're</div><div class='del'>-  # using a relative directory.</div><div class='del'>-  cp "$am_depcomp" conftest.dir</div><div class='del'>-  cd conftest.dir</div><div class='del'>-  # We will build objects and dependencies in a subdirectory because</div><div class='del'>-  # it helps to detect inapplicable dependency modes.  For instance</div><div class='del'>-  # both Tru64's cc and ICC support -MD to output dependencies as a</div><div class='del'>-  # side effect of compilation, but ICC will put the dependencies in</div><div class='del'>-  # the current directory while Tru64 will put them in the object</div><div class='del'>-  # directory.</div><div class='del'>-  mkdir sub</div><div class='del'>-</div><div class='del'>-  am_cv_$1_dependencies_compiler_type=none</div><div class='del'>-  if test "$am_compiler_list" = ""; then</div><div class='del'>-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] &lt; ./depcomp`</div><div class='del'>-  fi</div><div class='del'>-  am__universal=false</div><div class='del'>-  m4_case([$1], [CC],</div><div class='del'>-    [case " $depcc " in #(</div><div class='del'>-     *\ -arch\ *\ -arch\ *) am__universal=true ;;</div><div class='del'>-     esac],</div><div class='del'>-    [CXX],</div><div class='del'>-    [case " $depcc " in #(</div><div class='del'>-     *\ -arch\ *\ -arch\ *) am__universal=true ;;</div><div class='del'>-     esac])</div><div class='del'>-</div><div class='del'>-  for depmode in $am_compiler_list; do</div><div class='del'>-    # Setup a source with many dependencies, because some compilers</div><div class='del'>-    # like to wrap large dependency lists on column 80 (with \), and</div><div class='del'>-    # we should not choose a depcomp mode which is confused by this.</div><div class='del'>-    #</div><div class='del'>-    # We need to recreate these files for each test, as the compiler may</div><div class='del'>-    # overwrite some of them when testing with obscure command lines.</div><div class='del'>-    # This happens at least with the AIX C compiler.</div><div class='del'>-    : &gt; sub/conftest.c</div><div class='del'>-    for i in 1 2 3 4 5 6; do</div><div class='del'>-      echo '#include "conftst'$i'.h"' &gt;&gt; sub/conftest.c</div><div class='del'>-      # Using `: &gt; sub/conftst$i.h' creates only sub/conftst1.h with</div><div class='del'>-      # Solaris 8's {/usr,}/bin/sh.</div><div class='del'>-      touch sub/conftst$i.h</div><div class='del'>-    done</div><div class='del'>-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" &gt; confmf</div><div class='del'>-</div><div class='del'>-    # We check with `-c' and `-o' for the sake of the "dashmstdout"</div><div class='del'>-    # mode.  It turns out that the SunPro C++ compiler does not properly</div><div class='del'>-    # handle `-M -o', and we need to detect this.  Also, some Intel</div><div class='del'>-    # versions had trouble with output in subdirs</div><div class='del'>-    am__obj=sub/conftest.${OBJEXT-o}</div><div class='del'>-    am__minus_obj="-o $am__obj"</div><div class='del'>-    case $depmode in</div><div class='del'>-    gcc)</div><div class='del'>-      # This depmode causes a compiler race in universal mode.</div><div class='del'>-      test "$am__universal" = false || continue</div><div class='del'>-      ;;</div><div class='del'>-    nosideeffect)</div><div class='del'>-      # after this tag, mechanisms are not by side-effect, so they'll</div><div class='del'>-      # only be used when explicitly requested</div><div class='del'>-      if test "x$enable_dependency_tracking" = xyes; then</div><div class='del'>-	continue</div><div class='del'>-      else</div><div class='del'>-	break</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-    msvisualcpp | msvcmsys)</div><div class='del'>-      # This compiler won't grok `-c -o', but also, the minuso test has</div><div class='del'>-      # not run yet.  These depmodes are late enough in the game, and</div><div class='del'>-      # so weak that their functioning should not be impacted.</div><div class='del'>-      am__obj=conftest.${OBJEXT-o}</div><div class='del'>-      am__minus_obj=</div><div class='del'>-      ;;</div><div class='del'>-    none) break ;;</div><div class='del'>-    esac</div><div class='del'>-    if depmode=$depmode \</div><div class='del'>-       source=sub/conftest.c object=$am__obj \</div><div class='del'>-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \</div><div class='del'>-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \</div><div class='del'>-         &gt;/dev/null 2&gt;conftest.err &amp;&amp;</div><div class='del'>-       grep sub/conftst1.h sub/conftest.Po &gt; /dev/null 2&gt;&amp;1 &amp;&amp;</div><div class='del'>-       grep sub/conftst6.h sub/conftest.Po &gt; /dev/null 2&gt;&amp;1 &amp;&amp;</div><div class='del'>-       grep $am__obj sub/conftest.Po &gt; /dev/null 2&gt;&amp;1 &amp;&amp;</div><div class='del'>-       ${MAKE-make} -s -f confmf &gt; /dev/null 2&gt;&amp;1; then</div><div class='del'>-      # icc doesn't choke on unknown options, it will just issue warnings</div><div class='del'>-      # or remarks (even with -Werror).  So we grep stderr for any message</div><div class='del'>-      # that says an option was ignored or not supported.</div><div class='del'>-      # When given -MP, icc 7.0 and 7.1 complain thusly:</div><div class='del'>-      #   icc: Command line warning: ignoring option '-M'; no argument required</div><div class='del'>-      # The diagnosis changed in icc 8.0:</div><div class='del'>-      #   icc: Command line remark: option '-MP' not supported</div><div class='del'>-      if (grep 'ignoring option' conftest.err ||</div><div class='del'>-          grep 'not supported' conftest.err) &gt;/dev/null 2&gt;&amp;1; then :; else</div><div class='del'>-        am_cv_$1_dependencies_compiler_type=$depmode</div><div class='del'>-        break</div><div class='del'>-      fi</div><div class='del'>-    fi</div><div class='del'>-  done</div><div class='del'>-</div><div class='del'>-  cd ..</div><div class='del'>-  rm -rf conftest.dir</div><div class='del'>-else</div><div class='del'>-  am_cv_$1_dependencies_compiler_type=none</div><div class='del'>-fi</div><div class='del'>-])</div><div class='del'>-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])</div><div class='del'>-AM_CONDITIONAL([am__fastdep$1], [</div><div class='del'>-  test "x$enable_dependency_tracking" != xno \</div><div class='del'>-  &amp;&amp; test "$am_cv_$1_dependencies_compiler_type" = gcc3])</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# AM_SET_DEPDIR</div><div class='del'>-# -------------</div><div class='del'>-# Choose a directory name for dependency files.</div><div class='del'>-# This macro is AC_REQUIREd in _AM_DEPENDENCIES</div><div class='del'>-AC_DEFUN([AM_SET_DEPDIR],</div><div class='del'>-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl</div><div class='del'>-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# AM_DEP_TRACK</div><div class='del'>-# ------------</div><div class='del'>-AC_DEFUN([AM_DEP_TRACK],</div><div class='del'>-[AC_ARG_ENABLE(dependency-tracking,</div><div class='del'>-[  --disable-dependency-tracking  speeds up one-time build</div><div class='del'>-  --enable-dependency-tracking   do not reject slow dependency extractors])</div><div class='del'>-if test "x$enable_dependency_tracking" != xno; then</div><div class='del'>-  am_depcomp="$ac_aux_dir/depcomp"</div><div class='del'>-  AMDEPBACKSLASH='\'</div><div class='del'>-fi</div><div class='del'>-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])</div><div class='del'>-AC_SUBST([AMDEPBACKSLASH])dnl</div><div class='del'>-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-# Generate code to set up dependency tracking.              -*- Autoconf -*-</div><div class='del'>-</div><div class='del'>-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008</div><div class='del'>-# Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-#serial 5</div><div class='del'>-</div><div class='del'>-# _AM_OUTPUT_DEPENDENCY_COMMANDS</div><div class='del'>-# ------------------------------</div><div class='del'>-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],</div><div class='del'>-[{</div><div class='del'>-  # Autoconf 2.62 quotes --file arguments for eval, but not when files</div><div class='del'>-  # are listed without --file.  Let's play safe and only enable the eval</div><div class='del'>-  # if we detect the quoting.</div><div class='del'>-  case $CONFIG_FILES in</div><div class='del'>-  *\'*) eval set x "$CONFIG_FILES" ;;</div><div class='del'>-  *)   set x $CONFIG_FILES ;;</div><div class='del'>-  esac</div><div class='del'>-  shift</div><div class='del'>-  for mf</div><div class='del'>-  do</div><div class='del'>-    # Strip MF so we end up with the name of the file.</div><div class='del'>-    mf=`echo "$mf" | sed -e 's/:.*$//'`</div><div class='del'>-    # Check whether this is an Automake generated Makefile or not.</div><div class='del'>-    # We used to match only the files named `Makefile.in', but</div><div class='del'>-    # some people rename them; so instead we look at the file content.</div><div class='del'>-    # Grep'ing the first line is not enough: some people post-process</div><div class='del'>-    # each Makefile.in and add a new line on top of each file to say so.</div><div class='del'>-    # Grep'ing the whole file is not good either: AIX grep has a line</div><div class='del'>-    # limit of 2048, but all sed's we know have understand at least 4000.</div><div class='del'>-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-      dirpart=`AS_DIRNAME("$mf")`</div><div class='del'>-    else</div><div class='del'>-      continue</div><div class='del'>-    fi</div><div class='del'>-    # Extract the definition of DEPDIR, am__include, and am__quote</div><div class='del'>-    # from the Makefile without running `make'.</div><div class='del'>-    DEPDIR=`sed -n 's/^DEPDIR = //p' &lt; "$mf"`</div><div class='del'>-    test -z "$DEPDIR" &amp;&amp; continue</div><div class='del'>-    am__include=`sed -n 's/^am__include = //p' &lt; "$mf"`</div><div class='del'>-    test -z "am__include" &amp;&amp; continue</div><div class='del'>-    am__quote=`sed -n 's/^am__quote = //p' &lt; "$mf"`</div><div class='del'>-    # When using ansi2knr, U may be empty or an underscore; expand it</div><div class='del'>-    U=`sed -n 's/^U = //p' &lt; "$mf"`</div><div class='del'>-    # Find all dependency output files, they are included files with</div><div class='del'>-    # $(DEPDIR) in their names.  We invoke sed twice because it is the</div><div class='del'>-    # simplest approach to changing $(DEPDIR) to its actual value in the</div><div class='del'>-    # expansion.</div><div class='del'>-    for file in `sed -n "</div><div class='del'>-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' &lt;"$mf" | \</div><div class='del'>-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do</div><div class='del'>-      # Make sure the directory exists.</div><div class='del'>-      test -f "$dirpart/$file" &amp;&amp; continue</div><div class='del'>-      fdir=`AS_DIRNAME(["$file"])`</div><div class='del'>-      AS_MKDIR_P([$dirpart/$fdir])</div><div class='del'>-      # echo "creating $dirpart/$file"</div><div class='del'>-      echo '# dummy' &gt; "$dirpart/$file"</div><div class='del'>-    done</div><div class='del'>-  done</div><div class='del'>-}</div><div class='del'>-])# _AM_OUTPUT_DEPENDENCY_COMMANDS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# AM_OUTPUT_DEPENDENCY_COMMANDS</div><div class='del'>-# -----------------------------</div><div class='del'>-# This macro should only be invoked once -- use via AC_REQUIRE.</div><div class='del'>-#</div><div class='del'>-# This code is only required when automatic dependency tracking</div><div class='del'>-# is enabled.  FIXME.  This creates each `.P' file that we will</div><div class='del'>-# need in order to bootstrap the dependency handling code.</div><div class='del'>-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],</div><div class='del'>-[AC_CONFIG_COMMANDS([depfiles],</div><div class='del'>-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],</div><div class='del'>-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005</div><div class='del'>-# Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# serial 8</div><div class='del'>-</div><div class='del'>-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.</div><div class='del'>-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])</div><div class='del'>-</div><div class='del'>-# Do all the work for Automake.                             -*- Autoconf -*-</div><div class='del'>-</div><div class='del'>-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,</div><div class='del'>-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# serial 16</div><div class='del'>-</div><div class='del'>-# This macro actually does too much.  Some checks are only needed if</div><div class='del'>-# your package does certain things.  But this isn't really a big deal.</div><div class='del'>-</div><div class='del'>-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])</div><div class='del'>-# AM_INIT_AUTOMAKE([OPTIONS])</div><div class='del'>-# -----------------------------------------------</div><div class='del'>-# The call with PACKAGE and VERSION arguments is the old style</div><div class='del'>-# call (pre autoconf-2.50), which is being phased out.  PACKAGE</div><div class='del'>-# and VERSION should now be passed to AC_INIT and removed from</div><div class='del'>-# the call to AM_INIT_AUTOMAKE.</div><div class='del'>-# We support both call styles for the transition.  After</div><div class='del'>-# the next Automake release, Autoconf can make the AC_INIT</div><div class='del'>-# arguments mandatory, and then we can depend on a new Autoconf</div><div class='del'>-# release and drop the old call support.</div><div class='del'>-AC_DEFUN([AM_INIT_AUTOMAKE],</div><div class='del'>-[AC_PREREQ([2.62])dnl</div><div class='del'>-dnl Autoconf wants to disallow AM_ names.  We explicitly allow</div><div class='del'>-dnl the ones we care about.</div><div class='del'>-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl</div><div class='del'>-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl</div><div class='del'>-AC_REQUIRE([AC_PROG_INSTALL])dnl</div><div class='del'>-if test "`cd $srcdir &amp;&amp; pwd`" != "`pwd`"; then</div><div class='del'>-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output</div><div class='del'>-  # is not polluted with repeated "-I."</div><div class='del'>-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl</div><div class='del'>-  # test to see if srcdir already configured</div><div class='del'>-  if test -f $srcdir/config.status; then</div><div class='del'>-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# test whether we have cygpath</div><div class='del'>-if test -z "$CYGPATH_W"; then</div><div class='del'>-  if (cygpath --version) &gt;/dev/null 2&gt;/dev/null; then</div><div class='del'>-    CYGPATH_W='cygpath -w'</div><div class='del'>-  else</div><div class='del'>-    CYGPATH_W=echo</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-AC_SUBST([CYGPATH_W])</div><div class='del'>-</div><div class='del'>-# Define the identity of the package.</div><div class='del'>-dnl Distinguish between old-style and new-style calls.</div><div class='del'>-m4_ifval([$2],</div><div class='del'>-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl</div><div class='del'>- AC_SUBST([PACKAGE], [$1])dnl</div><div class='del'>- AC_SUBST([VERSION], [$2])],</div><div class='del'>-[_AM_SET_OPTIONS([$1])dnl</div><div class='del'>-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.</div><div class='del'>-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,</div><div class='del'>-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl</div><div class='del'>- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl</div><div class='del'>- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl</div><div class='del'>-</div><div class='del'>-_AM_IF_OPTION([no-define],,</div><div class='del'>-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])</div><div class='del'>- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl</div><div class='del'>-</div><div class='del'>-# Some tools Automake needs.</div><div class='del'>-AC_REQUIRE([AM_SANITY_CHECK])dnl</div><div class='del'>-AC_REQUIRE([AC_ARG_PROGRAM])dnl</div><div class='del'>-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})</div><div class='del'>-AM_MISSING_PROG(AUTOCONF, autoconf)</div><div class='del'>-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})</div><div class='del'>-AM_MISSING_PROG(AUTOHEADER, autoheader)</div><div class='del'>-AM_MISSING_PROG(MAKEINFO, makeinfo)</div><div class='del'>-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl</div><div class='del'>-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl</div><div class='del'>-AC_REQUIRE([AM_PROG_MKDIR_P])dnl</div><div class='del'>-# We need awk for the "check" target.  The system "awk" is bad on</div><div class='del'>-# some platforms.</div><div class='del'>-AC_REQUIRE([AC_PROG_AWK])dnl</div><div class='del'>-AC_REQUIRE([AC_PROG_MAKE_SET])dnl</div><div class='del'>-AC_REQUIRE([AM_SET_LEADING_DOT])dnl</div><div class='del'>-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],</div><div class='del'>-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],</div><div class='del'>-			     [_AM_PROG_TAR([v7])])])</div><div class='del'>-_AM_IF_OPTION([no-dependencies],,</div><div class='del'>-[AC_PROVIDE_IFELSE([AC_PROG_CC],</div><div class='del'>-		  [_AM_DEPENDENCIES(CC)],</div><div class='del'>-		  [define([AC_PROG_CC],</div><div class='del'>-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl</div><div class='del'>-AC_PROVIDE_IFELSE([AC_PROG_CXX],</div><div class='del'>-		  [_AM_DEPENDENCIES(CXX)],</div><div class='del'>-		  [define([AC_PROG_CXX],</div><div class='del'>-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl</div><div class='del'>-AC_PROVIDE_IFELSE([AC_PROG_OBJC],</div><div class='del'>-		  [_AM_DEPENDENCIES(OBJC)],</div><div class='del'>-		  [define([AC_PROG_OBJC],</div><div class='del'>-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl</div><div class='del'>-])</div><div class='del'>-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl</div><div class='del'>-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the</div><div class='del'>-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro</div><div class='del'>-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.</div><div class='del'>-AC_CONFIG_COMMANDS_PRE(dnl</div><div class='del'>-[m4_provide_if([_AM_COMPILER_EXEEXT],</div><div class='del'>-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not</div><div class='del'>-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further</div><div class='del'>-dnl mangled by Autoconf and run in a shell conditional statement.</div><div class='del'>-m4_define([_AC_COMPILER_EXEEXT],</div><div class='del'>-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# When config.status generates a header, we must update the stamp-h file.</div><div class='del'>-# This file resides in the same directory as the config header</div><div class='del'>-# that is generated.  The stamp files are numbered to have different names.</div><div class='del'>-</div><div class='del'>-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the</div><div class='del'>-# loop where config.status creates the headers, so we can generate</div><div class='del'>-# our stamp files there.</div><div class='del'>-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],</div><div class='del'>-[# Compute $1's index in $config_headers.</div><div class='del'>-_am_arg=$1</div><div class='del'>-_am_stamp_count=1</div><div class='del'>-for _am_header in $config_headers :; do</div><div class='del'>-  case $_am_header in</div><div class='del'>-    $_am_arg | $_am_arg:* )</div><div class='del'>-      break ;;</div><div class='del'>-    * )</div><div class='del'>-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;</div><div class='del'>-  esac</div><div class='del'>-done</div><div class='del'>-echo "timestamp for $_am_arg" &gt;`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])</div><div class='del'>-</div><div class='del'>-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# AM_PROG_INSTALL_SH</div><div class='del'>-# ------------------</div><div class='del'>-# Define $install_sh.</div><div class='del'>-AC_DEFUN([AM_PROG_INSTALL_SH],</div><div class='del'>-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl</div><div class='del'>-if test x"${install_sh}" != xset; then</div><div class='del'>-  case $am_aux_dir in</div><div class='del'>-  *\ * | *\	*)</div><div class='del'>-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;</div><div class='del'>-  *)</div><div class='del'>-    install_sh="\${SHELL} $am_aux_dir/install-sh"</div><div class='del'>-  esac</div><div class='del'>-fi</div><div class='del'>-AC_SUBST(install_sh)])</div><div class='del'>-</div><div class='del'>-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# serial 2</div><div class='del'>-</div><div class='del'>-# Check whether the underlying file-system supports filenames</div><div class='del'>-# with a leading dot.  For instance MS-DOS doesn't.</div><div class='del'>-AC_DEFUN([AM_SET_LEADING_DOT],</div><div class='del'>-[rm -rf .tst 2&gt;/dev/null</div><div class='del'>-mkdir .tst 2&gt;/dev/null</div><div class='del'>-if test -d .tst; then</div><div class='del'>-  am__leading_dot=.</div><div class='del'>-else</div><div class='del'>-  am__leading_dot=_</div><div class='del'>-fi</div><div class='del'>-rmdir .tst 2&gt;/dev/null</div><div class='del'>-AC_SUBST([am__leading_dot])])</div><div class='del'>-</div><div class='del'>-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-</div><div class='del'>-# From Jim Meyering</div><div class='del'>-</div><div class='del'>-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008</div><div class='del'>-# Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# serial 5</div><div class='del'>-</div><div class='del'>-# AM_MAINTAINER_MODE([DEFAULT-MODE])</div><div class='del'>-# ----------------------------------</div><div class='del'>-# Control maintainer-specific portions of Makefiles.</div><div class='del'>-# Default is to disable them, unless `enable' is passed literally.</div><div class='del'>-# For symmetry, `disable' may be passed as well.  Anyway, the user</div><div class='del'>-# can override the default with the --enable/--disable switch.</div><div class='del'>-AC_DEFUN([AM_MAINTAINER_MODE],</div><div class='del'>-[m4_case(m4_default([$1], [disable]),</div><div class='del'>-       [enable], [m4_define([am_maintainer_other], [disable])],</div><div class='del'>-       [disable], [m4_define([am_maintainer_other], [enable])],</div><div class='del'>-       [m4_define([am_maintainer_other], [enable])</div><div class='del'>-        m4_warn([syntax], [unexpected argument to AM@&amp;t@_MAINTAINER_MODE: $1])])</div><div class='del'>-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])</div><div class='del'>-  dnl maintainer-mode's default is 'disable' unless 'enable' is passed</div><div class='del'>-  AC_ARG_ENABLE([maintainer-mode],</div><div class='del'>-[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful</div><div class='del'>-			  (and sometimes confusing) to the casual installer],</div><div class='del'>-      [USE_MAINTAINER_MODE=$enableval],</div><div class='del'>-      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))</div><div class='del'>-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])</div><div class='del'>-  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])</div><div class='del'>-  MAINT=$MAINTAINER_MODE_TRUE</div><div class='del'>-  AC_SUBST([MAINT])dnl</div><div class='del'>-]</div><div class='del'>-)</div><div class='del'>-</div><div class='del'>-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])</div><div class='del'>-</div><div class='del'>-# Check to see how 'make' treats includes.	            -*- Autoconf -*-</div><div class='del'>-</div><div class='del'>-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# serial 4</div><div class='del'>-</div><div class='del'>-# AM_MAKE_INCLUDE()</div><div class='del'>-# -----------------</div><div class='del'>-# Check to see how make treats includes.</div><div class='del'>-AC_DEFUN([AM_MAKE_INCLUDE],</div><div class='del'>-[am_make=${MAKE-make}</div><div class='del'>-cat &gt; confinc &lt;&lt; 'END'</div><div class='del'>-am__doit:</div><div class='del'>-	@echo this is the am__doit target</div><div class='del'>-.PHONY: am__doit</div><div class='del'>-END</div><div class='del'>-# If we don't find an include directive, just comment out the code.</div><div class='del'>-AC_MSG_CHECKING([for style of include used by $am_make])</div><div class='del'>-am__include="#"</div><div class='del'>-am__quote=</div><div class='del'>-_am_result=none</div><div class='del'>-# First try GNU make style include.</div><div class='del'>-echo "include confinc" &gt; confmf</div><div class='del'>-# Ignore all kinds of additional output from `make'.</div><div class='del'>-case `$am_make -s -f confmf 2&gt; /dev/null` in #(</div><div class='del'>-*the\ am__doit\ target*)</div><div class='del'>-  am__include=include</div><div class='del'>-  am__quote=</div><div class='del'>-  _am_result=GNU</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-# Now try BSD make style include.</div><div class='del'>-if test "$am__include" = "#"; then</div><div class='del'>-   echo '.include "confinc"' &gt; confmf</div><div class='del'>-   case `$am_make -s -f confmf 2&gt; /dev/null` in #(</div><div class='del'>-   *the\ am__doit\ target*)</div><div class='del'>-     am__include=.include</div><div class='del'>-     am__quote="\""</div><div class='del'>-     _am_result=BSD</div><div class='del'>-     ;;</div><div class='del'>-   esac</div><div class='del'>-fi</div><div class='del'>-AC_SUBST([am__include])</div><div class='del'>-AC_SUBST([am__quote])</div><div class='del'>-AC_MSG_RESULT([$_am_result])</div><div class='del'>-rm -f confinc confmf</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-</div><div class='del'>-</div><div class='del'>-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008</div><div class='del'>-# Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# serial 6</div><div class='del'>-</div><div class='del'>-# AM_MISSING_PROG(NAME, PROGRAM)</div><div class='del'>-# ------------------------------</div><div class='del'>-AC_DEFUN([AM_MISSING_PROG],</div><div class='del'>-[AC_REQUIRE([AM_MISSING_HAS_RUN])</div><div class='del'>-$1=${$1-"${am_missing_run}$2"}</div><div class='del'>-AC_SUBST($1)])</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# AM_MISSING_HAS_RUN</div><div class='del'>-# ------------------</div><div class='del'>-# Define MISSING if not defined so far and test if it supports --run.</div><div class='del'>-# If it does, set am_missing_run to use it, otherwise, to nothing.</div><div class='del'>-AC_DEFUN([AM_MISSING_HAS_RUN],</div><div class='del'>-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl</div><div class='del'>-AC_REQUIRE_AUX_FILE([missing])dnl</div><div class='del'>-if test x"${MISSING+set}" != xset; then</div><div class='del'>-  case $am_aux_dir in</div><div class='del'>-  *\ * | *\	*)</div><div class='del'>-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;</div><div class='del'>-  *)</div><div class='del'>-    MISSING="\${SHELL} $am_aux_dir/missing" ;;</div><div class='del'>-  esac</div><div class='del'>-fi</div><div class='del'>-# Use eval to expand $SHELL</div><div class='del'>-if eval "$MISSING --run true"; then</div><div class='del'>-  am_missing_run="$MISSING --run "</div><div class='del'>-else</div><div class='del'>-  am_missing_run=</div><div class='del'>-  AC_MSG_WARN([`missing' script is too old or missing])</div><div class='del'>-fi</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# AM_PROG_MKDIR_P</div><div class='del'>-# ---------------</div><div class='del'>-# Check for `mkdir -p'.</div><div class='del'>-AC_DEFUN([AM_PROG_MKDIR_P],</div><div class='del'>-[AC_PREREQ([2.60])dnl</div><div class='del'>-AC_REQUIRE([AC_PROG_MKDIR_P])dnl</div><div class='del'>-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,</div><div class='del'>-dnl while keeping a definition of mkdir_p for backward compatibility.</div><div class='del'>-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.</div><div class='del'>-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of</div><div class='del'>-dnl Makefile.ins that do not define MKDIR_P, so we do our own</div><div class='del'>-dnl adjustment using top_builddir (which is defined more often than</div><div class='del'>-dnl MKDIR_P).</div><div class='del'>-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl</div><div class='del'>-case $mkdir_p in</div><div class='del'>-  [[\\/$]]* | ?:[[\\/]]*) ;;</div><div class='del'>-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;</div><div class='del'>-esac</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-# Helper functions for option handling.                     -*- Autoconf -*-</div><div class='del'>-</div><div class='del'>-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# serial 4</div><div class='del'>-</div><div class='del'>-# _AM_MANGLE_OPTION(NAME)</div><div class='del'>-# -----------------------</div><div class='del'>-AC_DEFUN([_AM_MANGLE_OPTION],</div><div class='del'>-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])</div><div class='del'>-</div><div class='del'>-# _AM_SET_OPTION(NAME)</div><div class='del'>-# ------------------------------</div><div class='del'>-# Set option NAME.  Presently that only means defining a flag for this option.</div><div class='del'>-AC_DEFUN([_AM_SET_OPTION],</div><div class='del'>-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])</div><div class='del'>-</div><div class='del'>-# _AM_SET_OPTIONS(OPTIONS)</div><div class='del'>-# ----------------------------------</div><div class='del'>-# OPTIONS is a space-separated list of Automake options.</div><div class='del'>-AC_DEFUN([_AM_SET_OPTIONS],</div><div class='del'>-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])</div><div class='del'>-</div><div class='del'>-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])</div><div class='del'>-# -------------------------------------------</div><div class='del'>-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.</div><div class='del'>-AC_DEFUN([_AM_IF_OPTION],</div><div class='del'>-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])</div><div class='del'>-</div><div class='del'>-# Check to make sure that the build environment is sane.    -*- Autoconf -*-</div><div class='del'>-</div><div class='del'>-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008</div><div class='del'>-# Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# serial 5</div><div class='del'>-</div><div class='del'>-# AM_SANITY_CHECK</div><div class='del'>-# ---------------</div><div class='del'>-AC_DEFUN([AM_SANITY_CHECK],</div><div class='del'>-[AC_MSG_CHECKING([whether build environment is sane])</div><div class='del'>-# Just in case</div><div class='del'>-sleep 1</div><div class='del'>-echo timestamp &gt; conftest.file</div><div class='del'>-# Reject unsafe characters in $srcdir or the absolute working directory</div><div class='del'>-# name.  Accept space and tab only in the latter.</div><div class='del'>-am_lf='</div><div class='del'>-'</div><div class='del'>-case `pwd` in</div><div class='del'>-  *[[\\\"\#\$\&amp;\'\`$am_lf]]*)</div><div class='del'>-    AC_MSG_ERROR([unsafe absolute working directory name]);;</div><div class='del'>-esac</div><div class='del'>-case $srcdir in</div><div class='del'>-  *[[\\\"\#\$\&amp;\'\`$am_lf\ \	]]*)</div><div class='del'>-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# Do `set' in a subshell so we don't clobber the current shell's</div><div class='del'>-# arguments.  Must try -L first in case configure is actually a</div><div class='del'>-# symlink; some systems play weird games with the mod time of symlinks</div><div class='del'>-# (eg FreeBSD returns the mod time of the symlink's containing</div><div class='del'>-# directory).</div><div class='del'>-if (</div><div class='del'>-   set X `ls -Lt "$srcdir/configure" conftest.file 2&gt; /dev/null`</div><div class='del'>-   if test "$[*]" = "X"; then</div><div class='del'>-      # -L didn't work.</div><div class='del'>-      set X `ls -t "$srcdir/configure" conftest.file`</div><div class='del'>-   fi</div><div class='del'>-   rm -f conftest.file</div><div class='del'>-   if test "$[*]" != "X $srcdir/configure conftest.file" \</div><div class='del'>-      &amp;&amp; test "$[*]" != "X conftest.file $srcdir/configure"; then</div><div class='del'>-</div><div class='del'>-      # If neither matched, then we have a broken ls.  This can happen</div><div class='del'>-      # if, for instance, CONFIG_SHELL is bash and it inherits a</div><div class='del'>-      # broken ls alias from the environment.  This has actually</div><div class='del'>-      # happened.  Such a system could not be considered "sane".</div><div class='del'>-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken</div><div class='del'>-alias in your environment])</div><div class='del'>-   fi</div><div class='del'>-</div><div class='del'>-   test "$[2]" = conftest.file</div><div class='del'>-   )</div><div class='del'>-then</div><div class='del'>-   # Ok.</div><div class='del'>-   :</div><div class='del'>-else</div><div class='del'>-   AC_MSG_ERROR([newly created file is older than distributed files!</div><div class='del'>-Check your system clock])</div><div class='del'>-fi</div><div class='del'>-AC_MSG_RESULT(yes)])</div><div class='del'>-</div><div class='del'>-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# AM_PROG_INSTALL_STRIP</div><div class='del'>-# ---------------------</div><div class='del'>-# One issue with vendor `install' (even GNU) is that you can't</div><div class='del'>-# specify the program used to strip binaries.  This is especially</div><div class='del'>-# annoying in cross-compiling environments, where the build's strip</div><div class='del'>-# is unlikely to handle the host's binaries.</div><div class='del'>-# Fortunately install-sh will honor a STRIPPROG variable, so we</div><div class='del'>-# always use install-sh in `make install-strip', and initialize</div><div class='del'>-# STRIPPROG with the value of the STRIP variable (set by the user).</div><div class='del'>-AC_DEFUN([AM_PROG_INSTALL_STRIP],</div><div class='del'>-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl</div><div class='del'>-# Installed binaries are usually stripped using `strip' when the user</div><div class='del'>-# run `make install-strip'.  However `strip' might not be the right</div><div class='del'>-# tool to use in cross-compilation environments, therefore Automake</div><div class='del'>-# will honor the `STRIP' environment variable to overrule this program.</div><div class='del'>-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.</div><div class='del'>-if test "$cross_compiling" != no; then</div><div class='del'>-  AC_CHECK_TOOL([STRIP], [strip], :)</div><div class='del'>-fi</div><div class='del'>-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"</div><div class='del'>-AC_SUBST([INSTALL_STRIP_PROGRAM])])</div><div class='del'>-</div><div class='del'>-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# serial 2</div><div class='del'>-</div><div class='del'>-# _AM_SUBST_NOTMAKE(VARIABLE)</div><div class='del'>-# ---------------------------</div><div class='del'>-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.</div><div class='del'>-# This macro is traced by Automake.</div><div class='del'>-AC_DEFUN([_AM_SUBST_NOTMAKE])</div><div class='del'>-</div><div class='del'>-# AM_SUBST_NOTMAKE(VARIABLE)</div><div class='del'>-# ---------------------------</div><div class='del'>-# Public sister of _AM_SUBST_NOTMAKE.</div><div class='del'>-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])</div><div class='del'>-</div><div class='del'>-# Check how to create a tarball.                            -*- Autoconf -*-</div><div class='del'>-</div><div class='del'>-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.</div><div class='del'>-#</div><div class='del'>-# This file is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy and/or distribute it,</div><div class='del'>-# with or without modifications, as long as this notice is preserved.</div><div class='del'>-</div><div class='del'>-# serial 2</div><div class='del'>-</div><div class='del'>-# _AM_PROG_TAR(FORMAT)</div><div class='del'>-# --------------------</div><div class='del'>-# Check how to create a tarball in format FORMAT.</div><div class='del'>-# FORMAT should be one of `v7', `ustar', or `pax'.</div><div class='del'>-#</div><div class='del'>-# Substitute a variable $(am__tar) that is a command</div><div class='del'>-# writing to stdout a FORMAT-tarball containing the directory</div><div class='del'>-# $tardir.</div><div class='del'>-#     tardir=directory &amp;&amp; $(am__tar) &gt; result.tar</div><div class='del'>-#</div><div class='del'>-# Substitute a variable $(am__untar) that extract such</div><div class='del'>-# a tarball read from stdin.</div><div class='del'>-#     $(am__untar) &lt; result.tar</div><div class='del'>-AC_DEFUN([_AM_PROG_TAR],</div><div class='del'>-[# Always define AMTAR for backward compatibility.</div><div class='del'>-AM_MISSING_PROG([AMTAR], [tar])</div><div class='del'>-m4_if([$1], [v7],</div><div class='del'>-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],</div><div class='del'>-     [m4_case([$1], [ustar],, [pax],,</div><div class='del'>-              [m4_fatal([Unknown tar format])])</div><div class='del'>-AC_MSG_CHECKING([how to create a $1 tar archive])</div><div class='del'>-# Loop over all known methods to create a tar archive until one works.</div><div class='del'>-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'</div><div class='del'>-_am_tools=${am_cv_prog_tar_$1-$_am_tools}</div><div class='del'>-# Do not fold the above two line into one, because Tru64 sh and</div><div class='del'>-# Solaris sh will not grok spaces in the rhs of `-'.</div><div class='del'>-for _am_tool in $_am_tools</div><div class='del'>-do</div><div class='del'>-  case $_am_tool in</div><div class='del'>-  gnutar)</div><div class='del'>-    for _am_tar in tar gnutar gtar;</div><div class='del'>-    do</div><div class='del'>-      AM_RUN_LOG([$_am_tar --version]) &amp;&amp; break</div><div class='del'>-    done</div><div class='del'>-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'</div><div class='del'>-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'</div><div class='del'>-    am__untar="$_am_tar -xf -"</div><div class='del'>-    ;;</div><div class='del'>-  plaintar)</div><div class='del'>-    # Must skip GNU tar: if it does not support --format= it doesn't create</div><div class='del'>-    # ustar tarball either.</div><div class='del'>-    (tar --version) &gt;/dev/null 2&gt;&amp;1 &amp;&amp; continue</div><div class='del'>-    am__tar='tar chf - "$$tardir"'</div><div class='del'>-    am__tar_='tar chf - "$tardir"'</div><div class='del'>-    am__untar='tar xf -'</div><div class='del'>-    ;;</div><div class='del'>-  pax)</div><div class='del'>-    am__tar='pax -L -x $1 -w "$$tardir"'</div><div class='del'>-    am__tar_='pax -L -x $1 -w "$tardir"'</div><div class='del'>-    am__untar='pax -r'</div><div class='del'>-    ;;</div><div class='del'>-  cpio)</div><div class='del'>-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'</div><div class='del'>-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'</div><div class='del'>-    am__untar='cpio -i -H $1 -d'</div><div class='del'>-    ;;</div><div class='del'>-  none)</div><div class='del'>-    am__tar=false</div><div class='del'>-    am__tar_=false</div><div class='del'>-    am__untar=false</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  # If the value was cached, stop now.  We just wanted to have am__tar</div><div class='del'>-  # and am__untar set.</div><div class='del'>-  test -n "${am_cv_prog_tar_$1}" &amp;&amp; break</div><div class='del'>-</div><div class='del'>-  # tar/untar a dummy directory, and stop if the command works</div><div class='del'>-  rm -rf conftest.dir</div><div class='del'>-  mkdir conftest.dir</div><div class='del'>-  echo GrepMe &gt; conftest.dir/file</div><div class='del'>-  AM_RUN_LOG([tardir=conftest.dir &amp;&amp; eval $am__tar_ &gt;conftest.tar])</div><div class='del'>-  rm -rf conftest.dir</div><div class='del'>-  if test -s conftest.tar; then</div><div class='del'>-    AM_RUN_LOG([$am__untar &lt;conftest.tar])</div><div class='del'>-    grep GrepMe conftest.dir/file &gt;/dev/null 2&gt;&amp;1 &amp;&amp; break</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-rm -rf conftest.dir</div><div class='del'>-</div><div class='del'>-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])</div><div class='del'>-AC_MSG_RESULT([$am_cv_prog_tar_$1])])</div><div class='del'>-AC_SUBST([am__tar])</div><div class='del'>-AC_SUBST([am__untar])</div><div class='del'>-]) # _AM_PROG_TAR</div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libpng/autogen.sh b/src/3rdparty/libpng/autogen.sh<br/>deleted file mode 100755<br/>index 77b6308..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/autogen.sh?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/autogen.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,25 +0,0 @@</div><div class='del'>-#! /bin/sh</div><div class='del'>-# a quick hack script to generate necessary files from </div><div class='del'>-# auto* tools.</div><div class='del'>-#</div><div class='del'>-# WARNING: if you run this you will change the versions</div><div class='del'>-# of the tools which are used and, maybe, required!</div><div class='del'>-        touch Makefile.am configure.ac</div><div class='del'>-{</div><div class='del'>-	echo "running libtoolize" &gt;&amp;2</div><div class='del'>-	libtoolize --force --copy --automake</div><div class='del'>-} &amp;&amp; {</div><div class='del'>-	echo "running aclocal" &gt;&amp;2</div><div class='del'>-	aclocal</div><div class='del'>-} &amp;&amp; {</div><div class='del'>-	echo "running autoheader [ignore the warnings]" &gt;&amp;2</div><div class='del'>-	autoheader</div><div class='del'>-} &amp;&amp; {</div><div class='del'>-	echo "running automake" &gt;&amp;2</div><div class='del'>-	automake --force-missing --foreign -a -c</div><div class='del'>-} &amp;&amp; {</div><div class='del'>-	echo "running autoconf" &gt;&amp;2</div><div class='del'>-	autoconf</div><div class='del'>-} &amp;&amp;</div><div class='del'>-	echo "autogen complete" &gt;&amp;2 ||</div><div class='del'>-	echo "ERROR: autogen.sh failed, autogen is incomplete" &gt;&amp;2</div><div class='head'>diff --git a/src/3rdparty/libpng/config.guess b/src/3rdparty/libpng/config.guess<br/>index da83314..dc84c68 100755..100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/config.guess?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/config.guess</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/config.guess?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/config.guess</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='ctx'> #! /bin/sh</div><div class='ctx'> # Attempt to guess a canonical system name.</div><div class='ctx'> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,</div><div class='del'>-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008</div><div class='add'>+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009</div><div class='ctx'> #   Free Software Foundation, Inc.</div><div class='ctx'> </div><div class='del'>-timestamp='2009-04-27'</div><div class='add'>+timestamp='2009-11-20'</div><div class='ctx'> </div><div class='ctx'> # This file is free software; you can redistribute it and/or modify it</div><div class='ctx'> # under the terms of the GNU General Public License as published by</div><div class='hunk'>@@ -27,16 +27,16 @@ timestamp='2009-04-27'</div><div class='ctx'> # the same distribution terms that you use for the rest of that program.</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-# Originally written by Per Bothner &lt;per@bothner.com&gt;.</div><div class='del'>-# Please send patches to &lt;config-patches@gnu.org&gt;.  Submit a context</div><div class='del'>-# diff and a properly formatted ChangeLog entry.</div><div class='add'>+# Originally written by Per Bothner.  Please send patches (context</div><div class='add'>+# diff format) to &lt;config-patches@gnu.org&gt; and include a ChangeLog</div><div class='add'>+# entry.</div><div class='ctx'> #</div><div class='ctx'> # This script attempts to guess a canonical system name similar to</div><div class='ctx'> # config.sub.  If it succeeds, it prints the system name on stdout, and</div><div class='ctx'> # exits with 0.  Otherwise, it exits with 1.</div><div class='ctx'> #</div><div class='del'>-# The plan is that this can be called by configure scripts if you</div><div class='del'>-# don't specify an explicit build system type.</div><div class='add'>+# You can get the latest version of this script from:</div><div class='add'>+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD</div><div class='ctx'> </div><div class='ctx'> me=`echo "$0" | sed -e 's,.*/,,'`</div><div class='ctx'> </div><div class='hunk'>@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in</div><div class='ctx'> 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)</div><div class='ctx'> 		eval $set_cc_for_build</div><div class='ctx'> 		if echo __ELF__ | $CC_FOR_BUILD -E - 2&gt;/dev/null \</div><div class='del'>-			| grep __ELF__ &gt;/dev/null</div><div class='add'>+			| grep -q __ELF__</div><div class='ctx'> 		then</div><div class='ctx'> 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).</div><div class='ctx'> 		    # Return netbsd for either.  FIX?</div><div class='hunk'>@@ -333,6 +333,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in</div><div class='ctx'>     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)</div><div class='ctx'> 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`</div><div class='ctx'> 	exit ;;</div><div class='add'>+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)</div><div class='add'>+	echo i386-pc-auroraux${UNAME_RELEASE}</div><div class='add'>+	exit ;;</div><div class='ctx'>     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)</div><div class='ctx'> 	eval $set_cc_for_build</div><div class='ctx'> 	SUN_ARCH="i386"</div><div class='hunk'>@@ -656,7 +659,7 @@ EOF</div><div class='ctx'> 	    # =&gt; hppa64-hp-hpux11.23</div><div class='ctx'> </div><div class='ctx'> 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2&gt;/dev/null) |</div><div class='del'>-		grep __LP64__ &gt;/dev/null</div><div class='add'>+		grep -q __LP64__</div><div class='ctx'> 	    then</div><div class='ctx'> 		HP_ARCH="hppa2.0w"</div><div class='ctx'> 	    else</div><div class='hunk'>@@ -807,12 +810,12 @@ EOF</div><div class='ctx'>     i*:PW*:*)</div><div class='ctx'> 	echo ${UNAME_MACHINE}-pc-pw32</div><div class='ctx'> 	exit ;;</div><div class='del'>-    *:Interix*:[3456]*)</div><div class='add'>+    *:Interix*:*)</div><div class='ctx'>     	case ${UNAME_MACHINE} in</div><div class='ctx'> 	    x86)</div><div class='ctx'> 		echo i586-pc-interix${UNAME_RELEASE}</div><div class='ctx'> 		exit ;;</div><div class='del'>-	    EM64T | authenticamd | genuineintel)</div><div class='add'>+	    authenticamd | genuineintel | EM64T)</div><div class='ctx'> 		echo x86_64-unknown-interix${UNAME_RELEASE}</div><div class='ctx'> 		exit ;;</div><div class='ctx'> 	    IA64)</div><div class='hunk'>@@ -822,6 +825,9 @@ EOF</div><div class='ctx'>     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)</div><div class='ctx'> 	echo i${UNAME_MACHINE}-pc-mks</div><div class='ctx'> 	exit ;;</div><div class='add'>+    8664:Windows_NT:*)</div><div class='add'>+	echo x86_64-pc-mks</div><div class='add'>+	exit ;;</div><div class='ctx'>     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)</div><div class='ctx'> 	# How do we know it's Interix rather than the generic POSIX subsystem?</div><div class='ctx'> 	# It also conflicts with pre-2.0 versions of AT&amp;T UWIN. Should we</div><div class='hunk'>@@ -851,6 +857,20 @@ EOF</div><div class='ctx'>     i*86:Minix:*:*)</div><div class='ctx'> 	echo ${UNAME_MACHINE}-pc-minix</div><div class='ctx'> 	exit ;;</div><div class='add'>+    alpha:Linux:*:*)</div><div class='add'>+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' &lt; /proc/cpuinfo` in</div><div class='add'>+	  EV5)   UNAME_MACHINE=alphaev5 ;;</div><div class='add'>+	  EV56)  UNAME_MACHINE=alphaev56 ;;</div><div class='add'>+	  PCA56) UNAME_MACHINE=alphapca56 ;;</div><div class='add'>+	  PCA57) UNAME_MACHINE=alphapca56 ;;</div><div class='add'>+	  EV6)   UNAME_MACHINE=alphaev6 ;;</div><div class='add'>+	  EV67)  UNAME_MACHINE=alphaev67 ;;</div><div class='add'>+	  EV68*) UNAME_MACHINE=alphaev68 ;;</div><div class='add'>+        esac</div><div class='add'>+	objdump --private-headers /bin/sh | grep -q ld.so.1</div><div class='add'>+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi</div><div class='add'>+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}</div><div class='add'>+	exit ;;</div><div class='ctx'>     arm*:Linux:*:*)</div><div class='ctx'> 	eval $set_cc_for_build</div><div class='ctx'> 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2&gt;/dev/null \</div><div class='hunk'>@@ -873,6 +893,17 @@ EOF</div><div class='ctx'>     frv:Linux:*:*)</div><div class='ctx'>     	echo frv-unknown-linux-gnu</div><div class='ctx'> 	exit ;;</div><div class='add'>+    i*86:Linux:*:*)</div><div class='add'>+	LIBC=gnu</div><div class='add'>+	eval $set_cc_for_build</div><div class='add'>+	sed 's/^	//' &lt;&lt; EOF &gt;$dummy.c</div><div class='add'>+	#ifdef __dietlibc__</div><div class='add'>+	LIBC=dietlibc</div><div class='add'>+	#endif</div><div class='add'>+EOF</div><div class='add'>+	eval `$CC_FOR_BUILD -E $dummy.c 2&gt;/dev/null | grep '^LIBC'`</div><div class='add'>+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"</div><div class='add'>+	exit ;;</div><div class='ctx'>     ia64:Linux:*:*)</div><div class='ctx'> 	echo ${UNAME_MACHINE}-unknown-linux-gnu</div><div class='ctx'> 	exit ;;</div><div class='hunk'>@@ -882,78 +913,34 @@ EOF</div><div class='ctx'>     m68*:Linux:*:*)</div><div class='ctx'> 	echo ${UNAME_MACHINE}-unknown-linux-gnu</div><div class='ctx'> 	exit ;;</div><div class='del'>-    mips:Linux:*:*)</div><div class='del'>-	eval $set_cc_for_build</div><div class='del'>-	sed 's/^	//' &lt;&lt; EOF &gt;$dummy.c</div><div class='del'>-	#undef CPU</div><div class='del'>-	#undef mips</div><div class='del'>-	#undef mipsel</div><div class='del'>-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)</div><div class='del'>-	CPU=mipsel</div><div class='del'>-	#else</div><div class='del'>-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)</div><div class='del'>-	CPU=mips</div><div class='del'>-	#else</div><div class='del'>-	CPU=</div><div class='del'>-	#endif</div><div class='del'>-	#endif</div><div class='del'>-EOF</div><div class='del'>-	eval "`$CC_FOR_BUILD -E $dummy.c 2&gt;/dev/null | sed -n '</div><div class='del'>-	    /^CPU/{</div><div class='del'>-		s: ::g</div><div class='del'>-		p</div><div class='del'>-	    }'`"</div><div class='del'>-	test x"${CPU}" != x &amp;&amp; { echo "${CPU}-unknown-linux-gnu"; exit; }</div><div class='del'>-	;;</div><div class='del'>-    mips64:Linux:*:*)</div><div class='add'>+    mips:Linux:*:* | mips64:Linux:*:*)</div><div class='ctx'> 	eval $set_cc_for_build</div><div class='ctx'> 	sed 's/^	//' &lt;&lt; EOF &gt;$dummy.c</div><div class='ctx'> 	#undef CPU</div><div class='del'>-	#undef mips64</div><div class='del'>-	#undef mips64el</div><div class='add'>+	#undef ${UNAME_MACHINE}</div><div class='add'>+	#undef ${UNAME_MACHINE}el</div><div class='ctx'> 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)</div><div class='del'>-	CPU=mips64el</div><div class='add'>+	CPU=${UNAME_MACHINE}el</div><div class='ctx'> 	#else</div><div class='ctx'> 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)</div><div class='del'>-	CPU=mips64</div><div class='add'>+	CPU=${UNAME_MACHINE}</div><div class='ctx'> 	#else</div><div class='ctx'> 	CPU=</div><div class='ctx'> 	#endif</div><div class='ctx'> 	#endif</div><div class='ctx'> EOF</div><div class='del'>-	eval "`$CC_FOR_BUILD -E $dummy.c 2&gt;/dev/null | sed -n '</div><div class='del'>-	    /^CPU/{</div><div class='del'>-		s: ::g</div><div class='del'>-		p</div><div class='del'>-	    }'`"</div><div class='add'>+	eval `$CC_FOR_BUILD -E $dummy.c 2&gt;/dev/null | grep '^CPU'`</div><div class='ctx'> 	test x"${CPU}" != x &amp;&amp; { echo "${CPU}-unknown-linux-gnu"; exit; }</div><div class='ctx'> 	;;</div><div class='ctx'>     or32:Linux:*:*)</div><div class='ctx'> 	echo or32-unknown-linux-gnu</div><div class='ctx'> 	exit ;;</div><div class='del'>-    ppc:Linux:*:*)</div><div class='del'>-	echo powerpc-unknown-linux-gnu</div><div class='del'>-	exit ;;</div><div class='del'>-    ppc64:Linux:*:*)</div><div class='del'>-	echo powerpc64-unknown-linux-gnu</div><div class='del'>-	exit ;;</div><div class='del'>-    alpha:Linux:*:*)</div><div class='del'>-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' &lt; /proc/cpuinfo` in</div><div class='del'>-	  EV5)   UNAME_MACHINE=alphaev5 ;;</div><div class='del'>-	  EV56)  UNAME_MACHINE=alphaev56 ;;</div><div class='del'>-	  PCA56) UNAME_MACHINE=alphapca56 ;;</div><div class='del'>-	  PCA57) UNAME_MACHINE=alphapca56 ;;</div><div class='del'>-	  EV6)   UNAME_MACHINE=alphaev6 ;;</div><div class='del'>-	  EV67)  UNAME_MACHINE=alphaev67 ;;</div><div class='del'>-	  EV68*) UNAME_MACHINE=alphaev68 ;;</div><div class='del'>-        esac</div><div class='del'>-	objdump --private-headers /bin/sh | grep ld.so.1 &gt;/dev/null</div><div class='del'>-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi</div><div class='del'>-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}</div><div class='del'>-	exit ;;</div><div class='ctx'>     padre:Linux:*:*)</div><div class='ctx'> 	echo sparc-unknown-linux-gnu</div><div class='ctx'> 	exit ;;</div><div class='add'>+    parisc64:Linux:*:* | hppa64:Linux:*:*)</div><div class='add'>+	echo hppa64-unknown-linux-gnu</div><div class='add'>+	exit ;;</div><div class='ctx'>     parisc:Linux:*:* | hppa:Linux:*:*)</div><div class='ctx'> 	# Look for CPU level</div><div class='ctx'> 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2&gt;/dev/null | cut -d' ' -f2` in</div><div class='hunk'>@@ -962,8 +949,11 @@ EOF</div><div class='ctx'> 	  *)    echo hppa-unknown-linux-gnu ;;</div><div class='ctx'> 	esac</div><div class='ctx'> 	exit ;;</div><div class='del'>-    parisc64:Linux:*:* | hppa64:Linux:*:*)</div><div class='del'>-	echo hppa64-unknown-linux-gnu</div><div class='add'>+    ppc64:Linux:*:*)</div><div class='add'>+	echo powerpc64-unknown-linux-gnu</div><div class='add'>+	exit ;;</div><div class='add'>+    ppc:Linux:*:*)</div><div class='add'>+	echo powerpc-unknown-linux-gnu</div><div class='ctx'> 	exit ;;</div><div class='ctx'>     s390:Linux:*:* | s390x:Linux:*:*)</div><div class='ctx'> 	echo ${UNAME_MACHINE}-ibm-linux</div><div class='hunk'>@@ -986,66 +976,6 @@ EOF</div><div class='ctx'>     xtensa*:Linux:*:*)</div><div class='ctx'>     	echo ${UNAME_MACHINE}-unknown-linux-gnu</div><div class='ctx'> 	exit ;;</div><div class='del'>-    i*86:Linux:*:*)</div><div class='del'>-	# The BFD linker knows what the default object file format is, so</div><div class='del'>-	# first see if it will tell us. cd to the root directory to prevent</div><div class='del'>-	# problems with other programs or directories called `ld' in the path.</div><div class='del'>-	# Set LC_ALL=C to ensure ld outputs messages in English.</div><div class='del'>-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2&gt;&amp;1 \</div><div class='del'>-			 | sed -ne '/supported targets:/!d</div><div class='del'>-				    s/[ 	][ 	]*/ /g</div><div class='del'>-				    s/.*supported targets: *//</div><div class='del'>-				    s/ .*//</div><div class='del'>-				    p'`</div><div class='del'>-        case "$ld_supported_targets" in</div><div class='del'>-	  elf32-i386)</div><div class='del'>-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"</div><div class='del'>-		;;</div><div class='del'>-	  a.out-i386-linux)</div><div class='del'>-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"</div><div class='del'>-		exit ;;</div><div class='del'>-	  "")</div><div class='del'>-		# Either a pre-BFD a.out linker (linux-gnuoldld) or</div><div class='del'>-		# one that does not give us useful --help.</div><div class='del'>-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"</div><div class='del'>-		exit ;;</div><div class='del'>-	esac</div><div class='del'>-	# Determine whether the default compiler is a.out or elf</div><div class='del'>-	eval $set_cc_for_build</div><div class='del'>-	sed 's/^	//' &lt;&lt; EOF &gt;$dummy.c</div><div class='del'>-	#include &lt;features.h&gt;</div><div class='del'>-	#ifdef __ELF__</div><div class='del'>-	# ifdef __GLIBC__</div><div class='del'>-	#  if __GLIBC__ &gt;= 2</div><div class='del'>-	LIBC=gnu</div><div class='del'>-	#  else</div><div class='del'>-	LIBC=gnulibc1</div><div class='del'>-	#  endif</div><div class='del'>-	# else</div><div class='del'>-	LIBC=gnulibc1</div><div class='del'>-	# endif</div><div class='del'>-	#else</div><div class='del'>-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)</div><div class='del'>-	LIBC=gnu</div><div class='del'>-	#else</div><div class='del'>-	LIBC=gnuaout</div><div class='del'>-	#endif</div><div class='del'>-	#endif</div><div class='del'>-	#ifdef __dietlibc__</div><div class='del'>-	LIBC=dietlibc</div><div class='del'>-	#endif</div><div class='del'>-EOF</div><div class='del'>-	eval "`$CC_FOR_BUILD -E $dummy.c 2&gt;/dev/null | sed -n '</div><div class='del'>-	    /^LIBC/{</div><div class='del'>-		s: ::g</div><div class='del'>-		p</div><div class='del'>-	    }'`"</div><div class='del'>-	test x"${LIBC}" != x &amp;&amp; {</div><div class='del'>-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"</div><div class='del'>-		exit</div><div class='del'>-	}</div><div class='del'>-	test x"${TENTATIVE}" != x &amp;&amp; { echo "${TENTATIVE}"; exit; }</div><div class='del'>-	;;</div><div class='ctx'>     i*86:DYNIX/ptx:4*:*)</div><div class='ctx'> 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.</div><div class='ctx'> 	# earlier versions are messed up and put the nodename in both</div><div class='hunk'>@@ -1074,7 +1004,7 @@ EOF</div><div class='ctx'>     i*86:syllable:*:*)</div><div class='ctx'> 	echo ${UNAME_MACHINE}-pc-syllable</div><div class='ctx'> 	exit ;;</div><div class='del'>-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)</div><div class='add'>+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)</div><div class='ctx'> 	echo i386-unknown-lynxos${UNAME_RELEASE}</div><div class='ctx'> 	exit ;;</div><div class='ctx'>     i*86:*DOS:*:*)</div><div class='hunk'>@@ -1182,7 +1112,7 @@ EOF</div><div class='ctx'>     rs6000:LynxOS:2.*:*)</div><div class='ctx'> 	echo rs6000-unknown-lynxos${UNAME_RELEASE}</div><div class='ctx'> 	exit ;;</div><div class='del'>-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)</div><div class='add'>+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)</div><div class='ctx'> 	echo powerpc-unknown-lynxos${UNAME_RELEASE}</div><div class='ctx'> 	exit ;;</div><div class='ctx'>     SM[BE]S:UNIX_SV:*:*)</div><div class='hunk'>@@ -1275,6 +1205,16 @@ EOF</div><div class='ctx'>     *:Darwin:*:*)</div><div class='ctx'> 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown</div><div class='ctx'> 	case $UNAME_PROCESSOR in</div><div class='add'>+	    i386)</div><div class='add'>+		eval $set_cc_for_build</div><div class='add'>+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then</div><div class='add'>+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \</div><div class='add'>+		      (CCOPTS= $CC_FOR_BUILD -E - 2&gt;/dev/null) | \</div><div class='add'>+		      grep IS_64BIT_ARCH &gt;/dev/null</div><div class='add'>+		  then</div><div class='add'>+		      UNAME_PROCESSOR="x86_64"</div><div class='add'>+		  fi</div><div class='add'>+		fi ;;</div><div class='ctx'> 	    unknown) UNAME_PROCESSOR=powerpc ;;</div><div class='ctx'> 	esac</div><div class='ctx'> 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}</div><div class='head'>diff --git a/src/3rdparty/libpng/config.sub b/src/3rdparty/libpng/config.sub<br/>index a39437d..2a55a50 100755..100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/config.sub?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/config.sub</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/config.sub?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/config.sub</a></div><div class='hunk'>@@ -1,10 +1,10 @@</div><div class='ctx'> #! /bin/sh</div><div class='ctx'> # Configuration validation subroutine script.</div><div class='ctx'> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,</div><div class='del'>-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008</div><div class='add'>+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009</div><div class='ctx'> #   Free Software Foundation, Inc.</div><div class='ctx'> </div><div class='del'>-timestamp='2009-04-17'</div><div class='add'>+timestamp='2009-11-20'</div><div class='ctx'> </div><div class='ctx'> # This file is (in principle) common to ALL GNU software.</div><div class='ctx'> # The presence of a machine in this file suggests that SOME GNU software</div><div class='hunk'>@@ -32,13 +32,16 @@ timestamp='2009-04-17'</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> # Please send patches to &lt;config-patches@gnu.org&gt;.  Submit a context</div><div class='del'>-# diff and a properly formatted ChangeLog entry.</div><div class='add'>+# diff and a properly formatted GNU ChangeLog entry.</div><div class='ctx'> #</div><div class='ctx'> # Configuration subroutine to validate and canonicalize a configuration type.</div><div class='ctx'> # Supply the specified configuration type as an argument.</div><div class='ctx'> # If it is invalid, we print an error message on stderr and exit with code 1.</div><div class='ctx'> # Otherwise, we print the canonical config type on stdout and succeed.</div><div class='ctx'> </div><div class='add'>+# You can get the latest version of this script from:</div><div class='add'>+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD</div><div class='add'>+</div><div class='ctx'> # This file is supposed to be the same for all GNU packages</div><div class='ctx'> # and recognize all the CPU types, system types and aliases</div><div class='ctx'> # that are meaningful with *any* GNU software.</div><div class='hunk'>@@ -149,10 +152,13 @@ case $os in</div><div class='ctx'> 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\</div><div class='ctx'> 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \</div><div class='ctx'> 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \</div><div class='del'>-	-apple | -axis | -knuth | -cray)</div><div class='add'>+	-apple | -axis | -knuth | -cray | -microblaze)</div><div class='ctx'> 		os=</div><div class='ctx'> 		basic_machine=$1</div><div class='ctx'> 		;;</div><div class='add'>+        -bluegene*)</div><div class='add'>+	        os=-cnk</div><div class='add'>+		;;</div><div class='ctx'> 	-sim | -cisco | -oki | -wec | -winbond)</div><div class='ctx'> 		os=</div><div class='ctx'> 		basic_machine=$1</div><div class='hunk'>@@ -281,6 +287,7 @@ case $basic_machine in</div><div class='ctx'> 	| pdp10 | pdp11 | pj | pjl \</div><div class='ctx'> 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \</div><div class='ctx'> 	| pyramid \</div><div class='add'>+	| rx \</div><div class='ctx'> 	| score \</div><div class='ctx'> 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \</div><div class='ctx'> 	| sh64 | sh64le \</div><div class='hunk'>@@ -288,13 +295,14 @@ case $basic_machine in</div><div class='ctx'> 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \</div><div class='ctx'> 	| spu | strongarm \</div><div class='ctx'> 	| tahoe | thumb | tic4x | tic80 | tron \</div><div class='add'>+	| ubicom32 \</div><div class='ctx'> 	| v850 | v850e \</div><div class='ctx'> 	| we32k \</div><div class='ctx'> 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \</div><div class='ctx'> 	| z8k | z80)</div><div class='ctx'> 		basic_machine=$basic_machine-unknown</div><div class='ctx'> 		;;</div><div class='del'>-	m6811 | m68hc11 | m6812 | m68hc12)</div><div class='add'>+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)</div><div class='ctx'> 		# Motorola 68HC11/12.</div><div class='ctx'> 		basic_machine=$basic_machine-unknown</div><div class='ctx'> 		os=-none</div><div class='hunk'>@@ -337,7 +345,7 @@ case $basic_machine in</div><div class='ctx'> 	| lm32-* \</div><div class='ctx'> 	| m32c-* | m32r-* | m32rle-* \</div><div class='ctx'> 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \</div><div class='del'>-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \</div><div class='add'>+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \</div><div class='ctx'> 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \</div><div class='ctx'> 	| mips16-* \</div><div class='ctx'> 	| mips64-* | mips64el-* \</div><div class='hunk'>@@ -365,7 +373,7 @@ case $basic_machine in</div><div class='ctx'> 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \</div><div class='ctx'> 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \</div><div class='ctx'> 	| pyramid-* \</div><div class='del'>-	| romp-* | rs6000-* \</div><div class='add'>+	| romp-* | rs6000-* | rx-* \</div><div class='ctx'> 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \</div><div class='ctx'> 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \</div><div class='ctx'> 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \</div><div class='hunk'>@@ -374,6 +382,7 @@ case $basic_machine in</div><div class='ctx'> 	| tahoe-* | thumb-* \</div><div class='ctx'> 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \</div><div class='ctx'> 	| tron-* \</div><div class='add'>+	| ubicom32-* \</div><div class='ctx'> 	| v850-* | v850e-* | vax-* \</div><div class='ctx'> 	| we32k-* \</div><div class='ctx'> 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \</div><div class='hunk'>@@ -467,6 +476,10 @@ case $basic_machine in</div><div class='ctx'> 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`</div><div class='ctx'> 		os=-linux</div><div class='ctx'> 		;;</div><div class='add'>+	bluegene*)</div><div class='add'>+		basic_machine=powerpc-ibm</div><div class='add'>+		os=-cnk</div><div class='add'>+		;;</div><div class='ctx'> 	c90)</div><div class='ctx'> 		basic_machine=c90-cray</div><div class='ctx'> 		os=-unicos</div><div class='hunk'>@@ -719,6 +732,9 @@ case $basic_machine in</div><div class='ctx'> 		basic_machine=ns32k-utek</div><div class='ctx'> 		os=-sysv</div><div class='ctx'> 		;;</div><div class='add'>+        microblaze)</div><div class='add'>+		basic_machine=microblaze-xilinx</div><div class='add'>+		;;</div><div class='ctx'> 	mingw32)</div><div class='ctx'> 		basic_machine=i386-pc</div><div class='ctx'> 		os=-mingw32</div><div class='hunk'>@@ -1240,6 +1256,9 @@ case $os in</div><div class='ctx'>         # First match some system type aliases</div><div class='ctx'>         # that might get confused with valid system types.</div><div class='ctx'> 	# -solaris* is a basic system type, with this one exception.</div><div class='add'>+        -auroraux)</div><div class='add'>+	        os=-auroraux</div><div class='add'>+		;;</div><div class='ctx'> 	-solaris1 | -solaris1.*)</div><div class='ctx'> 		os=`echo $os | sed -e 's|solaris1|sunos4|'`</div><div class='ctx'> 		;;</div><div class='hunk'>@@ -1260,9 +1279,9 @@ case $os in</div><div class='ctx'> 	# Each alternative MUST END IN A *, to match a version number.</div><div class='ctx'> 	# -sysv* is not here because it comes later, after sysvr4.</div><div class='ctx'> 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \</div><div class='del'>-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\</div><div class='del'>-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \</div><div class='del'>-	      | -kopensolaris* \</div><div class='add'>+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\</div><div class='add'>+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \</div><div class='add'>+	      | -sym* | -kopensolaris* \</div><div class='ctx'> 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \</div><div class='ctx'> 	      | -aos* | -aros* \</div><div class='ctx'> 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \</div><div class='hunk'>@@ -1283,7 +1302,7 @@ case $os in</div><div class='ctx'> 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \</div><div class='ctx'> 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \</div><div class='ctx'> 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \</div><div class='del'>-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)</div><div class='add'>+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)</div><div class='ctx'> 	# Remember, each alternative MUST END IN *, to match a version number.</div><div class='ctx'> 		;;</div><div class='ctx'> 	-qnx*)</div><div class='hunk'>@@ -1613,7 +1632,7 @@ case $basic_machine in</div><div class='ctx'> 			-sunos*)</div><div class='ctx'> 				vendor=sun</div><div class='ctx'> 				;;</div><div class='del'>-			-aix*)</div><div class='add'>+			-cnk*|-aix*)</div><div class='ctx'> 				vendor=ibm</div><div class='ctx'> 				;;</div><div class='ctx'> 			-beos*)</div><div class='head'>diff --git a/src/3rdparty/libpng/configure b/src/3rdparty/libpng/configure<br/>deleted file mode 100755<br/>index 347d34b..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/configure?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/configure</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,13839 +0,0 @@</div><div class='del'>-#! /bin/sh</div><div class='del'>-# Guess values for system-dependent variables and create Makefiles.</div><div class='del'>-# Generated by GNU Autoconf 2.65 for libpng 1.4.0.</div><div class='del'>-#</div><div class='del'>-# Report bugs to &lt;png-mng-implement@lists.sourceforge.net&gt;.</div><div class='del'>-#</div><div class='del'>-#</div><div class='del'>-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,</div><div class='del'>-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,</div><div class='del'>-# Inc.</div><div class='del'>-#</div><div class='del'>-#</div><div class='del'>-# This configure script is free software; the Free Software Foundation</div><div class='del'>-# gives unlimited permission to copy, distribute and modify it.</div><div class='del'>-## -------------------- ##</div><div class='del'>-## M4sh Initialization. ##</div><div class='del'>-## -------------------- ##</div><div class='del'>-</div><div class='del'>-# Be more Bourne compatible</div><div class='del'>-DUALCASE=1; export DUALCASE # for MKS sh</div><div class='del'>-if test -n "${ZSH_VERSION+set}" &amp;&amp; (emulate sh) &gt;/dev/null 2&gt;&amp;1; then :</div><div class='del'>-  emulate sh</div><div class='del'>-  NULLCMD=:</div><div class='del'>-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which</div><div class='del'>-  # is contrary to our usage.  Disable this feature.</div><div class='del'>-  alias -g '${1+"$@"}'='"$@"'</div><div class='del'>-  setopt NO_GLOB_SUBST</div><div class='del'>-else</div><div class='del'>-  case `(set -o) 2&gt;/dev/null` in #(</div><div class='del'>-  *posix*) :</div><div class='del'>-    set -o posix ;; #(</div><div class='del'>-  *) :</div><div class='del'>-     ;;</div><div class='del'>-esac</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-as_nl='</div><div class='del'>-'</div><div class='del'>-export as_nl</div><div class='del'>-# Printing a long string crashes Solaris 7 /usr/bin/printf.</div><div class='del'>-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'</div><div class='del'>-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo</div><div class='del'>-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo</div><div class='del'>-# Prefer a ksh shell builtin over an external printf program on Solaris,</div><div class='del'>-# but without wasting forks for bash or zsh.</div><div class='del'>-if test -z "$BASH_VERSION$ZSH_VERSION" \</div><div class='del'>-    &amp;&amp; (test "X`print -r -- $as_echo`" = "X$as_echo") 2&gt;/dev/null; then</div><div class='del'>-  as_echo='print -r --'</div><div class='del'>-  as_echo_n='print -rn --'</div><div class='del'>-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2&gt;/dev/null; then</div><div class='del'>-  as_echo='printf %s\n'</div><div class='del'>-  as_echo_n='printf %s'</div><div class='del'>-else</div><div class='del'>-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2&gt;/dev/null`" = "X-n $as_echo"; then</div><div class='del'>-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'</div><div class='del'>-    as_echo_n='/usr/ucb/echo -n'</div><div class='del'>-  else</div><div class='del'>-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'</div><div class='del'>-    as_echo_n_body='eval</div><div class='del'>-      arg=$1;</div><div class='del'>-      case $arg in #(</div><div class='del'>-      *"$as_nl"*)</div><div class='del'>-	expr "X$arg" : "X\\(.*\\)$as_nl";</div><div class='del'>-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;</div><div class='del'>-      esac;</div><div class='del'>-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"</div><div class='del'>-    '</div><div class='del'>-    export as_echo_n_body</div><div class='del'>-    as_echo_n='sh -c $as_echo_n_body as_echo'</div><div class='del'>-  fi</div><div class='del'>-  export as_echo_body</div><div class='del'>-  as_echo='sh -c $as_echo_body as_echo'</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# The user is always right.</div><div class='del'>-if test "${PATH_SEPARATOR+set}" != set; then</div><div class='del'>-  PATH_SEPARATOR=:</div><div class='del'>-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) &gt;/dev/null 2&gt;&amp;1 &amp;&amp; {</div><div class='del'>-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) &gt;/dev/null 2&gt;&amp;1 ||</div><div class='del'>-      PATH_SEPARATOR=';'</div><div class='del'>-  }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# IFS</div><div class='del'>-# We need space, tab and new line, in precisely that order.  Quoting is</div><div class='del'>-# there to prevent editors from complaining about space-tab.</div><div class='del'>-# (If _AS_PATH_WALK were called with IFS unset, it would disable word</div><div class='del'>-# splitting by setting IFS to empty value.)</div><div class='del'>-IFS=" ""	$as_nl"</div><div class='del'>-</div><div class='del'>-# Find who we are.  Look in the path if we contain no directory separator.</div><div class='del'>-case $0 in #((</div><div class='del'>-  *[\\/]* ) as_myself=$0 ;;</div><div class='del'>-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    test -r "$as_dir/$0" &amp;&amp; as_myself=$as_dir/$0 &amp;&amp; break</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-     ;;</div><div class='del'>-esac</div><div class='del'>-# We did not find ourselves, most probably we were run as `sh COMMAND'</div><div class='del'>-# in which case we are not to be found in the path.</div><div class='del'>-if test "x$as_myself" = x; then</div><div class='del'>-  as_myself=$0</div><div class='del'>-fi</div><div class='del'>-if test ! -f "$as_myself"; then</div><div class='del'>-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" &gt;&amp;2</div><div class='del'>-  exit 1</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Unset variables that we do not need and which cause bugs (e.g. in</div><div class='del'>-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"</div><div class='del'>-# suppresses any "Segmentation fault" message there.  '((' could</div><div class='del'>-# trigger a bug in pdksh 5.2.14.</div><div class='del'>-for as_var in BASH_ENV ENV MAIL MAILPATH</div><div class='del'>-do eval test x\${$as_var+set} = xset \</div><div class='del'>-  &amp;&amp; ( (unset $as_var) || exit 1) &gt;/dev/null 2&gt;&amp;1 &amp;&amp; unset $as_var || :</div><div class='del'>-done</div><div class='del'>-PS1='$ '</div><div class='del'>-PS2='&gt; '</div><div class='del'>-PS4='+ '</div><div class='del'>-</div><div class='del'>-# NLS nuisances.</div><div class='del'>-LC_ALL=C</div><div class='del'>-export LC_ALL</div><div class='del'>-LANGUAGE=C</div><div class='del'>-export LANGUAGE</div><div class='del'>-</div><div class='del'>-# CDPATH.</div><div class='del'>-(unset CDPATH) &gt;/dev/null 2&gt;&amp;1 &amp;&amp; unset CDPATH</div><div class='del'>-</div><div class='del'>-if test "x$CONFIG_SHELL" = x; then</div><div class='del'>-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" &amp;&amp; (emulate sh) &gt;/dev/null 2&gt;&amp;1; then :</div><div class='del'>-  emulate sh</div><div class='del'>-  NULLCMD=:</div><div class='del'>-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which</div><div class='del'>-  # is contrary to our usage.  Disable this feature.</div><div class='del'>-  alias -g '\${1+\"\$@\"}'='\"\$@\"'</div><div class='del'>-  setopt NO_GLOB_SUBST</div><div class='del'>-else</div><div class='del'>-  case \`(set -o) 2&gt;/dev/null\` in #(</div><div class='del'>-  *posix*) :</div><div class='del'>-    set -o posix ;; #(</div><div class='del'>-  *) :</div><div class='del'>-     ;;</div><div class='del'>-esac</div><div class='del'>-fi</div><div class='del'>-"</div><div class='del'>-  as_required="as_fn_return () { (exit \$1); }</div><div class='del'>-as_fn_success () { as_fn_return 0; }</div><div class='del'>-as_fn_failure () { as_fn_return 1; }</div><div class='del'>-as_fn_ret_success () { return 0; }</div><div class='del'>-as_fn_ret_failure () { return 1; }</div><div class='del'>-</div><div class='del'>-exitcode=0</div><div class='del'>-as_fn_success || { exitcode=1; echo as_fn_success failed.; }</div><div class='del'>-as_fn_failure &amp;&amp; { exitcode=1; echo as_fn_failure succeeded.; }</div><div class='del'>-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }</div><div class='del'>-as_fn_ret_failure &amp;&amp; { exitcode=1; echo as_fn_ret_failure succeeded.; }</div><div class='del'>-if ( set x; as_fn_ret_success y &amp;&amp; test x = \"\$1\" ); then :</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  exitcode=1; echo positional parameters were not saved.</div><div class='del'>-fi</div><div class='del'>-test x\$exitcode = x0 || exit 1"</div><div class='del'>-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO</div><div class='del'>-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO</div><div class='del'>-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &amp;&amp;</div><div class='del'>-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1</div><div class='del'>-test \$(( 1 + 1 )) = 2 || exit 1"</div><div class='del'>-  if (eval "$as_required") 2&gt;/dev/null; then :</div><div class='del'>-  as_have_required=yes</div><div class='del'>-else</div><div class='del'>-  as_have_required=no</div><div class='del'>-fi</div><div class='del'>-  if test x$as_have_required = xyes &amp;&amp; (eval "$as_suggested") 2&gt;/dev/null; then :</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-as_found=false</div><div class='del'>-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-  as_found=:</div><div class='del'>-  case $as_dir in #(</div><div class='del'>-	 /*)</div><div class='del'>-	   for as_base in sh bash ksh sh5; do</div><div class='del'>-	     # Try only shells that exist, to save several forks.</div><div class='del'>-	     as_shell=$as_dir/$as_base</div><div class='del'>-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &amp;&amp;</div><div class='del'>-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2&gt;/dev/null; then :</div><div class='del'>-  CONFIG_SHELL=$as_shell as_have_required=yes</div><div class='del'>-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2&gt;/dev/null; then :</div><div class='del'>-  break 2</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-	   done;;</div><div class='del'>-       esac</div><div class='del'>-  as_found=false</div><div class='del'>-done</div><div class='del'>-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &amp;&amp;</div><div class='del'>-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2&gt;/dev/null; then :</div><div class='del'>-  CONFIG_SHELL=$SHELL as_have_required=yes</div><div class='del'>-fi; }</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-      if test "x$CONFIG_SHELL" != x; then :</div><div class='del'>-  # We cannot yet assume a decent shell, so we have to provide a</div><div class='del'>-	# neutralization value for shells without unset; and this also</div><div class='del'>-	# works around shells that cannot unset nonexistent variables.</div><div class='del'>-	BASH_ENV=/dev/null</div><div class='del'>-	ENV=/dev/null</div><div class='del'>-	(unset BASH_ENV) &gt;/dev/null 2&gt;&amp;1 &amp;&amp; unset BASH_ENV ENV</div><div class='del'>-	export CONFIG_SHELL</div><div class='del'>-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-    if test x$as_have_required = xno; then :</div><div class='del'>-  $as_echo "$0: This script requires a shell more modern than all"</div><div class='del'>-  $as_echo "$0: the shells that I found on your system."</div><div class='del'>-  if test x${ZSH_VERSION+set} = xset ; then</div><div class='del'>-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"</div><div class='del'>-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."</div><div class='del'>-  else</div><div class='del'>-    $as_echo "$0: Please tell bug-autoconf@gnu.org and</div><div class='del'>-$0: png-mng-implement@lists.sourceforge.net about your</div><div class='del'>-$0: system, including any error possibly output before this</div><div class='del'>-$0: message. Then install a modern shell, or manually run</div><div class='del'>-$0: the script under such a shell if you do have one."</div><div class='del'>-  fi</div><div class='del'>-  exit 1</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-SHELL=${CONFIG_SHELL-/bin/sh}</div><div class='del'>-export SHELL</div><div class='del'>-# Unset more variables known to interfere with behavior of common tools.</div><div class='del'>-CLICOLOR_FORCE= GREP_OPTIONS=</div><div class='del'>-unset CLICOLOR_FORCE GREP_OPTIONS</div><div class='del'>-</div><div class='del'>-## --------------------- ##</div><div class='del'>-## M4sh Shell Functions. ##</div><div class='del'>-## --------------------- ##</div><div class='del'>-# as_fn_unset VAR</div><div class='del'>-# ---------------</div><div class='del'>-# Portably unset VAR.</div><div class='del'>-as_fn_unset ()</div><div class='del'>-{</div><div class='del'>-  { eval $1=; unset $1;}</div><div class='del'>-}</div><div class='del'>-as_unset=as_fn_unset</div><div class='del'>-</div><div class='del'>-# as_fn_set_status STATUS</div><div class='del'>-# -----------------------</div><div class='del'>-# Set $? to STATUS, without forking.</div><div class='del'>-as_fn_set_status ()</div><div class='del'>-{</div><div class='del'>-  return $1</div><div class='del'>-} # as_fn_set_status</div><div class='del'>-</div><div class='del'>-# as_fn_exit STATUS</div><div class='del'>-# -----------------</div><div class='del'>-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.</div><div class='del'>-as_fn_exit ()</div><div class='del'>-{</div><div class='del'>-  set +e</div><div class='del'>-  as_fn_set_status $1</div><div class='del'>-  exit $1</div><div class='del'>-} # as_fn_exit</div><div class='del'>-</div><div class='del'>-# as_fn_mkdir_p</div><div class='del'>-# -------------</div><div class='del'>-# Create "$as_dir" as a directory, including parents if necessary.</div><div class='del'>-as_fn_mkdir_p ()</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-  case $as_dir in #(</div><div class='del'>-  -*) as_dir=./$as_dir;;</div><div class='del'>-  esac</div><div class='del'>-  test -d "$as_dir" || eval $as_mkdir_p || {</div><div class='del'>-    as_dirs=</div><div class='del'>-    while :; do</div><div class='del'>-      case $as_dir in #(</div><div class='del'>-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(</div><div class='del'>-      *) as_qdir=$as_dir;;</div><div class='del'>-      esac</div><div class='del'>-      as_dirs="'$as_qdir' $as_dirs"</div><div class='del'>-      as_dir=`$as_dirname -- "$as_dir" ||</div><div class='del'>-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \</div><div class='del'>-	 X"$as_dir" : 'X\(//\)[^/]' \| \</div><div class='del'>-	 X"$as_dir" : 'X\(//\)$' \| \</div><div class='del'>-	 X"$as_dir" : 'X\(/\)' \| . 2&gt;/dev/null ||</div><div class='del'>-$as_echo X"$as_dir" |</div><div class='del'>-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\/\)[^/].*/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\/\)$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\).*/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  s/.*/./; q'`</div><div class='del'>-      test -d "$as_dir" &amp;&amp; break</div><div class='del'>-    done</div><div class='del'>-    test -z "$as_dirs" || eval "mkdir $as_dirs"</div><div class='del'>-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-} # as_fn_mkdir_p</div><div class='del'>-# as_fn_append VAR VALUE</div><div class='del'>-# ----------------------</div><div class='del'>-# Append the text in VALUE to the end of the definition contained in VAR. Take</div><div class='del'>-# advantage of any shell optimizations that allow amortized linear growth over</div><div class='del'>-# repeated appends, instead of the typical quadratic growth present in naive</div><div class='del'>-# implementations.</div><div class='del'>-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2&gt;/dev/null; then :</div><div class='del'>-  eval 'as_fn_append ()</div><div class='del'>-  {</div><div class='del'>-    eval $1+=\$2</div><div class='del'>-  }'</div><div class='del'>-else</div><div class='del'>-  as_fn_append ()</div><div class='del'>-  {</div><div class='del'>-    eval $1=\$$1\$2</div><div class='del'>-  }</div><div class='del'>-fi # as_fn_append</div><div class='del'>-</div><div class='del'>-# as_fn_arith ARG...</div><div class='del'>-# ------------------</div><div class='del'>-# Perform arithmetic evaluation on the ARGs, and store the result in the</div><div class='del'>-# global $as_val. Take advantage of shells that can avoid forks. The arguments</div><div class='del'>-# must be portable across $(()) and expr.</div><div class='del'>-if (eval "test \$(( 1 + 1 )) = 2") 2&gt;/dev/null; then :</div><div class='del'>-  eval 'as_fn_arith ()</div><div class='del'>-  {</div><div class='del'>-    as_val=$(( $* ))</div><div class='del'>-  }'</div><div class='del'>-else</div><div class='del'>-  as_fn_arith ()</div><div class='del'>-  {</div><div class='del'>-    as_val=`expr "$@" || test $? -eq 1`</div><div class='del'>-  }</div><div class='del'>-fi # as_fn_arith</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# as_fn_error ERROR [LINENO LOG_FD]</div><div class='del'>-# ---------------------------------</div><div class='del'>-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are</div><div class='del'>-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the</div><div class='del'>-# script with status $?, using 1 if that was 0.</div><div class='del'>-as_fn_error ()</div><div class='del'>-{</div><div class='del'>-  as_status=$?; test $as_status -eq 0 &amp;&amp; as_status=1</div><div class='del'>-  if test "$3"; then</div><div class='del'>-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" &gt;&amp;$3</div><div class='del'>-  fi</div><div class='del'>-  $as_echo "$as_me: error: $1" &gt;&amp;2</div><div class='del'>-  as_fn_exit $as_status</div><div class='del'>-} # as_fn_error</div><div class='del'>-</div><div class='del'>-if expr a : '\(a\)' &gt;/dev/null 2&gt;&amp;1 &amp;&amp;</div><div class='del'>-   test "X`expr 00001 : '.*\(...\)'`" = X001; then</div><div class='del'>-  as_expr=expr</div><div class='del'>-else</div><div class='del'>-  as_expr=false</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if (basename -- /) &gt;/dev/null 2&gt;&amp;1 &amp;&amp; test "X`basename -- / 2&gt;&amp;1`" = "X/"; then</div><div class='del'>-  as_basename=basename</div><div class='del'>-else</div><div class='del'>-  as_basename=false</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if (as_dir=`dirname -- /` &amp;&amp; test "X$as_dir" = X/) &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-  as_dirname=dirname</div><div class='del'>-else</div><div class='del'>-  as_dirname=false</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-as_me=`$as_basename -- "$0" ||</div><div class='del'>-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \</div><div class='del'>-	 X"$0" : 'X\(//\)$' \| \</div><div class='del'>-	 X"$0" : 'X\(/\)' \| . 2&gt;/dev/null ||</div><div class='del'>-$as_echo X/"$0" |</div><div class='del'>-    sed '/^.*\/\([^/][^/]*\)\/*$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\/\(\/\/\)$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\/\(\/\).*/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  s/.*/./; q'`</div><div class='del'>-</div><div class='del'>-# Avoid depending upon Character Ranges.</div><div class='del'>-as_cr_letters='abcdefghijklmnopqrstuvwxyz'</div><div class='del'>-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'</div><div class='del'>-as_cr_Letters=$as_cr_letters$as_cr_LETTERS</div><div class='del'>-as_cr_digits='0123456789'</div><div class='del'>-as_cr_alnum=$as_cr_Letters$as_cr_digits</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  as_lineno_1=$LINENO as_lineno_1a=$LINENO</div><div class='del'>-  as_lineno_2=$LINENO as_lineno_2a=$LINENO</div><div class='del'>-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &amp;&amp;</div><div class='del'>-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {</div><div class='del'>-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)</div><div class='del'>-  sed -n '</div><div class='del'>-    p</div><div class='del'>-    /[$]LINENO/=</div><div class='del'>-  ' &lt;$as_myself |</div><div class='del'>-    sed '</div><div class='del'>-      s/[$]LINENO.*/&amp;-/</div><div class='del'>-      t lineno</div><div class='del'>-      b</div><div class='del'>-      :lineno</div><div class='del'>-      N</div><div class='del'>-      :loop</div><div class='del'>-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/</div><div class='del'>-      t loop</div><div class='del'>-      s/-\n.*//</div><div class='del'>-    ' &gt;$as_me.lineno &amp;&amp;</div><div class='del'>-  chmod +x "$as_me.lineno" ||</div><div class='del'>-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" &gt;&amp;2; as_fn_exit 1; }</div><div class='del'>-</div><div class='del'>-  # Don't try to exec as it changes $[0], causing all sort of problems</div><div class='del'>-  # (the dirname of $[0] is not the place where we might find the</div><div class='del'>-  # original and so on.  Autoconf is especially sensitive to this).</div><div class='del'>-  . "./$as_me.lineno"</div><div class='del'>-  # Exit status is that of the last command.</div><div class='del'>-  exit</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECHO_C= ECHO_N= ECHO_T=</div><div class='del'>-case `echo -n x` in #(((((</div><div class='del'>--n*)</div><div class='del'>-  case `echo 'xy\c'` in</div><div class='del'>-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.</div><div class='del'>-  xy)  ECHO_C='\c';;</div><div class='del'>-  *)   echo `echo ksh88 bug on AIX 6.1` &gt; /dev/null</div><div class='del'>-       ECHO_T='	';;</div><div class='del'>-  esac;;</div><div class='del'>-*)</div><div class='del'>-  ECHO_N='-n';;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-rm -f conf$$ conf$$.exe conf$$.file</div><div class='del'>-if test -d conf$$.dir; then</div><div class='del'>-  rm -f conf$$.dir/conf$$.file</div><div class='del'>-else</div><div class='del'>-  rm -f conf$$.dir</div><div class='del'>-  mkdir conf$$.dir 2&gt;/dev/null</div><div class='del'>-fi</div><div class='del'>-if (echo &gt;conf$$.file) 2&gt;/dev/null; then</div><div class='del'>-  if ln -s conf$$.file conf$$ 2&gt;/dev/null; then</div><div class='del'>-    as_ln_s='ln -s'</div><div class='del'>-    # ... but there are two gotchas:</div><div class='del'>-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.</div><div class='del'>-    # 2) DJGPP &lt; 2.04 has no symlinks; `ln -s' creates a wrapper executable.</div><div class='del'>-    # In both cases, we have to default to `cp -p'.</div><div class='del'>-    ln -s conf$$.file conf$$.dir 2&gt;/dev/null &amp;&amp; test ! -f conf$$.exe ||</div><div class='del'>-      as_ln_s='cp -p'</div><div class='del'>-  elif ln conf$$.file conf$$ 2&gt;/dev/null; then</div><div class='del'>-    as_ln_s=ln</div><div class='del'>-  else</div><div class='del'>-    as_ln_s='cp -p'</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  as_ln_s='cp -p'</div><div class='del'>-fi</div><div class='del'>-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file</div><div class='del'>-rmdir conf$$.dir 2&gt;/dev/null</div><div class='del'>-</div><div class='del'>-if mkdir -p . 2&gt;/dev/null; then</div><div class='del'>-  as_mkdir_p='mkdir -p "$as_dir"'</div><div class='del'>-else</div><div class='del'>-  test -d ./-p &amp;&amp; rmdir ./-p</div><div class='del'>-  as_mkdir_p=false</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test -x / &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-  as_test_x='test -x'</div><div class='del'>-else</div><div class='del'>-  if ls -dL / &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-    as_ls_L_option=L</div><div class='del'>-  else</div><div class='del'>-    as_ls_L_option=</div><div class='del'>-  fi</div><div class='del'>-  as_test_x='</div><div class='del'>-    eval sh -c '\''</div><div class='del'>-      if test -d "$1"; then</div><div class='del'>-	test -d "$1/.";</div><div class='del'>-      else</div><div class='del'>-	case $1 in #(</div><div class='del'>-	-*)set "./$1";;</div><div class='del'>-	esac;</div><div class='del'>-	case `ls -ld'$as_ls_L_option' "$1" 2&gt;/dev/null` in #((</div><div class='del'>-	???[sx]*):;;*)false;;esac;fi</div><div class='del'>-    '\'' sh</div><div class='del'>-  '</div><div class='del'>-fi</div><div class='del'>-as_executable_p=$as_test_x</div><div class='del'>-</div><div class='del'>-# Sed expression to map a string onto a valid CPP name.</div><div class='del'>-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"</div><div class='del'>-</div><div class='del'>-# Sed expression to map a string onto a valid variable name.</div><div class='del'>-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Check that we are running under the correct shell.</div><div class='del'>-SHELL=${CONFIG_SHELL-/bin/sh}</div><div class='del'>-</div><div class='del'>-case X$lt_ECHO in</div><div class='del'>-X*--fallback-echo)</div><div class='del'>-  # Remove one level of quotation (which was required for Make).</div><div class='del'>-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-ECHO=${lt_ECHO-echo}</div><div class='del'>-if test "X$1" = X--no-reexec; then</div><div class='del'>-  # Discard the --no-reexec flag, and continue.</div><div class='del'>-  shift</div><div class='del'>-elif test "X$1" = X--fallback-echo; then</div><div class='del'>-  # Avoid inline document here, it may be left over</div><div class='del'>-  :</div><div class='del'>-elif test "X`{ $ECHO '\t'; } 2&gt;/dev/null`" = 'X\t' ; then</div><div class='del'>-  # Yippee, $ECHO works!</div><div class='del'>-  :</div><div class='del'>-else</div><div class='del'>-  # Restart under the correct shell.</div><div class='del'>-  exec $SHELL "$0" --no-reexec ${1+"$@"}</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test "X$1" = X--fallback-echo; then</div><div class='del'>-  # used as fallback echo</div><div class='del'>-  shift</div><div class='del'>-  cat &lt;&lt;_LT_EOF</div><div class='del'>-$*</div><div class='del'>-_LT_EOF</div><div class='del'>-  exit 0</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# The HP-UX ksh and POSIX shell print the target directory to stdout</div><div class='del'>-# if CDPATH is set.</div><div class='del'>-(unset CDPATH) &gt;/dev/null 2&gt;&amp;1 &amp;&amp; unset CDPATH</div><div class='del'>-</div><div class='del'>-if test -z "$lt_ECHO"; then</div><div class='del'>-  if test "X${echo_test_string+set}" != Xset; then</div><div class='del'>-    # find a string as large as possible, as long as the shell can cope with it</div><div class='del'>-    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do</div><div class='del'>-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...</div><div class='del'>-      if { echo_test_string=`eval $cmd`; } 2&gt;/dev/null &amp;&amp;</div><div class='del'>-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2&gt;/dev/null</div><div class='del'>-      then</div><div class='del'>-        break</div><div class='del'>-      fi</div><div class='del'>-    done</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  if test "X`{ $ECHO '\t'; } 2&gt;/dev/null`" = 'X\t' &amp;&amp;</div><div class='del'>-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-     test "X$echo_testing_string" = "X$echo_test_string"; then</div><div class='del'>-    :</div><div class='del'>-  else</div><div class='del'>-    # The Solaris, AIX, and Digital Unix default echo programs unquote</div><div class='del'>-    # backslashes.  This makes it impossible to quote backslashes using</div><div class='del'>-    #   echo "$something" | sed 's/\\/\\\\/g'</div><div class='del'>-    #</div><div class='del'>-    # So, first we look for a working echo in the user's PATH.</div><div class='del'>-</div><div class='del'>-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR</div><div class='del'>-    for dir in $PATH /usr/ucb; do</div><div class='del'>-      IFS="$lt_save_ifs"</div><div class='del'>-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &amp;&amp;</div><div class='del'>-         test "X`($dir/echo '\t') 2&gt;/dev/null`" = 'X\t' &amp;&amp;</div><div class='del'>-         echo_testing_string=`($dir/echo "$echo_test_string") 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-         test "X$echo_testing_string" = "X$echo_test_string"; then</div><div class='del'>-        ECHO="$dir/echo"</div><div class='del'>-        break</div><div class='del'>-      fi</div><div class='del'>-    done</div><div class='del'>-    IFS="$lt_save_ifs"</div><div class='del'>-</div><div class='del'>-    if test "X$ECHO" = Xecho; then</div><div class='del'>-      # We didn't find a better echo, so look for alternatives.</div><div class='del'>-      if test "X`{ print -r '\t'; } 2&gt;/dev/null`" = 'X\t' &amp;&amp;</div><div class='del'>-         echo_testing_string=`{ print -r "$echo_test_string"; } 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-         test "X$echo_testing_string" = "X$echo_test_string"; then</div><div class='del'>-        # This shell has a builtin print -r that does the trick.</div><div class='del'>-        ECHO='print -r'</div><div class='del'>-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &amp;&amp;</div><div class='del'>-	   test "X$CONFIG_SHELL" != X/bin/ksh; then</div><div class='del'>-        # If we have ksh, try running configure again with it.</div><div class='del'>-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}</div><div class='del'>-        export ORIGINAL_CONFIG_SHELL</div><div class='del'>-        CONFIG_SHELL=/bin/ksh</div><div class='del'>-        export CONFIG_SHELL</div><div class='del'>-        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}</div><div class='del'>-      else</div><div class='del'>-        # Try using printf.</div><div class='del'>-        ECHO='printf %s\n'</div><div class='del'>-        if test "X`{ $ECHO '\t'; } 2&gt;/dev/null`" = 'X\t' &amp;&amp;</div><div class='del'>-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-	   test "X$echo_testing_string" = "X$echo_test_string"; then</div><div class='del'>-	  # Cool, printf works</div><div class='del'>-	  :</div><div class='del'>-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-	     test "X$echo_testing_string" = 'X\t' &amp;&amp;</div><div class='del'>-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-	     test "X$echo_testing_string" = "X$echo_test_string"; then</div><div class='del'>-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL</div><div class='del'>-	  export CONFIG_SHELL</div><div class='del'>-	  SHELL="$CONFIG_SHELL"</div><div class='del'>-	  export SHELL</div><div class='del'>-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"</div><div class='del'>-        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-	     test "X$echo_testing_string" = 'X\t' &amp;&amp;</div><div class='del'>-	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-	     test "X$echo_testing_string" = "X$echo_test_string"; then</div><div class='del'>-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"</div><div class='del'>-        else</div><div class='del'>-	  # maybe with a smaller string...</div><div class='del'>-	  prev=:</div><div class='del'>-</div><div class='del'>-	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do</div><div class='del'>-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2&gt;/dev/null</div><div class='del'>-	    then</div><div class='del'>-	      break</div><div class='del'>-	    fi</div><div class='del'>-	    prev="$cmd"</div><div class='del'>-	  done</div><div class='del'>-</div><div class='del'>-	  if test "$prev" != 'sed 50q "$0"'; then</div><div class='del'>-	    echo_test_string=`eval $prev`</div><div class='del'>-	    export echo_test_string</div><div class='del'>-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}</div><div class='del'>-	  else</div><div class='del'>-	    # Oops.  We lost completely, so just stick with echo.</div><div class='del'>-	    ECHO=echo</div><div class='del'>-	  fi</div><div class='del'>-        fi</div><div class='del'>-      fi</div><div class='del'>-    fi</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Copy echo and quote the copy suitably for passing to libtool from</div><div class='del'>-# the Makefile, instead of quoting the original, which is used later.</div><div class='del'>-lt_ECHO=$ECHO</div><div class='del'>-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then</div><div class='del'>-   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-test -n "$DJDIR" || exec 7&lt;&amp;0 &lt;/dev/null</div><div class='del'>-exec 6&gt;&amp;1</div><div class='del'>-</div><div class='del'>-# Name of the host.</div><div class='del'>-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,</div><div class='del'>-# so uname gets run too.</div><div class='del'>-ac_hostname=`(hostname || uname -n) 2&gt;/dev/null | sed 1q`</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Initializations.</div><div class='del'>-#</div><div class='del'>-ac_default_prefix=/usr/local</div><div class='del'>-ac_clean_files=</div><div class='del'>-ac_config_libobj_dir=.</div><div class='del'>-LIBOBJS=</div><div class='del'>-cross_compiling=no</div><div class='del'>-subdirs=</div><div class='del'>-MFLAGS=</div><div class='del'>-MAKEFLAGS=</div><div class='del'>-</div><div class='del'>-# Identity of this package.</div><div class='del'>-PACKAGE_NAME='libpng'</div><div class='del'>-PACKAGE_TARNAME='libpng'</div><div class='del'>-PACKAGE_VERSION='1.4.0'</div><div class='del'>-PACKAGE_STRING='libpng 1.4.0'</div><div class='del'>-PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'</div><div class='del'>-PACKAGE_URL=''</div><div class='del'>-</div><div class='del'>-ac_unique_file="pngget.c"</div><div class='del'>-# Factoring default headers for most tests.</div><div class='del'>-ac_includes_default="\</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#ifdef HAVE_SYS_TYPES_H</div><div class='del'>-# include &lt;sys/types.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#ifdef HAVE_SYS_STAT_H</div><div class='del'>-# include &lt;sys/stat.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#ifdef STDC_HEADERS</div><div class='del'>-# include &lt;stdlib.h&gt;</div><div class='del'>-# include &lt;stddef.h&gt;</div><div class='del'>-#else</div><div class='del'>-# ifdef HAVE_STDLIB_H</div><div class='del'>-#  include &lt;stdlib.h&gt;</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='del'>-#ifdef HAVE_STRING_H</div><div class='del'>-# if !defined STDC_HEADERS &amp;&amp; defined HAVE_MEMORY_H</div><div class='del'>-#  include &lt;memory.h&gt;</div><div class='del'>-# endif</div><div class='del'>-# include &lt;string.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#ifdef HAVE_STRINGS_H</div><div class='del'>-# include &lt;strings.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#ifdef HAVE_INTTYPES_H</div><div class='del'>-# include &lt;inttypes.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#ifdef HAVE_STDINT_H</div><div class='del'>-# include &lt;stdint.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#ifdef HAVE_UNISTD_H</div><div class='del'>-# include &lt;unistd.h&gt;</div><div class='del'>-#endif"</div><div class='del'>-</div><div class='del'>-ac_subst_vars='am__EXEEXT_FALSE</div><div class='del'>-am__EXEEXT_TRUE</div><div class='del'>-LTLIBOBJS</div><div class='del'>-binconfigs</div><div class='del'>-pkgconfigdir</div><div class='del'>-PNGLIB_RELEASE</div><div class='del'>-PNGLIB_MINOR</div><div class='del'>-PNGLIB_MAJOR</div><div class='del'>-PNGLIB_VERSION</div><div class='del'>-SYMBOL_PREFIX</div><div class='del'>-HAVE_LD_VERSION_SCRIPT_FALSE</div><div class='del'>-HAVE_LD_VERSION_SCRIPT_TRUE</div><div class='del'>-LIBPNG_DEFINES</div><div class='del'>-LIBOBJS</div><div class='del'>-POW_LIB</div><div class='del'>-OTOOL64</div><div class='del'>-OTOOL</div><div class='del'>-LIPO</div><div class='del'>-NMEDIT</div><div class='del'>-DSYMUTIL</div><div class='del'>-lt_ECHO</div><div class='del'>-RANLIB</div><div class='del'>-AR</div><div class='del'>-NM</div><div class='del'>-ac_ct_DUMPBIN</div><div class='del'>-DUMPBIN</div><div class='del'>-LIBTOOL</div><div class='del'>-LN_S</div><div class='del'>-OBJDUMP</div><div class='del'>-DLLTOOL</div><div class='del'>-AS</div><div class='del'>-CPP</div><div class='del'>-LD</div><div class='del'>-FGREP</div><div class='del'>-EGREP</div><div class='del'>-GREP</div><div class='del'>-SED</div><div class='del'>-host_os</div><div class='del'>-host_vendor</div><div class='del'>-host_cpu</div><div class='del'>-host</div><div class='del'>-build_os</div><div class='del'>-build_vendor</div><div class='del'>-build_cpu</div><div class='del'>-build</div><div class='del'>-am__fastdepCC_FALSE</div><div class='del'>-am__fastdepCC_TRUE</div><div class='del'>-CCDEPMODE</div><div class='del'>-AMDEPBACKSLASH</div><div class='del'>-AMDEP_FALSE</div><div class='del'>-AMDEP_TRUE</div><div class='del'>-am__quote</div><div class='del'>-am__include</div><div class='del'>-DEPDIR</div><div class='del'>-OBJEXT</div><div class='del'>-EXEEXT</div><div class='del'>-ac_ct_CC</div><div class='del'>-CPPFLAGS</div><div class='del'>-LDFLAGS</div><div class='del'>-CFLAGS</div><div class='del'>-CC</div><div class='del'>-MAINT</div><div class='del'>-MAINTAINER_MODE_FALSE</div><div class='del'>-MAINTAINER_MODE_TRUE</div><div class='del'>-am__untar</div><div class='del'>-am__tar</div><div class='del'>-AMTAR</div><div class='del'>-am__leading_dot</div><div class='del'>-SET_MAKE</div><div class='del'>-AWK</div><div class='del'>-mkdir_p</div><div class='del'>-MKDIR_P</div><div class='del'>-INSTALL_STRIP_PROGRAM</div><div class='del'>-STRIP</div><div class='del'>-install_sh</div><div class='del'>-MAKEINFO</div><div class='del'>-AUTOHEADER</div><div class='del'>-AUTOMAKE</div><div class='del'>-AUTOCONF</div><div class='del'>-ACLOCAL</div><div class='del'>-VERSION</div><div class='del'>-PACKAGE</div><div class='del'>-CYGPATH_W</div><div class='del'>-am__isrc</div><div class='del'>-INSTALL_DATA</div><div class='del'>-INSTALL_SCRIPT</div><div class='del'>-INSTALL_PROGRAM</div><div class='del'>-target_alias</div><div class='del'>-host_alias</div><div class='del'>-build_alias</div><div class='del'>-LIBS</div><div class='del'>-ECHO_T</div><div class='del'>-ECHO_N</div><div class='del'>-ECHO_C</div><div class='del'>-DEFS</div><div class='del'>-mandir</div><div class='del'>-localedir</div><div class='del'>-libdir</div><div class='del'>-psdir</div><div class='del'>-pdfdir</div><div class='del'>-dvidir</div><div class='del'>-htmldir</div><div class='del'>-infodir</div><div class='del'>-docdir</div><div class='del'>-oldincludedir</div><div class='del'>-includedir</div><div class='del'>-localstatedir</div><div class='del'>-sharedstatedir</div><div class='del'>-sysconfdir</div><div class='del'>-datadir</div><div class='del'>-datarootdir</div><div class='del'>-libexecdir</div><div class='del'>-sbindir</div><div class='del'>-bindir</div><div class='del'>-program_transform_name</div><div class='del'>-prefix</div><div class='del'>-exec_prefix</div><div class='del'>-PACKAGE_URL</div><div class='del'>-PACKAGE_BUGREPORT</div><div class='del'>-PACKAGE_STRING</div><div class='del'>-PACKAGE_VERSION</div><div class='del'>-PACKAGE_TARNAME</div><div class='del'>-PACKAGE_NAME</div><div class='del'>-PATH_SEPARATOR</div><div class='del'>-SHELL'</div><div class='del'>-ac_subst_files=''</div><div class='del'>-ac_user_opts='</div><div class='del'>-enable_option_checking</div><div class='del'>-enable_maintainer_mode</div><div class='del'>-enable_dependency_tracking</div><div class='del'>-with_gnu_ld</div><div class='del'>-enable_shared</div><div class='del'>-enable_static</div><div class='del'>-with_pic</div><div class='del'>-enable_fast_install</div><div class='del'>-enable_libtool_lock</div><div class='del'>-with_pkgconfigdir</div><div class='del'>-with_binconfigs</div><div class='del'>-'</div><div class='del'>-      ac_precious_vars='build_alias</div><div class='del'>-host_alias</div><div class='del'>-target_alias</div><div class='del'>-CC</div><div class='del'>-CFLAGS</div><div class='del'>-LDFLAGS</div><div class='del'>-LIBS</div><div class='del'>-CPPFLAGS</div><div class='del'>-CPP'</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Initialize some variables set by options.</div><div class='del'>-ac_init_help=</div><div class='del'>-ac_init_version=false</div><div class='del'>-ac_unrecognized_opts=</div><div class='del'>-ac_unrecognized_sep=</div><div class='del'>-# The variables have the same names as the options, with</div><div class='del'>-# dashes changed to underlines.</div><div class='del'>-cache_file=/dev/null</div><div class='del'>-exec_prefix=NONE</div><div class='del'>-no_create=</div><div class='del'>-no_recursion=</div><div class='del'>-prefix=NONE</div><div class='del'>-program_prefix=NONE</div><div class='del'>-program_suffix=NONE</div><div class='del'>-program_transform_name=s,x,x,</div><div class='del'>-silent=</div><div class='del'>-site=</div><div class='del'>-srcdir=</div><div class='del'>-verbose=</div><div class='del'>-x_includes=NONE</div><div class='del'>-x_libraries=NONE</div><div class='del'>-</div><div class='del'>-# Installation directory options.</div><div class='del'>-# These are left unexpanded so users can "make install exec_prefix=/foo"</div><div class='del'>-# and all the variables that are supposed to be based on exec_prefix</div><div class='del'>-# by default will actually change.</div><div class='del'>-# Use braces instead of parens because sh, perl, etc. also accept them.</div><div class='del'>-# (The list follows the same order as the GNU Coding Standards.)</div><div class='del'>-bindir='${exec_prefix}/bin'</div><div class='del'>-sbindir='${exec_prefix}/sbin'</div><div class='del'>-libexecdir='${exec_prefix}/libexec'</div><div class='del'>-datarootdir='${prefix}/share'</div><div class='del'>-datadir='${datarootdir}'</div><div class='del'>-sysconfdir='${prefix}/etc'</div><div class='del'>-sharedstatedir='${prefix}/com'</div><div class='del'>-localstatedir='${prefix}/var'</div><div class='del'>-includedir='${prefix}/include'</div><div class='del'>-oldincludedir='/usr/include'</div><div class='del'>-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'</div><div class='del'>-infodir='${datarootdir}/info'</div><div class='del'>-htmldir='${docdir}'</div><div class='del'>-dvidir='${docdir}'</div><div class='del'>-pdfdir='${docdir}'</div><div class='del'>-psdir='${docdir}'</div><div class='del'>-libdir='${exec_prefix}/lib'</div><div class='del'>-localedir='${datarootdir}/locale'</div><div class='del'>-mandir='${datarootdir}/man'</div><div class='del'>-</div><div class='del'>-ac_prev=</div><div class='del'>-ac_dashdash=</div><div class='del'>-for ac_option</div><div class='del'>-do</div><div class='del'>-  # If the previous option needs an argument, assign it.</div><div class='del'>-  if test -n "$ac_prev"; then</div><div class='del'>-    eval $ac_prev=\$ac_option</div><div class='del'>-    ac_prev=</div><div class='del'>-    continue</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  case $ac_option in</div><div class='del'>-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;</div><div class='del'>-  *)	ac_optarg=yes ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  # Accept the important Cygnus configure options, so we can diagnose typos.</div><div class='del'>-</div><div class='del'>-  case $ac_dashdash$ac_option in</div><div class='del'>-  --)</div><div class='del'>-    ac_dashdash=yes ;;</div><div class='del'>-</div><div class='del'>-  -bindir | --bindir | --bindi | --bind | --bin | --bi)</div><div class='del'>-    ac_prev=bindir ;;</div><div class='del'>-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)</div><div class='del'>-    bindir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -build | --build | --buil | --bui | --bu)</div><div class='del'>-    ac_prev=build_alias ;;</div><div class='del'>-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)</div><div class='del'>-    build_alias=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -cache-file | --cache-file | --cache-fil | --cache-fi \</div><div class='del'>-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)</div><div class='del'>-    ac_prev=cache_file ;;</div><div class='del'>-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \</div><div class='del'>-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)</div><div class='del'>-    cache_file=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  --config-cache | -C)</div><div class='del'>-    cache_file=config.cache ;;</div><div class='del'>-</div><div class='del'>-  -datadir | --datadir | --datadi | --datad)</div><div class='del'>-    ac_prev=datadir ;;</div><div class='del'>-  -datadir=* | --datadir=* | --datadi=* | --datad=*)</div><div class='del'>-    datadir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \</div><div class='del'>-  | --dataroo | --dataro | --datar)</div><div class='del'>-    ac_prev=datarootdir ;;</div><div class='del'>-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \</div><div class='del'>-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)</div><div class='del'>-    datarootdir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -disable-* | --disable-*)</div><div class='del'>-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`</div><div class='del'>-    # Reject names that are not valid shell variable names.</div><div class='del'>-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" &gt;/dev/null &amp;&amp;</div><div class='del'>-      as_fn_error "invalid feature name: $ac_useropt"</div><div class='del'>-    ac_useropt_orig=$ac_useropt</div><div class='del'>-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`</div><div class='del'>-    case $ac_user_opts in</div><div class='del'>-      *"</div><div class='del'>-"enable_$ac_useropt"</div><div class='del'>-"*) ;;</div><div class='del'>-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"</div><div class='del'>-	 ac_unrecognized_sep=', ';;</div><div class='del'>-    esac</div><div class='del'>-    eval enable_$ac_useropt=no ;;</div><div class='del'>-</div><div class='del'>-  -docdir | --docdir | --docdi | --doc | --do)</div><div class='del'>-    ac_prev=docdir ;;</div><div class='del'>-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)</div><div class='del'>-    docdir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)</div><div class='del'>-    ac_prev=dvidir ;;</div><div class='del'>-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)</div><div class='del'>-    dvidir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -enable-* | --enable-*)</div><div class='del'>-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`</div><div class='del'>-    # Reject names that are not valid shell variable names.</div><div class='del'>-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" &gt;/dev/null &amp;&amp;</div><div class='del'>-      as_fn_error "invalid feature name: $ac_useropt"</div><div class='del'>-    ac_useropt_orig=$ac_useropt</div><div class='del'>-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`</div><div class='del'>-    case $ac_user_opts in</div><div class='del'>-      *"</div><div class='del'>-"enable_$ac_useropt"</div><div class='del'>-"*) ;;</div><div class='del'>-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"</div><div class='del'>-	 ac_unrecognized_sep=', ';;</div><div class='del'>-    esac</div><div class='del'>-    eval enable_$ac_useropt=\$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \</div><div class='del'>-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \</div><div class='del'>-  | --exec | --exe | --ex)</div><div class='del'>-    ac_prev=exec_prefix ;;</div><div class='del'>-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \</div><div class='del'>-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \</div><div class='del'>-  | --exec=* | --exe=* | --ex=*)</div><div class='del'>-    exec_prefix=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -gas | --gas | --ga | --g)</div><div class='del'>-    # Obsolete; use --with-gas.</div><div class='del'>-    with_gas=yes ;;</div><div class='del'>-</div><div class='del'>-  -help | --help | --hel | --he | -h)</div><div class='del'>-    ac_init_help=long ;;</div><div class='del'>-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)</div><div class='del'>-    ac_init_help=recursive ;;</div><div class='del'>-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)</div><div class='del'>-    ac_init_help=short ;;</div><div class='del'>-</div><div class='del'>-  -host | --host | --hos | --ho)</div><div class='del'>-    ac_prev=host_alias ;;</div><div class='del'>-  -host=* | --host=* | --hos=* | --ho=*)</div><div class='del'>-    host_alias=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)</div><div class='del'>-    ac_prev=htmldir ;;</div><div class='del'>-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \</div><div class='del'>-  | --ht=*)</div><div class='del'>-    htmldir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -includedir | --includedir | --includedi | --included | --include \</div><div class='del'>-  | --includ | --inclu | --incl | --inc)</div><div class='del'>-    ac_prev=includedir ;;</div><div class='del'>-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \</div><div class='del'>-  | --includ=* | --inclu=* | --incl=* | --inc=*)</div><div class='del'>-    includedir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -infodir | --infodir | --infodi | --infod | --info | --inf)</div><div class='del'>-    ac_prev=infodir ;;</div><div class='del'>-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)</div><div class='del'>-    infodir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -libdir | --libdir | --libdi | --libd)</div><div class='del'>-    ac_prev=libdir ;;</div><div class='del'>-  -libdir=* | --libdir=* | --libdi=* | --libd=*)</div><div class='del'>-    libdir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \</div><div class='del'>-  | --libexe | --libex | --libe)</div><div class='del'>-    ac_prev=libexecdir ;;</div><div class='del'>-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \</div><div class='del'>-  | --libexe=* | --libex=* | --libe=*)</div><div class='del'>-    libexecdir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -localedir | --localedir | --localedi | --localed | --locale)</div><div class='del'>-    ac_prev=localedir ;;</div><div class='del'>-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)</div><div class='del'>-    localedir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -localstatedir | --localstatedir | --localstatedi | --localstated \</div><div class='del'>-  | --localstate | --localstat | --localsta | --localst | --locals)</div><div class='del'>-    ac_prev=localstatedir ;;</div><div class='del'>-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \</div><div class='del'>-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)</div><div class='del'>-    localstatedir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)</div><div class='del'>-    ac_prev=mandir ;;</div><div class='del'>-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)</div><div class='del'>-    mandir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -nfp | --nfp | --nf)</div><div class='del'>-    # Obsolete; use --without-fp.</div><div class='del'>-    with_fp=no ;;</div><div class='del'>-</div><div class='del'>-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \</div><div class='del'>-  | --no-cr | --no-c | -n)</div><div class='del'>-    no_create=yes ;;</div><div class='del'>-</div><div class='del'>-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \</div><div class='del'>-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)</div><div class='del'>-    no_recursion=yes ;;</div><div class='del'>-</div><div class='del'>-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \</div><div class='del'>-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \</div><div class='del'>-  | --oldin | --oldi | --old | --ol | --o)</div><div class='del'>-    ac_prev=oldincludedir ;;</div><div class='del'>-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \</div><div class='del'>-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \</div><div class='del'>-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)</div><div class='del'>-    oldincludedir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)</div><div class='del'>-    ac_prev=prefix ;;</div><div class='del'>-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)</div><div class='del'>-    prefix=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -program-prefix | --program-prefix | --program-prefi | --program-pref \</div><div class='del'>-  | --program-pre | --program-pr | --program-p)</div><div class='del'>-    ac_prev=program_prefix ;;</div><div class='del'>-  -program-prefix=* | --program-prefix=* | --program-prefi=* \</div><div class='del'>-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)</div><div class='del'>-    program_prefix=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -program-suffix | --program-suffix | --program-suffi | --program-suff \</div><div class='del'>-  | --program-suf | --program-su | --program-s)</div><div class='del'>-    ac_prev=program_suffix ;;</div><div class='del'>-  -program-suffix=* | --program-suffix=* | --program-suffi=* \</div><div class='del'>-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)</div><div class='del'>-    program_suffix=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -program-transform-name | --program-transform-name \</div><div class='del'>-  | --program-transform-nam | --program-transform-na \</div><div class='del'>-  | --program-transform-n | --program-transform- \</div><div class='del'>-  | --program-transform | --program-transfor \</div><div class='del'>-  | --program-transfo | --program-transf \</div><div class='del'>-  | --program-trans | --program-tran \</div><div class='del'>-  | --progr-tra | --program-tr | --program-t)</div><div class='del'>-    ac_prev=program_transform_name ;;</div><div class='del'>-  -program-transform-name=* | --program-transform-name=* \</div><div class='del'>-  | --program-transform-nam=* | --program-transform-na=* \</div><div class='del'>-  | --program-transform-n=* | --program-transform-=* \</div><div class='del'>-  | --program-transform=* | --program-transfor=* \</div><div class='del'>-  | --program-transfo=* | --program-transf=* \</div><div class='del'>-  | --program-trans=* | --program-tran=* \</div><div class='del'>-  | --progr-tra=* | --program-tr=* | --program-t=*)</div><div class='del'>-    program_transform_name=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)</div><div class='del'>-    ac_prev=pdfdir ;;</div><div class='del'>-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)</div><div class='del'>-    pdfdir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -psdir | --psdir | --psdi | --psd | --ps)</div><div class='del'>-    ac_prev=psdir ;;</div><div class='del'>-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)</div><div class='del'>-    psdir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \</div><div class='del'>-  | -silent | --silent | --silen | --sile | --sil)</div><div class='del'>-    silent=yes ;;</div><div class='del'>-</div><div class='del'>-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)</div><div class='del'>-    ac_prev=sbindir ;;</div><div class='del'>-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \</div><div class='del'>-  | --sbi=* | --sb=*)</div><div class='del'>-    sbindir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -sharedstatedir | --sharedstatedir | --sharedstatedi \</div><div class='del'>-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \</div><div class='del'>-  | --sharedst | --shareds | --shared | --share | --shar \</div><div class='del'>-  | --sha | --sh)</div><div class='del'>-    ac_prev=sharedstatedir ;;</div><div class='del'>-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \</div><div class='del'>-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \</div><div class='del'>-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \</div><div class='del'>-  | --sha=* | --sh=*)</div><div class='del'>-    sharedstatedir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -site | --site | --sit)</div><div class='del'>-    ac_prev=site ;;</div><div class='del'>-  -site=* | --site=* | --sit=*)</div><div class='del'>-    site=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)</div><div class='del'>-    ac_prev=srcdir ;;</div><div class='del'>-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)</div><div class='del'>-    srcdir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \</div><div class='del'>-  | --syscon | --sysco | --sysc | --sys | --sy)</div><div class='del'>-    ac_prev=sysconfdir ;;</div><div class='del'>-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \</div><div class='del'>-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)</div><div class='del'>-    sysconfdir=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -target | --target | --targe | --targ | --tar | --ta | --t)</div><div class='del'>-    ac_prev=target_alias ;;</div><div class='del'>-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)</div><div class='del'>-    target_alias=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -v | -verbose | --verbose | --verbos | --verbo | --verb)</div><div class='del'>-    verbose=yes ;;</div><div class='del'>-</div><div class='del'>-  -version | --version | --versio | --versi | --vers | -V)</div><div class='del'>-    ac_init_version=: ;;</div><div class='del'>-</div><div class='del'>-  -with-* | --with-*)</div><div class='del'>-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`</div><div class='del'>-    # Reject names that are not valid shell variable names.</div><div class='del'>-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" &gt;/dev/null &amp;&amp;</div><div class='del'>-      as_fn_error "invalid package name: $ac_useropt"</div><div class='del'>-    ac_useropt_orig=$ac_useropt</div><div class='del'>-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`</div><div class='del'>-    case $ac_user_opts in</div><div class='del'>-      *"</div><div class='del'>-"with_$ac_useropt"</div><div class='del'>-"*) ;;</div><div class='del'>-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"</div><div class='del'>-	 ac_unrecognized_sep=', ';;</div><div class='del'>-    esac</div><div class='del'>-    eval with_$ac_useropt=\$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -without-* | --without-*)</div><div class='del'>-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`</div><div class='del'>-    # Reject names that are not valid shell variable names.</div><div class='del'>-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" &gt;/dev/null &amp;&amp;</div><div class='del'>-      as_fn_error "invalid package name: $ac_useropt"</div><div class='del'>-    ac_useropt_orig=$ac_useropt</div><div class='del'>-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`</div><div class='del'>-    case $ac_user_opts in</div><div class='del'>-      *"</div><div class='del'>-"with_$ac_useropt"</div><div class='del'>-"*) ;;</div><div class='del'>-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"</div><div class='del'>-	 ac_unrecognized_sep=', ';;</div><div class='del'>-    esac</div><div class='del'>-    eval with_$ac_useropt=no ;;</div><div class='del'>-</div><div class='del'>-  --x)</div><div class='del'>-    # Obsolete; use --with-x.</div><div class='del'>-    with_x=yes ;;</div><div class='del'>-</div><div class='del'>-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \</div><div class='del'>-  | --x-incl | --x-inc | --x-in | --x-i)</div><div class='del'>-    ac_prev=x_includes ;;</div><div class='del'>-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \</div><div class='del'>-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)</div><div class='del'>-    x_includes=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -x-libraries | --x-libraries | --x-librarie | --x-librari \</div><div class='del'>-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)</div><div class='del'>-    ac_prev=x_libraries ;;</div><div class='del'>-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \</div><div class='del'>-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)</div><div class='del'>-    x_libraries=$ac_optarg ;;</div><div class='del'>-</div><div class='del'>-  -*) as_fn_error "unrecognized option: \`$ac_option'</div><div class='del'>-Try \`$0 --help' for more information."</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  *=*)</div><div class='del'>-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`</div><div class='del'>-    # Reject names that are not valid shell variable names.</div><div class='del'>-    case $ac_envvar in #(</div><div class='del'>-      '' | [0-9]* | *[!_$as_cr_alnum]* )</div><div class='del'>-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;</div><div class='del'>-    esac</div><div class='del'>-    eval $ac_envvar=\$ac_optarg</div><div class='del'>-    export $ac_envvar ;;</div><div class='del'>-</div><div class='del'>-  *)</div><div class='del'>-    # FIXME: should be removed in autoconf 3.0.</div><div class='del'>-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" &gt;&amp;2</div><div class='del'>-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" &gt;/dev/null &amp;&amp;</div><div class='del'>-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" &gt;&amp;2</div><div class='del'>-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  esac</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-if test -n "$ac_prev"; then</div><div class='del'>-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`</div><div class='del'>-  as_fn_error "missing argument to $ac_option"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test -n "$ac_unrecognized_opts"; then</div><div class='del'>-  case $enable_option_checking in</div><div class='del'>-    no) ;;</div><div class='del'>-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;</div><div class='del'>-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" &gt;&amp;2 ;;</div><div class='del'>-  esac</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Check all directory arguments for consistency.</div><div class='del'>-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \</div><div class='del'>-		datadir sysconfdir sharedstatedir localstatedir includedir \</div><div class='del'>-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \</div><div class='del'>-		libdir localedir mandir</div><div class='del'>-do</div><div class='del'>-  eval ac_val=\$$ac_var</div><div class='del'>-  # Remove trailing slashes.</div><div class='del'>-  case $ac_val in</div><div class='del'>-    */ )</div><div class='del'>-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`</div><div class='del'>-      eval $ac_var=\$ac_val;;</div><div class='del'>-  esac</div><div class='del'>-  # Be sure to have absolute directory names.</div><div class='del'>-  case $ac_val in</div><div class='del'>-    [\\/$]* | ?:[\\/]* )  continue;;</div><div class='del'>-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;</div><div class='del'>-  esac</div><div class='del'>-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-# There might be people who depend on the old broken behavior: `$host'</div><div class='del'>-# used to hold the argument of --host etc.</div><div class='del'>-# FIXME: To remove some day.</div><div class='del'>-build=$build_alias</div><div class='del'>-host=$host_alias</div><div class='del'>-target=$target_alias</div><div class='del'>-</div><div class='del'>-# FIXME: To remove some day.</div><div class='del'>-if test "x$host_alias" != x; then</div><div class='del'>-  if test "x$build_alias" = x; then</div><div class='del'>-    cross_compiling=maybe</div><div class='del'>-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.</div><div class='del'>-    If a cross compiler is detected then cross compile mode will be used." &gt;&amp;2</div><div class='del'>-  elif test "x$build_alias" != "x$host_alias"; then</div><div class='del'>-    cross_compiling=yes</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-ac_tool_prefix=</div><div class='del'>-test -n "$host_alias" &amp;&amp; ac_tool_prefix=$host_alias-</div><div class='del'>-</div><div class='del'>-test "$silent" = yes &amp;&amp; exec 6&gt;/dev/null</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ac_pwd=`pwd` &amp;&amp; test -n "$ac_pwd" &amp;&amp;</div><div class='del'>-ac_ls_di=`ls -di .` &amp;&amp;</div><div class='del'>-ac_pwd_ls_di=`cd "$ac_pwd" &amp;&amp; ls -di .` ||</div><div class='del'>-  as_fn_error "working directory cannot be determined"</div><div class='del'>-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||</div><div class='del'>-  as_fn_error "pwd does not report name of working directory"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Find the source files, if location was not specified.</div><div class='del'>-if test -z "$srcdir"; then</div><div class='del'>-  ac_srcdir_defaulted=yes</div><div class='del'>-  # Try the directory containing this script, then the parent directory.</div><div class='del'>-  ac_confdir=`$as_dirname -- "$as_myself" ||</div><div class='del'>-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \</div><div class='del'>-	 X"$as_myself" : 'X\(//\)[^/]' \| \</div><div class='del'>-	 X"$as_myself" : 'X\(//\)$' \| \</div><div class='del'>-	 X"$as_myself" : 'X\(/\)' \| . 2&gt;/dev/null ||</div><div class='del'>-$as_echo X"$as_myself" |</div><div class='del'>-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\/\)[^/].*/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\/\)$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\).*/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  s/.*/./; q'`</div><div class='del'>-  srcdir=$ac_confdir</div><div class='del'>-  if test ! -r "$srcdir/$ac_unique_file"; then</div><div class='del'>-    srcdir=..</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  ac_srcdir_defaulted=no</div><div class='del'>-fi</div><div class='del'>-if test ! -r "$srcdir/$ac_unique_file"; then</div><div class='del'>-  test "$ac_srcdir_defaulted" = yes &amp;&amp; srcdir="$ac_confdir or .."</div><div class='del'>-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"</div><div class='del'>-fi</div><div class='del'>-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"</div><div class='del'>-ac_abs_confdir=`(</div><div class='del'>-	cd "$srcdir" &amp;&amp; test -r "./$ac_unique_file" || as_fn_error "$ac_msg"</div><div class='del'>-	pwd)`</div><div class='del'>-# When building in place, set srcdir=.</div><div class='del'>-if test "$ac_abs_confdir" = "$ac_pwd"; then</div><div class='del'>-  srcdir=.</div><div class='del'>-fi</div><div class='del'>-# Remove unnecessary trailing slashes from srcdir.</div><div class='del'>-# Double slashes in file names in object file debugging info</div><div class='del'>-# mess up M-x gdb in Emacs.</div><div class='del'>-case $srcdir in</div><div class='del'>-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;</div><div class='del'>-esac</div><div class='del'>-for ac_var in $ac_precious_vars; do</div><div class='del'>-  eval ac_env_${ac_var}_set=\${${ac_var}+set}</div><div class='del'>-  eval ac_env_${ac_var}_value=\$${ac_var}</div><div class='del'>-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}</div><div class='del'>-  eval ac_cv_env_${ac_var}_value=\$${ac_var}</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Report the --help message.</div><div class='del'>-#</div><div class='del'>-if test "$ac_init_help" = "long"; then</div><div class='del'>-  # Omit some internal or obsolete options to make the list less imposing.</div><div class='del'>-  # This message is too long to be a string in the A/UX 3.1 sh.</div><div class='del'>-  cat &lt;&lt;_ACEOF</div><div class='del'>-\`configure' configures libpng 1.4.0 to adapt to many kinds of systems.</div><div class='del'>-</div><div class='del'>-Usage: $0 [OPTION]... [VAR=VALUE]...</div><div class='del'>-</div><div class='del'>-To assign environment variables (e.g., CC, CFLAGS...), specify them as</div><div class='del'>-VAR=VALUE.  See below for descriptions of some of the useful variables.</div><div class='del'>-</div><div class='del'>-Defaults for the options are specified in brackets.</div><div class='del'>-</div><div class='del'>-Configuration:</div><div class='del'>-  -h, --help              display this help and exit</div><div class='del'>-      --help=short        display options specific to this package</div><div class='del'>-      --help=recursive    display the short help of all the included packages</div><div class='del'>-  -V, --version           display version information and exit</div><div class='del'>-  -q, --quiet, --silent   do not print \`checking...' messages</div><div class='del'>-      --cache-file=FILE   cache test results in FILE [disabled]</div><div class='del'>-  -C, --config-cache      alias for \`--cache-file=config.cache'</div><div class='del'>-  -n, --no-create         do not create output files</div><div class='del'>-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']</div><div class='del'>-</div><div class='del'>-Installation directories:</div><div class='del'>-  --prefix=PREFIX         install architecture-independent files in PREFIX</div><div class='del'>-                          [$ac_default_prefix]</div><div class='del'>-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX</div><div class='del'>-                          [PREFIX]</div><div class='del'>-</div><div class='del'>-By default, \`make install' will install all the files in</div><div class='del'>-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify</div><div class='del'>-an installation prefix other than \`$ac_default_prefix' using \`--prefix',</div><div class='del'>-for instance \`--prefix=\$HOME'.</div><div class='del'>-</div><div class='del'>-For better control, use the options below.</div><div class='del'>-</div><div class='del'>-Fine tuning of the installation directories:</div><div class='del'>-  --bindir=DIR            user executables [EPREFIX/bin]</div><div class='del'>-  --sbindir=DIR           system admin executables [EPREFIX/sbin]</div><div class='del'>-  --libexecdir=DIR        program executables [EPREFIX/libexec]</div><div class='del'>-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]</div><div class='del'>-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]</div><div class='del'>-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]</div><div class='del'>-  --libdir=DIR            object code libraries [EPREFIX/lib]</div><div class='del'>-  --includedir=DIR        C header files [PREFIX/include]</div><div class='del'>-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]</div><div class='del'>-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]</div><div class='del'>-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]</div><div class='del'>-  --infodir=DIR           info documentation [DATAROOTDIR/info]</div><div class='del'>-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]</div><div class='del'>-  --mandir=DIR            man documentation [DATAROOTDIR/man]</div><div class='del'>-  --docdir=DIR            documentation root [DATAROOTDIR/doc/libpng]</div><div class='del'>-  --htmldir=DIR           html documentation [DOCDIR]</div><div class='del'>-  --dvidir=DIR            dvi documentation [DOCDIR]</div><div class='del'>-  --pdfdir=DIR            pdf documentation [DOCDIR]</div><div class='del'>-  --psdir=DIR             ps documentation [DOCDIR]</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-  cat &lt;&lt;\_ACEOF</div><div class='del'>-</div><div class='del'>-Program names:</div><div class='del'>-  --program-prefix=PREFIX            prepend PREFIX to installed program names</div><div class='del'>-  --program-suffix=SUFFIX            append SUFFIX to installed program names</div><div class='del'>-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names</div><div class='del'>-</div><div class='del'>-System types:</div><div class='del'>-  --build=BUILD     configure for building on BUILD [guessed]</div><div class='del'>-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]</div><div class='del'>-_ACEOF</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test -n "$ac_init_help"; then</div><div class='del'>-  case $ac_init_help in</div><div class='del'>-     short | recursive ) echo "Configuration of libpng 1.4.0:";;</div><div class='del'>-   esac</div><div class='del'>-  cat &lt;&lt;\_ACEOF</div><div class='del'>-</div><div class='del'>-Optional Features:</div><div class='del'>-  --disable-option-checking  ignore unrecognized --enable/--with options</div><div class='del'>-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)</div><div class='del'>-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]</div><div class='del'>-  --enable-maintainer-mode  enable make rules and dependencies not useful</div><div class='del'>-			  (and sometimes confusing) to the casual installer</div><div class='del'>-  --disable-dependency-tracking  speeds up one-time build</div><div class='del'>-  --enable-dependency-tracking   do not reject slow dependency extractors</div><div class='del'>-  --enable-shared[=PKGS]  build shared libraries [default=yes]</div><div class='del'>-  --enable-static[=PKGS]  build static libraries [default=yes]</div><div class='del'>-  --enable-fast-install[=PKGS]</div><div class='del'>-                          optimize for fast installation [default=yes]</div><div class='del'>-  --disable-libtool-lock  avoid locking (might break parallel builds)</div><div class='del'>-</div><div class='del'>-Optional Packages:</div><div class='del'>-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]</div><div class='del'>-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)</div><div class='del'>-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]</div><div class='del'>-  --with-pic              try to use only PIC/non-PIC objects [default=use</div><div class='del'>-                          both]</div><div class='del'>-  --with-pkgconfigdir     Use the specified pkgconfig dir (default is</div><div class='del'>-                          libdir/pkgconfig)</div><div class='del'>-  --with-binconfigs       Generate shell libpng-config scripts as well as</div><div class='del'>-                          pkg-config data [default=yes]</div><div class='del'>-</div><div class='del'>-Some influential environment variables:</div><div class='del'>-  CC          C compiler command</div><div class='del'>-  CFLAGS      C compiler flags</div><div class='del'>-  LDFLAGS     linker flags, e.g. -L&lt;lib dir&gt; if you have libraries in a</div><div class='del'>-              nonstandard directory &lt;lib dir&gt;</div><div class='del'>-  LIBS        libraries to pass to the linker, e.g. -l&lt;library&gt;</div><div class='del'>-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I&lt;include dir&gt; if</div><div class='del'>-              you have headers in a nonstandard directory &lt;include dir&gt;</div><div class='del'>-  CPP         C preprocessor</div><div class='del'>-</div><div class='del'>-Use these variables to override the choices made by `configure' or to help</div><div class='del'>-it to find libraries and programs with nonstandard names/locations.</div><div class='del'>-</div><div class='del'>-Report bugs to &lt;png-mng-implement@lists.sourceforge.net&gt;.</div><div class='del'>-_ACEOF</div><div class='del'>-ac_status=$?</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test "$ac_init_help" = "recursive"; then</div><div class='del'>-  # If there are subdirs, report their specific --help.</div><div class='del'>-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: &amp;&amp; continue</div><div class='del'>-    test -d "$ac_dir" ||</div><div class='del'>-      { cd "$srcdir" &amp;&amp; ac_pwd=`pwd` &amp;&amp; srcdir=. &amp;&amp; test -d "$ac_dir"; } ||</div><div class='del'>-      continue</div><div class='del'>-    ac_builddir=.</div><div class='del'>-</div><div class='del'>-case "$ac_dir" in</div><div class='del'>-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;</div><div class='del'>-*)</div><div class='del'>-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`</div><div class='del'>-  # A ".." for each directory in $ac_dir_suffix.</div><div class='del'>-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`</div><div class='del'>-  case $ac_top_builddir_sub in</div><div class='del'>-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;</div><div class='del'>-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;</div><div class='del'>-  esac ;;</div><div class='del'>-esac</div><div class='del'>-ac_abs_top_builddir=$ac_pwd</div><div class='del'>-ac_abs_builddir=$ac_pwd$ac_dir_suffix</div><div class='del'>-# for backward compatibility:</div><div class='del'>-ac_top_builddir=$ac_top_build_prefix</div><div class='del'>-</div><div class='del'>-case $srcdir in</div><div class='del'>-  .)  # We are building in place.</div><div class='del'>-    ac_srcdir=.</div><div class='del'>-    ac_top_srcdir=$ac_top_builddir_sub</div><div class='del'>-    ac_abs_top_srcdir=$ac_pwd ;;</div><div class='del'>-  [\\/]* | ?:[\\/]* )  # Absolute name.</div><div class='del'>-    ac_srcdir=$srcdir$ac_dir_suffix;</div><div class='del'>-    ac_top_srcdir=$srcdir</div><div class='del'>-    ac_abs_top_srcdir=$srcdir ;;</div><div class='del'>-  *) # Relative name.</div><div class='del'>-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix</div><div class='del'>-    ac_top_srcdir=$ac_top_build_prefix$srcdir</div><div class='del'>-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;</div><div class='del'>-esac</div><div class='del'>-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix</div><div class='del'>-</div><div class='del'>-    cd "$ac_dir" || { ac_status=$?; continue; }</div><div class='del'>-    # Check for guested configure.</div><div class='del'>-    if test -f "$ac_srcdir/configure.gnu"; then</div><div class='del'>-      echo &amp;&amp;</div><div class='del'>-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive</div><div class='del'>-    elif test -f "$ac_srcdir/configure"; then</div><div class='del'>-      echo &amp;&amp;</div><div class='del'>-      $SHELL "$ac_srcdir/configure" --help=recursive</div><div class='del'>-    else</div><div class='del'>-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" &gt;&amp;2</div><div class='del'>-    fi || ac_status=$?</div><div class='del'>-    cd "$ac_pwd" || { ac_status=$?; break; }</div><div class='del'>-  done</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-test -n "$ac_init_help" &amp;&amp; exit $ac_status</div><div class='del'>-if $ac_init_version; then</div><div class='del'>-  cat &lt;&lt;\_ACEOF</div><div class='del'>-libpng configure 1.4.0</div><div class='del'>-generated by GNU Autoconf 2.65</div><div class='del'>-</div><div class='del'>-Copyright (C) 2009 Free Software Foundation, Inc.</div><div class='del'>-This configure script is free software; the Free Software Foundation</div><div class='del'>-gives unlimited permission to copy, distribute and modify it.</div><div class='del'>-_ACEOF</div><div class='del'>-  exit</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-## ------------------------ ##</div><div class='del'>-## Autoconf initialization. ##</div><div class='del'>-## ------------------------ ##</div><div class='del'>-</div><div class='del'>-# ac_fn_c_try_compile LINENO</div><div class='del'>-# --------------------------</div><div class='del'>-# Try to compile conftest.$ac_ext, and return whether this succeeded.</div><div class='del'>-ac_fn_c_try_compile ()</div><div class='del'>-{</div><div class='del'>-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack</div><div class='del'>-  rm -f conftest.$ac_objext</div><div class='del'>-  if { { ac_try="$ac_compile"</div><div class='del'>-case "(($ac_try" in</div><div class='del'>-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;</div><div class='del'>-  *) ac_try_echo=$ac_try;;</div><div class='del'>-esac</div><div class='del'>-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""</div><div class='del'>-$as_echo "$ac_try_echo"; } &gt;&amp;5</div><div class='del'>-  (eval "$ac_compile") 2&gt;conftest.err</div><div class='del'>-  ac_status=$?</div><div class='del'>-  if test -s conftest.err; then</div><div class='del'>-    grep -v '^ *+' conftest.err &gt;conftest.er1</div><div class='del'>-    cat conftest.er1 &gt;&amp;5</div><div class='del'>-    mv -f conftest.er1 conftest.err</div><div class='del'>-  fi</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; } &amp;&amp; {</div><div class='del'>-	 test -z "$ac_c_werror_flag" ||</div><div class='del'>-	 test ! -s conftest.err</div><div class='del'>-       } &amp;&amp; test -s conftest.$ac_objext; then :</div><div class='del'>-  ac_retval=0</div><div class='del'>-else</div><div class='del'>-  $as_echo "$as_me: failed program was:" &gt;&amp;5</div><div class='del'>-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5</div><div class='del'>-</div><div class='del'>-	ac_retval=1</div><div class='del'>-fi</div><div class='del'>-  eval $as_lineno_stack; test "x$as_lineno_stack" = x &amp;&amp; { as_lineno=; unset as_lineno;}</div><div class='del'>-  as_fn_set_status $ac_retval</div><div class='del'>-</div><div class='del'>-} # ac_fn_c_try_compile</div><div class='del'>-</div><div class='del'>-# ac_fn_c_try_cpp LINENO</div><div class='del'>-# ----------------------</div><div class='del'>-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.</div><div class='del'>-ac_fn_c_try_cpp ()</div><div class='del'>-{</div><div class='del'>-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack</div><div class='del'>-  if { { ac_try="$ac_cpp conftest.$ac_ext"</div><div class='del'>-case "(($ac_try" in</div><div class='del'>-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;</div><div class='del'>-  *) ac_try_echo=$ac_try;;</div><div class='del'>-esac</div><div class='del'>-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""</div><div class='del'>-$as_echo "$ac_try_echo"; } &gt;&amp;5</div><div class='del'>-  (eval "$ac_cpp conftest.$ac_ext") 2&gt;conftest.err</div><div class='del'>-  ac_status=$?</div><div class='del'>-  if test -s conftest.err; then</div><div class='del'>-    grep -v '^ *+' conftest.err &gt;conftest.er1</div><div class='del'>-    cat conftest.er1 &gt;&amp;5</div><div class='del'>-    mv -f conftest.er1 conftest.err</div><div class='del'>-  fi</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; } &gt;/dev/null &amp;&amp; {</div><div class='del'>-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||</div><div class='del'>-	 test ! -s conftest.err</div><div class='del'>-       }; then :</div><div class='del'>-  ac_retval=0</div><div class='del'>-else</div><div class='del'>-  $as_echo "$as_me: failed program was:" &gt;&amp;5</div><div class='del'>-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5</div><div class='del'>-</div><div class='del'>-    ac_retval=1</div><div class='del'>-fi</div><div class='del'>-  eval $as_lineno_stack; test "x$as_lineno_stack" = x &amp;&amp; { as_lineno=; unset as_lineno;}</div><div class='del'>-  as_fn_set_status $ac_retval</div><div class='del'>-</div><div class='del'>-} # ac_fn_c_try_cpp</div><div class='del'>-</div><div class='del'>-# ac_fn_c_try_link LINENO</div><div class='del'>-# -----------------------</div><div class='del'>-# Try to link conftest.$ac_ext, and return whether this succeeded.</div><div class='del'>-ac_fn_c_try_link ()</div><div class='del'>-{</div><div class='del'>-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack</div><div class='del'>-  rm -f conftest.$ac_objext conftest$ac_exeext</div><div class='del'>-  if { { ac_try="$ac_link"</div><div class='del'>-case "(($ac_try" in</div><div class='del'>-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;</div><div class='del'>-  *) ac_try_echo=$ac_try;;</div><div class='del'>-esac</div><div class='del'>-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""</div><div class='del'>-$as_echo "$ac_try_echo"; } &gt;&amp;5</div><div class='del'>-  (eval "$ac_link") 2&gt;conftest.err</div><div class='del'>-  ac_status=$?</div><div class='del'>-  if test -s conftest.err; then</div><div class='del'>-    grep -v '^ *+' conftest.err &gt;conftest.er1</div><div class='del'>-    cat conftest.er1 &gt;&amp;5</div><div class='del'>-    mv -f conftest.er1 conftest.err</div><div class='del'>-  fi</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; } &amp;&amp; {</div><div class='del'>-	 test -z "$ac_c_werror_flag" ||</div><div class='del'>-	 test ! -s conftest.err</div><div class='del'>-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {</div><div class='del'>-	 test "$cross_compiling" = yes ||</div><div class='del'>-	 $as_test_x conftest$ac_exeext</div><div class='del'>-       }; then :</div><div class='del'>-  ac_retval=0</div><div class='del'>-else</div><div class='del'>-  $as_echo "$as_me: failed program was:" &gt;&amp;5</div><div class='del'>-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5</div><div class='del'>-</div><div class='del'>-	ac_retval=1</div><div class='del'>-fi</div><div class='del'>-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information</div><div class='del'>-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would</div><div class='del'>-  # interfere with the next link command; also delete a directory that is</div><div class='del'>-  # left behind by Apple's compiler.  We do this before executing the actions.</div><div class='del'>-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo</div><div class='del'>-  eval $as_lineno_stack; test "x$as_lineno_stack" = x &amp;&amp; { as_lineno=; unset as_lineno;}</div><div class='del'>-  as_fn_set_status $ac_retval</div><div class='del'>-</div><div class='del'>-} # ac_fn_c_try_link</div><div class='del'>-</div><div class='del'>-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES</div><div class='del'>-# -------------------------------------------------------</div><div class='del'>-# Tests whether HEADER exists and can be compiled using the include files in</div><div class='del'>-# INCLUDES, setting the cache variable VAR accordingly.</div><div class='del'>-ac_fn_c_check_header_compile ()</div><div class='del'>-{</div><div class='del'>-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $2... " &gt;&amp;6; }</div><div class='del'>-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-$4</div><div class='del'>-#include &lt;$2&gt;</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_compile "$LINENO"; then :</div><div class='del'>-  eval "$3=yes"</div><div class='del'>-else</div><div class='del'>-  eval "$3=no"</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext</div><div class='del'>-fi</div><div class='del'>-eval ac_res=\$$3</div><div class='del'>-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_res" &gt;&amp;6; }</div><div class='del'>-  eval $as_lineno_stack; test "x$as_lineno_stack" = x &amp;&amp; { as_lineno=; unset as_lineno;}</div><div class='del'>-</div><div class='del'>-} # ac_fn_c_check_header_compile</div><div class='del'>-</div><div class='del'>-# ac_fn_c_try_run LINENO</div><div class='del'>-# ----------------------</div><div class='del'>-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes</div><div class='del'>-# that executables *can* be run.</div><div class='del'>-ac_fn_c_try_run ()</div><div class='del'>-{</div><div class='del'>-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack</div><div class='del'>-  if { { ac_try="$ac_link"</div><div class='del'>-case "(($ac_try" in</div><div class='del'>-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;</div><div class='del'>-  *) ac_try_echo=$ac_try;;</div><div class='del'>-esac</div><div class='del'>-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""</div><div class='del'>-$as_echo "$ac_try_echo"; } &gt;&amp;5</div><div class='del'>-  (eval "$ac_link") 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; } &amp;&amp; { ac_try='./conftest$ac_exeext'</div><div class='del'>-  { { case "(($ac_try" in</div><div class='del'>-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;</div><div class='del'>-  *) ac_try_echo=$ac_try;;</div><div class='del'>-esac</div><div class='del'>-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""</div><div class='del'>-$as_echo "$ac_try_echo"; } &gt;&amp;5</div><div class='del'>-  (eval "$ac_try") 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; }; }; then :</div><div class='del'>-  ac_retval=0</div><div class='del'>-else</div><div class='del'>-  $as_echo "$as_me: program exited with status $ac_status" &gt;&amp;5</div><div class='del'>-       $as_echo "$as_me: failed program was:" &gt;&amp;5</div><div class='del'>-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5</div><div class='del'>-</div><div class='del'>-       ac_retval=$ac_status</div><div class='del'>-fi</div><div class='del'>-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo</div><div class='del'>-  eval $as_lineno_stack; test "x$as_lineno_stack" = x &amp;&amp; { as_lineno=; unset as_lineno;}</div><div class='del'>-  as_fn_set_status $ac_retval</div><div class='del'>-</div><div class='del'>-} # ac_fn_c_try_run</div><div class='del'>-</div><div class='del'>-# ac_fn_c_check_func LINENO FUNC VAR</div><div class='del'>-# ----------------------------------</div><div class='del'>-# Tests whether FUNC exists, setting the cache variable VAR accordingly</div><div class='del'>-ac_fn_c_check_func ()</div><div class='del'>-{</div><div class='del'>-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $2... " &gt;&amp;6; }</div><div class='del'>-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-/* Define $2 to an innocuous variant, in case &lt;limits.h&gt; declares $2.</div><div class='del'>-   For example, HP-UX 11i &lt;limits.h&gt; declares gettimeofday.  */</div><div class='del'>-#define $2 innocuous_$2</div><div class='del'>-</div><div class='del'>-/* System header to define __stub macros and hopefully few prototypes,</div><div class='del'>-    which can conflict with char $2 (); below.</div><div class='del'>-    Prefer &lt;limits.h&gt; to &lt;assert.h&gt; if __STDC__ is defined, since</div><div class='del'>-    &lt;limits.h&gt; exists even on freestanding compilers.  */</div><div class='del'>-</div><div class='del'>-#ifdef __STDC__</div><div class='del'>-# include &lt;limits.h&gt;</div><div class='del'>-#else</div><div class='del'>-# include &lt;assert.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#undef $2</div><div class='del'>-</div><div class='del'>-/* Override any GCC internal prototype to avoid an error.</div><div class='del'>-   Use char because int might match the return type of a GCC</div><div class='del'>-   builtin and then its argument prototype would still apply.  */</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C"</div><div class='del'>-#endif</div><div class='del'>-char $2 ();</div><div class='del'>-/* The GNU C library defines this for functions which it implements</div><div class='del'>-    to always fail with ENOSYS.  Some functions are actually named</div><div class='del'>-    something starting with __ and the normal name is an alias.  */</div><div class='del'>-#if defined __stub_$2 || defined __stub___$2</div><div class='del'>-choke me</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-return $2 ();</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_link "$LINENO"; then :</div><div class='del'>-  eval "$3=yes"</div><div class='del'>-else</div><div class='del'>-  eval "$3=no"</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext \</div><div class='del'>-    conftest$ac_exeext conftest.$ac_ext</div><div class='del'>-fi</div><div class='del'>-eval ac_res=\$$3</div><div class='del'>-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_res" &gt;&amp;6; }</div><div class='del'>-  eval $as_lineno_stack; test "x$as_lineno_stack" = x &amp;&amp; { as_lineno=; unset as_lineno;}</div><div class='del'>-</div><div class='del'>-} # ac_fn_c_check_func</div><div class='del'>-</div><div class='del'>-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES</div><div class='del'>-# -------------------------------------------------------</div><div class='del'>-# Tests whether HEADER exists, giving a warning if it cannot be compiled using</div><div class='del'>-# the include files in INCLUDES and setting the cache variable VAR</div><div class='del'>-# accordingly.</div><div class='del'>-ac_fn_c_check_header_mongrel ()</div><div class='del'>-{</div><div class='del'>-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack</div><div class='del'>-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $2... " &gt;&amp;6; }</div><div class='del'>-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-fi</div><div class='del'>-eval ac_res=\$$3</div><div class='del'>-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_res" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  # Is the header compilable?</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking $2 usability... " &gt;&amp;6; }</div><div class='del'>-cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-$4</div><div class='del'>-#include &lt;$2&gt;</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_compile "$LINENO"; then :</div><div class='del'>-  ac_header_compiler=yes</div><div class='del'>-else</div><div class='del'>-  ac_header_compiler=no</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_header_compiler" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-# Is the header present?</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking $2 presence... " &gt;&amp;6; }</div><div class='del'>-cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-#include &lt;$2&gt;</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_cpp "$LINENO"; then :</div><div class='del'>-  ac_header_preproc=yes</div><div class='del'>-else</div><div class='del'>-  ac_header_preproc=no</div><div class='del'>-fi</div><div class='del'>-rm -f conftest.err conftest.$ac_ext</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_header_preproc" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-# So?  What about this header?</div><div class='del'>-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((</div><div class='del'>-  yes:no: )</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" &gt;&amp;2;}</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" &gt;&amp;2;}</div><div class='del'>-    ;;</div><div class='del'>-  no:yes:* )</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" &gt;&amp;2;}</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" &gt;&amp;2;}</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" &gt;&amp;2;}</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" &gt;&amp;2;}</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" &gt;&amp;2;}</div><div class='del'>-( cat &lt;&lt;\_ASBOX</div><div class='del'>-## ------------------------------------------------------ ##</div><div class='del'>-## Report this to png-mng-implement@lists.sourceforge.net ##</div><div class='del'>-## ------------------------------------------------------ ##</div><div class='del'>-_ASBOX</div><div class='del'>-     ) | sed "s/^/$as_me: WARNING:     /" &gt;&amp;2</div><div class='del'>-    ;;</div><div class='del'>-esac</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $2... " &gt;&amp;6; }</div><div class='del'>-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  eval "$3=\$ac_header_compiler"</div><div class='del'>-fi</div><div class='del'>-eval ac_res=\$$3</div><div class='del'>-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_res" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-  eval $as_lineno_stack; test "x$as_lineno_stack" = x &amp;&amp; { as_lineno=; unset as_lineno;}</div><div class='del'>-</div><div class='del'>-} # ac_fn_c_check_header_mongrel</div><div class='del'>-</div><div class='del'>-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES</div><div class='del'>-# -------------------------------------------</div><div class='del'>-# Tests whether TYPE exists after having included INCLUDES, setting cache</div><div class='del'>-# variable VAR accordingly.</div><div class='del'>-ac_fn_c_check_type ()</div><div class='del'>-{</div><div class='del'>-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $2... " &gt;&amp;6; }</div><div class='del'>-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  eval "$3=no"</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-$4</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-if (sizeof ($2))</div><div class='del'>-	 return 0;</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_compile "$LINENO"; then :</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-$4</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-if (sizeof (($2)))</div><div class='del'>-	    return 0;</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_compile "$LINENO"; then :</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  eval "$3=yes"</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext</div><div class='del'>-fi</div><div class='del'>-eval ac_res=\$$3</div><div class='del'>-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_res" &gt;&amp;6; }</div><div class='del'>-  eval $as_lineno_stack; test "x$as_lineno_stack" = x &amp;&amp; { as_lineno=; unset as_lineno;}</div><div class='del'>-</div><div class='del'>-} # ac_fn_c_check_type</div><div class='del'>-cat &gt;config.log &lt;&lt;_ACEOF</div><div class='del'>-This file contains any messages produced by compilers while</div><div class='del'>-running configure, to aid debugging if configure makes a mistake.</div><div class='del'>-</div><div class='del'>-It was created by libpng $as_me 1.4.0, which was</div><div class='del'>-generated by GNU Autoconf 2.65.  Invocation command line was</div><div class='del'>-</div><div class='del'>-  $ $0 $@</div><div class='del'>-</div><div class='del'>-_ACEOF</div><div class='del'>-exec 5&gt;&gt;config.log</div><div class='del'>-{</div><div class='del'>-cat &lt;&lt;_ASUNAME</div><div class='del'>-## --------- ##</div><div class='del'>-## Platform. ##</div><div class='del'>-## --------- ##</div><div class='del'>-</div><div class='del'>-hostname = `(hostname || uname -n) 2&gt;/dev/null | sed 1q`</div><div class='del'>-uname -m = `(uname -m) 2&gt;/dev/null || echo unknown`</div><div class='del'>-uname -r = `(uname -r) 2&gt;/dev/null || echo unknown`</div><div class='del'>-uname -s = `(uname -s) 2&gt;/dev/null || echo unknown`</div><div class='del'>-uname -v = `(uname -v) 2&gt;/dev/null || echo unknown`</div><div class='del'>-</div><div class='del'>-/usr/bin/uname -p = `(/usr/bin/uname -p) 2&gt;/dev/null || echo unknown`</div><div class='del'>-/bin/uname -X     = `(/bin/uname -X) 2&gt;/dev/null     || echo unknown`</div><div class='del'>-</div><div class='del'>-/bin/arch              = `(/bin/arch) 2&gt;/dev/null              || echo unknown`</div><div class='del'>-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2&gt;/dev/null       || echo unknown`</div><div class='del'>-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2&gt;/dev/null || echo unknown`</div><div class='del'>-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2&gt;/dev/null      || echo unknown`</div><div class='del'>-/bin/machine           = `(/bin/machine) 2&gt;/dev/null           || echo unknown`</div><div class='del'>-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2&gt;/dev/null       || echo unknown`</div><div class='del'>-/bin/universe          = `(/bin/universe) 2&gt;/dev/null          || echo unknown`</div><div class='del'>-</div><div class='del'>-_ASUNAME</div><div class='del'>-</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    $as_echo "PATH: $as_dir"</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-} &gt;&amp;5</div><div class='del'>-</div><div class='del'>-cat &gt;&amp;5 &lt;&lt;_ACEOF</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-## ----------- ##</div><div class='del'>-## Core tests. ##</div><div class='del'>-## ----------- ##</div><div class='del'>-</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Keep a trace of the command line.</div><div class='del'>-# Strip out --no-create and --no-recursion so they do not pile up.</div><div class='del'>-# Strip out --silent because we don't want to record it for future runs.</div><div class='del'>-# Also quote any args containing shell meta-characters.</div><div class='del'>-# Make two passes to allow for proper duplicate-argument suppression.</div><div class='del'>-ac_configure_args=</div><div class='del'>-ac_configure_args0=</div><div class='del'>-ac_configure_args1=</div><div class='del'>-ac_must_keep_next=false</div><div class='del'>-for ac_pass in 1 2</div><div class='del'>-do</div><div class='del'>-  for ac_arg</div><div class='del'>-  do</div><div class='del'>-    case $ac_arg in</div><div class='del'>-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;</div><div class='del'>-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \</div><div class='del'>-    | -silent | --silent | --silen | --sile | --sil)</div><div class='del'>-      continue ;;</div><div class='del'>-    *\'*)</div><div class='del'>-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;</div><div class='del'>-    esac</div><div class='del'>-    case $ac_pass in</div><div class='del'>-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;</div><div class='del'>-    2)</div><div class='del'>-      as_fn_append ac_configure_args1 " '$ac_arg'"</div><div class='del'>-      if test $ac_must_keep_next = true; then</div><div class='del'>-	ac_must_keep_next=false # Got value, back to normal.</div><div class='del'>-      else</div><div class='del'>-	case $ac_arg in</div><div class='del'>-	  *=* | --config-cache | -C | -disable-* | --disable-* \</div><div class='del'>-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \</div><div class='del'>-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \</div><div class='del'>-	  | -with-* | --with-* | -without-* | --without-* | --x)</div><div class='del'>-	    case "$ac_configure_args0 " in</div><div class='del'>-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;</div><div class='del'>-	    esac</div><div class='del'>-	    ;;</div><div class='del'>-	  -* ) ac_must_keep_next=true ;;</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-      as_fn_append ac_configure_args " '$ac_arg'"</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-  done</div><div class='del'>-done</div><div class='del'>-{ ac_configure_args0=; unset ac_configure_args0;}</div><div class='del'>-{ ac_configure_args1=; unset ac_configure_args1;}</div><div class='del'>-</div><div class='del'>-# When interrupted or exit'd, cleanup temporary files, and complete</div><div class='del'>-# config.log.  We remove comments because anyway the quotes in there</div><div class='del'>-# would cause problems or look ugly.</div><div class='del'>-# WARNING: Use '\'' to represent an apostrophe within the trap.</div><div class='del'>-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.</div><div class='del'>-trap 'exit_status=$?</div><div class='del'>-  # Save into config.log some information that might help in debugging.</div><div class='del'>-  {</div><div class='del'>-    echo</div><div class='del'>-</div><div class='del'>-    cat &lt;&lt;\_ASBOX</div><div class='del'>-## ---------------- ##</div><div class='del'>-## Cache variables. ##</div><div class='del'>-## ---------------- ##</div><div class='del'>-_ASBOX</div><div class='del'>-    echo</div><div class='del'>-    # The following way of writing the cache mishandles newlines in values,</div><div class='del'>-(</div><div class='del'>-  for ac_var in `(set) 2&gt;&amp;1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do</div><div class='del'>-    eval ac_val=\$$ac_var</div><div class='del'>-    case $ac_val in #(</div><div class='del'>-    *${as_nl}*)</div><div class='del'>-      case $ac_var in #(</div><div class='del'>-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" &gt;&amp;2;} ;;</div><div class='del'>-      esac</div><div class='del'>-      case $ac_var in #(</div><div class='del'>-      _ | IFS | as_nl) ;; #(</div><div class='del'>-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(</div><div class='del'>-      *) { eval $ac_var=; unset $ac_var;} ;;</div><div class='del'>-      esac ;;</div><div class='del'>-    esac</div><div class='del'>-  done</div><div class='del'>-  (set) 2&gt;&amp;1 |</div><div class='del'>-    case $as_nl`(ac_space='\'' '\''; set) 2&gt;&amp;1` in #(</div><div class='del'>-    *${as_nl}ac_space=\ *)</div><div class='del'>-      sed -n \</div><div class='del'>-	"s/'\''/'\''\\\\'\'''\''/g;</div><div class='del'>-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"</div><div class='del'>-      ;; #(</div><div class='del'>-    *)</div><div class='del'>-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"</div><div class='del'>-      ;;</div><div class='del'>-    esac |</div><div class='del'>-    sort</div><div class='del'>-)</div><div class='del'>-    echo</div><div class='del'>-</div><div class='del'>-    cat &lt;&lt;\_ASBOX</div><div class='del'>-## ----------------- ##</div><div class='del'>-## Output variables. ##</div><div class='del'>-## ----------------- ##</div><div class='del'>-_ASBOX</div><div class='del'>-    echo</div><div class='del'>-    for ac_var in $ac_subst_vars</div><div class='del'>-    do</div><div class='del'>-      eval ac_val=\$$ac_var</div><div class='del'>-      case $ac_val in</div><div class='del'>-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;</div><div class='del'>-      esac</div><div class='del'>-      $as_echo "$ac_var='\''$ac_val'\''"</div><div class='del'>-    done | sort</div><div class='del'>-    echo</div><div class='del'>-</div><div class='del'>-    if test -n "$ac_subst_files"; then</div><div class='del'>-      cat &lt;&lt;\_ASBOX</div><div class='del'>-## ------------------- ##</div><div class='del'>-## File substitutions. ##</div><div class='del'>-## ------------------- ##</div><div class='del'>-_ASBOX</div><div class='del'>-      echo</div><div class='del'>-      for ac_var in $ac_subst_files</div><div class='del'>-      do</div><div class='del'>-	eval ac_val=\$$ac_var</div><div class='del'>-	case $ac_val in</div><div class='del'>-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;</div><div class='del'>-	esac</div><div class='del'>-	$as_echo "$ac_var='\''$ac_val'\''"</div><div class='del'>-      done | sort</div><div class='del'>-      echo</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    if test -s confdefs.h; then</div><div class='del'>-      cat &lt;&lt;\_ASBOX</div><div class='del'>-## ----------- ##</div><div class='del'>-## confdefs.h. ##</div><div class='del'>-## ----------- ##</div><div class='del'>-_ASBOX</div><div class='del'>-      echo</div><div class='del'>-      cat confdefs.h</div><div class='del'>-      echo</div><div class='del'>-    fi</div><div class='del'>-    test "$ac_signal" != 0 &amp;&amp;</div><div class='del'>-      $as_echo "$as_me: caught signal $ac_signal"</div><div class='del'>-    $as_echo "$as_me: exit $exit_status"</div><div class='del'>-  } &gt;&amp;5</div><div class='del'>-  rm -f core *.core core.conftest.* &amp;&amp;</div><div class='del'>-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &amp;&amp;</div><div class='del'>-    exit $exit_status</div><div class='del'>-' 0</div><div class='del'>-for ac_signal in 1 2 13 15; do</div><div class='del'>-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal</div><div class='del'>-done</div><div class='del'>-ac_signal=0</div><div class='del'>-</div><div class='del'>-# confdefs.h avoids OS command line length limits that DEFS can exceed.</div><div class='del'>-rm -f -r conftest* confdefs.h</div><div class='del'>-</div><div class='del'>-$as_echo "/* confdefs.h */" &gt; confdefs.h</div><div class='del'>-</div><div class='del'>-# Predefined preprocessor variables.</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define PACKAGE_NAME "$PACKAGE_NAME"</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define PACKAGE_VERSION "$PACKAGE_VERSION"</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define PACKAGE_STRING "$PACKAGE_STRING"</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define PACKAGE_URL "$PACKAGE_URL"</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Let the site file select an alternate cache file if it wants to.</div><div class='del'>-# Prefer an explicitly selected file to automatically selected ones.</div><div class='del'>-ac_site_file1=NONE</div><div class='del'>-ac_site_file2=NONE</div><div class='del'>-if test -n "$CONFIG_SITE"; then</div><div class='del'>-  ac_site_file1=$CONFIG_SITE</div><div class='del'>-elif test "x$prefix" != xNONE; then</div><div class='del'>-  ac_site_file1=$prefix/share/config.site</div><div class='del'>-  ac_site_file2=$prefix/etc/config.site</div><div class='del'>-else</div><div class='del'>-  ac_site_file1=$ac_default_prefix/share/config.site</div><div class='del'>-  ac_site_file2=$ac_default_prefix/etc/config.site</div><div class='del'>-fi</div><div class='del'>-for ac_site_file in "$ac_site_file1" "$ac_site_file2"</div><div class='del'>-do</div><div class='del'>-  test "x$ac_site_file" = xNONE &amp;&amp; continue</div><div class='del'>-  if test /dev/null != "$ac_site_file" &amp;&amp; test -r "$ac_site_file"; then</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: loading site script $ac_site_file" &gt;&amp;6;}</div><div class='del'>-    sed 's/^/| /' "$ac_site_file" &gt;&amp;5</div><div class='del'>-    . "$ac_site_file"</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-if test -r "$cache_file"; then</div><div class='del'>-  # Some versions of bash will fail to source /dev/null (special files</div><div class='del'>-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.</div><div class='del'>-  if test /dev/null != "$cache_file" &amp;&amp; test -f "$cache_file"; then</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: loading cache $cache_file" &gt;&amp;6;}</div><div class='del'>-    case $cache_file in</div><div class='del'>-      [\\/]* | ?:[\\/]* ) . "$cache_file";;</div><div class='del'>-      *)                      . "./$cache_file";;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: creating cache $cache_file" &gt;&amp;6;}</div><div class='del'>-  &gt;$cache_file</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Check that the precious variables saved in the cache have kept the same</div><div class='del'>-# value.</div><div class='del'>-ac_cache_corrupted=false</div><div class='del'>-for ac_var in $ac_precious_vars; do</div><div class='del'>-  eval ac_old_set=\$ac_cv_env_${ac_var}_set</div><div class='del'>-  eval ac_new_set=\$ac_env_${ac_var}_set</div><div class='del'>-  eval ac_old_val=\$ac_cv_env_${ac_var}_value</div><div class='del'>-  eval ac_new_val=\$ac_env_${ac_var}_value</div><div class='del'>-  case $ac_old_set,$ac_new_set in</div><div class='del'>-    set,)</div><div class='del'>-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" &gt;&amp;2;}</div><div class='del'>-      ac_cache_corrupted=: ;;</div><div class='del'>-    ,set)</div><div class='del'>-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" &gt;&amp;2;}</div><div class='del'>-      ac_cache_corrupted=: ;;</div><div class='del'>-    ,);;</div><div class='del'>-    *)</div><div class='del'>-      if test "x$ac_old_val" != "x$ac_new_val"; then</div><div class='del'>-	# differences in whitespace do not lead to failure.</div><div class='del'>-	ac_old_val_w=`echo x $ac_old_val`</div><div class='del'>-	ac_new_val_w=`echo x $ac_new_val`</div><div class='del'>-	if test "$ac_old_val_w" != "$ac_new_val_w"; then</div><div class='del'>-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" &gt;&amp;2;}</div><div class='del'>-	  ac_cache_corrupted=:</div><div class='del'>-	else</div><div class='del'>-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" &gt;&amp;2;}</div><div class='del'>-	  eval $ac_var=\$ac_old_val</div><div class='del'>-	fi</div><div class='del'>-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me:   former value:  \`$ac_old_val'" &gt;&amp;2;}</div><div class='del'>-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me:   current value: \`$ac_new_val'" &gt;&amp;2;}</div><div class='del'>-      fi;;</div><div class='del'>-  esac</div><div class='del'>-  # Pass precious variables to config.status.</div><div class='del'>-  if test "$ac_new_set" = set; then</div><div class='del'>-    case $ac_new_val in</div><div class='del'>-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;</div><div class='del'>-    *) ac_arg=$ac_var=$ac_new_val ;;</div><div class='del'>-    esac</div><div class='del'>-    case " $ac_configure_args " in</div><div class='del'>-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.</div><div class='del'>-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-if $ac_cache_corrupted; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: error: in \`$ac_pwd':" &gt;&amp;2;}</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: error: changes in the environment can compromise the build" &gt;&amp;2;}</div><div class='del'>-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5</div><div class='del'>-fi</div><div class='del'>-## -------------------- ##</div><div class='del'>-## Main body of script. ##</div><div class='del'>-## -------------------- ##</div><div class='del'>-</div><div class='del'>-ac_ext=c</div><div class='del'>-ac_cpp='$CPP $CPPFLAGS'</div><div class='del'>-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext &gt;&amp;5'</div><div class='del'>-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS &gt;&amp;5'</div><div class='del'>-ac_compiler_gnu=$ac_cv_c_compiler_gnu</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-am__api_version='1.11'</div><div class='del'>-</div><div class='del'>-ac_aux_dir=</div><div class='del'>-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do</div><div class='del'>-  for ac_t in install-sh install.sh shtool; do</div><div class='del'>-    if test -f "$ac_dir/$ac_t"; then</div><div class='del'>-      ac_aux_dir=$ac_dir</div><div class='del'>-      ac_install_sh="$ac_aux_dir/$ac_t -c"</div><div class='del'>-      break 2</div><div class='del'>-    fi</div><div class='del'>-  done</div><div class='del'>-done</div><div class='del'>-if test -z "$ac_aux_dir"; then</div><div class='del'>-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# These three variables are undocumented and unsupported,</div><div class='del'>-# and are intended to be withdrawn in a future Autoconf release.</div><div class='del'>-# They can cause serious problems if a builder's source tree is in a directory</div><div class='del'>-# whose full name contains unusual characters.</div><div class='del'>-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.</div><div class='del'>-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.</div><div class='del'>-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Find a good install program.  We prefer a C program (faster),</div><div class='del'>-# so one script is as good as another.  But avoid the broken or</div><div class='del'>-# incompatible versions:</div><div class='del'>-# SysV /etc/install, /usr/sbin/install</div><div class='del'>-# SunOS /usr/etc/install</div><div class='del'>-# IRIX /sbin/install</div><div class='del'>-# AIX /bin/install</div><div class='del'>-# AmigaOS /C/install, which installs bootblocks on floppy discs</div><div class='del'>-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag</div><div class='del'>-# AFS /usr/afsws/bin/install, which mishandles nonexistent args</div><div class='del'>-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"</div><div class='del'>-# OS/2's system install, which has a completely different semantic</div><div class='del'>-# ./install, which can be erroneously created by make from ./install.sh.</div><div class='del'>-# Reject install programs that cannot install multiple files.</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for a BSD-compatible install... " &gt;&amp;6; }</div><div class='del'>-if test -z "$INSTALL"; then</div><div class='del'>-if test "${ac_cv_path_install+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    # Account for people who put trailing slashes in PATH elements.</div><div class='del'>-case $as_dir/ in #((</div><div class='del'>-  ./ | .// | /[cC]/* | \</div><div class='del'>-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \</div><div class='del'>-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \</div><div class='del'>-  /usr/ucb/* ) ;;</div><div class='del'>-  *)</div><div class='del'>-    # OSF1 and SCO ODT 3.0 have their own names for install.</div><div class='del'>-    # Don't use installbsd from OSF since it installs stuff as root</div><div class='del'>-    # by default.</div><div class='del'>-    for ac_prog in ginstall scoinst install; do</div><div class='del'>-      for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then</div><div class='del'>-	  if test $ac_prog = install &amp;&amp;</div><div class='del'>-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-	    # AIX install.  It has an incompatible calling convention.</div><div class='del'>-	    :</div><div class='del'>-	  elif test $ac_prog = install &amp;&amp;</div><div class='del'>-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-	    # program-specific install script used by HP pwplus--don't use.</div><div class='del'>-	    :</div><div class='del'>-	  else</div><div class='del'>-	    rm -rf conftest.one conftest.two conftest.dir</div><div class='del'>-	    echo one &gt; conftest.one</div><div class='del'>-	    echo two &gt; conftest.two</div><div class='del'>-	    mkdir conftest.dir</div><div class='del'>-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &amp;&amp;</div><div class='del'>-	      test -s conftest.one &amp;&amp; test -s conftest.two &amp;&amp;</div><div class='del'>-	      test -s conftest.dir/conftest.one &amp;&amp;</div><div class='del'>-	      test -s conftest.dir/conftest.two</div><div class='del'>-	    then</div><div class='del'>-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"</div><div class='del'>-	      break 3</div><div class='del'>-	    fi</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-      done</div><div class='del'>-    done</div><div class='del'>-    ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-rm -rf conftest.one conftest.two conftest.dir</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-  if test "${ac_cv_path_install+set}" = set; then</div><div class='del'>-    INSTALL=$ac_cv_path_install</div><div class='del'>-  else</div><div class='del'>-    # As a last resort, use the slow shell script.  Don't cache a</div><div class='del'>-    # value for INSTALL within a source directory, because that will</div><div class='del'>-    # break other packages using the cache if that directory is</div><div class='del'>-    # removed, or if the value is a relative name.</div><div class='del'>-    INSTALL=$ac_install_sh</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" &gt;&amp;5</div><div class='del'>-$as_echo "$INSTALL" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.</div><div class='del'>-# It thinks the first close brace ends the variable substitution.</div><div class='del'>-test -z "$INSTALL_PROGRAM" &amp;&amp; INSTALL_PROGRAM='${INSTALL}'</div><div class='del'>-</div><div class='del'>-test -z "$INSTALL_SCRIPT" &amp;&amp; INSTALL_SCRIPT='${INSTALL}'</div><div class='del'>-</div><div class='del'>-test -z "$INSTALL_DATA" &amp;&amp; INSTALL_DATA='${INSTALL} -m 644'</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether build environment is sane... " &gt;&amp;6; }</div><div class='del'>-# Just in case</div><div class='del'>-sleep 1</div><div class='del'>-echo timestamp &gt; conftest.file</div><div class='del'>-# Reject unsafe characters in $srcdir or the absolute working directory</div><div class='del'>-# name.  Accept space and tab only in the latter.</div><div class='del'>-am_lf='</div><div class='del'>-'</div><div class='del'>-case `pwd` in</div><div class='del'>-  *[\\\"\#\$\&amp;\'\`$am_lf]*)</div><div class='del'>-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;</div><div class='del'>-esac</div><div class='del'>-case $srcdir in</div><div class='del'>-  *[\\\"\#\$\&amp;\'\`$am_lf\ \	]*)</div><div class='del'>-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# Do `set' in a subshell so we don't clobber the current shell's</div><div class='del'>-# arguments.  Must try -L first in case configure is actually a</div><div class='del'>-# symlink; some systems play weird games with the mod time of symlinks</div><div class='del'>-# (eg FreeBSD returns the mod time of the symlink's containing</div><div class='del'>-# directory).</div><div class='del'>-if (</div><div class='del'>-   set X `ls -Lt "$srcdir/configure" conftest.file 2&gt; /dev/null`</div><div class='del'>-   if test "$*" = "X"; then</div><div class='del'>-      # -L didn't work.</div><div class='del'>-      set X `ls -t "$srcdir/configure" conftest.file`</div><div class='del'>-   fi</div><div class='del'>-   rm -f conftest.file</div><div class='del'>-   if test "$*" != "X $srcdir/configure conftest.file" \</div><div class='del'>-      &amp;&amp; test "$*" != "X conftest.file $srcdir/configure"; then</div><div class='del'>-</div><div class='del'>-      # If neither matched, then we have a broken ls.  This can happen</div><div class='del'>-      # if, for instance, CONFIG_SHELL is bash and it inherits a</div><div class='del'>-      # broken ls alias from the environment.  This has actually</div><div class='del'>-      # happened.  Such a system could not be considered "sane".</div><div class='del'>-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken</div><div class='del'>-alias in your environment" "$LINENO" 5</div><div class='del'>-   fi</div><div class='del'>-</div><div class='del'>-   test "$2" = conftest.file</div><div class='del'>-   )</div><div class='del'>-then</div><div class='del'>-   # Ok.</div><div class='del'>-   :</div><div class='del'>-else</div><div class='del'>-   as_fn_error "newly created file is older than distributed files!</div><div class='del'>-Check your system clock" "$LINENO" 5</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" &gt;&amp;5</div><div class='del'>-$as_echo "yes" &gt;&amp;6; }</div><div class='del'>-test "$program_prefix" != NONE &amp;&amp;</div><div class='del'>-  program_transform_name="s&amp;^&amp;$program_prefix&amp;;$program_transform_name"</div><div class='del'>-# Use a double $ so make ignores it.</div><div class='del'>-test "$program_suffix" != NONE &amp;&amp;</div><div class='del'>-  program_transform_name="s&amp;\$&amp;$program_suffix&amp;;$program_transform_name"</div><div class='del'>-# Double any \ or $.</div><div class='del'>-# By default was `s,x,x', remove it if useless.</div><div class='del'>-ac_script='s/[\\$]/&amp;&amp;/g;s/;s,x,x,$//'</div><div class='del'>-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`</div><div class='del'>-</div><div class='del'>-# expand $ac_aux_dir to an absolute path</div><div class='del'>-am_aux_dir=`cd $ac_aux_dir &amp;&amp; pwd`</div><div class='del'>-</div><div class='del'>-if test x"${MISSING+set}" != xset; then</div><div class='del'>-  case $am_aux_dir in</div><div class='del'>-  *\ * | *\	*)</div><div class='del'>-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;</div><div class='del'>-  *)</div><div class='del'>-    MISSING="\${SHELL} $am_aux_dir/missing" ;;</div><div class='del'>-  esac</div><div class='del'>-fi</div><div class='del'>-# Use eval to expand $SHELL</div><div class='del'>-if eval "$MISSING --run true"; then</div><div class='del'>-  am_missing_run="$MISSING --run "</div><div class='del'>-else</div><div class='del'>-  am_missing_run=</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" &gt;&amp;2;}</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test x"${install_sh}" != xset; then</div><div class='del'>-  case $am_aux_dir in</div><div class='del'>-  *\ * | *\	*)</div><div class='del'>-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;</div><div class='del'>-  *)</div><div class='del'>-    install_sh="\${SHELL} $am_aux_dir/install-sh"</div><div class='del'>-  esac</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Installed binaries are usually stripped using `strip' when the user</div><div class='del'>-# run `make install-strip'.  However `strip' might not be the right</div><div class='del'>-# tool to use in cross-compilation environments, therefore Automake</div><div class='del'>-# will honor the `STRIP' environment variable to overrule this program.</div><div class='del'>-if test "$cross_compiling" != no; then</div><div class='del'>-  if test -n "$ac_tool_prefix"; then</div><div class='del'>-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.</div><div class='del'>-set dummy ${ac_tool_prefix}strip; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_STRIP+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$STRIP"; then</div><div class='del'>-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-STRIP=$ac_cv_prog_STRIP</div><div class='del'>-if test -n "$STRIP"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" &gt;&amp;5</div><div class='del'>-$as_echo "$STRIP" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-if test -z "$ac_cv_prog_STRIP"; then</div><div class='del'>-  ac_ct_STRIP=$STRIP</div><div class='del'>-  # Extract the first word of "strip", so it can be a program name with args.</div><div class='del'>-set dummy strip; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_STRIP"; then</div><div class='del'>-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_STRIP="strip"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP</div><div class='del'>-if test -n "$ac_ct_STRIP"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_STRIP" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_STRIP" = x; then</div><div class='del'>-    STRIP=":"</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    STRIP=$ac_ct_STRIP</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  STRIP="$ac_cv_prog_STRIP"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for a thread-safe mkdir -p... " &gt;&amp;6; }</div><div class='del'>-if test -z "$MKDIR_P"; then</div><div class='del'>-  if test "${ac_cv_path_mkdir+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_prog in mkdir gmkdir; do</div><div class='del'>-	 for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue</div><div class='del'>-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2&gt;&amp;1` in #(</div><div class='del'>-	     'mkdir (GNU coreutils) '* | \</div><div class='del'>-	     'mkdir (coreutils) '* | \</div><div class='del'>-	     'mkdir (fileutils) '4.1*)</div><div class='del'>-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext</div><div class='del'>-	       break 3;;</div><div class='del'>-	   esac</div><div class='del'>-	 done</div><div class='del'>-       done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  test -d ./--version &amp;&amp; rmdir ./--version</div><div class='del'>-  if test "${ac_cv_path_mkdir+set}" = set; then</div><div class='del'>-    MKDIR_P="$ac_cv_path_mkdir -p"</div><div class='del'>-  else</div><div class='del'>-    # As a last resort, use the slow shell script.  Don't cache a</div><div class='del'>-    # value for MKDIR_P within a source directory, because that will</div><div class='del'>-    # break other packages using the cache if that directory is</div><div class='del'>-    # removed, or if the value is a relative name.</div><div class='del'>-    MKDIR_P="$ac_install_sh -d"</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" &gt;&amp;5</div><div class='del'>-$as_echo "$MKDIR_P" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-mkdir_p="$MKDIR_P"</div><div class='del'>-case $mkdir_p in</div><div class='del'>-  [\\/$]* | ?:[\\/]*) ;;</div><div class='del'>-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-for ac_prog in gawk mawk nawk awk</div><div class='del'>-do</div><div class='del'>-  # Extract the first word of "$ac_prog", so it can be a program name with args.</div><div class='del'>-set dummy $ac_prog; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_AWK+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$AWK"; then</div><div class='del'>-  ac_cv_prog_AWK="$AWK" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_AWK="$ac_prog"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-AWK=$ac_cv_prog_AWK</div><div class='del'>-if test -n "$AWK"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" &gt;&amp;5</div><div class='del'>-$as_echo "$AWK" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  test -n "$AWK" &amp;&amp; break</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " &gt;&amp;6; }</div><div class='del'>-set x ${MAKE-make}</div><div class='del'>-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`</div><div class='del'>-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  cat &gt;conftest.make &lt;&lt;\_ACEOF</div><div class='del'>-SHELL = /bin/sh</div><div class='del'>-all:</div><div class='del'>-	@echo '@@@%%%=$(MAKE)=@@@%%%'</div><div class='del'>-_ACEOF</div><div class='del'>-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.</div><div class='del'>-case `${MAKE-make} -f conftest.make 2&gt;/dev/null` in</div><div class='del'>-  *@@@%%%=?*=@@@%%%*)</div><div class='del'>-    eval ac_cv_prog_make_${ac_make}_set=yes;;</div><div class='del'>-  *)</div><div class='del'>-    eval ac_cv_prog_make_${ac_make}_set=no;;</div><div class='del'>-esac</div><div class='del'>-rm -f conftest.make</div><div class='del'>-fi</div><div class='del'>-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" &gt;&amp;5</div><div class='del'>-$as_echo "yes" &gt;&amp;6; }</div><div class='del'>-  SET_MAKE=</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-  SET_MAKE="MAKE=${MAKE-make}"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-rm -rf .tst 2&gt;/dev/null</div><div class='del'>-mkdir .tst 2&gt;/dev/null</div><div class='del'>-if test -d .tst; then</div><div class='del'>-  am__leading_dot=.</div><div class='del'>-else</div><div class='del'>-  am__leading_dot=_</div><div class='del'>-fi</div><div class='del'>-rmdir .tst 2&gt;/dev/null</div><div class='del'>-</div><div class='del'>-if test "`cd $srcdir &amp;&amp; pwd`" != "`pwd`"; then</div><div class='del'>-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output</div><div class='del'>-  # is not polluted with repeated "-I."</div><div class='del'>-  am__isrc=' -I$(srcdir)'</div><div class='del'>-  # test to see if srcdir already configured</div><div class='del'>-  if test -f $srcdir/config.status; then</div><div class='del'>-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# test whether we have cygpath</div><div class='del'>-if test -z "$CYGPATH_W"; then</div><div class='del'>-  if (cygpath --version) &gt;/dev/null 2&gt;/dev/null; then</div><div class='del'>-    CYGPATH_W='cygpath -w'</div><div class='del'>-  else</div><div class='del'>-    CYGPATH_W=echo</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Define the identity of the package.</div><div class='del'>- PACKAGE='libpng'</div><div class='del'>- VERSION='1.4.0'</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define PACKAGE "$PACKAGE"</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define VERSION "$VERSION"</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-# Some tools Automake needs.</div><div class='del'>-</div><div class='del'>-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}</div><div class='del'>-</div><div class='del'>-# We need awk for the "check" target.  The system "awk" is bad on</div><div class='del'>-# some platforms.</div><div class='del'>-# Always define AMTAR for backward compatibility.</div><div class='del'>-</div><div class='del'>-AMTAR=${AMTAR-"${am_missing_run}tar"}</div><div class='del'>-</div><div class='del'>-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " &gt;&amp;6; }</div><div class='del'>-    # Check whether --enable-maintainer-mode was given.</div><div class='del'>-if test "${enable_maintainer_mode+set}" = set; then :</div><div class='del'>-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval</div><div class='del'>-else</div><div class='del'>-  USE_MAINTAINER_MODE=no</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" &gt;&amp;5</div><div class='del'>-$as_echo "$USE_MAINTAINER_MODE" &gt;&amp;6; }</div><div class='del'>-   if test $USE_MAINTAINER_MODE = yes; then</div><div class='del'>-  MAINTAINER_MODE_TRUE=</div><div class='del'>-  MAINTAINER_MODE_FALSE='#'</div><div class='del'>-else</div><div class='del'>-  MAINTAINER_MODE_TRUE='#'</div><div class='del'>-  MAINTAINER_MODE_FALSE=</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  MAINT=$MAINTAINER_MODE_TRUE</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-PNGLIB_VERSION=1.4.0</div><div class='del'>-PNGLIB_MAJOR=1</div><div class='del'>-PNGLIB_MINOR=4</div><div class='del'>-PNGLIB_RELEASE=0</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ac_config_headers="$ac_config_headers config.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Checks for programs.</div><div class='del'>-ac_ext=c</div><div class='del'>-ac_cpp='$CPP $CPPFLAGS'</div><div class='del'>-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext &gt;&amp;5'</div><div class='del'>-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS &gt;&amp;5'</div><div class='del'>-ac_compiler_gnu=$ac_cv_c_compiler_gnu</div><div class='del'>-if test -n "$ac_tool_prefix"; then</div><div class='del'>-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.</div><div class='del'>-set dummy ${ac_tool_prefix}gcc; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_CC+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$CC"; then</div><div class='del'>-  ac_cv_prog_CC="$CC" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_CC="${ac_tool_prefix}gcc"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-CC=$ac_cv_prog_CC</div><div class='del'>-if test -n "$CC"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" &gt;&amp;5</div><div class='del'>-$as_echo "$CC" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-if test -z "$ac_cv_prog_CC"; then</div><div class='del'>-  ac_ct_CC=$CC</div><div class='del'>-  # Extract the first word of "gcc", so it can be a program name with args.</div><div class='del'>-set dummy gcc; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_CC"; then</div><div class='del'>-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_CC="gcc"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_CC=$ac_cv_prog_ac_ct_CC</div><div class='del'>-if test -n "$ac_ct_CC"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_CC" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_CC" = x; then</div><div class='del'>-    CC=""</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    CC=$ac_ct_CC</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  CC="$ac_cv_prog_CC"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test -z "$CC"; then</div><div class='del'>-          if test -n "$ac_tool_prefix"; then</div><div class='del'>-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.</div><div class='del'>-set dummy ${ac_tool_prefix}cc; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_CC+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$CC"; then</div><div class='del'>-  ac_cv_prog_CC="$CC" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_CC="${ac_tool_prefix}cc"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-CC=$ac_cv_prog_CC</div><div class='del'>-if test -n "$CC"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" &gt;&amp;5</div><div class='del'>-$as_echo "$CC" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-if test -z "$CC"; then</div><div class='del'>-  # Extract the first word of "cc", so it can be a program name with args.</div><div class='del'>-set dummy cc; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_CC+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$CC"; then</div><div class='del'>-  ac_cv_prog_CC="$CC" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-  ac_prog_rejected=no</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then</div><div class='del'>-       ac_prog_rejected=yes</div><div class='del'>-       continue</div><div class='del'>-     fi</div><div class='del'>-    ac_cv_prog_CC="cc"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-if test $ac_prog_rejected = yes; then</div><div class='del'>-  # We found a bogon in the path, so make sure we never use it.</div><div class='del'>-  set dummy $ac_cv_prog_CC</div><div class='del'>-  shift</div><div class='del'>-  if test $# != 0; then</div><div class='del'>-    # We chose a different compiler from the bogus one.</div><div class='del'>-    # However, it has the same basename, so the bogon will be chosen</div><div class='del'>-    # first if we set CC to just the basename; use the full file name.</div><div class='del'>-    shift</div><div class='del'>-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-CC=$ac_cv_prog_CC</div><div class='del'>-if test -n "$CC"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" &gt;&amp;5</div><div class='del'>-$as_echo "$CC" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-if test -z "$CC"; then</div><div class='del'>-  if test -n "$ac_tool_prefix"; then</div><div class='del'>-  for ac_prog in cl.exe</div><div class='del'>-  do</div><div class='del'>-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.</div><div class='del'>-set dummy $ac_tool_prefix$ac_prog; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_CC+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$CC"; then</div><div class='del'>-  ac_cv_prog_CC="$CC" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-CC=$ac_cv_prog_CC</div><div class='del'>-if test -n "$CC"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" &gt;&amp;5</div><div class='del'>-$as_echo "$CC" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    test -n "$CC" &amp;&amp; break</div><div class='del'>-  done</div><div class='del'>-fi</div><div class='del'>-if test -z "$CC"; then</div><div class='del'>-  ac_ct_CC=$CC</div><div class='del'>-  for ac_prog in cl.exe</div><div class='del'>-do</div><div class='del'>-  # Extract the first word of "$ac_prog", so it can be a program name with args.</div><div class='del'>-set dummy $ac_prog; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_CC"; then</div><div class='del'>-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_CC="$ac_prog"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_CC=$ac_cv_prog_ac_ct_CC</div><div class='del'>-if test -n "$ac_ct_CC"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_CC" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  test -n "$ac_ct_CC" &amp;&amp; break</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_CC" = x; then</div><div class='del'>-    CC=""</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    CC=$ac_ct_CC</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-test -z "$CC" &amp;&amp; { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: error: in \`$ac_pwd':" &gt;&amp;2;}</div><div class='del'>-as_fn_error "no acceptable C compiler found in \$PATH</div><div class='del'>-See \`config.log' for more details." "$LINENO" 5; }</div><div class='del'>-</div><div class='del'>-# Provide some information about the compiler.</div><div class='del'>-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" &gt;&amp;5</div><div class='del'>-set X $ac_compile</div><div class='del'>-ac_compiler=$2</div><div class='del'>-for ac_option in --version -v -V -qversion; do</div><div class='del'>-  { { ac_try="$ac_compiler $ac_option &gt;&amp;5"</div><div class='del'>-case "(($ac_try" in</div><div class='del'>-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;</div><div class='del'>-  *) ac_try_echo=$ac_try;;</div><div class='del'>-esac</div><div class='del'>-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""</div><div class='del'>-$as_echo "$ac_try_echo"; } &gt;&amp;5</div><div class='del'>-  (eval "$ac_compiler $ac_option &gt;&amp;5") 2&gt;conftest.err</div><div class='del'>-  ac_status=$?</div><div class='del'>-  if test -s conftest.err; then</div><div class='del'>-    sed '10a\</div><div class='del'>-... rest of stderr output deleted ...</div><div class='del'>-         10q' conftest.err &gt;conftest.er1</div><div class='del'>-    cat conftest.er1 &gt;&amp;5</div><div class='del'>-  fi</div><div class='del'>-  rm -f conftest.er1 conftest.err</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; }</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-ac_clean_files_save=$ac_clean_files</div><div class='del'>-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"</div><div class='del'>-# Try to create an executable without -o first, disregard a.out.</div><div class='del'>-# It will help us diagnose broken compilers, and finding out an intuition</div><div class='del'>-# of exeext.</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether the C compiler works... " &gt;&amp;6; }</div><div class='del'>-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`</div><div class='del'>-</div><div class='del'>-# The possible output files:</div><div class='del'>-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"</div><div class='del'>-</div><div class='del'>-ac_rmfiles=</div><div class='del'>-for ac_file in $ac_files</div><div class='del'>-do</div><div class='del'>-  case $ac_file in</div><div class='del'>-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;</div><div class='del'>-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;</div><div class='del'>-  esac</div><div class='del'>-done</div><div class='del'>-rm -f $ac_rmfiles</div><div class='del'>-</div><div class='del'>-if { { ac_try="$ac_link_default"</div><div class='del'>-case "(($ac_try" in</div><div class='del'>-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;</div><div class='del'>-  *) ac_try_echo=$ac_try;;</div><div class='del'>-esac</div><div class='del'>-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""</div><div class='del'>-$as_echo "$ac_try_echo"; } &gt;&amp;5</div><div class='del'>-  (eval "$ac_link_default") 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; }; then :</div><div class='del'>-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.</div><div class='del'>-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'</div><div class='del'>-# in a Makefile.  We should not override ac_cv_exeext if it was cached,</div><div class='del'>-# so that the user can short-circuit this test for compilers unknown to</div><div class='del'>-# Autoconf.</div><div class='del'>-for ac_file in $ac_files ''</div><div class='del'>-do</div><div class='del'>-  test -f "$ac_file" || continue</div><div class='del'>-  case $ac_file in</div><div class='del'>-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )</div><div class='del'>-	;;</div><div class='del'>-    [ab].out )</div><div class='del'>-	# We found the default executable, but exeext='' is most</div><div class='del'>-	# certainly right.</div><div class='del'>-	break;;</div><div class='del'>-    *.* )</div><div class='del'>-	if test "${ac_cv_exeext+set}" = set &amp;&amp; test "$ac_cv_exeext" != no;</div><div class='del'>-	then :; else</div><div class='del'>-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`</div><div class='del'>-	fi</div><div class='del'>-	# We set ac_cv_exeext here because the later test for it is not</div><div class='del'>-	# safe: cross compilers may not add the suffix if given an `-o'</div><div class='del'>-	# argument, so we may need to know it at that point already.</div><div class='del'>-	# Even if this section looks crufty: it has the advantage of</div><div class='del'>-	# actually working.</div><div class='del'>-	break;;</div><div class='del'>-    * )</div><div class='del'>-	break;;</div><div class='del'>-  esac</div><div class='del'>-done</div><div class='del'>-test "$ac_cv_exeext" = no &amp;&amp; ac_cv_exeext=</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  ac_file=''</div><div class='del'>-fi</div><div class='del'>-if test -z "$ac_file"; then :</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-$as_echo "$as_me: failed program was:" &gt;&amp;5</div><div class='del'>-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5</div><div class='del'>-</div><div class='del'>-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: error: in \`$ac_pwd':" &gt;&amp;2;}</div><div class='del'>-{ as_fn_set_status 77</div><div class='del'>-as_fn_error "C compiler cannot create executables</div><div class='del'>-See \`config.log' for more details." "$LINENO" 5; }; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" &gt;&amp;5</div><div class='del'>-$as_echo "yes" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for C compiler default output file name... " &gt;&amp;6; }</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_file" &gt;&amp;6; }</div><div class='del'>-ac_exeext=$ac_cv_exeext</div><div class='del'>-</div><div class='del'>-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out</div><div class='del'>-ac_clean_files=$ac_clean_files_save</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for suffix of executables... " &gt;&amp;6; }</div><div class='del'>-if { { ac_try="$ac_link"</div><div class='del'>-case "(($ac_try" in</div><div class='del'>-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;</div><div class='del'>-  *) ac_try_echo=$ac_try;;</div><div class='del'>-esac</div><div class='del'>-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""</div><div class='del'>-$as_echo "$ac_try_echo"; } &gt;&amp;5</div><div class='del'>-  (eval "$ac_link") 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; }; then :</div><div class='del'>-  # If both `conftest.exe' and `conftest' are `present' (well, observable)</div><div class='del'>-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will</div><div class='del'>-# work properly (i.e., refer to `conftest.exe'), while it won't with</div><div class='del'>-# `rm'.</div><div class='del'>-for ac_file in conftest.exe conftest conftest.*; do</div><div class='del'>-  test -f "$ac_file" || continue</div><div class='del'>-  case $ac_file in</div><div class='del'>-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;</div><div class='del'>-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`</div><div class='del'>-	  break;;</div><div class='del'>-    * ) break;;</div><div class='del'>-  esac</div><div class='del'>-done</div><div class='del'>-else</div><div class='del'>-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: error: in \`$ac_pwd':" &gt;&amp;2;}</div><div class='del'>-as_fn_error "cannot compute suffix of executables: cannot compile and link</div><div class='del'>-See \`config.log' for more details." "$LINENO" 5; }</div><div class='del'>-fi</div><div class='del'>-rm -f conftest conftest$ac_cv_exeext</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_exeext" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-rm -f conftest.$ac_ext</div><div class='del'>-EXEEXT=$ac_cv_exeext</div><div class='del'>-ac_exeext=$EXEEXT</div><div class='del'>-cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-FILE *f = fopen ("conftest.out", "w");</div><div class='del'>- return ferror (f) || fclose (f) != 0;</div><div class='del'>-</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-ac_clean_files="$ac_clean_files conftest.out"</div><div class='del'>-# Check that the compiler produces executables we can run.  If not, either</div><div class='del'>-# the compiler is broken, or we cross compile.</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether we are cross compiling... " &gt;&amp;6; }</div><div class='del'>-if test "$cross_compiling" != yes; then</div><div class='del'>-  { { ac_try="$ac_link"</div><div class='del'>-case "(($ac_try" in</div><div class='del'>-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;</div><div class='del'>-  *) ac_try_echo=$ac_try;;</div><div class='del'>-esac</div><div class='del'>-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""</div><div class='del'>-$as_echo "$ac_try_echo"; } &gt;&amp;5</div><div class='del'>-  (eval "$ac_link") 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; }</div><div class='del'>-  if { ac_try='./conftest$ac_cv_exeext'</div><div class='del'>-  { { case "(($ac_try" in</div><div class='del'>-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;</div><div class='del'>-  *) ac_try_echo=$ac_try;;</div><div class='del'>-esac</div><div class='del'>-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""</div><div class='del'>-$as_echo "$ac_try_echo"; } &gt;&amp;5</div><div class='del'>-  (eval "$ac_try") 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; }; }; then</div><div class='del'>-    cross_compiling=no</div><div class='del'>-  else</div><div class='del'>-    if test "$cross_compiling" = maybe; then</div><div class='del'>-	cross_compiling=yes</div><div class='del'>-    else</div><div class='del'>-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: error: in \`$ac_pwd':" &gt;&amp;2;}</div><div class='del'>-as_fn_error "cannot run C compiled programs.</div><div class='del'>-If you meant to cross compile, use \`--host'.</div><div class='del'>-See \`config.log' for more details." "$LINENO" 5; }</div><div class='del'>-    fi</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" &gt;&amp;5</div><div class='del'>-$as_echo "$cross_compiling" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out</div><div class='del'>-ac_clean_files=$ac_clean_files_save</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for suffix of object files... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_objext+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-rm -f conftest.o conftest.obj</div><div class='del'>-if { { ac_try="$ac_compile"</div><div class='del'>-case "(($ac_try" in</div><div class='del'>-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;</div><div class='del'>-  *) ac_try_echo=$ac_try;;</div><div class='del'>-esac</div><div class='del'>-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""</div><div class='del'>-$as_echo "$ac_try_echo"; } &gt;&amp;5</div><div class='del'>-  (eval "$ac_compile") 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; }; then :</div><div class='del'>-  for ac_file in conftest.o conftest.obj conftest.*; do</div><div class='del'>-  test -f "$ac_file" || continue;</div><div class='del'>-  case $ac_file in</div><div class='del'>-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;</div><div class='del'>-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`</div><div class='del'>-       break;;</div><div class='del'>-  esac</div><div class='del'>-done</div><div class='del'>-else</div><div class='del'>-  $as_echo "$as_me: failed program was:" &gt;&amp;5</div><div class='del'>-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5</div><div class='del'>-</div><div class='del'>-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: error: in \`$ac_pwd':" &gt;&amp;2;}</div><div class='del'>-as_fn_error "cannot compute suffix of object files: cannot compile</div><div class='del'>-See \`config.log' for more details." "$LINENO" 5; }</div><div class='del'>-fi</div><div class='del'>-rm -f conftest.$ac_cv_objext conftest.$ac_ext</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_objext" &gt;&amp;6; }</div><div class='del'>-OBJEXT=$ac_cv_objext</div><div class='del'>-ac_objext=$OBJEXT</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether we are using the GNU C compiler... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_c_compiler_gnu+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-#ifndef __GNUC__</div><div class='del'>-       choke me</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_compile "$LINENO"; then :</div><div class='del'>-  ac_compiler_gnu=yes</div><div class='del'>-else</div><div class='del'>-  ac_compiler_gnu=no</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext</div><div class='del'>-ac_cv_c_compiler_gnu=$ac_compiler_gnu</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_c_compiler_gnu" &gt;&amp;6; }</div><div class='del'>-if test $ac_compiler_gnu = yes; then</div><div class='del'>-  GCC=yes</div><div class='del'>-else</div><div class='del'>-  GCC=</div><div class='del'>-fi</div><div class='del'>-ac_test_CFLAGS=${CFLAGS+set}</div><div class='del'>-ac_save_CFLAGS=$CFLAGS</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether $CC accepts -g... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_cc_g+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  ac_save_c_werror_flag=$ac_c_werror_flag</div><div class='del'>-   ac_c_werror_flag=yes</div><div class='del'>-   ac_cv_prog_cc_g=no</div><div class='del'>-   CFLAGS="-g"</div><div class='del'>-   cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_compile "$LINENO"; then :</div><div class='del'>-  ac_cv_prog_cc_g=yes</div><div class='del'>-else</div><div class='del'>-  CFLAGS=""</div><div class='del'>-      cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_compile "$LINENO"; then :</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  ac_c_werror_flag=$ac_save_c_werror_flag</div><div class='del'>-	 CFLAGS="-g"</div><div class='del'>-	 cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_compile "$LINENO"; then :</div><div class='del'>-  ac_cv_prog_cc_g=yes</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext</div><div class='del'>-   ac_c_werror_flag=$ac_save_c_werror_flag</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_prog_cc_g" &gt;&amp;6; }</div><div class='del'>-if test "$ac_test_CFLAGS" = set; then</div><div class='del'>-  CFLAGS=$ac_save_CFLAGS</div><div class='del'>-elif test $ac_cv_prog_cc_g = yes; then</div><div class='del'>-  if test "$GCC" = yes; then</div><div class='del'>-    CFLAGS="-g -O2"</div><div class='del'>-  else</div><div class='del'>-    CFLAGS="-g"</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  if test "$GCC" = yes; then</div><div class='del'>-    CFLAGS="-O2"</div><div class='del'>-  else</div><div class='del'>-    CFLAGS=</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $CC option to accept ISO C89... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_cc_c89+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  ac_cv_prog_cc_c89=no</div><div class='del'>-ac_save_CC=$CC</div><div class='del'>-cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */</div><div class='del'>-struct buf { int x; };</div><div class='del'>-FILE * (*rcsopen) (struct buf *, struct stat *, int);</div><div class='del'>-static char *e (p, i)</div><div class='del'>-     char **p;</div><div class='del'>-     int i;</div><div class='del'>-{</div><div class='del'>-  return p[i];</div><div class='del'>-}</div><div class='del'>-static char *f (char * (*g) (char **, int), char **p, ...)</div><div class='del'>-{</div><div class='del'>-  char *s;</div><div class='del'>-  va_list v;</div><div class='del'>-  va_start (v,p);</div><div class='del'>-  s = g (p, va_arg (v,int));</div><div class='del'>-  va_end (v);</div><div class='del'>-  return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has</div><div class='del'>-   function prototypes and stuff, but not '\xHH' hex character constants.</div><div class='del'>-   These don't provoke an error unfortunately, instead are silently treated</div><div class='del'>-   as 'x'.  The following induces an error, until -std is added to get</div><div class='del'>-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an</div><div class='del'>-   array size at least.  It's necessary to write '\x00'==0 to get something</div><div class='del'>-   that's true only with -std.  */</div><div class='del'>-int osf4_cc_array ['\x00' == 0 ? 1 : -1];</div><div class='del'>-</div><div class='del'>-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters</div><div class='del'>-   inside strings and character constants.  */</div><div class='del'>-#define FOO(x) 'x'</div><div class='del'>-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];</div><div class='del'>-</div><div class='del'>-int test (int i, double x);</div><div class='del'>-struct s1 {int (*f) (int a);};</div><div class='del'>-struct s2 {int (*f) (double a);};</div><div class='del'>-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);</div><div class='del'>-int argc;</div><div class='del'>-char **argv;</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \</div><div class='del'>-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"</div><div class='del'>-do</div><div class='del'>-  CC="$ac_save_CC $ac_arg"</div><div class='del'>-  if ac_fn_c_try_compile "$LINENO"; then :</div><div class='del'>-  ac_cv_prog_cc_c89=$ac_arg</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext</div><div class='del'>-  test "x$ac_cv_prog_cc_c89" != "xno" &amp;&amp; break</div><div class='del'>-done</div><div class='del'>-rm -f conftest.$ac_ext</div><div class='del'>-CC=$ac_save_CC</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-# AC_CACHE_VAL</div><div class='del'>-case "x$ac_cv_prog_cc_c89" in</div><div class='del'>-  x)</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" &gt;&amp;5</div><div class='del'>-$as_echo "none needed" &gt;&amp;6; } ;;</div><div class='del'>-  xno)</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" &gt;&amp;5</div><div class='del'>-$as_echo "unsupported" &gt;&amp;6; } ;;</div><div class='del'>-  *)</div><div class='del'>-    CC="$CC $ac_cv_prog_cc_c89"</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_prog_cc_c89" &gt;&amp;6; } ;;</div><div class='del'>-esac</div><div class='del'>-if test "x$ac_cv_prog_cc_c89" != xno; then :</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-ac_ext=c</div><div class='del'>-ac_cpp='$CPP $CPPFLAGS'</div><div class='del'>-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext &gt;&amp;5'</div><div class='del'>-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS &gt;&amp;5'</div><div class='del'>-ac_compiler_gnu=$ac_cv_c_compiler_gnu</div><div class='del'>-DEPDIR="${am__leading_dot}deps"</div><div class='del'>-</div><div class='del'>-ac_config_commands="$ac_config_commands depfiles"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-am_make=${MAKE-make}</div><div class='del'>-cat &gt; confinc &lt;&lt; 'END'</div><div class='del'>-am__doit:</div><div class='del'>-	@echo this is the am__doit target</div><div class='del'>-.PHONY: am__doit</div><div class='del'>-END</div><div class='del'>-# If we don't find an include directive, just comment out the code.</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for style of include used by $am_make... " &gt;&amp;6; }</div><div class='del'>-am__include="#"</div><div class='del'>-am__quote=</div><div class='del'>-_am_result=none</div><div class='del'>-# First try GNU make style include.</div><div class='del'>-echo "include confinc" &gt; confmf</div><div class='del'>-# Ignore all kinds of additional output from `make'.</div><div class='del'>-case `$am_make -s -f confmf 2&gt; /dev/null` in #(</div><div class='del'>-*the\ am__doit\ target*)</div><div class='del'>-  am__include=include</div><div class='del'>-  am__quote=</div><div class='del'>-  _am_result=GNU</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-# Now try BSD make style include.</div><div class='del'>-if test "$am__include" = "#"; then</div><div class='del'>-   echo '.include "confinc"' &gt; confmf</div><div class='del'>-   case `$am_make -s -f confmf 2&gt; /dev/null` in #(</div><div class='del'>-   *the\ am__doit\ target*)</div><div class='del'>-     am__include=.include</div><div class='del'>-     am__quote="\""</div><div class='del'>-     _am_result=BSD</div><div class='del'>-     ;;</div><div class='del'>-   esac</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" &gt;&amp;5</div><div class='del'>-$as_echo "$_am_result" &gt;&amp;6; }</div><div class='del'>-rm -f confinc confmf</div><div class='del'>-</div><div class='del'>-# Check whether --enable-dependency-tracking was given.</div><div class='del'>-if test "${enable_dependency_tracking+set}" = set; then :</div><div class='del'>-  enableval=$enable_dependency_tracking;</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test "x$enable_dependency_tracking" != xno; then</div><div class='del'>-  am_depcomp="$ac_aux_dir/depcomp"</div><div class='del'>-  AMDEPBACKSLASH='\'</div><div class='del'>-fi</div><div class='del'>- if test "x$enable_dependency_tracking" != xno; then</div><div class='del'>-  AMDEP_TRUE=</div><div class='del'>-  AMDEP_FALSE='#'</div><div class='del'>-else</div><div class='del'>-  AMDEP_TRUE='#'</div><div class='del'>-  AMDEP_FALSE=</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-depcc="$CC"   am_compiler_list=</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking dependency style of $depcc... " &gt;&amp;6; }</div><div class='del'>-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -z "$AMDEP_TRUE" &amp;&amp; test -f "$am_depcomp"; then</div><div class='del'>-  # We make a subdir and do the tests there.  Otherwise we can end up</div><div class='del'>-  # making bogus files that we don't know about and never remove.  For</div><div class='del'>-  # instance it was reported that on HP-UX the gcc test will end up</div><div class='del'>-  # making a dummy file named `D' -- because `-MD' means `put the output</div><div class='del'>-  # in D'.</div><div class='del'>-  mkdir conftest.dir</div><div class='del'>-  # Copy depcomp to subdir because otherwise we won't find it if we're</div><div class='del'>-  # using a relative directory.</div><div class='del'>-  cp "$am_depcomp" conftest.dir</div><div class='del'>-  cd conftest.dir</div><div class='del'>-  # We will build objects and dependencies in a subdirectory because</div><div class='del'>-  # it helps to detect inapplicable dependency modes.  For instance</div><div class='del'>-  # both Tru64's cc and ICC support -MD to output dependencies as a</div><div class='del'>-  # side effect of compilation, but ICC will put the dependencies in</div><div class='del'>-  # the current directory while Tru64 will put them in the object</div><div class='del'>-  # directory.</div><div class='del'>-  mkdir sub</div><div class='del'>-</div><div class='del'>-  am_cv_CC_dependencies_compiler_type=none</div><div class='del'>-  if test "$am_compiler_list" = ""; then</div><div class='del'>-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' &lt; ./depcomp`</div><div class='del'>-  fi</div><div class='del'>-  am__universal=false</div><div class='del'>-  case " $depcc " in #(</div><div class='del'>-     *\ -arch\ *\ -arch\ *) am__universal=true ;;</div><div class='del'>-     esac</div><div class='del'>-</div><div class='del'>-  for depmode in $am_compiler_list; do</div><div class='del'>-    # Setup a source with many dependencies, because some compilers</div><div class='del'>-    # like to wrap large dependency lists on column 80 (with \), and</div><div class='del'>-    # we should not choose a depcomp mode which is confused by this.</div><div class='del'>-    #</div><div class='del'>-    # We need to recreate these files for each test, as the compiler may</div><div class='del'>-    # overwrite some of them when testing with obscure command lines.</div><div class='del'>-    # This happens at least with the AIX C compiler.</div><div class='del'>-    : &gt; sub/conftest.c</div><div class='del'>-    for i in 1 2 3 4 5 6; do</div><div class='del'>-      echo '#include "conftst'$i'.h"' &gt;&gt; sub/conftest.c</div><div class='del'>-      # Using `: &gt; sub/conftst$i.h' creates only sub/conftst1.h with</div><div class='del'>-      # Solaris 8's {/usr,}/bin/sh.</div><div class='del'>-      touch sub/conftst$i.h</div><div class='del'>-    done</div><div class='del'>-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" &gt; confmf</div><div class='del'>-</div><div class='del'>-    # We check with `-c' and `-o' for the sake of the "dashmstdout"</div><div class='del'>-    # mode.  It turns out that the SunPro C++ compiler does not properly</div><div class='del'>-    # handle `-M -o', and we need to detect this.  Also, some Intel</div><div class='del'>-    # versions had trouble with output in subdirs</div><div class='del'>-    am__obj=sub/conftest.${OBJEXT-o}</div><div class='del'>-    am__minus_obj="-o $am__obj"</div><div class='del'>-    case $depmode in</div><div class='del'>-    gcc)</div><div class='del'>-      # This depmode causes a compiler race in universal mode.</div><div class='del'>-      test "$am__universal" = false || continue</div><div class='del'>-      ;;</div><div class='del'>-    nosideeffect)</div><div class='del'>-      # after this tag, mechanisms are not by side-effect, so they'll</div><div class='del'>-      # only be used when explicitly requested</div><div class='del'>-      if test "x$enable_dependency_tracking" = xyes; then</div><div class='del'>-	continue</div><div class='del'>-      else</div><div class='del'>-	break</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-    msvisualcpp | msvcmsys)</div><div class='del'>-      # This compiler won't grok `-c -o', but also, the minuso test has</div><div class='del'>-      # not run yet.  These depmodes are late enough in the game, and</div><div class='del'>-      # so weak that their functioning should not be impacted.</div><div class='del'>-      am__obj=conftest.${OBJEXT-o}</div><div class='del'>-      am__minus_obj=</div><div class='del'>-      ;;</div><div class='del'>-    none) break ;;</div><div class='del'>-    esac</div><div class='del'>-    if depmode=$depmode \</div><div class='del'>-       source=sub/conftest.c object=$am__obj \</div><div class='del'>-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \</div><div class='del'>-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \</div><div class='del'>-         &gt;/dev/null 2&gt;conftest.err &amp;&amp;</div><div class='del'>-       grep sub/conftst1.h sub/conftest.Po &gt; /dev/null 2&gt;&amp;1 &amp;&amp;</div><div class='del'>-       grep sub/conftst6.h sub/conftest.Po &gt; /dev/null 2&gt;&amp;1 &amp;&amp;</div><div class='del'>-       grep $am__obj sub/conftest.Po &gt; /dev/null 2&gt;&amp;1 &amp;&amp;</div><div class='del'>-       ${MAKE-make} -s -f confmf &gt; /dev/null 2&gt;&amp;1; then</div><div class='del'>-      # icc doesn't choke on unknown options, it will just issue warnings</div><div class='del'>-      # or remarks (even with -Werror).  So we grep stderr for any message</div><div class='del'>-      # that says an option was ignored or not supported.</div><div class='del'>-      # When given -MP, icc 7.0 and 7.1 complain thusly:</div><div class='del'>-      #   icc: Command line warning: ignoring option '-M'; no argument required</div><div class='del'>-      # The diagnosis changed in icc 8.0:</div><div class='del'>-      #   icc: Command line remark: option '-MP' not supported</div><div class='del'>-      if (grep 'ignoring option' conftest.err ||</div><div class='del'>-          grep 'not supported' conftest.err) &gt;/dev/null 2&gt;&amp;1; then :; else</div><div class='del'>-        am_cv_CC_dependencies_compiler_type=$depmode</div><div class='del'>-        break</div><div class='del'>-      fi</div><div class='del'>-    fi</div><div class='del'>-  done</div><div class='del'>-</div><div class='del'>-  cd ..</div><div class='del'>-  rm -rf conftest.dir</div><div class='del'>-else</div><div class='del'>-  am_cv_CC_dependencies_compiler_type=none</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" &gt;&amp;5</div><div class='del'>-$as_echo "$am_cv_CC_dependencies_compiler_type" &gt;&amp;6; }</div><div class='del'>-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type</div><div class='del'>-</div><div class='del'>- if</div><div class='del'>-  test "x$enable_dependency_tracking" != xno \</div><div class='del'>-  &amp;&amp; test "$am_cv_CC_dependencies_compiler_type" = gcc3; then</div><div class='del'>-  am__fastdepCC_TRUE=</div><div class='del'>-  am__fastdepCC_FALSE='#'</div><div class='del'>-else</div><div class='del'>-  am__fastdepCC_TRUE='#'</div><div class='del'>-  am__fastdepCC_FALSE=</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Make sure we can run config.sub.</div><div class='del'>-$SHELL "$ac_aux_dir/config.sub" sun4 &gt;/dev/null 2&gt;&amp;1 ||</div><div class='del'>-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking build system type... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_build+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  ac_build_alias=$build_alias</div><div class='del'>-test "x$ac_build_alias" = x &amp;&amp;</div><div class='del'>-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`</div><div class='del'>-test "x$ac_build_alias" = x &amp;&amp;</div><div class='del'>-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5</div><div class='del'>-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||</div><div class='del'>-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_build" &gt;&amp;6; }</div><div class='del'>-case $ac_cv_build in</div><div class='del'>-*-*-*) ;;</div><div class='del'>-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;</div><div class='del'>-esac</div><div class='del'>-build=$ac_cv_build</div><div class='del'>-ac_save_IFS=$IFS; IFS='-'</div><div class='del'>-set x $ac_cv_build</div><div class='del'>-shift</div><div class='del'>-build_cpu=$1</div><div class='del'>-build_vendor=$2</div><div class='del'>-shift; shift</div><div class='del'>-# Remember, the first character of IFS is used to create $*,</div><div class='del'>-# except with old shells:</div><div class='del'>-build_os=$*</div><div class='del'>-IFS=$ac_save_IFS</div><div class='del'>-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking host system type... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_host+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test "x$host_alias" = x; then</div><div class='del'>-  ac_cv_host=$ac_cv_build</div><div class='del'>-else</div><div class='del'>-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||</div><div class='del'>-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_host" &gt;&amp;6; }</div><div class='del'>-case $ac_cv_host in</div><div class='del'>-*-*-*) ;;</div><div class='del'>-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;</div><div class='del'>-esac</div><div class='del'>-host=$ac_cv_host</div><div class='del'>-ac_save_IFS=$IFS; IFS='-'</div><div class='del'>-set x $ac_cv_host</div><div class='del'>-shift</div><div class='del'>-host_cpu=$1</div><div class='del'>-host_vendor=$2</div><div class='del'>-shift; shift</div><div class='del'>-# Remember, the first character of IFS is used to create $*,</div><div class='del'>-# except with old shells:</div><div class='del'>-host_os=$*</div><div class='del'>-IFS=$ac_save_IFS</div><div class='del'>-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for a sed that does not truncate output... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_path_SED+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/</div><div class='del'>-     for ac_i in 1 2 3 4 5 6 7; do</div><div class='del'>-       ac_script="$ac_script$as_nl$ac_script"</div><div class='del'>-     done</div><div class='del'>-     echo "$ac_script" 2&gt;/dev/null | sed 99q &gt;conftest.sed</div><div class='del'>-     { ac_script=; unset ac_script;}</div><div class='del'>-     if test -z "$SED"; then</div><div class='del'>-  ac_path_SED_found=false</div><div class='del'>-  # Loop through the user's path and test for each of PROGNAME-LIST</div><div class='del'>-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_prog in sed gsed; do</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"</div><div class='del'>-      { test -f "$ac_path_SED" &amp;&amp; $as_test_x "$ac_path_SED"; } || continue</div><div class='del'>-# Check for GNU ac_path_SED and select it if it is found.</div><div class='del'>-  # Check for GNU $ac_path_SED</div><div class='del'>-case `"$ac_path_SED" --version 2&gt;&amp;1` in</div><div class='del'>-*GNU*)</div><div class='del'>-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;</div><div class='del'>-*)</div><div class='del'>-  ac_count=0</div><div class='del'>-  $as_echo_n 0123456789 &gt;"conftest.in"</div><div class='del'>-  while :</div><div class='del'>-  do</div><div class='del'>-    cat "conftest.in" "conftest.in" &gt;"conftest.tmp"</div><div class='del'>-    mv "conftest.tmp" "conftest.in"</div><div class='del'>-    cp "conftest.in" "conftest.nl"</div><div class='del'>-    $as_echo '' &gt;&gt; "conftest.nl"</div><div class='del'>-    "$ac_path_SED" -f conftest.sed &lt; "conftest.nl" &gt;"conftest.out" 2&gt;/dev/null || break</div><div class='del'>-    diff "conftest.out" "conftest.nl" &gt;/dev/null 2&gt;&amp;1 || break</div><div class='del'>-    as_fn_arith $ac_count + 1 &amp;&amp; ac_count=$as_val</div><div class='del'>-    if test $ac_count -gt ${ac_path_SED_max-0}; then</div><div class='del'>-      # Best one so far, save it but keep looking for a better one</div><div class='del'>-      ac_cv_path_SED="$ac_path_SED"</div><div class='del'>-      ac_path_SED_max=$ac_count</div><div class='del'>-    fi</div><div class='del'>-    # 10*(2^10) chars as input seems more than enough</div><div class='del'>-    test $ac_count -gt 10 &amp;&amp; break</div><div class='del'>-  done</div><div class='del'>-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-      $ac_path_SED_found &amp;&amp; break 3</div><div class='del'>-    done</div><div class='del'>-  done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-  if test -z "$ac_cv_path_SED"; then</div><div class='del'>-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  ac_cv_path_SED=$SED</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_path_SED" &gt;&amp;6; }</div><div class='del'>- SED="$ac_cv_path_SED"</div><div class='del'>-  rm -f conftest.sed</div><div class='del'>-</div><div class='del'>-test -z "$SED" &amp;&amp; SED=sed</div><div class='del'>-Xsed="$SED -e 1s/^X//"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for grep that handles long lines and -e... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_path_GREP+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -z "$GREP"; then</div><div class='del'>-  ac_path_GREP_found=false</div><div class='del'>-  # Loop through the user's path and test for each of PROGNAME-LIST</div><div class='del'>-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_prog in grep ggrep; do</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"</div><div class='del'>-      { test -f "$ac_path_GREP" &amp;&amp; $as_test_x "$ac_path_GREP"; } || continue</div><div class='del'>-# Check for GNU ac_path_GREP and select it if it is found.</div><div class='del'>-  # Check for GNU $ac_path_GREP</div><div class='del'>-case `"$ac_path_GREP" --version 2&gt;&amp;1` in</div><div class='del'>-*GNU*)</div><div class='del'>-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;</div><div class='del'>-*)</div><div class='del'>-  ac_count=0</div><div class='del'>-  $as_echo_n 0123456789 &gt;"conftest.in"</div><div class='del'>-  while :</div><div class='del'>-  do</div><div class='del'>-    cat "conftest.in" "conftest.in" &gt;"conftest.tmp"</div><div class='del'>-    mv "conftest.tmp" "conftest.in"</div><div class='del'>-    cp "conftest.in" "conftest.nl"</div><div class='del'>-    $as_echo 'GREP' &gt;&gt; "conftest.nl"</div><div class='del'>-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' &lt; "conftest.nl" &gt;"conftest.out" 2&gt;/dev/null || break</div><div class='del'>-    diff "conftest.out" "conftest.nl" &gt;/dev/null 2&gt;&amp;1 || break</div><div class='del'>-    as_fn_arith $ac_count + 1 &amp;&amp; ac_count=$as_val</div><div class='del'>-    if test $ac_count -gt ${ac_path_GREP_max-0}; then</div><div class='del'>-      # Best one so far, save it but keep looking for a better one</div><div class='del'>-      ac_cv_path_GREP="$ac_path_GREP"</div><div class='del'>-      ac_path_GREP_max=$ac_count</div><div class='del'>-    fi</div><div class='del'>-    # 10*(2^10) chars as input seems more than enough</div><div class='del'>-    test $ac_count -gt 10 &amp;&amp; break</div><div class='del'>-  done</div><div class='del'>-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-      $ac_path_GREP_found &amp;&amp; break 3</div><div class='del'>-    done</div><div class='del'>-  done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-  if test -z "$ac_cv_path_GREP"; then</div><div class='del'>-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  ac_cv_path_GREP=$GREP</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_path_GREP" &gt;&amp;6; }</div><div class='del'>- GREP="$ac_cv_path_GREP"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for egrep... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_path_EGREP+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if echo a | $GREP -E '(a|b)' &gt;/dev/null 2&gt;&amp;1</div><div class='del'>-   then ac_cv_path_EGREP="$GREP -E"</div><div class='del'>-   else</div><div class='del'>-     if test -z "$EGREP"; then</div><div class='del'>-  ac_path_EGREP_found=false</div><div class='del'>-  # Loop through the user's path and test for each of PROGNAME-LIST</div><div class='del'>-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_prog in egrep; do</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"</div><div class='del'>-      { test -f "$ac_path_EGREP" &amp;&amp; $as_test_x "$ac_path_EGREP"; } || continue</div><div class='del'>-# Check for GNU ac_path_EGREP and select it if it is found.</div><div class='del'>-  # Check for GNU $ac_path_EGREP</div><div class='del'>-case `"$ac_path_EGREP" --version 2&gt;&amp;1` in</div><div class='del'>-*GNU*)</div><div class='del'>-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;</div><div class='del'>-*)</div><div class='del'>-  ac_count=0</div><div class='del'>-  $as_echo_n 0123456789 &gt;"conftest.in"</div><div class='del'>-  while :</div><div class='del'>-  do</div><div class='del'>-    cat "conftest.in" "conftest.in" &gt;"conftest.tmp"</div><div class='del'>-    mv "conftest.tmp" "conftest.in"</div><div class='del'>-    cp "conftest.in" "conftest.nl"</div><div class='del'>-    $as_echo 'EGREP' &gt;&gt; "conftest.nl"</div><div class='del'>-    "$ac_path_EGREP" 'EGREP$' &lt; "conftest.nl" &gt;"conftest.out" 2&gt;/dev/null || break</div><div class='del'>-    diff "conftest.out" "conftest.nl" &gt;/dev/null 2&gt;&amp;1 || break</div><div class='del'>-    as_fn_arith $ac_count + 1 &amp;&amp; ac_count=$as_val</div><div class='del'>-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then</div><div class='del'>-      # Best one so far, save it but keep looking for a better one</div><div class='del'>-      ac_cv_path_EGREP="$ac_path_EGREP"</div><div class='del'>-      ac_path_EGREP_max=$ac_count</div><div class='del'>-    fi</div><div class='del'>-    # 10*(2^10) chars as input seems more than enough</div><div class='del'>-    test $ac_count -gt 10 &amp;&amp; break</div><div class='del'>-  done</div><div class='del'>-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-      $ac_path_EGREP_found &amp;&amp; break 3</div><div class='del'>-    done</div><div class='del'>-  done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-  if test -z "$ac_cv_path_EGREP"; then</div><div class='del'>-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  ac_cv_path_EGREP=$EGREP</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-   fi</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_path_EGREP" &gt;&amp;6; }</div><div class='del'>- EGREP="$ac_cv_path_EGREP"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for fgrep... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_path_FGREP+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if echo 'ab*c' | $GREP -F 'ab*c' &gt;/dev/null 2&gt;&amp;1</div><div class='del'>-   then ac_cv_path_FGREP="$GREP -F"</div><div class='del'>-   else</div><div class='del'>-     if test -z "$FGREP"; then</div><div class='del'>-  ac_path_FGREP_found=false</div><div class='del'>-  # Loop through the user's path and test for each of PROGNAME-LIST</div><div class='del'>-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_prog in fgrep; do</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"</div><div class='del'>-      { test -f "$ac_path_FGREP" &amp;&amp; $as_test_x "$ac_path_FGREP"; } || continue</div><div class='del'>-# Check for GNU ac_path_FGREP and select it if it is found.</div><div class='del'>-  # Check for GNU $ac_path_FGREP</div><div class='del'>-case `"$ac_path_FGREP" --version 2&gt;&amp;1` in</div><div class='del'>-*GNU*)</div><div class='del'>-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;</div><div class='del'>-*)</div><div class='del'>-  ac_count=0</div><div class='del'>-  $as_echo_n 0123456789 &gt;"conftest.in"</div><div class='del'>-  while :</div><div class='del'>-  do</div><div class='del'>-    cat "conftest.in" "conftest.in" &gt;"conftest.tmp"</div><div class='del'>-    mv "conftest.tmp" "conftest.in"</div><div class='del'>-    cp "conftest.in" "conftest.nl"</div><div class='del'>-    $as_echo 'FGREP' &gt;&gt; "conftest.nl"</div><div class='del'>-    "$ac_path_FGREP" FGREP &lt; "conftest.nl" &gt;"conftest.out" 2&gt;/dev/null || break</div><div class='del'>-    diff "conftest.out" "conftest.nl" &gt;/dev/null 2&gt;&amp;1 || break</div><div class='del'>-    as_fn_arith $ac_count + 1 &amp;&amp; ac_count=$as_val</div><div class='del'>-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then</div><div class='del'>-      # Best one so far, save it but keep looking for a better one</div><div class='del'>-      ac_cv_path_FGREP="$ac_path_FGREP"</div><div class='del'>-      ac_path_FGREP_max=$ac_count</div><div class='del'>-    fi</div><div class='del'>-    # 10*(2^10) chars as input seems more than enough</div><div class='del'>-    test $ac_count -gt 10 &amp;&amp; break</div><div class='del'>-  done</div><div class='del'>-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-      $ac_path_FGREP_found &amp;&amp; break 3</div><div class='del'>-    done</div><div class='del'>-  done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-  if test -z "$ac_cv_path_FGREP"; then</div><div class='del'>-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  ac_cv_path_FGREP=$FGREP</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-   fi</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_path_FGREP" &gt;&amp;6; }</div><div class='del'>- FGREP="$ac_cv_path_FGREP"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-test -z "$GREP" &amp;&amp; GREP=grep</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Check whether --with-gnu-ld was given.</div><div class='del'>-if test "${with_gnu_ld+set}" = set; then :</div><div class='del'>-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes</div><div class='del'>-else</div><div class='del'>-  with_gnu_ld=no</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-ac_prog=ld</div><div class='del'>-if test "$GCC" = yes; then</div><div class='del'>-  # Check if gcc -print-prog-name=ld gives a path.</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for ld used by $CC... " &gt;&amp;6; }</div><div class='del'>-  case $host in</div><div class='del'>-  *-*-mingw*)</div><div class='del'>-    # gcc leaves a trailing carriage return which upsets mingw</div><div class='del'>-    ac_prog=`($CC -print-prog-name=ld) 2&gt;&amp;5 | tr -d '\015'` ;;</div><div class='del'>-  *)</div><div class='del'>-    ac_prog=`($CC -print-prog-name=ld) 2&gt;&amp;5` ;;</div><div class='del'>-  esac</div><div class='del'>-  case $ac_prog in</div><div class='del'>-    # Accept absolute paths.</div><div class='del'>-    [\\/]* | ?:[\\/]*)</div><div class='del'>-      re_direlt='/[^/][^/]*/\.\./'</div><div class='del'>-      # Canonicalize the pathname of ld</div><div class='del'>-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`</div><div class='del'>-      while $ECHO "$ac_prog" | $GREP "$re_direlt" &gt; /dev/null 2&gt;&amp;1; do</div><div class='del'>-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`</div><div class='del'>-      done</div><div class='del'>-      test -z "$LD" &amp;&amp; LD="$ac_prog"</div><div class='del'>-      ;;</div><div class='del'>-  "")</div><div class='del'>-    # If it fails, then pretend we aren't using GCC.</div><div class='del'>-    ac_prog=ld</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    # If it is relative, then search for the first ld in PATH.</div><div class='del'>-    with_gnu_ld=unknown</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-elif test "$with_gnu_ld" = yes; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for GNU ld... " &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for non-GNU ld... " &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-if test "${lt_cv_path_LD+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -z "$LD"; then</div><div class='del'>-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR</div><div class='del'>-  for ac_dir in $PATH; do</div><div class='del'>-    IFS="$lt_save_ifs"</div><div class='del'>-    test -z "$ac_dir" &amp;&amp; ac_dir=.</div><div class='del'>-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then</div><div class='del'>-      lt_cv_path_LD="$ac_dir/$ac_prog"</div><div class='del'>-      # Check to see if the program is GNU ld.  I'd rather use --version,</div><div class='del'>-      # but apparently some variants of GNU ld only accept -v.</div><div class='del'>-      # Break only if it was the GNU/non-GNU ld that we prefer.</div><div class='del'>-      case `"$lt_cv_path_LD" -v 2&gt;&amp;1 &lt;/dev/null` in</div><div class='del'>-      *GNU* | *'with BFD'*)</div><div class='del'>-	test "$with_gnu_ld" != no &amp;&amp; break</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-	test "$with_gnu_ld" != yes &amp;&amp; break</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-    fi</div><div class='del'>-  done</div><div class='del'>-  IFS="$lt_save_ifs"</div><div class='del'>-else</div><div class='del'>-  lt_cv_path_LD="$LD" # Let the user override the test with a path.</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-LD="$lt_cv_path_LD"</div><div class='del'>-if test -n "$LD"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" &gt;&amp;5</div><div class='del'>-$as_echo "$LD" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-test -z "$LD" &amp;&amp; as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking if the linker ($LD) is GNU ld... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_prog_gnu_ld+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  # I'd rather use --version here, but apparently some GNU lds only accept -v.</div><div class='del'>-case `$LD -v 2&gt;&amp;1 &lt;/dev/null` in</div><div class='del'>-*GNU* | *'with BFD'*)</div><div class='del'>-  lt_cv_prog_gnu_ld=yes</div><div class='del'>-  ;;</div><div class='del'>-*)</div><div class='del'>-  lt_cv_prog_gnu_ld=no</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_prog_gnu_ld" &gt;&amp;6; }</div><div class='del'>-with_gnu_ld=$lt_cv_prog_gnu_ld</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ac_ext=c</div><div class='del'>-ac_cpp='$CPP $CPPFLAGS'</div><div class='del'>-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext &gt;&amp;5'</div><div class='del'>-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS &gt;&amp;5'</div><div class='del'>-ac_compiler_gnu=$ac_cv_c_compiler_gnu</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking how to run the C preprocessor... " &gt;&amp;6; }</div><div class='del'>-# On Suns, sometimes $CPP names a directory.</div><div class='del'>-if test -n "$CPP" &amp;&amp; test -d "$CPP"; then</div><div class='del'>-  CPP=</div><div class='del'>-fi</div><div class='del'>-if test -z "$CPP"; then</div><div class='del'>-  if test "${ac_cv_prog_CPP+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-      # Double quotes because CPP needs to be expanded</div><div class='del'>-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"</div><div class='del'>-    do</div><div class='del'>-      ac_preproc_ok=false</div><div class='del'>-for ac_c_preproc_warn_flag in '' yes</div><div class='del'>-do</div><div class='del'>-  # Use a header file that comes with gcc, so configuring glibc</div><div class='del'>-  # with a fresh cross-compiler works.</div><div class='del'>-  # Prefer &lt;limits.h&gt; to &lt;assert.h&gt; if __STDC__ is defined, since</div><div class='del'>-  # &lt;limits.h&gt; exists even on freestanding compilers.</div><div class='del'>-  # On the NeXT, cc -E runs the code through the compiler's parser,</div><div class='del'>-  # not just through cpp. "Syntax error" is here to catch this case.</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-#ifdef __STDC__</div><div class='del'>-# include &lt;limits.h&gt;</div><div class='del'>-#else</div><div class='del'>-# include &lt;assert.h&gt;</div><div class='del'>-#endif</div><div class='del'>-		     Syntax error</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_cpp "$LINENO"; then :</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  # Broken: fails on valid input.</div><div class='del'>-continue</div><div class='del'>-fi</div><div class='del'>-rm -f conftest.err conftest.$ac_ext</div><div class='del'>-</div><div class='del'>-  # OK, works on sane cases.  Now check whether nonexistent headers</div><div class='del'>-  # can be detected and how.</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-#include &lt;ac_nonexistent.h&gt;</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_cpp "$LINENO"; then :</div><div class='del'>-  # Broken: success on invalid input.</div><div class='del'>-continue</div><div class='del'>-else</div><div class='del'>-  # Passes both tests.</div><div class='del'>-ac_preproc_ok=:</div><div class='del'>-break</div><div class='del'>-fi</div><div class='del'>-rm -f conftest.err conftest.$ac_ext</div><div class='del'>-</div><div class='del'>-done</div><div class='del'>-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.</div><div class='del'>-rm -f conftest.err conftest.$ac_ext</div><div class='del'>-if $ac_preproc_ok; then :</div><div class='del'>-  break</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-    done</div><div class='del'>-    ac_cv_prog_CPP=$CPP</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-  CPP=$ac_cv_prog_CPP</div><div class='del'>-else</div><div class='del'>-  ac_cv_prog_CPP=$CPP</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" &gt;&amp;5</div><div class='del'>-$as_echo "$CPP" &gt;&amp;6; }</div><div class='del'>-ac_preproc_ok=false</div><div class='del'>-for ac_c_preproc_warn_flag in '' yes</div><div class='del'>-do</div><div class='del'>-  # Use a header file that comes with gcc, so configuring glibc</div><div class='del'>-  # with a fresh cross-compiler works.</div><div class='del'>-  # Prefer &lt;limits.h&gt; to &lt;assert.h&gt; if __STDC__ is defined, since</div><div class='del'>-  # &lt;limits.h&gt; exists even on freestanding compilers.</div><div class='del'>-  # On the NeXT, cc -E runs the code through the compiler's parser,</div><div class='del'>-  # not just through cpp. "Syntax error" is here to catch this case.</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-#ifdef __STDC__</div><div class='del'>-# include &lt;limits.h&gt;</div><div class='del'>-#else</div><div class='del'>-# include &lt;assert.h&gt;</div><div class='del'>-#endif</div><div class='del'>-		     Syntax error</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_cpp "$LINENO"; then :</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  # Broken: fails on valid input.</div><div class='del'>-continue</div><div class='del'>-fi</div><div class='del'>-rm -f conftest.err conftest.$ac_ext</div><div class='del'>-</div><div class='del'>-  # OK, works on sane cases.  Now check whether nonexistent headers</div><div class='del'>-  # can be detected and how.</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-#include &lt;ac_nonexistent.h&gt;</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_cpp "$LINENO"; then :</div><div class='del'>-  # Broken: success on invalid input.</div><div class='del'>-continue</div><div class='del'>-else</div><div class='del'>-  # Passes both tests.</div><div class='del'>-ac_preproc_ok=:</div><div class='del'>-break</div><div class='del'>-fi</div><div class='del'>-rm -f conftest.err conftest.$ac_ext</div><div class='del'>-</div><div class='del'>-done</div><div class='del'>-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.</div><div class='del'>-rm -f conftest.err conftest.$ac_ext</div><div class='del'>-if $ac_preproc_ok; then :</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: error: in \`$ac_pwd':" &gt;&amp;2;}</div><div class='del'>-as_fn_error "C preprocessor \"$CPP\" fails sanity check</div><div class='del'>-See \`config.log' for more details." "$LINENO" 5; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-ac_ext=c</div><div class='del'>-ac_cpp='$CPP $CPPFLAGS'</div><div class='del'>-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext &gt;&amp;5'</div><div class='del'>-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS &gt;&amp;5'</div><div class='del'>-ac_compiler_gnu=$ac_cv_c_compiler_gnu</div><div class='del'>-</div><div class='del'>-if test -n "$ac_tool_prefix"; then</div><div class='del'>-  # Extract the first word of "${ac_tool_prefix}sed", so it can be a program name with args.</div><div class='del'>-set dummy ${ac_tool_prefix}sed; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_SED+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$SED"; then</div><div class='del'>-  ac_cv_prog_SED="$SED" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_SED="${ac_tool_prefix}sed"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-SED=$ac_cv_prog_SED</div><div class='del'>-if test -n "$SED"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" &gt;&amp;5</div><div class='del'>-$as_echo "$SED" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-if test -z "$ac_cv_prog_SED"; then</div><div class='del'>-  ac_ct_SED=$SED</div><div class='del'>-  # Extract the first word of "sed", so it can be a program name with args.</div><div class='del'>-set dummy sed; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_SED+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_SED"; then</div><div class='del'>-  ac_cv_prog_ac_ct_SED="$ac_ct_SED" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_SED="sed"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_SED=$ac_cv_prog_ac_ct_SED</div><div class='del'>-if test -n "$ac_ct_SED"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_SED" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_SED" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_SED" = x; then</div><div class='del'>-    SED=":"</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    SED=$ac_ct_SED</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  SED="$ac_cv_prog_SED"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-enable_win32_dll=yes</div><div class='del'>-</div><div class='del'>-case $host in</div><div class='del'>-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)</div><div class='del'>-  if test -n "$ac_tool_prefix"; then</div><div class='del'>-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.</div><div class='del'>-set dummy ${ac_tool_prefix}as; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_AS+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$AS"; then</div><div class='del'>-  ac_cv_prog_AS="$AS" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_AS="${ac_tool_prefix}as"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-AS=$ac_cv_prog_AS</div><div class='del'>-if test -n "$AS"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" &gt;&amp;5</div><div class='del'>-$as_echo "$AS" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-if test -z "$ac_cv_prog_AS"; then</div><div class='del'>-  ac_ct_AS=$AS</div><div class='del'>-  # Extract the first word of "as", so it can be a program name with args.</div><div class='del'>-set dummy as; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_AS"; then</div><div class='del'>-  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_AS="as"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_AS=$ac_cv_prog_ac_ct_AS</div><div class='del'>-if test -n "$ac_ct_AS"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_AS" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_AS" = x; then</div><div class='del'>-    AS="false"</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    AS=$ac_ct_AS</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  AS="$ac_cv_prog_AS"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test -n "$ac_tool_prefix"; then</div><div class='del'>-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.</div><div class='del'>-set dummy ${ac_tool_prefix}dlltool; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_DLLTOOL+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$DLLTOOL"; then</div><div class='del'>-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-DLLTOOL=$ac_cv_prog_DLLTOOL</div><div class='del'>-if test -n "$DLLTOOL"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" &gt;&amp;5</div><div class='del'>-$as_echo "$DLLTOOL" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-if test -z "$ac_cv_prog_DLLTOOL"; then</div><div class='del'>-  ac_ct_DLLTOOL=$DLLTOOL</div><div class='del'>-  # Extract the first word of "dlltool", so it can be a program name with args.</div><div class='del'>-set dummy dlltool; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_DLLTOOL"; then</div><div class='del'>-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL</div><div class='del'>-if test -n "$ac_ct_DLLTOOL"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_DLLTOOL" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_DLLTOOL" = x; then</div><div class='del'>-    DLLTOOL="false"</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    DLLTOOL=$ac_ct_DLLTOOL</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  DLLTOOL="$ac_cv_prog_DLLTOOL"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test -n "$ac_tool_prefix"; then</div><div class='del'>-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.</div><div class='del'>-set dummy ${ac_tool_prefix}objdump; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$OBJDUMP"; then</div><div class='del'>-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-OBJDUMP=$ac_cv_prog_OBJDUMP</div><div class='del'>-if test -n "$OBJDUMP"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" &gt;&amp;5</div><div class='del'>-$as_echo "$OBJDUMP" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-if test -z "$ac_cv_prog_OBJDUMP"; then</div><div class='del'>-  ac_ct_OBJDUMP=$OBJDUMP</div><div class='del'>-  # Extract the first word of "objdump", so it can be a program name with args.</div><div class='del'>-set dummy objdump; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_OBJDUMP"; then</div><div class='del'>-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_OBJDUMP="objdump"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP</div><div class='del'>-if test -n "$ac_ct_OBJDUMP"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_OBJDUMP" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_OBJDUMP" = x; then</div><div class='del'>-    OBJDUMP="false"</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    OBJDUMP=$ac_ct_OBJDUMP</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  OBJDUMP="$ac_cv_prog_OBJDUMP"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-test -z "$AS" &amp;&amp; AS=as</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-test -z "$DLLTOOL" &amp;&amp; DLLTOOL=dlltool</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-test -z "$OBJDUMP" &amp;&amp; OBJDUMP=objdump</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether ln -s works... " &gt;&amp;6; }</div><div class='del'>-LN_S=$as_ln_s</div><div class='del'>-if test "$LN_S" = "ln -s"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" &gt;&amp;5</div><div class='del'>-$as_echo "yes" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" &gt;&amp;5</div><div class='del'>-$as_echo "no, using $LN_S" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " &gt;&amp;6; }</div><div class='del'>-set x ${MAKE-make}</div><div class='del'>-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`</div><div class='del'>-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  cat &gt;conftest.make &lt;&lt;\_ACEOF</div><div class='del'>-SHELL = /bin/sh</div><div class='del'>-all:</div><div class='del'>-	@echo '@@@%%%=$(MAKE)=@@@%%%'</div><div class='del'>-_ACEOF</div><div class='del'>-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.</div><div class='del'>-case `${MAKE-make} -f conftest.make 2&gt;/dev/null` in</div><div class='del'>-  *@@@%%%=?*=@@@%%%*)</div><div class='del'>-    eval ac_cv_prog_make_${ac_make}_set=yes;;</div><div class='del'>-  *)</div><div class='del'>-    eval ac_cv_prog_make_${ac_make}_set=no;;</div><div class='del'>-esac</div><div class='del'>-rm -f conftest.make</div><div class='del'>-fi</div><div class='del'>-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" &gt;&amp;5</div><div class='del'>-$as_echo "yes" &gt;&amp;6; }</div><div class='del'>-  SET_MAKE=</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-  SET_MAKE="MAKE=${MAKE-make}"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-case `pwd` in</div><div class='del'>-  *\ * | *\	*)</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" &gt;&amp;2;} ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-macro_version='2.2.6b'</div><div class='del'>-macro_revision='1.3017'</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ltmain="$ac_aux_dir/ltmain.sh"</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_path_NM+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$NM"; then</div><div class='del'>-  # Let the user override the test.</div><div class='del'>-  lt_cv_path_NM="$NM"</div><div class='del'>-else</div><div class='del'>-  lt_nm_to_check="${ac_tool_prefix}nm"</div><div class='del'>-  if test -n "$ac_tool_prefix" &amp;&amp; test "$build" = "$host"; then</div><div class='del'>-    lt_nm_to_check="$lt_nm_to_check nm"</div><div class='del'>-  fi</div><div class='del'>-  for lt_tmp_nm in $lt_nm_to_check; do</div><div class='del'>-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR</div><div class='del'>-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do</div><div class='del'>-      IFS="$lt_save_ifs"</div><div class='del'>-      test -z "$ac_dir" &amp;&amp; ac_dir=.</div><div class='del'>-      tmp_nm="$ac_dir/$lt_tmp_nm"</div><div class='del'>-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then</div><div class='del'>-	# Check to see if the nm accepts a BSD-compat flag.</div><div class='del'>-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:</div><div class='del'>-	#   nm: unknown option "B" ignored</div><div class='del'>-	# Tru64's nm complains that /dev/null is an invalid object file</div><div class='del'>-	case `"$tmp_nm" -B /dev/null 2&gt;&amp;1 | sed '1q'` in</div><div class='del'>-	*/dev/null* | *'Invalid file or object type'*)</div><div class='del'>-	  lt_cv_path_NM="$tmp_nm -B"</div><div class='del'>-	  break</div><div class='del'>-	  ;;</div><div class='del'>-	*)</div><div class='del'>-	  case `"$tmp_nm" -p /dev/null 2&gt;&amp;1 | sed '1q'` in</div><div class='del'>-	  */dev/null*)</div><div class='del'>-	    lt_cv_path_NM="$tmp_nm -p"</div><div class='del'>-	    break</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but</div><div class='del'>-	    continue # so that we can try to find one that supports BSD flags</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-    done</div><div class='del'>-    IFS="$lt_save_ifs"</div><div class='del'>-  done</div><div class='del'>-  : ${lt_cv_path_NM=no}</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_path_NM" &gt;&amp;6; }</div><div class='del'>-if test "$lt_cv_path_NM" != "no"; then</div><div class='del'>-  NM="$lt_cv_path_NM"</div><div class='del'>-else</div><div class='del'>-  # Didn't find any BSD compatible name lister, look for dumpbin.</div><div class='del'>-  if test -n "$ac_tool_prefix"; then</div><div class='del'>-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"</div><div class='del'>-  do</div><div class='del'>-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.</div><div class='del'>-set dummy $ac_tool_prefix$ac_prog; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$DUMPBIN"; then</div><div class='del'>-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-DUMPBIN=$ac_cv_prog_DUMPBIN</div><div class='del'>-if test -n "$DUMPBIN"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" &gt;&amp;5</div><div class='del'>-$as_echo "$DUMPBIN" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    test -n "$DUMPBIN" &amp;&amp; break</div><div class='del'>-  done</div><div class='del'>-fi</div><div class='del'>-if test -z "$DUMPBIN"; then</div><div class='del'>-  ac_ct_DUMPBIN=$DUMPBIN</div><div class='del'>-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"</div><div class='del'>-do</div><div class='del'>-  # Extract the first word of "$ac_prog", so it can be a program name with args.</div><div class='del'>-set dummy $ac_prog; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_DUMPBIN"; then</div><div class='del'>-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN</div><div class='del'>-if test -n "$ac_ct_DUMPBIN"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_DUMPBIN" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  test -n "$ac_ct_DUMPBIN" &amp;&amp; break</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_DUMPBIN" = x; then</div><div class='del'>-    DUMPBIN=":"</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    DUMPBIN=$ac_ct_DUMPBIN</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  if test "$DUMPBIN" != ":"; then</div><div class='del'>-    NM="$DUMPBIN"</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-test -z "$NM" &amp;&amp; NM=nm</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking the name lister ($NM) interface... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_nm_interface+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  lt_cv_nm_interface="BSD nm"</div><div class='del'>-  echo "int some_variable = 0;" &gt; conftest.$ac_ext</div><div class='del'>-  (eval echo "\"\$as_me:5153: $ac_compile\"" &gt;&amp;5)</div><div class='del'>-  (eval "$ac_compile" 2&gt;conftest.err)</div><div class='del'>-  cat conftest.err &gt;&amp;5</div><div class='del'>-  (eval echo "\"\$as_me:5156: $NM \\\"conftest.$ac_objext\\\"\"" &gt;&amp;5)</div><div class='del'>-  (eval "$NM \"conftest.$ac_objext\"" 2&gt;conftest.err &gt; conftest.out)</div><div class='del'>-  cat conftest.err &gt;&amp;5</div><div class='del'>-  (eval echo "\"\$as_me:5159: output\"" &gt;&amp;5)</div><div class='del'>-  cat conftest.out &gt;&amp;5</div><div class='del'>-  if $GREP 'External.*some_variable' conftest.out &gt; /dev/null; then</div><div class='del'>-    lt_cv_nm_interface="MS dumpbin"</div><div class='del'>-  fi</div><div class='del'>-  rm -f conftest*</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_nm_interface" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-# find the maximum length of command line arguments</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking the maximum length of command line arguments... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-    i=0</div><div class='del'>-  teststring="ABCD"</div><div class='del'>-</div><div class='del'>-  case $build_os in</div><div class='del'>-  msdosdjgpp*)</div><div class='del'>-    # On DJGPP, this test can blow up pretty badly due to problems in libc</div><div class='del'>-    # (any single argument exceeding 2000 bytes causes a buffer overrun</div><div class='del'>-    # during glob expansion).  Even if it were fixed, the result of this</div><div class='del'>-    # check would be larger than it should be.</div><div class='del'>-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  gnu*)</div><div class='del'>-    # Under GNU Hurd, this test is not required because there is</div><div class='del'>-    # no limit to the length of command line arguments.</div><div class='del'>-    # Libtool will interpret -1 as no limit whatsoever</div><div class='del'>-    lt_cv_sys_max_cmd_len=-1;</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  cygwin* | mingw* | cegcc*)</div><div class='del'>-    # On Win9x/ME, this test blows up -- it succeeds, but takes</div><div class='del'>-    # about 5 minutes as the teststring grows exponentially.</div><div class='del'>-    # Worse, since 9x/ME are not pre-emptively multitasking,</div><div class='del'>-    # you end up with a "frozen" computer, even though with patience</div><div class='del'>-    # the test eventually succeeds (with a max line length of 256k).</div><div class='del'>-    # Instead, let's just punt: use the minimum linelength reported by</div><div class='del'>-    # all of the supported platforms: 8192 (on NT/2K/XP).</div><div class='del'>-    lt_cv_sys_max_cmd_len=8192;</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  amigaos*)</div><div class='del'>-    # On AmigaOS with pdksh, this test takes hours, literally.</div><div class='del'>-    # So we just punt and use a minimum line length of 8192.</div><div class='del'>-    lt_cv_sys_max_cmd_len=8192;</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)</div><div class='del'>-    # This has been around since 386BSD, at least.  Likely further.</div><div class='del'>-    if test -x /sbin/sysctl; then</div><div class='del'>-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`</div><div class='del'>-    elif test -x /usr/sbin/sysctl; then</div><div class='del'>-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`</div><div class='del'>-    else</div><div class='del'>-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs</div><div class='del'>-    fi</div><div class='del'>-    # And add a safety zone</div><div class='del'>-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`</div><div class='del'>-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  interix*)</div><div class='del'>-    # We know the value 262144 and hardcode it with a safety zone (like BSD)</div><div class='del'>-    lt_cv_sys_max_cmd_len=196608</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  osf*)</div><div class='del'>-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure</div><div class='del'>-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not</div><div class='del'>-    # nice to cause kernel panics so lets avoid the loop below.</div><div class='del'>-    # First set a reasonable default.</div><div class='del'>-    lt_cv_sys_max_cmd_len=16384</div><div class='del'>-    #</div><div class='del'>-    if test -x /sbin/sysconfig; then</div><div class='del'>-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in</div><div class='del'>-        *1*) lt_cv_sys_max_cmd_len=-1 ;;</div><div class='del'>-      esac</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  sco3.2v5*)</div><div class='del'>-    lt_cv_sys_max_cmd_len=102400</div><div class='del'>-    ;;</div><div class='del'>-  sysv5* | sco5v6* | sysv4.2uw2*)</div><div class='del'>-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2&gt;/dev/null`</div><div class='del'>-    if test -n "$kargmax"; then</div><div class='del'>-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`</div><div class='del'>-    else</div><div class='del'>-      lt_cv_sys_max_cmd_len=32768</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2&gt; /dev/null`</div><div class='del'>-    if test -n "$lt_cv_sys_max_cmd_len"; then</div><div class='del'>-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`</div><div class='del'>-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`</div><div class='del'>-    else</div><div class='del'>-      # Make teststring a little bigger before we do anything with it.</div><div class='del'>-      # a 1K string should be a reasonable start.</div><div class='del'>-      for i in 1 2 3 4 5 6 7 8 ; do</div><div class='del'>-        teststring=$teststring$teststring</div><div class='del'>-      done</div><div class='del'>-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}</div><div class='del'>-      # If test is not a shell built-in, we'll probably end up computing a</div><div class='del'>-      # maximum length that is only half of the actual maximum length, but</div><div class='del'>-      # we can't tell.</div><div class='del'>-      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2&gt;/dev/null` \</div><div class='del'>-	         = "XX$teststring$teststring"; } &gt;/dev/null 2&gt;&amp;1 &amp;&amp;</div><div class='del'>-	      test $i != 17 # 1/2 MB should be enough</div><div class='del'>-      do</div><div class='del'>-        i=`expr $i + 1`</div><div class='del'>-        teststring=$teststring$teststring</div><div class='del'>-      done</div><div class='del'>-      # Only check the string length outside the loop.</div><div class='del'>-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2&gt;&amp;1`</div><div class='del'>-      teststring=</div><div class='del'>-      # Add a significant safety factor because C++ compilers can tack on</div><div class='del'>-      # massive amounts of additional arguments before passing them to the</div><div class='del'>-      # linker.  It appears as though 1/2 is a usable value.</div><div class='del'>-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test -n $lt_cv_sys_max_cmd_len ; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_sys_max_cmd_len" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" &gt;&amp;5</div><div class='del'>-$as_echo "none" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-max_cmd_len=$lt_cv_sys_max_cmd_len</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-: ${CP="cp -f"}</div><div class='del'>-: ${MV="mv -f"}</div><div class='del'>-: ${RM="rm -f"}</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether the shell understands some XSI constructs... " &gt;&amp;6; }</div><div class='del'>-# Try some XSI features</div><div class='del'>-xsi_shell=no</div><div class='del'>-( _lt_dummy="a/b/c"</div><div class='del'>-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \</div><div class='del'>-      = c,a/b,, \</div><div class='del'>-    &amp;&amp; eval 'test $(( 1 + 1 )) -eq 2 \</div><div class='del'>-    &amp;&amp; test "${#_lt_dummy}" -eq 5' ) &gt;/dev/null 2&gt;&amp;1 \</div><div class='del'>-  &amp;&amp; xsi_shell=yes</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" &gt;&amp;5</div><div class='del'>-$as_echo "$xsi_shell" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether the shell understands \"+=\"... " &gt;&amp;6; }</div><div class='del'>-lt_shell_append=no</div><div class='del'>-( foo=bar; set foo baz; eval "$1+=\$2" &amp;&amp; test "$foo" = barbaz ) \</div><div class='del'>-    &gt;/dev/null 2&gt;&amp;1 \</div><div class='del'>-  &amp;&amp; lt_shell_append=yes</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_shell_append" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-if ( (MAIL=60; unset MAIL) || exit) &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-  lt_unset=unset</div><div class='del'>-else</div><div class='del'>-  lt_unset=false</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# test EBCDIC or ASCII</div><div class='del'>-case `echo X|tr X '\101'` in</div><div class='del'>- A) # ASCII based system</div><div class='del'>-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr</div><div class='del'>-  lt_SP2NL='tr \040 \012'</div><div class='del'>-  lt_NL2SP='tr \015\012 \040\040'</div><div class='del'>-  ;;</div><div class='del'>- *) # EBCDIC based system</div><div class='del'>-  lt_SP2NL='tr \100 \n'</div><div class='del'>-  lt_NL2SP='tr \r\n \100\100'</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $LD option to reload object files... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_ld_reload_flag+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  lt_cv_ld_reload_flag='-r'</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_ld_reload_flag" &gt;&amp;6; }</div><div class='del'>-reload_flag=$lt_cv_ld_reload_flag</div><div class='del'>-case $reload_flag in</div><div class='del'>-"" | " "*) ;;</div><div class='del'>-*) reload_flag=" $reload_flag" ;;</div><div class='del'>-esac</div><div class='del'>-reload_cmds='$LD$reload_flag -o $output$reload_objs'</div><div class='del'>-case $host_os in</div><div class='del'>-  darwin*)</div><div class='del'>-    if test "$GCC" = yes; then</div><div class='del'>-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'</div><div class='del'>-    else</div><div class='del'>-      reload_cmds='$LD$reload_flag -o $output$reload_objs'</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-if test -n "$ac_tool_prefix"; then</div><div class='del'>-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.</div><div class='del'>-set dummy ${ac_tool_prefix}objdump; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$OBJDUMP"; then</div><div class='del'>-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-OBJDUMP=$ac_cv_prog_OBJDUMP</div><div class='del'>-if test -n "$OBJDUMP"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" &gt;&amp;5</div><div class='del'>-$as_echo "$OBJDUMP" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-if test -z "$ac_cv_prog_OBJDUMP"; then</div><div class='del'>-  ac_ct_OBJDUMP=$OBJDUMP</div><div class='del'>-  # Extract the first word of "objdump", so it can be a program name with args.</div><div class='del'>-set dummy objdump; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_OBJDUMP"; then</div><div class='del'>-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_OBJDUMP="objdump"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP</div><div class='del'>-if test -n "$ac_ct_OBJDUMP"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_OBJDUMP" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_OBJDUMP" = x; then</div><div class='del'>-    OBJDUMP="false"</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    OBJDUMP=$ac_ct_OBJDUMP</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  OBJDUMP="$ac_cv_prog_OBJDUMP"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-test -z "$OBJDUMP" &amp;&amp; OBJDUMP=objdump</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking how to recognize dependent libraries... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_deplibs_check_method+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  lt_cv_file_magic_cmd='$MAGIC_CMD'</div><div class='del'>-lt_cv_file_magic_test_file=</div><div class='del'>-lt_cv_deplibs_check_method='unknown'</div><div class='del'>-# Need to set the preceding variable on all platforms that support</div><div class='del'>-# interlibrary dependencies.</div><div class='del'>-# 'none' -- dependencies not supported.</div><div class='del'>-# `unknown' -- same as none, but documents that we really don't know.</div><div class='del'>-# 'pass_all' -- all dependencies passed with no checks.</div><div class='del'>-# 'test_compile' -- check by making test program.</div><div class='del'>-# 'file_magic [[regex]]' -- check by looking for files in library path</div><div class='del'>-# which responds to the $file_magic_cmd with a given extended regex.</div><div class='del'>-# If you have `file' or equivalent on your system and you're not sure</div><div class='del'>-# whether `pass_all' will *always* work, you probably want this one.</div><div class='del'>-</div><div class='del'>-case $host_os in</div><div class='del'>-aix[4-9]*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-beos*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-bsdi[45]*)</div><div class='del'>-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'</div><div class='del'>-  lt_cv_file_magic_cmd='/usr/bin/file -L'</div><div class='del'>-  lt_cv_file_magic_test_file=/shlib/libc.so</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-cygwin*)</div><div class='del'>-  # func_win32_libid is a shell function defined in ltmain.sh</div><div class='del'>-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'</div><div class='del'>-  lt_cv_file_magic_cmd='func_win32_libid'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-mingw* | pw32*)</div><div class='del'>-  # Base MSYS/MinGW do not provide the 'file' command needed by</div><div class='del'>-  # func_win32_libid shell function, so use a weaker test based on 'objdump',</div><div class='del'>-  # unless we find 'file', for example because we are cross-compiling.</div><div class='del'>-  if ( file / ) &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'</div><div class='del'>-    lt_cv_file_magic_cmd='func_win32_libid'</div><div class='del'>-  else</div><div class='del'>-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'</div><div class='del'>-    lt_cv_file_magic_cmd='$OBJDUMP -f'</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-cegcc)</div><div class='del'>-  # use the weaker test based on 'objdump'. See mingw*.</div><div class='del'>-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'</div><div class='del'>-  lt_cv_file_magic_cmd='$OBJDUMP -f'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-darwin* | rhapsody*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-freebsd* | dragonfly*)</div><div class='del'>-  if echo __ELF__ | $CC -E - | $GREP __ELF__ &gt; /dev/null; then</div><div class='del'>-    case $host_cpu in</div><div class='del'>-    i*86 )</div><div class='del'>-      # Not sure whether the presence of OpenBSD here was a mistake.</div><div class='del'>-      # Let's accept both of them until this is cleared up.</div><div class='del'>-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'</div><div class='del'>-      lt_cv_file_magic_cmd=/usr/bin/file</div><div class='del'>-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-  else</div><div class='del'>-    lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-gnu*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-hpux10.20* | hpux11*)</div><div class='del'>-  lt_cv_file_magic_cmd=/usr/bin/file</div><div class='del'>-  case $host_cpu in</div><div class='del'>-  ia64*)</div><div class='del'>-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'</div><div class='del'>-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so</div><div class='del'>-    ;;</div><div class='del'>-  hppa*64*)</div><div class='del'>-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'</div><div class='del'>-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'</div><div class='del'>-    lt_cv_file_magic_test_file=/usr/lib/libc.sl</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-interix[3-9]*)</div><div class='del'>-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here</div><div class='del'>-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-irix5* | irix6* | nonstopux*)</div><div class='del'>-  case $LD in</div><div class='del'>-  *-32|*"-32 ") libmagic=32-bit;;</div><div class='del'>-  *-n32|*"-n32 ") libmagic=N32;;</div><div class='del'>-  *-64|*"-64 ") libmagic=64-bit;;</div><div class='del'>-  *) libmagic=never-match;;</div><div class='del'>-  esac</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-# This must be Linux ELF.</div><div class='del'>-linux* | k*bsd*-gnu)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-netbsd*)</div><div class='del'>-  if echo __ELF__ | $CC -E - | $GREP __ELF__ &gt; /dev/null; then</div><div class='del'>-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'</div><div class='del'>-  else</div><div class='del'>-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-newos6*)</div><div class='del'>-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'</div><div class='del'>-  lt_cv_file_magic_cmd=/usr/bin/file</div><div class='del'>-  lt_cv_file_magic_test_file=/usr/lib/libnls.so</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-*nto* | *qnx*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-openbsd*)</div><div class='del'>-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then</div><div class='del'>-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'</div><div class='del'>-  else</div><div class='del'>-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-osf3* | osf4* | osf5*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-rdos*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-solaris*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-sysv4 | sysv4.3*)</div><div class='del'>-  case $host_vendor in</div><div class='del'>-  motorola)</div><div class='del'>-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'</div><div class='del'>-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`</div><div class='del'>-    ;;</div><div class='del'>-  ncr)</div><div class='del'>-    lt_cv_deplibs_check_method=pass_all</div><div class='del'>-    ;;</div><div class='del'>-  sequent)</div><div class='del'>-    lt_cv_file_magic_cmd='/bin/file'</div><div class='del'>-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'</div><div class='del'>-    ;;</div><div class='del'>-  sni)</div><div class='del'>-    lt_cv_file_magic_cmd='/bin/file'</div><div class='del'>-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"</div><div class='del'>-    lt_cv_file_magic_test_file=/lib/libc.so</div><div class='del'>-    ;;</div><div class='del'>-  siemens)</div><div class='del'>-    lt_cv_deplibs_check_method=pass_all</div><div class='del'>-    ;;</div><div class='del'>-  pc)</div><div class='del'>-    lt_cv_deplibs_check_method=pass_all</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-tpf*)</div><div class='del'>-  lt_cv_deplibs_check_method=pass_all</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_deplibs_check_method" &gt;&amp;6; }</div><div class='del'>-file_magic_cmd=$lt_cv_file_magic_cmd</div><div class='del'>-deplibs_check_method=$lt_cv_deplibs_check_method</div><div class='del'>-test -z "$deplibs_check_method" &amp;&amp; deplibs_check_method=unknown</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-if test -n "$ac_tool_prefix"; then</div><div class='del'>-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.</div><div class='del'>-set dummy ${ac_tool_prefix}ar; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_AR+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$AR"; then</div><div class='del'>-  ac_cv_prog_AR="$AR" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_AR="${ac_tool_prefix}ar"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-AR=$ac_cv_prog_AR</div><div class='del'>-if test -n "$AR"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" &gt;&amp;5</div><div class='del'>-$as_echo "$AR" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-if test -z "$ac_cv_prog_AR"; then</div><div class='del'>-  ac_ct_AR=$AR</div><div class='del'>-  # Extract the first word of "ar", so it can be a program name with args.</div><div class='del'>-set dummy ar; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_AR"; then</div><div class='del'>-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_AR="ar"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_AR=$ac_cv_prog_ac_ct_AR</div><div class='del'>-if test -n "$ac_ct_AR"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_AR" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_AR" = x; then</div><div class='del'>-    AR="false"</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    AR=$ac_ct_AR</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  AR="$ac_cv_prog_AR"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-test -z "$AR" &amp;&amp; AR=ar</div><div class='del'>-test -z "$AR_FLAGS" &amp;&amp; AR_FLAGS=cru</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-if test -n "$ac_tool_prefix"; then</div><div class='del'>-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.</div><div class='del'>-set dummy ${ac_tool_prefix}strip; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_STRIP+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$STRIP"; then</div><div class='del'>-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-STRIP=$ac_cv_prog_STRIP</div><div class='del'>-if test -n "$STRIP"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" &gt;&amp;5</div><div class='del'>-$as_echo "$STRIP" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-if test -z "$ac_cv_prog_STRIP"; then</div><div class='del'>-  ac_ct_STRIP=$STRIP</div><div class='del'>-  # Extract the first word of "strip", so it can be a program name with args.</div><div class='del'>-set dummy strip; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_STRIP"; then</div><div class='del'>-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_STRIP="strip"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP</div><div class='del'>-if test -n "$ac_ct_STRIP"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_STRIP" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_STRIP" = x; then</div><div class='del'>-    STRIP=":"</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    STRIP=$ac_ct_STRIP</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  STRIP="$ac_cv_prog_STRIP"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-test -z "$STRIP" &amp;&amp; STRIP=:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-if test -n "$ac_tool_prefix"; then</div><div class='del'>-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.</div><div class='del'>-set dummy ${ac_tool_prefix}ranlib; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_RANLIB+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$RANLIB"; then</div><div class='del'>-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-RANLIB=$ac_cv_prog_RANLIB</div><div class='del'>-if test -n "$RANLIB"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" &gt;&amp;5</div><div class='del'>-$as_echo "$RANLIB" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-if test -z "$ac_cv_prog_RANLIB"; then</div><div class='del'>-  ac_ct_RANLIB=$RANLIB</div><div class='del'>-  # Extract the first word of "ranlib", so it can be a program name with args.</div><div class='del'>-set dummy ranlib; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_RANLIB"; then</div><div class='del'>-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_RANLIB="ranlib"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB</div><div class='del'>-if test -n "$ac_ct_RANLIB"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_RANLIB" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_RANLIB" = x; then</div><div class='del'>-    RANLIB=":"</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    RANLIB=$ac_ct_RANLIB</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  RANLIB="$ac_cv_prog_RANLIB"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-test -z "$RANLIB" &amp;&amp; RANLIB=:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Determine commands to create old-style static archives.</div><div class='del'>-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'</div><div class='del'>-old_postinstall_cmds='chmod 644 $oldlib'</div><div class='del'>-old_postuninstall_cmds=</div><div class='del'>-</div><div class='del'>-if test -n "$RANLIB"; then</div><div class='del'>-  case $host_os in</div><div class='del'>-  openbsd*)</div><div class='del'>-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# If no C compiler was specified, use CC.</div><div class='del'>-LTCC=${LTCC-"$CC"}</div><div class='del'>-</div><div class='del'>-# If no C compiler flags were specified, use CFLAGS.</div><div class='del'>-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}</div><div class='del'>-</div><div class='del'>-# Allow CC to be a program name with arguments.</div><div class='del'>-compiler=$CC</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Check for command to grab the raw symbol name followed by C symbol from nm.</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking command to parse $NM output from $compiler object... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-</div><div class='del'>-# These are sane defaults that work on at least a few old systems.</div><div class='del'>-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]</div><div class='del'>-</div><div class='del'>-# Character class describing NM global symbol codes.</div><div class='del'>-symcode='[BCDEGRST]'</div><div class='del'>-</div><div class='del'>-# Regexp to match symbols that can be accessed directly from C.</div><div class='del'>-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'</div><div class='del'>-</div><div class='del'>-# Define system-specific variables.</div><div class='del'>-case $host_os in</div><div class='del'>-aix*)</div><div class='del'>-  symcode='[BCDT]'</div><div class='del'>-  ;;</div><div class='del'>-cygwin* | mingw* | pw32* | cegcc*)</div><div class='del'>-  symcode='[ABCDGISTW]'</div><div class='del'>-  ;;</div><div class='del'>-hpux*)</div><div class='del'>-  if test "$host_cpu" = ia64; then</div><div class='del'>-    symcode='[ABCDEGRST]'</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-irix* | nonstopux*)</div><div class='del'>-  symcode='[BCDEGRST]'</div><div class='del'>-  ;;</div><div class='del'>-osf*)</div><div class='del'>-  symcode='[BCDEGQRST]'</div><div class='del'>-  ;;</div><div class='del'>-solaris*)</div><div class='del'>-  symcode='[BDRT]'</div><div class='del'>-  ;;</div><div class='del'>-sco3.2v5*)</div><div class='del'>-  symcode='[DT]'</div><div class='del'>-  ;;</div><div class='del'>-sysv4.2uw2*)</div><div class='del'>-  symcode='[DT]'</div><div class='del'>-  ;;</div><div class='del'>-sysv5* | sco5v6* | unixware* | OpenUNIX*)</div><div class='del'>-  symcode='[ABDT]'</div><div class='del'>-  ;;</div><div class='del'>-sysv4)</div><div class='del'>-  symcode='[DFNSTU]'</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# If we're using GNU nm, then use its standard symbol codes.</div><div class='del'>-case `$NM -V 2&gt;&amp;1` in</div><div class='del'>-*GNU* | *'with BFD'*)</div><div class='del'>-  symcode='[ABCDGIRSTW]' ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# Transform an extracted symbol line into a proper C declaration.</div><div class='del'>-# Some systems (esp. on ia64) link data and code symbols differently,</div><div class='del'>-# so use this general approach.</div><div class='del'>-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"</div><div class='del'>-</div><div class='del'>-# Transform an extracted symbol line into symbol name and symbol address</div><div class='del'>-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&amp;\2},/p'"</div><div class='del'>-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&amp;\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&amp;\2},/p'"</div><div class='del'>-</div><div class='del'>-# Handle CRLF in mingw tool chain</div><div class='del'>-opt_cr=</div><div class='del'>-case $build_os in</div><div class='del'>-mingw*)</div><div class='del'>-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# Try without a prefix underscore, then with it.</div><div class='del'>-for ac_symprfx in "" "_"; do</div><div class='del'>-</div><div class='del'>-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.</div><div class='del'>-  symxfrm="\\1 $ac_symprfx\\2 \\2"</div><div class='del'>-</div><div class='del'>-  # Write the raw and C identifiers.</div><div class='del'>-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then</div><div class='del'>-    # Fake it for dumpbin and say T for any non-static function</div><div class='del'>-    # and D for any global variable.</div><div class='del'>-    # Also find C++ and __fastcall symbols from MSVC++,</div><div class='del'>-    # which start with @ or ?.</div><div class='del'>-    lt_cv_sys_global_symbol_pipe="$AWK '"\</div><div class='del'>-"     {last_section=section; section=\$ 3};"\</div><div class='del'>-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\</div><div class='del'>-"     \$ 0!~/External *\|/{next};"\</div><div class='del'>-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\</div><div class='del'>-"     {if(hide[section]) next};"\</div><div class='del'>-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\</div><div class='del'>-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\</div><div class='del'>-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\</div><div class='del'>-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\</div><div class='del'>-"     ' prfx=^$ac_symprfx"</div><div class='del'>-  else</div><div class='del'>-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  # Check to see that the pipe works correctly.</div><div class='del'>-  pipe_works=no</div><div class='del'>-</div><div class='del'>-  rm -f conftest*</div><div class='del'>-  cat &gt; conftest.$ac_ext &lt;&lt;_LT_EOF</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif</div><div class='del'>-char nm_test_var;</div><div class='del'>-void nm_test_func(void);</div><div class='del'>-void nm_test_func(void){}</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-int main(){nm_test_var='a';nm_test_func();return(0);}</div><div class='del'>-_LT_EOF</div><div class='del'>-</div><div class='del'>-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } &gt;&amp;5</div><div class='del'>-  (eval $ac_compile) 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; }; then</div><div class='del'>-    # Now try to grab the symbols.</div><div class='del'>-    nlist=conftest.nm</div><div class='del'>-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \&gt; $nlist\""; } &gt;&amp;5</div><div class='del'>-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \&gt; $nlist) 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; } &amp;&amp; test -s "$nlist"; then</div><div class='del'>-      # Try sorting and uniquifying the output.</div><div class='del'>-      if sort "$nlist" | uniq &gt; "$nlist"T; then</div><div class='del'>-	mv -f "$nlist"T "$nlist"</div><div class='del'>-      else</div><div class='del'>-	rm -f "$nlist"T</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Make sure that we snagged all the symbols we need.</div><div class='del'>-      if $GREP ' nm_test_var$' "$nlist" &gt;/dev/null; then</div><div class='del'>-	if $GREP ' nm_test_func$' "$nlist" &gt;/dev/null; then</div><div class='del'>-	  cat &lt;&lt;_LT_EOF &gt; conftest.$ac_ext</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-	  # Now generate the symbol file.</div><div class='del'>-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' &lt; "$nlist" | $GREP -v main &gt;&gt; conftest.$ac_ext'</div><div class='del'>-</div><div class='del'>-	  cat &lt;&lt;_LT_EOF &gt;&gt; conftest.$ac_ext</div><div class='del'>-</div><div class='del'>-/* The mapping between symbol names and symbols.  */</div><div class='del'>-const struct {</div><div class='del'>-  const char *name;</div><div class='del'>-  void       *address;</div><div class='del'>-}</div><div class='del'>-lt__PROGRAM__LTX_preloaded_symbols[] =</div><div class='del'>-{</div><div class='del'>-  { "@PROGRAM@", (void *) 0 },</div><div class='del'>-_LT_EOF</div><div class='del'>-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&amp;\2},/" &lt; "$nlist" | $GREP -v main &gt;&gt; conftest.$ac_ext</div><div class='del'>-	  cat &lt;&lt;\_LT_EOF &gt;&gt; conftest.$ac_ext</div><div class='del'>-  {0, (void *) 0}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This works around a problem in FreeBSD linker */</div><div class='del'>-#ifdef FREEBSD_WORKAROUND</div><div class='del'>-static const void *lt_preloaded_setup() {</div><div class='del'>-  return lt__PROGRAM__LTX_preloaded_symbols;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-_LT_EOF</div><div class='del'>-	  # Now try linking the two files.</div><div class='del'>-	  mv conftest.$ac_objext conftstm.$ac_objext</div><div class='del'>-	  lt_save_LIBS="$LIBS"</div><div class='del'>-	  lt_save_CFLAGS="$CFLAGS"</div><div class='del'>-	  LIBS="conftstm.$ac_objext"</div><div class='del'>-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"</div><div class='del'>-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } &gt;&amp;5</div><div class='del'>-  (eval $ac_link) 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; } &amp;&amp; test -s conftest${ac_exeext}; then</div><div class='del'>-	    pipe_works=yes</div><div class='del'>-	  fi</div><div class='del'>-	  LIBS="$lt_save_LIBS"</div><div class='del'>-	  CFLAGS="$lt_save_CFLAGS"</div><div class='del'>-	else</div><div class='del'>-	  echo "cannot find nm_test_func in $nlist" &gt;&amp;5</div><div class='del'>-	fi</div><div class='del'>-      else</div><div class='del'>-	echo "cannot find nm_test_var in $nlist" &gt;&amp;5</div><div class='del'>-      fi</div><div class='del'>-    else</div><div class='del'>-      echo "cannot run $lt_cv_sys_global_symbol_pipe" &gt;&amp;5</div><div class='del'>-    fi</div><div class='del'>-  else</div><div class='del'>-    echo "$progname: failed program was:" &gt;&amp;5</div><div class='del'>-    cat conftest.$ac_ext &gt;&amp;5</div><div class='del'>-  fi</div><div class='del'>-  rm -rf conftest* conftst*</div><div class='del'>-</div><div class='del'>-  # Do not use the global_symbol_pipe unless it works.</div><div class='del'>-  if test "$pipe_works" = yes; then</div><div class='del'>-    break</div><div class='del'>-  else</div><div class='del'>-    lt_cv_sys_global_symbol_pipe=</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test -z "$lt_cv_sys_global_symbol_pipe"; then</div><div class='del'>-  lt_cv_sys_global_symbol_to_cdecl=</div><div class='del'>-fi</div><div class='del'>-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" &gt;&amp;5</div><div class='del'>-$as_echo "failed" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" &gt;&amp;5</div><div class='del'>-$as_echo "ok" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Check whether --enable-libtool-lock was given.</div><div class='del'>-if test "${enable_libtool_lock+set}" = set; then :</div><div class='del'>-  enableval=$enable_libtool_lock;</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-test "x$enable_libtool_lock" != xno &amp;&amp; enable_libtool_lock=yes</div><div class='del'>-</div><div class='del'>-# Some flags need to be propagated to the compiler or linker for good</div><div class='del'>-# libtool support.</div><div class='del'>-case $host in</div><div class='del'>-ia64-*-hpux*)</div><div class='del'>-  # Find out which ABI we are using.</div><div class='del'>-  echo 'int i;' &gt; conftest.$ac_ext</div><div class='del'>-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } &gt;&amp;5</div><div class='del'>-  (eval $ac_compile) 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; }; then</div><div class='del'>-    case `/usr/bin/file conftest.$ac_objext` in</div><div class='del'>-      *ELF-32*)</div><div class='del'>-	HPUX_IA64_MODE="32"</div><div class='del'>-	;;</div><div class='del'>-      *ELF-64*)</div><div class='del'>-	HPUX_IA64_MODE="64"</div><div class='del'>-	;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-  rm -rf conftest*</div><div class='del'>-  ;;</div><div class='del'>-*-*-irix6*)</div><div class='del'>-  # Find out which ABI we are using.</div><div class='del'>-  echo '#line 6351 "configure"' &gt; conftest.$ac_ext</div><div class='del'>-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } &gt;&amp;5</div><div class='del'>-  (eval $ac_compile) 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; }; then</div><div class='del'>-    if test "$lt_cv_prog_gnu_ld" = yes; then</div><div class='del'>-      case `/usr/bin/file conftest.$ac_objext` in</div><div class='del'>-	*32-bit*)</div><div class='del'>-	  LD="${LD-ld} -melf32bsmip"</div><div class='del'>-	  ;;</div><div class='del'>-	*N32*)</div><div class='del'>-	  LD="${LD-ld} -melf32bmipn32"</div><div class='del'>-	  ;;</div><div class='del'>-	*64-bit*)</div><div class='del'>-	  LD="${LD-ld} -melf64bmip"</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-    else</div><div class='del'>-      case `/usr/bin/file conftest.$ac_objext` in</div><div class='del'>-	*32-bit*)</div><div class='del'>-	  LD="${LD-ld} -32"</div><div class='del'>-	  ;;</div><div class='del'>-	*N32*)</div><div class='del'>-	  LD="${LD-ld} -n32"</div><div class='del'>-	  ;;</div><div class='del'>-	*64-bit*)</div><div class='del'>-	  LD="${LD-ld} -64"</div><div class='del'>-	  ;;</div><div class='del'>-      esac</div><div class='del'>-    fi</div><div class='del'>-  fi</div><div class='del'>-  rm -rf conftest*</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \</div><div class='del'>-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)</div><div class='del'>-  # Find out which ABI we are using.</div><div class='del'>-  echo 'int i;' &gt; conftest.$ac_ext</div><div class='del'>-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } &gt;&amp;5</div><div class='del'>-  (eval $ac_compile) 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; }; then</div><div class='del'>-    case `/usr/bin/file conftest.o` in</div><div class='del'>-      *32-bit*)</div><div class='del'>-	case $host in</div><div class='del'>-	  x86_64-*kfreebsd*-gnu)</div><div class='del'>-	    LD="${LD-ld} -m elf_i386_fbsd"</div><div class='del'>-	    ;;</div><div class='del'>-	  x86_64-*linux*)</div><div class='del'>-	    LD="${LD-ld} -m elf_i386"</div><div class='del'>-	    ;;</div><div class='del'>-	  ppc64-*linux*|powerpc64-*linux*)</div><div class='del'>-	    LD="${LD-ld} -m elf32ppclinux"</div><div class='del'>-	    ;;</div><div class='del'>-	  s390x-*linux*)</div><div class='del'>-	    LD="${LD-ld} -m elf_s390"</div><div class='del'>-	    ;;</div><div class='del'>-	  sparc64-*linux*)</div><div class='del'>-	    LD="${LD-ld} -m elf32_sparc"</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      *64-bit*)</div><div class='del'>-	case $host in</div><div class='del'>-	  x86_64-*kfreebsd*-gnu)</div><div class='del'>-	    LD="${LD-ld} -m elf_x86_64_fbsd"</div><div class='del'>-	    ;;</div><div class='del'>-	  x86_64-*linux*)</div><div class='del'>-	    LD="${LD-ld} -m elf_x86_64"</div><div class='del'>-	    ;;</div><div class='del'>-	  ppc*-*linux*|powerpc*-*linux*)</div><div class='del'>-	    LD="${LD-ld} -m elf64ppc"</div><div class='del'>-	    ;;</div><div class='del'>-	  s390*-*linux*|s390*-*tpf*)</div><div class='del'>-	    LD="${LD-ld} -m elf64_s390"</div><div class='del'>-	    ;;</div><div class='del'>-	  sparc*-*linux*)</div><div class='del'>-	    LD="${LD-ld} -m elf64_sparc"</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-  rm -rf conftest*</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-*-*-sco3.2v5*)</div><div class='del'>-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.</div><div class='del'>-  SAVE_CFLAGS="$CFLAGS"</div><div class='del'>-  CFLAGS="$CFLAGS -belf"</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether the C compiler needs -belf... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_cc_needs_belf+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  ac_ext=c</div><div class='del'>-ac_cpp='$CPP $CPPFLAGS'</div><div class='del'>-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext &gt;&amp;5'</div><div class='del'>-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS &gt;&amp;5'</div><div class='del'>-ac_compiler_gnu=$ac_cv_c_compiler_gnu</div><div class='del'>-</div><div class='del'>-     cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_link "$LINENO"; then :</div><div class='del'>-  lt_cv_cc_needs_belf=yes</div><div class='del'>-else</div><div class='del'>-  lt_cv_cc_needs_belf=no</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext \</div><div class='del'>-    conftest$ac_exeext conftest.$ac_ext</div><div class='del'>-     ac_ext=c</div><div class='del'>-ac_cpp='$CPP $CPPFLAGS'</div><div class='del'>-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext &gt;&amp;5'</div><div class='del'>-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS &gt;&amp;5'</div><div class='del'>-ac_compiler_gnu=$ac_cv_c_compiler_gnu</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_cc_needs_belf" &gt;&amp;6; }</div><div class='del'>-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then</div><div class='del'>-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf</div><div class='del'>-    CFLAGS="$SAVE_CFLAGS"</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-sparc*-*solaris*)</div><div class='del'>-  # Find out which ABI we are using.</div><div class='del'>-  echo 'int i;' &gt; conftest.$ac_ext</div><div class='del'>-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } &gt;&amp;5</div><div class='del'>-  (eval $ac_compile) 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; }; then</div><div class='del'>-    case `/usr/bin/file conftest.o` in</div><div class='del'>-    *64-bit*)</div><div class='del'>-      case $lt_cv_prog_gnu_ld in</div><div class='del'>-      yes*) LD="${LD-ld} -m elf64_sparc" ;;</div><div class='del'>-      *)</div><div class='del'>-	if ${LD-ld} -64 -r -o conftest2.o conftest.o &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-	  LD="${LD-ld} -64"</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-  rm -rf conftest*</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-need_locks="$enable_libtool_lock"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  case $host_os in</div><div class='del'>-    rhapsody* | darwin*)</div><div class='del'>-    if test -n "$ac_tool_prefix"; then</div><div class='del'>-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.</div><div class='del'>-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$DSYMUTIL"; then</div><div class='del'>-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-DSYMUTIL=$ac_cv_prog_DSYMUTIL</div><div class='del'>-if test -n "$DSYMUTIL"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" &gt;&amp;5</div><div class='del'>-$as_echo "$DSYMUTIL" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-if test -z "$ac_cv_prog_DSYMUTIL"; then</div><div class='del'>-  ac_ct_DSYMUTIL=$DSYMUTIL</div><div class='del'>-  # Extract the first word of "dsymutil", so it can be a program name with args.</div><div class='del'>-set dummy dsymutil; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_DSYMUTIL"; then</div><div class='del'>-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL</div><div class='del'>-if test -n "$ac_ct_DSYMUTIL"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_DSYMUTIL" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_DSYMUTIL" = x; then</div><div class='del'>-    DSYMUTIL=":"</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    DSYMUTIL=$ac_ct_DSYMUTIL</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-    if test -n "$ac_tool_prefix"; then</div><div class='del'>-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.</div><div class='del'>-set dummy ${ac_tool_prefix}nmedit; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_NMEDIT+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$NMEDIT"; then</div><div class='del'>-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-NMEDIT=$ac_cv_prog_NMEDIT</div><div class='del'>-if test -n "$NMEDIT"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" &gt;&amp;5</div><div class='del'>-$as_echo "$NMEDIT" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-if test -z "$ac_cv_prog_NMEDIT"; then</div><div class='del'>-  ac_ct_NMEDIT=$NMEDIT</div><div class='del'>-  # Extract the first word of "nmedit", so it can be a program name with args.</div><div class='del'>-set dummy nmedit; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_NMEDIT"; then</div><div class='del'>-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_NMEDIT="nmedit"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT</div><div class='del'>-if test -n "$ac_ct_NMEDIT"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_NMEDIT" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_NMEDIT" = x; then</div><div class='del'>-    NMEDIT=":"</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    NMEDIT=$ac_ct_NMEDIT</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  NMEDIT="$ac_cv_prog_NMEDIT"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-    if test -n "$ac_tool_prefix"; then</div><div class='del'>-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.</div><div class='del'>-set dummy ${ac_tool_prefix}lipo; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_LIPO+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$LIPO"; then</div><div class='del'>-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-LIPO=$ac_cv_prog_LIPO</div><div class='del'>-if test -n "$LIPO"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" &gt;&amp;5</div><div class='del'>-$as_echo "$LIPO" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-if test -z "$ac_cv_prog_LIPO"; then</div><div class='del'>-  ac_ct_LIPO=$LIPO</div><div class='del'>-  # Extract the first word of "lipo", so it can be a program name with args.</div><div class='del'>-set dummy lipo; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_LIPO"; then</div><div class='del'>-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_LIPO="lipo"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO</div><div class='del'>-if test -n "$ac_ct_LIPO"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_LIPO" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_LIPO" = x; then</div><div class='del'>-    LIPO=":"</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    LIPO=$ac_ct_LIPO</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  LIPO="$ac_cv_prog_LIPO"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-    if test -n "$ac_tool_prefix"; then</div><div class='del'>-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.</div><div class='del'>-set dummy ${ac_tool_prefix}otool; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_OTOOL+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$OTOOL"; then</div><div class='del'>-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-OTOOL=$ac_cv_prog_OTOOL</div><div class='del'>-if test -n "$OTOOL"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" &gt;&amp;5</div><div class='del'>-$as_echo "$OTOOL" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-if test -z "$ac_cv_prog_OTOOL"; then</div><div class='del'>-  ac_ct_OTOOL=$OTOOL</div><div class='del'>-  # Extract the first word of "otool", so it can be a program name with args.</div><div class='del'>-set dummy otool; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_OTOOL"; then</div><div class='del'>-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_OTOOL="otool"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL</div><div class='del'>-if test -n "$ac_ct_OTOOL"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_OTOOL" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_OTOOL" = x; then</div><div class='del'>-    OTOOL=":"</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    OTOOL=$ac_ct_OTOOL</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  OTOOL="$ac_cv_prog_OTOOL"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-    if test -n "$ac_tool_prefix"; then</div><div class='del'>-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.</div><div class='del'>-set dummy ${ac_tool_prefix}otool64; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_OTOOL64+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$OTOOL64"; then</div><div class='del'>-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-OTOOL64=$ac_cv_prog_OTOOL64</div><div class='del'>-if test -n "$OTOOL64"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" &gt;&amp;5</div><div class='del'>-$as_echo "$OTOOL64" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-if test -z "$ac_cv_prog_OTOOL64"; then</div><div class='del'>-  ac_ct_OTOOL64=$OTOOL64</div><div class='del'>-  # Extract the first word of "otool64", so it can be a program name with args.</div><div class='del'>-set dummy otool64; ac_word=$2</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $ac_word... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test -n "$ac_ct_OTOOL64"; then</div><div class='del'>-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.</div><div class='del'>-else</div><div class='del'>-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    for ac_exec_ext in '' $ac_executable_extensions; do</div><div class='del'>-  if { test -f "$as_dir/$ac_word$ac_exec_ext" &amp;&amp; $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then</div><div class='del'>-    ac_cv_prog_ac_ct_OTOOL64="otool64"</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" &gt;&amp;5</div><div class='del'>-    break 2</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64</div><div class='del'>-if test -n "$ac_ct_OTOOL64"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_ct_OTOOL64" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  if test "x$ac_ct_OTOOL64" = x; then</div><div class='del'>-    OTOOL64=":"</div><div class='del'>-  else</div><div class='del'>-    case $cross_compiling:$ac_tool_warned in</div><div class='del'>-yes:)</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" &gt;&amp;2;}</div><div class='del'>-ac_tool_warned=yes ;;</div><div class='del'>-esac</div><div class='del'>-    OTOOL64=$ac_ct_OTOOL64</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  OTOOL64="$ac_cv_prog_OTOOL64"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for -single_module linker flag... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  lt_cv_apple_cc_single_mod=no</div><div class='del'>-      if test -z "${LT_MULTI_MODULE}"; then</div><div class='del'>-	# By default we will add the -single_module flag. You can override</div><div class='del'>-	# by either setting the environment variable LT_MULTI_MODULE</div><div class='del'>-	# non-empty at configure time, or by adding -multi_module to the</div><div class='del'>-	# link flags.</div><div class='del'>-	rm -rf libconftest.dylib*</div><div class='del'>-	echo "int foo(void){return 1;}" &gt; conftest.c</div><div class='del'>-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \</div><div class='del'>--dynamiclib -Wl,-single_module conftest.c" &gt;&amp;5</div><div class='del'>-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \</div><div class='del'>-	  -dynamiclib -Wl,-single_module conftest.c 2&gt;conftest.err</div><div class='del'>-        _lt_result=$?</div><div class='del'>-	if test -f libconftest.dylib &amp;&amp; test ! -s conftest.err &amp;&amp; test $_lt_result = 0; then</div><div class='del'>-	  lt_cv_apple_cc_single_mod=yes</div><div class='del'>-	else</div><div class='del'>-	  cat conftest.err &gt;&amp;5</div><div class='del'>-	fi</div><div class='del'>-	rm -rf libconftest.dylib*</div><div class='del'>-	rm -f conftest.*</div><div class='del'>-      fi</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_apple_cc_single_mod" &gt;&amp;6; }</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for -exported_symbols_list linker flag... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  lt_cv_ld_exported_symbols_list=no</div><div class='del'>-      save_LDFLAGS=$LDFLAGS</div><div class='del'>-      echo "_main" &gt; conftest.sym</div><div class='del'>-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"</div><div class='del'>-      cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_link "$LINENO"; then :</div><div class='del'>-  lt_cv_ld_exported_symbols_list=yes</div><div class='del'>-else</div><div class='del'>-  lt_cv_ld_exported_symbols_list=no</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext \</div><div class='del'>-    conftest$ac_exeext conftest.$ac_ext</div><div class='del'>-	LDFLAGS="$save_LDFLAGS"</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_ld_exported_symbols_list" &gt;&amp;6; }</div><div class='del'>-    case $host_os in</div><div class='del'>-    rhapsody* | darwin1.[012])</div><div class='del'>-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;</div><div class='del'>-    darwin1.*)</div><div class='del'>-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;</div><div class='del'>-    darwin*) # darwin 5.x on</div><div class='del'>-      # if running on 10.5 or later, the deployment target defaults</div><div class='del'>-      # to the OS version, if on x86, and 10.4, the deployment</div><div class='del'>-      # target defaults to 10.4. Don't you love it?</div><div class='del'>-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in</div><div class='del'>-	10.0,*86*-darwin8*|10.0,*-darwin[91]*)</div><div class='del'>-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;</div><div class='del'>-	10.[012]*)</div><div class='del'>-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;</div><div class='del'>-	10.*)</div><div class='del'>-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;</div><div class='del'>-      esac</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then</div><div class='del'>-      _lt_dar_single_mod='$single_module'</div><div class='del'>-    fi</div><div class='del'>-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then</div><div class='del'>-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'</div><div class='del'>-    else</div><div class='del'>-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'</div><div class='del'>-    fi</div><div class='del'>-    if test "$DSYMUTIL" != ":"; then</div><div class='del'>-      _lt_dsymutil='~$DSYMUTIL $lib || :'</div><div class='del'>-    else</div><div class='del'>-      _lt_dsymutil=</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for ANSI C header files... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_header_stdc+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;float.h&gt;</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_compile "$LINENO"; then :</div><div class='del'>-  ac_cv_header_stdc=yes</div><div class='del'>-else</div><div class='del'>-  ac_cv_header_stdc=no</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext</div><div class='del'>-</div><div class='del'>-if test $ac_cv_header_stdc = yes; then</div><div class='del'>-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-_ACEOF</div><div class='del'>-if (eval "$ac_cpp conftest.$ac_ext") 2&gt;&amp;5 |</div><div class='del'>-  $EGREP "memchr" &gt;/dev/null 2&gt;&amp;1; then :</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  ac_cv_header_stdc=no</div><div class='del'>-fi</div><div class='del'>-rm -f conftest*</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test $ac_cv_header_stdc = yes; then</div><div class='del'>-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-_ACEOF</div><div class='del'>-if (eval "$ac_cpp conftest.$ac_ext") 2&gt;&amp;5 |</div><div class='del'>-  $EGREP "free" &gt;/dev/null 2&gt;&amp;1; then :</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  ac_cv_header_stdc=no</div><div class='del'>-fi</div><div class='del'>-rm -f conftest*</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test $ac_cv_header_stdc = yes; then</div><div class='del'>-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.</div><div class='del'>-  if test "$cross_compiling" = yes; then :</div><div class='del'>-  :</div><div class='del'>-else</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#if ((' ' &amp; 0x0FF) == 0x020)</div><div class='del'>-# define ISLOWER(c) ('a' &lt;= (c) &amp;&amp; (c) &lt;= 'z')</div><div class='del'>-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))</div><div class='del'>-#else</div><div class='del'>-# define ISLOWER(c) \</div><div class='del'>-		   (('a' &lt;= (c) &amp;&amp; (c) &lt;= 'i') \</div><div class='del'>-		     || ('j' &lt;= (c) &amp;&amp; (c) &lt;= 'r') \</div><div class='del'>-		     || ('s' &lt;= (c) &amp;&amp; (c) &lt;= 'z'))</div><div class='del'>-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define XOR(e, f) (((e) &amp;&amp; !(f)) || (!(e) &amp;&amp; (f)))</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-  int i;</div><div class='del'>-  for (i = 0; i &lt; 256; i++)</div><div class='del'>-    if (XOR (islower (i), ISLOWER (i))</div><div class='del'>-	|| toupper (i) != TOUPPER (i))</div><div class='del'>-      return 2;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_run "$LINENO"; then :</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  ac_cv_header_stdc=no</div><div class='del'>-fi</div><div class='del'>-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \</div><div class='del'>-  conftest.$ac_objext conftest.beam conftest.$ac_ext</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_header_stdc" &gt;&amp;6; }</div><div class='del'>-if test $ac_cv_header_stdc = yes; then</div><div class='del'>-</div><div class='del'>-$as_echo "#define STDC_HEADERS 1" &gt;&gt;confdefs.h</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# On IRIX 5.3, sys/types and inttypes.h are conflicting.</div><div class='del'>-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \</div><div class='del'>-		  inttypes.h stdint.h unistd.h</div><div class='del'>-do :</div><div class='del'>-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`</div><div class='del'>-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default</div><div class='del'>-"</div><div class='del'>-eval as_val=\$$as_ac_Header</div><div class='del'>-   if test "x$as_val" = x""yes; then :</div><div class='del'>-  cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-for ac_header in dlfcn.h</div><div class='del'>-do :</div><div class='del'>-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default</div><div class='del'>-"</div><div class='del'>-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :</div><div class='del'>-  cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define HAVE_DLFCN_H 1</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Set options</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-        enable_dlopen=no</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-            # Check whether --enable-shared was given.</div><div class='del'>-if test "${enable_shared+set}" = set; then :</div><div class='del'>-  enableval=$enable_shared; p=${PACKAGE-default}</div><div class='del'>-    case $enableval in</div><div class='del'>-    yes) enable_shared=yes ;;</div><div class='del'>-    no) enable_shared=no ;;</div><div class='del'>-    *)</div><div class='del'>-      enable_shared=no</div><div class='del'>-      # Look at the argument we got.  We use all the common list separators.</div><div class='del'>-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"</div><div class='del'>-      for pkg in $enableval; do</div><div class='del'>-	IFS="$lt_save_ifs"</div><div class='del'>-	if test "X$pkg" = "X$p"; then</div><div class='del'>-	  enable_shared=yes</div><div class='del'>-	fi</div><div class='del'>-      done</div><div class='del'>-      IFS="$lt_save_ifs"</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-else</div><div class='del'>-  enable_shared=yes</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  # Check whether --enable-static was given.</div><div class='del'>-if test "${enable_static+set}" = set; then :</div><div class='del'>-  enableval=$enable_static; p=${PACKAGE-default}</div><div class='del'>-    case $enableval in</div><div class='del'>-    yes) enable_static=yes ;;</div><div class='del'>-    no) enable_static=no ;;</div><div class='del'>-    *)</div><div class='del'>-     enable_static=no</div><div class='del'>-      # Look at the argument we got.  We use all the common list separators.</div><div class='del'>-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"</div><div class='del'>-      for pkg in $enableval; do</div><div class='del'>-	IFS="$lt_save_ifs"</div><div class='del'>-	if test "X$pkg" = "X$p"; then</div><div class='del'>-	  enable_static=yes</div><div class='del'>-	fi</div><div class='del'>-      done</div><div class='del'>-      IFS="$lt_save_ifs"</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-else</div><div class='del'>-  enable_static=yes</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Check whether --with-pic was given.</div><div class='del'>-if test "${with_pic+set}" = set; then :</div><div class='del'>-  withval=$with_pic; pic_mode="$withval"</div><div class='del'>-else</div><div class='del'>-  pic_mode=default</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-test -z "$pic_mode" &amp;&amp; pic_mode=default</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  # Check whether --enable-fast-install was given.</div><div class='del'>-if test "${enable_fast_install+set}" = set; then :</div><div class='del'>-  enableval=$enable_fast_install; p=${PACKAGE-default}</div><div class='del'>-    case $enableval in</div><div class='del'>-    yes) enable_fast_install=yes ;;</div><div class='del'>-    no) enable_fast_install=no ;;</div><div class='del'>-    *)</div><div class='del'>-      enable_fast_install=no</div><div class='del'>-      # Look at the argument we got.  We use all the common list separators.</div><div class='del'>-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"</div><div class='del'>-      for pkg in $enableval; do</div><div class='del'>-	IFS="$lt_save_ifs"</div><div class='del'>-	if test "X$pkg" = "X$p"; then</div><div class='del'>-	  enable_fast_install=yes</div><div class='del'>-	fi</div><div class='del'>-      done</div><div class='del'>-      IFS="$lt_save_ifs"</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-else</div><div class='del'>-  enable_fast_install=yes</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# This can be used to rebuild libtool when needed</div><div class='del'>-LIBTOOL_DEPS="$ltmain"</div><div class='del'>-</div><div class='del'>-# Always use our own libtool.</div><div class='del'>-LIBTOOL='$(SHELL) $(top_builddir)/libtool'</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-test -z "$LN_S" &amp;&amp; LN_S="ln -s"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-if test -n "${ZSH_VERSION+set}" ; then</div><div class='del'>-   setopt NO_GLOB_SUBST</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for objdir... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_objdir+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  rm -f .libs 2&gt;/dev/null</div><div class='del'>-mkdir .libs 2&gt;/dev/null</div><div class='del'>-if test -d .libs; then</div><div class='del'>-  lt_cv_objdir=.libs</div><div class='del'>-else</div><div class='del'>-  # MS-DOS does not allow filenames that begin with a dot.</div><div class='del'>-  lt_cv_objdir=_libs</div><div class='del'>-fi</div><div class='del'>-rmdir .libs 2&gt;/dev/null</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_objdir" &gt;&amp;6; }</div><div class='del'>-objdir=$lt_cv_objdir</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define LT_OBJDIR "$lt_cv_objdir/"</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-case $host_os in</div><div class='del'>-aix3*)</div><div class='del'>-  # AIX sometimes has problems with the GCC collect2 program.  For some</div><div class='del'>-  # reason, if we set the COLLECT_NAMES environment variable, the problems</div><div class='del'>-  # vanish in a puff of smoke.</div><div class='del'>-  if test "X${COLLECT_NAMES+set}" != Xset; then</div><div class='del'>-    COLLECT_NAMES=</div><div class='del'>-    export COLLECT_NAMES</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# Sed substitution that helps us do robust quoting.  It backslashifies</div><div class='del'>-# metacharacters that are still active within double-quoted strings.</div><div class='del'>-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'</div><div class='del'>-</div><div class='del'>-# Same as above, but do not quote variable references.</div><div class='del'>-double_quote_subst='s/\(["`\\]\)/\\\1/g'</div><div class='del'>-</div><div class='del'>-# Sed substitution to delay expansion of an escaped shell variable in a</div><div class='del'>-# double_quote_subst'ed string.</div><div class='del'>-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'</div><div class='del'>-</div><div class='del'>-# Sed substitution to delay expansion of an escaped single quote.</div><div class='del'>-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'</div><div class='del'>-</div><div class='del'>-# Sed substitution to avoid accidental globbing in evaled expressions</div><div class='del'>-no_glob_subst='s/\*/\\\*/g'</div><div class='del'>-</div><div class='del'>-# Global variables:</div><div class='del'>-ofile=libtool</div><div class='del'>-can_build_shared=yes</div><div class='del'>-</div><div class='del'>-# All known linkers require a `.a' archive for static linking (except MSVC,</div><div class='del'>-# which needs '.lib').</div><div class='del'>-libext=a</div><div class='del'>-</div><div class='del'>-with_gnu_ld="$lt_cv_prog_gnu_ld"</div><div class='del'>-</div><div class='del'>-old_CC="$CC"</div><div class='del'>-old_CFLAGS="$CFLAGS"</div><div class='del'>-</div><div class='del'>-# Set sane defaults for various variables</div><div class='del'>-test -z "$CC" &amp;&amp; CC=cc</div><div class='del'>-test -z "$LTCC" &amp;&amp; LTCC=$CC</div><div class='del'>-test -z "$LTCFLAGS" &amp;&amp; LTCFLAGS=$CFLAGS</div><div class='del'>-test -z "$LD" &amp;&amp; LD=ld</div><div class='del'>-test -z "$ac_objext" &amp;&amp; ac_objext=o</div><div class='del'>-</div><div class='del'>-for cc_temp in $compiler""; do</div><div class='del'>-  case $cc_temp in</div><div class='del'>-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;</div><div class='del'>-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;</div><div class='del'>-    \-*) ;;</div><div class='del'>-    *) break;;</div><div class='del'>-  esac</div><div class='del'>-done</div><div class='del'>-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Only perform the check for file, if the check method requires it</div><div class='del'>-test -z "$MAGIC_CMD" &amp;&amp; MAGIC_CMD=file</div><div class='del'>-case $deplibs_check_method in</div><div class='del'>-file_magic*)</div><div class='del'>-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for ${ac_tool_prefix}file... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  case $MAGIC_CMD in</div><div class='del'>-[\\/*] |  ?:[\\/]*)</div><div class='del'>-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.</div><div class='del'>-  ;;</div><div class='del'>-*)</div><div class='del'>-  lt_save_MAGIC_CMD="$MAGIC_CMD"</div><div class='del'>-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR</div><div class='del'>-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"</div><div class='del'>-  for ac_dir in $ac_dummy; do</div><div class='del'>-    IFS="$lt_save_ifs"</div><div class='del'>-    test -z "$ac_dir" &amp;&amp; ac_dir=.</div><div class='del'>-    if test -f $ac_dir/${ac_tool_prefix}file; then</div><div class='del'>-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"</div><div class='del'>-      if test -n "$file_magic_test_file"; then</div><div class='del'>-	case $deplibs_check_method in</div><div class='del'>-	"file_magic "*)</div><div class='del'>-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`</div><div class='del'>-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"</div><div class='del'>-	  if eval $file_magic_cmd \$file_magic_test_file 2&gt; /dev/null |</div><div class='del'>-	    $EGREP "$file_magic_regex" &gt; /dev/null; then</div><div class='del'>-	    :</div><div class='del'>-	  else</div><div class='del'>-	    cat &lt;&lt;_LT_EOF 1&gt;&amp;2</div><div class='del'>-</div><div class='del'>-*** Warning: the command libtool uses to detect shared libraries,</div><div class='del'>-*** $file_magic_cmd, produces output that libtool cannot recognize.</div><div class='del'>-*** The result is that libtool may fail to recognize shared libraries</div><div class='del'>-*** as such.  This will affect the creation of libtool libraries that</div><div class='del'>-*** depend on shared libraries, but programs linked with such libtool</div><div class='del'>-*** libraries will work regardless of this problem.  Nevertheless, you</div><div class='del'>-*** may want to report the problem to your system manager and/or to</div><div class='del'>-*** bug-libtool@gnu.org</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-	  fi ;;</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-      break</div><div class='del'>-    fi</div><div class='del'>-  done</div><div class='del'>-  IFS="$lt_save_ifs"</div><div class='del'>-  MAGIC_CMD="$lt_save_MAGIC_CMD"</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"</div><div class='del'>-if test -n "$MAGIC_CMD"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" &gt;&amp;5</div><div class='del'>-$as_echo "$MAGIC_CMD" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-if test -z "$lt_cv_path_MAGIC_CMD"; then</div><div class='del'>-  if test -n "$ac_tool_prefix"; then</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for file... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  case $MAGIC_CMD in</div><div class='del'>-[\\/*] |  ?:[\\/]*)</div><div class='del'>-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.</div><div class='del'>-  ;;</div><div class='del'>-*)</div><div class='del'>-  lt_save_MAGIC_CMD="$MAGIC_CMD"</div><div class='del'>-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR</div><div class='del'>-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"</div><div class='del'>-  for ac_dir in $ac_dummy; do</div><div class='del'>-    IFS="$lt_save_ifs"</div><div class='del'>-    test -z "$ac_dir" &amp;&amp; ac_dir=.</div><div class='del'>-    if test -f $ac_dir/file; then</div><div class='del'>-      lt_cv_path_MAGIC_CMD="$ac_dir/file"</div><div class='del'>-      if test -n "$file_magic_test_file"; then</div><div class='del'>-	case $deplibs_check_method in</div><div class='del'>-	"file_magic "*)</div><div class='del'>-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`</div><div class='del'>-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"</div><div class='del'>-	  if eval $file_magic_cmd \$file_magic_test_file 2&gt; /dev/null |</div><div class='del'>-	    $EGREP "$file_magic_regex" &gt; /dev/null; then</div><div class='del'>-	    :</div><div class='del'>-	  else</div><div class='del'>-	    cat &lt;&lt;_LT_EOF 1&gt;&amp;2</div><div class='del'>-</div><div class='del'>-*** Warning: the command libtool uses to detect shared libraries,</div><div class='del'>-*** $file_magic_cmd, produces output that libtool cannot recognize.</div><div class='del'>-*** The result is that libtool may fail to recognize shared libraries</div><div class='del'>-*** as such.  This will affect the creation of libtool libraries that</div><div class='del'>-*** depend on shared libraries, but programs linked with such libtool</div><div class='del'>-*** libraries will work regardless of this problem.  Nevertheless, you</div><div class='del'>-*** may want to report the problem to your system manager and/or to</div><div class='del'>-*** bug-libtool@gnu.org</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-	  fi ;;</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-      break</div><div class='del'>-    fi</div><div class='del'>-  done</div><div class='del'>-  IFS="$lt_save_ifs"</div><div class='del'>-  MAGIC_CMD="$lt_save_MAGIC_CMD"</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"</div><div class='del'>-if test -n "$MAGIC_CMD"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" &gt;&amp;5</div><div class='del'>-$as_echo "$MAGIC_CMD" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  else</div><div class='del'>-    MAGIC_CMD=:</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# Use C for the default configuration in the libtool script</div><div class='del'>-</div><div class='del'>-lt_save_CC="$CC"</div><div class='del'>-ac_ext=c</div><div class='del'>-ac_cpp='$CPP $CPPFLAGS'</div><div class='del'>-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext &gt;&amp;5'</div><div class='del'>-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS &gt;&amp;5'</div><div class='del'>-ac_compiler_gnu=$ac_cv_c_compiler_gnu</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Source file extension for C test sources.</div><div class='del'>-ac_ext=c</div><div class='del'>-</div><div class='del'>-# Object file extension for compiled C test sources.</div><div class='del'>-objext=o</div><div class='del'>-objext=$objext</div><div class='del'>-</div><div class='del'>-# Code to be used in simple compile tests</div><div class='del'>-lt_simple_compile_test_code="int some_variable = 0;"</div><div class='del'>-</div><div class='del'>-# Code to be used in simple link tests</div><div class='del'>-lt_simple_link_test_code='int main(){return(0);}'</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# If no C compiler was specified, use CC.</div><div class='del'>-LTCC=${LTCC-"$CC"}</div><div class='del'>-</div><div class='del'>-# If no C compiler flags were specified, use CFLAGS.</div><div class='del'>-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}</div><div class='del'>-</div><div class='del'>-# Allow CC to be a program name with arguments.</div><div class='del'>-compiler=$CC</div><div class='del'>-</div><div class='del'>-# Save the default compiler, since it gets overwritten when the other</div><div class='del'>-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.</div><div class='del'>-compiler_DEFAULT=$CC</div><div class='del'>-</div><div class='del'>-# save warnings/boilerplate of simple test code</div><div class='del'>-ac_outfile=conftest.$ac_objext</div><div class='del'>-echo "$lt_simple_compile_test_code" &gt;conftest.$ac_ext</div><div class='del'>-eval "$ac_compile" 2&gt;&amp;1 &gt;/dev/null | $SED '/^$/d; /^ *+/d' &gt;conftest.err</div><div class='del'>-_lt_compiler_boilerplate=`cat conftest.err`</div><div class='del'>-$RM conftest*</div><div class='del'>-</div><div class='del'>-ac_outfile=conftest.$ac_objext</div><div class='del'>-echo "$lt_simple_link_test_code" &gt;conftest.$ac_ext</div><div class='del'>-eval "$ac_link" 2&gt;&amp;1 &gt;/dev/null | $SED '/^$/d; /^ *+/d' &gt;conftest.err</div><div class='del'>-_lt_linker_boilerplate=`cat conftest.err`</div><div class='del'>-$RM -r conftest*</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-if test -n "$compiler"; then</div><div class='del'>-</div><div class='del'>-lt_prog_compiler_no_builtin_flag=</div><div class='del'>-</div><div class='del'>-if test "$GCC" = yes; then</div><div class='del'>-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'</div><div class='del'>-</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  lt_cv_prog_compiler_rtti_exceptions=no</div><div class='del'>-   ac_outfile=conftest.$ac_objext</div><div class='del'>-   echo "$lt_simple_compile_test_code" &gt; conftest.$ac_ext</div><div class='del'>-   lt_compiler_flag="-fno-rtti -fno-exceptions"</div><div class='del'>-   # Insert the option either (1) after the last *FLAGS variable, or</div><div class='del'>-   # (2) before a word containing "conftest.", or (3) at the end.</div><div class='del'>-   # Note that $ac_compile itself does not contain backslashes and begins</div><div class='del'>-   # with a dollar sign (not a hyphen), so the echo should work correctly.</div><div class='del'>-   # The option is referenced via a variable to avoid confusing sed.</div><div class='del'>-   lt_compile=`echo "$ac_compile" | $SED \</div><div class='del'>-   -e 's:.*FLAGS}\{0,1\} :&amp;$lt_compiler_flag :; t' \</div><div class='del'>-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&amp;:; t' \</div><div class='del'>-   -e 's:$: $lt_compiler_flag:'`</div><div class='del'>-   (eval echo "\"\$as_me:7738: $lt_compile\"" &gt;&amp;5)</div><div class='del'>-   (eval "$lt_compile" 2&gt;conftest.err)</div><div class='del'>-   ac_status=$?</div><div class='del'>-   cat conftest.err &gt;&amp;5</div><div class='del'>-   echo "$as_me:7742: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-   if (exit $ac_status) &amp;&amp; test -s "$ac_outfile"; then</div><div class='del'>-     # The compiler can only warn and ignore the option if not recognized</div><div class='del'>-     # So say no if there are warnings other than the usual output.</div><div class='del'>-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' &gt;conftest.exp</div><div class='del'>-     $SED '/^$/d; /^ *+/d' conftest.err &gt;conftest.er2</div><div class='del'>-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 &gt;/dev/null; then</div><div class='del'>-       lt_cv_prog_compiler_rtti_exceptions=yes</div><div class='del'>-     fi</div><div class='del'>-   fi</div><div class='del'>-   $RM conftest*</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then</div><div class='del'>-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"</div><div class='del'>-else</div><div class='del'>-    :</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  lt_prog_compiler_wl=</div><div class='del'>-lt_prog_compiler_pic=</div><div class='del'>-lt_prog_compiler_static=</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for $compiler option to produce PIC... " &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-  if test "$GCC" = yes; then</div><div class='del'>-    lt_prog_compiler_wl='-Wl,'</div><div class='del'>-    lt_prog_compiler_static='-static'</div><div class='del'>-</div><div class='del'>-    case $host_os in</div><div class='del'>-      aix*)</div><div class='del'>-      # All AIX code is PIC.</div><div class='del'>-      if test "$host_cpu" = ia64; then</div><div class='del'>-	# AIX 5 now supports IA64 processor</div><div class='del'>-	lt_prog_compiler_static='-Bstatic'</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    amigaos*)</div><div class='del'>-      case $host_cpu in</div><div class='del'>-      powerpc)</div><div class='del'>-            # see comment about AmigaOS4 .so support</div><div class='del'>-            lt_prog_compiler_pic='-fPIC'</div><div class='del'>-        ;;</div><div class='del'>-      m68k)</div><div class='del'>-            # FIXME: we need at least 68020 code to build shared libraries, but</div><div class='del'>-            # adding the `-m68020' flag to GCC prevents building anything better,</div><div class='del'>-            # like `-m68040'.</div><div class='del'>-            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'</div><div class='del'>-        ;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)</div><div class='del'>-      # PIC is the default for these OSes.</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    mingw* | cygwin* | pw32* | os2* | cegcc*)</div><div class='del'>-      # This hack is so that the source file can tell whether it is being</div><div class='del'>-      # built for inclusion in a dll (and should export symbols for example).</div><div class='del'>-      # Although the cygwin gcc ignores -fPIC, still need this for old-style</div><div class='del'>-      # (--disable-auto-import) libraries</div><div class='del'>-      lt_prog_compiler_pic='-DDLL_EXPORT'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    darwin* | rhapsody*)</div><div class='del'>-      # PIC is the default on this platform</div><div class='del'>-      # Common symbols not allowed in MH_DYLIB files</div><div class='del'>-      lt_prog_compiler_pic='-fno-common'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    hpux*)</div><div class='del'>-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit</div><div class='del'>-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag</div><div class='del'>-      # sets the default TLS model and affects inlining.</div><div class='del'>-      case $host_cpu in</div><div class='del'>-      hppa*64*)</div><div class='del'>-	# +Z the default</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-	lt_prog_compiler_pic='-fPIC'</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    interix[3-9]*)</div><div class='del'>-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.</div><div class='del'>-      # Instead, we relocate shared libraries at runtime.</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    msdosdjgpp*)</div><div class='del'>-      # Just because we use GCC doesn't mean we suddenly get shared libraries</div><div class='del'>-      # on systems that don't support them.</div><div class='del'>-      lt_prog_compiler_can_build_shared=no</div><div class='del'>-      enable_shared=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    *nto* | *qnx*)</div><div class='del'>-      # QNX uses GNU C++, but need to define -shared option too, otherwise</div><div class='del'>-      # it will coredump.</div><div class='del'>-      lt_prog_compiler_pic='-fPIC -shared'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv4*MP*)</div><div class='del'>-      if test -d /usr/nec; then</div><div class='del'>-	lt_prog_compiler_pic=-Kconform_pic</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    *)</div><div class='del'>-      lt_prog_compiler_pic='-fPIC'</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-  else</div><div class='del'>-    # PORTME Check for flag to pass linker flags through the system compiler.</div><div class='del'>-    case $host_os in</div><div class='del'>-    aix*)</div><div class='del'>-      lt_prog_compiler_wl='-Wl,'</div><div class='del'>-      if test "$host_cpu" = ia64; then</div><div class='del'>-	# AIX 5 now supports IA64 processor</div><div class='del'>-	lt_prog_compiler_static='-Bstatic'</div><div class='del'>-      else</div><div class='del'>-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    mingw* | cygwin* | pw32* | os2* | cegcc*)</div><div class='del'>-      # This hack is so that the source file can tell whether it is being</div><div class='del'>-      # built for inclusion in a dll (and should export symbols for example).</div><div class='del'>-      lt_prog_compiler_pic='-DDLL_EXPORT'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    hpux9* | hpux10* | hpux11*)</div><div class='del'>-      lt_prog_compiler_wl='-Wl,'</div><div class='del'>-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but</div><div class='del'>-      # not for PA HP-UX.</div><div class='del'>-      case $host_cpu in</div><div class='del'>-      hppa*64*|ia64*)</div><div class='del'>-	# +Z the default</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-	lt_prog_compiler_pic='+Z'</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      # Is there a better lt_prog_compiler_static that works with the bundled CC?</div><div class='del'>-      lt_prog_compiler_static='${wl}-a ${wl}archive'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    irix5* | irix6* | nonstopux*)</div><div class='del'>-      lt_prog_compiler_wl='-Wl,'</div><div class='del'>-      # PIC (with -KPIC) is the default.</div><div class='del'>-      lt_prog_compiler_static='-non_shared'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    linux* | k*bsd*-gnu)</div><div class='del'>-      case $cc_basename in</div><div class='del'>-      # old Intel for x86_64 which still supported -KPIC.</div><div class='del'>-      ecc*)</div><div class='del'>-	lt_prog_compiler_wl='-Wl,'</div><div class='del'>-	lt_prog_compiler_pic='-KPIC'</div><div class='del'>-	lt_prog_compiler_static='-static'</div><div class='del'>-        ;;</div><div class='del'>-      # icc used to be incompatible with GCC.</div><div class='del'>-      # ICC 10 doesn't accept -KPIC any more.</div><div class='del'>-      icc* | ifort*)</div><div class='del'>-	lt_prog_compiler_wl='-Wl,'</div><div class='del'>-	lt_prog_compiler_pic='-fPIC'</div><div class='del'>-	lt_prog_compiler_static='-static'</div><div class='del'>-        ;;</div><div class='del'>-      # Lahey Fortran 8.1.</div><div class='del'>-      lf95*)</div><div class='del'>-	lt_prog_compiler_wl='-Wl,'</div><div class='del'>-	lt_prog_compiler_pic='--shared'</div><div class='del'>-	lt_prog_compiler_static='--static'</div><div class='del'>-	;;</div><div class='del'>-      pgcc* | pgf77* | pgf90* | pgf95*)</div><div class='del'>-        # Portland Group compilers (*not* the Pentium gcc compiler,</div><div class='del'>-	# which looks to be a dead project)</div><div class='del'>-	lt_prog_compiler_wl='-Wl,'</div><div class='del'>-	lt_prog_compiler_pic='-fpic'</div><div class='del'>-	lt_prog_compiler_static='-Bstatic'</div><div class='del'>-        ;;</div><div class='del'>-      ccc*)</div><div class='del'>-        lt_prog_compiler_wl='-Wl,'</div><div class='del'>-        # All Alpha code is PIC.</div><div class='del'>-        lt_prog_compiler_static='-non_shared'</div><div class='del'>-        ;;</div><div class='del'>-      xl*)</div><div class='del'>-	# IBM XL C 8.0/Fortran 10.1 on PPC</div><div class='del'>-	lt_prog_compiler_wl='-Wl,'</div><div class='del'>-	lt_prog_compiler_pic='-qpic'</div><div class='del'>-	lt_prog_compiler_static='-qstaticlink'</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-	case `$CC -V 2&gt;&amp;1 | sed 5q` in</div><div class='del'>-	*Sun\ C*)</div><div class='del'>-	  # Sun C 5.9</div><div class='del'>-	  lt_prog_compiler_pic='-KPIC'</div><div class='del'>-	  lt_prog_compiler_static='-Bstatic'</div><div class='del'>-	  lt_prog_compiler_wl='-Wl,'</div><div class='del'>-	  ;;</div><div class='del'>-	*Sun\ F*)</div><div class='del'>-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker</div><div class='del'>-	  lt_prog_compiler_pic='-KPIC'</div><div class='del'>-	  lt_prog_compiler_static='-Bstatic'</div><div class='del'>-	  lt_prog_compiler_wl=''</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    newsos6)</div><div class='del'>-      lt_prog_compiler_pic='-KPIC'</div><div class='del'>-      lt_prog_compiler_static='-Bstatic'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    *nto* | *qnx*)</div><div class='del'>-      # QNX uses GNU C++, but need to define -shared option too, otherwise</div><div class='del'>-      # it will coredump.</div><div class='del'>-      lt_prog_compiler_pic='-fPIC -shared'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    osf3* | osf4* | osf5*)</div><div class='del'>-      lt_prog_compiler_wl='-Wl,'</div><div class='del'>-      # All OSF/1 code is PIC.</div><div class='del'>-      lt_prog_compiler_static='-non_shared'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    rdos*)</div><div class='del'>-      lt_prog_compiler_static='-non_shared'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    solaris*)</div><div class='del'>-      lt_prog_compiler_pic='-KPIC'</div><div class='del'>-      lt_prog_compiler_static='-Bstatic'</div><div class='del'>-      case $cc_basename in</div><div class='del'>-      f77* | f90* | f95*)</div><div class='del'>-	lt_prog_compiler_wl='-Qoption ld ';;</div><div class='del'>-      *)</div><div class='del'>-	lt_prog_compiler_wl='-Wl,';;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sunos4*)</div><div class='del'>-      lt_prog_compiler_wl='-Qoption ld '</div><div class='del'>-      lt_prog_compiler_pic='-PIC'</div><div class='del'>-      lt_prog_compiler_static='-Bstatic'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv4 | sysv4.2uw2* | sysv4.3*)</div><div class='del'>-      lt_prog_compiler_wl='-Wl,'</div><div class='del'>-      lt_prog_compiler_pic='-KPIC'</div><div class='del'>-      lt_prog_compiler_static='-Bstatic'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv4*MP*)</div><div class='del'>-      if test -d /usr/nec ;then</div><div class='del'>-	lt_prog_compiler_pic='-Kconform_pic'</div><div class='del'>-	lt_prog_compiler_static='-Bstatic'</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)</div><div class='del'>-      lt_prog_compiler_wl='-Wl,'</div><div class='del'>-      lt_prog_compiler_pic='-KPIC'</div><div class='del'>-      lt_prog_compiler_static='-Bstatic'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    unicos*)</div><div class='del'>-      lt_prog_compiler_wl='-Wl,'</div><div class='del'>-      lt_prog_compiler_can_build_shared=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    uts4*)</div><div class='del'>-      lt_prog_compiler_pic='-pic'</div><div class='del'>-      lt_prog_compiler_static='-Bstatic'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    *)</div><div class='del'>-      lt_prog_compiler_can_build_shared=no</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-case $host_os in</div><div class='del'>-  # For platforms which do not support PIC, -DPIC is meaningless:</div><div class='del'>-  *djgpp*)</div><div class='del'>-    lt_prog_compiler_pic=</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"</div><div class='del'>-    ;;</div><div class='del'>-esac</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_prog_compiler_pic" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Check to make sure the PIC flag actually works.</div><div class='del'>-#</div><div class='del'>-if test -n "$lt_prog_compiler_pic"; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  lt_cv_prog_compiler_pic_works=no</div><div class='del'>-   ac_outfile=conftest.$ac_objext</div><div class='del'>-   echo "$lt_simple_compile_test_code" &gt; conftest.$ac_ext</div><div class='del'>-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"</div><div class='del'>-   # Insert the option either (1) after the last *FLAGS variable, or</div><div class='del'>-   # (2) before a word containing "conftest.", or (3) at the end.</div><div class='del'>-   # Note that $ac_compile itself does not contain backslashes and begins</div><div class='del'>-   # with a dollar sign (not a hyphen), so the echo should work correctly.</div><div class='del'>-   # The option is referenced via a variable to avoid confusing sed.</div><div class='del'>-   lt_compile=`echo "$ac_compile" | $SED \</div><div class='del'>-   -e 's:.*FLAGS}\{0,1\} :&amp;$lt_compiler_flag :; t' \</div><div class='del'>-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&amp;:; t' \</div><div class='del'>-   -e 's:$: $lt_compiler_flag:'`</div><div class='del'>-   (eval echo "\"\$as_me:8077: $lt_compile\"" &gt;&amp;5)</div><div class='del'>-   (eval "$lt_compile" 2&gt;conftest.err)</div><div class='del'>-   ac_status=$?</div><div class='del'>-   cat conftest.err &gt;&amp;5</div><div class='del'>-   echo "$as_me:8081: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-   if (exit $ac_status) &amp;&amp; test -s "$ac_outfile"; then</div><div class='del'>-     # The compiler can only warn and ignore the option if not recognized</div><div class='del'>-     # So say no if there are warnings other than the usual output.</div><div class='del'>-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' &gt;conftest.exp</div><div class='del'>-     $SED '/^$/d; /^ *+/d' conftest.err &gt;conftest.er2</div><div class='del'>-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 &gt;/dev/null; then</div><div class='del'>-       lt_cv_prog_compiler_pic_works=yes</div><div class='del'>-     fi</div><div class='del'>-   fi</div><div class='del'>-   $RM conftest*</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_prog_compiler_pic_works" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then</div><div class='del'>-    case $lt_prog_compiler_pic in</div><div class='del'>-     "" | " "*) ;;</div><div class='del'>-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;</div><div class='del'>-     esac</div><div class='del'>-else</div><div class='del'>-    lt_prog_compiler_pic=</div><div class='del'>-     lt_prog_compiler_can_build_shared=no</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Check to make sure the static flag actually works.</div><div class='del'>-#</div><div class='del'>-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  lt_cv_prog_compiler_static_works=no</div><div class='del'>-   save_LDFLAGS="$LDFLAGS"</div><div class='del'>-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"</div><div class='del'>-   echo "$lt_simple_link_test_code" &gt; conftest.$ac_ext</div><div class='del'>-   if (eval $ac_link 2&gt;conftest.err) &amp;&amp; test -s conftest$ac_exeext; then</div><div class='del'>-     # The linker can only warn and ignore the option if not recognized</div><div class='del'>-     # So say no if there are warnings</div><div class='del'>-     if test -s conftest.err; then</div><div class='del'>-       # Append any errors to the config.log.</div><div class='del'>-       cat conftest.err 1&gt;&amp;5</div><div class='del'>-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' &gt; conftest.exp</div><div class='del'>-       $SED '/^$/d; /^ *+/d' conftest.err &gt;conftest.er2</div><div class='del'>-       if diff conftest.exp conftest.er2 &gt;/dev/null; then</div><div class='del'>-         lt_cv_prog_compiler_static_works=yes</div><div class='del'>-       fi</div><div class='del'>-     else</div><div class='del'>-       lt_cv_prog_compiler_static_works=yes</div><div class='del'>-     fi</div><div class='del'>-   fi</div><div class='del'>-   $RM -r conftest*</div><div class='del'>-   LDFLAGS="$save_LDFLAGS"</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_prog_compiler_static_works" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-if test x"$lt_cv_prog_compiler_static_works" = xyes; then</div><div class='del'>-    :</div><div class='del'>-else</div><div class='del'>-    lt_prog_compiler_static=</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  lt_cv_prog_compiler_c_o=no</div><div class='del'>-   $RM -r conftest 2&gt;/dev/null</div><div class='del'>-   mkdir conftest</div><div class='del'>-   cd conftest</div><div class='del'>-   mkdir out</div><div class='del'>-   echo "$lt_simple_compile_test_code" &gt; conftest.$ac_ext</div><div class='del'>-</div><div class='del'>-   lt_compiler_flag="-o out/conftest2.$ac_objext"</div><div class='del'>-   # Insert the option either (1) after the last *FLAGS variable, or</div><div class='del'>-   # (2) before a word containing "conftest.", or (3) at the end.</div><div class='del'>-   # Note that $ac_compile itself does not contain backslashes and begins</div><div class='del'>-   # with a dollar sign (not a hyphen), so the echo should work correctly.</div><div class='del'>-   lt_compile=`echo "$ac_compile" | $SED \</div><div class='del'>-   -e 's:.*FLAGS}\{0,1\} :&amp;$lt_compiler_flag :; t' \</div><div class='del'>-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&amp;:; t' \</div><div class='del'>-   -e 's:$: $lt_compiler_flag:'`</div><div class='del'>-   (eval echo "\"\$as_me:8182: $lt_compile\"" &gt;&amp;5)</div><div class='del'>-   (eval "$lt_compile" 2&gt;out/conftest.err)</div><div class='del'>-   ac_status=$?</div><div class='del'>-   cat out/conftest.err &gt;&amp;5</div><div class='del'>-   echo "$as_me:8186: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-   if (exit $ac_status) &amp;&amp; test -s out/conftest2.$ac_objext</div><div class='del'>-   then</div><div class='del'>-     # The compiler can only warn and ignore the option if not recognized</div><div class='del'>-     # So say no if there are warnings</div><div class='del'>-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' &gt; out/conftest.exp</div><div class='del'>-     $SED '/^$/d; /^ *+/d' out/conftest.err &gt;out/conftest.er2</div><div class='del'>-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 &gt;/dev/null; then</div><div class='del'>-       lt_cv_prog_compiler_c_o=yes</div><div class='del'>-     fi</div><div class='del'>-   fi</div><div class='del'>-   chmod u+w . 2&gt;&amp;5</div><div class='del'>-   $RM conftest*</div><div class='del'>-   # SGI C++ compiler will create directory out/ii_files/ for</div><div class='del'>-   # template instantiation</div><div class='del'>-   test -d out/ii_files &amp;&amp; $RM out/ii_files/* &amp;&amp; rmdir out/ii_files</div><div class='del'>-   $RM out/* &amp;&amp; rmdir out</div><div class='del'>-   cd ..</div><div class='del'>-   $RM -r conftest</div><div class='del'>-   $RM conftest*</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_prog_compiler_c_o" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  lt_cv_prog_compiler_c_o=no</div><div class='del'>-   $RM -r conftest 2&gt;/dev/null</div><div class='del'>-   mkdir conftest</div><div class='del'>-   cd conftest</div><div class='del'>-   mkdir out</div><div class='del'>-   echo "$lt_simple_compile_test_code" &gt; conftest.$ac_ext</div><div class='del'>-</div><div class='del'>-   lt_compiler_flag="-o out/conftest2.$ac_objext"</div><div class='del'>-   # Insert the option either (1) after the last *FLAGS variable, or</div><div class='del'>-   # (2) before a word containing "conftest.", or (3) at the end.</div><div class='del'>-   # Note that $ac_compile itself does not contain backslashes and begins</div><div class='del'>-   # with a dollar sign (not a hyphen), so the echo should work correctly.</div><div class='del'>-   lt_compile=`echo "$ac_compile" | $SED \</div><div class='del'>-   -e 's:.*FLAGS}\{0,1\} :&amp;$lt_compiler_flag :; t' \</div><div class='del'>-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&amp;:; t' \</div><div class='del'>-   -e 's:$: $lt_compiler_flag:'`</div><div class='del'>-   (eval echo "\"\$as_me:8237: $lt_compile\"" &gt;&amp;5)</div><div class='del'>-   (eval "$lt_compile" 2&gt;out/conftest.err)</div><div class='del'>-   ac_status=$?</div><div class='del'>-   cat out/conftest.err &gt;&amp;5</div><div class='del'>-   echo "$as_me:8241: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-   if (exit $ac_status) &amp;&amp; test -s out/conftest2.$ac_objext</div><div class='del'>-   then</div><div class='del'>-     # The compiler can only warn and ignore the option if not recognized</div><div class='del'>-     # So say no if there are warnings</div><div class='del'>-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' &gt; out/conftest.exp</div><div class='del'>-     $SED '/^$/d; /^ *+/d' out/conftest.err &gt;out/conftest.er2</div><div class='del'>-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 &gt;/dev/null; then</div><div class='del'>-       lt_cv_prog_compiler_c_o=yes</div><div class='del'>-     fi</div><div class='del'>-   fi</div><div class='del'>-   chmod u+w . 2&gt;&amp;5</div><div class='del'>-   $RM conftest*</div><div class='del'>-   # SGI C++ compiler will create directory out/ii_files/ for</div><div class='del'>-   # template instantiation</div><div class='del'>-   test -d out/ii_files &amp;&amp; $RM out/ii_files/* &amp;&amp; rmdir out/ii_files</div><div class='del'>-   $RM out/* &amp;&amp; rmdir out</div><div class='del'>-   cd ..</div><div class='del'>-   $RM -r conftest</div><div class='del'>-   $RM conftest*</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_prog_compiler_c_o" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-hard_links="nottested"</div><div class='del'>-if test "$lt_cv_prog_compiler_c_o" = no &amp;&amp; test "$need_locks" != no; then</div><div class='del'>-  # do not overwrite the value of need_locks provided by the user</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking if we can lock with hard links... " &gt;&amp;6; }</div><div class='del'>-  hard_links=yes</div><div class='del'>-  $RM conftest*</div><div class='del'>-  ln conftest.a conftest.b 2&gt;/dev/null &amp;&amp; hard_links=no</div><div class='del'>-  touch conftest.a</div><div class='del'>-  ln conftest.a conftest.b 2&gt;&amp;5 || hard_links=no</div><div class='del'>-  ln conftest.a conftest.b 2&gt;/dev/null &amp;&amp; hard_links=no</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" &gt;&amp;5</div><div class='del'>-$as_echo "$hard_links" &gt;&amp;6; }</div><div class='del'>-  if test "$hard_links" = no; then</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" &gt;&amp;2;}</div><div class='del'>-    need_locks=warn</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  need_locks=no</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-  runpath_var=</div><div class='del'>-  allow_undefined_flag=</div><div class='del'>-  always_export_symbols=no</div><div class='del'>-  archive_cmds=</div><div class='del'>-  archive_expsym_cmds=</div><div class='del'>-  compiler_needs_object=no</div><div class='del'>-  enable_shared_with_static_runtimes=no</div><div class='del'>-  export_dynamic_flag_spec=</div><div class='del'>-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq &gt; $export_symbols'</div><div class='del'>-  hardcode_automatic=no</div><div class='del'>-  hardcode_direct=no</div><div class='del'>-  hardcode_direct_absolute=no</div><div class='del'>-  hardcode_libdir_flag_spec=</div><div class='del'>-  hardcode_libdir_flag_spec_ld=</div><div class='del'>-  hardcode_libdir_separator=</div><div class='del'>-  hardcode_minus_L=no</div><div class='del'>-  hardcode_shlibpath_var=unsupported</div><div class='del'>-  inherit_rpath=no</div><div class='del'>-  link_all_deplibs=unknown</div><div class='del'>-  module_cmds=</div><div class='del'>-  module_expsym_cmds=</div><div class='del'>-  old_archive_from_new_cmds=</div><div class='del'>-  old_archive_from_expsyms_cmds=</div><div class='del'>-  thread_safe_flag_spec=</div><div class='del'>-  whole_archive_flag_spec=</div><div class='del'>-  # include_expsyms should be a list of space-separated symbols to be *always*</div><div class='del'>-  # included in the symbol list</div><div class='del'>-  include_expsyms=</div><div class='del'>-  # exclude_expsyms can be an extended regexp of symbols to exclude</div><div class='del'>-  # it will be wrapped by ` (' and `)$', so one must not match beginning or</div><div class='del'>-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',</div><div class='del'>-  # as well as any symbol that contains `d'.</div><div class='del'>-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'</div><div class='del'>-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out</div><div class='del'>-  # platforms (ab)use it in PIC code, but their linkers get confused if</div><div class='del'>-  # the symbol is explicitly referenced.  Since portable code cannot</div><div class='del'>-  # rely on this symbol name, it's probably fine to never include it in</div><div class='del'>-  # preloaded symbol tables.</div><div class='del'>-  # Exclude shared library initialization/finalization symbols.</div><div class='del'>-  extract_expsyms_cmds=</div><div class='del'>-</div><div class='del'>-  case $host_os in</div><div class='del'>-  cygwin* | mingw* | pw32* | cegcc*)</div><div class='del'>-    # FIXME: the MSVC++ port hasn't been tested in a loooong time</div><div class='del'>-    # When not using gcc, we currently assume that we are using</div><div class='del'>-    # Microsoft Visual C++.</div><div class='del'>-    if test "$GCC" != yes; then</div><div class='del'>-      with_gnu_ld=no</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  interix*)</div><div class='del'>-    # we just hope/assume this is gcc and not c89 (= MSVC++)</div><div class='del'>-    with_gnu_ld=yes</div><div class='del'>-    ;;</div><div class='del'>-  openbsd*)</div><div class='del'>-    with_gnu_ld=no</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  ld_shlibs=yes</div><div class='del'>-  if test "$with_gnu_ld" = yes; then</div><div class='del'>-    # If archive_cmds runs LD, not CC, wlarc should be empty</div><div class='del'>-    wlarc='${wl}'</div><div class='del'>-</div><div class='del'>-    # Set some defaults for GNU ld with shared library support. These</div><div class='del'>-    # are reset later if shared libraries are not supported. Putting them</div><div class='del'>-    # here allows them to be overridden if necessary.</div><div class='del'>-    runpath_var=LD_RUN_PATH</div><div class='del'>-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'</div><div class='del'>-    export_dynamic_flag_spec='${wl}--export-dynamic'</div><div class='del'>-    # ancient GNU ld didn't support --whole-archive et. al.</div><div class='del'>-    if $LD --help 2&gt;&amp;1 | $GREP 'no-whole-archive' &gt; /dev/null; then</div><div class='del'>-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'</div><div class='del'>-    else</div><div class='del'>-      whole_archive_flag_spec=</div><div class='del'>-    fi</div><div class='del'>-    supports_anon_versioning=no</div><div class='del'>-    case `$LD -v 2&gt;&amp;1` in</div><div class='del'>-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions &lt; 2.11</div><div class='del'>-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...</div><div class='del'>-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...</div><div class='del'>-      *\ 2.11.*) ;; # other 2.11 versions</div><div class='del'>-      *) supports_anon_versioning=yes ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    # See if GNU ld supports shared libraries.</div><div class='del'>-    case $host_os in</div><div class='del'>-    aix[3-9]*)</div><div class='del'>-      # On AIX/PPC, the GNU linker is very broken</div><div class='del'>-      if test "$host_cpu" != ia64; then</div><div class='del'>-	ld_shlibs=no</div><div class='del'>-	cat &lt;&lt;_LT_EOF 1&gt;&amp;2</div><div class='del'>-</div><div class='del'>-*** Warning: the GNU linker, at least up to release 2.9.1, is reported</div><div class='del'>-*** to be unable to reliably create shared libraries on AIX.</div><div class='del'>-*** Therefore, libtool is disabling shared libraries support.  If you</div><div class='del'>-*** really care for shared libraries, you may want to modify your PATH</div><div class='del'>-*** so that a non-GNU linker is found, and then restart.</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    amigaos*)</div><div class='del'>-      case $host_cpu in</div><div class='del'>-      powerpc)</div><div class='del'>-            # see comment about AmigaOS4 .so support</div><div class='del'>-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-            archive_expsym_cmds=''</div><div class='del'>-        ;;</div><div class='del'>-      m68k)</div><div class='del'>-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" &gt; $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" &gt;&gt; $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" &gt;&gt; $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" &gt;&gt; $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir &amp;&amp; a2ixlibrary -32)'</div><div class='del'>-            hardcode_libdir_flag_spec='-L$libdir'</div><div class='del'>-            hardcode_minus_L=yes</div><div class='del'>-        ;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    beos*)</div><div class='del'>-      if $LD --help 2&gt;&amp;1 | $GREP ': supported targets:.* elf' &gt; /dev/null; then</div><div class='del'>-	allow_undefined_flag=unsupported</div><div class='del'>-	# Joseph Beckenbach &lt;jrb3@best.com&gt; says some releases of gcc</div><div class='del'>-	# support --undefined.  This deserves some investigation.  FIXME</div><div class='del'>-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-      else</div><div class='del'>-	ld_shlibs=no</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    cygwin* | mingw* | pw32* | cegcc*)</div><div class='del'>-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,</div><div class='del'>-      # as there is no search path for DLLs.</div><div class='del'>-      hardcode_libdir_flag_spec='-L$libdir'</div><div class='del'>-      allow_undefined_flag=unsupported</div><div class='del'>-      always_export_symbols=no</div><div class='del'>-      enable_shared_with_static_runtimes=yes</div><div class='del'>-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq &gt; $export_symbols'</div><div class='del'>-</div><div class='del'>-      if $LD --help 2&gt;&amp;1 | $GREP 'auto-import' &gt; /dev/null; then</div><div class='del'>-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'</div><div class='del'>-	# If the export-symbols file already is a .def file (1st line</div><div class='del'>-	# is EXPORTS), use it as is; otherwise, prepend...</div><div class='del'>-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then</div><div class='del'>-	  cp $export_symbols $output_objdir/$soname.def;</div><div class='del'>-	else</div><div class='del'>-	  echo EXPORTS &gt; $output_objdir/$soname.def;</div><div class='del'>-	  cat $export_symbols &gt;&gt; $output_objdir/$soname.def;</div><div class='del'>-	fi~</div><div class='del'>-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'</div><div class='del'>-      else</div><div class='del'>-	ld_shlibs=no</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    interix[3-9]*)</div><div class='del'>-      hardcode_direct=no</div><div class='del'>-      hardcode_shlibpath_var=no</div><div class='del'>-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'</div><div class='del'>-      export_dynamic_flag_spec='${wl}-E'</div><div class='del'>-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.</div><div class='del'>-      # Instead, shared libraries are loaded at an image base (0x10000000 by</div><div class='del'>-      # default) and relocated if they conflict, which is a slow very memory</div><div class='del'>-      # consuming and fragmenting process.  To avoid this, we pick a random,</div><div class='del'>-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link</div><div class='del'>-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.</div><div class='del'>-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'</div><div class='del'>-      archive_expsym_cmds='sed "s,^,_," $export_symbols &gt;$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    gnu* | linux* | tpf* | k*bsd*-gnu)</div><div class='del'>-      tmp_diet=no</div><div class='del'>-      if test "$host_os" = linux-dietlibc; then</div><div class='del'>-	case $cc_basename in</div><div class='del'>-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-      if $LD --help 2&gt;&amp;1 | $EGREP ': supported targets:.* elf' &gt; /dev/null \</div><div class='del'>-	 &amp;&amp; test "$tmp_diet" = no</div><div class='del'>-      then</div><div class='del'>-	tmp_addflag=</div><div class='del'>-	tmp_sharedflag='-shared'</div><div class='del'>-	case $cc_basename,$host_cpu in</div><div class='del'>-        pgcc*)				# Portland Group C compiler</div><div class='del'>-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" &amp;&amp; new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'</div><div class='del'>-	  tmp_addflag=' $pic_flag'</div><div class='del'>-	  ;;</div><div class='del'>-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers</div><div class='del'>-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" &amp;&amp; new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'</div><div class='del'>-	  tmp_addflag=' $pic_flag -Mnomain' ;;</div><div class='del'>-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64</div><div class='del'>-	  tmp_addflag=' -i_dynamic' ;;</div><div class='del'>-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64</div><div class='del'>-	  tmp_addflag=' -i_dynamic -nofor_main' ;;</div><div class='del'>-	ifc* | ifort*)			# Intel Fortran compiler</div><div class='del'>-	  tmp_addflag=' -nofor_main' ;;</div><div class='del'>-	lf95*)				# Lahey Fortran 8.1</div><div class='del'>-	  whole_archive_flag_spec=</div><div class='del'>-	  tmp_sharedflag='--shared' ;;</div><div class='del'>-	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)</div><div class='del'>-	  tmp_sharedflag='-qmkshrobj'</div><div class='del'>-	  tmp_addflag= ;;</div><div class='del'>-	esac</div><div class='del'>-	case `$CC -V 2&gt;&amp;1 | sed 5q` in</div><div class='del'>-	*Sun\ C*)			# Sun C 5.9</div><div class='del'>-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'</div><div class='del'>-	  compiler_needs_object=yes</div><div class='del'>-	  tmp_sharedflag='-G' ;;</div><div class='del'>-	*Sun\ F*)			# Sun Fortran 8.3</div><div class='del'>-	  tmp_sharedflag='-G' ;;</div><div class='del'>-	esac</div><div class='del'>-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-</div><div class='del'>-        if test "x$supports_anon_versioning" = xyes; then</div><div class='del'>-          archive_expsym_cmds='echo "{ global:" &gt; $output_objdir/$libname.ver~</div><div class='del'>-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" &gt;&gt; $output_objdir/$libname.ver~</div><div class='del'>-	    echo "local: *; };" &gt;&gt; $output_objdir/$libname.ver~</div><div class='del'>-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'</div><div class='del'>-        fi</div><div class='del'>-</div><div class='del'>-	case $cc_basename in</div><div class='del'>-	xlf*)</div><div class='del'>-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself</div><div class='del'>-	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'</div><div class='del'>-	  hardcode_libdir_flag_spec=</div><div class='del'>-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'</div><div class='del'>-	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'</div><div class='del'>-	  if test "x$supports_anon_versioning" = xyes; then</div><div class='del'>-	    archive_expsym_cmds='echo "{ global:" &gt; $output_objdir/$libname.ver~</div><div class='del'>-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" &gt;&gt; $output_objdir/$libname.ver~</div><div class='del'>-	      echo "local: *; };" &gt;&gt; $output_objdir/$libname.ver~</div><div class='del'>-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'</div><div class='del'>-	  fi</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      else</div><div class='del'>-        ld_shlibs=no</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    netbsd*)</div><div class='del'>-      if echo __ELF__ | $CC -E - | $GREP __ELF__ &gt;/dev/null; then</div><div class='del'>-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'</div><div class='del'>-	wlarc=</div><div class='del'>-      else</div><div class='del'>-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    solaris*)</div><div class='del'>-      if $LD -v 2&gt;&amp;1 | $GREP 'BFD 2\.8' &gt; /dev/null; then</div><div class='del'>-	ld_shlibs=no</div><div class='del'>-	cat &lt;&lt;_LT_EOF 1&gt;&amp;2</div><div class='del'>-</div><div class='del'>-*** Warning: The releases 2.8.* of the GNU linker cannot reliably</div><div class='del'>-*** create shared libraries on Solaris systems.  Therefore, libtool</div><div class='del'>-*** is disabling shared libraries support.  We urge you to upgrade GNU</div><div class='del'>-*** binutils to release 2.9.1 or newer.  Another option is to modify</div><div class='del'>-*** your PATH or compiler configuration so that the native linker is</div><div class='del'>-*** used, and then restart.</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-      elif $LD --help 2&gt;&amp;1 | $GREP ': supported targets:.* elf' &gt; /dev/null; then</div><div class='del'>-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'</div><div class='del'>-      else</div><div class='del'>-	ld_shlibs=no</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)</div><div class='del'>-      case `$LD -v 2&gt;&amp;1` in</div><div class='del'>-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)</div><div class='del'>-	ld_shlibs=no</div><div class='del'>-	cat &lt;&lt;_LT_EOF 1&gt;&amp;2</div><div class='del'>-</div><div class='del'>-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not</div><div class='del'>-*** reliably create shared libraries on SCO systems.  Therefore, libtool</div><div class='del'>-*** is disabling shared libraries support.  We urge you to upgrade GNU</div><div class='del'>-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify</div><div class='del'>-*** your PATH or compiler configuration so that the native linker is</div><div class='del'>-*** used, and then restart.</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-	;;</div><div class='del'>-	*)</div><div class='del'>-	  # For security reasons, it is highly recommended that you always</div><div class='del'>-	  # use absolute paths for naming shared libraries, and exclude the</div><div class='del'>-	  # DT_RUNPATH tag from executables and libraries.  But doing so</div><div class='del'>-	  # requires that you compile everything twice, which is a pain.</div><div class='del'>-	  if $LD --help 2&gt;&amp;1 | $GREP ': supported targets:.* elf' &gt; /dev/null; then</div><div class='del'>-	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'</div><div class='del'>-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'</div><div class='del'>-	  else</div><div class='del'>-	    ld_shlibs=no</div><div class='del'>-	  fi</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sunos4*)</div><div class='del'>-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-      wlarc=</div><div class='del'>-      hardcode_direct=yes</div><div class='del'>-      hardcode_shlibpath_var=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    *)</div><div class='del'>-      if $LD --help 2&gt;&amp;1 | $GREP ': supported targets:.* elf' &gt; /dev/null; then</div><div class='del'>-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'</div><div class='del'>-      else</div><div class='del'>-	ld_shlibs=no</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    if test "$ld_shlibs" = no; then</div><div class='del'>-      runpath_var=</div><div class='del'>-      hardcode_libdir_flag_spec=</div><div class='del'>-      export_dynamic_flag_spec=</div><div class='del'>-      whole_archive_flag_spec=</div><div class='del'>-    fi</div><div class='del'>-  else</div><div class='del'>-    # PORTME fill in a description of your system's linker (not GNU ld)</div><div class='del'>-    case $host_os in</div><div class='del'>-    aix3*)</div><div class='del'>-      allow_undefined_flag=unsupported</div><div class='del'>-      always_export_symbols=yes</div><div class='del'>-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'</div><div class='del'>-      # Note: this linker hardcodes the directories in LIBPATH if there</div><div class='del'>-      # are no directories specified by -L.</div><div class='del'>-      hardcode_minus_L=yes</div><div class='del'>-      if test "$GCC" = yes &amp;&amp; test -z "$lt_prog_compiler_static"; then</div><div class='del'>-	# Neither direct hardcoding nor static linking is supported with a</div><div class='del'>-	# broken collect2.</div><div class='del'>-	hardcode_direct=unsupported</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    aix[4-9]*)</div><div class='del'>-      if test "$host_cpu" = ia64; then</div><div class='del'>-	# On IA64, the linker does run time linking by default, so we don't</div><div class='del'>-	# have to do anything special.</div><div class='del'>-	aix_use_runtimelinking=no</div><div class='del'>-	exp_sym_flag='-Bexport'</div><div class='del'>-	no_entry_flag=""</div><div class='del'>-      else</div><div class='del'>-	# If we're using GNU nm, then we don't want the "-C" option.</div><div class='del'>-	# -C means demangle to AIX nm, but means don't demangle with GNU nm</div><div class='del'>-	if $NM -V 2&gt;&amp;1 | $GREP 'GNU' &gt; /dev/null; then</div><div class='del'>-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) &amp;&amp; (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u &gt; $export_symbols'</div><div class='del'>-	else</div><div class='del'>-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) &amp;&amp; (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u &gt; $export_symbols'</div><div class='del'>-	fi</div><div class='del'>-	aix_use_runtimelinking=no</div><div class='del'>-</div><div class='del'>-	# Test if we are trying to use run time linking or normal</div><div class='del'>-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we</div><div class='del'>-	# need to do runtime linking.</div><div class='del'>-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)</div><div class='del'>-	  for ld_flag in $LDFLAGS; do</div><div class='del'>-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then</div><div class='del'>-	    aix_use_runtimelinking=yes</div><div class='del'>-	    break</div><div class='del'>-	  fi</div><div class='del'>-	  done</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-</div><div class='del'>-	exp_sym_flag='-bexport'</div><div class='del'>-	no_entry_flag='-bnoentry'</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # When large executables or shared objects are built, AIX ld can</div><div class='del'>-      # have problems creating the table of contents.  If linking a library</div><div class='del'>-      # or program results in "error TOC overflow" add -mminimal-toc to</div><div class='del'>-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not</div><div class='del'>-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.</div><div class='del'>-</div><div class='del'>-      archive_cmds=''</div><div class='del'>-      hardcode_direct=yes</div><div class='del'>-      hardcode_direct_absolute=yes</div><div class='del'>-      hardcode_libdir_separator=':'</div><div class='del'>-      link_all_deplibs=yes</div><div class='del'>-      file_list_spec='${wl}-f,'</div><div class='del'>-</div><div class='del'>-      if test "$GCC" = yes; then</div><div class='del'>-	case $host_os in aix4.[012]|aix4.[012].*)</div><div class='del'>-	# We only want to do this on AIX 4.2 and lower, the check</div><div class='del'>-	# below for broken collect2 doesn't work under 4.3+</div><div class='del'>-	  collect2name=`${CC} -print-prog-name=collect2`</div><div class='del'>-	  if test -f "$collect2name" &amp;&amp;</div><div class='del'>-	   strings "$collect2name" | $GREP resolve_lib_name &gt;/dev/null</div><div class='del'>-	  then</div><div class='del'>-	  # We have reworked collect2</div><div class='del'>-	  :</div><div class='del'>-	  else</div><div class='del'>-	  # We have old collect2</div><div class='del'>-	  hardcode_direct=unsupported</div><div class='del'>-	  # It fails to find uninstalled libraries when the uninstalled</div><div class='del'>-	  # path is not listed in the libpath.  Setting hardcode_minus_L</div><div class='del'>-	  # to unsupported forces relinking</div><div class='del'>-	  hardcode_minus_L=yes</div><div class='del'>-	  hardcode_libdir_flag_spec='-L$libdir'</div><div class='del'>-	  hardcode_libdir_separator=</div><div class='del'>-	  fi</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	shared_flag='-shared'</div><div class='del'>-	if test "$aix_use_runtimelinking" = yes; then</div><div class='del'>-	  shared_flag="$shared_flag "'${wl}-G'</div><div class='del'>-	fi</div><div class='del'>-      else</div><div class='del'>-	# not using gcc</div><div class='del'>-	if test "$host_cpu" = ia64; then</div><div class='del'>-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release</div><div class='del'>-	# chokes on -Wl,-G. The following line is correct:</div><div class='del'>-	  shared_flag='-G'</div><div class='del'>-	else</div><div class='del'>-	  if test "$aix_use_runtimelinking" = yes; then</div><div class='del'>-	    shared_flag='${wl}-G'</div><div class='del'>-	  else</div><div class='del'>-	    shared_flag='${wl}-bM:SRE'</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      export_dynamic_flag_spec='${wl}-bexpall'</div><div class='del'>-      # It seems that -bexpall does not export symbols beginning with</div><div class='del'>-      # underscore (_), so it is better to generate a list of symbols to export.</div><div class='del'>-      always_export_symbols=yes</div><div class='del'>-      if test "$aix_use_runtimelinking" = yes; then</div><div class='del'>-	# Warning - without using the other runtime loading flags (-brtl),</div><div class='del'>-	# -berok will link without error, but may produce a broken library.</div><div class='del'>-	allow_undefined_flag='-berok'</div><div class='del'>-        # Determine the default libpath from the value encoded in an</div><div class='del'>-        # empty executable.</div><div class='del'>-        cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_link "$LINENO"; then :</div><div class='del'>-</div><div class='del'>-lt_aix_libpath_sed='</div><div class='del'>-    /Import File Strings/,/^$/ {</div><div class='del'>-	/^0/ {</div><div class='del'>-	    s/^0  *\(.*\)$/\1/</div><div class='del'>-	    p</div><div class='del'>-	}</div><div class='del'>-    }'</div><div class='del'>-aix_libpath=`dump -H conftest$ac_exeext 2&gt;/dev/null | $SED -n -e "$lt_aix_libpath_sed"`</div><div class='del'>-# Check for a 64-bit object if we didn't find anything.</div><div class='del'>-if test -z "$aix_libpath"; then</div><div class='del'>-  aix_libpath=`dump -HX64 conftest$ac_exeext 2&gt;/dev/null | $SED -n -e "$lt_aix_libpath_sed"`</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext \</div><div class='del'>-    conftest$ac_exeext conftest.$ac_ext</div><div class='del'>-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi</div><div class='del'>-</div><div class='del'>-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"</div><div class='del'>-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"</div><div class='del'>-      else</div><div class='del'>-	if test "$host_cpu" = ia64; then</div><div class='del'>-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'</div><div class='del'>-	  allow_undefined_flag="-z nodefs"</div><div class='del'>-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"</div><div class='del'>-	else</div><div class='del'>-	 # Determine the default libpath from the value encoded in an</div><div class='del'>-	 # empty executable.</div><div class='del'>-	 cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_link "$LINENO"; then :</div><div class='del'>-</div><div class='del'>-lt_aix_libpath_sed='</div><div class='del'>-    /Import File Strings/,/^$/ {</div><div class='del'>-	/^0/ {</div><div class='del'>-	    s/^0  *\(.*\)$/\1/</div><div class='del'>-	    p</div><div class='del'>-	}</div><div class='del'>-    }'</div><div class='del'>-aix_libpath=`dump -H conftest$ac_exeext 2&gt;/dev/null | $SED -n -e "$lt_aix_libpath_sed"`</div><div class='del'>-# Check for a 64-bit object if we didn't find anything.</div><div class='del'>-if test -z "$aix_libpath"; then</div><div class='del'>-  aix_libpath=`dump -HX64 conftest$ac_exeext 2&gt;/dev/null | $SED -n -e "$lt_aix_libpath_sed"`</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext \</div><div class='del'>-    conftest$ac_exeext conftest.$ac_ext</div><div class='del'>-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi</div><div class='del'>-</div><div class='del'>-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"</div><div class='del'>-	  # Warning - without using the other run time loading flags,</div><div class='del'>-	  # -berok will link without error, but may produce a broken library.</div><div class='del'>-	  no_undefined_flag=' ${wl}-bernotok'</div><div class='del'>-	  allow_undefined_flag=' ${wl}-berok'</div><div class='del'>-	  # Exported symbols can be pulled into shared objects from archives</div><div class='del'>-	  whole_archive_flag_spec='$convenience'</div><div class='del'>-	  archive_cmds_need_lc=yes</div><div class='del'>-	  # This is similar to how AIX traditionally builds its shared libraries.</div><div class='del'>-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'</div><div class='del'>-	fi</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    amigaos*)</div><div class='del'>-      case $host_cpu in</div><div class='del'>-      powerpc)</div><div class='del'>-            # see comment about AmigaOS4 .so support</div><div class='del'>-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'</div><div class='del'>-            archive_expsym_cmds=''</div><div class='del'>-        ;;</div><div class='del'>-      m68k)</div><div class='del'>-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" &gt; $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" &gt;&gt; $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" &gt;&gt; $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" &gt;&gt; $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir &amp;&amp; a2ixlibrary -32)'</div><div class='del'>-            hardcode_libdir_flag_spec='-L$libdir'</div><div class='del'>-            hardcode_minus_L=yes</div><div class='del'>-        ;;</div><div class='del'>-      esac</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    bsdi[45]*)</div><div class='del'>-      export_dynamic_flag_spec=-rdynamic</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    cygwin* | mingw* | pw32* | cegcc*)</div><div class='del'>-      # When not using gcc, we currently assume that we are using</div><div class='del'>-      # Microsoft Visual C++.</div><div class='del'>-      # hardcode_libdir_flag_spec is actually meaningless, as there is</div><div class='del'>-      # no search path for DLLs.</div><div class='del'>-      hardcode_libdir_flag_spec=' '</div><div class='del'>-      allow_undefined_flag=unsupported</div><div class='del'>-      # Tell ltmain to make .lib files, not .a files.</div><div class='del'>-      libext=lib</div><div class='del'>-      # Tell ltmain to make .dll files, not .so files.</div><div class='del'>-      shrext_cmds=".dll"</div><div class='del'>-      # FIXME: Setting linknames here is a bad hack.</div><div class='del'>-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='</div><div class='del'>-      # The linker will automatically build a .lib file if we build a DLL.</div><div class='del'>-      old_archive_from_new_cmds='true'</div><div class='del'>-      # FIXME: Should let the user specify the lib program.</div><div class='del'>-      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'</div><div class='del'>-      fix_srcfile_path='`cygpath -w "$srcfile"`'</div><div class='del'>-      enable_shared_with_static_runtimes=yes</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    darwin* | rhapsody*)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  archive_cmds_need_lc=no</div><div class='del'>-  hardcode_direct=no</div><div class='del'>-  hardcode_automatic=yes</div><div class='del'>-  hardcode_shlibpath_var=unsupported</div><div class='del'>-  whole_archive_flag_spec=''</div><div class='del'>-  link_all_deplibs=yes</div><div class='del'>-  allow_undefined_flag="$_lt_dar_allow_undefined"</div><div class='del'>-  case $cc_basename in</div><div class='del'>-     ifort*) _lt_dar_can_shared=yes ;;</div><div class='del'>-     *) _lt_dar_can_shared=$GCC ;;</div><div class='del'>-  esac</div><div class='del'>-  if test "$_lt_dar_can_shared" = "yes"; then</div><div class='del'>-    output_verbose_link_cmd=echo</div><div class='del'>-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"</div><div class='del'>-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"</div><div class='del'>-    archive_expsym_cmds="sed 's,^,_,' &lt; \$export_symbols &gt; \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"</div><div class='del'>-    module_expsym_cmds="sed -e 's,^,_,' &lt; \$export_symbols &gt; \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"</div><div class='del'>-</div><div class='del'>-  else</div><div class='del'>-  ld_shlibs=no</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    dgux*)</div><div class='del'>-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-      hardcode_libdir_flag_spec='-L$libdir'</div><div class='del'>-      hardcode_shlibpath_var=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    freebsd1*)</div><div class='del'>-      ld_shlibs=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor</div><div class='del'>-    # support.  Future versions do this automatically, but an explicit c++rt0.o</div><div class='del'>-    # does not break anything, and helps significantly (at the cost of a little</div><div class='del'>-    # extra space).</div><div class='del'>-    freebsd2.2*)</div><div class='del'>-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'</div><div class='del'>-      hardcode_libdir_flag_spec='-R$libdir'</div><div class='del'>-      hardcode_direct=yes</div><div class='del'>-      hardcode_shlibpath_var=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.</div><div class='del'>-    freebsd2*)</div><div class='del'>-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-      hardcode_direct=yes</div><div class='del'>-      hardcode_minus_L=yes</div><div class='del'>-      hardcode_shlibpath_var=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.</div><div class='del'>-    freebsd* | dragonfly*)</div><div class='del'>-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-      hardcode_libdir_flag_spec='-R$libdir'</div><div class='del'>-      hardcode_direct=yes</div><div class='del'>-      hardcode_shlibpath_var=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    hpux9*)</div><div class='del'>-      if test "$GCC" = yes; then</div><div class='del'>-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'</div><div class='del'>-      else</div><div class='del'>-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'</div><div class='del'>-      fi</div><div class='del'>-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'</div><div class='del'>-      hardcode_libdir_separator=:</div><div class='del'>-      hardcode_direct=yes</div><div class='del'>-</div><div class='del'>-      # hardcode_minus_L: Not really in the search PATH,</div><div class='del'>-      # but as the default location of the library.</div><div class='del'>-      hardcode_minus_L=yes</div><div class='del'>-      export_dynamic_flag_spec='${wl}-E'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    hpux10*)</div><div class='del'>-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then</div><div class='del'>-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-      else</div><div class='del'>-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-      fi</div><div class='del'>-      if test "$with_gnu_ld" = no; then</div><div class='del'>-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'</div><div class='del'>-	hardcode_libdir_flag_spec_ld='+b $libdir'</div><div class='del'>-	hardcode_libdir_separator=:</div><div class='del'>-	hardcode_direct=yes</div><div class='del'>-	hardcode_direct_absolute=yes</div><div class='del'>-	export_dynamic_flag_spec='${wl}-E'</div><div class='del'>-	# hardcode_minus_L: Not really in the search PATH,</div><div class='del'>-	# but as the default location of the library.</div><div class='del'>-	hardcode_minus_L=yes</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    hpux11*)</div><div class='del'>-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then</div><div class='del'>-	case $host_cpu in</div><div class='del'>-	hppa*64*)</div><div class='del'>-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  ;;</div><div class='del'>-	ia64*)</div><div class='del'>-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  ;;</div><div class='del'>-	*)</div><div class='del'>-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      else</div><div class='del'>-	case $host_cpu in</div><div class='del'>-	hppa*64*)</div><div class='del'>-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  ;;</div><div class='del'>-	ia64*)</div><div class='del'>-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  ;;</div><div class='del'>-	*)</div><div class='del'>-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-      if test "$with_gnu_ld" = no; then</div><div class='del'>-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'</div><div class='del'>-	hardcode_libdir_separator=:</div><div class='del'>-</div><div class='del'>-	case $host_cpu in</div><div class='del'>-	hppa*64*|ia64*)</div><div class='del'>-	  hardcode_direct=no</div><div class='del'>-	  hardcode_shlibpath_var=no</div><div class='del'>-	  ;;</div><div class='del'>-	*)</div><div class='del'>-	  hardcode_direct=yes</div><div class='del'>-	  hardcode_direct_absolute=yes</div><div class='del'>-	  export_dynamic_flag_spec='${wl}-E'</div><div class='del'>-</div><div class='del'>-	  # hardcode_minus_L: Not really in the search PATH,</div><div class='del'>-	  # but as the default location of the library.</div><div class='del'>-	  hardcode_minus_L=yes</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    irix5* | irix6* | nonstopux*)</div><div class='del'>-      if test "$GCC" = yes; then</div><div class='del'>-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" &amp;&amp; $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'</div><div class='del'>-	# Try to use the -exported_symbol ld option, if it does not</div><div class='del'>-	# work, assume that -exports_file does not work either and</div><div class='del'>-	# implicitly export all symbols.</div><div class='del'>-        save_LDFLAGS="$LDFLAGS"</div><div class='del'>-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"</div><div class='del'>-        cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-int foo(void) {}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_link "$LINENO"; then :</div><div class='del'>-  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" &amp;&amp; $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext \</div><div class='del'>-    conftest$ac_exeext conftest.$ac_ext</div><div class='del'>-        LDFLAGS="$save_LDFLAGS"</div><div class='del'>-      else</div><div class='del'>-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" &amp;&amp; $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'</div><div class='del'>-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" &amp;&amp; $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'</div><div class='del'>-      fi</div><div class='del'>-      archive_cmds_need_lc='no'</div><div class='del'>-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'</div><div class='del'>-      hardcode_libdir_separator=:</div><div class='del'>-      inherit_rpath=yes</div><div class='del'>-      link_all_deplibs=yes</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    netbsd*)</div><div class='del'>-      if echo __ELF__ | $CC -E - | $GREP __ELF__ &gt;/dev/null; then</div><div class='del'>-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out</div><div class='del'>-      else</div><div class='del'>-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF</div><div class='del'>-      fi</div><div class='del'>-      hardcode_libdir_flag_spec='-R$libdir'</div><div class='del'>-      hardcode_direct=yes</div><div class='del'>-      hardcode_shlibpath_var=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    newsos6)</div><div class='del'>-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-      hardcode_direct=yes</div><div class='del'>-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'</div><div class='del'>-      hardcode_libdir_separator=:</div><div class='del'>-      hardcode_shlibpath_var=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    *nto* | *qnx*)</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    openbsd*)</div><div class='del'>-      if test -f /usr/libexec/ld.so; then</div><div class='del'>-	hardcode_direct=yes</div><div class='del'>-	hardcode_shlibpath_var=no</div><div class='del'>-	hardcode_direct_absolute=yes</div><div class='del'>-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then</div><div class='del'>-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'</div><div class='del'>-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'</div><div class='del'>-	  export_dynamic_flag_spec='${wl}-E'</div><div class='del'>-	else</div><div class='del'>-	  case $host_os in</div><div class='del'>-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)</div><div class='del'>-	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-	     hardcode_libdir_flag_spec='-R$libdir'</div><div class='del'>-	     ;;</div><div class='del'>-	   *)</div><div class='del'>-	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'</div><div class='del'>-	     ;;</div><div class='del'>-	  esac</div><div class='del'>-	fi</div><div class='del'>-      else</div><div class='del'>-	ld_shlibs=no</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    os2*)</div><div class='del'>-      hardcode_libdir_flag_spec='-L$libdir'</div><div class='del'>-      hardcode_minus_L=yes</div><div class='del'>-      allow_undefined_flag=unsupported</div><div class='del'>-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" &gt; $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" &gt;&gt; $output_objdir/$libname.def~$ECHO DATA &gt;&gt; $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" &gt;&gt; $output_objdir/$libname.def~$ECHO EXPORTS &gt;&gt; $output_objdir/$libname.def~emxexp $libobjs &gt;&gt; $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'</div><div class='del'>-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    osf3*)</div><div class='del'>-      if test "$GCC" = yes; then</div><div class='del'>-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'</div><div class='del'>-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" &amp;&amp; $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'</div><div class='del'>-      else</div><div class='del'>-	allow_undefined_flag=' -expect_unresolved \*'</div><div class='del'>-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" &amp;&amp; $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'</div><div class='del'>-      fi</div><div class='del'>-      archive_cmds_need_lc='no'</div><div class='del'>-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'</div><div class='del'>-      hardcode_libdir_separator=:</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    osf4* | osf5*)	# as osf3* with the addition of -msym flag</div><div class='del'>-      if test "$GCC" = yes; then</div><div class='del'>-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'</div><div class='del'>-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" &amp;&amp; $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'</div><div class='del'>-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'</div><div class='del'>-      else</div><div class='del'>-	allow_undefined_flag=' -expect_unresolved \*'</div><div class='del'>-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" &amp;&amp; $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'</div><div class='del'>-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" &gt;&gt; $lib.exp; done; printf "%s\\n" "-hidden"&gt;&gt; $lib.exp~</div><div class='del'>-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" &amp;&amp; $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'</div><div class='del'>-</div><div class='del'>-	# Both c and cxx compiler support -rpath directly</div><div class='del'>-	hardcode_libdir_flag_spec='-rpath $libdir'</div><div class='del'>-      fi</div><div class='del'>-      archive_cmds_need_lc='no'</div><div class='del'>-      hardcode_libdir_separator=:</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    solaris*)</div><div class='del'>-      no_undefined_flag=' -z defs'</div><div class='del'>-      if test "$GCC" = yes; then</div><div class='del'>-	wlarc='${wl}'</div><div class='del'>-	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	archive_expsym_cmds='echo "{ global:" &gt; $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" &gt;&gt; $lib.exp~echo "local: *; };" &gt;&gt; $lib.exp~</div><div class='del'>-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'</div><div class='del'>-      else</div><div class='del'>-	case `$CC -V 2&gt;&amp;1` in</div><div class='del'>-	*"Compilers 5.0"*)</div><div class='del'>-	  wlarc=''</div><div class='del'>-	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-	  archive_expsym_cmds='echo "{ global:" &gt; $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" &gt;&gt; $lib.exp~echo "local: *; };" &gt;&gt; $lib.exp~</div><div class='del'>-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'</div><div class='del'>-	  ;;</div><div class='del'>-	*)</div><div class='del'>-	  wlarc='${wl}'</div><div class='del'>-	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	  archive_expsym_cmds='echo "{ global:" &gt; $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" &gt;&gt; $lib.exp~echo "local: *; };" &gt;&gt; $lib.exp~</div><div class='del'>-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-      hardcode_libdir_flag_spec='-R$libdir'</div><div class='del'>-      hardcode_shlibpath_var=no</div><div class='del'>-      case $host_os in</div><div class='del'>-      solaris2.[0-5] | solaris2.[0-5].*) ;;</div><div class='del'>-      *)</div><div class='del'>-	# The compiler driver will combine and reorder linker options,</div><div class='del'>-	# but understands `-z linker_flag'.  GCC discards it without `$wl',</div><div class='del'>-	# but is careful enough not to reorder.</div><div class='del'>-	# Supported since Solaris 2.6 (maybe 2.5.1?)</div><div class='del'>-	if test "$GCC" = yes; then</div><div class='del'>-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'</div><div class='del'>-	else</div><div class='del'>-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      link_all_deplibs=yes</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sunos4*)</div><div class='del'>-      if test "x$host_vendor" = xsequent; then</div><div class='del'>-	# Use $CC to link under sequent, because it throws in some extra .o</div><div class='del'>-	# files that make .init and .fini sections work.</div><div class='del'>-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-      else</div><div class='del'>-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-      fi</div><div class='del'>-      hardcode_libdir_flag_spec='-L$libdir'</div><div class='del'>-      hardcode_direct=yes</div><div class='del'>-      hardcode_minus_L=yes</div><div class='del'>-      hardcode_shlibpath_var=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv4)</div><div class='del'>-      case $host_vendor in</div><div class='del'>-	sni)</div><div class='del'>-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-	  hardcode_direct=yes # is this really true???</div><div class='del'>-	;;</div><div class='del'>-	siemens)</div><div class='del'>-	  ## LD is ld it makes a PLAMLIB</div><div class='del'>-	  ## CC just makes a GrossModule.</div><div class='del'>-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-	  reload_cmds='$CC -r -o $output$reload_objs'</div><div class='del'>-	  hardcode_direct=no</div><div class='del'>-        ;;</div><div class='del'>-	motorola)</div><div class='del'>-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      runpath_var='LD_RUN_PATH'</div><div class='del'>-      hardcode_shlibpath_var=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv4.3*)</div><div class='del'>-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-      hardcode_shlibpath_var=no</div><div class='del'>-      export_dynamic_flag_spec='-Bexport'</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv4*MP*)</div><div class='del'>-      if test -d /usr/nec; then</div><div class='del'>-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-	hardcode_shlibpath_var=no</div><div class='del'>-	runpath_var=LD_RUN_PATH</div><div class='del'>-	hardcode_runpath_var=yes</div><div class='del'>-	ld_shlibs=yes</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)</div><div class='del'>-      no_undefined_flag='${wl}-z,text'</div><div class='del'>-      archive_cmds_need_lc=no</div><div class='del'>-      hardcode_shlibpath_var=no</div><div class='del'>-      runpath_var='LD_RUN_PATH'</div><div class='del'>-</div><div class='del'>-      if test "$GCC" = yes; then</div><div class='del'>-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-      else</div><div class='del'>-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    sysv5* | sco3.2v5* | sco5v6*)</div><div class='del'>-      # Note: We can NOT use -z defs as we might desire, because we do not</div><div class='del'>-      # link with -lc, and that would cause any symbols used from libc to</div><div class='del'>-      # always be unresolved, which means just about no library would</div><div class='del'>-      # ever link correctly.  If we're not using GNU ld we use -z text</div><div class='del'>-      # though, which does catch some bad symbols but isn't as heavy-handed</div><div class='del'>-      # as -z defs.</div><div class='del'>-      no_undefined_flag='${wl}-z,text'</div><div class='del'>-      allow_undefined_flag='${wl}-z,nodefs'</div><div class='del'>-      archive_cmds_need_lc=no</div><div class='del'>-      hardcode_shlibpath_var=no</div><div class='del'>-      hardcode_libdir_flag_spec='${wl}-R,$libdir'</div><div class='del'>-      hardcode_libdir_separator=':'</div><div class='del'>-      link_all_deplibs=yes</div><div class='del'>-      export_dynamic_flag_spec='${wl}-Bexport'</div><div class='del'>-      runpath_var='LD_RUN_PATH'</div><div class='del'>-</div><div class='del'>-      if test "$GCC" = yes; then</div><div class='del'>-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-      else</div><div class='del'>-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    uts4*)</div><div class='del'>-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'</div><div class='del'>-      hardcode_libdir_flag_spec='-L$libdir'</div><div class='del'>-      hardcode_shlibpath_var=no</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    *)</div><div class='del'>-      ld_shlibs=no</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    if test x$host_vendor = xsni; then</div><div class='del'>-      case $host in</div><div class='del'>-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)</div><div class='del'>-	export_dynamic_flag_spec='${wl}-Blargedynsym'</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-    fi</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" &gt;&amp;5</div><div class='del'>-$as_echo "$ld_shlibs" &gt;&amp;6; }</div><div class='del'>-test "$ld_shlibs" = no &amp;&amp; can_build_shared=no</div><div class='del'>-</div><div class='del'>-with_gnu_ld=$with_gnu_ld</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Do we need to explicitly link libc?</div><div class='del'>-#</div><div class='del'>-case "x$archive_cmds_need_lc" in</div><div class='del'>-x|xyes)</div><div class='del'>-  # Assume -lc should be added</div><div class='del'>-  archive_cmds_need_lc=yes</div><div class='del'>-</div><div class='del'>-  if test "$enable_shared" = yes &amp;&amp; test "$GCC" = yes; then</div><div class='del'>-    case $archive_cmds in</div><div class='del'>-    *'~'*)</div><div class='del'>-      # FIXME: we may have to deal with multi-command sequences.</div><div class='del'>-      ;;</div><div class='del'>-    '$CC '*)</div><div class='del'>-      # Test whether the compiler implicitly links with -lc since on some</div><div class='del'>-      # systems, -lgcc has to come before -lc. If gcc already passes -lc</div><div class='del'>-      # to ld, don't add -lc before -lgcc.</div><div class='del'>-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether -lc should be explicitly linked in... " &gt;&amp;6; }</div><div class='del'>-      $RM conftest*</div><div class='del'>-      echo "$lt_simple_compile_test_code" &gt; conftest.$ac_ext</div><div class='del'>-</div><div class='del'>-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } &gt;&amp;5</div><div class='del'>-  (eval $ac_compile) 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; } 2&gt;conftest.err; then</div><div class='del'>-        soname=conftest</div><div class='del'>-        lib=conftest</div><div class='del'>-        libobjs=conftest.$ac_objext</div><div class='del'>-        deplibs=</div><div class='del'>-        wl=$lt_prog_compiler_wl</div><div class='del'>-	pic_flag=$lt_prog_compiler_pic</div><div class='del'>-        compiler_flags=-v</div><div class='del'>-        linker_flags=-v</div><div class='del'>-        verstring=</div><div class='del'>-        output_objdir=.</div><div class='del'>-        libname=conftest</div><div class='del'>-        lt_save_allow_undefined_flag=$allow_undefined_flag</div><div class='del'>-        allow_undefined_flag=</div><div class='del'>-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\&gt;\&amp;1 \| $GREP \" -lc \" \&gt;/dev/null 2\&gt;\&amp;1\""; } &gt;&amp;5</div><div class='del'>-  (eval $archive_cmds 2\&gt;\&amp;1 \| $GREP \" -lc \" \&gt;/dev/null 2\&gt;\&amp;1) 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; }</div><div class='del'>-        then</div><div class='del'>-	  archive_cmds_need_lc=no</div><div class='del'>-        else</div><div class='del'>-	  archive_cmds_need_lc=yes</div><div class='del'>-        fi</div><div class='del'>-        allow_undefined_flag=$lt_save_allow_undefined_flag</div><div class='del'>-      else</div><div class='del'>-        cat conftest.err 1&gt;&amp;5</div><div class='del'>-      fi</div><div class='del'>-      $RM conftest*</div><div class='del'>-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" &gt;&amp;5</div><div class='del'>-$as_echo "$archive_cmds_need_lc" &gt;&amp;6; }</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking dynamic linker characteristics... " &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-if test "$GCC" = yes; then</div><div class='del'>-  case $host_os in</div><div class='del'>-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;</div><div class='del'>-    *) lt_awk_arg="/^libraries:/" ;;</div><div class='del'>-  esac</div><div class='del'>-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`</div><div class='del'>-  if $ECHO "$lt_search_path_spec" | $GREP ';' &gt;/dev/null ; then</div><div class='del'>-    # if the path contains ";" then we assume it to be the separator</div><div class='del'>-    # otherwise default to the standard path separator (i.e. ":") - it is</div><div class='del'>-    # assumed that no part of a normal pathname contains ";" but that should</div><div class='del'>-    # okay in the real world where ";" in dirpaths is itself problematic.</div><div class='del'>-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`</div><div class='del'>-  else</div><div class='del'>-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`</div><div class='del'>-  fi</div><div class='del'>-  # Ok, now we have the path, separated by spaces, we can step through it</div><div class='del'>-  # and add multilib dir if necessary.</div><div class='del'>-  lt_tmp_lt_search_path_spec=</div><div class='del'>-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2&gt;/dev/null`</div><div class='del'>-  for lt_sys_path in $lt_search_path_spec; do</div><div class='del'>-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then</div><div class='del'>-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"</div><div class='del'>-    else</div><div class='del'>-      test -d "$lt_sys_path" &amp;&amp; \</div><div class='del'>-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"</div><div class='del'>-    fi</div><div class='del'>-  done</div><div class='del'>-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '</div><div class='del'>-BEGIN {RS=" "; FS="/|\n";} {</div><div class='del'>-  lt_foo="";</div><div class='del'>-  lt_count=0;</div><div class='del'>-  for (lt_i = NF; lt_i &gt; 0; lt_i--) {</div><div class='del'>-    if ($lt_i != "" &amp;&amp; $lt_i != ".") {</div><div class='del'>-      if ($lt_i == "..") {</div><div class='del'>-        lt_count++;</div><div class='del'>-      } else {</div><div class='del'>-        if (lt_count == 0) {</div><div class='del'>-          lt_foo="/" $lt_i lt_foo;</div><div class='del'>-        } else {</div><div class='del'>-          lt_count--;</div><div class='del'>-        }</div><div class='del'>-      }</div><div class='del'>-    }</div><div class='del'>-  }</div><div class='del'>-  if (lt_foo != "") { lt_freq[lt_foo]++; }</div><div class='del'>-  if (lt_freq[lt_foo] == 1) { print lt_foo; }</div><div class='del'>-}'`</div><div class='del'>-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`</div><div class='del'>-else</div><div class='del'>-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"</div><div class='del'>-fi</div><div class='del'>-library_names_spec=</div><div class='del'>-libname_spec='lib$name'</div><div class='del'>-soname_spec=</div><div class='del'>-shrext_cmds=".so"</div><div class='del'>-postinstall_cmds=</div><div class='del'>-postuninstall_cmds=</div><div class='del'>-finish_cmds=</div><div class='del'>-finish_eval=</div><div class='del'>-shlibpath_var=</div><div class='del'>-shlibpath_overrides_runpath=unknown</div><div class='del'>-version_type=none</div><div class='del'>-dynamic_linker="$host_os ld.so"</div><div class='del'>-sys_lib_dlsearch_path_spec="/lib /usr/lib"</div><div class='del'>-need_lib_prefix=unknown</div><div class='del'>-hardcode_into_libs=no</div><div class='del'>-</div><div class='del'>-# when you set need_version to no, make sure it does not cause -set_version</div><div class='del'>-# flags to be left without arguments</div><div class='del'>-need_version=unknown</div><div class='del'>-</div><div class='del'>-case $host_os in</div><div class='del'>-aix3*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'</div><div class='del'>-  shlibpath_var=LIBPATH</div><div class='del'>-</div><div class='del'>-  # AIX 3 has no versioning support, so we append a major version to the name.</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-aix[4-9]*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  if test "$host_cpu" = ia64; then</div><div class='del'>-    # AIX 5 supports IA64</div><div class='del'>-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'</div><div class='del'>-    shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  else</div><div class='del'>-    # With GCC up to 2.95.x, collect2 would create an import file</div><div class='del'>-    # for dependence libraries.  The import file would start with</div><div class='del'>-    # the line `#! .'.  This would cause the generated library to</div><div class='del'>-    # depend on `.', always an invalid library.  This was fixed in</div><div class='del'>-    # development snapshots of GCC prior to 3.0.</div><div class='del'>-    case $host_os in</div><div class='del'>-      aix4 | aix4.[01] | aix4.[01].*)</div><div class='del'>-      if { echo '#if __GNUC__ &gt; 2 || (__GNUC__ == 2 &amp;&amp; __GNUC_MINOR__ &gt;= 97)'</div><div class='del'>-	   echo ' yes '</div><div class='del'>-	   echo '#endif'; } | ${CC} -E - | $GREP yes &gt; /dev/null; then</div><div class='del'>-	:</div><div class='del'>-      else</div><div class='del'>-	can_build_shared=no</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct</div><div class='del'>-    # soname into executable. Probably we can add versioning support to</div><div class='del'>-    # collect2, so additional links can be useful in future.</div><div class='del'>-    if test "$aix_use_runtimelinking" = yes; then</div><div class='del'>-      # If using run time linking (on AIX 4.2 or later) use lib&lt;name&gt;.so</div><div class='del'>-      # instead of lib&lt;name&gt;.a to let people know that these are not</div><div class='del'>-      # typical AIX shared libraries.</div><div class='del'>-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-    else</div><div class='del'>-      # We preserve .a as extension for shared libraries through AIX4.2</div><div class='del'>-      # and later when we are not doing run time linking.</div><div class='del'>-      library_names_spec='${libname}${release}.a $libname.a'</div><div class='del'>-      soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-    fi</div><div class='del'>-    shlibpath_var=LIBPATH</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-amigaos*)</div><div class='del'>-  case $host_cpu in</div><div class='del'>-  powerpc)</div><div class='del'>-    # Since July 2007 AmigaOS4 officially supports .so libraries.</div><div class='del'>-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.</div><div class='del'>-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-    ;;</div><div class='del'>-  m68k)</div><div class='del'>-    library_names_spec='$libname.ixlibrary $libname.a'</div><div class='del'>-    # Create ${libname}_ixlibrary.a entries in /sys/libs.</div><div class='del'>-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2&gt;/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs &amp;&amp; $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs &amp;&amp; $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-beos*)</div><div class='del'>-  library_names_spec='${libname}${shared_ext}'</div><div class='del'>-  dynamic_linker="$host_os ld.so"</div><div class='del'>-  shlibpath_var=LIBRARY_PATH</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-bsdi[45]*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"</div><div class='del'>-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"</div><div class='del'>-  # the default ld.so.conf also contains /usr/contrib/lib and</div><div class='del'>-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow</div><div class='del'>-  # libtool to hard-code these into programs</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-cygwin* | mingw* | pw32* | cegcc*)</div><div class='del'>-  version_type=windows</div><div class='del'>-  shrext_cmds=".dll"</div><div class='del'>-  need_version=no</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-</div><div class='del'>-  case $GCC,$host_os in</div><div class='del'>-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)</div><div class='del'>-    library_names_spec='$libname.dll.a'</div><div class='del'>-    # DLL is installed to $(libdir)/../bin by postinstall_cmds</div><div class='del'>-    postinstall_cmds='base_file=`basename \${file}`~</div><div class='del'>-      dlpath=`$SHELL 2&gt;&amp;1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~</div><div class='del'>-      dldir=$destdir/`dirname \$dlpath`~</div><div class='del'>-      test -d \$dldir || mkdir -p \$dldir~</div><div class='del'>-      $install_prog $dir/$dlname \$dldir/$dlname~</div><div class='del'>-      chmod a+x \$dldir/$dlname~</div><div class='del'>-      if test -n '\''$stripme'\'' &amp;&amp; test -n '\''$striplib'\''; then</div><div class='del'>-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;</div><div class='del'>-      fi'</div><div class='del'>-    postuninstall_cmds='dldll=`$SHELL 2&gt;&amp;1 -c '\''. $file; echo \$dlname'\''`~</div><div class='del'>-      dlpath=$dir/\$dldll~</div><div class='del'>-       $RM \$dlpath'</div><div class='del'>-    shlibpath_overrides_runpath=yes</div><div class='del'>-</div><div class='del'>-    case $host_os in</div><div class='del'>-    cygwin*)</div><div class='del'>-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'</div><div class='del'>-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'</div><div class='del'>-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"</div><div class='del'>-      ;;</div><div class='del'>-    mingw* | cegcc*)</div><div class='del'>-      # MinGW DLLs use traditional 'lib' prefix</div><div class='del'>-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'</div><div class='del'>-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`</div><div class='del'>-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' &gt;/dev/null; then</div><div class='del'>-        # It is most probably a Windows format PATH printed by</div><div class='del'>-        # mingw gcc, but we are running on Cygwin. Gcc prints its search</div><div class='del'>-        # path with ; separators, and with drive letters. We can handle the</div><div class='del'>-        # drive letters (cygwin fileutils understands them), so leave them,</div><div class='del'>-        # especially as we might pass files found there to a mingw objdump,</div><div class='del'>-        # which wouldn't understand a cygwinified path. Ahh.</div><div class='del'>-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`</div><div class='del'>-      else</div><div class='del'>-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-    pw32*)</div><div class='del'>-      # pw32 DLLs use 'pw' prefix rather than 'lib'</div><div class='del'>-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  *)</div><div class='del'>-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  dynamic_linker='Win32 ld.exe'</div><div class='del'>-  # FIXME: first we should search . and the directory the executable is in</div><div class='del'>-  shlibpath_var=PATH</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-darwin* | rhapsody*)</div><div class='del'>-  dynamic_linker="$host_os dyld"</div><div class='del'>-  version_type=darwin</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'</div><div class='del'>-  soname_spec='${libname}${release}${major}$shared_ext'</div><div class='del'>-  shlibpath_overrides_runpath=yes</div><div class='del'>-  shlibpath_var=DYLD_LIBRARY_PATH</div><div class='del'>-  shrext_cmds='`test .$module = .yes &amp;&amp; echo .so || echo .dylib`'</div><div class='del'>-</div><div class='del'>-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"</div><div class='del'>-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-dgux*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-freebsd1*)</div><div class='del'>-  dynamic_linker=no</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-freebsd* | dragonfly*)</div><div class='del'>-  # DragonFly does not have aout.  When/if they implement a new</div><div class='del'>-  # versioning mechanism, adjust this.</div><div class='del'>-  if test -x /usr/bin/objformat; then</div><div class='del'>-    objformat=`/usr/bin/objformat`</div><div class='del'>-  else</div><div class='del'>-    case $host_os in</div><div class='del'>-    freebsd[123]*) objformat=aout ;;</div><div class='del'>-    *) objformat=elf ;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-  version_type=freebsd-$objformat</div><div class='del'>-  case $version_type in</div><div class='del'>-    freebsd-elf*)</div><div class='del'>-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'</div><div class='del'>-      need_version=no</div><div class='del'>-      need_lib_prefix=no</div><div class='del'>-      ;;</div><div class='del'>-    freebsd-*)</div><div class='del'>-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'</div><div class='del'>-      need_version=yes</div><div class='del'>-      ;;</div><div class='del'>-  esac</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  case $host_os in</div><div class='del'>-  freebsd2*)</div><div class='del'>-    shlibpath_overrides_runpath=yes</div><div class='del'>-    ;;</div><div class='del'>-  freebsd3.[01]* | freebsdelf3.[01]*)</div><div class='del'>-    shlibpath_overrides_runpath=yes</div><div class='del'>-    hardcode_into_libs=yes</div><div class='del'>-    ;;</div><div class='del'>-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \</div><div class='del'>-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)</div><div class='del'>-    shlibpath_overrides_runpath=no</div><div class='del'>-    hardcode_into_libs=yes</div><div class='del'>-    ;;</div><div class='del'>-  *) # from 4.6 on, and DragonFly</div><div class='del'>-    shlibpath_overrides_runpath=yes</div><div class='del'>-    hardcode_into_libs=yes</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-gnu*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-hpux9* | hpux10* | hpux11*)</div><div class='del'>-  # Give a soname corresponding to the major version so that dld.sl refuses to</div><div class='del'>-  # link against other versions.</div><div class='del'>-  version_type=sunos</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  case $host_cpu in</div><div class='del'>-  ia64*)</div><div class='del'>-    shrext_cmds='.so'</div><div class='del'>-    hardcode_into_libs=yes</div><div class='del'>-    dynamic_linker="$host_os dld.so"</div><div class='del'>-    shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.</div><div class='del'>-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-    soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-    if test "X$HPUX_IA64_MODE" = X32; then</div><div class='del'>-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"</div><div class='del'>-    else</div><div class='del'>-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"</div><div class='del'>-    fi</div><div class='del'>-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec</div><div class='del'>-    ;;</div><div class='del'>-  hppa*64*)</div><div class='del'>-    shrext_cmds='.sl'</div><div class='del'>-    hardcode_into_libs=yes</div><div class='del'>-    dynamic_linker="$host_os dld.sl"</div><div class='del'>-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH</div><div class='del'>-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.</div><div class='del'>-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-    soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"</div><div class='del'>-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    shrext_cmds='.sl'</div><div class='del'>-    dynamic_linker="$host_os dld.sl"</div><div class='del'>-    shlibpath_var=SHLIB_PATH</div><div class='del'>-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH</div><div class='del'>-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-    soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  # HP-UX runs *really* slowly unless shared libraries are mode 555.</div><div class='del'>-  postinstall_cmds='chmod 555 $lib'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-interix[3-9]*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=no</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-irix5* | irix6* | nonstopux*)</div><div class='del'>-  case $host_os in</div><div class='del'>-    nonstopux*) version_type=nonstopux ;;</div><div class='del'>-    *)</div><div class='del'>-	if test "$lt_cv_prog_gnu_ld" = yes; then</div><div class='del'>-		version_type=linux</div><div class='del'>-	else</div><div class='del'>-		version_type=irix</div><div class='del'>-	fi ;;</div><div class='del'>-  esac</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'</div><div class='del'>-  case $host_os in</div><div class='del'>-  irix5* | nonstopux*)</div><div class='del'>-    libsuff= shlibsuff=</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    case $LD in # libtool.m4 will add one of these switches to LD</div><div class='del'>-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")</div><div class='del'>-      libsuff= shlibsuff= libmagic=32-bit;;</div><div class='del'>-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")</div><div class='del'>-      libsuff=32 shlibsuff=N32 libmagic=N32;;</div><div class='del'>-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")</div><div class='del'>-      libsuff=64 shlibsuff=64 libmagic=64-bit;;</div><div class='del'>-    *) libsuff= shlibsuff= libmagic=never-match;;</div><div class='del'>-    esac</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH</div><div class='del'>-  shlibpath_overrides_runpath=no</div><div class='del'>-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"</div><div class='del'>-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-# No shared lib support for Linux oldld, aout, or coff.</div><div class='del'>-linux*oldld* | linux*aout* | linux*coff*)</div><div class='del'>-  dynamic_linker=no</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-# This must be Linux ELF.</div><div class='del'>-linux* | k*bsd*-gnu)</div><div class='del'>-  version_type=linux</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=no</div><div class='del'>-  # Some binutils ld are patched to set DT_RUNPATH</div><div class='del'>-  save_LDFLAGS=$LDFLAGS</div><div class='del'>-  save_libdir=$libdir</div><div class='del'>-  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \</div><div class='del'>-       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_link "$LINENO"; then :</div><div class='del'>-  if  ($OBJDUMP -p conftest$ac_exeext) 2&gt;/dev/null | grep "RUNPATH.*$libdir" &gt;/dev/null; then :</div><div class='del'>-  shlibpath_overrides_runpath=yes</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext \</div><div class='del'>-    conftest$ac_exeext conftest.$ac_ext</div><div class='del'>-  LDFLAGS=$save_LDFLAGS</div><div class='del'>-  libdir=$save_libdir</div><div class='del'>-</div><div class='del'>-  # This implies no fast_install, which is unacceptable.</div><div class='del'>-  # Some rework will be needed to allow for fast_install</div><div class='del'>-  # before this can be enabled.</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-</div><div class='del'>-  # Append ld.so.conf contents to the search path</div><div class='del'>-  if test -f /etc/ld.so.conf; then</div><div class='del'>-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2&gt;/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' &lt; /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`</div><div class='del'>-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  # We used to test for /lib/ld.so.1 and disable shared libraries on</div><div class='del'>-  # powerpc, because MkLinux only supported shared libraries with the</div><div class='del'>-  # GNU dynamic linker.  Since this was broken with cross compilers,</div><div class='del'>-  # most powerpc-linux boxes support dynamic linking these days and</div><div class='del'>-  # people can always --disable-shared, the test was removed, and we</div><div class='del'>-  # assume the GNU/Linux dynamic linker is in use.</div><div class='del'>-  dynamic_linker='GNU/Linux ld.so'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-netbsd*)</div><div class='del'>-  version_type=sunos</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  if echo __ELF__ | $CC -E - | $GREP __ELF__ &gt;/dev/null; then</div><div class='del'>-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'</div><div class='del'>-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'</div><div class='del'>-    dynamic_linker='NetBSD (a.out) ld.so'</div><div class='del'>-  else</div><div class='del'>-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'</div><div class='del'>-    soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-    dynamic_linker='NetBSD ld.elf_so'</div><div class='del'>-  fi</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=yes</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-newsos6)</div><div class='del'>-  version_type=linux</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=yes</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-*nto* | *qnx*)</div><div class='del'>-  version_type=qnx</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=no</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  dynamic_linker='ldqnx.so'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-openbsd*)</div><div class='del'>-  version_type=sunos</div><div class='del'>-  sys_lib_dlsearch_path_spec="/usr/lib"</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.</div><div class='del'>-  case $host_os in</div><div class='del'>-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;</div><div class='del'>-    *)				need_version=no  ;;</div><div class='del'>-  esac</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'</div><div class='del'>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then</div><div class='del'>-    case $host_os in</div><div class='del'>-      openbsd2.[89] | openbsd2.[89].*)</div><div class='del'>-	shlibpath_overrides_runpath=no</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-	shlibpath_overrides_runpath=yes</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-  else</div><div class='del'>-    shlibpath_overrides_runpath=yes</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-os2*)</div><div class='del'>-  libname_spec='$name'</div><div class='del'>-  shrext_cmds=".dll"</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  library_names_spec='$libname${shared_ext} $libname.a'</div><div class='del'>-  dynamic_linker='OS/2 ld.exe'</div><div class='del'>-  shlibpath_var=LIBPATH</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-osf3* | osf4* | osf5*)</div><div class='del'>-  version_type=osf</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"</div><div class='del'>-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-rdos*)</div><div class='del'>-  dynamic_linker=no</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-solaris*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=yes</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  # ldd complains unless libraries are executable</div><div class='del'>-  postinstall_cmds='chmod +x $lib'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-sunos4*)</div><div class='del'>-  version_type=sunos</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'</div><div class='del'>-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=yes</div><div class='del'>-  if test "$with_gnu_ld" = yes; then</div><div class='del'>-    need_lib_prefix=no</div><div class='del'>-  fi</div><div class='del'>-  need_version=yes</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-sysv4 | sysv4.3*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  case $host_vendor in</div><div class='del'>-    sni)</div><div class='del'>-      shlibpath_overrides_runpath=no</div><div class='del'>-      need_lib_prefix=no</div><div class='del'>-      runpath_var=LD_RUN_PATH</div><div class='del'>-      ;;</div><div class='del'>-    siemens)</div><div class='del'>-      need_lib_prefix=no</div><div class='del'>-      ;;</div><div class='del'>-    motorola)</div><div class='del'>-      need_lib_prefix=no</div><div class='del'>-      need_version=no</div><div class='del'>-      shlibpath_overrides_runpath=no</div><div class='del'>-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'</div><div class='del'>-      ;;</div><div class='del'>-  esac</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-sysv4*MP*)</div><div class='del'>-  if test -d /usr/nec ;then</div><div class='del'>-    version_type=linux</div><div class='del'>-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'</div><div class='del'>-    soname_spec='$libname${shared_ext}.$major'</div><div class='del'>-    shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)</div><div class='del'>-  version_type=freebsd-elf</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=yes</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  if test "$with_gnu_ld" = yes; then</div><div class='del'>-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'</div><div class='del'>-  else</div><div class='del'>-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'</div><div class='del'>-    case $host_os in</div><div class='del'>-      sco3.2v5*)</div><div class='del'>-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"</div><div class='del'>-	;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-  sys_lib_dlsearch_path_spec='/usr/lib'</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-tpf*)</div><div class='del'>-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.</div><div class='del'>-  version_type=linux</div><div class='del'>-  need_lib_prefix=no</div><div class='del'>-  need_version=no</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  shlibpath_overrides_runpath=no</div><div class='del'>-  hardcode_into_libs=yes</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-uts4*)</div><div class='del'>-  version_type=linux</div><div class='del'>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'</div><div class='del'>-  soname_spec='${libname}${release}${shared_ext}$major'</div><div class='del'>-  shlibpath_var=LD_LIBRARY_PATH</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-*)</div><div class='del'>-  dynamic_linker=no</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" &gt;&amp;5</div><div class='del'>-$as_echo "$dynamic_linker" &gt;&amp;6; }</div><div class='del'>-test "$dynamic_linker" = no &amp;&amp; can_build_shared=no</div><div class='del'>-</div><div class='del'>-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"</div><div class='del'>-if test "$GCC" = yes; then</div><div class='del'>-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then</div><div class='del'>-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"</div><div class='del'>-fi</div><div class='del'>-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then</div><div class='del'>-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking how to hardcode library paths into programs... " &gt;&amp;6; }</div><div class='del'>-hardcode_action=</div><div class='del'>-if test -n "$hardcode_libdir_flag_spec" ||</div><div class='del'>-   test -n "$runpath_var" ||</div><div class='del'>-   test "X$hardcode_automatic" = "Xyes" ; then</div><div class='del'>-</div><div class='del'>-  # We can hardcode non-existent directories.</div><div class='del'>-  if test "$hardcode_direct" != no &amp;&amp;</div><div class='del'>-     # If the only mechanism to avoid hardcoding is shlibpath_var, we</div><div class='del'>-     # have to relink, otherwise we might link with an installed library</div><div class='del'>-     # when we should be linking with a yet-to-be-installed one</div><div class='del'>-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &amp;&amp;</div><div class='del'>-     test "$hardcode_minus_L" != no; then</div><div class='del'>-    # Linking always hardcodes the temporary library directory.</div><div class='del'>-    hardcode_action=relink</div><div class='del'>-  else</div><div class='del'>-    # We can link without hardcoding, and we can hardcode nonexisting dirs.</div><div class='del'>-    hardcode_action=immediate</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  # We cannot hardcode anything, or else we can only hardcode existing</div><div class='del'>-  # directories.</div><div class='del'>-  hardcode_action=unsupported</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" &gt;&amp;5</div><div class='del'>-$as_echo "$hardcode_action" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-if test "$hardcode_action" = relink ||</div><div class='del'>-   test "$inherit_rpath" = yes; then</div><div class='del'>-  # Fast installation is not supported</div><div class='del'>-  enable_fast_install=no</div><div class='del'>-elif test "$shlibpath_overrides_runpath" = yes ||</div><div class='del'>-     test "$enable_shared" = no; then</div><div class='del'>-  # Fast installation is not necessary</div><div class='del'>-  enable_fast_install=needless</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  if test "x$enable_dlopen" != xyes; then</div><div class='del'>-  enable_dlopen=unknown</div><div class='del'>-  enable_dlopen_self=unknown</div><div class='del'>-  enable_dlopen_self_static=unknown</div><div class='del'>-else</div><div class='del'>-  lt_cv_dlopen=no</div><div class='del'>-  lt_cv_dlopen_libs=</div><div class='del'>-</div><div class='del'>-  case $host_os in</div><div class='del'>-  beos*)</div><div class='del'>-    lt_cv_dlopen="load_add_on"</div><div class='del'>-    lt_cv_dlopen_libs=</div><div class='del'>-    lt_cv_dlopen_self=yes</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  mingw* | pw32* | cegcc*)</div><div class='del'>-    lt_cv_dlopen="LoadLibrary"</div><div class='del'>-    lt_cv_dlopen_libs=</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  cygwin*)</div><div class='del'>-    lt_cv_dlopen="dlopen"</div><div class='del'>-    lt_cv_dlopen_libs=</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  darwin*)</div><div class='del'>-  # if libdl is installed we need to link against it</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for dlopen in -ldl... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  ac_check_lib_save_LIBS=$LIBS</div><div class='del'>-LIBS="-ldl  $LIBS"</div><div class='del'>-cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-/* Override any GCC internal prototype to avoid an error.</div><div class='del'>-   Use char because int might match the return type of a GCC</div><div class='del'>-   builtin and then its argument prototype would still apply.  */</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C"</div><div class='del'>-#endif</div><div class='del'>-char dlopen ();</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-return dlopen ();</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_link "$LINENO"; then :</div><div class='del'>-  ac_cv_lib_dl_dlopen=yes</div><div class='del'>-else</div><div class='del'>-  ac_cv_lib_dl_dlopen=no</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext \</div><div class='del'>-    conftest$ac_exeext conftest.$ac_ext</div><div class='del'>-LIBS=$ac_check_lib_save_LIBS</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_lib_dl_dlopen" &gt;&amp;6; }</div><div class='del'>-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :</div><div class='del'>-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"</div><div class='del'>-else</div><div class='del'>-</div><div class='del'>-    lt_cv_dlopen="dyld"</div><div class='del'>-    lt_cv_dlopen_libs=</div><div class='del'>-    lt_cv_dlopen_self=yes</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  *)</div><div class='del'>-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"</div><div class='del'>-if test "x$ac_cv_func_shl_load" = x""yes; then :</div><div class='del'>-  lt_cv_dlopen="shl_load"</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for shl_load in -ldld... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  ac_check_lib_save_LIBS=$LIBS</div><div class='del'>-LIBS="-ldld  $LIBS"</div><div class='del'>-cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-/* Override any GCC internal prototype to avoid an error.</div><div class='del'>-   Use char because int might match the return type of a GCC</div><div class='del'>-   builtin and then its argument prototype would still apply.  */</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C"</div><div class='del'>-#endif</div><div class='del'>-char shl_load ();</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-return shl_load ();</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_link "$LINENO"; then :</div><div class='del'>-  ac_cv_lib_dld_shl_load=yes</div><div class='del'>-else</div><div class='del'>-  ac_cv_lib_dld_shl_load=no</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext \</div><div class='del'>-    conftest$ac_exeext conftest.$ac_ext</div><div class='del'>-LIBS=$ac_check_lib_save_LIBS</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_lib_dld_shl_load" &gt;&amp;6; }</div><div class='del'>-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :</div><div class='del'>-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"</div><div class='del'>-else</div><div class='del'>-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"</div><div class='del'>-if test "x$ac_cv_func_dlopen" = x""yes; then :</div><div class='del'>-  lt_cv_dlopen="dlopen"</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for dlopen in -ldl... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  ac_check_lib_save_LIBS=$LIBS</div><div class='del'>-LIBS="-ldl  $LIBS"</div><div class='del'>-cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-/* Override any GCC internal prototype to avoid an error.</div><div class='del'>-   Use char because int might match the return type of a GCC</div><div class='del'>-   builtin and then its argument prototype would still apply.  */</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C"</div><div class='del'>-#endif</div><div class='del'>-char dlopen ();</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-return dlopen ();</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_link "$LINENO"; then :</div><div class='del'>-  ac_cv_lib_dl_dlopen=yes</div><div class='del'>-else</div><div class='del'>-  ac_cv_lib_dl_dlopen=no</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext \</div><div class='del'>-    conftest$ac_exeext conftest.$ac_ext</div><div class='del'>-LIBS=$ac_check_lib_save_LIBS</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_lib_dl_dlopen" &gt;&amp;6; }</div><div class='del'>-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :</div><div class='del'>-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for dlopen in -lsvld... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  ac_check_lib_save_LIBS=$LIBS</div><div class='del'>-LIBS="-lsvld  $LIBS"</div><div class='del'>-cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-/* Override any GCC internal prototype to avoid an error.</div><div class='del'>-   Use char because int might match the return type of a GCC</div><div class='del'>-   builtin and then its argument prototype would still apply.  */</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C"</div><div class='del'>-#endif</div><div class='del'>-char dlopen ();</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-return dlopen ();</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_link "$LINENO"; then :</div><div class='del'>-  ac_cv_lib_svld_dlopen=yes</div><div class='del'>-else</div><div class='del'>-  ac_cv_lib_svld_dlopen=no</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext \</div><div class='del'>-    conftest$ac_exeext conftest.$ac_ext</div><div class='del'>-LIBS=$ac_check_lib_save_LIBS</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_lib_svld_dlopen" &gt;&amp;6; }</div><div class='del'>-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :</div><div class='del'>-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for dld_link in -ldld... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  ac_check_lib_save_LIBS=$LIBS</div><div class='del'>-LIBS="-ldld  $LIBS"</div><div class='del'>-cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-/* Override any GCC internal prototype to avoid an error.</div><div class='del'>-   Use char because int might match the return type of a GCC</div><div class='del'>-   builtin and then its argument prototype would still apply.  */</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C"</div><div class='del'>-#endif</div><div class='del'>-char dld_link ();</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-return dld_link ();</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_link "$LINENO"; then :</div><div class='del'>-  ac_cv_lib_dld_dld_link=yes</div><div class='del'>-else</div><div class='del'>-  ac_cv_lib_dld_dld_link=no</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext \</div><div class='del'>-    conftest$ac_exeext conftest.$ac_ext</div><div class='del'>-LIBS=$ac_check_lib_save_LIBS</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_lib_dld_dld_link" &gt;&amp;6; }</div><div class='del'>-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :</div><div class='del'>-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  if test "x$lt_cv_dlopen" != xno; then</div><div class='del'>-    enable_dlopen=yes</div><div class='del'>-  else</div><div class='del'>-    enable_dlopen=no</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  case $lt_cv_dlopen in</div><div class='del'>-  dlopen)</div><div class='del'>-    save_CPPFLAGS="$CPPFLAGS"</div><div class='del'>-    test "x$ac_cv_header_dlfcn_h" = xyes &amp;&amp; CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"</div><div class='del'>-</div><div class='del'>-    save_LDFLAGS="$LDFLAGS"</div><div class='del'>-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"</div><div class='del'>-</div><div class='del'>-    save_LIBS="$LIBS"</div><div class='del'>-    LIBS="$lt_cv_dlopen_libs $LIBS"</div><div class='del'>-</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether a program can dlopen itself... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_dlopen_self+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  	  if test "$cross_compiling" = yes; then :</div><div class='del'>-  lt_cv_dlopen_self=cross</div><div class='del'>-else</div><div class='del'>-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2</div><div class='del'>-  lt_status=$lt_dlunknown</div><div class='del'>-  cat &gt; conftest.$ac_ext &lt;&lt;_LT_EOF</div><div class='del'>-#line 10604 "configure"</div><div class='del'>-#include "confdefs.h"</div><div class='del'>-</div><div class='del'>-#if HAVE_DLFCN_H</div><div class='del'>-#include &lt;dlfcn.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef RTLD_GLOBAL</div><div class='del'>-#  define LT_DLGLOBAL		RTLD_GLOBAL</div><div class='del'>-#else</div><div class='del'>-#  ifdef DL_GLOBAL</div><div class='del'>-#    define LT_DLGLOBAL		DL_GLOBAL</div><div class='del'>-#  else</div><div class='del'>-#    define LT_DLGLOBAL		0</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we</div><div class='del'>-   find out it does not work in some platform. */</div><div class='del'>-#ifndef LT_DLLAZY_OR_NOW</div><div class='del'>-#  ifdef RTLD_LAZY</div><div class='del'>-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY</div><div class='del'>-#  else</div><div class='del'>-#    ifdef DL_LAZY</div><div class='del'>-#      define LT_DLLAZY_OR_NOW		DL_LAZY</div><div class='del'>-#    else</div><div class='del'>-#      ifdef RTLD_NOW</div><div class='del'>-#        define LT_DLLAZY_OR_NOW	RTLD_NOW</div><div class='del'>-#      else</div><div class='del'>-#        ifdef DL_NOW</div><div class='del'>-#          define LT_DLLAZY_OR_NOW	DL_NOW</div><div class='del'>-#        else</div><div class='del'>-#          define LT_DLLAZY_OR_NOW	0</div><div class='del'>-#        endif</div><div class='del'>-#      endif</div><div class='del'>-#    endif</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void fnord() { int i=42;}</div><div class='del'>-int main ()</div><div class='del'>-{</div><div class='del'>-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);</div><div class='del'>-  int status = $lt_dlunknown;</div><div class='del'>-</div><div class='del'>-  if (self)</div><div class='del'>-    {</div><div class='del'>-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;</div><div class='del'>-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;</div><div class='del'>-      /* dlclose (self); */</div><div class='del'>-    }</div><div class='del'>-  else</div><div class='del'>-    puts (dlerror ());</div><div class='del'>-</div><div class='del'>-  return status;</div><div class='del'>-}</div><div class='del'>-_LT_EOF</div><div class='del'>-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } &gt;&amp;5</div><div class='del'>-  (eval $ac_link) 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; } &amp;&amp; test -s conftest${ac_exeext} 2&gt;/dev/null; then</div><div class='del'>-    (./conftest; exit; ) &gt;&amp;5 2&gt;/dev/null</div><div class='del'>-    lt_status=$?</div><div class='del'>-    case x$lt_status in</div><div class='del'>-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;</div><div class='del'>-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;</div><div class='del'>-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;</div><div class='del'>-    esac</div><div class='del'>-  else :</div><div class='del'>-    # compilation failed</div><div class='del'>-    lt_cv_dlopen_self=no</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-rm -fr conftest*</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_dlopen_self" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-    if test "x$lt_cv_dlopen_self" = xyes; then</div><div class='del'>-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"</div><div class='del'>-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether a statically linked program can dlopen itself... " &gt;&amp;6; }</div><div class='del'>-if test "${lt_cv_dlopen_self_static+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  	  if test "$cross_compiling" = yes; then :</div><div class='del'>-  lt_cv_dlopen_self_static=cross</div><div class='del'>-else</div><div class='del'>-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2</div><div class='del'>-  lt_status=$lt_dlunknown</div><div class='del'>-  cat &gt; conftest.$ac_ext &lt;&lt;_LT_EOF</div><div class='del'>-#line 10700 "configure"</div><div class='del'>-#include "confdefs.h"</div><div class='del'>-</div><div class='del'>-#if HAVE_DLFCN_H</div><div class='del'>-#include &lt;dlfcn.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef RTLD_GLOBAL</div><div class='del'>-#  define LT_DLGLOBAL		RTLD_GLOBAL</div><div class='del'>-#else</div><div class='del'>-#  ifdef DL_GLOBAL</div><div class='del'>-#    define LT_DLGLOBAL		DL_GLOBAL</div><div class='del'>-#  else</div><div class='del'>-#    define LT_DLGLOBAL		0</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we</div><div class='del'>-   find out it does not work in some platform. */</div><div class='del'>-#ifndef LT_DLLAZY_OR_NOW</div><div class='del'>-#  ifdef RTLD_LAZY</div><div class='del'>-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY</div><div class='del'>-#  else</div><div class='del'>-#    ifdef DL_LAZY</div><div class='del'>-#      define LT_DLLAZY_OR_NOW		DL_LAZY</div><div class='del'>-#    else</div><div class='del'>-#      ifdef RTLD_NOW</div><div class='del'>-#        define LT_DLLAZY_OR_NOW	RTLD_NOW</div><div class='del'>-#      else</div><div class='del'>-#        ifdef DL_NOW</div><div class='del'>-#          define LT_DLLAZY_OR_NOW	DL_NOW</div><div class='del'>-#        else</div><div class='del'>-#          define LT_DLLAZY_OR_NOW	0</div><div class='del'>-#        endif</div><div class='del'>-#      endif</div><div class='del'>-#    endif</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void fnord() { int i=42;}</div><div class='del'>-int main ()</div><div class='del'>-{</div><div class='del'>-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);</div><div class='del'>-  int status = $lt_dlunknown;</div><div class='del'>-</div><div class='del'>-  if (self)</div><div class='del'>-    {</div><div class='del'>-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;</div><div class='del'>-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;</div><div class='del'>-      /* dlclose (self); */</div><div class='del'>-    }</div><div class='del'>-  else</div><div class='del'>-    puts (dlerror ());</div><div class='del'>-</div><div class='del'>-  return status;</div><div class='del'>-}</div><div class='del'>-_LT_EOF</div><div class='del'>-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } &gt;&amp;5</div><div class='del'>-  (eval $ac_link) 2&gt;&amp;5</div><div class='del'>-  ac_status=$?</div><div class='del'>-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" &gt;&amp;5</div><div class='del'>-  test $ac_status = 0; } &amp;&amp; test -s conftest${ac_exeext} 2&gt;/dev/null; then</div><div class='del'>-    (./conftest; exit; ) &gt;&amp;5 2&gt;/dev/null</div><div class='del'>-    lt_status=$?</div><div class='del'>-    case x$lt_status in</div><div class='del'>-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;</div><div class='del'>-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;</div><div class='del'>-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;</div><div class='del'>-    esac</div><div class='del'>-  else :</div><div class='del'>-    # compilation failed</div><div class='del'>-    lt_cv_dlopen_self_static=no</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-rm -fr conftest*</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" &gt;&amp;5</div><div class='del'>-$as_echo "$lt_cv_dlopen_self_static" &gt;&amp;6; }</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    CPPFLAGS="$save_CPPFLAGS"</div><div class='del'>-    LDFLAGS="$save_LDFLAGS"</div><div class='del'>-    LIBS="$save_LIBS"</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  case $lt_cv_dlopen_self in</div><div class='del'>-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;</div><div class='del'>-  *) enable_dlopen_self=unknown ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  case $lt_cv_dlopen_self_static in</div><div class='del'>-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;</div><div class='del'>-  *) enable_dlopen_self_static=unknown ;;</div><div class='del'>-  esac</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-striplib=</div><div class='del'>-old_striplib=</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether stripping libraries is possible... " &gt;&amp;6; }</div><div class='del'>-if test -n "$STRIP" &amp;&amp; $STRIP -V 2&gt;&amp;1 | $GREP "GNU strip" &gt;/dev/null; then</div><div class='del'>-  test -z "$old_striplib" &amp;&amp; old_striplib="$STRIP --strip-debug"</div><div class='del'>-  test -z "$striplib" &amp;&amp; striplib="$STRIP --strip-unneeded"</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" &gt;&amp;5</div><div class='del'>-$as_echo "yes" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-# FIXME - insert some real tests, host_os isn't really good enough</div><div class='del'>-  case $host_os in</div><div class='del'>-  darwin*)</div><div class='del'>-    if test -n "$STRIP" ; then</div><div class='del'>-      striplib="$STRIP -x"</div><div class='del'>-      old_striplib="$STRIP -S"</div><div class='del'>-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" &gt;&amp;5</div><div class='del'>-$as_echo "yes" &gt;&amp;6; }</div><div class='del'>-    else</div><div class='del'>-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  # Report which library types will actually be built</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking if libtool supports shared libraries... " &gt;&amp;6; }</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" &gt;&amp;5</div><div class='del'>-$as_echo "$can_build_shared" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether to build shared libraries... " &gt;&amp;6; }</div><div class='del'>-  test "$can_build_shared" = "no" &amp;&amp; enable_shared=no</div><div class='del'>-</div><div class='del'>-  # On AIX, shared libraries and static libraries use the same namespace, and</div><div class='del'>-  # are all built from PIC.</div><div class='del'>-  case $host_os in</div><div class='del'>-  aix3*)</div><div class='del'>-    test "$enable_shared" = yes &amp;&amp; enable_static=no</div><div class='del'>-    if test -n "$RANLIB"; then</div><div class='del'>-      archive_cmds="$archive_cmds~\$RANLIB \$lib"</div><div class='del'>-      postinstall_cmds='$RANLIB $lib'</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  aix[4-9]*)</div><div class='del'>-    if test "$host_cpu" != ia64 &amp;&amp; test "$aix_use_runtimelinking" = no ; then</div><div class='del'>-      test "$enable_shared" = yes &amp;&amp; enable_static=no</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" &gt;&amp;5</div><div class='del'>-$as_echo "$enable_shared" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether to build static libraries... " &gt;&amp;6; }</div><div class='del'>-  # Make sure either enable_shared or enable_static is yes.</div><div class='del'>-  test "$enable_shared" = yes || enable_static=yes</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" &gt;&amp;5</div><div class='del'>-$as_echo "$enable_static" &gt;&amp;6; }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-ac_ext=c</div><div class='del'>-ac_cpp='$CPP $CPPFLAGS'</div><div class='del'>-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext &gt;&amp;5'</div><div class='del'>-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS &gt;&amp;5'</div><div class='del'>-ac_compiler_gnu=$ac_cv_c_compiler_gnu</div><div class='del'>-</div><div class='del'>-CC="$lt_save_CC"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-        ac_config_commands="$ac_config_commands libtool"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Only expand once:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Checks for header files.</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for ANSI C header files... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_header_stdc+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;float.h&gt;</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_compile "$LINENO"; then :</div><div class='del'>-  ac_cv_header_stdc=yes</div><div class='del'>-else</div><div class='del'>-  ac_cv_header_stdc=no</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext</div><div class='del'>-</div><div class='del'>-if test $ac_cv_header_stdc = yes; then</div><div class='del'>-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-_ACEOF</div><div class='del'>-if (eval "$ac_cpp conftest.$ac_ext") 2&gt;&amp;5 |</div><div class='del'>-  $EGREP "memchr" &gt;/dev/null 2&gt;&amp;1; then :</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  ac_cv_header_stdc=no</div><div class='del'>-fi</div><div class='del'>-rm -f conftest*</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test $ac_cv_header_stdc = yes; then</div><div class='del'>-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-_ACEOF</div><div class='del'>-if (eval "$ac_cpp conftest.$ac_ext") 2&gt;&amp;5 |</div><div class='del'>-  $EGREP "free" &gt;/dev/null 2&gt;&amp;1; then :</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  ac_cv_header_stdc=no</div><div class='del'>-fi</div><div class='del'>-rm -f conftest*</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test $ac_cv_header_stdc = yes; then</div><div class='del'>-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.</div><div class='del'>-  if test "$cross_compiling" = yes; then :</div><div class='del'>-  :</div><div class='del'>-else</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#if ((' ' &amp; 0x0FF) == 0x020)</div><div class='del'>-# define ISLOWER(c) ('a' &lt;= (c) &amp;&amp; (c) &lt;= 'z')</div><div class='del'>-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))</div><div class='del'>-#else</div><div class='del'>-# define ISLOWER(c) \</div><div class='del'>-		   (('a' &lt;= (c) &amp;&amp; (c) &lt;= 'i') \</div><div class='del'>-		     || ('j' &lt;= (c) &amp;&amp; (c) &lt;= 'r') \</div><div class='del'>-		     || ('s' &lt;= (c) &amp;&amp; (c) &lt;= 'z'))</div><div class='del'>-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define XOR(e, f) (((e) &amp;&amp; !(f)) || (!(e) &amp;&amp; (f)))</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-  int i;</div><div class='del'>-  for (i = 0; i &lt; 256; i++)</div><div class='del'>-    if (XOR (islower (i), ISLOWER (i))</div><div class='del'>-	|| toupper (i) != TOUPPER (i))</div><div class='del'>-      return 2;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_run "$LINENO"; then :</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  ac_cv_header_stdc=no</div><div class='del'>-fi</div><div class='del'>-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \</div><div class='del'>-  conftest.$ac_objext conftest.beam conftest.$ac_ext</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_header_stdc" &gt;&amp;6; }</div><div class='del'>-if test $ac_cv_header_stdc = yes; then</div><div class='del'>-</div><div class='del'>-$as_echo "#define STDC_HEADERS 1" &gt;&gt;confdefs.h</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-for ac_header in malloc.h stdlib.h string.h strings.h</div><div class='del'>-do :</div><div class='del'>-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`</div><div class='del'>-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"</div><div class='del'>-eval as_val=\$$as_ac_Header</div><div class='del'>-   if test "x$as_val" = x""yes; then :</div><div class='del'>-  cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Checks for typedefs, structures, and compiler characteristics.</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for an ANSI C-conforming const... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_c_const+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-/* FIXME: Include the comments suggested by Paul. */</div><div class='del'>-#ifndef __cplusplus</div><div class='del'>-  /* Ultrix mips cc rejects this.  */</div><div class='del'>-  typedef int charset[2];</div><div class='del'>-  const charset cs;</div><div class='del'>-  /* SunOS 4.1.1 cc rejects this.  */</div><div class='del'>-  char const *const *pcpcc;</div><div class='del'>-  char **ppc;</div><div class='del'>-  /* NEC SVR4.0.2 mips cc rejects this.  */</div><div class='del'>-  struct point {int x, y;};</div><div class='del'>-  static struct point const zero = {0,0};</div><div class='del'>-  /* AIX XL C 1.02.0.0 rejects this.</div><div class='del'>-     It does not let you subtract one const X* pointer from another in</div><div class='del'>-     an arm of an if-expression whose if-part is not a constant</div><div class='del'>-     expression */</div><div class='del'>-  const char *g = "string";</div><div class='del'>-  pcpcc = &amp;g + (g ? g-g : 0);</div><div class='del'>-  /* HPUX 7.0 cc rejects these. */</div><div class='del'>-  ++pcpcc;</div><div class='del'>-  ppc = (char**) pcpcc;</div><div class='del'>-  pcpcc = (char const *const *) ppc;</div><div class='del'>-  { /* SCO 3.2v4 cc rejects this.  */</div><div class='del'>-    char *t;</div><div class='del'>-    char const *s = 0 ? (char *) 0 : (char const *) 0;</div><div class='del'>-</div><div class='del'>-    *t++ = 0;</div><div class='del'>-    if (s) return 0;</div><div class='del'>-  }</div><div class='del'>-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */</div><div class='del'>-    int x[] = {25, 17};</div><div class='del'>-    const int *foo = &amp;x[0];</div><div class='del'>-    ++foo;</div><div class='del'>-  }</div><div class='del'>-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */</div><div class='del'>-    typedef const int *iptr;</div><div class='del'>-    iptr p = 0;</div><div class='del'>-    ++p;</div><div class='del'>-  }</div><div class='del'>-  { /* AIX XL C 1.02.0.0 rejects this saying</div><div class='del'>-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */</div><div class='del'>-    struct s { int j; const int *ap[3]; };</div><div class='del'>-    struct s *b; b-&gt;j = 5;</div><div class='del'>-  }</div><div class='del'>-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */</div><div class='del'>-    const int foo = 10;</div><div class='del'>-    if (!foo) return 0;</div><div class='del'>-  }</div><div class='del'>-  return !cs[0] &amp;&amp; !zero.x;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_compile "$LINENO"; then :</div><div class='del'>-  ac_cv_c_const=yes</div><div class='del'>-else</div><div class='del'>-  ac_cv_c_const=no</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_c_const" &gt;&amp;6; }</div><div class='del'>-if test $ac_cv_c_const = no; then</div><div class='del'>-</div><div class='del'>-$as_echo "#define const /**/" &gt;&gt;confdefs.h</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"</div><div class='del'>-if test "x$ac_cv_type_size_t" = x""yes; then :</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define size_t unsigned int</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_struct_tm+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-struct tm tm;</div><div class='del'>-				     int *p = &amp;tm.tm_sec;</div><div class='del'>-				     return !p;</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_compile "$LINENO"; then :</div><div class='del'>-  ac_cv_struct_tm=time.h</div><div class='del'>-else</div><div class='del'>-  ac_cv_struct_tm=sys/time.h</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_struct_tm" &gt;&amp;6; }</div><div class='del'>-if test $ac_cv_struct_tm = sys/time.h; then</div><div class='del'>-</div><div class='del'>-$as_echo "#define TM_IN_SYS_TIME 1" &gt;&gt;confdefs.h</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Checks for library functions.</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for working strtod... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_func_strtod+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  if test "$cross_compiling" = yes; then :</div><div class='del'>-  ac_cv_func_strtod=no</div><div class='del'>-else</div><div class='del'>-  cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-$ac_includes_default</div><div class='del'>-#ifndef strtod</div><div class='del'>-double strtod ();</div><div class='del'>-#endif</div><div class='del'>-int</div><div class='del'>-main()</div><div class='del'>-{</div><div class='del'>-  {</div><div class='del'>-    /* Some versions of Linux strtod mis-parse strings with leading '+'.  */</div><div class='del'>-    char *string = " +69";</div><div class='del'>-    char *term;</div><div class='del'>-    double value;</div><div class='del'>-    value = strtod (string, &amp;term);</div><div class='del'>-    if (value != 69 || term != (string + 4))</div><div class='del'>-      return 1;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  {</div><div class='del'>-    /* Under Solaris 2.4, strtod returns the wrong value for the</div><div class='del'>-       terminating character under some conditions.  */</div><div class='del'>-    char *string = "NaN";</div><div class='del'>-    char *term;</div><div class='del'>-    strtod (string, &amp;term);</div><div class='del'>-    if (term != string &amp;&amp; *(term - 1) == 0)</div><div class='del'>-      return 1;</div><div class='del'>-  }</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_run "$LINENO"; then :</div><div class='del'>-  ac_cv_func_strtod=yes</div><div class='del'>-else</div><div class='del'>-  ac_cv_func_strtod=no</div><div class='del'>-fi</div><div class='del'>-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \</div><div class='del'>-  conftest.$ac_objext conftest.beam conftest.$ac_ext</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_func_strtod" &gt;&amp;6; }</div><div class='del'>-if test $ac_cv_func_strtod = no; then</div><div class='del'>-  case " $LIBOBJS " in</div><div class='del'>-  *" strtod.$ac_objext "* ) ;;</div><div class='del'>-  *) LIBOBJS="$LIBOBJS strtod.$ac_objext"</div><div class='del'>- ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"</div><div class='del'>-if test "x$ac_cv_func_pow" = x""yes; then :</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test $ac_cv_func_pow = no; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for pow in -lm... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_lib_m_pow+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  ac_check_lib_save_LIBS=$LIBS</div><div class='del'>-LIBS="-lm  $LIBS"</div><div class='del'>-cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-/* Override any GCC internal prototype to avoid an error.</div><div class='del'>-   Use char because int might match the return type of a GCC</div><div class='del'>-   builtin and then its argument prototype would still apply.  */</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C"</div><div class='del'>-#endif</div><div class='del'>-char pow ();</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-return pow ();</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_link "$LINENO"; then :</div><div class='del'>-  ac_cv_lib_m_pow=yes</div><div class='del'>-else</div><div class='del'>-  ac_cv_lib_m_pow=no</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext \</div><div class='del'>-    conftest$ac_exeext conftest.$ac_ext</div><div class='del'>-LIBS=$ac_check_lib_save_LIBS</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_lib_m_pow" &gt;&amp;6; }</div><div class='del'>-if test "x$ac_cv_lib_m_pow" = x""yes; then :</div><div class='del'>-  POW_LIB=-lm</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: cannot find library containing definition of pow" &gt;&amp;2;}</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-for ac_func in memset</div><div class='del'>-do :</div><div class='del'>-  ac_fn_c_check_func "$LINENO" "memset" "ac_cv_func_memset"</div><div class='del'>-if test "x$ac_cv_func_memset" = x""yes; then :</div><div class='del'>-  cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define HAVE_MEMSET 1</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  as_fn_error "memset not found in libc" "$LINENO" 5</div><div class='del'>-fi</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-for ac_func in pow</div><div class='del'>-do :</div><div class='del'>-  ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"</div><div class='del'>-if test "x$ac_cv_func_pow" = x""yes; then :</div><div class='del'>-  cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define HAVE_POW 1</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for pow in -lm... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_lib_m_pow+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  ac_check_lib_save_LIBS=$LIBS</div><div class='del'>-LIBS="-lm  $LIBS"</div><div class='del'>-cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-/* Override any GCC internal prototype to avoid an error.</div><div class='del'>-   Use char because int might match the return type of a GCC</div><div class='del'>-   builtin and then its argument prototype would still apply.  */</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C"</div><div class='del'>-#endif</div><div class='del'>-char pow ();</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-return pow ();</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_link "$LINENO"; then :</div><div class='del'>-  ac_cv_lib_m_pow=yes</div><div class='del'>-else</div><div class='del'>-  ac_cv_lib_m_pow=no</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext \</div><div class='del'>-    conftest$ac_exeext conftest.$ac_ext</div><div class='del'>-LIBS=$ac_check_lib_save_LIBS</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_lib_m_pow" &gt;&amp;6; }</div><div class='del'>-if test "x$ac_cv_lib_m_pow" = x""yes; then :</div><div class='del'>-  cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define HAVE_LIBM 1</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-  LIBS="-lm $LIBS"</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  as_fn_error "cannot find pow" "$LINENO" 5</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-fi</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibVersion in -lz" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for zlibVersion in -lz... " &gt;&amp;6; }</div><div class='del'>-if test "${ac_cv_lib_z_zlibVersion+set}" = set; then :</div><div class='del'>-  $as_echo_n "(cached) " &gt;&amp;6</div><div class='del'>-else</div><div class='del'>-  ac_check_lib_save_LIBS=$LIBS</div><div class='del'>-LIBS="-lz  $LIBS"</div><div class='del'>-cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext</div><div class='del'>-/* end confdefs.h.  */</div><div class='del'>-</div><div class='del'>-/* Override any GCC internal prototype to avoid an error.</div><div class='del'>-   Use char because int might match the return type of a GCC</div><div class='del'>-   builtin and then its argument prototype would still apply.  */</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C"</div><div class='del'>-#endif</div><div class='del'>-char zlibVersion ();</div><div class='del'>-int</div><div class='del'>-main ()</div><div class='del'>-{</div><div class='del'>-return zlibVersion ();</div><div class='del'>-  ;</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-_ACEOF</div><div class='del'>-if ac_fn_c_try_link "$LINENO"; then :</div><div class='del'>-  ac_cv_lib_z_zlibVersion=yes</div><div class='del'>-else</div><div class='del'>-  ac_cv_lib_z_zlibVersion=no</div><div class='del'>-fi</div><div class='del'>-rm -f core conftest.err conftest.$ac_objext \</div><div class='del'>-    conftest$ac_exeext conftest.$ac_ext</div><div class='del'>-LIBS=$ac_check_lib_save_LIBS</div><div class='del'>-fi</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_zlibVersion" &gt;&amp;5</div><div class='del'>-$as_echo "$ac_cv_lib_z_zlibVersion" &gt;&amp;6; }</div><div class='del'>-if test "x$ac_cv_lib_z_zlibVersion" = x""yes; then :</div><div class='del'>-  cat &gt;&gt;confdefs.h &lt;&lt;_ACEOF</div><div class='del'>-#define HAVE_LIBZ 1</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-  LIBS="-lz $LIBS"</div><div class='del'>-</div><div class='del'>-else</div><div class='del'>-  as_fn_error "zlib not installed" "$LINENO" 5</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG</div><div class='del'>-LIBPNG_DEFINES=$LIBPNG_DEFINES</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libraries can be versioned" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking if libraries can be versioned... " &gt;&amp;6; }</div><div class='del'>-GLD=`$LD --help &lt; /dev/null 2&gt;/dev/null | grep version-script`</div><div class='del'>-if test "$GLD"; then</div><div class='del'>-    have_ld_version_script=yes</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" &gt;&amp;5</div><div class='del'>-$as_echo "yes" &gt;&amp;6; }</div><div class='del'>-else</div><div class='del'>-    have_ld_version_script=no</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" &gt;&amp;5</div><div class='del'>-$as_echo "no" &gt;&amp;6; }</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** You have not enabled versioned symbols." &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: *** You have not enabled versioned symbols." &gt;&amp;2;}</div><div class='del'>-fi</div><div class='del'>- if test "$have_ld_version_script" = "yes"; then</div><div class='del'>-  HAVE_LD_VERSION_SCRIPT_TRUE=</div><div class='del'>-  HAVE_LD_VERSION_SCRIPT_FALSE='#'</div><div class='del'>-else</div><div class='del'>-  HAVE_LD_VERSION_SCRIPT_TRUE='#'</div><div class='del'>-  HAVE_LD_VERSION_SCRIPT_FALSE=</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-if test "$have_ld_version_script" = "yes"; then</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbol prefix" &gt;&amp;5</div><div class='del'>-$as_echo_n "checking for symbol prefix... " &gt;&amp;6; }</div><div class='del'>-    SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \</div><div class='del'>-                   | ${CPP-${CC-gcc} -E} - 2&gt;&amp;1 \</div><div class='del'>-                   | ${EGREP-grep} "^PREFIX=" \</div><div class='del'>-                   | ${SED-sed} "s:^PREFIX=::"`</div><div class='del'>-</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYMBOL_PREFIX" &gt;&amp;5</div><div class='del'>-$as_echo "$SYMBOL_PREFIX" &gt;&amp;6; }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Substitutions for .in files</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Additional arguments (and substitutions)</div><div class='del'>-# Allow the pkg-config directory to be set</div><div class='del'>-</div><div class='del'>-# Check whether --with-pkgconfigdir was given.</div><div class='del'>-if test "${with_pkgconfigdir+set}" = set; then :</div><div class='del'>-  withval=$with_pkgconfigdir; pkgconfigdir=${withval}</div><div class='del'>-else</div><div class='del'>-  pkgconfigdir='${libdir}/pkgconfig'</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: pkgconfig directory is ${pkgconfigdir}" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: pkgconfig directory is ${pkgconfigdir}" &gt;&amp;6;}</div><div class='del'>-</div><div class='del'>-# Make the *-config binary config scripts optional</div><div class='del'>-</div><div class='del'>-# Check whether --with-binconfigs was given.</div><div class='del'>-if test "${with_binconfigs+set}" = set; then :</div><div class='del'>-  withval=$with_binconfigs; if test "${withval}" = no; then</div><div class='del'>-		binconfigs=</div><div class='del'>-		{ $as_echo "$as_me:${as_lineno-$LINENO}: libpng-config scripts will not be built" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: libpng-config scripts will not be built" &gt;&amp;6;}</div><div class='del'>-	else</div><div class='del'>-		binconfigs='${binconfigs}'</div><div class='del'>-	fi</div><div class='del'>-else</div><div class='del'>-  binconfigs='${binconfigs}'</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Config files, substituting as above</div><div class='del'>-ac_config_files="$ac_config_files Makefile libpng.pc:libpng.pc.in"</div><div class='del'>-</div><div class='del'>-ac_config_files="$ac_config_files libpng-config:libpng-config.in"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-cat &gt;confcache &lt;&lt;\_ACEOF</div><div class='del'>-# This file is a shell script that caches the results of configure</div><div class='del'>-# tests run on this system so they can be shared between configure</div><div class='del'>-# scripts and configure runs, see configure's option --config-cache.</div><div class='del'>-# It is not useful on other systems.  If it contains results you don't</div><div class='del'>-# want to keep, you may remove or edit it.</div><div class='del'>-#</div><div class='del'>-# config.status only pays attention to the cache file if you give it</div><div class='del'>-# the --recheck option to rerun configure.</div><div class='del'>-#</div><div class='del'>-# `ac_cv_env_foo' variables (set or unset) will be overridden when</div><div class='del'>-# loading this file, other *unset* `ac_cv_foo' will be assigned the</div><div class='del'>-# following values.</div><div class='del'>-</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-# The following way of writing the cache mishandles newlines in values,</div><div class='del'>-# but we know of no workaround that is simple, portable, and efficient.</div><div class='del'>-# So, we kill variables containing newlines.</div><div class='del'>-# Ultrix sh set writes to stderr and can't be redirected directly,</div><div class='del'>-# and sets the high bit in the cache file unless we assign to the vars.</div><div class='del'>-(</div><div class='del'>-  for ac_var in `(set) 2&gt;&amp;1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do</div><div class='del'>-    eval ac_val=\$$ac_var</div><div class='del'>-    case $ac_val in #(</div><div class='del'>-    *${as_nl}*)</div><div class='del'>-      case $ac_var in #(</div><div class='del'>-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" &gt;&amp;2;} ;;</div><div class='del'>-      esac</div><div class='del'>-      case $ac_var in #(</div><div class='del'>-      _ | IFS | as_nl) ;; #(</div><div class='del'>-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(</div><div class='del'>-      *) { eval $ac_var=; unset $ac_var;} ;;</div><div class='del'>-      esac ;;</div><div class='del'>-    esac</div><div class='del'>-  done</div><div class='del'>-</div><div class='del'>-  (set) 2&gt;&amp;1 |</div><div class='del'>-    case $as_nl`(ac_space=' '; set) 2&gt;&amp;1` in #(</div><div class='del'>-    *${as_nl}ac_space=\ *)</div><div class='del'>-      # `set' does not quote correctly, so add quotes: double-quote</div><div class='del'>-      # substitution turns \\\\ into \\, and sed turns \\ into \.</div><div class='del'>-      sed -n \</div><div class='del'>-	"s/'/'\\\\''/g;</div><div class='del'>-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"</div><div class='del'>-      ;; #(</div><div class='del'>-    *)</div><div class='del'>-      # `set' quotes correctly as required by POSIX, so do not add quotes.</div><div class='del'>-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"</div><div class='del'>-      ;;</div><div class='del'>-    esac |</div><div class='del'>-    sort</div><div class='del'>-) |</div><div class='del'>-  sed '</div><div class='del'>-     /^ac_cv_env_/b end</div><div class='del'>-     t clear</div><div class='del'>-     :clear</div><div class='del'>-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &amp;/</div><div class='del'>-     t end</div><div class='del'>-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/</div><div class='del'>-     :end' &gt;&gt;confcache</div><div class='del'>-if diff "$cache_file" confcache &gt;/dev/null 2&gt;&amp;1; then :; else</div><div class='del'>-  if test -w "$cache_file"; then</div><div class='del'>-    test "x$cache_file" != "x/dev/null" &amp;&amp;</div><div class='del'>-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: updating cache $cache_file" &gt;&amp;6;}</div><div class='del'>-    cat confcache &gt;$cache_file</div><div class='del'>-  else</div><div class='del'>-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: not updating unwritable cache $cache_file" &gt;&amp;6;}</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-rm -f confcache</div><div class='del'>-</div><div class='del'>-test "x$prefix" = xNONE &amp;&amp; prefix=$ac_default_prefix</div><div class='del'>-# Let make expand exec_prefix.</div><div class='del'>-test "x$exec_prefix" = xNONE &amp;&amp; exec_prefix='${prefix}'</div><div class='del'>-</div><div class='del'>-DEFS=-DHAVE_CONFIG_H</div><div class='del'>-</div><div class='del'>-ac_libobjs=</div><div class='del'>-ac_ltlibobjs=</div><div class='del'>-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: &amp;&amp; continue</div><div class='del'>-  # 1. Remove the extension, and $U if already installed.</div><div class='del'>-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'</div><div class='del'>-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`</div><div class='del'>-  # 2. Prepend LIBOBJDIR.  When used with automake&gt;=1.10 LIBOBJDIR</div><div class='del'>-  #    will be set to the directory where LIBOBJS objects are built.</div><div class='del'>-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"</div><div class='del'>-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'</div><div class='del'>-done</div><div class='del'>-LIBOBJS=$ac_libobjs</div><div class='del'>-</div><div class='del'>-LTLIBOBJS=$ac_ltlibobjs</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- if test -n "$EXEEXT"; then</div><div class='del'>-  am__EXEEXT_TRUE=</div><div class='del'>-  am__EXEEXT_FALSE='#'</div><div class='del'>-else</div><div class='del'>-  am__EXEEXT_TRUE='#'</div><div class='del'>-  am__EXEEXT_FALSE=</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test -z "${MAINTAINER_MODE_TRUE}" &amp;&amp; test -z "${MAINTAINER_MODE_FALSE}"; then</div><div class='del'>-  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.</div><div class='del'>-Usually this means the macro was only invoked conditionally." "$LINENO" 5</div><div class='del'>-fi</div><div class='del'>-if test -z "${AMDEP_TRUE}" &amp;&amp; test -z "${AMDEP_FALSE}"; then</div><div class='del'>-  as_fn_error "conditional \"AMDEP\" was never defined.</div><div class='del'>-Usually this means the macro was only invoked conditionally." "$LINENO" 5</div><div class='del'>-fi</div><div class='del'>-if test -z "${am__fastdepCC_TRUE}" &amp;&amp; test -z "${am__fastdepCC_FALSE}"; then</div><div class='del'>-  as_fn_error "conditional \"am__fastdepCC\" was never defined.</div><div class='del'>-Usually this means the macro was only invoked conditionally." "$LINENO" 5</div><div class='del'>-fi</div><div class='del'>-if test -z "${HAVE_LD_VERSION_SCRIPT_TRUE}" &amp;&amp; test -z "${HAVE_LD_VERSION_SCRIPT_FALSE}"; then</div><div class='del'>-  as_fn_error "conditional \"HAVE_LD_VERSION_SCRIPT\" was never defined.</div><div class='del'>-Usually this means the macro was only invoked conditionally." "$LINENO" 5</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-: ${CONFIG_STATUS=./config.status}</div><div class='del'>-ac_write_fail=0</div><div class='del'>-ac_clean_files_save=$ac_clean_files</div><div class='del'>-ac_clean_files="$ac_clean_files $CONFIG_STATUS"</div><div class='del'>-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: creating $CONFIG_STATUS" &gt;&amp;6;}</div><div class='del'>-as_write_fail=0</div><div class='del'>-cat &gt;$CONFIG_STATUS &lt;&lt;_ASEOF || as_write_fail=1</div><div class='del'>-#! $SHELL</div><div class='del'>-# Generated by $as_me.</div><div class='del'>-# Run this file to recreate the current configuration.</div><div class='del'>-# Compiler output produced by configure, useful for debugging</div><div class='del'>-# configure, is in config.log if it exists.</div><div class='del'>-</div><div class='del'>-debug=false</div><div class='del'>-ac_cs_recheck=false</div><div class='del'>-ac_cs_silent=false</div><div class='del'>-</div><div class='del'>-SHELL=\${CONFIG_SHELL-$SHELL}</div><div class='del'>-export SHELL</div><div class='del'>-_ASEOF</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;\_ASEOF || as_write_fail=1</div><div class='del'>-## -------------------- ##</div><div class='del'>-## M4sh Initialization. ##</div><div class='del'>-## -------------------- ##</div><div class='del'>-</div><div class='del'>-# Be more Bourne compatible</div><div class='del'>-DUALCASE=1; export DUALCASE # for MKS sh</div><div class='del'>-if test -n "${ZSH_VERSION+set}" &amp;&amp; (emulate sh) &gt;/dev/null 2&gt;&amp;1; then :</div><div class='del'>-  emulate sh</div><div class='del'>-  NULLCMD=:</div><div class='del'>-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which</div><div class='del'>-  # is contrary to our usage.  Disable this feature.</div><div class='del'>-  alias -g '${1+"$@"}'='"$@"'</div><div class='del'>-  setopt NO_GLOB_SUBST</div><div class='del'>-else</div><div class='del'>-  case `(set -o) 2&gt;/dev/null` in #(</div><div class='del'>-  *posix*) :</div><div class='del'>-    set -o posix ;; #(</div><div class='del'>-  *) :</div><div class='del'>-     ;;</div><div class='del'>-esac</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-as_nl='</div><div class='del'>-'</div><div class='del'>-export as_nl</div><div class='del'>-# Printing a long string crashes Solaris 7 /usr/bin/printf.</div><div class='del'>-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'</div><div class='del'>-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo</div><div class='del'>-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo</div><div class='del'>-# Prefer a ksh shell builtin over an external printf program on Solaris,</div><div class='del'>-# but without wasting forks for bash or zsh.</div><div class='del'>-if test -z "$BASH_VERSION$ZSH_VERSION" \</div><div class='del'>-    &amp;&amp; (test "X`print -r -- $as_echo`" = "X$as_echo") 2&gt;/dev/null; then</div><div class='del'>-  as_echo='print -r --'</div><div class='del'>-  as_echo_n='print -rn --'</div><div class='del'>-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2&gt;/dev/null; then</div><div class='del'>-  as_echo='printf %s\n'</div><div class='del'>-  as_echo_n='printf %s'</div><div class='del'>-else</div><div class='del'>-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2&gt;/dev/null`" = "X-n $as_echo"; then</div><div class='del'>-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'</div><div class='del'>-    as_echo_n='/usr/ucb/echo -n'</div><div class='del'>-  else</div><div class='del'>-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'</div><div class='del'>-    as_echo_n_body='eval</div><div class='del'>-      arg=$1;</div><div class='del'>-      case $arg in #(</div><div class='del'>-      *"$as_nl"*)</div><div class='del'>-	expr "X$arg" : "X\\(.*\\)$as_nl";</div><div class='del'>-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;</div><div class='del'>-      esac;</div><div class='del'>-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"</div><div class='del'>-    '</div><div class='del'>-    export as_echo_n_body</div><div class='del'>-    as_echo_n='sh -c $as_echo_n_body as_echo'</div><div class='del'>-  fi</div><div class='del'>-  export as_echo_body</div><div class='del'>-  as_echo='sh -c $as_echo_body as_echo'</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# The user is always right.</div><div class='del'>-if test "${PATH_SEPARATOR+set}" != set; then</div><div class='del'>-  PATH_SEPARATOR=:</div><div class='del'>-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) &gt;/dev/null 2&gt;&amp;1 &amp;&amp; {</div><div class='del'>-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) &gt;/dev/null 2&gt;&amp;1 ||</div><div class='del'>-      PATH_SEPARATOR=';'</div><div class='del'>-  }</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# IFS</div><div class='del'>-# We need space, tab and new line, in precisely that order.  Quoting is</div><div class='del'>-# there to prevent editors from complaining about space-tab.</div><div class='del'>-# (If _AS_PATH_WALK were called with IFS unset, it would disable word</div><div class='del'>-# splitting by setting IFS to empty value.)</div><div class='del'>-IFS=" ""	$as_nl"</div><div class='del'>-</div><div class='del'>-# Find who we are.  Look in the path if we contain no directory separator.</div><div class='del'>-case $0 in #((</div><div class='del'>-  *[\\/]* ) as_myself=$0 ;;</div><div class='del'>-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR</div><div class='del'>-for as_dir in $PATH</div><div class='del'>-do</div><div class='del'>-  IFS=$as_save_IFS</div><div class='del'>-  test -z "$as_dir" &amp;&amp; as_dir=.</div><div class='del'>-    test -r "$as_dir/$0" &amp;&amp; as_myself=$as_dir/$0 &amp;&amp; break</div><div class='del'>-  done</div><div class='del'>-IFS=$as_save_IFS</div><div class='del'>-</div><div class='del'>-     ;;</div><div class='del'>-esac</div><div class='del'>-# We did not find ourselves, most probably we were run as `sh COMMAND'</div><div class='del'>-# in which case we are not to be found in the path.</div><div class='del'>-if test "x$as_myself" = x; then</div><div class='del'>-  as_myself=$0</div><div class='del'>-fi</div><div class='del'>-if test ! -f "$as_myself"; then</div><div class='del'>-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" &gt;&amp;2</div><div class='del'>-  exit 1</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Unset variables that we do not need and which cause bugs (e.g. in</div><div class='del'>-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"</div><div class='del'>-# suppresses any "Segmentation fault" message there.  '((' could</div><div class='del'>-# trigger a bug in pdksh 5.2.14.</div><div class='del'>-for as_var in BASH_ENV ENV MAIL MAILPATH</div><div class='del'>-do eval test x\${$as_var+set} = xset \</div><div class='del'>-  &amp;&amp; ( (unset $as_var) || exit 1) &gt;/dev/null 2&gt;&amp;1 &amp;&amp; unset $as_var || :</div><div class='del'>-done</div><div class='del'>-PS1='$ '</div><div class='del'>-PS2='&gt; '</div><div class='del'>-PS4='+ '</div><div class='del'>-</div><div class='del'>-# NLS nuisances.</div><div class='del'>-LC_ALL=C</div><div class='del'>-export LC_ALL</div><div class='del'>-LANGUAGE=C</div><div class='del'>-export LANGUAGE</div><div class='del'>-</div><div class='del'>-# CDPATH.</div><div class='del'>-(unset CDPATH) &gt;/dev/null 2&gt;&amp;1 &amp;&amp; unset CDPATH</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# as_fn_error ERROR [LINENO LOG_FD]</div><div class='del'>-# ---------------------------------</div><div class='del'>-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are</div><div class='del'>-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the</div><div class='del'>-# script with status $?, using 1 if that was 0.</div><div class='del'>-as_fn_error ()</div><div class='del'>-{</div><div class='del'>-  as_status=$?; test $as_status -eq 0 &amp;&amp; as_status=1</div><div class='del'>-  if test "$3"; then</div><div class='del'>-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack</div><div class='del'>-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" &gt;&amp;$3</div><div class='del'>-  fi</div><div class='del'>-  $as_echo "$as_me: error: $1" &gt;&amp;2</div><div class='del'>-  as_fn_exit $as_status</div><div class='del'>-} # as_fn_error</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# as_fn_set_status STATUS</div><div class='del'>-# -----------------------</div><div class='del'>-# Set $? to STATUS, without forking.</div><div class='del'>-as_fn_set_status ()</div><div class='del'>-{</div><div class='del'>-  return $1</div><div class='del'>-} # as_fn_set_status</div><div class='del'>-</div><div class='del'>-# as_fn_exit STATUS</div><div class='del'>-# -----------------</div><div class='del'>-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.</div><div class='del'>-as_fn_exit ()</div><div class='del'>-{</div><div class='del'>-  set +e</div><div class='del'>-  as_fn_set_status $1</div><div class='del'>-  exit $1</div><div class='del'>-} # as_fn_exit</div><div class='del'>-</div><div class='del'>-# as_fn_unset VAR</div><div class='del'>-# ---------------</div><div class='del'>-# Portably unset VAR.</div><div class='del'>-as_fn_unset ()</div><div class='del'>-{</div><div class='del'>-  { eval $1=; unset $1;}</div><div class='del'>-}</div><div class='del'>-as_unset=as_fn_unset</div><div class='del'>-# as_fn_append VAR VALUE</div><div class='del'>-# ----------------------</div><div class='del'>-# Append the text in VALUE to the end of the definition contained in VAR. Take</div><div class='del'>-# advantage of any shell optimizations that allow amortized linear growth over</div><div class='del'>-# repeated appends, instead of the typical quadratic growth present in naive</div><div class='del'>-# implementations.</div><div class='del'>-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2&gt;/dev/null; then :</div><div class='del'>-  eval 'as_fn_append ()</div><div class='del'>-  {</div><div class='del'>-    eval $1+=\$2</div><div class='del'>-  }'</div><div class='del'>-else</div><div class='del'>-  as_fn_append ()</div><div class='del'>-  {</div><div class='del'>-    eval $1=\$$1\$2</div><div class='del'>-  }</div><div class='del'>-fi # as_fn_append</div><div class='del'>-</div><div class='del'>-# as_fn_arith ARG...</div><div class='del'>-# ------------------</div><div class='del'>-# Perform arithmetic evaluation on the ARGs, and store the result in the</div><div class='del'>-# global $as_val. Take advantage of shells that can avoid forks. The arguments</div><div class='del'>-# must be portable across $(()) and expr.</div><div class='del'>-if (eval "test \$(( 1 + 1 )) = 2") 2&gt;/dev/null; then :</div><div class='del'>-  eval 'as_fn_arith ()</div><div class='del'>-  {</div><div class='del'>-    as_val=$(( $* ))</div><div class='del'>-  }'</div><div class='del'>-else</div><div class='del'>-  as_fn_arith ()</div><div class='del'>-  {</div><div class='del'>-    as_val=`expr "$@" || test $? -eq 1`</div><div class='del'>-  }</div><div class='del'>-fi # as_fn_arith</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-if expr a : '\(a\)' &gt;/dev/null 2&gt;&amp;1 &amp;&amp;</div><div class='del'>-   test "X`expr 00001 : '.*\(...\)'`" = X001; then</div><div class='del'>-  as_expr=expr</div><div class='del'>-else</div><div class='del'>-  as_expr=false</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if (basename -- /) &gt;/dev/null 2&gt;&amp;1 &amp;&amp; test "X`basename -- / 2&gt;&amp;1`" = "X/"; then</div><div class='del'>-  as_basename=basename</div><div class='del'>-else</div><div class='del'>-  as_basename=false</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if (as_dir=`dirname -- /` &amp;&amp; test "X$as_dir" = X/) &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-  as_dirname=dirname</div><div class='del'>-else</div><div class='del'>-  as_dirname=false</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-as_me=`$as_basename -- "$0" ||</div><div class='del'>-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \</div><div class='del'>-	 X"$0" : 'X\(//\)$' \| \</div><div class='del'>-	 X"$0" : 'X\(/\)' \| . 2&gt;/dev/null ||</div><div class='del'>-$as_echo X/"$0" |</div><div class='del'>-    sed '/^.*\/\([^/][^/]*\)\/*$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\/\(\/\/\)$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\/\(\/\).*/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  s/.*/./; q'`</div><div class='del'>-</div><div class='del'>-# Avoid depending upon Character Ranges.</div><div class='del'>-as_cr_letters='abcdefghijklmnopqrstuvwxyz'</div><div class='del'>-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'</div><div class='del'>-as_cr_Letters=$as_cr_letters$as_cr_LETTERS</div><div class='del'>-as_cr_digits='0123456789'</div><div class='del'>-as_cr_alnum=$as_cr_Letters$as_cr_digits</div><div class='del'>-</div><div class='del'>-ECHO_C= ECHO_N= ECHO_T=</div><div class='del'>-case `echo -n x` in #(((((</div><div class='del'>--n*)</div><div class='del'>-  case `echo 'xy\c'` in</div><div class='del'>-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.</div><div class='del'>-  xy)  ECHO_C='\c';;</div><div class='del'>-  *)   echo `echo ksh88 bug on AIX 6.1` &gt; /dev/null</div><div class='del'>-       ECHO_T='	';;</div><div class='del'>-  esac;;</div><div class='del'>-*)</div><div class='del'>-  ECHO_N='-n';;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-rm -f conf$$ conf$$.exe conf$$.file</div><div class='del'>-if test -d conf$$.dir; then</div><div class='del'>-  rm -f conf$$.dir/conf$$.file</div><div class='del'>-else</div><div class='del'>-  rm -f conf$$.dir</div><div class='del'>-  mkdir conf$$.dir 2&gt;/dev/null</div><div class='del'>-fi</div><div class='del'>-if (echo &gt;conf$$.file) 2&gt;/dev/null; then</div><div class='del'>-  if ln -s conf$$.file conf$$ 2&gt;/dev/null; then</div><div class='del'>-    as_ln_s='ln -s'</div><div class='del'>-    # ... but there are two gotchas:</div><div class='del'>-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.</div><div class='del'>-    # 2) DJGPP &lt; 2.04 has no symlinks; `ln -s' creates a wrapper executable.</div><div class='del'>-    # In both cases, we have to default to `cp -p'.</div><div class='del'>-    ln -s conf$$.file conf$$.dir 2&gt;/dev/null &amp;&amp; test ! -f conf$$.exe ||</div><div class='del'>-      as_ln_s='cp -p'</div><div class='del'>-  elif ln conf$$.file conf$$ 2&gt;/dev/null; then</div><div class='del'>-    as_ln_s=ln</div><div class='del'>-  else</div><div class='del'>-    as_ln_s='cp -p'</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  as_ln_s='cp -p'</div><div class='del'>-fi</div><div class='del'>-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file</div><div class='del'>-rmdir conf$$.dir 2&gt;/dev/null</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# as_fn_mkdir_p</div><div class='del'>-# -------------</div><div class='del'>-# Create "$as_dir" as a directory, including parents if necessary.</div><div class='del'>-as_fn_mkdir_p ()</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-  case $as_dir in #(</div><div class='del'>-  -*) as_dir=./$as_dir;;</div><div class='del'>-  esac</div><div class='del'>-  test -d "$as_dir" || eval $as_mkdir_p || {</div><div class='del'>-    as_dirs=</div><div class='del'>-    while :; do</div><div class='del'>-      case $as_dir in #(</div><div class='del'>-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(</div><div class='del'>-      *) as_qdir=$as_dir;;</div><div class='del'>-      esac</div><div class='del'>-      as_dirs="'$as_qdir' $as_dirs"</div><div class='del'>-      as_dir=`$as_dirname -- "$as_dir" ||</div><div class='del'>-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \</div><div class='del'>-	 X"$as_dir" : 'X\(//\)[^/]' \| \</div><div class='del'>-	 X"$as_dir" : 'X\(//\)$' \| \</div><div class='del'>-	 X"$as_dir" : 'X\(/\)' \| . 2&gt;/dev/null ||</div><div class='del'>-$as_echo X"$as_dir" |</div><div class='del'>-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\/\)[^/].*/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\/\)$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\).*/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  s/.*/./; q'`</div><div class='del'>-      test -d "$as_dir" &amp;&amp; break</div><div class='del'>-    done</div><div class='del'>-    test -z "$as_dirs" || eval "mkdir $as_dirs"</div><div class='del'>-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-} # as_fn_mkdir_p</div><div class='del'>-if mkdir -p . 2&gt;/dev/null; then</div><div class='del'>-  as_mkdir_p='mkdir -p "$as_dir"'</div><div class='del'>-else</div><div class='del'>-  test -d ./-p &amp;&amp; rmdir ./-p</div><div class='del'>-  as_mkdir_p=false</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test -x / &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-  as_test_x='test -x'</div><div class='del'>-else</div><div class='del'>-  if ls -dL / &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-    as_ls_L_option=L</div><div class='del'>-  else</div><div class='del'>-    as_ls_L_option=</div><div class='del'>-  fi</div><div class='del'>-  as_test_x='</div><div class='del'>-    eval sh -c '\''</div><div class='del'>-      if test -d "$1"; then</div><div class='del'>-	test -d "$1/.";</div><div class='del'>-      else</div><div class='del'>-	case $1 in #(</div><div class='del'>-	-*)set "./$1";;</div><div class='del'>-	esac;</div><div class='del'>-	case `ls -ld'$as_ls_L_option' "$1" 2&gt;/dev/null` in #((</div><div class='del'>-	???[sx]*):;;*)false;;esac;fi</div><div class='del'>-    '\'' sh</div><div class='del'>-  '</div><div class='del'>-fi</div><div class='del'>-as_executable_p=$as_test_x</div><div class='del'>-</div><div class='del'>-# Sed expression to map a string onto a valid CPP name.</div><div class='del'>-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"</div><div class='del'>-</div><div class='del'>-# Sed expression to map a string onto a valid variable name.</div><div class='del'>-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-exec 6&gt;&amp;1</div><div class='del'>-## ----------------------------------- ##</div><div class='del'>-## Main body of $CONFIG_STATUS script. ##</div><div class='del'>-## ----------------------------------- ##</div><div class='del'>-_ASEOF</div><div class='del'>-test $as_write_fail = 0 &amp;&amp; chmod +x $CONFIG_STATUS || ac_write_fail=1</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;\_ACEOF || ac_write_fail=1</div><div class='del'>-# Save the log message, to keep $0 and so on meaningful, and to</div><div class='del'>-# report actual input values of CONFIG_FILES etc. instead of their</div><div class='del'>-# values after options handling.</div><div class='del'>-ac_log="</div><div class='del'>-This file was extended by libpng $as_me 1.4.0, which was</div><div class='del'>-generated by GNU Autoconf 2.65.  Invocation command line was</div><div class='del'>-</div><div class='del'>-  CONFIG_FILES    = $CONFIG_FILES</div><div class='del'>-  CONFIG_HEADERS  = $CONFIG_HEADERS</div><div class='del'>-  CONFIG_LINKS    = $CONFIG_LINKS</div><div class='del'>-  CONFIG_COMMANDS = $CONFIG_COMMANDS</div><div class='del'>-  $ $0 $@</div><div class='del'>-</div><div class='del'>-on `(hostname || uname -n) 2&gt;/dev/null | sed 1q`</div><div class='del'>-"</div><div class='del'>-</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-case $ac_config_files in *"</div><div class='del'>-"*) set x $ac_config_files; shift; ac_config_files=$*;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-case $ac_config_headers in *"</div><div class='del'>-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;_ACEOF || ac_write_fail=1</div><div class='del'>-# Files that config.status was made for.</div><div class='del'>-config_files="$ac_config_files"</div><div class='del'>-config_headers="$ac_config_headers"</div><div class='del'>-config_commands="$ac_config_commands"</div><div class='del'>-</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;\_ACEOF || ac_write_fail=1</div><div class='del'>-ac_cs_usage="\</div><div class='del'>-\`$as_me' instantiates files and other configuration actions</div><div class='del'>-from templates according to the current configuration.  Unless the files</div><div class='del'>-and actions are specified as TAGs, all are instantiated by default.</div><div class='del'>-</div><div class='del'>-Usage: $0 [OPTION]... [TAG]...</div><div class='del'>-</div><div class='del'>-  -h, --help       print this help, then exit</div><div class='del'>-  -V, --version    print version number and configuration settings, then exit</div><div class='del'>-      --config     print configuration, then exit</div><div class='del'>-  -q, --quiet, --silent</div><div class='del'>-                   do not print progress messages</div><div class='del'>-  -d, --debug      don't remove temporary files</div><div class='del'>-      --recheck    update $as_me by reconfiguring in the same conditions</div><div class='del'>-      --file=FILE[:TEMPLATE]</div><div class='del'>-                   instantiate the configuration file FILE</div><div class='del'>-      --header=FILE[:TEMPLATE]</div><div class='del'>-                   instantiate the configuration header FILE</div><div class='del'>-</div><div class='del'>-Configuration files:</div><div class='del'>-$config_files</div><div class='del'>-</div><div class='del'>-Configuration headers:</div><div class='del'>-$config_headers</div><div class='del'>-</div><div class='del'>-Configuration commands:</div><div class='del'>-$config_commands</div><div class='del'>-</div><div class='del'>-Report bugs to &lt;png-mng-implement@lists.sourceforge.net&gt;."</div><div class='del'>-</div><div class='del'>-_ACEOF</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;_ACEOF || ac_write_fail=1</div><div class='del'>-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&amp;/g'`"</div><div class='del'>-ac_cs_version="\\</div><div class='del'>-libpng config.status 1.4.0</div><div class='del'>-configured by $0, generated by GNU Autoconf 2.65,</div><div class='del'>-  with options \\"\$ac_cs_config\\"</div><div class='del'>-</div><div class='del'>-Copyright (C) 2009 Free Software Foundation, Inc.</div><div class='del'>-This config.status script is free software; the Free Software Foundation</div><div class='del'>-gives unlimited permission to copy, distribute and modify it."</div><div class='del'>-</div><div class='del'>-ac_pwd='$ac_pwd'</div><div class='del'>-srcdir='$srcdir'</div><div class='del'>-INSTALL='$INSTALL'</div><div class='del'>-MKDIR_P='$MKDIR_P'</div><div class='del'>-AWK='$AWK'</div><div class='del'>-test -n "\$AWK" || AWK=awk</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;\_ACEOF || ac_write_fail=1</div><div class='del'>-# The default lists apply if the user does not specify any file.</div><div class='del'>-ac_need_defaults=:</div><div class='del'>-while test $# != 0</div><div class='del'>-do</div><div class='del'>-  case $1 in</div><div class='del'>-  --*=*)</div><div class='del'>-    ac_option=`expr "X$1" : 'X\([^=]*\)='`</div><div class='del'>-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`</div><div class='del'>-    ac_shift=:</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    ac_option=$1</div><div class='del'>-    ac_optarg=$2</div><div class='del'>-    ac_shift=shift</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  case $ac_option in</div><div class='del'>-  # Handling of the options.</div><div class='del'>-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)</div><div class='del'>-    ac_cs_recheck=: ;;</div><div class='del'>-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )</div><div class='del'>-    $as_echo "$ac_cs_version"; exit ;;</div><div class='del'>-  --config | --confi | --conf | --con | --co | --c )</div><div class='del'>-    $as_echo "$ac_cs_config"; exit ;;</div><div class='del'>-  --debug | --debu | --deb | --de | --d | -d )</div><div class='del'>-    debug=: ;;</div><div class='del'>-  --file | --fil | --fi | --f )</div><div class='del'>-    $ac_shift</div><div class='del'>-    case $ac_optarg in</div><div class='del'>-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;</div><div class='del'>-    esac</div><div class='del'>-    as_fn_append CONFIG_FILES " '$ac_optarg'"</div><div class='del'>-    ac_need_defaults=false;;</div><div class='del'>-  --header | --heade | --head | --hea )</div><div class='del'>-    $ac_shift</div><div class='del'>-    case $ac_optarg in</div><div class='del'>-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;</div><div class='del'>-    esac</div><div class='del'>-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"</div><div class='del'>-    ac_need_defaults=false;;</div><div class='del'>-  --he | --h)</div><div class='del'>-    # Conflict between --help and --header</div><div class='del'>-    as_fn_error "ambiguous option: \`$1'</div><div class='del'>-Try \`$0 --help' for more information.";;</div><div class='del'>-  --help | --hel | -h )</div><div class='del'>-    $as_echo "$ac_cs_usage"; exit ;;</div><div class='del'>-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \</div><div class='del'>-  | -silent | --silent | --silen | --sile | --sil | --si | --s)</div><div class='del'>-    ac_cs_silent=: ;;</div><div class='del'>-</div><div class='del'>-  # This is an error.</div><div class='del'>-  -*) as_fn_error "unrecognized option: \`$1'</div><div class='del'>-Try \`$0 --help' for more information." ;;</div><div class='del'>-</div><div class='del'>-  *) as_fn_append ac_config_targets " $1"</div><div class='del'>-     ac_need_defaults=false ;;</div><div class='del'>-</div><div class='del'>-  esac</div><div class='del'>-  shift</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-ac_configure_extra_args=</div><div class='del'>-</div><div class='del'>-if $ac_cs_silent; then</div><div class='del'>-  exec 6&gt;/dev/null</div><div class='del'>-  ac_configure_extra_args="$ac_configure_extra_args --silent"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-_ACEOF</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;_ACEOF || ac_write_fail=1</div><div class='del'>-if \$ac_cs_recheck; then</div><div class='del'>-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion</div><div class='del'>-  shift</div><div class='del'>-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" &gt;&amp;6</div><div class='del'>-  CONFIG_SHELL='$SHELL'</div><div class='del'>-  export CONFIG_SHELL</div><div class='del'>-  exec "\$@"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-_ACEOF</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;\_ACEOF || ac_write_fail=1</div><div class='del'>-exec 5&gt;&gt;config.log</div><div class='del'>-{</div><div class='del'>-  echo</div><div class='del'>-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' &lt;&lt;_ASBOX</div><div class='del'>-## Running $as_me. ##</div><div class='del'>-_ASBOX</div><div class='del'>-  $as_echo "$ac_log"</div><div class='del'>-} &gt;&amp;5</div><div class='del'>-</div><div class='del'>-_ACEOF</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;_ACEOF || ac_write_fail=1</div><div class='del'>-#</div><div class='del'>-# INIT-COMMANDS</div><div class='del'>-#</div><div class='del'>-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# The HP-UX ksh and POSIX shell print the target directory to stdout</div><div class='del'>-# if CDPATH is set.</div><div class='del'>-(unset CDPATH) &gt;/dev/null 2&gt;&amp;1 &amp;&amp; unset CDPATH</div><div class='del'>-</div><div class='del'>-sed_quote_subst='$sed_quote_subst'</div><div class='del'>-double_quote_subst='$double_quote_subst'</div><div class='del'>-delay_variable_subst='$delay_variable_subst'</div><div class='del'>-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'</div><div class='del'>-</div><div class='del'>-LTCC='$LTCC'</div><div class='del'>-LTCFLAGS='$LTCFLAGS'</div><div class='del'>-compiler='$compiler_DEFAULT'</div><div class='del'>-</div><div class='del'>-# Quote evaled strings.</div><div class='del'>-for var in SED \</div><div class='del'>-GREP \</div><div class='del'>-EGREP \</div><div class='del'>-FGREP \</div><div class='del'>-LD \</div><div class='del'>-NM \</div><div class='del'>-LN_S \</div><div class='del'>-lt_SP2NL \</div><div class='del'>-lt_NL2SP \</div><div class='del'>-reload_flag \</div><div class='del'>-deplibs_check_method \</div><div class='del'>-file_magic_cmd \</div><div class='del'>-AR \</div><div class='del'>-AR_FLAGS \</div><div class='del'>-STRIP \</div><div class='del'>-RANLIB \</div><div class='del'>-CC \</div><div class='del'>-CFLAGS \</div><div class='del'>-compiler \</div><div class='del'>-lt_cv_sys_global_symbol_pipe \</div><div class='del'>-lt_cv_sys_global_symbol_to_cdecl \</div><div class='del'>-lt_cv_sys_global_symbol_to_c_name_address \</div><div class='del'>-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \</div><div class='del'>-SHELL \</div><div class='del'>-ECHO \</div><div class='del'>-lt_prog_compiler_no_builtin_flag \</div><div class='del'>-lt_prog_compiler_wl \</div><div class='del'>-lt_prog_compiler_pic \</div><div class='del'>-lt_prog_compiler_static \</div><div class='del'>-lt_cv_prog_compiler_c_o \</div><div class='del'>-need_locks \</div><div class='del'>-DSYMUTIL \</div><div class='del'>-NMEDIT \</div><div class='del'>-LIPO \</div><div class='del'>-OTOOL \</div><div class='del'>-OTOOL64 \</div><div class='del'>-shrext_cmds \</div><div class='del'>-export_dynamic_flag_spec \</div><div class='del'>-whole_archive_flag_spec \</div><div class='del'>-compiler_needs_object \</div><div class='del'>-with_gnu_ld \</div><div class='del'>-allow_undefined_flag \</div><div class='del'>-no_undefined_flag \</div><div class='del'>-hardcode_libdir_flag_spec \</div><div class='del'>-hardcode_libdir_flag_spec_ld \</div><div class='del'>-hardcode_libdir_separator \</div><div class='del'>-fix_srcfile_path \</div><div class='del'>-exclude_expsyms \</div><div class='del'>-include_expsyms \</div><div class='del'>-file_list_spec \</div><div class='del'>-variables_saved_for_relink \</div><div class='del'>-libname_spec \</div><div class='del'>-library_names_spec \</div><div class='del'>-soname_spec \</div><div class='del'>-finish_eval \</div><div class='del'>-old_striplib \</div><div class='del'>-striplib; do</div><div class='del'>-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in</div><div class='del'>-    *[\\\\\\\`\\"\\\$]*)</div><div class='del'>-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""</div><div class='del'>-      ;;</div><div class='del'>-    *)</div><div class='del'>-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-# Double-quote double-evaled strings.</div><div class='del'>-for var in reload_cmds \</div><div class='del'>-old_postinstall_cmds \</div><div class='del'>-old_postuninstall_cmds \</div><div class='del'>-old_archive_cmds \</div><div class='del'>-extract_expsyms_cmds \</div><div class='del'>-old_archive_from_new_cmds \</div><div class='del'>-old_archive_from_expsyms_cmds \</div><div class='del'>-archive_cmds \</div><div class='del'>-archive_expsym_cmds \</div><div class='del'>-module_cmds \</div><div class='del'>-module_expsym_cmds \</div><div class='del'>-export_symbols_cmds \</div><div class='del'>-prelink_cmds \</div><div class='del'>-postinstall_cmds \</div><div class='del'>-postuninstall_cmds \</div><div class='del'>-finish_cmds \</div><div class='del'>-sys_lib_search_path_spec \</div><div class='del'>-sys_lib_dlsearch_path_spec; do</div><div class='del'>-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in</div><div class='del'>-    *[\\\\\\\`\\"\\\$]*)</div><div class='del'>-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""</div><div class='del'>-      ;;</div><div class='del'>-    *)</div><div class='del'>-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-# Fix-up fallback echo if it was mangled by the above quoting rules.</div><div class='del'>-case \$lt_ECHO in</div><div class='del'>-*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-ac_aux_dir='$ac_aux_dir'</div><div class='del'>-xsi_shell='$xsi_shell'</div><div class='del'>-lt_shell_append='$lt_shell_append'</div><div class='del'>-</div><div class='del'>-# See if we are running on zsh, and set the options which allow our</div><div class='del'>-# commands through without removal of \ escapes INIT.</div><div class='del'>-if test -n "\${ZSH_VERSION+set}" ; then</div><div class='del'>-   setopt NO_GLOB_SUBST</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    PACKAGE='$PACKAGE'</div><div class='del'>-    VERSION='$VERSION'</div><div class='del'>-    TIMESTAMP='$TIMESTAMP'</div><div class='del'>-    RM='$RM'</div><div class='del'>-    ofile='$ofile'</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;\_ACEOF || ac_write_fail=1</div><div class='del'>-</div><div class='del'>-# Handling of arguments.</div><div class='del'>-for ac_config_target in $ac_config_targets</div><div class='del'>-do</div><div class='del'>-  case $ac_config_target in</div><div class='del'>-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;</div><div class='del'>-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;</div><div class='del'>-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;</div><div class='del'>-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;</div><div class='del'>-    "libpng.pc") CONFIG_FILES="$CONFIG_FILES libpng.pc:libpng.pc.in" ;;</div><div class='del'>-    "libpng-config") CONFIG_FILES="$CONFIG_FILES libpng-config:libpng-config.in" ;;</div><div class='del'>-</div><div class='del'>-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;</div><div class='del'>-  esac</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# If the user did not use the arguments to specify the items to instantiate,</div><div class='del'>-# then the envvar interface is used.  Set only those that are not.</div><div class='del'>-# We use the long form for the default assignment because of an extremely</div><div class='del'>-# bizarre bug on SunOS 4.1.3.</div><div class='del'>-if $ac_need_defaults; then</div><div class='del'>-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files</div><div class='del'>-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers</div><div class='del'>-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Have a temporary directory for convenience.  Make it in the build tree</div><div class='del'>-# simply because there is no reason against having it here, and in addition,</div><div class='del'>-# creating and moving files from /tmp can sometimes cause problems.</div><div class='del'>-# Hook for its removal unless debugging.</div><div class='del'>-# Note that there is a small window in which the directory will not be cleaned:</div><div class='del'>-# after its creation but before its name has been assigned to `$tmp'.</div><div class='del'>-$debug ||</div><div class='del'>-{</div><div class='del'>-  tmp=</div><div class='del'>-  trap 'exit_status=$?</div><div class='del'>-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } &amp;&amp; exit $exit_status</div><div class='del'>-' 0</div><div class='del'>-  trap 'as_fn_exit 1' 1 2 13 15</div><div class='del'>-}</div><div class='del'>-# Create a (secure) tmp directory for tmp files.</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-  tmp=`(umask 077 &amp;&amp; mktemp -d "./confXXXXXX") 2&gt;/dev/null` &amp;&amp;</div><div class='del'>-  test -n "$tmp" &amp;&amp; test -d "$tmp"</div><div class='del'>-}  ||</div><div class='del'>-{</div><div class='del'>-  tmp=./conf$$-$RANDOM</div><div class='del'>-  (umask 077 &amp;&amp; mkdir "$tmp")</div><div class='del'>-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5</div><div class='del'>-</div><div class='del'>-# Set up the scripts for CONFIG_FILES section.</div><div class='del'>-# No need to generate them if there are no CONFIG_FILES.</div><div class='del'>-# This happens for instance with `./config.status config.h'.</div><div class='del'>-if test -n "$CONFIG_FILES"; then</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ac_cr=`echo X | tr X '\015'`</div><div class='del'>-# On cygwin, bash can eat \r inside `` if the user requested igncr.</div><div class='del'>-# But we know of no other shell where ac_cr would be empty at this</div><div class='del'>-# point, so we can use a bashism as a fallback.</div><div class='del'>-if test "x$ac_cr" = x; then</div><div class='del'>-  eval ac_cr=\$\'\\r\'</div><div class='del'>-fi</div><div class='del'>-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' &lt;/dev/null 2&gt;/dev/null`</div><div class='del'>-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then</div><div class='del'>-  ac_cs_awk_cr='\r'</div><div class='del'>-else</div><div class='del'>-  ac_cs_awk_cr=$ac_cr</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-echo 'BEGIN {' &gt;"$tmp/subs1.awk" &amp;&amp;</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-  echo "cat &gt;conf$$subs.awk &lt;&lt;_ACEOF" &amp;&amp;</div><div class='del'>-  echo "$ac_subst_vars" | sed 's/.*/&amp;!$&amp;$ac_delim/' &amp;&amp;</div><div class='del'>-  echo "_ACEOF"</div><div class='del'>-} &gt;conf$$subs.sh ||</div><div class='del'>-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5</div><div class='del'>-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`</div><div class='del'>-ac_delim='%!_!# '</div><div class='del'>-for ac_last_try in false false false false false :; do</div><div class='del'>-  . ./conf$$subs.sh ||</div><div class='del'>-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5</div><div class='del'>-</div><div class='del'>-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`</div><div class='del'>-  if test $ac_delim_n = $ac_delim_num; then</div><div class='del'>-    break</div><div class='del'>-  elif $ac_last_try; then</div><div class='del'>-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5</div><div class='del'>-  else</div><div class='del'>-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-rm -f conf$$subs.sh</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;_ACEOF || ac_write_fail=1</div><div class='del'>-cat &gt;&gt;"\$tmp/subs1.awk" &lt;&lt;\\_ACAWK &amp;&amp;</div><div class='del'>-_ACEOF</div><div class='del'>-sed -n '</div><div class='del'>-h</div><div class='del'>-s/^/S["/; s/!.*/"]=/</div><div class='del'>-p</div><div class='del'>-g</div><div class='del'>-s/^[^!]*!//</div><div class='del'>-:repl</div><div class='del'>-t repl</div><div class='del'>-s/'"$ac_delim"'$//</div><div class='del'>-t delim</div><div class='del'>-:nl</div><div class='del'>-h</div><div class='del'>-s/\(.\{148\}\)..*/\1/</div><div class='del'>-t more1</div><div class='del'>-s/["\\]/\\&amp;/g; s/^/"/; s/$/\\n"\\/</div><div class='del'>-p</div><div class='del'>-n</div><div class='del'>-b repl</div><div class='del'>-:more1</div><div class='del'>-s/["\\]/\\&amp;/g; s/^/"/; s/$/"\\/</div><div class='del'>-p</div><div class='del'>-g</div><div class='del'>-s/.\{148\}//</div><div class='del'>-t nl</div><div class='del'>-:delim</div><div class='del'>-h</div><div class='del'>-s/\(.\{148\}\)..*/\1/</div><div class='del'>-t more2</div><div class='del'>-s/["\\]/\\&amp;/g; s/^/"/; s/$/"/</div><div class='del'>-p</div><div class='del'>-b</div><div class='del'>-:more2</div><div class='del'>-s/["\\]/\\&amp;/g; s/^/"/; s/$/"\\/</div><div class='del'>-p</div><div class='del'>-g</div><div class='del'>-s/.\{148\}//</div><div class='del'>-t delim</div><div class='del'>-' &lt;conf$$subs.awk | sed '</div><div class='del'>-/^[^""]/{</div><div class='del'>-  N</div><div class='del'>-  s/\n//</div><div class='del'>-}</div><div class='del'>-' &gt;&gt;$CONFIG_STATUS || ac_write_fail=1</div><div class='del'>-rm -f conf$$subs.awk</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;_ACEOF || ac_write_fail=1</div><div class='del'>-_ACAWK</div><div class='del'>-cat &gt;&gt;"\$tmp/subs1.awk" &lt;&lt;_ACAWK &amp;&amp;</div><div class='del'>-  for (key in S) S_is_set[key] = 1</div><div class='del'>-  FS = ""</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-{</div><div class='del'>-  line = $ 0</div><div class='del'>-  nfields = split(line, field, "@")</div><div class='del'>-  substed = 0</div><div class='del'>-  len = length(field[1])</div><div class='del'>-  for (i = 2; i &lt; nfields; i++) {</div><div class='del'>-    key = field[i]</div><div class='del'>-    keylen = length(key)</div><div class='del'>-    if (S_is_set[key]) {</div><div class='del'>-      value = S[key]</div><div class='del'>-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)</div><div class='del'>-      len += length(value) + length(field[++i])</div><div class='del'>-      substed = 1</div><div class='del'>-    } else</div><div class='del'>-      len += 1 + keylen</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  print line</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-_ACAWK</div><div class='del'>-_ACEOF</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;\_ACEOF || ac_write_fail=1</div><div class='del'>-if sed "s/$ac_cr//" &lt; /dev/null &gt; /dev/null 2&gt;&amp;1; then</div><div class='del'>-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"</div><div class='del'>-else</div><div class='del'>-  cat</div><div class='del'>-fi &lt; "$tmp/subs1.awk" &gt; "$tmp/subs.awk" \</div><div class='del'>-  || as_fn_error "could not setup config files machinery" "$LINENO" 5</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-# VPATH may cause trouble with some makes, so we remove $(srcdir),</div><div class='del'>-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and</div><div class='del'>-# trailing colons and then remove the whole line if VPATH becomes empty</div><div class='del'>-# (actually we leave an empty line to preserve line numbers).</div><div class='del'>-if test "x$srcdir" = x.; then</div><div class='del'>-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{</div><div class='del'>-s/:*\$(srcdir):*/:/</div><div class='del'>-s/:*\${srcdir}:*/:/</div><div class='del'>-s/:*@srcdir@:*/:/</div><div class='del'>-s/^\([^=]*=[	 ]*\):*/\1/</div><div class='del'>-s/:*$//</div><div class='del'>-s/^[^=]*=[	 ]*$//</div><div class='del'>-}'</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;\_ACEOF || ac_write_fail=1</div><div class='del'>-fi # test -n "$CONFIG_FILES"</div><div class='del'>-</div><div class='del'>-# Set up the scripts for CONFIG_HEADERS section.</div><div class='del'>-# No need to generate them if there are no CONFIG_HEADERS.</div><div class='del'>-# This happens for instance with `./config.status Makefile'.</div><div class='del'>-if test -n "$CONFIG_HEADERS"; then</div><div class='del'>-cat &gt;"$tmp/defines.awk" &lt;&lt;\_ACAWK ||</div><div class='del'>-BEGIN {</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-# Transform confdefs.h into an awk script `defines.awk', embedded as</div><div class='del'>-# here-document in config.status, that substitutes the proper values into</div><div class='del'>-# config.h.in to produce config.h.</div><div class='del'>-</div><div class='del'>-# Create a delimiter string that does not exist in confdefs.h, to ease</div><div class='del'>-# handling of long lines.</div><div class='del'>-ac_delim='%!_!# '</div><div class='del'>-for ac_last_try in false false :; do</div><div class='del'>-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`</div><div class='del'>-  if test -z "$ac_t"; then</div><div class='del'>-    break</div><div class='del'>-  elif $ac_last_try; then</div><div class='del'>-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5</div><div class='del'>-  else</div><div class='del'>-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-# For the awk script, D is an array of macro values keyed by name,</div><div class='del'>-# likewise P contains macro parameters if any.  Preserve backslash</div><div class='del'>-# newline sequences.</div><div class='del'>-</div><div class='del'>-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*</div><div class='del'>-sed -n '</div><div class='del'>-s/.\{148\}/&amp;'"$ac_delim"'/g</div><div class='del'>-t rset</div><div class='del'>-:rset</div><div class='del'>-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /</div><div class='del'>-t def</div><div class='del'>-d</div><div class='del'>-:def</div><div class='del'>-s/\\$//</div><div class='del'>-t bsnl</div><div class='del'>-s/["\\]/\\&amp;/g</div><div class='del'>-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\</div><div class='del'>-D["\1"]=" \3"/p</div><div class='del'>-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p</div><div class='del'>-d</div><div class='del'>-:bsnl</div><div class='del'>-s/["\\]/\\&amp;/g</div><div class='del'>-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\</div><div class='del'>-D["\1"]=" \3\\\\\\n"\\/p</div><div class='del'>-t cont</div><div class='del'>-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p</div><div class='del'>-t cont</div><div class='del'>-d</div><div class='del'>-:cont</div><div class='del'>-n</div><div class='del'>-s/.\{148\}/&amp;'"$ac_delim"'/g</div><div class='del'>-t clear</div><div class='del'>-:clear</div><div class='del'>-s/\\$//</div><div class='del'>-t bsnlc</div><div class='del'>-s/["\\]/\\&amp;/g; s/^/"/; s/$/"/p</div><div class='del'>-d</div><div class='del'>-:bsnlc</div><div class='del'>-s/["\\]/\\&amp;/g; s/^/"/; s/$/\\\\\\n"\\/p</div><div class='del'>-b cont</div><div class='del'>-' &lt;confdefs.h | sed '</div><div class='del'>-s/'"$ac_delim"'/"\\\</div><div class='del'>-"/g' &gt;&gt;$CONFIG_STATUS || ac_write_fail=1</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;_ACEOF || ac_write_fail=1</div><div class='del'>-  for (key in D) D_is_set[key] = 1</div><div class='del'>-  FS = ""</div><div class='del'>-}</div><div class='del'>-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {</div><div class='del'>-  line = \$ 0</div><div class='del'>-  split(line, arg, " ")</div><div class='del'>-  if (arg[1] == "#") {</div><div class='del'>-    defundef = arg[2]</div><div class='del'>-    mac1 = arg[3]</div><div class='del'>-  } else {</div><div class='del'>-    defundef = substr(arg[1], 2)</div><div class='del'>-    mac1 = arg[2]</div><div class='del'>-  }</div><div class='del'>-  split(mac1, mac2, "(") #)</div><div class='del'>-  macro = mac2[1]</div><div class='del'>-  prefix = substr(line, 1, index(line, defundef) - 1)</div><div class='del'>-  if (D_is_set[macro]) {</div><div class='del'>-    # Preserve the white space surrounding the "#".</div><div class='del'>-    print prefix "define", macro P[macro] D[macro]</div><div class='del'>-    next</div><div class='del'>-  } else {</div><div class='del'>-    # Replace #undef with comments.  This is necessary, for example,</div><div class='del'>-    # in the case of _POSIX_SOURCE, which is predefined and required</div><div class='del'>-    # on some systems where configure will not decide to define it.</div><div class='del'>-    if (defundef == "undef") {</div><div class='del'>-      print "/*", prefix defundef, macro, "*/"</div><div class='del'>-      next</div><div class='del'>-    }</div><div class='del'>-  }</div><div class='del'>-}</div><div class='del'>-{ print }</div><div class='del'>-_ACAWK</div><div class='del'>-_ACEOF</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;\_ACEOF || ac_write_fail=1</div><div class='del'>-  as_fn_error "could not setup config headers machinery" "$LINENO" 5</div><div class='del'>-fi # test -n "$CONFIG_HEADERS"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"</div><div class='del'>-shift</div><div class='del'>-for ac_tag</div><div class='del'>-do</div><div class='del'>-  case $ac_tag in</div><div class='del'>-  :[FHLC]) ac_mode=$ac_tag; continue;;</div><div class='del'>-  esac</div><div class='del'>-  case $ac_mode$ac_tag in</div><div class='del'>-  :[FHL]*:*);;</div><div class='del'>-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;</div><div class='del'>-  :[FH]-) ac_tag=-:-;;</div><div class='del'>-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;</div><div class='del'>-  esac</div><div class='del'>-  ac_save_IFS=$IFS</div><div class='del'>-  IFS=:</div><div class='del'>-  set x $ac_tag</div><div class='del'>-  IFS=$ac_save_IFS</div><div class='del'>-  shift</div><div class='del'>-  ac_file=$1</div><div class='del'>-  shift</div><div class='del'>-</div><div class='del'>-  case $ac_mode in</div><div class='del'>-  :L) ac_source=$1;;</div><div class='del'>-  :[FH])</div><div class='del'>-    ac_file_inputs=</div><div class='del'>-    for ac_f</div><div class='del'>-    do</div><div class='del'>-      case $ac_f in</div><div class='del'>-      -) ac_f="$tmp/stdin";;</div><div class='del'>-      *) # Look for the file first in the build tree, then in the source tree</div><div class='del'>-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,</div><div class='del'>-	 # because $ac_f cannot contain `:'.</div><div class='del'>-	 test -f "$ac_f" ||</div><div class='del'>-	   case $ac_f in</div><div class='del'>-	   [\\/$]*) false;;</div><div class='del'>-	   *) test -f "$srcdir/$ac_f" &amp;&amp; ac_f="$srcdir/$ac_f";;</div><div class='del'>-	   esac ||</div><div class='del'>-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;</div><div class='del'>-      esac</div><div class='del'>-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac</div><div class='del'>-      as_fn_append ac_file_inputs " '$ac_f'"</div><div class='del'>-    done</div><div class='del'>-</div><div class='del'>-    # Let's still pretend it is `configure' which instantiates (i.e., don't</div><div class='del'>-    # use $as_me), people would be surprised to read:</div><div class='del'>-    #    /* config.h.  Generated by config.status.  */</div><div class='del'>-    configure_input='Generated from '`</div><div class='del'>-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'</div><div class='del'>-	`' by configure.'</div><div class='del'>-    if test x"$ac_file" != x-; then</div><div class='del'>-      configure_input="$ac_file.  $configure_input"</div><div class='del'>-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: creating $ac_file" &gt;&amp;6;}</div><div class='del'>-    fi</div><div class='del'>-    # Neutralize special characters interpreted by sed in replacement strings.</div><div class='del'>-    case $configure_input in #(</div><div class='del'>-    *\&amp;* | *\|* | *\\* )</div><div class='del'>-       ac_sed_conf_input=`$as_echo "$configure_input" |</div><div class='del'>-       sed 's/[\\\\&amp;|]/\\\\&amp;/g'`;; #(</div><div class='del'>-    *) ac_sed_conf_input=$configure_input;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    case $ac_tag in</div><div class='del'>-    *:-:* | *:-) cat &gt;"$tmp/stdin" \</div><div class='del'>-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;</div><div class='del'>-    esac</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  ac_dir=`$as_dirname -- "$ac_file" ||</div><div class='del'>-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \</div><div class='del'>-	 X"$ac_file" : 'X\(//\)[^/]' \| \</div><div class='del'>-	 X"$ac_file" : 'X\(//\)$' \| \</div><div class='del'>-	 X"$ac_file" : 'X\(/\)' \| . 2&gt;/dev/null ||</div><div class='del'>-$as_echo X"$ac_file" |</div><div class='del'>-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\/\)[^/].*/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\/\)$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\).*/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  s/.*/./; q'`</div><div class='del'>-  as_dir="$ac_dir"; as_fn_mkdir_p</div><div class='del'>-  ac_builddir=.</div><div class='del'>-</div><div class='del'>-case "$ac_dir" in</div><div class='del'>-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;</div><div class='del'>-*)</div><div class='del'>-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`</div><div class='del'>-  # A ".." for each directory in $ac_dir_suffix.</div><div class='del'>-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`</div><div class='del'>-  case $ac_top_builddir_sub in</div><div class='del'>-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;</div><div class='del'>-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;</div><div class='del'>-  esac ;;</div><div class='del'>-esac</div><div class='del'>-ac_abs_top_builddir=$ac_pwd</div><div class='del'>-ac_abs_builddir=$ac_pwd$ac_dir_suffix</div><div class='del'>-# for backward compatibility:</div><div class='del'>-ac_top_builddir=$ac_top_build_prefix</div><div class='del'>-</div><div class='del'>-case $srcdir in</div><div class='del'>-  .)  # We are building in place.</div><div class='del'>-    ac_srcdir=.</div><div class='del'>-    ac_top_srcdir=$ac_top_builddir_sub</div><div class='del'>-    ac_abs_top_srcdir=$ac_pwd ;;</div><div class='del'>-  [\\/]* | ?:[\\/]* )  # Absolute name.</div><div class='del'>-    ac_srcdir=$srcdir$ac_dir_suffix;</div><div class='del'>-    ac_top_srcdir=$srcdir</div><div class='del'>-    ac_abs_top_srcdir=$srcdir ;;</div><div class='del'>-  *) # Relative name.</div><div class='del'>-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix</div><div class='del'>-    ac_top_srcdir=$ac_top_build_prefix$srcdir</div><div class='del'>-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;</div><div class='del'>-esac</div><div class='del'>-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  case $ac_mode in</div><div class='del'>-  :F)</div><div class='del'>-  #</div><div class='del'>-  # CONFIG_FILE</div><div class='del'>-  #</div><div class='del'>-</div><div class='del'>-  case $INSTALL in</div><div class='del'>-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;</div><div class='del'>-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;</div><div class='del'>-  esac</div><div class='del'>-  ac_MKDIR_P=$MKDIR_P</div><div class='del'>-  case $MKDIR_P in</div><div class='del'>-  [\\/$]* | ?:[\\/]* ) ;;</div><div class='del'>-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;</div><div class='del'>-  esac</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;\_ACEOF || ac_write_fail=1</div><div class='del'>-# If the template does not know about datarootdir, expand it.</div><div class='del'>-# FIXME: This hack should be removed a few years after 2.60.</div><div class='del'>-ac_datarootdir_hack=; ac_datarootdir_seen=</div><div class='del'>-ac_sed_dataroot='</div><div class='del'>-/datarootdir/ {</div><div class='del'>-  p</div><div class='del'>-  q</div><div class='del'>-}</div><div class='del'>-/@datadir@/p</div><div class='del'>-/@docdir@/p</div><div class='del'>-/@infodir@/p</div><div class='del'>-/@localedir@/p</div><div class='del'>-/@mandir@/p'</div><div class='del'>-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in</div><div class='del'>-*datarootdir*) ac_datarootdir_seen=yes;;</div><div class='del'>-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" &gt;&amp;2;}</div><div class='del'>-_ACEOF</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;_ACEOF || ac_write_fail=1</div><div class='del'>-  ac_datarootdir_hack='</div><div class='del'>-  s&amp;@datadir@&amp;$datadir&amp;g</div><div class='del'>-  s&amp;@docdir@&amp;$docdir&amp;g</div><div class='del'>-  s&amp;@infodir@&amp;$infodir&amp;g</div><div class='del'>-  s&amp;@localedir@&amp;$localedir&amp;g</div><div class='del'>-  s&amp;@mandir@&amp;$mandir&amp;g</div><div class='del'>-  s&amp;\\\${datarootdir}&amp;$datarootdir&amp;g' ;;</div><div class='del'>-esac</div><div class='del'>-_ACEOF</div><div class='del'>-</div><div class='del'>-# Neutralize VPATH when `$srcdir' = `.'.</div><div class='del'>-# Shell code in configure.ac might set extrasub.</div><div class='del'>-# FIXME: do we really want to maintain this feature?</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;_ACEOF || ac_write_fail=1</div><div class='del'>-ac_sed_extra="$ac_vpsub</div><div class='del'>-$extrasub</div><div class='del'>-_ACEOF</div><div class='del'>-cat &gt;&gt;$CONFIG_STATUS &lt;&lt;\_ACEOF || ac_write_fail=1</div><div class='del'>-:t</div><div class='del'>-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b</div><div class='del'>-s|@configure_input@|$ac_sed_conf_input|;t t</div><div class='del'>-s&amp;@top_builddir@&amp;$ac_top_builddir_sub&amp;;t t</div><div class='del'>-s&amp;@top_build_prefix@&amp;$ac_top_build_prefix&amp;;t t</div><div class='del'>-s&amp;@srcdir@&amp;$ac_srcdir&amp;;t t</div><div class='del'>-s&amp;@abs_srcdir@&amp;$ac_abs_srcdir&amp;;t t</div><div class='del'>-s&amp;@top_srcdir@&amp;$ac_top_srcdir&amp;;t t</div><div class='del'>-s&amp;@abs_top_srcdir@&amp;$ac_abs_top_srcdir&amp;;t t</div><div class='del'>-s&amp;@builddir@&amp;$ac_builddir&amp;;t t</div><div class='del'>-s&amp;@abs_builddir@&amp;$ac_abs_builddir&amp;;t t</div><div class='del'>-s&amp;@abs_top_builddir@&amp;$ac_abs_top_builddir&amp;;t t</div><div class='del'>-s&amp;@INSTALL@&amp;$ac_INSTALL&amp;;t t</div><div class='del'>-s&amp;@MKDIR_P@&amp;$ac_MKDIR_P&amp;;t t</div><div class='del'>-$ac_datarootdir_hack</div><div class='del'>-"</div><div class='del'>-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" &gt;$tmp/out \</div><div class='del'>-  || as_fn_error "could not create $ac_file" "$LINENO" 5</div><div class='del'>-</div><div class='del'>-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &amp;&amp;</div><div class='del'>-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &amp;&amp;</div><div class='del'>-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &amp;&amp;</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'</div><div class='del'>-which seems to be undefined.  Please make sure it is defined." &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'</div><div class='del'>-which seems to be undefined.  Please make sure it is defined." &gt;&amp;2;}</div><div class='del'>-</div><div class='del'>-  rm -f "$tmp/stdin"</div><div class='del'>-  case $ac_file in</div><div class='del'>-  -) cat "$tmp/out" &amp;&amp; rm -f "$tmp/out";;</div><div class='del'>-  *) rm -f "$ac_file" &amp;&amp; mv "$tmp/out" "$ac_file";;</div><div class='del'>-  esac \</div><div class='del'>-  || as_fn_error "could not create $ac_file" "$LINENO" 5</div><div class='del'>- ;;</div><div class='del'>-  :H)</div><div class='del'>-  #</div><div class='del'>-  # CONFIG_HEADER</div><div class='del'>-  #</div><div class='del'>-  if test x"$ac_file" != x-; then</div><div class='del'>-    {</div><div class='del'>-      $as_echo "/* $configure_input  */" \</div><div class='del'>-      &amp;&amp; eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"</div><div class='del'>-    } &gt;"$tmp/config.h" \</div><div class='del'>-      || as_fn_error "could not create $ac_file" "$LINENO" 5</div><div class='del'>-    if diff "$ac_file" "$tmp/config.h" &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: $ac_file is unchanged" &gt;&amp;6;}</div><div class='del'>-    else</div><div class='del'>-      rm -f "$ac_file"</div><div class='del'>-      mv "$tmp/config.h" "$ac_file" \</div><div class='del'>-	|| as_fn_error "could not create $ac_file" "$LINENO" 5</div><div class='del'>-    fi</div><div class='del'>-  else</div><div class='del'>-    $as_echo "/* $configure_input  */" \</div><div class='del'>-      &amp;&amp; eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \</div><div class='del'>-      || as_fn_error "could not create -" "$LINENO" 5</div><div class='del'>-  fi</div><div class='del'>-# Compute "$ac_file"'s index in $config_headers.</div><div class='del'>-_am_arg="$ac_file"</div><div class='del'>-_am_stamp_count=1</div><div class='del'>-for _am_header in $config_headers :; do</div><div class='del'>-  case $_am_header in</div><div class='del'>-    $_am_arg | $_am_arg:* )</div><div class='del'>-      break ;;</div><div class='del'>-    * )</div><div class='del'>-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;</div><div class='del'>-  esac</div><div class='del'>-done</div><div class='del'>-echo "timestamp for $_am_arg" &gt;`$as_dirname -- "$_am_arg" ||</div><div class='del'>-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \</div><div class='del'>-	 X"$_am_arg" : 'X\(//\)[^/]' \| \</div><div class='del'>-	 X"$_am_arg" : 'X\(//\)$' \| \</div><div class='del'>-	 X"$_am_arg" : 'X\(/\)' \| . 2&gt;/dev/null ||</div><div class='del'>-$as_echo X"$_am_arg" |</div><div class='del'>-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\/\)[^/].*/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\/\)$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\).*/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  s/.*/./; q'`/stamp-h$_am_stamp_count</div><div class='del'>- ;;</div><div class='del'>-</div><div class='del'>-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: executing $ac_file commands" &gt;&amp;6;}</div><div class='del'>- ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  case $ac_file$ac_mode in</div><div class='del'>-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {</div><div class='del'>-  # Autoconf 2.62 quotes --file arguments for eval, but not when files</div><div class='del'>-  # are listed without --file.  Let's play safe and only enable the eval</div><div class='del'>-  # if we detect the quoting.</div><div class='del'>-  case $CONFIG_FILES in</div><div class='del'>-  *\'*) eval set x "$CONFIG_FILES" ;;</div><div class='del'>-  *)   set x $CONFIG_FILES ;;</div><div class='del'>-  esac</div><div class='del'>-  shift</div><div class='del'>-  for mf</div><div class='del'>-  do</div><div class='del'>-    # Strip MF so we end up with the name of the file.</div><div class='del'>-    mf=`echo "$mf" | sed -e 's/:.*$//'`</div><div class='del'>-    # Check whether this is an Automake generated Makefile or not.</div><div class='del'>-    # We used to match only the files named `Makefile.in', but</div><div class='del'>-    # some people rename them; so instead we look at the file content.</div><div class='del'>-    # Grep'ing the first line is not enough: some people post-process</div><div class='del'>-    # each Makefile.in and add a new line on top of each file to say so.</div><div class='del'>-    # Grep'ing the whole file is not good either: AIX grep has a line</div><div class='del'>-    # limit of 2048, but all sed's we know have understand at least 4000.</div><div class='del'>-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-      dirpart=`$as_dirname -- "$mf" ||</div><div class='del'>-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \</div><div class='del'>-	 X"$mf" : 'X\(//\)[^/]' \| \</div><div class='del'>-	 X"$mf" : 'X\(//\)$' \| \</div><div class='del'>-	 X"$mf" : 'X\(/\)' \| . 2&gt;/dev/null ||</div><div class='del'>-$as_echo X"$mf" |</div><div class='del'>-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\/\)[^/].*/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\/\)$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\).*/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  s/.*/./; q'`</div><div class='del'>-    else</div><div class='del'>-      continue</div><div class='del'>-    fi</div><div class='del'>-    # Extract the definition of DEPDIR, am__include, and am__quote</div><div class='del'>-    # from the Makefile without running `make'.</div><div class='del'>-    DEPDIR=`sed -n 's/^DEPDIR = //p' &lt; "$mf"`</div><div class='del'>-    test -z "$DEPDIR" &amp;&amp; continue</div><div class='del'>-    am__include=`sed -n 's/^am__include = //p' &lt; "$mf"`</div><div class='del'>-    test -z "am__include" &amp;&amp; continue</div><div class='del'>-    am__quote=`sed -n 's/^am__quote = //p' &lt; "$mf"`</div><div class='del'>-    # When using ansi2knr, U may be empty or an underscore; expand it</div><div class='del'>-    U=`sed -n 's/^U = //p' &lt; "$mf"`</div><div class='del'>-    # Find all dependency output files, they are included files with</div><div class='del'>-    # $(DEPDIR) in their names.  We invoke sed twice because it is the</div><div class='del'>-    # simplest approach to changing $(DEPDIR) to its actual value in the</div><div class='del'>-    # expansion.</div><div class='del'>-    for file in `sed -n "</div><div class='del'>-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' &lt;"$mf" | \</div><div class='del'>-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do</div><div class='del'>-      # Make sure the directory exists.</div><div class='del'>-      test -f "$dirpart/$file" &amp;&amp; continue</div><div class='del'>-      fdir=`$as_dirname -- "$file" ||</div><div class='del'>-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \</div><div class='del'>-	 X"$file" : 'X\(//\)[^/]' \| \</div><div class='del'>-	 X"$file" : 'X\(//\)$' \| \</div><div class='del'>-	 X"$file" : 'X\(/\)' \| . 2&gt;/dev/null ||</div><div class='del'>-$as_echo X"$file" |</div><div class='del'>-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\/\)[^/].*/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\/\)$/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  /^X\(\/\).*/{</div><div class='del'>-	    s//\1/</div><div class='del'>-	    q</div><div class='del'>-	  }</div><div class='del'>-	  s/.*/./; q'`</div><div class='del'>-      as_dir=$dirpart/$fdir; as_fn_mkdir_p</div><div class='del'>-      # echo "creating $dirpart/$file"</div><div class='del'>-      echo '# dummy' &gt; "$dirpart/$file"</div><div class='del'>-    done</div><div class='del'>-  done</div><div class='del'>-}</div><div class='del'>- ;;</div><div class='del'>-    "libtool":C)</div><div class='del'>-</div><div class='del'>-    # See if we are running on zsh, and set the options which allow our</div><div class='del'>-    # commands through without removal of \ escapes.</div><div class='del'>-    if test -n "${ZSH_VERSION+set}" ; then</div><div class='del'>-      setopt NO_GLOB_SUBST</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    cfgfile="${ofile}T"</div><div class='del'>-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15</div><div class='del'>-    $RM "$cfgfile"</div><div class='del'>-</div><div class='del'>-    cat &lt;&lt;_LT_EOF &gt;&gt; "$cfgfile"</div><div class='del'>-#! $SHELL</div><div class='del'>-</div><div class='del'>-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.</div><div class='del'>-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION</div><div class='del'>-# Libtool was configured on host `(hostname || uname -n) 2&gt;/dev/null | sed 1q`:</div><div class='del'>-# NOTE: Changes made to this file will be lost: look at ltmain.sh.</div><div class='del'>-#</div><div class='del'>-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,</div><div class='del'>-#                 2006, 2007, 2008 Free Software Foundation, Inc.</div><div class='del'>-#   Written by Gordon Matzigkeit, 1996</div><div class='del'>-#</div><div class='del'>-#   This file is part of GNU Libtool.</div><div class='del'>-#</div><div class='del'>-# GNU Libtool is free software; you can redistribute it and/or</div><div class='del'>-# modify it under the terms of the GNU General Public License as</div><div class='del'>-# published by the Free Software Foundation; either version 2 of</div><div class='del'>-# the License, or (at your option) any later version.</div><div class='del'>-#</div><div class='del'>-# As a special exception to the GNU General Public License,</div><div class='del'>-# if you distribute this file as part of a program or library that</div><div class='del'>-# is built using GNU Libtool, you may include this file under the</div><div class='del'>-# same distribution terms that you use for the rest of that program.</div><div class='del'>-#</div><div class='del'>-# GNU Libtool is distributed in the hope that it will be useful,</div><div class='del'>-# but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-# GNU General Public License for more details.</div><div class='del'>-#</div><div class='del'>-# You should have received a copy of the GNU General Public License</div><div class='del'>-# along with GNU Libtool; see the file COPYING.  If not, a copy</div><div class='del'>-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or</div><div class='del'>-# obtained by writing to the Free Software Foundation, Inc.,</div><div class='del'>-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# The names of the tagged configurations supported by this script.</div><div class='del'>-available_tags=""</div><div class='del'>-</div><div class='del'>-# ### BEGIN LIBTOOL CONFIG</div><div class='del'>-</div><div class='del'>-# A sed program that does not truncate output.</div><div class='del'>-SED=$lt_SED</div><div class='del'>-</div><div class='del'>-# Sed that helps us avoid accidentally triggering echo(1) options like -n.</div><div class='del'>-Xsed="\$SED -e 1s/^X//"</div><div class='del'>-</div><div class='del'>-# A grep program that handles long lines.</div><div class='del'>-GREP=$lt_GREP</div><div class='del'>-</div><div class='del'>-# An ERE matcher.</div><div class='del'>-EGREP=$lt_EGREP</div><div class='del'>-</div><div class='del'>-# A literal string matcher.</div><div class='del'>-FGREP=$lt_FGREP</div><div class='del'>-</div><div class='del'>-# Assembler program.</div><div class='del'>-AS=$AS</div><div class='del'>-</div><div class='del'>-# DLL creation program.</div><div class='del'>-DLLTOOL=$DLLTOOL</div><div class='del'>-</div><div class='del'>-# Object dumper program.</div><div class='del'>-OBJDUMP=$OBJDUMP</div><div class='del'>-</div><div class='del'>-# Which release of libtool.m4 was used?</div><div class='del'>-macro_version=$macro_version</div><div class='del'>-macro_revision=$macro_revision</div><div class='del'>-</div><div class='del'>-# Whether or not to build shared libraries.</div><div class='del'>-build_libtool_libs=$enable_shared</div><div class='del'>-</div><div class='del'>-# Whether or not to build static libraries.</div><div class='del'>-build_old_libs=$enable_static</div><div class='del'>-</div><div class='del'>-# What type of objects to build.</div><div class='del'>-pic_mode=$pic_mode</div><div class='del'>-</div><div class='del'>-# Whether or not to optimize for fast installation.</div><div class='del'>-fast_install=$enable_fast_install</div><div class='del'>-</div><div class='del'>-# The host system.</div><div class='del'>-host_alias=$host_alias</div><div class='del'>-host=$host</div><div class='del'>-host_os=$host_os</div><div class='del'>-</div><div class='del'>-# The build system.</div><div class='del'>-build_alias=$build_alias</div><div class='del'>-build=$build</div><div class='del'>-build_os=$build_os</div><div class='del'>-</div><div class='del'>-# A BSD- or MS-compatible name lister.</div><div class='del'>-NM=$lt_NM</div><div class='del'>-</div><div class='del'>-# Whether we need soft or hard links.</div><div class='del'>-LN_S=$lt_LN_S</div><div class='del'>-</div><div class='del'>-# What is the maximum length of a command?</div><div class='del'>-max_cmd_len=$max_cmd_len</div><div class='del'>-</div><div class='del'>-# Object file suffix (normally "o").</div><div class='del'>-objext=$ac_objext</div><div class='del'>-</div><div class='del'>-# Executable file suffix (normally "").</div><div class='del'>-exeext=$exeext</div><div class='del'>-</div><div class='del'>-# whether the shell understands "unset".</div><div class='del'>-lt_unset=$lt_unset</div><div class='del'>-</div><div class='del'>-# turn spaces into newlines.</div><div class='del'>-SP2NL=$lt_lt_SP2NL</div><div class='del'>-</div><div class='del'>-# turn newlines into spaces.</div><div class='del'>-NL2SP=$lt_lt_NL2SP</div><div class='del'>-</div><div class='del'>-# How to create reloadable object files.</div><div class='del'>-reload_flag=$lt_reload_flag</div><div class='del'>-reload_cmds=$lt_reload_cmds</div><div class='del'>-</div><div class='del'>-# Method to check whether dependent libraries are shared objects.</div><div class='del'>-deplibs_check_method=$lt_deplibs_check_method</div><div class='del'>-</div><div class='del'>-# Command to use when deplibs_check_method == "file_magic".</div><div class='del'>-file_magic_cmd=$lt_file_magic_cmd</div><div class='del'>-</div><div class='del'>-# The archiver.</div><div class='del'>-AR=$lt_AR</div><div class='del'>-AR_FLAGS=$lt_AR_FLAGS</div><div class='del'>-</div><div class='del'>-# A symbol stripping program.</div><div class='del'>-STRIP=$lt_STRIP</div><div class='del'>-</div><div class='del'>-# Commands used to install an old-style archive.</div><div class='del'>-RANLIB=$lt_RANLIB</div><div class='del'>-old_postinstall_cmds=$lt_old_postinstall_cmds</div><div class='del'>-old_postuninstall_cmds=$lt_old_postuninstall_cmds</div><div class='del'>-</div><div class='del'>-# A C compiler.</div><div class='del'>-LTCC=$lt_CC</div><div class='del'>-</div><div class='del'>-# LTCC compiler flags.</div><div class='del'>-LTCFLAGS=$lt_CFLAGS</div><div class='del'>-</div><div class='del'>-# Take the output of nm and produce a listing of raw symbols and C names.</div><div class='del'>-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe</div><div class='del'>-</div><div class='del'>-# Transform the output of nm in a proper C declaration.</div><div class='del'>-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl</div><div class='del'>-</div><div class='del'>-# Transform the output of nm in a C name address pair.</div><div class='del'>-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address</div><div class='del'>-</div><div class='del'>-# Transform the output of nm in a C name address pair when lib prefix is needed.</div><div class='del'>-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix</div><div class='del'>-</div><div class='del'>-# The name of the directory that contains temporary libtool files.</div><div class='del'>-objdir=$objdir</div><div class='del'>-</div><div class='del'>-# Shell to use when invoking shell scripts.</div><div class='del'>-SHELL=$lt_SHELL</div><div class='del'>-</div><div class='del'>-# An echo program that does not interpret backslashes.</div><div class='del'>-ECHO=$lt_ECHO</div><div class='del'>-</div><div class='del'>-# Used to examine libraries when file_magic_cmd begins with "file".</div><div class='del'>-MAGIC_CMD=$MAGIC_CMD</div><div class='del'>-</div><div class='del'>-# Must we lock files when doing compilation?</div><div class='del'>-need_locks=$lt_need_locks</div><div class='del'>-</div><div class='del'>-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.</div><div class='del'>-DSYMUTIL=$lt_DSYMUTIL</div><div class='del'>-</div><div class='del'>-# Tool to change global to local symbols on Mac OS X.</div><div class='del'>-NMEDIT=$lt_NMEDIT</div><div class='del'>-</div><div class='del'>-# Tool to manipulate fat objects and archives on Mac OS X.</div><div class='del'>-LIPO=$lt_LIPO</div><div class='del'>-</div><div class='del'>-# ldd/readelf like tool for Mach-O binaries on Mac OS X.</div><div class='del'>-OTOOL=$lt_OTOOL</div><div class='del'>-</div><div class='del'>-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.</div><div class='del'>-OTOOL64=$lt_OTOOL64</div><div class='del'>-</div><div class='del'>-# Old archive suffix (normally "a").</div><div class='del'>-libext=$libext</div><div class='del'>-</div><div class='del'>-# Shared library suffix (normally ".so").</div><div class='del'>-shrext_cmds=$lt_shrext_cmds</div><div class='del'>-</div><div class='del'>-# The commands to extract the exported symbol list from a shared archive.</div><div class='del'>-extract_expsyms_cmds=$lt_extract_expsyms_cmds</div><div class='del'>-</div><div class='del'>-# Variables whose values should be saved in libtool wrapper scripts and</div><div class='del'>-# restored at link time.</div><div class='del'>-variables_saved_for_relink=$lt_variables_saved_for_relink</div><div class='del'>-</div><div class='del'>-# Do we need the "lib" prefix for modules?</div><div class='del'>-need_lib_prefix=$need_lib_prefix</div><div class='del'>-</div><div class='del'>-# Do we need a version for libraries?</div><div class='del'>-need_version=$need_version</div><div class='del'>-</div><div class='del'>-# Library versioning type.</div><div class='del'>-version_type=$version_type</div><div class='del'>-</div><div class='del'>-# Shared library runtime path variable.</div><div class='del'>-runpath_var=$runpath_var</div><div class='del'>-</div><div class='del'>-# Shared library path variable.</div><div class='del'>-shlibpath_var=$shlibpath_var</div><div class='del'>-</div><div class='del'>-# Is shlibpath searched before the hard-coded library search path?</div><div class='del'>-shlibpath_overrides_runpath=$shlibpath_overrides_runpath</div><div class='del'>-</div><div class='del'>-# Format of library name prefix.</div><div class='del'>-libname_spec=$lt_libname_spec</div><div class='del'>-</div><div class='del'>-# List of archive names.  First name is the real one, the rest are links.</div><div class='del'>-# The last name is the one that the linker finds with -lNAME</div><div class='del'>-library_names_spec=$lt_library_names_spec</div><div class='del'>-</div><div class='del'>-# The coded name of the library, if different from the real name.</div><div class='del'>-soname_spec=$lt_soname_spec</div><div class='del'>-</div><div class='del'>-# Command to use after installation of a shared archive.</div><div class='del'>-postinstall_cmds=$lt_postinstall_cmds</div><div class='del'>-</div><div class='del'>-# Command to use after uninstallation of a shared archive.</div><div class='del'>-postuninstall_cmds=$lt_postuninstall_cmds</div><div class='del'>-</div><div class='del'>-# Commands used to finish a libtool library installation in a directory.</div><div class='del'>-finish_cmds=$lt_finish_cmds</div><div class='del'>-</div><div class='del'>-# As "finish_cmds", except a single script fragment to be evaled but</div><div class='del'>-# not shown.</div><div class='del'>-finish_eval=$lt_finish_eval</div><div class='del'>-</div><div class='del'>-# Whether we should hardcode library paths into libraries.</div><div class='del'>-hardcode_into_libs=$hardcode_into_libs</div><div class='del'>-</div><div class='del'>-# Compile-time system search path for libraries.</div><div class='del'>-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec</div><div class='del'>-</div><div class='del'>-# Run-time system search path for libraries.</div><div class='del'>-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec</div><div class='del'>-</div><div class='del'>-# Whether dlopen is supported.</div><div class='del'>-dlopen_support=$enable_dlopen</div><div class='del'>-</div><div class='del'>-# Whether dlopen of programs is supported.</div><div class='del'>-dlopen_self=$enable_dlopen_self</div><div class='del'>-</div><div class='del'>-# Whether dlopen of statically linked programs is supported.</div><div class='del'>-dlopen_self_static=$enable_dlopen_self_static</div><div class='del'>-</div><div class='del'>-# Commands to strip libraries.</div><div class='del'>-old_striplib=$lt_old_striplib</div><div class='del'>-striplib=$lt_striplib</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# The linker used to build libraries.</div><div class='del'>-LD=$lt_LD</div><div class='del'>-</div><div class='del'>-# Commands used to build an old-style archive.</div><div class='del'>-old_archive_cmds=$lt_old_archive_cmds</div><div class='del'>-</div><div class='del'>-# A language specific compiler.</div><div class='del'>-CC=$lt_compiler</div><div class='del'>-</div><div class='del'>-# Is the compiler the GNU compiler?</div><div class='del'>-with_gcc=$GCC</div><div class='del'>-</div><div class='del'>-# Compiler flag to turn off builtin functions.</div><div class='del'>-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag</div><div class='del'>-</div><div class='del'>-# How to pass a linker flag through the compiler.</div><div class='del'>-wl=$lt_lt_prog_compiler_wl</div><div class='del'>-</div><div class='del'>-# Additional compiler flags for building library objects.</div><div class='del'>-pic_flag=$lt_lt_prog_compiler_pic</div><div class='del'>-</div><div class='del'>-# Compiler flag to prevent dynamic linking.</div><div class='del'>-link_static_flag=$lt_lt_prog_compiler_static</div><div class='del'>-</div><div class='del'>-# Does compiler simultaneously support -c and -o options?</div><div class='del'>-compiler_c_o=$lt_lt_cv_prog_compiler_c_o</div><div class='del'>-</div><div class='del'>-# Whether or not to add -lc for building shared libraries.</div><div class='del'>-build_libtool_need_lc=$archive_cmds_need_lc</div><div class='del'>-</div><div class='del'>-# Whether or not to disallow shared libs when runtime libs are static.</div><div class='del'>-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes</div><div class='del'>-</div><div class='del'>-# Compiler flag to allow reflexive dlopens.</div><div class='del'>-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec</div><div class='del'>-</div><div class='del'>-# Compiler flag to generate shared objects directly from archives.</div><div class='del'>-whole_archive_flag_spec=$lt_whole_archive_flag_spec</div><div class='del'>-</div><div class='del'>-# Whether the compiler copes with passing no objects directly.</div><div class='del'>-compiler_needs_object=$lt_compiler_needs_object</div><div class='del'>-</div><div class='del'>-# Create an old-style archive from a shared archive.</div><div class='del'>-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds</div><div class='del'>-</div><div class='del'>-# Create a temporary old-style archive to link instead of a shared archive.</div><div class='del'>-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds</div><div class='del'>-</div><div class='del'>-# Commands used to build a shared archive.</div><div class='del'>-archive_cmds=$lt_archive_cmds</div><div class='del'>-archive_expsym_cmds=$lt_archive_expsym_cmds</div><div class='del'>-</div><div class='del'>-# Commands used to build a loadable module if different from building</div><div class='del'>-# a shared archive.</div><div class='del'>-module_cmds=$lt_module_cmds</div><div class='del'>-module_expsym_cmds=$lt_module_expsym_cmds</div><div class='del'>-</div><div class='del'>-# Whether we are building with GNU ld or not.</div><div class='del'>-with_gnu_ld=$lt_with_gnu_ld</div><div class='del'>-</div><div class='del'>-# Flag that allows shared libraries with undefined symbols to be built.</div><div class='del'>-allow_undefined_flag=$lt_allow_undefined_flag</div><div class='del'>-</div><div class='del'>-# Flag that enforces no undefined symbols.</div><div class='del'>-no_undefined_flag=$lt_no_undefined_flag</div><div class='del'>-</div><div class='del'>-# Flag to hardcode \$libdir into a binary during linking.</div><div class='del'>-# This must work even if \$libdir does not exist</div><div class='del'>-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec</div><div class='del'>-</div><div class='del'>-# If ld is used when linking, flag to hardcode \$libdir into a binary</div><div class='del'>-# during linking.  This must work even if \$libdir does not exist.</div><div class='del'>-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld</div><div class='del'>-</div><div class='del'>-# Whether we need a single "-rpath" flag with a separated argument.</div><div class='del'>-hardcode_libdir_separator=$lt_hardcode_libdir_separator</div><div class='del'>-</div><div class='del'>-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes</div><div class='del'>-# DIR into the resulting binary.</div><div class='del'>-hardcode_direct=$hardcode_direct</div><div class='del'>-</div><div class='del'>-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes</div><div class='del'>-# DIR into the resulting binary and the resulting library dependency is</div><div class='del'>-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the</div><div class='del'>-# library is relocated.</div><div class='del'>-hardcode_direct_absolute=$hardcode_direct_absolute</div><div class='del'>-</div><div class='del'>-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR</div><div class='del'>-# into the resulting binary.</div><div class='del'>-hardcode_minus_L=$hardcode_minus_L</div><div class='del'>-</div><div class='del'>-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR</div><div class='del'>-# into the resulting binary.</div><div class='del'>-hardcode_shlibpath_var=$hardcode_shlibpath_var</div><div class='del'>-</div><div class='del'>-# Set to "yes" if building a shared library automatically hardcodes DIR</div><div class='del'>-# into the library and all subsequent libraries and executables linked</div><div class='del'>-# against it.</div><div class='del'>-hardcode_automatic=$hardcode_automatic</div><div class='del'>-</div><div class='del'>-# Set to yes if linker adds runtime paths of dependent libraries</div><div class='del'>-# to runtime path list.</div><div class='del'>-inherit_rpath=$inherit_rpath</div><div class='del'>-</div><div class='del'>-# Whether libtool must link a program against all its dependency libraries.</div><div class='del'>-link_all_deplibs=$link_all_deplibs</div><div class='del'>-</div><div class='del'>-# Fix the shell variable \$srcfile for the compiler.</div><div class='del'>-fix_srcfile_path=$lt_fix_srcfile_path</div><div class='del'>-</div><div class='del'>-# Set to "yes" if exported symbols are required.</div><div class='del'>-always_export_symbols=$always_export_symbols</div><div class='del'>-</div><div class='del'>-# The commands to list exported symbols.</div><div class='del'>-export_symbols_cmds=$lt_export_symbols_cmds</div><div class='del'>-</div><div class='del'>-# Symbols that should not be listed in the preloaded symbols.</div><div class='del'>-exclude_expsyms=$lt_exclude_expsyms</div><div class='del'>-</div><div class='del'>-# Symbols that must always be exported.</div><div class='del'>-include_expsyms=$lt_include_expsyms</div><div class='del'>-</div><div class='del'>-# Commands necessary for linking programs (against libraries) with templates.</div><div class='del'>-prelink_cmds=$lt_prelink_cmds</div><div class='del'>-</div><div class='del'>-# Specify filename containing input files.</div><div class='del'>-file_list_spec=$lt_file_list_spec</div><div class='del'>-</div><div class='del'>-# How to hardcode a shared library path into an executable.</div><div class='del'>-hardcode_action=$hardcode_action</div><div class='del'>-</div><div class='del'>-# ### END LIBTOOL CONFIG</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-</div><div class='del'>-  case $host_os in</div><div class='del'>-  aix3*)</div><div class='del'>-    cat &lt;&lt;\_LT_EOF &gt;&gt; "$cfgfile"</div><div class='del'>-# AIX sometimes has problems with the GCC collect2 program.  For some</div><div class='del'>-# reason, if we set the COLLECT_NAMES environment variable, the problems</div><div class='del'>-# vanish in a puff of smoke.</div><div class='del'>-if test "X${COLLECT_NAMES+set}" != Xset; then</div><div class='del'>-  COLLECT_NAMES=</div><div class='del'>-  export COLLECT_NAMES</div><div class='del'>-fi</div><div class='del'>-_LT_EOF</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ltmain="$ac_aux_dir/ltmain.sh"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  # We use sed instead of cat because bash on DJGPP gets confused if</div><div class='del'>-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in</div><div class='del'>-  # text mode, it properly converts lines to CR/LF.  This bash problem</div><div class='del'>-  # is reportedly fixed, but why not run on old versions too?</div><div class='del'>-  sed '/^# Generated shell functions inserted here/q' "$ltmain" &gt;&gt; "$cfgfile" \</div><div class='del'>-    || (rm -f "$cfgfile"; exit 1)</div><div class='del'>-</div><div class='del'>-  case $xsi_shell in</div><div class='del'>-  yes)</div><div class='del'>-    cat &lt;&lt; \_LT_EOF &gt;&gt; "$cfgfile"</div><div class='del'>-</div><div class='del'>-# func_dirname file append nondir_replacement</div><div class='del'>-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,</div><div class='del'>-# otherwise set result to NONDIR_REPLACEMENT.</div><div class='del'>-func_dirname ()</div><div class='del'>-{</div><div class='del'>-  case ${1} in</div><div class='del'>-    */*) func_dirname_result="${1%/*}${2}" ;;</div><div class='del'>-    *  ) func_dirname_result="${3}" ;;</div><div class='del'>-  esac</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_basename file</div><div class='del'>-func_basename ()</div><div class='del'>-{</div><div class='del'>-  func_basename_result="${1##*/}"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_dirname_and_basename file append nondir_replacement</div><div class='del'>-# perform func_basename and func_dirname in a single function</div><div class='del'>-# call:</div><div class='del'>-#   dirname:  Compute the dirname of FILE.  If nonempty,</div><div class='del'>-#             add APPEND to the result, otherwise set result</div><div class='del'>-#             to NONDIR_REPLACEMENT.</div><div class='del'>-#             value returned in "$func_dirname_result"</div><div class='del'>-#   basename: Compute filename of FILE.</div><div class='del'>-#             value retuned in "$func_basename_result"</div><div class='del'>-# Implementation must be kept synchronized with func_dirname</div><div class='del'>-# and func_basename. For efficiency, we do not delegate to</div><div class='del'>-# those functions but instead duplicate the functionality here.</div><div class='del'>-func_dirname_and_basename ()</div><div class='del'>-{</div><div class='del'>-  case ${1} in</div><div class='del'>-    */*) func_dirname_result="${1%/*}${2}" ;;</div><div class='del'>-    *  ) func_dirname_result="${3}" ;;</div><div class='del'>-  esac</div><div class='del'>-  func_basename_result="${1##*/}"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_stripname prefix suffix name</div><div class='del'>-# strip PREFIX and SUFFIX off of NAME.</div><div class='del'>-# PREFIX and SUFFIX must not contain globbing or regex special</div><div class='del'>-# characters, hashes, percent signs, but SUFFIX may contain a leading</div><div class='del'>-# dot (in which case that matches only a dot).</div><div class='del'>-func_stripname ()</div><div class='del'>-{</div><div class='del'>-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are</div><div class='del'>-  # positional parameters, so assign one to ordinary parameter first.</div><div class='del'>-  func_stripname_result=${3}</div><div class='del'>-  func_stripname_result=${func_stripname_result#"${1}"}</div><div class='del'>-  func_stripname_result=${func_stripname_result%"${2}"}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_opt_split</div><div class='del'>-func_opt_split ()</div><div class='del'>-{</div><div class='del'>-  func_opt_split_opt=${1%%=*}</div><div class='del'>-  func_opt_split_arg=${1#*=}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_lo2o object</div><div class='del'>-func_lo2o ()</div><div class='del'>-{</div><div class='del'>-  case ${1} in</div><div class='del'>-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;</div><div class='del'>-    *)    func_lo2o_result=${1} ;;</div><div class='del'>-  esac</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_xform libobj-or-source</div><div class='del'>-func_xform ()</div><div class='del'>-{</div><div class='del'>-  func_xform_result=${1%.*}.lo</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_arith arithmetic-term...</div><div class='del'>-func_arith ()</div><div class='del'>-{</div><div class='del'>-  func_arith_result=$(( $* ))</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_len string</div><div class='del'>-# STRING may not start with a hyphen.</div><div class='del'>-func_len ()</div><div class='del'>-{</div><div class='del'>-  func_len_result=${#1}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-    ;;</div><div class='del'>-  *) # Bourne compatible functions.</div><div class='del'>-    cat &lt;&lt; \_LT_EOF &gt;&gt; "$cfgfile"</div><div class='del'>-</div><div class='del'>-# func_dirname file append nondir_replacement</div><div class='del'>-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,</div><div class='del'>-# otherwise set result to NONDIR_REPLACEMENT.</div><div class='del'>-func_dirname ()</div><div class='del'>-{</div><div class='del'>-  # Extract subdirectory from the argument.</div><div class='del'>-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`</div><div class='del'>-  if test "X$func_dirname_result" = "X${1}"; then</div><div class='del'>-    func_dirname_result="${3}"</div><div class='del'>-  else</div><div class='del'>-    func_dirname_result="$func_dirname_result${2}"</div><div class='del'>-  fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_basename file</div><div class='del'>-func_basename ()</div><div class='del'>-{</div><div class='del'>-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_stripname prefix suffix name</div><div class='del'>-# strip PREFIX and SUFFIX off of NAME.</div><div class='del'>-# PREFIX and SUFFIX must not contain globbing or regex special</div><div class='del'>-# characters, hashes, percent signs, but SUFFIX may contain a leading</div><div class='del'>-# dot (in which case that matches only a dot).</div><div class='del'>-# func_strip_suffix prefix name</div><div class='del'>-func_stripname ()</div><div class='del'>-{</div><div class='del'>-  case ${2} in</div><div class='del'>-    .*) func_stripname_result=`$ECHO "X${3}" \</div><div class='del'>-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;</div><div class='del'>-    *)  func_stripname_result=`$ECHO "X${3}" \</div><div class='del'>-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;</div><div class='del'>-  esac</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# sed scripts:</div><div class='del'>-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'</div><div class='del'>-my_sed_long_arg='1s/^-[^=]*=//'</div><div class='del'>-</div><div class='del'>-# func_opt_split</div><div class='del'>-func_opt_split ()</div><div class='del'>-{</div><div class='del'>-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`</div><div class='del'>-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_lo2o object</div><div class='del'>-func_lo2o ()</div><div class='del'>-{</div><div class='del'>-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_xform libobj-or-source</div><div class='del'>-func_xform ()</div><div class='del'>-{</div><div class='del'>-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_arith arithmetic-term...</div><div class='del'>-func_arith ()</div><div class='del'>-{</div><div class='del'>-  func_arith_result=`expr "$@"`</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_len string</div><div class='del'>-# STRING may not start with a hyphen.</div><div class='del'>-func_len ()</div><div class='del'>-{</div><div class='del'>-  func_len_result=`expr "$1" : ".*" 2&gt;/dev/null || echo $max_cmd_len`</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-case $lt_shell_append in</div><div class='del'>-  yes)</div><div class='del'>-    cat &lt;&lt; \_LT_EOF &gt;&gt; "$cfgfile"</div><div class='del'>-</div><div class='del'>-# func_append var value</div><div class='del'>-# Append VALUE to the end of shell variable VAR.</div><div class='del'>-func_append ()</div><div class='del'>-{</div><div class='del'>-  eval "$1+=\$2"</div><div class='del'>-}</div><div class='del'>-_LT_EOF</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    cat &lt;&lt; \_LT_EOF &gt;&gt; "$cfgfile"</div><div class='del'>-</div><div class='del'>-# func_append var value</div><div class='del'>-# Append VALUE to the end of shell variable VAR.</div><div class='del'>-func_append ()</div><div class='del'>-{</div><div class='del'>-  eval "$1=\$$1\$2"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-_LT_EOF</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" &gt;&gt; "$cfgfile" \</div><div class='del'>-    || (rm -f "$cfgfile"; exit 1)</div><div class='del'>-</div><div class='del'>-  mv -f "$cfgfile" "$ofile" ||</div><div class='del'>-    (rm -f "$ofile" &amp;&amp; cp "$cfgfile" "$ofile" &amp;&amp; rm -f "$cfgfile")</div><div class='del'>-  chmod +x "$ofile"</div><div class='del'>-</div><div class='del'>- ;;</div><div class='del'>-    "libpng-config":F) chmod +x libpng-config ;;</div><div class='del'>-</div><div class='del'>-  esac</div><div class='del'>-done # for ac_tag</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-as_fn_exit 0</div><div class='del'>-_ACEOF</div><div class='del'>-ac_clean_files=$ac_clean_files_save</div><div class='del'>-</div><div class='del'>-test $ac_write_fail = 0 ||</div><div class='del'>-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# configure is writing to config.log, and then calls config.status.</div><div class='del'>-# config.status does its own redirection, appending to config.log.</div><div class='del'>-# Unfortunately, on DOS this fails, as config.log is still kept open</div><div class='del'>-# by configure, so config.status won't be able to write to it; its</div><div class='del'>-# output is simply discarded.  So we exec the FD to /dev/null,</div><div class='del'>-# effectively closing config.log, so it can be properly (re)opened and</div><div class='del'>-# appended to by config.status.  When coming back to configure, we</div><div class='del'>-# need to make the FD available again.</div><div class='del'>-if test "$no_create" != yes; then</div><div class='del'>-  ac_cs_success=:</div><div class='del'>-  ac_config_status_args=</div><div class='del'>-  test "$silent" = yes &amp;&amp;</div><div class='del'>-    ac_config_status_args="$ac_config_status_args --quiet"</div><div class='del'>-  exec 5&gt;/dev/null</div><div class='del'>-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false</div><div class='del'>-  exec 5&gt;&gt;config.log</div><div class='del'>-  # Use ||, not &amp;&amp;, to avoid exiting from the if with $? = 1, which</div><div class='del'>-  # would make configure fail if this is the last instruction.</div><div class='del'>-  $ac_cs_success || as_fn_exit $?</div><div class='del'>-fi</div><div class='del'>-if test -n "$ac_unrecognized_opts" &amp;&amp; test "$enable_option_checking" != no; then</div><div class='del'>-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" &gt;&amp;5</div><div class='del'>-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" &gt;&amp;2;}</div><div class='del'>-fi</div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libpng/configure.ac b/src/3rdparty/libpng/configure.ac<br/>index dcdde1e..ff277a4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/configure.ac?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/configure.ac</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/configure.ac?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/configure.ac</a></div><div class='hunk'>@@ -18,15 +18,15 @@ AC_PREREQ(2.59)</div><div class='ctx'> </div><div class='ctx'> dnl Version number stuff here:</div><div class='ctx'> </div><div class='del'>-AC_INIT([libpng], [1.4.0], [png-mng-implement@lists.sourceforge.net])</div><div class='add'>+AC_INIT([libpng], [1.5.1], [png-mng-implement@lists.sourceforge.net])</div><div class='ctx'> AM_INIT_AUTOMAKE</div><div class='ctx'> dnl stop configure from automagically running automake</div><div class='ctx'> AM_MAINTAINER_MODE</div><div class='ctx'> </div><div class='del'>-PNGLIB_VERSION=1.4.0</div><div class='add'>+PNGLIB_VERSION=1.5.1</div><div class='ctx'> PNGLIB_MAJOR=1</div><div class='del'>-PNGLIB_MINOR=4</div><div class='del'>-PNGLIB_RELEASE=0</div><div class='add'>+PNGLIB_MINOR=5</div><div class='add'>+PNGLIB_RELEASE=1</div><div class='ctx'> </div><div class='ctx'> dnl End of version number stuff</div><div class='ctx'> </div><div class='hunk'>@@ -34,15 +34,38 @@ AC_CONFIG_SRCDIR([pngget.c])</div><div class='ctx'> AM_CONFIG_HEADER(config.h)</div><div class='ctx'> </div><div class='ctx'> # Checks for programs.</div><div class='add'>+AC_LANG([C])</div><div class='ctx'> AC_PROG_CC</div><div class='ctx'> AC_PROG_LD</div><div class='ctx'> AC_PROG_CPP</div><div class='ctx'> AC_CHECK_TOOL(SED, sed, :)</div><div class='del'>-AC_LIBTOOL_WIN32_DLL</div><div class='add'>+AC_CHECK_TOOL(AWK, awk, :)</div><div class='ctx'> AC_PROG_INSTALL</div><div class='ctx'> AC_PROG_LN_S</div><div class='ctx'> AC_PROG_MAKE_SET</div><div class='del'>-AC_PROG_LIBTOOL</div><div class='add'>+LT_INIT([win32-dll])</div><div class='add'>+</div><div class='add'>+# On Solaris 10 and 12 CPP gets set to cc -E, however this still</div><div class='add'>+# does some input parsing.  We need strict ANSI-C style tokenization,</div><div class='add'>+# check this:</div><div class='add'>+AC_REQUIRE_CPP</div><div class='add'>+AC_MSG_CHECKING([for a C preprocessor that does not parse its input])</div><div class='add'>+AC_TRY_CPP([1.5.0 16BIT],</div><div class='add'>+   [DFNCPP="$CPP"],</div><div class='add'>+   [DFNCPP=""</div><div class='add'>+   sav_CPP="$CPP"</div><div class='add'>+   for CPP in "${CC-cc} -E" "${CC-cc} -E -traditional-cpp" "/lib/cpp" "cpp"; do</div><div class='add'>+      AC_TRY_CPP([1.5.0 16BIT],</div><div class='add'>+         [DFNCPP="$CPP"]</div><div class='add'>+         [break],,)</div><div class='add'>+   done</div><div class='add'>+   CPP="$sav_CPP"])</div><div class='add'>+if test -n "$DFNCPP"; then</div><div class='add'>+   AC_MSG_RESULT([$DFNCPP])</div><div class='add'>+   AC_SUBST(DFNCPP)</div><div class='add'>+else</div><div class='add'>+   AC_MSG_FAILURE([not found], 1)</div><div class='add'>+fi</div><div class='ctx'> </div><div class='ctx'> # Checks for header files.</div><div class='ctx'> AC_HEADER_STDC</div><div class='hunk'>@@ -57,13 +80,30 @@ AC_STRUCT_TM</div><div class='ctx'> AC_FUNC_STRTOD</div><div class='ctx'> AC_CHECK_FUNCS([memset], , AC_ERROR([memset not found in libc]))</div><div class='ctx'> AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_ERROR([cannot find pow])) )</div><div class='del'>-AC_CHECK_LIB(z, zlibVersion, , AC_ERROR([zlib not installed]))</div><div class='add'>+AC_ARG_WITH(zlib-prefix,</div><div class='add'>+   AC_HELP_STRING([--with-zlib-prefix],</div><div class='add'>+                  [prefix that may have been used in installed zlib]),</div><div class='add'>+                  [ZPREFIX=${withval}],</div><div class='add'>+                  [ZPREFIX='z_'])</div><div class='add'>+AC_CHECK_LIB(z, zlibVersion, ,</div><div class='add'>+    AC_CHECK_LIB(z, ${ZPREFIX}zlibVersion, ,</div><div class='add'>+                 AC_ERROR([zlib not installed])))</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG</div><div class='ctx'> LIBPNG_DEFINES=$LIBPNG_DEFINES</div><div class='ctx'> AC_SUBST(LIBPNG_DEFINES)</div><div class='ctx'> </div><div class='ctx'> AC_MSG_CHECKING([if libraries can be versioned])</div><div class='add'>+# Special case for PE/COFF platforms: ld reports</div><div class='add'>+# support for version-script, but doesn't actually</div><div class='add'>+# DO anything with it.</div><div class='add'>+case $host in</div><div class='add'>+*cygwin* | *mingw32* | *interix* )</div><div class='add'>+    have_ld_version_script=no</div><div class='add'>+    AC_MSG_RESULT(no)</div><div class='add'>+;;</div><div class='add'>+* )</div><div class='ctx'> GLD=`$LD --help &lt; /dev/null 2&gt;/dev/null | grep version-script`</div><div class='ctx'> if test "$GLD"; then</div><div class='ctx'>     have_ld_version_script=yes</div><div class='hunk'>@@ -73,6 +113,9 @@ else</div><div class='ctx'>     AC_MSG_RESULT(no)</div><div class='ctx'>     AC_MSG_WARN(*** You have not enabled versioned symbols.)</div><div class='ctx'> fi</div><div class='add'>+;;</div><div class='add'>+esac</div><div class='add'>+</div><div class='ctx'> AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")</div><div class='ctx'> </div><div class='ctx'> if test "$have_ld_version_script" = "yes"; then</div><div class='head'>diff --git a/src/3rdparty/libpng/depcomp b/src/3rdparty/libpng/depcomp<br/>deleted file mode 100755<br/>index df8eea7..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/depcomp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/depcomp</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,630 +0,0 @@</div><div class='del'>-#! /bin/sh</div><div class='del'>-# depcomp - compile a program generating dependencies as side-effects</div><div class='del'>-</div><div class='del'>-scriptversion=2009-04-28.21; # UTC</div><div class='del'>-</div><div class='del'>-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free</div><div class='del'>-# Software Foundation, Inc.</div><div class='del'>-</div><div class='del'>-# This program is free software; you can redistribute it and/or modify</div><div class='del'>-# it under the terms of the GNU General Public License as published by</div><div class='del'>-# the Free Software Foundation; either version 2, or (at your option)</div><div class='del'>-# any later version.</div><div class='del'>-</div><div class='del'>-# This program is distributed in the hope that it will be useful,</div><div class='del'>-# but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-# GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-# You should have received a copy of the GNU General Public License</div><div class='del'>-# along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>-</div><div class='del'>-# As a special exception to the GNU General Public License, if you</div><div class='del'>-# distribute this file as part of a program that contains a</div><div class='del'>-# configuration script generated by Autoconf, you may include it under</div><div class='del'>-# the same distribution terms that you use for the rest of that program.</div><div class='del'>-</div><div class='del'>-# Originally written by Alexandre Oliva &lt;oliva@dcc.unicamp.br&gt;.</div><div class='del'>-</div><div class='del'>-case $1 in</div><div class='del'>-  '')</div><div class='del'>-     echo "$0: No command.  Try \`$0 --help' for more information." 1&gt;&amp;2</div><div class='del'>-     exit 1;</div><div class='del'>-     ;;</div><div class='del'>-  -h | --h*)</div><div class='del'>-    cat &lt;&lt;\EOF</div><div class='del'>-Usage: depcomp [--help] [--version] PROGRAM [ARGS]</div><div class='del'>-</div><div class='del'>-Run PROGRAMS ARGS to compile a file, generating dependencies</div><div class='del'>-as side-effects.</div><div class='del'>-</div><div class='del'>-Environment variables:</div><div class='del'>-  depmode     Dependency tracking mode.</div><div class='del'>-  source      Source file read by `PROGRAMS ARGS'.</div><div class='del'>-  object      Object file output by `PROGRAMS ARGS'.</div><div class='del'>-  DEPDIR      directory where to store dependencies.</div><div class='del'>-  depfile     Dependency file to output.</div><div class='del'>-  tmpdepfile  Temporary file to use when outputing dependencies.</div><div class='del'>-  libtool     Whether libtool is used (yes/no).</div><div class='del'>-</div><div class='del'>-Report bugs to &lt;bug-automake@gnu.org&gt;.</div><div class='del'>-EOF</div><div class='del'>-    exit $?</div><div class='del'>-    ;;</div><div class='del'>-  -v | --v*)</div><div class='del'>-    echo "depcomp $scriptversion"</div><div class='del'>-    exit $?</div><div class='del'>-    ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-if test -z "$depmode" || test -z "$source" || test -z "$object"; then</div><div class='del'>-  echo "depcomp: Variables source, object and depmode must be set" 1&gt;&amp;2</div><div class='del'>-  exit 1</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.</div><div class='del'>-depfile=${depfile-`echo "$object" |</div><div class='del'>-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&amp;|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}</div><div class='del'>-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}</div><div class='del'>-</div><div class='del'>-rm -f "$tmpdepfile"</div><div class='del'>-</div><div class='del'>-# Some modes work just like other modes, but use different flags.  We</div><div class='del'>-# parameterize here, but still list the modes in the big case below,</div><div class='del'>-# to make depend.m4 easier to write.  Note that we *cannot* use a case</div><div class='del'>-# here, because this file can only contain one case statement.</div><div class='del'>-if test "$depmode" = hp; then</div><div class='del'>-  # HP compiler uses -M and no extra arg.</div><div class='del'>-  gccflag=-M</div><div class='del'>-  depmode=gcc</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test "$depmode" = dashXmstdout; then</div><div class='del'>-   # This is just like dashmstdout with a different argument.</div><div class='del'>-   dashmflag=-xM</div><div class='del'>-   depmode=dashmstdout</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-cygpath_u="cygpath -u -f -"</div><div class='del'>-if test "$depmode" = msvcmsys; then</div><div class='del'>-   # This is just like msvisualcpp but w/o cygpath translation.</div><div class='del'>-   # Just convert the backslash-escaped backslashes to single forward</div><div class='del'>-   # slashes to satisfy depend.m4</div><div class='del'>-   cygpath_u="sed s,\\\\\\\\,/,g"</div><div class='del'>-   depmode=msvisualcpp</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-case "$depmode" in</div><div class='del'>-gcc3)</div><div class='del'>-## gcc 3 implements dependency tracking that does exactly what</div><div class='del'>-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like</div><div class='del'>-## it if -MD -MP comes after the -MF stuff.  Hmm.</div><div class='del'>-## Unfortunately, FreeBSD c89 acceptance of flags depends upon</div><div class='del'>-## the command line argument order; so add the flags where they</div><div class='del'>-## appear in depend2.am.  Note that the slowdown incurred here</div><div class='del'>-## affects only configure: in makefiles, %FASTDEP% shortcuts this.</div><div class='del'>-  for arg</div><div class='del'>-  do</div><div class='del'>-    case $arg in</div><div class='del'>-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;</div><div class='del'>-    *)  set fnord "$@" "$arg" ;;</div><div class='del'>-    esac</div><div class='del'>-    shift # fnord</div><div class='del'>-    shift # $arg</div><div class='del'>-  done</div><div class='del'>-  "$@"</div><div class='del'>-  stat=$?</div><div class='del'>-  if test $stat -eq 0; then :</div><div class='del'>-  else</div><div class='del'>-    rm -f "$tmpdepfile"</div><div class='del'>-    exit $stat</div><div class='del'>-  fi</div><div class='del'>-  mv "$tmpdepfile" "$depfile"</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-gcc)</div><div class='del'>-## There are various ways to get dependency output from gcc.  Here's</div><div class='del'>-## why we pick this rather obscure method:</div><div class='del'>-## - Don't want to use -MD because we'd like the dependencies to end</div><div class='del'>-##   up in a subdir.  Having to rename by hand is ugly.</div><div class='del'>-##   (We might end up doing this anyway to support other compilers.)</div><div class='del'>-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like</div><div class='del'>-##   -MM, not -M (despite what the docs say).</div><div class='del'>-## - Using -M directly means running the compiler twice (even worse</div><div class='del'>-##   than renaming).</div><div class='del'>-  if test -z "$gccflag"; then</div><div class='del'>-    gccflag=-MD,</div><div class='del'>-  fi</div><div class='del'>-  "$@" -Wp,"$gccflag$tmpdepfile"</div><div class='del'>-  stat=$?</div><div class='del'>-  if test $stat -eq 0; then :</div><div class='del'>-  else</div><div class='del'>-    rm -f "$tmpdepfile"</div><div class='del'>-    exit $stat</div><div class='del'>-  fi</div><div class='del'>-  rm -f "$depfile"</div><div class='del'>-  echo "$object : \\" &gt; "$depfile"</div><div class='del'>-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz</div><div class='del'>-## The second -e expression handles DOS-style file names with drive letters.</div><div class='del'>-  sed -e 's/^[^:]*: / /' \</div><div class='del'>-      -e 's/^['$alpha']:\/[^:]*: / /' &lt; "$tmpdepfile" &gt;&gt; "$depfile"</div><div class='del'>-## This next piece of magic avoids the `deleted header file' problem.</div><div class='del'>-## The problem is that when a header file which appears in a .P file</div><div class='del'>-## is deleted, the dependency causes make to die (because there is</div><div class='del'>-## typically no way to rebuild the header).  We avoid this by adding</div><div class='del'>-## dummy dependencies for each header file.  Too bad gcc doesn't do</div><div class='del'>-## this for us directly.</div><div class='del'>-  tr ' ' '</div><div class='del'>-' &lt; "$tmpdepfile" |</div><div class='del'>-## Some versions of gcc put a space before the `:'.  On the theory</div><div class='del'>-## that the space means something, we add a space to the output as</div><div class='del'>-## well.</div><div class='del'>-## Some versions of the HPUX 10.20 sed can't process this invocation</div><div class='del'>-## correctly.  Breaking it into two sed invocations is a workaround.</div><div class='del'>-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' &gt;&gt; "$depfile"</div><div class='del'>-  rm -f "$tmpdepfile"</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-hp)</div><div class='del'>-  # This case exists only to let depend.m4 do its work.  It works by</div><div class='del'>-  # looking at the text of this script.  This case will never be run,</div><div class='del'>-  # since it is checked for above.</div><div class='del'>-  exit 1</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-sgi)</div><div class='del'>-  if test "$libtool" = yes; then</div><div class='del'>-    "$@" "-Wp,-MDupdate,$tmpdepfile"</div><div class='del'>-  else</div><div class='del'>-    "$@" -MDupdate "$tmpdepfile"</div><div class='del'>-  fi</div><div class='del'>-  stat=$?</div><div class='del'>-  if test $stat -eq 0; then :</div><div class='del'>-  else</div><div class='del'>-    rm -f "$tmpdepfile"</div><div class='del'>-    exit $stat</div><div class='del'>-  fi</div><div class='del'>-  rm -f "$depfile"</div><div class='del'>-</div><div class='del'>-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files</div><div class='del'>-    echo "$object : \\" &gt; "$depfile"</div><div class='del'>-</div><div class='del'>-    # Clip off the initial element (the dependent).  Don't try to be</div><div class='del'>-    # clever and replace this with sed code, as IRIX sed won't handle</div><div class='del'>-    # lines with more than a fixed number of characters (4096 in</div><div class='del'>-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;</div><div class='del'>-    # the IRIX cc adds comments like `#:fec' to the end of the</div><div class='del'>-    # dependency line.</div><div class='del'>-    tr ' ' '</div><div class='del'>-' &lt; "$tmpdepfile" \</div><div class='del'>-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \</div><div class='del'>-    tr '</div><div class='del'>-' ' ' &gt;&gt; "$depfile"</div><div class='del'>-    echo &gt;&gt; "$depfile"</div><div class='del'>-</div><div class='del'>-    # The second pass generates a dummy entry for each header file.</div><div class='del'>-    tr ' ' '</div><div class='del'>-' &lt; "$tmpdepfile" \</div><div class='del'>-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \</div><div class='del'>-   &gt;&gt; "$depfile"</div><div class='del'>-  else</div><div class='del'>-    # The sourcefile does not contain any dependencies, so just</div><div class='del'>-    # store a dummy comment line, to avoid errors with the Makefile</div><div class='del'>-    # "include basename.Plo" scheme.</div><div class='del'>-    echo "#dummy" &gt; "$depfile"</div><div class='del'>-  fi</div><div class='del'>-  rm -f "$tmpdepfile"</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-aix)</div><div class='del'>-  # The C for AIX Compiler uses -M and outputs the dependencies</div><div class='del'>-  # in a .u file.  In older versions, this file always lives in the</div><div class='del'>-  # current directory.  Also, the AIX compiler puts `$object:' at the</div><div class='del'>-  # start of each line; $object doesn't have directory information.</div><div class='del'>-  # Version 6 uses the directory in both cases.</div><div class='del'>-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`</div><div class='del'>-  test "x$dir" = "x$object" &amp;&amp; dir=</div><div class='del'>-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`</div><div class='del'>-  if test "$libtool" = yes; then</div><div class='del'>-    tmpdepfile1=$dir$base.u</div><div class='del'>-    tmpdepfile2=$base.u</div><div class='del'>-    tmpdepfile3=$dir.libs/$base.u</div><div class='del'>-    "$@" -Wc,-M</div><div class='del'>-  else</div><div class='del'>-    tmpdepfile1=$dir$base.u</div><div class='del'>-    tmpdepfile2=$dir$base.u</div><div class='del'>-    tmpdepfile3=$dir$base.u</div><div class='del'>-    "$@" -M</div><div class='del'>-  fi</div><div class='del'>-  stat=$?</div><div class='del'>-</div><div class='del'>-  if test $stat -eq 0; then :</div><div class='del'>-  else</div><div class='del'>-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"</div><div class='del'>-    exit $stat</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"</div><div class='del'>-  do</div><div class='del'>-    test -f "$tmpdepfile" &amp;&amp; break</div><div class='del'>-  done</div><div class='del'>-  if test -f "$tmpdepfile"; then</div><div class='del'>-    # Each line is of the form `foo.o: dependent.h'.</div><div class='del'>-    # Do two passes, one to just change these to</div><div class='del'>-    # `$object: dependent.h' and one to simply `dependent.h:'.</div><div class='del'>-    sed -e "s,^.*\.[a-z]*:,$object:," &lt; "$tmpdepfile" &gt; "$depfile"</div><div class='del'>-    # That's a tab and a space in the [].</div><div class='del'>-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' &lt; "$tmpdepfile" &gt;&gt; "$depfile"</div><div class='del'>-  else</div><div class='del'>-    # The sourcefile does not contain any dependencies, so just</div><div class='del'>-    # store a dummy comment line, to avoid errors with the Makefile</div><div class='del'>-    # "include basename.Plo" scheme.</div><div class='del'>-    echo "#dummy" &gt; "$depfile"</div><div class='del'>-  fi</div><div class='del'>-  rm -f "$tmpdepfile"</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-icc)</div><div class='del'>-  # Intel's C compiler understands `-MD -MF file'.  However on</div><div class='del'>-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c</div><div class='del'>-  # ICC 7.0 will fill foo.d with something like</div><div class='del'>-  #    foo.o: sub/foo.c</div><div class='del'>-  #    foo.o: sub/foo.h</div><div class='del'>-  # which is wrong.  We want:</div><div class='del'>-  #    sub/foo.o: sub/foo.c</div><div class='del'>-  #    sub/foo.o: sub/foo.h</div><div class='del'>-  #    sub/foo.c:</div><div class='del'>-  #    sub/foo.h:</div><div class='del'>-  # ICC 7.1 will output</div><div class='del'>-  #    foo.o: sub/foo.c sub/foo.h</div><div class='del'>-  # and will wrap long lines using \ :</div><div class='del'>-  #    foo.o: sub/foo.c ... \</div><div class='del'>-  #     sub/foo.h ... \</div><div class='del'>-  #     ...</div><div class='del'>-</div><div class='del'>-  "$@" -MD -MF "$tmpdepfile"</div><div class='del'>-  stat=$?</div><div class='del'>-  if test $stat -eq 0; then :</div><div class='del'>-  else</div><div class='del'>-    rm -f "$tmpdepfile"</div><div class='del'>-    exit $stat</div><div class='del'>-  fi</div><div class='del'>-  rm -f "$depfile"</div><div class='del'>-  # Each line is of the form `foo.o: dependent.h',</div><div class='del'>-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.</div><div class='del'>-  # Do two passes, one to just change these to</div><div class='del'>-  # `$object: dependent.h' and one to simply `dependent.h:'.</div><div class='del'>-  sed "s,^[^:]*:,$object :," &lt; "$tmpdepfile" &gt; "$depfile"</div><div class='del'>-  # Some versions of the HPUX 10.20 sed can't process this invocation</div><div class='del'>-  # correctly.  Breaking it into two sed invocations is a workaround.</div><div class='del'>-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' &lt; "$tmpdepfile" |</div><div class='del'>-    sed -e 's/$/ :/' &gt;&gt; "$depfile"</div><div class='del'>-  rm -f "$tmpdepfile"</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-hp2)</div><div class='del'>-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64</div><div class='del'>-  # compilers, which have integrated preprocessors.  The correct option</div><div class='del'>-  # to use with these is +Maked; it writes dependencies to a file named</div><div class='del'>-  # 'foo.d', which lands next to the object file, wherever that</div><div class='del'>-  # happens to be.</div><div class='del'>-  # Much of this is similar to the tru64 case; see comments there.</div><div class='del'>-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`</div><div class='del'>-  test "x$dir" = "x$object" &amp;&amp; dir=</div><div class='del'>-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`</div><div class='del'>-  if test "$libtool" = yes; then</div><div class='del'>-    tmpdepfile1=$dir$base.d</div><div class='del'>-    tmpdepfile2=$dir.libs/$base.d</div><div class='del'>-    "$@" -Wc,+Maked</div><div class='del'>-  else</div><div class='del'>-    tmpdepfile1=$dir$base.d</div><div class='del'>-    tmpdepfile2=$dir$base.d</div><div class='del'>-    "$@" +Maked</div><div class='del'>-  fi</div><div class='del'>-  stat=$?</div><div class='del'>-  if test $stat -eq 0; then :</div><div class='del'>-  else</div><div class='del'>-     rm -f "$tmpdepfile1" "$tmpdepfile2"</div><div class='del'>-     exit $stat</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"</div><div class='del'>-  do</div><div class='del'>-    test -f "$tmpdepfile" &amp;&amp; break</div><div class='del'>-  done</div><div class='del'>-  if test -f "$tmpdepfile"; then</div><div class='del'>-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" &gt; "$depfile"</div><div class='del'>-    # Add `dependent.h:' lines.</div><div class='del'>-    sed -ne '2,${</div><div class='del'>-	       s/^ *//</div><div class='del'>-	       s/ \\*$//</div><div class='del'>-	       s/$/:/</div><div class='del'>-	       p</div><div class='del'>-	     }' "$tmpdepfile" &gt;&gt; "$depfile"</div><div class='del'>-  else</div><div class='del'>-    echo "#dummy" &gt; "$depfile"</div><div class='del'>-  fi</div><div class='del'>-  rm -f "$tmpdepfile" "$tmpdepfile2"</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-tru64)</div><div class='del'>-   # The Tru64 compiler uses -MD to generate dependencies as a side</div><div class='del'>-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.</div><div class='del'>-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put</div><div class='del'>-   # dependencies in `foo.d' instead, so we check for that too.</div><div class='del'>-   # Subdirectories are respected.</div><div class='del'>-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`</div><div class='del'>-   test "x$dir" = "x$object" &amp;&amp; dir=</div><div class='del'>-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`</div><div class='del'>-</div><div class='del'>-   if test "$libtool" = yes; then</div><div class='del'>-      # With Tru64 cc, shared objects can also be used to make a</div><div class='del'>-      # static library.  This mechanism is used in libtool 1.4 series to</div><div class='del'>-      # handle both shared and static libraries in a single compilation.</div><div class='del'>-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.</div><div class='del'>-      #</div><div class='del'>-      # With libtool 1.5 this exception was removed, and libtool now</div><div class='del'>-      # generates 2 separate objects for the 2 libraries.  These two</div><div class='del'>-      # compilations output dependencies in $dir.libs/$base.o.d and</div><div class='del'>-      # in $dir$base.o.d.  We have to check for both files, because</div><div class='del'>-      # one of the two compilations can be disabled.  We should prefer</div><div class='del'>-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is</div><div class='del'>-      # automatically cleaned when .libs/ is deleted, while ignoring</div><div class='del'>-      # the former would cause a distcleancheck panic.</div><div class='del'>-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4</div><div class='del'>-      tmpdepfile2=$dir$base.o.d          # libtool 1.5</div><div class='del'>-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5</div><div class='del'>-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504</div><div class='del'>-      "$@" -Wc,-MD</div><div class='del'>-   else</div><div class='del'>-      tmpdepfile1=$dir$base.o.d</div><div class='del'>-      tmpdepfile2=$dir$base.d</div><div class='del'>-      tmpdepfile3=$dir$base.d</div><div class='del'>-      tmpdepfile4=$dir$base.d</div><div class='del'>-      "$@" -MD</div><div class='del'>-   fi</div><div class='del'>-</div><div class='del'>-   stat=$?</div><div class='del'>-   if test $stat -eq 0; then :</div><div class='del'>-   else</div><div class='del'>-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"</div><div class='del'>-      exit $stat</div><div class='del'>-   fi</div><div class='del'>-</div><div class='del'>-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"</div><div class='del'>-   do</div><div class='del'>-     test -f "$tmpdepfile" &amp;&amp; break</div><div class='del'>-   done</div><div class='del'>-   if test -f "$tmpdepfile"; then</div><div class='del'>-      sed -e "s,^.*\.[a-z]*:,$object:," &lt; "$tmpdepfile" &gt; "$depfile"</div><div class='del'>-      # That's a tab and a space in the [].</div><div class='del'>-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' &lt; "$tmpdepfile" &gt;&gt; "$depfile"</div><div class='del'>-   else</div><div class='del'>-      echo "#dummy" &gt; "$depfile"</div><div class='del'>-   fi</div><div class='del'>-   rm -f "$tmpdepfile"</div><div class='del'>-   ;;</div><div class='del'>-</div><div class='del'>-#nosideeffect)</div><div class='del'>-  # This comment above is used by automake to tell side-effect</div><div class='del'>-  # dependency tracking mechanisms from slower ones.</div><div class='del'>-</div><div class='del'>-dashmstdout)</div><div class='del'>-  # Important note: in order to support this mode, a compiler *must*</div><div class='del'>-  # always write the preprocessed file to stdout, regardless of -o.</div><div class='del'>-  "$@" || exit $?</div><div class='del'>-</div><div class='del'>-  # Remove the call to Libtool.</div><div class='del'>-  if test "$libtool" = yes; then</div><div class='del'>-    while test "X$1" != 'X--mode=compile'; do</div><div class='del'>-      shift</div><div class='del'>-    done</div><div class='del'>-    shift</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  # Remove `-o $object'.</div><div class='del'>-  IFS=" "</div><div class='del'>-  for arg</div><div class='del'>-  do</div><div class='del'>-    case $arg in</div><div class='del'>-    -o)</div><div class='del'>-      shift</div><div class='del'>-      ;;</div><div class='del'>-    $object)</div><div class='del'>-      shift</div><div class='del'>-      ;;</div><div class='del'>-    *)</div><div class='del'>-      set fnord "$@" "$arg"</div><div class='del'>-      shift # fnord</div><div class='del'>-      shift # $arg</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-  done</div><div class='del'>-</div><div class='del'>-  test -z "$dashmflag" &amp;&amp; dashmflag=-M</div><div class='del'>-  # Require at least two characters before searching for `:'</div><div class='del'>-  # in the target name.  This is to cope with DOS-style filenames:</div><div class='del'>-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.</div><div class='del'>-  "$@" $dashmflag |</div><div class='del'>-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' &gt; "$tmpdepfile"</div><div class='del'>-  rm -f "$depfile"</div><div class='del'>-  cat &lt; "$tmpdepfile" &gt; "$depfile"</div><div class='del'>-  tr ' ' '</div><div class='del'>-' &lt; "$tmpdepfile" | \</div><div class='del'>-## Some versions of the HPUX 10.20 sed can't process this invocation</div><div class='del'>-## correctly.  Breaking it into two sed invocations is a workaround.</div><div class='del'>-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' &gt;&gt; "$depfile"</div><div class='del'>-  rm -f "$tmpdepfile"</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-dashXmstdout)</div><div class='del'>-  # This case only exists to satisfy depend.m4.  It is never actually</div><div class='del'>-  # run, as this mode is specially recognized in the preamble.</div><div class='del'>-  exit 1</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-makedepend)</div><div class='del'>-  "$@" || exit $?</div><div class='del'>-  # Remove any Libtool call</div><div class='del'>-  if test "$libtool" = yes; then</div><div class='del'>-    while test "X$1" != 'X--mode=compile'; do</div><div class='del'>-      shift</div><div class='del'>-    done</div><div class='del'>-    shift</div><div class='del'>-  fi</div><div class='del'>-  # X makedepend</div><div class='del'>-  shift</div><div class='del'>-  cleared=no eat=no</div><div class='del'>-  for arg</div><div class='del'>-  do</div><div class='del'>-    case $cleared in</div><div class='del'>-    no)</div><div class='del'>-      set ""; shift</div><div class='del'>-      cleared=yes ;;</div><div class='del'>-    esac</div><div class='del'>-    if test $eat = yes; then</div><div class='del'>-      eat=no</div><div class='del'>-      continue</div><div class='del'>-    fi</div><div class='del'>-    case "$arg" in</div><div class='del'>-    -D*|-I*)</div><div class='del'>-      set fnord "$@" "$arg"; shift ;;</div><div class='del'>-    # Strip any option that makedepend may not understand.  Remove</div><div class='del'>-    # the object too, otherwise makedepend will parse it as a source file.</div><div class='del'>-    -arch)</div><div class='del'>-      eat=yes ;;</div><div class='del'>-    -*|$object)</div><div class='del'>-      ;;</div><div class='del'>-    *)</div><div class='del'>-      set fnord "$@" "$arg"; shift ;;</div><div class='del'>-    esac</div><div class='del'>-  done</div><div class='del'>-  obj_suffix=`echo "$object" | sed 's/^.*\././'`</div><div class='del'>-  touch "$tmpdepfile"</div><div class='del'>-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"</div><div class='del'>-  rm -f "$depfile"</div><div class='del'>-  cat &lt; "$tmpdepfile" &gt; "$depfile"</div><div class='del'>-  sed '1,2d' "$tmpdepfile" | tr ' ' '</div><div class='del'>-' | \</div><div class='del'>-## Some versions of the HPUX 10.20 sed can't process this invocation</div><div class='del'>-## correctly.  Breaking it into two sed invocations is a workaround.</div><div class='del'>-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' &gt;&gt; "$depfile"</div><div class='del'>-  rm -f "$tmpdepfile" "$tmpdepfile".bak</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-cpp)</div><div class='del'>-  # Important note: in order to support this mode, a compiler *must*</div><div class='del'>-  # always write the preprocessed file to stdout.</div><div class='del'>-  "$@" || exit $?</div><div class='del'>-</div><div class='del'>-  # Remove the call to Libtool.</div><div class='del'>-  if test "$libtool" = yes; then</div><div class='del'>-    while test "X$1" != 'X--mode=compile'; do</div><div class='del'>-      shift</div><div class='del'>-    done</div><div class='del'>-    shift</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  # Remove `-o $object'.</div><div class='del'>-  IFS=" "</div><div class='del'>-  for arg</div><div class='del'>-  do</div><div class='del'>-    case $arg in</div><div class='del'>-    -o)</div><div class='del'>-      shift</div><div class='del'>-      ;;</div><div class='del'>-    $object)</div><div class='del'>-      shift</div><div class='del'>-      ;;</div><div class='del'>-    *)</div><div class='del'>-      set fnord "$@" "$arg"</div><div class='del'>-      shift # fnord</div><div class='del'>-      shift # $arg</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-  done</div><div class='del'>-</div><div class='del'>-  "$@" -E |</div><div class='del'>-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \</div><div class='del'>-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |</div><div class='del'>-    sed '$ s: \\$::' &gt; "$tmpdepfile"</div><div class='del'>-  rm -f "$depfile"</div><div class='del'>-  echo "$object : \\" &gt; "$depfile"</div><div class='del'>-  cat &lt; "$tmpdepfile" &gt;&gt; "$depfile"</div><div class='del'>-  sed &lt; "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' &gt;&gt; "$depfile"</div><div class='del'>-  rm -f "$tmpdepfile"</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-msvisualcpp)</div><div class='del'>-  # Important note: in order to support this mode, a compiler *must*</div><div class='del'>-  # always write the preprocessed file to stdout.</div><div class='del'>-  "$@" || exit $?</div><div class='del'>-</div><div class='del'>-  # Remove the call to Libtool.</div><div class='del'>-  if test "$libtool" = yes; then</div><div class='del'>-    while test "X$1" != 'X--mode=compile'; do</div><div class='del'>-      shift</div><div class='del'>-    done</div><div class='del'>-    shift</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  IFS=" "</div><div class='del'>-  for arg</div><div class='del'>-  do</div><div class='del'>-    case "$arg" in</div><div class='del'>-    -o)</div><div class='del'>-      shift</div><div class='del'>-      ;;</div><div class='del'>-    $object)</div><div class='del'>-      shift</div><div class='del'>-      ;;</div><div class='del'>-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")</div><div class='del'>-	set fnord "$@"</div><div class='del'>-	shift</div><div class='del'>-	shift</div><div class='del'>-	;;</div><div class='del'>-    *)</div><div class='del'>-	set fnord "$@" "$arg"</div><div class='del'>-	shift</div><div class='del'>-	shift</div><div class='del'>-	;;</div><div class='del'>-    esac</div><div class='del'>-  done</div><div class='del'>-  "$@" -E 2&gt;/dev/null |</div><div class='del'>-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u &gt; "$tmpdepfile"</div><div class='del'>-  rm -f "$depfile"</div><div class='del'>-  echo "$object : \\" &gt; "$depfile"</div><div class='del'>-  sed &lt; "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' &gt;&gt; "$depfile"</div><div class='del'>-  echo "	" &gt;&gt; "$depfile"</div><div class='del'>-  sed &lt; "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' &gt;&gt; "$depfile"</div><div class='del'>-  rm -f "$tmpdepfile"</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-msvcmsys)</div><div class='del'>-  # This case exists only to let depend.m4 do its work.  It works by</div><div class='del'>-  # looking at the text of this script.  This case will never be run,</div><div class='del'>-  # since it is checked for above.</div><div class='del'>-  exit 1</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-none)</div><div class='del'>-  exec "$@"</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-*)</div><div class='del'>-  echo "Unknown depmode $depmode" 1&gt;&amp;2</div><div class='del'>-  exit 1</div><div class='del'>-  ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-exit 0</div><div class='del'>-</div><div class='del'>-# Local Variables:</div><div class='del'>-# mode: shell-script</div><div class='del'>-# sh-indentation: 2</div><div class='del'>-# eval: (add-hook 'write-file-hooks 'time-stamp)</div><div class='del'>-# time-stamp-start: "scriptversion="</div><div class='del'>-# time-stamp-format: "%:y-%02m-%02d.%02H"</div><div class='del'>-# time-stamp-time-zone: "UTC"</div><div class='del'>-# time-stamp-end: "; # UTC"</div><div class='del'>-# End:</div><div class='head'>diff --git a/src/3rdparty/libpng/example.c b/src/3rdparty/libpng/example.c<br/>index 8c5d87b..cd3682f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/example.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/example.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/example.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/example.c</a></div><div class='hunk'>@@ -2,15 +2,15 @@</div><div class='ctx'> #if 0 /* in case someone actually tries to compile this */</div><div class='ctx'> </div><div class='ctx'> /* example.c - an example of using libpng</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='add'>+ * Last changed in libpng 1.5.0 [January 6, 2011]</div><div class='ctx'>  * This file has been placed in the public domain by the authors.</div><div class='del'>- * Maintained 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Maintained 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * Maintained 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* This is an example of how to use libpng to read and write PNG files.</div><div class='del'>- * The file libpng.txt is much more verbose then this.  If you have not</div><div class='add'>+ * The file libpng-manual.txt is much more verbose then this.  If you have not</div><div class='ctx'>  * read it, do so first.  This was designed to be a starting point of an</div><div class='ctx'>  * implementation.  This is not officially part of libpng, is hereby placed</div><div class='ctx'>  * in the public domain, and therefore does not require a copyright notice.</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'>   */</div><div class='ctx'> </div><div class='ctx'> #ifndef png_jmpbuf</div><div class='del'>-#  define png_jmpbuf(png_ptr) ((png_ptr)-&gt;jmpbuf)</div><div class='add'>+#  define png_jmpbuf(png_ptr) ((png_ptr)-&gt;png_jmpbuf)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Check to see if a file is a PNG file using png_sig_cmp().  png_sig_cmp()</div><div class='hunk'>@@ -160,7 +160,7 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */</div><div class='ctx'>     * If you have enough memory to read in the entire image at once,</div><div class='ctx'>     * and you need to specify only transforms that can be controlled</div><div class='ctx'>     * with one of the PNG_TRANSFORM_* bits (this presently excludes</div><div class='del'>-    * dithering, filling, setting background, and doing gamma</div><div class='add'>+    * quantizing, filling, setting background, and doing gamma</div><div class='ctx'>     * adjustment), then you can read the entire image (including</div><div class='ctx'>     * pixels) into the info structure with this call:</div><div class='ctx'>     */</div><div class='hunk'>@@ -271,7 +271,8 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */</div><div class='ctx'>          png_set_gamma(png_ptr, screen_gamma, 0.45455);</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-   /* Dither RGB files down to 8 bit palette or reduce palettes</div><div class='add'>+#ifdef PNG_READ_QUANTIZE_SUPPORTED</div><div class='add'>+   /* Quantize RGB files down to 8 bit palette or reduce palettes</div><div class='ctx'>     * to the number of colors available on your screen.</div><div class='ctx'>     */</div><div class='ctx'>    if (color_type &amp; PNG_COLOR_MASK_COLOR)</div><div class='hunk'>@@ -282,10 +283,10 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */</div><div class='ctx'>       /* This reduces the image to the application supplied palette */</div><div class='ctx'>       if (/* We have our own palette */)</div><div class='ctx'>       {</div><div class='del'>-         /* An array of colors to which the image should be dithered */</div><div class='add'>+         /* An array of colors to which the image should be quantized */</div><div class='ctx'>          png_color std_color_cube[MAX_SCREEN_COLORS];</div><div class='ctx'> </div><div class='del'>-         png_set_dither(png_ptr, std_color_cube, MAX_SCREEN_COLORS,</div><div class='add'>+         png_set_quantize(png_ptr, std_color_cube, MAX_SCREEN_COLORS,</div><div class='ctx'>             MAX_SCREEN_COLORS, NULL, 0);</div><div class='ctx'>       }</div><div class='ctx'>       /* This reduces the image to the palette supplied in the file */</div><div class='hunk'>@@ -295,10 +296,11 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */</div><div class='ctx'> </div><div class='ctx'>          png_get_hIST(png_ptr, info_ptr, &amp;histogram);</div><div class='ctx'> </div><div class='del'>-         png_set_dither(png_ptr, palette, num_palette,</div><div class='add'>+         png_set_quantize(png_ptr, palette, num_palette,</div><div class='ctx'>                         max_screen_colors, histogram, 0);</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='add'>+#endif /* PNG_READ_QUANTIZE_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'>    /* Invert monochrome files to have 0 as white and 1 as black */</div><div class='ctx'>    png_set_invert_mono(png_ptr);</div><div class='hunk'>@@ -509,20 +511,17 @@ row_callback(png_structp png_ptr, png_bytep new_row,</div><div class='ctx'>     * shown below:</div><div class='ctx'>     */</div><div class='ctx'> </div><div class='del'>-   /* Check if row_num is in bounds. */</div><div class='del'>-   if ((row_num &gt;= 0) &amp;&amp; (row_num &lt; height))</div><div class='del'>-   {</div><div class='del'>-     /* Get pointer to corresponding row in our</div><div class='del'>-      * PNG read buffer.</div><div class='del'>-      */</div><div class='del'>-     png_bytep old_row = ((png_bytep *)our_data)[row_num];</div><div class='del'>-</div><div class='del'>-     /* If both rows are allocated then copy the new row</div><div class='del'>-      * data to the corresponding row data.</div><div class='del'>-      */</div><div class='del'>-     if ((old_row != NULL) &amp;&amp; (new_row != NULL))</div><div class='del'>-     png_progressive_combine_row(png_ptr, old_row, new_row);</div><div class='del'>-   }</div><div class='add'>+   /* Get pointer to corresponding row in our</div><div class='add'>+    * PNG read buffer.</div><div class='add'>+    */</div><div class='add'>+   png_bytep old_row = ((png_bytep *)our_data)[row_num];</div><div class='add'>+</div><div class='add'>+   /* If both rows are allocated then copy the new row</div><div class='add'>+    * data to the corresponding row data.</div><div class='add'>+    */</div><div class='add'>+   if ((old_row != NULL) &amp;&amp; (new_row != NULL))</div><div class='add'>+   png_progressive_combine_row(png_ptr, old_row, new_row);</div><div class='add'>+</div><div class='ctx'>    /*</div><div class='ctx'>     * The rows and passes are called in order, so you don't really</div><div class='ctx'>     * need the row_num and pass, but I'm supplying them because it</div><div class='hunk'>@@ -656,14 +655,18 @@ void write_png(char *file_name /* , ... other image information ... */)</div><div class='ctx'> </div><div class='ctx'>    /* Optional significant bit (sBIT) chunk */</div><div class='ctx'>    png_color_8 sig_bit;</div><div class='add'>+</div><div class='ctx'>    /* If we are dealing with a grayscale image then */</div><div class='ctx'>    sig_bit.gray = true_bit_depth;</div><div class='add'>+</div><div class='ctx'>    /* Otherwise, if we are dealing with a color image then */</div><div class='ctx'>    sig_bit.red = true_red_bit_depth;</div><div class='ctx'>    sig_bit.green = true_green_bit_depth;</div><div class='ctx'>    sig_bit.blue = true_blue_bit_depth;</div><div class='add'>+</div><div class='ctx'>    /* If the image has an alpha channel then */</div><div class='ctx'>    sig_bit.alpha = true_alpha_bit_depth;</div><div class='add'>+</div><div class='ctx'>    png_set_sBIT(png_ptr, info_ptr, &amp;sig_bit);</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -676,17 +679,21 @@ void write_png(char *file_name /* , ... other image information ... */)</div><div class='ctx'>    text_ptr[0].key = "Title";</div><div class='ctx'>    text_ptr[0].text = "Mona Lisa";</div><div class='ctx'>    text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE;</div><div class='add'>+   text_ptr[0].itxt_length = 0;</div><div class='add'>+   text_ptr[0].lang = NULL;</div><div class='add'>+   text_ptr[0].lang_key = NULL;</div><div class='ctx'>    text_ptr[1].key = "Author";</div><div class='ctx'>    text_ptr[1].text = "Leonardo DaVinci";</div><div class='ctx'>    text_ptr[1].compression = PNG_TEXT_COMPRESSION_NONE;</div><div class='add'>+   text_ptr[1].itxt_length = 0;</div><div class='add'>+   text_ptr[1].lang = NULL;</div><div class='add'>+   text_ptr[1].lang_key = NULL;</div><div class='ctx'>    text_ptr[2].key = "Description";</div><div class='ctx'>    text_ptr[2].text = "&lt;long text&gt;";</div><div class='ctx'>    text_ptr[2].compression = PNG_TEXT_COMPRESSION_zTXt;</div><div class='del'>-#ifdef PNG_iTXt_SUPPORTED</div><div class='del'>-   text_ptr[0].lang = NULL;</div><div class='del'>-   text_ptr[1].lang = NULL;</div><div class='add'>+   text_ptr[2].itxt_length = 0;</div><div class='ctx'>    text_ptr[2].lang = NULL;</div><div class='del'>-#endif</div><div class='add'>+   text_ptr[2].lang_key = NULL;</div><div class='ctx'>    png_set_text(png_ptr, info_ptr, text_ptr, 3);</div><div class='ctx'> </div><div class='ctx'>    /* Other optional chunks like cHRM, bKGD, tRNS, tIME, oFFs, pHYs */</div><div class='hunk'>@@ -751,6 +758,7 @@ void write_png(char *file_name /* , ... other image information ... */)</div><div class='ctx'>    /* Turn on interlace handling if you are not using png_write_image() */</div><div class='ctx'>    if (interlacing)</div><div class='ctx'>       number_passes = png_set_interlace_handling(png_ptr);</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       number_passes = 1;</div><div class='ctx'> </div><div class='head'>diff --git a/src/3rdparty/libpng/install-sh b/src/3rdparty/libpng/install-sh<br/>deleted file mode 100755<br/>index 6781b98..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/install-sh?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/install-sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,520 +0,0 @@</div><div class='del'>-#!/bin/sh</div><div class='del'>-# install - install a program, script, or datafile</div><div class='del'>-</div><div class='del'>-scriptversion=2009-04-28.21; # UTC</div><div class='del'>-</div><div class='del'>-# This originates from X11R5 (mit/util/scripts/install.sh), which was</div><div class='del'>-# later released in X11R6 (xc/config/util/install.sh) with the</div><div class='del'>-# following copyright and license.</div><div class='del'>-#</div><div class='del'>-# Copyright (C) 1994 X Consortium</div><div class='del'>-#</div><div class='del'>-# Permission is hereby granted, free of charge, to any person obtaining a copy</div><div class='del'>-# of this software and associated documentation files (the "Software"), to</div><div class='del'>-# deal in the Software without restriction, including without limitation the</div><div class='del'>-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or</div><div class='del'>-# sell copies of the Software, and to permit persons to whom the Software is</div><div class='del'>-# furnished to do so, subject to the following conditions:</div><div class='del'>-#</div><div class='del'>-# The above copyright notice and this permission notice shall be included in</div><div class='del'>-# all copies or substantial portions of the Software.</div><div class='del'>-#</div><div class='del'>-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR</div><div class='del'>-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,</div><div class='del'>-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE</div><div class='del'>-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN</div><div class='del'>-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-</div><div class='del'>-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</div><div class='del'>-#</div><div class='del'>-# Except as contained in this notice, the name of the X Consortium shall not</div><div class='del'>-# be used in advertising or otherwise to promote the sale, use or other deal-</div><div class='del'>-# ings in this Software without prior written authorization from the X Consor-</div><div class='del'>-# tium.</div><div class='del'>-#</div><div class='del'>-#</div><div class='del'>-# FSF changes to this file are in the public domain.</div><div class='del'>-#</div><div class='del'>-# Calling this script install-sh is preferred over install.sh, to prevent</div><div class='del'>-# `make' implicit rules from creating a file called install from it</div><div class='del'>-# when there is no Makefile.</div><div class='del'>-#</div><div class='del'>-# This script is compatible with the BSD install script, but was written</div><div class='del'>-# from scratch.</div><div class='del'>-</div><div class='del'>-nl='</div><div class='del'>-'</div><div class='del'>-IFS=" ""	$nl"</div><div class='del'>-</div><div class='del'>-# set DOITPROG to echo to test this script</div><div class='del'>-</div><div class='del'>-# Don't use :- since 4.3BSD and earlier shells don't like it.</div><div class='del'>-doit=${DOITPROG-}</div><div class='del'>-if test -z "$doit"; then</div><div class='del'>-  doit_exec=exec</div><div class='del'>-else</div><div class='del'>-  doit_exec=$doit</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-# Put in absolute file names if you don't have them in your path;</div><div class='del'>-# or use environment vars.</div><div class='del'>-</div><div class='del'>-chgrpprog=${CHGRPPROG-chgrp}</div><div class='del'>-chmodprog=${CHMODPROG-chmod}</div><div class='del'>-chownprog=${CHOWNPROG-chown}</div><div class='del'>-cmpprog=${CMPPROG-cmp}</div><div class='del'>-cpprog=${CPPROG-cp}</div><div class='del'>-mkdirprog=${MKDIRPROG-mkdir}</div><div class='del'>-mvprog=${MVPROG-mv}</div><div class='del'>-rmprog=${RMPROG-rm}</div><div class='del'>-stripprog=${STRIPPROG-strip}</div><div class='del'>-</div><div class='del'>-posix_glob='?'</div><div class='del'>-initialize_posix_glob='</div><div class='del'>-  test "$posix_glob" != "?" || {</div><div class='del'>-    if (set -f) 2&gt;/dev/null; then</div><div class='del'>-      posix_glob=</div><div class='del'>-    else</div><div class='del'>-      posix_glob=:</div><div class='del'>-    fi</div><div class='del'>-  }</div><div class='del'>-'</div><div class='del'>-</div><div class='del'>-posix_mkdir=</div><div class='del'>-</div><div class='del'>-# Desired mode of installed file.</div><div class='del'>-mode=0755</div><div class='del'>-</div><div class='del'>-chgrpcmd=</div><div class='del'>-chmodcmd=$chmodprog</div><div class='del'>-chowncmd=</div><div class='del'>-mvcmd=$mvprog</div><div class='del'>-rmcmd="$rmprog -f"</div><div class='del'>-stripcmd=</div><div class='del'>-</div><div class='del'>-src=</div><div class='del'>-dst=</div><div class='del'>-dir_arg=</div><div class='del'>-dst_arg=</div><div class='del'>-</div><div class='del'>-copy_on_change=false</div><div class='del'>-no_target_directory=</div><div class='del'>-</div><div class='del'>-usage="\</div><div class='del'>-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE</div><div class='del'>-   or: $0 [OPTION]... SRCFILES... DIRECTORY</div><div class='del'>-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...</div><div class='del'>-   or: $0 [OPTION]... -d DIRECTORIES...</div><div class='del'>-</div><div class='del'>-In the 1st form, copy SRCFILE to DSTFILE.</div><div class='del'>-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.</div><div class='del'>-In the 4th, create DIRECTORIES.</div><div class='del'>-</div><div class='del'>-Options:</div><div class='del'>-     --help     display this help and exit.</div><div class='del'>-     --version  display version info and exit.</div><div class='del'>-</div><div class='del'>-  -c            (ignored)</div><div class='del'>-  -C            install only if different (preserve the last data modification time)</div><div class='del'>-  -d            create directories instead of installing files.</div><div class='del'>-  -g GROUP      $chgrpprog installed files to GROUP.</div><div class='del'>-  -m MODE       $chmodprog installed files to MODE.</div><div class='del'>-  -o USER       $chownprog installed files to USER.</div><div class='del'>-  -s            $stripprog installed files.</div><div class='del'>-  -t DIRECTORY  install into DIRECTORY.</div><div class='del'>-  -T            report an error if DSTFILE is a directory.</div><div class='del'>-</div><div class='del'>-Environment variables override the default commands:</div><div class='del'>-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG</div><div class='del'>-  RMPROG STRIPPROG</div><div class='del'>-"</div><div class='del'>-</div><div class='del'>-while test $# -ne 0; do</div><div class='del'>-  case $1 in</div><div class='del'>-    -c) ;;</div><div class='del'>-</div><div class='del'>-    -C) copy_on_change=true;;</div><div class='del'>-</div><div class='del'>-    -d) dir_arg=true;;</div><div class='del'>-</div><div class='del'>-    -g) chgrpcmd="$chgrpprog $2"</div><div class='del'>-	shift;;</div><div class='del'>-</div><div class='del'>-    --help) echo "$usage"; exit $?;;</div><div class='del'>-</div><div class='del'>-    -m) mode=$2</div><div class='del'>-	case $mode in</div><div class='del'>-	  *' '* | *'	'* | *'</div><div class='del'>-'*	  | *'*'* | *'?'* | *'['*)</div><div class='del'>-	    echo "$0: invalid mode: $mode" &gt;&amp;2</div><div class='del'>-	    exit 1;;</div><div class='del'>-	esac</div><div class='del'>-	shift;;</div><div class='del'>-</div><div class='del'>-    -o) chowncmd="$chownprog $2"</div><div class='del'>-	shift;;</div><div class='del'>-</div><div class='del'>-    -s) stripcmd=$stripprog;;</div><div class='del'>-</div><div class='del'>-    -t) dst_arg=$2</div><div class='del'>-	shift;;</div><div class='del'>-</div><div class='del'>-    -T) no_target_directory=true;;</div><div class='del'>-</div><div class='del'>-    --version) echo "$0 $scriptversion"; exit $?;;</div><div class='del'>-</div><div class='del'>-    --)	shift</div><div class='del'>-	break;;</div><div class='del'>-</div><div class='del'>-    -*)	echo "$0: invalid option: $1" &gt;&amp;2</div><div class='del'>-	exit 1;;</div><div class='del'>-</div><div class='del'>-    *)  break;;</div><div class='del'>-  esac</div><div class='del'>-  shift</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-if test $# -ne 0 &amp;&amp; test -z "$dir_arg$dst_arg"; then</div><div class='del'>-  # When -d is used, all remaining arguments are directories to create.</div><div class='del'>-  # When -t is used, the destination is already specified.</div><div class='del'>-  # Otherwise, the last argument is the destination.  Remove it from $@.</div><div class='del'>-  for arg</div><div class='del'>-  do</div><div class='del'>-    if test -n "$dst_arg"; then</div><div class='del'>-      # $@ is not empty: it contains at least $arg.</div><div class='del'>-      set fnord "$@" "$dst_arg"</div><div class='del'>-      shift # fnord</div><div class='del'>-    fi</div><div class='del'>-    shift # arg</div><div class='del'>-    dst_arg=$arg</div><div class='del'>-  done</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test $# -eq 0; then</div><div class='del'>-  if test -z "$dir_arg"; then</div><div class='del'>-    echo "$0: no input file specified." &gt;&amp;2</div><div class='del'>-    exit 1</div><div class='del'>-  fi</div><div class='del'>-  # It's OK to call `install-sh -d' without argument.</div><div class='del'>-  # This can happen when creating conditional directories.</div><div class='del'>-  exit 0</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test -z "$dir_arg"; then</div><div class='del'>-  trap '(exit $?); exit' 1 2 13 15</div><div class='del'>-</div><div class='del'>-  # Set umask so as not to create temps with too-generous modes.</div><div class='del'>-  # However, 'strip' requires both read and write access to temps.</div><div class='del'>-  case $mode in</div><div class='del'>-    # Optimize common cases.</div><div class='del'>-    *644) cp_umask=133;;</div><div class='del'>-    *755) cp_umask=22;;</div><div class='del'>-</div><div class='del'>-    *[0-7])</div><div class='del'>-      if test -z "$stripcmd"; then</div><div class='del'>-	u_plus_rw=</div><div class='del'>-      else</div><div class='del'>-	u_plus_rw='% 200'</div><div class='del'>-      fi</div><div class='del'>-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;</div><div class='del'>-    *)</div><div class='del'>-      if test -z "$stripcmd"; then</div><div class='del'>-	u_plus_rw=</div><div class='del'>-      else</div><div class='del'>-	u_plus_rw=,u+rw</div><div class='del'>-      fi</div><div class='del'>-      cp_umask=$mode$u_plus_rw;;</div><div class='del'>-  esac</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-for src</div><div class='del'>-do</div><div class='del'>-  # Protect names starting with `-'.</div><div class='del'>-  case $src in</div><div class='del'>-    -*) src=./$src;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  if test -n "$dir_arg"; then</div><div class='del'>-    dst=$src</div><div class='del'>-    dstdir=$dst</div><div class='del'>-    test -d "$dstdir"</div><div class='del'>-    dstdir_status=$?</div><div class='del'>-  else</div><div class='del'>-</div><div class='del'>-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command</div><div class='del'>-    # might cause directories to be created, which would be especially bad</div><div class='del'>-    # if $src (and thus $dsttmp) contains '*'.</div><div class='del'>-    if test ! -f "$src" &amp;&amp; test ! -d "$src"; then</div><div class='del'>-      echo "$0: $src does not exist." &gt;&amp;2</div><div class='del'>-      exit 1</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    if test -z "$dst_arg"; then</div><div class='del'>-      echo "$0: no destination specified." &gt;&amp;2</div><div class='del'>-      exit 1</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    dst=$dst_arg</div><div class='del'>-    # Protect names starting with `-'.</div><div class='del'>-    case $dst in</div><div class='del'>-      -*) dst=./$dst;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    # If destination is a directory, append the input filename; won't work</div><div class='del'>-    # if double slashes aren't ignored.</div><div class='del'>-    if test -d "$dst"; then</div><div class='del'>-      if test -n "$no_target_directory"; then</div><div class='del'>-	echo "$0: $dst_arg: Is a directory" &gt;&amp;2</div><div class='del'>-	exit 1</div><div class='del'>-      fi</div><div class='del'>-      dstdir=$dst</div><div class='del'>-      dst=$dstdir/`basename "$src"`</div><div class='del'>-      dstdir_status=0</div><div class='del'>-    else</div><div class='del'>-      # Prefer dirname, but fall back on a substitute if dirname fails.</div><div class='del'>-      dstdir=`</div><div class='del'>-	(dirname "$dst") 2&gt;/dev/null ||</div><div class='del'>-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \</div><div class='del'>-	     X"$dst" : 'X\(//\)[^/]' \| \</div><div class='del'>-	     X"$dst" : 'X\(//\)$' \| \</div><div class='del'>-	     X"$dst" : 'X\(/\)' \| . 2&gt;/dev/null ||</div><div class='del'>-	echo X"$dst" |</div><div class='del'>-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{</div><div class='del'>-		   s//\1/</div><div class='del'>-		   q</div><div class='del'>-		 }</div><div class='del'>-		 /^X\(\/\/\)[^/].*/{</div><div class='del'>-		   s//\1/</div><div class='del'>-		   q</div><div class='del'>-		 }</div><div class='del'>-		 /^X\(\/\/\)$/{</div><div class='del'>-		   s//\1/</div><div class='del'>-		   q</div><div class='del'>-		 }</div><div class='del'>-		 /^X\(\/\).*/{</div><div class='del'>-		   s//\1/</div><div class='del'>-		   q</div><div class='del'>-		 }</div><div class='del'>-		 s/.*/./; q'</div><div class='del'>-      `</div><div class='del'>-</div><div class='del'>-      test -d "$dstdir"</div><div class='del'>-      dstdir_status=$?</div><div class='del'>-    fi</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  obsolete_mkdir_used=false</div><div class='del'>-</div><div class='del'>-  if test $dstdir_status != 0; then</div><div class='del'>-    case $posix_mkdir in</div><div class='del'>-      '')</div><div class='del'>-	# Create intermediate dirs using mode 755 as modified by the umask.</div><div class='del'>-	# This is like FreeBSD 'install' as of 1997-10-28.</div><div class='del'>-	umask=`umask`</div><div class='del'>-	case $stripcmd.$umask in</div><div class='del'>-	  # Optimize common cases.</div><div class='del'>-	  *[2367][2367]) mkdir_umask=$umask;;</div><div class='del'>-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;</div><div class='del'>-</div><div class='del'>-	  *[0-7])</div><div class='del'>-	    mkdir_umask=`expr $umask + 22 \</div><div class='del'>-	      - $umask % 100 % 40 + $umask % 20 \</div><div class='del'>-	      - $umask % 10 % 4 + $umask % 2</div><div class='del'>-	    `;;</div><div class='del'>-	  *) mkdir_umask=$umask,go-w;;</div><div class='del'>-	esac</div><div class='del'>-</div><div class='del'>-	# With -d, create the new directory with the user-specified mode.</div><div class='del'>-	# Otherwise, rely on $mkdir_umask.</div><div class='del'>-	if test -n "$dir_arg"; then</div><div class='del'>-	  mkdir_mode=-m$mode</div><div class='del'>-	else</div><div class='del'>-	  mkdir_mode=</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	posix_mkdir=false</div><div class='del'>-	case $umask in</div><div class='del'>-	  *[123567][0-7][0-7])</div><div class='del'>-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which</div><div class='del'>-	    # is incompatible with FreeBSD 'install' when (umask &amp; 300) != 0.</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$</div><div class='del'>-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2&gt;/dev/null; exit $ret' 0</div><div class='del'>-</div><div class='del'>-	    if (umask $mkdir_umask &amp;&amp;</div><div class='del'>-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") &gt;/dev/null 2&gt;&amp;1</div><div class='del'>-	    then</div><div class='del'>-	      if test -z "$dir_arg" || {</div><div class='del'>-		   # Check for POSIX incompatibilities with -m.</div><div class='del'>-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or</div><div class='del'>-		   # other-writeable bit of parent directory when it shouldn't.</div><div class='del'>-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.</div><div class='del'>-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`</div><div class='del'>-		   case $ls_ld_tmpdir in</div><div class='del'>-		     d????-?r-*) different_mode=700;;</div><div class='del'>-		     d????-?--*) different_mode=755;;</div><div class='del'>-		     *) false;;</div><div class='del'>-		   esac &amp;&amp;</div><div class='del'>-		   $mkdirprog -m$different_mode -p -- "$tmpdir" &amp;&amp; {</div><div class='del'>-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`</div><div class='del'>-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"</div><div class='del'>-		   }</div><div class='del'>-		 }</div><div class='del'>-	      then posix_mkdir=:</div><div class='del'>-	      fi</div><div class='del'>-	      rmdir "$tmpdir/d" "$tmpdir"</div><div class='del'>-	    else</div><div class='del'>-	      # Remove any dirs left behind by ancient mkdir implementations.</div><div class='del'>-	      rmdir ./$mkdir_mode ./-p ./-- 2&gt;/dev/null</div><div class='del'>-	    fi</div><div class='del'>-	    trap '' 0;;</div><div class='del'>-	esac;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    if</div><div class='del'>-      $posix_mkdir &amp;&amp; (</div><div class='del'>-	umask $mkdir_umask &amp;&amp;</div><div class='del'>-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"</div><div class='del'>-      )</div><div class='del'>-    then :</div><div class='del'>-    else</div><div class='del'>-</div><div class='del'>-      # The umask is ridiculous, or mkdir does not conform to POSIX,</div><div class='del'>-      # or it failed possibly due to a race condition.  Create the</div><div class='del'>-      # directory the slow way, step by step, checking for races as we go.</div><div class='del'>-</div><div class='del'>-      case $dstdir in</div><div class='del'>-	/*) prefix='/';;</div><div class='del'>-	-*) prefix='./';;</div><div class='del'>-	*)  prefix='';;</div><div class='del'>-      esac</div><div class='del'>-</div><div class='del'>-      eval "$initialize_posix_glob"</div><div class='del'>-</div><div class='del'>-      oIFS=$IFS</div><div class='del'>-      IFS=/</div><div class='del'>-      $posix_glob set -f</div><div class='del'>-      set fnord $dstdir</div><div class='del'>-      shift</div><div class='del'>-      $posix_glob set +f</div><div class='del'>-      IFS=$oIFS</div><div class='del'>-</div><div class='del'>-      prefixes=</div><div class='del'>-</div><div class='del'>-      for d</div><div class='del'>-      do</div><div class='del'>-	test -z "$d" &amp;&amp; continue</div><div class='del'>-</div><div class='del'>-	prefix=$prefix$d</div><div class='del'>-	if test -d "$prefix"; then</div><div class='del'>-	  prefixes=</div><div class='del'>-	else</div><div class='del'>-	  if $posix_mkdir; then</div><div class='del'>-	    (umask=$mkdir_umask &amp;&amp;</div><div class='del'>-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") &amp;&amp; break</div><div class='del'>-	    # Don't fail if two instances are running concurrently.</div><div class='del'>-	    test -d "$prefix" || exit 1</div><div class='del'>-	  else</div><div class='del'>-	    case $prefix in</div><div class='del'>-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;</div><div class='del'>-	      *) qprefix=$prefix;;</div><div class='del'>-	    esac</div><div class='del'>-	    prefixes="$prefixes '$qprefix'"</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-	prefix=$prefix/</div><div class='del'>-      done</div><div class='del'>-</div><div class='del'>-      if test -n "$prefixes"; then</div><div class='del'>-	# Don't fail if two instances are running concurrently.</div><div class='del'>-	(umask $mkdir_umask &amp;&amp;</div><div class='del'>-	 eval "\$doit_exec \$mkdirprog $prefixes") ||</div><div class='del'>-	  test -d "$dstdir" || exit 1</div><div class='del'>-	obsolete_mkdir_used=true</div><div class='del'>-      fi</div><div class='del'>-    fi</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  if test -n "$dir_arg"; then</div><div class='del'>-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &amp;&amp;</div><div class='del'>-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &amp;&amp;</div><div class='del'>-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||</div><div class='del'>-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1</div><div class='del'>-  else</div><div class='del'>-</div><div class='del'>-    # Make a couple of temp file names in the proper directory.</div><div class='del'>-    dsttmp=$dstdir/_inst.$$_</div><div class='del'>-    rmtmp=$dstdir/_rm.$$_</div><div class='del'>-</div><div class='del'>-    # Trap to clean up those temp files at exit.</div><div class='del'>-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" &amp;&amp; exit $ret' 0</div><div class='del'>-</div><div class='del'>-    # Copy the file name to the temp name.</div><div class='del'>-    (umask $cp_umask &amp;&amp; $doit_exec $cpprog "$src" "$dsttmp") &amp;&amp;</div><div class='del'>-</div><div class='del'>-    # and set any options; do chmod last to preserve setuid bits.</div><div class='del'>-    #</div><div class='del'>-    # If any of these fail, we abort the whole thing.  If we want to</div><div class='del'>-    # ignore errors from any of these, just make sure not to ignore</div><div class='del'>-    # errors from the above "$doit $cpprog $src $dsttmp" command.</div><div class='del'>-    #</div><div class='del'>-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &amp;&amp;</div><div class='del'>-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &amp;&amp;</div><div class='del'>-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &amp;&amp;</div><div class='del'>-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &amp;&amp;</div><div class='del'>-</div><div class='del'>-    # If -C, don't bother to copy if it wouldn't change the file.</div><div class='del'>-    if $copy_on_change &amp;&amp;</div><div class='del'>-       old=`LC_ALL=C ls -dlL "$dst"	2&gt;/dev/null` &amp;&amp;</div><div class='del'>-       new=`LC_ALL=C ls -dlL "$dsttmp"	2&gt;/dev/null` &amp;&amp;</div><div class='del'>-</div><div class='del'>-       eval "$initialize_posix_glob" &amp;&amp;</div><div class='del'>-       $posix_glob set -f &amp;&amp;</div><div class='del'>-       set X $old &amp;&amp; old=:$2:$4:$5:$6 &amp;&amp;</div><div class='del'>-       set X $new &amp;&amp; new=:$2:$4:$5:$6 &amp;&amp;</div><div class='del'>-       $posix_glob set +f &amp;&amp;</div><div class='del'>-</div><div class='del'>-       test "$old" = "$new" &amp;&amp;</div><div class='del'>-       $cmpprog "$dst" "$dsttmp" &gt;/dev/null 2&gt;&amp;1</div><div class='del'>-    then</div><div class='del'>-      rm -f "$dsttmp"</div><div class='del'>-    else</div><div class='del'>-      # Rename the file to the real destination.</div><div class='del'>-      $doit $mvcmd -f "$dsttmp" "$dst" 2&gt;/dev/null ||</div><div class='del'>-</div><div class='del'>-      # The rename failed, perhaps because mv can't rename something else</div><div class='del'>-      # to itself, or perhaps because mv is so ancient that it does not</div><div class='del'>-      # support -f.</div><div class='del'>-      {</div><div class='del'>-	# Now remove or move aside any old file at destination location.</div><div class='del'>-	# We try this two ways since rm can't unlink itself on some</div><div class='del'>-	# systems and the destination file might be busy for other</div><div class='del'>-	# reasons.  In this case, the final cleanup might fail but the new</div><div class='del'>-	# file should still install successfully.</div><div class='del'>-	{</div><div class='del'>-	  test ! -f "$dst" ||</div><div class='del'>-	  $doit $rmcmd -f "$dst" 2&gt;/dev/null ||</div><div class='del'>-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2&gt;/dev/null &amp;&amp;</div><div class='del'>-	    { $doit $rmcmd -f "$rmtmp" 2&gt;/dev/null; :; }</div><div class='del'>-	  } ||</div><div class='del'>-	  { echo "$0: cannot unlink or rename $dst" &gt;&amp;2</div><div class='del'>-	    (exit 1); exit 1</div><div class='del'>-	  }</div><div class='del'>-	} &amp;&amp;</div><div class='del'>-</div><div class='del'>-	# Now rename the file to the real destination.</div><div class='del'>-	$doit $mvcmd "$dsttmp" "$dst"</div><div class='del'>-      }</div><div class='del'>-    fi || exit 1</div><div class='del'>-</div><div class='del'>-    trap '' 0</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-# Local variables:</div><div class='del'>-# eval: (add-hook 'write-file-hooks 'time-stamp)</div><div class='del'>-# time-stamp-start: "scriptversion="</div><div class='del'>-# time-stamp-format: "%:y-%02m-%02d.%02H"</div><div class='del'>-# time-stamp-time-zone: "UTC"</div><div class='del'>-# time-stamp-end: "; # UTC"</div><div class='del'>-# End:</div><div class='head'>diff --git a/src/3rdparty/libpng/libpng-1.4.0.txt b/src/3rdparty/libpng/libpng-1.4.0.txt<br/>deleted file mode 100644<br/>index 3da0aa8..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/libpng-1.4.0.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/libpng-1.4.0.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3277 +0,0 @@</div><div class='del'>-libpng.txt - A description on how to use and modify libpng</div><div class='del'>-</div><div class='del'>- libpng version 1.4.0 - January 3, 2010</div><div class='del'>- Updated and distributed by Glenn Randers-Pehrson</div><div class='del'>- &lt;glennrp at users.sourceforge.net&gt;</div><div class='del'>- Copyright (c) 1998-2009 Glenn Randers-Pehrson</div><div class='del'>-</div><div class='del'>- This document is released under the libpng license.</div><div class='del'>- For conditions of distribution and use, see the disclaimer</div><div class='del'>- and license in png.h</div><div class='del'>-</div><div class='del'>- Based on:</div><div class='del'>-</div><div class='del'>- libpng versions 0.97, January 1998, through 1.4.0 - January 3, 2010</div><div class='del'>- Updated and distributed by Glenn Randers-Pehrson</div><div class='del'>- Copyright (c) 1998-2009 Glenn Randers-Pehrson</div><div class='del'>-</div><div class='del'>- libpng 1.0 beta 6  version 0.96 May 28, 1997</div><div class='del'>- Updated and distributed by Andreas Dilger</div><div class='del'>- Copyright (c) 1996, 1997 Andreas Dilger</div><div class='del'>-</div><div class='del'>- libpng 1.0 beta 2 - version 0.88  January 26, 1996</div><div class='del'>- For conditions of distribution and use, see copyright</div><div class='del'>- notice in png.h. Copyright (c) 1995, 1996 Guy Eric</div><div class='del'>- Schalnat, Group 42, Inc.</div><div class='del'>-</div><div class='del'>- Updated/rewritten per request in the libpng FAQ</div><div class='del'>- Copyright (c) 1995, 1996 Frank J. T. Wojcik</div><div class='del'>- December 18, 1995 &amp; January 20, 1996</div><div class='del'>-</div><div class='del'>-I. Introduction</div><div class='del'>-</div><div class='del'>-This file describes how to use and modify the PNG reference library</div><div class='del'>-(known as libpng) for your own use.  There are five sections to this</div><div class='del'>-file: introduction, structures, reading, writing, and modification and</div><div class='del'>-configuration notes for various special platforms.  In addition to this</div><div class='del'>-file, example.c is a good starting point for using the library, as</div><div class='del'>-it is heavily commented and should include everything most people</div><div class='del'>-will need.  We assume that libpng is already installed; see the</div><div class='del'>-INSTALL file for instructions on how to install libpng.</div><div class='del'>-</div><div class='del'>-For examples of libpng usage, see the files "example.c", "pngtest.c",</div><div class='del'>-and the files in the "contrib" directory, all of which are included in</div><div class='del'>-the libpng distribution.</div><div class='del'>-</div><div class='del'>-Libpng was written as a companion to the PNG specification, as a way</div><div class='del'>-of reducing the amount of time and effort it takes to support the PNG</div><div class='del'>-file format in application programs.</div><div class='del'>-</div><div class='del'>-The PNG specification (second edition), November 2003, is available as</div><div class='del'>-a W3C Recommendation and as an ISO Standard (ISO/IEC 15948:2003 (E)) at</div><div class='del'>-&lt;http://www.w3.org/TR/2003/REC-PNG-20031110/</div><div class='del'>-The W3C and ISO documents have identical technical content.</div><div class='del'>-</div><div class='del'>-The PNG-1.2 specification is available at</div><div class='del'>-&lt;http://www.libpng.org/pub/png/documents/&gt;.  It is technically equivalent</div><div class='del'>-to the PNG specification (second edition) but has some additional material.</div><div class='del'>-</div><div class='del'>-The PNG-1.0 specification is available</div><div class='del'>-as RFC 2083 &lt;http://www.libpng.org/pub/png/documents/&gt; and as a</div><div class='del'>-W3C Recommendation &lt;http://www.w3.org/TR/REC.png.html&gt;.</div><div class='del'>-</div><div class='del'>-Some additional chunks are described in the special-purpose public chunks</div><div class='del'>-documents at &lt;http://www.libpng.org/pub/png/documents/&gt;.</div><div class='del'>-</div><div class='del'>-Other information</div><div class='del'>-about PNG, and the latest version of libpng, can be found at the PNG home</div><div class='del'>-page, &lt;http://www.libpng.org/pub/png/&gt;.</div><div class='del'>-</div><div class='del'>-Most users will not have to modify the library significantly; advanced</div><div class='del'>-users may want to modify it more.  All attempts were made to make it as</div><div class='del'>-complete as possible, while keeping the code easy to understand.</div><div class='del'>-Currently, this library only supports C.  Support for other languages</div><div class='del'>-is being considered.</div><div class='del'>-</div><div class='del'>-Libpng has been designed to handle multiple sessions at one time,</div><div class='del'>-to be easily modifiable, to be portable to the vast majority of</div><div class='del'>-machines (ANSI, K&amp;R, 16-, 32-, and 64-bit) available, and to be easy</div><div class='del'>-to use.  The ultimate goal of libpng is to promote the acceptance of</div><div class='del'>-the PNG file format in whatever way possible.  While there is still</div><div class='del'>-work to be done (see the TODO file), libpng should cover the</div><div class='del'>-majority of the needs of its users.</div><div class='del'>-</div><div class='del'>-Libpng uses zlib for its compression and decompression of PNG files.</div><div class='del'>-Further information about zlib, and the latest version of zlib, can</div><div class='del'>-be found at the zlib home page, &lt;http://www.info-zip.org/pub/infozip/zlib/&gt;.</div><div class='del'>-The zlib compression utility is a general purpose utility that is</div><div class='del'>-useful for more than PNG files, and can be used without libpng.</div><div class='del'>-See the documentation delivered with zlib for more details.</div><div class='del'>-You can usually find the source files for the zlib utility wherever you</div><div class='del'>-find the libpng source files.</div><div class='del'>-</div><div class='del'>-Libpng is thread safe, provided the threads are using different</div><div class='del'>-instances of the structures.  Each thread should have its own</div><div class='del'>-png_struct and png_info instances, and thus its own image.</div><div class='del'>-Libpng does not protect itself against two threads using the</div><div class='del'>-same instance of a structure.</div><div class='del'>-</div><div class='del'>-II. Structures</div><div class='del'>-</div><div class='del'>-There are two main structures that are important to libpng, png_struct</div><div class='del'>-and png_info.  The first, png_struct, is an internal structure that</div><div class='del'>-will not, for the most part, be used by a user except as the first</div><div class='del'>-variable passed to every libpng function call.</div><div class='del'>-</div><div class='del'>-The png_info structure is designed to provide information about the</div><div class='del'>-PNG file.  At one time, the fields of png_info were intended to be</div><div class='del'>-directly accessible to the user.  However, this tended to cause problems</div><div class='del'>-with applications using dynamically loaded libraries, and as a result</div><div class='del'>-a set of interface functions for png_info (the png_get_*() and png_set_*()</div><div class='del'>-functions) was developed.  The fields of png_info are still available for</div><div class='del'>-older applications, but it is suggested that applications use the new</div><div class='del'>-interfaces if at all possible.</div><div class='del'>-</div><div class='del'>-Applications that do make direct access to the members of png_struct (except</div><div class='del'>-for png_ptr-&gt;jmpbuf) must be recompiled whenever the library is updated,</div><div class='del'>-and applications that make direct access to the members of png_info must</div><div class='del'>-be recompiled if they were compiled or loaded with libpng version 1.0.6,</div><div class='del'>-in which the members were in a different order.  In version 1.0.7, the</div><div class='del'>-members of the png_info structure reverted to the old order, as they were</div><div class='del'>-in versions 0.97c through 1.0.5.  Starting with version 2.0.0, both</div><div class='del'>-structures are going to be hidden, and the contents of the structures will</div><div class='del'>-only be accessible through the png_get/png_set functions.</div><div class='del'>-</div><div class='del'>-The png.h header file is an invaluable reference for programming with libpng.</div><div class='del'>-And while I'm on the topic, make sure you include the libpng header file:</div><div class='del'>-</div><div class='del'>-#include &lt;png.h&gt;</div><div class='del'>-</div><div class='del'>-III. Reading</div><div class='del'>-</div><div class='del'>-We'll now walk you through the possible functions to call when reading</div><div class='del'>-in a PNG file sequentially, briefly explaining the syntax and purpose</div><div class='del'>-of each one.  See example.c and png.h for more detail.  While</div><div class='del'>-progressive reading is covered in the next section, you will still</div><div class='del'>-need some of the functions discussed in this section to read a PNG</div><div class='del'>-file.</div><div class='del'>-</div><div class='del'>-Setup</div><div class='del'>-</div><div class='del'>-You will want to do the I/O initialization(*) before you get into libpng,</div><div class='del'>-so if it doesn't work, you don't have much to undo.  Of course, you</div><div class='del'>-will also want to insure that you are, in fact, dealing with a PNG</div><div class='del'>-file.  Libpng provides a simple check to see if a file is a PNG file.</div><div class='del'>-To use it, pass in the first 1 to 8 bytes of the file to the function</div><div class='del'>-png_sig_cmp(), and it will return 0 (false) if the bytes match the</div><div class='del'>-corresponding bytes of the PNG signature, or nonzero (true) otherwise.</div><div class='del'>-Of course, the more bytes you pass in, the greater the accuracy of the</div><div class='del'>-prediction.</div><div class='del'>-</div><div class='del'>-If you are intending to keep the file pointer open for use in libpng,</div><div class='del'>-you must ensure you don't read more than 8 bytes from the beginning</div><div class='del'>-of the file, and you also have to make a call to png_set_sig_bytes_read()</div><div class='del'>-with the number of bytes you read from the beginning.  Libpng will</div><div class='del'>-then only check the bytes (if any) that your program didn't read.</div><div class='del'>-</div><div class='del'>-(*): If you are not using the standard I/O functions, you will need</div><div class='del'>-to replace them with custom functions.  See the discussion under</div><div class='del'>-Customizing libpng.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    FILE *fp = fopen(file_name, "rb");</div><div class='del'>-    if (!fp)</div><div class='del'>-    {</div><div class='del'>-        return (ERROR);</div><div class='del'>-    }</div><div class='del'>-    fread(header, 1, number, fp);</div><div class='del'>-    is_png = !png_sig_cmp(header, 0, number);</div><div class='del'>-    if (!is_png)</div><div class='del'>-    {</div><div class='del'>-        return (NOT_PNG);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Next, png_struct and png_info need to be allocated and initialized.  In</div><div class='del'>-order to ensure that the size of these structures is correct even with a</div><div class='del'>-dynamically linked libpng, there are functions to initialize and</div><div class='del'>-allocate the structures.  We also pass the library version, optional</div><div class='del'>-pointers to error handling functions, and a pointer to a data struct for</div><div class='del'>-use by the error functions, if necessary (the pointer and functions can</div><div class='del'>-be NULL if the default error handlers are to be used).  See the section</div><div class='del'>-on Changes to Libpng below regarding the old initialization functions.</div><div class='del'>-The structure allocation functions quietly return NULL if they fail to</div><div class='del'>-create the structure, so your application should check for that.</div><div class='del'>-</div><div class='del'>-    png_structp png_ptr = png_create_read_struct</div><div class='del'>-       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,</div><div class='del'>-        user_error_fn, user_warning_fn);</div><div class='del'>-    if (!png_ptr)</div><div class='del'>-        return (ERROR);</div><div class='del'>-</div><div class='del'>-    png_infop info_ptr = png_create_info_struct(png_ptr);</div><div class='del'>-    if (!info_ptr)</div><div class='del'>-    {</div><div class='del'>-        png_destroy_read_struct(&amp;png_ptr,</div><div class='del'>-           (png_infopp)NULL, (png_infopp)NULL);</div><div class='del'>-        return (ERROR);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    png_infop end_info = png_create_info_struct(png_ptr);</div><div class='del'>-    if (!end_info)</div><div class='del'>-    {</div><div class='del'>-        png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='del'>-          (png_infopp)NULL);</div><div class='del'>-        return (ERROR);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-If you want to use your own memory allocation routines,</div><div class='del'>-define PNG_USER_MEM_SUPPORTED and use</div><div class='del'>-png_create_read_struct_2() instead of png_create_read_struct():</div><div class='del'>-</div><div class='del'>-    png_structp png_ptr = png_create_read_struct_2</div><div class='del'>-       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,</div><div class='del'>-        user_error_fn, user_warning_fn, (png_voidp)</div><div class='del'>-        user_mem_ptr, user_malloc_fn, user_free_fn);</div><div class='del'>-</div><div class='del'>-The error handling routines passed to png_create_read_struct()</div><div class='del'>-and the memory alloc/free routines passed to png_create_struct_2()</div><div class='del'>-are only necessary if you are not using the libpng supplied error</div><div class='del'>-handling and memory alloc/free functions.</div><div class='del'>-</div><div class='del'>-When libpng encounters an error, it expects to longjmp back</div><div class='del'>-to your routine.  Therefore, you will need to call setjmp and pass</div><div class='del'>-your png_jmpbuf(png_ptr).  If you read the file from different</div><div class='del'>-routines, you will need to update the jmpbuf field every time you enter</div><div class='del'>-a new routine that will call a png_*() function.</div><div class='del'>-</div><div class='del'>-See your documentation of setjmp/longjmp for your compiler for more</div><div class='del'>-information on setjmp/longjmp.  See the discussion on libpng error</div><div class='del'>-handling in the Customizing Libpng section below for more information</div><div class='del'>-on the libpng error handling.  If an error occurs, and libpng longjmp's</div><div class='del'>-back to your setjmp, you will want to call png_destroy_read_struct() to</div><div class='del'>-free any memory.</div><div class='del'>-</div><div class='del'>-    if (setjmp(png_jmpbuf(png_ptr)))</div><div class='del'>-    {</div><div class='del'>-        png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='del'>-           &amp;end_info);</div><div class='del'>-        fclose(fp);</div><div class='del'>-        return (ERROR);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-If you would rather avoid the complexity of setjmp/longjmp issues,</div><div class='del'>-you can compile libpng with PNG_SETJMP_NOT_SUPPORTED, in which case</div><div class='del'>-errors will result in a call to PNG_ABORT() which defaults to abort().</div><div class='del'>-</div><div class='del'>-Now you need to set up the input code.  The default for libpng is to</div><div class='del'>-use the C function fread().  If you use this, you will need to pass a</div><div class='del'>-valid FILE * in the function png_init_io().  Be sure that the file is</div><div class='del'>-opened in binary mode.  If you wish to handle reading data in another</div><div class='del'>-way, you need not call the png_init_io() function, but you must then</div><div class='del'>-implement the libpng I/O methods discussed in the Customizing Libpng</div><div class='del'>-section below.</div><div class='del'>-</div><div class='del'>-    png_init_io(png_ptr, fp);</div><div class='del'>-</div><div class='del'>-If you had previously opened the file and read any of the signature from</div><div class='del'>-the beginning in order to see if this was a PNG file, you need to let</div><div class='del'>-libpng know that there are some bytes missing from the start of the file.</div><div class='del'>-</div><div class='del'>-    png_set_sig_bytes(png_ptr, number);</div><div class='del'>-</div><div class='del'>-Setting up callback code</div><div class='del'>-</div><div class='del'>-You can set up a callback function to handle any unknown chunks in the</div><div class='del'>-input stream. You must supply the function</div><div class='del'>-</div><div class='del'>-    read_chunk_callback(png_ptr ptr,</div><div class='del'>-         png_unknown_chunkp chunk);</div><div class='del'>-    {</div><div class='del'>-       /* The unknown chunk structure contains your</div><div class='del'>-          chunk data, along with similar data for any other</div><div class='del'>-          unknown chunks: */</div><div class='del'>-</div><div class='del'>-           png_byte name[5];</div><div class='del'>-           png_byte *data;</div><div class='del'>-           png_size_t size;</div><div class='del'>-</div><div class='del'>-       /* Note that libpng has already taken care of</div><div class='del'>-          the CRC handling */</div><div class='del'>-</div><div class='del'>-       /* put your code here.  Search for your chunk in the</div><div class='del'>-          unknown chunk structure, process it, and return one</div><div class='del'>-          of the following: */</div><div class='del'>-</div><div class='del'>-       return (-n); /* chunk had an error */</div><div class='del'>-       return (0); /* did not recognize */</div><div class='del'>-       return (n); /* success */</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-(You can give your function another name that you like instead of</div><div class='del'>-"read_chunk_callback")</div><div class='del'>-</div><div class='del'>-To inform libpng about your function, use</div><div class='del'>-</div><div class='del'>-    png_set_read_user_chunk_fn(png_ptr, user_chunk_ptr,</div><div class='del'>-        read_chunk_callback);</div><div class='del'>-</div><div class='del'>-This names not only the callback function, but also a user pointer that</div><div class='del'>-you can retrieve with</div><div class='del'>-</div><div class='del'>-    png_get_user_chunk_ptr(png_ptr);</div><div class='del'>-</div><div class='del'>-If you call the png_set_read_user_chunk_fn() function, then all unknown</div><div class='del'>-chunks will be saved when read, in case your callback function will need</div><div class='del'>-one or more of them.  This behavior can be changed with the</div><div class='del'>-png_set_keep_unknown_chunks() function, described below.</div><div class='del'>-</div><div class='del'>-At this point, you can set up a callback function that will be</div><div class='del'>-called after each row has been read, which you can use to control</div><div class='del'>-a progress meter or the like.  It's demonstrated in pngtest.c.</div><div class='del'>-You must supply a function</div><div class='del'>-</div><div class='del'>-    void read_row_callback(png_ptr ptr, png_uint_32 row,</div><div class='del'>-       int pass);</div><div class='del'>-    {</div><div class='del'>-      /* put your code here */</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-(You can give it another name that you like instead of "read_row_callback")</div><div class='del'>-</div><div class='del'>-To inform libpng about your function, use</div><div class='del'>-</div><div class='del'>-    png_set_read_status_fn(png_ptr, read_row_callback);</div><div class='del'>-</div><div class='del'>-Unknown-chunk handling</div><div class='del'>-</div><div class='del'>-Now you get to set the way the library processes unknown chunks in the</div><div class='del'>-input PNG stream. Both known and unknown chunks will be read.  Normal</div><div class='del'>-behavior is that known chunks will be parsed into information in</div><div class='del'>-various info_ptr members while unknown chunks will be discarded. This</div><div class='del'>-behavior can be wasteful if your application will never use some known</div><div class='del'>-chunk types. To change this, you can call:</div><div class='del'>-</div><div class='del'>-    png_set_keep_unknown_chunks(png_ptr, keep,</div><div class='del'>-        chunk_list, num_chunks);</div><div class='del'>-    keep       - 0: default unknown chunk handling</div><div class='del'>-                 1: ignore; do not keep</div><div class='del'>-                 2: keep only if safe-to-copy</div><div class='del'>-                 3: keep even if unsafe-to-copy</div><div class='del'>-               You can use these definitions:</div><div class='del'>-                 PNG_HANDLE_CHUNK_AS_DEFAULT   0</div><div class='del'>-                 PNG_HANDLE_CHUNK_NEVER        1</div><div class='del'>-                 PNG_HANDLE_CHUNK_IF_SAFE      2</div><div class='del'>-                 PNG_HANDLE_CHUNK_ALWAYS       3</div><div class='del'>-    chunk_list - list of chunks affected (a byte string,</div><div class='del'>-                 five bytes per chunk, NULL or '\0' if</div><div class='del'>-                 num_chunks is 0)</div><div class='del'>-    num_chunks - number of chunks affected; if 0, all</div><div class='del'>-                 unknown chunks are affected.  If nonzero,</div><div class='del'>-                 only the chunks in the list are affected</div><div class='del'>-</div><div class='del'>-Unknown chunks declared in this way will be saved as raw data onto a</div><div class='del'>-list of png_unknown_chunk structures.  If a chunk that is normally</div><div class='del'>-known to libpng is named in the list, it will be handled as unknown,</div><div class='del'>-according to the "keep" directive.  If a chunk is named in successive</div><div class='del'>-instances of png_set_keep_unknown_chunks(), the final instance will</div><div class='del'>-take precedence.  The IHDR and IEND chunks should not be named in</div><div class='del'>-chunk_list; if they are, libpng will process them normally anyway.</div><div class='del'>-</div><div class='del'>-Here is an example of the usage of png_set_keep_unknown_chunks(),</div><div class='del'>-where the private "vpAg" chunk will later be processed by a user chunk</div><div class='del'>-callback function:</div><div class='del'>-</div><div class='del'>-    png_byte vpAg[5]={118, 112,  65, 103, (png_byte) '\0'};</div><div class='del'>-</div><div class='del'>-    #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)</div><div class='del'>-      png_byte unused_chunks[]=</div><div class='del'>-      {</div><div class='del'>-        104,  73,  83,  84, (png_byte) '\0',   /* hIST */</div><div class='del'>-        105,  84,  88, 116, (png_byte) '\0',   /* iTXt */</div><div class='del'>-        112,  67,  65,  76, (png_byte) '\0',   /* pCAL */</div><div class='del'>-        115,  67,  65,  76, (png_byte) '\0',   /* sCAL */</div><div class='del'>-        115,  80,  76,  84, (png_byte) '\0',   /* sPLT */</div><div class='del'>-        116,  73,  77,  69, (png_byte) '\0',   /* tIME */</div><div class='del'>-      };</div><div class='del'>-    #endif</div><div class='del'>-</div><div class='del'>-    ...</div><div class='del'>-</div><div class='del'>-    #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)</div><div class='del'>-      /* ignore all unknown chunks: */</div><div class='del'>-      png_set_keep_unknown_chunks(read_ptr, 1, NULL, 0);</div><div class='del'>-      /* except for vpAg: */</div><div class='del'>-      png_set_keep_unknown_chunks(read_ptr, 2, vpAg, 1);</div><div class='del'>-      /* also ignore unused known chunks: */</div><div class='del'>-      png_set_keep_unknown_chunks(read_ptr, 1, unused_chunks,</div><div class='del'>-         (int)sizeof(unused_chunks)/5);</div><div class='del'>-    #endif</div><div class='del'>-</div><div class='del'>-User limits</div><div class='del'>-</div><div class='del'>-The PNG specification allows the width and height of an image to be as</div><div class='del'>-large as 2^31-1 (0x7fffffff), or about 2.147 billion rows and columns.</div><div class='del'>-Since very few applications really need to process such large images,</div><div class='del'>-we have imposed an arbitrary 1-million limit on rows and columns.</div><div class='del'>-Larger images will be rejected immediately with a png_error() call. If</div><div class='del'>-you wish to override this limit, you can use</div><div class='del'>-</div><div class='del'>-   png_set_user_limits(png_ptr, width_max, height_max);</div><div class='del'>-</div><div class='del'>-to set your own limits, or use width_max = height_max = 0x7fffffffL</div><div class='del'>-to allow all valid dimensions (libpng may reject some very large images</div><div class='del'>-anyway because of potential buffer overflow conditions).</div><div class='del'>-</div><div class='del'>-You should put this statement after you create the PNG structure and</div><div class='del'>-before calling png_read_info(), png_read_png(), or png_process_data().</div><div class='del'>-If you need to retrieve the limits that are being applied, use</div><div class='del'>-</div><div class='del'>-   width_max = png_get_user_width_max(png_ptr);</div><div class='del'>-   height_max = png_get_user_height_max(png_ptr);</div><div class='del'>-</div><div class='del'>-The PNG specification sets no limit on the number of ancillary chunks</div><div class='del'>-allowed in a PNG datastream.  You can impose a limit on the total number</div><div class='del'>-of sPLT, tEXt, iTXt, zTXt, and unknown chunks that will be stored, with</div><div class='del'>-</div><div class='del'>-   png_set_chunk_cache_max(png_ptr, user_chunk_cache_max);</div><div class='del'>-</div><div class='del'>-where 0x7fffffffL means unlimited.  You can retrieve this limit with</div><div class='del'>-</div><div class='del'>-   chunk_cache_max = png_get_chunk_cache_max(png_ptr);</div><div class='del'>-</div><div class='del'>-This limit also applies to the number of buffers that can be allocated</div><div class='del'>-by png_decompress_chunk() while decompressing iTXt, zTXt, and iCCP chunks.</div><div class='del'>-</div><div class='del'>-The high-level read interface</div><div class='del'>-</div><div class='del'>-At this point there are two ways to proceed; through the high-level</div><div class='del'>-read interface, or through a sequence of low-level read operations.</div><div class='del'>-You can use the high-level interface if (a) you are willing to read</div><div class='del'>-the entire image into memory, and (b) the input transformations</div><div class='del'>-you want to do are limited to the following set:</div><div class='del'>-</div><div class='del'>-    PNG_TRANSFORM_IDENTITY      No transformation</div><div class='del'>-    PNG_TRANSFORM_STRIP_16      Strip 16-bit samples to</div><div class='del'>-                                8 bits</div><div class='del'>-    PNG_TRANSFORM_STRIP_ALPHA   Discard the alpha channel</div><div class='del'>-    PNG_TRANSFORM_PACKING       Expand 1, 2 and 4-bit</div><div class='del'>-                                samples to bytes</div><div class='del'>-    PNG_TRANSFORM_PACKSWAP      Change order of packed</div><div class='del'>-                                pixels to LSB first</div><div class='del'>-    PNG_TRANSFORM_EXPAND        Perform set_expand()</div><div class='del'>-    PNG_TRANSFORM_INVERT_MONO   Invert monochrome images</div><div class='del'>-    PNG_TRANSFORM_SHIFT         Normalize pixels to the</div><div class='del'>-                                sBIT depth</div><div class='del'>-    PNG_TRANSFORM_BGR           Flip RGB to BGR, RGBA</div><div class='del'>-                                to BGRA</div><div class='del'>-    PNG_TRANSFORM_SWAP_ALPHA    Flip RGBA to ARGB or GA</div><div class='del'>-                                to AG</div><div class='del'>-    PNG_TRANSFORM_INVERT_ALPHA  Change alpha from opacity</div><div class='del'>-                                to transparency</div><div class='del'>-    PNG_TRANSFORM_SWAP_ENDIAN   Byte-swap 16-bit samples</div><div class='del'>-    PNG_TRANSFORM_GRAY_TO_RGB   Expand grayscale samples</div><div class='del'>-                                to RGB (or GA to RGBA)</div><div class='del'>-</div><div class='del'>-(This excludes setting a background color, doing gamma transformation,</div><div class='del'>-dithering, and setting filler.)  If this is the case, simply do this:</div><div class='del'>-</div><div class='del'>-    png_read_png(png_ptr, info_ptr, png_transforms, NULL)</div><div class='del'>-</div><div class='del'>-where png_transforms is an integer containing the bitwise OR of some</div><div class='del'>-set of transformation flags.  This call is equivalent to png_read_info(),</div><div class='del'>-followed the set of transformations indicated by the transform mask,</div><div class='del'>-then png_read_image(), and finally png_read_end().</div><div class='del'>-</div><div class='del'>-(The final parameter of this call is not yet used.  Someday it might point</div><div class='del'>-to transformation parameters required by some future input transform.)</div><div class='del'>-</div><div class='del'>-You must use png_transforms and not call any png_set_transform() functions</div><div class='del'>-when you use png_read_png().</div><div class='del'>-</div><div class='del'>-After you have called png_read_png(), you can retrieve the image data</div><div class='del'>-with</div><div class='del'>-</div><div class='del'>-   row_pointers = png_get_rows(png_ptr, info_ptr);</div><div class='del'>-</div><div class='del'>-where row_pointers is an array of pointers to the pixel data for each row:</div><div class='del'>-</div><div class='del'>-   png_bytep row_pointers[height];</div><div class='del'>-</div><div class='del'>-If you know your image size and pixel size ahead of time, you can allocate</div><div class='del'>-row_pointers prior to calling png_read_png() with</div><div class='del'>-</div><div class='del'>-   if (height &gt; PNG_UINT_32_MAX/png_sizeof(png_byte))</div><div class='del'>-      png_error (png_ptr,</div><div class='del'>-         "Image is too tall to process in memory");</div><div class='del'>-   if (width &gt; PNG_UINT_32_MAX/pixel_size)</div><div class='del'>-      png_error (png_ptr,</div><div class='del'>-         "Image is too wide to process in memory");</div><div class='del'>-   row_pointers = png_malloc(png_ptr,</div><div class='del'>-      height*png_sizeof(png_bytep));</div><div class='del'>-   for (int i=0; i&lt;height, i++)</div><div class='del'>-      row_pointers[i]=NULL;  /* security precaution */</div><div class='del'>-   for (int i=0; i&lt;height, i++)</div><div class='del'>-      row_pointers[i]=png_malloc(png_ptr,</div><div class='del'>-         width*pixel_size);</div><div class='del'>-   png_set_rows(png_ptr, info_ptr, &amp;row_pointers);</div><div class='del'>-</div><div class='del'>-Alternatively you could allocate your image in one big block and define</div><div class='del'>-row_pointers[i] to point into the proper places in your block.</div><div class='del'>-</div><div class='del'>-If you use png_set_rows(), the application is responsible for freeing</div><div class='del'>-row_pointers (and row_pointers[i], if they were separately allocated).</div><div class='del'>-</div><div class='del'>-If you don't allocate row_pointers ahead of time, png_read_png() will</div><div class='del'>-do it, and it'll be free'ed when you call png_destroy_*().</div><div class='del'>-</div><div class='del'>-The low-level read interface</div><div class='del'>-</div><div class='del'>-If you are going the low-level route, you are now ready to read all</div><div class='del'>-the file information up to the actual image data.  You do this with a</div><div class='del'>-call to png_read_info().</div><div class='del'>-</div><div class='del'>-    png_read_info(png_ptr, info_ptr);</div><div class='del'>-</div><div class='del'>-This will process all chunks up to but not including the image data.</div><div class='del'>-</div><div class='del'>-Querying the info structure</div><div class='del'>-</div><div class='del'>-Functions are used to get the information from the info_ptr once it</div><div class='del'>-has been read.  Note that these fields may not be completely filled</div><div class='del'>-in until png_read_end() has read the chunk data following the image.</div><div class='del'>-</div><div class='del'>-    png_get_IHDR(png_ptr, info_ptr, &amp;width, &amp;height,</div><div class='del'>-       &amp;bit_depth, &amp;color_type, &amp;interlace_type,</div><div class='del'>-       &amp;compression_type, &amp;filter_method);</div><div class='del'>-</div><div class='del'>-    width          - holds the width of the image</div><div class='del'>-                     in pixels (up to 2^31).</div><div class='del'>-    height         - holds the height of the image</div><div class='del'>-                     in pixels (up to 2^31).</div><div class='del'>-    bit_depth      - holds the bit depth of one of the</div><div class='del'>-                     image channels.  (valid values are</div><div class='del'>-                     1, 2, 4, 8, 16 and depend also on</div><div class='del'>-                     the color_type.  See also</div><div class='del'>-                     significant bits (sBIT) below).</div><div class='del'>-    color_type     - describes which color/alpha channels</div><div class='del'>-                         are present.</div><div class='del'>-                     PNG_COLOR_TYPE_GRAY</div><div class='del'>-                        (bit depths 1, 2, 4, 8, 16)</div><div class='del'>-                     PNG_COLOR_TYPE_GRAY_ALPHA</div><div class='del'>-                        (bit depths 8, 16)</div><div class='del'>-                     PNG_COLOR_TYPE_PALETTE</div><div class='del'>-                        (bit depths 1, 2, 4, 8)</div><div class='del'>-                     PNG_COLOR_TYPE_RGB</div><div class='del'>-                        (bit_depths 8, 16)</div><div class='del'>-                     PNG_COLOR_TYPE_RGB_ALPHA</div><div class='del'>-                        (bit_depths 8, 16)</div><div class='del'>-</div><div class='del'>-                     PNG_COLOR_MASK_PALETTE</div><div class='del'>-                     PNG_COLOR_MASK_COLOR</div><div class='del'>-                     PNG_COLOR_MASK_ALPHA</div><div class='del'>-</div><div class='del'>-    filter_method  - (must be PNG_FILTER_TYPE_BASE</div><div class='del'>-                     for PNG 1.0, and can also be</div><div class='del'>-                     PNG_INTRAPIXEL_DIFFERENCING if</div><div class='del'>-                     the PNG datastream is embedded in</div><div class='del'>-                     a MNG-1.0 datastream)</div><div class='del'>-    compression_type - (must be PNG_COMPRESSION_TYPE_BASE</div><div class='del'>-                     for PNG 1.0)</div><div class='del'>-    interlace_type - (PNG_INTERLACE_NONE or</div><div class='del'>-                     PNG_INTERLACE_ADAM7)</div><div class='del'>-</div><div class='del'>-    Any or all of interlace_type, compression_type, or</div><div class='del'>-    filter_method can be NULL if you are</div><div class='del'>-    not interested in their values.</div><div class='del'>-</div><div class='del'>-    Note that png_get_IHDR() returns 32-bit data into</div><div class='del'>-    the application's width and height variables.</div><div class='del'>-    This is an unsafe situation if these are 16-bit</div><div class='del'>-    variables.  In such situations, the</div><div class='del'>-    png_get_image_width() and png_get_image_height()</div><div class='del'>-    functions described below are safer.</div><div class='del'>-</div><div class='del'>-    width            = png_get_image_width(png_ptr,</div><div class='del'>-                         info_ptr);</div><div class='del'>-    height           = png_get_image_height(png_ptr,</div><div class='del'>-                         info_ptr);</div><div class='del'>-    bit_depth        = png_get_bit_depth(png_ptr,</div><div class='del'>-                         info_ptr);</div><div class='del'>-    color_type       = png_get_color_type(png_ptr,</div><div class='del'>-                         info_ptr);</div><div class='del'>-    filter_method    = png_get_filter_type(png_ptr,</div><div class='del'>-                         info_ptr);</div><div class='del'>-    compression_type = png_get_compression_type(png_ptr,</div><div class='del'>-                         info_ptr);</div><div class='del'>-    interlace_type   = png_get_interlace_type(png_ptr,</div><div class='del'>-                         info_ptr);</div><div class='del'>-</div><div class='del'>-    channels = png_get_channels(png_ptr, info_ptr);</div><div class='del'>-    channels       - number of channels of info for the</div><div class='del'>-                     color type (valid values are 1 (GRAY,</div><div class='del'>-                     PALETTE), 2 (GRAY_ALPHA), 3 (RGB),</div><div class='del'>-                     4 (RGB_ALPHA or RGB + filler byte))</div><div class='del'>-    rowbytes = png_get_rowbytes(png_ptr, info_ptr);</div><div class='del'>-    rowbytes       - number of bytes needed to hold a row</div><div class='del'>-</div><div class='del'>-    signature = png_get_signature(png_ptr, info_ptr);</div><div class='del'>-    signature      - holds the signature read from the</div><div class='del'>-                     file (if any).  The data is kept in</div><div class='del'>-                     the same offset it would be if the</div><div class='del'>-                     whole signature were read (i.e. if an</div><div class='del'>-                     application had already read in 4</div><div class='del'>-                     bytes of signature before starting</div><div class='del'>-                     libpng, the remaining 4 bytes would</div><div class='del'>-                     be in signature[4] through signature[7]</div><div class='del'>-                     (see png_set_sig_bytes())).</div><div class='del'>-</div><div class='del'>-These are also important, but their validity depends on whether the chunk</div><div class='del'>-has been read.  The png_get_valid(png_ptr, info_ptr, PNG_INFO_&lt;chunk&gt;) and</div><div class='del'>-png_get_&lt;chunk&gt;(png_ptr, info_ptr, ...) functions return non-zero if the</div><div class='del'>-data has been read, or zero if it is missing.  The parameters to the</div><div class='del'>-png_get_&lt;chunk&gt; are set directly if they are simple data types, or a</div><div class='del'>-pointer into the info_ptr is returned for any complex types.</div><div class='del'>-</div><div class='del'>-    png_get_PLTE(png_ptr, info_ptr, &amp;palette,</div><div class='del'>-                     &amp;num_palette);</div><div class='del'>-    palette        - the palette for the file</div><div class='del'>-                     (array of png_color)</div><div class='del'>-    num_palette    - number of entries in the palette</div><div class='del'>-</div><div class='del'>-    png_get_gAMA(png_ptr, info_ptr, &amp;gamma);</div><div class='del'>-    gamma          - the gamma the file is written</div><div class='del'>-                     at (PNG_INFO_gAMA)</div><div class='del'>-</div><div class='del'>-    png_get_sRGB(png_ptr, info_ptr, &amp;srgb_intent);</div><div class='del'>-    srgb_intent    - the rendering intent (PNG_INFO_sRGB)</div><div class='del'>-                     The presence of the sRGB chunk</div><div class='del'>-                     means that the pixel data is in the</div><div class='del'>-                     sRGB color space.  This chunk also</div><div class='del'>-                     implies specific values of gAMA and</div><div class='del'>-                     cHRM.</div><div class='del'>-</div><div class='del'>-    png_get_iCCP(png_ptr, info_ptr, &amp;name,</div><div class='del'>-       &amp;compression_type, &amp;profile, &amp;proflen);</div><div class='del'>-    name            - The profile name.</div><div class='del'>-    compression     - The compression type; always</div><div class='del'>-                      PNG_COMPRESSION_TYPE_BASE for PNG 1.0.</div><div class='del'>-                      You may give NULL to this argument to</div><div class='del'>-                      ignore it.</div><div class='del'>-    profile         - International Color Consortium color</div><div class='del'>-                      profile data. May contain NULs.</div><div class='del'>-    proflen         - length of profile data in bytes.</div><div class='del'>-</div><div class='del'>-    png_get_sBIT(png_ptr, info_ptr, &amp;sig_bit);</div><div class='del'>-    sig_bit        - the number of significant bits for</div><div class='del'>-                     (PNG_INFO_sBIT) each of the gray,</div><div class='del'>-                     red, green, and blue channels,</div><div class='del'>-                     whichever are appropriate for the</div><div class='del'>-                     given color type (png_color_16)</div><div class='del'>-</div><div class='del'>-    png_get_tRNS(png_ptr, info_ptr, &amp;trans_alpha,</div><div class='del'>-                     &amp;num_trans, &amp;trans_color);</div><div class='del'>-    trans_alpha    - array of alpha (transparency)</div><div class='del'>-                     entries for palette (PNG_INFO_tRNS)</div><div class='del'>-    trans_color    - graylevel or color sample values of</div><div class='del'>-                     the single transparent color for</div><div class='del'>-                     non-paletted images (PNG_INFO_tRNS)</div><div class='del'>-    num_trans      - number of transparent entries</div><div class='del'>-                     (PNG_INFO_tRNS)</div><div class='del'>-</div><div class='del'>-    png_get_hIST(png_ptr, info_ptr, &amp;hist);</div><div class='del'>-                     (PNG_INFO_hIST)</div><div class='del'>-    hist           - histogram of palette (array of</div><div class='del'>-                     png_uint_16)</div><div class='del'>-</div><div class='del'>-    png_get_tIME(png_ptr, info_ptr, &amp;mod_time);</div><div class='del'>-    mod_time       - time image was last modified</div><div class='del'>-                    (PNG_VALID_tIME)</div><div class='del'>-</div><div class='del'>-    png_get_bKGD(png_ptr, info_ptr, &amp;background);</div><div class='del'>-    background     - background color (PNG_VALID_bKGD)</div><div class='del'>-                     valid 16-bit red, green and blue</div><div class='del'>-                     values, regardless of color_type</div><div class='del'>-</div><div class='del'>-    num_comments   = png_get_text(png_ptr, info_ptr,</div><div class='del'>-                     &amp;text_ptr, &amp;num_text);</div><div class='del'>-    num_comments   - number of comments</div><div class='del'>-    text_ptr       - array of png_text holding image</div><div class='del'>-                     comments</div><div class='del'>-    text_ptr[i].compression - type of compression used</div><div class='del'>-                 on "text" PNG_TEXT_COMPRESSION_NONE</div><div class='del'>-                           PNG_TEXT_COMPRESSION_zTXt</div><div class='del'>-                           PNG_ITXT_COMPRESSION_NONE</div><div class='del'>-                           PNG_ITXT_COMPRESSION_zTXt</div><div class='del'>-    text_ptr[i].key   - keyword for comment.  Must contain</div><div class='del'>-                         1-79 characters.</div><div class='del'>-    text_ptr[i].text  - text comments for current</div><div class='del'>-                         keyword.  Can be empty.</div><div class='del'>-    text_ptr[i].text_length - length of text string,</div><div class='del'>-                 after decompression, 0 for iTXt</div><div class='del'>-    text_ptr[i].itxt_length - length of itxt string,</div><div class='del'>-                 after decompression, 0 for tEXt/zTXt</div><div class='del'>-    text_ptr[i].lang  - language of comment (empty</div><div class='del'>-                         string for unknown).</div><div class='del'>-    text_ptr[i].lang_key  - keyword in UTF-8</div><div class='del'>-                         (empty string for unknown).</div><div class='del'>-    Note that the itxt_length, lang, and lang_key</div><div class='del'>-    members of the text_ptr structure only exist</div><div class='del'>-    when the library is built with iTXt chunk support.</div><div class='del'>-</div><div class='del'>-    num_text       - number of comments (same as</div><div class='del'>-                     num_comments; you can put NULL here</div><div class='del'>-                     to avoid the duplication)</div><div class='del'>-    Note while png_set_text() will accept text, language,</div><div class='del'>-    and translated keywords that can be NULL pointers, the</div><div class='del'>-    structure returned by png_get_text will always contain</div><div class='del'>-    regular zero-terminated C strings.  They might be</div><div class='del'>-    empty strings but they will never be NULL pointers.</div><div class='del'>-</div><div class='del'>-    num_spalettes = png_get_sPLT(png_ptr, info_ptr,</div><div class='del'>-       &amp;palette_ptr);</div><div class='del'>-    palette_ptr    - array of palette structures holding</div><div class='del'>-                     contents of one or more sPLT chunks</div><div class='del'>-                     read.</div><div class='del'>-    num_spalettes  - number of sPLT chunks read.</div><div class='del'>-</div><div class='del'>-    png_get_oFFs(png_ptr, info_ptr, &amp;offset_x, &amp;offset_y,</div><div class='del'>-       &amp;unit_type);</div><div class='del'>-    offset_x       - positive offset from the left edge</div><div class='del'>-                     of the screen</div><div class='del'>-    offset_y       - positive offset from the top edge</div><div class='del'>-                     of the screen</div><div class='del'>-    unit_type      - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER</div><div class='del'>-</div><div class='del'>-    png_get_pHYs(png_ptr, info_ptr, &amp;res_x, &amp;res_y,</div><div class='del'>-       &amp;unit_type);</div><div class='del'>-    res_x          - pixels/unit physical resolution in</div><div class='del'>-                     x direction</div><div class='del'>-    res_y          - pixels/unit physical resolution in</div><div class='del'>-                     x direction</div><div class='del'>-    unit_type      - PNG_RESOLUTION_UNKNOWN,</div><div class='del'>-                     PNG_RESOLUTION_METER</div><div class='del'>-</div><div class='del'>-    png_get_sCAL(png_ptr, info_ptr, &amp;unit, &amp;width,</div><div class='del'>-       &amp;height)</div><div class='del'>-    unit        - physical scale units (an integer)</div><div class='del'>-    width       - width of a pixel in physical scale units</div><div class='del'>-    height      - height of a pixel in physical scale units</div><div class='del'>-                 (width and height are doubles)</div><div class='del'>-</div><div class='del'>-    png_get_sCAL_s(png_ptr, info_ptr, &amp;unit, &amp;width,</div><div class='del'>-       &amp;height)</div><div class='del'>-    unit        - physical scale units (an integer)</div><div class='del'>-    width       - width of a pixel in physical scale units</div><div class='del'>-    height      - height of a pixel in physical scale units</div><div class='del'>-                 (width and height are strings like "2.54")</div><div class='del'>-</div><div class='del'>-    num_unknown_chunks = png_get_unknown_chunks(png_ptr,</div><div class='del'>-       info_ptr, &amp;unknowns)</div><div class='del'>-    unknowns          - array of png_unknown_chunk</div><div class='del'>-                        structures holding unknown chunks</div><div class='del'>-    unknowns[i].name  - name of unknown chunk</div><div class='del'>-    unknowns[i].data  - data of unknown chunk</div><div class='del'>-    unknowns[i].size  - size of unknown chunk's data</div><div class='del'>-    unknowns[i].location - position of chunk in file</div><div class='del'>-</div><div class='del'>-    The value of "i" corresponds to the order in which the</div><div class='del'>-    chunks were read from the PNG file or inserted with the</div><div class='del'>-    png_set_unknown_chunks() function.</div><div class='del'>-</div><div class='del'>-The data from the pHYs chunk can be retrieved in several convenient</div><div class='del'>-forms:</div><div class='del'>-</div><div class='del'>-    res_x = png_get_x_pixels_per_meter(png_ptr,</div><div class='del'>-       info_ptr)</div><div class='del'>-    res_y = png_get_y_pixels_per_meter(png_ptr,</div><div class='del'>-       info_ptr)</div><div class='del'>-    res_x_and_y = png_get_pixels_per_meter(png_ptr,</div><div class='del'>-       info_ptr)</div><div class='del'>-    res_x = png_get_x_pixels_per_inch(png_ptr,</div><div class='del'>-       info_ptr)</div><div class='del'>-    res_y = png_get_y_pixels_per_inch(png_ptr,</div><div class='del'>-       info_ptr)</div><div class='del'>-    res_x_and_y = png_get_pixels_per_inch(png_ptr,</div><div class='del'>-       info_ptr)</div><div class='del'>-    aspect_ratio = png_get_pixel_aspect_ratio(png_ptr,</div><div class='del'>-       info_ptr)</div><div class='del'>-</div><div class='del'>-   (Each of these returns 0 [signifying "unknown"] if</div><div class='del'>-       the data is not present or if res_x is 0;</div><div class='del'>-       res_x_and_y is 0 if res_x != res_y)</div><div class='del'>-</div><div class='del'>-The data from the oFFs chunk can be retrieved in several convenient</div><div class='del'>-forms:</div><div class='del'>-</div><div class='del'>-    x_offset = png_get_x_offset_microns(png_ptr, info_ptr);</div><div class='del'>-    y_offset = png_get_y_offset_microns(png_ptr, info_ptr);</div><div class='del'>-    x_offset = png_get_x_offset_inches(png_ptr, info_ptr);</div><div class='del'>-    y_offset = png_get_y_offset_inches(png_ptr, info_ptr);</div><div class='del'>-</div><div class='del'>-   (Each of these returns 0 [signifying "unknown" if both</div><div class='del'>-       x and y are 0] if the data is not present or if the</div><div class='del'>-       chunk is present but the unit is the pixel)</div><div class='del'>-</div><div class='del'>-For more information, see the png_info definition in png.h and the</div><div class='del'>-PNG specification for chunk contents.  Be careful with trusting</div><div class='del'>-rowbytes, as some of the transformations could increase the space</div><div class='del'>-needed to hold a row (expand, filler, gray_to_rgb, etc.).</div><div class='del'>-See png_read_update_info(), below.</div><div class='del'>-</div><div class='del'>-A quick word about text_ptr and num_text.  PNG stores comments in</div><div class='del'>-keyword/text pairs, one pair per chunk, with no limit on the number</div><div class='del'>-of text chunks, and a 2^31 byte limit on their size.  While there are</div><div class='del'>-suggested keywords, there is no requirement to restrict the use to these</div><div class='del'>-strings.  It is strongly suggested that keywords and text be sensible</div><div class='del'>-to humans (that's the point), so don't use abbreviations.  Non-printing</div><div class='del'>-symbols are not allowed.  See the PNG specification for more details.</div><div class='del'>-There is also no requirement to have text after the keyword.</div><div class='del'>-</div><div class='del'>-Keywords should be limited to 79 Latin-1 characters without leading or</div><div class='del'>-trailing spaces, but non-consecutive spaces are allowed within the</div><div class='del'>-keyword.  It is possible to have the same keyword any number of times.</div><div class='del'>-The text_ptr is an array of png_text structures, each holding a</div><div class='del'>-pointer to a language string, a pointer to a keyword and a pointer to</div><div class='del'>-a text string.  The text string, language code, and translated</div><div class='del'>-keyword may be empty or NULL pointers.  The keyword/text</div><div class='del'>-pairs are put into the array in the order that they are received.</div><div class='del'>-However, some or all of the text chunks may be after the image, so, to</div><div class='del'>-make sure you have read all the text chunks, don't mess with these</div><div class='del'>-until after you read the stuff after the image.  This will be</div><div class='del'>-mentioned again below in the discussion that goes with png_read_end().</div><div class='del'>-</div><div class='del'>-Input transformations</div><div class='del'>-</div><div class='del'>-After you've read the header information, you can set up the library</div><div class='del'>-to handle any special transformations of the image data.  The various</div><div class='del'>-ways to transform the data will be described in the order that they</div><div class='del'>-should occur.  This is important, as some of these change the color</div><div class='del'>-type and/or bit depth of the data, and some others only work on</div><div class='del'>-certain color types and bit depths.  Even though each transformation</div><div class='del'>-checks to see if it has data that it can do something with, you should</div><div class='del'>-make sure to only enable a transformation if it will be valid for the</div><div class='del'>-data.  For example, don't swap red and blue on grayscale data.</div><div class='del'>-</div><div class='del'>-The colors used for the background and transparency values should be</div><div class='del'>-supplied in the same format/depth as the current image data.  They</div><div class='del'>-are stored in the same format/depth as the image data in a bKGD or tRNS</div><div class='del'>-chunk, so this is what libpng expects for this data.  The colors are</div><div class='del'>-transformed to keep in sync with the image data when an application</div><div class='del'>-calls the png_read_update_info() routine (see below).</div><div class='del'>-</div><div class='del'>-Data will be decoded into the supplied row buffers packed into bytes</div><div class='del'>-unless the library has been told to transform it into another format.</div><div class='del'>-For example, 4 bit/pixel paletted or grayscale data will be returned</div><div class='del'>-2 pixels/byte with the leftmost pixel in the high-order bits of the</div><div class='del'>-byte, unless png_set_packing() is called.  8-bit RGB data will be stored</div><div class='del'>-in RGB RGB RGB format unless png_set_filler() or png_set_add_alpha()</div><div class='del'>-is called to insert filler bytes, either before or after each RGB triplet.</div><div class='del'>-16-bit RGB data will be returned RRGGBB RRGGBB, with the most significant</div><div class='del'>-byte of the color value first, unless png_set_strip_16() is called to</div><div class='del'>-transform it to regular RGB RGB triplets, or png_set_filler() or</div><div class='del'>-png_set_add alpha() is called to insert filler bytes, either before or</div><div class='del'>-after each RRGGBB triplet.  Similarly, 8-bit or 16-bit grayscale data can</div><div class='del'>-be modified with</div><div class='del'>-png_set_filler(), png_set_add_alpha(), or png_set_strip_16().</div><div class='del'>-</div><div class='del'>-The following code transforms grayscale images of less than 8 to 8 bits,</div><div class='del'>-changes paletted images to RGB, and adds a full alpha channel if there is</div><div class='del'>-transparency information in a tRNS chunk.  This is most useful on</div><div class='del'>-grayscale images with bit depths of 2 or 4 or if there is a multiple-image</div><div class='del'>-viewing application that wishes to treat all images in the same way.</div><div class='del'>-</div><div class='del'>-    if (color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='del'>-        png_set_palette_to_rgb(png_ptr);</div><div class='del'>-</div><div class='del'>-    if (color_type == PNG_COLOR_TYPE_GRAY &amp;&amp;</div><div class='del'>-        bit_depth &lt; 8) png_set_expand_gray_1_2_4_to_8(png_ptr);</div><div class='del'>-</div><div class='del'>-    if (png_get_valid(png_ptr, info_ptr,</div><div class='del'>-        PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr);</div><div class='del'>-</div><div class='del'>-These three functions are actually aliases for png_set_expand(), added</div><div class='del'>-in libpng version 1.0.4, with the function names expanded to improve code</div><div class='del'>-readability.  In some future version they may actually do different</div><div class='del'>-things.</div><div class='del'>-</div><div class='del'>-As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was</div><div class='del'>-added.  It expands the sample depth without changing tRNS to alpha.</div><div class='del'>-</div><div class='del'>-As of libpng version 1.4.0, not all possible expansions are supported.</div><div class='del'>-</div><div class='del'>-In the following table, the 01 means grayscale with depth&lt;8, 31 means</div><div class='del'>-indexed with depth&lt;8, other numerals represent the color type, "T" means</div><div class='del'>-the tRNS chunk is present, A means an alpha channel is present, and O</div><div class='del'>-means tRNS or alpha is present but all pixels in the image are opaque.</div><div class='del'>-</div><div class='del'>-  FROM  01  31   0  0T  0O   2  2T  2O   3  3T  3O  4A  4O  6A  6O </div><div class='del'>-   TO</div><div class='del'>-   01    -                   </div><div class='del'>-   31        -</div><div class='del'>-    0    1       -           </div><div class='del'>-   0T                -</div><div class='del'>-   0O                    -</div><div class='del'>-    2           GX           -</div><div class='del'>-   2T                            -</div><div class='del'>-   2O                                -</div><div class='del'>-    3        1                           -</div><div class='del'>-   3T                                        -</div><div class='del'>-   3O                                            -</div><div class='del'>-   4A                T                               -</div><div class='del'>-   4O                                                    -</div><div class='del'>-   6A               GX         TX           TX               -</div><div class='del'>-   6O                   GX                      TX               -</div><div class='del'>-</div><div class='del'>-Within the matrix,</div><div class='del'>-     "-" means the transformation is not supported.</div><div class='del'>-     "X" means the transformation is obtained by png_set_expand().</div><div class='del'>-     "1" means the transformation is obtained by</div><div class='del'>-         png_set_expand_gray_1_2_4_to_8</div><div class='del'>-     "G" means the transformation is obtained by</div><div class='del'>-         png_set_gray_to_rgb().</div><div class='del'>-     "P" means the transformation is obtained by</div><div class='del'>-         png_set_expand_palette_to_rgb().</div><div class='del'>-     "T" means the transformation is obtained by</div><div class='del'>-         png_set_tRNS_to_alpha().</div><div class='del'>-</div><div class='del'>-PNG can have files with 16 bits per channel.  If you only can handle</div><div class='del'>-8 bits per channel, this will strip the pixels down to 8 bit.</div><div class='del'>-</div><div class='del'>-    if (bit_depth == 16)</div><div class='del'>-        png_set_strip_16(png_ptr);</div><div class='del'>-</div><div class='del'>-If, for some reason, you don't need the alpha channel on an image,</div><div class='del'>-and you want to remove it rather than combining it with the background</div><div class='del'>-(but the image author certainly had in mind that you *would* combine</div><div class='del'>-it with the background, so that's what you should probably do):</div><div class='del'>-</div><div class='del'>-    if (color_type &amp; PNG_COLOR_MASK_ALPHA)</div><div class='del'>-        png_set_strip_alpha(png_ptr);</div><div class='del'>-</div><div class='del'>-In PNG files, the alpha channel in an image</div><div class='del'>-is the level of opacity.  If you need the alpha channel in an image to</div><div class='del'>-be the level of transparency instead of opacity, you can invert the</div><div class='del'>-alpha channel (or the tRNS chunk data) after it's read, so that 0 is</div><div class='del'>-fully opaque and 255 (in 8-bit or paletted images) or 65535 (in 16-bit</div><div class='del'>-images) is fully transparent, with</div><div class='del'>-</div><div class='del'>-    png_set_invert_alpha(png_ptr);</div><div class='del'>-</div><div class='del'>-PNG files pack pixels of bit depths 1, 2, and 4 into bytes as small as</div><div class='del'>-they can, resulting in, for example, 8 pixels per byte for 1 bit</div><div class='del'>-files.  This code expands to 1 pixel per byte without changing the</div><div class='del'>-values of the pixels:</div><div class='del'>-</div><div class='del'>-    if (bit_depth &lt; 8)</div><div class='del'>-        png_set_packing(png_ptr);</div><div class='del'>-</div><div class='del'>-PNG files have possible bit depths of 1, 2, 4, 8, and 16.  All pixels</div><div class='del'>-stored in a PNG image have been "scaled" or "shifted" up to the next</div><div class='del'>-higher possible bit depth (e.g. from 5 bits/sample in the range [0,31]</div><div class='del'>-to 8 bits/sample in the range [0, 255]).  However, it is also possible</div><div class='del'>-to convert the PNG pixel data back to the original bit depth of the</div><div class='del'>-image.  This call reduces the pixels back down to the original bit depth:</div><div class='del'>-</div><div class='del'>-    png_color_8p sig_bit;</div><div class='del'>-</div><div class='del'>-    if (png_get_sBIT(png_ptr, info_ptr, &amp;sig_bit))</div><div class='del'>-        png_set_shift(png_ptr, sig_bit);</div><div class='del'>-</div><div class='del'>-PNG files store 3-color pixels in red, green, blue order.  This code</div><div class='del'>-changes the storage of the pixels to blue, green, red:</div><div class='del'>-</div><div class='del'>-    if (color_type == PNG_COLOR_TYPE_RGB ||</div><div class='del'>-        color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='del'>-        png_set_bgr(png_ptr);</div><div class='del'>-</div><div class='del'>-PNG files store RGB pixels packed into 3 or 6 bytes. This code expands them</div><div class='del'>-into 4 or 8 bytes for windowing systems that need them in this format:</div><div class='del'>-</div><div class='del'>-    if (color_type == PNG_COLOR_TYPE_RGB)</div><div class='del'>-        png_set_filler(png_ptr, filler, PNG_FILLER_BEFORE);</div><div class='del'>-</div><div class='del'>-where "filler" is the 8 or 16-bit number to fill with, and the location is</div><div class='del'>-either PNG_FILLER_BEFORE or PNG_FILLER_AFTER, depending upon whether</div><div class='del'>-you want the filler before the RGB or after.  This transformation</div><div class='del'>-does not affect images that already have full alpha channels.  To add an</div><div class='del'>-opaque alpha channel, use filler=0xff or 0xffff and PNG_FILLER_AFTER which</div><div class='del'>-will generate RGBA pixels.</div><div class='del'>-</div><div class='del'>-Note that png_set_filler() does not change the color type.  If you want</div><div class='del'>-to do that, you can add a true alpha channel with</div><div class='del'>-</div><div class='del'>-    if (color_type == PNG_COLOR_TYPE_RGB ||</div><div class='del'>-           color_type == PNG_COLOR_TYPE_GRAY)</div><div class='del'>-    png_set_add_alpha(png_ptr, filler, PNG_FILLER_AFTER);</div><div class='del'>-</div><div class='del'>-where "filler" contains the alpha value to assign to each pixel.</div><div class='del'>-This function was added in libpng-1.2.7.</div><div class='del'>-</div><div class='del'>-If you are reading an image with an alpha channel, and you need the</div><div class='del'>-data as ARGB instead of the normal PNG format RGBA:</div><div class='del'>-</div><div class='del'>-    if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='del'>-        png_set_swap_alpha(png_ptr);</div><div class='del'>-</div><div class='del'>-For some uses, you may want a grayscale image to be represented as</div><div class='del'>-RGB.  This code will do that conversion:</div><div class='del'>-</div><div class='del'>-    if (color_type == PNG_COLOR_TYPE_GRAY ||</div><div class='del'>-        color_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='del'>-          png_set_gray_to_rgb(png_ptr);</div><div class='del'>-</div><div class='del'>-Conversely, you can convert an RGB or RGBA image to grayscale or grayscale</div><div class='del'>-with alpha.</div><div class='del'>-</div><div class='del'>-    if (color_type == PNG_COLOR_TYPE_RGB ||</div><div class='del'>-        color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='del'>-          png_set_rgb_to_gray_fixed(png_ptr, error_action,</div><div class='del'>-             int red_weight, int green_weight);</div><div class='del'>-</div><div class='del'>-    error_action = 1: silently do the conversion</div><div class='del'>-    error_action = 2: issue a warning if the original</div><div class='del'>-                      image has any pixel where</div><div class='del'>-                      red != green or red != blue</div><div class='del'>-    error_action = 3: issue an error and abort the</div><div class='del'>-                      conversion if the original</div><div class='del'>-                      image has any pixel where</div><div class='del'>-                      red != green or red != blue</div><div class='del'>-</div><div class='del'>-    red_weight:       weight of red component times 100000</div><div class='del'>-    green_weight:     weight of green component times 100000</div><div class='del'>-                      If either weight is negative, default</div><div class='del'>-                      weights (21268, 71514) are used.</div><div class='del'>-</div><div class='del'>-If you have set error_action = 1 or 2, you can</div><div class='del'>-later check whether the image really was gray, after processing</div><div class='del'>-the image rows, with the png_get_rgb_to_gray_status(png_ptr) function.</div><div class='del'>-It will return a png_byte that is zero if the image was gray or</div><div class='del'>-1 if there were any non-gray pixels.  bKGD and sBIT data</div><div class='del'>-will be silently converted to grayscale, using the green channel</div><div class='del'>-data, regardless of the error_action setting.</div><div class='del'>-</div><div class='del'>-With red_weight+green_weight&lt;=100000,</div><div class='del'>-the normalized graylevel is computed:</div><div class='del'>-</div><div class='del'>-    int rw = red_weight * 65536;</div><div class='del'>-    int gw = green_weight * 65536;</div><div class='del'>-    int bw = 65536 - (rw + gw);</div><div class='del'>-    gray = (rw*red + gw*green + bw*blue)/65536;</div><div class='del'>-</div><div class='del'>-The default values approximate those recommended in the Charles</div><div class='del'>-Poynton's Color FAQ, &lt;http://www.inforamp.net/~poynton/&gt;</div><div class='del'>-Copyright (c) 1998-01-04 Charles Poynton &lt;poynton at inforamp.net&gt;</div><div class='del'>-</div><div class='del'>-    Y = 0.212671 * R + 0.715160 * G + 0.072169 * B</div><div class='del'>-</div><div class='del'>-Libpng approximates this with</div><div class='del'>-</div><div class='del'>-    Y = 0.21268 * R    + 0.7151 * G    + 0.07217 * B</div><div class='del'>-</div><div class='del'>-which can be expressed with integers as</div><div class='del'>-</div><div class='del'>-    Y = (6969 * R + 23434 * G + 2365 * B)/32768</div><div class='del'>-</div><div class='del'>-The calculation is done in a linear colorspace, if the image gamma</div><div class='del'>-is known.</div><div class='del'>-</div><div class='del'>-If you have a grayscale and you are using png_set_expand_depth(),</div><div class='del'>-png_set_expand(), or png_set_gray_to_rgb to change to truecolor or to</div><div class='del'>-a higher bit-depth, you must either supply the background color as a gray</div><div class='del'>-value at the original file bit-depth (need_expand = 1) or else supply the</div><div class='del'>-background color as an RGB triplet at the final, expanded bit depth</div><div class='del'>-(need_expand = 0).  Similarly, if you are reading a paletted image, you</div><div class='del'>-must either supply the background color as a palette index (need_expand = 1)</div><div class='del'>-or as an RGB triplet that may or may not be in the palette (need_expand = 0).</div><div class='del'>-</div><div class='del'>-    png_color_16 my_background;</div><div class='del'>-    png_color_16p image_background;</div><div class='del'>-</div><div class='del'>-    if (png_get_bKGD(png_ptr, info_ptr, &amp;image_background))</div><div class='del'>-        png_set_background(png_ptr, image_background,</div><div class='del'>-          PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);</div><div class='del'>-    else</div><div class='del'>-        png_set_background(png_ptr, &amp;my_background,</div><div class='del'>-          PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);</div><div class='del'>-</div><div class='del'>-The png_set_background() function tells libpng to composite images</div><div class='del'>-with alpha or simple transparency against the supplied background</div><div class='del'>-color.  If the PNG file contains a bKGD chunk (PNG_INFO_bKGD valid),</div><div class='del'>-you may use this color, or supply another color more suitable for</div><div class='del'>-the current display (e.g., the background color from a web page).  You</div><div class='del'>-need to tell libpng whether the color is in the gamma space of the</div><div class='del'>-display (PNG_BACKGROUND_GAMMA_SCREEN for colors you supply), the file</div><div class='del'>-(PNG_BACKGROUND_GAMMA_FILE for colors from the bKGD chunk), or one</div><div class='del'>-that is neither of these gammas (PNG_BACKGROUND_GAMMA_UNIQUE - I don't</div><div class='del'>-know why anyone would use this, but it's here).</div><div class='del'>-</div><div class='del'>-To properly display PNG images on any kind of system, the application needs</div><div class='del'>-to know what the display gamma is.  Ideally, the user will know this, and</div><div class='del'>-the application will allow them to set it.  One method of allowing the user</div><div class='del'>-to set the display gamma separately for each system is to check for a</div><div class='del'>-SCREEN_GAMMA or DISPLAY_GAMMA environment variable, which will hopefully be</div><div class='del'>-correctly set.</div><div class='del'>-</div><div class='del'>-Note that display_gamma is the overall gamma correction required to produce</div><div class='del'>-pleasing results, which depends on the lighting conditions in the surrounding</div><div class='del'>-environment.  In a dim or brightly lit room, no compensation other than</div><div class='del'>-the physical gamma exponent of the monitor is needed, while in a dark room</div><div class='del'>-a slightly smaller exponent is better.</div><div class='del'>-</div><div class='del'>-   double gamma, screen_gamma;</div><div class='del'>-</div><div class='del'>-   if (/* We have a user-defined screen</div><div class='del'>-       gamma value */)</div><div class='del'>-   {</div><div class='del'>-      screen_gamma = user_defined_screen_gamma;</div><div class='del'>-   }</div><div class='del'>-   /* One way that applications can share the same</div><div class='del'>-      screen gamma value */</div><div class='del'>-   else if ((gamma_str = getenv("SCREEN_GAMMA"))</div><div class='del'>-      != NULL)</div><div class='del'>-   {</div><div class='del'>-      screen_gamma = (double)atof(gamma_str);</div><div class='del'>-   }</div><div class='del'>-   /* If we don't have another value */</div><div class='del'>-   else</div><div class='del'>-   {</div><div class='del'>-      screen_gamma = 2.2; /* A good guess for a</div><div class='del'>-           PC monitor in a bright office or a dim room */</div><div class='del'>-      screen_gamma = 2.0; /* A good guess for a</div><div class='del'>-           PC monitor in a dark room */</div><div class='del'>-      screen_gamma = 1.7 or 1.0;  /* A good</div><div class='del'>-           guess for Mac systems */</div><div class='del'>-   }</div><div class='del'>-</div><div class='del'>-The png_set_gamma() function handles gamma transformations of the data.</div><div class='del'>-Pass both the file gamma and the current screen_gamma.  If the file does</div><div class='del'>-not have a gamma value, you can pass one anyway if you have an idea what</div><div class='del'>-it is (usually 0.45455 is a good guess for GIF images on PCs).  Note</div><div class='del'>-that file gammas are inverted from screen gammas.  See the discussions</div><div class='del'>-on gamma in the PNG specification for an excellent description of what</div><div class='del'>-gamma is, and why all applications should support it.  It is strongly</div><div class='del'>-recommended that PNG viewers support gamma correction.</div><div class='del'>-</div><div class='del'>-   if (png_get_gAMA(png_ptr, info_ptr, &amp;gamma))</div><div class='del'>-      png_set_gamma(png_ptr, screen_gamma, gamma);</div><div class='del'>-   else</div><div class='del'>-      png_set_gamma(png_ptr, screen_gamma, 0.45455);</div><div class='del'>-</div><div class='del'>-PNG files describe monochrome as black being zero and white being one.</div><div class='del'>-The following code will reverse this (make black be one and white be</div><div class='del'>-zero):</div><div class='del'>-</div><div class='del'>-   if (bit_depth == 1 &amp;&amp; color_type == PNG_COLOR_TYPE_GRAY)</div><div class='del'>-      png_set_invert_mono(png_ptr);</div><div class='del'>-</div><div class='del'>-This function can also be used to invert grayscale and gray-alpha images:</div><div class='del'>-</div><div class='del'>-   if (color_type == PNG_COLOR_TYPE_GRAY ||</div><div class='del'>-        color_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='del'>-      png_set_invert_mono(png_ptr);</div><div class='del'>-</div><div class='del'>-PNG files store 16 bit pixels in network byte order (big-endian,</div><div class='del'>-ie. most significant bits first).  This code changes the storage to the</div><div class='del'>-other way (little-endian, i.e. least significant bits first, the</div><div class='del'>-way PCs store them):</div><div class='del'>-</div><div class='del'>-    if (bit_depth == 16)</div><div class='del'>-        png_set_swap(png_ptr);</div><div class='del'>-</div><div class='del'>-If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you</div><div class='del'>-need to change the order the pixels are packed into bytes, you can use:</div><div class='del'>-</div><div class='del'>-    if (bit_depth &lt; 8)</div><div class='del'>-       png_set_packswap(png_ptr);</div><div class='del'>-</div><div class='del'>-Finally, you can write your own transformation function if none of</div><div class='del'>-the existing ones meets your needs.  This is done by setting a callback</div><div class='del'>-with</div><div class='del'>-</div><div class='del'>-    png_set_read_user_transform_fn(png_ptr,</div><div class='del'>-       read_transform_fn);</div><div class='del'>-</div><div class='del'>-You must supply the function</div><div class='del'>-</div><div class='del'>-    void read_transform_fn(png_ptr ptr, row_info_ptr</div><div class='del'>-       row_info, png_bytep data)</div><div class='del'>-</div><div class='del'>-See pngtest.c for a working example.  Your function will be called</div><div class='del'>-after all of the other transformations have been processed.</div><div class='del'>-</div><div class='del'>-You can also set up a pointer to a user structure for use by your</div><div class='del'>-callback function, and you can inform libpng that your transform</div><div class='del'>-function will change the number of channels or bit depth with the</div><div class='del'>-function</div><div class='del'>-</div><div class='del'>-    png_set_user_transform_info(png_ptr, user_ptr,</div><div class='del'>-       user_depth, user_channels);</div><div class='del'>-</div><div class='del'>-The user's application, not libpng, is responsible for allocating and</div><div class='del'>-freeing any memory required for the user structure.</div><div class='del'>-</div><div class='del'>-You can retrieve the pointer via the function</div><div class='del'>-png_get_user_transform_ptr().  For example:</div><div class='del'>-</div><div class='del'>-    voidp read_user_transform_ptr =</div><div class='del'>-       png_get_user_transform_ptr(png_ptr);</div><div class='del'>-</div><div class='del'>-The last thing to handle is interlacing; this is covered in detail below,</div><div class='del'>-but you must call the function here if you want libpng to handle expansion</div><div class='del'>-of the interlaced image.</div><div class='del'>-</div><div class='del'>-    number_of_passes = png_set_interlace_handling(png_ptr);</div><div class='del'>-</div><div class='del'>-After setting the transformations, libpng can update your png_info</div><div class='del'>-structure to reflect any transformations you've requested with this</div><div class='del'>-call.  This is most useful to update the info structure's rowbytes</div><div class='del'>-field so you can use it to allocate your image memory.  This function</div><div class='del'>-will also update your palette with the correct screen_gamma and</div><div class='del'>-background if these have been given with the calls above.</div><div class='del'>-</div><div class='del'>-    png_read_update_info(png_ptr, info_ptr);</div><div class='del'>-</div><div class='del'>-After you call png_read_update_info(), you can allocate any</div><div class='del'>-memory you need to hold the image.  The row data is simply</div><div class='del'>-raw byte data for all forms of images.  As the actual allocation</div><div class='del'>-varies among applications, no example will be given.  If you</div><div class='del'>-are allocating one large chunk, you will need to build an</div><div class='del'>-array of pointers to each row, as it will be needed for some</div><div class='del'>-of the functions below.</div><div class='del'>-</div><div class='del'>-Reading image data</div><div class='del'>-</div><div class='del'>-After you've allocated memory, you can read the image data.</div><div class='del'>-The simplest way to do this is in one function call.  If you are</div><div class='del'>-allocating enough memory to hold the whole image, you can just</div><div class='del'>-call png_read_image() and libpng will read in all the image data</div><div class='del'>-and put it in the memory area supplied.  You will need to pass in</div><div class='del'>-an array of pointers to each row.</div><div class='del'>-</div><div class='del'>-This function automatically handles interlacing, so you don't need</div><div class='del'>-to call png_set_interlace_handling() or call this function multiple</div><div class='del'>-times, or any of that other stuff necessary with png_read_rows().</div><div class='del'>-</div><div class='del'>-   png_read_image(png_ptr, row_pointers);</div><div class='del'>-</div><div class='del'>-where row_pointers is:</div><div class='del'>-</div><div class='del'>-   png_bytep row_pointers[height];</div><div class='del'>-</div><div class='del'>-You can point to void or char or whatever you use for pixels.</div><div class='del'>-</div><div class='del'>-If you don't want to read in the whole image at once, you can</div><div class='del'>-use png_read_rows() instead.  If there is no interlacing (check</div><div class='del'>-interlace_type == PNG_INTERLACE_NONE), this is simple:</div><div class='del'>-</div><div class='del'>-    png_read_rows(png_ptr, row_pointers, NULL,</div><div class='del'>-       number_of_rows);</div><div class='del'>-</div><div class='del'>-where row_pointers is the same as in the png_read_image() call.</div><div class='del'>-</div><div class='del'>-If you are doing this just one row at a time, you can do this with</div><div class='del'>-a single row_pointer instead of an array of row_pointers:</div><div class='del'>-</div><div class='del'>-    png_bytep row_pointer = row;</div><div class='del'>-    png_read_row(png_ptr, row_pointer, NULL);</div><div class='del'>-</div><div class='del'>-If the file is interlaced (interlace_type != 0 in the IHDR chunk), things</div><div class='del'>-get somewhat harder.  The only current (PNG Specification version 1.2)</div><div class='del'>-interlacing type for PNG is (interlace_type == PNG_INTERLACE_ADAM7)</div><div class='del'>-is a somewhat complicated 2D interlace scheme, known as Adam7, that</div><div class='del'>-breaks down an image into seven smaller images of varying size, based</div><div class='del'>-on an 8x8 grid.</div><div class='del'>-</div><div class='del'>-libpng can fill out those images or it can give them to you "as is".</div><div class='del'>-If you want them filled out, there are two ways to do that.  The one</div><div class='del'>-mentioned in the PNG specification is to expand each pixel to cover</div><div class='del'>-those pixels that have not been read yet (the "rectangle" method).</div><div class='del'>-This results in a blocky image for the first pass, which gradually</div><div class='del'>-smooths out as more pixels are read.  The other method is the "sparkle"</div><div class='del'>-method, where pixels are drawn only in their final locations, with the</div><div class='del'>-rest of the image remaining whatever colors they were initialized to</div><div class='del'>-before the start of the read.  The first method usually looks better,</div><div class='del'>-but tends to be slower, as there are more pixels to put in the rows.</div><div class='del'>-</div><div class='del'>-If you don't want libpng to handle the interlacing details, just call</div><div class='del'>-png_read_rows() seven times to read in all seven images.  Each of the</div><div class='del'>-images is a valid image by itself, or they can all be combined on an</div><div class='del'>-8x8 grid to form a single image (although if you intend to combine them</div><div class='del'>-you would be far better off using the libpng interlace handling).</div><div class='del'>-</div><div class='del'>-The first pass will return an image 1/8 as wide as the entire image</div><div class='del'>-(every 8th column starting in column 0) and 1/8 as high as the original</div><div class='del'>-(every 8th row starting in row 0), the second will be 1/8 as wide</div><div class='del'>-(starting in column 4) and 1/8 as high (also starting in row 0).  The</div><div class='del'>-third pass will be 1/4 as wide (every 4th pixel starting in column 0) and</div><div class='del'>-1/8 as high (every 8th row starting in row 4), and the fourth pass will</div><div class='del'>-be 1/4 as wide and 1/4 as high (every 4th column starting in column 2,</div><div class='del'>-and every 4th row starting in row 0).  The fifth pass will return an</div><div class='del'>-image 1/2 as wide, and 1/4 as high (starting at column 0 and row 2),</div><div class='del'>-while the sixth pass will be 1/2 as wide and 1/2 as high as the original</div><div class='del'>-(starting in column 1 and row 0).  The seventh and final pass will be as</div><div class='del'>-wide as the original, and 1/2 as high, containing all of the odd</div><div class='del'>-numbered scanlines.  Phew!</div><div class='del'>-</div><div class='del'>-If you want libpng to expand the images, call this before calling</div><div class='del'>-png_start_read_image() or png_read_update_info():</div><div class='del'>-</div><div class='del'>-    if (interlace_type == PNG_INTERLACE_ADAM7)</div><div class='del'>-        number_of_passes</div><div class='del'>-           = png_set_interlace_handling(png_ptr);</div><div class='del'>-</div><div class='del'>-This will return the number of passes needed.  Currently, this</div><div class='del'>-is seven, but may change if another interlace type is added.</div><div class='del'>-This function can be called even if the file is not interlaced,</div><div class='del'>-where it will return one pass.</div><div class='del'>-</div><div class='del'>-If you are not going to display the image after each pass, but are</div><div class='del'>-going to wait until the entire image is read in, use the sparkle</div><div class='del'>-effect.  This effect is faster and the end result of either method</div><div class='del'>-is exactly the same.  If you are planning on displaying the image</div><div class='del'>-after each pass, the "rectangle" effect is generally considered the</div><div class='del'>-better looking one.</div><div class='del'>-</div><div class='del'>-If you only want the "sparkle" effect, just call png_read_rows() as</div><div class='del'>-normal, with the third parameter NULL.  Make sure you make pass over</div><div class='del'>-the image number_of_passes times, and you don't change the data in the</div><div class='del'>-rows between calls.  You can change the locations of the data, just</div><div class='del'>-not the data.  Each pass only writes the pixels appropriate for that</div><div class='del'>-pass, and assumes the data from previous passes is still valid.</div><div class='del'>-</div><div class='del'>-    png_read_rows(png_ptr, row_pointers, NULL,</div><div class='del'>-       number_of_rows);</div><div class='del'>-</div><div class='del'>-If you only want the first effect (the rectangles), do the same as</div><div class='del'>-before except pass the row buffer in the third parameter, and leave</div><div class='del'>-the second parameter NULL.</div><div class='del'>-</div><div class='del'>-    png_read_rows(png_ptr, NULL, row_pointers,</div><div class='del'>-       number_of_rows);</div><div class='del'>-</div><div class='del'>-Finishing a sequential read</div><div class='del'>-</div><div class='del'>-After you are finished reading the image through the</div><div class='del'>-low-level interface, you can finish reading the file.  If you are</div><div class='del'>-interested in comments or time, which may be stored either before or</div><div class='del'>-after the image data, you should pass the separate png_info struct if</div><div class='del'>-you want to keep the comments from before and after the image</div><div class='del'>-separate.  If you are not interested, you can pass NULL.</div><div class='del'>-</div><div class='del'>-   png_read_end(png_ptr, end_info);</div><div class='del'>-</div><div class='del'>-When you are done, you can free all memory allocated by libpng like this:</div><div class='del'>-</div><div class='del'>-   png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='del'>-       &amp;end_info);</div><div class='del'>-</div><div class='del'>-It is also possible to individually free the info_ptr members that</div><div class='del'>-point to libpng-allocated storage with the following function:</div><div class='del'>-</div><div class='del'>-    png_free_data(png_ptr, info_ptr, mask, seq)</div><div class='del'>-    mask - identifies data to be freed, a mask</div><div class='del'>-           containing the bitwise OR of one or</div><div class='del'>-           more of</div><div class='del'>-             PNG_FREE_PLTE, PNG_FREE_TRNS,</div><div class='del'>-             PNG_FREE_HIST, PNG_FREE_ICCP,</div><div class='del'>-             PNG_FREE_PCAL, PNG_FREE_ROWS,</div><div class='del'>-             PNG_FREE_SCAL, PNG_FREE_SPLT,</div><div class='del'>-             PNG_FREE_TEXT, PNG_FREE_UNKN,</div><div class='del'>-           or simply PNG_FREE_ALL</div><div class='del'>-    seq  - sequence number of item to be freed</div><div class='del'>-           (-1 for all items)</div><div class='del'>-</div><div class='del'>-This function may be safely called when the relevant storage has</div><div class='del'>-already been freed, or has not yet been allocated, or was allocated</div><div class='del'>-by the user and not by libpng,  and will in those cases do nothing.</div><div class='del'>-The "seq" parameter is ignored if only one item of the selected data</div><div class='del'>-type, such as PLTE, is allowed.  If "seq" is not -1, and multiple items</div><div class='del'>-are allowed for the data type identified in the mask, such as text or</div><div class='del'>-sPLT, only the n'th item in the structure is freed, where n is "seq".</div><div class='del'>-</div><div class='del'>-The default behavior is only to free data that was allocated internally</div><div class='del'>-by libpng.  This can be changed, so that libpng will not free the data,</div><div class='del'>-or so that it will free data that was allocated by the user with png_malloc()</div><div class='del'>-or png_zalloc() and passed in via a png_set_*() function, with</div><div class='del'>-</div><div class='del'>-    png_data_freer(png_ptr, info_ptr, freer, mask)</div><div class='del'>-    mask   - which data elements are affected</div><div class='del'>-             same choices as in png_free_data()</div><div class='del'>-    freer  - one of</div><div class='del'>-               PNG_DESTROY_WILL_FREE_DATA</div><div class='del'>-               PNG_SET_WILL_FREE_DATA</div><div class='del'>-               PNG_USER_WILL_FREE_DATA</div><div class='del'>-</div><div class='del'>-This function only affects data that has already been allocated.</div><div class='del'>-You can call this function after reading the PNG data but before calling</div><div class='del'>-any png_set_*() functions, to control whether the user or the png_set_*()</div><div class='del'>-function is responsible for freeing any existing data that might be present,</div><div class='del'>-and again after the png_set_*() functions to control whether the user</div><div class='del'>-or png_destroy_*() is supposed to free the data.  When the user assumes</div><div class='del'>-responsibility for libpng-allocated data, the application must use</div><div class='del'>-png_free() to free it, and when the user transfers responsibility to libpng</div><div class='del'>-for data that the user has allocated, the user must have used png_malloc()</div><div class='del'>-or png_zalloc() to allocate it.</div><div class='del'>-</div><div class='del'>-If you allocated your row_pointers in a single block, as suggested above in</div><div class='del'>-the description of the high level read interface, you must not transfer</div><div class='del'>-responsibility for freeing it to the png_set_rows or png_read_destroy function,</div><div class='del'>-because they would also try to free the individual row_pointers[i].</div><div class='del'>-</div><div class='del'>-If you allocated text_ptr.text, text_ptr.lang, and text_ptr.translated_keyword</div><div class='del'>-separately, do not transfer responsibility for freeing text_ptr to libpng,</div><div class='del'>-because when libpng fills a png_text structure it combines these members with</div><div class='del'>-the key member, and png_free_data() will free only text_ptr.key.  Similarly,</div><div class='del'>-if you transfer responsibility for free'ing text_ptr from libpng to your</div><div class='del'>-application, your application must not separately free those members.</div><div class='del'>-</div><div class='del'>-The png_free_data() function will turn off the "valid" flag for anything</div><div class='del'>-it frees.  If you need to turn the flag off for a chunk that was freed by</div><div class='del'>-your application instead of by libpng, you can use</div><div class='del'>-</div><div class='del'>-    png_set_invalid(png_ptr, info_ptr, mask);</div><div class='del'>-    mask - identifies the chunks to be made invalid,</div><div class='del'>-           containing the bitwise OR of one or</div><div class='del'>-           more of</div><div class='del'>-             PNG_INFO_gAMA, PNG_INFO_sBIT,</div><div class='del'>-             PNG_INFO_cHRM, PNG_INFO_PLTE,</div><div class='del'>-             PNG_INFO_tRNS, PNG_INFO_bKGD,</div><div class='del'>-             PNG_INFO_hIST, PNG_INFO_pHYs,</div><div class='del'>-             PNG_INFO_oFFs, PNG_INFO_tIME,</div><div class='del'>-             PNG_INFO_pCAL, PNG_INFO_sRGB,</div><div class='del'>-             PNG_INFO_iCCP, PNG_INFO_sPLT,</div><div class='del'>-             PNG_INFO_sCAL, PNG_INFO_IDAT</div><div class='del'>-</div><div class='del'>-For a more compact example of reading a PNG image, see the file example.c.</div><div class='del'>-</div><div class='del'>-Reading PNG files progressively</div><div class='del'>-</div><div class='del'>-The progressive reader is slightly different then the non-progressive</div><div class='del'>-reader.  Instead of calling png_read_info(), png_read_rows(), and</div><div class='del'>-png_read_end(), you make one call to png_process_data(), which calls</div><div class='del'>-callbacks when it has the info, a row, or the end of the image.  You</div><div class='del'>-set up these callbacks with png_set_progressive_read_fn().  You don't</div><div class='del'>-have to worry about the input/output functions of libpng, as you are</div><div class='del'>-giving the library the data directly in png_process_data().  I will</div><div class='del'>-assume that you have read the section on reading PNG files above,</div><div class='del'>-so I will only highlight the differences (although I will show</div><div class='del'>-all of the code).</div><div class='del'>-</div><div class='del'>-png_structp png_ptr;</div><div class='del'>-png_infop info_ptr;</div><div class='del'>-</div><div class='del'>- /*  An example code fragment of how you would</div><div class='del'>-     initialize the progressive reader in your</div><div class='del'>-     application. */</div><div class='del'>- int</div><div class='del'>- initialize_png_reader()</div><div class='del'>- {</div><div class='del'>-    png_ptr = png_create_read_struct</div><div class='del'>-        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,</div><div class='del'>-         user_error_fn, user_warning_fn);</div><div class='del'>-    if (!png_ptr)</div><div class='del'>-        return (ERROR);</div><div class='del'>-    info_ptr = png_create_info_struct(png_ptr);</div><div class='del'>-    if (!info_ptr)</div><div class='del'>-    {</div><div class='del'>-        png_destroy_read_struct(&amp;png_ptr, (png_infopp)NULL,</div><div class='del'>-           (png_infopp)NULL);</div><div class='del'>-        return (ERROR);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (setjmp(png_jmpbuf(png_ptr)))</div><div class='del'>-    {</div><div class='del'>-        png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='del'>-           (png_infopp)NULL);</div><div class='del'>-        return (ERROR);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* This one's new.  You can provide functions</div><div class='del'>-       to be called when the header info is valid,</div><div class='del'>-       when each row is completed, and when the image</div><div class='del'>-       is finished.  If you aren't using all functions,</div><div class='del'>-       you can specify NULL parameters.  Even when all</div><div class='del'>-       three functions are NULL, you need to call</div><div class='del'>-       png_set_progressive_read_fn().  You can use</div><div class='del'>-       any struct as the user_ptr (cast to a void pointer</div><div class='del'>-       for the function call), and retrieve the pointer</div><div class='del'>-       from inside the callbacks using the function</div><div class='del'>-</div><div class='del'>-          png_get_progressive_ptr(png_ptr);</div><div class='del'>-</div><div class='del'>-       which will return a void pointer, which you have</div><div class='del'>-       to cast appropriately.</div><div class='del'>-     */</div><div class='del'>-    png_set_progressive_read_fn(png_ptr, (void *)user_ptr,</div><div class='del'>-        info_callback, row_callback, end_callback);</div><div class='del'>-</div><div class='del'>-    return 0;</div><div class='del'>- }</div><div class='del'>-</div><div class='del'>- /* A code fragment that you call as you receive blocks</div><div class='del'>-   of data */</div><div class='del'>- int</div><div class='del'>- process_data(png_bytep buffer, png_uint_32 length)</div><div class='del'>- {</div><div class='del'>-    if (setjmp(png_jmpbuf(png_ptr)))</div><div class='del'>-    {</div><div class='del'>-        png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='del'>-           (png_infopp)NULL);</div><div class='del'>-        return (ERROR);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* This one's new also.  Simply give it a chunk</div><div class='del'>-       of data from the file stream (in order, of</div><div class='del'>-       course).  On machines with segmented memory</div><div class='del'>-       models machines, don't give it any more than</div><div class='del'>-       64K.  The library seems to run fine with sizes</div><div class='del'>-       of 4K. Although you can give it much less if</div><div class='del'>-       necessary (I assume you can give it chunks of</div><div class='del'>-       1 byte, I haven't tried less then 256 bytes</div><div class='del'>-       yet).  When this function returns, you may</div><div class='del'>-       want to display any rows that were generated</div><div class='del'>-       in the row callback if you don't already do</div><div class='del'>-       so there.</div><div class='del'>-     */</div><div class='del'>-    png_process_data(png_ptr, info_ptr, buffer, length);</div><div class='del'>-    return 0;</div><div class='del'>- }</div><div class='del'>-</div><div class='del'>- /* This function is called (as set by</div><div class='del'>-    png_set_progressive_read_fn() above) when enough data</div><div class='del'>-    has been supplied so all of the header has been</div><div class='del'>-    read.</div><div class='del'>- */</div><div class='del'>- void</div><div class='del'>- info_callback(png_structp png_ptr, png_infop info)</div><div class='del'>- {</div><div class='del'>-    /* Do any setup here, including setting any of</div><div class='del'>-       the transformations mentioned in the Reading</div><div class='del'>-       PNG files section.  For now, you _must_ call</div><div class='del'>-       either png_start_read_image() or</div><div class='del'>-       png_read_update_info() after all the</div><div class='del'>-       transformations are set (even if you don't set</div><div class='del'>-       any).  You may start getting rows before</div><div class='del'>-       png_process_data() returns, so this is your</div><div class='del'>-       last chance to prepare for that.</div><div class='del'>-     */</div><div class='del'>- }</div><div class='del'>-</div><div class='del'>- /* This function is called when each row of image</div><div class='del'>-    data is complete */</div><div class='del'>- void</div><div class='del'>- row_callback(png_structp png_ptr, png_bytep new_row,</div><div class='del'>-    png_uint_32 row_num, int pass)</div><div class='del'>- {</div><div class='del'>-    /* If the image is interlaced, and you turned</div><div class='del'>-       on the interlace handler, this function will</div><div class='del'>-       be called for every row in every pass.  Some</div><div class='del'>-       of these rows will not be changed from the</div><div class='del'>-       previous pass.  When the row is not changed,</div><div class='del'>-       the new_row variable will be NULL.  The rows</div><div class='del'>-       and passes are called in order, so you don't</div><div class='del'>-       really need the row_num and pass, but I'm</div><div class='del'>-       supplying them because it may make your life</div><div class='del'>-       easier.</div><div class='del'>-</div><div class='del'>-       For the non-NULL rows of interlaced images,</div><div class='del'>-       you must call png_progressive_combine_row()</div><div class='del'>-       passing in the row and the old row.  You can</div><div class='del'>-       call this function for NULL rows (it will just</div><div class='del'>-       return) and for non-interlaced images (it just</div><div class='del'>-       does the memcpy for you) if it will make the</div><div class='del'>-       code easier.  Thus, you can just do this for</div><div class='del'>-       all cases:</div><div class='del'>-     */</div><div class='del'>-</div><div class='del'>-        png_progressive_combine_row(png_ptr, old_row,</div><div class='del'>-          new_row);</div><div class='del'>-</div><div class='del'>-    /* where old_row is what was displayed for</div><div class='del'>-       previously for the row.  Note that the first</div><div class='del'>-       pass (pass == 0, really) will completely cover</div><div class='del'>-       the old row, so the rows do not have to be</div><div class='del'>-       initialized.  After the first pass (and only</div><div class='del'>-       for interlaced images), you will have to pass</div><div class='del'>-       the current row, and the function will combine</div><div class='del'>-       the old row and the new row.</div><div class='del'>-    */</div><div class='del'>- }</div><div class='del'>-</div><div class='del'>- void</div><div class='del'>- end_callback(png_structp png_ptr, png_infop info)</div><div class='del'>- {</div><div class='del'>-    /* This function is called after the whole image</div><div class='del'>-       has been read, including any chunks after the</div><div class='del'>-       image (up to and including the IEND).  You</div><div class='del'>-       will usually have the same info chunk as you</div><div class='del'>-       had in the header, although some data may have</div><div class='del'>-       been added to the comments and time fields.</div><div class='del'>-</div><div class='del'>-       Most people won't do much here, perhaps setting</div><div class='del'>-       a flag that marks the image as finished.</div><div class='del'>-     */</div><div class='del'>- }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-IV. Writing</div><div class='del'>-</div><div class='del'>-Much of this is very similar to reading.  However, everything of</div><div class='del'>-importance is repeated here, so you won't have to constantly look</div><div class='del'>-back up in the reading section to understand writing.</div><div class='del'>-</div><div class='del'>-Setup</div><div class='del'>-</div><div class='del'>-You will want to do the I/O initialization before you get into libpng,</div><div class='del'>-so if it doesn't work, you don't have anything to undo. If you are not</div><div class='del'>-using the standard I/O functions, you will need to replace them with</div><div class='del'>-custom writing functions.  See the discussion under Customizing libpng.</div><div class='del'>-</div><div class='del'>-    FILE *fp = fopen(file_name, "wb");</div><div class='del'>-    if (!fp)</div><div class='del'>-    {</div><div class='del'>-       return (ERROR);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-Next, png_struct and png_info need to be allocated and initialized.</div><div class='del'>-As these can be both relatively large, you may not want to store these</div><div class='del'>-on the stack, unless you have stack space to spare.  Of course, you</div><div class='del'>-will want to check if they return NULL.  If you are also reading,</div><div class='del'>-you won't want to name your read structure and your write structure</div><div class='del'>-both "png_ptr"; you can call them anything you like, such as</div><div class='del'>-"read_ptr" and "write_ptr".  Look at pngtest.c, for example.</div><div class='del'>-</div><div class='del'>-    png_structp png_ptr = png_create_write_struct</div><div class='del'>-       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,</div><div class='del'>-        user_error_fn, user_warning_fn);</div><div class='del'>-    if (!png_ptr)</div><div class='del'>-       return (ERROR);</div><div class='del'>-</div><div class='del'>-    png_infop info_ptr = png_create_info_struct(png_ptr);</div><div class='del'>-    if (!info_ptr)</div><div class='del'>-    {</div><div class='del'>-       png_destroy_write_struct(&amp;png_ptr,</div><div class='del'>-         (png_infopp)NULL);</div><div class='del'>-       return (ERROR);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-If you want to use your own memory allocation routines,</div><div class='del'>-define PNG_USER_MEM_SUPPORTED and use</div><div class='del'>-png_create_write_struct_2() instead of png_create_write_struct():</div><div class='del'>-</div><div class='del'>-    png_structp png_ptr = png_create_write_struct_2</div><div class='del'>-       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,</div><div class='del'>-        user_error_fn, user_warning_fn, (png_voidp)</div><div class='del'>-        user_mem_ptr, user_malloc_fn, user_free_fn);</div><div class='del'>-</div><div class='del'>-After you have these structures, you will need to set up the</div><div class='del'>-error handling.  When libpng encounters an error, it expects to</div><div class='del'>-longjmp() back to your routine.  Therefore, you will need to call</div><div class='del'>-setjmp() and pass the png_jmpbuf(png_ptr).  If you</div><div class='del'>-write the file from different routines, you will need to update</div><div class='del'>-the png_jmpbuf(png_ptr) every time you enter a new routine that will</div><div class='del'>-call a png_*() function.  See your documentation of setjmp/longjmp</div><div class='del'>-for your compiler for more information on setjmp/longjmp.  See</div><div class='del'>-the discussion on libpng error handling in the Customizing Libpng</div><div class='del'>-section below for more information on the libpng error handling.</div><div class='del'>-</div><div class='del'>-    if (setjmp(png_jmpbuf(png_ptr)))</div><div class='del'>-    {</div><div class='del'>-       png_destroy_write_struct(&amp;png_ptr, &amp;info_ptr);</div><div class='del'>-       fclose(fp);</div><div class='del'>-       return (ERROR);</div><div class='del'>-    }</div><div class='del'>-    ...</div><div class='del'>-    return;</div><div class='del'>-</div><div class='del'>-If you would rather avoid the complexity of setjmp/longjmp issues,</div><div class='del'>-you can compile libpng with PNG_SETJMP_NOT_SUPPORTED, in which case</div><div class='del'>-errors will result in a call to PNG_ABORT() which defaults to abort().</div><div class='del'>-</div><div class='del'>-Now you need to set up the output code.  The default for libpng is to</div><div class='del'>-use the C function fwrite().  If you use this, you will need to pass a</div><div class='del'>-valid FILE * in the function png_init_io().  Be sure that the file is</div><div class='del'>-opened in binary mode.  Again, if you wish to handle writing data in</div><div class='del'>-another way, see the discussion on libpng I/O handling in the Customizing</div><div class='del'>-Libpng section below.</div><div class='del'>-</div><div class='del'>-    png_init_io(png_ptr, fp);</div><div class='del'>-</div><div class='del'>-If you are embedding your PNG into a datastream such as MNG, and don't</div><div class='del'>-want libpng to write the 8-byte signature, or if you have already</div><div class='del'>-written the signature in your application, use</div><div class='del'>-</div><div class='del'>-    png_set_sig_bytes(png_ptr, 8);</div><div class='del'>-</div><div class='del'>-to inform libpng that it should not write a signature.</div><div class='del'>-</div><div class='del'>-Write callbacks</div><div class='del'>-</div><div class='del'>-At this point, you can set up a callback function that will be</div><div class='del'>-called after each row has been written, which you can use to control</div><div class='del'>-a progress meter or the like.  It's demonstrated in pngtest.c.</div><div class='del'>-You must supply a function</div><div class='del'>-</div><div class='del'>-    void write_row_callback(png_ptr, png_uint_32 row,</div><div class='del'>-       int pass);</div><div class='del'>-    {</div><div class='del'>-      /* put your code here */</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-(You can give it another name that you like instead of "write_row_callback")</div><div class='del'>-</div><div class='del'>-To inform libpng about your function, use</div><div class='del'>-</div><div class='del'>-    png_set_write_status_fn(png_ptr, write_row_callback);</div><div class='del'>-</div><div class='del'>-You now have the option of modifying how the compression library will</div><div class='del'>-run.  The following functions are mainly for testing, but may be useful</div><div class='del'>-in some cases, like if you need to write PNG files extremely fast and</div><div class='del'>-are willing to give up some compression, or if you want to get the</div><div class='del'>-maximum possible compression at the expense of slower writing.  If you</div><div class='del'>-have no special needs in this area, let the library do what it wants by</div><div class='del'>-not calling this function at all, as it has been tuned to deliver a good</div><div class='del'>-speed/compression ratio. The second parameter to png_set_filter() is</div><div class='del'>-the filter method, for which the only valid values are 0 (as of the</div><div class='del'>-July 1999 PNG specification, version 1.2) or 64 (if you are writing</div><div class='del'>-a PNG datastream that is to be embedded in a MNG datastream).  The third</div><div class='del'>-parameter is a flag that indicates which filter type(s) are to be tested</div><div class='del'>-for each scanline.  See the PNG specification for details on the specific</div><div class='del'>-filter types.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    /* turn on or off filtering, and/or choose</div><div class='del'>-       specific filters.  You can use either a single</div><div class='del'>-       PNG_FILTER_VALUE_NAME or the bitwise OR of one</div><div class='del'>-       or more PNG_FILTER_NAME masks. */</div><div class='del'>-    png_set_filter(png_ptr, 0,</div><div class='del'>-       PNG_FILTER_NONE  | PNG_FILTER_VALUE_NONE |</div><div class='del'>-       PNG_FILTER_SUB   | PNG_FILTER_VALUE_SUB  |</div><div class='del'>-       PNG_FILTER_UP    | PNG_FILTER_VALUE_UP   |</div><div class='del'>-       PNG_FILTER_AVG   | PNG_FILTER_VALUE_AVG  |</div><div class='del'>-       PNG_FILTER_PAETH | PNG_FILTER_VALUE_PAETH|</div><div class='del'>-       PNG_ALL_FILTERS);</div><div class='del'>-</div><div class='del'>-If an application</div><div class='del'>-wants to start and stop using particular filters during compression,</div><div class='del'>-it should start out with all of the filters (to ensure that the previous</div><div class='del'>-row of pixels will be stored in case it's needed later), and then add</div><div class='del'>-and remove them after the start of compression.</div><div class='del'>-</div><div class='del'>-If you are writing a PNG datastream that is to be embedded in a MNG</div><div class='del'>-datastream, the second parameter can be either 0 or 64.</div><div class='del'>-</div><div class='del'>-The png_set_compression_*() functions interface to the zlib compression</div><div class='del'>-library, and should mostly be ignored unless you really know what you are</div><div class='del'>-doing.  The only generally useful call is png_set_compression_level()</div><div class='del'>-which changes how much time zlib spends on trying to compress the image</div><div class='del'>-data.  See the Compression Library (zlib.h and algorithm.txt, distributed</div><div class='del'>-with zlib) for details on the compression levels.</div><div class='del'>-</div><div class='del'>-    /* set the zlib compression level */</div><div class='del'>-    png_set_compression_level(png_ptr,</div><div class='del'>-        Z_BEST_COMPRESSION);</div><div class='del'>-</div><div class='del'>-    /* set other zlib parameters */</div><div class='del'>-    png_set_compression_mem_level(png_ptr, 8);</div><div class='del'>-    png_set_compression_strategy(png_ptr,</div><div class='del'>-        Z_DEFAULT_STRATEGY);</div><div class='del'>-    png_set_compression_window_bits(png_ptr, 15);</div><div class='del'>-    png_set_compression_method(png_ptr, 8);</div><div class='del'>-    png_set_compression_buffer_size(png_ptr, 8192)</div><div class='del'>-</div><div class='del'>-extern PNG_EXPORT(void,png_set_zbuf_size)</div><div class='del'>-</div><div class='del'>-Setting the contents of info for output</div><div class='del'>-</div><div class='del'>-You now need to fill in the png_info structure with all the data you</div><div class='del'>-wish to write before the actual image.  Note that the only thing you</div><div class='del'>-are allowed to write after the image is the text chunks and the time</div><div class='del'>-chunk (as of PNG Specification 1.2, anyway).  See png_write_end() and</div><div class='del'>-the latest PNG specification for more information on that.  If you</div><div class='del'>-wish to write them before the image, fill them in now, and flag that</div><div class='del'>-data as being valid.  If you want to wait until after the data, don't</div><div class='del'>-fill them until png_write_end().  For all the fields in png_info and</div><div class='del'>-their data types, see png.h.  For explanations of what the fields</div><div class='del'>-contain, see the PNG specification.</div><div class='del'>-</div><div class='del'>-Some of the more important parts of the png_info are:</div><div class='del'>-</div><div class='del'>-    png_set_IHDR(png_ptr, info_ptr, width, height,</div><div class='del'>-       bit_depth, color_type, interlace_type,</div><div class='del'>-       compression_type, filter_method)</div><div class='del'>-    width          - holds the width of the image</div><div class='del'>-                     in pixels (up to 2^31).</div><div class='del'>-    height         - holds the height of the image</div><div class='del'>-                     in pixels (up to 2^31).</div><div class='del'>-    bit_depth      - holds the bit depth of one of the</div><div class='del'>-                     image channels.</div><div class='del'>-                     (valid values are 1, 2, 4, 8, 16</div><div class='del'>-                     and depend also on the</div><div class='del'>-                     color_type.  See also significant</div><div class='del'>-                     bits (sBIT) below).</div><div class='del'>-    color_type     - describes which color/alpha</div><div class='del'>-                     channels are present.</div><div class='del'>-                     PNG_COLOR_TYPE_GRAY</div><div class='del'>-                        (bit depths 1, 2, 4, 8, 16)</div><div class='del'>-                     PNG_COLOR_TYPE_GRAY_ALPHA</div><div class='del'>-                        (bit depths 8, 16)</div><div class='del'>-                     PNG_COLOR_TYPE_PALETTE</div><div class='del'>-                        (bit depths 1, 2, 4, 8)</div><div class='del'>-                     PNG_COLOR_TYPE_RGB</div><div class='del'>-                        (bit_depths 8, 16)</div><div class='del'>-                     PNG_COLOR_TYPE_RGB_ALPHA</div><div class='del'>-                        (bit_depths 8, 16)</div><div class='del'>-</div><div class='del'>-                     PNG_COLOR_MASK_PALETTE</div><div class='del'>-                     PNG_COLOR_MASK_COLOR</div><div class='del'>-                     PNG_COLOR_MASK_ALPHA</div><div class='del'>-</div><div class='del'>-    interlace_type - PNG_INTERLACE_NONE or</div><div class='del'>-                     PNG_INTERLACE_ADAM7</div><div class='del'>-    compression_type - (must be</div><div class='del'>-                     PNG_COMPRESSION_TYPE_DEFAULT)</div><div class='del'>-    filter_method  - (must be PNG_FILTER_TYPE_DEFAULT</div><div class='del'>-                     or, if you are writing a PNG to</div><div class='del'>-                     be embedded in a MNG datastream,</div><div class='del'>-                     can also be</div><div class='del'>-                     PNG_INTRAPIXEL_DIFFERENCING)</div><div class='del'>-</div><div class='del'>-If you call png_set_IHDR(), the call must appear before any of the</div><div class='del'>-other png_set_*() functions, because they might require access to some of</div><div class='del'>-the IHDR settings.  The remaining png_set_*() functions can be called</div><div class='del'>-in any order.</div><div class='del'>-</div><div class='del'>-If you wish, you can reset the compression_type, interlace_type, or</div><div class='del'>-filter_method later by calling png_set_IHDR() again; if you do this, the</div><div class='del'>-width, height, bit_depth, and color_type must be the same in each call.</div><div class='del'>-</div><div class='del'>-    png_set_PLTE(png_ptr, info_ptr, palette,</div><div class='del'>-       num_palette);</div><div class='del'>-    palette        - the palette for the file</div><div class='del'>-                     (array of png_color)</div><div class='del'>-    num_palette    - number of entries in the palette</div><div class='del'>-</div><div class='del'>-    png_set_gAMA(png_ptr, info_ptr, gamma);</div><div class='del'>-    gamma          - the gamma the image was created</div><div class='del'>-                     at (PNG_INFO_gAMA)</div><div class='del'>-</div><div class='del'>-    png_set_sRGB(png_ptr, info_ptr, srgb_intent);</div><div class='del'>-    srgb_intent    - the rendering intent</div><div class='del'>-                     (PNG_INFO_sRGB) The presence of</div><div class='del'>-                     the sRGB chunk means that the pixel</div><div class='del'>-                     data is in the sRGB color space.</div><div class='del'>-                     This chunk also implies specific</div><div class='del'>-                     values of gAMA and cHRM.  Rendering</div><div class='del'>-                     intent is the CSS-1 property that</div><div class='del'>-                     has been defined by the International</div><div class='del'>-                     Color Consortium</div><div class='del'>-                     (http://www.color.org).</div><div class='del'>-                     It can be one of</div><div class='del'>-                     PNG_sRGB_INTENT_SATURATION,</div><div class='del'>-                     PNG_sRGB_INTENT_PERCEPTUAL,</div><div class='del'>-                     PNG_sRGB_INTENT_ABSOLUTE, or</div><div class='del'>-                     PNG_sRGB_INTENT_RELATIVE.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,</div><div class='del'>-       srgb_intent);</div><div class='del'>-    srgb_intent    - the rendering intent</div><div class='del'>-                     (PNG_INFO_sRGB) The presence of the</div><div class='del'>-                     sRGB chunk means that the pixel</div><div class='del'>-                     data is in the sRGB color space.</div><div class='del'>-                     This function also causes gAMA and</div><div class='del'>-                     cHRM chunks with the specific values</div><div class='del'>-                     that are consistent with sRGB to be</div><div class='del'>-                     written.</div><div class='del'>-</div><div class='del'>-    png_set_iCCP(png_ptr, info_ptr, name, compression_type,</div><div class='del'>-                      profile, proflen);</div><div class='del'>-    name            - The profile name.</div><div class='del'>-    compression     - The compression type; always</div><div class='del'>-                      PNG_COMPRESSION_TYPE_BASE for PNG 1.0.</div><div class='del'>-                      You may give NULL to this argument to</div><div class='del'>-                      ignore it.</div><div class='del'>-    profile         - International Color Consortium color</div><div class='del'>-                      profile data. May contain NULs.</div><div class='del'>-    proflen         - length of profile data in bytes.</div><div class='del'>-</div><div class='del'>-    png_set_sBIT(png_ptr, info_ptr, sig_bit);</div><div class='del'>-    sig_bit        - the number of significant bits for</div><div class='del'>-                     (PNG_INFO_sBIT) each of the gray, red,</div><div class='del'>-                     green, and blue channels, whichever are</div><div class='del'>-                     appropriate for the given color type</div><div class='del'>-                     (png_color_16)</div><div class='del'>-</div><div class='del'>-    png_set_tRNS(png_ptr, info_ptr, trans_alpha,</div><div class='del'>-       num_trans, trans_color);</div><div class='del'>-    trans_alpha    - array of alpha (transparency)</div><div class='del'>-                     entries for palette (PNG_INFO_tRNS)</div><div class='del'>-    trans_color    - graylevel or color sample values</div><div class='del'>-                     (in order red, green, blue) of the</div><div class='del'>-                     single transparent color for</div><div class='del'>-                     non-paletted images (PNG_INFO_tRNS)</div><div class='del'>-    num_trans      - number of transparent entries</div><div class='del'>-                     (PNG_INFO_tRNS)</div><div class='del'>-</div><div class='del'>-    png_set_hIST(png_ptr, info_ptr, hist);</div><div class='del'>-                    (PNG_INFO_hIST)</div><div class='del'>-    hist           - histogram of palette (array of</div><div class='del'>-                     png_uint_16)</div><div class='del'>-</div><div class='del'>-    png_set_tIME(png_ptr, info_ptr, mod_time);</div><div class='del'>-    mod_time       - time image was last modified</div><div class='del'>-                     (PNG_VALID_tIME)</div><div class='del'>-</div><div class='del'>-    png_set_bKGD(png_ptr, info_ptr, background);</div><div class='del'>-    background     - background color (PNG_VALID_bKGD)</div><div class='del'>-</div><div class='del'>-    png_set_text(png_ptr, info_ptr, text_ptr, num_text);</div><div class='del'>-    text_ptr       - array of png_text holding image</div><div class='del'>-                     comments</div><div class='del'>-    text_ptr[i].compression - type of compression used</div><div class='del'>-                 on "text" PNG_TEXT_COMPRESSION_NONE</div><div class='del'>-                           PNG_TEXT_COMPRESSION_zTXt</div><div class='del'>-                           PNG_ITXT_COMPRESSION_NONE</div><div class='del'>-                           PNG_ITXT_COMPRESSION_zTXt</div><div class='del'>-    text_ptr[i].key   - keyword for comment.  Must contain</div><div class='del'>-                 1-79 characters.</div><div class='del'>-    text_ptr[i].text  - text comments for current</div><div class='del'>-                         keyword.  Can be NULL or empty.</div><div class='del'>-    text_ptr[i].text_length - length of text string,</div><div class='del'>-                 after decompression, 0 for iTXt</div><div class='del'>-    text_ptr[i].itxt_length - length of itxt string,</div><div class='del'>-                 after decompression, 0 for tEXt/zTXt</div><div class='del'>-    text_ptr[i].lang  - language of comment (NULL or</div><div class='del'>-                         empty for unknown).</div><div class='del'>-    text_ptr[i].translated_keyword  - keyword in UTF-8 (NULL</div><div class='del'>-                         or empty for unknown).</div><div class='del'>-    Note that the itxt_length, lang, and lang_key</div><div class='del'>-    members of the text_ptr structure only exist</div><div class='del'>-    when the library is built with iTXt chunk support.</div><div class='del'>-</div><div class='del'>-    num_text       - number of comments</div><div class='del'>-</div><div class='del'>-    png_set_sPLT(png_ptr, info_ptr, &amp;palette_ptr,</div><div class='del'>-       num_spalettes);</div><div class='del'>-    palette_ptr    - array of png_sPLT_struct structures</div><div class='del'>-                     to be added to the list of palettes</div><div class='del'>-                     in the info structure.</div><div class='del'>-    num_spalettes  - number of palette structures to be</div><div class='del'>-                     added.</div><div class='del'>-</div><div class='del'>-    png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y,</div><div class='del'>-        unit_type);</div><div class='del'>-    offset_x  - positive offset from the left</div><div class='del'>-                     edge of the screen</div><div class='del'>-    offset_y  - positive offset from the top</div><div class='del'>-                     edge of the screen</div><div class='del'>-    unit_type - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER</div><div class='del'>-</div><div class='del'>-    png_set_pHYs(png_ptr, info_ptr, res_x, res_y,</div><div class='del'>-        unit_type);</div><div class='del'>-    res_x       - pixels/unit physical resolution</div><div class='del'>-                  in x direction</div><div class='del'>-    res_y       - pixels/unit physical resolution</div><div class='del'>-                  in y direction</div><div class='del'>-    unit_type   - PNG_RESOLUTION_UNKNOWN,</div><div class='del'>-                  PNG_RESOLUTION_METER</div><div class='del'>-</div><div class='del'>-    png_set_sCAL(png_ptr, info_ptr, unit, width, height)</div><div class='del'>-    unit        - physical scale units (an integer)</div><div class='del'>-    width       - width of a pixel in physical scale units</div><div class='del'>-    height      - height of a pixel in physical scale units</div><div class='del'>-                  (width and height are doubles)</div><div class='del'>-</div><div class='del'>-    png_set_sCAL_s(png_ptr, info_ptr, unit, width, height)</div><div class='del'>-    unit        - physical scale units (an integer)</div><div class='del'>-    width       - width of a pixel in physical scale units</div><div class='del'>-    height      - height of a pixel in physical scale units</div><div class='del'>-                 (width and height are strings like "2.54")</div><div class='del'>-</div><div class='del'>-    png_set_unknown_chunks(png_ptr, info_ptr, &amp;unknowns,</div><div class='del'>-       num_unknowns)</div><div class='del'>-    unknowns          - array of png_unknown_chunk</div><div class='del'>-                        structures holding unknown chunks</div><div class='del'>-    unknowns[i].name  - name of unknown chunk</div><div class='del'>-    unknowns[i].data  - data of unknown chunk</div><div class='del'>-    unknowns[i].size  - size of unknown chunk's data</div><div class='del'>-    unknowns[i].location - position to write chunk in file</div><div class='del'>-                           0: do not write chunk</div><div class='del'>-                           PNG_HAVE_IHDR: before PLTE</div><div class='del'>-                           PNG_HAVE_PLTE: before IDAT</div><div class='del'>-                           PNG_AFTER_IDAT: after IDAT</div><div class='del'>-</div><div class='del'>-The "location" member is set automatically according to</div><div class='del'>-what part of the output file has already been written.</div><div class='del'>-You can change its value after calling png_set_unknown_chunks()</div><div class='del'>-as demonstrated in pngtest.c.  Within each of the "locations",</div><div class='del'>-the chunks are sequenced according to their position in the</div><div class='del'>-structure (that is, the value of "i", which is the order in which</div><div class='del'>-the chunk was either read from the input file or defined with</div><div class='del'>-png_set_unknown_chunks).</div><div class='del'>-</div><div class='del'>-A quick word about text and num_text.  text is an array of png_text</div><div class='del'>-structures.  num_text is the number of valid structures in the array.</div><div class='del'>-Each png_text structure holds a language code, a keyword, a text value,</div><div class='del'>-and a compression type.</div><div class='del'>-</div><div class='del'>-The compression types have the same valid numbers as the compression</div><div class='del'>-types of the image data.  Currently, the only valid number is zero.</div><div class='del'>-However, you can store text either compressed or uncompressed, unlike</div><div class='del'>-images, which always have to be compressed.  So if you don't want the</div><div class='del'>-text compressed, set the compression type to PNG_TEXT_COMPRESSION_NONE.</div><div class='del'>-Because tEXt and zTXt chunks don't have a language field, if you</div><div class='del'>-specify PNG_TEXT_COMPRESSION_NONE or PNG_TEXT_COMPRESSION_zTXt</div><div class='del'>-any language code or translated keyword will not be written out.</div><div class='del'>-</div><div class='del'>-Until text gets around 1000 bytes, it is not worth compressing it.</div><div class='del'>-After the text has been written out to the file, the compression type</div><div class='del'>-is set to PNG_TEXT_COMPRESSION_NONE_WR or PNG_TEXT_COMPRESSION_zTXt_WR,</div><div class='del'>-so that it isn't written out again at the end (in case you are calling</div><div class='del'>-png_write_end() with the same struct.</div><div class='del'>-</div><div class='del'>-The keywords that are given in the PNG Specification are:</div><div class='del'>-</div><div class='del'>-    Title            Short (one line) title or</div><div class='del'>-                     caption for image</div><div class='del'>-    Author           Name of image's creator</div><div class='del'>-    Description      Description of image (possibly long)</div><div class='del'>-    Copyright        Copyright notice</div><div class='del'>-    Creation Time    Time of original image creation</div><div class='del'>-                     (usually RFC 1123 format, see below)</div><div class='del'>-    Software         Software used to create the image</div><div class='del'>-    Disclaimer       Legal disclaimer</div><div class='del'>-    Warning          Warning of nature of content</div><div class='del'>-    Source           Device used to create the image</div><div class='del'>-    Comment          Miscellaneous comment; conversion</div><div class='del'>-                     from other image format</div><div class='del'>-</div><div class='del'>-The keyword-text pairs work like this.  Keywords should be short</div><div class='del'>-simple descriptions of what the comment is about.  Some typical</div><div class='del'>-keywords are found in the PNG specification, as is some recommendations</div><div class='del'>-on keywords.  You can repeat keywords in a file.  You can even write</div><div class='del'>-some text before the image and some after.  For example, you may want</div><div class='del'>-to put a description of the image before the image, but leave the</div><div class='del'>-disclaimer until after, so viewers working over modem connections</div><div class='del'>-don't have to wait for the disclaimer to go over the modem before</div><div class='del'>-they start seeing the image.  Finally, keywords should be full</div><div class='del'>-words, not abbreviations.  Keywords and text are in the ISO 8859-1</div><div class='del'>-(Latin-1) character set (a superset of regular ASCII) and can not</div><div class='del'>-contain NUL characters, and should not contain control or other</div><div class='del'>-unprintable characters.  To make the comments widely readable, stick</div><div class='del'>-with basic ASCII, and avoid machine specific character set extensions</div><div class='del'>-like the IBM-PC character set.  The keyword must be present, but</div><div class='del'>-you can leave off the text string on non-compressed pairs.</div><div class='del'>-Compressed pairs must have a text string, as only the text string</div><div class='del'>-is compressed anyway, so the compression would be meaningless.</div><div class='del'>-</div><div class='del'>-PNG supports modification time via the png_time structure.  Two</div><div class='del'>-conversion routines are provided, png_convert_from_time_t() for</div><div class='del'>-time_t and png_convert_from_struct_tm() for struct tm.  The</div><div class='del'>-time_t routine uses gmtime().  You don't have to use either of</div><div class='del'>-these, but if you wish to fill in the png_time structure directly,</div><div class='del'>-you should provide the time in universal time (GMT) if possible</div><div class='del'>-instead of your local time.  Note that the year number is the full</div><div class='del'>-year (e.g. 1998, rather than 98 - PNG is year 2000 compliant!), and</div><div class='del'>-that months start with 1.</div><div class='del'>-</div><div class='del'>-If you want to store the time of the original image creation, you should</div><div class='del'>-use a plain tEXt chunk with the "Creation Time" keyword.  This is</div><div class='del'>-necessary because the "creation time" of a PNG image is somewhat vague,</div><div class='del'>-depending on whether you mean the PNG file, the time the image was</div><div class='del'>-created in a non-PNG format, a still photo from which the image was</div><div class='del'>-scanned, or possibly the subject matter itself.  In order to facilitate</div><div class='del'>-machine-readable dates, it is recommended that the "Creation Time"</div><div class='del'>-tEXt chunk use RFC 1123 format dates (e.g. "22 May 1997 18:07:10 GMT"),</div><div class='del'>-although this isn't a requirement.  Unlike the tIME chunk, the</div><div class='del'>-"Creation Time" tEXt chunk is not expected to be automatically changed</div><div class='del'>-by the software.  To facilitate the use of RFC 1123 dates, a function</div><div class='del'>-png_convert_to_rfc1123(png_timep) is provided to convert from PNG</div><div class='del'>-time to an RFC 1123 format string.</div><div class='del'>-</div><div class='del'>-Writing unknown chunks</div><div class='del'>-</div><div class='del'>-You can use the png_set_unknown_chunks function to queue up chunks</div><div class='del'>-for writing.  You give it a chunk name, raw data, and a size; that's</div><div class='del'>-all there is to it.  The chunks will be written by the next following</div><div class='del'>-png_write_info_before_PLTE, png_write_info, or png_write_end function.</div><div class='del'>-Any chunks previously read into the info structure's unknown-chunk</div><div class='del'>-list will also be written out in a sequence that satisfies the PNG</div><div class='del'>-specification's ordering rules.</div><div class='del'>-</div><div class='del'>-The high-level write interface</div><div class='del'>-</div><div class='del'>-At this point there are two ways to proceed; through the high-level</div><div class='del'>-write interface, or through a sequence of low-level write operations.</div><div class='del'>-You can use the high-level interface if your image data is present</div><div class='del'>-in the info structure.  All defined output</div><div class='del'>-transformations are permitted, enabled by the following masks.</div><div class='del'>-</div><div class='del'>-    PNG_TRANSFORM_IDENTITY      No transformation</div><div class='del'>-    PNG_TRANSFORM_PACKING       Pack 1, 2 and 4-bit samples</div><div class='del'>-    PNG_TRANSFORM_PACKSWAP      Change order of packed</div><div class='del'>-                                pixels to LSB first</div><div class='del'>-    PNG_TRANSFORM_INVERT_MONO   Invert monochrome images</div><div class='del'>-    PNG_TRANSFORM_SHIFT         Normalize pixels to the</div><div class='del'>-                                sBIT depth</div><div class='del'>-    PNG_TRANSFORM_BGR           Flip RGB to BGR, RGBA</div><div class='del'>-                                to BGRA</div><div class='del'>-    PNG_TRANSFORM_SWAP_ALPHA    Flip RGBA to ARGB or GA</div><div class='del'>-                                to AG</div><div class='del'>-    PNG_TRANSFORM_INVERT_ALPHA  Change alpha from opacity</div><div class='del'>-                                to transparency</div><div class='del'>-    PNG_TRANSFORM_SWAP_ENDIAN   Byte-swap 16-bit samples</div><div class='del'>-    PNG_TRANSFORM_STRIP_FILLER        Strip out filler</div><div class='del'>-                                      bytes (deprecated).</div><div class='del'>-    PNG_TRANSFORM_STRIP_FILLER_BEFORE Strip out leading</div><div class='del'>-                                      filler bytes</div><div class='del'>-    PNG_TRANSFORM_STRIP_FILLER_AFTER  Strip out trailing</div><div class='del'>-                                      filler bytes</div><div class='del'>-</div><div class='del'>-If you have valid image data in the info structure (you can use</div><div class='del'>-png_set_rows() to put image data in the info structure), simply do this:</div><div class='del'>-</div><div class='del'>-    png_write_png(png_ptr, info_ptr, png_transforms, NULL)</div><div class='del'>-</div><div class='del'>-where png_transforms is an integer containing the bitwise OR of some set of</div><div class='del'>-transformation flags.  This call is equivalent to png_write_info(),</div><div class='del'>-followed the set of transformations indicated by the transform mask,</div><div class='del'>-then png_write_image(), and finally png_write_end().</div><div class='del'>-</div><div class='del'>-(The final parameter of this call is not yet used.  Someday it might point</div><div class='del'>-to transformation parameters required by some future output transform.)</div><div class='del'>-</div><div class='del'>-You must use png_transforms and not call any png_set_transform() functions</div><div class='del'>-when you use png_write_png().</div><div class='del'>-</div><div class='del'>-The low-level write interface</div><div class='del'>-</div><div class='del'>-If you are going the low-level route instead, you are now ready to</div><div class='del'>-write all the file information up to the actual image data.  You do</div><div class='del'>-this with a call to png_write_info().</div><div class='del'>-</div><div class='del'>-    png_write_info(png_ptr, info_ptr);</div><div class='del'>-</div><div class='del'>-Note that there is one transformation you may need to do before</div><div class='del'>-png_write_info().  In PNG files, the alpha channel in an image is the</div><div class='del'>-level of opacity.  If your data is supplied as a level of transparency,</div><div class='del'>-you can invert the alpha channel before you write it, so that 0 is</div><div class='del'>-fully transparent and 255 (in 8-bit or paletted images) or 65535</div><div class='del'>-(in 16-bit images) is fully opaque, with</div><div class='del'>-</div><div class='del'>-    png_set_invert_alpha(png_ptr);</div><div class='del'>-</div><div class='del'>-This must appear before png_write_info() instead of later with the</div><div class='del'>-other transformations because in the case of paletted images the tRNS</div><div class='del'>-chunk data has to be inverted before the tRNS chunk is written.  If</div><div class='del'>-your image is not a paletted image, the tRNS data (which in such cases</div><div class='del'>-represents a single color to be rendered as transparent) won't need to</div><div class='del'>-be changed, and you can safely do this transformation after your</div><div class='del'>-png_write_info() call.</div><div class='del'>-</div><div class='del'>-If you need to write a private chunk that you want to appear before</div><div class='del'>-the PLTE chunk when PLTE is present, you can write the PNG info in</div><div class='del'>-two steps, and insert code to write your own chunk between them:</div><div class='del'>-</div><div class='del'>-    png_write_info_before_PLTE(png_ptr, info_ptr);</div><div class='del'>-    png_set_unknown_chunks(png_ptr, info_ptr, ...);</div><div class='del'>-    png_write_info(png_ptr, info_ptr);</div><div class='del'>-</div><div class='del'>-After you've written the file information, you can set up the library</div><div class='del'>-to handle any special transformations of the image data.  The various</div><div class='del'>-ways to transform the data will be described in the order that they</div><div class='del'>-should occur.  This is important, as some of these change the color</div><div class='del'>-type and/or bit depth of the data, and some others only work on</div><div class='del'>-certain color types and bit depths.  Even though each transformation</div><div class='del'>-checks to see if it has data that it can do something with, you should</div><div class='del'>-make sure to only enable a transformation if it will be valid for the</div><div class='del'>-data.  For example, don't swap red and blue on grayscale data.</div><div class='del'>-</div><div class='del'>-PNG files store RGB pixels packed into 3 or 6 bytes.  This code tells</div><div class='del'>-the library to strip input data that has 4 or 8 bytes per pixel down</div><div class='del'>-to 3 or 6 bytes (or strip 2 or 4-byte grayscale+filler data to 1 or 2</div><div class='del'>-bytes per pixel).</div><div class='del'>-</div><div class='del'>-    png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);</div><div class='del'>-</div><div class='del'>-where the 0 is unused, and the location is either PNG_FILLER_BEFORE or</div><div class='del'>-PNG_FILLER_AFTER, depending upon whether the filler byte in the pixel</div><div class='del'>-is stored XRGB or RGBX.</div><div class='del'>-</div><div class='del'>-PNG files pack pixels of bit depths 1, 2, and 4 into bytes as small as</div><div class='del'>-they can, resulting in, for example, 8 pixels per byte for 1 bit files.</div><div class='del'>-If the data is supplied at 1 pixel per byte, use this code, which will</div><div class='del'>-correctly pack the pixels into a single byte:</div><div class='del'>-</div><div class='del'>-    png_set_packing(png_ptr);</div><div class='del'>-</div><div class='del'>-PNG files reduce possible bit depths to 1, 2, 4, 8, and 16.  If your</div><div class='del'>-data is of another bit depth, you can write an sBIT chunk into the</div><div class='del'>-file so that decoders can recover the original data if desired.</div><div class='del'>-</div><div class='del'>-    /* Set the true bit depth of the image data */</div><div class='del'>-    if (color_type &amp; PNG_COLOR_MASK_COLOR)</div><div class='del'>-    {</div><div class='del'>-        sig_bit.red = true_bit_depth;</div><div class='del'>-        sig_bit.green = true_bit_depth;</div><div class='del'>-        sig_bit.blue = true_bit_depth;</div><div class='del'>-    }</div><div class='del'>-    else</div><div class='del'>-    {</div><div class='del'>-        sig_bit.gray = true_bit_depth;</div><div class='del'>-    }</div><div class='del'>-    if (color_type &amp; PNG_COLOR_MASK_ALPHA)</div><div class='del'>-    {</div><div class='del'>-        sig_bit.alpha = true_bit_depth;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    png_set_sBIT(png_ptr, info_ptr, &amp;sig_bit);</div><div class='del'>-</div><div class='del'>-If the data is stored in the row buffer in a bit depth other than</div><div class='del'>-one supported by PNG (e.g. 3 bit data in the range 0-7 for a 4-bit PNG),</div><div class='del'>-this will scale the values to appear to be the correct bit depth as</div><div class='del'>-is required by PNG.</div><div class='del'>-</div><div class='del'>-    png_set_shift(png_ptr, &amp;sig_bit);</div><div class='del'>-</div><div class='del'>-PNG files store 16 bit pixels in network byte order (big-endian,</div><div class='del'>-ie. most significant bits first).  This code would be used if they are</div><div class='del'>-supplied the other way (little-endian, i.e. least significant bits</div><div class='del'>-first, the way PCs store them):</div><div class='del'>-</div><div class='del'>-    if (bit_depth &gt; 8)</div><div class='del'>-       png_set_swap(png_ptr);</div><div class='del'>-</div><div class='del'>-If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you</div><div class='del'>-need to change the order the pixels are packed into bytes, you can use:</div><div class='del'>-</div><div class='del'>-    if (bit_depth &lt; 8)</div><div class='del'>-       png_set_packswap(png_ptr);</div><div class='del'>-</div><div class='del'>-PNG files store 3 color pixels in red, green, blue order.  This code</div><div class='del'>-would be used if they are supplied as blue, green, red:</div><div class='del'>-</div><div class='del'>-    png_set_bgr(png_ptr);</div><div class='del'>-</div><div class='del'>-PNG files describe monochrome as black being zero and white being</div><div class='del'>-one. This code would be used if the pixels are supplied with this reversed</div><div class='del'>-(black being one and white being zero):</div><div class='del'>-</div><div class='del'>-    png_set_invert_mono(png_ptr);</div><div class='del'>-</div><div class='del'>-Finally, you can write your own transformation function if none of</div><div class='del'>-the existing ones meets your needs.  This is done by setting a callback</div><div class='del'>-with</div><div class='del'>-</div><div class='del'>-    png_set_write_user_transform_fn(png_ptr,</div><div class='del'>-       write_transform_fn);</div><div class='del'>-</div><div class='del'>-You must supply the function</div><div class='del'>-</div><div class='del'>-    void write_transform_fn(png_ptr ptr, row_info_ptr</div><div class='del'>-       row_info, png_bytep data)</div><div class='del'>-</div><div class='del'>-See pngtest.c for a working example.  Your function will be called</div><div class='del'>-before any of the other transformations are processed.</div><div class='del'>-</div><div class='del'>-You can also set up a pointer to a user structure for use by your</div><div class='del'>-callback function.</div><div class='del'>-</div><div class='del'>-    png_set_user_transform_info(png_ptr, user_ptr, 0, 0);</div><div class='del'>-</div><div class='del'>-The user_channels and user_depth parameters of this function are ignored</div><div class='del'>-when writing; you can set them to zero as shown.</div><div class='del'>-</div><div class='del'>-You can retrieve the pointer via the function png_get_user_transform_ptr().</div><div class='del'>-For example:</div><div class='del'>-</div><div class='del'>-    voidp write_user_transform_ptr =</div><div class='del'>-       png_get_user_transform_ptr(png_ptr);</div><div class='del'>-</div><div class='del'>-It is possible to have libpng flush any pending output, either manually,</div><div class='del'>-or automatically after a certain number of lines have been written.  To</div><div class='del'>-flush the output stream a single time call:</div><div class='del'>-</div><div class='del'>-    png_write_flush(png_ptr);</div><div class='del'>-</div><div class='del'>-and to have libpng flush the output stream periodically after a certain</div><div class='del'>-number of scanlines have been written, call:</div><div class='del'>-</div><div class='del'>-    png_set_flush(png_ptr, nrows);</div><div class='del'>-</div><div class='del'>-Note that the distance between rows is from the last time png_write_flush()</div><div class='del'>-was called, or the first row of the image if it has never been called.</div><div class='del'>-So if you write 50 lines, and then png_set_flush 25, it will flush the</div><div class='del'>-output on the next scanline, and every 25 lines thereafter, unless</div><div class='del'>-png_write_flush() is called before 25 more lines have been written.</div><div class='del'>-If nrows is too small (less than about 10 lines for a 640 pixel wide</div><div class='del'>-RGB image) the image compression may decrease noticeably (although this</div><div class='del'>-may be acceptable for real-time applications).  Infrequent flushing will</div><div class='del'>-only degrade the compression performance by a few percent over images</div><div class='del'>-that do not use flushing.</div><div class='del'>-</div><div class='del'>-Writing the image data</div><div class='del'>-</div><div class='del'>-That's it for the transformations.  Now you can write the image data.</div><div class='del'>-The simplest way to do this is in one function call.  If you have the</div><div class='del'>-whole image in memory, you can just call png_write_image() and libpng</div><div class='del'>-will write the image.  You will need to pass in an array of pointers to</div><div class='del'>-each row.  This function automatically handles interlacing, so you don't</div><div class='del'>-need to call png_set_interlace_handling() or call this function multiple</div><div class='del'>-times, or any of that other stuff necessary with png_write_rows().</div><div class='del'>-</div><div class='del'>-    png_write_image(png_ptr, row_pointers);</div><div class='del'>-</div><div class='del'>-where row_pointers is:</div><div class='del'>-</div><div class='del'>-    png_byte *row_pointers[height];</div><div class='del'>-</div><div class='del'>-You can point to void or char or whatever you use for pixels.</div><div class='del'>-</div><div class='del'>-If you don't want to write the whole image at once, you can</div><div class='del'>-use png_write_rows() instead.  If the file is not interlaced,</div><div class='del'>-this is simple:</div><div class='del'>-</div><div class='del'>-    png_write_rows(png_ptr, row_pointers,</div><div class='del'>-       number_of_rows);</div><div class='del'>-</div><div class='del'>-row_pointers is the same as in the png_write_image() call.</div><div class='del'>-</div><div class='del'>-If you are just writing one row at a time, you can do this with</div><div class='del'>-a single row_pointer instead of an array of row_pointers:</div><div class='del'>-</div><div class='del'>-    png_bytep row_pointer = row;</div><div class='del'>-</div><div class='del'>-    png_write_row(png_ptr, row_pointer);</div><div class='del'>-</div><div class='del'>-When the file is interlaced, things can get a good deal more complicated.</div><div class='del'>-The only currently (as of the PNG Specification version 1.2, dated July</div><div class='del'>-1999) defined interlacing scheme for PNG files is the "Adam7" interlace</div><div class='del'>-scheme, that breaks down an image into seven smaller images of varying</div><div class='del'>-size.  libpng will build these images for you, or you can do them</div><div class='del'>-yourself.  If you want to build them yourself, see the PNG specification</div><div class='del'>-for details of which pixels to write when.</div><div class='del'>-</div><div class='del'>-If you don't want libpng to handle the interlacing details, just</div><div class='del'>-use png_set_interlace_handling() and call png_write_rows() the</div><div class='del'>-correct number of times to write all seven sub-images.</div><div class='del'>-</div><div class='del'>-If you want libpng to build the sub-images, call this before you start</div><div class='del'>-writing any rows:</div><div class='del'>-</div><div class='del'>-    number_of_passes =</div><div class='del'>-       png_set_interlace_handling(png_ptr);</div><div class='del'>-</div><div class='del'>-This will return the number of passes needed.  Currently, this is seven,</div><div class='del'>-but may change if another interlace type is added.</div><div class='del'>-</div><div class='del'>-Then write the complete image number_of_passes times.</div><div class='del'>-</div><div class='del'>-    png_write_rows(png_ptr, row_pointers,</div><div class='del'>-       number_of_rows);</div><div class='del'>-</div><div class='del'>-As some of these rows are not used, and thus return immediately, you may</div><div class='del'>-want to read about interlacing in the PNG specification, and only update</div><div class='del'>-the rows that are actually used.</div><div class='del'>-</div><div class='del'>-Finishing a sequential write</div><div class='del'>-</div><div class='del'>-After you are finished writing the image, you should finish writing</div><div class='del'>-the file.  If you are interested in writing comments or time, you should</div><div class='del'>-pass an appropriately filled png_info pointer.  If you are not interested,</div><div class='del'>-you can pass NULL.</div><div class='del'>-</div><div class='del'>-    png_write_end(png_ptr, info_ptr);</div><div class='del'>-</div><div class='del'>-When you are done, you can free all memory used by libpng like this:</div><div class='del'>-</div><div class='del'>-    png_destroy_write_struct(&amp;png_ptr, &amp;info_ptr);</div><div class='del'>-</div><div class='del'>-It is also possible to individually free the info_ptr members that</div><div class='del'>-point to libpng-allocated storage with the following function:</div><div class='del'>-</div><div class='del'>-    png_free_data(png_ptr, info_ptr, mask, seq)</div><div class='del'>-    mask  - identifies data to be freed, a mask</div><div class='del'>-            containing the bitwise OR of one or</div><div class='del'>-            more of</div><div class='del'>-              PNG_FREE_PLTE, PNG_FREE_TRNS,</div><div class='del'>-              PNG_FREE_HIST, PNG_FREE_ICCP,</div><div class='del'>-              PNG_FREE_PCAL, PNG_FREE_ROWS,</div><div class='del'>-              PNG_FREE_SCAL, PNG_FREE_SPLT,</div><div class='del'>-              PNG_FREE_TEXT, PNG_FREE_UNKN,</div><div class='del'>-            or simply PNG_FREE_ALL</div><div class='del'>-    seq   - sequence number of item to be freed</div><div class='del'>-            (-1 for all items)</div><div class='del'>-</div><div class='del'>-This function may be safely called when the relevant storage has</div><div class='del'>-already been freed, or has not yet been allocated, or was allocated</div><div class='del'>-by the user  and not by libpng,  and will in those cases do nothing.</div><div class='del'>-The "seq" parameter is ignored if only one item of the selected data</div><div class='del'>-type, such as PLTE, is allowed.  If "seq" is not -1, and multiple items</div><div class='del'>-are allowed for the data type identified in the mask, such as text or</div><div class='del'>-sPLT, only the n'th item in the structure is freed, where n is "seq".</div><div class='del'>-</div><div class='del'>-If you allocated data such as a palette that you passed in to libpng</div><div class='del'>-with png_set_*, you must not free it until just before the call to</div><div class='del'>-png_destroy_write_struct().</div><div class='del'>-</div><div class='del'>-The default behavior is only to free data that was allocated internally</div><div class='del'>-by libpng.  This can be changed, so that libpng will not free the data,</div><div class='del'>-or so that it will free data that was allocated by the user with png_malloc()</div><div class='del'>-or png_zalloc() and passed in via a png_set_*() function, with</div><div class='del'>-</div><div class='del'>-    png_data_freer(png_ptr, info_ptr, freer, mask)</div><div class='del'>-    mask   - which data elements are affected</div><div class='del'>-             same choices as in png_free_data()</div><div class='del'>-    freer  - one of</div><div class='del'>-               PNG_DESTROY_WILL_FREE_DATA</div><div class='del'>-               PNG_SET_WILL_FREE_DATA</div><div class='del'>-               PNG_USER_WILL_FREE_DATA</div><div class='del'>-</div><div class='del'>-For example, to transfer responsibility for some data from a read structure</div><div class='del'>-to a write structure, you could use</div><div class='del'>-</div><div class='del'>-    png_data_freer(read_ptr, read_info_ptr,</div><div class='del'>-       PNG_USER_WILL_FREE_DATA,</div><div class='del'>-       PNG_FREE_PLTE|PNG_FREE_tRNS|PNG_FREE_hIST)</div><div class='del'>-    png_data_freer(write_ptr, write_info_ptr,</div><div class='del'>-       PNG_DESTROY_WILL_FREE_DATA,</div><div class='del'>-       PNG_FREE_PLTE|PNG_FREE_tRNS|PNG_FREE_hIST)</div><div class='del'>-</div><div class='del'>-thereby briefly reassigning responsibility for freeing to the user but</div><div class='del'>-immediately afterwards reassigning it once more to the write_destroy</div><div class='del'>-function.  Having done this, it would then be safe to destroy the read</div><div class='del'>-structure and continue to use the PLTE, tRNS, and hIST data in the write</div><div class='del'>-structure.</div><div class='del'>-</div><div class='del'>-This function only affects data that has already been allocated.</div><div class='del'>-You can call this function before calling after the png_set_*() functions</div><div class='del'>-to control whether the user or png_destroy_*() is supposed to free the data.</div><div class='del'>-When the user assumes responsibility for libpng-allocated data, the</div><div class='del'>-application must use</div><div class='del'>-png_free() to free it, and when the user transfers responsibility to libpng</div><div class='del'>-for data that the user has allocated, the user must have used png_malloc()</div><div class='del'>-or png_zalloc() to allocate it.</div><div class='del'>-</div><div class='del'>-If you allocated text_ptr.text, text_ptr.lang, and text_ptr.translated_keyword</div><div class='del'>-separately, do not transfer responsibility for freeing text_ptr to libpng,</div><div class='del'>-because when libpng fills a png_text structure it combines these members with</div><div class='del'>-the key member, and png_free_data() will free only text_ptr.key.  Similarly,</div><div class='del'>-if you transfer responsibility for free'ing text_ptr from libpng to your</div><div class='del'>-application, your application must not separately free those members.</div><div class='del'>-For a more compact example of writing a PNG image, see the file example.c.</div><div class='del'>-</div><div class='del'>-V. Modifying/Customizing libpng:</div><div class='del'>-</div><div class='del'>-There are two issues here.  The first is changing how libpng does</div><div class='del'>-standard things like memory allocation, input/output, and error handling.</div><div class='del'>-The second deals with more complicated things like adding new chunks,</div><div class='del'>-adding new transformations, and generally changing how libpng works.</div><div class='del'>-Both of those are compile-time issues; that is, they are generally</div><div class='del'>-determined at the time the code is written, and there is rarely a need</div><div class='del'>-to provide the user with a means of changing them.</div><div class='del'>-</div><div class='del'>-Memory allocation, input/output, and error handling</div><div class='del'>-</div><div class='del'>-All of the memory allocation, input/output, and error handling in libpng</div><div class='del'>-goes through callbacks that are user-settable.  The default routines are</div><div class='del'>-in pngmem.c, pngrio.c, pngwio.c, and pngerror.c, respectively.  To change</div><div class='del'>-these functions, call the appropriate png_set_*_fn() function.</div><div class='del'>-</div><div class='del'>-Memory allocation is done through the functions png_malloc(), png_calloc(),</div><div class='del'>-and png_free().  These currently just call the standard C functions.</div><div class='del'>-png_calloc() calls png_malloc() and then png_memset() to clear the newly</div><div class='del'>-allocated memory to zero.  If your pointers can't access more then 64K</div><div class='del'>-at a time, you will want to set MAXSEG_64K in zlib.h.  Since it is</div><div class='del'>-unlikely that the method of handling memory allocation on a platform</div><div class='del'>-will change between applications, these functions must be modified in</div><div class='del'>-the library at compile time.  If you prefer to use a different method</div><div class='del'>-of allocating and freeing data, you can use png_create_read_struct_2() or</div><div class='del'>-png_create_write_struct_2() to register your own functions as described</div><div class='del'>-above.  These functions also provide a void pointer that can be retrieved</div><div class='del'>-via</div><div class='del'>-</div><div class='del'>-    mem_ptr=png_get_mem_ptr(png_ptr);</div><div class='del'>-</div><div class='del'>-Your replacement memory functions must have prototypes as follows:</div><div class='del'>-</div><div class='del'>-    png_voidp malloc_fn(png_structp png_ptr,</div><div class='del'>-       png_size_t size);</div><div class='del'>-    void free_fn(png_structp png_ptr, png_voidp ptr);</div><div class='del'>-</div><div class='del'>-Your malloc_fn() must return NULL in case of failure.  The png_malloc()</div><div class='del'>-function will normally call png_error() if it receives a NULL from the</div><div class='del'>-system memory allocator or from your replacement malloc_fn().</div><div class='del'>-</div><div class='del'>-Your free_fn() will never be called with a NULL ptr, since libpng's</div><div class='del'>-png_free() checks for NULL before calling free_fn().</div><div class='del'>-</div><div class='del'>-Input/Output in libpng is done through png_read() and png_write(),</div><div class='del'>-which currently just call fread() and fwrite().  The FILE * is stored in</div><div class='del'>-png_struct and is initialized via png_init_io().  If you wish to change</div><div class='del'>-the method of I/O, the library supplies callbacks that you can set</div><div class='del'>-through the function png_set_read_fn() and png_set_write_fn() at run</div><div class='del'>-time, instead of calling the png_init_io() function.  These functions</div><div class='del'>-also provide a void pointer that can be retrieved via the function</div><div class='del'>-png_get_io_ptr().  For example:</div><div class='del'>-</div><div class='del'>-    png_set_read_fn(png_structp read_ptr,</div><div class='del'>-        voidp read_io_ptr, png_rw_ptr read_data_fn)</div><div class='del'>-</div><div class='del'>-    png_set_write_fn(png_structp write_ptr,</div><div class='del'>-        voidp write_io_ptr, png_rw_ptr write_data_fn,</div><div class='del'>-        png_flush_ptr output_flush_fn);</div><div class='del'>-</div><div class='del'>-    voidp read_io_ptr = png_get_io_ptr(read_ptr);</div><div class='del'>-    voidp write_io_ptr = png_get_io_ptr(write_ptr);</div><div class='del'>-</div><div class='del'>-The replacement I/O functions must have prototypes as follows:</div><div class='del'>-</div><div class='del'>-    void user_read_data(png_structp png_ptr,</div><div class='del'>-        png_bytep data, png_size_t length);</div><div class='del'>-    void user_write_data(png_structp png_ptr,</div><div class='del'>-        png_bytep data, png_size_t length);</div><div class='del'>-    void user_flush_data(png_structp png_ptr);</div><div class='del'>-</div><div class='del'>-The user_read_data() function is responsible for detecting and</div><div class='del'>-handling end-of-data errors.</div><div class='del'>-</div><div class='del'>-Supplying NULL for the read, write, or flush functions sets them back</div><div class='del'>-to using the default C stream functions, which expect the io_ptr to</div><div class='del'>-point to a standard *FILE structure.  It is probably a mistake</div><div class='del'>-to use NULL for one of write_data_fn and output_flush_fn but not both</div><div class='del'>-of them, unless you have built libpng with PNG_NO_WRITE_FLUSH defined.</div><div class='del'>-It is an error to read from a write stream, and vice versa.</div><div class='del'>-</div><div class='del'>-Error handling in libpng is done through png_error() and png_warning().</div><div class='del'>-Errors handled through png_error() are fatal, meaning that png_error()</div><div class='del'>-should never return to its caller.  Currently, this is handled via</div><div class='del'>-setjmp() and longjmp() (unless you have compiled libpng with</div><div class='del'>-PNG_SETJMP_NOT_SUPPORTED, in which case it is handled via PNG_ABORT()),</div><div class='del'>-but you could change this to do things like exit() if you should wish.</div><div class='del'>-</div><div class='del'>-On non-fatal errors, png_warning() is called</div><div class='del'>-to print a warning message, and then control returns to the calling code.</div><div class='del'>-By default png_error() and png_warning() print a message on stderr via</div><div class='del'>-fprintf() unless the library is compiled with PNG_NO_CONSOLE_IO defined</div><div class='del'>-(because you don't want the messages) or PNG_NO_STDIO defined (because</div><div class='del'>-fprintf() isn't available).  If you wish to change the behavior of the error</div><div class='del'>-functions, you will need to set up your own message callbacks.  These</div><div class='del'>-functions are normally supplied at the time that the png_struct is created.</div><div class='del'>-It is also possible to redirect errors and warnings to your own replacement</div><div class='del'>-functions after png_create_*_struct() has been called by calling:</div><div class='del'>-</div><div class='del'>-    png_set_error_fn(png_structp png_ptr,</div><div class='del'>-        png_voidp error_ptr, png_error_ptr error_fn,</div><div class='del'>-        png_error_ptr warning_fn);</div><div class='del'>-</div><div class='del'>-    png_voidp error_ptr = png_get_error_ptr(png_ptr);</div><div class='del'>-</div><div class='del'>-If NULL is supplied for either error_fn or warning_fn, then the libpng</div><div class='del'>-default function will be used, calling fprintf() and/or longjmp() if a</div><div class='del'>-problem is encountered.  The replacement error functions should have</div><div class='del'>-parameters as follows:</div><div class='del'>-</div><div class='del'>-    void user_error_fn(png_structp png_ptr,</div><div class='del'>-        png_const_charp error_msg);</div><div class='del'>-    void user_warning_fn(png_structp png_ptr,</div><div class='del'>-        png_const_charp warning_msg);</div><div class='del'>-</div><div class='del'>-The motivation behind using setjmp() and longjmp() is the C++ throw and</div><div class='del'>-catch exception handling methods.  This makes the code much easier to write,</div><div class='del'>-as there is no need to check every return code of every function call.</div><div class='del'>-However, there are some uncertainties about the status of local variables</div><div class='del'>-after a longjmp, so the user may want to be careful about doing anything</div><div class='del'>-after setjmp returns non-zero besides returning itself.  Consult your</div><div class='del'>-compiler documentation for more details.  For an alternative approach, you</div><div class='del'>-may wish to use the "cexcept" facility (see http://cexcept.sourceforge.net).</div><div class='del'>-</div><div class='del'>-Custom chunks</div><div class='del'>-</div><div class='del'>-If you need to read or write custom chunks, you may need to get deeper</div><div class='del'>-into the libpng code.  The library now has mechanisms for storing</div><div class='del'>-and writing chunks of unknown type; you can even declare callbacks</div><div class='del'>-for custom chunks.  However, this may not be good enough if the</div><div class='del'>-library code itself needs to know about interactions between your</div><div class='del'>-chunk and existing `intrinsic' chunks.</div><div class='del'>-</div><div class='del'>-If you need to write a new intrinsic chunk, first read the PNG</div><div class='del'>-specification. Acquire a first level of understanding of how it works.</div><div class='del'>-Pay particular attention to the sections that describe chunk names,</div><div class='del'>-and look at how other chunks were designed, so you can do things</div><div class='del'>-similarly.  Second, check out the sections of libpng that read and</div><div class='del'>-write chunks.  Try to find a chunk that is similar to yours and use</div><div class='del'>-it as a template.  More details can be found in the comments inside</div><div class='del'>-the code.  It is best to handle unknown chunks in a generic method,</div><div class='del'>-via callback functions, instead of by modifying libpng functions.</div><div class='del'>-</div><div class='del'>-If you wish to write your own transformation for the data, look through</div><div class='del'>-the part of the code that does the transformations, and check out some of</div><div class='del'>-the simpler ones to get an idea of how they work.  Try to find a similar</div><div class='del'>-transformation to the one you want to add and copy off of it.  More details</div><div class='del'>-can be found in the comments inside the code itself.</div><div class='del'>-</div><div class='del'>-Configuring for 16 bit platforms</div><div class='del'>-</div><div class='del'>-You will want to look into zconf.h to tell zlib (and thus libpng) that</div><div class='del'>-it cannot allocate more then 64K at a time.  Even if you can, the memory</div><div class='del'>-won't be accessible.  So limit zlib and libpng to 64K by defining MAXSEG_64K.</div><div class='del'>-</div><div class='del'>-Configuring for DOS</div><div class='del'>-</div><div class='del'>-For DOS users who only have access to the lower 640K, you will</div><div class='del'>-have to limit zlib's memory usage via a png_set_compression_mem_level()</div><div class='del'>-call.  See zlib.h or zconf.h in the zlib library for more information.</div><div class='del'>-</div><div class='del'>-Configuring for Medium Model</div><div class='del'>-</div><div class='del'>-Libpng's support for medium model has been tested on most of the popular</div><div class='del'>-compilers.  Make sure MAXSEG_64K gets defined, USE_FAR_KEYWORD gets</div><div class='del'>-defined, and FAR gets defined to far in pngconf.h, and you should be</div><div class='del'>-all set.  Everything in the library (except for zlib's structure) is</div><div class='del'>-expecting far data.  You must use the typedefs with the p or pp on</div><div class='del'>-the end for pointers (or at least look at them and be careful).  Make</div><div class='del'>-note that the rows of data are defined as png_bytepp, which is an</div><div class='del'>-unsigned char far * far *.</div><div class='del'>-</div><div class='del'>-Configuring for gui/windowing platforms:</div><div class='del'>-</div><div class='del'>-You will need to write new error and warning functions that use the GUI</div><div class='del'>-interface, as described previously, and set them to be the error and</div><div class='del'>-warning functions at the time that png_create_*_struct() is called,</div><div class='del'>-in order to have them available during the structure initialization.</div><div class='del'>-They can be changed later via png_set_error_fn().  On some compilers,</div><div class='del'>-you may also have to change the memory allocators (png_malloc, etc.).</div><div class='del'>-</div><div class='del'>-Configuring for compiler xxx:</div><div class='del'>-</div><div class='del'>-All includes for libpng are in pngconf.h.  If you need to add, change</div><div class='del'>-or delete an include, this is the place to do it.</div><div class='del'>-The includes that are not needed outside libpng are placed in pngpriv.h,</div><div class='del'>-which is only used by the routines inside libpng itself.</div><div class='del'>-The files in libpng proper only include pngpriv.h and png.h, which</div><div class='del'>-in turn includes pngconf.h.</div><div class='del'>-</div><div class='del'>-Configuring zlib:</div><div class='del'>-</div><div class='del'>-There are special functions to configure the compression.  Perhaps the</div><div class='del'>-most useful one changes the compression level, which currently uses</div><div class='del'>-input compression values in the range 0 - 9.  The library normally</div><div class='del'>-uses the default compression level (Z_DEFAULT_COMPRESSION = 6).  Tests</div><div class='del'>-have shown that for a large majority of images, compression values in</div><div class='del'>-the range 3-6 compress nearly as well as higher levels, and do so much</div><div class='del'>-faster.  For online applications it may be desirable to have maximum speed</div><div class='del'>-(Z_BEST_SPEED = 1).  With versions of zlib after v0.99, you can also</div><div class='del'>-specify no compression (Z_NO_COMPRESSION = 0), but this would create</div><div class='del'>-files larger than just storing the raw bitmap.  You can specify the</div><div class='del'>-compression level by calling:</div><div class='del'>-</div><div class='del'>-    png_set_compression_level(png_ptr, level);</div><div class='del'>-</div><div class='del'>-Another useful one is to reduce the memory level used by the library.</div><div class='del'>-The memory level defaults to 8, but it can be lowered if you are</div><div class='del'>-short on memory (running DOS, for example, where you only have 640K).</div><div class='del'>-Note that the memory level does have an effect on compression; among</div><div class='del'>-other things, lower levels will result in sections of incompressible</div><div class='del'>-data being emitted in smaller stored blocks, with a correspondingly</div><div class='del'>-larger relative overhead of up to 15% in the worst case.</div><div class='del'>-</div><div class='del'>-    png_set_compression_mem_level(png_ptr, level);</div><div class='del'>-</div><div class='del'>-The other functions are for configuring zlib.  They are not recommended</div><div class='del'>-for normal use and may result in writing an invalid PNG file.  See</div><div class='del'>-zlib.h for more information on what these mean.</div><div class='del'>-</div><div class='del'>-    png_set_compression_strategy(png_ptr,</div><div class='del'>-        strategy);</div><div class='del'>-    png_set_compression_window_bits(png_ptr,</div><div class='del'>-        window_bits);</div><div class='del'>-    png_set_compression_method(png_ptr, method);</div><div class='del'>-    png_set_compression_buffer_size(png_ptr, size);</div><div class='del'>-</div><div class='del'>-Controlling row filtering</div><div class='del'>-</div><div class='del'>-If you want to control whether libpng uses filtering or not, which</div><div class='del'>-filters are used, and how it goes about picking row filters, you</div><div class='del'>-can call one of these functions.  The selection and configuration</div><div class='del'>-of row filters can have a significant impact on the size and</div><div class='del'>-encoding speed and a somewhat lesser impact on the decoding speed</div><div class='del'>-of an image.  Filtering is enabled by default for RGB and grayscale</div><div class='del'>-images (with and without alpha), but not for paletted images nor</div><div class='del'>-for any images with bit depths less than 8 bits/pixel.</div><div class='del'>-</div><div class='del'>-The 'method' parameter sets the main filtering method, which is</div><div class='del'>-currently only '0' in the PNG 1.2 specification.  The 'filters'</div><div class='del'>-parameter sets which filter(s), if any, should be used for each</div><div class='del'>-scanline.  Possible values are PNG_ALL_FILTERS and PNG_NO_FILTERS</div><div class='del'>-to turn filtering on and off, respectively.</div><div class='del'>-</div><div class='del'>-Individual filter types are PNG_FILTER_NONE, PNG_FILTER_SUB,</div><div class='del'>-PNG_FILTER_UP, PNG_FILTER_AVG, PNG_FILTER_PAETH, which can be bitwise</div><div class='del'>-ORed together with '|' to specify one or more filters to use.</div><div class='del'>-These filters are described in more detail in the PNG specification.</div><div class='del'>-If you intend to change the filter type during the course of writing</div><div class='del'>-the image, you should start with flags set for all of the filters</div><div class='del'>-you intend to use so that libpng can initialize its internal</div><div class='del'>-structures appropriately for all of the filter types.  (Note that this</div><div class='del'>-means the first row must always be adaptively filtered, because libpng</div><div class='del'>-currently does not allocate the filter buffers until png_write_row()</div><div class='del'>-is called for the first time.)</div><div class='del'>-</div><div class='del'>-    filters = PNG_FILTER_NONE | PNG_FILTER_SUB</div><div class='del'>-              PNG_FILTER_UP | PNG_FILTER_AVG |</div><div class='del'>-              PNG_FILTER_PAETH | PNG_ALL_FILTERS;</div><div class='del'>-</div><div class='del'>-    png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE,</div><div class='del'>-       filters);</div><div class='del'>-              The second parameter can also be</div><div class='del'>-              PNG_INTRAPIXEL_DIFFERENCING if you are</div><div class='del'>-              writing a PNG to be embedded in a MNG</div><div class='del'>-              datastream.  This parameter must be the</div><div class='del'>-              same as the value of filter_method used</div><div class='del'>-              in png_set_IHDR().</div><div class='del'>-</div><div class='del'>-It is also possible to influence how libpng chooses from among the</div><div class='del'>-available filters.  This is done in one or both of two ways - by</div><div class='del'>-telling it how important it is to keep the same filter for successive</div><div class='del'>-rows, and by telling it the relative computational costs of the filters.</div><div class='del'>-</div><div class='del'>-    double weights[3] = {1.5, 1.3, 1.1},</div><div class='del'>-       costs[PNG_FILTER_VALUE_LAST] =</div><div class='del'>-       {1.0, 1.3, 1.3, 1.5, 1.7};</div><div class='del'>-</div><div class='del'>-    png_set_filter_heuristics(png_ptr,</div><div class='del'>-       PNG_FILTER_HEURISTIC_WEIGHTED, 3,</div><div class='del'>-       weights, costs);</div><div class='del'>-</div><div class='del'>-The weights are multiplying factors that indicate to libpng that the</div><div class='del'>-row filter should be the same for successive rows unless another row filter</div><div class='del'>-is that many times better than the previous filter.  In the above example,</div><div class='del'>-if the previous 3 filters were SUB, SUB, NONE, the SUB filter could have a</div><div class='del'>-"sum of absolute differences" 1.5 x 1.3 times higher than other filters</div><div class='del'>-and still be chosen, while the NONE filter could have a sum 1.1 times</div><div class='del'>-higher than other filters and still be chosen.  Unspecified weights are</div><div class='del'>-taken to be 1.0, and the specified weights should probably be declining</div><div class='del'>-like those above in order to emphasize recent filters over older filters.</div><div class='del'>-</div><div class='del'>-The filter costs specify for each filter type a relative decoding cost</div><div class='del'>-to be considered when selecting row filters.  This means that filters</div><div class='del'>-with higher costs are less likely to be chosen over filters with lower</div><div class='del'>-costs, unless their "sum of absolute differences" is that much smaller.</div><div class='del'>-The costs do not necessarily reflect the exact computational speeds of</div><div class='del'>-the various filters, since this would unduly influence the final image</div><div class='del'>-size.</div><div class='del'>-</div><div class='del'>-Note that the numbers above were invented purely for this example and</div><div class='del'>-are given only to help explain the function usage.  Little testing has</div><div class='del'>-been done to find optimum values for either the costs or the weights.</div><div class='del'>-</div><div class='del'>-Removing unwanted object code</div><div class='del'>-</div><div class='del'>-There are a bunch of #define's in pngconf.h that control what parts of</div><div class='del'>-libpng are compiled.  All the defines end in _SUPPORTED.  If you are</div><div class='del'>-never going to use a capability, you can change the #define to #undef</div><div class='del'>-before recompiling libpng and save yourself code and data space, or</div><div class='del'>-you can turn off individual capabilities with defines that begin with</div><div class='del'>-PNG_NO_.</div><div class='del'>-</div><div class='del'>-You can also turn all of the transforms and ancillary chunk capabilities</div><div class='del'>-off en masse with compiler directives that define</div><div class='del'>-PNG_NO_READ[or WRITE]_TRANSFORMS, or PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS,</div><div class='del'>-or all four,</div><div class='del'>-along with directives to turn on any of the capabilities that you do</div><div class='del'>-want.  The PNG_NO_READ[or WRITE]_TRANSFORMS directives disable the extra</div><div class='del'>-transformations but still leave the library fully capable of reading</div><div class='del'>-and writing PNG files with all known public chunks. Use of the</div><div class='del'>-PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS directive produces a library</div><div class='del'>-that is incapable of reading or writing ancillary chunks.  If you are</div><div class='del'>-not using the progressive reading capability, you can turn that off</div><div class='del'>-with PNG_NO_PROGRESSIVE_READ (don't confuse this with the INTERLACING</div><div class='del'>-capability, which you'll still have).</div><div class='del'>-</div><div class='del'>-All the reading and writing specific code are in separate files, so the</div><div class='del'>-linker should only grab the files it needs.  However, if you want to</div><div class='del'>-make sure, or if you are building a stand alone library, all the</div><div class='del'>-reading files start with pngr and all the writing files start with</div><div class='del'>-pngw.  The files that don't match either (like png.c, pngtrans.c, etc.)</div><div class='del'>-are used for both reading and writing, and always need to be included.</div><div class='del'>-The progressive reader is in pngpread.c</div><div class='del'>-</div><div class='del'>-If you are creating or distributing a dynamically linked library (a .so</div><div class='del'>-or DLL file), you should not remove or disable any parts of the library,</div><div class='del'>-as this will cause applications linked with different versions of the</div><div class='del'>-library to fail if they call functions not available in your library.</div><div class='del'>-The size of the library itself should not be an issue, because only</div><div class='del'>-those sections that are actually used will be loaded into memory.</div><div class='del'>-</div><div class='del'>-Requesting debug printout</div><div class='del'>-</div><div class='del'>-The macro definition PNG_DEBUG can be used to request debugging</div><div class='del'>-printout.  Set it to an integer value in the range 0 to 3.  Higher</div><div class='del'>-numbers result in increasing amounts of debugging information.  The</div><div class='del'>-information is printed to the "stderr" file, unless another file</div><div class='del'>-name is specified in the PNG_DEBUG_FILE macro definition.</div><div class='del'>-</div><div class='del'>-When PNG_DEBUG &gt; 0, the following functions (macros) become available:</div><div class='del'>-</div><div class='del'>-   png_debug(level, message)</div><div class='del'>-   png_debug1(level, message, p1)</div><div class='del'>-   png_debug2(level, message, p1, p2)</div><div class='del'>-</div><div class='del'>-in which "level" is compared to PNG_DEBUG to decide whether to print</div><div class='del'>-the message, "message" is the formatted string to be printed,</div><div class='del'>-and p1 and p2 are parameters that are to be embedded in the string</div><div class='del'>-according to printf-style formatting directives.  For example,</div><div class='del'>-</div><div class='del'>-   png_debug1(2, "foo=%d\n", foo);</div><div class='del'>-</div><div class='del'>-is expanded to</div><div class='del'>-</div><div class='del'>-   if(PNG_DEBUG &gt; 2)</div><div class='del'>-     fprintf(PNG_DEBUG_FILE, "foo=%d\n", foo);</div><div class='del'>-</div><div class='del'>-When PNG_DEBUG is defined but is zero, the macros aren't defined, but you</div><div class='del'>-can still use PNG_DEBUG to control your own debugging:</div><div class='del'>-</div><div class='del'>-   #ifdef PNG_DEBUG</div><div class='del'>-       fprintf(stderr, ...</div><div class='del'>-   #endif</div><div class='del'>-</div><div class='del'>-When PNG_DEBUG = 1, the macros are defined, but only png_debug statements</div><div class='del'>-having level = 0 will be printed.  There aren't any such statements in</div><div class='del'>-this version of libpng, but if you insert some they will be printed.</div><div class='del'>-</div><div class='del'>-VI.  MNG support</div><div class='del'>-</div><div class='del'>-The MNG specification (available at http://www.libpng.org/pub/mng) allows</div><div class='del'>-certain extensions to PNG for PNG images that are embedded in MNG datastreams.</div><div class='del'>-Libpng can support some of these extensions.  To enable them, use the</div><div class='del'>-png_permit_mng_features() function:</div><div class='del'>-</div><div class='del'>-   feature_set = png_permit_mng_features(png_ptr, mask)</div><div class='del'>-   mask is a png_uint_32 containing the bitwise OR of the</div><div class='del'>-        features you want to enable.  These include</div><div class='del'>-        PNG_FLAG_MNG_EMPTY_PLTE</div><div class='del'>-        PNG_FLAG_MNG_FILTER_64</div><div class='del'>-        PNG_ALL_MNG_FEATURES</div><div class='del'>-   feature_set is a png_uint_32 that is the bitwise AND of</div><div class='del'>-      your mask with the set of MNG features that is</div><div class='del'>-      supported by the version of libpng that you are using.</div><div class='del'>-</div><div class='del'>-It is an error to use this function when reading or writing a standalone</div><div class='del'>-PNG file with the PNG 8-byte signature.  The PNG datastream must be wrapped</div><div class='del'>-in a MNG datastream.  As a minimum, it must have the MNG 8-byte signature</div><div class='del'>-and the MHDR and MEND chunks.  Libpng does not provide support for these</div><div class='del'>-or any other MNG chunks; your application must provide its own support for</div><div class='del'>-them.  You may wish to consider using libmng (available at</div><div class='del'>-http://www.libmng.com) instead.</div><div class='del'>-</div><div class='del'>-VII.  Changes to Libpng from version 0.88</div><div class='del'>-</div><div class='del'>-It should be noted that versions of libpng later than 0.96 are not</div><div class='del'>-distributed by the original libpng author, Guy Schalnat, nor by</div><div class='del'>-Andreas Dilger, who had taken over from Guy during 1996 and 1997, and</div><div class='del'>-distributed versions 0.89 through 0.96, but rather by another member</div><div class='del'>-of the original PNG Group, Glenn Randers-Pehrson.  Guy and Andreas are</div><div class='del'>-still alive and well, but they have moved on to other things.</div><div class='del'>-</div><div class='del'>-The old libpng functions png_read_init(), png_write_init(),</div><div class='del'>-png_info_init(), png_read_destroy(), and png_write_destroy() have been</div><div class='del'>-moved to PNG_INTERNAL in version 0.95 to discourage their use.  These</div><div class='del'>-functions will be removed from libpng version 2.0.0.</div><div class='del'>-</div><div class='del'>-The preferred method of creating and initializing the libpng structures is</div><div class='del'>-via the png_create_read_struct(), png_create_write_struct(), and</div><div class='del'>-png_create_info_struct() because they isolate the size of the structures</div><div class='del'>-from the application, allow version error checking, and also allow the</div><div class='del'>-use of custom error handling routines during the initialization, which</div><div class='del'>-the old functions do not.  The functions png_read_destroy() and</div><div class='del'>-png_write_destroy() do not actually free the memory that libpng</div><div class='del'>-allocated for these structs, but just reset the data structures, so they</div><div class='del'>-can be used instead of png_destroy_read_struct() and</div><div class='del'>-png_destroy_write_struct() if you feel there is too much system overhead</div><div class='del'>-allocating and freeing the png_struct for each image read.</div><div class='del'>-</div><div class='del'>-Setting the error callbacks via png_set_message_fn() before</div><div class='del'>-png_read_init() as was suggested in libpng-0.88 is no longer supported</div><div class='del'>-because this caused applications that do not use custom error functions</div><div class='del'>-to fail if the png_ptr was not initialized to zero.  It is still possible</div><div class='del'>-to set the error callbacks AFTER png_read_init(), or to change them with</div><div class='del'>-png_set_error_fn(), which is essentially the same function, but with a new</div><div class='del'>-name to force compilation errors with applications that try to use the old</div><div class='del'>-method.</div><div class='del'>-</div><div class='del'>-Starting with version 1.0.7, you can find out which version of the library</div><div class='del'>-you are using at run-time:</div><div class='del'>-</div><div class='del'>-   png_uint_32 libpng_vn = png_access_version_number();</div><div class='del'>-</div><div class='del'>-The number libpng_vn is constructed from the major version, minor</div><div class='del'>-version with leading zero, and release number with leading zero,</div><div class='del'>-(e.g., libpng_vn for version 1.0.7 is 10007).</div><div class='del'>-</div><div class='del'>-You can also check which version of png.h you used when compiling your</div><div class='del'>-application:</div><div class='del'>-</div><div class='del'>-   png_uint_32 application_vn = PNG_LIBPNG_VER;</div><div class='del'>-</div><div class='del'>-VIII.  Changes to Libpng from version 1.0.x to 1.2.x</div><div class='del'>-</div><div class='del'>-Support for user memory management was enabled by default.  To</div><div class='del'>-accomplish this, the functions png_create_read_struct_2(),</div><div class='del'>-png_create_write_struct_2(), png_set_mem_fn(), png_get_mem_ptr(),</div><div class='del'>-png_malloc_default(), and png_free_default() were added.</div><div class='del'>-</div><div class='del'>-Support for the iTXt chunk has been enabled by default as of</div><div class='del'>-version 1.2.41.</div><div class='del'>-</div><div class='del'>-Support for certain MNG features was enabled.</div><div class='del'>-</div><div class='del'>-Support for numbered error messages was added.  However, we never got</div><div class='del'>-around to actually numbering the error messages.  The function</div><div class='del'>-png_set_strip_error_numbers() was added (Note: the prototype for this</div><div class='del'>-function was inadvertently removed from png.h in PNG_NO_ASSEMBLER_CODE</div><div class='del'>-builds of libpng-1.2.15.  It was restored in libpng-1.2.36).</div><div class='del'>-</div><div class='del'>-The png_malloc_warn() function was added at libpng-1.2.3.  This issues</div><div class='del'>-a png_warning and returns NULL instead of aborting when it fails to</div><div class='del'>-acquire the requested memory allocation.</div><div class='del'>-</div><div class='del'>-Support for setting user limits on image width and height was enabled</div><div class='del'>-by default.  The functions png_set_user_limits(), png_get_user_width_max(),</div><div class='del'>-and png_get_user_height_max() were added at libpng-1.2.6.</div><div class='del'>-</div><div class='del'>-The png_set_add_alpha() function was added at libpng-1.2.7.</div><div class='del'>-</div><div class='del'>-The function png_set_expand_gray_1_2_4_to_8() was added at libpng-1.2.9.</div><div class='del'>-Unlike png_set_gray_1_2_4_to_8(), the new function does not expand the</div><div class='del'>-tRNS chunk to alpha. The png_set_gray_1_2_4_to_8() function is</div><div class='del'>-deprecated.</div><div class='del'>-</div><div class='del'>-A number of macro definitions in support of runtime selection of</div><div class='del'>-assembler code features (especially Intel MMX code support) were</div><div class='del'>-added at libpng-1.2.0:</div><div class='del'>-</div><div class='del'>-    PNG_ASM_FLAG_MMX_SUPPORT_COMPILED</div><div class='del'>-    PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU</div><div class='del'>-    PNG_ASM_FLAG_MMX_READ_COMBINE_ROW</div><div class='del'>-    PNG_ASM_FLAG_MMX_READ_INTERLACE</div><div class='del'>-    PNG_ASM_FLAG_MMX_READ_FILTER_SUB</div><div class='del'>-    PNG_ASM_FLAG_MMX_READ_FILTER_UP</div><div class='del'>-    PNG_ASM_FLAG_MMX_READ_FILTER_AVG</div><div class='del'>-    PNG_ASM_FLAG_MMX_READ_FILTER_PAETH</div><div class='del'>-    PNG_ASM_FLAGS_INITIALIZED</div><div class='del'>-    PNG_MMX_READ_FLAGS</div><div class='del'>-    PNG_MMX_FLAGS</div><div class='del'>-    PNG_MMX_WRITE_FLAGS</div><div class='del'>-    PNG_MMX_FLAGS</div><div class='del'>-</div><div class='del'>-We added the following functions in support of runtime</div><div class='del'>-selection of assembler code features:</div><div class='del'>-</div><div class='del'>-    png_get_mmx_flagmask()</div><div class='del'>-    png_set_mmx_thresholds()</div><div class='del'>-    png_get_asm_flags()</div><div class='del'>-    png_get_mmx_bitdepth_threshold()</div><div class='del'>-    png_get_mmx_rowbytes_threshold()</div><div class='del'>-    png_set_asm_flags()</div><div class='del'>-</div><div class='del'>-We replaced all of these functions with simple stubs in libpng-1.2.20,</div><div class='del'>-when the Intel assembler code was removed due to a licensing issue.</div><div class='del'>-</div><div class='del'>-These macros are deprecated:</div><div class='del'>-</div><div class='del'>-    PNG_READ_TRANSFORMS_NOT_SUPPORTED</div><div class='del'>-    PNG_PROGRESSIVE_READ_NOT_SUPPORTED</div><div class='del'>-    PNG_NO_SEQUENTIAL_READ_SUPPORTED</div><div class='del'>-    PNG_WRITE_TRANSFORMS_NOT_SUPPORTED</div><div class='del'>-    PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED</div><div class='del'>-    PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED</div><div class='del'>-</div><div class='del'>-They have been replaced, respectively, by:</div><div class='del'>-</div><div class='del'>-    PNG_NO_READ_TRANSFORMS</div><div class='del'>-    PNG_NO_PROGRESSIVE_READ</div><div class='del'>-    PNG_NO_SEQUENTIAL_READ</div><div class='del'>-    PNG_NO_WRITE_TRANSFORMS</div><div class='del'>-    PNG_NO_READ_ANCILLARY_CHUNKS</div><div class='del'>-    PNG_NO_WRITE_ANCILLARY_CHUNKS</div><div class='del'>-</div><div class='del'>-PNG_MAX_UINT was replaced with PNG_UINT_31_MAX.  It has been</div><div class='del'>-deprecated since libpng-1.0.16 and libpng-1.2.6.</div><div class='del'>-</div><div class='del'>-The function</div><div class='del'>-    png_check_sig(sig, num)</div><div class='del'>-was replaced with</div><div class='del'>-    !png_sig_cmp(sig, 0, num)</div><div class='del'>-It has been deprecated since libpng-0.90.</div><div class='del'>-</div><div class='del'>-The function</div><div class='del'>-    png_set_gray_1_2_4_to_8()</div><div class='del'>-which also expands tRNS to alpha was replaced with</div><div class='del'>-    png_set_expand_gray_1_2_4_to_8()</div><div class='del'>-which does not. It has been deprecated since libpng-1.0.18 and 1.2.9.</div><div class='del'>-</div><div class='del'>-IX.  Changes to Libpng from version 1.0.x/1.2.x to 1.4.x</div><div class='del'>-</div><div class='del'>-Private libpng prototypes and macro definitions were moved from</div><div class='del'>-png.h and pngconf.h into a new pngpriv.h header file.</div><div class='del'>-</div><div class='del'>-Functions png_set_benign_errors(), png_benign_error(), and</div><div class='del'>-png_chunk_benign_error() were added.</div><div class='del'>-</div><div class='del'>-Support for setting the maximum amount of memory that the application</div><div class='del'>-will allocate for reading chunks was added, as a security measure.</div><div class='del'>-The functions png_set_chunk_cache_max() and png_get_chunk_cache_max()</div><div class='del'>-were added to the library.</div><div class='del'>-</div><div class='del'>-We implemented support for I/O states by adding png_ptr member io_state</div><div class='del'>-and functions png_get_io_chunk_name() and png_get_io_state() in pngget.c</div><div class='del'>-</div><div class='del'>-We added PNG_TRANSFORM_GRAY_TO_RGB to the available high-level</div><div class='del'>-input transforms.</div><div class='del'>-</div><div class='del'>-Checking for and reporting of errors in the IHDR chunk is more thorough.</div><div class='del'>-</div><div class='del'>-Support for global arrays was removed, to improve thread safety.</div><div class='del'>-</div><div class='del'>-Some obsolete/deprecated macros and functions have been removed.</div><div class='del'>-</div><div class='del'>-Typecasted NULL definitions such as</div><div class='del'>-   #define png_voidp_NULL            (png_voidp)NULL</div><div class='del'>-were eliminated.  If you used these in your application, just use</div><div class='del'>-NULL instead.</div><div class='del'>-</div><div class='del'>-The png_struct and info_struct members "trans" and "trans_values" were</div><div class='del'>-changed to "trans_alpha" and "trans_color", respectively.</div><div class='del'>-</div><div class='del'>-The obsolete, unused pnggccrd.c and pngvcrd.c files and related makefiles</div><div class='del'>-were removed.</div><div class='del'>-</div><div class='del'>-The PNG_1_0_X and PNG_1_2_X macros were eliminated.</div><div class='del'>-</div><div class='del'>-The PNG_LEGACY_SUPPORTED macro was eliminated.</div><div class='del'>-</div><div class='del'>-Many WIN32_WCE #ifdefs were removed.</div><div class='del'>-</div><div class='del'>-The functions png_read_init(info_ptr), png_write_init(info_ptr),</div><div class='del'>-png_info_init(info_ptr), png_read_destroy(), and png_write_destroy()</div><div class='del'>-have been removed.  They have been deprecated since libpng-0.95.</div><div class='del'>-</div><div class='del'>-The png_permit_empty_plte() was removed. It has been deprecated</div><div class='del'>-since libpng-1.0.9.  Use png_permit_mng_features() instead.</div><div class='del'>-</div><div class='del'>-We removed the obsolete stub functions png_get_mmx_flagmask(),</div><div class='del'>-png_set_mmx_thresholds(), png_get_asm_flags(),</div><div class='del'>-png_get_mmx_bitdepth_threshold(), png_get_mmx_rowbytes_threshold(),</div><div class='del'>-png_set_asm_flags(), and png_mmx_supported()</div><div class='del'>-</div><div class='del'>-We removed the obsolete png_check_sig(), png_memcpy_check(), and</div><div class='del'>-png_memset_check() functions.  Instead use !png_sig_cmp(), png_memcpy(),</div><div class='del'>-and png_memset(), respectively.</div><div class='del'>-</div><div class='del'>-The function png_set_gray_1_2_4_to_8() was removed. It has been</div><div class='del'>-deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with</div><div class='del'>-png_set_expand_gray_1_2_4_to_8() because the former function also</div><div class='del'>-expanded palette images.</div><div class='del'>-</div><div class='del'>-We changed the prototype for png_malloc() from</div><div class='del'>-    png_malloc(png_structp png_ptr, png_uint_32 size)</div><div class='del'>-to</div><div class='del'>-    png_malloc(png_structp png_ptr, png_alloc_size_t size)</div><div class='del'>-</div><div class='del'>-The png_calloc() function was added and is used in place of</div><div class='del'>-of "png_malloc(); png_memset();" except in the case in png_read_png()</div><div class='del'>-where the array consists of pointers; in this case a "for" loop is used</div><div class='del'>-after the png_malloc() to set the pointers to NULL, to give robust.</div><div class='del'>-behavior in case the application runs out of memory part-way through</div><div class='del'>-the process.</div><div class='del'>-</div><div class='del'>-We changed the prototypes of png_get_compression_buffer_size() and</div><div class='del'>-png_set_compression_buffer_size() to work with png_size_t instead of</div><div class='del'>-png_uint_32.</div><div class='del'>-</div><div class='del'>-Support for numbered error messages was removed by default, since we</div><div class='del'>-never got around to actually numbering the error messages. The function</div><div class='del'>-png_set_strip_error_numbers() was removed from the library by default.</div><div class='del'>-</div><div class='del'>-The png_zalloc() and png_zfree() functions are no longer exported.</div><div class='del'>-The png_zalloc() function no longer zeroes out the memory that it</div><div class='del'>-allocates.</div><div class='del'>-</div><div class='del'>-We removed the trailing '.' from the warning and error messages.</div><div class='del'>-</div><div class='del'>-X. Detecting libpng</div><div class='del'>-</div><div class='del'>-The png_get_io_ptr() function has been present since libpng-0.88, has never</div><div class='del'>-changed, and is unaffected by conditional compilation macros.  It is the</div><div class='del'>-best choice for use in configure scripts for detecting the presence of any</div><div class='del'>-libpng version since 0.88.  In an autoconf "configure.in" you could use</div><div class='del'>-</div><div class='del'>-    AC_CHECK_LIB(png, png_get_io_ptr, ...</div><div class='del'>-</div><div class='del'>-XI. Source code repository</div><div class='del'>-</div><div class='del'>-Since about February 2009, version 1.2.34, libpng has been under "git" source</div><div class='del'>-control.  The git repository was built from old libpng-x.y.z.tar.gz files</div><div class='del'>-going back to version 0.70.  You can access the git repository (read only)</div><div class='del'>-at</div><div class='del'>-</div><div class='del'>-    git://libpng.git.sourceforge.net/gitroot/libpng</div><div class='del'>-</div><div class='del'>-or you can browse it via "gitweb" at</div><div class='del'>-</div><div class='del'>-    http://libpng.git.sourceforge.net/git/gitweb.cgi?p=libpng</div><div class='del'>-</div><div class='del'>-Patches can be sent to glennrp at users.sourceforge.net or to</div><div class='del'>-png-mng-implement at lists.sourceforge.net or you can upload them to</div><div class='del'>-the libpng bug tracker at</div><div class='del'>-</div><div class='del'>-    http://libpng.sourceforge.net</div><div class='del'>-</div><div class='del'>-XII. Coding style</div><div class='del'>-</div><div class='del'>-Our coding style is similar to the "Allman" style, with curly</div><div class='del'>-braces on separate lines:</div><div class='del'>-</div><div class='del'>-    if (condition)</div><div class='del'>-    {</div><div class='del'>-       action;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    else if (another condition)</div><div class='del'>-    {</div><div class='del'>-       another action;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-The braces can be omitted from simple one-line actions:</div><div class='del'>-</div><div class='del'>-    if (condition)</div><div class='del'>-       return (0);</div><div class='del'>-</div><div class='del'>-We use 3-space indentation, except for continued statements which</div><div class='del'>-are usually indented the same as the first line of the statement</div><div class='del'>-plus four more spaces.</div><div class='del'>-</div><div class='del'>-For macro definitions we use 2-space indentation, always leaving the "#"</div><div class='del'>-in the first column.</div><div class='del'>-</div><div class='del'>-    #ifndef PNG_NO_FEATURE</div><div class='del'>-    #  ifndef PNG_FEATURE_SUPPORTED</div><div class='del'>-    #    define PNG_FEATURE_SUPPORTED</div><div class='del'>-    #  endif</div><div class='del'>-    #endif</div><div class='del'>-</div><div class='del'>-Comments appear with the leading "/*" at the same indentation as</div><div class='del'>-the statement that follows the comment:</div><div class='del'>-</div><div class='del'>-    /* Single-line comment */</div><div class='del'>-    statement;</div><div class='del'>-</div><div class='del'>-    /* Multiple-line</div><div class='del'>-     * comment</div><div class='del'>-     */</div><div class='del'>-    statement;</div><div class='del'>-</div><div class='del'>-Very short comments can be placed at the end of the statement</div><div class='del'>-to which they pertain:</div><div class='del'>-</div><div class='del'>-    statement;    /* comment */</div><div class='del'>-</div><div class='del'>-We don't use C++ style ("//") comments. We have, however,</div><div class='del'>-used them in the past in some now-abandoned MMX assembler</div><div class='del'>-code.</div><div class='del'>-</div><div class='del'>-Functions and their curly braces are not indented, and</div><div class='del'>-exported functions are marked with PNGAPI:</div><div class='del'>-</div><div class='del'>- /* This is a public function that is visible to</div><div class='del'>-  * application programers. It does thus-and-so.</div><div class='del'>-  */</div><div class='del'>- void PNGAPI</div><div class='del'>- png_exported_function(png_ptr, png_info, foo)</div><div class='del'>- {</div><div class='del'>-    body;</div><div class='del'>- }</div><div class='del'>-</div><div class='del'>-The prototypes for all exported functions appear in png.h,</div><div class='del'>-above the comment that says</div><div class='del'>-</div><div class='del'>-    /* Maintainer: Put new public prototypes here ... */</div><div class='del'>-</div><div class='del'>-We mark all non-exported functions with "/* PRIVATE */"":</div><div class='del'>-</div><div class='del'>- void /* PRIVATE */</div><div class='del'>- png_non_exported_function(png_ptr, png_info, foo)</div><div class='del'>- {</div><div class='del'>-    body;</div><div class='del'>- }</div><div class='del'>-</div><div class='del'>-The prototypes for non-exported functions (except for those in</div><div class='del'>-pngtest) appear in</div><div class='del'>-pngpriv.h</div><div class='del'>-above the comment that says</div><div class='del'>-</div><div class='del'>-  /* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */</div><div class='del'>-</div><div class='del'>-The names of all exported functions and variables begin</div><div class='del'>-with  "png_", and all publicly visible C preprocessor</div><div class='del'>-macros begin with "PNG_".</div><div class='del'>-</div><div class='del'>-We put a space after each comma and after each semicolon</div><div class='del'>-in "for" statments, and we put spaces before and after each</div><div class='del'>-C binary operator and after "for" or "while".  We don't</div><div class='del'>-put a space between a typecast and the expression being</div><div class='del'>-cast, nor do we put one between a function name and the</div><div class='del'>-left parenthesis that follows it:</div><div class='del'>-</div><div class='del'>-    for (i = 2; i &gt; 0; --i)</div><div class='del'>-       y[i] = a(x) + (int)b;</div><div class='del'>-</div><div class='del'>-We prefer #ifdef and #ifndef to #if defined() and if !defined()</div><div class='del'>-when there is only one macro being tested.</div><div class='del'>-</div><div class='del'>-We do not use the TAB character for indentation in the C sources.</div><div class='del'>-</div><div class='del'>-Lines do not exceed 80 characters.</div><div class='del'>-</div><div class='del'>-Other rules can be inferred by inspecting the libpng source.</div><div class='del'>-</div><div class='del'>-XIII. Y2K Compliance in libpng</div><div class='del'>-</div><div class='del'>-January 3, 2010</div><div class='del'>-</div><div class='del'>-Since the PNG Development group is an ad-hoc body, we can't make</div><div class='del'>-an official declaration.</div><div class='del'>-</div><div class='del'>-This is your unofficial assurance that libpng from version 0.71 and</div><div class='del'>-upward through 1.4.0 are Y2K compliant.  It is my belief that earlier</div><div class='del'>-versions were also Y2K compliant.</div><div class='del'>-</div><div class='del'>-Libpng only has three year fields.  One is a 2-byte unsigned integer that</div><div class='del'>-will hold years up to 65535.  The other two hold the date in text</div><div class='del'>-format, and will hold years up to 9999.</div><div class='del'>-</div><div class='del'>-The integer is</div><div class='del'>-    "png_uint_16 year" in png_time_struct.</div><div class='del'>-</div><div class='del'>-The strings are</div><div class='del'>-    "png_charp time_buffer" in png_struct and</div><div class='del'>-    "near_time_buffer", which is a local character string in png.c.</div><div class='del'>-</div><div class='del'>-There are seven time-related functions:</div><div class='del'>-</div><div class='del'>-    png_convert_to_rfc_1123() in png.c</div><div class='del'>-      (formerly png_convert_to_rfc_1152() in error)</div><div class='del'>-    png_convert_from_struct_tm() in pngwrite.c, called</div><div class='del'>-      in pngwrite.c</div><div class='del'>-    png_convert_from_time_t() in pngwrite.c</div><div class='del'>-    png_get_tIME() in pngget.c</div><div class='del'>-    png_handle_tIME() in pngrutil.c, called in pngread.c</div><div class='del'>-    png_set_tIME() in pngset.c</div><div class='del'>-    png_write_tIME() in pngwutil.c, called in pngwrite.c</div><div class='del'>-</div><div class='del'>-All appear to handle dates properly in a Y2K environment.  The</div><div class='del'>-png_convert_from_time_t() function calls gmtime() to convert from system</div><div class='del'>-clock time, which returns (year - 1900), which we properly convert to</div><div class='del'>-the full 4-digit year.  There is a possibility that applications using</div><div class='del'>-libpng are not passing 4-digit years into the png_convert_to_rfc_1123()</div><div class='del'>-function, or that they are incorrectly passing only a 2-digit year</div><div class='del'>-instead of "year - 1900" into the png_convert_from_struct_tm() function,</div><div class='del'>-but this is not under our control.  The libpng documentation has always</div><div class='del'>-stated that it works with 4-digit years, and the APIs have been</div><div class='del'>-documented as such.</div><div class='del'>-</div><div class='del'>-The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned</div><div class='del'>-integer to hold the year, and can hold years as large as 65535.</div><div class='del'>-</div><div class='del'>-zlib, upon which libpng depends, is also Y2K compliant.  It contains</div><div class='del'>-no date-related code.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-   Glenn Randers-Pehrson</div><div class='del'>-   libpng maintainer</div><div class='del'>-   PNG Development Group</div><div class='head'>diff --git a/src/3rdparty/libpng/libpng-config.in b/src/3rdparty/libpng/libpng-config.in<br/>deleted file mode 100755<br/>index 2987cef..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/libpng-config.in?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/libpng-config.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,127 +0,0 @@</div><div class='del'>-#! /bin/sh</div><div class='del'>-</div><div class='del'>-# libpng-config</div><div class='del'>-# provides configuration info for libpng.</div><div class='del'>-</div><div class='del'>-# Copyright (C) 2002, 2004, 2006, 2007 Glenn Randers-Pehrson</div><div class='del'>-</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Modeled after libxml-config.</div><div class='del'>-</div><div class='del'>-version="@PNGLIB_VERSION@"</div><div class='del'>-prefix="@prefix@"</div><div class='del'>-exec_prefix="@exec_prefix@"</div><div class='del'>-libdir="@libdir@"</div><div class='del'>-includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"</div><div class='del'>-libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"</div><div class='del'>-all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"</div><div class='del'>-I_opts="-I${includedir}"</div><div class='del'>-L_opts="-L${libdir}"</div><div class='del'>-R_opts=""</div><div class='del'>-cppflags=""</div><div class='del'>-ccopts=""</div><div class='del'>-ldopts=""</div><div class='del'>-</div><div class='del'>-usage()</div><div class='del'>-{</div><div class='del'>-    cat &lt;&lt;EOF</div><div class='del'>-Usage: $0 [OPTION] ...</div><div class='del'>-</div><div class='del'>-Known values for OPTION are:</div><div class='del'>-</div><div class='del'>-  --prefix        print libpng prefix</div><div class='del'>-  --libdir        print path to directory containing library</div><div class='del'>-  --libs          print library linking information</div><div class='del'>-  --ccopts        print compiler options</div><div class='del'>-  --cppflags      print pre-processor flags</div><div class='del'>-  --cflags        print preprocessor flags, I_opts, and compiler options</div><div class='del'>-  --I_opts        print "-I" include options</div><div class='del'>-  --L_opts        print linker "-L" flags for dynamic linking</div><div class='del'>-  --R_opts        print dynamic linker "-R" or "-rpath" flags</div><div class='del'>-  --ldopts        print linker options</div><div class='del'>-  --ldflags       print linker flags (ldopts, L_opts, R_opts, and libs)</div><div class='del'>-  --static        revise subsequent outputs for static linking</div><div class='del'>-  --help          print this help and exit</div><div class='del'>-  --version       print version information</div><div class='del'>-EOF</div><div class='del'>-</div><div class='del'>-    exit $1</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-if test $# -eq 0; then</div><div class='del'>-    usage 1</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-while test $# -gt 0; do</div><div class='del'>-    case "$1" in</div><div class='del'>-</div><div class='del'>-    --prefix)</div><div class='del'>-        echo ${prefix}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --version)</div><div class='del'>-        echo ${version}</div><div class='del'>-        exit 0</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --help)</div><div class='del'>-        usage 0</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --ccopts)</div><div class='del'>-        echo ${ccopts}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --cppflags)</div><div class='del'>-        echo ${cppflags}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --cflags)</div><div class='del'>-        echo ${I_opts} ${cppflags} ${ccopts}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --libdir)</div><div class='del'>-        echo ${libdir}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --libs)</div><div class='del'>-        echo ${libs}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --I_opts)</div><div class='del'>-        echo ${I_opts}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --L_opts)</div><div class='del'>-        echo ${L_opts}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --R_opts)</div><div class='del'>-        echo ${R_opts}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --ldopts)</div><div class='del'>-    	echo ${ldopts}</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-    --ldflags)</div><div class='del'>-        echo ${ldopts} ${L_opts} ${R_opts} ${libs}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --static)</div><div class='del'>-        R_opts=""</div><div class='del'>-	libs=${all_libs}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    *)</div><div class='del'>-        usage</div><div class='del'>-        exit 1</div><div class='del'>-        ;;</div><div class='del'>-    esac</div><div class='del'>-    shift</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-exit 0</div><div class='head'>diff --git a/src/3rdparty/libpng/libpng-manual.txt b/src/3rdparty/libpng/libpng-manual.txt<br/>new file mode 100644<br/>index 0000000..77adf7a<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/libpng-manual.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/libpng-manual.txt</a></div><div class='hunk'>@@ -0,0 +1,4136 @@</div><div class='add'>+libpng-manual.txt - A description on how to use and modify libpng</div><div class='add'>+</div><div class='add'>+ libpng version 1.5.1 - February 3, 2011</div><div class='add'>+ Updated and distributed by Glenn Randers-Pehrson</div><div class='add'>+ &lt;glennrp at users.sourceforge.net&gt;</div><div class='add'>+ Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='add'>+</div><div class='add'>+ This document is released under the libpng license.</div><div class='add'>+ For conditions of distribution and use, see the disclaimer</div><div class='add'>+ and license in png.h</div><div class='add'>+</div><div class='add'>+ Based on:</div><div class='add'>+</div><div class='add'>+ libpng versions 0.97, January 1998, through 1.5.1 - February 3, 2011</div><div class='add'>+ Updated and distributed by Glenn Randers-Pehrson</div><div class='add'>+ Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='add'>+</div><div class='add'>+ libpng 1.0 beta 6  version 0.96 May 28, 1997</div><div class='add'>+ Updated and distributed by Andreas Dilger</div><div class='add'>+ Copyright (c) 1996, 1997 Andreas Dilger</div><div class='add'>+</div><div class='add'>+ libpng 1.0 beta 2 - version 0.88  January 26, 1996</div><div class='add'>+ For conditions of distribution and use, see copyright</div><div class='add'>+ notice in png.h. Copyright (c) 1995, 1996 Guy Eric</div><div class='add'>+ Schalnat, Group 42, Inc.</div><div class='add'>+</div><div class='add'>+ Updated/rewritten per request in the libpng FAQ</div><div class='add'>+ Copyright (c) 1995, 1996 Frank J. T. Wojcik</div><div class='add'>+ December 18, 1995 &amp; January 20, 1996</div><div class='add'>+</div><div class='add'>+I. Introduction</div><div class='add'>+</div><div class='add'>+This file describes how to use and modify the PNG reference library</div><div class='add'>+(known as libpng) for your own use.  There are five sections to this</div><div class='add'>+file: introduction, structures, reading, writing, and modification and</div><div class='add'>+configuration notes for various special platforms.  In addition to this</div><div class='add'>+file, example.c is a good starting point for using the library, as</div><div class='add'>+it is heavily commented and should include everything most people</div><div class='add'>+will need.  We assume that libpng is already installed; see the</div><div class='add'>+INSTALL file for instructions on how to install libpng.</div><div class='add'>+</div><div class='add'>+For examples of libpng usage, see the files "example.c", "pngtest.c",</div><div class='add'>+and the files in the "contrib" directory, all of which are included in</div><div class='add'>+the libpng distribution.</div><div class='add'>+</div><div class='add'>+Libpng was written as a companion to the PNG specification, as a way</div><div class='add'>+of reducing the amount of time and effort it takes to support the PNG</div><div class='add'>+file format in application programs.</div><div class='add'>+</div><div class='add'>+The PNG specification (second edition), November 2003, is available as</div><div class='add'>+a W3C Recommendation and as an ISO Standard (ISO/IEC 15948:2003 (E)) at</div><div class='add'>+&lt;http://www.w3.org/TR/2003/REC-PNG-20031110/</div><div class='add'>+The W3C and ISO documents have identical technical content.</div><div class='add'>+</div><div class='add'>+The PNG-1.2 specification is available at</div><div class='add'>+&lt;http://www.libpng.org/pub/png/documents/&gt;.  It is technically equivalent</div><div class='add'>+to the PNG specification (second edition) but has some additional material.</div><div class='add'>+</div><div class='add'>+The PNG-1.0 specification is available</div><div class='add'>+as RFC 2083 &lt;http://www.libpng.org/pub/png/documents/&gt; and as a</div><div class='add'>+W3C Recommendation &lt;http://www.w3.org/TR/REC.png.html&gt;.</div><div class='add'>+</div><div class='add'>+Some additional chunks are described in the special-purpose public chunks</div><div class='add'>+documents at &lt;http://www.libpng.org/pub/png/documents/&gt;.</div><div class='add'>+</div><div class='add'>+Other information</div><div class='add'>+about PNG, and the latest version of libpng, can be found at the PNG home</div><div class='add'>+page, &lt;http://www.libpng.org/pub/png/&gt;.</div><div class='add'>+</div><div class='add'>+Most users will not have to modify the library significantly; advanced</div><div class='add'>+users may want to modify it more.  All attempts were made to make it as</div><div class='add'>+complete as possible, while keeping the code easy to understand.</div><div class='add'>+Currently, this library only supports C.  Support for other languages</div><div class='add'>+is being considered.</div><div class='add'>+</div><div class='add'>+Libpng has been designed to handle multiple sessions at one time,</div><div class='add'>+to be easily modifiable, to be portable to the vast majority of</div><div class='add'>+machines (ANSI, K&amp;R, 16-, 32-, and 64-bit) available, and to be easy</div><div class='add'>+to use.  The ultimate goal of libpng is to promote the acceptance of</div><div class='add'>+the PNG file format in whatever way possible.  While there is still</div><div class='add'>+work to be done (see the TODO file), libpng should cover the</div><div class='add'>+majority of the needs of its users.</div><div class='add'>+</div><div class='add'>+Libpng uses zlib for its compression and decompression of PNG files.</div><div class='add'>+Further information about zlib, and the latest version of zlib, can</div><div class='add'>+be found at the zlib home page, &lt;http://www.info-zip.org/pub/infozip/zlib/&gt;.</div><div class='add'>+The zlib compression utility is a general purpose utility that is</div><div class='add'>+useful for more than PNG files, and can be used without libpng.</div><div class='add'>+See the documentation delivered with zlib for more details.</div><div class='add'>+You can usually find the source files for the zlib utility wherever you</div><div class='add'>+find the libpng source files.</div><div class='add'>+</div><div class='add'>+Libpng is thread safe, provided the threads are using different</div><div class='add'>+instances of the structures.  Each thread should have its own</div><div class='add'>+png_struct and png_info instances, and thus its own image.</div><div class='add'>+Libpng does not protect itself against two threads using the</div><div class='add'>+same instance of a structure.</div><div class='add'>+</div><div class='add'>+II. Structures</div><div class='add'>+</div><div class='add'>+There are two main structures that are important to libpng, png_struct</div><div class='add'>+and png_info.  Both are internal structures that are no longer exposed</div><div class='add'>+in the libpng interface (as of libpng 1.5.0).</div><div class='add'>+</div><div class='add'>+The png_info structure is designed to provide information about the</div><div class='add'>+PNG file.  At one time, the fields of png_info were intended to be</div><div class='add'>+directly accessible to the user.  However, this tended to cause problems</div><div class='add'>+with applications using dynamically loaded libraries, and as a result</div><div class='add'>+a set of interface functions for png_info (the png_get_*() and png_set_*()</div><div class='add'>+functions) was developed.</div><div class='add'>+</div><div class='add'>+The png_struct structure is the object used by the library to decode a</div><div class='add'>+single image.  As of 1.5.0 this structure is also not exposed.</div><div class='add'>+</div><div class='add'>+Almost all libpng APIs require a pointer to a png_struct as the first argument.</div><div class='add'>+Many (in particular the png_set and png_get APIs) also require a pointer</div><div class='add'>+to png_info as the second argument.  Some application visible macros</div><div class='add'>+defined in png.h designed for basic data access (reading and writing</div><div class='add'>+integers in the PNG format) break this rule, but it's almost always safe</div><div class='add'>+to assume that a (png_struct*) has to be passed to call an API function.</div><div class='add'>+</div><div class='add'>+The png.h header file is an invaluable reference for programming with libpng.</div><div class='add'>+And while I'm on the topic, make sure you include the libpng header file:</div><div class='add'>+</div><div class='add'>+#include &lt;png.h&gt;</div><div class='add'>+</div><div class='add'>+Types</div><div class='add'>+</div><div class='add'>+The png.h header file defines a number of integral types used by the</div><div class='add'>+APIs.  Most of these are fairly obvious; for example types corresponding</div><div class='add'>+to integers of particular sizes and types for passing color values.</div><div class='add'>+</div><div class='add'>+One exception is how non-integral numbers are handled.  For application</div><div class='add'>+convenience most APIs that take such numbers have C (double) arguments,</div><div class='add'>+however internally PNG, and libpng, use 32 bit signed integers and encode</div><div class='add'>+the value by multiplying by 100,000.  As of libpng 1.5.0 a convenience</div><div class='add'>+macro PNG_FP_1 is defined in png.h along with a type (png_fixed_point)</div><div class='add'>+which is simply (png_int_32).</div><div class='add'>+</div><div class='add'>+All APIs that take (double) arguments also have an matching API that</div><div class='add'>+takes the corresponding fixed point integer arguments.  The fixed point</div><div class='add'>+API has the same name as the floating point one with _fixed appended.</div><div class='add'>+The actual range of values permitted in the APIs is frequently less than</div><div class='add'>+the full range of (png_fixed_point) (-21474 to +21474).  When APIs require</div><div class='add'>+a non-negative argument the type is recorded as png_uint_32 above.  Consult</div><div class='add'>+the header file and the text below for more information.</div><div class='add'>+</div><div class='add'>+Special care must be take with sCAL chunk handling because the chunk itself</div><div class='add'>+uses non-integral values encoded as strings containing decimal floating point</div><div class='add'>+numbers.  See the comments in the header file.</div><div class='add'>+</div><div class='add'>+Configuration</div><div class='add'>+</div><div class='add'>+The main header file function declarations are frequently protected by C</div><div class='add'>+preprocessing directives of the form:</div><div class='add'>+</div><div class='add'>+    #ifdef PNG_feature_SUPPORTED</div><div class='add'>+    declare-function</div><div class='add'>+    #endif</div><div class='add'>+</div><div class='add'>+The library can be built without support for these APIs, although a</div><div class='add'>+standard build will have all implemented APIs.  Application programs</div><div class='add'>+should check the feature macros before using an API for maximum</div><div class='add'>+portability.  From libpng 1.5.0 the feature macros set during the build</div><div class='add'>+of libpng are recorded in the header file "pnglibconf.h" and this file</div><div class='add'>+is always included by png.h.</div><div class='add'>+</div><div class='add'>+If you don't need to change the library configuration from the default skip to</div><div class='add'>+the next section ("Reading").</div><div class='add'>+</div><div class='add'>+Notice that some of the makefiles in the 'scripts' directory and (in 1.5.0) all</div><div class='add'>+of the build project files in the 'projects' directory simply copy</div><div class='add'>+scripts/pnglibconf.h.prebuilt to pnglibconf.h.  This means that these build</div><div class='add'>+systems do not permit easy auto-configuration of the library - they only</div><div class='add'>+support the default configuration.</div><div class='add'>+</div><div class='add'>+The easiest way to make minor changes to the libpng configuration when</div><div class='add'>+auto-configuration is supported is to add definitions to the command line</div><div class='add'>+using (typically) CPPFLAGS.  For example:</div><div class='add'>+</div><div class='add'>+CPPFLAGS=-DPNG_NO_FLOATING_ARITHMETIC</div><div class='add'>+</div><div class='add'>+will change the internal libpng math implementation for gamma correction and</div><div class='add'>+other arithmetic calculations to fixed point, avoiding the need for fast</div><div class='add'>+floating point support.  The result can be seen in the generated pnglibconf.h -</div><div class='add'>+make sure it contains the changed feature macro setting.</div><div class='add'>+</div><div class='add'>+If you need to make more extensive configuration changes - more than one or two</div><div class='add'>+feature macro settings - you can either add -DPNG_USER_CONFIG to the build</div><div class='add'>+command line and put a list of feature macro settings in pngusr.h or you can set</div><div class='add'>+DFA_XTRA (a makefile variable) to a file containing the same information in the</div><div class='add'>+form of 'option' settings.</div><div class='add'>+</div><div class='add'>+A. Changing pnglibconf.h</div><div class='add'>+</div><div class='add'>+A variety of methods exist to build libpng.  Not all of these support</div><div class='add'>+reconfiguration of pnglibconf.h.  To reconfigure pnglibconf.h it must either be</div><div class='add'>+rebuilt from scripts/pnglibconf.dfa using awk or it must be edited by hand.</div><div class='add'>+</div><div class='add'>+Hand editing is achieved by copying scripts/pnglibconf.h.prebuilt and changing</div><div class='add'>+the lines defining the supported features, paying very close attention to the</div><div class='add'>+'option' information in scripts/pnglibconf.dfa that describes those features and</div><div class='add'>+their requirements.  This is easy to get wrong.</div><div class='add'>+</div><div class='add'>+B. Configuration using DFA_XTRA</div><div class='add'>+</div><div class='add'>+Rebuilding from pnglibconf.dfa is easy if a functioning 'awk', or a later</div><div class='add'>+variant such as 'nawk' or 'gawk', is available.  The configure build will</div><div class='add'>+automatically find an appropriate awk and build pnglibconf.h.</div><div class='add'>+scripts/pnglibconf.mak contains a set of make rules for doing the same thing if</div><div class='add'>+configure is not used, and many of the makefiles in the scripts directory use</div><div class='add'>+this approach.</div><div class='add'>+</div><div class='add'>+When rebuilding simply write new file containing changed options and set</div><div class='add'>+DFA_XTRA to the name of this file.  This causes the build to append the new file</div><div class='add'>+to the end of scripts/pnglibconf.dfa.  pngusr.dfa should contain lines of the</div><div class='add'>+following forms:</div><div class='add'>+</div><div class='add'>+everything = off</div><div class='add'>+</div><div class='add'>+This turns all optional features off.  Include it at the start of pngusr.dfa to</div><div class='add'>+make it easier to build a minimal configuration.  You will need to turn at least</div><div class='add'>+some features on afterward to enable either reading or writing code, or both.</div><div class='add'>+</div><div class='add'>+option feature on</div><div class='add'>+option feature off</div><div class='add'>+</div><div class='add'>+Enable or disable a single feature.  This will automatically enable other</div><div class='add'>+features required by a feature that is turned on or disable other features that</div><div class='add'>+require a feature which is turned off.  Conflicting settings will cause an error</div><div class='add'>+message to be emitted by awk.</div><div class='add'>+</div><div class='add'>+setting feature default value</div><div class='add'>+</div><div class='add'>+Changes the default value of setting 'feature' to 'value'.  There are a small</div><div class='add'>+number of settings listed at the top of pnglibconf.h, they are documented in the</div><div class='add'>+source code.  Most of these values have performance implications for the library</div><div class='add'>+but most of them have no visible effect on the API.  Some can also be overridden</div><div class='add'>+from the API.</div><div class='add'>+</div><div class='add'>+C. Configuration using PNG_USR_CONFIG</div><div class='add'>+</div><div class='add'>+If -DPNG_USR_CONFIG is added to the CFLAGS when pnglibconf.h is built the file</div><div class='add'>+pngusr.h will automatically be included before the options in</div><div class='add'>+scripts/pnglibconf.dfa are processed.  pngusr.h should contain only macro</div><div class='add'>+definitions turning features on or off or setting settings.</div><div class='add'>+</div><div class='add'>+Apart from the global setting "everything = off" all the options listed above</div><div class='add'>+can be set using macros in pngusr.h:</div><div class='add'>+</div><div class='add'>+#define PNG_feature_SUPPORTED</div><div class='add'>+</div><div class='add'>+is equivalent to:</div><div class='add'>+</div><div class='add'>+option feature on</div><div class='add'>+</div><div class='add'>+#define PNG_NO_feature</div><div class='add'>+</div><div class='add'>+is equivalent to:</div><div class='add'>+</div><div class='add'>+option feature off</div><div class='add'>+</div><div class='add'>+#define PNG_feature value</div><div class='add'>+</div><div class='add'>+is equivalent to:</div><div class='add'>+</div><div class='add'>+setting feature default value</div><div class='add'>+</div><div class='add'>+Notice that in both cases, pngusr.dfa and pngusr.h, the contents of the</div><div class='add'>+pngusr file you supply override the contents of scripts/pnglibconf.dfa</div><div class='add'>+</div><div class='add'>+If confusing or incomprehensible behavior results it is possible to</div><div class='add'>+examine the intermediate file pnglibconf.dfn to find the full set of</div><div class='add'>+dependency information for each setting and option.  Simply locate the</div><div class='add'>+feature in the file and read the C comments that precede it.</div><div class='add'>+</div><div class='add'>+III. Reading</div><div class='add'>+</div><div class='add'>+We'll now walk you through the possible functions to call when reading</div><div class='add'>+in a PNG file sequentially, briefly explaining the syntax and purpose</div><div class='add'>+of each one.  See example.c and png.h for more detail.  While</div><div class='add'>+progressive reading is covered in the next section, you will still</div><div class='add'>+need some of the functions discussed in this section to read a PNG</div><div class='add'>+file.</div><div class='add'>+</div><div class='add'>+Setup</div><div class='add'>+</div><div class='add'>+You will want to do the I/O initialization(*) before you get into libpng,</div><div class='add'>+so if it doesn't work, you don't have much to undo.  Of course, you</div><div class='add'>+will also want to insure that you are, in fact, dealing with a PNG</div><div class='add'>+file.  Libpng provides a simple check to see if a file is a PNG file.</div><div class='add'>+To use it, pass in the first 1 to 8 bytes of the file to the function</div><div class='add'>+png_sig_cmp(), and it will return 0 (false) if the bytes match the</div><div class='add'>+corresponding bytes of the PNG signature, or nonzero (true) otherwise.</div><div class='add'>+Of course, the more bytes you pass in, the greater the accuracy of the</div><div class='add'>+prediction.</div><div class='add'>+</div><div class='add'>+If you are intending to keep the file pointer open for use in libpng,</div><div class='add'>+you must ensure you don't read more than 8 bytes from the beginning</div><div class='add'>+of the file, and you also have to make a call to png_set_sig_bytes_read()</div><div class='add'>+with the number of bytes you read from the beginning.  Libpng will</div><div class='add'>+then only check the bytes (if any) that your program didn't read.</div><div class='add'>+</div><div class='add'>+(*): If you are not using the standard I/O functions, you will need</div><div class='add'>+to replace them with custom functions.  See the discussion under</div><div class='add'>+Customizing libpng.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    FILE *fp = fopen(file_name, "rb");</div><div class='add'>+    if (!fp)</div><div class='add'>+    {</div><div class='add'>+       return (ERROR);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    fread(header, 1, number, fp);</div><div class='add'>+    is_png = !png_sig_cmp(header, 0, number);</div><div class='add'>+</div><div class='add'>+    if (!is_png)</div><div class='add'>+    {</div><div class='add'>+       return (NOT_PNG);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Next, png_struct and png_info need to be allocated and initialized.  In</div><div class='add'>+order to ensure that the size of these structures is correct even with a</div><div class='add'>+dynamically linked libpng, there are functions to initialize and</div><div class='add'>+allocate the structures.  We also pass the library version, optional</div><div class='add'>+pointers to error handling functions, and a pointer to a data struct for</div><div class='add'>+use by the error functions, if necessary (the pointer and functions can</div><div class='add'>+be NULL if the default error handlers are to be used).  See the section</div><div class='add'>+on Changes to Libpng below regarding the old initialization functions.</div><div class='add'>+The structure allocation functions quietly return NULL if they fail to</div><div class='add'>+create the structure, so your application should check for that.</div><div class='add'>+</div><div class='add'>+    png_structp png_ptr = png_create_read_struct</div><div class='add'>+        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,</div><div class='add'>+        user_error_fn, user_warning_fn);</div><div class='add'>+</div><div class='add'>+    if (!png_ptr)</div><div class='add'>+       return (ERROR);</div><div class='add'>+</div><div class='add'>+    png_infop info_ptr = png_create_info_struct(png_ptr);</div><div class='add'>+</div><div class='add'>+    if (!info_ptr)</div><div class='add'>+    {</div><div class='add'>+       png_destroy_read_struct(&amp;png_ptr,</div><div class='add'>+           (png_infopp)NULL, (png_infopp)NULL);</div><div class='add'>+       return (ERROR);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    png_infop end_info = png_create_info_struct(png_ptr);</div><div class='add'>+</div><div class='add'>+    if (!end_info)</div><div class='add'>+    {</div><div class='add'>+       png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='add'>+          (png_infopp)NULL);</div><div class='add'>+       return (ERROR);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+If you want to use your own memory allocation routines,</div><div class='add'>+use a libpng that was built with PNG_USER_MEM_SUPPORTED defined, and use</div><div class='add'>+png_create_read_struct_2() instead of png_create_read_struct():</div><div class='add'>+</div><div class='add'>+    png_structp png_ptr = png_create_read_struct_2</div><div class='add'>+       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,</div><div class='add'>+        user_error_fn, user_warning_fn, (png_voidp)</div><div class='add'>+        user_mem_ptr, user_malloc_fn, user_free_fn);</div><div class='add'>+</div><div class='add'>+The error handling routines passed to png_create_read_struct()</div><div class='add'>+and the memory alloc/free routines passed to png_create_struct_2()</div><div class='add'>+are only necessary if you are not using the libpng supplied error</div><div class='add'>+handling and memory alloc/free functions.</div><div class='add'>+</div><div class='add'>+When libpng encounters an error, it expects to longjmp back</div><div class='add'>+to your routine.  Therefore, you will need to call setjmp and pass</div><div class='add'>+your png_jmpbuf(png_ptr).  If you read the file from different</div><div class='add'>+routines, you will need to update the jmpbuf field every time you enter</div><div class='add'>+a new routine that will call a png_*() function.</div><div class='add'>+</div><div class='add'>+See your documentation of setjmp/longjmp for your compiler for more</div><div class='add'>+information on setjmp/longjmp.  See the discussion on libpng error</div><div class='add'>+handling in the Customizing Libpng section below for more information</div><div class='add'>+on the libpng error handling.  If an error occurs, and libpng longjmp's</div><div class='add'>+back to your setjmp, you will want to call png_destroy_read_struct() to</div><div class='add'>+free any memory.</div><div class='add'>+</div><div class='add'>+    if (setjmp(png_jmpbuf(png_ptr)))</div><div class='add'>+    {</div><div class='add'>+       png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='add'>+           &amp;end_info);</div><div class='add'>+       fclose(fp);</div><div class='add'>+       return (ERROR);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+If you would rather avoid the complexity of setjmp/longjmp issues,</div><div class='add'>+you can compile libpng with PNG_NO_SETJMP, in which case</div><div class='add'>+errors will result in a call to PNG_ABORT() which defaults to abort().</div><div class='add'>+</div><div class='add'>+You can #define PNG_ABORT() to a function that does something</div><div class='add'>+more useful than abort(), as long as your function does not</div><div class='add'>+return.</div><div class='add'>+</div><div class='add'>+Now you need to set up the input code.  The default for libpng is to</div><div class='add'>+use the C function fread().  If you use this, you will need to pass a</div><div class='add'>+valid FILE * in the function png_init_io().  Be sure that the file is</div><div class='add'>+opened in binary mode.  If you wish to handle reading data in another</div><div class='add'>+way, you need not call the png_init_io() function, but you must then</div><div class='add'>+implement the libpng I/O methods discussed in the Customizing Libpng</div><div class='add'>+section below.</div><div class='add'>+</div><div class='add'>+    png_init_io(png_ptr, fp);</div><div class='add'>+</div><div class='add'>+If you had previously opened the file and read any of the signature from</div><div class='add'>+the beginning in order to see if this was a PNG file, you need to let</div><div class='add'>+libpng know that there are some bytes missing from the start of the file.</div><div class='add'>+</div><div class='add'>+    png_set_sig_bytes(png_ptr, number);</div><div class='add'>+</div><div class='add'>+You can change the zlib compression buffer size to be used while</div><div class='add'>+reading compressed data with</div><div class='add'>+</div><div class='add'>+    png_set_compression_buffer_size(png_ptr, buffer_size);</div><div class='add'>+</div><div class='add'>+where the default size is 8192 bytes.  Note that the buffer size</div><div class='add'>+is changed immediately and the buffer is reallocated immediately,</div><div class='add'>+instead of setting a flag to be acted upon later.</div><div class='add'>+</div><div class='add'>+If you want CRC errors to be handled in a different manner than</div><div class='add'>+the default, use</div><div class='add'>+</div><div class='add'>+    png_set_crc_action(png_ptr, crit_action, ancil_action);</div><div class='add'>+</div><div class='add'>+The values for png_set_crc_action() say how libpng is to handle CRC errors in</div><div class='add'>+ancillary and critical chunks, and whether to use the data contained</div><div class='add'>+therein.  Note that it is impossible to "discard" data in a critical</div><div class='add'>+chunk.</div><div class='add'>+</div><div class='add'>+Choices for (int) crit_action are</div><div class='add'>+   PNG_CRC_DEFAULT      0  error/quit</div><div class='add'>+   PNG_CRC_ERROR_QUIT   1  error/quit</div><div class='add'>+   PNG_CRC_WARN_USE     3  warn/use data</div><div class='add'>+   PNG_CRC_QUIET_USE    4  quiet/use data</div><div class='add'>+   PNG_CRC_NO_CHANGE    5  use the current value</div><div class='add'>+</div><div class='add'>+Choices for (int) ancil_action are</div><div class='add'>+   PNG_CRC_DEFAULT      0  error/quit</div><div class='add'>+   PNG_CRC_ERROR_QUIT   1  error/quit</div><div class='add'>+   PNG_CRC_WARN_DISCARD 2  warn/discard data</div><div class='add'>+   PNG_CRC_WARN_USE     3  warn/use data</div><div class='add'>+   PNG_CRC_QUIET_USE    4  quiet/use data</div><div class='add'>+   PNG_CRC_NO_CHANGE    5  use the current value</div><div class='add'>+</div><div class='add'>+Setting up callback code</div><div class='add'>+</div><div class='add'>+You can set up a callback function to handle any unknown chunks in the</div><div class='add'>+input stream. You must supply the function</div><div class='add'>+</div><div class='add'>+    read_chunk_callback(png_structp png_ptr,</div><div class='add'>+         png_unknown_chunkp chunk);</div><div class='add'>+    {</div><div class='add'>+       /* The unknown chunk structure contains your</div><div class='add'>+          chunk data, along with similar data for any other</div><div class='add'>+          unknown chunks: */</div><div class='add'>+</div><div class='add'>+           png_byte name[5];</div><div class='add'>+           png_byte *data;</div><div class='add'>+           png_size_t size;</div><div class='add'>+</div><div class='add'>+       /* Note that libpng has already taken care of</div><div class='add'>+          the CRC handling */</div><div class='add'>+</div><div class='add'>+       /* put your code here.  Search for your chunk in the</div><div class='add'>+          unknown chunk structure, process it, and return one</div><div class='add'>+          of the following: */</div><div class='add'>+</div><div class='add'>+       return (-n); /* chunk had an error */</div><div class='add'>+       return (0); /* did not recognize */</div><div class='add'>+       return (n); /* success */</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+(You can give your function another name that you like instead of</div><div class='add'>+"read_chunk_callback")</div><div class='add'>+</div><div class='add'>+To inform libpng about your function, use</div><div class='add'>+</div><div class='add'>+    png_set_read_user_chunk_fn(png_ptr, user_chunk_ptr,</div><div class='add'>+        read_chunk_callback);</div><div class='add'>+</div><div class='add'>+This names not only the callback function, but also a user pointer that</div><div class='add'>+you can retrieve with</div><div class='add'>+</div><div class='add'>+    png_get_user_chunk_ptr(png_ptr);</div><div class='add'>+</div><div class='add'>+If you call the png_set_read_user_chunk_fn() function, then all unknown</div><div class='add'>+chunks will be saved when read, in case your callback function will need</div><div class='add'>+one or more of them.  This behavior can be changed with the</div><div class='add'>+png_set_keep_unknown_chunks() function, described below.</div><div class='add'>+</div><div class='add'>+At this point, you can set up a callback function that will be</div><div class='add'>+called after each row has been read, which you can use to control</div><div class='add'>+a progress meter or the like.  It's demonstrated in pngtest.c.</div><div class='add'>+You must supply a function</div><div class='add'>+</div><div class='add'>+    void read_row_callback(png_structp png_ptr,</div><div class='add'>+       png_uint_32 row, int pass);</div><div class='add'>+    {</div><div class='add'>+      /* put your code here */</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+(You can give it another name that you like instead of "read_row_callback")</div><div class='add'>+</div><div class='add'>+To inform libpng about your function, use</div><div class='add'>+</div><div class='add'>+    png_set_read_status_fn(png_ptr, read_row_callback);</div><div class='add'>+</div><div class='add'>+Unknown-chunk handling</div><div class='add'>+</div><div class='add'>+Now you get to set the way the library processes unknown chunks in the</div><div class='add'>+input PNG stream. Both known and unknown chunks will be read.  Normal</div><div class='add'>+behavior is that known chunks will be parsed into information in</div><div class='add'>+various info_ptr members while unknown chunks will be discarded. This</div><div class='add'>+behavior can be wasteful if your application will never use some known</div><div class='add'>+chunk types. To change this, you can call:</div><div class='add'>+</div><div class='add'>+    png_set_keep_unknown_chunks(png_ptr, keep,</div><div class='add'>+        chunk_list, num_chunks);</div><div class='add'>+    keep       - 0: default unknown chunk handling</div><div class='add'>+                 1: ignore; do not keep</div><div class='add'>+                 2: keep only if safe-to-copy</div><div class='add'>+                 3: keep even if unsafe-to-copy</div><div class='add'>+</div><div class='add'>+               You can use these definitions:</div><div class='add'>+                 PNG_HANDLE_CHUNK_AS_DEFAULT   0</div><div class='add'>+                 PNG_HANDLE_CHUNK_NEVER        1</div><div class='add'>+                 PNG_HANDLE_CHUNK_IF_SAFE      2</div><div class='add'>+                 PNG_HANDLE_CHUNK_ALWAYS       3</div><div class='add'>+</div><div class='add'>+    chunk_list - list of chunks affected (a byte string,</div><div class='add'>+                 five bytes per chunk, NULL or '\0' if</div><div class='add'>+                 num_chunks is 0)</div><div class='add'>+</div><div class='add'>+    num_chunks - number of chunks affected; if 0, all</div><div class='add'>+                 unknown chunks are affected.  If nonzero,</div><div class='add'>+                 only the chunks in the list are affected</div><div class='add'>+</div><div class='add'>+Unknown chunks declared in this way will be saved as raw data onto a</div><div class='add'>+list of png_unknown_chunk structures.  If a chunk that is normally</div><div class='add'>+known to libpng is named in the list, it will be handled as unknown,</div><div class='add'>+according to the "keep" directive.  If a chunk is named in successive</div><div class='add'>+instances of png_set_keep_unknown_chunks(), the final instance will</div><div class='add'>+take precedence.  The IHDR and IEND chunks should not be named in</div><div class='add'>+chunk_list; if they are, libpng will process them normally anyway.</div><div class='add'>+</div><div class='add'>+Here is an example of the usage of png_set_keep_unknown_chunks(),</div><div class='add'>+where the private "vpAg" chunk will later be processed by a user chunk</div><div class='add'>+callback function:</div><div class='add'>+</div><div class='add'>+    png_byte vpAg[5]={118, 112,  65, 103, (png_byte) '\0'};</div><div class='add'>+</div><div class='add'>+    #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)</div><div class='add'>+      png_byte unused_chunks[]=</div><div class='add'>+      {</div><div class='add'>+        104,  73,  83,  84, (png_byte) '\0',   /* hIST */</div><div class='add'>+        105,  84,  88, 116, (png_byte) '\0',   /* iTXt */</div><div class='add'>+        112,  67,  65,  76, (png_byte) '\0',   /* pCAL */</div><div class='add'>+        115,  67,  65,  76, (png_byte) '\0',   /* sCAL */</div><div class='add'>+        115,  80,  76,  84, (png_byte) '\0',   /* sPLT */</div><div class='add'>+        116,  73,  77,  69, (png_byte) '\0',   /* tIME */</div><div class='add'>+      };</div><div class='add'>+    #endif</div><div class='add'>+</div><div class='add'>+    ...</div><div class='add'>+</div><div class='add'>+    #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)</div><div class='add'>+      /* ignore all unknown chunks: */</div><div class='add'>+      png_set_keep_unknown_chunks(read_ptr, 1, NULL, 0);</div><div class='add'>+</div><div class='add'>+      /* except for vpAg: */</div><div class='add'>+      png_set_keep_unknown_chunks(read_ptr, 2, vpAg, 1);</div><div class='add'>+</div><div class='add'>+      /* also ignore unused known chunks: */</div><div class='add'>+      png_set_keep_unknown_chunks(read_ptr, 1, unused_chunks,</div><div class='add'>+         (int)sizeof(unused_chunks)/5);</div><div class='add'>+    #endif</div><div class='add'>+</div><div class='add'>+User limits</div><div class='add'>+</div><div class='add'>+The PNG specification allows the width and height of an image to be as</div><div class='add'>+large as 2^31-1 (0x7fffffff), or about 2.147 billion rows and columns.</div><div class='add'>+Since very few applications really need to process such large images,</div><div class='add'>+we have imposed an arbitrary 1-million limit on rows and columns.</div><div class='add'>+Larger images will be rejected immediately with a png_error() call. If</div><div class='add'>+you wish to override this limit, you can use</div><div class='add'>+</div><div class='add'>+   png_set_user_limits(png_ptr, width_max, height_max);</div><div class='add'>+</div><div class='add'>+to set your own limits, or use width_max = height_max = 0x7fffffffL</div><div class='add'>+to allow all valid dimensions (libpng may reject some very large images</div><div class='add'>+anyway because of potential buffer overflow conditions).</div><div class='add'>+</div><div class='add'>+You should put this statement after you create the PNG structure and</div><div class='add'>+before calling png_read_info(), png_read_png(), or png_process_data().</div><div class='add'>+If you need to retrieve the limits that are being applied, use</div><div class='add'>+</div><div class='add'>+   width_max = png_get_user_width_max(png_ptr);</div><div class='add'>+   height_max = png_get_user_height_max(png_ptr);</div><div class='add'>+</div><div class='add'>+The PNG specification sets no limit on the number of ancillary chunks</div><div class='add'>+allowed in a PNG datastream.  You can impose a limit on the total number</div><div class='add'>+of sPLT, tEXt, iTXt, zTXt, and unknown chunks that will be stored, with</div><div class='add'>+</div><div class='add'>+   png_set_chunk_cache_max(png_ptr, user_chunk_cache_max);</div><div class='add'>+</div><div class='add'>+where 0x7fffffffL means unlimited.  You can retrieve this limit with</div><div class='add'>+</div><div class='add'>+   chunk_cache_max = png_get_chunk_cache_max(png_ptr);</div><div class='add'>+</div><div class='add'>+This limit also applies to the number of buffers that can be allocated</div><div class='add'>+by png_decompress_chunk() while decompressing iTXt, zTXt, and iCCP chunks.</div><div class='add'>+</div><div class='add'>+You can also set a limit on the amount of memory that a compressed chunk</div><div class='add'>+other than IDAT can occupy, with</div><div class='add'>+</div><div class='add'>+   png_set_chunk_malloc_max(png_ptr, user_chunk_malloc_max);</div><div class='add'>+</div><div class='add'>+and you can retrieve the limit with</div><div class='add'>+</div><div class='add'>+   chunk_malloc_max = png_get_chunk_malloc_max(png_ptr);</div><div class='add'>+</div><div class='add'>+Any chunks that would cause either of these limits to be exceeded will</div><div class='add'>+be ignored.</div><div class='add'>+</div><div class='add'>+The high-level read interface</div><div class='add'>+</div><div class='add'>+At this point there are two ways to proceed; through the high-level</div><div class='add'>+read interface, or through a sequence of low-level read operations.</div><div class='add'>+You can use the high-level interface if (a) you are willing to read</div><div class='add'>+the entire image into memory, and (b) the input transformations</div><div class='add'>+you want to do are limited to the following set:</div><div class='add'>+</div><div class='add'>+    PNG_TRANSFORM_IDENTITY      No transformation</div><div class='add'>+    PNG_TRANSFORM_STRIP_16      Strip 16-bit samples to</div><div class='add'>+                                8 bits</div><div class='add'>+    PNG_TRANSFORM_STRIP_ALPHA   Discard the alpha channel</div><div class='add'>+    PNG_TRANSFORM_PACKING       Expand 1, 2 and 4-bit</div><div class='add'>+                                samples to bytes</div><div class='add'>+    PNG_TRANSFORM_PACKSWAP      Change order of packed</div><div class='add'>+                                pixels to LSB first</div><div class='add'>+    PNG_TRANSFORM_EXPAND        Perform set_expand()</div><div class='add'>+    PNG_TRANSFORM_INVERT_MONO   Invert monochrome images</div><div class='add'>+    PNG_TRANSFORM_SHIFT         Normalize pixels to the</div><div class='add'>+                                sBIT depth</div><div class='add'>+    PNG_TRANSFORM_BGR           Flip RGB to BGR, RGBA</div><div class='add'>+                                to BGRA</div><div class='add'>+    PNG_TRANSFORM_SWAP_ALPHA    Flip RGBA to ARGB or GA</div><div class='add'>+                                to AG</div><div class='add'>+    PNG_TRANSFORM_INVERT_ALPHA  Change alpha from opacity</div><div class='add'>+                                to transparency</div><div class='add'>+    PNG_TRANSFORM_SWAP_ENDIAN   Byte-swap 16-bit samples</div><div class='add'>+    PNG_TRANSFORM_GRAY_TO_RGB   Expand grayscale samples</div><div class='add'>+                                to RGB (or GA to RGBA)</div><div class='add'>+</div><div class='add'>+(This excludes setting a background color, doing gamma transformation,</div><div class='add'>+quantizing, and setting filler.)  If this is the case, simply do this:</div><div class='add'>+</div><div class='add'>+    png_read_png(png_ptr, info_ptr, png_transforms, NULL)</div><div class='add'>+</div><div class='add'>+where png_transforms is an integer containing the bitwise OR of some</div><div class='add'>+set of transformation flags.  This call is equivalent to png_read_info(),</div><div class='add'>+followed the set of transformations indicated by the transform mask,</div><div class='add'>+then png_read_image(), and finally png_read_end().</div><div class='add'>+</div><div class='add'>+(The final parameter of this call is not yet used.  Someday it might point</div><div class='add'>+to transformation parameters required by some future input transform.)</div><div class='add'>+</div><div class='add'>+You must use png_transforms and not call any png_set_transform() functions</div><div class='add'>+when you use png_read_png().</div><div class='add'>+</div><div class='add'>+After you have called png_read_png(), you can retrieve the image data</div><div class='add'>+with</div><div class='add'>+</div><div class='add'>+   row_pointers = png_get_rows(png_ptr, info_ptr);</div><div class='add'>+</div><div class='add'>+where row_pointers is an array of pointers to the pixel data for each row:</div><div class='add'>+</div><div class='add'>+   png_bytep row_pointers[height];</div><div class='add'>+</div><div class='add'>+If you know your image size and pixel size ahead of time, you can allocate</div><div class='add'>+row_pointers prior to calling png_read_png() with</div><div class='add'>+</div><div class='add'>+   if (height &gt; PNG_UINT_32_MAX/png_sizeof(png_byte))</div><div class='add'>+      png_error (png_ptr,</div><div class='add'>+          "Image is too tall to process in memory");</div><div class='add'>+</div><div class='add'>+   if (width &gt; PNG_UINT_32_MAX/pixel_size)</div><div class='add'>+      png_error (png_ptr,</div><div class='add'>+          "Image is too wide to process in memory");</div><div class='add'>+</div><div class='add'>+   row_pointers = png_malloc(png_ptr,</div><div class='add'>+       height*png_sizeof(png_bytep));</div><div class='add'>+</div><div class='add'>+   for (int i=0; i&lt;height, i++)</div><div class='add'>+      row_pointers[i]=NULL;  /* security precaution */</div><div class='add'>+</div><div class='add'>+   for (int i=0; i&lt;height, i++)</div><div class='add'>+      row_pointers[i]=png_malloc(png_ptr,</div><div class='add'>+          width*pixel_size);</div><div class='add'>+</div><div class='add'>+   png_set_rows(png_ptr, info_ptr, &amp;row_pointers);</div><div class='add'>+</div><div class='add'>+Alternatively you could allocate your image in one big block and define</div><div class='add'>+row_pointers[i] to point into the proper places in your block.</div><div class='add'>+</div><div class='add'>+If you use png_set_rows(), the application is responsible for freeing</div><div class='add'>+row_pointers (and row_pointers[i], if they were separately allocated).</div><div class='add'>+</div><div class='add'>+If you don't allocate row_pointers ahead of time, png_read_png() will</div><div class='add'>+do it, and it'll be free'ed by libpng when you call png_destroy_*().</div><div class='add'>+</div><div class='add'>+The low-level read interface</div><div class='add'>+</div><div class='add'>+If you are going the low-level route, you are now ready to read all</div><div class='add'>+the file information up to the actual image data.  You do this with a</div><div class='add'>+call to png_read_info().</div><div class='add'>+</div><div class='add'>+    png_read_info(png_ptr, info_ptr);</div><div class='add'>+</div><div class='add'>+This will process all chunks up to but not including the image data.</div><div class='add'>+</div><div class='add'>+Querying the info structure</div><div class='add'>+</div><div class='add'>+Functions are used to get the information from the info_ptr once it</div><div class='add'>+has been read.  Note that these fields may not be completely filled</div><div class='add'>+in until png_read_end() has read the chunk data following the image.</div><div class='add'>+</div><div class='add'>+    png_get_IHDR(png_ptr, info_ptr, &amp;width, &amp;height,</div><div class='add'>+       &amp;bit_depth, &amp;color_type, &amp;interlace_type,</div><div class='add'>+       &amp;compression_type, &amp;filter_method);</div><div class='add'>+</div><div class='add'>+    width          - holds the width of the image</div><div class='add'>+                     in pixels (up to 2^31).</div><div class='add'>+</div><div class='add'>+    height         - holds the height of the image</div><div class='add'>+                     in pixels (up to 2^31).</div><div class='add'>+</div><div class='add'>+    bit_depth      - holds the bit depth of one of the</div><div class='add'>+                     image channels.  (valid values are</div><div class='add'>+                     1, 2, 4, 8, 16 and depend also on</div><div class='add'>+                     the color_type.  See also</div><div class='add'>+                     significant bits (sBIT) below).</div><div class='add'>+</div><div class='add'>+    color_type     - describes which color/alpha channels</div><div class='add'>+                         are present.</div><div class='add'>+                     PNG_COLOR_TYPE_GRAY</div><div class='add'>+                        (bit depths 1, 2, 4, 8, 16)</div><div class='add'>+                     PNG_COLOR_TYPE_GRAY_ALPHA</div><div class='add'>+                        (bit depths 8, 16)</div><div class='add'>+                     PNG_COLOR_TYPE_PALETTE</div><div class='add'>+                        (bit depths 1, 2, 4, 8)</div><div class='add'>+                     PNG_COLOR_TYPE_RGB</div><div class='add'>+                        (bit_depths 8, 16)</div><div class='add'>+                     PNG_COLOR_TYPE_RGB_ALPHA</div><div class='add'>+                        (bit_depths 8, 16)</div><div class='add'>+</div><div class='add'>+                     PNG_COLOR_MASK_PALETTE</div><div class='add'>+                     PNG_COLOR_MASK_COLOR</div><div class='add'>+                     PNG_COLOR_MASK_ALPHA</div><div class='add'>+</div><div class='add'>+    interlace_type - (PNG_INTERLACE_NONE or</div><div class='add'>+                     PNG_INTERLACE_ADAM7)</div><div class='add'>+</div><div class='add'>+    compression_type - (must be PNG_COMPRESSION_TYPE_BASE</div><div class='add'>+                     for PNG 1.0)</div><div class='add'>+</div><div class='add'>+    filter_method  - (must be PNG_FILTER_TYPE_BASE</div><div class='add'>+                     for PNG 1.0, and can also be</div><div class='add'>+                     PNG_INTRAPIXEL_DIFFERENCING if</div><div class='add'>+                     the PNG datastream is embedded in</div><div class='add'>+                     a MNG-1.0 datastream)</div><div class='add'>+</div><div class='add'>+    Any or all of interlace_type, compression_type, or</div><div class='add'>+    filter_method can be NULL if you are</div><div class='add'>+    not interested in their values.</div><div class='add'>+</div><div class='add'>+    Note that png_get_IHDR() returns 32-bit data into</div><div class='add'>+    the application's width and height variables.</div><div class='add'>+    This is an unsafe situation if these are 16-bit</div><div class='add'>+    variables.  In such situations, the</div><div class='add'>+    png_get_image_width() and png_get_image_height()</div><div class='add'>+    functions described below are safer.</div><div class='add'>+</div><div class='add'>+    width            = png_get_image_width(png_ptr,</div><div class='add'>+                         info_ptr);</div><div class='add'>+</div><div class='add'>+    height           = png_get_image_height(png_ptr,</div><div class='add'>+                         info_ptr);</div><div class='add'>+</div><div class='add'>+    bit_depth        = png_get_bit_depth(png_ptr,</div><div class='add'>+                         info_ptr);</div><div class='add'>+</div><div class='add'>+    color_type       = png_get_color_type(png_ptr,</div><div class='add'>+                         info_ptr);</div><div class='add'>+</div><div class='add'>+    interlace_type   = png_get_interlace_type(png_ptr,</div><div class='add'>+                         info_ptr);</div><div class='add'>+</div><div class='add'>+    compression_type = png_get_compression_type(png_ptr,</div><div class='add'>+                         info_ptr);</div><div class='add'>+</div><div class='add'>+    filter_method    = png_get_filter_type(png_ptr,</div><div class='add'>+                         info_ptr);</div><div class='add'>+</div><div class='add'>+    channels = png_get_channels(png_ptr, info_ptr);</div><div class='add'>+</div><div class='add'>+    channels       - number of channels of info for the</div><div class='add'>+                     color type (valid values are 1 (GRAY,</div><div class='add'>+                     PALETTE), 2 (GRAY_ALPHA), 3 (RGB),</div><div class='add'>+                     4 (RGB_ALPHA or RGB + filler byte))</div><div class='add'>+</div><div class='add'>+    rowbytes = png_get_rowbytes(png_ptr, info_ptr);</div><div class='add'>+</div><div class='add'>+    rowbytes       - number of bytes needed to hold a row</div><div class='add'>+</div><div class='add'>+    signature = png_get_signature(png_ptr, info_ptr);</div><div class='add'>+</div><div class='add'>+    signature      - holds the signature read from the</div><div class='add'>+                     file (if any).  The data is kept in</div><div class='add'>+                     the same offset it would be if the</div><div class='add'>+                     whole signature were read (i.e. if an</div><div class='add'>+                     application had already read in 4</div><div class='add'>+                     bytes of signature before starting</div><div class='add'>+                     libpng, the remaining 4 bytes would</div><div class='add'>+                     be in signature[4] through signature[7]</div><div class='add'>+                     (see png_set_sig_bytes())).</div><div class='add'>+</div><div class='add'>+These are also important, but their validity depends on whether the chunk</div><div class='add'>+has been read.  The png_get_valid(png_ptr, info_ptr, PNG_INFO_&lt;chunk&gt;) and</div><div class='add'>+png_get_&lt;chunk&gt;(png_ptr, info_ptr, ...) functions return non-zero if the</div><div class='add'>+data has been read, or zero if it is missing.  The parameters to the</div><div class='add'>+png_get_&lt;chunk&gt; are set directly if they are simple data types, or a</div><div class='add'>+pointer into the info_ptr is returned for any complex types.</div><div class='add'>+</div><div class='add'>+    png_get_PLTE(png_ptr, info_ptr, &amp;palette,</div><div class='add'>+                     &amp;num_palette);</div><div class='add'>+</div><div class='add'>+    palette        - the palette for the file</div><div class='add'>+                     (array of png_color)</div><div class='add'>+</div><div class='add'>+    num_palette    - number of entries in the palette</div><div class='add'>+</div><div class='add'>+    png_get_gAMA(png_ptr, info_ptr, &amp;file_gamma);</div><div class='add'>+    png_get_gAMA_fixed(png_ptr, info_ptr, &amp;int_file_gamma);</div><div class='add'>+</div><div class='add'>+    file_gamma     - the gamma at which the file is</div><div class='add'>+                     written (PNG_INFO_gAMA)</div><div class='add'>+</div><div class='add'>+    int_file_gamma - 100,000 times the gamma at which the</div><div class='add'>+                     file is written</div><div class='add'>+</div><div class='add'>+    png_get_sRGB(png_ptr, info_ptr, &amp;srgb_intent);</div><div class='add'>+</div><div class='add'>+    file_srgb_intent - the rendering intent (PNG_INFO_sRGB)</div><div class='add'>+                     The presence of the sRGB chunk</div><div class='add'>+                     means that the pixel data is in the</div><div class='add'>+                     sRGB color space.  This chunk also</div><div class='add'>+                     implies specific values of gAMA and</div><div class='add'>+                     cHRM.</div><div class='add'>+</div><div class='add'>+    png_get_iCCP(png_ptr, info_ptr, &amp;name,</div><div class='add'>+       &amp;compression_type, &amp;profile, &amp;proflen);</div><div class='add'>+</div><div class='add'>+    name             - The profile name.</div><div class='add'>+</div><div class='add'>+    compression_type - The compression type; always</div><div class='add'>+                       PNG_COMPRESSION_TYPE_BASE for PNG 1.0.</div><div class='add'>+                       You may give NULL to this argument to</div><div class='add'>+                       ignore it.</div><div class='add'>+</div><div class='add'>+    profile          - International Color Consortium color</div><div class='add'>+                       profile data. May contain NULs.</div><div class='add'>+</div><div class='add'>+    proflen          - length of profile data in bytes.</div><div class='add'>+</div><div class='add'>+    png_get_sBIT(png_ptr, info_ptr, &amp;sig_bit);</div><div class='add'>+</div><div class='add'>+    sig_bit        - the number of significant bits for</div><div class='add'>+                     (PNG_INFO_sBIT) each of the gray,</div><div class='add'>+                     red, green, and blue channels,</div><div class='add'>+                     whichever are appropriate for the</div><div class='add'>+                     given color type (png_color_16)</div><div class='add'>+</div><div class='add'>+    png_get_tRNS(png_ptr, info_ptr, &amp;trans_alpha,</div><div class='add'>+                     &amp;num_trans, &amp;trans_color);</div><div class='add'>+</div><div class='add'>+    trans_alpha    - array of alpha (transparency)</div><div class='add'>+                     entries for palette (PNG_INFO_tRNS)</div><div class='add'>+</div><div class='add'>+    num_trans      - number of transparent entries</div><div class='add'>+                     (PNG_INFO_tRNS)</div><div class='add'>+</div><div class='add'>+    trans_color    - graylevel or color sample values of</div><div class='add'>+                     the single transparent color for</div><div class='add'>+                     non-paletted images (PNG_INFO_tRNS)</div><div class='add'>+</div><div class='add'>+    png_get_hIST(png_ptr, info_ptr, &amp;hist);</div><div class='add'>+                     (PNG_INFO_hIST)</div><div class='add'>+</div><div class='add'>+    hist           - histogram of palette (array of</div><div class='add'>+                     png_uint_16)</div><div class='add'>+</div><div class='add'>+    png_get_tIME(png_ptr, info_ptr, &amp;mod_time);</div><div class='add'>+</div><div class='add'>+    mod_time       - time image was last modified</div><div class='add'>+                    (PNG_VALID_tIME)</div><div class='add'>+</div><div class='add'>+    png_get_bKGD(png_ptr, info_ptr, &amp;background);</div><div class='add'>+</div><div class='add'>+    background     - background color (PNG_VALID_bKGD)</div><div class='add'>+                     valid 16-bit red, green and blue</div><div class='add'>+                     values, regardless of color_type</div><div class='add'>+</div><div class='add'>+    num_comments   = png_get_text(png_ptr, info_ptr,</div><div class='add'>+                     &amp;text_ptr, &amp;num_text);</div><div class='add'>+</div><div class='add'>+    num_comments   - number of comments</div><div class='add'>+</div><div class='add'>+    text_ptr       - array of png_text holding image</div><div class='add'>+                     comments</div><div class='add'>+</div><div class='add'>+    text_ptr[i].compression - type of compression used</div><div class='add'>+                 on "text" PNG_TEXT_COMPRESSION_NONE</div><div class='add'>+                           PNG_TEXT_COMPRESSION_zTXt</div><div class='add'>+                           PNG_ITXT_COMPRESSION_NONE</div><div class='add'>+                           PNG_ITXT_COMPRESSION_zTXt</div><div class='add'>+</div><div class='add'>+    text_ptr[i].key   - keyword for comment.  Must contain</div><div class='add'>+                         1-79 characters.</div><div class='add'>+</div><div class='add'>+    text_ptr[i].text  - text comments for current</div><div class='add'>+                         keyword.  Can be empty.</div><div class='add'>+</div><div class='add'>+    text_ptr[i].text_length - length of text string,</div><div class='add'>+                 after decompression, 0 for iTXt</div><div class='add'>+</div><div class='add'>+    text_ptr[i].itxt_length - length of itxt string,</div><div class='add'>+                 after decompression, 0 for tEXt/zTXt</div><div class='add'>+</div><div class='add'>+    text_ptr[i].lang  - language of comment (empty</div><div class='add'>+                         string for unknown).</div><div class='add'>+</div><div class='add'>+    text_ptr[i].lang_key  - keyword in UTF-8</div><div class='add'>+                         (empty string for unknown).</div><div class='add'>+</div><div class='add'>+    Note that the itxt_length, lang, and lang_key</div><div class='add'>+    members of the text_ptr structure only exist</div><div class='add'>+    when the library is built with iTXt chunk support.</div><div class='add'>+</div><div class='add'>+    num_text       - number of comments (same as</div><div class='add'>+                     num_comments; you can put NULL here</div><div class='add'>+                     to avoid the duplication)</div><div class='add'>+</div><div class='add'>+    Note while png_set_text() will accept text, language,</div><div class='add'>+    and translated keywords that can be NULL pointers, the</div><div class='add'>+    structure returned by png_get_text will always contain</div><div class='add'>+    regular zero-terminated C strings.  They might be</div><div class='add'>+    empty strings but they will never be NULL pointers.</div><div class='add'>+</div><div class='add'>+    num_spalettes = png_get_sPLT(png_ptr, info_ptr,</div><div class='add'>+       &amp;palette_ptr);</div><div class='add'>+</div><div class='add'>+    num_spalettes  - number of sPLT chunks read.</div><div class='add'>+</div><div class='add'>+    palette_ptr    - array of palette structures holding</div><div class='add'>+                     contents of one or more sPLT chunks</div><div class='add'>+                     read.</div><div class='add'>+</div><div class='add'>+    png_get_oFFs(png_ptr, info_ptr, &amp;offset_x, &amp;offset_y,</div><div class='add'>+       &amp;unit_type);</div><div class='add'>+</div><div class='add'>+    offset_x       - positive offset from the left edge</div><div class='add'>+                     of the screen</div><div class='add'>+</div><div class='add'>+    offset_y       - positive offset from the top edge</div><div class='add'>+                     of the screen</div><div class='add'>+</div><div class='add'>+    unit_type      - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER</div><div class='add'>+</div><div class='add'>+    png_get_pHYs(png_ptr, info_ptr, &amp;res_x, &amp;res_y,</div><div class='add'>+       &amp;unit_type);</div><div class='add'>+</div><div class='add'>+    res_x          - pixels/unit physical resolution in</div><div class='add'>+                     x direction</div><div class='add'>+</div><div class='add'>+    res_y          - pixels/unit physical resolution in</div><div class='add'>+                     x direction</div><div class='add'>+</div><div class='add'>+    unit_type      - PNG_RESOLUTION_UNKNOWN,</div><div class='add'>+                     PNG_RESOLUTION_METER</div><div class='add'>+</div><div class='add'>+    png_get_sCAL(png_ptr, info_ptr, &amp;unit, &amp;width,</div><div class='add'>+       &amp;height)</div><div class='add'>+</div><div class='add'>+    unit        - physical scale units (an integer)</div><div class='add'>+</div><div class='add'>+    width       - width of a pixel in physical scale units</div><div class='add'>+</div><div class='add'>+    height      - height of a pixel in physical scale units</div><div class='add'>+                 (width and height are doubles)</div><div class='add'>+</div><div class='add'>+    png_get_sCAL_s(png_ptr, info_ptr, &amp;unit, &amp;width,</div><div class='add'>+       &amp;height)</div><div class='add'>+</div><div class='add'>+    unit        - physical scale units (an integer)</div><div class='add'>+</div><div class='add'>+    width       - width of a pixel in physical scale units</div><div class='add'>+</div><div class='add'>+    height      - height of a pixel in physical scale units</div><div class='add'>+                 (width and height are strings like "2.54")</div><div class='add'>+</div><div class='add'>+    num_unknown_chunks = png_get_unknown_chunks(png_ptr,</div><div class='add'>+       info_ptr, &amp;unknowns)</div><div class='add'>+</div><div class='add'>+    unknowns          - array of png_unknown_chunk</div><div class='add'>+                        structures holding unknown chunks</div><div class='add'>+</div><div class='add'>+    unknowns[i].name  - name of unknown chunk</div><div class='add'>+</div><div class='add'>+    unknowns[i].data  - data of unknown chunk</div><div class='add'>+</div><div class='add'>+    unknowns[i].size  - size of unknown chunk's data</div><div class='add'>+</div><div class='add'>+    unknowns[i].location - position of chunk in file</div><div class='add'>+</div><div class='add'>+    The value of "i" corresponds to the order in which the</div><div class='add'>+    chunks were read from the PNG file or inserted with the</div><div class='add'>+    png_set_unknown_chunks() function.</div><div class='add'>+</div><div class='add'>+The data from the pHYs chunk can be retrieved in several convenient</div><div class='add'>+forms:</div><div class='add'>+</div><div class='add'>+    res_x = png_get_x_pixels_per_meter(png_ptr,</div><div class='add'>+       info_ptr)</div><div class='add'>+</div><div class='add'>+    res_y = png_get_y_pixels_per_meter(png_ptr,</div><div class='add'>+       info_ptr)</div><div class='add'>+</div><div class='add'>+    res_x_and_y = png_get_pixels_per_meter(png_ptr,</div><div class='add'>+       info_ptr)</div><div class='add'>+</div><div class='add'>+    res_x = png_get_x_pixels_per_inch(png_ptr,</div><div class='add'>+       info_ptr)</div><div class='add'>+</div><div class='add'>+    res_y = png_get_y_pixels_per_inch(png_ptr,</div><div class='add'>+       info_ptr)</div><div class='add'>+</div><div class='add'>+    res_x_and_y = png_get_pixels_per_inch(png_ptr,</div><div class='add'>+       info_ptr)</div><div class='add'>+</div><div class='add'>+    aspect_ratio = png_get_pixel_aspect_ratio(png_ptr,</div><div class='add'>+       info_ptr)</div><div class='add'>+</div><div class='add'>+    Each of these returns 0 [signifying "unknown"] if</div><div class='add'>+       the data is not present or if res_x is 0;</div><div class='add'>+       res_x_and_y is 0 if res_x != res_y</div><div class='add'>+</div><div class='add'>+    Note that because of the way the resolutions are</div><div class='add'>+       stored internally, the inch conversions won't</div><div class='add'>+       come out to exactly even number.  For example,</div><div class='add'>+       72 dpi is stored as 0.28346 pixels/meter, and</div><div class='add'>+       when this is retrieved it is 71.9988 dpi, so</div><div class='add'>+       be sure to round the returned value appropriately</div><div class='add'>+       if you want to display a reasonable-looking result. </div><div class='add'>+</div><div class='add'>+The data from the oFFs chunk can be retrieved in several convenient</div><div class='add'>+forms:</div><div class='add'>+</div><div class='add'>+    x_offset = png_get_x_offset_microns(png_ptr, info_ptr);</div><div class='add'>+</div><div class='add'>+    y_offset = png_get_y_offset_microns(png_ptr, info_ptr);</div><div class='add'>+</div><div class='add'>+    x_offset = png_get_x_offset_inches(png_ptr, info_ptr);</div><div class='add'>+</div><div class='add'>+    y_offset = png_get_y_offset_inches(png_ptr, info_ptr);</div><div class='add'>+</div><div class='add'>+    Each of these returns 0 [signifying "unknown" if both</div><div class='add'>+       x and y are 0] if the data is not present or if the</div><div class='add'>+       chunk is present but the unit is the pixel.  The</div><div class='add'>+       remark about inexact inch conversions applies here</div><div class='add'>+       as well, because a value in inches can't always be</div><div class='add'>+       converted to microns and back without some loss</div><div class='add'>+       of precision.</div><div class='add'>+</div><div class='add'>+For more information, see the png_info definition in png.h and the</div><div class='add'>+PNG specification for chunk contents.  Be careful with trusting</div><div class='add'>+rowbytes, as some of the transformations could increase the space</div><div class='add'>+needed to hold a row (expand, filler, gray_to_rgb, etc.).</div><div class='add'>+See png_read_update_info(), below.</div><div class='add'>+</div><div class='add'>+A quick word about text_ptr and num_text.  PNG stores comments in</div><div class='add'>+keyword/text pairs, one pair per chunk, with no limit on the number</div><div class='add'>+of text chunks, and a 2^31 byte limit on their size.  While there are</div><div class='add'>+suggested keywords, there is no requirement to restrict the use to these</div><div class='add'>+strings.  It is strongly suggested that keywords and text be sensible</div><div class='add'>+to humans (that's the point), so don't use abbreviations.  Non-printing</div><div class='add'>+symbols are not allowed.  See the PNG specification for more details.</div><div class='add'>+There is also no requirement to have text after the keyword.</div><div class='add'>+</div><div class='add'>+Keywords should be limited to 79 Latin-1 characters without leading or</div><div class='add'>+trailing spaces, but non-consecutive spaces are allowed within the</div><div class='add'>+keyword.  It is possible to have the same keyword any number of times.</div><div class='add'>+The text_ptr is an array of png_text structures, each holding a</div><div class='add'>+pointer to a language string, a pointer to a keyword and a pointer to</div><div class='add'>+a text string.  The text string, language code, and translated</div><div class='add'>+keyword may be empty or NULL pointers.  The keyword/text</div><div class='add'>+pairs are put into the array in the order that they are received.</div><div class='add'>+However, some or all of the text chunks may be after the image, so, to</div><div class='add'>+make sure you have read all the text chunks, don't mess with these</div><div class='add'>+until after you read the stuff after the image.  This will be</div><div class='add'>+mentioned again below in the discussion that goes with png_read_end().</div><div class='add'>+</div><div class='add'>+Input transformations</div><div class='add'>+</div><div class='add'>+After you've read the header information, you can set up the library</div><div class='add'>+to handle any special transformations of the image data.  The various</div><div class='add'>+ways to transform the data will be described in the order that they</div><div class='add'>+should occur.  This is important, as some of these change the color</div><div class='add'>+type and/or bit depth of the data, and some others only work on</div><div class='add'>+certain color types and bit depths.  Even though each transformation</div><div class='add'>+checks to see if it has data that it can do something with, you should</div><div class='add'>+make sure to only enable a transformation if it will be valid for the</div><div class='add'>+data.  For example, don't swap red and blue on grayscale data.</div><div class='add'>+</div><div class='add'>+The colors used for the background and transparency values should be</div><div class='add'>+supplied in the same format/depth as the current image data.  They</div><div class='add'>+are stored in the same format/depth as the image data in a bKGD or tRNS</div><div class='add'>+chunk, so this is what libpng expects for this data.  The colors are</div><div class='add'>+transformed to keep in sync with the image data when an application</div><div class='add'>+calls the png_read_update_info() routine (see below).</div><div class='add'>+</div><div class='add'>+Data will be decoded into the supplied row buffers packed into bytes</div><div class='add'>+unless the library has been told to transform it into another format.</div><div class='add'>+For example, 4 bit/pixel paletted or grayscale data will be returned</div><div class='add'>+2 pixels/byte with the leftmost pixel in the high-order bits of the</div><div class='add'>+byte, unless png_set_packing() is called.  8-bit RGB data will be stored</div><div class='add'>+in RGB RGB RGB format unless png_set_filler() or png_set_add_alpha()</div><div class='add'>+is called to insert filler bytes, either before or after each RGB triplet.</div><div class='add'>+16-bit RGB data will be returned RRGGBB RRGGBB, with the most significant</div><div class='add'>+byte of the color value first, unless png_set_strip_16() is called to</div><div class='add'>+transform it to regular RGB RGB triplets, or png_set_filler() or</div><div class='add'>+png_set_add alpha() is called to insert filler bytes, either before or</div><div class='add'>+after each RRGGBB triplet.  Similarly, 8-bit or 16-bit grayscale data can</div><div class='add'>+be modified with</div><div class='add'>+png_set_filler(), png_set_add_alpha(), or png_set_strip_16().</div><div class='add'>+</div><div class='add'>+The following code transforms grayscale images of less than 8 to 8 bits,</div><div class='add'>+changes paletted images to RGB, and adds a full alpha channel if there is</div><div class='add'>+transparency information in a tRNS chunk.  This is most useful on</div><div class='add'>+grayscale images with bit depths of 2 or 4 or if there is a multiple-image</div><div class='add'>+viewing application that wishes to treat all images in the same way.</div><div class='add'>+</div><div class='add'>+    if (color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+        png_set_palette_to_rgb(png_ptr);</div><div class='add'>+</div><div class='add'>+    if (color_type == PNG_COLOR_TYPE_GRAY &amp;&amp;</div><div class='add'>+        bit_depth &lt; 8) png_set_expand_gray_1_2_4_to_8(png_ptr);</div><div class='add'>+</div><div class='add'>+    if (png_get_valid(png_ptr, info_ptr,</div><div class='add'>+        PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr);</div><div class='add'>+</div><div class='add'>+These three functions are actually aliases for png_set_expand(), added</div><div class='add'>+in libpng version 1.0.4, with the function names expanded to improve code</div><div class='add'>+readability.  In some future version they may actually do different</div><div class='add'>+things.</div><div class='add'>+</div><div class='add'>+As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was</div><div class='add'>+added.  It expands the sample depth without changing tRNS to alpha.</div><div class='add'>+</div><div class='add'>+As of libpng version 1.5.1, not all possible expansions are supported.</div><div class='add'>+</div><div class='add'>+In the following table, the 01 means grayscale with depth&lt;8, 31 means</div><div class='add'>+indexed with depth&lt;8, other numerals represent the color type, "T" means</div><div class='add'>+the tRNS chunk is present, A means an alpha channel is present, and O</div><div class='add'>+means tRNS or alpha is present but all pixels in the image are opaque.</div><div class='add'>+</div><div class='add'>+  FROM  01  31   0  0T  0O   2  2T  2O   3  3T  3O  4A  4O  6A  6O </div><div class='add'>+   TO</div><div class='add'>+   01    -                   </div><div class='add'>+   31        -</div><div class='add'>+    0    1       -           </div><div class='add'>+   0T                -</div><div class='add'>+   0O                    -</div><div class='add'>+    2           GX           -</div><div class='add'>+   2T                            -</div><div class='add'>+   2O                                -</div><div class='add'>+    3        1                           -</div><div class='add'>+   3T                                        -</div><div class='add'>+   3O                                            -</div><div class='add'>+   4A                T                               -</div><div class='add'>+   4O                                                    -</div><div class='add'>+   6A               GX         TX           TX               -</div><div class='add'>+   6O                   GX                      TX               -</div><div class='add'>+</div><div class='add'>+Within the matrix,</div><div class='add'>+     "-" means the transformation is not supported.</div><div class='add'>+     "X" means the transformation is obtained by png_set_expand().</div><div class='add'>+     "1" means the transformation is obtained by</div><div class='add'>+         png_set_expand_gray_1_2_4_to_8</div><div class='add'>+     "G" means the transformation is obtained by</div><div class='add'>+         png_set_gray_to_rgb().</div><div class='add'>+     "P" means the transformation is obtained by</div><div class='add'>+         png_set_expand_palette_to_rgb().</div><div class='add'>+     "T" means the transformation is obtained by</div><div class='add'>+         png_set_tRNS_to_alpha().</div><div class='add'>+</div><div class='add'>+PNG can have files with 16 bits per channel.  If you only can handle</div><div class='add'>+8 bits per channel, this will strip the pixels down to 8 bit.</div><div class='add'>+</div><div class='add'>+    if (bit_depth == 16)</div><div class='add'>+       png_set_strip_16(png_ptr);</div><div class='add'>+</div><div class='add'>+If, for some reason, you don't need the alpha channel on an image,</div><div class='add'>+and you want to remove it rather than combining it with the background</div><div class='add'>+(but the image author certainly had in mind that you *would* combine</div><div class='add'>+it with the background, so that's what you should probably do):</div><div class='add'>+</div><div class='add'>+    if (color_type &amp; PNG_COLOR_MASK_ALPHA)</div><div class='add'>+       png_set_strip_alpha(png_ptr);</div><div class='add'>+</div><div class='add'>+In PNG files, the alpha channel in an image</div><div class='add'>+is the level of opacity.  If you need the alpha channel in an image to</div><div class='add'>+be the level of transparency instead of opacity, you can invert the</div><div class='add'>+alpha channel (or the tRNS chunk data) after it's read, so that 0 is</div><div class='add'>+fully opaque and 255 (in 8-bit or paletted images) or 65535 (in 16-bit</div><div class='add'>+images) is fully transparent, with</div><div class='add'>+</div><div class='add'>+    png_set_invert_alpha(png_ptr);</div><div class='add'>+</div><div class='add'>+PNG files pack pixels of bit depths 1, 2, and 4 into bytes as small as</div><div class='add'>+they can, resulting in, for example, 8 pixels per byte for 1 bit</div><div class='add'>+files.  This code expands to 1 pixel per byte without changing the</div><div class='add'>+values of the pixels:</div><div class='add'>+</div><div class='add'>+    if (bit_depth &lt; 8)</div><div class='add'>+       png_set_packing(png_ptr);</div><div class='add'>+</div><div class='add'>+PNG files have possible bit depths of 1, 2, 4, 8, and 16.  All pixels</div><div class='add'>+stored in a PNG image have been "scaled" or "shifted" up to the next</div><div class='add'>+higher possible bit depth (e.g. from 5 bits/sample in the range [0,31]</div><div class='add'>+to 8 bits/sample in the range [0, 255]).  However, it is also possible</div><div class='add'>+to convert the PNG pixel data back to the original bit depth of the</div><div class='add'>+image.  This call reduces the pixels back down to the original bit depth:</div><div class='add'>+</div><div class='add'>+    png_color_8p sig_bit;</div><div class='add'>+</div><div class='add'>+    if (png_get_sBIT(png_ptr, info_ptr, &amp;sig_bit))</div><div class='add'>+       png_set_shift(png_ptr, sig_bit);</div><div class='add'>+</div><div class='add'>+PNG files store 3-color pixels in red, green, blue order.  This code</div><div class='add'>+changes the storage of the pixels to blue, green, red:</div><div class='add'>+</div><div class='add'>+    if (color_type == PNG_COLOR_TYPE_RGB ||</div><div class='add'>+        color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='add'>+       png_set_bgr(png_ptr);</div><div class='add'>+</div><div class='add'>+PNG files store RGB pixels packed into 3 or 6 bytes. This code expands them</div><div class='add'>+into 4 or 8 bytes for windowing systems that need them in this format:</div><div class='add'>+</div><div class='add'>+    if (color_type == PNG_COLOR_TYPE_RGB)</div><div class='add'>+       png_set_filler(png_ptr, filler, PNG_FILLER_BEFORE);</div><div class='add'>+</div><div class='add'>+where "filler" is the 8 or 16-bit number to fill with, and the location is</div><div class='add'>+either PNG_FILLER_BEFORE or PNG_FILLER_AFTER, depending upon whether</div><div class='add'>+you want the filler before the RGB or after.  This transformation</div><div class='add'>+does not affect images that already have full alpha channels.  To add an</div><div class='add'>+opaque alpha channel, use filler=0xff or 0xffff and PNG_FILLER_AFTER which</div><div class='add'>+will generate RGBA pixels.</div><div class='add'>+</div><div class='add'>+Note that png_set_filler() does not change the color type.  If you want</div><div class='add'>+to do that, you can add a true alpha channel with</div><div class='add'>+</div><div class='add'>+    if (color_type == PNG_COLOR_TYPE_RGB ||</div><div class='add'>+       color_type == PNG_COLOR_TYPE_GRAY)</div><div class='add'>+       png_set_add_alpha(png_ptr, filler, PNG_FILLER_AFTER);</div><div class='add'>+</div><div class='add'>+where "filler" contains the alpha value to assign to each pixel.</div><div class='add'>+This function was added in libpng-1.2.7.</div><div class='add'>+</div><div class='add'>+If you are reading an image with an alpha channel, and you need the</div><div class='add'>+data as ARGB instead of the normal PNG format RGBA:</div><div class='add'>+</div><div class='add'>+    if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='add'>+       png_set_swap_alpha(png_ptr);</div><div class='add'>+</div><div class='add'>+For some uses, you may want a grayscale image to be represented as</div><div class='add'>+RGB.  This code will do that conversion:</div><div class='add'>+</div><div class='add'>+    if (color_type == PNG_COLOR_TYPE_GRAY ||</div><div class='add'>+        color_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='add'>+       png_set_gray_to_rgb(png_ptr);</div><div class='add'>+</div><div class='add'>+Conversely, you can convert an RGB or RGBA image to grayscale or grayscale</div><div class='add'>+with alpha.</div><div class='add'>+</div><div class='add'>+    if (color_type == PNG_COLOR_TYPE_RGB ||</div><div class='add'>+        color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='add'>+       png_set_rgb_to_gray_fixed(png_ptr, error_action,</div><div class='add'>+           int red_weight, int green_weight);</div><div class='add'>+</div><div class='add'>+    error_action = 1: silently do the conversion</div><div class='add'>+</div><div class='add'>+    error_action = 2: issue a warning if the original</div><div class='add'>+                      image has any pixel where</div><div class='add'>+                      red != green or red != blue</div><div class='add'>+</div><div class='add'>+    error_action = 3: issue an error and abort the</div><div class='add'>+                      conversion if the original</div><div class='add'>+                      image has any pixel where</div><div class='add'>+                      red != green or red != blue</div><div class='add'>+</div><div class='add'>+    red_weight:       weight of red component times 100000</div><div class='add'>+</div><div class='add'>+    green_weight:     weight of green component times 100000</div><div class='add'>+                      If either weight is negative, default</div><div class='add'>+                      weights (21268, 71514) are used.</div><div class='add'>+</div><div class='add'>+If you have set error_action = 1 or 2, you can</div><div class='add'>+later check whether the image really was gray, after processing</div><div class='add'>+the image rows, with the png_get_rgb_to_gray_status(png_ptr) function.</div><div class='add'>+It will return a png_byte that is zero if the image was gray or</div><div class='add'>+1 if there were any non-gray pixels.  bKGD and sBIT data</div><div class='add'>+will be silently converted to grayscale, using the green channel</div><div class='add'>+data, regardless of the error_action setting.</div><div class='add'>+</div><div class='add'>+With red_weight+green_weight&lt;=100000,</div><div class='add'>+the normalized graylevel is computed:</div><div class='add'>+</div><div class='add'>+    int rw = red_weight * 65536;</div><div class='add'>+    int gw = green_weight * 65536;</div><div class='add'>+    int bw = 65536 - (rw + gw);</div><div class='add'>+    gray = (rw*red + gw*green + bw*blue)/65536;</div><div class='add'>+</div><div class='add'>+The default values approximate those recommended in the Charles</div><div class='add'>+Poynton's Color FAQ, &lt;http://www.inforamp.net/~poynton/&gt;</div><div class='add'>+Copyright (c) 1998-01-04 Charles Poynton &lt;poynton at inforamp.net&gt;</div><div class='add'>+</div><div class='add'>+    Y = 0.212671 * R + 0.715160 * G + 0.072169 * B</div><div class='add'>+</div><div class='add'>+Libpng approximates this with integers scaled by 32768:</div><div class='add'>+</div><div class='add'>+    Y = (6968 * R + 23434 * G + 2366 * B)/32768</div><div class='add'>+</div><div class='add'>+The calculation is done in a linear colorspace, if the image gamma</div><div class='add'>+can be determined.</div><div class='add'>+</div><div class='add'>+If you have a grayscale and you are using png_set_expand_depth(),</div><div class='add'>+png_set_expand(), or png_set_gray_to_rgb to change to truecolor or to</div><div class='add'>+a higher bit-depth, you must either supply the background color as a gray</div><div class='add'>+value at the original file bit-depth (need_expand = 1) or else supply the</div><div class='add'>+background color as an RGB triplet at the final, expanded bit depth</div><div class='add'>+(need_expand = 0).  Similarly, if you are reading a paletted image, you</div><div class='add'>+must either supply the background color as a palette index (need_expand = 1)</div><div class='add'>+or as an RGB triplet that may or may not be in the palette (need_expand = 0).</div><div class='add'>+</div><div class='add'>+    png_color_16 my_background;</div><div class='add'>+    png_color_16p image_background;</div><div class='add'>+</div><div class='add'>+    if (png_get_bKGD(png_ptr, info_ptr, &amp;image_background))</div><div class='add'>+       png_set_background(png_ptr, image_background,</div><div class='add'>+           PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);</div><div class='add'>+    else</div><div class='add'>+       png_set_background(png_ptr, &amp;my_background,</div><div class='add'>+           PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);</div><div class='add'>+</div><div class='add'>+The png_set_background() function tells libpng to composite images</div><div class='add'>+with alpha or simple transparency against the supplied background</div><div class='add'>+color.  If the PNG file contains a bKGD chunk (PNG_INFO_bKGD valid),</div><div class='add'>+you may use this color, or supply another color more suitable for</div><div class='add'>+the current display (e.g., the background color from a web page).  You</div><div class='add'>+need to tell libpng whether the color is in the gamma space of the</div><div class='add'>+display (PNG_BACKGROUND_GAMMA_SCREEN for colors you supply), the file</div><div class='add'>+(PNG_BACKGROUND_GAMMA_FILE for colors from the bKGD chunk), or one</div><div class='add'>+that is neither of these gammas (PNG_BACKGROUND_GAMMA_UNIQUE - I don't</div><div class='add'>+know why anyone would use this, but it's here).</div><div class='add'>+</div><div class='add'>+To properly display PNG images on any kind of system, the application needs</div><div class='add'>+to know what the display gamma is.  Ideally, the user will know this, and</div><div class='add'>+the application will allow them to set it.  One method of allowing the user</div><div class='add'>+to set the display gamma separately for each system is to check for a</div><div class='add'>+SCREEN_GAMMA or DISPLAY_GAMMA environment variable, which will hopefully be</div><div class='add'>+correctly set.</div><div class='add'>+</div><div class='add'>+Note that display_gamma is the overall gamma correction required to produce</div><div class='add'>+pleasing results, which depends on the lighting conditions in the surrounding</div><div class='add'>+environment.  In a dim or brightly lit room, no compensation other than</div><div class='add'>+the physical gamma exponent of the monitor is needed, while in a dark room</div><div class='add'>+a slightly smaller exponent is better.</div><div class='add'>+</div><div class='add'>+   double gamma, screen_gamma;</div><div class='add'>+</div><div class='add'>+   if (/* We have a user-defined screen</div><div class='add'>+       gamma value */)</div><div class='add'>+   {</div><div class='add'>+      screen_gamma = user_defined_screen_gamma;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* One way that applications can share the same</div><div class='add'>+      screen gamma value */</div><div class='add'>+   else if ((gamma_str = getenv("SCREEN_GAMMA"))</div><div class='add'>+      != NULL)</div><div class='add'>+   {</div><div class='add'>+      screen_gamma = (double)atof(gamma_str);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* If we don't have another value */</div><div class='add'>+   else</div><div class='add'>+   {</div><div class='add'>+      screen_gamma = 2.2; /* A good guess for a</div><div class='add'>+           PC monitor in a bright office or a dim room */</div><div class='add'>+</div><div class='add'>+      screen_gamma = 2.0; /* A good guess for a</div><div class='add'>+           PC monitor in a dark room */</div><div class='add'>+</div><div class='add'>+      screen_gamma = 1.7 or 1.0;  /* A good</div><div class='add'>+           guess for Mac systems */</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+The functions png_set_gamma() and its fixed point equivalent</div><div class='add'>+png_set_gamma_fixed() handle gamma transformations of the data.</div><div class='add'>+Pass both the file gamma and the current screen_gamma.  If the file does</div><div class='add'>+not have a gamma value, you can pass one anyway if you have an idea what</div><div class='add'>+it is (usually 0.45455 is a good guess for GIF images on PCs).  Note</div><div class='add'>+that file gammas are inverted from screen gammas.  See the discussions</div><div class='add'>+on gamma in the PNG specification for an excellent description of what</div><div class='add'>+gamma is, and why all applications should support it.  It is strongly</div><div class='add'>+recommended that PNG viewers support gamma correction.</div><div class='add'>+</div><div class='add'>+   if (png_get_gAMA(png_ptr, info_ptr, &amp;file_gamma))</div><div class='add'>+      png_set_gamma(png_ptr, screen_gamma, file_gamma);</div><div class='add'>+</div><div class='add'>+   else</div><div class='add'>+      png_set_gamma(png_ptr, screen_gamma, 0.45455);</div><div class='add'>+</div><div class='add'>+If you need to reduce an RGB file to a paletted file, or if a paletted</div><div class='add'>+file has more entries then will fit on your screen, png_set_quantize()</div><div class='add'>+will do that.  Note that this is a simple match quantization that merely</div><div class='add'>+finds the closest color available.  This should work fairly well with</div><div class='add'>+optimized palettes, but fairly badly with linear color cubes.  If you</div><div class='add'>+pass a palette that is larger then maximum_colors, the file will</div><div class='add'>+reduce the number of colors in the palette so it will fit into</div><div class='add'>+maximum_colors.  If there is a histogram, it will use it to make</div><div class='add'>+more intelligent choices when reducing the palette.  If there is no</div><div class='add'>+histogram, it may not do as good a job.</div><div class='add'>+</div><div class='add'>+   if (color_type &amp; PNG_COLOR_MASK_COLOR)</div><div class='add'>+   {</div><div class='add'>+      if (png_get_valid(png_ptr, info_ptr,</div><div class='add'>+          PNG_INFO_PLTE))</div><div class='add'>+      {</div><div class='add'>+         png_uint_16p histogram = NULL;</div><div class='add'>+</div><div class='add'>+         png_get_hIST(png_ptr, info_ptr,</div><div class='add'>+             &amp;histogram);</div><div class='add'>+         png_set_quantize(png_ptr, palette, num_palette,</div><div class='add'>+            max_screen_colors, histogram, 1);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         png_color std_color_cube[MAX_SCREEN_COLORS] =</div><div class='add'>+            { ... colors ... };</div><div class='add'>+</div><div class='add'>+         png_set_quantize(png_ptr, std_color_cube,</div><div class='add'>+            MAX_SCREEN_COLORS, MAX_SCREEN_COLORS,</div><div class='add'>+            NULL,0);</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+PNG files describe monochrome as black being zero and white being one.</div><div class='add'>+The following code will reverse this (make black be one and white be</div><div class='add'>+zero):</div><div class='add'>+</div><div class='add'>+   if (bit_depth == 1 &amp;&amp; color_type == PNG_COLOR_TYPE_GRAY)</div><div class='add'>+      png_set_invert_mono(png_ptr);</div><div class='add'>+</div><div class='add'>+This function can also be used to invert grayscale and gray-alpha images:</div><div class='add'>+</div><div class='add'>+   if (color_type == PNG_COLOR_TYPE_GRAY ||</div><div class='add'>+       color_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='add'>+      png_set_invert_mono(png_ptr);</div><div class='add'>+</div><div class='add'>+PNG files store 16 bit pixels in network byte order (big-endian,</div><div class='add'>+ie. most significant bits first).  This code changes the storage to the</div><div class='add'>+other way (little-endian, i.e. least significant bits first, the</div><div class='add'>+way PCs store them):</div><div class='add'>+</div><div class='add'>+    if (bit_depth == 16)</div><div class='add'>+       png_set_swap(png_ptr);</div><div class='add'>+</div><div class='add'>+If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you</div><div class='add'>+need to change the order the pixels are packed into bytes, you can use:</div><div class='add'>+</div><div class='add'>+    if (bit_depth &lt; 8)</div><div class='add'>+       png_set_packswap(png_ptr);</div><div class='add'>+</div><div class='add'>+Finally, you can write your own transformation function if none of</div><div class='add'>+the existing ones meets your needs.  This is done by setting a callback</div><div class='add'>+with</div><div class='add'>+</div><div class='add'>+    png_set_read_user_transform_fn(png_ptr,</div><div class='add'>+        read_transform_fn);</div><div class='add'>+</div><div class='add'>+You must supply the function</div><div class='add'>+</div><div class='add'>+    void read_transform_fn(png_structp png_ptr, row_info_ptr</div><div class='add'>+        row_info, png_bytep data)</div><div class='add'>+</div><div class='add'>+See pngtest.c for a working example.  Your function will be called</div><div class='add'>+after all of the other transformations have been processed.  Take care with</div><div class='add'>+interlaced images if you do the interlace yourself - the width of the row is the</div><div class='add'>+width in 'row_info', not the overall image width.</div><div class='add'>+</div><div class='add'>+If supported libpng provides two information routines that you can use to find</div><div class='add'>+where you are in processing the image:</div><div class='add'>+</div><div class='add'>+   png_get_current_pass_number(png_structp png_ptr);</div><div class='add'>+   png_get_current_row_number(png_structp png_ptr);</div><div class='add'>+</div><div class='add'>+Don't try using these outside a transform callback - firstly they are only</div><div class='add'>+supported if user transforms are supported, secondly they may well return</div><div class='add'>+unexpected results unless the row is actually being processed at the moment they</div><div class='add'>+are called.</div><div class='add'>+</div><div class='add'>+You can also set up a pointer to a user structure for use by your</div><div class='add'>+callback function, and you can inform libpng that your transform</div><div class='add'>+function will change the number of channels or bit depth with the</div><div class='add'>+function</div><div class='add'>+</div><div class='add'>+    png_set_user_transform_info(png_ptr, user_ptr,</div><div class='add'>+        user_depth, user_channels);</div><div class='add'>+</div><div class='add'>+The user's application, not libpng, is responsible for allocating and</div><div class='add'>+freeing any memory required for the user structure.</div><div class='add'>+</div><div class='add'>+You can retrieve the pointer via the function</div><div class='add'>+png_get_user_transform_ptr().  For example:</div><div class='add'>+</div><div class='add'>+    voidp read_user_transform_ptr =</div><div class='add'>+        png_get_user_transform_ptr(png_ptr);</div><div class='add'>+</div><div class='add'>+The last thing to handle is interlacing; this is covered in detail below,</div><div class='add'>+but you must call the function here if you want libpng to handle expansion</div><div class='add'>+of the interlaced image.</div><div class='add'>+</div><div class='add'>+    number_of_passes = png_set_interlace_handling(png_ptr);</div><div class='add'>+</div><div class='add'>+After setting the transformations, libpng can update your png_info</div><div class='add'>+structure to reflect any transformations you've requested with this</div><div class='add'>+call.  This is most useful to update the info structure's rowbytes</div><div class='add'>+field so you can use it to allocate your image memory.  This function</div><div class='add'>+will also update your palette with the correct screen_gamma and</div><div class='add'>+background if these have been given with the calls above.</div><div class='add'>+</div><div class='add'>+    png_read_update_info(png_ptr, info_ptr);</div><div class='add'>+</div><div class='add'>+After you call png_read_update_info(), you can allocate any</div><div class='add'>+memory you need to hold the image.  The row data is simply</div><div class='add'>+raw byte data for all forms of images.  As the actual allocation</div><div class='add'>+varies among applications, no example will be given.  If you</div><div class='add'>+are allocating one large chunk, you will need to build an</div><div class='add'>+array of pointers to each row, as it will be needed for some</div><div class='add'>+of the functions below.</div><div class='add'>+</div><div class='add'>+Remember: Before you call png_read_update_info(), the png_get_</div><div class='add'>+functions return the values corresponding to the original PNG image.</div><div class='add'>+After you call png_read_update_info the values refer to the image</div><div class='add'>+that libpng will output.  Consequently you must call all the png_set_</div><div class='add'>+functions before you call png_read_update_info().  This is particularly</div><div class='add'>+important for png_set_interlace_handling() - if you are going to call</div><div class='add'>+png_read_update_info() you must call png_set_interlace_handling() before</div><div class='add'>+it unless you want to receive interlaced output.</div><div class='add'>+</div><div class='add'>+Reading image data</div><div class='add'>+</div><div class='add'>+After you've allocated memory, you can read the image data.</div><div class='add'>+The simplest way to do this is in one function call.  If you are</div><div class='add'>+allocating enough memory to hold the whole image, you can just</div><div class='add'>+call png_read_image() and libpng will read in all the image data</div><div class='add'>+and put it in the memory area supplied.  You will need to pass in</div><div class='add'>+an array of pointers to each row.</div><div class='add'>+</div><div class='add'>+This function automatically handles interlacing, so you don't</div><div class='add'>+need to call png_set_interlace_handling() (unless you call</div><div class='add'>+png_read_update_info()) or call this function multiple times, or any</div><div class='add'>+of that other stuff necessary with png_read_rows().</div><div class='add'>+</div><div class='add'>+   png_read_image(png_ptr, row_pointers);</div><div class='add'>+</div><div class='add'>+where row_pointers is:</div><div class='add'>+</div><div class='add'>+   png_bytep row_pointers[height];</div><div class='add'>+</div><div class='add'>+You can point to void or char or whatever you use for pixels.</div><div class='add'>+</div><div class='add'>+If you don't want to read in the whole image at once, you can</div><div class='add'>+use png_read_rows() instead.  If there is no interlacing (check</div><div class='add'>+interlace_type == PNG_INTERLACE_NONE), this is simple:</div><div class='add'>+</div><div class='add'>+    png_read_rows(png_ptr, row_pointers, NULL,</div><div class='add'>+        number_of_rows);</div><div class='add'>+</div><div class='add'>+where row_pointers is the same as in the png_read_image() call.</div><div class='add'>+</div><div class='add'>+If you are doing this just one row at a time, you can do this with</div><div class='add'>+a single row_pointer instead of an array of row_pointers:</div><div class='add'>+</div><div class='add'>+    png_bytep row_pointer = row;</div><div class='add'>+    png_read_row(png_ptr, row_pointer, NULL);</div><div class='add'>+</div><div class='add'>+If the file is interlaced (interlace_type != 0 in the IHDR chunk), things</div><div class='add'>+get somewhat harder.  The only current (PNG Specification version 1.2)</div><div class='add'>+interlacing type for PNG is (interlace_type == PNG_INTERLACE_ADAM7);</div><div class='add'>+a somewhat complicated 2D interlace scheme, known as Adam7, that</div><div class='add'>+breaks down an image into seven smaller images of varying size, based</div><div class='add'>+on an 8x8 grid.  This number is defined (from libpng 1.5) as</div><div class='add'>+PNG_INTERLACE_ADAM7_PASSES in png.h</div><div class='add'>+</div><div class='add'>+libpng can fill out those images or it can give them to you "as is".</div><div class='add'>+It is almost always better to have libpng handle the interlacing for you.</div><div class='add'>+If you want the images filled out, there are two ways to do that.  The one</div><div class='add'>+mentioned in the PNG specification is to expand each pixel to cover</div><div class='add'>+those pixels that have not been read yet (the "rectangle" method).</div><div class='add'>+This results in a blocky image for the first pass, which gradually</div><div class='add'>+smooths out as more pixels are read.  The other method is the "sparkle"</div><div class='add'>+method, where pixels are drawn only in their final locations, with the</div><div class='add'>+rest of the image remaining whatever colors they were initialized to</div><div class='add'>+before the start of the read.  The first method usually looks better,</div><div class='add'>+but tends to be slower, as there are more pixels to put in the rows.</div><div class='add'>+</div><div class='add'>+If, as is likely, you want libpng to expand the images, call this before</div><div class='add'>+calling png_start_read_image() or png_read_update_info():</div><div class='add'>+</div><div class='add'>+    if (interlace_type == PNG_INTERLACE_ADAM7)</div><div class='add'>+       number_of_passes</div><div class='add'>+           = png_set_interlace_handling(png_ptr);</div><div class='add'>+</div><div class='add'>+This will return the number of passes needed.  Currently, this is seven,</div><div class='add'>+but may change if another interlace type is added.  This function can be</div><div class='add'>+called even if the file is not interlaced, where it will return one pass.</div><div class='add'>+You then need to read the whole image 'number_of_passes' times.  Each time</div><div class='add'>+will distribute the pixels from the current pass to the correct place in</div><div class='add'>+the output image, so you need to supply the same rows to png_read_rows in</div><div class='add'>+each pass.</div><div class='add'>+</div><div class='add'>+If you are not going to display the image after each pass, but are</div><div class='add'>+going to wait until the entire image is read in, use the sparkle</div><div class='add'>+effect.  This effect is faster and the end result of either method</div><div class='add'>+is exactly the same.  If you are planning on displaying the image</div><div class='add'>+after each pass, the "rectangle" effect is generally considered the</div><div class='add'>+better looking one.</div><div class='add'>+</div><div class='add'>+If you only want the "sparkle" effect, just call png_read_rows() as</div><div class='add'>+normal, with the third parameter NULL.  Make sure you make pass over</div><div class='add'>+the image number_of_passes times, and you don't change the data in the</div><div class='add'>+rows between calls.  You can change the locations of the data, just</div><div class='add'>+not the data.  Each pass only writes the pixels appropriate for that</div><div class='add'>+pass, and assumes the data from previous passes is still valid.</div><div class='add'>+</div><div class='add'>+    png_read_rows(png_ptr, row_pointers, NULL,</div><div class='add'>+        number_of_rows);</div><div class='add'>+</div><div class='add'>+If you only want the first effect (the rectangles), do the same as</div><div class='add'>+before except pass the row buffer in the third parameter, and leave</div><div class='add'>+the second parameter NULL.</div><div class='add'>+</div><div class='add'>+    png_read_rows(png_ptr, NULL, row_pointers,</div><div class='add'>+        number_of_rows);</div><div class='add'>+</div><div class='add'>+If you don't want libpng to handle the interlacing details, just call</div><div class='add'>+png_read_rows() PNG_INTERLACE_ADAM7_PASSES times to read in all the images.</div><div class='add'>+Each of the images is a valid image by itself, however you will almost</div><div class='add'>+certainly need to distribute the pixels from each sub-image to the</div><div class='add'>+correct place.  This is where everything gets very tricky.</div><div class='add'>+</div><div class='add'>+If you want to retrieve the separate images you must pass the correct</div><div class='add'>+number of rows to each successive call of png_read_rows().  The calculation</div><div class='add'>+gets pretty complicated for small images, where some sub-images may</div><div class='add'>+not even exist because either their width or height ends up zero.</div><div class='add'>+libpng provides two macros to help you in 1.5 and later versions:</div><div class='add'>+</div><div class='add'>+   png_uint_32 width = PNG_PASS_COLS(image_width, pass_number);</div><div class='add'>+   png_uint_32 height = PNG_PASS_ROWS(image_height, pass_number);</div><div class='add'>+</div><div class='add'>+Respectively these tell you the width and height of the sub-image</div><div class='add'>+corresponding to the numbered pass.  'pass' is in in the range 0 to 6 -</div><div class='add'>+this can be confusing because the specification refers to the same passes</div><div class='add'>+as 1 to 7!  Be careful, you must check both the width and height before</div><div class='add'>+calling png_read_rows() and not call it for that pass if either is zero.</div><div class='add'>+</div><div class='add'>+You can, of course, read each sub-image row by row.  If you want to</div><div class='add'>+produce optimal code to make a pixel-by-pixel transformation of an</div><div class='add'>+interlaced image this is the best approach; read each row of each pass,</div><div class='add'>+transform it, and write it out to a new interlaced image.</div><div class='add'>+</div><div class='add'>+If you want to de-interlace the image yourself libpng provides further</div><div class='add'>+macros to help that tell you where to place the pixels in the output image.</div><div class='add'>+Because the interlacing scheme is rectangular - sub-image pixels are always</div><div class='add'>+arranged on a rectangular grid - all you need to know for each pass is the</div><div class='add'>+starting column and row in the output image of the first pixel plus the</div><div class='add'>+spacing between each pixel.  As of libpng 1.5 there are four macros to</div><div class='add'>+retrieve this information:</div><div class='add'>+</div><div class='add'>+   png_uint_32 x = PNG_PASS_START_COL(pass);</div><div class='add'>+   png_uint_32 y = PNG_PASS_START_ROW(pass);</div><div class='add'>+   png_uint_32 xStep = 1U &lt;&lt; PNG_PASS_COL_SHIFT(pass);</div><div class='add'>+   png_uint_32 yStep = 1U &lt;&lt; PNG_PASS_ROW_SHIFT(pass);</div><div class='add'>+</div><div class='add'>+These allow you to write the obvious loop:</div><div class='add'>+</div><div class='add'>+   png_uint_32 input_y = 0;</div><div class='add'>+   png_uint_32 output_y = PNG_PASS_START_ROW(pass);</div><div class='add'>+</div><div class='add'>+   while (output_y &lt; output_image_height)</div><div class='add'>+   {</div><div class='add'>+      png_uint_32 input_x = 0;</div><div class='add'>+      png_uint_32 output_x = PNG_PASS_START_COL(pass);</div><div class='add'>+</div><div class='add'>+      while (output_x &lt; output_image_width)</div><div class='add'>+      {</div><div class='add'>+         image[output_y][output_x] =</div><div class='add'>+             subimage[pass][input_y][input_x++];</div><div class='add'>+</div><div class='add'>+         output_x += xStep;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      ++input_y;</div><div class='add'>+      output_y += yStep;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+Notice that the steps between successive output rows and columns are</div><div class='add'>+returned as shifts.  This is possible because the pixels in the subimages</div><div class='add'>+are always a power of 2 apart - 1, 2, 4 or 8 pixels - in the original</div><div class='add'>+image.  In practice you may need to directly calculate the output coordinate</div><div class='add'>+given an input coordinate.  libpng provides two further macros for this</div><div class='add'>+purpose:</div><div class='add'>+</div><div class='add'>+   png_uint_32 output_x = PNG_COL_FROM_PASS_COL(input_x, pass);</div><div class='add'>+   png_uint_32 output_y = PNG_ROW_FROM_PASS_ROW(input_y, pass);</div><div class='add'>+</div><div class='add'>+Finally a pair of macros are provided to tell you if a particular image</div><div class='add'>+row or column appears in a given pass:</div><div class='add'>+</div><div class='add'>+   int col_in_pass = PNG_COL_IN_INTERLACE_PASS(output_x, pass);</div><div class='add'>+   int row_in_pass = PNG_ROW_IN_INTERLACE_PASS(output_y, pass);</div><div class='add'>+</div><div class='add'>+Bear in mind that you will probably also need to check the width and height</div><div class='add'>+of the pass in addition to the above to be sure the pass even exists!</div><div class='add'>+</div><div class='add'>+With any luck you are convinced by now that you don't want to do your own</div><div class='add'>+interlace handling.  In reality normally the only good reason for doing this</div><div class='add'>+is if you are processing PNG files on a pixel-by-pixel basis and don't want</div><div class='add'>+to load the whole file into memory when it is interlaced.</div><div class='add'>+</div><div class='add'>+libpng includes a test program, pngvalid, that illustrates reading and</div><div class='add'>+writing of interlaced images.  If you can't get interlacing to work in your</div><div class='add'>+code and don't want to leave it to libpng (the recommended approach) see</div><div class='add'>+how pngvalid.c does it.</div><div class='add'>+</div><div class='add'>+Finishing a sequential read</div><div class='add'>+</div><div class='add'>+After you are finished reading the image through the</div><div class='add'>+low-level interface, you can finish reading the file.  If you are</div><div class='add'>+interested in comments or time, which may be stored either before or</div><div class='add'>+after the image data, you should pass the separate png_info struct if</div><div class='add'>+you want to keep the comments from before and after the image</div><div class='add'>+separate.  If you are not interested, you can pass NULL.</div><div class='add'>+</div><div class='add'>+   png_read_end(png_ptr, end_info);</div><div class='add'>+</div><div class='add'>+When you are done, you can free all memory allocated by libpng like this:</div><div class='add'>+</div><div class='add'>+   png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='add'>+       &amp;end_info);</div><div class='add'>+</div><div class='add'>+It is also possible to individually free the info_ptr members that</div><div class='add'>+point to libpng-allocated storage with the following function:</div><div class='add'>+</div><div class='add'>+    png_free_data(png_ptr, info_ptr, mask, seq)</div><div class='add'>+</div><div class='add'>+    mask - identifies data to be freed, a mask</div><div class='add'>+           containing the bitwise OR of one or</div><div class='add'>+           more of</div><div class='add'>+             PNG_FREE_PLTE, PNG_FREE_TRNS,</div><div class='add'>+             PNG_FREE_HIST, PNG_FREE_ICCP,</div><div class='add'>+             PNG_FREE_PCAL, PNG_FREE_ROWS,</div><div class='add'>+             PNG_FREE_SCAL, PNG_FREE_SPLT,</div><div class='add'>+             PNG_FREE_TEXT, PNG_FREE_UNKN,</div><div class='add'>+           or simply PNG_FREE_ALL</div><div class='add'>+</div><div class='add'>+    seq  - sequence number of item to be freed</div><div class='add'>+           (-1 for all items)</div><div class='add'>+</div><div class='add'>+This function may be safely called when the relevant storage has</div><div class='add'>+already been freed, or has not yet been allocated, or was allocated</div><div class='add'>+by the user and not by libpng,  and will in those cases do nothing.</div><div class='add'>+The "seq" parameter is ignored if only one item of the selected data</div><div class='add'>+type, such as PLTE, is allowed.  If "seq" is not -1, and multiple items</div><div class='add'>+are allowed for the data type identified in the mask, such as text or</div><div class='add'>+sPLT, only the n'th item in the structure is freed, where n is "seq".</div><div class='add'>+</div><div class='add'>+The default behavior is only to free data that was allocated internally</div><div class='add'>+by libpng.  This can be changed, so that libpng will not free the data,</div><div class='add'>+or so that it will free data that was allocated by the user with png_malloc()</div><div class='add'>+or png_zalloc() and passed in via a png_set_*() function, with</div><div class='add'>+</div><div class='add'>+    png_data_freer(png_ptr, info_ptr, freer, mask)</div><div class='add'>+</div><div class='add'>+    freer  - one of</div><div class='add'>+               PNG_DESTROY_WILL_FREE_DATA</div><div class='add'>+               PNG_SET_WILL_FREE_DATA</div><div class='add'>+               PNG_USER_WILL_FREE_DATA</div><div class='add'>+</div><div class='add'>+    mask   - which data elements are affected</div><div class='add'>+             same choices as in png_free_data()</div><div class='add'>+</div><div class='add'>+This function only affects data that has already been allocated.</div><div class='add'>+You can call this function after reading the PNG data but before calling</div><div class='add'>+any png_set_*() functions, to control whether the user or the png_set_*()</div><div class='add'>+function is responsible for freeing any existing data that might be present,</div><div class='add'>+and again after the png_set_*() functions to control whether the user</div><div class='add'>+or png_destroy_*() is supposed to free the data.  When the user assumes</div><div class='add'>+responsibility for libpng-allocated data, the application must use</div><div class='add'>+png_free() to free it, and when the user transfers responsibility to libpng</div><div class='add'>+for data that the user has allocated, the user must have used png_malloc()</div><div class='add'>+or png_zalloc() to allocate it.</div><div class='add'>+</div><div class='add'>+If you allocated your row_pointers in a single block, as suggested above in</div><div class='add'>+the description of the high level read interface, you must not transfer</div><div class='add'>+responsibility for freeing it to the png_set_rows or png_read_destroy function,</div><div class='add'>+because they would also try to free the individual row_pointers[i].</div><div class='add'>+</div><div class='add'>+If you allocated text_ptr.text, text_ptr.lang, and text_ptr.translated_keyword</div><div class='add'>+separately, do not transfer responsibility for freeing text_ptr to libpng,</div><div class='add'>+because when libpng fills a png_text structure it combines these members with</div><div class='add'>+the key member, and png_free_data() will free only text_ptr.key.  Similarly,</div><div class='add'>+if you transfer responsibility for free'ing text_ptr from libpng to your</div><div class='add'>+application, your application must not separately free those members.</div><div class='add'>+</div><div class='add'>+The png_free_data() function will turn off the "valid" flag for anything</div><div class='add'>+it frees.  If you need to turn the flag off for a chunk that was freed by</div><div class='add'>+your application instead of by libpng, you can use</div><div class='add'>+</div><div class='add'>+    png_set_invalid(png_ptr, info_ptr, mask);</div><div class='add'>+</div><div class='add'>+    mask - identifies the chunks to be made invalid,</div><div class='add'>+           containing the bitwise OR of one or</div><div class='add'>+           more of</div><div class='add'>+             PNG_INFO_gAMA, PNG_INFO_sBIT,</div><div class='add'>+             PNG_INFO_cHRM, PNG_INFO_PLTE,</div><div class='add'>+             PNG_INFO_tRNS, PNG_INFO_bKGD,</div><div class='add'>+             PNG_INFO_hIST, PNG_INFO_pHYs,</div><div class='add'>+             PNG_INFO_oFFs, PNG_INFO_tIME,</div><div class='add'>+             PNG_INFO_pCAL, PNG_INFO_sRGB,</div><div class='add'>+             PNG_INFO_iCCP, PNG_INFO_sPLT,</div><div class='add'>+             PNG_INFO_sCAL, PNG_INFO_IDAT</div><div class='add'>+</div><div class='add'>+For a more compact example of reading a PNG image, see the file example.c.</div><div class='add'>+</div><div class='add'>+Reading PNG files progressively</div><div class='add'>+</div><div class='add'>+The progressive reader is slightly different then the non-progressive</div><div class='add'>+reader.  Instead of calling png_read_info(), png_read_rows(), and</div><div class='add'>+png_read_end(), you make one call to png_process_data(), which calls</div><div class='add'>+callbacks when it has the info, a row, or the end of the image.  You</div><div class='add'>+set up these callbacks with png_set_progressive_read_fn().  You don't</div><div class='add'>+have to worry about the input/output functions of libpng, as you are</div><div class='add'>+giving the library the data directly in png_process_data().  I will</div><div class='add'>+assume that you have read the section on reading PNG files above,</div><div class='add'>+so I will only highlight the differences (although I will show</div><div class='add'>+all of the code).</div><div class='add'>+</div><div class='add'>+png_structp png_ptr;</div><div class='add'>+png_infop info_ptr;</div><div class='add'>+</div><div class='add'>+ /*  An example code fragment of how you would</div><div class='add'>+     initialize the progressive reader in your</div><div class='add'>+     application. */</div><div class='add'>+ int</div><div class='add'>+ initialize_png_reader()</div><div class='add'>+ {</div><div class='add'>+    png_ptr = png_create_read_struct</div><div class='add'>+        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,</div><div class='add'>+         user_error_fn, user_warning_fn);</div><div class='add'>+</div><div class='add'>+    if (!png_ptr)</div><div class='add'>+        return (ERROR);</div><div class='add'>+</div><div class='add'>+    info_ptr = png_create_info_struct(png_ptr);</div><div class='add'>+</div><div class='add'>+    if (!info_ptr)</div><div class='add'>+    {</div><div class='add'>+       png_destroy_read_struct(&amp;png_ptr,</div><div class='add'>+          (png_infopp)NULL, (png_infopp)NULL);</div><div class='add'>+       return (ERROR);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (setjmp(png_jmpbuf(png_ptr)))</div><div class='add'>+    {</div><div class='add'>+       png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='add'>+          (png_infopp)NULL);</div><div class='add'>+       return (ERROR);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* This one's new.  You can provide functions</div><div class='add'>+       to be called when the header info is valid,</div><div class='add'>+       when each row is completed, and when the image</div><div class='add'>+       is finished.  If you aren't using all functions,</div><div class='add'>+       you can specify NULL parameters.  Even when all</div><div class='add'>+       three functions are NULL, you need to call</div><div class='add'>+       png_set_progressive_read_fn().  You can use</div><div class='add'>+       any struct as the user_ptr (cast to a void pointer</div><div class='add'>+       for the function call), and retrieve the pointer</div><div class='add'>+       from inside the callbacks using the function</div><div class='add'>+</div><div class='add'>+          png_get_progressive_ptr(png_ptr);</div><div class='add'>+</div><div class='add'>+       which will return a void pointer, which you have</div><div class='add'>+       to cast appropriately.</div><div class='add'>+     */</div><div class='add'>+    png_set_progressive_read_fn(png_ptr, (void *)user_ptr,</div><div class='add'>+        info_callback, row_callback, end_callback);</div><div class='add'>+</div><div class='add'>+    return 0;</div><div class='add'>+ }</div><div class='add'>+</div><div class='add'>+ /* A code fragment that you call as you receive blocks</div><div class='add'>+   of data */</div><div class='add'>+ int</div><div class='add'>+ process_data(png_bytep buffer, png_uint_32 length)</div><div class='add'>+ {</div><div class='add'>+    if (setjmp(png_jmpbuf(png_ptr)))</div><div class='add'>+    {</div><div class='add'>+       png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='add'>+           (png_infopp)NULL);</div><div class='add'>+       return (ERROR);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* This one's new also.  Simply give it a chunk</div><div class='add'>+       of data from the file stream (in order, of</div><div class='add'>+       course).  On machines with segmented memory</div><div class='add'>+       models machines, don't give it any more than</div><div class='add'>+       64K.  The library seems to run fine with sizes</div><div class='add'>+       of 4K. Although you can give it much less if</div><div class='add'>+       necessary (I assume you can give it chunks of</div><div class='add'>+       1 byte, I haven't tried less then 256 bytes</div><div class='add'>+       yet).  When this function returns, you may</div><div class='add'>+       want to display any rows that were generated</div><div class='add'>+       in the row callback if you don't already do</div><div class='add'>+       so there.</div><div class='add'>+     */</div><div class='add'>+    png_process_data(png_ptr, info_ptr, buffer, length);</div><div class='add'>+</div><div class='add'>+    /* At this point you can call png_process_data_skip if</div><div class='add'>+       you want to handle data the library will skip yourself;</div><div class='add'>+       it simply returns the number of bytes to skip (and stops</div><div class='add'>+       libpng skipping that number of bytes on the next</div><div class='add'>+       png_process_data call).</div><div class='add'>+    return 0;</div><div class='add'>+ }</div><div class='add'>+</div><div class='add'>+ /* This function is called (as set by</div><div class='add'>+    png_set_progressive_read_fn() above) when enough data</div><div class='add'>+    has been supplied so all of the header has been</div><div class='add'>+    read.</div><div class='add'>+ */</div><div class='add'>+ void</div><div class='add'>+ info_callback(png_structp png_ptr, png_infop info)</div><div class='add'>+ {</div><div class='add'>+    /* Do any setup here, including setting any of</div><div class='add'>+       the transformations mentioned in the Reading</div><div class='add'>+       PNG files section.  For now, you _must_ call</div><div class='add'>+       either png_start_read_image() or</div><div class='add'>+       png_read_update_info() after all the</div><div class='add'>+       transformations are set (even if you don't set</div><div class='add'>+       any).  You may start getting rows before</div><div class='add'>+       png_process_data() returns, so this is your</div><div class='add'>+       last chance to prepare for that.</div><div class='add'>+</div><div class='add'>+       This is where you turn on interlace handling,</div><div class='add'>+       assuming you don't want to do it yourself.</div><div class='add'>+</div><div class='add'>+       If you need to you can stop the processing of</div><div class='add'>+       your original input data at this point by calling</div><div class='add'>+       png_process_data_pause.  This returns the number</div><div class='add'>+       of unprocessed bytes from the last png_process_data</div><div class='add'>+       call - it is up to you to ensure that the next call</div><div class='add'>+       sees these bytes again.  If you don't want to bother</div><div class='add'>+       with this you can get libpng to cache the unread</div><div class='add'>+       bytes by setting the 'save' parameter (see png.h) but</div><div class='add'>+       then libpng will have to copy the data internally.</div><div class='add'>+     */</div><div class='add'>+ }</div><div class='add'>+</div><div class='add'>+ /* This function is called when each row of image</div><div class='add'>+    data is complete */</div><div class='add'>+ void</div><div class='add'>+ row_callback(png_structp png_ptr, png_bytep new_row,</div><div class='add'>+    png_uint_32 row_num, int pass)</div><div class='add'>+ {</div><div class='add'>+    /* If the image is interlaced, and you turned</div><div class='add'>+       on the interlace handler, this function will</div><div class='add'>+       be called for every row in every pass.  Some</div><div class='add'>+       of these rows will not be changed from the</div><div class='add'>+       previous pass.  When the row is not changed,</div><div class='add'>+       the new_row variable will be NULL.  The rows</div><div class='add'>+       and passes are called in order, so you don't</div><div class='add'>+       really need the row_num and pass, but I'm</div><div class='add'>+       supplying them because it may make your life</div><div class='add'>+       easier.</div><div class='add'>+</div><div class='add'>+       If you did not turn on interlace handling then</div><div class='add'>+       the callback is called for each row of each</div><div class='add'>+       sub-image when the image is interlaced.  In this</div><div class='add'>+       case 'row_num' is the row in the sub-image, not</div><div class='add'>+       the row in the output image as it is in all other</div><div class='add'>+       cases.</div><div class='add'>+</div><div class='add'>+       For the non-NULL rows of interlaced images when</div><div class='add'>+       you have switched on libpng interlace handling,</div><div class='add'>+       you must call png_progressive_combine_row()</div><div class='add'>+       passing in the row and the old row.  You can</div><div class='add'>+       call this function for NULL rows (it will just</div><div class='add'>+       return) and for non-interlaced images (it just</div><div class='add'>+       does the memcpy for you) if it will make the</div><div class='add'>+       code easier.  Thus, you can just do this for</div><div class='add'>+       all cases if you switch on interlace handling;</div><div class='add'>+     */</div><div class='add'>+</div><div class='add'>+        png_progressive_combine_row(png_ptr, old_row,</div><div class='add'>+          new_row);</div><div class='add'>+</div><div class='add'>+    /* where old_row is what was displayed for</div><div class='add'>+       previously for the row.  Note that the first</div><div class='add'>+       pass (pass == 0, really) will completely cover</div><div class='add'>+       the old row, so the rows do not have to be</div><div class='add'>+       initialized.  After the first pass (and only</div><div class='add'>+       for interlaced images), you will have to pass</div><div class='add'>+       the current row, and the function will combine</div><div class='add'>+       the old row and the new row.</div><div class='add'>+</div><div class='add'>+       You can also call png_process_data_pause in this</div><div class='add'>+       callback - see above.</div><div class='add'>+    */</div><div class='add'>+ }</div><div class='add'>+</div><div class='add'>+ void</div><div class='add'>+ end_callback(png_structp png_ptr, png_infop info)</div><div class='add'>+ {</div><div class='add'>+    /* This function is called after the whole image</div><div class='add'>+       has been read, including any chunks after the</div><div class='add'>+       image (up to and including the IEND).  You</div><div class='add'>+       will usually have the same info chunk as you</div><div class='add'>+       had in the header, although some data may have</div><div class='add'>+       been added to the comments and time fields.</div><div class='add'>+</div><div class='add'>+       Most people won't do much here, perhaps setting</div><div class='add'>+       a flag that marks the image as finished.</div><div class='add'>+     */</div><div class='add'>+ }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+IV. Writing</div><div class='add'>+</div><div class='add'>+Much of this is very similar to reading.  However, everything of</div><div class='add'>+importance is repeated here, so you won't have to constantly look</div><div class='add'>+back up in the reading section to understand writing.</div><div class='add'>+</div><div class='add'>+Setup</div><div class='add'>+</div><div class='add'>+You will want to do the I/O initialization before you get into libpng,</div><div class='add'>+so if it doesn't work, you don't have anything to undo. If you are not</div><div class='add'>+using the standard I/O functions, you will need to replace them with</div><div class='add'>+custom writing functions.  See the discussion under Customizing libpng.</div><div class='add'>+</div><div class='add'>+    FILE *fp = fopen(file_name, "wb");</div><div class='add'>+</div><div class='add'>+    if (!fp)</div><div class='add'>+       return (ERROR);</div><div class='add'>+</div><div class='add'>+Next, png_struct and png_info need to be allocated and initialized.</div><div class='add'>+As these can be both relatively large, you may not want to store these</div><div class='add'>+on the stack, unless you have stack space to spare.  Of course, you</div><div class='add'>+will want to check if they return NULL.  If you are also reading,</div><div class='add'>+you won't want to name your read structure and your write structure</div><div class='add'>+both "png_ptr"; you can call them anything you like, such as</div><div class='add'>+"read_ptr" and "write_ptr".  Look at pngtest.c, for example.</div><div class='add'>+</div><div class='add'>+    png_structp png_ptr = png_create_write_struct</div><div class='add'>+       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,</div><div class='add'>+        user_error_fn, user_warning_fn);</div><div class='add'>+</div><div class='add'>+    if (!png_ptr)</div><div class='add'>+       return (ERROR);</div><div class='add'>+</div><div class='add'>+    png_infop info_ptr = png_create_info_struct(png_ptr);</div><div class='add'>+    if (!info_ptr)</div><div class='add'>+    {</div><div class='add'>+       png_destroy_write_struct(&amp;png_ptr,</div><div class='add'>+           (png_infopp)NULL);</div><div class='add'>+       return (ERROR);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+If you want to use your own memory allocation routines,</div><div class='add'>+define PNG_USER_MEM_SUPPORTED and use</div><div class='add'>+png_create_write_struct_2() instead of png_create_write_struct():</div><div class='add'>+</div><div class='add'>+    png_structp png_ptr = png_create_write_struct_2</div><div class='add'>+       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,</div><div class='add'>+        user_error_fn, user_warning_fn, (png_voidp)</div><div class='add'>+        user_mem_ptr, user_malloc_fn, user_free_fn);</div><div class='add'>+</div><div class='add'>+After you have these structures, you will need to set up the</div><div class='add'>+error handling.  When libpng encounters an error, it expects to</div><div class='add'>+longjmp() back to your routine.  Therefore, you will need to call</div><div class='add'>+setjmp() and pass the png_jmpbuf(png_ptr).  If you</div><div class='add'>+write the file from different routines, you will need to update</div><div class='add'>+the png_jmpbuf(png_ptr) every time you enter a new routine that will</div><div class='add'>+call a png_*() function.  See your documentation of setjmp/longjmp</div><div class='add'>+for your compiler for more information on setjmp/longjmp.  See</div><div class='add'>+the discussion on libpng error handling in the Customizing Libpng</div><div class='add'>+section below for more information on the libpng error handling.</div><div class='add'>+</div><div class='add'>+    if (setjmp(png_jmpbuf(png_ptr)))</div><div class='add'>+    {</div><div class='add'>+    png_destroy_write_struct(&amp;png_ptr, &amp;info_ptr);</div><div class='add'>+       fclose(fp);</div><div class='add'>+       return (ERROR);</div><div class='add'>+    }</div><div class='add'>+    ...</div><div class='add'>+    return;</div><div class='add'>+</div><div class='add'>+If you would rather avoid the complexity of setjmp/longjmp issues,</div><div class='add'>+you can compile libpng with PNG_NO_SETJMP, in which case</div><div class='add'>+errors will result in a call to PNG_ABORT() which defaults to abort().</div><div class='add'>+</div><div class='add'>+You can #define PNG_ABORT() to a function that does something</div><div class='add'>+more useful than abort(), as long as your function does not</div><div class='add'>+return.</div><div class='add'>+</div><div class='add'>+Now you need to set up the output code.  The default for libpng is to</div><div class='add'>+use the C function fwrite().  If you use this, you will need to pass a</div><div class='add'>+valid FILE * in the function png_init_io().  Be sure that the file is</div><div class='add'>+opened in binary mode.  Again, if you wish to handle writing data in</div><div class='add'>+another way, see the discussion on libpng I/O handling in the Customizing</div><div class='add'>+Libpng section below.</div><div class='add'>+</div><div class='add'>+    png_init_io(png_ptr, fp);</div><div class='add'>+</div><div class='add'>+If you are embedding your PNG into a datastream such as MNG, and don't</div><div class='add'>+want libpng to write the 8-byte signature, or if you have already</div><div class='add'>+written the signature in your application, use</div><div class='add'>+</div><div class='add'>+    png_set_sig_bytes(png_ptr, 8);</div><div class='add'>+</div><div class='add'>+to inform libpng that it should not write a signature.</div><div class='add'>+</div><div class='add'>+Write callbacks</div><div class='add'>+</div><div class='add'>+At this point, you can set up a callback function that will be</div><div class='add'>+called after each row has been written, which you can use to control</div><div class='add'>+a progress meter or the like.  It's demonstrated in pngtest.c.</div><div class='add'>+You must supply a function</div><div class='add'>+</div><div class='add'>+    void write_row_callback(png_structp png_ptr, png_uint_32 row,</div><div class='add'>+       int pass);</div><div class='add'>+    {</div><div class='add'>+      /* put your code here */</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+(You can give it another name that you like instead of "write_row_callback")</div><div class='add'>+</div><div class='add'>+To inform libpng about your function, use</div><div class='add'>+</div><div class='add'>+    png_set_write_status_fn(png_ptr, write_row_callback);</div><div class='add'>+</div><div class='add'>+You now have the option of modifying how the compression library will</div><div class='add'>+run.  The following functions are mainly for testing, but may be useful</div><div class='add'>+in some cases, like if you need to write PNG files extremely fast and</div><div class='add'>+are willing to give up some compression, or if you want to get the</div><div class='add'>+maximum possible compression at the expense of slower writing.  If you</div><div class='add'>+have no special needs in this area, let the library do what it wants by</div><div class='add'>+not calling this function at all, as it has been tuned to deliver a good</div><div class='add'>+speed/compression ratio. The second parameter to png_set_filter() is</div><div class='add'>+the filter method, for which the only valid values are 0 (as of the</div><div class='add'>+July 1999 PNG specification, version 1.2) or 64 (if you are writing</div><div class='add'>+a PNG datastream that is to be embedded in a MNG datastream).  The third</div><div class='add'>+parameter is a flag that indicates which filter type(s) are to be tested</div><div class='add'>+for each scanline.  See the PNG specification for details on the specific</div><div class='add'>+filter types.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    /* turn on or off filtering, and/or choose</div><div class='add'>+       specific filters.  You can use either a single</div><div class='add'>+       PNG_FILTER_VALUE_NAME or the bitwise OR of one</div><div class='add'>+       or more PNG_FILTER_NAME masks.</div><div class='add'>+     */</div><div class='add'>+    png_set_filter(png_ptr, 0,</div><div class='add'>+       PNG_FILTER_NONE  | PNG_FILTER_VALUE_NONE |</div><div class='add'>+       PNG_FILTER_SUB   | PNG_FILTER_VALUE_SUB  |</div><div class='add'>+       PNG_FILTER_UP    | PNG_FILTER_VALUE_UP   |</div><div class='add'>+       PNG_FILTER_AVG   | PNG_FILTER_VALUE_AVG  |</div><div class='add'>+       PNG_FILTER_PAETH | PNG_FILTER_VALUE_PAETH|</div><div class='add'>+       PNG_ALL_FILTERS);</div><div class='add'>+</div><div class='add'>+If an application wants to start and stop using particular filters during</div><div class='add'>+compression, it should start out with all of the filters (to ensure that</div><div class='add'>+the previous row of pixels will be stored in case it's needed later),</div><div class='add'>+and then add and remove them after the start of compression.</div><div class='add'>+</div><div class='add'>+If you are writing a PNG datastream that is to be embedded in a MNG</div><div class='add'>+datastream, the second parameter can be either 0 or 64.</div><div class='add'>+</div><div class='add'>+The png_set_compression_*() functions interface to the zlib compression</div><div class='add'>+library, and should mostly be ignored unless you really know what you are</div><div class='add'>+doing.  The only generally useful call is png_set_compression_level()</div><div class='add'>+which changes how much time zlib spends on trying to compress the image</div><div class='add'>+data.  See the Compression Library (zlib.h and algorithm.txt, distributed</div><div class='add'>+with zlib) for details on the compression levels.</div><div class='add'>+</div><div class='add'>+    /* set the zlib compression level */</div><div class='add'>+    png_set_compression_level(png_ptr,</div><div class='add'>+        Z_BEST_COMPRESSION);</div><div class='add'>+</div><div class='add'>+    /* set other zlib parameters */</div><div class='add'>+    png_set_compression_mem_level(png_ptr, 8);</div><div class='add'>+    png_set_compression_strategy(png_ptr,</div><div class='add'>+        Z_DEFAULT_STRATEGY);</div><div class='add'>+    png_set_compression_window_bits(png_ptr, 15);</div><div class='add'>+    png_set_compression_method(png_ptr, 8);</div><div class='add'>+    png_set_compression_buffer_size(png_ptr, 8192)</div><div class='add'>+</div><div class='add'>+extern PNG_EXPORT(void,png_set_zbuf_size)</div><div class='add'>+</div><div class='add'>+Setting the contents of info for output</div><div class='add'>+</div><div class='add'>+You now need to fill in the png_info structure with all the data you</div><div class='add'>+wish to write before the actual image.  Note that the only thing you</div><div class='add'>+are allowed to write after the image is the text chunks and the time</div><div class='add'>+chunk (as of PNG Specification 1.2, anyway).  See png_write_end() and</div><div class='add'>+the latest PNG specification for more information on that.  If you</div><div class='add'>+wish to write them before the image, fill them in now, and flag that</div><div class='add'>+data as being valid.  If you want to wait until after the data, don't</div><div class='add'>+fill them until png_write_end().  For all the fields in png_info and</div><div class='add'>+their data types, see png.h.  For explanations of what the fields</div><div class='add'>+contain, see the PNG specification.</div><div class='add'>+</div><div class='add'>+Some of the more important parts of the png_info are:</div><div class='add'>+</div><div class='add'>+    png_set_IHDR(png_ptr, info_ptr, width, height,</div><div class='add'>+       bit_depth, color_type, interlace_type,</div><div class='add'>+       compression_type, filter_method)</div><div class='add'>+</div><div class='add'>+    width          - holds the width of the image</div><div class='add'>+                     in pixels (up to 2^31).</div><div class='add'>+</div><div class='add'>+    height         - holds the height of the image</div><div class='add'>+                     in pixels (up to 2^31).</div><div class='add'>+</div><div class='add'>+    bit_depth      - holds the bit depth of one of the</div><div class='add'>+                     image channels.</div><div class='add'>+                     (valid values are 1, 2, 4, 8, 16</div><div class='add'>+                     and depend also on the</div><div class='add'>+                     color_type.  See also significant</div><div class='add'>+                     bits (sBIT) below).</div><div class='add'>+</div><div class='add'>+    color_type     - describes which color/alpha</div><div class='add'>+                     channels are present.</div><div class='add'>+                     PNG_COLOR_TYPE_GRAY</div><div class='add'>+                        (bit depths 1, 2, 4, 8, 16)</div><div class='add'>+                     PNG_COLOR_TYPE_GRAY_ALPHA</div><div class='add'>+                        (bit depths 8, 16)</div><div class='add'>+                     PNG_COLOR_TYPE_PALETTE</div><div class='add'>+                        (bit depths 1, 2, 4, 8)</div><div class='add'>+                     PNG_COLOR_TYPE_RGB</div><div class='add'>+                        (bit_depths 8, 16)</div><div class='add'>+                     PNG_COLOR_TYPE_RGB_ALPHA</div><div class='add'>+                        (bit_depths 8, 16)</div><div class='add'>+</div><div class='add'>+                     PNG_COLOR_MASK_PALETTE</div><div class='add'>+                     PNG_COLOR_MASK_COLOR</div><div class='add'>+                     PNG_COLOR_MASK_ALPHA</div><div class='add'>+</div><div class='add'>+    interlace_type - PNG_INTERLACE_NONE or</div><div class='add'>+                     PNG_INTERLACE_ADAM7</div><div class='add'>+</div><div class='add'>+    compression_type - (must be</div><div class='add'>+                     PNG_COMPRESSION_TYPE_DEFAULT)</div><div class='add'>+</div><div class='add'>+    filter_method  - (must be PNG_FILTER_TYPE_DEFAULT</div><div class='add'>+                     or, if you are writing a PNG to</div><div class='add'>+                     be embedded in a MNG datastream,</div><div class='add'>+                     can also be</div><div class='add'>+                     PNG_INTRAPIXEL_DIFFERENCING)</div><div class='add'>+</div><div class='add'>+If you call png_set_IHDR(), the call must appear before any of the</div><div class='add'>+other png_set_*() functions, because they might require access to some of</div><div class='add'>+the IHDR settings.  The remaining png_set_*() functions can be called</div><div class='add'>+in any order.</div><div class='add'>+</div><div class='add'>+If you wish, you can reset the compression_type, interlace_type, or</div><div class='add'>+filter_method later by calling png_set_IHDR() again; if you do this, the</div><div class='add'>+width, height, bit_depth, and color_type must be the same in each call.</div><div class='add'>+</div><div class='add'>+    png_set_PLTE(png_ptr, info_ptr, palette,</div><div class='add'>+       num_palette);</div><div class='add'>+</div><div class='add'>+    palette        - the palette for the file</div><div class='add'>+                     (array of png_color)</div><div class='add'>+    num_palette    - number of entries in the palette</div><div class='add'>+</div><div class='add'>+    png_set_gAMA(png_ptr, info_ptr, file_gamma);</div><div class='add'>+    png_set_gAMA_fixed(png_ptr, info_ptr, int_file_gamma);</div><div class='add'>+</div><div class='add'>+    file_gamma     - the gamma at which the image was</div><div class='add'>+                     created (PNG_INFO_gAMA)</div><div class='add'>+</div><div class='add'>+    int_file_gamma - 100,000 times the gamma at which</div><div class='add'>+                     the image was created</div><div class='add'>+</div><div class='add'>+    png_set_sRGB(png_ptr, info_ptr, srgb_intent);</div><div class='add'>+</div><div class='add'>+    srgb_intent    - the rendering intent</div><div class='add'>+                     (PNG_INFO_sRGB) The presence of</div><div class='add'>+                     the sRGB chunk means that the pixel</div><div class='add'>+                     data is in the sRGB color space.</div><div class='add'>+                     This chunk also implies specific</div><div class='add'>+                     values of gAMA and cHRM.  Rendering</div><div class='add'>+                     intent is the CSS-1 property that</div><div class='add'>+                     has been defined by the International</div><div class='add'>+                     Color Consortium</div><div class='add'>+                     (http://www.color.org).</div><div class='add'>+                     It can be one of</div><div class='add'>+                     PNG_sRGB_INTENT_SATURATION,</div><div class='add'>+                     PNG_sRGB_INTENT_PERCEPTUAL,</div><div class='add'>+                     PNG_sRGB_INTENT_ABSOLUTE, or</div><div class='add'>+                     PNG_sRGB_INTENT_RELATIVE.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,</div><div class='add'>+       srgb_intent);</div><div class='add'>+</div><div class='add'>+    srgb_intent    - the rendering intent</div><div class='add'>+                     (PNG_INFO_sRGB) The presence of the</div><div class='add'>+                     sRGB chunk means that the pixel</div><div class='add'>+                     data is in the sRGB color space.</div><div class='add'>+                     This function also causes gAMA and</div><div class='add'>+                     cHRM chunks with the specific values</div><div class='add'>+                     that are consistent with sRGB to be</div><div class='add'>+                     written.</div><div class='add'>+</div><div class='add'>+    png_set_iCCP(png_ptr, info_ptr, name, compression_type,</div><div class='add'>+                       profile, proflen);</div><div class='add'>+</div><div class='add'>+    name             - The profile name.</div><div class='add'>+</div><div class='add'>+    compression_type - The compression type; always</div><div class='add'>+                       PNG_COMPRESSION_TYPE_BASE for PNG 1.0.</div><div class='add'>+                       You may give NULL to this argument to</div><div class='add'>+                       ignore it.</div><div class='add'>+</div><div class='add'>+    profile          - International Color Consortium color</div><div class='add'>+                       profile data. May contain NULs.</div><div class='add'>+</div><div class='add'>+    proflen          - length of profile data in bytes.</div><div class='add'>+</div><div class='add'>+    png_set_sBIT(png_ptr, info_ptr, sig_bit);</div><div class='add'>+</div><div class='add'>+    sig_bit        - the number of significant bits for</div><div class='add'>+                     (PNG_INFO_sBIT) each of the gray, red,</div><div class='add'>+                     green, and blue channels, whichever are</div><div class='add'>+                     appropriate for the given color type</div><div class='add'>+                     (png_color_16)</div><div class='add'>+</div><div class='add'>+    png_set_tRNS(png_ptr, info_ptr, trans_alpha,</div><div class='add'>+       num_trans, trans_color);</div><div class='add'>+</div><div class='add'>+    trans_alpha    - array of alpha (transparency)</div><div class='add'>+                     entries for palette (PNG_INFO_tRNS)</div><div class='add'>+</div><div class='add'>+    trans_color    - graylevel or color sample values</div><div class='add'>+                     (in order red, green, blue) of the</div><div class='add'>+                     single transparent color for</div><div class='add'>+                     non-paletted images (PNG_INFO_tRNS)</div><div class='add'>+</div><div class='add'>+    num_trans      - number of transparent entries</div><div class='add'>+                     (PNG_INFO_tRNS)</div><div class='add'>+</div><div class='add'>+    png_set_hIST(png_ptr, info_ptr, hist);</div><div class='add'>+</div><div class='add'>+    hist           - histogram of palette (array of</div><div class='add'>+                     png_uint_16) (PNG_INFO_hIST)</div><div class='add'>+</div><div class='add'>+    png_set_tIME(png_ptr, info_ptr, mod_time);</div><div class='add'>+</div><div class='add'>+    mod_time       - time image was last modified</div><div class='add'>+                     (PNG_VALID_tIME)</div><div class='add'>+</div><div class='add'>+    png_set_bKGD(png_ptr, info_ptr, background);</div><div class='add'>+</div><div class='add'>+    background     - background color (PNG_VALID_bKGD)</div><div class='add'>+</div><div class='add'>+    png_set_text(png_ptr, info_ptr, text_ptr, num_text);</div><div class='add'>+</div><div class='add'>+    text_ptr       - array of png_text holding image</div><div class='add'>+                     comments</div><div class='add'>+</div><div class='add'>+    text_ptr[i].compression - type of compression used</div><div class='add'>+                 on "text" PNG_TEXT_COMPRESSION_NONE</div><div class='add'>+                           PNG_TEXT_COMPRESSION_zTXt</div><div class='add'>+                           PNG_ITXT_COMPRESSION_NONE</div><div class='add'>+                           PNG_ITXT_COMPRESSION_zTXt</div><div class='add'>+    text_ptr[i].key   - keyword for comment.  Must contain</div><div class='add'>+                 1-79 characters.</div><div class='add'>+    text_ptr[i].text  - text comments for current</div><div class='add'>+                         keyword.  Can be NULL or empty.</div><div class='add'>+    text_ptr[i].text_length - length of text string,</div><div class='add'>+                 after decompression, 0 for iTXt</div><div class='add'>+    text_ptr[i].itxt_length - length of itxt string,</div><div class='add'>+                 after decompression, 0 for tEXt/zTXt</div><div class='add'>+    text_ptr[i].lang  - language of comment (NULL or</div><div class='add'>+                         empty for unknown).</div><div class='add'>+    text_ptr[i].translated_keyword  - keyword in UTF-8 (NULL</div><div class='add'>+                         or empty for unknown).</div><div class='add'>+    Note that the itxt_length, lang, and lang_key</div><div class='add'>+    members of the text_ptr structure only exist</div><div class='add'>+    when the library is built with iTXt chunk support.</div><div class='add'>+</div><div class='add'>+    num_text       - number of comments</div><div class='add'>+</div><div class='add'>+    png_set_sPLT(png_ptr, info_ptr, &amp;palette_ptr,</div><div class='add'>+       num_spalettes);</div><div class='add'>+</div><div class='add'>+    palette_ptr    - array of png_sPLT_struct structures</div><div class='add'>+                     to be added to the list of palettes</div><div class='add'>+                     in the info structure.</div><div class='add'>+    num_spalettes  - number of palette structures to be</div><div class='add'>+                     added.</div><div class='add'>+</div><div class='add'>+    png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y,</div><div class='add'>+        unit_type);</div><div class='add'>+</div><div class='add'>+    offset_x  - positive offset from the left</div><div class='add'>+                     edge of the screen</div><div class='add'>+</div><div class='add'>+    offset_y  - positive offset from the top</div><div class='add'>+                     edge of the screen</div><div class='add'>+</div><div class='add'>+    unit_type - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER</div><div class='add'>+</div><div class='add'>+    png_set_pHYs(png_ptr, info_ptr, res_x, res_y,</div><div class='add'>+        unit_type);</div><div class='add'>+</div><div class='add'>+    res_x       - pixels/unit physical resolution</div><div class='add'>+                  in x direction</div><div class='add'>+</div><div class='add'>+    res_y       - pixels/unit physical resolution</div><div class='add'>+                  in y direction</div><div class='add'>+</div><div class='add'>+    unit_type   - PNG_RESOLUTION_UNKNOWN,</div><div class='add'>+                  PNG_RESOLUTION_METER</div><div class='add'>+</div><div class='add'>+    png_set_sCAL(png_ptr, info_ptr, unit, width, height)</div><div class='add'>+</div><div class='add'>+    unit        - physical scale units (an integer)</div><div class='add'>+</div><div class='add'>+    width       - width of a pixel in physical scale units</div><div class='add'>+</div><div class='add'>+    height      - height of a pixel in physical scale units</div><div class='add'>+                  (width and height are doubles)</div><div class='add'>+</div><div class='add'>+    png_set_sCAL_s(png_ptr, info_ptr, unit, width, height)</div><div class='add'>+</div><div class='add'>+    unit        - physical scale units (an integer)</div><div class='add'>+</div><div class='add'>+    width       - width of a pixel in physical scale units</div><div class='add'>+</div><div class='add'>+    height      - height of a pixel in physical scale units</div><div class='add'>+                 (width and height are strings like "2.54")</div><div class='add'>+</div><div class='add'>+    png_set_unknown_chunks(png_ptr, info_ptr, &amp;unknowns,</div><div class='add'>+       num_unknowns)</div><div class='add'>+</div><div class='add'>+    unknowns          - array of png_unknown_chunk</div><div class='add'>+                        structures holding unknown chunks</div><div class='add'>+    unknowns[i].name  - name of unknown chunk</div><div class='add'>+    unknowns[i].data  - data of unknown chunk</div><div class='add'>+    unknowns[i].size  - size of unknown chunk's data</div><div class='add'>+    unknowns[i].location - position to write chunk in file</div><div class='add'>+                           0: do not write chunk</div><div class='add'>+                           PNG_HAVE_IHDR: before PLTE</div><div class='add'>+                           PNG_HAVE_PLTE: before IDAT</div><div class='add'>+                           PNG_AFTER_IDAT: after IDAT</div><div class='add'>+</div><div class='add'>+The "location" member is set automatically according to</div><div class='add'>+what part of the output file has already been written.</div><div class='add'>+You can change its value after calling png_set_unknown_chunks()</div><div class='add'>+as demonstrated in pngtest.c.  Within each of the "locations",</div><div class='add'>+the chunks are sequenced according to their position in the</div><div class='add'>+structure (that is, the value of "i", which is the order in which</div><div class='add'>+the chunk was either read from the input file or defined with</div><div class='add'>+png_set_unknown_chunks).</div><div class='add'>+</div><div class='add'>+A quick word about text and num_text.  text is an array of png_text</div><div class='add'>+structures.  num_text is the number of valid structures in the array.</div><div class='add'>+Each png_text structure holds a language code, a keyword, a text value,</div><div class='add'>+and a compression type.</div><div class='add'>+</div><div class='add'>+The compression types have the same valid numbers as the compression</div><div class='add'>+types of the image data.  Currently, the only valid number is zero.</div><div class='add'>+However, you can store text either compressed or uncompressed, unlike</div><div class='add'>+images, which always have to be compressed.  So if you don't want the</div><div class='add'>+text compressed, set the compression type to PNG_TEXT_COMPRESSION_NONE.</div><div class='add'>+Because tEXt and zTXt chunks don't have a language field, if you</div><div class='add'>+specify PNG_TEXT_COMPRESSION_NONE or PNG_TEXT_COMPRESSION_zTXt</div><div class='add'>+any language code or translated keyword will not be written out.</div><div class='add'>+</div><div class='add'>+Until text gets around 1000 bytes, it is not worth compressing it.</div><div class='add'>+After the text has been written out to the file, the compression type</div><div class='add'>+is set to PNG_TEXT_COMPRESSION_NONE_WR or PNG_TEXT_COMPRESSION_zTXt_WR,</div><div class='add'>+so that it isn't written out again at the end (in case you are calling</div><div class='add'>+png_write_end() with the same struct).</div><div class='add'>+</div><div class='add'>+The keywords that are given in the PNG Specification are:</div><div class='add'>+</div><div class='add'>+    Title            Short (one line) title or</div><div class='add'>+                     caption for image</div><div class='add'>+</div><div class='add'>+    Author           Name of image's creator</div><div class='add'>+</div><div class='add'>+    Description      Description of image (possibly long)</div><div class='add'>+</div><div class='add'>+    Copyright        Copyright notice</div><div class='add'>+</div><div class='add'>+    Creation Time    Time of original image creation</div><div class='add'>+                     (usually RFC 1123 format, see below)</div><div class='add'>+</div><div class='add'>+    Software         Software used to create the image</div><div class='add'>+</div><div class='add'>+    Disclaimer       Legal disclaimer</div><div class='add'>+</div><div class='add'>+    Warning          Warning of nature of content</div><div class='add'>+</div><div class='add'>+    Source           Device used to create the image</div><div class='add'>+</div><div class='add'>+    Comment          Miscellaneous comment; conversion</div><div class='add'>+                     from other image format</div><div class='add'>+</div><div class='add'>+The keyword-text pairs work like this.  Keywords should be short</div><div class='add'>+simple descriptions of what the comment is about.  Some typical</div><div class='add'>+keywords are found in the PNG specification, as is some recommendations</div><div class='add'>+on keywords.  You can repeat keywords in a file.  You can even write</div><div class='add'>+some text before the image and some after.  For example, you may want</div><div class='add'>+to put a description of the image before the image, but leave the</div><div class='add'>+disclaimer until after, so viewers working over modem connections</div><div class='add'>+don't have to wait for the disclaimer to go over the modem before</div><div class='add'>+they start seeing the image.  Finally, keywords should be full</div><div class='add'>+words, not abbreviations.  Keywords and text are in the ISO 8859-1</div><div class='add'>+(Latin-1) character set (a superset of regular ASCII) and can not</div><div class='add'>+contain NUL characters, and should not contain control or other</div><div class='add'>+unprintable characters.  To make the comments widely readable, stick</div><div class='add'>+with basic ASCII, and avoid machine specific character set extensions</div><div class='add'>+like the IBM-PC character set.  The keyword must be present, but</div><div class='add'>+you can leave off the text string on non-compressed pairs.</div><div class='add'>+Compressed pairs must have a text string, as only the text string</div><div class='add'>+is compressed anyway, so the compression would be meaningless.</div><div class='add'>+</div><div class='add'>+PNG supports modification time via the png_time structure.  Two</div><div class='add'>+conversion routines are provided, png_convert_from_time_t() for</div><div class='add'>+time_t and png_convert_from_struct_tm() for struct tm.  The</div><div class='add'>+time_t routine uses gmtime().  You don't have to use either of</div><div class='add'>+these, but if you wish to fill in the png_time structure directly,</div><div class='add'>+you should provide the time in universal time (GMT) if possible</div><div class='add'>+instead of your local time.  Note that the year number is the full</div><div class='add'>+year (e.g. 1998, rather than 98 - PNG is year 2000 compliant!), and</div><div class='add'>+that months start with 1.</div><div class='add'>+</div><div class='add'>+If you want to store the time of the original image creation, you should</div><div class='add'>+use a plain tEXt chunk with the "Creation Time" keyword.  This is</div><div class='add'>+necessary because the "creation time" of a PNG image is somewhat vague,</div><div class='add'>+depending on whether you mean the PNG file, the time the image was</div><div class='add'>+created in a non-PNG format, a still photo from which the image was</div><div class='add'>+scanned, or possibly the subject matter itself.  In order to facilitate</div><div class='add'>+machine-readable dates, it is recommended that the "Creation Time"</div><div class='add'>+tEXt chunk use RFC 1123 format dates (e.g. "22 May 1997 18:07:10 GMT"),</div><div class='add'>+although this isn't a requirement.  Unlike the tIME chunk, the</div><div class='add'>+"Creation Time" tEXt chunk is not expected to be automatically changed</div><div class='add'>+by the software.  To facilitate the use of RFC 1123 dates, a function</div><div class='add'>+png_convert_to_rfc1123(png_timep) is provided to convert from PNG</div><div class='add'>+time to an RFC 1123 format string.</div><div class='add'>+</div><div class='add'>+Writing unknown chunks</div><div class='add'>+</div><div class='add'>+You can use the png_set_unknown_chunks function to queue up chunks</div><div class='add'>+for writing.  You give it a chunk name, raw data, and a size; that's</div><div class='add'>+all there is to it.  The chunks will be written by the next following</div><div class='add'>+png_write_info_before_PLTE, png_write_info, or png_write_end function.</div><div class='add'>+Any chunks previously read into the info structure's unknown-chunk</div><div class='add'>+list will also be written out in a sequence that satisfies the PNG</div><div class='add'>+specification's ordering rules.</div><div class='add'>+</div><div class='add'>+The high-level write interface</div><div class='add'>+</div><div class='add'>+At this point there are two ways to proceed; through the high-level</div><div class='add'>+write interface, or through a sequence of low-level write operations.</div><div class='add'>+You can use the high-level interface if your image data is present</div><div class='add'>+in the info structure.  All defined output</div><div class='add'>+transformations are permitted, enabled by the following masks.</div><div class='add'>+</div><div class='add'>+    PNG_TRANSFORM_IDENTITY      No transformation</div><div class='add'>+    PNG_TRANSFORM_PACKING       Pack 1, 2 and 4-bit samples</div><div class='add'>+    PNG_TRANSFORM_PACKSWAP      Change order of packed</div><div class='add'>+                                pixels to LSB first</div><div class='add'>+    PNG_TRANSFORM_INVERT_MONO   Invert monochrome images</div><div class='add'>+    PNG_TRANSFORM_SHIFT         Normalize pixels to the</div><div class='add'>+                                sBIT depth</div><div class='add'>+    PNG_TRANSFORM_BGR           Flip RGB to BGR, RGBA</div><div class='add'>+                                to BGRA</div><div class='add'>+    PNG_TRANSFORM_SWAP_ALPHA    Flip RGBA to ARGB or GA</div><div class='add'>+                                to AG</div><div class='add'>+    PNG_TRANSFORM_INVERT_ALPHA  Change alpha from opacity</div><div class='add'>+                                to transparency</div><div class='add'>+    PNG_TRANSFORM_SWAP_ENDIAN   Byte-swap 16-bit samples</div><div class='add'>+    PNG_TRANSFORM_STRIP_FILLER        Strip out filler</div><div class='add'>+                                      bytes (deprecated).</div><div class='add'>+    PNG_TRANSFORM_STRIP_FILLER_BEFORE Strip out leading</div><div class='add'>+                                      filler bytes</div><div class='add'>+    PNG_TRANSFORM_STRIP_FILLER_AFTER  Strip out trailing</div><div class='add'>+                                      filler bytes</div><div class='add'>+</div><div class='add'>+If you have valid image data in the info structure (you can use</div><div class='add'>+png_set_rows() to put image data in the info structure), simply do this:</div><div class='add'>+</div><div class='add'>+    png_write_png(png_ptr, info_ptr, png_transforms, NULL)</div><div class='add'>+</div><div class='add'>+where png_transforms is an integer containing the bitwise OR of some set of</div><div class='add'>+transformation flags.  This call is equivalent to png_write_info(),</div><div class='add'>+followed the set of transformations indicated by the transform mask,</div><div class='add'>+then png_write_image(), and finally png_write_end().</div><div class='add'>+</div><div class='add'>+(The final parameter of this call is not yet used.  Someday it might point</div><div class='add'>+to transformation parameters required by some future output transform.)</div><div class='add'>+</div><div class='add'>+You must use png_transforms and not call any png_set_transform() functions</div><div class='add'>+when you use png_write_png().</div><div class='add'>+</div><div class='add'>+The low-level write interface</div><div class='add'>+</div><div class='add'>+If you are going the low-level route instead, you are now ready to</div><div class='add'>+write all the file information up to the actual image data.  You do</div><div class='add'>+this with a call to png_write_info().</div><div class='add'>+</div><div class='add'>+    png_write_info(png_ptr, info_ptr);</div><div class='add'>+</div><div class='add'>+Note that there is one transformation you may need to do before</div><div class='add'>+png_write_info().  In PNG files, the alpha channel in an image is the</div><div class='add'>+level of opacity.  If your data is supplied as a level of transparency,</div><div class='add'>+you can invert the alpha channel before you write it, so that 0 is</div><div class='add'>+fully transparent and 255 (in 8-bit or paletted images) or 65535</div><div class='add'>+(in 16-bit images) is fully opaque, with</div><div class='add'>+</div><div class='add'>+    png_set_invert_alpha(png_ptr);</div><div class='add'>+</div><div class='add'>+This must appear before png_write_info() instead of later with the</div><div class='add'>+other transformations because in the case of paletted images the tRNS</div><div class='add'>+chunk data has to be inverted before the tRNS chunk is written.  If</div><div class='add'>+your image is not a paletted image, the tRNS data (which in such cases</div><div class='add'>+represents a single color to be rendered as transparent) won't need to</div><div class='add'>+be changed, and you can safely do this transformation after your</div><div class='add'>+png_write_info() call.</div><div class='add'>+</div><div class='add'>+If you need to write a private chunk that you want to appear before</div><div class='add'>+the PLTE chunk when PLTE is present, you can write the PNG info in</div><div class='add'>+two steps, and insert code to write your own chunk between them:</div><div class='add'>+</div><div class='add'>+    png_write_info_before_PLTE(png_ptr, info_ptr);</div><div class='add'>+    png_set_unknown_chunks(png_ptr, info_ptr, ...);</div><div class='add'>+    png_write_info(png_ptr, info_ptr);</div><div class='add'>+</div><div class='add'>+After you've written the file information, you can set up the library</div><div class='add'>+to handle any special transformations of the image data.  The various</div><div class='add'>+ways to transform the data will be described in the order that they</div><div class='add'>+should occur.  This is important, as some of these change the color</div><div class='add'>+type and/or bit depth of the data, and some others only work on</div><div class='add'>+certain color types and bit depths.  Even though each transformation</div><div class='add'>+checks to see if it has data that it can do something with, you should</div><div class='add'>+make sure to only enable a transformation if it will be valid for the</div><div class='add'>+data.  For example, don't swap red and blue on grayscale data.</div><div class='add'>+</div><div class='add'>+PNG files store RGB pixels packed into 3 or 6 bytes.  This code tells</div><div class='add'>+the library to strip input data that has 4 or 8 bytes per pixel down</div><div class='add'>+to 3 or 6 bytes (or strip 2 or 4-byte grayscale+filler data to 1 or 2</div><div class='add'>+bytes per pixel).</div><div class='add'>+</div><div class='add'>+    png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);</div><div class='add'>+</div><div class='add'>+where the 0 is unused, and the location is either PNG_FILLER_BEFORE or</div><div class='add'>+PNG_FILLER_AFTER, depending upon whether the filler byte in the pixel</div><div class='add'>+is stored XRGB or RGBX.</div><div class='add'>+</div><div class='add'>+PNG files pack pixels of bit depths 1, 2, and 4 into bytes as small as</div><div class='add'>+they can, resulting in, for example, 8 pixels per byte for 1 bit files.</div><div class='add'>+If the data is supplied at 1 pixel per byte, use this code, which will</div><div class='add'>+correctly pack the pixels into a single byte:</div><div class='add'>+</div><div class='add'>+    png_set_packing(png_ptr);</div><div class='add'>+</div><div class='add'>+PNG files reduce possible bit depths to 1, 2, 4, 8, and 16.  If your</div><div class='add'>+data is of another bit depth, you can write an sBIT chunk into the</div><div class='add'>+file so that decoders can recover the original data if desired.</div><div class='add'>+</div><div class='add'>+    /* Set the true bit depth of the image data */</div><div class='add'>+    if (color_type &amp; PNG_COLOR_MASK_COLOR)</div><div class='add'>+    {</div><div class='add'>+       sig_bit.red = true_bit_depth;</div><div class='add'>+       sig_bit.green = true_bit_depth;</div><div class='add'>+       sig_bit.blue = true_bit_depth;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    else</div><div class='add'>+    {</div><div class='add'>+       sig_bit.gray = true_bit_depth;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (color_type &amp; PNG_COLOR_MASK_ALPHA)</div><div class='add'>+    {</div><div class='add'>+       sig_bit.alpha = true_bit_depth;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    png_set_sBIT(png_ptr, info_ptr, &amp;sig_bit);</div><div class='add'>+</div><div class='add'>+If the data is stored in the row buffer in a bit depth other than</div><div class='add'>+one supported by PNG (e.g. 3 bit data in the range 0-7 for a 4-bit PNG),</div><div class='add'>+this will scale the values to appear to be the correct bit depth as</div><div class='add'>+is required by PNG.</div><div class='add'>+</div><div class='add'>+    png_set_shift(png_ptr, &amp;sig_bit);</div><div class='add'>+</div><div class='add'>+PNG files store 16 bit pixels in network byte order (big-endian,</div><div class='add'>+ie. most significant bits first).  This code would be used if they are</div><div class='add'>+supplied the other way (little-endian, i.e. least significant bits</div><div class='add'>+first, the way PCs store them):</div><div class='add'>+</div><div class='add'>+    if (bit_depth &gt; 8)</div><div class='add'>+       png_set_swap(png_ptr);</div><div class='add'>+</div><div class='add'>+If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you</div><div class='add'>+need to change the order the pixels are packed into bytes, you can use:</div><div class='add'>+</div><div class='add'>+    if (bit_depth &lt; 8)</div><div class='add'>+       png_set_packswap(png_ptr);</div><div class='add'>+</div><div class='add'>+PNG files store 3 color pixels in red, green, blue order.  This code</div><div class='add'>+would be used if they are supplied as blue, green, red:</div><div class='add'>+</div><div class='add'>+    png_set_bgr(png_ptr);</div><div class='add'>+</div><div class='add'>+PNG files describe monochrome as black being zero and white being</div><div class='add'>+one. This code would be used if the pixels are supplied with this reversed</div><div class='add'>+(black being one and white being zero):</div><div class='add'>+</div><div class='add'>+    png_set_invert_mono(png_ptr);</div><div class='add'>+</div><div class='add'>+Finally, you can write your own transformation function if none of</div><div class='add'>+the existing ones meets your needs.  This is done by setting a callback</div><div class='add'>+with</div><div class='add'>+</div><div class='add'>+    png_set_write_user_transform_fn(png_ptr,</div><div class='add'>+       write_transform_fn);</div><div class='add'>+</div><div class='add'>+You must supply the function</div><div class='add'>+</div><div class='add'>+    void write_transform_fn(png_structp png_ptr ptr,</div><div class='add'>+       row_info_ptr row_info, png_bytep data)</div><div class='add'>+</div><div class='add'>+See pngtest.c for a working example.  Your function will be called</div><div class='add'>+before any of the other transformations are processed.  If supported</div><div class='add'>+libpng also supplies an information routine that may be called from</div><div class='add'>+your callback:</div><div class='add'>+</div><div class='add'>+   png_get_current_row_number(png_ptr);</div><div class='add'>+</div><div class='add'>+This returns the current row passed to the transform.  Even with interlaced</div><div class='add'>+images the value returned is the row in the final output image.</div><div class='add'>+</div><div class='add'>+You can also set up a pointer to a user structure for use by your</div><div class='add'>+callback function.</div><div class='add'>+</div><div class='add'>+    png_set_user_transform_info(png_ptr, user_ptr, 0, 0);</div><div class='add'>+</div><div class='add'>+The user_channels and user_depth parameters of this function are ignored</div><div class='add'>+when writing; you can set them to zero as shown.</div><div class='add'>+</div><div class='add'>+You can retrieve the pointer via the function png_get_user_transform_ptr().</div><div class='add'>+For example:</div><div class='add'>+</div><div class='add'>+    voidp write_user_transform_ptr =</div><div class='add'>+       png_get_user_transform_ptr(png_ptr);</div><div class='add'>+</div><div class='add'>+It is possible to have libpng flush any pending output, either manually,</div><div class='add'>+or automatically after a certain number of lines have been written.  To</div><div class='add'>+flush the output stream a single time call:</div><div class='add'>+</div><div class='add'>+    png_write_flush(png_ptr);</div><div class='add'>+</div><div class='add'>+and to have libpng flush the output stream periodically after a certain</div><div class='add'>+number of scanlines have been written, call:</div><div class='add'>+</div><div class='add'>+    png_set_flush(png_ptr, nrows);</div><div class='add'>+</div><div class='add'>+Note that the distance between rows is from the last time png_write_flush()</div><div class='add'>+was called, or the first row of the image if it has never been called.</div><div class='add'>+So if you write 50 lines, and then png_set_flush 25, it will flush the</div><div class='add'>+output on the next scanline, and every 25 lines thereafter, unless</div><div class='add'>+png_write_flush() is called before 25 more lines have been written.</div><div class='add'>+If nrows is too small (less than about 10 lines for a 640 pixel wide</div><div class='add'>+RGB image) the image compression may decrease noticeably (although this</div><div class='add'>+may be acceptable for real-time applications).  Infrequent flushing will</div><div class='add'>+only degrade the compression performance by a few percent over images</div><div class='add'>+that do not use flushing.</div><div class='add'>+</div><div class='add'>+Writing the image data</div><div class='add'>+</div><div class='add'>+That's it for the transformations.  Now you can write the image data.</div><div class='add'>+The simplest way to do this is in one function call.  If you have the</div><div class='add'>+whole image in memory, you can just call png_write_image() and libpng</div><div class='add'>+will write the image.  You will need to pass in an array of pointers to</div><div class='add'>+each row.  This function automatically handles interlacing, so you don't</div><div class='add'>+need to call png_set_interlace_handling() or call this function multiple</div><div class='add'>+times, or any of that other stuff necessary with png_write_rows().</div><div class='add'>+</div><div class='add'>+    png_write_image(png_ptr, row_pointers);</div><div class='add'>+</div><div class='add'>+where row_pointers is:</div><div class='add'>+</div><div class='add'>+    png_byte *row_pointers[height];</div><div class='add'>+</div><div class='add'>+You can point to void or char or whatever you use for pixels.</div><div class='add'>+</div><div class='add'>+If you don't want to write the whole image at once, you can</div><div class='add'>+use png_write_rows() instead.  If the file is not interlaced,</div><div class='add'>+this is simple:</div><div class='add'>+</div><div class='add'>+    png_write_rows(png_ptr, row_pointers,</div><div class='add'>+       number_of_rows);</div><div class='add'>+</div><div class='add'>+row_pointers is the same as in the png_write_image() call.</div><div class='add'>+</div><div class='add'>+If you are just writing one row at a time, you can do this with</div><div class='add'>+a single row_pointer instead of an array of row_pointers:</div><div class='add'>+</div><div class='add'>+    png_bytep row_pointer = row;</div><div class='add'>+</div><div class='add'>+    png_write_row(png_ptr, row_pointer);</div><div class='add'>+</div><div class='add'>+When the file is interlaced, things can get a good deal more complicated.</div><div class='add'>+The only currently (as of the PNG Specification version 1.2, dated July</div><div class='add'>+1999) defined interlacing scheme for PNG files is the "Adam7" interlace</div><div class='add'>+scheme, that breaks down an image into seven smaller images of varying</div><div class='add'>+size.  libpng will build these images for you, or you can do them</div><div class='add'>+yourself.  If you want to build them yourself, see the PNG specification</div><div class='add'>+for details of which pixels to write when.</div><div class='add'>+</div><div class='add'>+If you don't want libpng to handle the interlacing details, just</div><div class='add'>+use png_set_interlace_handling() and call png_write_rows() the</div><div class='add'>+correct number of times to write all the sub-images</div><div class='add'>+(png_set_interlace_handling() returns the number of sub-images.)</div><div class='add'>+</div><div class='add'>+If you want libpng to build the sub-images, call this before you start</div><div class='add'>+writing any rows:</div><div class='add'>+</div><div class='add'>+    number_of_passes = png_set_interlace_handling(png_ptr);</div><div class='add'>+</div><div class='add'>+This will return the number of passes needed.  Currently, this is seven,</div><div class='add'>+but may change if another interlace type is added.</div><div class='add'>+</div><div class='add'>+Then write the complete image number_of_passes times.</div><div class='add'>+</div><div class='add'>+    png_write_rows(png_ptr, row_pointers, number_of_rows);</div><div class='add'>+</div><div class='add'>+Think carefully before you write an interlaced image.  Typically code that</div><div class='add'>+reads such images reads all the image data into memory, uncompressed, before</div><div class='add'>+doing any processing.  Only code that can display an image on the fly can</div><div class='add'>+take advantage of the interlacing and even then the image has to be exactly</div><div class='add'>+the correct size for the output device, because scaling an image requires</div><div class='add'>+adjacent pixels and these are not available until all the passes have been</div><div class='add'>+read.</div><div class='add'>+</div><div class='add'>+If you do write an interlaced image you will hardly ever need to handle</div><div class='add'>+the interlacing yourself.  Call png_set_interlace_handling() and use the</div><div class='add'>+approach described above.</div><div class='add'>+</div><div class='add'>+The only time it is conceivable that you will really need to write an</div><div class='add'>+interlaced image pass-by-pass is when you have read one pass by pass and</div><div class='add'>+made some pixel-by-pixel transformation to it, as described in the read</div><div class='add'>+code above.  In this case use the PNG_PASS_ROWS and PNG_PASS_COLS macros</div><div class='add'>+to determine the size of each sub-image in turn and simply write the rows</div><div class='add'>+you obtained from the read code.</div><div class='add'>+</div><div class='add'>+Finishing a sequential write</div><div class='add'>+</div><div class='add'>+After you are finished writing the image, you should finish writing</div><div class='add'>+the file.  If you are interested in writing comments or time, you should</div><div class='add'>+pass an appropriately filled png_info pointer.  If you are not interested,</div><div class='add'>+you can pass NULL.</div><div class='add'>+</div><div class='add'>+    png_write_end(png_ptr, info_ptr);</div><div class='add'>+</div><div class='add'>+When you are done, you can free all memory used by libpng like this:</div><div class='add'>+</div><div class='add'>+    png_destroy_write_struct(&amp;png_ptr, &amp;info_ptr);</div><div class='add'>+</div><div class='add'>+It is also possible to individually free the info_ptr members that</div><div class='add'>+point to libpng-allocated storage with the following function:</div><div class='add'>+</div><div class='add'>+    png_free_data(png_ptr, info_ptr, mask, seq)</div><div class='add'>+</div><div class='add'>+    mask  - identifies data to be freed, a mask</div><div class='add'>+            containing the bitwise OR of one or</div><div class='add'>+            more of</div><div class='add'>+              PNG_FREE_PLTE, PNG_FREE_TRNS,</div><div class='add'>+              PNG_FREE_HIST, PNG_FREE_ICCP,</div><div class='add'>+              PNG_FREE_PCAL, PNG_FREE_ROWS,</div><div class='add'>+              PNG_FREE_SCAL, PNG_FREE_SPLT,</div><div class='add'>+              PNG_FREE_TEXT, PNG_FREE_UNKN,</div><div class='add'>+            or simply PNG_FREE_ALL</div><div class='add'>+</div><div class='add'>+    seq   - sequence number of item to be freed</div><div class='add'>+            (-1 for all items)</div><div class='add'>+</div><div class='add'>+This function may be safely called when the relevant storage has</div><div class='add'>+already been freed, or has not yet been allocated, or was allocated</div><div class='add'>+by the user  and not by libpng,  and will in those cases do nothing.</div><div class='add'>+The "seq" parameter is ignored if only one item of the selected data</div><div class='add'>+type, such as PLTE, is allowed.  If "seq" is not -1, and multiple items</div><div class='add'>+are allowed for the data type identified in the mask, such as text or</div><div class='add'>+sPLT, only the n'th item in the structure is freed, where n is "seq".</div><div class='add'>+</div><div class='add'>+If you allocated data such as a palette that you passed in to libpng</div><div class='add'>+with png_set_*, you must not free it until just before the call to</div><div class='add'>+png_destroy_write_struct().</div><div class='add'>+</div><div class='add'>+The default behavior is only to free data that was allocated internally</div><div class='add'>+by libpng.  This can be changed, so that libpng will not free the data,</div><div class='add'>+or so that it will free data that was allocated by the user with png_malloc()</div><div class='add'>+or png_zalloc() and passed in via a png_set_*() function, with</div><div class='add'>+</div><div class='add'>+    png_data_freer(png_ptr, info_ptr, freer, mask)</div><div class='add'>+</div><div class='add'>+    freer  - one of</div><div class='add'>+               PNG_DESTROY_WILL_FREE_DATA</div><div class='add'>+               PNG_SET_WILL_FREE_DATA</div><div class='add'>+               PNG_USER_WILL_FREE_DATA</div><div class='add'>+</div><div class='add'>+    mask   - which data elements are affected</div><div class='add'>+             same choices as in png_free_data()</div><div class='add'>+</div><div class='add'>+For example, to transfer responsibility for some data from a read structure</div><div class='add'>+to a write structure, you could use</div><div class='add'>+</div><div class='add'>+    png_data_freer(read_ptr, read_info_ptr,</div><div class='add'>+       PNG_USER_WILL_FREE_DATA,</div><div class='add'>+       PNG_FREE_PLTE|PNG_FREE_tRNS|PNG_FREE_hIST)</div><div class='add'>+</div><div class='add'>+    png_data_freer(write_ptr, write_info_ptr,</div><div class='add'>+       PNG_DESTROY_WILL_FREE_DATA,</div><div class='add'>+       PNG_FREE_PLTE|PNG_FREE_tRNS|PNG_FREE_hIST)</div><div class='add'>+</div><div class='add'>+thereby briefly reassigning responsibility for freeing to the user but</div><div class='add'>+immediately afterwards reassigning it once more to the write_destroy</div><div class='add'>+function.  Having done this, it would then be safe to destroy the read</div><div class='add'>+structure and continue to use the PLTE, tRNS, and hIST data in the write</div><div class='add'>+structure.</div><div class='add'>+</div><div class='add'>+This function only affects data that has already been allocated.</div><div class='add'>+You can call this function before calling after the png_set_*() functions</div><div class='add'>+to control whether the user or png_destroy_*() is supposed to free the data.</div><div class='add'>+When the user assumes responsibility for libpng-allocated data, the</div><div class='add'>+application must use</div><div class='add'>+png_free() to free it, and when the user transfers responsibility to libpng</div><div class='add'>+for data that the user has allocated, the user must have used png_malloc()</div><div class='add'>+or png_zalloc() to allocate it.</div><div class='add'>+</div><div class='add'>+If you allocated text_ptr.text, text_ptr.lang, and text_ptr.translated_keyword</div><div class='add'>+separately, do not transfer responsibility for freeing text_ptr to libpng,</div><div class='add'>+because when libpng fills a png_text structure it combines these members with</div><div class='add'>+the key member, and png_free_data() will free only text_ptr.key.  Similarly,</div><div class='add'>+if you transfer responsibility for free'ing text_ptr from libpng to your</div><div class='add'>+application, your application must not separately free those members.</div><div class='add'>+For a more compact example of writing a PNG image, see the file example.c.</div><div class='add'>+</div><div class='add'>+V. Modifying/Customizing libpng:</div><div class='add'>+</div><div class='add'>+There are two issues here.  The first is changing how libpng does</div><div class='add'>+standard things like memory allocation, input/output, and error handling.</div><div class='add'>+The second deals with more complicated things like adding new chunks,</div><div class='add'>+adding new transformations, and generally changing how libpng works.</div><div class='add'>+Both of those are compile-time issues; that is, they are generally</div><div class='add'>+determined at the time the code is written, and there is rarely a need</div><div class='add'>+to provide the user with a means of changing them.</div><div class='add'>+</div><div class='add'>+Memory allocation, input/output, and error handling</div><div class='add'>+</div><div class='add'>+All of the memory allocation, input/output, and error handling in libpng</div><div class='add'>+goes through callbacks that are user-settable.  The default routines are</div><div class='add'>+in pngmem.c, pngrio.c, pngwio.c, and pngerror.c, respectively.  To change</div><div class='add'>+these functions, call the appropriate png_set_*_fn() function.</div><div class='add'>+</div><div class='add'>+Memory allocation is done through the functions png_malloc(), png_calloc(),</div><div class='add'>+and png_free().  These currently just call the standard C functions.</div><div class='add'>+png_calloc() calls png_malloc() and then clears the newly</div><div class='add'>+allocated memory to zero.  There is limited support for certain systems</div><div class='add'>+with segmented memory architectures and the types of pointers declared by</div><div class='add'>+png.h match this; you will have to use appropriate pointers in your</div><div class='add'>+application.  Since it is</div><div class='add'>+unlikely that the method of handling memory allocation on a platform</div><div class='add'>+will change between applications, these functions must be modified in</div><div class='add'>+the library at compile time.  If you prefer to use a different method</div><div class='add'>+of allocating and freeing data, you can use png_create_read_struct_2() or</div><div class='add'>+png_create_write_struct_2() to register your own functions as described</div><div class='add'>+above.  These functions also provide a void pointer that can be retrieved</div><div class='add'>+via</div><div class='add'>+</div><div class='add'>+    mem_ptr=png_get_mem_ptr(png_ptr);</div><div class='add'>+</div><div class='add'>+Your replacement memory functions must have prototypes as follows:</div><div class='add'>+</div><div class='add'>+    png_voidp malloc_fn(png_structp png_ptr,</div><div class='add'>+       png_alloc_size_t size);</div><div class='add'>+</div><div class='add'>+    void free_fn(png_structp png_ptr, png_voidp ptr);</div><div class='add'>+</div><div class='add'>+Your malloc_fn() must return NULL in case of failure.  The png_malloc()</div><div class='add'>+function will normally call png_error() if it receives a NULL from the</div><div class='add'>+system memory allocator or from your replacement malloc_fn().</div><div class='add'>+</div><div class='add'>+Your free_fn() will never be called with a NULL ptr, since libpng's</div><div class='add'>+png_free() checks for NULL before calling free_fn().</div><div class='add'>+</div><div class='add'>+Input/Output in libpng is done through png_read() and png_write(),</div><div class='add'>+which currently just call fread() and fwrite().  The FILE * is stored in</div><div class='add'>+png_struct and is initialized via png_init_io().  If you wish to change</div><div class='add'>+the method of I/O, the library supplies callbacks that you can set</div><div class='add'>+through the function png_set_read_fn() and png_set_write_fn() at run</div><div class='add'>+time, instead of calling the png_init_io() function.  These functions</div><div class='add'>+also provide a void pointer that can be retrieved via the function</div><div class='add'>+png_get_io_ptr().  For example:</div><div class='add'>+</div><div class='add'>+    png_set_read_fn(png_structp read_ptr,</div><div class='add'>+        voidp read_io_ptr, png_rw_ptr read_data_fn)</div><div class='add'>+</div><div class='add'>+    png_set_write_fn(png_structp write_ptr,</div><div class='add'>+        voidp write_io_ptr, png_rw_ptr write_data_fn,</div><div class='add'>+        png_flush_ptr output_flush_fn);</div><div class='add'>+</div><div class='add'>+    voidp read_io_ptr = png_get_io_ptr(read_ptr);</div><div class='add'>+    voidp write_io_ptr = png_get_io_ptr(write_ptr);</div><div class='add'>+</div><div class='add'>+The replacement I/O functions must have prototypes as follows:</div><div class='add'>+</div><div class='add'>+    void user_read_data(png_structp png_ptr,</div><div class='add'>+        png_bytep data, png_size_t length);</div><div class='add'>+</div><div class='add'>+    void user_write_data(png_structp png_ptr,</div><div class='add'>+        png_bytep data, png_size_t length);</div><div class='add'>+</div><div class='add'>+    void user_flush_data(png_structp png_ptr);</div><div class='add'>+</div><div class='add'>+The user_read_data() function is responsible for detecting and</div><div class='add'>+handling end-of-data errors.</div><div class='add'>+</div><div class='add'>+Supplying NULL for the read, write, or flush functions sets them back</div><div class='add'>+to using the default C stream functions, which expect the io_ptr to</div><div class='add'>+point to a standard *FILE structure.  It is probably a mistake</div><div class='add'>+to use NULL for one of write_data_fn and output_flush_fn but not both</div><div class='add'>+of them, unless you have built libpng with PNG_NO_WRITE_FLUSH defined.</div><div class='add'>+It is an error to read from a write stream, and vice versa.</div><div class='add'>+</div><div class='add'>+Error handling in libpng is done through png_error() and png_warning().</div><div class='add'>+Errors handled through png_error() are fatal, meaning that png_error()</div><div class='add'>+should never return to its caller.  Currently, this is handled via</div><div class='add'>+setjmp() and longjmp() (unless you have compiled libpng with</div><div class='add'>+PNG_NO_SETJMP, in which case it is handled via PNG_ABORT()),</div><div class='add'>+but you could change this to do things like exit() if you should wish,</div><div class='add'>+as long as your function does not return.</div><div class='add'>+</div><div class='add'>+On non-fatal errors, png_warning() is called</div><div class='add'>+to print a warning message, and then control returns to the calling code.</div><div class='add'>+By default png_error() and png_warning() print a message on stderr via</div><div class='add'>+fprintf() unless the library is compiled with PNG_NO_CONSOLE_IO defined</div><div class='add'>+(because you don't want the messages) or PNG_NO_STDIO defined (because</div><div class='add'>+fprintf() isn't available).  If you wish to change the behavior of the error</div><div class='add'>+functions, you will need to set up your own message callbacks.  These</div><div class='add'>+functions are normally supplied at the time that the png_struct is created.</div><div class='add'>+It is also possible to redirect errors and warnings to your own replacement</div><div class='add'>+functions after png_create_*_struct() has been called by calling:</div><div class='add'>+</div><div class='add'>+    png_set_error_fn(png_structp png_ptr,</div><div class='add'>+        png_voidp error_ptr, png_error_ptr error_fn,</div><div class='add'>+        png_error_ptr warning_fn);</div><div class='add'>+</div><div class='add'>+    png_voidp error_ptr = png_get_error_ptr(png_ptr);</div><div class='add'>+</div><div class='add'>+If NULL is supplied for either error_fn or warning_fn, then the libpng</div><div class='add'>+default function will be used, calling fprintf() and/or longjmp() if a</div><div class='add'>+problem is encountered.  The replacement error functions should have</div><div class='add'>+parameters as follows:</div><div class='add'>+</div><div class='add'>+    void user_error_fn(png_structp png_ptr,</div><div class='add'>+        png_const_charp error_msg);</div><div class='add'>+</div><div class='add'>+    void user_warning_fn(png_structp png_ptr,</div><div class='add'>+        png_const_charp warning_msg);</div><div class='add'>+</div><div class='add'>+The motivation behind using setjmp() and longjmp() is the C++ throw and</div><div class='add'>+catch exception handling methods.  This makes the code much easier to write,</div><div class='add'>+as there is no need to check every return code of every function call.</div><div class='add'>+However, there are some uncertainties about the status of local variables</div><div class='add'>+after a longjmp, so the user may want to be careful about doing anything</div><div class='add'>+after setjmp returns non-zero besides returning itself.  Consult your</div><div class='add'>+compiler documentation for more details.  For an alternative approach, you</div><div class='add'>+may wish to use the "cexcept" facility (see http://cexcept.sourceforge.net).</div><div class='add'>+</div><div class='add'>+Custom chunks</div><div class='add'>+</div><div class='add'>+If you need to read or write custom chunks, you may need to get deeper</div><div class='add'>+into the libpng code.  The library now has mechanisms for storing</div><div class='add'>+and writing chunks of unknown type; you can even declare callbacks</div><div class='add'>+for custom chunks.  However, this may not be good enough if the</div><div class='add'>+library code itself needs to know about interactions between your</div><div class='add'>+chunk and existing `intrinsic' chunks.</div><div class='add'>+</div><div class='add'>+If you need to write a new intrinsic chunk, first read the PNG</div><div class='add'>+specification. Acquire a first level of understanding of how it works.</div><div class='add'>+Pay particular attention to the sections that describe chunk names,</div><div class='add'>+and look at how other chunks were designed, so you can do things</div><div class='add'>+similarly.  Second, check out the sections of libpng that read and</div><div class='add'>+write chunks.  Try to find a chunk that is similar to yours and use</div><div class='add'>+it as a template.  More details can be found in the comments inside</div><div class='add'>+the code.  It is best to handle unknown chunks in a generic method,</div><div class='add'>+via callback functions, instead of by modifying libpng functions.</div><div class='add'>+</div><div class='add'>+If you wish to write your own transformation for the data, look through</div><div class='add'>+the part of the code that does the transformations, and check out some of</div><div class='add'>+the simpler ones to get an idea of how they work.  Try to find a similar</div><div class='add'>+transformation to the one you want to add and copy off of it.  More details</div><div class='add'>+can be found in the comments inside the code itself.</div><div class='add'>+</div><div class='add'>+Configuring for 16 bit platforms</div><div class='add'>+</div><div class='add'>+You will want to look into zconf.h to tell zlib (and thus libpng) that</div><div class='add'>+it cannot allocate more then 64K at a time.  Even if you can, the memory</div><div class='add'>+won't be accessible.  So limit zlib and libpng to 64K by defining MAXSEG_64K.</div><div class='add'>+</div><div class='add'>+Configuring for DOS</div><div class='add'>+</div><div class='add'>+For DOS users who only have access to the lower 640K, you will</div><div class='add'>+have to limit zlib's memory usage via a png_set_compression_mem_level()</div><div class='add'>+call.  See zlib.h or zconf.h in the zlib library for more information.</div><div class='add'>+</div><div class='add'>+Configuring for Medium Model</div><div class='add'>+</div><div class='add'>+Libpng's support for medium model has been tested on most of the popular</div><div class='add'>+compilers.  Make sure MAXSEG_64K gets defined, USE_FAR_KEYWORD gets</div><div class='add'>+defined, and FAR gets defined to far in pngconf.h, and you should be</div><div class='add'>+all set.  Everything in the library (except for zlib's structure) is</div><div class='add'>+expecting far data.  You must use the typedefs with the p or pp on</div><div class='add'>+the end for pointers (or at least look at them and be careful).  Make</div><div class='add'>+note that the rows of data are defined as png_bytepp, which is an</div><div class='add'>+unsigned char far * far *.</div><div class='add'>+</div><div class='add'>+Configuring for gui/windowing platforms:</div><div class='add'>+</div><div class='add'>+You will need to write new error and warning functions that use the GUI</div><div class='add'>+interface, as described previously, and set them to be the error and</div><div class='add'>+warning functions at the time that png_create_*_struct() is called,</div><div class='add'>+in order to have them available during the structure initialization.</div><div class='add'>+They can be changed later via png_set_error_fn().  On some compilers,</div><div class='add'>+you may also have to change the memory allocators (png_malloc, etc.).</div><div class='add'>+</div><div class='add'>+Configuring for compiler xxx:</div><div class='add'>+</div><div class='add'>+All includes for libpng are in pngconf.h.  If you need to add, change</div><div class='add'>+or delete an include, this is the place to do it.</div><div class='add'>+The includes that are not needed outside libpng are placed in pngpriv.h,</div><div class='add'>+which is only used by the routines inside libpng itself.</div><div class='add'>+The files in libpng proper only include pngpriv.h and png.h, which</div><div class='add'>+in turn includes pngconf.h.</div><div class='add'>+</div><div class='add'>+Configuring zlib:</div><div class='add'>+</div><div class='add'>+There are special functions to configure the compression.  Perhaps the</div><div class='add'>+most useful one changes the compression level, which currently uses</div><div class='add'>+input compression values in the range 0 - 9.  The library normally</div><div class='add'>+uses the default compression level (Z_DEFAULT_COMPRESSION = 6).  Tests</div><div class='add'>+have shown that for a large majority of images, compression values in</div><div class='add'>+the range 3-6 compress nearly as well as higher levels, and do so much</div><div class='add'>+faster.  For online applications it may be desirable to have maximum speed</div><div class='add'>+(Z_BEST_SPEED = 1).  With versions of zlib after v0.99, you can also</div><div class='add'>+specify no compression (Z_NO_COMPRESSION = 0), but this would create</div><div class='add'>+files larger than just storing the raw bitmap.  You can specify the</div><div class='add'>+compression level by calling:</div><div class='add'>+</div><div class='add'>+    png_set_compression_level(png_ptr, level);</div><div class='add'>+</div><div class='add'>+Another useful one is to reduce the memory level used by the library.</div><div class='add'>+The memory level defaults to 8, but it can be lowered if you are</div><div class='add'>+short on memory (running DOS, for example, where you only have 640K).</div><div class='add'>+Note that the memory level does have an effect on compression; among</div><div class='add'>+other things, lower levels will result in sections of incompressible</div><div class='add'>+data being emitted in smaller stored blocks, with a correspondingly</div><div class='add'>+larger relative overhead of up to 15% in the worst case.</div><div class='add'>+</div><div class='add'>+    png_set_compression_mem_level(png_ptr, level);</div><div class='add'>+</div><div class='add'>+The other functions are for configuring zlib.  They are not recommended</div><div class='add'>+for normal use and may result in writing an invalid PNG file.  See</div><div class='add'>+zlib.h for more information on what these mean.</div><div class='add'>+</div><div class='add'>+    png_set_compression_strategy(png_ptr,</div><div class='add'>+        strategy);</div><div class='add'>+</div><div class='add'>+    png_set_compression_window_bits(png_ptr,</div><div class='add'>+        window_bits);</div><div class='add'>+</div><div class='add'>+    png_set_compression_method(png_ptr, method);</div><div class='add'>+    png_set_compression_buffer_size(png_ptr, size);</div><div class='add'>+</div><div class='add'>+Controlling row filtering</div><div class='add'>+</div><div class='add'>+If you want to control whether libpng uses filtering or not, which</div><div class='add'>+filters are used, and how it goes about picking row filters, you</div><div class='add'>+can call one of these functions.  The selection and configuration</div><div class='add'>+of row filters can have a significant impact on the size and</div><div class='add'>+encoding speed and a somewhat lesser impact on the decoding speed</div><div class='add'>+of an image.  Filtering is enabled by default for RGB and grayscale</div><div class='add'>+images (with and without alpha), but not for paletted images nor</div><div class='add'>+for any images with bit depths less than 8 bits/pixel.</div><div class='add'>+</div><div class='add'>+The 'method' parameter sets the main filtering method, which is</div><div class='add'>+currently only '0' in the PNG 1.2 specification.  The 'filters'</div><div class='add'>+parameter sets which filter(s), if any, should be used for each</div><div class='add'>+scanline.  Possible values are PNG_ALL_FILTERS and PNG_NO_FILTERS</div><div class='add'>+to turn filtering on and off, respectively.</div><div class='add'>+</div><div class='add'>+Individual filter types are PNG_FILTER_NONE, PNG_FILTER_SUB,</div><div class='add'>+PNG_FILTER_UP, PNG_FILTER_AVG, PNG_FILTER_PAETH, which can be bitwise</div><div class='add'>+ORed together with '|' to specify one or more filters to use.</div><div class='add'>+These filters are described in more detail in the PNG specification.</div><div class='add'>+If you intend to change the filter type during the course of writing</div><div class='add'>+the image, you should start with flags set for all of the filters</div><div class='add'>+you intend to use so that libpng can initialize its internal</div><div class='add'>+structures appropriately for all of the filter types.  (Note that this</div><div class='add'>+means the first row must always be adaptively filtered, because libpng</div><div class='add'>+currently does not allocate the filter buffers until png_write_row()</div><div class='add'>+is called for the first time.)</div><div class='add'>+</div><div class='add'>+    filters = PNG_FILTER_NONE | PNG_FILTER_SUB</div><div class='add'>+              PNG_FILTER_UP | PNG_FILTER_AVG |</div><div class='add'>+              PNG_FILTER_PAETH | PNG_ALL_FILTERS;</div><div class='add'>+</div><div class='add'>+    png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE,</div><div class='add'>+       filters);</div><div class='add'>+              The second parameter can also be</div><div class='add'>+              PNG_INTRAPIXEL_DIFFERENCING if you are</div><div class='add'>+              writing a PNG to be embedded in a MNG</div><div class='add'>+              datastream.  This parameter must be the</div><div class='add'>+              same as the value of filter_method used</div><div class='add'>+              in png_set_IHDR().</div><div class='add'>+</div><div class='add'>+It is also possible to influence how libpng chooses from among the</div><div class='add'>+available filters.  This is done in one or both of two ways - by</div><div class='add'>+telling it how important it is to keep the same filter for successive</div><div class='add'>+rows, and by telling it the relative computational costs of the filters.</div><div class='add'>+</div><div class='add'>+    double weights[3] = {1.5, 1.3, 1.1},</div><div class='add'>+       costs[PNG_FILTER_VALUE_LAST] =</div><div class='add'>+       {1.0, 1.3, 1.3, 1.5, 1.7};</div><div class='add'>+</div><div class='add'>+    png_set_filter_heuristics(png_ptr,</div><div class='add'>+       PNG_FILTER_HEURISTIC_WEIGHTED, 3,</div><div class='add'>+       weights, costs);</div><div class='add'>+</div><div class='add'>+The weights are multiplying factors that indicate to libpng that the</div><div class='add'>+row filter should be the same for successive rows unless another row filter</div><div class='add'>+is that many times better than the previous filter.  In the above example,</div><div class='add'>+if the previous 3 filters were SUB, SUB, NONE, the SUB filter could have a</div><div class='add'>+"sum of absolute differences" 1.5 x 1.3 times higher than other filters</div><div class='add'>+and still be chosen, while the NONE filter could have a sum 1.1 times</div><div class='add'>+higher than other filters and still be chosen.  Unspecified weights are</div><div class='add'>+taken to be 1.0, and the specified weights should probably be declining</div><div class='add'>+like those above in order to emphasize recent filters over older filters.</div><div class='add'>+</div><div class='add'>+The filter costs specify for each filter type a relative decoding cost</div><div class='add'>+to be considered when selecting row filters.  This means that filters</div><div class='add'>+with higher costs are less likely to be chosen over filters with lower</div><div class='add'>+costs, unless their "sum of absolute differences" is that much smaller.</div><div class='add'>+The costs do not necessarily reflect the exact computational speeds of</div><div class='add'>+the various filters, since this would unduly influence the final image</div><div class='add'>+size.</div><div class='add'>+</div><div class='add'>+Note that the numbers above were invented purely for this example and</div><div class='add'>+are given only to help explain the function usage.  Little testing has</div><div class='add'>+been done to find optimum values for either the costs or the weights.</div><div class='add'>+</div><div class='add'>+Removing unwanted object code</div><div class='add'>+</div><div class='add'>+There are a bunch of #define's in pngconf.h that control what parts of</div><div class='add'>+libpng are compiled.  All the defines end in _SUPPORTED.  If you are</div><div class='add'>+never going to use a capability, you can change the #define to #undef</div><div class='add'>+before recompiling libpng and save yourself code and data space, or</div><div class='add'>+you can turn off individual capabilities with defines that begin with</div><div class='add'>+PNG_NO_.</div><div class='add'>+</div><div class='add'>+In libpng-1.5.0 and later, the #define's are in pnglibconf.h instead.</div><div class='add'>+</div><div class='add'>+You can also turn all of the transforms and ancillary chunk capabilities</div><div class='add'>+off en masse with compiler directives that define</div><div class='add'>+PNG_NO_READ[or WRITE]_TRANSFORMS, or PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS,</div><div class='add'>+or all four,</div><div class='add'>+along with directives to turn on any of the capabilities that you do</div><div class='add'>+want.  The PNG_NO_READ[or WRITE]_TRANSFORMS directives disable the extra</div><div class='add'>+transformations but still leave the library fully capable of reading</div><div class='add'>+and writing PNG files with all known public chunks. Use of the</div><div class='add'>+PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS directive produces a library</div><div class='add'>+that is incapable of reading or writing ancillary chunks.  If you are</div><div class='add'>+not using the progressive reading capability, you can turn that off</div><div class='add'>+with PNG_NO_PROGRESSIVE_READ (don't confuse this with the INTERLACING</div><div class='add'>+capability, which you'll still have).</div><div class='add'>+</div><div class='add'>+All the reading and writing specific code are in separate files, so the</div><div class='add'>+linker should only grab the files it needs.  However, if you want to</div><div class='add'>+make sure, or if you are building a stand alone library, all the</div><div class='add'>+reading files start with pngr and all the writing files start with</div><div class='add'>+pngw.  The files that don't match either (like png.c, pngtrans.c, etc.)</div><div class='add'>+are used for both reading and writing, and always need to be included.</div><div class='add'>+The progressive reader is in pngpread.c</div><div class='add'>+</div><div class='add'>+If you are creating or distributing a dynamically linked library (a .so</div><div class='add'>+or DLL file), you should not remove or disable any parts of the library,</div><div class='add'>+as this will cause applications linked with different versions of the</div><div class='add'>+library to fail if they call functions not available in your library.</div><div class='add'>+The size of the library itself should not be an issue, because only</div><div class='add'>+those sections that are actually used will be loaded into memory.</div><div class='add'>+</div><div class='add'>+Requesting debug printout</div><div class='add'>+</div><div class='add'>+The macro definition PNG_DEBUG can be used to request debugging</div><div class='add'>+printout.  Set it to an integer value in the range 0 to 3.  Higher</div><div class='add'>+numbers result in increasing amounts of debugging information.  The</div><div class='add'>+information is printed to the "stderr" file, unless another file</div><div class='add'>+name is specified in the PNG_DEBUG_FILE macro definition.</div><div class='add'>+</div><div class='add'>+When PNG_DEBUG &gt; 0, the following functions (macros) become available:</div><div class='add'>+</div><div class='add'>+   png_debug(level, message)</div><div class='add'>+   png_debug1(level, message, p1)</div><div class='add'>+   png_debug2(level, message, p1, p2)</div><div class='add'>+</div><div class='add'>+in which "level" is compared to PNG_DEBUG to decide whether to print</div><div class='add'>+the message, "message" is the formatted string to be printed,</div><div class='add'>+and p1 and p2 are parameters that are to be embedded in the string</div><div class='add'>+according to printf-style formatting directives.  For example,</div><div class='add'>+</div><div class='add'>+   png_debug1(2, "foo=%d\n", foo);</div><div class='add'>+</div><div class='add'>+is expanded to</div><div class='add'>+</div><div class='add'>+   if (PNG_DEBUG &gt; 2)</div><div class='add'>+      fprintf(PNG_DEBUG_FILE, "foo=%d\n", foo);</div><div class='add'>+</div><div class='add'>+When PNG_DEBUG is defined but is zero, the macros aren't defined, but you</div><div class='add'>+can still use PNG_DEBUG to control your own debugging:</div><div class='add'>+</div><div class='add'>+   #ifdef PNG_DEBUG</div><div class='add'>+       fprintf(stderr, ...</div><div class='add'>+   #endif</div><div class='add'>+</div><div class='add'>+When PNG_DEBUG = 1, the macros are defined, but only png_debug statements</div><div class='add'>+having level = 0 will be printed.  There aren't any such statements in</div><div class='add'>+this version of libpng, but if you insert some they will be printed.</div><div class='add'>+</div><div class='add'>+VI.  MNG support</div><div class='add'>+</div><div class='add'>+The MNG specification (available at http://www.libpng.org/pub/mng) allows</div><div class='add'>+certain extensions to PNG for PNG images that are embedded in MNG datastreams.</div><div class='add'>+Libpng can support some of these extensions.  To enable them, use the</div><div class='add'>+png_permit_mng_features() function:</div><div class='add'>+</div><div class='add'>+   feature_set = png_permit_mng_features(png_ptr, mask)</div><div class='add'>+</div><div class='add'>+   mask is a png_uint_32 containing the bitwise OR of the</div><div class='add'>+        features you want to enable.  These include</div><div class='add'>+        PNG_FLAG_MNG_EMPTY_PLTE</div><div class='add'>+        PNG_FLAG_MNG_FILTER_64</div><div class='add'>+        PNG_ALL_MNG_FEATURES</div><div class='add'>+</div><div class='add'>+   feature_set is a png_uint_32 that is the bitwise AND of</div><div class='add'>+      your mask with the set of MNG features that is</div><div class='add'>+      supported by the version of libpng that you are using.</div><div class='add'>+</div><div class='add'>+It is an error to use this function when reading or writing a standalone</div><div class='add'>+PNG file with the PNG 8-byte signature.  The PNG datastream must be wrapped</div><div class='add'>+in a MNG datastream.  As a minimum, it must have the MNG 8-byte signature</div><div class='add'>+and the MHDR and MEND chunks.  Libpng does not provide support for these</div><div class='add'>+or any other MNG chunks; your application must provide its own support for</div><div class='add'>+them.  You may wish to consider using libmng (available at</div><div class='add'>+http://www.libmng.com) instead.</div><div class='add'>+</div><div class='add'>+VII.  Changes to Libpng from version 0.88</div><div class='add'>+</div><div class='add'>+It should be noted that versions of libpng later than 0.96 are not</div><div class='add'>+distributed by the original libpng author, Guy Schalnat, nor by</div><div class='add'>+Andreas Dilger, who had taken over from Guy during 1996 and 1997, and</div><div class='add'>+distributed versions 0.89 through 0.96, but rather by another member</div><div class='add'>+of the original PNG Group, Glenn Randers-Pehrson.  Guy and Andreas are</div><div class='add'>+still alive and well, but they have moved on to other things.</div><div class='add'>+</div><div class='add'>+The old libpng functions png_read_init(), png_write_init(),</div><div class='add'>+png_info_init(), png_read_destroy(), and png_write_destroy() have been</div><div class='add'>+moved to PNG_INTERNAL in version 0.95 to discourage their use.  These</div><div class='add'>+functions will be removed from libpng version 1.4.0.</div><div class='add'>+</div><div class='add'>+The preferred method of creating and initializing the libpng structures is</div><div class='add'>+via the png_create_read_struct(), png_create_write_struct(), and</div><div class='add'>+png_create_info_struct() because they isolate the size of the structures</div><div class='add'>+from the application, allow version error checking, and also allow the</div><div class='add'>+use of custom error handling routines during the initialization, which</div><div class='add'>+the old functions do not.  The functions png_read_destroy() and</div><div class='add'>+png_write_destroy() do not actually free the memory that libpng</div><div class='add'>+allocated for these structs, but just reset the data structures, so they</div><div class='add'>+can be used instead of png_destroy_read_struct() and</div><div class='add'>+png_destroy_write_struct() if you feel there is too much system overhead</div><div class='add'>+allocating and freeing the png_struct for each image read.</div><div class='add'>+</div><div class='add'>+Setting the error callbacks via png_set_message_fn() before</div><div class='add'>+png_read_init() as was suggested in libpng-0.88 is no longer supported</div><div class='add'>+because this caused applications that do not use custom error functions</div><div class='add'>+to fail if the png_ptr was not initialized to zero.  It is still possible</div><div class='add'>+to set the error callbacks AFTER png_read_init(), or to change them with</div><div class='add'>+png_set_error_fn(), which is essentially the same function, but with a new</div><div class='add'>+name to force compilation errors with applications that try to use the old</div><div class='add'>+method.</div><div class='add'>+</div><div class='add'>+Starting with version 1.0.7, you can find out which version of the library</div><div class='add'>+you are using at run-time:</div><div class='add'>+</div><div class='add'>+   png_uint_32 libpng_vn = png_access_version_number();</div><div class='add'>+</div><div class='add'>+The number libpng_vn is constructed from the major version, minor</div><div class='add'>+version with leading zero, and release number with leading zero,</div><div class='add'>+(e.g., libpng_vn for version 1.0.7 is 10007).</div><div class='add'>+</div><div class='add'>+You can also check which version of png.h you used when compiling your</div><div class='add'>+application:</div><div class='add'>+</div><div class='add'>+   png_uint_32 application_vn = PNG_LIBPNG_VER;</div><div class='add'>+</div><div class='add'>+VIII.  Changes to Libpng from version 1.0.x to 1.2.x</div><div class='add'>+</div><div class='add'>+Support for user memory management was enabled by default.  To</div><div class='add'>+accomplish this, the functions png_create_read_struct_2(),</div><div class='add'>+png_create_write_struct_2(), png_set_mem_fn(), png_get_mem_ptr(),</div><div class='add'>+png_malloc_default(), and png_free_default() were added.</div><div class='add'>+</div><div class='add'>+Support for the iTXt chunk has been enabled by default as of</div><div class='add'>+version 1.2.41.</div><div class='add'>+</div><div class='add'>+Support for certain MNG features was enabled.</div><div class='add'>+</div><div class='add'>+Support for numbered error messages was added.  However, we never got</div><div class='add'>+around to actually numbering the error messages.  The function</div><div class='add'>+png_set_strip_error_numbers() was added (Note: the prototype for this</div><div class='add'>+function was inadvertently removed from png.h in PNG_NO_ASSEMBLER_CODE</div><div class='add'>+builds of libpng-1.2.15.  It was restored in libpng-1.2.36).</div><div class='add'>+</div><div class='add'>+The png_malloc_warn() function was added at libpng-1.2.3.  This issues</div><div class='add'>+a png_warning and returns NULL instead of aborting when it fails to</div><div class='add'>+acquire the requested memory allocation.</div><div class='add'>+</div><div class='add'>+Support for setting user limits on image width and height was enabled</div><div class='add'>+by default.  The functions png_set_user_limits(), png_get_user_width_max(),</div><div class='add'>+and png_get_user_height_max() were added at libpng-1.2.6.</div><div class='add'>+</div><div class='add'>+The png_set_add_alpha() function was added at libpng-1.2.7.</div><div class='add'>+</div><div class='add'>+The function png_set_expand_gray_1_2_4_to_8() was added at libpng-1.2.9.</div><div class='add'>+Unlike png_set_gray_1_2_4_to_8(), the new function does not expand the</div><div class='add'>+tRNS chunk to alpha. The png_set_gray_1_2_4_to_8() function is</div><div class='add'>+deprecated.</div><div class='add'>+</div><div class='add'>+A number of macro definitions in support of runtime selection of</div><div class='add'>+assembler code features (especially Intel MMX code support) were</div><div class='add'>+added at libpng-1.2.0:</div><div class='add'>+</div><div class='add'>+    PNG_ASM_FLAG_MMX_SUPPORT_COMPILED</div><div class='add'>+    PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU</div><div class='add'>+    PNG_ASM_FLAG_MMX_READ_COMBINE_ROW</div><div class='add'>+    PNG_ASM_FLAG_MMX_READ_INTERLACE</div><div class='add'>+    PNG_ASM_FLAG_MMX_READ_FILTER_SUB</div><div class='add'>+    PNG_ASM_FLAG_MMX_READ_FILTER_UP</div><div class='add'>+    PNG_ASM_FLAG_MMX_READ_FILTER_AVG</div><div class='add'>+    PNG_ASM_FLAG_MMX_READ_FILTER_PAETH</div><div class='add'>+    PNG_ASM_FLAGS_INITIALIZED</div><div class='add'>+    PNG_MMX_READ_FLAGS</div><div class='add'>+    PNG_MMX_FLAGS</div><div class='add'>+    PNG_MMX_WRITE_FLAGS</div><div class='add'>+    PNG_MMX_FLAGS</div><div class='add'>+</div><div class='add'>+We added the following functions in support of runtime</div><div class='add'>+selection of assembler code features:</div><div class='add'>+</div><div class='add'>+    png_get_mmx_flagmask()</div><div class='add'>+    png_set_mmx_thresholds()</div><div class='add'>+    png_get_asm_flags()</div><div class='add'>+    png_get_mmx_bitdepth_threshold()</div><div class='add'>+    png_get_mmx_rowbytes_threshold()</div><div class='add'>+    png_set_asm_flags()</div><div class='add'>+</div><div class='add'>+We replaced all of these functions with simple stubs in libpng-1.2.20,</div><div class='add'>+when the Intel assembler code was removed due to a licensing issue.</div><div class='add'>+</div><div class='add'>+These macros are deprecated:</div><div class='add'>+</div><div class='add'>+    PNG_READ_TRANSFORMS_NOT_SUPPORTED</div><div class='add'>+    PNG_PROGRESSIVE_READ_NOT_SUPPORTED</div><div class='add'>+    PNG_NO_SEQUENTIAL_READ_SUPPORTED</div><div class='add'>+    PNG_WRITE_TRANSFORMS_NOT_SUPPORTED</div><div class='add'>+    PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED</div><div class='add'>+    PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED</div><div class='add'>+</div><div class='add'>+They have been replaced, respectively, by:</div><div class='add'>+</div><div class='add'>+    PNG_NO_READ_TRANSFORMS</div><div class='add'>+    PNG_NO_PROGRESSIVE_READ</div><div class='add'>+    PNG_NO_SEQUENTIAL_READ</div><div class='add'>+    PNG_NO_WRITE_TRANSFORMS</div><div class='add'>+    PNG_NO_READ_ANCILLARY_CHUNKS</div><div class='add'>+    PNG_NO_WRITE_ANCILLARY_CHUNKS</div><div class='add'>+</div><div class='add'>+PNG_MAX_UINT was replaced with PNG_UINT_31_MAX.  It has been</div><div class='add'>+deprecated since libpng-1.0.16 and libpng-1.2.6.</div><div class='add'>+</div><div class='add'>+The function</div><div class='add'>+    png_check_sig(sig, num)</div><div class='add'>+was replaced with</div><div class='add'>+    !png_sig_cmp(sig, 0, num)</div><div class='add'>+It has been deprecated since libpng-0.90.</div><div class='add'>+</div><div class='add'>+The function</div><div class='add'>+    png_set_gray_1_2_4_to_8()</div><div class='add'>+which also expands tRNS to alpha was replaced with</div><div class='add'>+    png_set_expand_gray_1_2_4_to_8()</div><div class='add'>+which does not. It has been deprecated since libpng-1.0.18 and 1.2.9.</div><div class='add'>+</div><div class='add'>+IX.  Changes to Libpng from version 1.0.x/1.2.x to 1.4.x</div><div class='add'>+</div><div class='add'>+Private libpng prototypes and macro definitions were moved from</div><div class='add'>+png.h and pngconf.h into a new pngpriv.h header file.</div><div class='add'>+</div><div class='add'>+Functions png_set_benign_errors(), png_benign_error(), and</div><div class='add'>+png_chunk_benign_error() were added.</div><div class='add'>+</div><div class='add'>+Support for setting the maximum amount of memory that the application</div><div class='add'>+will allocate for reading chunks was added, as a security measure.</div><div class='add'>+The functions png_set_chunk_cache_max() and png_get_chunk_cache_max()</div><div class='add'>+were added to the library.</div><div class='add'>+</div><div class='add'>+We implemented support for I/O states by adding png_ptr member io_state</div><div class='add'>+and functions png_get_io_chunk_name() and png_get_io_state() in pngget.c</div><div class='add'>+</div><div class='add'>+We added PNG_TRANSFORM_GRAY_TO_RGB to the available high-level</div><div class='add'>+input transforms.</div><div class='add'>+</div><div class='add'>+Checking for and reporting of errors in the IHDR chunk is more thorough.</div><div class='add'>+</div><div class='add'>+Support for global arrays was removed, to improve thread safety.</div><div class='add'>+</div><div class='add'>+Some obsolete/deprecated macros and functions have been removed.</div><div class='add'>+</div><div class='add'>+Typecasted NULL definitions such as</div><div class='add'>+   #define png_voidp_NULL            (png_voidp)NULL</div><div class='add'>+were eliminated.  If you used these in your application, just use</div><div class='add'>+NULL instead.</div><div class='add'>+</div><div class='add'>+The png_struct and info_struct members "trans" and "trans_values" were</div><div class='add'>+changed to "trans_alpha" and "trans_color", respectively.</div><div class='add'>+</div><div class='add'>+The obsolete, unused pnggccrd.c and pngvcrd.c files and related makefiles</div><div class='add'>+were removed.</div><div class='add'>+</div><div class='add'>+The PNG_1_0_X and PNG_1_2_X macros were eliminated.</div><div class='add'>+</div><div class='add'>+The PNG_LEGACY_SUPPORTED macro was eliminated.</div><div class='add'>+</div><div class='add'>+Many WIN32_WCE #ifdefs were removed.</div><div class='add'>+</div><div class='add'>+The functions png_read_init(info_ptr), png_write_init(info_ptr),</div><div class='add'>+png_info_init(info_ptr), png_read_destroy(), and png_write_destroy()</div><div class='add'>+have been removed.  They have been deprecated since libpng-0.95.</div><div class='add'>+</div><div class='add'>+The png_permit_empty_plte() was removed. It has been deprecated</div><div class='add'>+since libpng-1.0.9.  Use png_permit_mng_features() instead.</div><div class='add'>+</div><div class='add'>+We removed the obsolete stub functions png_get_mmx_flagmask(),</div><div class='add'>+png_set_mmx_thresholds(), png_get_asm_flags(),</div><div class='add'>+png_get_mmx_bitdepth_threshold(), png_get_mmx_rowbytes_threshold(),</div><div class='add'>+png_set_asm_flags(), and png_mmx_supported()</div><div class='add'>+</div><div class='add'>+We removed the obsolete png_check_sig(), png_memcpy_check(), and</div><div class='add'>+png_memset_check() functions.  Instead use !png_sig_cmp(), memcpy(),</div><div class='add'>+and memset(), respectively.</div><div class='add'>+</div><div class='add'>+The function png_set_gray_1_2_4_to_8() was removed. It has been</div><div class='add'>+deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with</div><div class='add'>+png_set_expand_gray_1_2_4_to_8() because the former function also</div><div class='add'>+expanded palette images.</div><div class='add'>+</div><div class='add'>+Macros for png_get_uint_16, png_get_uint_32, and png_get_int_32</div><div class='add'>+were added and are used by default instead of the corresponding</div><div class='add'>+functions. Unfortunately,</div><div class='add'>+from libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the  </div><div class='add'>+function) incorrectly returned a value of type png_uint_32.</div><div class='add'>+</div><div class='add'>+We changed the prototype for png_malloc() from</div><div class='add'>+    png_malloc(png_structp png_ptr, png_uint_32 size)</div><div class='add'>+to</div><div class='add'>+    png_malloc(png_structp png_ptr, png_alloc_size_t size)</div><div class='add'>+</div><div class='add'>+This also applies to the prototype for the user replacement malloc_fn().</div><div class='add'>+</div><div class='add'>+The png_calloc() function was added and is used in place of</div><div class='add'>+of "png_malloc(); memset();" except in the case in png_read_png()</div><div class='add'>+where the array consists of pointers; in this case a "for" loop is used</div><div class='add'>+after the png_malloc() to set the pointers to NULL, to give robust.</div><div class='add'>+behavior in case the application runs out of memory part-way through</div><div class='add'>+the process.</div><div class='add'>+</div><div class='add'>+We changed the prototypes of png_get_compression_buffer_size() and</div><div class='add'>+png_set_compression_buffer_size() to work with png_size_t instead of</div><div class='add'>+png_uint_32.</div><div class='add'>+</div><div class='add'>+Support for numbered error messages was removed by default, since we</div><div class='add'>+never got around to actually numbering the error messages. The function</div><div class='add'>+png_set_strip_error_numbers() was removed from the library by default.</div><div class='add'>+</div><div class='add'>+The png_zalloc() and png_zfree() functions are no longer exported.</div><div class='add'>+The png_zalloc() function no longer zeroes out the memory that it</div><div class='add'>+allocates.</div><div class='add'>+</div><div class='add'>+Support for dithering was disabled by default in libpng-1.4.0, because</div><div class='add'>+been well tested and doesn't actually "dither".  The code was not</div><div class='add'>+removed, however, and could be enabled by building libpng with</div><div class='add'>+PNG_READ_DITHER_SUPPORTED defined.  In libpng-1.4.2, this support</div><div class='add'>+was reenabled, but the function was renamed png_set_quantize() to</div><div class='add'>+reflect more accurately what it actually does.  At the same time,</div><div class='add'>+the PNG_DITHER_[RED,GREEN_BLUE]_BITS macros were also renamed to</div><div class='add'>+PNG_QUANTIZE_[RED,GREEN,BLUE]_BITS, and PNG_READ_DITHER_SUPPORTED</div><div class='add'>+was renamed to PNG_READ_QUANTIZE_SUPPORTED.</div><div class='add'>+</div><div class='add'>+We removed the trailing '.' from the warning and error messages.</div><div class='add'>+</div><div class='add'>+X.  Changes to Libpng from version 1.4.x to 1.5.x</div><div class='add'>+</div><div class='add'>+From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the  </div><div class='add'>+function) incorrectly returned a value of type png_uint_32.</div><div class='add'>+</div><div class='add'>+A. Changes that affect users of libpng</div><div class='add'>+</div><div class='add'>+There are no substantial API changes between the non-deprecated parts of</div><div class='add'>+the 1.4.5 API and the 1.5.0 API, however the ability to directly access</div><div class='add'>+the main libpng control structures, png_struct and png_info, deprecated</div><div class='add'>+in earlier versions of libpng, has been completely removed from</div><div class='add'>+libpng 1.5.</div><div class='add'>+</div><div class='add'>+We no longer include zlib.h in png.h.  Applications that need access</div><div class='add'>+to information in zlib.h will need to add the '#include "zlib.h"'</div><div class='add'>+directive.  It does not matter whether it is placed prior to or after</div><div class='add'>+the '"#include png.h"' directive.</div><div class='add'>+</div><div class='add'>+We moved the png_strcpy(), png_strncpy(), png_strlen(), png_memcpy(),</div><div class='add'>+png_memcmp(), png_sprintf, and png_memcpy() macros into a private</div><div class='add'>+header file (pngpriv.h) that is not accessible to applications.</div><div class='add'>+</div><div class='add'>+In png_get_iCCP, the type of "profile" was changed from png_charpp</div><div class='add'>+to png_bytepp, and in png_set_iCCP, from png_charp to png_const_bytep.</div><div class='add'>+</div><div class='add'>+There are changes of form in png.h, including new and changed macros to</div><div class='add'>+declare</div><div class='add'>+parts of the API.  Some API functions with arguments that are pointers to</div><div class='add'>+data not modified within the function have been corrected to declare</div><div class='add'>+these arguments with PNG_CONST.</div><div class='add'>+</div><div class='add'>+Much of the internal use of C macros to control the library build has also</div><div class='add'>+changed and some of this is visible in the exported header files, in</div><div class='add'>+particular the use of macros to control data and API elements visible</div><div class='add'>+during application compilation may require significant revision to</div><div class='add'>+application code.  (It is extremely rare for an application to do this.)</div><div class='add'>+</div><div class='add'>+Any program that compiled against libpng 1.4 and did not use deprecated</div><div class='add'>+features or access internal library structures should compile and work</div><div class='add'>+against libpng 1.5.</div><div class='add'>+</div><div class='add'>+libpng 1.5.0 adds PNG_ PASS macros to help in the reading and writing of</div><div class='add'>+interlaced images.  The macros return the number of rows and columns in</div><div class='add'>+each pass and information that can be used to de-interlace and (if</div><div class='add'>+absolutely necessary) interlace an image.</div><div class='add'>+</div><div class='add'>+libpng 1.5.0 adds an API png_longjmp(png_ptr, value).  This API calls</div><div class='add'>+the application provided png_longjmp_ptr on the internal, but application</div><div class='add'>+initialized, jmpbuf.  It is provided as a convenience to avoid the need</div><div class='add'>+to use the png_jmpbuf macro, which had the unnecessary side effect of</div><div class='add'>+resetting the internal png_longjmp_ptr value.</div><div class='add'>+</div><div class='add'>+libpng 1.5.0 includes a complete fixed point API.  By default this is</div><div class='add'>+present along with the corresponding floating point API.  In general the</div><div class='add'>+fixed point API is faster and smaller than the floating point one because</div><div class='add'>+the PNG file format used fixed point, not floating point.  This applies</div><div class='add'>+even if the library uses floating point in internal calculations.  A new</div><div class='add'>+macro, PNG_FLOATING_ARITHMETIC_SUPPORTED, reveals whether the library</div><div class='add'>+uses floating point arithmetic (the default) or fixed point arithmetic</div><div class='add'>+internally for performance critical calculations such as gamma correction.</div><div class='add'>+In some cases, the gamma calculations may produce slightly different</div><div class='add'>+results.  This has changed the results in png_rgb_to_gray and in alpha</div><div class='add'>+composition (png_set_background for example). This applies even if the</div><div class='add'>+original image was already linear (gamma == 1.0) and, therefore, it is</div><div class='add'>+not necessary to linearize the image.  This is because libpng has *not*</div><div class='add'>+been changed to optimize that case correctly, yet.</div><div class='add'>+</div><div class='add'>+Fixed point support for the sCAL chunk comes with an important caveat;</div><div class='add'>+the sCAL specification uses a decimal encoding of floating point values</div><div class='add'>+and the accuracy of PNG fixed point values is insufficient for</div><div class='add'>+representation of these values. Consequently a "string" API</div><div class='add'>+(png_get_sCAL_s and png_set_sCAL_s) is the only reliable way of reading</div><div class='add'>+arbitrary sCAL chunks in the absence of either the floating point API or</div><div class='add'>+internal floating point calculations.</div><div class='add'>+</div><div class='add'>+Applications no longer need to include the optional distribution header</div><div class='add'>+file pngusr.h or define the corresponding macros during application</div><div class='add'>+build in order to see the correct variant of the libpng API.  From 1.5.0</div><div class='add'>+application code can check for the corresponding _SUPPORTED macro:</div><div class='add'>+</div><div class='add'>+#ifdef PNG_INCH_CONVERSIONS_SUPPORTED</div><div class='add'>+   /* code that uses the inch conversion APIs. */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+This macro will only be defined if the inch conversion functions have been</div><div class='add'>+compiled into libpng.  The full set of macros, and whether or not support</div><div class='add'>+has been compiled in, are available in the header file pnglibconf.h.</div><div class='add'>+This header file is specific to the libpng build.  Notice that prior to</div><div class='add'>+1.5.0 the _SUPPORTED macros would always have the default definition unless</div><div class='add'>+reset by pngusr.h or by explicit settings on the compiler command line.</div><div class='add'>+These settings may produce compiler warnings or errors in 1.5.0 because</div><div class='add'>+of macro redefinition.</div><div class='add'>+</div><div class='add'>+From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the  </div><div class='add'>+function) incorrectly returned a value of type png_uint_32.  libpng 1.5.0</div><div class='add'>+is consistent with the implementation in 1.4.5 and 1.2.x (where the macro</div><div class='add'>+did not exist.)</div><div class='add'>+</div><div class='add'>+Applications can now choose whether to use these macros or to call the</div><div class='add'>+corresponding function by defining PNG_USE_READ_MACROS or</div><div class='add'>+PNG_NO_USE_READ_MACROS before including png.h.  Notice that this is</div><div class='add'>+only supported from 1.5.0 -defining PNG_NO_USE_READ_MACROS prior to 1.5.0</div><div class='add'>+ will lead to a link failure.</div><div class='add'>+</div><div class='add'>+B. Changes to the build and configuration of libpng</div><div class='add'>+</div><div class='add'>+Details of internal changes to the library code can be found in the CHANGES</div><div class='add'>+file.  These will be of no concern to the vast majority of library users or</div><div class='add'>+builders, however the few who configure libpng to a non-default feature</div><div class='add'>+set may need to change how this is done.</div><div class='add'>+</div><div class='add'>+There should be no need for library builders to alter build scripts if</div><div class='add'>+these use the distributed build support - configure or the makefiles -</div><div class='add'>+however users of the makefiles may care to update their build scripts</div><div class='add'>+to build pnglibconf.h where the corresponding makefile does not do so.</div><div class='add'>+</div><div class='add'>+Building libpng with a non-default configuration has changed completely.</div><div class='add'>+The old method using pngusr.h should still work correctly even though the</div><div class='add'>+way pngusr.h is used in the build has been changed, however library</div><div class='add'>+builders will probably want to examine the changes to take advantage of</div><div class='add'>+new capabilities and to simplify their build system.</div><div class='add'>+</div><div class='add'>+B.1 Specific changes to library configuration capabilities</div><div class='add'>+</div><div class='add'>+The library now supports a complete fixed point implementation and can</div><div class='add'>+thus be used on systems which have no floating point support or very</div><div class='add'>+limited or slow support.  Previously gamma correction, an essential part</div><div class='add'>+of complete PNG support, required reasonably fast floating point.</div><div class='add'>+</div><div class='add'>+As part of this the choice of internal implementation has been made</div><div class='add'>+independent of the choice of fixed versus floating point APIs and all the</div><div class='add'>+missing fixed point APIs have been implemented.</div><div class='add'>+</div><div class='add'>+The exact mechanism used to control attributes of API functions has</div><div class='add'>+changed.  A single set of operating system independent macro definitions</div><div class='add'>+is used and operating system specific directives are defined in</div><div class='add'>+pnglibconf.h</div><div class='add'>+</div><div class='add'>+As part of this the mechanism used to choose procedure call standards on</div><div class='add'>+those systems that allow a choice has been changed.  At present this only</div><div class='add'>+affects certain Microsoft (DOS, Windows) and IBM (OS/2) operating systems</div><div class='add'>+running on Intel processors.  As before PNGAPI is defined where required</div><div class='add'>+to control the exported API functions; however, two new macros, PNGCBAPI</div><div class='add'>+and PNGCAPI, are used instead for callback functions (PNGCBAPI) and</div><div class='add'>+(PNGCAPI) for functions that must match a C library prototype (currently</div><div class='add'>+only png_longjmp_ptr, which must match the C longjmp function.)  The new</div><div class='add'>+approach is documented in pngconf.h</div><div class='add'>+</div><div class='add'>+Despite these changes libpng 1.5.0 only supports the native C function</div><div class='add'>+calling standard on those platforms tested so far (__cdecl on Microsoft</div><div class='add'>+Windows).  This is because the support requirements for alternative</div><div class='add'>+calling conventions seem to no longer exist.  Developers who find it</div><div class='add'>+necessary to set PNG_API_RULE to 1 should advise the mailing list</div><div class='add'>+(png-mng-implement) of this and library builders who use Openwatcom and</div><div class='add'>+therefore set PNG_API_RULE to 2 should also contact the mailing list.</div><div class='add'>+</div><div class='add'>+A new test program, pngvalid, is provided in addition to pngtest.</div><div class='add'>+pngvalid validates the arithmetic accuracy of the gamma correction</div><div class='add'>+calculations and includes a number of validations of the file format.</div><div class='add'>+A subset of the full range of tests is run when "make check" is done</div><div class='add'>+(in the 'configure' build.)  pngvalid also allows total allocated memory</div><div class='add'>+usage to be evaluated and performs additional memory overwrite validation.</div><div class='add'>+</div><div class='add'>+Many changes to individual feature macros have been made. The following</div><div class='add'>+are the changes most likely to be noticed by library builders who</div><div class='add'>+configure libpng:</div><div class='add'>+</div><div class='add'>+1) All feature macros now have consistent naming:</div><div class='add'>+</div><div class='add'>+#define PNG_NO_feature turns the feature off</div><div class='add'>+#define PNG_feature_SUPPORTED turns the feature on</div><div class='add'>+</div><div class='add'>+pnglibconf.h contains one line for each feature macro which is either:</div><div class='add'>+</div><div class='add'>+#define PNG_feature_SUPPORTED</div><div class='add'>+</div><div class='add'>+if the feature is supported or:</div><div class='add'>+</div><div class='add'>+/*#undef PNG_feature_SUPPORTED*/</div><div class='add'>+</div><div class='add'>+if it is not.  Library code consistently checks for the 'SUPPORTED' macro.</div><div class='add'>+It does not, and should not, check for the 'NO' macro which will not</div><div class='add'>+normally be defined even if the feature is not supported.</div><div class='add'>+</div><div class='add'>+Compatibility with the old names is provided as follows:</div><div class='add'>+</div><div class='add'>+PNG_INCH_CONVERSIONS turns on PNG_INCH_CONVERSIONS_SUPPORTED</div><div class='add'>+</div><div class='add'>+And the following definitions disable the corresponding feature:</div><div class='add'>+</div><div class='add'>+PNG_SETJMP_NOT_SUPPORTED disables SETJMP</div><div class='add'>+PNG_READ_TRANSFORMS_NOT_SUPPORTED disables READ_TRANSFORMS</div><div class='add'>+PNG_NO_READ_COMPOSITED_NODIV disables READ_COMPOSITE_NODIV</div><div class='add'>+PNG_WRITE_TRANSFORMS_NOT_SUPPORTED disables WRITE_TRANSFORMS</div><div class='add'>+PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED disables READ_ANCILLARY_CHUNKS</div><div class='add'>+PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED disables WRITE_ANCILLARY_CHUNKS</div><div class='add'>+</div><div class='add'>+Library builders should remove use of the above, inconsistent, names.</div><div class='add'>+</div><div class='add'>+2) Warning and error message formatting was previously conditional on</div><div class='add'>+the STDIO feature. The library has been changed to use the</div><div class='add'>+CONSOLE_IO feature instead. This means that if CONSOLE_IO is disabled</div><div class='add'>+the library no longer uses the printf(3) functions, even though the</div><div class='add'>+default read/write implementations use (FILE) style stdio.h functions.</div><div class='add'>+</div><div class='add'>+3) Three feature macros now control the fixed/floating point decisions:</div><div class='add'>+</div><div class='add'>+PNG_FLOATING_POINT_SUPPORTED enables the floating point APIs</div><div class='add'>+</div><div class='add'>+PNG_FIXED_POINT_SUPPORTED enables the fixed point APIs; however, in</div><div class='add'>+practice these are normally required internally anyway (because the PNG</div><div class='add'>+file format is fixed point), therefore in most cases PNG_NO_FIXED_POINT</div><div class='add'>+merely stops the function from being exported.</div><div class='add'>+</div><div class='add'>+PNG_FLOATING_ARITHMETIC_SUPPORTED chooses between the internal floating</div><div class='add'>+point implementation or the fixed point one.  Typically the fixed point</div><div class='add'>+implementation is larger and slower than the floating point implementation</div><div class='add'>+on a system that supports floating point, however it may be faster on a</div><div class='add'>+system which lacks floating point hardware and therefore uses a software</div><div class='add'>+emulation.</div><div class='add'>+</div><div class='add'>+4) Added PNG_{READ,WRITE}_INT_FUNCTIONS_SUPPORTED.  This allows the</div><div class='add'>+functions to read and write ints to be disabled independently of</div><div class='add'>+PNG_USE_READ_MACROS, which allows libpng to be built with the functions</div><div class='add'>+even though the default is to use the macros - this allows applications</div><div class='add'>+to choose at app buildtime whether or not to use macros (previously</div><div class='add'>+impossible because the functions weren't in the default build.)</div><div class='add'>+</div><div class='add'>+B.2 Changes to the configuration mechanism</div><div class='add'>+</div><div class='add'>+Prior to libpng-1.5.0 library builders who needed to configure libpng</div><div class='add'>+had either to modify the exported pngconf.h header file to add system</div><div class='add'>+specific configuration or had to write feature selection macros into</div><div class='add'>+pngusr.h and cause this to be included into pngconf.h by defining</div><div class='add'>+PNG_USER_CONFIG. The latter mechanism had the disadvantage that an</div><div class='add'>+application built without PNG_USER_CONFIG defined would see the</div><div class='add'>+unmodified, default, libpng API and thus would probably fail to link.</div><div class='add'>+</div><div class='add'>+These mechanisms still work in the configure build and in any makefile</div><div class='add'>+build that builds pnglibconf.h although the feature selection macros</div><div class='add'>+have changed somewhat as described above.  In 1.5.0, however, pngusr.h is</div><div class='add'>+processed only once, when the exported header file pnglibconf.h is built.</div><div class='add'>+pngconf.h no longer includes pngusr.h, therefore it is ignored after the</div><div class='add'>+build of pnglibconf.h and it is never included in an application build.</div><div class='add'>+</div><div class='add'>+The rarely used alternative of adding a list of feature macros to the</div><div class='add'>+CFLAGS setting in the build also still works, however the macros will be</div><div class='add'>+copied to pnglibconf.h and this may produce macro redefinition warnings</div><div class='add'>+when the individual C files are compiled.</div><div class='add'>+</div><div class='add'>+All configuration now only works if pnglibconf.h is built from</div><div class='add'>+scripts/pnglibconf.dfa.  This requires the program awk.  Brian Kernighan</div><div class='add'>+(the original author of awk) maintains C source code of that awk and this</div><div class='add'>+and all known later implementations (often called by subtly different</div><div class='add'>+names - nawk and gawk for example) are adequate to build pnglibconf.h.</div><div class='add'>+The Sun Microsystems (now Oracle) program 'awk' is an earlier version</div><div class='add'>+and does not work, this may also apply to other systems that have a</div><div class='add'>+functioning awk called 'nawk'.</div><div class='add'>+</div><div class='add'>+Configuration options are now documented in scripts/pnglibconf.dfa.  This</div><div class='add'>+file also includes dependency information that ensures a configuration is</div><div class='add'>+consistent; that is, if a feature is switched off dependent features are</div><div class='add'>+also removed.  As a recommended alternative to using feature macros in</div><div class='add'>+pngusr.h a system builder may also define equivalent options in pngusr.dfa</div><div class='add'>+(or, indeed, any file) and add that to the configuration by setting</div><div class='add'>+DFA_XTRA to the file name.  The makefiles in contrib/pngminim illustrate</div><div class='add'>+how to do this, and a case where pngusr.h is still required.</div><div class='add'>+</div><div class='add'>+XI. Detecting libpng</div><div class='add'>+</div><div class='add'>+The png_get_io_ptr() function has been present since libpng-0.88, has never</div><div class='add'>+changed, and is unaffected by conditional compilation macros.  It is the</div><div class='add'>+best choice for use in configure scripts for detecting the presence of any</div><div class='add'>+libpng version since 0.88.  In an autoconf "configure.in" you could use</div><div class='add'>+</div><div class='add'>+    AC_CHECK_LIB(png, png_get_io_ptr, ...</div><div class='add'>+</div><div class='add'>+XII. Source code repository</div><div class='add'>+</div><div class='add'>+Since about February 2009, version 1.2.34, libpng has been under "git" source</div><div class='add'>+control.  The git repository was built from old libpng-x.y.z.tar.gz files</div><div class='add'>+going back to version 0.70.  You can access the git repository (read only)</div><div class='add'>+at</div><div class='add'>+</div><div class='add'>+    git://libpng.git.sourceforge.net/gitroot/libpng</div><div class='add'>+</div><div class='add'>+or you can browse it via "gitweb" at</div><div class='add'>+</div><div class='add'>+    http://libpng.git.sourceforge.net/git/gitweb.cgi?p=libpng</div><div class='add'>+</div><div class='add'>+Patches can be sent to glennrp at users.sourceforge.net or to</div><div class='add'>+png-mng-implement at lists.sourceforge.net or you can upload them to</div><div class='add'>+the libpng bug tracker at</div><div class='add'>+</div><div class='add'>+    http://libpng.sourceforge.net</div><div class='add'>+</div><div class='add'>+We also accept patches built from the tar or zip distributions, and</div><div class='add'>+simple verbal discriptions of bug fixes, reported either to the</div><div class='add'>+SourceForge bug tracker or to the png-mng-implement at lists.sf.net</div><div class='add'>+mailing list.</div><div class='add'>+</div><div class='add'>+XIII. Coding style</div><div class='add'>+</div><div class='add'>+Our coding style is similar to the "Allman" style, with curly</div><div class='add'>+braces on separate lines:</div><div class='add'>+</div><div class='add'>+    if (condition)</div><div class='add'>+    {</div><div class='add'>+       action;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    else if (another condition)</div><div class='add'>+    {</div><div class='add'>+       another action;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+The braces can be omitted from simple one-line actions:</div><div class='add'>+</div><div class='add'>+    if (condition)</div><div class='add'>+       return (0);</div><div class='add'>+</div><div class='add'>+We use 3-space indentation, except for continued statements which</div><div class='add'>+are usually indented the same as the first line of the statement</div><div class='add'>+plus four more spaces.</div><div class='add'>+</div><div class='add'>+For macro definitions we use 2-space indentation, always leaving the "#"</div><div class='add'>+in the first column.</div><div class='add'>+</div><div class='add'>+    #ifndef PNG_NO_FEATURE</div><div class='add'>+    #  ifndef PNG_FEATURE_SUPPORTED</div><div class='add'>+    #    define PNG_FEATURE_SUPPORTED</div><div class='add'>+    #  endif</div><div class='add'>+    #endif</div><div class='add'>+</div><div class='add'>+Comments appear with the leading "/*" at the same indentation as</div><div class='add'>+the statement that follows the comment:</div><div class='add'>+</div><div class='add'>+    /* Single-line comment */</div><div class='add'>+    statement;</div><div class='add'>+</div><div class='add'>+    /* This is a multiple-line</div><div class='add'>+     * comment.</div><div class='add'>+     */</div><div class='add'>+    statement;</div><div class='add'>+</div><div class='add'>+Very short comments can be placed after the end of the statement</div><div class='add'>+to which they pertain:</div><div class='add'>+</div><div class='add'>+    statement;    /* comment */</div><div class='add'>+</div><div class='add'>+We don't use C++ style ("//") comments. We have, however,</div><div class='add'>+used them in the past in some now-abandoned MMX assembler</div><div class='add'>+code.</div><div class='add'>+</div><div class='add'>+Functions and their curly braces are not indented, and</div><div class='add'>+exported functions are marked with PNGAPI:</div><div class='add'>+</div><div class='add'>+ /* This is a public function that is visible to</div><div class='add'>+  * application programmers. It does thus-and-so.</div><div class='add'>+  */</div><div class='add'>+ void PNGAPI</div><div class='add'>+ png_exported_function(png_ptr, png_info, foo)</div><div class='add'>+ {</div><div class='add'>+    body;</div><div class='add'>+ }</div><div class='add'>+</div><div class='add'>+The prototypes for all exported functions appear in png.h,</div><div class='add'>+above the comment that says</div><div class='add'>+</div><div class='add'>+    /* Maintainer: Put new public prototypes here ... */</div><div class='add'>+</div><div class='add'>+We mark all non-exported functions with "/* PRIVATE */"":</div><div class='add'>+</div><div class='add'>+ void /* PRIVATE */</div><div class='add'>+ png_non_exported_function(png_ptr, png_info, foo)</div><div class='add'>+ {</div><div class='add'>+    body;</div><div class='add'>+ }</div><div class='add'>+</div><div class='add'>+The prototypes for non-exported functions (except for those in</div><div class='add'>+pngtest) appear in</div><div class='add'>+pngpriv.h</div><div class='add'>+above the comment that says</div><div class='add'>+</div><div class='add'>+  /* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */</div><div class='add'>+</div><div class='add'>+To avoid polluting the global namespace, the names of all exported</div><div class='add'>+functions and variables begin with  "png_", and all publicly visible C</div><div class='add'>+preprocessor macros begin with "PNG_".  We request that applications that</div><div class='add'>+use libpng *not* begin any of their own symbols with either of these strings.</div><div class='add'>+</div><div class='add'>+We put a space after each comma and after each semicolon</div><div class='add'>+in "for" statements, and we put spaces before and after each</div><div class='add'>+C binary operator and after "for" or "while", and before</div><div class='add'>+"?".  We don't put a space between a typecast and the expression</div><div class='add'>+being cast, nor do we put one between a function name and the</div><div class='add'>+left parenthesis that follows it:</div><div class='add'>+</div><div class='add'>+    for (i = 2; i &gt; 0; --i)</div><div class='add'>+       y[i] = a(x) + (int)b;</div><div class='add'>+</div><div class='add'>+We prefer #ifdef and #ifndef to #if defined() and if !defined()</div><div class='add'>+when there is only one macro being tested.</div><div class='add'>+</div><div class='add'>+We do not use the TAB character for indentation in the C sources.</div><div class='add'>+</div><div class='add'>+Lines do not exceed 80 characters.</div><div class='add'>+</div><div class='add'>+Other rules can be inferred by inspecting the libpng source.</div><div class='add'>+</div><div class='add'>+XIV. Y2K Compliance in libpng</div><div class='add'>+</div><div class='add'>+February 3, 2011</div><div class='add'>+</div><div class='add'>+Since the PNG Development group is an ad-hoc body, we can't make</div><div class='add'>+an official declaration.</div><div class='add'>+</div><div class='add'>+This is your unofficial assurance that libpng from version 0.71 and</div><div class='add'>+upward through 1.5.1 are Y2K compliant.  It is my belief that earlier</div><div class='add'>+versions were also Y2K compliant.</div><div class='add'>+</div><div class='add'>+Libpng only has three year fields.  One is a 2-byte unsigned integer that</div><div class='add'>+will hold years up to 65535.  The other two hold the date in text</div><div class='add'>+format, and will hold years up to 9999.</div><div class='add'>+</div><div class='add'>+The integer is</div><div class='add'>+    "png_uint_16 year" in png_time_struct.</div><div class='add'>+</div><div class='add'>+The strings are</div><div class='add'>+    "png_charp time_buffer" in png_struct and</div><div class='add'>+    "near_time_buffer", which is a local character string in png.c.</div><div class='add'>+</div><div class='add'>+There are seven time-related functions:</div><div class='add'>+</div><div class='add'>+    png_convert_to_rfc_1123() in png.c</div><div class='add'>+      (formerly png_convert_to_rfc_1152() in error)</div><div class='add'>+    png_convert_from_struct_tm() in pngwrite.c, called</div><div class='add'>+      in pngwrite.c</div><div class='add'>+    png_convert_from_time_t() in pngwrite.c</div><div class='add'>+    png_get_tIME() in pngget.c</div><div class='add'>+    png_handle_tIME() in pngrutil.c, called in pngread.c</div><div class='add'>+    png_set_tIME() in pngset.c</div><div class='add'>+    png_write_tIME() in pngwutil.c, called in pngwrite.c</div><div class='add'>+</div><div class='add'>+All appear to handle dates properly in a Y2K environment.  The</div><div class='add'>+png_convert_from_time_t() function calls gmtime() to convert from system</div><div class='add'>+clock time, which returns (year - 1900), which we properly convert to</div><div class='add'>+the full 4-digit year.  There is a possibility that applications using</div><div class='add'>+libpng are not passing 4-digit years into the png_convert_to_rfc_1123()</div><div class='add'>+function, or that they are incorrectly passing only a 2-digit year</div><div class='add'>+instead of "year - 1900" into the png_convert_from_struct_tm() function,</div><div class='add'>+but this is not under our control.  The libpng documentation has always</div><div class='add'>+stated that it works with 4-digit years, and the APIs have been</div><div class='add'>+documented as such.</div><div class='add'>+</div><div class='add'>+The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned</div><div class='add'>+integer to hold the year, and can hold years as large as 65535.</div><div class='add'>+</div><div class='add'>+zlib, upon which libpng depends, is also Y2K compliant.  It contains</div><div class='add'>+no date-related code.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+   Glenn Randers-Pehrson</div><div class='add'>+   libpng maintainer</div><div class='add'>+   PNG Development Group</div><div class='head'>diff --git a/src/3rdparty/libpng/libpng.3 b/src/3rdparty/libpng/libpng.3<br/>index 6b77fde..ecc4277 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/libpng.3?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/libpng.3</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/libpng.3?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/libpng.3</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='del'>-.TH LIBPNG 3 "January 3, 2010"</div><div class='add'>+.TH LIBPNG 3 "February 3, 2011"</div><div class='ctx'> .SH NAME</div><div class='del'>-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='add'>+libpng \- Portable Network Graphics (PNG) Reference Library 1.5.1</div><div class='ctx'> .SH SYNOPSIS</div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -16,6 +16,14 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='add'>+\fBvoid png_build_grayscale_palette (int \fP\fIbit_depth\fP\fB, png_colorp \fIpalette\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_voidp png_calloc (png_structp \fP\fIpng_ptr\fP\fB, png_alloc_size_t \fIsize\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='ctx'> \fBvoid png_chunk_benign_error (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fIerror\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='hunk'>@@ -48,7 +56,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_structp png_create_read_struct_2(png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fP\fIwarn_fn\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP</div><div class='add'>+\fBpng_structp png_create_read_struct_2 (png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fP\fIwarn_fn\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -56,7 +64,11 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_structp png_create_write_struct_2(png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fP\fIwarn_fn\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP</div><div class='add'>+\fBpng_structp png_create_write_struct_2 (png_const_charp \fP\fIuser_png_ver\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fP\fIwarn_fn\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBvoid png_data_freer (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fIfreer\fP\fB, png_uint_32 \fImask)\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -72,6 +84,10 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='add'>+\fBvoid png_err (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='ctx'> \fBvoid png_error (png_structp \fP\fIpng_ptr\fP\fB, png_const_charp \fIerror\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='hunk'>@@ -84,7 +100,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoid png_free_default(png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fIptr\fP\fB);\fP</div><div class='add'>+\fBvoid png_free_default (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fIptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -92,75 +108,89 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_byte png_get_bit_depth (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_byte png_get_bit_depth (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_bKGD (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_16p \fI*background\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_bKGD (png_const_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_16p \fI*background\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_byte png_get_channels (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_byte png_get_channels (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fP\fI*white_x\fP\fB, double \fP\fI*white_y\fP\fB, double \fP\fI*red_x\fP\fB, double \fP\fI*red_y\fP\fB, double \fP\fI*green_x\fP\fB, double \fP\fI*green_y\fP\fB, double \fP\fI*blue_x\fP\fB, double \fI*blue_y\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_cHRM (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, double \fP\fI*white_x\fP\fB, double \fP\fI*white_y\fP\fB, double \fP\fI*red_x\fP\fB, double \fP\fI*red_y\fP\fB, double \fP\fI*green_x\fP\fB, double \fP\fI*green_y\fP\fB, double \fP\fI*blue_x\fP\fB, double \fI*blue_y\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_cHRM_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*white_x\fP\fB, png_uint_32 \fP\fI*white_y\fP\fB, png_uint_32 \fP\fI*red_x\fP\fB, png_uint_32 \fP\fI*red_y\fP\fB, png_uint_32 \fP\fI*green_x\fP\fB, png_uint_32 \fP\fI*green_y\fP\fB, png_uint_32 \fP\fI*blue_x\fP\fB, png_uint_32 \fI*blue_y\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_cHRM_fixed (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*white_x\fP\fB, png_uint_32 \fP\fI*white_y\fP\fB, png_uint_32 \fP\fI*red_x\fP\fB, png_uint_32 \fP\fI*red_y\fP\fB, png_uint_32 \fP\fI*green_x\fP\fB, png_uint_32 \fP\fI*green_y\fP\fB, png_uint_32 \fP\fI*blue_x\fP\fB, png_uint_32 \fI*blue_y\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_chunk_cache_max (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_chunk_cache_max (png_const_structp \fIpng_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_byte png_get_color_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_alloc_size_t png_get_chunk_malloc_max (png_const_structp \fIpng_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_compression_buffer_size (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_byte png_get_color_type (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_byte png_get_compression_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_compression_buffer_size (png_const_structp \fIpng_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_byte png_get_copyright (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_byte png_get_compression_type (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_voidp png_get_error_ptr (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_byte png_get_copyright (png_const_structp \fIpng_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_byte png_get_filter_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_current_row_number \fI(png_const_structp\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_gAMA (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fI*file_gamma\fP\fB);\fP</div><div class='add'>+\fBpng_byte png_get_current_pass_number \fI(png_const_structp\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_gAMA_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fI*int_file_gamma\fP\fB);\fP</div><div class='add'>+\fBpng_voidp png_get_error_ptr (png_const_structp \fIpng_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_byte png_get_header_ver (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_byte png_get_filter_type (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_byte png_get_header_version (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_gAMA (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, double \fI*file_gamma\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_16p \fI*hist\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_gAMA_fixed (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fI*int_file_gamma\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charpp \fP\fIname\fP\fB, int \fP\fI*compression_type\fP\fB, png_charpp \fP\fIprofile\fP\fB, png_uint_32 \fI*proflen\fP\fB);\fP</div><div class='add'>+\fBpng_byte png_get_header_ver (png_const_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_byte png_get_header_version (png_const_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_uint_32 png_get_hIST (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, png_uint_16p \fI*hist\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_uint_32 png_get_iCCP (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, png_charpp \fP\fIname\fP\fB, int \fP\fI*compression_type\fP\fB, png_bytepp \fP\fIprofile\fP\fB, png_uint_32 \fI*proflen\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -168,11 +198,11 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_image_height (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_image_height (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_image_width (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_image_width (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -180,7 +210,15 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_byte png_get_interlace_type (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_byte png_get_interlace_type (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_const_bytep png_get_io_chunk_name (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_uint_32 png_get_io_chunk_type (png_const_structp \fIpng_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -188,77 +226,105 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_byte png_get_libpng_ver (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_io_state (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_voidp png_get_mem_ptr(png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_byte png_get_libpng_ver (png_const_structp \fIpng_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*offset_x\fP\fB, png_uint_32 \fP\fI*offset_y\fP\fB, int \fI*unit_type\fP\fB);\fP</div><div class='add'>+\fBpng_voidp png_get_mem_ptr (png_const_structp \fIpng_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fI*purpose\fP\fB, png_int_32 \fP\fI*X0\fP\fB, png_int_32 \fP\fI*X1\fP\fB, int \fP\fI*type\fP\fB, int \fP\fI*nparams\fP\fB, png_charp \fP\fI*units\fP\fB, png_charpp \fI*params\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_oFFs (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*offset_x\fP\fB, png_uint_32 \fP\fI*offset_y\fP\fB, int \fI*unit_type\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*res_x\fP\fB, png_uint_32 \fP\fI*res_y\fP\fB, int \fI*unit_type\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_pCAL (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fI*purpose\fP\fB, png_int_32 \fP\fI*X0\fP\fB, png_int_32 \fP\fI*X1\fP\fB, int \fP\fI*type\fP\fB, int \fP\fI*nparams\fP\fB, png_charp \fP\fI*units\fP\fB, png_charpp \fI*params\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBfloat png_get_pixel_aspect_ratio (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_pHYs (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*res_x\fP\fB, png_uint_32 \fP\fI*res_y\fP\fB, int \fI*unit_type\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_pixels_per_meter (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBfloat png_get_pixel_aspect_ratio (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_voidp png_get_progressive_ptr (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_pHYs_dpi (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fP\fI*res_x\fP\fB, png_uint_32 \fP\fI*res_y\fP\fB, int \fI*unit_type\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_colorp \fP\fI*palette\fP\fB, int \fI*num_palette\fP\fB);\fP</div><div class='add'>+\fBpng_fixed_point png_get_pixel_aspect_ratio_fixed (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_byte png_get_rgb_to_gray_status (png_structp \fIpng_ptr)</div><div class='add'>+\fBpng_uint_32 png_get_pixels_per_inch (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_rowbytes (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_uint_32 png_get_pixels_per_meter (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_voidp png_get_progressive_ptr (png_const_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_uint_32 png_get_PLTE (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, png_colorp \fP\fI*palette\fP\fB, int \fI*num_palette\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_byte png_get_rgb_to_gray_status (png_const_structp \fIpng_ptr)</div><div class='add'>+</div><div class='add'>+\fBpng_uint_32 png_get_rowbytes (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_bytepp png_get_rows (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_bytepp png_get_rows (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_sBIT (png_const_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_8p \fI*sig_bit\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_color_8p \fI*sig_bit\fP\fB);\fP</div><div class='add'>+\fBvoid png_get_sCAL (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, int* \fP\fIunit\fP\fB, double* \fP\fIwidth\fP\fB, double* \fIheight\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_bytep png_get_signature (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBvoid png_get_sCAL_fixed (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, int* \fP\fIunit\fP\fB, png_fixed_pointp \fP\fIwidth\fP\fB, png_fixed_pointp \fIheight\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_spalette_p \fI*splt_ptr\fP\fB);\fP</div><div class='add'>+\fBvoid png_get_sCAL_s (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, int* \fP\fIunit\fP\fB, png_charpp \fP\fIwidth\fP\fB, png_charpp \fIheight\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_sRGB (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fI*intent\fP\fB);\fP</div><div class='add'>+\fBpng_bytep png_get_signature (png_const_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_text (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_textp \fP\fI*text_ptr\fP\fB, int \fI*num_text\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_sPLT (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, png_spalette_p \fI*splt_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_timep \fI*mod_time\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_sRGB (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, int \fI*file_srgb_intent\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fI*trans\fP\fB, int \fP\fI*num_trans\fP\fB, png_color_16p \fI*trans_color\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_text (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, png_textp \fP\fI*text_ptr\fP\fB, int \fI*num_text\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_uint_32 png_get_tIME (png_const_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_timep \fI*mod_time\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_uint_32 png_get_tRNS (png_const_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fI*trans_alpha\fP\fB, int \fP\fI*num_trans\fP\fB, png_color_16p \fI*trans_color\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -268,7 +334,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_uint_31 (png_bytep \fIbuf\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_uint_31 (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIbuf\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -278,51 +344,75 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_unknown_chunks (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_unknown_chunkpp \fIunknowns\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_unknown_chunks (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, png_unknown_chunkpp \fIunknowns\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_voidp png_get_user_chunk_ptr (png_const_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_uint_32 png_get_user_height_max (png_const_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_voidp png_get_user_transform_ptr (png_const_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_uint_32 png_get_user_width_max (png_const_structp \fIpng_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_voidp png_get_user_chunk_ptr (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_valid (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIflag\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_user_height_max( png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBfloat png_get_x_offset_inches (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_voidp png_get_user_transform_ptr (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_fixed_point png_get_x_offset_inches_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_user_width_max (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_int_32 png_get_x_offset_microns (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_valid (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIflag\fP\fB);\fP</div><div class='add'>+\fBpng_int_32 png_get_x_offset_pixels (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_int_32 png_get_x_offset_microns (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_x_pixels_per_inch (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_int_32 png_get_x_offset_pixels (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_get_x_pixels_per_meter (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_x_pixels_per_meter (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBfloat png_get_y_offset_inches (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_int_32 png_get_y_offset_microns (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_fixed_point png_get_y_offset_inches_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_int_32 png_get_y_offset_pixels (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_int_32 png_get_y_offset_microns (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_uint_32 png_get_y_pixels_per_meter (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+\fBpng_int_32 png_get_y_offset_pixels (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_uint_32 png_get_y_pixels_per_inch (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_uint_32 png_get_y_pixels_per_meter (png_const_structp \fP\fIpng_ptr\fP\fB, png_const_infop \fIinfo_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -330,23 +420,31 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='add'>+\fBvoid png_info_init_3 (png_infopp \fP\fIinfo_ptr\fP\fB, png_size_t \fIpng_info_struct_size\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='ctx'> \fBvoid png_init_io (png_structp \fP\fIpng_ptr\fP\fB, FILE \fI*fp\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='add'>+\fBvoid png_longjmp (png_structp \fP\fIpng_ptr\fP\fB, int \fIval\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='ctx'> \fBpng_voidp png_malloc (png_structp \fP\fIpng_ptr\fP\fB, png_alloc_size_t \fIsize\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_voidp png_malloc_default(png_structp \fP\fIpng_ptr\fP\fB, png_alloc_size_t \fIsize\fP\fB);\fP</div><div class='add'>+\fBpng_voidp png_malloc_default (png_structp \fP\fIpng_ptr\fP\fB, png_alloc_size_t \fIsize\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoidp png_memcpy (png_voidp \fP\fIs1\fP\fB, png_voidp \fP\fIs2\fP\fB, png_size_t \fIsize\fP\fB);\fP</div><div class='add'>+\fBpng_voidp png_malloc_warn (png_structp \fP\fIpng_ptr\fP\fB, png_alloc_size_t \fIsize\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoidp png_memset (png_voidp \fP\fIs1\fP\fB, int \fP\fIvalue\fP\fB, png_size_t \fIsize\fP\fB);\fP</div><div class='add'>+\fBpng_uint_32 png_permit_mng_features (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fImng_features_permitted\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -354,6 +452,14 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='add'>+\fBpng_size_t png_process_data_pause \fP\fI(png_structp\fP\fB, int \fIsave\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBpng_uint_32 png_process_data_skip \fI(png_structp\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='ctx'> \fBvoid png_progressive_combine_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIold_row\fP\fB, png_bytep \fInew_row\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='hunk'>@@ -386,7 +492,11 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBpng_save_int_32 (png_bytep \fP\fIbuf\fP\fB, png_int_32 \fIi\fP\fB);\fP</div><div class='add'>+\fBint png_reset_zstream (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBvoid png_save_int_32 (png_bytep \fP\fIbuf\fP\fB, png_int_32 \fIi\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -406,6 +516,14 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='add'>+\fBvoid png_set_background_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_color_16p \fP\fIbackground_color\fP\fB, int \fP\fIbackground_gamma_code\fP\fB, int \fP\fIneed_expand\fP\fB, png_uint_32 \fIbackground_gamma\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBvoid png_set_benign_errors (png_structp \fP\fIpng_ptr\fP\fB, int \fIallowed\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='ctx'> \fBvoid png_set_bgr (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='hunk'>@@ -450,10 +568,6 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoid png_set_dither (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, int \fP\fInum_palette\fP\fB, int \fP\fImaximum_colors\fP\fB, png_uint_16p \fP\fIhistogram\fP\fB, int \fIfull_dither\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='ctx'> \fBvoid png_set_error_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIerror_ptr\fP\fB, png_error_ptr \fP\fIerror_fn\fP\fB, png_error_ptr \fIwarning_fn\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='hunk'>@@ -462,7 +576,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoid png_set_expand_gray_1_2_4_to_8(png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBvoid png_set_expand_gray_1_2_4_to_8 (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -478,6 +592,10 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='add'>+\fBvoid png_set_filter_heuristics_fixed (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIheuristic_method\fP\fB, int \fP\fInum_weights\fP\fB, png_fixed_point_p \fP\fIfilter_weights\fP\fB, png_fixed_point_p \fIfilter_costs\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='ctx'> \fBvoid png_set_flush (png_structp \fP\fIpng_ptr\fP\fB, int \fInrows\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='hunk'>@@ -486,6 +604,10 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='add'>+\fBvoid png_set_gamma_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIscreen_gamma\fP\fB, png_uint_32 \fIdefault_file_gamma\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='ctx'> \fBvoid png_set_gAMA (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fIfile_gamma\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='hunk'>@@ -494,7 +616,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoid png_set_gray_1_2_4_to_8(png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBvoid png_set_gray_1_2_4_to_8 (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -506,7 +628,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoid png_set_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fIname\fP\fB, int \fP\fIcompression_type\fP\fB, png_charp \fP\fIprofile\fP\fB, png_uint_32 \fIproflen\fP\fB);\fP</div><div class='add'>+\fBvoid png_set_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_const_charp \fP\fIname\fP\fB, int \fP\fIcompression_type\fP\fB, png_const_bytep \fP\fIprofile\fP\fB, png_uint_32 \fIproflen\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -538,7 +660,15 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoid png_set_mem_fn(png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP</div><div class='add'>+\fBvoid png_set_chunk_malloc_max (png_structp \fP\fIpng_ptr\fP\fB, png_alloc_size_t \fIuser_chunk_cache_max\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBvoid png_set_compression_buffer_size (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIsize\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBvoid png_set_mem_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fImem_ptr\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_free_ptr \fIfree_fn\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -554,7 +684,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoid png_set_palette_to_rgb(png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBvoid png_set_palette_to_rgb (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -574,6 +704,10 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='add'>+\fBvoid png_set_quantize (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, int \fP\fInum_palette\fP\fB, int \fP\fImaximum_colors\fP\fB, png_uint_16p \fP\fIhistogram\fP\fB, int \fIfull_quantize\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='ctx'> \fBvoid png_set_read_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIio_ptr\fP\fB, png_rw_ptr \fIread_data_fn\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='hunk'>@@ -582,6 +716,10 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='add'>+\fBvoid png_set_read_user_chunk_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIuser_chunk_ptr\fP\fB, png_user_chunk_ptr \fIread_user_chunk_fn\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='ctx'> \fBvoid png_set_read_user_transform_fn (png_structp \fP\fIpng_ptr\fP\fB, png_user_transform_ptr \fIread_user_transform_fn\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='hunk'>@@ -590,7 +728,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoid png_set_rgb_to_gray_fixed (png_structp \fP\fIpng_ptr\fP\fB, int error_action png_fixed_point \fP\fIred\fP\fB, png_fixed_point \fIgreen\fP\fB);\fP</div><div class='add'>+\fBvoid png_set_rgb_to_gray_fixed (png_structp \fP\fIpng_ptr\fP\fB, int error_action png_uint_32 \fP\fIred\fP\fB, png_uint_32 \fIgreen\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -602,7 +740,15 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoid png_set_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_charp \fP\fIunit\fP\fB, double \fP\fIwidth\fP\fB, double \fIheight\fP\fB);\fP</div><div class='add'>+\fBvoid png_set_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fIunit\fP\fB, double \fP\fIwidth\fP\fB, double \fIheight\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBvoid png_set_sCAL_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fIunit\fP\fB, png_fixed_point \fP\fIwidth\fP\fB, png_fixed_point \fIheight\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='add'>+\fBvoid png_set_sCAL_s (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fIunit\fP\fB, png_charp \fP\fIwidth\fP\fB, png_charp \fIheight\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -618,11 +764,11 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoid png_set_sRGB (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fIintent\fP\fB);\fP</div><div class='add'>+\fBvoid png_set_sRGB (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fIsrgb_intent\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoid png_set_sRGB_gAMA_and_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fIintent\fP\fB);\fP</div><div class='add'>+\fBvoid png_set_sRGB_gAMA_and_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fIsrgb_intent\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -634,6 +780,10 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='add'>+\fBvoid png_set_strip_error_numbers (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIstrip_mode\fP\fB);\fP</div><div class='add'>+</div><div class='add'>+\fI\fB</div><div class='add'>+</div><div class='ctx'> \fBvoid png_set_swap (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='hunk'>@@ -650,11 +800,11 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoid png_set_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fItrans\fP\fB, int \fP\fInum_trans\fP\fB, png_color_16p \fItrans_color\fP\fB);\fP</div><div class='add'>+\fBvoid png_set_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_bytep \fP\fItrans_alpha\fP\fB, int \fP\fInum_trans\fP\fB, png_color_16p \fItrans_color\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoid png_set_tRNS_to_alpha(png_structp \fIpng_ptr\fP\fB);\fP</div><div class='add'>+\fBvoid png_set_tRNS_to_alpha (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -662,11 +812,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoid png_set_unknown_chunk_location(png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fIchunk\fP\fB, int \fIlocation\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_set_read_user_chunk_fn (png_structp \fP\fIpng_ptr\fP\fB, png_voidp \fP\fIuser_chunk_ptr\fP\fB, png_user_chunk_ptr \fIread_user_chunk_fn\fP\fB);\fP</div><div class='add'>+\fBvoid png_set_unknown_chunk_location (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, int \fP\fIchunk\fP\fB, int \fIlocation\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='hunk'>@@ -690,10 +836,6 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoid png_set_compression_buffer_size(png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIsize\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='ctx'> \fBint png_sig_cmp (png_bytep \fP\fIsig\fP\fB, png_size_t \fP\fIstart\fP\fB, png_size_t \fInum_to_check\fP\fB);\fP</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='hunk'>@@ -773,14 +915,14 @@ library supports encoding, decoding, and various manipulations of</div><div class='ctx'> the Portable Network Graphics (PNG) format image files.  It uses the</div><div class='ctx'> .IR zlib(3)</div><div class='ctx'> compression library.</div><div class='del'>-Following is a copy of the libpng.txt file that accompanies libpng.</div><div class='add'>+Following is a copy of the libpng-manual.txt file that accompanies libpng.</div><div class='ctx'> .SH LIBPNG.TXT</div><div class='del'>-libpng.txt - A description on how to use and modify libpng</div><div class='add'>+libpng-manual.txt - A description on how to use and modify libpng</div><div class='ctx'> </div><div class='del'>- libpng version 1.4.0 - January 3, 2010</div><div class='add'>+ libpng version 1.5.1 - February 3, 2011</div><div class='ctx'>  Updated and distributed by Glenn Randers-Pehrson</div><div class='ctx'>  &lt;glennrp at users.sourceforge.net&gt;</div><div class='del'>- Copyright (c) 1998-2009 Glenn Randers-Pehrson</div><div class='add'>+ Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'> </div><div class='ctx'>  This document is released under the libpng license.</div><div class='ctx'>  For conditions of distribution and use, see the disclaimer</div><div class='hunk'>@@ -788,9 +930,9 @@ libpng.txt - A description on how to use and modify libpng</div><div class='ctx'> </div><div class='ctx'>  Based on:</div><div class='ctx'> </div><div class='del'>- libpng versions 0.97, January 1998, through 1.4.0 - January 3, 2010</div><div class='add'>+ libpng versions 0.97, January 1998, through 1.5.1 - February 3, 2011</div><div class='ctx'>  Updated and distributed by Glenn Randers-Pehrson</div><div class='del'>- Copyright (c) 1998-2009 Glenn Randers-Pehrson</div><div class='add'>+ Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'> </div><div class='ctx'>  libpng 1.0 beta 6  version 0.96 May 28, 1997</div><div class='ctx'>  Updated and distributed by Andreas Dilger</div><div class='hunk'>@@ -876,34 +1018,181 @@ same instance of a structure.</div><div class='ctx'> .SH II. Structures</div><div class='ctx'> </div><div class='ctx'> There are two main structures that are important to libpng, png_struct</div><div class='del'>-and png_info.  The first, png_struct, is an internal structure that</div><div class='del'>-will not, for the most part, be used by a user except as the first</div><div class='del'>-variable passed to every libpng function call.</div><div class='add'>+and png_info.  Both are internal structures that are no longer exposed</div><div class='add'>+in the libpng interface (as of libpng 1.5.0).</div><div class='ctx'> </div><div class='ctx'> The png_info structure is designed to provide information about the</div><div class='ctx'> PNG file.  At one time, the fields of png_info were intended to be</div><div class='ctx'> directly accessible to the user.  However, this tended to cause problems</div><div class='ctx'> with applications using dynamically loaded libraries, and as a result</div><div class='ctx'> a set of interface functions for png_info (the png_get_*() and png_set_*()</div><div class='del'>-functions) was developed.  The fields of png_info are still available for</div><div class='del'>-older applications, but it is suggested that applications use the new</div><div class='del'>-interfaces if at all possible.</div><div class='del'>-</div><div class='del'>-Applications that do make direct access to the members of png_struct (except</div><div class='del'>-for png_ptr-&gt;jmpbuf) must be recompiled whenever the library is updated,</div><div class='del'>-and applications that make direct access to the members of png_info must</div><div class='del'>-be recompiled if they were compiled or loaded with libpng version 1.0.6,</div><div class='del'>-in which the members were in a different order.  In version 1.0.7, the</div><div class='del'>-members of the png_info structure reverted to the old order, as they were</div><div class='del'>-in versions 0.97c through 1.0.5.  Starting with version 2.0.0, both</div><div class='del'>-structures are going to be hidden, and the contents of the structures will</div><div class='del'>-only be accessible through the png_get/png_set functions.</div><div class='add'>+functions) was developed.</div><div class='add'>+</div><div class='add'>+The png_struct structure is the object used by the library to decode a</div><div class='add'>+single image.  As of 1.5.0 this structure is also not exposed.</div><div class='add'>+</div><div class='add'>+Almost all libpng APIs require a pointer to a png_struct as the first argument.</div><div class='add'>+Many (in particular the png_set and png_get APIs) also require a pointer</div><div class='add'>+to png_info as the second argument.  Some application visible macros</div><div class='add'>+defined in png.h designed for basic data access (reading and writing</div><div class='add'>+integers in the PNG format) break this rule, but it's almost always safe</div><div class='add'>+to assume that a (png_struct*) has to be passed to call an API function.</div><div class='ctx'> </div><div class='ctx'> The png.h header file is an invaluable reference for programming with libpng.</div><div class='ctx'> And while I'm on the topic, make sure you include the libpng header file:</div><div class='ctx'> </div><div class='ctx'> #include &lt;png.h&gt;</div><div class='ctx'> </div><div class='add'>+.SS Types</div><div class='add'>+</div><div class='add'>+The png.h header file defines a number of integral types used by the</div><div class='add'>+APIs.  Most of these are fairly obvious; for example types corresponding</div><div class='add'>+to integers of particular sizes and types for passing color values.</div><div class='add'>+</div><div class='add'>+One exception is how non-integral numbers are handled.  For application</div><div class='add'>+convenience most APIs that take such numbers have C (double) arguments,</div><div class='add'>+however internally PNG, and libpng, use 32 bit signed integers and encode</div><div class='add'>+the value by multiplying by 100,000.  As of libpng 1.5.0 a convenience</div><div class='add'>+macro PNG_FP_1 is defined in png.h along with a type (png_fixed_point)</div><div class='add'>+which is simply (png_int_32).</div><div class='add'>+</div><div class='add'>+All APIs that take (double) arguments also have an matching API that</div><div class='add'>+takes the corresponding fixed point integer arguments.  The fixed point</div><div class='add'>+API has the same name as the floating point one with _fixed appended.</div><div class='add'>+The actual range of values permitted in the APIs is frequently less than</div><div class='add'>+the full range of (png_fixed_point) (-21474 to +21474).  When APIs require</div><div class='add'>+a non-negative argument the type is recorded as png_uint_32 above.  Consult</div><div class='add'>+the header file and the text below for more information.</div><div class='add'>+</div><div class='add'>+Special care must be take with sCAL chunk handling because the chunk itself</div><div class='add'>+uses non-integral values encoded as strings containing decimal floating point</div><div class='add'>+numbers.  See the comments in the header file.</div><div class='add'>+</div><div class='add'>+.SS Configuration</div><div class='add'>+</div><div class='add'>+The main header file function declarations are frequently protected by C</div><div class='add'>+preprocessing directives of the form:</div><div class='add'>+</div><div class='add'>+    #ifdef PNG_feature_SUPPORTED</div><div class='add'>+    declare-function</div><div class='add'>+    #endif</div><div class='add'>+</div><div class='add'>+The library can be built without support for these APIs, although a</div><div class='add'>+standard build will have all implemented APIs.  Application programs</div><div class='add'>+should check the feature macros before using an API for maximum</div><div class='add'>+portability.  From libpng 1.5.0 the feature macros set during the build</div><div class='add'>+of libpng are recorded in the header file "pnglibconf.h" and this file</div><div class='add'>+is always included by png.h.</div><div class='add'>+</div><div class='add'>+If you don't need to change the library configuration from the default skip to</div><div class='add'>+the next section ("Reading").</div><div class='add'>+</div><div class='add'>+Notice that some of the makefiles in the 'scripts' directory and (in 1.5.0) all</div><div class='add'>+of the build project files in the 'projects' directory simply copy</div><div class='add'>+scripts/pnglibconf.h.prebuilt to pnglibconf.h.  This means that these build</div><div class='add'>+systems do not permit easy auto-configuration of the library - they only</div><div class='add'>+support the default configuration.</div><div class='add'>+</div><div class='add'>+The easiest way to make minor changes to the libpng configuration when</div><div class='add'>+auto-configuration is supported is to add definitions to the command line</div><div class='add'>+using (typically) CPPFLAGS.  For example:</div><div class='add'>+</div><div class='add'>+CPPFLAGS=-DPNG_NO_FLOATING_ARITHMETIC</div><div class='add'>+</div><div class='add'>+will change the internal libpng math implementation for gamma correction and</div><div class='add'>+other arithmetic calculations to fixed point, avoiding the need for fast</div><div class='add'>+floating point support.  The result can be seen in the generated pnglibconf.h -</div><div class='add'>+make sure it contains the changed feature macro setting.</div><div class='add'>+</div><div class='add'>+If you need to make more extensive configuration changes - more than one or two</div><div class='add'>+feature macro settings - you can either add -DPNG_USER_CONFIG to the build</div><div class='add'>+command line and put a list of feature macro settings in pngusr.h or you can set</div><div class='add'>+DFA_XTRA (a makefile variable) to a file containing the same information in the</div><div class='add'>+form of 'option' settings.</div><div class='add'>+</div><div class='add'>+A. Changing pnglibconf.h</div><div class='add'>+</div><div class='add'>+A variety of methods exist to build libpng.  Not all of these support</div><div class='add'>+reconfiguration of pnglibconf.h.  To reconfigure pnglibconf.h it must either be</div><div class='add'>+rebuilt from scripts/pnglibconf.dfa using awk or it must be edited by hand.</div><div class='add'>+</div><div class='add'>+Hand editing is achieved by copying scripts/pnglibconf.h.prebuilt and changing</div><div class='add'>+the lines defining the supported features, paying very close attention to the</div><div class='add'>+'option' information in scripts/pnglibconf.dfa that describes those features and</div><div class='add'>+their requirements.  This is easy to get wrong.</div><div class='add'>+</div><div class='add'>+B. Configuration using DFA_XTRA</div><div class='add'>+</div><div class='add'>+Rebuilding from pnglibconf.dfa is easy if a functioning 'awk', or a later</div><div class='add'>+variant such as 'nawk' or 'gawk', is available.  The configure build will</div><div class='add'>+automatically find an appropriate awk and build pnglibconf.h.</div><div class='add'>+scripts/pnglibconf.mak contains a set of make rules for doing the same thing if</div><div class='add'>+configure is not used, and many of the makefiles in the scripts directory use</div><div class='add'>+this approach.</div><div class='add'>+</div><div class='add'>+When rebuilding simply write new file containing changed options and set</div><div class='add'>+DFA_XTRA to the name of this file.  This causes the build to append the new file</div><div class='add'>+to the end of scripts/pnglibconf.dfa.  pngusr.dfa should contain lines of the</div><div class='add'>+following forms:</div><div class='add'>+</div><div class='add'>+everything = off</div><div class='add'>+</div><div class='add'>+This turns all optional features off.  Include it at the start of pngusr.dfa to</div><div class='add'>+make it easier to build a minimal configuration.  You will need to turn at least</div><div class='add'>+some features on afterward to enable either reading or writing code, or both.</div><div class='add'>+</div><div class='add'>+option feature on</div><div class='add'>+option feature off</div><div class='add'>+</div><div class='add'>+Enable or disable a single feature.  This will automatically enable other</div><div class='add'>+features required by a feature that is turned on or disable other features that</div><div class='add'>+require a feature which is turned off.  Conflicting settings will cause an error</div><div class='add'>+message to be emitted by awk.</div><div class='add'>+</div><div class='add'>+setting feature default value</div><div class='add'>+</div><div class='add'>+Changes the default value of setting 'feature' to 'value'.  There are a small</div><div class='add'>+number of settings listed at the top of pnglibconf.h, they are documented in the</div><div class='add'>+source code.  Most of these values have performance implications for the library</div><div class='add'>+but most of them have no visible effect on the API.  Some can also be overridden</div><div class='add'>+from the API.</div><div class='add'>+</div><div class='add'>+C. Configuration using PNG_USR_CONFIG</div><div class='add'>+</div><div class='add'>+If -DPNG_USR_CONFIG is added to the CFLAGS when pnglibconf.h is built the file</div><div class='add'>+pngusr.h will automatically be included before the options in</div><div class='add'>+scripts/pnglibconf.dfa are processed.  pngusr.h should contain only macro</div><div class='add'>+definitions turning features on or off or setting settings.</div><div class='add'>+</div><div class='add'>+Apart from the global setting "everything = off" all the options listed above</div><div class='add'>+can be set using macros in pngusr.h:</div><div class='add'>+</div><div class='add'>+#define PNG_feature_SUPPORTED</div><div class='add'>+</div><div class='add'>+is equivalent to:</div><div class='add'>+</div><div class='add'>+option feature on</div><div class='add'>+</div><div class='add'>+#define PNG_NO_feature</div><div class='add'>+</div><div class='add'>+is equivalent to:</div><div class='add'>+</div><div class='add'>+option feature off</div><div class='add'>+</div><div class='add'>+#define PNG_feature value</div><div class='add'>+</div><div class='add'>+is equivalent to:</div><div class='add'>+</div><div class='add'>+setting feature default value</div><div class='add'>+</div><div class='add'>+Notice that in both cases, pngusr.dfa and pngusr.h, the contents of the</div><div class='add'>+pngusr file you supply override the contents of scripts/pnglibconf.dfa</div><div class='add'>+</div><div class='add'>+If confusing or incomprehensible behavior results it is possible to</div><div class='add'>+examine the intermediate file pnglibconf.dfn to find the full set of</div><div class='add'>+dependency information for each setting and option.  Simply locate the</div><div class='add'>+feature in the file and read the C comments that precede it.</div><div class='add'>+</div><div class='ctx'> .SH III. Reading</div><div class='ctx'> </div><div class='ctx'> We'll now walk you through the possible functions to call when reading</div><div class='hunk'>@@ -939,13 +1228,15 @@ Customizing libpng.</div><div class='ctx'>     FILE *fp = fopen(file_name, "rb");</div><div class='ctx'>     if (!fp)</div><div class='ctx'>     {</div><div class='del'>-        return (ERROR);</div><div class='add'>+       return (ERROR);</div><div class='ctx'>     }</div><div class='add'>+</div><div class='ctx'>     fread(header, 1, number, fp);</div><div class='ctx'>     is_png = !png_sig_cmp(header, 0, number);</div><div class='add'>+</div><div class='ctx'>     if (!is_png)</div><div class='ctx'>     {</div><div class='del'>-        return (NOT_PNG);</div><div class='add'>+       return (NOT_PNG);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -961,29 +1252,32 @@ The structure allocation functions quietly return NULL if they fail to</div><div class='ctx'> create the structure, so your application should check for that.</div><div class='ctx'> </div><div class='ctx'>     png_structp png_ptr = png_create_read_struct</div><div class='del'>-       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,</div><div class='add'>+        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,</div><div class='ctx'>         user_error_fn, user_warning_fn);</div><div class='add'>+</div><div class='ctx'>     if (!png_ptr)</div><div class='del'>-        return (ERROR);</div><div class='add'>+       return (ERROR);</div><div class='ctx'> </div><div class='ctx'>     png_infop info_ptr = png_create_info_struct(png_ptr);</div><div class='add'>+</div><div class='ctx'>     if (!info_ptr)</div><div class='ctx'>     {</div><div class='del'>-        png_destroy_read_struct(&amp;png_ptr,</div><div class='add'>+       png_destroy_read_struct(&amp;png_ptr,</div><div class='ctx'>            (png_infopp)NULL, (png_infopp)NULL);</div><div class='del'>-        return (ERROR);</div><div class='add'>+       return (ERROR);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     png_infop end_info = png_create_info_struct(png_ptr);</div><div class='add'>+</div><div class='ctx'>     if (!end_info)</div><div class='ctx'>     {</div><div class='del'>-        png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='add'>+       png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='ctx'>           (png_infopp)NULL);</div><div class='del'>-        return (ERROR);</div><div class='add'>+       return (ERROR);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'> If you want to use your own memory allocation routines,</div><div class='del'>-define PNG_USER_MEM_SUPPORTED and use</div><div class='add'>+use a libpng that was built with PNG_USER_MEM_SUPPORTED defined, and use</div><div class='ctx'> png_create_read_struct_2() instead of png_create_read_struct():</div><div class='ctx'> </div><div class='ctx'>     png_structp png_ptr = png_create_read_struct_2</div><div class='hunk'>@@ -1011,16 +1305,20 @@ free any memory.</div><div class='ctx'> </div><div class='ctx'>     if (setjmp(png_jmpbuf(png_ptr)))</div><div class='ctx'>     {</div><div class='del'>-        png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='add'>+       png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='ctx'>            &amp;end_info);</div><div class='del'>-        fclose(fp);</div><div class='del'>-        return (ERROR);</div><div class='add'>+       fclose(fp);</div><div class='add'>+       return (ERROR);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'> If you would rather avoid the complexity of setjmp/longjmp issues,</div><div class='del'>-you can compile libpng with PNG_SETJMP_NOT_SUPPORTED, in which case</div><div class='add'>+you can compile libpng with PNG_NO_SETJMP, in which case</div><div class='ctx'> errors will result in a call to PNG_ABORT() which defaults to abort().</div><div class='ctx'> </div><div class='add'>+You can #define PNG_ABORT() to a function that does something</div><div class='add'>+more useful than abort(), as long as your function does not</div><div class='add'>+return.</div><div class='add'>+</div><div class='ctx'> Now you need to set up the input code.  The default for libpng is to</div><div class='ctx'> use the C function fread().  If you use this, you will need to pass a</div><div class='ctx'> valid FILE * in the function png_init_io().  Be sure that the file is</div><div class='hunk'>@@ -1037,12 +1335,46 @@ libpng know that there are some bytes missing from the start of the file.</div><div class='ctx'> </div><div class='ctx'>     png_set_sig_bytes(png_ptr, number);</div><div class='ctx'> </div><div class='add'>+You can change the zlib compression buffer size to be used while</div><div class='add'>+reading compressed data with</div><div class='add'>+</div><div class='add'>+    png_set_compression_buffer_size(png_ptr, buffer_size);</div><div class='add'>+</div><div class='add'>+where the default size is 8192 bytes.  Note that the buffer size</div><div class='add'>+is changed immediately and the buffer is reallocated immediately,</div><div class='add'>+instead of setting a flag to be acted upon later.</div><div class='add'>+</div><div class='add'>+If you want CRC errors to be handled in a different manner than</div><div class='add'>+the default, use</div><div class='add'>+</div><div class='add'>+    png_set_crc_action(png_ptr, crit_action, ancil_action);</div><div class='add'>+</div><div class='add'>+The values for png_set_crc_action() say how libpng is to handle CRC errors in</div><div class='add'>+ancillary and critical chunks, and whether to use the data contained</div><div class='add'>+therein.  Note that it is impossible to "discard" data in a critical</div><div class='add'>+chunk.</div><div class='add'>+</div><div class='add'>+Choices for (int) crit_action are</div><div class='add'>+   PNG_CRC_DEFAULT      0  error/quit</div><div class='add'>+   PNG_CRC_ERROR_QUIT   1  error/quit</div><div class='add'>+   PNG_CRC_WARN_USE     3  warn/use data</div><div class='add'>+   PNG_CRC_QUIET_USE    4  quiet/use data</div><div class='add'>+   PNG_CRC_NO_CHANGE    5  use the current value</div><div class='add'>+</div><div class='add'>+Choices for (int) ancil_action are</div><div class='add'>+   PNG_CRC_DEFAULT      0  error/quit</div><div class='add'>+   PNG_CRC_ERROR_QUIT   1  error/quit</div><div class='add'>+   PNG_CRC_WARN_DISCARD 2  warn/discard data</div><div class='add'>+   PNG_CRC_WARN_USE     3  warn/use data</div><div class='add'>+   PNG_CRC_QUIET_USE    4  quiet/use data</div><div class='add'>+   PNG_CRC_NO_CHANGE    5  use the current value</div><div class='add'>+</div><div class='ctx'> .SS Setting up callback code</div><div class='ctx'> </div><div class='ctx'> You can set up a callback function to handle any unknown chunks in the</div><div class='ctx'> input stream. You must supply the function</div><div class='ctx'> </div><div class='del'>-    read_chunk_callback(png_ptr ptr,</div><div class='add'>+    read_chunk_callback(png_structp png_ptr,</div><div class='ctx'>          png_unknown_chunkp chunk);</div><div class='ctx'>     {</div><div class='ctx'>        /* The unknown chunk structure contains your</div><div class='hunk'>@@ -1088,8 +1420,8 @@ called after each row has been read, which you can use to control</div><div class='ctx'> a progress meter or the like.  It's demonstrated in pngtest.c.</div><div class='ctx'> You must supply a function</div><div class='ctx'> </div><div class='del'>-    void read_row_callback(png_ptr ptr, png_uint_32 row,</div><div class='del'>-       int pass);</div><div class='add'>+    void read_row_callback(png_structp png_ptr,</div><div class='add'>+       png_uint_32 row, int pass);</div><div class='ctx'>     {</div><div class='ctx'>       /* put your code here */</div><div class='ctx'>     }</div><div class='hunk'>@@ -1115,14 +1447,17 @@ chunk types. To change this, you can call:</div><div class='ctx'>                  1: ignore; do not keep</div><div class='ctx'>                  2: keep only if safe-to-copy</div><div class='ctx'>                  3: keep even if unsafe-to-copy</div><div class='add'>+</div><div class='ctx'>                You can use these definitions:</div><div class='ctx'>                  PNG_HANDLE_CHUNK_AS_DEFAULT   0</div><div class='ctx'>                  PNG_HANDLE_CHUNK_NEVER        1</div><div class='ctx'>                  PNG_HANDLE_CHUNK_IF_SAFE      2</div><div class='ctx'>                  PNG_HANDLE_CHUNK_ALWAYS       3</div><div class='add'>+</div><div class='ctx'>     chunk_list - list of chunks affected (a byte string,</div><div class='ctx'>                  five bytes per chunk, NULL or '\0' if</div><div class='ctx'>                  num_chunks is 0)</div><div class='add'>+</div><div class='ctx'>     num_chunks - number of chunks affected; if 0, all</div><div class='ctx'>                  unknown chunks are affected.  If nonzero,</div><div class='ctx'>                  only the chunks in the list are affected</div><div class='hunk'>@@ -1158,8 +1493,10 @@ callback function:</div><div class='ctx'>     #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)</div><div class='ctx'>       /* ignore all unknown chunks: */</div><div class='ctx'>       png_set_keep_unknown_chunks(read_ptr, 1, NULL, 0);</div><div class='add'>+</div><div class='ctx'>       /* except for vpAg: */</div><div class='ctx'>       png_set_keep_unknown_chunks(read_ptr, 2, vpAg, 1);</div><div class='add'>+</div><div class='ctx'>       /* also ignore unused known chunks: */</div><div class='ctx'>       png_set_keep_unknown_chunks(read_ptr, 1, unused_chunks,</div><div class='ctx'>          (int)sizeof(unused_chunks)/5);</div><div class='hunk'>@@ -1200,6 +1537,18 @@ where 0x7fffffffL means unlimited.  You can retrieve this limit with</div><div class='ctx'> This limit also applies to the number of buffers that can be allocated</div><div class='ctx'> by png_decompress_chunk() while decompressing iTXt, zTXt, and iCCP chunks.</div><div class='ctx'> </div><div class='add'>+You can also set a limit on the amount of memory that a compressed chunk</div><div class='add'>+other than IDAT can occupy, with</div><div class='add'>+</div><div class='add'>+   png_set_chunk_malloc_max(png_ptr, user_chunk_malloc_max);</div><div class='add'>+</div><div class='add'>+and you can retrieve the limit with</div><div class='add'>+</div><div class='add'>+   chunk_malloc_max = png_get_chunk_malloc_max(png_ptr);</div><div class='add'>+</div><div class='add'>+Any chunks that would cause either of these limits to be exceeded will</div><div class='add'>+be ignored.</div><div class='add'>+</div><div class='ctx'> .SS The high-level read interface</div><div class='ctx'> </div><div class='ctx'> At this point there are two ways to proceed; through the high-level</div><div class='hunk'>@@ -1231,7 +1580,7 @@ you want to do are limited to the following set:</div><div class='ctx'>                                 to RGB (or GA to RGBA)</div><div class='ctx'> </div><div class='ctx'> (This excludes setting a background color, doing gamma transformation,</div><div class='del'>-dithering, and setting filler.)  If this is the case, simply do this:</div><div class='add'>+quantizing, and setting filler.)  If this is the case, simply do this:</div><div class='ctx'> </div><div class='ctx'>     png_read_png(png_ptr, info_ptr, png_transforms, NULL)</div><div class='ctx'> </div><div class='hunk'>@@ -1260,17 +1609,22 @@ row_pointers prior to calling png_read_png() with</div><div class='ctx'> </div><div class='ctx'>    if (height &gt; PNG_UINT_32_MAX/png_sizeof(png_byte))</div><div class='ctx'>       png_error (png_ptr,</div><div class='del'>-         "Image is too tall to process in memory");</div><div class='add'>+          "Image is too tall to process in memory");</div><div class='add'>+</div><div class='ctx'>    if (width &gt; PNG_UINT_32_MAX/pixel_size)</div><div class='ctx'>       png_error (png_ptr,</div><div class='del'>-         "Image is too wide to process in memory");</div><div class='add'>+          "Image is too wide to process in memory");</div><div class='add'>+</div><div class='ctx'>    row_pointers = png_malloc(png_ptr,</div><div class='del'>-      height*png_sizeof(png_bytep));</div><div class='add'>+       height*png_sizeof(png_bytep));</div><div class='add'>+</div><div class='ctx'>    for (int i=0; i&lt;height, i++)</div><div class='ctx'>       row_pointers[i]=NULL;  /* security precaution */</div><div class='add'>+</div><div class='ctx'>    for (int i=0; i&lt;height, i++)</div><div class='ctx'>       row_pointers[i]=png_malloc(png_ptr,</div><div class='del'>-         width*pixel_size);</div><div class='add'>+          width*pixel_size);</div><div class='add'>+</div><div class='ctx'>    png_set_rows(png_ptr, info_ptr, &amp;row_pointers);</div><div class='ctx'> </div><div class='ctx'> Alternatively you could allocate your image in one big block and define</div><div class='hunk'>@@ -1280,7 +1634,7 @@ If you use png_set_rows(), the application is responsible for freeing</div><div class='ctx'> row_pointers (and row_pointers[i], if they were separately allocated).</div><div class='ctx'> </div><div class='ctx'> If you don't allocate row_pointers ahead of time, png_read_png() will</div><div class='del'>-do it, and it'll be free'ed when you call png_destroy_*().</div><div class='add'>+do it, and it'll be free'ed by libpng when you call png_destroy_*().</div><div class='ctx'> </div><div class='ctx'> .SS The low-level read interface</div><div class='ctx'> </div><div class='hunk'>@@ -1304,13 +1658,16 @@ in until png_read_end() has read the chunk data following the image.</div><div class='ctx'> </div><div class='ctx'>     width          - holds the width of the image</div><div class='ctx'>                      in pixels (up to 2^31).</div><div class='add'>+</div><div class='ctx'>     height         - holds the height of the image</div><div class='ctx'>                      in pixels (up to 2^31).</div><div class='add'>+</div><div class='ctx'>     bit_depth      - holds the bit depth of one of the</div><div class='ctx'>                      image channels.  (valid values are</div><div class='ctx'>                      1, 2, 4, 8, 16 and depend also on</div><div class='ctx'>                      the color_type.  See also</div><div class='ctx'>                      significant bits (sBIT) below).</div><div class='add'>+</div><div class='ctx'>     color_type     - describes which color/alpha channels</div><div class='ctx'>                          are present.</div><div class='ctx'>                      PNG_COLOR_TYPE_GRAY</div><div class='hunk'>@@ -1328,15 +1685,17 @@ in until png_read_end() has read the chunk data following the image.</div><div class='ctx'>                      PNG_COLOR_MASK_COLOR</div><div class='ctx'>                      PNG_COLOR_MASK_ALPHA</div><div class='ctx'> </div><div class='add'>+    interlace_type - (PNG_INTERLACE_NONE or</div><div class='add'>+                     PNG_INTERLACE_ADAM7)</div><div class='add'>+</div><div class='add'>+    compression_type - (must be PNG_COMPRESSION_TYPE_BASE</div><div class='add'>+                     for PNG 1.0)</div><div class='add'>+</div><div class='ctx'>     filter_method  - (must be PNG_FILTER_TYPE_BASE</div><div class='ctx'>                      for PNG 1.0, and can also be</div><div class='ctx'>                      PNG_INTRAPIXEL_DIFFERENCING if</div><div class='ctx'>                      the PNG datastream is embedded in</div><div class='ctx'>                      a MNG-1.0 datastream)</div><div class='del'>-    compression_type - (must be PNG_COMPRESSION_TYPE_BASE</div><div class='del'>-                     for PNG 1.0)</div><div class='del'>-    interlace_type - (PNG_INTERLACE_NONE or</div><div class='del'>-                     PNG_INTERLACE_ADAM7)</div><div class='ctx'> </div><div class='ctx'>     Any or all of interlace_type, compression_type, or</div><div class='ctx'>     filter_method can be NULL if you are</div><div class='hunk'>@@ -1351,28 +1710,38 @@ in until png_read_end() has read the chunk data following the image.</div><div class='ctx'> </div><div class='ctx'>     width            = png_get_image_width(png_ptr,</div><div class='ctx'>                          info_ptr);</div><div class='add'>+</div><div class='ctx'>     height           = png_get_image_height(png_ptr,</div><div class='ctx'>                          info_ptr);</div><div class='add'>+</div><div class='ctx'>     bit_depth        = png_get_bit_depth(png_ptr,</div><div class='ctx'>                          info_ptr);</div><div class='add'>+</div><div class='ctx'>     color_type       = png_get_color_type(png_ptr,</div><div class='ctx'>                          info_ptr);</div><div class='del'>-    filter_method    = png_get_filter_type(png_ptr,</div><div class='add'>+</div><div class='add'>+    interlace_type   = png_get_interlace_type(png_ptr,</div><div class='ctx'>                          info_ptr);</div><div class='add'>+</div><div class='ctx'>     compression_type = png_get_compression_type(png_ptr,</div><div class='ctx'>                          info_ptr);</div><div class='del'>-    interlace_type   = png_get_interlace_type(png_ptr,</div><div class='add'>+</div><div class='add'>+    filter_method    = png_get_filter_type(png_ptr,</div><div class='ctx'>                          info_ptr);</div><div class='ctx'> </div><div class='ctx'>     channels = png_get_channels(png_ptr, info_ptr);</div><div class='add'>+</div><div class='ctx'>     channels       - number of channels of info for the</div><div class='ctx'>                      color type (valid values are 1 (GRAY,</div><div class='ctx'>                      PALETTE), 2 (GRAY_ALPHA), 3 (RGB),</div><div class='ctx'>                      4 (RGB_ALPHA or RGB + filler byte))</div><div class='add'>+</div><div class='ctx'>     rowbytes = png_get_rowbytes(png_ptr, info_ptr);</div><div class='add'>+</div><div class='ctx'>     rowbytes       - number of bytes needed to hold a row</div><div class='ctx'> </div><div class='ctx'>     signature = png_get_signature(png_ptr, info_ptr);</div><div class='add'>+</div><div class='ctx'>     signature      - holds the signature read from the</div><div class='ctx'>                      file (if any).  The data is kept in</div><div class='ctx'>                      the same offset it would be if the</div><div class='hunk'>@@ -1392,16 +1761,24 @@ pointer into the info_ptr is returned for any complex types.</div><div class='ctx'> </div><div class='ctx'>     png_get_PLTE(png_ptr, info_ptr, &amp;palette,</div><div class='ctx'>                      &amp;num_palette);</div><div class='add'>+</div><div class='ctx'>     palette        - the palette for the file</div><div class='ctx'>                      (array of png_color)</div><div class='add'>+</div><div class='ctx'>     num_palette    - number of entries in the palette</div><div class='ctx'> </div><div class='del'>-    png_get_gAMA(png_ptr, info_ptr, &amp;gamma);</div><div class='del'>-    gamma          - the gamma the file is written</div><div class='del'>-                     at (PNG_INFO_gAMA)</div><div class='add'>+    png_get_gAMA(png_ptr, info_ptr, &amp;file_gamma);</div><div class='add'>+    png_get_gAMA_fixed(png_ptr, info_ptr, &amp;int_file_gamma);</div><div class='add'>+</div><div class='add'>+    file_gamma     - the gamma at which the file is</div><div class='add'>+                     written (PNG_INFO_gAMA)</div><div class='add'>+</div><div class='add'>+    int_file_gamma - 100,000 times the gamma at which the</div><div class='add'>+                     file is written</div><div class='ctx'> </div><div class='ctx'>     png_get_sRGB(png_ptr, info_ptr, &amp;srgb_intent);</div><div class='del'>-    srgb_intent    - the rendering intent (PNG_INFO_sRGB)</div><div class='add'>+</div><div class='add'>+    file_srgb_intent - the rendering intent (PNG_INFO_sRGB)</div><div class='ctx'>                      The presence of the sRGB chunk</div><div class='ctx'>                      means that the pixel data is in the</div><div class='ctx'>                      sRGB color space.  This chunk also</div><div class='hunk'>@@ -1410,16 +1787,21 @@ pointer into the info_ptr is returned for any complex types.</div><div class='ctx'> </div><div class='ctx'>     png_get_iCCP(png_ptr, info_ptr, &amp;name,</div><div class='ctx'>        &amp;compression_type, &amp;profile, &amp;proflen);</div><div class='del'>-    name            - The profile name.</div><div class='del'>-    compression     - The compression type; always</div><div class='del'>-                      PNG_COMPRESSION_TYPE_BASE for PNG 1.0.</div><div class='del'>-                      You may give NULL to this argument to</div><div class='del'>-                      ignore it.</div><div class='del'>-    profile         - International Color Consortium color</div><div class='del'>-                      profile data. May contain NULs.</div><div class='del'>-    proflen         - length of profile data in bytes.</div><div class='add'>+</div><div class='add'>+    name             - The profile name.</div><div class='add'>+</div><div class='add'>+    compression_type - The compression type; always</div><div class='add'>+                       PNG_COMPRESSION_TYPE_BASE for PNG 1.0.</div><div class='add'>+                       You may give NULL to this argument to</div><div class='add'>+                       ignore it.</div><div class='add'>+</div><div class='add'>+    profile          - International Color Consortium color</div><div class='add'>+                       profile data. May contain NULs.</div><div class='add'>+</div><div class='add'>+    proflen          - length of profile data in bytes.</div><div class='ctx'> </div><div class='ctx'>     png_get_sBIT(png_ptr, info_ptr, &amp;sig_bit);</div><div class='add'>+</div><div class='ctx'>     sig_bit        - the number of significant bits for</div><div class='ctx'>                      (PNG_INFO_sBIT) each of the gray,</div><div class='ctx'>                      red, green, and blue channels,</div><div class='hunk'>@@ -1428,50 +1810,66 @@ pointer into the info_ptr is returned for any complex types.</div><div class='ctx'> </div><div class='ctx'>     png_get_tRNS(png_ptr, info_ptr, &amp;trans_alpha,</div><div class='ctx'>                      &amp;num_trans, &amp;trans_color);</div><div class='add'>+</div><div class='ctx'>     trans_alpha    - array of alpha (transparency)</div><div class='ctx'>                      entries for palette (PNG_INFO_tRNS)</div><div class='add'>+</div><div class='add'>+    num_trans      - number of transparent entries</div><div class='add'>+                     (PNG_INFO_tRNS)</div><div class='add'>+</div><div class='ctx'>     trans_color    - graylevel or color sample values of</div><div class='ctx'>                      the single transparent color for</div><div class='ctx'>                      non-paletted images (PNG_INFO_tRNS)</div><div class='del'>-    num_trans      - number of transparent entries</div><div class='del'>-                     (PNG_INFO_tRNS)</div><div class='ctx'> </div><div class='ctx'>     png_get_hIST(png_ptr, info_ptr, &amp;hist);</div><div class='ctx'>                      (PNG_INFO_hIST)</div><div class='add'>+</div><div class='ctx'>     hist           - histogram of palette (array of</div><div class='ctx'>                      png_uint_16)</div><div class='ctx'> </div><div class='ctx'>     png_get_tIME(png_ptr, info_ptr, &amp;mod_time);</div><div class='add'>+</div><div class='ctx'>     mod_time       - time image was last modified</div><div class='ctx'>                     (PNG_VALID_tIME)</div><div class='ctx'> </div><div class='ctx'>     png_get_bKGD(png_ptr, info_ptr, &amp;background);</div><div class='add'>+</div><div class='ctx'>     background     - background color (PNG_VALID_bKGD)</div><div class='ctx'>                      valid 16-bit red, green and blue</div><div class='ctx'>                      values, regardless of color_type</div><div class='ctx'> </div><div class='ctx'>     num_comments   = png_get_text(png_ptr, info_ptr,</div><div class='ctx'>                      &amp;text_ptr, &amp;num_text);</div><div class='add'>+</div><div class='ctx'>     num_comments   - number of comments</div><div class='add'>+</div><div class='ctx'>     text_ptr       - array of png_text holding image</div><div class='ctx'>                      comments</div><div class='add'>+</div><div class='ctx'>     text_ptr[i].compression - type of compression used</div><div class='ctx'>                  on "text" PNG_TEXT_COMPRESSION_NONE</div><div class='ctx'>                            PNG_TEXT_COMPRESSION_zTXt</div><div class='ctx'>                            PNG_ITXT_COMPRESSION_NONE</div><div class='ctx'>                            PNG_ITXT_COMPRESSION_zTXt</div><div class='add'>+</div><div class='ctx'>     text_ptr[i].key   - keyword for comment.  Must contain</div><div class='ctx'>                          1-79 characters.</div><div class='add'>+</div><div class='ctx'>     text_ptr[i].text  - text comments for current</div><div class='ctx'>                          keyword.  Can be empty.</div><div class='add'>+</div><div class='ctx'>     text_ptr[i].text_length - length of text string,</div><div class='ctx'>                  after decompression, 0 for iTXt</div><div class='add'>+</div><div class='ctx'>     text_ptr[i].itxt_length - length of itxt string,</div><div class='ctx'>                  after decompression, 0 for tEXt/zTXt</div><div class='add'>+</div><div class='ctx'>     text_ptr[i].lang  - language of comment (empty</div><div class='ctx'>                          string for unknown).</div><div class='add'>+</div><div class='ctx'>     text_ptr[i].lang_key  - keyword in UTF-8</div><div class='ctx'>                          (empty string for unknown).</div><div class='add'>+</div><div class='ctx'>     Note that the itxt_length, lang, and lang_key</div><div class='ctx'>     members of the text_ptr structure only exist</div><div class='ctx'>     when the library is built with iTXt chunk support.</div><div class='hunk'>@@ -1479,6 +1877,7 @@ pointer into the info_ptr is returned for any complex types.</div><div class='ctx'>     num_text       - number of comments (same as</div><div class='ctx'>                      num_comments; you can put NULL here</div><div class='ctx'>                      to avoid the duplication)</div><div class='add'>+</div><div class='ctx'>     Note while png_set_text() will accept text, language,</div><div class='ctx'>     and translated keywords that can be NULL pointers, the</div><div class='ctx'>     structure returned by png_get_text will always contain</div><div class='hunk'>@@ -1487,49 +1886,68 @@ pointer into the info_ptr is returned for any complex types.</div><div class='ctx'> </div><div class='ctx'>     num_spalettes = png_get_sPLT(png_ptr, info_ptr,</div><div class='ctx'>        &amp;palette_ptr);</div><div class='add'>+</div><div class='add'>+    num_spalettes  - number of sPLT chunks read.</div><div class='add'>+</div><div class='ctx'>     palette_ptr    - array of palette structures holding</div><div class='ctx'>                      contents of one or more sPLT chunks</div><div class='ctx'>                      read.</div><div class='del'>-    num_spalettes  - number of sPLT chunks read.</div><div class='ctx'> </div><div class='ctx'>     png_get_oFFs(png_ptr, info_ptr, &amp;offset_x, &amp;offset_y,</div><div class='ctx'>        &amp;unit_type);</div><div class='add'>+</div><div class='ctx'>     offset_x       - positive offset from the left edge</div><div class='ctx'>                      of the screen</div><div class='add'>+</div><div class='ctx'>     offset_y       - positive offset from the top edge</div><div class='ctx'>                      of the screen</div><div class='add'>+</div><div class='ctx'>     unit_type      - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER</div><div class='ctx'> </div><div class='ctx'>     png_get_pHYs(png_ptr, info_ptr, &amp;res_x, &amp;res_y,</div><div class='ctx'>        &amp;unit_type);</div><div class='add'>+</div><div class='ctx'>     res_x          - pixels/unit physical resolution in</div><div class='ctx'>                      x direction</div><div class='add'>+</div><div class='ctx'>     res_y          - pixels/unit physical resolution in</div><div class='ctx'>                      x direction</div><div class='add'>+</div><div class='ctx'>     unit_type      - PNG_RESOLUTION_UNKNOWN,</div><div class='ctx'>                      PNG_RESOLUTION_METER</div><div class='ctx'> </div><div class='ctx'>     png_get_sCAL(png_ptr, info_ptr, &amp;unit, &amp;width,</div><div class='ctx'>        &amp;height)</div><div class='add'>+</div><div class='ctx'>     unit        - physical scale units (an integer)</div><div class='add'>+</div><div class='ctx'>     width       - width of a pixel in physical scale units</div><div class='add'>+</div><div class='ctx'>     height      - height of a pixel in physical scale units</div><div class='ctx'>                  (width and height are doubles)</div><div class='ctx'> </div><div class='ctx'>     png_get_sCAL_s(png_ptr, info_ptr, &amp;unit, &amp;width,</div><div class='ctx'>        &amp;height)</div><div class='add'>+</div><div class='ctx'>     unit        - physical scale units (an integer)</div><div class='add'>+</div><div class='ctx'>     width       - width of a pixel in physical scale units</div><div class='add'>+</div><div class='ctx'>     height      - height of a pixel in physical scale units</div><div class='ctx'>                  (width and height are strings like "2.54")</div><div class='ctx'> </div><div class='ctx'>     num_unknown_chunks = png_get_unknown_chunks(png_ptr,</div><div class='ctx'>        info_ptr, &amp;unknowns)</div><div class='add'>+</div><div class='ctx'>     unknowns          - array of png_unknown_chunk</div><div class='ctx'>                         structures holding unknown chunks</div><div class='add'>+</div><div class='ctx'>     unknowns[i].name  - name of unknown chunk</div><div class='add'>+</div><div class='ctx'>     unknowns[i].data  - data of unknown chunk</div><div class='add'>+</div><div class='ctx'>     unknowns[i].size  - size of unknown chunk's data</div><div class='add'>+</div><div class='ctx'>     unknowns[i].location - position of chunk in file</div><div class='ctx'> </div><div class='ctx'>     The value of "i" corresponds to the order in which the</div><div class='hunk'>@@ -1541,34 +1959,55 @@ forms:</div><div class='ctx'> </div><div class='ctx'>     res_x = png_get_x_pixels_per_meter(png_ptr,</div><div class='ctx'>        info_ptr)</div><div class='add'>+</div><div class='ctx'>     res_y = png_get_y_pixels_per_meter(png_ptr,</div><div class='ctx'>        info_ptr)</div><div class='add'>+</div><div class='ctx'>     res_x_and_y = png_get_pixels_per_meter(png_ptr,</div><div class='ctx'>        info_ptr)</div><div class='add'>+</div><div class='ctx'>     res_x = png_get_x_pixels_per_inch(png_ptr,</div><div class='ctx'>        info_ptr)</div><div class='add'>+</div><div class='ctx'>     res_y = png_get_y_pixels_per_inch(png_ptr,</div><div class='ctx'>        info_ptr)</div><div class='add'>+</div><div class='ctx'>     res_x_and_y = png_get_pixels_per_inch(png_ptr,</div><div class='ctx'>        info_ptr)</div><div class='add'>+</div><div class='ctx'>     aspect_ratio = png_get_pixel_aspect_ratio(png_ptr,</div><div class='ctx'>        info_ptr)</div><div class='ctx'> </div><div class='del'>-   (Each of these returns 0 [signifying "unknown"] if</div><div class='add'>+    Each of these returns 0 [signifying "unknown"] if</div><div class='ctx'>        the data is not present or if res_x is 0;</div><div class='del'>-       res_x_and_y is 0 if res_x != res_y)</div><div class='add'>+       res_x_and_y is 0 if res_x != res_y</div><div class='add'>+</div><div class='add'>+    Note that because of the way the resolutions are</div><div class='add'>+       stored internally, the inch conversions won't</div><div class='add'>+       come out to exactly even number.  For example,</div><div class='add'>+       72 dpi is stored as 0.28346 pixels/meter, and</div><div class='add'>+       when this is retrieved it is 71.9988 dpi, so</div><div class='add'>+       be sure to round the returned value appropriately</div><div class='add'>+       if you want to display a reasonable-looking result. </div><div class='ctx'> </div><div class='ctx'> The data from the oFFs chunk can be retrieved in several convenient</div><div class='ctx'> forms:</div><div class='ctx'> </div><div class='ctx'>     x_offset = png_get_x_offset_microns(png_ptr, info_ptr);</div><div class='add'>+</div><div class='ctx'>     y_offset = png_get_y_offset_microns(png_ptr, info_ptr);</div><div class='add'>+</div><div class='ctx'>     x_offset = png_get_x_offset_inches(png_ptr, info_ptr);</div><div class='add'>+</div><div class='ctx'>     y_offset = png_get_y_offset_inches(png_ptr, info_ptr);</div><div class='ctx'> </div><div class='del'>-   (Each of these returns 0 [signifying "unknown" if both</div><div class='add'>+    Each of these returns 0 [signifying "unknown" if both</div><div class='ctx'>        x and y are 0] if the data is not present or if the</div><div class='del'>-       chunk is present but the unit is the pixel)</div><div class='add'>+       chunk is present but the unit is the pixel.  The</div><div class='add'>+       remark about inexact inch conversions applies here</div><div class='add'>+       as well, because a value in inches can't always be</div><div class='add'>+       converted to microns and back without some loss</div><div class='add'>+       of precision.</div><div class='ctx'> </div><div class='ctx'> For more information, see the png_info definition in png.h and the</div><div class='ctx'> PNG specification for chunk contents.  Be careful with trusting</div><div class='hunk'>@@ -1655,7 +2094,7 @@ things.</div><div class='ctx'> As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was</div><div class='ctx'> added.  It expands the sample depth without changing tRNS to alpha.</div><div class='ctx'> </div><div class='del'>-As of libpng version 1.4.0, not all possible expansions are supported.</div><div class='add'>+As of libpng version 1.5.1, not all possible expansions are supported.</div><div class='ctx'> </div><div class='ctx'> In the following table, the 01 means grayscale with depth&lt;8, 31 means</div><div class='ctx'> indexed with depth&lt;8, other numerals represent the color type, "T" means</div><div class='hunk'>@@ -1696,7 +2135,7 @@ PNG can have files with 16 bits per channel.  If you only can handle</div><div class='ctx'> 8 bits per channel, this will strip the pixels down to 8 bit.</div><div class='ctx'> </div><div class='ctx'>     if (bit_depth == 16)</div><div class='del'>-        png_set_strip_16(png_ptr);</div><div class='add'>+       png_set_strip_16(png_ptr);</div><div class='ctx'> </div><div class='ctx'> If, for some reason, you don't need the alpha channel on an image,</div><div class='ctx'> and you want to remove it rather than combining it with the background</div><div class='hunk'>@@ -1704,7 +2143,7 @@ and you want to remove it rather than combining it with the background</div><div class='ctx'> it with the background, so that's what you should probably do):</div><div class='ctx'> </div><div class='ctx'>     if (color_type &amp; PNG_COLOR_MASK_ALPHA)</div><div class='del'>-        png_set_strip_alpha(png_ptr);</div><div class='add'>+       png_set_strip_alpha(png_ptr);</div><div class='ctx'> </div><div class='ctx'> In PNG files, the alpha channel in an image</div><div class='ctx'> is the level of opacity.  If you need the alpha channel in an image to</div><div class='hunk'>@@ -1721,7 +2160,7 @@ files.  This code expands to 1 pixel per byte without changing the</div><div class='ctx'> values of the pixels:</div><div class='ctx'> </div><div class='ctx'>     if (bit_depth &lt; 8)</div><div class='del'>-        png_set_packing(png_ptr);</div><div class='add'>+       png_set_packing(png_ptr);</div><div class='ctx'> </div><div class='ctx'> PNG files have possible bit depths of 1, 2, 4, 8, and 16.  All pixels</div><div class='ctx'> stored in a PNG image have been "scaled" or "shifted" up to the next</div><div class='hunk'>@@ -1733,20 +2172,20 @@ image.  This call reduces the pixels back down to the original bit depth:</div><div class='ctx'>     png_color_8p sig_bit;</div><div class='ctx'> </div><div class='ctx'>     if (png_get_sBIT(png_ptr, info_ptr, &amp;sig_bit))</div><div class='del'>-        png_set_shift(png_ptr, sig_bit);</div><div class='add'>+       png_set_shift(png_ptr, sig_bit);</div><div class='ctx'> </div><div class='ctx'> PNG files store 3-color pixels in red, green, blue order.  This code</div><div class='ctx'> changes the storage of the pixels to blue, green, red:</div><div class='ctx'> </div><div class='ctx'>     if (color_type == PNG_COLOR_TYPE_RGB ||</div><div class='ctx'>         color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='del'>-        png_set_bgr(png_ptr);</div><div class='add'>+       png_set_bgr(png_ptr);</div><div class='ctx'> </div><div class='ctx'> PNG files store RGB pixels packed into 3 or 6 bytes. This code expands them</div><div class='ctx'> into 4 or 8 bytes for windowing systems that need them in this format:</div><div class='ctx'> </div><div class='ctx'>     if (color_type == PNG_COLOR_TYPE_RGB)</div><div class='del'>-        png_set_filler(png_ptr, filler, PNG_FILLER_BEFORE);</div><div class='add'>+       png_set_filler(png_ptr, filler, PNG_FILLER_BEFORE);</div><div class='ctx'> </div><div class='ctx'> where "filler" is the 8 or 16-bit number to fill with, and the location is</div><div class='ctx'> either PNG_FILLER_BEFORE or PNG_FILLER_AFTER, depending upon whether</div><div class='hunk'>@@ -1759,8 +2198,8 @@ Note that png_set_filler() does not change the color type.  If you want</div><div class='ctx'> to do that, you can add a true alpha channel with</div><div class='ctx'> </div><div class='ctx'>     if (color_type == PNG_COLOR_TYPE_RGB ||</div><div class='del'>-           color_type == PNG_COLOR_TYPE_GRAY)</div><div class='del'>-    png_set_add_alpha(png_ptr, filler, PNG_FILLER_AFTER);</div><div class='add'>+       color_type == PNG_COLOR_TYPE_GRAY)</div><div class='add'>+       png_set_add_alpha(png_ptr, filler, PNG_FILLER_AFTER);</div><div class='ctx'> </div><div class='ctx'> where "filler" contains the alpha value to assign to each pixel.</div><div class='ctx'> This function was added in libpng-1.2.7.</div><div class='hunk'>@@ -1769,33 +2208,36 @@ If you are reading an image with an alpha channel, and you need the</div><div class='ctx'> data as ARGB instead of the normal PNG format RGBA:</div><div class='ctx'> </div><div class='ctx'>     if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='del'>-        png_set_swap_alpha(png_ptr);</div><div class='add'>+       png_set_swap_alpha(png_ptr);</div><div class='ctx'> </div><div class='ctx'> For some uses, you may want a grayscale image to be represented as</div><div class='ctx'> RGB.  This code will do that conversion:</div><div class='ctx'> </div><div class='ctx'>     if (color_type == PNG_COLOR_TYPE_GRAY ||</div><div class='ctx'>         color_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='del'>-          png_set_gray_to_rgb(png_ptr);</div><div class='add'>+       png_set_gray_to_rgb(png_ptr);</div><div class='ctx'> </div><div class='ctx'> Conversely, you can convert an RGB or RGBA image to grayscale or grayscale</div><div class='ctx'> with alpha.</div><div class='ctx'> </div><div class='ctx'>     if (color_type == PNG_COLOR_TYPE_RGB ||</div><div class='ctx'>         color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='del'>-          png_set_rgb_to_gray_fixed(png_ptr, error_action,</div><div class='del'>-             int red_weight, int green_weight);</div><div class='add'>+       png_set_rgb_to_gray_fixed(png_ptr, error_action,</div><div class='add'>+           int red_weight, int green_weight);</div><div class='ctx'> </div><div class='ctx'>     error_action = 1: silently do the conversion</div><div class='add'>+</div><div class='ctx'>     error_action = 2: issue a warning if the original</div><div class='ctx'>                       image has any pixel where</div><div class='ctx'>                       red != green or red != blue</div><div class='add'>+</div><div class='ctx'>     error_action = 3: issue an error and abort the</div><div class='ctx'>                       conversion if the original</div><div class='ctx'>                       image has any pixel where</div><div class='ctx'>                       red != green or red != blue</div><div class='ctx'> </div><div class='ctx'>     red_weight:       weight of red component times 100000</div><div class='add'>+</div><div class='ctx'>     green_weight:     weight of green component times 100000</div><div class='ctx'>                       If either weight is negative, default</div><div class='ctx'>                       weights (21268, 71514) are used.</div><div class='hunk'>@@ -1822,16 +2264,12 @@ Copyright (c) 1998-01-04 Charles Poynton &lt;poynton at inforamp.net&gt;</div><div class='ctx'> </div><div class='ctx'>     Y = 0.212671 * R + 0.715160 * G + 0.072169 * B</div><div class='ctx'> </div><div class='del'>-Libpng approximates this with</div><div class='del'>-</div><div class='del'>-    Y = 0.21268 * R    + 0.7151 * G    + 0.07217 * B</div><div class='del'>-</div><div class='del'>-which can be expressed with integers as</div><div class='add'>+Libpng approximates this with integers scaled by 32768:</div><div class='ctx'> </div><div class='del'>-    Y = (6969 * R + 23434 * G + 2365 * B)/32768</div><div class='add'>+    Y = (6968 * R + 23434 * G + 2366 * B)/32768</div><div class='ctx'> </div><div class='ctx'> The calculation is done in a linear colorspace, if the image gamma</div><div class='del'>-is known.</div><div class='add'>+can be determined.</div><div class='ctx'> </div><div class='ctx'> If you have a grayscale and you are using png_set_expand_depth(),</div><div class='ctx'> png_set_expand(), or png_set_gray_to_rgb to change to truecolor or to</div><div class='hunk'>@@ -1846,11 +2284,11 @@ or as an RGB triplet that may or may not be in the palette (need_expand = 0).</div><div class='ctx'>     png_color_16p image_background;</div><div class='ctx'> </div><div class='ctx'>     if (png_get_bKGD(png_ptr, info_ptr, &amp;image_background))</div><div class='del'>-        png_set_background(png_ptr, image_background,</div><div class='del'>-          PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);</div><div class='add'>+       png_set_background(png_ptr, image_background,</div><div class='add'>+           PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);</div><div class='ctx'>     else</div><div class='del'>-        png_set_background(png_ptr, &amp;my_background,</div><div class='del'>-          PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);</div><div class='add'>+       png_set_background(png_ptr, &amp;my_background,</div><div class='add'>+           PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);</div><div class='ctx'> </div><div class='ctx'> The png_set_background() function tells libpng to composite images</div><div class='ctx'> with alpha or simple transparency against the supplied background</div><div class='hunk'>@@ -1883,6 +2321,7 @@ a slightly smaller exponent is better.</div><div class='ctx'>    {</div><div class='ctx'>       screen_gamma = user_defined_screen_gamma;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    /* One way that applications can share the same</div><div class='ctx'>       screen gamma value */</div><div class='ctx'>    else if ((gamma_str = getenv("SCREEN_GAMMA"))</div><div class='hunk'>@@ -1890,18 +2329,22 @@ a slightly smaller exponent is better.</div><div class='ctx'>    {</div><div class='ctx'>       screen_gamma = (double)atof(gamma_str);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    /* If we don't have another value */</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='ctx'>       screen_gamma = 2.2; /* A good guess for a</div><div class='ctx'>            PC monitor in a bright office or a dim room */</div><div class='add'>+</div><div class='ctx'>       screen_gamma = 2.0; /* A good guess for a</div><div class='ctx'>            PC monitor in a dark room */</div><div class='add'>+</div><div class='ctx'>       screen_gamma = 1.7 or 1.0;  /* A good</div><div class='ctx'>            guess for Mac systems */</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-The png_set_gamma() function handles gamma transformations of the data.</div><div class='add'>+The functions png_set_gamma() and its fixed point equivalent</div><div class='add'>+png_set_gamma_fixed() handle gamma transformations of the data.</div><div class='ctx'> Pass both the file gamma and the current screen_gamma.  If the file does</div><div class='ctx'> not have a gamma value, you can pass one anyway if you have an idea what</div><div class='ctx'> it is (usually 0.45455 is a good guess for GIF images on PCs).  Note</div><div class='hunk'>@@ -1910,11 +2353,47 @@ on gamma in the PNG specification for an excellent description of what</div><div class='ctx'> gamma is, and why all applications should support it.  It is strongly</div><div class='ctx'> recommended that PNG viewers support gamma correction.</div><div class='ctx'> </div><div class='del'>-   if (png_get_gAMA(png_ptr, info_ptr, &amp;gamma))</div><div class='del'>-      png_set_gamma(png_ptr, screen_gamma, gamma);</div><div class='add'>+   if (png_get_gAMA(png_ptr, info_ptr, &amp;file_gamma))</div><div class='add'>+      png_set_gamma(png_ptr, screen_gamma, file_gamma);</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       png_set_gamma(png_ptr, screen_gamma, 0.45455);</div><div class='ctx'> </div><div class='add'>+If you need to reduce an RGB file to a paletted file, or if a paletted</div><div class='add'>+file has more entries then will fit on your screen, png_set_quantize()</div><div class='add'>+will do that.  Note that this is a simple match quantization that merely</div><div class='add'>+finds the closest color available.  This should work fairly well with</div><div class='add'>+optimized palettes, but fairly badly with linear color cubes.  If you</div><div class='add'>+pass a palette that is larger then maximum_colors, the file will</div><div class='add'>+reduce the number of colors in the palette so it will fit into</div><div class='add'>+maximum_colors.  If there is a histogram, it will use it to make</div><div class='add'>+more intelligent choices when reducing the palette.  If there is no</div><div class='add'>+histogram, it may not do as good a job.</div><div class='add'>+</div><div class='add'>+   if (color_type &amp; PNG_COLOR_MASK_COLOR)</div><div class='add'>+   {</div><div class='add'>+      if (png_get_valid(png_ptr, info_ptr,</div><div class='add'>+          PNG_INFO_PLTE))</div><div class='add'>+      {</div><div class='add'>+         png_uint_16p histogram = NULL;</div><div class='add'>+</div><div class='add'>+         png_get_hIST(png_ptr, info_ptr,</div><div class='add'>+             &amp;histogram);</div><div class='add'>+         png_set_quantize(png_ptr, palette, num_palette,</div><div class='add'>+            max_screen_colors, histogram, 1);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         png_color std_color_cube[MAX_SCREEN_COLORS] =</div><div class='add'>+            { ... colors ... };</div><div class='add'>+</div><div class='add'>+         png_set_quantize(png_ptr, std_color_cube,</div><div class='add'>+            MAX_SCREEN_COLORS, MAX_SCREEN_COLORS,</div><div class='add'>+            NULL,0);</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='ctx'> PNG files describe monochrome as black being zero and white being one.</div><div class='ctx'> The following code will reverse this (make black be one and white be</div><div class='ctx'> zero):</div><div class='hunk'>@@ -1925,7 +2404,7 @@ zero):</div><div class='ctx'> This function can also be used to invert grayscale and gray-alpha images:</div><div class='ctx'> </div><div class='ctx'>    if (color_type == PNG_COLOR_TYPE_GRAY ||</div><div class='del'>-        color_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='add'>+       color_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='ctx'>       png_set_invert_mono(png_ptr);</div><div class='ctx'> </div><div class='ctx'> PNG files store 16 bit pixels in network byte order (big-endian,</div><div class='hunk'>@@ -1934,7 +2413,7 @@ other way (little-endian, i.e. least significant bits first, the</div><div class='ctx'> way PCs store them):</div><div class='ctx'> </div><div class='ctx'>     if (bit_depth == 16)</div><div class='del'>-        png_set_swap(png_ptr);</div><div class='add'>+       png_set_swap(png_ptr);</div><div class='ctx'> </div><div class='ctx'> If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you</div><div class='ctx'> need to change the order the pixels are packed into bytes, you can use:</div><div class='hunk'>@@ -1947,15 +2426,28 @@ the existing ones meets your needs.  This is done by setting a callback</div><div class='ctx'> with</div><div class='ctx'> </div><div class='ctx'>     png_set_read_user_transform_fn(png_ptr,</div><div class='del'>-       read_transform_fn);</div><div class='add'>+        read_transform_fn);</div><div class='ctx'> </div><div class='ctx'> You must supply the function</div><div class='ctx'> </div><div class='del'>-    void read_transform_fn(png_ptr ptr, row_info_ptr</div><div class='del'>-       row_info, png_bytep data)</div><div class='add'>+    void read_transform_fn(png_structp png_ptr, row_info_ptr</div><div class='add'>+        row_info, png_bytep data)</div><div class='ctx'> </div><div class='ctx'> See pngtest.c for a working example.  Your function will be called</div><div class='del'>-after all of the other transformations have been processed.</div><div class='add'>+after all of the other transformations have been processed.  Take care with</div><div class='add'>+interlaced images if you do the interlace yourself - the width of the row is the</div><div class='add'>+width in 'row_info', not the overall image width.</div><div class='add'>+</div><div class='add'>+If supported libpng provides two information routines that you can use to find</div><div class='add'>+where you are in processing the image:</div><div class='add'>+</div><div class='add'>+   png_get_current_pass_number(png_structp png_ptr);</div><div class='add'>+   png_get_current_row_number(png_structp png_ptr);</div><div class='add'>+</div><div class='add'>+Don't try using these outside a transform callback - firstly they are only</div><div class='add'>+supported if user transforms are supported, secondly they may well return</div><div class='add'>+unexpected results unless the row is actually being processed at the moment they</div><div class='add'>+are called.</div><div class='ctx'> </div><div class='ctx'> You can also set up a pointer to a user structure for use by your</div><div class='ctx'> callback function, and you can inform libpng that your transform</div><div class='hunk'>@@ -1963,7 +2455,7 @@ function will change the number of channels or bit depth with the</div><div class='ctx'> function</div><div class='ctx'> </div><div class='ctx'>     png_set_user_transform_info(png_ptr, user_ptr,</div><div class='del'>-       user_depth, user_channels);</div><div class='add'>+        user_depth, user_channels);</div><div class='ctx'> </div><div class='ctx'> The user's application, not libpng, is responsible for allocating and</div><div class='ctx'> freeing any memory required for the user structure.</div><div class='hunk'>@@ -1972,7 +2464,7 @@ You can retrieve the pointer via the function</div><div class='ctx'> png_get_user_transform_ptr().  For example:</div><div class='ctx'> </div><div class='ctx'>     voidp read_user_transform_ptr =</div><div class='del'>-       png_get_user_transform_ptr(png_ptr);</div><div class='add'>+        png_get_user_transform_ptr(png_ptr);</div><div class='ctx'> </div><div class='ctx'> The last thing to handle is interlacing; this is covered in detail below,</div><div class='ctx'> but you must call the function here if you want libpng to handle expansion</div><div class='hunk'>@@ -1997,6 +2489,15 @@ are allocating one large chunk, you will need to build an</div><div class='ctx'> array of pointers to each row, as it will be needed for some</div><div class='ctx'> of the functions below.</div><div class='ctx'> </div><div class='add'>+Remember: Before you call png_read_update_info(), the png_get_</div><div class='add'>+functions return the values corresponding to the original PNG image.</div><div class='add'>+After you call png_read_update_info the values refer to the image</div><div class='add'>+that libpng will output.  Consequently you must call all the png_set_</div><div class='add'>+functions before you call png_read_update_info().  This is particularly</div><div class='add'>+important for png_set_interlace_handling() - if you are going to call</div><div class='add'>+png_read_update_info() you must call png_set_interlace_handling() before</div><div class='add'>+it unless you want to receive interlaced output.</div><div class='add'>+</div><div class='ctx'> .SS Reading image data</div><div class='ctx'> </div><div class='ctx'> After you've allocated memory, you can read the image data.</div><div class='hunk'>@@ -2006,9 +2507,10 @@ call png_read_image() and libpng will read in all the image data</div><div class='ctx'> and put it in the memory area supplied.  You will need to pass in</div><div class='ctx'> an array of pointers to each row.</div><div class='ctx'> </div><div class='del'>-This function automatically handles interlacing, so you don't need</div><div class='del'>-to call png_set_interlace_handling() or call this function multiple</div><div class='del'>-times, or any of that other stuff necessary with png_read_rows().</div><div class='add'>+This function automatically handles interlacing, so you don't</div><div class='add'>+need to call png_set_interlace_handling() (unless you call</div><div class='add'>+png_read_update_info()) or call this function multiple times, or any</div><div class='add'>+of that other stuff necessary with png_read_rows().</div><div class='ctx'> </div><div class='ctx'>    png_read_image(png_ptr, row_pointers);</div><div class='ctx'> </div><div class='hunk'>@@ -2023,7 +2525,7 @@ use png_read_rows() instead.  If there is no interlacing (check</div><div class='ctx'> interlace_type == PNG_INTERLACE_NONE), this is simple:</div><div class='ctx'> </div><div class='ctx'>     png_read_rows(png_ptr, row_pointers, NULL,</div><div class='del'>-       number_of_rows);</div><div class='add'>+        number_of_rows);</div><div class='ctx'> </div><div class='ctx'> where row_pointers is the same as in the png_read_image() call.</div><div class='ctx'> </div><div class='hunk'>@@ -2035,13 +2537,15 @@ a single row_pointer instead of an array of row_pointers:</div><div class='ctx'> </div><div class='ctx'> If the file is interlaced (interlace_type != 0 in the IHDR chunk), things</div><div class='ctx'> get somewhat harder.  The only current (PNG Specification version 1.2)</div><div class='del'>-interlacing type for PNG is (interlace_type == PNG_INTERLACE_ADAM7)</div><div class='del'>-is a somewhat complicated 2D interlace scheme, known as Adam7, that</div><div class='add'>+interlacing type for PNG is (interlace_type == PNG_INTERLACE_ADAM7);</div><div class='add'>+a somewhat complicated 2D interlace scheme, known as Adam7, that</div><div class='ctx'> breaks down an image into seven smaller images of varying size, based</div><div class='del'>-on an 8x8 grid.</div><div class='add'>+on an 8x8 grid.  This number is defined (from libpng 1.5) as</div><div class='add'>+PNG_INTERLACE_ADAM7_PASSES in png.h</div><div class='ctx'> </div><div class='ctx'> libpng can fill out those images or it can give them to you "as is".</div><div class='del'>-If you want them filled out, there are two ways to do that.  The one</div><div class='add'>+It is almost always better to have libpng handle the interlacing for you.</div><div class='add'>+If you want the images filled out, there are two ways to do that.  The one</div><div class='ctx'> mentioned in the PNG specification is to expand each pixel to cover</div><div class='ctx'> those pixels that have not been read yet (the "rectangle" method).</div><div class='ctx'> This results in a blocky image for the first pass, which gradually</div><div class='hunk'>@@ -2051,37 +2555,20 @@ rest of the image remaining whatever colors they were initialized to</div><div class='ctx'> before the start of the read.  The first method usually looks better,</div><div class='ctx'> but tends to be slower, as there are more pixels to put in the rows.</div><div class='ctx'> </div><div class='del'>-If you don't want libpng to handle the interlacing details, just call</div><div class='del'>-png_read_rows() seven times to read in all seven images.  Each of the</div><div class='del'>-images is a valid image by itself, or they can all be combined on an</div><div class='del'>-8x8 grid to form a single image (although if you intend to combine them</div><div class='del'>-you would be far better off using the libpng interlace handling).</div><div class='del'>-</div><div class='del'>-The first pass will return an image 1/8 as wide as the entire image</div><div class='del'>-(every 8th column starting in column 0) and 1/8 as high as the original</div><div class='del'>-(every 8th row starting in row 0), the second will be 1/8 as wide</div><div class='del'>-(starting in column 4) and 1/8 as high (also starting in row 0).  The</div><div class='del'>-third pass will be 1/4 as wide (every 4th pixel starting in column 0) and</div><div class='del'>-1/8 as high (every 8th row starting in row 4), and the fourth pass will</div><div class='del'>-be 1/4 as wide and 1/4 as high (every 4th column starting in column 2,</div><div class='del'>-and every 4th row starting in row 0).  The fifth pass will return an</div><div class='del'>-image 1/2 as wide, and 1/4 as high (starting at column 0 and row 2),</div><div class='del'>-while the sixth pass will be 1/2 as wide and 1/2 as high as the original</div><div class='del'>-(starting in column 1 and row 0).  The seventh and final pass will be as</div><div class='del'>-wide as the original, and 1/2 as high, containing all of the odd</div><div class='del'>-numbered scanlines.  Phew!</div><div class='del'>-</div><div class='del'>-If you want libpng to expand the images, call this before calling</div><div class='del'>-png_start_read_image() or png_read_update_info():</div><div class='add'>+If, as is likely, you want libpng to expand the images, call this before</div><div class='add'>+calling png_start_read_image() or png_read_update_info():</div><div class='ctx'> </div><div class='ctx'>     if (interlace_type == PNG_INTERLACE_ADAM7)</div><div class='del'>-        number_of_passes</div><div class='add'>+       number_of_passes</div><div class='ctx'>            = png_set_interlace_handling(png_ptr);</div><div class='ctx'> </div><div class='del'>-This will return the number of passes needed.  Currently, this</div><div class='del'>-is seven, but may change if another interlace type is added.</div><div class='del'>-This function can be called even if the file is not interlaced,</div><div class='del'>-where it will return one pass.</div><div class='add'>+This will return the number of passes needed.  Currently, this is seven,</div><div class='add'>+but may change if another interlace type is added.  This function can be</div><div class='add'>+called even if the file is not interlaced, where it will return one pass.</div><div class='add'>+You then need to read the whole image 'number_of_passes' times.  Each time</div><div class='add'>+will distribute the pixels from the current pass to the correct place in</div><div class='add'>+the output image, so you need to supply the same rows to png_read_rows in</div><div class='add'>+each pass.</div><div class='ctx'> </div><div class='ctx'> If you are not going to display the image after each pass, but are</div><div class='ctx'> going to wait until the entire image is read in, use the sparkle</div><div class='hunk'>@@ -2098,14 +2585,104 @@ not the data.  Each pass only writes the pixels appropriate for that</div><div class='ctx'> pass, and assumes the data from previous passes is still valid.</div><div class='ctx'> </div><div class='ctx'>     png_read_rows(png_ptr, row_pointers, NULL,</div><div class='del'>-       number_of_rows);</div><div class='add'>+        number_of_rows);</div><div class='ctx'> </div><div class='ctx'> If you only want the first effect (the rectangles), do the same as</div><div class='ctx'> before except pass the row buffer in the third parameter, and leave</div><div class='ctx'> the second parameter NULL.</div><div class='ctx'> </div><div class='ctx'>     png_read_rows(png_ptr, NULL, row_pointers,</div><div class='del'>-       number_of_rows);</div><div class='add'>+        number_of_rows);</div><div class='add'>+</div><div class='add'>+If you don't want libpng to handle the interlacing details, just call</div><div class='add'>+png_read_rows() PNG_INTERLACE_ADAM7_PASSES times to read in all the images.</div><div class='add'>+Each of the images is a valid image by itself, however you will almost</div><div class='add'>+certainly need to distribute the pixels from each sub-image to the</div><div class='add'>+correct place.  This is where everything gets very tricky.</div><div class='add'>+</div><div class='add'>+If you want to retrieve the separate images you must pass the correct</div><div class='add'>+number of rows to each successive call of png_read_rows().  The calculation</div><div class='add'>+gets pretty complicated for small images, where some sub-images may</div><div class='add'>+not even exist because either their width or height ends up zero.</div><div class='add'>+libpng provides two macros to help you in 1.5 and later versions:</div><div class='add'>+</div><div class='add'>+   png_uint_32 width = PNG_PASS_COLS(image_width, pass_number);</div><div class='add'>+   png_uint_32 height = PNG_PASS_ROWS(image_height, pass_number);</div><div class='add'>+</div><div class='add'>+Respectively these tell you the width and height of the sub-image</div><div class='add'>+corresponding to the numbered pass.  'pass' is in in the range 0 to 6 -</div><div class='add'>+this can be confusing because the specification refers to the same passes</div><div class='add'>+as 1 to 7!  Be careful, you must check both the width and height before</div><div class='add'>+calling png_read_rows() and not call it for that pass if either is zero.</div><div class='add'>+</div><div class='add'>+You can, of course, read each sub-image row by row.  If you want to</div><div class='add'>+produce optimal code to make a pixel-by-pixel transformation of an</div><div class='add'>+interlaced image this is the best approach; read each row of each pass,</div><div class='add'>+transform it, and write it out to a new interlaced image.</div><div class='add'>+</div><div class='add'>+If you want to de-interlace the image yourself libpng provides further</div><div class='add'>+macros to help that tell you where to place the pixels in the output image.</div><div class='add'>+Because the interlacing scheme is rectangular - sub-image pixels are always</div><div class='add'>+arranged on a rectangular grid - all you need to know for each pass is the</div><div class='add'>+starting column and row in the output image of the first pixel plus the</div><div class='add'>+spacing between each pixel.  As of libpng 1.5 there are four macros to</div><div class='add'>+retrieve this information:</div><div class='add'>+</div><div class='add'>+   png_uint_32 x = PNG_PASS_START_COL(pass);</div><div class='add'>+   png_uint_32 y = PNG_PASS_START_ROW(pass);</div><div class='add'>+   png_uint_32 xStep = 1U &lt;&lt; PNG_PASS_COL_SHIFT(pass);</div><div class='add'>+   png_uint_32 yStep = 1U &lt;&lt; PNG_PASS_ROW_SHIFT(pass);</div><div class='add'>+</div><div class='add'>+These allow you to write the obvious loop:</div><div class='add'>+</div><div class='add'>+   png_uint_32 input_y = 0;</div><div class='add'>+   png_uint_32 output_y = PNG_PASS_START_ROW(pass);</div><div class='add'>+</div><div class='add'>+   while (output_y &lt; output_image_height)</div><div class='add'>+   {</div><div class='add'>+      png_uint_32 input_x = 0;</div><div class='add'>+      png_uint_32 output_x = PNG_PASS_START_COL(pass);</div><div class='add'>+</div><div class='add'>+      while (output_x &lt; output_image_width)</div><div class='add'>+      {</div><div class='add'>+         image[output_y][output_x] =</div><div class='add'>+             subimage[pass][input_y][input_x++];</div><div class='add'>+</div><div class='add'>+         output_x += xStep;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      ++input_y;</div><div class='add'>+      output_y += yStep;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+Notice that the steps between successive output rows and columns are</div><div class='add'>+returned as shifts.  This is possible because the pixels in the subimages</div><div class='add'>+are always a power of 2 apart - 1, 2, 4 or 8 pixels - in the original</div><div class='add'>+image.  In practice you may need to directly calculate the output coordinate</div><div class='add'>+given an input coordinate.  libpng provides two further macros for this</div><div class='add'>+purpose:</div><div class='add'>+</div><div class='add'>+   png_uint_32 output_x = PNG_COL_FROM_PASS_COL(input_x, pass);</div><div class='add'>+   png_uint_32 output_y = PNG_ROW_FROM_PASS_ROW(input_y, pass);</div><div class='add'>+</div><div class='add'>+Finally a pair of macros are provided to tell you if a particular image</div><div class='add'>+row or column appears in a given pass:</div><div class='add'>+</div><div class='add'>+   int col_in_pass = PNG_COL_IN_INTERLACE_PASS(output_x, pass);</div><div class='add'>+   int row_in_pass = PNG_ROW_IN_INTERLACE_PASS(output_y, pass);</div><div class='add'>+</div><div class='add'>+Bear in mind that you will probably also need to check the width and height</div><div class='add'>+of the pass in addition to the above to be sure the pass even exists!</div><div class='add'>+</div><div class='add'>+With any luck you are convinced by now that you don't want to do your own</div><div class='add'>+interlace handling.  In reality normally the only good reason for doing this</div><div class='add'>+is if you are processing PNG files on a pixel-by-pixel basis and don't want</div><div class='add'>+to load the whole file into memory when it is interlaced.</div><div class='add'>+</div><div class='add'>+libpng includes a test program, pngvalid, that illustrates reading and</div><div class='add'>+writing of interlaced images.  If you can't get interlacing to work in your</div><div class='add'>+code and don't want to leave it to libpng (the recommended approach) see</div><div class='add'>+how pngvalid.c does it.</div><div class='ctx'> </div><div class='ctx'> .SS Finishing a sequential read</div><div class='ctx'> </div><div class='hunk'>@@ -2127,6 +2704,7 @@ It is also possible to individually free the info_ptr members that</div><div class='ctx'> point to libpng-allocated storage with the following function:</div><div class='ctx'> </div><div class='ctx'>     png_free_data(png_ptr, info_ptr, mask, seq)</div><div class='add'>+</div><div class='ctx'>     mask - identifies data to be freed, a mask</div><div class='ctx'>            containing the bitwise OR of one or</div><div class='ctx'>            more of</div><div class='hunk'>@@ -2136,6 +2714,7 @@ point to libpng-allocated storage with the following function:</div><div class='ctx'>              PNG_FREE_SCAL, PNG_FREE_SPLT,</div><div class='ctx'>              PNG_FREE_TEXT, PNG_FREE_UNKN,</div><div class='ctx'>            or simply PNG_FREE_ALL</div><div class='add'>+</div><div class='ctx'>     seq  - sequence number of item to be freed</div><div class='ctx'>            (-1 for all items)</div><div class='ctx'> </div><div class='hunk'>@@ -2153,13 +2732,15 @@ or so that it will free data that was allocated by the user with png_malloc()</div><div class='ctx'> or png_zalloc() and passed in via a png_set_*() function, with</div><div class='ctx'> </div><div class='ctx'>     png_data_freer(png_ptr, info_ptr, freer, mask)</div><div class='del'>-    mask   - which data elements are affected</div><div class='del'>-             same choices as in png_free_data()</div><div class='add'>+</div><div class='ctx'>     freer  - one of</div><div class='ctx'>                PNG_DESTROY_WILL_FREE_DATA</div><div class='ctx'>                PNG_SET_WILL_FREE_DATA</div><div class='ctx'>                PNG_USER_WILL_FREE_DATA</div><div class='ctx'> </div><div class='add'>+    mask   - which data elements are affected</div><div class='add'>+             same choices as in png_free_data()</div><div class='add'>+</div><div class='ctx'> This function only affects data that has already been allocated.</div><div class='ctx'> You can call this function after reading the PNG data but before calling</div><div class='ctx'> any png_set_*() functions, to control whether the user or the png_set_*()</div><div class='hunk'>@@ -2188,6 +2769,7 @@ it frees.  If you need to turn the flag off for a chunk that was freed by</div><div class='ctx'> your application instead of by libpng, you can use</div><div class='ctx'> </div><div class='ctx'>     png_set_invalid(png_ptr, info_ptr, mask);</div><div class='add'>+</div><div class='ctx'>     mask - identifies the chunks to be made invalid,</div><div class='ctx'>            containing the bitwise OR of one or</div><div class='ctx'>            more of</div><div class='hunk'>@@ -2227,21 +2809,24 @@ png_infop info_ptr;</div><div class='ctx'>     png_ptr = png_create_read_struct</div><div class='ctx'>         (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,</div><div class='ctx'>          user_error_fn, user_warning_fn);</div><div class='add'>+</div><div class='ctx'>     if (!png_ptr)</div><div class='ctx'>         return (ERROR);</div><div class='add'>+</div><div class='ctx'>     info_ptr = png_create_info_struct(png_ptr);</div><div class='add'>+</div><div class='ctx'>     if (!info_ptr)</div><div class='ctx'>     {</div><div class='del'>-        png_destroy_read_struct(&amp;png_ptr, (png_infopp)NULL,</div><div class='del'>-           (png_infopp)NULL);</div><div class='del'>-        return (ERROR);</div><div class='add'>+       png_destroy_read_struct(&amp;png_ptr,</div><div class='add'>+          (png_infopp)NULL, (png_infopp)NULL);</div><div class='add'>+       return (ERROR);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if (setjmp(png_jmpbuf(png_ptr)))</div><div class='ctx'>     {</div><div class='del'>-        png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='del'>-           (png_infopp)NULL);</div><div class='del'>-        return (ERROR);</div><div class='add'>+       png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='add'>+          (png_infopp)NULL);</div><div class='add'>+       return (ERROR);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     /* This one's new.  You can provide functions</div><div class='hunk'>@@ -2273,9 +2858,9 @@ png_infop info_ptr;</div><div class='ctx'>  {</div><div class='ctx'>     if (setjmp(png_jmpbuf(png_ptr)))</div><div class='ctx'>     {</div><div class='del'>-        png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='add'>+       png_destroy_read_struct(&amp;png_ptr, &amp;info_ptr,</div><div class='ctx'>            (png_infopp)NULL);</div><div class='del'>-        return (ERROR);</div><div class='add'>+       return (ERROR);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     /* This one's new also.  Simply give it a chunk</div><div class='hunk'>@@ -2292,6 +2877,12 @@ png_infop info_ptr;</div><div class='ctx'>        so there.</div><div class='ctx'>      */</div><div class='ctx'>     png_process_data(png_ptr, info_ptr, buffer, length);</div><div class='add'>+</div><div class='add'>+    /* At this point you can call png_process_data_skip if</div><div class='add'>+       you want to handle data the library will skip yourself;</div><div class='add'>+       it simply returns the number of bytes to skip (and stops</div><div class='add'>+       libpng skipping that number of bytes on the next</div><div class='add'>+       png_process_data call).</div><div class='ctx'>     return 0;</div><div class='ctx'>  }</div><div class='ctx'> </div><div class='hunk'>@@ -2312,6 +2903,19 @@ png_infop info_ptr;</div><div class='ctx'>        any).  You may start getting rows before</div><div class='ctx'>        png_process_data() returns, so this is your</div><div class='ctx'>        last chance to prepare for that.</div><div class='add'>+</div><div class='add'>+       This is where you turn on interlace handling,</div><div class='add'>+       assuming you don't want to do it yourself.</div><div class='add'>+</div><div class='add'>+       If you need to you can stop the processing of</div><div class='add'>+       your original input data at this point by calling</div><div class='add'>+       png_process_data_pause.  This returns the number</div><div class='add'>+       of unprocessed bytes from the last png_process_data</div><div class='add'>+       call - it is up to you to ensure that the next call</div><div class='add'>+       sees these bytes again.  If you don't want to bother</div><div class='add'>+       with this you can get libpng to cache the unread</div><div class='add'>+       bytes by setting the 'save' parameter (see png.h) but</div><div class='add'>+       then libpng will have to copy the data internally.</div><div class='ctx'>      */</div><div class='ctx'>  }</div><div class='ctx'> </div><div class='hunk'>@@ -2332,14 +2936,22 @@ png_infop info_ptr;</div><div class='ctx'>        supplying them because it may make your life</div><div class='ctx'>        easier.</div><div class='ctx'> </div><div class='del'>-       For the non-NULL rows of interlaced images,</div><div class='add'>+       If you did not turn on interlace handling then</div><div class='add'>+       the callback is called for each row of each</div><div class='add'>+       sub-image when the image is interlaced.  In this</div><div class='add'>+       case 'row_num' is the row in the sub-image, not</div><div class='add'>+       the row in the output image as it is in all other</div><div class='add'>+       cases.</div><div class='add'>+</div><div class='add'>+       For the non-NULL rows of interlaced images when</div><div class='add'>+       you have switched on libpng interlace handling,</div><div class='ctx'>        you must call png_progressive_combine_row()</div><div class='ctx'>        passing in the row and the old row.  You can</div><div class='ctx'>        call this function for NULL rows (it will just</div><div class='ctx'>        return) and for non-interlaced images (it just</div><div class='ctx'>        does the memcpy for you) if it will make the</div><div class='ctx'>        code easier.  Thus, you can just do this for</div><div class='del'>-       all cases:</div><div class='add'>+       all cases if you switch on interlace handling;</div><div class='ctx'>      */</div><div class='ctx'> </div><div class='ctx'>         png_progressive_combine_row(png_ptr, old_row,</div><div class='hunk'>@@ -2353,6 +2965,9 @@ png_infop info_ptr;</div><div class='ctx'>        for interlaced images), you will have to pass</div><div class='ctx'>        the current row, and the function will combine</div><div class='ctx'>        the old row and the new row.</div><div class='add'>+</div><div class='add'>+       You can also call png_process_data_pause in this</div><div class='add'>+       callback - see above.</div><div class='ctx'>     */</div><div class='ctx'>  }</div><div class='ctx'> </div><div class='hunk'>@@ -2387,10 +3002,9 @@ using the standard I/O functions, you will need to replace them with</div><div class='ctx'> custom writing functions.  See the discussion under Customizing libpng.</div><div class='ctx'> </div><div class='ctx'>     FILE *fp = fopen(file_name, "wb");</div><div class='add'>+</div><div class='ctx'>     if (!fp)</div><div class='del'>-    {</div><div class='ctx'>        return (ERROR);</div><div class='del'>-    }</div><div class='ctx'> </div><div class='ctx'> Next, png_struct and png_info need to be allocated and initialized.</div><div class='ctx'> As these can be both relatively large, you may not want to store these</div><div class='hunk'>@@ -2403,6 +3017,7 @@ both "png_ptr"; you can call them anything you like, such as</div><div class='ctx'>     png_structp png_ptr = png_create_write_struct</div><div class='ctx'>        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,</div><div class='ctx'>         user_error_fn, user_warning_fn);</div><div class='add'>+</div><div class='ctx'>     if (!png_ptr)</div><div class='ctx'>        return (ERROR);</div><div class='ctx'> </div><div class='hunk'>@@ -2410,7 +3025,7 @@ both "png_ptr"; you can call them anything you like, such as</div><div class='ctx'>     if (!info_ptr)</div><div class='ctx'>     {</div><div class='ctx'>        png_destroy_write_struct(&amp;png_ptr,</div><div class='del'>-         (png_infopp)NULL);</div><div class='add'>+           (png_infopp)NULL);</div><div class='ctx'>        return (ERROR);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='hunk'>@@ -2436,7 +3051,7 @@ section below for more information on the libpng error handling.</div><div class='ctx'> </div><div class='ctx'>     if (setjmp(png_jmpbuf(png_ptr)))</div><div class='ctx'>     {</div><div class='del'>-       png_destroy_write_struct(&amp;png_ptr, &amp;info_ptr);</div><div class='add'>+    png_destroy_write_struct(&amp;png_ptr, &amp;info_ptr);</div><div class='ctx'>        fclose(fp);</div><div class='ctx'>        return (ERROR);</div><div class='ctx'>     }</div><div class='hunk'>@@ -2444,9 +3059,13 @@ section below for more information on the libpng error handling.</div><div class='ctx'>     return;</div><div class='ctx'> </div><div class='ctx'> If you would rather avoid the complexity of setjmp/longjmp issues,</div><div class='del'>-you can compile libpng with PNG_SETJMP_NOT_SUPPORTED, in which case</div><div class='add'>+you can compile libpng with PNG_NO_SETJMP, in which case</div><div class='ctx'> errors will result in a call to PNG_ABORT() which defaults to abort().</div><div class='ctx'> </div><div class='add'>+You can #define PNG_ABORT() to a function that does something</div><div class='add'>+more useful than abort(), as long as your function does not</div><div class='add'>+return.</div><div class='add'>+</div><div class='ctx'> Now you need to set up the output code.  The default for libpng is to</div><div class='ctx'> use the C function fwrite().  If you use this, you will need to pass a</div><div class='ctx'> valid FILE * in the function png_init_io().  Be sure that the file is</div><div class='hunk'>@@ -2471,7 +3090,7 @@ called after each row has been written, which you can use to control</div><div class='ctx'> a progress meter or the like.  It's demonstrated in pngtest.c.</div><div class='ctx'> You must supply a function</div><div class='ctx'> </div><div class='del'>-    void write_row_callback(png_ptr, png_uint_32 row,</div><div class='add'>+    void write_row_callback(png_structp png_ptr, png_uint_32 row,</div><div class='ctx'>        int pass);</div><div class='ctx'>     {</div><div class='ctx'>       /* put your code here */</div><div class='hunk'>@@ -2502,7 +3121,8 @@ filter types.</div><div class='ctx'>     /* turn on or off filtering, and/or choose</div><div class='ctx'>        specific filters.  You can use either a single</div><div class='ctx'>        PNG_FILTER_VALUE_NAME or the bitwise OR of one</div><div class='del'>-       or more PNG_FILTER_NAME masks. */</div><div class='add'>+       or more PNG_FILTER_NAME masks.</div><div class='add'>+     */</div><div class='ctx'>     png_set_filter(png_ptr, 0,</div><div class='ctx'>        PNG_FILTER_NONE  | PNG_FILTER_VALUE_NONE |</div><div class='ctx'>        PNG_FILTER_SUB   | PNG_FILTER_VALUE_SUB  |</div><div class='hunk'>@@ -2511,11 +3131,10 @@ filter types.</div><div class='ctx'>        PNG_FILTER_PAETH | PNG_FILTER_VALUE_PAETH|</div><div class='ctx'>        PNG_ALL_FILTERS);</div><div class='ctx'> </div><div class='del'>-If an application</div><div class='del'>-wants to start and stop using particular filters during compression,</div><div class='del'>-it should start out with all of the filters (to ensure that the previous</div><div class='del'>-row of pixels will be stored in case it's needed later), and then add</div><div class='del'>-and remove them after the start of compression.</div><div class='add'>+If an application wants to start and stop using particular filters during</div><div class='add'>+compression, it should start out with all of the filters (to ensure that</div><div class='add'>+the previous row of pixels will be stored in case it's needed later),</div><div class='add'>+and then add and remove them after the start of compression.</div><div class='ctx'> </div><div class='ctx'> If you are writing a PNG datastream that is to be embedded in a MNG</div><div class='ctx'> datastream, the second parameter can be either 0 or 64.</div><div class='hunk'>@@ -2559,16 +3178,20 @@ Some of the more important parts of the png_info are:</div><div class='ctx'>     png_set_IHDR(png_ptr, info_ptr, width, height,</div><div class='ctx'>        bit_depth, color_type, interlace_type,</div><div class='ctx'>        compression_type, filter_method)</div><div class='add'>+</div><div class='ctx'>     width          - holds the width of the image</div><div class='ctx'>                      in pixels (up to 2^31).</div><div class='add'>+</div><div class='ctx'>     height         - holds the height of the image</div><div class='ctx'>                      in pixels (up to 2^31).</div><div class='add'>+</div><div class='ctx'>     bit_depth      - holds the bit depth of one of the</div><div class='ctx'>                      image channels.</div><div class='ctx'>                      (valid values are 1, 2, 4, 8, 16</div><div class='ctx'>                      and depend also on the</div><div class='ctx'>                      color_type.  See also significant</div><div class='ctx'>                      bits (sBIT) below).</div><div class='add'>+</div><div class='ctx'>     color_type     - describes which color/alpha</div><div class='ctx'>                      channels are present.</div><div class='ctx'>                      PNG_COLOR_TYPE_GRAY</div><div class='hunk'>@@ -2588,8 +3211,10 @@ Some of the more important parts of the png_info are:</div><div class='ctx'> </div><div class='ctx'>     interlace_type - PNG_INTERLACE_NONE or</div><div class='ctx'>                      PNG_INTERLACE_ADAM7</div><div class='add'>+</div><div class='ctx'>     compression_type - (must be</div><div class='ctx'>                      PNG_COMPRESSION_TYPE_DEFAULT)</div><div class='add'>+</div><div class='ctx'>     filter_method  - (must be PNG_FILTER_TYPE_DEFAULT</div><div class='ctx'>                      or, if you are writing a PNG to</div><div class='ctx'>                      be embedded in a MNG datastream,</div><div class='hunk'>@@ -2607,15 +3232,22 @@ width, height, bit_depth, and color_type must be the same in each call.</div><div class='ctx'> </div><div class='ctx'>     png_set_PLTE(png_ptr, info_ptr, palette,</div><div class='ctx'>        num_palette);</div><div class='add'>+</div><div class='ctx'>     palette        - the palette for the file</div><div class='ctx'>                      (array of png_color)</div><div class='ctx'>     num_palette    - number of entries in the palette</div><div class='ctx'> </div><div class='del'>-    png_set_gAMA(png_ptr, info_ptr, gamma);</div><div class='del'>-    gamma          - the gamma the image was created</div><div class='del'>-                     at (PNG_INFO_gAMA)</div><div class='add'>+    png_set_gAMA(png_ptr, info_ptr, file_gamma);</div><div class='add'>+    png_set_gAMA_fixed(png_ptr, info_ptr, int_file_gamma);</div><div class='add'>+</div><div class='add'>+    file_gamma     - the gamma at which the image was</div><div class='add'>+                     created (PNG_INFO_gAMA)</div><div class='add'>+</div><div class='add'>+    int_file_gamma - 100,000 times the gamma at which</div><div class='add'>+                     the image was created</div><div class='ctx'> </div><div class='ctx'>     png_set_sRGB(png_ptr, info_ptr, srgb_intent);</div><div class='add'>+</div><div class='ctx'>     srgb_intent    - the rendering intent</div><div class='ctx'>                      (PNG_INFO_sRGB) The presence of</div><div class='ctx'>                      the sRGB chunk means that the pixel</div><div class='hunk'>@@ -2635,6 +3267,7 @@ width, height, bit_depth, and color_type must be the same in each call.</div><div class='ctx'> </div><div class='ctx'>     png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,</div><div class='ctx'>        srgb_intent);</div><div class='add'>+</div><div class='ctx'>     srgb_intent    - the rendering intent</div><div class='ctx'>                      (PNG_INFO_sRGB) The presence of the</div><div class='ctx'>                      sRGB chunk means that the pixel</div><div class='hunk'>@@ -2645,17 +3278,22 @@ width, height, bit_depth, and color_type must be the same in each call.</div><div class='ctx'>                      written.</div><div class='ctx'> </div><div class='ctx'>     png_set_iCCP(png_ptr, info_ptr, name, compression_type,</div><div class='del'>-                      profile, proflen);</div><div class='del'>-    name            - The profile name.</div><div class='del'>-    compression     - The compression type; always</div><div class='del'>-                      PNG_COMPRESSION_TYPE_BASE for PNG 1.0.</div><div class='del'>-                      You may give NULL to this argument to</div><div class='del'>-                      ignore it.</div><div class='del'>-    profile         - International Color Consortium color</div><div class='del'>-                      profile data. May contain NULs.</div><div class='del'>-    proflen         - length of profile data in bytes.</div><div class='add'>+                       profile, proflen);</div><div class='add'>+</div><div class='add'>+    name             - The profile name.</div><div class='add'>+</div><div class='add'>+    compression_type - The compression type; always</div><div class='add'>+                       PNG_COMPRESSION_TYPE_BASE for PNG 1.0.</div><div class='add'>+                       You may give NULL to this argument to</div><div class='add'>+                       ignore it.</div><div class='add'>+</div><div class='add'>+    profile          - International Color Consortium color</div><div class='add'>+                       profile data. May contain NULs.</div><div class='add'>+</div><div class='add'>+    proflen          - length of profile data in bytes.</div><div class='ctx'> </div><div class='ctx'>     png_set_sBIT(png_ptr, info_ptr, sig_bit);</div><div class='add'>+</div><div class='ctx'>     sig_bit        - the number of significant bits for</div><div class='ctx'>                      (PNG_INFO_sBIT) each of the gray, red,</div><div class='ctx'>                      green, and blue channels, whichever are</div><div class='hunk'>@@ -2664,30 +3302,37 @@ width, height, bit_depth, and color_type must be the same in each call.</div><div class='ctx'> </div><div class='ctx'>     png_set_tRNS(png_ptr, info_ptr, trans_alpha,</div><div class='ctx'>        num_trans, trans_color);</div><div class='add'>+</div><div class='ctx'>     trans_alpha    - array of alpha (transparency)</div><div class='ctx'>                      entries for palette (PNG_INFO_tRNS)</div><div class='add'>+</div><div class='ctx'>     trans_color    - graylevel or color sample values</div><div class='ctx'>                      (in order red, green, blue) of the</div><div class='ctx'>                      single transparent color for</div><div class='ctx'>                      non-paletted images (PNG_INFO_tRNS)</div><div class='add'>+</div><div class='ctx'>     num_trans      - number of transparent entries</div><div class='ctx'>                      (PNG_INFO_tRNS)</div><div class='ctx'> </div><div class='ctx'>     png_set_hIST(png_ptr, info_ptr, hist);</div><div class='del'>-                    (PNG_INFO_hIST)</div><div class='add'>+</div><div class='ctx'>     hist           - histogram of palette (array of</div><div class='del'>-                     png_uint_16)</div><div class='add'>+                     png_uint_16) (PNG_INFO_hIST)</div><div class='ctx'> </div><div class='ctx'>     png_set_tIME(png_ptr, info_ptr, mod_time);</div><div class='add'>+</div><div class='ctx'>     mod_time       - time image was last modified</div><div class='ctx'>                      (PNG_VALID_tIME)</div><div class='ctx'> </div><div class='ctx'>     png_set_bKGD(png_ptr, info_ptr, background);</div><div class='add'>+</div><div class='ctx'>     background     - background color (PNG_VALID_bKGD)</div><div class='ctx'> </div><div class='ctx'>     png_set_text(png_ptr, info_ptr, text_ptr, num_text);</div><div class='add'>+</div><div class='ctx'>     text_ptr       - array of png_text holding image</div><div class='ctx'>                      comments</div><div class='add'>+</div><div class='ctx'>     text_ptr[i].compression - type of compression used</div><div class='ctx'>                  on "text" PNG_TEXT_COMPRESSION_NONE</div><div class='ctx'>                            PNG_TEXT_COMPRESSION_zTXt</div><div class='hunk'>@@ -2713,6 +3358,7 @@ width, height, bit_depth, and color_type must be the same in each call.</div><div class='ctx'> </div><div class='ctx'>     png_set_sPLT(png_ptr, info_ptr, &amp;palette_ptr,</div><div class='ctx'>        num_spalettes);</div><div class='add'>+</div><div class='ctx'>     palette_ptr    - array of png_sPLT_struct structures</div><div class='ctx'>                      to be added to the list of palettes</div><div class='ctx'>                      in the info structure.</div><div class='hunk'>@@ -2721,35 +3367,48 @@ width, height, bit_depth, and color_type must be the same in each call.</div><div class='ctx'> </div><div class='ctx'>     png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y,</div><div class='ctx'>         unit_type);</div><div class='add'>+</div><div class='ctx'>     offset_x  - positive offset from the left</div><div class='ctx'>                      edge of the screen</div><div class='add'>+</div><div class='ctx'>     offset_y  - positive offset from the top</div><div class='ctx'>                      edge of the screen</div><div class='add'>+</div><div class='ctx'>     unit_type - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER</div><div class='ctx'> </div><div class='ctx'>     png_set_pHYs(png_ptr, info_ptr, res_x, res_y,</div><div class='ctx'>         unit_type);</div><div class='add'>+</div><div class='ctx'>     res_x       - pixels/unit physical resolution</div><div class='ctx'>                   in x direction</div><div class='add'>+</div><div class='ctx'>     res_y       - pixels/unit physical resolution</div><div class='ctx'>                   in y direction</div><div class='add'>+</div><div class='ctx'>     unit_type   - PNG_RESOLUTION_UNKNOWN,</div><div class='ctx'>                   PNG_RESOLUTION_METER</div><div class='ctx'> </div><div class='ctx'>     png_set_sCAL(png_ptr, info_ptr, unit, width, height)</div><div class='add'>+</div><div class='ctx'>     unit        - physical scale units (an integer)</div><div class='add'>+</div><div class='ctx'>     width       - width of a pixel in physical scale units</div><div class='add'>+</div><div class='ctx'>     height      - height of a pixel in physical scale units</div><div class='ctx'>                   (width and height are doubles)</div><div class='ctx'> </div><div class='ctx'>     png_set_sCAL_s(png_ptr, info_ptr, unit, width, height)</div><div class='add'>+</div><div class='ctx'>     unit        - physical scale units (an integer)</div><div class='add'>+</div><div class='ctx'>     width       - width of a pixel in physical scale units</div><div class='add'>+</div><div class='ctx'>     height      - height of a pixel in physical scale units</div><div class='ctx'>                  (width and height are strings like "2.54")</div><div class='ctx'> </div><div class='ctx'>     png_set_unknown_chunks(png_ptr, info_ptr, &amp;unknowns,</div><div class='ctx'>        num_unknowns)</div><div class='add'>+</div><div class='ctx'>     unknowns          - array of png_unknown_chunk</div><div class='ctx'>                         structures holding unknown chunks</div><div class='ctx'>     unknowns[i].name  - name of unknown chunk</div><div class='hunk'>@@ -2788,21 +3447,30 @@ Until text gets around 1000 bytes, it is not worth compressing it.</div><div class='ctx'> After the text has been written out to the file, the compression type</div><div class='ctx'> is set to PNG_TEXT_COMPRESSION_NONE_WR or PNG_TEXT_COMPRESSION_zTXt_WR,</div><div class='ctx'> so that it isn't written out again at the end (in case you are calling</div><div class='del'>-png_write_end() with the same struct.</div><div class='add'>+png_write_end() with the same struct).</div><div class='ctx'> </div><div class='ctx'> The keywords that are given in the PNG Specification are:</div><div class='ctx'> </div><div class='ctx'>     Title            Short (one line) title or</div><div class='ctx'>                      caption for image</div><div class='add'>+</div><div class='ctx'>     Author           Name of image's creator</div><div class='add'>+</div><div class='ctx'>     Description      Description of image (possibly long)</div><div class='add'>+</div><div class='ctx'>     Copyright        Copyright notice</div><div class='add'>+</div><div class='ctx'>     Creation Time    Time of original image creation</div><div class='ctx'>                      (usually RFC 1123 format, see below)</div><div class='add'>+</div><div class='ctx'>     Software         Software used to create the image</div><div class='add'>+</div><div class='ctx'>     Disclaimer       Legal disclaimer</div><div class='add'>+</div><div class='ctx'>     Warning          Warning of nature of content</div><div class='add'>+</div><div class='ctx'>     Source           Device used to create the image</div><div class='add'>+</div><div class='ctx'>     Comment          Miscellaneous comment; conversion</div><div class='ctx'>                      from other image format</div><div class='ctx'> </div><div class='hunk'>@@ -2972,17 +3640,19 @@ file so that decoders can recover the original data if desired.</div><div class='ctx'>     /* Set the true bit depth of the image data */</div><div class='ctx'>     if (color_type &amp; PNG_COLOR_MASK_COLOR)</div><div class='ctx'>     {</div><div class='del'>-        sig_bit.red = true_bit_depth;</div><div class='del'>-        sig_bit.green = true_bit_depth;</div><div class='del'>-        sig_bit.blue = true_bit_depth;</div><div class='add'>+       sig_bit.red = true_bit_depth;</div><div class='add'>+       sig_bit.green = true_bit_depth;</div><div class='add'>+       sig_bit.blue = true_bit_depth;</div><div class='ctx'>     }</div><div class='add'>+</div><div class='ctx'>     else</div><div class='ctx'>     {</div><div class='del'>-        sig_bit.gray = true_bit_depth;</div><div class='add'>+       sig_bit.gray = true_bit_depth;</div><div class='ctx'>     }</div><div class='add'>+</div><div class='ctx'>     if (color_type &amp; PNG_COLOR_MASK_ALPHA)</div><div class='ctx'>     {</div><div class='del'>-        sig_bit.alpha = true_bit_depth;</div><div class='add'>+       sig_bit.alpha = true_bit_depth;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     png_set_sBIT(png_ptr, info_ptr, &amp;sig_bit);</div><div class='hunk'>@@ -3028,11 +3698,18 @@ with</div><div class='ctx'> </div><div class='ctx'> You must supply the function</div><div class='ctx'> </div><div class='del'>-    void write_transform_fn(png_ptr ptr, row_info_ptr</div><div class='del'>-       row_info, png_bytep data)</div><div class='add'>+    void write_transform_fn(png_structp png_ptr ptr,</div><div class='add'>+       row_info_ptr row_info, png_bytep data)</div><div class='ctx'> </div><div class='ctx'> See pngtest.c for a working example.  Your function will be called</div><div class='del'>-before any of the other transformations are processed.</div><div class='add'>+before any of the other transformations are processed.  If supported</div><div class='add'>+libpng also supplies an information routine that may be called from</div><div class='add'>+your callback:</div><div class='add'>+</div><div class='add'>+   png_get_current_row_number(png_ptr);</div><div class='add'>+</div><div class='add'>+This returns the current row passed to the transform.  Even with interlaced</div><div class='add'>+images the value returned is the row in the final output image.</div><div class='ctx'> </div><div class='ctx'> You can also set up a pointer to a user structure for use by your</div><div class='ctx'> callback function.</div><div class='hunk'>@@ -3114,25 +3791,39 @@ for details of which pixels to write when.</div><div class='ctx'> </div><div class='ctx'> If you don't want libpng to handle the interlacing details, just</div><div class='ctx'> use png_set_interlace_handling() and call png_write_rows() the</div><div class='del'>-correct number of times to write all seven sub-images.</div><div class='add'>+correct number of times to write all the sub-images</div><div class='add'>+(png_set_interlace_handling() returns the number of sub-images.)</div><div class='ctx'> </div><div class='ctx'> If you want libpng to build the sub-images, call this before you start</div><div class='ctx'> writing any rows:</div><div class='ctx'> </div><div class='del'>-    number_of_passes =</div><div class='del'>-       png_set_interlace_handling(png_ptr);</div><div class='add'>+    number_of_passes = png_set_interlace_handling(png_ptr);</div><div class='ctx'> </div><div class='ctx'> This will return the number of passes needed.  Currently, this is seven,</div><div class='ctx'> but may change if another interlace type is added.</div><div class='ctx'> </div><div class='ctx'> Then write the complete image number_of_passes times.</div><div class='ctx'> </div><div class='del'>-    png_write_rows(png_ptr, row_pointers,</div><div class='del'>-       number_of_rows);</div><div class='add'>+    png_write_rows(png_ptr, row_pointers, number_of_rows);</div><div class='add'>+</div><div class='add'>+Think carefully before you write an interlaced image.  Typically code that</div><div class='add'>+reads such images reads all the image data into memory, uncompressed, before</div><div class='add'>+doing any processing.  Only code that can display an image on the fly can</div><div class='add'>+take advantage of the interlacing and even then the image has to be exactly</div><div class='add'>+the correct size for the output device, because scaling an image requires</div><div class='add'>+adjacent pixels and these are not available until all the passes have been</div><div class='add'>+read.</div><div class='add'>+</div><div class='add'>+If you do write an interlaced image you will hardly ever need to handle</div><div class='add'>+the interlacing yourself.  Call png_set_interlace_handling() and use the</div><div class='add'>+approach described above.</div><div class='ctx'> </div><div class='del'>-As some of these rows are not used, and thus return immediately, you may</div><div class='del'>-want to read about interlacing in the PNG specification, and only update</div><div class='del'>-the rows that are actually used.</div><div class='add'>+The only time it is conceivable that you will really need to write an</div><div class='add'>+interlaced image pass-by-pass is when you have read one pass by pass and</div><div class='add'>+made some pixel-by-pixel transformation to it, as described in the read</div><div class='add'>+code above.  In this case use the PNG_PASS_ROWS and PNG_PASS_COLS macros</div><div class='add'>+to determine the size of each sub-image in turn and simply write the rows</div><div class='add'>+you obtained from the read code.</div><div class='ctx'> </div><div class='ctx'> .SS Finishing a sequential write</div><div class='ctx'> </div><div class='hunk'>@@ -3151,6 +3842,7 @@ It is also possible to individually free the info_ptr members that</div><div class='ctx'> point to libpng-allocated storage with the following function:</div><div class='ctx'> </div><div class='ctx'>     png_free_data(png_ptr, info_ptr, mask, seq)</div><div class='add'>+</div><div class='ctx'>     mask  - identifies data to be freed, a mask</div><div class='ctx'>             containing the bitwise OR of one or</div><div class='ctx'>             more of</div><div class='hunk'>@@ -3160,6 +3852,7 @@ point to libpng-allocated storage with the following function:</div><div class='ctx'>               PNG_FREE_SCAL, PNG_FREE_SPLT,</div><div class='ctx'>               PNG_FREE_TEXT, PNG_FREE_UNKN,</div><div class='ctx'>             or simply PNG_FREE_ALL</div><div class='add'>+</div><div class='ctx'>     seq   - sequence number of item to be freed</div><div class='ctx'>             (-1 for all items)</div><div class='ctx'> </div><div class='hunk'>@@ -3181,19 +3874,22 @@ or so that it will free data that was allocated by the user with png_malloc()</div><div class='ctx'> or png_zalloc() and passed in via a png_set_*() function, with</div><div class='ctx'> </div><div class='ctx'>     png_data_freer(png_ptr, info_ptr, freer, mask)</div><div class='del'>-    mask   - which data elements are affected</div><div class='del'>-             same choices as in png_free_data()</div><div class='add'>+</div><div class='ctx'>     freer  - one of</div><div class='ctx'>                PNG_DESTROY_WILL_FREE_DATA</div><div class='ctx'>                PNG_SET_WILL_FREE_DATA</div><div class='ctx'>                PNG_USER_WILL_FREE_DATA</div><div class='ctx'> </div><div class='add'>+    mask   - which data elements are affected</div><div class='add'>+             same choices as in png_free_data()</div><div class='add'>+</div><div class='ctx'> For example, to transfer responsibility for some data from a read structure</div><div class='ctx'> to a write structure, you could use</div><div class='ctx'> </div><div class='ctx'>     png_data_freer(read_ptr, read_info_ptr,</div><div class='ctx'>        PNG_USER_WILL_FREE_DATA,</div><div class='ctx'>        PNG_FREE_PLTE|PNG_FREE_tRNS|PNG_FREE_hIST)</div><div class='add'>+</div><div class='ctx'>     png_data_freer(write_ptr, write_info_ptr,</div><div class='ctx'>        PNG_DESTROY_WILL_FREE_DATA,</div><div class='ctx'>        PNG_FREE_PLTE|PNG_FREE_tRNS|PNG_FREE_hIST)</div><div class='hunk'>@@ -3240,9 +3936,11 @@ these functions, call the appropriate png_set_*_fn() function.</div><div class='ctx'> </div><div class='ctx'> Memory allocation is done through the functions png_malloc(), png_calloc(),</div><div class='ctx'> and png_free().  These currently just call the standard C functions.</div><div class='del'>-png_calloc() calls png_malloc() and then png_memset() to clear the newly</div><div class='del'>-allocated memory to zero.  If your pointers can't access more then 64K</div><div class='del'>-at a time, you will want to set MAXSEG_64K in zlib.h.  Since it is</div><div class='add'>+png_calloc() calls png_malloc() and then clears the newly</div><div class='add'>+allocated memory to zero.  There is limited support for certain systems</div><div class='add'>+with segmented memory architectures and the types of pointers declared by</div><div class='add'>+png.h match this; you will have to use appropriate pointers in your</div><div class='add'>+application.  Since it is</div><div class='ctx'> unlikely that the method of handling memory allocation on a platform</div><div class='ctx'> will change between applications, these functions must be modified in</div><div class='ctx'> the library at compile time.  If you prefer to use a different method</div><div class='hunk'>@@ -3256,7 +3954,8 @@ via</div><div class='ctx'> Your replacement memory functions must have prototypes as follows:</div><div class='ctx'> </div><div class='ctx'>     png_voidp malloc_fn(png_structp png_ptr,</div><div class='del'>-       png_size_t size);</div><div class='add'>+       png_alloc_size_t size);</div><div class='add'>+</div><div class='ctx'>     void free_fn(png_structp png_ptr, png_voidp ptr);</div><div class='ctx'> </div><div class='ctx'> Your malloc_fn() must return NULL in case of failure.  The png_malloc()</div><div class='hunk'>@@ -3289,8 +3988,10 @@ The replacement I/O functions must have prototypes as follows:</div><div class='ctx'> </div><div class='ctx'>     void user_read_data(png_structp png_ptr,</div><div class='ctx'>         png_bytep data, png_size_t length);</div><div class='add'>+</div><div class='ctx'>     void user_write_data(png_structp png_ptr,</div><div class='ctx'>         png_bytep data, png_size_t length);</div><div class='add'>+</div><div class='ctx'>     void user_flush_data(png_structp png_ptr);</div><div class='ctx'> </div><div class='ctx'> The user_read_data() function is responsible for detecting and</div><div class='hunk'>@@ -3307,8 +4008,9 @@ Error handling in libpng is done through png_error() and png_warning().</div><div class='ctx'> Errors handled through png_error() are fatal, meaning that png_error()</div><div class='ctx'> should never return to its caller.  Currently, this is handled via</div><div class='ctx'> setjmp() and longjmp() (unless you have compiled libpng with</div><div class='del'>-PNG_SETJMP_NOT_SUPPORTED, in which case it is handled via PNG_ABORT()),</div><div class='del'>-but you could change this to do things like exit() if you should wish.</div><div class='add'>+PNG_NO_SETJMP, in which case it is handled via PNG_ABORT()),</div><div class='add'>+but you could change this to do things like exit() if you should wish,</div><div class='add'>+as long as your function does not return.</div><div class='ctx'> </div><div class='ctx'> On non-fatal errors, png_warning() is called</div><div class='ctx'> to print a warning message, and then control returns to the calling code.</div><div class='hunk'>@@ -3334,6 +4036,7 @@ parameters as follows:</div><div class='ctx'> </div><div class='ctx'>     void user_error_fn(png_structp png_ptr,</div><div class='ctx'>         png_const_charp error_msg);</div><div class='add'>+</div><div class='ctx'>     void user_warning_fn(png_structp png_ptr,</div><div class='ctx'>         png_const_charp warning_msg);</div><div class='ctx'> </div><div class='hunk'>@@ -3444,8 +4147,10 @@ zlib.h for more information on what these mean.</div><div class='ctx'> </div><div class='ctx'>     png_set_compression_strategy(png_ptr,</div><div class='ctx'>         strategy);</div><div class='add'>+</div><div class='ctx'>     png_set_compression_window_bits(png_ptr,</div><div class='ctx'>         window_bits);</div><div class='add'>+</div><div class='ctx'>     png_set_compression_method(png_ptr, method);</div><div class='ctx'>     png_set_compression_buffer_size(png_ptr, size);</div><div class='ctx'> </div><div class='hunk'>@@ -3535,6 +4240,8 @@ before recompiling libpng and save yourself code and data space, or</div><div class='ctx'> you can turn off individual capabilities with defines that begin with</div><div class='ctx'> PNG_NO_.</div><div class='ctx'> </div><div class='add'>+In libpng-1.5.0 and later, the #define's are in pnglibconf.h instead.</div><div class='add'>+</div><div class='ctx'> You can also turn all of the transforms and ancillary chunk capabilities</div><div class='ctx'> off en masse with compiler directives that define</div><div class='ctx'> PNG_NO_READ[or WRITE]_TRANSFORMS, or PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS,</div><div class='hunk'>@@ -3587,8 +4294,8 @@ according to printf-style formatting directives.  For example,</div><div class='ctx'> </div><div class='ctx'> is expanded to</div><div class='ctx'> </div><div class='del'>-   if(PNG_DEBUG &gt; 2)</div><div class='del'>-     fprintf(PNG_DEBUG_FILE, "foo=%d\n", foo);</div><div class='add'>+   if (PNG_DEBUG &gt; 2)</div><div class='add'>+      fprintf(PNG_DEBUG_FILE, "foo=%d\n", foo);</div><div class='ctx'> </div><div class='ctx'> When PNG_DEBUG is defined but is zero, the macros aren't defined, but you</div><div class='ctx'> can still use PNG_DEBUG to control your own debugging:</div><div class='hunk'>@@ -3609,11 +4316,13 @@ Libpng can support some of these extensions.  To enable them, use the</div><div class='ctx'> png_permit_mng_features() function:</div><div class='ctx'> </div><div class='ctx'>    feature_set = png_permit_mng_features(png_ptr, mask)</div><div class='add'>+</div><div class='ctx'>    mask is a png_uint_32 containing the bitwise OR of the</div><div class='ctx'>         features you want to enable.  These include</div><div class='ctx'>         PNG_FLAG_MNG_EMPTY_PLTE</div><div class='ctx'>         PNG_FLAG_MNG_FILTER_64</div><div class='ctx'>         PNG_ALL_MNG_FEATURES</div><div class='add'>+</div><div class='ctx'>    feature_set is a png_uint_32 that is the bitwise AND of</div><div class='ctx'>       your mask with the set of MNG features that is</div><div class='ctx'>       supported by the version of libpng that you are using.</div><div class='hunk'>@@ -3638,7 +4347,7 @@ still alive and well, but they have moved on to other things.</div><div class='ctx'> The old libpng functions png_read_init(), png_write_init(),</div><div class='ctx'> png_info_init(), png_read_destroy(), and png_write_destroy() have been</div><div class='ctx'> moved to PNG_INTERNAL in version 0.95 to discourage their use.  These</div><div class='del'>-functions will be removed from libpng version 2.0.0.</div><div class='add'>+functions will be removed from libpng version 1.4.0.</div><div class='ctx'> </div><div class='ctx'> The preferred method of creating and initializing the libpng structures is</div><div class='ctx'> via the png_create_read_struct(), png_create_write_struct(), and</div><div class='hunk'>@@ -3827,21 +4536,29 @@ png_get_mmx_bitdepth_threshold(), png_get_mmx_rowbytes_threshold(),</div><div class='ctx'> png_set_asm_flags(), and png_mmx_supported()</div><div class='ctx'> </div><div class='ctx'> We removed the obsolete png_check_sig(), png_memcpy_check(), and</div><div class='del'>-png_memset_check() functions.  Instead use !png_sig_cmp(), png_memcpy(),</div><div class='del'>-and png_memset(), respectively.</div><div class='add'>+png_memset_check() functions.  Instead use !png_sig_cmp(), memcpy(),</div><div class='add'>+and memset(), respectively.</div><div class='ctx'> </div><div class='ctx'> The function png_set_gray_1_2_4_to_8() was removed. It has been</div><div class='ctx'> deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with</div><div class='ctx'> png_set_expand_gray_1_2_4_to_8() because the former function also</div><div class='ctx'> expanded palette images.</div><div class='ctx'> </div><div class='add'>+Macros for png_get_uint_16, png_get_uint_32, and png_get_int_32</div><div class='add'>+were added and are used by default instead of the corresponding</div><div class='add'>+functions. Unfortunately,</div><div class='add'>+from libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the  </div><div class='add'>+function) incorrectly returned a value of type png_uint_32.</div><div class='add'>+</div><div class='ctx'> We changed the prototype for png_malloc() from</div><div class='ctx'>     png_malloc(png_structp png_ptr, png_uint_32 size)</div><div class='ctx'> to</div><div class='ctx'>     png_malloc(png_structp png_ptr, png_alloc_size_t size)</div><div class='ctx'> </div><div class='add'>+This also applies to the prototype for the user replacement malloc_fn().</div><div class='add'>+</div><div class='ctx'> The png_calloc() function was added and is used in place of</div><div class='del'>-of "png_malloc(); png_memset();" except in the case in png_read_png()</div><div class='add'>+of "png_malloc(); memset();" except in the case in png_read_png()</div><div class='ctx'> where the array consists of pointers; in this case a "for" loop is used</div><div class='ctx'> after the png_malloc() to set the pointers to NULL, to give robust.</div><div class='ctx'> behavior in case the application runs out of memory part-way through</div><div class='hunk'>@@ -3859,9 +4576,287 @@ The png_zalloc() and png_zfree() functions are no longer exported.</div><div class='ctx'> The png_zalloc() function no longer zeroes out the memory that it</div><div class='ctx'> allocates.</div><div class='ctx'> </div><div class='add'>+Support for dithering was disabled by default in libpng-1.4.0, because</div><div class='add'>+been well tested and doesn't actually "dither".  The code was not</div><div class='add'>+removed, however, and could be enabled by building libpng with</div><div class='add'>+PNG_READ_DITHER_SUPPORTED defined.  In libpng-1.4.2, this support</div><div class='add'>+was reenabled, but the function was renamed png_set_quantize() to</div><div class='add'>+reflect more accurately what it actually does.  At the same time,</div><div class='add'>+the PNG_DITHER_[RED,GREEN_BLUE]_BITS macros were also renamed to</div><div class='add'>+PNG_QUANTIZE_[RED,GREEN,BLUE]_BITS, and PNG_READ_DITHER_SUPPORTED</div><div class='add'>+was renamed to PNG_READ_QUANTIZE_SUPPORTED.</div><div class='add'>+</div><div class='ctx'> We removed the trailing '.' from the warning and error messages.</div><div class='ctx'> </div><div class='del'>-.SH X. Detecting libpng</div><div class='add'>+.SH X.  Changes to Libpng from version 1.4.x to 1.5.x</div><div class='add'>+</div><div class='add'>+From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the  </div><div class='add'>+function) incorrectly returned a value of type png_uint_32.</div><div class='add'>+</div><div class='add'>+A. Changes that affect users of libpng</div><div class='add'>+</div><div class='add'>+There are no substantial API changes between the non-deprecated parts of</div><div class='add'>+the 1.4.5 API and the 1.5.0 API, however the ability to directly access</div><div class='add'>+the main libpng control structures, png_struct and png_info, deprecated</div><div class='add'>+in earlier versions of libpng, has been completely removed from</div><div class='add'>+libpng 1.5.</div><div class='add'>+</div><div class='add'>+We no longer include zlib.h in png.h.  Applications that need access</div><div class='add'>+to information in zlib.h will need to add the '#include "zlib.h"'</div><div class='add'>+directive.  It does not matter whether it is placed prior to or after</div><div class='add'>+the '"#include png.h"' directive.</div><div class='add'>+</div><div class='add'>+We moved the png_strcpy(), png_strncpy(), png_strlen(), png_memcpy(),</div><div class='add'>+png_memcmp(), png_sprintf, and png_memcpy() macros into a private</div><div class='add'>+header file (pngpriv.h) that is not accessible to applications.</div><div class='add'>+</div><div class='add'>+In png_get_iCCP, the type of "profile" was changed from png_charpp</div><div class='add'>+to png_bytepp, and in png_set_iCCP, from png_charp to png_const_bytep.</div><div class='add'>+</div><div class='add'>+There are changes of form in png.h, including new and changed macros to</div><div class='add'>+declare</div><div class='add'>+parts of the API.  Some API functions with arguments that are pointers to</div><div class='add'>+data not modified within the function have been corrected to declare</div><div class='add'>+these arguments with PNG_CONST.</div><div class='add'>+</div><div class='add'>+Much of the internal use of C macros to control the library build has also</div><div class='add'>+changed and some of this is visible in the exported header files, in</div><div class='add'>+particular the use of macros to control data and API elements visible</div><div class='add'>+during application compilation may require significant revision to</div><div class='add'>+application code.  (It is extremely rare for an application to do this.)</div><div class='add'>+</div><div class='add'>+Any program that compiled against libpng 1.4 and did not use deprecated</div><div class='add'>+features or access internal library structures should compile and work</div><div class='add'>+against libpng 1.5.</div><div class='add'>+</div><div class='add'>+libpng 1.5.0 adds PNG_ PASS macros to help in the reading and writing of</div><div class='add'>+interlaced images.  The macros return the number of rows and columns in</div><div class='add'>+each pass and information that can be used to de-interlace and (if</div><div class='add'>+absolutely necessary) interlace an image.</div><div class='add'>+</div><div class='add'>+libpng 1.5.0 adds an API png_longjmp(png_ptr, value).  This API calls</div><div class='add'>+the application provided png_longjmp_ptr on the internal, but application</div><div class='add'>+initialized, jmpbuf.  It is provided as a convenience to avoid the need</div><div class='add'>+to use the png_jmpbuf macro, which had the unnecessary side effect of</div><div class='add'>+resetting the internal png_longjmp_ptr value.</div><div class='add'>+</div><div class='add'>+libpng 1.5.0 includes a complete fixed point API.  By default this is</div><div class='add'>+present along with the corresponding floating point API.  In general the</div><div class='add'>+fixed point API is faster and smaller than the floating point one because</div><div class='add'>+the PNG file format used fixed point, not floating point.  This applies</div><div class='add'>+even if the library uses floating point in internal calculations.  A new</div><div class='add'>+macro, PNG_FLOATING_ARITHMETIC_SUPPORTED, reveals whether the library</div><div class='add'>+uses floating point arithmetic (the default) or fixed point arithmetic</div><div class='add'>+internally for performance critical calculations such as gamma correction.</div><div class='add'>+In some cases, the gamma calculations may produce slightly different</div><div class='add'>+results.  This has changed the results in png_rgb_to_gray and in alpha</div><div class='add'>+composition (png_set_background for example). This applies even if the</div><div class='add'>+original image was already linear (gamma == 1.0) and, therefore, it is</div><div class='add'>+not necessary to linearize the image.  This is because libpng has *not*</div><div class='add'>+been changed to optimize that case correctly, yet.</div><div class='add'>+</div><div class='add'>+Fixed point support for the sCAL chunk comes with an important caveat;</div><div class='add'>+the sCAL specification uses a decimal encoding of floating point values</div><div class='add'>+and the accuracy of PNG fixed point values is insufficient for</div><div class='add'>+representation of these values. Consequently a "string" API</div><div class='add'>+(png_get_sCAL_s and png_set_sCAL_s) is the only reliable way of reading</div><div class='add'>+arbitrary sCAL chunks in the absence of either the floating point API or</div><div class='add'>+internal floating point calculations.</div><div class='add'>+</div><div class='add'>+Applications no longer need to include the optional distribution header</div><div class='add'>+file pngusr.h or define the corresponding macros during application</div><div class='add'>+build in order to see the correct variant of the libpng API.  From 1.5.0</div><div class='add'>+application code can check for the corresponding _SUPPORTED macro:</div><div class='add'>+</div><div class='add'>+#ifdef PNG_INCH_CONVERSIONS_SUPPORTED</div><div class='add'>+   /* code that uses the inch conversion APIs. */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+This macro will only be defined if the inch conversion functions have been</div><div class='add'>+compiled into libpng.  The full set of macros, and whether or not support</div><div class='add'>+has been compiled in, are available in the header file pnglibconf.h.</div><div class='add'>+This header file is specific to the libpng build.  Notice that prior to</div><div class='add'>+1.5.0 the _SUPPORTED macros would always have the default definition unless</div><div class='add'>+reset by pngusr.h or by explicit settings on the compiler command line.</div><div class='add'>+These settings may produce compiler warnings or errors in 1.5.0 because</div><div class='add'>+of macro redefinition.</div><div class='add'>+</div><div class='add'>+From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the  </div><div class='add'>+function) incorrectly returned a value of type png_uint_32.  libpng 1.5.0</div><div class='add'>+is consistent with the implementation in 1.4.5 and 1.2.x (where the macro</div><div class='add'>+did not exist.)</div><div class='add'>+</div><div class='add'>+Applications can now choose whether to use these macros or to call the</div><div class='add'>+corresponding function by defining PNG_USE_READ_MACROS or</div><div class='add'>+PNG_NO_USE_READ_MACROS before including png.h.  Notice that this is</div><div class='add'>+only supported from 1.5.0 -defining PNG_NO_USE_READ_MACROS prior to 1.5.0</div><div class='add'>+ will lead to a link failure.</div><div class='add'>+</div><div class='add'>+B. Changes to the build and configuration of libpng</div><div class='add'>+</div><div class='add'>+Details of internal changes to the library code can be found in the CHANGES</div><div class='add'>+file.  These will be of no concern to the vast majority of library users or</div><div class='add'>+builders, however the few who configure libpng to a non-default feature</div><div class='add'>+set may need to change how this is done.</div><div class='add'>+</div><div class='add'>+There should be no need for library builders to alter build scripts if</div><div class='add'>+these use the distributed build support - configure or the makefiles -</div><div class='add'>+however users of the makefiles may care to update their build scripts</div><div class='add'>+to build pnglibconf.h where the corresponding makefile does not do so.</div><div class='add'>+</div><div class='add'>+Building libpng with a non-default configuration has changed completely.</div><div class='add'>+The old method using pngusr.h should still work correctly even though the</div><div class='add'>+way pngusr.h is used in the build has been changed, however library</div><div class='add'>+builders will probably want to examine the changes to take advantage of</div><div class='add'>+new capabilities and to simplify their build system.</div><div class='add'>+</div><div class='add'>+B.1 Specific changes to library configuration capabilities</div><div class='add'>+</div><div class='add'>+The library now supports a complete fixed point implementation and can</div><div class='add'>+thus be used on systems which have no floating point support or very</div><div class='add'>+limited or slow support.  Previously gamma correction, an essential part</div><div class='add'>+of complete PNG support, required reasonably fast floating point.</div><div class='add'>+</div><div class='add'>+As part of this the choice of internal implementation has been made</div><div class='add'>+independent of the choice of fixed versus floating point APIs and all the</div><div class='add'>+missing fixed point APIs have been implemented.</div><div class='add'>+</div><div class='add'>+The exact mechanism used to control attributes of API functions has</div><div class='add'>+changed.  A single set of operating system independent macro definitions</div><div class='add'>+is used and operating system specific directives are defined in</div><div class='add'>+pnglibconf.h</div><div class='add'>+</div><div class='add'>+As part of this the mechanism used to choose procedure call standards on</div><div class='add'>+those systems that allow a choice has been changed.  At present this only</div><div class='add'>+affects certain Microsoft (DOS, Windows) and IBM (OS/2) operating systems</div><div class='add'>+running on Intel processors.  As before PNGAPI is defined where required</div><div class='add'>+to control the exported API functions; however, two new macros, PNGCBAPI</div><div class='add'>+and PNGCAPI, are used instead for callback functions (PNGCBAPI) and</div><div class='add'>+(PNGCAPI) for functions that must match a C library prototype (currently</div><div class='add'>+only png_longjmp_ptr, which must match the C longjmp function.)  The new</div><div class='add'>+approach is documented in pngconf.h</div><div class='add'>+</div><div class='add'>+Despite these changes libpng 1.5.0 only supports the native C function</div><div class='add'>+calling standard on those platforms tested so far (__cdecl on Microsoft</div><div class='add'>+Windows).  This is because the support requirements for alternative</div><div class='add'>+calling conventions seem to no longer exist.  Developers who find it</div><div class='add'>+necessary to set PNG_API_RULE to 1 should advise the mailing list</div><div class='add'>+(png-mng-implement) of this and library builders who use Openwatcom and</div><div class='add'>+therefore set PNG_API_RULE to 2 should also contact the mailing list.</div><div class='add'>+</div><div class='add'>+A new test program, pngvalid, is provided in addition to pngtest.</div><div class='add'>+pngvalid validates the arithmetic accuracy of the gamma correction</div><div class='add'>+calculations and includes a number of validations of the file format.</div><div class='add'>+A subset of the full range of tests is run when "make check" is done</div><div class='add'>+(in the 'configure' build.)  pngvalid also allows total allocated memory</div><div class='add'>+usage to be evaluated and performs additional memory overwrite validation.</div><div class='add'>+</div><div class='add'>+Many changes to individual feature macros have been made. The following</div><div class='add'>+are the changes most likely to be noticed by library builders who</div><div class='add'>+configure libpng:</div><div class='add'>+</div><div class='add'>+1) All feature macros now have consistent naming:</div><div class='add'>+</div><div class='add'>+#define PNG_NO_feature turns the feature off</div><div class='add'>+#define PNG_feature_SUPPORTED turns the feature on</div><div class='add'>+</div><div class='add'>+pnglibconf.h contains one line for each feature macro which is either:</div><div class='add'>+</div><div class='add'>+#define PNG_feature_SUPPORTED</div><div class='add'>+</div><div class='add'>+if the feature is supported or:</div><div class='add'>+</div><div class='add'>+/*#undef PNG_feature_SUPPORTED*/</div><div class='add'>+</div><div class='add'>+if it is not.  Library code consistently checks for the 'SUPPORTED' macro.</div><div class='add'>+It does not, and should not, check for the 'NO' macro which will not</div><div class='add'>+normally be defined even if the feature is not supported.</div><div class='add'>+</div><div class='add'>+Compatibility with the old names is provided as follows:</div><div class='add'>+</div><div class='add'>+PNG_INCH_CONVERSIONS turns on PNG_INCH_CONVERSIONS_SUPPORTED</div><div class='add'>+</div><div class='add'>+And the following definitions disable the corresponding feature:</div><div class='add'>+</div><div class='add'>+PNG_SETJMP_NOT_SUPPORTED disables SETJMP</div><div class='add'>+PNG_READ_TRANSFORMS_NOT_SUPPORTED disables READ_TRANSFORMS</div><div class='add'>+PNG_NO_READ_COMPOSITED_NODIV disables READ_COMPOSITE_NODIV</div><div class='add'>+PNG_WRITE_TRANSFORMS_NOT_SUPPORTED disables WRITE_TRANSFORMS</div><div class='add'>+PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED disables READ_ANCILLARY_CHUNKS</div><div class='add'>+PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED disables WRITE_ANCILLARY_CHUNKS</div><div class='add'>+</div><div class='add'>+Library builders should remove use of the above, inconsistent, names.</div><div class='add'>+</div><div class='add'>+2) Warning and error message formatting was previously conditional on</div><div class='add'>+the STDIO feature. The library has been changed to use the</div><div class='add'>+CONSOLE_IO feature instead. This means that if CONSOLE_IO is disabled</div><div class='add'>+the library no longer uses the printf(3) functions, even though the</div><div class='add'>+default read/write implementations use (FILE) style stdio.h functions.</div><div class='add'>+</div><div class='add'>+3) Three feature macros now control the fixed/floating point decisions:</div><div class='add'>+</div><div class='add'>+PNG_FLOATING_POINT_SUPPORTED enables the floating point APIs</div><div class='add'>+</div><div class='add'>+PNG_FIXED_POINT_SUPPORTED enables the fixed point APIs; however, in</div><div class='add'>+practice these are normally required internally anyway (because the PNG</div><div class='add'>+file format is fixed point), therefore in most cases PNG_NO_FIXED_POINT</div><div class='add'>+merely stops the function from being exported.</div><div class='add'>+</div><div class='add'>+PNG_FLOATING_ARITHMETIC_SUPPORTED chooses between the internal floating</div><div class='add'>+point implementation or the fixed point one.  Typically the fixed point</div><div class='add'>+implementation is larger and slower than the floating point implementation</div><div class='add'>+on a system that supports floating point, however it may be faster on a</div><div class='add'>+system which lacks floating point hardware and therefore uses a software</div><div class='add'>+emulation.</div><div class='add'>+</div><div class='add'>+4) Added PNG_{READ,WRITE}_INT_FUNCTIONS_SUPPORTED.  This allows the</div><div class='add'>+functions to read and write ints to be disabled independently of</div><div class='add'>+PNG_USE_READ_MACROS, which allows libpng to be built with the functions</div><div class='add'>+even though the default is to use the macros - this allows applications</div><div class='add'>+to choose at app buildtime whether or not to use macros (previously</div><div class='add'>+impossible because the functions weren't in the default build.)</div><div class='add'>+</div><div class='add'>+B.2 Changes to the configuration mechanism</div><div class='add'>+</div><div class='add'>+Prior to libpng-1.5.0 library builders who needed to configure libpng</div><div class='add'>+had either to modify the exported pngconf.h header file to add system</div><div class='add'>+specific configuration or had to write feature selection macros into</div><div class='add'>+pngusr.h and cause this to be included into pngconf.h by defining</div><div class='add'>+PNG_USER_CONFIG. The latter mechanism had the disadvantage that an</div><div class='add'>+application built without PNG_USER_CONFIG defined would see the</div><div class='add'>+unmodified, default, libpng API and thus would probably fail to link.</div><div class='add'>+</div><div class='add'>+These mechanisms still work in the configure build and in any makefile</div><div class='add'>+build that builds pnglibconf.h although the feature selection macros</div><div class='add'>+have changed somewhat as described above.  In 1.5.0, however, pngusr.h is</div><div class='add'>+processed only once, when the exported header file pnglibconf.h is built.</div><div class='add'>+pngconf.h no longer includes pngusr.h, therefore it is ignored after the</div><div class='add'>+build of pnglibconf.h and it is never included in an application build.</div><div class='add'>+</div><div class='add'>+The rarely used alternative of adding a list of feature macros to the</div><div class='add'>+CFLAGS setting in the build also still works, however the macros will be</div><div class='add'>+copied to pnglibconf.h and this may produce macro redefinition warnings</div><div class='add'>+when the individual C files are compiled.</div><div class='add'>+</div><div class='add'>+All configuration now only works if pnglibconf.h is built from</div><div class='add'>+scripts/pnglibconf.dfa.  This requires the program awk.  Brian Kernighan</div><div class='add'>+(the original author of awk) maintains C source code of that awk and this</div><div class='add'>+and all known later implementations (often called by subtly different</div><div class='add'>+names - nawk and gawk for example) are adequate to build pnglibconf.h.</div><div class='add'>+The Sun Microsystems (now Oracle) program 'awk' is an earlier version</div><div class='add'>+and does not work, this may also apply to other systems that have a</div><div class='add'>+functioning awk called 'nawk'.</div><div class='add'>+</div><div class='add'>+Configuration options are now documented in scripts/pnglibconf.dfa.  This</div><div class='add'>+file also includes dependency information that ensures a configuration is</div><div class='add'>+consistent; that is, if a feature is switched off dependent features are</div><div class='add'>+also removed.  As a recommended alternative to using feature macros in</div><div class='add'>+pngusr.h a system builder may also define equivalent options in pngusr.dfa</div><div class='add'>+(or, indeed, any file) and add that to the configuration by setting</div><div class='add'>+DFA_XTRA to the file name.  The makefiles in contrib/pngminim illustrate</div><div class='add'>+how to do this, and a case where pngusr.h is still required.</div><div class='add'>+</div><div class='add'>+.SH XI. Detecting libpng</div><div class='ctx'> </div><div class='ctx'> The png_get_io_ptr() function has been present since libpng-0.88, has never</div><div class='ctx'> changed, and is unaffected by conditional compilation macros.  It is the</div><div class='hunk'>@@ -3870,7 +4865,7 @@ libpng version since 0.88.  In an autoconf "configure.in" you could use</div><div class='ctx'> </div><div class='ctx'>     AC_CHECK_LIB(png, png_get_io_ptr, ...</div><div class='ctx'> </div><div class='del'>-.SH XI. Source code repository</div><div class='add'>+.SH XII. Source code repository</div><div class='ctx'> </div><div class='ctx'> Since about February 2009, version 1.2.34, libpng has been under "git" source</div><div class='ctx'> control.  The git repository was built from old libpng-x.y.z.tar.gz files</div><div class='hunk'>@@ -3889,7 +4884,12 @@ the libpng bug tracker at</div><div class='ctx'> </div><div class='ctx'>     http://libpng.sourceforge.net</div><div class='ctx'> </div><div class='del'>-.SH XII. Coding style</div><div class='add'>+We also accept patches built from the tar or zip distributions, and</div><div class='add'>+simple verbal discriptions of bug fixes, reported either to the</div><div class='add'>+SourceForge bug tracker or to the png-mng-implement at lists.sf.net</div><div class='add'>+mailing list.</div><div class='add'>+</div><div class='add'>+.SH XIII. Coding style</div><div class='ctx'> </div><div class='ctx'> Our coding style is similar to the "Allman" style, with curly</div><div class='ctx'> braces on separate lines:</div><div class='hunk'>@@ -3928,12 +4928,12 @@ the statement that follows the comment:</div><div class='ctx'>     /* Single-line comment */</div><div class='ctx'>     statement;</div><div class='ctx'> </div><div class='del'>-    /* Multiple-line</div><div class='del'>-     * comment</div><div class='add'>+    /* This is a multiple-line</div><div class='add'>+     * comment.</div><div class='ctx'>      */</div><div class='ctx'>     statement;</div><div class='ctx'> </div><div class='del'>-Very short comments can be placed at the end of the statement</div><div class='add'>+Very short comments can be placed after the end of the statement</div><div class='ctx'> to which they pertain:</div><div class='ctx'> </div><div class='ctx'>     statement;    /* comment */</div><div class='hunk'>@@ -3946,7 +4946,7 @@ Functions and their curly braces are not indented, and</div><div class='ctx'> exported functions are marked with PNGAPI:</div><div class='ctx'> </div><div class='ctx'>  /* This is a public function that is visible to</div><div class='del'>-  * application programers. It does thus-and-so.</div><div class='add'>+  * application programmers. It does thus-and-so.</div><div class='ctx'>   */</div><div class='ctx'>  void PNGAPI</div><div class='ctx'>  png_exported_function(png_ptr, png_info, foo)</div><div class='hunk'>@@ -3974,15 +4974,16 @@ above the comment that says</div><div class='ctx'> </div><div class='ctx'>   /* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */</div><div class='ctx'> </div><div class='del'>-The names of all exported functions and variables begin</div><div class='del'>-with  "png_", and all publicly visible C preprocessor</div><div class='del'>-macros begin with "PNG_".</div><div class='add'>+To avoid polluting the global namespace, the names of all exported</div><div class='add'>+functions and variables begin with  "png_", and all publicly visible C</div><div class='add'>+preprocessor macros begin with "PNG_".  We request that applications that</div><div class='add'>+use libpng *not* begin any of their own symbols with either of these strings.</div><div class='ctx'> </div><div class='ctx'> We put a space after each comma and after each semicolon</div><div class='del'>-in "for" statments, and we put spaces before and after each</div><div class='del'>-C binary operator and after "for" or "while".  We don't</div><div class='del'>-put a space between a typecast and the expression being</div><div class='del'>-cast, nor do we put one between a function name and the</div><div class='add'>+in "for" statements, and we put spaces before and after each</div><div class='add'>+C binary operator and after "for" or "while", and before</div><div class='add'>+"?".  We don't put a space between a typecast and the expression</div><div class='add'>+being cast, nor do we put one between a function name and the</div><div class='ctx'> left parenthesis that follows it:</div><div class='ctx'> </div><div class='ctx'>     for (i = 2; i &gt; 0; --i)</div><div class='hunk'>@@ -3997,15 +4998,15 @@ Lines do not exceed 80 characters.</div><div class='ctx'> </div><div class='ctx'> Other rules can be inferred by inspecting the libpng source.</div><div class='ctx'> </div><div class='del'>-.SH XIII. Y2K Compliance in libpng</div><div class='add'>+.SH XIV. Y2K Compliance in libpng</div><div class='ctx'> </div><div class='del'>-January 3, 2010</div><div class='add'>+February 3, 2011</div><div class='ctx'> </div><div class='ctx'> Since the PNG Development group is an ad-hoc body, we can't make</div><div class='ctx'> an official declaration.</div><div class='ctx'> </div><div class='ctx'> This is your unofficial assurance that libpng from version 0.71 and</div><div class='del'>-upward through 1.4.0 are Y2K compliant.  It is my belief that earlier</div><div class='add'>+upward through 1.5.1 are Y2K compliant.  It is my belief that earlier</div><div class='ctx'> versions were also Y2K compliant.</div><div class='ctx'> </div><div class='ctx'> Libpng only has three year fields.  One is a 2-byte unsigned integer that</div><div class='hunk'>@@ -4178,6 +5179,19 @@ the first widely used release:</div><div class='ctx'>  1.4.0beta88-109     14    10400  14.so.14.0[.0]</div><div class='ctx'>  1.4.0rc02-08        14    10400  14.so.14.0[.0]</div><div class='ctx'>  1.4.0               14    10400  14.so.14.0[.0]</div><div class='add'>+ 1.4.1beta01-03      14    10401  14.so.14.1[.0]</div><div class='add'>+ 1.4.1rc01           14    10401  14.so.14.1[.0]</div><div class='add'>+ 1.4.1beta04-12      14    10401  14.so.14.1[.0]</div><div class='add'>+ 1.4.1               14    10401  14.so.14.1[.0]</div><div class='add'>+ 1.4.2               14    10402  14.so.14.2[.0]</div><div class='add'>+ 1.4.3               14    10403  14.so.14.3[.0]</div><div class='add'>+ 1.4.4               14    10404  14.so.14.4[.0]</div><div class='add'>+ 1.5.0beta01-58      15    10500  15.so.15.0[.0]</div><div class='add'>+ 1.5.0rc01-07        15    10500  15.so.15.0[.0]</div><div class='add'>+ 1.5.0               15    10500  15.so.15.0[.0]</div><div class='add'>+ 1.5.1beta01-11      15    10501  15.so.15.1[.0]</div><div class='add'>+ 1.5.1rc01-02        15    10501  15.so.15.1[.0]</div><div class='add'>+ 1.5.1               15    10501  15.so.15.1[.0]</div><div class='ctx'> </div><div class='ctx'> Henceforth the source version will match the shared-library minor</div><div class='ctx'> and patch numbers; the shared-library major version number will be</div><div class='hunk'>@@ -4190,7 +5204,8 @@ version 1.0.6j; from then on they were given the upcoming public</div><div class='ctx'> release number plus "betaNN" or "rcN".</div><div class='ctx'> </div><div class='ctx'> .SH "SEE ALSO"</div><div class='del'>-libpngpf(3), png(5)</div><div class='add'>+.BR "png"(5), " libpngpf"(3), " zlib"(3), " deflate"(5), " " and " zlib"(5)</div><div class='add'>+</div><div class='ctx'> .LP</div><div class='ctx'> .IR libpng :</div><div class='ctx'> .IP</div><div class='hunk'>@@ -4233,7 +5248,7 @@ possible without all of you.</div><div class='ctx'> </div><div class='ctx'> Thanks to Frank J. T. Wojcik for helping with the documentation.</div><div class='ctx'> </div><div class='del'>-Libpng version 1.4.0 - January 3, 2010:</div><div class='add'>+Libpng version 1.5.1 - February 3, 2011:</div><div class='ctx'> Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.</div><div class='ctx'> Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).</div><div class='ctx'> </div><div class='hunk'>@@ -4256,7 +5271,7 @@ this sentence.</div><div class='ctx'> </div><div class='ctx'> This code is released under the libpng license.</div><div class='ctx'> </div><div class='del'>-libpng versions 1.2.6, August 15, 2004, through 1.4.0, January 3, 2010, are</div><div class='add'>+libpng versions 1.2.6, August 15, 2004, through 1.5.1, February 3, 2011, are</div><div class='ctx'> Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are</div><div class='ctx'> distributed according to the same disclaimer and license as libpng-1.2.5</div><div class='ctx'> with the following individual added to the list of Contributing Authors</div><div class='hunk'>@@ -4355,7 +5370,7 @@ certification mark of the Open Source Initiative.</div><div class='ctx'> </div><div class='ctx'> Glenn Randers-Pehrson</div><div class='ctx'> glennrp at users.sourceforge.net</div><div class='del'>-January 3, 2010</div><div class='add'>+February 3, 2011</div><div class='ctx'> </div><div class='ctx'> .\" end of man page</div><div class='ctx'> </div><div class='head'>diff --git a/src/3rdparty/libpng/libpngpf.3 b/src/3rdparty/libpng/libpngpf.3<br/>index f323764..ff6e164 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/libpngpf.3?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/libpngpf.3</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/libpngpf.3?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/libpngpf.3</a></div><div class='hunk'>@@ -1,810 +1,30 @@</div><div class='del'>-.TH LIBPNGPF 3 "January 3, 2010"</div><div class='add'>+.TH LIBPNGPF 3 "February 3, 2011"</div><div class='ctx'> .SH NAME</div><div class='del'>-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0</div><div class='add'>+libpng \- Portable Network Graphics (PNG) Reference Library 1.5.1</div><div class='ctx'> (private functions)</div><div class='ctx'> .SH SYNOPSIS</div><div class='del'>-\fB#include &lt;png.h&gt;\fP</div><div class='del'>-</div><div class='ctx'> \fB#include \fI"pngpriv.h"</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='del'>-\fBvoid png_64bit_product (long \fP\fIv1\fP\fB, long \fP\fIv2\fP\fB, unsigned long \fI*hi_product,</div><div class='del'>-</div><div class='del'>-\fBunsigned long \fI*lo_product\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_build_gamma_table (png_structp \fP\fIpng_ptr\fP\fB, png_byte \fIbit_depth\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_build_grayscale_palette (int \fP\fIbit_depth\fP\fB, png_colorp \fIpalette\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_calculate_crc (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIptr\fP\fB, png_size_t \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBint png_check_cHRM_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_fixed_point \fP\fIint_white_x\fP\fB, png_fixed_point \fP\fIint_white_y\fP\fB, png_fixed_point \fP\fIint_red_x\fP\fB, png_fixed_point \fP\fIint_red_y\fP\fB, png_fixed_point \fP\fIint_green_x\fP\fB, png_fixed_point \fP\fIint_green_y\fP\fB, png_fixed_point \fP\fIint_blue_x\fP\fB, png_fixed_point \fIint_blue_y\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_check_chunk_name (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIchunk_name\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBpng_size_t png_check_keyword (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charpp \fInew_key\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_check_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIwidth\fP\fB, png_uint_32 \fP\fIheight\fP\fB, int \fP\fIbit_depth\fP\fB, int \fP\fIcolor_type\fP\fB, int \fP\fIinterlace_type\fP\fB, int \fP\fIcompression_type\fP\fB, int \fIfilter_type\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_combine_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fImask\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_correct_palette (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, int \fInum_palette\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBint png_crc_error (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBint png_crc_finish (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIskip\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_crc_read (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuf\fP\fB, png_size_t \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBpng_voidp png_create_struct (int \fItype\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBpng_voidp png_create_struct_2 (int \fP\fItype\fP\fB, png_malloc_ptr \fP\fImalloc_fn\fP\fB, png_voidp \fImem_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBint png_debug(int \fP\fIlevel\fP\fB, png_const_charp \fImessage\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBint png_debug1(int \fP\fIlevel\fP\fB, png_const_charp \fP\fImessage\fP\fB, \fIp1\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBint png_debug2(int \fP\fIlevel\fP\fB, png_const_charp \fP\fImessage\fP\fB, \fP\fIp1\fP\fB, \fIp2\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_decompress_chunk (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIcomp_type\fP\fB, png_size_t \fP\fIchunklength\fP\fB, png_size_t \fP\fIprefix_length\fP\fB, png_size_t \fI*data_length\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_destroy_struct (png_voidp \fIstruct_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_destroy_struct_2 (png_voidp \fP\fIstruct_ptr\fP\fB, png_free_ptr \fP\fIfree_fn\fP\fB, png_voidp \fImem_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_background (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_16p \fP\fItrans_color\fP\fB, png_color_16p \fP\fIbackground\fP\fB, png_color_16p \fP\fIbackground_1\fP\fB, png_bytep \fP\fIgamma_table\fP\fB, png_bytep \fP\fIgamma_from_1\fP\fB, png_bytep \fP\fIgamma_to_1\fP\fB, png_uint_16pp \fP\fIgamma_16\fP\fB, png_uint_16pp \fP\fIgamma_16_from_1\fP\fB, png_uint_16pp \fP\fIgamma_16_to_1\fP\fB, int \fIgamma_shift\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_bgr (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_chop (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_dither (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIpalette_lookup\fP\fB, png_bytep \fIdither_lookup\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_expand (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_16p \fItrans_value\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_expand_palette (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_colorp \fP\fIpalette\fP\fB, png_bytep \fP\fItrans\fP\fB, int \fInum_trans\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_gamma (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIgamma_table\fP\fB, png_uint_16pp \fP\fIgamma_16_table\fP\fB, int \fIgamma_shift\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_gray_to_rgb (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_invert (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_pack (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fIbit_depth\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_packswap (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_read_filler (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fP\fIfiller\fP\fB, png_uint_32 \fIflags\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_read_interlace (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fP\fIpass\fP\fB, png_uint_32 \fItransformations\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_read_invert_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_read_swap_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_read_transformations (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBint png_do_rgb_to_gray (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_shift (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_8p \fIbit_depth\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_strip_filler (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_uint_32 \fIflags\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_swap (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_unpack (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_unshift (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_color_8p \fIsig_bits\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_write_interlace (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, int \fIpass\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_write_invert_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_write_swap_alpha (png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fIrow\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_do_write_transformations (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid *png_far_to_near (png_structp png_ptr,png_voidp \fP\fIptr\fP\fB, int \fIcheck\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_flush (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_bKGD (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_gAMA (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_IEND (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_iTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_sRGB (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_unknown (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_handle_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_info_destroy (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_init_mmx_flags (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_init_read_transformations (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_process_IDAT_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_length\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_process_some_data (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_check_crc (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_crc_finish (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_crc_skip (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_fill_buffer (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_handle_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_handle_unknown (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_handle_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_uint_32 \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_have_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_have_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_have_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIrow\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_process_row (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_read_chunk (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_read_end (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_read_IDAT (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_read_sig (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_read_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_read_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_restore_buffer (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIbuffer\fP\fB, png_size_t \fIbuffer_length\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_push_save_buffer (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_read_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_read_destroy (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_infop \fIend_info_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_read_filter_row (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fP\fIrow_info\fP\fB, png_bytep \fP\fIrow\fP\fB, png_bytep \fP\fIprev_row\fP\fB, int \fIfilter\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_read_finish_row (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_read_push_finish_row (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_read_start_row (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_read_transform_info (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fIinfo_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_reset_crc (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBint png_set_text_2 (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, png_textp \fP\fItext_ptr\fP\fB, int \fInum_text\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_cHRM (png_structp \fP\fIpng_ptr\fP\fB, double \fP\fIwhite_x\fP\fB, double \fP\fIwhite_y\fP\fB, double \fP\fIred_x\fP\fB, double \fP\fIred_y\fP\fB, double \fP\fIgreen_x\fP\fB, double \fP\fIgreen_y\fP\fB, double \fP\fIblue_x\fP\fB, double \fIblue_y\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_cHRM_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIwhite_x\fP\fB, png_uint_32 \fP\fIwhite_y\fP\fB, png_uint_32 \fP\fIred_x\fP\fB, png_uint_32 \fP\fIred_y\fP\fB, png_uint_32 \fP\fIgreen_x\fP\fB, png_uint_32 \fP\fIgreen_y\fP\fB, png_uint_32 \fP\fIblue_x\fP\fB, png_uint_32 \fIblue_y\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_data (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_destroy (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_filtered_row (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fIfiltered_row\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_find_filter (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fIrow_info\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_finish_row (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_gAMA (png_structp \fP\fIpng_ptr\fP\fB, double \fIfile_gamma\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_gAMA_fixed (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fIint_file_gamma\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_hIST (png_structp \fP\fIpng_ptr\fP\fB, png_uint_16p \fP\fIhist\fP\fB, int \fInum_hist\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_iCCP (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIname\fP\fB, int \fP\fIcompression_type\fP\fB, png_charp \fP\fIprofile\fP\fB, int \fIproflen\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_IDAT (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fIdata\fP\fB, png_size_t \fIlength\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_IEND (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_IHDR (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIwidth\fP\fB, png_uint_32 \fP\fIheight\fP\fB, int \fP\fIbit_depth\fP\fB, int \fP\fIcolor_type\fP\fB, int \fP\fIcompression_type\fP\fB, int \fP\fIfilter_type\fP\fB, int \fIinterlace_type\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_iTXt (png_structp \fP\fIpng_ptr\fP\fB, int \fP\fIcompression\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fIlang\fP\fB, png_charp \fP\fItranslated_key\fP\fB, png_charp \fItext\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='add'>+\fBAs of libpng version \fP\fI1.5.1\fP\fB, this section is no longer \fP\fImaintained\fP\fB, now \fIthat</div><div class='ctx'> </div><div class='del'>-\fI\fB</div><div class='add'>+\fBthe private function prototypes are hidden in pngpriv.h and not \fIaccessible</div><div class='ctx'> </div><div class='del'>-\fBvoid png_write_oFFs (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIx_offset\fP\fB, png_uint_32 \fP\fIy_offset\fP\fB, int \fIunit_type\fP\fB);\fP</div><div class='add'>+\fBto applications. Look in pngpriv.h for the prototypes and a short \fIdescription</div><div class='ctx'> </div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_pCAL (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIpurpose\fP\fB, png_int_32 \fP\fIX0\fP\fB, png_int_32 \fP\fIX1\fP\fB, int \fP\fItype\fP\fB, int \fP\fInparams\fP\fB, png_charp \fP\fIunits\fP\fB, png_charpp \fIparams\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_pHYs (png_structp \fP\fIpng_ptr\fP\fB, png_uint_32 \fP\fIx_pixels_per_unit\fP\fB, png_uint_32 \fP\fIy_pixels_per_unit\fP\fB, int \fIunit_type\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_PLTE (png_structp \fP\fIpng_ptr\fP\fB, png_colorp \fP\fIpalette\fP\fB, png_uint_32 \fInum_pal\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_sBIT (png_structp \fP\fIpng_ptr\fP\fB, png_color_8p \fP\fIsbit\fP\fB, int \fIcolor_type\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_sCAL (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIunit\fP\fB, double \fP\fIwidth\fP\fB, double \fIheight\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_sCAL_s (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIunit\fP\fB, png_charp \fP\fIwidth\fP\fB, png_charp \fIheight\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_sRGB (png_structp \fP\fIpng_ptr\fP\fB, int \fIintent\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_sPLT (png_structp \fP\fIpng_ptr\fP\fB, png_spalette_p \fIpalette\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_start_row (png_structp \fIpng_ptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_tEXt (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fItext\fP\fB, png_size_t \fItext_len\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_tIME (png_structp \fP\fIpng_ptr\fP\fB, png_timep \fImod_time\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_tRNS (png_structp \fP\fIpng_ptr\fP\fB, png_bytep \fP\fItrans\fP\fB, png_color_16p \fP\fIvalues\fP\fB, int \fP\fInumber\fP\fB, int \fIcolor_type\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_write_zTXt (png_structp \fP\fIpng_ptr\fP\fB, png_charp \fP\fIkey\fP\fB, png_charp \fP\fItext\fP\fB, png_size_t \fP\fItext_len\fP\fB, int \fIcompression\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoidpf png_zalloc (voidpf \fP\fIpng_ptr\fP\fB, uInt \fP\fIitems\fP\fB, uInt \fIsize\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='del'>-</div><div class='del'>-\fBvoid png_zfree (voidpf \fP\fIpng_ptr\fP\fB, voidpf \fIptr\fP\fB);\fP</div><div class='del'>-</div><div class='del'>-\fI\fB</div><div class='add'>+\fBof each \fIfunction.</div><div class='ctx'> </div><div class='ctx'> \fI\fB</div><div class='ctx'> </div><div class='ctx'> .SH DESCRIPTION</div><div class='del'>-The functions listed above are used privately by libpng</div><div class='add'>+The functions previously listed here are  used privately by libpng</div><div class='ctx'> and are not recommended for use by applications.  They are</div><div class='ctx'> not "exported" to applications using shared libraries.  They</div><div class='ctx'> are listed alphabetically here as an aid to libpng maintainers.</div><div class='del'>-See png.h for more information on these functions.</div><div class='add'>+See pngpriv.h for more information on these functions.</div><div class='ctx'> </div><div class='ctx'> .SH SEE ALSO</div><div class='del'>-libpng(3), png(5)</div><div class='add'>+.BR "png"(5), " libpng"(3), " zlib"(3), " deflate"(5), " " and " zlib"(5)</div><div class='ctx'> .SH AUTHOR</div><div class='ctx'> Glenn Randers-Pehrson</div><div class='head'>diff --git a/src/3rdparty/libpng/ltmain.sh b/src/3rdparty/libpng/ltmain.sh<br/>deleted file mode 100755<br/>index a72f2fd..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/ltmain.sh?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/ltmain.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8406 +0,0 @@</div><div class='del'>-# Generated from ltmain.m4sh.</div><div class='del'>-</div><div class='del'>-# ltmain.sh (GNU libtool) 2.2.6b</div><div class='del'>-# Written by Gordon Matzigkeit &lt;gord@gnu.ai.mit.edu&gt;, 1996</div><div class='del'>-</div><div class='del'>-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.</div><div class='del'>-# This is free software; see the source for copying conditions.  There is NO</div><div class='del'>-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</div><div class='del'>-</div><div class='del'>-# GNU Libtool is free software; you can redistribute it and/or modify</div><div class='del'>-# it under the terms of the GNU General Public License as published by</div><div class='del'>-# the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-# (at your option) any later version.</div><div class='del'>-#</div><div class='del'>-# As a special exception to the GNU General Public License,</div><div class='del'>-# if you distribute this file as part of a program or library that</div><div class='del'>-# is built using GNU Libtool, you may include this file under the</div><div class='del'>-# same distribution terms that you use for the rest of that program.</div><div class='del'>-#</div><div class='del'>-# GNU Libtool is distributed in the hope that it will be useful, but</div><div class='del'>-# WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>-# General Public License for more details.</div><div class='del'>-#</div><div class='del'>-# You should have received a copy of the GNU General Public License</div><div class='del'>-# along with GNU Libtool; see the file COPYING.  If not, a copy</div><div class='del'>-# can be downloaded from http://www.gnu.org/licenses/gpl.html,</div><div class='del'>-# or obtained by writing to the Free Software Foundation, Inc.,</div><div class='del'>-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</div><div class='del'>-</div><div class='del'>-# Usage: $progname [OPTION]... [MODE-ARG]...</div><div class='del'>-#</div><div class='del'>-# Provide generalized library-building support services.</div><div class='del'>-#</div><div class='del'>-#     --config             show all configuration variables</div><div class='del'>-#     --debug              enable verbose shell tracing</div><div class='del'>-# -n, --dry-run            display commands without modifying any files</div><div class='del'>-#     --features           display basic configuration information and exit</div><div class='del'>-#     --mode=MODE          use operation mode MODE</div><div class='del'>-#     --preserve-dup-deps  don't remove duplicate dependency libraries</div><div class='del'>-#     --quiet, --silent    don't print informational messages</div><div class='del'>-#     --tag=TAG            use configuration variables from tag TAG</div><div class='del'>-# -v, --verbose            print informational messages (default)</div><div class='del'>-#     --version            print version information</div><div class='del'>-# -h, --help               print short or long help message</div><div class='del'>-#</div><div class='del'>-# MODE must be one of the following:</div><div class='del'>-#</div><div class='del'>-#       clean              remove files from the build directory</div><div class='del'>-#       compile            compile a source file into a libtool object</div><div class='del'>-#       execute            automatically set library path, then run a program</div><div class='del'>-#       finish             complete the installation of libtool libraries</div><div class='del'>-#       install            install libraries or executables</div><div class='del'>-#       link               create a library or an executable</div><div class='del'>-#       uninstall          remove libraries from an installed directory</div><div class='del'>-#</div><div class='del'>-# MODE-ARGS vary depending on the MODE.</div><div class='del'>-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.</div><div class='del'>-#</div><div class='del'>-# When reporting a bug, please describe a test case to reproduce it and</div><div class='del'>-# include the following information:</div><div class='del'>-#</div><div class='del'>-#       host-triplet:	$host</div><div class='del'>-#       shell:		$SHELL</div><div class='del'>-#       compiler:		$LTCC</div><div class='del'>-#       compiler flags:		$LTCFLAGS</div><div class='del'>-#       linker:		$LD (gnu? $with_gnu_ld)</div><div class='del'>-#       $progname:		(GNU libtool) 2.2.6b</div><div class='del'>-#       automake:		$automake_version</div><div class='del'>-#       autoconf:		$autoconf_version</div><div class='del'>-#</div><div class='del'>-# Report bugs to &lt;bug-libtool@gnu.org&gt;.</div><div class='del'>-</div><div class='del'>-PROGRAM=ltmain.sh</div><div class='del'>-PACKAGE=libtool</div><div class='del'>-VERSION=2.2.6b</div><div class='del'>-TIMESTAMP=""</div><div class='del'>-package_revision=1.3017</div><div class='del'>-</div><div class='del'>-# Be Bourne compatible</div><div class='del'>-if test -n "${ZSH_VERSION+set}" &amp;&amp; (emulate sh) &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-  emulate sh</div><div class='del'>-  NULLCMD=:</div><div class='del'>-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which</div><div class='del'>-  # is contrary to our usage.  Disable this feature.</div><div class='del'>-  alias -g '${1+"$@"}'='"$@"'</div><div class='del'>-  setopt NO_GLOB_SUBST</div><div class='del'>-else</div><div class='del'>-  case `(set -o) 2&gt;/dev/null` in *posix*) set -o posix;; esac</div><div class='del'>-fi</div><div class='del'>-BIN_SH=xpg4; export BIN_SH # for Tru64</div><div class='del'>-DUALCASE=1; export DUALCASE # for MKS sh</div><div class='del'>-</div><div class='del'>-# NLS nuisances: We save the old values to restore during execute mode.</div><div class='del'>-# Only set LANG and LC_ALL to C if already set.</div><div class='del'>-# These must not be set unconditionally because not all systems understand</div><div class='del'>-# e.g. LANG=C (notably SCO).</div><div class='del'>-lt_user_locale=</div><div class='del'>-lt_safe_locale=</div><div class='del'>-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES</div><div class='del'>-do</div><div class='del'>-  eval "if test \"\${$lt_var+set}\" = set; then</div><div class='del'>-          save_$lt_var=\$$lt_var</div><div class='del'>-          $lt_var=C</div><div class='del'>-	  export $lt_var</div><div class='del'>-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"</div><div class='del'>-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"</div><div class='del'>-	fi"</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-$lt_unset CDPATH</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-: ${CP="cp -f"}</div><div class='del'>-: ${ECHO="echo"}</div><div class='del'>-: ${EGREP="/bin/grep -E"}</div><div class='del'>-: ${FGREP="/bin/grep -F"}</div><div class='del'>-: ${GREP="/bin/grep"}</div><div class='del'>-: ${LN_S="ln -s"}</div><div class='del'>-: ${MAKE="make"}</div><div class='del'>-: ${MKDIR="mkdir"}</div><div class='del'>-: ${MV="mv -f"}</div><div class='del'>-: ${RM="rm -f"}</div><div class='del'>-: ${SED="/bin/sed"}</div><div class='del'>-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}</div><div class='del'>-: ${Xsed="$SED -e 1s/^X//"}</div><div class='del'>-</div><div class='del'>-# Global variables:</div><div class='del'>-EXIT_SUCCESS=0</div><div class='del'>-EXIT_FAILURE=1</div><div class='del'>-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.</div><div class='del'>-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.</div><div class='del'>-</div><div class='del'>-exit_status=$EXIT_SUCCESS</div><div class='del'>-</div><div class='del'>-# Make sure IFS has a sensible default</div><div class='del'>-lt_nl='</div><div class='del'>-'</div><div class='del'>-IFS=" 	$lt_nl"</div><div class='del'>-</div><div class='del'>-dirname="s,/[^/]*$,,"</div><div class='del'>-basename="s,^.*/,,"</div><div class='del'>-</div><div class='del'>-# func_dirname_and_basename file append nondir_replacement</div><div class='del'>-# perform func_basename and func_dirname in a single function</div><div class='del'>-# call:</div><div class='del'>-#   dirname:  Compute the dirname of FILE.  If nonempty,</div><div class='del'>-#             add APPEND to the result, otherwise set result</div><div class='del'>-#             to NONDIR_REPLACEMENT.</div><div class='del'>-#             value returned in "$func_dirname_result"</div><div class='del'>-#   basename: Compute filename of FILE.</div><div class='del'>-#             value retuned in "$func_basename_result"</div><div class='del'>-# Implementation must be kept synchronized with func_dirname</div><div class='del'>-# and func_basename. For efficiency, we do not delegate to</div><div class='del'>-# those functions but instead duplicate the functionality here.</div><div class='del'>-func_dirname_and_basename ()</div><div class='del'>-{</div><div class='del'>-  # Extract subdirectory from the argument.</div><div class='del'>-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`</div><div class='del'>-  if test "X$func_dirname_result" = "X${1}"; then</div><div class='del'>-    func_dirname_result="${3}"</div><div class='del'>-  else</div><div class='del'>-    func_dirname_result="$func_dirname_result${2}"</div><div class='del'>-  fi</div><div class='del'>-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# Generated shell functions inserted here.</div><div class='del'>-</div><div class='del'>-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh</div><div class='del'>-# is ksh but when the shell is invoked as "sh" and the current value of</div><div class='del'>-# the _XPG environment variable is not equal to 1 (one), the special</div><div class='del'>-# positional parameter $0, within a function call, is the name of the</div><div class='del'>-# function.</div><div class='del'>-progpath="$0"</div><div class='del'>-</div><div class='del'>-# The name of this program:</div><div class='del'>-# In the unlikely event $progname began with a '-', it would play havoc with</div><div class='del'>-# func_echo (imagine progname=-n), so we prepend ./ in that case:</div><div class='del'>-func_dirname_and_basename "$progpath"</div><div class='del'>-progname=$func_basename_result</div><div class='del'>-case $progname in</div><div class='del'>-  -*) progname=./$progname ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# Make sure we have an absolute path for reexecution:</div><div class='del'>-case $progpath in</div><div class='del'>-  [\\/]*|[A-Za-z]:\\*) ;;</div><div class='del'>-  *[\\/]*)</div><div class='del'>-     progdir=$func_dirname_result</div><div class='del'>-     progdir=`cd "$progdir" &amp;&amp; pwd`</div><div class='del'>-     progpath="$progdir/$progname"</div><div class='del'>-     ;;</div><div class='del'>-  *)</div><div class='del'>-     save_IFS="$IFS"</div><div class='del'>-     IFS=:</div><div class='del'>-     for progdir in $PATH; do</div><div class='del'>-       IFS="$save_IFS"</div><div class='del'>-       test -x "$progdir/$progname" &amp;&amp; break</div><div class='del'>-     done</div><div class='del'>-     IFS="$save_IFS"</div><div class='del'>-     test -n "$progdir" || progdir=`pwd`</div><div class='del'>-     progpath="$progdir/$progname"</div><div class='del'>-     ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# Sed substitution that helps us do robust quoting.  It backslashifies</div><div class='del'>-# metacharacters that are still active within double-quoted strings.</div><div class='del'>-Xsed="${SED}"' -e 1s/^X//'</div><div class='del'>-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'</div><div class='del'>-</div><div class='del'>-# Same as above, but do not quote variable references.</div><div class='del'>-double_quote_subst='s/\(["`\\]\)/\\\1/g'</div><div class='del'>-</div><div class='del'>-# Re-`\' parameter expansions in output of double_quote_subst that were</div><div class='del'>-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'</div><div class='del'>-# in input to double_quote_subst, that '$' was protected from expansion.</div><div class='del'>-# Since each input `\' is now two `\'s, look for any number of runs of</div><div class='del'>-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.</div><div class='del'>-bs='\\'</div><div class='del'>-bs2='\\\\'</div><div class='del'>-bs4='\\\\\\\\'</div><div class='del'>-dollar='\$'</div><div class='del'>-sed_double_backslash="\</div><div class='del'>-  s/$bs4/&amp;\\</div><div class='del'>-/g</div><div class='del'>-  s/^$bs2$dollar/$bs&amp;/</div><div class='del'>-  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g</div><div class='del'>-  s/\n//g"</div><div class='del'>-</div><div class='del'>-# Standard options:</div><div class='del'>-opt_dry_run=false</div><div class='del'>-opt_help=false</div><div class='del'>-opt_quiet=false</div><div class='del'>-opt_verbose=false</div><div class='del'>-opt_warning=:</div><div class='del'>-</div><div class='del'>-# func_echo arg...</div><div class='del'>-# Echo program name prefixed message, along with the current mode</div><div class='del'>-# name if it has been set yet.</div><div class='del'>-func_echo ()</div><div class='del'>-{</div><div class='del'>-    $ECHO "$progname${mode+: }$mode: $*"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_verbose arg...</div><div class='del'>-# Echo program name prefixed message in verbose mode only.</div><div class='del'>-func_verbose ()</div><div class='del'>-{</div><div class='del'>-    $opt_verbose &amp;&amp; func_echo ${1+"$@"}</div><div class='del'>-</div><div class='del'>-    # A bug in bash halts the script if the last line of a function</div><div class='del'>-    # fails when set -e is in force, so we need another command to</div><div class='del'>-    # work around that:</div><div class='del'>-    :</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_error arg...</div><div class='del'>-# Echo program name prefixed message to standard error.</div><div class='del'>-func_error ()</div><div class='del'>-{</div><div class='del'>-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1&gt;&amp;2</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_warning arg...</div><div class='del'>-# Echo program name prefixed warning message to standard error.</div><div class='del'>-func_warning ()</div><div class='del'>-{</div><div class='del'>-    $opt_warning &amp;&amp; $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1&gt;&amp;2</div><div class='del'>-</div><div class='del'>-    # bash bug again:</div><div class='del'>-    :</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_fatal_error arg...</div><div class='del'>-# Echo program name prefixed message to standard error, and exit.</div><div class='del'>-func_fatal_error ()</div><div class='del'>-{</div><div class='del'>-    func_error ${1+"$@"}</div><div class='del'>-    exit $EXIT_FAILURE</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_fatal_help arg...</div><div class='del'>-# Echo program name prefixed message to standard error, followed by</div><div class='del'>-# a help hint, and exit.</div><div class='del'>-func_fatal_help ()</div><div class='del'>-{</div><div class='del'>-    func_error ${1+"$@"}</div><div class='del'>-    func_fatal_error "$help"</div><div class='del'>-}</div><div class='del'>-help="Try \`$progname --help' for more information."  ## default</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_grep expression filename</div><div class='del'>-# Check whether EXPRESSION matches any line of FILENAME, without output.</div><div class='del'>-func_grep ()</div><div class='del'>-{</div><div class='del'>-    $GREP "$1" "$2" &gt;/dev/null 2&gt;&amp;1</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_mkdir_p directory-path</div><div class='del'>-# Make sure the entire path to DIRECTORY-PATH is available.</div><div class='del'>-func_mkdir_p ()</div><div class='del'>-{</div><div class='del'>-    my_directory_path="$1"</div><div class='del'>-    my_dir_list=</div><div class='del'>-</div><div class='del'>-    if test -n "$my_directory_path" &amp;&amp; test "$opt_dry_run" != ":"; then</div><div class='del'>-</div><div class='del'>-      # Protect directory names starting with `-'</div><div class='del'>-      case $my_directory_path in</div><div class='del'>-        -*) my_directory_path="./$my_directory_path" ;;</div><div class='del'>-      esac</div><div class='del'>-</div><div class='del'>-      # While some portion of DIR does not yet exist...</div><div class='del'>-      while test ! -d "$my_directory_path"; do</div><div class='del'>-        # ...make a list in topmost first order.  Use a colon delimited</div><div class='del'>-	# list incase some portion of path contains whitespace.</div><div class='del'>-        my_dir_list="$my_directory_path:$my_dir_list"</div><div class='del'>-</div><div class='del'>-        # If the last portion added has no slash in it, the list is done</div><div class='del'>-        case $my_directory_path in */*) ;; *) break ;; esac</div><div class='del'>-</div><div class='del'>-        # ...otherwise throw away the child directory and loop</div><div class='del'>-        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`</div><div class='del'>-      done</div><div class='del'>-      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`</div><div class='del'>-</div><div class='del'>-      save_mkdir_p_IFS="$IFS"; IFS=':'</div><div class='del'>-      for my_dir in $my_dir_list; do</div><div class='del'>-	IFS="$save_mkdir_p_IFS"</div><div class='del'>-        # mkdir can fail with a `File exist' error if two processes</div><div class='del'>-        # try to create one of the directories concurrently.  Don't</div><div class='del'>-        # stop in that case!</div><div class='del'>-        $MKDIR "$my_dir" 2&gt;/dev/null || :</div><div class='del'>-      done</div><div class='del'>-      IFS="$save_mkdir_p_IFS"</div><div class='del'>-</div><div class='del'>-      # Bail out if we (or some other process) failed to create a directory.</div><div class='del'>-      test -d "$my_directory_path" || \</div><div class='del'>-        func_fatal_error "Failed to create \`$1'"</div><div class='del'>-    fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_mktempdir [string]</div><div class='del'>-# Make a temporary directory that won't clash with other running</div><div class='del'>-# libtool processes, and avoids race conditions if possible.  If</div><div class='del'>-# given, STRING is the basename for that directory.</div><div class='del'>-func_mktempdir ()</div><div class='del'>-{</div><div class='del'>-    my_template="${TMPDIR-/tmp}/${1-$progname}"</div><div class='del'>-</div><div class='del'>-    if test "$opt_dry_run" = ":"; then</div><div class='del'>-      # Return a directory name, but don't create it in dry-run mode</div><div class='del'>-      my_tmpdir="${my_template}-$$"</div><div class='del'>-    else</div><div class='del'>-</div><div class='del'>-      # If mktemp works, use that first and foremost</div><div class='del'>-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2&gt;/dev/null`</div><div class='del'>-</div><div class='del'>-      if test ! -d "$my_tmpdir"; then</div><div class='del'>-        # Failing that, at least try and use $RANDOM to avoid a race</div><div class='del'>-        my_tmpdir="${my_template}-${RANDOM-0}$$"</div><div class='del'>-</div><div class='del'>-        save_mktempdir_umask=`umask`</div><div class='del'>-        umask 0077</div><div class='del'>-        $MKDIR "$my_tmpdir"</div><div class='del'>-        umask $save_mktempdir_umask</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # If we're not in dry-run mode, bomb out on failure</div><div class='del'>-      test -d "$my_tmpdir" || \</div><div class='del'>-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    $ECHO "X$my_tmpdir" | $Xsed</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_quote_for_eval arg</div><div class='del'>-# Aesthetically quote ARG to be evaled later.</div><div class='del'>-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT</div><div class='del'>-# is double-quoted, suitable for a subsequent eval, whereas</div><div class='del'>-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters</div><div class='del'>-# which are still active within double quotes backslashified.</div><div class='del'>-func_quote_for_eval ()</div><div class='del'>-{</div><div class='del'>-    case $1 in</div><div class='del'>-      *[\\\`\"\$]*)</div><div class='del'>-	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;</div><div class='del'>-      *)</div><div class='del'>-        func_quote_for_eval_unquoted_result="$1" ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    case $func_quote_for_eval_unquoted_result in</div><div class='del'>-      # Double-quote args containing shell metacharacters to delay</div><div class='del'>-      # word splitting, command substitution and and variable</div><div class='del'>-      # expansion for a subsequent eval.</div><div class='del'>-      # Many Bourne shells cannot handle close brackets correctly</div><div class='del'>-      # in scan sets, so we specify it separately.</div><div class='del'>-      *[\[\~\#\^\&amp;\*\(\)\{\}\|\;\&lt;\&gt;\?\'\ \	]*|*]*|"")</div><div class='del'>-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""</div><div class='del'>-        ;;</div><div class='del'>-      *)</div><div class='del'>-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"</div><div class='del'>-    esac</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_quote_for_expand arg</div><div class='del'>-# Aesthetically quote ARG to be evaled later; same as above,</div><div class='del'>-# but do not quote variable references.</div><div class='del'>-func_quote_for_expand ()</div><div class='del'>-{</div><div class='del'>-    case $1 in</div><div class='del'>-      *[\\\`\"]*)</div><div class='del'>-	my_arg=`$ECHO "X$1" | $Xsed \</div><div class='del'>-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;</div><div class='del'>-      *)</div><div class='del'>-        my_arg="$1" ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    case $my_arg in</div><div class='del'>-      # Double-quote args containing shell metacharacters to delay</div><div class='del'>-      # word splitting and command substitution for a subsequent eval.</div><div class='del'>-      # Many Bourne shells cannot handle close brackets correctly</div><div class='del'>-      # in scan sets, so we specify it separately.</div><div class='del'>-      *[\[\~\#\^\&amp;\*\(\)\{\}\|\;\&lt;\&gt;\?\'\ \	]*|*]*|"")</div><div class='del'>-        my_arg="\"$my_arg\""</div><div class='del'>-        ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    func_quote_for_expand_result="$my_arg"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_show_eval cmd [fail_exp]</div><div class='del'>-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is</div><div class='del'>-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP</div><div class='del'>-# is given, then evaluate it.</div><div class='del'>-func_show_eval ()</div><div class='del'>-{</div><div class='del'>-    my_cmd="$1"</div><div class='del'>-    my_fail_exp="${2-:}"</div><div class='del'>-</div><div class='del'>-    ${opt_silent-false} || {</div><div class='del'>-      func_quote_for_expand "$my_cmd"</div><div class='del'>-      eval "func_echo $func_quote_for_expand_result"</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if ${opt_dry_run-false}; then :; else</div><div class='del'>-      eval "$my_cmd"</div><div class='del'>-      my_status=$?</div><div class='del'>-      if test "$my_status" -eq 0; then :; else</div><div class='del'>-	eval "(exit $my_status); $my_fail_exp"</div><div class='del'>-      fi</div><div class='del'>-    fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_show_eval_locale cmd [fail_exp]</div><div class='del'>-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is</div><div class='del'>-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP</div><div class='del'>-# is given, then evaluate it.  Use the saved locale for evaluation.</div><div class='del'>-func_show_eval_locale ()</div><div class='del'>-{</div><div class='del'>-    my_cmd="$1"</div><div class='del'>-    my_fail_exp="${2-:}"</div><div class='del'>-</div><div class='del'>-    ${opt_silent-false} || {</div><div class='del'>-      func_quote_for_expand "$my_cmd"</div><div class='del'>-      eval "func_echo $func_quote_for_expand_result"</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if ${opt_dry_run-false}; then :; else</div><div class='del'>-      eval "$lt_user_locale</div><div class='del'>-	    $my_cmd"</div><div class='del'>-      my_status=$?</div><div class='del'>-      eval "$lt_safe_locale"</div><div class='del'>-      if test "$my_status" -eq 0; then :; else</div><div class='del'>-	eval "(exit $my_status); $my_fail_exp"</div><div class='del'>-      fi</div><div class='del'>-    fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_version</div><div class='del'>-# Echo version message to standard output and exit.</div><div class='del'>-func_version ()</div><div class='del'>-{</div><div class='del'>-    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {</div><div class='del'>-        s/^# //</div><div class='del'>-	s/^# *$//</div><div class='del'>-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/</div><div class='del'>-        p</div><div class='del'>-     }' &lt; "$progpath"</div><div class='del'>-     exit $?</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_usage</div><div class='del'>-# Echo short help message to standard output and exit.</div><div class='del'>-func_usage ()</div><div class='del'>-{</div><div class='del'>-    $SED -n '/^# Usage:/,/# -h/ {</div><div class='del'>-        s/^# //</div><div class='del'>-	s/^# *$//</div><div class='del'>-	s/\$progname/'$progname'/</div><div class='del'>-	p</div><div class='del'>-    }' &lt; "$progpath"</div><div class='del'>-    $ECHO</div><div class='del'>-    $ECHO "run \`$progname --help | more' for full usage"</div><div class='del'>-    exit $?</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_help</div><div class='del'>-# Echo long help message to standard output and exit.</div><div class='del'>-func_help ()</div><div class='del'>-{</div><div class='del'>-    $SED -n '/^# Usage:/,/# Report bugs to/ {</div><div class='del'>-        s/^# //</div><div class='del'>-	s/^# *$//</div><div class='del'>-	s*\$progname*'$progname'*</div><div class='del'>-	s*\$host*'"$host"'*</div><div class='del'>-	s*\$SHELL*'"$SHELL"'*</div><div class='del'>-	s*\$LTCC*'"$LTCC"'*</div><div class='del'>-	s*\$LTCFLAGS*'"$LTCFLAGS"'*</div><div class='del'>-	s*\$LD*'"$LD"'*</div><div class='del'>-	s/\$with_gnu_ld/'"$with_gnu_ld"'/</div><div class='del'>-	s/\$automake_version/'"`(automake --version) 2&gt;/dev/null |$SED 1q`"'/</div><div class='del'>-	s/\$autoconf_version/'"`(autoconf --version) 2&gt;/dev/null |$SED 1q`"'/</div><div class='del'>-	p</div><div class='del'>-     }' &lt; "$progpath"</div><div class='del'>-    exit $?</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_missing_arg argname</div><div class='del'>-# Echo program name prefixed message to standard error and set global</div><div class='del'>-# exit_cmd.</div><div class='del'>-func_missing_arg ()</div><div class='del'>-{</div><div class='del'>-    func_error "missing argument for $1"</div><div class='del'>-    exit_cmd=exit</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-exit_cmd=:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Check that we have a working $ECHO.</div><div class='del'>-if test "X$1" = X--no-reexec; then</div><div class='del'>-  # Discard the --no-reexec flag, and continue.</div><div class='del'>-  shift</div><div class='del'>-elif test "X$1" = X--fallback-echo; then</div><div class='del'>-  # Avoid inline document here, it may be left over</div><div class='del'>-  :</div><div class='del'>-elif test "X`{ $ECHO '\t'; } 2&gt;/dev/null`" = 'X\t'; then</div><div class='del'>-  # Yippee, $ECHO works!</div><div class='del'>-  :</div><div class='del'>-else</div><div class='del'>-  # Restart under the correct shell, and then maybe $ECHO will work.</div><div class='del'>-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test "X$1" = X--fallback-echo; then</div><div class='del'>-  # used as fallback echo</div><div class='del'>-  shift</div><div class='del'>-  cat &lt;&lt;EOF</div><div class='del'>-$*</div><div class='del'>-EOF</div><div class='del'>-  exit $EXIT_SUCCESS</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-magic="%%%MAGIC variable%%%"</div><div class='del'>-magic_exe="%%%MAGIC EXE variable%%%"</div><div class='del'>-</div><div class='del'>-# Global variables.</div><div class='del'>-# $mode is unset</div><div class='del'>-nonopt=</div><div class='del'>-execute_dlfiles=</div><div class='del'>-preserve_args=</div><div class='del'>-lo2o="s/\\.lo\$/.${objext}/"</div><div class='del'>-o2lo="s/\\.${objext}\$/.lo/"</div><div class='del'>-extracted_archives=</div><div class='del'>-extracted_serial=0</div><div class='del'>-</div><div class='del'>-opt_dry_run=false</div><div class='del'>-opt_duplicate_deps=false</div><div class='del'>-opt_silent=false</div><div class='del'>-opt_debug=:</div><div class='del'>-</div><div class='del'>-# If this variable is set in any of the actions, the command in it</div><div class='del'>-# will be execed at the end.  This prevents here-documents from being</div><div class='del'>-# left over by shells.</div><div class='del'>-exec_cmd=</div><div class='del'>-</div><div class='del'>-# func_fatal_configuration arg...</div><div class='del'>-# Echo program name prefixed message to standard error, followed by</div><div class='del'>-# a configuration failure hint, and exit.</div><div class='del'>-func_fatal_configuration ()</div><div class='del'>-{</div><div class='del'>-    func_error ${1+"$@"}</div><div class='del'>-    func_error "See the $PACKAGE documentation for more information."</div><div class='del'>-    func_fatal_error "Fatal configuration error."</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_config</div><div class='del'>-# Display the configuration for all the tags in this script.</div><div class='del'>-func_config ()</div><div class='del'>-{</div><div class='del'>-    re_begincf='^# ### BEGIN LIBTOOL'</div><div class='del'>-    re_endcf='^# ### END LIBTOOL'</div><div class='del'>-</div><div class='del'>-    # Default configuration.</div><div class='del'>-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" &lt; "$progpath"</div><div class='del'>-</div><div class='del'>-    # Now print the configurations for the tags.</div><div class='del'>-    for tagname in $taglist; do</div><div class='del'>-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" &lt; "$progpath"</div><div class='del'>-    done</div><div class='del'>-</div><div class='del'>-    exit $?</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_features</div><div class='del'>-# Display the features supported by this script.</div><div class='del'>-func_features ()</div><div class='del'>-{</div><div class='del'>-    $ECHO "host: $host"</div><div class='del'>-    if test "$build_libtool_libs" = yes; then</div><div class='del'>-      $ECHO "enable shared libraries"</div><div class='del'>-    else</div><div class='del'>-      $ECHO "disable shared libraries"</div><div class='del'>-    fi</div><div class='del'>-    if test "$build_old_libs" = yes; then</div><div class='del'>-      $ECHO "enable static libraries"</div><div class='del'>-    else</div><div class='del'>-      $ECHO "disable static libraries"</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    exit $?</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_enable_tag tagname</div><div class='del'>-# Verify that TAGNAME is valid, and either flag an error and exit, or</div><div class='del'>-# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist</div><div class='del'>-# variable here.</div><div class='del'>-func_enable_tag ()</div><div class='del'>-{</div><div class='del'>-  # Global variable:</div><div class='del'>-  tagname="$1"</div><div class='del'>-</div><div class='del'>-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"</div><div class='del'>-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"</div><div class='del'>-  sed_extractcf="/$re_begincf/,/$re_endcf/p"</div><div class='del'>-</div><div class='del'>-  # Validate tagname.</div><div class='del'>-  case $tagname in</div><div class='del'>-    *[!-_A-Za-z0-9,/]*)</div><div class='del'>-      func_fatal_error "invalid tag name: $tagname"</div><div class='del'>-      ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  # Don't test for the "default" C tag, as we know it's</div><div class='del'>-  # there but not specially marked.</div><div class='del'>-  case $tagname in</div><div class='del'>-    CC) ;;</div><div class='del'>-    *)</div><div class='del'>-      if $GREP "$re_begincf" "$progpath" &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-	taglist="$taglist $tagname"</div><div class='del'>-</div><div class='del'>-	# Evaluate the configuration.  Be careful to quote the path</div><div class='del'>-	# and the sed script, to avoid splitting on whitespace, but</div><div class='del'>-	# also don't use non-portable quotes within backquotes within</div><div class='del'>-	# quotes we have to do it in 2 steps:</div><div class='del'>-	extractedcf=`$SED -n -e "$sed_extractcf" &lt; "$progpath"`</div><div class='del'>-	eval "$extractedcf"</div><div class='del'>-      else</div><div class='del'>-	func_error "ignoring unknown tag $tagname"</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-  esac</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# Parse options once, thoroughly.  This comes as soon as possible in</div><div class='del'>-# the script to make things like `libtool --version' happen quickly.</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-  # Shorthand for --mode=foo, only valid as the first argument</div><div class='del'>-  case $1 in</div><div class='del'>-  clean|clea|cle|cl)</div><div class='del'>-    shift; set dummy --mode clean ${1+"$@"}; shift</div><div class='del'>-    ;;</div><div class='del'>-  compile|compil|compi|comp|com|co|c)</div><div class='del'>-    shift; set dummy --mode compile ${1+"$@"}; shift</div><div class='del'>-    ;;</div><div class='del'>-  execute|execut|execu|exec|exe|ex|e)</div><div class='del'>-    shift; set dummy --mode execute ${1+"$@"}; shift</div><div class='del'>-    ;;</div><div class='del'>-  finish|finis|fini|fin|fi|f)</div><div class='del'>-    shift; set dummy --mode finish ${1+"$@"}; shift</div><div class='del'>-    ;;</div><div class='del'>-  install|instal|insta|inst|ins|in|i)</div><div class='del'>-    shift; set dummy --mode install ${1+"$@"}; shift</div><div class='del'>-    ;;</div><div class='del'>-  link|lin|li|l)</div><div class='del'>-    shift; set dummy --mode link ${1+"$@"}; shift</div><div class='del'>-    ;;</div><div class='del'>-  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)</div><div class='del'>-    shift; set dummy --mode uninstall ${1+"$@"}; shift</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  # Parse non-mode specific arguments:</div><div class='del'>-  while test "$#" -gt 0; do</div><div class='del'>-    opt="$1"</div><div class='del'>-    shift</div><div class='del'>-</div><div class='del'>-    case $opt in</div><div class='del'>-      --config)		func_config					;;</div><div class='del'>-</div><div class='del'>-      --debug)		preserve_args="$preserve_args $opt"</div><div class='del'>-			func_echo "enabling shell trace mode"</div><div class='del'>-			opt_debug='set -x'</div><div class='del'>-			$opt_debug</div><div class='del'>-			;;</div><div class='del'>-</div><div class='del'>-      -dlopen)		test "$#" -eq 0 &amp;&amp; func_missing_arg "$opt" &amp;&amp; break</div><div class='del'>-			execute_dlfiles="$execute_dlfiles $1"</div><div class='del'>-			shift</div><div class='del'>-			;;</div><div class='del'>-</div><div class='del'>-      --dry-run | -n)	opt_dry_run=:					;;</div><div class='del'>-      --features)       func_features					;;</div><div class='del'>-      --finish)		mode="finish"					;;</div><div class='del'>-</div><div class='del'>-      --mode)		test "$#" -eq 0 &amp;&amp; func_missing_arg "$opt" &amp;&amp; break</div><div class='del'>-			case $1 in</div><div class='del'>-			  # Valid mode arguments:</div><div class='del'>-			  clean)	;;</div><div class='del'>-			  compile)	;;</div><div class='del'>-			  execute)	;;</div><div class='del'>-			  finish)	;;</div><div class='del'>-			  install)	;;</div><div class='del'>-			  link)		;;</div><div class='del'>-			  relink)	;;</div><div class='del'>-			  uninstall)	;;</div><div class='del'>-</div><div class='del'>-			  # Catch anything else as an error</div><div class='del'>-			  *) func_error "invalid argument for $opt"</div><div class='del'>-			     exit_cmd=exit</div><div class='del'>-			     break</div><div class='del'>-			     ;;</div><div class='del'>-		        esac</div><div class='del'>-</div><div class='del'>-			mode="$1"</div><div class='del'>-			shift</div><div class='del'>-			;;</div><div class='del'>-</div><div class='del'>-      --preserve-dup-deps)</div><div class='del'>-			opt_duplicate_deps=:				;;</div><div class='del'>-</div><div class='del'>-      --quiet|--silent)	preserve_args="$preserve_args $opt"</div><div class='del'>-			opt_silent=:</div><div class='del'>-			;;</div><div class='del'>-</div><div class='del'>-      --verbose| -v)	preserve_args="$preserve_args $opt"</div><div class='del'>-			opt_silent=false</div><div class='del'>-			;;</div><div class='del'>-</div><div class='del'>-      --tag)		test "$#" -eq 0 &amp;&amp; func_missing_arg "$opt" &amp;&amp; break</div><div class='del'>-			preserve_args="$preserve_args $opt $1"</div><div class='del'>-			func_enable_tag "$1"	# tagname is set here</div><div class='del'>-			shift</div><div class='del'>-			;;</div><div class='del'>-</div><div class='del'>-      # Separate optargs to long options:</div><div class='del'>-      -dlopen=*|--mode=*|--tag=*)</div><div class='del'>-			func_opt_split "$opt"</div><div class='del'>-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}</div><div class='del'>-			shift</div><div class='del'>-			;;</div><div class='del'>-</div><div class='del'>-      -\?|-h)		func_usage					;;</div><div class='del'>-      --help)		opt_help=:					;;</div><div class='del'>-      --version)	func_version					;;</div><div class='del'>-</div><div class='del'>-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;</div><div class='del'>-</div><div class='del'>-      *)		nonopt="$opt"</div><div class='del'>-			break</div><div class='del'>-			;;</div><div class='del'>-    esac</div><div class='del'>-  done</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  case $host in</div><div class='del'>-    *cygwin* | *mingw* | *pw32* | *cegcc*)</div><div class='del'>-      # don't eliminate duplications in $postdeps and $predeps</div><div class='del'>-      opt_duplicate_compiler_generated_deps=:</div><div class='del'>-      ;;</div><div class='del'>-    *)</div><div class='del'>-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps</div><div class='del'>-      ;;</div><div class='del'>-  esac</div><div class='del'>-</div><div class='del'>-  # Having warned about all mis-specified options, bail out if</div><div class='del'>-  # anything was wrong.</div><div class='del'>-  $exit_cmd $EXIT_FAILURE</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_check_version_match</div><div class='del'>-# Ensure that we are using m4 macros, and libtool script from the same</div><div class='del'>-# release of libtool.</div><div class='del'>-func_check_version_match ()</div><div class='del'>-{</div><div class='del'>-  if test "$package_revision" != "$macro_revision"; then</div><div class='del'>-    if test "$VERSION" != "$macro_version"; then</div><div class='del'>-      if test -z "$macro_version"; then</div><div class='del'>-        cat &gt;&amp;2 &lt;&lt;_LT_EOF</div><div class='del'>-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the</div><div class='del'>-$progname: definition of this LT_INIT comes from an older release.</div><div class='del'>-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION</div><div class='del'>-$progname: and run autoconf again.</div><div class='del'>-_LT_EOF</div><div class='del'>-      else</div><div class='del'>-        cat &gt;&amp;2 &lt;&lt;_LT_EOF</div><div class='del'>-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the</div><div class='del'>-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.</div><div class='del'>-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION</div><div class='del'>-$progname: and run autoconf again.</div><div class='del'>-_LT_EOF</div><div class='del'>-      fi</div><div class='del'>-    else</div><div class='del'>-      cat &gt;&amp;2 &lt;&lt;_LT_EOF</div><div class='del'>-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,</div><div class='del'>-$progname: but the definition of this LT_INIT comes from revision $macro_revision.</div><div class='del'>-$progname: You should recreate aclocal.m4 with macros from revision $package_revision</div><div class='del'>-$progname: of $PACKAGE $VERSION and run autoconf again.</div><div class='del'>-_LT_EOF</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    exit $EXIT_MISMATCH</div><div class='del'>-  fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-## ----------- ##</div><div class='del'>-##    Main.    ##</div><div class='del'>-## ----------- ##</div><div class='del'>-</div><div class='del'>-$opt_help || {</div><div class='del'>-  # Sanity checks first:</div><div class='del'>-  func_check_version_match</div><div class='del'>-</div><div class='del'>-  if test "$build_libtool_libs" != yes &amp;&amp; test "$build_old_libs" != yes; then</div><div class='del'>-    func_fatal_configuration "not configured to build any kind of library"</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  test -z "$mode" &amp;&amp; func_fatal_error "error: you must specify a MODE."</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  # Darwin sucks</div><div class='del'>-  eval std_shrext=\"$shrext_cmds\"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  # Only execute mode is allowed to have -dlopen flags.</div><div class='del'>-  if test -n "$execute_dlfiles" &amp;&amp; test "$mode" != execute; then</div><div class='del'>-    func_error "unrecognized option \`-dlopen'"</div><div class='del'>-    $ECHO "$help" 1&gt;&amp;2</div><div class='del'>-    exit $EXIT_FAILURE</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  # Change the help message to a mode-specific one.</div><div class='del'>-  generic_help="$help"</div><div class='del'>-  help="Try \`$progname --help --mode=$mode' for more information."</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_lalib_p file</div><div class='del'>-# True iff FILE is a libtool `.la' library or `.lo' object file.</div><div class='del'>-# This function is only a basic sanity check; it will hardly flush out</div><div class='del'>-# determined imposters.</div><div class='del'>-func_lalib_p ()</div><div class='del'>-{</div><div class='del'>-    test -f "$1" &amp;&amp;</div><div class='del'>-      $SED -e 4q "$1" 2&gt;/dev/null \</div><div class='del'>-        | $GREP "^# Generated by .*$PACKAGE" &gt; /dev/null 2&gt;&amp;1</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_lalib_unsafe_p file</div><div class='del'>-# True iff FILE is a libtool `.la' library or `.lo' object file.</div><div class='del'>-# This function implements the same check as func_lalib_p without</div><div class='del'>-# resorting to external programs.  To this end, it redirects stdin and</div><div class='del'>-# closes it afterwards, without saving the original file descriptor.</div><div class='del'>-# As a safety measure, use it only where a negative result would be</div><div class='del'>-# fatal anyway.  Works if `file' does not exist.</div><div class='del'>-func_lalib_unsafe_p ()</div><div class='del'>-{</div><div class='del'>-    lalib_p=no</div><div class='del'>-    if test -f "$1" &amp;&amp; test -r "$1" &amp;&amp; exec 5&lt;&amp;0 &lt;"$1"; then</div><div class='del'>-	for lalib_p_l in 1 2 3 4</div><div class='del'>-	do</div><div class='del'>-	    read lalib_p_line</div><div class='del'>-	    case "$lalib_p_line" in</div><div class='del'>-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;</div><div class='del'>-	    esac</div><div class='del'>-	done</div><div class='del'>-	exec 0&lt;&amp;5 5&lt;&amp;-</div><div class='del'>-    fi</div><div class='del'>-    test "$lalib_p" = yes</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_ltwrapper_script_p file</div><div class='del'>-# True iff FILE is a libtool wrapper script</div><div class='del'>-# This function is only a basic sanity check; it will hardly flush out</div><div class='del'>-# determined imposters.</div><div class='del'>-func_ltwrapper_script_p ()</div><div class='del'>-{</div><div class='del'>-    func_lalib_p "$1"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_ltwrapper_executable_p file</div><div class='del'>-# True iff FILE is a libtool wrapper executable</div><div class='del'>-# This function is only a basic sanity check; it will hardly flush out</div><div class='del'>-# determined imposters.</div><div class='del'>-func_ltwrapper_executable_p ()</div><div class='del'>-{</div><div class='del'>-    func_ltwrapper_exec_suffix=</div><div class='del'>-    case $1 in</div><div class='del'>-    *.exe) ;;</div><div class='del'>-    *) func_ltwrapper_exec_suffix=.exe ;;</div><div class='del'>-    esac</div><div class='del'>-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" &gt;/dev/null 2&gt;&amp;1</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_ltwrapper_scriptname file</div><div class='del'>-# Assumes file is an ltwrapper_executable</div><div class='del'>-# uses $file to determine the appropriate filename for a</div><div class='del'>-# temporary ltwrapper_script.</div><div class='del'>-func_ltwrapper_scriptname ()</div><div class='del'>-{</div><div class='del'>-    func_ltwrapper_scriptname_result=""</div><div class='del'>-    if func_ltwrapper_executable_p "$1"; then</div><div class='del'>-	func_dirname_and_basename "$1" "" "."</div><div class='del'>-	func_stripname '' '.exe' "$func_basename_result"</div><div class='del'>-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"</div><div class='del'>-    fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_ltwrapper_p file</div><div class='del'>-# True iff FILE is a libtool wrapper script or wrapper executable</div><div class='del'>-# This function is only a basic sanity check; it will hardly flush out</div><div class='del'>-# determined imposters.</div><div class='del'>-func_ltwrapper_p ()</div><div class='del'>-{</div><div class='del'>-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_execute_cmds commands fail_cmd</div><div class='del'>-# Execute tilde-delimited COMMANDS.</div><div class='del'>-# If FAIL_CMD is given, eval that upon failure.</div><div class='del'>-# FAIL_CMD may read-access the current command in variable CMD!</div><div class='del'>-func_execute_cmds ()</div><div class='del'>-{</div><div class='del'>-    $opt_debug</div><div class='del'>-    save_ifs=$IFS; IFS='~'</div><div class='del'>-    for cmd in $1; do</div><div class='del'>-      IFS=$save_ifs</div><div class='del'>-      eval cmd=\"$cmd\"</div><div class='del'>-      func_show_eval "$cmd" "${2-:}"</div><div class='del'>-    done</div><div class='del'>-    IFS=$save_ifs</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_source file</div><div class='del'>-# Source FILE, adding directory component if necessary.</div><div class='del'>-# Note that it is not necessary on cygwin/mingw to append a dot to</div><div class='del'>-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe</div><div class='del'>-# behavior happens only for exec(3), not for open(2)!  Also, sourcing</div><div class='del'>-# `FILE.' does not work on cygwin managed mounts.</div><div class='del'>-func_source ()</div><div class='del'>-{</div><div class='del'>-    $opt_debug</div><div class='del'>-    case $1 in</div><div class='del'>-    */* | *\\*)	. "$1" ;;</div><div class='del'>-    *)		. "./$1" ;;</div><div class='del'>-    esac</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_infer_tag arg</div><div class='del'>-# Infer tagged configuration to use if any are available and</div><div class='del'>-# if one wasn't chosen via the "--tag" command line option.</div><div class='del'>-# Only attempt this if the compiler in the base compile</div><div class='del'>-# command doesn't match the default compiler.</div><div class='del'>-# arg is usually of the form 'gcc ...'</div><div class='del'>-func_infer_tag ()</div><div class='del'>-{</div><div class='del'>-    $opt_debug</div><div class='del'>-    if test -n "$available_tags" &amp;&amp; test -z "$tagname"; then</div><div class='del'>-      CC_quoted=</div><div class='del'>-      for arg in $CC; do</div><div class='del'>-        func_quote_for_eval "$arg"</div><div class='del'>-	CC_quoted="$CC_quoted $func_quote_for_eval_result"</div><div class='del'>-      done</div><div class='del'>-      case $@ in</div><div class='del'>-      # Blanks in the command may have been stripped by the calling shell,</div><div class='del'>-      # but not from the CC environment variable when configure was run.</div><div class='del'>-      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;</div><div class='del'>-      # Blanks at the start of $base_compile will cause this to fail</div><div class='del'>-      # if we don't check for them as well.</div><div class='del'>-      *)</div><div class='del'>-	for z in $available_tags; do</div><div class='del'>-	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" &lt; "$progpath" &gt; /dev/null; then</div><div class='del'>-	    # Evaluate the configuration.</div><div class='del'>-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' &lt; $progpath`"</div><div class='del'>-	    CC_quoted=</div><div class='del'>-	    for arg in $CC; do</div><div class='del'>-	      # Double-quote args containing other shell metacharacters.</div><div class='del'>-	      func_quote_for_eval "$arg"</div><div class='del'>-	      CC_quoted="$CC_quoted $func_quote_for_eval_result"</div><div class='del'>-	    done</div><div class='del'>-	    case "$@ " in</div><div class='del'>-	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)</div><div class='del'>-	      # The compiler in the base compile command matches</div><div class='del'>-	      # the one in the tagged configuration.</div><div class='del'>-	      # Assume this is the tagged configuration we want.</div><div class='del'>-	      tagname=$z</div><div class='del'>-	      break</div><div class='del'>-	      ;;</div><div class='del'>-	    esac</div><div class='del'>-	  fi</div><div class='del'>-	done</div><div class='del'>-	# If $tagname still isn't set, then no tagged configuration</div><div class='del'>-	# was found and let the user know that the "--tag" command</div><div class='del'>-	# line option must be used.</div><div class='del'>-	if test -z "$tagname"; then</div><div class='del'>-	  func_echo "unable to infer tagged configuration"</div><div class='del'>-	  func_fatal_error "specify a tag with \`--tag'"</div><div class='del'>-#	else</div><div class='del'>-#	  func_verbose "using $tagname tagged configuration"</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-    fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_write_libtool_object output_name pic_name nonpic_name</div><div class='del'>-# Create a libtool object file (analogous to a ".la" file),</div><div class='del'>-# but don't create it if we're doing a dry run.</div><div class='del'>-func_write_libtool_object ()</div><div class='del'>-{</div><div class='del'>-    write_libobj=${1}</div><div class='del'>-    if test "$build_libtool_libs" = yes; then</div><div class='del'>-      write_lobj=\'${2}\'</div><div class='del'>-    else</div><div class='del'>-      write_lobj=none</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    if test "$build_old_libs" = yes; then</div><div class='del'>-      write_oldobj=\'${3}\'</div><div class='del'>-    else</div><div class='del'>-      write_oldobj=none</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    $opt_dry_run || {</div><div class='del'>-      cat &gt;${write_libobj}T &lt;&lt;EOF</div><div class='del'>-# $write_libobj - a libtool object file</div><div class='del'>-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION</div><div class='del'>-#</div><div class='del'>-# Please DO NOT delete this file!</div><div class='del'>-# It is necessary for linking the library.</div><div class='del'>-</div><div class='del'>-# Name of the PIC object.</div><div class='del'>-pic_object=$write_lobj</div><div class='del'>-</div><div class='del'>-# Name of the non-PIC object</div><div class='del'>-non_pic_object=$write_oldobj</div><div class='del'>-</div><div class='del'>-EOF</div><div class='del'>-      $MV "${write_libobj}T" "${write_libobj}"</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_mode_compile arg...</div><div class='del'>-func_mode_compile ()</div><div class='del'>-{</div><div class='del'>-    $opt_debug</div><div class='del'>-    # Get the compilation command and the source file.</div><div class='del'>-    base_compile=</div><div class='del'>-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"</div><div class='del'>-    suppress_opt=yes</div><div class='del'>-    suppress_output=</div><div class='del'>-    arg_mode=normal</div><div class='del'>-    libobj=</div><div class='del'>-    later=</div><div class='del'>-    pie_flag=</div><div class='del'>-</div><div class='del'>-    for arg</div><div class='del'>-    do</div><div class='del'>-      case $arg_mode in</div><div class='del'>-      arg  )</div><div class='del'>-	# do not "continue".  Instead, add this to base_compile</div><div class='del'>-	lastarg="$arg"</div><div class='del'>-	arg_mode=normal</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      target )</div><div class='del'>-	libobj="$arg"</div><div class='del'>-	arg_mode=normal</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      normal )</div><div class='del'>-	# Accept any command-line options.</div><div class='del'>-	case $arg in</div><div class='del'>-	-o)</div><div class='del'>-	  test -n "$libobj" &amp;&amp; \</div><div class='del'>-	    func_fatal_error "you cannot specify \`-o' more than once"</div><div class='del'>-	  arg_mode=target</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-</div><div class='del'>-	-pie | -fpie | -fPIE)</div><div class='del'>-          pie_flag="$pie_flag $arg"</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-</div><div class='del'>-	-shared | -static | -prefer-pic | -prefer-non-pic)</div><div class='del'>-	  later="$later $arg"</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-</div><div class='del'>-	-no-suppress)</div><div class='del'>-	  suppress_opt=no</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-</div><div class='del'>-	-Xcompiler)</div><div class='del'>-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list</div><div class='del'>-	  continue      #  The current "srcfile" will either be retained or</div><div class='del'>-	  ;;            #  replaced later.  I would guess that would be a bug.</div><div class='del'>-</div><div class='del'>-	-Wc,*)</div><div class='del'>-	  func_stripname '-Wc,' '' "$arg"</div><div class='del'>-	  args=$func_stripname_result</div><div class='del'>-	  lastarg=</div><div class='del'>-	  save_ifs="$IFS"; IFS=','</div><div class='del'>-	  for arg in $args; do</div><div class='del'>-	    IFS="$save_ifs"</div><div class='del'>-	    func_quote_for_eval "$arg"</div><div class='del'>-	    lastarg="$lastarg $func_quote_for_eval_result"</div><div class='del'>-	  done</div><div class='del'>-	  IFS="$save_ifs"</div><div class='del'>-	  func_stripname ' ' '' "$lastarg"</div><div class='del'>-	  lastarg=$func_stripname_result</div><div class='del'>-</div><div class='del'>-	  # Add the arguments to base_compile.</div><div class='del'>-	  base_compile="$base_compile $lastarg"</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-</div><div class='del'>-	*)</div><div class='del'>-	  # Accept the current argument as the source file.</div><div class='del'>-	  # The previous "srcfile" becomes the current argument.</div><div class='del'>-	  #</div><div class='del'>-	  lastarg="$srcfile"</div><div class='del'>-	  srcfile="$arg"</div><div class='del'>-	  ;;</div><div class='del'>-	esac  #  case $arg</div><div class='del'>-	;;</div><div class='del'>-      esac    #  case $arg_mode</div><div class='del'>-</div><div class='del'>-      # Aesthetically quote the previous argument.</div><div class='del'>-      func_quote_for_eval "$lastarg"</div><div class='del'>-      base_compile="$base_compile $func_quote_for_eval_result"</div><div class='del'>-    done # for arg</div><div class='del'>-</div><div class='del'>-    case $arg_mode in</div><div class='del'>-    arg)</div><div class='del'>-      func_fatal_error "you must specify an argument for -Xcompile"</div><div class='del'>-      ;;</div><div class='del'>-    target)</div><div class='del'>-      func_fatal_error "you must specify a target with \`-o'"</div><div class='del'>-      ;;</div><div class='del'>-    *)</div><div class='del'>-      # Get the name of the library object.</div><div class='del'>-      test -z "$libobj" &amp;&amp; {</div><div class='del'>-	func_basename "$srcfile"</div><div class='del'>-	libobj="$func_basename_result"</div><div class='del'>-      }</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    # Recognize several different file suffixes.</div><div class='del'>-    # If the user specifies -o file.o, it is replaced with file.lo</div><div class='del'>-    case $libobj in</div><div class='del'>-    *.[cCFSifmso] | \</div><div class='del'>-    *.ada | *.adb | *.ads | *.asm | \</div><div class='del'>-    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \</div><div class='del'>-    *.[fF][09]? | *.for | *.java | *.obj | *.sx)</div><div class='del'>-      func_xform "$libobj"</div><div class='del'>-      libobj=$func_xform_result</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    case $libobj in</div><div class='del'>-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;</div><div class='del'>-    *)</div><div class='del'>-      func_fatal_error "cannot determine name of library object from \`$libobj'"</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    func_infer_tag $base_compile</div><div class='del'>-</div><div class='del'>-    for arg in $later; do</div><div class='del'>-      case $arg in</div><div class='del'>-      -shared)</div><div class='del'>-	test "$build_libtool_libs" != yes &amp;&amp; \</div><div class='del'>-	  func_fatal_configuration "can not build a shared library"</div><div class='del'>-	build_old_libs=no</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -static)</div><div class='del'>-	build_libtool_libs=no</div><div class='del'>-	build_old_libs=yes</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -prefer-pic)</div><div class='del'>-	pic_mode=yes</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -prefer-non-pic)</div><div class='del'>-	pic_mode=no</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-    done</div><div class='del'>-</div><div class='del'>-    func_quote_for_eval "$libobj"</div><div class='del'>-    test "X$libobj" != "X$func_quote_for_eval_result" \</div><div class='del'>-      &amp;&amp; $ECHO "X$libobj" | $GREP '[]~#^*{};&lt;&gt;?"'"'"'	 &amp;()|`$[]' \</div><div class='del'>-      &amp;&amp; func_warning "libobj name \`$libobj' may not contain shell special characters."</div><div class='del'>-    func_dirname_and_basename "$obj" "/" ""</div><div class='del'>-    objname="$func_basename_result"</div><div class='del'>-    xdir="$func_dirname_result"</div><div class='del'>-    lobj=${xdir}$objdir/$objname</div><div class='del'>-</div><div class='del'>-    test -z "$base_compile" &amp;&amp; \</div><div class='del'>-      func_fatal_help "you must specify a compilation command"</div><div class='del'>-</div><div class='del'>-    # Delete any leftover library objects.</div><div class='del'>-    if test "$build_old_libs" = yes; then</div><div class='del'>-      removelist="$obj $lobj $libobj ${libobj}T"</div><div class='del'>-    else</div><div class='del'>-      removelist="$lobj $libobj ${libobj}T"</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    # On Cygwin there's no "real" PIC flag so we must build both object types</div><div class='del'>-    case $host_os in</div><div class='del'>-    cygwin* | mingw* | pw32* | os2* | cegcc*)</div><div class='del'>-      pic_mode=default</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-    if test "$pic_mode" = no &amp;&amp; test "$deplibs_check_method" != pass_all; then</div><div class='del'>-      # non-PIC code in shared libraries is not supported</div><div class='del'>-      pic_mode=default</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    # Calculate the filename of the output object if compiler does</div><div class='del'>-    # not support -o with -c</div><div class='del'>-    if test "$compiler_c_o" = no; then</div><div class='del'>-      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}</div><div class='del'>-      lockfile="$output_obj.lock"</div><div class='del'>-    else</div><div class='del'>-      output_obj=</div><div class='del'>-      need_locks=no</div><div class='del'>-      lockfile=</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    # Lock this critical section if it is needed</div><div class='del'>-    # We use this script file to make the link, it avoids creating a new file</div><div class='del'>-    if test "$need_locks" = yes; then</div><div class='del'>-      until $opt_dry_run || ln "$progpath" "$lockfile" 2&gt;/dev/null; do</div><div class='del'>-	func_echo "Waiting for $lockfile to be removed"</div><div class='del'>-	sleep 2</div><div class='del'>-      done</div><div class='del'>-    elif test "$need_locks" = warn; then</div><div class='del'>-      if test -f "$lockfile"; then</div><div class='del'>-	$ECHO "\</div><div class='del'>-*** ERROR, $lockfile exists and contains:</div><div class='del'>-`cat $lockfile 2&gt;/dev/null`</div><div class='del'>-</div><div class='del'>-This indicates that another process is trying to use the same</div><div class='del'>-temporary object file, and libtool could not work around it because</div><div class='del'>-your compiler does not support \`-c' and \`-o' together.  If you</div><div class='del'>-repeat this compilation, it may succeed, by chance, but you had better</div><div class='del'>-avoid parallel builds (make -j) in this platform, or get a better</div><div class='del'>-compiler."</div><div class='del'>-</div><div class='del'>-	$opt_dry_run || $RM $removelist</div><div class='del'>-	exit $EXIT_FAILURE</div><div class='del'>-      fi</div><div class='del'>-      removelist="$removelist $output_obj"</div><div class='del'>-      $ECHO "$srcfile" &gt; "$lockfile"</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    $opt_dry_run || $RM $removelist</div><div class='del'>-    removelist="$removelist $lockfile"</div><div class='del'>-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15</div><div class='del'>-</div><div class='del'>-    if test -n "$fix_srcfile_path"; then</div><div class='del'>-      eval srcfile=\"$fix_srcfile_path\"</div><div class='del'>-    fi</div><div class='del'>-    func_quote_for_eval "$srcfile"</div><div class='del'>-    qsrcfile=$func_quote_for_eval_result</div><div class='del'>-</div><div class='del'>-    # Only build a PIC object if we are building libtool libraries.</div><div class='del'>-    if test "$build_libtool_libs" = yes; then</div><div class='del'>-      # Without this assignment, base_compile gets emptied.</div><div class='del'>-      fbsd_hideous_sh_bug=$base_compile</div><div class='del'>-</div><div class='del'>-      if test "$pic_mode" != no; then</div><div class='del'>-	command="$base_compile $qsrcfile $pic_flag"</div><div class='del'>-      else</div><div class='del'>-	# Don't build PIC code</div><div class='del'>-	command="$base_compile $qsrcfile"</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      func_mkdir_p "$xdir$objdir"</div><div class='del'>-</div><div class='del'>-      if test -z "$output_obj"; then</div><div class='del'>-	# Place PIC objects in $objdir</div><div class='del'>-	command="$command -o $lobj"</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      func_show_eval_locale "$command"	\</div><div class='del'>-          'test -n "$output_obj" &amp;&amp; $RM $removelist; exit $EXIT_FAILURE'</div><div class='del'>-</div><div class='del'>-      if test "$need_locks" = warn &amp;&amp;</div><div class='del'>-	 test "X`cat $lockfile 2&gt;/dev/null`" != "X$srcfile"; then</div><div class='del'>-	$ECHO "\</div><div class='del'>-*** ERROR, $lockfile contains:</div><div class='del'>-`cat $lockfile 2&gt;/dev/null`</div><div class='del'>-</div><div class='del'>-but it should contain:</div><div class='del'>-$srcfile</div><div class='del'>-</div><div class='del'>-This indicates that another process is trying to use the same</div><div class='del'>-temporary object file, and libtool could not work around it because</div><div class='del'>-your compiler does not support \`-c' and \`-o' together.  If you</div><div class='del'>-repeat this compilation, it may succeed, by chance, but you had better</div><div class='del'>-avoid parallel builds (make -j) in this platform, or get a better</div><div class='del'>-compiler."</div><div class='del'>-</div><div class='del'>-	$opt_dry_run || $RM $removelist</div><div class='del'>-	exit $EXIT_FAILURE</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Just move the object if needed, then go on to compile the next one</div><div class='del'>-      if test -n "$output_obj" &amp;&amp; test "X$output_obj" != "X$lobj"; then</div><div class='del'>-	func_show_eval '$MV "$output_obj" "$lobj"' \</div><div class='del'>-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Allow error messages only from the first compilation.</div><div class='del'>-      if test "$suppress_opt" = yes; then</div><div class='del'>-	suppress_output=' &gt;/dev/null 2&gt;&amp;1'</div><div class='del'>-      fi</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    # Only build a position-dependent object if we build old libraries.</div><div class='del'>-    if test "$build_old_libs" = yes; then</div><div class='del'>-      if test "$pic_mode" != yes; then</div><div class='del'>-	# Don't build PIC code</div><div class='del'>-	command="$base_compile $qsrcfile$pie_flag"</div><div class='del'>-      else</div><div class='del'>-	command="$base_compile $qsrcfile $pic_flag"</div><div class='del'>-      fi</div><div class='del'>-      if test "$compiler_c_o" = yes; then</div><div class='del'>-	command="$command -o $obj"</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Suppress compiler output if we already did a PIC compilation.</div><div class='del'>-      command="$command$suppress_output"</div><div class='del'>-      func_show_eval_locale "$command" \</div><div class='del'>-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'</div><div class='del'>-</div><div class='del'>-      if test "$need_locks" = warn &amp;&amp;</div><div class='del'>-	 test "X`cat $lockfile 2&gt;/dev/null`" != "X$srcfile"; then</div><div class='del'>-	$ECHO "\</div><div class='del'>-*** ERROR, $lockfile contains:</div><div class='del'>-`cat $lockfile 2&gt;/dev/null`</div><div class='del'>-</div><div class='del'>-but it should contain:</div><div class='del'>-$srcfile</div><div class='del'>-</div><div class='del'>-This indicates that another process is trying to use the same</div><div class='del'>-temporary object file, and libtool could not work around it because</div><div class='del'>-your compiler does not support \`-c' and \`-o' together.  If you</div><div class='del'>-repeat this compilation, it may succeed, by chance, but you had better</div><div class='del'>-avoid parallel builds (make -j) in this platform, or get a better</div><div class='del'>-compiler."</div><div class='del'>-</div><div class='del'>-	$opt_dry_run || $RM $removelist</div><div class='del'>-	exit $EXIT_FAILURE</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Just move the object if needed</div><div class='del'>-      if test -n "$output_obj" &amp;&amp; test "X$output_obj" != "X$obj"; then</div><div class='del'>-	func_show_eval '$MV "$output_obj" "$obj"' \</div><div class='del'>-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'</div><div class='del'>-      fi</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    $opt_dry_run || {</div><div class='del'>-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"</div><div class='del'>-</div><div class='del'>-      # Unlock the critical section if it was locked</div><div class='del'>-      if test "$need_locks" != no; then</div><div class='del'>-	removelist=$lockfile</div><div class='del'>-        $RM "$lockfile"</div><div class='del'>-      fi</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    exit $EXIT_SUCCESS</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-$opt_help || {</div><div class='del'>-test "$mode" = compile &amp;&amp; func_mode_compile ${1+"$@"}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-func_mode_help ()</div><div class='del'>-{</div><div class='del'>-    # We need to display help for each of the modes.</div><div class='del'>-    case $mode in</div><div class='del'>-      "")</div><div class='del'>-        # Generic help is extracted from the usage comments</div><div class='del'>-        # at the start of this file.</div><div class='del'>-        func_help</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      clean)</div><div class='del'>-        $ECHO \</div><div class='del'>-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...</div><div class='del'>-</div><div class='del'>-Remove files from the build directory.</div><div class='del'>-</div><div class='del'>-RM is the name of the program to use to delete files associated with each FILE</div><div class='del'>-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed</div><div class='del'>-to RM.</div><div class='del'>-</div><div class='del'>-If FILE is a libtool library, object or program, all the files associated</div><div class='del'>-with it are deleted. Otherwise, only FILE itself is deleted using RM."</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      compile)</div><div class='del'>-      $ECHO \</div><div class='del'>-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE</div><div class='del'>-</div><div class='del'>-Compile a source file into a libtool library object.</div><div class='del'>-</div><div class='del'>-This mode accepts the following additional options:</div><div class='del'>-</div><div class='del'>-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE</div><div class='del'>-  -no-suppress      do not suppress compiler output for multiple passes</div><div class='del'>-  -prefer-pic       try to building PIC objects only</div><div class='del'>-  -prefer-non-pic   try to building non-PIC objects only</div><div class='del'>-  -shared           do not build a \`.o' file suitable for static linking</div><div class='del'>-  -static           only build a \`.o' file suitable for static linking</div><div class='del'>-</div><div class='del'>-COMPILE-COMMAND is a command to be used in creating a \`standard' object file</div><div class='del'>-from the given SOURCEFILE.</div><div class='del'>-</div><div class='del'>-The output file name is determined by removing the directory component from</div><div class='del'>-SOURCEFILE, then substituting the C source code suffix \`.c' with the</div><div class='del'>-library object suffix, \`.lo'."</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      execute)</div><div class='del'>-        $ECHO \</div><div class='del'>-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...</div><div class='del'>-</div><div class='del'>-Automatically set library path, then run a program.</div><div class='del'>-</div><div class='del'>-This mode accepts the following additional options:</div><div class='del'>-</div><div class='del'>-  -dlopen FILE      add the directory containing FILE to the library path</div><div class='del'>-</div><div class='del'>-This mode sets the library path environment variable according to \`-dlopen'</div><div class='del'>-flags.</div><div class='del'>-</div><div class='del'>-If any of the ARGS are libtool executable wrappers, then they are translated</div><div class='del'>-into their corresponding uninstalled binary, and any of their required library</div><div class='del'>-directories are added to the library path.</div><div class='del'>-</div><div class='del'>-Then, COMMAND is executed, with ARGS as arguments."</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      finish)</div><div class='del'>-        $ECHO \</div><div class='del'>-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...</div><div class='del'>-</div><div class='del'>-Complete the installation of libtool libraries.</div><div class='del'>-</div><div class='del'>-Each LIBDIR is a directory that contains libtool libraries.</div><div class='del'>-</div><div class='del'>-The commands that this mode executes may require superuser privileges.  Use</div><div class='del'>-the \`--dry-run' option if you just want to see what would be executed."</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      install)</div><div class='del'>-        $ECHO \</div><div class='del'>-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...</div><div class='del'>-</div><div class='del'>-Install executables or libraries.</div><div class='del'>-</div><div class='del'>-INSTALL-COMMAND is the installation command.  The first component should be</div><div class='del'>-either the \`install' or \`cp' program.</div><div class='del'>-</div><div class='del'>-The following components of INSTALL-COMMAND are treated specially:</div><div class='del'>-</div><div class='del'>-  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation</div><div class='del'>-</div><div class='del'>-The rest of the components are interpreted as arguments to that command (only</div><div class='del'>-BSD-compatible install options are recognized)."</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      link)</div><div class='del'>-        $ECHO \</div><div class='del'>-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...</div><div class='del'>-</div><div class='del'>-Link object files or libraries together to form another library, or to</div><div class='del'>-create an executable program.</div><div class='del'>-</div><div class='del'>-LINK-COMMAND is a command using the C compiler that you would use to create</div><div class='del'>-a program from several object files.</div><div class='del'>-</div><div class='del'>-The following components of LINK-COMMAND are treated specially:</div><div class='del'>-</div><div class='del'>-  -all-static       do not do any dynamic linking at all</div><div class='del'>-  -avoid-version    do not add a version suffix if possible</div><div class='del'>-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime</div><div class='del'>-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols</div><div class='del'>-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)</div><div class='del'>-  -export-symbols SYMFILE</div><div class='del'>-                    try to export only the symbols listed in SYMFILE</div><div class='del'>-  -export-symbols-regex REGEX</div><div class='del'>-                    try to export only the symbols matching REGEX</div><div class='del'>-  -LLIBDIR          search LIBDIR for required installed libraries</div><div class='del'>-  -lNAME            OUTPUT-FILE requires the installed library libNAME</div><div class='del'>-  -module           build a library that can dlopened</div><div class='del'>-  -no-fast-install  disable the fast-install mode</div><div class='del'>-  -no-install       link a not-installable executable</div><div class='del'>-  -no-undefined     declare that a library does not refer to external symbols</div><div class='del'>-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects</div><div class='del'>-  -objectlist FILE  Use a list of object files found in FILE to specify objects</div><div class='del'>-  -precious-files-regex REGEX</div><div class='del'>-                    don't remove output files matching REGEX</div><div class='del'>-  -release RELEASE  specify package release information</div><div class='del'>-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR</div><div class='del'>-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries</div><div class='del'>-  -shared           only do dynamic linking of libtool libraries</div><div class='del'>-  -shrext SUFFIX    override the standard shared library file extension</div><div class='del'>-  -static           do not do any dynamic linking of uninstalled libtool libraries</div><div class='del'>-  -static-libtool-libs</div><div class='del'>-                    do not do any dynamic linking of libtool libraries</div><div class='del'>-  -version-info CURRENT[:REVISION[:AGE]]</div><div class='del'>-                    specify library version info [each variable defaults to 0]</div><div class='del'>-  -weak LIBNAME     declare that the target provides the LIBNAME interface</div><div class='del'>-</div><div class='del'>-All other options (arguments beginning with \`-') are ignored.</div><div class='del'>-</div><div class='del'>-Every other argument is treated as a filename.  Files ending in \`.la' are</div><div class='del'>-treated as uninstalled libtool libraries, other files are standard or library</div><div class='del'>-object files.</div><div class='del'>-</div><div class='del'>-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,</div><div class='del'>-only library objects (\`.lo' files) may be specified, and \`-rpath' is</div><div class='del'>-required, except when creating a convenience library.</div><div class='del'>-</div><div class='del'>-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created</div><div class='del'>-using \`ar' and \`ranlib', or on Windows using \`lib'.</div><div class='del'>-</div><div class='del'>-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file</div><div class='del'>-is created, otherwise an executable program is created."</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      uninstall)</div><div class='del'>-        $ECHO \</div><div class='del'>-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...</div><div class='del'>-</div><div class='del'>-Remove libraries from an installation directory.</div><div class='del'>-</div><div class='del'>-RM is the name of the program to use to delete files associated with each FILE</div><div class='del'>-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed</div><div class='del'>-to RM.</div><div class='del'>-</div><div class='del'>-If FILE is a libtool library, all the files associated with it are deleted.</div><div class='del'>-Otherwise, only FILE itself is deleted using RM."</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      *)</div><div class='del'>-        func_fatal_help "invalid operation mode \`$mode'"</div><div class='del'>-        ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    $ECHO</div><div class='del'>-    $ECHO "Try \`$progname --help' for more information about other modes."</div><div class='del'>-</div><div class='del'>-    exit $?</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-  # Now that we've collected a possible --mode arg, show help if necessary</div><div class='del'>-  $opt_help &amp;&amp; func_mode_help</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_mode_execute arg...</div><div class='del'>-func_mode_execute ()</div><div class='del'>-{</div><div class='del'>-    $opt_debug</div><div class='del'>-    # The first argument is the command name.</div><div class='del'>-    cmd="$nonopt"</div><div class='del'>-    test -z "$cmd" &amp;&amp; \</div><div class='del'>-      func_fatal_help "you must specify a COMMAND"</div><div class='del'>-</div><div class='del'>-    # Handle -dlopen flags immediately.</div><div class='del'>-    for file in $execute_dlfiles; do</div><div class='del'>-      test -f "$file" \</div><div class='del'>-	|| func_fatal_help "\`$file' is not a file"</div><div class='del'>-</div><div class='del'>-      dir=</div><div class='del'>-      case $file in</div><div class='del'>-      *.la)</div><div class='del'>-	# Check to see that this really is a libtool archive.</div><div class='del'>-	func_lalib_unsafe_p "$file" \</div><div class='del'>-	  || func_fatal_help "\`$lib' is not a valid libtool archive"</div><div class='del'>-</div><div class='del'>-	# Read the libtool library.</div><div class='del'>-	dlname=</div><div class='del'>-	library_names=</div><div class='del'>-	func_source "$file"</div><div class='del'>-</div><div class='del'>-	# Skip this library if it cannot be dlopened.</div><div class='del'>-	if test -z "$dlname"; then</div><div class='del'>-	  # Warn if it was a shared library.</div><div class='del'>-	  test -n "$library_names" &amp;&amp; \</div><div class='del'>-	    func_warning "\`$file' was not linked with \`-export-dynamic'"</div><div class='del'>-	  continue</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	func_dirname "$file" "" "."</div><div class='del'>-	dir="$func_dirname_result"</div><div class='del'>-</div><div class='del'>-	if test -f "$dir/$objdir/$dlname"; then</div><div class='del'>-	  dir="$dir/$objdir"</div><div class='del'>-	else</div><div class='del'>-	  if test ! -f "$dir/$dlname"; then</div><div class='del'>-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      *.lo)</div><div class='del'>-	# Just add the directory containing the .lo file.</div><div class='del'>-	func_dirname "$file" "" "."</div><div class='del'>-	dir="$func_dirname_result"</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      *)</div><div class='del'>-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-</div><div class='del'>-      # Get the absolute pathname.</div><div class='del'>-      absdir=`cd "$dir" &amp;&amp; pwd`</div><div class='del'>-      test -n "$absdir" &amp;&amp; dir="$absdir"</div><div class='del'>-</div><div class='del'>-      # Now add the directory to shlibpath_var.</div><div class='del'>-      if eval "test -z \"\$$shlibpath_var\""; then</div><div class='del'>-	eval "$shlibpath_var=\"\$dir\""</div><div class='del'>-      else</div><div class='del'>-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""</div><div class='del'>-      fi</div><div class='del'>-    done</div><div class='del'>-</div><div class='del'>-    # This variable tells wrapper scripts just to set shlibpath_var</div><div class='del'>-    # rather than running their programs.</div><div class='del'>-    libtool_execute_magic="$magic"</div><div class='del'>-</div><div class='del'>-    # Check if any of the arguments is a wrapper script.</div><div class='del'>-    args=</div><div class='del'>-    for file</div><div class='del'>-    do</div><div class='del'>-      case $file in</div><div class='del'>-      -*) ;;</div><div class='del'>-      *)</div><div class='del'>-	# Do a test to see if this is really a libtool program.</div><div class='del'>-	if func_ltwrapper_script_p "$file"; then</div><div class='del'>-	  func_source "$file"</div><div class='del'>-	  # Transform arg to wrapped name.</div><div class='del'>-	  file="$progdir/$program"</div><div class='del'>-	elif func_ltwrapper_executable_p "$file"; then</div><div class='del'>-	  func_ltwrapper_scriptname "$file"</div><div class='del'>-	  func_source "$func_ltwrapper_scriptname_result"</div><div class='del'>-	  # Transform arg to wrapped name.</div><div class='del'>-	  file="$progdir/$program"</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      # Quote arguments (to preserve shell metacharacters).</div><div class='del'>-      func_quote_for_eval "$file"</div><div class='del'>-      args="$args $func_quote_for_eval_result"</div><div class='del'>-    done</div><div class='del'>-</div><div class='del'>-    if test "X$opt_dry_run" = Xfalse; then</div><div class='del'>-      if test -n "$shlibpath_var"; then</div><div class='del'>-	# Export the shlibpath_var.</div><div class='del'>-	eval "export $shlibpath_var"</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Restore saved environment variables</div><div class='del'>-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES</div><div class='del'>-      do</div><div class='del'>-	eval "if test \"\${save_$lt_var+set}\" = set; then</div><div class='del'>-                $lt_var=\$save_$lt_var; export $lt_var</div><div class='del'>-	      else</div><div class='del'>-		$lt_unset $lt_var</div><div class='del'>-	      fi"</div><div class='del'>-      done</div><div class='del'>-</div><div class='del'>-      # Now prepare to actually exec the command.</div><div class='del'>-      exec_cmd="\$cmd$args"</div><div class='del'>-    else</div><div class='del'>-      # Display what would be done.</div><div class='del'>-      if test -n "$shlibpath_var"; then</div><div class='del'>-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""</div><div class='del'>-	$ECHO "export $shlibpath_var"</div><div class='del'>-      fi</div><div class='del'>-      $ECHO "$cmd$args"</div><div class='del'>-      exit $EXIT_SUCCESS</div><div class='del'>-    fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test "$mode" = execute &amp;&amp; func_mode_execute ${1+"$@"}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_mode_finish arg...</div><div class='del'>-func_mode_finish ()</div><div class='del'>-{</div><div class='del'>-    $opt_debug</div><div class='del'>-    libdirs="$nonopt"</div><div class='del'>-    admincmds=</div><div class='del'>-</div><div class='del'>-    if test -n "$finish_cmds$finish_eval" &amp;&amp; test -n "$libdirs"; then</div><div class='del'>-      for dir</div><div class='del'>-      do</div><div class='del'>-	libdirs="$libdirs $dir"</div><div class='del'>-      done</div><div class='del'>-</div><div class='del'>-      for libdir in $libdirs; do</div><div class='del'>-	if test -n "$finish_cmds"; then</div><div class='del'>-	  # Do each command in the finish commands.</div><div class='del'>-	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds</div><div class='del'>-'"$cmd"'"'</div><div class='del'>-	fi</div><div class='del'>-	if test -n "$finish_eval"; then</div><div class='del'>-	  # Do the single finish_eval.</div><div class='del'>-	  eval cmds=\"$finish_eval\"</div><div class='del'>-	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds</div><div class='del'>-       $cmds"</div><div class='del'>-	fi</div><div class='del'>-      done</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    # Exit here if they wanted silent mode.</div><div class='del'>-    $opt_silent &amp;&amp; exit $EXIT_SUCCESS</div><div class='del'>-</div><div class='del'>-    $ECHO "X----------------------------------------------------------------------" | $Xsed</div><div class='del'>-    $ECHO "Libraries have been installed in:"</div><div class='del'>-    for libdir in $libdirs; do</div><div class='del'>-      $ECHO "   $libdir"</div><div class='del'>-    done</div><div class='del'>-    $ECHO</div><div class='del'>-    $ECHO "If you ever happen to want to link against installed libraries"</div><div class='del'>-    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"</div><div class='del'>-    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"</div><div class='del'>-    $ECHO "flag during linking and do at least one of the following:"</div><div class='del'>-    if test -n "$shlibpath_var"; then</div><div class='del'>-      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"</div><div class='del'>-      $ECHO "     during execution"</div><div class='del'>-    fi</div><div class='del'>-    if test -n "$runpath_var"; then</div><div class='del'>-      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"</div><div class='del'>-      $ECHO "     during linking"</div><div class='del'>-    fi</div><div class='del'>-    if test -n "$hardcode_libdir_flag_spec"; then</div><div class='del'>-      libdir=LIBDIR</div><div class='del'>-      eval flag=\"$hardcode_libdir_flag_spec\"</div><div class='del'>-</div><div class='del'>-      $ECHO "   - use the \`$flag' linker flag"</div><div class='del'>-    fi</div><div class='del'>-    if test -n "$admincmds"; then</div><div class='del'>-      $ECHO "   - have your system administrator run these commands:$admincmds"</div><div class='del'>-    fi</div><div class='del'>-    if test -f /etc/ld.so.conf; then</div><div class='del'>-      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"</div><div class='del'>-    fi</div><div class='del'>-    $ECHO</div><div class='del'>-</div><div class='del'>-    $ECHO "See any operating system documentation about shared libraries for"</div><div class='del'>-    case $host in</div><div class='del'>-      solaris2.[6789]|solaris2.1[0-9])</div><div class='del'>-        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"</div><div class='del'>-	$ECHO "pages."</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."</div><div class='del'>-        ;;</div><div class='del'>-    esac</div><div class='del'>-    $ECHO "X----------------------------------------------------------------------" | $Xsed</div><div class='del'>-    exit $EXIT_SUCCESS</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test "$mode" = finish &amp;&amp; func_mode_finish ${1+"$@"}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_mode_install arg...</div><div class='del'>-func_mode_install ()</div><div class='del'>-{</div><div class='del'>-    $opt_debug</div><div class='del'>-    # There may be an optional sh(1) argument at the beginning of</div><div class='del'>-    # install_prog (especially on Windows NT).</div><div class='del'>-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||</div><div class='del'>-       # Allow the use of GNU shtool's install command.</div><div class='del'>-       $ECHO "X$nonopt" | $GREP shtool &gt;/dev/null; then</div><div class='del'>-      # Aesthetically quote it.</div><div class='del'>-      func_quote_for_eval "$nonopt"</div><div class='del'>-      install_prog="$func_quote_for_eval_result "</div><div class='del'>-      arg=$1</div><div class='del'>-      shift</div><div class='del'>-    else</div><div class='del'>-      install_prog=</div><div class='del'>-      arg=$nonopt</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    # The real first argument should be the name of the installation program.</div><div class='del'>-    # Aesthetically quote it.</div><div class='del'>-    func_quote_for_eval "$arg"</div><div class='del'>-    install_prog="$install_prog$func_quote_for_eval_result"</div><div class='del'>-</div><div class='del'>-    # We need to accept at least all the BSD install flags.</div><div class='del'>-    dest=</div><div class='del'>-    files=</div><div class='del'>-    opts=</div><div class='del'>-    prev=</div><div class='del'>-    install_type=</div><div class='del'>-    isdir=no</div><div class='del'>-    stripme=</div><div class='del'>-    for arg</div><div class='del'>-    do</div><div class='del'>-      if test -n "$dest"; then</div><div class='del'>-	files="$files $dest"</div><div class='del'>-	dest=$arg</div><div class='del'>-	continue</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      case $arg in</div><div class='del'>-      -d) isdir=yes ;;</div><div class='del'>-      -f)</div><div class='del'>-	case " $install_prog " in</div><div class='del'>-	*[\\\ /]cp\ *) ;;</div><div class='del'>-	*) prev=$arg ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      -g | -m | -o)</div><div class='del'>-	prev=$arg</div><div class='del'>-	;;</div><div class='del'>-      -s)</div><div class='del'>-	stripme=" -s"</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-      -*)</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-	# If the previous option needed an argument, then skip it.</div><div class='del'>-	if test -n "$prev"; then</div><div class='del'>-	  prev=</div><div class='del'>-	else</div><div class='del'>-	  dest=$arg</div><div class='del'>-	  continue</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-</div><div class='del'>-      # Aesthetically quote the argument.</div><div class='del'>-      func_quote_for_eval "$arg"</div><div class='del'>-      install_prog="$install_prog $func_quote_for_eval_result"</div><div class='del'>-    done</div><div class='del'>-</div><div class='del'>-    test -z "$install_prog" &amp;&amp; \</div><div class='del'>-      func_fatal_help "you must specify an install program"</div><div class='del'>-</div><div class='del'>-    test -n "$prev" &amp;&amp; \</div><div class='del'>-      func_fatal_help "the \`$prev' option requires an argument"</div><div class='del'>-</div><div class='del'>-    if test -z "$files"; then</div><div class='del'>-      if test -z "$dest"; then</div><div class='del'>-	func_fatal_help "no file or destination specified"</div><div class='del'>-      else</div><div class='del'>-	func_fatal_help "you must specify a destination"</div><div class='del'>-      fi</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    # Strip any trailing slash from the destination.</div><div class='del'>-    func_stripname '' '/' "$dest"</div><div class='del'>-    dest=$func_stripname_result</div><div class='del'>-</div><div class='del'>-    # Check to see that the destination is a directory.</div><div class='del'>-    test -d "$dest" &amp;&amp; isdir=yes</div><div class='del'>-    if test "$isdir" = yes; then</div><div class='del'>-      destdir="$dest"</div><div class='del'>-      destname=</div><div class='del'>-    else</div><div class='del'>-      func_dirname_and_basename "$dest" "" "."</div><div class='del'>-      destdir="$func_dirname_result"</div><div class='del'>-      destname="$func_basename_result"</div><div class='del'>-</div><div class='del'>-      # Not a directory, so check to see that there is only one file specified.</div><div class='del'>-      set dummy $files; shift</div><div class='del'>-      test "$#" -gt 1 &amp;&amp; \</div><div class='del'>-	func_fatal_help "\`$dest' is not a directory"</div><div class='del'>-    fi</div><div class='del'>-    case $destdir in</div><div class='del'>-    [\\/]* | [A-Za-z]:[\\/]*) ;;</div><div class='del'>-    *)</div><div class='del'>-      for file in $files; do</div><div class='del'>-	case $file in</div><div class='del'>-	*.lo) ;;</div><div class='del'>-	*)</div><div class='del'>-	  func_fatal_help "\`$destdir' must be an absolute directory name"</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      done</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    # This variable tells wrapper scripts just to set variables rather</div><div class='del'>-    # than running their programs.</div><div class='del'>-    libtool_install_magic="$magic"</div><div class='del'>-</div><div class='del'>-    staticlibs=</div><div class='del'>-    future_libdirs=</div><div class='del'>-    current_libdirs=</div><div class='del'>-    for file in $files; do</div><div class='del'>-</div><div class='del'>-      # Do each installation.</div><div class='del'>-      case $file in</div><div class='del'>-      *.$libext)</div><div class='del'>-	# Do the static libraries later.</div><div class='del'>-	staticlibs="$staticlibs $file"</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      *.la)</div><div class='del'>-	# Check to see that this really is a libtool archive.</div><div class='del'>-	func_lalib_unsafe_p "$file" \</div><div class='del'>-	  || func_fatal_help "\`$file' is not a valid libtool archive"</div><div class='del'>-</div><div class='del'>-	library_names=</div><div class='del'>-	old_library=</div><div class='del'>-	relink_command=</div><div class='del'>-	func_source "$file"</div><div class='del'>-</div><div class='del'>-	# Add the libdir to current_libdirs if it is the destination.</div><div class='del'>-	if test "X$destdir" = "X$libdir"; then</div><div class='del'>-	  case "$current_libdirs " in</div><div class='del'>-	  *" $libdir "*) ;;</div><div class='del'>-	  *) current_libdirs="$current_libdirs $libdir" ;;</div><div class='del'>-	  esac</div><div class='del'>-	else</div><div class='del'>-	  # Note the libdir as a future libdir.</div><div class='del'>-	  case "$future_libdirs " in</div><div class='del'>-	  *" $libdir "*) ;;</div><div class='del'>-	  *) future_libdirs="$future_libdirs $libdir" ;;</div><div class='del'>-	  esac</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	func_dirname "$file" "/" ""</div><div class='del'>-	dir="$func_dirname_result"</div><div class='del'>-	dir="$dir$objdir"</div><div class='del'>-</div><div class='del'>-	if test -n "$relink_command"; then</div><div class='del'>-	  # Determine the prefix the user has applied to our future dir.</div><div class='del'>-	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`</div><div class='del'>-</div><div class='del'>-	  # Don't allow the user to place us outside of our expected</div><div class='del'>-	  # location b/c this prevents finding dependent libraries that</div><div class='del'>-	  # are installed to the same prefix.</div><div class='del'>-	  # At present, this check doesn't affect windows .dll's that</div><div class='del'>-	  # are installed into $libdir/../bin (currently, that works fine)</div><div class='del'>-	  # but it's something to keep an eye on.</div><div class='del'>-	  test "$inst_prefix_dir" = "$destdir" &amp;&amp; \</div><div class='del'>-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"</div><div class='del'>-</div><div class='del'>-	  if test -n "$inst_prefix_dir"; then</div><div class='del'>-	    # Stick the inst_prefix_dir data into the link command.</div><div class='del'>-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`</div><div class='del'>-	  else</div><div class='del'>-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  func_warning "relinking \`$file'"</div><div class='del'>-	  func_show_eval "$relink_command" \</div><div class='del'>-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# See the names of the shared library.</div><div class='del'>-	set dummy $library_names; shift</div><div class='del'>-	if test -n "$1"; then</div><div class='del'>-	  realname="$1"</div><div class='del'>-	  shift</div><div class='del'>-</div><div class='del'>-	  srcname="$realname"</div><div class='del'>-	  test -n "$relink_command" &amp;&amp; srcname="$realname"T</div><div class='del'>-</div><div class='del'>-	  # Install the shared library and build the symlinks.</div><div class='del'>-	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \</div><div class='del'>-	      'exit $?'</div><div class='del'>-	  tstripme="$stripme"</div><div class='del'>-	  case $host_os in</div><div class='del'>-	  cygwin* | mingw* | pw32* | cegcc*)</div><div class='del'>-	    case $realname in</div><div class='del'>-	    *.dll.a)</div><div class='del'>-	      tstripme=""</div><div class='del'>-	      ;;</div><div class='del'>-	    esac</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	  if test -n "$tstripme" &amp;&amp; test -n "$striplib"; then</div><div class='del'>-	    func_show_eval "$striplib $destdir/$realname" 'exit $?'</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  if test "$#" -gt 0; then</div><div class='del'>-	    # Delete the old symlinks, and create new ones.</div><div class='del'>-	    # Try `ln -sf' first, because the `ln' binary might depend on</div><div class='del'>-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,</div><div class='del'>-	    # so we also need to try rm &amp;&amp; ln -s.</div><div class='del'>-	    for linkname</div><div class='del'>-	    do</div><div class='del'>-	      test "$linkname" != "$realname" \</div><div class='del'>-		&amp;&amp; func_show_eval "(cd $destdir &amp;&amp; { $LN_S -f $realname $linkname || { $RM $linkname &amp;&amp; $LN_S $realname $linkname; }; })"</div><div class='del'>-	    done</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  # Do each command in the postinstall commands.</div><div class='del'>-	  lib="$destdir/$realname"</div><div class='del'>-	  func_execute_cmds "$postinstall_cmds" 'exit $?'</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# Install the pseudo-library for information purposes.</div><div class='del'>-	func_basename "$file"</div><div class='del'>-	name="$func_basename_result"</div><div class='del'>-	instname="$dir/$name"i</div><div class='del'>-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'</div><div class='del'>-</div><div class='del'>-	# Maybe install the static library, too.</div><div class='del'>-	test -n "$old_library" &amp;&amp; staticlibs="$staticlibs $dir/$old_library"</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      *.lo)</div><div class='del'>-	# Install (i.e. copy) a libtool object.</div><div class='del'>-</div><div class='del'>-	# Figure out destination file name, if it wasn't already specified.</div><div class='del'>-	if test -n "$destname"; then</div><div class='del'>-	  destfile="$destdir/$destname"</div><div class='del'>-	else</div><div class='del'>-	  func_basename "$file"</div><div class='del'>-	  destfile="$func_basename_result"</div><div class='del'>-	  destfile="$destdir/$destfile"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# Deduce the name of the destination old-style object file.</div><div class='del'>-	case $destfile in</div><div class='del'>-	*.lo)</div><div class='del'>-	  func_lo2o "$destfile"</div><div class='del'>-	  staticdest=$func_lo2o_result</div><div class='del'>-	  ;;</div><div class='del'>-	*.$objext)</div><div class='del'>-	  staticdest="$destfile"</div><div class='del'>-	  destfile=</div><div class='del'>-	  ;;</div><div class='del'>-	*)</div><div class='del'>-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-</div><div class='del'>-	# Install the libtool object if requested.</div><div class='del'>-	test -n "$destfile" &amp;&amp; \</div><div class='del'>-	  func_show_eval "$install_prog $file $destfile" 'exit $?'</div><div class='del'>-</div><div class='del'>-	# Install the old object if enabled.</div><div class='del'>-	if test "$build_old_libs" = yes; then</div><div class='del'>-	  # Deduce the name of the old-style object file.</div><div class='del'>-	  func_lo2o "$file"</div><div class='del'>-	  staticobj=$func_lo2o_result</div><div class='del'>-	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'</div><div class='del'>-	fi</div><div class='del'>-	exit $EXIT_SUCCESS</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      *)</div><div class='del'>-	# Figure out destination file name, if it wasn't already specified.</div><div class='del'>-	if test -n "$destname"; then</div><div class='del'>-	  destfile="$destdir/$destname"</div><div class='del'>-	else</div><div class='del'>-	  func_basename "$file"</div><div class='del'>-	  destfile="$func_basename_result"</div><div class='del'>-	  destfile="$destdir/$destfile"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# If the file is missing, and there is a .exe on the end, strip it</div><div class='del'>-	# because it is most likely a libtool script we actually want to</div><div class='del'>-	# install</div><div class='del'>-	stripped_ext=""</div><div class='del'>-	case $file in</div><div class='del'>-	  *.exe)</div><div class='del'>-	    if test ! -f "$file"; then</div><div class='del'>-	      func_stripname '' '.exe' "$file"</div><div class='del'>-	      file=$func_stripname_result</div><div class='del'>-	      stripped_ext=".exe"</div><div class='del'>-	    fi</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-</div><div class='del'>-	# Do a test to see if this is really a libtool program.</div><div class='del'>-	case $host in</div><div class='del'>-	*cygwin* | *mingw*)</div><div class='del'>-	    if func_ltwrapper_executable_p "$file"; then</div><div class='del'>-	      func_ltwrapper_scriptname "$file"</div><div class='del'>-	      wrapper=$func_ltwrapper_scriptname_result</div><div class='del'>-	    else</div><div class='del'>-	      func_stripname '' '.exe' "$file"</div><div class='del'>-	      wrapper=$func_stripname_result</div><div class='del'>-	    fi</div><div class='del'>-	    ;;</div><div class='del'>-	*)</div><div class='del'>-	    wrapper=$file</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	if func_ltwrapper_script_p "$wrapper"; then</div><div class='del'>-	  notinst_deplibs=</div><div class='del'>-	  relink_command=</div><div class='del'>-</div><div class='del'>-	  func_source "$wrapper"</div><div class='del'>-</div><div class='del'>-	  # Check the variables that should have been set.</div><div class='del'>-	  test -z "$generated_by_libtool_version" &amp;&amp; \</div><div class='del'>-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"</div><div class='del'>-</div><div class='del'>-	  finalize=yes</div><div class='del'>-	  for lib in $notinst_deplibs; do</div><div class='del'>-	    # Check to see that each library is installed.</div><div class='del'>-	    libdir=</div><div class='del'>-	    if test -f "$lib"; then</div><div class='del'>-	      func_source "$lib"</div><div class='del'>-	    fi</div><div class='del'>-	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test</div><div class='del'>-	    if test -n "$libdir" &amp;&amp; test ! -f "$libfile"; then</div><div class='del'>-	      func_warning "\`$lib' has not been installed in \`$libdir'"</div><div class='del'>-	      finalize=no</div><div class='del'>-	    fi</div><div class='del'>-	  done</div><div class='del'>-</div><div class='del'>-	  relink_command=</div><div class='del'>-	  func_source "$wrapper"</div><div class='del'>-</div><div class='del'>-	  outputname=</div><div class='del'>-	  if test "$fast_install" = no &amp;&amp; test -n "$relink_command"; then</div><div class='del'>-	    $opt_dry_run || {</div><div class='del'>-	      if test "$finalize" = yes; then</div><div class='del'>-	        tmpdir=`func_mktempdir`</div><div class='del'>-		func_basename "$file$stripped_ext"</div><div class='del'>-		file="$func_basename_result"</div><div class='del'>-	        outputname="$tmpdir/$file"</div><div class='del'>-	        # Replace the output file specification.</div><div class='del'>-	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`</div><div class='del'>-</div><div class='del'>-	        $opt_silent || {</div><div class='del'>-	          func_quote_for_expand "$relink_command"</div><div class='del'>-		  eval "func_echo $func_quote_for_expand_result"</div><div class='del'>-	        }</div><div class='del'>-	        if eval "$relink_command"; then :</div><div class='del'>-	          else</div><div class='del'>-		  func_error "error: relink \`$file' with the above command before installing it"</div><div class='del'>-		  $opt_dry_run || ${RM}r "$tmpdir"</div><div class='del'>-		  continue</div><div class='del'>-	        fi</div><div class='del'>-	        file="$outputname"</div><div class='del'>-	      else</div><div class='del'>-	        func_warning "cannot relink \`$file'"</div><div class='del'>-	      fi</div><div class='del'>-	    }</div><div class='del'>-	  else</div><div class='del'>-	    # Install the binary that we compiled earlier.</div><div class='del'>-	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# remove .exe since cygwin /usr/bin/install will append another</div><div class='del'>-	# one anyway</div><div class='del'>-	case $install_prog,$host in</div><div class='del'>-	*/usr/bin/install*,*cygwin*)</div><div class='del'>-	  case $file:$destfile in</div><div class='del'>-	  *.exe:*.exe)</div><div class='del'>-	    # this is ok</div><div class='del'>-	    ;;</div><div class='del'>-	  *.exe:*)</div><div class='del'>-	    destfile=$destfile.exe</div><div class='del'>-	    ;;</div><div class='del'>-	  *:*.exe)</div><div class='del'>-	    func_stripname '' '.exe' "$destfile"</div><div class='del'>-	    destfile=$func_stripname_result</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'</div><div class='del'>-	$opt_dry_run || if test -n "$outputname"; then</div><div class='del'>-	  ${RM}r "$tmpdir"</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-    done</div><div class='del'>-</div><div class='del'>-    for file in $staticlibs; do</div><div class='del'>-      func_basename "$file"</div><div class='del'>-      name="$func_basename_result"</div><div class='del'>-</div><div class='del'>-      # Set up the ranlib parameters.</div><div class='del'>-      oldlib="$destdir/$name"</div><div class='del'>-</div><div class='del'>-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'</div><div class='del'>-</div><div class='del'>-      if test -n "$stripme" &amp;&amp; test -n "$old_striplib"; then</div><div class='del'>-	func_show_eval "$old_striplib $oldlib" 'exit $?'</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Do each command in the postinstall commands.</div><div class='del'>-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'</div><div class='del'>-    done</div><div class='del'>-</div><div class='del'>-    test -n "$future_libdirs" &amp;&amp; \</div><div class='del'>-      func_warning "remember to run \`$progname --finish$future_libdirs'"</div><div class='del'>-</div><div class='del'>-    if test -n "$current_libdirs"; then</div><div class='del'>-      # Maybe just do a dry run.</div><div class='del'>-      $opt_dry_run &amp;&amp; current_libdirs=" -n$current_libdirs"</div><div class='del'>-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'</div><div class='del'>-    else</div><div class='del'>-      exit $EXIT_SUCCESS</div><div class='del'>-    fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test "$mode" = install &amp;&amp; func_mode_install ${1+"$@"}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_generate_dlsyms outputname originator pic_p</div><div class='del'>-# Extract symbols from dlprefiles and create ${outputname}S.o with</div><div class='del'>-# a dlpreopen symbol table.</div><div class='del'>-func_generate_dlsyms ()</div><div class='del'>-{</div><div class='del'>-    $opt_debug</div><div class='del'>-    my_outputname="$1"</div><div class='del'>-    my_originator="$2"</div><div class='del'>-    my_pic_p="${3-no}"</div><div class='del'>-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`</div><div class='del'>-    my_dlsyms=</div><div class='del'>-</div><div class='del'>-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then</div><div class='del'>-      if test -n "$NM" &amp;&amp; test -n "$global_symbol_pipe"; then</div><div class='del'>-	my_dlsyms="${my_outputname}S.c"</div><div class='del'>-      else</div><div class='del'>-	func_error "not configured to extract global symbols from dlpreopened files"</div><div class='del'>-      fi</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    if test -n "$my_dlsyms"; then</div><div class='del'>-      case $my_dlsyms in</div><div class='del'>-      "") ;;</div><div class='del'>-      *.c)</div><div class='del'>-	# Discover the nlist of each of the dlfiles.</div><div class='del'>-	nlist="$output_objdir/${my_outputname}.nm"</div><div class='del'>-</div><div class='del'>-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"</div><div class='del'>-</div><div class='del'>-	# Parse the name list into a source file.</div><div class='del'>-	func_verbose "creating $output_objdir/$my_dlsyms"</div><div class='del'>-</div><div class='del'>-	$opt_dry_run || $ECHO &gt; "$output_objdir/$my_dlsyms" "\</div><div class='del'>-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */</div><div class='del'>-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern \"C\" {</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* External symbol declarations for the compiler. */\</div><div class='del'>-"</div><div class='del'>-</div><div class='del'>-	if test "$dlself" = yes; then</div><div class='del'>-	  func_verbose "generating symbol list for \`$output'"</div><div class='del'>-</div><div class='del'>-	  $opt_dry_run || echo ': @PROGRAM@ ' &gt; "$nlist"</div><div class='del'>-</div><div class='del'>-	  # Add our own program objects to the symbol list.</div><div class='del'>-	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`</div><div class='del'>-	  for progfile in $progfiles; do</div><div class='del'>-	    func_verbose "extracting global C symbols from \`$progfile'"</div><div class='del'>-	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe &gt;&gt; '$nlist'"</div><div class='del'>-	  done</div><div class='del'>-</div><div class='del'>-	  if test -n "$exclude_expsyms"; then</div><div class='del'>-	    $opt_dry_run || {</div><div class='del'>-	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" &gt; "$nlist"T'</div><div class='del'>-	      eval '$MV "$nlist"T "$nlist"'</div><div class='del'>-	    }</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  if test -n "$export_symbols_regex"; then</div><div class='del'>-	    $opt_dry_run || {</div><div class='del'>-	      eval '$EGREP -e "$export_symbols_regex" "$nlist" &gt; "$nlist"T'</div><div class='del'>-	      eval '$MV "$nlist"T "$nlist"'</div><div class='del'>-	    }</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  # Prepare the list of exported symbols</div><div class='del'>-	  if test -z "$export_symbols"; then</div><div class='del'>-	    export_symbols="$output_objdir/$outputname.exp"</div><div class='del'>-	    $opt_dry_run || {</div><div class='del'>-	      $RM $export_symbols</div><div class='del'>-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'&lt; "$nlist" &gt; "$export_symbols"'</div><div class='del'>-	      case $host in</div><div class='del'>-	      *cygwin* | *mingw* | *cegcc* )</div><div class='del'>-                eval "echo EXPORTS "'&gt; "$output_objdir/$outputname.def"'</div><div class='del'>-                eval 'cat "$export_symbols" &gt;&gt; "$output_objdir/$outputname.def"'</div><div class='del'>-	        ;;</div><div class='del'>-	      esac</div><div class='del'>-	    }</div><div class='del'>-	  else</div><div class='del'>-	    $opt_dry_run || {</div><div class='del'>-	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' &lt; "$export_symbols" &gt; "$output_objdir/$outputname.exp"'</div><div class='del'>-	      eval '$GREP -f "$output_objdir/$outputname.exp" &lt; "$nlist" &gt; "$nlist"T'</div><div class='del'>-	      eval '$MV "$nlist"T "$nlist"'</div><div class='del'>-	      case $host in</div><div class='del'>-	        *cygwin | *mingw* | *cegcc* )</div><div class='del'>-	          eval "echo EXPORTS "'&gt; "$output_objdir/$outputname.def"'</div><div class='del'>-	          eval 'cat "$nlist" &gt;&gt; "$output_objdir/$outputname.def"'</div><div class='del'>-	          ;;</div><div class='del'>-	      esac</div><div class='del'>-	    }</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	for dlprefile in $dlprefiles; do</div><div class='del'>-	  func_verbose "extracting global C symbols from \`$dlprefile'"</div><div class='del'>-	  func_basename "$dlprefile"</div><div class='del'>-	  name="$func_basename_result"</div><div class='del'>-	  $opt_dry_run || {</div><div class='del'>-	    eval '$ECHO ": $name " &gt;&gt; "$nlist"'</div><div class='del'>-	    eval "$NM $dlprefile 2&gt;/dev/null | $global_symbol_pipe &gt;&gt; '$nlist'"</div><div class='del'>-	  }</div><div class='del'>-	done</div><div class='del'>-</div><div class='del'>-	$opt_dry_run || {</div><div class='del'>-	  # Make sure we have at least an empty file.</div><div class='del'>-	  test -f "$nlist" || : &gt; "$nlist"</div><div class='del'>-</div><div class='del'>-	  if test -n "$exclude_expsyms"; then</div><div class='del'>-	    $EGREP -v " ($exclude_expsyms)$" "$nlist" &gt; "$nlist"T</div><div class='del'>-	    $MV "$nlist"T "$nlist"</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  # Try sorting and uniquifying the output.</div><div class='del'>-	  if $GREP -v "^: " &lt; "$nlist" |</div><div class='del'>-	      if sort -k 3 &lt;/dev/null &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-		sort -k 3</div><div class='del'>-	      else</div><div class='del'>-		sort +2</div><div class='del'>-	      fi |</div><div class='del'>-	      uniq &gt; "$nlist"S; then</div><div class='del'>-	    :</div><div class='del'>-	  else</div><div class='del'>-	    $GREP -v "^: " &lt; "$nlist" &gt; "$nlist"S</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  if test -f "$nlist"S; then</div><div class='del'>-	    eval "$global_symbol_to_cdecl"' &lt; "$nlist"S &gt;&gt; "$output_objdir/$my_dlsyms"'</div><div class='del'>-	  else</div><div class='del'>-	    $ECHO '/* NONE */' &gt;&gt; "$output_objdir/$my_dlsyms"</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  $ECHO &gt;&gt; "$output_objdir/$my_dlsyms" "\</div><div class='del'>-</div><div class='del'>-/* The mapping between symbol names and symbols.  */</div><div class='del'>-typedef struct {</div><div class='del'>-  const char *name;</div><div class='del'>-  void *address;</div><div class='del'>-} lt_dlsymlist;</div><div class='del'>-"</div><div class='del'>-	  case $host in</div><div class='del'>-	  *cygwin* | *mingw* | *cegcc* )</div><div class='del'>-	    $ECHO &gt;&gt; "$output_objdir/$my_dlsyms" "\</div><div class='del'>-/* DATA imports from DLLs on WIN32 con't be const, because</div><div class='del'>-   runtime relocations are performed -- see ld's documentation</div><div class='del'>-   on pseudo-relocs.  */"</div><div class='del'>-	    lt_dlsym_const= ;;</div><div class='del'>-	  *osf5*)</div><div class='del'>-	    echo &gt;&gt; "$output_objdir/$my_dlsyms" "\</div><div class='del'>-/* This system does not cope well with relocations in const data */"</div><div class='del'>-	    lt_dlsym_const= ;;</div><div class='del'>-	  *)</div><div class='del'>-	    lt_dlsym_const=const ;;</div><div class='del'>-	  esac</div><div class='del'>-</div><div class='del'>-	  $ECHO &gt;&gt; "$output_objdir/$my_dlsyms" "\</div><div class='del'>-extern $lt_dlsym_const lt_dlsymlist</div><div class='del'>-lt_${my_prefix}_LTX_preloaded_symbols[];</div><div class='del'>-$lt_dlsym_const lt_dlsymlist</div><div class='del'>-lt_${my_prefix}_LTX_preloaded_symbols[] =</div><div class='del'>-{\</div><div class='del'>-  { \"$my_originator\", (void *) 0 },"</div><div class='del'>-</div><div class='del'>-	  case $need_lib_prefix in</div><div class='del'>-	  no)</div><div class='del'>-	    eval "$global_symbol_to_c_name_address" &lt; "$nlist" &gt;&gt; "$output_objdir/$my_dlsyms"</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    eval "$global_symbol_to_c_name_address_lib_prefix" &lt; "$nlist" &gt;&gt; "$output_objdir/$my_dlsyms"</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	  $ECHO &gt;&gt; "$output_objdir/$my_dlsyms" "\</div><div class='del'>-  {0, (void *) 0}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This works around a problem in FreeBSD linker */</div><div class='del'>-#ifdef FREEBSD_WORKAROUND</div><div class='del'>-static const void *lt_preloaded_setup() {</div><div class='del'>-  return lt_${my_prefix}_LTX_preloaded_symbols;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif\</div><div class='del'>-"</div><div class='del'>-	} # !$opt_dry_run</div><div class='del'>-</div><div class='del'>-	pic_flag_for_symtable=</div><div class='del'>-	case "$compile_command " in</div><div class='del'>-	*" -static "*) ;;</div><div class='del'>-	*)</div><div class='del'>-	  case $host in</div><div class='del'>-	  # compiling the symbol table file with pic_flag works around</div><div class='del'>-	  # a FreeBSD bug that causes programs to crash when -lm is</div><div class='del'>-	  # linked before any other PIC object.  But we must not use</div><div class='del'>-	  # pic_flag when linking with -static.  The problem exists in</div><div class='del'>-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.</div><div class='del'>-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)</div><div class='del'>-	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;</div><div class='del'>-	  *-*-hpux*)</div><div class='del'>-	    pic_flag_for_symtable=" $pic_flag"  ;;</div><div class='del'>-	  *)</div><div class='del'>-	    if test "X$my_pic_p" != Xno; then</div><div class='del'>-	      pic_flag_for_symtable=" $pic_flag"</div><div class='del'>-	    fi</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	symtab_cflags=</div><div class='del'>-	for arg in $LTCFLAGS; do</div><div class='del'>-	  case $arg in</div><div class='del'>-	  -pie | -fpie | -fPIE) ;;</div><div class='del'>-	  *) symtab_cflags="$symtab_cflags $arg" ;;</div><div class='del'>-	  esac</div><div class='del'>-	done</div><div class='del'>-</div><div class='del'>-	# Now compile the dynamic symbol file.</div><div class='del'>-	func_show_eval '(cd $output_objdir &amp;&amp; $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'</div><div class='del'>-</div><div class='del'>-	# Clean up the generated files.</div><div class='del'>-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'</div><div class='del'>-</div><div class='del'>-	# Transform the symbol file into the correct name.</div><div class='del'>-	symfileobj="$output_objdir/${my_outputname}S.$objext"</div><div class='del'>-	case $host in</div><div class='del'>-	*cygwin* | *mingw* | *cegcc* )</div><div class='del'>-	  if test -f "$output_objdir/$my_outputname.def"; then</div><div class='del'>-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`</div><div class='del'>-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`</div><div class='del'>-	  else</div><div class='del'>-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`</div><div class='del'>-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`</div><div class='del'>-	  fi</div><div class='del'>-	  ;;</div><div class='del'>-	*)</div><div class='del'>-	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`</div><div class='del'>-	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-	func_fatal_error "unknown suffix for \`$my_dlsyms'"</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-    else</div><div class='del'>-      # We keep going just in case the user didn't refer to</div><div class='del'>-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe</div><div class='del'>-      # really was required.</div><div class='del'>-</div><div class='del'>-      # Nullify the symbol file.</div><div class='del'>-      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`</div><div class='del'>-      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`</div><div class='del'>-    fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-# func_win32_libid arg</div><div class='del'>-# return the library type of file 'arg'</div><div class='del'>-#</div><div class='del'>-# Need a lot of goo to handle *both* DLLs and import libs</div><div class='del'>-# Has to be a shell function in order to 'eat' the argument</div><div class='del'>-# that is supplied when $file_magic_command is called.</div><div class='del'>-func_win32_libid ()</div><div class='del'>-{</div><div class='del'>-  $opt_debug</div><div class='del'>-  win32_libid_type="unknown"</div><div class='del'>-  win32_fileres=`file -L $1 2&gt;/dev/null`</div><div class='del'>-  case $win32_fileres in</div><div class='del'>-  *ar\ archive\ import\ library*) # definitely import</div><div class='del'>-    win32_libid_type="x86 archive import"</div><div class='del'>-    ;;</div><div class='del'>-  *ar\ archive*) # could be an import, or static</div><div class='del'>-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2&gt;/dev/null |</div><div class='del'>-       $EGREP 'file format pe-i386(.*architecture: i386)?' &gt;/dev/null ; then</div><div class='del'>-      win32_nmres=`eval $NM -f posix -A $1 |</div><div class='del'>-	$SED -n -e '</div><div class='del'>-	    1,100{</div><div class='del'>-		/ I /{</div><div class='del'>-		    s,.*,import,</div><div class='del'>-		    p</div><div class='del'>-		    q</div><div class='del'>-		}</div><div class='del'>-	    }'`</div><div class='del'>-      case $win32_nmres in</div><div class='del'>-      import*)  win32_libid_type="x86 archive import";;</div><div class='del'>-      *)        win32_libid_type="x86 archive static";;</div><div class='del'>-      esac</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  *DLL*)</div><div class='del'>-    win32_libid_type="x86 DLL"</div><div class='del'>-    ;;</div><div class='del'>-  *executable*) # but shell scripts are "executable" too...</div><div class='del'>-    case $win32_fileres in</div><div class='del'>-    *MS\ Windows\ PE\ Intel*)</div><div class='del'>-      win32_libid_type="x86 DLL"</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-    ;;</div><div class='del'>-  esac</div><div class='del'>-  $ECHO "$win32_libid_type"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_extract_an_archive dir oldlib</div><div class='del'>-func_extract_an_archive ()</div><div class='del'>-{</div><div class='del'>-    $opt_debug</div><div class='del'>-    f_ex_an_ar_dir="$1"; shift</div><div class='del'>-    f_ex_an_ar_oldlib="$1"</div><div class='del'>-    func_show_eval "(cd \$f_ex_an_ar_dir &amp;&amp; $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'</div><div class='del'>-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc &gt;/dev/null 2&gt;&amp;1); then</div><div class='del'>-     :</div><div class='del'>-    else</div><div class='del'>-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"</div><div class='del'>-    fi</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_extract_archives gentop oldlib ...</div><div class='del'>-func_extract_archives ()</div><div class='del'>-{</div><div class='del'>-    $opt_debug</div><div class='del'>-    my_gentop="$1"; shift</div><div class='del'>-    my_oldlibs=${1+"$@"}</div><div class='del'>-    my_oldobjs=""</div><div class='del'>-    my_xlib=""</div><div class='del'>-    my_xabs=""</div><div class='del'>-    my_xdir=""</div><div class='del'>-</div><div class='del'>-    for my_xlib in $my_oldlibs; do</div><div class='del'>-      # Extract the objects.</div><div class='del'>-      case $my_xlib in</div><div class='del'>-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;</div><div class='del'>-	*) my_xabs=`pwd`"/$my_xlib" ;;</div><div class='del'>-      esac</div><div class='del'>-      func_basename "$my_xlib"</div><div class='del'>-      my_xlib="$func_basename_result"</div><div class='del'>-      my_xlib_u=$my_xlib</div><div class='del'>-      while :; do</div><div class='del'>-        case " $extracted_archives " in</div><div class='del'>-	*" $my_xlib_u "*)</div><div class='del'>-	  func_arith $extracted_serial + 1</div><div class='del'>-	  extracted_serial=$func_arith_result</div><div class='del'>-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;</div><div class='del'>-	*) break ;;</div><div class='del'>-	esac</div><div class='del'>-      done</div><div class='del'>-      extracted_archives="$extracted_archives $my_xlib_u"</div><div class='del'>-      my_xdir="$my_gentop/$my_xlib_u"</div><div class='del'>-</div><div class='del'>-      func_mkdir_p "$my_xdir"</div><div class='del'>-</div><div class='del'>-      case $host in</div><div class='del'>-      *-darwin*)</div><div class='del'>-	func_verbose "Extracting $my_xabs"</div><div class='del'>-	# Do not bother doing anything if just a dry run</div><div class='del'>-	$opt_dry_run || {</div><div class='del'>-	  darwin_orig_dir=`pwd`</div><div class='del'>-	  cd $my_xdir || exit $?</div><div class='del'>-	  darwin_archive=$my_xabs</div><div class='del'>-	  darwin_curdir=`pwd`</div><div class='del'>-	  darwin_base_archive=`basename "$darwin_archive"`</div><div class='del'>-	  darwin_arches=`$LIPO -info "$darwin_archive" 2&gt;/dev/null | $GREP Architectures 2&gt;/dev/null || true`</div><div class='del'>-	  if test -n "$darwin_arches"; then</div><div class='del'>-	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`</div><div class='del'>-	    darwin_arch=</div><div class='del'>-	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"</div><div class='del'>-	    for darwin_arch in  $darwin_arches ; do</div><div class='del'>-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"</div><div class='del'>-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"</div><div class='del'>-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"</div><div class='del'>-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"</div><div class='del'>-	      cd "$darwin_curdir"</div><div class='del'>-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"</div><div class='del'>-	    done # $darwin_arches</div><div class='del'>-            ## Okay now we've a bunch of thin objects, gotta fatten them up :)</div><div class='del'>-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`</div><div class='del'>-	    darwin_file=</div><div class='del'>-	    darwin_files=</div><div class='del'>-	    for darwin_file in $darwin_filelist; do</div><div class='del'>-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`</div><div class='del'>-	      $LIPO -create -output "$darwin_file" $darwin_files</div><div class='del'>-	    done # $darwin_filelist</div><div class='del'>-	    $RM -rf unfat-$$</div><div class='del'>-	    cd "$darwin_orig_dir"</div><div class='del'>-	  else</div><div class='del'>-	    cd $darwin_orig_dir</div><div class='del'>-	    func_extract_an_archive "$my_xdir" "$my_xabs"</div><div class='del'>-	  fi # $darwin_arches</div><div class='del'>-	} # !$opt_dry_run</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-        func_extract_an_archive "$my_xdir" "$my_xabs"</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`</div><div class='del'>-    done</div><div class='del'>-</div><div class='del'>-    func_extract_archives_result="$my_oldobjs"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_emit_wrapper_part1 [arg=no]</div><div class='del'>-#</div><div class='del'>-# Emit the first part of a libtool wrapper script on stdout.</div><div class='del'>-# For more information, see the description associated with</div><div class='del'>-# func_emit_wrapper(), below.</div><div class='del'>-func_emit_wrapper_part1 ()</div><div class='del'>-{</div><div class='del'>-	func_emit_wrapper_part1_arg1=no</div><div class='del'>-	if test -n "$1" ; then</div><div class='del'>-	  func_emit_wrapper_part1_arg1=$1</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	$ECHO "\</div><div class='del'>-#! $SHELL</div><div class='del'>-</div><div class='del'>-# $output - temporary wrapper script for $objdir/$outputname</div><div class='del'>-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION</div><div class='del'>-#</div><div class='del'>-# The $output program cannot be directly executed until all the libtool</div><div class='del'>-# libraries that it depends on are installed.</div><div class='del'>-#</div><div class='del'>-# This wrapper script should never be moved out of the build directory.</div><div class='del'>-# If it is, it will not operate correctly.</div><div class='del'>-</div><div class='del'>-# Sed substitution that helps us do robust quoting.  It backslashifies</div><div class='del'>-# metacharacters that are still active within double-quoted strings.</div><div class='del'>-Xsed='${SED} -e 1s/^X//'</div><div class='del'>-sed_quote_subst='$sed_quote_subst'</div><div class='del'>-</div><div class='del'>-# Be Bourne compatible</div><div class='del'>-if test -n \"\${ZSH_VERSION+set}\" &amp;&amp; (emulate sh) &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-  emulate sh</div><div class='del'>-  NULLCMD=:</div><div class='del'>-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which</div><div class='del'>-  # is contrary to our usage.  Disable this feature.</div><div class='del'>-  alias -g '\${1+\"\$@\"}'='\"\$@\"'</div><div class='del'>-  setopt NO_GLOB_SUBST</div><div class='del'>-else</div><div class='del'>-  case \`(set -o) 2&gt;/dev/null\` in *posix*) set -o posix;; esac</div><div class='del'>-fi</div><div class='del'>-BIN_SH=xpg4; export BIN_SH # for Tru64</div><div class='del'>-DUALCASE=1; export DUALCASE # for MKS sh</div><div class='del'>-</div><div class='del'>-# The HP-UX ksh and POSIX shell print the target directory to stdout</div><div class='del'>-# if CDPATH is set.</div><div class='del'>-(unset CDPATH) &gt;/dev/null 2&gt;&amp;1 &amp;&amp; unset CDPATH</div><div class='del'>-</div><div class='del'>-relink_command=\"$relink_command\"</div><div class='del'>-</div><div class='del'>-# This environment variable determines our operation mode.</div><div class='del'>-if test \"\$libtool_install_magic\" = \"$magic\"; then</div><div class='del'>-  # install mode needs the following variables:</div><div class='del'>-  generated_by_libtool_version='$macro_version'</div><div class='del'>-  notinst_deplibs='$notinst_deplibs'</div><div class='del'>-else</div><div class='del'>-  # When we are sourced in execute mode, \$file and \$ECHO are already set.</div><div class='del'>-  if test \"\$libtool_execute_magic\" != \"$magic\"; then</div><div class='del'>-    ECHO=\"$qecho\"</div><div class='del'>-    file=\"\$0\"</div><div class='del'>-    # Make sure echo works.</div><div class='del'>-    if test \"X\$1\" = X--no-reexec; then</div><div class='del'>-      # Discard the --no-reexec flag, and continue.</div><div class='del'>-      shift</div><div class='del'>-    elif test \"X\`{ \$ECHO '\t'; } 2&gt;/dev/null\`\" = 'X\t'; then</div><div class='del'>-      # Yippee, \$ECHO works!</div><div class='del'>-      :</div><div class='del'>-    else</div><div class='del'>-      # Restart under the correct shell, and then maybe \$ECHO will work.</div><div class='del'>-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}</div><div class='del'>-    fi</div><div class='del'>-  fi\</div><div class='del'>-"</div><div class='del'>-	$ECHO "\</div><div class='del'>-</div><div class='del'>-  # Find the directory that this script lives in.</div><div class='del'>-  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`</div><div class='del'>-  test \"x\$thisdir\" = \"x\$file\" &amp;&amp; thisdir=.</div><div class='del'>-</div><div class='del'>-  # Follow symbolic links until we get to the real thisdir.</div><div class='del'>-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-&gt; //p'\`</div><div class='del'>-  while test -n \"\$file\"; do</div><div class='del'>-    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`</div><div class='del'>-</div><div class='del'>-    # If there was a directory component, then change thisdir.</div><div class='del'>-    if test \"x\$destdir\" != \"x\$file\"; then</div><div class='del'>-      case \"\$destdir\" in</div><div class='del'>-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;</div><div class='del'>-      *) thisdir=\"\$thisdir/\$destdir\" ;;</div><div class='del'>-      esac</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`</div><div class='del'>-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-&gt; //p'\`</div><div class='del'>-  done</div><div class='del'>-"</div><div class='del'>-}</div><div class='del'>-# end: func_emit_wrapper_part1</div><div class='del'>-</div><div class='del'>-# func_emit_wrapper_part2 [arg=no]</div><div class='del'>-#</div><div class='del'>-# Emit the second part of a libtool wrapper script on stdout.</div><div class='del'>-# For more information, see the description associated with</div><div class='del'>-# func_emit_wrapper(), below.</div><div class='del'>-func_emit_wrapper_part2 ()</div><div class='del'>-{</div><div class='del'>-	func_emit_wrapper_part2_arg1=no</div><div class='del'>-	if test -n "$1" ; then</div><div class='del'>-	  func_emit_wrapper_part2_arg1=$1</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	$ECHO "\</div><div class='del'>-</div><div class='del'>-  # Usually 'no', except on cygwin/mingw when embedded into</div><div class='del'>-  # the cwrapper.</div><div class='del'>-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1</div><div class='del'>-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then</div><div class='del'>-    # special case for '.'</div><div class='del'>-    if test \"\$thisdir\" = \".\"; then</div><div class='del'>-      thisdir=\`pwd\`</div><div class='del'>-    fi</div><div class='del'>-    # remove .libs from thisdir</div><div class='del'>-    case \"\$thisdir\" in</div><div class='del'>-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;</div><div class='del'>-    $objdir )   thisdir=. ;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-</div><div class='del'>-  # Try to get the absolute directory name.</div><div class='del'>-  absdir=\`cd \"\$thisdir\" &amp;&amp; pwd\`</div><div class='del'>-  test -n \"\$absdir\" &amp;&amp; thisdir=\"\$absdir\"</div><div class='del'>-"</div><div class='del'>-</div><div class='del'>-	if test "$fast_install" = yes; then</div><div class='del'>-	  $ECHO "\</div><div class='del'>-  program=lt-'$outputname'$exeext</div><div class='del'>-  progdir=\"\$thisdir/$objdir\"</div><div class='del'>-</div><div class='del'>-  if test ! -f \"\$progdir/\$program\" ||</div><div class='del'>-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2&gt;/dev/null | ${SED} 1q\`; \\</div><div class='del'>-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then</div><div class='del'>-</div><div class='del'>-    file=\"\$\$-\$program\"</div><div class='del'>-</div><div class='del'>-    if test ! -d \"\$progdir\"; then</div><div class='del'>-      $MKDIR \"\$progdir\"</div><div class='del'>-    else</div><div class='del'>-      $RM \"\$progdir/\$file\"</div><div class='del'>-    fi"</div><div class='del'>-</div><div class='del'>-	  $ECHO "\</div><div class='del'>-</div><div class='del'>-    # relink executable if necessary</div><div class='del'>-    if test -n \"\$relink_command\"; then</div><div class='del'>-      if relink_command_output=\`eval \$relink_command 2&gt;&amp;1\`; then :</div><div class='del'>-      else</div><div class='del'>-	$ECHO \"\$relink_command_output\" &gt;&amp;2</div><div class='del'>-	$RM \"\$progdir/\$file\"</div><div class='del'>-	exit 1</div><div class='del'>-      fi</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2&gt;/dev/null ||</div><div class='del'>-    { $RM \"\$progdir/\$program\";</div><div class='del'>-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }</div><div class='del'>-    $RM \"\$progdir/\$file\"</div><div class='del'>-  fi"</div><div class='del'>-	else</div><div class='del'>-	  $ECHO "\</div><div class='del'>-  program='$outputname'</div><div class='del'>-  progdir=\"\$thisdir/$objdir\"</div><div class='del'>-"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	$ECHO "\</div><div class='del'>-</div><div class='del'>-  if test -f \"\$progdir/\$program\"; then"</div><div class='del'>-</div><div class='del'>-	# Export our shlibpath_var if we have one.</div><div class='del'>-	if test "$shlibpath_overrides_runpath" = yes &amp;&amp; test -n "$shlibpath_var" &amp;&amp; test -n "$temp_rpath"; then</div><div class='del'>-	  $ECHO "\</div><div class='del'>-    # Add our own library path to $shlibpath_var</div><div class='del'>-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"</div><div class='del'>-</div><div class='del'>-    # Some systems cannot cope with colon-terminated $shlibpath_var</div><div class='del'>-    # The second colon is a workaround for a bug in BeOS R4 sed</div><div class='del'>-    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`</div><div class='del'>-</div><div class='del'>-    export $shlibpath_var</div><div class='del'>-"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# fixup the dll searchpath if we need to.</div><div class='del'>-	if test -n "$dllsearchpath"; then</div><div class='del'>-	  $ECHO "\</div><div class='del'>-    # Add the dll search path components to the executable PATH</div><div class='del'>-    PATH=$dllsearchpath:\$PATH</div><div class='del'>-"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	$ECHO "\</div><div class='del'>-    if test \"\$libtool_execute_magic\" != \"$magic\"; then</div><div class='del'>-      # Run the actual program with our arguments.</div><div class='del'>-"</div><div class='del'>-	case $host in</div><div class='del'>-	# Backslashes separate directories on plain windows</div><div class='del'>-	*-*-mingw | *-*-os2* | *-cegcc*)</div><div class='del'>-	  $ECHO "\</div><div class='del'>-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}</div><div class='del'>-"</div><div class='del'>-	  ;;</div><div class='del'>-</div><div class='del'>-	*)</div><div class='del'>-	  $ECHO "\</div><div class='del'>-      exec \"\$progdir/\$program\" \${1+\"\$@\"}</div><div class='del'>-"</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	$ECHO "\</div><div class='del'>-      \$ECHO \"\$0: cannot exec \$program \$*\" 1&gt;&amp;2</div><div class='del'>-      exit 1</div><div class='del'>-    fi</div><div class='del'>-  else</div><div class='del'>-    # The program doesn't exist.</div><div class='del'>-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1&gt;&amp;2</div><div class='del'>-    \$ECHO \"This script is just a wrapper for \$program.\" 1&gt;&amp;2</div><div class='del'>-    $ECHO \"See the $PACKAGE documentation for more information.\" 1&gt;&amp;2</div><div class='del'>-    exit 1</div><div class='del'>-  fi</div><div class='del'>-fi\</div><div class='del'>-"</div><div class='del'>-}</div><div class='del'>-# end: func_emit_wrapper_part2</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_emit_wrapper [arg=no]</div><div class='del'>-#</div><div class='del'>-# Emit a libtool wrapper script on stdout.</div><div class='del'>-# Don't directly open a file because we may want to</div><div class='del'>-# incorporate the script contents within a cygwin/mingw</div><div class='del'>-# wrapper executable.  Must ONLY be called from within</div><div class='del'>-# func_mode_link because it depends on a number of variables</div><div class='del'>-# set therein.</div><div class='del'>-#</div><div class='del'>-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR</div><div class='del'>-# variable will take.  If 'yes', then the emitted script</div><div class='del'>-# will assume that the directory in which it is stored is</div><div class='del'>-# the $objdir directory.  This is a cygwin/mingw-specific</div><div class='del'>-# behavior.</div><div class='del'>-func_emit_wrapper ()</div><div class='del'>-{</div><div class='del'>-	func_emit_wrapper_arg1=no</div><div class='del'>-	if test -n "$1" ; then</div><div class='del'>-	  func_emit_wrapper_arg1=$1</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# split this up so that func_emit_cwrapperexe_src</div><div class='del'>-	# can call each part independently.</div><div class='del'>-	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"</div><div class='del'>-	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_to_host_path arg</div><div class='del'>-#</div><div class='del'>-# Convert paths to host format when used with build tools.</div><div class='del'>-# Intended for use with "native" mingw (where libtool itself</div><div class='del'>-# is running under the msys shell), or in the following cross-</div><div class='del'>-# build environments:</div><div class='del'>-#    $build          $host</div><div class='del'>-#    mingw (msys)    mingw  [e.g. native]</div><div class='del'>-#    cygwin          mingw</div><div class='del'>-#    *nix + wine     mingw</div><div class='del'>-# where wine is equipped with the `winepath' executable.</div><div class='del'>-# In the native mingw case, the (msys) shell automatically</div><div class='del'>-# converts paths for any non-msys applications it launches,</div><div class='del'>-# but that facility isn't available from inside the cwrapper.</div><div class='del'>-# Similar accommodations are necessary for $host mingw and</div><div class='del'>-# $build cygwin.  Calling this function does no harm for other</div><div class='del'>-# $host/$build combinations not listed above.</div><div class='del'>-#</div><div class='del'>-# ARG is the path (on $build) that should be converted to</div><div class='del'>-# the proper representation for $host. The result is stored</div><div class='del'>-# in $func_to_host_path_result.</div><div class='del'>-func_to_host_path ()</div><div class='del'>-{</div><div class='del'>-  func_to_host_path_result="$1"</div><div class='del'>-  if test -n "$1" ; then</div><div class='del'>-    case $host in</div><div class='del'>-      *mingw* )</div><div class='del'>-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'</div><div class='del'>-        case $build in</div><div class='del'>-          *mingw* ) # actually, msys</div><div class='del'>-            # awkward: cmd appends spaces to result</div><div class='del'>-            lt_sed_strip_trailing_spaces="s/[ ]*\$//"</div><div class='del'>-            func_to_host_path_tmp1=`( cmd //c echo "$1" |\</div><div class='del'>-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2&gt;/dev/null || echo ""`</div><div class='del'>-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\</div><div class='del'>-              $SED -e "$lt_sed_naive_backslashify"`</div><div class='del'>-            ;;</div><div class='del'>-          *cygwin* )</div><div class='del'>-            func_to_host_path_tmp1=`cygpath -w "$1"`</div><div class='del'>-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\</div><div class='del'>-              $SED -e "$lt_sed_naive_backslashify"`</div><div class='del'>-            ;;</div><div class='del'>-          * )</div><div class='del'>-            # Unfortunately, winepath does not exit with a non-zero</div><div class='del'>-            # error code, so we are forced to check the contents of</div><div class='del'>-            # stdout. On the other hand, if the command is not</div><div class='del'>-            # found, the shell will set an exit code of 127 and print</div><div class='del'>-            # *an error message* to stdout. So we must check for both</div><div class='del'>-            # error code of zero AND non-empty stdout, which explains</div><div class='del'>-            # the odd construction:</div><div class='del'>-            func_to_host_path_tmp1=`winepath -w "$1" 2&gt;/dev/null`</div><div class='del'>-            if test "$?" -eq 0 &amp;&amp; test -n "${func_to_host_path_tmp1}"; then</div><div class='del'>-              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\</div><div class='del'>-                $SED -e "$lt_sed_naive_backslashify"`</div><div class='del'>-            else</div><div class='del'>-              # Allow warning below.</div><div class='del'>-              func_to_host_path_result=""</div><div class='del'>-            fi</div><div class='del'>-            ;;</div><div class='del'>-        esac</div><div class='del'>-        if test -z "$func_to_host_path_result" ; then</div><div class='del'>-          func_error "Could not determine host path corresponding to"</div><div class='del'>-          func_error "  '$1'"</div><div class='del'>-          func_error "Continuing, but uninstalled executables may not work."</div><div class='del'>-          # Fallback:</div><div class='del'>-          func_to_host_path_result="$1"</div><div class='del'>-        fi</div><div class='del'>-        ;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-}</div><div class='del'>-# end: func_to_host_path</div><div class='del'>-</div><div class='del'>-# func_to_host_pathlist arg</div><div class='del'>-#</div><div class='del'>-# Convert pathlists to host format when used with build tools.</div><div class='del'>-# See func_to_host_path(), above. This function supports the</div><div class='del'>-# following $build/$host combinations (but does no harm for</div><div class='del'>-# combinations not listed here):</div><div class='del'>-#    $build          $host</div><div class='del'>-#    mingw (msys)    mingw  [e.g. native]</div><div class='del'>-#    cygwin          mingw</div><div class='del'>-#    *nix + wine     mingw</div><div class='del'>-#</div><div class='del'>-# Path separators are also converted from $build format to</div><div class='del'>-# $host format. If ARG begins or ends with a path separator</div><div class='del'>-# character, it is preserved (but converted to $host format)</div><div class='del'>-# on output.</div><div class='del'>-#</div><div class='del'>-# ARG is a pathlist (on $build) that should be converted to</div><div class='del'>-# the proper representation on $host. The result is stored</div><div class='del'>-# in $func_to_host_pathlist_result.</div><div class='del'>-func_to_host_pathlist ()</div><div class='del'>-{</div><div class='del'>-  func_to_host_pathlist_result="$1"</div><div class='del'>-  if test -n "$1" ; then</div><div class='del'>-    case $host in</div><div class='del'>-      *mingw* )</div><div class='del'>-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'</div><div class='del'>-        # Remove leading and trailing path separator characters from</div><div class='del'>-        # ARG. msys behavior is inconsistent here, cygpath turns them</div><div class='del'>-        # into '.;' and ';.', and winepath ignores them completely.</div><div class='del'>-        func_to_host_pathlist_tmp2="$1"</div><div class='del'>-        # Once set for this call, this variable should not be</div><div class='del'>-        # reassigned. It is used in tha fallback case.</div><div class='del'>-        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\</div><div class='del'>-          $SED -e 's|^:*||' -e 's|:*$||'`</div><div class='del'>-        case $build in</div><div class='del'>-          *mingw* ) # Actually, msys.</div><div class='del'>-            # Awkward: cmd appends spaces to result.</div><div class='del'>-            lt_sed_strip_trailing_spaces="s/[ ]*\$//"</div><div class='del'>-            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\</div><div class='del'>-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2&gt;/dev/null || echo ""`</div><div class='del'>-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\</div><div class='del'>-              $SED -e "$lt_sed_naive_backslashify"`</div><div class='del'>-            ;;</div><div class='del'>-          *cygwin* )</div><div class='del'>-            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`</div><div class='del'>-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\</div><div class='del'>-              $SED -e "$lt_sed_naive_backslashify"`</div><div class='del'>-            ;;</div><div class='del'>-          * )</div><div class='del'>-            # unfortunately, winepath doesn't convert pathlists</div><div class='del'>-            func_to_host_pathlist_result=""</div><div class='del'>-            func_to_host_pathlist_oldIFS=$IFS</div><div class='del'>-            IFS=:</div><div class='del'>-            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do</div><div class='del'>-              IFS=$func_to_host_pathlist_oldIFS</div><div class='del'>-              if test -n "$func_to_host_pathlist_f" ; then</div><div class='del'>-                func_to_host_path "$func_to_host_pathlist_f"</div><div class='del'>-                if test -n "$func_to_host_path_result" ; then</div><div class='del'>-                  if test -z "$func_to_host_pathlist_result" ; then</div><div class='del'>-                    func_to_host_pathlist_result="$func_to_host_path_result"</div><div class='del'>-                  else</div><div class='del'>-                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"</div><div class='del'>-                  fi</div><div class='del'>-                fi</div><div class='del'>-              fi</div><div class='del'>-              IFS=:</div><div class='del'>-            done</div><div class='del'>-            IFS=$func_to_host_pathlist_oldIFS</div><div class='del'>-            ;;</div><div class='del'>-        esac</div><div class='del'>-        if test -z "$func_to_host_pathlist_result" ; then</div><div class='del'>-          func_error "Could not determine the host path(s) corresponding to"</div><div class='del'>-          func_error "  '$1'"</div><div class='del'>-          func_error "Continuing, but uninstalled executables may not work."</div><div class='del'>-          # Fallback. This may break if $1 contains DOS-style drive</div><div class='del'>-          # specifications. The fix is not to complicate the expression</div><div class='del'>-          # below, but for the user to provide a working wine installation</div><div class='del'>-          # with winepath so that path translation in the cross-to-mingw</div><div class='del'>-          # case works properly.</div><div class='del'>-          lt_replace_pathsep_nix_to_dos="s|:|;|g"</div><div class='del'>-          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\</div><div class='del'>-            $SED -e "$lt_replace_pathsep_nix_to_dos"`</div><div class='del'>-        fi</div><div class='del'>-        # Now, add the leading and trailing path separators back</div><div class='del'>-        case "$1" in</div><div class='del'>-          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"</div><div class='del'>-            ;;</div><div class='del'>-        esac</div><div class='del'>-        case "$1" in</div><div class='del'>-          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"</div><div class='del'>-            ;;</div><div class='del'>-        esac</div><div class='del'>-        ;;</div><div class='del'>-    esac</div><div class='del'>-  fi</div><div class='del'>-}</div><div class='del'>-# end: func_to_host_pathlist</div><div class='del'>-</div><div class='del'>-# func_emit_cwrapperexe_src</div><div class='del'>-# emit the source code for a wrapper executable on stdout</div><div class='del'>-# Must ONLY be called from within func_mode_link because</div><div class='del'>-# it depends on a number of variable set therein.</div><div class='del'>-func_emit_cwrapperexe_src ()</div><div class='del'>-{</div><div class='del'>-	cat &lt;&lt;EOF</div><div class='del'>-</div><div class='del'>-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname</div><div class='del'>-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION</div><div class='del'>-</div><div class='del'>-   The $output program cannot be directly executed until all the libtool</div><div class='del'>-   libraries that it depends on are installed.</div><div class='del'>-</div><div class='del'>-   This wrapper executable should never be moved out of the build directory.</div><div class='del'>-   If it is, it will not operate correctly.</div><div class='del'>-</div><div class='del'>-   Currently, it simply execs the wrapper *script* "$SHELL $output",</div><div class='del'>-   but could eventually absorb all of the scripts functionality and</div><div class='del'>-   exec $objdir/$outputname directly.</div><div class='del'>-*/</div><div class='del'>-EOF</div><div class='del'>-	    cat &lt;&lt;"EOF"</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#ifdef _MSC_VER</div><div class='del'>-# include &lt;direct.h&gt;</div><div class='del'>-# include &lt;process.h&gt;</div><div class='del'>-# include &lt;io.h&gt;</div><div class='del'>-# define setmode _setmode</div><div class='del'>-#else</div><div class='del'>-# include &lt;unistd.h&gt;</div><div class='del'>-# include &lt;stdint.h&gt;</div><div class='del'>-# ifdef __CYGWIN__</div><div class='del'>-#  include &lt;io.h&gt;</div><div class='del'>-#  define HAVE_SETENV</div><div class='del'>-#  ifdef __STRICT_ANSI__</div><div class='del'>-char *realpath (const char *, char *);</div><div class='del'>-int putenv (char *);</div><div class='del'>-int setenv (const char *, const char *, int);</div><div class='del'>-#  endif</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='del'>-#include &lt;malloc.h&gt;</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;assert.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-</div><div class='del'>-#if defined(PATH_MAX)</div><div class='del'>-# define LT_PATHMAX PATH_MAX</div><div class='del'>-#elif defined(MAXPATHLEN)</div><div class='del'>-# define LT_PATHMAX MAXPATHLEN</div><div class='del'>-#else</div><div class='del'>-# define LT_PATHMAX 1024</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef S_IXOTH</div><div class='del'>-# define S_IXOTH 0</div><div class='del'>-#endif</div><div class='del'>-#ifndef S_IXGRP</div><div class='del'>-# define S_IXGRP 0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef _MSC_VER</div><div class='del'>-# define S_IXUSR _S_IEXEC</div><div class='del'>-# define stat _stat</div><div class='del'>-# ifndef _INTPTR_T_DEFINED</div><div class='del'>-#  define intptr_t int</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef DIR_SEPARATOR</div><div class='del'>-# define DIR_SEPARATOR '/'</div><div class='del'>-# define PATH_SEPARATOR ':'</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \</div><div class='del'>-  defined (__OS2__)</div><div class='del'>-# define HAVE_DOS_BASED_FILE_SYSTEM</div><div class='del'>-# define FOPEN_WB "wb"</div><div class='del'>-# ifndef DIR_SEPARATOR_2</div><div class='del'>-#  define DIR_SEPARATOR_2 '\\'</div><div class='del'>-# endif</div><div class='del'>-# ifndef PATH_SEPARATOR_2</div><div class='del'>-#  define PATH_SEPARATOR_2 ';'</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef DIR_SEPARATOR_2</div><div class='del'>-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)</div><div class='del'>-#else /* DIR_SEPARATOR_2 */</div><div class='del'>-# define IS_DIR_SEPARATOR(ch) \</div><div class='del'>-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))</div><div class='del'>-#endif /* DIR_SEPARATOR_2 */</div><div class='del'>-</div><div class='del'>-#ifndef PATH_SEPARATOR_2</div><div class='del'>-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)</div><div class='del'>-#else /* PATH_SEPARATOR_2 */</div><div class='del'>-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)</div><div class='del'>-#endif /* PATH_SEPARATOR_2 */</div><div class='del'>-</div><div class='del'>-#ifdef __CYGWIN__</div><div class='del'>-# define FOPEN_WB "wb"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef FOPEN_WB</div><div class='del'>-# define FOPEN_WB "w"</div><div class='del'>-#endif</div><div class='del'>-#ifndef _O_BINARY</div><div class='del'>-# define _O_BINARY 0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))</div><div class='del'>-#define XFREE(stale) do { \</div><div class='del'>-  if (stale) { free ((void *) stale); stale = 0; } \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#undef LTWRAPPER_DEBUGPRINTF</div><div class='del'>-#if defined DEBUGWRAPPER</div><div class='del'>-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args</div><div class='del'>-static void</div><div class='del'>-ltwrapper_debugprintf (const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-    va_list args;</div><div class='del'>-    va_start (args, fmt);</div><div class='del'>-    (void) vfprintf (stderr, fmt, args);</div><div class='del'>-    va_end (args);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-# define LTWRAPPER_DEBUGPRINTF(args)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-const char *program_name = NULL;</div><div class='del'>-</div><div class='del'>-void *xmalloc (size_t num);</div><div class='del'>-char *xstrdup (const char *string);</div><div class='del'>-const char *base_name (const char *name);</div><div class='del'>-char *find_executable (const char *wrapper);</div><div class='del'>-char *chase_symlinks (const char *pathspec);</div><div class='del'>-int make_executable (const char *path);</div><div class='del'>-int check_executable (const char *path);</div><div class='del'>-char *strendzap (char *str, const char *pat);</div><div class='del'>-void lt_fatal (const char *message, ...);</div><div class='del'>-void lt_setenv (const char *name, const char *value);</div><div class='del'>-char *lt_extend_str (const char *orig_value, const char *add, int to_end);</div><div class='del'>-void lt_opt_process_env_set (const char *arg);</div><div class='del'>-void lt_opt_process_env_prepend (const char *arg);</div><div class='del'>-void lt_opt_process_env_append (const char *arg);</div><div class='del'>-int lt_split_name_value (const char *arg, char** name, char** value);</div><div class='del'>-void lt_update_exe_path (const char *name, const char *value);</div><div class='del'>-void lt_update_lib_path (const char *name, const char *value);</div><div class='del'>-</div><div class='del'>-static const char *script_text_part1 =</div><div class='del'>-EOF</div><div class='del'>-</div><div class='del'>-	    func_emit_wrapper_part1 yes |</div><div class='del'>-	        $SED -e 's/\([\\"]\)/\\\1/g' \</div><div class='del'>-	             -e 's/^/  "/' -e 's/$/\\n"/'</div><div class='del'>-	    echo ";"</div><div class='del'>-	    cat &lt;&lt;EOF</div><div class='del'>-</div><div class='del'>-static const char *script_text_part2 =</div><div class='del'>-EOF</div><div class='del'>-	    func_emit_wrapper_part2 yes |</div><div class='del'>-	        $SED -e 's/\([\\"]\)/\\\1/g' \</div><div class='del'>-	             -e 's/^/  "/' -e 's/$/\\n"/'</div><div class='del'>-	    echo ";"</div><div class='del'>-</div><div class='del'>-	    cat &lt;&lt;EOF</div><div class='del'>-const char * MAGIC_EXE = "$magic_exe";</div><div class='del'>-const char * LIB_PATH_VARNAME = "$shlibpath_var";</div><div class='del'>-EOF</div><div class='del'>-</div><div class='del'>-	    if test "$shlibpath_overrides_runpath" = yes &amp;&amp; test -n "$shlibpath_var" &amp;&amp; test -n "$temp_rpath"; then</div><div class='del'>-              func_to_host_pathlist "$temp_rpath"</div><div class='del'>-	      cat &lt;&lt;EOF</div><div class='del'>-const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";</div><div class='del'>-EOF</div><div class='del'>-	    else</div><div class='del'>-	      cat &lt;&lt;"EOF"</div><div class='del'>-const char * LIB_PATH_VALUE   = "";</div><div class='del'>-EOF</div><div class='del'>-	    fi</div><div class='del'>-</div><div class='del'>-	    if test -n "$dllsearchpath"; then</div><div class='del'>-              func_to_host_pathlist "$dllsearchpath:"</div><div class='del'>-	      cat &lt;&lt;EOF</div><div class='del'>-const char * EXE_PATH_VARNAME = "PATH";</div><div class='del'>-const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";</div><div class='del'>-EOF</div><div class='del'>-	    else</div><div class='del'>-	      cat &lt;&lt;"EOF"</div><div class='del'>-const char * EXE_PATH_VARNAME = "";</div><div class='del'>-const char * EXE_PATH_VALUE   = "";</div><div class='del'>-EOF</div><div class='del'>-	    fi</div><div class='del'>-</div><div class='del'>-	    if test "$fast_install" = yes; then</div><div class='del'>-	      cat &lt;&lt;EOF</div><div class='del'>-const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */</div><div class='del'>-EOF</div><div class='del'>-	    else</div><div class='del'>-	      cat &lt;&lt;EOF</div><div class='del'>-const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */</div><div class='del'>-EOF</div><div class='del'>-	    fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	    cat &lt;&lt;"EOF"</div><div class='del'>-</div><div class='del'>-#define LTWRAPPER_OPTION_PREFIX         "--lt-"</div><div class='del'>-#define LTWRAPPER_OPTION_PREFIX_LENGTH  5</div><div class='del'>-</div><div class='del'>-static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;</div><div class='del'>-static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;</div><div class='del'>-</div><div class='del'>-static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";</div><div class='del'>-</div><div class='del'>-static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;</div><div class='del'>-static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";</div><div class='del'>-  /* argument is putenv-style "foo=bar", value of foo is set to bar */</div><div class='del'>-</div><div class='del'>-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;</div><div class='del'>-static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";</div><div class='del'>-  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */</div><div class='del'>-</div><div class='del'>-static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;</div><div class='del'>-static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";</div><div class='del'>-  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char *argv[])</div><div class='del'>-{</div><div class='del'>-  char **newargz;</div><div class='del'>-  int  newargc;</div><div class='del'>-  char *tmp_pathspec;</div><div class='del'>-  char *actual_cwrapper_path;</div><div class='del'>-  char *actual_cwrapper_name;</div><div class='del'>-  char *target_name;</div><div class='del'>-  char *lt_argv_zero;</div><div class='del'>-  intptr_t rval = 127;</div><div class='del'>-</div><div class='del'>-  int i;</div><div class='del'>-</div><div class='del'>-  program_name = (char *) xstrdup (base_name (argv[0]));</div><div class='del'>-  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));</div><div class='del'>-  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));</div><div class='del'>-</div><div class='del'>-  /* very simple arg parsing; don't want to rely on getopt */</div><div class='del'>-  for (i = 1; i &lt; argc; i++)</div><div class='del'>-    {</div><div class='del'>-      if (strcmp (argv[i], dumpscript_opt) == 0)</div><div class='del'>-	{</div><div class='del'>-EOF</div><div class='del'>-	    case "$host" in</div><div class='del'>-	      *mingw* | *cygwin* )</div><div class='del'>-		# make stdout use "unix" line endings</div><div class='del'>-		echo "          setmode(1,_O_BINARY);"</div><div class='del'>-		;;</div><div class='del'>-	      esac</div><div class='del'>-</div><div class='del'>-	    cat &lt;&lt;"EOF"</div><div class='del'>-	  printf ("%s", script_text_part1);</div><div class='del'>-	  printf ("%s", script_text_part2);</div><div class='del'>-	  return 0;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  newargz = XMALLOC (char *, argc + 1);</div><div class='del'>-  tmp_pathspec = find_executable (argv[0]);</div><div class='del'>-  if (tmp_pathspec == NULL)</div><div class='del'>-    lt_fatal ("Couldn't find %s", argv[0]);</div><div class='del'>-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",</div><div class='del'>-			  tmp_pathspec));</div><div class='del'>-</div><div class='del'>-  actual_cwrapper_path = chase_symlinks (tmp_pathspec);</div><div class='del'>-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",</div><div class='del'>-			  actual_cwrapper_path));</div><div class='del'>-  XFREE (tmp_pathspec);</div><div class='del'>-</div><div class='del'>-  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));</div><div class='del'>-  strendzap (actual_cwrapper_path, actual_cwrapper_name);</div><div class='del'>-</div><div class='del'>-  /* wrapper name transforms */</div><div class='del'>-  strendzap (actual_cwrapper_name, ".exe");</div><div class='del'>-  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);</div><div class='del'>-  XFREE (actual_cwrapper_name);</div><div class='del'>-  actual_cwrapper_name = tmp_pathspec;</div><div class='del'>-  tmp_pathspec = 0;</div><div class='del'>-</div><div class='del'>-  /* target_name transforms -- use actual target program name; might have lt- prefix */</div><div class='del'>-  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));</div><div class='del'>-  strendzap (target_name, ".exe");</div><div class='del'>-  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);</div><div class='del'>-  XFREE (target_name);</div><div class='del'>-  target_name = tmp_pathspec;</div><div class='del'>-  tmp_pathspec = 0;</div><div class='del'>-</div><div class='del'>-  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",</div><div class='del'>-			  target_name));</div><div class='del'>-EOF</div><div class='del'>-</div><div class='del'>-	    cat &lt;&lt;EOF</div><div class='del'>-  newargz[0] =</div><div class='del'>-    XMALLOC (char, (strlen (actual_cwrapper_path) +</div><div class='del'>-		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));</div><div class='del'>-  strcpy (newargz[0], actual_cwrapper_path);</div><div class='del'>-  strcat (newargz[0], "$objdir");</div><div class='del'>-  strcat (newargz[0], "/");</div><div class='del'>-EOF</div><div class='del'>-</div><div class='del'>-	    cat &lt;&lt;"EOF"</div><div class='del'>-  /* stop here, and copy so we don't have to do this twice */</div><div class='del'>-  tmp_pathspec = xstrdup (newargz[0]);</div><div class='del'>-</div><div class='del'>-  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */</div><div class='del'>-  strcat (newargz[0], actual_cwrapper_name);</div><div class='del'>-</div><div class='del'>-  /* DO want the lt- prefix here if it exists, so use target_name */</div><div class='del'>-  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);</div><div class='del'>-  XFREE (tmp_pathspec);</div><div class='del'>-  tmp_pathspec = NULL;</div><div class='del'>-EOF</div><div class='del'>-</div><div class='del'>-	    case $host_os in</div><div class='del'>-	      mingw*)</div><div class='del'>-	    cat &lt;&lt;"EOF"</div><div class='del'>-  {</div><div class='del'>-    char* p;</div><div class='del'>-    while ((p = strchr (newargz[0], '\\')) != NULL)</div><div class='del'>-      {</div><div class='del'>-	*p = '/';</div><div class='del'>-      }</div><div class='del'>-    while ((p = strchr (lt_argv_zero, '\\')) != NULL)</div><div class='del'>-      {</div><div class='del'>-	*p = '/';</div><div class='del'>-      }</div><div class='del'>-  }</div><div class='del'>-EOF</div><div class='del'>-	    ;;</div><div class='del'>-	    esac</div><div class='del'>-</div><div class='del'>-	    cat &lt;&lt;"EOF"</div><div class='del'>-  XFREE (target_name);</div><div class='del'>-  XFREE (actual_cwrapper_path);</div><div class='del'>-  XFREE (actual_cwrapper_name);</div><div class='del'>-</div><div class='del'>-  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */</div><div class='del'>-  lt_setenv ("DUALCASE", "1");  /* for MSK sh */</div><div class='del'>-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);</div><div class='del'>-  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);</div><div class='del'>-</div><div class='del'>-  newargc=0;</div><div class='del'>-  for (i = 1; i &lt; argc; i++)</div><div class='del'>-    {</div><div class='del'>-      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)</div><div class='del'>-        {</div><div class='del'>-          if (argv[i][env_set_opt_len] == '=')</div><div class='del'>-            {</div><div class='del'>-              const char *p = argv[i] + env_set_opt_len + 1;</div><div class='del'>-              lt_opt_process_env_set (p);</div><div class='del'>-            }</div><div class='del'>-          else if (argv[i][env_set_opt_len] == '\0' &amp;&amp; i + 1 &lt; argc)</div><div class='del'>-            {</div><div class='del'>-              lt_opt_process_env_set (argv[++i]); /* don't copy */</div><div class='del'>-            }</div><div class='del'>-          else</div><div class='del'>-            lt_fatal ("%s missing required argument", env_set_opt);</div><div class='del'>-          continue;</div><div class='del'>-        }</div><div class='del'>-      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)</div><div class='del'>-        {</div><div class='del'>-          if (argv[i][env_prepend_opt_len] == '=')</div><div class='del'>-            {</div><div class='del'>-              const char *p = argv[i] + env_prepend_opt_len + 1;</div><div class='del'>-              lt_opt_process_env_prepend (p);</div><div class='del'>-            }</div><div class='del'>-          else if (argv[i][env_prepend_opt_len] == '\0' &amp;&amp; i + 1 &lt; argc)</div><div class='del'>-            {</div><div class='del'>-              lt_opt_process_env_prepend (argv[++i]); /* don't copy */</div><div class='del'>-            }</div><div class='del'>-          else</div><div class='del'>-            lt_fatal ("%s missing required argument", env_prepend_opt);</div><div class='del'>-          continue;</div><div class='del'>-        }</div><div class='del'>-      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)</div><div class='del'>-        {</div><div class='del'>-          if (argv[i][env_append_opt_len] == '=')</div><div class='del'>-            {</div><div class='del'>-              const char *p = argv[i] + env_append_opt_len + 1;</div><div class='del'>-              lt_opt_process_env_append (p);</div><div class='del'>-            }</div><div class='del'>-          else if (argv[i][env_append_opt_len] == '\0' &amp;&amp; i + 1 &lt; argc)</div><div class='del'>-            {</div><div class='del'>-              lt_opt_process_env_append (argv[++i]); /* don't copy */</div><div class='del'>-            }</div><div class='del'>-          else</div><div class='del'>-            lt_fatal ("%s missing required argument", env_append_opt);</div><div class='del'>-          continue;</div><div class='del'>-        }</div><div class='del'>-      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)</div><div class='del'>-        {</div><div class='del'>-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX</div><div class='del'>-             namespace, but it is not one of the ones we know about and</div><div class='del'>-             have already dealt with, above (inluding dump-script), then</div><div class='del'>-             report an error. Otherwise, targets might begin to believe</div><div class='del'>-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX</div><div class='del'>-             namespace. The first time any user complains about this, we'll</div><div class='del'>-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option</div><div class='del'>-             or a configure.ac-settable value.</div><div class='del'>-           */</div><div class='del'>-          lt_fatal ("Unrecognized option in %s namespace: '%s'",</div><div class='del'>-                    ltwrapper_option_prefix, argv[i]);</div><div class='del'>-        }</div><div class='del'>-      /* otherwise ... */</div><div class='del'>-      newargz[++newargc] = xstrdup (argv[i]);</div><div class='del'>-    }</div><div class='del'>-  newargz[++newargc] = NULL;</div><div class='del'>-</div><div class='del'>-  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "&lt;NULL&gt;")));</div><div class='del'>-  for (i = 0; i &lt; newargc; i++)</div><div class='del'>-    {</div><div class='del'>-      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "&lt;NULL&gt;")));</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-EOF</div><div class='del'>-</div><div class='del'>-	    case $host_os in</div><div class='del'>-	      mingw*)</div><div class='del'>-		cat &lt;&lt;"EOF"</div><div class='del'>-  /* execv doesn't actually work on mingw as expected on unix */</div><div class='del'>-  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);</div><div class='del'>-  if (rval == -1)</div><div class='del'>-    {</div><div class='del'>-      /* failed to start process */</div><div class='del'>-      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));</div><div class='del'>-      return 127;</div><div class='del'>-    }</div><div class='del'>-  return rval;</div><div class='del'>-EOF</div><div class='del'>-		;;</div><div class='del'>-	      *)</div><div class='del'>-		cat &lt;&lt;"EOF"</div><div class='del'>-  execv (lt_argv_zero, newargz);</div><div class='del'>-  return rval; /* =127, but avoids unused variable warning */</div><div class='del'>-EOF</div><div class='del'>-		;;</div><div class='del'>-	    esac</div><div class='del'>-</div><div class='del'>-	    cat &lt;&lt;"EOF"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void *</div><div class='del'>-xmalloc (size_t num)</div><div class='del'>-{</div><div class='del'>-  void *p = (void *) malloc (num);</div><div class='del'>-  if (!p)</div><div class='del'>-    lt_fatal ("Memory exhausted");</div><div class='del'>-</div><div class='del'>-  return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-xstrdup (const char *string)</div><div class='del'>-{</div><div class='del'>-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),</div><div class='del'>-			  string) : NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-base_name (const char *name)</div><div class='del'>-{</div><div class='del'>-  const char *base;</div><div class='del'>-</div><div class='del'>-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)</div><div class='del'>-  /* Skip over the disk name in MSDOS pathnames. */</div><div class='del'>-  if (isalpha ((unsigned char) name[0]) &amp;&amp; name[1] == ':')</div><div class='del'>-    name += 2;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-  for (base = name; *name; name++)</div><div class='del'>-    if (IS_DIR_SEPARATOR (*name))</div><div class='del'>-      base = name + 1;</div><div class='del'>-  return base;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-check_executable (const char *path)</div><div class='del'>-{</div><div class='del'>-  struct stat st;</div><div class='del'>-</div><div class='del'>-  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",</div><div class='del'>-			  path ? (*path ? path : "EMPTY!") : "NULL!"));</div><div class='del'>-  if ((!path) || (!*path))</div><div class='del'>-    return 0;</div><div class='del'>-</div><div class='del'>-  if ((stat (path, &amp;st) &gt;= 0)</div><div class='del'>-      &amp;&amp; (st.st_mode &amp; (S_IXUSR | S_IXGRP | S_IXOTH)))</div><div class='del'>-    return 1;</div><div class='del'>-  else</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-make_executable (const char *path)</div><div class='del'>-{</div><div class='del'>-  int rval = 0;</div><div class='del'>-  struct stat st;</div><div class='del'>-</div><div class='del'>-  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",</div><div class='del'>-			  path ? (*path ? path : "EMPTY!") : "NULL!"));</div><div class='del'>-  if ((!path) || (!*path))</div><div class='del'>-    return 0;</div><div class='del'>-</div><div class='del'>-  if (stat (path, &amp;st) &gt;= 0)</div><div class='del'>-    {</div><div class='del'>-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);</div><div class='del'>-    }</div><div class='del'>-  return rval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Searches for the full path of the wrapper.  Returns</div><div class='del'>-   newly allocated full path name if found, NULL otherwise</div><div class='del'>-   Does not chase symlinks, even on platforms that support them.</div><div class='del'>-*/</div><div class='del'>-char *</div><div class='del'>-find_executable (const char *wrapper)</div><div class='del'>-{</div><div class='del'>-  int has_slash = 0;</div><div class='del'>-  const char *p;</div><div class='del'>-  const char *p_next;</div><div class='del'>-  /* static buffer for getcwd */</div><div class='del'>-  char tmp[LT_PATHMAX + 1];</div><div class='del'>-  int tmp_len;</div><div class='del'>-  char *concat_name;</div><div class='del'>-</div><div class='del'>-  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",</div><div class='del'>-			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));</div><div class='del'>-</div><div class='del'>-  if ((wrapper == NULL) || (*wrapper == '\0'))</div><div class='del'>-    return NULL;</div><div class='del'>-</div><div class='del'>-  /* Absolute path? */</div><div class='del'>-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)</div><div class='del'>-  if (isalpha ((unsigned char) wrapper[0]) &amp;&amp; wrapper[1] == ':')</div><div class='del'>-    {</div><div class='del'>-      concat_name = xstrdup (wrapper);</div><div class='del'>-      if (check_executable (concat_name))</div><div class='del'>-	return concat_name;</div><div class='del'>-      XFREE (concat_name);</div><div class='del'>-    }</div><div class='del'>-  else</div><div class='del'>-    {</div><div class='del'>-#endif</div><div class='del'>-      if (IS_DIR_SEPARATOR (wrapper[0]))</div><div class='del'>-	{</div><div class='del'>-	  concat_name = xstrdup (wrapper);</div><div class='del'>-	  if (check_executable (concat_name))</div><div class='del'>-	    return concat_name;</div><div class='del'>-	  XFREE (concat_name);</div><div class='del'>-	}</div><div class='del'>-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)</div><div class='del'>-    }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-  for (p = wrapper; *p; p++)</div><div class='del'>-    if (*p == '/')</div><div class='del'>-      {</div><div class='del'>-	has_slash = 1;</div><div class='del'>-	break;</div><div class='del'>-      }</div><div class='del'>-  if (!has_slash)</div><div class='del'>-    {</div><div class='del'>-      /* no slashes; search PATH */</div><div class='del'>-      const char *path = getenv ("PATH");</div><div class='del'>-      if (path != NULL)</div><div class='del'>-	{</div><div class='del'>-	  for (p = path; *p; p = p_next)</div><div class='del'>-	    {</div><div class='del'>-	      const char *q;</div><div class='del'>-	      size_t p_len;</div><div class='del'>-	      for (q = p; *q; q++)</div><div class='del'>-		if (IS_PATH_SEPARATOR (*q))</div><div class='del'>-		  break;</div><div class='del'>-	      p_len = q - p;</div><div class='del'>-	      p_next = (*q == '\0' ? q : q + 1);</div><div class='del'>-	      if (p_len == 0)</div><div class='del'>-		{</div><div class='del'>-		  /* empty path: current directory */</div><div class='del'>-		  if (getcwd (tmp, LT_PATHMAX) == NULL)</div><div class='del'>-		    lt_fatal ("getcwd failed");</div><div class='del'>-		  tmp_len = strlen (tmp);</div><div class='del'>-		  concat_name =</div><div class='del'>-		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);</div><div class='del'>-		  memcpy (concat_name, tmp, tmp_len);</div><div class='del'>-		  concat_name[tmp_len] = '/';</div><div class='del'>-		  strcpy (concat_name + tmp_len + 1, wrapper);</div><div class='del'>-		}</div><div class='del'>-	      else</div><div class='del'>-		{</div><div class='del'>-		  concat_name =</div><div class='del'>-		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);</div><div class='del'>-		  memcpy (concat_name, p, p_len);</div><div class='del'>-		  concat_name[p_len] = '/';</div><div class='del'>-		  strcpy (concat_name + p_len + 1, wrapper);</div><div class='del'>-		}</div><div class='del'>-	      if (check_executable (concat_name))</div><div class='del'>-		return concat_name;</div><div class='del'>-	      XFREE (concat_name);</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-      /* not found in PATH; assume curdir */</div><div class='del'>-    }</div><div class='del'>-  /* Relative path | not found in path: prepend cwd */</div><div class='del'>-  if (getcwd (tmp, LT_PATHMAX) == NULL)</div><div class='del'>-    lt_fatal ("getcwd failed");</div><div class='del'>-  tmp_len = strlen (tmp);</div><div class='del'>-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);</div><div class='del'>-  memcpy (concat_name, tmp, tmp_len);</div><div class='del'>-  concat_name[tmp_len] = '/';</div><div class='del'>-  strcpy (concat_name + tmp_len + 1, wrapper);</div><div class='del'>-</div><div class='del'>-  if (check_executable (concat_name))</div><div class='del'>-    return concat_name;</div><div class='del'>-  XFREE (concat_name);</div><div class='del'>-  return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-chase_symlinks (const char *pathspec)</div><div class='del'>-{</div><div class='del'>-#ifndef S_ISLNK</div><div class='del'>-  return xstrdup (pathspec);</div><div class='del'>-#else</div><div class='del'>-  char buf[LT_PATHMAX];</div><div class='del'>-  struct stat s;</div><div class='del'>-  char *tmp_pathspec = xstrdup (pathspec);</div><div class='del'>-  char *p;</div><div class='del'>-  int has_symlinks = 0;</div><div class='del'>-  while (strlen (tmp_pathspec) &amp;&amp; !has_symlinks)</div><div class='del'>-    {</div><div class='del'>-      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",</div><div class='del'>-			      tmp_pathspec));</div><div class='del'>-      if (lstat (tmp_pathspec, &amp;s) == 0)</div><div class='del'>-	{</div><div class='del'>-	  if (S_ISLNK (s.st_mode) != 0)</div><div class='del'>-	    {</div><div class='del'>-	      has_symlinks = 1;</div><div class='del'>-	      break;</div><div class='del'>-	    }</div><div class='del'>-</div><div class='del'>-	  /* search backwards for last DIR_SEPARATOR */</div><div class='del'>-	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;</div><div class='del'>-	  while ((p &gt; tmp_pathspec) &amp;&amp; (!IS_DIR_SEPARATOR (*p)))</div><div class='del'>-	    p--;</div><div class='del'>-	  if ((p == tmp_pathspec) &amp;&amp; (!IS_DIR_SEPARATOR (*p)))</div><div class='del'>-	    {</div><div class='del'>-	      /* no more DIR_SEPARATORS left */</div><div class='del'>-	      break;</div><div class='del'>-	    }</div><div class='del'>-	  *p = '\0';</div><div class='del'>-	}</div><div class='del'>-      else</div><div class='del'>-	{</div><div class='del'>-	  char *errstr = strerror (errno);</div><div class='del'>-	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-  XFREE (tmp_pathspec);</div><div class='del'>-</div><div class='del'>-  if (!has_symlinks)</div><div class='del'>-    {</div><div class='del'>-      return xstrdup (pathspec);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  tmp_pathspec = realpath (pathspec, buf);</div><div class='del'>-  if (tmp_pathspec == 0)</div><div class='del'>-    {</div><div class='del'>-      lt_fatal ("Could not follow symlinks for %s", pathspec);</div><div class='del'>-    }</div><div class='del'>-  return xstrdup (tmp_pathspec);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-strendzap (char *str, const char *pat)</div><div class='del'>-{</div><div class='del'>-  size_t len, patlen;</div><div class='del'>-</div><div class='del'>-  assert (str != NULL);</div><div class='del'>-  assert (pat != NULL);</div><div class='del'>-</div><div class='del'>-  len = strlen (str);</div><div class='del'>-  patlen = strlen (pat);</div><div class='del'>-</div><div class='del'>-  if (patlen &lt;= len)</div><div class='del'>-    {</div><div class='del'>-      str += len - patlen;</div><div class='del'>-      if (strcmp (str, pat) == 0)</div><div class='del'>-	*str = '\0';</div><div class='del'>-    }</div><div class='del'>-  return str;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-lt_error_core (int exit_status, const char *mode,</div><div class='del'>-	       const char *message, va_list ap)</div><div class='del'>-{</div><div class='del'>-  fprintf (stderr, "%s: %s: ", program_name, mode);</div><div class='del'>-  vfprintf (stderr, message, ap);</div><div class='del'>-  fprintf (stderr, ".\n");</div><div class='del'>-</div><div class='del'>-  if (exit_status &gt;= 0)</div><div class='del'>-    exit (exit_status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-lt_fatal (const char *message, ...)</div><div class='del'>-{</div><div class='del'>-  va_list ap;</div><div class='del'>-  va_start (ap, message);</div><div class='del'>-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);</div><div class='del'>-  va_end (ap);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-lt_setenv (const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",</div><div class='del'>-                          (name ? name : "&lt;NULL&gt;"),</div><div class='del'>-                          (value ? value : "&lt;NULL&gt;")));</div><div class='del'>-  {</div><div class='del'>-#ifdef HAVE_SETENV</div><div class='del'>-    /* always make a copy, for consistency with !HAVE_SETENV */</div><div class='del'>-    char *str = xstrdup (value);</div><div class='del'>-    setenv (name, str, 1);</div><div class='del'>-#else</div><div class='del'>-    int len = strlen (name) + 1 + strlen (value) + 1;</div><div class='del'>-    char *str = XMALLOC (char, len);</div><div class='del'>-    sprintf (str, "%s=%s", name, value);</div><div class='del'>-    if (putenv (str) != EXIT_SUCCESS)</div><div class='del'>-      {</div><div class='del'>-        XFREE (str);</div><div class='del'>-      }</div><div class='del'>-#endif</div><div class='del'>-  }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-lt_extend_str (const char *orig_value, const char *add, int to_end)</div><div class='del'>-{</div><div class='del'>-  char *new_value;</div><div class='del'>-  if (orig_value &amp;&amp; *orig_value)</div><div class='del'>-    {</div><div class='del'>-      int orig_value_len = strlen (orig_value);</div><div class='del'>-      int add_len = strlen (add);</div><div class='del'>-      new_value = XMALLOC (char, add_len + orig_value_len + 1);</div><div class='del'>-      if (to_end)</div><div class='del'>-        {</div><div class='del'>-          strcpy (new_value, orig_value);</div><div class='del'>-          strcpy (new_value + orig_value_len, add);</div><div class='del'>-        }</div><div class='del'>-      else</div><div class='del'>-        {</div><div class='del'>-          strcpy (new_value, add);</div><div class='del'>-          strcpy (new_value + add_len, orig_value);</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-  else</div><div class='del'>-    {</div><div class='del'>-      new_value = xstrdup (add);</div><div class='del'>-    }</div><div class='del'>-  return new_value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-lt_split_name_value (const char *arg, char** name, char** value)</div><div class='del'>-{</div><div class='del'>-  const char *p;</div><div class='del'>-  int len;</div><div class='del'>-  if (!arg || !*arg)</div><div class='del'>-    return 1;</div><div class='del'>-</div><div class='del'>-  p = strchr (arg, (int)'=');</div><div class='del'>-</div><div class='del'>-  if (!p)</div><div class='del'>-    return 1;</div><div class='del'>-</div><div class='del'>-  *value = xstrdup (++p);</div><div class='del'>-</div><div class='del'>-  len = strlen (arg) - strlen (*value);</div><div class='del'>-  *name = XMALLOC (char, len);</div><div class='del'>-  strncpy (*name, arg, len-1);</div><div class='del'>-  (*name)[len - 1] = '\0';</div><div class='del'>-</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-lt_opt_process_env_set (const char *arg)</div><div class='del'>-{</div><div class='del'>-  char *name = NULL;</div><div class='del'>-  char *value = NULL;</div><div class='del'>-</div><div class='del'>-  if (lt_split_name_value (arg, &amp;name, &amp;value) != 0)</div><div class='del'>-    {</div><div class='del'>-      XFREE (name);</div><div class='del'>-      XFREE (value);</div><div class='del'>-      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  lt_setenv (name, value);</div><div class='del'>-  XFREE (name);</div><div class='del'>-  XFREE (value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-lt_opt_process_env_prepend (const char *arg)</div><div class='del'>-{</div><div class='del'>-  char *name = NULL;</div><div class='del'>-  char *value = NULL;</div><div class='del'>-  char *new_value = NULL;</div><div class='del'>-</div><div class='del'>-  if (lt_split_name_value (arg, &amp;name, &amp;value) != 0)</div><div class='del'>-    {</div><div class='del'>-      XFREE (name);</div><div class='del'>-      XFREE (value);</div><div class='del'>-      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  new_value = lt_extend_str (getenv (name), value, 0);</div><div class='del'>-  lt_setenv (name, new_value);</div><div class='del'>-  XFREE (new_value);</div><div class='del'>-  XFREE (name);</div><div class='del'>-  XFREE (value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-lt_opt_process_env_append (const char *arg)</div><div class='del'>-{</div><div class='del'>-  char *name = NULL;</div><div class='del'>-  char *value = NULL;</div><div class='del'>-  char *new_value = NULL;</div><div class='del'>-</div><div class='del'>-  if (lt_split_name_value (arg, &amp;name, &amp;value) != 0)</div><div class='del'>-    {</div><div class='del'>-      XFREE (name);</div><div class='del'>-      XFREE (value);</div><div class='del'>-      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  new_value = lt_extend_str (getenv (name), value, 1);</div><div class='del'>-  lt_setenv (name, new_value);</div><div class='del'>-  XFREE (new_value);</div><div class='del'>-  XFREE (name);</div><div class='del'>-  XFREE (value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-lt_update_exe_path (const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",</div><div class='del'>-                          (name ? name : "&lt;NULL&gt;"),</div><div class='del'>-                          (value ? value : "&lt;NULL&gt;")));</div><div class='del'>-</div><div class='del'>-  if (name &amp;&amp; *name &amp;&amp; value &amp;&amp; *value)</div><div class='del'>-    {</div><div class='del'>-      char *new_value = lt_extend_str (getenv (name), value, 0);</div><div class='del'>-      /* some systems can't cope with a ':'-terminated path #' */</div><div class='del'>-      int len = strlen (new_value);</div><div class='del'>-      while (((len = strlen (new_value)) &gt; 0) &amp;&amp; IS_PATH_SEPARATOR (new_value[len-1]))</div><div class='del'>-        {</div><div class='del'>-          new_value[len-1] = '\0';</div><div class='del'>-        }</div><div class='del'>-      lt_setenv (name, new_value);</div><div class='del'>-      XFREE (new_value);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-lt_update_lib_path (const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",</div><div class='del'>-                          (name ? name : "&lt;NULL&gt;"),</div><div class='del'>-                          (value ? value : "&lt;NULL&gt;")));</div><div class='del'>-</div><div class='del'>-  if (name &amp;&amp; *name &amp;&amp; value &amp;&amp; *value)</div><div class='del'>-    {</div><div class='del'>-      char *new_value = lt_extend_str (getenv (name), value, 0);</div><div class='del'>-      lt_setenv (name, new_value);</div><div class='del'>-      XFREE (new_value);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EOF</div><div class='del'>-}</div><div class='del'>-# end: func_emit_cwrapperexe_src</div><div class='del'>-</div><div class='del'>-# func_mode_link arg...</div><div class='del'>-func_mode_link ()</div><div class='del'>-{</div><div class='del'>-    $opt_debug</div><div class='del'>-    case $host in</div><div class='del'>-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)</div><div class='del'>-      # It is impossible to link a dll without this setting, and</div><div class='del'>-      # we shouldn't force the makefile maintainer to figure out</div><div class='del'>-      # which system we are compiling for in order to pass an extra</div><div class='del'>-      # flag for every libtool invocation.</div><div class='del'>-      # allow_undefined=no</div><div class='del'>-</div><div class='del'>-      # FIXME: Unfortunately, there are problems with the above when trying</div><div class='del'>-      # to make a dll which has undefined symbols, in which case not</div><div class='del'>-      # even a static library is built.  For now, we need to specify</div><div class='del'>-      # -no-undefined on the libtool link line when we can be certain</div><div class='del'>-      # that all symbols are satisfied, otherwise we get a static library.</div><div class='del'>-      allow_undefined=yes</div><div class='del'>-      ;;</div><div class='del'>-    *)</div><div class='del'>-      allow_undefined=yes</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-    libtool_args=$nonopt</div><div class='del'>-    base_compile="$nonopt $@"</div><div class='del'>-    compile_command=$nonopt</div><div class='del'>-    finalize_command=$nonopt</div><div class='del'>-</div><div class='del'>-    compile_rpath=</div><div class='del'>-    finalize_rpath=</div><div class='del'>-    compile_shlibpath=</div><div class='del'>-    finalize_shlibpath=</div><div class='del'>-    convenience=</div><div class='del'>-    old_convenience=</div><div class='del'>-    deplibs=</div><div class='del'>-    old_deplibs=</div><div class='del'>-    compiler_flags=</div><div class='del'>-    linker_flags=</div><div class='del'>-    dllsearchpath=</div><div class='del'>-    lib_search_path=`pwd`</div><div class='del'>-    inst_prefix_dir=</div><div class='del'>-    new_inherited_linker_flags=</div><div class='del'>-</div><div class='del'>-    avoid_version=no</div><div class='del'>-    dlfiles=</div><div class='del'>-    dlprefiles=</div><div class='del'>-    dlself=no</div><div class='del'>-    export_dynamic=no</div><div class='del'>-    export_symbols=</div><div class='del'>-    export_symbols_regex=</div><div class='del'>-    generated=</div><div class='del'>-    libobjs=</div><div class='del'>-    ltlibs=</div><div class='del'>-    module=no</div><div class='del'>-    no_install=no</div><div class='del'>-    objs=</div><div class='del'>-    non_pic_objects=</div><div class='del'>-    precious_files_regex=</div><div class='del'>-    prefer_static_libs=no</div><div class='del'>-    preload=no</div><div class='del'>-    prev=</div><div class='del'>-    prevarg=</div><div class='del'>-    release=</div><div class='del'>-    rpath=</div><div class='del'>-    xrpath=</div><div class='del'>-    perm_rpath=</div><div class='del'>-    temp_rpath=</div><div class='del'>-    thread_safe=no</div><div class='del'>-    vinfo=</div><div class='del'>-    vinfo_number=no</div><div class='del'>-    weak_libs=</div><div class='del'>-    single_module="${wl}-single_module"</div><div class='del'>-    func_infer_tag $base_compile</div><div class='del'>-</div><div class='del'>-    # We need to know -static, to get the right output filenames.</div><div class='del'>-    for arg</div><div class='del'>-    do</div><div class='del'>-      case $arg in</div><div class='del'>-      -shared)</div><div class='del'>-	test "$build_libtool_libs" != yes &amp;&amp; \</div><div class='del'>-	  func_fatal_configuration "can not build a shared library"</div><div class='del'>-	build_old_libs=no</div><div class='del'>-	break</div><div class='del'>-	;;</div><div class='del'>-      -all-static | -static | -static-libtool-libs)</div><div class='del'>-	case $arg in</div><div class='del'>-	-all-static)</div><div class='del'>-	  if test "$build_libtool_libs" = yes &amp;&amp; test -z "$link_static_flag"; then</div><div class='del'>-	    func_warning "complete static linking is impossible in this configuration"</div><div class='del'>-	  fi</div><div class='del'>-	  if test -n "$link_static_flag"; then</div><div class='del'>-	    dlopen_self=$dlopen_self_static</div><div class='del'>-	  fi</div><div class='del'>-	  prefer_static_libs=yes</div><div class='del'>-	  ;;</div><div class='del'>-	-static)</div><div class='del'>-	  if test -z "$pic_flag" &amp;&amp; test -n "$link_static_flag"; then</div><div class='del'>-	    dlopen_self=$dlopen_self_static</div><div class='del'>-	  fi</div><div class='del'>-	  prefer_static_libs=built</div><div class='del'>-	  ;;</div><div class='del'>-	-static-libtool-libs)</div><div class='del'>-	  if test -z "$pic_flag" &amp;&amp; test -n "$link_static_flag"; then</div><div class='del'>-	    dlopen_self=$dlopen_self_static</div><div class='del'>-	  fi</div><div class='del'>-	  prefer_static_libs=yes</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	build_libtool_libs=no</div><div class='del'>-	build_old_libs=yes</div><div class='del'>-	break</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-    done</div><div class='del'>-</div><div class='del'>-    # See if our shared archives depend on static archives.</div><div class='del'>-    test -n "$old_archive_from_new_cmds" &amp;&amp; build_old_libs=yes</div><div class='del'>-</div><div class='del'>-    # Go through the arguments, transforming them on the way.</div><div class='del'>-    while test "$#" -gt 0; do</div><div class='del'>-      arg="$1"</div><div class='del'>-      shift</div><div class='del'>-      func_quote_for_eval "$arg"</div><div class='del'>-      qarg=$func_quote_for_eval_unquoted_result</div><div class='del'>-      func_append libtool_args " $func_quote_for_eval_result"</div><div class='del'>-</div><div class='del'>-      # If the previous option needs an argument, assign it.</div><div class='del'>-      if test -n "$prev"; then</div><div class='del'>-	case $prev in</div><div class='del'>-	output)</div><div class='del'>-	  func_append compile_command " @OUTPUT@"</div><div class='del'>-	  func_append finalize_command " @OUTPUT@"</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-</div><div class='del'>-	case $prev in</div><div class='del'>-	dlfiles|dlprefiles)</div><div class='del'>-	  if test "$preload" = no; then</div><div class='del'>-	    # Add the symbol object into the linking commands.</div><div class='del'>-	    func_append compile_command " @SYMFILE@"</div><div class='del'>-	    func_append finalize_command " @SYMFILE@"</div><div class='del'>-	    preload=yes</div><div class='del'>-	  fi</div><div class='del'>-	  case $arg in</div><div class='del'>-	  *.la | *.lo) ;;  # We handle these cases below.</div><div class='del'>-	  force)</div><div class='del'>-	    if test "$dlself" = no; then</div><div class='del'>-	      dlself=needless</div><div class='del'>-	      export_dynamic=yes</div><div class='del'>-	    fi</div><div class='del'>-	    prev=</div><div class='del'>-	    continue</div><div class='del'>-	    ;;</div><div class='del'>-	  self)</div><div class='del'>-	    if test "$prev" = dlprefiles; then</div><div class='del'>-	      dlself=yes</div><div class='del'>-	    elif test "$prev" = dlfiles &amp;&amp; test "$dlopen_self" != yes; then</div><div class='del'>-	      dlself=yes</div><div class='del'>-	    else</div><div class='del'>-	      dlself=needless</div><div class='del'>-	      export_dynamic=yes</div><div class='del'>-	    fi</div><div class='del'>-	    prev=</div><div class='del'>-	    continue</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    if test "$prev" = dlfiles; then</div><div class='del'>-	      dlfiles="$dlfiles $arg"</div><div class='del'>-	    else</div><div class='del'>-	      dlprefiles="$dlprefiles $arg"</div><div class='del'>-	    fi</div><div class='del'>-	    prev=</div><div class='del'>-	    continue</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	  ;;</div><div class='del'>-	expsyms)</div><div class='del'>-	  export_symbols="$arg"</div><div class='del'>-	  test -f "$arg" \</div><div class='del'>-	    || func_fatal_error "symbol file \`$arg' does not exist"</div><div class='del'>-	  prev=</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	expsyms_regex)</div><div class='del'>-	  export_symbols_regex="$arg"</div><div class='del'>-	  prev=</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	framework)</div><div class='del'>-	  case $host in</div><div class='del'>-	    *-*-darwin*)</div><div class='del'>-	      case "$deplibs " in</div><div class='del'>-		*" $qarg.ltframework "*) ;;</div><div class='del'>-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later</div><div class='del'>-		   ;;</div><div class='del'>-	      esac</div><div class='del'>-	      ;;</div><div class='del'>-	  esac</div><div class='del'>-	  prev=</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	inst_prefix)</div><div class='del'>-	  inst_prefix_dir="$arg"</div><div class='del'>-	  prev=</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	objectlist)</div><div class='del'>-	  if test -f "$arg"; then</div><div class='del'>-	    save_arg=$arg</div><div class='del'>-	    moreargs=</div><div class='del'>-	    for fil in `cat "$save_arg"`</div><div class='del'>-	    do</div><div class='del'>-#	      moreargs="$moreargs $fil"</div><div class='del'>-	      arg=$fil</div><div class='del'>-	      # A libtool-controlled object.</div><div class='del'>-</div><div class='del'>-	      # Check to see that this really is a libtool object.</div><div class='del'>-	      if func_lalib_unsafe_p "$arg"; then</div><div class='del'>-		pic_object=</div><div class='del'>-		non_pic_object=</div><div class='del'>-</div><div class='del'>-		# Read the .lo file</div><div class='del'>-		func_source "$arg"</div><div class='del'>-</div><div class='del'>-		if test -z "$pic_object" ||</div><div class='del'>-		   test -z "$non_pic_object" ||</div><div class='del'>-		   test "$pic_object" = none &amp;&amp;</div><div class='del'>-		   test "$non_pic_object" = none; then</div><div class='del'>-		  func_fatal_error "cannot find name of object for \`$arg'"</div><div class='del'>-		fi</div><div class='del'>-</div><div class='del'>-		# Extract subdirectory from the argument.</div><div class='del'>-		func_dirname "$arg" "/" ""</div><div class='del'>-		xdir="$func_dirname_result"</div><div class='del'>-</div><div class='del'>-		if test "$pic_object" != none; then</div><div class='del'>-		  # Prepend the subdirectory the object is found in.</div><div class='del'>-		  pic_object="$xdir$pic_object"</div><div class='del'>-</div><div class='del'>-		  if test "$prev" = dlfiles; then</div><div class='del'>-		    if test "$build_libtool_libs" = yes &amp;&amp; test "$dlopen_support" = yes; then</div><div class='del'>-		      dlfiles="$dlfiles $pic_object"</div><div class='del'>-		      prev=</div><div class='del'>-		      continue</div><div class='del'>-		    else</div><div class='del'>-		      # If libtool objects are unsupported, then we need to preload.</div><div class='del'>-		      prev=dlprefiles</div><div class='del'>-		    fi</div><div class='del'>-		  fi</div><div class='del'>-</div><div class='del'>-		  # CHECK ME:  I think I busted this.  -Ossama</div><div class='del'>-		  if test "$prev" = dlprefiles; then</div><div class='del'>-		    # Preload the old-style object.</div><div class='del'>-		    dlprefiles="$dlprefiles $pic_object"</div><div class='del'>-		    prev=</div><div class='del'>-		  fi</div><div class='del'>-</div><div class='del'>-		  # A PIC object.</div><div class='del'>-		  func_append libobjs " $pic_object"</div><div class='del'>-		  arg="$pic_object"</div><div class='del'>-		fi</div><div class='del'>-</div><div class='del'>-		# Non-PIC object.</div><div class='del'>-		if test "$non_pic_object" != none; then</div><div class='del'>-		  # Prepend the subdirectory the object is found in.</div><div class='del'>-		  non_pic_object="$xdir$non_pic_object"</div><div class='del'>-</div><div class='del'>-		  # A standard non-PIC object</div><div class='del'>-		  func_append non_pic_objects " $non_pic_object"</div><div class='del'>-		  if test -z "$pic_object" || test "$pic_object" = none ; then</div><div class='del'>-		    arg="$non_pic_object"</div><div class='del'>-		  fi</div><div class='del'>-		else</div><div class='del'>-		  # If the PIC object exists, use it instead.</div><div class='del'>-		  # $xdir was prepended to $pic_object above.</div><div class='del'>-		  non_pic_object="$pic_object"</div><div class='del'>-		  func_append non_pic_objects " $non_pic_object"</div><div class='del'>-		fi</div><div class='del'>-	      else</div><div class='del'>-		# Only an error if not doing a dry-run.</div><div class='del'>-		if $opt_dry_run; then</div><div class='del'>-		  # Extract subdirectory from the argument.</div><div class='del'>-		  func_dirname "$arg" "/" ""</div><div class='del'>-		  xdir="$func_dirname_result"</div><div class='del'>-</div><div class='del'>-		  func_lo2o "$arg"</div><div class='del'>-		  pic_object=$xdir$objdir/$func_lo2o_result</div><div class='del'>-		  non_pic_object=$xdir$func_lo2o_result</div><div class='del'>-		  func_append libobjs " $pic_object"</div><div class='del'>-		  func_append non_pic_objects " $non_pic_object"</div><div class='del'>-	        else</div><div class='del'>-		  func_fatal_error "\`$arg' is not a valid libtool object"</div><div class='del'>-		fi</div><div class='del'>-	      fi</div><div class='del'>-	    done</div><div class='del'>-	  else</div><div class='del'>-	    func_fatal_error "link input file \`$arg' does not exist"</div><div class='del'>-	  fi</div><div class='del'>-	  arg=$save_arg</div><div class='del'>-	  prev=</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	precious_regex)</div><div class='del'>-	  precious_files_regex="$arg"</div><div class='del'>-	  prev=</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	release)</div><div class='del'>-	  release="-$arg"</div><div class='del'>-	  prev=</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	rpath | xrpath)</div><div class='del'>-	  # We need an absolute path.</div><div class='del'>-	  case $arg in</div><div class='del'>-	  [\\/]* | [A-Za-z]:[\\/]*) ;;</div><div class='del'>-	  *)</div><div class='del'>-	    func_fatal_error "only absolute run-paths are allowed"</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	  if test "$prev" = rpath; then</div><div class='del'>-	    case "$rpath " in</div><div class='del'>-	    *" $arg "*) ;;</div><div class='del'>-	    *) rpath="$rpath $arg" ;;</div><div class='del'>-	    esac</div><div class='del'>-	  else</div><div class='del'>-	    case "$xrpath " in</div><div class='del'>-	    *" $arg "*) ;;</div><div class='del'>-	    *) xrpath="$xrpath $arg" ;;</div><div class='del'>-	    esac</div><div class='del'>-	  fi</div><div class='del'>-	  prev=</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	shrext)</div><div class='del'>-	  shrext_cmds="$arg"</div><div class='del'>-	  prev=</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	weak)</div><div class='del'>-	  weak_libs="$weak_libs $arg"</div><div class='del'>-	  prev=</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	xcclinker)</div><div class='del'>-	  linker_flags="$linker_flags $qarg"</div><div class='del'>-	  compiler_flags="$compiler_flags $qarg"</div><div class='del'>-	  prev=</div><div class='del'>-	  func_append compile_command " $qarg"</div><div class='del'>-	  func_append finalize_command " $qarg"</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	xcompiler)</div><div class='del'>-	  compiler_flags="$compiler_flags $qarg"</div><div class='del'>-	  prev=</div><div class='del'>-	  func_append compile_command " $qarg"</div><div class='del'>-	  func_append finalize_command " $qarg"</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	xlinker)</div><div class='del'>-	  linker_flags="$linker_flags $qarg"</div><div class='del'>-	  compiler_flags="$compiler_flags $wl$qarg"</div><div class='del'>-	  prev=</div><div class='del'>-	  func_append compile_command " $wl$qarg"</div><div class='del'>-	  func_append finalize_command " $wl$qarg"</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	*)</div><div class='del'>-	  eval "$prev=\"\$arg\""</div><div class='del'>-	  prev=</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      fi # test -n "$prev"</div><div class='del'>-</div><div class='del'>-      prevarg="$arg"</div><div class='del'>-</div><div class='del'>-      case $arg in</div><div class='del'>-      -all-static)</div><div class='del'>-	if test -n "$link_static_flag"; then</div><div class='del'>-	  # See comment for -static flag below, for more details.</div><div class='del'>-	  func_append compile_command " $link_static_flag"</div><div class='del'>-	  func_append finalize_command " $link_static_flag"</div><div class='del'>-	fi</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -allow-undefined)</div><div class='del'>-	# FIXME: remove this flag sometime in the future.</div><div class='del'>-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -avoid-version)</div><div class='del'>-	avoid_version=yes</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -dlopen)</div><div class='del'>-	prev=dlfiles</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -dlpreopen)</div><div class='del'>-	prev=dlprefiles</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -export-dynamic)</div><div class='del'>-	export_dynamic=yes</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -export-symbols | -export-symbols-regex)</div><div class='del'>-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then</div><div class='del'>-	  func_fatal_error "more than one -exported-symbols argument is not allowed"</div><div class='del'>-	fi</div><div class='del'>-	if test "X$arg" = "X-export-symbols"; then</div><div class='del'>-	  prev=expsyms</div><div class='del'>-	else</div><div class='del'>-	  prev=expsyms_regex</div><div class='del'>-	fi</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -framework)</div><div class='del'>-	prev=framework</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -inst-prefix-dir)</div><div class='del'>-	prev=inst_prefix</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*</div><div class='del'>-      # so, if we see these flags be careful not to treat them like -L</div><div class='del'>-      -L[A-Z][A-Z]*:*)</div><div class='del'>-	case $with_gcc/$host in</div><div class='del'>-	no/*-*-irix* | /*-*-irix*)</div><div class='del'>-	  func_append compile_command " $arg"</div><div class='del'>-	  func_append finalize_command " $arg"</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -L*)</div><div class='del'>-	func_stripname '-L' '' "$arg"</div><div class='del'>-	dir=$func_stripname_result</div><div class='del'>-	if test -z "$dir"; then</div><div class='del'>-	  if test "$#" -gt 0; then</div><div class='del'>-	    func_fatal_error "require no space between \`-L' and \`$1'"</div><div class='del'>-	  else</div><div class='del'>-	    func_fatal_error "need path for \`-L' option"</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-	# We need an absolute path.</div><div class='del'>-	case $dir in</div><div class='del'>-	[\\/]* | [A-Za-z]:[\\/]*) ;;</div><div class='del'>-	*)</div><div class='del'>-	  absdir=`cd "$dir" &amp;&amp; pwd`</div><div class='del'>-	  test -z "$absdir" &amp;&amp; \</div><div class='del'>-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"</div><div class='del'>-	  dir="$absdir"</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	case "$deplibs " in</div><div class='del'>-	*" -L$dir "*) ;;</div><div class='del'>-	*)</div><div class='del'>-	  deplibs="$deplibs -L$dir"</div><div class='del'>-	  lib_search_path="$lib_search_path $dir"</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	case $host in</div><div class='del'>-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)</div><div class='del'>-	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`</div><div class='del'>-	  case :$dllsearchpath: in</div><div class='del'>-	  *":$dir:"*) ;;</div><div class='del'>-	  ::) dllsearchpath=$dir;;</div><div class='del'>-	  *) dllsearchpath="$dllsearchpath:$dir";;</div><div class='del'>-	  esac</div><div class='del'>-	  case :$dllsearchpath: in</div><div class='del'>-	  *":$testbindir:"*) ;;</div><div class='del'>-	  ::) dllsearchpath=$testbindir;;</div><div class='del'>-	  *) dllsearchpath="$dllsearchpath:$testbindir";;</div><div class='del'>-	  esac</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -l*)</div><div class='del'>-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then</div><div class='del'>-	  case $host in</div><div class='del'>-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)</div><div class='del'>-	    # These systems don't actually have a C or math library (as such)</div><div class='del'>-	    continue</div><div class='del'>-	    ;;</div><div class='del'>-	  *-*-os2*)</div><div class='del'>-	    # These systems don't actually have a C library (as such)</div><div class='del'>-	    test "X$arg" = "X-lc" &amp;&amp; continue</div><div class='del'>-	    ;;</div><div class='del'>-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)</div><div class='del'>-	    # Do not include libc due to us having libc/libc_r.</div><div class='del'>-	    test "X$arg" = "X-lc" &amp;&amp; continue</div><div class='del'>-	    ;;</div><div class='del'>-	  *-*-rhapsody* | *-*-darwin1.[012])</div><div class='del'>-	    # Rhapsody C and math libraries are in the System framework</div><div class='del'>-	    deplibs="$deplibs System.ltframework"</div><div class='del'>-	    continue</div><div class='del'>-	    ;;</div><div class='del'>-	  *-*-sco3.2v5* | *-*-sco5v6*)</div><div class='del'>-	    # Causes problems with __ctype</div><div class='del'>-	    test "X$arg" = "X-lc" &amp;&amp; continue</div><div class='del'>-	    ;;</div><div class='del'>-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)</div><div class='del'>-	    # Compiler inserts libc in the correct place for threads to work</div><div class='del'>-	    test "X$arg" = "X-lc" &amp;&amp; continue</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	elif test "X$arg" = "X-lc_r"; then</div><div class='del'>-	 case $host in</div><div class='del'>-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)</div><div class='del'>-	   # Do not include libc_r directly, use -pthread flag.</div><div class='del'>-	   continue</div><div class='del'>-	   ;;</div><div class='del'>-	 esac</div><div class='del'>-	fi</div><div class='del'>-	deplibs="$deplibs $arg"</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -module)</div><div class='del'>-	module=yes</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      # Tru64 UNIX uses -model [arg] to determine the layout of C++</div><div class='del'>-      # classes, name mangling, and exception handling.</div><div class='del'>-      # Darwin uses the -arch flag to determine output architecture.</div><div class='del'>-      -model|-arch|-isysroot)</div><div class='del'>-	compiler_flags="$compiler_flags $arg"</div><div class='del'>-	func_append compile_command " $arg"</div><div class='del'>-	func_append finalize_command " $arg"</div><div class='del'>-	prev=xcompiler</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)</div><div class='del'>-	compiler_flags="$compiler_flags $arg"</div><div class='del'>-	func_append compile_command " $arg"</div><div class='del'>-	func_append finalize_command " $arg"</div><div class='del'>-	case "$new_inherited_linker_flags " in</div><div class='del'>-	    *" $arg "*) ;;</div><div class='del'>-	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;</div><div class='del'>-	esac</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -multi_module)</div><div class='del'>-	single_module="${wl}-multi_module"</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -no-fast-install)</div><div class='del'>-	fast_install=no</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -no-install)</div><div class='del'>-	case $host in</div><div class='del'>-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)</div><div class='del'>-	  # The PATH hackery in wrapper scripts is required on Windows</div><div class='del'>-	  # and Darwin in order for the loader to find any dlls it needs.</div><div class='del'>-	  func_warning "\`-no-install' is ignored for $host"</div><div class='del'>-	  func_warning "assuming \`-no-fast-install' instead"</div><div class='del'>-	  fast_install=no</div><div class='del'>-	  ;;</div><div class='del'>-	*) no_install=yes ;;</div><div class='del'>-	esac</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -no-undefined)</div><div class='del'>-	allow_undefined=no</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -objectlist)</div><div class='del'>-	prev=objectlist</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -o) prev=output ;;</div><div class='del'>-</div><div class='del'>-      -precious-files-regex)</div><div class='del'>-	prev=precious_regex</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -release)</div><div class='del'>-	prev=release</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -rpath)</div><div class='del'>-	prev=rpath</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -R)</div><div class='del'>-	prev=xrpath</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -R*)</div><div class='del'>-	func_stripname '-R' '' "$arg"</div><div class='del'>-	dir=$func_stripname_result</div><div class='del'>-	# We need an absolute path.</div><div class='del'>-	case $dir in</div><div class='del'>-	[\\/]* | [A-Za-z]:[\\/]*) ;;</div><div class='del'>-	*)</div><div class='del'>-	  func_fatal_error "only absolute run-paths are allowed"</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	case "$xrpath " in</div><div class='del'>-	*" $dir "*) ;;</div><div class='del'>-	*) xrpath="$xrpath $dir" ;;</div><div class='del'>-	esac</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -shared)</div><div class='del'>-	# The effects of -shared are defined in a previous loop.</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -shrext)</div><div class='del'>-	prev=shrext</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -static | -static-libtool-libs)</div><div class='del'>-	# The effects of -static are defined in a previous loop.</div><div class='del'>-	# We used to do the same as -all-static on platforms that</div><div class='del'>-	# didn't have a PIC flag, but the assumption that the effects</div><div class='del'>-	# would be equivalent was wrong.  It would break on at least</div><div class='del'>-	# Digital Unix and AIX.</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -thread-safe)</div><div class='del'>-	thread_safe=yes</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -version-info)</div><div class='del'>-	prev=vinfo</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -version-number)</div><div class='del'>-	prev=vinfo</div><div class='del'>-	vinfo_number=yes</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -weak)</div><div class='del'>-        prev=weak</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -Wc,*)</div><div class='del'>-	func_stripname '-Wc,' '' "$arg"</div><div class='del'>-	args=$func_stripname_result</div><div class='del'>-	arg=</div><div class='del'>-	save_ifs="$IFS"; IFS=','</div><div class='del'>-	for flag in $args; do</div><div class='del'>-	  IFS="$save_ifs"</div><div class='del'>-          func_quote_for_eval "$flag"</div><div class='del'>-	  arg="$arg $wl$func_quote_for_eval_result"</div><div class='del'>-	  compiler_flags="$compiler_flags $func_quote_for_eval_result"</div><div class='del'>-	done</div><div class='del'>-	IFS="$save_ifs"</div><div class='del'>-	func_stripname ' ' '' "$arg"</div><div class='del'>-	arg=$func_stripname_result</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -Wl,*)</div><div class='del'>-	func_stripname '-Wl,' '' "$arg"</div><div class='del'>-	args=$func_stripname_result</div><div class='del'>-	arg=</div><div class='del'>-	save_ifs="$IFS"; IFS=','</div><div class='del'>-	for flag in $args; do</div><div class='del'>-	  IFS="$save_ifs"</div><div class='del'>-          func_quote_for_eval "$flag"</div><div class='del'>-	  arg="$arg $wl$func_quote_for_eval_result"</div><div class='del'>-	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"</div><div class='del'>-	  linker_flags="$linker_flags $func_quote_for_eval_result"</div><div class='del'>-	done</div><div class='del'>-	IFS="$save_ifs"</div><div class='del'>-	func_stripname ' ' '' "$arg"</div><div class='del'>-	arg=$func_stripname_result</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -Xcompiler)</div><div class='del'>-	prev=xcompiler</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -Xlinker)</div><div class='del'>-	prev=xlinker</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      -XCClinker)</div><div class='del'>-	prev=xcclinker</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      # -msg_* for osf cc</div><div class='del'>-      -msg_*)</div><div class='del'>-	func_quote_for_eval "$arg"</div><div class='del'>-	arg="$func_quote_for_eval_result"</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler</div><div class='del'>-      # -r[0-9][0-9]* specifies the processor on the SGI compiler</div><div class='del'>-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler</div><div class='del'>-      # +DA*, +DD* enable 64-bit mode on the HP compiler</div><div class='del'>-      # -q* pass through compiler args for the IBM compiler</div><div class='del'>-      # -m*, -t[45]*, -txscale* pass through architecture-specific</div><div class='del'>-      # compiler args for GCC</div><div class='del'>-      # -F/path gives path to uninstalled frameworks, gcc on darwin</div><div class='del'>-      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC</div><div class='del'>-      # @file GCC response files</div><div class='del'>-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \</div><div class='del'>-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)</div><div class='del'>-        func_quote_for_eval "$arg"</div><div class='del'>-	arg="$func_quote_for_eval_result"</div><div class='del'>-        func_append compile_command " $arg"</div><div class='del'>-        func_append finalize_command " $arg"</div><div class='del'>-        compiler_flags="$compiler_flags $arg"</div><div class='del'>-        continue</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-      # Some other compiler flag.</div><div class='del'>-      -* | +*)</div><div class='del'>-        func_quote_for_eval "$arg"</div><div class='del'>-	arg="$func_quote_for_eval_result"</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      *.$objext)</div><div class='del'>-	# A standard object.</div><div class='del'>-	objs="$objs $arg"</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      *.lo)</div><div class='del'>-	# A libtool-controlled object.</div><div class='del'>-</div><div class='del'>-	# Check to see that this really is a libtool object.</div><div class='del'>-	if func_lalib_unsafe_p "$arg"; then</div><div class='del'>-	  pic_object=</div><div class='del'>-	  non_pic_object=</div><div class='del'>-</div><div class='del'>-	  # Read the .lo file</div><div class='del'>-	  func_source "$arg"</div><div class='del'>-</div><div class='del'>-	  if test -z "$pic_object" ||</div><div class='del'>-	     test -z "$non_pic_object" ||</div><div class='del'>-	     test "$pic_object" = none &amp;&amp;</div><div class='del'>-	     test "$non_pic_object" = none; then</div><div class='del'>-	    func_fatal_error "cannot find name of object for \`$arg'"</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  # Extract subdirectory from the argument.</div><div class='del'>-	  func_dirname "$arg" "/" ""</div><div class='del'>-	  xdir="$func_dirname_result"</div><div class='del'>-</div><div class='del'>-	  if test "$pic_object" != none; then</div><div class='del'>-	    # Prepend the subdirectory the object is found in.</div><div class='del'>-	    pic_object="$xdir$pic_object"</div><div class='del'>-</div><div class='del'>-	    if test "$prev" = dlfiles; then</div><div class='del'>-	      if test "$build_libtool_libs" = yes &amp;&amp; test "$dlopen_support" = yes; then</div><div class='del'>-		dlfiles="$dlfiles $pic_object"</div><div class='del'>-		prev=</div><div class='del'>-		continue</div><div class='del'>-	      else</div><div class='del'>-		# If libtool objects are unsupported, then we need to preload.</div><div class='del'>-		prev=dlprefiles</div><div class='del'>-	      fi</div><div class='del'>-	    fi</div><div class='del'>-</div><div class='del'>-	    # CHECK ME:  I think I busted this.  -Ossama</div><div class='del'>-	    if test "$prev" = dlprefiles; then</div><div class='del'>-	      # Preload the old-style object.</div><div class='del'>-	      dlprefiles="$dlprefiles $pic_object"</div><div class='del'>-	      prev=</div><div class='del'>-	    fi</div><div class='del'>-</div><div class='del'>-	    # A PIC object.</div><div class='del'>-	    func_append libobjs " $pic_object"</div><div class='del'>-	    arg="$pic_object"</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  # Non-PIC object.</div><div class='del'>-	  if test "$non_pic_object" != none; then</div><div class='del'>-	    # Prepend the subdirectory the object is found in.</div><div class='del'>-	    non_pic_object="$xdir$non_pic_object"</div><div class='del'>-</div><div class='del'>-	    # A standard non-PIC object</div><div class='del'>-	    func_append non_pic_objects " $non_pic_object"</div><div class='del'>-	    if test -z "$pic_object" || test "$pic_object" = none ; then</div><div class='del'>-	      arg="$non_pic_object"</div><div class='del'>-	    fi</div><div class='del'>-	  else</div><div class='del'>-	    # If the PIC object exists, use it instead.</div><div class='del'>-	    # $xdir was prepended to $pic_object above.</div><div class='del'>-	    non_pic_object="$pic_object"</div><div class='del'>-	    func_append non_pic_objects " $non_pic_object"</div><div class='del'>-	  fi</div><div class='del'>-	else</div><div class='del'>-	  # Only an error if not doing a dry-run.</div><div class='del'>-	  if $opt_dry_run; then</div><div class='del'>-	    # Extract subdirectory from the argument.</div><div class='del'>-	    func_dirname "$arg" "/" ""</div><div class='del'>-	    xdir="$func_dirname_result"</div><div class='del'>-</div><div class='del'>-	    func_lo2o "$arg"</div><div class='del'>-	    pic_object=$xdir$objdir/$func_lo2o_result</div><div class='del'>-	    non_pic_object=$xdir$func_lo2o_result</div><div class='del'>-	    func_append libobjs " $pic_object"</div><div class='del'>-	    func_append non_pic_objects " $non_pic_object"</div><div class='del'>-	  else</div><div class='del'>-	    func_fatal_error "\`$arg' is not a valid libtool object"</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      *.$libext)</div><div class='del'>-	# An archive.</div><div class='del'>-	deplibs="$deplibs $arg"</div><div class='del'>-	old_deplibs="$old_deplibs $arg"</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      *.la)</div><div class='del'>-	# A libtool-controlled library.</div><div class='del'>-</div><div class='del'>-	if test "$prev" = dlfiles; then</div><div class='del'>-	  # This library was specified with -dlopen.</div><div class='del'>-	  dlfiles="$dlfiles $arg"</div><div class='del'>-	  prev=</div><div class='del'>-	elif test "$prev" = dlprefiles; then</div><div class='del'>-	  # The library was specified with -dlpreopen.</div><div class='del'>-	  dlprefiles="$dlprefiles $arg"</div><div class='del'>-	  prev=</div><div class='del'>-	else</div><div class='del'>-	  deplibs="$deplibs $arg"</div><div class='del'>-	fi</div><div class='del'>-	continue</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      # Some other compiler argument.</div><div class='del'>-      *)</div><div class='del'>-	# Unknown arguments in both finalize_command and compile_command need</div><div class='del'>-	# to be aesthetically quoted because they are evaled later.</div><div class='del'>-	func_quote_for_eval "$arg"</div><div class='del'>-	arg="$func_quote_for_eval_result"</div><div class='del'>-	;;</div><div class='del'>-      esac # arg</div><div class='del'>-</div><div class='del'>-      # Now actually substitute the argument into the commands.</div><div class='del'>-      if test -n "$arg"; then</div><div class='del'>-	func_append compile_command " $arg"</div><div class='del'>-	func_append finalize_command " $arg"</div><div class='del'>-      fi</div><div class='del'>-    done # argument parsing loop</div><div class='del'>-</div><div class='del'>-    test -n "$prev" &amp;&amp; \</div><div class='del'>-      func_fatal_help "the \`$prevarg' option requires an argument"</div><div class='del'>-</div><div class='del'>-    if test "$export_dynamic" = yes &amp;&amp; test -n "$export_dynamic_flag_spec"; then</div><div class='del'>-      eval arg=\"$export_dynamic_flag_spec\"</div><div class='del'>-      func_append compile_command " $arg"</div><div class='del'>-      func_append finalize_command " $arg"</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    oldlibs=</div><div class='del'>-    # calculate the name of the file, without its directory</div><div class='del'>-    func_basename "$output"</div><div class='del'>-    outputname="$func_basename_result"</div><div class='del'>-    libobjs_save="$libobjs"</div><div class='del'>-</div><div class='del'>-    if test -n "$shlibpath_var"; then</div><div class='del'>-      # get the directories listed in $shlibpath_var</div><div class='del'>-      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`</div><div class='del'>-    else</div><div class='del'>-      shlib_search_path=</div><div class='del'>-    fi</div><div class='del'>-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"</div><div class='del'>-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"</div><div class='del'>-</div><div class='del'>-    func_dirname "$output" "/" ""</div><div class='del'>-    output_objdir="$func_dirname_result$objdir"</div><div class='del'>-    # Create the object directory.</div><div class='del'>-    func_mkdir_p "$output_objdir"</div><div class='del'>-</div><div class='del'>-    # Determine the type of output</div><div class='del'>-    case $output in</div><div class='del'>-    "")</div><div class='del'>-      func_fatal_help "you must specify an output file"</div><div class='del'>-      ;;</div><div class='del'>-    *.$libext) linkmode=oldlib ;;</div><div class='del'>-    *.lo | *.$objext) linkmode=obj ;;</div><div class='del'>-    *.la) linkmode=lib ;;</div><div class='del'>-    *) linkmode=prog ;; # Anything else should be a program.</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    specialdeplibs=</div><div class='del'>-</div><div class='del'>-    libs=</div><div class='del'>-    # Find all interdependent deplibs by searching for libraries</div><div class='del'>-    # that are linked more than once (e.g. -la -lb -la)</div><div class='del'>-    for deplib in $deplibs; do</div><div class='del'>-      if $opt_duplicate_deps ; then</div><div class='del'>-	case "$libs " in</div><div class='del'>-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-      libs="$libs $deplib"</div><div class='del'>-    done</div><div class='del'>-</div><div class='del'>-    if test "$linkmode" = lib; then</div><div class='del'>-      libs="$predeps $libs $compiler_lib_search_path $postdeps"</div><div class='del'>-</div><div class='del'>-      # Compute libraries that are listed more than once in $predeps</div><div class='del'>-      # $postdeps and mark them as special (i.e., whose duplicates are</div><div class='del'>-      # not to be eliminated).</div><div class='del'>-      pre_post_deps=</div><div class='del'>-      if $opt_duplicate_compiler_generated_deps; then</div><div class='del'>-	for pre_post_dep in $predeps $postdeps; do</div><div class='del'>-	  case "$pre_post_deps " in</div><div class='del'>-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;</div><div class='del'>-	  esac</div><div class='del'>-	  pre_post_deps="$pre_post_deps $pre_post_dep"</div><div class='del'>-	done</div><div class='del'>-      fi</div><div class='del'>-      pre_post_deps=</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    deplibs=</div><div class='del'>-    newdependency_libs=</div><div class='del'>-    newlib_search_path=</div><div class='del'>-    need_relink=no # whether we're linking any uninstalled libtool libraries</div><div class='del'>-    notinst_deplibs= # not-installed libtool libraries</div><div class='del'>-    notinst_path= # paths that contain not-installed libtool libraries</div><div class='del'>-</div><div class='del'>-    case $linkmode in</div><div class='del'>-    lib)</div><div class='del'>-	passes="conv dlpreopen link"</div><div class='del'>-	for file in $dlfiles $dlprefiles; do</div><div class='del'>-	  case $file in</div><div class='del'>-	  *.la) ;;</div><div class='del'>-	  *)</div><div class='del'>-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	done</div><div class='del'>-	;;</div><div class='del'>-    prog)</div><div class='del'>-	compile_deplibs=</div><div class='del'>-	finalize_deplibs=</div><div class='del'>-	alldeplibs=no</div><div class='del'>-	newdlfiles=</div><div class='del'>-	newdlprefiles=</div><div class='del'>-	passes="conv scan dlopen dlpreopen link"</div><div class='del'>-	;;</div><div class='del'>-    *)  passes="conv"</div><div class='del'>-	;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    for pass in $passes; do</div><div class='del'>-      # The preopen pass in lib mode reverses $deplibs; put it back here</div><div class='del'>-      # so that -L comes before libs that need it for instance...</div><div class='del'>-      if test "$linkmode,$pass" = "lib,link"; then</div><div class='del'>-	## FIXME: Find the place where the list is rebuilt in the wrong</div><div class='del'>-	##        order, and fix it there properly</div><div class='del'>-        tmp_deplibs=</div><div class='del'>-	for deplib in $deplibs; do</div><div class='del'>-	  tmp_deplibs="$deplib $tmp_deplibs"</div><div class='del'>-	done</div><div class='del'>-	deplibs="$tmp_deplibs"</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      if test "$linkmode,$pass" = "lib,link" ||</div><div class='del'>-	 test "$linkmode,$pass" = "prog,scan"; then</div><div class='del'>-	libs="$deplibs"</div><div class='del'>-	deplibs=</div><div class='del'>-      fi</div><div class='del'>-      if test "$linkmode" = prog; then</div><div class='del'>-	case $pass in</div><div class='del'>-	dlopen) libs="$dlfiles" ;;</div><div class='del'>-	dlpreopen) libs="$dlprefiles" ;;</div><div class='del'>-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-      if test "$linkmode,$pass" = "lib,dlpreopen"; then</div><div class='del'>-	# Collect and forward deplibs of preopened libtool libs</div><div class='del'>-	for lib in $dlprefiles; do</div><div class='del'>-	  # Ignore non-libtool-libs</div><div class='del'>-	  dependency_libs=</div><div class='del'>-	  case $lib in</div><div class='del'>-	  *.la)	func_source "$lib" ;;</div><div class='del'>-	  esac</div><div class='del'>-</div><div class='del'>-	  # Collect preopened libtool deplibs, except any this library</div><div class='del'>-	  # has declared as weak libs</div><div class='del'>-	  for deplib in $dependency_libs; do</div><div class='del'>-            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`</div><div class='del'>-	    case " $weak_libs " in</div><div class='del'>-	    *" $deplib_base "*) ;;</div><div class='del'>-	    *) deplibs="$deplibs $deplib" ;;</div><div class='del'>-	    esac</div><div class='del'>-	  done</div><div class='del'>-	done</div><div class='del'>-	libs="$dlprefiles"</div><div class='del'>-      fi</div><div class='del'>-      if test "$pass" = dlopen; then</div><div class='del'>-	# Collect dlpreopened libraries</div><div class='del'>-	save_deplibs="$deplibs"</div><div class='del'>-	deplibs=</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      for deplib in $libs; do</div><div class='del'>-	lib=</div><div class='del'>-	found=no</div><div class='del'>-	case $deplib in</div><div class='del'>-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)</div><div class='del'>-	  if test "$linkmode,$pass" = "prog,link"; then</div><div class='del'>-	    compile_deplibs="$deplib $compile_deplibs"</div><div class='del'>-	    finalize_deplibs="$deplib $finalize_deplibs"</div><div class='del'>-	  else</div><div class='del'>-	    compiler_flags="$compiler_flags $deplib"</div><div class='del'>-	    if test "$linkmode" = lib ; then</div><div class='del'>-		case "$new_inherited_linker_flags " in</div><div class='del'>-		    *" $deplib "*) ;;</div><div class='del'>-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;</div><div class='del'>-		esac</div><div class='del'>-	    fi</div><div class='del'>-	  fi</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	-l*)</div><div class='del'>-	  if test "$linkmode" != lib &amp;&amp; test "$linkmode" != prog; then</div><div class='del'>-	    func_warning "\`-l' is ignored for archives/objects"</div><div class='del'>-	    continue</div><div class='del'>-	  fi</div><div class='del'>-	  func_stripname '-l' '' "$deplib"</div><div class='del'>-	  name=$func_stripname_result</div><div class='del'>-	  if test "$linkmode" = lib; then</div><div class='del'>-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"</div><div class='del'>-	  else</div><div class='del'>-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"</div><div class='del'>-	  fi</div><div class='del'>-	  for searchdir in $searchdirs; do</div><div class='del'>-	    for search_ext in .la $std_shrext .so .a; do</div><div class='del'>-	      # Search the libtool library</div><div class='del'>-	      lib="$searchdir/lib${name}${search_ext}"</div><div class='del'>-	      if test -f "$lib"; then</div><div class='del'>-		if test "$search_ext" = ".la"; then</div><div class='del'>-		  found=yes</div><div class='del'>-		else</div><div class='del'>-		  found=no</div><div class='del'>-		fi</div><div class='del'>-		break 2</div><div class='del'>-	      fi</div><div class='del'>-	    done</div><div class='del'>-	  done</div><div class='del'>-	  if test "$found" != yes; then</div><div class='del'>-	    # deplib doesn't seem to be a libtool library</div><div class='del'>-	    if test "$linkmode,$pass" = "prog,link"; then</div><div class='del'>-	      compile_deplibs="$deplib $compile_deplibs"</div><div class='del'>-	      finalize_deplibs="$deplib $finalize_deplibs"</div><div class='del'>-	    else</div><div class='del'>-	      deplibs="$deplib $deplibs"</div><div class='del'>-	      test "$linkmode" = lib &amp;&amp; newdependency_libs="$deplib $newdependency_libs"</div><div class='del'>-	    fi</div><div class='del'>-	    continue</div><div class='del'>-	  else # deplib is a libtool library</div><div class='del'>-	    # If $allow_libtool_libs_with_static_runtimes &amp;&amp; $deplib is a stdlib,</div><div class='del'>-	    # We need to do some special things here, and not later.</div><div class='del'>-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then</div><div class='del'>-	      case " $predeps $postdeps " in</div><div class='del'>-	      *" $deplib "*)</div><div class='del'>-		if func_lalib_p "$lib"; then</div><div class='del'>-		  library_names=</div><div class='del'>-		  old_library=</div><div class='del'>-		  func_source "$lib"</div><div class='del'>-		  for l in $old_library $library_names; do</div><div class='del'>-		    ll="$l"</div><div class='del'>-		  done</div><div class='del'>-		  if test "X$ll" = "X$old_library" ; then # only static version available</div><div class='del'>-		    found=no</div><div class='del'>-		    func_dirname "$lib" "" "."</div><div class='del'>-		    ladir="$func_dirname_result"</div><div class='del'>-		    lib=$ladir/$old_library</div><div class='del'>-		    if test "$linkmode,$pass" = "prog,link"; then</div><div class='del'>-		      compile_deplibs="$deplib $compile_deplibs"</div><div class='del'>-		      finalize_deplibs="$deplib $finalize_deplibs"</div><div class='del'>-		    else</div><div class='del'>-		      deplibs="$deplib $deplibs"</div><div class='del'>-		      test "$linkmode" = lib &amp;&amp; newdependency_libs="$deplib $newdependency_libs"</div><div class='del'>-		    fi</div><div class='del'>-		    continue</div><div class='del'>-		  fi</div><div class='del'>-		fi</div><div class='del'>-		;;</div><div class='del'>-	      *) ;;</div><div class='del'>-	      esac</div><div class='del'>-	    fi</div><div class='del'>-	  fi</div><div class='del'>-	  ;; # -l</div><div class='del'>-	*.ltframework)</div><div class='del'>-	  if test "$linkmode,$pass" = "prog,link"; then</div><div class='del'>-	    compile_deplibs="$deplib $compile_deplibs"</div><div class='del'>-	    finalize_deplibs="$deplib $finalize_deplibs"</div><div class='del'>-	  else</div><div class='del'>-	    deplibs="$deplib $deplibs"</div><div class='del'>-	    if test "$linkmode" = lib ; then</div><div class='del'>-		case "$new_inherited_linker_flags " in</div><div class='del'>-		    *" $deplib "*) ;;</div><div class='del'>-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;</div><div class='del'>-		esac</div><div class='del'>-	    fi</div><div class='del'>-	  fi</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	-L*)</div><div class='del'>-	  case $linkmode in</div><div class='del'>-	  lib)</div><div class='del'>-	    deplibs="$deplib $deplibs"</div><div class='del'>-	    test "$pass" = conv &amp;&amp; continue</div><div class='del'>-	    newdependency_libs="$deplib $newdependency_libs"</div><div class='del'>-	    func_stripname '-L' '' "$deplib"</div><div class='del'>-	    newlib_search_path="$newlib_search_path $func_stripname_result"</div><div class='del'>-	    ;;</div><div class='del'>-	  prog)</div><div class='del'>-	    if test "$pass" = conv; then</div><div class='del'>-	      deplibs="$deplib $deplibs"</div><div class='del'>-	      continue</div><div class='del'>-	    fi</div><div class='del'>-	    if test "$pass" = scan; then</div><div class='del'>-	      deplibs="$deplib $deplibs"</div><div class='del'>-	    else</div><div class='del'>-	      compile_deplibs="$deplib $compile_deplibs"</div><div class='del'>-	      finalize_deplibs="$deplib $finalize_deplibs"</div><div class='del'>-	    fi</div><div class='del'>-	    func_stripname '-L' '' "$deplib"</div><div class='del'>-	    newlib_search_path="$newlib_search_path $func_stripname_result"</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    func_warning "\`-L' is ignored for archives/objects"</div><div class='del'>-	    ;;</div><div class='del'>-	  esac # linkmode</div><div class='del'>-	  continue</div><div class='del'>-	  ;; # -L</div><div class='del'>-	-R*)</div><div class='del'>-	  if test "$pass" = link; then</div><div class='del'>-	    func_stripname '-R' '' "$deplib"</div><div class='del'>-	    dir=$func_stripname_result</div><div class='del'>-	    # Make sure the xrpath contains only unique directories.</div><div class='del'>-	    case "$xrpath " in</div><div class='del'>-	    *" $dir "*) ;;</div><div class='del'>-	    *) xrpath="$xrpath $dir" ;;</div><div class='del'>-	    esac</div><div class='del'>-	  fi</div><div class='del'>-	  deplibs="$deplib $deplibs"</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	*.la) lib="$deplib" ;;</div><div class='del'>-	*.$libext)</div><div class='del'>-	  if test "$pass" = conv; then</div><div class='del'>-	    deplibs="$deplib $deplibs"</div><div class='del'>-	    continue</div><div class='del'>-	  fi</div><div class='del'>-	  case $linkmode in</div><div class='del'>-	  lib)</div><div class='del'>-	    # Linking convenience modules into shared libraries is allowed,</div><div class='del'>-	    # but linking other static libraries is non-portable.</div><div class='del'>-	    case " $dlpreconveniencelibs " in</div><div class='del'>-	    *" $deplib "*) ;;</div><div class='del'>-	    *)</div><div class='del'>-	      valid_a_lib=no</div><div class='del'>-	      case $deplibs_check_method in</div><div class='del'>-		match_pattern*)</div><div class='del'>-		  set dummy $deplibs_check_method; shift</div><div class='del'>-		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`</div><div class='del'>-		  if eval "\$ECHO \"X$deplib\"" 2&gt;/dev/null | $Xsed -e 10q \</div><div class='del'>-		    | $EGREP "$match_pattern_regex" &gt; /dev/null; then</div><div class='del'>-		    valid_a_lib=yes</div><div class='del'>-		  fi</div><div class='del'>-		;;</div><div class='del'>-		pass_all)</div><div class='del'>-		  valid_a_lib=yes</div><div class='del'>-		;;</div><div class='del'>-	      esac</div><div class='del'>-	      if test "$valid_a_lib" != yes; then</div><div class='del'>-		$ECHO</div><div class='del'>-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."</div><div class='del'>-		$ECHO "*** I have the capability to make that library automatically link in when"</div><div class='del'>-		$ECHO "*** you link to this library.  But I can only do this if you have a"</div><div class='del'>-		$ECHO "*** shared version of the library, which you do not appear to have"</div><div class='del'>-		$ECHO "*** because the file extensions .$libext of this argument makes me believe"</div><div class='del'>-		$ECHO "*** that it is just a static archive that I should not use here."</div><div class='del'>-	      else</div><div class='del'>-		$ECHO</div><div class='del'>-		$ECHO "*** Warning: Linking the shared library $output against the"</div><div class='del'>-		$ECHO "*** static library $deplib is not portable!"</div><div class='del'>-		deplibs="$deplib $deplibs"</div><div class='del'>-	      fi</div><div class='del'>-	      ;;</div><div class='del'>-	    esac</div><div class='del'>-	    continue</div><div class='del'>-	    ;;</div><div class='del'>-	  prog)</div><div class='del'>-	    if test "$pass" != link; then</div><div class='del'>-	      deplibs="$deplib $deplibs"</div><div class='del'>-	    else</div><div class='del'>-	      compile_deplibs="$deplib $compile_deplibs"</div><div class='del'>-	      finalize_deplibs="$deplib $finalize_deplibs"</div><div class='del'>-	    fi</div><div class='del'>-	    continue</div><div class='del'>-	    ;;</div><div class='del'>-	  esac # linkmode</div><div class='del'>-	  ;; # *.$libext</div><div class='del'>-	*.lo | *.$objext)</div><div class='del'>-	  if test "$pass" = conv; then</div><div class='del'>-	    deplibs="$deplib $deplibs"</div><div class='del'>-	  elif test "$linkmode" = prog; then</div><div class='del'>-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then</div><div class='del'>-	      # If there is no dlopen support or we're linking statically,</div><div class='del'>-	      # we need to preload.</div><div class='del'>-	      newdlprefiles="$newdlprefiles $deplib"</div><div class='del'>-	      compile_deplibs="$deplib $compile_deplibs"</div><div class='del'>-	      finalize_deplibs="$deplib $finalize_deplibs"</div><div class='del'>-	    else</div><div class='del'>-	      newdlfiles="$newdlfiles $deplib"</div><div class='del'>-	    fi</div><div class='del'>-	  fi</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	%DEPLIBS%)</div><div class='del'>-	  alldeplibs=yes</div><div class='del'>-	  continue</div><div class='del'>-	  ;;</div><div class='del'>-	esac # case $deplib</div><div class='del'>-</div><div class='del'>-	if test "$found" = yes || test -f "$lib"; then :</div><div class='del'>-	else</div><div class='del'>-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# Check to see that this really is a libtool archive.</div><div class='del'>-	func_lalib_unsafe_p "$lib" \</div><div class='del'>-	  || func_fatal_error "\`$lib' is not a valid libtool archive"</div><div class='del'>-</div><div class='del'>-	func_dirname "$lib" "" "."</div><div class='del'>-	ladir="$func_dirname_result"</div><div class='del'>-</div><div class='del'>-	dlname=</div><div class='del'>-	dlopen=</div><div class='del'>-	dlpreopen=</div><div class='del'>-	libdir=</div><div class='del'>-	library_names=</div><div class='del'>-	old_library=</div><div class='del'>-	inherited_linker_flags=</div><div class='del'>-	# If the library was installed with an old release of libtool,</div><div class='del'>-	# it will not redefine variables installed, or shouldnotlink</div><div class='del'>-	installed=yes</div><div class='del'>-	shouldnotlink=no</div><div class='del'>-	avoidtemprpath=</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	# Read the .la file</div><div class='del'>-	func_source "$lib"</div><div class='del'>-</div><div class='del'>-	# Convert "-framework foo" to "foo.ltframework"</div><div class='del'>-	if test -n "$inherited_linker_flags"; then</div><div class='del'>-	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`</div><div class='del'>-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do</div><div class='del'>-	    case " $new_inherited_linker_flags " in</div><div class='del'>-	      *" $tmp_inherited_linker_flag "*) ;;</div><div class='del'>-	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;</div><div class='del'>-	    esac</div><div class='del'>-	  done</div><div class='del'>-	fi</div><div class='del'>-	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`</div><div class='del'>-	if test "$linkmode,$pass" = "lib,link" ||</div><div class='del'>-	   test "$linkmode,$pass" = "prog,scan" ||</div><div class='del'>-	   { test "$linkmode" != prog &amp;&amp; test "$linkmode" != lib; }; then</div><div class='del'>-	  test -n "$dlopen" &amp;&amp; dlfiles="$dlfiles $dlopen"</div><div class='del'>-	  test -n "$dlpreopen" &amp;&amp; dlprefiles="$dlprefiles $dlpreopen"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	if test "$pass" = conv; then</div><div class='del'>-	  # Only check for convenience libraries</div><div class='del'>-	  deplibs="$lib $deplibs"</div><div class='del'>-	  if test -z "$libdir"; then</div><div class='del'>-	    if test -z "$old_library"; then</div><div class='del'>-	      func_fatal_error "cannot find name of link library for \`$lib'"</div><div class='del'>-	    fi</div><div class='del'>-	    # It is a libtool convenience library, so add in its objects.</div><div class='del'>-	    convenience="$convenience $ladir/$objdir/$old_library"</div><div class='del'>-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"</div><div class='del'>-	  elif test "$linkmode" != prog &amp;&amp; test "$linkmode" != lib; then</div><div class='del'>-	    func_fatal_error "\`$lib' is not a convenience library"</div><div class='del'>-	  fi</div><div class='del'>-	  tmp_libs=</div><div class='del'>-	  for deplib in $dependency_libs; do</div><div class='del'>-	    deplibs="$deplib $deplibs"</div><div class='del'>-	    if $opt_duplicate_deps ; then</div><div class='del'>-	      case "$tmp_libs " in</div><div class='del'>-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;</div><div class='del'>-	      esac</div><div class='del'>-	    fi</div><div class='del'>-	    tmp_libs="$tmp_libs $deplib"</div><div class='del'>-	  done</div><div class='del'>-	  continue</div><div class='del'>-	fi # $pass = conv</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	# Get the name of the library we link against.</div><div class='del'>-	linklib=</div><div class='del'>-	for l in $old_library $library_names; do</div><div class='del'>-	  linklib="$l"</div><div class='del'>-	done</div><div class='del'>-	if test -z "$linklib"; then</div><div class='del'>-	  func_fatal_error "cannot find name of link library for \`$lib'"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# This library was specified with -dlopen.</div><div class='del'>-	if test "$pass" = dlopen; then</div><div class='del'>-	  if test -z "$libdir"; then</div><div class='del'>-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"</div><div class='del'>-	  fi</div><div class='del'>-	  if test -z "$dlname" ||</div><div class='del'>-	     test "$dlopen_support" != yes ||</div><div class='del'>-	     test "$build_libtool_libs" = no; then</div><div class='del'>-	    # If there is no dlname, no dlopen support or we're linking</div><div class='del'>-	    # statically, we need to preload.  We also need to preload any</div><div class='del'>-	    # dependent libraries so libltdl's deplib preloader doesn't</div><div class='del'>-	    # bomb out in the load deplibs phase.</div><div class='del'>-	    dlprefiles="$dlprefiles $lib $dependency_libs"</div><div class='del'>-	  else</div><div class='del'>-	    newdlfiles="$newdlfiles $lib"</div><div class='del'>-	  fi</div><div class='del'>-	  continue</div><div class='del'>-	fi # $pass = dlopen</div><div class='del'>-</div><div class='del'>-	# We need an absolute path.</div><div class='del'>-	case $ladir in</div><div class='del'>-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;</div><div class='del'>-	*)</div><div class='del'>-	  abs_ladir=`cd "$ladir" &amp;&amp; pwd`</div><div class='del'>-	  if test -z "$abs_ladir"; then</div><div class='del'>-	    func_warning "cannot determine absolute directory name of \`$ladir'"</div><div class='del'>-	    func_warning "passing it literally to the linker, although it might fail"</div><div class='del'>-	    abs_ladir="$ladir"</div><div class='del'>-	  fi</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	func_basename "$lib"</div><div class='del'>-	laname="$func_basename_result"</div><div class='del'>-</div><div class='del'>-	# Find the relevant object directory and library name.</div><div class='del'>-	if test "X$installed" = Xyes; then</div><div class='del'>-	  if test ! -f "$libdir/$linklib" &amp;&amp; test -f "$abs_ladir/$linklib"; then</div><div class='del'>-	    func_warning "library \`$lib' was moved."</div><div class='del'>-	    dir="$ladir"</div><div class='del'>-	    absdir="$abs_ladir"</div><div class='del'>-	    libdir="$abs_ladir"</div><div class='del'>-	  else</div><div class='del'>-	    dir="$libdir"</div><div class='del'>-	    absdir="$libdir"</div><div class='del'>-	  fi</div><div class='del'>-	  test "X$hardcode_automatic" = Xyes &amp;&amp; avoidtemprpath=yes</div><div class='del'>-	else</div><div class='del'>-	  if test ! -f "$ladir/$objdir/$linklib" &amp;&amp; test -f "$abs_ladir/$linklib"; then</div><div class='del'>-	    dir="$ladir"</div><div class='del'>-	    absdir="$abs_ladir"</div><div class='del'>-	    # Remove this search path later</div><div class='del'>-	    notinst_path="$notinst_path $abs_ladir"</div><div class='del'>-	  else</div><div class='del'>-	    dir="$ladir/$objdir"</div><div class='del'>-	    absdir="$abs_ladir/$objdir"</div><div class='del'>-	    # Remove this search path later</div><div class='del'>-	    notinst_path="$notinst_path $abs_ladir"</div><div class='del'>-	  fi</div><div class='del'>-	fi # $installed = yes</div><div class='del'>-	func_stripname 'lib' '.la' "$laname"</div><div class='del'>-	name=$func_stripname_result</div><div class='del'>-</div><div class='del'>-	# This library was specified with -dlpreopen.</div><div class='del'>-	if test "$pass" = dlpreopen; then</div><div class='del'>-	  if test -z "$libdir" &amp;&amp; test "$linkmode" = prog; then</div><div class='del'>-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"</div><div class='del'>-	  fi</div><div class='del'>-	  # Prefer using a static library (so that no silly _DYNAMIC symbols</div><div class='del'>-	  # are required to link).</div><div class='del'>-	  if test -n "$old_library"; then</div><div class='del'>-	    newdlprefiles="$newdlprefiles $dir/$old_library"</div><div class='del'>-	    # Keep a list of preopened convenience libraries to check</div><div class='del'>-	    # that they are being used correctly in the link pass.</div><div class='del'>-	    test -z "$libdir" &amp;&amp; \</div><div class='del'>-		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"</div><div class='del'>-	  # Otherwise, use the dlname, so that lt_dlopen finds it.</div><div class='del'>-	  elif test -n "$dlname"; then</div><div class='del'>-	    newdlprefiles="$newdlprefiles $dir/$dlname"</div><div class='del'>-	  else</div><div class='del'>-	    newdlprefiles="$newdlprefiles $dir/$linklib"</div><div class='del'>-	  fi</div><div class='del'>-	fi # $pass = dlpreopen</div><div class='del'>-</div><div class='del'>-	if test -z "$libdir"; then</div><div class='del'>-	  # Link the convenience library</div><div class='del'>-	  if test "$linkmode" = lib; then</div><div class='del'>-	    deplibs="$dir/$old_library $deplibs"</div><div class='del'>-	  elif test "$linkmode,$pass" = "prog,link"; then</div><div class='del'>-	    compile_deplibs="$dir/$old_library $compile_deplibs"</div><div class='del'>-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"</div><div class='del'>-	  else</div><div class='del'>-	    deplibs="$lib $deplibs" # used for prog,scan pass</div><div class='del'>-	  fi</div><div class='del'>-	  continue</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if test "$linkmode" = prog &amp;&amp; test "$pass" != link; then</div><div class='del'>-	  newlib_search_path="$newlib_search_path $ladir"</div><div class='del'>-	  deplibs="$lib $deplibs"</div><div class='del'>-</div><div class='del'>-	  linkalldeplibs=no</div><div class='del'>-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||</div><div class='del'>-	     test "$build_libtool_libs" = no; then</div><div class='del'>-	    linkalldeplibs=yes</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  tmp_libs=</div><div class='del'>-	  for deplib in $dependency_libs; do</div><div class='del'>-	    case $deplib in</div><div class='del'>-	    -L*) func_stripname '-L' '' "$deplib"</div><div class='del'>-	         newlib_search_path="$newlib_search_path $func_stripname_result"</div><div class='del'>-		 ;;</div><div class='del'>-	    esac</div><div class='del'>-	    # Need to link against all dependency_libs?</div><div class='del'>-	    if test "$linkalldeplibs" = yes; then</div><div class='del'>-	      deplibs="$deplib $deplibs"</div><div class='del'>-	    else</div><div class='del'>-	      # Need to hardcode shared library paths</div><div class='del'>-	      # or/and link against static libraries</div><div class='del'>-	      newdependency_libs="$deplib $newdependency_libs"</div><div class='del'>-	    fi</div><div class='del'>-	    if $opt_duplicate_deps ; then</div><div class='del'>-	      case "$tmp_libs " in</div><div class='del'>-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;</div><div class='del'>-	      esac</div><div class='del'>-	    fi</div><div class='del'>-	    tmp_libs="$tmp_libs $deplib"</div><div class='del'>-	  done # for deplib</div><div class='del'>-	  continue</div><div class='del'>-	fi # $linkmode = prog...</div><div class='del'>-</div><div class='del'>-	if test "$linkmode,$pass" = "prog,link"; then</div><div class='del'>-	  if test -n "$library_names" &amp;&amp;</div><div class='del'>-	     { { test "$prefer_static_libs" = no ||</div><div class='del'>-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||</div><div class='del'>-	       test -z "$old_library"; }; then</div><div class='del'>-	    # We need to hardcode the library path</div><div class='del'>-	    if test -n "$shlibpath_var" &amp;&amp; test -z "$avoidtemprpath" ; then</div><div class='del'>-	      # Make sure the rpath contains only unique directories.</div><div class='del'>-	      case "$temp_rpath:" in</div><div class='del'>-	      *"$absdir:"*) ;;</div><div class='del'>-	      *) temp_rpath="$temp_rpath$absdir:" ;;</div><div class='del'>-	      esac</div><div class='del'>-	    fi</div><div class='del'>-</div><div class='del'>-	    # Hardcode the library path.</div><div class='del'>-	    # Skip directories that are in the system default run-time</div><div class='del'>-	    # search path.</div><div class='del'>-	    case " $sys_lib_dlsearch_path " in</div><div class='del'>-	    *" $absdir "*) ;;</div><div class='del'>-	    *)</div><div class='del'>-	      case "$compile_rpath " in</div><div class='del'>-	      *" $absdir "*) ;;</div><div class='del'>-	      *) compile_rpath="$compile_rpath $absdir"</div><div class='del'>-	      esac</div><div class='del'>-	      ;;</div><div class='del'>-	    esac</div><div class='del'>-	    case " $sys_lib_dlsearch_path " in</div><div class='del'>-	    *" $libdir "*) ;;</div><div class='del'>-	    *)</div><div class='del'>-	      case "$finalize_rpath " in</div><div class='del'>-	      *" $libdir "*) ;;</div><div class='del'>-	      *) finalize_rpath="$finalize_rpath $libdir"</div><div class='del'>-	      esac</div><div class='del'>-	      ;;</div><div class='del'>-	    esac</div><div class='del'>-	  fi # $linkmode,$pass = prog,link...</div><div class='del'>-</div><div class='del'>-	  if test "$alldeplibs" = yes &amp;&amp;</div><div class='del'>-	     { test "$deplibs_check_method" = pass_all ||</div><div class='del'>-	       { test "$build_libtool_libs" = yes &amp;&amp;</div><div class='del'>-		 test -n "$library_names"; }; }; then</div><div class='del'>-	    # We only need to search for static libraries</div><div class='del'>-	    continue</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	link_static=no # Whether the deplib will be linked statically</div><div class='del'>-	use_static_libs=$prefer_static_libs</div><div class='del'>-	if test "$use_static_libs" = built &amp;&amp; test "$installed" = yes; then</div><div class='del'>-	  use_static_libs=no</div><div class='del'>-	fi</div><div class='del'>-	if test -n "$library_names" &amp;&amp;</div><div class='del'>-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then</div><div class='del'>-	  case $host in</div><div class='del'>-	  *cygwin* | *mingw* | *cegcc*)</div><div class='del'>-	      # No point in relinking DLLs because paths are not encoded</div><div class='del'>-	      notinst_deplibs="$notinst_deplibs $lib"</div><div class='del'>-	      need_relink=no</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    if test "$installed" = no; then</div><div class='del'>-	      notinst_deplibs="$notinst_deplibs $lib"</div><div class='del'>-	      need_relink=yes</div><div class='del'>-	    fi</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	  # This is a shared library</div><div class='del'>-</div><div class='del'>-	  # Warn about portability, can't link against -module's on some</div><div class='del'>-	  # systems (darwin).  Don't bleat about dlopened modules though!</div><div class='del'>-	  dlopenmodule=""</div><div class='del'>-	  for dlpremoduletest in $dlprefiles; do</div><div class='del'>-	    if test "X$dlpremoduletest" = "X$lib"; then</div><div class='del'>-	      dlopenmodule="$dlpremoduletest"</div><div class='del'>-	      break</div><div class='del'>-	    fi</div><div class='del'>-	  done</div><div class='del'>-	  if test -z "$dlopenmodule" &amp;&amp; test "$shouldnotlink" = yes &amp;&amp; test "$pass" = link; then</div><div class='del'>-	    $ECHO</div><div class='del'>-	    if test "$linkmode" = prog; then</div><div class='del'>-	      $ECHO "*** Warning: Linking the executable $output against the loadable module"</div><div class='del'>-	    else</div><div class='del'>-	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"</div><div class='del'>-	    fi</div><div class='del'>-	    $ECHO "*** $linklib is not portable!"</div><div class='del'>-	  fi</div><div class='del'>-	  if test "$linkmode" = lib &amp;&amp;</div><div class='del'>-	     test "$hardcode_into_libs" = yes; then</div><div class='del'>-	    # Hardcode the library path.</div><div class='del'>-	    # Skip directories that are in the system default run-time</div><div class='del'>-	    # search path.</div><div class='del'>-	    case " $sys_lib_dlsearch_path " in</div><div class='del'>-	    *" $absdir "*) ;;</div><div class='del'>-	    *)</div><div class='del'>-	      case "$compile_rpath " in</div><div class='del'>-	      *" $absdir "*) ;;</div><div class='del'>-	      *) compile_rpath="$compile_rpath $absdir"</div><div class='del'>-	      esac</div><div class='del'>-	      ;;</div><div class='del'>-	    esac</div><div class='del'>-	    case " $sys_lib_dlsearch_path " in</div><div class='del'>-	    *" $libdir "*) ;;</div><div class='del'>-	    *)</div><div class='del'>-	      case "$finalize_rpath " in</div><div class='del'>-	      *" $libdir "*) ;;</div><div class='del'>-	      *) finalize_rpath="$finalize_rpath $libdir"</div><div class='del'>-	      esac</div><div class='del'>-	      ;;</div><div class='del'>-	    esac</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  if test -n "$old_archive_from_expsyms_cmds"; then</div><div class='del'>-	    # figure out the soname</div><div class='del'>-	    set dummy $library_names</div><div class='del'>-	    shift</div><div class='del'>-	    realname="$1"</div><div class='del'>-	    shift</div><div class='del'>-	    libname=`eval "\\$ECHO \"$libname_spec\""`</div><div class='del'>-	    # use dlname if we got it. it's perfectly good, no?</div><div class='del'>-	    if test -n "$dlname"; then</div><div class='del'>-	      soname="$dlname"</div><div class='del'>-	    elif test -n "$soname_spec"; then</div><div class='del'>-	      # bleh windows</div><div class='del'>-	      case $host in</div><div class='del'>-	      *cygwin* | mingw* | *cegcc*)</div><div class='del'>-	        func_arith $current - $age</div><div class='del'>-		major=$func_arith_result</div><div class='del'>-		versuffix="-$major"</div><div class='del'>-		;;</div><div class='del'>-	      esac</div><div class='del'>-	      eval soname=\"$soname_spec\"</div><div class='del'>-	    else</div><div class='del'>-	      soname="$realname"</div><div class='del'>-	    fi</div><div class='del'>-</div><div class='del'>-	    # Make a new name for the extract_expsyms_cmds to use</div><div class='del'>-	    soroot="$soname"</div><div class='del'>-	    func_basename "$soroot"</div><div class='del'>-	    soname="$func_basename_result"</div><div class='del'>-	    func_stripname 'lib' '.dll' "$soname"</div><div class='del'>-	    newlib=libimp-$func_stripname_result.a</div><div class='del'>-</div><div class='del'>-	    # If the library has no export list, then create one now</div><div class='del'>-	    if test -f "$output_objdir/$soname-def"; then :</div><div class='del'>-	    else</div><div class='del'>-	      func_verbose "extracting exported symbol list from \`$soname'"</div><div class='del'>-	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'</div><div class='del'>-	    fi</div><div class='del'>-</div><div class='del'>-	    # Create $newlib</div><div class='del'>-	    if test -f "$output_objdir/$newlib"; then :; else</div><div class='del'>-	      func_verbose "generating import library for \`$soname'"</div><div class='del'>-	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'</div><div class='del'>-	    fi</div><div class='del'>-	    # make sure the library variables are pointing to the new library</div><div class='del'>-	    dir=$output_objdir</div><div class='del'>-	    linklib=$newlib</div><div class='del'>-	  fi # test -n "$old_archive_from_expsyms_cmds"</div><div class='del'>-</div><div class='del'>-	  if test "$linkmode" = prog || test "$mode" != relink; then</div><div class='del'>-	    add_shlibpath=</div><div class='del'>-	    add_dir=</div><div class='del'>-	    add=</div><div class='del'>-	    lib_linked=yes</div><div class='del'>-	    case $hardcode_action in</div><div class='del'>-	    immediate | unsupported)</div><div class='del'>-	      if test "$hardcode_direct" = no; then</div><div class='del'>-		add="$dir/$linklib"</div><div class='del'>-		case $host in</div><div class='del'>-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;</div><div class='del'>-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;</div><div class='del'>-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \</div><div class='del'>-		    *-*-unixware7*) add_dir="-L$dir" ;;</div><div class='del'>-		  *-*-darwin* )</div><div class='del'>-		    # if the lib is a (non-dlopened) module then we can not</div><div class='del'>-		    # link against it, someone is ignoring the earlier warnings</div><div class='del'>-		    if /usr/bin/file -L $add 2&gt; /dev/null |</div><div class='del'>-			 $GREP ": [^:]* bundle" &gt;/dev/null ; then</div><div class='del'>-		      if test "X$dlopenmodule" != "X$lib"; then</div><div class='del'>-			$ECHO "*** Warning: lib $linklib is a module, not a shared library"</div><div class='del'>-			if test -z "$old_library" ; then</div><div class='del'>-			  $ECHO</div><div class='del'>-			  $ECHO "*** And there doesn't seem to be a static archive available"</div><div class='del'>-			  $ECHO "*** The link will probably fail, sorry"</div><div class='del'>-			else</div><div class='del'>-			  add="$dir/$old_library"</div><div class='del'>-			fi</div><div class='del'>-		      elif test -n "$old_library"; then</div><div class='del'>-			add="$dir/$old_library"</div><div class='del'>-		      fi</div><div class='del'>-		    fi</div><div class='del'>-		esac</div><div class='del'>-	      elif test "$hardcode_minus_L" = no; then</div><div class='del'>-		case $host in</div><div class='del'>-		*-*-sunos*) add_shlibpath="$dir" ;;</div><div class='del'>-		esac</div><div class='del'>-		add_dir="-L$dir"</div><div class='del'>-		add="-l$name"</div><div class='del'>-	      elif test "$hardcode_shlibpath_var" = no; then</div><div class='del'>-		add_shlibpath="$dir"</div><div class='del'>-		add="-l$name"</div><div class='del'>-	      else</div><div class='del'>-		lib_linked=no</div><div class='del'>-	      fi</div><div class='del'>-	      ;;</div><div class='del'>-	    relink)</div><div class='del'>-	      if test "$hardcode_direct" = yes &amp;&amp;</div><div class='del'>-	         test "$hardcode_direct_absolute" = no; then</div><div class='del'>-		add="$dir/$linklib"</div><div class='del'>-	      elif test "$hardcode_minus_L" = yes; then</div><div class='del'>-		add_dir="-L$dir"</div><div class='del'>-		# Try looking first in the location we're being installed to.</div><div class='del'>-		if test -n "$inst_prefix_dir"; then</div><div class='del'>-		  case $libdir in</div><div class='del'>-		    [\\/]*)</div><div class='del'>-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"</div><div class='del'>-		      ;;</div><div class='del'>-		  esac</div><div class='del'>-		fi</div><div class='del'>-		add="-l$name"</div><div class='del'>-	      elif test "$hardcode_shlibpath_var" = yes; then</div><div class='del'>-		add_shlibpath="$dir"</div><div class='del'>-		add="-l$name"</div><div class='del'>-	      else</div><div class='del'>-		lib_linked=no</div><div class='del'>-	      fi</div><div class='del'>-	      ;;</div><div class='del'>-	    *) lib_linked=no ;;</div><div class='del'>-	    esac</div><div class='del'>-</div><div class='del'>-	    if test "$lib_linked" != yes; then</div><div class='del'>-	      func_fatal_configuration "unsupported hardcode properties"</div><div class='del'>-	    fi</div><div class='del'>-</div><div class='del'>-	    if test -n "$add_shlibpath"; then</div><div class='del'>-	      case :$compile_shlibpath: in</div><div class='del'>-	      *":$add_shlibpath:"*) ;;</div><div class='del'>-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;</div><div class='del'>-	      esac</div><div class='del'>-	    fi</div><div class='del'>-	    if test "$linkmode" = prog; then</div><div class='del'>-	      test -n "$add_dir" &amp;&amp; compile_deplibs="$add_dir $compile_deplibs"</div><div class='del'>-	      test -n "$add" &amp;&amp; compile_deplibs="$add $compile_deplibs"</div><div class='del'>-	    else</div><div class='del'>-	      test -n "$add_dir" &amp;&amp; deplibs="$add_dir $deplibs"</div><div class='del'>-	      test -n "$add" &amp;&amp; deplibs="$add $deplibs"</div><div class='del'>-	      if test "$hardcode_direct" != yes &amp;&amp;</div><div class='del'>-		 test "$hardcode_minus_L" != yes &amp;&amp;</div><div class='del'>-		 test "$hardcode_shlibpath_var" = yes; then</div><div class='del'>-		case :$finalize_shlibpath: in</div><div class='del'>-		*":$libdir:"*) ;;</div><div class='del'>-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;</div><div class='del'>-		esac</div><div class='del'>-	      fi</div><div class='del'>-	    fi</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  if test "$linkmode" = prog || test "$mode" = relink; then</div><div class='del'>-	    add_shlibpath=</div><div class='del'>-	    add_dir=</div><div class='del'>-	    add=</div><div class='del'>-	    # Finalize command for both is simple: just hardcode it.</div><div class='del'>-	    if test "$hardcode_direct" = yes &amp;&amp;</div><div class='del'>-	       test "$hardcode_direct_absolute" = no; then</div><div class='del'>-	      add="$libdir/$linklib"</div><div class='del'>-	    elif test "$hardcode_minus_L" = yes; then</div><div class='del'>-	      add_dir="-L$libdir"</div><div class='del'>-	      add="-l$name"</div><div class='del'>-	    elif test "$hardcode_shlibpath_var" = yes; then</div><div class='del'>-	      case :$finalize_shlibpath: in</div><div class='del'>-	      *":$libdir:"*) ;;</div><div class='del'>-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;</div><div class='del'>-	      esac</div><div class='del'>-	      add="-l$name"</div><div class='del'>-	    elif test "$hardcode_automatic" = yes; then</div><div class='del'>-	      if test -n "$inst_prefix_dir" &amp;&amp;</div><div class='del'>-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then</div><div class='del'>-		add="$inst_prefix_dir$libdir/$linklib"</div><div class='del'>-	      else</div><div class='del'>-		add="$libdir/$linklib"</div><div class='del'>-	      fi</div><div class='del'>-	    else</div><div class='del'>-	      # We cannot seem to hardcode it, guess we'll fake it.</div><div class='del'>-	      add_dir="-L$libdir"</div><div class='del'>-	      # Try looking first in the location we're being installed to.</div><div class='del'>-	      if test -n "$inst_prefix_dir"; then</div><div class='del'>-		case $libdir in</div><div class='del'>-		  [\\/]*)</div><div class='del'>-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"</div><div class='del'>-		    ;;</div><div class='del'>-		esac</div><div class='del'>-	      fi</div><div class='del'>-	      add="-l$name"</div><div class='del'>-	    fi</div><div class='del'>-</div><div class='del'>-	    if test "$linkmode" = prog; then</div><div class='del'>-	      test -n "$add_dir" &amp;&amp; finalize_deplibs="$add_dir $finalize_deplibs"</div><div class='del'>-	      test -n "$add" &amp;&amp; finalize_deplibs="$add $finalize_deplibs"</div><div class='del'>-	    else</div><div class='del'>-	      test -n "$add_dir" &amp;&amp; deplibs="$add_dir $deplibs"</div><div class='del'>-	      test -n "$add" &amp;&amp; deplibs="$add $deplibs"</div><div class='del'>-	    fi</div><div class='del'>-	  fi</div><div class='del'>-	elif test "$linkmode" = prog; then</div><div class='del'>-	  # Here we assume that one of hardcode_direct or hardcode_minus_L</div><div class='del'>-	  # is not unsupported.  This is valid on all known static and</div><div class='del'>-	  # shared platforms.</div><div class='del'>-	  if test "$hardcode_direct" != unsupported; then</div><div class='del'>-	    test -n "$old_library" &amp;&amp; linklib="$old_library"</div><div class='del'>-	    compile_deplibs="$dir/$linklib $compile_deplibs"</div><div class='del'>-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"</div><div class='del'>-	  else</div><div class='del'>-	    compile_deplibs="-l$name -L$dir $compile_deplibs"</div><div class='del'>-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"</div><div class='del'>-	  fi</div><div class='del'>-	elif test "$build_libtool_libs" = yes; then</div><div class='del'>-	  # Not a shared library</div><div class='del'>-	  if test "$deplibs_check_method" != pass_all; then</div><div class='del'>-	    # We're trying link a shared library against a static one</div><div class='del'>-	    # but the system doesn't support it.</div><div class='del'>-</div><div class='del'>-	    # Just print a warning and add the library to dependency_libs so</div><div class='del'>-	    # that the program can be linked against the static library.</div><div class='del'>-	    $ECHO</div><div class='del'>-	    $ECHO "*** Warning: This system can not link to static lib archive $lib."</div><div class='del'>-	    $ECHO "*** I have the capability to make that library automatically link in when"</div><div class='del'>-	    $ECHO "*** you link to this library.  But I can only do this if you have a"</div><div class='del'>-	    $ECHO "*** shared version of the library, which you do not appear to have."</div><div class='del'>-	    if test "$module" = yes; then</div><div class='del'>-	      $ECHO "*** But as you try to build a module library, libtool will still create "</div><div class='del'>-	      $ECHO "*** a static module, that should work as long as the dlopening application"</div><div class='del'>-	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."</div><div class='del'>-	      if test -z "$global_symbol_pipe"; then</div><div class='del'>-		$ECHO</div><div class='del'>-		$ECHO "*** However, this would only work if libtool was able to extract symbol"</div><div class='del'>-		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"</div><div class='del'>-		$ECHO "*** not find such a program.  So, this module is probably useless."</div><div class='del'>-		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."</div><div class='del'>-	      fi</div><div class='del'>-	      if test "$build_old_libs" = no; then</div><div class='del'>-		build_libtool_libs=module</div><div class='del'>-		build_old_libs=yes</div><div class='del'>-	      else</div><div class='del'>-		build_libtool_libs=no</div><div class='del'>-	      fi</div><div class='del'>-	    fi</div><div class='del'>-	  else</div><div class='del'>-	    deplibs="$dir/$old_library $deplibs"</div><div class='del'>-	    link_static=yes</div><div class='del'>-	  fi</div><div class='del'>-	fi # link shared/static library?</div><div class='del'>-</div><div class='del'>-	if test "$linkmode" = lib; then</div><div class='del'>-	  if test -n "$dependency_libs" &amp;&amp;</div><div class='del'>-	     { test "$hardcode_into_libs" != yes ||</div><div class='del'>-	       test "$build_old_libs" = yes ||</div><div class='del'>-	       test "$link_static" = yes; }; then</div><div class='del'>-	    # Extract -R from dependency_libs</div><div class='del'>-	    temp_deplibs=</div><div class='del'>-	    for libdir in $dependency_libs; do</div><div class='del'>-	      case $libdir in</div><div class='del'>-	      -R*) func_stripname '-R' '' "$libdir"</div><div class='del'>-	           temp_xrpath=$func_stripname_result</div><div class='del'>-		   case " $xrpath " in</div><div class='del'>-		   *" $temp_xrpath "*) ;;</div><div class='del'>-		   *) xrpath="$xrpath $temp_xrpath";;</div><div class='del'>-		   esac;;</div><div class='del'>-	      *) temp_deplibs="$temp_deplibs $libdir";;</div><div class='del'>-	      esac</div><div class='del'>-	    done</div><div class='del'>-	    dependency_libs="$temp_deplibs"</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  newlib_search_path="$newlib_search_path $absdir"</div><div class='del'>-	  # Link against this library</div><div class='del'>-	  test "$link_static" = no &amp;&amp; newdependency_libs="$abs_ladir/$laname $newdependency_libs"</div><div class='del'>-	  # ... and its dependency_libs</div><div class='del'>-	  tmp_libs=</div><div class='del'>-	  for deplib in $dependency_libs; do</div><div class='del'>-	    newdependency_libs="$deplib $newdependency_libs"</div><div class='del'>-	    if $opt_duplicate_deps ; then</div><div class='del'>-	      case "$tmp_libs " in</div><div class='del'>-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;</div><div class='del'>-	      esac</div><div class='del'>-	    fi</div><div class='del'>-	    tmp_libs="$tmp_libs $deplib"</div><div class='del'>-	  done</div><div class='del'>-</div><div class='del'>-	  if test "$link_all_deplibs" != no; then</div><div class='del'>-	    # Add the search paths of all dependency libraries</div><div class='del'>-	    for deplib in $dependency_libs; do</div><div class='del'>-	      case $deplib in</div><div class='del'>-	      -L*) path="$deplib" ;;</div><div class='del'>-	      *.la)</div><div class='del'>-	        func_dirname "$deplib" "" "."</div><div class='del'>-		dir="$func_dirname_result"</div><div class='del'>-		# We need an absolute path.</div><div class='del'>-		case $dir in</div><div class='del'>-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;</div><div class='del'>-		*)</div><div class='del'>-		  absdir=`cd "$dir" &amp;&amp; pwd`</div><div class='del'>-		  if test -z "$absdir"; then</div><div class='del'>-		    func_warning "cannot determine absolute directory name of \`$dir'"</div><div class='del'>-		    absdir="$dir"</div><div class='del'>-		  fi</div><div class='del'>-		  ;;</div><div class='del'>-		esac</div><div class='del'>-		if $GREP "^installed=no" $deplib &gt; /dev/null; then</div><div class='del'>-		case $host in</div><div class='del'>-		*-*-darwin*)</div><div class='del'>-		  depdepl=</div><div class='del'>-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`</div><div class='del'>-		  if test -n "$deplibrary_names" ; then</div><div class='del'>-		    for tmp in $deplibrary_names ; do</div><div class='del'>-		      depdepl=$tmp</div><div class='del'>-		    done</div><div class='del'>-		    if test -f "$absdir/$objdir/$depdepl" ; then</div><div class='del'>-		      depdepl="$absdir/$objdir/$depdepl"</div><div class='del'>-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`</div><div class='del'>-                      if test -z "$darwin_install_name"; then</div><div class='del'>-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`</div><div class='del'>-                      fi</div><div class='del'>-		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"</div><div class='del'>-		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"</div><div class='del'>-		      path=</div><div class='del'>-		    fi</div><div class='del'>-		  fi</div><div class='del'>-		  ;;</div><div class='del'>-		*)</div><div class='del'>-		  path="-L$absdir/$objdir"</div><div class='del'>-		  ;;</div><div class='del'>-		esac</div><div class='del'>-		else</div><div class='del'>-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`</div><div class='del'>-		  test -z "$libdir" &amp;&amp; \</div><div class='del'>-		    func_fatal_error "\`$deplib' is not a valid libtool archive"</div><div class='del'>-		  test "$absdir" != "$libdir" &amp;&amp; \</div><div class='del'>-		    func_warning "\`$deplib' seems to be moved"</div><div class='del'>-</div><div class='del'>-		  path="-L$absdir"</div><div class='del'>-		fi</div><div class='del'>-		;;</div><div class='del'>-	      esac</div><div class='del'>-	      case " $deplibs " in</div><div class='del'>-	      *" $path "*) ;;</div><div class='del'>-	      *) deplibs="$path $deplibs" ;;</div><div class='del'>-	      esac</div><div class='del'>-	    done</div><div class='del'>-	  fi # link_all_deplibs != no</div><div class='del'>-	fi # linkmode = lib</div><div class='del'>-      done # for deplib in $libs</div><div class='del'>-      if test "$pass" = link; then</div><div class='del'>-	if test "$linkmode" = "prog"; then</div><div class='del'>-	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"</div><div class='del'>-	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"</div><div class='del'>-	else</div><div class='del'>-	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`</div><div class='del'>-	fi</div><div class='del'>-      fi</div><div class='del'>-      dependency_libs="$newdependency_libs"</div><div class='del'>-      if test "$pass" = dlpreopen; then</div><div class='del'>-	# Link the dlpreopened libraries before other libraries</div><div class='del'>-	for deplib in $save_deplibs; do</div><div class='del'>-	  deplibs="$deplib $deplibs"</div><div class='del'>-	done</div><div class='del'>-      fi</div><div class='del'>-      if test "$pass" != dlopen; then</div><div class='del'>-	if test "$pass" != conv; then</div><div class='del'>-	  # Make sure lib_search_path contains only unique directories.</div><div class='del'>-	  lib_search_path=</div><div class='del'>-	  for dir in $newlib_search_path; do</div><div class='del'>-	    case "$lib_search_path " in</div><div class='del'>-	    *" $dir "*) ;;</div><div class='del'>-	    *) lib_search_path="$lib_search_path $dir" ;;</div><div class='del'>-	    esac</div><div class='del'>-	  done</div><div class='del'>-	  newlib_search_path=</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	if test "$linkmode,$pass" != "prog,link"; then</div><div class='del'>-	  vars="deplibs"</div><div class='del'>-	else</div><div class='del'>-	  vars="compile_deplibs finalize_deplibs"</div><div class='del'>-	fi</div><div class='del'>-	for var in $vars dependency_libs; do</div><div class='del'>-	  # Add libraries to $var in reverse order</div><div class='del'>-	  eval tmp_libs=\"\$$var\"</div><div class='del'>-	  new_libs=</div><div class='del'>-	  for deplib in $tmp_libs; do</div><div class='del'>-	    # FIXME: Pedantically, this is the right thing to do, so</div><div class='del'>-	    #        that some nasty dependency loop isn't accidentally</div><div class='del'>-	    #        broken:</div><div class='del'>-	    #new_libs="$deplib $new_libs"</div><div class='del'>-	    # Pragmatically, this seems to cause very few problems in</div><div class='del'>-	    # practice:</div><div class='del'>-	    case $deplib in</div><div class='del'>-	    -L*) new_libs="$deplib $new_libs" ;;</div><div class='del'>-	    -R*) ;;</div><div class='del'>-	    *)</div><div class='del'>-	      # And here is the reason: when a library appears more</div><div class='del'>-	      # than once as an explicit dependence of a library, or</div><div class='del'>-	      # is implicitly linked in more than once by the</div><div class='del'>-	      # compiler, it is considered special, and multiple</div><div class='del'>-	      # occurrences thereof are not removed.  Compare this</div><div class='del'>-	      # with having the same library being listed as a</div><div class='del'>-	      # dependency of multiple other libraries: in this case,</div><div class='del'>-	      # we know (pedantically, we assume) the library does not</div><div class='del'>-	      # need to be listed more than once, so we keep only the</div><div class='del'>-	      # last copy.  This is not always right, but it is rare</div><div class='del'>-	      # enough that we require users that really mean to play</div><div class='del'>-	      # such unportable linking tricks to link the library</div><div class='del'>-	      # using -Wl,-lname, so that libtool does not consider it</div><div class='del'>-	      # for duplicate removal.</div><div class='del'>-	      case " $specialdeplibs " in</div><div class='del'>-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;</div><div class='del'>-	      *)</div><div class='del'>-		case " $new_libs " in</div><div class='del'>-		*" $deplib "*) ;;</div><div class='del'>-		*) new_libs="$deplib $new_libs" ;;</div><div class='del'>-		esac</div><div class='del'>-		;;</div><div class='del'>-	      esac</div><div class='del'>-	      ;;</div><div class='del'>-	    esac</div><div class='del'>-	  done</div><div class='del'>-	  tmp_libs=</div><div class='del'>-	  for deplib in $new_libs; do</div><div class='del'>-	    case $deplib in</div><div class='del'>-	    -L*)</div><div class='del'>-	      case " $tmp_libs " in</div><div class='del'>-	      *" $deplib "*) ;;</div><div class='del'>-	      *) tmp_libs="$tmp_libs $deplib" ;;</div><div class='del'>-	      esac</div><div class='del'>-	      ;;</div><div class='del'>-	    *) tmp_libs="$tmp_libs $deplib" ;;</div><div class='del'>-	    esac</div><div class='del'>-	  done</div><div class='del'>-	  eval $var=\"$tmp_libs\"</div><div class='del'>-	done # for var</div><div class='del'>-      fi</div><div class='del'>-      # Last step: remove runtime libs from dependency_libs</div><div class='del'>-      # (they stay in deplibs)</div><div class='del'>-      tmp_libs=</div><div class='del'>-      for i in $dependency_libs ; do</div><div class='del'>-	case " $predeps $postdeps $compiler_lib_search_path " in</div><div class='del'>-	*" $i "*)</div><div class='del'>-	  i=""</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	if test -n "$i" ; then</div><div class='del'>-	  tmp_libs="$tmp_libs $i"</div><div class='del'>-	fi</div><div class='del'>-      done</div><div class='del'>-      dependency_libs=$tmp_libs</div><div class='del'>-    done # for pass</div><div class='del'>-    if test "$linkmode" = prog; then</div><div class='del'>-      dlfiles="$newdlfiles"</div><div class='del'>-    fi</div><div class='del'>-    if test "$linkmode" = prog || test "$linkmode" = lib; then</div><div class='del'>-      dlprefiles="$newdlprefiles"</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    case $linkmode in</div><div class='del'>-    oldlib)</div><div class='del'>-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then</div><div class='del'>-	func_warning "\`-dlopen' is ignored for archives"</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      case " $deplibs" in</div><div class='del'>-      *\ -l* | *\ -L*)</div><div class='del'>-	func_warning "\`-l' and \`-L' are ignored for archives" ;;</div><div class='del'>-      esac</div><div class='del'>-</div><div class='del'>-      test -n "$rpath" &amp;&amp; \</div><div class='del'>-	func_warning "\`-rpath' is ignored for archives"</div><div class='del'>-</div><div class='del'>-      test -n "$xrpath" &amp;&amp; \</div><div class='del'>-	func_warning "\`-R' is ignored for archives"</div><div class='del'>-</div><div class='del'>-      test -n "$vinfo" &amp;&amp; \</div><div class='del'>-	func_warning "\`-version-info/-version-number' is ignored for archives"</div><div class='del'>-</div><div class='del'>-      test -n "$release" &amp;&amp; \</div><div class='del'>-	func_warning "\`-release' is ignored for archives"</div><div class='del'>-</div><div class='del'>-      test -n "$export_symbols$export_symbols_regex" &amp;&amp; \</div><div class='del'>-	func_warning "\`-export-symbols' is ignored for archives"</div><div class='del'>-</div><div class='del'>-      # Now set the variables for building old libraries.</div><div class='del'>-      build_libtool_libs=no</div><div class='del'>-      oldlibs="$output"</div><div class='del'>-      objs="$objs$old_deplibs"</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    lib)</div><div class='del'>-      # Make sure we only generate libraries of the form `libNAME.la'.</div><div class='del'>-      case $outputname in</div><div class='del'>-      lib*)</div><div class='del'>-	func_stripname 'lib' '.la' "$outputname"</div><div class='del'>-	name=$func_stripname_result</div><div class='del'>-	eval shared_ext=\"$shrext_cmds\"</div><div class='del'>-	eval libname=\"$libname_spec\"</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-	test "$module" = no &amp;&amp; \</div><div class='del'>-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"</div><div class='del'>-</div><div class='del'>-	if test "$need_lib_prefix" != no; then</div><div class='del'>-	  # Add the "lib" prefix for modules if required</div><div class='del'>-	  func_stripname '' '.la' "$outputname"</div><div class='del'>-	  name=$func_stripname_result</div><div class='del'>-	  eval shared_ext=\"$shrext_cmds\"</div><div class='del'>-	  eval libname=\"$libname_spec\"</div><div class='del'>-	else</div><div class='del'>-	  func_stripname '' '.la' "$outputname"</div><div class='del'>-	  libname=$func_stripname_result</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-</div><div class='del'>-      if test -n "$objs"; then</div><div class='del'>-	if test "$deplibs_check_method" != pass_all; then</div><div class='del'>-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"</div><div class='del'>-	else</div><div class='del'>-	  $ECHO</div><div class='del'>-	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"</div><div class='del'>-	  $ECHO "*** objects $objs is not portable!"</div><div class='del'>-	  libobjs="$libobjs $objs"</div><div class='del'>-	fi</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      test "$dlself" != no &amp;&amp; \</div><div class='del'>-	func_warning "\`-dlopen self' is ignored for libtool libraries"</div><div class='del'>-</div><div class='del'>-      set dummy $rpath</div><div class='del'>-      shift</div><div class='del'>-      test "$#" -gt 1 &amp;&amp; \</div><div class='del'>-	func_warning "ignoring multiple \`-rpath's for a libtool library"</div><div class='del'>-</div><div class='del'>-      install_libdir="$1"</div><div class='del'>-</div><div class='del'>-      oldlibs=</div><div class='del'>-      if test -z "$rpath"; then</div><div class='del'>-	if test "$build_libtool_libs" = yes; then</div><div class='del'>-	  # Building a libtool convenience library.</div><div class='del'>-	  # Some compilers have problems with a `.al' extension so</div><div class='del'>-	  # convenience libraries should have the same extension an</div><div class='del'>-	  # archive normally would.</div><div class='del'>-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"</div><div class='del'>-	  build_libtool_libs=convenience</div><div class='del'>-	  build_old_libs=yes</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	test -n "$vinfo" &amp;&amp; \</div><div class='del'>-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"</div><div class='del'>-</div><div class='del'>-	test -n "$release" &amp;&amp; \</div><div class='del'>-	  func_warning "\`-release' is ignored for convenience libraries"</div><div class='del'>-      else</div><div class='del'>-</div><div class='del'>-	# Parse the version information argument.</div><div class='del'>-	save_ifs="$IFS"; IFS=':'</div><div class='del'>-	set dummy $vinfo 0 0 0</div><div class='del'>-	shift</div><div class='del'>-	IFS="$save_ifs"</div><div class='del'>-</div><div class='del'>-	test -n "$7" &amp;&amp; \</div><div class='del'>-	  func_fatal_help "too many parameters to \`-version-info'"</div><div class='del'>-</div><div class='del'>-	# convert absolute version numbers to libtool ages</div><div class='del'>-	# this retains compatibility with .la files and attempts</div><div class='del'>-	# to make the code below a bit more comprehensible</div><div class='del'>-</div><div class='del'>-	case $vinfo_number in</div><div class='del'>-	yes)</div><div class='del'>-	  number_major="$1"</div><div class='del'>-	  number_minor="$2"</div><div class='del'>-	  number_revision="$3"</div><div class='del'>-	  #</div><div class='del'>-	  # There are really only two kinds -- those that</div><div class='del'>-	  # use the current revision as the major version</div><div class='del'>-	  # and those that subtract age and use age as</div><div class='del'>-	  # a minor version.  But, then there is irix</div><div class='del'>-	  # which has an extra 1 added just for fun</div><div class='del'>-	  #</div><div class='del'>-	  case $version_type in</div><div class='del'>-	  darwin|linux|osf|windows|none)</div><div class='del'>-	    func_arith $number_major + $number_minor</div><div class='del'>-	    current=$func_arith_result</div><div class='del'>-	    age="$number_minor"</div><div class='del'>-	    revision="$number_revision"</div><div class='del'>-	    ;;</div><div class='del'>-	  freebsd-aout|freebsd-elf|sunos)</div><div class='del'>-	    current="$number_major"</div><div class='del'>-	    revision="$number_minor"</div><div class='del'>-	    age="0"</div><div class='del'>-	    ;;</div><div class='del'>-	  irix|nonstopux)</div><div class='del'>-	    func_arith $number_major + $number_minor</div><div class='del'>-	    current=$func_arith_result</div><div class='del'>-	    age="$number_minor"</div><div class='del'>-	    revision="$number_minor"</div><div class='del'>-	    lt_irix_increment=no</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	  ;;</div><div class='del'>-	no)</div><div class='del'>-	  current="$1"</div><div class='del'>-	  revision="$2"</div><div class='del'>-	  age="$3"</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-</div><div class='del'>-	# Check that each of the things are valid numbers.</div><div class='del'>-	case $current in</div><div class='del'>-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;</div><div class='del'>-	*)</div><div class='del'>-	  func_error "CURRENT \`$current' must be a nonnegative integer"</div><div class='del'>-	  func_fatal_error "\`$vinfo' is not valid version information"</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-</div><div class='del'>-	case $revision in</div><div class='del'>-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;</div><div class='del'>-	*)</div><div class='del'>-	  func_error "REVISION \`$revision' must be a nonnegative integer"</div><div class='del'>-	  func_fatal_error "\`$vinfo' is not valid version information"</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-</div><div class='del'>-	case $age in</div><div class='del'>-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;</div><div class='del'>-	*)</div><div class='del'>-	  func_error "AGE \`$age' must be a nonnegative integer"</div><div class='del'>-	  func_fatal_error "\`$vinfo' is not valid version information"</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-</div><div class='del'>-	if test "$age" -gt "$current"; then</div><div class='del'>-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"</div><div class='del'>-	  func_fatal_error "\`$vinfo' is not valid version information"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# Calculate the version variables.</div><div class='del'>-	major=</div><div class='del'>-	versuffix=</div><div class='del'>-	verstring=</div><div class='del'>-	case $version_type in</div><div class='del'>-	none) ;;</div><div class='del'>-</div><div class='del'>-	darwin)</div><div class='del'>-	  # Like Linux, but with the current version available in</div><div class='del'>-	  # verstring for coding it into the library header</div><div class='del'>-	  func_arith $current - $age</div><div class='del'>-	  major=.$func_arith_result</div><div class='del'>-	  versuffix="$major.$age.$revision"</div><div class='del'>-	  # Darwin ld doesn't like 0 for these options...</div><div class='del'>-	  func_arith $current + 1</div><div class='del'>-	  minor_current=$func_arith_result</div><div class='del'>-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"</div><div class='del'>-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"</div><div class='del'>-	  ;;</div><div class='del'>-</div><div class='del'>-	freebsd-aout)</div><div class='del'>-	  major=".$current"</div><div class='del'>-	  versuffix=".$current.$revision";</div><div class='del'>-	  ;;</div><div class='del'>-</div><div class='del'>-	freebsd-elf)</div><div class='del'>-	  major=".$current"</div><div class='del'>-	  versuffix=".$current"</div><div class='del'>-	  ;;</div><div class='del'>-</div><div class='del'>-	irix | nonstopux)</div><div class='del'>-	  if test "X$lt_irix_increment" = "Xno"; then</div><div class='del'>-	    func_arith $current - $age</div><div class='del'>-	  else</div><div class='del'>-	    func_arith $current - $age + 1</div><div class='del'>-	  fi</div><div class='del'>-	  major=$func_arith_result</div><div class='del'>-</div><div class='del'>-	  case $version_type in</div><div class='del'>-	    nonstopux) verstring_prefix=nonstopux ;;</div><div class='del'>-	    *)         verstring_prefix=sgi ;;</div><div class='del'>-	  esac</div><div class='del'>-	  verstring="$verstring_prefix$major.$revision"</div><div class='del'>-</div><div class='del'>-	  # Add in all the interfaces that we are compatible with.</div><div class='del'>-	  loop=$revision</div><div class='del'>-	  while test "$loop" -ne 0; do</div><div class='del'>-	    func_arith $revision - $loop</div><div class='del'>-	    iface=$func_arith_result</div><div class='del'>-	    func_arith $loop - 1</div><div class='del'>-	    loop=$func_arith_result</div><div class='del'>-	    verstring="$verstring_prefix$major.$iface:$verstring"</div><div class='del'>-	  done</div><div class='del'>-</div><div class='del'>-	  # Before this point, $major must not contain `.'.</div><div class='del'>-	  major=.$major</div><div class='del'>-	  versuffix="$major.$revision"</div><div class='del'>-	  ;;</div><div class='del'>-</div><div class='del'>-	linux)</div><div class='del'>-	  func_arith $current - $age</div><div class='del'>-	  major=.$func_arith_result</div><div class='del'>-	  versuffix="$major.$age.$revision"</div><div class='del'>-	  ;;</div><div class='del'>-</div><div class='del'>-	osf)</div><div class='del'>-	  func_arith $current - $age</div><div class='del'>-	  major=.$func_arith_result</div><div class='del'>-	  versuffix=".$current.$age.$revision"</div><div class='del'>-	  verstring="$current.$age.$revision"</div><div class='del'>-</div><div class='del'>-	  # Add in all the interfaces that we are compatible with.</div><div class='del'>-	  loop=$age</div><div class='del'>-	  while test "$loop" -ne 0; do</div><div class='del'>-	    func_arith $current - $loop</div><div class='del'>-	    iface=$func_arith_result</div><div class='del'>-	    func_arith $loop - 1</div><div class='del'>-	    loop=$func_arith_result</div><div class='del'>-	    verstring="$verstring:${iface}.0"</div><div class='del'>-	  done</div><div class='del'>-</div><div class='del'>-	  # Make executables depend on our current version.</div><div class='del'>-	  verstring="$verstring:${current}.0"</div><div class='del'>-	  ;;</div><div class='del'>-</div><div class='del'>-	qnx)</div><div class='del'>-	  major=".$current"</div><div class='del'>-	  versuffix=".$current"</div><div class='del'>-	  ;;</div><div class='del'>-</div><div class='del'>-	sunos)</div><div class='del'>-	  major=".$current"</div><div class='del'>-	  versuffix=".$current.$revision"</div><div class='del'>-	  ;;</div><div class='del'>-</div><div class='del'>-	windows)</div><div class='del'>-	  # Use '-' rather than '.', since we only want one</div><div class='del'>-	  # extension on DOS 8.3 filesystems.</div><div class='del'>-	  func_arith $current - $age</div><div class='del'>-	  major=$func_arith_result</div><div class='del'>-	  versuffix="-$major"</div><div class='del'>-	  ;;</div><div class='del'>-</div><div class='del'>-	*)</div><div class='del'>-	  func_fatal_configuration "unknown library version type \`$version_type'"</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-</div><div class='del'>-	# Clear the version info if we defaulted, and they specified a release.</div><div class='del'>-	if test -z "$vinfo" &amp;&amp; test -n "$release"; then</div><div class='del'>-	  major=</div><div class='del'>-	  case $version_type in</div><div class='del'>-	  darwin)</div><div class='del'>-	    # we can't check for "0.0" in archive_cmds due to quoting</div><div class='del'>-	    # problems, so we reset it completely</div><div class='del'>-	    verstring=</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    verstring="0.0"</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	  if test "$need_version" = no; then</div><div class='del'>-	    versuffix=</div><div class='del'>-	  else</div><div class='del'>-	    versuffix=".0.0"</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# Remove version info from name if versioning should be avoided</div><div class='del'>-	if test "$avoid_version" = yes &amp;&amp; test "$need_version" = no; then</div><div class='del'>-	  major=</div><div class='del'>-	  versuffix=</div><div class='del'>-	  verstring=""</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# Check to see if the archive will have undefined symbols.</div><div class='del'>-	if test "$allow_undefined" = yes; then</div><div class='del'>-	  if test "$allow_undefined_flag" = unsupported; then</div><div class='del'>-	    func_warning "undefined symbols not allowed in $host shared libraries"</div><div class='del'>-	    build_libtool_libs=no</div><div class='del'>-	    build_old_libs=yes</div><div class='del'>-	  fi</div><div class='del'>-	else</div><div class='del'>-	  # Don't allow undefined symbols.</div><div class='del'>-	  allow_undefined_flag="$no_undefined_flag"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      func_generate_dlsyms "$libname" "$libname" "yes"</div><div class='del'>-      libobjs="$libobjs $symfileobj"</div><div class='del'>-      test "X$libobjs" = "X " &amp;&amp; libobjs=</div><div class='del'>-</div><div class='del'>-      if test "$mode" != relink; then</div><div class='del'>-	# Remove our outputs, but don't remove object files since they</div><div class='del'>-	# may have been created when compiling PIC objects.</div><div class='del'>-	removelist=</div><div class='del'>-	tempremovelist=`$ECHO "$output_objdir/*"`</div><div class='del'>-	for p in $tempremovelist; do</div><div class='del'>-	  case $p in</div><div class='del'>-	    *.$objext | *.gcno)</div><div class='del'>-	       ;;</div><div class='del'>-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)</div><div class='del'>-	       if test "X$precious_files_regex" != "X"; then</div><div class='del'>-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" &gt;/dev/null 2&gt;&amp;1</div><div class='del'>-		 then</div><div class='del'>-		   continue</div><div class='del'>-		 fi</div><div class='del'>-	       fi</div><div class='del'>-	       removelist="$removelist $p"</div><div class='del'>-	       ;;</div><div class='del'>-	    *) ;;</div><div class='del'>-	  esac</div><div class='del'>-	done</div><div class='del'>-	test -n "$removelist" &amp;&amp; \</div><div class='del'>-	  func_show_eval "${RM}r \$removelist"</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Now set the variables for building old libraries.</div><div class='del'>-      if test "$build_old_libs" = yes &amp;&amp; test "$build_libtool_libs" != convenience ; then</div><div class='del'>-	oldlibs="$oldlibs $output_objdir/$libname.$libext"</div><div class='del'>-</div><div class='del'>-	# Transform .lo files to .o files.</div><div class='del'>-	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Eliminate all temporary directories.</div><div class='del'>-      #for path in $notinst_path; do</div><div class='del'>-      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`</div><div class='del'>-      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`</div><div class='del'>-      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`</div><div class='del'>-      #done</div><div class='del'>-</div><div class='del'>-      if test -n "$xrpath"; then</div><div class='del'>-	# If the user specified any rpath flags, then add them.</div><div class='del'>-	temp_xrpath=</div><div class='del'>-	for libdir in $xrpath; do</div><div class='del'>-	  temp_xrpath="$temp_xrpath -R$libdir"</div><div class='del'>-	  case "$finalize_rpath " in</div><div class='del'>-	  *" $libdir "*) ;;</div><div class='del'>-	  *) finalize_rpath="$finalize_rpath $libdir" ;;</div><div class='del'>-	  esac</div><div class='del'>-	done</div><div class='del'>-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then</div><div class='del'>-	  dependency_libs="$temp_xrpath $dependency_libs"</div><div class='del'>-	fi</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Make sure dlfiles contains only unique files that won't be dlpreopened</div><div class='del'>-      old_dlfiles="$dlfiles"</div><div class='del'>-      dlfiles=</div><div class='del'>-      for lib in $old_dlfiles; do</div><div class='del'>-	case " $dlprefiles $dlfiles " in</div><div class='del'>-	*" $lib "*) ;;</div><div class='del'>-	*) dlfiles="$dlfiles $lib" ;;</div><div class='del'>-	esac</div><div class='del'>-      done</div><div class='del'>-</div><div class='del'>-      # Make sure dlprefiles contains only unique files</div><div class='del'>-      old_dlprefiles="$dlprefiles"</div><div class='del'>-      dlprefiles=</div><div class='del'>-      for lib in $old_dlprefiles; do</div><div class='del'>-	case "$dlprefiles " in</div><div class='del'>-	*" $lib "*) ;;</div><div class='del'>-	*) dlprefiles="$dlprefiles $lib" ;;</div><div class='del'>-	esac</div><div class='del'>-      done</div><div class='del'>-</div><div class='del'>-      if test "$build_libtool_libs" = yes; then</div><div class='del'>-	if test -n "$rpath"; then</div><div class='del'>-	  case $host in</div><div class='del'>-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)</div><div class='del'>-	    # these systems don't actually have a c library (as such)!</div><div class='del'>-	    ;;</div><div class='del'>-	  *-*-rhapsody* | *-*-darwin1.[012])</div><div class='del'>-	    # Rhapsody C library is in the System framework</div><div class='del'>-	    deplibs="$deplibs System.ltframework"</div><div class='del'>-	    ;;</div><div class='del'>-	  *-*-netbsd*)</div><div class='del'>-	    # Don't link with libc until the a.out ld.so is fixed.</div><div class='del'>-	    ;;</div><div class='del'>-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)</div><div class='del'>-	    # Do not include libc due to us having libc/libc_r.</div><div class='del'>-	    ;;</div><div class='del'>-	  *-*-sco3.2v5* | *-*-sco5v6*)</div><div class='del'>-	    # Causes problems with __ctype</div><div class='del'>-	    ;;</div><div class='del'>-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)</div><div class='del'>-	    # Compiler inserts libc in the correct place for threads to work</div><div class='del'>-	    ;;</div><div class='del'>-	  *)</div><div class='del'>-	    # Add libc to deplibs on all other systems if necessary.</div><div class='del'>-	    if test "$build_libtool_need_lc" = "yes"; then</div><div class='del'>-	      deplibs="$deplibs -lc"</div><div class='del'>-	    fi</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# Transform deplibs into only deplibs that can be linked in shared.</div><div class='del'>-	name_save=$name</div><div class='del'>-	libname_save=$libname</div><div class='del'>-	release_save=$release</div><div class='del'>-	versuffix_save=$versuffix</div><div class='del'>-	major_save=$major</div><div class='del'>-	# I'm not sure if I'm treating the release correctly.  I think</div><div class='del'>-	# release should show up in the -l (ie -lgmp5) so we don't want to</div><div class='del'>-	# add it in twice.  Is that correct?</div><div class='del'>-	release=""</div><div class='del'>-	versuffix=""</div><div class='del'>-	major=""</div><div class='del'>-	newdeplibs=</div><div class='del'>-	droppeddeps=no</div><div class='del'>-	case $deplibs_check_method in</div><div class='del'>-	pass_all)</div><div class='del'>-	  # Don't check for shared/static.  Everything works.</div><div class='del'>-	  # This might be a little naive.  We might want to check</div><div class='del'>-	  # whether the library exists or not.  But this is on</div><div class='del'>-	  # osf3 &amp; osf4 and I'm not really sure... Just</div><div class='del'>-	  # implementing what was already the behavior.</div><div class='del'>-	  newdeplibs=$deplibs</div><div class='del'>-	  ;;</div><div class='del'>-	test_compile)</div><div class='del'>-	  # This code stresses the "libraries are programs" paradigm to its</div><div class='del'>-	  # limits. Maybe even breaks it.  We compile a program, linking it</div><div class='del'>-	  # against the deplibs as a proxy for the library.  Then we can check</div><div class='del'>-	  # whether they linked in statically or dynamically with ldd.</div><div class='del'>-	  $opt_dry_run || $RM conftest.c</div><div class='del'>-	  cat &gt; conftest.c &lt;&lt;EOF</div><div class='del'>-	  int main() { return 0; }</div><div class='del'>-EOF</div><div class='del'>-	  $opt_dry_run || $RM conftest</div><div class='del'>-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then</div><div class='del'>-	    ldd_output=`ldd conftest`</div><div class='del'>-	    for i in $deplibs; do</div><div class='del'>-	      case $i in</div><div class='del'>-	      -l*)</div><div class='del'>-		func_stripname -l '' "$i"</div><div class='del'>-		name=$func_stripname_result</div><div class='del'>-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then</div><div class='del'>-		  case " $predeps $postdeps " in</div><div class='del'>-		  *" $i "*)</div><div class='del'>-		    newdeplibs="$newdeplibs $i"</div><div class='del'>-		    i=""</div><div class='del'>-		    ;;</div><div class='del'>-		  esac</div><div class='del'>-		fi</div><div class='del'>-		if test -n "$i" ; then</div><div class='del'>-		  libname=`eval "\\$ECHO \"$libname_spec\""`</div><div class='del'>-		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`</div><div class='del'>-		  set dummy $deplib_matches; shift</div><div class='del'>-		  deplib_match=$1</div><div class='del'>-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then</div><div class='del'>-		    newdeplibs="$newdeplibs $i"</div><div class='del'>-		  else</div><div class='del'>-		    droppeddeps=yes</div><div class='del'>-		    $ECHO</div><div class='del'>-		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."</div><div class='del'>-		    $ECHO "*** I have the capability to make that library automatically link in when"</div><div class='del'>-		    $ECHO "*** you link to this library.  But I can only do this if you have a"</div><div class='del'>-		    $ECHO "*** shared version of the library, which I believe you do not have"</div><div class='del'>-		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"</div><div class='del'>-		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."</div><div class='del'>-		  fi</div><div class='del'>-		fi</div><div class='del'>-		;;</div><div class='del'>-	      *)</div><div class='del'>-		newdeplibs="$newdeplibs $i"</div><div class='del'>-		;;</div><div class='del'>-	      esac</div><div class='del'>-	    done</div><div class='del'>-	  else</div><div class='del'>-	    # Error occurred in the first compile.  Let's try to salvage</div><div class='del'>-	    # the situation: Compile a separate program for each library.</div><div class='del'>-	    for i in $deplibs; do</div><div class='del'>-	      case $i in</div><div class='del'>-	      -l*)</div><div class='del'>-		func_stripname -l '' "$i"</div><div class='del'>-		name=$func_stripname_result</div><div class='del'>-		$opt_dry_run || $RM conftest</div><div class='del'>-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then</div><div class='del'>-		  ldd_output=`ldd conftest`</div><div class='del'>-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then</div><div class='del'>-		    case " $predeps $postdeps " in</div><div class='del'>-		    *" $i "*)</div><div class='del'>-		      newdeplibs="$newdeplibs $i"</div><div class='del'>-		      i=""</div><div class='del'>-		      ;;</div><div class='del'>-		    esac</div><div class='del'>-		  fi</div><div class='del'>-		  if test -n "$i" ; then</div><div class='del'>-		    libname=`eval "\\$ECHO \"$libname_spec\""`</div><div class='del'>-		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`</div><div class='del'>-		    set dummy $deplib_matches; shift</div><div class='del'>-		    deplib_match=$1</div><div class='del'>-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then</div><div class='del'>-		      newdeplibs="$newdeplibs $i"</div><div class='del'>-		    else</div><div class='del'>-		      droppeddeps=yes</div><div class='del'>-		      $ECHO</div><div class='del'>-		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."</div><div class='del'>-		      $ECHO "*** I have the capability to make that library automatically link in when"</div><div class='del'>-		      $ECHO "*** you link to this library.  But I can only do this if you have a"</div><div class='del'>-		      $ECHO "*** shared version of the library, which you do not appear to have"</div><div class='del'>-		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"</div><div class='del'>-		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."</div><div class='del'>-		    fi</div><div class='del'>-		  fi</div><div class='del'>-		else</div><div class='del'>-		  droppeddeps=yes</div><div class='del'>-		  $ECHO</div><div class='del'>-		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"</div><div class='del'>-		  $ECHO "*** make it link in!  You will probably need to install it or some"</div><div class='del'>-		  $ECHO "*** library that it depends on before this library will be fully"</div><div class='del'>-		  $ECHO "*** functional.  Installing it before continuing would be even better."</div><div class='del'>-		fi</div><div class='del'>-		;;</div><div class='del'>-	      *)</div><div class='del'>-		newdeplibs="$newdeplibs $i"</div><div class='del'>-		;;</div><div class='del'>-	      esac</div><div class='del'>-	    done</div><div class='del'>-	  fi</div><div class='del'>-	  ;;</div><div class='del'>-	file_magic*)</div><div class='del'>-	  set dummy $deplibs_check_method; shift</div><div class='del'>-	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`</div><div class='del'>-	  for a_deplib in $deplibs; do</div><div class='del'>-	    case $a_deplib in</div><div class='del'>-	    -l*)</div><div class='del'>-	      func_stripname -l '' "$a_deplib"</div><div class='del'>-	      name=$func_stripname_result</div><div class='del'>-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then</div><div class='del'>-		case " $predeps $postdeps " in</div><div class='del'>-		*" $a_deplib "*)</div><div class='del'>-		  newdeplibs="$newdeplibs $a_deplib"</div><div class='del'>-		  a_deplib=""</div><div class='del'>-		  ;;</div><div class='del'>-		esac</div><div class='del'>-	      fi</div><div class='del'>-	      if test -n "$a_deplib" ; then</div><div class='del'>-		libname=`eval "\\$ECHO \"$libname_spec\""`</div><div class='del'>-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do</div><div class='del'>-		  potential_libs=`ls $i/$libname[.-]* 2&gt;/dev/null`</div><div class='del'>-		  for potent_lib in $potential_libs; do</div><div class='del'>-		      # Follow soft links.</div><div class='del'>-		      if ls -lLd "$potent_lib" 2&gt;/dev/null |</div><div class='del'>-			 $GREP " -&gt; " &gt;/dev/null; then</div><div class='del'>-			continue</div><div class='del'>-		      fi</div><div class='del'>-		      # The statement above tries to avoid entering an</div><div class='del'>-		      # endless loop below, in case of cyclic links.</div><div class='del'>-		      # We might still enter an endless loop, since a link</div><div class='del'>-		      # loop can be closed while we follow links,</div><div class='del'>-		      # but so what?</div><div class='del'>-		      potlib="$potent_lib"</div><div class='del'>-		      while test -h "$potlib" 2&gt;/dev/null; do</div><div class='del'>-			potliblink=`ls -ld $potlib | ${SED} 's/.* -&gt; //'`</div><div class='del'>-			case $potliblink in</div><div class='del'>-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;</div><div class='del'>-			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;</div><div class='del'>-			esac</div><div class='del'>-		      done</div><div class='del'>-		      if eval $file_magic_cmd \"\$potlib\" 2&gt;/dev/null |</div><div class='del'>-			 $SED -e 10q |</div><div class='del'>-			 $EGREP "$file_magic_regex" &gt; /dev/null; then</div><div class='del'>-			newdeplibs="$newdeplibs $a_deplib"</div><div class='del'>-			a_deplib=""</div><div class='del'>-			break 2</div><div class='del'>-		      fi</div><div class='del'>-		  done</div><div class='del'>-		done</div><div class='del'>-	      fi</div><div class='del'>-	      if test -n "$a_deplib" ; then</div><div class='del'>-		droppeddeps=yes</div><div class='del'>-		$ECHO</div><div class='del'>-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."</div><div class='del'>-		$ECHO "*** I have the capability to make that library automatically link in when"</div><div class='del'>-		$ECHO "*** you link to this library.  But I can only do this if you have a"</div><div class='del'>-		$ECHO "*** shared version of the library, which you do not appear to have"</div><div class='del'>-		$ECHO "*** because I did check the linker path looking for a file starting"</div><div class='del'>-		if test -z "$potlib" ; then</div><div class='del'>-		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"</div><div class='del'>-		else</div><div class='del'>-		  $ECHO "*** with $libname and none of the candidates passed a file format test"</div><div class='del'>-		  $ECHO "*** using a file magic. Last file checked: $potlib"</div><div class='del'>-		fi</div><div class='del'>-	      fi</div><div class='del'>-	      ;;</div><div class='del'>-	    *)</div><div class='del'>-	      # Add a -L argument.</div><div class='del'>-	      newdeplibs="$newdeplibs $a_deplib"</div><div class='del'>-	      ;;</div><div class='del'>-	    esac</div><div class='del'>-	  done # Gone through all deplibs.</div><div class='del'>-	  ;;</div><div class='del'>-	match_pattern*)</div><div class='del'>-	  set dummy $deplibs_check_method; shift</div><div class='del'>-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`</div><div class='del'>-	  for a_deplib in $deplibs; do</div><div class='del'>-	    case $a_deplib in</div><div class='del'>-	    -l*)</div><div class='del'>-	      func_stripname -l '' "$a_deplib"</div><div class='del'>-	      name=$func_stripname_result</div><div class='del'>-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then</div><div class='del'>-		case " $predeps $postdeps " in</div><div class='del'>-		*" $a_deplib "*)</div><div class='del'>-		  newdeplibs="$newdeplibs $a_deplib"</div><div class='del'>-		  a_deplib=""</div><div class='del'>-		  ;;</div><div class='del'>-		esac</div><div class='del'>-	      fi</div><div class='del'>-	      if test -n "$a_deplib" ; then</div><div class='del'>-		libname=`eval "\\$ECHO \"$libname_spec\""`</div><div class='del'>-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do</div><div class='del'>-		  potential_libs=`ls $i/$libname[.-]* 2&gt;/dev/null`</div><div class='del'>-		  for potent_lib in $potential_libs; do</div><div class='del'>-		    potlib="$potent_lib" # see symlink-check above in file_magic test</div><div class='del'>-		    if eval "\$ECHO \"X$potent_lib\"" 2&gt;/dev/null | $Xsed -e 10q | \</div><div class='del'>-		       $EGREP "$match_pattern_regex" &gt; /dev/null; then</div><div class='del'>-		      newdeplibs="$newdeplibs $a_deplib"</div><div class='del'>-		      a_deplib=""</div><div class='del'>-		      break 2</div><div class='del'>-		    fi</div><div class='del'>-		  done</div><div class='del'>-		done</div><div class='del'>-	      fi</div><div class='del'>-	      if test -n "$a_deplib" ; then</div><div class='del'>-		droppeddeps=yes</div><div class='del'>-		$ECHO</div><div class='del'>-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."</div><div class='del'>-		$ECHO "*** I have the capability to make that library automatically link in when"</div><div class='del'>-		$ECHO "*** you link to this library.  But I can only do this if you have a"</div><div class='del'>-		$ECHO "*** shared version of the library, which you do not appear to have"</div><div class='del'>-		$ECHO "*** because I did check the linker path looking for a file starting"</div><div class='del'>-		if test -z "$potlib" ; then</div><div class='del'>-		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"</div><div class='del'>-		else</div><div class='del'>-		  $ECHO "*** with $libname and none of the candidates passed a file format test"</div><div class='del'>-		  $ECHO "*** using a regex pattern. Last file checked: $potlib"</div><div class='del'>-		fi</div><div class='del'>-	      fi</div><div class='del'>-	      ;;</div><div class='del'>-	    *)</div><div class='del'>-	      # Add a -L argument.</div><div class='del'>-	      newdeplibs="$newdeplibs $a_deplib"</div><div class='del'>-	      ;;</div><div class='del'>-	    esac</div><div class='del'>-	  done # Gone through all deplibs.</div><div class='del'>-	  ;;</div><div class='del'>-	none | unknown | *)</div><div class='del'>-	  newdeplibs=""</div><div class='del'>-	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \</div><div class='del'>-	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`</div><div class='del'>-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then</div><div class='del'>-	    for i in $predeps $postdeps ; do</div><div class='del'>-	      # can't use Xsed below, because $i might contain '/'</div><div class='del'>-	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`</div><div class='del'>-	    done</div><div class='del'>-	  fi</div><div class='del'>-	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |</div><div class='del'>-	     $GREP . &gt;/dev/null; then</div><div class='del'>-	    $ECHO</div><div class='del'>-	    if test "X$deplibs_check_method" = "Xnone"; then</div><div class='del'>-	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."</div><div class='del'>-	    else</div><div class='del'>-	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."</div><div class='del'>-	    fi</div><div class='del'>-	    $ECHO "*** All declared inter-library dependencies are being dropped."</div><div class='del'>-	    droppeddeps=yes</div><div class='del'>-	  fi</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-	versuffix=$versuffix_save</div><div class='del'>-	major=$major_save</div><div class='del'>-	release=$release_save</div><div class='del'>-	libname=$libname_save</div><div class='del'>-	name=$name_save</div><div class='del'>-</div><div class='del'>-	case $host in</div><div class='del'>-	*-*-rhapsody* | *-*-darwin1.[012])</div><div class='del'>-	  # On Rhapsody replace the C library with the System framework</div><div class='del'>-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-</div><div class='del'>-	if test "$droppeddeps" = yes; then</div><div class='del'>-	  if test "$module" = yes; then</div><div class='del'>-	    $ECHO</div><div class='del'>-	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"</div><div class='del'>-	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"</div><div class='del'>-	    $ECHO "*** a static module, that should work as long as the dlopening"</div><div class='del'>-	    $ECHO "*** application is linked with the -dlopen flag."</div><div class='del'>-	    if test -z "$global_symbol_pipe"; then</div><div class='del'>-	      $ECHO</div><div class='del'>-	      $ECHO "*** However, this would only work if libtool was able to extract symbol"</div><div class='del'>-	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"</div><div class='del'>-	      $ECHO "*** not find such a program.  So, this module is probably useless."</div><div class='del'>-	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."</div><div class='del'>-	    fi</div><div class='del'>-	    if test "$build_old_libs" = no; then</div><div class='del'>-	      oldlibs="$output_objdir/$libname.$libext"</div><div class='del'>-	      build_libtool_libs=module</div><div class='del'>-	      build_old_libs=yes</div><div class='del'>-	    else</div><div class='del'>-	      build_libtool_libs=no</div><div class='del'>-	    fi</div><div class='del'>-	  else</div><div class='del'>-	    $ECHO "*** The inter-library dependencies that have been dropped here will be"</div><div class='del'>-	    $ECHO "*** automatically added whenever a program is linked with this library"</div><div class='del'>-	    $ECHO "*** or is declared to -dlopen it."</div><div class='del'>-</div><div class='del'>-	    if test "$allow_undefined" = no; then</div><div class='del'>-	      $ECHO</div><div class='del'>-	      $ECHO "*** Since this library must not contain undefined symbols,"</div><div class='del'>-	      $ECHO "*** because either the platform does not support them or"</div><div class='del'>-	      $ECHO "*** it was explicitly requested with -no-undefined,"</div><div class='del'>-	      $ECHO "*** libtool will only create a static version of it."</div><div class='del'>-	      if test "$build_old_libs" = no; then</div><div class='del'>-		oldlibs="$output_objdir/$libname.$libext"</div><div class='del'>-		build_libtool_libs=module</div><div class='del'>-		build_old_libs=yes</div><div class='del'>-	      else</div><div class='del'>-		build_libtool_libs=no</div><div class='del'>-	      fi</div><div class='del'>-	    fi</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-	# Done checking deplibs!</div><div class='del'>-	deplibs=$newdeplibs</div><div class='del'>-      fi</div><div class='del'>-      # Time to change all our "foo.ltframework" stuff back to "-framework foo"</div><div class='del'>-      case $host in</div><div class='del'>-	*-*-darwin*)</div><div class='del'>-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`</div><div class='del'>-	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`</div><div class='del'>-	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`</div><div class='del'>-	  ;;</div><div class='del'>-      esac</div><div class='del'>-</div><div class='del'>-      # move library search paths that coincide with paths to not yet</div><div class='del'>-      # installed libraries to the beginning of the library search list</div><div class='del'>-      new_libs=</div><div class='del'>-      for path in $notinst_path; do</div><div class='del'>-	case " $new_libs " in</div><div class='del'>-	*" -L$path/$objdir "*) ;;</div><div class='del'>-	*)</div><div class='del'>-	  case " $deplibs " in</div><div class='del'>-	  *" -L$path/$objdir "*)</div><div class='del'>-	    new_libs="$new_libs -L$path/$objdir" ;;</div><div class='del'>-	  esac</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      done</div><div class='del'>-      for deplib in $deplibs; do</div><div class='del'>-	case $deplib in</div><div class='del'>-	-L*)</div><div class='del'>-	  case " $new_libs " in</div><div class='del'>-	  *" $deplib "*) ;;</div><div class='del'>-	  *) new_libs="$new_libs $deplib" ;;</div><div class='del'>-	  esac</div><div class='del'>-	  ;;</div><div class='del'>-	*) new_libs="$new_libs $deplib" ;;</div><div class='del'>-	esac</div><div class='del'>-      done</div><div class='del'>-      deplibs="$new_libs"</div><div class='del'>-</div><div class='del'>-      # All the library-specific variables (install_libdir is set above).</div><div class='del'>-      library_names=</div><div class='del'>-      old_library=</div><div class='del'>-      dlname=</div><div class='del'>-</div><div class='del'>-      # Test again, we may have decided not to build it any more</div><div class='del'>-      if test "$build_libtool_libs" = yes; then</div><div class='del'>-	if test "$hardcode_into_libs" = yes; then</div><div class='del'>-	  # Hardcode the library paths</div><div class='del'>-	  hardcode_libdirs=</div><div class='del'>-	  dep_rpath=</div><div class='del'>-	  rpath="$finalize_rpath"</div><div class='del'>-	  test "$mode" != relink &amp;&amp; rpath="$compile_rpath$rpath"</div><div class='del'>-	  for libdir in $rpath; do</div><div class='del'>-	    if test -n "$hardcode_libdir_flag_spec"; then</div><div class='del'>-	      if test -n "$hardcode_libdir_separator"; then</div><div class='del'>-		if test -z "$hardcode_libdirs"; then</div><div class='del'>-		  hardcode_libdirs="$libdir"</div><div class='del'>-		else</div><div class='del'>-		  # Just accumulate the unique libdirs.</div><div class='del'>-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in</div><div class='del'>-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)</div><div class='del'>-		    ;;</div><div class='del'>-		  *)</div><div class='del'>-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"</div><div class='del'>-		    ;;</div><div class='del'>-		  esac</div><div class='del'>-		fi</div><div class='del'>-	      else</div><div class='del'>-		eval flag=\"$hardcode_libdir_flag_spec\"</div><div class='del'>-		dep_rpath="$dep_rpath $flag"</div><div class='del'>-	      fi</div><div class='del'>-	    elif test -n "$runpath_var"; then</div><div class='del'>-	      case "$perm_rpath " in</div><div class='del'>-	      *" $libdir "*) ;;</div><div class='del'>-	      *) perm_rpath="$perm_rpath $libdir" ;;</div><div class='del'>-	      esac</div><div class='del'>-	    fi</div><div class='del'>-	  done</div><div class='del'>-	  # Substitute the hardcoded libdirs into the rpath.</div><div class='del'>-	  if test -n "$hardcode_libdir_separator" &amp;&amp;</div><div class='del'>-	     test -n "$hardcode_libdirs"; then</div><div class='del'>-	    libdir="$hardcode_libdirs"</div><div class='del'>-	    if test -n "$hardcode_libdir_flag_spec_ld"; then</div><div class='del'>-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"</div><div class='del'>-	    else</div><div class='del'>-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"</div><div class='del'>-	    fi</div><div class='del'>-	  fi</div><div class='del'>-	  if test -n "$runpath_var" &amp;&amp; test -n "$perm_rpath"; then</div><div class='del'>-	    # We should set the runpath_var.</div><div class='del'>-	    rpath=</div><div class='del'>-	    for dir in $perm_rpath; do</div><div class='del'>-	      rpath="$rpath$dir:"</div><div class='del'>-	    done</div><div class='del'>-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"</div><div class='del'>-	  fi</div><div class='del'>-	  test -n "$dep_rpath" &amp;&amp; deplibs="$dep_rpath $deplibs"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	shlibpath="$finalize_shlibpath"</div><div class='del'>-	test "$mode" != relink &amp;&amp; shlibpath="$compile_shlibpath$shlibpath"</div><div class='del'>-	if test -n "$shlibpath"; then</div><div class='del'>-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# Get the real and link names of the library.</div><div class='del'>-	eval shared_ext=\"$shrext_cmds\"</div><div class='del'>-	eval library_names=\"$library_names_spec\"</div><div class='del'>-	set dummy $library_names</div><div class='del'>-	shift</div><div class='del'>-	realname="$1"</div><div class='del'>-	shift</div><div class='del'>-</div><div class='del'>-	if test -n "$soname_spec"; then</div><div class='del'>-	  eval soname=\"$soname_spec\"</div><div class='del'>-	else</div><div class='del'>-	  soname="$realname"</div><div class='del'>-	fi</div><div class='del'>-	if test -z "$dlname"; then</div><div class='del'>-	  dlname=$soname</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	lib="$output_objdir/$realname"</div><div class='del'>-	linknames=</div><div class='del'>-	for link</div><div class='del'>-	do</div><div class='del'>-	  linknames="$linknames $link"</div><div class='del'>-	done</div><div class='del'>-</div><div class='del'>-	# Use standard objects if they are pic</div><div class='del'>-	test -z "$pic_flag" &amp;&amp; libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`</div><div class='del'>-	test "X$libobjs" = "X " &amp;&amp; libobjs=</div><div class='del'>-</div><div class='del'>-	delfiles=</div><div class='del'>-	if test -n "$export_symbols" &amp;&amp; test -n "$include_expsyms"; then</div><div class='del'>-	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"</div><div class='del'>-	  export_symbols="$output_objdir/$libname.uexp"</div><div class='del'>-	  delfiles="$delfiles $export_symbols"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	orig_export_symbols=</div><div class='del'>-	case $host_os in</div><div class='del'>-	cygwin* | mingw* | cegcc*)</div><div class='del'>-	  if test -n "$export_symbols" &amp;&amp; test -z "$export_symbols_regex"; then</div><div class='del'>-	    # exporting using user supplied symfile</div><div class='del'>-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then</div><div class='del'>-	      # and it's NOT already a .def file. Must figure out</div><div class='del'>-	      # which of the given symbols are data symbols and tag</div><div class='del'>-	      # them as such. So, trigger use of export_symbols_cmds.</div><div class='del'>-	      # export_symbols gets reassigned inside the "prepare</div><div class='del'>-	      # the list of exported symbols" if statement, so the</div><div class='del'>-	      # include_expsyms logic still works.</div><div class='del'>-	      orig_export_symbols="$export_symbols"</div><div class='del'>-	      export_symbols=</div><div class='del'>-	      always_export_symbols=yes</div><div class='del'>-	    fi</div><div class='del'>-	  fi</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-</div><div class='del'>-	# Prepare the list of exported symbols</div><div class='del'>-	if test -z "$export_symbols"; then</div><div class='del'>-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then</div><div class='del'>-	    func_verbose "generating symbol list for \`$libname.la'"</div><div class='del'>-	    export_symbols="$output_objdir/$libname.exp"</div><div class='del'>-	    $opt_dry_run || $RM $export_symbols</div><div class='del'>-	    cmds=$export_symbols_cmds</div><div class='del'>-	    save_ifs="$IFS"; IFS='~'</div><div class='del'>-	    for cmd in $cmds; do</div><div class='del'>-	      IFS="$save_ifs"</div><div class='del'>-	      eval cmd=\"$cmd\"</div><div class='del'>-	      func_len " $cmd"</div><div class='del'>-	      len=$func_len_result</div><div class='del'>-	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then</div><div class='del'>-		func_show_eval "$cmd" 'exit $?'</div><div class='del'>-		skipped_export=false</div><div class='del'>-	      else</div><div class='del'>-		# The command line is too long to execute in one step.</div><div class='del'>-		func_verbose "using reloadable object file for export list..."</div><div class='del'>-		skipped_export=:</div><div class='del'>-		# Break out early, otherwise skipped_export may be</div><div class='del'>-		# set to false by a later but shorter cmd.</div><div class='del'>-		break</div><div class='del'>-	      fi</div><div class='del'>-	    done</div><div class='del'>-	    IFS="$save_ifs"</div><div class='del'>-	    if test -n "$export_symbols_regex" &amp;&amp; test "X$skipped_export" != "X:"; then</div><div class='del'>-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" &gt; "${export_symbols}T"'</div><div class='del'>-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'</div><div class='del'>-	    fi</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	if test -n "$export_symbols" &amp;&amp; test -n "$include_expsyms"; then</div><div class='del'>-	  tmp_export_symbols="$export_symbols"</div><div class='del'>-	  test -n "$orig_export_symbols" &amp;&amp; tmp_export_symbols="$orig_export_symbols"</div><div class='del'>-	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL &gt;&gt; "$tmp_export_symbols"'</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	if test "X$skipped_export" != "X:" &amp;&amp; test -n "$orig_export_symbols"; then</div><div class='del'>-	  # The given exports_symbols file has to be filtered, so filter it.</div><div class='del'>-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"</div><div class='del'>-	  # FIXME: $output_objdir/$libname.filter potentially contains lots of</div><div class='del'>-	  # 's' commands which not all seds can handle. GNU sed should be fine</div><div class='del'>-	  # though. Also, the filter scales superlinearly with the number of</div><div class='del'>-	  # global variables. join(1) would be nice here, but unfortunately</div><div class='del'>-	  # isn't a blessed tool.</div><div class='del'>-	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' &lt; $export_symbols &gt; $output_objdir/$libname.filter</div><div class='del'>-	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"</div><div class='del'>-	  export_symbols=$output_objdir/$libname.def</div><div class='del'>-	  $opt_dry_run || $SED -f $output_objdir/$libname.filter &lt; $orig_export_symbols &gt; $export_symbols</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	tmp_deplibs=</div><div class='del'>-	for test_deplib in $deplibs; do</div><div class='del'>-	  case " $convenience " in</div><div class='del'>-	  *" $test_deplib "*) ;;</div><div class='del'>-	  *)</div><div class='del'>-	    tmp_deplibs="$tmp_deplibs $test_deplib"</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	done</div><div class='del'>-	deplibs="$tmp_deplibs"</div><div class='del'>-</div><div class='del'>-	if test -n "$convenience"; then</div><div class='del'>-	  if test -n "$whole_archive_flag_spec" &amp;&amp;</div><div class='del'>-	    test "$compiler_needs_object" = yes &amp;&amp;</div><div class='del'>-	    test -z "$libobjs"; then</div><div class='del'>-	    # extract the archives, so we have objects to list.</div><div class='del'>-	    # TODO: could optimize this to just extract one archive.</div><div class='del'>-	    whole_archive_flag_spec=</div><div class='del'>-	  fi</div><div class='del'>-	  if test -n "$whole_archive_flag_spec"; then</div><div class='del'>-	    save_libobjs=$libobjs</div><div class='del'>-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"</div><div class='del'>-	    test "X$libobjs" = "X " &amp;&amp; libobjs=</div><div class='del'>-	  else</div><div class='del'>-	    gentop="$output_objdir/${outputname}x"</div><div class='del'>-	    generated="$generated $gentop"</div><div class='del'>-</div><div class='del'>-	    func_extract_archives $gentop $convenience</div><div class='del'>-	    libobjs="$libobjs $func_extract_archives_result"</div><div class='del'>-	    test "X$libobjs" = "X " &amp;&amp; libobjs=</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	if test "$thread_safe" = yes &amp;&amp; test -n "$thread_safe_flag_spec"; then</div><div class='del'>-	  eval flag=\"$thread_safe_flag_spec\"</div><div class='del'>-	  linker_flags="$linker_flags $flag"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# Make a backup of the uninstalled library when relinking</div><div class='del'>-	if test "$mode" = relink; then</div><div class='del'>-	  $opt_dry_run || eval '(cd $output_objdir &amp;&amp; $RM ${realname}U &amp;&amp; $MV $realname ${realname}U)' || exit $?</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# Do each of the archive commands.</div><div class='del'>-	if test "$module" = yes &amp;&amp; test -n "$module_cmds" ; then</div><div class='del'>-	  if test -n "$export_symbols" &amp;&amp; test -n "$module_expsym_cmds"; then</div><div class='del'>-	    eval test_cmds=\"$module_expsym_cmds\"</div><div class='del'>-	    cmds=$module_expsym_cmds</div><div class='del'>-	  else</div><div class='del'>-	    eval test_cmds=\"$module_cmds\"</div><div class='del'>-	    cmds=$module_cmds</div><div class='del'>-	  fi</div><div class='del'>-	else</div><div class='del'>-	  if test -n "$export_symbols" &amp;&amp; test -n "$archive_expsym_cmds"; then</div><div class='del'>-	    eval test_cmds=\"$archive_expsym_cmds\"</div><div class='del'>-	    cmds=$archive_expsym_cmds</div><div class='del'>-	  else</div><div class='del'>-	    eval test_cmds=\"$archive_cmds\"</div><div class='del'>-	    cmds=$archive_cmds</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	if test "X$skipped_export" != "X:" &amp;&amp;</div><div class='del'>-	   func_len " $test_cmds" &amp;&amp;</div><div class='del'>-	   len=$func_len_result &amp;&amp;</div><div class='del'>-	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then</div><div class='del'>-	  :</div><div class='del'>-	else</div><div class='del'>-	  # The command line is too long to link in one step, link piecewise</div><div class='del'>-	  # or, if using GNU ld and skipped_export is not :, use a linker</div><div class='del'>-	  # script.</div><div class='del'>-</div><div class='del'>-	  # Save the value of $output and $libobjs because we want to</div><div class='del'>-	  # use them later.  If we have whole_archive_flag_spec, we</div><div class='del'>-	  # want to use save_libobjs as it was before</div><div class='del'>-	  # whole_archive_flag_spec was expanded, because we can't</div><div class='del'>-	  # assume the linker understands whole_archive_flag_spec.</div><div class='del'>-	  # This may have to be revisited, in case too many</div><div class='del'>-	  # convenience libraries get linked in and end up exceeding</div><div class='del'>-	  # the spec.</div><div class='del'>-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then</div><div class='del'>-	    save_libobjs=$libobjs</div><div class='del'>-	  fi</div><div class='del'>-	  save_output=$output</div><div class='del'>-	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`</div><div class='del'>-</div><div class='del'>-	  # Clear the reloadable object creation command queue and</div><div class='del'>-	  # initialize k to one.</div><div class='del'>-	  test_cmds=</div><div class='del'>-	  concat_cmds=</div><div class='del'>-	  objlist=</div><div class='del'>-	  last_robj=</div><div class='del'>-	  k=1</div><div class='del'>-</div><div class='del'>-	  if test -n "$save_libobjs" &amp;&amp; test "X$skipped_export" != "X:" &amp;&amp; test "$with_gnu_ld" = yes; then</div><div class='del'>-	    output=${output_objdir}/${output_la}.lnkscript</div><div class='del'>-	    func_verbose "creating GNU ld script: $output"</div><div class='del'>-	    $ECHO 'INPUT (' &gt; $output</div><div class='del'>-	    for obj in $save_libobjs</div><div class='del'>-	    do</div><div class='del'>-	      $ECHO "$obj" &gt;&gt; $output</div><div class='del'>-	    done</div><div class='del'>-	    $ECHO ')' &gt;&gt; $output</div><div class='del'>-	    delfiles="$delfiles $output"</div><div class='del'>-	  elif test -n "$save_libobjs" &amp;&amp; test "X$skipped_export" != "X:" &amp;&amp; test "X$file_list_spec" != X; then</div><div class='del'>-	    output=${output_objdir}/${output_la}.lnk</div><div class='del'>-	    func_verbose "creating linker input file list: $output"</div><div class='del'>-	    : &gt; $output</div><div class='del'>-	    set x $save_libobjs</div><div class='del'>-	    shift</div><div class='del'>-	    firstobj=</div><div class='del'>-	    if test "$compiler_needs_object" = yes; then</div><div class='del'>-	      firstobj="$1 "</div><div class='del'>-	      shift</div><div class='del'>-	    fi</div><div class='del'>-	    for obj</div><div class='del'>-	    do</div><div class='del'>-	      $ECHO "$obj" &gt;&gt; $output</div><div class='del'>-	    done</div><div class='del'>-	    delfiles="$delfiles $output"</div><div class='del'>-	    output=$firstobj\"$file_list_spec$output\"</div><div class='del'>-	  else</div><div class='del'>-	    if test -n "$save_libobjs"; then</div><div class='del'>-	      func_verbose "creating reloadable object files..."</div><div class='del'>-	      output=$output_objdir/$output_la-${k}.$objext</div><div class='del'>-	      eval test_cmds=\"$reload_cmds\"</div><div class='del'>-	      func_len " $test_cmds"</div><div class='del'>-	      len0=$func_len_result</div><div class='del'>-	      len=$len0</div><div class='del'>-</div><div class='del'>-	      # Loop over the list of objects to be linked.</div><div class='del'>-	      for obj in $save_libobjs</div><div class='del'>-	      do</div><div class='del'>-		func_len " $obj"</div><div class='del'>-		func_arith $len + $func_len_result</div><div class='del'>-		len=$func_arith_result</div><div class='del'>-		if test "X$objlist" = X ||</div><div class='del'>-		   test "$len" -lt "$max_cmd_len"; then</div><div class='del'>-		  func_append objlist " $obj"</div><div class='del'>-		else</div><div class='del'>-		  # The command $test_cmds is almost too long, add a</div><div class='del'>-		  # command to the queue.</div><div class='del'>-		  if test "$k" -eq 1 ; then</div><div class='del'>-		    # The first file doesn't have a previous command to add.</div><div class='del'>-		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"</div><div class='del'>-		  else</div><div class='del'>-		    # All subsequent reloadable object files will link in</div><div class='del'>-		    # the last one created.</div><div class='del'>-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"</div><div class='del'>-		  fi</div><div class='del'>-		  last_robj=$output_objdir/$output_la-${k}.$objext</div><div class='del'>-		  func_arith $k + 1</div><div class='del'>-		  k=$func_arith_result</div><div class='del'>-		  output=$output_objdir/$output_la-${k}.$objext</div><div class='del'>-		  objlist=$obj</div><div class='del'>-		  func_len " $last_robj"</div><div class='del'>-		  func_arith $len0 + $func_len_result</div><div class='del'>-		  len=$func_arith_result</div><div class='del'>-		fi</div><div class='del'>-	      done</div><div class='del'>-	      # Handle the remaining objects by creating one last</div><div class='del'>-	      # reloadable object file.  All subsequent reloadable object</div><div class='del'>-	      # files will link in the last one created.</div><div class='del'>-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~</div><div class='del'>-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"</div><div class='del'>-	      if test -n "$last_robj"; then</div><div class='del'>-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"</div><div class='del'>-	      fi</div><div class='del'>-	      delfiles="$delfiles $output"</div><div class='del'>-</div><div class='del'>-	    else</div><div class='del'>-	      output=</div><div class='del'>-	    fi</div><div class='del'>-</div><div class='del'>-	    if ${skipped_export-false}; then</div><div class='del'>-	      func_verbose "generating symbol list for \`$libname.la'"</div><div class='del'>-	      export_symbols="$output_objdir/$libname.exp"</div><div class='del'>-	      $opt_dry_run || $RM $export_symbols</div><div class='del'>-	      libobjs=$output</div><div class='del'>-	      # Append the command to create the export file.</div><div class='del'>-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~</div><div class='del'>-	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"</div><div class='del'>-	      if test -n "$last_robj"; then</div><div class='del'>-		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"</div><div class='del'>-	      fi</div><div class='del'>-	    fi</div><div class='del'>-</div><div class='del'>-	    test -n "$save_libobjs" &amp;&amp;</div><div class='del'>-	      func_verbose "creating a temporary reloadable object file: $output"</div><div class='del'>-</div><div class='del'>-	    # Loop through the commands generated above and execute them.</div><div class='del'>-	    save_ifs="$IFS"; IFS='~'</div><div class='del'>-	    for cmd in $concat_cmds; do</div><div class='del'>-	      IFS="$save_ifs"</div><div class='del'>-	      $opt_silent || {</div><div class='del'>-		  func_quote_for_expand "$cmd"</div><div class='del'>-		  eval "func_echo $func_quote_for_expand_result"</div><div class='del'>-	      }</div><div class='del'>-	      $opt_dry_run || eval "$cmd" || {</div><div class='del'>-		lt_exit=$?</div><div class='del'>-</div><div class='del'>-		# Restore the uninstalled library and exit</div><div class='del'>-		if test "$mode" = relink; then</div><div class='del'>-		  ( cd "$output_objdir" &amp;&amp; \</div><div class='del'>-		    $RM "${realname}T" &amp;&amp; \</div><div class='del'>-		    $MV "${realname}U" "$realname" )</div><div class='del'>-		fi</div><div class='del'>-</div><div class='del'>-		exit $lt_exit</div><div class='del'>-	      }</div><div class='del'>-	    done</div><div class='del'>-	    IFS="$save_ifs"</div><div class='del'>-</div><div class='del'>-	    if test -n "$export_symbols_regex" &amp;&amp; ${skipped_export-false}; then</div><div class='del'>-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" &gt; "${export_symbols}T"'</div><div class='del'>-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'</div><div class='del'>-	    fi</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-          if ${skipped_export-false}; then</div><div class='del'>-	    if test -n "$export_symbols" &amp;&amp; test -n "$include_expsyms"; then</div><div class='del'>-	      tmp_export_symbols="$export_symbols"</div><div class='del'>-	      test -n "$orig_export_symbols" &amp;&amp; tmp_export_symbols="$orig_export_symbols"</div><div class='del'>-	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL &gt;&gt; "$tmp_export_symbols"'</div><div class='del'>-	    fi</div><div class='del'>-</div><div class='del'>-	    if test -n "$orig_export_symbols"; then</div><div class='del'>-	      # The given exports_symbols file has to be filtered, so filter it.</div><div class='del'>-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"</div><div class='del'>-	      # FIXME: $output_objdir/$libname.filter potentially contains lots of</div><div class='del'>-	      # 's' commands which not all seds can handle. GNU sed should be fine</div><div class='del'>-	      # though. Also, the filter scales superlinearly with the number of</div><div class='del'>-	      # global variables. join(1) would be nice here, but unfortunately</div><div class='del'>-	      # isn't a blessed tool.</div><div class='del'>-	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' &lt; $export_symbols &gt; $output_objdir/$libname.filter</div><div class='del'>-	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"</div><div class='del'>-	      export_symbols=$output_objdir/$libname.def</div><div class='del'>-	      $opt_dry_run || $SED -f $output_objdir/$libname.filter &lt; $orig_export_symbols &gt; $export_symbols</div><div class='del'>-	    fi</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  libobjs=$output</div><div class='del'>-	  # Restore the value of output.</div><div class='del'>-	  output=$save_output</div><div class='del'>-</div><div class='del'>-	  if test -n "$convenience" &amp;&amp; test -n "$whole_archive_flag_spec"; then</div><div class='del'>-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"</div><div class='del'>-	    test "X$libobjs" = "X " &amp;&amp; libobjs=</div><div class='del'>-	  fi</div><div class='del'>-	  # Expand the library linking commands again to reset the</div><div class='del'>-	  # value of $libobjs for piecewise linking.</div><div class='del'>-</div><div class='del'>-	  # Do each of the archive commands.</div><div class='del'>-	  if test "$module" = yes &amp;&amp; test -n "$module_cmds" ; then</div><div class='del'>-	    if test -n "$export_symbols" &amp;&amp; test -n "$module_expsym_cmds"; then</div><div class='del'>-	      cmds=$module_expsym_cmds</div><div class='del'>-	    else</div><div class='del'>-	      cmds=$module_cmds</div><div class='del'>-	    fi</div><div class='del'>-	  else</div><div class='del'>-	    if test -n "$export_symbols" &amp;&amp; test -n "$archive_expsym_cmds"; then</div><div class='del'>-	      cmds=$archive_expsym_cmds</div><div class='del'>-	    else</div><div class='del'>-	      cmds=$archive_cmds</div><div class='del'>-	    fi</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	if test -n "$delfiles"; then</div><div class='del'>-	  # Append the command to remove temporary files to $cmds.</div><div class='del'>-	  eval cmds=\"\$cmds~\$RM $delfiles\"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# Add any objects from preloaded convenience libraries</div><div class='del'>-	if test -n "$dlprefiles"; then</div><div class='del'>-	  gentop="$output_objdir/${outputname}x"</div><div class='del'>-	  generated="$generated $gentop"</div><div class='del'>-</div><div class='del'>-	  func_extract_archives $gentop $dlprefiles</div><div class='del'>-	  libobjs="$libobjs $func_extract_archives_result"</div><div class='del'>-	  test "X$libobjs" = "X " &amp;&amp; libobjs=</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	save_ifs="$IFS"; IFS='~'</div><div class='del'>-	for cmd in $cmds; do</div><div class='del'>-	  IFS="$save_ifs"</div><div class='del'>-	  eval cmd=\"$cmd\"</div><div class='del'>-	  $opt_silent || {</div><div class='del'>-	    func_quote_for_expand "$cmd"</div><div class='del'>-	    eval "func_echo $func_quote_for_expand_result"</div><div class='del'>-	  }</div><div class='del'>-	  $opt_dry_run || eval "$cmd" || {</div><div class='del'>-	    lt_exit=$?</div><div class='del'>-</div><div class='del'>-	    # Restore the uninstalled library and exit</div><div class='del'>-	    if test "$mode" = relink; then</div><div class='del'>-	      ( cd "$output_objdir" &amp;&amp; \</div><div class='del'>-	        $RM "${realname}T" &amp;&amp; \</div><div class='del'>-		$MV "${realname}U" "$realname" )</div><div class='del'>-	    fi</div><div class='del'>-</div><div class='del'>-	    exit $lt_exit</div><div class='del'>-	  }</div><div class='del'>-	done</div><div class='del'>-	IFS="$save_ifs"</div><div class='del'>-</div><div class='del'>-	# Restore the uninstalled library and exit</div><div class='del'>-	if test "$mode" = relink; then</div><div class='del'>-	  $opt_dry_run || eval '(cd $output_objdir &amp;&amp; $RM ${realname}T &amp;&amp; $MV $realname ${realname}T &amp;&amp; $MV ${realname}U $realname)' || exit $?</div><div class='del'>-</div><div class='del'>-	  if test -n "$convenience"; then</div><div class='del'>-	    if test -z "$whole_archive_flag_spec"; then</div><div class='del'>-	      func_show_eval '${RM}r "$gentop"'</div><div class='del'>-	    fi</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  exit $EXIT_SUCCESS</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# Create links to the real library.</div><div class='del'>-	for linkname in $linknames; do</div><div class='del'>-	  if test "$realname" != "$linkname"; then</div><div class='del'>-	    func_show_eval '(cd "$output_objdir" &amp;&amp; $RM "$linkname" &amp;&amp; $LN_S "$realname" "$linkname")' 'exit $?'</div><div class='del'>-	  fi</div><div class='del'>-	done</div><div class='del'>-</div><div class='del'>-	# If -module or -export-dynamic was specified, set the dlname.</div><div class='del'>-	if test "$module" = yes || test "$export_dynamic" = yes; then</div><div class='del'>-	  # On all known operating systems, these are identical.</div><div class='del'>-	  dlname="$soname"</div><div class='del'>-	fi</div><div class='del'>-      fi</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    obj)</div><div class='del'>-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then</div><div class='del'>-	func_warning "\`-dlopen' is ignored for objects"</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      case " $deplibs" in</div><div class='del'>-      *\ -l* | *\ -L*)</div><div class='del'>-	func_warning "\`-l' and \`-L' are ignored for objects" ;;</div><div class='del'>-      esac</div><div class='del'>-</div><div class='del'>-      test -n "$rpath" &amp;&amp; \</div><div class='del'>-	func_warning "\`-rpath' is ignored for objects"</div><div class='del'>-</div><div class='del'>-      test -n "$xrpath" &amp;&amp; \</div><div class='del'>-	func_warning "\`-R' is ignored for objects"</div><div class='del'>-</div><div class='del'>-      test -n "$vinfo" &amp;&amp; \</div><div class='del'>-	func_warning "\`-version-info' is ignored for objects"</div><div class='del'>-</div><div class='del'>-      test -n "$release" &amp;&amp; \</div><div class='del'>-	func_warning "\`-release' is ignored for objects"</div><div class='del'>-</div><div class='del'>-      case $output in</div><div class='del'>-      *.lo)</div><div class='del'>-	test -n "$objs$old_deplibs" &amp;&amp; \</div><div class='del'>-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"</div><div class='del'>-</div><div class='del'>-	libobj=$output</div><div class='del'>-	func_lo2o "$libobj"</div><div class='del'>-	obj=$func_lo2o_result</div><div class='del'>-	;;</div><div class='del'>-      *)</div><div class='del'>-	libobj=</div><div class='del'>-	obj="$output"</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-</div><div class='del'>-      # Delete the old objects.</div><div class='del'>-      $opt_dry_run || $RM $obj $libobj</div><div class='del'>-</div><div class='del'>-      # Objects from convenience libraries.  This assumes</div><div class='del'>-      # single-version convenience libraries.  Whenever we create</div><div class='del'>-      # different ones for PIC/non-PIC, this we'll have to duplicate</div><div class='del'>-      # the extraction.</div><div class='del'>-      reload_conv_objs=</div><div class='del'>-      gentop=</div><div class='del'>-      # reload_cmds runs $LD directly, so let us get rid of</div><div class='del'>-      # -Wl from whole_archive_flag_spec and hope we can get by with</div><div class='del'>-      # turning comma into space..</div><div class='del'>-      wl=</div><div class='del'>-</div><div class='del'>-      if test -n "$convenience"; then</div><div class='del'>-	if test -n "$whole_archive_flag_spec"; then</div><div class='del'>-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"</div><div class='del'>-	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`</div><div class='del'>-	else</div><div class='del'>-	  gentop="$output_objdir/${obj}x"</div><div class='del'>-	  generated="$generated $gentop"</div><div class='del'>-</div><div class='del'>-	  func_extract_archives $gentop $convenience</div><div class='del'>-	  reload_conv_objs="$reload_objs $func_extract_archives_result"</div><div class='del'>-	fi</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Create the old-style object.</div><div class='del'>-      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test</div><div class='del'>-</div><div class='del'>-      output="$obj"</div><div class='del'>-      func_execute_cmds "$reload_cmds" 'exit $?'</div><div class='del'>-</div><div class='del'>-      # Exit if we aren't doing a library object file.</div><div class='del'>-      if test -z "$libobj"; then</div><div class='del'>-	if test -n "$gentop"; then</div><div class='del'>-	  func_show_eval '${RM}r "$gentop"'</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	exit $EXIT_SUCCESS</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      if test "$build_libtool_libs" != yes; then</div><div class='del'>-	if test -n "$gentop"; then</div><div class='del'>-	  func_show_eval '${RM}r "$gentop"'</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# Create an invalid libtool object if no PIC, so that we don't</div><div class='del'>-	# accidentally link it into a program.</div><div class='del'>-	# $show "echo timestamp &gt; $libobj"</div><div class='del'>-	# $opt_dry_run || eval "echo timestamp &gt; $libobj" || exit $?</div><div class='del'>-	exit $EXIT_SUCCESS</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      if test -n "$pic_flag" || test "$pic_mode" != default; then</div><div class='del'>-	# Only do commands if we really have different PIC objects.</div><div class='del'>-	reload_objs="$libobjs $reload_conv_objs"</div><div class='del'>-	output="$libobj"</div><div class='del'>-	func_execute_cmds "$reload_cmds" 'exit $?'</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      if test -n "$gentop"; then</div><div class='del'>-	func_show_eval '${RM}r "$gentop"'</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      exit $EXIT_SUCCESS</div><div class='del'>-      ;;</div><div class='del'>-</div><div class='del'>-    prog)</div><div class='del'>-      case $host in</div><div class='del'>-	*cygwin*) func_stripname '' '.exe' "$output"</div><div class='del'>-	          output=$func_stripname_result.exe;;</div><div class='del'>-      esac</div><div class='del'>-      test -n "$vinfo" &amp;&amp; \</div><div class='del'>-	func_warning "\`-version-info' is ignored for programs"</div><div class='del'>-</div><div class='del'>-      test -n "$release" &amp;&amp; \</div><div class='del'>-	func_warning "\`-release' is ignored for programs"</div><div class='del'>-</div><div class='del'>-      test "$preload" = yes \</div><div class='del'>-        &amp;&amp; test "$dlopen_support" = unknown \</div><div class='del'>-	&amp;&amp; test "$dlopen_self" = unknown \</div><div class='del'>-	&amp;&amp; test "$dlopen_self_static" = unknown &amp;&amp; \</div><div class='del'>-	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."</div><div class='del'>-</div><div class='del'>-      case $host in</div><div class='del'>-      *-*-rhapsody* | *-*-darwin1.[012])</div><div class='del'>-	# On Rhapsody replace the C library is the System framework</div><div class='del'>-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`</div><div class='del'>-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-</div><div class='del'>-      case $host in</div><div class='del'>-      *-*-darwin*)</div><div class='del'>-	# Don't allow lazy linking, it breaks C++ global constructors</div><div class='del'>-	# But is supposedly fixed on 10.4 or later (yay!).</div><div class='del'>-	if test "$tagname" = CXX ; then</div><div class='del'>-	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in</div><div class='del'>-	    10.[0123])</div><div class='del'>-	      compile_command="$compile_command ${wl}-bind_at_load"</div><div class='del'>-	      finalize_command="$finalize_command ${wl}-bind_at_load"</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	fi</div><div class='del'>-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"</div><div class='del'>-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`</div><div class='del'>-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-      # move library search paths that coincide with paths to not yet</div><div class='del'>-      # installed libraries to the beginning of the library search list</div><div class='del'>-      new_libs=</div><div class='del'>-      for path in $notinst_path; do</div><div class='del'>-	case " $new_libs " in</div><div class='del'>-	*" -L$path/$objdir "*) ;;</div><div class='del'>-	*)</div><div class='del'>-	  case " $compile_deplibs " in</div><div class='del'>-	  *" -L$path/$objdir "*)</div><div class='del'>-	    new_libs="$new_libs -L$path/$objdir" ;;</div><div class='del'>-	  esac</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      done</div><div class='del'>-      for deplib in $compile_deplibs; do</div><div class='del'>-	case $deplib in</div><div class='del'>-	-L*)</div><div class='del'>-	  case " $new_libs " in</div><div class='del'>-	  *" $deplib "*) ;;</div><div class='del'>-	  *) new_libs="$new_libs $deplib" ;;</div><div class='del'>-	  esac</div><div class='del'>-	  ;;</div><div class='del'>-	*) new_libs="$new_libs $deplib" ;;</div><div class='del'>-	esac</div><div class='del'>-      done</div><div class='del'>-      compile_deplibs="$new_libs"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-      compile_command="$compile_command $compile_deplibs"</div><div class='del'>-      finalize_command="$finalize_command $finalize_deplibs"</div><div class='del'>-</div><div class='del'>-      if test -n "$rpath$xrpath"; then</div><div class='del'>-	# If the user specified any rpath flags, then add them.</div><div class='del'>-	for libdir in $rpath $xrpath; do</div><div class='del'>-	  # This is the magic to use -rpath.</div><div class='del'>-	  case "$finalize_rpath " in</div><div class='del'>-	  *" $libdir "*) ;;</div><div class='del'>-	  *) finalize_rpath="$finalize_rpath $libdir" ;;</div><div class='del'>-	  esac</div><div class='del'>-	done</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Now hardcode the library paths</div><div class='del'>-      rpath=</div><div class='del'>-      hardcode_libdirs=</div><div class='del'>-      for libdir in $compile_rpath $finalize_rpath; do</div><div class='del'>-	if test -n "$hardcode_libdir_flag_spec"; then</div><div class='del'>-	  if test -n "$hardcode_libdir_separator"; then</div><div class='del'>-	    if test -z "$hardcode_libdirs"; then</div><div class='del'>-	      hardcode_libdirs="$libdir"</div><div class='del'>-	    else</div><div class='del'>-	      # Just accumulate the unique libdirs.</div><div class='del'>-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in</div><div class='del'>-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)</div><div class='del'>-		;;</div><div class='del'>-	      *)</div><div class='del'>-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"</div><div class='del'>-		;;</div><div class='del'>-	      esac</div><div class='del'>-	    fi</div><div class='del'>-	  else</div><div class='del'>-	    eval flag=\"$hardcode_libdir_flag_spec\"</div><div class='del'>-	    rpath="$rpath $flag"</div><div class='del'>-	  fi</div><div class='del'>-	elif test -n "$runpath_var"; then</div><div class='del'>-	  case "$perm_rpath " in</div><div class='del'>-	  *" $libdir "*) ;;</div><div class='del'>-	  *) perm_rpath="$perm_rpath $libdir" ;;</div><div class='del'>-	  esac</div><div class='del'>-	fi</div><div class='del'>-	case $host in</div><div class='del'>-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)</div><div class='del'>-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`</div><div class='del'>-	  case :$dllsearchpath: in</div><div class='del'>-	  *":$libdir:"*) ;;</div><div class='del'>-	  ::) dllsearchpath=$libdir;;</div><div class='del'>-	  *) dllsearchpath="$dllsearchpath:$libdir";;</div><div class='del'>-	  esac</div><div class='del'>-	  case :$dllsearchpath: in</div><div class='del'>-	  *":$testbindir:"*) ;;</div><div class='del'>-	  ::) dllsearchpath=$testbindir;;</div><div class='del'>-	  *) dllsearchpath="$dllsearchpath:$testbindir";;</div><div class='del'>-	  esac</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      done</div><div class='del'>-      # Substitute the hardcoded libdirs into the rpath.</div><div class='del'>-      if test -n "$hardcode_libdir_separator" &amp;&amp;</div><div class='del'>-	 test -n "$hardcode_libdirs"; then</div><div class='del'>-	libdir="$hardcode_libdirs"</div><div class='del'>-	eval rpath=\" $hardcode_libdir_flag_spec\"</div><div class='del'>-      fi</div><div class='del'>-      compile_rpath="$rpath"</div><div class='del'>-</div><div class='del'>-      rpath=</div><div class='del'>-      hardcode_libdirs=</div><div class='del'>-      for libdir in $finalize_rpath; do</div><div class='del'>-	if test -n "$hardcode_libdir_flag_spec"; then</div><div class='del'>-	  if test -n "$hardcode_libdir_separator"; then</div><div class='del'>-	    if test -z "$hardcode_libdirs"; then</div><div class='del'>-	      hardcode_libdirs="$libdir"</div><div class='del'>-	    else</div><div class='del'>-	      # Just accumulate the unique libdirs.</div><div class='del'>-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in</div><div class='del'>-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)</div><div class='del'>-		;;</div><div class='del'>-	      *)</div><div class='del'>-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"</div><div class='del'>-		;;</div><div class='del'>-	      esac</div><div class='del'>-	    fi</div><div class='del'>-	  else</div><div class='del'>-	    eval flag=\"$hardcode_libdir_flag_spec\"</div><div class='del'>-	    rpath="$rpath $flag"</div><div class='del'>-	  fi</div><div class='del'>-	elif test -n "$runpath_var"; then</div><div class='del'>-	  case "$finalize_perm_rpath " in</div><div class='del'>-	  *" $libdir "*) ;;</div><div class='del'>-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;</div><div class='del'>-	  esac</div><div class='del'>-	fi</div><div class='del'>-      done</div><div class='del'>-      # Substitute the hardcoded libdirs into the rpath.</div><div class='del'>-      if test -n "$hardcode_libdir_separator" &amp;&amp;</div><div class='del'>-	 test -n "$hardcode_libdirs"; then</div><div class='del'>-	libdir="$hardcode_libdirs"</div><div class='del'>-	eval rpath=\" $hardcode_libdir_flag_spec\"</div><div class='del'>-      fi</div><div class='del'>-      finalize_rpath="$rpath"</div><div class='del'>-</div><div class='del'>-      if test -n "$libobjs" &amp;&amp; test "$build_old_libs" = yes; then</div><div class='del'>-	# Transform all the library objects into standard objects.</div><div class='del'>-	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`</div><div class='del'>-	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"</div><div class='del'>-</div><div class='del'>-      # template prelinking step</div><div class='del'>-      if test -n "$prelink_cmds"; then</div><div class='del'>-	func_execute_cmds "$prelink_cmds" 'exit $?'</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      wrappers_required=yes</div><div class='del'>-      case $host in</div><div class='del'>-      *cygwin* | *mingw* )</div><div class='del'>-        if test "$build_libtool_libs" != yes; then</div><div class='del'>-          wrappers_required=no</div><div class='del'>-        fi</div><div class='del'>-        ;;</div><div class='del'>-      *cegcc)</div><div class='del'>-        # Disable wrappers for cegcc, we are cross compiling anyway.</div><div class='del'>-        wrappers_required=no</div><div class='del'>-        ;;</div><div class='del'>-      *)</div><div class='del'>-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then</div><div class='del'>-          wrappers_required=no</div><div class='del'>-        fi</div><div class='del'>-        ;;</div><div class='del'>-      esac</div><div class='del'>-      if test "$wrappers_required" = no; then</div><div class='del'>-	# Replace the output file specification.</div><div class='del'>-	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`</div><div class='del'>-	link_command="$compile_command$compile_rpath"</div><div class='del'>-</div><div class='del'>-	# We have no uninstalled library dependencies, so finalize right now.</div><div class='del'>-	exit_status=0</div><div class='del'>-	func_show_eval "$link_command" 'exit_status=$?'</div><div class='del'>-</div><div class='del'>-	# Delete the generated files.</div><div class='del'>-	if test -f "$output_objdir/${outputname}S.${objext}"; then</div><div class='del'>-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	exit $exit_status</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      if test -n "$compile_shlibpath$finalize_shlibpath"; then</div><div class='del'>-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"</div><div class='del'>-      fi</div><div class='del'>-      if test -n "$finalize_shlibpath"; then</div><div class='del'>-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      compile_var=</div><div class='del'>-      finalize_var=</div><div class='del'>-      if test -n "$runpath_var"; then</div><div class='del'>-	if test -n "$perm_rpath"; then</div><div class='del'>-	  # We should set the runpath_var.</div><div class='del'>-	  rpath=</div><div class='del'>-	  for dir in $perm_rpath; do</div><div class='del'>-	    rpath="$rpath$dir:"</div><div class='del'>-	  done</div><div class='del'>-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "</div><div class='del'>-	fi</div><div class='del'>-	if test -n "$finalize_perm_rpath"; then</div><div class='del'>-	  # We should set the runpath_var.</div><div class='del'>-	  rpath=</div><div class='del'>-	  for dir in $finalize_perm_rpath; do</div><div class='del'>-	    rpath="$rpath$dir:"</div><div class='del'>-	  done</div><div class='del'>-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "</div><div class='del'>-	fi</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      if test "$no_install" = yes; then</div><div class='del'>-	# We don't need to create a wrapper script.</div><div class='del'>-	link_command="$compile_var$compile_command$compile_rpath"</div><div class='del'>-	# Replace the output file specification.</div><div class='del'>-	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`</div><div class='del'>-	# Delete the old output file.</div><div class='del'>-	$opt_dry_run || $RM $output</div><div class='del'>-	# Link the executable and exit</div><div class='del'>-	func_show_eval "$link_command" 'exit $?'</div><div class='del'>-	exit $EXIT_SUCCESS</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      if test "$hardcode_action" = relink; then</div><div class='del'>-	# Fast installation is not supported</div><div class='del'>-	link_command="$compile_var$compile_command$compile_rpath"</div><div class='del'>-	relink_command="$finalize_var$finalize_command$finalize_rpath"</div><div class='del'>-</div><div class='del'>-	func_warning "this platform does not like uninstalled shared libraries"</div><div class='del'>-	func_warning "\`$output' will be relinked during installation"</div><div class='del'>-      else</div><div class='del'>-	if test "$fast_install" != no; then</div><div class='del'>-	  link_command="$finalize_var$compile_command$finalize_rpath"</div><div class='del'>-	  if test "$fast_install" = yes; then</div><div class='del'>-	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`</div><div class='del'>-	  else</div><div class='del'>-	    # fast_install is set to needless</div><div class='del'>-	    relink_command=</div><div class='del'>-	  fi</div><div class='del'>-	else</div><div class='del'>-	  link_command="$compile_var$compile_command$compile_rpath"</div><div class='del'>-	  relink_command="$finalize_var$finalize_command$finalize_rpath"</div><div class='del'>-	fi</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Replace the output file specification.</div><div class='del'>-      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`</div><div class='del'>-</div><div class='del'>-      # Delete the old output files.</div><div class='del'>-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname</div><div class='del'>-</div><div class='del'>-      func_show_eval "$link_command" 'exit $?'</div><div class='del'>-</div><div class='del'>-      # Now create the wrapper script.</div><div class='del'>-      func_verbose "creating $output"</div><div class='del'>-</div><div class='del'>-      # Quote the relink command for shipping.</div><div class='del'>-      if test -n "$relink_command"; then</div><div class='del'>-	# Preserve any variables that may affect compiler behavior</div><div class='del'>-	for var in $variables_saved_for_relink; do</div><div class='del'>-	  if eval test -z \"\${$var+set}\"; then</div><div class='del'>-	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"</div><div class='del'>-	  elif eval var_value=\$$var; test -z "$var_value"; then</div><div class='del'>-	    relink_command="$var=; export $var; $relink_command"</div><div class='del'>-	  else</div><div class='del'>-	    func_quote_for_eval "$var_value"</div><div class='del'>-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"</div><div class='del'>-	  fi</div><div class='del'>-	done</div><div class='del'>-	relink_command="(cd `pwd`; $relink_command)"</div><div class='del'>-	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Quote $ECHO for shipping.</div><div class='del'>-      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then</div><div class='del'>-	case $progpath in</div><div class='del'>-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;</div><div class='del'>-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;</div><div class='del'>-	esac</div><div class='del'>-	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`</div><div class='del'>-      else</div><div class='del'>-	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Only actually do things if not in dry run mode.</div><div class='del'>-      $opt_dry_run || {</div><div class='del'>-	# win32 will think the script is a binary if it has</div><div class='del'>-	# a .exe suffix, so we strip it off here.</div><div class='del'>-	case $output in</div><div class='del'>-	  *.exe) func_stripname '' '.exe' "$output"</div><div class='del'>-	         output=$func_stripname_result ;;</div><div class='del'>-	esac</div><div class='del'>-	# test for cygwin because mv fails w/o .exe extensions</div><div class='del'>-	case $host in</div><div class='del'>-	  *cygwin*)</div><div class='del'>-	    exeext=.exe</div><div class='del'>-	    func_stripname '' '.exe' "$outputname"</div><div class='del'>-	    outputname=$func_stripname_result ;;</div><div class='del'>-	  *) exeext= ;;</div><div class='del'>-	esac</div><div class='del'>-	case $host in</div><div class='del'>-	  *cygwin* | *mingw* )</div><div class='del'>-	    func_dirname_and_basename "$output" "" "."</div><div class='del'>-	    output_name=$func_basename_result</div><div class='del'>-	    output_path=$func_dirname_result</div><div class='del'>-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"</div><div class='del'>-	    cwrapper="$output_path/$output_name.exe"</div><div class='del'>-	    $RM $cwrappersource $cwrapper</div><div class='del'>-	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15</div><div class='del'>-</div><div class='del'>-	    func_emit_cwrapperexe_src &gt; $cwrappersource</div><div class='del'>-</div><div class='del'>-	    # The wrapper executable is built using the $host compiler,</div><div class='del'>-	    # because it contains $host paths and files. If cross-</div><div class='del'>-	    # compiling, it, like the target executable, must be</div><div class='del'>-	    # executed on the $host or under an emulation environment.</div><div class='del'>-	    $opt_dry_run || {</div><div class='del'>-	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource</div><div class='del'>-	      $STRIP $cwrapper</div><div class='del'>-	    }</div><div class='del'>-</div><div class='del'>-	    # Now, create the wrapper script for func_source use:</div><div class='del'>-	    func_ltwrapper_scriptname $cwrapper</div><div class='del'>-	    $RM $func_ltwrapper_scriptname_result</div><div class='del'>-	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15</div><div class='del'>-	    $opt_dry_run || {</div><div class='del'>-	      # note: this script will not be executed, so do not chmod.</div><div class='del'>-	      if test "x$build" = "x$host" ; then</div><div class='del'>-		$cwrapper --lt-dump-script &gt; $func_ltwrapper_scriptname_result</div><div class='del'>-	      else</div><div class='del'>-		func_emit_wrapper no &gt; $func_ltwrapper_scriptname_result</div><div class='del'>-	      fi</div><div class='del'>-	    }</div><div class='del'>-	  ;;</div><div class='del'>-	  * )</div><div class='del'>-	    $RM $output</div><div class='del'>-	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15</div><div class='del'>-</div><div class='del'>-	    func_emit_wrapper no &gt; $output</div><div class='del'>-	    chmod +x $output</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-      }</div><div class='del'>-      exit $EXIT_SUCCESS</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    # See if we need to build an old-fashioned archive.</div><div class='del'>-    for oldlib in $oldlibs; do</div><div class='del'>-</div><div class='del'>-      if test "$build_libtool_libs" = convenience; then</div><div class='del'>-	oldobjs="$libobjs_save $symfileobj"</div><div class='del'>-	addlibs="$convenience"</div><div class='del'>-	build_libtool_libs=no</div><div class='del'>-      else</div><div class='del'>-	if test "$build_libtool_libs" = module; then</div><div class='del'>-	  oldobjs="$libobjs_save"</div><div class='del'>-	  build_libtool_libs=no</div><div class='del'>-	else</div><div class='del'>-	  oldobjs="$old_deplibs $non_pic_objects"</div><div class='del'>-	  if test "$preload" = yes &amp;&amp; test -f "$symfileobj"; then</div><div class='del'>-	    oldobjs="$oldobjs $symfileobj"</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-	addlibs="$old_convenience"</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      if test -n "$addlibs"; then</div><div class='del'>-	gentop="$output_objdir/${outputname}x"</div><div class='del'>-	generated="$generated $gentop"</div><div class='del'>-</div><div class='del'>-	func_extract_archives $gentop $addlibs</div><div class='del'>-	oldobjs="$oldobjs $func_extract_archives_result"</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Do each command in the archive commands.</div><div class='del'>-      if test -n "$old_archive_from_new_cmds" &amp;&amp; test "$build_libtool_libs" = yes; then</div><div class='del'>-	cmds=$old_archive_from_new_cmds</div><div class='del'>-      else</div><div class='del'>-</div><div class='del'>-	# Add any objects from preloaded convenience libraries</div><div class='del'>-	if test -n "$dlprefiles"; then</div><div class='del'>-	  gentop="$output_objdir/${outputname}x"</div><div class='del'>-	  generated="$generated $gentop"</div><div class='del'>-</div><div class='del'>-	  func_extract_archives $gentop $dlprefiles</div><div class='del'>-	  oldobjs="$oldobjs $func_extract_archives_result"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	# POSIX demands no paths to be encoded in archives.  We have</div><div class='del'>-	# to avoid creating archives with duplicate basenames if we</div><div class='del'>-	# might have to extract them afterwards, e.g., when creating a</div><div class='del'>-	# static archive out of a convenience library, or when linking</div><div class='del'>-	# the entirety of a libtool archive into another (currently</div><div class='del'>-	# not supported by libtool).</div><div class='del'>-	if (for obj in $oldobjs</div><div class='del'>-	    do</div><div class='del'>-	      func_basename "$obj"</div><div class='del'>-	      $ECHO "$func_basename_result"</div><div class='del'>-	    done | sort | sort -uc &gt;/dev/null 2&gt;&amp;1); then</div><div class='del'>-	  :</div><div class='del'>-	else</div><div class='del'>-	  $ECHO "copying selected object files to avoid basename conflicts..."</div><div class='del'>-	  gentop="$output_objdir/${outputname}x"</div><div class='del'>-	  generated="$generated $gentop"</div><div class='del'>-	  func_mkdir_p "$gentop"</div><div class='del'>-	  save_oldobjs=$oldobjs</div><div class='del'>-	  oldobjs=</div><div class='del'>-	  counter=1</div><div class='del'>-	  for obj in $save_oldobjs</div><div class='del'>-	  do</div><div class='del'>-	    func_basename "$obj"</div><div class='del'>-	    objbase="$func_basename_result"</div><div class='del'>-	    case " $oldobjs " in</div><div class='del'>-	    " ") oldobjs=$obj ;;</div><div class='del'>-	    *[\ /]"$objbase "*)</div><div class='del'>-	      while :; do</div><div class='del'>-		# Make sure we don't pick an alternate name that also</div><div class='del'>-		# overlaps.</div><div class='del'>-		newobj=lt$counter-$objbase</div><div class='del'>-		func_arith $counter + 1</div><div class='del'>-		counter=$func_arith_result</div><div class='del'>-		case " $oldobjs " in</div><div class='del'>-		*[\ /]"$newobj "*) ;;</div><div class='del'>-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;</div><div class='del'>-		esac</div><div class='del'>-	      done</div><div class='del'>-	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"</div><div class='del'>-	      oldobjs="$oldobjs $gentop/$newobj"</div><div class='del'>-	      ;;</div><div class='del'>-	    *) oldobjs="$oldobjs $obj" ;;</div><div class='del'>-	    esac</div><div class='del'>-	  done</div><div class='del'>-	fi</div><div class='del'>-	eval cmds=\"$old_archive_cmds\"</div><div class='del'>-</div><div class='del'>-	func_len " $cmds"</div><div class='del'>-	len=$func_len_result</div><div class='del'>-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then</div><div class='del'>-	  cmds=$old_archive_cmds</div><div class='del'>-	else</div><div class='del'>-	  # the command line is too long to link in one step, link in parts</div><div class='del'>-	  func_verbose "using piecewise archive linking..."</div><div class='del'>-	  save_RANLIB=$RANLIB</div><div class='del'>-	  RANLIB=:</div><div class='del'>-	  objlist=</div><div class='del'>-	  concat_cmds=</div><div class='del'>-	  save_oldobjs=$oldobjs</div><div class='del'>-	  oldobjs=</div><div class='del'>-	  # Is there a better way of finding the last object in the list?</div><div class='del'>-	  for obj in $save_oldobjs</div><div class='del'>-	  do</div><div class='del'>-	    last_oldobj=$obj</div><div class='del'>-	  done</div><div class='del'>-	  eval test_cmds=\"$old_archive_cmds\"</div><div class='del'>-	  func_len " $test_cmds"</div><div class='del'>-	  len0=$func_len_result</div><div class='del'>-	  len=$len0</div><div class='del'>-	  for obj in $save_oldobjs</div><div class='del'>-	  do</div><div class='del'>-	    func_len " $obj"</div><div class='del'>-	    func_arith $len + $func_len_result</div><div class='del'>-	    len=$func_arith_result</div><div class='del'>-	    func_append objlist " $obj"</div><div class='del'>-	    if test "$len" -lt "$max_cmd_len"; then</div><div class='del'>-	      :</div><div class='del'>-	    else</div><div class='del'>-	      # the above command should be used before it gets too long</div><div class='del'>-	      oldobjs=$objlist</div><div class='del'>-	      if test "$obj" = "$last_oldobj" ; then</div><div class='del'>-		RANLIB=$save_RANLIB</div><div class='del'>-	      fi</div><div class='del'>-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~</div><div class='del'>-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"</div><div class='del'>-	      objlist=</div><div class='del'>-	      len=$len0</div><div class='del'>-	    fi</div><div class='del'>-	  done</div><div class='del'>-	  RANLIB=$save_RANLIB</div><div class='del'>-	  oldobjs=$objlist</div><div class='del'>-	  if test "X$oldobjs" = "X" ; then</div><div class='del'>-	    eval cmds=\"\$concat_cmds\"</div><div class='del'>-	  else</div><div class='del'>-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-      fi</div><div class='del'>-      func_execute_cmds "$cmds" 'exit $?'</div><div class='del'>-    done</div><div class='del'>-</div><div class='del'>-    test -n "$generated" &amp;&amp; \</div><div class='del'>-      func_show_eval "${RM}r$generated"</div><div class='del'>-</div><div class='del'>-    # Now create the libtool archive.</div><div class='del'>-    case $output in</div><div class='del'>-    *.la)</div><div class='del'>-      old_library=</div><div class='del'>-      test "$build_old_libs" = yes &amp;&amp; old_library="$libname.$libext"</div><div class='del'>-      func_verbose "creating $output"</div><div class='del'>-</div><div class='del'>-      # Preserve any variables that may affect compiler behavior</div><div class='del'>-      for var in $variables_saved_for_relink; do</div><div class='del'>-	if eval test -z \"\${$var+set}\"; then</div><div class='del'>-	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"</div><div class='del'>-	elif eval var_value=\$$var; test -z "$var_value"; then</div><div class='del'>-	  relink_command="$var=; export $var; $relink_command"</div><div class='del'>-	else</div><div class='del'>-	  func_quote_for_eval "$var_value"</div><div class='del'>-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"</div><div class='del'>-	fi</div><div class='del'>-      done</div><div class='del'>-      # Quote the link command for shipping.</div><div class='del'>-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"</div><div class='del'>-      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`</div><div class='del'>-      if test "$hardcode_automatic" = yes ; then</div><div class='del'>-	relink_command=</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Only create the output if not a dry run.</div><div class='del'>-      $opt_dry_run || {</div><div class='del'>-	for installed in no yes; do</div><div class='del'>-	  if test "$installed" = yes; then</div><div class='del'>-	    if test -z "$install_libdir"; then</div><div class='del'>-	      break</div><div class='del'>-	    fi</div><div class='del'>-	    output="$output_objdir/$outputname"i</div><div class='del'>-	    # Replace all uninstalled libtool libraries with the installed ones</div><div class='del'>-	    newdependency_libs=</div><div class='del'>-	    for deplib in $dependency_libs; do</div><div class='del'>-	      case $deplib in</div><div class='del'>-	      *.la)</div><div class='del'>-		func_basename "$deplib"</div><div class='del'>-		name="$func_basename_result"</div><div class='del'>-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`</div><div class='del'>-		test -z "$libdir" &amp;&amp; \</div><div class='del'>-		  func_fatal_error "\`$deplib' is not a valid libtool archive"</div><div class='del'>-		newdependency_libs="$newdependency_libs $libdir/$name"</div><div class='del'>-		;;</div><div class='del'>-	      *) newdependency_libs="$newdependency_libs $deplib" ;;</div><div class='del'>-	      esac</div><div class='del'>-	    done</div><div class='del'>-	    dependency_libs="$newdependency_libs"</div><div class='del'>-	    newdlfiles=</div><div class='del'>-</div><div class='del'>-	    for lib in $dlfiles; do</div><div class='del'>-	      case $lib in</div><div class='del'>-	      *.la)</div><div class='del'>-	        func_basename "$lib"</div><div class='del'>-		name="$func_basename_result"</div><div class='del'>-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`</div><div class='del'>-		test -z "$libdir" &amp;&amp; \</div><div class='del'>-		  func_fatal_error "\`$lib' is not a valid libtool archive"</div><div class='del'>-		newdlfiles="$newdlfiles $libdir/$name"</div><div class='del'>-		;;</div><div class='del'>-	      *) newdlfiles="$newdlfiles $lib" ;;</div><div class='del'>-	      esac</div><div class='del'>-	    done</div><div class='del'>-	    dlfiles="$newdlfiles"</div><div class='del'>-	    newdlprefiles=</div><div class='del'>-	    for lib in $dlprefiles; do</div><div class='del'>-	      case $lib in</div><div class='del'>-	      *.la)</div><div class='del'>-		# Only pass preopened files to the pseudo-archive (for</div><div class='del'>-		# eventual linking with the app. that links it) if we</div><div class='del'>-		# didn't already link the preopened objects directly into</div><div class='del'>-		# the library:</div><div class='del'>-		func_basename "$lib"</div><div class='del'>-		name="$func_basename_result"</div><div class='del'>-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`</div><div class='del'>-		test -z "$libdir" &amp;&amp; \</div><div class='del'>-		  func_fatal_error "\`$lib' is not a valid libtool archive"</div><div class='del'>-		newdlprefiles="$newdlprefiles $libdir/$name"</div><div class='del'>-		;;</div><div class='del'>-	      esac</div><div class='del'>-	    done</div><div class='del'>-	    dlprefiles="$newdlprefiles"</div><div class='del'>-	  else</div><div class='del'>-	    newdlfiles=</div><div class='del'>-	    for lib in $dlfiles; do</div><div class='del'>-	      case $lib in</div><div class='del'>-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;</div><div class='del'>-		*) abs=`pwd`"/$lib" ;;</div><div class='del'>-	      esac</div><div class='del'>-	      newdlfiles="$newdlfiles $abs"</div><div class='del'>-	    done</div><div class='del'>-	    dlfiles="$newdlfiles"</div><div class='del'>-	    newdlprefiles=</div><div class='del'>-	    for lib in $dlprefiles; do</div><div class='del'>-	      case $lib in</div><div class='del'>-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;</div><div class='del'>-		*) abs=`pwd`"/$lib" ;;</div><div class='del'>-	      esac</div><div class='del'>-	      newdlprefiles="$newdlprefiles $abs"</div><div class='del'>-	    done</div><div class='del'>-	    dlprefiles="$newdlprefiles"</div><div class='del'>-	  fi</div><div class='del'>-	  $RM $output</div><div class='del'>-	  # place dlname in correct position for cygwin</div><div class='del'>-	  tdlname=$dlname</div><div class='del'>-	  case $host,$output,$installed,$module,$dlname in</div><div class='del'>-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;</div><div class='del'>-	  esac</div><div class='del'>-	  $ECHO &gt; $output "\</div><div class='del'>-# $outputname - a libtool library file</div><div class='del'>-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION</div><div class='del'>-#</div><div class='del'>-# Please DO NOT delete this file!</div><div class='del'>-# It is necessary for linking the library.</div><div class='del'>-</div><div class='del'>-# The name that we can dlopen(3).</div><div class='del'>-dlname='$tdlname'</div><div class='del'>-</div><div class='del'>-# Names of this library.</div><div class='del'>-library_names='$library_names'</div><div class='del'>-</div><div class='del'>-# The name of the static archive.</div><div class='del'>-old_library='$old_library'</div><div class='del'>-</div><div class='del'>-# Linker flags that can not go in dependency_libs.</div><div class='del'>-inherited_linker_flags='$new_inherited_linker_flags'</div><div class='del'>-</div><div class='del'>-# Libraries that this one depends upon.</div><div class='del'>-dependency_libs='$dependency_libs'</div><div class='del'>-</div><div class='del'>-# Names of additional weak libraries provided by this library</div><div class='del'>-weak_library_names='$weak_libs'</div><div class='del'>-</div><div class='del'>-# Version information for $libname.</div><div class='del'>-current=$current</div><div class='del'>-age=$age</div><div class='del'>-revision=$revision</div><div class='del'>-</div><div class='del'>-# Is this an already installed library?</div><div class='del'>-installed=$installed</div><div class='del'>-</div><div class='del'>-# Should we warn about portability when linking against -modules?</div><div class='del'>-shouldnotlink=$module</div><div class='del'>-</div><div class='del'>-# Files to dlopen/dlpreopen</div><div class='del'>-dlopen='$dlfiles'</div><div class='del'>-dlpreopen='$dlprefiles'</div><div class='del'>-</div><div class='del'>-# Directory that this library needs to be installed in:</div><div class='del'>-libdir='$install_libdir'"</div><div class='del'>-	  if test "$installed" = no &amp;&amp; test "$need_relink" = yes; then</div><div class='del'>-	    $ECHO &gt;&gt; $output "\</div><div class='del'>-relink_command=\"$relink_command\""</div><div class='del'>-	  fi</div><div class='del'>-	done</div><div class='del'>-      }</div><div class='del'>-</div><div class='del'>-      # Do a symbolic link so that the libtool archive can be found in</div><div class='del'>-      # LD_LIBRARY_PATH before the program is installed.</div><div class='del'>-      func_show_eval '( cd "$output_objdir" &amp;&amp; $RM "$outputname" &amp;&amp; $LN_S "../$outputname" "$outputname" )' 'exit $?'</div><div class='del'>-      ;;</div><div class='del'>-    esac</div><div class='del'>-    exit $EXIT_SUCCESS</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-{ test "$mode" = link || test "$mode" = relink; } &amp;&amp;</div><div class='del'>-    func_mode_link ${1+"$@"}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# func_mode_uninstall arg...</div><div class='del'>-func_mode_uninstall ()</div><div class='del'>-{</div><div class='del'>-    $opt_debug</div><div class='del'>-    RM="$nonopt"</div><div class='del'>-    files=</div><div class='del'>-    rmforce=</div><div class='del'>-    exit_status=0</div><div class='del'>-</div><div class='del'>-    # This variable tells wrapper scripts just to set variables rather</div><div class='del'>-    # than running their programs.</div><div class='del'>-    libtool_install_magic="$magic"</div><div class='del'>-</div><div class='del'>-    for arg</div><div class='del'>-    do</div><div class='del'>-      case $arg in</div><div class='del'>-      -f) RM="$RM $arg"; rmforce=yes ;;</div><div class='del'>-      -*) RM="$RM $arg" ;;</div><div class='del'>-      *) files="$files $arg" ;;</div><div class='del'>-      esac</div><div class='del'>-    done</div><div class='del'>-</div><div class='del'>-    test -z "$RM" &amp;&amp; \</div><div class='del'>-      func_fatal_help "you must specify an RM program"</div><div class='del'>-</div><div class='del'>-    rmdirs=</div><div class='del'>-</div><div class='del'>-    origobjdir="$objdir"</div><div class='del'>-    for file in $files; do</div><div class='del'>-      func_dirname "$file" "" "."</div><div class='del'>-      dir="$func_dirname_result"</div><div class='del'>-      if test "X$dir" = X.; then</div><div class='del'>-	objdir="$origobjdir"</div><div class='del'>-      else</div><div class='del'>-	objdir="$dir/$origobjdir"</div><div class='del'>-      fi</div><div class='del'>-      func_basename "$file"</div><div class='del'>-      name="$func_basename_result"</div><div class='del'>-      test "$mode" = uninstall &amp;&amp; objdir="$dir"</div><div class='del'>-</div><div class='del'>-      # Remember objdir for removal later, being careful to avoid duplicates</div><div class='del'>-      if test "$mode" = clean; then</div><div class='del'>-	case " $rmdirs " in</div><div class='del'>-	  *" $objdir "*) ;;</div><div class='del'>-	  *) rmdirs="$rmdirs $objdir" ;;</div><div class='del'>-	esac</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      # Don't error if the file doesn't exist and rm -f was used.</div><div class='del'>-      if { test -L "$file"; } &gt;/dev/null 2&gt;&amp;1 ||</div><div class='del'>-	 { test -h "$file"; } &gt;/dev/null 2&gt;&amp;1 ||</div><div class='del'>-	 test -f "$file"; then</div><div class='del'>-	:</div><div class='del'>-      elif test -d "$file"; then</div><div class='del'>-	exit_status=1</div><div class='del'>-	continue</div><div class='del'>-      elif test "$rmforce" = yes; then</div><div class='del'>-	continue</div><div class='del'>-      fi</div><div class='del'>-</div><div class='del'>-      rmfiles="$file"</div><div class='del'>-</div><div class='del'>-      case $name in</div><div class='del'>-      *.la)</div><div class='del'>-	# Possibly a libtool archive, so verify it.</div><div class='del'>-	if func_lalib_p "$file"; then</div><div class='del'>-	  func_source $dir/$name</div><div class='del'>-</div><div class='del'>-	  # Delete the libtool libraries and symlinks.</div><div class='del'>-	  for n in $library_names; do</div><div class='del'>-	    rmfiles="$rmfiles $objdir/$n"</div><div class='del'>-	  done</div><div class='del'>-	  test -n "$old_library" &amp;&amp; rmfiles="$rmfiles $objdir/$old_library"</div><div class='del'>-</div><div class='del'>-	  case "$mode" in</div><div class='del'>-	  clean)</div><div class='del'>-	    case "  $library_names " in</div><div class='del'>-	    # "  " in the beginning catches empty $dlname</div><div class='del'>-	    *" $dlname "*) ;;</div><div class='del'>-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;</div><div class='del'>-	    esac</div><div class='del'>-	    test -n "$libdir" &amp;&amp; rmfiles="$rmfiles $objdir/$name $objdir/${name}i"</div><div class='del'>-	    ;;</div><div class='del'>-	  uninstall)</div><div class='del'>-	    if test -n "$library_names"; then</div><div class='del'>-	      # Do each command in the postuninstall commands.</div><div class='del'>-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'</div><div class='del'>-	    fi</div><div class='del'>-</div><div class='del'>-	    if test -n "$old_library"; then</div><div class='del'>-	      # Do each command in the old_postuninstall commands.</div><div class='del'>-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'</div><div class='del'>-	    fi</div><div class='del'>-	    # FIXME: should reinstall the best remaining shared library.</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      *.lo)</div><div class='del'>-	# Possibly a libtool object, so verify it.</div><div class='del'>-	if func_lalib_p "$file"; then</div><div class='del'>-</div><div class='del'>-	  # Read the .lo file</div><div class='del'>-	  func_source $dir/$name</div><div class='del'>-</div><div class='del'>-	  # Add PIC object to the list of files to remove.</div><div class='del'>-	  if test -n "$pic_object" &amp;&amp;</div><div class='del'>-	     test "$pic_object" != none; then</div><div class='del'>-	    rmfiles="$rmfiles $dir/$pic_object"</div><div class='del'>-	  fi</div><div class='del'>-</div><div class='del'>-	  # Add non-PIC object to the list of files to remove.</div><div class='del'>-	  if test -n "$non_pic_object" &amp;&amp;</div><div class='del'>-	     test "$non_pic_object" != none; then</div><div class='del'>-	    rmfiles="$rmfiles $dir/$non_pic_object"</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-      *)</div><div class='del'>-	if test "$mode" = clean ; then</div><div class='del'>-	  noexename=$name</div><div class='del'>-	  case $file in</div><div class='del'>-	  *.exe)</div><div class='del'>-	    func_stripname '' '.exe' "$file"</div><div class='del'>-	    file=$func_stripname_result</div><div class='del'>-	    func_stripname '' '.exe' "$name"</div><div class='del'>-	    noexename=$func_stripname_result</div><div class='del'>-	    # $file with .exe has already been added to rmfiles,</div><div class='del'>-	    # add $file without .exe</div><div class='del'>-	    rmfiles="$rmfiles $file"</div><div class='del'>-	    ;;</div><div class='del'>-	  esac</div><div class='del'>-	  # Do a test to see if this is a libtool program.</div><div class='del'>-	  if func_ltwrapper_p "$file"; then</div><div class='del'>-	    if func_ltwrapper_executable_p "$file"; then</div><div class='del'>-	      func_ltwrapper_scriptname "$file"</div><div class='del'>-	      relink_command=</div><div class='del'>-	      func_source $func_ltwrapper_scriptname_result</div><div class='del'>-	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"</div><div class='del'>-	    else</div><div class='del'>-	      relink_command=</div><div class='del'>-	      func_source $dir/$noexename</div><div class='del'>-	    fi</div><div class='del'>-</div><div class='del'>-	    # note $name still contains .exe if it was in $file originally</div><div class='del'>-	    # as does the version of $file that was added into $rmfiles</div><div class='del'>-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"</div><div class='del'>-	    if test "$fast_install" = yes &amp;&amp; test -n "$relink_command"; then</div><div class='del'>-	      rmfiles="$rmfiles $objdir/lt-$name"</div><div class='del'>-	    fi</div><div class='del'>-	    if test "X$noexename" != "X$name" ; then</div><div class='del'>-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"</div><div class='del'>-	    fi</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-      esac</div><div class='del'>-      func_show_eval "$RM $rmfiles" 'exit_status=1'</div><div class='del'>-    done</div><div class='del'>-    objdir="$origobjdir"</div><div class='del'>-</div><div class='del'>-    # Try to remove the ${objdir}s in the directories where we deleted files</div><div class='del'>-    for dir in $rmdirs; do</div><div class='del'>-      if test -d "$dir"; then</div><div class='del'>-	func_show_eval "rmdir $dir &gt;/dev/null 2&gt;&amp;1"</div><div class='del'>-      fi</div><div class='del'>-    done</div><div class='del'>-</div><div class='del'>-    exit $exit_status</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-{ test "$mode" = uninstall || test "$mode" = clean; } &amp;&amp;</div><div class='del'>-    func_mode_uninstall ${1+"$@"}</div><div class='del'>-</div><div class='del'>-test -z "$mode" &amp;&amp; {</div><div class='del'>-  help="$generic_help"</div><div class='del'>-  func_fatal_help "you must specify a MODE"</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-test -z "$exec_cmd" &amp;&amp; \</div><div class='del'>-  func_fatal_help "invalid operation mode \`$mode'"</div><div class='del'>-</div><div class='del'>-if test -n "$exec_cmd"; then</div><div class='del'>-  eval exec "$exec_cmd"</div><div class='del'>-  exit $EXIT_FAILURE</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-exit $exit_status</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# The TAGs below are defined such that we never get into a situation</div><div class='del'>-# in which we disable both kinds of libraries.  Given conflicting</div><div class='del'>-# choices, we go for a static library, that is the most portable,</div><div class='del'>-# since we can't tell whether shared libraries were disabled because</div><div class='del'>-# the user asked for that or because the platform doesn't support</div><div class='del'>-# them.  This is particularly important on AIX, because we don't</div><div class='del'>-# support having both static and shared libraries enabled at the same</div><div class='del'>-# time on that platform, so we default to a shared-only configuration.</div><div class='del'>-# If a disable-shared tag is given, we'll fallback to a static-only</div><div class='del'>-# configuration.  But we'll never go from static-only to shared-only.</div><div class='del'>-</div><div class='del'>-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared</div><div class='del'>-build_libtool_libs=no</div><div class='del'>-build_old_libs=yes</div><div class='del'>-# ### END LIBTOOL TAG CONFIG: disable-shared</div><div class='del'>-</div><div class='del'>-# ### BEGIN LIBTOOL TAG CONFIG: disable-static</div><div class='del'>-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`</div><div class='del'>-# ### END LIBTOOL TAG CONFIG: disable-static</div><div class='del'>-</div><div class='del'>-# Local Variables:</div><div class='del'>-# mode:shell-script</div><div class='del'>-# sh-indentation:2</div><div class='del'>-# End:</div><div class='del'>-# vi:sw=2</div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libpng/missing b/src/3rdparty/libpng/missing<br/>deleted file mode 100755<br/>index 28055d2..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/missing?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/missing</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,376 +0,0 @@</div><div class='del'>-#! /bin/sh</div><div class='del'>-# Common stub for a few missing GNU programs while installing.</div><div class='del'>-</div><div class='del'>-scriptversion=2009-04-28.21; # UTC</div><div class='del'>-</div><div class='del'>-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,</div><div class='del'>-# 2008, 2009 Free Software Foundation, Inc.</div><div class='del'>-# Originally by Fran,cois Pinard &lt;pinard@iro.umontreal.ca&gt;, 1996.</div><div class='del'>-</div><div class='del'>-# This program is free software; you can redistribute it and/or modify</div><div class='del'>-# it under the terms of the GNU General Public License as published by</div><div class='del'>-# the Free Software Foundation; either version 2, or (at your option)</div><div class='del'>-# any later version.</div><div class='del'>-</div><div class='del'>-# This program is distributed in the hope that it will be useful,</div><div class='del'>-# but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-# GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-# You should have received a copy of the GNU General Public License</div><div class='del'>-# along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>-</div><div class='del'>-# As a special exception to the GNU General Public License, if you</div><div class='del'>-# distribute this file as part of a program that contains a</div><div class='del'>-# configuration script generated by Autoconf, you may include it under</div><div class='del'>-# the same distribution terms that you use for the rest of that program.</div><div class='del'>-</div><div class='del'>-if test $# -eq 0; then</div><div class='del'>-  echo 1&gt;&amp;2 "Try \`$0 --help' for more information"</div><div class='del'>-  exit 1</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-run=:</div><div class='del'>-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'</div><div class='del'>-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'</div><div class='del'>-</div><div class='del'>-# In the cases where this matters, `missing' is being run in the</div><div class='del'>-# srcdir already.</div><div class='del'>-if test -f configure.ac; then</div><div class='del'>-  configure_ac=configure.ac</div><div class='del'>-else</div><div class='del'>-  configure_ac=configure.in</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-msg="missing on your system"</div><div class='del'>-</div><div class='del'>-case $1 in</div><div class='del'>---run)</div><div class='del'>-  # Try to run requested program, and just exit if it succeeds.</div><div class='del'>-  run=</div><div class='del'>-  shift</div><div class='del'>-  "$@" &amp;&amp; exit 0</div><div class='del'>-  # Exit code 63 means version mismatch.  This often happens</div><div class='del'>-  # when the user try to use an ancient version of a tool on</div><div class='del'>-  # a file that requires a minimum version.  In this case we</div><div class='del'>-  # we should proceed has if the program had been absent, or</div><div class='del'>-  # if --run hadn't been passed.</div><div class='del'>-  if test $? = 63; then</div><div class='del'>-    run=:</div><div class='del'>-    msg="probably too old"</div><div class='del'>-  fi</div><div class='del'>-  ;;</div><div class='del'>-</div><div class='del'>-  -h|--h|--he|--hel|--help)</div><div class='del'>-    echo "\</div><div class='del'>-$0 [OPTION]... PROGRAM [ARGUMENT]...</div><div class='del'>-</div><div class='del'>-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an</div><div class='del'>-error status if there is no known handling for PROGRAM.</div><div class='del'>-</div><div class='del'>-Options:</div><div class='del'>-  -h, --help      display this help and exit</div><div class='del'>-  -v, --version   output version information and exit</div><div class='del'>-  --run           try to run the given command, and emulate it if it fails</div><div class='del'>-</div><div class='del'>-Supported PROGRAM values:</div><div class='del'>-  aclocal      touch file \`aclocal.m4'</div><div class='del'>-  autoconf     touch file \`configure'</div><div class='del'>-  autoheader   touch file \`config.h.in'</div><div class='del'>-  autom4te     touch the output file, or create a stub one</div><div class='del'>-  automake     touch all \`Makefile.in' files</div><div class='del'>-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]</div><div class='del'>-  flex         create \`lex.yy.c', if possible, from existing .c</div><div class='del'>-  help2man     touch the output file</div><div class='del'>-  lex          create \`lex.yy.c', if possible, from existing .c</div><div class='del'>-  makeinfo     touch the output file</div><div class='del'>-  tar          try tar, gnutar, gtar, then tar without non-portable flags</div><div class='del'>-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]</div><div class='del'>-</div><div class='del'>-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and</div><div class='del'>-\`g' are ignored when checking the name.</div><div class='del'>-</div><div class='del'>-Send bug reports to &lt;bug-automake@gnu.org&gt;."</div><div class='del'>-    exit $?</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)</div><div class='del'>-    echo "missing $scriptversion (GNU Automake)"</div><div class='del'>-    exit $?</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  -*)</div><div class='del'>-    echo 1&gt;&amp;2 "$0: Unknown \`$1' option"</div><div class='del'>-    echo 1&gt;&amp;2 "Try \`$0 --help' for more information"</div><div class='del'>-    exit 1</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# normalize program name to check for.</div><div class='del'>-program=`echo "$1" | sed '</div><div class='del'>-  s/^gnu-//; t</div><div class='del'>-  s/^gnu//; t</div><div class='del'>-  s/^g//; t'`</div><div class='del'>-</div><div class='del'>-# Now exit if we have it, but it failed.  Also exit now if we</div><div class='del'>-# don't have it and --version was passed (most likely to detect</div><div class='del'>-# the program).  This is about non-GNU programs, so use $1 not</div><div class='del'>-# $program.</div><div class='del'>-case $1 in</div><div class='del'>-  lex*|yacc*)</div><div class='del'>-    # Not GNU programs, they don't have --version.</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  tar*)</div><div class='del'>-    if test -n "$run"; then</div><div class='del'>-       echo 1&gt;&amp;2 "ERROR: \`tar' requires --run"</div><div class='del'>-       exit 1</div><div class='del'>-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then</div><div class='del'>-       exit 1</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  *)</div><div class='del'>-    if test -z "$run" &amp;&amp; ($1 --version) &gt; /dev/null 2&gt;&amp;1; then</div><div class='del'>-       # We have it, but it failed.</div><div class='del'>-       exit 1</div><div class='del'>-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then</div><div class='del'>-       # Could not run --version or --help.  This is probably someone</div><div class='del'>-       # running `$TOOL --version' or `$TOOL --help' to check whether</div><div class='del'>-       # $TOOL exists and not knowing $TOOL uses missing.</div><div class='del'>-       exit 1</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# If it does not exist, or fails to run (possibly an outdated version),</div><div class='del'>-# try to emulate it.</div><div class='del'>-case $program in</div><div class='del'>-  aclocal*)</div><div class='del'>-    echo 1&gt;&amp;2 "\</div><div class='del'>-WARNING: \`$1' is $msg.  You should only need it if</div><div class='del'>-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want</div><div class='del'>-         to install the \`Automake' and \`Perl' packages.  Grab them from</div><div class='del'>-         any GNU archive site."</div><div class='del'>-    touch aclocal.m4</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  autoconf*)</div><div class='del'>-    echo 1&gt;&amp;2 "\</div><div class='del'>-WARNING: \`$1' is $msg.  You should only need it if</div><div class='del'>-         you modified \`${configure_ac}'.  You might want to install the</div><div class='del'>-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU</div><div class='del'>-         archive site."</div><div class='del'>-    touch configure</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  autoheader*)</div><div class='del'>-    echo 1&gt;&amp;2 "\</div><div class='del'>-WARNING: \`$1' is $msg.  You should only need it if</div><div class='del'>-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want</div><div class='del'>-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them</div><div class='del'>-         from any GNU archive site."</div><div class='del'>-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`</div><div class='del'>-    test -z "$files" &amp;&amp; files="config.h"</div><div class='del'>-    touch_files=</div><div class='del'>-    for f in $files; do</div><div class='del'>-      case $f in</div><div class='del'>-      *:*) touch_files="$touch_files "`echo "$f" |</div><div class='del'>-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;</div><div class='del'>-      *) touch_files="$touch_files $f.in";;</div><div class='del'>-      esac</div><div class='del'>-    done</div><div class='del'>-    touch $touch_files</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  automake*)</div><div class='del'>-    echo 1&gt;&amp;2 "\</div><div class='del'>-WARNING: \`$1' is $msg.  You should only need it if</div><div class='del'>-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.</div><div class='del'>-         You might want to install the \`Automake' and \`Perl' packages.</div><div class='del'>-         Grab them from any GNU archive site."</div><div class='del'>-    find . -type f -name Makefile.am -print |</div><div class='del'>-	   sed 's/\.am$/.in/' |</div><div class='del'>-	   while read f; do touch "$f"; done</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  autom4te*)</div><div class='del'>-    echo 1&gt;&amp;2 "\</div><div class='del'>-WARNING: \`$1' is needed, but is $msg.</div><div class='del'>-         You might have modified some files without having the</div><div class='del'>-         proper tools for further handling them.</div><div class='del'>-         You can get \`$1' as part of \`Autoconf' from any GNU</div><div class='del'>-         archive site."</div><div class='del'>-</div><div class='del'>-    file=`echo "$*" | sed -n "$sed_output"`</div><div class='del'>-    test -z "$file" &amp;&amp; file=`echo "$*" | sed -n "$sed_minuso"`</div><div class='del'>-    if test -f "$file"; then</div><div class='del'>-	touch $file</div><div class='del'>-    else</div><div class='del'>-	test -z "$file" || exec &gt;$file</div><div class='del'>-	echo "#! /bin/sh"</div><div class='del'>-	echo "# Created by GNU Automake missing as a replacement of"</div><div class='del'>-	echo "#  $ $@"</div><div class='del'>-	echo "exit 0"</div><div class='del'>-	chmod +x $file</div><div class='del'>-	exit 1</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  bison*|yacc*)</div><div class='del'>-    echo 1&gt;&amp;2 "\</div><div class='del'>-WARNING: \`$1' $msg.  You should only need it if</div><div class='del'>-         you modified a \`.y' file.  You may need the \`Bison' package</div><div class='del'>-         in order for those modifications to take effect.  You can get</div><div class='del'>-         \`Bison' from any GNU archive site."</div><div class='del'>-    rm -f y.tab.c y.tab.h</div><div class='del'>-    if test $# -ne 1; then</div><div class='del'>-        eval LASTARG="\${$#}"</div><div class='del'>-	case $LASTARG in</div><div class='del'>-	*.y)</div><div class='del'>-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`</div><div class='del'>-	    if test -f "$SRCFILE"; then</div><div class='del'>-	         cp "$SRCFILE" y.tab.c</div><div class='del'>-	    fi</div><div class='del'>-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`</div><div class='del'>-	    if test -f "$SRCFILE"; then</div><div class='del'>-	         cp "$SRCFILE" y.tab.h</div><div class='del'>-	    fi</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-    fi</div><div class='del'>-    if test ! -f y.tab.h; then</div><div class='del'>-	echo &gt;y.tab.h</div><div class='del'>-    fi</div><div class='del'>-    if test ! -f y.tab.c; then</div><div class='del'>-	echo 'main() { return 0; }' &gt;y.tab.c</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  lex*|flex*)</div><div class='del'>-    echo 1&gt;&amp;2 "\</div><div class='del'>-WARNING: \`$1' is $msg.  You should only need it if</div><div class='del'>-         you modified a \`.l' file.  You may need the \`Flex' package</div><div class='del'>-         in order for those modifications to take effect.  You can get</div><div class='del'>-         \`Flex' from any GNU archive site."</div><div class='del'>-    rm -f lex.yy.c</div><div class='del'>-    if test $# -ne 1; then</div><div class='del'>-        eval LASTARG="\${$#}"</div><div class='del'>-	case $LASTARG in</div><div class='del'>-	*.l)</div><div class='del'>-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`</div><div class='del'>-	    if test -f "$SRCFILE"; then</div><div class='del'>-	         cp "$SRCFILE" lex.yy.c</div><div class='del'>-	    fi</div><div class='del'>-	  ;;</div><div class='del'>-	esac</div><div class='del'>-    fi</div><div class='del'>-    if test ! -f lex.yy.c; then</div><div class='del'>-	echo 'main() { return 0; }' &gt;lex.yy.c</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  help2man*)</div><div class='del'>-    echo 1&gt;&amp;2 "\</div><div class='del'>-WARNING: \`$1' is $msg.  You should only need it if</div><div class='del'>-	 you modified a dependency of a manual page.  You may need the</div><div class='del'>-	 \`Help2man' package in order for those modifications to take</div><div class='del'>-	 effect.  You can get \`Help2man' from any GNU archive site."</div><div class='del'>-</div><div class='del'>-    file=`echo "$*" | sed -n "$sed_output"`</div><div class='del'>-    test -z "$file" &amp;&amp; file=`echo "$*" | sed -n "$sed_minuso"`</div><div class='del'>-    if test -f "$file"; then</div><div class='del'>-	touch $file</div><div class='del'>-    else</div><div class='del'>-	test -z "$file" || exec &gt;$file</div><div class='del'>-	echo ".ab help2man is required to generate this page"</div><div class='del'>-	exit $?</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  makeinfo*)</div><div class='del'>-    echo 1&gt;&amp;2 "\</div><div class='del'>-WARNING: \`$1' is $msg.  You should only need it if</div><div class='del'>-         you modified a \`.texi' or \`.texinfo' file, or any other file</div><div class='del'>-         indirectly affecting the aspect of the manual.  The spurious</div><div class='del'>-         call might also be the consequence of using a buggy \`make' (AIX,</div><div class='del'>-         DU, IRIX).  You might want to install the \`Texinfo' package or</div><div class='del'>-         the \`GNU make' package.  Grab either from any GNU archive site."</div><div class='del'>-    # The file to touch is that specified with -o ...</div><div class='del'>-    file=`echo "$*" | sed -n "$sed_output"`</div><div class='del'>-    test -z "$file" &amp;&amp; file=`echo "$*" | sed -n "$sed_minuso"`</div><div class='del'>-    if test -z "$file"; then</div><div class='del'>-      # ... or it is the one specified with @setfilename ...</div><div class='del'>-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`</div><div class='del'>-      file=`sed -n '</div><div class='del'>-	/^@setfilename/{</div><div class='del'>-	  s/.* \([^ ]*\) *$/\1/</div><div class='del'>-	  p</div><div class='del'>-	  q</div><div class='del'>-	}' $infile`</div><div class='del'>-      # ... or it is derived from the source name (dir/f.texi becomes f.info)</div><div class='del'>-      test -z "$file" &amp;&amp; file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info</div><div class='del'>-    fi</div><div class='del'>-    # If the file does not exist, the user really needs makeinfo;</div><div class='del'>-    # let's fail without touching anything.</div><div class='del'>-    test -f $file || exit 1</div><div class='del'>-    touch $file</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  tar*)</div><div class='del'>-    shift</div><div class='del'>-</div><div class='del'>-    # We have already tried tar in the generic part.</div><div class='del'>-    # Look for gnutar/gtar before invocation to avoid ugly error</div><div class='del'>-    # messages.</div><div class='del'>-    if (gnutar --version &gt; /dev/null 2&gt;&amp;1); then</div><div class='del'>-       gnutar "$@" &amp;&amp; exit 0</div><div class='del'>-    fi</div><div class='del'>-    if (gtar --version &gt; /dev/null 2&gt;&amp;1); then</div><div class='del'>-       gtar "$@" &amp;&amp; exit 0</div><div class='del'>-    fi</div><div class='del'>-    firstarg="$1"</div><div class='del'>-    if shift; then</div><div class='del'>-	case $firstarg in</div><div class='del'>-	*o*)</div><div class='del'>-	    firstarg=`echo "$firstarg" | sed s/o//`</div><div class='del'>-	    tar "$firstarg" "$@" &amp;&amp; exit 0</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-	case $firstarg in</div><div class='del'>-	*h*)</div><div class='del'>-	    firstarg=`echo "$firstarg" | sed s/h//`</div><div class='del'>-	    tar "$firstarg" "$@" &amp;&amp; exit 0</div><div class='del'>-	    ;;</div><div class='del'>-	esac</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    echo 1&gt;&amp;2 "\</div><div class='del'>-WARNING: I can't seem to be able to run \`tar' with the given arguments.</div><div class='del'>-         You may want to install GNU tar or Free paxutils, or check the</div><div class='del'>-         command line arguments."</div><div class='del'>-    exit 1</div><div class='del'>-    ;;</div><div class='del'>-</div><div class='del'>-  *)</div><div class='del'>-    echo 1&gt;&amp;2 "\</div><div class='del'>-WARNING: \`$1' is needed, and is $msg.</div><div class='del'>-         You might have modified some files without having the</div><div class='del'>-         proper tools for further handling them.  Check the \`README' file,</div><div class='del'>-         it often tells you about the needed prerequisites for installing</div><div class='del'>-         this package.  You may also peek at any GNU archive site, in case</div><div class='del'>-         some other package would contain this missing \`$1' program."</div><div class='del'>-    exit 1</div><div class='del'>-    ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-exit 0</div><div class='del'>-</div><div class='del'>-# Local variables:</div><div class='del'>-# eval: (add-hook 'write-file-hooks 'time-stamp)</div><div class='del'>-# time-stamp-start: "scriptversion="</div><div class='del'>-# time-stamp-format: "%:y-%02m-%02d.%02H"</div><div class='del'>-# time-stamp-time-zone: "UTC"</div><div class='del'>-# time-stamp-end: "; # UTC"</div><div class='del'>-# End:</div><div class='head'>diff --git a/src/3rdparty/libpng/mkinstalldirs b/src/3rdparty/libpng/mkinstalldirs<br/>deleted file mode 100755<br/>index 4191a45..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/mkinstalldirs?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/mkinstalldirs</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,162 +0,0 @@</div><div class='del'>-#! /bin/sh</div><div class='del'>-# mkinstalldirs --- make directory hierarchy</div><div class='del'>-</div><div class='del'>-scriptversion=2009-04-28.21; # UTC</div><div class='del'>-</div><div class='del'>-# Original author: Noah Friedman &lt;friedman@prep.ai.mit.edu&gt;</div><div class='del'>-# Created: 1993-05-16</div><div class='del'>-# Public domain.</div><div class='del'>-#</div><div class='del'>-# This file is maintained in Automake, please report</div><div class='del'>-# bugs to &lt;bug-automake@gnu.org&gt; or send patches to</div><div class='del'>-# &lt;automake-patches@gnu.org&gt;.</div><div class='del'>-</div><div class='del'>-nl='</div><div class='del'>-'</div><div class='del'>-IFS=" ""	$nl"</div><div class='del'>-errstatus=0</div><div class='del'>-dirmode=</div><div class='del'>-</div><div class='del'>-usage="\</div><div class='del'>-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...</div><div class='del'>-</div><div class='del'>-Create each directory DIR (with mode MODE, if specified), including all</div><div class='del'>-leading file name components.</div><div class='del'>-</div><div class='del'>-Report bugs to &lt;bug-automake@gnu.org&gt;."</div><div class='del'>-</div><div class='del'>-# process command line arguments</div><div class='del'>-while test $# -gt 0 ; do</div><div class='del'>-  case $1 in</div><div class='del'>-    -h | --help | --h*)         # -h for help</div><div class='del'>-      echo "$usage"</div><div class='del'>-      exit $?</div><div class='del'>-      ;;</div><div class='del'>-    -m)                         # -m PERM arg</div><div class='del'>-      shift</div><div class='del'>-      test $# -eq 0 &amp;&amp; { echo "$usage" 1&gt;&amp;2; exit 1; }</div><div class='del'>-      dirmode=$1</div><div class='del'>-      shift</div><div class='del'>-      ;;</div><div class='del'>-    --version)</div><div class='del'>-      echo "$0 $scriptversion"</div><div class='del'>-      exit $?</div><div class='del'>-      ;;</div><div class='del'>-    --)                         # stop option processing</div><div class='del'>-      shift</div><div class='del'>-      break</div><div class='del'>-      ;;</div><div class='del'>-    -*)                         # unknown option</div><div class='del'>-      echo "$usage" 1&gt;&amp;2</div><div class='del'>-      exit 1</div><div class='del'>-      ;;</div><div class='del'>-    *)                          # first non-opt arg</div><div class='del'>-      break</div><div class='del'>-      ;;</div><div class='del'>-  esac</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-for file</div><div class='del'>-do</div><div class='del'>-  if test -d "$file"; then</div><div class='del'>-    shift</div><div class='del'>-  else</div><div class='del'>-    break</div><div class='del'>-  fi</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-case $# in</div><div class='del'>-  0) exit 0 ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and</div><div class='del'>-# mkdir -p a/c at the same time, both will detect that a is missing,</div><div class='del'>-# one will create a, then the other will try to create a and die with</div><div class='del'>-# a "File exists" error.  This is a problem when calling mkinstalldirs</div><div class='del'>-# from a parallel make.  We use --version in the probe to restrict</div><div class='del'>-# ourselves to GNU mkdir, which is thread-safe.</div><div class='del'>-case $dirmode in</div><div class='del'>-  '')</div><div class='del'>-    if mkdir -p --version . &gt;/dev/null 2&gt;&amp;1 &amp;&amp; test ! -d ./--version; then</div><div class='del'>-      echo "mkdir -p -- $*"</div><div class='del'>-      exec mkdir -p -- "$@"</div><div class='del'>-    else</div><div class='del'>-      # On NextStep and OpenStep, the `mkdir' command does not</div><div class='del'>-      # recognize any option.  It will interpret all options as</div><div class='del'>-      # directories to create, and then abort because `.' already</div><div class='del'>-      # exists.</div><div class='del'>-      test -d ./-p &amp;&amp; rmdir ./-p</div><div class='del'>-      test -d ./--version &amp;&amp; rmdir ./--version</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-  *)</div><div class='del'>-    if mkdir -m "$dirmode" -p --version . &gt;/dev/null 2&gt;&amp;1 &amp;&amp;</div><div class='del'>-       test ! -d ./--version; then</div><div class='del'>-      echo "mkdir -m $dirmode -p -- $*"</div><div class='del'>-      exec mkdir -m "$dirmode" -p -- "$@"</div><div class='del'>-    else</div><div class='del'>-      # Clean up after NextStep and OpenStep mkdir.</div><div class='del'>-      for d in ./-m ./-p ./--version "./$dirmode";</div><div class='del'>-      do</div><div class='del'>-        test -d $d &amp;&amp; rmdir $d</div><div class='del'>-      done</div><div class='del'>-    fi</div><div class='del'>-    ;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-for file</div><div class='del'>-do</div><div class='del'>-  case $file in</div><div class='del'>-    /*) pathcomp=/ ;;</div><div class='del'>-    *)  pathcomp= ;;</div><div class='del'>-  esac</div><div class='del'>-  oIFS=$IFS</div><div class='del'>-  IFS=/</div><div class='del'>-  set fnord $file</div><div class='del'>-  shift</div><div class='del'>-  IFS=$oIFS</div><div class='del'>-</div><div class='del'>-  for d</div><div class='del'>-  do</div><div class='del'>-    test "x$d" = x &amp;&amp; continue</div><div class='del'>-</div><div class='del'>-    pathcomp=$pathcomp$d</div><div class='del'>-    case $pathcomp in</div><div class='del'>-      -*) pathcomp=./$pathcomp ;;</div><div class='del'>-    esac</div><div class='del'>-</div><div class='del'>-    if test ! -d "$pathcomp"; then</div><div class='del'>-      echo "mkdir $pathcomp"</div><div class='del'>-</div><div class='del'>-      mkdir "$pathcomp" || lasterr=$?</div><div class='del'>-</div><div class='del'>-      if test ! -d "$pathcomp"; then</div><div class='del'>-	errstatus=$lasterr</div><div class='del'>-      else</div><div class='del'>-	if test ! -z "$dirmode"; then</div><div class='del'>-	  echo "chmod $dirmode $pathcomp"</div><div class='del'>-	  lasterr=</div><div class='del'>-	  chmod "$dirmode" "$pathcomp" || lasterr=$?</div><div class='del'>-</div><div class='del'>-	  if test ! -z "$lasterr"; then</div><div class='del'>-	    errstatus=$lasterr</div><div class='del'>-	  fi</div><div class='del'>-	fi</div><div class='del'>-      fi</div><div class='del'>-    fi</div><div class='del'>-</div><div class='del'>-    pathcomp=$pathcomp/</div><div class='del'>-  done</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-exit $errstatus</div><div class='del'>-</div><div class='del'>-# Local Variables:</div><div class='del'>-# mode: shell-script</div><div class='del'>-# sh-indentation: 2</div><div class='del'>-# eval: (add-hook 'write-file-hooks 'time-stamp)</div><div class='del'>-# time-stamp-start: "scriptversion="</div><div class='del'>-# time-stamp-format: "%:y-%02m-%02d.%02H"</div><div class='del'>-# time-stamp-time-zone: "UTC"</div><div class='del'>-# time-stamp-end: "; # UTC"</div><div class='del'>-# End:</div><div class='head'>diff --git a/src/3rdparty/libpng/png.5 b/src/3rdparty/libpng/png.5<br/>index 6f904a9..9c5f8d3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/png.5?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/png.5</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/png.5?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/png.5</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-.TH PNG 5 "January 3, 2010"</div><div class='add'>+.TH PNG 5 "February 3, 2011"</div><div class='ctx'> .SH NAME</div><div class='ctx'> png \- Portable Network Graphics (PNG) format</div><div class='ctx'> .SH DESCRIPTION</div><div class='hunk'>@@ -18,7 +18,7 @@ gamma and chromaticity data for improved color matching on heterogeneous</div><div class='ctx'> platforms.</div><div class='ctx'> </div><div class='ctx'> .SH "SEE ALSO"</div><div class='del'>-.IR libpng(3), zlib(3), deflate(5), and zlib(5)</div><div class='add'>+.BR "libpng"(3), " libpngpf"(3), " zlib"(3), " deflate"(5), " " and " zlib"(5)</div><div class='ctx'> .LP</div><div class='ctx'> PNG specification (second edition), November 2003:</div><div class='ctx'> .IP</div><div class='head'>diff --git a/src/3rdparty/libpng/png.c b/src/3rdparty/libpng/png.c<br/>index a845a47..764f47c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/png.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/png.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/png.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/png.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> </div><div class='ctx'> /* png.c - location for general purpose libpng functions</div><div class='ctx'>  *</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Last changed in libpng 1.5.1 [February 3, 2011]</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,17 +11,10 @@</div><div class='ctx'>  * and license in png.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define PNG_NO_EXTERN</div><div class='del'>-#define PNG_NO_PEDANTIC_WARNINGS</div><div class='del'>-#include "png.h"</div><div class='ctx'> #include "pngpriv.h"</div><div class='ctx'> </div><div class='ctx'> /* Generate a compiler error if there is an old png.h in the search path. */</div><div class='del'>-typedef version_1_4_0 Your_png_h_is_not_version_1_4_0;</div><div class='del'>-</div><div class='del'>-/* Version information for C files.  This had better match the version</div><div class='del'>- * string defined in png.h.</div><div class='del'>- */</div><div class='add'>+typedef png_libpng_version_1_5_1 Your_png_h_is_not_version_1_5_1;</div><div class='ctx'> </div><div class='ctx'> /* Tells libpng that we have already handled the first "num_bytes" bytes</div><div class='ctx'>  * of the PNG file signature.  If the PNG data is embedded into another</div><div class='hunk'>@@ -53,11 +46,13 @@ png_set_sig_bytes(png_structp png_ptr, int num_bytes)</div><div class='ctx'>  * PNG signature (this is the same behaviour as strcmp, memcmp, etc).</div><div class='ctx'>  */</div><div class='ctx'> int PNGAPI</div><div class='del'>-png_sig_cmp(png_bytep sig, png_size_t start, png_size_t num_to_check)</div><div class='add'>+png_sig_cmp(png_const_bytep sig, png_size_t start, png_size_t num_to_check)</div><div class='ctx'> {</div><div class='ctx'>    png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};</div><div class='add'>+</div><div class='ctx'>    if (num_to_check &gt; 8)</div><div class='ctx'>       num_to_check = 8;</div><div class='add'>+</div><div class='ctx'>    else if (num_to_check &lt; 1)</div><div class='ctx'>       return (-1);</div><div class='ctx'> </div><div class='hunk'>@@ -73,9 +68,9 @@ png_sig_cmp(png_bytep sig, png_size_t start, png_size_t num_to_check)</div><div class='ctx'> #endif /* PNG_READ_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)</div><div class='del'>-/* Function to allocate memory for zlib and clear it to 0. */</div><div class='del'>-voidpf /* PRIVATE */</div><div class='del'>-png_zalloc(voidpf png_ptr, uInt items, uInt size)</div><div class='add'>+/* Function to allocate memory for zlib */</div><div class='add'>+PNG_FUNCTION(voidpf /* PRIVATE */,</div><div class='add'>+png_zalloc,(voidpf png_ptr, uInt items, uInt size),PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='ctx'>    png_voidp ptr;</div><div class='ctx'>    png_structp p=(png_structp)png_ptr;</div><div class='hunk'>@@ -84,6 +79,7 @@ png_zalloc(voidpf png_ptr, uInt items, uInt size)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return (NULL);</div><div class='add'>+</div><div class='ctx'>    if (items &gt; PNG_UINT_32_MAX/size)</div><div class='ctx'>    {</div><div class='ctx'>      png_warning (p, "Potential overflow in png_zalloc()");</div><div class='hunk'>@@ -120,7 +116,7 @@ png_reset_crc(png_structp png_ptr)</div><div class='ctx'>  * trouble of calculating it.</div><div class='ctx'>  */</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_calculate_crc(png_structp png_ptr, png_bytep ptr, png_size_t length)</div><div class='add'>+png_calculate_crc(png_structp png_ptr, png_const_bytep ptr, png_size_t length)</div><div class='ctx'> {</div><div class='ctx'>    int need_crc = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -130,6 +126,7 @@ png_calculate_crc(png_structp png_ptr, png_bytep ptr, png_size_t length)</div><div class='ctx'>           (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))</div><div class='ctx'>          need_crc = 0;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else                                                    /* critical */</div><div class='ctx'>    {</div><div class='ctx'>       if (png_ptr-&gt;flags &amp; PNG_FLAG_CRC_CRITICAL_IGNORE)</div><div class='hunk'>@@ -146,8 +143,8 @@ png_calculate_crc(png_structp png_ptr, png_bytep ptr, png_size_t length)</div><div class='ctx'>  * and png_info_init() so that applications that want to use a shared</div><div class='ctx'>  * libpng don't have to be recompiled if png_info changes size.</div><div class='ctx'>  */</div><div class='del'>-png_infop PNGAPI</div><div class='del'>-png_create_info_struct(png_structp png_ptr)</div><div class='add'>+PNG_FUNCTION(png_infop,PNGAPI</div><div class='add'>+png_create_info_struct,(png_structp png_ptr),PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='ctx'>    png_infop info_ptr;</div><div class='ctx'> </div><div class='hunk'>@@ -237,8 +234,10 @@ png_data_freer(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'> </div><div class='ctx'>    if (freer == PNG_DESTROY_WILL_FREE_DATA)</div><div class='ctx'>       info_ptr-&gt;free_me |= mask;</div><div class='add'>+</div><div class='ctx'>    else if (freer == PNG_USER_WILL_FREE_DATA)</div><div class='ctx'>       info_ptr-&gt;free_me &amp;= ~mask;</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       png_warning(png_ptr,</div><div class='ctx'>          "Unknown freer parameter in png_data_freer");</div><div class='hunk'>@@ -265,6 +264,7 @@ png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask,</div><div class='ctx'>             info_ptr-&gt;text[num].key = NULL;</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          int i;</div><div class='hunk'>@@ -350,6 +350,7 @@ png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask,</div><div class='ctx'>             info_ptr-&gt;splt_palettes[num].entries = NULL;</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          if (info_ptr-&gt;splt_palettes_num)</div><div class='hunk'>@@ -384,13 +385,14 @@ png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask,</div><div class='ctx'>              info_ptr-&gt;unknown_chunks[num].data = NULL;</div><div class='ctx'>           }</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          int i;</div><div class='ctx'> </div><div class='ctx'>          if (info_ptr-&gt;unknown_chunks_num)</div><div class='ctx'>          {</div><div class='del'>-            for (i = 0; i &lt; (int)info_ptr-&gt;unknown_chunks_num; i++)</div><div class='add'>+            for (i = 0; i &lt; info_ptr-&gt;unknown_chunks_num; i++)</div><div class='ctx'>                png_free_data(png_ptr, info_ptr, PNG_FREE_UNKN, i);</div><div class='ctx'> </div><div class='ctx'>             png_free(png_ptr, info_ptr-&gt;unknown_chunks);</div><div class='hunk'>@@ -439,10 +441,10 @@ png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask,</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-   if (num == -1)</div><div class='del'>-      info_ptr-&gt;free_me &amp;= ~mask;</div><div class='del'>-   else</div><div class='del'>-      info_ptr-&gt;free_me &amp;= ~(mask &amp; ~PNG_FREE_MUL);</div><div class='add'>+   if (num != -1)</div><div class='add'>+      mask &amp;= ~PNG_FREE_MUL;</div><div class='add'>+</div><div class='add'>+   info_ptr-&gt;free_me &amp;= ~mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This is an internal routine to free any memory that the info struct is</div><div class='hunk'>@@ -478,11 +480,12 @@ png_get_io_ptr(png_structp png_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return (NULL);</div><div class='add'>+</div><div class='ctx'>    return (png_ptr-&gt;io_ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)</div><div class='del'>-#ifdef PNG_STDIO_SUPPORTED</div><div class='add'>+#  ifdef PNG_STDIO_SUPPORTED</div><div class='ctx'> /* Initialize the default input/output functions for the PNG file.  If you</div><div class='ctx'>  * use your own read or write routines, you can call either png_set_read_fn()</div><div class='ctx'>  * or png_set_write_fn() instead of png_init_io().  If you have defined</div><div class='hunk'>@@ -499,14 +502,14 @@ png_init_io(png_structp png_ptr, png_FILE_p fp)</div><div class='ctx'> </div><div class='ctx'>    png_ptr-&gt;io_ptr = (png_voidp)fp;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_TIME_RFC1123_SUPPORTED</div><div class='add'>+#  ifdef PNG_TIME_RFC1123_SUPPORTED</div><div class='ctx'> /* Convert the supplied time into an RFC 1123 string suitable for use in</div><div class='ctx'>  * a "Creation Time" or other text-based time string.</div><div class='ctx'>  */</div><div class='del'>-png_charp PNGAPI</div><div class='del'>-png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime)</div><div class='add'>+png_const_charp PNGAPI</div><div class='add'>+png_convert_to_rfc1123(png_structp png_ptr, png_const_timep ptime)</div><div class='ctx'> {</div><div class='ctx'>    static PNG_CONST char short_months[12][4] =</div><div class='ctx'>         {"Jan", "Feb", "Mar", "Apr", "May", "Jun",</div><div class='hunk'>@@ -514,13 +517,14 @@ png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return (NULL);</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;time_buffer == NULL)</div><div class='ctx'>    {</div><div class='ctx'>       png_ptr-&gt;time_buffer = (png_charp)png_malloc(png_ptr, (png_uint_32)(29*</div><div class='ctx'>          png_sizeof(char)));</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-#ifdef USE_FAR_KEYWORD</div><div class='add'>+#    ifdef USE_FAR_KEYWORD</div><div class='ctx'>    {</div><div class='ctx'>       char near_time_buf[29];</div><div class='ctx'>       png_snprintf6(near_time_buf, 29, "%d %s %d %02d:%02d:%02d +0000",</div><div class='hunk'>@@ -530,38 +534,38 @@ png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime)</div><div class='ctx'>       png_memcpy(png_ptr-&gt;time_buffer, near_time_buf,</div><div class='ctx'>           29*png_sizeof(char));</div><div class='ctx'>    }</div><div class='del'>-#else</div><div class='add'>+#    else</div><div class='ctx'>    png_snprintf6(png_ptr-&gt;time_buffer, 29, "%d %s %d %02d:%02d:%02d +0000",</div><div class='ctx'>        ptime-&gt;day % 32, short_months[(ptime-&gt;month - 1) % 12],</div><div class='ctx'>        ptime-&gt;year, ptime-&gt;hour % 24, ptime-&gt;minute % 60,</div><div class='ctx'>        ptime-&gt;second % 61);</div><div class='del'>-#endif</div><div class='del'>-   return ((png_charp)png_ptr-&gt;time_buffer);</div><div class='add'>+#    endif</div><div class='add'>+   return png_ptr-&gt;time_buffer;</div><div class='ctx'> }</div><div class='del'>-#endif /* PNG_TIME_RFC1123_SUPPORTED */</div><div class='add'>+#  endif /* PNG_TIME_RFC1123_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> #endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */</div><div class='ctx'> </div><div class='del'>-png_charp PNGAPI</div><div class='del'>-png_get_copyright(png_structp png_ptr)</div><div class='add'>+png_const_charp PNGAPI</div><div class='add'>+png_get_copyright(png_const_structp png_ptr)</div><div class='ctx'> {</div><div class='del'>-   png_ptr = png_ptr;  /* Silence compiler warning about unused png_ptr */</div><div class='add'>+   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */</div><div class='ctx'> #ifdef PNG_STRING_COPYRIGHT</div><div class='del'>-      return PNG_STRING_COPYRIGHT</div><div class='add'>+   return PNG_STRING_COPYRIGHT</div><div class='ctx'> #else</div><div class='del'>-#ifdef __STDC__</div><div class='del'>-   return ((png_charp) PNG_STRING_NEWLINE \</div><div class='del'>-     "libpng version 1.4.0 - January 3, 2010" PNG_STRING_NEWLINE \</div><div class='del'>-     "Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \</div><div class='add'>+#  ifdef __STDC__</div><div class='add'>+   return PNG_STRING_NEWLINE \</div><div class='add'>+     "libpng version 1.5.1 - February 3, 2011" PNG_STRING_NEWLINE \</div><div class='add'>+     "Copyright (c) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \</div><div class='ctx'>      "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \</div><div class='ctx'>      "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \</div><div class='del'>-     PNG_STRING_NEWLINE);</div><div class='del'>-#else</div><div class='del'>-      return ((png_charp) "libpng version 1.4.0 - January 3, 2010\</div><div class='del'>-      Copyright (c) 1998-2010 Glenn Randers-Pehrson\</div><div class='add'>+     PNG_STRING_NEWLINE;</div><div class='add'>+#  else</div><div class='add'>+      return "libpng version 1.5.1 - February 3, 2011\</div><div class='add'>+      Copyright (c) 1998-2011 Glenn Randers-Pehrson\</div><div class='ctx'>       Copyright (c) 1996-1997 Andreas Dilger\</div><div class='del'>-      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");</div><div class='del'>-#endif</div><div class='add'>+      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";</div><div class='add'>+#  endif</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -573,78 +577,81 @@ png_get_copyright(png_structp png_ptr)</div><div class='ctx'>  * png_get_header_ver().  Due to the version_nn_nn_nn typedef guard,</div><div class='ctx'>  * it is guaranteed that png.c uses the correct version of png.h.</div><div class='ctx'>  */</div><div class='del'>-png_charp PNGAPI</div><div class='del'>-png_get_libpng_ver(png_structp png_ptr)</div><div class='add'>+png_const_charp PNGAPI</div><div class='add'>+png_get_libpng_ver(png_const_structp png_ptr)</div><div class='ctx'> {</div><div class='ctx'>    /* Version of *.c files used when building libpng */</div><div class='del'>-   png_ptr = png_ptr;  /* Silence compiler warning about unused png_ptr */</div><div class='del'>-   return ((png_charp) PNG_LIBPNG_VER_STRING);</div><div class='add'>+   return png_get_header_ver(png_ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-png_charp PNGAPI</div><div class='del'>-png_get_header_ver(png_structp png_ptr)</div><div class='add'>+png_const_charp PNGAPI</div><div class='add'>+png_get_header_ver(png_const_structp png_ptr)</div><div class='ctx'> {</div><div class='ctx'>    /* Version of *.h files used when building libpng */</div><div class='del'>-   png_ptr = png_ptr;  /* Silence compiler warning about unused png_ptr */</div><div class='del'>-   return ((png_charp) PNG_LIBPNG_VER_STRING);</div><div class='add'>+   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */</div><div class='add'>+   return PNG_LIBPNG_VER_STRING;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-png_charp PNGAPI</div><div class='del'>-png_get_header_version(png_structp png_ptr)</div><div class='add'>+png_const_charp PNGAPI</div><div class='add'>+png_get_header_version(png_const_structp png_ptr)</div><div class='ctx'> {</div><div class='ctx'>    /* Returns longer string containing both version and date */</div><div class='del'>-   png_ptr = png_ptr;  /* Silence compiler warning about unused png_ptr */</div><div class='add'>+   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */</div><div class='ctx'> #ifdef __STDC__</div><div class='del'>-   return ((png_charp) PNG_HEADER_VERSION_STRING</div><div class='del'>-#ifndef PNG_READ_SUPPORTED</div><div class='add'>+   return PNG_HEADER_VERSION_STRING</div><div class='add'>+#  ifndef PNG_READ_SUPPORTED</div><div class='ctx'>    "     (NO READ SUPPORT)"</div><div class='del'>-#endif</div><div class='del'>-   PNG_STRING_NEWLINE);</div><div class='add'>+#  endif</div><div class='add'>+   PNG_STRING_NEWLINE;</div><div class='ctx'> #else</div><div class='del'>-   return ((png_charp) PNG_HEADER_VERSION_STRING);</div><div class='add'>+   return PNG_HEADER_VERSION_STRING;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)</div><div class='del'>-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='add'>+#  ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='ctx'> int PNGAPI</div><div class='del'>-png_handle_as_unknown(png_structp png_ptr, png_bytep chunk_name)</div><div class='add'>+png_handle_as_unknown(png_structp png_ptr, png_const_bytep chunk_name)</div><div class='ctx'> {</div><div class='ctx'>    /* Check chunk_name and return "keep" value if it's on the list, else 0 */</div><div class='ctx'>    int i;</div><div class='ctx'>    png_bytep p;</div><div class='ctx'>    if (png_ptr == NULL || chunk_name == NULL || png_ptr-&gt;num_chunk_list&lt;=0)</div><div class='ctx'>       return 0;</div><div class='add'>+</div><div class='ctx'>    p = png_ptr-&gt;chunk_list + png_ptr-&gt;num_chunk_list*5 - 5;</div><div class='ctx'>    for (i = png_ptr-&gt;num_chunk_list; i; i--, p -= 5)</div><div class='ctx'>       if (!png_memcmp(chunk_name, p, 4))</div><div class='ctx'>         return ((int)*(p + 4));</div><div class='ctx'>    return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='add'>+#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_READ_SUPPORTED</div><div class='ctx'> /* This function, added to libpng-1.0.6g, is untested. */</div><div class='ctx'> int PNGAPI</div><div class='ctx'> png_reset_zstream(png_structp png_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return Z_STREAM_ERROR;</div><div class='add'>+</div><div class='ctx'>    return (inflateReset(&amp;png_ptr-&gt;zstream));</div><div class='ctx'> }</div><div class='del'>-#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */</div><div class='add'>+#endif /* PNG_READ_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> /* This function was added to libpng-1.0.7 */</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='ctx'> png_access_version_number(void)</div><div class='ctx'> {</div><div class='ctx'>    /* Version of *.c files used when building libpng */</div><div class='del'>-   return((png_uint_32) PNG_LIBPNG_VER);</div><div class='add'>+   return((png_uint_32)PNG_LIBPNG_VER);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)</div><div class='del'>-#ifdef PNG_SIZE_T</div><div class='add'>+#  ifdef PNG_SIZE_T</div><div class='ctx'> /* Added at libpng version 1.2.6 */</div><div class='ctx'>    PNG_EXTERN png_size_t PNGAPI png_convert_size PNGARG((size_t size));</div><div class='ctx'> png_size_t PNGAPI</div><div class='hunk'>@@ -652,53 +659,13 @@ png_convert_size(size_t size)</div><div class='ctx'> {</div><div class='ctx'>    if (size &gt; (png_size_t)-1)</div><div class='ctx'>       PNG_ABORT();  /* We haven't got access to png_ptr, so no png_error() */</div><div class='add'>+</div><div class='ctx'>    return ((png_size_t)size);</div><div class='ctx'> }</div><div class='del'>-#endif /* PNG_SIZE_T */</div><div class='add'>+#  endif /* PNG_SIZE_T */</div><div class='ctx'> </div><div class='ctx'> /* Added at libpng version 1.2.34 and 1.4.0 (moved from pngset.c) */</div><div class='del'>-#ifdef PNG_cHRM_SUPPORTED</div><div class='del'>-#ifdef PNG_CHECK_cHRM_SUPPORTED</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *    Multiply two 32-bit numbers, V1 and V2, using 32-bit</div><div class='del'>- *    arithmetic, to produce a 64 bit result in the HI/LO words.</div><div class='del'>- *</div><div class='del'>- *                  A B</div><div class='del'>- *                x C D</div><div class='del'>- *               ------</div><div class='del'>- *              AD || BD</div><div class='del'>- *        AC || CB || 0</div><div class='del'>- *</div><div class='del'>- *    where A and B are the high and low 16-bit words of V1,</div><div class='del'>- *    C and D are the 16-bit words of V2, AD is the product of</div><div class='del'>- *    A and D, and X || Y is (X &lt;&lt; 16) + Y.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-void /* PRIVATE */</div><div class='del'>-png_64bit_product (long v1, long v2, unsigned long *hi_product,</div><div class='del'>-   unsigned long *lo_product)</div><div class='del'>-{</div><div class='del'>-   int a, b, c, d;</div><div class='del'>-   long lo, hi, x, y;</div><div class='del'>-</div><div class='del'>-   a = (v1 &gt;&gt; 16) &amp; 0xffff;</div><div class='del'>-   b = v1 &amp; 0xffff;</div><div class='del'>-   c = (v2 &gt;&gt; 16) &amp; 0xffff;</div><div class='del'>-   d = v2 &amp; 0xffff;</div><div class='del'>-</div><div class='del'>-   lo = b * d;                   /* BD */</div><div class='del'>-   x = a * d + c * b;            /* AD + CB */</div><div class='del'>-   y = ((lo &gt;&gt; 16) &amp; 0xffff) + x;</div><div class='del'>-</div><div class='del'>-   lo = (lo &amp; 0xffff) | ((y &amp; 0xffff) &lt;&lt; 16);</div><div class='del'>-   hi = (y &gt;&gt; 16) &amp; 0xffff;</div><div class='del'>-</div><div class='del'>-   hi += a * c;                  /* AC */</div><div class='del'>-</div><div class='del'>-   *hi_product = (unsigned long)hi;</div><div class='del'>-   *lo_product = (unsigned long)lo;</div><div class='del'>-}</div><div class='add'>+#  ifdef PNG_CHECK_cHRM_SUPPORTED</div><div class='ctx'> </div><div class='ctx'> int /* PRIVATE */</div><div class='ctx'> png_check_cHRM_fixed(png_structp png_ptr,</div><div class='hunk'>@@ -723,14 +690,14 @@ png_check_cHRM_fixed(png_structp png_ptr,</div><div class='ctx'>         "Ignoring attempt to set negative chromaticity value");</div><div class='ctx'>       ret = 0;</div><div class='ctx'>    }</div><div class='del'>-   if (white_x &gt; (png_fixed_point) PNG_UINT_31_MAX ||</div><div class='del'>-       white_y &gt; (png_fixed_point) PNG_UINT_31_MAX ||</div><div class='del'>-         red_x &gt; (png_fixed_point) PNG_UINT_31_MAX ||</div><div class='del'>-         red_y &gt; (png_fixed_point) PNG_UINT_31_MAX ||</div><div class='del'>-       green_x &gt; (png_fixed_point) PNG_UINT_31_MAX ||</div><div class='del'>-       green_y &gt; (png_fixed_point) PNG_UINT_31_MAX ||</div><div class='del'>-        blue_x &gt; (png_fixed_point) PNG_UINT_31_MAX ||</div><div class='del'>-        blue_y &gt; (png_fixed_point) PNG_UINT_31_MAX )</div><div class='add'>+   if (white_x &gt; (png_fixed_point)PNG_UINT_31_MAX ||</div><div class='add'>+       white_y &gt; (png_fixed_point)PNG_UINT_31_MAX ||</div><div class='add'>+         red_x &gt; (png_fixed_point)PNG_UINT_31_MAX ||</div><div class='add'>+         red_y &gt; (png_fixed_point)PNG_UINT_31_MAX ||</div><div class='add'>+       green_x &gt; (png_fixed_point)PNG_UINT_31_MAX ||</div><div class='add'>+       green_y &gt; (png_fixed_point)PNG_UINT_31_MAX ||</div><div class='add'>+        blue_x &gt; (png_fixed_point)PNG_UINT_31_MAX ||</div><div class='add'>+        blue_y &gt; (png_fixed_point)PNG_UINT_31_MAX )</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr,</div><div class='ctx'>         "Ignoring attempt to set chromaticity value exceeding 21474.83");</div><div class='hunk'>@@ -741,16 +708,19 @@ png_check_cHRM_fixed(png_structp png_ptr,</div><div class='ctx'>       png_warning(png_ptr, "Invalid cHRM white point");</div><div class='ctx'>       ret = 0;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (red_x &gt; 100000L - red_y)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid cHRM red point");</div><div class='ctx'>       ret = 0;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (green_x &gt; 100000L - green_y)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid cHRM green point");</div><div class='ctx'>       ret = 0;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (blue_x &gt; 100000L - blue_y)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid cHRM blue point");</div><div class='hunk'>@@ -769,8 +739,7 @@ png_check_cHRM_fixed(png_structp png_ptr,</div><div class='ctx'> </div><div class='ctx'>    return ret;</div><div class='ctx'> }</div><div class='del'>-#endif /* PNG_CHECK_cHRM_SUPPORTED */</div><div class='del'>-#endif /* PNG_cHRM_SUPPORTED */</div><div class='add'>+#  endif /* PNG_CHECK_cHRM_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_check_IHDR(png_structp png_ptr,</div><div class='hunk'>@@ -793,21 +762,22 @@ png_check_IHDR(png_structp png_ptr,</div><div class='ctx'>       error = 1;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_SET_USER_LIMITS_SUPPORTED</div><div class='add'>+#  ifdef PNG_SET_USER_LIMITS_SUPPORTED</div><div class='ctx'>    if (width &gt; png_ptr-&gt;user_width_max || width &gt; PNG_USER_WIDTH_MAX)</div><div class='del'>-#else</div><div class='add'>+</div><div class='add'>+#  else</div><div class='ctx'>    if (width &gt; PNG_USER_WIDTH_MAX)</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Image width exceeds user limit in IHDR");</div><div class='ctx'>       error = 1;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_SET_USER_LIMITS_SUPPORTED</div><div class='add'>+#  ifdef PNG_SET_USER_LIMITS_SUPPORTED</div><div class='ctx'>    if (height &gt; png_ptr-&gt;user_height_max || height &gt; PNG_USER_HEIGHT_MAX)</div><div class='del'>-#else</div><div class='add'>+#  else</div><div class='ctx'>    if (height &gt; PNG_USER_HEIGHT_MAX)</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Image height exceeds user limit in IHDR");</div><div class='ctx'>       error = 1;</div><div class='hunk'>@@ -819,15 +789,15 @@ png_check_IHDR(png_structp png_ptr,</div><div class='ctx'>       error = 1;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-   if ( height &gt; PNG_UINT_31_MAX)</div><div class='add'>+   if (height &gt; PNG_UINT_31_MAX)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid image height in IHDR");</div><div class='ctx'>       error = 1;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-   if ( width &gt; (PNG_UINT_32_MAX</div><div class='add'>+   if (width &gt; (PNG_UINT_32_MAX</div><div class='ctx'>                  &gt;&gt; 3)      /* 8-byte RGBA pixels */</div><div class='del'>-                 - 64       /* bigrowbuf hack */</div><div class='add'>+                 - 48       /* bigrowbuf hack */</div><div class='ctx'>                  - 1        /* filter byte */</div><div class='ctx'>                  - 7*8      /* rounding of width to multiple of 8 pixels */</div><div class='ctx'>                  - 8)       /* extra max_pixel_depth pad */</div><div class='hunk'>@@ -869,7 +839,7 @@ png_check_IHDR(png_structp png_ptr,</div><div class='ctx'>       error = 1;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_MNG_FEATURES_SUPPORTED</div><div class='add'>+#  ifdef PNG_MNG_FEATURES_SUPPORTED</div><div class='ctx'>    /* Accept filter_method 64 (intrapixel differencing) only if</div><div class='ctx'>     * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and</div><div class='ctx'>     * 2. Libpng did not read a PNG signature (this filter_method is only</div><div class='hunk'>@@ -886,10 +856,10 @@ png_check_IHDR(png_structp png_ptr,</div><div class='ctx'>    if (filter_type != PNG_FILTER_TYPE_BASE)</div><div class='ctx'>    {</div><div class='ctx'>       if (!((png_ptr-&gt;mng_features_permitted &amp; PNG_FLAG_MNG_FILTER_64) &amp;&amp;</div><div class='del'>-         (filter_type == PNG_INTRAPIXEL_DIFFERENCING) &amp;&amp;</div><div class='del'>-         ((png_ptr-&gt;mode &amp; PNG_HAVE_PNG_SIGNATURE) == 0) &amp;&amp;</div><div class='del'>-         (color_type == PNG_COLOR_TYPE_RGB ||</div><div class='del'>-         color_type == PNG_COLOR_TYPE_RGB_ALPHA)))</div><div class='add'>+          (filter_type == PNG_INTRAPIXEL_DIFFERENCING) &amp;&amp;</div><div class='add'>+          ((png_ptr-&gt;mode &amp; PNG_HAVE_PNG_SIGNATURE) == 0) &amp;&amp;</div><div class='add'>+          (color_type == PNG_COLOR_TYPE_RGB ||</div><div class='add'>+          color_type == PNG_COLOR_TYPE_RGB_ALPHA)))</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr, "Unknown filter method in IHDR");</div><div class='ctx'>          error = 1;</div><div class='hunk'>@@ -902,15 +872,1491 @@ png_check_IHDR(png_structp png_ptr,</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-#else</div><div class='add'>+#  else</div><div class='ctx'>    if (filter_type != PNG_FILTER_TYPE_BASE)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Unknown filter method in IHDR");</div><div class='ctx'>       error = 1;</div><div class='ctx'>    }</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'> </div><div class='ctx'>    if (error == 1)</div><div class='ctx'>       png_error(png_ptr, "Invalid IHDR data");</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#if defined(PNG_sCAL_SUPPORTED) || defined(PNG_pCAL_SUPPORTED)</div><div class='add'>+/* ASCII to fp functions */</div><div class='add'>+/* Check an ASCII formated floating point value, see the more detailed</div><div class='add'>+ * comments in pngpriv.h</div><div class='add'>+ */</div><div class='add'>+/* The following is used internally to preserve the 'valid' flag */</div><div class='add'>+#define png_fp_add(state, flags) ((state) |= (flags))</div><div class='add'>+#define png_fp_set(state, value)\</div><div class='add'>+   ((state) = (value) | ((state) &amp; PNG_FP_WAS_VALID))</div><div class='add'>+</div><div class='add'>+/* Internal type codes: bits above the base state! */</div><div class='add'>+#define PNG_FP_SIGN   0  /* [+-] */</div><div class='add'>+#define PNG_FP_DOT    4  /* . */</div><div class='add'>+#define PNG_FP_DIGIT  8  /* [0123456789] */</div><div class='add'>+#define PNG_FP_E     12  /* [Ee] */</div><div class='add'>+</div><div class='add'>+int /* PRIVATE */</div><div class='add'>+png_check_fp_number(png_const_charp string, png_size_t size, int *statep,</div><div class='add'>+   png_size_tp whereami)</div><div class='add'>+{</div><div class='add'>+   int state = *statep;</div><div class='add'>+   png_size_t i = *whereami;</div><div class='add'>+</div><div class='add'>+   while (i &lt; size)</div><div class='add'>+   {</div><div class='add'>+      int type;</div><div class='add'>+      /* First find the type of the next character */</div><div class='add'>+      {</div><div class='add'>+         char ch = string[i];</div><div class='add'>+</div><div class='add'>+         if (ch &gt;= 48 &amp;&amp; ch &lt;= 57)</div><div class='add'>+            type = PNG_FP_DIGIT;</div><div class='add'>+</div><div class='add'>+         else switch (ch)</div><div class='add'>+         {</div><div class='add'>+         case 43: case 45:  type = PNG_FP_SIGN;  break;</div><div class='add'>+         case 46:           type = PNG_FP_DOT;   break;</div><div class='add'>+         case 69: case 101: type = PNG_FP_E;     break;</div><div class='add'>+         default:           goto PNG_FP_End;</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* Now deal with this type according to the current</div><div class='add'>+       * state, the type is arranged to not overlap the</div><div class='add'>+       * bits of the PNG_FP_STATE.</div><div class='add'>+       */</div><div class='add'>+      switch ((state &amp; PNG_FP_STATE) + type)</div><div class='add'>+      {</div><div class='add'>+      case PNG_FP_INTEGER + PNG_FP_SIGN:</div><div class='add'>+         if (state &amp; PNG_FP_SAW_ANY)</div><div class='add'>+            goto PNG_FP_End; /* not a part of the number */</div><div class='add'>+</div><div class='add'>+         png_fp_add(state, PNG_FP_SAW_SIGN);</div><div class='add'>+         break;</div><div class='add'>+</div><div class='add'>+      case PNG_FP_INTEGER + PNG_FP_DOT:</div><div class='add'>+         /* Ok as trailer, ok as lead of fraction. */</div><div class='add'>+         if (state &amp; PNG_FP_SAW_DOT) /* two dots */</div><div class='add'>+            goto PNG_FP_End;</div><div class='add'>+</div><div class='add'>+         else if (state &amp; PNG_FP_SAW_DIGIT) /* trailing dot? */</div><div class='add'>+            png_fp_add(state, PNG_FP_SAW_DOT);</div><div class='add'>+</div><div class='add'>+         else</div><div class='add'>+            png_fp_set(state, PNG_FP_FRACTION | PNG_FP_SAW_DOT);</div><div class='add'>+</div><div class='add'>+         break;</div><div class='add'>+</div><div class='add'>+      case PNG_FP_INTEGER + PNG_FP_DIGIT:</div><div class='add'>+         if (state &amp; PNG_FP_SAW_DOT) /* delayed fraction */</div><div class='add'>+            png_fp_set(state, PNG_FP_FRACTION | PNG_FP_SAW_DOT);</div><div class='add'>+</div><div class='add'>+         png_fp_add(state, PNG_FP_SAW_DIGIT + PNG_FP_WAS_VALID);</div><div class='add'>+</div><div class='add'>+         break;</div><div class='add'>+      case PNG_FP_INTEGER + PNG_FP_E:</div><div class='add'>+         if ((state &amp; PNG_FP_SAW_DIGIT) == 0)</div><div class='add'>+            goto PNG_FP_End;</div><div class='add'>+</div><div class='add'>+         png_fp_set(state, PNG_FP_EXPONENT);</div><div class='add'>+</div><div class='add'>+         break;</div><div class='add'>+</div><div class='add'>+   /* case PNG_FP_FRACTION + PNG_FP_SIGN:</div><div class='add'>+         goto PNG_FP_End; ** no sign in exponent */</div><div class='add'>+</div><div class='add'>+   /* case PNG_FP_FRACTION + PNG_FP_DOT:</div><div class='add'>+         goto PNG_FP_End; ** Because SAW_DOT is always set */</div><div class='add'>+</div><div class='add'>+      case PNG_FP_FRACTION + PNG_FP_DIGIT:</div><div class='add'>+         png_fp_add(state, PNG_FP_SAW_DIGIT + PNG_FP_WAS_VALID);</div><div class='add'>+         break;</div><div class='add'>+</div><div class='add'>+      case PNG_FP_FRACTION + PNG_FP_E:</div><div class='add'>+         /* This is correct because the trailing '.' on an</div><div class='add'>+          * integer is handled above - so we can only get here</div><div class='add'>+          * with the sequence ".E" (with no preceding digits).</div><div class='add'>+          */</div><div class='add'>+         if ((state &amp; PNG_FP_SAW_DIGIT) == 0)</div><div class='add'>+            goto PNG_FP_End;</div><div class='add'>+</div><div class='add'>+         png_fp_set(state, PNG_FP_EXPONENT);</div><div class='add'>+</div><div class='add'>+         break;</div><div class='add'>+</div><div class='add'>+      case PNG_FP_EXPONENT + PNG_FP_SIGN:</div><div class='add'>+         if (state &amp; PNG_FP_SAW_ANY)</div><div class='add'>+            goto PNG_FP_End; /* not a part of the number */</div><div class='add'>+</div><div class='add'>+         png_fp_add(state, PNG_FP_SAW_SIGN);</div><div class='add'>+</div><div class='add'>+         break;</div><div class='add'>+</div><div class='add'>+   /* case PNG_FP_EXPONENT + PNG_FP_DOT:</div><div class='add'>+         goto PNG_FP_End; */</div><div class='add'>+</div><div class='add'>+      case PNG_FP_EXPONENT + PNG_FP_DIGIT:</div><div class='add'>+         png_fp_add(state, PNG_FP_SAW_DIGIT + PNG_FP_WAS_VALID);</div><div class='add'>+</div><div class='add'>+         break;</div><div class='add'>+</div><div class='add'>+   /* case PNG_FP_EXPONEXT + PNG_FP_E:</div><div class='add'>+         goto PNG_FP_End; */</div><div class='add'>+</div><div class='add'>+      default: goto PNG_FP_End; /* I.e. break 2 */</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* The character seems ok, continue. */</div><div class='add'>+      ++i;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+PNG_FP_End:</div><div class='add'>+   /* Here at the end, update the state and return the correct</div><div class='add'>+    * return code.</div><div class='add'>+    */</div><div class='add'>+   *statep = state;</div><div class='add'>+   *whereami = i;</div><div class='add'>+</div><div class='add'>+   return (state &amp; PNG_FP_SAW_DIGIT) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* The same but for a complete string. */</div><div class='add'>+int</div><div class='add'>+png_check_fp_string(png_const_charp string, png_size_t size)</div><div class='add'>+{</div><div class='add'>+   int        state=0;</div><div class='add'>+   png_size_t char_index=0;</div><div class='add'>+</div><div class='add'>+   return png_check_fp_number(string, size, &amp;state, &amp;char_index) &amp;&amp;</div><div class='add'>+      (char_index == size || string[char_index] == 0);</div><div class='add'>+}</div><div class='add'>+#endif /* pCAL or sCAL */</div><div class='add'>+</div><div class='add'>+#ifdef PNG_READ_sCAL_SUPPORTED</div><div class='add'>+#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+/* Utility used below - a simple accurate power of ten from an integral</div><div class='add'>+ * exponent.</div><div class='add'>+ */</div><div class='add'>+static double</div><div class='add'>+png_pow10(int power)</div><div class='add'>+{</div><div class='add'>+   int recip = 0;</div><div class='add'>+   double d = 1;</div><div class='add'>+</div><div class='add'>+   /* Handle negative exponent with a reciprocal at the end because</div><div class='add'>+    * 10 is exact whereas .1 is inexact in base 2</div><div class='add'>+    */</div><div class='add'>+   if (power &lt; 0)</div><div class='add'>+   {</div><div class='add'>+      if (power &lt; DBL_MIN_10_EXP) return 0;</div><div class='add'>+      recip = 1, power = -power;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   if (power &gt; 0)</div><div class='add'>+   {</div><div class='add'>+      /* Decompose power bitwise. */</div><div class='add'>+      double mult = 10;</div><div class='add'>+      do</div><div class='add'>+      {</div><div class='add'>+         if (power &amp; 1) d *= mult;</div><div class='add'>+         mult *= mult;</div><div class='add'>+         power &gt;&gt;= 1;</div><div class='add'>+      }</div><div class='add'>+      while (power &gt; 0);</div><div class='add'>+</div><div class='add'>+      if (recip) d = 1/d;</div><div class='add'>+   }</div><div class='add'>+   /* else power is 0 and d is 1 */</div><div class='add'>+</div><div class='add'>+   return d;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Function to format a floating point value in ASCII with a given</div><div class='add'>+ * precision.</div><div class='add'>+ */</div><div class='add'>+void /* PRIVATE */</div><div class='add'>+png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,</div><div class='add'>+    double fp, unsigned int precision)</div><div class='add'>+{</div><div class='add'>+   /* We use standard functions from math.h, but not printf because</div><div class='add'>+    * that would require stdio.  The caller must supply a buffer of</div><div class='add'>+    * sufficient size or we will png_error.  The tests on size and</div><div class='add'>+    * the space in ascii[] consumed are indicated below.</div><div class='add'>+    */</div><div class='add'>+   if (precision &lt; 1)</div><div class='add'>+      precision = DBL_DIG;</div><div class='add'>+</div><div class='add'>+   /* Enforce the limit of the implementation precision too. */</div><div class='add'>+   if (precision &gt; DBL_DIG+1)</div><div class='add'>+      precision = DBL_DIG+1;</div><div class='add'>+</div><div class='add'>+   /* Basic sanity checks */</div><div class='add'>+   if (size &gt;= precision+5) /* See the requirements below. */</div><div class='add'>+   {</div><div class='add'>+      if (fp &lt; 0)</div><div class='add'>+      {</div><div class='add'>+         fp = -fp;</div><div class='add'>+         *ascii++ = 45; /* '-'  PLUS 1 TOTAL 1*/</div><div class='add'>+         --size;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      if (fp &gt;= DBL_MIN &amp;&amp; fp &lt;= DBL_MAX)</div><div class='add'>+      {</div><div class='add'>+         int exp_b10;       /* A base 10 exponent */</div><div class='add'>+         double base;   /* 10^exp_b10 */</div><div class='add'>+</div><div class='add'>+         /* First extract a base 10 exponent of the number,</div><div class='add'>+          * the calculation below rounds down when converting</div><div class='add'>+          * from base 2 to base 10 (multiply by log10(2) -</div><div class='add'>+          * 0.3010, but 77/256 is 0.3008, so exp_b10 needs to</div><div class='add'>+          * be increased.  Note that the arithmetic shift</div><div class='add'>+          * performs a floor() unlike C arithmetic - using a</div><div class='add'>+          * C multiply would break the following for negative</div><div class='add'>+          * exponents.</div><div class='add'>+          */</div><div class='add'>+         (void)frexp(fp, &amp;exp_b10); /* exponent to base 2 */</div><div class='add'>+</div><div class='add'>+         exp_b10 = (exp_b10 * 77) &gt;&gt; 8; /* &lt;= exponent to base 10 */</div><div class='add'>+</div><div class='add'>+         /* Avoid underflow here. */</div><div class='add'>+         base = png_pow10(exp_b10); /* May underflow */</div><div class='add'>+</div><div class='add'>+         while (base &lt; DBL_MIN || base &lt; fp)</div><div class='add'>+         {</div><div class='add'>+            /* And this may overflow. */</div><div class='add'>+            double test = png_pow10(exp_b10+1);</div><div class='add'>+</div><div class='add'>+            if (test &lt;= DBL_MAX)</div><div class='add'>+               ++exp_b10, base = test;</div><div class='add'>+</div><div class='add'>+            else</div><div class='add'>+               break;</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         /* Normalize fp and correct exp_b10, after this fp is in the</div><div class='add'>+          * range [.1,1) and exp_b10 is both the exponent and the digit</div><div class='add'>+          * *before* which the decimal point should be inserted</div><div class='add'>+          * (starting with 0 for the first digit).  Note that this</div><div class='add'>+          * works even if 10^exp_b10 is out of range because of the</div><div class='add'>+          * test on DBL_MAX above.</div><div class='add'>+          */</div><div class='add'>+         fp /= base;</div><div class='add'>+         while (fp &gt;= 1) fp /= 10, ++exp_b10;</div><div class='add'>+</div><div class='add'>+         /* Because of the code above fp may, at this point, be</div><div class='add'>+          * less than .1, this is ok because the code below can</div><div class='add'>+          * handle the leading zeros this generates, so no attempt</div><div class='add'>+          * is made to correct that here.</div><div class='add'>+          */</div><div class='add'>+</div><div class='add'>+         {</div><div class='add'>+            int czero, clead, cdigits;</div><div class='add'>+            char exponent[10];</div><div class='add'>+</div><div class='add'>+            /* Allow up to two leading zeros - this will not lengthen</div><div class='add'>+             * the number compared to using E-n.</div><div class='add'>+             */</div><div class='add'>+            if (exp_b10 &lt; 0 &amp;&amp; exp_b10 &gt; -3) /* PLUS 3 TOTAL 4 */</div><div class='add'>+            {</div><div class='add'>+               czero = -exp_b10; /* PLUS 2 digits: TOTAL 3 */</div><div class='add'>+               exp_b10 = 0;      /* Dot added below before first output. */</div><div class='add'>+            }</div><div class='add'>+            else</div><div class='add'>+               czero = 0;    /* No zeros to add */</div><div class='add'>+</div><div class='add'>+            /* Generate the digit list, stripping trailing zeros and</div><div class='add'>+             * inserting a '.' before a digit if the exponent is 0.</div><div class='add'>+             */</div><div class='add'>+            clead = czero; /* Count of leading zeros */</div><div class='add'>+            cdigits = 0;   /* Count of digits in list. */</div><div class='add'>+</div><div class='add'>+            do</div><div class='add'>+            {</div><div class='add'>+               double d;</div><div class='add'>+</div><div class='add'>+               fp *= 10;</div><div class='add'>+               /* Use modf here, not floor and subtract, so that</div><div class='add'>+                * the separation is done in one step.  At the end</div><div class='add'>+                * of the loop don't break the number into parts so</div><div class='add'>+                * that the final digit is rounded.</div><div class='add'>+                */</div><div class='add'>+               if (cdigits+czero-clead+1 &lt; (int)precision)</div><div class='add'>+                  fp = modf(fp, &amp;d);</div><div class='add'>+</div><div class='add'>+               else</div><div class='add'>+               {</div><div class='add'>+                  d = floor(fp + .5);</div><div class='add'>+</div><div class='add'>+                  if (d &gt; 9)</div><div class='add'>+                  {</div><div class='add'>+                     /* Rounding up to 10, handle that here. */</div><div class='add'>+                     if (czero &gt; 0)</div><div class='add'>+                     {</div><div class='add'>+                        --czero, d = 1;</div><div class='add'>+                        if (cdigits == 0) --clead;</div><div class='add'>+                     }</div><div class='add'>+                     else</div><div class='add'>+                     {</div><div class='add'>+                        while (cdigits &gt; 0 &amp;&amp; d &gt; 9)</div><div class='add'>+                        {</div><div class='add'>+                           int ch = *--ascii;</div><div class='add'>+</div><div class='add'>+                           if (exp_b10 != (-1))</div><div class='add'>+                              ++exp_b10;</div><div class='add'>+</div><div class='add'>+                           else if (ch == 46)</div><div class='add'>+                           {</div><div class='add'>+                              ch = *--ascii, ++size;</div><div class='add'>+                              /* Advance exp_b10 to '1', so that the</div><div class='add'>+                               * decimal point happens after the</div><div class='add'>+                               * previous digit.</div><div class='add'>+                               */</div><div class='add'>+                              exp_b10 = 1;</div><div class='add'>+                           }</div><div class='add'>+</div><div class='add'>+                           --cdigits;</div><div class='add'>+                           d = ch - 47;  /* I.e. 1+(ch-48) */</div><div class='add'>+                        }</div><div class='add'>+</div><div class='add'>+                        /* Did we reach the beginning? If so adjust the</div><div class='add'>+                         * exponent but take into account the leading</div><div class='add'>+                         * decimal point.</div><div class='add'>+                         */</div><div class='add'>+                        if (d &gt; 9)  /* cdigits == 0 */</div><div class='add'>+                        {</div><div class='add'>+                           if (exp_b10 == (-1))</div><div class='add'>+                           {</div><div class='add'>+                              /* Leading decimal point (plus zeros?), if</div><div class='add'>+                               * we lose the decimal point here it must</div><div class='add'>+                               * be reentered below.</div><div class='add'>+                               */</div><div class='add'>+                              int ch = *--ascii;</div><div class='add'>+</div><div class='add'>+                              if (ch == 46)</div><div class='add'>+                                 ++size, exp_b10 = 1;</div><div class='add'>+</div><div class='add'>+                              /* Else lost a leading zero, so 'exp_b10' is</div><div class='add'>+                               * still ok at (-1)</div><div class='add'>+                               */</div><div class='add'>+                           }</div><div class='add'>+                           else</div><div class='add'>+                              ++exp_b10;</div><div class='add'>+</div><div class='add'>+                           /* In all cases we output a '1' */</div><div class='add'>+                           d = 1;</div><div class='add'>+                        }</div><div class='add'>+                     }</div><div class='add'>+                  }</div><div class='add'>+                  fp = 0; /* Guarantees termination below. */</div><div class='add'>+               }</div><div class='add'>+</div><div class='add'>+               if (d == 0)</div><div class='add'>+               {</div><div class='add'>+                  ++czero;</div><div class='add'>+                  if (cdigits == 0) ++clead;</div><div class='add'>+               }</div><div class='add'>+               else</div><div class='add'>+               {</div><div class='add'>+                  /* Included embedded zeros in the digit count. */</div><div class='add'>+                  cdigits += czero - clead;</div><div class='add'>+                  clead = 0;</div><div class='add'>+</div><div class='add'>+                  while (czero &gt; 0)</div><div class='add'>+                  {</div><div class='add'>+                     /* exp_b10 == (-1) means we just output the decimal</div><div class='add'>+                      * place - after the DP don't adjust 'exp_b10' any</div><div class='add'>+                      * more!</div><div class='add'>+                      */</div><div class='add'>+                     if (exp_b10 != (-1))</div><div class='add'>+                     {</div><div class='add'>+                        if (exp_b10 == 0) *ascii++ = 46, --size;</div><div class='add'>+                        /* PLUS 1: TOTAL 4 */</div><div class='add'>+                        --exp_b10;</div><div class='add'>+                     }</div><div class='add'>+                     *ascii++ = 48, --czero;</div><div class='add'>+                  }</div><div class='add'>+</div><div class='add'>+                  if (exp_b10 != (-1))</div><div class='add'>+                  {</div><div class='add'>+                     if (exp_b10 == 0) *ascii++ = 46, --size; /* counted</div><div class='add'>+                                                                 above */</div><div class='add'>+                     --exp_b10;</div><div class='add'>+                  }</div><div class='add'>+                  *ascii++ = (char)(48 + (int)d), ++cdigits;</div><div class='add'>+               }</div><div class='add'>+            }</div><div class='add'>+            while (cdigits+czero-clead &lt; (int)precision &amp;&amp; fp &gt; DBL_MIN);</div><div class='add'>+</div><div class='add'>+            /* The total output count (max) is now 4+precision */</div><div class='add'>+</div><div class='add'>+            /* Check for an exponent, if we don't need one we are</div><div class='add'>+             * done and just need to terminate the string.  At</div><div class='add'>+             * this point exp_b10==(-1) is effectively if flag - it got</div><div class='add'>+             * to '-1' because of the decrement after outputing</div><div class='add'>+             * the decimal point above (the exponent required is</div><div class='add'>+             * *not* -1!)</div><div class='add'>+             */</div><div class='add'>+            if (exp_b10 &gt;= (-1) &amp;&amp; exp_b10 &lt;= 2)</div><div class='add'>+            {</div><div class='add'>+               /* The following only happens if we didn't output the</div><div class='add'>+                * leading zeros above for negative exponent, so this</div><div class='add'>+                * doest add to the digit requirement.  Note that the</div><div class='add'>+                * two zeros here can only be output if the two leading</div><div class='add'>+                * zeros were *not* output, so this doesn't increase</div><div class='add'>+                * the output count.</div><div class='add'>+                */</div><div class='add'>+               while (--exp_b10 &gt;= 0) *ascii++ = 48;</div><div class='add'>+</div><div class='add'>+               *ascii = 0;</div><div class='add'>+</div><div class='add'>+               /* Total buffer requirement (including the '\0') is</div><div class='add'>+                * 5+precision - see check at the start.</div><div class='add'>+                */</div><div class='add'>+               return;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            /* Here if an exponent is required, adjust size for</div><div class='add'>+             * the digits we output but did not count.  The total</div><div class='add'>+             * digit output here so far is at most 1+precision - no</div><div class='add'>+             * decimal point and no leading or trailing zeros have</div><div class='add'>+             * been output.</div><div class='add'>+             */</div><div class='add'>+            size -= cdigits;</div><div class='add'>+</div><div class='add'>+            *ascii++ = 69, --size;    /* 'E': PLUS 1 TOTAL 2+precision*/</div><div class='add'>+            if (exp_b10 &lt; 0)</div><div class='add'>+            {</div><div class='add'>+               *ascii++ = 45, --size; /* '-': PLUS 1 TOTAL 3+precision */</div><div class='add'>+               exp_b10 = -exp_b10;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            cdigits = 0;</div><div class='add'>+</div><div class='add'>+            while (exp_b10 &gt; 0)</div><div class='add'>+            {</div><div class='add'>+               exponent[cdigits++] = (char)(48 + exp_b10 % 10);</div><div class='add'>+               exp_b10 /= 10;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            /* Need another size check here for the exponent digits, so</div><div class='add'>+             * this need not be considered above.</div><div class='add'>+             */</div><div class='add'>+            if ((int)size &gt; cdigits)</div><div class='add'>+            {</div><div class='add'>+               while (cdigits &gt; 0) *ascii++ = exponent[--cdigits];</div><div class='add'>+</div><div class='add'>+               *ascii = 0;</div><div class='add'>+</div><div class='add'>+               return;</div><div class='add'>+            }</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+      else if (!(fp &gt;= DBL_MIN))</div><div class='add'>+      {</div><div class='add'>+         *ascii++ = 48; /* '0' */</div><div class='add'>+         *ascii = 0;</div><div class='add'>+         return;</div><div class='add'>+      }</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         *ascii++ = 105; /* 'i' */</div><div class='add'>+         *ascii++ = 110; /* 'n' */</div><div class='add'>+         *ascii++ = 102; /* 'f' */</div><div class='add'>+         *ascii = 0;</div><div class='add'>+         return;</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* Here on buffer too small. */</div><div class='add'>+   png_error(png_ptr, "ASCII conversion buffer too small");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#  endif /* FLOATING_POINT */</div><div class='add'>+</div><div class='add'>+#  ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+/* Function to format a fixed point value in ASCII.</div><div class='add'>+ */</div><div class='add'>+void /* PRIVATE */</div><div class='add'>+png_ascii_from_fixed(png_structp png_ptr, png_charp ascii, png_size_t size,</div><div class='add'>+    png_fixed_point fp)</div><div class='add'>+{</div><div class='add'>+   /* Require space for 10 decimal digits, a decimal point, a minus sign and a</div><div class='add'>+    * trailing \0, 13 characters:</div><div class='add'>+    */</div><div class='add'>+   if (size &gt; 12)</div><div class='add'>+   {</div><div class='add'>+      png_uint_32 num;</div><div class='add'>+</div><div class='add'>+      /* Avoid overflow here on the minimum integer. */</div><div class='add'>+      if (fp &lt; 0)</div><div class='add'>+         *ascii++ = 45, --size, num = -fp;</div><div class='add'>+      else</div><div class='add'>+         num = fp;</div><div class='add'>+</div><div class='add'>+      if (num &lt;= 0x80000000U) /* else overflowed */</div><div class='add'>+      {</div><div class='add'>+         unsigned int ndigits = 0, first = 16/*flag value*/;</div><div class='add'>+         char digits[10];</div><div class='add'>+</div><div class='add'>+         while (num)</div><div class='add'>+         {</div><div class='add'>+            /* Split the low digit off num: */</div><div class='add'>+            unsigned int tmp = num/10;</div><div class='add'>+            num -= tmp*10;</div><div class='add'>+            digits[ndigits++] = (char)(48 + num);</div><div class='add'>+            /* Record the first non-zero digit, note that this is a number</div><div class='add'>+             * starting at 1, it's not actually the array index.</div><div class='add'>+             */</div><div class='add'>+            if (first == 16 &amp;&amp; num &gt; 0)</div><div class='add'>+               first = ndigits;</div><div class='add'>+            num = tmp;</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         if (ndigits &gt; 0)</div><div class='add'>+         {</div><div class='add'>+            while (ndigits &gt; 5) *ascii++ = digits[--ndigits];</div><div class='add'>+            /* The remaining digits are fractional digits, ndigits is '5' or</div><div class='add'>+             * smaller at this point.  It is certainly not zero.  Check for a</div><div class='add'>+             * non-zero fractional digit:</div><div class='add'>+             */</div><div class='add'>+            if (first &lt;= 5)</div><div class='add'>+            {</div><div class='add'>+               unsigned int i;</div><div class='add'>+               *ascii++ = 46; /* decimal point */</div><div class='add'>+               /* ndigits may be &lt;5 for small numbers, output leading zeros</div><div class='add'>+                * then ndigits digits to first:</div><div class='add'>+                */</div><div class='add'>+               i = 5;</div><div class='add'>+               while (ndigits &lt; i) *ascii++ = 48, --i;</div><div class='add'>+               while (ndigits &gt;= first) *ascii++ = digits[--ndigits];</div><div class='add'>+               /* Don't output the trailing zeros! */</div><div class='add'>+            }</div><div class='add'>+         }</div><div class='add'>+         else</div><div class='add'>+            *ascii++ = 48;</div><div class='add'>+</div><div class='add'>+         /* And null terminate the string: */</div><div class='add'>+         *ascii = 0;</div><div class='add'>+         return;</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* Here on buffer too small. */</div><div class='add'>+   png_error(png_ptr, "ASCII conversion buffer too small");</div><div class='add'>+}</div><div class='add'>+#   endif /* FIXED_POINT */</div><div class='add'>+#endif /* READ_SCAL */</div><div class='add'>+</div><div class='add'>+#if defined(PNG_FLOATING_POINT_SUPPORTED) &amp;&amp; \</div><div class='add'>+   !defined(PNG_FIXED_POINT_MACRO_SUPPORTED)</div><div class='add'>+png_fixed_point</div><div class='add'>+png_fixed(png_structp png_ptr, double fp, png_const_charp text)</div><div class='add'>+{</div><div class='add'>+   double r = floor(100000 * fp + .5);</div><div class='add'>+</div><div class='add'>+   if (r &gt; 2147483647. || r &lt; -2147483648.)</div><div class='add'>+      png_fixed_error(png_ptr, text);</div><div class='add'>+</div><div class='add'>+   return (png_fixed_point)r;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(PNG_READ_GAMMA_SUPPORTED) || \</div><div class='add'>+    defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG__READ_pHYs_SUPPORTED)</div><div class='add'>+/* muldiv functions */</div><div class='add'>+/* This API takes signed arguments and rounds the result to the nearest</div><div class='add'>+ * integer (or, for a fixed point number - the standard argument - to</div><div class='add'>+ * the nearest .00001).  Overflow and divide by zero are signalled in</div><div class='add'>+ * the result, a boolean - true on success, false on overflow.</div><div class='add'>+ */</div><div class='add'>+int</div><div class='add'>+png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,</div><div class='add'>+    png_int_32 divisor)</div><div class='add'>+{</div><div class='add'>+   /* Return a * times / divisor, rounded. */</div><div class='add'>+   if (divisor != 0)</div><div class='add'>+   {</div><div class='add'>+      if (a == 0 || times == 0)</div><div class='add'>+      {</div><div class='add'>+         *res = 0;</div><div class='add'>+         return 1;</div><div class='add'>+      }</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED</div><div class='add'>+         double r = a;</div><div class='add'>+         r *= times;</div><div class='add'>+         r /= divisor;</div><div class='add'>+         r = floor(r+.5);</div><div class='add'>+</div><div class='add'>+         /* A png_fixed_point is a 32 bit integer. */</div><div class='add'>+         if (r &lt;= 2147483647. &amp;&amp; r &gt;= -2147483648.)</div><div class='add'>+         {</div><div class='add'>+            *res = (png_fixed_point)r;</div><div class='add'>+            return 1;</div><div class='add'>+         }</div><div class='add'>+#else</div><div class='add'>+         int negative = 0;</div><div class='add'>+         png_uint_32 A, T, D;</div><div class='add'>+         png_uint_32 s16, s32, s00;</div><div class='add'>+</div><div class='add'>+         if (a &lt; 0)</div><div class='add'>+            negative = 1, A = -a;</div><div class='add'>+         else</div><div class='add'>+            A = a;</div><div class='add'>+</div><div class='add'>+         if (times &lt; 0)</div><div class='add'>+            negative = !negative, T = -times;</div><div class='add'>+         else</div><div class='add'>+            T = times;</div><div class='add'>+</div><div class='add'>+         if (divisor &lt; 0)</div><div class='add'>+            negative = !negative, D = -divisor;</div><div class='add'>+         else</div><div class='add'>+            D = divisor;</div><div class='add'>+</div><div class='add'>+         /* Following can't overflow because the arguments only</div><div class='add'>+          * have 31 bits each, however the result may be 32 bits.</div><div class='add'>+          */</div><div class='add'>+         s16 = (A &gt;&gt; 16) * (T &amp; 0xffff) +</div><div class='add'>+                           (A &amp; 0xffff) * (T &gt;&gt; 16);</div><div class='add'>+         /* Can't overflow because the a*times bit is only 30</div><div class='add'>+          * bits at most.</div><div class='add'>+          */</div><div class='add'>+         s32 = (A &gt;&gt; 16) * (T &gt;&gt; 16) + (s16 &gt;&gt; 16);</div><div class='add'>+         s00 = (A &amp; 0xffff) * (T &amp; 0xffff);</div><div class='add'>+</div><div class='add'>+         s16 = (s16 &amp; 0xffff) &lt;&lt; 16;</div><div class='add'>+         s00 += s16;</div><div class='add'>+</div><div class='add'>+         if (s00 &lt; s16)</div><div class='add'>+            ++s32; /* carry */</div><div class='add'>+</div><div class='add'>+         if (s32 &lt; D) /* else overflow */</div><div class='add'>+         {</div><div class='add'>+            /* s32.s00 is now the 64 bit product, do a standard</div><div class='add'>+             * division, we know that s32 &lt; D, so the maximum</div><div class='add'>+             * required shift is 31.</div><div class='add'>+             */</div><div class='add'>+            int bitshift = 32;</div><div class='add'>+            png_fixed_point result = 0; /* NOTE: signed */</div><div class='add'>+</div><div class='add'>+            while (--bitshift &gt;= 0)</div><div class='add'>+            {</div><div class='add'>+               png_uint_32 d32, d00;</div><div class='add'>+</div><div class='add'>+               if (bitshift &gt; 0)</div><div class='add'>+                  d32 = D &gt;&gt; (32-bitshift), d00 = D &lt;&lt; bitshift;</div><div class='add'>+</div><div class='add'>+               else</div><div class='add'>+                  d32 = 0, d00 = D;</div><div class='add'>+</div><div class='add'>+               if (s32 &gt; d32)</div><div class='add'>+               {</div><div class='add'>+                  if (s00 &lt; d00) --s32; /* carry */</div><div class='add'>+                  s32 -= d32, s00 -= d00, result += 1&lt;&lt;bitshift;</div><div class='add'>+               }</div><div class='add'>+</div><div class='add'>+               else</div><div class='add'>+                  if (s32 == d32 &amp;&amp; s00 &gt;= d00)</div><div class='add'>+                     s32 = 0, s00 -= d00, result += 1&lt;&lt;bitshift;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            /* Handle the rounding. */</div><div class='add'>+            if (s00 &gt;= (D &gt;&gt; 1))</div><div class='add'>+               ++result;</div><div class='add'>+</div><div class='add'>+            if (negative)</div><div class='add'>+               result = -result;</div><div class='add'>+</div><div class='add'>+            /* Check for overflow. */</div><div class='add'>+            if ((negative &amp;&amp; result &lt;= 0) || (!negative &amp;&amp; result &gt;= 0))</div><div class='add'>+            {</div><div class='add'>+               *res = result;</div><div class='add'>+               return 1;</div><div class='add'>+            }</div><div class='add'>+         }</div><div class='add'>+#endif</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return 0;</div><div class='add'>+}</div><div class='add'>+#endif /* READ_GAMMA || INCH_CONVERSIONS */</div><div class='add'>+</div><div class='add'>+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)</div><div class='add'>+/* The following is for when the caller doesn't much care about the</div><div class='add'>+ * result.</div><div class='add'>+ */</div><div class='add'>+png_fixed_point</div><div class='add'>+png_muldiv_warn(png_structp png_ptr, png_fixed_point a, png_int_32 times,</div><div class='add'>+    png_int_32 divisor)</div><div class='add'>+{</div><div class='add'>+   png_fixed_point result;</div><div class='add'>+</div><div class='add'>+   if (png_muldiv(&amp;result, a, times, divisor))</div><div class='add'>+      return result;</div><div class='add'>+</div><div class='add'>+   png_warning(png_ptr, "fixed point overflow ignored");</div><div class='add'>+   return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_READ_GAMMA_SUPPORTED /* more fixed point functions for gammma */</div><div class='add'>+/* Calculate a reciprocal, return 0 on div-by-zero or overflow. */</div><div class='add'>+png_fixed_point</div><div class='add'>+png_reciprocal(png_fixed_point a)</div><div class='add'>+{</div><div class='add'>+#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED</div><div class='add'>+   double r = floor(1E10/a+.5);</div><div class='add'>+</div><div class='add'>+   if (r &lt;= 2147483647. &amp;&amp; r &gt;= -2147483648.)</div><div class='add'>+      return (png_fixed_point)r;</div><div class='add'>+#else</div><div class='add'>+   png_fixed_point res;</div><div class='add'>+</div><div class='add'>+   if (png_muldiv(&amp;res, 100000, 100000, a))</div><div class='add'>+      return res;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+   return 0; /* error/overflow */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* A local convenience routine. */</div><div class='add'>+static png_fixed_point</div><div class='add'>+png_product2(png_fixed_point a, png_fixed_point b)</div><div class='add'>+{</div><div class='add'>+   /* The required result is 1/a * 1/b; the following preserves accuracy. */</div><div class='add'>+#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED</div><div class='add'>+   double r = a * 1E-5;</div><div class='add'>+   r *= b;</div><div class='add'>+   r = floor(r+.5);</div><div class='add'>+</div><div class='add'>+   if (r &lt;= 2147483647. &amp;&amp; r &gt;= -2147483648.)</div><div class='add'>+      return (png_fixed_point)r;</div><div class='add'>+#else</div><div class='add'>+   png_fixed_point res;</div><div class='add'>+</div><div class='add'>+   if (png_muldiv(&amp;res, a, b, 100000))</div><div class='add'>+      return res;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+   return 0; /* overflow */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The inverse of the above. */</div><div class='add'>+png_fixed_point</div><div class='add'>+png_reciprocal2(png_fixed_point a, png_fixed_point b)</div><div class='add'>+{</div><div class='add'>+   /* The required result is 1/a * 1/b; the following preserves accuracy. */</div><div class='add'>+#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED</div><div class='add'>+   double r = 1E15/a;</div><div class='add'>+   r /= b;</div><div class='add'>+   r = floor(r+.5);</div><div class='add'>+</div><div class='add'>+   if (r &lt;= 2147483647. &amp;&amp; r &gt;= -2147483648.)</div><div class='add'>+      return (png_fixed_point)r;</div><div class='add'>+#else</div><div class='add'>+   /* This may overflow because the range of png_fixed_point isn't symmetric,</div><div class='add'>+    * but this API is only used for the product of file and screen gamma so it</div><div class='add'>+    * doesn't matter that the smallest number it can produce is 1/21474, not</div><div class='add'>+    * 1/100000</div><div class='add'>+    */</div><div class='add'>+   png_fixed_point res = png_product2(a, b);</div><div class='add'>+</div><div class='add'>+   if (res != 0)</div><div class='add'>+      return png_reciprocal(res);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+   return 0; /* overflow */</div><div class='add'>+}</div><div class='add'>+#endif /* READ_GAMMA */</div><div class='add'>+</div><div class='add'>+#ifdef PNG_CHECK_cHRM_SUPPORTED</div><div class='add'>+/* Added at libpng version 1.2.34 (Dec 8, 2008) and 1.4.0 (Jan 2,</div><div class='add'>+ * 2010: moved from pngset.c) */</div><div class='add'>+/*</div><div class='add'>+ *    Multiply two 32-bit numbers, V1 and V2, using 32-bit</div><div class='add'>+ *    arithmetic, to produce a 64 bit result in the HI/LO words.</div><div class='add'>+ *</div><div class='add'>+ *                  A B</div><div class='add'>+ *                x C D</div><div class='add'>+ *               ------</div><div class='add'>+ *              AD || BD</div><div class='add'>+ *        AC || CB || 0</div><div class='add'>+ *</div><div class='add'>+ *    where A and B are the high and low 16-bit words of V1,</div><div class='add'>+ *    C and D are the 16-bit words of V2, AD is the product of</div><div class='add'>+ *    A and D, and X || Y is (X &lt;&lt; 16) + Y.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+void /* PRIVATE */</div><div class='add'>+png_64bit_product (long v1, long v2, unsigned long *hi_product,</div><div class='add'>+    unsigned long *lo_product)</div><div class='add'>+{</div><div class='add'>+   int a, b, c, d;</div><div class='add'>+   long lo, hi, x, y;</div><div class='add'>+</div><div class='add'>+   a = (v1 &gt;&gt; 16) &amp; 0xffff;</div><div class='add'>+   b = v1 &amp; 0xffff;</div><div class='add'>+   c = (v2 &gt;&gt; 16) &amp; 0xffff;</div><div class='add'>+   d = v2 &amp; 0xffff;</div><div class='add'>+</div><div class='add'>+   lo = b * d;                   /* BD */</div><div class='add'>+   x = a * d + c * b;            /* AD + CB */</div><div class='add'>+   y = ((lo &gt;&gt; 16) &amp; 0xffff) + x;</div><div class='add'>+</div><div class='add'>+   lo = (lo &amp; 0xffff) | ((y &amp; 0xffff) &lt;&lt; 16);</div><div class='add'>+   hi = (y &gt;&gt; 16) &amp; 0xffff;</div><div class='add'>+</div><div class='add'>+   hi += a * c;                  /* AC */</div><div class='add'>+</div><div class='add'>+   *hi_product = (unsigned long)hi;</div><div class='add'>+   *lo_product = (unsigned long)lo;</div><div class='add'>+}</div><div class='add'>+#endif /* CHECK_cHRM */</div><div class='add'>+</div><div class='add'>+#ifdef PNG_READ_GAMMA_SUPPORTED /* gamma table code */</div><div class='add'>+#ifndef PNG_FLOATING_ARITHMETIC_SUPPORTED</div><div class='add'>+/* Fixed point gamma.</div><div class='add'>+ *</div><div class='add'>+ * To calculate gamma this code implements fast log() and exp() calls using only</div><div class='add'>+ * fixed point arithmetic.  This code has sufficient precision for either 8 or</div><div class='add'>+ * 16 bit sample values.</div><div class='add'>+ *</div><div class='add'>+ * The tables used here were calculated using simple 'bc' programs, but C double</div><div class='add'>+ * precision floating point arithmetic would work fine.  The programs are given</div><div class='add'>+ * at the head of each table.</div><div class='add'>+ *</div><div class='add'>+ * 8 bit log table</div><div class='add'>+ *   This is a table of -log(value/255)/log(2) for 'value' in the range 128 to</div><div class='add'>+ *   255, so it's the base 2 logarithm of a normalized 8 bit floating point</div><div class='add'>+ *   mantissa.  The numbers are 32 bit fractions.</div><div class='add'>+ */</div><div class='add'>+static png_uint_32</div><div class='add'>+png_8bit_l2[128] =</div><div class='add'>+{</div><div class='add'>+#  if PNG_DO_BC</div><div class='add'>+      for (i=128;i&lt;256;++i) { .5 - l(i/255)/l(2)*65536*65536; }</div><div class='add'>+#  endif</div><div class='add'>+   4270715492U, 4222494797U, 4174646467U, 4127164793U, 4080044201U, 4033279239U,</div><div class='add'>+   3986864580U, 3940795015U, 3895065449U, 3849670902U, 3804606499U, 3759867474U,</div><div class='add'>+   3715449162U, 3671346997U, 3627556511U, 3584073329U, 3540893168U, 3498011834U,</div><div class='add'>+   3455425220U, 3413129301U, 3371120137U, 3329393864U, 3287946700U, 3246774933U,</div><div class='add'>+   3205874930U, 3165243125U, 3124876025U, 3084770202U, 3044922296U, 3005329011U,</div><div class='add'>+   2965987113U, 2926893432U, 2888044853U, 2849438323U, 2811070844U, 2772939474U,</div><div class='add'>+   2735041326U, 2697373562U, 2659933400U, 2622718104U, 2585724991U, 2548951424U,</div><div class='add'>+   2512394810U, 2476052606U, 2439922311U, 2404001468U, 2368287663U, 2332778523U,</div><div class='add'>+   2297471715U, 2262364947U, 2227455964U, 2192742551U, 2158222529U, 2123893754U,</div><div class='add'>+   2089754119U, 2055801552U, 2022034013U, 1988449497U, 1955046031U, 1921821672U,</div><div class='add'>+   1888774511U, 1855902668U, 1823204291U, 1790677560U, 1758320682U, 1726131893U,</div><div class='add'>+   1694109454U, 1662251657U, 1630556815U, 1599023271U, 1567649391U, 1536433567U,</div><div class='add'>+   1505374214U, 1474469770U, 1443718700U, 1413119487U, 1382670639U, 1352370686U,</div><div class='add'>+   1322218179U, 1292211689U, 1262349810U, 1232631153U, 1203054352U, 1173618059U,</div><div class='add'>+   1144320946U, 1115161701U, 1086139034U, 1057251672U, 1028498358U, 999877854U,</div><div class='add'>+   971388940U, 943030410U, 914801076U, 886699767U, 858725327U, 830876614U,</div><div class='add'>+   803152505U, 775551890U, 748073672U, 720716771U, 693480120U, 666362667U,</div><div class='add'>+   639363374U, 612481215U, 585715177U, 559064263U, 532527486U, 506103872U,</div><div class='add'>+   479792461U, 453592303U, 427502463U, 401522014U, 375650043U, 349885648U,</div><div class='add'>+   324227938U, 298676034U, 273229066U, 247886176U, 222646516U, 197509248U,</div><div class='add'>+   172473545U, 147538590U, 122703574U, 97967701U, 73330182U, 48790236U,</div><div class='add'>+   24347096U, 0U</div><div class='add'>+#if 0</div><div class='add'>+   /* The following are the values for 16 bit tables - these work fine for the 8</div><div class='add'>+    * bit conversions but produce very slightly larger errors in the 16 bit log</div><div class='add'>+    * (about 1.2 as opposed to 0.7 absolute error in the final value).  To use</div><div class='add'>+    * these all the shifts below must be adjusted appropriately.</div><div class='add'>+    */</div><div class='add'>+   65166, 64430, 63700, 62976, 62257, 61543, 60835, 60132, 59434, 58741, 58054,</div><div class='add'>+   57371, 56693, 56020, 55352, 54689, 54030, 53375, 52726, 52080, 51439, 50803,</div><div class='add'>+   50170, 49542, 48918, 48298, 47682, 47070, 46462, 45858, 45257, 44661, 44068,</div><div class='add'>+   43479, 42894, 42312, 41733, 41159, 40587, 40020, 39455, 38894, 38336, 37782,</div><div class='add'>+   37230, 36682, 36137, 35595, 35057, 34521, 33988, 33459, 32932, 32408, 31887,</div><div class='add'>+   31369, 30854, 30341, 29832, 29325, 28820, 28319, 27820, 27324, 26830, 26339,</div><div class='add'>+   25850, 25364, 24880, 24399, 23920, 23444, 22970, 22499, 22029, 21562, 21098,</div><div class='add'>+   20636, 20175, 19718, 19262, 18808, 18357, 17908, 17461, 17016, 16573, 16132,</div><div class='add'>+   15694, 15257, 14822, 14390, 13959, 13530, 13103, 12678, 12255, 11834, 11415,</div><div class='add'>+   10997, 10582, 10168, 9756, 9346, 8937, 8531, 8126, 7723, 7321, 6921, 6523,</div><div class='add'>+   6127, 5732, 5339, 4947, 4557, 4169, 3782, 3397, 3014, 2632, 2251, 1872, 1495,</div><div class='add'>+   1119, 744, 372</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static png_int_32</div><div class='add'>+png_log8bit(unsigned int x)</div><div class='add'>+{</div><div class='add'>+   unsigned int lg2 = 0;</div><div class='add'>+   /* Each time 'x' is multiplied by 2, 1 must be subtracted off the final log,</div><div class='add'>+    * because the log is actually negate that means adding 1.  The final</div><div class='add'>+    * returned value thus has the range 0 (for 255 input) to 7.994 (for 1</div><div class='add'>+    * input), return 7.99998 for the overflow (log 0) case - so the result is</div><div class='add'>+    * always at most 19 bits.</div><div class='add'>+    */</div><div class='add'>+   if ((x &amp;= 0xff) == 0)</div><div class='add'>+      return 0xffffffff;</div><div class='add'>+</div><div class='add'>+   if ((x &amp; 0xf0) == 0)</div><div class='add'>+      lg2  = 4, x &lt;&lt;= 4;</div><div class='add'>+</div><div class='add'>+   if ((x &amp; 0xc0) == 0)</div><div class='add'>+      lg2 += 2, x &lt;&lt;= 2;</div><div class='add'>+</div><div class='add'>+   if ((x &amp; 0x80) == 0)</div><div class='add'>+      lg2 += 1, x &lt;&lt;= 1;</div><div class='add'>+</div><div class='add'>+   /* result is at most 19 bits, so this cast is safe: */</div><div class='add'>+   return (png_int_32)((lg2 &lt;&lt; 16) + ((png_8bit_l2[x-128]+32768)&gt;&gt;16));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The above gives exact (to 16 binary places) log2 values for 8 bit images,</div><div class='add'>+ * for 16 bit images we use the most significant 8 bits of the 16 bit value to</div><div class='add'>+ * get an approximation then multiply the approximation by a correction factor</div><div class='add'>+ * determined by the remaining up to 8 bits.  This requires an additional step</div><div class='add'>+ * in the 16 bit case.</div><div class='add'>+ *</div><div class='add'>+ * We want log2(value/65535), we have log2(v'/255), where:</div><div class='add'>+ *</div><div class='add'>+ *    value = v' * 256 + v''</div><div class='add'>+ *          = v' * f</div><div class='add'>+ *</div><div class='add'>+ * So f is value/v', which is equal to (256+v''/v') since v' is in the range 128</div><div class='add'>+ * to 255 and v'' is in the range 0 to 255 f will be in the range 256 to less</div><div class='add'>+ * than 258.  The final factor also needs to correct for the fact that our 8 bit</div><div class='add'>+ * value is scaled by 255, whereas the 16 bit values must be scaled by 65535.</div><div class='add'>+ *</div><div class='add'>+ * This gives a final formula using a calculated value 'x' which is value/v' and</div><div class='add'>+ * scaling by 65536 to match the above table:</div><div class='add'>+ *</div><div class='add'>+ *   log2(x/257) * 65536</div><div class='add'>+ *</div><div class='add'>+ * Since these numbers are so close to '1' we can use simple linear</div><div class='add'>+ * interpolation between the two end values 256/257 (result -368.61) and 258/257</div><div class='add'>+ * (result 367.179).  The values used below are scaled by a further 64 to give</div><div class='add'>+ * 16 bit precision in the interpolation:</div><div class='add'>+ *</div><div class='add'>+ * Start (256): -23591</div><div class='add'>+ * Zero  (257):      0</div><div class='add'>+ * End   (258):  23499</div><div class='add'>+ */</div><div class='add'>+static png_int_32</div><div class='add'>+png_log16bit(png_uint_32 x)</div><div class='add'>+{</div><div class='add'>+   unsigned int lg2 = 0;</div><div class='add'>+</div><div class='add'>+   /* As above, but now the input has 16 bits. */</div><div class='add'>+   if ((x &amp;= 0xffff) == 0)</div><div class='add'>+      return 0xffffffff;</div><div class='add'>+</div><div class='add'>+   if ((x &amp; 0xff00) == 0)</div><div class='add'>+      lg2  = 8, x &lt;&lt;= 8;</div><div class='add'>+</div><div class='add'>+   if ((x &amp; 0xf000) == 0)</div><div class='add'>+      lg2 += 4, x &lt;&lt;= 4;</div><div class='add'>+</div><div class='add'>+   if ((x &amp; 0xc000) == 0)</div><div class='add'>+      lg2 += 2, x &lt;&lt;= 2;</div><div class='add'>+</div><div class='add'>+   if ((x &amp; 0x8000) == 0)</div><div class='add'>+      lg2 += 1, x &lt;&lt;= 1;</div><div class='add'>+</div><div class='add'>+   /* Calculate the base logarithm from the top 8 bits as a 28 bit fractional</div><div class='add'>+    * value.</div><div class='add'>+    */</div><div class='add'>+   lg2 &lt;&lt;= 28;</div><div class='add'>+   lg2 += (png_8bit_l2[(x&gt;&gt;8)-128]+8) &gt;&gt; 4;</div><div class='add'>+</div><div class='add'>+   /* Now we need to interpolate the factor, this requires a division by the top</div><div class='add'>+    * 8 bits.  Do this with maximum precision.</div><div class='add'>+    */</div><div class='add'>+   x = ((x &lt;&lt; 16) + (x &gt;&gt; 9)) / (x &gt;&gt; 8);</div><div class='add'>+</div><div class='add'>+   /* Since we divided by the top 8 bits of 'x' there will be a '1' at 1&lt;&lt;24,</div><div class='add'>+    * the value at 1&lt;&lt;16 (ignoring this) will be 0 or 1; this gives us exactly</div><div class='add'>+    * 16 bits to interpolate to get the low bits of the result.  Round the</div><div class='add'>+    * answer.  Note that the end point values are scaled by 64 to retain overall</div><div class='add'>+    * precision and that 'lg2' is current scaled by an extra 12 bits, so adjust</div><div class='add'>+    * the overall scaling by 6-12.  Round at every step.</div><div class='add'>+    */</div><div class='add'>+   x -= 1U &lt;&lt; 24;</div><div class='add'>+</div><div class='add'>+   if (x &lt;= 65536U) /* &lt;= '257' */</div><div class='add'>+      lg2 += ((23591U * (65536U-x)) + (1U &lt;&lt; (16+6-12-1))) &gt;&gt; (16+6-12);</div><div class='add'>+</div><div class='add'>+   else</div><div class='add'>+      lg2 -= ((23499U * (x-65536U)) + (1U &lt;&lt; (16+6-12-1))) &gt;&gt; (16+6-12);</div><div class='add'>+</div><div class='add'>+   /* Safe, because the result can't have more than 20 bits: */</div><div class='add'>+   return (png_int_32)((lg2 + 2048) &gt;&gt; 12);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The 'exp()' case must invert the above, taking a 20 bit fixed point</div><div class='add'>+ * logarithmic value and returning a 16 or 8 bit number as appropriate.  In</div><div class='add'>+ * each case only the low 16 bits are relevant - the fraction - since the</div><div class='add'>+ * integer bits (the top 4) simply determine a shift.</div><div class='add'>+ *</div><div class='add'>+ * The worst case is the 16 bit distinction between 65535 and 65534, this</div><div class='add'>+ * requires perhaps spurious accuracty in the decoding of the logarithm to</div><div class='add'>+ * distinguish log2(65535/65534.5) - 10^-5 or 17 bits.  There is little chance</div><div class='add'>+ * of getting this accuracy in practice.</div><div class='add'>+ *</div><div class='add'>+ * To deal with this the following exp() function works out the exponent of the</div><div class='add'>+ * frational part of the logarithm by using an accurate 32 bit value from the</div><div class='add'>+ * top four fractional bits then multiplying in the remaining bits.</div><div class='add'>+ */</div><div class='add'>+static png_uint_32</div><div class='add'>+png_32bit_exp[16] =</div><div class='add'>+{</div><div class='add'>+#  if PNG_DO_BC</div><div class='add'>+      for (i=0;i&lt;16;++i) { .5 + e(-i/16*l(2))*2^32; }</div><div class='add'>+#  endif</div><div class='add'>+   /* NOTE: the first entry is deliberately set to the maximum 32 bit value. */</div><div class='add'>+   4294967295U, 4112874773U, 3938502376U, 3771522796U, 3611622603U, 3458501653U,</div><div class='add'>+   3311872529U, 3171459999U, 3037000500U, 2908241642U, 2784941738U, 2666869345U,</div><div class='add'>+   2553802834U, 2445529972U, 2341847524U, 2242560872U</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Adjustment table; provided to explain the numbers in the code below. */</div><div class='add'>+#if PNG_DO_BC</div><div class='add'>+for (i=11;i&gt;=0;--i){ print i, " ", (1 - e(-(2^i)/65536*l(2))) * 2^(32-i), "\n"}</div><div class='add'>+   11 44937.64284865548751208448</div><div class='add'>+   10 45180.98734845585101160448</div><div class='add'>+    9 45303.31936980687359311872</div><div class='add'>+    8 45364.65110595323018870784</div><div class='add'>+    7 45395.35850361789624614912</div><div class='add'>+    6 45410.72259715102037508096</div><div class='add'>+    5 45418.40724413220722311168</div><div class='add'>+    4 45422.25021786898173001728</div><div class='add'>+    3 45424.17186732298419044352</div><div class='add'>+    2 45425.13273269940811464704</div><div class='add'>+    1 45425.61317555035558641664</div><div class='add'>+    0 45425.85339951654943850496</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static png_uint_32</div><div class='add'>+png_exp(png_fixed_point x)</div><div class='add'>+{</div><div class='add'>+   if (x &gt; 0 &amp;&amp; x &lt;= 0xfffff) /* Else overflow or zero (underflow) */</div><div class='add'>+   {</div><div class='add'>+      /* Obtain a 4 bit approximation */</div><div class='add'>+      png_uint_32 e = png_32bit_exp[(x &gt;&gt; 12) &amp; 0xf];</div><div class='add'>+</div><div class='add'>+      /* Incorporate the low 12 bits - these decrease the returned value by</div><div class='add'>+       * multiplying by a number less than 1 if the bit is set.  The multiplier</div><div class='add'>+       * is determined by the above table and the shift. Notice that the values</div><div class='add'>+       * converge on 45426 and this is used to allow linear interpolation of the</div><div class='add'>+       * low bits.</div><div class='add'>+       */</div><div class='add'>+      if (x &amp; 0x800)</div><div class='add'>+         e -= (((e &gt;&gt; 16) * 44938U) +  16U) &gt;&gt; 5;</div><div class='add'>+</div><div class='add'>+      if (x &amp; 0x400)</div><div class='add'>+         e -= (((e &gt;&gt; 16) * 45181U) +  32U) &gt;&gt; 6;</div><div class='add'>+</div><div class='add'>+      if (x &amp; 0x200)</div><div class='add'>+         e -= (((e &gt;&gt; 16) * 45303U) +  64U) &gt;&gt; 7;</div><div class='add'>+</div><div class='add'>+      if (x &amp; 0x100)</div><div class='add'>+         e -= (((e &gt;&gt; 16) * 45365U) + 128U) &gt;&gt; 8;</div><div class='add'>+</div><div class='add'>+      if (x &amp; 0x080)</div><div class='add'>+         e -= (((e &gt;&gt; 16) * 45395U) + 256U) &gt;&gt; 9;</div><div class='add'>+</div><div class='add'>+      if (x &amp; 0x040)</div><div class='add'>+         e -= (((e &gt;&gt; 16) * 45410U) + 512U) &gt;&gt; 10;</div><div class='add'>+</div><div class='add'>+      /* And handle the low 6 bits in a single block. */</div><div class='add'>+      e -= (((e &gt;&gt; 16) * 355U * (x &amp; 0x3fU)) + 256U) &gt;&gt; 9;</div><div class='add'>+</div><div class='add'>+      /* Handle the upper bits of x. */</div><div class='add'>+      e &gt;&gt;= x &gt;&gt; 16;</div><div class='add'>+      return e;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* Check for overflow */</div><div class='add'>+   if (x &lt;= 0)</div><div class='add'>+      return png_32bit_exp[0];</div><div class='add'>+</div><div class='add'>+   /* Else underflow */</div><div class='add'>+   return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static png_byte</div><div class='add'>+png_exp8bit(png_fixed_point lg2)</div><div class='add'>+{</div><div class='add'>+   /* Get a 32 bit value: */</div><div class='add'>+   png_uint_32 x = png_exp(lg2);</div><div class='add'>+</div><div class='add'>+   /* Convert the 32 bit value to 0..255 by multiplying by 256-1, note that the</div><div class='add'>+    * second, rounding, step can't overflow because of the first, subtraction,</div><div class='add'>+    * step.</div><div class='add'>+    */</div><div class='add'>+   x -= x &gt;&gt; 8;</div><div class='add'>+   return (png_byte)((x + 0x7fffffU) &gt;&gt; 24);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static png_uint_16</div><div class='add'>+png_exp16bit(png_fixed_point lg2)</div><div class='add'>+{</div><div class='add'>+   /* Get a 32 bit value: */</div><div class='add'>+   png_uint_32 x = png_exp(lg2);</div><div class='add'>+</div><div class='add'>+   /* Convert the 32 bit value to 0..65535 by multiplying by 65536-1: */</div><div class='add'>+   x -= x &gt;&gt; 16;</div><div class='add'>+   return (png_uint_16)((x + 32767U) &gt;&gt; 16);</div><div class='add'>+}</div><div class='add'>+#endif /* FLOATING_ARITHMETIC */</div><div class='add'>+</div><div class='add'>+png_byte</div><div class='add'>+png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma_val)</div><div class='add'>+{</div><div class='add'>+   if (value &gt; 0 &amp;&amp; value &lt; 255)</div><div class='add'>+   {</div><div class='add'>+#     ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED</div><div class='add'>+         double r = floor(255*pow(value/255.,gamma_val*.00001)+.5);</div><div class='add'>+         return (png_byte)r;</div><div class='add'>+#     else</div><div class='add'>+         png_int_32 lg2 = png_log8bit(value);</div><div class='add'>+         png_fixed_point res;</div><div class='add'>+</div><div class='add'>+         if (png_muldiv(&amp;res, gamma_val, lg2, PNG_FP_1))</div><div class='add'>+            return png_exp8bit(res);</div><div class='add'>+</div><div class='add'>+         /* Overflow. */</div><div class='add'>+         value = 0;</div><div class='add'>+#     endif</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return (png_byte)value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+png_uint_16</div><div class='add'>+png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma_val)</div><div class='add'>+{</div><div class='add'>+   if (value &gt; 0 &amp;&amp; value &lt; 65535)</div><div class='add'>+   {</div><div class='add'>+#     ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED</div><div class='add'>+         double r = floor(65535*pow(value/65535.,gamma_val*.00001)+.5);</div><div class='add'>+         return (png_uint_16)r;</div><div class='add'>+#     else</div><div class='add'>+         png_int_32 lg2 = png_log16bit(value);</div><div class='add'>+         png_fixed_point res;</div><div class='add'>+</div><div class='add'>+         if (png_muldiv(&amp;res, gamma_val, lg2, PNG_FP_1))</div><div class='add'>+            return png_exp16bit(res);</div><div class='add'>+</div><div class='add'>+         /* Overflow. */</div><div class='add'>+         value = 0;</div><div class='add'>+#     endif</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return (png_uint_16)value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This does the right thing based on the bit_depth field of the</div><div class='add'>+ * png_struct, interpreting values as 8 or 16 bit.  While the result</div><div class='add'>+ * is nominally a 16 bit value if bit depth is 8 then the result is</div><div class='add'>+ * 8 bit (as are the arguments.)</div><div class='add'>+ */</div><div class='add'>+png_uint_16 /* PRIVATE */</div><div class='add'>+png_gamma_correct(png_structp png_ptr, unsigned int value,</div><div class='add'>+    png_fixed_point gamma_val)</div><div class='add'>+{</div><div class='add'>+   if (png_ptr-&gt;bit_depth == 8)</div><div class='add'>+      return png_gamma_8bit_correct(value, gamma_val);</div><div class='add'>+</div><div class='add'>+   else</div><div class='add'>+      return png_gamma_16bit_correct(value, gamma_val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This is the shared test on whether a gamma value is 'significant' - whether</div><div class='add'>+ * it is worth doing gamma correction.</div><div class='add'>+ */</div><div class='add'>+int /* PRIVATE */</div><div class='add'>+png_gamma_significant(png_fixed_point gamma_val)</div><div class='add'>+{</div><div class='add'>+   return gamma_val &lt; PNG_FP_1 - PNG_GAMMA_THRESHOLD_FIXED ||</div><div class='add'>+       gamma_val &gt; PNG_FP_1 + PNG_GAMMA_THRESHOLD_FIXED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Internal function to build a single 16 bit table - the table consists of</div><div class='add'>+ * 'num' 256 entry subtables, where 'num' is determined by 'shift' - the amount</div><div class='add'>+ * to shift the input values right (or 16-number_of_signifiant_bits).</div><div class='add'>+ *</div><div class='add'>+ * The caller is responsible for ensuring that the table gets cleaned up on</div><div class='add'>+ * png_error (i.e. if one of the mallocs below fails) - i.e. the *table argument</div><div class='add'>+ * should be somewhere that will be cleaned.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+png_build_16bit_table(png_structp png_ptr, png_uint_16pp *ptable,</div><div class='add'>+   PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)</div><div class='add'>+{</div><div class='add'>+   /* Various values derived from 'shift': */</div><div class='add'>+   PNG_CONST unsigned int num = 1U &lt;&lt; (8U - shift);</div><div class='add'>+   PNG_CONST unsigned int max = (1U &lt;&lt; (16U - shift))-1U;</div><div class='add'>+   PNG_CONST unsigned int max_by_2 = 1U &lt;&lt; (15U-shift);</div><div class='add'>+   unsigned int i;</div><div class='add'>+</div><div class='add'>+   png_uint_16pp table = *ptable =</div><div class='add'>+       (png_uint_16pp)png_calloc(png_ptr, num * png_sizeof(png_uint_16p));</div><div class='add'>+</div><div class='add'>+   for (i = 0; i &lt; num; i++)</div><div class='add'>+   {</div><div class='add'>+      png_uint_16p sub_table = table[i] =</div><div class='add'>+          (png_uint_16p)png_malloc(png_ptr, 256 * png_sizeof(png_uint_16));</div><div class='add'>+</div><div class='add'>+      /* The 'threshold' test is repeated here because it can arise for one of</div><div class='add'>+       * the 16 bit tables even if the others don't hit it.</div><div class='add'>+       */</div><div class='add'>+      if (png_gamma_significant(gamma_val))</div><div class='add'>+      {</div><div class='add'>+         /* The old code would overflow at the end and this would cause the</div><div class='add'>+          * 'pow' function to return a result &gt;1, resulting in an</div><div class='add'>+          * arithmetic error.  This code follows the spec exactly; ig is</div><div class='add'>+          * the recovered input sample, it always has 8-16 bits.</div><div class='add'>+          *</div><div class='add'>+          * We want input * 65535/max, rounded, the arithmetic fits in 32</div><div class='add'>+          * bits (unsigned) so long as max &lt;= 32767.</div><div class='add'>+          */</div><div class='add'>+         unsigned int j;</div><div class='add'>+         for (j = 0; j &lt; 256; j++)</div><div class='add'>+         {</div><div class='add'>+            png_uint_32 ig = (j &lt;&lt; (8-shift)) + i;</div><div class='add'>+#           ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED</div><div class='add'>+               /* Inline the 'max' scaling operation: */</div><div class='add'>+               double d = floor(65535*pow(ig/(double)max, gamma_val*.00001)+.5);</div><div class='add'>+               sub_table[j] = (png_uint_16)d;</div><div class='add'>+#           else</div><div class='add'>+               if (shift)</div><div class='add'>+                  ig = (ig * 65535U + max_by_2)/max;</div><div class='add'>+</div><div class='add'>+               sub_table[j] = png_gamma_16bit_correct(ig, gamma_val);</div><div class='add'>+#           endif</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         /* We must still build a table, but do it the fast way. */</div><div class='add'>+         unsigned int j;</div><div class='add'>+</div><div class='add'>+         for (j = 0; j &lt; 256; j++)</div><div class='add'>+         {</div><div class='add'>+            png_uint_32 ig = (j &lt;&lt; (8-shift)) + i;</div><div class='add'>+</div><div class='add'>+            if (shift)</div><div class='add'>+               ig = (ig * 65535U + max_by_2)/max;</div><div class='add'>+</div><div class='add'>+            sub_table[j] = (png_uint_16)ig;</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* NOTE: this function expects the *inverse* of the overall gamma transformation</div><div class='add'>+ * required.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+png_build_16to8_table(png_structp png_ptr, png_uint_16pp *ptable,</div><div class='add'>+   PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)</div><div class='add'>+{</div><div class='add'>+   PNG_CONST unsigned int num = 1U &lt;&lt; (8U - shift);</div><div class='add'>+   PNG_CONST unsigned int max = (1U &lt;&lt; (16U - shift))-1U;</div><div class='add'>+   unsigned int i;</div><div class='add'>+   png_uint_32 last;</div><div class='add'>+</div><div class='add'>+   png_uint_16pp table = *ptable =</div><div class='add'>+       (png_uint_16pp)png_calloc(png_ptr, num * png_sizeof(png_uint_16p));</div><div class='add'>+</div><div class='add'>+   /* 'num' is the number of tables and also the number of low bits of low</div><div class='add'>+    * bits of the input 16 bit value used to select a table.  Each table is</div><div class='add'>+    * itself index by the high 8 bits of the value.</div><div class='add'>+    */</div><div class='add'>+   for (i = 0; i &lt; num; i++)</div><div class='add'>+      table[i] = (png_uint_16p)png_malloc(png_ptr,</div><div class='add'>+          256 * png_sizeof(png_uint_16));</div><div class='add'>+</div><div class='add'>+   /* 'gamma_val' is set to the reciprocal of the value calculated above, so</div><div class='add'>+    * pow(out,g) is an *input* value.  'last' is the last input value set.</div><div class='add'>+    *</div><div class='add'>+    * In the loop 'i' is used to find output values.  Since the output is 8</div><div class='add'>+    * bit there are only 256 possible values.  The tables are set up to</div><div class='add'>+    * select the closest possible output value for each input by finding</div><div class='add'>+    * the input value at the boundary between each pair of output values</div><div class='add'>+    * and filling the table up to that boundary with the lower output</div><div class='add'>+    * value.</div><div class='add'>+    *</div><div class='add'>+    * The boundary values are 0.5,1.5..253.5,254.5.  Since these are 9 bit</div><div class='add'>+    * values the code below uses a 16 bit value in i; the values start at</div><div class='add'>+    * 128.5 (for 0.5) and step by 257, for a total of 254 values (the last</div><div class='add'>+    * entries are filled with 255).  Start i at 128 and fill all 'last'</div><div class='add'>+    * table entries &lt;= 'max'</div><div class='add'>+    */</div><div class='add'>+   last = 0;</div><div class='add'>+   for (i = 0; i &lt; 255; ++i) /* 8 bit output value */</div><div class='add'>+   {</div><div class='add'>+      /* Find the corresponding maximum input value */</div><div class='add'>+      png_uint_16 out = (png_uint_16)(i * 257U); /* 16 bit output value */</div><div class='add'>+</div><div class='add'>+      /* Find the boundary value in 16 bits: */</div><div class='add'>+      png_uint_32 bound = png_gamma_16bit_correct(out+128U, gamma_val);</div><div class='add'>+</div><div class='add'>+      /* Adjust (round) to (16-shift) bits: */</div><div class='add'>+      bound = (bound * max + 32768U)/65535U + 1U;</div><div class='add'>+</div><div class='add'>+      while (last &lt; bound)</div><div class='add'>+      {</div><div class='add'>+         table[last &amp; (0xffU &gt;&gt; shift)][last &gt;&gt; (8U - shift)] = out;</div><div class='add'>+         last++;</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* And fill in the final entries. */</div><div class='add'>+   while (last &lt; (num &lt;&lt; 8))</div><div class='add'>+   {</div><div class='add'>+      table[last &amp; (0xff &gt;&gt; shift)][last &gt;&gt; (8U - shift)] = 65535U;</div><div class='add'>+      last++;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Build a single 8 bit table: same as the 16 bit case but much simpler (and</div><div class='add'>+ * typically much faster).  Note that libpng currently does no sBIT processing</div><div class='add'>+ * (apparently contrary to the spec) so a 256 entry table is always generated.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+png_build_8bit_table(png_structp png_ptr, png_bytepp ptable,</div><div class='add'>+   PNG_CONST png_fixed_point gamma_val)</div><div class='add'>+{</div><div class='add'>+   unsigned int i;</div><div class='add'>+   png_bytep table = *ptable = (png_bytep)png_malloc(png_ptr, 256);</div><div class='add'>+</div><div class='add'>+   if (png_gamma_significant(gamma_val)) for (i=0; i&lt;256; i++)</div><div class='add'>+      table[i] = png_gamma_8bit_correct(i, gamma_val);</div><div class='add'>+</div><div class='add'>+   else for (i=0; i&lt;256; ++i)</div><div class='add'>+      table[i] = (png_byte)i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* We build the 8- or 16-bit gamma tables here.  Note that for 16-bit</div><div class='add'>+ * tables, we don't make a full table if we are reducing to 8-bit in</div><div class='add'>+ * the future.  Note also how the gamma_16 tables are segmented so that</div><div class='add'>+ * we don't need to allocate &gt; 64K chunks for a full 16-bit table.</div><div class='add'>+ */</div><div class='add'>+void /* PRIVATE */</div><div class='add'>+png_build_gamma_table(png_structp png_ptr, int bit_depth)</div><div class='add'>+{</div><div class='add'>+  png_debug(1, "in png_build_gamma_table");</div><div class='add'>+</div><div class='add'>+  if (bit_depth &lt;= 8)</div><div class='add'>+  {</div><div class='add'>+     png_build_8bit_table(png_ptr, &amp;png_ptr-&gt;gamma_table,</div><div class='add'>+         png_ptr-&gt;screen_gamma &gt; 0 ?  png_reciprocal2(png_ptr-&gt;gamma,</div><div class='add'>+         png_ptr-&gt;screen_gamma) : PNG_FP_1);</div><div class='add'>+</div><div class='add'>+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \</div><div class='add'>+   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)</div><div class='add'>+     if (png_ptr-&gt;transformations &amp; ((PNG_BACKGROUND) | PNG_RGB_TO_GRAY))</div><div class='add'>+     {</div><div class='add'>+        png_build_8bit_table(png_ptr, &amp;png_ptr-&gt;gamma_to_1,</div><div class='add'>+            png_reciprocal(png_ptr-&gt;gamma));</div><div class='add'>+</div><div class='add'>+        png_build_8bit_table(png_ptr, &amp;png_ptr-&gt;gamma_from_1,</div><div class='add'>+            png_ptr-&gt;screen_gamma &gt; 0 ?  png_reciprocal(png_ptr-&gt;screen_gamma) :</div><div class='add'>+            png_ptr-&gt;gamma/* Probably doing rgb_to_gray */);</div><div class='add'>+     }</div><div class='add'>+#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */</div><div class='add'>+  }</div><div class='add'>+  else</div><div class='add'>+  {</div><div class='add'>+     png_byte shift, sig_bit;</div><div class='add'>+</div><div class='add'>+     if (png_ptr-&gt;color_type &amp; PNG_COLOR_MASK_COLOR)</div><div class='add'>+     {</div><div class='add'>+        sig_bit = png_ptr-&gt;sig_bit.red;</div><div class='add'>+</div><div class='add'>+        if (png_ptr-&gt;sig_bit.green &gt; sig_bit)</div><div class='add'>+           sig_bit = png_ptr-&gt;sig_bit.green;</div><div class='add'>+</div><div class='add'>+        if (png_ptr-&gt;sig_bit.blue &gt; sig_bit)</div><div class='add'>+           sig_bit = png_ptr-&gt;sig_bit.blue;</div><div class='add'>+     }</div><div class='add'>+     else</div><div class='add'>+        sig_bit = png_ptr-&gt;sig_bit.gray;</div><div class='add'>+</div><div class='add'>+     /* 16 bit gamma code uses this equation:</div><div class='add'>+      *</div><div class='add'>+      *   ov = table[(iv &amp; 0xff) &gt;&gt; gamma_shift][iv &gt;&gt; 8]</div><div class='add'>+      *</div><div class='add'>+      * Where 'iv' is the input color value and 'ov' is the output value -</div><div class='add'>+      * pow(iv, gamma).</div><div class='add'>+      *</div><div class='add'>+      * Thus the gamma table consists of up to 256 256 entry tables.  The table</div><div class='add'>+      * is selected by the (8-gamma_shift) most significant of the low 8 bits of</div><div class='add'>+      * the color value then indexed by the upper 8 bits:</div><div class='add'>+      *</div><div class='add'>+      *   table[low bits][high 8 bits]</div><div class='add'>+      *</div><div class='add'>+      * So the table 'n' corresponds to all those 'iv' of:</div><div class='add'>+      *</div><div class='add'>+      *   &lt;all high 8 bit values&gt;&lt;n &lt;&lt; gamma_shift&gt;..&lt;(n+1 &lt;&lt; gamma_shift)-1&gt;</div><div class='add'>+      *</div><div class='add'>+      */</div><div class='add'>+     if (sig_bit &gt; 0 &amp;&amp; sig_bit &lt; 16U)</div><div class='add'>+        shift = (png_byte)(16U - sig_bit); /* shift == insignificant bits */</div><div class='add'>+</div><div class='add'>+     else</div><div class='add'>+        shift = 0; /* keep all 16 bits */</div><div class='add'>+</div><div class='add'>+     if (png_ptr-&gt;transformations &amp; PNG_16_TO_8)</div><div class='add'>+     {</div><div class='add'>+        /* PNG_MAX_GAMMA_8 is the number of bits to keep - effectively</div><div class='add'>+         * the significant bits in the *input* when the output will</div><div class='add'>+         * eventually be 8 bits.  By default it is 11.</div><div class='add'>+         */</div><div class='add'>+        if (shift &lt; (16U - PNG_MAX_GAMMA_8))</div><div class='add'>+           shift = (16U - PNG_MAX_GAMMA_8);</div><div class='add'>+     }</div><div class='add'>+</div><div class='add'>+     if (shift &gt; 8U)</div><div class='add'>+        shift = 8U; /* Guarantees at least one table! */</div><div class='add'>+</div><div class='add'>+     png_ptr-&gt;gamma_shift = shift;</div><div class='add'>+</div><div class='add'>+#ifdef PNG_16BIT_SUPPORTED</div><div class='add'>+     if (png_ptr-&gt;transformations &amp; (PNG_16_TO_8 | PNG_BACKGROUND))</div><div class='add'>+#endif</div><div class='add'>+         png_build_16to8_table(png_ptr, &amp;png_ptr-&gt;gamma_16_table, shift,</div><div class='add'>+         png_ptr-&gt;screen_gamma &gt; 0 ? png_product2(png_ptr-&gt;gamma,</div><div class='add'>+         png_ptr-&gt;screen_gamma) : PNG_FP_1);</div><div class='add'>+</div><div class='add'>+#ifdef PNG_16BIT_SUPPORTED</div><div class='add'>+     else</div><div class='add'>+         png_build_16bit_table(png_ptr, &amp;png_ptr-&gt;gamma_16_table, shift,</div><div class='add'>+         png_ptr-&gt;screen_gamma &gt; 0 ? png_reciprocal2(png_ptr-&gt;gamma,</div><div class='add'>+         png_ptr-&gt;screen_gamma) : PNG_FP_1);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \</div><div class='add'>+   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)</div><div class='add'>+     if (png_ptr-&gt;transformations &amp; (PNG_BACKGROUND | PNG_RGB_TO_GRAY))</div><div class='add'>+     {</div><div class='add'>+        png_build_16bit_table(png_ptr, &amp;png_ptr-&gt;gamma_16_to_1, shift,</div><div class='add'>+            png_reciprocal(png_ptr-&gt;gamma));</div><div class='add'>+</div><div class='add'>+        /* Notice that the '16 from 1' table should be full precision, however</div><div class='add'>+         * the lookup on this table still uses gamma_shift, so it can't be.</div><div class='add'>+         * TODO: fix this.</div><div class='add'>+         */</div><div class='add'>+        png_build_16bit_table(png_ptr, &amp;png_ptr-&gt;gamma_16_from_1, shift,</div><div class='add'>+            png_ptr-&gt;screen_gamma &gt; 0 ? png_reciprocal(png_ptr-&gt;screen_gamma) :</div><div class='add'>+            png_ptr-&gt;gamma/* Probably doing rgb_to_gray */);</div><div class='add'>+     }</div><div class='add'>+#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */</div><div class='add'>+  }</div><div class='add'>+}</div><div class='add'>+#endif /* READ_GAMMA */</div><div class='ctx'> #endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */</div><div class='head'>diff --git a/src/3rdparty/libpng/png.h b/src/3rdparty/libpng/png.h<br/>index 5ea2b0d..100f56d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/png.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/png.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/png.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/png.h</a></div><div class='hunk'>@@ -1,26 +1,26 @@</div><div class='ctx'> </div><div class='ctx'> /* png.h - header file for PNG reference library</div><div class='ctx'>  *</div><div class='del'>- * libpng version 1.4.0 - January 3, 2010</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * libpng version 1.5.1 - February 3, 2011</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='ctx'>  * This code is released under the libpng license (See LICENSE, below)</div><div class='ctx'>  *</div><div class='ctx'>  * Authors and maintainers:</div><div class='del'>- *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat</div><div class='del'>- *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger</div><div class='del'>- *  libpng versions 0.97, January 1998, through 1.4.0 - January 3, 2010: Glenn</div><div class='del'>- *  See also "Contributing Authors", below.</div><div class='add'>+ *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat</div><div class='add'>+ *   libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger</div><div class='add'>+ *   libpng versions 0.97, January 1998, through 1.5.1 - February 3, 2011: Glenn</div><div class='add'>+ *   See also "Contributing Authors", below.</div><div class='ctx'>  *</div><div class='ctx'>  * Note about libpng version numbers:</div><div class='ctx'>  *</div><div class='del'>- *    Due to various miscommunications, unforeseen code incompatibilities</div><div class='del'>- *    and occasional factors outside the authors' control, version numbering</div><div class='del'>- *    on the library has not always been consistent and straightforward.</div><div class='del'>- *    The following table summarizes matters since version 0.89c, which was</div><div class='del'>- *    the first widely used release:</div><div class='add'>+ *   Due to various miscommunications, unforeseen code incompatibilities</div><div class='add'>+ *   and occasional factors outside the authors' control, version numbering</div><div class='add'>+ *   on the library has not always been consistent and straightforward.</div><div class='add'>+ *   The following table summarizes matters since version 0.89c, which was</div><div class='add'>+ *   the first widely used release:</div><div class='ctx'>  *</div><div class='ctx'>  *    source                 png.h  png.h  shared-lib</div><div class='ctx'>  *    version                string   int  version</div><div class='hunk'>@@ -134,27 +134,40 @@</div><div class='ctx'>  *    1.4.0beta88-109         14    10400  14.so.14.0[.0]</div><div class='ctx'>  *    1.4.0rc02-08            14    10400  14.so.14.0[.0]</div><div class='ctx'>  *    1.4.0                   14    10400  14.so.14.0[.0]</div><div class='add'>+ *    1.4.1beta01-03          14    10401  14.so.14.1[.0]</div><div class='add'>+ *    1.4.1rc01               14    10401  14.so.14.1[.0]</div><div class='add'>+ *    1.4.1beta04-12          14    10401  14.so.14.1[.0]</div><div class='add'>+ *    1.4.1                   14    10401  14.so.14.1[.0]</div><div class='add'>+ *    1.4.2                   14    10402  14.so.14.2[.0]</div><div class='add'>+ *    1.4.3                   14    10403  14.so.14.3[.0]</div><div class='add'>+ *    1.4.4                   14    10404  14.so.14.4[.0]</div><div class='add'>+ *    1.5.0beta01-58          15    10500  15.so.15.0[.0]</div><div class='add'>+ *    1.5.0rc01-07            15    10500  15.so.15.0[.0]</div><div class='add'>+ *    1.5.0                   15    10500  15.so.15.0[.0]</div><div class='add'>+ *    1.5.1beta01-11          15    10501  15.so.15.1[.0]</div><div class='add'>+ *    1.5.1rc01-02            15    10501  15.so.15.1[.0]</div><div class='add'>+ *    1.5.1                   15    10501  15.so.15.1[.0]</div><div class='ctx'>  *</div><div class='del'>- *    Henceforth the source version will match the shared-library major</div><div class='del'>- *    and minor numbers; the shared-library major version number will be</div><div class='del'>- *    used for changes in backward compatibility, as it is intended.  The</div><div class='del'>- *    PNG_LIBPNG_VER macro, which is not used within libpng but is available</div><div class='del'>- *    for applications, is an unsigned integer of the form xyyzz corresponding</div><div class='del'>- *    to the source version x.y.z (leading zeros in y and z).  Beta versions</div><div class='del'>- *    were given the previous public release number plus a letter, until</div><div class='del'>- *    version 1.0.6j; from then on they were given the upcoming public</div><div class='del'>- *    release number plus "betaNN" or "rcN".</div><div class='add'>+ *   Henceforth the source version will match the shared-library major</div><div class='add'>+ *   and minor numbers; the shared-library major version number will be</div><div class='add'>+ *   used for changes in backward compatibility, as it is intended.  The</div><div class='add'>+ *   PNG_LIBPNG_VER macro, which is not used within libpng but is available</div><div class='add'>+ *   for applications, is an unsigned integer of the form xyyzz corresponding</div><div class='add'>+ *   to the source version x.y.z (leading zeros in y and z).  Beta versions</div><div class='add'>+ *   were given the previous public release number plus a letter, until</div><div class='add'>+ *   version 1.0.6j; from then on they were given the upcoming public</div><div class='add'>+ *   release number plus "betaNN" or "rcN".</div><div class='ctx'>  *</div><div class='del'>- *    Binary incompatibility exists only when applications make direct access</div><div class='del'>- *    to the info_ptr or png_ptr members through png.h, and the compiled</div><div class='del'>- *    application is loaded with a different version of the library.</div><div class='add'>+ *   Binary incompatibility exists only when applications make direct access</div><div class='add'>+ *   to the info_ptr or png_ptr members through png.h, and the compiled</div><div class='add'>+ *   application is loaded with a different version of the library.</div><div class='ctx'>  *</div><div class='del'>- *    DLLNUM will change each time there are forward or backward changes</div><div class='del'>- *    in binary compatibility (e.g., when a new feature is added).</div><div class='add'>+ *   DLLNUM will change each time there are forward or backward changes</div><div class='add'>+ *   in binary compatibility (e.g., when a new feature is added).</div><div class='ctx'>  *</div><div class='del'>- * See libpng.txt or libpng.3 for more information.  The PNG specification</div><div class='del'>- * is available as a W3C Recommendation and as an ISO Specification,</div><div class='del'>- * &lt;http://www.w3.org/TR/2003/REC-PNG-20031110/</div><div class='add'>+ * See libpng-manual.txt or libpng.3 for more information.  The PNG</div><div class='add'>+ * specification is available as a W3C Recommendation and as an ISO</div><div class='add'>+ * Specification, &lt;http://www.w3.org/TR/2003/REC-PNG-20031110/</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -165,8 +178,8 @@</div><div class='ctx'>  *</div><div class='ctx'>  * This code is released under the libpng license.</div><div class='ctx'>  *</div><div class='del'>- * libpng versions 1.2.6, August 15, 2004, through 1.4.0, January 3, 2010, are</div><div class='del'>- * Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are</div><div class='add'>+ * libpng versions 1.2.6, August 15, 2004, through 1.5.1, February 3, 2011, are</div><div class='add'>+ * Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are</div><div class='ctx'>  * distributed according to the same disclaimer and license as libpng-1.2.5</div><div class='ctx'>  * with the following individual added to the list of Contributing Authors:</div><div class='ctx'>  *</div><div class='hunk'>@@ -192,7 +205,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are</div><div class='ctx'>  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are</div><div class='del'>- * distributed according to the same disclaimer and license as libpng-0.96,</div><div class='add'>+ * distributed according to the same disclaimer and license as libpng-0.96, </div><div class='ctx'>  * with the following individuals added to the list of Contributing Authors:</div><div class='ctx'>  *</div><div class='ctx'>  *    Tom Lane</div><div class='hunk'>@@ -201,7 +214,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * libpng versions 0.89, June 1996, through 0.96, May 1997, are</div><div class='ctx'>  * Copyright (c) 1996, 1997 Andreas Dilger</div><div class='del'>- * Distributed according to the same disclaimer and license as libpng-0.88,</div><div class='add'>+ * Distributed according to the same disclaimer and license as libpng-0.88, </div><div class='ctx'>  * with the following individuals added to the list of Contributing Authors:</div><div class='ctx'>  *</div><div class='ctx'>  *    John Bowler</div><div class='hunk'>@@ -224,10 +237,10 @@</div><div class='ctx'>  *    Tim Wegner</div><div class='ctx'>  *</div><div class='ctx'>  * The PNG Reference Library is supplied "AS IS".  The Contributing Authors</div><div class='del'>- * and Group 42, Inc. disclaim all warranties, expressed or implied,</div><div class='add'>+ * and Group 42, Inc. disclaim all warranties, expressed or implied, </div><div class='ctx'>  * including, without limitation, the warranties of merchantability and of</div><div class='ctx'>  * fitness for any purpose.  The Contributing Authors and Group 42, Inc.</div><div class='del'>- * assume no liability for direct, indirect, incidental, special, exemplary,</div><div class='add'>+ * assume no liability for direct, indirect, incidental, special, exemplary, </div><div class='ctx'>  * or consequential damages, which may result from the use of the PNG</div><div class='ctx'>  * Reference Library, even if advised of the possibility of such damage.</div><div class='ctx'>  *</div><div class='hunk'>@@ -235,13 +248,13 @@</div><div class='ctx'>  * source code, or portions hereof, for any purpose, without fee, subject</div><div class='ctx'>  * to the following restrictions:</div><div class='ctx'>  *</div><div class='del'>- * 1. The origin of this source code must not be misrepresented.</div><div class='add'>+ *   1. The origin of this source code must not be misrepresented.</div><div class='ctx'>  *</div><div class='del'>- * 2. Altered versions must be plainly marked as such and</div><div class='del'>- * must not be misrepresented as being the original source.</div><div class='add'>+ *   2. Altered versions must be plainly marked as such and must not</div><div class='add'>+ *      be misrepresented as being the original source.</div><div class='ctx'>  *</div><div class='del'>- * 3. This Copyright notice may not be removed or altered from</div><div class='del'>- *    any source or altered source distribution.</div><div class='add'>+ *   3. This Copyright notice may not be removed or altered from</div><div class='add'>+ *      any source or altered source distribution.</div><div class='ctx'>  *</div><div class='ctx'>  * The Contributing Authors and Group 42, Inc. specifically permit, without</div><div class='ctx'>  * fee, and encourage the use of this source code as a component to</div><div class='hunk'>@@ -254,7 +267,7 @@</div><div class='ctx'>  * A "png_get_copyright" function is available, for convenient use in "about"</div><div class='ctx'>  * boxes and the like:</div><div class='ctx'>  *</div><div class='del'>- *     printf("%s",png_get_copyright(NULL));</div><div class='add'>+ *     printf("%s", png_get_copyright(NULL));</div><div class='ctx'>  *</div><div class='ctx'>  * Also, the PNG logo (in PNG format, of course) is supplied in the</div><div class='ctx'>  * files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).</div><div class='hunk'>@@ -277,14 +290,14 @@</div><div class='ctx'>  * Y2K compliance in libpng:</div><div class='ctx'>  * =========================</div><div class='ctx'>  *</div><div class='del'>- *    January 3, 2010</div><div class='add'>+ *    February 3, 2011</div><div class='ctx'>  *</div><div class='ctx'>  *    Since the PNG Development group is an ad-hoc body, we can't make</div><div class='ctx'>  *    an official declaration.</div><div class='ctx'>  *</div><div class='ctx'>  *    This is your unofficial assurance that libpng from version 0.71 and</div><div class='del'>- *    upward through 1.4.0 are Y2K compliant.  It is my belief that earlier</div><div class='del'>- *    versions were also Y2K compliant.</div><div class='add'>+ *    upward through 1.5.1 are Y2K compliant.  It is my belief that</div><div class='add'>+ *    earlier versions were also Y2K compliant.</div><div class='ctx'>  *</div><div class='ctx'>  *    Libpng only has three year fields.  One is a 2-byte unsigned integer</div><div class='ctx'>  *    that will hold years up to 65535.  The other two hold the date in text</div><div class='hunk'>@@ -313,7 +326,7 @@</div><div class='ctx'>  *    the full 4-digit year.  There is a possibility that applications using</div><div class='ctx'>  *    libpng are not passing 4-digit years into the png_convert_to_rfc_1123()</div><div class='ctx'>  *    function, or that they are incorrectly passing only a 2-digit year</div><div class='del'>- *    instead of "year - 1900" into the png_convert_from_struct_tm() function,</div><div class='add'>+ *    instead of "year - 1900" into the png_convert_from_struct_tm() function, </div><div class='ctx'>  *    but this is not under our control.  The libpng documentation has always</div><div class='ctx'>  *    stated that it works with 4-digit years, and the APIs have been</div><div class='ctx'>  *    documented as such.</div><div class='hunk'>@@ -332,24 +345,24 @@</div><div class='ctx'> #ifndef PNG_H</div><div class='ctx'> #define PNG_H</div><div class='ctx'> </div><div class='del'>-/* This is not the place to learn how to use libpng.  The file libpng.txt</div><div class='add'>+/* This is not the place to learn how to use libpng. The file libpng-manual.txt</div><div class='ctx'>  * describes how to use libpng, and the file example.c summarizes it</div><div class='ctx'>  * with some code on which to build.  This file is useful for looking</div><div class='ctx'>  * at the actual function definitions and structure components.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Version information for png.h - this should match the version in png.c */</div><div class='del'>-#define PNG_LIBPNG_VER_STRING "1.4.0"</div><div class='add'>+#define PNG_LIBPNG_VER_STRING "1.5.1"</div><div class='ctx'> #define PNG_HEADER_VERSION_STRING \</div><div class='del'>-   " libpng version 1.4.0 - January 3, 2010\n"</div><div class='add'>+     " libpng version 1.5.1 - February 3, 2011\n"</div><div class='ctx'> </div><div class='del'>-#define PNG_LIBPNG_VER_SONUM   14</div><div class='del'>-#define PNG_LIBPNG_VER_DLLNUM  14</div><div class='add'>+#define PNG_LIBPNG_VER_SONUM   15</div><div class='add'>+#define PNG_LIBPNG_VER_DLLNUM  15</div><div class='ctx'> </div><div class='ctx'> /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */</div><div class='ctx'> #define PNG_LIBPNG_VER_MAJOR   1</div><div class='del'>-#define PNG_LIBPNG_VER_MINOR   4</div><div class='del'>-#define PNG_LIBPNG_VER_RELEASE 0</div><div class='add'>+#define PNG_LIBPNG_VER_MINOR   5</div><div class='add'>+#define PNG_LIBPNG_VER_RELEASE 1</div><div class='ctx'> /* This should match the numeric part of the final component of</div><div class='ctx'>  * PNG_LIBPNG_VER_STRING, omitting any leading zero:</div><div class='ctx'>  */</div><div class='hunk'>@@ -379,19 +392,35 @@</div><div class='ctx'>  * version 1.0.0 was mis-numbered 100 instead of 10000).  From</div><div class='ctx'>  * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release</div><div class='ctx'>  */</div><div class='del'>-#define PNG_LIBPNG_VER 10400 /* 1.4.0 */</div><div class='add'>+#define PNG_LIBPNG_VER 10501 /* 1.5.1 */</div><div class='ctx'> </div><div class='del'>-#ifndef PNG_VERSION_INFO_ONLY</div><div class='del'>-/* Include the compression library's header */</div><div class='del'>-#include "zlib.h"</div><div class='add'>+/* Library configuration: these options cannot be changed after</div><div class='add'>+ * the library has been built.</div><div class='add'>+ */</div><div class='add'>+#ifndef PNGLCONF_H</div><div class='add'>+    /* If pnglibconf.h is missing, you can</div><div class='add'>+     * copy scripts/pnglibconf.h.prebuilt to pnglibconf.h</div><div class='add'>+     */</div><div class='add'>+#   include "pnglibconf.h"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef _AIX</div><div class='del'>-#define jmpbuf __jmpbuf</div><div class='add'>+#ifndef PNG_VERSION_INFO_ONLY</div><div class='add'>+/* Standard header files (not needed for the version info) */</div><div class='add'>+#  ifdef PNG_SETJMP_SUPPORTED</div><div class='add'>+#    include &lt;setjmp.h&gt;</div><div class='add'>+#  endif</div><div class='add'>+</div><div class='add'>+/* Need the time information for converting tIME chunks, it</div><div class='add'>+ * defines struct tm:</div><div class='add'>+ */</div><div class='add'>+#ifdef PNG_CONVERT_tIME_SUPPORTED</div><div class='add'>+   /* "time.h" functions are not supported on all operating systems */</div><div class='add'>+#  include &lt;time.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Include all user configurable info, including optional assembler routines */</div><div class='del'>-#include "pngconf.h"</div><div class='add'>+/* Machine specific configuration. */</div><div class='add'>+#  include "pngconf.h"</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Added at libpng-1.2.8</div><div class='hunk'>@@ -407,13 +436,13 @@</div><div class='ctx'>  * StringFileInfo block must contain a SpecialBuild string.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_USER_PRIVATEBUILD</div><div class='add'>+#ifdef PNG_USER_PRIVATEBUILD /* From pnglibconf.h */</div><div class='ctx'> #  define PNG_LIBPNG_BUILD_TYPE \</div><div class='del'>-          (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_PRIVATE)</div><div class='add'>+       (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_PRIVATE)</div><div class='ctx'> #else</div><div class='ctx'> #  ifdef PNG_LIBPNG_SPECIALBUILD</div><div class='ctx'> #    define PNG_LIBPNG_BUILD_TYPE \</div><div class='del'>-            (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_SPECIAL)</div><div class='add'>+         (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_SPECIAL)</div><div class='ctx'> #  else</div><div class='ctx'> #    define PNG_LIBPNG_BUILD_TYPE (PNG_LIBPNG_BUILD_BASE_TYPE)</div><div class='ctx'> #  endif</div><div class='hunk'>@@ -426,20 +455,61 @@</div><div class='ctx'> extern "C" {</div><div class='ctx'> #endif /* __cplusplus */</div><div class='ctx'> </div><div class='del'>-/* This file is arranged in several sections.  The first section contains</div><div class='del'>- * structure and type definitions.  The second section contains the external</div><div class='del'>- * library functions, while the third has the internal library functions,</div><div class='del'>- * which applications aren't expected to use directly.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Variables declared in png.c - only it needs to define PNG_NO_EXTERN */</div><div class='del'>-#if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN)</div><div class='ctx'> /* Version information for C files, stored in png.c.  This had better match</div><div class='ctx'>  * the version above.</div><div class='ctx'>  */</div><div class='ctx'> #define png_libpng_ver png_get_header_ver(NULL)</div><div class='ctx'> </div><div class='del'>-#endif /* PNG_NO_EXTERN */</div><div class='add'>+/* This file is arranged in several sections:</div><div class='add'>+ *</div><div class='add'>+ * 1. Any configuration options that can be specified by for the application</div><div class='add'>+ *    code when it is built.  (Build time configuration is in pnglibconf.h)</div><div class='add'>+ * 2. Type definitions (base types are defined in pngconf.h), structure</div><div class='add'>+ *    definitions.</div><div class='add'>+ * 3. Exported library functions.</div><div class='add'>+ *</div><div class='add'>+ * The library source code has additional files (principally pngpriv.h) that</div><div class='add'>+ * allow configuration of the library.</div><div class='add'>+ */</div><div class='add'>+/* Section 1: run time configuration</div><div class='add'>+ * See pnglibconf.h for build time configuration</div><div class='add'>+ *</div><div class='add'>+ * Run time configuration allows the application to choose between</div><div class='add'>+ * implementations of certain arithmetic APIs.  The default is set</div><div class='add'>+ * at build time and recorded in pnglibconf.h, but it is safe to</div><div class='add'>+ * override these (and only these) settings.  Note that this won't</div><div class='add'>+ * change what the library does, only application code, and the</div><div class='add'>+ * settings can (and probably should) be made on a per-file basis</div><div class='add'>+ * by setting the #defines before including png.h</div><div class='add'>+ *</div><div class='add'>+ * Use macros to read integers from PNG data or use the exported</div><div class='add'>+ * functions?</div><div class='add'>+ *   PNG_USE_READ_MACROS: use the macros (see below)  Note that</div><div class='add'>+ *     the macros evaluate their argument multiple times.</div><div class='add'>+ *   PNG_NO_USE_READ_MACROS: call the relevant library function.</div><div class='add'>+ *</div><div class='add'>+ * Use the alternative algorithm for compositing alpha samples that</div><div class='add'>+ * does not use division?</div><div class='add'>+ *   PNG_READ_COMPOSITE_NODIV_SUPPORTED: use the 'no division'</div><div class='add'>+ *      algorithm.</div><div class='add'>+ *   PNG_NO_READ_COMPOSITE_NODIV: use the 'division' algorithm.</div><div class='add'>+ *</div><div class='add'>+ * How to handle benign errors if PNG_ALLOW_BENIGN_ERRORS is</div><div class='add'>+ * false?</div><div class='add'>+ *   PNG_ALLOW_BENIGN_ERRORS: map calls to the benign error</div><div class='add'>+ *      APIs to png_warning.</div><div class='add'>+ * Otherwise the calls are mapped to png_error.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Section 2: type definitions, including structures and compile time</div><div class='add'>+ * constants.</div><div class='add'>+ * See pngconf.h for base types that vary by machine/system</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* This triggers a compiler error in png.c, if png.c and png.h</div><div class='add'>+ * do not agree upon the version number.</div><div class='add'>+ */</div><div class='add'>+typedef char* png_libpng_version_1_5_1;</div><div class='ctx'> </div><div class='ctx'> /* Three color definitions.  The order of the red, green, and blue, (and the</div><div class='ctx'>  * exact size) is not important, although the size of the fields need to</div><div class='hunk'>@@ -452,6 +522,7 @@ typedef struct png_color_struct</div><div class='ctx'>    png_byte blue;</div><div class='ctx'> } png_color;</div><div class='ctx'> typedef png_color FAR * png_colorp;</div><div class='add'>+typedef PNG_CONST png_color FAR * png_const_colorp;</div><div class='ctx'> typedef png_color FAR * FAR * png_colorpp;</div><div class='ctx'> </div><div class='ctx'> typedef struct png_color_16_struct</div><div class='hunk'>@@ -463,6 +534,7 @@ typedef struct png_color_16_struct</div><div class='ctx'>    png_uint_16 gray;  /* for use in grayscale files */</div><div class='ctx'> } png_color_16;</div><div class='ctx'> typedef png_color_16 FAR * png_color_16p;</div><div class='add'>+typedef PNG_CONST png_color_16 FAR * png_const_color_16p;</div><div class='ctx'> typedef png_color_16 FAR * FAR * png_color_16pp;</div><div class='ctx'> </div><div class='ctx'> typedef struct png_color_8_struct</div><div class='hunk'>@@ -474,6 +546,7 @@ typedef struct png_color_8_struct</div><div class='ctx'>    png_byte alpha; /* for alpha channel files */</div><div class='ctx'> } png_color_8;</div><div class='ctx'> typedef png_color_8 FAR * png_color_8p;</div><div class='add'>+typedef PNG_CONST png_color_8 FAR * png_const_color_8p;</div><div class='ctx'> typedef png_color_8 FAR * FAR * png_color_8pp;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -489,6 +562,7 @@ typedef struct png_sPLT_entry_struct</div><div class='ctx'>    png_uint_16 frequency;</div><div class='ctx'> } png_sPLT_entry;</div><div class='ctx'> typedef png_sPLT_entry FAR * png_sPLT_entryp;</div><div class='add'>+typedef PNG_CONST png_sPLT_entry FAR * png_const_sPLT_entryp;</div><div class='ctx'> typedef png_sPLT_entry FAR * FAR * png_sPLT_entrypp;</div><div class='ctx'> </div><div class='ctx'> /*  When the depth of the sPLT palette is 8 bits, the color and alpha samples</div><div class='hunk'>@@ -504,15 +578,16 @@ typedef struct png_sPLT_struct</div><div class='ctx'>    png_int_32 nentries;      /* number of palette entries */</div><div class='ctx'> } png_sPLT_t;</div><div class='ctx'> typedef png_sPLT_t FAR * png_sPLT_tp;</div><div class='add'>+typedef PNG_CONST png_sPLT_t FAR * png_const_sPLT_tp;</div><div class='ctx'> typedef png_sPLT_t FAR * FAR * png_sPLT_tpp;</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_TEXT_SUPPORTED</div><div class='del'>-/* png_text holds the contents of a text/ztxt/itxt chunk in a PNG file,</div><div class='add'>+/* png_text holds the contents of a text/ztxt/itxt chunk in a PNG file, </div><div class='ctx'>  * and whether that contents is compressed or not.  The "key" field</div><div class='ctx'>  * points to a regular zero-terminated C string.  The "text", "lang", and</div><div class='ctx'>  * "lang_key" fields can be regular C strings, empty strings, or NULL pointers.</div><div class='ctx'>  * However, the * structure returned by png_get_text() will always contain</div><div class='del'>- * regular zero-terminated C strings (possibly empty), never NULL pointers,</div><div class='add'>+ * regular zero-terminated C strings (possibly empty), never NULL pointers, </div><div class='ctx'>  * so they can be safely used in printf() and other string-handling functions.</div><div class='ctx'>  */</div><div class='ctx'> typedef struct png_text_struct</div><div class='hunk'>@@ -526,15 +601,14 @@ typedef struct png_text_struct</div><div class='ctx'>    png_charp text;         /* comment, may be an empty string (ie "")</div><div class='ctx'>                               or a NULL pointer */</div><div class='ctx'>    png_size_t text_length; /* length of the text string */</div><div class='del'>-#ifdef PNG_iTXt_SUPPORTED</div><div class='ctx'>    png_size_t itxt_length; /* length of the itxt string */</div><div class='ctx'>    png_charp lang;         /* language code, 0-79 characters</div><div class='ctx'>                               or a NULL pointer */</div><div class='ctx'>    png_charp lang_key;     /* keyword translated UTF-8 string, 0 or more</div><div class='ctx'>                               chars or a NULL pointer */</div><div class='del'>-#endif</div><div class='ctx'> } png_text;</div><div class='ctx'> typedef png_text FAR * png_textp;</div><div class='add'>+typedef PNG_CONST png_text FAR * png_const_textp;</div><div class='ctx'> typedef png_text FAR * FAR * png_textpp;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -564,10 +638,11 @@ typedef struct png_time_struct</div><div class='ctx'>    png_byte second;  /* second of minute, 0 - 60 (for leap seconds) */</div><div class='ctx'> } png_time;</div><div class='ctx'> typedef png_time FAR * png_timep;</div><div class='add'>+typedef PNG_CONST png_time FAR * png_const_timep;</div><div class='ctx'> typedef png_time FAR * FAR * png_timepp;</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \</div><div class='del'>- defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)</div><div class='add'>+    defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)</div><div class='ctx'> /* png_unknown_chunk is a structure to hold queued chunks for which there is</div><div class='ctx'>  * no specific support.  The idea is that we can use this to queue</div><div class='ctx'>  * up private chunks for output even though the library doesn't actually</div><div class='hunk'>@@ -584,286 +659,13 @@ typedef struct png_unknown_chunk_t</div><div class='ctx'> }</div><div class='ctx'> png_unknown_chunk;</div><div class='ctx'> typedef png_unknown_chunk FAR * png_unknown_chunkp;</div><div class='add'>+typedef PNG_CONST png_unknown_chunk FAR * png_const_unknown_chunkp;</div><div class='ctx'> typedef png_unknown_chunk FAR * FAR * png_unknown_chunkpp;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* png_info is a structure that holds the information in a PNG file so</div><div class='del'>- * that the application can find out the characteristics of the image.</div><div class='del'>- * If you are reading the file, this structure will tell you what is</div><div class='del'>- * in the PNG file.  If you are writing the file, fill in the information</div><div class='del'>- * you want to put into the PNG file, then call png_write_info().</div><div class='del'>- * The names chosen should be very close to the PNG specification, so</div><div class='del'>- * consult that document for information about the meaning of each field.</div><div class='del'>- *</div><div class='del'>- * With libpng &lt; 0.95, it was only possible to directly set and read the</div><div class='del'>- * the values in the png_info_struct, which meant that the contents and</div><div class='del'>- * order of the values had to remain fixed.  With libpng 0.95 and later,</div><div class='del'>- * however, there are now functions that abstract the contents of</div><div class='del'>- * png_info_struct from the application, so this makes it easier to use</div><div class='del'>- * libpng with dynamic libraries, and even makes it possible to use</div><div class='del'>- * libraries that don't have all of the libpng ancillary chunk-handing</div><div class='del'>- * functionality.</div><div class='del'>- *</div><div class='del'>- * In any case, the order of the parameters in png_info_struct should NOT</div><div class='del'>- * be changed for as long as possible to keep compatibility with applications</div><div class='del'>- * that use the old direct-access method with png_info_struct.</div><div class='del'>- *</div><div class='del'>- * The following members may have allocated storage attached that should be</div><div class='del'>- * cleaned up before the structure is discarded: palette, trans, text,</div><div class='del'>- * pcal_purpose, pcal_units, pcal_params, hist, iccp_name, iccp_profile,</div><div class='del'>- * splt_palettes, scal_unit, row_pointers, and unknowns.   By default, these</div><div class='del'>- * are automatically freed when the info structure is deallocated, if they were</div><div class='del'>- * allocated internally by libpng.  This behavior can be changed by means</div><div class='del'>- * of the png_data_freer() function.</div><div class='del'>- *</div><div class='del'>- * More allocation details: all the chunk-reading functions that</div><div class='del'>- * change these members go through the corresponding png_set_*</div><div class='del'>- * functions.  A function to clear these members is available: see</div><div class='del'>- * png_free_data().  The png_set_* functions do not depend on being</div><div class='del'>- * able to point info structure members to any of the storage they are</div><div class='del'>- * passed (they make their own copies), EXCEPT that the png_set_text</div><div class='del'>- * functions use the same storage passed to them in the text_ptr or</div><div class='del'>- * itxt_ptr structure argument, and the png_set_rows and png_set_unknowns</div><div class='del'>- * functions do not make their own copies.</div><div class='del'>- */</div><div class='del'>-typedef struct png_info_struct</div><div class='del'>-{</div><div class='del'>-   /* the following are necessary for every PNG file */</div><div class='del'>-   png_uint_32 width PNG_DEPSTRUCT;       /* width of image in pixels (from IHDR) */</div><div class='del'>-   png_uint_32 height PNG_DEPSTRUCT;      /* height of image in pixels (from IHDR) */</div><div class='del'>-   png_uint_32 valid PNG_DEPSTRUCT;       /* valid chunk data (see PNG_INFO_ below) */</div><div class='del'>-   png_size_t rowbytes PNG_DEPSTRUCT;     /* bytes needed to hold an untransformed row */</div><div class='del'>-   png_colorp palette PNG_DEPSTRUCT;      /* array of color values (valid &amp; PNG_INFO_PLTE) */</div><div class='del'>-   png_uint_16 num_palette PNG_DEPSTRUCT; /* number of color entries in "palette" (PLTE) */</div><div class='del'>-   png_uint_16 num_trans PNG_DEPSTRUCT;   /* number of transparent palette color (tRNS) */</div><div class='del'>-   png_byte bit_depth PNG_DEPSTRUCT;      /* 1, 2, 4, 8, or 16 bits/channel (from IHDR) */</div><div class='del'>-   png_byte color_type PNG_DEPSTRUCT;     /* see PNG_COLOR_TYPE_ below (from IHDR) */</div><div class='del'>-   /* The following three should have been named *_method not *_type */</div><div class='del'>-   png_byte compression_type PNG_DEPSTRUCT; /* must be PNG_COMPRESSION_TYPE_BASE (IHDR) */</div><div class='del'>-   png_byte filter_type PNG_DEPSTRUCT;    /* must be PNG_FILTER_TYPE_BASE (from IHDR) */</div><div class='del'>-   png_byte interlace_type PNG_DEPSTRUCT; /* One of PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */</div><div class='del'>-</div><div class='del'>-   /* The following is informational only on read, and not used on writes. */</div><div class='del'>-   png_byte channels PNG_DEPSTRUCT;       /* number of data channels per pixel (1, 2, 3, 4) */</div><div class='del'>-   png_byte pixel_depth PNG_DEPSTRUCT;    /* number of bits per pixel */</div><div class='del'>-   png_byte spare_byte PNG_DEPSTRUCT;     /* to align the data, and for future use */</div><div class='del'>-   png_byte signature[8] PNG_DEPSTRUCT;   /* magic bytes read by libpng from start of file */</div><div class='del'>-</div><div class='del'>-   /* The rest of the data is optional.  If you are reading, check the</div><div class='del'>-    * valid field to see if the information in these are valid.  If you</div><div class='del'>-    * are writing, set the valid field to those chunks you want written,</div><div class='del'>-    * and initialize the appropriate fields below.</div><div class='del'>-    */</div><div class='del'>-</div><div class='del'>-#if defined(PNG_gAMA_SUPPORTED) &amp;&amp; defined(PNG_FLOATING_POINT_SUPPORTED)</div><div class='del'>-   /* The gAMA chunk describes the gamma characteristics of the system</div><div class='del'>-    * on which the image was created, normally in the range [1.0, 2.5].</div><div class='del'>-    * Data is valid if (valid &amp; PNG_INFO_gAMA) is non-zero.</div><div class='del'>-    */</div><div class='del'>-   float gamma PNG_DEPSTRUCT; /* gamma value of image, if (valid &amp; PNG_INFO_gAMA) */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_sRGB_SUPPORTED</div><div class='del'>-    /* GR-P, 0.96a */</div><div class='del'>-    /* Data valid if (valid &amp; PNG_INFO_sRGB) non-zero. */</div><div class='del'>-   png_byte srgb_intent PNG_DEPSTRUCT; /* sRGB rendering intent [0, 1, 2, or 3] */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_TEXT_SUPPORTED</div><div class='del'>-   /* The tEXt, and zTXt chunks contain human-readable textual data in</div><div class='del'>-    * uncompressed, compressed, and optionally compressed forms, respectively.</div><div class='del'>-    * The data in "text" is an array of pointers to uncompressed,</div><div class='del'>-    * null-terminated C strings. Each chunk has a keyword that describes the</div><div class='del'>-    * textual data contained in that chunk.  Keywords are not required to be</div><div class='del'>-    * unique, and the text string may be empty.  Any number of text chunks may</div><div class='del'>-    * be in an image.</div><div class='del'>-    */</div><div class='del'>-   int num_text PNG_DEPSTRUCT; /* number of comments read/to write */</div><div class='del'>-   int max_text PNG_DEPSTRUCT; /* current size of text array */</div><div class='del'>-   png_textp text PNG_DEPSTRUCT; /* array of comments read/to write */</div><div class='del'>-#endif /* PNG_TEXT_SUPPORTED */</div><div class='del'>-</div><div class='del'>-#ifdef PNG_tIME_SUPPORTED</div><div class='del'>-   /* The tIME chunk holds the last time the displayed image data was</div><div class='del'>-    * modified.  See the png_time struct for the contents of this struct.</div><div class='del'>-    */</div><div class='del'>-   png_time mod_time PNG_DEPSTRUCT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_sBIT_SUPPORTED</div><div class='del'>-   /* The sBIT chunk specifies the number of significant high-order bits</div><div class='del'>-    * in the pixel data.  Values are in the range [1, bit_depth], and are</div><div class='del'>-    * only specified for the channels in the pixel data.  The contents of</div><div class='del'>-    * the low-order bits is not specified.  Data is valid if</div><div class='del'>-    * (valid &amp; PNG_INFO_sBIT) is non-zero.</div><div class='del'>-    */</div><div class='del'>-   png_color_8 sig_bit PNG_DEPSTRUCT; /* significant bits in color channels */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_EXPAND_SUPPORTED) || \</div><div class='del'>-defined(PNG_READ_BACKGROUND_SUPPORTED)</div><div class='del'>-   /* The tRNS chunk supplies transparency data for paletted images and</div><div class='del'>-    * other image types that don't need a full alpha channel.  There are</div><div class='del'>-    * "num_trans" transparency values for a paletted image, stored in the</div><div class='del'>-    * same order as the palette colors, starting from index 0.  Values</div><div class='del'>-    * for the data are in the range [0, 255], ranging from fully transparent</div><div class='del'>-    * to fully opaque, respectively.  For non-paletted images, there is a</div><div class='del'>-    * single color specified that should be treated as fully transparent.</div><div class='del'>-    * Data is valid if (valid &amp; PNG_INFO_tRNS) is non-zero.</div><div class='del'>-    */</div><div class='del'>-   png_bytep trans_alpha PNG_DEPSTRUCT;    /* alpha values for paletted image */</div><div class='del'>-   png_color_16 trans_color PNG_DEPSTRUCT; /* transparent color for non-palette image */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)</div><div class='del'>-   /* The bKGD chunk gives the suggested image background color if the</div><div class='del'>-    * display program does not have its own background color and the image</div><div class='del'>-    * is needs to composited onto a background before display.  The colors</div><div class='del'>-    * in "background" are normally in the same color space/depth as the</div><div class='del'>-    * pixel data.  Data is valid if (valid &amp; PNG_INFO_bKGD) is non-zero.</div><div class='del'>-    */</div><div class='del'>-   png_color_16 background PNG_DEPSTRUCT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_oFFs_SUPPORTED</div><div class='del'>-   /* The oFFs chunk gives the offset in "offset_unit_type" units rightwards</div><div class='del'>-    * and downwards from the top-left corner of the display, page, or other</div><div class='del'>-    * application-specific co-ordinate space.  See the PNG_OFFSET_ defines</div><div class='del'>-    * below for the unit types.  Valid if (valid &amp; PNG_INFO_oFFs) non-zero.</div><div class='del'>-    */</div><div class='del'>-   png_int_32 x_offset PNG_DEPSTRUCT; /* x offset on page */</div><div class='del'>-   png_int_32 y_offset PNG_DEPSTRUCT; /* y offset on page */</div><div class='del'>-   png_byte offset_unit_type PNG_DEPSTRUCT; /* offset units type */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_pHYs_SUPPORTED</div><div class='del'>-   /* The pHYs chunk gives the physical pixel density of the image for</div><div class='del'>-    * display or printing in "phys_unit_type" units (see PNG_RESOLUTION_</div><div class='del'>-    * defines below).  Data is valid if (valid &amp; PNG_INFO_pHYs) is non-zero.</div><div class='del'>-    */</div><div class='del'>-   png_uint_32 x_pixels_per_unit PNG_DEPSTRUCT; /* horizontal pixel density */</div><div class='del'>-   png_uint_32 y_pixels_per_unit PNG_DEPSTRUCT; /* vertical pixel density */</div><div class='del'>-   png_byte phys_unit_type PNG_DEPSTRUCT; /* resolution type (see PNG_RESOLUTION_ below) */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_hIST_SUPPORTED</div><div class='del'>-   /* The hIST chunk contains the relative frequency or importance of the</div><div class='del'>-    * various palette entries, so that a viewer can intelligently select a</div><div class='del'>-    * reduced-color palette, if required.  Data is an array of "num_palette"</div><div class='del'>-    * values in the range [0,65535]. Data valid if (valid &amp; PNG_INFO_hIST)</div><div class='del'>-    * is non-zero.</div><div class='del'>-    */</div><div class='del'>-   png_uint_16p hist PNG_DEPSTRUCT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_cHRM_SUPPORTED</div><div class='del'>-   /* The cHRM chunk describes the CIE color characteristics of the monitor</div><div class='del'>-    * on which the PNG was created.  This data allows the viewer to do gamut</div><div class='del'>-    * mapping of the input image to ensure that the viewer sees the same</div><div class='del'>-    * colors in the image as the creator.  Values are in the range</div><div class='del'>-    * [0.0, 0.8].  Data valid if (valid &amp; PNG_INFO_cHRM) non-zero.</div><div class='del'>-    */</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   float x_white PNG_DEPSTRUCT;</div><div class='del'>-   float y_white PNG_DEPSTRUCT;</div><div class='del'>-   float x_red PNG_DEPSTRUCT;</div><div class='del'>-   float y_red PNG_DEPSTRUCT;</div><div class='del'>-   float x_green PNG_DEPSTRUCT;</div><div class='del'>-   float y_green PNG_DEPSTRUCT;</div><div class='del'>-   float x_blue PNG_DEPSTRUCT;</div><div class='del'>-   float y_blue PNG_DEPSTRUCT;</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_pCAL_SUPPORTED</div><div class='del'>-   /* The pCAL chunk describes a transformation between the stored pixel</div><div class='del'>-    * values and original physical data values used to create the image.</div><div class='del'>-    * The integer range [0, 2^bit_depth - 1] maps to the floating-point</div><div class='del'>-    * range given by [pcal_X0, pcal_X1], and are further transformed by a</div><div class='del'>-    * (possibly non-linear) transformation function given by "pcal_type"</div><div class='del'>-    * and "pcal_params" into "pcal_units".  Please see the PNG_EQUATION_</div><div class='del'>-    * defines below, and the PNG-Group's PNG extensions document for a</div><div class='del'>-    * complete description of the transformations and how they should be</div><div class='del'>-    * implemented, and for a description of the ASCII parameter strings.</div><div class='del'>-    * Data values are valid if (valid &amp; PNG_INFO_pCAL) non-zero.</div><div class='del'>-    */</div><div class='del'>-   png_charp pcal_purpose PNG_DEPSTRUCT;  /* pCAL chunk description string */</div><div class='del'>-   png_int_32 pcal_X0 PNG_DEPSTRUCT;      /* minimum value */</div><div class='del'>-   png_int_32 pcal_X1 PNG_DEPSTRUCT;      /* maximum value */</div><div class='del'>-   png_charp pcal_units PNG_DEPSTRUCT;    /* Latin-1 string giving physical units */</div><div class='del'>-   png_charpp pcal_params PNG_DEPSTRUCT;  /* ASCII strings containing parameter values */</div><div class='del'>-   png_byte pcal_type PNG_DEPSTRUCT;      /* equation type (see PNG_EQUATION_ below) */</div><div class='del'>-   png_byte pcal_nparams PNG_DEPSTRUCT;   /* number of parameters given in pcal_params */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* New members added in libpng-1.0.6 */</div><div class='del'>-   png_uint_32 free_me PNG_DEPSTRUCT;     /* flags items libpng is responsible for freeing */</div><div class='del'>-</div><div class='del'>-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \</div><div class='del'>- defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)</div><div class='del'>-   /* Storage for unknown chunks that the library doesn't recognize. */</div><div class='del'>-   png_unknown_chunkp unknown_chunks PNG_DEPSTRUCT;</div><div class='del'>-   png_size_t unknown_chunks_num PNG_DEPSTRUCT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_iCCP_SUPPORTED</div><div class='del'>-   /* iCCP chunk data. */</div><div class='del'>-   png_charp iccp_name PNG_DEPSTRUCT;     /* profile name */</div><div class='del'>-   png_charp iccp_profile PNG_DEPSTRUCT;  /* International Color Consortium profile data */</div><div class='del'>-                            /* Note to maintainer: should be png_bytep */</div><div class='del'>-   png_uint_32 iccp_proflen PNG_DEPSTRUCT;  /* ICC profile data length */</div><div class='del'>-   png_byte iccp_compression PNG_DEPSTRUCT; /* Always zero */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_sPLT_SUPPORTED</div><div class='del'>-   /* Data on sPLT chunks (there may be more than one). */</div><div class='del'>-   png_sPLT_tp splt_palettes PNG_DEPSTRUCT;</div><div class='del'>-   png_uint_32 splt_palettes_num PNG_DEPSTRUCT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_sCAL_SUPPORTED</div><div class='del'>-   /* The sCAL chunk describes the actual physical dimensions of the</div><div class='del'>-    * subject matter of the graphic.  The chunk contains a unit specification</div><div class='del'>-    * a byte value, and two ASCII strings representing floating-point</div><div class='del'>-    * values.  The values are width and height corresponsing to one pixel</div><div class='del'>-    * in the image.  This external representation is converted to double</div><div class='del'>-    * here.  Data values are valid if (valid &amp; PNG_INFO_sCAL) is non-zero.</div><div class='del'>-    */</div><div class='del'>-   png_byte scal_unit PNG_DEPSTRUCT;         /* unit of physical scale */</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   double scal_pixel_width PNG_DEPSTRUCT;    /* width of one pixel */</div><div class='del'>-   double scal_pixel_height PNG_DEPSTRUCT;   /* height of one pixel */</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-   png_charp scal_s_width PNG_DEPSTRUCT;     /* string containing height */</div><div class='del'>-   png_charp scal_s_height PNG_DEPSTRUCT;    /* string containing width */</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_INFO_IMAGE_SUPPORTED</div><div class='del'>-   /* Memory has been allocated if (valid &amp; PNG_ALLOCATED_INFO_ROWS) non-zero */</div><div class='del'>-   /* Data valid if (valid &amp; PNG_INFO_IDAT) non-zero */</div><div class='del'>-   png_bytepp row_pointers PNG_DEPSTRUCT;        /* the image bits */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(PNG_FIXED_POINT_SUPPORTED) &amp;&amp; defined(PNG_gAMA_SUPPORTED)</div><div class='del'>-   png_fixed_point int_gamma PNG_DEPSTRUCT; /* gamma of image, if (valid &amp; PNG_INFO_gAMA) */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(PNG_cHRM_SUPPORTED) &amp;&amp; defined(PNG_FIXED_POINT_SUPPORTED)</div><div class='del'>-   png_fixed_point int_x_white PNG_DEPSTRUCT;</div><div class='del'>-   png_fixed_point int_y_white PNG_DEPSTRUCT;</div><div class='del'>-   png_fixed_point int_x_red PNG_DEPSTRUCT;</div><div class='del'>-   png_fixed_point int_y_red PNG_DEPSTRUCT;</div><div class='del'>-   png_fixed_point int_x_green PNG_DEPSTRUCT;</div><div class='del'>-   png_fixed_point int_y_green PNG_DEPSTRUCT;</div><div class='del'>-   png_fixed_point int_x_blue PNG_DEPSTRUCT;</div><div class='del'>-   png_fixed_point int_y_blue PNG_DEPSTRUCT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-} png_info;</div><div class='del'>-</div><div class='add'>+typedef struct png_info_def png_info;</div><div class='ctx'> typedef png_info FAR * png_infop;</div><div class='add'>+typedef PNG_CONST png_info FAR * png_const_infop;</div><div class='ctx'> typedef png_info FAR * FAR * png_infopp;</div><div class='ctx'> </div><div class='ctx'> /* Maximum positive integer used in PNG is (2^31)-1 */</div><div class='hunk'>@@ -871,6 +673,12 @@ typedef png_info FAR * FAR * png_infopp;</div><div class='ctx'> #define PNG_UINT_32_MAX ((png_uint_32)(-1))</div><div class='ctx'> #define PNG_SIZE_MAX ((png_size_t)(-1))</div><div class='ctx'> </div><div class='add'>+/* These are constants for fixed point values encoded in the</div><div class='add'>+ * PNG specification manner (x100000)</div><div class='add'>+ */</div><div class='add'>+#define PNG_FP_1    100000</div><div class='add'>+#define PNG_FP_HALF  50000</div><div class='add'>+</div><div class='ctx'> /* These describe the color_type field in png_info. */</div><div class='ctx'> /* color type masks */</div><div class='ctx'> #define PNG_COLOR_MASK_PALETTE    1</div><div class='hunk'>@@ -965,11 +773,11 @@ typedef png_info FAR * FAR * png_infopp;</div><div class='ctx'>  */</div><div class='ctx'> typedef struct png_row_info_struct</div><div class='ctx'> {</div><div class='del'>-   png_uint_32 width; /* width of row */</div><div class='del'>-   png_size_t rowbytes; /* number of bytes in row */</div><div class='del'>-   png_byte color_type; /* color type of row */</div><div class='del'>-   png_byte bit_depth; /* bit depth of row */</div><div class='del'>-   png_byte channels; /* number of channels (1, 2, 3, or 4) */</div><div class='add'>+   png_uint_32 width;    /* width of row */</div><div class='add'>+   png_size_t rowbytes;  /* number of bytes in row */</div><div class='add'>+   png_byte color_type;  /* color type of row */</div><div class='add'>+   png_byte bit_depth;   /* bit depth of row */</div><div class='add'>+   png_byte channels;    /* number of channels (1, 2, 3, or 4) */</div><div class='ctx'>    png_byte pixel_depth; /* bits per pixel (depth * channels) */</div><div class='ctx'> } png_row_info;</div><div class='ctx'> </div><div class='hunk'>@@ -980,44 +788,65 @@ typedef png_row_info FAR * FAR * png_row_infopp;</div><div class='ctx'>  * that allow the user to override the default I/O functions with his or her</div><div class='ctx'>  * own.  The png_error_ptr type should match that of user-supplied warning</div><div class='ctx'>  * and error functions, while the png_rw_ptr type should match that of the</div><div class='del'>- * user read/write data functions.</div><div class='add'>+ * user read/write data functions.  Note that the 'write' function must not</div><div class='add'>+ * modify the buffer it is passed. The 'read' function, on the other hand, is</div><div class='add'>+ * expected to return the read data in the buffer.</div><div class='ctx'>  */</div><div class='ctx'> typedef struct png_struct_def png_struct;</div><div class='add'>+typedef PNG_CONST png_struct FAR * png_const_structp;</div><div class='ctx'> typedef png_struct FAR * png_structp;</div><div class='ctx'> </div><div class='del'>-typedef void (PNGAPI *png_error_ptr) PNGARG((png_structp, png_const_charp));</div><div class='del'>-typedef void (PNGAPI *png_rw_ptr) PNGARG((png_structp, png_bytep, png_size_t));</div><div class='del'>-typedef void (PNGAPI *png_flush_ptr) PNGARG((png_structp));</div><div class='del'>-typedef void (PNGAPI *png_read_status_ptr) PNGARG((png_structp, png_uint_32,</div><div class='del'>-   int));</div><div class='del'>-typedef void (PNGAPI *png_write_status_ptr) PNGARG((png_structp, png_uint_32,</div><div class='del'>-   int));</div><div class='add'>+typedef PNG_CALLBACK(void, *png_error_ptr, (png_structp, png_const_charp), );</div><div class='add'>+typedef PNG_CALLBACK(void, *png_rw_ptr, (png_structp, png_bytep, png_size_t), );</div><div class='add'>+typedef PNG_CALLBACK(void, *png_flush_ptr, (png_structp), );</div><div class='add'>+typedef PNG_CALLBACK(void, *png_read_status_ptr, (png_structp, png_uint_32, </div><div class='add'>+    int), );</div><div class='add'>+typedef PNG_CALLBACK(void, *png_write_status_ptr, (png_structp, png_uint_32, </div><div class='add'>+    int), );</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_PROGRESSIVE_READ_SUPPORTED</div><div class='del'>-typedef void (PNGAPI *png_progressive_info_ptr) PNGARG((png_structp, png_infop));</div><div class='del'>-typedef void (PNGAPI *png_progressive_end_ptr) PNGARG((png_structp, png_infop));</div><div class='del'>-typedef void (PNGAPI *png_progressive_row_ptr) PNGARG((png_structp, png_bytep,</div><div class='del'>-   png_uint_32, int));</div><div class='add'>+typedef PNG_CALLBACK(void, *png_progressive_info_ptr, </div><div class='add'>+    (png_structp, png_infop), );</div><div class='add'>+typedef PNG_CALLBACK(void, *png_progressive_end_ptr,</div><div class='add'>+    (png_structp, png_infop), );</div><div class='add'>+typedef PNG_CALLBACK(void, *png_progressive_row_ptr,</div><div class='add'>+    (png_structp, png_bytep, png_uint_32, int), );</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \</div><div class='ctx'>     defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)</div><div class='del'>-typedef void (PNGAPI *png_user_transform_ptr) PNGARG((png_structp,</div><div class='del'>-    png_row_infop, png_bytep));</div><div class='add'>+typedef PNG_CALLBACK(void, *png_user_transform_ptr,</div><div class='add'>+    (png_structp, png_row_infop, png_bytep), );</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_USER_CHUNKS_SUPPORTED</div><div class='del'>-typedef int (PNGAPI *png_user_chunk_ptr) PNGARG((png_structp, png_unknown_chunkp));</div><div class='add'>+typedef PNG_CALLBACK(int, *png_user_chunk_ptr, (png_structp, </div><div class='add'>+    png_unknown_chunkp), );</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED</div><div class='del'>-typedef void (PNGAPI *png_unknown_chunk_ptr) PNGARG((png_structp));</div><div class='add'>+typedef PNG_CALLBACK(void, *png_unknown_chunk_ptr, (png_structp), );</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_SETJMP_SUPPORTED</div><div class='ctx'> /* This must match the function definition in &lt;setjmp.h&gt;, and the</div><div class='ctx'>  * application must include this before png.h to obtain the definition</div><div class='del'>- * of jmp_buf.</div><div class='add'>+ * of jmp_buf.  The function is required to be PNG_NORETURN.  (Note that</div><div class='add'>+ * PNG_PTR_NORETURN is used here because current versions of the Microsoft</div><div class='add'>+ * C compiler do not support the PNG_NORETURN attribute on a pointer.)</div><div class='add'>+ *</div><div class='add'>+ * If you get a type warning from the compiler when linking against this line</div><div class='add'>+ * then your compiler has 'longjmp' that does not match the requirements of the</div><div class='add'>+ * compiler that built libpng.  You will have to write a wrapper function for</div><div class='add'>+ * your compiler's longjmp and call png_set_longjmp_fn directly (not via the</div><div class='add'>+ * png_jmpbuf macro.)</div><div class='add'>+ *</div><div class='add'>+ * If you get a warning here while building the library you will need to make</div><div class='add'>+ * changes to ensure that pnglibconf.h records the calling convention used by</div><div class='add'>+ * your compiler.  This may be very difficult - try using a different compiler</div><div class='add'>+ * to build the library!</div><div class='ctx'>  */</div><div class='del'>-typedef void (PNGAPI *png_longjmp_ptr) PNGARG((jmp_buf, int));</div><div class='add'>+typedef PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)), </div><div class='add'>+   PNG_PTR_NORETURN);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Transform masks for the high-level interface */</div><div class='hunk'>@@ -1045,350 +874,85 @@ typedef void (PNGAPI *png_longjmp_ptr) PNGARG((jmp_buf, int));</div><div class='ctx'> #define PNG_FLAG_MNG_FILTER_64      0x04</div><div class='ctx'> #define PNG_ALL_MNG_FEATURES        0x05</div><div class='ctx'> </div><div class='del'>-typedef png_voidp (*png_malloc_ptr) PNGARG((png_structp, png_alloc_size_t));</div><div class='del'>-typedef void (*png_free_ptr) PNGARG((png_structp, png_voidp));</div><div class='del'>-</div><div class='del'>-/* The structure that holds the information to read and write PNG files.</div><div class='del'>- * The only people who need to care about what is inside of this are the</div><div class='del'>- * people who will be modifying the library for their own special needs.</div><div class='del'>- * It should NOT be accessed directly by an application, except to store</div><div class='del'>- * the jmp_buf.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-struct png_struct_def</div><div class='del'>-{</div><div class='del'>-#ifdef PNG_SETJMP_SUPPORTED</div><div class='del'>-   jmp_buf jmpbuf PNG_DEPSTRUCT;            /* used in png_error */</div><div class='del'>-   png_longjmp_ptr longjmp_fn PNG_DEPSTRUCT;/* setjmp non-local goto function. */</div><div class='del'>-#endif</div><div class='del'>-   png_error_ptr error_fn PNG_DEPSTRUCT;    /* function for printing errors and aborting */</div><div class='del'>-   png_error_ptr warning_fn PNG_DEPSTRUCT;  /* function for printing warnings */</div><div class='del'>-   png_voidp error_ptr PNG_DEPSTRUCT;       /* user supplied struct for error functions */</div><div class='del'>-   png_rw_ptr write_data_fn PNG_DEPSTRUCT;  /* function for writing output data */</div><div class='del'>-   png_rw_ptr read_data_fn PNG_DEPSTRUCT;   /* function for reading input data */</div><div class='del'>-   png_voidp io_ptr PNG_DEPSTRUCT;          /* ptr to application struct for I/O functions */</div><div class='del'>-</div><div class='del'>-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED</div><div class='del'>-   png_user_transform_ptr read_user_transform_fn PNG_DEPSTRUCT; /* user read transform */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED</div><div class='del'>-   png_user_transform_ptr write_user_transform_fn PNG_DEPSTRUCT; /* user write transform */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* These were added in libpng-1.0.2 */</div><div class='del'>-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED</div><div class='del'>-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \</div><div class='del'>-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)</div><div class='del'>-   png_voidp user_transform_ptr PNG_DEPSTRUCT; /* user supplied struct for user transform */</div><div class='del'>-   png_byte user_transform_depth PNG_DEPSTRUCT;    /* bit depth of user transformed pixels */</div><div class='del'>-   png_byte user_transform_channels PNG_DEPSTRUCT; /* channels in user transformed pixels */</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-   png_uint_32 mode PNG_DEPSTRUCT;          /* tells us where we are in the PNG file */</div><div class='del'>-   png_uint_32 flags PNG_DEPSTRUCT;         /* flags indicating various things to libpng */</div><div class='del'>-   png_uint_32 transformations PNG_DEPSTRUCT; /* which transformations to perform */</div><div class='del'>-</div><div class='del'>-   z_stream zstream PNG_DEPSTRUCT;          /* pointer to decompression structure (below) */</div><div class='del'>-   png_bytep zbuf PNG_DEPSTRUCT;            /* buffer for zlib */</div><div class='del'>-   png_size_t zbuf_size PNG_DEPSTRUCT;      /* size of zbuf */</div><div class='del'>-   int zlib_level PNG_DEPSTRUCT;            /* holds zlib compression level */</div><div class='del'>-   int zlib_method PNG_DEPSTRUCT;           /* holds zlib compression method */</div><div class='del'>-   int zlib_window_bits PNG_DEPSTRUCT;      /* holds zlib compression window bits */</div><div class='del'>-   int zlib_mem_level PNG_DEPSTRUCT;        /* holds zlib compression memory level */</div><div class='del'>-   int zlib_strategy PNG_DEPSTRUCT;         /* holds zlib compression strategy */</div><div class='del'>-</div><div class='del'>-   png_uint_32 width PNG_DEPSTRUCT;         /* width of image in pixels */</div><div class='del'>-   png_uint_32 height PNG_DEPSTRUCT;        /* height of image in pixels */</div><div class='del'>-   png_uint_32 num_rows PNG_DEPSTRUCT;      /* number of rows in current pass */</div><div class='del'>-   png_uint_32 usr_width PNG_DEPSTRUCT;     /* width of row at start of write */</div><div class='del'>-   png_size_t rowbytes PNG_DEPSTRUCT;       /* size of row in bytes */</div><div class='del'>-   png_size_t irowbytes PNG_DEPSTRUCT;      /* size of current interlaced row in bytes */</div><div class='del'>-   png_uint_32 iwidth PNG_DEPSTRUCT;        /* width of current interlaced row in pixels */</div><div class='del'>-   png_uint_32 row_number PNG_DEPSTRUCT;    /* current row in interlace pass */</div><div class='del'>-   png_bytep prev_row PNG_DEPSTRUCT;        /* buffer to save previous (unfiltered) row */</div><div class='del'>-   png_bytep row_buf PNG_DEPSTRUCT;         /* buffer to save current (unfiltered) row */</div><div class='del'>-   png_bytep sub_row PNG_DEPSTRUCT;         /* buffer to save "sub" row when filtering */</div><div class='del'>-   png_bytep up_row PNG_DEPSTRUCT;          /* buffer to save "up" row when filtering */</div><div class='del'>-   png_bytep avg_row PNG_DEPSTRUCT;         /* buffer to save "avg" row when filtering */</div><div class='del'>-   png_bytep paeth_row PNG_DEPSTRUCT;       /* buffer to save "Paeth" row when filtering */</div><div class='del'>-   png_row_info row_info PNG_DEPSTRUCT;     /* used for transformation routines */</div><div class='del'>-</div><div class='del'>-   png_uint_32 idat_size PNG_DEPSTRUCT;     /* current IDAT size for read */</div><div class='del'>-   png_uint_32 crc PNG_DEPSTRUCT;           /* current chunk CRC value */</div><div class='del'>-   png_colorp palette PNG_DEPSTRUCT;        /* palette from the input file */</div><div class='del'>-   png_uint_16 num_palette PNG_DEPSTRUCT;   /* number of color entries in palette */</div><div class='del'>-   png_uint_16 num_trans PNG_DEPSTRUCT;     /* number of transparency values */</div><div class='del'>-   png_byte chunk_name[5] PNG_DEPSTRUCT;    /* null-terminated name of current chunk */</div><div class='del'>-   png_byte compression PNG_DEPSTRUCT;      /* file compression type (always 0) */</div><div class='del'>-   png_byte filter PNG_DEPSTRUCT;           /* file filter type (always 0) */</div><div class='del'>-   png_byte interlaced PNG_DEPSTRUCT;       /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */</div><div class='del'>-   png_byte pass PNG_DEPSTRUCT;             /* current interlace pass (0 - 6) */</div><div class='del'>-   png_byte do_filter PNG_DEPSTRUCT;        /* row filter flags (see PNG_FILTER_ below ) */</div><div class='del'>-   png_byte color_type PNG_DEPSTRUCT;       /* color type of file */</div><div class='del'>-   png_byte bit_depth PNG_DEPSTRUCT;        /* bit depth of file */</div><div class='del'>-   png_byte usr_bit_depth PNG_DEPSTRUCT;    /* bit depth of users row */</div><div class='del'>-   png_byte pixel_depth PNG_DEPSTRUCT;      /* number of bits per pixel */</div><div class='del'>-   png_byte channels PNG_DEPSTRUCT;         /* number of channels in file */</div><div class='del'>-   png_byte usr_channels PNG_DEPSTRUCT;     /* channels at start of write */</div><div class='del'>-   png_byte sig_bytes PNG_DEPSTRUCT;        /* magic bytes read/written from start of file */</div><div class='del'>-</div><div class='del'>-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)</div><div class='del'>-   png_uint_16 filler PNG_DEPSTRUCT;           /* filler bytes for pixel expansion */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_bKGD_SUPPORTED</div><div class='del'>-   png_byte background_gamma_type PNG_DEPSTRUCT;</div><div class='del'>-#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   float background_gamma PNG_DEPSTRUCT;</div><div class='del'>-#  endif</div><div class='del'>-   png_color_16 background PNG_DEPSTRUCT;   /* background color in screen gamma space */</div><div class='del'>-#ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='del'>-   png_color_16 background_1 PNG_DEPSTRUCT; /* background normalized to gamma 1.0 */</div><div class='del'>-#endif</div><div class='del'>-#endif /* PNG_bKGD_SUPPORTED */</div><div class='del'>-</div><div class='del'>-#ifdef PNG_WRITE_FLUSH_SUPPORTED</div><div class='del'>-   png_flush_ptr output_flush_fn PNG_DEPSTRUCT; /* Function for flushing output */</div><div class='del'>-   png_uint_32 flush_dist PNG_DEPSTRUCT;    /* how many rows apart to flush, 0 - no flush */</div><div class='del'>-   png_uint_32 flush_rows PNG_DEPSTRUCT;    /* number of rows written since last flush */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)</div><div class='del'>-   int gamma_shift PNG_DEPSTRUCT;      /* number of "insignificant" bits 16-bit gamma */</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   float gamma PNG_DEPSTRUCT;          /* file gamma value */</div><div class='del'>-   float screen_gamma PNG_DEPSTRUCT;   /* screen gamma value (display_exponent) */</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)</div><div class='del'>-   png_bytep gamma_table PNG_DEPSTRUCT;     /* gamma table for 8-bit depth files */</div><div class='del'>-   png_bytep gamma_from_1 PNG_DEPSTRUCT;    /* converts from 1.0 to screen */</div><div class='del'>-   png_bytep gamma_to_1 PNG_DEPSTRUCT;      /* converts from file to 1.0 */</div><div class='del'>-   png_uint_16pp gamma_16_table PNG_DEPSTRUCT; /* gamma table for 16-bit depth files */</div><div class='del'>-   png_uint_16pp gamma_16_from_1 PNG_DEPSTRUCT; /* converts from 1.0 to screen */</div><div class='del'>-   png_uint_16pp gamma_16_to_1 PNG_DEPSTRUCT; /* converts from file to 1.0 */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_sBIT_SUPPORTED)</div><div class='del'>-   png_color_8 sig_bit PNG_DEPSTRUCT;       /* significant bits in each available channel */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)</div><div class='del'>-   png_color_8 shift PNG_DEPSTRUCT;         /* shift for significant bit tranformation */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) \</div><div class='del'>- || defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)</div><div class='del'>-   png_bytep trans_alpha PNG_DEPSTRUCT;           /* alpha values for paletted files */</div><div class='del'>-   png_color_16 trans_color PNG_DEPSTRUCT;  /* transparent color for non-paletted files */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-   png_read_status_ptr read_row_fn PNG_DEPSTRUCT;   /* called after each row is decoded */</div><div class='del'>-   png_write_status_ptr write_row_fn PNG_DEPSTRUCT; /* called after each row is encoded */</div><div class='del'>-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED</div><div class='del'>-   png_progressive_info_ptr info_fn PNG_DEPSTRUCT; /* called after header data fully read */</div><div class='del'>-   png_progressive_row_ptr row_fn PNG_DEPSTRUCT;   /* called after each prog. row is decoded */</div><div class='del'>-   png_progressive_end_ptr end_fn PNG_DEPSTRUCT;   /* called after image is complete */</div><div class='del'>-   png_bytep save_buffer_ptr PNG_DEPSTRUCT;        /* current location in save_buffer */</div><div class='del'>-   png_bytep save_buffer PNG_DEPSTRUCT;            /* buffer for previously read data */</div><div class='del'>-   png_bytep current_buffer_ptr PNG_DEPSTRUCT;     /* current location in current_buffer */</div><div class='del'>-   png_bytep current_buffer PNG_DEPSTRUCT;         /* buffer for recently used data */</div><div class='del'>-   png_uint_32 push_length PNG_DEPSTRUCT;          /* size of current input chunk */</div><div class='del'>-   png_uint_32 skip_length PNG_DEPSTRUCT;          /* bytes to skip in input data */</div><div class='del'>-   png_size_t save_buffer_size PNG_DEPSTRUCT;      /* amount of data now in save_buffer */</div><div class='del'>-   png_size_t save_buffer_max PNG_DEPSTRUCT;       /* total size of save_buffer */</div><div class='del'>-   png_size_t buffer_size PNG_DEPSTRUCT;           /* total amount of available input data */</div><div class='del'>-   png_size_t current_buffer_size PNG_DEPSTRUCT;   /* amount of data now in current_buffer */</div><div class='del'>-   int process_mode PNG_DEPSTRUCT;                 /* what push library is currently doing */</div><div class='del'>-   int cur_palette PNG_DEPSTRUCT;                  /* current push library palette index */</div><div class='del'>-</div><div class='del'>-#  ifdef PNG_TEXT_SUPPORTED</div><div class='del'>-     png_size_t current_text_size PNG_DEPSTRUCT;   /* current size of text input data */</div><div class='del'>-     png_size_t current_text_left PNG_DEPSTRUCT;   /* how much text left to read in input */</div><div class='del'>-     png_charp current_text PNG_DEPSTRUCT;         /* current text chunk buffer */</div><div class='del'>-     png_charp current_text_ptr PNG_DEPSTRUCT;     /* current location in current_text */</div><div class='del'>-#  endif /* PNG_PROGRESSIVE_READ_SUPPORTED &amp;&amp; PNG_TEXT_SUPPORTED */</div><div class='del'>-</div><div class='del'>-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */</div><div class='del'>-</div><div class='del'>-#if defined(__TURBOC__) &amp;&amp; !defined(_Windows) &amp;&amp; !defined(__FLAT__)</div><div class='del'>-/* For the Borland special 64K segment handler */</div><div class='del'>-   png_bytepp offset_table_ptr PNG_DEPSTRUCT;</div><div class='del'>-   png_bytep offset_table PNG_DEPSTRUCT;</div><div class='del'>-   png_uint_16 offset_table_number PNG_DEPSTRUCT;</div><div class='del'>-   png_uint_16 offset_table_count PNG_DEPSTRUCT;</div><div class='del'>-   png_uint_16 offset_table_count_free PNG_DEPSTRUCT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_READ_DITHER_SUPPORTED</div><div class='del'>-   png_bytep palette_lookup PNG_DEPSTRUCT;         /* lookup table for dithering */</div><div class='del'>-   png_bytep dither_index PNG_DEPSTRUCT;           /* index translation for palette files */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(PNG_READ_DITHER_SUPPORTED) || defined(PNG_hIST_SUPPORTED)</div><div class='del'>-   png_uint_16p hist PNG_DEPSTRUCT;                /* histogram */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED</div><div class='del'>-   png_byte heuristic_method PNG_DEPSTRUCT;        /* heuristic for row filter selection */</div><div class='del'>-   png_byte num_prev_filters PNG_DEPSTRUCT;        /* number of weights for previous rows */</div><div class='del'>-   png_bytep prev_filters PNG_DEPSTRUCT;           /* filter type(s) of previous row(s) */</div><div class='del'>-   png_uint_16p filter_weights PNG_DEPSTRUCT;      /* weight(s) for previous line(s) */</div><div class='del'>-   png_uint_16p inv_filter_weights PNG_DEPSTRUCT;  /* 1/weight(s) for previous line(s) */</div><div class='del'>-   png_uint_16p filter_costs PNG_DEPSTRUCT;        /* relative filter calculation cost */</div><div class='del'>-   png_uint_16p inv_filter_costs PNG_DEPSTRUCT;    /* 1/relative filter calculation cost */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_TIME_RFC1123_SUPPORTED</div><div class='del'>-   png_charp time_buffer PNG_DEPSTRUCT;            /* String to hold RFC 1123 time text */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* New members added in libpng-1.0.6 */</div><div class='del'>-</div><div class='del'>-   png_uint_32 free_me PNG_DEPSTRUCT;     /* flags items libpng is responsible for freeing */</div><div class='del'>-</div><div class='del'>-#ifdef PNG_USER_CHUNKS_SUPPORTED</div><div class='del'>-   png_voidp user_chunk_ptr PNG_DEPSTRUCT;</div><div class='del'>-   png_user_chunk_ptr read_user_chunk_fn PNG_DEPSTRUCT; /* user read chunk handler */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='del'>-   int num_chunk_list PNG_DEPSTRUCT;</div><div class='del'>-   png_bytep chunk_list PNG_DEPSTRUCT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* New members added in libpng-1.0.3 */</div><div class='del'>-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED</div><div class='del'>-   png_byte rgb_to_gray_status PNG_DEPSTRUCT;</div><div class='del'>-   /* These were changed from png_byte in libpng-1.0.6 */</div><div class='del'>-   png_uint_16 rgb_to_gray_red_coeff PNG_DEPSTRUCT;</div><div class='del'>-   png_uint_16 rgb_to_gray_green_coeff PNG_DEPSTRUCT;</div><div class='del'>-   png_uint_16 rgb_to_gray_blue_coeff PNG_DEPSTRUCT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* New member added in libpng-1.0.4 (renamed in 1.0.9) */</div><div class='del'>-#if defined(PNG_MNG_FEATURES_SUPPORTED) || \</div><div class='del'>-    defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \</div><div class='del'>-    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)</div><div class='del'>-/* Changed from png_byte to png_uint_32 at version 1.2.0 */</div><div class='del'>-   png_uint_32 mng_features_permitted PNG_DEPSTRUCT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* New member added in libpng-1.0.7 */</div><div class='del'>-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)</div><div class='del'>-   png_fixed_point int_gamma PNG_DEPSTRUCT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* New member added in libpng-1.0.9, ifdef'ed out in 1.0.12, enabled in 1.2.0 */</div><div class='del'>-#ifdef PNG_MNG_FEATURES_SUPPORTED</div><div class='del'>-   png_byte filter_type PNG_DEPSTRUCT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* New members added in libpng-1.2.0 */</div><div class='del'>-</div><div class='del'>-/* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */</div><div class='del'>-#ifdef PNG_USER_MEM_SUPPORTED</div><div class='del'>-   png_voidp mem_ptr PNG_DEPSTRUCT;                /* user supplied struct for mem functions */</div><div class='del'>-   png_malloc_ptr malloc_fn PNG_DEPSTRUCT;         /* function for allocating memory */</div><div class='del'>-   png_free_ptr free_fn PNG_DEPSTRUCT;             /* function for freeing memory */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* New member added in libpng-1.0.13 and 1.2.0 */</div><div class='del'>-   png_bytep big_row_buf PNG_DEPSTRUCT;         /* buffer to save current (unfiltered) row */</div><div class='del'>-</div><div class='del'>-#ifdef PNG_READ_DITHER_SUPPORTED</div><div class='del'>-/* The following three members were added at version 1.0.14 and 1.2.4 */</div><div class='del'>-   png_bytep dither_sort PNG_DEPSTRUCT;            /* working sort array */</div><div class='del'>-   png_bytep index_to_palette PNG_DEPSTRUCT;       /* where the original index currently is */</div><div class='del'>-                                     /* in the palette */</div><div class='del'>-   png_bytep palette_to_index PNG_DEPSTRUCT;       /* which original index points to this */</div><div class='del'>-                                     /* palette color */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* New members added in libpng-1.0.16 and 1.2.6 */</div><div class='del'>-   png_byte compression_type PNG_DEPSTRUCT;</div><div class='del'>-</div><div class='del'>-#ifdef PNG_SET_USER_LIMITS_SUPPORTED</div><div class='del'>-   png_uint_32 user_width_max PNG_DEPSTRUCT;</div><div class='del'>-   png_uint_32 user_height_max PNG_DEPSTRUCT;</div><div class='del'>-   /* Added in libpng-1.4.0: Total number of sPLT, text, and unknown</div><div class='del'>-    * chunks that can be stored (0x7fffffff means unlimited).</div><div class='del'>-    */</div><div class='del'>-   png_uint_32 user_chunk_cache_max PNG_DEPSTRUCT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* New member added in libpng-1.0.25 and 1.2.17 */</div><div class='del'>-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED</div><div class='del'>-   /* Storage for unknown chunk that the library doesn't recognize. */</div><div class='del'>-   png_unknown_chunk unknown_chunk PNG_DEPSTRUCT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* New members added in libpng-1.2.26 */</div><div class='del'>-  png_uint_32 old_big_row_buf_size PNG_DEPSTRUCT;</div><div class='del'>-  png_uint_32 old_prev_row_size PNG_DEPSTRUCT;</div><div class='del'>-</div><div class='del'>-/* New member added in libpng-1.2.30 */</div><div class='del'>-  png_charp chunkdata PNG_DEPSTRUCT;  /* buffer for reading chunk data */</div><div class='del'>-</div><div class='del'>-/* New member added in libpng-1.4.0 */</div><div class='del'>-#ifdef PNG_IO_STATE_SUPPORTED</div><div class='del'>-   png_uint_32 io_state PNG_DEPSTRUCT;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This triggers a compiler error in png.c, if png.c and png.h</div><div class='del'>- * do not agree upon the version number.</div><div class='add'>+/* NOTE: prior to 1.5 these functions had no 'API' style declaration, </div><div class='add'>+ * this allowed the zlib default functions to be used on Windows</div><div class='add'>+ * platforms.  In 1.5 the zlib default malloc (which just calls malloc and</div><div class='add'>+ * ignores the first argument) should be completely compatible with the</div><div class='add'>+ * following.</div><div class='ctx'>  */</div><div class='del'>-typedef png_structp version_1_4_0;</div><div class='add'>+typedef PNG_CALLBACK(png_voidp, *png_malloc_ptr, (png_structp, </div><div class='add'>+    png_alloc_size_t), );</div><div class='add'>+typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp), );</div><div class='ctx'> </div><div class='ctx'> typedef png_struct FAR * FAR * png_structpp;</div><div class='ctx'> </div><div class='del'>-/* Here are the function definitions most commonly used.  This is not</div><div class='del'>- * the place to find out how to use libpng.  See libpng.txt for the</div><div class='add'>+/* Section 3: exported functions</div><div class='add'>+ * Here are the function definitions most commonly used.  This is not</div><div class='add'>+ * the place to find out how to use libpng.  See libpng-manual.txt for the</div><div class='ctx'>  * full explanation, see example.c for the summary.  This just provides</div><div class='ctx'>  * a simple one line description of the use of each function.</div><div class='add'>+ *</div><div class='add'>+ * The PNG_EXPORT() and PNG_EXPORTA() macros used below are defined in</div><div class='add'>+ * pngconf.h and in the *.dfn files in the scripts directory.</div><div class='add'>+ *</div><div class='add'>+ *   PNG_EXPORT(ordinal, type, name, (args));</div><div class='add'>+ *</div><div class='add'>+ *       ordinal:    ordinal that is used while building</div><div class='add'>+ *                   *.def files. The ordinal value is only</div><div class='add'>+ *                   relevant when preprocessing png.h with</div><div class='add'>+ *                   the *.dfn files for building symbol table</div><div class='add'>+ *                   entries, and are removed by pngconf.h.</div><div class='add'>+ *       type:       return type of the function</div><div class='add'>+ *       name:       function name</div><div class='add'>+ *       args:       function arguments, with types</div><div class='add'>+ *</div><div class='add'>+ * When we wish to append attributes to a function prototype we use</div><div class='add'>+ * the PNG_EXPORTA() macro instead.</div><div class='add'>+ *</div><div class='add'>+ *   PNG_EXPORTA(ordinal, type, name, (args), attributes);</div><div class='add'>+ *</div><div class='add'>+ *       ordinal, type, name, and args: same as in PNG_EXPORT().</div><div class='add'>+ *       attributes: function attributes</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Returns the version number of the library */</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_access_version_number) PNGARG((void));</div><div class='add'>+PNG_EXPORT(1, png_uint_32, png_access_version_number, (void));</div><div class='ctx'> </div><div class='ctx'> /* Tell lib we have already handled the first &lt;num_bytes&gt; magic bytes.</div><div class='ctx'>  * Handling more than 8 bytes from the beginning of the file is an error.</div><div class='ctx'>  */</div><div class='del'>-extern PNG_EXPORT(void,png_set_sig_bytes) PNGARG((png_structp png_ptr,</div><div class='del'>-   int num_bytes));</div><div class='add'>+PNG_EXPORT(2, void, png_set_sig_bytes, (png_structp png_ptr, int num_bytes));</div><div class='ctx'> </div><div class='ctx'> /* Check sig[start] through sig[start + num_to_check - 1] to see if it's a</div><div class='ctx'>  * PNG file.  Returns zero if the supplied bytes match the 8-byte PNG</div><div class='ctx'>  * signature, and non-zero otherwise.  Having num_to_check == 0 or</div><div class='ctx'>  * start &gt; 7 will always fail (ie return non-zero).</div><div class='ctx'>  */</div><div class='del'>-extern PNG_EXPORT(int,png_sig_cmp) PNGARG((png_bytep sig, png_size_t start,</div><div class='del'>-   png_size_t num_to_check));</div><div class='add'>+PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, png_size_t start, </div><div class='add'>+    png_size_t num_to_check));</div><div class='add'>+</div><div class='add'>+/* Simple signature checking function.  This is the same as calling</div><div class='add'>+ * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).</div><div class='add'>+ */</div><div class='add'>+#define png_check_sig(sig, n) !png_sig_cmp((sig), 0, (n))</div><div class='ctx'> </div><div class='ctx'> /* Allocate and initialize png_ptr struct for reading, and any other memory. */</div><div class='del'>-extern PNG_EXPORT(png_structp,png_create_read_struct)</div><div class='del'>-   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='del'>-   png_error_ptr error_fn, png_error_ptr warn_fn)) PNG_ALLOCATED;</div><div class='add'>+PNG_EXPORTA(4, png_structp, png_create_read_struct,</div><div class='add'>+    (png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='add'>+    png_error_ptr error_fn, png_error_ptr warn_fn), </div><div class='add'>+    PNG_ALLOCATED);</div><div class='ctx'> </div><div class='ctx'> /* Allocate and initialize png_ptr struct for writing, and any other memory */</div><div class='del'>-extern PNG_EXPORT(png_structp,png_create_write_struct)</div><div class='del'>-   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='del'>-   png_error_ptr error_fn, png_error_ptr warn_fn)) PNG_ALLOCATED;</div><div class='add'>+PNG_EXPORTA(5, png_structp, png_create_write_struct,</div><div class='add'>+    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,</div><div class='add'>+    png_error_ptr warn_fn), </div><div class='add'>+    PNG_ALLOCATED);</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_WRITE_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_size_t,png_get_compression_buffer_size)</div><div class='del'>-   PNGARG((png_structp png_ptr));</div><div class='del'>-#endif</div><div class='add'>+PNG_EXPORT(6, png_size_t, png_get_compression_buffer_size,</div><div class='add'>+    (png_const_structp png_ptr));</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_WRITE_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_compression_buffer_size)</div><div class='del'>-   PNGARG((png_structp png_ptr, png_size_t size));</div><div class='del'>-#endif</div><div class='add'>+PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structp png_ptr, </div><div class='add'>+    png_size_t size));</div><div class='ctx'> </div><div class='ctx'> /* Moved from pngconf.h in 1.4.0 and modified to ensure setjmp/longjmp</div><div class='ctx'>  * match up.</div><div class='hunk'>@@ -1401,283 +965,312 @@ extern PNG_EXPORT(void,png_set_compression_buffer_size)</div><div class='ctx'>  * allocated by the library - the call will return NULL on a mismatch</div><div class='ctx'>  * indicating an ABI mismatch.</div><div class='ctx'>  */</div><div class='del'>-extern PNG_EXPORT(jmp_buf*, png_set_longjmp_fn)</div><div class='del'>-   PNGARG((png_structp png_ptr, png_longjmp_ptr longjmp_fn, size_t jmp_buf_size));</div><div class='add'>+PNG_EXPORT(8, jmp_buf*, png_set_longjmp_fn, (png_structp png_ptr, </div><div class='add'>+    png_longjmp_ptr longjmp_fn, size_t jmp_buf_size));</div><div class='ctx'> #  define png_jmpbuf(png_ptr) \</div><div class='del'>-   (*png_set_longjmp_fn((png_ptr), longjmp, sizeof (jmp_buf)))</div><div class='add'>+      (*png_set_longjmp_fn((png_ptr), longjmp, sizeof (jmp_buf)))</div><div class='ctx'> #else</div><div class='ctx'> #  define png_jmpbuf(png_ptr) \</div><div class='del'>-   (LIBPNG_WAS_COMPILED_WITH__PNG_NO_SETJMP)</div><div class='add'>+      (LIBPNG_WAS_COMPILED_WITH__PNG_NO_SETJMP)</div><div class='ctx'> #endif</div><div class='add'>+/* This function should be used by libpng applications in place of</div><div class='add'>+ * longjmp(png_ptr-&gt;jmpbuf, val).  If longjmp_fn() has been set, it</div><div class='add'>+ * will use it; otherwise it will call PNG_ABORT().  This function was</div><div class='add'>+ * added in libpng-1.5.0.</div><div class='add'>+ */</div><div class='add'>+PNG_EXPORTA(9, void, png_longjmp, (png_structp png_ptr, int val),</div><div class='add'>+    PNG_NORETURN);</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_READ_SUPPORTED</div><div class='ctx'> /* Reset the compression stream */</div><div class='del'>-extern PNG_EXPORT(int,png_reset_zstream) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(10, int, png_reset_zstream, (png_structp png_ptr));</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */</div><div class='ctx'> #ifdef PNG_USER_MEM_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_structp,png_create_read_struct_2)</div><div class='del'>-   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='del'>-   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,</div><div class='del'>-   png_malloc_ptr malloc_fn, png_free_ptr free_fn)) PNG_ALLOCATED;</div><div class='del'>-extern PNG_EXPORT(png_structp,png_create_write_struct_2)</div><div class='del'>-   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='del'>-   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,</div><div class='del'>-   png_malloc_ptr malloc_fn, png_free_ptr free_fn)) PNG_ALLOCATED;</div><div class='add'>+PNG_EXPORTA(11, png_structp, png_create_read_struct_2,</div><div class='add'>+    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,</div><div class='add'>+    png_error_ptr warn_fn, </div><div class='add'>+    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn), </div><div class='add'>+    PNG_ALLOCATED);</div><div class='add'>+PNG_EXPORTA(12, png_structp, png_create_write_struct_2,</div><div class='add'>+    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,</div><div class='add'>+    png_error_ptr warn_fn, </div><div class='add'>+    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn), </div><div class='add'>+    PNG_ALLOCATED);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Write the PNG file signature. */</div><div class='del'>-extern PNG_EXPORT(void,png_write_sig) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(13, void, png_write_sig, (png_structp png_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Write a PNG chunk - size, type, (optional) data, CRC. */</div><div class='del'>-extern PNG_EXPORT(void,png_write_chunk) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytep chunk_name, png_bytep data, png_size_t length));</div><div class='add'>+PNG_EXPORT(14, void, png_write_chunk, (png_structp png_ptr, png_const_bytep</div><div class='add'>+    chunk_name, png_const_bytep data, png_size_t length));</div><div class='ctx'> </div><div class='ctx'> /* Write the start of a PNG chunk - length and chunk name. */</div><div class='del'>-extern PNG_EXPORT(void,png_write_chunk_start) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytep chunk_name, png_uint_32 length));</div><div class='add'>+PNG_EXPORT(15, void, png_write_chunk_start, (png_structp png_ptr, </div><div class='add'>+    png_const_bytep chunk_name, png_uint_32 length));</div><div class='ctx'> </div><div class='ctx'> /* Write the data of a PNG chunk started with png_write_chunk_start(). */</div><div class='del'>-extern PNG_EXPORT(void,png_write_chunk_data) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytep data, png_size_t length));</div><div class='add'>+PNG_EXPORT(16, void, png_write_chunk_data, (png_structp png_ptr,</div><div class='add'>+    png_const_bytep data, png_size_t length));</div><div class='ctx'> </div><div class='ctx'> /* Finish a chunk started with png_write_chunk_start() (includes CRC). */</div><div class='del'>-extern PNG_EXPORT(void,png_write_chunk_end) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(17, void, png_write_chunk_end, (png_structp png_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Allocate and initialize the info structure */</div><div class='del'>-extern PNG_EXPORT(png_infop,png_create_info_struct)</div><div class='del'>-   PNGARG((png_structp png_ptr)) PNG_ALLOCATED;</div><div class='add'>+PNG_EXPORTA(18, png_infop, png_create_info_struct, (png_structp png_ptr), </div><div class='add'>+    PNG_ALLOCATED);</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(void,png_info_init_3) PNGARG((png_infopp info_ptr,</div><div class='add'>+PNG_EXPORT(19, void, png_info_init_3, (png_infopp info_ptr, </div><div class='ctx'>     png_size_t png_info_struct_size));</div><div class='ctx'> </div><div class='ctx'> /* Writes all the PNG information before the image. */</div><div class='del'>-extern PNG_EXPORT(void,png_write_info_before_PLTE) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr));</div><div class='del'>-extern PNG_EXPORT(void,png_write_info) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(20, void, png_write_info_before_PLTE,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(21, void, png_write_info,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_SEQUENTIAL_READ_SUPPORTED</div><div class='ctx'> /* Read the information before the actual image data. */</div><div class='del'>-extern PNG_EXPORT(void,png_read_info) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(22, void, png_read_info,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_TIME_RFC1123_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_charp,png_convert_to_rfc1123)</div><div class='del'>-   PNGARG((png_structp png_ptr, png_timep ptime));</div><div class='add'>+PNG_EXPORT(23, png_const_charp, png_convert_to_rfc1123,</div><div class='add'>+    (png_structp png_ptr, </div><div class='add'>+    png_const_timep ptime));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_CONVERT_tIME_SUPPORTED</div><div class='ctx'> /* Convert from a struct tm to png_time */</div><div class='del'>-extern PNG_EXPORT(void,png_convert_from_struct_tm) PNGARG((png_timep ptime,</div><div class='del'>-   struct tm FAR * ttime));</div><div class='add'>+PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime, </div><div class='add'>+    PNG_CONST struct tm FAR * ttime));</div><div class='ctx'> </div><div class='ctx'> /* Convert from time_t to png_time.  Uses gmtime() */</div><div class='del'>-extern PNG_EXPORT(void,png_convert_from_time_t) PNGARG((png_timep ptime,</div><div class='del'>-   time_t ttime));</div><div class='add'>+PNG_EXPORT(25, void, png_convert_from_time_t,</div><div class='add'>+    (png_timep ptime, time_t ttime));</div><div class='ctx'> #endif /* PNG_CONVERT_tIME_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_EXPAND_SUPPORTED</div><div class='ctx'> /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */</div><div class='del'>-extern PNG_EXPORT(void,png_set_expand) PNGARG((png_structp png_ptr));</div><div class='del'>-extern PNG_EXPORT(void,png_set_expand_gray_1_2_4_to_8) PNGARG((png_structp</div><div class='del'>-  png_ptr));</div><div class='del'>-extern PNG_EXPORT(void,png_set_palette_to_rgb) PNGARG((png_structp png_ptr));</div><div class='del'>-extern PNG_EXPORT(void,png_set_tRNS_to_alpha) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(26, void, png_set_expand, (png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(27, void, png_set_expand_gray_1_2_4_to_8, (png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(28, void, png_set_palette_to_rgb, (png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(29, void, png_set_tRNS_to_alpha, (png_structp png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)</div><div class='ctx'> /* Use blue, green, red order for pixels. */</div><div class='del'>-extern PNG_EXPORT(void,png_set_bgr) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(30, void, png_set_bgr, (png_structp png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED</div><div class='ctx'> /* Expand the grayscale to 24-bit RGB if necessary. */</div><div class='del'>-extern PNG_EXPORT(void,png_set_gray_to_rgb) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(31, void, png_set_gray_to_rgb, (png_structp png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED</div><div class='ctx'> /* Reduce RGB to grayscale. */</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_rgb_to_gray) PNGARG((png_structp png_ptr,</div><div class='del'>-   int error_action, double red, double green ));</div><div class='del'>-#endif</div><div class='del'>-extern PNG_EXPORT(void,png_set_rgb_to_gray_fixed) PNGARG((png_structp png_ptr,</div><div class='del'>-   int error_action, png_fixed_point red, png_fixed_point green ));</div><div class='del'>-extern PNG_EXPORT(png_byte,png_get_rgb_to_gray_status) PNGARG((png_structp</div><div class='del'>-   png_ptr));</div><div class='add'>+PNG_FP_EXPORT(32, void, png_set_rgb_to_gray, (png_structp png_ptr,</div><div class='add'>+    int error_action, double red, double green));</div><div class='add'>+PNG_FIXED_EXPORT(33, void, png_set_rgb_to_gray_fixed, (png_structp png_ptr, </div><div class='add'>+    int error_action, png_fixed_point red, png_fixed_point green));</div><div class='add'>+</div><div class='add'>+PNG_EXPORT(34, png_byte, png_get_rgb_to_gray_status, (png_const_structp</div><div class='add'>+    png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(void,png_build_grayscale_palette) PNGARG((int bit_depth,</div><div class='del'>-   png_colorp palette));</div><div class='add'>+PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth, </div><div class='add'>+    png_colorp palette));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_strip_alpha) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(36, void, png_set_strip_alpha, (png_structp png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \</div><div class='ctx'>     defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)</div><div class='del'>-extern PNG_EXPORT(void,png_set_swap_alpha) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(37, void, png_set_swap_alpha, (png_structp png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \</div><div class='ctx'>     defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)</div><div class='del'>-extern PNG_EXPORT(void,png_set_invert_alpha) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(38, void, png_set_invert_alpha, (png_structp png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)</div><div class='ctx'> /* Add a filler byte to 8-bit Gray or 24-bit RGB images. */</div><div class='del'>-extern PNG_EXPORT(void,png_set_filler) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_uint_32 filler, int flags));</div><div class='add'>+PNG_EXPORT(39, void, png_set_filler, (png_structp png_ptr, png_uint_32 filler, </div><div class='add'>+    int flags));</div><div class='ctx'> /* The values of the PNG_FILLER_ defines should NOT be changed */</div><div class='del'>-#define PNG_FILLER_BEFORE 0</div><div class='del'>-#define PNG_FILLER_AFTER 1</div><div class='add'>+#  define PNG_FILLER_BEFORE 0</div><div class='add'>+#  define PNG_FILLER_AFTER 1</div><div class='ctx'> /* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */</div><div class='del'>-extern PNG_EXPORT(void,png_set_add_alpha) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_uint_32 filler, int flags));</div><div class='add'>+PNG_EXPORT(40, void, png_set_add_alpha,</div><div class='add'>+    (png_structp png_ptr, png_uint_32 filler, </div><div class='add'>+    int flags));</div><div class='ctx'> #endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)</div><div class='ctx'> /* Swap bytes in 16-bit depth files. */</div><div class='del'>-extern PNG_EXPORT(void,png_set_swap) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(41, void, png_set_swap, (png_structp png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)</div><div class='ctx'> /* Use 1 byte per pixel in 1, 2, or 4-bit depth files. */</div><div class='del'>-extern PNG_EXPORT(void,png_set_packing) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(42, void, png_set_packing, (png_structp png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(PNG_READ_PACKSWAP_SUPPORTED) || defined(PNG_WRITE_PACKSWAP_SUPPORTED)</div><div class='add'>+#if defined(PNG_READ_PACKSWAP_SUPPORTED) || \</div><div class='add'>+    defined(PNG_WRITE_PACKSWAP_SUPPORTED)</div><div class='ctx'> /* Swap packing order of pixels in bytes. */</div><div class='del'>-extern PNG_EXPORT(void,png_set_packswap) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(43, void, png_set_packswap, (png_structp png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)</div><div class='ctx'> /* Converts files to legal bit depths. */</div><div class='del'>-extern PNG_EXPORT(void,png_set_shift) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_color_8p true_bits));</div><div class='add'>+PNG_EXPORT(44, void, png_set_shift, (png_structp png_ptr, png_const_color_8p</div><div class='add'>+    true_bits));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_INTERLACING_SUPPORTED) || \</div><div class='ctx'>     defined(PNG_WRITE_INTERLACING_SUPPORTED)</div><div class='del'>-/* Have the code handle the interlacing.  Returns the number of passes. */</div><div class='del'>-extern PNG_EXPORT(int,png_set_interlace_handling) PNGARG((png_structp png_ptr));</div><div class='add'>+/* Have the code handle the interlacing.  Returns the number of passes.</div><div class='add'>+ * MUST be called before png_read_update_info or png_start_read_image,</div><div class='add'>+ * otherwise it will not have the desired effect.  Note that it is still</div><div class='add'>+ * necessary to call png_read_row or png_read_rows png_get_image_height</div><div class='add'>+ * times for each pass.</div><div class='add'>+*/</div><div class='add'>+PNG_EXPORT(45, int, png_set_interlace_handling, (png_structp png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)</div><div class='ctx'> /* Invert monochrome files */</div><div class='del'>-extern PNG_EXPORT(void,png_set_invert_mono) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(46, void, png_set_invert_mono, (png_structp png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_BACKGROUND_SUPPORTED</div><div class='ctx'> /* Handle alpha and tRNS by replacing with a background color. */</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_background) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_color_16p background_color, int background_gamma_code,</div><div class='del'>-   int need_expand, double background_gamma));</div><div class='add'>+PNG_FP_EXPORT(47, void, png_set_background, (png_structp png_ptr, </div><div class='add'>+    png_const_color_16p background_color, int background_gamma_code, </div><div class='add'>+    int need_expand, double background_gamma));</div><div class='add'>+PNG_FIXED_EXPORT(215, void, png_set_background_fixed, (png_structp png_ptr,</div><div class='add'>+    png_const_color_16p background_color, int background_gamma_code, </div><div class='add'>+    int need_expand, png_fixed_point background_gamma));</div><div class='ctx'> #endif</div><div class='del'>-#define PNG_BACKGROUND_GAMMA_UNKNOWN 0</div><div class='del'>-#define PNG_BACKGROUND_GAMMA_SCREEN  1</div><div class='del'>-#define PNG_BACKGROUND_GAMMA_FILE    2</div><div class='del'>-#define PNG_BACKGROUND_GAMMA_UNIQUE  3</div><div class='add'>+#ifdef PNG_READ_BACKGROUND_SUPPORTED</div><div class='add'>+#  define PNG_BACKGROUND_GAMMA_UNKNOWN 0</div><div class='add'>+#  define PNG_BACKGROUND_GAMMA_SCREEN  1</div><div class='add'>+#  define PNG_BACKGROUND_GAMMA_FILE    2</div><div class='add'>+#  define PNG_BACKGROUND_GAMMA_UNIQUE  3</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_16_TO_8_SUPPORTED</div><div class='ctx'> /* Strip the second byte of information from a 16-bit depth file. */</div><div class='del'>-extern PNG_EXPORT(void,png_set_strip_16) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(48, void, png_set_strip_16, (png_structp png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_READ_DITHER_SUPPORTED</div><div class='del'>-/* Turn on dithering, and reduce the palette to the number of colors available. */</div><div class='del'>-extern PNG_EXPORT(void,png_set_dither) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_colorp palette, int num_palette, int maximum_colors,</div><div class='del'>-   png_uint_16p histogram, int full_dither));</div><div class='add'>+#ifdef PNG_READ_QUANTIZE_SUPPORTED</div><div class='add'>+/* Turn on quantizing, and reduce the palette to the number of colors</div><div class='add'>+ * available.</div><div class='add'>+ */</div><div class='add'>+PNG_EXPORT(49, void, png_set_quantize,</div><div class='add'>+    (png_structp png_ptr, png_colorp palette, </div><div class='add'>+    int num_palette, int maximum_colors, png_const_uint_16p histogram, </div><div class='add'>+    int full_quantize));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='add'>+/* The threshold on gamma processing is configurable but hard-wired into the</div><div class='add'>+ * library.  The following is the floating point variant.</div><div class='add'>+ */</div><div class='add'>+#define PNG_GAMMA_THRESHOLD (PNG_GAMMA_THRESHOLD_FIXED*.00001)</div><div class='add'>+</div><div class='ctx'> /* Handle gamma correction. Screen_gamma=(display_exponent) */</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_gamma) PNGARG((png_structp png_ptr,</div><div class='del'>-   double screen_gamma, double default_file_gamma));</div><div class='del'>-#endif</div><div class='add'>+PNG_FP_EXPORT(50, void, png_set_gamma,</div><div class='add'>+    (png_structp png_ptr, double screen_gamma, </div><div class='add'>+    double default_file_gamma));</div><div class='add'>+PNG_FIXED_EXPORT(208, void, png_set_gamma_fixed, (png_structp png_ptr, </div><div class='add'>+    png_fixed_point screen_gamma, png_fixed_point default_file_gamma));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #ifdef PNG_WRITE_FLUSH_SUPPORTED</div><div class='ctx'> /* Set how many lines between output flushes - 0 for no flushing */</div><div class='del'>-extern PNG_EXPORT(void,png_set_flush) PNGARG((png_structp png_ptr, int nrows));</div><div class='add'>+PNG_EXPORT(51, void, png_set_flush, (png_structp png_ptr, int nrows));</div><div class='ctx'> /* Flush the current PNG output buffer */</div><div class='del'>-extern PNG_EXPORT(void,png_write_flush) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(52, void, png_write_flush, (png_structp png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Optional update palette with requested transformations */</div><div class='del'>-extern PNG_EXPORT(void,png_start_read_image) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(53, void, png_start_read_image, (png_structp png_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Optional call to update the users info structure */</div><div class='del'>-extern PNG_EXPORT(void,png_read_update_info) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(54, void, png_read_update_info,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_SEQUENTIAL_READ_SUPPORTED</div><div class='ctx'> /* Read one or more rows of image data. */</div><div class='del'>-extern PNG_EXPORT(void,png_read_rows) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytepp row, png_bytepp display_row, png_uint_32 num_rows));</div><div class='add'>+PNG_EXPORT(55, void, png_read_rows, (png_structp png_ptr, png_bytepp row, </div><div class='add'>+    png_bytepp display_row, png_uint_32 num_rows));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_SEQUENTIAL_READ_SUPPORTED</div><div class='ctx'> /* Read a row of data. */</div><div class='del'>-extern PNG_EXPORT(void,png_read_row) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytep row,</div><div class='del'>-   png_bytep display_row));</div><div class='add'>+PNG_EXPORT(56, void, png_read_row, (png_structp png_ptr, png_bytep row, </div><div class='add'>+    png_bytep display_row));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_SEQUENTIAL_READ_SUPPORTED</div><div class='ctx'> /* Read the whole image into memory at once. */</div><div class='del'>-extern PNG_EXPORT(void,png_read_image) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytepp image));</div><div class='add'>+PNG_EXPORT(57, void, png_read_image, (png_structp png_ptr, png_bytepp image));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Write a row of image data */</div><div class='del'>-extern PNG_EXPORT(void,png_write_row) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytep row));</div><div class='add'>+PNG_EXPORT(58, void, png_write_row,</div><div class='add'>+    (png_structp png_ptr, png_const_bytep row));</div><div class='ctx'> </div><div class='del'>-/* Write a few rows of image data */</div><div class='del'>-extern PNG_EXPORT(void,png_write_rows) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytepp row, png_uint_32 num_rows));</div><div class='add'>+/* Write a few rows of image data: (*row) is not written; however, the type</div><div class='add'>+ * is declared as writeable to maintain compatibility with previous versions</div><div class='add'>+ * of libpng and to allow the 'display_row' array from read_rows to be passed</div><div class='add'>+ * unchanged to write_rows.</div><div class='add'>+ */</div><div class='add'>+PNG_EXPORT(59, void, png_write_rows, (png_structp png_ptr, png_bytepp row, </div><div class='add'>+    png_uint_32 num_rows));</div><div class='ctx'> </div><div class='ctx'> /* Write the image data */</div><div class='del'>-extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytepp image));</div><div class='add'>+PNG_EXPORT(60, void, png_write_image,</div><div class='add'>+    (png_structp png_ptr, png_bytepp image));</div><div class='ctx'> </div><div class='ctx'> /* Write the end of the PNG file. */</div><div class='del'>-extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(61, void, png_write_end,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_SEQUENTIAL_READ_SUPPORTED</div><div class='ctx'> /* Read the end of the PNG file. */</div><div class='del'>-extern PNG_EXPORT(void,png_read_end) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(62, void, png_read_end, (png_structp png_ptr, png_infop info_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Free any memory associated with the png_info_struct */</div><div class='del'>-extern PNG_EXPORT(void,png_destroy_info_struct) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infopp info_ptr_ptr));</div><div class='add'>+PNG_EXPORT(63, void, png_destroy_info_struct, (png_structp png_ptr, </div><div class='add'>+    png_infopp info_ptr_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Free any memory associated with the png_struct and the png_info_structs */</div><div class='del'>-extern PNG_EXPORT(void,png_destroy_read_struct) PNGARG((png_structpp</div><div class='del'>-   png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));</div><div class='add'>+PNG_EXPORT(64, void, png_destroy_read_struct, (png_structpp png_ptr_ptr, </div><div class='add'>+    png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Free any memory associated with the png_struct and the png_info_structs */</div><div class='del'>-extern PNG_EXPORT(void,png_destroy_write_struct)</div><div class='del'>-   PNGARG((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr));</div><div class='add'>+PNG_EXPORT(65, void, png_destroy_write_struct, (png_structpp png_ptr_ptr, </div><div class='add'>+    png_infopp info_ptr_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Set the libpng method of handling chunk CRC errors */</div><div class='del'>-extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr,</div><div class='del'>-   int crit_action, int ancil_action));</div><div class='add'>+PNG_EXPORT(66, void, png_set_crc_action,</div><div class='add'>+    (png_structp png_ptr, int crit_action, int ancil_action));</div><div class='ctx'> </div><div class='del'>-/* Values for png_set_crc_action() to say how to handle CRC errors in</div><div class='add'>+/* Values for png_set_crc_action() say how to handle CRC errors in</div><div class='ctx'>  * ancillary and critical chunks, and whether to use the data contained</div><div class='ctx'>  * therein.  Note that it is impossible to "discard" data in a critical</div><div class='del'>- * chunk.  For versions prior to 0.90, the action was always error/quit,</div><div class='add'>+ * chunk.  For versions prior to 0.90, the action was always error/quit, </div><div class='ctx'>  * whereas in version 0.90 and later, the action for CRC errors in ancillary</div><div class='ctx'>  * chunks is warn/discard.  These values should NOT be changed.</div><div class='ctx'>  *</div><div class='hunk'>@@ -1701,8 +1294,8 @@ extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr,</div><div class='ctx'> /* Set the filtering method(s) used by libpng.  Currently, the only valid</div><div class='ctx'>  * value for "method" is 0.</div><div class='ctx'>  */</div><div class='del'>-extern PNG_EXPORT(void,png_set_filter) PNGARG((png_structp png_ptr, int method,</div><div class='del'>-   int filters));</div><div class='add'>+PNG_EXPORT(67, void, png_set_filter,</div><div class='add'>+    (png_structp png_ptr, int method, int filters));</div><div class='ctx'> </div><div class='ctx'> /* Flags for png_set_filter() to say which filters to use.  The flags</div><div class='ctx'>  * are chosen so that they don't conflict with real filter types</div><div class='hunk'>@@ -1757,11 +1350,13 @@ extern PNG_EXPORT(void,png_set_filter) PNGARG((png_structp png_ptr, int method,</div><div class='ctx'>  * the weights and costs are set to 1.0, this degenerates the WEIGHTED method</div><div class='ctx'>  * to the UNWEIGHTED method, but with added encoding time/computation.</div><div class='ctx'>  */</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_filter_heuristics) PNGARG((png_structp png_ptr,</div><div class='del'>-   int heuristic_method, int num_weights, png_doublep filter_weights,</div><div class='del'>-   png_doublep filter_costs));</div><div class='del'>-#endif</div><div class='add'>+PNG_FP_EXPORT(68, void, png_set_filter_heuristics, (png_structp png_ptr, </div><div class='add'>+    int heuristic_method, int num_weights, png_const_doublep filter_weights, </div><div class='add'>+    png_const_doublep filter_costs));</div><div class='add'>+PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,</div><div class='add'>+    (png_structp png_ptr, </div><div class='add'>+    int heuristic_method, int num_weights, png_const_fixed_point_p</div><div class='add'>+    filter_weights, png_const_fixed_point_p filter_costs));</div><div class='ctx'> #endif /*  PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> /* Heuristic used for row filter selection.  These defines should NOT be</div><div class='hunk'>@@ -1776,36 +1371,36 @@ extern PNG_EXPORT(void,png_set_filter_heuristics) PNGARG((png_structp png_ptr,</div><div class='ctx'>  * 0 - 9, corresponding directly to the zlib compression levels 0 - 9</div><div class='ctx'>  * (0 - no compression, 9 - "maximal" compression).  Note that tests have</div><div class='ctx'>  * shown that zlib compression levels 3-6 usually perform as well as level 9</div><div class='del'>- * for PNG images, and do considerably fewer caclulations.  In the future,</div><div class='add'>+ * for PNG images, and do considerably fewer caclulations.  In the future, </div><div class='ctx'>  * these values may not correspond directly to the zlib compression levels.</div><div class='ctx'>  */</div><div class='del'>-extern PNG_EXPORT(void,png_set_compression_level) PNGARG((png_structp png_ptr,</div><div class='del'>-   int level));</div><div class='add'>+PNG_EXPORT(69, void, png_set_compression_level,</div><div class='add'>+    (png_structp png_ptr, int level));</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(void,png_set_compression_mem_level)</div><div class='del'>-   PNGARG((png_structp png_ptr, int mem_level));</div><div class='add'>+PNG_EXPORT(70, void, png_set_compression_mem_level, (png_structp png_ptr, </div><div class='add'>+    int mem_level));</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(void,png_set_compression_strategy)</div><div class='del'>-   PNGARG((png_structp png_ptr, int strategy));</div><div class='add'>+PNG_EXPORT(71, void, png_set_compression_strategy, (png_structp png_ptr, </div><div class='add'>+    int strategy));</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(void,png_set_compression_window_bits)</div><div class='del'>-   PNGARG((png_structp png_ptr, int window_bits));</div><div class='add'>+PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structp png_ptr, </div><div class='add'>+    int window_bits));</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(void,png_set_compression_method) PNGARG((png_structp png_ptr,</div><div class='del'>-   int method));</div><div class='add'>+PNG_EXPORT(73, void, png_set_compression_method, (png_structp png_ptr,</div><div class='add'>+    int method));</div><div class='ctx'> </div><div class='ctx'> /* These next functions are called for input/output, memory, and error</div><div class='del'>- * handling.  They are in the file pngrio.c, pngwio.c, and pngerror.c,</div><div class='add'>+ * handling.  They are in the file pngrio.c, pngwio.c, and pngerror.c, </div><div class='ctx'>  * and call standard C I/O routines such as fread(), fwrite(), and</div><div class='ctx'>  * fprintf().  These functions can be made to use other I/O routines</div><div class='ctx'>  * at run time for those applications that need to handle I/O in a</div><div class='del'>- * different manner by calling png_set_???_fn().  See libpng.txt for</div><div class='add'>+ * different manner by calling png_set_???_fn().  See libpng-manual.txt for</div><div class='ctx'>  * more information.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_STDIO_SUPPORTED</div><div class='ctx'> /* Initialize the input/output for the PNG file to the default functions. */</div><div class='del'>-extern PNG_EXPORT(void,png_init_io) PNGARG((png_structp png_ptr, png_FILE_p fp));</div><div class='add'>+PNG_EXPORT(74, void, png_init_io, (png_structp png_ptr, png_FILE_p fp));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Replace the (error and abort), and warning functions with user</div><div class='hunk'>@@ -1816,11 +1411,12 @@ extern PNG_EXPORT(void,png_init_io) PNGARG((png_structp png_ptr, png_FILE_p fp))</div><div class='ctx'>  * default function will be used.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(void,png_set_error_fn) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn));</div><div class='add'>+PNG_EXPORT(75, void, png_set_error_fn,</div><div class='add'>+    (png_structp png_ptr, png_voidp error_ptr, </div><div class='add'>+    png_error_ptr error_fn, png_error_ptr warning_fn));</div><div class='ctx'> </div><div class='ctx'> /* Return the user pointer associated with the error functions */</div><div class='del'>-extern PNG_EXPORT(png_voidp,png_get_error_ptr) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(76, png_voidp, png_get_error_ptr, (png_const_structp png_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Replace the default data output functions with a user supplied one(s).</div><div class='ctx'>  * If buffered output is not used, then output_flush_fn can be set to NULL.</div><div class='hunk'>@@ -1832,101 +1428,133 @@ extern PNG_EXPORT(png_voidp,png_get_error_ptr) PNGARG((png_structp png_ptr));</div><div class='ctx'>  * default flush function, which uses the standard *FILE structure, will</div><div class='ctx'>  * be used.</div><div class='ctx'>  */</div><div class='del'>-extern PNG_EXPORT(void,png_set_write_fn) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_voidp io_ptr, png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));</div><div class='add'>+PNG_EXPORT(77, void, png_set_write_fn, (png_structp png_ptr, png_voidp io_ptr, </div><div class='add'>+    png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));</div><div class='ctx'> </div><div class='ctx'> /* Replace the default data input function with a user supplied one. */</div><div class='del'>-extern PNG_EXPORT(void,png_set_read_fn) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_voidp io_ptr, png_rw_ptr read_data_fn));</div><div class='add'>+PNG_EXPORT(78, void, png_set_read_fn, (png_structp png_ptr, png_voidp io_ptr, </div><div class='add'>+    png_rw_ptr read_data_fn));</div><div class='ctx'> </div><div class='ctx'> /* Return the user pointer associated with the I/O functions */</div><div class='del'>-extern PNG_EXPORT(png_voidp,png_get_io_ptr) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(79, png_voidp, png_get_io_ptr, (png_structp png_ptr));</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(void,png_set_read_status_fn) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_read_status_ptr read_row_fn));</div><div class='add'>+PNG_EXPORT(80, void, png_set_read_status_fn, (png_structp png_ptr, </div><div class='add'>+    png_read_status_ptr read_row_fn));</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(void,png_set_write_status_fn) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_write_status_ptr write_row_fn));</div><div class='add'>+PNG_EXPORT(81, void, png_set_write_status_fn, (png_structp png_ptr, </div><div class='add'>+    png_write_status_ptr write_row_fn));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'> /* Replace the default memory allocation functions with user supplied one(s). */</div><div class='del'>-extern PNG_EXPORT(void,png_set_mem_fn) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn));</div><div class='add'>+PNG_EXPORT(82, void, png_set_mem_fn, (png_structp png_ptr, png_voidp mem_ptr, </div><div class='add'>+    png_malloc_ptr malloc_fn, png_free_ptr free_fn));</div><div class='ctx'> /* Return the user pointer associated with the memory functions */</div><div class='del'>-extern PNG_EXPORT(png_voidp,png_get_mem_ptr) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(83, png_voidp, png_get_mem_ptr, (png_const_structp png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_read_user_transform_fn) PNGARG((png_structp</div><div class='del'>-   png_ptr, png_user_transform_ptr read_user_transform_fn));</div><div class='add'>+PNG_EXPORT(84, void, png_set_read_user_transform_fn, (png_structp png_ptr, </div><div class='add'>+    png_user_transform_ptr read_user_transform_fn));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_write_user_transform_fn) PNGARG((png_structp</div><div class='del'>-   png_ptr, png_user_transform_ptr write_user_transform_fn));</div><div class='add'>+PNG_EXPORT(85, void, png_set_write_user_transform_fn, (png_structp png_ptr, </div><div class='add'>+    png_user_transform_ptr write_user_transform_fn));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \</div><div class='del'>-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)</div><div class='del'>-extern PNG_EXPORT(void,png_set_user_transform_info) PNGARG((png_structp</div><div class='del'>-   png_ptr, png_voidp user_transform_ptr, int user_transform_depth,</div><div class='del'>-   int user_transform_channels));</div><div class='add'>+#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED</div><div class='add'>+PNG_EXPORT(86, void, png_set_user_transform_info, (png_structp png_ptr, </div><div class='add'>+    png_voidp user_transform_ptr, int user_transform_depth, </div><div class='add'>+    int user_transform_channels));</div><div class='ctx'> /* Return the user pointer associated with the user transform functions */</div><div class='del'>-extern PNG_EXPORT(png_voidp,png_get_user_transform_ptr)</div><div class='del'>-   PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(87, png_voidp, png_get_user_transform_ptr,</div><div class='add'>+    (png_const_structp png_ptr));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED</div><div class='add'>+/* Return information about the row currently being processed.  Note that these</div><div class='add'>+ * APIs do not fail but will return unexpected results if called outside a user</div><div class='add'>+ * transform callback.  Also note that when transforming an interlaced image the</div><div class='add'>+ * row number is still the row in the final, de-interlaced, image but the row</div><div class='add'>+ * only contains the data of the current pass - consult png_row_info for the</div><div class='add'>+ * actual width of the row!</div><div class='add'>+ */</div><div class='add'>+PNG_EXPORT(217, png_uint_32, png_get_current_row_number, (png_const_structp));</div><div class='add'>+PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structp));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_USER_CHUNKS_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_read_user_chunk_fn) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));</div><div class='del'>-extern PNG_EXPORT(png_voidp,png_get_user_chunk_ptr) PNGARG((png_structp</div><div class='del'>-   png_ptr));</div><div class='add'>+PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structp png_ptr, </div><div class='add'>+    png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));</div><div class='add'>+PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr, (png_const_structp png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_PROGRESSIVE_READ_SUPPORTED</div><div class='ctx'> /* Sets the function callbacks for the push reader, and a pointer to a</div><div class='ctx'>  * user-defined structure available to the callback functions.</div><div class='ctx'>  */</div><div class='del'>-extern PNG_EXPORT(void,png_set_progressive_read_fn) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_voidp progressive_ptr,</div><div class='del'>-   png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,</div><div class='del'>-   png_progressive_end_ptr end_fn));</div><div class='add'>+PNG_EXPORT(90, void, png_set_progressive_read_fn, (png_structp png_ptr, </div><div class='add'>+    png_voidp progressive_ptr, png_progressive_info_ptr info_fn, </div><div class='add'>+    png_progressive_row_ptr row_fn, png_progressive_end_ptr end_fn));</div><div class='ctx'> </div><div class='ctx'> /* Returns the user pointer associated with the push read functions */</div><div class='del'>-extern PNG_EXPORT(png_voidp,png_get_progressive_ptr)</div><div class='del'>-   PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(91, png_voidp, png_get_progressive_ptr, (png_const_structp png_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Function to be called when data becomes available */</div><div class='del'>-extern PNG_EXPORT(void,png_process_data) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_bytep buffer, png_size_t buffer_size));</div><div class='add'>+PNG_EXPORT(92, void, png_process_data,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    png_bytep buffer, png_size_t buffer_size));</div><div class='add'>+</div><div class='add'>+/* A function which may be called *only* within png_process_data to stop the</div><div class='add'>+ * processing of any more data.  The function returns the number of bytes</div><div class='add'>+ * remaining, excluding any that libpng has cached internally.  A subsequent</div><div class='add'>+ * call to png_process_data must supply these bytes again.  If the argument</div><div class='add'>+ * 'save' is set to true the routine will first save all the pending data and</div><div class='add'>+ * will always return 0.</div><div class='add'>+ */</div><div class='add'>+PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structp, int save));</div><div class='add'>+</div><div class='add'>+/* A function which may be called *only* outside (after) a call to</div><div class='add'>+ * png_process_data.  It returns the number of bytes of data to skip in the</div><div class='add'>+ * input.  Normally it will return 0, but if it returns a non-zero value the</div><div class='add'>+ * application must skip than number of bytes of input data and pass the</div><div class='add'>+ * following data to the next call to png_process_data.</div><div class='add'>+ */</div><div class='add'>+PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structp));</div><div class='ctx'> </div><div class='del'>-/* Function that combines rows.  Not very much different than the</div><div class='del'>- * png_combine_row() call.  Is this even used?????</div><div class='add'>+/* Function that combines rows.  'new_row' is a flag that should come from</div><div class='add'>+ * the callback and be non-NULL if anything needs to be done; the library</div><div class='add'>+ * stores its own version of the new data internally and ignores the passed</div><div class='add'>+ * in value.</div><div class='ctx'>  */</div><div class='del'>-extern PNG_EXPORT(void,png_progressive_combine_row) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytep old_row, png_bytep new_row));</div><div class='add'>+PNG_EXPORT(93, void, png_progressive_combine_row, (png_structp png_ptr, </div><div class='add'>+    png_bytep old_row, png_const_bytep new_row));</div><div class='ctx'> #endif /* PNG_PROGRESSIVE_READ_SUPPORTED */</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(png_voidp,png_malloc) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_alloc_size_t size)) PNG_ALLOCATED;</div><div class='add'>+PNG_EXPORTA(94, png_voidp, png_malloc,</div><div class='add'>+    (png_structp png_ptr, png_alloc_size_t size), </div><div class='add'>+    PNG_ALLOCATED);</div><div class='ctx'> /* Added at libpng version 1.4.0 */</div><div class='del'>-extern PNG_EXPORT(png_voidp,png_calloc) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_alloc_size_t size)) PNG_ALLOCATED;</div><div class='add'>+PNG_EXPORTA(95, png_voidp, png_calloc,</div><div class='add'>+    (png_structp png_ptr, png_alloc_size_t size), </div><div class='add'>+    PNG_ALLOCATED);</div><div class='ctx'> </div><div class='ctx'> /* Added at libpng version 1.2.4 */</div><div class='del'>-extern PNG_EXPORT(png_voidp,png_malloc_warn) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_alloc_size_t size)) PNG_ALLOCATED;</div><div class='add'>+PNG_EXPORTA(96, png_voidp, png_malloc_warn, (png_structp png_ptr, </div><div class='add'>+    png_alloc_size_t size), PNG_ALLOCATED);</div><div class='ctx'> </div><div class='ctx'> /* Frees a pointer allocated by png_malloc() */</div><div class='del'>-extern PNG_EXPORT(void,png_free) PNGARG((png_structp png_ptr, png_voidp ptr));</div><div class='add'>+PNG_EXPORT(97, void, png_free, (png_structp png_ptr, png_voidp ptr));</div><div class='ctx'> </div><div class='ctx'> /* Free data that was allocated internally */</div><div class='del'>-extern PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_uint_32 free_me, int num));</div><div class='add'>+PNG_EXPORT(98, void, png_free_data,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, png_uint_32 free_me, int num));</div><div class='add'>+</div><div class='ctx'> /* Reassign responsibility for freeing existing data, whether allocated</div><div class='ctx'>  * by libpng or by the application */</div><div class='del'>-extern PNG_EXPORT(void,png_data_freer) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, int freer, png_uint_32 mask));</div><div class='add'>+PNG_EXPORT(99, void, png_data_freer,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, int freer, png_uint_32 mask));</div><div class='add'>+</div><div class='ctx'> /* Assignments for png_data_freer */</div><div class='ctx'> #define PNG_DESTROY_WILL_FREE_DATA 1</div><div class='ctx'> #define PNG_SET_WILL_FREE_DATA 1</div><div class='hunk'>@@ -1947,46 +1575,56 @@ extern PNG_EXPORT(void,png_data_freer) PNGARG((png_structp png_ptr,</div><div class='ctx'> #define PNG_FREE_MUL  0x4220 /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_USER_MEM_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_voidp,png_malloc_default) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_alloc_size_t size)) PNG_ALLOCATED;</div><div class='del'>-extern PNG_EXPORT(void,png_free_default) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_voidp ptr));</div><div class='add'>+PNG_EXPORTA(100, png_voidp, png_malloc_default, (png_structp png_ptr, </div><div class='add'>+    png_alloc_size_t size), PNG_ALLOCATED);</div><div class='add'>+PNG_EXPORT(101, void, png_free_default, (png_structp png_ptr, png_voidp ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifndef PNG_NO_ERROR_TEXT</div><div class='add'>+#ifdef PNG_ERROR_TEXT_SUPPORTED</div><div class='ctx'> /* Fatal error in PNG image of libpng - can't continue */</div><div class='del'>-extern PNG_EXPORT(void,png_error) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_const_charp error_message)) PNG_NORETURN;</div><div class='add'>+PNG_EXPORTA(102, void, png_error,</div><div class='add'>+    (png_structp png_ptr, png_const_charp error_message), </div><div class='add'>+    PNG_NORETURN);</div><div class='ctx'> </div><div class='ctx'> /* The same, but the chunk name is prepended to the error string. */</div><div class='del'>-extern PNG_EXPORT(void,png_chunk_error) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_const_charp error_message)) PNG_NORETURN;</div><div class='add'>+PNG_EXPORTA(103, void, png_chunk_error, (png_structp png_ptr, </div><div class='add'>+    png_const_charp error_message), PNG_NORETURN);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> /* Fatal error in PNG image of libpng - can't continue */</div><div class='del'>-extern PNG_EXPORT(void,png_err) PNGARG((png_structp png_ptr)) PNG_NORETURN;</div><div class='add'>+PNG_EXPORTA(104, void, png_err, (png_structp png_ptr), PNG_NORETURN);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Non-fatal error in libpng.  Can continue, but may have a problem. */</div><div class='del'>-extern PNG_EXPORT(void,png_warning) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_const_charp warning_message));</div><div class='add'>+PNG_EXPORT(105, void, png_warning, (png_structp png_ptr, </div><div class='add'>+    png_const_charp warning_message));</div><div class='ctx'> </div><div class='ctx'> /* Non-fatal error in libpng, chunk name is prepended to message. */</div><div class='del'>-extern PNG_EXPORT(void,png_chunk_warning) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_const_charp warning_message));</div><div class='add'>+PNG_EXPORT(106, void, png_chunk_warning, (png_structp png_ptr, </div><div class='add'>+    png_const_charp warning_message));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_BENIGN_ERRORS_SUPPORTED</div><div class='ctx'> /* Benign error in libpng.  Can continue, but may have a problem.</div><div class='ctx'>  * User can choose whether to handle as a fatal error or as a warning. */</div><div class='del'>-extern PNG_EXPORT(void,png_benign_error) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_const_charp warning_message));</div><div class='add'>+#  undef png_benign_error</div><div class='add'>+PNG_EXPORT(107, void, png_benign_error, (png_structp png_ptr, </div><div class='add'>+    png_const_charp warning_message));</div><div class='ctx'> </div><div class='ctx'> /* Same, chunk name is prepended to message. */</div><div class='del'>-extern PNG_EXPORT(void,png_chunk_benign_error) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_const_charp warning_message));</div><div class='add'>+#  undef png_chunk_benign_error</div><div class='add'>+PNG_EXPORT(108, void, png_chunk_benign_error, (png_structp png_ptr, </div><div class='add'>+    png_const_charp warning_message));</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(void,png_set_benign_errors) PNGARG((png_structp</div><div class='del'>-   png_ptr, int allowed));</div><div class='add'>+PNG_EXPORT(109, void, png_set_benign_errors,</div><div class='add'>+    (png_structp png_ptr, int allowed));</div><div class='add'>+#else</div><div class='add'>+#  ifdef PNG_ALLOW_BENIGN_ERRORS</div><div class='add'>+#    define png_benign_error png_warning</div><div class='add'>+#    define png_chunk_benign_error png_chunk_warning</div><div class='add'>+#  else</div><div class='add'>+#    define png_benign_error png_error</div><div class='add'>+#    define png_chunk_benign_error png_chunk_error</div><div class='add'>+#  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* The png_set_&lt;chunk&gt; functions are for storing values in the png_info_struct.</div><div class='hunk'>@@ -2002,261 +1640,271 @@ extern PNG_EXPORT(void,png_set_benign_errors) PNGARG((png_structp</div><div class='ctx'>  * png_info_struct.</div><div class='ctx'>  */</div><div class='ctx'> /* Returns "flag" if chunk data is valid in info_ptr. */</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_valid) PNGARG((png_structp png_ptr,</div><div class='del'>-png_infop info_ptr, png_uint_32 flag));</div><div class='add'>+PNG_EXPORT(110, png_uint_32, png_get_valid,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr, </div><div class='add'>+    png_uint_32 flag));</div><div class='ctx'> </div><div class='ctx'> /* Returns number of bytes needed to hold a transformed row. */</div><div class='del'>-extern PNG_EXPORT(png_size_t,png_get_rowbytes) PNGARG((png_structp png_ptr,</div><div class='del'>-png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(111, png_size_t, png_get_rowbytes, (png_const_structp png_ptr, </div><div class='add'>+    png_const_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_INFO_IMAGE_SUPPORTED</div><div class='ctx'> /* Returns row_pointers, which is an array of pointers to scanlines that was</div><div class='ctx'>  * returned from png_read_png().</div><div class='ctx'>  */</div><div class='del'>-extern PNG_EXPORT(png_bytepp,png_get_rows) PNGARG((png_structp png_ptr,</div><div class='del'>-png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(112, png_bytepp, png_get_rows,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr));</div><div class='ctx'> /* Set row_pointers, which is an array of pointers to scanlines for use</div><div class='ctx'>  * by png_write_png().</div><div class='ctx'>  */</div><div class='del'>-extern PNG_EXPORT(void,png_set_rows) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_bytepp row_pointers));</div><div class='add'>+PNG_EXPORT(113, void, png_set_rows, (png_structp png_ptr,</div><div class='add'>+    png_infop info_ptr, png_bytepp row_pointers));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Returns number of color channels in image. */</div><div class='del'>-extern PNG_EXPORT(png_byte,png_get_channels) PNGARG((png_structp png_ptr,</div><div class='del'>-png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(114, png_byte, png_get_channels,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_EASY_ACCESS_SUPPORTED</div><div class='ctx'> /* Returns image width in pixels. */</div><div class='del'>-extern PNG_EXPORT(png_uint_32, png_get_image_width) PNGARG((png_structp</div><div class='del'>-png_ptr, png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(115, png_uint_32, png_get_image_width, (png_const_structp png_ptr, </div><div class='add'>+    png_const_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Returns image height in pixels. */</div><div class='del'>-extern PNG_EXPORT(png_uint_32, png_get_image_height) PNGARG((png_structp</div><div class='del'>-png_ptr, png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(116, png_uint_32, png_get_image_height, (png_const_structp png_ptr, </div><div class='add'>+    png_const_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Returns image bit_depth. */</div><div class='del'>-extern PNG_EXPORT(png_byte, png_get_bit_depth) PNGARG((png_structp</div><div class='del'>-png_ptr, png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(117, png_byte, png_get_bit_depth,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Returns image color_type. */</div><div class='del'>-extern PNG_EXPORT(png_byte, png_get_color_type) PNGARG((png_structp</div><div class='del'>-png_ptr, png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(118, png_byte, png_get_color_type, (png_const_structp png_ptr, </div><div class='add'>+    png_const_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Returns image filter_type. */</div><div class='del'>-extern PNG_EXPORT(png_byte, png_get_filter_type) PNGARG((png_structp</div><div class='del'>-png_ptr, png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(119, png_byte, png_get_filter_type, (png_const_structp png_ptr, </div><div class='add'>+    png_const_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Returns image interlace_type. */</div><div class='del'>-extern PNG_EXPORT(png_byte, png_get_interlace_type) PNGARG((png_structp</div><div class='del'>-png_ptr, png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(120, png_byte, png_get_interlace_type, (png_const_structp png_ptr, </div><div class='add'>+    png_const_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Returns image compression_type. */</div><div class='del'>-extern PNG_EXPORT(png_byte, png_get_compression_type) PNGARG((png_structp</div><div class='del'>-png_ptr, png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(121, png_byte, png_get_compression_type, (png_const_structp png_ptr, </div><div class='add'>+    png_const_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Returns image resolution in pixels per meter, from pHYs chunk data. */</div><div class='del'>-extern PNG_EXPORT(png_uint_32, png_get_pixels_per_meter) PNGARG((png_structp</div><div class='del'>-png_ptr, png_infop info_ptr));</div><div class='del'>-extern PNG_EXPORT(png_uint_32, png_get_x_pixels_per_meter) PNGARG((png_structp</div><div class='del'>-png_ptr, png_infop info_ptr));</div><div class='del'>-extern PNG_EXPORT(png_uint_32, png_get_y_pixels_per_meter) PNGARG((png_structp</div><div class='del'>-png_ptr, png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(122, png_uint_32, png_get_pixels_per_meter,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr));</div><div class='add'>+PNG_EXPORT(123, png_uint_32, png_get_x_pixels_per_meter,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr));</div><div class='add'>+PNG_EXPORT(124, png_uint_32, png_get_y_pixels_per_meter,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Returns pixel aspect ratio, computed from pHYs chunk data.  */</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(float, png_get_pixel_aspect_ratio) PNGARG((png_structp</div><div class='del'>-png_ptr, png_infop info_ptr));</div><div class='del'>-#endif</div><div class='add'>+PNG_FP_EXPORT(125, float, png_get_pixel_aspect_ratio,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr));</div><div class='add'>+PNG_FIXED_EXPORT(210, png_fixed_point, png_get_pixel_aspect_ratio_fixed, </div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Returns image x, y offset in pixels or microns, from oFFs chunk data. */</div><div class='del'>-extern PNG_EXPORT(png_int_32, png_get_x_offset_pixels) PNGARG((png_structp</div><div class='del'>-png_ptr, png_infop info_ptr));</div><div class='del'>-extern PNG_EXPORT(png_int_32, png_get_y_offset_pixels) PNGARG((png_structp</div><div class='del'>-png_ptr, png_infop info_ptr));</div><div class='del'>-extern PNG_EXPORT(png_int_32, png_get_x_offset_microns) PNGARG((png_structp</div><div class='del'>-png_ptr, png_infop info_ptr));</div><div class='del'>-extern PNG_EXPORT(png_int_32, png_get_y_offset_microns) PNGARG((png_structp</div><div class='del'>-png_ptr, png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(126, png_int_32, png_get_x_offset_pixels,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr));</div><div class='add'>+PNG_EXPORT(127, png_int_32, png_get_y_offset_pixels,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr));</div><div class='add'>+PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr));</div><div class='add'>+PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> #endif /* PNG_EASY_ACCESS_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> /* Returns pointer to signature string read from PNG header */</div><div class='del'>-extern PNG_EXPORT(png_bytep,png_get_signature) PNGARG((png_structp png_ptr,</div><div class='del'>-png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(130, png_const_bytep, png_get_signature,</div><div class='add'>+    (png_const_structp png_ptr, png_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_bKGD_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_bKGD) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_color_16p *background));</div><div class='add'>+PNG_EXPORT(131, png_uint_32, png_get_bKGD,</div><div class='add'>+    (png_const_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    png_color_16p *background));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_bKGD_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_bKGD) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_color_16p background));</div><div class='add'>+PNG_EXPORT(132, void, png_set_bKGD, (png_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    png_const_color_16p background));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_cHRM_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_cHRM) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, double *white_x, double *white_y, double *red_x,</div><div class='del'>-   double *red_y, double *green_x, double *green_y, double *blue_x,</div><div class='del'>-   double *blue_y));</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_cHRM_fixed) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_fixed_point *int_white_x, png_fixed_point</div><div class='del'>-   *int_white_y, png_fixed_point *int_red_x, png_fixed_point *int_red_y,</div><div class='del'>-   png_fixed_point *int_green_x, png_fixed_point *int_green_y, png_fixed_point</div><div class='del'>-   *int_blue_x, png_fixed_point *int_blue_y));</div><div class='add'>+PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM, (png_const_structp png_ptr, </div><div class='add'>+   png_const_infop info_ptr, double *white_x, double *white_y, double *red_x, </div><div class='add'>+    double *red_y, double *green_x, double *green_y, double *blue_x, </div><div class='add'>+    double *blue_y));</div><div class='add'>+#ifdef PNG_FIXED_POINT_SUPPORTED /* Otherwise not implemented */</div><div class='add'>+PNG_FIXED_EXPORT(134, png_uint_32, png_get_cHRM_fixed,</div><div class='add'>+    (png_const_structp png_ptr, </div><div class='add'>+    png_const_infop info_ptr, png_fixed_point *int_white_x, </div><div class='add'>+    png_fixed_point *int_white_y, png_fixed_point *int_red_x, </div><div class='add'>+    png_fixed_point *int_red_y, png_fixed_point *int_green_x, </div><div class='add'>+    png_fixed_point *int_green_y, png_fixed_point *int_blue_x, </div><div class='add'>+    png_fixed_point *int_blue_y));</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_cHRM_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_cHRM) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, double white_x, double white_y, double red_x,</div><div class='del'>-   double red_y, double green_x, double green_y, double blue_x, double blue_y));</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_cHRM_fixed) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_fixed_point int_white_x, png_fixed_point int_white_y,</div><div class='del'>-   png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point</div><div class='del'>-   int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,</div><div class='del'>-   png_fixed_point int_blue_y));</div><div class='del'>-#endif</div><div class='add'>+PNG_FP_EXPORT(135, void, png_set_cHRM,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    double white_x, double white_y, double red_x, double red_y, double green_x, </div><div class='add'>+    double green_y, double blue_x, double blue_y));</div><div class='add'>+PNG_FIXED_EXPORT(136, void, png_set_cHRM_fixed, (png_structp png_ptr, </div><div class='add'>+    png_infop info_ptr, png_fixed_point int_white_x, </div><div class='add'>+    png_fixed_point int_white_y, png_fixed_point int_red_x, </div><div class='add'>+    png_fixed_point int_red_y, png_fixed_point int_green_x, </div><div class='add'>+    png_fixed_point int_green_y, png_fixed_point int_blue_x, </div><div class='add'>+    png_fixed_point int_blue_y));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_gAMA_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_gAMA) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, double *file_gamma));</div><div class='del'>-#endif</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_gAMA_fixed) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_fixed_point *int_file_gamma));</div><div class='add'>+PNG_FP_EXPORT(137, png_uint_32, png_get_gAMA,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr, </div><div class='add'>+    double *file_gamma));</div><div class='add'>+PNG_FIXED_EXPORT(138, png_uint_32, png_get_gAMA_fixed,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    png_fixed_point *int_file_gamma));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_gAMA_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_gAMA) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, double file_gamma));</div><div class='del'>-#endif</div><div class='del'>-extern PNG_EXPORT(void,png_set_gAMA_fixed) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_fixed_point int_file_gamma));</div><div class='add'>+PNG_FP_EXPORT(139, void, png_set_gAMA, (png_structp png_ptr,</div><div class='add'>+    png_infop info_ptr, double file_gamma));</div><div class='add'>+PNG_FIXED_EXPORT(140, void, png_set_gAMA_fixed, (png_structp png_ptr, </div><div class='add'>+    png_infop info_ptr, png_fixed_point int_file_gamma));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_hIST_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_hIST) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_uint_16p *hist));</div><div class='add'>+PNG_EXPORT(141, png_uint_32, png_get_hIST,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr, </div><div class='add'>+    png_uint_16p *hist));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_hIST_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_hIST) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_uint_16p hist));</div><div class='add'>+PNG_EXPORT(142, void, png_set_hIST, (png_structp png_ptr,</div><div class='add'>+    png_infop info_ptr, png_const_uint_16p hist));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_IHDR) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_uint_32 *width, png_uint_32 *height,</div><div class='del'>-   int *bit_depth, int *color_type, int *interlace_method,</div><div class='del'>-   int *compression_method, int *filter_method));</div><div class='add'>+PNG_EXPORT(143, png_uint_32, png_get_IHDR,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, </div><div class='add'>+    int *interlace_method, int *compression_method, int *filter_method));</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(void,png_set_IHDR) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_uint_32 width, png_uint_32 height, int bit_depth,</div><div class='del'>-   int color_type, int interlace_method, int compression_method,</div><div class='del'>-   int filter_method));</div><div class='add'>+PNG_EXPORT(144, void, png_set_IHDR,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    png_uint_32 width, png_uint_32 height, int bit_depth, int color_type, </div><div class='add'>+    int interlace_method, int compression_method, int filter_method));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_oFFs_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_oFFs) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,</div><div class='del'>-   int *unit_type));</div><div class='add'>+PNG_EXPORT(145, png_uint_32, png_get_oFFs,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr, </div><div class='add'>+    png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_oFFs_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_oFFs) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_int_32 offset_x, png_int_32 offset_y,</div><div class='del'>-   int unit_type));</div><div class='add'>+PNG_EXPORT(146, void, png_set_oFFs,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    png_int_32 offset_x, png_int_32 offset_y, int unit_type));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_pCAL_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_pCAL) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_charp *purpose, png_int_32 *X0, png_int_32 *X1,</div><div class='del'>-   int *type, int *nparams, png_charp *units, png_charpp *params));</div><div class='add'>+PNG_EXPORT(147, png_uint_32, png_get_pCAL,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr, </div><div class='add'>+    png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type,</div><div class='add'>+    int *nparams, </div><div class='add'>+    png_charp *units, png_charpp *params));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_pCAL_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_pCAL) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_charp purpose, png_int_32 X0, png_int_32 X1,</div><div class='del'>-   int type, int nparams, png_charp units, png_charpp params));</div><div class='add'>+PNG_EXPORT(148, void, png_set_pCAL, (png_structp png_ptr,</div><div class='add'>+    png_infop info_ptr, </div><div class='add'>+    png_const_charp purpose, png_int_32 X0, png_int_32 X1, int type, </div><div class='add'>+    int nparams, png_const_charp units, png_charpp params));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_pHYs_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_pHYs) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));</div><div class='add'>+PNG_EXPORT(149, png_uint_32, png_get_pHYs,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr, </div><div class='add'>+    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_pHYs_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_pHYs) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_uint_32 res_x, png_uint_32 res_y, int unit_type));</div><div class='add'>+PNG_EXPORT(150, void, png_set_pHYs,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    png_uint_32 res_x, png_uint_32 res_y, int unit_type));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_PLTE) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_colorp *palette, int *num_palette));</div><div class='add'>+PNG_EXPORT(151, png_uint_32, png_get_PLTE,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr, </div><div class='add'>+    png_colorp *palette, int *num_palette));</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(void,png_set_PLTE) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_colorp palette, int num_palette));</div><div class='add'>+PNG_EXPORT(152, void, png_set_PLTE,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    png_const_colorp palette, int num_palette));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_sBIT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_sBIT) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_color_8p *sig_bit));</div><div class='add'>+PNG_EXPORT(153, png_uint_32, png_get_sBIT,</div><div class='add'>+    (png_const_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    png_color_8p *sig_bit));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_sBIT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_sBIT) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_color_8p sig_bit));</div><div class='add'>+PNG_EXPORT(154, void, png_set_sBIT,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, png_const_color_8p sig_bit));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_sRGB_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_sRGB) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, int *intent));</div><div class='add'>+PNG_EXPORT(155, png_uint_32, png_get_sRGB, (png_const_structp png_ptr,</div><div class='add'>+    png_const_infop info_ptr, int *file_srgb_intent));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_sRGB_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_sRGB) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, int intent));</div><div class='del'>-extern PNG_EXPORT(void,png_set_sRGB_gAMA_and_cHRM) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, int intent));</div><div class='add'>+PNG_EXPORT(156, void, png_set_sRGB,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, int srgb_intent));</div><div class='add'>+PNG_EXPORT(157, void, png_set_sRGB_gAMA_and_cHRM, (png_structp png_ptr, </div><div class='add'>+    png_infop info_ptr, int srgb_intent));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_iCCP_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_iCCP) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_charpp name, int *compression_type,</div><div class='del'>-   png_charpp profile, png_uint_32 *proflen));</div><div class='del'>-   /* Note to maintainer: profile should be png_bytepp */</div><div class='add'>+PNG_EXPORT(158, png_uint_32, png_get_iCCP,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr, </div><div class='add'>+    png_charpp name, int *compression_type, png_bytepp profile, </div><div class='add'>+    png_uint_32 *proflen));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_iCCP_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_iCCP) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_charp name, int compression_type,</div><div class='del'>-   png_charp profile, png_uint_32 proflen));</div><div class='del'>-   /* Note to maintainer: profile should be png_bytep */</div><div class='add'>+PNG_EXPORT(159, void, png_set_iCCP,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    png_const_charp name, int compression_type, png_const_bytep profile, </div><div class='add'>+    png_uint_32 proflen));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_sPLT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_sPLT) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_sPLT_tpp entries));</div><div class='add'>+PNG_EXPORT(160, png_uint_32, png_get_sPLT,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr, </div><div class='add'>+    png_sPLT_tpp entries));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_sPLT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_sPLT) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_sPLT_tp entries, int nentries));</div><div class='add'>+PNG_EXPORT(161, void, png_set_sPLT,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    png_const_sPLT_tp entries, int nentries));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_TEXT_SUPPORTED</div><div class='ctx'> /* png_get_text also returns the number of text chunks in *num_text */</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_text) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_textp *text_ptr, int *num_text));</div><div class='add'>+PNG_EXPORT(162, png_uint_32, png_get_text,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr, </div><div class='add'>+    png_textp *text_ptr, int *num_text));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Note while png_set_text() will accept a structure whose text,</div><div class='add'>+/* Note while png_set_text() will accept a structure whose text, </div><div class='ctx'>  * language, and  translated keywords are NULL pointers, the structure</div><div class='ctx'>  * returned by png_get_text will always contain regular</div><div class='ctx'>  * zero-terminated C strings.  They might be empty strings but</div><div class='hunk'>@@ -2264,59 +1912,64 @@ extern PNG_EXPORT(png_uint_32,png_get_text) PNGARG((png_structp png_ptr,</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_TEXT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_text) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_textp text_ptr, int num_text));</div><div class='add'>+PNG_EXPORT(163, void, png_set_text,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    png_const_textp text_ptr, int num_text));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_tIME_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_tIME) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_timep *mod_time));</div><div class='add'>+PNG_EXPORT(164, png_uint_32, png_get_tIME,</div><div class='add'>+    (png_const_structp png_ptr, png_infop info_ptr, png_timep *mod_time));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_tIME_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_tIME) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_timep mod_time));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_tRNS_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_tRNS) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_bytep *trans_alpha, int *num_trans,</div><div class='del'>-   png_color_16p *trans_color));</div><div class='add'>+PNG_EXPORT(165, void, png_set_tIME,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, png_const_timep mod_time));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_tRNS_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_tRNS) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_bytep trans_alpha, int num_trans,</div><div class='del'>-   png_color_16p trans_color));</div><div class='add'>+PNG_EXPORT(166, png_uint_32, png_get_tRNS,</div><div class='add'>+    (png_const_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_tRNS_SUPPORTED</div><div class='add'>+PNG_EXPORT(167, void, png_set_tRNS,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    png_const_bytep trans_alpha, int num_trans, </div><div class='add'>+    png_const_color_16p trans_color));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_sCAL_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_sCAL) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, int *unit, double *width, double *height));</div><div class='del'>-#else</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_sCAL_s) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, int *unit, png_charpp swidth, png_charpp sheight));</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='add'>+PNG_FP_EXPORT(168, png_uint_32, png_get_sCAL,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr, </div><div class='add'>+    int *unit, double *width, double *height));</div><div class='add'>+#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED</div><div class='add'>+/* NOTE: this API is currently implemented using floating point arithmetic, </div><div class='add'>+ * consequently it can only be used on systems with floating point support.</div><div class='add'>+ * In any case the range of values supported by png_fixed_point is small and it</div><div class='add'>+ * is highly recommended that png_get_sCAL_s be used instead.</div><div class='add'>+ */</div><div class='add'>+PNG_FIXED_EXPORT(214, png_uint_32, png_get_sCAL_fixed,</div><div class='add'>+    (png_structp png_ptr, png_const_infop info_ptr, int *unit,</div><div class='add'>+    png_fixed_point *width, </div><div class='add'>+    png_fixed_point *height));</div><div class='add'>+#endif</div><div class='add'>+PNG_EXPORT(169, png_uint_32, png_get_sCAL_s,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    int *unit, png_charpp swidth, png_charpp sheight));</div><div class='add'>+</div><div class='add'>+PNG_FP_EXPORT(170, void, png_set_sCAL,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    int unit, double width, double height));</div><div class='add'>+PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_structp png_ptr, </div><div class='add'>+   png_infop info_ptr, int unit, png_fixed_point width, </div><div class='add'>+   png_fixed_point height));</div><div class='add'>+PNG_EXPORT(171, void, png_set_sCAL_s,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    int unit, png_const_charp swidth, png_const_charp sheight));</div><div class='ctx'> #endif /* PNG_sCAL_SUPPORTED */</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_sCAL_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_sCAL) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, int unit, double width, double height));</div><div class='del'>-#else</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_sCAL_s) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, int unit, png_charp swidth, png_charp sheight));</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-#endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */</div><div class='del'>-</div><div class='ctx'> #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='ctx'> /* Provide a list of chunks and how they are to be handled, if the built-in</div><div class='ctx'>    handling or default unknown chunk handling is not desired.  Any chunks not</div><div class='hunk'>@@ -2327,47 +1980,49 @@ extern PNG_EXPORT(void,png_set_sCAL_s) PNGARG((png_structp png_ptr,</div><div class='ctx'>            = 2: keep only if safe-to-copy</div><div class='ctx'>            = 3: keep even if unsafe-to-copy</div><div class='ctx'> */</div><div class='del'>-extern PNG_EXPORT(void, png_set_keep_unknown_chunks) PNGARG((png_structp</div><div class='del'>-   png_ptr, int keep, png_bytep chunk_list, int num_chunks));</div><div class='del'>-PNG_EXPORT(int,png_handle_as_unknown) PNGARG((png_structp png_ptr, png_bytep</div><div class='del'>-   chunk_name));</div><div class='add'>+PNG_EXPORT(172, void, png_set_keep_unknown_chunks,</div><div class='add'>+    (png_structp png_ptr, int keep, </div><div class='add'>+    png_const_bytep chunk_list, int num_chunks));</div><div class='add'>+PNG_EXPORT(173, int, png_handle_as_unknown, (png_structp png_ptr, </div><div class='add'>+    png_const_bytep chunk_name));</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void, png_set_unknown_chunks) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns));</div><div class='del'>-extern PNG_EXPORT(void, png_set_unknown_chunk_location)</div><div class='del'>-   PNGARG((png_structp png_ptr, png_infop info_ptr, int chunk, int location));</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_unknown_chunks) PNGARG((png_structp</div><div class='del'>-   png_ptr, png_infop info_ptr, png_unknown_chunkpp entries));</div><div class='add'>+PNG_EXPORT(174, void, png_set_unknown_chunks, (png_structp png_ptr, </div><div class='add'>+    png_infop info_ptr, png_const_unknown_chunkp unknowns,</div><div class='add'>+    int num_unknowns));</div><div class='add'>+PNG_EXPORT(175, void, png_set_unknown_chunk_location,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, int chunk, int location));</div><div class='add'>+PNG_EXPORT(176, int, png_get_unknown_chunks, (png_const_structp png_ptr, </div><div class='add'>+    png_const_infop info_ptr, png_unknown_chunkpp entries));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Png_free_data() will turn off the "valid" flag for anything it frees.</div><div class='del'>- * If you need to turn it off for a chunk that your application has freed,</div><div class='add'>+ * If you need to turn it off for a chunk that your application has freed, </div><div class='ctx'>  * you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK);</div><div class='ctx'>  */</div><div class='del'>-extern PNG_EXPORT(void, png_set_invalid) PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, int mask));</div><div class='add'>+PNG_EXPORT(177, void, png_set_invalid,</div><div class='add'>+    (png_structp png_ptr, png_infop info_ptr, int mask));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_INFO_IMAGE_SUPPORTED</div><div class='ctx'> /* The "params" pointer is currently not used and is for future expansion. */</div><div class='del'>-extern PNG_EXPORT(void, png_read_png) PNGARG((png_structp png_ptr,</div><div class='del'>-                        png_infop info_ptr,</div><div class='del'>-                        int transforms,</div><div class='del'>-                        png_voidp params));</div><div class='del'>-extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr,</div><div class='del'>-                        png_infop info_ptr,</div><div class='del'>-                        int transforms,</div><div class='del'>-                        png_voidp params));</div><div class='add'>+PNG_EXPORT(178, void, png_read_png, (png_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    int transforms, png_voidp params));</div><div class='add'>+PNG_EXPORT(179, void, png_write_png, (png_structp png_ptr, png_infop info_ptr, </div><div class='add'>+    int transforms, png_voidp params));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(png_charp,png_get_copyright) PNGARG((png_structp png_ptr));</div><div class='del'>-extern PNG_EXPORT(png_charp,png_get_header_ver) PNGARG((png_structp png_ptr));</div><div class='del'>-extern PNG_EXPORT(png_charp,png_get_header_version) PNGARG((png_structp png_ptr));</div><div class='del'>-extern PNG_EXPORT(png_charp,png_get_libpng_ver) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(180, png_const_charp, png_get_copyright,</div><div class='add'>+    (png_const_structp png_ptr));</div><div class='add'>+PNG_EXPORT(181, png_const_charp, png_get_header_ver,</div><div class='add'>+    (png_const_structp png_ptr));</div><div class='add'>+PNG_EXPORT(182, png_const_charp, png_get_header_version,</div><div class='add'>+    (png_const_structp png_ptr));</div><div class='add'>+PNG_EXPORT(183, png_const_charp, png_get_libpng_ver,</div><div class='add'>+    (png_const_structp png_ptr));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_MNG_FEATURES_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp</div><div class='del'>-   png_ptr, png_uint_32 mng_features_permitted));</div><div class='add'>+PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structp png_ptr, </div><div class='add'>+    png_uint_32 mng_features_permitted));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* For use in png_set_keep_unknown, added to version 1.2.6 */</div><div class='hunk'>@@ -2380,69 +2035,135 @@ extern PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp</div><div class='ctx'>  * messages before passing them to the error or warning handler.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef PNG_ERROR_NUMBERS_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp</div><div class='del'>-   png_ptr, png_uint_32 strip_mode));</div><div class='add'>+PNG_EXPORT(185, void, png_set_strip_error_numbers,</div><div class='add'>+    (png_structp png_ptr, </div><div class='add'>+    png_uint_32 strip_mode));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Added in libpng-1.2.6 */</div><div class='ctx'> #ifdef PNG_SET_USER_LIMITS_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(void,png_set_user_limits) PNGARG((png_structp</div><div class='del'>-   png_ptr, png_uint_32 user_width_max, png_uint_32 user_height_max));</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_user_width_max) PNGARG((png_structp</div><div class='del'>-   png_ptr));</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_user_height_max) PNGARG((png_structp</div><div class='del'>-   png_ptr));</div><div class='add'>+PNG_EXPORT(186, void, png_set_user_limits, (png_structp png_ptr, </div><div class='add'>+    png_uint_32 user_width_max, png_uint_32 user_height_max));</div><div class='add'>+PNG_EXPORT(187, png_uint_32, png_get_user_width_max,</div><div class='add'>+    (png_const_structp png_ptr));</div><div class='add'>+PNG_EXPORT(188, png_uint_32, png_get_user_height_max,</div><div class='add'>+    (png_const_structp png_ptr));</div><div class='ctx'> /* Added in libpng-1.4.0 */</div><div class='del'>-extern PNG_EXPORT(void,png_set_chunk_cache_max) PNGARG((png_structp</div><div class='del'>-   png_ptr, png_uint_32 user_chunk_cache_max));</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_chunk_cache_max)</div><div class='del'>-   PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(189, void, png_set_chunk_cache_max, (png_structp png_ptr, </div><div class='add'>+    png_uint_32 user_chunk_cache_max));</div><div class='add'>+PNG_EXPORT(190, png_uint_32, png_get_chunk_cache_max,</div><div class='add'>+    (png_const_structp png_ptr));</div><div class='add'>+/* Added in libpng-1.4.1 */</div><div class='add'>+PNG_EXPORT(191, void, png_set_chunk_malloc_max, (png_structp png_ptr, </div><div class='add'>+    png_alloc_size_t user_chunk_cache_max));</div><div class='add'>+PNG_EXPORT(192, png_alloc_size_t, png_get_chunk_malloc_max,</div><div class='add'>+    (png_const_structp png_ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(PNG_INCH_CONVERSIONS) &amp;&amp; defined(PNG_FLOATING_POINT_SUPPORTED)</div><div class='del'>-PNG_EXPORT(png_uint_32,png_get_pixels_per_inch) PNGARG((png_structp png_ptr,</div><div class='del'>-png_infop info_ptr));</div><div class='add'>+#if defined(PNG_INCH_CONVERSIONS_SUPPORTED)</div><div class='add'>+PNG_EXPORT(193, png_uint_32, png_get_pixels_per_inch,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr));</div><div class='ctx'> </div><div class='del'>-PNG_EXPORT(png_uint_32,png_get_x_pixels_per_inch) PNGARG((png_structp png_ptr,</div><div class='del'>-png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(194, png_uint_32, png_get_x_pixels_per_inch,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr));</div><div class='ctx'> </div><div class='del'>-PNG_EXPORT(png_uint_32,png_get_y_pixels_per_inch) PNGARG((png_structp png_ptr,</div><div class='del'>-png_infop info_ptr));</div><div class='add'>+PNG_EXPORT(195, png_uint_32, png_get_y_pixels_per_inch,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr));</div><div class='ctx'> </div><div class='del'>-PNG_EXPORT(float,png_get_x_offset_inches) PNGARG((png_structp png_ptr,</div><div class='del'>-png_infop info_ptr));</div><div class='add'>+PNG_FP_EXPORT(196, float, png_get_x_offset_inches,</div><div class='add'>+    (png_const_structp png_ptr, png_const_infop info_ptr));</div><div class='add'>+#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */</div><div class='add'>+PNG_FIXED_EXPORT(211, png_fixed_point, png_get_x_offset_inches_fixed, </div><div class='add'>+    (png_structp png_ptr, png_const_infop info_ptr));</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-PNG_EXPORT(float,png_get_y_offset_inches) PNGARG((png_structp png_ptr,</div><div class='del'>-png_infop info_ptr));</div><div class='add'>+PNG_FP_EXPORT(197, float, png_get_y_offset_inches, (png_const_structp png_ptr, </div><div class='add'>+    png_const_infop info_ptr));</div><div class='add'>+#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */</div><div class='add'>+PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed, </div><div class='add'>+    (png_structp png_ptr, png_const_infop info_ptr));</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_pHYs_SUPPORTED</div><div class='del'>-PNG_EXPORT(png_uint_32,png_get_pHYs_dpi) PNGARG((png_structp png_ptr,</div><div class='del'>-png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));</div><div class='del'>-#endif /* PNG_pHYs_SUPPORTED */</div><div class='del'>-#endif  /* PNG_INCH_CONVERSIONS &amp;&amp; PNG_FLOATING_POINT_SUPPORTED */</div><div class='add'>+#  ifdef PNG_pHYs_SUPPORTED</div><div class='add'>+PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structp png_ptr, </div><div class='add'>+    png_const_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,</div><div class='add'>+    int *unit_type));</div><div class='add'>+#  endif /* PNG_pHYs_SUPPORTED */</div><div class='add'>+#endif  /* PNG_INCH_CONVERSIONS_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> /* Added in libpng-1.4.0 */</div><div class='ctx'> #ifdef PNG_IO_STATE_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_io_state) PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORT(199, png_uint_32, png_get_io_state, (png_structp png_ptr));</div><div class='ctx'> </div><div class='del'>-extern PNG_EXPORT(png_bytep,png_get_io_chunk_name)</div><div class='del'>-   PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXPORTA(200, png_const_bytep, png_get_io_chunk_name,</div><div class='add'>+    (png_structp png_ptr), PNG_DEPRECATED);</div><div class='add'>+PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,</div><div class='add'>+    (png_const_structp png_ptr));</div><div class='ctx'> </div><div class='ctx'> /* The flags returned by png_get_io_state() are the following: */</div><div class='del'>-#define PNG_IO_NONE        0x0000   /* no I/O at this moment */</div><div class='del'>-#define PNG_IO_READING     0x0001   /* currently reading */</div><div class='del'>-#define PNG_IO_WRITING     0x0002   /* currently writing */</div><div class='del'>-#define PNG_IO_SIGNATURE   0x0010   /* currently at the file signature */</div><div class='del'>-#define PNG_IO_CHUNK_HDR   0x0020   /* currently at the chunk header */</div><div class='del'>-#define PNG_IO_CHUNK_DATA  0x0040   /* currently at the chunk data */</div><div class='del'>-#define PNG_IO_CHUNK_CRC   0x0080   /* currently at the chunk crc */</div><div class='del'>-#define PNG_IO_MASK_OP     0x000f   /* current operation: reading/writing */</div><div class='del'>-#define PNG_IO_MASK_LOC    0x00f0   /* current location: sig/hdr/data/crc */</div><div class='add'>+#  define PNG_IO_NONE        0x0000   /* no I/O at this moment */</div><div class='add'>+#  define PNG_IO_READING     0x0001   /* currently reading */</div><div class='add'>+#  define PNG_IO_WRITING     0x0002   /* currently writing */</div><div class='add'>+#  define PNG_IO_SIGNATURE   0x0010   /* currently at the file signature */</div><div class='add'>+#  define PNG_IO_CHUNK_HDR   0x0020   /* currently at the chunk header */</div><div class='add'>+#  define PNG_IO_CHUNK_DATA  0x0040   /* currently at the chunk data */</div><div class='add'>+#  define PNG_IO_CHUNK_CRC   0x0080   /* currently at the chunk crc */</div><div class='add'>+#  define PNG_IO_MASK_OP     0x000f   /* current operation: reading/writing */</div><div class='add'>+#  define PNG_IO_MASK_LOC    0x00f0   /* current location: sig/hdr/data/crc */</div><div class='ctx'> #endif /* ?PNG_IO_STATE_SUPPORTED */</div><div class='ctx'> </div><div class='del'>-/* Maintainer: Put new public prototypes here ^, in libpng.3, and project</div><div class='del'>- * defs</div><div class='add'>+/* Interlace support.  The following macros are always defined so that if</div><div class='add'>+ * libpng interlace handling is turned off the macros may be used to handle</div><div class='add'>+ * interlaced images within the application.</div><div class='add'>+ */</div><div class='add'>+#define PNG_INTERLACE_ADAM7_PASSES 7</div><div class='add'>+</div><div class='add'>+/* Two macros to return the first row and first column of the original,</div><div class='add'>+ * full, image which appears in a given pass.  'pass' is in the range 0</div><div class='add'>+ * to 6 and the result is in the range 0 to 7.</div><div class='add'>+ */</div><div class='add'>+#define PNG_PASS_START_ROW(pass) (((1U&amp;~(pass))&lt;&lt;(3-((pass)&gt;&gt;1)))&amp;7)</div><div class='add'>+#define PNG_PASS_START_COL(pass) (((1U&amp; (pass))&lt;&lt;(3-(((pass)+1)&gt;&gt;1)))&amp;7)</div><div class='add'>+</div><div class='add'>+/* Two macros to help evaluate the number of rows or columns in each</div><div class='add'>+ * pass.  This is expressed as a shift - effectively log2 of the number or</div><div class='add'>+ * rows or columns in each 8x8 tile of the original image.</div><div class='ctx'>  */</div><div class='add'>+#define PNG_PASS_ROW_SHIFT(pass) ((pass)&gt;2?(8-(pass))&gt;&gt;1:3)</div><div class='add'>+#define PNG_PASS_COL_SHIFT(pass) ((pass)&gt;1?(7-(pass))&gt;&gt;1:3)</div><div class='add'>+</div><div class='add'>+/* Hence two macros to determine the number of rows or columns in a given</div><div class='add'>+ * pass of an image given its height or width.  In fact these macros may</div><div class='add'>+ * return non-zero even though the sub-image is empty, because the other</div><div class='add'>+ * dimension may be empty for a small image.</div><div class='add'>+ */</div><div class='add'>+#define PNG_PASS_ROWS(height, pass) (((height)+(((1&lt;&lt;PNG_PASS_ROW_SHIFT(pass))\</div><div class='add'>+   -1)-PNG_PASS_START_ROW(pass)))&gt;&gt;PNG_PASS_ROW_SHIFT(pass))</div><div class='add'>+#define PNG_PASS_COLS(width, pass) (((width)+(((1&lt;&lt;PNG_PASS_COL_SHIFT(pass))\</div><div class='add'>+   -1)-PNG_PASS_START_COL(pass)))&gt;&gt;PNG_PASS_COL_SHIFT(pass))</div><div class='add'>+</div><div class='add'>+/* For the progressive reader it is necessary to find the row in the output</div><div class='add'>+ * image given a row in an interlaced image, so two more macros:</div><div class='add'>+ */</div><div class='add'>+#define PNG_ROW_FROM_PASS_ROW(yIn, pass) \</div><div class='add'>+   (((yIn)&lt;&lt;PNG_PASS_ROW_SHIFT(pass))+PNG_PASS_START_ROW(pass))</div><div class='add'>+#define PNG_COL_FROM_PASS_COL(xIn, pass) \</div><div class='add'>+   (((xIn)&lt;&lt;PNG_PASS_COL_SHIFT(pass))+PNG_PASS_START_COL(pass))</div><div class='add'>+</div><div class='add'>+/* Two macros which return a boolean (0 or 1) saying whether the given row</div><div class='add'>+ * or column is in a particular pass.  These use a common utility macro that</div><div class='add'>+ * returns a mask for a given pass - the offset 'off' selects the row or</div><div class='add'>+ * column version.  The mask has the appropriate bit set for each column in</div><div class='add'>+ * the tile.</div><div class='add'>+ */</div><div class='add'>+#define PNG_PASS_MASK(pass,off) ( \</div><div class='add'>+   ((0x110145AFU&gt;&gt;(((7-(off))-(pass))&lt;&lt;2)) &amp; 0xFU) | \</div><div class='add'>+   ((0x01145AF0U&gt;&gt;(((7-(off))-(pass))&lt;&lt;2)) &amp; 0xF0U))</div><div class='add'>+</div><div class='add'>+#define PNG_ROW_IN_INTERLACE_PASS(y, pass) \</div><div class='add'>+   ((PNG_PASS_MASK(pass,0) &gt;&gt; ((y)&amp;7)) &amp; 1)</div><div class='add'>+#define PNG_COL_IN_INTERLACE_PASS(x, pass) \</div><div class='add'>+   ((PNG_PASS_MASK(pass,1) &gt;&gt; ((x)&amp;7)) &amp; 1)</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED</div><div class='ctx'> /* With these routines we avoid an integer divide, which will be slower on</div><div class='hunk'>@@ -2457,91 +2178,98 @@ extern PNG_EXPORT(png_bytep,png_get_io_chunk_name)</div><div class='ctx'>  * [Optimized code by Greg Roelofs and Mark Adler...blame us for bugs. :-) ]</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>- /* fg and bg should be in `gamma 1.0' space; alpha is the opacity          */</div><div class='add'>+ /* fg and bg should be in `gamma 1.0' space; alpha is the opacity */</div><div class='ctx'> </div><div class='del'>-#  define png_composite(composite, fg, alpha, bg)                            \</div><div class='del'>-     { png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) * (png_uint_16)(alpha) \</div><div class='del'>-                        +        (png_uint_16)(bg)*(png_uint_16)(255 -       \</div><div class='del'>-                        (png_uint_16)(alpha)) + (png_uint_16)128);           \</div><div class='add'>+#  define png_composite(composite, fg, alpha, bg)         \</div><div class='add'>+     { png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) \</div><div class='add'>+           * (png_uint_16)(alpha)                         \</div><div class='add'>+           + (png_uint_16)(bg)*(png_uint_16)(255          \</div><div class='add'>+           - (png_uint_16)(alpha)) + (png_uint_16)128);   \</div><div class='ctx'>        (composite) = (png_byte)((temp + (temp &gt;&gt; 8)) &gt;&gt; 8); }</div><div class='ctx'> </div><div class='del'>-#  define png_composite_16(composite, fg, alpha, bg)                         \</div><div class='del'>-     { png_uint_32 temp = (png_uint_32)((png_uint_32)(fg) * (png_uint_32)(alpha) \</div><div class='del'>-                        + (png_uint_32)(bg)*(png_uint_32)(65535L -           \</div><div class='del'>-                        (png_uint_32)(alpha)) + (png_uint_32)32768L);        \</div><div class='add'>+#  define png_composite_16(composite, fg, alpha, bg)       \</div><div class='add'>+     { png_uint_32 temp = (png_uint_32)((png_uint_32)(fg)  \</div><div class='add'>+           * (png_uint_32)(alpha)                          \</div><div class='add'>+           + (png_uint_32)(bg)*(png_uint_32)(65535L        \</div><div class='add'>+           - (png_uint_32)(alpha)) + (png_uint_32)32768L); \</div><div class='ctx'>        (composite) = (png_uint_16)((temp + (temp &gt;&gt; 16)) &gt;&gt; 16); }</div><div class='ctx'> </div><div class='ctx'> #else  /* Standard method using integer division */</div><div class='ctx'> </div><div class='del'>-#  define png_composite(composite, fg, alpha, bg)                            \</div><div class='del'>-     (composite) = (png_byte)(((png_uint_16)(fg) * (png_uint_16)(alpha) +    \</div><div class='del'>-       (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) +       \</div><div class='del'>-       (png_uint_16)127) / 255)</div><div class='add'>+#  define png_composite(composite, fg, alpha, bg)                          \</div><div class='add'>+     (composite) = (png_byte)(((png_uint_16)(fg) * (png_uint_16)(alpha) +  \</div><div class='add'>+     (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) +       \</div><div class='add'>+     (png_uint_16)127) / 255)</div><div class='ctx'> </div><div class='ctx'> #  define png_composite_16(composite, fg, alpha, bg)                         \</div><div class='ctx'>      (composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \</div><div class='del'>-       (png_uint_32)(bg)*(png_uint_32)(65535L - (png_uint_32)(alpha)) +      \</div><div class='del'>-       (png_uint_32)32767) / (png_uint_32)65535L)</div><div class='add'>+     (png_uint_32)(bg)*(png_uint_32)(65535L - (png_uint_32)(alpha)) +        \</div><div class='add'>+     (png_uint_32)32767) / (png_uint_32)65535L)</div><div class='ctx'> #endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED</div><div class='add'>+PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));</div><div class='add'>+PNG_EXPORT(202, png_uint_16, png_get_uint_16, (png_const_bytep buf));</div><div class='add'>+PNG_EXPORT(203, png_int_32, png_get_int_32, (png_const_bytep buf));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+PNG_EXPORT(204, png_uint_32, png_get_uint_31, (png_structp png_ptr, </div><div class='add'>+    png_const_bytep buf));</div><div class='add'>+/* No png_get_int_16 -- may be added if there's a real need for it. */</div><div class='add'>+</div><div class='add'>+/* Place a 32-bit number into a buffer in PNG byte order (big-endian). */</div><div class='add'>+#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED</div><div class='add'>+PNG_EXPORT(205, void, png_save_uint_32, (png_bytep buf, png_uint_32 i));</div><div class='add'>+#endif</div><div class='add'>+#ifdef PNG_SAVE_INT_32_SUPPORTED</div><div class='add'>+PNG_EXPORT(206, void, png_save_int_32, (png_bytep buf, png_int_32 i));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Place a 16-bit number into a buffer in PNG byte order.</div><div class='add'>+ * The parameter is declared unsigned int, not png_uint_16, </div><div class='add'>+ * just to avoid potential problems on pre-ANSI C compilers.</div><div class='add'>+ */</div><div class='add'>+#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED</div><div class='add'>+PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));</div><div class='add'>+/* No png_save_int_16 -- may be added if there's a real need for it. */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_USE_READ_MACROS</div><div class='ctx'> /* Inline macros to do direct reads of bytes from the input buffer.</div><div class='ctx'>  * The png_get_int_32() routine assumes we are using two's complement</div><div class='ctx'>  * format for negative values, which is almost certainly true.</div><div class='ctx'>  */</div><div class='del'>-/* We could make special-case BIG_ENDIAN macros that do direct reads here */</div><div class='ctx'> #  define png_get_uint_32(buf) \</div><div class='ctx'>      (((png_uint_32)(*(buf)) &lt;&lt; 24) + \</div><div class='ctx'>       ((png_uint_32)(*((buf) + 1)) &lt;&lt; 16) + \</div><div class='ctx'>       ((png_uint_32)(*((buf) + 2)) &lt;&lt; 8) + \</div><div class='ctx'>       ((png_uint_32)(*((buf) + 3))))</div><div class='add'>+</div><div class='add'>+   /* From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the</div><div class='add'>+    * function) incorrectly returned a value of type png_uint_32.</div><div class='add'>+    */</div><div class='ctx'> #  define png_get_uint_16(buf) \</div><div class='del'>-     (((png_uint_32)(*(buf)) &lt;&lt; 8) + \</div><div class='del'>-      ((png_uint_32)(*((buf) + 1))))</div><div class='del'>-#ifdef PNG_GET_INT_32_SUPPORTED</div><div class='add'>+     ((png_uint_16) \</div><div class='add'>+      (((unsigned int)(*(buf)) &lt;&lt; 8) + \</div><div class='add'>+       ((unsigned int)(*((buf) + 1)))))</div><div class='add'>+</div><div class='ctx'> #  define png_get_int_32(buf) \</div><div class='del'>-     (((png_int_32)(*(buf)) &lt;&lt; 24) + \</div><div class='del'>-      ((png_int_32)(*((buf) + 1)) &lt;&lt; 16) + \</div><div class='del'>-      ((png_int_32)(*((buf) + 2)) &lt;&lt; 8) + \</div><div class='del'>-      ((png_int_32)(*((buf) + 3))))</div><div class='add'>+     ((png_int_32)((*(buf) &amp; 0x80) \</div><div class='add'>+      ? -((png_int_32)((png_get_uint_32(buf) ^ 0xffffffffL) + 1)) \</div><div class='add'>+      : (png_int_32)png_get_uint_32(buf)))</div><div class='ctx'> #endif</div><div class='del'>-#else</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_uint_32) PNGARG((png_bytep buf));</div><div class='del'>-extern PNG_EXPORT(png_uint_16,png_get_uint_16) PNGARG((png_bytep buf));</div><div class='del'>-#ifdef PNG_GET_INT_32_SUPPORTED</div><div class='del'>-extern PNG_EXPORT(png_int_32,png_get_int_32) PNGARG((png_bytep buf));</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-extern PNG_EXPORT(png_uint_32,png_get_uint_31)</div><div class='del'>-  PNGARG((png_structp png_ptr, png_bytep buf));</div><div class='del'>-/* No png_get_int_16 -- may be added if there's a real need for it. */</div><div class='ctx'> </div><div class='del'>-/* Place a 32-bit number into a buffer in PNG byte order (big-endian). */</div><div class='del'>-extern PNG_EXPORT(void,png_save_uint_32)</div><div class='del'>-   PNGARG((png_bytep buf, png_uint_32 i));</div><div class='del'>-extern PNG_EXPORT(void,png_save_int_32)</div><div class='del'>-   PNGARG((png_bytep buf, png_int_32 i));</div><div class='del'>-</div><div class='del'>-/* Place a 16-bit number into a buffer in PNG byte order.</div><div class='del'>- * The parameter is declared unsigned int, not png_uint_16,</div><div class='del'>- * just to avoid potential problems on pre-ANSI C compilers.</div><div class='add'>+/* Maintainer: Put new public prototypes here ^, in libpng.3, and project</div><div class='add'>+ * defs</div><div class='ctx'>  */</div><div class='del'>-extern PNG_EXPORT(void,png_save_uint_16)</div><div class='del'>-   PNGARG((png_bytep buf, unsigned int i));</div><div class='del'>-/* No png_save_int_16 -- may be added if there's a real need for it. */</div><div class='ctx'> </div><div class='del'>-/* ************************************************************************* */</div><div class='del'>-</div><div class='del'>-/* Various modes of operation.  Note that after an init, mode is set to</div><div class='del'>- * zero automatically when the structure is created.</div><div class='add'>+/* The last ordinal number (this is the *last* one already used; the next</div><div class='add'>+ * one to use is one more than this.)  Maintainer, remember to add an entry to</div><div class='add'>+ * scripts/symbols.def as well.</div><div class='ctx'>  */</div><div class='del'>-#define PNG_HAVE_IHDR               0x01</div><div class='del'>-#define PNG_HAVE_PLTE               0x02</div><div class='del'>-#define PNG_HAVE_IDAT               0x04</div><div class='del'>-#define PNG_AFTER_IDAT              0x08 /* Have complete zlib datastream */</div><div class='del'>-#define PNG_HAVE_IEND               0x10</div><div class='del'>-#define PNG_HAVE_gAMA               0x20</div><div class='del'>-#define PNG_HAVE_cHRM               0x40</div><div class='add'>+#ifdef PNG_EXPORT_LAST_ORDINAL</div><div class='add'>+  PNG_EXPORT_LAST_ORDINAL(220);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef __cplusplus</div><div class='ctx'> }</div><div class='head'>diff --git a/src/3rdparty/libpng/pngbar.jpg b/src/3rdparty/libpng/pngbar.jpg<br/>deleted file mode 100644<br/>index 70ba8d8..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngbar.jpg?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngbar.jpg</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/src/3rdparty/libpng/pngbar.png b/src/3rdparty/libpng/pngbar.png<br/>deleted file mode 100644<br/>index 49798c8..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngbar.png?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngbar.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/src/3rdparty/libpng/pngconf.h b/src/3rdparty/libpng/pngconf.h<br/>index 1f8bef8..d0b3454 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngconf.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngconf.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngconf.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngconf.h</a></div><div class='hunk'>@@ -1,9 +1,9 @@</div><div class='ctx'> </div><div class='ctx'> /* pngconf.h - machine configurable file for libpng</div><div class='ctx'>  *</div><div class='del'>- * libpng version 1.4.0 - January 3, 2010</div><div class='del'>- * For conditions of distribution and use, see copyright notice in png.h</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * libpng version 1.5.1 - February 3, 2011</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -22,280 +22,55 @@</div><div class='ctx'> #ifndef PNGCONF_H</div><div class='ctx'> #define PNGCONF_H</div><div class='ctx'> </div><div class='add'>+/* PNG_NO_LIMITS_H may be used to turn off the use of the standard C</div><div class='add'>+ * definition file for  machine specific limits, this may impact the</div><div class='add'>+ * correctness of the definitons below (see uses of INT_MAX).</div><div class='add'>+ */</div><div class='ctx'> #ifndef PNG_NO_LIMITS_H</div><div class='ctx'> #  include &lt;limits.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Added at libpng-1.2.9 */</div><div class='del'>-</div><div class='del'>-/* config.h is created by and PNG_CONFIGURE_LIBPNG is set by the "configure" script. */</div><div class='del'>-#ifdef PNG_CONFIGURE_LIBPNG</div><div class='del'>-#  ifdef HAVE_CONFIG_H</div><div class='del'>-#    include "config.h"</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Added at libpng-1.2.8</div><div class='del'>- *</div><div class='del'>- * PNG_USER_CONFIG has to be defined on the compiler command line. This</div><div class='del'>- * includes the resource compiler for Windows DLL configurations.</div><div class='add'>+/* For the memory copy APIs (i.e. the standard definitions of these),</div><div class='add'>+ * because this file defines png_memcpy and so on the base APIs must</div><div class='add'>+ * be defined here.</div><div class='ctx'>  */</div><div class='del'>-#ifdef PNG_USER_CONFIG</div><div class='del'>-#  ifndef PNG_USER_PRIVATEBUILD</div><div class='del'>-#    define PNG_USER_PRIVATEBUILD</div><div class='del'>-#  endif</div><div class='del'>-#  include "pngusr.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If you create a private DLL you need to define in "pngusr.h" the followings:</div><div class='del'>- * #define PNG_USER_PRIVATEBUILD &lt;Describes by whom and why this version of</div><div class='del'>- *        the DLL was built&gt;</div><div class='del'>- *  e.g. #define PNG_USER_PRIVATEBUILD "Build by MyCompany for xyz reasons."</div><div class='del'>- * #define PNG_USER_DLLFNAME_POSTFIX &lt;two-letter postfix that serve to</div><div class='del'>- *        distinguish your DLL from those of the official release. These</div><div class='del'>- *        correspond to the trailing letters that come after the version</div><div class='del'>- *        number and must match your private DLL name&gt;</div><div class='del'>- *  e.g. // private DLL "libpng13gx.dll"</div><div class='del'>- *       #define PNG_USER_DLLFNAME_POSTFIX "gx"</div><div class='del'>- *</div><div class='del'>- * The following macros are also at your disposal if you want to complete the</div><div class='del'>- * DLL VERSIONINFO structure.</div><div class='del'>- * - PNG_USER_VERSIONINFO_COMMENTS</div><div class='del'>- * - PNG_USER_VERSIONINFO_COMPANYNAME</div><div class='del'>- * - PNG_USER_VERSIONINFO_LEGALTRADEMARKS</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef __STDC__</div><div class='del'>-#  ifdef SPECIALBUILD</div><div class='del'>-#    pragma message("PNG_LIBPNG_SPECIALBUILD (and deprecated SPECIALBUILD)\</div><div class='del'>-     are now LIBPNG reserved macros. Use PNG_USER_PRIVATEBUILD instead.")</div><div class='del'>-#  endif</div><div class='del'>-</div><div class='del'>-#  ifdef PRIVATEBUILD</div><div class='del'>-#    pragma message("PRIVATEBUILD is deprecated.\</div><div class='del'>-     Use PNG_USER_PRIVATEBUILD instead.")</div><div class='del'>-#    define PNG_USER_PRIVATEBUILD PRIVATEBUILD</div><div class='del'>-#  endif</div><div class='del'>-#endif /* __STDC__ */</div><div class='del'>-</div><div class='del'>-/* End of material added to libpng-1.2.8 */</div><div class='del'>-</div><div class='del'>-#ifndef PNG_VERSION_INFO_ONLY</div><div class='del'>-</div><div class='del'>-/* This is the size of the compression buffer, and thus the size of</div><div class='del'>- * an IDAT chunk.  Make this whatever size you feel is best for your</div><div class='del'>- * machine.  One of these will be allocated per png_struct.  When this</div><div class='del'>- * is full, it writes the data to the disk, and does some other</div><div class='del'>- * calculations.  Making this an extremely small size will slow</div><div class='del'>- * the library down, but you may want to experiment to determine</div><div class='del'>- * where it becomes significant, if you are concerned with memory</div><div class='del'>- * usage.  Note that zlib allocates at least 32Kb also.  For readers,</div><div class='del'>- * this describes the size of the buffer available to read the data in.</div><div class='del'>- * Unless this gets smaller than the size of a row (compressed),</div><div class='del'>- * it should not make much difference how big this is.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef PNG_ZBUF_SIZE</div><div class='del'>-#  define PNG_ZBUF_SIZE 8192</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Enable if you want a write-only libpng */</div><div class='del'>-</div><div class='del'>-#ifndef PNG_NO_READ_SUPPORTED</div><div class='del'>-#  define PNG_READ_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Enable if you want a read-only libpng */</div><div class='del'>-</div><div class='del'>-#ifndef PNG_NO_WRITE_SUPPORTED</div><div class='del'>-#  define PNG_WRITE_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Enabled in 1.4.0. */</div><div class='del'>-#ifdef PNG_ALLOW_BENIGN_ERRORS</div><div class='del'>-#  define png_benign_error png_warning</div><div class='del'>-#  define png_chunk_benign_error png_chunk_warning</div><div class='add'>+#if defined(BSD) &amp;&amp; !defined(VXWORKS)</div><div class='add'>+#  include &lt;strings.h&gt;</div><div class='ctx'> #else</div><div class='del'>-#  ifndef PNG_BENIGN_ERRORS_SUPPORTED</div><div class='del'>-#    define png_benign_error png_error</div><div class='del'>-#    define png_chunk_benign_error png_chunk_error</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Added at libpng version 1.4.0 */</div><div class='del'>-#if !defined(PNG_NO_WARNINGS) &amp;&amp; !defined(PNG_WARNINGS_SUPPORTED)</div><div class='del'>-#  define PNG_WARNINGS_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Added at libpng version 1.4.0 */</div><div class='del'>-#if !defined(PNG_NO_ERROR_TEXT) &amp;&amp; !defined(PNG_ERROR_TEXT_SUPPORTED)</div><div class='del'>-#  define PNG_ERROR_TEXT_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Added at libpng version 1.4.0 */</div><div class='del'>-#if !defined(PNG_NO_CHECK_cHRM) &amp;&amp; !defined(PNG_CHECK_cHRM_SUPPORTED)</div><div class='del'>-#  define PNG_CHECK_cHRM_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Added at libpng version 1.4.0 */</div><div class='del'>-#if !defined(PNG_NO_ALIGNED_MEMORY) &amp;&amp; !defined(PNG_ALIGNED_MEMORY_SUPPORTED)</div><div class='del'>-#  define PNG_ALIGNED_MEMORY_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Enabled by default in 1.2.0.  You can disable this if you don't need to</div><div class='del'>-   support PNGs that are embedded in MNG datastreams */</div><div class='del'>-#ifndef PNG_NO_MNG_FEATURES</div><div class='del'>-#  ifndef PNG_MNG_FEATURES_SUPPORTED</div><div class='del'>-#    define PNG_MNG_FEATURES_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Added at libpng version 1.4.0 */</div><div class='del'>-#ifndef PNG_NO_FLOATING_POINT_SUPPORTED</div><div class='del'>-#  ifndef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-#    define PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-#  endif</div><div class='add'>+#  include &lt;string.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Added at libpng-1.4.0beta49 for testing (this test is no longer used</div><div class='del'>-   in libpng and png_calloc() is always present)</div><div class='del'>- */</div><div class='del'>-#define PNG_CALLOC_SUPPORTED</div><div class='del'>-</div><div class='del'>-/* If you are running on a machine where you cannot allocate more</div><div class='del'>- * than 64K of memory at once, uncomment this.  While libpng will not</div><div class='del'>- * normally need that much memory in a chunk (unless you load up a very</div><div class='del'>- * large file), zlib needs to know how big of a chunk it can use, and</div><div class='del'>- * libpng thus makes sure to check any memory allocation to verify it</div><div class='del'>- * will fit into memory.</div><div class='del'>-#define PNG_MAX_MALLOC_64K</div><div class='add'>+/* For png_FILE_p - this provides the standard definition of a</div><div class='add'>+ * FILE</div><div class='ctx'>  */</div><div class='del'>-#if defined(MAXSEG_64K) &amp;&amp; !defined(PNG_MAX_MALLOC_64K)</div><div class='del'>-#  define PNG_MAX_MALLOC_64K</div><div class='add'>+#ifdef PNG_STDIO_SUPPORTED</div><div class='add'>+#  include &lt;stdio.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Special munging to support doing things the 'cygwin' way:</div><div class='del'>- * 'Normal' png-on-win32 defines/defaults:</div><div class='del'>- *   PNG_BUILD_DLL -- building dll</div><div class='del'>- *   PNG_USE_DLL   -- building an application, linking to dll</div><div class='del'>- *   (no define)   -- building static library, or building an</div><div class='del'>- *                    application and linking to the static lib</div><div class='del'>- * 'Cygwin' defines/defaults:</div><div class='del'>- *   PNG_BUILD_DLL -- (ignored) building the dll</div><div class='del'>- *   (no define)   -- (ignored) building an application, linking to the dll</div><div class='del'>- *   PNG_STATIC    -- (ignored) building the static lib, or building an</div><div class='del'>- *                    application that links to the static lib.</div><div class='del'>- *   ALL_STATIC    -- (ignored) building various static libs, or building an</div><div class='del'>- *                    application that links to the static libs.</div><div class='del'>- * Thus,</div><div class='del'>- * a cygwin user should define either PNG_BUILD_DLL or PNG_STATIC, and</div><div class='del'>- * this bit of #ifdefs will define the 'correct' config variables based on</div><div class='del'>- * that. If a cygwin user *wants* to define 'PNG_USE_DLL' that's okay, but</div><div class='del'>- * unnecessary.</div><div class='del'>- *</div><div class='del'>- * Also, the precedence order is:</div><div class='del'>- *   ALL_STATIC (since we can't #undef something outside our namespace)</div><div class='del'>- *   PNG_BUILD_DLL</div><div class='del'>- *   PNG_STATIC</div><div class='del'>- *   (nothing) == PNG_USE_DLL</div><div class='del'>- *</div><div class='del'>- * CYGWIN (2002-01-20): The preceding is now obsolete. With the advent</div><div class='del'>- *   of auto-import in binutils, we no longer need to worry about</div><div class='del'>- *   __declspec(dllexport) / __declspec(dllimport) and friends.  Therefore,</div><div class='del'>- *   we don't need to worry about PNG_STATIC or ALL_STATIC when it comes</div><div class='del'>- *   to __declspec() stuff.  However, we DO need to worry about</div><div class='del'>- *   PNG_BUILD_DLL and PNG_STATIC because those change some defaults</div><div class='del'>- *   such as CONSOLE_IO.</div><div class='add'>+/* This controls optimization of the reading of 16 and 32 bit values</div><div class='add'>+ * from PNG files.  It can be set on a per-app-file basis - it</div><div class='add'>+ * just changes whether a macro is used to the function is called.</div><div class='add'>+ * The library builder sets the default, if read functions are not</div><div class='add'>+ * built into the library the macro implementation is forced on.</div><div class='ctx'>  */</div><div class='del'>-#ifdef __CYGWIN__</div><div class='del'>-#  ifdef ALL_STATIC</div><div class='del'>-#    ifdef PNG_BUILD_DLL</div><div class='del'>-#      undef PNG_BUILD_DLL</div><div class='del'>-#    endif</div><div class='del'>-#    ifdef PNG_USE_DLL</div><div class='del'>-#      undef PNG_USE_DLL</div><div class='del'>-#    endif</div><div class='del'>-#    ifdef PNG_DLL</div><div class='del'>-#      undef PNG_DLL</div><div class='del'>-#    endif</div><div class='del'>-#    ifndef PNG_STATIC</div><div class='del'>-#      define PNG_STATIC</div><div class='del'>-#    endif</div><div class='del'>-#  else</div><div class='del'>-#    ifdef PNG_BUILD_DLL</div><div class='del'>-#      ifdef PNG_STATIC</div><div class='del'>-#        undef PNG_STATIC</div><div class='del'>-#      endif</div><div class='del'>-#      ifdef PNG_USE_DLL</div><div class='del'>-#        undef PNG_USE_DLL</div><div class='del'>-#      endif</div><div class='del'>-#      ifndef PNG_DLL</div><div class='del'>-#        define PNG_DLL</div><div class='del'>-#      endif</div><div class='del'>-#    else</div><div class='del'>-#      ifdef PNG_STATIC</div><div class='del'>-#        ifdef PNG_USE_DLL</div><div class='del'>-#          undef PNG_USE_DLL</div><div class='del'>-#        endif</div><div class='del'>-#        ifdef PNG_DLL</div><div class='del'>-#          undef PNG_DLL</div><div class='del'>-#        endif</div><div class='del'>-#      else</div><div class='del'>-#        ifndef PNG_USE_DLL</div><div class='del'>-#          define PNG_USE_DLL</div><div class='del'>-#        endif</div><div class='del'>-#        ifndef PNG_DLL</div><div class='del'>-#          define PNG_DLL</div><div class='del'>-#        endif</div><div class='del'>-#      endif</div><div class='del'>-#    endif</div><div class='add'>+#ifndef PNG_READ_INT_FUNCTIONS_SUPPORTED</div><div class='add'>+#  define PNG_USE_READ_MACROS</div><div class='add'>+#endif</div><div class='add'>+#if !defined(PNG_NO_USE_READ_MACROS) &amp;&amp; !defined(PNG_USE_READ_MACROS)</div><div class='add'>+#  if PNG_DEFAULT_READ_MACROS</div><div class='add'>+#    define PNG_USE_READ_MACROS</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* This protects us against compilers that run on a windowing system</div><div class='del'>- * and thus don't have or would rather us not use the stdio types:</div><div class='del'>- * stdin, stdout, and stderr.  The only one currently used is stderr</div><div class='del'>- * in png_error() and png_warning().  #defining PNG_NO_CONSOLE_IO will</div><div class='del'>- * prevent these from being compiled and used. #defining PNG_NO_STDIO</div><div class='del'>- * will also prevent these, plus will prevent the entire set of stdio</div><div class='del'>- * macros and functions (FILE *, printf, etc.) from being compiled and used,</div><div class='del'>- * unless (PNG_DEBUG &gt; 0) has been #defined.</div><div class='add'>+/* COMPILER SPECIFIC OPTIONS.</div><div class='ctx'>  *</div><div class='del'>- * #define PNG_NO_CONSOLE_IO</div><div class='del'>- * #define PNG_NO_STDIO</div><div class='add'>+ * These options are provided so that a variety of difficult compilers</div><div class='add'>+ * can be used.  Some are fixed at build time (e.g. PNG_API_RULE</div><div class='add'>+ * below) but still have compiler specific implementations, others</div><div class='add'>+ * may be changed on a per-file basis when compiling against libpng.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#if !defined(PNG_NO_STDIO) &amp;&amp; !defined(PNG_STDIO_SUPPORTED)</div><div class='del'>-#  define PNG_STDIO_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef PNG_BUILD_DLL</div><div class='del'>-#  if !defined(PNG_CONSOLE_IO_SUPPORTED) &amp;&amp; !defined(PNG_NO_CONSOLE_IO)</div><div class='del'>-#    define PNG_NO_CONSOLE_IO</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#  ifdef PNG_NO_STDIO</div><div class='del'>-#    ifndef PNG_NO_CONSOLE_IO</div><div class='del'>-#      define PNG_NO_CONSOLE_IO</div><div class='del'>-#    endif</div><div class='del'>-#    ifdef PNG_DEBUG</div><div class='del'>-#      if (PNG_DEBUG &gt; 0)</div><div class='del'>-#        include &lt;stdio.h&gt;</div><div class='del'>-#      endif</div><div class='del'>-#    endif</div><div class='del'>-#  else</div><div class='del'>-#    include &lt;stdio.h&gt;</div><div class='del'>-#  endif</div><div class='del'>-</div><div class='del'>-#if !(defined PNG_NO_CONSOLE_IO) &amp;&amp; !defined(PNG_CONSOLE_IO_SUPPORTED)</div><div class='del'>-#  define PNG_CONSOLE_IO_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* This macro protects us against machines that don't have function</div><div class='add'>+/* The PNGARG macro protects us against machines that don't have function</div><div class='ctx'>  * prototypes (ie K&amp;R style headers).  If your compiler does not handle</div><div class='ctx'>  * function prototypes, define this macro and use the included ansi2knr.</div><div class='ctx'>  * I've always been able to use _NO_PROTO as the indicator, but you may</div><div class='hunk'>@@ -304,747 +79,397 @@</div><div class='ctx'>  */</div><div class='ctx'> #ifndef PNGARG</div><div class='ctx'> </div><div class='del'>-#ifdef OF /* zlib prototype munger */</div><div class='del'>-#  define PNGARG(arglist) OF(arglist)</div><div class='del'>-#else</div><div class='add'>+#  ifdef OF /* zlib prototype munger */</div><div class='add'>+#    define PNGARG(arglist) OF(arglist)</div><div class='add'>+#  else</div><div class='ctx'> </div><div class='del'>-#ifdef _NO_PROTO</div><div class='del'>-#  define PNGARG(arglist) ()</div><div class='del'>-#else</div><div class='del'>-#  define PNGARG(arglist) arglist</div><div class='del'>-#endif /* _NO_PROTO */</div><div class='add'>+#    ifdef _NO_PROTO</div><div class='add'>+#      define PNGARG(arglist) ()</div><div class='add'>+#    else</div><div class='add'>+#      define PNGARG(arglist) arglist</div><div class='add'>+#    endif /* _NO_PROTO */</div><div class='ctx'> </div><div class='del'>-#endif /* OF */</div><div class='add'>+#  endif /* OF */</div><div class='ctx'> </div><div class='ctx'> #endif /* PNGARG */</div><div class='ctx'> </div><div class='del'>-/* Try to determine if we are compiling on a Mac.  Note that testing for</div><div class='del'>- * just __MWERKS__ is not good enough, because the Codewarrior is now used</div><div class='del'>- * on non-Mac platforms.</div><div class='del'>- */</div><div class='del'>-#ifndef MACOS</div><div class='del'>-#  if (defined(__MWERKS__) &amp;&amp; defined(macintosh)) || defined(applec) || \</div><div class='del'>-      defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)</div><div class='del'>-#    define MACOS</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Enough people need this for various reasons to include it here */</div><div class='del'>-#if !defined(MACOS) &amp;&amp; !defined(RISCOS) &amp;&amp; !defined(_WIN32_WCE)</div><div class='del'>-#  include &lt;sys/types.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* PNG_SETJMP_NOT_SUPPORTED and PNG_NO_SETJMP_SUPPORTED are deprecated. */</div><div class='del'>-#if !defined(PNG_NO_SETJMP) &amp;&amp; \</div><div class='del'>-    !defined(PNG_SETJMP_NOT_SUPPORTED) &amp;&amp; !defined(PNG_NO_SETJMP_SUPPORTED)</div><div class='del'>-#  define PNG_SETJMP_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_SETJMP_SUPPORTED</div><div class='del'>-/* This is an attempt to force a single setjmp behaviour on Linux.  If</div><div class='del'>- * the X config stuff didn't define _BSD_SOURCE we wouldn't need this.</div><div class='add'>+/* Function calling conventions.</div><div class='add'>+ * =============================</div><div class='add'>+ * Normally it is not necessary to specify to the compiler how to call</div><div class='add'>+ * a function - it just does it - however on x86 systems derived from</div><div class='add'>+ * Microsoft and Borland C compilers ('IBM PC', 'DOS', 'Windows' systems</div><div class='add'>+ * and some others) there are multiple ways to call a function and the</div><div class='add'>+ * default can be changed on the compiler command line.  For this reason</div><div class='add'>+ * libpng specifies the calling convention of every exported function and</div><div class='add'>+ * every function called via a user supplied function pointer.  This is</div><div class='add'>+ * done in this file by defining the following macros:</div><div class='ctx'>  *</div><div class='del'>- * You can bypass this test if you know that your application uses exactly</div><div class='del'>- * the same setjmp.h that was included when libpng was built.  Only define</div><div class='del'>- * PNG_SKIP_SETJMP_CHECK while building your application, prior to the</div><div class='del'>- * application's '#include "png.h"'. Don't define PNG_SKIP_SETJMP_CHECK</div><div class='del'>- * while building a separate libpng library for general use.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#  ifndef PNG_SKIP_SETJMP_CHECK</div><div class='del'>-#    ifdef __linux__</div><div class='del'>-#      ifdef _BSD_SOURCE</div><div class='del'>-#        define PNG_SAVE_BSD_SOURCE</div><div class='del'>-#        undef _BSD_SOURCE</div><div class='del'>-#      endif</div><div class='del'>-#      ifdef _SETJMP_H</div><div class='del'>-       /* If you encounter a compiler error here, see the explanation</div><div class='del'>-        * near the end of INSTALL.</div><div class='del'>-        */</div><div class='del'>-           __pngconf.h__ in libpng already includes setjmp.h;</div><div class='del'>-           __dont__ include it again.;</div><div class='del'>-#      endif</div><div class='del'>-#    endif /* __linux__ */</div><div class='del'>-#  endif /* PNG_SKIP_SETJMP_CHECK */</div><div class='del'>-</div><div class='del'>-   /* Include setjmp.h for error handling */</div><div class='del'>-#  include &lt;setjmp.h&gt;</div><div class='add'>+ * PNGAPI    Calling convention for exported functions.</div><div class='add'>+ * PNGCBAPI  Calling convention for user provided (callback) functions.</div><div class='add'>+ * PNGCAPI   Calling convention used by the ANSI-C library (required</div><div class='add'>+ *           for longjmp callbacks and sometimes used internally to</div><div class='add'>+ *           specify the calling convention for zlib).</div><div class='add'>+ *</div><div class='add'>+ * These macros should never be overridden.  If it is necessary to</div><div class='add'>+ * change calling convention in a private build this can be done</div><div class='add'>+ * by setting PNG_API_RULE (which defaults to 0) to one of the values</div><div class='add'>+ * below to select the correct 'API' variants.</div><div class='add'>+ *</div><div class='add'>+ * PNG_API_RULE=0 Use PNGCAPI - the 'C' calling convention - throughout.</div><div class='add'>+ *                This is correct in every known environment.</div><div class='add'>+ * PNG_API_RULE=1 Use the operating system convention for PNGAPI and</div><div class='add'>+ *                the 'C' calling convention (from PNGCAPI) for</div><div class='add'>+ *                callbacks (PNGCBAPI).  This is no longer required</div><div class='add'>+ *                in any known environment - if it has to be used</div><div class='add'>+ *                please post an explanation of the problem to the</div><div class='add'>+ *                libpng mailing list.</div><div class='add'>+ *</div><div class='add'>+ * These cases only differ if the operating system does not use the C</div><div class='add'>+ * calling convention, at present this just means the above cases</div><div class='add'>+ * (x86 DOS/Windows sytems) and, even then, this does not apply to</div><div class='add'>+ * Cygwin running on those systems.</div><div class='add'>+ *</div><div class='add'>+ * Note that the value must be defined in pnglibconf.h so that what</div><div class='add'>+ * the application uses to call the library matches the conventions</div><div class='add'>+ * set when building the library.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Symbol export</div><div class='add'>+ * =============</div><div class='add'>+ * When building a shared library it is almost always necessary to tell</div><div class='add'>+ * the compiler which symbols to export.  The png.h macro 'PNG_EXPORT'</div><div class='add'>+ * is used to mark the symbols.  On some systems these symbols can be</div><div class='add'>+ * extracted at link time and need no special processing by the compiler,</div><div class='add'>+ * on other systems the symbols are flagged by the compiler and just</div><div class='add'>+ * the declaration requires a special tag applied (unfortunately) in a</div><div class='add'>+ * compiler dependent way.  Some systems can do either.</div><div class='add'>+ *</div><div class='add'>+ * A small number of older systems also require a symbol from a DLL to</div><div class='add'>+ * be flagged to the program that calls it.  This is a problem because</div><div class='add'>+ * we do not know in the header file included by application code that</div><div class='add'>+ * the symbol will come from a shared library, as opposed to a statically</div><div class='add'>+ * linked one.  For this reason the application must tell us by setting</div><div class='add'>+ * the magic flag PNG_USE_DLL to turn on the special processing before</div><div class='add'>+ * it includes png.h.</div><div class='add'>+ *</div><div class='add'>+ * Four additional macros are used to make this happen:</div><div class='add'>+ *</div><div class='add'>+ * PNG_IMPEXP The magic (if any) to cause a symbol to be exported from</div><div class='add'>+ *            the build or imported if PNG_USE_DLL is set - compiler</div><div class='add'>+ *            and system specific.</div><div class='add'>+ *</div><div class='add'>+ * PNG_EXPORT_TYPE(type) A macro that pre or appends PNG_IMPEXP to</div><div class='add'>+ *                       'type', compiler specific.</div><div class='add'>+ *</div><div class='add'>+ * PNG_DLL_EXPORT Set to the magic to use during a libpng build to</div><div class='add'>+ *                make a symbol exported from the DLL.</div><div class='add'>+ *</div><div class='add'>+ * PNG_DLL_IMPORT Set to the magic to force the libpng symbols to come</div><div class='add'>+ *                from a DLL - used to define PNG_IMPEXP when</div><div class='add'>+ *                PNG_USE_DLL is set.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* System specific discovery.</div><div class='add'>+ * ==========================</div><div class='add'>+ * This code is used at build time to find PNG_IMPEXP, the API settings</div><div class='add'>+ * and PNG_EXPORT_TYPE(), it may also set a macro to indicate the DLL</div><div class='add'>+ * import processing is possible.  On Windows/x86 systems it also sets</div><div class='add'>+ * compiler-specific macros to the values required to change the calling</div><div class='add'>+ * conventions of the various functions.</div><div class='add'>+ */</div><div class='add'>+#if ( defined(_Windows) || defined(_WINDOWS) || defined(WIN32) ||\</div><div class='add'>+      defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) ) &amp;&amp;\</div><div class='add'>+    ( defined(_X86_) || defined(_X64_) || defined(_M_IX86) ||\</div><div class='add'>+      defined(_M_X64) || defined(_M_IA64) )</div><div class='add'>+  /* Windows system (DOS doesn't support DLLs) running on x86/x64.  Includes</div><div class='add'>+   * builds under Cygwin or MinGW.  Also includes Watcom builds but these need</div><div class='add'>+   * special treatment because they are not compatible with GCC or Visual C</div><div class='add'>+   * because of different calling conventions.</div><div class='add'>+   */</div><div class='add'>+#  if PNG_API_RULE == 2</div><div class='add'>+    /* If this line results in an error, either because __watcall is not</div><div class='add'>+     * understood or because of a redefine just below you cannot use *this*</div><div class='add'>+     * build of the library with the compiler you are using.  *This* build was</div><div class='add'>+     * build using Watcom and applications must also be built using Watcom!</div><div class='add'>+     */</div><div class='add'>+#    define PNGCAPI __watcall</div><div class='add'>+#  endif</div><div class='ctx'> </div><div class='del'>-#  ifdef __linux__</div><div class='del'>-#    ifdef PNG_SAVE_BSD_SOURCE</div><div class='del'>-#      ifdef _BSD_SOURCE</div><div class='del'>-#        undef _BSD_SOURCE</div><div class='del'>-#      endif</div><div class='del'>-#      define _BSD_SOURCE</div><div class='del'>-#      undef PNG_SAVE_BSD_SOURCE</div><div class='add'>+#  if defined(__GNUC__) || (defined (_MSC_VER) &amp;&amp; (_MSC_VER &gt;= 800)) || defined(__WINSCW__)</div><div class='add'>+#    define PNGCAPI __cdecl</div><div class='add'>+#    if PNG_API_RULE == 1</div><div class='add'>+#      define PNGAPI __stdcall</div><div class='ctx'> #    endif</div><div class='del'>-#  endif /* __linux__ */</div><div class='del'>-#endif /* PNG_SETJMP_SUPPORTED */</div><div class='del'>-</div><div class='del'>-#if defined(BSD) &amp;&amp; !defined(VXWORKS)</div><div class='del'>-#  include &lt;strings.h&gt;</div><div class='del'>-#else</div><div class='del'>-#  include &lt;string.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Other defines for things like memory and the like can go here.  */</div><div class='del'>-</div><div class='del'>-/* This controls how fine the dithering gets.  As this allocates</div><div class='del'>- * a largish chunk of memory (32K), those who are not as concerned</div><div class='del'>- * with dithering quality can decrease some or all of these.</div><div class='del'>- */</div><div class='del'>-#ifndef PNG_DITHER_RED_BITS</div><div class='del'>-#  define PNG_DITHER_RED_BITS 5</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_DITHER_GREEN_BITS</div><div class='del'>-#  define PNG_DITHER_GREEN_BITS 5</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_DITHER_BLUE_BITS</div><div class='del'>-#  define PNG_DITHER_BLUE_BITS 5</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* This controls how fine the gamma correction becomes when you</div><div class='del'>- * are only interested in 8 bits anyway.  Increasing this value</div><div class='del'>- * results in more memory being used, and more pow() functions</div><div class='del'>- * being called to fill in the gamma tables.  Don't set this value</div><div class='del'>- * less then 8, and even that may not work (I haven't tested it).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef PNG_MAX_GAMMA_8</div><div class='del'>-#  define PNG_MAX_GAMMA_8 11</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* This controls how much a difference in gamma we can tolerate before</div><div class='del'>- * we actually start doing gamma conversion.</div><div class='del'>- */</div><div class='del'>-#ifndef PNG_GAMMA_THRESHOLD</div><div class='del'>-#  define PNG_GAMMA_THRESHOLD 0.05</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* The following uses const char * instead of char * for error</div><div class='del'>- * and warning message functions, so some compilers won't complain.</div><div class='del'>- * If you do not want to use const, define PNG_NO_CONST here.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef PNG_CONST</div><div class='del'>-#  ifndef PNG_NO_CONST</div><div class='del'>-#    define PNG_CONST const</div><div class='ctx'> #  else</div><div class='del'>-#    define PNG_CONST</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* The following defines give you the ability to remove code from the</div><div class='del'>- * library that you will not be using.  I wish I could figure out how to</div><div class='del'>- * automate this, but I can't do that without making it seriously hard</div><div class='del'>- * on the users.  So if you are not using an ability, change the #define</div><div class='del'>- * to and #undef, and that part of the library will not be compiled.  If</div><div class='del'>- * your linker can't find a function, you may want to make sure the</div><div class='del'>- * ability is defined here.  Some of these depend upon some others being</div><div class='del'>- * defined.  I haven't figured out all the interactions here, so you may</div><div class='del'>- * have to experiment awhile to get everything to compile.  If you are</div><div class='del'>- * creating or using a shared library, you probably shouldn't touch this,</div><div class='del'>- * as it will affect the size of the structures, and this will cause bad</div><div class='del'>- * things to happen if the library and/or application ever change.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Any features you will not be using can be undef'ed here */</div><div class='del'>-</div><div class='del'>-/* GR-P, 0.96a: Set "*TRANSFORMS_SUPPORTED as default but allow user</div><div class='del'>- * to turn it off with PNG_NO_READ|WRITE_TRANSFORMS on the compile line,</div><div class='del'>- * then pick and choose which ones to define without having to edit this</div><div class='del'>- * file. It is safe to use the PNG_NO_READ|WRITE_TRANSFORMS</div><div class='del'>- * if you only want to have a png-compliant reader/writer but don't need</div><div class='del'>- * any of the extra transformations.  This saves about 80 kbytes in a</div><div class='del'>- * typical installation of the library. (PNG_NO_* form added in version</div><div class='del'>- * 1.0.1c, for consistency; PNG_*_TRANSFORMS_NOT_SUPPORTED deprecated in</div><div class='del'>- * 1.4.0)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Ignore attempt to turn off both floating and fixed point support */</div><div class='del'>-#if !defined(PNG_FLOATING_POINT_SUPPORTED) || \</div><div class='del'>-    !defined(PNG_NO_FIXED_POINT_SUPPORTED)</div><div class='del'>-#  define PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_READ_SUPPORTED</div><div class='del'>-</div><div class='del'>-/* PNG_READ_TRANSFORMS_NOT_SUPPORTED is deprecated. */</div><div class='del'>-#if !defined(PNG_READ_TRANSFORMS_NOT_SUPPORTED) &amp;&amp; \</div><div class='del'>-      !defined(PNG_NO_READ_TRANSFORMS)</div><div class='del'>-#  define PNG_READ_TRANSFORMS_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_READ_TRANSFORMS_SUPPORTED</div><div class='del'>-#  ifndef PNG_NO_READ_EXPAND</div><div class='del'>-#    define PNG_READ_EXPAND_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_READ_SHIFT</div><div class='del'>-#    define PNG_READ_SHIFT_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_READ_PACK</div><div class='del'>-#    define PNG_READ_PACK_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_READ_BGR</div><div class='del'>-#    define PNG_READ_BGR_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_READ_SWAP</div><div class='del'>-#    define PNG_READ_SWAP_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_READ_PACKSWAP</div><div class='del'>-#    define PNG_READ_PACKSWAP_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_READ_INVERT</div><div class='del'>-#    define PNG_READ_INVERT_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#if 0 /* removed from libpng-1.4.0 */</div><div class='del'>-#  ifndef PNG_NO_READ_DITHER</div><div class='del'>-#    define PNG_READ_DITHER_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif /* 0 */</div><div class='del'>-#  ifndef PNG_NO_READ_BACKGROUND</div><div class='del'>-#    define PNG_READ_BACKGROUND_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_READ_16_TO_8</div><div class='del'>-#    define PNG_READ_16_TO_8_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_READ_FILLER</div><div class='del'>-#    define PNG_READ_FILLER_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_READ_GAMMA</div><div class='del'>-#    define PNG_READ_GAMMA_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_READ_GRAY_TO_RGB</div><div class='del'>-#    define PNG_READ_GRAY_TO_RGB_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_READ_SWAP_ALPHA</div><div class='del'>-#    define PNG_READ_SWAP_ALPHA_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_READ_INVERT_ALPHA</div><div class='del'>-#    define PNG_READ_INVERT_ALPHA_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_READ_STRIP_ALPHA</div><div class='del'>-#    define PNG_READ_STRIP_ALPHA_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_READ_USER_TRANSFORM</div><div class='del'>-#    define PNG_READ_USER_TRANSFORM_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_READ_RGB_TO_GRAY</div><div class='del'>-#    define PNG_READ_RGB_TO_GRAY_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif /* PNG_READ_TRANSFORMS_SUPPORTED */</div><div class='del'>-</div><div class='del'>-/* PNG_PROGRESSIVE_READ_NOT_SUPPORTED is deprecated. */</div><div class='del'>-#if !defined(PNG_NO_PROGRESSIVE_READ) &amp;&amp; \</div><div class='del'>- !defined(PNG_PROGRESSIVE_READ_NOT_SUPPORTED)  /* if you don't do progressive */</div><div class='del'>-#  define PNG_PROGRESSIVE_READ_SUPPORTED     /* reading.  This is not talking */</div><div class='del'>-#endif                               /* about interlacing capability!  You'll */</div><div class='del'>-            /* still have interlacing unless you change the following define: */</div><div class='del'>-</div><div class='del'>-#define PNG_READ_INTERLACING_SUPPORTED /* required for PNG-compliant decoders */</div><div class='del'>-</div><div class='del'>-/* PNG_NO_SEQUENTIAL_READ_SUPPORTED is deprecated. */</div><div class='del'>-#if !defined(PNG_NO_SEQUENTIAL_READ) &amp;&amp; \</div><div class='del'>-    !defined(PNG_SEQUENTIAL_READ_SUPPORTED) &amp;&amp; \</div><div class='del'>-    !defined(PNG_NO_SEQUENTIAL_READ_SUPPORTED)</div><div class='del'>-#  define PNG_SEQUENTIAL_READ_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef PNG_NO_READ_COMPOSITE_NODIV</div><div class='del'>-#  ifndef PNG_NO_READ_COMPOSITED_NODIV  /* libpng-1.0.x misspelling */</div><div class='del'>-#    define PNG_READ_COMPOSITE_NODIV_SUPPORTED   /* well tested on Intel, SGI */</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='add'>+    /* An older compiler, or one not detected (erroneously) above,</div><div class='add'>+     * if necessary override on the command line to get the correct</div><div class='add'>+     * variants for the compiler.</div><div class='add'>+     */</div><div class='add'>+#    ifndef PNGCAPI</div><div class='add'>+#      define PNGCAPI _cdecl</div><div class='add'>+#    endif</div><div class='add'>+#    if PNG_API_RULE == 1 &amp;&amp; !defined(PNGAPI)</div><div class='add'>+#      define PNGAPI _stdcall</div><div class='add'>+#    endif</div><div class='add'>+#  endif /* compiler/api */</div><div class='add'>+  /* NOTE: PNGCBAPI always defaults to PNGCAPI. */</div><div class='ctx'> </div><div class='del'>-#if !defined(PNG_NO_GET_INT_32) || defined(PNG_READ_oFFS_SUPPORTED) || \</div><div class='del'>-    defined(PNG_READ_pCAL_SUPPORTED)</div><div class='del'>-#  ifndef PNG_GET_INT_32_SUPPORTED</div><div class='del'>-#    define PNG_GET_INT_32_SUPPORTED</div><div class='add'>+#  if defined(PNGAPI) &amp;&amp; !defined(PNG_USER_PRIVATEBUILD)</div><div class='add'>+   ERROR: PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed</div><div class='ctx'> #  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* PNG_READ_SUPPORTED */</div><div class='del'>-</div><div class='del'>-#ifdef PNG_WRITE_SUPPORTED</div><div class='del'>-</div><div class='del'>-/* PNG_WRITE_TRANSFORMS_NOT_SUPPORTED is deprecated. */</div><div class='del'>-#if !defined(PNG_WRITE_TRANSFORMS_NOT_SUPPORTED) &amp;&amp; \</div><div class='del'>-    !defined(PNG_NO_WRITE_TRANSFORMS)</div><div class='del'>-#  define PNG_WRITE_TRANSFORMS_SUPPORTED</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED</div><div class='del'>-#  ifndef PNG_NO_WRITE_SHIFT</div><div class='del'>-#    define PNG_WRITE_SHIFT_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_WRITE_PACK</div><div class='del'>-#    define PNG_WRITE_PACK_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_WRITE_BGR</div><div class='del'>-#    define PNG_WRITE_BGR_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_WRITE_SWAP</div><div class='del'>-#    define PNG_WRITE_SWAP_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_WRITE_PACKSWAP</div><div class='del'>-#    define PNG_WRITE_PACKSWAP_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_WRITE_INVERT</div><div class='del'>-#    define PNG_WRITE_INVERT_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_WRITE_FILLER</div><div class='del'>-#    define PNG_WRITE_FILLER_SUPPORTED   /* same as WRITE_STRIP_ALPHA */</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_WRITE_SWAP_ALPHA</div><div class='del'>-#    define PNG_WRITE_SWAP_ALPHA_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_WRITE_INVERT_ALPHA</div><div class='del'>-#    define PNG_WRITE_INVERT_ALPHA_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_NO_WRITE_USER_TRANSFORM</div><div class='del'>-#    define PNG_WRITE_USER_TRANSFORM_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif /* PNG_WRITE_TRANSFORMS_SUPPORTED */</div><div class='add'>+#  if (defined(_MSC_VER) &amp;&amp; _MSC_VER &lt; 800) ||\</div><div class='add'>+      (defined(__BORLANDC__) &amp;&amp; __BORLANDC__ &lt; 0x500)</div><div class='add'>+    /* older Borland and MSC</div><div class='add'>+     * compilers used '__export' and required this to be after</div><div class='add'>+     * the type.</div><div class='add'>+     */</div><div class='add'>+#    ifndef PNG_EXPORT_TYPE</div><div class='add'>+#      define PNG_EXPORT_TYPE(type) type PNG_IMPEXP</div><div class='add'>+#    endif</div><div class='add'>+#    define PNG_DLL_EXPORT __export</div><div class='add'>+#  else /* newer compiler */</div><div class='add'>+#    define PNG_DLL_EXPORT __declspec(dllexport)</div><div class='add'>+#    ifndef PNG_DLL_IMPORT</div><div class='add'>+#      define PNG_DLL_IMPORT __declspec(dllimport)</div><div class='add'>+#    endif</div><div class='add'>+#  endif /* compiler */</div><div class='add'>+</div><div class='add'>+#else /* !Windows/x86 */</div><div class='add'>+#  if (defined(__IBMC__) || defined(__IBMCPP__)) &amp;&amp; defined(__OS2__)</div><div class='add'>+#    define PNGAPI _System</div><div class='add'>+#  else /* !Windows/x86 &amp;&amp; !OS/2 */</div><div class='add'>+    /* Use the defaults, or define PNG*API on the command line (but</div><div class='add'>+     * this will have to be done for every compile!)</div><div class='add'>+     */</div><div class='add'>+#  endif /* other system, !OS/2 */</div><div class='add'>+#endif /* !Windows/x86 */</div><div class='ctx'> </div><div class='del'>-#if !defined(PNG_NO_WRITE_INTERLACING_SUPPORTED) &amp;&amp; \</div><div class='del'>-    !defined(PNG_WRITE_INTERLACING_SUPPORTED)</div><div class='del'>-    /* This is not required for PNG-compliant encoders, but can cause</div><div class='del'>-     * trouble if left undefined</div><div class='del'>-    */</div><div class='del'>-#  define PNG_WRITE_INTERLACING_SUPPORTED</div><div class='add'>+/* Now do all the defaulting . */</div><div class='add'>+#ifndef PNGCAPI</div><div class='add'>+#  define PNGCAPI</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#if !defined(PNG_NO_WRITE_WEIGHTED_FILTER) &amp;&amp; \</div><div class='del'>-    !defined(PNG_WRITE_WEIGHTED_FILTER) &amp;&amp; \</div><div class='del'>-     defined(PNG_FLOATING_POINT_SUPPORTED)</div><div class='del'>-#  define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED</div><div class='add'>+#ifndef PNGCBAPI</div><div class='add'>+#  define PNGCBAPI PNGCAPI</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#ifndef PNG_NO_WRITE_FLUSH</div><div class='del'>-#  define PNG_WRITE_FLUSH_SUPPORTED</div><div class='add'>+#ifndef PNGAPI</div><div class='add'>+#  define PNGAPI PNGCAPI</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if !defined(PNG_NO_SAVE_INT_32) || defined(PNG_WRITE_oFFS_SUPPORTED) || \</div><div class='del'>-    defined(PNG_WRITE_pCAL_SUPPORTED)</div><div class='del'>-#  ifndef PNG_SAVE_INT_32_SUPPORTED</div><div class='del'>-#    define PNG_SAVE_INT_32_SUPPORTED</div><div class='add'>+/* The default for PNG_IMPEXP depends on whether the library is</div><div class='add'>+ * being built or used.</div><div class='add'>+ */</div><div class='add'>+#ifndef PNG_IMPEXP</div><div class='add'>+#  ifdef PNGLIB_BUILD</div><div class='add'>+    /* Building the library */</div><div class='add'>+#    if (defined(DLL_EXPORT)/*from libtool*/ ||\</div><div class='add'>+        defined(_WINDLL) || defined(_DLL) || defined(__DLL__) ||\</div><div class='add'>+        defined(_USRDLL) ||\</div><div class='add'>+        defined(PNG_BUILD_DLL)) &amp;&amp; defined(PNG_DLL_EXPORT)</div><div class='add'>+      /* Building a DLL. */</div><div class='add'>+#      define PNG_IMPEXP PNG_DLL_EXPORT</div><div class='add'>+#    endif /* DLL */</div><div class='add'>+#  else</div><div class='add'>+    /* Using the library */</div><div class='add'>+#    if defined(PNG_USE_DLL) &amp;&amp; defined(PNG_DLL_IMPORT)</div><div class='add'>+      /* This forces use of a DLL, disallowing static linking */</div><div class='add'>+#      define PNG_IMPEXP PNG_DLL_IMPORT</div><div class='add'>+#    endif</div><div class='ctx'> #  endif</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-#endif /* PNG_WRITE_SUPPORTED */</div><div class='del'>-</div><div class='del'>-#define PNG_NO_ERROR_NUMBERS</div><div class='add'>+#   if !defined(PNG_IMPEXP)</div><div class='add'>+#       include &lt;qconfig.h&gt;</div><div class='add'>+#       if defined(QT_VISIBILITY_AVAILABLE)</div><div class='add'>+#           define PNG_IMPEXP __attribute__((visibility("default")))</div><div class='add'>+#       endif</div><div class='add'>+#   endif</div><div class='ctx'> </div><div class='del'>-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \</div><div class='del'>-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)</div><div class='del'>-#  ifndef PNG_NO_USER_TRANSFORM_PTR</div><div class='del'>-#    define PNG_USER_TRANSFORM_PTR_SUPPORTED</div><div class='add'>+#  ifndef PNG_IMPEXP</div><div class='add'>+#    define PNG_IMPEXP</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(PNG_STDIO_SUPPORTED) &amp;&amp; !defined(PNG_TIME_RFC1123_SUPPORTED)</div><div class='del'>-#  define PNG_TIME_RFC1123_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* This adds extra functions in pngget.c for accessing data from the</div><div class='del'>- * info pointer (added in version 0.99)</div><div class='del'>- * png_get_image_width()</div><div class='del'>- * png_get_image_height()</div><div class='del'>- * png_get_bit_depth()</div><div class='del'>- * png_get_color_type()</div><div class='del'>- * png_get_compression_type()</div><div class='del'>- * png_get_filter_type()</div><div class='del'>- * png_get_interlace_type()</div><div class='del'>- * png_get_pixel_aspect_ratio()</div><div class='del'>- * png_get_pixels_per_meter()</div><div class='del'>- * png_get_x_offset_pixels()</div><div class='del'>- * png_get_y_offset_pixels()</div><div class='del'>- * png_get_x_offset_microns()</div><div class='del'>- * png_get_y_offset_microns()</div><div class='add'>+/* THe following complexity is concerned with getting the 'attributes' of the</div><div class='add'>+ * declared function in the correct place.  This potentially requires a separate</div><div class='add'>+ * PNG_EXPORT function for every compiler.</div><div class='ctx'>  */</div><div class='del'>-#if !defined(PNG_NO_EASY_ACCESS) &amp;&amp; !defined(PNG_EASY_ACCESS_SUPPORTED)</div><div class='del'>-#  define PNG_EASY_ACCESS_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Added at libpng-1.2.0 */</div><div class='del'>-#if !defined(PNG_NO_USER_MEM) &amp;&amp; !defined(PNG_USER_MEM_SUPPORTED)</div><div class='del'>-#  define PNG_USER_MEM_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Added at libpng-1.2.6 */</div><div class='del'>-#ifndef PNG_SET_USER_LIMITS_SUPPORTED</div><div class='del'>-#  ifndef PNG_NO_SET_USER_LIMITS</div><div class='del'>-#    define PNG_SET_USER_LIMITS_SUPPORTED</div><div class='add'>+#ifndef PNG_FUNCTION</div><div class='add'>+#  ifdef __GNUC__</div><div class='add'>+#     define PNG_FUNCTION(type, name, args, attributes)\</div><div class='add'>+         attributes type name args</div><div class='add'>+#  else /* !GNUC */</div><div class='add'>+#     ifdef _MSC_VER</div><div class='add'>+#        define PNG_FUNCTION(type, name, args, attributes)\</div><div class='add'>+         attributes type name args</div><div class='add'>+#     else /* !MSC */</div><div class='add'>+#        define PNG_FUNCTION(type, name, args, attributes)\</div><div class='add'>+            type name args</div><div class='add'>+#     endif</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Added at libpng-1.0.16 and 1.2.6.  To accept all valid PNGs no matter</div><div class='del'>- * how large, set these limits to 0x7fffffffL</div><div class='del'>- */</div><div class='del'>-#ifndef PNG_USER_WIDTH_MAX</div><div class='del'>-#  define PNG_USER_WIDTH_MAX 1000000L</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_USER_HEIGHT_MAX</div><div class='del'>-#  define PNG_USER_HEIGHT_MAX 1000000L</div><div class='add'>+#ifndef PNG_EXPORT_TYPE</div><div class='add'>+#  define PNG_EXPORT_TYPE(type) PNG_IMPEXP type</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Added at libpng-1.4.0 */</div><div class='del'>-#ifndef PNG_USER_CHUNK_CACHE_MAX</div><div class='del'>-#  define PNG_USER_CHUNK_CACHE_MAX 0x7fffffffL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Added at libpng-1.4.0 */</div><div class='del'>-#if !defined(PNG_NO_IO_STATE) &amp;&amp; !defined(PNG_IO_STATE_SUPPORTED)</div><div class='del'>-#  define PNG_IO_STATE_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef PNG_LITERAL_SHARP</div><div class='del'>-#  define PNG_LITERAL_SHARP 0x23</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_LITERAL_LEFT_SQUARE_BRACKET</div><div class='del'>-#  define PNG_LITERAL_LEFT_SQUARE_BRACKET 0x5b</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_LITERAL_RIGHT_SQUARE_BRACKET</div><div class='del'>-#  define PNG_LITERAL_RIGHT_SQUARE_BRACKET 0x5d</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_STRING_NEWLINE</div><div class='del'>-#define PNG_STRING_NEWLINE "\n"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* These are currently experimental features, define them if you want */</div><div class='del'>-</div><div class='del'>-/* Very little testing */</div><div class='del'>-/*</div><div class='del'>-#ifdef PNG_READ_SUPPORTED</div><div class='del'>-#  ifndef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED</div><div class='del'>-#    define PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED</div><div class='del'>-#  endif</div><div class='add'>+   /* The ordinal value is only relevant when preprocessing png.h for symbol</div><div class='add'>+    * table entries, so we discard it here.  See the .dfn files in the</div><div class='add'>+    * scripts directory.</div><div class='add'>+    */</div><div class='add'>+#ifndef PNG_EXPORTA</div><div class='add'>+#  define PNG_EXPORTA(ordinal, type, name, args, attributes)\</div><div class='add'>+      extern PNG_FUNCTION(PNG_EXPORT_TYPE(type),(PNGAPI name),PNGARG(args),\</div><div class='add'>+         attributes)</div><div class='ctx'> #endif</div><div class='del'>-*/</div><div class='ctx'> </div><div class='del'>-/* This is only for PowerPC big-endian and 680x0 systems */</div><div class='del'>-/* some testing */</div><div class='del'>-/*</div><div class='del'>-#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED</div><div class='del'>-#  define PNG_READ_BIG_ENDIAN_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-*/</div><div class='add'>+#define PNG_EXPORT(ordinal, type, name, args)\</div><div class='add'>+   PNG_EXPORTA(ordinal, type, name, args, )</div><div class='ctx'> </div><div class='del'>-#if !defined(PNG_NO_USE_READ_MACROS) &amp;&amp; !defined(PNG_USE_READ_MACROS)</div><div class='del'>-#  define PNG_USE_READ_MACROS</div><div class='add'>+/* Use PNG_REMOVED to comment out a removed interface. */</div><div class='add'>+#ifndef PNG_REMOVED</div><div class='add'>+#  define PNG_REMOVED(ordinal, type, name, args, attributes)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Buggy compilers (e.g., gcc 2.7.2.2) need PNG_NO_POINTER_INDEXING */</div><div class='del'>-</div><div class='del'>-#if !defined(PNG_NO_POINTER_INDEXING) &amp;&amp; \</div><div class='del'>-    !defined(PNG_POINTER_INDEXING_SUPPORTED)</div><div class='del'>-#  define PNG_POINTER_INDEXING_SUPPORTED</div><div class='add'>+#ifndef PNG_CALLBACK</div><div class='add'>+#  define PNG_CALLBACK(type, name, args, attributes)\</div><div class='add'>+   type (PNGCBAPI name) PNGARG(args) attributes</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* Any chunks you are not interested in, you can undef here.  The</div><div class='del'>- * ones that allocate memory may be expecially important (hIST,</div><div class='del'>- * tEXt, zTXt, tRNS, pCAL).  Others will just save time and make png_info</div><div class='del'>- * a bit smaller.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* The size of the png_text structure changed in libpng-1.0.6 when</div><div class='del'>- * iTXt support was added.  iTXt support was turned off by default through</div><div class='del'>- * libpng-1.2.x, to support old apps that malloc the png_text structure</div><div class='del'>- * instead of calling png_set_text() and letting libpng malloc it.  It</div><div class='del'>- * was turned on by default in libpng-1.4.0.</div><div class='add'>+/* Support for compiler specific function attributes.  These are used</div><div class='add'>+ * so that where compiler support is available incorrect use of API</div><div class='add'>+ * functions in png.h will generate compiler warnings.</div><div class='add'>+ *</div><div class='add'>+ * Added at libpng-1.2.41.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED is deprecated. */</div><div class='del'>-#if defined(PNG_READ_SUPPORTED) &amp;&amp; \</div><div class='del'>-    !defined(PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED) &amp;&amp; \</div><div class='del'>-    !defined(PNG_NO_READ_ANCILLARY_CHUNKS)</div><div class='del'>-#  define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED is deprecated. */</div><div class='del'>-#if defined(PNG_WRITE_SUPPORTED) &amp;&amp; \</div><div class='del'>-    !defined(PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED) &amp;&amp; \</div><div class='del'>-    !defined(PNG_NO_WRITE_ANCILLARY_CHUNKS)</div><div class='del'>-#  define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_READ_ANCILLARY_CHUNKS_SUPPORTED</div><div class='del'>-</div><div class='del'>-#ifdef PNG_NO_READ_TEXT</div><div class='del'>-#  define PNG_NO_READ_iTXt</div><div class='del'>-#  define PNG_NO_READ_tEXt</div><div class='del'>-#  define PNG_NO_READ_zTXt</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef PNG_NO_READ_bKGD</div><div class='del'>-#  define PNG_READ_bKGD_SUPPORTED</div><div class='del'>-#  define PNG_bKGD_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_READ_cHRM</div><div class='del'>-#  define PNG_READ_cHRM_SUPPORTED</div><div class='del'>-#  define PNG_cHRM_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_READ_gAMA</div><div class='del'>-#  define PNG_READ_gAMA_SUPPORTED</div><div class='del'>-#  define PNG_gAMA_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_READ_hIST</div><div class='del'>-#  define PNG_READ_hIST_SUPPORTED</div><div class='del'>-#  define PNG_hIST_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_READ_iCCP</div><div class='del'>-#  define PNG_READ_iCCP_SUPPORTED</div><div class='del'>-#  define PNG_iCCP_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_READ_iTXt</div><div class='del'>-#  ifndef PNG_READ_iTXt_SUPPORTED</div><div class='del'>-#    define PNG_READ_iTXt_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_iTXt_SUPPORTED</div><div class='del'>-#    define PNG_iTXt_SUPPORTED</div><div class='add'>+#ifndef PNG_NO_PEDANTIC_WARNINGS</div><div class='add'>+#  ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED</div><div class='add'>+#    define PNG_PEDANTIC_WARNINGS_SUPPORTED</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='del'>-#ifndef PNG_NO_READ_oFFs</div><div class='del'>-#  define PNG_READ_oFFs_SUPPORTED</div><div class='del'>-#  define PNG_oFFs_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_READ_pCAL</div><div class='del'>-#  define PNG_READ_pCAL_SUPPORTED</div><div class='del'>-#  define PNG_pCAL_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_READ_sCAL</div><div class='del'>-#  define PNG_READ_sCAL_SUPPORTED</div><div class='del'>-#  define PNG_sCAL_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_READ_pHYs</div><div class='del'>-#  define PNG_READ_pHYs_SUPPORTED</div><div class='del'>-#  define PNG_pHYs_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_READ_sBIT</div><div class='del'>-#  define PNG_READ_sBIT_SUPPORTED</div><div class='del'>-#  define PNG_sBIT_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_READ_sPLT</div><div class='del'>-#  define PNG_READ_sPLT_SUPPORTED</div><div class='del'>-#  define PNG_sPLT_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_READ_sRGB</div><div class='del'>-#  define PNG_READ_sRGB_SUPPORTED</div><div class='del'>-#  define PNG_sRGB_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_READ_tEXt</div><div class='del'>-#  define PNG_READ_tEXt_SUPPORTED</div><div class='del'>-#  define PNG_tEXt_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_READ_tIME</div><div class='del'>-#  define PNG_READ_tIME_SUPPORTED</div><div class='del'>-#  define PNG_tIME_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_READ_tRNS</div><div class='del'>-#  define PNG_READ_tRNS_SUPPORTED</div><div class='del'>-#  define PNG_tRNS_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_READ_zTXt</div><div class='del'>-#  define PNG_READ_zTXt_SUPPORTED</div><div class='del'>-#  define PNG_zTXt_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_READ_OPT_PLTE</div><div class='del'>-#  define PNG_READ_OPT_PLTE_SUPPORTED /* only affects support of the */</div><div class='del'>-#endif                      /* optional PLTE chunk in RGB and RGBA images */</div><div class='del'>-#if defined(PNG_READ_iTXt_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) || \</div><div class='del'>-    defined(PNG_READ_zTXt_SUPPORTED)</div><div class='del'>-#  define PNG_READ_TEXT_SUPPORTED</div><div class='del'>-#  define PNG_TEXT_SUPPORTED</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-#endif /* PNG_READ_ANCILLARY_CHUNKS_SUPPORTED */</div><div class='add'>+#ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED</div><div class='add'>+  /* Support for compiler specific function attributes.  These are used</div><div class='add'>+   * so that where compiler support is available incorrect use of API</div><div class='add'>+   * functions in png.h will generate compiler warnings.  Added at libpng</div><div class='add'>+   * version 1.2.41.</div><div class='add'>+   */</div><div class='add'>+#  ifdef __GNUC__</div><div class='add'>+#    ifndef PNG_USE_RESULT</div><div class='add'>+#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))</div><div class='add'>+#    endif</div><div class='add'>+#    ifndef PNG_NORETURN</div><div class='add'>+#      define PNG_NORETURN   __attribute__((__noreturn__))</div><div class='add'>+#    endif</div><div class='add'>+#    ifndef PNG_PTR_NORETURN</div><div class='add'>+#      define PNG_PTR_NORETURN   __attribute__((__noreturn__))</div><div class='add'>+#    endif</div><div class='add'>+#    ifndef PNG_ALLOCATED</div><div class='add'>+#      define PNG_ALLOCATED  __attribute__((__malloc__))</div><div class='add'>+#    endif</div><div class='ctx'> </div><div class='del'>-#ifndef PNG_NO_READ_UNKNOWN_CHUNKS</div><div class='del'>-#  define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED</div><div class='del'>-#  ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED</div><div class='del'>-#    define PNG_UNKNOWN_CHUNKS_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#if !defined(PNG_NO_READ_USER_CHUNKS) &amp;&amp; \</div><div class='del'>-     defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)</div><div class='del'>-#  define PNG_READ_USER_CHUNKS_SUPPORTED</div><div class='del'>-#  define PNG_USER_CHUNKS_SUPPORTED</div><div class='del'>-#  ifdef PNG_NO_READ_UNKNOWN_CHUNKS</div><div class='del'>-#    undef PNG_NO_READ_UNKNOWN_CHUNKS</div><div class='del'>-#  endif</div><div class='del'>-#  ifdef PNG_NO_HANDLE_AS_UNKNOWN</div><div class='del'>-#    undef PNG_NO_HANDLE_AS_UNKNOWN</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_HANDLE_AS_UNKNOWN</div><div class='del'>-#  ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='del'>-#    define PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='add'>+    /* This specifically protects structure members that should only be</div><div class='add'>+     * accessed from within the library, therefore should be empty during</div><div class='add'>+     * a library build.</div><div class='add'>+     */</div><div class='add'>+#    ifndef PNGLIB_BUILD</div><div class='add'>+#      ifndef PNG_DEPRECATED</div><div class='add'>+#        define PNG_DEPRECATED __attribute__((__deprecated__))</div><div class='add'>+#      endif</div><div class='add'>+#      ifndef PNG_DEPSTRUCT</div><div class='add'>+#        define PNG_DEPSTRUCT  __attribute__((__deprecated__))</div><div class='add'>+#      endif</div><div class='add'>+#      ifndef PNG_PRIVATE</div><div class='add'>+#        if 0 /* Doesn't work so we use deprecated instead*/</div><div class='add'>+#          define PNG_PRIVATE \</div><div class='add'>+            __attribute__((warning("This function is not exported by libpng.")))</div><div class='add'>+#        else</div><div class='add'>+#          define PNG_PRIVATE \</div><div class='add'>+            __attribute__((__deprecated__))</div><div class='add'>+#        endif</div><div class='add'>+#      endif /* PNG_PRIVATE */</div><div class='add'>+#    endif /* PNGLIB_BUILD */</div><div class='add'>+#  endif /* __GNUC__ */</div><div class='add'>+#  ifdef _MSC_VER /* may need to check value */</div><div class='add'>+#    ifndef PNG_USE_RESULT</div><div class='add'>+#      define PNG_USE_RESULT /*not supported*/</div><div class='add'>+#    endif</div><div class='add'>+#    ifndef PNG_NORETURN</div><div class='add'>+#      define PNG_NORETURN   __declspec(noreturn)</div><div class='add'>+#    endif</div><div class='add'>+#    ifndef PNG_PTR_NORETURN</div><div class='add'>+#      define PNG_PTR_NORETURN /*not supported*/</div><div class='add'>+#    endif</div><div class='add'>+#    ifndef PNG_ALLOCATED</div><div class='add'>+#      define PNG_ALLOCATED __declspec(restrict)</div><div class='add'>+#    endif</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_WRITE_SUPPORTED</div><div class='del'>-#ifdef PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED</div><div class='add'>+    /* This specifically protects structure members that should only be</div><div class='add'>+     * accessed from within the library, therefore should be empty during</div><div class='add'>+     * a library build.</div><div class='add'>+     */</div><div class='add'>+#    ifndef PNGLIB_BUILD</div><div class='add'>+#      ifndef PNG_DEPRECATED</div><div class='add'>+#        define PNG_DEPRECATED __declspec(deprecated)</div><div class='add'>+#      endif</div><div class='add'>+#      ifndef PNG_DEPSTRUCT</div><div class='add'>+#        define PNG_DEPSTRUCT  __declspec(deprecated)</div><div class='add'>+#      endif</div><div class='add'>+#      ifndef PNG_PRIVATE</div><div class='add'>+#        define PNG_PRIVATE __declspec(deprecated)</div><div class='add'>+#      endif /* PNG_PRIVATE */</div><div class='add'>+#    endif /* PNGLIB_BUILD */</div><div class='add'>+#  endif /* __GNUC__ */</div><div class='add'>+#endif /* PNG_PEDANTIC_WARNINGS */</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_NO_WRITE_TEXT</div><div class='del'>-#  define PNG_NO_WRITE_iTXt</div><div class='del'>-#  define PNG_NO_WRITE_tEXt</div><div class='del'>-#  define PNG_NO_WRITE_zTXt</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_WRITE_bKGD</div><div class='del'>-#  define PNG_WRITE_bKGD_SUPPORTED</div><div class='del'>-#  ifndef PNG_bKGD_SUPPORTED</div><div class='del'>-#    define PNG_bKGD_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_WRITE_cHRM</div><div class='del'>-#  define PNG_WRITE_cHRM_SUPPORTED</div><div class='del'>-#  ifndef PNG_cHRM_SUPPORTED</div><div class='del'>-#    define PNG_cHRM_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_WRITE_gAMA</div><div class='del'>-#  define PNG_WRITE_gAMA_SUPPORTED</div><div class='del'>-#  ifndef PNG_gAMA_SUPPORTED</div><div class='del'>-#    define PNG_gAMA_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_WRITE_hIST</div><div class='del'>-#  define PNG_WRITE_hIST_SUPPORTED</div><div class='del'>-#  ifndef PNG_hIST_SUPPORTED</div><div class='del'>-#    define PNG_hIST_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_WRITE_iCCP</div><div class='del'>-#  define PNG_WRITE_iCCP_SUPPORTED</div><div class='del'>-#  ifndef PNG_iCCP_SUPPORTED</div><div class='del'>-#    define PNG_iCCP_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_WRITE_iTXt</div><div class='del'>-#  ifndef PNG_WRITE_iTXt_SUPPORTED</div><div class='del'>-#    define PNG_WRITE_iTXt_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef PNG_iTXt_SUPPORTED</div><div class='del'>-#    define PNG_iTXt_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_WRITE_oFFs</div><div class='del'>-#  define PNG_WRITE_oFFs_SUPPORTED</div><div class='del'>-#  ifndef PNG_oFFs_SUPPORTED</div><div class='del'>-#    define PNG_oFFs_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_WRITE_pCAL</div><div class='del'>-#  define PNG_WRITE_pCAL_SUPPORTED</div><div class='del'>-#  ifndef PNG_pCAL_SUPPORTED</div><div class='del'>-#    define PNG_pCAL_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_WRITE_sCAL</div><div class='del'>-#  define PNG_WRITE_sCAL_SUPPORTED</div><div class='del'>-#  ifndef PNG_sCAL_SUPPORTED</div><div class='del'>-#    define PNG_sCAL_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_WRITE_pHYs</div><div class='del'>-#  define PNG_WRITE_pHYs_SUPPORTED</div><div class='del'>-#  ifndef PNG_pHYs_SUPPORTED</div><div class='del'>-#    define PNG_pHYs_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_WRITE_sBIT</div><div class='del'>-#  define PNG_WRITE_sBIT_SUPPORTED</div><div class='del'>-#  ifndef PNG_sBIT_SUPPORTED</div><div class='del'>-#    define PNG_sBIT_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_WRITE_sPLT</div><div class='del'>-#  define PNG_WRITE_sPLT_SUPPORTED</div><div class='del'>-#  ifndef PNG_sPLT_SUPPORTED</div><div class='del'>-#    define PNG_sPLT_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_WRITE_sRGB</div><div class='del'>-#  define PNG_WRITE_sRGB_SUPPORTED</div><div class='del'>-#  ifndef PNG_sRGB_SUPPORTED</div><div class='del'>-#    define PNG_sRGB_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_WRITE_tEXt</div><div class='del'>-#  define PNG_WRITE_tEXt_SUPPORTED</div><div class='del'>-#  ifndef PNG_tEXt_SUPPORTED</div><div class='del'>-#    define PNG_tEXt_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NO_WRITE_tIME</div><div class='del'>-#  define PNG_WRITE_tIME_SUPPORTED</div><div class='del'>-#  ifndef PNG_tIME_SUPPORTED</div><div class='del'>-#    define PNG_tIME_SUPPORTED</div><div class='del'>-#  endif</div><div class='add'>+#ifndef PNG_DEPRECATED</div><div class='add'>+#  define PNG_DEPRECATED  /* Use of this function is deprecated */</div><div class='ctx'> #endif</div><div class='del'>-#ifndef PNG_NO_WRITE_tRNS</div><div class='del'>-#  define PNG_WRITE_tRNS_SUPPORTED</div><div class='del'>-#  ifndef PNG_tRNS_SUPPORTED</div><div class='del'>-#    define PNG_tRNS_SUPPORTED</div><div class='del'>-#  endif</div><div class='add'>+#ifndef PNG_USE_RESULT</div><div class='add'>+#  define PNG_USE_RESULT  /* The result of this function must be checked */</div><div class='ctx'> #endif</div><div class='del'>-#ifndef PNG_NO_WRITE_zTXt</div><div class='del'>-#  define PNG_WRITE_zTXt_SUPPORTED</div><div class='del'>-#  ifndef PNG_zTXt_SUPPORTED</div><div class='del'>-#    define PNG_zTXt_SUPPORTED</div><div class='del'>-#  endif</div><div class='add'>+#ifndef PNG_NORETURN</div><div class='add'>+#  define PNG_NORETURN    /* This function does not return */</div><div class='ctx'> #endif</div><div class='del'>-#if defined(PNG_WRITE_iTXt_SUPPORTED) || defined(PNG_WRITE_tEXt_SUPPORTED) || \</div><div class='del'>-    defined(PNG_WRITE_zTXt_SUPPORTED)</div><div class='del'>-#  define PNG_WRITE_TEXT_SUPPORTED</div><div class='del'>-#  ifndef PNG_TEXT_SUPPORTED</div><div class='del'>-#    define PNG_TEXT_SUPPORTED</div><div class='del'>-#  endif</div><div class='add'>+#ifndef PNG_ALLOCATED</div><div class='add'>+#  define PNG_ALLOCATED   /* The result of the function is new memory */</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_WRITE_tIME_SUPPORTED</div><div class='del'>-#  ifndef PNG_NO_CONVERT_tIME</div><div class='del'>-#    ifndef _WIN32_WCE</div><div class='del'>-/*   The "tm" structure is not supported on WindowsCE */</div><div class='del'>-#      ifndef PNG_CONVERT_tIME_SUPPORTED</div><div class='del'>-#        define PNG_CONVERT_tIME_SUPPORTED</div><div class='del'>-#      endif</div><div class='del'>-#   endif</div><div class='del'>-#  endif</div><div class='add'>+#ifndef PNG_DEPSTRUCT</div><div class='add'>+#  define PNG_DEPSTRUCT   /* Access to this struct member is deprecated */</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */</div><div class='del'>-</div><div class='del'>-#if !defined(PNG_NO_WRITE_FILTER) &amp;&amp; !defined(PNG_WRITE_FILTER_SUPPORTED)</div><div class='del'>-#  define PNG_WRITE_FILTER_SUPPORTED</div><div class='add'>+#ifndef PNG_PRIVATE</div><div class='add'>+#  define PNG_PRIVATE     /* This is a private libpng function */</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-#ifndef PNG_NO_WRITE_UNKNOWN_CHUNKS</div><div class='del'>-#  define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED</div><div class='del'>-#  ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED</div><div class='del'>-#    define PNG_UNKNOWN_CHUNKS_SUPPORTED</div><div class='add'>+#ifndef PNG_FP_EXPORT     /* A floating point API. */</div><div class='add'>+#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+#     define PNG_FP_EXPORT(ordinal, type, name, args)\</div><div class='add'>+         PNG_EXPORT(ordinal, type, name, args)</div><div class='add'>+#  else                   /* No floating point APIs */</div><div class='add'>+#     define PNG_FP_EXPORT(ordinal, type, name, args)</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='del'>-#ifndef PNG_NO_HANDLE_AS_UNKNOWN</div><div class='del'>-#  ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='del'>-#    define PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='add'>+#ifndef PNG_FIXED_EXPORT  /* A fixed point API. */</div><div class='add'>+#  ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+#     define PNG_FIXED_EXPORT(ordinal, type, name, args)\</div><div class='add'>+         PNG_EXPORT(ordinal, type, name, args)</div><div class='add'>+#  else                   /* No fixed point APIs */</div><div class='add'>+#     define PNG_FIXED_EXPORT(ordinal, type, name, args)</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='del'>-#endif /* PNG_WRITE_SUPPORTED */</div><div class='ctx'> </div><div class='del'>-/* Turn this off to disable png_read_png() and</div><div class='del'>- * png_write_png() and leave the row_pointers member</div><div class='del'>- * out of the info structure.</div><div class='add'>+/* The following uses const char * instead of char * for error</div><div class='add'>+ * and warning message functions, so some compilers won't complain.</div><div class='add'>+ * If you do not want to use const, define PNG_NO_CONST here.</div><div class='add'>+ *</div><div class='add'>+ * This should not change how the APIs are called, so it can be done</div><div class='add'>+ * on a per-file basis in the application.</div><div class='ctx'>  */</div><div class='del'>-#ifndef PNG_NO_INFO_IMAGE</div><div class='del'>-#  define PNG_INFO_IMAGE_SUPPORTED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Need the time information for converting tIME chunks */</div><div class='del'>-#ifdef PNG_CONVERT_tIME_SUPPORTED</div><div class='del'>-     /* "time.h" functions are not supported on WindowsCE */</div><div class='del'>-#    include &lt;time.h&gt;</div><div class='add'>+#ifndef PNG_CONST</div><div class='add'>+#  ifndef PNG_NO_CONST</div><div class='add'>+#    define PNG_CONST const</div><div class='add'>+#  else</div><div class='add'>+#    define PNG_CONST</div><div class='add'>+#  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Some typedefs to get us started.  These should be safe on most of the</div><div class='hunk'>@@ -1067,11 +492,11 @@ typedef short png_int_16;</div><div class='ctx'> typedef unsigned char png_byte;</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_NO_SIZE_T</div><div class='del'>-   typedef unsigned int png_size_t;</div><div class='add'>+typedef unsigned int png_size_t;</div><div class='ctx'> #else</div><div class='del'>-   typedef size_t png_size_t;</div><div class='add'>+typedef size_t png_size_t;</div><div class='ctx'> #endif</div><div class='del'>-#define png_sizeof(x) sizeof(x)</div><div class='add'>+#define png_sizeof(x) (sizeof (x))</div><div class='ctx'> </div><div class='ctx'> /* The following is needed for medium model support.  It cannot be in the</div><div class='ctx'>  * pngpriv.h header.  Needs modification for other compilers besides</div><div class='hunk'>@@ -1091,20 +516,20 @@ typedef unsigned char png_byte;</div><div class='ctx'> #  else</div><div class='ctx'> #    define LDATA 0</div><div class='ctx'> #  endif</div><div class='del'>-   /* GRR:  why is Cygwin in here?  Cygwin is not Borland C... */</div><div class='add'>+  /* GRR:  why is Cygwin in here?  Cygwin is not Borland C... */</div><div class='ctx'> #  if !defined(__WIN32__) &amp;&amp; !defined(__FLAT__) &amp;&amp; !defined(__CYGWIN__)</div><div class='del'>-#    define PNG_MAX_MALLOC_64K</div><div class='add'>+#    define PNG_MAX_MALLOC_64K /* only used in build */</div><div class='ctx'> #    if (LDATA != 1)</div><div class='ctx'> #      ifndef FAR</div><div class='ctx'> #        define FAR __far</div><div class='ctx'> #      endif</div><div class='ctx'> #      define USE_FAR_KEYWORD</div><div class='ctx'> #    endif   /* LDATA != 1 */</div><div class='del'>-     /* Possibly useful for moving data out of default segment.</div><div class='del'>-      * Uncomment it if you want. Could also define FARDATA as</div><div class='del'>-      * const if your compiler supports it. (SJT)</div><div class='del'>-#    define FARDATA FAR</div><div class='del'>-      */</div><div class='add'>+         /* Possibly useful for moving data out of default segment.</div><div class='add'>+          * Uncomment it if you want. Could also define FARDATA as</div><div class='add'>+          * const if your compiler supports it. (SJT)</div><div class='add'>+#        define FARDATA FAR</div><div class='add'>+          */</div><div class='ctx'> #  endif  /* __WIN32__, __FLAT__, __CYGWIN__ */</div><div class='ctx'> #endif   /* __BORLANDC__ */</div><div class='ctx'> </div><div class='hunk'>@@ -1134,26 +559,37 @@ typedef unsigned char png_byte;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Typedef for floating-point numbers that are converted</div><div class='del'>-   to fixed-point with a multiple of 100,000, e.g., int_gamma */</div><div class='add'>+ * to fixed-point with a multiple of 100,000, e.g., gamma</div><div class='add'>+ */</div><div class='ctx'> typedef png_int_32 png_fixed_point;</div><div class='ctx'> </div><div class='ctx'> /* Add typedefs for pointers */</div><div class='del'>-typedef void            FAR * png_voidp;</div><div class='del'>-typedef png_byte        FAR * png_bytep;</div><div class='del'>-typedef png_uint_32     FAR * png_uint_32p;</div><div class='del'>-typedef png_int_32      FAR * png_int_32p;</div><div class='del'>-typedef png_uint_16     FAR * png_uint_16p;</div><div class='del'>-typedef png_int_16      FAR * png_int_16p;</div><div class='del'>-typedef PNG_CONST char  FAR * png_const_charp;</div><div class='del'>-typedef char            FAR * png_charp;</div><div class='del'>-typedef png_fixed_point FAR * png_fixed_point_p;</div><div class='del'>-</div><div class='del'>-#ifndef PNG_NO_STDIO</div><div class='del'>-typedef FILE                * png_FILE_p;</div><div class='add'>+typedef void                      FAR * png_voidp;</div><div class='add'>+typedef PNG_CONST void            FAR * png_const_voidp;</div><div class='add'>+typedef png_byte                  FAR * png_bytep;</div><div class='add'>+typedef PNG_CONST png_byte        FAR * png_const_bytep;</div><div class='add'>+typedef png_uint_32               FAR * png_uint_32p;</div><div class='add'>+typedef PNG_CONST png_uint_32     FAR * png_const_uint_32p;</div><div class='add'>+typedef png_int_32                FAR * png_int_32p;</div><div class='add'>+typedef PNG_CONST png_int_32      FAR * png_const_int_32p;</div><div class='add'>+typedef png_uint_16               FAR * png_uint_16p;</div><div class='add'>+typedef PNG_CONST png_uint_16     FAR * png_const_uint_16p;</div><div class='add'>+typedef png_int_16                FAR * png_int_16p;</div><div class='add'>+typedef PNG_CONST png_int_16      FAR * png_const_int_16p;</div><div class='add'>+typedef char                      FAR * png_charp;</div><div class='add'>+typedef PNG_CONST char            FAR * png_const_charp;</div><div class='add'>+typedef png_fixed_point           FAR * png_fixed_point_p;</div><div class='add'>+typedef PNG_CONST png_fixed_point FAR * png_const_fixed_point_p;</div><div class='add'>+typedef png_size_t                FAR * png_size_tp;</div><div class='add'>+typedef PNG_CONST png_size_t      FAR * png_const_size_tp;</div><div class='add'>+</div><div class='add'>+#ifdef PNG_STDIO_SUPPORTED</div><div class='add'>+typedef FILE            * png_FILE_p;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-typedef double          FAR * png_doublep;</div><div class='add'>+typedef double           FAR * png_doublep;</div><div class='add'>+typedef PNG_CONST double FAR * png_const_doublep;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Pointers to pointers; i.e. arrays */</div><div class='hunk'>@@ -1172,279 +608,6 @@ typedef double          FAR * FAR * png_doublepp;</div><div class='ctx'> /* Pointers to pointers to pointers; i.e., pointer to array */</div><div class='ctx'> typedef char            FAR * FAR * FAR * png_charppp;</div><div class='ctx'> </div><div class='del'>-/* Define PNG_BUILD_DLL if the module being built is a Windows</div><div class='del'>- * LIBPNG DLL.</div><div class='del'>- *</div><div class='del'>- * Define PNG_USE_DLL if you want to *link* to the Windows LIBPNG DLL.</div><div class='del'>- * It is equivalent to Microsoft predefined macro _DLL that is</div><div class='del'>- * automatically defined when you compile using the share</div><div class='del'>- * version of the CRT (C Run-Time library)</div><div class='del'>- *</div><div class='del'>- * The cygwin mods make this behavior a little different:</div><div class='del'>- * Define PNG_BUILD_DLL if you are building a dll for use with cygwin</div><div class='del'>- * Define PNG_STATIC if you are building a static library for use with cygwin,</div><div class='del'>- *   -or- if you are building an application that you want to link to the</div><div class='del'>- *   static library.</div><div class='del'>- * PNG_USE_DLL is defined by default (no user action needed) unless one of</div><div class='del'>- *   the other flags is defined.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#if !defined(PNG_DLL) &amp;&amp; (defined(PNG_BUILD_DLL) || defined(PNG_USE_DLL))</div><div class='del'>-#  define PNG_DLL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __CYGWIN__</div><div class='del'>-#  undef PNGAPI</div><div class='del'>-#  define PNGAPI __cdecl</div><div class='del'>-#  undef PNG_IMPEXP</div><div class='del'>-#  define PNG_IMPEXP</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define PNG_USE_LOCAL_ARRAYS /* Not used in libpng, defined for legacy apps */</div><div class='del'>-</div><div class='del'>-/* If you define PNGAPI, e.g., with compiler option "-DPNGAPI=__stdcall",</div><div class='del'>- * you may get warnings regarding the linkage of png_zalloc and png_zfree.</div><div class='del'>- * Don't ignore those warnings; you must also reset the default calling</div><div class='del'>- * convention in your compiler to match your PNGAPI, and you must build</div><div class='del'>- * zlib and your applications the same way you build libpng.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#if defined(__MINGW32__) &amp;&amp; !defined(PNG_MODULEDEF)</div><div class='del'>-#  ifndef PNG_NO_MODULEDEF</div><div class='del'>-#    define PNG_NO_MODULEDEF</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if !defined(PNG_IMPEXP) &amp;&amp; defined(PNG_BUILD_DLL) &amp;&amp; !defined(PNG_NO_MODULEDEF)</div><div class='del'>-#  define PNG_IMPEXP</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(PNG_DLL) || defined(_DLL) || defined(__DLL__ ) || \</div><div class='del'>-    (( defined(_Windows) || defined(_WINDOWS) || \</div><div class='del'>-       defined(WIN32) || defined(_WIN32) || defined(__WIN32__) ))</div><div class='del'>-</div><div class='del'>-#  ifndef PNGAPI</div><div class='del'>-#     if (defined(__GNUC__) &amp;&amp; defined(__arm__)) || defined (__ARMCC__)</div><div class='del'>-#        define PNGAPI</div><div class='del'>-#     elif defined(__GNUC__) || (defined (_MSC_VER) &amp;&amp; (_MSC_VER &gt;= 800))  || defined(__WINSCW__)</div><div class='del'>-#        define PNGAPI __cdecl</div><div class='del'>-#     else</div><div class='del'>-#        define PNGAPI _cdecl</div><div class='del'>-#     endif</div><div class='del'>-#  endif</div><div class='del'>-</div><div class='del'>-#  if !defined(PNG_IMPEXP) &amp;&amp; (!defined(PNG_DLL) || \</div><div class='del'>-       0 /* WINCOMPILER_WITH_NO_SUPPORT_FOR_DECLIMPEXP */)</div><div class='del'>-#     define PNG_IMPEXP</div><div class='del'>-#  endif</div><div class='del'>-</div><div class='del'>-#  ifndef PNG_IMPEXP</div><div class='del'>-</div><div class='del'>-#    define PNG_EXPORT_TYPE1(type,symbol)  PNG_IMPEXP type PNGAPI symbol</div><div class='del'>-#    define PNG_EXPORT_TYPE2(type,symbol)  type PNG_IMPEXP PNGAPI symbol</div><div class='del'>-</div><div class='del'>-     /* Borland/Microsoft */</div><div class='del'>-#    if defined(_MSC_VER) || defined(__BORLANDC__)</div><div class='del'>-#      if (_MSC_VER &gt;= 800) || (__BORLANDC__ &gt;= 0x500)</div><div class='del'>-#         define PNG_EXPORT PNG_EXPORT_TYPE1</div><div class='del'>-#      else</div><div class='del'>-#         define PNG_EXPORT PNG_EXPORT_TYPE2</div><div class='del'>-#         ifdef PNG_BUILD_DLL</div><div class='del'>-#            define PNG_IMPEXP __export</div><div class='del'>-#         else</div><div class='del'>-#            define PNG_IMPEXP /*__import */ /* doesn't exist AFAIK in VC++ */</div><div class='del'>-#         endif                              /* Exists in Borland C++ for</div><div class='del'>-                                                C++ classes (== huge) */</div><div class='del'>-#      endif</div><div class='del'>-#    endif</div><div class='del'>-</div><div class='del'>-#    ifndef PNG_IMPEXP</div><div class='del'>-#      ifdef PNG_BUILD_DLL</div><div class='del'>-#        define PNG_IMPEXP __declspec(dllexport)</div><div class='del'>-#      else</div><div class='del'>-#        define PNG_IMPEXP __declspec(dllimport)</div><div class='del'>-#      endif</div><div class='del'>-#    endif</div><div class='del'>-#  endif  /* PNG_IMPEXP */</div><div class='del'>-#else /* !(DLL || non-cygwin WINDOWS) */</div><div class='del'>-#   if (defined(__IBMC__) || defined(__IBMCPP__)) &amp;&amp; defined(__OS2__)</div><div class='del'>-#     ifndef PNGAPI</div><div class='del'>-#       define PNGAPI _System</div><div class='del'>-#     endif</div><div class='del'>-#   else</div><div class='del'>-#     if 0 /* ... other platforms, with other meanings */</div><div class='del'>-#     endif</div><div class='del'>-#   endif</div><div class='del'>-</div><div class='del'>-#   if !defined(PNG_IMPEXP)</div><div class='del'>-#       include &lt;qconfig.h&gt;</div><div class='del'>-#       if defined(QT_VISIBILITY_AVAILABLE)</div><div class='del'>-#           define PNG_IMPEXP __attribute__((visibility("default")))</div><div class='del'>-#       endif</div><div class='del'>-#   endif</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef PNGAPI</div><div class='del'>-#  define PNGAPI</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_IMPEXP</div><div class='del'>-#  define PNG_IMPEXP</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_BUILDSYMS</div><div class='del'>-#  ifndef PNG_EXPORT</div><div class='del'>-#    define PNG_EXPORT(type,symbol) PNG_FUNCTION_EXPORT symbol END</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef PNG_EXPORT</div><div class='del'>-#  define PNG_EXPORT(type,symbol) PNG_IMPEXP type PNGAPI symbol</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Support for compiler specific function attributes.  These are used</div><div class='del'>- * so that where compiler support is available incorrect use of API</div><div class='del'>- * functions in png.h will generate compiler warnings.</div><div class='del'>- *</div><div class='del'>- * Added at libpng-1.2.41.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef PNG_NO_PEDANTIC_WARNINGS</div><div class='del'>-#  ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED</div><div class='del'>-#    define PNG_PEDANTIC_WARNINGS_SUPPORTED</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED</div><div class='del'>-/* Support for compiler specific function attributes.  These are used</div><div class='del'>- * so that where compiler support is available incorrect use of API</div><div class='del'>- * functions in png.h will generate compiler warnings.  Added at libpng</div><div class='del'>- * version 1.2.41.</div><div class='del'>- */</div><div class='del'>-#  ifdef __GNUC__</div><div class='del'>-#    ifndef PNG_USE_RESULT</div><div class='del'>-#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))</div><div class='del'>-#    endif</div><div class='del'>-#    ifndef PNG_NORETURN</div><div class='del'>-#      define PNG_NORETURN   __attribute__((__noreturn__))</div><div class='del'>-#    endif</div><div class='del'>-#    ifndef PNG_ALLOCATED</div><div class='del'>-#      define PNG_ALLOCATED  __attribute__((__malloc__))</div><div class='del'>-#    endif</div><div class='del'>-</div><div class='del'>-    /* This specifically protects structure members that should only be</div><div class='del'>-     * accessed from within the library, therefore should be empty during</div><div class='del'>-     * a library build.</div><div class='del'>-     */</div><div class='del'>-#    ifndef PNG_DEPRECATED</div><div class='del'>-#      define PNG_DEPRECATED __attribute__((__deprecated__))</div><div class='del'>-#    endif</div><div class='del'>-#    ifndef PNG_DEPSTRUCT</div><div class='del'>-#      define PNG_DEPSTRUCT  __attribute__((__deprecated__))</div><div class='del'>-#    endif</div><div class='del'>-#    ifndef PNG_PRIVATE</div><div class='del'>-#      if 0 /* Doesn't work so we use deprecated instead*/</div><div class='del'>-#        define PNG_PRIVATE \</div><div class='del'>-          __attribute__((warning("This function is not exported by libpng.")))</div><div class='del'>-#      else</div><div class='del'>-#        define PNG_PRIVATE \</div><div class='del'>-          __attribute__((__deprecated__))</div><div class='del'>-#      endif</div><div class='del'>-#    endif /* PNG_PRIVATE */</div><div class='del'>-#  endif /* __GNUC__ */</div><div class='del'>-#endif /* PNG_PEDANTIC_WARNINGS */</div><div class='del'>-</div><div class='del'>-#ifndef PNG_DEPRECATED</div><div class='del'>-#  define PNG_DEPRECATED  /* Use of this function is deprecated */</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_USE_RESULT</div><div class='del'>-#  define PNG_USE_RESULT  /* The result of this function must be checked */</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_NORETURN</div><div class='del'>-#  define PNG_NORETURN    /* This function does not return */</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_ALLOCATED</div><div class='del'>-#  define PNG_ALLOCATED   /* The result of the function is new memory */</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_DEPSTRUCT</div><div class='del'>-#  define PNG_DEPSTRUCT   /* Access to this struct member is deprecated */</div><div class='del'>-#endif</div><div class='del'>-#ifndef PNG_PRIVATE</div><div class='del'>-#  define PNG_PRIVATE     /* This is a private libpng function */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Users may want to use these so they are not private.  Any library</div><div class='del'>- * functions that are passed far data must be model-independent.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* memory model/platform independent fns */</div><div class='del'>-#ifndef PNG_ABORT</div><div class='del'>-#  if defined(_WINDOWS_) || defined(_WIN32_WCE)</div><div class='del'>-#     define PNG_ABORT() ExitProcess(0)</div><div class='del'>-#  else</div><div class='del'>-#     define PNG_ABORT() abort()</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef USE_FAR_KEYWORD</div><div class='del'>-/* Use this to make far-to-near assignments */</div><div class='del'>-#  define CHECK   1</div><div class='del'>-#  define NOCHECK 0</div><div class='del'>-#  define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))</div><div class='del'>-#  define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))</div><div class='del'>-#  define png_strcpy  _fstrcpy</div><div class='del'>-#  define png_strncpy _fstrncpy   /* Added to v 1.2.6 */</div><div class='del'>-#  define png_strlen  _fstrlen</div><div class='del'>-#  define png_memcmp  _fmemcmp    /* SJT: added */</div><div class='del'>-#  define png_memcpy  _fmemcpy</div><div class='del'>-#  define png_memset  _fmemset</div><div class='del'>-#  define png_sprintf sprintf</div><div class='del'>-#else</div><div class='del'>-#  ifdef _WINDOWS_  /* Favor Windows over C runtime fns */</div><div class='del'>-#    define CVT_PTR(ptr)         (ptr)</div><div class='del'>-#    define CVT_PTR_NOCHECK(ptr) (ptr)</div><div class='del'>-#    define png_strcpy  lstrcpyA</div><div class='del'>-#    define png_strncpy lstrcpynA</div><div class='del'>-#    define png_strlen  lstrlenA</div><div class='del'>-#    define png_memcmp  memcmp</div><div class='del'>-#    define png_memcpy  CopyMemory</div><div class='del'>-#    define png_memset  memset</div><div class='del'>-#    define png_sprintf wsprintfA</div><div class='del'>-#  else</div><div class='del'>-#    define CVT_PTR(ptr)         (ptr)</div><div class='del'>-#    define CVT_PTR_NOCHECK(ptr) (ptr)</div><div class='del'>-#    define png_strcpy  strcpy</div><div class='del'>-#    define png_strncpy strncpy     /* Added to v 1.2.6 */</div><div class='del'>-#    define png_strlen  strlen</div><div class='del'>-#    define png_memcmp  memcmp      /* SJT: added */</div><div class='del'>-#    define png_memcpy  memcpy</div><div class='del'>-#    define png_memset  memset</div><div class='del'>-#    define png_sprintf sprintf</div><div class='del'>-#    ifndef PNG_NO_SNPRINTF</div><div class='del'>-#      ifdef _MSC_VER</div><div class='del'>-#        define png_snprintf _snprintf   /* Added to v 1.2.19 */</div><div class='del'>-#        define png_snprintf2 _snprintf</div><div class='del'>-#        define png_snprintf6 _snprintf</div><div class='del'>-#      else</div><div class='del'>-#        define png_snprintf snprintf   /* Added to v 1.2.19 */</div><div class='del'>-#        define png_snprintf2 snprintf</div><div class='del'>-#        define png_snprintf6 snprintf</div><div class='del'>-#      endif</div><div class='del'>-#    else</div><div class='del'>-       /* You don't have or don't want to use snprintf().  Caution: Using</div><div class='del'>-        * sprintf instead of snprintf exposes your application to accidental</div><div class='del'>-        * or malevolent buffer overflows.  If you don't have snprintf()</div><div class='del'>-        * as a general rule you should provide one (you can get one from</div><div class='del'>-        * Portable OpenSSH).</div><div class='del'>-        */</div><div class='del'>-#      define png_snprintf(s1,n,fmt,x1) sprintf(s1,fmt,x1)</div><div class='del'>-#      define png_snprintf2(s1,n,fmt,x1,x2) sprintf(s1,fmt,x1,x2)</div><div class='del'>-#      define png_snprintf6(s1,n,fmt,x1,x2,x3,x4,x5,x6) \</div><div class='del'>-          sprintf(s1,fmt,x1,x2,x3,x4,x5,x6)</div><div class='del'>-#    endif</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* png_alloc_size_t is guaranteed to be no smaller than png_size_t,</div><div class='ctx'>  * and no smaller than png_uint_32.  Casts from png_size_t or png_uint_32</div><div class='ctx'>  * to png_alloc_size_t are not necessary; in fact, it is recommended</div><div class='hunk'>@@ -1455,38 +618,22 @@ typedef char            FAR * FAR * FAR * png_charppp;</div><div class='ctx'>  * to encounter practical situations that require such conversions.</div><div class='ctx'>  */</div><div class='ctx'> #if defined(__TURBOC__) &amp;&amp; !defined(__FLAT__)</div><div class='del'>-#  define  png_mem_alloc farmalloc</div><div class='del'>-#  define  png_mem_free  farfree</div><div class='ctx'>    typedef unsigned long png_alloc_size_t;</div><div class='ctx'> #else</div><div class='ctx'> #  if defined(_MSC_VER) &amp;&amp; defined(MAXSEG_64K)</div><div class='del'>-#    define  png_mem_alloc(s) halloc(s, 1)</div><div class='del'>-#    define  png_mem_free     hfree</div><div class='ctx'>      typedef unsigned long    png_alloc_size_t;</div><div class='ctx'> #  else</div><div class='del'>-#    if defined(_WINDOWS_) &amp;&amp; (!defined(INT_MAX) || INT_MAX &lt;= 0x7ffffffeL)</div><div class='del'>-#      define  png_mem_alloc(s) HeapAlloc(GetProcessHeap(), 0, s)</div><div class='del'>-#      define  png_mem_free(p)  HeapFree(GetProcessHeap(), 0, p)</div><div class='del'>-       typedef DWORD            png_alloc_size_t;</div><div class='add'>+     /* This is an attempt to detect an old Windows system where (int) is</div><div class='add'>+      * actually 16 bits, in that case png_malloc must have an argument with a</div><div class='add'>+      * bigger size to accomodate the requirements of the library.</div><div class='add'>+      */</div><div class='add'>+#    if (defined(_Windows) || defined(_WINDOWS) || defined(_WINDOWS_)) &amp;&amp; \</div><div class='add'>+        (!defined(INT_MAX) || INT_MAX &lt;= 0x7ffffffeL)</div><div class='add'>+       typedef DWORD         png_alloc_size_t;</div><div class='ctx'> #    else</div><div class='del'>-#      define  png_mem_alloc malloc</div><div class='del'>-#      define  png_mem_free  free</div><div class='ctx'>        typedef png_size_t    png_alloc_size_t;</div><div class='ctx'> #    endif</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='del'>-/* End of memory model/platform independent support */</div><div class='del'>-</div><div class='del'>-/* Just a little check that someone hasn't tried to define something</div><div class='del'>- * contradictory.</div><div class='del'>- */</div><div class='del'>-#if (PNG_ZBUF_SIZE &gt; 65536L) &amp;&amp; defined(PNG_MAX_MALLOC_64K)</div><div class='del'>-#  undef PNG_ZBUF_SIZE</div><div class='del'>-#  define PNG_ZBUF_SIZE 65536L</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Added at libpng-1.2.8 */</div><div class='del'>-#endif /* PNG_VERSION_INFO_ONLY */</div><div class='ctx'> </div><div class='ctx'> #endif /* PNGCONF_H */</div><div class='head'>diff --git a/src/3rdparty/libpng/pngdebug.h b/src/3rdparty/libpng/pngdebug.h<br/>new file mode 100644<br/>index 0000000..16f81fd<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngdebug.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngdebug.h</a></div><div class='hunk'>@@ -0,0 +1,157 @@</div><div class='add'>+</div><div class='add'>+/* pngdebug.h - Debugging macros for libpng, also used in pngtest.c</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='add'>+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='add'>+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='add'>+ *</div><div class='add'>+ * Last changed in libpng 1.5.0 [January 6, 2011]</div><div class='add'>+ *</div><div class='add'>+ * This code is released under the libpng license.</div><div class='add'>+ * For conditions of distribution and use, see the disclaimer</div><div class='add'>+ * and license in png.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Define PNG_DEBUG at compile time for debugging information.  Higher</div><div class='add'>+ * numbers for PNG_DEBUG mean more debugging information.  This has</div><div class='add'>+ * only been added since version 0.95 so it is not implemented throughout</div><div class='add'>+ * libpng yet, but more support will be added as needed.</div><div class='add'>+ *</div><div class='add'>+ * png_debug[1-2]?(level, message ,arg{0-2})</div><div class='add'>+ *   Expands to a statement (either a simple expression or a compound</div><div class='add'>+ *   do..while(0) statement) that outputs a message with parameter</div><div class='add'>+ *   substitution if PNG_DEBUG is defined to 2 or more.  If PNG_DEBUG</div><div class='add'>+ *   is undefined, 0 or 1 every png_debug expands to a simple expression</div><div class='add'>+ *   (actually ((void)0)).</div><div class='add'>+ *</div><div class='add'>+ *   level: level of detail of message, starting at 0.  A level 'n'</div><div class='add'>+ *          message is preceded by 'n' tab characters (not implemented</div><div class='add'>+ *          on Microsoft compilers unless PNG_DEBUG_FILE is also</div><div class='add'>+ *          defined, to allow debug DLL compilation with no standard IO).</div><div class='add'>+ *   message: a printf(3) style text string.  A trailing '\n' is added</div><div class='add'>+ *            to the message.</div><div class='add'>+ *   arg: 0 to 2 arguments for printf(3) style substitution in message.</div><div class='add'>+ */</div><div class='add'>+#ifndef PNGDEBUG_H</div><div class='add'>+#define PNGDEBUG_H</div><div class='add'>+/* These settings control the formatting of messages in png.c and pngerror.c */</div><div class='add'>+/* Moved to pngdebug.h at 1.5.0 */</div><div class='add'>+#  ifndef PNG_LITERAL_SHARP</div><div class='add'>+#    define PNG_LITERAL_SHARP 0x23</div><div class='add'>+#  endif</div><div class='add'>+#  ifndef PNG_LITERAL_LEFT_SQUARE_BRACKET</div><div class='add'>+#    define PNG_LITERAL_LEFT_SQUARE_BRACKET 0x5b</div><div class='add'>+#  endif</div><div class='add'>+#  ifndef PNG_LITERAL_RIGHT_SQUARE_BRACKET</div><div class='add'>+#    define PNG_LITERAL_RIGHT_SQUARE_BRACKET 0x5d</div><div class='add'>+#  endif</div><div class='add'>+#  ifndef PNG_STRING_NEWLINE</div><div class='add'>+#    define PNG_STRING_NEWLINE "\n"</div><div class='add'>+#  endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_DEBUG</div><div class='add'>+#  if (PNG_DEBUG &gt; 0)</div><div class='add'>+#    if !defined(PNG_DEBUG_FILE) &amp;&amp; defined(_MSC_VER)</div><div class='add'>+#      include &lt;crtdbg.h&gt;</div><div class='add'>+#      if (PNG_DEBUG &gt; 1)</div><div class='add'>+#        ifndef _DEBUG</div><div class='add'>+#          define _DEBUG</div><div class='add'>+#        endif</div><div class='add'>+#        ifndef png_debug</div><div class='add'>+#          define png_debug(l,m)  _RPT0(_CRT_WARN,m PNG_STRING_NEWLINE)</div><div class='add'>+#        endif</div><div class='add'>+#        ifndef png_debug1</div><div class='add'>+#          define png_debug1(l,m,p1)  _RPT1(_CRT_WARN,m PNG_STRING_NEWLINE,p1)</div><div class='add'>+#        endif</div><div class='add'>+#        ifndef png_debug2</div><div class='add'>+#          define png_debug2(l,m,p1,p2) \</div><div class='add'>+             _RPT2(_CRT_WARN,m PNG_STRING_NEWLINE,p1,p2)</div><div class='add'>+#        endif</div><div class='add'>+#      endif</div><div class='add'>+#    else /* PNG_DEBUG_FILE || !_MSC_VER */</div><div class='add'>+#      ifndef PNG_STDIO_SUPPORTED</div><div class='add'>+#        include &lt;stdio.h&gt; /* not included yet */</div><div class='add'>+#      endif</div><div class='add'>+#      ifndef PNG_DEBUG_FILE</div><div class='add'>+#        define PNG_DEBUG_FILE stderr</div><div class='add'>+#      endif /* PNG_DEBUG_FILE */</div><div class='add'>+</div><div class='add'>+#      if (PNG_DEBUG &gt; 1)</div><div class='add'>+/* Note: ["%s"m PNG_STRING_NEWLINE] probably does not work on</div><div class='add'>+ * non-ISO compilers</div><div class='add'>+ */</div><div class='add'>+#        ifdef __STDC__</div><div class='add'>+#          ifndef png_debug</div><div class='add'>+#            define png_debug(l,m) \</div><div class='add'>+       do { \</div><div class='add'>+       int num_tabs=l; \</div><div class='add'>+       fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \</div><div class='add'>+         (num_tabs==2 ? "\t\t":(num_tabs&gt;2 ? "\t\t\t":"")))); \</div><div class='add'>+       } while (0)</div><div class='add'>+#          endif</div><div class='add'>+#          ifndef png_debug1</div><div class='add'>+#            define png_debug1(l,m,p1) \</div><div class='add'>+       do { \</div><div class='add'>+       int num_tabs=l; \</div><div class='add'>+       fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \</div><div class='add'>+         (num_tabs==2 ? "\t\t":(num_tabs&gt;2 ? "\t\t\t":""))),p1); \</div><div class='add'>+       } while (0)</div><div class='add'>+#          endif</div><div class='add'>+#          ifndef png_debug2</div><div class='add'>+#            define png_debug2(l,m,p1,p2) \</div><div class='add'>+       do { \</div><div class='add'>+       int num_tabs=l; \</div><div class='add'>+       fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \</div><div class='add'>+         (num_tabs==2 ? "\t\t":(num_tabs&gt;2 ? "\t\t\t":""))),p1,p2); \</div><div class='add'>+       } while (0)</div><div class='add'>+#          endif</div><div class='add'>+#        else /* __STDC __ */</div><div class='add'>+#          ifndef png_debug</div><div class='add'>+#            define png_debug(l,m) \</div><div class='add'>+       do { \</div><div class='add'>+       int num_tabs=l; \</div><div class='add'>+       char format[256]; \</div><div class='add'>+       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \</div><div class='add'>+         (num_tabs==2 ? "\t\t":(num_tabs&gt;2 ? "\t\t\t":""))), \</div><div class='add'>+         m,PNG_STRING_NEWLINE); \</div><div class='add'>+       fprintf(PNG_DEBUG_FILE,format); \</div><div class='add'>+       } while (0)</div><div class='add'>+#          endif</div><div class='add'>+#          ifndef png_debug1</div><div class='add'>+#            define png_debug1(l,m,p1) \</div><div class='add'>+       do { \</div><div class='add'>+       int num_tabs=l; \</div><div class='add'>+       char format[256]; \</div><div class='add'>+       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \</div><div class='add'>+         (num_tabs==2 ? "\t\t":(num_tabs&gt;2 ? "\t\t\t":""))), \</div><div class='add'>+         m,PNG_STRING_NEWLINE); \</div><div class='add'>+       fprintf(PNG_DEBUG_FILE,format,p1); \</div><div class='add'>+       } while (0)</div><div class='add'>+#          endif</div><div class='add'>+#          ifndef png_debug2</div><div class='add'>+#            define png_debug2(l,m,p1,p2) \</div><div class='add'>+       do { \</div><div class='add'>+       int num_tabs=l; \</div><div class='add'>+       char format[256]; \</div><div class='add'>+       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \</div><div class='add'>+         (num_tabs==2 ? "\t\t":(num_tabs&gt;2 ? "\t\t\t":""))), \</div><div class='add'>+         m,PNG_STRING_NEWLINE); \</div><div class='add'>+       fprintf(PNG_DEBUG_FILE,format,p1,p2); \</div><div class='add'>+       } while (0)</div><div class='add'>+#          endif</div><div class='add'>+#        endif /* __STDC __ */</div><div class='add'>+#      endif /* (PNG_DEBUG &gt; 1) */</div><div class='add'>+</div><div class='add'>+#    endif /* _MSC_VER */</div><div class='add'>+#  endif /* (PNG_DEBUG &gt; 0) */</div><div class='add'>+#endif /* PNG_DEBUG */</div><div class='add'>+#ifndef png_debug</div><div class='add'>+#  define png_debug(l, m) ((void)0)</div><div class='add'>+#endif</div><div class='add'>+#ifndef png_debug1</div><div class='add'>+#  define png_debug1(l, m, p1) ((void)0)</div><div class='add'>+#endif</div><div class='add'>+#ifndef png_debug2</div><div class='add'>+#  define png_debug2(l, m, p1, p2) ((void)0)</div><div class='add'>+#endif</div><div class='add'>+#endif /* PNGDEBUG_H */</div><div class='head'>diff --git a/src/3rdparty/libpng/pngerror.c b/src/3rdparty/libpng/pngerror.c<br/>index 633eae2..8290bb4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngerror.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngerror.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngerror.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngerror.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> </div><div class='ctx'> /* pngerror.c - stub functions for i/o and memory allocation</div><div class='ctx'>  *</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Last changed in libpng 1.5.1 [February 3, 2011]</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -16,18 +16,17 @@</div><div class='ctx'>  * at each function.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define PNG_NO_PEDANTIC_WARNINGS</div><div class='del'>-#include "png.h"</div><div class='del'>-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)</div><div class='ctx'> #include "pngpriv.h"</div><div class='ctx'> </div><div class='del'>-static void /* PRIVATE */</div><div class='del'>-png_default_error PNGARG((png_structp png_ptr,</div><div class='del'>-  png_const_charp error_message)) PNG_NORETURN;</div><div class='add'>+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)</div><div class='add'>+</div><div class='add'>+static PNG_FUNCTION(void, png_default_error,PNGARG((png_structp png_ptr,</div><div class='add'>+    png_const_charp error_message)),PNG_NORETURN);</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_WARNINGS_SUPPORTED</div><div class='ctx'> static void /* PRIVATE */</div><div class='ctx'> png_default_warning PNGARG((png_structp png_ptr,</div><div class='del'>-  png_const_charp warning_message));</div><div class='add'>+   png_const_charp warning_message));</div><div class='ctx'> #endif /* PNG_WARNINGS_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> /* This function is called whenever there is a fatal error.  This function</div><div class='hunk'>@@ -36,42 +35,45 @@ png_default_warning PNGARG((png_structp png_ptr,</div><div class='ctx'>  * to replace the error function at run-time.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef PNG_ERROR_TEXT_SUPPORTED</div><div class='del'>-void PNGAPI</div><div class='del'>-png_error(png_structp png_ptr, png_const_charp error_message)</div><div class='add'>+PNG_FUNCTION(void,PNGAPI</div><div class='add'>+png_error,(png_structp png_ptr, png_const_charp error_message),PNG_NORETURN)</div><div class='ctx'> {</div><div class='ctx'> #ifdef PNG_ERROR_NUMBERS_SUPPORTED</div><div class='ctx'>    char msg[16];</div><div class='ctx'>    if (png_ptr != NULL)</div><div class='ctx'>    {</div><div class='del'>-     if (png_ptr-&gt;flags&amp;</div><div class='del'>-       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))</div><div class='del'>-     {</div><div class='del'>-       if (*error_message == PNG_LITERAL_SHARP)</div><div class='del'>-       {</div><div class='del'>-           /* Strip "#nnnn " from beginning of error message. */</div><div class='del'>-           int offset;</div><div class='del'>-           for (offset = 1; offset&lt;15; offset++)</div><div class='del'>-              if (error_message[offset] == ' ')</div><div class='add'>+      if (png_ptr-&gt;flags&amp;</div><div class='add'>+         (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))</div><div class='add'>+      {</div><div class='add'>+         if (*error_message == PNG_LITERAL_SHARP)</div><div class='add'>+         {</div><div class='add'>+            /* Strip "#nnnn " from beginning of error message. */</div><div class='add'>+            int offset;</div><div class='add'>+            for (offset = 1; offset&lt;15; offset++)</div><div class='add'>+               if (error_message[offset] == ' ')</div><div class='ctx'>                   break;</div><div class='del'>-           if (png_ptr-&gt;flags&amp;PNG_FLAG_STRIP_ERROR_TEXT)</div><div class='del'>-           {</div><div class='del'>-              int i;</div><div class='del'>-              for (i = 0; i &lt; offset - 1; i++)</div><div class='del'>-                 msg[i] = error_message[i + 1];</div><div class='del'>-              msg[i - 1] = '\0';</div><div class='del'>-              error_message = msg;</div><div class='del'>-           }</div><div class='del'>-           else</div><div class='del'>-              error_message += offset;</div><div class='del'>-       }</div><div class='del'>-       else</div><div class='del'>-       {</div><div class='del'>-           if (png_ptr-&gt;flags&amp;PNG_FLAG_STRIP_ERROR_TEXT)</div><div class='del'>-           {</div><div class='del'>-              msg[0] = '0';</div><div class='del'>-              msg[1] = '\0';</div><div class='del'>-              error_message = msg;</div><div class='del'>-           }</div><div class='add'>+</div><div class='add'>+            if (png_ptr-&gt;flags&amp;PNG_FLAG_STRIP_ERROR_TEXT)</div><div class='add'>+            {</div><div class='add'>+               int i;</div><div class='add'>+               for (i = 0; i &lt; offset - 1; i++)</div><div class='add'>+                  msg[i] = error_message[i + 1];</div><div class='add'>+               msg[i - 1] = '\0';</div><div class='add'>+               error_message = msg;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            else</div><div class='add'>+               error_message += offset;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         if (png_ptr-&gt;flags&amp;PNG_FLAG_STRIP_ERROR_TEXT)</div><div class='add'>+         {</div><div class='add'>+            msg[0] = '0';</div><div class='add'>+            msg[1] = '\0';</div><div class='add'>+            error_message = msg;</div><div class='add'>+         }</div><div class='ctx'>        }</div><div class='ctx'>      }</div><div class='ctx'>    }</div><div class='hunk'>@@ -84,8 +86,8 @@ png_error(png_structp png_ptr, png_const_charp error_message)</div><div class='ctx'>    png_default_error(png_ptr, error_message);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-void PNGAPI</div><div class='del'>-png_err(png_structp png_ptr)</div><div class='add'>+PNG_FUNCTION(void,PNGAPI</div><div class='add'>+png_err,(png_structp png_ptr),PNG_NORETURN)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; png_ptr-&gt;error_fn != NULL)</div><div class='ctx'>       (*(png_ptr-&gt;error_fn))(png_ptr, '\0');</div><div class='hunk'>@@ -110,16 +112,16 @@ png_warning(png_structp png_ptr, png_const_charp warning_message)</div><div class='ctx'>    {</div><div class='ctx'> #ifdef PNG_ERROR_NUMBERS_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;flags&amp;</div><div class='del'>-     (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))</div><div class='add'>+       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))</div><div class='ctx'> #endif</div><div class='del'>-     {</div><div class='del'>-       if (*warning_message == PNG_LITERAL_SHARP)</div><div class='del'>-       {</div><div class='del'>-           for (offset = 1; offset &lt; 15; offset++)</div><div class='del'>-              if (warning_message[offset] == ' ')</div><div class='add'>+      {</div><div class='add'>+         if (*warning_message == PNG_LITERAL_SHARP)</div><div class='add'>+         {</div><div class='add'>+            for (offset = 1; offset &lt; 15; offset++)</div><div class='add'>+               if (warning_message[offset] == ' ')</div><div class='ctx'>                   break;</div><div class='del'>-       }</div><div class='del'>-     }</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='ctx'>    }</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; png_ptr-&gt;warning_fn != NULL)</div><div class='ctx'>       (*(png_ptr-&gt;warning_fn))(png_ptr, warning_message + offset);</div><div class='hunk'>@@ -133,9 +135,9 @@ void PNGAPI</div><div class='ctx'> png_benign_error(png_structp png_ptr, png_const_charp error_message)</div><div class='ctx'> {</div><div class='ctx'>   if (png_ptr-&gt;flags &amp; PNG_FLAG_BENIGN_ERRORS_WARN)</div><div class='del'>-    png_warning(png_ptr, error_message);</div><div class='add'>+     png_warning(png_ptr, error_message);</div><div class='ctx'>   else</div><div class='del'>-    png_error(png_ptr, error_message);</div><div class='add'>+     png_error(png_ptr, error_message);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -155,7 +157,7 @@ static PNG_CONST char png_digit[16] = {</div><div class='ctx'> #if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_ERROR_TEXT_SUPPORTED)</div><div class='ctx'> static void /* PRIVATE */</div><div class='ctx'> png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp</div><div class='del'>-   error_message)</div><div class='add'>+    error_message)</div><div class='ctx'> {</div><div class='ctx'>    int iout = 0, iin = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -169,6 +171,7 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp</div><div class='ctx'>          buffer[iout++] = png_digit[c &amp; 0x0f];</div><div class='ctx'>          buffer[iout++] = PNG_LITERAL_RIGHT_SQUARE_BRACKET;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          buffer[iout++] = (png_byte)c;</div><div class='hunk'>@@ -177,6 +180,7 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp</div><div class='ctx'> </div><div class='ctx'>    if (error_message == NULL)</div><div class='ctx'>       buffer[iout] = '\0';</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='ctx'>       buffer[iout++] = ':';</div><div class='hunk'>@@ -185,22 +189,24 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp</div><div class='ctx'>       buffer[iout + PNG_MAX_ERROR_TEXT - 1] = '\0';</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='add'>+#endif /* PNG_WARNINGS_SUPPORTED || PNG_ERROR_TEXT_SUPPORTED */</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_READ_SUPPORTED</div><div class='del'>-void PNGAPI</div><div class='del'>-png_chunk_error(png_structp png_ptr, png_const_charp error_message)</div><div class='add'>+#if defined(PNG_READ_SUPPORTED) &amp;&amp; defined(PNG_ERROR_TEXT_SUPPORTED)</div><div class='add'>+PNG_FUNCTION(void,PNGAPI</div><div class='add'>+png_chunk_error,(png_structp png_ptr, png_const_charp error_message),</div><div class='add'>+   PNG_NORETURN)</div><div class='ctx'> {</div><div class='ctx'>    char msg[18+PNG_MAX_ERROR_TEXT];</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='del'>-     png_error(png_ptr, error_message);</div><div class='add'>+      png_error(png_ptr, error_message);</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='del'>-     png_format_buffer(png_ptr, msg, error_message);</div><div class='del'>-     png_error(png_ptr, msg);</div><div class='add'>+      png_format_buffer(png_ptr, msg, error_message);</div><div class='add'>+      png_error(png_ptr, msg);</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='del'>-#endif /* PNG_READ_SUPPORTED */</div><div class='del'>-#endif /* PNG_WARNINGS_SUPPORTED || PNG_ERROR_TEXT_SUPPORTED */</div><div class='add'>+#endif /* PNG_READ_SUPPORTED &amp;&amp; PNG_ERROR_TEXT_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WARNINGS_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='hunk'>@@ -208,11 +214,12 @@ png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)</div><div class='ctx'> {</div><div class='ctx'>    char msg[18+PNG_MAX_ERROR_TEXT];</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='del'>-     png_warning(png_ptr, warning_message);</div><div class='add'>+      png_warning(png_ptr, warning_message);</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='del'>-     png_format_buffer(png_ptr, msg, warning_message);</div><div class='del'>-     png_warning(png_ptr, msg);</div><div class='add'>+      png_format_buffer(png_ptr, msg, warning_message);</div><div class='add'>+      png_warning(png_ptr, msg);</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> #endif /* PNG_WARNINGS_SUPPORTED */</div><div class='hunk'>@@ -222,14 +229,37 @@ png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_chunk_benign_error(png_structp png_ptr, png_const_charp error_message)</div><div class='ctx'> {</div><div class='del'>-  if (png_ptr-&gt;flags &amp; PNG_FLAG_BENIGN_ERRORS_WARN)</div><div class='del'>-    png_chunk_warning(png_ptr, error_message);</div><div class='del'>-  else</div><div class='del'>-    png_chunk_error(png_ptr, error_message);</div><div class='add'>+   if (png_ptr-&gt;flags &amp; PNG_FLAG_BENIGN_ERRORS_WARN)</div><div class='add'>+      png_chunk_warning(png_ptr, error_message);</div><div class='add'>+</div><div class='add'>+   else</div><div class='add'>+      png_chunk_error(png_ptr, error_message);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> #endif /* PNG_READ_SUPPORTED */</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_ERROR_TEXT_SUPPORTED</div><div class='add'>+#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+PNG_FUNCTION(void,</div><div class='add'>+png_fixed_error,(png_structp png_ptr, png_const_charp name),PNG_NORETURN)</div><div class='add'>+{</div><div class='add'>+#  define fixed_message "fixed point overflow in "</div><div class='add'>+#  define fixed_message_ln ((sizeof fixed_message)-1)</div><div class='add'>+   int  iin;</div><div class='add'>+   char msg[fixed_message_ln+PNG_MAX_ERROR_TEXT];</div><div class='add'>+   png_memcpy(msg, fixed_message, fixed_message_ln);</div><div class='add'>+   iin = 0;</div><div class='add'>+   if (name != NULL) while (iin &lt; (PNG_MAX_ERROR_TEXT-1) &amp;&amp; name[iin] != 0)</div><div class='add'>+   {</div><div class='add'>+      msg[fixed_message_ln + iin] = name[iin];</div><div class='add'>+      ++iin;</div><div class='add'>+   }</div><div class='add'>+   msg[fixed_message_ln + iin] = 0;</div><div class='add'>+   png_error(png_ptr, msg);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_SETJMP_SUPPORTED</div><div class='ctx'> /* This API only exists if ANSI-C style error handling is used,</div><div class='ctx'>  * otherwise it is necessary for png_default_error to be overridden.</div><div class='hunk'>@@ -242,7 +272,7 @@ png_set_longjmp_fn(png_structp png_ptr, png_longjmp_ptr longjmp_fn,</div><div class='ctx'>       return NULL;</div><div class='ctx'> </div><div class='ctx'>    png_ptr-&gt;longjmp_fn = longjmp_fn;</div><div class='del'>-   return &amp;png_ptr-&gt;jmpbuf;</div><div class='add'>+   return &amp;png_ptr-&gt;png_jmpbuf;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -251,35 +281,38 @@ png_set_longjmp_fn(png_structp png_ptr, png_longjmp_ptr longjmp_fn,</div><div class='ctx'>  * function is used by default, or if the program supplies NULL for the</div><div class='ctx'>  * error function pointer in png_set_error_fn().</div><div class='ctx'>  */</div><div class='del'>-static void /* PRIVATE */</div><div class='del'>-png_default_error(png_structp png_ptr, png_const_charp error_message)</div><div class='add'>+static PNG_FUNCTION(void /* PRIVATE */,</div><div class='add'>+png_default_error,(png_structp png_ptr, png_const_charp error_message),</div><div class='add'>+   PNG_NORETURN)</div><div class='ctx'> {</div><div class='ctx'> #ifdef PNG_CONSOLE_IO_SUPPORTED</div><div class='ctx'> #ifdef PNG_ERROR_NUMBERS_SUPPORTED</div><div class='ctx'>    if (*error_message == PNG_LITERAL_SHARP)</div><div class='ctx'>    {</div><div class='del'>-     /* Strip "#nnnn " from beginning of error message. */</div><div class='del'>-     int offset;</div><div class='del'>-     char error_number[16];</div><div class='del'>-     for (offset = 0; offset&lt;15; offset++)</div><div class='del'>-     {</div><div class='add'>+      /* Strip "#nnnn " from beginning of error message. */</div><div class='add'>+      int offset;</div><div class='add'>+      char error_number[16];</div><div class='add'>+      for (offset = 0; offset&lt;15; offset++)</div><div class='add'>+      {</div><div class='ctx'>          error_number[offset] = error_message[offset + 1];</div><div class='ctx'>          if (error_message[offset] == ' ')</div><div class='del'>-             break;</div><div class='del'>-     }</div><div class='del'>-     if ((offset &gt; 1) &amp;&amp; (offset &lt; 15))</div><div class='del'>-     {</div><div class='del'>-       error_number[offset - 1] = '\0';</div><div class='del'>-       fprintf(stderr, "libpng error no. %s: %s",</div><div class='del'>-          error_number, error_message + offset + 1);</div><div class='del'>-       fprintf(stderr, PNG_STRING_NEWLINE);</div><div class='del'>-     }</div><div class='del'>-     else</div><div class='del'>-     {</div><div class='del'>-       fprintf(stderr, "libpng error: %s, offset=%d",</div><div class='del'>-          error_message, offset);</div><div class='del'>-       fprintf(stderr, PNG_STRING_NEWLINE);</div><div class='del'>-     }</div><div class='add'>+            break;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      if ((offset &gt; 1) &amp;&amp; (offset &lt; 15))</div><div class='add'>+      {</div><div class='add'>+         error_number[offset - 1] = '\0';</div><div class='add'>+         fprintf(stderr, "libpng error no. %s: %s",</div><div class='add'>+             error_number, error_message + offset + 1);</div><div class='add'>+         fprintf(stderr, PNG_STRING_NEWLINE);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         fprintf(stderr, "libpng error: %s, offset=%d",</div><div class='add'>+             error_message, offset);</div><div class='add'>+         fprintf(stderr, PNG_STRING_NEWLINE);</div><div class='add'>+      }</div><div class='ctx'>    }</div><div class='ctx'>    else</div><div class='ctx'> #endif</div><div class='hunk'>@@ -288,26 +321,32 @@ png_default_error(png_structp png_ptr, png_const_charp error_message)</div><div class='ctx'>       fprintf(stderr, PNG_STRING_NEWLINE);</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='add'>+#ifndef PNG_CONSOLE_IO_SUPPORTED</div><div class='add'>+   PNG_UNUSED(error_message) /* Make compiler happy */</div><div class='add'>+#endif</div><div class='add'>+   png_longjmp(png_ptr, 1);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+PNG_FUNCTION(void,PNGAPI</div><div class='add'>+png_longjmp,(png_structp png_ptr, int val),PNG_NORETURN)</div><div class='add'>+{</div><div class='ctx'> #ifdef PNG_SETJMP_SUPPORTED</div><div class='ctx'>    if (png_ptr &amp;&amp; png_ptr-&gt;longjmp_fn)</div><div class='ctx'>    {</div><div class='ctx'> #  ifdef USE_FAR_KEYWORD</div><div class='del'>-   {</div><div class='del'>-      jmp_buf jmpbuf;</div><div class='del'>-      png_memcpy(jmpbuf, png_ptr-&gt;jmpbuf, png_sizeof(jmp_buf));</div><div class='del'>-     png_ptr-&gt;longjmp_fn(jmpbuf, 1);</div><div class='del'>-   }</div><div class='add'>+      {</div><div class='add'>+         jmp_buf png_jmpbuf;</div><div class='add'>+         png_memcpy(png_jmpbuf, png_ptr-&gt;png_jmpbuf, png_sizeof(jmp_buf));</div><div class='add'>+         png_ptr-&gt;longjmp_fn(png_jmpbuf, val);</div><div class='add'>+      }</div><div class='add'>+</div><div class='ctx'> #  else</div><div class='del'>-   png_ptr-&gt;longjmp_fn(png_ptr-&gt;jmpbuf, 1);</div><div class='add'>+   png_ptr-&gt;longjmp_fn(png_ptr-&gt;png_jmpbuf, val);</div><div class='ctx'> #  endif</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='ctx'>    /* Here if not setjmp support or if png_ptr is null. */</div><div class='ctx'>    PNG_ABORT();</div><div class='del'>-#ifndef PNG_CONSOLE_IO_SUPPORTED</div><div class='del'>-   error_message = error_message; /* Make compiler happy */</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WARNINGS_SUPPORTED</div><div class='hunk'>@@ -323,52 +362,56 @@ png_default_warning(png_structp png_ptr, png_const_charp warning_message)</div><div class='ctx'> #  ifdef PNG_ERROR_NUMBERS_SUPPORTED</div><div class='ctx'>    if (*warning_message == PNG_LITERAL_SHARP)</div><div class='ctx'>    {</div><div class='del'>-     int offset;</div><div class='del'>-     char warning_number[16];</div><div class='del'>-     for (offset = 0; offset &lt; 15; offset++)</div><div class='del'>-     {</div><div class='del'>-        warning_number[offset] = warning_message[offset + 1];</div><div class='del'>-        if (warning_message[offset] == ' ')</div><div class='add'>+      int offset;</div><div class='add'>+      char warning_number[16];</div><div class='add'>+      for (offset = 0; offset &lt; 15; offset++)</div><div class='add'>+      {</div><div class='add'>+         warning_number[offset] = warning_message[offset + 1];</div><div class='add'>+         if (warning_message[offset] == ' ')</div><div class='ctx'>             break;</div><div class='del'>-     }</div><div class='del'>-     if ((offset &gt; 1) &amp;&amp; (offset &lt; 15))</div><div class='del'>-     {</div><div class='del'>-       warning_number[offset + 1] = '\0';</div><div class='del'>-       fprintf(stderr, "libpng warning no. %s: %s",</div><div class='del'>-          warning_number, warning_message + offset);</div><div class='del'>-       fprintf(stderr, PNG_STRING_NEWLINE);</div><div class='del'>-     }</div><div class='del'>-     else</div><div class='del'>-     {</div><div class='del'>-       fprintf(stderr, "libpng warning: %s",</div><div class='del'>-          warning_message);</div><div class='del'>-       fprintf(stderr, PNG_STRING_NEWLINE);</div><div class='del'>-     }</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      if ((offset &gt; 1) &amp;&amp; (offset &lt; 15))</div><div class='add'>+      {</div><div class='add'>+         warning_number[offset + 1] = '\0';</div><div class='add'>+         fprintf(stderr, "libpng warning no. %s: %s",</div><div class='add'>+             warning_number, warning_message + offset);</div><div class='add'>+         fprintf(stderr, PNG_STRING_NEWLINE);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         fprintf(stderr, "libpng warning: %s",</div><div class='add'>+             warning_message);</div><div class='add'>+         fprintf(stderr, PNG_STRING_NEWLINE);</div><div class='add'>+      }</div><div class='ctx'>    }</div><div class='ctx'>    else</div><div class='ctx'> #  endif</div><div class='add'>+</div><div class='ctx'>    {</div><div class='del'>-     fprintf(stderr, "libpng warning: %s", warning_message);</div><div class='del'>-     fprintf(stderr, PNG_STRING_NEWLINE);</div><div class='add'>+      fprintf(stderr, "libpng warning: %s", warning_message);</div><div class='add'>+      fprintf(stderr, PNG_STRING_NEWLINE);</div><div class='ctx'>    }</div><div class='ctx'> #else</div><div class='del'>-   warning_message = warning_message; /* Make compiler happy */</div><div class='add'>+   PNG_UNUSED(warning_message) /* Make compiler happy */</div><div class='ctx'> #endif</div><div class='del'>-   png_ptr = png_ptr; /* Make compiler happy */</div><div class='add'>+   PNG_UNUSED(png_ptr) /* Make compiler happy */</div><div class='ctx'> }</div><div class='ctx'> #endif /* PNG_WARNINGS_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> /* This function is called when the application wants to use another method</div><div class='ctx'>  * of handling errors and warnings.  Note that the error function MUST NOT</div><div class='ctx'>  * return to the calling routine or serious problems will occur.  The return</div><div class='del'>- * method used in the default routine calls longjmp(png_ptr-&gt;jmpbuf, 1)</div><div class='add'>+ * method used in the default routine calls longjmp(png_ptr-&gt;png_jmpbuf, 1)</div><div class='ctx'>  */</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,</div><div class='del'>-   png_error_ptr error_fn, png_error_ptr warning_fn)</div><div class='add'>+    png_error_ptr error_fn, png_error_ptr warning_fn)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;error_ptr = error_ptr;</div><div class='ctx'>    png_ptr-&gt;error_fn = error_fn;</div><div class='ctx'>    png_ptr-&gt;warning_fn = warning_fn;</div><div class='hunk'>@@ -380,10 +423,11 @@ png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,</div><div class='ctx'>  * pointer before png_write_destroy and png_read_destroy are called.</div><div class='ctx'>  */</div><div class='ctx'> png_voidp PNGAPI</div><div class='del'>-png_get_error_ptr(png_structp png_ptr)</div><div class='add'>+png_get_error_ptr(png_const_structp png_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return NULL;</div><div class='add'>+</div><div class='ctx'>    return ((png_voidp)png_ptr-&gt;error_ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -394,8 +438,9 @@ png_set_strip_error_numbers(png_structp png_ptr, png_uint_32 strip_mode)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL)</div><div class='ctx'>    {</div><div class='del'>-     png_ptr-&gt;flags &amp;=</div><div class='del'>-       ((~(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))&amp;strip_mode);</div><div class='add'>+      png_ptr-&gt;flags &amp;=</div><div class='add'>+         ((~(PNG_FLAG_STRIP_ERROR_NUMBERS |</div><div class='add'>+         PNG_FLAG_STRIP_ERROR_TEXT))&amp;strip_mode);</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='head'>diff --git a/src/3rdparty/libpng/pngget.c b/src/3rdparty/libpng/pngget.c<br/>index 8611b85..b5e5798 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngget.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngget.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngget.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngget.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> </div><div class='ctx'> /* pngget.c - retrieval of values from info struct</div><div class='ctx'>  *</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Last changed in libpng 1.5.1 [February 3, 2011]</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -12,47 +12,44 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define PNG_NO_PEDANTIC_WARNINGS</div><div class='del'>-#include "png.h"</div><div class='del'>-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)</div><div class='ctx'> #include "pngpriv.h"</div><div class='ctx'> </div><div class='add'>+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)</div><div class='add'>+</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_valid(png_structp png_ptr, png_infop info_ptr, png_uint_32 flag)</div><div class='add'>+png_get_valid(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    png_uint_32 flag)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='ctx'>       return(info_ptr-&gt;valid &amp; flag);</div><div class='ctx'> </div><div class='del'>-   else</div><div class='del'>-      return(0);</div><div class='add'>+   return(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> png_size_t PNGAPI</div><div class='del'>-png_get_rowbytes(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_rowbytes(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='ctx'>       return(info_ptr-&gt;rowbytes);</div><div class='ctx'> </div><div class='del'>-   else</div><div class='del'>-      return(0);</div><div class='add'>+   return(0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_INFO_IMAGE_SUPPORTED</div><div class='ctx'> png_bytepp PNGAPI</div><div class='del'>-png_get_rows(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_rows(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='ctx'>       return(info_ptr-&gt;row_pointers);</div><div class='ctx'> </div><div class='del'>-   else</div><div class='del'>-      return(0);</div><div class='add'>+   return(0);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_EASY_ACCESS_SUPPORTED</div><div class='ctx'> /* Easy access to info, added in libpng-0.99 */</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_image_width(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_image_width(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='ctx'>       return info_ptr-&gt;width;</div><div class='hunk'>@@ -61,7 +58,7 @@ png_get_image_width(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_image_height(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_image_height(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='ctx'>       return info_ptr-&gt;height;</div><div class='hunk'>@@ -70,7 +67,7 @@ png_get_image_height(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> png_byte PNGAPI</div><div class='del'>-png_get_bit_depth(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_bit_depth(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='ctx'>       return info_ptr-&gt;bit_depth;</div><div class='hunk'>@@ -79,7 +76,7 @@ png_get_bit_depth(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> png_byte PNGAPI</div><div class='del'>-png_get_color_type(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_color_type(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='ctx'>       return info_ptr-&gt;color_type;</div><div class='hunk'>@@ -88,7 +85,7 @@ png_get_color_type(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> png_byte PNGAPI</div><div class='del'>-png_get_filter_type(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_filter_type(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='ctx'>       return info_ptr-&gt;filter_type;</div><div class='hunk'>@@ -97,7 +94,7 @@ png_get_filter_type(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> png_byte PNGAPI</div><div class='del'>-png_get_interlace_type(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_interlace_type(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='ctx'>       return info_ptr-&gt;interlace_type;</div><div class='hunk'>@@ -106,7 +103,7 @@ png_get_interlace_type(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> png_byte PNGAPI</div><div class='del'>-png_get_compression_type(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_compression_type(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='ctx'>       return info_ptr-&gt;compression_type;</div><div class='hunk'>@@ -115,222 +112,275 @@ png_get_compression_type(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_x_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_x_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='del'>-   if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='ctx'> #ifdef PNG_pHYs_SUPPORTED</div><div class='del'>-   if (info_ptr-&gt;valid &amp; PNG_INFO_pHYs)</div><div class='del'>-   {</div><div class='del'>-      png_debug1(1, "in %s retrieval function", "png_get_x_pixels_per_meter");</div><div class='del'>-</div><div class='del'>-      if (info_ptr-&gt;phys_unit_type != PNG_RESOLUTION_METER)</div><div class='del'>-          return (0);</div><div class='add'>+   if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_pHYs))</div><div class='add'>+      {</div><div class='add'>+         png_debug1(1, "in %s retrieval function",</div><div class='add'>+             "png_get_x_pixels_per_meter");</div><div class='ctx'> </div><div class='del'>-      else</div><div class='del'>-          return (info_ptr-&gt;x_pixels_per_unit);</div><div class='del'>-   }</div><div class='del'>-#else</div><div class='del'>-   return (0);</div><div class='add'>+         if (info_ptr-&gt;phys_unit_type == PNG_RESOLUTION_METER)</div><div class='add'>+            return (info_ptr-&gt;x_pixels_per_unit);</div><div class='add'>+      }</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_y_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_y_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='del'>-   if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='ctx'> #ifdef PNG_pHYs_SUPPORTED</div><div class='del'>-   if (info_ptr-&gt;valid &amp; PNG_INFO_pHYs)</div><div class='add'>+   if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_pHYs))</div><div class='ctx'>    {</div><div class='del'>-      png_debug1(1, "in %s retrieval function", "png_get_y_pixels_per_meter");</div><div class='del'>-</div><div class='del'>-      if (info_ptr-&gt;phys_unit_type != PNG_RESOLUTION_METER)</div><div class='del'>-          return (0);</div><div class='add'>+      png_debug1(1, "in %s retrieval function",</div><div class='add'>+          "png_get_y_pixels_per_meter");</div><div class='ctx'> </div><div class='del'>-      else</div><div class='del'>-          return (info_ptr-&gt;y_pixels_per_unit);</div><div class='add'>+      if (info_ptr-&gt;phys_unit_type == PNG_RESOLUTION_METER)</div><div class='add'>+         return (info_ptr-&gt;y_pixels_per_unit);</div><div class='ctx'>    }</div><div class='del'>-#else</div><div class='del'>-   return (0);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='del'>-   if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='ctx'> #ifdef PNG_pHYs_SUPPORTED</div><div class='del'>-   if (info_ptr-&gt;valid &amp; PNG_INFO_pHYs)</div><div class='add'>+   if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_pHYs))</div><div class='ctx'>    {</div><div class='ctx'>       png_debug1(1, "in %s retrieval function", "png_get_pixels_per_meter");</div><div class='ctx'> </div><div class='del'>-      if (info_ptr-&gt;phys_unit_type != PNG_RESOLUTION_METER ||</div><div class='del'>-         info_ptr-&gt;x_pixels_per_unit != info_ptr-&gt;y_pixels_per_unit)</div><div class='del'>-          return (0);</div><div class='del'>-</div><div class='del'>-      else</div><div class='del'>-          return (info_ptr-&gt;x_pixels_per_unit);</div><div class='add'>+      if (info_ptr-&gt;phys_unit_type == PNG_RESOLUTION_METER &amp;&amp;</div><div class='add'>+          info_ptr-&gt;x_pixels_per_unit == info_ptr-&gt;y_pixels_per_unit)</div><div class='add'>+         return (info_ptr-&gt;x_pixels_per_unit);</div><div class='ctx'>    }</div><div class='del'>-#else</div><div class='del'>-   return (0);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='ctx'> float PNGAPI</div><div class='del'>-png_get_pixel_aspect_ratio(png_structp png_ptr, png_infop info_ptr)</div><div class='del'>-   {</div><div class='del'>-   if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='del'>-#ifdef PNG_pHYs_SUPPORTED</div><div class='del'>-</div><div class='del'>-   if (info_ptr-&gt;valid &amp; PNG_INFO_pHYs)</div><div class='add'>+png_get_pixel_aspect_ratio(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='add'>+{</div><div class='add'>+#ifdef PNG_READ_pHYs_SUPPORTED</div><div class='add'>+   if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_pHYs))</div><div class='ctx'>    {</div><div class='ctx'>       png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio");</div><div class='ctx'> </div><div class='del'>-      if (info_ptr-&gt;x_pixels_per_unit == 0)</div><div class='del'>-         return ((float)0.0);</div><div class='del'>-</div><div class='del'>-      else</div><div class='add'>+      if (info_ptr-&gt;x_pixels_per_unit != 0)</div><div class='ctx'>          return ((float)((float)info_ptr-&gt;y_pixels_per_unit</div><div class='del'>-            /(float)info_ptr-&gt;x_pixels_per_unit));</div><div class='add'>+             /(float)info_ptr-&gt;x_pixels_per_unit));</div><div class='ctx'>    }</div><div class='del'>-#else</div><div class='del'>-      return (0.0);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'>    return ((float)0.0);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+png_fixed_point PNGAPI</div><div class='add'>+png_get_pixel_aspect_ratio_fixed(png_const_structp png_ptr,</div><div class='add'>+    png_const_infop info_ptr)</div><div class='add'>+{</div><div class='add'>+#ifdef PNG_READ_pHYs_SUPPORTED</div><div class='add'>+   if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_pHYs)</div><div class='add'>+       &amp;&amp; info_ptr-&gt;x_pixels_per_unit &gt; 0 &amp;&amp; info_ptr-&gt;y_pixels_per_unit &gt; 0</div><div class='add'>+       &amp;&amp; info_ptr-&gt;x_pixels_per_unit &lt;= PNG_UINT_31_MAX</div><div class='add'>+       &amp;&amp; info_ptr-&gt;y_pixels_per_unit &lt;= PNG_UINT_31_MAX)</div><div class='add'>+   {</div><div class='add'>+      png_fixed_point res;</div><div class='add'>+</div><div class='add'>+      png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio_fixed");</div><div class='add'>+</div><div class='add'>+      /* The following casts work because a PNG 4 byte integer only has a valid</div><div class='add'>+       * range of 0..2^31-1; otherwise the cast might overflow.</div><div class='add'>+       */</div><div class='add'>+      if (png_muldiv(&amp;res, (png_int_32)info_ptr-&gt;y_pixels_per_unit, PNG_FP_1,</div><div class='add'>+          (png_int_32)info_ptr-&gt;x_pixels_per_unit))</div><div class='add'>+         return res;</div><div class='add'>+   }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+   return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> png_int_32 PNGAPI</div><div class='del'>-png_get_x_offset_microns(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_x_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='del'>-   if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='ctx'> #ifdef PNG_oFFs_SUPPORTED</div><div class='del'>-</div><div class='del'>-   if (info_ptr-&gt;valid &amp; PNG_INFO_oFFs)</div><div class='add'>+   if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_oFFs))</div><div class='ctx'>    {</div><div class='ctx'>       png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns");</div><div class='ctx'> </div><div class='del'>-      if (info_ptr-&gt;offset_unit_type != PNG_OFFSET_MICROMETER)</div><div class='del'>-          return (0);</div><div class='del'>-</div><div class='del'>-      else</div><div class='del'>-          return (info_ptr-&gt;x_offset);</div><div class='add'>+      if (info_ptr-&gt;offset_unit_type == PNG_OFFSET_MICROMETER)</div><div class='add'>+         return (info_ptr-&gt;x_offset);</div><div class='ctx'>    }</div><div class='del'>-#else</div><div class='del'>-      return (0);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> png_int_32 PNGAPI</div><div class='del'>-png_get_y_offset_microns(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_y_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='del'>-   if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='del'>-</div><div class='ctx'> #ifdef PNG_oFFs_SUPPORTED</div><div class='del'>-   if (info_ptr-&gt;valid &amp; PNG_INFO_oFFs)</div><div class='add'>+   if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_oFFs))</div><div class='ctx'>    {</div><div class='ctx'>       png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns");</div><div class='ctx'> </div><div class='del'>-      if (info_ptr-&gt;offset_unit_type != PNG_OFFSET_MICROMETER)</div><div class='del'>-          return (0);</div><div class='del'>-</div><div class='del'>-      else</div><div class='del'>-          return (info_ptr-&gt;y_offset);</div><div class='add'>+      if (info_ptr-&gt;offset_unit_type == PNG_OFFSET_MICROMETER)</div><div class='add'>+         return (info_ptr-&gt;y_offset);</div><div class='ctx'>    }</div><div class='del'>-#else</div><div class='del'>-   return (0);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> png_int_32 PNGAPI</div><div class='del'>-png_get_x_offset_pixels(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_x_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='del'>-   if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='del'>-</div><div class='ctx'> #ifdef PNG_oFFs_SUPPORTED</div><div class='del'>-   if (info_ptr-&gt;valid &amp; PNG_INFO_oFFs)</div><div class='add'>+   if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_oFFs))</div><div class='ctx'>    {</div><div class='del'>-      png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns");</div><div class='del'>-</div><div class='del'>-      if (info_ptr-&gt;offset_unit_type != PNG_OFFSET_PIXEL)</div><div class='del'>-          return (0);</div><div class='add'>+      png_debug1(1, "in %s retrieval function", "png_get_x_offset_pixels");</div><div class='ctx'> </div><div class='del'>-      else</div><div class='del'>-          return (info_ptr-&gt;x_offset);</div><div class='add'>+      if (info_ptr-&gt;offset_unit_type == PNG_OFFSET_PIXEL)</div><div class='add'>+         return (info_ptr-&gt;x_offset);</div><div class='ctx'>    }</div><div class='del'>-#else</div><div class='del'>-   return (0);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> png_int_32 PNGAPI</div><div class='del'>-png_get_y_offset_pixels(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_y_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='del'>-   if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='del'>-</div><div class='ctx'> #ifdef PNG_oFFs_SUPPORTED</div><div class='del'>-   if (info_ptr-&gt;valid &amp; PNG_INFO_oFFs)</div><div class='add'>+   if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_oFFs))</div><div class='ctx'>    {</div><div class='del'>-      png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns");</div><div class='add'>+      png_debug1(1, "in %s retrieval function", "png_get_y_offset_pixels");</div><div class='ctx'> </div><div class='del'>-      if (info_ptr-&gt;offset_unit_type != PNG_OFFSET_PIXEL)</div><div class='del'>-          return (0);</div><div class='del'>-</div><div class='del'>-      else</div><div class='del'>-          return (info_ptr-&gt;y_offset);</div><div class='add'>+      if (info_ptr-&gt;offset_unit_type == PNG_OFFSET_PIXEL)</div><div class='add'>+         return (info_ptr-&gt;y_offset);</div><div class='ctx'>    }</div><div class='del'>-#else</div><div class='del'>-   return (0);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(PNG_INCH_CONVERSIONS) &amp;&amp; defined(PNG_FLOATING_POINT_SUPPORTED)</div><div class='add'>+#ifdef PNG_INCH_CONVERSIONS_SUPPORTED</div><div class='add'>+static png_uint_32</div><div class='add'>+ppi_from_ppm(png_uint_32 ppm)</div><div class='add'>+{</div><div class='add'>+#if 0</div><div class='add'>+   /* The conversion is *(2.54/100), in binary (32 digits):</div><div class='add'>+    * .00000110100000001001110101001001</div><div class='add'>+    */</div><div class='add'>+   png_uint_32 t1001, t1101;</div><div class='add'>+   ppm &gt;&gt;= 1;                  /* .1 */</div><div class='add'>+   t1001 = ppm + (ppm &gt;&gt; 3);   /* .1001 */</div><div class='add'>+   t1101 = t1001 + (ppm &gt;&gt; 1); /* .1101 */</div><div class='add'>+   ppm &gt;&gt;= 20;                 /* .000000000000000000001 */</div><div class='add'>+   t1101 += t1101 &gt;&gt; 15;       /* .1101000000000001101 */</div><div class='add'>+   t1001 &gt;&gt;= 11;               /* .000000000001001 */</div><div class='add'>+   t1001 += t1001 &gt;&gt; 12;       /* .000000000001001000000001001 */</div><div class='add'>+   ppm += t1001;               /* .000000000001001000001001001 */</div><div class='add'>+   ppm += t1101;               /* .110100000001001110101001001 */</div><div class='add'>+   return (ppm + 16) &gt;&gt; 5;/* .00000110100000001001110101001001 */</div><div class='add'>+#else</div><div class='add'>+   /* The argument is a PNG unsigned integer, so it is not permitted</div><div class='add'>+    * to be bigger than 2^31.</div><div class='add'>+    */</div><div class='add'>+   png_fixed_point result;</div><div class='add'>+   if (ppm &lt;= PNG_UINT_31_MAX &amp;&amp; png_muldiv(&amp;result, (png_int_32)ppm, 127,</div><div class='add'>+       5000))</div><div class='add'>+      return result;</div><div class='add'>+</div><div class='add'>+   /* Overflow. */</div><div class='add'>+   return 0;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='del'>-   return ((png_uint_32)((float)png_get_pixels_per_meter(png_ptr, info_ptr)</div><div class='del'>-     *.0254 +.5));</div><div class='add'>+   return ppi_from_ppm(png_get_pixels_per_meter(png_ptr, info_ptr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_x_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_x_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='del'>-   return ((png_uint_32)((float)png_get_x_pixels_per_meter(png_ptr, info_ptr)</div><div class='del'>-     *.0254 +.5));</div><div class='add'>+   return ppi_from_ppm(png_get_x_pixels_per_meter(png_ptr, info_ptr));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_y_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_y_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='add'>+{</div><div class='add'>+   return ppi_from_ppm(png_get_y_pixels_per_meter(png_ptr, info_ptr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+static png_fixed_point</div><div class='add'>+png_fixed_inches_from_microns(png_structp png_ptr, png_int_32 microns)</div><div class='add'>+{</div><div class='add'>+   /* Convert from metres * 1,000,000 to inches * 100,000, meters to</div><div class='add'>+    * inches is simply *(100/2.54), so we want *(10/2.54) == 500/127.</div><div class='add'>+    * Notice that this can overflow - a warning is output and 0 is</div><div class='add'>+    * returned.</div><div class='add'>+    */</div><div class='add'>+   return png_muldiv_warn(png_ptr, microns, 500, 127);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+png_fixed_point PNGAPI</div><div class='add'>+png_get_x_offset_inches_fixed(png_structp png_ptr,</div><div class='add'>+    png_const_infop info_ptr)</div><div class='add'>+{</div><div class='add'>+   return png_fixed_inches_from_microns(png_ptr,</div><div class='add'>+       png_get_x_offset_microns(png_ptr, info_ptr));</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+png_fixed_point PNGAPI</div><div class='add'>+png_get_y_offset_inches_fixed(png_structp png_ptr,</div><div class='add'>+    png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='del'>-   return ((png_uint_32)((float)png_get_y_pixels_per_meter(png_ptr, info_ptr)</div><div class='del'>-     *.0254 +.5));</div><div class='add'>+   return png_fixed_inches_from_microns(png_ptr,</div><div class='add'>+       png_get_y_offset_microns(png_ptr, info_ptr));</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='ctx'> float PNGAPI</div><div class='del'>-png_get_x_offset_inches(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_x_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='del'>-   return ((float)png_get_x_offset_microns(png_ptr, info_ptr)</div><div class='del'>-     *.00003937);</div><div class='add'>+   /* To avoid the overflow do the conversion directly in floating</div><div class='add'>+    * point.</div><div class='add'>+    */</div><div class='add'>+   return (float)(png_get_x_offset_microns(png_ptr, info_ptr) * .00003937);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='ctx'> float PNGAPI</div><div class='del'>-png_get_y_offset_inches(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_y_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='del'>-   return ((float)png_get_y_offset_microns(png_ptr, info_ptr)</div><div class='del'>-     *.00003937);</div><div class='add'>+   /* To avoid the overflow do the conversion directly in floating</div><div class='add'>+    * point.</div><div class='add'>+    */</div><div class='add'>+   return (float)(png_get_y_offset_microns(png_ptr, info_ptr) * .00003937);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_pHYs_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_pHYs_dpi(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)</div><div class='add'>+png_get_pHYs_dpi(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)</div><div class='ctx'> {</div><div class='ctx'>    png_uint_32 retval = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -343,15 +393,18 @@ png_get_pHYs_dpi(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>          *res_x = info_ptr-&gt;x_pixels_per_unit;</div><div class='ctx'>          retval |= PNG_INFO_pHYs;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       if (res_y != NULL)</div><div class='ctx'>       {</div><div class='ctx'>          *res_y = info_ptr-&gt;y_pixels_per_unit;</div><div class='ctx'>          retval |= PNG_INFO_pHYs;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       if (unit_type != NULL)</div><div class='ctx'>       {</div><div class='ctx'>          *unit_type = (int)info_ptr-&gt;phys_unit_type;</div><div class='ctx'>          retval |= PNG_INFO_pHYs;</div><div class='add'>+</div><div class='ctx'>          if (*unit_type == 1)</div><div class='ctx'>          {</div><div class='ctx'>             if (res_x != NULL) *res_x = (png_uint_32)(*res_x * .0254 + .50);</div><div class='hunk'>@@ -359,176 +412,182 @@ png_get_pHYs_dpi(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (retval);</div><div class='ctx'> }</div><div class='ctx'> #endif /* PNG_pHYs_SUPPORTED */</div><div class='del'>-#endif  /* PNG_INCH_CONVERSIONS &amp;&amp; PNG_FLOATING_POINT_SUPPORTED */</div><div class='add'>+#endif  /* PNG_INCH_CONVERSIONS_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> /* png_get_channels really belongs in here, too, but it's been around longer */</div><div class='ctx'> </div><div class='ctx'> #endif  /* PNG_EASY_ACCESS_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> png_byte PNGAPI</div><div class='del'>-png_get_channels(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_get_channels(png_const_structp png_ptr, png_const_infop info_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='ctx'>       return(info_ptr-&gt;channels);</div><div class='del'>-   else</div><div class='del'>-      return (0);</div><div class='add'>+</div><div class='add'>+   return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-png_bytep PNGAPI</div><div class='del'>-png_get_signature(png_structp png_ptr, png_infop info_ptr)</div><div class='add'>+png_const_bytep PNGAPI</div><div class='add'>+png_get_signature(png_const_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL)</div><div class='ctx'>       return(info_ptr-&gt;signature);</div><div class='del'>-   else</div><div class='del'>-      return (NULL);</div><div class='add'>+</div><div class='add'>+   return (NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_bKGD_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_bKGD(png_structp png_ptr, png_infop info_ptr,</div><div class='add'>+png_get_bKGD(png_const_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>    png_color_16p *background)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_bKGD)</div><div class='del'>-      &amp;&amp; background != NULL)</div><div class='add'>+       &amp;&amp; background != NULL)</div><div class='ctx'>    {</div><div class='ctx'>       png_debug1(1, "in %s retrieval function", "bKGD");</div><div class='ctx'> </div><div class='ctx'>       *background = &amp;(info_ptr-&gt;background);</div><div class='ctx'>       return (PNG_INFO_bKGD);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_cHRM_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_cHRM(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   double *white_x, double *white_y, double *red_x, double *red_y,</div><div class='del'>-   double *green_x, double *green_y, double *blue_x, double *blue_y)</div><div class='add'>+png_get_cHRM(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    double *white_x, double *white_y, double *red_x, double *red_y,</div><div class='add'>+    double *green_x, double *green_y, double *blue_x, double *blue_y)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_cHRM))</div><div class='ctx'>    {</div><div class='ctx'>       png_debug1(1, "in %s retrieval function", "cHRM");</div><div class='ctx'> </div><div class='ctx'>       if (white_x != NULL)</div><div class='del'>-         *white_x = (double)info_ptr-&gt;x_white;</div><div class='add'>+         *white_x = png_float(png_ptr, info_ptr-&gt;x_white, "cHRM white X");</div><div class='ctx'>       if (white_y != NULL)</div><div class='del'>-         *white_y = (double)info_ptr-&gt;y_white;</div><div class='add'>+         *white_y = png_float(png_ptr, info_ptr-&gt;y_white, "cHRM white Y");</div><div class='ctx'>       if (red_x != NULL)</div><div class='del'>-         *red_x = (double)info_ptr-&gt;x_red;</div><div class='add'>+         *red_x = png_float(png_ptr, info_ptr-&gt;x_red, "cHRM red X");</div><div class='ctx'>       if (red_y != NULL)</div><div class='del'>-         *red_y = (double)info_ptr-&gt;y_red;</div><div class='add'>+         *red_y = png_float(png_ptr, info_ptr-&gt;y_red, "cHRM red Y");</div><div class='ctx'>       if (green_x != NULL)</div><div class='del'>-         *green_x = (double)info_ptr-&gt;x_green;</div><div class='add'>+         *green_x = png_float(png_ptr, info_ptr-&gt;x_green, "cHRM green X");</div><div class='ctx'>       if (green_y != NULL)</div><div class='del'>-         *green_y = (double)info_ptr-&gt;y_green;</div><div class='add'>+         *green_y = png_float(png_ptr, info_ptr-&gt;y_green, "cHRM green Y");</div><div class='ctx'>       if (blue_x != NULL)</div><div class='del'>-         *blue_x = (double)info_ptr-&gt;x_blue;</div><div class='add'>+         *blue_x = png_float(png_ptr, info_ptr-&gt;x_blue, "cHRM blue X");</div><div class='ctx'>       if (blue_y != NULL)</div><div class='del'>-         *blue_y = (double)info_ptr-&gt;y_blue;</div><div class='add'>+         *blue_y = png_float(png_ptr, info_ptr-&gt;y_blue, "cHRM blue Y");</div><div class='ctx'>       return (PNG_INFO_cHRM);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+#  endif</div><div class='add'>+</div><div class='add'>+#  ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,</div><div class='del'>-   png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,</div><div class='del'>-   png_fixed_point *blue_x, png_fixed_point *blue_y)</div><div class='add'>+png_get_cHRM_fixed(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,</div><div class='add'>+    png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,</div><div class='add'>+    png_fixed_point *blue_x, png_fixed_point *blue_y)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s retrieval function", "cHRM");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_cHRM))</div><div class='ctx'>    {</div><div class='ctx'>       if (white_x != NULL)</div><div class='del'>-         *white_x = info_ptr-&gt;int_x_white;</div><div class='add'>+         *white_x = info_ptr-&gt;x_white;</div><div class='ctx'>       if (white_y != NULL)</div><div class='del'>-         *white_y = info_ptr-&gt;int_y_white;</div><div class='add'>+         *white_y = info_ptr-&gt;y_white;</div><div class='ctx'>       if (red_x != NULL)</div><div class='del'>-         *red_x = info_ptr-&gt;int_x_red;</div><div class='add'>+         *red_x = info_ptr-&gt;x_red;</div><div class='ctx'>       if (red_y != NULL)</div><div class='del'>-         *red_y = info_ptr-&gt;int_y_red;</div><div class='add'>+         *red_y = info_ptr-&gt;y_red;</div><div class='ctx'>       if (green_x != NULL)</div><div class='del'>-         *green_x = info_ptr-&gt;int_x_green;</div><div class='add'>+         *green_x = info_ptr-&gt;x_green;</div><div class='ctx'>       if (green_y != NULL)</div><div class='del'>-         *green_y = info_ptr-&gt;int_y_green;</div><div class='add'>+         *green_y = info_ptr-&gt;y_green;</div><div class='ctx'>       if (blue_x != NULL)</div><div class='del'>-         *blue_x = info_ptr-&gt;int_x_blue;</div><div class='add'>+         *blue_x = info_ptr-&gt;x_blue;</div><div class='ctx'>       if (blue_y != NULL)</div><div class='del'>-         *blue_y = info_ptr-&gt;int_y_blue;</div><div class='add'>+         *blue_y = info_ptr-&gt;y_blue;</div><div class='ctx'>       return (PNG_INFO_cHRM);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_gAMA_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-png_uint_32 PNGAPI</div><div class='del'>-png_get_gAMA(png_structp png_ptr, png_infop info_ptr, double *file_gamma)</div><div class='add'>+png_uint_32 PNGFAPI</div><div class='add'>+png_get_gAMA_fixed(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    png_fixed_point *file_gamma)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s retrieval function", "gAMA");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_gAMA)</div><div class='del'>-      &amp;&amp; file_gamma != NULL)</div><div class='add'>+       &amp;&amp; file_gamma != NULL)</div><div class='ctx'>    {</div><div class='del'>-      *file_gamma = (double)info_ptr-&gt;gamma;</div><div class='add'>+      *file_gamma = info_ptr-&gt;gamma;</div><div class='ctx'>       return (PNG_INFO_gAMA);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_gAMA_fixed(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-    png_fixed_point *int_file_gamma)</div><div class='add'>+png_get_gAMA(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    double *file_gamma)</div><div class='ctx'> {</div><div class='del'>-   png_debug1(1, "in %s retrieval function", "gAMA");</div><div class='add'>+   png_fixed_point igamma;</div><div class='add'>+   png_uint_32 ok = png_get_gAMA_fixed(png_ptr, info_ptr, &amp;igamma);</div><div class='ctx'> </div><div class='del'>-   if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_gAMA)</div><div class='del'>-      &amp;&amp; int_file_gamma != NULL)</div><div class='del'>-   {</div><div class='del'>-      *int_file_gamma = info_ptr-&gt;int_gamma;</div><div class='del'>-      return (PNG_INFO_gAMA);</div><div class='del'>-   }</div><div class='del'>-   return (0);</div><div class='add'>+   if (ok)</div><div class='add'>+      *file_gamma = png_float(png_ptr, igamma, "png_get_gAMA");</div><div class='add'>+</div><div class='add'>+   return ok;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+#  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_sRGB_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_sRGB(png_structp png_ptr, png_infop info_ptr, int *file_srgb_intent)</div><div class='add'>+png_get_sRGB(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    int *file_srgb_intent)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s retrieval function", "sRGB");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_sRGB)</div><div class='del'>-      &amp;&amp; file_srgb_intent != NULL)</div><div class='add'>+       &amp;&amp; file_srgb_intent != NULL)</div><div class='ctx'>    {</div><div class='ctx'>       *file_srgb_intent = (int)info_ptr-&gt;srgb_intent;</div><div class='ctx'>       return (PNG_INFO_sRGB);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_iCCP_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_iCCP(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-             png_charpp name, int *compression_type,</div><div class='del'>-             png_charpp profile, png_uint_32 *proflen)</div><div class='add'>+png_get_iCCP(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    png_charpp name, int *compression_type,</div><div class='add'>+    png_bytepp profile, png_uint_32 *proflen)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s retrieval function", "iCCP");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_iCCP)</div><div class='del'>-      &amp;&amp; name != NULL &amp;&amp; profile != NULL &amp;&amp; proflen != NULL)</div><div class='add'>+       &amp;&amp; name != NULL &amp;&amp; profile != NULL &amp;&amp; proflen != NULL)</div><div class='ctx'>    {</div><div class='ctx'>       *name = info_ptr-&gt;iccp_name;</div><div class='ctx'>       *profile = info_ptr-&gt;iccp_profile;</div><div class='hunk'>@@ -539,45 +598,49 @@ png_get_iCCP(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>       *compression_type = (int)info_ptr-&gt;iccp_compression;</div><div class='ctx'>       return (PNG_INFO_iCCP);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_sPLT_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_sPLT(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-             png_sPLT_tpp spalettes)</div><div class='add'>+png_get_sPLT(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    png_sPLT_tpp spalettes)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; spalettes != NULL)</div><div class='ctx'>    {</div><div class='del'>-     *spalettes = info_ptr-&gt;splt_palettes;</div><div class='del'>-     return ((png_uint_32)info_ptr-&gt;splt_palettes_num);</div><div class='add'>+      *spalettes = info_ptr-&gt;splt_palettes;</div><div class='add'>+      return ((png_uint_32)info_ptr-&gt;splt_palettes_num);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_hIST_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p *hist)</div><div class='add'>+png_get_hIST(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    png_uint_16p *hist)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s retrieval function", "hIST");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_hIST)</div><div class='del'>-      &amp;&amp; hist != NULL)</div><div class='add'>+       &amp;&amp; hist != NULL)</div><div class='ctx'>    {</div><div class='ctx'>       *hist = info_ptr-&gt;hist;</div><div class='ctx'>       return (PNG_INFO_hIST);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> png_uint_32 PNGAPI</div><div class='ctx'> png_get_IHDR(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 *width, png_uint_32 *height, int *bit_depth,</div><div class='del'>-   int *color_type, int *interlace_type, int *compression_type,</div><div class='del'>-   int *filter_type)</div><div class='add'>+    png_uint_32 *width, png_uint_32 *height, int *bit_depth,</div><div class='add'>+    int *color_type, int *interlace_type, int *compression_type,</div><div class='add'>+    int *filter_type)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s retrieval function", "IHDR");</div><div class='hunk'>@@ -614,28 +677,29 @@ png_get_IHDR(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_oFFs_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_oFFs(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type)</div><div class='add'>+png_get_oFFs(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s retrieval function", "oFFs");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_oFFs)</div><div class='del'>-      &amp;&amp; offset_x != NULL &amp;&amp; offset_y != NULL &amp;&amp; unit_type != NULL)</div><div class='add'>+       &amp;&amp; offset_x != NULL &amp;&amp; offset_y != NULL &amp;&amp; unit_type != NULL)</div><div class='ctx'>    {</div><div class='ctx'>       *offset_x = info_ptr-&gt;x_offset;</div><div class='ctx'>       *offset_y = info_ptr-&gt;y_offset;</div><div class='ctx'>       *unit_type = (int)info_ptr-&gt;offset_unit_type;</div><div class='ctx'>       return (PNG_INFO_oFFs);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_pCAL_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_pCAL(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,</div><div class='del'>-   png_charp *units, png_charpp *params)</div><div class='add'>+png_get_pCAL(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,</div><div class='add'>+    png_charp *units, png_charpp *params)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s retrieval function", "pCAL");</div><div class='ctx'> </div><div class='hunk'>@@ -652,57 +716,78 @@ png_get_pCAL(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>       *params = info_ptr-&gt;pcal_params;</div><div class='ctx'>       return (PNG_INFO_pCAL);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_sCAL_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+#  ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+#    ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED</div><div class='add'>+png_uint_32 PNGAPI</div><div class='add'>+png_get_sCAL_fixed(png_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    int *unit, png_fixed_point *width, png_fixed_point *height)</div><div class='add'>+{</div><div class='add'>+   if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp;</div><div class='add'>+       (info_ptr-&gt;valid &amp; PNG_INFO_sCAL))</div><div class='add'>+   {</div><div class='add'>+      *unit = info_ptr-&gt;scal_unit;</div><div class='add'>+      /*TODO: make this work without FP support */</div><div class='add'>+      *width = png_fixed(png_ptr, atof(info_ptr-&gt;scal_s_width), "sCAL width");</div><div class='add'>+      *height = png_fixed(png_ptr, atof(info_ptr-&gt;scal_s_height),</div><div class='add'>+         "sCAL height");</div><div class='add'>+      return (PNG_INFO_sCAL);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return(0);</div><div class='add'>+}</div><div class='add'>+#    endif /* FLOATING_ARITHMETIC */</div><div class='add'>+#  endif /* FIXED_POINT */</div><div class='add'>+#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_sCAL(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-             int *unit, double *width, double *height)</div><div class='add'>+png_get_sCAL(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    int *unit, double *width, double *height)</div><div class='ctx'> {</div><div class='del'>-    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp;</div><div class='del'>-        (info_ptr-&gt;valid &amp; PNG_INFO_sCAL))</div><div class='del'>-    {</div><div class='del'>-        *unit = info_ptr-&gt;scal_unit;</div><div class='del'>-        *width = info_ptr-&gt;scal_pixel_width;</div><div class='del'>-        *height = info_ptr-&gt;scal_pixel_height;</div><div class='del'>-        return (PNG_INFO_sCAL);</div><div class='del'>-    }</div><div class='del'>-    return(0);</div><div class='add'>+   if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp;</div><div class='add'>+       (info_ptr-&gt;valid &amp; PNG_INFO_sCAL))</div><div class='add'>+   {</div><div class='add'>+      *unit = info_ptr-&gt;scal_unit;</div><div class='add'>+      *width = atof(info_ptr-&gt;scal_s_width);</div><div class='add'>+      *height = atof(info_ptr-&gt;scal_s_height);</div><div class='add'>+      return (PNG_INFO_sCAL);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return(0);</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+#  endif /* FLOATING POINT */</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_sCAL_s(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-             int *unit, png_charpp width, png_charpp height)</div><div class='add'>+png_get_sCAL_s(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    int *unit, png_charpp width, png_charpp height)</div><div class='ctx'> {</div><div class='del'>-    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp;</div><div class='del'>-        (info_ptr-&gt;valid &amp; PNG_INFO_sCAL))</div><div class='del'>-    {</div><div class='del'>-        *unit = info_ptr-&gt;scal_unit;</div><div class='del'>-        *width = info_ptr-&gt;scal_s_width;</div><div class='del'>-        *height = info_ptr-&gt;scal_s_height;</div><div class='del'>-        return (PNG_INFO_sCAL);</div><div class='del'>-    }</div><div class='del'>-    return(0);</div><div class='add'>+   if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp;</div><div class='add'>+       (info_ptr-&gt;valid &amp; PNG_INFO_sCAL))</div><div class='add'>+   {</div><div class='add'>+      *unit = info_ptr-&gt;scal_unit;</div><div class='add'>+      *width = info_ptr-&gt;scal_s_width;</div><div class='add'>+      *height = info_ptr-&gt;scal_s_height;</div><div class='add'>+      return (PNG_INFO_sCAL);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return(0);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='add'>+#endif /* sCAL */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_pHYs_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_pHYs(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)</div><div class='add'>+png_get_pHYs(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)</div><div class='ctx'> {</div><div class='ctx'>    png_uint_32 retval = 0;</div><div class='ctx'> </div><div class='ctx'>    png_debug1(1, "in %s retrieval function", "pHYs");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp;</div><div class='del'>-      (info_ptr-&gt;valid &amp; PNG_INFO_pHYs))</div><div class='add'>+       (info_ptr-&gt;valid &amp; PNG_INFO_pHYs))</div><div class='ctx'>    {</div><div class='ctx'>       if (res_x != NULL)</div><div class='ctx'>       {</div><div class='hunk'>@@ -722,13 +807,14 @@ png_get_pHYs(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>          retval |= PNG_INFO_pHYs;</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (retval);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+#endif /* pHYs */</div><div class='ctx'> </div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_PLTE(png_structp png_ptr, png_infop info_ptr, png_colorp *palette,</div><div class='del'>-   int *num_palette)</div><div class='add'>+png_get_PLTE(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    png_colorp *palette, int *num_palette)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s retrieval function", "PLTE");</div><div class='ctx'> </div><div class='hunk'>@@ -740,35 +826,38 @@ png_get_PLTE(png_structp png_ptr, png_infop info_ptr, png_colorp *palette,</div><div class='ctx'>       png_debug1(3, "num_palette = %d", *num_palette);</div><div class='ctx'>       return (PNG_INFO_PLTE);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_sBIT_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_sBIT(png_structp png_ptr, png_infop info_ptr, png_color_8p *sig_bit)</div><div class='add'>+png_get_sBIT(png_const_structp png_ptr, png_infop info_ptr,</div><div class='add'>+    png_color_8p *sig_bit)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s retrieval function", "sBIT");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_sBIT)</div><div class='del'>-      &amp;&amp; sig_bit != NULL)</div><div class='add'>+       &amp;&amp; sig_bit != NULL)</div><div class='ctx'>    {</div><div class='ctx'>       *sig_bit = &amp;(info_ptr-&gt;sig_bit);</div><div class='ctx'>       return (PNG_INFO_sBIT);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_TEXT_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_text(png_structp png_ptr, png_infop info_ptr, png_textp *text_ptr,</div><div class='del'>-   int *num_text)</div><div class='add'>+png_get_text(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    png_textp *text_ptr, int *num_text)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; info_ptr-&gt;num_text &gt; 0)</div><div class='ctx'>    {</div><div class='ctx'>       png_debug1(1, "in %s retrieval function",</div><div class='del'>-         (png_ptr-&gt;chunk_name[0] == '\0' ? "text"</div><div class='del'>-             : (png_const_charp)png_ptr-&gt;chunk_name));</div><div class='add'>+          (png_ptr-&gt;chunk_name[0] == '\0' ? "text" :</div><div class='add'>+          (png_const_charp)png_ptr-&gt;chunk_name));</div><div class='ctx'> </div><div class='ctx'>       if (text_ptr != NULL)</div><div class='ctx'>          *text_ptr = info_ptr-&gt;text;</div><div class='hunk'>@@ -778,15 +867,17 @@ png_get_text(png_structp png_ptr, png_infop info_ptr, png_textp *text_ptr,</div><div class='ctx'> </div><div class='ctx'>       return ((png_uint_32)info_ptr-&gt;num_text);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (num_text != NULL)</div><div class='del'>-     *num_text = 0;</div><div class='add'>+      *num_text = 0;</div><div class='add'>+</div><div class='ctx'>    return(0);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_tIME_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_tIME(png_structp png_ptr, png_infop info_ptr, png_timep *mod_time)</div><div class='add'>+png_get_tIME(png_const_structp png_ptr, png_infop info_ptr, png_timep *mod_time)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s retrieval function", "tIME");</div><div class='ctx'> </div><div class='hunk'>@@ -796,14 +887,15 @@ png_get_tIME(png_structp png_ptr, png_infop info_ptr, png_timep *mod_time)</div><div class='ctx'>       *mod_time = &amp;(info_ptr-&gt;mod_time);</div><div class='ctx'>       return (PNG_INFO_tIME);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_tRNS_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_tRNS(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color)</div><div class='add'>+png_get_tRNS(png_const_structp png_ptr, png_infop info_ptr,</div><div class='add'>+    png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color)</div><div class='ctx'> {</div><div class='ctx'>    png_uint_32 retval = 0;</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_tRNS))</div><div class='hunk'>@@ -812,104 +904,125 @@ png_get_tRNS(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'> </div><div class='ctx'>       if (info_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>       {</div><div class='del'>-          if (trans_alpha != NULL)</div><div class='del'>-          {</div><div class='del'>-             *trans_alpha = info_ptr-&gt;trans_alpha;</div><div class='del'>-             retval |= PNG_INFO_tRNS;</div><div class='del'>-          }</div><div class='del'>-</div><div class='del'>-          if (trans_color != NULL)</div><div class='del'>-             *trans_color = &amp;(info_ptr-&gt;trans_color);</div><div class='add'>+         if (trans_alpha != NULL)</div><div class='add'>+         {</div><div class='add'>+            *trans_alpha = info_ptr-&gt;trans_alpha;</div><div class='add'>+            retval |= PNG_INFO_tRNS;</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         if (trans_color != NULL)</div><div class='add'>+            *trans_color = &amp;(info_ptr-&gt;trans_color);</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else /* if (info_ptr-&gt;color_type != PNG_COLOR_TYPE_PALETTE) */</div><div class='ctx'>       {</div><div class='del'>-          if (trans_color != NULL)</div><div class='del'>-          {</div><div class='del'>-             *trans_color = &amp;(info_ptr-&gt;trans_color);</div><div class='del'>-             retval |= PNG_INFO_tRNS;</div><div class='del'>-          }</div><div class='del'>-</div><div class='del'>-          if (trans_alpha != NULL)</div><div class='del'>-             *trans_alpha = NULL;</div><div class='add'>+         if (trans_color != NULL)</div><div class='add'>+         {</div><div class='add'>+            *trans_color = &amp;(info_ptr-&gt;trans_color);</div><div class='add'>+            retval |= PNG_INFO_tRNS;</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         if (trans_alpha != NULL)</div><div class='add'>+            *trans_alpha = NULL;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       if (num_trans != NULL)</div><div class='ctx'>       {</div><div class='ctx'>          *num_trans = info_ptr-&gt;num_trans;</div><div class='ctx'>          retval |= PNG_INFO_tRNS;</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (retval);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED</div><div class='del'>-png_uint_32 PNGAPI</div><div class='del'>-png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-             png_unknown_chunkpp unknowns)</div><div class='add'>+int PNGAPI</div><div class='add'>+png_get_unknown_chunks(png_const_structp png_ptr, png_const_infop info_ptr,</div><div class='add'>+    png_unknown_chunkpp unknowns)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; unknowns != NULL)</div><div class='ctx'>    {</div><div class='del'>-     *unknowns = info_ptr-&gt;unknown_chunks;</div><div class='del'>-     return ((png_uint_32)info_ptr-&gt;unknown_chunks_num);</div><div class='add'>+      *unknowns = info_ptr-&gt;unknown_chunks;</div><div class='add'>+      return info_ptr-&gt;unknown_chunks_num;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    return (0);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED</div><div class='ctx'> png_byte PNGAPI</div><div class='del'>-png_get_rgb_to_gray_status (png_structp png_ptr)</div><div class='add'>+png_get_rgb_to_gray_status (png_const_structp png_ptr)</div><div class='ctx'> {</div><div class='del'>-   return (png_byte)(png_ptr? png_ptr-&gt;rgb_to_gray_status : 0);</div><div class='add'>+   return (png_byte)(png_ptr ? png_ptr-&gt;rgb_to_gray_status : 0);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_USER_CHUNKS_SUPPORTED</div><div class='ctx'> png_voidp PNGAPI</div><div class='del'>-png_get_user_chunk_ptr(png_structp png_ptr)</div><div class='add'>+png_get_user_chunk_ptr(png_const_structp png_ptr)</div><div class='ctx'> {</div><div class='del'>-   return (png_ptr? png_ptr-&gt;user_chunk_ptr : NULL);</div><div class='add'>+   return (png_ptr ? png_ptr-&gt;user_chunk_ptr : NULL);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_WRITE_SUPPORTED</div><div class='ctx'> png_size_t PNGAPI</div><div class='del'>-png_get_compression_buffer_size(png_structp png_ptr)</div><div class='add'>+png_get_compression_buffer_size(png_const_structp png_ptr)</div><div class='ctx'> {</div><div class='ctx'>    return (png_ptr ? png_ptr-&gt;zbuf_size : 0L);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_SET_USER_LIMITS_SUPPORTED</div><div class='del'>-/* These functions were added to libpng 1.2.6 */</div><div class='add'>+/* These functions were added to libpng 1.2.6 and were enabled</div><div class='add'>+ * by default in libpng-1.4.0 */</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_user_width_max (png_structp png_ptr)</div><div class='add'>+png_get_user_width_max (png_const_structp png_ptr)</div><div class='ctx'> {</div><div class='del'>-    return (png_ptr? png_ptr-&gt;user_width_max : 0);</div><div class='add'>+   return (png_ptr ? png_ptr-&gt;user_width_max : 0);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_user_height_max (png_structp png_ptr)</div><div class='add'>+png_get_user_height_max (png_const_structp png_ptr)</div><div class='ctx'> {</div><div class='del'>-    return (png_ptr? png_ptr-&gt;user_height_max : 0);</div><div class='add'>+   return (png_ptr ? png_ptr-&gt;user_height_max : 0);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> /* This function was added to libpng 1.4.0 */</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_chunk_cache_max (png_structp png_ptr)</div><div class='add'>+png_get_chunk_cache_max (png_const_structp png_ptr)</div><div class='add'>+{</div><div class='add'>+   return (png_ptr ? png_ptr-&gt;user_chunk_cache_max : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function was added to libpng 1.4.1 */</div><div class='add'>+png_alloc_size_t PNGAPI</div><div class='add'>+png_get_chunk_malloc_max (png_const_structp png_ptr)</div><div class='ctx'> {</div><div class='del'>-    return (png_ptr? png_ptr-&gt;user_chunk_cache_max? 0x7fffffffL :</div><div class='del'>-       png_ptr-&gt;user_chunk_cache_max - 1 : 0);</div><div class='add'>+   return (png_ptr ? png_ptr-&gt;user_chunk_malloc_max : 0);</div><div class='ctx'> }</div><div class='ctx'> #endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */</div><div class='ctx'> </div><div class='add'>+/* These functions were added to libpng 1.4.0 */</div><div class='ctx'> #ifdef PNG_IO_STATE_SUPPORTED</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='ctx'> png_get_io_state (png_structp png_ptr)</div><div class='ctx'> {</div><div class='del'>-    return png_ptr-&gt;io_state;</div><div class='add'>+   return png_ptr-&gt;io_state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+png_uint_32 PNGAPI</div><div class='add'>+png_get_io_chunk_type (png_const_structp png_ptr)</div><div class='add'>+{</div><div class='add'>+   return ((png_ptr-&gt;chunk_name[0] &lt;&lt; 24) +</div><div class='add'>+           (png_ptr-&gt;chunk_name[1] &lt;&lt; 16) +</div><div class='add'>+           (png_ptr-&gt;chunk_name[2] &lt;&lt;  8) +</div><div class='add'>+           (png_ptr-&gt;chunk_name[3]));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-png_bytep PNGAPI</div><div class='add'>+png_const_bytep PNGAPI</div><div class='ctx'> png_get_io_chunk_name (png_structp png_ptr)</div><div class='ctx'> {</div><div class='ctx'>    return png_ptr-&gt;chunk_name;</div><div class='head'>diff --git a/src/3rdparty/libpng/pnginfo.h b/src/3rdparty/libpng/pnginfo.h<br/>new file mode 100644<br/>index 0000000..fa19f85<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pnginfo.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pnginfo.h</a></div><div class='hunk'>@@ -0,0 +1,270 @@</div><div class='add'>+</div><div class='add'>+/* pnginfo.h - header file for PNG reference library</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='add'>+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='add'>+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='add'>+ *</div><div class='add'>+ * Last changed in libpng 1.5.0 [January 6, 2011]</div><div class='add'>+ *</div><div class='add'>+ * This code is released under the libpng license.</div><div class='add'>+ * For conditions of distribution and use, see the disclaimer</div><div class='add'>+ * and license in png.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+ /* png_info is a structure that holds the information in a PNG file so</div><div class='add'>+ * that the application can find out the characteristics of the image.</div><div class='add'>+ * If you are reading the file, this structure will tell you what is</div><div class='add'>+ * in the PNG file.  If you are writing the file, fill in the information</div><div class='add'>+ * you want to put into the PNG file, using png_set_*() functions, then</div><div class='add'>+ * call png_write_info().</div><div class='add'>+ *</div><div class='add'>+ * The names chosen should be very close to the PNG specification, so</div><div class='add'>+ * consult that document for information about the meaning of each field.</div><div class='add'>+ *</div><div class='add'>+ * With libpng &lt; 0.95, it was only possible to directly set and read the</div><div class='add'>+ * the values in the png_info_struct, which meant that the contents and</div><div class='add'>+ * order of the values had to remain fixed.  With libpng 0.95 and later,</div><div class='add'>+ * however, there are now functions that abstract the contents of</div><div class='add'>+ * png_info_struct from the application, so this makes it easier to use</div><div class='add'>+ * libpng with dynamic libraries, and even makes it possible to use</div><div class='add'>+ * libraries that don't have all of the libpng ancillary chunk-handing</div><div class='add'>+ * functionality.  In libpng-1.5.0 this was moved into a separate private</div><div class='add'>+ * file that is not visible to applications.</div><div class='add'>+ *</div><div class='add'>+ * The following members may have allocated storage attached that should be</div><div class='add'>+ * cleaned up before the structure is discarded: palette, trans, text,</div><div class='add'>+ * pcal_purpose, pcal_units, pcal_params, hist, iccp_name, iccp_profile,</div><div class='add'>+ * splt_palettes, scal_unit, row_pointers, and unknowns.   By default, these</div><div class='add'>+ * are automatically freed when the info structure is deallocated, if they were</div><div class='add'>+ * allocated internally by libpng.  This behavior can be changed by means</div><div class='add'>+ * of the png_data_freer() function.</div><div class='add'>+ *</div><div class='add'>+ * More allocation details: all the chunk-reading functions that</div><div class='add'>+ * change these members go through the corresponding png_set_*</div><div class='add'>+ * functions.  A function to clear these members is available: see</div><div class='add'>+ * png_free_data().  The png_set_* functions do not depend on being</div><div class='add'>+ * able to point info structure members to any of the storage they are</div><div class='add'>+ * passed (they make their own copies), EXCEPT that the png_set_text</div><div class='add'>+ * functions use the same storage passed to them in the text_ptr or</div><div class='add'>+ * itxt_ptr structure argument, and the png_set_rows and png_set_unknowns</div><div class='add'>+ * functions do not make their own copies.</div><div class='add'>+ */</div><div class='add'>+#ifndef PNGINFO_H</div><div class='add'>+#define PNGINFO_H</div><div class='add'>+</div><div class='add'>+struct png_info_def</div><div class='add'>+{</div><div class='add'>+   /* the following are necessary for every PNG file */</div><div class='add'>+   png_uint_32 width;  /* width of image in pixels (from IHDR) */</div><div class='add'>+   png_uint_32 height; /* height of image in pixels (from IHDR) */</div><div class='add'>+   png_uint_32 valid;  /* valid chunk data (see PNG_INFO_ below) */</div><div class='add'>+   png_size_t rowbytes; /* bytes needed to hold an untransformed row */</div><div class='add'>+   png_colorp palette;      /* array of color values (valid &amp; PNG_INFO_PLTE) */</div><div class='add'>+   png_uint_16 num_palette; /* number of color entries in "palette" (PLTE) */</div><div class='add'>+   png_uint_16 num_trans;   /* number of transparent palette color (tRNS) */</div><div class='add'>+   png_byte bit_depth;      /* 1, 2, 4, 8, or 16 bits/channel (from IHDR) */</div><div class='add'>+   png_byte color_type;     /* see PNG_COLOR_TYPE_ below (from IHDR) */</div><div class='add'>+   /* The following three should have been named *_method not *_type */</div><div class='add'>+   png_byte compression_type; /* must be PNG_COMPRESSION_TYPE_BASE (IHDR) */</div><div class='add'>+   png_byte filter_type;    /* must be PNG_FILTER_TYPE_BASE (from IHDR) */</div><div class='add'>+   png_byte interlace_type; /* One of PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */</div><div class='add'>+</div><div class='add'>+   /* The following is informational only on read, and not used on writes. */</div><div class='add'>+   png_byte channels;       /* number of data channels per pixel (1, 2, 3, 4) */</div><div class='add'>+   png_byte pixel_depth;    /* number of bits per pixel */</div><div class='add'>+   png_byte spare_byte;     /* to align the data, and for future use */</div><div class='add'>+   png_byte signature[8];   /* magic bytes read by libpng from start of file */</div><div class='add'>+</div><div class='add'>+   /* The rest of the data is optional.  If you are reading, check the</div><div class='add'>+    * valid field to see if the information in these are valid.  If you</div><div class='add'>+    * are writing, set the valid field to those chunks you want written,</div><div class='add'>+    * and initialize the appropriate fields below.</div><div class='add'>+    */</div><div class='add'>+</div><div class='add'>+#if defined(PNG_gAMA_SUPPORTED)</div><div class='add'>+   /* The gAMA chunk describes the gamma characteristics of the system</div><div class='add'>+    * on which the image was created, normally in the range [1.0, 2.5].</div><div class='add'>+    * Data is valid if (valid &amp; PNG_INFO_gAMA) is non-zero.</div><div class='add'>+    */</div><div class='add'>+   png_fixed_point gamma;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_sRGB_SUPPORTED</div><div class='add'>+    /* GR-P, 0.96a */</div><div class='add'>+    /* Data valid if (valid &amp; PNG_INFO_sRGB) non-zero. */</div><div class='add'>+   png_byte srgb_intent; /* sRGB rendering intent [0, 1, 2, or 3] */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_TEXT_SUPPORTED</div><div class='add'>+   /* The tEXt, and zTXt chunks contain human-readable textual data in</div><div class='add'>+    * uncompressed, compressed, and optionally compressed forms, respectively.</div><div class='add'>+    * The data in "text" is an array of pointers to uncompressed,</div><div class='add'>+    * null-terminated C strings. Each chunk has a keyword that describes the</div><div class='add'>+    * textual data contained in that chunk.  Keywords are not required to be</div><div class='add'>+    * unique, and the text string may be empty.  Any number of text chunks may</div><div class='add'>+    * be in an image.</div><div class='add'>+    */</div><div class='add'>+   int num_text; /* number of comments read or comments to write */</div><div class='add'>+   int max_text; /* current size of text array */</div><div class='add'>+   png_textp text; /* array of comments read or comments to write */</div><div class='add'>+#endif /* PNG_TEXT_SUPPORTED */</div><div class='add'>+</div><div class='add'>+#ifdef PNG_tIME_SUPPORTED</div><div class='add'>+   /* The tIME chunk holds the last time the displayed image data was</div><div class='add'>+    * modified.  See the png_time struct for the contents of this struct.</div><div class='add'>+    */</div><div class='add'>+   png_time mod_time;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_sBIT_SUPPORTED</div><div class='add'>+   /* The sBIT chunk specifies the number of significant high-order bits</div><div class='add'>+    * in the pixel data.  Values are in the range [1, bit_depth], and are</div><div class='add'>+    * only specified for the channels in the pixel data.  The contents of</div><div class='add'>+    * the low-order bits is not specified.  Data is valid if</div><div class='add'>+    * (valid &amp; PNG_INFO_sBIT) is non-zero.</div><div class='add'>+    */</div><div class='add'>+   png_color_8 sig_bit; /* significant bits in color channels */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_EXPAND_SUPPORTED) || \</div><div class='add'>+defined(PNG_READ_BACKGROUND_SUPPORTED)</div><div class='add'>+   /* The tRNS chunk supplies transparency data for paletted images and</div><div class='add'>+    * other image types that don't need a full alpha channel.  There are</div><div class='add'>+    * "num_trans" transparency values for a paletted image, stored in the</div><div class='add'>+    * same order as the palette colors, starting from index 0.  Values</div><div class='add'>+    * for the data are in the range [0, 255], ranging from fully transparent</div><div class='add'>+    * to fully opaque, respectively.  For non-paletted images, there is a</div><div class='add'>+    * single color specified that should be treated as fully transparent.</div><div class='add'>+    * Data is valid if (valid &amp; PNG_INFO_tRNS) is non-zero.</div><div class='add'>+    */</div><div class='add'>+   png_bytep trans;    /* alpha values for paletted image */</div><div class='add'>+   png_bytep trans_alpha;    /* alpha values for paletted image */</div><div class='add'>+   png_color_16 trans_color; /* transparent color for non-palette image */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)</div><div class='add'>+   /* The bKGD chunk gives the suggested image background color if the</div><div class='add'>+    * display program does not have its own background color and the image</div><div class='add'>+    * is needs to composited onto a background before display.  The colors</div><div class='add'>+    * in "background" are normally in the same color space/depth as the</div><div class='add'>+    * pixel data.  Data is valid if (valid &amp; PNG_INFO_bKGD) is non-zero.</div><div class='add'>+    */</div><div class='add'>+   png_color_16 background;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_oFFs_SUPPORTED</div><div class='add'>+   /* The oFFs chunk gives the offset in "offset_unit_type" units rightwards</div><div class='add'>+    * and downwards from the top-left corner of the display, page, or other</div><div class='add'>+    * application-specific co-ordinate space.  See the PNG_OFFSET_ defines</div><div class='add'>+    * below for the unit types.  Valid if (valid &amp; PNG_INFO_oFFs) non-zero.</div><div class='add'>+    */</div><div class='add'>+   png_int_32 x_offset; /* x offset on page */</div><div class='add'>+   png_int_32 y_offset; /* y offset on page */</div><div class='add'>+   png_byte offset_unit_type; /* offset units type */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_pHYs_SUPPORTED</div><div class='add'>+   /* The pHYs chunk gives the physical pixel density of the image for</div><div class='add'>+    * display or printing in "phys_unit_type" units (see PNG_RESOLUTION_</div><div class='add'>+    * defines below).  Data is valid if (valid &amp; PNG_INFO_pHYs) is non-zero.</div><div class='add'>+    */</div><div class='add'>+   png_uint_32 x_pixels_per_unit; /* horizontal pixel density */</div><div class='add'>+   png_uint_32 y_pixels_per_unit; /* vertical pixel density */</div><div class='add'>+   png_byte phys_unit_type; /* resolution type (see PNG_RESOLUTION_ below) */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_hIST_SUPPORTED</div><div class='add'>+   /* The hIST chunk contains the relative frequency or importance of the</div><div class='add'>+    * various palette entries, so that a viewer can intelligently select a</div><div class='add'>+    * reduced-color palette, if required.  Data is an array of "num_palette"</div><div class='add'>+    * values in the range [0,65535]. Data valid if (valid &amp; PNG_INFO_hIST)</div><div class='add'>+    * is non-zero.</div><div class='add'>+    */</div><div class='add'>+   png_uint_16p hist;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_cHRM_SUPPORTED</div><div class='add'>+   /* The cHRM chunk describes the CIE color characteristics of the monitor</div><div class='add'>+    * on which the PNG was created.  This data allows the viewer to do gamut</div><div class='add'>+    * mapping of the input image to ensure that the viewer sees the same</div><div class='add'>+    * colors in the image as the creator.  Values are in the range</div><div class='add'>+    * [0.0, 0.8].  Data valid if (valid &amp; PNG_INFO_cHRM) non-zero.</div><div class='add'>+    */</div><div class='add'>+   png_fixed_point x_white;</div><div class='add'>+   png_fixed_point y_white;</div><div class='add'>+   png_fixed_point x_red;</div><div class='add'>+   png_fixed_point y_red;</div><div class='add'>+   png_fixed_point x_green;</div><div class='add'>+   png_fixed_point y_green;</div><div class='add'>+   png_fixed_point x_blue;</div><div class='add'>+   png_fixed_point y_blue;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_pCAL_SUPPORTED</div><div class='add'>+   /* The pCAL chunk describes a transformation between the stored pixel</div><div class='add'>+    * values and original physical data values used to create the image.</div><div class='add'>+    * The integer range [0, 2^bit_depth - 1] maps to the floating-point</div><div class='add'>+    * range given by [pcal_X0, pcal_X1], and are further transformed by a</div><div class='add'>+    * (possibly non-linear) transformation function given by "pcal_type"</div><div class='add'>+    * and "pcal_params" into "pcal_units".  Please see the PNG_EQUATION_</div><div class='add'>+    * defines below, and the PNG-Group's PNG extensions document for a</div><div class='add'>+    * complete description of the transformations and how they should be</div><div class='add'>+    * implemented, and for a description of the ASCII parameter strings.</div><div class='add'>+    * Data values are valid if (valid &amp; PNG_INFO_pCAL) non-zero.</div><div class='add'>+    */</div><div class='add'>+   png_charp pcal_purpose;  /* pCAL chunk description string */</div><div class='add'>+   png_int_32 pcal_X0;      /* minimum value */</div><div class='add'>+   png_int_32 pcal_X1;      /* maximum value */</div><div class='add'>+   png_charp pcal_units;    /* Latin-1 string giving physical units */</div><div class='add'>+   png_charpp pcal_params;  /* ASCII strings containing parameter values */</div><div class='add'>+   png_byte pcal_type;      /* equation type (see PNG_EQUATION_ below) */</div><div class='add'>+   png_byte pcal_nparams;   /* number of parameters given in pcal_params */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* New members added in libpng-1.0.6 */</div><div class='add'>+   png_uint_32 free_me;     /* flags items libpng is responsible for freeing */</div><div class='add'>+</div><div class='add'>+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \</div><div class='add'>+ defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)</div><div class='add'>+   /* Storage for unknown chunks that the library doesn't recognize. */</div><div class='add'>+   png_unknown_chunkp unknown_chunks;</div><div class='add'>+   int unknown_chunks_num;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_iCCP_SUPPORTED</div><div class='add'>+   /* iCCP chunk data. */</div><div class='add'>+   png_charp iccp_name;     /* profile name */</div><div class='add'>+   png_bytep iccp_profile;  /* International Color Consortium profile data */</div><div class='add'>+   png_uint_32 iccp_proflen;  /* ICC profile data length */</div><div class='add'>+   png_byte iccp_compression; /* Always zero */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_sPLT_SUPPORTED</div><div class='add'>+   /* Data on sPLT chunks (there may be more than one). */</div><div class='add'>+   png_sPLT_tp splt_palettes;</div><div class='add'>+   png_uint_32 splt_palettes_num;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_sCAL_SUPPORTED</div><div class='add'>+   /* The sCAL chunk describes the actual physical dimensions of the</div><div class='add'>+    * subject matter of the graphic.  The chunk contains a unit specification</div><div class='add'>+    * a byte value, and two ASCII strings representing floating-point</div><div class='add'>+    * values.  The values are width and height corresponsing to one pixel</div><div class='add'>+    * in the image.  Data values are valid if (valid &amp; PNG_INFO_sCAL) is</div><div class='add'>+    * non-zero.</div><div class='add'>+    */</div><div class='add'>+   png_byte scal_unit;         /* unit of physical scale */</div><div class='add'>+   png_charp scal_s_width;     /* string containing height */</div><div class='add'>+   png_charp scal_s_height;    /* string containing width */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_INFO_IMAGE_SUPPORTED</div><div class='add'>+   /* Memory has been allocated if (valid &amp; PNG_ALLOCATED_INFO_ROWS)</div><div class='add'>+      non-zero */</div><div class='add'>+   /* Data valid if (valid &amp; PNG_INFO_IDAT) non-zero */</div><div class='add'>+   png_bytepp row_pointers;        /* the image bits */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+#endif /* PNGINFO_H */</div><div class='head'>diff --git a/src/3rdparty/libpng/pnglibconf.h b/src/3rdparty/libpng/pnglibconf.h<br/>new file mode 100644<br/>index 0000000..b1d2169<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pnglibconf.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pnglibconf.h</a></div><div class='hunk'>@@ -0,0 +1,176 @@</div><div class='add'>+</div><div class='add'>+/* libpng STANDARD API DEFINITION */</div><div class='add'>+</div><div class='add'>+/* pnglibconf.h - library build configuration */</div><div class='add'>+</div><div class='add'>+/* libpng version 1.5.0 - last changed on January 6, 2011 */</div><div class='add'>+</div><div class='add'>+/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */</div><div class='add'>+</div><div class='add'>+/* This code is released under the libpng license. */</div><div class='add'>+/* For conditions of distribution and use, see the disclaimer */</div><div class='add'>+/* and license in png.h */</div><div class='add'>+</div><div class='add'>+/* pnglibconf.h */</div><div class='add'>+/* Machine generated file: DO NOT EDIT */</div><div class='add'>+/* Derived from: scripts/pnglibconf.dfa */</div><div class='add'>+#ifndef PNGLCONF_H</div><div class='add'>+#define PNGLCONF_H</div><div class='add'>+/* settings */</div><div class='add'>+#define PNG_MAX_GAMMA_8 11</div><div class='add'>+#define PNG_CALLOC_SUPPORTED</div><div class='add'>+#define PNG_QUANTIZE_RED_BITS 5</div><div class='add'>+#define PNG_USER_WIDTH_MAX 1000000L</div><div class='add'>+#define PNG_QUANTIZE_GREEN_BITS 5</div><div class='add'>+#define PNG_API_RULE 0</div><div class='add'>+#define PNG_QUANTIZE_BLUE_BITS 5</div><div class='add'>+#define PNG_USER_CHUNK_CACHE_MAX 0</div><div class='add'>+#define PNG_USER_HEIGHT_MAX 1000000L</div><div class='add'>+#define PNG_sCAL_PRECISION 5</div><div class='add'>+#define PNG_COST_SHIFT 3</div><div class='add'>+#define PNG_WEIGHT_SHIFT 8</div><div class='add'>+#define PNG_USER_CHUNK_MALLOC_MAX 0</div><div class='add'>+#define PNG_DEFAULT_READ_MACROS 1</div><div class='add'>+#define PNG_ZBUF_SIZE 8192</div><div class='add'>+#define PNG_GAMMA_THRESHOLD_FIXED 5000</div><div class='add'>+/* end of settings */</div><div class='add'>+/* options */</div><div class='add'>+#define PNG_INFO_IMAGE_SUPPORTED</div><div class='add'>+#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='add'>+#define PNG_POINTER_INDEXING_SUPPORTED</div><div class='add'>+#define PNG_WARNINGS_SUPPORTED</div><div class='add'>+#define PNG_FLOATING_ARITHMETIC_SUPPORTED</div><div class='add'>+#define PNG_WRITE_SUPPORTED</div><div class='add'>+#define PNG_WRITE_INTERLACING_SUPPORTED</div><div class='add'>+#define PNG_WRITE_16BIT_SUPPORTED</div><div class='add'>+#define PNG_EASY_ACCESS_SUPPORTED</div><div class='add'>+#define PNG_ALIGN_MEMORY_SUPPORTED</div><div class='add'>+#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED</div><div class='add'>+#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED</div><div class='add'>+#define PNG_USER_LIMITS_SUPPORTED</div><div class='add'>+#define PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/</div><div class='add'>+#define PNG_ERROR_TEXT_SUPPORTED</div><div class='add'>+#define PNG_READ_SUPPORTED</div><div class='add'>+/*#undef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED*/</div><div class='add'>+#define PNG_BENIGN_ERRORS_SUPPORTED</div><div class='add'>+#define PNG_SETJMP_SUPPORTED</div><div class='add'>+#define PNG_WRITE_FLUSH_SUPPORTED</div><div class='add'>+#define PNG_MNG_FEATURES_SUPPORTED</div><div class='add'>+#define PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+#define PNG_INCH_CONVERSIONS_SUPPORTED</div><div class='add'>+#define PNG_STDIO_SUPPORTED</div><div class='add'>+#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED</div><div class='add'>+#define PNG_USER_MEM_SUPPORTED</div><div class='add'>+#define PNG_IO_STATE_SUPPORTED</div><div class='add'>+#define PNG_SET_USER_LIMITS_SUPPORTED</div><div class='add'>+#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED</div><div class='add'>+#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED</div><div class='add'>+#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED</div><div class='add'>+#define PNG_WRITE_FILTER_SUPPORTED</div><div class='add'>+#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED</div><div class='add'>+#define PNG_WRITE_iCCP_SUPPORTED</div><div class='add'>+#define PNG_READ_TRANSFORMS_SUPPORTED</div><div class='add'>+#define PNG_READ_GAMMA_SUPPORTED</div><div class='add'>+#define PNG_READ_bKGD_SUPPORTED</div><div class='add'>+#define PNG_UNKNOWN_CHUNKS_SUPPORTED</div><div class='add'>+#define PNG_READ_sCAL_SUPPORTED</div><div class='add'>+#define PNG_WRITE_hIST_SUPPORTED</div><div class='add'>+#define PNG_READ_OPT_PLTE_SUPPORTED</div><div class='add'>+#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED</div><div class='add'>+#define PNG_WRITE_gAMA_SUPPORTED</div><div class='add'>+#define PNG_READ_GRAY_TO_RGB_SUPPORTED</div><div class='add'>+#define PNG_WRITE_pCAL_SUPPORTED</div><div class='add'>+#define PNG_READ_INVERT_ALPHA_SUPPORTED</div><div class='add'>+#define PNG_WRITE_TRANSFORMS_SUPPORTED</div><div class='add'>+#define PNG_READ_sBIT_SUPPORTED</div><div class='add'>+#define PNG_READ_PACK_SUPPORTED</div><div class='add'>+#define PNG_WRITE_SWAP_SUPPORTED</div><div class='add'>+#define PNG_READ_cHRM_SUPPORTED</div><div class='add'>+#define PNG_WRITE_tIME_SUPPORTED</div><div class='add'>+#define PNG_READ_INTERLACING_SUPPORTED</div><div class='add'>+#define PNG_READ_tRNS_SUPPORTED</div><div class='add'>+#define PNG_WRITE_pHYs_SUPPORTED</div><div class='add'>+#define PNG_WRITE_INVERT_SUPPORTED</div><div class='add'>+#define PNG_READ_RGB_TO_GRAY_SUPPORTED</div><div class='add'>+#define PNG_WRITE_sRGB_SUPPORTED</div><div class='add'>+#define PNG_READ_oFFs_SUPPORTED</div><div class='add'>+#define PNG_WRITE_FILLER_SUPPORTED</div><div class='add'>+#define PNG_WRITE_TEXT_SUPPORTED</div><div class='add'>+#define PNG_WRITE_SHIFT_SUPPORTED</div><div class='add'>+#define PNG_PROGRESSIVE_READ_SUPPORTED</div><div class='add'>+#define PNG_READ_SHIFT_SUPPORTED</div><div class='add'>+#define PNG_CONVERT_tIME_SUPPORTED</div><div class='add'>+#define PNG_READ_USER_TRANSFORM_SUPPORTED</div><div class='add'>+#define PNG_READ_INT_FUNCTIONS_SUPPORTED</div><div class='add'>+#define PNG_READ_USER_CHUNKS_SUPPORTED</div><div class='add'>+#define PNG_READ_hIST_SUPPORTED</div><div class='add'>+#define PNG_READ_16BIT_SUPPORTED</div><div class='add'>+#define PNG_READ_SWAP_ALPHA_SUPPORTED</div><div class='add'>+#define PNG_READ_COMPOSITE_NODIV_SUPPORTED</div><div class='add'>+#define PNG_SEQUENTIAL_READ_SUPPORTED</div><div class='add'>+#define PNG_READ_BACKGROUND_SUPPORTED</div><div class='add'>+#define PNG_READ_QUANTIZE_SUPPORTED</div><div class='add'>+#define PNG_READ_iCCP_SUPPORTED</div><div class='add'>+#define PNG_READ_STRIP_ALPHA_SUPPORTED</div><div class='add'>+#define PNG_READ_PACKSWAP_SUPPORTED</div><div class='add'>+#define PNG_READ_sRGB_SUPPORTED</div><div class='add'>+#define PNG_WRITE_tEXt_SUPPORTED</div><div class='add'>+#define PNG_READ_gAMA_SUPPORTED</div><div class='add'>+#define PNG_READ_pCAL_SUPPORTED</div><div class='add'>+#define PNG_READ_EXPAND_SUPPORTED</div><div class='add'>+#define PNG_WRITE_sPLT_SUPPORTED</div><div class='add'>+#define PNG_READ_SWAP_SUPPORTED</div><div class='add'>+#define PNG_READ_tIME_SUPPORTED</div><div class='add'>+#define PNG_READ_pHYs_SUPPORTED</div><div class='add'>+#define PNG_WRITE_SWAP_ALPHA_SUPPORTED</div><div class='add'>+#define PNG_TIME_RFC1123_SUPPORTED</div><div class='add'>+#define PNG_READ_TEXT_SUPPORTED</div><div class='add'>+#define PNG_WRITE_BGR_SUPPORTED</div><div class='add'>+#define PNG_USER_CHUNKS_SUPPORTED</div><div class='add'>+#define PNG_CONSOLE_IO_SUPPORTED</div><div class='add'>+#define PNG_WRITE_PACK_SUPPORTED</div><div class='add'>+#define PNG_READ_FILLER_SUPPORTED</div><div class='add'>+#define PNG_WRITE_bKGD_SUPPORTED</div><div class='add'>+#define PNG_WRITE_tRNS_SUPPORTED</div><div class='add'>+#define PNG_READ_sPLT_SUPPORTED</div><div class='add'>+#define PNG_WRITE_sCAL_SUPPORTED</div><div class='add'>+#define PNG_WRITE_oFFs_SUPPORTED</div><div class='add'>+#define PNG_READ_tEXt_SUPPORTED</div><div class='add'>+#define PNG_WRITE_sBIT_SUPPORTED</div><div class='add'>+#define PNG_READ_INVERT_SUPPORTED</div><div class='add'>+#define PNG_READ_16_TO_8_SUPPORTED</div><div class='add'>+#define PNG_WRITE_cHRM_SUPPORTED</div><div class='add'>+#define PNG_16BIT_SUPPORTED</div><div class='add'>+#define PNG_WRITE_USER_TRANSFORM_SUPPORTED</div><div class='add'>+#define PNG_READ_BGR_SUPPORTED</div><div class='add'>+#define PNG_WRITE_PACKSWAP_SUPPORTED</div><div class='add'>+#define PNG_WRITE_INVERT_ALPHA_SUPPORTED</div><div class='add'>+#define PNG_sCAL_SUPPORTED</div><div class='add'>+#define PNG_WRITE_zTXt_SUPPORTED</div><div class='add'>+#define PNG_sBIT_SUPPORTED</div><div class='add'>+#define PNG_cHRM_SUPPORTED</div><div class='add'>+#define PNG_bKGD_SUPPORTED</div><div class='add'>+#define PNG_tRNS_SUPPORTED</div><div class='add'>+#define PNG_WRITE_iTXt_SUPPORTED</div><div class='add'>+#define PNG_oFFs_SUPPORTED</div><div class='add'>+#define PNG_USER_TRANSFORM_PTR_SUPPORTED</div><div class='add'>+#define PNG_USER_TRANSFORM_INFO_SUPPORTED</div><div class='add'>+#define PNG_hIST_SUPPORTED</div><div class='add'>+#define PNG_iCCP_SUPPORTED</div><div class='add'>+#define PNG_sRGB_SUPPORTED</div><div class='add'>+#define PNG_READ_zTXt_SUPPORTED</div><div class='add'>+#define PNG_gAMA_SUPPORTED</div><div class='add'>+#define PNG_pCAL_SUPPORTED</div><div class='add'>+#define PNG_CHECK_cHRM_SUPPORTED</div><div class='add'>+#define PNG_tIME_SUPPORTED</div><div class='add'>+#define PNG_pHYs_SUPPORTED</div><div class='add'>+#define PNG_READ_iTXt_SUPPORTED</div><div class='add'>+#define PNG_TEXT_SUPPORTED</div><div class='add'>+#define PNG_SAVE_INT_32_SUPPORTED</div><div class='add'>+#define PNG_sPLT_SUPPORTED</div><div class='add'>+#define PNG_tEXt_SUPPORTED</div><div class='add'>+#define PNG_zTXt_SUPPORTED</div><div class='add'>+#define PNG_iTXt_SUPPORTED</div><div class='add'>+/* end of options */</div><div class='add'>+#endif /* PNGLCONF_H */</div><div class='head'>diff --git a/src/3rdparty/libpng/pngmem.c b/src/3rdparty/libpng/pngmem.c<br/>index dee2966..a15d8b0 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngmem.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngmem.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngmem.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngmem.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> </div><div class='ctx'> /* pngmem.c - stub functions for memory allocation</div><div class='ctx'>  *</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Last changed in libpng 1.5.1 [February 3, 2011]</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -17,40 +17,42 @@</div><div class='ctx'>  * identify the replacement functions.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define PNG_NO_PEDANTIC_WARNINGS</div><div class='del'>-#include "png.h"</div><div class='del'>-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)</div><div class='ctx'> #include "pngpriv.h"</div><div class='ctx'> </div><div class='add'>+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)</div><div class='add'>+</div><div class='ctx'> /* Borland DOS special memory handler */</div><div class='ctx'> #if defined(__TURBOC__) &amp;&amp; !defined(_Windows) &amp;&amp; !defined(__FLAT__)</div><div class='ctx'> /* If you change this, be sure to change the one in png.h also */</div><div class='ctx'> </div><div class='ctx'> /* Allocate memory for a png_struct.  The malloc and memset can be replaced</div><div class='ctx'>    by a single call to calloc() if this is thought to improve performance. */</div><div class='del'>-png_voidp /* PRIVATE */</div><div class='del'>-png_create_struct(int type)</div><div class='add'>+PNG_FUNCTION(png_voidp /* PRIVATE */,</div><div class='add'>+png_create_struct,(int type),PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='del'>-#ifdef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>    return (png_create_struct_2(type, NULL, NULL));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Alternate version of png_create_struct, for use with user-defined malloc. */</div><div class='del'>-png_voidp /* PRIVATE */</div><div class='del'>-png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)</div><div class='add'>+PNG_FUNCTION(png_voidp /* PRIVATE */,</div><div class='add'>+png_create_struct_2,(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr),</div><div class='add'>+   PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='del'>-#endif /* PNG_USER_MEM_SUPPORTED */</div><div class='add'>+#  endif /* PNG_USER_MEM_SUPPORTED */</div><div class='ctx'>    png_size_t size;</div><div class='ctx'>    png_voidp struct_ptr;</div><div class='ctx'> </div><div class='ctx'>    if (type == PNG_STRUCT_INFO)</div><div class='ctx'>       size = png_sizeof(png_info);</div><div class='add'>+</div><div class='ctx'>    else if (type == PNG_STRUCT_PNG)</div><div class='ctx'>       size = png_sizeof(png_struct);</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       return (png_get_copyright(NULL));</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>    if (malloc_fn != NULL)</div><div class='ctx'>    {</div><div class='ctx'>       png_struct dummy_struct;</div><div class='hunk'>@@ -58,11 +60,13 @@ png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)</div><div class='ctx'>       png_ptr-&gt;mem_ptr=mem_ptr;</div><div class='ctx'>       struct_ptr = (*(malloc_fn))(png_ptr, (png_uint_32)size);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='del'>-#endif /* PNG_USER_MEM_SUPPORTED */</div><div class='add'>+#  endif /* PNG_USER_MEM_SUPPORTED */</div><div class='ctx'>    struct_ptr = (png_voidp)farmalloc(size);</div><div class='ctx'>    if (struct_ptr != NULL)</div><div class='ctx'>       png_memset(struct_ptr, 0, size);</div><div class='add'>+</div><div class='ctx'>    return (struct_ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -70,7 +74,7 @@ png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_destroy_struct(png_voidp struct_ptr)</div><div class='ctx'> {</div><div class='del'>-#ifdef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>    png_destroy_struct_2(struct_ptr, NULL, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -79,10 +83,10 @@ void /* PRIVATE */</div><div class='ctx'> png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,</div><div class='ctx'>     png_voidp mem_ptr)</div><div class='ctx'> {</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'>    if (struct_ptr != NULL)</div><div class='ctx'>    {</div><div class='del'>-#ifdef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>       if (free_fn != NULL)</div><div class='ctx'>       {</div><div class='ctx'>          png_struct dummy_struct;</div><div class='hunk'>@@ -91,7 +95,8 @@ png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,</div><div class='ctx'>          (*(free_fn))(png_ptr, struct_ptr);</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='del'>-#endif /* PNG_USER_MEM_SUPPORTED */</div><div class='add'>+</div><div class='add'>+#  endif /* PNG_USER_MEM_SUPPORTED */</div><div class='ctx'>       farfree (struct_ptr);</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='hunk'>@@ -115,55 +120,62 @@ png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,</div><div class='ctx'>  * result, we would be truncating potentially larger memory requests</div><div class='ctx'>  * (which should cause a fatal error) and introducing major problems.</div><div class='ctx'>  */</div><div class='del'>-png_voidp PNGAPI</div><div class='del'>-png_calloc(png_structp png_ptr, png_alloc_size_t size)</div><div class='add'>+PNG_FUNCTION(png_voidp,PNGAPI</div><div class='add'>+png_calloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='ctx'>    png_voidp ret;</div><div class='ctx'> </div><div class='ctx'>    ret = (png_malloc(png_ptr, size));</div><div class='add'>+</div><div class='ctx'>    if (ret != NULL)</div><div class='ctx'>       png_memset(ret,0,(png_size_t)size);</div><div class='add'>+</div><div class='ctx'>    return (ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-png_voidp PNGAPI</div><div class='del'>-png_malloc(png_structp png_ptr, png_alloc_size_t size)</div><div class='add'>+PNG_FUNCTION(png_voidp,PNGAPI</div><div class='add'>+png_malloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='ctx'>    png_voidp ret;</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL || size == 0)</div><div class='ctx'>       return (NULL);</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;malloc_fn != NULL)</div><div class='ctx'>       ret = ((png_voidp)(*(png_ptr-&gt;malloc_fn))(png_ptr, (png_size_t)size));</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       ret = (png_malloc_default(png_ptr, size));</div><div class='add'>+</div><div class='ctx'>    if (ret == NULL &amp;&amp; (png_ptr-&gt;flags&amp;PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)</div><div class='ctx'>        png_error(png_ptr, "Out of memory");</div><div class='add'>+</div><div class='ctx'>    return (ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-png_voidp PNGAPI</div><div class='del'>-png_malloc_default(png_structp png_ptr, png_alloc_size_t size)</div><div class='add'>+PNG_FUNCTION(png_voidp,PNGAPI</div><div class='add'>+png_malloc_default,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='ctx'>    png_voidp ret;</div><div class='del'>-#endif /* PNG_USER_MEM_SUPPORTED */</div><div class='add'>+#  endif /* PNG_USER_MEM_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL || size == 0)</div><div class='ctx'>       return (NULL);</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_MAX_MALLOC_64K</div><div class='add'>+#  ifdef PNG_MAX_MALLOC_64K</div><div class='ctx'>    if (size &gt; (png_uint_32)65536L)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Cannot Allocate &gt; 64K");</div><div class='ctx'>       ret = NULL;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'> </div><div class='ctx'>    if (size != (size_t)size)</div><div class='ctx'>       ret = NULL;</div><div class='add'>+</div><div class='ctx'>    else if (size == (png_uint_32)65536L)</div><div class='ctx'>    {</div><div class='ctx'>       if (png_ptr-&gt;offset_table == NULL)</div><div class='hunk'>@@ -186,10 +198,13 @@ png_malloc_default(png_structp png_ptr, png_alloc_size_t size)</div><div class='ctx'> </div><div class='ctx'>             if (png_ptr-&gt;zlib_window_bits &gt; 14)</div><div class='ctx'>                num_blocks = (int)(1 &lt;&lt; (png_ptr-&gt;zlib_window_bits - 14));</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'>                num_blocks = 1;</div><div class='add'>+</div><div class='ctx'>             if (png_ptr-&gt;zlib_mem_level &gt;= 7)</div><div class='ctx'>                num_blocks += (int)(1 &lt;&lt; (png_ptr-&gt;zlib_mem_level - 7));</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'>                num_blocks++;</div><div class='ctx'> </div><div class='hunk'>@@ -199,25 +214,27 @@ png_malloc_default(png_structp png_ptr, png_alloc_size_t size)</div><div class='ctx'> </div><div class='ctx'>             if (table == NULL)</div><div class='ctx'>             {</div><div class='del'>-#ifndef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifndef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>                if ((png_ptr-&gt;flags&amp;PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)</div><div class='del'>-                  png_error(png_ptr, "Out Of Memory"); /* Note "O" and "M" */</div><div class='add'>+                  png_error(png_ptr, "Out Of Memory"); /* Note "O", "M" */</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   png_warning(png_ptr, "Out Of Memory");</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'>                return (NULL);</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'>             if ((png_size_t)table &amp; 0xfff0)</div><div class='ctx'>             {</div><div class='del'>-#ifndef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifndef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>                if ((png_ptr-&gt;flags&amp;PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)</div><div class='ctx'>                   png_error(png_ptr,</div><div class='ctx'>                     "Farmalloc didn't return normalized pointer");</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   png_warning(png_ptr,</div><div class='ctx'>                     "Farmalloc didn't return normalized pointer");</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'>                return (NULL);</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='hunk'>@@ -227,12 +244,13 @@ png_malloc_default(png_structp png_ptr, png_alloc_size_t size)</div><div class='ctx'> </div><div class='ctx'>             if (png_ptr-&gt;offset_table_ptr == NULL)</div><div class='ctx'>             {</div><div class='del'>-#ifndef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifndef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>                if ((png_ptr-&gt;flags&amp;PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)</div><div class='del'>-                  png_error(png_ptr, "Out Of memory"); /* Note "O" and "M" */</div><div class='add'>+                  png_error(png_ptr, "Out Of memory"); /* Note "O", "m" */</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   png_warning(png_ptr, "Out Of memory");</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'>                return (NULL);</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='hunk'>@@ -242,6 +260,7 @@ png_malloc_default(png_structp png_ptr, png_alloc_size_t size)</div><div class='ctx'>                hptr = (png_byte huge *)((long)(hptr) &amp; 0xfffffff0L);</div><div class='ctx'>                hptr = hptr + 16L;  /* "hptr += 16L" fails on Turbo C++ 3.0 */</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             for (i = 0; i &lt; num_blocks; i++)</div><div class='ctx'>             {</div><div class='ctx'>                png_ptr-&gt;offset_table_ptr[i] = (png_bytep)hptr;</div><div class='hunk'>@@ -256,29 +275,32 @@ png_malloc_default(png_structp png_ptr, png_alloc_size_t size)</div><div class='ctx'> </div><div class='ctx'>       if (png_ptr-&gt;offset_table_count &gt;= png_ptr-&gt;offset_table_number)</div><div class='ctx'>       {</div><div class='del'>-#ifndef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifndef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>          if ((png_ptr-&gt;flags&amp;PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)</div><div class='ctx'>             png_error(png_ptr, "Out of Memory"); /* Note "o" and "M" */</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             png_warning(png_ptr, "Out of Memory");</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'>          return (NULL);</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='ctx'>       ret = png_ptr-&gt;offset_table_ptr[png_ptr-&gt;offset_table_count++];</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       ret = farmalloc(size);</div><div class='ctx'> </div><div class='del'>-#ifndef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifndef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>    if (ret == NULL)</div><div class='ctx'>    {</div><div class='ctx'>       if ((png_ptr-&gt;flags&amp;PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)</div><div class='ctx'>          png_error(png_ptr, "Out of memory"); /* Note "o" and "m" */</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>          png_warning(png_ptr, "Out of memory"); /* Note "o" and "m" */</div><div class='ctx'>    }</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'> </div><div class='ctx'>    return (ret);</div><div class='ctx'> }</div><div class='hunk'>@@ -293,12 +315,13 @@ png_free(png_structp png_ptr, png_voidp ptr)</div><div class='ctx'>    if (png_ptr == NULL || ptr == NULL)</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;free_fn != NULL)</div><div class='ctx'>    {</div><div class='ctx'>       (*(png_ptr-&gt;free_fn))(png_ptr, ptr);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       png_free_default(png_ptr, ptr);</div><div class='ctx'> }</div><div class='hunk'>@@ -306,7 +329,7 @@ png_free(png_structp png_ptr, png_voidp ptr)</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_free_default(png_structp png_ptr, png_voidp ptr)</div><div class='ctx'> {</div><div class='del'>-#endif /* PNG_USER_MEM_SUPPORTED */</div><div class='add'>+#  endif /* PNG_USER_MEM_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL || ptr == NULL)</div><div class='ctx'>       return;</div><div class='hunk'>@@ -334,9 +357,7 @@ png_free_default(png_structp png_ptr, png_voidp ptr)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    if (ptr != NULL)</div><div class='del'>-   {</div><div class='ctx'>       farfree(ptr);</div><div class='del'>-   }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #else /* Not the Borland DOS special memory handler */</div><div class='hunk'>@@ -344,52 +365,58 @@ png_free_default(png_structp png_ptr, png_voidp ptr)</div><div class='ctx'> /* Allocate memory for a png_struct or a png_info.  The malloc and</div><div class='ctx'>    memset can be replaced by a single call to calloc() if this is thought</div><div class='ctx'>    to improve performance noticably. */</div><div class='del'>-png_voidp /* PRIVATE */</div><div class='del'>-png_create_struct(int type)</div><div class='add'>+PNG_FUNCTION(png_voidp /* PRIVATE */,</div><div class='add'>+png_create_struct,(int type),PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='del'>-#ifdef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>    return (png_create_struct_2(type, NULL, NULL));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Allocate memory for a png_struct or a png_info.  The malloc and</div><div class='ctx'>    memset can be replaced by a single call to calloc() if this is thought</div><div class='ctx'>    to improve performance noticably. */</div><div class='del'>-png_voidp /* PRIVATE */</div><div class='del'>-png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)</div><div class='add'>+PNG_FUNCTION(png_voidp /* PRIVATE */,</div><div class='add'>+png_create_struct_2,(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr),</div><div class='add'>+   PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='del'>-#endif /* PNG_USER_MEM_SUPPORTED */</div><div class='add'>+#  endif /* PNG_USER_MEM_SUPPORTED */</div><div class='ctx'>    png_size_t size;</div><div class='ctx'>    png_voidp struct_ptr;</div><div class='ctx'> </div><div class='ctx'>    if (type == PNG_STRUCT_INFO)</div><div class='ctx'>       size = png_sizeof(png_info);</div><div class='add'>+</div><div class='ctx'>    else if (type == PNG_STRUCT_PNG)</div><div class='ctx'>       size = png_sizeof(png_struct);</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       return (NULL);</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>    if (malloc_fn != NULL)</div><div class='ctx'>    {</div><div class='ctx'>       png_struct dummy_struct;</div><div class='ctx'>       png_structp png_ptr = &amp;dummy_struct;</div><div class='ctx'>       png_ptr-&gt;mem_ptr=mem_ptr;</div><div class='ctx'>       struct_ptr = (*(malloc_fn))(png_ptr, size);</div><div class='add'>+</div><div class='ctx'>       if (struct_ptr != NULL)</div><div class='ctx'>          png_memset(struct_ptr, 0, size);</div><div class='add'>+</div><div class='ctx'>       return (struct_ptr);</div><div class='ctx'>    }</div><div class='del'>-#endif /* PNG_USER_MEM_SUPPORTED */</div><div class='add'>+#  endif /* PNG_USER_MEM_SUPPORTED */</div><div class='ctx'> </div><div class='del'>-#if defined(__TURBOC__) &amp;&amp; !defined(__FLAT__)</div><div class='add'>+#  if defined(__TURBOC__) &amp;&amp; !defined(__FLAT__)</div><div class='ctx'>    struct_ptr = (png_voidp)farmalloc(size);</div><div class='del'>-#else</div><div class='del'>-# if defined(_MSC_VER) &amp;&amp; defined(MAXSEG_64K)</div><div class='add'>+#  else</div><div class='add'>+#    if defined(_MSC_VER) &amp;&amp; defined(MAXSEG_64K)</div><div class='ctx'>    struct_ptr = (png_voidp)halloc(size, 1);</div><div class='del'>-# else</div><div class='add'>+#    else</div><div class='ctx'>    struct_ptr = (png_voidp)malloc(size);</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='add'>+</div><div class='ctx'>    if (struct_ptr != NULL)</div><div class='ctx'>       png_memset(struct_ptr, 0, size);</div><div class='ctx'> </div><div class='hunk'>@@ -401,7 +428,7 @@ png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_destroy_struct(png_voidp struct_ptr)</div><div class='ctx'> {</div><div class='del'>-#ifdef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>    png_destroy_struct_2(struct_ptr, NULL, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -410,10 +437,10 @@ void /* PRIVATE */</div><div class='ctx'> png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,</div><div class='ctx'>     png_voidp mem_ptr)</div><div class='ctx'> {</div><div class='del'>-#endif /* PNG_USER_MEM_SUPPORTED */</div><div class='add'>+#  endif /* PNG_USER_MEM_SUPPORTED */</div><div class='ctx'>    if (struct_ptr != NULL)</div><div class='ctx'>    {</div><div class='del'>-#ifdef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>       if (free_fn != NULL)</div><div class='ctx'>       {</div><div class='ctx'>          png_struct dummy_struct;</div><div class='hunk'>@@ -422,16 +449,19 @@ png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,</div><div class='ctx'>          (*(free_fn))(png_ptr, struct_ptr);</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='del'>-#endif /* PNG_USER_MEM_SUPPORTED */</div><div class='del'>-#if defined(__TURBOC__) &amp;&amp; !defined(__FLAT__)</div><div class='add'>+#  endif /* PNG_USER_MEM_SUPPORTED */</div><div class='add'>+#  if defined(__TURBOC__) &amp;&amp; !defined(__FLAT__)</div><div class='ctx'>       farfree(struct_ptr);</div><div class='del'>-#else</div><div class='del'>-# if defined(_MSC_VER) &amp;&amp; defined(MAXSEG_64K)</div><div class='add'>+</div><div class='add'>+#  else</div><div class='add'>+#    if defined(_MSC_VER) &amp;&amp; defined(MAXSEG_64K)</div><div class='ctx'>       hfree(struct_ptr);</div><div class='del'>-# else</div><div class='add'>+</div><div class='add'>+#    else</div><div class='ctx'>       free(struct_ptr);</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -442,80 +472,92 @@ png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,</div><div class='ctx'>  * have the ability to do that.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-png_voidp PNGAPI</div><div class='del'>-png_calloc(png_structp png_ptr, png_alloc_size_t size)</div><div class='add'>+PNG_FUNCTION(png_voidp,PNGAPI</div><div class='add'>+png_calloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='ctx'>    png_voidp ret;</div><div class='ctx'> </div><div class='ctx'>    ret = (png_malloc(png_ptr, size));</div><div class='add'>+</div><div class='ctx'>    if (ret != NULL)</div><div class='ctx'>       png_memset(ret,0,(png_size_t)size);</div><div class='add'>+</div><div class='ctx'>    return (ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-png_voidp PNGAPI</div><div class='del'>-png_malloc(png_structp png_ptr, png_alloc_size_t size)</div><div class='add'>+PNG_FUNCTION(png_voidp,PNGAPI</div><div class='add'>+png_malloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='ctx'>    png_voidp ret;</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>    if (png_ptr == NULL || size == 0)</div><div class='ctx'>       return (NULL);</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr-&gt;malloc_fn != NULL)</div><div class='ctx'>       ret = ((png_voidp)(*(png_ptr-&gt;malloc_fn))(png_ptr, (png_size_t)size));</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       ret = (png_malloc_default(png_ptr, size));</div><div class='add'>+</div><div class='ctx'>    if (ret == NULL &amp;&amp; (png_ptr-&gt;flags&amp;PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)</div><div class='ctx'>        png_error(png_ptr, "Out of Memory");</div><div class='add'>+</div><div class='ctx'>    return (ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-png_voidp PNGAPI</div><div class='del'>-png_malloc_default(png_structp png_ptr, png_alloc_size_t size)</div><div class='add'>+PNG_FUNCTION(png_voidp,PNGAPI</div><div class='add'>+png_malloc_default,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='ctx'>    png_voidp ret;</div><div class='del'>-#endif /* PNG_USER_MEM_SUPPORTED */</div><div class='add'>+#  endif /* PNG_USER_MEM_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL || size == 0)</div><div class='ctx'>       return (NULL);</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_MAX_MALLOC_64K</div><div class='add'>+#  ifdef PNG_MAX_MALLOC_64K</div><div class='ctx'>    if (size &gt; (png_uint_32)65536L)</div><div class='ctx'>    {</div><div class='del'>-#ifndef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#    ifndef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>       if ((png_ptr-&gt;flags&amp;PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)</div><div class='ctx'>          png_error(png_ptr, "Cannot Allocate &gt; 64K");</div><div class='add'>+</div><div class='ctx'>       else</div><div class='del'>-#endif</div><div class='add'>+#    endif</div><div class='ctx'>          return NULL;</div><div class='ctx'>    }</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'> </div><div class='ctx'>    /* Check for overflow */</div><div class='del'>-#if defined(__TURBOC__) &amp;&amp; !defined(__FLAT__)</div><div class='add'>+#  if defined(__TURBOC__) &amp;&amp; !defined(__FLAT__)</div><div class='add'>+</div><div class='ctx'>    if (size != (unsigned long)size)</div><div class='ctx'>       ret = NULL;</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       ret = farmalloc(size);</div><div class='del'>-#else</div><div class='del'>-# if defined(_MSC_VER) &amp;&amp; defined(MAXSEG_64K)</div><div class='add'>+</div><div class='add'>+#  else</div><div class='add'>+#    if defined(_MSC_VER) &amp;&amp; defined(MAXSEG_64K)</div><div class='ctx'>    if (size != (unsigned long)size)</div><div class='ctx'>       ret = NULL;</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       ret = halloc(size, 1);</div><div class='del'>-# else</div><div class='add'>+</div><div class='add'>+#    else</div><div class='ctx'>    if (size != (size_t)size)</div><div class='ctx'>       ret = NULL;</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       ret = malloc((size_t)size);</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='ctx'> </div><div class='del'>-#ifndef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifndef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>    if (ret == NULL &amp;&amp; (png_ptr-&gt;flags&amp;PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)</div><div class='ctx'>       png_error(png_ptr, "Out of Memory");</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'> </div><div class='ctx'>    return (ret);</div><div class='ctx'> }</div><div class='hunk'>@@ -529,34 +571,38 @@ png_free(png_structp png_ptr, png_voidp ptr)</div><div class='ctx'>    if (png_ptr == NULL || ptr == NULL)</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_USER_MEM_SUPPORTED</div><div class='add'>+#  ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;free_fn != NULL)</div><div class='ctx'>    {</div><div class='ctx'>       (*(png_ptr-&gt;free_fn))(png_ptr, ptr);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       png_free_default(png_ptr, ptr);</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_free_default(png_structp png_ptr, png_voidp ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL || ptr == NULL)</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='del'>-#endif /* PNG_USER_MEM_SUPPORTED */</div><div class='add'>+#  endif /* PNG_USER_MEM_SUPPORTED */</div><div class='ctx'> </div><div class='del'>-#if defined(__TURBOC__) &amp;&amp; !defined(__FLAT__)</div><div class='add'>+#  if defined(__TURBOC__) &amp;&amp; !defined(__FLAT__)</div><div class='ctx'>    farfree(ptr);</div><div class='del'>-#else</div><div class='del'>-# if defined(_MSC_VER) &amp;&amp; defined(MAXSEG_64K)</div><div class='add'>+</div><div class='add'>+#  else</div><div class='add'>+#    if defined(_MSC_VER) &amp;&amp; defined(MAXSEG_64K)</div><div class='ctx'>    hfree(ptr);</div><div class='del'>-# else</div><div class='add'>+</div><div class='add'>+#    else</div><div class='ctx'>    free(ptr);</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='ctx'> </div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='add'>+}</div><div class='ctx'> #endif /* Not Borland DOS special memory handler */</div><div class='ctx'> </div><div class='ctx'> /* This function was added at libpng version 1.2.3.  The png_malloc_warn()</div><div class='hunk'>@@ -564,8 +610,8 @@ png_free_default(png_structp png_ptr, png_voidp ptr)</div><div class='ctx'>  * instead of issuing a png_error, if it fails to allocate the requested</div><div class='ctx'>  * memory.</div><div class='ctx'>  */</div><div class='del'>-png_voidp PNGAPI</div><div class='del'>-png_malloc_warn(png_structp png_ptr, png_alloc_size_t size)</div><div class='add'>+PNG_FUNCTION(png_voidp,PNGAPI</div><div class='add'>+png_malloc_warn,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='ctx'>    png_voidp ptr;</div><div class='ctx'>    png_uint_32 save_flags;</div><div class='hunk'>@@ -601,10 +647,11 @@ png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr</div><div class='ctx'>  * pointer before png_write_destroy and png_read_destroy are called.</div><div class='ctx'>  */</div><div class='ctx'> png_voidp PNGAPI</div><div class='del'>-png_get_mem_ptr(png_structp png_ptr)</div><div class='add'>+png_get_mem_ptr(png_const_structp png_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return (NULL);</div><div class='add'>+</div><div class='ctx'>    return ((png_voidp)png_ptr-&gt;mem_ptr);</div><div class='ctx'> }</div><div class='ctx'> #endif /* PNG_USER_MEM_SUPPORTED */</div><div class='head'>diff --git a/src/3rdparty/libpng/pngnow.png b/src/3rdparty/libpng/pngnow.png<br/>deleted file mode 100644<br/>index 82793eb..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngnow.png?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngnow.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/src/3rdparty/libpng/pngpread.c b/src/3rdparty/libpng/pngpread.c<br/>index e3d3111..7b1149b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngpread.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngpread.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngpread.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngpread.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> </div><div class='ctx'> /* pngpread.c - read a png file in push mode</div><div class='ctx'>  *</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Last changed in libpng 1.5.1 [February 3, 2011]</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,11 +11,10 @@</div><div class='ctx'>  * and license in png.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define PNG_NO_PEDANTIC_WARNINGS</div><div class='del'>-#include "png.h"</div><div class='del'>-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED</div><div class='ctx'> #include "pngpriv.h"</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED</div><div class='add'>+</div><div class='ctx'> /* Push model modes */</div><div class='ctx'> #define PNG_READ_SIG_MODE   0</div><div class='ctx'> #define PNG_READ_CHUNK_MODE 1</div><div class='hunk'>@@ -29,7 +28,7 @@</div><div class='ctx'> </div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_process_data(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_bytep buffer, png_size_t buffer_size)</div><div class='add'>+    png_bytep buffer, png_size_t buffer_size)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL || info_ptr == NULL)</div><div class='ctx'>       return;</div><div class='hunk'>@@ -42,6 +41,64 @@ png_process_data(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+png_size_t PNGAPI</div><div class='add'>+png_process_data_pause(png_structp png_ptr, int save)</div><div class='add'>+{</div><div class='add'>+   if (png_ptr != NULL)</div><div class='add'>+   {</div><div class='add'>+      /* It's easiest for the caller if we do the save, then the caller doesn't</div><div class='add'>+       * have to supply the same data again:</div><div class='add'>+       */</div><div class='add'>+      if (save)</div><div class='add'>+         png_push_save_buffer(png_ptr);</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         /* This includes any pending saved bytes: */</div><div class='add'>+         png_size_t remaining = png_ptr-&gt;buffer_size;</div><div class='add'>+         png_ptr-&gt;buffer_size = 0;</div><div class='add'>+</div><div class='add'>+         /* So subtract the saved buffer size, unless all the data</div><div class='add'>+          * is actually 'saved', in which case we just return 0</div><div class='add'>+          */</div><div class='add'>+         if (png_ptr-&gt;save_buffer_size &lt; remaining)</div><div class='add'>+            return remaining - png_ptr-&gt;save_buffer_size;</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+png_uint_32 PNGAPI</div><div class='add'>+png_process_data_skip(png_structp png_ptr)</div><div class='add'>+{</div><div class='add'>+   png_uint_32 remaining = 0;</div><div class='add'>+</div><div class='add'>+   if (png_ptr != NULL &amp;&amp; png_ptr-&gt;process_mode == PNG_SKIP_MODE &amp;&amp;</div><div class='add'>+      png_ptr-&gt;skip_length &gt; 0)</div><div class='add'>+   {</div><div class='add'>+      /* At the end of png_process_data the buffer size must be 0 (see the loop</div><div class='add'>+       * above) so we can detect a broken call here:</div><div class='add'>+       */</div><div class='add'>+      if (png_ptr-&gt;buffer_size != 0)</div><div class='add'>+         png_error(png_ptr,</div><div class='add'>+            "png_process_data_skip called inside png_process_data");</div><div class='add'>+</div><div class='add'>+      /* If is impossible for there to be a saved buffer at this point -</div><div class='add'>+       * otherwise we could not be in SKIP mode.  This will also happen if</div><div class='add'>+       * png_process_skip is called inside png_process_data (but only very</div><div class='add'>+       * rarely.)</div><div class='add'>+       */</div><div class='add'>+      if (png_ptr-&gt;save_buffer_size != 0)</div><div class='add'>+         png_error(png_ptr, "png_process_data_skip called with saved data");</div><div class='add'>+</div><div class='add'>+      remaining = png_ptr-&gt;skip_length;</div><div class='add'>+      png_ptr-&gt;skip_length = 0;</div><div class='add'>+      png_ptr-&gt;process_mode = PNG_READ_CHUNK_MODE;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return remaining;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* What we do with the incoming data depends on what we were previously</div><div class='ctx'>  * doing before we ran out of data...</div><div class='ctx'>  */</div><div class='hunk'>@@ -127,7 +184,7 @@ png_push_read_sig(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_push_fill_buffer(png_ptr, &amp;(info_ptr-&gt;signature[num_checked]),</div><div class='del'>-      num_to_check);</div><div class='add'>+       num_to_check);</div><div class='ctx'>    png_ptr-&gt;sig_bytes = (png_byte)(png_ptr-&gt;sig_bytes + num_to_check);</div><div class='ctx'> </div><div class='ctx'>    if (png_sig_cmp(info_ptr-&gt;signature, num_checked, num_to_check))</div><div class='hunk'>@@ -135,6 +192,7 @@ png_push_read_sig(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>       if (num_checked &lt; 4 &amp;&amp;</div><div class='ctx'>           png_sig_cmp(info_ptr-&gt;signature, num_checked, num_to_check - 4))</div><div class='ctx'>          png_error(png_ptr, "Not a PNG file");</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>          png_error(png_ptr, "PNG file corrupted by ASCII conversion");</div><div class='ctx'>    }</div><div class='hunk'>@@ -231,8 +289,8 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    if (!png_memcmp(png_ptr-&gt;chunk_name, png_IDAT, 4))</div><div class='del'>-     if (png_ptr-&gt;mode &amp; PNG_AFTER_IDAT)</div><div class='del'>-        png_ptr-&gt;mode |= PNG_HAVE_CHUNK_AFTER_IDAT;</div><div class='add'>+      if (png_ptr-&gt;mode &amp; PNG_AFTER_IDAT)</div><div class='add'>+         png_ptr-&gt;mode |= PNG_HAVE_CHUNK_AFTER_IDAT;</div><div class='ctx'> </div><div class='ctx'>    if (!png_memcmp(png_ptr-&gt;chunk_name, png_IHDR, 4))</div><div class='ctx'>    {</div><div class='hunk'>@@ -285,7 +343,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>             png_error(png_ptr, "Missing IHDR before IDAT");</div><div class='ctx'> </div><div class='ctx'>          else if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE &amp;&amp;</div><div class='del'>-                  !(png_ptr-&gt;mode &amp; PNG_HAVE_PLTE))</div><div class='add'>+             !(png_ptr-&gt;mode &amp; PNG_HAVE_PLTE))</div><div class='ctx'>             png_error(png_ptr, "Missing PLTE before IDAT");</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='hunk'>@@ -329,7 +387,9 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>       png_ptr-&gt;mode |= PNG_HAVE_IDAT;</div><div class='ctx'>       png_ptr-&gt;process_mode = PNG_READ_IDAT_MODE;</div><div class='ctx'>       png_push_have_info(png_ptr, info_ptr);</div><div class='del'>-      png_ptr-&gt;zstream.avail_out = (uInt)png_ptr-&gt;irowbytes;</div><div class='add'>+      png_ptr-&gt;zstream.avail_out =</div><div class='add'>+          (uInt) PNG_ROWBYTES(png_ptr-&gt;pixel_depth,</div><div class='add'>+          png_ptr-&gt;iwidth) + 1;</div><div class='ctx'>       png_ptr-&gt;zstream.next_out = png_ptr-&gt;row_buf;</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='hunk'>@@ -580,32 +640,45 @@ png_push_crc_finish(png_structp png_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr-&gt;skip_length &amp;&amp; png_ptr-&gt;save_buffer_size)</div><div class='ctx'>    {</div><div class='del'>-      png_size_t save_size;</div><div class='add'>+      png_size_t save_size = png_ptr-&gt;save_buffer_size;</div><div class='add'>+      png_uint_32 skip_length = png_ptr-&gt;skip_length;</div><div class='add'>+</div><div class='add'>+      /* We want the smaller of 'skip_length' and 'save_buffer_size', but</div><div class='add'>+       * they are of different types and we don't know which variable has the</div><div class='add'>+       * fewest bits.  Carefully select the smaller and cast it to the type of</div><div class='add'>+       * the larger - this cannot overflow.  Do not cast in the following test</div><div class='add'>+       * - it will break on either 16 or 64 bit platforms.</div><div class='add'>+       */</div><div class='add'>+      if (skip_length &lt; save_size)</div><div class='add'>+         save_size = (png_size_t)skip_length;</div><div class='ctx'> </div><div class='del'>-      if (png_ptr-&gt;skip_length &lt; (png_uint_32)png_ptr-&gt;save_buffer_size)</div><div class='del'>-         save_size = (png_size_t)png_ptr-&gt;skip_length;</div><div class='ctx'>       else</div><div class='del'>-         save_size = png_ptr-&gt;save_buffer_size;</div><div class='add'>+         skip_length = (png_uint_32)save_size;</div><div class='ctx'> </div><div class='ctx'>       png_calculate_crc(png_ptr, png_ptr-&gt;save_buffer_ptr, save_size);</div><div class='ctx'> </div><div class='del'>-      png_ptr-&gt;skip_length -= save_size;</div><div class='add'>+      png_ptr-&gt;skip_length -= skip_length;</div><div class='ctx'>       png_ptr-&gt;buffer_size -= save_size;</div><div class='ctx'>       png_ptr-&gt;save_buffer_size -= save_size;</div><div class='ctx'>       png_ptr-&gt;save_buffer_ptr += save_size;</div><div class='ctx'>    }</div><div class='ctx'>    if (png_ptr-&gt;skip_length &amp;&amp; png_ptr-&gt;current_buffer_size)</div><div class='ctx'>    {</div><div class='del'>-      png_size_t save_size;</div><div class='add'>+      png_size_t save_size = png_ptr-&gt;current_buffer_size;</div><div class='add'>+      png_uint_32 skip_length = png_ptr-&gt;skip_length;</div><div class='add'>+</div><div class='add'>+      /* We want the smaller of 'skip_length' and 'current_buffer_size', here,</div><div class='add'>+       * the same problem exists as above and the same solution.</div><div class='add'>+       */</div><div class='add'>+      if (skip_length &lt; save_size)</div><div class='add'>+         save_size = (png_size_t)skip_length;</div><div class='ctx'> </div><div class='del'>-      if (png_ptr-&gt;skip_length &lt; (png_uint_32)png_ptr-&gt;current_buffer_size)</div><div class='del'>-         save_size = (png_size_t)png_ptr-&gt;skip_length;</div><div class='ctx'>       else</div><div class='del'>-         save_size = png_ptr-&gt;current_buffer_size;</div><div class='add'>+         skip_length = (png_uint_32)save_size;</div><div class='ctx'> </div><div class='ctx'>       png_calculate_crc(png_ptr, png_ptr-&gt;current_buffer_ptr, save_size);</div><div class='ctx'> </div><div class='del'>-      png_ptr-&gt;skip_length -= save_size;</div><div class='add'>+      png_ptr-&gt;skip_length -= skip_length;</div><div class='ctx'>       png_ptr-&gt;buffer_size -= save_size;</div><div class='ctx'>       png_ptr-&gt;current_buffer_size -= save_size;</div><div class='ctx'>       png_ptr-&gt;current_buffer_ptr += save_size;</div><div class='hunk'>@@ -623,7 +696,7 @@ png_push_crc_finish(png_structp png_ptr)</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void PNGAPI</div><div class='add'>+void PNGCBAPI</div><div class='ctx'> png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)</div><div class='ctx'> {</div><div class='ctx'>    png_bytep ptr;</div><div class='hunk'>@@ -638,6 +711,7 @@ png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)</div><div class='ctx'> </div><div class='ctx'>       if (length &lt; png_ptr-&gt;save_buffer_size)</div><div class='ctx'>          save_size = length;</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>          save_size = png_ptr-&gt;save_buffer_size;</div><div class='ctx'> </div><div class='hunk'>@@ -678,28 +752,35 @@ png_push_save_buffer(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'>          istop = png_ptr-&gt;save_buffer_size;</div><div class='ctx'>          for (i = 0, sp = png_ptr-&gt;save_buffer_ptr, dp = png_ptr-&gt;save_buffer;</div><div class='del'>-            i &lt; istop; i++, sp++, dp++)</div><div class='add'>+             i &lt; istop; i++, sp++, dp++)</div><div class='ctx'>          {</div><div class='ctx'>             *dp = *sp;</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='ctx'>    if (png_ptr-&gt;save_buffer_size + png_ptr-&gt;current_buffer_size &gt;</div><div class='del'>-      png_ptr-&gt;save_buffer_max)</div><div class='add'>+       png_ptr-&gt;save_buffer_max)</div><div class='ctx'>    {</div><div class='ctx'>       png_size_t new_max;</div><div class='ctx'>       png_bytep old_buffer;</div><div class='ctx'> </div><div class='ctx'>       if (png_ptr-&gt;save_buffer_size &gt; PNG_SIZE_MAX -</div><div class='del'>-         (png_ptr-&gt;current_buffer_size + 256))</div><div class='add'>+          (png_ptr-&gt;current_buffer_size + 256))</div><div class='ctx'>       {</div><div class='del'>-        png_error(png_ptr, "Potential overflow of save_buffer");</div><div class='add'>+         png_error(png_ptr, "Potential overflow of save_buffer");</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='ctx'>       new_max = png_ptr-&gt;save_buffer_size + png_ptr-&gt;current_buffer_size + 256;</div><div class='ctx'>       old_buffer = png_ptr-&gt;save_buffer;</div><div class='del'>-      png_ptr-&gt;save_buffer = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-         (png_size_t)new_max);</div><div class='add'>+      png_ptr-&gt;save_buffer = (png_bytep)png_malloc_warn(png_ptr,</div><div class='add'>+          (png_size_t)new_max);</div><div class='add'>+</div><div class='add'>+      if (png_ptr-&gt;save_buffer == NULL)</div><div class='add'>+      {</div><div class='add'>+         png_free(png_ptr, old_buffer);</div><div class='add'>+         png_error(png_ptr, "Insufficient memory for save_buffer");</div><div class='add'>+      }</div><div class='add'>+</div><div class='ctx'>       png_memcpy(png_ptr-&gt;save_buffer, old_buffer, png_ptr-&gt;save_buffer_size);</div><div class='ctx'>       png_free(png_ptr, old_buffer);</div><div class='ctx'>       png_ptr-&gt;save_buffer_max = new_max;</div><div class='hunk'>@@ -748,8 +829,10 @@ png_push_read_IDAT(png_structp png_ptr)</div><div class='ctx'>       if (png_memcmp(png_ptr-&gt;chunk_name, png_IDAT, 4))</div><div class='ctx'>       {</div><div class='ctx'>          png_ptr-&gt;process_mode = PNG_READ_CHUNK_MODE;</div><div class='add'>+</div><div class='ctx'>          if (!(png_ptr-&gt;flags &amp; PNG_FLAG_ZLIB_FINISHED))</div><div class='ctx'>             png_error(png_ptr, "Not enough compressed data");</div><div class='add'>+</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='hunk'>@@ -757,49 +840,52 @@ png_push_read_IDAT(png_structp png_ptr)</div><div class='ctx'>    }</div><div class='ctx'>    if (png_ptr-&gt;idat_size &amp;&amp; png_ptr-&gt;save_buffer_size)</div><div class='ctx'>    {</div><div class='del'>-      png_size_t save_size;</div><div class='del'>-</div><div class='del'>-      if (png_ptr-&gt;idat_size &lt; (png_uint_32)png_ptr-&gt;save_buffer_size)</div><div class='del'>-      {</div><div class='del'>-         save_size = (png_size_t)png_ptr-&gt;idat_size;</div><div class='add'>+      png_size_t save_size = png_ptr-&gt;save_buffer_size;</div><div class='add'>+      png_uint_32 idat_size = png_ptr-&gt;idat_size;</div><div class='add'>+</div><div class='add'>+      /* We want the smaller of 'idat_size' and 'current_buffer_size', but they</div><div class='add'>+       * are of different types and we don't know which variable has the fewest</div><div class='add'>+       * bits.  Carefully select the smaller and cast it to the type of the</div><div class='add'>+       * larger - this cannot overflow.  Do not cast in the following test - it</div><div class='add'>+       * will break on either 16 or 64 bit platforms.</div><div class='add'>+       */</div><div class='add'>+      if (idat_size &lt; save_size)</div><div class='add'>+         save_size = (png_size_t)idat_size;</div><div class='ctx'> </div><div class='del'>-         /* Check for overflow */</div><div class='del'>-         if ((png_uint_32)save_size != png_ptr-&gt;idat_size)</div><div class='del'>-            png_error(png_ptr, "save_size overflowed in pngpread");</div><div class='del'>-      }</div><div class='ctx'>       else</div><div class='del'>-         save_size = png_ptr-&gt;save_buffer_size;</div><div class='add'>+         idat_size = (png_uint_32)save_size;</div><div class='ctx'> </div><div class='ctx'>       png_calculate_crc(png_ptr, png_ptr-&gt;save_buffer_ptr, save_size);</div><div class='ctx'> </div><div class='del'>-      if (!(png_ptr-&gt;flags &amp; PNG_FLAG_ZLIB_FINISHED))</div><div class='del'>-         png_process_IDAT_data(png_ptr, png_ptr-&gt;save_buffer_ptr, save_size);</div><div class='add'>+      png_process_IDAT_data(png_ptr, png_ptr-&gt;save_buffer_ptr, save_size);</div><div class='ctx'> </div><div class='del'>-      png_ptr-&gt;idat_size -= save_size;</div><div class='add'>+      png_ptr-&gt;idat_size -= idat_size;</div><div class='ctx'>       png_ptr-&gt;buffer_size -= save_size;</div><div class='ctx'>       png_ptr-&gt;save_buffer_size -= save_size;</div><div class='ctx'>       png_ptr-&gt;save_buffer_ptr += save_size;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;idat_size &amp;&amp; png_ptr-&gt;current_buffer_size)</div><div class='ctx'>    {</div><div class='del'>-      png_size_t save_size;</div><div class='add'>+      png_size_t save_size = png_ptr-&gt;current_buffer_size;</div><div class='add'>+      png_uint_32 idat_size = png_ptr-&gt;idat_size;</div><div class='ctx'> </div><div class='del'>-      if (png_ptr-&gt;idat_size &lt; (png_uint_32)png_ptr-&gt;current_buffer_size)</div><div class='del'>-      {</div><div class='del'>-         save_size = (png_size_t)png_ptr-&gt;idat_size;</div><div class='add'>+      /* We want the smaller of 'idat_size' and 'current_buffer_size', but they</div><div class='add'>+       * are of different types and we don't know which variable has the fewest</div><div class='add'>+       * bits.  Carefully select the smaller and cast it to the type of the</div><div class='add'>+       * larger - this cannot overflow.</div><div class='add'>+       */</div><div class='add'>+      if (idat_size &lt; save_size)</div><div class='add'>+         save_size = (png_size_t)idat_size;</div><div class='ctx'> </div><div class='del'>-         /* Check for overflow */</div><div class='del'>-         if ((png_uint_32)save_size != png_ptr-&gt;idat_size)</div><div class='del'>-            png_error(png_ptr, "save_size overflowed in pngpread");</div><div class='del'>-      }</div><div class='ctx'>       else</div><div class='del'>-         save_size = png_ptr-&gt;current_buffer_size;</div><div class='add'>+         idat_size = (png_uint_32)save_size;</div><div class='ctx'> </div><div class='ctx'>       png_calculate_crc(png_ptr, png_ptr-&gt;current_buffer_ptr, save_size);</div><div class='del'>-      if (!(png_ptr-&gt;flags &amp; PNG_FLAG_ZLIB_FINISHED))</div><div class='del'>-        png_process_IDAT_data(png_ptr, png_ptr-&gt;current_buffer_ptr, save_size);</div><div class='ctx'> </div><div class='del'>-      png_ptr-&gt;idat_size -= save_size;</div><div class='add'>+      png_process_IDAT_data(png_ptr, png_ptr-&gt;current_buffer_ptr, save_size);</div><div class='add'>+</div><div class='add'>+      png_ptr-&gt;idat_size -= idat_size;</div><div class='ctx'>       png_ptr-&gt;buffer_size -= save_size;</div><div class='ctx'>       png_ptr-&gt;current_buffer_size -= save_size;</div><div class='ctx'>       png_ptr-&gt;current_buffer_ptr += save_size;</div><div class='hunk'>@@ -822,60 +908,104 @@ void /* PRIVATE */</div><div class='ctx'> png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,</div><div class='ctx'>    png_size_t buffer_length)</div><div class='ctx'> {</div><div class='del'>-   int ret;</div><div class='del'>-</div><div class='del'>-   if ((png_ptr-&gt;flags &amp; PNG_FLAG_ZLIB_FINISHED) &amp;&amp; buffer_length)</div><div class='del'>-      png_benign_error(png_ptr, "Extra compression data");</div><div class='add'>+   /* The caller checks for a non-zero buffer length. */</div><div class='add'>+   if (!(buffer_length &gt; 0) || buffer == NULL)</div><div class='add'>+      png_error(png_ptr, "No IDAT data (internal error)");</div><div class='ctx'> </div><div class='add'>+   /* This routine must process all the data it has been given</div><div class='add'>+    * before returning, calling the row callback as required to</div><div class='add'>+    * handle the uncompressed results.</div><div class='add'>+    */</div><div class='ctx'>    png_ptr-&gt;zstream.next_in = buffer;</div><div class='ctx'>    png_ptr-&gt;zstream.avail_in = (uInt)buffer_length;</div><div class='del'>-   for (;;)</div><div class='add'>+</div><div class='add'>+   /* Keep going until the decompressed data is all processed</div><div class='add'>+    * or the stream marked as finished.</div><div class='add'>+    */</div><div class='add'>+   while (png_ptr-&gt;zstream.avail_in &gt; 0 &amp;&amp;</div><div class='add'>+          !(png_ptr-&gt;flags &amp; PNG_FLAG_ZLIB_FINISHED))</div><div class='ctx'>    {</div><div class='del'>-      ret = inflate(&amp;png_ptr-&gt;zstream, Z_PARTIAL_FLUSH);</div><div class='del'>-      if (ret != Z_OK)</div><div class='add'>+      int ret;</div><div class='add'>+</div><div class='add'>+      /* We have data for zlib, but we must check that zlib</div><div class='add'>+       * has someplace to put the results.  It doesn't matter</div><div class='add'>+       * if we don't expect any results -- it may be the input</div><div class='add'>+       * data is just the LZ end code.</div><div class='add'>+       */</div><div class='add'>+      if (!(png_ptr-&gt;zstream.avail_out &gt; 0))</div><div class='ctx'>       {</div><div class='del'>-         if (ret == Z_STREAM_END)</div><div class='del'>-         {</div><div class='del'>-            if (png_ptr-&gt;zstream.avail_in)</div><div class='del'>-               png_benign_error(png_ptr, "Extra compressed data");</div><div class='add'>+         png_ptr-&gt;zstream.avail_out =</div><div class='add'>+             (uInt) PNG_ROWBYTES(png_ptr-&gt;pixel_depth,</div><div class='add'>+             png_ptr-&gt;iwidth) + 1;</div><div class='ctx'> </div><div class='del'>-            if (!(png_ptr-&gt;zstream.avail_out))</div><div class='del'>-            {</div><div class='del'>-               png_push_process_row(png_ptr);</div><div class='del'>-            }</div><div class='add'>+         png_ptr-&gt;zstream.next_out = png_ptr-&gt;row_buf;</div><div class='add'>+      }</div><div class='ctx'> </div><div class='del'>-            png_ptr-&gt;mode |= PNG_AFTER_IDAT;</div><div class='del'>-            png_ptr-&gt;flags |= PNG_FLAG_ZLIB_FINISHED;</div><div class='del'>-            break;</div><div class='del'>-         }</div><div class='del'>-         else if (ret == Z_BUF_ERROR)</div><div class='del'>-            break;</div><div class='add'>+      /* Using Z_SYNC_FLUSH here means that an unterminated</div><div class='add'>+       * LZ stream (a stream with a missing end code) can still</div><div class='add'>+       * be handled, otherwise (Z_NO_FLUSH) a future zlib</div><div class='add'>+       * implementation might defer output and therefore</div><div class='add'>+       * change the current behavior (see comments in inflate.c</div><div class='add'>+       * for why this doesn't happen at present with zlib 1.2.5).</div><div class='add'>+       */</div><div class='add'>+      ret = inflate(&amp;png_ptr-&gt;zstream, Z_SYNC_FLUSH);</div><div class='add'>+</div><div class='add'>+      /* Check for any failure before proceeding. */</div><div class='add'>+      if (ret != Z_OK &amp;&amp; ret != Z_STREAM_END)</div><div class='add'>+      {</div><div class='add'>+         /* Terminate the decompression. */</div><div class='add'>+         png_ptr-&gt;flags |= PNG_FLAG_ZLIB_FINISHED;</div><div class='add'>+</div><div class='add'>+         /* This may be a truncated stream (missing or</div><div class='add'>+          * damaged end code).  Treat that as a warning.</div><div class='add'>+          */</div><div class='add'>+         if (png_ptr-&gt;row_number &gt;= png_ptr-&gt;num_rows ||</div><div class='add'>+             png_ptr-&gt;pass &gt; 6)</div><div class='add'>+            png_warning(png_ptr, "Truncated compressed data in IDAT");</div><div class='ctx'> </div><div class='ctx'>          else</div><div class='del'>-            png_error(png_ptr, "Decompression Error");</div><div class='add'>+            png_error(png_ptr, "Decompression error in IDAT");</div><div class='add'>+</div><div class='add'>+         /* Skip the check on unprocessed input */</div><div class='add'>+         return;</div><div class='ctx'>       }</div><div class='del'>-      if (!(png_ptr-&gt;zstream.avail_out))</div><div class='add'>+</div><div class='add'>+      /* Did inflate output any data? */</div><div class='add'>+      if (png_ptr-&gt;zstream.next_out != png_ptr-&gt;row_buf)</div><div class='ctx'>       {</div><div class='del'>-         if ((</div><div class='del'>-#ifdef PNG_READ_INTERLACING_SUPPORTED</div><div class='del'>-             png_ptr-&gt;interlaced &amp;&amp; png_ptr-&gt;pass &gt; 6) ||</div><div class='del'>-             (!png_ptr-&gt;interlaced &amp;&amp;</div><div class='del'>-#endif</div><div class='del'>-             png_ptr-&gt;row_number == png_ptr-&gt;num_rows))</div><div class='add'>+         /* Is this unexpected data after the last row?</div><div class='add'>+          * If it is, artificially terminate the LZ output</div><div class='add'>+          * here.</div><div class='add'>+          */</div><div class='add'>+         if (png_ptr-&gt;row_number &gt;= png_ptr-&gt;num_rows ||</div><div class='add'>+             png_ptr-&gt;pass &gt; 6)</div><div class='ctx'>          {</div><div class='del'>-           if (png_ptr-&gt;zstream.avail_in)</div><div class='del'>-             png_warning(png_ptr, "Too much data in IDAT chunks");</div><div class='del'>-           png_ptr-&gt;flags |= PNG_FLAG_ZLIB_FINISHED;</div><div class='del'>-           break;</div><div class='add'>+            /* Extra data. */</div><div class='add'>+            png_warning(png_ptr, "Extra compressed data in IDAT");</div><div class='add'>+            png_ptr-&gt;flags |= PNG_FLAG_ZLIB_FINISHED;</div><div class='add'>+</div><div class='add'>+            /* Do no more processing; skip the unprocessed</div><div class='add'>+             * input check below.</div><div class='add'>+             */</div><div class='add'>+            return;</div><div class='ctx'>          }</div><div class='del'>-         png_push_process_row(png_ptr);</div><div class='del'>-         png_ptr-&gt;zstream.avail_out = (uInt)png_ptr-&gt;irowbytes;</div><div class='del'>-         png_ptr-&gt;zstream.next_out = png_ptr-&gt;row_buf;</div><div class='add'>+</div><div class='add'>+         /* Do we have a complete row? */</div><div class='add'>+         if (png_ptr-&gt;zstream.avail_out == 0)</div><div class='add'>+            png_push_process_row(png_ptr);</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='del'>-      else</div><div class='del'>-         break;</div><div class='add'>+      /* And check for the end of the stream. */</div><div class='add'>+      if (ret == Z_STREAM_END)</div><div class='add'>+         png_ptr-&gt;flags |= PNG_FLAG_ZLIB_FINISHED;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='add'>+   /* All the data should have been processed, if anything</div><div class='add'>+    * is left at this point we have bytes of IDAT data</div><div class='add'>+    * after the zlib end code.</div><div class='add'>+    */</div><div class='add'>+   if (png_ptr-&gt;zstream.avail_in &gt; 0)</div><div class='add'>+      png_warning(png_ptr, "Extra compression data in IDAT");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void /* PRIVATE */</div><div class='hunk'>@@ -891,8 +1021,8 @@ png_push_process_row(png_structp png_ptr)</div><div class='ctx'>        png_ptr-&gt;row_info.width);</div><div class='ctx'> </div><div class='ctx'>    png_read_filter_row(png_ptr, &amp;(png_ptr-&gt;row_info),</div><div class='del'>-      png_ptr-&gt;row_buf + 1, png_ptr-&gt;prev_row + 1,</div><div class='del'>-      (int)(png_ptr-&gt;row_buf[0]));</div><div class='add'>+       png_ptr-&gt;row_buf + 1, png_ptr-&gt;prev_row + 1,</div><div class='add'>+       (int)(png_ptr-&gt;row_buf[0]));</div><div class='ctx'> </div><div class='ctx'>    png_memcpy(png_ptr-&gt;prev_row, png_ptr-&gt;row_buf, png_ptr-&gt;rowbytes + 1);</div><div class='ctx'> </div><div class='hunk'>@@ -906,7 +1036,7 @@ png_push_process_row(png_structp png_ptr)</div><div class='ctx'>       if (png_ptr-&gt;pass &lt; 6)</div><div class='ctx'> /*       old interface (pre-1.0.9):</div><div class='ctx'>          png_do_read_interlace(&amp;(png_ptr-&gt;row_info),</div><div class='del'>-            png_ptr-&gt;row_buf + 1, png_ptr-&gt;pass, png_ptr-&gt;transformations);</div><div class='add'>+             png_ptr-&gt;row_buf + 1, png_ptr-&gt;pass, png_ptr-&gt;transformations);</div><div class='ctx'>  */</div><div class='ctx'>          png_do_read_interlace(png_ptr);</div><div class='ctx'> </div><div class='hunk'>@@ -1062,6 +1192,8 @@ png_push_process_row(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='add'>+         default:</div><div class='ctx'>          case 6:</div><div class='ctx'>          {</div><div class='ctx'>             png_push_have_row(png_ptr, png_ptr-&gt;row_buf + 1);</div><div class='hunk'>@@ -1113,15 +1245,15 @@ png_read_push_finish_row(png_structp png_ptr)</div><div class='ctx'>    if (png_ptr-&gt;interlaced)</div><div class='ctx'>    {</div><div class='ctx'>       png_ptr-&gt;row_number = 0;</div><div class='del'>-      png_memset(png_ptr-&gt;prev_row, 0,</div><div class='del'>-         png_ptr-&gt;rowbytes + 1);</div><div class='add'>+      png_memset(png_ptr-&gt;prev_row, 0, png_ptr-&gt;rowbytes + 1);</div><div class='add'>+</div><div class='ctx'>       do</div><div class='ctx'>       {</div><div class='ctx'>          png_ptr-&gt;pass++;</div><div class='ctx'>          if ((png_ptr-&gt;pass == 1 &amp;&amp; png_ptr-&gt;width &lt; 5) ||</div><div class='ctx'>              (png_ptr-&gt;pass == 3 &amp;&amp; png_ptr-&gt;width &lt; 3) ||</div><div class='ctx'>              (png_ptr-&gt;pass == 5 &amp;&amp; png_ptr-&gt;width &lt; 2))</div><div class='del'>-           png_ptr-&gt;pass++;</div><div class='add'>+            png_ptr-&gt;pass++;</div><div class='ctx'> </div><div class='ctx'>          if (png_ptr-&gt;pass &gt; 7)</div><div class='ctx'>             png_ptr-&gt;pass--;</div><div class='hunk'>@@ -1130,20 +1262,17 @@ png_read_push_finish_row(png_structp png_ptr)</div><div class='ctx'>             break;</div><div class='ctx'> </div><div class='ctx'>          png_ptr-&gt;iwidth = (png_ptr-&gt;width +</div><div class='del'>-            png_pass_inc[png_ptr-&gt;pass] - 1 -</div><div class='del'>-            png_pass_start[png_ptr-&gt;pass]) /</div><div class='del'>-            png_pass_inc[png_ptr-&gt;pass];</div><div class='del'>-</div><div class='del'>-         png_ptr-&gt;irowbytes = PNG_ROWBYTES(png_ptr-&gt;pixel_depth,</div><div class='del'>-            png_ptr-&gt;iwidth) + 1;</div><div class='add'>+             png_pass_inc[png_ptr-&gt;pass] - 1 -</div><div class='add'>+             png_pass_start[png_ptr-&gt;pass]) /</div><div class='add'>+             png_pass_inc[png_ptr-&gt;pass];</div><div class='ctx'> </div><div class='ctx'>          if (png_ptr-&gt;transformations &amp; PNG_INTERLACE)</div><div class='ctx'>             break;</div><div class='ctx'> </div><div class='ctx'>          png_ptr-&gt;num_rows = (png_ptr-&gt;height +</div><div class='del'>-            png_pass_yinc[png_ptr-&gt;pass] - 1 -</div><div class='del'>-            png_pass_ystart[png_ptr-&gt;pass]) /</div><div class='del'>-            png_pass_yinc[png_ptr-&gt;pass];</div><div class='add'>+             png_pass_yinc[png_ptr-&gt;pass] - 1 -</div><div class='add'>+             png_pass_ystart[png_ptr-&gt;pass]) /</div><div class='add'>+             png_pass_yinc[png_ptr-&gt;pass];</div><div class='ctx'> </div><div class='ctx'>       } while (png_ptr-&gt;iwidth == 0 || png_ptr-&gt;num_rows == 0);</div><div class='ctx'>    }</div><div class='hunk'>@@ -1153,12 +1282,13 @@ png_read_push_finish_row(png_structp png_ptr)</div><div class='ctx'> #ifdef PNG_READ_tEXt_SUPPORTED</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32</div><div class='del'>-   length)</div><div class='add'>+    length)</div><div class='ctx'> {</div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR) || (png_ptr-&gt;mode &amp; PNG_HAVE_IEND))</div><div class='ctx'>       {</div><div class='add'>+         PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */</div><div class='ctx'>          png_error(png_ptr, "Out of place tEXt");</div><div class='del'>-         info_ptr = info_ptr; /* To quiet some compiler warnings */</div><div class='add'>+         /*NOT REACHED*/</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_MAX_MALLOC_64K</div><div class='hunk'>@@ -1173,7 +1303,7 @@ png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>    png_ptr-&gt;current_text = (png_charp)png_malloc(png_ptr,</div><div class='del'>-      (png_size_t)(length + 1));</div><div class='add'>+       (png_size_t)(length + 1));</div><div class='ctx'>    png_ptr-&gt;current_text[length] = '\0';</div><div class='ctx'>    png_ptr-&gt;current_text_ptr = png_ptr-&gt;current_text;</div><div class='ctx'>    png_ptr-&gt;current_text_size = (png_size_t)length;</div><div class='hunk'>@@ -1226,14 +1356,12 @@ png_push_read_tEXt(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>       if (text &lt; key + png_ptr-&gt;current_text_size)</div><div class='ctx'>          text++;</div><div class='ctx'> </div><div class='del'>-      text_ptr = (png_textp)png_malloc(png_ptr,</div><div class='del'>-         png_sizeof(png_text));</div><div class='add'>+      text_ptr = (png_textp)png_malloc(png_ptr, png_sizeof(png_text));</div><div class='ctx'>       text_ptr-&gt;compression = PNG_TEXT_COMPRESSION_NONE;</div><div class='ctx'>       text_ptr-&gt;key = key;</div><div class='del'>-#ifdef PNG_iTXt_SUPPORTED</div><div class='add'>+      text_ptr-&gt;itxt_length = 0;</div><div class='ctx'>       text_ptr-&gt;lang = NULL;</div><div class='ctx'>       text_ptr-&gt;lang_key = NULL;</div><div class='del'>-#endif</div><div class='ctx'>       text_ptr-&gt;text = text;</div><div class='ctx'> </div><div class='ctx'>       ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);</div><div class='hunk'>@@ -1243,7 +1371,7 @@ png_push_read_tEXt(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>       png_ptr-&gt;current_text = NULL;</div><div class='ctx'> </div><div class='ctx'>       if (ret)</div><div class='del'>-        png_warning(png_ptr, "Insufficient memory to store text chunk");</div><div class='add'>+         png_warning(png_ptr, "Insufficient memory to store text chunk");</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1254,10 +1382,11 @@ png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32</div><div class='ctx'>    length)</div><div class='ctx'> {</div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR) || (png_ptr-&gt;mode &amp; PNG_HAVE_IEND))</div><div class='del'>-      {</div><div class='del'>-         png_error(png_ptr, "Out of place zTXt");</div><div class='del'>-         info_ptr = info_ptr; /* To quiet some compiler warnings */</div><div class='del'>-      }</div><div class='add'>+   {</div><div class='add'>+      PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */</div><div class='add'>+      png_error(png_ptr, "Out of place zTXt");</div><div class='add'>+      /*NOT REACHED*/</div><div class='add'>+   }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_MAX_MALLOC_64K</div><div class='ctx'>    /* We can't handle zTXt chunks &gt; 64K, since we don't have enough space</div><div class='hunk'>@@ -1273,7 +1402,7 @@ png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>    png_ptr-&gt;current_text = (png_charp)png_malloc(png_ptr,</div><div class='del'>-      (png_size_t)(length + 1));</div><div class='add'>+       (png_size_t)(length + 1));</div><div class='ctx'>    png_ptr-&gt;current_text[length] = '\0';</div><div class='ctx'>    png_ptr-&gt;current_text_ptr = png_ptr-&gt;current_text;</div><div class='ctx'>    png_ptr-&gt;current_text_size = (png_size_t)length;</div><div class='hunk'>@@ -1338,9 +1467,9 @@ png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> </div><div class='ctx'>       text++;</div><div class='ctx'> </div><div class='del'>-      png_ptr-&gt;zstream.next_in = (png_bytep )text;</div><div class='add'>+      png_ptr-&gt;zstream.next_in = (png_bytep)text;</div><div class='ctx'>       png_ptr-&gt;zstream.avail_in = (uInt)(png_ptr-&gt;current_text_size -</div><div class='del'>-         (text - key));</div><div class='add'>+          (text - key));</div><div class='ctx'>       png_ptr-&gt;zstream.next_out = png_ptr-&gt;zbuf;</div><div class='ctx'>       png_ptr-&gt;zstream.avail_out = (uInt)png_ptr-&gt;zbuf_size;</div><div class='ctx'> </div><div class='hunk'>@@ -1361,42 +1490,45 @@ png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>             png_free(png_ptr, text);</div><div class='ctx'>             return;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          if (!(png_ptr-&gt;zstream.avail_out) || ret == Z_STREAM_END)</div><div class='ctx'>          {</div><div class='ctx'>             if (text == NULL)</div><div class='ctx'>             {</div><div class='ctx'>                text = (png_charp)png_malloc(png_ptr,</div><div class='del'>-                     (png_ptr-&gt;zbuf_size</div><div class='del'>-                     - png_ptr-&gt;zstream.avail_out + key_size + 1));</div><div class='add'>+                   (png_ptr-&gt;zbuf_size</div><div class='add'>+                   - png_ptr-&gt;zstream.avail_out + key_size + 1));</div><div class='ctx'> </div><div class='ctx'>                png_memcpy(text + key_size, png_ptr-&gt;zbuf,</div><div class='del'>-                  png_ptr-&gt;zbuf_size - png_ptr-&gt;zstream.avail_out);</div><div class='add'>+                   png_ptr-&gt;zbuf_size - png_ptr-&gt;zstream.avail_out);</div><div class='ctx'> </div><div class='ctx'>                png_memcpy(text, key, key_size);</div><div class='ctx'> </div><div class='ctx'>                text_size = key_size + png_ptr-&gt;zbuf_size -</div><div class='del'>-                  png_ptr-&gt;zstream.avail_out;</div><div class='add'>+                   png_ptr-&gt;zstream.avail_out;</div><div class='ctx'> </div><div class='ctx'>                *(text + text_size) = '\0';</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'>             {</div><div class='ctx'>                png_charp tmp;</div><div class='ctx'> </div><div class='ctx'>                tmp = text;</div><div class='ctx'>                text = (png_charp)png_malloc(png_ptr, text_size +</div><div class='del'>-                  (png_ptr-&gt;zbuf_size </div><div class='del'>-                  - png_ptr-&gt;zstream.avail_out + 1));</div><div class='add'>+                   (png_ptr-&gt;zbuf_size</div><div class='add'>+                   - png_ptr-&gt;zstream.avail_out + 1));</div><div class='ctx'> </div><div class='ctx'>                png_memcpy(text, tmp, text_size);</div><div class='ctx'>                png_free(png_ptr, tmp);</div><div class='ctx'> </div><div class='ctx'>                png_memcpy(text + text_size, png_ptr-&gt;zbuf,</div><div class='del'>-                  png_ptr-&gt;zbuf_size - png_ptr-&gt;zstream.avail_out);</div><div class='add'>+                   png_ptr-&gt;zbuf_size - png_ptr-&gt;zstream.avail_out);</div><div class='ctx'> </div><div class='ctx'>                text_size += png_ptr-&gt;zbuf_size - png_ptr-&gt;zstream.avail_out;</div><div class='ctx'>                *(text + text_size) = '\0';</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             if (ret != Z_STREAM_END)</div><div class='ctx'>             {</div><div class='ctx'>                png_ptr-&gt;zstream.next_out = png_ptr-&gt;zbuf;</div><div class='hunk'>@@ -1432,10 +1564,9 @@ png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>           png_sizeof(png_text));</div><div class='ctx'>       text_ptr-&gt;compression = PNG_TEXT_COMPRESSION_zTXt;</div><div class='ctx'>       text_ptr-&gt;key = key;</div><div class='del'>-#ifdef PNG_iTXt_SUPPORTED</div><div class='add'>+      text_ptr-&gt;itxt_length = 0;</div><div class='ctx'>       text_ptr-&gt;lang = NULL;</div><div class='ctx'>       text_ptr-&gt;lang_key = NULL;</div><div class='del'>-#endif</div><div class='ctx'>       text_ptr-&gt;text = text;</div><div class='ctx'> </div><div class='ctx'>       ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);</div><div class='hunk'>@@ -1444,7 +1575,7 @@ png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>       png_free(png_ptr, text_ptr);</div><div class='ctx'> </div><div class='ctx'>       if (ret)</div><div class='del'>-        png_warning(png_ptr, "Insufficient memory to store text chunk");</div><div class='add'>+         png_warning(png_ptr, "Insufficient memory to store text chunk");</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1452,13 +1583,14 @@ png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> #ifdef PNG_READ_iTXt_SUPPORTED</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32</div><div class='del'>-   length)</div><div class='add'>+    length)</div><div class='ctx'> {</div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR) || (png_ptr-&gt;mode &amp; PNG_HAVE_IEND))</div><div class='del'>-      {</div><div class='del'>-         png_error(png_ptr, "Out of place iTXt");</div><div class='del'>-         info_ptr = info_ptr; /* To quiet some compiler warnings */</div><div class='del'>-      }</div><div class='add'>+   {</div><div class='add'>+      PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */</div><div class='add'>+      png_error(png_ptr, "Out of place iTXt");</div><div class='add'>+      /*NOT REACHED*/</div><div class='add'>+   }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_MAX_MALLOC_64K</div><div class='ctx'>    png_ptr-&gt;skip_length = 0;  /* This may not be necessary */</div><div class='hunk'>@@ -1472,7 +1604,7 @@ png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>    png_ptr-&gt;current_text = (png_charp)png_malloc(png_ptr,</div><div class='del'>-      (png_size_t)(length + 1));</div><div class='add'>+       (png_size_t)(length + 1));</div><div class='ctx'>    png_ptr-&gt;current_text[length] = '\0';</div><div class='ctx'>    png_ptr-&gt;current_text_ptr = png_ptr-&gt;current_text;</div><div class='ctx'>    png_ptr-&gt;current_text_size = (png_size_t)length;</div><div class='hunk'>@@ -1498,6 +1630,7 @@ png_push_read_iTXt(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>       png_ptr-&gt;current_text_left -= text_size;</div><div class='ctx'>       png_ptr-&gt;current_text_ptr += text_size;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (!(png_ptr-&gt;current_text_left))</div><div class='ctx'>    {</div><div class='ctx'>       png_textp text_ptr;</div><div class='hunk'>@@ -1541,15 +1674,15 @@ png_push_read_iTXt(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> </div><div class='ctx'>       if (lang_key &lt; key + png_ptr-&gt;current_text_size - 1)</div><div class='ctx'>       {</div><div class='del'>-        for (; *text; text++)</div><div class='del'>-           /* Empty loop */ ;</div><div class='add'>+         for (; *text; text++)</div><div class='add'>+            /* Empty loop */ ;</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='ctx'>       if (text &lt; key + png_ptr-&gt;current_text_size)</div><div class='ctx'>          text++;</div><div class='ctx'> </div><div class='ctx'>       text_ptr = (png_textp)png_malloc(png_ptr,</div><div class='del'>-         png_sizeof(png_text));</div><div class='add'>+          png_sizeof(png_text));</div><div class='ctx'> </div><div class='ctx'>       text_ptr-&gt;compression = comp_flag + 2;</div><div class='ctx'>       text_ptr-&gt;key = key;</div><div class='hunk'>@@ -1576,7 +1709,7 @@ png_push_read_iTXt(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>  */</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32</div><div class='del'>-   length)</div><div class='add'>+    length)</div><div class='ctx'> {</div><div class='ctx'>    png_uint_32 skip = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1584,15 +1717,15 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32</div><div class='ctx'>    {</div><div class='ctx'> #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED</div><div class='ctx'>       if (png_handle_as_unknown(png_ptr, png_ptr-&gt;chunk_name) !=</div><div class='del'>-         PNG_HANDLE_CHUNK_ALWAYS</div><div class='add'>+          PNG_HANDLE_CHUNK_ALWAYS</div><div class='ctx'> #ifdef PNG_READ_USER_CHUNKS_SUPPORTED</div><div class='del'>-         &amp;&amp; png_ptr-&gt;read_user_chunk_fn == NULL</div><div class='add'>+          &amp;&amp; png_ptr-&gt;read_user_chunk_fn == NULL</div><div class='ctx'> #endif</div><div class='del'>-         )</div><div class='add'>+          )</div><div class='ctx'> #endif</div><div class='ctx'>          png_chunk_error(png_ptr, "unknown critical chunk");</div><div class='ctx'> </div><div class='del'>-      info_ptr = info_ptr; /* To quiet some compiler warnings */</div><div class='add'>+      PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED</div><div class='hunk'>@@ -1601,16 +1734,16 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32</div><div class='ctx'> #ifdef PNG_MAX_MALLOC_64K</div><div class='ctx'>       if (length &gt; (png_uint_32)65535L)</div><div class='ctx'>       {</div><div class='del'>-          png_warning(png_ptr, "unknown chunk too large to fit in memory");</div><div class='del'>-          skip = length - (png_uint_32)65535L;</div><div class='del'>-          length = (png_uint_32)65535L;</div><div class='add'>+         png_warning(png_ptr, "unknown chunk too large to fit in memory");</div><div class='add'>+         skip = length - (png_uint_32)65535L;</div><div class='add'>+         length = (png_uint_32)65535L;</div><div class='ctx'>       }</div><div class='ctx'> #endif</div><div class='ctx'>       png_memcpy((png_charp)png_ptr-&gt;unknown_chunk.name,</div><div class='del'>-                 (png_charp)png_ptr-&gt;chunk_name, </div><div class='del'>-                 png_sizeof(png_ptr-&gt;unknown_chunk.name));</div><div class='add'>+          (png_charp)png_ptr-&gt;chunk_name,</div><div class='add'>+          png_sizeof(png_ptr-&gt;unknown_chunk.name));</div><div class='ctx'>       png_ptr-&gt;unknown_chunk.name[png_sizeof(png_ptr-&gt;unknown_chunk.name) - 1]</div><div class='del'>-        = '\0';</div><div class='add'>+          = '\0';</div><div class='ctx'> </div><div class='ctx'>       png_ptr-&gt;unknown_chunk.size = (png_size_t)length;</div><div class='ctx'> </div><div class='hunk'>@@ -1620,7 +1753,7 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          png_ptr-&gt;unknown_chunk.data = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-            (png_size_t)length);</div><div class='add'>+             (png_size_t)length);</div><div class='ctx'>          png_crc_read(png_ptr, (png_bytep)png_ptr-&gt;unknown_chunk.data, length);</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='hunk'>@@ -1630,7 +1763,7 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32</div><div class='ctx'>          /* Callback to user unknown chunk handler */</div><div class='ctx'>          int ret;</div><div class='ctx'>          ret = (*(png_ptr-&gt;read_user_chunk_fn))</div><div class='del'>-           (png_ptr, &amp;png_ptr-&gt;unknown_chunk);</div><div class='add'>+             (png_ptr, &amp;png_ptr-&gt;unknown_chunk);</div><div class='ctx'> </div><div class='ctx'>          if (ret &lt; 0)</div><div class='ctx'>             png_chunk_error(png_ptr, "error in user chunk");</div><div class='hunk'>@@ -1639,16 +1772,16 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32</div><div class='ctx'>          {</div><div class='ctx'>             if (!(png_ptr-&gt;chunk_name[0] &amp; 0x20))</div><div class='ctx'>                if (png_handle_as_unknown(png_ptr, png_ptr-&gt;chunk_name) !=</div><div class='del'>-                    PNG_HANDLE_CHUNK_ALWAYS)</div><div class='add'>+                   PNG_HANDLE_CHUNK_ALWAYS)</div><div class='ctx'>                   png_chunk_error(png_ptr, "unknown critical chunk");</div><div class='ctx'>             png_set_unknown_chunks(png_ptr, info_ptr,</div><div class='del'>-               &amp;png_ptr-&gt;unknown_chunk, 1);</div><div class='add'>+                &amp;png_ptr-&gt;unknown_chunk, 1);</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='ctx'>       else</div><div class='ctx'> #endif</div><div class='del'>-        png_set_unknown_chunks(png_ptr, info_ptr, &amp;png_ptr-&gt;unknown_chunk, 1);</div><div class='add'>+         png_set_unknown_chunks(png_ptr, info_ptr, &amp;png_ptr-&gt;unknown_chunk, 1);</div><div class='ctx'>       png_free(png_ptr, png_ptr-&gt;unknown_chunk.data);</div><div class='ctx'>       png_ptr-&gt;unknown_chunk.data = NULL;</div><div class='ctx'>    }</div><div class='hunk'>@@ -1682,8 +1815,8 @@ png_push_have_row(png_structp png_ptr, png_bytep row)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void PNGAPI</div><div class='del'>-png_progressive_combine_row (png_structp png_ptr,</div><div class='del'>-   png_bytep old_row, png_bytep new_row)</div><div class='add'>+png_progressive_combine_row (png_structp png_ptr, png_bytep old_row,</div><div class='add'>+    png_const_bytep new_row)</div><div class='ctx'> {</div><div class='ctx'>    PNG_CONST int FARDATA png_pass_dsp_mask[7] =</div><div class='ctx'>       {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};</div><div class='hunk'>@@ -1697,8 +1830,8 @@ png_progressive_combine_row (png_structp png_ptr,</div><div class='ctx'> </div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,</div><div class='del'>-   png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,</div><div class='del'>-   png_progressive_end_ptr end_fn)</div><div class='add'>+    png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,</div><div class='add'>+    png_progressive_end_ptr end_fn)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='hunk'>@@ -1711,7 +1844,7 @@ png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> png_voidp PNGAPI</div><div class='del'>-png_get_progressive_ptr(png_structp png_ptr)</div><div class='add'>+png_get_progressive_ptr(png_const_structp png_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return (NULL);</div><div class='head'>diff --git a/src/3rdparty/libpng/pngpriv.h b/src/3rdparty/libpng/pngpriv.h<br/>index 87a4ba6..9b90f26 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngpriv.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngpriv.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngpriv.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngpriv.h</a></div><div class='hunk'>@@ -1,12 +1,13 @@</div><div class='ctx'> </div><div class='ctx'> /* pngpriv.h - private declarations for use inside libpng</div><div class='ctx'>  *</div><div class='del'>- * libpng version 1.4.0 - January 3, 2010</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in png.h</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='add'>+ * Last changed in libpng 1.5.0 [January 6, 2011]</div><div class='add'>+ *</div><div class='ctx'>  * This code is released under the libpng license.</div><div class='ctx'>  * For conditions of distribution and use, see the disclaimer</div><div class='ctx'>  * and license in png.h</div><div class='hunk'>@@ -24,25 +25,134 @@</div><div class='ctx'> #ifndef PNGPRIV_H</div><div class='ctx'> #define PNGPRIV_H</div><div class='ctx'> </div><div class='del'>-#ifndef PNG_VERSION_INFO_ONLY</div><div class='add'>+#ifdef _MSC_VER</div><div class='add'>+#  define _CRT_SECURE_NO_DEPRECATE</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+/* This is required for the definition of abort(), used as a last ditch</div><div class='add'>+ * error handler when all else fails.</div><div class='add'>+ */</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> </div><div class='add'>+#define PNGLIB_BUILD</div><div class='add'>+#ifdef PNG_USER_CONFIG</div><div class='add'>+#  include "pngusr.h"</div><div class='add'>+   /* These should have been defined in pngusr.h */</div><div class='add'>+#  ifndef PNG_USER_PRIVATEBUILD</div><div class='add'>+#    define PNG_USER_PRIVATEBUILD "Custom libpng build"</div><div class='add'>+#  endif</div><div class='add'>+#  ifndef PNG_USER_DLLFNAME_POSTFIX</div><div class='add'>+#    define PNG_USER_DLLFNAME_POSTFIX "Cb"</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+#include "png.h"</div><div class='add'>+#include "pnginfo.h"</div><div class='add'>+#include "pngstruct.h"</div><div class='add'>+</div><div class='add'>+/* This is used for 16 bit gamma tables - only the top level pointers are const,</div><div class='add'>+ * this could be changed:</div><div class='add'>+ */</div><div class='add'>+typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp;</div><div class='add'>+</div><div class='add'>+/* Added at libpng-1.2.9 */</div><div class='add'>+/* Moved to pngpriv.h at libpng-1.5.0 */</div><div class='add'>+</div><div class='add'>+/* config.h is created by and PNG_CONFIGURE_LIBPNG is set by the "configure"</div><div class='add'>+ * script.  We may need it here to get the correct configuration on things</div><div class='add'>+ * like limits.</div><div class='add'>+ */</div><div class='add'>+#ifdef PNG_CONFIGURE_LIBPNG</div><div class='add'>+#  ifdef HAVE_CONFIG_H</div><div class='add'>+#    include "config.h"</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Moved to pngpriv.h at libpng-1.5.0 */</div><div class='add'>+/* NOTE: some of these may have been used in external applications as</div><div class='add'>+ * these definitions were exposed in pngconf.h prior to 1.5.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* If you are running on a machine where you cannot allocate more</div><div class='add'>+ * than 64K of memory at once, uncomment this.  While libpng will not</div><div class='add'>+ * normally need that much memory in a chunk (unless you load up a very</div><div class='add'>+ * large file), zlib needs to know how big of a chunk it can use, and</div><div class='add'>+ * libpng thus makes sure to check any memory allocation to verify it</div><div class='add'>+ * will fit into memory.</div><div class='add'>+ *</div><div class='add'>+ * zlib provides 'MAXSEG_64K' which, if defined, indicates the</div><div class='add'>+ * same limit and pngconf.h (already included) sets the limit</div><div class='add'>+ * if certain operating systems are detected.</div><div class='add'>+ */</div><div class='add'>+#if defined(MAXSEG_64K) &amp;&amp; !defined(PNG_MAX_MALLOC_64K)</div><div class='add'>+#  define PNG_MAX_MALLOC_64K</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Unused formal parameter warnings are silenced using the following macro</div><div class='add'>+ * which is expected to have no bad effects on performance (optimizing</div><div class='add'>+ * compilers will probably remove it entirely).  Note that if you replace</div><div class='add'>+ * it with something other than whitespace, you must include the terminating</div><div class='add'>+ * semicolon.</div><div class='add'>+ */</div><div class='add'>+#define PNG_UNUSED(param) (void)param;</div><div class='add'>+</div><div class='add'>+/* Just a little check that someone hasn't tried to define something</div><div class='add'>+ * contradictory.</div><div class='add'>+ */</div><div class='add'>+#if (PNG_ZBUF_SIZE &gt; 65536L) &amp;&amp; defined(PNG_MAX_MALLOC_64K)</div><div class='add'>+#  undef PNG_ZBUF_SIZE</div><div class='add'>+#  define PNG_ZBUF_SIZE 65536L</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* If warnings or errors are turned off the code is disabled</div><div class='add'>+ * or redirected here.</div><div class='add'>+ */</div><div class='add'>+#ifndef PNG_WARNINGS_SUPPORTED</div><div class='add'>+#  define png_warning(s1,s2) ((void)0)</div><div class='add'>+#  define png_chunk_warning(s1,s2) ((void)0)</div><div class='add'>+#endif</div><div class='add'>+#ifndef PNG_ERROR_TEXT_SUPPORTED</div><div class='add'>+#  define png_error(s1,s2) png_err(s1)</div><div class='add'>+#  define png_chunk_error(s1,s2) png_err(s1)</div><div class='add'>+#  define png_fixed_error(s1,s2) png_err(s1)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef PNG_EXTERN</div><div class='ctx'> /* The functions exported by PNG_EXTERN are internal functions, which</div><div class='ctx'>  * aren't usually used outside the library (as far as I know), so it is</div><div class='ctx'>  * debatable if they should be exported at all.  In the future, when it</div><div class='ctx'>  * is possible to have run-time registry of chunk-handling functions,</div><div class='del'>- * some of these will be made available again.</div><div class='del'>-#define PNG_EXTERN extern</div><div class='add'>+ * some of these might be made available again.</div><div class='add'>+#  define PNG_EXTERN extern</div><div class='add'>+ */</div><div class='add'>+#  define PNG_EXTERN</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Some fixed point APIs are still required even if not exported because</div><div class='add'>+ * they get used by the corresponding floating point APIs.  This magic</div><div class='add'>+ * deals with this:</div><div class='ctx'>  */</div><div class='del'>-#define PNG_EXTERN</div><div class='add'>+#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+#  define PNGFAPI PNGAPI</div><div class='add'>+#else</div><div class='add'>+#  define PNGFAPI /* PRIVATE */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* Other defines specific to compilers can go here.  Try to keep</div><div class='ctx'>  * them inside an appropriate ifdef/endif pair for portability.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-#  ifdef MACOS</div><div class='add'>+#if defined(PNG_FLOATING_POINT_SUPPORTED) ||\</div><div class='add'>+    defined(PNG_FLOATING_ARITHMETIC_SUPPORTED)</div><div class='add'>+   /* png.c requires the following ANSI-C constants if the conversion of</div><div class='add'>+    * floating point to ASCII is implemented therein:</div><div class='add'>+    *</div><div class='add'>+    *  DBL_DIG  Maximum number of decimal digits (can be set to any constant)</div><div class='add'>+    *  DBL_MIN  Smallest normalized fp number (can be set to an arbitrary value)</div><div class='add'>+    *  DBL_MAX  Maximum floating point number (can be set to an arbitrary value)</div><div class='add'>+    */</div><div class='add'>+#  include &lt;float.h&gt;</div><div class='add'>+</div><div class='add'>+#  if (defined(__MWERKS__) &amp;&amp; defined(macintosh)) || defined(applec) || \</div><div class='add'>+    defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)</div><div class='ctx'>      /* We need to check that &lt;math.h&gt; hasn't already been included earlier</div><div class='ctx'>       * as it seems it doesn't agree with &lt;fp.h&gt;, yet we should really use</div><div class='ctx'>       * &lt;fp.h&gt; if possible.</div><div class='hunk'>@@ -61,11 +171,6 @@</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Codewarrior on NT has linking problems without this. */</div><div class='del'>-#if (defined(__MWERKS__) &amp;&amp; defined(WIN32)) || defined(__STDC__)</div><div class='del'>-#  define PNG_ALWAYS_EXTERN</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* This provides the non-ANSI (far) memory allocation routines. */</div><div class='ctx'> #if defined(__TURBOC__) &amp;&amp; defined(__MSDOS__)</div><div class='ctx'> #  include &lt;mem.h&gt;</div><div class='hunk'>@@ -77,12 +182,88 @@</div><div class='ctx'> #  if !defined(__SYMBIAN32__)</div><div class='ctx'> #    include &lt;windows.h&gt;  /* defines _WINDOWS_ macro */</div><div class='ctx'> #  endif</div><div class='del'>-/* I have no idea why is this necessary... */</div><div class='del'>-#  ifdef _MSC_VER</div><div class='del'>-#    include &lt;malloc.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Moved here around 1.5.0beta36 from pngconf.h */</div><div class='add'>+/* Users may want to use these so they are not private.  Any library</div><div class='add'>+ * functions that are passed far data must be model-independent.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Memory model/platform independent fns */</div><div class='add'>+#ifndef PNG_ABORT</div><div class='add'>+#  if defined(_WINDOWS_) || defined(_WIN32_WCE)</div><div class='add'>+#    define PNG_ABORT() ExitProcess(0)</div><div class='add'>+#  else</div><div class='add'>+#    define PNG_ABORT() abort()</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef USE_FAR_KEYWORD</div><div class='add'>+/* Use this to make far-to-near assignments */</div><div class='add'>+#  define CHECK   1</div><div class='add'>+#  define NOCHECK 0</div><div class='add'>+#  define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))</div><div class='add'>+#  define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))</div><div class='add'>+#  define png_strcpy  _fstrcpy</div><div class='add'>+#  define png_strncpy _fstrncpy   /* Added to v 1.2.6 */</div><div class='add'>+#  define png_strlen  _fstrlen</div><div class='add'>+#  define png_memcmp  _fmemcmp    /* SJT: added */</div><div class='add'>+#  define png_memcpy  _fmemcpy</div><div class='add'>+#  define png_memset  _fmemset</div><div class='add'>+#  define png_sprintf sprintf</div><div class='add'>+#else</div><div class='add'>+#  ifdef _WINDOWS_  /* Favor Windows over C runtime fns */</div><div class='add'>+#    define CVT_PTR(ptr)         (ptr)</div><div class='add'>+#    define CVT_PTR_NOCHECK(ptr) (ptr)</div><div class='add'>+#    define png_strcpy  lstrcpyA</div><div class='add'>+#    define png_strncpy lstrcpynA</div><div class='add'>+#    define png_strlen  lstrlenA</div><div class='add'>+#    define png_memcmp  memcmp</div><div class='add'>+#    define png_memcpy  CopyMemory</div><div class='add'>+#    define png_memset  memset</div><div class='add'>+#    define png_sprintf wsprintfA</div><div class='add'>+#  else</div><div class='add'>+#    define CVT_PTR(ptr)         (ptr)</div><div class='add'>+#    define CVT_PTR_NOCHECK(ptr) (ptr)</div><div class='add'>+#    define png_strcpy  strcpy</div><div class='add'>+#    define png_strncpy strncpy     /* Added to v 1.2.6 */</div><div class='add'>+#    define png_strlen  strlen</div><div class='add'>+#    define png_memcmp  memcmp      /* SJT: added */</div><div class='add'>+#    define png_memcpy  memcpy</div><div class='add'>+#    define png_memset  memset</div><div class='add'>+#    define png_sprintf sprintf</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+/* End of memory model/platform independent support */</div><div class='add'>+</div><div class='add'>+#ifndef PNG_NO_SNPRINTF</div><div class='add'>+#  ifdef _MSC_VER</div><div class='add'>+#    define png_snprintf _snprintf   /* Added to v 1.2.19 */</div><div class='add'>+#    define png_snprintf2 _snprintf</div><div class='add'>+#    define png_snprintf6 _snprintf</div><div class='add'>+#  else</div><div class='add'>+#    define png_snprintf snprintf   /* Added to v 1.2.19 */</div><div class='add'>+#    define png_snprintf2 snprintf</div><div class='add'>+#    define png_snprintf6 snprintf</div><div class='add'>+#  endif</div><div class='add'>+#else</div><div class='add'>+  /* You don't have or don't want to use snprintf().  Caution: Using</div><div class='add'>+   * sprintf instead of snprintf exposes your application to accidental</div><div class='add'>+   * or malevolent buffer overflows.  If you don't have snprintf()</div><div class='add'>+   * as a general rule you should provide one (you can get one from</div><div class='add'>+   * Portable OpenSSH).</div><div class='add'>+   */</div><div class='add'>+#  define png_snprintf(s1,n,fmt,x1) png_sprintf(s1,fmt,x1)</div><div class='add'>+#  define png_snprintf2(s1,n,fmt,x1,x2) png_sprintf(s1,fmt,x1,x2)</div><div class='add'>+#  define png_snprintf6(s1,n,fmt,x1,x2,x3,x4,x5,x6) \</div><div class='add'>+      png_sprintf(s1,fmt,x1,x2,x3,x4,x5,x6)</div><div class='add'>+#endif</div><div class='add'>+/* End of 1.5.0beta36 move from pngconf.h */</div><div class='add'>+</div><div class='add'>+/* CONSTANTS and UTILITY MACROS</div><div class='add'>+ * These are used internally by libpng and not exposed in the API</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> /* Various modes of operation.  Note that after an init, mode is set to</div><div class='ctx'>  * zero automatically when the structure is created.</div><div class='ctx'>  */</div><div class='hunk'>@@ -108,7 +289,7 @@</div><div class='ctx'> #define PNG_SHIFT               0x0008</div><div class='ctx'> #define PNG_SWAP_BYTES          0x0010</div><div class='ctx'> #define PNG_INVERT_MONO         0x0020</div><div class='del'>-#define PNG_DITHER              0x0040</div><div class='add'>+#define PNG_QUANTIZE            0x0040</div><div class='ctx'> #define PNG_BACKGROUND          0x0080</div><div class='ctx'> #define PNG_BACKGROUND_EXPAND   0x0100</div><div class='ctx'>                           /*    0x0200 unused */</div><div class='hunk'>@@ -140,9 +321,7 @@</div><div class='ctx'> #define PNG_STRUCT_INFO  0x0002</div><div class='ctx'> </div><div class='ctx'> /* Scaling factor for filter heuristic weighting calculations */</div><div class='del'>-#define PNG_WEIGHT_SHIFT 8</div><div class='ctx'> #define PNG_WEIGHT_FACTOR (1&lt;&lt;(PNG_WEIGHT_SHIFT))</div><div class='del'>-#define PNG_COST_SHIFT 3</div><div class='ctx'> #define PNG_COST_FACTOR (1&lt;&lt;(PNG_COST_SHIFT))</div><div class='ctx'> </div><div class='ctx'> /* Flags for the png_ptr-&gt;flags rather than declaring a byte for each one */</div><div class='hunk'>@@ -187,6 +366,18 @@</div><div class='ctx'> #define PNG_FLAG_CRC_MASK           (PNG_FLAG_CRC_ANCILLARY_MASK | \</div><div class='ctx'>                                      PNG_FLAG_CRC_CRITICAL_MASK)</div><div class='ctx'> </div><div class='add'>+/* zlib.h declares a magic type 'uInt' that limits the amount of data that zlib</div><div class='add'>+ * can handle at once.  This type need be no larger than 16 bits (so maximum of</div><div class='add'>+ * 65535), this define allows us to discover how big it is, but limited by the</div><div class='add'>+ * maximuum for png_size_t.  The value can be overriden in a library build</div><div class='add'>+ * (pngusr.h, or set it in CPPFLAGS) and it works to set it to a considerably</div><div class='add'>+ * lower value (e.g. 255 works).  A lower value may help memory usage (slightly)</div><div class='add'>+ * and may even improve performance on some systems (and degrade it on others.)</div><div class='add'>+ */</div><div class='add'>+#ifndef ZLIB_IO_MAX</div><div class='add'>+#  define ZLIB_IO_MAX ((uInt)-1)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /* Save typing and make code easier to understand */</div><div class='ctx'> </div><div class='ctx'> #define PNG_COLOR_DIST(c1, c2) (abs((int)((c1).red) - (int)((c2).red)) + \</div><div class='hunk'>@@ -205,7 +396,46 @@</div><div class='ctx'>  * integers, "value" a variable. Added to libpng-1.2.6 JB</div><div class='ctx'>  */</div><div class='ctx'> #define PNG_OUT_OF_RANGE(value, ideal, delta) \</div><div class='del'>-        ( (value) &lt; (ideal)-(delta) || (value) &gt; (ideal)+(delta) )</div><div class='add'>+   ( (value) &lt; (ideal)-(delta) || (value) &gt; (ideal)+(delta) )</div><div class='add'>+</div><div class='add'>+/* Conversions between fixed and floating point, only defined if</div><div class='add'>+ * required (to make sure the code doesn't accidentally use float</div><div class='add'>+ * when it is supposedly disabled.)</div><div class='add'>+ */</div><div class='add'>+#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+/* The floating point conversion can't overflow, though it can and</div><div class='add'>+ * does lose accuracy relative to the original fixed point value.</div><div class='add'>+ * In practice this doesn't matter because png_fixed_point only</div><div class='add'>+ * stores numbers with very low precision.  The png_ptr and s</div><div class='add'>+ * arguments are unused by default but are there in case error</div><div class='add'>+ * checking becomes a requirement.</div><div class='add'>+ */</div><div class='add'>+#define png_float(png_ptr, fixed, s) (.00001 * (fixed))</div><div class='add'>+</div><div class='add'>+/* The fixed point conversion performs range checking and evaluates</div><div class='add'>+ * its argument multiple times, so must be used with care.  The</div><div class='add'>+ * range checking uses the PNG specification values for a signed</div><div class='add'>+ * 32 bit fixed point value except that the values are deliberately</div><div class='add'>+ * rounded-to-zero to an integral value - 21474 (21474.83 is roughly</div><div class='add'>+ * (2^31-1) * 100000). 's' is a string that describes the value being</div><div class='add'>+ * converted.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: this macro will raise a png_error if the range check fails,</div><div class='add'>+ * therefore it is normally only appropriate to use this on values</div><div class='add'>+ * that come from API calls or other sources where an out of range</div><div class='add'>+ * error indicates a programming error, not a data error!</div><div class='add'>+ *</div><div class='add'>+ * NOTE: by default this is off - the macro is not used - because the</div><div class='add'>+ * function call saves a lot of code.</div><div class='add'>+ */</div><div class='add'>+#ifdef PNG_FIXED_POINT_MACRO_SUPPORTED</div><div class='add'>+#define png_fixed(png_ptr, fp, s) ((fp) &lt;= 21474 &amp;&amp; (fp) &gt;= -21474 ?\</div><div class='add'>+    ((png_fixed_point)(100000 * (fp))) : (png_fixed_error(png_ptr, s),0))</div><div class='add'>+#else</div><div class='add'>+PNG_EXTERN png_fixed_point png_fixed PNGARG((png_structp png_ptr, double fp,</div><div class='add'>+   png_const_charp text));</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* Constant strings for known chunk types.  If you need to add a chunk,</div><div class='ctx'>  * define the name here, and add an invocation of the macro wherever it's</div><div class='hunk'>@@ -247,70 +477,78 @@ extern "C" {</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* Allocate memory for an internal libpng struct */</div><div class='del'>-PNG_EXTERN png_voidp png_create_struct PNGARG((int type));</div><div class='add'>+PNG_EXTERN PNG_FUNCTION(png_voidp,png_create_struct,PNGARG((int type)),</div><div class='add'>+   PNG_ALLOCATED);</div><div class='ctx'> </div><div class='ctx'> /* Free memory from internal libpng struct */</div><div class='ctx'> PNG_EXTERN void png_destroy_struct PNGARG((png_voidp struct_ptr));</div><div class='ctx'> </div><div class='del'>-PNG_EXTERN png_voidp png_create_struct_2 PNGARG((int type, png_malloc_ptr</div><div class='del'>-  malloc_fn, png_voidp mem_ptr));</div><div class='add'>+PNG_EXTERN PNG_FUNCTION(png_voidp,png_create_struct_2,</div><div class='add'>+   PNGARG((int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)),</div><div class='add'>+   PNG_ALLOCATED);</div><div class='ctx'> PNG_EXTERN void png_destroy_struct_2 PNGARG((png_voidp struct_ptr,</div><div class='del'>-   png_free_ptr free_fn, png_voidp mem_ptr));</div><div class='add'>+    png_free_ptr free_fn, png_voidp mem_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Free any memory that info_ptr points to and reset struct. */</div><div class='ctx'> PNG_EXTERN void png_info_destroy PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr));</div><div class='add'>+    png_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Function to allocate memory for zlib.  PNGAPI is disallowed. */</div><div class='del'>-PNG_EXTERN voidpf png_zalloc PNGARG((voidpf png_ptr, uInt items, uInt size));</div><div class='add'>+PNG_EXTERN PNG_FUNCTION(voidpf,png_zalloc,PNGARG((voidpf png_ptr, uInt items,</div><div class='add'>+   uInt size)),PNG_ALLOCATED);</div><div class='ctx'> </div><div class='ctx'> /* Function to free memory for zlib.  PNGAPI is disallowed. */</div><div class='ctx'> PNG_EXTERN void png_zfree PNGARG((voidpf png_ptr, voidpf ptr));</div><div class='ctx'> </div><div class='del'>-/* Next four functions are used internally as callbacks.  PNGAPI is required</div><div class='del'>- * but not PNG_EXPORT.  PNGAPI added at libpng version 1.2.3. */</div><div class='add'>+/* Next four functions are used internally as callbacks.  PNGCBAPI is required</div><div class='add'>+ * but not PNG_EXPORT.  PNGAPI added at libpng version 1.2.3, changed to</div><div class='add'>+ * PNGCBAPI at 1.5.0</div><div class='add'>+ */</div><div class='ctx'> </div><div class='del'>-PNG_EXTERN void PNGAPI png_default_read_data PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytep data, png_size_t length));</div><div class='add'>+PNG_EXTERN void PNGCBAPI png_default_read_data PNGARG((png_structp png_ptr,</div><div class='add'>+    png_bytep data, png_size_t length));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_PROGRESSIVE_READ_SUPPORTED</div><div class='del'>-PNG_EXTERN void PNGAPI png_push_fill_buffer PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytep buffer, png_size_t length));</div><div class='add'>+PNG_EXTERN void PNGCBAPI png_push_fill_buffer PNGARG((png_structp png_ptr,</div><div class='add'>+    png_bytep buffer, png_size_t length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-PNG_EXTERN void PNGAPI png_default_write_data PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytep data, png_size_t length));</div><div class='add'>+PNG_EXTERN void PNGCBAPI png_default_write_data PNGARG((png_structp png_ptr,</div><div class='add'>+    png_bytep data, png_size_t length));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_FLUSH_SUPPORTED</div><div class='del'>-#ifdef PNG_STDIO_SUPPORTED</div><div class='del'>-PNG_EXTERN void PNGAPI png_default_flush PNGARG((png_structp png_ptr));</div><div class='del'>-#endif</div><div class='add'>+#  ifdef PNG_STDIO_SUPPORTED</div><div class='add'>+PNG_EXTERN void PNGCBAPI png_default_flush PNGARG((png_structp png_ptr));</div><div class='add'>+#  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Reset the CRC variable */</div><div class='ctx'> PNG_EXTERN void png_reset_crc PNGARG((png_structp png_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Write the "data" buffer to whatever output you are using */</div><div class='del'>-PNG_EXTERN void png_write_data PNGARG((png_structp png_ptr, png_bytep data,</div><div class='del'>-   png_size_t length));</div><div class='add'>+PNG_EXTERN void png_write_data PNGARG((png_structp png_ptr,</div><div class='add'>+    png_const_bytep data, png_size_t length));</div><div class='add'>+</div><div class='add'>+/* Read and check the PNG file signature */</div><div class='add'>+PNG_EXTERN void png_read_sig PNGARG((png_structp png_ptr, png_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Read the chunk header (length + type name) */</div><div class='ctx'> PNG_EXTERN png_uint_32 png_read_chunk_header PNGARG((png_structp png_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Read data from whatever input you are using into the "data" buffer */</div><div class='ctx'> PNG_EXTERN void png_read_data PNGARG((png_structp png_ptr, png_bytep data,</div><div class='del'>-   png_size_t length));</div><div class='add'>+    png_size_t length));</div><div class='ctx'> </div><div class='ctx'> /* Read bytes into buf, and update png_ptr-&gt;crc */</div><div class='ctx'> PNG_EXTERN void png_crc_read PNGARG((png_structp png_ptr, png_bytep buf,</div><div class='del'>-   png_size_t length));</div><div class='add'>+    png_size_t length));</div><div class='ctx'> </div><div class='ctx'> /* Decompress data in a chunk that uses compression */</div><div class='ctx'> #if defined(PNG_zTXt_SUPPORTED) || defined(PNG_iTXt_SUPPORTED) || \</div><div class='ctx'>     defined(PNG_iCCP_SUPPORTED) || defined(PNG_sPLT_SUPPORTED)</div><div class='ctx'> PNG_EXTERN void png_decompress_chunk PNGARG((png_structp png_ptr,</div><div class='del'>-   int comp_type, png_size_t chunklength, png_size_t prefix_length,</div><div class='del'>-   png_size_t *data_length));</div><div class='add'>+    int comp_type, png_size_t chunklength, png_size_t prefix_length,</div><div class='add'>+    png_size_t *data_length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Read "skip" bytes, read the file crc, and (optionally) verify png_ptr-&gt;crc */</div><div class='hunk'>@@ -323,8 +561,8 @@ PNG_EXTERN int png_crc_error PNGARG((png_structp png_ptr));</div><div class='ctx'>  * passing a maximum of 64K on systems that have this as a memory limit,</div><div class='ctx'>  * since this is the maximum buffer size we can specify.</div><div class='ctx'>  */</div><div class='del'>-PNG_EXTERN void png_calculate_crc PNGARG((png_structp png_ptr, png_bytep ptr,</div><div class='del'>-   png_size_t length));</div><div class='add'>+PNG_EXTERN void png_calculate_crc PNGARG((png_structp png_ptr,</div><div class='add'>+    png_const_bytep ptr, png_size_t length));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_FLUSH_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_flush PNGARG((png_structp png_ptr));</div><div class='hunk'>@@ -336,138 +574,132 @@ PNG_EXTERN void png_flush PNGARG((png_structp png_ptr));</div><div class='ctx'>  * information.</div><div class='ctx'>  */</div><div class='ctx'> PNG_EXTERN void png_write_IHDR PNGARG((png_structp png_ptr, png_uint_32 width,</div><div class='del'>-   png_uint_32 height,</div><div class='del'>-   int bit_depth, int color_type, int compression_method, int filter_method,</div><div class='del'>-   int interlace_method));</div><div class='add'>+    png_uint_32 height,</div><div class='add'>+    int bit_depth, int color_type, int compression_method, int filter_method,</div><div class='add'>+    int interlace_method));</div><div class='ctx'> </div><div class='del'>-PNG_EXTERN void png_write_PLTE PNGARG((png_structp png_ptr, png_colorp palette,</div><div class='del'>-   png_uint_32 num_pal));</div><div class='add'>+PNG_EXTERN void png_write_PLTE PNGARG((png_structp png_ptr,</div><div class='add'>+    png_const_colorp palette, png_uint_32 num_pal));</div><div class='ctx'> </div><div class='ctx'> PNG_EXTERN void png_write_IDAT PNGARG((png_structp png_ptr, png_bytep data,</div><div class='del'>-   png_size_t length));</div><div class='add'>+    png_size_t length));</div><div class='ctx'> </div><div class='ctx'> PNG_EXTERN void png_write_IEND PNGARG((png_structp png_ptr));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_gAMA_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_write_gAMA PNGARG((png_structp png_ptr, double file_gamma));</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-PNG_EXTERN void png_write_gAMA_fixed PNGARG((png_structp png_ptr, png_fixed_point</div><div class='del'>-    file_gamma));</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='add'>+#  ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+PNG_EXTERN void png_write_gAMA_fixed PNGARG((png_structp png_ptr,</div><div class='add'>+    png_fixed_point file_gamma));</div><div class='add'>+#  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_sBIT_SUPPORTED</div><div class='del'>-PNG_EXTERN void png_write_sBIT PNGARG((png_structp png_ptr, png_color_8p sbit,</div><div class='del'>-   int color_type));</div><div class='add'>+PNG_EXTERN void png_write_sBIT PNGARG((png_structp png_ptr,</div><div class='add'>+    png_const_color_8p sbit, int color_type));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_cHRM_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_write_cHRM PNGARG((png_structp png_ptr,</div><div class='del'>-   double white_x, double white_y,</div><div class='del'>-   double red_x, double red_y, double green_x, double green_y,</div><div class='del'>-   double blue_x, double blue_y));</div><div class='del'>-#endif</div><div class='add'>+    double white_x, double white_y,</div><div class='add'>+    double red_x, double red_y, double green_x, double green_y,</div><div class='add'>+    double blue_x, double blue_y));</div><div class='add'>+#  endif</div><div class='ctx'> PNG_EXTERN void png_write_cHRM_fixed PNGARG((png_structp png_ptr,</div><div class='del'>-   png_fixed_point int_white_x, png_fixed_point int_white_y,</div><div class='del'>-   png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point</div><div class='del'>-   int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,</div><div class='del'>-   png_fixed_point int_blue_y));</div><div class='add'>+    png_fixed_point int_white_x, png_fixed_point int_white_y,</div><div class='add'>+    png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point</div><div class='add'>+    int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,</div><div class='add'>+    png_fixed_point int_blue_y));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_sRGB_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_write_sRGB PNGARG((png_structp png_ptr,</div><div class='del'>-   int intent));</div><div class='add'>+    int intent));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_iCCP_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_write_iCCP PNGARG((png_structp png_ptr,</div><div class='del'>-   png_charp name, int compression_type,</div><div class='del'>-   png_charp profile, int proflen));</div><div class='add'>+    png_const_charp name, int compression_type,</div><div class='add'>+    png_const_charp profile, int proflen));</div><div class='ctx'>    /* Note to maintainer: profile should be png_bytep */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_sPLT_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_write_sPLT PNGARG((png_structp png_ptr,</div><div class='del'>-   png_sPLT_tp palette));</div><div class='add'>+    png_const_sPLT_tp palette));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_tRNS_SUPPORTED</div><div class='del'>-PNG_EXTERN void png_write_tRNS PNGARG((png_structp png_ptr, png_bytep trans,</div><div class='del'>-   png_color_16p values, int number, int color_type));</div><div class='add'>+PNG_EXTERN void png_write_tRNS PNGARG((png_structp png_ptr,</div><div class='add'>+    png_const_bytep trans, png_const_color_16p values, int number,</div><div class='add'>+    int color_type));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_bKGD_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_write_bKGD PNGARG((png_structp png_ptr,</div><div class='del'>-   png_color_16p values, int color_type));</div><div class='add'>+    png_const_color_16p values, int color_type));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_hIST_SUPPORTED</div><div class='del'>-PNG_EXTERN void png_write_hIST PNGARG((png_structp png_ptr, png_uint_16p hist,</div><div class='del'>-   int num_hist));</div><div class='add'>+PNG_EXTERN void png_write_hIST PNGARG((png_structp png_ptr,</div><div class='add'>+    png_const_uint_16p hist, int num_hist));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \</div><div class='ctx'>     defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)</div><div class='ctx'> PNG_EXTERN png_size_t png_check_keyword PNGARG((png_structp png_ptr,</div><div class='del'>-   png_charp key, png_charpp new_key));</div><div class='add'>+    png_const_charp key, png_charpp new_key));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_tEXt_SUPPORTED</div><div class='del'>-PNG_EXTERN void png_write_tEXt PNGARG((png_structp png_ptr, png_charp key,</div><div class='del'>-   png_charp text, png_size_t text_len));</div><div class='add'>+PNG_EXTERN void png_write_tEXt PNGARG((png_structp png_ptr, png_const_charp key,</div><div class='add'>+    png_const_charp text, png_size_t text_len));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_zTXt_SUPPORTED</div><div class='del'>-PNG_EXTERN void png_write_zTXt PNGARG((png_structp png_ptr, png_charp key,</div><div class='del'>-   png_charp text, png_size_t text_len, int compression));</div><div class='add'>+PNG_EXTERN void png_write_zTXt PNGARG((png_structp png_ptr, png_const_charp key,</div><div class='add'>+    png_const_charp text, png_size_t text_len, int compression));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_iTXt_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_write_iTXt PNGARG((png_structp png_ptr,</div><div class='del'>-   int compression, png_charp key, png_charp lang, png_charp lang_key,</div><div class='del'>-   png_charp text));</div><div class='add'>+    int compression, png_const_charp key, png_const_charp lang,</div><div class='add'>+    png_const_charp lang_key, png_const_charp text));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_TEXT_SUPPORTED  /* Added at version 1.0.14 and 1.2.4 */</div><div class='ctx'> PNG_EXTERN int png_set_text_2 PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_textp text_ptr, int num_text));</div><div class='add'>+    png_infop info_ptr, png_const_textp text_ptr, int num_text));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_oFFs_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_write_oFFs PNGARG((png_structp png_ptr,</div><div class='del'>-   png_int_32 x_offset, png_int_32 y_offset, int unit_type));</div><div class='add'>+    png_int_32 x_offset, png_int_32 y_offset, int unit_type));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_pCAL_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_write_pCAL PNGARG((png_structp png_ptr, png_charp purpose,</div><div class='del'>-   png_int_32 X0, png_int_32 X1, int type, int nparams,</div><div class='del'>-   png_charp units, png_charpp params));</div><div class='add'>+    png_int_32 X0, png_int_32 X1, int type, int nparams,</div><div class='add'>+    png_const_charp units, png_charpp params));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_pHYs_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_write_pHYs PNGARG((png_structp png_ptr,</div><div class='del'>-   png_uint_32 x_pixels_per_unit, png_uint_32 y_pixels_per_unit,</div><div class='del'>-   int unit_type));</div><div class='add'>+    png_uint_32 x_pixels_per_unit, png_uint_32 y_pixels_per_unit,</div><div class='add'>+    int unit_type));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_tIME_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_write_tIME PNGARG((png_structp png_ptr,</div><div class='del'>-   png_timep mod_time));</div><div class='add'>+    png_const_timep mod_time));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_sCAL_SUPPORTED</div><div class='del'>-#if defined(PNG_FLOATING_POINT_SUPPORTED) &amp;&amp; defined(PNG_STDIO_SUPPORTED)</div><div class='del'>-PNG_EXTERN void png_write_sCAL PNGARG((png_structp png_ptr,</div><div class='del'>-   int unit, double width, double height));</div><div class='del'>-#else</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_write_sCAL_s PNGARG((png_structp png_ptr,</div><div class='del'>-   int unit, png_charp width, png_charp height));</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='add'>+    int unit, png_const_charp width, png_const_charp height));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Called when finished processing a row of data */</div><div class='hunk'>@@ -476,20 +708,15 @@ PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr));</div><div class='ctx'> /* Internal use only.   Called before first row of data */</div><div class='ctx'> PNG_EXTERN void png_write_start_row PNGARG((png_structp png_ptr));</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='del'>-PNG_EXTERN void png_build_gamma_table PNGARG((png_structp png_ptr,</div><div class='del'>-   png_byte bit_depth));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* Combine a row of data, dealing with alpha, etc. if requested */</div><div class='ctx'> PNG_EXTERN void png_combine_row PNGARG((png_structp png_ptr, png_bytep row,</div><div class='del'>-   int mask));</div><div class='add'>+    int mask));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_INTERLACING_SUPPORTED</div><div class='ctx'> /* Expand an interlaced row */</div><div class='ctx'> /* OLD pre-1.0.9 interface:</div><div class='ctx'> PNG_EXTERN void png_do_read_interlace PNGARG((png_row_infop row_info,</div><div class='del'>-   png_bytep row, int pass, png_uint_32 transformations));</div><div class='add'>+    png_bytep row, int pass, png_uint_32 transformations));</div><div class='ctx'>  */</div><div class='ctx'> PNG_EXTERN void png_do_read_interlace PNGARG((png_structp png_ptr));</div><div class='ctx'> #endif</div><div class='hunk'>@@ -499,20 +726,21 @@ PNG_EXTERN void png_do_read_interlace PNGARG((png_structp png_ptr));</div><div class='ctx'> #ifdef PNG_WRITE_INTERLACING_SUPPORTED</div><div class='ctx'> /* Grab pixels out of a row for an interlaced pass */</div><div class='ctx'> PNG_EXTERN void png_do_write_interlace PNGARG((png_row_infop row_info,</div><div class='del'>-   png_bytep row, int pass));</div><div class='add'>+    png_bytep row, int pass));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Unfilter a row */</div><div class='ctx'> PNG_EXTERN void png_read_filter_row PNGARG((png_structp png_ptr,</div><div class='del'>-   png_row_infop row_info, png_bytep row, png_bytep prev_row, int filter));</div><div class='add'>+    png_row_infop row_info, png_bytep row, png_const_bytep prev_row,</div><div class='add'>+    int filter));</div><div class='ctx'> </div><div class='ctx'> /* Choose the best filter to use and filter the row data */</div><div class='ctx'> PNG_EXTERN void png_write_find_filter PNGARG((png_structp png_ptr,</div><div class='del'>-   png_row_infop row_info));</div><div class='add'>+    png_row_infop row_info));</div><div class='ctx'> </div><div class='ctx'> /* Write out the filtered row. */</div><div class='ctx'> PNG_EXTERN void png_write_filtered_row PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytep filtered_row));</div><div class='add'>+    png_bytep filtered_row));</div><div class='ctx'> /* Finish a row while reading, dealing with interlacing passes, etc. */</div><div class='ctx'> PNG_EXTERN void png_read_finish_row PNGARG((png_structp png_ptr));</div><div class='ctx'> </div><div class='hunk'>@@ -520,87 +748,97 @@ PNG_EXTERN void png_read_finish_row PNGARG((png_structp png_ptr));</div><div class='ctx'> PNG_EXTERN void png_read_start_row PNGARG((png_structp png_ptr));</div><div class='ctx'> /* Optional call to update the users info structure */</div><div class='ctx'> PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr));</div><div class='add'>+    png_infop info_ptr));</div><div class='ctx'> </div><div class='ctx'> /* These are the functions that do the transformations */</div><div class='ctx'> #ifdef PNG_READ_FILLER_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info,</div><div class='del'>-   png_bytep row, png_uint_32 filler, png_uint_32 flags));</div><div class='add'>+    png_bytep row, png_uint_32 filler, png_uint_32 flags));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_SWAP_ALPHA_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_do_read_swap_alpha PNGARG((png_row_infop row_info,</div><div class='del'>-   png_bytep row));</div><div class='add'>+    png_bytep row));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_do_write_swap_alpha PNGARG((png_row_infop row_info,</div><div class='del'>-   png_bytep row));</div><div class='add'>+    png_bytep row));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_do_read_invert_alpha PNGARG((png_row_infop row_info,</div><div class='del'>-   png_bytep row));</div><div class='add'>+    png_bytep row));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_do_write_invert_alpha PNGARG((png_row_infop row_info,</div><div class='del'>-   png_bytep row));</div><div class='add'>+    png_bytep row));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_WRITE_FILLER_SUPPORTED) || \</div><div class='ctx'>     defined(PNG_READ_STRIP_ALPHA_SUPPORTED)</div><div class='ctx'> PNG_EXTERN void png_do_strip_filler PNGARG((png_row_infop row_info,</div><div class='del'>-   png_bytep row, png_uint_32 flags));</div><div class='add'>+    png_bytep row, png_uint_32 flags));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_16BIT_SUPPORTED</div><div class='ctx'> #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)</div><div class='del'>-PNG_EXTERN void png_do_swap PNGARG((png_row_infop row_info, png_bytep row));</div><div class='add'>+PNG_EXTERN void png_do_swap PNGARG((png_row_infop row_info,</div><div class='add'>+    png_bytep row));</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(PNG_READ_PACKSWAP_SUPPORTED) || defined(PNG_WRITE_PACKSWAP_SUPPORTED)</div><div class='del'>-PNG_EXTERN void png_do_packswap PNGARG((png_row_infop row_info, png_bytep row));</div><div class='add'>+#if defined(PNG_READ_PACKSWAP_SUPPORTED) || \</div><div class='add'>+    defined(PNG_WRITE_PACKSWAP_SUPPORTED)</div><div class='add'>+PNG_EXTERN void png_do_packswap PNGARG((png_row_infop row_info,</div><div class='add'>+    png_bytep row));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED</div><div class='del'>-PNG_EXTERN int png_do_rgb_to_gray PNGARG((png_structp png_ptr, png_row_infop</div><div class='del'>-   row_info, png_bytep row));</div><div class='add'>+PNG_EXTERN int png_do_rgb_to_gray PNGARG((png_structp png_ptr,</div><div class='add'>+    png_row_infop row_info, png_bytep row));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_do_gray_to_rgb PNGARG((png_row_infop row_info,</div><div class='del'>-   png_bytep row));</div><div class='add'>+    png_bytep row));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_PACK_SUPPORTED</div><div class='del'>-PNG_EXTERN void png_do_unpack PNGARG((png_row_infop row_info, png_bytep row));</div><div class='add'>+PNG_EXTERN void png_do_unpack PNGARG((png_row_infop row_info,</div><div class='add'>+    png_bytep row));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_SHIFT_SUPPORTED</div><div class='del'>-PNG_EXTERN void png_do_unshift PNGARG((png_row_infop row_info, png_bytep row,</div><div class='del'>-   png_color_8p sig_bits));</div><div class='add'>+PNG_EXTERN void png_do_unshift PNGARG((png_row_infop row_info,</div><div class='add'>+    png_bytep row, png_const_color_8p sig_bits));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)</div><div class='del'>-PNG_EXTERN void png_do_invert PNGARG((png_row_infop row_info, png_bytep row));</div><div class='add'>+PNG_EXTERN void png_do_invert PNGARG((png_row_infop row_info,</div><div class='add'>+    png_bytep row));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_16_TO_8_SUPPORTED</div><div class='del'>-PNG_EXTERN void png_do_chop PNGARG((png_row_infop row_info, png_bytep row));</div><div class='add'>+PNG_EXTERN void png_do_chop PNGARG((png_row_infop row_info,</div><div class='add'>+    png_bytep row));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_READ_DITHER_SUPPORTED</div><div class='del'>-PNG_EXTERN void png_do_dither PNGARG((png_row_infop row_info,</div><div class='del'>-   png_bytep row, png_bytep palette_lookup, png_bytep dither_lookup));</div><div class='add'>+#ifdef PNG_READ_QUANTIZE_SUPPORTED</div><div class='add'>+PNG_EXTERN void png_do_quantize PNGARG((png_row_infop row_info,</div><div class='add'>+    png_bytep row, png_const_bytep palette_lookup,</div><div class='add'>+    png_const_bytep quantize_lookup));</div><div class='ctx'> </div><div class='ctx'> #  ifdef PNG_CORRECT_PALETTE_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_correct_palette PNGARG((png_structp png_ptr,</div><div class='del'>-   png_colorp palette, int num_palette));</div><div class='add'>+    png_colorp palette, int num_palette));</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)</div><div class='del'>-PNG_EXTERN void png_do_bgr PNGARG((png_row_infop row_info, png_bytep row));</div><div class='add'>+PNG_EXTERN void png_do_bgr PNGARG((png_row_infop row_info,</div><div class='add'>+    png_bytep row));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_PACK_SUPPORTED</div><div class='hunk'>@@ -609,35 +847,38 @@ PNG_EXTERN void png_do_pack PNGARG((png_row_infop row_info,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_SHIFT_SUPPORTED</div><div class='del'>-PNG_EXTERN void png_do_shift PNGARG((png_row_infop row_info, png_bytep row,</div><div class='del'>-   png_color_8p bit_depth));</div><div class='add'>+PNG_EXTERN void png_do_shift PNGARG((png_row_infop row_info,</div><div class='add'>+    png_bytep row, png_const_color_8p bit_depth));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_BACKGROUND_SUPPORTED</div><div class='del'>-#ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='del'>-PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info, png_bytep row,</div><div class='del'>-   png_color_16p trans_color, png_color_16p background,</div><div class='del'>-   png_color_16p background_1,</div><div class='del'>-   png_bytep gamma_table, png_bytep gamma_from_1, png_bytep gamma_to_1,</div><div class='del'>-   png_uint_16pp gamma_16, png_uint_16pp gamma_16_from_1,</div><div class='del'>-   png_uint_16pp gamma_16_to_1, int gamma_shift));</div><div class='del'>-#else</div><div class='del'>-PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info, png_bytep row,</div><div class='del'>-   png_color_16p trans_color, png_color_16p background));</div><div class='del'>-#endif</div><div class='add'>+#  ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='add'>+PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info,</div><div class='add'>+    png_bytep row, png_const_color_16p trans_color,</div><div class='add'>+    png_const_color_16p background, png_const_color_16p background_1,</div><div class='add'>+    png_const_bytep gamma_table, png_const_bytep gamma_from_1,</div><div class='add'>+    png_const_bytep gamma_to_1, png_const_uint_16pp gamma_16,</div><div class='add'>+    png_const_uint_16pp gamma_16_from_1, png_const_uint_16pp gamma_16_to_1,</div><div class='add'>+    int gamma_shift));</div><div class='add'>+#  else</div><div class='add'>+PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info,</div><div class='add'>+    png_bytep row, png_const_color_16p trans_color,</div><div class='add'>+    png_const_color_16p background));</div><div class='add'>+#  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='del'>-PNG_EXTERN void png_do_gamma PNGARG((png_row_infop row_info, png_bytep row,</div><div class='del'>-   png_bytep gamma_table, png_uint_16pp gamma_16_table,</div><div class='del'>-   int gamma_shift));</div><div class='add'>+PNG_EXTERN void png_do_gamma PNGARG((png_row_infop row_info,</div><div class='add'>+    png_bytep row, png_const_bytep gamma_table,</div><div class='add'>+    png_const_uint_16pp gamma_16_table, int gamma_shift));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_EXPAND_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_do_expand_palette PNGARG((png_row_infop row_info,</div><div class='del'>-   png_bytep row, png_colorp palette, png_bytep trans, int num_trans));</div><div class='add'>+    png_bytep row, png_const_colorp palette, png_const_bytep trans,</div><div class='add'>+    int num_trans));</div><div class='ctx'> PNG_EXTERN void png_do_expand PNGARG((png_row_infop row_info,</div><div class='del'>-   png_bytep row, png_color_16p trans_value));</div><div class='add'>+    png_bytep row, png_const_color_16p trans_color));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* The following decodes the appropriate chunks, and does error correction,</div><div class='hunk'>@@ -646,102 +887,102 @@ PNG_EXTERN void png_do_expand PNGARG((png_row_infop row_info,</div><div class='ctx'> </div><div class='ctx'> /* Decode the IHDR chunk */</div><div class='ctx'> PNG_EXTERN void png_handle_IHDR PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> PNG_EXTERN void png_handle_PLTE PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> PNG_EXTERN void png_handle_IEND PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_bKGD_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_handle_bKGD PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_cHRM_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_handle_cHRM PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_gAMA_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_handle_gAMA PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_hIST_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_handle_hIST PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_iCCP_SUPPORTED</div><div class='del'>-extern void png_handle_iCCP PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+PNG_EXTERN void png_handle_iCCP PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif /* PNG_READ_iCCP_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_iTXt_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_handle_iTXt PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_oFFs_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_handle_oFFs PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_pCAL_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_handle_pCAL PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_pHYs_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_handle_pHYs PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_sBIT_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_handle_sBIT PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_sCAL_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_handle_sCAL PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_sPLT_SUPPORTED</div><div class='del'>-extern void png_handle_sPLT PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+PNG_EXTERN void png_handle_sPLT PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif /* PNG_READ_sPLT_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_sRGB_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_handle_sRGB PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_tEXt_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_handle_tEXt PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_tIME_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_handle_tIME PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_tRNS_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_handle_tRNS PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_zTXt_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_handle_zTXt PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_uint_32 length));</div><div class='add'>+    png_infop info_ptr, png_uint_32 length));</div><div class='ctx'> </div><div class='ctx'> PNG_EXTERN void png_check_chunk_name PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytep chunk_name));</div><div class='add'>+    png_const_bytep chunk_name));</div><div class='ctx'> </div><div class='ctx'> /* Handle the transformations for reading and writing */</div><div class='ctx'> PNG_EXTERN void png_do_read_transformations PNGARG((png_structp png_ptr));</div><div class='hunk'>@@ -751,19 +992,19 @@ PNG_EXTERN void png_init_read_transformations PNGARG((png_structp png_ptr));</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_PROGRESSIVE_READ_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_push_read_chunk PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr));</div><div class='add'>+    png_infop info_ptr));</div><div class='ctx'> PNG_EXTERN void png_push_read_sig PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr));</div><div class='add'>+    png_infop info_ptr));</div><div class='ctx'> PNG_EXTERN void png_push_check_crc PNGARG((png_structp png_ptr));</div><div class='ctx'> PNG_EXTERN void png_push_crc_skip PNGARG((png_structp png_ptr,</div><div class='del'>-   png_uint_32 length));</div><div class='add'>+    png_uint_32 length));</div><div class='ctx'> PNG_EXTERN void png_push_crc_finish PNGARG((png_structp png_ptr));</div><div class='ctx'> PNG_EXTERN void png_push_save_buffer PNGARG((png_structp png_ptr));</div><div class='ctx'> PNG_EXTERN void png_push_restore_buffer PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytep buffer, png_size_t buffer_length));</div><div class='add'>+    png_bytep buffer, png_size_t buffer_length));</div><div class='ctx'> PNG_EXTERN void png_push_read_IDAT PNGARG((png_structp png_ptr));</div><div class='ctx'> PNG_EXTERN void png_process_IDAT_data PNGARG((png_structp png_ptr,</div><div class='del'>-   png_bytep buffer, png_size_t buffer_length));</div><div class='add'>+    png_bytep buffer, png_size_t buffer_length));</div><div class='ctx'> PNG_EXTERN void png_push_process_row PNGARG((png_structp png_ptr));</div><div class='ctx'> PNG_EXTERN void png_push_handle_unknown PNGARG((png_structp png_ptr,</div><div class='ctx'>    png_infop info_ptr, png_uint_32 length));</div><div class='hunk'>@@ -773,185 +1014,232 @@ PNG_EXTERN void png_push_have_end PNGARG((png_structp png_ptr,</div><div class='ctx'>    png_infop info_ptr));</div><div class='ctx'> PNG_EXTERN void png_push_have_row PNGARG((png_structp png_ptr, png_bytep row));</div><div class='ctx'> PNG_EXTERN void png_push_read_end PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr));</div><div class='add'>+    png_infop info_ptr));</div><div class='ctx'> PNG_EXTERN void png_process_some_data PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr));</div><div class='add'>+    png_infop info_ptr));</div><div class='ctx'> PNG_EXTERN void png_read_push_finish_row PNGARG((png_structp png_ptr));</div><div class='del'>-#ifdef PNG_READ_tEXt_SUPPORTED</div><div class='add'>+#  ifdef PNG_READ_tEXt_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_push_handle_tEXt PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_uint_32 length));</div><div class='add'>+    png_infop info_ptr, png_uint_32 length));</div><div class='ctx'> PNG_EXTERN void png_push_read_tEXt PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr));</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_READ_zTXt_SUPPORTED</div><div class='add'>+    png_infop info_ptr));</div><div class='add'>+#  endif</div><div class='add'>+#  ifdef PNG_READ_zTXt_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_push_handle_zTXt PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_uint_32 length));</div><div class='add'>+    png_infop info_ptr, png_uint_32 length));</div><div class='ctx'> PNG_EXTERN void png_push_read_zTXt PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr));</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_READ_iTXt_SUPPORTED</div><div class='add'>+    png_infop info_ptr));</div><div class='add'>+#  endif</div><div class='add'>+#  ifdef PNG_READ_iTXt_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_push_handle_iTXt PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_uint_32 length));</div><div class='add'>+    png_infop info_ptr, png_uint_32 length));</div><div class='ctx'> PNG_EXTERN void png_push_read_iTXt PNGARG((png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr));</div><div class='del'>-#endif</div><div class='add'>+    png_infop info_ptr));</div><div class='add'>+#  endif</div><div class='ctx'> </div><div class='ctx'> #endif /* PNG_PROGRESSIVE_READ_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_MNG_FEATURES_SUPPORTED</div><div class='ctx'> PNG_EXTERN void png_do_read_intrapixel PNGARG((png_row_infop row_info,</div><div class='del'>-   png_bytep row));</div><div class='add'>+    png_bytep row));</div><div class='ctx'> PNG_EXTERN void png_do_write_intrapixel PNGARG((png_row_infop row_info,</div><div class='del'>-   png_bytep row));</div><div class='add'>+    png_bytep row));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Added at libpng version 1.4.0 */</div><div class='del'>-#ifdef PNG_cHRM_SUPPORTED</div><div class='add'>+#ifdef PNG_CHECK_cHRM_SUPPORTED</div><div class='ctx'> PNG_EXTERN int png_check_cHRM_fixed PNGARG((png_structp png_ptr,</div><div class='del'>-   png_fixed_point int_white_x, png_fixed_point int_white_y,</div><div class='del'>-   png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point</div><div class='del'>-   int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,</div><div class='del'>-   png_fixed_point int_blue_y));</div><div class='add'>+    png_fixed_point int_white_x, png_fixed_point int_white_y,</div><div class='add'>+    png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point</div><div class='add'>+    int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,</div><div class='add'>+    png_fixed_point int_blue_y));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_cHRM_SUPPORTED</div><div class='ctx'> #ifdef PNG_CHECK_cHRM_SUPPORTED</div><div class='ctx'> /* Added at libpng version 1.2.34 and 1.4.0 */</div><div class='add'>+/* Currently only used by png_check_cHRM_fixed */</div><div class='ctx'> PNG_EXTERN void png_64bit_product PNGARG((long v1, long v2,</div><div class='del'>-   unsigned long *hi_product, unsigned long *lo_product));</div><div class='del'>-#endif</div><div class='add'>+    unsigned long *hi_product, unsigned long *lo_product));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Added at libpng version 1.4.0 */</div><div class='ctx'> PNG_EXTERN void png_check_IHDR PNGARG((png_structp png_ptr,</div><div class='del'>-   png_uint_32 width, png_uint_32 height, int bit_depth,</div><div class='del'>-   int color_type, int interlace_type, int compression_type,</div><div class='del'>-   int filter_type));</div><div class='add'>+    png_uint_32 width, png_uint_32 height, int bit_depth,</div><div class='add'>+    int color_type, int interlace_type, int compression_type,</div><div class='add'>+    int filter_type));</div><div class='ctx'> </div><div class='ctx'> /* Free all memory used by the read (old method - NOT DLL EXPORTED) */</div><div class='del'>-extern void png_read_destroy PNGARG((png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_infop end_info_ptr));</div><div class='add'>+PNG_EXTERN void png_read_destroy PNGARG((png_structp png_ptr,</div><div class='add'>+    png_infop info_ptr, png_infop end_info_ptr));</div><div class='ctx'> </div><div class='ctx'> /* Free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */</div><div class='del'>-extern void png_write_destroy PNGARG((png_structp png_ptr));</div><div class='add'>+PNG_EXTERN void png_write_destroy PNGARG((png_structp png_ptr));</div><div class='ctx'> </div><div class='ctx'> #ifdef USE_FAR_KEYWORD  /* memory model conversion function */</div><div class='del'>-extern void *png_far_to_near PNGARG((png_structp png_ptr,png_voidp ptr,</div><div class='del'>-   int check));</div><div class='add'>+PNG_EXTERN void *png_far_to_near PNGARG((png_structp png_ptr, png_voidp ptr,</div><div class='add'>+    int check));</div><div class='ctx'> #endif /* USE_FAR_KEYWORD */</div><div class='ctx'> </div><div class='del'>-/* Define PNG_DEBUG at compile time for debugging information.  Higher</div><div class='del'>- * numbers for PNG_DEBUG mean more debugging information.  This has</div><div class='del'>- * only been added since version 0.95 so it is not implemented throughout</div><div class='del'>- * libpng yet, but more support will be added as needed.</div><div class='del'>- */</div><div class='del'>-#ifdef PNG_DEBUG</div><div class='del'>-#if (PNG_DEBUG &gt; 0)</div><div class='del'>-#if !defined(PNG_DEBUG_FILE) &amp;&amp; defined(_MSC_VER)</div><div class='del'>-#include &lt;crtdbg.h&gt;</div><div class='del'>-#if (PNG_DEBUG &gt; 1)</div><div class='del'>-#ifndef _DEBUG</div><div class='del'>-#  define _DEBUG</div><div class='del'>-#endif</div><div class='del'>-#ifndef png_debug</div><div class='del'>-#define png_debug(l,m)  _RPT0(_CRT_WARN,m PNG_STRING_NEWLINE)</div><div class='del'>-#endif</div><div class='del'>-#ifndef png_debug1</div><div class='del'>-#define png_debug1(l,m,p1)  _RPT1(_CRT_WARN,m PNG_STRING_NEWLINE,p1)</div><div class='del'>-#endif</div><div class='del'>-#ifndef png_debug2</div><div class='del'>-#define png_debug2(l,m,p1,p2) _RPT2(_CRT_WARN,m PNG_STRING_NEWLINE,p1,p2)</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-#else /* PNG_DEBUG_FILE || !_MSC_VER */</div><div class='del'>-#ifndef PNG_DEBUG_FILE</div><div class='del'>-#define PNG_DEBUG_FILE stderr</div><div class='del'>-#endif /* PNG_DEBUG_FILE */</div><div class='del'>-</div><div class='del'>-#if (PNG_DEBUG &gt; 1)</div><div class='del'>-/* Note: ["%s"m PNG_STRING_NEWLINE] probably does not work on</div><div class='del'>- * non-ISO compilers</div><div class='del'>- */</div><div class='del'>-#  ifdef __STDC__</div><div class='del'>-#    ifndef png_debug</div><div class='del'>-#      define png_debug(l,m) \</div><div class='del'>-       { \</div><div class='del'>-       int num_tabs=l; \</div><div class='del'>-       fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \</div><div class='del'>-         (num_tabs==2 ? "\t\t":(num_tabs&gt;2 ? "\t\t\t":"")))); \</div><div class='del'>-       }</div><div class='del'>-#    endif</div><div class='del'>-#    ifndef png_debug1</div><div class='del'>-#      define png_debug1(l,m,p1) \</div><div class='del'>-       { \</div><div class='del'>-       int num_tabs=l; \</div><div class='del'>-       fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \</div><div class='del'>-         (num_tabs==2 ? "\t\t":(num_tabs&gt;2 ? "\t\t\t":""))),p1); \</div><div class='del'>-       }</div><div class='del'>-#    endif</div><div class='del'>-#    ifndef png_debug2</div><div class='del'>-#      define png_debug2(l,m,p1,p2) \</div><div class='del'>-       { \</div><div class='del'>-       int num_tabs=l; \</div><div class='del'>-       fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \</div><div class='del'>-         (num_tabs==2 ? "\t\t":(num_tabs&gt;2 ? "\t\t\t":""))),p1,p2); \</div><div class='del'>-       }</div><div class='del'>-#    endif</div><div class='del'>-#  else /* __STDC __ */</div><div class='del'>-#    ifndef png_debug</div><div class='del'>-#      define png_debug(l,m) \</div><div class='del'>-       { \</div><div class='del'>-       int num_tabs=l; \</div><div class='del'>-       char format[256]; \</div><div class='del'>-       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \</div><div class='del'>-         (num_tabs==2 ? "\t\t":(num_tabs&gt;2 ? "\t\t\t":""))), \</div><div class='del'>-         m,PNG_STRING_NEWLINE); \</div><div class='del'>-       fprintf(PNG_DEBUG_FILE,format); \</div><div class='del'>-       }</div><div class='del'>-#    endif</div><div class='del'>-#    ifndef png_debug1</div><div class='del'>-#      define png_debug1(l,m,p1) \</div><div class='del'>-       { \</div><div class='del'>-       int num_tabs=l; \</div><div class='del'>-       char format[256]; \</div><div class='del'>-       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \</div><div class='del'>-         (num_tabs==2 ? "\t\t":(num_tabs&gt;2 ? "\t\t\t":""))), \</div><div class='del'>-         m,PNG_STRING_NEWLINE); \</div><div class='del'>-       fprintf(PNG_DEBUG_FILE,format,p1); \</div><div class='del'>-       }</div><div class='del'>-#    endif</div><div class='del'>-#    ifndef png_debug2</div><div class='del'>-#      define png_debug2(l,m,p1,p2) \</div><div class='del'>-       { \</div><div class='del'>-       int num_tabs=l; \</div><div class='del'>-       char format[256]; \</div><div class='del'>-       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \</div><div class='del'>-         (num_tabs==2 ? "\t\t":(num_tabs&gt;2 ? "\t\t\t":""))), \</div><div class='del'>-         m,PNG_STRING_NEWLINE); \</div><div class='del'>-       fprintf(PNG_DEBUG_FILE,format,p1,p2); \</div><div class='del'>-       }</div><div class='del'>-#    endif</div><div class='del'>-#  endif /* __STDC __ */</div><div class='del'>-#endif /* (PNG_DEBUG &gt; 1) */</div><div class='add'>+#if defined(PNG_FLOATING_POINT_SUPPORTED) &amp;&amp; defined(PNG_ERROR_TEXT_SUPPORTED)</div><div class='add'>+PNG_EXTERN PNG_FUNCTION(void, png_fixed_error, (png_structp png_ptr,</div><div class='add'>+   png_const_charp name),PNG_NORETURN);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* ASCII to FP interfaces, currently only implemented if sCAL</div><div class='add'>+ * support is required.</div><div class='add'>+ */</div><div class='add'>+#if defined(PNG_READ_sCAL_SUPPORTED)</div><div class='add'>+/* MAX_DIGITS is actually the maximum number of characters in an sCAL</div><div class='add'>+ * width or height, derived from the precision (number of significant</div><div class='add'>+ * digits - a build time settable option) and assumpitions about the</div><div class='add'>+ * maximum ridiculous exponent.</div><div class='add'>+ */</div><div class='add'>+#define PNG_sCAL_MAX_DIGITS (PNG_sCAL_PRECISION+1/*.*/+1/*E*/+10/*exponent*/)</div><div class='add'>+</div><div class='add'>+#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+PNG_EXTERN void png_ascii_from_fp PNGARG((png_structp png_ptr, png_charp ascii,</div><div class='add'>+    png_size_t size, double fp, unsigned int precision));</div><div class='add'>+#endif /* FLOATING_POINT */</div><div class='add'>+</div><div class='add'>+#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+PNG_EXTERN void png_ascii_from_fixed PNGARG((png_structp png_ptr,</div><div class='add'>+    png_charp ascii, png_size_t size, png_fixed_point fp));</div><div class='add'>+#endif /* FIXED_POINT */</div><div class='add'>+#endif /* READ_sCAL */</div><div class='add'>+</div><div class='add'>+#if defined(PNG_sCAL_SUPPORTED) || defined(PNG_pCAL_SUPPORTED)</div><div class='add'>+/* An internal API to validate the format of a floating point number.</div><div class='add'>+ * The result is the index of the next character.  If the number is</div><div class='add'>+ * not valid it will be the index of a character in the supposed number.</div><div class='add'>+ *</div><div class='add'>+ * The format of a number is defined in the PNG extensions specification</div><div class='add'>+ * and this API is strictly conformant to that spec, not anyone elses!</div><div class='add'>+ *</div><div class='add'>+ * The format as a regular expression is:</div><div class='add'>+ *</div><div class='add'>+ * [+-]?[0-9]+.?([Ee][+-]?[0-9]+)?</div><div class='add'>+ *</div><div class='add'>+ * or:</div><div class='add'>+ *</div><div class='add'>+ * [+-]?.[0-9]+(.[0-9]+)?([Ee][+-]?[0-9]+)?</div><div class='add'>+ *</div><div class='add'>+ * The complexity is that either integer or fraction must be present and the</div><div class='add'>+ * fraction is permitted to have no digits only if the integer is present.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: The dangling E problem.</div><div class='add'>+ *   There is a PNG valid floating point number in the following:</div><div class='add'>+ *</div><div class='add'>+ *       PNG floating point numb1.ers are not greedy.</div><div class='add'>+ *</div><div class='add'>+ *   Working this out requires *TWO* character lookahead (because of the</div><div class='add'>+ *   sign), the parser does not do this - it will fail at the 'r' - this</div><div class='add'>+ *   doesn't matter for PNG sCAL chunk values, but it requires more care</div><div class='add'>+ *   if the value were ever to be embedded in something more complex.  Use</div><div class='add'>+ *   ANSI-C strtod if you need the lookahead.</div><div class='add'>+ */</div><div class='add'>+/* State table for the parser. */</div><div class='add'>+#define PNG_FP_INTEGER    0  /* before or in integer */</div><div class='add'>+#define PNG_FP_FRACTION   1  /* before or in fraction */</div><div class='add'>+#define PNG_FP_EXPONENT   2  /* before or in exponent */</div><div class='add'>+#define PNG_FP_STATE      3  /* mask for the above */</div><div class='add'>+#define PNG_FP_SAW_SIGN   4  /* Saw +/- in current state */</div><div class='add'>+#define PNG_FP_SAW_DIGIT  8  /* Saw a digit in current state */</div><div class='add'>+#define PNG_FP_SAW_DOT   16  /* Saw a dot in current state */</div><div class='add'>+#define PNG_FP_SAW_E     32  /* Saw an E (or e) in current state */</div><div class='add'>+#define PNG_FP_SAW_ANY   60  /* Saw any of the above 4 */</div><div class='add'>+#define PNG_FP_WAS_VALID 64  /* Preceding substring is a valid fp number */</div><div class='add'>+#define PNG_FP_INVALID  128  /* Available for callers as a distinct value */</div><div class='add'>+</div><div class='add'>+/* Result codes for the parser (boolean - true meants ok, false means</div><div class='add'>+ * not ok yet.)</div><div class='add'>+ */</div><div class='add'>+#define PNG_FP_MAYBE      0  /* The number may be valid in the future */</div><div class='add'>+#define PNG_FP_OK         1  /* The number is valid */</div><div class='add'>+</div><div class='add'>+/* The actual parser.  This can be called repeatedly, it updates</div><div class='add'>+ * the index into the string and the state variable (which must</div><div class='add'>+ * be initialzed to 0).  It returns a result code, as above.  There</div><div class='add'>+ * is no point calling the parser any more if it fails to advance to</div><div class='add'>+ * the end of the string - it is stuck on an invalid character (or</div><div class='add'>+ * terminated by '\0').</div><div class='add'>+ *</div><div class='add'>+ * Note that the pointer will consume an E or even an E+ then leave</div><div class='add'>+ * a 'maybe' state even though a preceding integer.fraction is valid.</div><div class='add'>+ * The PNG_FP_WAS_VALID flag indicates that a preceding substring was</div><div class='add'>+ * a valid number.  It's possible to recover from this by calling</div><div class='add'>+ * the parser again (from the start, with state 0) but with a string</div><div class='add'>+ * that omits the last character (i.e. set the size to the index of</div><div class='add'>+ * the problem character.)  This has not been tested within libpng.</div><div class='add'>+ */</div><div class='add'>+PNG_EXTERN int png_check_fp_number PNGARG((png_const_charp string,</div><div class='add'>+    png_size_t size, int *statep, png_size_tp whereami));</div><div class='add'>+</div><div class='add'>+/* This is the same but it checks a complete string and returns true</div><div class='add'>+ * only if it just contains a floating point number.</div><div class='add'>+ */</div><div class='add'>+PNG_EXTERN int png_check_fp_string PNGARG((png_const_charp string,</div><div class='add'>+    png_size_t size));</div><div class='add'>+#endif /* pCAL || sCAL */</div><div class='add'>+</div><div class='add'>+#if defined(PNG_READ_GAMMA_SUPPORTED) ||\</div><div class='add'>+    defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED)</div><div class='add'>+/* Added at libpng version 1.5.0 */</div><div class='add'>+/* This is a utility to provide a*times/div (rounded) and indicate</div><div class='add'>+ * if there is an overflow.  The result is a boolean - false (0)</div><div class='add'>+ * for overflow, true (1) if no overflow, in which case *res</div><div class='add'>+ * holds the result.</div><div class='add'>+ */</div><div class='add'>+PNG_EXTERN int png_muldiv PNGARG((png_fixed_point_p res, png_fixed_point a,</div><div class='add'>+    png_int_32 times, png_int_32 div));</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-#endif /* _MSC_VER */</div><div class='del'>-#endif /* (PNG_DEBUG &gt; 0) */</div><div class='del'>-#endif /* PNG_DEBUG */</div><div class='del'>-#ifndef png_debug</div><div class='del'>-#define png_debug(l, m)</div><div class='add'>+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)</div><div class='add'>+/* Same deal, but issue a warning on overflow and return 0. */</div><div class='add'>+PNG_EXTERN png_fixed_point png_muldiv_warn PNGARG((png_structp png_ptr,</div><div class='add'>+    png_fixed_point a, png_int_32 times, png_int_32 div));</div><div class='ctx'> #endif</div><div class='del'>-#ifndef png_debug1</div><div class='del'>-#define png_debug1(l, m, p1)</div><div class='add'>+</div><div class='add'>+#ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='add'>+/* Calculate a reciprocal - used for gamma values.  This returns</div><div class='add'>+ * 0 if the argument is 0 in order to maintain an undefined value,</div><div class='add'>+ * there are no warnings.</div><div class='add'>+ */</div><div class='add'>+PNG_EXTERN png_fixed_point png_reciprocal PNGARG((png_fixed_point a));</div><div class='add'>+</div><div class='add'>+/* The same but gives a reciprocal of the product of two fixed point</div><div class='add'>+ * values.  Accuracy is suitable for gamma calculations but this is</div><div class='add'>+ * not exact - use png_muldiv for that.</div><div class='add'>+ */</div><div class='add'>+PNG_EXTERN png_fixed_point png_reciprocal2 PNGARG((png_fixed_point a,</div><div class='add'>+    png_fixed_point b));</div><div class='ctx'> #endif</div><div class='del'>-#ifndef png_debug2</div><div class='del'>-#define png_debug2(l, m, p1, p2)</div><div class='add'>+</div><div class='add'>+#ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='add'>+/* Internal fixed point gamma correction.  These APIs are called as</div><div class='add'>+ * required to convert single values - they don't need to be fast,</div><div class='add'>+ * they are not used when processing image pixel values.</div><div class='add'>+ *</div><div class='add'>+ * While the input is an 'unsigned' value it must actually be the</div><div class='add'>+ * correct bit value - 0..255 or 0..65535 as required.</div><div class='add'>+ */</div><div class='add'>+PNG_EXTERN png_uint_16 png_gamma_correct PNGARG((png_structp png_ptr,</div><div class='add'>+    unsigned int value, png_fixed_point gamma));</div><div class='add'>+PNG_EXTERN int png_gamma_significant PNGARG((png_fixed_point gamma));</div><div class='add'>+PNG_EXTERN png_uint_16 png_gamma_16bit_correct PNGARG((unsigned int value,</div><div class='add'>+    png_fixed_point gamma));</div><div class='add'>+PNG_EXTERN png_byte png_gamma_8bit_correct PNGARG((unsigned int value,</div><div class='add'>+    png_fixed_point gamma));</div><div class='add'>+PNG_EXTERN void png_build_gamma_table PNGARG((png_structp png_ptr,</div><div class='add'>+    int bit_depth));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+#include "pngdebug.h"</div><div class='add'>+</div><div class='ctx'> #ifdef __cplusplus</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#endif /* PNG_VERSION_INFO_ONLY */</div><div class='ctx'> #endif /* PNGPRIV_H */</div><div class='head'>diff --git a/src/3rdparty/libpng/pngread.c b/src/3rdparty/libpng/pngread.c<br/>index 1b3a3f5..2c8f2cd 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngread.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngread.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngread.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngread.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> </div><div class='ctx'> /* pngread.c - read a PNG file</div><div class='ctx'>  *</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Last changed in libpng 1.5.1 [$RDATE%]</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -14,28 +14,28 @@</div><div class='ctx'>  * read a PNG file or stream.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define PNG_NO_PEDANTIC_WARNINGS</div><div class='del'>-#include "png.h"</div><div class='del'>-#ifdef PNG_READ_SUPPORTED</div><div class='ctx'> #include "pngpriv.h"</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_READ_SUPPORTED</div><div class='ctx'> </div><div class='ctx'> /* Create a PNG structure for reading, and allocate any memory needed. */</div><div class='del'>-png_structp PNGAPI</div><div class='del'>-png_create_read_struct(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='del'>-   png_error_ptr error_fn, png_error_ptr warn_fn)</div><div class='add'>+PNG_FUNCTION(png_structp,PNGAPI</div><div class='add'>+png_create_read_struct,(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='add'>+    png_error_ptr error_fn, png_error_ptr warn_fn),PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>    return (png_create_read_struct_2(user_png_ver, error_ptr, error_fn,</div><div class='del'>-      warn_fn, NULL, NULL, NULL));</div><div class='add'>+       warn_fn, NULL, NULL, NULL));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Alternate create PNG structure for reading, and allocate any memory needed. */</div><div class='del'>-png_structp PNGAPI</div><div class='del'>-png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='del'>-   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,</div><div class='del'>-   png_malloc_ptr malloc_fn, png_free_ptr free_fn)</div><div class='add'>+/* Alternate create PNG structure for reading, and allocate any memory</div><div class='add'>+ * needed.</div><div class='add'>+ */</div><div class='add'>+PNG_FUNCTION(png_structp,PNGAPI</div><div class='add'>+png_create_read_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='add'>+    png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,</div><div class='add'>+    png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='ctx'> #endif /* PNG_USER_MEM_SUPPORTED */</div><div class='ctx'> </div><div class='hunk'>@@ -47,7 +47,7 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_SETJMP_SUPPORTED</div><div class='ctx'> #ifdef USE_FAR_KEYWORD</div><div class='del'>-   jmp_buf jmpbuf;</div><div class='add'>+   jmp_buf png_jmpbuf;</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -57,7 +57,7 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>    png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,</div><div class='del'>-      malloc_fn, mem_ptr);</div><div class='add'>+       malloc_fn, mem_ptr);</div><div class='ctx'> #else</div><div class='ctx'>    png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -65,11 +65,19 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='ctx'>       return (NULL);</div><div class='ctx'> </div><div class='ctx'>    /* Added at libpng-1.2.6 */</div><div class='del'>-#ifdef PNG_SET_USER_LIMITS_SUPPORTED</div><div class='add'>+#ifdef PNG_USER_LIMITS_SUPPORTED</div><div class='ctx'>    png_ptr-&gt;user_width_max = PNG_USER_WIDTH_MAX;</div><div class='ctx'>    png_ptr-&gt;user_height_max = PNG_USER_HEIGHT_MAX;</div><div class='del'>-   /* Added at libpng-1.4.0 */</div><div class='add'>+</div><div class='add'>+#  ifdef PNG_USER_CHUNK_CACHE_MAX</div><div class='add'>+   /* Added at libpng-1.2.43 and 1.4.0 */</div><div class='ctx'>    png_ptr-&gt;user_chunk_cache_max = PNG_USER_CHUNK_CACHE_MAX;</div><div class='add'>+#  endif</div><div class='add'>+</div><div class='add'>+#  ifdef PNG_SET_USER_CHUNK_MALLOC_MAX</div><div class='add'>+   /* Added at libpng-1.2.43 and 1.4.1 */</div><div class='add'>+   png_ptr-&gt;user_chunk_malloc_max = PNG_USER_CHUNK_MALLOC_MAX;</div><div class='add'>+#  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_SETJMP_SUPPORTED</div><div class='hunk'>@@ -77,13 +85,13 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='ctx'>    encounter a png_error() will longjmp here.  Since the jmpbuf is</div><div class='ctx'>    then meaningless we abort instead of returning. */</div><div class='ctx'> #ifdef USE_FAR_KEYWORD</div><div class='del'>-   if (setjmp(jmpbuf))</div><div class='add'>+   if (setjmp(png_jmpbuf))</div><div class='ctx'> #else</div><div class='ctx'>    if (setjmp(png_jmpbuf(png_ptr))) /* Sets longjmp to match setjmp */</div><div class='ctx'> #endif</div><div class='ctx'>       PNG_ABORT();</div><div class='ctx'> #ifdef USE_FAR_KEYWORD</div><div class='del'>-   png_memcpy(png_jmpbuf(png_ptr), jmpbuf, png_sizeof(jmp_buf));</div><div class='add'>+   png_memcpy(png_jmpbuf(png_ptr), png_jmpbuf, png_sizeof(jmp_buf));</div><div class='ctx'> #endif</div><div class='ctx'> #endif /* PNG_SETJMP_SUPPORTED */</div><div class='ctx'> </div><div class='hunk'>@@ -96,46 +104,47 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='ctx'>    if (user_png_ver)</div><div class='ctx'>    {</div><div class='ctx'>       i = 0;</div><div class='add'>+</div><div class='ctx'>       do</div><div class='ctx'>       {</div><div class='ctx'>          if (user_png_ver[i] != png_libpng_ver[i])</div><div class='ctx'>             png_ptr-&gt;flags |= PNG_FLAG_LIBRARY_MISMATCH;</div><div class='ctx'>       } while (png_libpng_ver[i++]);</div><div class='del'>-    }</div><div class='del'>-    else</div><div class='del'>-         png_ptr-&gt;flags |= PNG_FLAG_LIBRARY_MISMATCH;</div><div class='add'>+   }</div><div class='ctx'> </div><div class='add'>+   else</div><div class='add'>+      png_ptr-&gt;flags |= PNG_FLAG_LIBRARY_MISMATCH;</div><div class='ctx'> </div><div class='del'>-    if (png_ptr-&gt;flags &amp; PNG_FLAG_LIBRARY_MISMATCH)</div><div class='del'>-    {</div><div class='del'>-       /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so</div><div class='del'>-       * we must recompile any applications that use any older library version.</div><div class='del'>-       * For versions after libpng 1.0, we will be compatible, so we need</div><div class='del'>-       * only check the first digit.</div><div class='del'>-       */</div><div class='add'>+</div><div class='add'>+   if (png_ptr-&gt;flags &amp; PNG_FLAG_LIBRARY_MISMATCH)</div><div class='add'>+   {</div><div class='add'>+     /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so</div><div class='add'>+      * we must recompile any applications that use any older library version.</div><div class='add'>+      * For versions after libpng 1.0, we will be compatible, so we need</div><div class='add'>+      * only check the first digit.</div><div class='add'>+      */</div><div class='ctx'>       if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||</div><div class='ctx'>           (user_png_ver[0] == '1' &amp;&amp; user_png_ver[2] != png_libpng_ver[2]) ||</div><div class='ctx'>           (user_png_ver[0] == '0' &amp;&amp; user_png_ver[2] &lt; '9'))</div><div class='ctx'>       {</div><div class='del'>-#ifdef PNG_STDIO_SUPPORTED</div><div class='add'>+#ifdef PNG_CONSOLE_IO_SUPPORTED</div><div class='ctx'>          char msg[80];</div><div class='ctx'>          if (user_png_ver)</div><div class='ctx'>          {</div><div class='del'>-           png_snprintf(msg, 80,</div><div class='del'>-              "Application was compiled with png.h from libpng-%.20s",</div><div class='del'>-              user_png_ver);</div><div class='del'>-           png_warning(png_ptr, msg);</div><div class='add'>+            png_snprintf2(msg, 80,</div><div class='add'>+                "Application built with libpng-%.20s"</div><div class='add'>+                " but running with %.20s",</div><div class='add'>+                user_png_ver,</div><div class='add'>+                png_libpng_ver);</div><div class='add'>+            png_warning(png_ptr, msg);</div><div class='ctx'>          }</div><div class='del'>-         png_snprintf(msg, 80,</div><div class='del'>-             "Application  is  running with png.c from libpng-%.20s",</div><div class='del'>-             png_libpng_ver);</div><div class='del'>-         png_warning(png_ptr, msg);</div><div class='add'>+#else</div><div class='add'>+         png_warning(png_ptr,</div><div class='add'>+             "Incompatible libpng version in application and library");</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef PNG_ERROR_NUMBERS_SUPPORTED</div><div class='ctx'>          png_ptr-&gt;flags = 0;</div><div class='ctx'> #endif</div><div class='del'>-         png_warning(png_ptr,</div><div class='del'>-            "Incompatible libpng version in application and library");</div><div class='ctx'> </div><div class='ctx'>          png_cleanup_needed = 1;</div><div class='ctx'>       }</div><div class='hunk'>@@ -145,11 +154,12 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='ctx'>    {</div><div class='ctx'>    /* Initialize zbuf - compression buffer */</div><div class='ctx'>    png_ptr-&gt;zbuf_size = PNG_ZBUF_SIZE;</div><div class='del'>-   png_ptr-&gt;zbuf = (png_bytep)png_malloc_warn(png_ptr,</div><div class='del'>-     png_ptr-&gt;zbuf_size);</div><div class='add'>+   png_ptr-&gt;zbuf = (png_bytep)png_malloc_warn(png_ptr, png_ptr-&gt;zbuf_size);</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;zbuf == NULL)</div><div class='del'>-        png_cleanup_needed = 1;</div><div class='add'>+      png_cleanup_needed = 1;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;zstream.zalloc = png_zalloc;</div><div class='ctx'>    png_ptr-&gt;zstream.zfree = png_zfree;</div><div class='ctx'>    png_ptr-&gt;zstream.opaque = (voidpf)png_ptr;</div><div class='hunk'>@@ -158,12 +168,24 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='ctx'>    {</div><div class='ctx'>       switch (inflateInit(&amp;png_ptr-&gt;zstream))</div><div class='ctx'>       {</div><div class='del'>-         case Z_OK: /* Do nothing */ break;</div><div class='add'>+         case Z_OK:</div><div class='add'>+            break; /* Do nothing */</div><div class='add'>+</div><div class='ctx'>          case Z_MEM_ERROR:</div><div class='del'>-         case Z_STREAM_ERROR: png_warning(png_ptr, "zlib memory error");</div><div class='del'>-            png_cleanup_needed = 1; break;</div><div class='del'>-         case Z_VERSION_ERROR: png_warning(png_ptr, "zlib version error");</div><div class='del'>-            png_cleanup_needed = 1; break;</div><div class='add'>+            png_warning(png_ptr, "zlib memory error");</div><div class='add'>+            png_cleanup_needed = 1;</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         case Z_STREAM_ERROR:</div><div class='add'>+            png_warning(png_ptr, "zlib stream error");</div><div class='add'>+            png_cleanup_needed = 1;</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         case Z_VERSION_ERROR:</div><div class='add'>+            png_warning(png_ptr, "zlib version error");</div><div class='add'>+            png_cleanup_needed = 1;</div><div class='add'>+            break;</div><div class='add'>+</div><div class='ctx'>          default: png_warning(png_ptr, "Unknown zlib error");</div><div class='ctx'>             png_cleanup_needed = 1;</div><div class='ctx'>       }</div><div class='hunk'>@@ -176,7 +198,7 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='ctx'>       png_ptr-&gt;zbuf = NULL;</div><div class='ctx'> #ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>       png_destroy_struct_2((png_voidp)png_ptr,</div><div class='del'>-         (png_free_ptr)free_fn, (png_voidp)mem_ptr);</div><div class='add'>+          (png_free_ptr)free_fn, (png_voidp)mem_ptr);</div><div class='ctx'> #else</div><div class='ctx'>       png_destroy_struct((png_voidp)png_ptr);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -206,34 +228,12 @@ void PNGAPI</div><div class='ctx'> png_read_info(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_read_info");</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>    if (png_ptr == NULL || info_ptr == NULL)</div><div class='ctx'>       return;</div><div class='del'>- </div><div class='del'>-   /* If we haven't checked all of the PNG signature bytes, do so now. */</div><div class='del'>-   if (png_ptr-&gt;sig_bytes &lt; 8)</div><div class='del'>-   {</div><div class='del'>-      png_size_t num_checked = png_ptr-&gt;sig_bytes,</div><div class='del'>-                 num_to_check = 8 - num_checked;</div><div class='del'>-</div><div class='del'>-#ifdef PNG_IO_STATE_SUPPORTED</div><div class='del'>-      png_ptr-&gt;io_state = PNG_IO_READING | PNG_IO_SIGNATURE;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-      png_read_data(png_ptr, &amp;(info_ptr-&gt;signature[num_checked]), num_to_check);</div><div class='del'>-      png_ptr-&gt;sig_bytes = 8;</div><div class='del'>-</div><div class='del'>-      if (png_sig_cmp(info_ptr-&gt;signature, num_checked, num_to_check))</div><div class='del'>-      {</div><div class='del'>-         if (num_checked &lt; 4 &amp;&amp;</div><div class='del'>-             png_sig_cmp(info_ptr-&gt;signature, num_checked, num_to_check - 4))</div><div class='del'>-            png_error(png_ptr, "Not a PNG file");</div><div class='del'>-         else</div><div class='del'>-            png_error(png_ptr, "PNG file corrupted by ASCII conversion");</div><div class='del'>-      }</div><div class='del'>-      if (num_checked &lt; 3)</div><div class='del'>-         png_ptr-&gt;mode |= PNG_HAVE_PNG_SIGNATURE;</div><div class='del'>-   }</div><div class='add'>+   /* Read and check the PNG file signature. */</div><div class='add'>+   png_read_sig(png_ptr, info_ptr);</div><div class='ctx'> </div><div class='ctx'>    for (;;)</div><div class='ctx'>    {</div><div class='hunk'>@@ -299,114 +299,141 @@ png_read_info(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>        * matching the chunk name rather than a linear search.</div><div class='ctx'>        */</div><div class='ctx'>       if (!png_memcmp(chunk_name, png_IDAT, 4))</div><div class='del'>-        if (png_ptr-&gt;mode &amp; PNG_AFTER_IDAT)</div><div class='del'>-          png_ptr-&gt;mode |= PNG_HAVE_CHUNK_AFTER_IDAT;</div><div class='add'>+         if (png_ptr-&gt;mode &amp; PNG_AFTER_IDAT)</div><div class='add'>+            png_ptr-&gt;mode |= PNG_HAVE_CHUNK_AFTER_IDAT;</div><div class='ctx'> </div><div class='ctx'>       if (!png_memcmp(chunk_name, png_IHDR, 4))</div><div class='ctx'>          png_handle_IHDR(png_ptr, info_ptr, length);</div><div class='add'>+</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_IEND, 4))</div><div class='ctx'>          png_handle_IEND(png_ptr, info_ptr, length);</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='ctx'>       else if (png_handle_as_unknown(png_ptr, chunk_name))</div><div class='ctx'>       {</div><div class='ctx'>          if (!png_memcmp(chunk_name, png_IDAT, 4))</div><div class='ctx'>             png_ptr-&gt;mode |= PNG_HAVE_IDAT;</div><div class='add'>+</div><div class='ctx'>          png_handle_unknown(png_ptr, info_ptr, length);</div><div class='add'>+</div><div class='ctx'>          if (!png_memcmp(chunk_name, png_PLTE, 4))</div><div class='ctx'>             png_ptr-&gt;mode |= PNG_HAVE_PLTE;</div><div class='add'>+</div><div class='ctx'>          else if (!png_memcmp(chunk_name, png_IDAT, 4))</div><div class='ctx'>          {</div><div class='ctx'>             if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR))</div><div class='ctx'>                png_error(png_ptr, "Missing IHDR before IDAT");</div><div class='add'>+</div><div class='ctx'>             else if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE &amp;&amp;</div><div class='del'>-                     !(png_ptr-&gt;mode &amp; PNG_HAVE_PLTE))</div><div class='add'>+                !(png_ptr-&gt;mode &amp; PNG_HAVE_PLTE))</div><div class='ctx'>                png_error(png_ptr, "Missing PLTE before IDAT");</div><div class='add'>+</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='ctx'> #endif</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_PLTE, 4))</div><div class='ctx'>          png_handle_PLTE(png_ptr, info_ptr, length);</div><div class='add'>+</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_IDAT, 4))</div><div class='ctx'>       {</div><div class='ctx'>          if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR))</div><div class='ctx'>             png_error(png_ptr, "Missing IHDR before IDAT");</div><div class='add'>+</div><div class='ctx'>          else if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE &amp;&amp;</div><div class='del'>-                  !(png_ptr-&gt;mode &amp; PNG_HAVE_PLTE))</div><div class='add'>+             !(png_ptr-&gt;mode &amp; PNG_HAVE_PLTE))</div><div class='ctx'>             png_error(png_ptr, "Missing PLTE before IDAT");</div><div class='ctx'> </div><div class='ctx'>          png_ptr-&gt;idat_size = length;</div><div class='ctx'>          png_ptr-&gt;mode |= PNG_HAVE_IDAT;</div><div class='ctx'>          break;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_bKGD_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_bKGD, 4))</div><div class='ctx'>          png_handle_bKGD(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_cHRM_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_cHRM, 4))</div><div class='ctx'>          png_handle_cHRM(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_gAMA_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_gAMA, 4))</div><div class='ctx'>          png_handle_gAMA(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_hIST_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_hIST, 4))</div><div class='ctx'>          png_handle_hIST(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_oFFs_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_oFFs, 4))</div><div class='ctx'>          png_handle_oFFs(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_pCAL_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_pCAL, 4))</div><div class='ctx'>          png_handle_pCAL(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_sCAL_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_sCAL, 4))</div><div class='ctx'>          png_handle_sCAL(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_pHYs_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_pHYs, 4))</div><div class='ctx'>          png_handle_pHYs(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_sBIT_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_sBIT, 4))</div><div class='ctx'>          png_handle_sBIT(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_sRGB_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_sRGB, 4))</div><div class='ctx'>          png_handle_sRGB(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_iCCP_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_iCCP, 4))</div><div class='ctx'>          png_handle_iCCP(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_sPLT_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_sPLT, 4))</div><div class='ctx'>          png_handle_sPLT(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_tEXt_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_tEXt, 4))</div><div class='ctx'>          png_handle_tEXt(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_tIME_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_tIME, 4))</div><div class='ctx'>          png_handle_tIME(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_tRNS_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_tRNS, 4))</div><div class='ctx'>          png_handle_tRNS(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_zTXt_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_zTXt, 4))</div><div class='ctx'>          png_handle_zTXt(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_iTXt_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_iTXt, 4))</div><div class='ctx'>          png_handle_iTXt(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>          png_handle_unknown(png_ptr, info_ptr, length);</div><div class='ctx'>    }</div><div class='hunk'>@@ -418,14 +445,17 @@ void PNGAPI</div><div class='ctx'> png_read_update_info(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_read_update_info");</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    if (!(png_ptr-&gt;flags &amp; PNG_FLAG_ROW_INIT))</div><div class='ctx'>       png_read_start_row(png_ptr);</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       png_warning(png_ptr,</div><div class='del'>-      "Ignoring extra png_read_update_info() call; row buffer not reallocated");</div><div class='add'>+          "Ignoring extra png_read_update_info() call;"</div><div class='add'>+          " row buffer not reallocated");</div><div class='ctx'> </div><div class='ctx'>    png_read_transform_info(png_ptr, info_ptr);</div><div class='ctx'> }</div><div class='hunk'>@@ -440,11 +470,16 @@ void PNGAPI</div><div class='ctx'> png_start_read_image(png_structp png_ptr)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_start_read_image");</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    if (!(png_ptr-&gt;flags &amp; PNG_FLAG_ROW_INIT))</div><div class='ctx'>       png_read_start_row(png_ptr);</div><div class='add'>+   else</div><div class='add'>+      png_warning(png_ptr,</div><div class='add'>+          "Ignoring extra png_start_read_image() call;"</div><div class='add'>+          " row buffer not reallocated");</div><div class='ctx'> }</div><div class='ctx'> #endif /* PNG_SEQUENTIAL_READ_SUPPORTED */</div><div class='ctx'> </div><div class='hunk'>@@ -454,18 +489,19 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)</div><div class='ctx'> {</div><div class='ctx'>    PNG_IDAT;</div><div class='ctx'>    PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55,</div><div class='del'>-      0xff};</div><div class='add'>+       0xff};</div><div class='ctx'>    PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};</div><div class='ctx'>    int ret;</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>    png_debug2(1, "in png_read_row (row %lu, pass %d)",</div><div class='del'>-      (unsigned long) png_ptr-&gt;row_number, png_ptr-&gt;pass);</div><div class='add'>+       (unsigned long)png_ptr-&gt;row_number, png_ptr-&gt;pass);</div><div class='ctx'> </div><div class='ctx'>    if (!(png_ptr-&gt;flags &amp; PNG_FLAG_ROW_INIT))</div><div class='ctx'>       png_read_start_row(png_ptr);</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;row_number == 0 &amp;&amp; png_ptr-&gt;pass == 0)</div><div class='ctx'>    {</div><div class='ctx'>    /* Check for transforms that have been set but were defined out */</div><div class='hunk'>@@ -473,26 +509,33 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_INVERT_MONO)</div><div class='ctx'>       png_warning(png_ptr, "PNG_READ_INVERT_SUPPORTED is not defined");</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #if defined(PNG_WRITE_FILLER_SUPPORTED) &amp;&amp; !defined(PNG_READ_FILLER_SUPPORTED)</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_FILLER)</div><div class='ctx'>       png_warning(png_ptr, "PNG_READ_FILLER_SUPPORTED is not defined");</div><div class='ctx'> #endif</div><div class='del'>-#if defined(PNG_WRITE_PACKSWAP_SUPPORTED) &amp;&amp; !defined(PNG_READ_PACKSWAP_SUPPORTED)</div><div class='add'>+</div><div class='add'>+#if defined(PNG_WRITE_PACKSWAP_SUPPORTED) &amp;&amp; \</div><div class='add'>+    !defined(PNG_READ_PACKSWAP_SUPPORTED)</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_PACKSWAP)</div><div class='ctx'>       png_warning(png_ptr, "PNG_READ_PACKSWAP_SUPPORTED is not defined");</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #if defined(PNG_WRITE_PACK_SUPPORTED) &amp;&amp; !defined(PNG_READ_PACK_SUPPORTED)</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_PACK)</div><div class='ctx'>       png_warning(png_ptr, "PNG_READ_PACK_SUPPORTED is not defined");</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #if defined(PNG_WRITE_SHIFT_SUPPORTED) &amp;&amp; !defined(PNG_READ_SHIFT_SUPPORTED)</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_SHIFT)</div><div class='ctx'>       png_warning(png_ptr, "PNG_READ_SHIFT_SUPPORTED is not defined");</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #if defined(PNG_WRITE_BGR_SUPPORTED) &amp;&amp; !defined(PNG_READ_BGR_SUPPORTED)</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_BGR)</div><div class='ctx'>       png_warning(png_ptr, "PNG_READ_BGR_SUPPORTED is not defined");</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #if defined(PNG_WRITE_SWAP_SUPPORTED) &amp;&amp; !defined(PNG_READ_SWAP_SUPPORTED)</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_SWAP_BYTES)</div><div class='ctx'>       png_warning(png_ptr, "PNG_READ_SWAP_SUPPORTED is not defined");</div><div class='hunk'>@@ -515,42 +558,50 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)</div><div class='ctx'>                return;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='add'>+</div><div class='ctx'>          case 1:</div><div class='ctx'>             if ((png_ptr-&gt;row_number &amp; 0x07) || png_ptr-&gt;width &lt; 5)</div><div class='ctx'>             {</div><div class='ctx'>                if (dsp_row != NULL)</div><div class='ctx'>                   png_combine_row(png_ptr, dsp_row,</div><div class='del'>-                     png_pass_dsp_mask[png_ptr-&gt;pass]);</div><div class='add'>+                      png_pass_dsp_mask[png_ptr-&gt;pass]);</div><div class='add'>+</div><div class='ctx'>                png_read_finish_row(png_ptr);</div><div class='ctx'>                return;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='add'>+</div><div class='ctx'>          case 2:</div><div class='ctx'>             if ((png_ptr-&gt;row_number &amp; 0x07) != 4)</div><div class='ctx'>             {</div><div class='ctx'>                if (dsp_row != NULL &amp;&amp; (png_ptr-&gt;row_number &amp; 4))</div><div class='ctx'>                   png_combine_row(png_ptr, dsp_row,</div><div class='del'>-                     png_pass_dsp_mask[png_ptr-&gt;pass]);</div><div class='add'>+                      png_pass_dsp_mask[png_ptr-&gt;pass]);</div><div class='add'>+</div><div class='ctx'>                png_read_finish_row(png_ptr);</div><div class='ctx'>                return;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='add'>+</div><div class='ctx'>          case 3:</div><div class='ctx'>             if ((png_ptr-&gt;row_number &amp; 3) || png_ptr-&gt;width &lt; 3)</div><div class='ctx'>             {</div><div class='ctx'>                if (dsp_row != NULL)</div><div class='ctx'>                   png_combine_row(png_ptr, dsp_row,</div><div class='del'>-                     png_pass_dsp_mask[png_ptr-&gt;pass]);</div><div class='add'>+                      png_pass_dsp_mask[png_ptr-&gt;pass]);</div><div class='add'>+</div><div class='ctx'>                png_read_finish_row(png_ptr);</div><div class='ctx'>                return;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='add'>+</div><div class='ctx'>          case 4:</div><div class='ctx'>             if ((png_ptr-&gt;row_number &amp; 3) != 2)</div><div class='ctx'>             {</div><div class='ctx'>                if (dsp_row != NULL &amp;&amp; (png_ptr-&gt;row_number &amp; 2))</div><div class='ctx'>                   png_combine_row(png_ptr, dsp_row,</div><div class='del'>-                     png_pass_dsp_mask[png_ptr-&gt;pass]);</div><div class='add'>+                      png_pass_dsp_mask[png_ptr-&gt;pass]);</div><div class='add'>+</div><div class='ctx'>                png_read_finish_row(png_ptr);</div><div class='ctx'>                return;</div><div class='ctx'>             }</div><div class='hunk'>@@ -560,11 +611,14 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)</div><div class='ctx'>             {</div><div class='ctx'>                if (dsp_row != NULL)</div><div class='ctx'>                   png_combine_row(png_ptr, dsp_row,</div><div class='del'>-                     png_pass_dsp_mask[png_ptr-&gt;pass]);</div><div class='add'>+                      png_pass_dsp_mask[png_ptr-&gt;pass]);</div><div class='add'>+</div><div class='ctx'>                png_read_finish_row(png_ptr);</div><div class='ctx'>                return;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='add'>+</div><div class='add'>+         default:</div><div class='ctx'>          case 6:</div><div class='ctx'>             if (!(png_ptr-&gt;row_number &amp; 1))</div><div class='ctx'>             {</div><div class='hunk'>@@ -580,7 +634,10 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)</div><div class='ctx'>       png_error(png_ptr, "Invalid attempt to read row data");</div><div class='ctx'> </div><div class='ctx'>    png_ptr-&gt;zstream.next_out = png_ptr-&gt;row_buf;</div><div class='del'>-   png_ptr-&gt;zstream.avail_out = (uInt)png_ptr-&gt;irowbytes;</div><div class='add'>+   png_ptr-&gt;zstream.avail_out =</div><div class='add'>+       (uInt)(PNG_ROWBYTES(png_ptr-&gt;pixel_depth,</div><div class='add'>+       png_ptr-&gt;iwidth) + 1);</div><div class='add'>+</div><div class='ctx'>    do</div><div class='ctx'>    {</div><div class='ctx'>       if (!(png_ptr-&gt;zstream.avail_in))</div><div class='hunk'>@@ -598,10 +655,12 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)</div><div class='ctx'>          if (png_ptr-&gt;zbuf_size &gt; png_ptr-&gt;idat_size)</div><div class='ctx'>             png_ptr-&gt;zstream.avail_in = (uInt)png_ptr-&gt;idat_size;</div><div class='ctx'>          png_crc_read(png_ptr, png_ptr-&gt;zbuf,</div><div class='del'>-            (png_size_t)png_ptr-&gt;zstream.avail_in);</div><div class='add'>+             (png_size_t)png_ptr-&gt;zstream.avail_in);</div><div class='ctx'>          png_ptr-&gt;idat_size -= png_ptr-&gt;zstream.avail_in;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       ret = inflate(&amp;png_ptr-&gt;zstream, Z_PARTIAL_FLUSH);</div><div class='add'>+</div><div class='ctx'>       if (ret == Z_STREAM_END)</div><div class='ctx'>       {</div><div class='ctx'>          if (png_ptr-&gt;zstream.avail_out || png_ptr-&gt;zstream.avail_in ||</div><div class='hunk'>@@ -611,9 +670,10 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)</div><div class='ctx'>          png_ptr-&gt;flags |= PNG_FLAG_ZLIB_FINISHED;</div><div class='ctx'>          break;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       if (ret != Z_OK)</div><div class='ctx'>          png_error(png_ptr, png_ptr-&gt;zstream.msg ? png_ptr-&gt;zstream.msg :</div><div class='del'>-                   "Decompression error");</div><div class='add'>+             "Decompression error");</div><div class='ctx'> </div><div class='ctx'>    } while (png_ptr-&gt;zstream.avail_out);</div><div class='ctx'> </div><div class='hunk'>@@ -627,14 +687,14 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr-&gt;row_buf[0])</div><div class='ctx'>    png_read_filter_row(png_ptr, &amp;(png_ptr-&gt;row_info),</div><div class='del'>-      png_ptr-&gt;row_buf + 1, png_ptr-&gt;prev_row + 1,</div><div class='del'>-      (int)(png_ptr-&gt;row_buf[0]));</div><div class='add'>+       png_ptr-&gt;row_buf + 1, png_ptr-&gt;prev_row + 1,</div><div class='add'>+       (int)(png_ptr-&gt;row_buf[0]));</div><div class='ctx'> </div><div class='ctx'>    png_memcpy(png_ptr-&gt;prev_row, png_ptr-&gt;row_buf, png_ptr-&gt;rowbytes + 1);</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_MNG_FEATURES_SUPPORTED</div><div class='ctx'>    if ((png_ptr-&gt;mng_features_permitted &amp; PNG_FLAG_MNG_FILTER_64) &amp;&amp;</div><div class='del'>-      (png_ptr-&gt;filter_type == PNG_INTRAPIXEL_DIFFERENCING))</div><div class='add'>+       (png_ptr-&gt;filter_type == PNG_INTRAPIXEL_DIFFERENCING))</div><div class='ctx'>    {</div><div class='ctx'>       /* Intrapixel differencing */</div><div class='ctx'>       png_do_read_intrapixel(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1);</div><div class='hunk'>@@ -658,17 +718,18 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)</div><div class='ctx'>          png_do_read_interlace(png_ptr);</div><div class='ctx'> </div><div class='ctx'>       if (dsp_row != NULL)</div><div class='del'>-         png_combine_row(png_ptr, dsp_row,</div><div class='del'>-            png_pass_dsp_mask[png_ptr-&gt;pass]);</div><div class='add'>+         png_combine_row(png_ptr, dsp_row, png_pass_dsp_mask[png_ptr-&gt;pass]);</div><div class='add'>+</div><div class='ctx'>       if (row != NULL)</div><div class='del'>-         png_combine_row(png_ptr, row,</div><div class='del'>-            png_pass_mask[png_ptr-&gt;pass]);</div><div class='add'>+         png_combine_row(png_ptr, row, png_pass_mask[png_ptr-&gt;pass]);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'> #endif</div><div class='ctx'>    {</div><div class='ctx'>       if (row != NULL)</div><div class='ctx'>          png_combine_row(png_ptr, row, 0xff);</div><div class='add'>+</div><div class='ctx'>       if (dsp_row != NULL)</div><div class='ctx'>          png_combine_row(png_ptr, dsp_row, 0xff);</div><div class='ctx'>    }</div><div class='hunk'>@@ -706,16 +767,17 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)</div><div class='ctx'> </div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_read_rows(png_structp png_ptr, png_bytepp row,</div><div class='del'>-   png_bytepp display_row, png_uint_32 num_rows)</div><div class='add'>+    png_bytepp display_row, png_uint_32 num_rows)</div><div class='ctx'> {</div><div class='ctx'>    png_uint_32 i;</div><div class='ctx'>    png_bytepp rp;</div><div class='ctx'>    png_bytepp dp;</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_read_rows");</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    rp = row;</div><div class='ctx'>    dp = display_row;</div><div class='ctx'>    if (rp != NULL &amp;&amp; dp != NULL)</div><div class='hunk'>@@ -726,6 +788,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row,</div><div class='ctx'> </div><div class='ctx'>          png_read_row(png_ptr, rptr, dptr);</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>    else if (rp != NULL)</div><div class='ctx'>       for (i = 0; i &lt; num_rows; i++)</div><div class='ctx'>       {</div><div class='hunk'>@@ -733,6 +796,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row,</div><div class='ctx'>          png_read_row(png_ptr, rptr, NULL);</div><div class='ctx'>          rp++;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>    else if (dp != NULL)</div><div class='ctx'>       for (i = 0; i &lt; num_rows; i++)</div><div class='ctx'>       {</div><div class='hunk'>@@ -764,22 +828,45 @@ png_read_image(png_structp png_ptr, png_bytepp image)</div><div class='ctx'>    png_bytepp rp;</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_read_image");</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_INTERLACING_SUPPORTED</div><div class='del'>-   pass = png_set_interlace_handling(png_ptr);</div><div class='add'>+   if (!(png_ptr-&gt;flags &amp; PNG_FLAG_ROW_INIT))</div><div class='add'>+   {</div><div class='add'>+      pass = png_set_interlace_handling(png_ptr);</div><div class='add'>+      /* And make sure transforms are initialized. */</div><div class='add'>+      png_start_read_image(png_ptr);</div><div class='add'>+   }</div><div class='add'>+   else</div><div class='add'>+   {</div><div class='add'>+      if (png_ptr-&gt;interlaced &amp;&amp; !(png_ptr-&gt;transformations &amp; PNG_INTERLACE))</div><div class='add'>+      {</div><div class='add'>+         /* Caller called png_start_read_image or png_read_update_info without</div><div class='add'>+          * first turning on the PNG_INTERLACE transform.  We can fix this here,</div><div class='add'>+          * but the caller should do it!</div><div class='add'>+          */</div><div class='add'>+         png_warning(png_ptr, "Interlace handling should be turned on when "</div><div class='add'>+            "using png_read_image");</div><div class='add'>+         /* Make sure this is set correctly */</div><div class='add'>+         png_ptr-&gt;num_rows = png_ptr-&gt;height;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* Obtain the pass number, which also turns on the PNG_INTERLACE flag in</div><div class='add'>+       * the above error case.</div><div class='add'>+       */</div><div class='add'>+      pass = png_set_interlace_handling(png_ptr);</div><div class='add'>+   }</div><div class='ctx'> #else</div><div class='ctx'>    if (png_ptr-&gt;interlaced)</div><div class='ctx'>       png_error(png_ptr,</div><div class='del'>-        "Cannot read interlaced image -- interlace handler disabled");</div><div class='add'>+          "Cannot read interlaced image -- interlace handler disabled");</div><div class='add'>+</div><div class='ctx'>    pass = 1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'>    image_height=png_ptr-&gt;height;</div><div class='del'>-   png_ptr-&gt;num_rows = image_height; /* Make sure this is set correctly */</div><div class='ctx'> </div><div class='ctx'>    for (j = 0; j &lt; pass; j++)</div><div class='ctx'>    {</div><div class='hunk'>@@ -802,9 +889,10 @@ void PNGAPI</div><div class='ctx'> png_read_end(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_read_end");</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_crc_finish(png_ptr, 0); /* Finish off CRC from last IDAT chunk */</div><div class='ctx'> </div><div class='ctx'>    do</div><div class='hunk'>@@ -869,8 +957,10 @@ png_read_end(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> </div><div class='ctx'>       if (!png_memcmp(chunk_name, png_IHDR, 4))</div><div class='ctx'>          png_handle_IHDR(png_ptr, info_ptr, length);</div><div class='add'>+</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_IEND, 4))</div><div class='ctx'>          png_handle_IEND(png_ptr, info_ptr, length);</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='ctx'>       else if (png_handle_as_unknown(png_ptr, chunk_name))</div><div class='ctx'>       {</div><div class='hunk'>@@ -884,6 +974,7 @@ png_read_end(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>             png_ptr-&gt;mode |= PNG_HAVE_PLTE;</div><div class='ctx'>       }</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_IDAT, 4))</div><div class='ctx'>       {</div><div class='ctx'>          /* Zero length IDATs are legal after the last IDAT has been</div><div class='hunk'>@@ -891,78 +982,97 @@ png_read_end(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>           */</div><div class='ctx'>          if ((length &gt; 0) || (png_ptr-&gt;mode &amp; PNG_HAVE_CHUNK_AFTER_IDAT))</div><div class='ctx'>             png_benign_error(png_ptr, "Too many IDATs found");</div><div class='add'>+</div><div class='ctx'>          png_crc_finish(png_ptr, length);</div><div class='ctx'>       }</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_PLTE, 4))</div><div class='ctx'>          png_handle_PLTE(png_ptr, info_ptr, length);</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_bKGD_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_bKGD, 4))</div><div class='ctx'>          png_handle_bKGD(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_cHRM_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_cHRM, 4))</div><div class='ctx'>          png_handle_cHRM(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_gAMA_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_gAMA, 4))</div><div class='ctx'>          png_handle_gAMA(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_hIST_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_hIST, 4))</div><div class='ctx'>          png_handle_hIST(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_oFFs_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_oFFs, 4))</div><div class='ctx'>          png_handle_oFFs(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_pCAL_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_pCAL, 4))</div><div class='ctx'>          png_handle_pCAL(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_sCAL_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_sCAL, 4))</div><div class='ctx'>          png_handle_sCAL(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_pHYs_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_pHYs, 4))</div><div class='ctx'>          png_handle_pHYs(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_sBIT_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_sBIT, 4))</div><div class='ctx'>          png_handle_sBIT(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_sRGB_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_sRGB, 4))</div><div class='ctx'>          png_handle_sRGB(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_iCCP_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_iCCP, 4))</div><div class='ctx'>          png_handle_iCCP(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_sPLT_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_sPLT, 4))</div><div class='ctx'>          png_handle_sPLT(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_tEXt_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_tEXt, 4))</div><div class='ctx'>          png_handle_tEXt(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_tIME_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_tIME, 4))</div><div class='ctx'>          png_handle_tIME(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_tRNS_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_tRNS, 4))</div><div class='ctx'>          png_handle_tRNS(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_zTXt_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_zTXt, 4))</div><div class='ctx'>          png_handle_zTXt(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_iTXt_SUPPORTED</div><div class='ctx'>       else if (!png_memcmp(chunk_name, png_iTXt, 4))</div><div class='ctx'>          png_handle_iTXt(png_ptr, info_ptr, length);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>          png_handle_unknown(png_ptr, info_ptr, length);</div><div class='ctx'>    } while (!(png_ptr-&gt;mode &amp; PNG_HAVE_IEND));</div><div class='hunk'>@@ -972,7 +1082,7 @@ png_read_end(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> /* Free all memory used by the read */</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,</div><div class='del'>-   png_infopp end_info_ptr_ptr)</div><div class='add'>+    png_infopp end_info_ptr_ptr)</div><div class='ctx'> {</div><div class='ctx'>    png_structp png_ptr = NULL;</div><div class='ctx'>    png_infop info_ptr = NULL, end_info_ptr = NULL;</div><div class='hunk'>@@ -982,7 +1092,7 @@ png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_destroy_read_struct");</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>    if (png_ptr_ptr != NULL)</div><div class='ctx'>       png_ptr = *png_ptr_ptr;</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='hunk'>@@ -1023,7 +1133,7 @@ png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>       png_destroy_struct_2((png_voidp)end_info_ptr, (png_free_ptr)free_fn,</div><div class='del'>-         (png_voidp)mem_ptr);</div><div class='add'>+          (png_voidp)mem_ptr);</div><div class='ctx'> #else</div><div class='ctx'>       png_destroy_struct((png_voidp)end_info_ptr);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1044,7 +1154,8 @@ png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,</div><div class='ctx'> </div><div class='ctx'> /* Free all memory used by the read (old method) */</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)</div><div class='add'>+png_read_destroy(png_structp png_ptr, png_infop info_ptr,</div><div class='add'>+    png_infop end_info_ptr)</div><div class='ctx'> {</div><div class='ctx'> #ifdef PNG_SETJMP_SUPPORTED</div><div class='ctx'>    jmp_buf tmp_jmp;</div><div class='hunk'>@@ -1057,7 +1168,7 @@ png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_read_destroy");</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>    if (info_ptr != NULL)</div><div class='ctx'>       png_info_destroy(png_ptr, info_ptr);</div><div class='ctx'> </div><div class='hunk'>@@ -1068,31 +1179,38 @@ png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;big_row_buf);</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;prev_row);</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='del'>-#ifdef PNG_READ_DITHER_SUPPORTED</div><div class='add'>+</div><div class='add'>+#ifdef PNG_READ_QUANTIZE_SUPPORTED</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;palette_lookup);</div><div class='del'>-   png_free(png_ptr, png_ptr-&gt;dither_index);</div><div class='add'>+   png_free(png_ptr, png_ptr-&gt;quantize_index);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;gamma_table);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_BACKGROUND_SUPPORTED</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;gamma_from_1);</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;gamma_to_1);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;free_me &amp; PNG_FREE_PLTE)</div><div class='ctx'>       png_zfree(png_ptr, png_ptr-&gt;palette);</div><div class='ctx'>    png_ptr-&gt;free_me &amp;= ~PNG_FREE_PLTE;</div><div class='add'>+</div><div class='ctx'> #if defined(PNG_tRNS_SUPPORTED) || \</div><div class='ctx'>     defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)</div><div class='ctx'>    if (png_ptr-&gt;free_me &amp; PNG_FREE_TRNS)</div><div class='ctx'>       png_free(png_ptr, png_ptr-&gt;trans_alpha);</div><div class='ctx'>    png_ptr-&gt;free_me &amp;= ~PNG_FREE_TRNS;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_hIST_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;free_me &amp; PNG_FREE_HIST)</div><div class='ctx'>       png_free(png_ptr, png_ptr-&gt;hist);</div><div class='ctx'>    png_ptr-&gt;free_me &amp;= ~PNG_FREE_HIST;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;gamma_16_table != NULL)</div><div class='ctx'>    {</div><div class='hunk'>@@ -1104,6 +1222,7 @@ png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr</div><div class='ctx'>       }</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;gamma_16_table);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_BACKGROUND_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;gamma_16_from_1 != NULL)</div><div class='ctx'>    {</div><div class='hunk'>@@ -1127,11 +1246,13 @@ png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_TIME_RFC1123_SUPPORTED</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;time_buffer);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>    inflateEnd(&amp;png_ptr-&gt;zstream);</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_PROGRESSIVE_READ_SUPPORTED</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;save_buffer);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1146,7 +1267,7 @@ png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr</div><div class='ctx'>     * being used again.</div><div class='ctx'>     */</div><div class='ctx'> #ifdef PNG_SETJMP_SUPPORTED</div><div class='del'>-   png_memcpy(tmp_jmp, png_ptr-&gt;jmpbuf, png_sizeof(jmp_buf));</div><div class='add'>+   png_memcpy(tmp_jmp, png_ptr-&gt;png_jmpbuf, png_sizeof(jmp_buf));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>    error_fn = png_ptr-&gt;error_fn;</div><div class='hunk'>@@ -1166,7 +1287,7 @@ png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_SETJMP_SUPPORTED</div><div class='del'>-   png_memcpy(png_ptr-&gt;jmpbuf, tmp_jmp, png_sizeof(jmp_buf));</div><div class='add'>+   png_memcpy(png_ptr-&gt;png_jmpbuf, tmp_jmp, png_sizeof(jmp_buf));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -1176,6 +1297,7 @@ png_set_read_status_fn(png_structp png_ptr, png_read_status_ptr read_row_fn)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;read_row_fn = read_row_fn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1245,7 +1367,7 @@ png_read_png(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>          png_set_expand(png_ptr);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-   /* We don't handle background color or gamma transformation or dithering.</div><div class='add'>+   /* We don't handle background color or gamma transformation or quantizing.</div><div class='ctx'>     */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_INVERT_SUPPORTED</div><div class='hunk'>@@ -1271,40 +1393,35 @@ png_read_png(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_BGR_SUPPORTED</div><div class='del'>-   /* Flip the RGB pixels to BGR (or RGBA to BGRA)</div><div class='del'>-    */</div><div class='add'>+   /* Flip the RGB pixels to BGR (or RGBA to BGRA) */</div><div class='ctx'>    if (transforms &amp; PNG_TRANSFORM_BGR)</div><div class='ctx'>       png_set_bgr(png_ptr);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_SWAP_ALPHA_SUPPORTED</div><div class='del'>-   /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR)</div><div class='del'>-    */</div><div class='add'>+   /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */</div><div class='ctx'>    if (transforms &amp; PNG_TRANSFORM_SWAP_ALPHA)</div><div class='del'>-       png_set_swap_alpha(png_ptr);</div><div class='add'>+      png_set_swap_alpha(png_ptr);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_SWAP_SUPPORTED</div><div class='del'>-   /* Swap bytes of 16 bit files to least significant byte first</div><div class='del'>-    */</div><div class='add'>+   /* Swap bytes of 16 bit files to least significant byte first */</div><div class='ctx'>    if (transforms &amp; PNG_TRANSFORM_SWAP_ENDIAN)</div><div class='ctx'>       png_set_swap(png_ptr);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Added at libpng-1.2.41 */</div><div class='ctx'> #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED</div><div class='del'>-   /* Invert the alpha channel from opacity to transparency</div><div class='del'>-    */</div><div class='add'>+   /* Invert the alpha channel from opacity to transparency */</div><div class='ctx'>    if (transforms &amp; PNG_TRANSFORM_INVERT_ALPHA)</div><div class='del'>-       png_set_invert_alpha(png_ptr);</div><div class='add'>+      png_set_invert_alpha(png_ptr);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Added at libpng-1.2.41 */</div><div class='ctx'> #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED</div><div class='del'>-   /* Expand grayscale image to RGB</div><div class='del'>-    */</div><div class='add'>+   /* Expand grayscale image to RGB */</div><div class='ctx'>    if (transforms &amp; PNG_TRANSFORM_GRAY_TO_RGB)</div><div class='del'>-       png_set_gray_to_rgb(png_ptr);</div><div class='add'>+      png_set_gray_to_rgb(png_ptr);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>    /* We don't handle adding filler bytes */</div><div class='hunk'>@@ -1320,10 +1437,10 @@ png_read_png(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>    png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);</div><div class='ctx'>    if (info_ptr-&gt;row_pointers == NULL)</div><div class='ctx'>    {</div><div class='del'>-    png_uint_32 iptr;</div><div class='add'>+      png_uint_32 iptr;</div><div class='ctx'> </div><div class='ctx'>       info_ptr-&gt;row_pointers = (png_bytepp)png_malloc(png_ptr,</div><div class='del'>-         info_ptr-&gt;height * png_sizeof(png_bytep));</div><div class='add'>+          info_ptr-&gt;height * png_sizeof(png_bytep));</div><div class='ctx'>       for (iptr=0; iptr&lt;info_ptr-&gt;height; iptr++)</div><div class='ctx'>          info_ptr-&gt;row_pointers[iptr] = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1340,8 +1457,8 @@ png_read_png(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>    /* Read rest of file, and get additional chunks in info_ptr - REQUIRED */</div><div class='ctx'>    png_read_end(png_ptr, info_ptr);</div><div class='ctx'> </div><div class='del'>-   transforms = transforms; /* Quiet compiler warnings */</div><div class='del'>-   params = params;</div><div class='add'>+   PNG_UNUSED(transforms)   /* Quiet compiler warnings */</div><div class='add'>+   PNG_UNUSED(params)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> #endif /* PNG_INFO_IMAGE_SUPPORTED */</div><div class='head'>diff --git a/src/3rdparty/libpng/pngrio.c b/src/3rdparty/libpng/pngrio.c<br/>index 53f2a45..e9c381c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngrio.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngrio.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngrio.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngrio.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> </div><div class='ctx'> /* pngrio.c - functions for data input</div><div class='ctx'>  *</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Last changed in libpng 1.5.0 [January 6, 2011]</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -18,11 +18,10 @@</div><div class='ctx'>  * libpng use it at run time with png_set_read_fn(...).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define PNG_NO_PEDANTIC_WARNINGS</div><div class='del'>-#include "png.h"</div><div class='del'>-#ifdef PNG_READ_SUPPORTED</div><div class='ctx'> #include "pngpriv.h"</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_READ_SUPPORTED</div><div class='add'>+</div><div class='ctx'> /* Read the data from whatever input you are using.  The default routine</div><div class='ctx'>  * reads from a file pointer.  Note that this routine sometimes gets called</div><div class='ctx'>  * with very small lengths, so you should implement some kind of simple</div><div class='hunk'>@@ -33,9 +32,10 @@ void /* PRIVATE */</div><div class='ctx'> png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(4, "reading %d bytes", (int)length);</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;read_data_fn != NULL)</div><div class='ctx'>       (*(png_ptr-&gt;read_data_fn))(png_ptr, data, length);</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       png_error(png_ptr, "Call to NULL read function");</div><div class='ctx'> }</div><div class='hunk'>@@ -46,14 +46,15 @@ png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'>  * read_data function and use it at run time with png_set_read_fn(), rather</div><div class='ctx'>  * than changing the library.</div><div class='ctx'>  */</div><div class='del'>-#ifndef USE_FAR_KEYWORD</div><div class='del'>-void PNGAPI</div><div class='add'>+#  ifndef USE_FAR_KEYWORD</div><div class='add'>+void PNGCBAPI</div><div class='ctx'> png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> {</div><div class='ctx'>    png_size_t check;</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    /* fread() returns 0 on error, so it is OK to store this in a png_size_t</div><div class='ctx'>     * instead of an int, which is what fread() actually returns.</div><div class='ctx'>     */</div><div class='hunk'>@@ -62,7 +63,7 @@ png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'>    if (check != length)</div><div class='ctx'>       png_error(png_ptr, "Read Error");</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='add'>+#  else</div><div class='ctx'> /* This is the model-independent version. Since the standard I/O library</div><div class='ctx'>    can't handle far buffers in the medium and small models, we have to copy</div><div class='ctx'>    the data.</div><div class='hunk'>@@ -71,7 +72,7 @@ png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> #define NEAR_BUF_SIZE 1024</div><div class='ctx'> #define MIN(a,b) (a &lt;= b ? a : b)</div><div class='ctx'> </div><div class='del'>-static void PNGAPI</div><div class='add'>+static void PNGCBAPI</div><div class='ctx'> png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> {</div><div class='ctx'>    png_size_t check;</div><div class='hunk'>@@ -80,46 +81,57 @@ png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    /* Check if data really is near. If so, use usual code. */</div><div class='ctx'>    n_data = (png_byte *)CVT_PTR_NOCHECK(data);</div><div class='ctx'>    io_ptr = (png_FILE_p)CVT_PTR(png_ptr-&gt;io_ptr);</div><div class='add'>+</div><div class='ctx'>    if ((png_bytep)n_data == data)</div><div class='ctx'>    {</div><div class='ctx'>       check = fread(n_data, 1, length, io_ptr);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='ctx'>       png_byte buf[NEAR_BUF_SIZE];</div><div class='ctx'>       png_size_t read, remaining, err;</div><div class='ctx'>       check = 0;</div><div class='ctx'>       remaining = length;</div><div class='add'>+</div><div class='ctx'>       do</div><div class='ctx'>       {</div><div class='ctx'>          read = MIN(NEAR_BUF_SIZE, remaining);</div><div class='ctx'>          err = fread(buf, 1, read, io_ptr);</div><div class='ctx'>          png_memcpy(data, buf, read); /* copy far buffer to near buffer */</div><div class='add'>+</div><div class='ctx'>          if (err != read)</div><div class='ctx'>             break;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             check += err;</div><div class='add'>+</div><div class='ctx'>          data += read;</div><div class='ctx'>          remaining -= read;</div><div class='ctx'>       }</div><div class='ctx'>       while (remaining != 0);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if ((png_uint_32)check != (png_uint_32)length)</div><div class='ctx'>       png_error(png_ptr, "read Error");</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* This function allows the application to supply a new input function</div><div class='ctx'>  * for libpng if standard C streams aren't being used.</div><div class='ctx'>  *</div><div class='ctx'>  * This function takes as its arguments:</div><div class='add'>+ *</div><div class='ctx'>  * png_ptr      - pointer to a png input data structure</div><div class='add'>+ *</div><div class='ctx'>  * io_ptr       - pointer to user supplied structure containing info about</div><div class='ctx'>  *                the input functions.  May be NULL.</div><div class='add'>+ *</div><div class='ctx'>  * read_data_fn - pointer to a new input function that takes as its</div><div class='ctx'>  *                arguments a pointer to a png_struct, a pointer to</div><div class='ctx'>  *                a location where input data can be stored, and a 32-bit</div><div class='hunk'>@@ -135,11 +147,13 @@ png_set_read_fn(png_structp png_ptr, png_voidp io_ptr,</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;io_ptr = io_ptr;</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_STDIO_SUPPORTED</div><div class='ctx'>    if (read_data_fn != NULL)</div><div class='ctx'>       png_ptr-&gt;read_data_fn = read_data_fn;</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       png_ptr-&gt;read_data_fn = png_default_read_data;</div><div class='ctx'> #else</div><div class='hunk'>@@ -151,9 +165,8 @@ png_set_read_fn(png_structp png_ptr, png_voidp io_ptr,</div><div class='ctx'>    {</div><div class='ctx'>       png_ptr-&gt;write_data_fn = NULL;</div><div class='ctx'>       png_warning(png_ptr,</div><div class='del'>-         "It's an error to set both read_data_fn and write_data_fn in the ");</div><div class='del'>-      png_warning(png_ptr,</div><div class='del'>-         "same structure.  Resetting write_data_fn to NULL");</div><div class='add'>+          "Can't set both read_data_fn and write_data_fn in the"</div><div class='add'>+          " same structure");</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_FLUSH_SUPPORTED</div><div class='head'>diff --git a/src/3rdparty/libpng/pngrtran.c b/src/3rdparty/libpng/pngrtran.c<br/>index 30aa5dc..e6e0c46 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngrtran.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngrtran.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngrtran.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngrtran.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> </div><div class='ctx'> /* pngrtran.c - transforms the data in a row for PNG readers</div><div class='ctx'>  *</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Last changed in libpng 1.5.1 [February 3, 2011]</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -16,17 +16,16 @@</div><div class='ctx'>  * in pngtrans.c.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define PNG_NO_PEDANTIC_WARNINGS</div><div class='del'>-#include "png.h"</div><div class='del'>-#ifdef PNG_READ_SUPPORTED</div><div class='ctx'> #include "pngpriv.h"</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_READ_SUPPORTED</div><div class='add'>+</div><div class='ctx'> /* Set the action on getting a CRC error for an ancillary or critical chunk. */</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_set_crc_action");</div><div class='del'>- </div><div class='add'>+</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='hunk'>@@ -89,18 +88,18 @@ png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action)</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(PNG_READ_BACKGROUND_SUPPORTED) &amp;&amp; \</div><div class='del'>-    defined(PNG_FLOATING_POINT_SUPPORTED)</div><div class='add'>+#ifdef PNG_READ_BACKGROUND_SUPPORTED</div><div class='ctx'> /* Handle alpha and tRNS via a background color */</div><div class='del'>-void PNGAPI</div><div class='del'>-png_set_background(png_structp png_ptr,</div><div class='del'>-   png_color_16p background_color, int background_gamma_code,</div><div class='del'>-   int need_expand, double background_gamma)</div><div class='add'>+void PNGFAPI</div><div class='add'>+png_set_background_fixed(png_structp png_ptr,</div><div class='add'>+    png_const_color_16p background_color, int background_gamma_code,</div><div class='add'>+    int need_expand, png_fixed_point background_gamma)</div><div class='ctx'> {</div><div class='del'>-   png_debug(1, "in png_set_background");</div><div class='del'>- </div><div class='add'>+   png_debug(1, "in png_set_background_fixed");</div><div class='add'>+</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Application must supply a known background gamma");</div><div class='hunk'>@@ -110,11 +109,22 @@ png_set_background(png_structp png_ptr,</div><div class='ctx'>    png_ptr-&gt;transformations |= PNG_BACKGROUND;</div><div class='ctx'>    png_memcpy(&amp;(png_ptr-&gt;background), background_color,</div><div class='ctx'>       png_sizeof(png_color_16));</div><div class='del'>-   png_ptr-&gt;background_gamma = (float)background_gamma;</div><div class='add'>+   png_ptr-&gt;background_gamma = background_gamma;</div><div class='ctx'>    png_ptr-&gt;background_gamma_type = (png_byte)(background_gamma_code);</div><div class='ctx'>    png_ptr-&gt;transformations |= (need_expand ? PNG_BACKGROUND_EXPAND : 0);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+void PNGAPI</div><div class='add'>+png_set_background(png_structp png_ptr,</div><div class='add'>+    png_const_color_16p background_color, int background_gamma_code,</div><div class='add'>+    int need_expand, double background_gamma)</div><div class='add'>+{</div><div class='add'>+   png_set_background_fixed(png_ptr, background_color, background_gamma_code,</div><div class='add'>+      need_expand, png_fixed(png_ptr, background_gamma, "png_set_background"));</div><div class='add'>+}</div><div class='add'>+#  endif  /* FLOATING_POINT */</div><div class='add'>+#endif /* READ_BACKGROUND */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_16_TO_8_SUPPORTED</div><div class='ctx'> /* Strip 16 bit depth files to 8 bit depth */</div><div class='hunk'>@@ -125,6 +135,7 @@ png_set_strip_16(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;transformations |= PNG_16_TO_8;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -137,17 +148,18 @@ png_set_strip_alpha(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;flags |= PNG_FLAG_STRIP_ALPHA;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_READ_DITHER_SUPPORTED</div><div class='add'>+#ifdef PNG_READ_QUANTIZE_SUPPORTED</div><div class='ctx'> /* Dither file to 8 bit.  Supply a palette, the current number</div><div class='ctx'>  * of elements in the palette, the maximum number of elements</div><div class='ctx'>  * allowed, and a histogram if possible.  If the current number</div><div class='ctx'>  * of colors is greater then the maximum number, the palette will be</div><div class='del'>- * modified to fit in the maximum number.  "full_dither" indicates</div><div class='del'>- * whether we need a dithering cube set up for RGB images, or if we</div><div class='add'>+ * modified to fit in the maximum number.  "full_quantize" indicates</div><div class='add'>+ * whether we need a quantizing cube set up for RGB images, or if we</div><div class='ctx'>  * simply are reducing the number of colors in a paletted image.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -161,24 +173,25 @@ typedef png_dsort FAR *       png_dsortp;</div><div class='ctx'> typedef png_dsort FAR * FAR * png_dsortpp;</div><div class='ctx'> </div><div class='ctx'> void PNGAPI</div><div class='del'>-png_set_dither(png_structp png_ptr, png_colorp palette,</div><div class='del'>-   int num_palette, int maximum_colors, png_uint_16p histogram,</div><div class='del'>-   int full_dither)</div><div class='add'>+png_set_quantize(png_structp png_ptr, png_colorp palette,</div><div class='add'>+    int num_palette, int maximum_colors, png_const_uint_16p histogram,</div><div class='add'>+    int full_quantize)</div><div class='ctx'> {</div><div class='del'>-   png_debug(1, "in png_set_dither");</div><div class='add'>+   png_debug(1, "in png_set_quantize");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='del'>-   png_ptr-&gt;transformations |= PNG_DITHER;</div><div class='ctx'> </div><div class='del'>-   if (!full_dither)</div><div class='add'>+   png_ptr-&gt;transformations |= PNG_QUANTIZE;</div><div class='add'>+</div><div class='add'>+   if (!full_quantize)</div><div class='ctx'>    {</div><div class='ctx'>       int i;</div><div class='ctx'> </div><div class='del'>-      png_ptr-&gt;dither_index = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-         (png_uint_32)(num_palette * png_sizeof(png_byte)));</div><div class='add'>+      png_ptr-&gt;quantize_index = (png_bytep)png_malloc(png_ptr,</div><div class='add'>+          (png_uint_32)(num_palette * png_sizeof(png_byte)));</div><div class='ctx'>       for (i = 0; i &lt; num_palette; i++)</div><div class='del'>-         png_ptr-&gt;dither_index[i] = (png_byte)i;</div><div class='add'>+         png_ptr-&gt;quantize_index[i] = (png_byte)i;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    if (num_palette &gt; maximum_colors)</div><div class='hunk'>@@ -192,12 +205,12 @@ png_set_dither(png_structp png_ptr, png_colorp palette,</div><div class='ctx'>          int i;</div><div class='ctx'> </div><div class='ctx'>          /* Initialize an array to sort colors */</div><div class='del'>-         png_ptr-&gt;dither_sort = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-            (png_uint_32)(num_palette * png_sizeof(png_byte)));</div><div class='add'>+         png_ptr-&gt;quantize_sort = (png_bytep)png_malloc(png_ptr,</div><div class='add'>+             (png_uint_32)(num_palette * png_sizeof(png_byte)));</div><div class='ctx'> </div><div class='del'>-         /* Initialize the dither_sort array */</div><div class='add'>+         /* Initialize the quantize_sort array */</div><div class='ctx'>          for (i = 0; i &lt; num_palette; i++)</div><div class='del'>-            png_ptr-&gt;dither_sort[i] = (png_byte)i;</div><div class='add'>+            png_ptr-&gt;quantize_sort[i] = (png_byte)i;</div><div class='ctx'> </div><div class='ctx'>          /* Find the least used palette entries by starting a</div><div class='ctx'>           * bubble sort, and running it until we have sorted</div><div class='hunk'>@@ -214,23 +227,24 @@ png_set_dither(png_structp png_ptr, png_colorp palette,</div><div class='ctx'>             done = 1;</div><div class='ctx'>             for (j = 0; j &lt; i; j++)</div><div class='ctx'>             {</div><div class='del'>-               if (histogram[png_ptr-&gt;dither_sort[j]]</div><div class='del'>-                   &lt; histogram[png_ptr-&gt;dither_sort[j + 1]])</div><div class='add'>+               if (histogram[png_ptr-&gt;quantize_sort[j]]</div><div class='add'>+                   &lt; histogram[png_ptr-&gt;quantize_sort[j + 1]])</div><div class='ctx'>                {</div><div class='ctx'>                   png_byte t;</div><div class='ctx'> </div><div class='del'>-                  t = png_ptr-&gt;dither_sort[j];</div><div class='del'>-                  png_ptr-&gt;dither_sort[j] = png_ptr-&gt;dither_sort[j + 1];</div><div class='del'>-                  png_ptr-&gt;dither_sort[j + 1] = t;</div><div class='add'>+                  t = png_ptr-&gt;quantize_sort[j];</div><div class='add'>+                  png_ptr-&gt;quantize_sort[j] = png_ptr-&gt;quantize_sort[j + 1];</div><div class='add'>+                  png_ptr-&gt;quantize_sort[j + 1] = t;</div><div class='ctx'>                   done = 0;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             if (done)</div><div class='ctx'>                break;</div><div class='ctx'>          }</div><div class='ctx'> </div><div class='ctx'>          /* Swap the palette around, and set up a table, if necessary */</div><div class='del'>-         if (full_dither)</div><div class='add'>+         if (full_quantize)</div><div class='ctx'>          {</div><div class='ctx'>             int j = num_palette;</div><div class='ctx'> </div><div class='hunk'>@@ -239,11 +253,12 @@ png_set_dither(png_structp png_ptr, png_colorp palette,</div><div class='ctx'>              */</div><div class='ctx'>             for (i = 0; i &lt; maximum_colors; i++)</div><div class='ctx'>             {</div><div class='del'>-               if ((int)png_ptr-&gt;dither_sort[i] &gt;= maximum_colors)</div><div class='add'>+               if ((int)png_ptr-&gt;quantize_sort[i] &gt;= maximum_colors)</div><div class='ctx'>                {</div><div class='ctx'>                   do</div><div class='ctx'>                      j--;</div><div class='del'>-                  while ((int)png_ptr-&gt;dither_sort[j] &gt;= maximum_colors);</div><div class='add'>+                  while ((int)png_ptr-&gt;quantize_sort[j] &gt;= maximum_colors);</div><div class='add'>+</div><div class='ctx'>                   palette[i] = palette[j];</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='hunk'>@@ -258,32 +273,32 @@ png_set_dither(png_structp png_ptr, png_colorp palette,</div><div class='ctx'>             for (i = 0; i &lt; maximum_colors; i++)</div><div class='ctx'>             {</div><div class='ctx'>                /* Only move the colors we need to */</div><div class='del'>-               if ((int)png_ptr-&gt;dither_sort[i] &gt;= maximum_colors)</div><div class='add'>+               if ((int)png_ptr-&gt;quantize_sort[i] &gt;= maximum_colors)</div><div class='ctx'>                {</div><div class='ctx'>                   png_color tmp_color;</div><div class='ctx'> </div><div class='ctx'>                   do</div><div class='ctx'>                      j--;</div><div class='del'>-                  while ((int)png_ptr-&gt;dither_sort[j] &gt;= maximum_colors);</div><div class='add'>+                  while ((int)png_ptr-&gt;quantize_sort[j] &gt;= maximum_colors);</div><div class='ctx'> </div><div class='ctx'>                   tmp_color = palette[j];</div><div class='ctx'>                   palette[j] = palette[i];</div><div class='ctx'>                   palette[i] = tmp_color;</div><div class='ctx'>                   /* Indicate where the color went */</div><div class='del'>-                  png_ptr-&gt;dither_index[j] = (png_byte)i;</div><div class='del'>-                  png_ptr-&gt;dither_index[i] = (png_byte)j;</div><div class='add'>+                  png_ptr-&gt;quantize_index[j] = (png_byte)i;</div><div class='add'>+                  png_ptr-&gt;quantize_index[i] = (png_byte)j;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'>             /* Find closest color for those colors we are not using */</div><div class='ctx'>             for (i = 0; i &lt; num_palette; i++)</div><div class='ctx'>             {</div><div class='del'>-               if ((int)png_ptr-&gt;dither_index[i] &gt;= maximum_colors)</div><div class='add'>+               if ((int)png_ptr-&gt;quantize_index[i] &gt;= maximum_colors)</div><div class='ctx'>                {</div><div class='ctx'>                   int min_d, k, min_k, d_index;</div><div class='ctx'> </div><div class='ctx'>                   /* Find the closest color to one we threw out */</div><div class='del'>-                  d_index = png_ptr-&gt;dither_index[i];</div><div class='add'>+                  d_index = png_ptr-&gt;quantize_index[i];</div><div class='ctx'>                   min_d = PNG_COLOR_DIST(palette[d_index], palette[0]);</div><div class='ctx'>                   for (k = 1, min_k = 0; k &lt; maximum_colors; k++)</div><div class='ctx'>                   {</div><div class='hunk'>@@ -298,12 +313,12 @@ png_set_dither(png_structp png_ptr, png_colorp palette,</div><div class='ctx'>                      }</div><div class='ctx'>                   }</div><div class='ctx'>                   /* Point to closest color */</div><div class='del'>-                  png_ptr-&gt;dither_index[i] = (png_byte)min_k;</div><div class='add'>+                  png_ptr-&gt;quantize_index[i] = (png_byte)min_k;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='del'>-         png_free(png_ptr, png_ptr-&gt;dither_sort);</div><div class='del'>-         png_ptr-&gt;dither_sort = NULL;</div><div class='add'>+         png_free(png_ptr, png_ptr-&gt;quantize_sort);</div><div class='add'>+         png_ptr-&gt;quantize_sort = NULL;</div><div class='ctx'>       }</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='hunk'>@@ -325,9 +340,9 @@ png_set_dither(png_structp png_ptr, png_colorp palette,</div><div class='ctx'> </div><div class='ctx'>          /* Initialize palette index arrays */</div><div class='ctx'>          png_ptr-&gt;index_to_palette = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-            (png_uint_32)(num_palette * png_sizeof(png_byte)));</div><div class='add'>+             (png_uint_32)(num_palette * png_sizeof(png_byte)));</div><div class='ctx'>          png_ptr-&gt;palette_to_index = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-            (png_uint_32)(num_palette * png_sizeof(png_byte)));</div><div class='add'>+             (png_uint_32)(num_palette * png_sizeof(png_byte)));</div><div class='ctx'> </div><div class='ctx'>          /* Initialize the sort array */</div><div class='ctx'>          for (i = 0; i &lt; num_palette; i++)</div><div class='hunk'>@@ -337,7 +352,7 @@ png_set_dither(png_structp png_ptr, png_colorp palette,</div><div class='ctx'>          }</div><div class='ctx'> </div><div class='ctx'>          hash = (png_dsortpp)png_calloc(png_ptr, (png_uint_32)(769 *</div><div class='del'>-            png_sizeof(png_dsortp)));</div><div class='add'>+             png_sizeof(png_dsortp)));</div><div class='ctx'> </div><div class='ctx'>          num_new_palette = num_palette;</div><div class='ctx'> </div><div class='hunk'>@@ -368,8 +383,10 @@ png_set_dither(png_structp png_ptr, png_colorp palette,</div><div class='ctx'> </div><div class='ctx'>                      t = (png_dsortp)png_malloc_warn(png_ptr,</div><div class='ctx'>                          (png_uint_32)(png_sizeof(png_dsort)));</div><div class='add'>+</div><div class='ctx'>                      if (t == NULL)</div><div class='ctx'>                          break;</div><div class='add'>+</div><div class='ctx'>                      t-&gt;next = hash[d];</div><div class='ctx'>                      t-&gt;left = (png_byte)i;</div><div class='ctx'>                      t-&gt;right = (png_byte)j;</div><div class='hunk'>@@ -390,9 +407,9 @@ png_set_dither(png_structp png_ptr, png_colorp palette,</div><div class='ctx'>                   for (p = hash[i]; p; p = p-&gt;next)</div><div class='ctx'>                   {</div><div class='ctx'>                      if ((int)png_ptr-&gt;index_to_palette[p-&gt;left]</div><div class='del'>-                        &lt; num_new_palette &amp;&amp;</div><div class='del'>-                        (int)png_ptr-&gt;index_to_palette[p-&gt;right]</div><div class='del'>-                        &lt; num_new_palette)</div><div class='add'>+                         &lt; num_new_palette &amp;&amp;</div><div class='add'>+                         (int)png_ptr-&gt;index_to_palette[p-&gt;right]</div><div class='add'>+                         &lt; num_new_palette)</div><div class='ctx'>                      {</div><div class='ctx'>                         int j, next_j;</div><div class='ctx'> </div><div class='hunk'>@@ -409,31 +426,36 @@ png_set_dither(png_structp png_ptr, png_colorp palette,</div><div class='ctx'> </div><div class='ctx'>                         num_new_palette--;</div><div class='ctx'>                         palette[png_ptr-&gt;index_to_palette[j]]</div><div class='del'>-                          = palette[num_new_palette];</div><div class='del'>-                        if (!full_dither)</div><div class='add'>+                            = palette[num_new_palette];</div><div class='add'>+                        if (!full_quantize)</div><div class='ctx'>                         {</div><div class='ctx'>                            int k;</div><div class='ctx'> </div><div class='ctx'>                            for (k = 0; k &lt; num_palette; k++)</div><div class='ctx'>                            {</div><div class='del'>-                              if (png_ptr-&gt;dither_index[k] ==</div><div class='del'>-                                 png_ptr-&gt;index_to_palette[j])</div><div class='del'>-                                 png_ptr-&gt;dither_index[k] =</div><div class='del'>-                                    png_ptr-&gt;index_to_palette[next_j];</div><div class='del'>-                              if ((int)png_ptr-&gt;dither_index[k] ==</div><div class='del'>-                                 num_new_palette)</div><div class='del'>-                                 png_ptr-&gt;dither_index[k] =</div><div class='del'>-                                    png_ptr-&gt;index_to_palette[j];</div><div class='add'>+                              if (png_ptr-&gt;quantize_index[k] ==</div><div class='add'>+                                  png_ptr-&gt;index_to_palette[j])</div><div class='add'>+                                 png_ptr-&gt;quantize_index[k] =</div><div class='add'>+                                     png_ptr-&gt;index_to_palette[next_j];</div><div class='add'>+</div><div class='add'>+                              if ((int)png_ptr-&gt;quantize_index[k] ==</div><div class='add'>+                                  num_new_palette)</div><div class='add'>+                                 png_ptr-&gt;quantize_index[k] =</div><div class='add'>+                                     png_ptr-&gt;index_to_palette[j];</div><div class='ctx'>                            }</div><div class='ctx'>                         }</div><div class='ctx'> </div><div class='ctx'>                         png_ptr-&gt;index_to_palette[png_ptr-&gt;palette_to_index</div><div class='del'>-                           [num_new_palette]] = png_ptr-&gt;index_to_palette[j];</div><div class='add'>+                            [num_new_palette]] = png_ptr-&gt;index_to_palette[j];</div><div class='add'>+</div><div class='ctx'>                         png_ptr-&gt;palette_to_index[png_ptr-&gt;index_to_palette[j]]</div><div class='del'>-                           = png_ptr-&gt;palette_to_index[num_new_palette];</div><div class='add'>+                            = png_ptr-&gt;palette_to_index[num_new_palette];</div><div class='add'>+</div><div class='add'>+                        png_ptr-&gt;index_to_palette[j] =</div><div class='add'>+                            (png_byte)num_new_palette;</div><div class='ctx'> </div><div class='del'>-                        png_ptr-&gt;index_to_palette[j] = (png_byte)num_new_palette;</div><div class='del'>-                        png_ptr-&gt;palette_to_index[num_new_palette] = (png_byte)j;</div><div class='add'>+                        png_ptr-&gt;palette_to_index[num_new_palette] =</div><div class='add'>+                            (png_byte)j;</div><div class='ctx'>                      }</div><div class='ctx'>                      if (num_new_palette &lt;= maximum_colors)</div><div class='ctx'>                         break;</div><div class='hunk'>@@ -473,36 +495,38 @@ png_set_dither(png_structp png_ptr, png_colorp palette,</div><div class='ctx'>    }</div><div class='ctx'>    png_ptr-&gt;num_palette = (png_uint_16)num_palette;</div><div class='ctx'> </div><div class='del'>-   if (full_dither)</div><div class='add'>+   if (full_quantize)</div><div class='ctx'>    {</div><div class='ctx'>       int i;</div><div class='ctx'>       png_bytep distance;</div><div class='del'>-      int total_bits = PNG_DITHER_RED_BITS + PNG_DITHER_GREEN_BITS +</div><div class='del'>-         PNG_DITHER_BLUE_BITS;</div><div class='del'>-      int num_red = (1 &lt;&lt; PNG_DITHER_RED_BITS);</div><div class='del'>-      int num_green = (1 &lt;&lt; PNG_DITHER_GREEN_BITS);</div><div class='del'>-      int num_blue = (1 &lt;&lt; PNG_DITHER_BLUE_BITS);</div><div class='add'>+      int total_bits = PNG_QUANTIZE_RED_BITS + PNG_QUANTIZE_GREEN_BITS +</div><div class='add'>+          PNG_QUANTIZE_BLUE_BITS;</div><div class='add'>+      int num_red = (1 &lt;&lt; PNG_QUANTIZE_RED_BITS);</div><div class='add'>+      int num_green = (1 &lt;&lt; PNG_QUANTIZE_GREEN_BITS);</div><div class='add'>+      int num_blue = (1 &lt;&lt; PNG_QUANTIZE_BLUE_BITS);</div><div class='ctx'>       png_size_t num_entries = ((png_size_t)1 &lt;&lt; total_bits);</div><div class='ctx'> </div><div class='del'>-      png_ptr-&gt;palette_lookup = (png_bytep )png_calloc(png_ptr,</div><div class='del'>-         (png_uint_32)(num_entries * png_sizeof(png_byte)));</div><div class='add'>+      png_ptr-&gt;palette_lookup = (png_bytep)png_calloc(png_ptr,</div><div class='add'>+          (png_uint_32)(num_entries * png_sizeof(png_byte)));</div><div class='ctx'> </div><div class='ctx'>       distance = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_entries *</div><div class='del'>-         png_sizeof(png_byte)));</div><div class='add'>+          png_sizeof(png_byte)));</div><div class='add'>+</div><div class='ctx'>       png_memset(distance, 0xff, num_entries * png_sizeof(png_byte));</div><div class='ctx'> </div><div class='ctx'>       for (i = 0; i &lt; num_palette; i++)</div><div class='ctx'>       {</div><div class='ctx'>          int ir, ig, ib;</div><div class='del'>-         int r = (palette[i].red &gt;&gt; (8 - PNG_DITHER_RED_BITS));</div><div class='del'>-         int g = (palette[i].green &gt;&gt; (8 - PNG_DITHER_GREEN_BITS));</div><div class='del'>-         int b = (palette[i].blue &gt;&gt; (8 - PNG_DITHER_BLUE_BITS));</div><div class='add'>+         int r = (palette[i].red &gt;&gt; (8 - PNG_QUANTIZE_RED_BITS));</div><div class='add'>+         int g = (palette[i].green &gt;&gt; (8 - PNG_QUANTIZE_GREEN_BITS));</div><div class='add'>+         int b = (palette[i].blue &gt;&gt; (8 - PNG_QUANTIZE_BLUE_BITS));</div><div class='ctx'> </div><div class='ctx'>          for (ir = 0; ir &lt; num_red; ir++)</div><div class='ctx'>          {</div><div class='ctx'>             /* int dr = abs(ir - r); */</div><div class='ctx'>             int dr = ((ir &gt; r) ? ir - r : r - ir);</div><div class='del'>-            int index_r = (ir &lt;&lt; (PNG_DITHER_BLUE_BITS + PNG_DITHER_GREEN_BITS));</div><div class='add'>+            int index_r = (ir &lt;&lt; (PNG_QUANTIZE_BLUE_BITS +</div><div class='add'>+                PNG_QUANTIZE_GREEN_BITS));</div><div class='ctx'> </div><div class='ctx'>             for (ig = 0; ig &lt; num_green; ig++)</div><div class='ctx'>             {</div><div class='hunk'>@@ -510,7 +534,7 @@ png_set_dither(png_structp png_ptr, png_colorp palette,</div><div class='ctx'>                int dg = ((ig &gt; g) ? ig - g : g - ig);</div><div class='ctx'>                int dt = dr + dg;</div><div class='ctx'>                int dm = ((dr &gt; dg) ? dr : dg);</div><div class='del'>-               int index_g = index_r | (ig &lt;&lt; PNG_DITHER_BLUE_BITS);</div><div class='add'>+               int index_g = index_r | (ig &lt;&lt; PNG_QUANTIZE_BLUE_BITS);</div><div class='ctx'> </div><div class='ctx'>                for (ib = 0; ib &lt; num_blue; ib++)</div><div class='ctx'>                {</div><div class='hunk'>@@ -533,9 +557,9 @@ png_set_dither(png_structp png_ptr, png_colorp palette,</div><div class='ctx'>       png_free(png_ptr, distance);</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+#endif /* PNG_READ_QUANTIZE_SUPPORTED */</div><div class='ctx'> </div><div class='del'>-#if defined(PNG_READ_GAMMA_SUPPORTED) &amp;&amp; defined(PNG_FLOATING_POINT_SUPPORTED)</div><div class='add'>+#ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='ctx'> /* Transform the image from the file_gamma to the screen_gamma.  We</div><div class='ctx'>  * only do transformations on images where the file_gamma and screen_gamma</div><div class='ctx'>  * are not close reciprocals, otherwise it slows things down slightly, and</div><div class='hunk'>@@ -545,22 +569,48 @@ png_set_dither(png_structp png_ptr, png_colorp palette,</div><div class='ctx'>  * are present in the tRNS array for palette images.  We can't do it here</div><div class='ctx'>  * because we don't necessarily have the tRNS chunk yet.</div><div class='ctx'>  */</div><div class='del'>-void PNGAPI</div><div class='del'>-png_set_gamma(png_structp png_ptr, double scrn_gamma, double file_gamma)</div><div class='add'>+static int /* PRIVATE */</div><div class='add'>+png_gamma_threshold(png_fixed_point scrn_gamma, png_fixed_point file_gamma)</div><div class='ctx'> {</div><div class='del'>-   png_debug(1, "in png_set_gamma");</div><div class='add'>+   /* PNG_GAMMA_THRESHOLD is the threshold for performing gamma</div><div class='add'>+    * correction as a difference of the overall transform from 1.0</div><div class='add'>+    *</div><div class='add'>+    * We want to compare the threshold with s*f - 1, if we get</div><div class='add'>+    * overflow here it is because of wacky gamma values so we</div><div class='add'>+    * turn on processing anyway.</div><div class='add'>+    */</div><div class='add'>+   png_fixed_point gtest;</div><div class='add'>+   return !png_muldiv(&amp;gtest, scrn_gamma, file_gamma, PNG_FP_1) ||</div><div class='add'>+       png_gamma_significant(gtest);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void PNGFAPI</div><div class='add'>+png_set_gamma_fixed(png_structp png_ptr, png_fixed_point scrn_gamma,</div><div class='add'>+   png_fixed_point file_gamma)</div><div class='add'>+{</div><div class='add'>+   png_debug(1, "in png_set_gamma_fixed");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='del'>-   if ((fabs(scrn_gamma * file_gamma - 1.0) &gt; PNG_GAMMA_THRESHOLD) ||</div><div class='del'>-       (png_ptr-&gt;color_type &amp; PNG_COLOR_MASK_ALPHA) ||</div><div class='del'>-       (png_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE))</div><div class='del'>-     png_ptr-&gt;transformations |= PNG_GAMMA;</div><div class='del'>-   png_ptr-&gt;gamma = (float)file_gamma;</div><div class='del'>-   png_ptr-&gt;screen_gamma = (float)scrn_gamma;</div><div class='add'>+   if ((png_ptr-&gt;color_type &amp; PNG_COLOR_MASK_ALPHA) ||</div><div class='add'>+       (png_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE) ||</div><div class='add'>+       png_gamma_threshold(scrn_gamma, file_gamma))</div><div class='add'>+      png_ptr-&gt;transformations |= PNG_GAMMA;</div><div class='add'>+   png_ptr-&gt;gamma = file_gamma;</div><div class='add'>+   png_ptr-&gt;screen_gamma = scrn_gamma;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+void PNGAPI</div><div class='add'>+png_set_gamma(png_structp png_ptr, double scrn_gamma, double file_gamma)</div><div class='add'>+{</div><div class='add'>+   png_set_gamma_fixed(png_ptr,</div><div class='add'>+      png_fixed(png_ptr, scrn_gamma, "png_set_gamma screen gamma"),</div><div class='add'>+      png_fixed(png_ptr, file_gamma, "png_set_gamma file gamma"));</div><div class='add'>+}</div><div class='add'>+#  endif /* FLOATING_POINT_SUPPORTED */</div><div class='add'>+#endif /* READ_GAMMA */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_EXPAND_SUPPORTED</div><div class='ctx'> /* Expand paletted images to RGB, expand grayscale images of</div><div class='hunk'>@@ -642,32 +692,20 @@ png_set_gray_to_rgb(png_structp png_ptr)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_set_gray_to_rgb");</div><div class='ctx'> </div><div class='del'>-   png_ptr-&gt;transformations |= PNG_GRAY_TO_RGB;</div><div class='del'>-   png_ptr-&gt;flags &amp;= ~PNG_FLAG_ROW_INIT;</div><div class='add'>+   if (png_ptr != NULL)</div><div class='add'>+   {</div><div class='add'>+      /* Because rgb must be 8 bits or more: */</div><div class='add'>+      png_set_expand_gray_1_2_4_to_8(png_ptr);</div><div class='add'>+      png_ptr-&gt;transformations |= PNG_GRAY_TO_RGB;</div><div class='add'>+      png_ptr-&gt;flags &amp;= ~PNG_FLAG_ROW_INIT;</div><div class='add'>+   }</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-/* Convert a RGB image to a grayscale of the same width.  This allows us,</div><div class='del'>- * for example, to convert a 24 bpp RGB image into an 8 bpp grayscale image.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void PNGAPI</div><div class='del'>-png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red,</div><div class='del'>-   double green)</div><div class='del'>-{</div><div class='del'>-   int red_fixed = (int)((float)red*100000.0 + 0.5);</div><div class='del'>-   int green_fixed = (int)((float)green*100000.0 + 0.5);</div><div class='del'>-   if (png_ptr == NULL)</div><div class='del'>-      return;</div><div class='del'>-   png_set_rgb_to_gray_fixed(png_ptr, error_action, red_fixed, green_fixed);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void PNGAPI</div><div class='add'>+void PNGFAPI</div><div class='ctx'> png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,</div><div class='del'>-   png_fixed_point red, png_fixed_point green)</div><div class='add'>+    png_fixed_point red, png_fixed_point green)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_set_rgb_to_gray");</div><div class='ctx'> </div><div class='hunk'>@@ -676,13 +714,21 @@ png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,</div><div class='ctx'> </div><div class='ctx'>    switch(error_action)</div><div class='ctx'>    {</div><div class='del'>-      case 1: png_ptr-&gt;transformations |= PNG_RGB_TO_GRAY;</div><div class='del'>-              break;</div><div class='add'>+      case 1:</div><div class='add'>+         png_ptr-&gt;transformations |= PNG_RGB_TO_GRAY;</div><div class='add'>+         break;</div><div class='ctx'> </div><div class='del'>-      case 2: png_ptr-&gt;transformations |= PNG_RGB_TO_GRAY_WARN;</div><div class='del'>-              break;</div><div class='add'>+      case 2:</div><div class='add'>+         png_ptr-&gt;transformations |= PNG_RGB_TO_GRAY_WARN;</div><div class='add'>+         break;</div><div class='ctx'> </div><div class='del'>-      case 3: png_ptr-&gt;transformations |= PNG_RGB_TO_GRAY_ERR;</div><div class='add'>+      case 3:</div><div class='add'>+         png_ptr-&gt;transformations |= PNG_RGB_TO_GRAY_ERR;</div><div class='add'>+         break;</div><div class='add'>+</div><div class='add'>+      default:</div><div class='add'>+         png_error(png_ptr, "invalid error action to rgb_to_gray");</div><div class='add'>+         break;</div><div class='ctx'>    }</div><div class='ctx'>    if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'> #ifdef PNG_READ_EXPAND_SUPPORTED</div><div class='hunk'>@@ -691,6 +737,7 @@ png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr,</div><div class='ctx'>         "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED");</div><div class='add'>+</div><div class='ctx'>       png_ptr-&gt;transformations &amp;= ~PNG_RGB_TO_GRAY;</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -701,30 +748,52 @@ png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,</div><div class='ctx'>          red_int   =  6968; /* .212671 * 32768 + .5 */</div><div class='ctx'>          green_int = 23434; /* .715160 * 32768 + .5 */</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if (red + green &lt; 100000L)</div><div class='ctx'>       {</div><div class='ctx'>          red_int = (png_uint_16)(((png_uint_32)red*32768L)/100000L);</div><div class='ctx'>          green_int = (png_uint_16)(((png_uint_32)green*32768L)/100000L);</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr, "ignoring out of range rgb_to_gray coefficients");</div><div class='ctx'>          red_int   =  6968;</div><div class='ctx'>          green_int = 23434;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       png_ptr-&gt;rgb_to_gray_red_coeff   = red_int;</div><div class='ctx'>       png_ptr-&gt;rgb_to_gray_green_coeff = green_int;</div><div class='ctx'>       png_ptr-&gt;rgb_to_gray_blue_coeff  =</div><div class='del'>-         (png_uint_16)(32768 - red_int - green_int);</div><div class='add'>+          (png_uint_16)(32768 - red_int - green_int);</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+/* Convert a RGB image to a grayscale of the same width.  This allows us,</div><div class='add'>+ * for example, to convert a 24 bpp RGB image into an 8 bpp grayscale image.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void PNGAPI</div><div class='add'>+png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red,</div><div class='add'>+   double green)</div><div class='add'>+{</div><div class='add'>+   if (png_ptr == NULL)</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   png_set_rgb_to_gray_fixed(png_ptr, error_action,</div><div class='add'>+      png_fixed(png_ptr, red, "rgb to gray red coefficient"),</div><div class='add'>+      png_fixed(png_ptr, green, "rgb to gray green coefficient"));</div><div class='add'>+}</div><div class='add'>+#endif /* FLOATING POINT */</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \</div><div class='ctx'>     defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_read_user_transform_fn(png_structp png_ptr, png_user_transform_ptr</div><div class='del'>-   read_user_transform_fn)</div><div class='add'>+    read_user_transform_fn)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_set_read_user_transform_fn");</div><div class='ctx'> </div><div class='hunk'>@@ -747,8 +816,9 @@ png_init_read_transformations(png_structp png_ptr)</div><div class='ctx'>    png_debug(1, "in png_init_read_transformations");</div><div class='ctx'> </div><div class='ctx'>   {</div><div class='del'>-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || defined(PNG_READ_SHIFT_SUPPORTED) \</div><div class='del'>- || defined(PNG_READ_GAMMA_SUPPORTED)</div><div class='add'>+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \</div><div class='add'>+    defined(PNG_READ_SHIFT_SUPPORTED) || \</div><div class='add'>+    defined(PNG_READ_GAMMA_SUPPORTED)</div><div class='ctx'>    int color_type = png_ptr-&gt;color_type;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -768,15 +838,17 @@ png_init_read_transformations(png_structp png_ptr)</div><div class='ctx'>    if ((png_ptr-&gt;transformations &amp; PNG_BACKGROUND_EXPAND) &amp;&amp;</div><div class='ctx'>        !(color_type &amp; PNG_COLOR_MASK_COLOR))</div><div class='ctx'>    {</div><div class='del'>-          png_ptr-&gt;mode |= PNG_BACKGROUND_IS_GRAY;</div><div class='del'>-   } else if ((png_ptr-&gt;transformations &amp; PNG_BACKGROUND) &amp;&amp;</div><div class='del'>-              !(png_ptr-&gt;transformations &amp; PNG_BACKGROUND_EXPAND) &amp;&amp;</div><div class='del'>-              (png_ptr-&gt;transformations &amp; PNG_GRAY_TO_RGB) &amp;&amp;</div><div class='del'>-              png_ptr-&gt;background.red == png_ptr-&gt;background.green &amp;&amp;</div><div class='del'>-              png_ptr-&gt;background.red == png_ptr-&gt;background.blue)</div><div class='add'>+      png_ptr-&gt;mode |= PNG_BACKGROUND_IS_GRAY;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   else if ((png_ptr-&gt;transformations &amp; PNG_BACKGROUND) &amp;&amp;</div><div class='add'>+       !(png_ptr-&gt;transformations &amp; PNG_BACKGROUND_EXPAND) &amp;&amp;</div><div class='add'>+       (png_ptr-&gt;transformations &amp; PNG_GRAY_TO_RGB) &amp;&amp;</div><div class='add'>+       png_ptr-&gt;background.red == png_ptr-&gt;background.green &amp;&amp;</div><div class='add'>+       png_ptr-&gt;background.red == png_ptr-&gt;background.blue)</div><div class='ctx'>    {</div><div class='del'>-          png_ptr-&gt;mode |= PNG_BACKGROUND_IS_GRAY;</div><div class='del'>-          png_ptr-&gt;background.gray = png_ptr-&gt;background.red;</div><div class='add'>+      png_ptr-&gt;mode |= PNG_BACKGROUND_IS_GRAY;</div><div class='add'>+      png_ptr-&gt;background.gray = png_ptr-&gt;background.red;</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -791,55 +863,57 @@ png_init_read_transformations(png_structp png_ptr)</div><div class='ctx'>             case 1:</div><div class='ctx'>                png_ptr-&gt;background.gray *= (png_uint_16)0xff;</div><div class='ctx'>                png_ptr-&gt;background.red = png_ptr-&gt;background.green</div><div class='del'>-                 =  png_ptr-&gt;background.blue = png_ptr-&gt;background.gray;</div><div class='add'>+                   =  png_ptr-&gt;background.blue = png_ptr-&gt;background.gray;</div><div class='ctx'>                if (!(png_ptr-&gt;transformations &amp; PNG_EXPAND_tRNS))</div><div class='ctx'>                {</div><div class='ctx'>                  png_ptr-&gt;trans_color.gray *= (png_uint_16)0xff;</div><div class='ctx'>                  png_ptr-&gt;trans_color.red = png_ptr-&gt;trans_color.green</div><div class='del'>-                   = png_ptr-&gt;trans_color.blue = png_ptr-&gt;trans_color.gray;</div><div class='add'>+                     = png_ptr-&gt;trans_color.blue = png_ptr-&gt;trans_color.gray;</div><div class='ctx'>                }</div><div class='ctx'>                break;</div><div class='ctx'> </div><div class='ctx'>             case 2:</div><div class='ctx'>                png_ptr-&gt;background.gray *= (png_uint_16)0x55;</div><div class='ctx'>                png_ptr-&gt;background.red = png_ptr-&gt;background.green</div><div class='del'>-                 = png_ptr-&gt;background.blue = png_ptr-&gt;background.gray;</div><div class='add'>+                   = png_ptr-&gt;background.blue = png_ptr-&gt;background.gray;</div><div class='ctx'>                if (!(png_ptr-&gt;transformations &amp; PNG_EXPAND_tRNS))</div><div class='ctx'>                {</div><div class='del'>-                 png_ptr-&gt;trans_color.gray *= (png_uint_16)0x55;</div><div class='del'>-                 png_ptr-&gt;trans_color.red = png_ptr-&gt;trans_color.green</div><div class='del'>-                   = png_ptr-&gt;trans_color.blue = png_ptr-&gt;trans_color.gray;</div><div class='add'>+                  png_ptr-&gt;trans_color.gray *= (png_uint_16)0x55;</div><div class='add'>+                  png_ptr-&gt;trans_color.red = png_ptr-&gt;trans_color.green</div><div class='add'>+                      = png_ptr-&gt;trans_color.blue = png_ptr-&gt;trans_color.gray;</div><div class='ctx'>                }</div><div class='ctx'>                break;</div><div class='ctx'> </div><div class='ctx'>             case 4:</div><div class='ctx'>                png_ptr-&gt;background.gray *= (png_uint_16)0x11;</div><div class='ctx'>                png_ptr-&gt;background.red = png_ptr-&gt;background.green</div><div class='del'>-                 = png_ptr-&gt;background.blue = png_ptr-&gt;background.gray;</div><div class='add'>+                   = png_ptr-&gt;background.blue = png_ptr-&gt;background.gray;</div><div class='ctx'>                if (!(png_ptr-&gt;transformations &amp; PNG_EXPAND_tRNS))</div><div class='ctx'>                {</div><div class='del'>-                 png_ptr-&gt;trans_color.gray *= (png_uint_16)0x11;</div><div class='del'>-                 png_ptr-&gt;trans_color.red = png_ptr-&gt;trans_color.green</div><div class='del'>-                   = png_ptr-&gt;trans_color.blue = png_ptr-&gt;trans_color.gray;</div><div class='add'>+                  png_ptr-&gt;trans_color.gray *= (png_uint_16)0x11;</div><div class='add'>+                  png_ptr-&gt;trans_color.red = png_ptr-&gt;trans_color.green</div><div class='add'>+                      = png_ptr-&gt;trans_color.blue = png_ptr-&gt;trans_color.gray;</div><div class='ctx'>                }</div><div class='ctx'>                break;</div><div class='ctx'> </div><div class='add'>+            default:</div><div class='add'>+</div><div class='ctx'>             case 8:</div><div class='ctx'> </div><div class='ctx'>             case 16:</div><div class='ctx'>                png_ptr-&gt;background.red = png_ptr-&gt;background.green</div><div class='del'>-                 = png_ptr-&gt;background.blue = png_ptr-&gt;background.gray;</div><div class='add'>+                   = png_ptr-&gt;background.blue = png_ptr-&gt;background.gray;</div><div class='ctx'>                break;</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='ctx'>       else if (color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>       {</div><div class='ctx'>          png_ptr-&gt;background.red   =</div><div class='del'>-            png_ptr-&gt;palette[png_ptr-&gt;background.index].red;</div><div class='add'>+             png_ptr-&gt;palette[png_ptr-&gt;background.index].red;</div><div class='ctx'>          png_ptr-&gt;background.green =</div><div class='del'>-            png_ptr-&gt;palette[png_ptr-&gt;background.index].green;</div><div class='add'>+             png_ptr-&gt;palette[png_ptr-&gt;background.index].green;</div><div class='ctx'>          png_ptr-&gt;background.blue  =</div><div class='del'>-            png_ptr-&gt;palette[png_ptr-&gt;background.index].blue;</div><div class='add'>+             png_ptr-&gt;palette[png_ptr-&gt;background.index].blue;</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED</div><div class='ctx'>         if (png_ptr-&gt;transformations &amp; PNG_INVERT_ALPHA)</div><div class='hunk'>@@ -848,13 +922,14 @@ png_init_read_transformations(png_structp png_ptr)</div><div class='ctx'>            if (!(png_ptr-&gt;transformations &amp; PNG_EXPAND_tRNS))</div><div class='ctx'> #endif</div><div class='ctx'>            {</div><div class='del'>-           /* Invert the alpha channel (in tRNS) unless the pixels are</div><div class='del'>-            * going to be expanded, in which case leave it for later</div><div class='del'>-            */</div><div class='add'>+              /* Invert the alpha channel (in tRNS) unless the pixels are</div><div class='add'>+               * going to be expanded, in which case leave it for later</div><div class='add'>+               */</div><div class='ctx'>               int i, istop;</div><div class='ctx'>               istop=(int)png_ptr-&gt;num_trans;</div><div class='ctx'>               for (i=0; i&lt;istop; i++)</div><div class='del'>-                 png_ptr-&gt;trans_alpha[i] = (png_byte)(255 - png_ptr-&gt;trans_alpha[i]);</div><div class='add'>+                 png_ptr-&gt;trans_alpha[i] = (png_byte)(255 -</div><div class='add'>+                    png_ptr-&gt;trans_alpha[i]);</div><div class='ctx'>            }</div><div class='ctx'>         }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -866,25 +941,24 @@ png_init_read_transformations(png_structp png_ptr)</div><div class='ctx'> #if defined(PNG_READ_BACKGROUND_SUPPORTED) &amp;&amp; defined(PNG_READ_GAMMA_SUPPORTED)</div><div class='ctx'>    png_ptr-&gt;background_1 = png_ptr-&gt;background;</div><div class='ctx'> #endif</div><div class='del'>-#if defined(PNG_READ_GAMMA_SUPPORTED) &amp;&amp; defined(PNG_FLOATING_POINT_SUPPORTED)</div><div class='add'>+#ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='ctx'> </div><div class='ctx'>    if ((color_type == PNG_COLOR_TYPE_PALETTE &amp;&amp; png_ptr-&gt;num_trans != 0)</div><div class='del'>-       &amp;&amp; (fabs(png_ptr-&gt;screen_gamma * png_ptr-&gt;gamma - 1.0)</div><div class='del'>-         &lt; PNG_GAMMA_THRESHOLD))</div><div class='add'>+       &amp;&amp; png_gamma_threshold(png_ptr-&gt;screen_gamma, png_ptr-&gt;gamma))</div><div class='ctx'>    {</div><div class='del'>-    int i, k;</div><div class='del'>-    k=0;</div><div class='del'>-    for (i=0; i&lt;png_ptr-&gt;num_trans; i++)</div><div class='del'>-    {</div><div class='del'>-      if (png_ptr-&gt;trans_alpha[i] != 0 &amp;&amp; png_ptr-&gt;trans_alpha[i] != 0xff)</div><div class='del'>-        k=1; /* Partial transparency is present */</div><div class='del'>-    }</div><div class='del'>-    if (k == 0)</div><div class='del'>-      png_ptr-&gt;transformations &amp;= ~PNG_GAMMA;</div><div class='add'>+      int i, k;</div><div class='add'>+      k=0;</div><div class='add'>+      for (i=0; i&lt;png_ptr-&gt;num_trans; i++)</div><div class='add'>+      {</div><div class='add'>+        if (png_ptr-&gt;trans_alpha[i] != 0 &amp;&amp; png_ptr-&gt;trans_alpha[i] != 0xff)</div><div class='add'>+           k=1; /* Partial transparency is present */</div><div class='add'>+      }</div><div class='add'>+      if (k == 0)</div><div class='add'>+         png_ptr-&gt;transformations &amp;= ~PNG_GAMMA;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    if ((png_ptr-&gt;transformations &amp; (PNG_GAMMA | PNG_RGB_TO_GRAY)) &amp;&amp;</div><div class='del'>-        png_ptr-&gt;gamma != 0.0)</div><div class='add'>+       png_ptr-&gt;gamma != 0)</div><div class='ctx'>    {</div><div class='ctx'>       png_build_gamma_table(png_ptr, png_ptr-&gt;bit_depth);</div><div class='ctx'> </div><div class='hunk'>@@ -893,13 +967,14 @@ png_init_read_transformations(png_structp png_ptr)</div><div class='ctx'>       {</div><div class='ctx'>          if (color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>          {</div><div class='del'>-           /* Could skip if no transparency */</div><div class='add'>+            /* Could skip if no transparency */</div><div class='ctx'>             png_color back, back_1;</div><div class='ctx'>             png_colorp palette = png_ptr-&gt;palette;</div><div class='ctx'>             int num_palette = png_ptr-&gt;num_palette;</div><div class='ctx'>             int i;</div><div class='ctx'>             if (png_ptr-&gt;background_gamma_type == PNG_BACKGROUND_GAMMA_FILE)</div><div class='ctx'>             {</div><div class='add'>+</div><div class='ctx'>                back.red = png_ptr-&gt;gamma_table[png_ptr-&gt;background.red];</div><div class='ctx'>                back.green = png_ptr-&gt;gamma_table[png_ptr-&gt;background.green];</div><div class='ctx'>                back.blue = png_ptr-&gt;gamma_table[png_ptr-&gt;background.blue];</div><div class='hunk'>@@ -910,56 +985,58 @@ png_init_read_transformations(png_structp png_ptr)</div><div class='ctx'>             }</div><div class='ctx'>             else</div><div class='ctx'>             {</div><div class='del'>-               double g, gs;</div><div class='add'>+               png_fixed_point g, gs;</div><div class='ctx'> </div><div class='ctx'>                switch (png_ptr-&gt;background_gamma_type)</div><div class='ctx'>                {</div><div class='ctx'>                   case PNG_BACKGROUND_GAMMA_SCREEN:</div><div class='ctx'>                      g = (png_ptr-&gt;screen_gamma);</div><div class='del'>-                     gs = 1.0;</div><div class='add'>+                     gs = PNG_FP_1;</div><div class='ctx'>                      break;</div><div class='ctx'> </div><div class='ctx'>                   case PNG_BACKGROUND_GAMMA_FILE:</div><div class='del'>-                     g = 1.0 / (png_ptr-&gt;gamma);</div><div class='del'>-                     gs = 1.0 / (png_ptr-&gt;gamma * png_ptr-&gt;screen_gamma);</div><div class='add'>+                     g = png_reciprocal(png_ptr-&gt;gamma);</div><div class='add'>+                     gs = png_reciprocal2(png_ptr-&gt;gamma,</div><div class='add'>+                        png_ptr-&gt;screen_gamma);</div><div class='ctx'>                      break;</div><div class='ctx'> </div><div class='ctx'>                   case PNG_BACKGROUND_GAMMA_UNIQUE:</div><div class='del'>-                     g = 1.0 / (png_ptr-&gt;background_gamma);</div><div class='del'>-                     gs = 1.0 / (png_ptr-&gt;background_gamma *</div><div class='del'>-                                 png_ptr-&gt;screen_gamma);</div><div class='add'>+                     g = png_reciprocal(png_ptr-&gt;background_gamma);</div><div class='add'>+                     gs = png_reciprocal2(png_ptr-&gt;background_gamma,</div><div class='add'>+                        png_ptr-&gt;screen_gamma);</div><div class='ctx'>                      break;</div><div class='ctx'>                   default:</div><div class='del'>-                     g = 1.0;    /* back_1 */</div><div class='del'>-                     gs = 1.0;   /* back */</div><div class='add'>+                     g = PNG_FP_1;    /* back_1 */</div><div class='add'>+                     gs = PNG_FP_1;   /* back */</div><div class='add'>+                     break;</div><div class='ctx'>                }</div><div class='ctx'> </div><div class='del'>-               if ( fabs(gs - 1.0) &lt; PNG_GAMMA_THRESHOLD)</div><div class='add'>+               if (png_gamma_significant(gs))</div><div class='ctx'>                {</div><div class='ctx'>                   back.red   = (png_byte)png_ptr-&gt;background.red;</div><div class='ctx'>                   back.green = (png_byte)png_ptr-&gt;background.green;</div><div class='ctx'>                   back.blue  = (png_byte)png_ptr-&gt;background.blue;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                {</div><div class='del'>-                  back.red = (png_byte)(pow(</div><div class='del'>-                     (double)png_ptr-&gt;background.red/255.0, gs) * 255.0 + .5);</div><div class='del'>-                  back.green = (png_byte)(pow(</div><div class='del'>-                     (double)png_ptr-&gt;background.green/255.0, gs) * 255.0 + .5);</div><div class='del'>-                  back.blue = (png_byte)(pow(</div><div class='del'>-                     (double)png_ptr-&gt;background.blue/255.0, gs) * 255.0 + .5);</div><div class='add'>+                  back.red = png_gamma_8bit_correct(png_ptr-&gt;background.red,</div><div class='add'>+                      gs);</div><div class='add'>+                  back.green = png_gamma_8bit_correct(png_ptr-&gt;background.green,</div><div class='add'>+                      gs);</div><div class='add'>+                  back.blue = png_gamma_8bit_correct(png_ptr-&gt;background.blue,</div><div class='add'>+                      gs);</div><div class='ctx'>                }</div><div class='del'>-</div><div class='del'>-               back_1.red = (png_byte)(pow(</div><div class='del'>-                  (double)png_ptr-&gt;background.red/255.0, g) * 255.0 + .5);</div><div class='del'>-               back_1.green = (png_byte)(pow(</div><div class='del'>-                  (double)png_ptr-&gt;background.green/255.0, g) * 255.0 + .5);</div><div class='del'>-               back_1.blue = (png_byte)(pow(</div><div class='del'>-                  (double)png_ptr-&gt;background.blue/255.0, g) * 255.0 + .5);</div><div class='add'>+               back_1.red = png_gamma_8bit_correct(png_ptr-&gt;background.red, g);</div><div class='add'>+               back_1.green = png_gamma_8bit_correct(png_ptr-&gt;background.green,</div><div class='add'>+                   g);</div><div class='add'>+               back_1.blue = png_gamma_8bit_correct(png_ptr-&gt;background.blue,</div><div class='add'>+                   g);</div><div class='ctx'>             }</div><div class='ctx'>             for (i = 0; i &lt; num_palette; i++)</div><div class='ctx'>             {</div><div class='del'>-               if (i &lt; (int)png_ptr-&gt;num_trans &amp;&amp; png_ptr-&gt;trans_alpha[i] != 0xff)</div><div class='add'>+               if (i &lt; (int)png_ptr-&gt;num_trans &amp;&amp;</div><div class='add'>+                   png_ptr-&gt;trans_alpha[i] != 0xff)</div><div class='ctx'>                {</div><div class='ctx'>                   if (png_ptr-&gt;trans_alpha[i] == 0)</div><div class='ctx'>                   {</div><div class='hunk'>@@ -996,65 +1073,76 @@ png_init_read_transformations(png_structp png_ptr)</div><div class='ctx'>              */</div><div class='ctx'>             png_ptr-&gt;transformations &amp;= ~PNG_BACKGROUND;</div><div class='ctx'>             png_ptr-&gt;transformations &amp;= ~PNG_GAMMA;</div><div class='del'>-            png_ptr-&gt;transformations |= PNG_STRIP_ALPHA;</div><div class='add'>+            png_ptr-&gt;flags |= PNG_FLAG_STRIP_ALPHA;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          /* if (png_ptr-&gt;background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */</div><div class='ctx'>          else</div><div class='ctx'>          /* color_type != PNG_COLOR_TYPE_PALETTE */</div><div class='ctx'>          {</div><div class='del'>-            double m = (double)(((png_uint_32)1 &lt;&lt; png_ptr-&gt;bit_depth) - 1);</div><div class='del'>-            double g = 1.0;</div><div class='del'>-            double gs = 1.0;</div><div class='add'>+            png_fixed_point g = PNG_FP_1;</div><div class='add'>+            png_fixed_point gs = PNG_FP_1;</div><div class='ctx'> </div><div class='ctx'>             switch (png_ptr-&gt;background_gamma_type)</div><div class='ctx'>             {</div><div class='ctx'>                case PNG_BACKGROUND_GAMMA_SCREEN:</div><div class='del'>-                  g = (png_ptr-&gt;screen_gamma);</div><div class='del'>-                  gs = 1.0;</div><div class='add'>+                  g = png_ptr-&gt;screen_gamma;</div><div class='add'>+                  /* gs = PNG_FP_1; */</div><div class='ctx'>                   break;</div><div class='ctx'> </div><div class='ctx'>                case PNG_BACKGROUND_GAMMA_FILE:</div><div class='del'>-                  g = 1.0 / (png_ptr-&gt;gamma);</div><div class='del'>-                  gs = 1.0 / (png_ptr-&gt;gamma * png_ptr-&gt;screen_gamma);</div><div class='add'>+                  g = png_reciprocal(png_ptr-&gt;gamma);</div><div class='add'>+                  gs = png_reciprocal2(png_ptr-&gt;gamma, png_ptr-&gt;screen_gamma);</div><div class='ctx'>                   break;</div><div class='ctx'> </div><div class='ctx'>                case PNG_BACKGROUND_GAMMA_UNIQUE:</div><div class='del'>-                  g = 1.0 / (png_ptr-&gt;background_gamma);</div><div class='del'>-                  gs = 1.0 / (png_ptr-&gt;background_gamma *</div><div class='del'>-                     png_ptr-&gt;screen_gamma);</div><div class='add'>+                  g = png_reciprocal(png_ptr-&gt;background_gamma);</div><div class='add'>+                  gs = png_reciprocal2(png_ptr-&gt;background_gamma,</div><div class='add'>+                      png_ptr-&gt;screen_gamma);</div><div class='ctx'>                   break;</div><div class='add'>+</div><div class='add'>+               default:</div><div class='add'>+                  png_error(png_ptr, "invalid background gamma type");</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='del'>-            png_ptr-&gt;background_1.gray = (png_uint_16)(pow(</div><div class='del'>-               (double)png_ptr-&gt;background.gray / m, g) * m + .5);</div><div class='del'>-            png_ptr-&gt;background.gray = (png_uint_16)(pow(</div><div class='del'>-               (double)png_ptr-&gt;background.gray / m, gs) * m + .5);</div><div class='add'>+            png_ptr-&gt;background_1.gray = png_gamma_correct(png_ptr,</div><div class='add'>+                png_ptr-&gt;background.gray, g);</div><div class='add'>+</div><div class='add'>+            png_ptr-&gt;background.gray = png_gamma_correct(png_ptr,</div><div class='add'>+                png_ptr-&gt;background.gray, gs);</div><div class='ctx'> </div><div class='ctx'>             if ((png_ptr-&gt;background.red != png_ptr-&gt;background.green) ||</div><div class='ctx'>                 (png_ptr-&gt;background.red != png_ptr-&gt;background.blue) ||</div><div class='ctx'>                 (png_ptr-&gt;background.red != png_ptr-&gt;background.gray))</div><div class='ctx'>             {</div><div class='ctx'>                /* RGB or RGBA with color background */</div><div class='del'>-               png_ptr-&gt;background_1.red = (png_uint_16)(pow(</div><div class='del'>-                  (double)png_ptr-&gt;background.red / m, g) * m + .5);</div><div class='del'>-               png_ptr-&gt;background_1.green = (png_uint_16)(pow(</div><div class='del'>-                  (double)png_ptr-&gt;background.green / m, g) * m + .5);</div><div class='del'>-               png_ptr-&gt;background_1.blue = (png_uint_16)(pow(</div><div class='del'>-                  (double)png_ptr-&gt;background.blue / m, g) * m + .5);</div><div class='del'>-               png_ptr-&gt;background.red = (png_uint_16)(pow(</div><div class='del'>-                  (double)png_ptr-&gt;background.red / m, gs) * m + .5);</div><div class='del'>-               png_ptr-&gt;background.green = (png_uint_16)(pow(</div><div class='del'>-                  (double)png_ptr-&gt;background.green / m, gs) * m + .5);</div><div class='del'>-               png_ptr-&gt;background.blue = (png_uint_16)(pow(</div><div class='del'>-                  (double)png_ptr-&gt;background.blue / m, gs) * m + .5);</div><div class='add'>+               png_ptr-&gt;background_1.red = png_gamma_correct(png_ptr,</div><div class='add'>+                   png_ptr-&gt;background.red, g);</div><div class='add'>+</div><div class='add'>+               png_ptr-&gt;background_1.green = png_gamma_correct(png_ptr,</div><div class='add'>+                   png_ptr-&gt;background.green, g);</div><div class='add'>+</div><div class='add'>+               png_ptr-&gt;background_1.blue = png_gamma_correct(png_ptr,</div><div class='add'>+                   png_ptr-&gt;background.blue, g);</div><div class='add'>+</div><div class='add'>+               png_ptr-&gt;background.red = png_gamma_correct(png_ptr,</div><div class='add'>+                   png_ptr-&gt;background.red, gs);</div><div class='add'>+</div><div class='add'>+               png_ptr-&gt;background.green = png_gamma_correct(png_ptr,</div><div class='add'>+                   png_ptr-&gt;background.green, gs);</div><div class='add'>+</div><div class='add'>+               png_ptr-&gt;background.blue = png_gamma_correct(png_ptr,</div><div class='add'>+                   png_ptr-&gt;background.blue, gs);</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'>             {</div><div class='ctx'>                /* GRAY, GRAY ALPHA, RGB, or RGBA with gray background */</div><div class='ctx'>                png_ptr-&gt;background_1.red = png_ptr-&gt;background_1.green</div><div class='del'>-                 = png_ptr-&gt;background_1.blue = png_ptr-&gt;background_1.gray;</div><div class='add'>+                   = png_ptr-&gt;background_1.blue = png_ptr-&gt;background_1.gray;</div><div class='add'>+</div><div class='ctx'>                png_ptr-&gt;background.red = png_ptr-&gt;background.green</div><div class='del'>-                 = png_ptr-&gt;background.blue = png_ptr-&gt;background.gray;</div><div class='add'>+                   = png_ptr-&gt;background.blue = png_ptr-&gt;background.gray;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='hunk'>@@ -1081,7 +1169,7 @@ png_init_read_transformations(png_structp png_ptr)</div><div class='ctx'> #ifdef PNG_READ_BACKGROUND_SUPPORTED</div><div class='ctx'>    else</div><div class='ctx'> #endif</div><div class='del'>-#endif /* PNG_READ_GAMMA_SUPPORTED &amp;&amp; PNG_FLOATING_POINT_SUPPORTED */</div><div class='add'>+#endif /* PNG_READ_GAMMA_SUPPORTED */</div><div class='ctx'> #ifdef PNG_READ_BACKGROUND_SUPPORTED</div><div class='ctx'>    /* No GAMMA transformation */</div><div class='ctx'>    if ((png_ptr-&gt;transformations &amp; PNG_BACKGROUND) &amp;&amp;</div><div class='hunk'>@@ -1102,27 +1190,30 @@ png_init_read_transformations(png_structp png_ptr)</div><div class='ctx'>          {</div><div class='ctx'>             palette[i] = back;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          else if (png_ptr-&gt;trans_alpha[i] != 0xff)</div><div class='ctx'>          {</div><div class='ctx'>             /* The png_composite() macro is defined in png.h */</div><div class='ctx'>             png_composite(palette[i].red, palette[i].red,</div><div class='del'>-               png_ptr-&gt;trans_alpha[i], back.red);</div><div class='add'>+                png_ptr-&gt;trans_alpha[i], back.red);</div><div class='add'>+</div><div class='ctx'>             png_composite(palette[i].green, palette[i].green,</div><div class='del'>-               png_ptr-&gt;trans_alpha[i], back.green);</div><div class='add'>+                png_ptr-&gt;trans_alpha[i], back.green);</div><div class='add'>+</div><div class='ctx'>             png_composite(palette[i].blue, palette[i].blue,</div><div class='del'>-               png_ptr-&gt;trans_alpha[i], back.blue);</div><div class='add'>+                png_ptr-&gt;trans_alpha[i], back.blue);</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='ctx'>       /* Handled alpha, still need to strip the channel. */</div><div class='ctx'>       png_ptr-&gt;transformations &amp;= ~PNG_BACKGROUND;</div><div class='del'>-      png_ptr-&gt;transformations |= PNG_STRIP_ALPHA;</div><div class='add'>+      png_ptr-&gt;flags |= PNG_FLAG_STRIP_ALPHA;</div><div class='ctx'>    }</div><div class='ctx'> #endif /* PNG_READ_BACKGROUND_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_SHIFT_SUPPORTED</div><div class='ctx'>    if ((png_ptr-&gt;transformations &amp; PNG_SHIFT) &amp;&amp;</div><div class='del'>-      (color_type == PNG_COLOR_TYPE_PALETTE))</div><div class='add'>+       (color_type == PNG_COLOR_TYPE_PALETTE))</div><div class='ctx'>    {</div><div class='ctx'>       png_uint_16 i;</div><div class='ctx'>       png_uint_16 istop = png_ptr-&gt;num_palette;</div><div class='hunk'>@@ -1132,10 +1223,13 @@ png_init_read_transformations(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'>       if (sr &lt; 0 || sr &gt; 8)</div><div class='ctx'>          sr = 0;</div><div class='add'>+</div><div class='ctx'>       if (sg &lt; 0 || sg &gt; 8)</div><div class='ctx'>          sg = 0;</div><div class='add'>+</div><div class='ctx'>       if (sb &lt; 0 || sb &gt; 8)</div><div class='ctx'>          sb = 0;</div><div class='add'>+</div><div class='ctx'>       for (i = 0; i &lt; istop; i++)</div><div class='ctx'>       {</div><div class='ctx'>          png_ptr-&gt;palette[i].red &gt;&gt;= sr;</div><div class='hunk'>@@ -1167,10 +1261,12 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>       if (info_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>       {</div><div class='ctx'>          if (png_ptr-&gt;num_trans &amp;&amp;</div><div class='del'>-              (png_ptr-&gt;transformations &amp; PNG_EXPAND_tRNS))</div><div class='add'>+             (png_ptr-&gt;transformations &amp; PNG_EXPAND_tRNS))</div><div class='ctx'>             info_ptr-&gt;color_type = PNG_COLOR_TYPE_RGB_ALPHA;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             info_ptr-&gt;color_type = PNG_COLOR_TYPE_RGB;</div><div class='add'>+</div><div class='ctx'>          info_ptr-&gt;bit_depth = 8;</div><div class='ctx'>          info_ptr-&gt;num_trans = 0;</div><div class='ctx'>       }</div><div class='hunk'>@@ -1179,10 +1275,11 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>          if (png_ptr-&gt;num_trans)</div><div class='ctx'>          {</div><div class='ctx'>             if (png_ptr-&gt;transformations &amp; PNG_EXPAND_tRNS)</div><div class='del'>-              info_ptr-&gt;color_type |= PNG_COLOR_MASK_ALPHA;</div><div class='add'>+               info_ptr-&gt;color_type |= PNG_COLOR_MASK_ALPHA;</div><div class='ctx'>          }</div><div class='ctx'>          if (info_ptr-&gt;bit_depth &lt; 8)</div><div class='ctx'>             info_ptr-&gt;bit_depth = 8;</div><div class='add'>+</div><div class='ctx'>          info_ptr-&gt;num_trans = 0;</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='hunk'>@@ -1191,7 +1288,8 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> #ifdef PNG_READ_BACKGROUND_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_BACKGROUND)</div><div class='ctx'>    {</div><div class='del'>-      info_ptr-&gt;color_type &amp;= ~PNG_COLOR_MASK_ALPHA;</div><div class='add'>+      info_ptr-&gt;color_type = (png_byte)(info_ptr-&gt;color_type &amp;</div><div class='add'>+          ~PNG_COLOR_MASK_ALPHA);</div><div class='ctx'>       info_ptr-&gt;num_trans = 0;</div><div class='ctx'>       info_ptr-&gt;background = png_ptr-&gt;background;</div><div class='ctx'>    }</div><div class='hunk'>@@ -1200,18 +1298,22 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> #ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_GAMMA)</div><div class='ctx'>    {</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='ctx'>       info_ptr-&gt;gamma = png_ptr-&gt;gamma;</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-      info_ptr-&gt;int_gamma = png_ptr-&gt;int_gamma;</div><div class='del'>-#endif</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_16_TO_8_SUPPORTED</div><div class='add'>+#ifdef PNG_READ_16BIT_SUPPORTED</div><div class='ctx'>    if ((png_ptr-&gt;transformations &amp; PNG_16_TO_8) &amp;&amp; (info_ptr-&gt;bit_depth == 16))</div><div class='ctx'>       info_ptr-&gt;bit_depth = 8;</div><div class='add'>+#else</div><div class='add'>+   /* Force chopping 16-bit input down to 8 */</div><div class='add'>+   if (info_ptr-&gt;bit_depth == 16)</div><div class='add'>+   {</div><div class='add'>+      png_ptr-&gt;transformations |=PNG_16_TO_8;</div><div class='add'>+      info_ptr-&gt;bit_depth = 8;</div><div class='add'>+   }</div><div class='add'>+#endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED</div><div class='hunk'>@@ -1224,8 +1326,8 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>       info_ptr-&gt;color_type &amp;= ~PNG_COLOR_MASK_COLOR;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_READ_DITHER_SUPPORTED</div><div class='del'>-   if (png_ptr-&gt;transformations &amp; PNG_DITHER)</div><div class='add'>+#ifdef PNG_READ_QUANTIZE_SUPPORTED</div><div class='add'>+   if (png_ptr-&gt;transformations &amp; PNG_QUANTIZE)</div><div class='ctx'>    {</div><div class='ctx'>       if (((info_ptr-&gt;color_type == PNG_COLOR_TYPE_RGB) ||</div><div class='ctx'>           (info_ptr-&gt;color_type == PNG_COLOR_TYPE_RGB_ALPHA)) &amp;&amp;</div><div class='hunk'>@@ -1243,8 +1345,10 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> </div><div class='ctx'>    if (info_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>       info_ptr-&gt;channels = 1;</div><div class='add'>+</div><div class='ctx'>    else if (info_ptr-&gt;color_type &amp; PNG_COLOR_MASK_COLOR)</div><div class='ctx'>       info_ptr-&gt;channels = 3;</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       info_ptr-&gt;channels = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1265,23 +1369,24 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>       info_ptr-&gt;channels++;</div><div class='ctx'>       /* If adding a true alpha channel not just filler */</div><div class='ctx'>       if (png_ptr-&gt;transformations &amp; PNG_ADD_ALPHA)</div><div class='del'>-        info_ptr-&gt;color_type |= PNG_COLOR_MASK_ALPHA;</div><div class='add'>+         info_ptr-&gt;color_type |= PNG_COLOR_MASK_ALPHA;</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) &amp;&amp; \</div><div class='ctx'> defined(PNG_READ_USER_TRANSFORM_SUPPORTED)</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_USER_TRANSFORM)</div><div class='del'>-     {</div><div class='del'>-       if (info_ptr-&gt;bit_depth &lt; png_ptr-&gt;user_transform_depth)</div><div class='add'>+   {</div><div class='add'>+      if (info_ptr-&gt;bit_depth &lt; png_ptr-&gt;user_transform_depth)</div><div class='ctx'>          info_ptr-&gt;bit_depth = png_ptr-&gt;user_transform_depth;</div><div class='del'>-       if (info_ptr-&gt;channels &lt; png_ptr-&gt;user_transform_channels)</div><div class='add'>+</div><div class='add'>+      if (info_ptr-&gt;channels &lt; png_ptr-&gt;user_transform_channels)</div><div class='ctx'>          info_ptr-&gt;channels = png_ptr-&gt;user_transform_channels;</div><div class='del'>-     }</div><div class='add'>+   }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>    info_ptr-&gt;pixel_depth = (png_byte)(info_ptr-&gt;channels *</div><div class='del'>-      info_ptr-&gt;bit_depth);</div><div class='add'>+       info_ptr-&gt;bit_depth);</div><div class='ctx'> </div><div class='ctx'>    info_ptr-&gt;rowbytes = PNG_ROWBYTES(info_ptr-&gt;pixel_depth, info_ptr-&gt;width);</div><div class='ctx'> </div><div class='hunk'>@@ -1302,12 +1407,12 @@ png_do_read_transformations(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr-&gt;row_buf == NULL)</div><div class='ctx'>    {</div><div class='del'>-#ifdef PNG_STDIO_SUPPORTED</div><div class='add'>+#ifdef PNG_CONSOLE_IO_SUPPORTED</div><div class='ctx'>       char msg[50];</div><div class='ctx'> </div><div class='ctx'>       png_snprintf2(msg, 50,</div><div class='del'>-         "NULL row buffer for row %ld, pass %d", (long)png_ptr-&gt;row_number,</div><div class='del'>-         png_ptr-&gt;pass);</div><div class='add'>+          "NULL row buffer for row %ld, pass %d", (long)png_ptr-&gt;row_number,</div><div class='add'>+          png_ptr-&gt;pass);</div><div class='ctx'>       png_error(png_ptr, msg);</div><div class='ctx'> #else</div><div class='ctx'>       png_error(png_ptr, "NULL row buffer");</div><div class='hunk'>@@ -1332,17 +1437,18 @@ png_do_read_transformations(png_structp png_ptr)</div><div class='ctx'>       if (png_ptr-&gt;row_info.color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>       {</div><div class='ctx'>          png_do_expand_palette(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1,</div><div class='del'>-            png_ptr-&gt;palette, png_ptr-&gt;trans_alpha, png_ptr-&gt;num_trans);</div><div class='add'>+             png_ptr-&gt;palette, png_ptr-&gt;trans_alpha, png_ptr-&gt;num_trans);</div><div class='ctx'>       }</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          if (png_ptr-&gt;num_trans &amp;&amp;</div><div class='ctx'>              (png_ptr-&gt;transformations &amp; PNG_EXPAND_tRNS))</div><div class='ctx'>             png_do_expand(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1,</div><div class='del'>-               &amp;(png_ptr-&gt;trans_color));</div><div class='add'>+                &amp;(png_ptr-&gt;trans_color));</div><div class='ctx'>          else</div><div class='add'>+</div><div class='ctx'>             png_do_expand(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1,</div><div class='del'>-               NULL);</div><div class='add'>+                NULL);</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1350,20 +1456,23 @@ png_do_read_transformations(png_structp png_ptr)</div><div class='ctx'> #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;flags &amp; PNG_FLAG_STRIP_ALPHA)</div><div class='ctx'>       png_do_strip_filler(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1,</div><div class='del'>-         PNG_FLAG_FILLER_AFTER | (png_ptr-&gt;flags &amp; PNG_FLAG_STRIP_ALPHA));</div><div class='add'>+          PNG_FLAG_FILLER_AFTER | (png_ptr-&gt;flags &amp; PNG_FLAG_STRIP_ALPHA));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_RGB_TO_GRAY)</div><div class='ctx'>    {</div><div class='ctx'>       int rgb_error =</div><div class='del'>-         png_do_rgb_to_gray(png_ptr, &amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1);</div><div class='add'>+          png_do_rgb_to_gray(png_ptr, &amp;(png_ptr-&gt;row_info),</div><div class='add'>+              png_ptr-&gt;row_buf + 1);</div><div class='add'>+</div><div class='ctx'>       if (rgb_error)</div><div class='ctx'>       {</div><div class='ctx'>          png_ptr-&gt;rgb_to_gray_status=1;</div><div class='ctx'>          if ((png_ptr-&gt;transformations &amp; PNG_RGB_TO_GRAY) ==</div><div class='ctx'>              PNG_RGB_TO_GRAY_WARN)</div><div class='ctx'>             png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");</div><div class='add'>+</div><div class='ctx'>          if ((png_ptr-&gt;transformations &amp; PNG_RGB_TO_GRAY) ==</div><div class='ctx'>              PNG_RGB_TO_GRAY_ERR)</div><div class='ctx'>             png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");</div><div class='hunk'>@@ -1413,18 +1522,18 @@ png_do_read_transformations(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_BACKGROUND_SUPPORTED</div><div class='ctx'>    if ((png_ptr-&gt;transformations &amp; PNG_BACKGROUND) &amp;&amp;</div><div class='del'>-      ((png_ptr-&gt;num_trans != 0 ) ||</div><div class='del'>-      (png_ptr-&gt;color_type &amp; PNG_COLOR_MASK_ALPHA)))</div><div class='add'>+       ((png_ptr-&gt;num_trans != 0) ||</div><div class='add'>+       (png_ptr-&gt;color_type &amp; PNG_COLOR_MASK_ALPHA)))</div><div class='ctx'>       png_do_background(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1,</div><div class='del'>-         &amp;(png_ptr-&gt;trans_color), &amp;(png_ptr-&gt;background)</div><div class='add'>+          &amp;(png_ptr-&gt;trans_color), &amp;(png_ptr-&gt;background)</div><div class='ctx'> #ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='del'>-         , &amp;(png_ptr-&gt;background_1),</div><div class='del'>-         png_ptr-&gt;gamma_table, png_ptr-&gt;gamma_from_1,</div><div class='del'>-         png_ptr-&gt;gamma_to_1, png_ptr-&gt;gamma_16_table,</div><div class='del'>-         png_ptr-&gt;gamma_16_from_1, png_ptr-&gt;gamma_16_to_1,</div><div class='del'>-         png_ptr-&gt;gamma_shift</div><div class='add'>+          , &amp;(png_ptr-&gt;background_1),</div><div class='add'>+          png_ptr-&gt;gamma_table, png_ptr-&gt;gamma_from_1,</div><div class='add'>+          png_ptr-&gt;gamma_to_1, png_ptr-&gt;gamma_16_table,</div><div class='add'>+          png_ptr-&gt;gamma_16_from_1, png_ptr-&gt;gamma_16_to_1,</div><div class='add'>+          png_ptr-&gt;gamma_shift</div><div class='ctx'> #endif</div><div class='del'>-);</div><div class='add'>+          );</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='hunk'>@@ -1445,15 +1554,16 @@ png_do_read_transformations(png_structp png_ptr)</div><div class='ctx'>       png_do_chop(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_READ_DITHER_SUPPORTED</div><div class='del'>-   if (png_ptr-&gt;transformations &amp; PNG_DITHER)</div><div class='add'>+#ifdef PNG_READ_QUANTIZE_SUPPORTED</div><div class='add'>+   if (png_ptr-&gt;transformations &amp; PNG_QUANTIZE)</div><div class='ctx'>    {</div><div class='del'>-      png_do_dither((png_row_infop)&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1,</div><div class='del'>-         png_ptr-&gt;palette_lookup, png_ptr-&gt;dither_index);</div><div class='del'>-      if (png_ptr-&gt;row_info.rowbytes == (png_uint_32)0)</div><div class='del'>-         png_error(png_ptr, "png_do_dither returned rowbytes=0");</div><div class='add'>+      png_do_quantize(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1,</div><div class='add'>+          png_ptr-&gt;palette_lookup, png_ptr-&gt;quantize_index);</div><div class='add'>+</div><div class='add'>+      if (png_ptr-&gt;row_info.rowbytes == 0)</div><div class='add'>+         png_error(png_ptr, "png_do_quantize returned rowbytes=0");</div><div class='ctx'>    }</div><div class='del'>-#endif</div><div class='add'>+#endif /* PNG_READ_QUANTIZE_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_INVERT_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_INVERT_MONO)</div><div class='hunk'>@@ -1463,7 +1573,7 @@ png_do_read_transformations(png_structp png_ptr)</div><div class='ctx'> #ifdef PNG_READ_SHIFT_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_SHIFT)</div><div class='ctx'>       png_do_unshift(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1,</div><div class='del'>-         &amp;(png_ptr-&gt;shift));</div><div class='add'>+          &amp;(png_ptr-&gt;shift));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_PACK_SUPPORTED</div><div class='hunk'>@@ -1491,7 +1601,7 @@ png_do_read_transformations(png_structp png_ptr)</div><div class='ctx'> #ifdef PNG_READ_FILLER_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_FILLER)</div><div class='ctx'>       png_do_read_filler(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1,</div><div class='del'>-         (png_uint_32)png_ptr-&gt;filler, png_ptr-&gt;flags);</div><div class='add'>+          (png_uint_32)png_ptr-&gt;filler, png_ptr-&gt;flags);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED</div><div class='hunk'>@@ -1504,35 +1614,39 @@ png_do_read_transformations(png_structp png_ptr)</div><div class='ctx'>       png_do_read_swap_alpha(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_READ_16BIT_SUPPORTED</div><div class='ctx'> #ifdef PNG_READ_SWAP_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_SWAP_BYTES)</div><div class='ctx'>       png_do_swap(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1);</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_USER_TRANSFORM)</div><div class='ctx'>     {</div><div class='ctx'>       if (png_ptr-&gt;read_user_transform_fn != NULL)</div><div class='ctx'>          (*(png_ptr-&gt;read_user_transform_fn)) /* User read transform function */</div><div class='del'>-            (png_ptr,                    /* png_ptr */</div><div class='del'>-               &amp;(png_ptr-&gt;row_info),     /* row_info: */</div><div class='del'>-               /*  png_uint_32 width;       width of row */</div><div class='del'>-               /*  png_uint_32 rowbytes;    number of bytes in row */</div><div class='del'>-               /*  png_byte color_type;     color type of pixels */</div><div class='del'>-               /*  png_byte bit_depth;      bit depth of samples */</div><div class='del'>-               /*  png_byte channels;       number of channels (1-4) */</div><div class='del'>-               /*  png_byte pixel_depth;    bits per pixel (depth*channels) */</div><div class='del'>-               png_ptr-&gt;row_buf + 1);    /* start of pixel data for row */</div><div class='add'>+             (png_ptr,                    /* png_ptr */</div><div class='add'>+             &amp;(png_ptr-&gt;row_info),     /* row_info: */</div><div class='add'>+                /*  png_uint_32 width;       width of row */</div><div class='add'>+                /*  png_size_t rowbytes;     number of bytes in row */</div><div class='add'>+                /*  png_byte color_type;     color type of pixels */</div><div class='add'>+                /*  png_byte bit_depth;      bit depth of samples */</div><div class='add'>+                /*  png_byte channels;       number of channels (1-4) */</div><div class='add'>+                /*  png_byte pixel_depth;    bits per pixel (depth*channels) */</div><div class='add'>+             png_ptr-&gt;row_buf + 1);    /* start of pixel data for row */</div><div class='ctx'> #ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED</div><div class='ctx'>       if (png_ptr-&gt;user_transform_depth)</div><div class='ctx'>          png_ptr-&gt;row_info.bit_depth = png_ptr-&gt;user_transform_depth;</div><div class='add'>+</div><div class='ctx'>       if (png_ptr-&gt;user_transform_channels)</div><div class='ctx'>          png_ptr-&gt;row_info.channels = png_ptr-&gt;user_transform_channels;</div><div class='ctx'> #endif</div><div class='ctx'>       png_ptr-&gt;row_info.pixel_depth = (png_byte)(png_ptr-&gt;row_info.bit_depth *</div><div class='del'>-         png_ptr-&gt;row_info.channels);</div><div class='add'>+          png_ptr-&gt;row_info.channels);</div><div class='add'>+</div><div class='ctx'>       png_ptr-&gt;row_info.rowbytes = PNG_ROWBYTES(png_ptr-&gt;row_info.pixel_depth,</div><div class='del'>-         png_ptr-&gt;row_info.width);</div><div class='add'>+          png_ptr-&gt;row_info.width);</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1565,11 +1679,13 @@ png_do_unpack(png_row_infop row_info, png_bytep row)</div><div class='ctx'>             for (i = 0; i &lt; row_width; i++)</div><div class='ctx'>             {</div><div class='ctx'>                *dp = (png_byte)((*sp &gt;&gt; shift) &amp; 0x01);</div><div class='add'>+</div><div class='ctx'>                if (shift == 7)</div><div class='ctx'>                {</div><div class='ctx'>                   shift = 0;</div><div class='ctx'>                   sp--;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   shift++;</div><div class='ctx'> </div><div class='hunk'>@@ -1587,11 +1703,13 @@ png_do_unpack(png_row_infop row_info, png_bytep row)</div><div class='ctx'>             for (i = 0; i &lt; row_width; i++)</div><div class='ctx'>             {</div><div class='ctx'>                *dp = (png_byte)((*sp &gt;&gt; shift) &amp; 0x03);</div><div class='add'>+</div><div class='ctx'>                if (shift == 6)</div><div class='ctx'>                {</div><div class='ctx'>                   shift = 0;</div><div class='ctx'>                   sp--;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   shift += 2;</div><div class='ctx'> </div><div class='hunk'>@@ -1608,11 +1726,13 @@ png_do_unpack(png_row_infop row_info, png_bytep row)</div><div class='ctx'>             for (i = 0; i &lt; row_width; i++)</div><div class='ctx'>             {</div><div class='ctx'>                *dp = (png_byte)((*sp &gt;&gt; shift) &amp; 0x0f);</div><div class='add'>+</div><div class='ctx'>                if (shift == 4)</div><div class='ctx'>                {</div><div class='ctx'>                   shift = 0;</div><div class='ctx'>                   sp--;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   shift = 4;</div><div class='ctx'> </div><div class='hunk'>@@ -1620,6 +1740,9 @@ png_do_unpack(png_row_infop row_info, png_bytep row)</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='add'>+         default:</div><div class='add'>+            break;</div><div class='ctx'>       }</div><div class='ctx'>       row_info-&gt;bit_depth = 8;</div><div class='ctx'>       row_info-&gt;pixel_depth = (png_byte)(8 * row_info-&gt;channels);</div><div class='hunk'>@@ -1635,7 +1758,8 @@ png_do_unpack(png_row_infop row_info, png_bytep row)</div><div class='ctx'>  * the values back to 0 through 31.</div><div class='ctx'>  */</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_do_unshift(png_row_infop row_info, png_bytep row, png_color_8p sig_bits)</div><div class='add'>+png_do_unshift(png_row_infop row_info, png_bytep row,</div><div class='add'>+    png_const_color_8p sig_bits)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_do_unshift");</div><div class='ctx'> </div><div class='hunk'>@@ -1654,10 +1778,12 @@ png_do_unshift(png_row_infop row_info, png_bytep row, png_color_8p sig_bits)</div><div class='ctx'>          shift[channels++] = row_info-&gt;bit_depth - sig_bits-&gt;green;</div><div class='ctx'>          shift[channels++] = row_info-&gt;bit_depth - sig_bits-&gt;blue;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          shift[channels++] = row_info-&gt;bit_depth - sig_bits-&gt;gray;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       if (row_info-&gt;color_type &amp; PNG_COLOR_MASK_ALPHA)</div><div class='ctx'>       {</div><div class='ctx'>          shift[channels++] = row_info-&gt;bit_depth - sig_bits-&gt;alpha;</div><div class='hunk'>@@ -1667,6 +1793,7 @@ png_do_unshift(png_row_infop row_info, png_bytep row, png_color_8p sig_bits)</div><div class='ctx'>       {</div><div class='ctx'>          if (shift[c] &lt;= 0)</div><div class='ctx'>             shift[c] = 0;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             value = 1;</div><div class='ctx'>       }</div><div class='hunk'>@@ -1676,11 +1803,14 @@ png_do_unshift(png_row_infop row_info, png_bytep row, png_color_8p sig_bits)</div><div class='ctx'> </div><div class='ctx'>       switch (row_info-&gt;bit_depth)</div><div class='ctx'>       {</div><div class='add'>+         default:</div><div class='add'>+            break; </div><div class='add'>+</div><div class='ctx'>          case 2:</div><div class='ctx'>          {</div><div class='ctx'>             png_bytep bp;</div><div class='del'>-            png_uint_32 i;</div><div class='del'>-            png_uint_32 istop = row_info-&gt;rowbytes;</div><div class='add'>+            png_size_t i;</div><div class='add'>+            png_size_t istop = row_info-&gt;rowbytes;</div><div class='ctx'> </div><div class='ctx'>             for (bp = row, i = 0; i &lt; istop; i++)</div><div class='ctx'>             {</div><div class='hunk'>@@ -1693,10 +1823,10 @@ png_do_unshift(png_row_infop row_info, png_bytep row, png_color_8p sig_bits)</div><div class='ctx'>          case 4:</div><div class='ctx'>          {</div><div class='ctx'>             png_bytep bp = row;</div><div class='del'>-            png_uint_32 i;</div><div class='del'>-            png_uint_32 istop = row_info-&gt;rowbytes;</div><div class='add'>+            png_size_t i;</div><div class='add'>+            png_size_t istop = row_info-&gt;rowbytes;</div><div class='ctx'>             png_byte mask = (png_byte)((((int)0xf0 &gt;&gt; shift[0]) &amp; (int)0xf0) |</div><div class='del'>-               (png_byte)((int)0xf &gt;&gt; shift[0]));</div><div class='add'>+                (png_byte)((int)0xf &gt;&gt; shift[0]));</div><div class='ctx'> </div><div class='ctx'>             for (i = 0; i &lt; istop; i++)</div><div class='ctx'>             {</div><div class='hunk'>@@ -1719,6 +1849,7 @@ png_do_unshift(png_row_infop row_info, png_bytep row, png_color_8p sig_bits)</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_READ_16BIT_SUPPORTED</div><div class='ctx'>          case 16:</div><div class='ctx'>          {</div><div class='ctx'>             png_bytep bp = row;</div><div class='hunk'>@@ -1734,6 +1865,7 @@ png_do_unshift(png_row_infop row_info, png_bytep row, png_color_8p sig_bits)</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+#endif</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='hunk'>@@ -1821,6 +1953,8 @@ png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'>                *(--dp) = save;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='add'>+</div><div class='add'>+#ifdef PNG_READ_16BIT_SUPPORTED</div><div class='ctx'>          /* This converts from RRGGBBAA to AARRGGBB */</div><div class='ctx'>          else</div><div class='ctx'>          {</div><div class='hunk'>@@ -1843,7 +1977,9 @@ png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'>                *(--dp) = save[1];</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='add'>+#endif</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if (row_info-&gt;color_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='ctx'>       {</div><div class='ctx'>          /* This converts from GA to AG */</div><div class='hunk'>@@ -1861,6 +1997,8 @@ png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'>                *(--dp) = save;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='add'>+</div><div class='add'>+#ifdef PNG_READ_16BIT_SUPPORTED</div><div class='ctx'>          /* This converts from GGAA to AAGG */</div><div class='ctx'>          else</div><div class='ctx'>          {</div><div class='hunk'>@@ -1879,6 +2017,7 @@ png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'>                *(--dp) = save[1];</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='add'>+#endif</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='hunk'>@@ -1888,94 +2027,99 @@ png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_do_read_invert_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'> {</div><div class='add'>+   png_uint_32 row_width;</div><div class='ctx'>    png_debug(1, "in png_do_read_invert_alpha");</div><div class='ctx'> </div><div class='add'>+   row_width = row_info-&gt;width;</div><div class='add'>+   if (row_info-&gt;color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='ctx'>    {</div><div class='del'>-      png_uint_32 row_width = row_info-&gt;width;</div><div class='del'>-      if (row_info-&gt;color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='add'>+      if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>       {</div><div class='ctx'>          /* This inverts the alpha channel in RGBA */</div><div class='del'>-         if (row_info-&gt;bit_depth == 8)</div><div class='del'>-         {</div><div class='del'>-            png_bytep sp = row + row_info-&gt;rowbytes;</div><div class='del'>-            png_bytep dp = sp;</div><div class='del'>-            png_uint_32 i;</div><div class='add'>+         png_bytep sp = row + row_info-&gt;rowbytes;</div><div class='add'>+         png_bytep dp = sp;</div><div class='add'>+         png_uint_32 i;</div><div class='ctx'> </div><div class='del'>-            for (i = 0; i &lt; row_width; i++)</div><div class='del'>-            {</div><div class='del'>-               *(--dp) = (png_byte)(255 - *(--sp));</div><div class='add'>+         for (i = 0; i &lt; row_width; i++)</div><div class='add'>+         {</div><div class='add'>+            *(--dp) = (png_byte)(255 - *(--sp));</div><div class='ctx'> </div><div class='del'>-/*             This does nothing:</div><div class='del'>-               *(--dp) = *(--sp);</div><div class='del'>-               *(--dp) = *(--sp);</div><div class='del'>-               *(--dp) = *(--sp);</div><div class='del'>-               We can replace it with:</div><div class='add'>+/*          This does nothing:</div><div class='add'>+            *(--dp) = *(--sp);</div><div class='add'>+            *(--dp) = *(--sp);</div><div class='add'>+            *(--dp) = *(--sp);</div><div class='add'>+            We can replace it with:</div><div class='ctx'> */</div><div class='del'>-               sp-=3;</div><div class='del'>-               dp=sp;</div><div class='del'>-            }</div><div class='add'>+            sp-=3;</div><div class='add'>+            dp=sp;</div><div class='ctx'>          }</div><div class='del'>-         /* This inverts the alpha channel in RRGGBBAA */</div><div class='del'>-         else</div><div class='del'>-         {</div><div class='del'>-            png_bytep sp = row + row_info-&gt;rowbytes;</div><div class='del'>-            png_bytep dp = sp;</div><div class='del'>-            png_uint_32 i;</div><div class='add'>+      }</div><div class='ctx'> </div><div class='del'>-            for (i = 0; i &lt; row_width; i++)</div><div class='del'>-            {</div><div class='del'>-               *(--dp) = (png_byte)(255 - *(--sp));</div><div class='del'>-               *(--dp) = (png_byte)(255 - *(--sp));</div><div class='add'>+#ifdef PNG_READ_16BIT_SUPPORTED</div><div class='add'>+      /* This inverts the alpha channel in RRGGBBAA */</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         png_bytep sp = row + row_info-&gt;rowbytes;</div><div class='add'>+         png_bytep dp = sp;</div><div class='add'>+         png_uint_32 i;</div><div class='ctx'> </div><div class='del'>-/*             This does nothing:</div><div class='del'>-               *(--dp) = *(--sp);</div><div class='del'>-               *(--dp) = *(--sp);</div><div class='del'>-               *(--dp) = *(--sp);</div><div class='del'>-               *(--dp) = *(--sp);</div><div class='del'>-               *(--dp) = *(--sp);</div><div class='del'>-               *(--dp) = *(--sp);</div><div class='del'>-               We can replace it with:</div><div class='add'>+         for (i = 0; i &lt; row_width; i++)</div><div class='add'>+         {</div><div class='add'>+            *(--dp) = (png_byte)(255 - *(--sp));</div><div class='add'>+            *(--dp) = (png_byte)(255 - *(--sp));</div><div class='add'>+</div><div class='add'>+/*          This does nothing:</div><div class='add'>+            *(--dp) = *(--sp);</div><div class='add'>+            *(--dp) = *(--sp);</div><div class='add'>+            *(--dp) = *(--sp);</div><div class='add'>+            *(--dp) = *(--sp);</div><div class='add'>+            *(--dp) = *(--sp);</div><div class='add'>+            *(--dp) = *(--sp);</div><div class='add'>+            We can replace it with:</div><div class='ctx'> */</div><div class='del'>-               sp-=6;</div><div class='del'>-               dp=sp;</div><div class='del'>-            }</div><div class='add'>+            sp-=6;</div><div class='add'>+            dp=sp;</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='del'>-      else if (row_info-&gt;color_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='add'>+#endif</div><div class='add'>+   }</div><div class='add'>+   else if (row_info-&gt;color_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='add'>+   {</div><div class='add'>+      if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>       {</div><div class='ctx'>          /* This inverts the alpha channel in GA */</div><div class='del'>-         if (row_info-&gt;bit_depth == 8)</div><div class='del'>-         {</div><div class='del'>-            png_bytep sp = row + row_info-&gt;rowbytes;</div><div class='del'>-            png_bytep dp = sp;</div><div class='del'>-            png_uint_32 i;</div><div class='add'>+         png_bytep sp = row + row_info-&gt;rowbytes;</div><div class='add'>+         png_bytep dp = sp;</div><div class='add'>+         png_uint_32 i;</div><div class='ctx'> </div><div class='del'>-            for (i = 0; i &lt; row_width; i++)</div><div class='del'>-            {</div><div class='del'>-               *(--dp) = (png_byte)(255 - *(--sp));</div><div class='del'>-               *(--dp) = *(--sp);</div><div class='del'>-            }</div><div class='add'>+         for (i = 0; i &lt; row_width; i++)</div><div class='add'>+         {</div><div class='add'>+            *(--dp) = (png_byte)(255 - *(--sp));</div><div class='add'>+            *(--dp) = *(--sp);</div><div class='ctx'>          }</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+#ifdef PNG_READ_16BIT_SUPPORTED</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='ctx'>          /* This inverts the alpha channel in GGAA */</div><div class='del'>-         else</div><div class='del'>-         {</div><div class='del'>-            png_bytep sp  = row + row_info-&gt;rowbytes;</div><div class='del'>-            png_bytep dp = sp;</div><div class='del'>-            png_uint_32 i;</div><div class='add'>+         png_bytep sp  = row + row_info-&gt;rowbytes;</div><div class='add'>+         png_bytep dp = sp;</div><div class='add'>+         png_uint_32 i;</div><div class='ctx'> </div><div class='del'>-            for (i = 0; i &lt; row_width; i++)</div><div class='del'>-            {</div><div class='del'>-               *(--dp) = (png_byte)(255 - *(--sp));</div><div class='del'>-               *(--dp) = (png_byte)(255 - *(--sp));</div><div class='add'>+         for (i = 0; i &lt; row_width; i++)</div><div class='add'>+         {</div><div class='add'>+            *(--dp) = (png_byte)(255 - *(--sp));</div><div class='add'>+            *(--dp) = (png_byte)(255 - *(--sp));</div><div class='ctx'> /*</div><div class='del'>-               *(--dp) = *(--sp);</div><div class='del'>-               *(--dp) = *(--sp);</div><div class='add'>+            *(--dp) = *(--sp);</div><div class='add'>+            *(--dp) = *(--sp);</div><div class='ctx'> */</div><div class='del'>-               sp-=2;</div><div class='del'>-               dp=sp;</div><div class='del'>-            }</div><div class='add'>+            sp-=2;</div><div class='add'>+            dp=sp;</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+#endif</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1984,12 +2128,14 @@ png_do_read_invert_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'> /* Add filler channel if we have RGB color */</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_do_read_filler(png_row_infop row_info, png_bytep row,</div><div class='del'>-   png_uint_32 filler, png_uint_32 flags)</div><div class='add'>+    png_uint_32 filler, png_uint_32 flags)</div><div class='ctx'> {</div><div class='ctx'>    png_uint_32 i;</div><div class='ctx'>    png_uint_32 row_width = row_info-&gt;width;</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_READ_16BIT_SUPPORTED</div><div class='ctx'>    png_byte hi_filler = (png_byte)((filler&gt;&gt;8) &amp; 0xff);</div><div class='add'>+#endif</div><div class='ctx'>    png_byte lo_filler = (png_byte)(filler &amp; 0xff);</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_do_read_filler");</div><div class='hunk'>@@ -1999,9 +2145,9 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,</div><div class='ctx'>    {</div><div class='ctx'>       if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>       {</div><div class='del'>-         /* This changes the data from G to GX */</div><div class='ctx'>          if (flags &amp; PNG_FLAG_FILLER_AFTER)</div><div class='ctx'>          {</div><div class='add'>+            /* This changes the data from G to GX */</div><div class='ctx'>             png_bytep sp = row + (png_size_t)row_width;</div><div class='ctx'>             png_bytep dp =  sp + (png_size_t)row_width;</div><div class='ctx'>             for (i = 1; i &lt; row_width; i++)</div><div class='hunk'>@@ -2014,9 +2160,10 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,</div><div class='ctx'>             row_info-&gt;pixel_depth = 16;</div><div class='ctx'>             row_info-&gt;rowbytes = row_width * 2;</div><div class='ctx'>          }</div><div class='del'>-      /* This changes the data from G to XG */</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>          {</div><div class='add'>+            /* This changes the data from G to XG */</div><div class='ctx'>             png_bytep sp = row + (png_size_t)row_width;</div><div class='ctx'>             png_bytep dp = sp  + (png_size_t)row_width;</div><div class='ctx'>             for (i = 0; i &lt; row_width; i++)</div><div class='hunk'>@@ -2029,11 +2176,13 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,</div><div class='ctx'>             row_info-&gt;rowbytes = row_width * 2;</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+</div><div class='add'>+#ifdef PNG_READ_16BIT_SUPPORTED</div><div class='ctx'>       else if (row_info-&gt;bit_depth == 16)</div><div class='ctx'>       {</div><div class='del'>-         /* This changes the data from GG to GGXX */</div><div class='ctx'>          if (flags &amp; PNG_FLAG_FILLER_AFTER)</div><div class='ctx'>          {</div><div class='add'>+            /* This changes the data from GG to GGXX */</div><div class='ctx'>             png_bytep sp = row + (png_size_t)row_width * 2;</div><div class='ctx'>             png_bytep dp = sp  + (png_size_t)row_width * 2;</div><div class='ctx'>             for (i = 1; i &lt; row_width; i++)</div><div class='hunk'>@@ -2049,9 +2198,10 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,</div><div class='ctx'>             row_info-&gt;pixel_depth = 32;</div><div class='ctx'>             row_info-&gt;rowbytes = row_width * 4;</div><div class='ctx'>          }</div><div class='del'>-         /* This changes the data from GG to XXGG */</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>          {</div><div class='add'>+            /* This changes the data from GG to XXGG */</div><div class='ctx'>             png_bytep sp = row + (png_size_t)row_width * 2;</div><div class='ctx'>             png_bytep dp = sp  + (png_size_t)row_width * 2;</div><div class='ctx'>             for (i = 0; i &lt; row_width; i++)</div><div class='hunk'>@@ -2066,14 +2216,15 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,</div><div class='ctx'>             row_info-&gt;rowbytes = row_width * 4;</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+#endif</div><div class='ctx'>    } /* COLOR_TYPE == GRAY */</div><div class='ctx'>    else if (row_info-&gt;color_type == PNG_COLOR_TYPE_RGB)</div><div class='ctx'>    {</div><div class='ctx'>       if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>       {</div><div class='del'>-         /* This changes the data from RGB to RGBX */</div><div class='ctx'>          if (flags &amp; PNG_FLAG_FILLER_AFTER)</div><div class='ctx'>          {</div><div class='add'>+            /* This changes the data from RGB to RGBX */</div><div class='ctx'>             png_bytep sp = row + (png_size_t)row_width * 3;</div><div class='ctx'>             png_bytep dp = sp  + (png_size_t)row_width;</div><div class='ctx'>             for (i = 1; i &lt; row_width; i++)</div><div class='hunk'>@@ -2088,9 +2239,10 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,</div><div class='ctx'>             row_info-&gt;pixel_depth = 32;</div><div class='ctx'>             row_info-&gt;rowbytes = row_width * 4;</div><div class='ctx'>          }</div><div class='del'>-      /* This changes the data from RGB to XRGB */</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>          {</div><div class='add'>+            /* This changes the data from RGB to XRGB */</div><div class='ctx'>             png_bytep sp = row + (png_size_t)row_width * 3;</div><div class='ctx'>             png_bytep dp = sp + (png_size_t)row_width;</div><div class='ctx'>             for (i = 0; i &lt; row_width; i++)</div><div class='hunk'>@@ -2105,11 +2257,13 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,</div><div class='ctx'>             row_info-&gt;rowbytes = row_width * 4;</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+</div><div class='add'>+#ifdef PNG_READ_16BIT_SUPPORTED</div><div class='ctx'>       else if (row_info-&gt;bit_depth == 16)</div><div class='ctx'>       {</div><div class='del'>-         /* This changes the data from RRGGBB to RRGGBBXX */</div><div class='ctx'>          if (flags &amp; PNG_FLAG_FILLER_AFTER)</div><div class='ctx'>          {</div><div class='add'>+            /* This changes the data from RRGGBB to RRGGBBXX */</div><div class='ctx'>             png_bytep sp = row + (png_size_t)row_width * 6;</div><div class='ctx'>             png_bytep dp = sp  + (png_size_t)row_width * 2;</div><div class='ctx'>             for (i = 1; i &lt; row_width; i++)</div><div class='hunk'>@@ -2129,9 +2283,10 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,</div><div class='ctx'>             row_info-&gt;pixel_depth = 64;</div><div class='ctx'>             row_info-&gt;rowbytes = row_width * 8;</div><div class='ctx'>          }</div><div class='del'>-         /* This changes the data from RRGGBB to XXRRGGBB */</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>          {</div><div class='add'>+            /* This changes the data from RRGGBB to XXRRGGBB */</div><div class='ctx'>             png_bytep sp = row + (png_size_t)row_width * 6;</div><div class='ctx'>             png_bytep dp = sp  + (png_size_t)row_width * 2;</div><div class='ctx'>             for (i = 0; i &lt; row_width; i++)</div><div class='hunk'>@@ -2145,11 +2300,13 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                *(--dp) = hi_filler;</div><div class='ctx'>                *(--dp) = lo_filler;</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             row_info-&gt;channels = 4;</div><div class='ctx'>             row_info-&gt;pixel_depth = 64;</div><div class='ctx'>             row_info-&gt;rowbytes = row_width * 8;</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+#endif</div><div class='ctx'>    } /* COLOR_TYPE == RGB */</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2165,12 +2322,13 @@ png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)</div><div class='ctx'>    png_debug(1, "in png_do_gray_to_rgb");</div><div class='ctx'> </div><div class='ctx'>    if (row_info-&gt;bit_depth &gt;= 8 &amp;&amp;</div><div class='del'>-      !(row_info-&gt;color_type &amp; PNG_COLOR_MASK_COLOR))</div><div class='add'>+       !(row_info-&gt;color_type &amp; PNG_COLOR_MASK_COLOR))</div><div class='ctx'>    {</div><div class='ctx'>       if (row_info-&gt;color_type == PNG_COLOR_TYPE_GRAY)</div><div class='ctx'>       {</div><div class='ctx'>          if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>          {</div><div class='add'>+            /* This changes G to RGB */</div><div class='ctx'>             png_bytep sp = row + (png_size_t)row_width - 1;</div><div class='ctx'>             png_bytep dp = sp  + (png_size_t)row_width * 2;</div><div class='ctx'>             for (i = 0; i &lt; row_width; i++)</div><div class='hunk'>@@ -2180,8 +2338,10 @@ png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)</div><div class='ctx'>                *(dp--) = *(sp--);</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>          {</div><div class='add'>+            /* This changes GG to RRGGBB */</div><div class='ctx'>             png_bytep sp = row + (png_size_t)row_width * 2 - 1;</div><div class='ctx'>             png_bytep dp = sp  + (png_size_t)row_width * 4;</div><div class='ctx'>             for (i = 0; i &lt; row_width; i++)</div><div class='hunk'>@@ -2195,10 +2355,12 @@ png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if (row_info-&gt;color_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='ctx'>       {</div><div class='ctx'>          if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>          {</div><div class='add'>+            /* This changes GA to RGBA */</div><div class='ctx'>             png_bytep sp = row + (png_size_t)row_width * 2 - 1;</div><div class='ctx'>             png_bytep dp = sp  + (png_size_t)row_width * 2;</div><div class='ctx'>             for (i = 0; i &lt; row_width; i++)</div><div class='hunk'>@@ -2209,8 +2371,10 @@ png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)</div><div class='ctx'>                *(dp--) = *(sp--);</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>          {</div><div class='add'>+            /* This changes GGAA to RRGGBBAA */</div><div class='ctx'>             png_bytep sp = row + (png_size_t)row_width * 4 - 1;</div><div class='ctx'>             png_bytep dp = sp  + (png_size_t)row_width * 4;</div><div class='ctx'>             for (i = 0; i &lt; row_width; i++)</div><div class='hunk'>@@ -2229,7 +2393,7 @@ png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)</div><div class='ctx'>       row_info-&gt;channels += (png_byte)2;</div><div class='ctx'>       row_info-&gt;color_type |= PNG_COLOR_MASK_COLOR;</div><div class='ctx'>       row_info-&gt;pixel_depth = (png_byte)(row_info-&gt;channels *</div><div class='del'>-         row_info-&gt;bit_depth);</div><div class='add'>+          row_info-&gt;bit_depth);</div><div class='ctx'>       row_info-&gt;rowbytes = PNG_ROWBYTES(row_info-&gt;pixel_depth, row_width);</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='hunk'>@@ -2268,8 +2432,8 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_do_rgb_to_gray");</div><div class='ctx'> </div><div class='del'>-   if (</div><div class='del'>-      (row_info-&gt;color_type &amp; PNG_COLOR_MASK_COLOR))</div><div class='add'>+   if (!(row_info-&gt;color_type &amp; PNG_COLOR_MASK_PALETTE) &amp;&amp;</div><div class='add'>+       (row_info-&gt;color_type &amp; PNG_COLOR_MASK_COLOR))</div><div class='ctx'>    {</div><div class='ctx'>       png_uint_32 rc = png_ptr-&gt;rgb_to_gray_red_coeff;</div><div class='ctx'>       png_uint_32 gc = png_ptr-&gt;rgb_to_gray_green_coeff;</div><div class='hunk'>@@ -2290,12 +2454,14 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)</div><div class='ctx'>                   png_byte red   = png_ptr-&gt;gamma_to_1[*(sp++)];</div><div class='ctx'>                   png_byte green = png_ptr-&gt;gamma_to_1[*(sp++)];</div><div class='ctx'>                   png_byte blue  = png_ptr-&gt;gamma_to_1[*(sp++)];</div><div class='add'>+</div><div class='ctx'>                   if (red != green || red != blue)</div><div class='ctx'>                   {</div><div class='ctx'>                      rgb_error |= 1;</div><div class='ctx'>                      *(dp++) = png_ptr-&gt;gamma_from_1[</div><div class='del'>-                       (rc*red + gc*green + bc*blue)&gt;&gt;15];</div><div class='add'>+                         (rc*red + gc*green + bc*blue)&gt;&gt;15];</div><div class='ctx'>                   }</div><div class='add'>+</div><div class='ctx'>                   else</div><div class='ctx'>                      *(dp++) = *(sp - 1);</div><div class='ctx'>                }</div><div class='hunk'>@@ -2310,11 +2476,13 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)</div><div class='ctx'>                   png_byte red   = *(sp++);</div><div class='ctx'>                   png_byte green = *(sp++);</div><div class='ctx'>                   png_byte blue  = *(sp++);</div><div class='add'>+</div><div class='ctx'>                   if (red != green || red != blue)</div><div class='ctx'>                   {</div><div class='ctx'>                      rgb_error |= 1;</div><div class='ctx'>                      *(dp++) = (png_byte)((rc*red + gc*green + bc*blue)&gt;&gt;15);</div><div class='ctx'>                   }</div><div class='add'>+</div><div class='ctx'>                   else</div><div class='ctx'>                      *(dp++) = *(sp - 1);</div><div class='ctx'>                }</div><div class='hunk'>@@ -2333,22 +2501,24 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)</div><div class='ctx'>                {</div><div class='ctx'>                   png_uint_16 red, green, blue, w;</div><div class='ctx'> </div><div class='del'>-                  red   = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp+1)); sp+=2;</div><div class='del'>-                  green = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp+1)); sp+=2;</div><div class='del'>-                  blue  = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp+1)); sp+=2;</div><div class='add'>+                  red   = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp + 1)); sp += 2;</div><div class='add'>+                  green = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp + 1)); sp += 2;</div><div class='add'>+                  blue  = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp + 1)); sp += 2;</div><div class='ctx'> </div><div class='ctx'>                   if (red == green &amp;&amp; red == blue)</div><div class='ctx'>                      w = red;</div><div class='add'>+</div><div class='ctx'>                   else</div><div class='ctx'>                   {</div><div class='del'>-                     png_uint_16 red_1   = png_ptr-&gt;gamma_16_to_1[(red&amp;0xff) &gt;&gt;</div><div class='del'>-                                  png_ptr-&gt;gamma_shift][red&gt;&gt;8];</div><div class='del'>-                     png_uint_16 green_1 = png_ptr-&gt;gamma_16_to_1[(green&amp;0xff) &gt;&gt;</div><div class='del'>-                                  png_ptr-&gt;gamma_shift][green&gt;&gt;8];</div><div class='del'>-                     png_uint_16 blue_1  = png_ptr-&gt;gamma_16_to_1[(blue&amp;0xff) &gt;&gt;</div><div class='del'>-                                  png_ptr-&gt;gamma_shift][blue&gt;&gt;8];</div><div class='add'>+                     png_uint_16 red_1   = png_ptr-&gt;gamma_16_to_1[(red&amp;0xff)</div><div class='add'>+                         &gt;&gt; png_ptr-&gt;gamma_shift][red&gt;&gt;8];</div><div class='add'>+                     png_uint_16 green_1 =</div><div class='add'>+                         png_ptr-&gt;gamma_16_to_1[(green&amp;0xff) &gt;&gt;</div><div class='add'>+                         png_ptr-&gt;gamma_shift][green&gt;&gt;8];</div><div class='add'>+                     png_uint_16 blue_1  = png_ptr-&gt;gamma_16_to_1[(blue&amp;0xff)</div><div class='add'>+                         &gt;&gt; png_ptr-&gt;gamma_shift][blue&gt;&gt;8];</div><div class='ctx'>                      png_uint_16 gray16  = (png_uint_16)((rc*red_1 + gc*green_1</div><div class='del'>-                                  + bc*blue_1)&gt;&gt;15);</div><div class='add'>+                         + bc*blue_1)&gt;&gt;15);</div><div class='ctx'>                      w = png_ptr-&gt;gamma_16_from_1[(gray16&amp;0xff) &gt;&gt;</div><div class='ctx'>                          png_ptr-&gt;gamma_shift][gray16 &gt;&gt; 8];</div><div class='ctx'>                      rgb_error |= 1;</div><div class='hunk'>@@ -2367,12 +2537,13 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)</div><div class='ctx'>                {</div><div class='ctx'>                   png_uint_16 red, green, blue, gray16;</div><div class='ctx'> </div><div class='del'>-                  red   = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp+1)); sp+=2;</div><div class='del'>-                  green = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp+1)); sp+=2;</div><div class='del'>-                  blue  = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp+1)); sp+=2;</div><div class='add'>+                  red   = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp + 1)); sp += 2;</div><div class='add'>+                  green = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp + 1)); sp += 2;</div><div class='add'>+                  blue  = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp + 1)); sp += 2;</div><div class='ctx'> </div><div class='ctx'>                   if (red != green || red != blue)</div><div class='ctx'>                      rgb_error |= 1;</div><div class='add'>+</div><div class='ctx'>                   gray16  = (png_uint_16)((rc*red + gc*green + bc*blue)&gt;&gt;15);</div><div class='ctx'>                   *(dp++) = (png_byte)((gray16&gt;&gt;8) &amp; 0xff);</div><div class='ctx'>                   *(dp++) = (png_byte)(gray16 &amp; 0xff);</div><div class='hunk'>@@ -2394,10 +2565,13 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)</div><div class='ctx'>                   png_byte red   = png_ptr-&gt;gamma_to_1[*(sp++)];</div><div class='ctx'>                   png_byte green = png_ptr-&gt;gamma_to_1[*(sp++)];</div><div class='ctx'>                   png_byte blue  = png_ptr-&gt;gamma_to_1[*(sp++)];</div><div class='add'>+</div><div class='ctx'>                   if (red != green || red != blue)</div><div class='ctx'>                      rgb_error |= 1;</div><div class='add'>+</div><div class='ctx'>                   *(dp++) =  png_ptr-&gt;gamma_from_1</div><div class='del'>-                             [(rc*red + gc*green + bc*blue)&gt;&gt;15];</div><div class='add'>+                      [(rc*red + gc*green + bc*blue)&gt;&gt;15];</div><div class='add'>+</div><div class='ctx'>                   *(dp++) = *(sp++);  /* alpha */</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='hunk'>@@ -2413,6 +2587,7 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)</div><div class='ctx'>                   png_byte blue  = *(sp++);</div><div class='ctx'>                   if (red != green || red != blue)</div><div class='ctx'>                      rgb_error |= 1;</div><div class='add'>+</div><div class='ctx'>                   *(dp++) =  (png_byte)((rc*red + gc*green + bc*blue)&gt;&gt;15);</div><div class='ctx'>                   *(dp++) = *(sp++);  /* alpha */</div><div class='ctx'>                }</div><div class='hunk'>@@ -2430,24 +2605,31 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)</div><div class='ctx'>                {</div><div class='ctx'>                   png_uint_16 red, green, blue, w;</div><div class='ctx'> </div><div class='del'>-                  red   = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp+1)); sp+=2;</div><div class='del'>-                  green = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp+1)); sp+=2;</div><div class='del'>-                  blue  = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp+1)); sp+=2;</div><div class='add'>+                  red   = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp + 1)); sp += 2;</div><div class='add'>+                  green = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp + 1)); sp += 2;</div><div class='add'>+                  blue  = (png_uint_16)(((*(sp))&lt;&lt;8) | *(sp + 1)); sp += 2;</div><div class='ctx'> </div><div class='ctx'>                   if (red == green &amp;&amp; red == blue)</div><div class='ctx'>                      w = red;</div><div class='add'>+</div><div class='ctx'>                   else</div><div class='ctx'>                   {</div><div class='ctx'>                      png_uint_16 red_1   = png_ptr-&gt;gamma_16_to_1[(red&amp;0xff) &gt;&gt;</div><div class='del'>-                                  png_ptr-&gt;gamma_shift][red&gt;&gt;8];</div><div class='del'>-                     png_uint_16 green_1 = png_ptr-&gt;gamma_16_to_1[(green&amp;0xff) &gt;&gt;</div><div class='del'>-                                  png_ptr-&gt;gamma_shift][green&gt;&gt;8];</div><div class='add'>+                         png_ptr-&gt;gamma_shift][red&gt;&gt;8];</div><div class='add'>+</div><div class='add'>+                     png_uint_16 green_1 =</div><div class='add'>+                         png_ptr-&gt;gamma_16_to_1[(green&amp;0xff) &gt;&gt;</div><div class='add'>+                         png_ptr-&gt;gamma_shift][green&gt;&gt;8];</div><div class='add'>+</div><div class='ctx'>                      png_uint_16 blue_1  = png_ptr-&gt;gamma_16_to_1[(blue&amp;0xff) &gt;&gt;</div><div class='del'>-                                  png_ptr-&gt;gamma_shift][blue&gt;&gt;8];</div><div class='add'>+                         png_ptr-&gt;gamma_shift][blue&gt;&gt;8];</div><div class='add'>+</div><div class='ctx'>                      png_uint_16 gray16  = (png_uint_16)((rc * red_1</div><div class='del'>-                                  + gc * green_1 + bc * blue_1)&gt;&gt;15);</div><div class='add'>+                         + gc * green_1 + bc * blue_1)&gt;&gt;15);</div><div class='add'>+</div><div class='ctx'>                      w = png_ptr-&gt;gamma_16_from_1[(gray16&amp;0xff) &gt;&gt;</div><div class='ctx'>                          png_ptr-&gt;gamma_shift][gray16 &gt;&gt; 8];</div><div class='add'>+</div><div class='ctx'>                      rgb_error |= 1;</div><div class='ctx'>                   }</div><div class='ctx'> </div><div class='hunk'>@@ -2465,11 +2647,13 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)</div><div class='ctx'>                for (i = 0; i &lt; row_width; i++)</div><div class='ctx'>                {</div><div class='ctx'>                   png_uint_16 red, green, blue, gray16;</div><div class='del'>-                  red   = (png_uint_16)((*(sp)&lt;&lt;8) | *(sp+1)); sp+=2;</div><div class='del'>-                  green = (png_uint_16)((*(sp)&lt;&lt;8) | *(sp+1)); sp+=2;</div><div class='del'>-                  blue  = (png_uint_16)((*(sp)&lt;&lt;8) | *(sp+1)); sp+=2;</div><div class='add'>+                  red   = (png_uint_16)((*(sp)&lt;&lt;8) | *(sp + 1)); sp += 2;</div><div class='add'>+                  green = (png_uint_16)((*(sp)&lt;&lt;8) | *(sp + 1)); sp += 2;</div><div class='add'>+                  blue  = (png_uint_16)((*(sp)&lt;&lt;8) | *(sp + 1)); sp += 2;</div><div class='add'>+</div><div class='ctx'>                   if (red != green || red != blue)</div><div class='ctx'>                      rgb_error |= 1;</div><div class='add'>+</div><div class='ctx'>                   gray16  = (png_uint_16)((rc*red + gc*green + bc*blue)&gt;&gt;15);</div><div class='ctx'>                   *(dp++) = (png_byte)((gray16&gt;&gt;8) &amp; 0xff);</div><div class='ctx'>                   *(dp++) = (png_byte)(gray16 &amp; 0xff);</div><div class='hunk'>@@ -2479,10 +2663,11 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='del'>-   row_info-&gt;channels -= (png_byte)2;</div><div class='del'>-      row_info-&gt;color_type &amp;= ~PNG_COLOR_MASK_COLOR;</div><div class='add'>+      row_info-&gt;channels -= 2;</div><div class='add'>+      row_info-&gt;color_type = (png_byte)(row_info-&gt;color_type &amp;</div><div class='add'>+          ~PNG_COLOR_MASK_COLOR);</div><div class='ctx'>       row_info-&gt;pixel_depth = (png_byte)(row_info-&gt;channels *</div><div class='del'>-         row_info-&gt;bit_depth);</div><div class='add'>+          row_info-&gt;bit_depth);</div><div class='ctx'>       row_info-&gt;rowbytes = PNG_ROWBYTES(row_info-&gt;pixel_depth, row_width);</div><div class='ctx'>    }</div><div class='ctx'>    return rgb_error;</div><div class='hunk'>@@ -2551,18 +2736,18 @@ png_build_grayscale_palette(int bit_depth, png_colorp palette)</div><div class='ctx'>  */</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_do_background(png_row_infop row_info, png_bytep row,</div><div class='del'>-   png_color_16p trans_color, png_color_16p background</div><div class='add'>+    png_const_color_16p trans_color, png_const_color_16p background</div><div class='ctx'> #ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='del'>-   , png_color_16p background_1,</div><div class='del'>-   png_bytep gamma_table, png_bytep gamma_from_1, png_bytep gamma_to_1,</div><div class='del'>-   png_uint_16pp gamma_16, png_uint_16pp gamma_16_from_1,</div><div class='del'>-   png_uint_16pp gamma_16_to_1, int gamma_shift</div><div class='add'>+    , png_const_color_16p background_1, png_const_bytep gamma_table,</div><div class='add'>+    png_const_bytep gamma_from_1, png_const_bytep gamma_to_1,</div><div class='add'>+    png_const_uint_16pp gamma_16, png_const_uint_16pp gamma_16_from_1,</div><div class='add'>+    png_const_uint_16pp gamma_16_to_1, int gamma_shift</div><div class='ctx'> #endif</div><div class='del'>-   )</div><div class='add'>+    )</div><div class='ctx'> {</div><div class='ctx'>    png_bytep sp, dp;</div><div class='ctx'>    png_uint_32 i;</div><div class='del'>-   png_uint_32 row_width=row_info-&gt;width;</div><div class='add'>+   png_uint_32 row_width = row_info-&gt;width;</div><div class='ctx'>    int shift;</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_do_background");</div><div class='hunk'>@@ -2589,11 +2774,13 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         *sp &amp;= (png_byte)((0x7f7f &gt;&gt; (7 - shift)) &amp; 0xff);</div><div class='ctx'>                         *sp |= (png_byte)(background-&gt;gray &lt;&lt; shift);</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'>                      if (!shift)</div><div class='ctx'>                      {</div><div class='ctx'>                         shift = 7;</div><div class='ctx'>                         sp++;</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'>                      else</div><div class='ctx'>                         shift--;</div><div class='ctx'>                   }</div><div class='hunk'>@@ -2615,6 +2802,7 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                            *sp &amp;= (png_byte)((0x3f3f &gt;&gt; (6 - shift)) &amp; 0xff);</div><div class='ctx'>                            *sp |= (png_byte)(background-&gt;gray &lt;&lt; shift);</div><div class='ctx'>                         }</div><div class='add'>+</div><div class='ctx'>                         else</div><div class='ctx'>                         {</div><div class='ctx'>                            png_byte p = (png_byte)((*sp &gt;&gt; shift) &amp; 0x03);</div><div class='hunk'>@@ -2623,15 +2811,18 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                            *sp &amp;= (png_byte)((0x3f3f &gt;&gt; (6 - shift)) &amp; 0xff);</div><div class='ctx'>                            *sp |= (png_byte)(g &lt;&lt; shift);</div><div class='ctx'>                         }</div><div class='add'>+</div><div class='ctx'>                         if (!shift)</div><div class='ctx'>                         {</div><div class='ctx'>                            shift = 6;</div><div class='ctx'>                            sp++;</div><div class='ctx'>                         }</div><div class='add'>+</div><div class='ctx'>                         else</div><div class='ctx'>                            shift -= 2;</div><div class='ctx'>                      }</div><div class='ctx'>                   }</div><div class='add'>+</div><div class='ctx'>                   else</div><div class='ctx'> #endif</div><div class='ctx'>                   {</div><div class='hunk'>@@ -2645,11 +2836,13 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                            *sp &amp;= (png_byte)((0x3f3f &gt;&gt; (6 - shift)) &amp; 0xff);</div><div class='ctx'>                            *sp |= (png_byte)(background-&gt;gray &lt;&lt; shift);</div><div class='ctx'>                         }</div><div class='add'>+</div><div class='ctx'>                         if (!shift)</div><div class='ctx'>                         {</div><div class='ctx'>                            shift = 6;</div><div class='ctx'>                            sp++;</div><div class='ctx'>                         }</div><div class='add'>+</div><div class='ctx'>                         else</div><div class='ctx'>                            shift -= 2;</div><div class='ctx'>                      }</div><div class='hunk'>@@ -2672,23 +2865,27 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                            *sp &amp;= (png_byte)((0xf0f &gt;&gt; (4 - shift)) &amp; 0xff);</div><div class='ctx'>                            *sp |= (png_byte)(background-&gt;gray &lt;&lt; shift);</div><div class='ctx'>                         }</div><div class='add'>+</div><div class='ctx'>                         else</div><div class='ctx'>                         {</div><div class='ctx'>                            png_byte p = (png_byte)((*sp &gt;&gt; shift) &amp; 0x0f);</div><div class='ctx'>                            png_byte g = (png_byte)((gamma_table[p |</div><div class='del'>-                             (p &lt;&lt; 4)] &gt;&gt; 4) &amp; 0x0f);</div><div class='add'>+                               (p &lt;&lt; 4)] &gt;&gt; 4) &amp; 0x0f);</div><div class='ctx'>                            *sp &amp;= (png_byte)((0xf0f &gt;&gt; (4 - shift)) &amp; 0xff);</div><div class='ctx'>                            *sp |= (png_byte)(g &lt;&lt; shift);</div><div class='ctx'>                         }</div><div class='add'>+</div><div class='ctx'>                         if (!shift)</div><div class='ctx'>                         {</div><div class='ctx'>                            shift = 4;</div><div class='ctx'>                            sp++;</div><div class='ctx'>                         }</div><div class='add'>+</div><div class='ctx'>                         else</div><div class='ctx'>                            shift -= 4;</div><div class='ctx'>                      }</div><div class='ctx'>                   }</div><div class='add'>+</div><div class='ctx'>                   else</div><div class='ctx'> #endif</div><div class='ctx'>                   {</div><div class='hunk'>@@ -2702,11 +2899,13 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                            *sp &amp;= (png_byte)((0xf0f &gt;&gt; (4 - shift)) &amp; 0xff);</div><div class='ctx'>                            *sp |= (png_byte)(background-&gt;gray &lt;&lt; shift);</div><div class='ctx'>                         }</div><div class='add'>+</div><div class='ctx'>                         if (!shift)</div><div class='ctx'>                         {</div><div class='ctx'>                            shift = 4;</div><div class='ctx'>                            sp++;</div><div class='ctx'>                         }</div><div class='add'>+</div><div class='ctx'>                         else</div><div class='ctx'>                            shift -= 4;</div><div class='ctx'>                      }</div><div class='hunk'>@@ -2723,13 +2922,10 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                      for (i = 0; i &lt; row_width; i++, sp++)</div><div class='ctx'>                      {</div><div class='ctx'>                         if (*sp == trans_color-&gt;gray)</div><div class='del'>-                        {</div><div class='ctx'>                            *sp = (png_byte)background-&gt;gray;</div><div class='del'>-                        }</div><div class='add'>+</div><div class='ctx'>                         else</div><div class='del'>-                        {</div><div class='ctx'>                            *sp = gamma_table[*sp];</div><div class='del'>-                        }</div><div class='ctx'>                      }</div><div class='ctx'>                   }</div><div class='ctx'>                   else</div><div class='hunk'>@@ -2739,9 +2935,7 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                      for (i = 0; i &lt; row_width; i++, sp++)</div><div class='ctx'>                      {</div><div class='ctx'>                         if (*sp == trans_color-&gt;gray)</div><div class='del'>-                        {</div><div class='ctx'>                            *sp = (png_byte)background-&gt;gray;</div><div class='del'>-                        }</div><div class='ctx'>                      }</div><div class='ctx'>                   }</div><div class='ctx'>                   break;</div><div class='hunk'>@@ -2758,12 +2952,14 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         png_uint_16 v;</div><div class='ctx'> </div><div class='ctx'>                         v = (png_uint_16)(((*sp) &lt;&lt; 8) + *(sp + 1));</div><div class='add'>+</div><div class='ctx'>                         if (v == trans_color-&gt;gray)</div><div class='ctx'>                         {</div><div class='ctx'>                            /* Background is already in screen gamma */</div><div class='ctx'>                            *sp = (png_byte)((background-&gt;gray &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                            *(sp + 1) = (png_byte)(background-&gt;gray &amp; 0xff);</div><div class='ctx'>                         }</div><div class='add'>+</div><div class='ctx'>                         else</div><div class='ctx'>                         {</div><div class='ctx'>                            v = gamma_16[*(sp + 1) &gt;&gt; gamma_shift][*sp];</div><div class='hunk'>@@ -2781,6 +2977,7 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         png_uint_16 v;</div><div class='ctx'> </div><div class='ctx'>                         v = (png_uint_16)(((*sp) &lt;&lt; 8) + *(sp + 1));</div><div class='add'>+</div><div class='ctx'>                         if (v == trans_color-&gt;gray)</div><div class='ctx'>                         {</div><div class='ctx'>                            *sp = (png_byte)((background-&gt;gray &gt;&gt; 8) &amp; 0xff);</div><div class='hunk'>@@ -2790,6 +2987,9 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                   }</div><div class='ctx'>                   break;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='add'>+               default:</div><div class='add'>+                  break;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='hunk'>@@ -2805,13 +3005,14 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                   for (i = 0; i &lt; row_width; i++, sp += 3)</div><div class='ctx'>                   {</div><div class='ctx'>                      if (*sp == trans_color-&gt;red &amp;&amp;</div><div class='del'>-                        *(sp + 1) == trans_color-&gt;green &amp;&amp;</div><div class='del'>-                        *(sp + 2) == trans_color-&gt;blue)</div><div class='add'>+                         *(sp + 1) == trans_color-&gt;green &amp;&amp;</div><div class='add'>+                         *(sp + 2) == trans_color-&gt;blue)</div><div class='ctx'>                      {</div><div class='ctx'>                         *sp = (png_byte)background-&gt;red;</div><div class='ctx'>                         *(sp + 1) = (png_byte)background-&gt;green;</div><div class='ctx'>                         *(sp + 2) = (png_byte)background-&gt;blue;</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'>                      else</div><div class='ctx'>                      {</div><div class='ctx'>                         *sp = gamma_table[*sp];</div><div class='hunk'>@@ -2827,8 +3028,8 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                   for (i = 0; i &lt; row_width; i++, sp += 3)</div><div class='ctx'>                   {</div><div class='ctx'>                      if (*sp == trans_color-&gt;red &amp;&amp;</div><div class='del'>-                        *(sp + 1) == trans_color-&gt;green &amp;&amp;</div><div class='del'>-                        *(sp + 2) == trans_color-&gt;blue)</div><div class='add'>+                         *(sp + 1) == trans_color-&gt;green &amp;&amp;</div><div class='add'>+                         *(sp + 2) == trans_color-&gt;blue)</div><div class='ctx'>                      {</div><div class='ctx'>                         *sp = (png_byte)background-&gt;red;</div><div class='ctx'>                         *(sp + 1) = (png_byte)background-&gt;green;</div><div class='hunk'>@@ -2846,10 +3047,15 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                   for (i = 0; i &lt; row_width; i++, sp += 6)</div><div class='ctx'>                   {</div><div class='ctx'>                      png_uint_16 r = (png_uint_16)(((*sp) &lt;&lt; 8) + *(sp + 1));</div><div class='del'>-                     png_uint_16 g = (png_uint_16)(((*(sp+2)) &lt;&lt; 8) + *(sp+3));</div><div class='del'>-                     png_uint_16 b = (png_uint_16)(((*(sp+4)) &lt;&lt; 8) + *(sp+5));</div><div class='add'>+</div><div class='add'>+                     png_uint_16 g = (png_uint_16)(((*(sp + 2)) &lt;&lt; 8)</div><div class='add'>+                         + *(sp + 3));</div><div class='add'>+</div><div class='add'>+                     png_uint_16 b = (png_uint_16)(((*(sp + 4)) &lt;&lt; 8)</div><div class='add'>+                         + *(sp + 5));</div><div class='add'>+</div><div class='ctx'>                      if (r == trans_color-&gt;red &amp;&amp; g == trans_color-&gt;green &amp;&amp;</div><div class='del'>-                        b == trans_color-&gt;blue)</div><div class='add'>+                         b == trans_color-&gt;blue)</div><div class='ctx'>                      {</div><div class='ctx'>                         /* Background is already in screen gamma */</div><div class='ctx'>                         *sp = (png_byte)((background-&gt;red &gt;&gt; 8) &amp; 0xff);</div><div class='hunk'>@@ -2859,32 +3065,40 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         *(sp + 4) = (png_byte)((background-&gt;blue &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(sp + 5) = (png_byte)(background-&gt;blue &amp; 0xff);</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'>                      else</div><div class='ctx'>                      {</div><div class='ctx'>                         png_uint_16 v = gamma_16[*(sp + 1) &gt;&gt; gamma_shift][*sp];</div><div class='ctx'>                         *sp = (png_byte)((v &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(sp + 1) = (png_byte)(v &amp; 0xff);</div><div class='add'>+</div><div class='ctx'>                         v = gamma_16[*(sp + 3) &gt;&gt; gamma_shift][*(sp + 2)];</div><div class='ctx'>                         *(sp + 2) = (png_byte)((v &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(sp + 3) = (png_byte)(v &amp; 0xff);</div><div class='add'>+</div><div class='ctx'>                         v = gamma_16[*(sp + 5) &gt;&gt; gamma_shift][*(sp + 4)];</div><div class='ctx'>                         *(sp + 4) = (png_byte)((v &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(sp + 5) = (png_byte)(v &amp; 0xff);</div><div class='ctx'>                      }</div><div class='ctx'>                   }</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'> #endif</div><div class='ctx'>                {</div><div class='ctx'>                   sp = row;</div><div class='ctx'>                   for (i = 0; i &lt; row_width; i++, sp += 6)</div><div class='ctx'>                   {</div><div class='del'>-                     png_uint_16 r = (png_uint_16)(((*sp) &lt;&lt; 8) + *(sp+1));</div><div class='del'>-                     png_uint_16 g = (png_uint_16)(((*(sp+2)) &lt;&lt; 8) + *(sp+3));</div><div class='del'>-                     png_uint_16 b = (png_uint_16)(((*(sp+4)) &lt;&lt; 8) + *(sp+5));</div><div class='add'>+                     png_uint_16 r = (png_uint_16)(((*sp) &lt;&lt; 8) + *(sp + 1));</div><div class='add'>+</div><div class='add'>+                     png_uint_16 g = (png_uint_16)(((*(sp + 2)) &lt;&lt; 8)</div><div class='add'>+                         + *(sp + 3));</div><div class='add'>+</div><div class='add'>+                     png_uint_16 b = (png_uint_16)(((*(sp + 4)) &lt;&lt; 8)</div><div class='add'>+                         + *(sp + 5));</div><div class='ctx'> </div><div class='ctx'>                      if (r == trans_color-&gt;red &amp;&amp; g == trans_color-&gt;green &amp;&amp;</div><div class='del'>-                        b == trans_color-&gt;blue)</div><div class='add'>+                         b == trans_color-&gt;blue)</div><div class='ctx'>                      {</div><div class='ctx'>                         *sp = (png_byte)((background-&gt;red &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(sp + 1) = (png_byte)(background-&gt;red &amp; 0xff);</div><div class='hunk'>@@ -2914,14 +3128,14 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                      png_uint_16 a = *(sp + 1);</div><div class='ctx'> </div><div class='ctx'>                      if (a == 0xff)</div><div class='del'>-                     {</div><div class='ctx'>                         *dp = gamma_table[*sp];</div><div class='del'>-                     }</div><div class='add'>+</div><div class='ctx'>                      else if (a == 0)</div><div class='ctx'>                      {</div><div class='ctx'>                         /* Background is already in screen gamma */</div><div class='ctx'>                         *dp = (png_byte)background-&gt;gray;</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'>                      else</div><div class='ctx'>                      {</div><div class='ctx'>                         png_byte v, w;</div><div class='hunk'>@@ -2942,18 +3156,15 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                      png_byte a = *(sp + 1);</div><div class='ctx'> </div><div class='ctx'>                      if (a == 0xff)</div><div class='del'>-                     {</div><div class='ctx'>                         *dp = *sp;</div><div class='del'>-                     }</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='ctx'>                      else if (a == 0)</div><div class='del'>-                     {</div><div class='ctx'>                         *dp = (png_byte)background-&gt;gray;</div><div class='del'>-                     }</div><div class='add'>+</div><div class='ctx'>                      else</div><div class='del'>-                     {</div><div class='ctx'>                         png_composite(*dp, *sp, a, background_1-&gt;gray);</div><div class='del'>-                     }</div><div class='add'>+</div><div class='ctx'> #else</div><div class='ctx'>                      *dp = (png_byte)background-&gt;gray;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2970,7 +3181,8 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                   dp = row;</div><div class='ctx'>                   for (i = 0; i &lt; row_width; i++, sp += 4, dp += 2)</div><div class='ctx'>                   {</div><div class='del'>-                     png_uint_16 a = (png_uint_16)(((*(sp+2)) &lt;&lt; 8) + *(sp+3));</div><div class='add'>+                     png_uint_16 a = (png_uint_16)(((*(sp + 2)) &lt;&lt; 8)</div><div class='add'>+                         + *(sp + 3));</div><div class='ctx'> </div><div class='ctx'>                      if (a == (png_uint_16)0xffff)</div><div class='ctx'>                      {</div><div class='hunk'>@@ -2980,6 +3192,7 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         *dp = (png_byte)((v &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(dp + 1) = (png_byte)(v &amp; 0xff);</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='ctx'>                      else if (a == 0)</div><div class='ctx'> #else</div><div class='hunk'>@@ -2990,6 +3203,7 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         *dp = (png_byte)((background-&gt;gray &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(dp + 1) = (png_byte)(background-&gt;gray &amp; 0xff);</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='ctx'>                      else</div><div class='ctx'>                      {</div><div class='hunk'>@@ -3011,11 +3225,12 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                   dp = row;</div><div class='ctx'>                   for (i = 0; i &lt; row_width; i++, sp += 4, dp += 2)</div><div class='ctx'>                   {</div><div class='del'>-                     png_uint_16 a = (png_uint_16)(((*(sp+2)) &lt;&lt; 8) + *(sp+3));</div><div class='add'>+                     png_uint_16 a = (png_uint_16)(((*(sp + 2)) &lt;&lt; 8)</div><div class='add'>+                         + *(sp + 3));</div><div class='add'>+</div><div class='ctx'>                      if (a == (png_uint_16)0xffff)</div><div class='del'>-                     {</div><div class='ctx'>                         png_memcpy(dp, sp, 2);</div><div class='del'>-                     }</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='ctx'>                      else if (a == 0)</div><div class='ctx'> #else</div><div class='hunk'>@@ -3025,6 +3240,7 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         *dp = (png_byte)((background-&gt;gray &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(dp + 1) = (png_byte)(background-&gt;gray &amp; 0xff);</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='ctx'>                      else</div><div class='ctx'>                      {</div><div class='hunk'>@@ -3062,6 +3278,7 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         *(dp + 1) = gamma_table[*(sp + 1)];</div><div class='ctx'>                         *(dp + 2) = gamma_table[*(sp + 2)];</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'>                      else if (a == 0)</div><div class='ctx'>                      {</div><div class='ctx'>                         /* Background is already in screen gamma */</div><div class='hunk'>@@ -3069,6 +3286,7 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         *(dp + 1) = (png_byte)background-&gt;green;</div><div class='ctx'>                         *(dp + 2) = (png_byte)background-&gt;blue;</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'>                      else</div><div class='ctx'>                      {</div><div class='ctx'>                         png_byte v, w;</div><div class='hunk'>@@ -3076,9 +3294,11 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         v = gamma_to_1[*sp];</div><div class='ctx'>                         png_composite(w, v, a, background_1-&gt;red);</div><div class='ctx'>                         *dp = gamma_from_1[w];</div><div class='add'>+</div><div class='ctx'>                         v = gamma_to_1[*(sp + 1)];</div><div class='ctx'>                         png_composite(w, v, a, background_1-&gt;green);</div><div class='ctx'>                         *(dp + 1) = gamma_from_1[w];</div><div class='add'>+</div><div class='ctx'>                         v = gamma_to_1[*(sp + 2)];</div><div class='ctx'>                         png_composite(w, v, a, background_1-&gt;blue);</div><div class='ctx'>                         *(dp + 2) = gamma_from_1[w];</div><div class='hunk'>@@ -3100,19 +3320,23 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         *(dp + 1) = *(sp + 1);</div><div class='ctx'>                         *(dp + 2) = *(sp + 2);</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'>                      else if (a == 0)</div><div class='ctx'>                      {</div><div class='ctx'>                         *dp = (png_byte)background-&gt;red;</div><div class='ctx'>                         *(dp + 1) = (png_byte)background-&gt;green;</div><div class='ctx'>                         *(dp + 2) = (png_byte)background-&gt;blue;</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'>                      else</div><div class='ctx'>                      {</div><div class='ctx'>                         png_composite(*dp, *sp, a, background-&gt;red);</div><div class='add'>+</div><div class='ctx'>                         png_composite(*(dp + 1), *(sp + 1), a,</div><div class='del'>-                           background-&gt;green);</div><div class='add'>+                            background-&gt;green);</div><div class='add'>+</div><div class='ctx'>                         png_composite(*(dp + 2), *(sp + 2), a,</div><div class='del'>-                           background-&gt;blue);</div><div class='add'>+                            background-&gt;blue);</div><div class='ctx'>                      }</div><div class='ctx'>                   }</div><div class='ctx'>                }</div><div class='hunk'>@@ -3129,6 +3353,7 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                   {</div><div class='ctx'>                      png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))</div><div class='ctx'>                          &lt;&lt; 8) + (png_uint_16)(*(sp + 7)));</div><div class='add'>+</div><div class='ctx'>                      if (a == (png_uint_16)0xffff)</div><div class='ctx'>                      {</div><div class='ctx'>                         png_uint_16 v;</div><div class='hunk'>@@ -3136,13 +3361,16 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         v = gamma_16[*(sp + 1) &gt;&gt; gamma_shift][*sp];</div><div class='ctx'>                         *dp = (png_byte)((v &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(dp + 1) = (png_byte)(v &amp; 0xff);</div><div class='add'>+</div><div class='ctx'>                         v = gamma_16[*(sp + 3) &gt;&gt; gamma_shift][*(sp + 2)];</div><div class='ctx'>                         *(dp + 2) = (png_byte)((v &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(dp + 3) = (png_byte)(v &amp; 0xff);</div><div class='add'>+</div><div class='ctx'>                         v = gamma_16[*(sp + 5) &gt;&gt; gamma_shift][*(sp + 4)];</div><div class='ctx'>                         *(dp + 4) = (png_byte)((v &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(dp + 5) = (png_byte)(v &amp; 0xff);</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'>                      else if (a == 0)</div><div class='ctx'>                      {</div><div class='ctx'>                         /* Background is already in screen gamma */</div><div class='hunk'>@@ -3153,28 +3381,35 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         *(dp + 4) = (png_byte)((background-&gt;blue &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(dp + 5) = (png_byte)(background-&gt;blue &amp; 0xff);</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'>                      else</div><div class='ctx'>                      {</div><div class='ctx'>                         png_uint_16 v, w, x;</div><div class='ctx'> </div><div class='ctx'>                         v = gamma_16_to_1[*(sp + 1) &gt;&gt; gamma_shift][*sp];</div><div class='ctx'>                         png_composite_16(w, v, a, background_1-&gt;red);</div><div class='add'>+</div><div class='ctx'>                         x = gamma_16_from_1[((w&amp;0xff) &gt;&gt; gamma_shift)][w &gt;&gt; 8];</div><div class='ctx'>                         *dp = (png_byte)((x &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(dp + 1) = (png_byte)(x &amp; 0xff);</div><div class='add'>+</div><div class='ctx'>                         v = gamma_16_to_1[*(sp + 3) &gt;&gt; gamma_shift][*(sp + 2)];</div><div class='ctx'>                         png_composite_16(w, v, a, background_1-&gt;green);</div><div class='add'>+</div><div class='ctx'>                         x = gamma_16_from_1[((w&amp;0xff) &gt;&gt; gamma_shift)][w &gt;&gt; 8];</div><div class='ctx'>                         *(dp + 2) = (png_byte)((x &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(dp + 3) = (png_byte)(x &amp; 0xff);</div><div class='add'>+</div><div class='ctx'>                         v = gamma_16_to_1[*(sp + 5) &gt;&gt; gamma_shift][*(sp + 4)];</div><div class='ctx'>                         png_composite_16(w, v, a, background_1-&gt;blue);</div><div class='add'>+</div><div class='ctx'>                         x = gamma_16_from_1[(w &amp; 0xff) &gt;&gt; gamma_shift][w &gt;&gt; 8];</div><div class='ctx'>                         *(dp + 4) = (png_byte)((x &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(dp + 5) = (png_byte)(x &amp; 0xff);</div><div class='ctx'>                      }</div><div class='ctx'>                   }</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'> #endif</div><div class='ctx'>                {</div><div class='hunk'>@@ -3183,11 +3418,13 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                   for (i = 0; i &lt; row_width; i++, sp += 8, dp += 6)</div><div class='ctx'>                   {</div><div class='ctx'>                      png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))</div><div class='del'>-                        &lt;&lt; 8) + (png_uint_16)(*(sp + 7)));</div><div class='add'>+                         &lt;&lt; 8) + (png_uint_16)(*(sp + 7)));</div><div class='add'>+</div><div class='ctx'>                      if (a == (png_uint_16)0xffff)</div><div class='ctx'>                      {</div><div class='ctx'>                         png_memcpy(dp, sp, 6);</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'>                      else if (a == 0)</div><div class='ctx'>                      {</div><div class='ctx'>                         *dp = (png_byte)((background-&gt;red &gt;&gt; 8) &amp; 0xff);</div><div class='hunk'>@@ -3197,6 +3434,7 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         *(dp + 4) = (png_byte)((background-&gt;blue &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(dp + 5) = (png_byte)(background-&gt;blue &amp; 0xff);</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'>                      else</div><div class='ctx'>                      {</div><div class='ctx'>                         png_uint_16 v;</div><div class='hunk'>@@ -3210,9 +3448,11 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         png_composite_16(v, r, a, background-&gt;red);</div><div class='ctx'>                         *dp = (png_byte)((v &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(dp + 1) = (png_byte)(v &amp; 0xff);</div><div class='add'>+</div><div class='ctx'>                         png_composite_16(v, g, a, background-&gt;green);</div><div class='ctx'>                         *(dp + 2) = (png_byte)((v &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(dp + 3) = (png_byte)(v &amp; 0xff);</div><div class='add'>+</div><div class='ctx'>                         png_composite_16(v, b, a, background-&gt;blue);</div><div class='ctx'>                         *(dp + 4) = (png_byte)((v &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                         *(dp + 5) = (png_byte)(v &amp; 0xff);</div><div class='hunk'>@@ -3222,14 +3462,18 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='add'>+         default:</div><div class='add'>+            break;</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='ctx'>       if (row_info-&gt;color_type &amp; PNG_COLOR_MASK_ALPHA)</div><div class='ctx'>       {</div><div class='del'>-         row_info-&gt;color_type &amp;= ~PNG_COLOR_MASK_ALPHA;</div><div class='add'>+         row_info-&gt;color_type = (png_byte)(row_info-&gt;color_type &amp;</div><div class='add'>+             ~PNG_COLOR_MASK_ALPHA);</div><div class='ctx'>          row_info-&gt;channels--;</div><div class='ctx'>          row_info-&gt;pixel_depth = (png_byte)(row_info-&gt;channels *</div><div class='del'>-            row_info-&gt;bit_depth);</div><div class='add'>+             row_info-&gt;bit_depth);</div><div class='ctx'>          row_info-&gt;rowbytes = PNG_ROWBYTES(row_info-&gt;pixel_depth, row_width);</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='hunk'>@@ -3245,8 +3489,8 @@ png_do_background(png_row_infop row_info, png_bytep row,</div><div class='ctx'>  */</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_do_gamma(png_row_infop row_info, png_bytep row,</div><div class='del'>-   png_bytep gamma_table, png_uint_16pp gamma_16_table,</div><div class='del'>-   int gamma_shift)</div><div class='add'>+    png_const_bytep gamma_table, png_const_uint_16pp gamma_16_table,</div><div class='add'>+    int gamma_shift)</div><div class='ctx'> {</div><div class='ctx'>    png_bytep sp;</div><div class='ctx'>    png_uint_32 i;</div><div class='hunk'>@@ -3254,9 +3498,8 @@ png_do_gamma(png_row_infop row_info, png_bytep row,</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_do_gamma");</div><div class='ctx'> </div><div class='del'>-   if (</div><div class='del'>-       ((row_info-&gt;bit_depth &lt;= 8 &amp;&amp; gamma_table != NULL) ||</div><div class='del'>-        (row_info-&gt;bit_depth == 16 &amp;&amp; gamma_16_table != NULL)))</div><div class='add'>+   if (((row_info-&gt;bit_depth &lt;= 8 &amp;&amp; gamma_table != NULL) ||</div><div class='add'>+       (row_info-&gt;bit_depth == 16 &amp;&amp; gamma_16_table != NULL)))</div><div class='ctx'>    {</div><div class='ctx'>       switch (row_info-&gt;color_type)</div><div class='ctx'>       {</div><div class='hunk'>@@ -3275,6 +3518,7 @@ png_do_gamma(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                   sp++;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else /* if (row_info-&gt;bit_depth == 16) */</div><div class='ctx'>             {</div><div class='ctx'>                sp = row;</div><div class='hunk'>@@ -3286,10 +3530,12 @@ png_do_gamma(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                   *sp = (png_byte)((v &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                   *(sp + 1) = (png_byte)(v &amp; 0xff);</div><div class='ctx'>                   sp += 2;</div><div class='add'>+</div><div class='ctx'>                   v = gamma_16_table[*(sp + 1) &gt;&gt; gamma_shift][*sp];</div><div class='ctx'>                   *sp = (png_byte)((v &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                   *(sp + 1) = (png_byte)(v &amp; 0xff);</div><div class='ctx'>                   sp += 2;</div><div class='add'>+</div><div class='ctx'>                   v = gamma_16_table[*(sp + 1) &gt;&gt; gamma_shift][*sp];</div><div class='ctx'>                   *sp = (png_byte)((v &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                   *(sp + 1) = (png_byte)(v &amp; 0xff);</div><div class='hunk'>@@ -3308,13 +3554,17 @@ png_do_gamma(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                {</div><div class='ctx'>                   *sp = gamma_table[*sp];</div><div class='ctx'>                   sp++;</div><div class='add'>+</div><div class='ctx'>                   *sp = gamma_table[*sp];</div><div class='ctx'>                   sp++;</div><div class='add'>+</div><div class='ctx'>                   *sp = gamma_table[*sp];</div><div class='ctx'>                   sp++;</div><div class='add'>+</div><div class='ctx'>                   sp++;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else /* if (row_info-&gt;bit_depth == 16) */</div><div class='ctx'>             {</div><div class='ctx'>                sp = row;</div><div class='hunk'>@@ -3324,10 +3574,12 @@ png_do_gamma(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                   *sp = (png_byte)((v &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                   *(sp + 1) = (png_byte)(v &amp; 0xff);</div><div class='ctx'>                   sp += 2;</div><div class='add'>+</div><div class='ctx'>                   v = gamma_16_table[*(sp + 1) &gt;&gt; gamma_shift][*sp];</div><div class='ctx'>                   *sp = (png_byte)((v &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                   *(sp + 1) = (png_byte)(v &amp; 0xff);</div><div class='ctx'>                   sp += 2;</div><div class='add'>+</div><div class='ctx'>                   v = gamma_16_table[*(sp + 1) &gt;&gt; gamma_shift][*sp];</div><div class='ctx'>                   *sp = (png_byte)((v &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                   *(sp + 1) = (png_byte)(v &amp; 0xff);</div><div class='hunk'>@@ -3348,6 +3600,7 @@ png_do_gamma(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                   sp += 2;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else /* if (row_info-&gt;bit_depth == 16) */</div><div class='ctx'>             {</div><div class='ctx'>                sp = row;</div><div class='hunk'>@@ -3375,10 +3628,10 @@ png_do_gamma(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                   int d = *sp &amp; 0x03;</div><div class='ctx'> </div><div class='ctx'>                   *sp = (png_byte)(</div><div class='del'>-                        ((((int)gamma_table[a|(a&gt;&gt;2)|(a&gt;&gt;4)|(a&gt;&gt;6)])   ) &amp; 0xc0)|</div><div class='del'>-                        ((((int)gamma_table[(b&lt;&lt;2)|b|(b&gt;&gt;2)|(b&gt;&gt;4)])&gt;&gt;2) &amp; 0x30)|</div><div class='del'>-                        ((((int)gamma_table[(c&lt;&lt;4)|(c&lt;&lt;2)|c|(c&gt;&gt;2)])&gt;&gt;4) &amp; 0x0c)|</div><div class='del'>-                        ((((int)gamma_table[(d&lt;&lt;6)|(d&lt;&lt;4)|(d&lt;&lt;2)|d])&gt;&gt;6) ));</div><div class='add'>+                      ((((int)gamma_table[a|(a&gt;&gt;2)|(a&gt;&gt;4)|(a&gt;&gt;6)])   ) &amp; 0xc0)|</div><div class='add'>+                      ((((int)gamma_table[(b&lt;&lt;2)|b|(b&gt;&gt;2)|(b&gt;&gt;4)])&gt;&gt;2) &amp; 0x30)|</div><div class='add'>+                      ((((int)gamma_table[(c&lt;&lt;4)|(c&lt;&lt;2)|c|(c&gt;&gt;2)])&gt;&gt;4) &amp; 0x0c)|</div><div class='add'>+                      ((((int)gamma_table[(d&lt;&lt;6)|(d&lt;&lt;4)|(d&lt;&lt;2)|d])&gt;&gt;6) ));</div><div class='ctx'>                   sp++;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='hunk'>@@ -3392,7 +3645,7 @@ png_do_gamma(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                   int lsb = *sp &amp; 0x0f;</div><div class='ctx'> </div><div class='ctx'>                   *sp = (png_byte)((((int)gamma_table[msb | (msb &gt;&gt; 4)]) &amp; 0xf0)</div><div class='del'>-                          | (((int)gamma_table[(lsb &lt;&lt; 4) | lsb]) &gt;&gt; 4));</div><div class='add'>+                      | (((int)gamma_table[(lsb &lt;&lt; 4) | lsb]) &gt;&gt; 4));</div><div class='ctx'>                   sp++;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='hunk'>@@ -3420,6 +3673,9 @@ png_do_gamma(png_row_infop row_info, png_bytep row,</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='add'>+         default:</div><div class='add'>+            break;</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='hunk'>@@ -3431,7 +3687,7 @@ png_do_gamma(png_row_infop row_info, png_bytep row,</div><div class='ctx'>  */</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_do_expand_palette(png_row_infop row_info, png_bytep row,</div><div class='del'>-   png_colorp palette, png_bytep trans_alpha, int num_trans)</div><div class='add'>+   png_const_colorp palette, png_const_bytep trans_alpha, int num_trans)</div><div class='ctx'> {</div><div class='ctx'>    int shift, value;</div><div class='ctx'>    png_bytep sp, dp;</div><div class='hunk'>@@ -3440,8 +3696,7 @@ png_do_expand_palette(png_row_infop row_info, png_bytep row,</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_do_expand_palette");</div><div class='ctx'> </div><div class='del'>-   if (</div><div class='del'>-       row_info-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+   if (row_info-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>    {</div><div class='ctx'>       if (row_info-&gt;bit_depth &lt; 8)</div><div class='ctx'>       {</div><div class='hunk'>@@ -3456,13 +3711,16 @@ png_do_expand_palette(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                {</div><div class='ctx'>                   if ((*sp &gt;&gt; shift) &amp; 0x01)</div><div class='ctx'>                      *dp = 1;</div><div class='add'>+</div><div class='ctx'>                   else</div><div class='ctx'>                      *dp = 0;</div><div class='add'>+</div><div class='ctx'>                   if (shift == 7)</div><div class='ctx'>                   {</div><div class='ctx'>                      shift = 0;</div><div class='ctx'>                      sp--;</div><div class='ctx'>                   }</div><div class='add'>+</div><div class='ctx'>                   else</div><div class='ctx'>                      shift++;</div><div class='ctx'> </div><div class='hunk'>@@ -3485,6 +3743,7 @@ png_do_expand_palette(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                      shift = 0;</div><div class='ctx'>                      sp--;</div><div class='ctx'>                   }</div><div class='add'>+</div><div class='ctx'>                   else</div><div class='ctx'>                      shift += 2;</div><div class='ctx'> </div><div class='hunk'>@@ -3507,6 +3766,7 @@ png_do_expand_palette(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                      shift = 0;</div><div class='ctx'>                      sp--;</div><div class='ctx'>                   }</div><div class='add'>+</div><div class='ctx'>                   else</div><div class='ctx'>                      shift += 4;</div><div class='ctx'> </div><div class='hunk'>@@ -3514,14 +3774,17 @@ png_do_expand_palette(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                }</div><div class='ctx'>                break;</div><div class='ctx'>             }</div><div class='add'>+</div><div class='add'>+            default:</div><div class='add'>+               break;</div><div class='ctx'>          }</div><div class='ctx'>          row_info-&gt;bit_depth = 8;</div><div class='ctx'>          row_info-&gt;pixel_depth = 8;</div><div class='ctx'>          row_info-&gt;rowbytes = row_width;</div><div class='ctx'>       }</div><div class='del'>-      switch (row_info-&gt;bit_depth)</div><div class='add'>+</div><div class='add'>+      if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>       {</div><div class='del'>-         case 8:</div><div class='ctx'>          {</div><div class='ctx'>             if (trans_alpha != NULL)</div><div class='ctx'>             {</div><div class='hunk'>@@ -3532,8 +3795,10 @@ png_do_expand_palette(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                {</div><div class='ctx'>                   if ((int)(*sp) &gt;= num_trans)</div><div class='ctx'>                      *dp-- = 0xff;</div><div class='add'>+</div><div class='ctx'>                   else</div><div class='ctx'>                      *dp-- = trans_alpha[*sp];</div><div class='add'>+</div><div class='ctx'>                   *dp-- = palette[*sp].blue;</div><div class='ctx'>                   *dp-- = palette[*sp].green;</div><div class='ctx'>                   *dp-- = palette[*sp].red;</div><div class='hunk'>@@ -3545,6 +3810,7 @@ png_do_expand_palette(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                row_info-&gt;color_type = 6;</div><div class='ctx'>                row_info-&gt;channels = 4;</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'>             {</div><div class='ctx'>                sp = row + (png_size_t)row_width - 1;</div><div class='hunk'>@@ -3564,7 +3830,6 @@ png_do_expand_palette(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                row_info-&gt;color_type = 2;</div><div class='ctx'>                row_info-&gt;channels = 3;</div><div class='ctx'>             }</div><div class='del'>-            break;</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='hunk'>@@ -3575,7 +3840,7 @@ png_do_expand_palette(png_row_infop row_info, png_bytep row,</div><div class='ctx'>  */</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_do_expand(png_row_infop row_info, png_bytep row,</div><div class='del'>-   png_color_16p trans_value)</div><div class='add'>+    png_const_color_16p trans_value)</div><div class='ctx'> {</div><div class='ctx'>    int shift, value;</div><div class='ctx'>    png_bytep sp, dp;</div><div class='hunk'>@@ -3595,7 +3860,7 @@ png_do_expand(png_row_infop row_info, png_bytep row,</div><div class='ctx'>             {</div><div class='ctx'>                case 1:</div><div class='ctx'>                {</div><div class='del'>-                  gray = (png_uint_16)((gray&amp;0x01)*0xff);</div><div class='add'>+                  gray = (png_uint_16)((gray &amp; 0x01) * 0xff);</div><div class='ctx'>                   sp = row + (png_size_t)((row_width - 1) &gt;&gt; 3);</div><div class='ctx'>                   dp = row + (png_size_t)row_width - 1;</div><div class='ctx'>                   shift = 7 - (int)((row_width + 7) &amp; 0x07);</div><div class='hunk'>@@ -3603,13 +3868,16 @@ png_do_expand(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                   {</div><div class='ctx'>                      if ((*sp &gt;&gt; shift) &amp; 0x01)</div><div class='ctx'>                         *dp = 0xff;</div><div class='add'>+</div><div class='ctx'>                      else</div><div class='ctx'>                         *dp = 0;</div><div class='add'>+</div><div class='ctx'>                      if (shift == 7)</div><div class='ctx'>                      {</div><div class='ctx'>                         shift = 0;</div><div class='ctx'>                         sp--;</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'>                      else</div><div class='ctx'>                         shift++;</div><div class='ctx'> </div><div class='hunk'>@@ -3620,7 +3888,7 @@ png_do_expand(png_row_infop row_info, png_bytep row,</div><div class='ctx'> </div><div class='ctx'>                case 2:</div><div class='ctx'>                {</div><div class='del'>-                  gray = (png_uint_16)((gray&amp;0x03)*0x55);</div><div class='add'>+                  gray = (png_uint_16)((gray &amp; 0x03) * 0x55);</div><div class='ctx'>                   sp = row + (png_size_t)((row_width - 1) &gt;&gt; 2);</div><div class='ctx'>                   dp = row + (png_size_t)row_width - 1;</div><div class='ctx'>                   shift = (int)((3 - ((row_width + 3) &amp; 0x03)) &lt;&lt; 1);</div><div class='hunk'>@@ -3634,6 +3902,7 @@ png_do_expand(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         shift = 0;</div><div class='ctx'>                         sp--;</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'>                      else</div><div class='ctx'>                         shift += 2;</div><div class='ctx'> </div><div class='hunk'>@@ -3644,7 +3913,7 @@ png_do_expand(png_row_infop row_info, png_bytep row,</div><div class='ctx'> </div><div class='ctx'>                case 4:</div><div class='ctx'>                {</div><div class='del'>-                  gray = (png_uint_16)((gray&amp;0x0f)*0x11);</div><div class='add'>+                  gray = (png_uint_16)((gray &amp; 0x0f) * 0x11);</div><div class='ctx'>                   sp = row + (png_size_t)((row_width - 1) &gt;&gt; 1);</div><div class='ctx'>                   dp = row + (png_size_t)row_width - 1;</div><div class='ctx'>                   shift = (int)((1 - ((row_width + 1) &amp; 0x01)) &lt;&lt; 2);</div><div class='hunk'>@@ -3657,6 +3926,7 @@ png_do_expand(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                         shift = 0;</div><div class='ctx'>                         sp--;</div><div class='ctx'>                      }</div><div class='add'>+</div><div class='ctx'>                      else</div><div class='ctx'>                         shift = 4;</div><div class='ctx'> </div><div class='hunk'>@@ -3664,6 +3934,9 @@ png_do_expand(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                   }</div><div class='ctx'>                   break;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='add'>+               default:</div><div class='add'>+                  break;</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'>             row_info-&gt;bit_depth = 8;</div><div class='hunk'>@@ -3678,20 +3951,23 @@ png_do_expand(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                gray = gray &amp; 0xff;</div><div class='ctx'>                sp = row + (png_size_t)row_width - 1;</div><div class='ctx'>                dp = row + (png_size_t)(row_width &lt;&lt; 1) - 1;</div><div class='add'>+</div><div class='ctx'>                for (i = 0; i &lt; row_width; i++)</div><div class='ctx'>                {</div><div class='ctx'>                   if (*sp == gray)</div><div class='ctx'>                      *dp-- = 0;</div><div class='add'>+</div><div class='ctx'>                   else</div><div class='ctx'>                      *dp-- = 0xff;</div><div class='add'>+</div><div class='ctx'>                   *dp-- = *sp--;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'>             else if (row_info-&gt;bit_depth == 16)</div><div class='ctx'>             {</div><div class='del'>-               png_byte gray_high = (gray &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-               png_byte gray_low = gray &amp; 0xff;</div><div class='add'>+               png_byte gray_high = (png_byte)((gray &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+               png_byte gray_low = (png_byte)(gray &amp; 0xff);</div><div class='ctx'>                sp = row + row_info-&gt;rowbytes - 1;</div><div class='ctx'>                dp = row + (row_info-&gt;rowbytes &lt;&lt; 1) - 1;</div><div class='ctx'>                for (i = 0; i &lt; row_width; i++)</div><div class='hunk'>@@ -3701,11 +3977,13 @@ png_do_expand(png_row_infop row_info, png_bytep row,</div><div class='ctx'>                      *dp-- = 0;</div><div class='ctx'>                      *dp-- = 0;</div><div class='ctx'>                   }</div><div class='add'>+</div><div class='ctx'>                   else</div><div class='ctx'>                   {</div><div class='ctx'>                      *dp-- = 0xff;</div><div class='ctx'>                      *dp-- = 0xff;</div><div class='ctx'>                   }</div><div class='add'>+</div><div class='ctx'>                   *dp-- = *sp--;</div><div class='ctx'>                   *dp-- = *sp--;</div><div class='ctx'>                }</div><div class='hunk'>@@ -3722,17 +4000,19 @@ png_do_expand(png_row_infop row_info, png_bytep row,</div><div class='ctx'>       {</div><div class='ctx'>          if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>          {</div><div class='del'>-            png_byte red = trans_value-&gt;red &amp; 0xff;</div><div class='del'>-            png_byte green = trans_value-&gt;green &amp; 0xff;</div><div class='del'>-            png_byte blue = trans_value-&gt;blue &amp; 0xff;</div><div class='add'>+            png_byte red = (png_byte)(trans_value-&gt;red &amp; 0xff);</div><div class='add'>+            png_byte green = (png_byte)(trans_value-&gt;green &amp; 0xff);</div><div class='add'>+            png_byte blue = (png_byte)(trans_value-&gt;blue &amp; 0xff);</div><div class='ctx'>             sp = row + (png_size_t)row_info-&gt;rowbytes - 1;</div><div class='ctx'>             dp = row + (png_size_t)(row_width &lt;&lt; 2) - 1;</div><div class='ctx'>             for (i = 0; i &lt; row_width; i++)</div><div class='ctx'>             {</div><div class='ctx'>                if (*(sp - 2) == red &amp;&amp; *(sp - 1) == green &amp;&amp; *(sp) == blue)</div><div class='ctx'>                   *dp-- = 0;</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   *dp-- = 0xff;</div><div class='add'>+</div><div class='ctx'>                *dp-- = *sp--;</div><div class='ctx'>                *dp-- = *sp--;</div><div class='ctx'>                *dp-- = *sp--;</div><div class='hunk'>@@ -3740,31 +4020,33 @@ png_do_expand(png_row_infop row_info, png_bytep row,</div><div class='ctx'>          }</div><div class='ctx'>          else if (row_info-&gt;bit_depth == 16)</div><div class='ctx'>          {</div><div class='del'>-            png_byte red_high = (trans_value-&gt;red &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-            png_byte green_high = (trans_value-&gt;green &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-            png_byte blue_high = (trans_value-&gt;blue &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-            png_byte red_low = trans_value-&gt;red &amp; 0xff;</div><div class='del'>-            png_byte green_low = trans_value-&gt;green &amp; 0xff;</div><div class='del'>-            png_byte blue_low = trans_value-&gt;blue &amp; 0xff;</div><div class='add'>+            png_byte red_high = (png_byte)((trans_value-&gt;red &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+            png_byte green_high = (png_byte)((trans_value-&gt;green &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+            png_byte blue_high = (png_byte)((trans_value-&gt;blue &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+            png_byte red_low = (png_byte)(trans_value-&gt;red &amp; 0xff);</div><div class='add'>+            png_byte green_low = (png_byte)(trans_value-&gt;green &amp; 0xff);</div><div class='add'>+            png_byte blue_low = (png_byte)(trans_value-&gt;blue &amp; 0xff);</div><div class='ctx'>             sp = row + row_info-&gt;rowbytes - 1;</div><div class='ctx'>             dp = row + (png_size_t)(row_width &lt;&lt; 3) - 1;</div><div class='ctx'>             for (i = 0; i &lt; row_width; i++)</div><div class='ctx'>             {</div><div class='ctx'>                if (*(sp - 5) == red_high &amp;&amp;</div><div class='del'>-                  *(sp - 4) == red_low &amp;&amp;</div><div class='del'>-                  *(sp - 3) == green_high &amp;&amp;</div><div class='del'>-                  *(sp - 2) == green_low &amp;&amp;</div><div class='del'>-                  *(sp - 1) == blue_high &amp;&amp;</div><div class='del'>-                  *(sp    ) == blue_low)</div><div class='add'>+                   *(sp - 4) == red_low &amp;&amp;</div><div class='add'>+                   *(sp - 3) == green_high &amp;&amp;</div><div class='add'>+                   *(sp - 2) == green_low &amp;&amp;</div><div class='add'>+                   *(sp - 1) == blue_high &amp;&amp;</div><div class='add'>+                   *(sp    ) == blue_low)</div><div class='ctx'>                {</div><div class='ctx'>                   *dp-- = 0;</div><div class='ctx'>                   *dp-- = 0;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                {</div><div class='ctx'>                   *dp-- = 0xff;</div><div class='ctx'>                   *dp-- = 0xff;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                *dp-- = *sp--;</div><div class='ctx'>                *dp-- = *sp--;</div><div class='ctx'>                *dp-- = *sp--;</div><div class='hunk'>@@ -3782,20 +4064,20 @@ png_do_expand(png_row_infop row_info, png_bytep row,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_READ_DITHER_SUPPORTED</div><div class='add'>+#ifdef PNG_READ_QUANTIZE_SUPPORTED</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_do_dither(png_row_infop row_info, png_bytep row,</div><div class='del'>-    png_bytep palette_lookup, png_bytep dither_lookup)</div><div class='add'>+png_do_quantize(png_row_infop row_info, png_bytep row,</div><div class='add'>+    png_const_bytep palette_lookup, png_const_bytep quantize_lookup)</div><div class='ctx'> {</div><div class='ctx'>    png_bytep sp, dp;</div><div class='ctx'>    png_uint_32 i;</div><div class='ctx'>    png_uint_32 row_width=row_info-&gt;width;</div><div class='ctx'> </div><div class='del'>-   png_debug(1, "in png_do_dither");</div><div class='add'>+   png_debug(1, "in png_do_quantize");</div><div class='ctx'> </div><div class='add'>+   if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>    {</div><div class='del'>-      if (row_info-&gt;color_type == PNG_COLOR_TYPE_RGB &amp;&amp;</div><div class='del'>-         palette_lookup &amp;&amp; row_info-&gt;bit_depth == 8)</div><div class='add'>+      if (row_info-&gt;color_type == PNG_COLOR_TYPE_RGB &amp;&amp; palette_lookup)</div><div class='ctx'>       {</div><div class='ctx'>          int r, g, b, p;</div><div class='ctx'>          sp = row;</div><div class='hunk'>@@ -3813,24 +4095,26 @@ png_do_dither(png_row_infop row_info, png_bytep row,</div><div class='ctx'>              *    (((g &gt;&gt; 3) &amp; 0x1f) &lt;&lt; 5) |</div><div class='ctx'>              *    ((b &gt;&gt; 3) &amp; 0x1f);</div><div class='ctx'>              */</div><div class='del'>-            p = (((r &gt;&gt; (8 - PNG_DITHER_RED_BITS)) &amp;</div><div class='del'>-               ((1 &lt;&lt; PNG_DITHER_RED_BITS) - 1)) &lt;&lt;</div><div class='del'>-               (PNG_DITHER_GREEN_BITS + PNG_DITHER_BLUE_BITS)) |</div><div class='del'>-               (((g &gt;&gt; (8 - PNG_DITHER_GREEN_BITS)) &amp;</div><div class='del'>-               ((1 &lt;&lt; PNG_DITHER_GREEN_BITS) - 1)) &lt;&lt;</div><div class='del'>-               (PNG_DITHER_BLUE_BITS)) |</div><div class='del'>-               ((b &gt;&gt; (8 - PNG_DITHER_BLUE_BITS)) &amp;</div><div class='del'>-               ((1 &lt;&lt; PNG_DITHER_BLUE_BITS) - 1));</div><div class='add'>+            p = (((r &gt;&gt; (8 - PNG_QUANTIZE_RED_BITS)) &amp;</div><div class='add'>+                ((1 &lt;&lt; PNG_QUANTIZE_RED_BITS) - 1)) &lt;&lt;</div><div class='add'>+                (PNG_QUANTIZE_GREEN_BITS + PNG_QUANTIZE_BLUE_BITS)) |</div><div class='add'>+                (((g &gt;&gt; (8 - PNG_QUANTIZE_GREEN_BITS)) &amp;</div><div class='add'>+                ((1 &lt;&lt; PNG_QUANTIZE_GREEN_BITS) - 1)) &lt;&lt;</div><div class='add'>+                (PNG_QUANTIZE_BLUE_BITS)) |</div><div class='add'>+                ((b &gt;&gt; (8 - PNG_QUANTIZE_BLUE_BITS)) &amp;</div><div class='add'>+                ((1 &lt;&lt; PNG_QUANTIZE_BLUE_BITS) - 1));</div><div class='ctx'> </div><div class='ctx'>             *dp++ = palette_lookup[p];</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          row_info-&gt;color_type = PNG_COLOR_TYPE_PALETTE;</div><div class='ctx'>          row_info-&gt;channels = 1;</div><div class='ctx'>          row_info-&gt;pixel_depth = row_info-&gt;bit_depth;</div><div class='ctx'>          row_info-&gt;rowbytes = PNG_ROWBYTES(row_info-&gt;pixel_depth, row_width);</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if (row_info-&gt;color_type == PNG_COLOR_TYPE_RGB_ALPHA &amp;&amp;</div><div class='del'>-         palette_lookup != NULL &amp;&amp; row_info-&gt;bit_depth == 8)</div><div class='add'>+         palette_lookup != NULL)</div><div class='ctx'>       {</div><div class='ctx'>          int r, g, b, p;</div><div class='ctx'>          sp = row;</div><div class='hunk'>@@ -3842,293 +4126,37 @@ png_do_dither(png_row_infop row_info, png_bytep row,</div><div class='ctx'>             b = *sp++;</div><div class='ctx'>             sp++;</div><div class='ctx'> </div><div class='del'>-            p = (((r &gt;&gt; (8 - PNG_DITHER_RED_BITS)) &amp;</div><div class='del'>-               ((1 &lt;&lt; PNG_DITHER_RED_BITS) - 1)) &lt;&lt;</div><div class='del'>-               (PNG_DITHER_GREEN_BITS + PNG_DITHER_BLUE_BITS)) |</div><div class='del'>-               (((g &gt;&gt; (8 - PNG_DITHER_GREEN_BITS)) &amp;</div><div class='del'>-               ((1 &lt;&lt; PNG_DITHER_GREEN_BITS) - 1)) &lt;&lt;</div><div class='del'>-               (PNG_DITHER_BLUE_BITS)) |</div><div class='del'>-               ((b &gt;&gt; (8 - PNG_DITHER_BLUE_BITS)) &amp;</div><div class='del'>-               ((1 &lt;&lt; PNG_DITHER_BLUE_BITS) - 1));</div><div class='add'>+            p = (((r &gt;&gt; (8 - PNG_QUANTIZE_RED_BITS)) &amp;</div><div class='add'>+                ((1 &lt;&lt; PNG_QUANTIZE_RED_BITS) - 1)) &lt;&lt;</div><div class='add'>+                (PNG_QUANTIZE_GREEN_BITS + PNG_QUANTIZE_BLUE_BITS)) |</div><div class='add'>+                (((g &gt;&gt; (8 - PNG_QUANTIZE_GREEN_BITS)) &amp;</div><div class='add'>+                ((1 &lt;&lt; PNG_QUANTIZE_GREEN_BITS) - 1)) &lt;&lt;</div><div class='add'>+                (PNG_QUANTIZE_BLUE_BITS)) |</div><div class='add'>+                ((b &gt;&gt; (8 - PNG_QUANTIZE_BLUE_BITS)) &amp;</div><div class='add'>+                ((1 &lt;&lt; PNG_QUANTIZE_BLUE_BITS) - 1));</div><div class='ctx'> </div><div class='ctx'>             *dp++ = palette_lookup[p];</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          row_info-&gt;color_type = PNG_COLOR_TYPE_PALETTE;</div><div class='ctx'>          row_info-&gt;channels = 1;</div><div class='ctx'>          row_info-&gt;pixel_depth = row_info-&gt;bit_depth;</div><div class='ctx'>          row_info-&gt;rowbytes = PNG_ROWBYTES(row_info-&gt;pixel_depth, row_width);</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if (row_info-&gt;color_type == PNG_COLOR_TYPE_PALETTE &amp;&amp;</div><div class='del'>-         dither_lookup &amp;&amp; row_info-&gt;bit_depth == 8)</div><div class='add'>+         quantize_lookup)</div><div class='ctx'>       {</div><div class='ctx'>          sp = row;</div><div class='add'>+</div><div class='ctx'>          for (i = 0; i &lt; row_width; i++, sp++)</div><div class='ctx'>          {</div><div class='del'>-            *sp = dither_lookup[*sp];</div><div class='add'>+            *sp = quantize_lookup[*sp];</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-#ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='del'>-static PNG_CONST int png_gamma_shift[] =</div><div class='del'>-   {0x10, 0x21, 0x42, 0x84, 0x110, 0x248, 0x550, 0xff0, 0x00};</div><div class='del'>-</div><div class='del'>-/* We build the 8- or 16-bit gamma tables here.  Note that for 16-bit</div><div class='del'>- * tables, we don't make a full table if we are reducing to 8-bit in</div><div class='del'>- * the future.  Note also how the gamma_16 tables are segmented so that</div><div class='del'>- * we don't need to allocate &gt; 64K chunks for a full 16-bit table.</div><div class='del'>- *</div><div class='del'>- * See the PNG extensions document for an integer algorithm for creating</div><div class='del'>- * the gamma tables.  Maybe we will implement that here someday.</div><div class='del'>- *</div><div class='del'>- * We should only reach this point if</div><div class='del'>- *</div><div class='del'>- *      the file_gamma is known (i.e., the gAMA or sRGB chunk is present,</div><div class='del'>- *      or the application has provided a file_gamma)</div><div class='del'>- *</div><div class='del'>- *   AND</div><div class='del'>- *      {</div><div class='del'>- *         the screen_gamma is known</div><div class='del'>- *</div><div class='del'>- *      OR</div><div class='del'>- *</div><div class='del'>- *         RGB_to_gray transformation is being performed</div><div class='del'>- *      }</div><div class='del'>- *</div><div class='del'>- *   AND</div><div class='del'>- *      {</div><div class='del'>- *         the screen_gamma is different from the reciprocal of the</div><div class='del'>- *         file_gamma by more than the specified threshold</div><div class='del'>- *</div><div class='del'>- *      OR</div><div class='del'>- *</div><div class='del'>- *         a background color has been specified and the file_gamma</div><div class='del'>- *         and screen_gamma are not 1.0, within the specified threshold.</div><div class='del'>- *      }</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void /* PRIVATE */</div><div class='del'>-png_build_gamma_table(png_structp png_ptr, png_byte bit_depth)</div><div class='del'>-{</div><div class='del'>-  png_debug(1, "in png_build_gamma_table");</div><div class='del'>-</div><div class='del'>-  if (bit_depth &lt;= 8)</div><div class='del'>-  {</div><div class='del'>-     int i;</div><div class='del'>-     double g;</div><div class='del'>-</div><div class='del'>-     if (png_ptr-&gt;screen_gamma &gt; .000001)</div><div class='del'>-        g = 1.0 / (png_ptr-&gt;gamma * png_ptr-&gt;screen_gamma);</div><div class='del'>-</div><div class='del'>-     else</div><div class='del'>-        g = 1.0;</div><div class='del'>-</div><div class='del'>-     png_ptr-&gt;gamma_table = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-        (png_uint_32)256);</div><div class='del'>-</div><div class='del'>-     for (i = 0; i &lt; 256; i++)</div><div class='del'>-     {</div><div class='del'>-        png_ptr-&gt;gamma_table[i] = (png_byte)(pow((double)i / 255.0,</div><div class='del'>-           g) * 255.0 + .5);</div><div class='del'>-     }</div><div class='del'>-</div><div class='del'>-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \</div><div class='del'>-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)</div><div class='del'>-     if (png_ptr-&gt;transformations &amp; ((PNG_BACKGROUND) | PNG_RGB_TO_GRAY))</div><div class='del'>-     {</div><div class='del'>-</div><div class='del'>-        g = 1.0 / (png_ptr-&gt;gamma);</div><div class='del'>-</div><div class='del'>-        png_ptr-&gt;gamma_to_1 = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-           (png_uint_32)256);</div><div class='del'>-</div><div class='del'>-        for (i = 0; i &lt; 256; i++)</div><div class='del'>-        {</div><div class='del'>-           png_ptr-&gt;gamma_to_1[i] = (png_byte)(pow((double)i / 255.0,</div><div class='del'>-              g) * 255.0 + .5);</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-        png_ptr-&gt;gamma_from_1 = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-           (png_uint_32)256);</div><div class='del'>-</div><div class='del'>-        if (png_ptr-&gt;screen_gamma &gt; 0.000001)</div><div class='del'>-           g = 1.0 / png_ptr-&gt;screen_gamma;</div><div class='del'>-</div><div class='del'>-        else</div><div class='del'>-           g = png_ptr-&gt;gamma;   /* Probably doing rgb_to_gray */</div><div class='del'>-</div><div class='del'>-        for (i = 0; i &lt; 256; i++)</div><div class='del'>-        {</div><div class='del'>-           png_ptr-&gt;gamma_from_1[i] = (png_byte)(pow((double)i / 255.0,</div><div class='del'>-              g) * 255.0 + .5);</div><div class='del'>-</div><div class='del'>-        }</div><div class='del'>-     }</div><div class='del'>-#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */</div><div class='del'>-  }</div><div class='del'>-  else</div><div class='del'>-  {</div><div class='del'>-     double g;</div><div class='del'>-     int i, j, shift, num;</div><div class='del'>-     int sig_bit;</div><div class='del'>-     png_uint_32 ig;</div><div class='del'>-</div><div class='del'>-     if (png_ptr-&gt;color_type &amp; PNG_COLOR_MASK_COLOR)</div><div class='del'>-     {</div><div class='del'>-        sig_bit = (int)png_ptr-&gt;sig_bit.red;</div><div class='del'>-</div><div class='del'>-        if ((int)png_ptr-&gt;sig_bit.green &gt; sig_bit)</div><div class='del'>-           sig_bit = png_ptr-&gt;sig_bit.green;</div><div class='del'>-</div><div class='del'>-        if ((int)png_ptr-&gt;sig_bit.blue &gt; sig_bit)</div><div class='del'>-           sig_bit = png_ptr-&gt;sig_bit.blue;</div><div class='del'>-     }</div><div class='del'>-     else</div><div class='del'>-     {</div><div class='del'>-        sig_bit = (int)png_ptr-&gt;sig_bit.gray;</div><div class='del'>-     }</div><div class='del'>-</div><div class='del'>-     if (sig_bit &gt; 0)</div><div class='del'>-        shift = 16 - sig_bit;</div><div class='del'>-</div><div class='del'>-     else</div><div class='del'>-        shift = 0;</div><div class='del'>-</div><div class='del'>-     if (png_ptr-&gt;transformations &amp; PNG_16_TO_8)</div><div class='del'>-     {</div><div class='del'>-        if (shift &lt; (16 - PNG_MAX_GAMMA_8))</div><div class='del'>-           shift = (16 - PNG_MAX_GAMMA_8);</div><div class='del'>-     }</div><div class='del'>-</div><div class='del'>-     if (shift &gt; 8)</div><div class='del'>-        shift = 8;</div><div class='del'>-</div><div class='del'>-     if (shift &lt; 0)</div><div class='del'>-        shift = 0;</div><div class='del'>-</div><div class='del'>-     png_ptr-&gt;gamma_shift = (png_byte)shift;</div><div class='del'>-</div><div class='del'>-     num = (1 &lt;&lt; (8 - shift));</div><div class='del'>-</div><div class='del'>-     if (png_ptr-&gt;screen_gamma &gt; .000001)</div><div class='del'>-        g = 1.0 / (png_ptr-&gt;gamma * png_ptr-&gt;screen_gamma);</div><div class='del'>-     else</div><div class='del'>-        g = 1.0;</div><div class='del'>-</div><div class='del'>-     png_ptr-&gt;gamma_16_table = (png_uint_16pp)png_calloc(png_ptr,</div><div class='del'>-        (png_uint_32)(num * png_sizeof(png_uint_16p)));</div><div class='del'>-</div><div class='del'>-     if (png_ptr-&gt;transformations &amp; (PNG_16_TO_8 | PNG_BACKGROUND))</div><div class='del'>-     {</div><div class='del'>-        double fin, fout;</div><div class='del'>-        png_uint_32 last, max;</div><div class='del'>-</div><div class='del'>-        for (i = 0; i &lt; num; i++)</div><div class='del'>-        {</div><div class='del'>-           png_ptr-&gt;gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr,</div><div class='del'>-              (png_uint_32)(256 * png_sizeof(png_uint_16)));</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        g = 1.0 / g;</div><div class='del'>-        last = 0;</div><div class='del'>-        for (i = 0; i &lt; 256; i++)</div><div class='del'>-        {</div><div class='del'>-           fout = ((double)i + 0.5) / 256.0;</div><div class='del'>-           fin = pow(fout, g);</div><div class='del'>-           max = (png_uint_32)(fin * (double)((png_uint_32)num &lt;&lt; 8));</div><div class='del'>-           while (last &lt;= max)</div><div class='del'>-           {</div><div class='del'>-              png_ptr-&gt;gamma_16_table[(int)(last &amp; (0xff &gt;&gt; shift))]</div><div class='del'>-                 [(int)(last &gt;&gt; (8 - shift))] = (png_uint_16)(</div><div class='del'>-                 (png_uint_16)i | ((png_uint_16)i &lt;&lt; 8));</div><div class='del'>-              last++;</div><div class='del'>-           }</div><div class='del'>-        }</div><div class='del'>-        while (last &lt; ((png_uint_32)num &lt;&lt; 8))</div><div class='del'>-        {</div><div class='del'>-           png_ptr-&gt;gamma_16_table[(int)(last &amp; (0xff &gt;&gt; shift))]</div><div class='del'>-              [(int)(last &gt;&gt; (8 - shift))] = (png_uint_16)65535L;</div><div class='del'>-           last++;</div><div class='del'>-        }</div><div class='del'>-     }</div><div class='del'>-     else</div><div class='del'>-     {</div><div class='del'>-        for (i = 0; i &lt; num; i++)</div><div class='del'>-        {</div><div class='del'>-           png_ptr-&gt;gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr,</div><div class='del'>-              (png_uint_32)(256 * png_sizeof(png_uint_16)));</div><div class='del'>-</div><div class='del'>-           ig = (((png_uint_32)i * (png_uint_32)png_gamma_shift[shift]) &gt;&gt; 4);</div><div class='del'>-</div><div class='del'>-           for (j = 0; j &lt; 256; j++)</div><div class='del'>-           {</div><div class='del'>-              png_ptr-&gt;gamma_16_table[i][j] =</div><div class='del'>-                 (png_uint_16)(pow((double)(ig + ((png_uint_32)j &lt;&lt; 8)) /</div><div class='del'>-                    65535.0, g) * 65535.0 + .5);</div><div class='del'>-           }</div><div class='del'>-        }</div><div class='del'>-     }</div><div class='del'>-</div><div class='del'>-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \</div><div class='del'>-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)</div><div class='del'>-     if (png_ptr-&gt;transformations &amp; (PNG_BACKGROUND | PNG_RGB_TO_GRAY))</div><div class='del'>-     {</div><div class='del'>-</div><div class='del'>-        g = 1.0 / (png_ptr-&gt;gamma);</div><div class='del'>-</div><div class='del'>-        png_ptr-&gt;gamma_16_to_1 = (png_uint_16pp)png_calloc(png_ptr,</div><div class='del'>-           (png_uint_32)(num * png_sizeof(png_uint_16p )));</div><div class='del'>-</div><div class='del'>-        for (i = 0; i &lt; num; i++)</div><div class='del'>-        {</div><div class='del'>-           png_ptr-&gt;gamma_16_to_1[i] = (png_uint_16p)png_malloc(png_ptr,</div><div class='del'>-              (png_uint_32)(256 * png_sizeof(png_uint_16)));</div><div class='del'>-</div><div class='del'>-           ig = (((png_uint_32)i *</div><div class='del'>-              (png_uint_32)png_gamma_shift[shift]) &gt;&gt; 4);</div><div class='del'>-           for (j = 0; j &lt; 256; j++)</div><div class='del'>-           {</div><div class='del'>-              png_ptr-&gt;gamma_16_to_1[i][j] =</div><div class='del'>-                 (png_uint_16)(pow((double)(ig + ((png_uint_32)j &lt;&lt; 8)) /</div><div class='del'>-                    65535.0, g) * 65535.0 + .5);</div><div class='del'>-           }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if (png_ptr-&gt;screen_gamma &gt; 0.000001)</div><div class='del'>-           g = 1.0 / png_ptr-&gt;screen_gamma;</div><div class='del'>-</div><div class='del'>-        else</div><div class='del'>-           g = png_ptr-&gt;gamma;   /* Probably doing rgb_to_gray */</div><div class='del'>-</div><div class='del'>-        png_ptr-&gt;gamma_16_from_1 = (png_uint_16pp)png_calloc(png_ptr,</div><div class='del'>-           (png_uint_32)(num * png_sizeof(png_uint_16p)));</div><div class='del'>-</div><div class='del'>-        for (i = 0; i &lt; num; i++)</div><div class='del'>-        {</div><div class='del'>-           png_ptr-&gt;gamma_16_from_1[i] = (png_uint_16p)png_malloc(png_ptr,</div><div class='del'>-              (png_uint_32)(256 * png_sizeof(png_uint_16)));</div><div class='del'>-</div><div class='del'>-           ig = (((png_uint_32)i *</div><div class='del'>-              (png_uint_32)png_gamma_shift[shift]) &gt;&gt; 4);</div><div class='del'>-</div><div class='del'>-           for (j = 0; j &lt; 256; j++)</div><div class='del'>-           {</div><div class='del'>-              png_ptr-&gt;gamma_16_from_1[i][j] =</div><div class='del'>-                 (png_uint_16)(pow((double)(ig + ((png_uint_32)j &lt;&lt; 8)) /</div><div class='del'>-                    65535.0, g) * 65535.0 + .5);</div><div class='del'>-           }</div><div class='del'>-        }</div><div class='del'>-     }</div><div class='del'>-#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */</div><div class='del'>-  }</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-/* To do: install integer version of png_build_gamma_table here */</div><div class='del'>-#endif</div><div class='add'>+#endif /* PNG_READ_QUANTIZE_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_MNG_FEATURES_SUPPORTED</div><div class='ctx'> /* Undoes intrapixel differencing  */</div><div class='hunk'>@@ -4142,6 +4170,7 @@ png_do_read_intrapixel(png_row_infop row_info, png_bytep row)</div><div class='ctx'>    {</div><div class='ctx'>       int bytes_per_pixel;</div><div class='ctx'>       png_uint_32 row_width = row_info-&gt;width;</div><div class='add'>+</div><div class='ctx'>       if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>       {</div><div class='ctx'>          png_bytep rp;</div><div class='hunk'>@@ -4158,8 +4187,8 @@ png_do_read_intrapixel(png_row_infop row_info, png_bytep row)</div><div class='ctx'> </div><div class='ctx'>          for (i = 0, rp = row; i &lt; row_width; i++, rp += bytes_per_pixel)</div><div class='ctx'>          {</div><div class='del'>-            *(rp) = (png_byte)((256 + *rp + *(rp+1))&amp;0xff);</div><div class='del'>-            *(rp+2) = (png_byte)((256 + *(rp+2) + *(rp+1))&amp;0xff);</div><div class='add'>+            *(rp) = (png_byte)((256 + *rp + *(rp + 1)) &amp; 0xff);</div><div class='add'>+            *(rp+2) = (png_byte)((256 + *(rp + 2) + *(rp + 1)) &amp; 0xff);</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='ctx'>       else if (row_info-&gt;bit_depth == 16)</div><div class='hunk'>@@ -4183,10 +4212,10 @@ png_do_read_intrapixel(png_row_infop row_info, png_bytep row)</div><div class='ctx'>             png_uint_32 s2   = (*(rp + 4) &lt;&lt; 8) | *(rp + 5);</div><div class='ctx'>             png_uint_32 red  = (png_uint_32)((s0 + s1 + 65536L) &amp; 0xffffL);</div><div class='ctx'>             png_uint_32 blue = (png_uint_32)((s2 + s1 + 65536L) &amp; 0xffffL);</div><div class='del'>-            *(rp  ) = (png_byte)((red &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-            *(rp+1) = (png_byte)(red &amp; 0xff);</div><div class='del'>-            *(rp+4) = (png_byte)((blue &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-            *(rp+5) = (png_byte)(blue &amp; 0xff);</div><div class='add'>+            *(rp    ) = (png_byte)((red &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+            *(rp + 1) = (png_byte)(red &amp; 0xff);</div><div class='add'>+            *(rp + 4) = (png_byte)((blue &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+            *(rp + 5) = (png_byte)(blue &amp; 0xff);</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='head'>diff --git a/src/3rdparty/libpng/pngrutil.c b/src/3rdparty/libpng/pngrutil.c<br/>index d971e8f..4c3cd53 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngrutil.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngrutil.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngrutil.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngrutil.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> </div><div class='ctx'> /* pngrutil.c - utilities to read a PNG file</div><div class='ctx'>  *</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Last changed in libpng 1.5.1 [February 3, 2011]</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -14,58 +14,136 @@</div><div class='ctx'>  * libpng itself during the course of reading an image.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define PNG_NO_PEDANTIC_WARNINGS</div><div class='del'>-#include "png.h"</div><div class='del'>-#ifdef PNG_READ_SUPPORTED</div><div class='ctx'> #include "pngpriv.h"</div><div class='ctx'> </div><div class='del'>-#    define png_strtod(p,a,b) strtod(a,b)</div><div class='add'>+#ifdef PNG_READ_SUPPORTED</div><div class='add'>+</div><div class='add'>+#define png_strtod(p,a,b) strtod(a,b)</div><div class='add'>+</div><div class='ctx'> png_uint_32 PNGAPI</div><div class='del'>-png_get_uint_31(png_structp png_ptr, png_bytep buf)</div><div class='add'>+png_get_uint_31(png_structp png_ptr, png_const_bytep buf)</div><div class='add'>+{</div><div class='add'>+   png_uint_32 uval = png_get_uint_32(buf);</div><div class='add'>+</div><div class='add'>+   if (uval &gt; PNG_UINT_31_MAX)</div><div class='add'>+      png_error(png_ptr, "PNG unsigned integer out of range");</div><div class='add'>+</div><div class='add'>+   return (uval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined(PNG_READ_gAMA_SUPPORTED) || defined(PNG_READ_cHRM_SUPPORTED)</div><div class='add'>+/* The following is a variation on the above for use with the fixed</div><div class='add'>+ * point values used for gAMA and cHRM.  Instead of png_error it</div><div class='add'>+ * issues a warning and returns (-1) - an invalid value because both</div><div class='add'>+ * gAMA and cHRM use *unsigned* integers for fixed point values.</div><div class='add'>+ */</div><div class='add'>+#define PNG_FIXED_ERROR (-1)</div><div class='add'>+</div><div class='add'>+static png_fixed_point /* PRIVATE */</div><div class='add'>+png_get_fixed_point(png_structp png_ptr, png_const_bytep buf)</div><div class='ctx'> {</div><div class='del'>-   png_uint_32 i = png_get_uint_32(buf);</div><div class='del'>-   if (i &gt; PNG_UINT_31_MAX)</div><div class='del'>-     png_error(png_ptr, "PNG unsigned integer out of range");</div><div class='del'>-   return (i);</div><div class='add'>+   png_uint_32 uval = png_get_uint_32(buf);</div><div class='add'>+</div><div class='add'>+   if (uval &lt;= PNG_UINT_31_MAX)</div><div class='add'>+      return (png_fixed_point)uval; /* known to be in range */</div><div class='add'>+</div><div class='add'>+   /* The caller can turn off the warning by passing NULL. */</div><div class='add'>+   if (png_ptr != NULL)</div><div class='add'>+      png_warning(png_ptr, "PNG fixed point integer out of range");</div><div class='add'>+</div><div class='add'>+   return PNG_FIXED_ERROR;</div><div class='ctx'> }</div><div class='del'>-#ifndef PNG_USE_READ_MACROS</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED</div><div class='add'>+/* NOTE: the read macros will obscure these definitions, so that if</div><div class='add'>+ * PNG_USE_READ_MACROS is set the library will not use them internally,</div><div class='add'>+ * but the APIs will still be available externally.</div><div class='add'>+ *</div><div class='add'>+ * The parentheses around "PNGAPI function_name" in the following three</div><div class='add'>+ * functions are necessary because they allow the macros to co-exist with</div><div class='add'>+ * these (unused but exported) functions.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> /* Grab an unsigned 32-bit integer from a buffer in big-endian format. */</div><div class='del'>-png_uint_32 PNGAPI</div><div class='del'>-png_get_uint_32(png_bytep buf)</div><div class='add'>+png_uint_32 (PNGAPI</div><div class='add'>+png_get_uint_32)(png_const_bytep buf)</div><div class='ctx'> {</div><div class='del'>-   png_uint_32 i = ((png_uint_32)(*buf) &lt;&lt; 24) +</div><div class='del'>-      ((png_uint_32)(*(buf + 1)) &lt;&lt; 16) +</div><div class='del'>-      ((png_uint_32)(*(buf + 2)) &lt;&lt; 8) +</div><div class='del'>-      (png_uint_32)(*(buf + 3));</div><div class='add'>+   png_uint_32 uval =</div><div class='add'>+       ((png_uint_32)(*(buf    )) &lt;&lt; 24) +</div><div class='add'>+       ((png_uint_32)(*(buf + 1)) &lt;&lt; 16) +</div><div class='add'>+       ((png_uint_32)(*(buf + 2)) &lt;&lt;  8) +</div><div class='add'>+       ((png_uint_32)(*(buf + 3))      ) ;</div><div class='ctx'> </div><div class='del'>-   return (i);</div><div class='add'>+   return uval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Grab a signed 32-bit integer from a buffer in big-endian format.  The</div><div class='del'>- * data is stored in the PNG file in two's complement format, and it is</div><div class='del'>- * assumed that the machine format for signed integers is the same.</div><div class='add'>+ * data is stored in the PNG file in two's complement format and there</div><div class='add'>+ * is no guarantee that a 'png_int_32' is exactly 32 bits, therefore</div><div class='add'>+ * the following code does a two's complement to native conversion.</div><div class='ctx'>  */</div><div class='del'>-png_int_32 PNGAPI</div><div class='del'>-png_get_int_32(png_bytep buf)</div><div class='add'>+png_int_32 (PNGAPI</div><div class='add'>+png_get_int_32)(png_const_bytep buf)</div><div class='ctx'> {</div><div class='del'>-   png_int_32 i = ((png_int_32)(*buf) &lt;&lt; 24) +</div><div class='del'>-      ((png_int_32)(*(buf + 1)) &lt;&lt; 16) +</div><div class='del'>-      ((png_int_32)(*(buf + 2)) &lt;&lt; 8) +</div><div class='del'>-      (png_int_32)(*(buf + 3));</div><div class='add'>+   png_uint_32 uval = png_get_uint_32(buf);</div><div class='add'>+   if ((uval &amp; 0x80000000L) == 0) /* non-negative */</div><div class='add'>+      return uval;</div><div class='ctx'> </div><div class='del'>-   return (i);</div><div class='add'>+   uval = (uval ^ 0xffffffffL) + 1;  /* 2's complement: -x = ~x+1 */</div><div class='add'>+   return -(png_int_32)uval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Grab an unsigned 16-bit integer from a buffer in big-endian format. */</div><div class='del'>-png_uint_16 PNGAPI</div><div class='del'>-png_get_uint_16(png_bytep buf)</div><div class='add'>+png_uint_16 (PNGAPI</div><div class='add'>+png_get_uint_16)(png_const_bytep buf)</div><div class='add'>+{</div><div class='add'>+   /* ANSI-C requires an int value to accomodate at least 16 bits so this</div><div class='add'>+    * works and allows the compiler not to worry about possible narrowing</div><div class='add'>+    * on 32 bit systems.  (Pre-ANSI systems did not make integers smaller</div><div class='add'>+    * than 16 bits either.)</div><div class='add'>+    */</div><div class='add'>+   unsigned int val =</div><div class='add'>+       ((unsigned int)(*buf) &lt;&lt; 8) +</div><div class='add'>+       ((unsigned int)(*(buf + 1)));</div><div class='add'>+</div><div class='add'>+   return (png_uint_16)val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* PNG_READ_INT_FUNCTIONS_SUPPORTED */</div><div class='add'>+</div><div class='add'>+/* Read and check the PNG file signature */</div><div class='add'>+void /* PRIVATE */</div><div class='add'>+png_read_sig(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> {</div><div class='del'>-   png_uint_16 i = (png_uint_16)(((png_uint_16)(*buf) &lt;&lt; 8) +</div><div class='del'>-      (png_uint_16)(*(buf + 1)));</div><div class='add'>+   png_size_t num_checked, num_to_check;</div><div class='ctx'> </div><div class='del'>-   return (i);</div><div class='add'>+   /* Exit if the user application does not expect a signature. */</div><div class='add'>+   if (png_ptr-&gt;sig_bytes &gt;= 8)</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   num_checked = png_ptr-&gt;sig_bytes;</div><div class='add'>+   num_to_check = 8 - num_checked;</div><div class='add'>+</div><div class='add'>+#ifdef PNG_IO_STATE_SUPPORTED</div><div class='add'>+   png_ptr-&gt;io_state = PNG_IO_READING | PNG_IO_SIGNATURE;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+   /* The signature must be serialized in a single I/O call. */</div><div class='add'>+   png_read_data(png_ptr, &amp;(info_ptr-&gt;signature[num_checked]), num_to_check);</div><div class='add'>+   png_ptr-&gt;sig_bytes = 8;</div><div class='add'>+</div><div class='add'>+   if (png_sig_cmp(info_ptr-&gt;signature, num_checked, num_to_check))</div><div class='add'>+   {</div><div class='add'>+      if (num_checked &lt; 4 &amp;&amp;</div><div class='add'>+          png_sig_cmp(info_ptr-&gt;signature, num_checked, num_to_check - 4))</div><div class='add'>+         png_error(png_ptr, "Not a PNG file");</div><div class='add'>+      else</div><div class='add'>+         png_error(png_ptr, "PNG file corrupted by ASCII conversion");</div><div class='add'>+   }</div><div class='add'>+   if (num_checked &lt; 3)</div><div class='add'>+      png_ptr-&gt;mode |= PNG_HAVE_PNG_SIGNATURE;</div><div class='ctx'> }</div><div class='del'>-#endif /* PNG_USE_READ_MACROS */</div><div class='ctx'> </div><div class='ctx'> /* Read the chunk header (length + type name).</div><div class='ctx'>  * Put the type name into png_ptr-&gt;chunk_name, and return the length.</div><div class='hunk'>@@ -77,33 +155,29 @@ png_read_chunk_header(png_structp png_ptr)</div><div class='ctx'>    png_uint_32 length;</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_IO_STATE_SUPPORTED</div><div class='del'>-   /* Inform the I/O callback that the chunk header is being read.</div><div class='del'>-    * PNG_IO_CHUNK_HDR requires a single I/O call.</div><div class='del'>-    */</div><div class='ctx'>    png_ptr-&gt;io_state = PNG_IO_READING | PNG_IO_CHUNK_HDR;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-   /* Read the length and the chunk name */</div><div class='add'>+   /* Read the length and the chunk name.</div><div class='add'>+    * This must be performed in a single I/O call.</div><div class='add'>+    */</div><div class='ctx'>    png_read_data(png_ptr, buf, 8);</div><div class='ctx'>    length = png_get_uint_31(png_ptr, buf);</div><div class='ctx'> </div><div class='del'>-   /* Put the chunk name into png_ptr-&gt;chunk_name */</div><div class='add'>+   /* Put the chunk name into png_ptr-&gt;chunk_name. */</div><div class='ctx'>    png_memcpy(png_ptr-&gt;chunk_name, buf + 4, 4);</div><div class='ctx'> </div><div class='del'>-   png_debug2(0, "Reading %s chunk, length = %lu",</div><div class='del'>-      png_ptr-&gt;chunk_name, length);</div><div class='add'>+   png_debug2(0, "Reading %s chunk, length = %u",</div><div class='add'>+       png_ptr-&gt;chunk_name, length);</div><div class='ctx'> </div><div class='del'>-   /* Reset the crc and run it over the chunk name */</div><div class='add'>+   /* Reset the crc and run it over the chunk name. */</div><div class='ctx'>    png_reset_crc(png_ptr);</div><div class='ctx'>    png_calculate_crc(png_ptr, png_ptr-&gt;chunk_name, 4);</div><div class='ctx'> </div><div class='del'>-   /* Check to see if chunk name is valid */</div><div class='add'>+   /* Check to see if chunk name is valid. */</div><div class='ctx'>    png_check_chunk_name(png_ptr, png_ptr-&gt;chunk_name);</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_IO_STATE_SUPPORTED</div><div class='del'>-   /* Inform the I/O callback that chunk data will (possibly) be read.</div><div class='del'>-    * PNG_IO_CHUNK_DATA does NOT require a specific number of I/O calls.</div><div class='del'>-    */</div><div class='ctx'>    png_ptr-&gt;io_state = PNG_IO_READING | PNG_IO_CHUNK_DATA;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -116,6 +190,7 @@ png_crc_read(png_structp png_ptr, png_bytep buf, png_size_t length)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_read_data(png_ptr, buf, length);</div><div class='ctx'>    png_calculate_crc(png_ptr, buf, length);</div><div class='ctx'> }</div><div class='hunk'>@@ -135,6 +210,7 @@ png_crc_finish(png_structp png_ptr, png_uint_32 skip)</div><div class='ctx'>    {</div><div class='ctx'>       png_crc_read(png_ptr, png_ptr-&gt;zbuf, png_ptr-&gt;zbuf_size);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (i)</div><div class='ctx'>    {</div><div class='ctx'>       png_crc_read(png_ptr, png_ptr-&gt;zbuf, i);</div><div class='hunk'>@@ -149,11 +225,13 @@ png_crc_finish(png_structp png_ptr, png_uint_32 skip)</div><div class='ctx'>       {</div><div class='ctx'>          png_chunk_warning(png_ptr, "CRC error");</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          png_chunk_benign_error(png_ptr, "CRC error");</div><div class='ctx'>          return (0);</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       return (1);</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='hunk'>@@ -176,6 +254,7 @@ png_crc_error(png_structp png_ptr)</div><div class='ctx'>           (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))</div><div class='ctx'>          need_crc = 0;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else                                                    /* critical */</div><div class='ctx'>    {</div><div class='ctx'>       if (png_ptr-&gt;flags &amp; PNG_FLAG_CRC_CRITICAL_IGNORE)</div><div class='hunk'>@@ -183,11 +262,10 @@ png_crc_error(png_structp png_ptr)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_IO_STATE_SUPPORTED</div><div class='del'>-   /* Inform the I/O callback that the chunk CRC is being read */</div><div class='del'>-   /* PNG_IO_CHUNK_CRC requires the I/O to be done at once */</div><div class='ctx'>    png_ptr-&gt;io_state = PNG_IO_READING | PNG_IO_CHUNK_CRC;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+   /* The chunk CRC must be serialized in a single I/O call. */</div><div class='ctx'>    png_read_data(png_ptr, crc_bytes, 4);</div><div class='ctx'> </div><div class='ctx'>    if (need_crc)</div><div class='hunk'>@@ -195,200 +273,268 @@ png_crc_error(png_structp png_ptr)</div><div class='ctx'>       crc = png_get_uint_32(crc_bytes);</div><div class='ctx'>       return ((int)(crc != png_ptr-&gt;crc));</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       return (0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_READ_iTXt_SUPPORTED) || \</div><div class='ctx'>     defined(PNG_READ_iCCP_SUPPORTED)</div><div class='del'>-/*</div><div class='del'>- * Decompress trailing data in a chunk.  The assumption is that chunkdata</div><div class='del'>- * points at an allocated area holding the contents of a chunk with a</div><div class='del'>- * trailing compressed part.  What we get back is an allocated area</div><div class='del'>- * holding the original prefix part and an uncompressed version of the</div><div class='del'>- * trailing part (the malloc area passed in is freed).</div><div class='del'>- */</div><div class='del'>-void /* PRIVATE */</div><div class='del'>-png_decompress_chunk(png_structp png_ptr, int comp_type,</div><div class='del'>-                              png_size_t chunklength,</div><div class='del'>-                              png_size_t prefix_size, png_size_t *newlength)</div><div class='add'>+static png_size_t</div><div class='add'>+png_inflate(png_structp png_ptr, png_bytep data, png_size_t size,</div><div class='add'>+    png_bytep output, png_size_t output_size)</div><div class='ctx'> {</div><div class='del'>-   static PNG_CONST char msg[] = "Error decoding compressed chunk";</div><div class='del'>-   png_charp text;</div><div class='del'>-   png_size_t text_size;</div><div class='add'>+   png_size_t count = 0;</div><div class='add'>+</div><div class='add'>+   /* zlib can't necessarily handle more than 65535 bytes at once (i.e. it can't</div><div class='add'>+    * even necessarily handle 65536 bytes) because the type uInt is "16 bits or</div><div class='add'>+    * more".  Consequently it is necessary to chunk the input to zlib.  This</div><div class='add'>+    * code uses ZLIB_IO_MAX, from pngpriv.h, as the maximum (the maximum value</div><div class='add'>+    * that can be stored in a uInt.)  It is possible to set ZLIB_IO_MAX to a</div><div class='add'>+    * lower value in pngpriv.h and this may sometimes have a performance</div><div class='add'>+    * advantage, because it forces access of the input data to be separated from</div><div class='add'>+    * at least some of the use by some period of time.</div><div class='add'>+    */</div><div class='add'>+   png_ptr-&gt;zstream.next_in = data;</div><div class='add'>+   /* avail_in is set below from 'size' */</div><div class='add'>+   png_ptr-&gt;zstream.avail_in = 0;</div><div class='ctx'> </div><div class='del'>-   if (comp_type == PNG_COMPRESSION_TYPE_BASE)</div><div class='add'>+   while (1)</div><div class='ctx'>    {</div><div class='del'>-      int ret = Z_OK;</div><div class='del'>-      png_ptr-&gt;zstream.next_in = (png_bytep)(png_ptr-&gt;chunkdata + prefix_size);</div><div class='del'>-      png_ptr-&gt;zstream.avail_in = (uInt)(chunklength - prefix_size);</div><div class='add'>+      int ret, avail;</div><div class='add'>+</div><div class='add'>+      /* The setting of 'avail_in' used to be outside the loop, by setting it</div><div class='add'>+       * inside it is possible to chunk the input to zlib and simply rely on</div><div class='add'>+       * zlib to advance the 'next_in' pointer.  This allows arbitrary amounts o</div><div class='add'>+       * data to be passed through zlib at the unavoidable cost of requiring a</div><div class='add'>+       * window save (memcpy of up to 32768 output bytes) every ZLIB_IO_MAX</div><div class='add'>+       * input bytes.</div><div class='add'>+       */</div><div class='add'>+      if (png_ptr-&gt;zstream.avail_in == 0 &amp;&amp; size &gt; 0)</div><div class='add'>+      {</div><div class='add'>+         if (size &lt;= ZLIB_IO_MAX)</div><div class='add'>+         {</div><div class='add'>+            /* The value is less than ZLIB_IO_MAX so the cast is safe: */</div><div class='add'>+            png_ptr-&gt;zstream.avail_in = (uInt)size;</div><div class='add'>+            size = 0;</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         else</div><div class='add'>+         {</div><div class='add'>+            png_ptr-&gt;zstream.avail_in = ZLIB_IO_MAX;</div><div class='add'>+            size -= ZLIB_IO_MAX;</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* Reset the output buffer each time round - we empty it</div><div class='add'>+       * after every inflate call.</div><div class='add'>+       */</div><div class='ctx'>       png_ptr-&gt;zstream.next_out = png_ptr-&gt;zbuf;</div><div class='del'>-      png_ptr-&gt;zstream.avail_out = (uInt)png_ptr-&gt;zbuf_size;</div><div class='add'>+      png_ptr-&gt;zstream.avail_out = png_ptr-&gt;zbuf_size;</div><div class='ctx'> </div><div class='del'>-      text_size = 0;</div><div class='del'>-      text = NULL;</div><div class='add'>+      ret = inflate(&amp;png_ptr-&gt;zstream, Z_NO_FLUSH);</div><div class='add'>+      avail = png_ptr-&gt;zbuf_size - png_ptr-&gt;zstream.avail_out;</div><div class='ctx'> </div><div class='del'>-      while (png_ptr-&gt;zstream.avail_in)</div><div class='add'>+      /* First copy/count any new output - but only if we didn't</div><div class='add'>+       * get an error code.</div><div class='add'>+       */</div><div class='add'>+      if ((ret == Z_OK || ret == Z_STREAM_END) &amp;&amp; avail &gt; 0)</div><div class='ctx'>       {</div><div class='del'>-         ret = inflate(&amp;png_ptr-&gt;zstream, Z_PARTIAL_FLUSH);</div><div class='del'>-         if (ret != Z_OK &amp;&amp; ret != Z_STREAM_END)</div><div class='del'>-         {</div><div class='del'>-            if (png_ptr-&gt;zstream.msg != NULL)</div><div class='del'>-               png_warning(png_ptr, png_ptr-&gt;zstream.msg);</div><div class='del'>-            else</div><div class='del'>-               png_warning(png_ptr, msg);</div><div class='del'>-            inflateReset(&amp;png_ptr-&gt;zstream);</div><div class='del'>-            png_ptr-&gt;zstream.avail_in = 0;</div><div class='add'>+         png_size_t space = avail; /* &gt; 0, see above */</div><div class='ctx'> </div><div class='del'>-            if (text ==  NULL)</div><div class='del'>-            {</div><div class='del'>-               text_size = prefix_size + png_sizeof(msg) + 1;</div><div class='del'>-               text = (png_charp)png_malloc_warn(png_ptr, text_size);</div><div class='del'>-               if (text ==  NULL)</div><div class='del'>-                 {</div><div class='del'>-                    png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='del'>-                    png_ptr-&gt;chunkdata = NULL;</div><div class='del'>-                    png_error(png_ptr, "Not enough memory to decompress chunk");</div><div class='del'>-                 }</div><div class='del'>-               png_memcpy(text, png_ptr-&gt;chunkdata, prefix_size);</div><div class='del'>-            }</div><div class='add'>+         if (output != 0 &amp;&amp; output_size &gt; count)</div><div class='add'>+         {</div><div class='add'>+            png_size_t copy = output_size - count;</div><div class='ctx'> </div><div class='del'>-            text[text_size - 1] = 0x00;</div><div class='add'>+            if (space &lt; copy)</div><div class='add'>+               copy = space;</div><div class='ctx'> </div><div class='del'>-            /* Copy what we can of the error message into the text chunk */</div><div class='del'>-            text_size = (png_size_t)(chunklength -</div><div class='del'>-              (text - png_ptr-&gt;chunkdata) - 1);</div><div class='del'>-            if (text_size &gt; png_sizeof(msg))</div><div class='del'>-               text_size = png_sizeof(msg);</div><div class='del'>-            png_memcpy(text + prefix_size, msg, text_size);</div><div class='del'>-            break;</div><div class='add'>+            png_memcpy(output + count, png_ptr-&gt;zbuf, copy);</div><div class='ctx'>          }</div><div class='del'>-         if (!png_ptr-&gt;zstream.avail_out || ret == Z_STREAM_END)</div><div class='del'>-         {</div><div class='del'>-            if (text == NULL)</div><div class='del'>-            {</div><div class='del'>-               text_size = prefix_size +</div><div class='del'>-                   png_ptr-&gt;zbuf_size - png_ptr-&gt;zstream.avail_out;</div><div class='del'>-               text = (png_charp)png_malloc_warn(png_ptr, text_size + 1);</div><div class='del'>-               if (text ==  NULL)</div><div class='del'>-               {</div><div class='del'>-                  png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='del'>-                  png_ptr-&gt;chunkdata = NULL;</div><div class='del'>-                  png_error(png_ptr,</div><div class='del'>-                    "Not enough memory to decompress chunk");</div><div class='del'>-               }</div><div class='del'>-               png_memcpy(text + prefix_size, png_ptr-&gt;zbuf,</div><div class='del'>-                    text_size - prefix_size);</div><div class='del'>-               png_memcpy(text, png_ptr-&gt;chunkdata, prefix_size);</div><div class='del'>-               *(text + text_size) = 0x00;</div><div class='del'>-            }</div><div class='del'>-            else</div><div class='del'>-            {</div><div class='del'>-               png_charp tmp;</div><div class='add'>+         count += space;</div><div class='add'>+      }</div><div class='ctx'> </div><div class='del'>-               tmp = text;</div><div class='del'>-#ifdef PNG_SET_USER_LIMITS_SUPPORTED</div><div class='del'>-               if ((png_ptr-&gt;user_chunk_cache_max != 0) &amp;&amp;</div><div class='del'>-                  (--png_ptr-&gt;user_chunk_cache_max == 0))</div><div class='del'>-               {</div><div class='del'>-                  png_warning(png_ptr, "No space in chunk cache");</div><div class='del'>-                  text = NULL;</div><div class='del'>-               }</div><div class='add'>+      if (ret == Z_OK)</div><div class='add'>+         continue;</div><div class='ctx'> </div><div class='del'>-               else</div><div class='del'>-               {</div><div class='del'>-#endif</div><div class='del'>-                  text = (png_charp)png_malloc_warn(png_ptr,</div><div class='del'>-                     (png_size_t)(text_size +</div><div class='del'>-                      png_ptr-&gt;zbuf_size - png_ptr-&gt;zstream.avail_out + 1));</div><div class='del'>-#ifdef PNG_SET_USER_LIMITS_SUPPORTED</div><div class='del'>-               }</div><div class='add'>+      /* Termination conditions - always reset the zstream, it</div><div class='add'>+       * must be left in inflateInit state.</div><div class='add'>+       */</div><div class='add'>+      png_ptr-&gt;zstream.avail_in = 0;</div><div class='add'>+      inflateReset(&amp;png_ptr-&gt;zstream);</div><div class='add'>+</div><div class='add'>+      if (ret == Z_STREAM_END)</div><div class='add'>+         return count; /* NOTE: may be zero. */</div><div class='add'>+</div><div class='add'>+      /* Now handle the error codes - the API always returns 0</div><div class='add'>+       * and the error message is dumped into the uncompressed</div><div class='add'>+       * buffer if available.</div><div class='add'>+       */</div><div class='add'>+      {</div><div class='add'>+         PNG_CONST char *msg;</div><div class='add'>+#ifdef PNG_CONSOLE_IO_SUPPORTED</div><div class='add'>+         char umsg[52];</div><div class='ctx'> #endif</div><div class='del'>-               if (text == NULL)</div><div class='del'>-               {</div><div class='del'>-                  png_free(png_ptr, tmp);</div><div class='del'>-                  png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='del'>-                  png_ptr-&gt;chunkdata = NULL;</div><div class='del'>-                  png_error(png_ptr,</div><div class='del'>-                    "Not enough memory to decompress chunk");</div><div class='del'>-               }</div><div class='del'>-               png_memcpy(text, tmp, text_size);</div><div class='del'>-               png_free(png_ptr, tmp);</div><div class='del'>-               png_memcpy(text + text_size, png_ptr-&gt;zbuf,</div><div class='del'>-                  (png_ptr-&gt;zbuf_size - png_ptr-&gt;zstream.avail_out));</div><div class='del'>-               text_size += png_ptr-&gt;zbuf_size - png_ptr-&gt;zstream.avail_out;</div><div class='del'>-               *(text + text_size) = 0x00;</div><div class='del'>-            }</div><div class='del'>-            if (ret == Z_STREAM_END)</div><div class='del'>-               break;</div><div class='del'>-            else</div><div class='add'>+         if (png_ptr-&gt;zstream.msg != 0)</div><div class='add'>+            msg = png_ptr-&gt;zstream.msg;</div><div class='add'>+</div><div class='add'>+         else</div><div class='add'>+         {</div><div class='add'>+#ifdef PNG_CONSOLE_IO_SUPPORTED</div><div class='add'>+            switch (ret)</div><div class='ctx'>             {</div><div class='del'>-               png_ptr-&gt;zstream.next_out = png_ptr-&gt;zbuf;</div><div class='del'>-               png_ptr-&gt;zstream.avail_out = (uInt)png_ptr-&gt;zbuf_size;</div><div class='add'>+               case Z_BUF_ERROR:</div><div class='add'>+                  msg = "Buffer error in compressed datastream in %s chunk";</div><div class='add'>+                  break;</div><div class='add'>+</div><div class='add'>+               case Z_DATA_ERROR:</div><div class='add'>+                  msg = "Data error in compressed datastream in %s chunk";</div><div class='add'>+                  break;</div><div class='add'>+</div><div class='add'>+               default:</div><div class='add'>+                  msg = "Incomplete compressed datastream in %s chunk";</div><div class='add'>+                  break;</div><div class='ctx'>             }</div><div class='add'>+</div><div class='add'>+            png_snprintf(umsg, sizeof umsg, msg, png_ptr-&gt;chunk_name);</div><div class='add'>+            msg = umsg;</div><div class='add'>+#else</div><div class='add'>+            msg = "Damaged compressed datastream in chunk other than IDAT";</div><div class='add'>+#endif</div><div class='ctx'>          }</div><div class='add'>+</div><div class='add'>+         png_warning(png_ptr, msg);</div><div class='ctx'>       }</div><div class='del'>-      if (ret != Z_STREAM_END)</div><div class='del'>-      {</div><div class='del'>-#ifdef PNG_STDIO_SUPPORTED</div><div class='del'>-         char umsg[52];</div><div class='ctx'> </div><div class='del'>-         if (ret == Z_BUF_ERROR)</div><div class='del'>-            png_snprintf(umsg, 52,</div><div class='del'>-                "Buffer error in compressed datastream in %s chunk",</div><div class='del'>-                png_ptr-&gt;chunk_name);</div><div class='add'>+      /* 0 means an error - notice that this code simply ignores</div><div class='add'>+       * zero length compressed chunks as a result.</div><div class='add'>+       */</div><div class='add'>+      return 0;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-         else if (ret == Z_DATA_ERROR)</div><div class='del'>-            png_snprintf(umsg, 52,</div><div class='del'>-                "Data error in compressed datastream in %s chunk",</div><div class='del'>-                png_ptr-&gt;chunk_name);</div><div class='add'>+/*</div><div class='add'>+ * Decompress trailing data in a chunk.  The assumption is that chunkdata</div><div class='add'>+ * points at an allocated area holding the contents of a chunk with a</div><div class='add'>+ * trailing compressed part.  What we get back is an allocated area</div><div class='add'>+ * holding the original prefix part and an uncompressed version of the</div><div class='add'>+ * trailing part (the malloc area passed in is freed).</div><div class='add'>+ */</div><div class='add'>+void /* PRIVATE */</div><div class='add'>+png_decompress_chunk(png_structp png_ptr, int comp_type,</div><div class='add'>+    png_size_t chunklength,</div><div class='add'>+    png_size_t prefix_size, png_size_t *newlength)</div><div class='add'>+{</div><div class='add'>+   /* The caller should guarantee this */</div><div class='add'>+   if (prefix_size &gt; chunklength)</div><div class='add'>+   {</div><div class='add'>+      /* The recovery is to delete the chunk. */</div><div class='add'>+      png_warning(png_ptr, "invalid chunklength");</div><div class='add'>+      prefix_size = 0; /* To delete everything */</div><div class='add'>+   }</div><div class='ctx'> </div><div class='del'>-         else</div><div class='del'>-            png_snprintf(umsg, 52,</div><div class='del'>-                "Incomplete compressed datastream in %s chunk",</div><div class='del'>-                png_ptr-&gt;chunk_name);</div><div class='add'>+   else if (comp_type == PNG_COMPRESSION_TYPE_BASE)</div><div class='add'>+   {</div><div class='add'>+      png_size_t expanded_size = png_inflate(png_ptr,</div><div class='add'>+          (png_bytep)(png_ptr-&gt;chunkdata + prefix_size),</div><div class='add'>+          chunklength - prefix_size,</div><div class='add'>+          0,            /*output*/</div><div class='add'>+          0);           /*output size*/</div><div class='ctx'> </div><div class='del'>-         png_warning(png_ptr, umsg);</div><div class='add'>+      /* Now check the limits on this chunk - if the limit fails the</div><div class='add'>+       * compressed data will be removed, the prefix will remain.</div><div class='add'>+       */</div><div class='add'>+#ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED</div><div class='add'>+      if (png_ptr-&gt;user_chunk_malloc_max &amp;&amp;</div><div class='add'>+          (prefix_size + expanded_size &gt;= png_ptr-&gt;user_chunk_malloc_max - 1))</div><div class='ctx'> #else</div><div class='del'>-         png_warning(png_ptr,</div><div class='del'>-            "Incomplete compressed datastream in chunk other than IDAT");</div><div class='add'>+#  ifdef PNG_USER_CHUNK_MALLOC_MAX</div><div class='add'>+      if ((PNG_USER_CHUNK_MALLOC_MAX &gt; 0) &amp;&amp;</div><div class='add'>+          prefix_size + expanded_size &gt;= PNG_USER_CHUNK_MALLOC_MAX - 1)</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+         png_warning(png_ptr, "Exceeded size limit while expanding chunk");</div><div class='add'>+</div><div class='add'>+      /* If the size is zero either there was an error and a message</div><div class='add'>+       * has already been output (warning) or the size really is zero</div><div class='add'>+       * and we have nothing to do - the code will exit through the</div><div class='add'>+       * error case below.</div><div class='add'>+       */</div><div class='add'>+#if defined(PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED) || \</div><div class='add'>+    defined(PNG_USER_CHUNK_MALLOC_MAX)</div><div class='add'>+      else if (expanded_size &gt; 0)</div><div class='add'>+#else</div><div class='add'>+      if (expanded_size &gt; 0)</div><div class='ctx'> #endif</div><div class='del'>-         text_size = prefix_size;</div><div class='del'>-         if (text ==  NULL)</div><div class='add'>+      {</div><div class='add'>+         /* Success (maybe) - really uncompress the chunk. */</div><div class='add'>+         png_size_t new_size = 0;</div><div class='add'>+         png_charp text = png_malloc_warn(png_ptr,</div><div class='add'>+             prefix_size + expanded_size + 1);</div><div class='add'>+</div><div class='add'>+         if (text != NULL)</div><div class='ctx'>          {</div><div class='del'>-            text = (png_charp)png_malloc_warn(png_ptr, text_size+1);</div><div class='del'>-            if (text == NULL)</div><div class='del'>-              {</div><div class='del'>-                png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='del'>-                png_ptr-&gt;chunkdata = NULL;</div><div class='del'>-                png_error(png_ptr, "Not enough memory for text");</div><div class='del'>-              }</div><div class='ctx'>             png_memcpy(text, png_ptr-&gt;chunkdata, prefix_size);</div><div class='del'>-         }</div><div class='del'>-         *(text + text_size) = 0x00;</div><div class='del'>-      }</div><div class='add'>+            new_size = png_inflate(png_ptr,</div><div class='add'>+                (png_bytep)(png_ptr-&gt;chunkdata + prefix_size),</div><div class='add'>+                chunklength - prefix_size,</div><div class='add'>+                (png_bytep)(text + prefix_size), expanded_size);</div><div class='add'>+            text[prefix_size + expanded_size] = 0; /* just in case */</div><div class='ctx'> </div><div class='del'>-      inflateReset(&amp;png_ptr-&gt;zstream);</div><div class='del'>-      png_ptr-&gt;zstream.avail_in = 0;</div><div class='add'>+            if (new_size == expanded_size)</div><div class='add'>+            {</div><div class='add'>+               png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='add'>+               png_ptr-&gt;chunkdata = text;</div><div class='add'>+               *newlength = prefix_size + expanded_size;</div><div class='add'>+               return; /* The success return! */</div><div class='add'>+            }</div><div class='ctx'> </div><div class='del'>-      png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='del'>-      png_ptr-&gt;chunkdata = text;</div><div class='del'>-      *newlength=text_size;</div><div class='add'>+            png_warning(png_ptr, "png_inflate logic error");</div><div class='add'>+            png_free(png_ptr, text);</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         else</div><div class='add'>+            png_warning(png_ptr, "Not enough memory to decompress chunk");</div><div class='add'>+      }</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else /* if (comp_type != PNG_COMPRESSION_TYPE_BASE) */</div><div class='ctx'>    {</div><div class='ctx'> #ifdef PNG_STDIO_SUPPORTED</div><div class='ctx'>       char umsg[50];</div><div class='ctx'> </div><div class='del'>-      png_snprintf(umsg, 50, "Unknown zTXt compression type %d", comp_type);</div><div class='add'>+      png_snprintf(umsg, sizeof umsg,</div><div class='add'>+          "Unknown zTXt compression type %d", comp_type);</div><div class='ctx'>       png_warning(png_ptr, umsg);</div><div class='ctx'> #else</div><div class='ctx'>       png_warning(png_ptr, "Unknown zTXt compression type");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-      *(png_ptr-&gt;chunkdata + prefix_size) = 0x00;</div><div class='del'>-      *newlength = prefix_size;</div><div class='add'>+      /* The recovery is to simply drop the data. */</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* Generic error return - leave the prefix, delete the compressed</div><div class='add'>+    * data, reallocate the chunkdata to remove the potentially large</div><div class='add'>+    * amount of compressed data.</div><div class='add'>+    */</div><div class='add'>+   {</div><div class='add'>+      png_charp text = png_malloc_warn(png_ptr, prefix_size + 1);</div><div class='add'>+</div><div class='add'>+      if (text != NULL)</div><div class='add'>+      {</div><div class='add'>+         if (prefix_size &gt; 0)</div><div class='add'>+            png_memcpy(text, png_ptr-&gt;chunkdata, prefix_size);</div><div class='add'>+</div><div class='add'>+         png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='add'>+         png_ptr-&gt;chunkdata = text;</div><div class='add'>+</div><div class='add'>+         /* This is an extra zero in the 'uncompressed' part. */</div><div class='add'>+         *(png_ptr-&gt;chunkdata + prefix_size) = 0x00;</div><div class='add'>+      }</div><div class='add'>+      /* Ignore a malloc error here - it is safe. */</div><div class='ctx'>    }</div><div class='add'>+</div><div class='add'>+   *newlength = prefix_size;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -437,6 +583,7 @@ png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    /* Find number of channels */</div><div class='ctx'>    switch (png_ptr-&gt;color_type)</div><div class='ctx'>    {</div><div class='add'>+      default: /* invalid, png_set_IHDR calls png_error */</div><div class='ctx'>       case PNG_COLOR_TYPE_GRAY:</div><div class='ctx'>       case PNG_COLOR_TYPE_PALETTE:</div><div class='ctx'>          png_ptr-&gt;channels = 1;</div><div class='hunk'>@@ -461,9 +608,9 @@ png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    png_ptr-&gt;rowbytes = PNG_ROWBYTES(png_ptr-&gt;pixel_depth, png_ptr-&gt;width);</div><div class='ctx'>    png_debug1(3, "bit_depth = %d", png_ptr-&gt;bit_depth);</div><div class='ctx'>    png_debug1(3, "channels = %d", png_ptr-&gt;channels);</div><div class='del'>-   png_debug1(3, "rowbytes = %lu", png_ptr-&gt;rowbytes);</div><div class='add'>+   png_debug1(3, "rowbytes = %lu", (unsigned long)png_ptr-&gt;rowbytes);</div><div class='ctx'>    png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,</div><div class='del'>-      color_type, interlace_type, compression_type, filter_type);</div><div class='add'>+       color_type, interlace_type, compression_type, filter_type);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Read and check the palette */</div><div class='hunk'>@@ -496,10 +643,11 @@ png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    if (!(png_ptr-&gt;color_type&amp;PNG_COLOR_MASK_COLOR))</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr,</div><div class='del'>-        "Ignoring PLTE chunk in grayscale PNG");</div><div class='add'>+          "Ignoring PLTE chunk in grayscale PNG");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'> #ifndef PNG_READ_OPT_PLTE_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;color_type != PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>    {</div><div class='hunk'>@@ -548,7 +696,7 @@ png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-   /* If we actually NEED the PLTE chunk (ie for a paletted image), we do</div><div class='add'>+   /* If we actually need the PLTE chunk (ie for a paletted image), we do</div><div class='ctx'>     * whatever the normal CRC configuration tells us.  However, if we</div><div class='ctx'>     * have an RGB image, the PLTE can be considered ancillary, so</div><div class='ctx'>     * we will act as though it is.</div><div class='hunk'>@@ -559,25 +707,29 @@ png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    {</div><div class='ctx'>       png_crc_finish(png_ptr, 0);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'> #ifndef PNG_READ_OPT_PLTE_SUPPORTED</div><div class='ctx'>    else if (png_crc_error(png_ptr))  /* Only if we have a CRC error */</div><div class='ctx'>    {</div><div class='ctx'>       /* If we don't want to use the data from an ancillary chunk,</div><div class='del'>-         we have two options: an error abort, or a warning and we</div><div class='del'>-         ignore the data in this chunk (which should be OK, since</div><div class='del'>-         it's considered ancillary for a RGB or RGBA image). */</div><div class='add'>+       * we have two options: an error abort, or a warning and we</div><div class='add'>+       * ignore the data in this chunk (which should be OK, since</div><div class='add'>+       * it's considered ancillary for a RGB or RGBA image).</div><div class='add'>+       */</div><div class='ctx'>       if (!(png_ptr-&gt;flags &amp; PNG_FLAG_CRC_ANCILLARY_USE))</div><div class='ctx'>       {</div><div class='ctx'>          if (png_ptr-&gt;flags &amp; PNG_FLAG_CRC_ANCILLARY_NOWARN)</div><div class='ctx'>          {</div><div class='ctx'>             png_chunk_benign_error(png_ptr, "CRC error");</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>          {</div><div class='ctx'>             png_chunk_warning(png_ptr, "CRC error");</div><div class='ctx'>             return;</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       /* Otherwise, we (optionally) emit a warning and use the chunk. */</div><div class='ctx'>       else if (!(png_ptr-&gt;flags &amp; PNG_FLAG_CRC_ANCILLARY_NOWARN))</div><div class='ctx'>       {</div><div class='hunk'>@@ -598,6 +750,7 @@ png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>             png_warning(png_ptr, "Truncating incorrect tRNS chunk length");</div><div class='ctx'>             png_ptr-&gt;num_trans = (png_uint_16)num;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          if (info_ptr-&gt;num_trans &gt; (png_uint_16)num)</div><div class='ctx'>          {</div><div class='ctx'>             png_warning(png_ptr, "Truncating incorrect info tRNS chunk length");</div><div class='hunk'>@@ -625,9 +778,10 @@ png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Incorrect IEND chunk length");</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    png_crc_finish(png_ptr, length);</div><div class='ctx'> </div><div class='del'>-   info_ptr = info_ptr; /* Quiet compiler warnings about unused info_ptr */</div><div class='add'>+   PNG_UNUSED(info_ptr) /* Quiet compiler warnings about unused info_ptr */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_gAMA_SUPPORTED</div><div class='hunk'>@@ -635,30 +789,29 @@ void /* PRIVATE */</div><div class='ctx'> png_handle_gAMA(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> {</div><div class='ctx'>    png_fixed_point igamma;</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   float file_gamma;</div><div class='del'>-#endif</div><div class='ctx'>    png_byte buf[4];</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_handle_gAMA");</div><div class='ctx'> </div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR))</div><div class='ctx'>       png_error(png_ptr, "Missing IHDR before gAMA");</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_IDAT)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid gAMA after IDAT");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_PLTE)</div><div class='ctx'>       /* Should be an error, but we can cope with it */</div><div class='ctx'>       png_warning(png_ptr, "Out of place gAMA chunk");</div><div class='ctx'> </div><div class='ctx'>    if (info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_gAMA)</div><div class='ctx'> #ifdef PNG_READ_sRGB_SUPPORTED</div><div class='del'>-      &amp;&amp; !(info_ptr-&gt;valid &amp; PNG_INFO_sRGB)</div><div class='add'>+       &amp;&amp; !(info_ptr-&gt;valid &amp; PNG_INFO_sRGB)</div><div class='ctx'> #endif</div><div class='del'>-      )</div><div class='add'>+       )</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Duplicate gAMA chunk");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='hunk'>@@ -673,41 +826,43 @@ png_handle_gAMA(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_crc_read(png_ptr, buf, 4);</div><div class='add'>+</div><div class='ctx'>    if (png_crc_finish(png_ptr, 0))</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='del'>-   igamma = (png_fixed_point)png_get_uint_32(buf);</div><div class='del'>-   /* Check for zero gamma */</div><div class='del'>-   if (igamma == 0)</div><div class='del'>-      {</div><div class='del'>-         png_warning(png_ptr,</div><div class='del'>-           "Ignoring gAMA chunk with gamma=0");</div><div class='del'>-         return;</div><div class='del'>-      }</div><div class='add'>+   igamma = png_get_fixed_point(NULL, buf);</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_READ_sRGB_SUPPORTED</div><div class='add'>+   /* Check for zero gamma or an error. */</div><div class='add'>+   if (igamma &lt;= 0)</div><div class='add'>+   {</div><div class='add'>+      png_warning(png_ptr,</div><div class='add'>+          "Ignoring gAMA chunk with out of range gamma");</div><div class='add'>+</div><div class='add'>+      return;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+#  ifdef PNG_READ_sRGB_SUPPORTED</div><div class='ctx'>    if (info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_sRGB))</div><div class='add'>+   {</div><div class='ctx'>       if (PNG_OUT_OF_RANGE(igamma, 45500L, 500))</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr,</div><div class='del'>-           "Ignoring incorrect gAMA value when sRGB is also present");</div><div class='del'>-#ifdef PNG_CONSOLE_IO_SUPPORTED</div><div class='add'>+             "Ignoring incorrect gAMA value when sRGB is also present");</div><div class='add'>+</div><div class='add'>+#    ifdef PNG_CONSOLE_IO_SUPPORTED</div><div class='ctx'>          fprintf(stderr, "gamma = (%d/100000)", (int)igamma);</div><div class='del'>-#endif</div><div class='add'>+#    endif</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='del'>-#endif /* PNG_READ_sRGB_SUPPORTED */</div><div class='add'>+   }</div><div class='add'>+#  endif /* PNG_READ_sRGB_SUPPORTED */</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   file_gamma = (float)igamma / (float)100000.0;</div><div class='ctx'> #  ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='del'>-     png_ptr-&gt;gamma = file_gamma;</div><div class='add'>+   /* Gamma correction on read is supported. */</div><div class='add'>+   png_ptr-&gt;gamma = igamma;</div><div class='ctx'> #  endif</div><div class='del'>-     png_set_gAMA(png_ptr, info_ptr, file_gamma);</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+   /* And set the 'info' structure members. */</div><div class='ctx'>    png_set_gAMA_fixed(png_ptr, info_ptr, igamma);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -724,17 +879,20 @@ png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR))</div><div class='ctx'>       png_error(png_ptr, "Missing IHDR before sBIT");</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_IDAT)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid sBIT after IDAT");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_PLTE)</div><div class='ctx'>    {</div><div class='ctx'>       /* Should be an error, but we can cope with it */</div><div class='ctx'>       png_warning(png_ptr, "Out of place sBIT chunk");</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_sBIT))</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Duplicate sBIT chunk");</div><div class='hunk'>@@ -744,6 +902,7 @@ png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>       truelen = 3;</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       truelen = (png_size_t)png_ptr-&gt;channels;</div><div class='ctx'> </div><div class='hunk'>@@ -755,6 +914,7 @@ png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_crc_read(png_ptr, buf, truelen);</div><div class='add'>+</div><div class='ctx'>    if (png_crc_finish(png_ptr, 0))</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='hunk'>@@ -765,6 +925,7 @@ png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>       png_ptr-&gt;sig_bit.blue = buf[2];</div><div class='ctx'>       png_ptr-&gt;sig_bit.alpha = buf[3];</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='ctx'>       png_ptr-&gt;sig_bit.gray = buf[0];</div><div class='hunk'>@@ -773,6 +934,7 @@ png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>       png_ptr-&gt;sig_bit.blue = buf[0];</div><div class='ctx'>       png_ptr-&gt;sig_bit.alpha = buf[1];</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    png_set_sBIT(png_ptr, info_ptr, &amp;(png_ptr-&gt;sig_bit));</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -782,32 +944,29 @@ void /* PRIVATE */</div><div class='ctx'> png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> {</div><div class='ctx'>    png_byte buf[32];</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;</div><div class='del'>-#endif</div><div class='del'>-   png_fixed_point int_x_white, int_y_white, int_x_red, int_y_red, int_x_green,</div><div class='del'>-      int_y_green, int_x_blue, int_y_blue;</div><div class='del'>-</div><div class='del'>-   png_uint_32 uint_x, uint_y;</div><div class='add'>+   png_fixed_point x_white, y_white, x_red, y_red, x_green, y_green, x_blue,</div><div class='add'>+      y_blue;</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_handle_cHRM");</div><div class='ctx'> </div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR))</div><div class='ctx'>       png_error(png_ptr, "Missing IHDR before cHRM");</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_IDAT)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid cHRM after IDAT");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_PLTE)</div><div class='ctx'>       /* Should be an error, but we can cope with it */</div><div class='ctx'>       png_warning(png_ptr, "Missing PLTE before cHRM");</div><div class='ctx'> </div><div class='ctx'>    if (info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_cHRM)</div><div class='del'>-#ifdef PNG_READ_sRGB_SUPPORTED</div><div class='del'>-      &amp;&amp; !(info_ptr-&gt;valid &amp; PNG_INFO_sRGB)</div><div class='del'>-#endif</div><div class='add'>+#  ifdef PNG_READ_sRGB_SUPPORTED</div><div class='add'>+       &amp;&amp; !(info_ptr-&gt;valid &amp; PNG_INFO_sRGB)</div><div class='add'>+#  endif</div><div class='ctx'>       )</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Duplicate cHRM chunk");</div><div class='hunk'>@@ -823,81 +982,61 @@ png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_crc_read(png_ptr, buf, 32);</div><div class='add'>+</div><div class='ctx'>    if (png_crc_finish(png_ptr, 0))</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='del'>-   uint_x = png_get_uint_32(buf);</div><div class='del'>-   uint_y = png_get_uint_32(buf + 4);</div><div class='del'>-   int_x_white = (png_fixed_point)uint_x;</div><div class='del'>-   int_y_white = (png_fixed_point)uint_y;</div><div class='del'>-</div><div class='del'>-   uint_x = png_get_uint_32(buf + 8);</div><div class='del'>-   uint_y = png_get_uint_32(buf + 12);</div><div class='del'>-   int_x_red = (png_fixed_point)uint_x;</div><div class='del'>-   int_y_red = (png_fixed_point)uint_y;</div><div class='del'>-</div><div class='del'>-   uint_x = png_get_uint_32(buf + 16);</div><div class='del'>-   uint_y = png_get_uint_32(buf + 20);</div><div class='del'>-   int_x_green = (png_fixed_point)uint_x;</div><div class='del'>-   int_y_green = (png_fixed_point)uint_y;</div><div class='del'>-</div><div class='del'>-   uint_x = png_get_uint_32(buf + 24);</div><div class='del'>-   uint_y = png_get_uint_32(buf + 28);</div><div class='del'>-   int_x_blue = (png_fixed_point)uint_x;</div><div class='del'>-   int_y_blue = (png_fixed_point)uint_y;</div><div class='add'>+   x_white = png_get_fixed_point(NULL, buf);</div><div class='add'>+   y_white = png_get_fixed_point(NULL, buf + 4);</div><div class='add'>+   x_red   = png_get_fixed_point(NULL, buf + 8);</div><div class='add'>+   y_red   = png_get_fixed_point(NULL, buf + 12);</div><div class='add'>+   x_green = png_get_fixed_point(NULL, buf + 16);</div><div class='add'>+   y_green = png_get_fixed_point(NULL, buf + 20);</div><div class='add'>+   x_blue  = png_get_fixed_point(NULL, buf + 24);</div><div class='add'>+   y_blue  = png_get_fixed_point(NULL, buf + 28);</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   white_x = (float)int_x_white / (float)100000.0;</div><div class='del'>-   white_y = (float)int_y_white / (float)100000.0;</div><div class='del'>-   red_x   = (float)int_x_red   / (float)100000.0;</div><div class='del'>-   red_y   = (float)int_y_red   / (float)100000.0;</div><div class='del'>-   green_x = (float)int_x_green / (float)100000.0;</div><div class='del'>-   green_y = (float)int_y_green / (float)100000.0;</div><div class='del'>-   blue_x  = (float)int_x_blue  / (float)100000.0;</div><div class='del'>-   blue_y  = (float)int_y_blue  / (float)100000.0;</div><div class='del'>-#endif</div><div class='add'>+   if (x_white == PNG_FIXED_ERROR ||</div><div class='add'>+       y_white == PNG_FIXED_ERROR ||</div><div class='add'>+       x_red   == PNG_FIXED_ERROR ||</div><div class='add'>+       y_red   == PNG_FIXED_ERROR ||</div><div class='add'>+       x_green == PNG_FIXED_ERROR ||</div><div class='add'>+       y_green == PNG_FIXED_ERROR ||</div><div class='add'>+       x_blue  == PNG_FIXED_ERROR ||</div><div class='add'>+       y_blue  == PNG_FIXED_ERROR)</div><div class='add'>+   {</div><div class='add'>+      png_warning(png_ptr, "Ignoring cHRM chunk with negative chromaticities");</div><div class='add'>+      return;</div><div class='add'>+   }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_sRGB_SUPPORTED</div><div class='ctx'>    if ((info_ptr != NULL) &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_sRGB))</div><div class='add'>+   {</div><div class='add'>+      if (PNG_OUT_OF_RANGE(x_white, 31270,  1000) ||</div><div class='add'>+          PNG_OUT_OF_RANGE(y_white, 32900,  1000) ||</div><div class='add'>+          PNG_OUT_OF_RANGE(x_red,   64000L, 1000) ||</div><div class='add'>+          PNG_OUT_OF_RANGE(y_red,   33000,  1000) ||</div><div class='add'>+          PNG_OUT_OF_RANGE(x_green, 30000,  1000) ||</div><div class='add'>+          PNG_OUT_OF_RANGE(y_green, 60000L, 1000) ||</div><div class='add'>+          PNG_OUT_OF_RANGE(x_blue,  15000,  1000) ||</div><div class='add'>+          PNG_OUT_OF_RANGE(y_blue,   6000,  1000))</div><div class='ctx'>       {</div><div class='del'>-      if (PNG_OUT_OF_RANGE(int_x_white, 31270,  1000) ||</div><div class='del'>-          PNG_OUT_OF_RANGE(int_y_white, 32900,  1000) ||</div><div class='del'>-          PNG_OUT_OF_RANGE(int_x_red,   64000L, 1000) ||</div><div class='del'>-          PNG_OUT_OF_RANGE(int_y_red,   33000,  1000) ||</div><div class='del'>-          PNG_OUT_OF_RANGE(int_x_green, 30000,  1000) ||</div><div class='del'>-          PNG_OUT_OF_RANGE(int_y_green, 60000L, 1000) ||</div><div class='del'>-          PNG_OUT_OF_RANGE(int_x_blue,  15000,  1000) ||</div><div class='del'>-          PNG_OUT_OF_RANGE(int_y_blue,   6000,  1000))</div><div class='del'>-         {</div><div class='del'>-            png_warning(png_ptr,</div><div class='del'>-              "Ignoring incorrect cHRM value when sRGB is also present");</div><div class='add'>+         png_warning(png_ptr,</div><div class='add'>+             "Ignoring incorrect cHRM value when sRGB is also present");</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_CONSOLE_IO_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-            fprintf(stderr, "wx=%f, wy=%f, rx=%f, ry=%f\n",</div><div class='del'>-               white_x, white_y, red_x, red_y);</div><div class='del'>-            fprintf(stderr, "gx=%f, gy=%f, bx=%f, by=%f\n",</div><div class='del'>-               green_x, green_y, blue_x, blue_y);</div><div class='del'>-#else</div><div class='del'>-            fprintf(stderr, "wx=%ld, wy=%ld, rx=%ld, ry=%ld\n",</div><div class='del'>-               int_x_white, int_y_white, int_x_red, int_y_red);</div><div class='del'>-            fprintf(stderr, "gx=%ld, gy=%ld, bx=%ld, by=%ld\n",</div><div class='del'>-               int_x_green, int_y_green, int_x_blue, int_y_blue);</div><div class='del'>-#endif</div><div class='add'>+         fprintf(stderr, "wx=%d, wy=%d, rx=%d, ry=%d\n",</div><div class='add'>+             x_white, y_white, x_red, y_red);</div><div class='add'>+</div><div class='add'>+         fprintf(stderr, "gx=%d, gy=%d, bx=%d, by=%d\n",</div><div class='add'>+             x_green, y_green, x_blue, y_blue);</div><div class='ctx'> #endif /* PNG_CONSOLE_IO_SUPPORTED */</div><div class='del'>-         }</div><div class='del'>-         return;</div><div class='ctx'>       }</div><div class='add'>+      return;</div><div class='add'>+   }</div><div class='ctx'> #endif /* PNG_READ_sRGB_SUPPORTED */</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   png_set_cHRM(png_ptr, info_ptr,</div><div class='del'>-      white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-   png_set_cHRM_fixed(png_ptr, info_ptr,</div><div class='del'>-      int_x_white, int_y_white, int_x_red, int_y_red, int_x_green,</div><div class='del'>-      int_y_green, int_x_blue, int_y_blue);</div><div class='del'>-#endif</div><div class='add'>+   png_set_cHRM_fixed(png_ptr, info_ptr, x_white, y_white, x_red, y_red,</div><div class='add'>+      x_green, y_green, x_blue, y_blue);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -912,12 +1051,14 @@ png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR))</div><div class='ctx'>       png_error(png_ptr, "Missing IHDR before sRGB");</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_IDAT)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid sRGB after IDAT");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_PLTE)</div><div class='ctx'>       /* Should be an error, but we can cope with it */</div><div class='ctx'>       png_warning(png_ptr, "Out of place sRGB chunk");</div><div class='hunk'>@@ -937,10 +1078,12 @@ png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_crc_read(png_ptr, buf, 1);</div><div class='add'>+</div><div class='ctx'>    if (png_crc_finish(png_ptr, 0))</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='ctx'>    intent = buf[0];</div><div class='add'>+</div><div class='ctx'>    /* Check for bad intent */</div><div class='ctx'>    if (intent &gt;= PNG_sRGB_INTENT_LAST)</div><div class='ctx'>    {</div><div class='hunk'>@@ -951,48 +1094,31 @@ png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> #if defined(PNG_READ_gAMA_SUPPORTED) &amp;&amp; defined(PNG_READ_GAMMA_SUPPORTED)</div><div class='ctx'>    if (info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_gAMA))</div><div class='ctx'>    {</div><div class='del'>-   png_fixed_point igamma;</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-      igamma=info_ptr-&gt;int_gamma;</div><div class='del'>-#else</div><div class='del'>-#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-      igamma=(png_fixed_point)(info_ptr-&gt;gamma * 100000.);</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-      if (PNG_OUT_OF_RANGE(igamma, 45500L, 500))</div><div class='add'>+      if (PNG_OUT_OF_RANGE(info_ptr-&gt;gamma, 45500L, 500))</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr,</div><div class='del'>-           "Ignoring incorrect gAMA value when sRGB is also present");</div><div class='add'>+             "Ignoring incorrect gAMA value when sRGB is also present");</div><div class='ctx'> #ifdef PNG_CONSOLE_IO_SUPPORTED</div><div class='del'>-#  ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-         fprintf(stderr, "incorrect gamma=(%d/100000)\n",</div><div class='del'>-            (int)png_ptr-&gt;int_gamma);</div><div class='del'>-#  else</div><div class='del'>-#    ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-         fprintf(stderr, "incorrect gamma=%f\n", png_ptr-&gt;gamma);</div><div class='del'>-#    endif</div><div class='del'>-#  endif</div><div class='add'>+         fprintf(stderr, "incorrect gamma=(%d/100000)\n", info_ptr-&gt;gamma);</div><div class='ctx'> #endif</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='ctx'> #endif /* PNG_READ_gAMA_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_cHRM_SUPPORTED</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='ctx'>    if (info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_cHRM))</div><div class='del'>-      if (PNG_OUT_OF_RANGE(info_ptr-&gt;int_x_white, 31270,  1000) ||</div><div class='del'>-          PNG_OUT_OF_RANGE(info_ptr-&gt;int_y_white, 32900,  1000) ||</div><div class='del'>-          PNG_OUT_OF_RANGE(info_ptr-&gt;int_x_red,   64000L, 1000) ||</div><div class='del'>-          PNG_OUT_OF_RANGE(info_ptr-&gt;int_y_red,   33000,  1000) ||</div><div class='del'>-          PNG_OUT_OF_RANGE(info_ptr-&gt;int_x_green, 30000,  1000) ||</div><div class='del'>-          PNG_OUT_OF_RANGE(info_ptr-&gt;int_y_green, 60000L, 1000) ||</div><div class='del'>-          PNG_OUT_OF_RANGE(info_ptr-&gt;int_x_blue,  15000,  1000) ||</div><div class='del'>-          PNG_OUT_OF_RANGE(info_ptr-&gt;int_y_blue,   6000,  1000))</div><div class='del'>-         {</div><div class='del'>-            png_warning(png_ptr,</div><div class='del'>-              "Ignoring incorrect cHRM value when sRGB is also present");</div><div class='del'>-         }</div><div class='del'>-#endif /* PNG_FIXED_POINT_SUPPORTED */</div><div class='add'>+      if (PNG_OUT_OF_RANGE(info_ptr-&gt;x_white, 31270,  1000) ||</div><div class='add'>+          PNG_OUT_OF_RANGE(info_ptr-&gt;y_white, 32900,  1000) ||</div><div class='add'>+          PNG_OUT_OF_RANGE(info_ptr-&gt;x_red,   64000L, 1000) ||</div><div class='add'>+          PNG_OUT_OF_RANGE(info_ptr-&gt;y_red,   33000,  1000) ||</div><div class='add'>+          PNG_OUT_OF_RANGE(info_ptr-&gt;x_green, 30000,  1000) ||</div><div class='add'>+          PNG_OUT_OF_RANGE(info_ptr-&gt;y_green, 60000L, 1000) ||</div><div class='add'>+          PNG_OUT_OF_RANGE(info_ptr-&gt;x_blue,  15000,  1000) ||</div><div class='add'>+          PNG_OUT_OF_RANGE(info_ptr-&gt;y_blue,   6000,  1000))</div><div class='add'>+      {</div><div class='add'>+         png_warning(png_ptr,</div><div class='add'>+             "Ignoring incorrect cHRM value when sRGB is also present");</div><div class='add'>+      }</div><div class='ctx'> #endif /* PNG_READ_cHRM_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'>    png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, intent);</div><div class='hunk'>@@ -1008,19 +1134,22 @@ png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    png_bytep pC;</div><div class='ctx'>    png_charp profile;</div><div class='ctx'>    png_uint_32 skip = 0;</div><div class='del'>-   png_uint_32 profile_size, profile_length;</div><div class='add'>+   png_uint_32 profile_size;</div><div class='add'>+   png_alloc_size_t profile_length;</div><div class='ctx'>    png_size_t slength, prefix_length, data_length;</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_handle_iCCP");</div><div class='ctx'> </div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR))</div><div class='ctx'>       png_error(png_ptr, "Missing IHDR before iCCP");</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_IDAT)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid iCCP after IDAT");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_PLTE)</div><div class='ctx'>       /* Should be an error, but we can cope with it */</div><div class='ctx'>       png_warning(png_ptr, "Out of place iCCP chunk");</div><div class='hunk'>@@ -1063,7 +1192,7 @@ png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    /* There should be at least one zero (the compression type byte)</div><div class='ctx'>     * following the separator, and we should be on it</div><div class='ctx'>     */</div><div class='del'>-   if ( profile &gt;= png_ptr-&gt;chunkdata + slength - 1)</div><div class='add'>+   if (profile &gt;= png_ptr-&gt;chunkdata + slength - 1)</div><div class='ctx'>    {</div><div class='ctx'>       png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='ctx'>       png_ptr-&gt;chunkdata = NULL;</div><div class='hunk'>@@ -1073,6 +1202,7 @@ png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    /* Compression_type should always be zero */</div><div class='ctx'>    compression_type = *profile++;</div><div class='add'>+</div><div class='ctx'>    if (compression_type)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Ignoring nonzero compression type in iCCP chunk");</div><div class='hunk'>@@ -1082,11 +1212,11 @@ png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    prefix_length = profile - png_ptr-&gt;chunkdata;</div><div class='ctx'>    png_decompress_chunk(png_ptr, compression_type,</div><div class='del'>-     slength, prefix_length, &amp;data_length);</div><div class='add'>+       slength, prefix_length, &amp;data_length);</div><div class='ctx'> </div><div class='ctx'>    profile_length = data_length - prefix_length;</div><div class='ctx'> </div><div class='del'>-   if ( prefix_length &gt; data_length || profile_length &lt; 4)</div><div class='add'>+   if (prefix_length &gt; data_length || profile_length &lt; 4)</div><div class='ctx'>    {</div><div class='ctx'>       png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='ctx'>       png_ptr-&gt;chunkdata = NULL;</div><div class='hunk'>@@ -1096,24 +1226,43 @@ png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    /* Check the profile_size recorded in the first 32 bits of the ICC profile */</div><div class='ctx'>    pC = (png_bytep)(png_ptr-&gt;chunkdata + prefix_length);</div><div class='del'>-   profile_size = ((*(pC    ))&lt;&lt;24) |</div><div class='del'>-                  ((*(pC + 1))&lt;&lt;16) |</div><div class='del'>-                  ((*(pC + 2))&lt;&lt; 8) |</div><div class='del'>-                  ((*(pC + 3))    );</div><div class='add'>+   profile_size = ((*(pC    )) &lt;&lt; 24) |</div><div class='add'>+                  ((*(pC + 1)) &lt;&lt; 16) |</div><div class='add'>+                  ((*(pC + 2)) &lt;&lt;  8) |</div><div class='add'>+                  ((*(pC + 3))      );</div><div class='ctx'> </div><div class='add'>+   /* NOTE: the following guarantees that 'profile_length' fits into 32 bits,</div><div class='add'>+    * because profile_size is a 32 bit value.</div><div class='add'>+    */</div><div class='ctx'>    if (profile_size &lt; profile_length)</div><div class='ctx'>       profile_length = profile_size;</div><div class='ctx'> </div><div class='add'>+   /* And the following guarantees that profile_size == profile_length. */</div><div class='ctx'>    if (profile_size &gt; profile_length)</div><div class='ctx'>    {</div><div class='ctx'>       png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='ctx'>       png_ptr-&gt;chunkdata = NULL;</div><div class='del'>-      png_warning(png_ptr, "Ignoring truncated iCCP profile");</div><div class='add'>+#ifdef PNG_STDIO_SUPPORTED</div><div class='add'>+      {</div><div class='add'>+         char umsg[80];</div><div class='add'>+</div><div class='add'>+         png_snprintf2(umsg, 80,</div><div class='add'>+             "Ignoring iCCP chunk with declared size = %u "</div><div class='add'>+              "and actual length = %u",</div><div class='add'>+              (unsigned int) profile_size,</div><div class='add'>+              (unsigned int) profile_length);</div><div class='add'>+         png_warning(png_ptr, umsg);</div><div class='add'>+      }</div><div class='add'>+#else</div><div class='add'>+      png_warning(png_ptr,</div><div class='add'>+         "Ignoring iCCP chunk with uncompressed size mismatch");</div><div class='add'>+#endif</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_set_iCCP(png_ptr, info_ptr, png_ptr-&gt;chunkdata,</div><div class='del'>-     compression_type, png_ptr-&gt;chunkdata + prefix_length, profile_length);</div><div class='add'>+       compression_type, (png_bytep)png_ptr-&gt;chunkdata + prefix_length,</div><div class='add'>+       profile_size);</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='ctx'>    png_ptr-&gt;chunkdata = NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -1129,13 +1278,16 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> #ifdef PNG_POINTER_INDEXING_SUPPORTED</div><div class='ctx'>    png_sPLT_entryp pp;</div><div class='ctx'> #endif</div><div class='del'>-   int data_length, entry_size, i;</div><div class='add'>+   png_uint_32 data_length;</div><div class='add'>+   int entry_size, i;</div><div class='ctx'>    png_uint_32 skip = 0;</div><div class='ctx'>    png_size_t slength;</div><div class='add'>+   png_uint_32 dl;</div><div class='add'>+   png_size_t max_dl;</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_handle_sPLT");</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_SET_USER_LIMITS_SUPPORTED</div><div class='add'>+#ifdef PNG_USER_LIMITS_SUPPORTED</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr-&gt;user_chunk_cache_max != 0)</div><div class='ctx'>    {</div><div class='hunk'>@@ -1144,6 +1296,7 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>          png_crc_finish(png_ptr, length);</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       if (--png_ptr-&gt;user_chunk_cache_max == 1)</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr, "No space in chunk cache for sPLT");</div><div class='hunk'>@@ -1155,6 +1308,7 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR))</div><div class='ctx'>       png_error(png_ptr, "Missing IHDR before sPLT");</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_IDAT)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid sPLT after IDAT");</div><div class='hunk'>@@ -1173,6 +1327,11 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='ctx'>    png_ptr-&gt;chunkdata = (png_charp)png_malloc(png_ptr, length + 1);</div><div class='add'>+</div><div class='add'>+   /* WARNING: this may break if size_t is less than 32 bits; it is assumed</div><div class='add'>+    * that the PNG_MAX_MALLOC_64K test is enabled in this case, but this is a</div><div class='add'>+    * potential breakage point if the types in pngconf.h aren't exactly right.</div><div class='add'>+    */</div><div class='ctx'>    slength = (png_size_t)length;</div><div class='ctx'>    png_crc_read(png_ptr, (png_bytep)png_ptr-&gt;chunkdata, slength);</div><div class='ctx'> </div><div class='hunk'>@@ -1185,8 +1344,10 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    png_ptr-&gt;chunkdata[slength] = 0x00;</div><div class='ctx'> </div><div class='del'>-   for (entry_start = (png_bytep)png_ptr-&gt;chunkdata; *entry_start; entry_start++)</div><div class='add'>+   for (entry_start = (png_bytep)png_ptr-&gt;chunkdata; *entry_start;</div><div class='add'>+       entry_start++)</div><div class='ctx'>       /* Empty loop to find end of name */ ;</div><div class='add'>+</div><div class='ctx'>    ++entry_start;</div><div class='ctx'> </div><div class='ctx'>    /* A sample depth should follow the separator, and we should be on it  */</div><div class='hunk'>@@ -1200,7 +1361,12 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    new_palette.depth = *entry_start++;</div><div class='ctx'>    entry_size = (new_palette.depth == 8 ? 6 : 10);</div><div class='del'>-   data_length = (slength - (entry_start - (png_bytep)png_ptr-&gt;chunkdata));</div><div class='add'>+   /* This must fit in a png_uint_32 because it is derived from the original</div><div class='add'>+    * chunk data length (and use 'length', not 'slength' here for clarity -</div><div class='add'>+    * they are guaranteed to be the same, see the tests above.)</div><div class='add'>+    */</div><div class='add'>+   data_length = length - (png_uint_32)(entry_start -</div><div class='add'>+      (png_bytep)png_ptr-&gt;chunkdata);</div><div class='ctx'> </div><div class='ctx'>    /* Integrity-check the data length */</div><div class='ctx'>    if (data_length % entry_size)</div><div class='hunk'>@@ -1211,15 +1377,20 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-   new_palette.nentries = (png_int_32) ( data_length / entry_size);</div><div class='del'>-   if ((png_uint_32) new_palette.nentries &gt;</div><div class='del'>-       (png_uint_32) (PNG_SIZE_MAX / png_sizeof(png_sPLT_entry)))</div><div class='add'>+   dl = (png_int_32)(data_length / entry_size);</div><div class='add'>+   max_dl = PNG_SIZE_MAX / png_sizeof(png_sPLT_entry);</div><div class='add'>+</div><div class='add'>+   if (dl &gt; max_dl)</div><div class='ctx'>    {</div><div class='ctx'>        png_warning(png_ptr, "sPLT chunk too long");</div><div class='ctx'>        return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='add'>+   new_palette.nentries = (png_int_32)(data_length / entry_size);</div><div class='add'>+</div><div class='ctx'>    new_palette.entries = (png_sPLT_entryp)png_malloc_warn(</div><div class='ctx'>        png_ptr, new_palette.nentries * png_sizeof(png_sPLT_entry));</div><div class='add'>+</div><div class='ctx'>    if (new_palette.entries == NULL)</div><div class='ctx'>    {</div><div class='ctx'>        png_warning(png_ptr, "sPLT chunk requires too much memory");</div><div class='hunk'>@@ -1233,39 +1404,44 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>       if (new_palette.depth == 8)</div><div class='ctx'>       {</div><div class='del'>-          pp-&gt;red = *entry_start++;</div><div class='del'>-          pp-&gt;green = *entry_start++;</div><div class='del'>-          pp-&gt;blue = *entry_start++;</div><div class='del'>-          pp-&gt;alpha = *entry_start++;</div><div class='add'>+         pp-&gt;red = *entry_start++;</div><div class='add'>+         pp-&gt;green = *entry_start++;</div><div class='add'>+         pp-&gt;blue = *entry_start++;</div><div class='add'>+         pp-&gt;alpha = *entry_start++;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='del'>-          pp-&gt;red   = png_get_uint_16(entry_start); entry_start += 2;</div><div class='del'>-          pp-&gt;green = png_get_uint_16(entry_start); entry_start += 2;</div><div class='del'>-          pp-&gt;blue  = png_get_uint_16(entry_start); entry_start += 2;</div><div class='del'>-          pp-&gt;alpha = png_get_uint_16(entry_start); entry_start += 2;</div><div class='add'>+         pp-&gt;red   = png_get_uint_16(entry_start); entry_start += 2;</div><div class='add'>+         pp-&gt;green = png_get_uint_16(entry_start); entry_start += 2;</div><div class='add'>+         pp-&gt;blue  = png_get_uint_16(entry_start); entry_start += 2;</div><div class='add'>+         pp-&gt;alpha = png_get_uint_16(entry_start); entry_start += 2;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       pp-&gt;frequency = png_get_uint_16(entry_start); entry_start += 2;</div><div class='ctx'>    }</div><div class='ctx'> #else</div><div class='ctx'>    pp = new_palette.entries;</div><div class='add'>+</div><div class='ctx'>    for (i = 0; i &lt; new_palette.nentries; i++)</div><div class='ctx'>    {</div><div class='ctx'> </div><div class='ctx'>       if (new_palette.depth == 8)</div><div class='ctx'>       {</div><div class='del'>-          pp[i].red   = *entry_start++;</div><div class='del'>-          pp[i].green = *entry_start++;</div><div class='del'>-          pp[i].blue  = *entry_start++;</div><div class='del'>-          pp[i].alpha = *entry_start++;</div><div class='add'>+         pp[i].red   = *entry_start++;</div><div class='add'>+         pp[i].green = *entry_start++;</div><div class='add'>+         pp[i].blue  = *entry_start++;</div><div class='add'>+         pp[i].alpha = *entry_start++;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='del'>-          pp[i].red   = png_get_uint_16(entry_start); entry_start += 2;</div><div class='del'>-          pp[i].green = png_get_uint_16(entry_start); entry_start += 2;</div><div class='del'>-          pp[i].blue  = png_get_uint_16(entry_start); entry_start += 2;</div><div class='del'>-          pp[i].alpha = png_get_uint_16(entry_start); entry_start += 2;</div><div class='add'>+         pp[i].red   = png_get_uint_16(entry_start); entry_start += 2;</div><div class='add'>+         pp[i].green = png_get_uint_16(entry_start); entry_start += 2;</div><div class='add'>+         pp[i].blue  = png_get_uint_16(entry_start); entry_start += 2;</div><div class='add'>+         pp[i].alpha = png_get_uint_16(entry_start); entry_start += 2;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       pp-&gt;frequency = png_get_uint_16(entry_start); entry_start += 2;</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1291,12 +1467,14 @@ png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR))</div><div class='ctx'>       png_error(png_ptr, "Missing IHDR before tRNS");</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_IDAT)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid tRNS after IDAT");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_tRNS))</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Duplicate tRNS chunk");</div><div class='hunk'>@@ -1319,6 +1497,7 @@ png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>       png_ptr-&gt;num_trans = 1;</div><div class='ctx'>       png_ptr-&gt;trans_color.gray = png_get_uint_16(buf);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_RGB)</div><div class='ctx'>    {</div><div class='ctx'>       png_byte buf[6];</div><div class='hunk'>@@ -1329,12 +1508,14 @@ png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>          png_crc_finish(png_ptr, length);</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       png_crc_read(png_ptr, buf, (png_size_t)length);</div><div class='ctx'>       png_ptr-&gt;num_trans = 1;</div><div class='ctx'>       png_ptr-&gt;trans_color.red = png_get_uint_16(buf);</div><div class='ctx'>       png_ptr-&gt;trans_color.green = png_get_uint_16(buf + 2);</div><div class='ctx'>       png_ptr-&gt;trans_color.blue = png_get_uint_16(buf + 4);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>    {</div><div class='ctx'>       if (!(png_ptr-&gt;mode &amp; PNG_HAVE_PLTE))</div><div class='hunk'>@@ -1342,6 +1523,7 @@ png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>          /* Should be an error, but we can cope with it. */</div><div class='ctx'>          png_warning(png_ptr, "Missing PLTE before tRNS");</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       if (length &gt; (png_uint_32)png_ptr-&gt;num_palette ||</div><div class='ctx'>           length &gt; PNG_MAX_PALETTE_LENGTH)</div><div class='ctx'>       {</div><div class='hunk'>@@ -1349,15 +1531,18 @@ png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>          png_crc_finish(png_ptr, length);</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       if (length == 0)</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr, "Zero length tRNS chunk");</div><div class='ctx'>          png_crc_finish(png_ptr, length);</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       png_crc_read(png_ptr, readbuf, (png_size_t)length);</div><div class='ctx'>       png_ptr-&gt;num_trans = (png_uint_16)length;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "tRNS chunk not allowed with alpha channel");</div><div class='hunk'>@@ -1372,7 +1557,7 @@ png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_set_tRNS(png_ptr, info_ptr, readbuf, png_ptr-&gt;num_trans,</div><div class='del'>-      &amp;(png_ptr-&gt;trans_color));</div><div class='add'>+       &amp;(png_ptr-&gt;trans_color));</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1387,19 +1572,22 @@ png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR))</div><div class='ctx'>       png_error(png_ptr, "Missing IHDR before bKGD");</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_IDAT)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid bKGD after IDAT");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE &amp;&amp;</div><div class='del'>-            !(png_ptr-&gt;mode &amp; PNG_HAVE_PLTE))</div><div class='add'>+       !(png_ptr-&gt;mode &amp; PNG_HAVE_PLTE))</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Missing PLTE before bKGD");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_bKGD))</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Duplicate bKGD chunk");</div><div class='hunk'>@@ -1409,8 +1597,10 @@ png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>       truelen = 1;</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;color_type &amp; PNG_COLOR_MASK_COLOR)</div><div class='ctx'>       truelen = 6;</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       truelen = 2;</div><div class='ctx'> </div><div class='hunk'>@@ -1422,31 +1612,38 @@ png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_crc_read(png_ptr, buf, truelen);</div><div class='add'>+</div><div class='ctx'>    if (png_crc_finish(png_ptr, 0))</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='ctx'>    /* We convert the index value into RGB components so that we can allow</div><div class='ctx'>     * arbitrary RGB values for background when we have transparency, and</div><div class='ctx'>     * so it is easy to determine the RGB values of the background color</div><div class='del'>-    * from the info_ptr struct. */</div><div class='add'>+    * from the info_ptr struct.</div><div class='add'>+    */</div><div class='ctx'>    if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>    {</div><div class='ctx'>       png_ptr-&gt;background.index = buf[0];</div><div class='add'>+</div><div class='ctx'>       if (info_ptr &amp;&amp; info_ptr-&gt;num_palette)</div><div class='ctx'>       {</div><div class='del'>-          if (buf[0] &gt;= info_ptr-&gt;num_palette)</div><div class='del'>-          {</div><div class='del'>-             png_warning(png_ptr, "Incorrect bKGD chunk index value");</div><div class='del'>-             return;</div><div class='del'>-          }</div><div class='del'>-          png_ptr-&gt;background.red =</div><div class='add'>+         if (buf[0] &gt;= info_ptr-&gt;num_palette)</div><div class='add'>+         {</div><div class='add'>+            png_warning(png_ptr, "Incorrect bKGD chunk index value");</div><div class='add'>+            return;</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         png_ptr-&gt;background.red =</div><div class='ctx'>              (png_uint_16)png_ptr-&gt;palette[buf[0]].red;</div><div class='del'>-          png_ptr-&gt;background.green =</div><div class='add'>+</div><div class='add'>+         png_ptr-&gt;background.green =</div><div class='ctx'>              (png_uint_16)png_ptr-&gt;palette[buf[0]].green;</div><div class='del'>-          png_ptr-&gt;background.blue =</div><div class='add'>+</div><div class='add'>+         png_ptr-&gt;background.blue =</div><div class='ctx'>              (png_uint_16)png_ptr-&gt;palette[buf[0]].blue;</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (!(png_ptr-&gt;color_type &amp; PNG_COLOR_MASK_COLOR)) /* GRAY */</div><div class='ctx'>    {</div><div class='ctx'>       png_ptr-&gt;background.red =</div><div class='hunk'>@@ -1454,6 +1651,7 @@ png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>       png_ptr-&gt;background.blue =</div><div class='ctx'>       png_ptr-&gt;background.gray = png_get_uint_16(buf);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='ctx'>       png_ptr-&gt;background.red = png_get_uint_16(buf);</div><div class='hunk'>@@ -1476,18 +1674,21 @@ png_handle_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR))</div><div class='ctx'>       png_error(png_ptr, "Missing IHDR before hIST");</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_IDAT)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid hIST after IDAT");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (!(png_ptr-&gt;mode &amp; PNG_HAVE_PLTE))</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Missing PLTE before hIST");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_hIST))</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Duplicate hIST chunk");</div><div class='hunk'>@@ -1496,8 +1697,9 @@ png_handle_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    num = length / 2 ;</div><div class='del'>-   if (num != (unsigned int) png_ptr-&gt;num_palette || num &gt;</div><div class='del'>-      (unsigned int) PNG_MAX_PALETTE_LENGTH)</div><div class='add'>+</div><div class='add'>+   if (num != (unsigned int)png_ptr-&gt;num_palette || num &gt;</div><div class='add'>+       (unsigned int)PNG_MAX_PALETTE_LENGTH)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Incorrect hIST chunk length");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='hunk'>@@ -1531,12 +1733,14 @@ png_handle_pHYs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR))</div><div class='ctx'>       png_error(png_ptr, "Missing IHDR before pHYs");</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_IDAT)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid pHYs after IDAT");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_pHYs))</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Duplicate pHYs chunk");</div><div class='hunk'>@@ -1552,6 +1756,7 @@ png_handle_pHYs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_crc_read(png_ptr, buf, 9);</div><div class='add'>+</div><div class='ctx'>    if (png_crc_finish(png_ptr, 0))</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='hunk'>@@ -1574,12 +1779,14 @@ png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR))</div><div class='ctx'>       png_error(png_ptr, "Missing IHDR before oFFs");</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_IDAT)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid oFFs after IDAT");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_oFFs))</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Duplicate oFFs chunk");</div><div class='hunk'>@@ -1595,6 +1802,7 @@ png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_crc_read(png_ptr, buf, 9);</div><div class='add'>+</div><div class='ctx'>    if (png_crc_finish(png_ptr, 0))</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='hunk'>@@ -1621,12 +1829,14 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR))</div><div class='ctx'>       png_error(png_ptr, "Missing IHDR before pCAL");</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_IDAT)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid pCAL after IDAT");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_pCAL))</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Duplicate pCAL chunk");</div><div class='hunk'>@@ -1634,15 +1844,17 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-   png_debug1(2, "Allocating and reading pCAL chunk data (%lu bytes)",</div><div class='del'>-      length + 1);</div><div class='add'>+   png_debug1(2, "Allocating and reading pCAL chunk data (%u bytes)",</div><div class='add'>+       length + 1);</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='ctx'>    png_ptr-&gt;chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;chunkdata == NULL)</div><div class='del'>-     {</div><div class='del'>-       png_warning(png_ptr, "No memory for pCAL purpose");</div><div class='del'>-       return;</div><div class='del'>-     }</div><div class='add'>+   {</div><div class='add'>+      png_warning(png_ptr, "No memory for pCAL purpose");</div><div class='add'>+      return;</div><div class='add'>+   }</div><div class='add'>+</div><div class='ctx'>    slength = (png_size_t)length;</div><div class='ctx'>    png_crc_read(png_ptr, (png_bytep)png_ptr-&gt;chunkdata, slength);</div><div class='ctx'> </div><div class='hunk'>@@ -1662,7 +1874,8 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    endptr = png_ptr-&gt;chunkdata + slength;</div><div class='ctx'> </div><div class='ctx'>    /* We need to have at least 12 bytes after the purpose string</div><div class='del'>-      in order to get the parameter information. */</div><div class='add'>+    * in order to get the parameter information.</div><div class='add'>+    */</div><div class='ctx'>    if (endptr &lt;= buf + 12)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid pCAL data");</div><div class='hunk'>@@ -1680,7 +1893,8 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    png_debug(3, "Checking pCAL equation type and number of parameters");</div><div class='ctx'>    /* Check that we have the right number of parameters for known</div><div class='del'>-      equation types. */</div><div class='add'>+    * equation types.</div><div class='add'>+    */</div><div class='ctx'>    if ((type == PNG_EQUATION_LINEAR &amp;&amp; nparams != 2) ||</div><div class='ctx'>        (type == PNG_EQUATION_BASE_E &amp;&amp; nparams != 3) ||</div><div class='ctx'>        (type == PNG_EQUATION_ARBITRARY &amp;&amp; nparams != 3) ||</div><div class='hunk'>@@ -1691,6 +1905,7 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>       png_ptr-&gt;chunkdata = NULL;</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (type &gt;= PNG_EQUATION_LAST)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");</div><div class='hunk'>@@ -1700,15 +1915,17 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>       /* Empty loop to move past the units string. */ ;</div><div class='ctx'> </div><div class='ctx'>    png_debug(3, "Allocating pCAL parameters array");</div><div class='add'>+</div><div class='ctx'>    params = (png_charpp)png_malloc_warn(png_ptr,</div><div class='del'>-      (png_size_t)(nparams * png_sizeof(png_charp)));</div><div class='add'>+       (png_size_t)(nparams * png_sizeof(png_charp)));</div><div class='add'>+</div><div class='ctx'>    if (params == NULL)</div><div class='del'>-     {</div><div class='del'>-       png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='del'>-       png_ptr-&gt;chunkdata = NULL;</div><div class='del'>-       png_warning(png_ptr, "No memory for pCAL params");</div><div class='del'>-       return;</div><div class='del'>-     }</div><div class='add'>+   {</div><div class='add'>+      png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='add'>+      png_ptr-&gt;chunkdata = NULL;</div><div class='add'>+      png_warning(png_ptr, "No memory for pCAL params");</div><div class='add'>+      return;</div><div class='add'>+   }</div><div class='ctx'> </div><div class='ctx'>    /* Get pointers to the start of each parameter string. */</div><div class='ctx'>    for (i = 0; i &lt; (int)nparams; i++)</div><div class='hunk'>@@ -1716,6 +1933,7 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>       buf++; /* Skip the null string terminator from previous parameter. */</div><div class='ctx'> </div><div class='ctx'>       png_debug1(3, "Reading pCAL parameter %d", i);</div><div class='add'>+</div><div class='ctx'>       for (params[i] = buf; buf &lt;= endptr &amp;&amp; *buf != 0x00; buf++)</div><div class='ctx'>          /* Empty loop to move past each parameter string */ ;</div><div class='ctx'> </div><div class='hunk'>@@ -1744,27 +1962,21 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> {</div><div class='del'>-   png_charp ep;</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   double width, height;</div><div class='del'>-   png_charp vp;</div><div class='del'>-#else</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-   png_charp swidth, sheight;</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-   png_size_t slength;</div><div class='add'>+   png_size_t slength, i;</div><div class='add'>+   int state;</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_handle_sCAL");</div><div class='ctx'> </div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR))</div><div class='ctx'>       png_error(png_ptr, "Missing IHDR before sCAL");</div><div class='add'>+</div><div class='ctx'>    else if (png_ptr-&gt;mode &amp; PNG_HAVE_IDAT)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid sCAL after IDAT");</div><div class='ctx'>       png_crc_finish(png_ptr, length);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_sCAL))</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Duplicate sCAL chunk");</div><div class='hunk'>@@ -1772,16 +1984,21 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-   png_debug1(2, "Allocating and reading sCAL chunk data (%lu bytes)",</div><div class='add'>+   png_debug1(2, "Allocating and reading sCAL chunk data (%u bytes)",</div><div class='ctx'>       length + 1);</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;chunkdata == NULL)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Out of memory while processing sCAL chunk");</div><div class='add'>+      png_crc_finish(png_ptr, length);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    slength = (png_size_t)length;</div><div class='ctx'>    png_crc_read(png_ptr, (png_bytep)png_ptr-&gt;chunkdata, slength);</div><div class='add'>+   png_ptr-&gt;chunkdata[slength] = 0x00; /* Null terminate the last string */</div><div class='ctx'> </div><div class='ctx'>    if (png_crc_finish(png_ptr, 0))</div><div class='ctx'>    {</div><div class='hunk'>@@ -1790,95 +2007,44 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-   png_ptr-&gt;chunkdata[slength] = 0x00; /* Null terminate the last string */</div><div class='del'>-</div><div class='del'>-   ep = png_ptr-&gt;chunkdata + 1;        /* Skip unit byte */</div><div class='del'>-</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   width = png_strtod(png_ptr, ep, &amp;vp);</div><div class='del'>-   if (*vp)</div><div class='del'>-   {</div><div class='del'>-      png_warning(png_ptr, "malformed width string in sCAL chunk");</div><div class='del'>-      return;</div><div class='del'>-   }</div><div class='del'>-#else</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-   swidth = (png_charp)png_malloc_warn(png_ptr, png_strlen(ep) + 1);</div><div class='del'>-   if (swidth == NULL)</div><div class='del'>-   {</div><div class='del'>-      png_warning(png_ptr, "Out of memory while processing sCAL chunk width");</div><div class='del'>-      return;</div><div class='del'>-   }</div><div class='del'>-   png_memcpy(swidth, ep, png_strlen(ep));</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-   for (ep = png_ptr-&gt;chunkdata; *ep; ep++)</div><div class='del'>-      /* Empty loop */ ;</div><div class='del'>-   ep++;</div><div class='del'>-</div><div class='del'>-   if (png_ptr-&gt;chunkdata + slength &lt; ep)</div><div class='add'>+   /* Validate the unit. */</div><div class='add'>+   if (png_ptr-&gt;chunkdata[0] != 1 &amp;&amp; png_ptr-&gt;chunkdata[0] != 2)</div><div class='ctx'>    {</div><div class='del'>-      png_warning(png_ptr, "Truncated sCAL chunk");</div><div class='del'>-#if defined(PNG_FIXED_POINT_SUPPORTED) &amp;&amp; \</div><div class='del'>-    !defined(PNG_FLOATING_POINT_SUPPORTED)</div><div class='del'>-      png_free(png_ptr, swidth);</div><div class='del'>-#endif</div><div class='add'>+      png_warning(png_ptr, "Invalid sCAL ignored: invalid unit");</div><div class='ctx'>       png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='ctx'>       png_ptr-&gt;chunkdata = NULL;</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   height = png_strtod(png_ptr, ep, &amp;vp);</div><div class='del'>-   if (*vp)</div><div class='del'>-   {</div><div class='del'>-      png_warning(png_ptr, "malformed height string in sCAL chunk");</div><div class='del'>-      return;</div><div class='del'>-   }</div><div class='del'>-#else</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-   sheight = (png_charp)png_malloc_warn(png_ptr, png_strlen(ep) + 1);</div><div class='del'>-   if (sheight == NULL)</div><div class='del'>-   {</div><div class='del'>-      png_warning(png_ptr, "Out of memory while processing sCAL chunk height");</div><div class='del'>-      return;</div><div class='del'>-   }</div><div class='del'>-   png_memcpy(sheight, ep, png_strlen(ep));</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='add'>+   /* Validate the ASCII numbers, need two ASCII numbers separated by</div><div class='add'>+    * a '\0' and they need to fit exactly in the chunk data.</div><div class='add'>+    */</div><div class='add'>+   i = 0;</div><div class='add'>+   state = 0;</div><div class='ctx'> </div><div class='del'>-   if (png_ptr-&gt;chunkdata + slength &lt; ep</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-      || width &lt;= 0. || height &lt;= 0.</div><div class='del'>-#endif</div><div class='del'>-      )</div><div class='add'>+   if (png_ptr-&gt;chunkdata[1] == 45 /* negative width */ ||</div><div class='add'>+       !png_check_fp_number(png_ptr-&gt;chunkdata, slength, &amp;state, &amp;i) ||</div><div class='add'>+       i &gt;= slength || png_ptr-&gt;chunkdata[i++] != 0)</div><div class='add'>+      png_warning(png_ptr, "Invalid sCAL chunk ignored: bad width format");</div><div class='add'>+</div><div class='add'>+   else</div><div class='ctx'>    {</div><div class='del'>-      png_warning(png_ptr, "Invalid sCAL data");</div><div class='del'>-      png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='del'>-      png_ptr-&gt;chunkdata = NULL;</div><div class='del'>-#if defined(PNG_FIXED_POINT_SUPPORTED) &amp;&amp; !defined(PNG_FLOATING_POINT_SUPPORTED)</div><div class='del'>-      png_free(png_ptr, swidth);</div><div class='del'>-      png_free(png_ptr, sheight);</div><div class='del'>-#endif</div><div class='del'>-      return;</div><div class='del'>-   }</div><div class='add'>+      png_size_t heighti = i;</div><div class='ctx'> </div><div class='add'>+      if (png_ptr-&gt;chunkdata[i] == 45 /* negative height */ ||</div><div class='add'>+          !png_check_fp_number(png_ptr-&gt;chunkdata, slength, &amp;state, &amp;i) ||</div><div class='add'>+          i != slength)</div><div class='add'>+         png_warning(png_ptr, "Invalid sCAL chunk ignored: bad height format");</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   png_set_sCAL(png_ptr, info_ptr, png_ptr-&gt;chunkdata[0], width, height);</div><div class='del'>-#else</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-   png_set_sCAL_s(png_ptr, info_ptr, png_ptr-&gt;chunkdata[0], swidth, sheight);</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='add'>+      else</div><div class='add'>+         /* This is the (only) success case. */</div><div class='add'>+         png_set_sCAL_s(png_ptr, info_ptr, png_ptr-&gt;chunkdata[0],</div><div class='add'>+            png_ptr-&gt;chunkdata+1, png_ptr-&gt;chunkdata+heighti);</div><div class='add'>+   }</div><div class='ctx'> </div><div class='add'>+   /* Clean up - just free the temporarily allocated buffer. */</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='ctx'>    png_ptr-&gt;chunkdata = NULL;</div><div class='del'>-#if defined(PNG_FIXED_POINT_SUPPORTED) &amp;&amp; !defined(PNG_FLOATING_POINT_SUPPORTED)</div><div class='del'>-   png_free(png_ptr, swidth);</div><div class='del'>-   png_free(png_ptr, sheight);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1893,6 +2059,7 @@ png_handle_tIME(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IHDR))</div><div class='ctx'>       png_error(png_ptr, "Out of place tIME chunk");</div><div class='add'>+</div><div class='ctx'>    else if (info_ptr != NULL &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_tIME))</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Duplicate tIME chunk");</div><div class='hunk'>@@ -1911,6 +2078,7 @@ png_handle_tIME(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_crc_read(png_ptr, buf, 7);</div><div class='add'>+</div><div class='ctx'>    if (png_crc_finish(png_ptr, 0))</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='hunk'>@@ -1939,7 +2107,7 @@ png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_handle_tEXt");</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_SET_USER_LIMITS_SUPPORTED</div><div class='add'>+#ifdef PNG_USER_LIMITS_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;user_chunk_cache_max != 0)</div><div class='ctx'>    {</div><div class='ctx'>       if (png_ptr-&gt;user_chunk_cache_max == 1)</div><div class='hunk'>@@ -1947,6 +2115,7 @@ png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>          png_crc_finish(png_ptr, length);</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       if (--png_ptr-&gt;user_chunk_cache_max == 1)</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr, "No space in chunk cache for tEXt");</div><div class='hunk'>@@ -1974,11 +2143,13 @@ png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='ctx'> </div><div class='ctx'>    png_ptr-&gt;chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;chunkdata == NULL)</div><div class='ctx'>    {</div><div class='ctx'>      png_warning(png_ptr, "No memory to process text chunk");</div><div class='ctx'>      return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    slength = (png_size_t)length;</div><div class='ctx'>    png_crc_read(png_ptr, (png_bytep)png_ptr-&gt;chunkdata, slength);</div><div class='ctx'> </div><div class='hunk'>@@ -2000,21 +2171,21 @@ png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>       text++;</div><div class='ctx'> </div><div class='ctx'>    text_ptr = (png_textp)png_malloc_warn(png_ptr,</div><div class='del'>-      png_sizeof(png_text));</div><div class='add'>+       png_sizeof(png_text));</div><div class='add'>+</div><div class='ctx'>    if (text_ptr == NULL)</div><div class='ctx'>    {</div><div class='del'>-     png_warning(png_ptr, "Not enough memory to process text chunk");</div><div class='del'>-     png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='del'>-     png_ptr-&gt;chunkdata = NULL;</div><div class='del'>-     return;</div><div class='add'>+      png_warning(png_ptr, "Not enough memory to process text chunk");</div><div class='add'>+      png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='add'>+      png_ptr-&gt;chunkdata = NULL;</div><div class='add'>+      return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    text_ptr-&gt;compression = PNG_TEXT_COMPRESSION_NONE;</div><div class='ctx'>    text_ptr-&gt;key = key;</div><div class='del'>-#ifdef PNG_iTXt_SUPPORTED</div><div class='ctx'>    text_ptr-&gt;lang = NULL;</div><div class='ctx'>    text_ptr-&gt;lang_key = NULL;</div><div class='ctx'>    text_ptr-&gt;itxt_length = 0;</div><div class='del'>-#endif</div><div class='ctx'>    text_ptr-&gt;text = text;</div><div class='ctx'>    text_ptr-&gt;text_length = png_strlen(text);</div><div class='ctx'> </div><div class='hunk'>@@ -2023,8 +2194,9 @@ png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='ctx'>    png_ptr-&gt;chunkdata = NULL;</div><div class='ctx'>    png_free(png_ptr, text_ptr);</div><div class='add'>+</div><div class='ctx'>    if (ret)</div><div class='del'>-     png_warning(png_ptr, "Insufficient memory to process text chunk");</div><div class='add'>+      png_warning(png_ptr, "Insufficient memory to process text chunk");</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -2041,7 +2213,7 @@ png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_handle_zTXt");</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_SET_USER_LIMITS_SUPPORTED</div><div class='add'>+#ifdef PNG_USER_LIMITS_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;user_chunk_cache_max != 0)</div><div class='ctx'>    {</div><div class='ctx'>       if (png_ptr-&gt;user_chunk_cache_max == 1)</div><div class='hunk'>@@ -2049,6 +2221,7 @@ png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>          png_crc_finish(png_ptr, length);</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       if (--png_ptr-&gt;user_chunk_cache_max == 1)</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr, "No space in chunk cache for zTXt");</div><div class='hunk'>@@ -2066,24 +2239,28 @@ png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_MAX_MALLOC_64K</div><div class='ctx'>    /* We will no doubt have problems with chunks even half this size, but</div><div class='del'>-      there is no hard and fast rule to tell us where to stop. */</div><div class='add'>+    * there is no hard and fast rule to tell us where to stop.</div><div class='add'>+    */</div><div class='ctx'>    if (length &gt; (png_uint_32)65535L)</div><div class='ctx'>    {</div><div class='del'>-     png_warning(png_ptr, "zTXt chunk too large to fit in memory");</div><div class='del'>-     png_crc_finish(png_ptr, length);</div><div class='del'>-     return;</div><div class='add'>+      png_warning(png_ptr, "zTXt chunk too large to fit in memory");</div><div class='add'>+      png_crc_finish(png_ptr, length);</div><div class='add'>+      return;</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='ctx'>    png_ptr-&gt;chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;chunkdata == NULL)</div><div class='ctx'>    {</div><div class='del'>-     png_warning(png_ptr, "Out of memory processing zTXt chunk");</div><div class='del'>-     return;</div><div class='add'>+      png_warning(png_ptr, "Out of memory processing zTXt chunk");</div><div class='add'>+      return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    slength = (png_size_t)length;</div><div class='ctx'>    png_crc_read(png_ptr, (png_bytep)png_ptr-&gt;chunkdata, slength);</div><div class='add'>+</div><div class='ctx'>    if (png_crc_finish(png_ptr, 0))</div><div class='ctx'>    {</div><div class='ctx'>       png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='hunk'>@@ -2104,37 +2281,41 @@ png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>       png_ptr-&gt;chunkdata = NULL;</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='ctx'>        comp_type = *(++text);</div><div class='add'>+</div><div class='ctx'>        if (comp_type != PNG_TEXT_COMPRESSION_zTXt)</div><div class='ctx'>        {</div><div class='ctx'>           png_warning(png_ptr, "Unknown compression type in zTXt chunk");</div><div class='ctx'>           comp_type = PNG_TEXT_COMPRESSION_zTXt;</div><div class='ctx'>        }</div><div class='add'>+</div><div class='ctx'>        text++;        /* Skip the compression_method byte */</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    prefix_len = text - png_ptr-&gt;chunkdata;</div><div class='ctx'> </div><div class='ctx'>    png_decompress_chunk(png_ptr, comp_type,</div><div class='del'>-     (png_size_t)length, prefix_len, &amp;data_len);</div><div class='add'>+       (png_size_t)length, prefix_len, &amp;data_len);</div><div class='ctx'> </div><div class='ctx'>    text_ptr = (png_textp)png_malloc_warn(png_ptr,</div><div class='del'>-      png_sizeof(png_text));</div><div class='add'>+       png_sizeof(png_text));</div><div class='add'>+</div><div class='ctx'>    if (text_ptr == NULL)</div><div class='ctx'>    {</div><div class='del'>-     png_warning(png_ptr, "Not enough memory to process zTXt chunk");</div><div class='del'>-     png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='del'>-     png_ptr-&gt;chunkdata = NULL;</div><div class='del'>-     return;</div><div class='add'>+      png_warning(png_ptr, "Not enough memory to process zTXt chunk");</div><div class='add'>+      png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='add'>+      png_ptr-&gt;chunkdata = NULL;</div><div class='add'>+      return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    text_ptr-&gt;compression = comp_type;</div><div class='ctx'>    text_ptr-&gt;key = png_ptr-&gt;chunkdata;</div><div class='del'>-#ifdef PNG_iTXt_SUPPORTED</div><div class='ctx'>    text_ptr-&gt;lang = NULL;</div><div class='ctx'>    text_ptr-&gt;lang_key = NULL;</div><div class='ctx'>    text_ptr-&gt;itxt_length = 0;</div><div class='del'>-#endif</div><div class='ctx'>    text_ptr-&gt;text = png_ptr-&gt;chunkdata + prefix_len;</div><div class='ctx'>    text_ptr-&gt;text_length = data_len;</div><div class='ctx'> </div><div class='hunk'>@@ -2143,8 +2324,9 @@ png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    png_free(png_ptr, text_ptr);</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='ctx'>    png_ptr-&gt;chunkdata = NULL;</div><div class='add'>+</div><div class='ctx'>    if (ret)</div><div class='del'>-     png_error(png_ptr, "Insufficient memory to store zTXt chunk");</div><div class='add'>+      png_error(png_ptr, "Insufficient memory to store zTXt chunk");</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -2162,7 +2344,7 @@ png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_handle_iTXt");</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_SET_USER_LIMITS_SUPPORTED</div><div class='add'>+#ifdef PNG_USER_LIMITS_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;user_chunk_cache_max != 0)</div><div class='ctx'>    {</div><div class='ctx'>       if (png_ptr-&gt;user_chunk_cache_max == 1)</div><div class='hunk'>@@ -2170,6 +2352,7 @@ png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>          png_crc_finish(png_ptr, length);</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       if (--png_ptr-&gt;user_chunk_cache_max == 1)</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr, "No space in chunk cache for iTXt");</div><div class='hunk'>@@ -2187,24 +2370,28 @@ png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_MAX_MALLOC_64K</div><div class='ctx'>    /* We will no doubt have problems with chunks even half this size, but</div><div class='del'>-      there is no hard and fast rule to tell us where to stop. */</div><div class='add'>+    * there is no hard and fast rule to tell us where to stop.</div><div class='add'>+    */</div><div class='ctx'>    if (length &gt; (png_uint_32)65535L)</div><div class='ctx'>    {</div><div class='del'>-     png_warning(png_ptr, "iTXt chunk too large to fit in memory");</div><div class='del'>-     png_crc_finish(png_ptr, length);</div><div class='del'>-     return;</div><div class='add'>+      png_warning(png_ptr, "iTXt chunk too large to fit in memory");</div><div class='add'>+      png_crc_finish(png_ptr, length);</div><div class='add'>+      return;</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='ctx'>    png_ptr-&gt;chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;chunkdata == NULL)</div><div class='ctx'>    {</div><div class='del'>-     png_warning(png_ptr, "No memory to process iTXt chunk");</div><div class='del'>-     return;</div><div class='add'>+      png_warning(png_ptr, "No memory to process iTXt chunk");</div><div class='add'>+      return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    slength = (png_size_t)length;</div><div class='ctx'>    png_crc_read(png_ptr, (png_bytep)png_ptr-&gt;chunkdata, slength);</div><div class='add'>+</div><div class='ctx'>    if (png_crc_finish(png_ptr, 0))</div><div class='ctx'>    {</div><div class='ctx'>       png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='hunk'>@@ -2216,6 +2403,7 @@ png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    for (lang = png_ptr-&gt;chunkdata; *lang; lang++)</div><div class='ctx'>       /* Empty loop */ ;</div><div class='add'>+</div><div class='ctx'>    lang++;        /* Skip NUL separator */</div><div class='ctx'> </div><div class='ctx'>    /* iTXt must have a language tag (possibly empty), two compression bytes,</div><div class='hunk'>@@ -2230,14 +2418,16 @@ png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>       png_ptr-&gt;chunkdata = NULL;</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='del'>-       comp_flag = *lang++;</div><div class='del'>-       comp_type = *lang++;</div><div class='add'>+      comp_flag = *lang++;</div><div class='add'>+      comp_type = *lang++;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    for (lang_key = lang; *lang_key; lang_key++)</div><div class='ctx'>       /* Empty loop */ ;</div><div class='add'>+</div><div class='ctx'>    lang_key++;        /* Skip NUL separator */</div><div class='ctx'> </div><div class='ctx'>    if (lang_key &gt;= png_ptr-&gt;chunkdata + slength)</div><div class='hunk'>@@ -2250,7 +2440,9 @@ png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    for (text = lang_key; *text; text++)</div><div class='ctx'>       /* Empty loop */ ;</div><div class='add'>+</div><div class='ctx'>    text++;        /* Skip NUL separator */</div><div class='add'>+</div><div class='ctx'>    if (text &gt;= png_ptr-&gt;chunkdata + slength)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Malformed iTXt chunk");</div><div class='hunk'>@@ -2262,20 +2454,25 @@ png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    prefix_len = text - png_ptr-&gt;chunkdata;</div><div class='ctx'> </div><div class='ctx'>    key=png_ptr-&gt;chunkdata;</div><div class='add'>+</div><div class='ctx'>    if (comp_flag)</div><div class='del'>-       png_decompress_chunk(png_ptr, comp_type,</div><div class='del'>-         (size_t)length, prefix_len, &amp;data_len);</div><div class='add'>+      png_decompress_chunk(png_ptr, comp_type,</div><div class='add'>+          (size_t)length, prefix_len, &amp;data_len);</div><div class='add'>+</div><div class='ctx'>    else</div><div class='del'>-       data_len = png_strlen(png_ptr-&gt;chunkdata + prefix_len);</div><div class='add'>+      data_len = png_strlen(png_ptr-&gt;chunkdata + prefix_len);</div><div class='add'>+</div><div class='ctx'>    text_ptr = (png_textp)png_malloc_warn(png_ptr,</div><div class='del'>-      png_sizeof(png_text));</div><div class='add'>+       png_sizeof(png_text));</div><div class='add'>+</div><div class='ctx'>    if (text_ptr == NULL)</div><div class='ctx'>    {</div><div class='del'>-     png_warning(png_ptr, "Not enough memory to process iTXt chunk");</div><div class='del'>-     png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='del'>-     png_ptr-&gt;chunkdata = NULL;</div><div class='del'>-     return;</div><div class='add'>+      png_warning(png_ptr, "Not enough memory to process iTXt chunk");</div><div class='add'>+      png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='add'>+      png_ptr-&gt;chunkdata = NULL;</div><div class='add'>+      return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    text_ptr-&gt;compression = (int)comp_flag + 1;</div><div class='ctx'>    text_ptr-&gt;lang_key = png_ptr-&gt;chunkdata + (lang_key - key);</div><div class='ctx'>    text_ptr-&gt;lang = png_ptr-&gt;chunkdata + (lang - key);</div><div class='hunk'>@@ -2289,16 +2486,18 @@ png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    png_free(png_ptr, text_ptr);</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;chunkdata);</div><div class='ctx'>    png_ptr-&gt;chunkdata = NULL;</div><div class='add'>+</div><div class='ctx'>    if (ret)</div><div class='del'>-     png_error(png_ptr, "Insufficient memory to store iTXt chunk");</div><div class='add'>+      png_error(png_ptr, "Insufficient memory to store iTXt chunk");</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* This function is called when we haven't found a handler for a</div><div class='del'>-   chunk.  If there isn't a problem with the chunk itself (ie bad</div><div class='del'>-   chunk name, CRC, or a critical chunk), the chunk is silently ignored</div><div class='del'>-   -- unless the PNG_FLAG_UNKNOWN_CHUNKS_SUPPORTED flag is on in which</div><div class='del'>-   case it will be saved away to be written out later. */</div><div class='add'>+ * chunk.  If there isn't a problem with the chunk itself (ie bad</div><div class='add'>+ * chunk name, CRC, or a critical chunk), the chunk is silently ignored</div><div class='add'>+ * -- unless the PNG_FLAG_UNKNOWN_CHUNKS_SUPPORTED flag is on in which</div><div class='add'>+ * case it will be saved away to be written out later.</div><div class='add'>+ */</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> {</div><div class='hunk'>@@ -2306,7 +2505,7 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_handle_unknown");</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_SET_USER_LIMITS_SUPPORTED</div><div class='add'>+#ifdef PNG_USER_LIMITS_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;user_chunk_cache_max != 0)</div><div class='ctx'>    {</div><div class='ctx'>       if (png_ptr-&gt;user_chunk_cache_max == 1)</div><div class='hunk'>@@ -2314,6 +2513,7 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>          png_crc_finish(png_ptr, length);</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       if (--png_ptr-&gt;user_chunk_cache_max == 1)</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr, "No space in chunk cache for unknown chunk");</div><div class='hunk'>@@ -2326,6 +2526,7 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    if (png_ptr-&gt;mode &amp; PNG_HAVE_IDAT)</div><div class='ctx'>    {</div><div class='ctx'>       PNG_IDAT;</div><div class='add'>+</div><div class='ctx'>       if (png_memcmp(png_ptr-&gt;chunk_name, png_IDAT, 4))  /* Not an IDAT */</div><div class='ctx'>          png_ptr-&gt;mode |= PNG_AFTER_IDAT;</div><div class='ctx'>    }</div><div class='hunk'>@@ -2334,13 +2535,13 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    {</div><div class='ctx'> #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='ctx'>       if (png_handle_as_unknown(png_ptr, png_ptr-&gt;chunk_name) !=</div><div class='del'>-           PNG_HANDLE_CHUNK_ALWAYS</div><div class='add'>+          PNG_HANDLE_CHUNK_ALWAYS</div><div class='ctx'> #ifdef PNG_READ_USER_CHUNKS_SUPPORTED</div><div class='del'>-           &amp;&amp; png_ptr-&gt;read_user_chunk_fn == NULL</div><div class='add'>+          &amp;&amp; png_ptr-&gt;read_user_chunk_fn == NULL</div><div class='ctx'> #endif</div><div class='del'>-        )</div><div class='add'>+          )</div><div class='ctx'> #endif</div><div class='del'>-          png_chunk_error(png_ptr, "unknown critical chunk");</div><div class='add'>+         png_chunk_error(png_ptr, "unknown critical chunk");</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED</div><div class='hunk'>@@ -2348,55 +2549,71 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'> #ifdef PNG_READ_USER_CHUNKS_SUPPORTED</div><div class='ctx'>        || (png_ptr-&gt;read_user_chunk_fn != NULL)</div><div class='ctx'> #endif</div><div class='del'>-        )</div><div class='add'>+       )</div><div class='ctx'>    {</div><div class='ctx'> #ifdef PNG_MAX_MALLOC_64K</div><div class='del'>-       if (length &gt; (png_uint_32)65535L)</div><div class='del'>-       {</div><div class='del'>-           png_warning(png_ptr, "unknown chunk too large to fit in memory");</div><div class='del'>-           skip = length - (png_uint_32)65535L;</div><div class='del'>-           length = (png_uint_32)65535L;</div><div class='del'>-       }</div><div class='add'>+      if (length &gt; (png_uint_32)65535L)</div><div class='add'>+      {</div><div class='add'>+         png_warning(png_ptr, "unknown chunk too large to fit in memory");</div><div class='add'>+         skip = length - (png_uint_32)65535L;</div><div class='add'>+         length = (png_uint_32)65535L;</div><div class='add'>+      }</div><div class='ctx'> #endif</div><div class='del'>-       png_memcpy((png_charp)png_ptr-&gt;unknown_chunk.name,</div><div class='del'>-                  (png_charp)png_ptr-&gt;chunk_name,</div><div class='del'>-                  png_sizeof(png_ptr-&gt;unknown_chunk.name));</div><div class='del'>-       png_ptr-&gt;unknown_chunk.name[png_sizeof(png_ptr-&gt;unknown_chunk.name)-1] = '\0';</div><div class='del'>-       png_ptr-&gt;unknown_chunk.size = (png_size_t)length;</div><div class='del'>-       if (length == 0)</div><div class='add'>+</div><div class='add'>+      png_memcpy((png_charp)png_ptr-&gt;unknown_chunk.name,</div><div class='add'>+          (png_charp)png_ptr-&gt;chunk_name,</div><div class='add'>+          png_sizeof(png_ptr-&gt;unknown_chunk.name));</div><div class='add'>+</div><div class='add'>+      png_ptr-&gt;unknown_chunk.name[png_sizeof(png_ptr-&gt;unknown_chunk.name)-1]</div><div class='add'>+          = '\0';</div><div class='add'>+</div><div class='add'>+      png_ptr-&gt;unknown_chunk.size = (png_size_t)length;</div><div class='add'>+</div><div class='add'>+      if (length == 0)</div><div class='ctx'>          png_ptr-&gt;unknown_chunk.data = NULL;</div><div class='del'>-       else</div><div class='del'>-       {</div><div class='add'>+</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='ctx'>          png_ptr-&gt;unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);</div><div class='ctx'>          png_crc_read(png_ptr, (png_bytep)png_ptr-&gt;unknown_chunk.data, length);</div><div class='del'>-       }</div><div class='add'>+      }</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_READ_USER_CHUNKS_SUPPORTED</div><div class='del'>-       if (png_ptr-&gt;read_user_chunk_fn != NULL)</div><div class='del'>-       {</div><div class='del'>-          /* Callback to user unknown chunk handler */</div><div class='del'>-          int ret;</div><div class='del'>-          ret = (*(png_ptr-&gt;read_user_chunk_fn))</div><div class='del'>-            (png_ptr, &amp;png_ptr-&gt;unknown_chunk);</div><div class='del'>-          if (ret &lt; 0)</div><div class='del'>-             png_chunk_error(png_ptr, "error in user chunk");</div><div class='del'>-          if (ret == 0)</div><div class='del'>-          {</div><div class='del'>-             if (!(png_ptr-&gt;chunk_name[0] &amp; 0x20))</div><div class='add'>+      if (png_ptr-&gt;read_user_chunk_fn != NULL)</div><div class='add'>+      {</div><div class='add'>+         /* Callback to user unknown chunk handler */</div><div class='add'>+         int ret;</div><div class='add'>+</div><div class='add'>+         ret = (*(png_ptr-&gt;read_user_chunk_fn))</div><div class='add'>+             (png_ptr, &amp;png_ptr-&gt;unknown_chunk);</div><div class='add'>+</div><div class='add'>+         if (ret &lt; 0)</div><div class='add'>+            png_chunk_error(png_ptr, "error in user chunk");</div><div class='add'>+</div><div class='add'>+         if (ret == 0)</div><div class='add'>+         {</div><div class='add'>+            if (!(png_ptr-&gt;chunk_name[0] &amp; 0x20))</div><div class='add'>+            {</div><div class='ctx'> #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='del'>-                if (png_handle_as_unknown(png_ptr, png_ptr-&gt;chunk_name) !=</div><div class='del'>-                     PNG_HANDLE_CHUNK_ALWAYS)</div><div class='add'>+               if (png_handle_as_unknown(png_ptr, png_ptr-&gt;chunk_name) !=</div><div class='add'>+                   PNG_HANDLE_CHUNK_ALWAYS)</div><div class='ctx'> #endif</div><div class='del'>-                   png_chunk_error(png_ptr, "unknown critical chunk");</div><div class='del'>-             png_set_unknown_chunks(png_ptr, info_ptr,</div><div class='del'>-               &amp;png_ptr-&gt;unknown_chunk, 1);</div><div class='del'>-          }</div><div class='del'>-       }</div><div class='del'>-       else</div><div class='add'>+                  png_chunk_error(png_ptr, "unknown critical chunk");</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            png_set_unknown_chunks(png_ptr, info_ptr,</div><div class='add'>+                &amp;png_ptr-&gt;unknown_chunk, 1);</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      else</div><div class='ctx'> #endif</div><div class='del'>-       png_set_unknown_chunks(png_ptr, info_ptr, &amp;png_ptr-&gt;unknown_chunk, 1);</div><div class='del'>-       png_free(png_ptr, png_ptr-&gt;unknown_chunk.data);</div><div class='del'>-       png_ptr-&gt;unknown_chunk.data = NULL;</div><div class='add'>+         png_set_unknown_chunks(png_ptr, info_ptr, &amp;png_ptr-&gt;unknown_chunk, 1);</div><div class='add'>+</div><div class='add'>+      png_free(png_ptr, png_ptr-&gt;unknown_chunk.data);</div><div class='add'>+      png_ptr-&gt;unknown_chunk.data = NULL;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'> #endif</div><div class='ctx'>       skip = length;</div><div class='hunk'>@@ -2404,20 +2621,21 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)</div><div class='ctx'>    png_crc_finish(png_ptr, skip);</div><div class='ctx'> </div><div class='ctx'> #ifndef PNG_READ_USER_CHUNKS_SUPPORTED</div><div class='del'>-   info_ptr = info_ptr; /* Quiet compiler warnings about unused info_ptr */</div><div class='add'>+   PNG_UNUSED(info_ptr) /* Quiet compiler warnings about unused info_ptr */</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* This function is called to verify that a chunk name is valid.</div><div class='del'>-   This function can't have the "critical chunk check" incorporated</div><div class='del'>-   into it, since in the future we will need to be able to call user</div><div class='del'>-   functions to handle unknown critical chunks after we check that</div><div class='del'>-   the chunk name itself is valid. */</div><div class='add'>+ * This function can't have the "critical chunk check" incorporated</div><div class='add'>+ * into it, since in the future we will need to be able to call user</div><div class='add'>+ * functions to handle unknown critical chunks after we check that</div><div class='add'>+ * the chunk name itself is valid.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> #define isnonalpha(c) ((c) &lt; 65 || (c) &gt; 122 || ((c) &gt; 90 &amp;&amp; (c) &lt; 97))</div><div class='ctx'> </div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_check_chunk_name(png_structp png_ptr, png_bytep chunk_name)</div><div class='add'>+png_check_chunk_name(png_structp png_ptr, png_const_bytep chunk_name)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_check_chunk_name");</div><div class='ctx'>    if (isnonalpha(chunk_name[0]) || isnonalpha(chunk_name[1]) ||</div><div class='hunk'>@@ -2428,25 +2646,28 @@ png_check_chunk_name(png_structp png_ptr, png_bytep chunk_name)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Combines the row recently read in with the existing pixels in the</div><div class='del'>-   row.  This routine takes care of alpha and transparency if requested.</div><div class='del'>-   This routine also handles the two methods of progressive display</div><div class='del'>-   of interlaced images, depending on the mask value.</div><div class='del'>-   The mask value describes which pixels are to be combined with</div><div class='del'>-   the row.  The pattern always repeats every 8 pixels, so just 8</div><div class='del'>-   bits are needed.  A one indicates the pixel is to be combined,</div><div class='del'>-   a zero indicates the pixel is to be skipped.  This is in addition</div><div class='del'>-   to any alpha or transparency value associated with the pixel.  If</div><div class='del'>-   you want all pixels to be combined, pass 0xff (255) in mask.  */</div><div class='add'>+ * row.  This routine takes care of alpha and transparency if requested.</div><div class='add'>+ * This routine also handles the two methods of progressive display</div><div class='add'>+ * of interlaced images, depending on the mask value.</div><div class='add'>+ * The mask value describes which pixels are to be combined with</div><div class='add'>+ * the row.  The pattern always repeats every 8 pixels, so just 8</div><div class='add'>+ * bits are needed.  A one indicates the pixel is to be combined,</div><div class='add'>+ * a zero indicates the pixel is to be skipped.  This is in addition</div><div class='add'>+ * to any alpha or transparency value associated with the pixel.  If</div><div class='add'>+ * you want all pixels to be combined, pass 0xff (255) in mask.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_combine_row(png_structp png_ptr, png_bytep row, int mask)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_combine_row");</div><div class='add'>+</div><div class='ctx'>    if (mask == 0xff)</div><div class='ctx'>    {</div><div class='ctx'>       png_memcpy(row, png_ptr-&gt;row_buf + 1,</div><div class='del'>-         PNG_ROWBYTES(png_ptr-&gt;row_info.pixel_depth, png_ptr-&gt;width));</div><div class='add'>+          PNG_ROWBYTES(png_ptr-&gt;row_info.pixel_depth, png_ptr-&gt;width));</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='ctx'>       switch (png_ptr-&gt;row_info.pixel_depth)</div><div class='hunk'>@@ -2468,6 +2689,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)</div><div class='ctx'>                 s_end = 7;</div><div class='ctx'>                 s_inc = 1;</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'> #endif</div><div class='ctx'>             {</div><div class='hunk'>@@ -2495,16 +2717,19 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)</div><div class='ctx'>                   sp++;</div><div class='ctx'>                   dp++;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   shift += s_inc;</div><div class='ctx'> </div><div class='ctx'>                if (m == 1)</div><div class='ctx'>                   m = 0x80;</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   m &gt;&gt;= 1;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          case 2:</div><div class='ctx'>          {</div><div class='ctx'>             png_bytep sp = png_ptr-&gt;row_buf + 1;</div><div class='hunk'>@@ -2523,6 +2748,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)</div><div class='ctx'>                s_end = 6;</div><div class='ctx'>                s_inc = 2;</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'> #endif</div><div class='ctx'>             {</div><div class='hunk'>@@ -2548,15 +2774,19 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)</div><div class='ctx'>                   sp++;</div><div class='ctx'>                   dp++;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   shift += s_inc;</div><div class='add'>+</div><div class='ctx'>                if (m == 1)</div><div class='ctx'>                   m = 0x80;</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   m &gt;&gt;= 1;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          case 4:</div><div class='ctx'>          {</div><div class='ctx'>             png_bytep sp = png_ptr-&gt;row_buf + 1;</div><div class='hunk'>@@ -2575,6 +2805,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)</div><div class='ctx'>                s_end = 4;</div><div class='ctx'>                s_inc = 4;</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'> #endif</div><div class='ctx'>             {</div><div class='hunk'>@@ -2599,15 +2830,19 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)</div><div class='ctx'>                   sp++;</div><div class='ctx'>                   dp++;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   shift += s_inc;</div><div class='add'>+</div><div class='ctx'>                if (m == 1)</div><div class='ctx'>                   m = 0x80;</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   m &gt;&gt;= 1;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          default:</div><div class='ctx'>          {</div><div class='ctx'>             png_bytep sp = png_ptr-&gt;row_buf + 1;</div><div class='hunk'>@@ -2617,7 +2852,6 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)</div><div class='ctx'>             png_uint_32 row_width = png_ptr-&gt;width;</div><div class='ctx'>             png_byte m = 0x80;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'>             for (i = 0; i &lt; row_width; i++)</div><div class='ctx'>             {</div><div class='ctx'>                if (m &amp; mask)</div><div class='hunk'>@@ -2630,6 +2864,7 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)</div><div class='ctx'> </div><div class='ctx'>                if (m == 1)</div><div class='ctx'>                   m = 0x80;</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   m &gt;&gt;= 1;</div><div class='ctx'>             }</div><div class='hunk'>@@ -2640,10 +2875,6 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_INTERLACING_SUPPORTED</div><div class='del'>-/* OLD pre-1.0.9 interface:</div><div class='del'>-void png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,</div><div class='del'>-   png_uint_32 transformations)</div><div class='del'>- */</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_do_read_interlace(png_structp png_ptr)</div><div class='ctx'> {</div><div class='hunk'>@@ -2684,6 +2915,7 @@ png_do_read_interlace(png_structp png_ptr)</div><div class='ctx'>                 s_end = 0;</div><div class='ctx'>                 s_inc = -1;</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'> #endif</div><div class='ctx'>             {</div><div class='hunk'>@@ -2701,24 +2933,29 @@ png_do_read_interlace(png_structp png_ptr)</div><div class='ctx'>                {</div><div class='ctx'>                   *dp &amp;= (png_byte)((0x7f7f &gt;&gt; (7 - dshift)) &amp; 0xff);</div><div class='ctx'>                   *dp |= (png_byte)(v &lt;&lt; dshift);</div><div class='add'>+</div><div class='ctx'>                   if (dshift == s_end)</div><div class='ctx'>                   {</div><div class='ctx'>                      dshift = s_start;</div><div class='ctx'>                      dp--;</div><div class='ctx'>                   }</div><div class='add'>+</div><div class='ctx'>                   else</div><div class='ctx'>                      dshift += s_inc;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                if (sshift == s_end)</div><div class='ctx'>                {</div><div class='ctx'>                   sshift = s_start;</div><div class='ctx'>                   sp--;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   sshift += s_inc;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          case 2:</div><div class='ctx'>          {</div><div class='ctx'>             png_bytep sp = row + (png_uint_32)((row_info-&gt;width - 1) &gt;&gt; 2);</div><div class='hunk'>@@ -2737,6 +2974,7 @@ png_do_read_interlace(png_structp png_ptr)</div><div class='ctx'>                s_end = 0;</div><div class='ctx'>                s_inc = -2;</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'> #endif</div><div class='ctx'>             {</div><div class='hunk'>@@ -2757,24 +2995,29 @@ png_do_read_interlace(png_structp png_ptr)</div><div class='ctx'>                {</div><div class='ctx'>                   *dp &amp;= (png_byte)((0x3f3f &gt;&gt; (6 - dshift)) &amp; 0xff);</div><div class='ctx'>                   *dp |= (png_byte)(v &lt;&lt; dshift);</div><div class='add'>+</div><div class='ctx'>                   if (dshift == s_end)</div><div class='ctx'>                   {</div><div class='ctx'>                      dshift = s_start;</div><div class='ctx'>                      dp--;</div><div class='ctx'>                   }</div><div class='add'>+</div><div class='ctx'>                   else</div><div class='ctx'>                      dshift += s_inc;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                if (sshift == s_end)</div><div class='ctx'>                {</div><div class='ctx'>                   sshift = s_start;</div><div class='ctx'>                   sp--;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   sshift += s_inc;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          case 4:</div><div class='ctx'>          {</div><div class='ctx'>             png_bytep sp = row + (png_size_t)((row_info-&gt;width - 1) &gt;&gt; 1);</div><div class='hunk'>@@ -2793,6 +3036,7 @@ png_do_read_interlace(png_structp png_ptr)</div><div class='ctx'>                s_end = 0;</div><div class='ctx'>                s_inc = -4;</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'> #endif</div><div class='ctx'>             {</div><div class='hunk'>@@ -2812,19 +3056,23 @@ png_do_read_interlace(png_structp png_ptr)</div><div class='ctx'>                {</div><div class='ctx'>                   *dp &amp;= (png_byte)((0xf0f &gt;&gt; (4 - dshift)) &amp; 0xff);</div><div class='ctx'>                   *dp |= (png_byte)(v &lt;&lt; dshift);</div><div class='add'>+</div><div class='ctx'>                   if (dshift == s_end)</div><div class='ctx'>                   {</div><div class='ctx'>                      dshift = s_start;</div><div class='ctx'>                      dp--;</div><div class='ctx'>                   }</div><div class='add'>+</div><div class='ctx'>                   else</div><div class='ctx'>                      dshift += s_inc;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                if (sshift == s_end)</div><div class='ctx'>                {</div><div class='ctx'>                   sshift = s_start;</div><div class='ctx'>                   sp--;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   sshift += s_inc;</div><div class='ctx'>             }</div><div class='hunk'>@@ -2833,7 +3081,10 @@ png_do_read_interlace(png_structp png_ptr)</div><div class='ctx'>          default:</div><div class='ctx'>          {</div><div class='ctx'>             png_size_t pixel_bytes = (row_info-&gt;pixel_depth &gt;&gt; 3);</div><div class='del'>-            png_bytep sp = row + (png_size_t)(row_info-&gt;width - 1) * pixel_bytes;</div><div class='add'>+</div><div class='add'>+            png_bytep sp = row + (png_size_t)(row_info-&gt;width - 1)</div><div class='add'>+                * pixel_bytes;</div><div class='add'>+</div><div class='ctx'>             png_bytep dp = row + (png_size_t)(final_width - 1) * pixel_bytes;</div><div class='ctx'> </div><div class='ctx'>             int jstop = png_pass_inc[pass];</div><div class='hunk'>@@ -2845,11 +3096,13 @@ png_do_read_interlace(png_structp png_ptr)</div><div class='ctx'>                int j;</div><div class='ctx'> </div><div class='ctx'>                png_memcpy(v, sp, pixel_bytes);</div><div class='add'>+</div><div class='ctx'>                for (j = 0; j &lt; jstop; j++)</div><div class='ctx'>                {</div><div class='ctx'>                   png_memcpy(dp, v, pixel_bytes);</div><div class='ctx'>                   dp -= pixel_bytes;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                sp -= pixel_bytes;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='hunk'>@@ -2859,26 +3112,27 @@ png_do_read_interlace(png_structp png_ptr)</div><div class='ctx'>       row_info-&gt;rowbytes = PNG_ROWBYTES(row_info-&gt;pixel_depth, final_width);</div><div class='ctx'>    }</div><div class='ctx'> #ifndef PNG_READ_PACKSWAP_SUPPORTED</div><div class='del'>-   transformations = transformations; /* Silence compiler warning */</div><div class='add'>+   PNG_UNUSED(transformations)  /* Silence compiler warning */</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> #endif /* PNG_READ_INTERLACING_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,</div><div class='del'>-   png_bytep prev_row, int filter)</div><div class='add'>+    png_const_bytep prev_row, int filter)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_read_filter_row");</div><div class='del'>-   png_debug2(2, "row = %lu, filter = %d", png_ptr-&gt;row_number, filter);</div><div class='add'>+   png_debug2(2, "row = %u, filter = %d", png_ptr-&gt;row_number, filter);</div><div class='ctx'>    switch (filter)</div><div class='ctx'>    {</div><div class='ctx'>       case PNG_FILTER_VALUE_NONE:</div><div class='ctx'>          break;</div><div class='add'>+</div><div class='ctx'>       case PNG_FILTER_VALUE_SUB:</div><div class='ctx'>       {</div><div class='del'>-         png_uint_32 i;</div><div class='del'>-         png_uint_32 istop = row_info-&gt;rowbytes;</div><div class='del'>-         png_uint_32 bpp = (row_info-&gt;pixel_depth + 7) &gt;&gt; 3;</div><div class='add'>+         png_size_t i;</div><div class='add'>+         png_size_t istop = row_info-&gt;rowbytes;</div><div class='add'>+         unsigned int bpp = (row_info-&gt;pixel_depth + 7) &gt;&gt; 3;</div><div class='ctx'>          png_bytep rp = row + bpp;</div><div class='ctx'>          png_bytep lp = row;</div><div class='ctx'> </div><div class='hunk'>@@ -2891,10 +3145,10 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,</div><div class='ctx'>       }</div><div class='ctx'>       case PNG_FILTER_VALUE_UP:</div><div class='ctx'>       {</div><div class='del'>-         png_uint_32 i;</div><div class='del'>-         png_uint_32 istop = row_info-&gt;rowbytes;</div><div class='add'>+         png_size_t i;</div><div class='add'>+         png_size_t istop = row_info-&gt;rowbytes;</div><div class='ctx'>          png_bytep rp = row;</div><div class='del'>-         png_bytep pp = prev_row;</div><div class='add'>+         png_const_bytep pp = prev_row;</div><div class='ctx'> </div><div class='ctx'>          for (i = 0; i &lt; istop; i++)</div><div class='ctx'>          {</div><div class='hunk'>@@ -2905,37 +3159,39 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,</div><div class='ctx'>       }</div><div class='ctx'>       case PNG_FILTER_VALUE_AVG:</div><div class='ctx'>       {</div><div class='del'>-         png_uint_32 i;</div><div class='add'>+         png_size_t i;</div><div class='ctx'>          png_bytep rp = row;</div><div class='del'>-         png_bytep pp = prev_row;</div><div class='add'>+         png_const_bytep pp = prev_row;</div><div class='ctx'>          png_bytep lp = row;</div><div class='del'>-         png_uint_32 bpp = (row_info-&gt;pixel_depth + 7) &gt;&gt; 3;</div><div class='del'>-         png_uint_32 istop = row_info-&gt;rowbytes - bpp;</div><div class='add'>+         unsigned int bpp = (row_info-&gt;pixel_depth + 7) &gt;&gt; 3;</div><div class='add'>+         png_size_t istop = row_info-&gt;rowbytes - bpp;</div><div class='ctx'> </div><div class='ctx'>          for (i = 0; i &lt; bpp; i++)</div><div class='ctx'>          {</div><div class='ctx'>             *rp = (png_byte)(((int)(*rp) +</div><div class='del'>-               ((int)(*pp++) / 2 )) &amp; 0xff);</div><div class='add'>+                ((int)(*pp++) / 2 )) &amp; 0xff);</div><div class='add'>+</div><div class='ctx'>             rp++;</div><div class='ctx'>          }</div><div class='ctx'> </div><div class='ctx'>          for (i = 0; i &lt; istop; i++)</div><div class='ctx'>          {</div><div class='ctx'>             *rp = (png_byte)(((int)(*rp) +</div><div class='del'>-               (int)(*pp++ + *lp++) / 2 ) &amp; 0xff);</div><div class='add'>+                (int)(*pp++ + *lp++) / 2 ) &amp; 0xff);</div><div class='add'>+</div><div class='ctx'>             rp++;</div><div class='ctx'>          }</div><div class='ctx'>          break;</div><div class='ctx'>       }</div><div class='ctx'>       case PNG_FILTER_VALUE_PAETH:</div><div class='ctx'>       {</div><div class='del'>-         png_uint_32 i;</div><div class='add'>+         png_size_t i;</div><div class='ctx'>          png_bytep rp = row;</div><div class='del'>-         png_bytep pp = prev_row;</div><div class='add'>+         png_const_bytep pp = prev_row;</div><div class='ctx'>          png_bytep lp = row;</div><div class='del'>-         png_bytep cp = prev_row;</div><div class='del'>-         png_uint_32 bpp = (row_info-&gt;pixel_depth + 7) &gt;&gt; 3;</div><div class='del'>-         png_uint_32 istop=row_info-&gt;rowbytes - bpp;</div><div class='add'>+         png_const_bytep cp = prev_row;</div><div class='add'>+         unsigned int bpp = (row_info-&gt;pixel_depth + 7) &gt;&gt; 3;</div><div class='add'>+         png_size_t istop=row_info-&gt;rowbytes - bpp;</div><div class='ctx'> </div><div class='ctx'>          for (i = 0; i &lt; bpp; i++)</div><div class='ctx'>          {</div><div class='hunk'>@@ -2967,8 +3223,10 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,</div><div class='ctx'>             /*</div><div class='ctx'>                if (pa &lt;= pb &amp;&amp; pa &lt;= pc)</div><div class='ctx'>                   p = a;</div><div class='add'>+</div><div class='ctx'>                else if (pb &lt;= pc)</div><div class='ctx'>                   p = b;</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   p = c;</div><div class='ctx'>              */</div><div class='hunk'>@@ -2981,8 +3239,8 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,</div><div class='ctx'>          break;</div><div class='ctx'>       }</div><div class='ctx'>       default:</div><div class='del'>-         png_warning(png_ptr, "Ignoring bad adaptive filter type");</div><div class='del'>-         *row = 0;</div><div class='add'>+         png_error(png_ptr, "Ignoring bad adaptive filter type");</div><div class='add'>+         /*NOT REACHED */</div><div class='ctx'>          break;</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='hunk'>@@ -3016,33 +3274,33 @@ png_read_finish_row(png_structp png_ptr)</div><div class='ctx'>    if (png_ptr-&gt;interlaced)</div><div class='ctx'>    {</div><div class='ctx'>       png_ptr-&gt;row_number = 0;</div><div class='del'>-      png_memset(png_ptr-&gt;prev_row, 0,</div><div class='del'>-         png_ptr-&gt;rowbytes + 1);</div><div class='add'>+</div><div class='add'>+      png_memset(png_ptr-&gt;prev_row, 0, png_ptr-&gt;rowbytes + 1);</div><div class='add'>+</div><div class='ctx'>       do</div><div class='ctx'>       {</div><div class='ctx'>          png_ptr-&gt;pass++;</div><div class='add'>+</div><div class='ctx'>          if (png_ptr-&gt;pass &gt;= 7)</div><div class='ctx'>             break;</div><div class='add'>+</div><div class='ctx'>          png_ptr-&gt;iwidth = (png_ptr-&gt;width +</div><div class='ctx'>             png_pass_inc[png_ptr-&gt;pass] - 1 -</div><div class='ctx'>             png_pass_start[png_ptr-&gt;pass]) /</div><div class='ctx'>             png_pass_inc[png_ptr-&gt;pass];</div><div class='ctx'> </div><div class='del'>-         png_ptr-&gt;irowbytes = PNG_ROWBYTES(png_ptr-&gt;pixel_depth,</div><div class='del'>-            png_ptr-&gt;iwidth) + 1;</div><div class='del'>-</div><div class='ctx'>          if (!(png_ptr-&gt;transformations &amp; PNG_INTERLACE))</div><div class='ctx'>          {</div><div class='ctx'>             png_ptr-&gt;num_rows = (png_ptr-&gt;height +</div><div class='del'>-               png_pass_yinc[png_ptr-&gt;pass] - 1 -</div><div class='del'>-               png_pass_ystart[png_ptr-&gt;pass]) /</div><div class='del'>-               png_pass_yinc[png_ptr-&gt;pass];</div><div class='del'>-            if (!(png_ptr-&gt;num_rows))</div><div class='del'>-               continue;</div><div class='add'>+                png_pass_yinc[png_ptr-&gt;pass] - 1 -</div><div class='add'>+                png_pass_ystart[png_ptr-&gt;pass]) /</div><div class='add'>+                png_pass_yinc[png_ptr-&gt;pass];</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          else  /* if (png_ptr-&gt;transformations &amp; PNG_INTERLACE) */</div><div class='del'>-            break;</div><div class='del'>-      } while (png_ptr-&gt;iwidth == 0);</div><div class='add'>+            break; /* libpng deinterlacing sees every row */</div><div class='add'>+</div><div class='add'>+      } while (png_ptr-&gt;num_rows == 0 || png_ptr-&gt;iwidth == 0);</div><div class='ctx'> </div><div class='ctx'>       if (png_ptr-&gt;pass &lt; 7)</div><div class='ctx'>          return;</div><div class='hunk'>@@ -3057,44 +3315,45 @@ png_read_finish_row(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'>       png_ptr-&gt;zstream.next_out = (Byte *)&amp;extra;</div><div class='ctx'>       png_ptr-&gt;zstream.avail_out = (uInt)1;</div><div class='add'>+</div><div class='ctx'>       for (;;)</div><div class='ctx'>       {</div><div class='ctx'>          if (!(png_ptr-&gt;zstream.avail_in))</div><div class='ctx'>          {</div><div class='ctx'>             while (!png_ptr-&gt;idat_size)</div><div class='ctx'>             {</div><div class='del'>-               png_byte chunk_length[4];</div><div class='del'>-</div><div class='ctx'>                png_crc_finish(png_ptr, 0);</div><div class='del'>-</div><div class='del'>-               png_read_data(png_ptr, chunk_length, 4);</div><div class='del'>-               png_ptr-&gt;idat_size = png_get_uint_31(png_ptr, chunk_length);</div><div class='del'>-               png_reset_crc(png_ptr);</div><div class='del'>-               png_crc_read(png_ptr, png_ptr-&gt;chunk_name, 4);</div><div class='add'>+               png_ptr-&gt;idat_size = png_read_chunk_header(png_ptr);</div><div class='ctx'>                if (png_memcmp(png_ptr-&gt;chunk_name, png_IDAT, 4))</div><div class='ctx'>                   png_error(png_ptr, "Not enough image data");</div><div class='del'>-</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             png_ptr-&gt;zstream.avail_in = (uInt)png_ptr-&gt;zbuf_size;</div><div class='ctx'>             png_ptr-&gt;zstream.next_in = png_ptr-&gt;zbuf;</div><div class='add'>+</div><div class='ctx'>             if (png_ptr-&gt;zbuf_size &gt; png_ptr-&gt;idat_size)</div><div class='ctx'>                png_ptr-&gt;zstream.avail_in = (uInt)png_ptr-&gt;idat_size;</div><div class='add'>+</div><div class='ctx'>             png_crc_read(png_ptr, png_ptr-&gt;zbuf, png_ptr-&gt;zstream.avail_in);</div><div class='ctx'>             png_ptr-&gt;idat_size -= png_ptr-&gt;zstream.avail_in;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          ret = inflate(&amp;png_ptr-&gt;zstream, Z_PARTIAL_FLUSH);</div><div class='add'>+</div><div class='ctx'>          if (ret == Z_STREAM_END)</div><div class='ctx'>          {</div><div class='ctx'>             if (!(png_ptr-&gt;zstream.avail_out) || png_ptr-&gt;zstream.avail_in ||</div><div class='del'>-               png_ptr-&gt;idat_size)</div><div class='add'>+                png_ptr-&gt;idat_size)</div><div class='ctx'>                png_warning(png_ptr, "Extra compressed data");</div><div class='add'>+</div><div class='ctx'>             png_ptr-&gt;mode |= PNG_AFTER_IDAT;</div><div class='ctx'>             png_ptr-&gt;flags |= PNG_FLAG_ZLIB_FINISHED;</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          if (ret != Z_OK)</div><div class='ctx'>             png_error(png_ptr, png_ptr-&gt;zstream.msg ? png_ptr-&gt;zstream.msg :</div><div class='del'>-                      "Decompression Error");</div><div class='add'>+                "Decompression Error");</div><div class='ctx'> </div><div class='ctx'>          if (!(png_ptr-&gt;zstream.avail_out))</div><div class='ctx'>          {</div><div class='hunk'>@@ -3147,25 +3406,24 @@ png_read_start_row(png_structp png_ptr)</div><div class='ctx'>    {</div><div class='ctx'>       if (!(png_ptr-&gt;transformations &amp; PNG_INTERLACE))</div><div class='ctx'>          png_ptr-&gt;num_rows = (png_ptr-&gt;height + png_pass_yinc[0] - 1 -</div><div class='del'>-            png_pass_ystart[0]) / png_pass_yinc[0];</div><div class='add'>+             png_pass_ystart[0]) / png_pass_yinc[0];</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>          png_ptr-&gt;num_rows = png_ptr-&gt;height;</div><div class='ctx'> </div><div class='ctx'>       png_ptr-&gt;iwidth = (png_ptr-&gt;width +</div><div class='del'>-         png_pass_inc[png_ptr-&gt;pass] - 1 -</div><div class='del'>-         png_pass_start[png_ptr-&gt;pass]) /</div><div class='del'>-         png_pass_inc[png_ptr-&gt;pass];</div><div class='del'>-</div><div class='del'>-         png_ptr-&gt;irowbytes =</div><div class='del'>-            PNG_ROWBYTES(png_ptr-&gt;pixel_depth, png_ptr-&gt;iwidth) + 1;</div><div class='add'>+          png_pass_inc[png_ptr-&gt;pass] - 1 -</div><div class='add'>+          png_pass_start[png_ptr-&gt;pass]) /</div><div class='add'>+          png_pass_inc[png_ptr-&gt;pass];</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'> #endif /* PNG_READ_INTERLACING_SUPPORTED */</div><div class='ctx'>    {</div><div class='ctx'>       png_ptr-&gt;num_rows = png_ptr-&gt;height;</div><div class='ctx'>       png_ptr-&gt;iwidth = png_ptr-&gt;width;</div><div class='del'>-      png_ptr-&gt;irowbytes = png_ptr-&gt;rowbytes + 1;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    max_pixel_depth = png_ptr-&gt;pixel_depth;</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_READ_PACK_SUPPORTED</div><div class='hunk'>@@ -3180,16 +3438,20 @@ png_read_start_row(png_structp png_ptr)</div><div class='ctx'>       {</div><div class='ctx'>          if (png_ptr-&gt;num_trans)</div><div class='ctx'>             max_pixel_depth = 32;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             max_pixel_depth = 24;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_GRAY)</div><div class='ctx'>       {</div><div class='ctx'>          if (max_pixel_depth &lt; 8)</div><div class='ctx'>             max_pixel_depth = 8;</div><div class='add'>+</div><div class='ctx'>          if (png_ptr-&gt;num_trans)</div><div class='ctx'>             max_pixel_depth *= 2;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_RGB)</div><div class='ctx'>       {</div><div class='ctx'>          if (png_ptr-&gt;num_trans)</div><div class='hunk'>@@ -3206,17 +3468,21 @@ png_read_start_row(png_structp png_ptr)</div><div class='ctx'>    {</div><div class='ctx'>       if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>          max_pixel_depth = 32;</div><div class='add'>+</div><div class='ctx'>       else if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_GRAY)</div><div class='ctx'>       {</div><div class='ctx'>          if (max_pixel_depth &lt;= 8)</div><div class='ctx'>             max_pixel_depth = 16;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             max_pixel_depth = 32;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_RGB)</div><div class='ctx'>       {</div><div class='ctx'>          if (max_pixel_depth &lt;= 32)</div><div class='ctx'>             max_pixel_depth = 32;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             max_pixel_depth = 64;</div><div class='ctx'>       }</div><div class='hunk'>@@ -3228,29 +3494,34 @@ png_read_start_row(png_structp png_ptr)</div><div class='ctx'>    {</div><div class='ctx'>       if (</div><div class='ctx'> #ifdef PNG_READ_EXPAND_SUPPORTED</div><div class='del'>-        (png_ptr-&gt;num_trans &amp;&amp; (png_ptr-&gt;transformations &amp; PNG_EXPAND)) ||</div><div class='add'>+          (png_ptr-&gt;num_trans &amp;&amp; (png_ptr-&gt;transformations &amp; PNG_EXPAND)) ||</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef PNG_READ_FILLER_SUPPORTED</div><div class='del'>-        (png_ptr-&gt;transformations &amp; (PNG_FILLER)) ||</div><div class='add'>+          (png_ptr-&gt;transformations &amp; (PNG_FILLER)) ||</div><div class='ctx'> #endif</div><div class='del'>-        png_ptr-&gt;color_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='add'>+          png_ptr-&gt;color_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='ctx'>       {</div><div class='ctx'>          if (max_pixel_depth &lt;= 16)</div><div class='ctx'>             max_pixel_depth = 32;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             max_pixel_depth = 64;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          if (max_pixel_depth &lt;= 8)</div><div class='del'>-           {</div><div class='del'>-             if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='add'>+         {</div><div class='add'>+            if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='ctx'>                max_pixel_depth = 32;</div><div class='del'>-             else</div><div class='add'>+</div><div class='add'>+            else</div><div class='ctx'>                max_pixel_depth = 24;</div><div class='del'>-           }</div><div class='add'>+         }</div><div class='add'>+</div><div class='ctx'>          else if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='ctx'>             max_pixel_depth = 64;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             max_pixel_depth = 48;</div><div class='ctx'>       }</div><div class='hunk'>@@ -3260,12 +3531,13 @@ png_read_start_row(png_structp png_ptr)</div><div class='ctx'> #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) &amp;&amp; \</div><div class='ctx'> defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_USER_TRANSFORM)</div><div class='del'>-     {</div><div class='del'>-       int user_pixel_depth = png_ptr-&gt;user_transform_depth*</div><div class='add'>+   {</div><div class='add'>+      int user_pixel_depth = png_ptr-&gt;user_transform_depth*</div><div class='ctx'>          png_ptr-&gt;user_transform_channels;</div><div class='del'>-       if (user_pixel_depth &gt; max_pixel_depth)</div><div class='add'>+</div><div class='add'>+      if (user_pixel_depth &gt; max_pixel_depth)</div><div class='ctx'>          max_pixel_depth=user_pixel_depth;</div><div class='del'>-     }</div><div class='add'>+   }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>    /* Align the width on the next larger 8 pixels.  Mainly used</div><div class='hunk'>@@ -3276,7 +3548,8 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)</div><div class='ctx'>     * for safety's sake</div><div class='ctx'>     */</div><div class='ctx'>    row_bytes = PNG_ROWBYTES(max_pixel_depth, row_bytes) +</div><div class='del'>-      1 + ((max_pixel_depth + 7) &gt;&gt; 3);</div><div class='add'>+       1 + ((max_pixel_depth + 7) &gt;&gt; 3);</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_MAX_MALLOC_64K</div><div class='ctx'>    if (row_bytes &gt; (png_uint_32)65536L)</div><div class='ctx'>       png_error(png_ptr, "This image requires a row greater than 64KB");</div><div class='hunk'>@@ -3285,20 +3558,24 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)</div><div class='ctx'>    if (row_bytes + 48 &gt; png_ptr-&gt;old_big_row_buf_size)</div><div class='ctx'>    {</div><div class='ctx'>      png_free(png_ptr, png_ptr-&gt;big_row_buf);</div><div class='add'>+</div><div class='ctx'>      if (png_ptr-&gt;interlaced)</div><div class='ctx'>         png_ptr-&gt;big_row_buf = (png_bytep)png_calloc(png_ptr,</div><div class='ctx'>             row_bytes + 48);</div><div class='add'>+</div><div class='ctx'>      else</div><div class='ctx'>         png_ptr-&gt;big_row_buf = (png_bytep)png_malloc(png_ptr,</div><div class='ctx'>             row_bytes + 48);</div><div class='add'>+</div><div class='ctx'>      png_ptr-&gt;old_big_row_buf_size = row_bytes + 48;</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_ALIGNED_MEMORY_SUPPORTED</div><div class='ctx'>      /* Use 16-byte aligned memory for row_buf with at least 16 bytes</div><div class='ctx'>       * of padding before and after row_buf.</div><div class='ctx'>       */</div><div class='del'>-     png_ptr-&gt;row_buf = png_ptr-&gt;big_row_buf + 32</div><div class='del'>-         - (((png_alloc_size_t)&amp;(png_ptr-&gt;big_row_buf[0]) + 15) % 16);</div><div class='add'>+     png_ptr-&gt;row_buf = png_ptr-&gt;big_row_buf + 32 -</div><div class='add'>+         (((png_alloc_size_t)png_ptr-&gt;big_row_buf + 15) &amp; 0x0F);</div><div class='add'>+</div><div class='ctx'>      png_ptr-&gt;old_big_row_buf_size = row_bytes + 48;</div><div class='ctx'> #else</div><div class='ctx'>      /* Use 32 bytes of padding before and 16 bytes after row_buf. */</div><div class='hunk'>@@ -3308,28 +3585,31 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_MAX_MALLOC_64K</div><div class='del'>-   if ((png_uint_32)png_ptr-&gt;rowbytes + 1 &gt; (png_uint_32)65536L)</div><div class='add'>+   if (png_ptr-&gt;rowbytes &gt; 65535)</div><div class='ctx'>       png_error(png_ptr, "This image requires a row greater than 64KB");</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='del'>-   if ((png_uint_32)png_ptr-&gt;rowbytes &gt; (png_uint_32)(PNG_SIZE_MAX - 1))</div><div class='add'>+   if (png_ptr-&gt;rowbytes &gt; (PNG_SIZE_MAX - 1))</div><div class='ctx'>       png_error(png_ptr, "Row has too many bytes to allocate in memory");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr-&gt;rowbytes + 1 &gt; png_ptr-&gt;old_prev_row_size)</div><div class='ctx'>    {</div><div class='ctx'>       png_free(png_ptr, png_ptr-&gt;prev_row);</div><div class='del'>-      png_ptr-&gt;prev_row = (png_bytep)png_malloc(png_ptr, (png_uint_32)(</div><div class='del'>-        png_ptr-&gt;rowbytes + 1));</div><div class='add'>+</div><div class='add'>+      png_ptr-&gt;prev_row = (png_bytep)png_malloc(png_ptr, png_ptr-&gt;rowbytes + 1);</div><div class='add'>+</div><div class='ctx'>       png_ptr-&gt;old_prev_row_size = png_ptr-&gt;rowbytes + 1;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_memset(png_ptr-&gt;prev_row, 0, png_ptr-&gt;rowbytes + 1);</div><div class='ctx'> </div><div class='del'>-   png_debug1(3, "width = %lu,", png_ptr-&gt;width);</div><div class='del'>-   png_debug1(3, "height = %lu,", png_ptr-&gt;height);</div><div class='del'>-   png_debug1(3, "iwidth = %lu,", png_ptr-&gt;iwidth);</div><div class='del'>-   png_debug1(3, "num_rows = %lu,", png_ptr-&gt;num_rows);</div><div class='del'>-   png_debug1(3, "rowbytes = %lu,", png_ptr-&gt;rowbytes);</div><div class='del'>-   png_debug1(3, "irowbytes = %lu", png_ptr-&gt;irowbytes);</div><div class='add'>+   png_debug1(3, "width = %u,", png_ptr-&gt;width);</div><div class='add'>+   png_debug1(3, "height = %u,", png_ptr-&gt;height);</div><div class='add'>+   png_debug1(3, "iwidth = %u,", png_ptr-&gt;iwidth);</div><div class='add'>+   png_debug1(3, "num_rows = %u,", png_ptr-&gt;num_rows);</div><div class='add'>+   png_debug1(3, "rowbytes = %lu,", (unsigned long)png_ptr-&gt;rowbytes);</div><div class='add'>+   png_debug1(3, "irowbytes = %lu",</div><div class='add'>+       (unsigned long)PNG_ROWBYTES(png_ptr-&gt;pixel_depth, png_ptr-&gt;iwidth) + 1);</div><div class='ctx'> </div><div class='ctx'>    png_ptr-&gt;flags |= PNG_FLAG_ROW_INIT;</div><div class='ctx'> }</div><div class='head'>diff --git a/src/3rdparty/libpng/pngset.c b/src/3rdparty/libpng/pngset.c<br/>index adb4016..2cfcf33 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngset.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngset.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngset.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngset.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> </div><div class='ctx'> /* pngset.c - storage of image information into info struct</div><div class='ctx'>  *</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Last changed in libpng 1.5.1 [February 3, 2011]</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -16,14 +16,14 @@</div><div class='ctx'>  * info struct and allows us to change the structure in the future.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define PNG_NO_PEDANTIC_WARNINGS</div><div class='del'>-#include "png.h"</div><div class='del'>-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)</div><div class='ctx'> #include "pngpriv.h"</div><div class='ctx'> </div><div class='add'>+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_bKGD_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='del'>-png_set_bKGD(png_structp png_ptr, png_infop info_ptr, png_color_16p background)</div><div class='add'>+png_set_bKGD(png_structp png_ptr, png_infop info_ptr,</div><div class='add'>+    png_const_color_16p background)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s storage function", "bKGD");</div><div class='ctx'> </div><div class='hunk'>@@ -36,150 +36,94 @@ png_set_bKGD(png_structp png_ptr, png_infop info_ptr, png_color_16p background)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_cHRM_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-void PNGAPI</div><div class='del'>-png_set_cHRM(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   double white_x, double white_y, double red_x, double red_y,</div><div class='del'>-   double green_x, double green_y, double blue_x, double blue_y)</div><div class='del'>-{</div><div class='del'>-   png_debug1(1, "in %s storage function", "cHRM");</div><div class='del'>-</div><div class='del'>-   if (png_ptr == NULL || info_ptr == NULL)</div><div class='del'>-      return;</div><div class='del'>-</div><div class='del'>-   info_ptr-&gt;x_white = (float)white_x;</div><div class='del'>-   info_ptr-&gt;y_white = (float)white_y;</div><div class='del'>-   info_ptr-&gt;x_red   = (float)red_x;</div><div class='del'>-   info_ptr-&gt;y_red   = (float)red_y;</div><div class='del'>-   info_ptr-&gt;x_green = (float)green_x;</div><div class='del'>-   info_ptr-&gt;y_green = (float)green_y;</div><div class='del'>-   info_ptr-&gt;x_blue  = (float)blue_x;</div><div class='del'>-   info_ptr-&gt;y_blue  = (float)blue_y;</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-   info_ptr-&gt;int_x_white = (png_fixed_point)(white_x*100000.+0.5);</div><div class='del'>-   info_ptr-&gt;int_y_white = (png_fixed_point)(white_y*100000.+0.5);</div><div class='del'>-   info_ptr-&gt;int_x_red   = (png_fixed_point)(  red_x*100000.+0.5);</div><div class='del'>-   info_ptr-&gt;int_y_red   = (png_fixed_point)(  red_y*100000.+0.5);</div><div class='del'>-   info_ptr-&gt;int_x_green = (png_fixed_point)(green_x*100000.+0.5);</div><div class='del'>-   info_ptr-&gt;int_y_green = (png_fixed_point)(green_y*100000.+0.5);</div><div class='del'>-   info_ptr-&gt;int_x_blue  = (png_fixed_point)( blue_x*100000.+0.5);</div><div class='del'>-   info_ptr-&gt;int_y_blue  = (png_fixed_point)( blue_y*100000.+0.5);</div><div class='del'>-#endif</div><div class='del'>-   info_ptr-&gt;valid |= PNG_INFO_cHRM;</div><div class='del'>-}</div><div class='del'>-#endif /* PNG_FLOATING_POINT_SUPPORTED */</div><div class='del'>-</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-void PNGAPI</div><div class='add'>+void PNGFAPI</div><div class='ctx'> png_set_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,</div><div class='del'>-   png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,</div><div class='del'>-   png_fixed_point blue_x, png_fixed_point blue_y)</div><div class='add'>+    png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,</div><div class='add'>+    png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,</div><div class='add'>+    png_fixed_point blue_x, png_fixed_point blue_y)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s storage function", "cHRM fixed");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL || info_ptr == NULL)</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_CHECK_cHRM_SUPPORTED</div><div class='add'>+#  ifdef PNG_CHECK_cHRM_SUPPORTED</div><div class='ctx'>    if (png_check_cHRM_fixed(png_ptr,</div><div class='del'>-      white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y))</div><div class='del'>-#endif</div><div class='add'>+       white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y))</div><div class='add'>+#  endif</div><div class='ctx'>    {</div><div class='del'>-      info_ptr-&gt;int_x_white = white_x;</div><div class='del'>-      info_ptr-&gt;int_y_white = white_y;</div><div class='del'>-      info_ptr-&gt;int_x_red   = red_x;</div><div class='del'>-      info_ptr-&gt;int_y_red   = red_y;</div><div class='del'>-      info_ptr-&gt;int_x_green = green_x;</div><div class='del'>-      info_ptr-&gt;int_y_green = green_y;</div><div class='del'>-      info_ptr-&gt;int_x_blue  = blue_x;</div><div class='del'>-      info_ptr-&gt;int_y_blue  = blue_y;</div><div class='del'>-#ifdef  PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-      info_ptr-&gt;x_white = (float)(white_x/100000.);</div><div class='del'>-      info_ptr-&gt;y_white = (float)(white_y/100000.);</div><div class='del'>-      info_ptr-&gt;x_red   = (float)(  red_x/100000.);</div><div class='del'>-      info_ptr-&gt;y_red   = (float)(  red_y/100000.);</div><div class='del'>-      info_ptr-&gt;x_green = (float)(green_x/100000.);</div><div class='del'>-      info_ptr-&gt;y_green = (float)(green_y/100000.);</div><div class='del'>-      info_ptr-&gt;x_blue  = (float)( blue_x/100000.);</div><div class='del'>-      info_ptr-&gt;y_blue  = (float)( blue_y/100000.);</div><div class='del'>-#endif</div><div class='add'>+      info_ptr-&gt;x_white = white_x;</div><div class='add'>+      info_ptr-&gt;y_white = white_y;</div><div class='add'>+      info_ptr-&gt;x_red   = red_x;</div><div class='add'>+      info_ptr-&gt;y_red   = red_y;</div><div class='add'>+      info_ptr-&gt;x_green = green_x;</div><div class='add'>+      info_ptr-&gt;y_green = green_y;</div><div class='add'>+      info_ptr-&gt;x_blue  = blue_x;</div><div class='add'>+      info_ptr-&gt;y_blue  = blue_y;</div><div class='ctx'>       info_ptr-&gt;valid |= PNG_INFO_cHRM;</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='del'>-#endif /* PNG_FIXED_POINT_SUPPORTED */</div><div class='del'>-#endif /* PNG_cHRM_SUPPORTED */</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_gAMA_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='del'>-png_set_gAMA(png_structp png_ptr, png_infop info_ptr, double file_gamma)</div><div class='add'>+png_set_cHRM(png_structp png_ptr, png_infop info_ptr,</div><div class='add'>+    double white_x, double white_y, double red_x, double red_y,</div><div class='add'>+    double green_x, double green_y, double blue_x, double blue_y)</div><div class='ctx'> {</div><div class='del'>-   double png_gamma;</div><div class='del'>-</div><div class='del'>-   png_debug1(1, "in %s storage function", "gAMA");</div><div class='add'>+   png_set_cHRM_fixed(png_ptr, info_ptr,</div><div class='add'>+      png_fixed(png_ptr, white_x, "cHRM White X"),</div><div class='add'>+      png_fixed(png_ptr, white_y, "cHRM White Y"),</div><div class='add'>+      png_fixed(png_ptr, red_x, "cHRM Red X"),</div><div class='add'>+      png_fixed(png_ptr, red_y, "cHRM Red Y"),</div><div class='add'>+      png_fixed(png_ptr, green_x, "cHRM Green X"),</div><div class='add'>+      png_fixed(png_ptr, green_y, "cHRM Green Y"),</div><div class='add'>+      png_fixed(png_ptr, blue_x, "cHRM Blue X"),</div><div class='add'>+      png_fixed(png_ptr, blue_y, "cHRM Blue Y"));</div><div class='add'>+}</div><div class='add'>+#  endif /* PNG_FLOATING_POINT_SUPPORTED */</div><div class='ctx'> </div><div class='del'>-   if (png_ptr == NULL || info_ptr == NULL)</div><div class='del'>-      return;</div><div class='add'>+#endif /* PNG_cHRM_SUPPORTED */</div><div class='ctx'> </div><div class='del'>-   /* Check for overflow */</div><div class='del'>-   if (file_gamma &gt; 21474.83)</div><div class='del'>-   {</div><div class='del'>-      png_warning(png_ptr, "Limiting gamma to 21474.83");</div><div class='del'>-      png_gamma=21474.83;</div><div class='del'>-   }</div><div class='del'>-   else</div><div class='del'>-      png_gamma = file_gamma;</div><div class='del'>-   info_ptr-&gt;gamma = (float)png_gamma;</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-   info_ptr-&gt;int_gamma = (int)(png_gamma*100000.+.5);</div><div class='del'>-#endif</div><div class='del'>-   info_ptr-&gt;valid |= PNG_INFO_gAMA;</div><div class='del'>-   if (png_gamma == 0.0)</div><div class='del'>-      png_warning(png_ptr, "Setting gamma=0");</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-void PNGAPI</div><div class='add'>+#ifdef PNG_gAMA_SUPPORTED</div><div class='add'>+void PNGFAPI</div><div class='ctx'> png_set_gAMA_fixed(png_structp png_ptr, png_infop info_ptr, png_fixed_point</div><div class='del'>-   int_gamma)</div><div class='add'>+    file_gamma)</div><div class='ctx'> {</div><div class='del'>-   png_fixed_point png_gamma;</div><div class='del'>-</div><div class='ctx'>    png_debug1(1, "in %s storage function", "gAMA");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL || info_ptr == NULL)</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='del'>-   if (int_gamma &gt; (png_fixed_point)PNG_UINT_31_MAX)</div><div class='del'>-   {</div><div class='del'>-      png_warning(png_ptr, "Limiting gamma to 21474.83");</div><div class='del'>-      png_gamma=PNG_UINT_31_MAX;</div><div class='del'>-   }</div><div class='add'>+   /* Previously these values were limited, however they must be</div><div class='add'>+    * wrong, therefore storing them (and setting PNG_INFO_gAMA)</div><div class='add'>+    * must be wrong too.</div><div class='add'>+    */</div><div class='add'>+   if (file_gamma &gt; (png_fixed_point)PNG_UINT_31_MAX)</div><div class='add'>+      png_warning(png_ptr, "Gamma too large, ignored");</div><div class='add'>+</div><div class='add'>+   else if (file_gamma &lt;= 0)</div><div class='add'>+      png_warning(png_ptr, "Negative or zero gamma ignored");</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='del'>-      if (int_gamma &lt; 0)</div><div class='del'>-      {</div><div class='del'>-         png_warning(png_ptr, "Setting negative gamma to zero");</div><div class='del'>-         png_gamma = 0;</div><div class='del'>-      }</div><div class='del'>-      else</div><div class='del'>-         png_gamma = int_gamma;</div><div class='add'>+      info_ptr-&gt;gamma = file_gamma;</div><div class='add'>+      info_ptr-&gt;valid |= PNG_INFO_gAMA;</div><div class='ctx'>    }</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   info_ptr-&gt;gamma = (float)(png_gamma/100000.);</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-   info_ptr-&gt;int_gamma = png_gamma;</div><div class='del'>-#endif</div><div class='del'>-   info_ptr-&gt;valid |= PNG_INFO_gAMA;</div><div class='del'>-   if (png_gamma == 0)</div><div class='del'>-      png_warning(png_ptr, "Setting gamma=0");</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+void PNGAPI</div><div class='add'>+png_set_gAMA(png_structp png_ptr, png_infop info_ptr, double file_gamma)</div><div class='add'>+{</div><div class='add'>+   png_set_gAMA_fixed(png_ptr, info_ptr, png_fixed(png_ptr, file_gamma,</div><div class='add'>+       "png_set_gAMA"));</div><div class='add'>+}</div><div class='add'>+#  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_hIST_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='del'>-png_set_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p hist)</div><div class='add'>+png_set_hIST(png_structp png_ptr, png_infop info_ptr, png_const_uint_16p hist)</div><div class='ctx'> {</div><div class='ctx'>    int i;</div><div class='ctx'> </div><div class='hunk'>@@ -192,16 +136,19 @@ png_set_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p hist)</div><div class='ctx'>        &gt; PNG_MAX_PALETTE_LENGTH)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr,</div><div class='del'>-         "Invalid palette size, hIST allocation skipped");</div><div class='add'>+          "Invalid palette size, hIST allocation skipped");</div><div class='add'>+</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_free_data(png_ptr, info_ptr, PNG_FREE_HIST, 0);</div><div class='add'>+</div><div class='ctx'>    /* Changed from info-&gt;num_palette to PNG_MAX_PALETTE_LENGTH in</div><div class='ctx'>     * version 1.2.1</div><div class='ctx'>     */</div><div class='ctx'>    png_ptr-&gt;hist = (png_uint_16p)png_malloc_warn(png_ptr,</div><div class='del'>-      PNG_MAX_PALETTE_LENGTH * png_sizeof(png_uint_16));</div><div class='add'>+       PNG_MAX_PALETTE_LENGTH * png_sizeof(png_uint_16));</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;hist == NULL)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Insufficient memory for hIST chunk data");</div><div class='hunk'>@@ -210,18 +157,18 @@ png_set_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p hist)</div><div class='ctx'> </div><div class='ctx'>    for (i = 0; i &lt; info_ptr-&gt;num_palette; i++)</div><div class='ctx'>       png_ptr-&gt;hist[i] = hist[i];</div><div class='add'>+</div><div class='ctx'>    info_ptr-&gt;hist = png_ptr-&gt;hist;</div><div class='ctx'>    info_ptr-&gt;valid |= PNG_INFO_hIST;</div><div class='del'>-</div><div class='ctx'>    info_ptr-&gt;free_me |= PNG_FREE_HIST;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_IHDR(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 width, png_uint_32 height, int bit_depth,</div><div class='del'>-   int color_type, int interlace_type, int compression_type,</div><div class='del'>-   int filter_type)</div><div class='add'>+    png_uint_32 width, png_uint_32 height, int bit_depth,</div><div class='add'>+    int color_type, int interlace_type, int compression_type,</div><div class='add'>+    int filter_type)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s storage function", "IHDR");</div><div class='ctx'> </div><div class='hunk'>@@ -242,21 +189,25 @@ png_set_IHDR(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'> </div><div class='ctx'>    if (info_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>       info_ptr-&gt;channels = 1;</div><div class='add'>+</div><div class='ctx'>    else if (info_ptr-&gt;color_type &amp; PNG_COLOR_MASK_COLOR)</div><div class='ctx'>       info_ptr-&gt;channels = 3;</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       info_ptr-&gt;channels = 1;</div><div class='add'>+</div><div class='ctx'>    if (info_ptr-&gt;color_type &amp; PNG_COLOR_MASK_ALPHA)</div><div class='ctx'>       info_ptr-&gt;channels++;</div><div class='add'>+</div><div class='ctx'>    info_ptr-&gt;pixel_depth = (png_byte)(info_ptr-&gt;channels * info_ptr-&gt;bit_depth);</div><div class='ctx'> </div><div class='ctx'>    /* Check for potential overflow */</div><div class='del'>-   if (width &gt; (PNG_UINT_32_MAX</div><div class='del'>-                 &gt;&gt; 3)      /* 8-byte RGBA pixels */</div><div class='del'>-                 - 64       /* bigrowbuf hack */</div><div class='del'>-                 - 1        /* filter byte */</div><div class='del'>-                 - 7*8      /* rounding of width to multiple of 8 pixels */</div><div class='del'>-                 - 8)       /* extra max_pixel_depth pad */</div><div class='add'>+   if (width &gt;</div><div class='add'>+       (PNG_UINT_32_MAX &gt;&gt; 3)      /* 8-byte RRGGBBAA pixels */</div><div class='add'>+       - 48       /* bigrowbuf hack */</div><div class='add'>+       - 1        /* filter byte */</div><div class='add'>+       - 7*8      /* rounding of width to multiple of 8 pixels */</div><div class='add'>+       - 8)       /* extra max_pixel_depth pad */</div><div class='ctx'>       info_ptr-&gt;rowbytes = 0;</div><div class='ctx'>    else</div><div class='ctx'>       info_ptr-&gt;rowbytes = PNG_ROWBYTES(info_ptr-&gt;pixel_depth, width);</div><div class='hunk'>@@ -265,7 +216,7 @@ png_set_IHDR(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'> #ifdef PNG_oFFs_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_oFFs(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_int_32 offset_x, png_int_32 offset_y, int unit_type)</div><div class='add'>+    png_int_32 offset_x, png_int_32 offset_y, int unit_type)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s storage function", "oFFs");</div><div class='ctx'> </div><div class='hunk'>@@ -282,8 +233,8 @@ png_set_oFFs(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'> #ifdef PNG_pCAL_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_pCAL(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_charp purpose, png_int_32 X0, png_int_32 X1, int type, int nparams,</div><div class='del'>-   png_charp units, png_charpp params)</div><div class='add'>+    png_const_charp purpose, png_int_32 X0, png_int_32 X1, int type,</div><div class='add'>+    int nparams, png_const_charp units, png_charpp params)</div><div class='ctx'> {</div><div class='ctx'>    png_size_t length;</div><div class='ctx'>    int i;</div><div class='hunk'>@@ -295,13 +246,27 @@ png_set_pCAL(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'> </div><div class='ctx'>    length = png_strlen(purpose) + 1;</div><div class='ctx'>    png_debug1(3, "allocating purpose for info (%lu bytes)",</div><div class='del'>-     (unsigned long)length);</div><div class='add'>+       (unsigned long)length);</div><div class='add'>+</div><div class='add'>+   /* TODO: validate format of calibration name and unit name */</div><div class='add'>+</div><div class='add'>+   /* Check that the type matches the specification. */</div><div class='add'>+   if (type &lt; 0 || type &gt; 3)</div><div class='add'>+      png_error(png_ptr, "Invalid pCAL equation type");</div><div class='add'>+</div><div class='add'>+   /* Validate params[nparams] */</div><div class='add'>+   for (i=0; i&lt;nparams; ++i)</div><div class='add'>+      if (!png_check_fp_string(params[i], png_strlen(params[i])))</div><div class='add'>+         png_error(png_ptr, "Invalid format for pCAL parameter");</div><div class='add'>+</div><div class='ctx'>    info_ptr-&gt;pcal_purpose = (png_charp)png_malloc_warn(png_ptr, length);</div><div class='add'>+</div><div class='ctx'>    if (info_ptr-&gt;pcal_purpose == NULL)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Insufficient memory for pCAL purpose");</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    png_memcpy(info_ptr-&gt;pcal_purpose, purpose, length);</div><div class='ctx'> </div><div class='ctx'>    png_debug(3, "storing X0, X1, type, and nparams in info");</div><div class='hunk'>@@ -313,16 +278,20 @@ png_set_pCAL(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>    length = png_strlen(units) + 1;</div><div class='ctx'>    png_debug1(3, "allocating units for info (%lu bytes)",</div><div class='ctx'>      (unsigned long)length);</div><div class='add'>+</div><div class='ctx'>    info_ptr-&gt;pcal_units = (png_charp)png_malloc_warn(png_ptr, length);</div><div class='add'>+</div><div class='ctx'>    if (info_ptr-&gt;pcal_units == NULL)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Insufficient memory for pCAL units");</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    png_memcpy(info_ptr-&gt;pcal_units, units, length);</div><div class='ctx'> </div><div class='ctx'>    info_ptr-&gt;pcal_params = (png_charpp)png_malloc_warn(png_ptr,</div><div class='del'>-      (png_size_t)((nparams + 1) * png_sizeof(png_charp)));</div><div class='add'>+       (png_size_t)((nparams + 1) * png_sizeof(png_charp)));</div><div class='add'>+</div><div class='ctx'>    if (info_ptr-&gt;pcal_params == NULL)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Insufficient memory for pCAL params");</div><div class='hunk'>@@ -335,13 +304,16 @@ png_set_pCAL(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>    {</div><div class='ctx'>       length = png_strlen(params[i]) + 1;</div><div class='ctx'>       png_debug2(3, "allocating parameter %d for info (%lu bytes)", i,</div><div class='del'>-        (unsigned long)length);</div><div class='add'>+          (unsigned long)length);</div><div class='add'>+</div><div class='ctx'>       info_ptr-&gt;pcal_params[i] = (png_charp)png_malloc_warn(png_ptr, length);</div><div class='add'>+</div><div class='ctx'>       if (info_ptr-&gt;pcal_params[i] == NULL)</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr, "Insufficient memory for pCAL parameter");</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       png_memcpy(info_ptr-&gt;pcal_params[i], params[i], length);</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='hunk'>@@ -350,74 +322,132 @@ png_set_pCAL(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(PNG_READ_sCAL_SUPPORTED) || defined(PNG_WRITE_sCAL_SUPPORTED)</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+#ifdef PNG_sCAL_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='del'>-png_set_sCAL(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-             int unit, double width, double height)</div><div class='add'>+png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,</div><div class='add'>+    int unit, png_const_charp swidth, png_const_charp sheight)</div><div class='ctx'> {</div><div class='add'>+   png_size_t lengthw = 0, lengthh = 0;</div><div class='add'>+</div><div class='ctx'>    png_debug1(1, "in %s storage function", "sCAL");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL || info_ptr == NULL)</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='del'>-   info_ptr-&gt;scal_unit = (png_byte)unit;</div><div class='del'>-   info_ptr-&gt;scal_pixel_width = width;</div><div class='del'>-   info_ptr-&gt;scal_pixel_height = height;</div><div class='add'>+   /* Double check the unit (should never get here with an invalid</div><div class='add'>+    * unit unless this is an API call.)</div><div class='add'>+    */</div><div class='add'>+   if (unit != 1 &amp;&amp; unit != 2)</div><div class='add'>+      png_error(png_ptr, "Invalid sCAL unit");</div><div class='ctx'> </div><div class='del'>-   info_ptr-&gt;valid |= PNG_INFO_sCAL;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-void PNGAPI</div><div class='del'>-png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-             int unit, png_charp swidth, png_charp sheight)</div><div class='del'>-{</div><div class='del'>-   png_size_t length;</div><div class='add'>+   if (swidth == NULL || (lengthw = png_strlen(swidth)) &lt;= 0 ||</div><div class='add'>+       swidth[0] == 45 /*'-'*/ || !png_check_fp_string(swidth, lengthw))</div><div class='add'>+      png_error(png_ptr, "Invalid sCAL width");</div><div class='ctx'> </div><div class='del'>-   png_debug1(1, "in %s storage function", "sCAL");</div><div class='del'>-</div><div class='del'>-   if (png_ptr == NULL || info_ptr == NULL)</div><div class='del'>-      return;</div><div class='add'>+   if (sheight == NULL || (lengthh = png_strlen(sheight)) &lt;= 0 ||</div><div class='add'>+       sheight[0] == 45 /*'-'*/ || !png_check_fp_string(sheight, lengthh))</div><div class='add'>+      png_error(png_ptr, "Invalid sCAL height");</div><div class='ctx'> </div><div class='ctx'>    info_ptr-&gt;scal_unit = (png_byte)unit;</div><div class='ctx'> </div><div class='del'>-   length = png_strlen(swidth) + 1;</div><div class='del'>-   png_debug1(3, "allocating unit for info (%u bytes)",</div><div class='del'>-      (unsigned int)length);</div><div class='del'>-   info_ptr-&gt;scal_s_width = (png_charp)png_malloc_warn(png_ptr, length);</div><div class='add'>+   ++lengthw;</div><div class='add'>+</div><div class='add'>+   png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthw);</div><div class='add'>+</div><div class='add'>+   info_ptr-&gt;scal_s_width = (png_charp)png_malloc_warn(png_ptr, lengthw);</div><div class='add'>+</div><div class='ctx'>    if (info_ptr-&gt;scal_s_width == NULL)</div><div class='ctx'>    {</div><div class='del'>-      png_warning(png_ptr,</div><div class='del'>-         "Memory allocation failed while processing sCAL");</div><div class='add'>+      png_warning(png_ptr, "Memory allocation failed while processing sCAL");</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='del'>-   png_memcpy(info_ptr-&gt;scal_s_width, swidth, length);</div><div class='ctx'> </div><div class='del'>-   length = png_strlen(sheight) + 1;</div><div class='del'>-   png_debug1(3, "allocating unit for info (%u bytes)",</div><div class='del'>-      (unsigned int)length);</div><div class='del'>-   info_ptr-&gt;scal_s_height = (png_charp)png_malloc_warn(png_ptr, length);</div><div class='add'>+   png_memcpy(info_ptr-&gt;scal_s_width, swidth, lengthw);</div><div class='add'>+</div><div class='add'>+   ++lengthh;</div><div class='add'>+</div><div class='add'>+   png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthh);</div><div class='add'>+</div><div class='add'>+   info_ptr-&gt;scal_s_height = (png_charp)png_malloc_warn(png_ptr, lengthh);</div><div class='add'>+</div><div class='ctx'>    if (info_ptr-&gt;scal_s_height == NULL)</div><div class='ctx'>    {</div><div class='ctx'>       png_free (png_ptr, info_ptr-&gt;scal_s_width);</div><div class='ctx'>       info_ptr-&gt;scal_s_width = NULL;</div><div class='del'>-      png_warning(png_ptr,</div><div class='del'>-         "Memory allocation failed while processing sCAL");</div><div class='add'>+</div><div class='add'>+      png_warning(png_ptr, "Memory allocation failed while processing sCAL");</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='del'>-   png_memcpy(info_ptr-&gt;scal_s_height, sheight, length);</div><div class='add'>+</div><div class='add'>+   png_memcpy(info_ptr-&gt;scal_s_height, sheight, lengthh);</div><div class='add'>+</div><div class='ctx'>    info_ptr-&gt;valid |= PNG_INFO_sCAL;</div><div class='ctx'>    info_ptr-&gt;free_me |= PNG_FREE_SCAL;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+void PNGAPI</div><div class='add'>+png_set_sCAL(png_structp png_ptr, png_infop info_ptr, int unit, double width,</div><div class='add'>+    double height)</div><div class='add'>+{</div><div class='add'>+   png_debug1(1, "in %s storage function", "sCAL");</div><div class='add'>+</div><div class='add'>+   /* Check the arguments. */</div><div class='add'>+   if (width &lt;= 0)</div><div class='add'>+      png_warning(png_ptr, "Invalid sCAL width ignored");</div><div class='add'>+</div><div class='add'>+   else if (height &lt;= 0)</div><div class='add'>+      png_warning(png_ptr, "Invalid sCAL height ignored");</div><div class='add'>+</div><div class='add'>+   else</div><div class='add'>+   {</div><div class='add'>+      /* Convert 'width' and 'height' to ASCII. */</div><div class='add'>+      char swidth[PNG_sCAL_MAX_DIGITS+1];</div><div class='add'>+      char sheight[PNG_sCAL_MAX_DIGITS+1];</div><div class='add'>+</div><div class='add'>+      png_ascii_from_fp(png_ptr, swidth, sizeof swidth, width,</div><div class='add'>+         PNG_sCAL_PRECISION);</div><div class='add'>+      png_ascii_from_fp(png_ptr, sheight, sizeof sheight, height,</div><div class='add'>+         PNG_sCAL_PRECISION);</div><div class='add'>+</div><div class='add'>+      png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+#  endif</div><div class='add'>+</div><div class='add'>+#  ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+void PNGAPI</div><div class='add'>+png_set_sCAL_fixed(png_structp png_ptr, png_infop info_ptr, int unit,</div><div class='add'>+    png_fixed_point width, png_fixed_point height)</div><div class='add'>+{</div><div class='add'>+   png_debug1(1, "in %s storage function", "sCAL");</div><div class='add'>+</div><div class='add'>+   /* Check the arguments. */</div><div class='add'>+   if (width &lt;= 0)</div><div class='add'>+      png_warning(png_ptr, "Invalid sCAL width ignored");</div><div class='add'>+</div><div class='add'>+   else if (height &lt;= 0)</div><div class='add'>+      png_warning(png_ptr, "Invalid sCAL height ignored");</div><div class='add'>+</div><div class='add'>+   else</div><div class='add'>+   {</div><div class='add'>+      /* Convert 'width' and 'height' to ASCII. */</div><div class='add'>+      char swidth[PNG_sCAL_MAX_DIGITS+1];</div><div class='add'>+      char sheight[PNG_sCAL_MAX_DIGITS+1];</div><div class='add'>+</div><div class='add'>+      png_ascii_from_fixed(png_ptr, swidth, sizeof swidth, width);</div><div class='add'>+      png_ascii_from_fixed(png_ptr, sheight, sizeof sheight, height);</div><div class='add'>+</div><div class='add'>+      png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+#  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_pHYs_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_pHYs(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_uint_32 res_x, png_uint_32 res_y, int unit_type)</div><div class='add'>+    png_uint_32 res_x, png_uint_32 res_y, int unit_type)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s storage function", "pHYs");</div><div class='ctx'> </div><div class='hunk'>@@ -433,7 +463,7 @@ png_set_pHYs(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'> </div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_PLTE(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_colorp palette, int num_palette)</div><div class='add'>+    png_const_colorp palette, int num_palette)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'>    png_debug1(1, "in %s storage function", "PLTE");</div><div class='hunk'>@@ -445,6 +475,7 @@ png_set_PLTE(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>    {</div><div class='ctx'>       if (info_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>          png_error(png_ptr, "Invalid palette length");</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr, "Invalid palette length");</div><div class='hunk'>@@ -463,7 +494,8 @@ png_set_PLTE(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>     * too-large sample values.</div><div class='ctx'>     */</div><div class='ctx'>    png_ptr-&gt;palette = (png_colorp)png_calloc(png_ptr,</div><div class='del'>-      PNG_MAX_PALETTE_LENGTH * png_sizeof(png_color));</div><div class='add'>+       PNG_MAX_PALETTE_LENGTH * png_sizeof(png_color));</div><div class='add'>+</div><div class='ctx'>    png_memcpy(png_ptr-&gt;palette, palette, num_palette * png_sizeof(png_color));</div><div class='ctx'>    info_ptr-&gt;palette = png_ptr-&gt;palette;</div><div class='ctx'>    info_ptr-&gt;num_palette = png_ptr-&gt;num_palette = (png_uint_16)num_palette;</div><div class='hunk'>@@ -476,7 +508,7 @@ png_set_PLTE(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'> #ifdef PNG_sBIT_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_sBIT(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_color_8p sig_bit)</div><div class='add'>+    png_const_color_8p sig_bit)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s storage function", "sBIT");</div><div class='ctx'> </div><div class='hunk'>@@ -490,85 +522,41 @@ png_set_sBIT(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_sRGB_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='del'>-png_set_sRGB(png_structp png_ptr, png_infop info_ptr, int intent)</div><div class='add'>+png_set_sRGB(png_structp png_ptr, png_infop info_ptr, int srgb_intent)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s storage function", "sRGB");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL || info_ptr == NULL)</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='del'>-   info_ptr-&gt;srgb_intent = (png_byte)intent;</div><div class='add'>+   info_ptr-&gt;srgb_intent = (png_byte)srgb_intent;</div><div class='ctx'>    info_ptr-&gt;valid |= PNG_INFO_sRGB;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   int intent)</div><div class='add'>+    int srgb_intent)</div><div class='ctx'> {</div><div class='del'>-#ifdef PNG_gAMA_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   float file_gamma;</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-   png_fixed_point int_file_gamma;</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_cHRM_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;</div><div class='del'>-#endif</div><div class='del'>-   png_fixed_point int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,</div><div class='del'>-      int_green_y, int_blue_x, int_blue_y;</div><div class='del'>-#endif</div><div class='ctx'>    png_debug1(1, "in %s storage function", "sRGB_gAMA_and_cHRM");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL || info_ptr == NULL)</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='del'>-   png_set_sRGB(png_ptr, info_ptr, intent);</div><div class='add'>+   png_set_sRGB(png_ptr, info_ptr, srgb_intent);</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_gAMA_SUPPORTED</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   file_gamma = (float).45455;</div><div class='del'>-   png_set_gAMA(png_ptr, info_ptr, file_gamma);</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-   int_file_gamma = 45455L;</div><div class='del'>-   png_set_gAMA_fixed(png_ptr, info_ptr, int_file_gamma);</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_cHRM_SUPPORTED</div><div class='del'>-   int_white_x = 31270L;</div><div class='del'>-   int_white_y = 32900L;</div><div class='del'>-   int_red_x   = 64000L;</div><div class='del'>-   int_red_y   = 33000L;</div><div class='del'>-   int_green_x = 30000L;</div><div class='del'>-   int_green_y = 60000L;</div><div class='del'>-   int_blue_x  = 15000L;</div><div class='del'>-   int_blue_y  =  6000L;</div><div class='del'>-</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   white_x = (float).3127;</div><div class='del'>-   white_y = (float).3290;</div><div class='del'>-   red_x   = (float).64;</div><div class='del'>-   red_y   = (float).33;</div><div class='del'>-   green_x = (float).30;</div><div class='del'>-   green_y = (float).60;</div><div class='del'>-   blue_x  = (float).15;</div><div class='del'>-   blue_y  = (float).06;</div><div class='del'>-#endif</div><div class='add'>+#  ifdef PNG_gAMA_SUPPORTED</div><div class='add'>+   png_set_gAMA_fixed(png_ptr, info_ptr, 45455L);</div><div class='add'>+#  endif</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+#  ifdef PNG_cHRM_SUPPORTED</div><div class='ctx'>    png_set_cHRM_fixed(png_ptr, info_ptr,</div><div class='del'>-       int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,</div><div class='del'>-       int_green_y, int_blue_x, int_blue_y);</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-   png_set_cHRM(png_ptr, info_ptr,</div><div class='del'>-       white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);</div><div class='del'>-#endif</div><div class='del'>-#endif /* cHRM */</div><div class='add'>+      /* color      x       y */</div><div class='add'>+      /* white */ 31270L, 32900L,</div><div class='add'>+      /* red   */ 64000L, 33000L,</div><div class='add'>+      /* green */ 30000L, 60000L,</div><div class='add'>+      /* blue  */ 15000L,  6000L</div><div class='add'>+   );</div><div class='add'>+#  endif /* cHRM */</div><div class='ctx'> }</div><div class='ctx'> #endif /* sRGB */</div><div class='ctx'> </div><div class='hunk'>@@ -576,11 +564,11 @@ png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'> #ifdef PNG_iCCP_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_iCCP(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-             png_charp name, int compression_type,</div><div class='del'>-             png_charp profile, png_uint_32 proflen)</div><div class='add'>+    png_const_charp name, int compression_type,</div><div class='add'>+    png_const_bytep profile, png_uint_32 proflen)</div><div class='ctx'> {</div><div class='ctx'>    png_charp new_iccp_name;</div><div class='del'>-   png_charp new_iccp_profile;</div><div class='add'>+   png_bytep new_iccp_profile;</div><div class='ctx'>    png_uint_32 length;</div><div class='ctx'> </div><div class='ctx'>    png_debug1(1, "in %s storage function", "iCCP");</div><div class='hunk'>@@ -590,13 +578,16 @@ png_set_iCCP(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'> </div><div class='ctx'>    length = png_strlen(name)+1;</div><div class='ctx'>    new_iccp_name = (png_charp)png_malloc_warn(png_ptr, length);</div><div class='add'>+</div><div class='ctx'>    if (new_iccp_name == NULL)</div><div class='ctx'>    {</div><div class='ctx'>         png_warning(png_ptr, "Insufficient memory to process iCCP chunk");</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    png_memcpy(new_iccp_name, name, length);</div><div class='del'>-   new_iccp_profile = (png_charp)png_malloc_warn(png_ptr, proflen);</div><div class='add'>+   new_iccp_profile = (png_bytep)png_malloc_warn(png_ptr, proflen);</div><div class='add'>+</div><div class='ctx'>    if (new_iccp_profile == NULL)</div><div class='ctx'>    {</div><div class='ctx'>       png_free (png_ptr, new_iccp_name);</div><div class='hunk'>@@ -604,6 +595,7 @@ png_set_iCCP(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>           "Insufficient memory to process iCCP profile");</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    png_memcpy(new_iccp_profile, profile, (png_size_t)proflen);</div><div class='ctx'> </div><div class='ctx'>    png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, 0);</div><div class='hunk'>@@ -622,24 +614,25 @@ png_set_iCCP(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_TEXT_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='del'>-png_set_text(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,</div><div class='del'>-             int num_text)</div><div class='add'>+png_set_text(png_structp png_ptr, png_infop info_ptr, png_const_textp text_ptr,</div><div class='add'>+    int num_text)</div><div class='ctx'> {</div><div class='ctx'>    int ret;</div><div class='ctx'>    ret = png_set_text_2(png_ptr, info_ptr, text_ptr, num_text);</div><div class='add'>+</div><div class='ctx'>    if (ret)</div><div class='ctx'>       png_error(png_ptr, "Insufficient memory to store text");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int /* PRIVATE */</div><div class='del'>-png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,</div><div class='del'>-               int num_text)</div><div class='add'>+png_set_text_2(png_structp png_ptr, png_infop info_ptr,</div><div class='add'>+    png_const_textp text_ptr, int num_text)</div><div class='ctx'> {</div><div class='ctx'>    int i;</div><div class='ctx'> </div><div class='ctx'>    png_debug1(1, "in %s storage function", ((png_ptr == NULL ||</div><div class='del'>-      png_ptr-&gt;chunk_name[0] == '\0') ?</div><div class='del'>-      "text" : (png_const_charp)png_ptr-&gt;chunk_name));</div><div class='add'>+       png_ptr-&gt;chunk_name[0] == '\0') ?</div><div class='add'>+       "text" : (png_const_charp)png_ptr-&gt;chunk_name));</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL || info_ptr == NULL || num_text == 0)</div><div class='ctx'>       return(0);</div><div class='hunk'>@@ -659,27 +652,31 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,</div><div class='ctx'>          old_text = info_ptr-&gt;text;</div><div class='ctx'>          info_ptr-&gt;text = (png_textp)png_malloc_warn(png_ptr,</div><div class='ctx'>             (png_size_t)(info_ptr-&gt;max_text * png_sizeof(png_text)));</div><div class='add'>+</div><div class='ctx'>          if (info_ptr-&gt;text == NULL)</div><div class='ctx'>          {</div><div class='ctx'>             png_free(png_ptr, old_text);</div><div class='ctx'>             return(1);</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          png_memcpy(info_ptr-&gt;text, old_text, (png_size_t)(old_max *</div><div class='del'>-            png_sizeof(png_text)));</div><div class='add'>+             png_sizeof(png_text)));</div><div class='ctx'>          png_free(png_ptr, old_text);</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          info_ptr-&gt;max_text = num_text + 8;</div><div class='ctx'>          info_ptr-&gt;num_text = 0;</div><div class='ctx'>          info_ptr-&gt;text = (png_textp)png_malloc_warn(png_ptr,</div><div class='del'>-            (png_size_t)(info_ptr-&gt;max_text * png_sizeof(png_text)));</div><div class='add'>+             (png_size_t)(info_ptr-&gt;max_text * png_sizeof(png_text)));</div><div class='ctx'>          if (info_ptr-&gt;text == NULL)</div><div class='ctx'>             return(1);</div><div class='ctx'>          info_ptr-&gt;free_me |= PNG_FREE_TEXT;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       png_debug1(3, "allocated %d entries for info_ptr-&gt;text",</div><div class='del'>-         info_ptr-&gt;max_text);</div><div class='add'>+          info_ptr-&gt;max_text);</div><div class='ctx'>    }</div><div class='ctx'>    for (i = 0; i &lt; num_text; i++)</div><div class='ctx'>    {</div><div class='hunk'>@@ -690,6 +687,13 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,</div><div class='ctx'>       if (text_ptr[i].key == NULL)</div><div class='ctx'>           continue;</div><div class='ctx'> </div><div class='add'>+      if (text_ptr[i].compression &lt; PNG_TEXT_COMPRESSION_NONE ||</div><div class='add'>+          text_ptr[i].compression &gt;= PNG_TEXT_COMPRESSION_LAST)</div><div class='add'>+      {</div><div class='add'>+         png_warning(png_ptr, "text compression mode is out of range");</div><div class='add'>+         continue;</div><div class='add'>+      }</div><div class='add'>+</div><div class='ctx'>       key_len = png_strlen(text_ptr[i].key);</div><div class='ctx'> </div><div class='ctx'>       if (text_ptr[i].compression &lt;= 0)</div><div class='hunk'>@@ -699,34 +703,38 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='ctx'>       else</div><div class='del'>-#ifdef PNG_iTXt_SUPPORTED</div><div class='add'>+#  ifdef PNG_iTXt_SUPPORTED</div><div class='ctx'>       {</div><div class='ctx'>          /* Set iTXt data */</div><div class='ctx'> </div><div class='ctx'>          if (text_ptr[i].lang != NULL)</div><div class='ctx'>             lang_len = png_strlen(text_ptr[i].lang);</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             lang_len = 0;</div><div class='add'>+</div><div class='ctx'>          if (text_ptr[i].lang_key != NULL)</div><div class='ctx'>             lang_key_len = png_strlen(text_ptr[i].lang_key);</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             lang_key_len = 0;</div><div class='ctx'>       }</div><div class='del'>-#else /* PNG_iTXt_SUPPORTED */</div><div class='add'>+#  else /* PNG_iTXt_SUPPORTED */</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr, "iTXt chunk not supported");</div><div class='ctx'>          continue;</div><div class='ctx'>       }</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'> </div><div class='ctx'>       if (text_ptr[i].text == NULL || text_ptr[i].text[0] == '\0')</div><div class='ctx'>       {</div><div class='ctx'>          text_length = 0;</div><div class='del'>-#ifdef PNG_iTXt_SUPPORTED</div><div class='add'>+#  ifdef PNG_iTXt_SUPPORTED</div><div class='ctx'>          if (text_ptr[i].compression &gt; 0)</div><div class='ctx'>             textp-&gt;compression = PNG_ITXT_COMPRESSION_NONE;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'>             textp-&gt;compression = PNG_TEXT_COMPRESSION_NONE;</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='hunk'>@@ -737,18 +745,20 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='ctx'>       textp-&gt;key = (png_charp)png_malloc_warn(png_ptr,</div><div class='del'>-         (png_size_t)</div><div class='del'>-         (key_len + text_length + lang_len + lang_key_len + 4));</div><div class='add'>+          (png_size_t)</div><div class='add'>+          (key_len + text_length + lang_len + lang_key_len + 4));</div><div class='add'>+</div><div class='ctx'>       if (textp-&gt;key == NULL)</div><div class='ctx'>          return(1);</div><div class='del'>-      png_debug2(2, "Allocated %lu bytes at %x in png_set_text",</div><div class='del'>-                 (unsigned long)(png_uint_32)</div><div class='del'>-                 (key_len + lang_len + lang_key_len + text_length + 4),</div><div class='del'>-                 (int)textp-&gt;key);</div><div class='add'>+</div><div class='add'>+      png_debug2(2, "Allocated %lu bytes at %p in png_set_text",</div><div class='add'>+          (unsigned long)(png_uint_32)</div><div class='add'>+          (key_len + lang_len + lang_key_len + text_length + 4),</div><div class='add'>+          textp-&gt;key);</div><div class='ctx'> </div><div class='ctx'>       png_memcpy(textp-&gt;key, text_ptr[i].key,(png_size_t)(key_len));</div><div class='ctx'>       *(textp-&gt;key + key_len) = '\0';</div><div class='del'>-#ifdef PNG_iTXt_SUPPORTED</div><div class='add'>+</div><div class='ctx'>       if (text_ptr[i].compression &gt; 0)</div><div class='ctx'>       {</div><div class='ctx'>          textp-&gt;lang = textp-&gt;key + key_len + 1;</div><div class='hunk'>@@ -759,35 +769,34 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,</div><div class='ctx'>          *(textp-&gt;lang_key + lang_key_len) = '\0';</div><div class='ctx'>          textp-&gt;text = textp-&gt;lang_key + lang_key_len + 1;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='del'>-#endif</div><div class='ctx'>       {</div><div class='del'>-#ifdef PNG_iTXt_SUPPORTED</div><div class='ctx'>          textp-&gt;lang=NULL;</div><div class='ctx'>          textp-&gt;lang_key=NULL;</div><div class='del'>-#endif</div><div class='ctx'>          textp-&gt;text = textp-&gt;key + key_len + 1;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       if (text_length)</div><div class='ctx'>          png_memcpy(textp-&gt;text, text_ptr[i].text,</div><div class='del'>-            (png_size_t)(text_length));</div><div class='add'>+             (png_size_t)(text_length));</div><div class='add'>+</div><div class='ctx'>       *(textp-&gt;text + text_length) = '\0';</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_iTXt_SUPPORTED</div><div class='add'>+#  ifdef PNG_iTXt_SUPPORTED</div><div class='ctx'>       if (textp-&gt;compression &gt; 0)</div><div class='ctx'>       {</div><div class='ctx'>          textp-&gt;text_length = 0;</div><div class='ctx'>          textp-&gt;itxt_length = text_length;</div><div class='ctx'>       }</div><div class='del'>-      else</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='add'>+      else</div><div class='add'>+#  endif</div><div class='ctx'>       {</div><div class='ctx'>          textp-&gt;text_length = text_length;</div><div class='del'>-#ifdef PNG_iTXt_SUPPORTED</div><div class='ctx'>          textp-&gt;itxt_length = 0;</div><div class='del'>-#endif</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       info_ptr-&gt;num_text++;</div><div class='ctx'>       png_debug1(3, "transferred text chunk %d", info_ptr-&gt;num_text);</div><div class='ctx'>    }</div><div class='hunk'>@@ -797,7 +806,7 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_tIME_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='del'>-png_set_tIME(png_structp png_ptr, png_infop info_ptr, png_timep mod_time)</div><div class='add'>+png_set_tIME(png_structp png_ptr, png_infop info_ptr, png_const_timep mod_time)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s storage function", "tIME");</div><div class='ctx'> </div><div class='hunk'>@@ -813,7 +822,7 @@ png_set_tIME(png_structp png_ptr, png_infop info_ptr, png_timep mod_time)</div><div class='ctx'> #ifdef PNG_tRNS_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_tRNS(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   png_bytep trans_alpha, int num_trans, png_color_16p trans_color)</div><div class='add'>+    png_const_bytep trans_alpha, int num_trans, png_const_color_16p trans_color)</div><div class='ctx'> {</div><div class='ctx'>    png_debug1(1, "in %s storage function", "tRNS");</div><div class='ctx'> </div><div class='hunk'>@@ -830,8 +839,9 @@ png_set_tRNS(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>        png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);</div><div class='ctx'> </div><div class='ctx'>        /* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */</div><div class='del'>-       png_ptr-&gt;trans_alpha = info_ptr-&gt;trans_alpha = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-           (png_size_t)PNG_MAX_PALETTE_LENGTH);</div><div class='add'>+       png_ptr-&gt;trans_alpha = info_ptr-&gt;trans_alpha =</div><div class='add'>+           (png_bytep)png_malloc(png_ptr, (png_size_t)PNG_MAX_PALETTE_LENGTH);</div><div class='add'>+</div><div class='ctx'>        if (num_trans &gt; 0 &amp;&amp; num_trans &lt;= PNG_MAX_PALETTE_LENGTH)</div><div class='ctx'>           png_memcpy(info_ptr-&gt;trans_alpha, trans_alpha, (png_size_t)num_trans);</div><div class='ctx'>    }</div><div class='hunk'>@@ -839,6 +849,7 @@ png_set_tRNS(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>    if (trans_color != NULL)</div><div class='ctx'>    {</div><div class='ctx'>       int sample_max = (1 &lt;&lt; info_ptr-&gt;bit_depth);</div><div class='add'>+</div><div class='ctx'>       if ((info_ptr-&gt;color_type == PNG_COLOR_TYPE_GRAY &amp;&amp;</div><div class='ctx'>           (int)trans_color-&gt;gray &gt; sample_max) ||</div><div class='ctx'>           (info_ptr-&gt;color_type == PNG_COLOR_TYPE_RGB &amp;&amp;</div><div class='hunk'>@@ -847,13 +858,16 @@ png_set_tRNS(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>           (int)trans_color-&gt;blue &gt; sample_max)))</div><div class='ctx'>          png_warning(png_ptr,</div><div class='ctx'>             "tRNS chunk has out-of-range samples for bit_depth");</div><div class='add'>+</div><div class='ctx'>       png_memcpy(&amp;(info_ptr-&gt;trans_color), trans_color,</div><div class='ctx'>          png_sizeof(png_color_16));</div><div class='add'>+</div><div class='ctx'>       if (num_trans == 0)</div><div class='ctx'>          num_trans = 1;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    info_ptr-&gt;num_trans = (png_uint_16)num_trans;</div><div class='add'>+</div><div class='ctx'>    if (num_trans != 0)</div><div class='ctx'>    {</div><div class='ctx'>       info_ptr-&gt;valid |= PNG_INFO_tRNS;</div><div class='hunk'>@@ -865,11 +879,12 @@ png_set_tRNS(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'> #ifdef PNG_sPLT_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_sPLT(png_structp png_ptr,</div><div class='del'>-             png_infop info_ptr, png_sPLT_tp entries, int nentries)</div><div class='add'>+    png_infop info_ptr, png_const_sPLT_tp entries, int nentries)</div><div class='ctx'> /*</div><div class='ctx'>  *  entries        - array of png_sPLT_t structures</div><div class='ctx'>  *                   to be added to the list of palettes</div><div class='ctx'>  *                   in the info structure.</div><div class='add'>+ *</div><div class='ctx'>  *  nentries       - number of palette structures to be</div><div class='ctx'>  *                   added.</div><div class='ctx'>  */</div><div class='hunk'>@@ -882,7 +897,8 @@ png_set_sPLT(png_structp png_ptr,</div><div class='ctx'> </div><div class='ctx'>    np = (png_sPLT_tp)png_malloc_warn(png_ptr,</div><div class='ctx'>        (info_ptr-&gt;splt_palettes_num + nentries) *</div><div class='del'>-        (png_size_t)png_sizeof(png_sPLT_t));</div><div class='add'>+       (png_size_t)png_sizeof(png_sPLT_t));</div><div class='add'>+</div><div class='ctx'>    if (np == NULL)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "No memory for sPLT palettes");</div><div class='hunk'>@@ -891,36 +907,42 @@ png_set_sPLT(png_structp png_ptr,</div><div class='ctx'> </div><div class='ctx'>    png_memcpy(np, info_ptr-&gt;splt_palettes,</div><div class='ctx'>        info_ptr-&gt;splt_palettes_num * png_sizeof(png_sPLT_t));</div><div class='add'>+</div><div class='ctx'>    png_free(png_ptr, info_ptr-&gt;splt_palettes);</div><div class='ctx'>    info_ptr-&gt;splt_palettes=NULL;</div><div class='ctx'> </div><div class='ctx'>    for (i = 0; i &lt; nentries; i++)</div><div class='ctx'>    {</div><div class='ctx'>       png_sPLT_tp to = np + info_ptr-&gt;splt_palettes_num + i;</div><div class='del'>-      png_sPLT_tp from = entries + i;</div><div class='add'>+      png_const_sPLT_tp from = entries + i;</div><div class='ctx'>       png_uint_32 length;</div><div class='ctx'> </div><div class='ctx'>       length = png_strlen(from-&gt;name) + 1;</div><div class='ctx'>       to-&gt;name = (png_charp)png_malloc_warn(png_ptr, (png_size_t)length);</div><div class='add'>+</div><div class='ctx'>       if (to-&gt;name == NULL)</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr,</div><div class='del'>-           "Out of memory while processing sPLT chunk");</div><div class='add'>+             "Out of memory while processing sPLT chunk");</div><div class='ctx'>          continue;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       png_memcpy(to-&gt;name, from-&gt;name, length);</div><div class='ctx'>       to-&gt;entries = (png_sPLT_entryp)png_malloc_warn(png_ptr,</div><div class='ctx'>           (png_size_t)(from-&gt;nentries * png_sizeof(png_sPLT_entry)));</div><div class='add'>+</div><div class='ctx'>       if (to-&gt;entries == NULL)</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr,</div><div class='del'>-           "Out of memory while processing sPLT chunk");</div><div class='add'>+             "Out of memory while processing sPLT chunk");</div><div class='ctx'>          png_free(png_ptr, to-&gt;name);</div><div class='ctx'>          to-&gt;name = NULL;</div><div class='ctx'>          continue;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       png_memcpy(to-&gt;entries, from-&gt;entries,</div><div class='ctx'>           from-&gt;nentries * png_sizeof(png_sPLT_entry));</div><div class='add'>+</div><div class='ctx'>       to-&gt;nentries = from-&gt;nentries;</div><div class='ctx'>       to-&gt;depth = from-&gt;depth;</div><div class='ctx'>    }</div><div class='hunk'>@@ -935,7 +957,7 @@ png_set_sPLT(png_structp png_ptr,</div><div class='ctx'> #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_unknown_chunks(png_structp png_ptr,</div><div class='del'>-   png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns)</div><div class='add'>+   png_infop info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns)</div><div class='ctx'> {</div><div class='ctx'>    png_unknown_chunkp np;</div><div class='ctx'>    int i;</div><div class='hunk'>@@ -944,8 +966,9 @@ png_set_unknown_chunks(png_structp png_ptr,</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='ctx'>    np = (png_unknown_chunkp)png_malloc_warn(png_ptr,</div><div class='del'>-       (png_size_t)((info_ptr-&gt;unknown_chunks_num + num_unknowns) *</div><div class='del'>-       png_sizeof(png_unknown_chunk)));</div><div class='add'>+       (png_size_t)(info_ptr-&gt;unknown_chunks_num + num_unknowns) *</div><div class='add'>+       png_sizeof(png_unknown_chunk));</div><div class='add'>+</div><div class='ctx'>    if (np == NULL)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr,</div><div class='hunk'>@@ -954,34 +977,39 @@ png_set_unknown_chunks(png_structp png_ptr,</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_memcpy(np, info_ptr-&gt;unknown_chunks,</div><div class='del'>-       info_ptr-&gt;unknown_chunks_num * png_sizeof(png_unknown_chunk));</div><div class='add'>+       (png_size_t)info_ptr-&gt;unknown_chunks_num *</div><div class='add'>+       png_sizeof(png_unknown_chunk));</div><div class='add'>+</div><div class='ctx'>    png_free(png_ptr, info_ptr-&gt;unknown_chunks);</div><div class='ctx'>    info_ptr-&gt;unknown_chunks = NULL;</div><div class='ctx'> </div><div class='ctx'>    for (i = 0; i &lt; num_unknowns; i++)</div><div class='ctx'>    {</div><div class='ctx'>       png_unknown_chunkp to = np + info_ptr-&gt;unknown_chunks_num + i;</div><div class='del'>-      png_unknown_chunkp from = unknowns + i;</div><div class='add'>+      png_const_unknown_chunkp from = unknowns + i;</div><div class='ctx'> </div><div class='del'>-      png_memcpy((png_charp)to-&gt;name, (png_charp)from-&gt;name,</div><div class='del'>-          png_sizeof(from-&gt;name));</div><div class='add'>+      png_memcpy(to-&gt;name, from-&gt;name, png_sizeof(from-&gt;name));</div><div class='ctx'>       to-&gt;name[png_sizeof(to-&gt;name)-1] = '\0';</div><div class='ctx'>       to-&gt;size = from-&gt;size;</div><div class='add'>+</div><div class='ctx'>       /* Note our location in the read or write sequence */</div><div class='ctx'>       to-&gt;location = (png_byte)(png_ptr-&gt;mode &amp; 0xff);</div><div class='ctx'> </div><div class='ctx'>       if (from-&gt;size == 0)</div><div class='ctx'>          to-&gt;data=NULL;</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          to-&gt;data = (png_bytep)png_malloc_warn(png_ptr,</div><div class='del'>-           (png_size_t)from-&gt;size);</div><div class='add'>+             (png_size_t)from-&gt;size);</div><div class='add'>+</div><div class='ctx'>          if (to-&gt;data == NULL)</div><div class='ctx'>          {</div><div class='ctx'>             png_warning(png_ptr,</div><div class='del'>-             "Out of memory while processing unknown chunk");</div><div class='add'>+                "Out of memory while processing unknown chunk");</div><div class='ctx'>             to-&gt;size = 0;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             png_memcpy(to-&gt;data, from-&gt;data, from-&gt;size);</div><div class='ctx'>       }</div><div class='hunk'>@@ -991,12 +1019,13 @@ png_set_unknown_chunks(png_structp png_ptr,</div><div class='ctx'>    info_ptr-&gt;unknown_chunks_num += num_unknowns;</div><div class='ctx'>    info_ptr-&gt;free_me |= PNG_FREE_UNKN;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_unknown_chunk_location(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-   int chunk, int location)</div><div class='add'>+    int chunk, int location)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; info_ptr != NULL &amp;&amp; chunk &gt;= 0 &amp;&amp; chunk &lt;</div><div class='del'>-       (int)info_ptr-&gt;unknown_chunks_num)</div><div class='add'>+       info_ptr-&gt;unknown_chunks_num)</div><div class='ctx'>       info_ptr-&gt;unknown_chunks[chunk].location = (png_byte)location;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1010,40 +1039,48 @@ png_permit_mng_features (png_structp png_ptr, png_uint_32 mng_features)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return (png_uint_32)0;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;mng_features_permitted =</div><div class='del'>-     (png_byte)(mng_features &amp; PNG_ALL_MNG_FEATURES);</div><div class='add'>+       (png_byte)(mng_features &amp; PNG_ALL_MNG_FEATURES);</div><div class='add'>+</div><div class='ctx'>    return (png_uint_32)png_ptr-&gt;mng_features_permitted;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='del'>-png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_bytep</div><div class='del'>-   chunk_list, int num_chunks)</div><div class='add'>+png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_const_bytep</div><div class='add'>+    chunk_list, int num_chunks)</div><div class='ctx'> {</div><div class='ctx'>    png_bytep new_list, p;</div><div class='ctx'>    int i, old_num_chunks;</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    if (num_chunks == 0)</div><div class='ctx'>    {</div><div class='ctx'>       if (keep == PNG_HANDLE_CHUNK_ALWAYS || keep == PNG_HANDLE_CHUNK_IF_SAFE)</div><div class='ctx'>          png_ptr-&gt;flags |= PNG_FLAG_KEEP_UNKNOWN_CHUNKS;</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>          png_ptr-&gt;flags &amp;= ~PNG_FLAG_KEEP_UNKNOWN_CHUNKS;</div><div class='ctx'> </div><div class='ctx'>       if (keep == PNG_HANDLE_CHUNK_ALWAYS)</div><div class='ctx'>          png_ptr-&gt;flags |= PNG_FLAG_KEEP_UNSAFE_CHUNKS;</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>          png_ptr-&gt;flags &amp;= ~PNG_FLAG_KEEP_UNSAFE_CHUNKS;</div><div class='add'>+</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (chunk_list == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    old_num_chunks = png_ptr-&gt;num_chunk_list;</div><div class='ctx'>    new_list=(png_bytep)png_malloc(png_ptr,</div><div class='del'>-      (png_size_t)</div><div class='del'>-       (5*(num_chunks + old_num_chunks)));</div><div class='add'>+       (png_size_t)(5*(num_chunks + old_num_chunks)));</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;chunk_list != NULL)</div><div class='ctx'>    {</div><div class='ctx'>       png_memcpy(new_list, png_ptr-&gt;chunk_list,</div><div class='hunk'>@@ -1051,10 +1088,13 @@ png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_bytep</div><div class='ctx'>       png_free(png_ptr, png_ptr-&gt;chunk_list);</div><div class='ctx'>       png_ptr-&gt;chunk_list=NULL;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    png_memcpy(new_list + 5*old_num_chunks, chunk_list,</div><div class='ctx'>        (png_size_t)(5*num_chunks));</div><div class='add'>+</div><div class='ctx'>    for (p = new_list + 5*old_num_chunks + 4, i = 0; i&lt;num_chunks; i++, p += 5)</div><div class='ctx'>       *p=(png_byte)keep;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;num_chunk_list = old_num_chunks + num_chunks;</div><div class='ctx'>    png_ptr-&gt;chunk_list = new_list;</div><div class='ctx'>    png_ptr-&gt;free_me |= PNG_FREE_LIST;</div><div class='hunk'>@@ -1064,7 +1104,7 @@ png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_bytep</div><div class='ctx'> #ifdef PNG_READ_USER_CHUNKS_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_read_user_chunk_fn(png_structp png_ptr, png_voidp user_chunk_ptr,</div><div class='del'>-   png_user_chunk_ptr read_user_chunk_fn)</div><div class='add'>+    png_user_chunk_ptr read_user_chunk_fn)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_set_read_user_chunk_fn");</div><div class='ctx'> </div><div class='hunk'>@@ -1087,26 +1127,41 @@ png_set_rows(png_structp png_ptr, png_infop info_ptr, png_bytepp row_pointers)</div><div class='ctx'> </div><div class='ctx'>    if (info_ptr-&gt;row_pointers &amp;&amp; (info_ptr-&gt;row_pointers != row_pointers))</div><div class='ctx'>       png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);</div><div class='add'>+</div><div class='ctx'>    info_ptr-&gt;row_pointers = row_pointers;</div><div class='add'>+</div><div class='ctx'>    if (row_pointers)</div><div class='ctx'>       info_ptr-&gt;valid |= PNG_INFO_IDAT;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_WRITE_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='del'>-png_set_compression_buffer_size(png_structp png_ptr,</div><div class='del'>-    png_size_t size)</div><div class='add'>+png_set_compression_buffer_size(png_structp png_ptr, png_size_t size)</div><div class='ctx'> {</div><div class='ctx'>     if (png_ptr == NULL)</div><div class='ctx'>        return;</div><div class='add'>+</div><div class='ctx'>     png_free(png_ptr, png_ptr-&gt;zbuf);</div><div class='del'>-    png_ptr-&gt;zbuf_size = size;</div><div class='add'>+</div><div class='add'>+    if (size &gt; ZLIB_IO_MAX)</div><div class='add'>+    {</div><div class='add'>+       png_warning(png_ptr, "Attempt to set buffer size beyond max ignored");</div><div class='add'>+       png_ptr-&gt;zbuf_size = ZLIB_IO_MAX;</div><div class='add'>+       size = ZLIB_IO_MAX; /* must fit */</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    else</div><div class='add'>+       png_ptr-&gt;zbuf_size = (uInt)size;</div><div class='add'>+</div><div class='ctx'>     png_ptr-&gt;zbuf = (png_bytep)png_malloc(png_ptr, size);</div><div class='add'>+</div><div class='add'>+    /* The following ensures a relatively safe failure if this gets called while</div><div class='add'>+     * the buffer is actually in use.</div><div class='add'>+     */</div><div class='ctx'>     png_ptr-&gt;zstream.next_out = png_ptr-&gt;zbuf;</div><div class='del'>-    png_ptr-&gt;zstream.avail_out = (uInt)png_ptr-&gt;zbuf_size;</div><div class='add'>+    png_ptr-&gt;zstream.avail_out = 0;</div><div class='add'>+    png_ptr-&gt;zstream.avail_in = 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask)</div><div class='hunk'>@@ -1129,21 +1184,27 @@ png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max,</div><div class='ctx'>     */</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;user_width_max = user_width_max;</div><div class='ctx'>    png_ptr-&gt;user_height_max = user_height_max;</div><div class='ctx'> }</div><div class='add'>+</div><div class='ctx'> /* This function was added to libpng 1.4.0 */</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_chunk_cache_max (png_structp png_ptr,</div><div class='ctx'>    png_uint_32 user_chunk_cache_max)</div><div class='ctx'> {</div><div class='del'>-    if (png_ptr == NULL)</div><div class='del'>-      return;</div><div class='del'>-    png_ptr-&gt;user_chunk_cache_max = user_chunk_cache_max;</div><div class='del'>-    if (user_chunk_cache_max == 0x7fffffffL)  /* Unlimited */</div><div class='del'>-       png_ptr-&gt;user_chunk_cache_max = 0;</div><div class='del'>-    else</div><div class='del'>-       png_ptr-&gt;user_chunk_cache_max = user_chunk_cache_max + 1;</div><div class='add'>+    if (png_ptr)</div><div class='add'>+       png_ptr-&gt;user_chunk_cache_max = user_chunk_cache_max;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function was added to libpng 1.4.1 */</div><div class='add'>+void PNGAPI</div><div class='add'>+png_set_chunk_malloc_max (png_structp png_ptr,</div><div class='add'>+    png_alloc_size_t user_chunk_malloc_max)</div><div class='add'>+{</div><div class='add'>+   if (png_ptr)</div><div class='add'>+      png_ptr-&gt;user_chunk_malloc_max = user_chunk_malloc_max;</div><div class='ctx'> }</div><div class='ctx'> #endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */</div><div class='ctx'> </div><div class='hunk'>@@ -1156,6 +1217,7 @@ png_set_benign_errors(png_structp png_ptr, int allowed)</div><div class='ctx'> </div><div class='ctx'>    if (allowed)</div><div class='ctx'>       png_ptr-&gt;flags |= PNG_FLAG_BENIGN_ERRORS_WARN;</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       png_ptr-&gt;flags &amp;= ~PNG_FLAG_BENIGN_ERRORS_WARN;</div><div class='ctx'> }</div><div class='head'>diff --git a/src/3rdparty/libpng/pngstruct.h b/src/3rdparty/libpng/pngstruct.h<br/>new file mode 100644<br/>index 0000000..8d781fa<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngstruct.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngstruct.h</a></div><div class='hunk'>@@ -0,0 +1,308 @@</div><div class='add'>+</div><div class='add'>+/* pngstruct.h - header file for PNG reference library</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='add'>+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='add'>+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='add'>+ *</div><div class='add'>+ * Last changed in libpng 1.5.0 [January 6, 2011]</div><div class='add'>+ *</div><div class='add'>+ * This code is released under the libpng license.</div><div class='add'>+ * For conditions of distribution and use, see the disclaimer</div><div class='add'>+ * and license in png.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* The structure that holds the information to read and write PNG files.</div><div class='add'>+ * The only people who need to care about what is inside of this are the</div><div class='add'>+ * people who will be modifying the library for their own special needs.</div><div class='add'>+ * It should NOT be accessed directly by an application.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef PNGSTRUCT_H</div><div class='add'>+#define PNGSTRUCT_H</div><div class='add'>+/* zlib.h defines the structure z_stream, an instance of which is included</div><div class='add'>+ * in this structure and is required for decompressing the LZ compressed</div><div class='add'>+ * data in PNG files.</div><div class='add'>+ */</div><div class='add'>+#include "zlib.h"</div><div class='add'>+</div><div class='add'>+struct png_struct_def</div><div class='add'>+{</div><div class='add'>+#ifdef PNG_SETJMP_SUPPORTED</div><div class='add'>+   jmp_buf png_jmpbuf;            /* used in png_error */</div><div class='add'>+   png_longjmp_ptr longjmp_fn;/* setjmp non-local goto function. */</div><div class='add'>+#endif</div><div class='add'>+   png_error_ptr error_fn;    /* function for printing errors and aborting */</div><div class='add'>+   png_error_ptr warning_fn;  /* function for printing warnings */</div><div class='add'>+   png_voidp error_ptr;       /* user supplied struct for error functions */</div><div class='add'>+   png_rw_ptr write_data_fn;  /* function for writing output data */</div><div class='add'>+   png_rw_ptr read_data_fn;   /* function for reading input data */</div><div class='add'>+   png_voidp io_ptr;          /* ptr to application struct for I/O functions */</div><div class='add'>+</div><div class='add'>+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED</div><div class='add'>+   png_user_transform_ptr read_user_transform_fn; /* user read transform */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED</div><div class='add'>+   png_user_transform_ptr write_user_transform_fn; /* user write transform */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* These were added in libpng-1.0.2 */</div><div class='add'>+#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED</div><div class='add'>+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \</div><div class='add'>+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)</div><div class='add'>+   png_voidp user_transform_ptr; /* user supplied struct for user transform */</div><div class='add'>+   png_byte user_transform_depth;    /* bit depth of user transformed pixels */</div><div class='add'>+   png_byte user_transform_channels; /* channels in user transformed pixels */</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+   png_uint_32 mode;          /* tells us where we are in the PNG file */</div><div class='add'>+   png_uint_32 flags;         /* flags indicating various things to libpng */</div><div class='add'>+   png_uint_32 transformations; /* which transformations to perform */</div><div class='add'>+</div><div class='add'>+   z_stream zstream;          /* pointer to decompression structure (below) */</div><div class='add'>+   png_bytep zbuf;            /* buffer for zlib */</div><div class='add'>+   uInt zbuf_size;            /* size of zbuf (typically 65536) */</div><div class='add'>+   int zlib_level;            /* holds zlib compression level */</div><div class='add'>+   int zlib_method;           /* holds zlib compression method */</div><div class='add'>+   int zlib_window_bits;      /* holds zlib compression window bits */</div><div class='add'>+   int zlib_mem_level;        /* holds zlib compression memory level */</div><div class='add'>+   int zlib_strategy;         /* holds zlib compression strategy */</div><div class='add'>+</div><div class='add'>+   png_uint_32 width;         /* width of image in pixels */</div><div class='add'>+   png_uint_32 height;        /* height of image in pixels */</div><div class='add'>+   png_uint_32 num_rows;      /* number of rows in current pass */</div><div class='add'>+   png_uint_32 usr_width;     /* width of row at start of write */</div><div class='add'>+   png_size_t rowbytes;       /* size of row in bytes */</div><div class='add'>+   png_uint_32 iwidth;        /* width of current interlaced row in pixels */</div><div class='add'>+   png_uint_32 row_number;    /* current row in interlace pass */</div><div class='add'>+   png_bytep prev_row;        /* buffer to save previous (unfiltered) row */</div><div class='add'>+   png_bytep row_buf;         /* buffer to save current (unfiltered) row */</div><div class='add'>+   png_bytep sub_row;         /* buffer to save "sub" row when filtering */</div><div class='add'>+   png_bytep up_row;          /* buffer to save "up" row when filtering */</div><div class='add'>+   png_bytep avg_row;         /* buffer to save "avg" row when filtering */</div><div class='add'>+   png_bytep paeth_row;       /* buffer to save "Paeth" row when filtering */</div><div class='add'>+   png_row_info row_info;     /* used for transformation routines */</div><div class='add'>+</div><div class='add'>+   png_uint_32 idat_size;     /* current IDAT size for read */</div><div class='add'>+   png_uint_32 crc;           /* current chunk CRC value */</div><div class='add'>+   png_colorp palette;        /* palette from the input file */</div><div class='add'>+   png_uint_16 num_palette;   /* number of color entries in palette */</div><div class='add'>+   png_uint_16 num_trans;     /* number of transparency values */</div><div class='add'>+   png_byte chunk_name[5];    /* null-terminated name of current chunk */</div><div class='add'>+   png_byte compression;      /* file compression type (always 0) */</div><div class='add'>+   png_byte filter;           /* file filter type (always 0) */</div><div class='add'>+   png_byte interlaced;       /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */</div><div class='add'>+   png_byte pass;             /* current interlace pass (0 - 6) */</div><div class='add'>+   png_byte do_filter;        /* row filter flags (see PNG_FILTER_ below ) */</div><div class='add'>+   png_byte color_type;       /* color type of file */</div><div class='add'>+   png_byte bit_depth;        /* bit depth of file */</div><div class='add'>+   png_byte usr_bit_depth;    /* bit depth of users row */</div><div class='add'>+   png_byte pixel_depth;      /* number of bits per pixel */</div><div class='add'>+   png_byte channels;         /* number of channels in file */</div><div class='add'>+   png_byte usr_channels;     /* channels at start of write */</div><div class='add'>+   png_byte sig_bytes;        /* magic bytes read/written from start of file */</div><div class='add'>+</div><div class='add'>+#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)</div><div class='add'>+   png_uint_16 filler;           /* filler bytes for pixel expansion */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_bKGD_SUPPORTED</div><div class='add'>+   png_byte background_gamma_type;</div><div class='add'>+   png_fixed_point background_gamma;</div><div class='add'>+   png_color_16 background;   /* background color in screen gamma space */</div><div class='add'>+#ifdef PNG_READ_GAMMA_SUPPORTED</div><div class='add'>+   png_color_16 background_1; /* background normalized to gamma 1.0 */</div><div class='add'>+#endif</div><div class='add'>+#endif /* PNG_bKGD_SUPPORTED */</div><div class='add'>+</div><div class='add'>+#ifdef PNG_WRITE_FLUSH_SUPPORTED</div><div class='add'>+   png_flush_ptr output_flush_fn; /* Function for flushing output */</div><div class='add'>+   png_uint_32 flush_dist;    /* how many rows apart to flush, 0 - no flush */</div><div class='add'>+   png_uint_32 flush_rows;    /* number of rows written since last flush */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)</div><div class='add'>+   int gamma_shift;      /* number of "insignificant" bits in 16-bit gamma */</div><div class='add'>+   png_fixed_point gamma;        /* file gamma value */</div><div class='add'>+   png_fixed_point screen_gamma; /* screen gamma value (display_exponent) */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)</div><div class='add'>+   png_bytep gamma_table;     /* gamma table for 8-bit depth files */</div><div class='add'>+   png_bytep gamma_from_1;    /* converts from 1.0 to screen */</div><div class='add'>+   png_bytep gamma_to_1;      /* converts from file to 1.0 */</div><div class='add'>+   png_uint_16pp gamma_16_table; /* gamma table for 16-bit depth files */</div><div class='add'>+   png_uint_16pp gamma_16_from_1; /* converts from 1.0 to screen */</div><div class='add'>+   png_uint_16pp gamma_16_to_1; /* converts from file to 1.0 */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_sBIT_SUPPORTED)</div><div class='add'>+   png_color_8 sig_bit;       /* significant bits in each available channel */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)</div><div class='add'>+   png_color_8 shift;         /* shift for significant bit tranformation */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) \</div><div class='add'>+ || defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)</div><div class='add'>+   png_bytep trans_alpha;           /* alpha values for paletted files */</div><div class='add'>+   png_color_16 trans_color;  /* transparent color for non-paletted files */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+   png_read_status_ptr read_row_fn;   /* called after each row is decoded */</div><div class='add'>+   png_write_status_ptr write_row_fn; /* called after each row is encoded */</div><div class='add'>+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED</div><div class='add'>+   png_progressive_info_ptr info_fn; /* called after header data fully read */</div><div class='add'>+   png_progressive_row_ptr row_fn;   /* called after a prog. row is decoded */</div><div class='add'>+   png_progressive_end_ptr end_fn;   /* called after image is complete */</div><div class='add'>+   png_bytep save_buffer_ptr;        /* current location in save_buffer */</div><div class='add'>+   png_bytep save_buffer;            /* buffer for previously read data */</div><div class='add'>+   png_bytep current_buffer_ptr;     /* current location in current_buffer */</div><div class='add'>+   png_bytep current_buffer;         /* buffer for recently used data */</div><div class='add'>+   png_uint_32 push_length;          /* size of current input chunk */</div><div class='add'>+   png_uint_32 skip_length;          /* bytes to skip in input data */</div><div class='add'>+   png_size_t save_buffer_size;      /* amount of data now in save_buffer */</div><div class='add'>+   png_size_t save_buffer_max;       /* total size of save_buffer */</div><div class='add'>+   png_size_t buffer_size;           /* total amount of available input data */</div><div class='add'>+   png_size_t current_buffer_size;   /* amount of data now in current_buffer */</div><div class='add'>+   int process_mode;                 /* what push library is currently doing */</div><div class='add'>+   int cur_palette;                  /* current push library palette index */</div><div class='add'>+</div><div class='add'>+#  ifdef PNG_TEXT_SUPPORTED</div><div class='add'>+     png_size_t current_text_size;   /* current size of text input data */</div><div class='add'>+     png_size_t current_text_left;   /* how much text left to read in input */</div><div class='add'>+     png_charp current_text;         /* current text chunk buffer */</div><div class='add'>+     png_charp current_text_ptr;     /* current location in current_text */</div><div class='add'>+#  endif /* PNG_PROGRESSIVE_READ_SUPPORTED &amp;&amp; PNG_TEXT_SUPPORTED */</div><div class='add'>+</div><div class='add'>+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */</div><div class='add'>+</div><div class='add'>+#if defined(__TURBOC__) &amp;&amp; !defined(_Windows) &amp;&amp; !defined(__FLAT__)</div><div class='add'>+/* For the Borland special 64K segment handler */</div><div class='add'>+   png_bytepp offset_table_ptr;</div><div class='add'>+   png_bytep offset_table;</div><div class='add'>+   png_uint_16 offset_table_number;</div><div class='add'>+   png_uint_16 offset_table_count;</div><div class='add'>+   png_uint_16 offset_table_count_free;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_READ_QUANTIZE_SUPPORTED</div><div class='add'>+   png_bytep palette_lookup; /* lookup table for quantizing */</div><div class='add'>+   png_bytep quantize_index; /* index translation for palette files */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(PNG_READ_QUANTIZE_SUPPORTED) || defined(PNG_hIST_SUPPORTED)</div><div class='add'>+   png_uint_16p hist;                /* histogram */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED</div><div class='add'>+   png_byte heuristic_method;        /* heuristic for row filter selection */</div><div class='add'>+   png_byte num_prev_filters;        /* number of weights for previous rows */</div><div class='add'>+   png_bytep prev_filters;           /* filter type(s) of previous row(s) */</div><div class='add'>+   png_uint_16p filter_weights;      /* weight(s) for previous line(s) */</div><div class='add'>+   png_uint_16p inv_filter_weights;  /* 1/weight(s) for previous line(s) */</div><div class='add'>+   png_uint_16p filter_costs;        /* relative filter calculation cost */</div><div class='add'>+   png_uint_16p inv_filter_costs;    /* 1/relative filter calculation cost */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_TIME_RFC1123_SUPPORTED</div><div class='add'>+   png_charp time_buffer; /* String to hold RFC 1123 time text */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* New members added in libpng-1.0.6 */</div><div class='add'>+</div><div class='add'>+   png_uint_32 free_me;    /* flags items libpng is responsible for freeing */</div><div class='add'>+</div><div class='add'>+#ifdef PNG_USER_CHUNKS_SUPPORTED</div><div class='add'>+   png_voidp user_chunk_ptr;</div><div class='add'>+   png_user_chunk_ptr read_user_chunk_fn; /* user read chunk handler */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='add'>+   int num_chunk_list;</div><div class='add'>+   png_bytep chunk_list;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* New members added in libpng-1.0.3 */</div><div class='add'>+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED</div><div class='add'>+   png_byte rgb_to_gray_status;</div><div class='add'>+   /* These were changed from png_byte in libpng-1.0.6 */</div><div class='add'>+   png_uint_16 rgb_to_gray_red_coeff;</div><div class='add'>+   png_uint_16 rgb_to_gray_green_coeff;</div><div class='add'>+   png_uint_16 rgb_to_gray_blue_coeff;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* New member added in libpng-1.0.4 (renamed in 1.0.9) */</div><div class='add'>+#if defined(PNG_MNG_FEATURES_SUPPORTED) || \</div><div class='add'>+    defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \</div><div class='add'>+    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)</div><div class='add'>+/* Changed from png_byte to png_uint_32 at version 1.2.0 */</div><div class='add'>+   png_uint_32 mng_features_permitted;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* New member added in libpng-1.0.9, ifdef'ed out in 1.0.12, enabled in 1.2.0 */</div><div class='add'>+#ifdef PNG_MNG_FEATURES_SUPPORTED</div><div class='add'>+   png_byte filter_type;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* New members added in libpng-1.2.0 */</div><div class='add'>+</div><div class='add'>+/* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */</div><div class='add'>+#ifdef PNG_USER_MEM_SUPPORTED</div><div class='add'>+   png_voidp mem_ptr;             /* user supplied struct for mem functions */</div><div class='add'>+   png_malloc_ptr malloc_fn;      /* function for allocating memory */</div><div class='add'>+   png_free_ptr free_fn;          /* function for freeing memory */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* New member added in libpng-1.0.13 and 1.2.0 */</div><div class='add'>+   png_bytep big_row_buf;         /* buffer to save current (unfiltered) row */</div><div class='add'>+</div><div class='add'>+#ifdef PNG_READ_QUANTIZE_SUPPORTED</div><div class='add'>+/* The following three members were added at version 1.0.14 and 1.2.4 */</div><div class='add'>+   png_bytep quantize_sort;          /* working sort array */</div><div class='add'>+   png_bytep index_to_palette;       /* where the original index currently is</div><div class='add'>+                                        in the palette */</div><div class='add'>+   png_bytep palette_to_index;       /* which original index points to this</div><div class='add'>+                                         palette color */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* New members added in libpng-1.0.16 and 1.2.6 */</div><div class='add'>+   png_byte compression_type;</div><div class='add'>+</div><div class='add'>+#ifdef PNG_USER_LIMITS_SUPPORTED</div><div class='add'>+   png_uint_32 user_width_max;</div><div class='add'>+   png_uint_32 user_height_max;</div><div class='add'>+</div><div class='add'>+   /* Added in libpng-1.4.0: Total number of sPLT, text, and unknown</div><div class='add'>+    * chunks that can be stored (0 means unlimited).</div><div class='add'>+    */</div><div class='add'>+   png_uint_32 user_chunk_cache_max;</div><div class='add'>+</div><div class='add'>+   /* Total memory that a zTXt, sPLT, iTXt, iCCP, or unknown chunk</div><div class='add'>+    * can occupy when decompressed.  0 means unlimited.</div><div class='add'>+    */</div><div class='add'>+   png_alloc_size_t user_chunk_malloc_max;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* New member added in libpng-1.0.25 and 1.2.17 */</div><div class='add'>+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED</div><div class='add'>+   /* Storage for unknown chunk that the library doesn't recognize. */</div><div class='add'>+   png_unknown_chunk unknown_chunk;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* New members added in libpng-1.2.26 */</div><div class='add'>+  png_size_t old_big_row_buf_size;</div><div class='add'>+  png_size_t old_prev_row_size;</div><div class='add'>+</div><div class='add'>+/* New member added in libpng-1.2.30 */</div><div class='add'>+  png_charp chunkdata;  /* buffer for reading chunk data */</div><div class='add'>+</div><div class='add'>+#ifdef PNG_IO_STATE_SUPPORTED</div><div class='add'>+/* New member added in libpng-1.4.0 */</div><div class='add'>+   png_uint_32 io_state;</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+#endif /* PNGSTRUCT_H */</div><div class='head'>diff --git a/src/3rdparty/libpng/pngtest.c b/src/3rdparty/libpng/pngtest.c<br/>index 4b70404..cbb7eb2 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngtest.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngtest.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngtest.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngtest.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> </div><div class='ctx'> /* pngtest.c - a simple test program to test libpng</div><div class='ctx'>  *</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Last changed in libpng 1.5.0 [January 6, 2011]</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -31,26 +31,51 @@</div><div class='ctx'>  * of files at once by typing "pngtest -m file1.png file2.png ..."</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include "zlib.h"</div><div class='ctx'> #include "png.h"</div><div class='del'>-#include "pngpriv.h"</div><div class='del'>-</div><div class='add'>+/* Copied from pngpriv.h but only used in error messages below. */</div><div class='add'>+#ifndef PNG_ZBUF_SIZE</div><div class='add'>+#  define PNG_ZBUF_SIZE 8192</div><div class='add'>+#endif</div><div class='ctx'> #  include &lt;stdio.h&gt;</div><div class='ctx'> #  include &lt;stdlib.h&gt;</div><div class='add'>+#  include &lt;string.h&gt;</div><div class='ctx'> #  define FCLOSE(file) fclose(file)</div><div class='ctx'> </div><div class='ctx'> #ifndef PNG_STDIO_SUPPORTED</div><div class='del'>-     typedef FILE                * png_FILE_p;</div><div class='add'>+typedef FILE                * png_FILE_p;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* Makes pngtest verbose so we can find problems (needs to be before png.h) */</div><div class='add'>+/* Makes pngtest verbose so we can find problems. */</div><div class='ctx'> #ifndef PNG_DEBUG</div><div class='ctx'> #  define PNG_DEBUG 0</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if PNG_DEBUG &gt; 1</div><div class='add'>+#  define pngtest_debug(m)        ((void)fprintf(stderr, m "\n"))</div><div class='add'>+#  define pngtest_debug1(m,p1)    ((void)fprintf(stderr, m "\n", p1))</div><div class='add'>+#  define pngtest_debug2(m,p1,p2) ((void)fprintf(stderr, m "\n", p1, p2))</div><div class='add'>+#else</div><div class='add'>+#  define pngtest_debug(m)        ((void)0)</div><div class='add'>+#  define pngtest_debug1(m,p1)    ((void)0)</div><div class='add'>+#  define pngtest_debug2(m,p1,p2) ((void)0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if !PNG_DEBUG</div><div class='ctx'> #  define SINGLE_ROWBUF_ALLOC  /* Makes buffer overruns easier to nail */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/* The code uses memcmp and memcpy on large objects (typically row pointers) so</div><div class='add'>+ * it is necessary to do soemthing special on certain architectures, note that</div><div class='add'>+ * the actual support for this was effectively removed in 1.4, so only the</div><div class='add'>+ * memory remains in this program:</div><div class='add'>+ */</div><div class='add'>+#define CVT_PTR(ptr)         (ptr)</div><div class='add'>+#define CVT_PTR_NOCHECK(ptr) (ptr)</div><div class='add'>+#define png_memcmp  memcmp</div><div class='add'>+#define png_memcpy  memcpy</div><div class='add'>+#define png_memset  memset</div><div class='add'>+</div><div class='ctx'> /* Turn on CPU timing</div><div class='ctx'> #define PNGTEST_TIMING</div><div class='ctx'> */</div><div class='hunk'>@@ -82,11 +107,6 @@ int test_one_file PNGARG((PNG_CONST char *inname, PNG_CONST char *outname));</div><div class='ctx'> /*  #define STDERR stderr  */</div><div class='ctx'> #define STDERR stdout   /* For DOS */</div><div class='ctx'> </div><div class='del'>-/* In case a system header (e.g., on AIX) defined jmpbuf */</div><div class='del'>-#ifdef jmpbuf</div><div class='del'>-#  undef jmpbuf</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng */</div><div class='ctx'> #ifndef png_jmpbuf</div><div class='ctx'> #  define png_jmpbuf(png_ptr) png_ptr-&gt;jmpbuf</div><div class='hunk'>@@ -97,35 +117,40 @@ static int status_pass = 1;</div><div class='ctx'> static int status_dots_requested = 0;</div><div class='ctx'> static int status_dots = 1;</div><div class='ctx'> </div><div class='del'>-void</div><div class='add'>+void PNGCBAPI</div><div class='ctx'> read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);</div><div class='del'>-void</div><div class='add'>+void PNGCBAPI</div><div class='ctx'> read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL || row_number &gt; PNG_UINT_31_MAX)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    if (status_pass != pass)</div><div class='ctx'>    {</div><div class='ctx'>       fprintf(stdout, "\n Pass %d: ", pass);</div><div class='ctx'>       status_pass = pass;</div><div class='ctx'>       status_dots = 31;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    status_dots--;</div><div class='add'>+</div><div class='ctx'>    if (status_dots == 0)</div><div class='ctx'>    {</div><div class='ctx'>       fprintf(stdout, "\n         ");</div><div class='ctx'>       status_dots=30;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    fprintf(stdout, "r");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void</div><div class='add'>+void PNGCBAPI</div><div class='ctx'> write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);</div><div class='del'>-void</div><div class='add'>+void PNGCBAPI</div><div class='ctx'> write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL || row_number &gt; PNG_UINT_31_MAX || pass &gt; 7)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    fprintf(stdout, "w");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -136,9 +161,9 @@ write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)</div><div class='ctx'>  * 5 in case illegal filter values are present.)</div><div class='ctx'>  */</div><div class='ctx'> static png_uint_32 filters_used[256];</div><div class='del'>-void</div><div class='add'>+void PNGCBAPI</div><div class='ctx'> count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data);</div><div class='del'>-void</div><div class='add'>+void PNGCBAPI</div><div class='ctx'> count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr != NULL &amp;&amp; row_info != NULL)</div><div class='hunk'>@@ -153,13 +178,14 @@ count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data)</div><div class='ctx'> </div><div class='ctx'> static png_uint_32 zero_samples;</div><div class='ctx'> </div><div class='del'>-void</div><div class='add'>+void PNGCBAPI</div><div class='ctx'> count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data);</div><div class='del'>-void</div><div class='add'>+void PNGCBAPI</div><div class='ctx'> count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)</div><div class='ctx'> {</div><div class='ctx'>    png_bytep dp = data;</div><div class='del'>-   if (png_ptr == NULL)return;</div><div class='add'>+   if (png_ptr == NULL)</div><div class='add'>+      return;</div><div class='ctx'> </div><div class='ctx'>    /* Contents of row_info:</div><div class='ctx'>     *  png_uint_32 width      width of row</div><div class='hunk'>@@ -176,41 +202,49 @@ count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)</div><div class='ctx'>     {</div><div class='ctx'>        int pos = 0;</div><div class='ctx'>        png_uint_32 n, nstop;</div><div class='add'>+</div><div class='ctx'>        for (n = 0, nstop=row_info-&gt;width; n&lt;nstop; n++)</div><div class='ctx'>        {</div><div class='ctx'>           if (row_info-&gt;bit_depth == 1)</div><div class='ctx'>           {</div><div class='ctx'>              if (((*dp &lt;&lt; pos++ ) &amp; 0x80) == 0)</div><div class='ctx'>                 zero_samples++;</div><div class='add'>+</div><div class='ctx'>              if (pos == 8)</div><div class='ctx'>              {</div><div class='ctx'>                 pos = 0;</div><div class='ctx'>                 dp++;</div><div class='ctx'>              }</div><div class='ctx'>           }</div><div class='add'>+</div><div class='ctx'>           if (row_info-&gt;bit_depth == 2)</div><div class='ctx'>           {</div><div class='ctx'>              if (((*dp &lt;&lt; (pos+=2)) &amp; 0xc0) == 0)</div><div class='ctx'>                 zero_samples++;</div><div class='add'>+</div><div class='ctx'>              if (pos == 8)</div><div class='ctx'>              {</div><div class='ctx'>                 pos = 0;</div><div class='ctx'>                 dp++;</div><div class='ctx'>              }</div><div class='ctx'>           }</div><div class='add'>+</div><div class='ctx'>           if (row_info-&gt;bit_depth == 4)</div><div class='ctx'>           {</div><div class='ctx'>              if (((*dp &lt;&lt; (pos+=4)) &amp; 0xf0) == 0)</div><div class='ctx'>                 zero_samples++;</div><div class='add'>+</div><div class='ctx'>              if (pos == 8)</div><div class='ctx'>              {</div><div class='ctx'>                 pos = 0;</div><div class='ctx'>                 dp++;</div><div class='ctx'>              }</div><div class='ctx'>           }</div><div class='add'>+</div><div class='ctx'>           if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>              if (*dp++ == 0)</div><div class='ctx'>                 zero_samples++;</div><div class='add'>+</div><div class='ctx'>           if (row_info-&gt;bit_depth == 16)</div><div class='ctx'>           {</div><div class='ctx'>              if ((*dp | *(dp+1)) == 0)</div><div class='hunk'>@@ -233,10 +267,12 @@ count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)</div><div class='ctx'>              if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>                 if (*dp++ == 0)</div><div class='ctx'>                    zero_samples++;</div><div class='add'>+</div><div class='ctx'>              if (row_info-&gt;bit_depth == 16)</div><div class='ctx'>              {</div><div class='ctx'>                 if ((*dp | *(dp+1)) == 0)</div><div class='ctx'>                    zero_samples++;</div><div class='add'>+</div><div class='ctx'>                 dp+=2;</div><div class='ctx'>              }</div><div class='ctx'>           }</div><div class='hunk'>@@ -263,8 +299,50 @@ static int wrote_question = 0;</div><div class='ctx'>  * than changing the library.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_IO_STATE_SUPPORTED</div><div class='add'>+void</div><div class='add'>+pngtest_check_io_state(png_structp png_ptr, png_size_t data_length,</div><div class='add'>+   png_uint_32 io_op);</div><div class='add'>+void</div><div class='add'>+pngtest_check_io_state(png_structp png_ptr, png_size_t data_length,</div><div class='add'>+   png_uint_32 io_op)</div><div class='add'>+{</div><div class='add'>+   png_uint_32 io_state = png_get_io_state(png_ptr);</div><div class='add'>+   int err = 0;</div><div class='add'>+</div><div class='add'>+   /* Check if the current operation (reading / writing) is as expected. */</div><div class='add'>+   if ((io_state &amp; PNG_IO_MASK_OP) != io_op)</div><div class='add'>+      png_error(png_ptr, "Incorrect operation in I/O state");</div><div class='add'>+</div><div class='add'>+   /* Check if the buffer size specific to the current location</div><div class='add'>+    * (file signature / header / data / crc) is as expected.</div><div class='add'>+    */</div><div class='add'>+   switch (io_state &amp; PNG_IO_MASK_LOC)</div><div class='add'>+   {</div><div class='add'>+   case PNG_IO_SIGNATURE:</div><div class='add'>+      if (data_length &gt; 8)</div><div class='add'>+         err = 1;</div><div class='add'>+      break;</div><div class='add'>+   case PNG_IO_CHUNK_HDR:</div><div class='add'>+      if (data_length != 8)</div><div class='add'>+         err = 1;</div><div class='add'>+      break;</div><div class='add'>+   case PNG_IO_CHUNK_DATA:</div><div class='add'>+      break;  /* no restrictions here */</div><div class='add'>+   case PNG_IO_CHUNK_CRC:</div><div class='add'>+      if (data_length != 4)</div><div class='add'>+         err = 1;</div><div class='add'>+      break;</div><div class='add'>+   default:</div><div class='add'>+      err = 1;  /* uninitialized */</div><div class='add'>+   }</div><div class='add'>+   if (err)</div><div class='add'>+      png_error(png_ptr, "Bad I/O state or buffer size");</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef USE_FAR_KEYWORD</div><div class='del'>-static void</div><div class='add'>+static void PNGCBAPI</div><div class='ctx'> pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> {</div><div class='ctx'>    png_size_t check = 0;</div><div class='hunk'>@@ -281,8 +359,12 @@ pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> </div><div class='ctx'>    if (check != length)</div><div class='ctx'>    {</div><div class='del'>-      png_error(png_ptr, "Read Error!");</div><div class='add'>+      png_error(png_ptr, "Read Error");</div><div class='ctx'>    }</div><div class='add'>+</div><div class='add'>+#ifdef PNG_IO_STATE_SUPPORTED</div><div class='add'>+   pngtest_check_io_state(png_ptr, length, PNG_IO_READING);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> /* This is the model-independent version. Since the standard I/O library</div><div class='hunk'>@@ -293,7 +375,7 @@ pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> #define NEAR_BUF_SIZE 1024</div><div class='ctx'> #define MIN(a,b) (a &lt;= b ? a : b)</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static void PNGCBAPI</div><div class='ctx'> pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> {</div><div class='ctx'>    png_size_t check;</div><div class='hunk'>@@ -302,7 +384,7 @@ pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> </div><div class='ctx'>    /* Check if data really is near. If so, use usual code. */</div><div class='ctx'>    n_data = (png_byte *)CVT_PTR_NOCHECK(data);</div><div class='del'>-   io_ptr = (png_FILE_p)CVT_PTR(png_ptr-&gt;io_ptr);</div><div class='add'>+   io_ptr = (png_FILE_p)CVT_PTR(png_get_io_ptr(png_ptr));</div><div class='ctx'>    if ((png_bytep)n_data == data)</div><div class='ctx'>    {</div><div class='ctx'>       check = fread(n_data, 1, length, io_ptr);</div><div class='hunk'>@@ -313,6 +395,7 @@ pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'>       png_size_t read, remaining, err;</div><div class='ctx'>       check = 0;</div><div class='ctx'>       remaining = length;</div><div class='add'>+</div><div class='ctx'>       do</div><div class='ctx'>       {</div><div class='ctx'>          read = MIN(NEAR_BUF_SIZE, remaining);</div><div class='hunk'>@@ -327,17 +410,22 @@ pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'>       }</div><div class='ctx'>       while (remaining != 0);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (check != length)</div><div class='del'>-      png_error(png_ptr, "read Error");</div><div class='add'>+      png_error(png_ptr, "Read Error");</div><div class='add'>+</div><div class='add'>+#ifdef PNG_IO_STATE_SUPPORTED</div><div class='add'>+   pngtest_check_io_state(png_ptr, length, PNG_IO_READING);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> #endif /* USE_FAR_KEYWORD */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_FLUSH_SUPPORTED</div><div class='del'>-static void</div><div class='add'>+static void PNGCBAPI</div><div class='ctx'> pngtest_flush(png_structp png_ptr)</div><div class='ctx'> {</div><div class='ctx'>    /* Do nothing; fflush() is said to be just a waste of energy. */</div><div class='del'>-   png_ptr = png_ptr;  /* Stifle compiler warning */</div><div class='add'>+   PNG_UNUSED(png_ptr)   /* Stifle compiler warning */</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -347,16 +435,21 @@ pngtest_flush(png_structp png_ptr)</div><div class='ctx'>  * than changing the library.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef USE_FAR_KEYWORD</div><div class='del'>-static void</div><div class='add'>+static void PNGCBAPI</div><div class='ctx'> pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> {</div><div class='ctx'>    png_size_t check;</div><div class='ctx'> </div><div class='del'>-   check = fwrite(data, 1, length, (png_FILE_p)png_ptr-&gt;io_ptr);</div><div class='add'>+   check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr));</div><div class='add'>+</div><div class='ctx'>    if (check != length)</div><div class='ctx'>    {</div><div class='ctx'>       png_error(png_ptr, "Write Error");</div><div class='ctx'>    }</div><div class='add'>+</div><div class='add'>+#ifdef PNG_IO_STATE_SUPPORTED</div><div class='add'>+   pngtest_check_io_state(png_ptr, length, PNG_IO_WRITING);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> /* This is the model-independent version. Since the standard I/O library</div><div class='hunk'>@@ -367,7 +460,7 @@ pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> #define NEAR_BUF_SIZE 1024</div><div class='ctx'> #define MIN(a,b) (a &lt;= b ? a : b)</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static void PNGCBAPI</div><div class='ctx'> pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> {</div><div class='ctx'>    png_size_t check;</div><div class='hunk'>@@ -376,17 +469,20 @@ pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> </div><div class='ctx'>    /* Check if data really is near. If so, use usual code. */</div><div class='ctx'>    near_data = (png_byte *)CVT_PTR_NOCHECK(data);</div><div class='del'>-   io_ptr = (png_FILE_p)CVT_PTR(png_ptr-&gt;io_ptr);</div><div class='add'>+   io_ptr = (png_FILE_p)CVT_PTR(png_get_io_ptr(png_ptr));</div><div class='add'>+</div><div class='ctx'>    if ((png_bytep)near_data == data)</div><div class='ctx'>    {</div><div class='ctx'>       check = fwrite(near_data, 1, length, io_ptr);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='ctx'>       png_byte buf[NEAR_BUF_SIZE];</div><div class='ctx'>       png_size_t written, remaining, err;</div><div class='ctx'>       check = 0;</div><div class='ctx'>       remaining = length;</div><div class='add'>+</div><div class='ctx'>       do</div><div class='ctx'>       {</div><div class='ctx'>          written = MIN(NEAR_BUF_SIZE, remaining);</div><div class='hunk'>@@ -401,10 +497,15 @@ pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'>       }</div><div class='ctx'>       while (remaining != 0);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (check != length)</div><div class='ctx'>    {</div><div class='ctx'>       png_error(png_ptr, "Write Error");</div><div class='ctx'>    }</div><div class='add'>+</div><div class='add'>+#ifdef PNG_IO_STATE_SUPPORTED</div><div class='add'>+   pngtest_check_io_state(png_ptr, length, PNG_IO_WRITING);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> #endif /* USE_FAR_KEYWORD */</div><div class='ctx'> </div><div class='hunk'>@@ -413,14 +514,16 @@ pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'>  * here if you don't want to.  In the default configuration, png_ptr is</div><div class='ctx'>  * not used, but it is passed in case it may be useful.</div><div class='ctx'>  */</div><div class='del'>-static void</div><div class='add'>+static void PNGCBAPI</div><div class='ctx'> pngtest_warning(png_structp png_ptr, png_const_charp message)</div><div class='ctx'> {</div><div class='ctx'>    PNG_CONST char *name = "UNKNOWN (ERROR!)";</div><div class='ctx'>    char *test;</div><div class='ctx'>    test = png_get_error_ptr(png_ptr);</div><div class='add'>+</div><div class='ctx'>    if (test == NULL)</div><div class='ctx'>      fprintf(STDERR, "%s: libpng warning: %s\n", name, message);</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>      fprintf(STDERR, "%s: libpng warning: %s\n", test, message);</div><div class='ctx'> }</div><div class='hunk'>@@ -430,7 +533,7 @@ pngtest_warning(png_structp png_ptr, png_const_charp message)</div><div class='ctx'>  * function is used by default, or if the program supplies NULL for the</div><div class='ctx'>  * error function pointer in png_set_error_fn().</div><div class='ctx'>  */</div><div class='del'>-static void</div><div class='add'>+static void PNGCBAPI</div><div class='ctx'> pngtest_error(png_structp png_ptr, png_const_charp message)</div><div class='ctx'> {</div><div class='ctx'>    pngtest_warning(png_ptr, message);</div><div class='hunk'>@@ -467,12 +570,12 @@ static int maximum_allocation = 0;</div><div class='ctx'> static int total_allocation = 0;</div><div class='ctx'> static int num_allocations = 0;</div><div class='ctx'> </div><div class='del'>-png_voidp png_debug_malloc</div><div class='del'>-   PNGARG((png_structp png_ptr, png_alloc_size_t size));</div><div class='del'>-void png_debug_free PNGARG((png_structp png_ptr, png_voidp ptr));</div><div class='add'>+png_voidp PNGCBAPI png_debug_malloc PNGARG((png_structp png_ptr,</div><div class='add'>+    png_alloc_size_t size));</div><div class='add'>+void PNGCBAPI png_debug_free PNGARG((png_structp png_ptr, png_voidp ptr));</div><div class='ctx'> </div><div class='ctx'> png_voidp</div><div class='del'>-png_debug_malloc(png_structp png_ptr, png_alloc_size_t size)</div><div class='add'>+PNGCBAPI png_debug_malloc(png_structp png_ptr, png_alloc_size_t size)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'>    /* png_malloc has already tested for NULL; png_create_struct calls</div><div class='hunk'>@@ -494,12 +597,16 @@ png_debug_malloc(png_structp png_ptr, png_alloc_size_t size)</div><div class='ctx'>       current_allocation += size;</div><div class='ctx'>       total_allocation += size;</div><div class='ctx'>       num_allocations ++;</div><div class='add'>+</div><div class='ctx'>       if (current_allocation &gt; maximum_allocation)</div><div class='ctx'>          maximum_allocation = current_allocation;</div><div class='add'>+</div><div class='ctx'>       pinfo-&gt;pointer = png_malloc(png_ptr, size);</div><div class='ctx'>       /* Restore malloc_fn and free_fn */</div><div class='add'>+</div><div class='ctx'>       png_set_mem_fn(png_ptr,</div><div class='ctx'>           NULL, png_debug_malloc, png_debug_free);</div><div class='add'>+</div><div class='ctx'>       if (size != 0 &amp;&amp; pinfo-&gt;pointer == NULL)</div><div class='ctx'>       {</div><div class='ctx'>          current_allocation -= size;</div><div class='hunk'>@@ -507,23 +614,27 @@ png_debug_malloc(png_structp png_ptr, png_alloc_size_t size)</div><div class='ctx'>          png_error(png_ptr,</div><div class='ctx'>            "out of memory in pngtest-&gt;png_debug_malloc");</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       pinfo-&gt;next = pinformation;</div><div class='ctx'>       pinformation = pinfo;</div><div class='ctx'>       /* Make sure the caller isn't assuming zeroed memory. */</div><div class='ctx'>       png_memset(pinfo-&gt;pointer, 0xdd, pinfo-&gt;size);</div><div class='add'>+</div><div class='ctx'>       if (verbose)</div><div class='del'>-         printf("png_malloc %lu bytes at %x\n", (unsigned long)size,</div><div class='add'>+         printf("png_malloc %lu bytes at %p\n", (unsigned long)size,</div><div class='ctx'>             pinfo-&gt;pointer);</div><div class='add'>+</div><div class='ctx'>       return (png_voidp)(pinfo-&gt;pointer);</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Free a pointer.  It is removed from the list at the same time. */</div><div class='del'>-void</div><div class='add'>+void PNGCBAPI</div><div class='ctx'> png_debug_free(png_structp png_ptr, png_voidp ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       fprintf(STDERR, "NULL pointer to png_debug_free.\n");</div><div class='add'>+</div><div class='ctx'>    if (ptr == 0)</div><div class='ctx'>    {</div><div class='ctx'> #if 0 /* This happens all the time. */</div><div class='hunk'>@@ -535,9 +646,11 @@ png_debug_free(png_structp png_ptr, png_voidp ptr)</div><div class='ctx'>    /* Unlink the element from the list. */</div><div class='ctx'>    {</div><div class='ctx'>       memory_infop FAR *ppinfo = &amp;pinformation;</div><div class='add'>+</div><div class='ctx'>       for (;;)</div><div class='ctx'>       {</div><div class='ctx'>          memory_infop pinfo = *ppinfo;</div><div class='add'>+</div><div class='ctx'>          if (pinfo-&gt;pointer == ptr)</div><div class='ctx'>          {</div><div class='ctx'>             *ppinfo = pinfo-&gt;next;</div><div class='hunk'>@@ -551,18 +664,21 @@ png_debug_free(png_structp png_ptr, png_voidp ptr)</div><div class='ctx'>             pinfo = NULL;</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          if (pinfo-&gt;next == NULL)</div><div class='ctx'>          {</div><div class='ctx'>             fprintf(STDERR, "Pointer %x not found\n", (unsigned int)ptr);</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          ppinfo = &amp;pinfo-&gt;next;</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    /* Finally free the data. */</div><div class='ctx'>    if (verbose)</div><div class='del'>-      printf("Freeing %x\n", ptr);</div><div class='add'>+      printf("Freeing %p\n", ptr);</div><div class='add'>+</div><div class='ctx'>    png_free_default(png_ptr, ptr);</div><div class='ctx'>    ptr = NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -584,7 +700,7 @@ static png_uint_32 user_chunk_data[4];</div><div class='ctx'>      * 3: vpAg units</div><div class='ctx'>      */</div><div class='ctx'> </div><div class='del'>-static int read_user_chunk_callback(png_struct *png_ptr,</div><div class='add'>+static int PNGCBAPI read_user_chunk_callback(png_struct *png_ptr,</div><div class='ctx'>    png_unknown_chunkp chunk)</div><div class='ctx'> {</div><div class='ctx'>    png_uint_32</div><div class='hunk'>@@ -609,8 +725,10 @@ static int read_user_chunk_callback(png_struct *png_ptr,</div><div class='ctx'>          /* Found sTER chunk */</div><div class='ctx'>          if (chunk-&gt;size != 1)</div><div class='ctx'>             return (-1); /* Error return */</div><div class='add'>+</div><div class='ctx'>          if (chunk-&gt;data[0] != 0 &amp;&amp; chunk-&gt;data[0] != 1)</div><div class='ctx'>             return (-1);  /* Invalid mode */</div><div class='add'>+</div><div class='ctx'>          my_user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);</div><div class='ctx'>          my_user_chunk_data[0]=chunk-&gt;data[0]+1;</div><div class='ctx'>          return (1);</div><div class='hunk'>@@ -661,7 +779,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>    int bit_depth, color_type;</div><div class='ctx'> #ifdef PNG_SETJMP_SUPPORTED</div><div class='ctx'> #ifdef USE_FAR_KEYWORD</div><div class='del'>-   jmp_buf jmpbuf;</div><div class='add'>+   jmp_buf png_jmpbuf;</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -682,12 +800,11 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>       return (1);</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-   png_debug(0, "Allocating read and write structures");</div><div class='add'>+   pngtest_debug("Allocating read and write structures");</div><div class='ctx'> #if defined(PNG_USER_MEM_SUPPORTED) &amp;&amp; PNG_DEBUG</div><div class='ctx'>    read_ptr =</div><div class='ctx'>       png_create_read_struct_2(PNG_LIBPNG_VER_STRING, NULL,</div><div class='del'>-      NULL, NULL, NULL,</div><div class='del'>-      (png_malloc_ptr)png_debug_malloc, (png_free_ptr)png_debug_free);</div><div class='add'>+      NULL, NULL, NULL, png_debug_malloc, png_debug_free);</div><div class='ctx'> #else</div><div class='ctx'>    read_ptr =</div><div class='ctx'>       png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);</div><div class='hunk'>@@ -720,7 +837,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>        pngtest_warning);</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='del'>-   png_debug(0, "Allocating read_info, write_info and end_info structures");</div><div class='add'>+   pngtest_debug("Allocating read_info, write_info and end_info structures");</div><div class='ctx'>    read_info_ptr = png_create_info_struct(read_ptr);</div><div class='ctx'>    end_info_ptr = png_create_info_struct(read_ptr);</div><div class='ctx'> #ifdef PNG_WRITE_SUPPORTED</div><div class='hunk'>@@ -729,9 +846,9 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_SETJMP_SUPPORTED</div><div class='del'>-   png_debug(0, "Setting jmpbuf for read struct");</div><div class='add'>+   pngtest_debug("Setting jmpbuf for read struct");</div><div class='ctx'> #ifdef USE_FAR_KEYWORD</div><div class='del'>-   if (setjmp(jmpbuf))</div><div class='add'>+   if (setjmp(png_jmpbuf))</div><div class='ctx'> #else</div><div class='ctx'>    if (setjmp(png_jmpbuf(read_ptr)))</div><div class='ctx'> #endif</div><div class='hunk'>@@ -749,13 +866,14 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>       return (1);</div><div class='ctx'>    }</div><div class='ctx'> #ifdef USE_FAR_KEYWORD</div><div class='del'>-   png_memcpy(png_jmpbuf(read_ptr), jmpbuf, png_sizeof(jmp_buf));</div><div class='add'>+   png_memcpy(png_jmpbuf(read_ptr), png_jmpbuf, png_sizeof(jmp_buf));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_SUPPORTED</div><div class='del'>-   png_debug(0, "Setting jmpbuf for write struct");</div><div class='add'>+   pngtest_debug("Setting jmpbuf for write struct");</div><div class='ctx'> #ifdef USE_FAR_KEYWORD</div><div class='del'>-   if (setjmp(jmpbuf))</div><div class='add'>+</div><div class='add'>+   if (setjmp(png_jmpbuf))</div><div class='ctx'> #else</div><div class='ctx'>    if (setjmp(png_jmpbuf(write_ptr)))</div><div class='ctx'> #endif</div><div class='hunk'>@@ -770,13 +888,14 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>       FCLOSE(fpout);</div><div class='ctx'>       return (1);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'> #ifdef USE_FAR_KEYWORD</div><div class='del'>-   png_memcpy(png_jmpbuf(write_ptr), jmpbuf, png_sizeof(jmp_buf));</div><div class='add'>+   png_memcpy(png_jmpbuf(write_ptr), png_jmpbuf, png_sizeof(jmp_buf));</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-   png_debug(0, "Initializing input and output streams");</div><div class='add'>+   pngtest_debug("Initializing input and output streams");</div><div class='ctx'> #ifdef PNG_STDIO_SUPPORTED</div><div class='ctx'>    png_init_io(read_ptr, fpin);</div><div class='ctx'> #  ifdef PNG_WRITE_SUPPORTED</div><div class='hunk'>@@ -793,6 +912,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'> #    endif</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'>    if (status_dots_requested == 1)</div><div class='ctx'>    {</div><div class='ctx'> #ifdef PNG_WRITE_SUPPORTED</div><div class='hunk'>@@ -800,6 +920,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'> #endif</div><div class='ctx'>       png_set_read_status_fn(read_ptr, read_row_callback);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='ctx'> #ifdef PNG_WRITE_SUPPORTED</div><div class='hunk'>@@ -811,8 +932,10 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'> #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED</div><div class='ctx'>    {</div><div class='ctx'>       int i;</div><div class='add'>+</div><div class='ctx'>       for (i = 0; i&lt;256; i++)</div><div class='ctx'>          filters_used[i] = 0;</div><div class='add'>+</div><div class='ctx'>       png_set_read_user_transform_fn(read_ptr, count_filters);</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -836,10 +959,10 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>       NULL, 0);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-   png_debug(0, "Reading info struct");</div><div class='add'>+   pngtest_debug("Reading info struct");</div><div class='ctx'>    png_read_info(read_ptr, read_info_ptr);</div><div class='ctx'> </div><div class='del'>-   png_debug(0, "Transferring info struct");</div><div class='add'>+   pngtest_debug("Transferring info struct");</div><div class='ctx'>    {</div><div class='ctx'>       int interlace_type, compression_type, filter_type;</div><div class='ctx'> </div><div class='hunk'>@@ -859,8 +982,9 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>    {</div><div class='ctx'>       png_fixed_point white_x, white_y, red_x, red_y, green_x, green_y, blue_x,</div><div class='ctx'>          blue_y;</div><div class='del'>-      if (png_get_cHRM_fixed(read_ptr, read_info_ptr, &amp;white_x, &amp;white_y, &amp;red_x,</div><div class='del'>-         &amp;red_y, &amp;green_x, &amp;green_y, &amp;blue_x, &amp;blue_y))</div><div class='add'>+</div><div class='add'>+      if (png_get_cHRM_fixed(read_ptr, read_info_ptr, &amp;white_x, &amp;white_y,</div><div class='add'>+         &amp;red_x, &amp;red_y, &amp;green_x, &amp;green_y, &amp;blue_x, &amp;blue_y))</div><div class='ctx'>       {</div><div class='ctx'>          png_set_cHRM_fixed(write_ptr, write_info_ptr, white_x, white_y, red_x,</div><div class='ctx'>             red_y, green_x, green_y, blue_x, blue_y);</div><div class='hunk'>@@ -881,6 +1005,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>    {</div><div class='ctx'>       double white_x, white_y, red_x, red_y, green_x, green_y, blue_x,</div><div class='ctx'>          blue_y;</div><div class='add'>+</div><div class='ctx'>       if (png_get_cHRM(read_ptr, read_info_ptr, &amp;white_x, &amp;white_y, &amp;red_x,</div><div class='ctx'>          &amp;red_y, &amp;green_x, &amp;green_y, &amp;blue_x, &amp;blue_y))</div><div class='ctx'>       {</div><div class='hunk'>@@ -902,7 +1027,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'> #ifdef PNG_iCCP_SUPPORTED</div><div class='ctx'>    {</div><div class='ctx'>       png_charp name;</div><div class='del'>-      png_charp profile;</div><div class='add'>+      png_bytep profile;</div><div class='ctx'>       png_uint_32 proflen;</div><div class='ctx'>       int compression_type;</div><div class='ctx'> </div><div class='hunk'>@@ -1012,7 +1137,8 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>       if (png_get_sCAL_s(read_ptr, read_info_ptr, &amp;unit, &amp;scal_width,</div><div class='ctx'>           &amp;scal_height))</div><div class='ctx'>       {</div><div class='del'>-         png_set_sCAL_s(write_ptr, write_info_ptr, unit, scal_width, scal_height);</div><div class='add'>+         png_set_sCAL_s(write_ptr, write_info_ptr, unit, scal_width,</div><div class='add'>+             scal_height);</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1025,7 +1151,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'> </div><div class='ctx'>       if (png_get_text(read_ptr, read_info_ptr, &amp;text_ptr, &amp;num_text) &gt; 0)</div><div class='ctx'>       {</div><div class='del'>-         png_debug1(0, "Handling %d iTXt/tEXt/zTXt chunks", num_text);</div><div class='add'>+         pngtest_debug1("Handling %d iTXt/tEXt/zTXt chunks", num_text);</div><div class='ctx'>          png_set_text(write_ptr, write_info_ptr, text_ptr, num_text);</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='hunk'>@@ -1045,6 +1171,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>          png_memcpy(tIME_string,</div><div class='ctx'>                     png_convert_to_rfc1123(read_ptr, mod_time),</div><div class='ctx'>                     png_sizeof(tIME_string));</div><div class='add'>+</div><div class='ctx'>          tIME_string[png_sizeof(tIME_string) - 1] = '\0';</div><div class='ctx'>          tIME_chunk_present++;</div><div class='ctx'> #endif /* PNG_TIME_RFC1123_SUPPORTED */</div><div class='hunk'>@@ -1076,18 +1203,19 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'> #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED</div><div class='ctx'>    {</div><div class='ctx'>       png_unknown_chunkp unknowns;</div><div class='del'>-      int num_unknowns = (int)png_get_unknown_chunks(read_ptr, read_info_ptr,</div><div class='add'>+      int num_unknowns = png_get_unknown_chunks(read_ptr, read_info_ptr,</div><div class='ctx'>          &amp;unknowns);</div><div class='add'>+</div><div class='ctx'>       if (num_unknowns)</div><div class='ctx'>       {</div><div class='del'>-         png_size_t i;</div><div class='add'>+         int i;</div><div class='ctx'>          png_set_unknown_chunks(write_ptr, write_info_ptr, unknowns,</div><div class='ctx'>            num_unknowns);</div><div class='ctx'>          /* Copy the locations from the read_info_ptr.  The automatically</div><div class='ctx'>           * generated locations in write_info_ptr are wrong because we</div><div class='ctx'>           * haven't written anything yet.</div><div class='ctx'>           */</div><div class='del'>-         for (i = 0; i &lt; (png_size_t)num_unknowns; i++)</div><div class='add'>+         for (i = 0; i &lt; num_unknowns; i++)</div><div class='ctx'>            png_set_unknown_chunk_location(write_ptr, write_info_ptr, i,</div><div class='ctx'>              unknowns[i].location);</div><div class='ctx'>       }</div><div class='hunk'>@@ -1095,7 +1223,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_SUPPORTED</div><div class='del'>-   png_debug(0, "Writing info struct");</div><div class='add'>+   pngtest_debug("Writing info struct");</div><div class='ctx'> </div><div class='ctx'> /* If we wanted, we could write info in two steps:</div><div class='ctx'>  * png_write_info_before_PLTE(write_ptr, write_info_ptr);</div><div class='hunk'>@@ -1113,9 +1241,11 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>       if (verbose)</div><div class='ctx'>          fprintf(STDERR, "\n stereo mode = %lu\n",</div><div class='ctx'>            (unsigned long)(user_chunk_data[0] - 1));</div><div class='add'>+</div><div class='ctx'>       ster_chunk_data[0]=(unsigned char)(user_chunk_data[0] - 1);</div><div class='ctx'>       png_write_chunk(write_ptr, png_sTER, ster_chunk_data, 1);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (user_chunk_data[1] != 0 || user_chunk_data[2] != 0)</div><div class='ctx'>    {</div><div class='ctx'>       png_byte png_vpAg[5] = {118, 112,  65, 103, '\0'};</div><div class='hunk'>@@ -1128,6 +1258,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>            (unsigned long)user_chunk_data[1],</div><div class='ctx'>            (unsigned long)user_chunk_data[2],</div><div class='ctx'>            (unsigned long)user_chunk_data[3]);</div><div class='add'>+</div><div class='ctx'>       png_save_uint_32(vpag_chunk_data, user_chunk_data[1]);</div><div class='ctx'>       png_save_uint_32(vpag_chunk_data + 4, user_chunk_data[2]);</div><div class='ctx'>       vpag_chunk_data[8] = (unsigned char)(user_chunk_data[3] &amp; 0xff);</div><div class='hunk'>@@ -1138,12 +1269,13 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef SINGLE_ROWBUF_ALLOC</div><div class='del'>-   png_debug(0, "Allocating row buffer...");</div><div class='add'>+   pngtest_debug("Allocating row buffer...");</div><div class='ctx'>    row_buf = (png_bytep)png_malloc(read_ptr,</div><div class='ctx'>       png_get_rowbytes(read_ptr, read_info_ptr));</div><div class='del'>-   png_debug1(0, "0x%08lx", (unsigned long)row_buf);</div><div class='add'>+</div><div class='add'>+   pngtest_debug1("\t0x%08lx", (unsigned long)row_buf);</div><div class='ctx'> #endif /* SINGLE_ROWBUF_ALLOC */</div><div class='del'>-   png_debug(0, "Writing row data");</div><div class='add'>+   pngtest_debug("Writing row data");</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_INTERLACING_SUPPORTED) || \</div><div class='ctx'>   defined(PNG_WRITE_INTERLACING_SUPPORTED)</div><div class='hunk'>@@ -1162,15 +1294,17 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'> #endif</div><div class='ctx'>    for (pass = 0; pass &lt; num_pass; pass++)</div><div class='ctx'>    {</div><div class='del'>-      png_debug1(0, "Writing row data for pass %d", pass);</div><div class='add'>+      pngtest_debug1("Writing row data for pass %d", pass);</div><div class='ctx'>       for (y = 0; y &lt; height; y++)</div><div class='ctx'>       {</div><div class='ctx'> #ifndef SINGLE_ROWBUF_ALLOC</div><div class='del'>-         png_debug2(0, "Allocating row buffer (pass %d, y = %ld)...", pass, y);</div><div class='add'>+         pngtest_debug2("Allocating row buffer (pass %d, y = %u)...", pass, y);</div><div class='ctx'>          row_buf = (png_bytep)png_malloc(read_ptr,</div><div class='ctx'>             png_get_rowbytes(read_ptr, read_info_ptr));</div><div class='del'>-         png_debug2(0, "0x%08lx (%ld bytes)", (unsigned long)row_buf,</div><div class='add'>+</div><div class='add'>+         pngtest_debug2("\t0x%08lx (%u bytes)", (unsigned long)row_buf,</div><div class='ctx'>             png_get_rowbytes(read_ptr, read_info_ptr));</div><div class='add'>+</div><div class='ctx'> #endif /* !SINGLE_ROWBUF_ALLOC */</div><div class='ctx'>          png_read_rows(read_ptr, (png_bytepp)&amp;row_buf, NULL, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -1189,7 +1323,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'> #endif /* PNG_WRITE_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> #ifndef SINGLE_ROWBUF_ALLOC</div><div class='del'>-         png_debug2(0, "Freeing row buffer (pass %d, y = %ld)", pass, y);</div><div class='add'>+         pngtest_debug2("Freeing row buffer (pass %d, y = %u)", pass, y);</div><div class='ctx'>          png_free(read_ptr, row_buf);</div><div class='ctx'>          row_buf = NULL;</div><div class='ctx'> #endif /* !SINGLE_ROWBUF_ALLOC */</div><div class='hunk'>@@ -1203,7 +1337,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>    png_free_data(write_ptr, write_info_ptr, PNG_FREE_UNKN, -1);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-   png_debug(0, "Reading and writing end_info data");</div><div class='add'>+   pngtest_debug("Reading and writing end_info data");</div><div class='ctx'> </div><div class='ctx'>    png_read_end(read_ptr, end_info_ptr);</div><div class='ctx'> #ifdef PNG_TEXT_SUPPORTED</div><div class='hunk'>@@ -1213,7 +1347,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'> </div><div class='ctx'>       if (png_get_text(read_ptr, end_info_ptr, &amp;text_ptr, &amp;num_text) &gt; 0)</div><div class='ctx'>       {</div><div class='del'>-         png_debug1(0, "Handling %d iTXt/tEXt/zTXt chunks", num_text);</div><div class='add'>+         pngtest_debug1("Handling %d iTXt/tEXt/zTXt chunks", num_text);</div><div class='ctx'>          png_set_text(write_ptr, write_end_info_ptr, text_ptr, num_text);</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='hunk'>@@ -1232,6 +1366,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>          png_memcpy(tIME_string,</div><div class='ctx'>                     png_convert_to_rfc1123(read_ptr, mod_time),</div><div class='ctx'>                     png_sizeof(tIME_string));</div><div class='add'>+</div><div class='ctx'>          tIME_string[png_sizeof(tIME_string) - 1] = '\0';</div><div class='ctx'>          tIME_chunk_present++;</div><div class='ctx'> #endif /* PNG_TIME_RFC1123_SUPPORTED */</div><div class='hunk'>@@ -1241,19 +1376,19 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'> #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED</div><div class='ctx'>    {</div><div class='ctx'>       png_unknown_chunkp unknowns;</div><div class='del'>-      int num_unknowns;</div><div class='del'>-      num_unknowns = (int)png_get_unknown_chunks(read_ptr, end_info_ptr,</div><div class='add'>+      int num_unknowns = png_get_unknown_chunks(read_ptr, end_info_ptr,</div><div class='ctx'>          &amp;unknowns);</div><div class='add'>+</div><div class='ctx'>       if (num_unknowns)</div><div class='ctx'>       {</div><div class='del'>-         png_size_t i;</div><div class='add'>+         int i;</div><div class='ctx'>          png_set_unknown_chunks(write_ptr, write_end_info_ptr, unknowns,</div><div class='ctx'>            num_unknowns);</div><div class='ctx'>          /* Copy the locations from the read_info_ptr.  The automatically</div><div class='ctx'>           * generated locations in write_end_info_ptr are wrong because we</div><div class='ctx'>           * haven't written the end_info yet.</div><div class='ctx'>           */</div><div class='del'>-         for (i = 0; i &lt; (png_size_t)num_unknowns; i++)</div><div class='add'>+         for (i = 0; i &lt; num_unknowns; i++)</div><div class='ctx'>            png_set_unknown_chunk_location(write_ptr, write_end_info_ptr, i,</div><div class='ctx'>              unknowns[i].location);</div><div class='ctx'>       }</div><div class='hunk'>@@ -1274,26 +1409,26 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-   png_debug(0, "Destroying data structs");</div><div class='add'>+   pngtest_debug("Destroying data structs");</div><div class='ctx'> #ifdef SINGLE_ROWBUF_ALLOC</div><div class='del'>-   png_debug(1, "destroying row_buf for read_ptr");</div><div class='add'>+   pngtest_debug("destroying row_buf for read_ptr");</div><div class='ctx'>    png_free(read_ptr, row_buf);</div><div class='ctx'>    row_buf = NULL;</div><div class='ctx'> #endif /* SINGLE_ROWBUF_ALLOC */</div><div class='del'>-   png_debug(1, "destroying read_ptr, read_info_ptr, end_info_ptr");</div><div class='add'>+   pngtest_debug("destroying read_ptr, read_info_ptr, end_info_ptr");</div><div class='ctx'>    png_destroy_read_struct(&amp;read_ptr, &amp;read_info_ptr, &amp;end_info_ptr);</div><div class='ctx'> #ifdef PNG_WRITE_SUPPORTED</div><div class='del'>-   png_debug(1, "destroying write_end_info_ptr");</div><div class='add'>+   pngtest_debug("destroying write_end_info_ptr");</div><div class='ctx'>    png_destroy_info_struct(write_ptr, &amp;write_end_info_ptr);</div><div class='del'>-   png_debug(1, "destroying write_ptr, write_info_ptr");</div><div class='add'>+   pngtest_debug("destroying write_ptr, write_info_ptr");</div><div class='ctx'>    png_destroy_write_struct(&amp;write_ptr, &amp;write_info_ptr);</div><div class='ctx'> #endif</div><div class='del'>-   png_debug(0, "Destruction complete.");</div><div class='add'>+   pngtest_debug("Destruction complete.");</div><div class='ctx'> </div><div class='ctx'>    FCLOSE(fpin);</div><div class='ctx'>    FCLOSE(fpout);</div><div class='ctx'> </div><div class='del'>-   png_debug(0, "Opening files for comparison");</div><div class='add'>+   pngtest_debug("Opening files for comparison");</div><div class='ctx'>    if ((fpin = fopen(inname, "rb")) == NULL)</div><div class='ctx'>    {</div><div class='ctx'>       fprintf(STDERR, "Could not find file %s\n", inname);</div><div class='hunk'>@@ -1318,6 +1453,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>       {</div><div class='ctx'>          fprintf(STDERR, "\nFiles %s and %s are of a different size\n",</div><div class='ctx'>                  inname, outname);</div><div class='add'>+</div><div class='ctx'>          if (wrote_question == 0)</div><div class='ctx'>          {</div><div class='ctx'>             fprintf(STDERR,</div><div class='hunk'>@@ -1330,6 +1466,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>               ZLIB_VERSION);</div><div class='ctx'>             wrote_question = 1;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          FCLOSE(fpin);</div><div class='ctx'>          FCLOSE(fpout);</div><div class='ctx'>          return (0);</div><div class='hunk'>@@ -1341,6 +1478,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>       if (png_memcmp(inbuf, outbuf, num_in))</div><div class='ctx'>       {</div><div class='ctx'>          fprintf(STDERR, "\nFiles %s and %s are different\n", inname, outname);</div><div class='add'>+</div><div class='ctx'>          if (wrote_question == 0)</div><div class='ctx'>          {</div><div class='ctx'>             fprintf(STDERR,</div><div class='hunk'>@@ -1353,6 +1491,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)</div><div class='ctx'>               ZLIB_VERSION);</div><div class='ctx'>             wrote_question = 1;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          FCLOSE(fpin);</div><div class='ctx'>          FCLOSE(fpout);</div><div class='ctx'>          return (0);</div><div class='hunk'>@@ -1387,11 +1526,10 @@ main(int argc, char *argv[])</div><div class='ctx'>    fprintf(STDERR, " library (%lu):%s",</div><div class='ctx'>       (unsigned long)png_access_version_number(),</div><div class='ctx'>       png_get_header_version(NULL));</div><div class='add'>+</div><div class='ctx'>    /* Show the version of libpng used in building the application */</div><div class='ctx'>    fprintf(STDERR, " pngtest (%lu):%s", (unsigned long)PNG_LIBPNG_VER,</div><div class='ctx'>       PNG_HEADER_VERSION_STRING);</div><div class='del'>-   fprintf(STDERR, " sizeof(png_struct)=%ld, sizeof(png_info)=%ld\n",</div><div class='del'>-                    (long)png_sizeof(png_struct), (long)png_sizeof(png_info));</div><div class='ctx'> </div><div class='ctx'>    /* Do some consistency checking on the memory allocation settings, I'm</div><div class='ctx'>     * not sure this matters, but it is nice to know, the first of these</div><div class='hunk'>@@ -1422,6 +1560,7 @@ main(int argc, char *argv[])</div><div class='ctx'>          multiple = 1;</div><div class='ctx'>          status_dots_requested = 0;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if (strcmp(argv[1], "-mv") == 0 ||</div><div class='ctx'>                strcmp(argv[1], "-vm") == 0 )</div><div class='ctx'>       {</div><div class='hunk'>@@ -1429,12 +1568,14 @@ main(int argc, char *argv[])</div><div class='ctx'>          verbose = 1;</div><div class='ctx'>          status_dots_requested = 1;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if (strcmp(argv[1], "-v") == 0)</div><div class='ctx'>       {</div><div class='ctx'>          verbose = 1;</div><div class='ctx'>          status_dots_requested = 1;</div><div class='ctx'>          inname = argv[2];</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          inname = argv[1];</div><div class='hunk'>@@ -1465,14 +1606,14 @@ main(int argc, char *argv[])</div><div class='ctx'> #endif</div><div class='ctx'>       for (i=2; i&lt;argc; ++i)</div><div class='ctx'>       {</div><div class='del'>-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED</div><div class='del'>-         int k;</div><div class='del'>-#endif</div><div class='ctx'>          int kerror;</div><div class='ctx'>          fprintf(STDERR, "\n Testing %s:", argv[i]);</div><div class='ctx'>          kerror = test_one_file(argv[i], outname);</div><div class='ctx'>          if (kerror == 0)</div><div class='ctx'>          {</div><div class='add'>+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED</div><div class='add'>+            int k;</div><div class='add'>+#endif</div><div class='ctx'> #ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED</div><div class='ctx'>             fprintf(STDERR, "\n PASS (%lu zero samples)\n",</div><div class='ctx'>                (unsigned long)zero_samples);</div><div class='hunk'>@@ -1488,9 +1629,11 @@ main(int argc, char *argv[])</div><div class='ctx'> #ifdef PNG_TIME_RFC1123_SUPPORTED</div><div class='ctx'>          if (tIME_chunk_present != 0)</div><div class='ctx'>             fprintf(STDERR, " tIME = %s\n", tIME_string);</div><div class='add'>+</div><div class='ctx'>          tIME_chunk_present = 0;</div><div class='ctx'> #endif /* PNG_TIME_RFC1123_SUPPORTED */</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>          {</div><div class='ctx'>             fprintf(STDERR, " FAIL\n");</div><div class='hunk'>@@ -1500,17 +1643,19 @@ main(int argc, char *argv[])</div><div class='ctx'>          if (allocation_now != current_allocation)</div><div class='ctx'>             fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",</div><div class='ctx'>                current_allocation - allocation_now);</div><div class='add'>+</div><div class='ctx'>          if (current_allocation != 0)</div><div class='ctx'>          {</div><div class='ctx'>             memory_infop pinfo = pinformation;</div><div class='ctx'> </div><div class='ctx'>             fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",</div><div class='ctx'>                current_allocation);</div><div class='add'>+</div><div class='ctx'>             while (pinfo != NULL)</div><div class='ctx'>             {</div><div class='ctx'>                fprintf(STDERR, " %lu bytes at %x\n",</div><div class='ctx'>                  (unsigned long)pinfo-&gt;size,</div><div class='del'>-                 (unsigned int) pinfo-&gt;pointer);</div><div class='add'>+                 (unsigned int)pinfo-&gt;pointer);</div><div class='ctx'>                pinfo = pinfo-&gt;next;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='hunk'>@@ -1527,6 +1672,7 @@ main(int argc, char *argv[])</div><div class='ctx'>             num_allocations);</div><div class='ctx'> #endif</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='ctx'>       int i;</div><div class='hunk'>@@ -1536,11 +1682,17 @@ main(int argc, char *argv[])</div><div class='ctx'> #if defined(PNG_USER_MEM_SUPPORTED) &amp;&amp; PNG_DEBUG</div><div class='ctx'>          int allocation_now = current_allocation;</div><div class='ctx'> #endif</div><div class='del'>-         if (i == 1) status_dots_requested = 1;</div><div class='del'>-         else if (verbose == 0)status_dots_requested = 0;</div><div class='add'>+         if (i == 1)</div><div class='add'>+            status_dots_requested = 1;</div><div class='add'>+</div><div class='add'>+         else if (verbose == 0)</div><div class='add'>+            status_dots_requested = 0;</div><div class='add'>+</div><div class='ctx'>          if (i == 0 || verbose == 1 || ierror != 0)</div><div class='ctx'>             fprintf(STDERR, "\n Testing %s:", inname);</div><div class='add'>+</div><div class='ctx'>          kerror = test_one_file(inname, outname);</div><div class='add'>+</div><div class='ctx'>          if (kerror == 0)</div><div class='ctx'>          {</div><div class='ctx'>             if (verbose == 1 || i == 2)</div><div class='hunk'>@@ -1558,8 +1710,7 @@ main(int argc, char *argv[])</div><div class='ctx'>                 for (k = 0; k&lt;256; k++)</div><div class='ctx'>                    if (filters_used[k])</div><div class='ctx'>                       fprintf(STDERR, " Filter %d was used %lu times\n",</div><div class='del'>-                         k,</div><div class='del'>-                         (unsigned long)filters_used[k]);</div><div class='add'>+                         k, (unsigned long)filters_used[k]);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef PNG_TIME_RFC1123_SUPPORTED</div><div class='ctx'>              if (tIME_chunk_present != 0)</div><div class='hunk'>@@ -1567,10 +1718,12 @@ main(int argc, char *argv[])</div><div class='ctx'> #endif /* PNG_TIME_RFC1123_SUPPORTED */</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>          {</div><div class='ctx'>             if (verbose == 0 &amp;&amp; i != 2)</div><div class='ctx'>                fprintf(STDERR, "\n Testing %s:", inname);</div><div class='add'>+</div><div class='ctx'>             fprintf(STDERR, " FAIL\n");</div><div class='ctx'>             ierror += kerror;</div><div class='ctx'>          }</div><div class='hunk'>@@ -1578,12 +1731,14 @@ main(int argc, char *argv[])</div><div class='ctx'>          if (allocation_now != current_allocation)</div><div class='ctx'>              fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",</div><div class='ctx'>                current_allocation - allocation_now);</div><div class='add'>+</div><div class='ctx'>          if (current_allocation != 0)</div><div class='ctx'>          {</div><div class='ctx'>              memory_infop pinfo = pinformation;</div><div class='ctx'> </div><div class='ctx'>              fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",</div><div class='ctx'>                 current_allocation);</div><div class='add'>+</div><div class='ctx'>              while (pinfo != NULL)</div><div class='ctx'>              {</div><div class='ctx'>                 fprintf(STDERR, " %lu bytes at %x\n",</div><div class='hunk'>@@ -1621,10 +1776,12 @@ main(int argc, char *argv[])</div><div class='ctx'> </div><div class='ctx'>    if (ierror == 0)</div><div class='ctx'>       fprintf(STDERR, " libpng passes test\n");</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       fprintf(STDERR, " libpng FAILS test\n");</div><div class='add'>+</div><div class='ctx'>    return (int)(ierror != 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Generate a compiler error if there is an old png.h in the search path. */</div><div class='del'>-typedef version_1_4_0 your_png_h_is_not_version_1_4_0;</div><div class='add'>+typedef png_libpng_version_1_5_1 Your_png_h_is_not_version_1_5_1;</div><div class='head'>diff --git a/src/3rdparty/libpng/pngtest.png b/src/3rdparty/libpng/pngtest.png<br/>deleted file mode 100644<br/>index cfdd36f..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngtest.png?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngtest.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/src/3rdparty/libpng/pngtrans.c b/src/3rdparty/libpng/pngtrans.c<br/>index 7b217bb..137f555 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngtrans.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngtrans.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngtrans.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngtrans.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> </div><div class='ctx'> /* pngtrans.c - transforms the data in a row (used by both readers and writers)</div><div class='ctx'>  *</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Last changed in libpng 1.5.1 [February 3, 2011]</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,11 +11,10 @@</div><div class='ctx'>  * and license in png.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define PNG_NO_PEDANTIC_WARNINGS</div><div class='del'>-#include "png.h"</div><div class='del'>-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)</div><div class='ctx'> #include "pngpriv.h"</div><div class='ctx'> </div><div class='add'>+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)</div><div class='add'>+</div><div class='ctx'> #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)</div><div class='ctx'> /* Turn on BGR-to-RGB mapping */</div><div class='ctx'> void PNGAPI</div><div class='hunk'>@@ -25,6 +24,7 @@ png_set_bgr(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;transformations |= PNG_BGR;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -38,6 +38,7 @@ png_set_swap(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;bit_depth == 16)</div><div class='ctx'>       png_ptr-&gt;transformations |= PNG_SWAP_BYTES;</div><div class='ctx'> }</div><div class='hunk'>@@ -52,6 +53,7 @@ png_set_packing(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;bit_depth &lt; 8)</div><div class='ctx'>    {</div><div class='ctx'>       png_ptr-&gt;transformations |= PNG_PACK;</div><div class='hunk'>@@ -69,6 +71,7 @@ png_set_packswap(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;bit_depth &lt; 8)</div><div class='ctx'>       png_ptr-&gt;transformations |= PNG_PACKSWAP;</div><div class='ctx'> }</div><div class='hunk'>@@ -76,12 +79,13 @@ png_set_packswap(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)</div><div class='ctx'> void PNGAPI</div><div class='del'>-png_set_shift(png_structp png_ptr, png_color_8p true_bits)</div><div class='add'>+png_set_shift(png_structp png_ptr, png_const_color_8p true_bits)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_set_shift");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;transformations |= PNG_SHIFT;</div><div class='ctx'>    png_ptr-&gt;shift = *true_bits;</div><div class='ctx'> }</div><div class='hunk'>@@ -117,10 +121,13 @@ png_set_filler(png_structp png_ptr, png_uint_32 filler, int filler_loc)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;transformations |= PNG_FILLER;</div><div class='ctx'>    png_ptr-&gt;filler = (png_uint_16)filler;</div><div class='add'>+</div><div class='ctx'>    if (filler_loc == PNG_FILLER_AFTER)</div><div class='ctx'>       png_ptr-&gt;flags |= PNG_FLAG_FILLER_AFTER;</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       png_ptr-&gt;flags &amp;= ~PNG_FLAG_FILLER_AFTER;</div><div class='ctx'> </div><div class='hunk'>@@ -135,7 +142,7 @@ png_set_filler(png_structp png_ptr, png_uint_32 filler, int filler_loc)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    /* Also I added this in libpng-1.0.2a (what happens when we expand</div><div class='del'>-    * a less-than-8-bit grayscale to GA? */</div><div class='add'>+    * a less-than-8-bit grayscale to GA?) */</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_GRAY &amp;&amp; png_ptr-&gt;bit_depth &gt;= 8)</div><div class='ctx'>    {</div><div class='hunk'>@@ -151,6 +158,7 @@ png_set_add_alpha(png_structp png_ptr, png_uint_32 filler, int filler_loc)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_set_filler(png_ptr, filler, filler_loc);</div><div class='ctx'>    png_ptr-&gt;transformations |= PNG_ADD_ALPHA;</div><div class='ctx'> }</div><div class='hunk'>@@ -166,6 +174,7 @@ png_set_swap_alpha(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;transformations |= PNG_SWAP_ALPHA;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -179,6 +188,7 @@ png_set_invert_alpha(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;transformations |= PNG_INVERT_ALPHA;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -191,6 +201,7 @@ png_set_invert_mono(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;transformations |= PNG_INVERT_MONO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -206,8 +217,8 @@ png_do_invert(png_row_infop row_info, png_bytep row)</div><div class='ctx'>    if (row_info-&gt;color_type == PNG_COLOR_TYPE_GRAY)</div><div class='ctx'>    {</div><div class='ctx'>       png_bytep rp = row;</div><div class='del'>-      png_uint_32 i;</div><div class='del'>-      png_uint_32 istop = row_info-&gt;rowbytes;</div><div class='add'>+      png_size_t i;</div><div class='add'>+      png_size_t istop = row_info-&gt;rowbytes;</div><div class='ctx'> </div><div class='ctx'>       for (i = 0; i &lt; istop; i++)</div><div class='ctx'>       {</div><div class='hunk'>@@ -215,36 +226,41 @@ png_do_invert(png_row_infop row_info, png_bytep row)</div><div class='ctx'>          rp++;</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (row_info-&gt;color_type == PNG_COLOR_TYPE_GRAY_ALPHA &amp;&amp;</div><div class='ctx'>       row_info-&gt;bit_depth == 8)</div><div class='ctx'>    {</div><div class='ctx'>       png_bytep rp = row;</div><div class='del'>-      png_uint_32 i;</div><div class='del'>-      png_uint_32 istop = row_info-&gt;rowbytes;</div><div class='add'>+      png_size_t i;</div><div class='add'>+      png_size_t istop = row_info-&gt;rowbytes;</div><div class='ctx'> </div><div class='del'>-      for (i = 0; i &lt; istop; i+=2)</div><div class='add'>+      for (i = 0; i &lt; istop; i += 2)</div><div class='ctx'>       {</div><div class='ctx'>          *rp = (png_byte)(~(*rp));</div><div class='del'>-         rp+=2;</div><div class='add'>+         rp += 2;</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='add'>+</div><div class='add'>+#ifdef PNG_16BIT_SUPPORTED</div><div class='ctx'>    else if (row_info-&gt;color_type == PNG_COLOR_TYPE_GRAY_ALPHA &amp;&amp;</div><div class='ctx'>       row_info-&gt;bit_depth == 16)</div><div class='ctx'>    {</div><div class='ctx'>       png_bytep rp = row;</div><div class='del'>-      png_uint_32 i;</div><div class='del'>-      png_uint_32 istop = row_info-&gt;rowbytes;</div><div class='add'>+      png_size_t i;</div><div class='add'>+      png_size_t istop = row_info-&gt;rowbytes;</div><div class='ctx'> </div><div class='del'>-      for (i = 0; i &lt; istop; i+=4)</div><div class='add'>+      for (i = 0; i &lt; istop; i += 4)</div><div class='ctx'>       {</div><div class='ctx'>          *rp = (png_byte)(~(*rp));</div><div class='del'>-         *(rp+1) = (png_byte)(~(*(rp+1)));</div><div class='del'>-         rp+=4;</div><div class='add'>+         *(rp + 1) = (png_byte)(~(*(rp + 1)));</div><div class='add'>+         rp += 4;</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_16BIT_SUPPORTED</div><div class='ctx'> #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)</div><div class='ctx'> /* Swaps byte order on 16 bit depth images */</div><div class='ctx'> void /* PRIVATE */</div><div class='hunk'>@@ -252,8 +268,7 @@ png_do_swap(png_row_infop row_info, png_bytep row)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_do_swap");</div><div class='ctx'> </div><div class='del'>-   if (</div><div class='del'>-       row_info-&gt;bit_depth == 16)</div><div class='add'>+   if (row_info-&gt;bit_depth == 16)</div><div class='ctx'>    {</div><div class='ctx'>       png_bytep rp = row;</div><div class='ctx'>       png_uint_32 i;</div><div class='hunk'>@@ -268,6 +283,7 @@ png_do_swap(png_row_infop row_info, png_bytep row)</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)</div><div class='ctx'> static PNG_CONST png_byte onebppswaptable[256] = {</div><div class='hunk'>@@ -381,19 +397,22 @@ png_do_packswap(png_row_infop row_info, png_bytep row)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_do_packswap");</div><div class='ctx'> </div><div class='del'>-   if (</div><div class='del'>-       row_info-&gt;bit_depth &lt; 8)</div><div class='add'>+   if (row_info-&gt;bit_depth &lt; 8)</div><div class='ctx'>    {</div><div class='del'>-      png_bytep rp, end, table;</div><div class='add'>+      png_bytep rp;</div><div class='add'>+      png_const_bytep end, table;</div><div class='ctx'> </div><div class='ctx'>       end = row + row_info-&gt;rowbytes;</div><div class='ctx'> </div><div class='ctx'>       if (row_info-&gt;bit_depth == 1)</div><div class='del'>-         table = (png_bytep)onebppswaptable;</div><div class='add'>+         table = onebppswaptable;</div><div class='add'>+</div><div class='ctx'>       else if (row_info-&gt;bit_depth == 2)</div><div class='del'>-         table = (png_bytep)twobppswaptable;</div><div class='add'>+         table = twobppswaptable;</div><div class='add'>+</div><div class='ctx'>       else if (row_info-&gt;bit_depth == 4)</div><div class='del'>-         table = (png_bytep)fourbppswaptable;</div><div class='add'>+         table = fourbppswaptable;</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>          return;</div><div class='ctx'> </div><div class='hunk'>@@ -412,9 +431,9 @@ png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)</div><div class='ctx'>    png_debug(1, "in png_do_strip_filler");</div><div class='ctx'> </div><div class='ctx'>    {</div><div class='del'>-      png_bytep sp=row;</div><div class='del'>-      png_bytep dp=row;</div><div class='del'>-      png_uint_32 row_width=row_info-&gt;width;</div><div class='add'>+      png_bytep sp = row;</div><div class='add'>+      png_bytep dp = row;</div><div class='add'>+      png_uint_32 row_width = row_info-&gt;width;</div><div class='ctx'>       png_uint_32 i;</div><div class='ctx'> </div><div class='ctx'>       if ((row_info-&gt;color_type == PNG_COLOR_TYPE_RGB ||</div><div class='hunk'>@@ -427,7 +446,7 @@ png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)</div><div class='ctx'>             /* This converts from RGBX or RGBA to RGB */</div><div class='ctx'>             if (flags &amp; PNG_FLAG_FILLER_AFTER)</div><div class='ctx'>             {</div><div class='del'>-               dp+=3; sp+=4;</div><div class='add'>+               dp += 3; sp += 4;</div><div class='ctx'>                for (i = 1; i &lt; row_width; i++)</div><div class='ctx'>                {</div><div class='ctx'>                   *dp++ = *sp++;</div><div class='hunk'>@@ -436,6 +455,7 @@ png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)</div><div class='ctx'>                   sp++;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             /* This converts from XRGB or ARGB to RGB */</div><div class='ctx'>             else</div><div class='ctx'>             {</div><div class='hunk'>@@ -450,6 +470,7 @@ png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)</div><div class='ctx'>             row_info-&gt;pixel_depth = 24;</div><div class='ctx'>             row_info-&gt;rowbytes = row_width * 3;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          else /* if (row_info-&gt;bit_depth == 16) */</div><div class='ctx'>          {</div><div class='ctx'>             if (flags &amp; PNG_FLAG_FILLER_AFTER)</div><div class='hunk'>@@ -473,6 +494,7 @@ png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)</div><div class='ctx'>                   sp += 2;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'>             {</div><div class='ctx'>                /* This converts from XXRRGGBB or AARRGGBB to RRGGBB */</div><div class='hunk'>@@ -484,7 +506,7 @@ png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)</div><div class='ctx'>                   dp += 6;</div><div class='ctx'>                   */</div><div class='ctx'> </div><div class='del'>-                  sp+=2;</div><div class='add'>+                  sp += 2;</div><div class='ctx'>                   *dp++ = *sp++;</div><div class='ctx'>                   *dp++ = *sp++;</div><div class='ctx'>                   *dp++ = *sp++;</div><div class='hunk'>@@ -493,11 +515,13 @@ png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)</div><div class='ctx'>                   *dp++ = *sp++;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             row_info-&gt;pixel_depth = 48;</div><div class='ctx'>             row_info-&gt;rowbytes = row_width * 6;</div><div class='ctx'>          }</div><div class='ctx'>          row_info-&gt;channels = 3;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if ((row_info-&gt;color_type == PNG_COLOR_TYPE_GRAY ||</div><div class='ctx'>          (row_info-&gt;color_type == PNG_COLOR_TYPE_GRAY_ALPHA &amp;&amp;</div><div class='ctx'>          (flags &amp; PNG_FLAG_STRIP_ALPHA))) &amp;&amp;</div><div class='hunk'>@@ -505,27 +529,30 @@ png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)</div><div class='ctx'>       {</div><div class='ctx'>          if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>          {</div><div class='del'>-            /* This converts from GX or GA to G */</div><div class='ctx'>             if (flags &amp; PNG_FLAG_FILLER_AFTER)</div><div class='ctx'>             {</div><div class='add'>+               /* This converts from GX or GA to G */</div><div class='ctx'>                for (i = 0; i &lt; row_width; i++)</div><div class='ctx'>                {</div><div class='ctx'>                   *dp++ = *sp++;</div><div class='ctx'>                   sp++;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='del'>-            /* This converts from XG or AG to G */</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'>             {</div><div class='add'>+               /* This converts from XG or AG to G */</div><div class='ctx'>                for (i = 0; i &lt; row_width; i++)</div><div class='ctx'>                {</div><div class='ctx'>                   sp++;</div><div class='ctx'>                   *dp++ = *sp++;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             row_info-&gt;pixel_depth = 8;</div><div class='ctx'>             row_info-&gt;rowbytes = row_width;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          else /* if (row_info-&gt;bit_depth == 16) */</div><div class='ctx'>          {</div><div class='ctx'>             if (flags &amp; PNG_FLAG_FILLER_AFTER)</div><div class='hunk'>@@ -539,6 +566,7 @@ png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)</div><div class='ctx'>                   sp += 2;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'>             {</div><div class='ctx'>                /* This converts from XXGG or AAGG to GG */</div><div class='hunk'>@@ -549,13 +577,16 @@ png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)</div><div class='ctx'>                   *dp++ = *sp++;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             row_info-&gt;pixel_depth = 16;</div><div class='ctx'>             row_info-&gt;rowbytes = row_width * 2;</div><div class='ctx'>          }</div><div class='ctx'>          row_info-&gt;channels = 1;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       if (flags &amp; PNG_FLAG_STRIP_ALPHA)</div><div class='del'>-        row_info-&gt;color_type &amp;= ~PNG_COLOR_MASK_ALPHA;</div><div class='add'>+        row_info-&gt;color_type = (png_byte)(row_info-&gt;color_type &amp;</div><div class='add'>+            ~PNG_COLOR_MASK_ALPHA);</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -567,8 +598,7 @@ png_do_bgr(png_row_infop row_info, png_bytep row)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_do_bgr");</div><div class='ctx'> </div><div class='del'>-   if (</div><div class='del'>-       (row_info-&gt;color_type &amp; PNG_COLOR_MASK_COLOR))</div><div class='add'>+   if ((row_info-&gt;color_type &amp; PNG_COLOR_MASK_COLOR))</div><div class='ctx'>    {</div><div class='ctx'>       png_uint_32 row_width = row_info-&gt;width;</div><div class='ctx'>       if (row_info-&gt;bit_depth == 8)</div><div class='hunk'>@@ -585,6 +615,7 @@ png_do_bgr(png_row_infop row_info, png_bytep row)</div><div class='ctx'>                *(rp + 2) = save;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          else if (row_info-&gt;color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='ctx'>          {</div><div class='ctx'>             png_bytep rp;</div><div class='hunk'>@@ -598,6 +629,8 @@ png_do_bgr(png_row_infop row_info, png_bytep row)</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+</div><div class='add'>+#ifdef PNG_16BIT_SUPPORTED</div><div class='ctx'>       else if (row_info-&gt;bit_depth == 16)</div><div class='ctx'>       {</div><div class='ctx'>          if (row_info-&gt;color_type == PNG_COLOR_TYPE_RGB)</div><div class='hunk'>@@ -615,6 +648,7 @@ png_do_bgr(png_row_infop row_info, png_bytep row)</div><div class='ctx'>                *(rp + 5) = save;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          else if (row_info-&gt;color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='ctx'>          {</div><div class='ctx'>             png_bytep rp;</div><div class='hunk'>@@ -631,12 +665,14 @@ png_do_bgr(png_row_infop row_info, png_bytep row)</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+#endif</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> #endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \</div><div class='ctx'>     defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)</div><div class='add'>+#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_user_transform_info(png_structp png_ptr, png_voidp</div><div class='ctx'>    user_transform_ptr, int user_transform_depth, int user_transform_channels)</div><div class='hunk'>@@ -645,15 +681,9 @@ png_set_user_transform_info(png_structp png_ptr, png_voidp</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='del'>-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED</div><div class='ctx'>    png_ptr-&gt;user_transform_ptr = user_transform_ptr;</div><div class='ctx'>    png_ptr-&gt;user_transform_depth = (png_byte)user_transform_depth;</div><div class='ctx'>    png_ptr-&gt;user_transform_channels = (png_byte)user_transform_channels;</div><div class='del'>-#else</div><div class='del'>-   if (user_transform_ptr || user_transform_depth || user_transform_channels)</div><div class='del'>-      png_warning(png_ptr,</div><div class='del'>-        "This version of libpng does not support user transform info");</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -662,15 +692,32 @@ png_set_user_transform_info(png_structp png_ptr, png_voidp</div><div class='ctx'>  * associated with this pointer before png_write_destroy and png_read_destroy</div><div class='ctx'>  * are called.</div><div class='ctx'>  */</div><div class='add'>+#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED</div><div class='ctx'> png_voidp PNGAPI</div><div class='del'>-png_get_user_transform_ptr(png_structp png_ptr)</div><div class='add'>+png_get_user_transform_ptr(png_const_structp png_ptr)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return (NULL);</div><div class='del'>-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED</div><div class='add'>+</div><div class='ctx'>    return ((png_voidp)png_ptr-&gt;user_transform_ptr);</div><div class='del'>-#else</div><div class='del'>-   return (NULL);</div><div class='add'>+}</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+png_uint_32 PNGAPI</div><div class='add'>+png_get_current_row_number(png_const_structp png_ptr)</div><div class='add'>+{</div><div class='add'>+   if (png_ptr != NULL)</div><div class='add'>+      return png_ptr-&gt;row_number;</div><div class='add'>+   return PNG_UINT_32_MAX; /* help the app not to fail silently */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+png_byte PNGAPI</div><div class='add'>+png_get_current_pass_number(png_const_structp png_ptr)</div><div class='add'>+{</div><div class='add'>+   if (png_ptr != NULL)</div><div class='add'>+      return png_ptr-&gt;pass;</div><div class='add'>+   return 8; /* invalid */</div><div class='ctx'> }</div><div class='add'>+#endif /* PNG_READ_USER_TRANSFORM_SUPPORTED ||</div><div class='add'>+          PNG_WRITE_USER_TRANSFORM_SUPPORTED */</div><div class='ctx'> #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */</div><div class='head'>diff --git a/src/3rdparty/libpng/pngvalid.c b/src/3rdparty/libpng/pngvalid.c<br/>new file mode 100644<br/>index 0000000..faebe4b<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngvalid.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngvalid.c</a></div><div class='hunk'>@@ -0,0 +1,6658 @@</div><div class='add'>+</div><div class='add'>+/* pngvalid.c - validate libpng by constructing then reading png files.</div><div class='add'>+ *</div><div class='add'>+ * Last changed in libpng 1.5.1 [February 3, 2011]</div><div class='add'>+ * Copyright (c) 2011 Glenn Randers-Pehrson</div><div class='add'>+ * Written by John Cunningham Bowler</div><div class='add'>+ *</div><div class='add'>+ * This code is released under the libpng license.</div><div class='add'>+ * For conditions of distribution and use, see the disclaimer</div><div class='add'>+ * and license in png.h</div><div class='add'>+ *</div><div class='add'>+ * NOTES:</div><div class='add'>+ *   This is a C program that is intended to be linked against libpng.  It</div><div class='add'>+ *   generates bitmaps internally, stores them as PNG files (using the</div><div class='add'>+ *   sequential write code) then reads them back (using the sequential</div><div class='add'>+ *   read code) and validates that the result has the correct data.</div><div class='add'>+ *</div><div class='add'>+ *   The program can be modified and extended to test the correctness of</div><div class='add'>+ *   transformations performed by libpng.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "png.h"</div><div class='add'>+#if PNG_LIBPNG_VER &lt; 10500</div><div class='add'>+/* This delibarately lacks the PNG_CONST. */</div><div class='add'>+typedef png_byte *png_const_bytep;</div><div class='add'>+</div><div class='add'>+/* This is copied from 1.5.1 png.h: */</div><div class='add'>+#define PNG_INTERLACE_ADAM7_PASSES 7</div><div class='add'>+#define PNG_PASS_START_ROW(pass) (((1U&amp;~(pass))&lt;&lt;(3-((pass)&gt;&gt;1)))&amp;7)</div><div class='add'>+#define PNG_PASS_START_COL(pass) (((1U&amp; (pass))&lt;&lt;(3-(((pass)+1)&gt;&gt;1)))&amp;7)</div><div class='add'>+#define PNG_PASS_ROW_SHIFT(pass) ((pass)&gt;2?(8-(pass))&gt;&gt;1:3)</div><div class='add'>+#define PNG_PASS_COL_SHIFT(pass) ((pass)&gt;1?(7-(pass))&gt;&gt;1:3)</div><div class='add'>+#define PNG_PASS_ROWS(height, pass) (((height)+(((1&lt;&lt;PNG_PASS_ROW_SHIFT(pass))\</div><div class='add'>+   -1)-PNG_PASS_START_ROW(pass)))&gt;&gt;PNG_PASS_ROW_SHIFT(pass))</div><div class='add'>+#define PNG_PASS_COLS(width, pass) (((width)+(((1&lt;&lt;PNG_PASS_COL_SHIFT(pass))\</div><div class='add'>+   -1)-PNG_PASS_START_COL(pass)))&gt;&gt;PNG_PASS_COL_SHIFT(pass))</div><div class='add'>+#define PNG_ROW_FROM_PASS_ROW(yIn, pass) \</div><div class='add'>+   (((yIn)&lt;&lt;PNG_PASS_ROW_SHIFT(pass))+PNG_PASS_START_ROW(pass))</div><div class='add'>+#define PNG_COL_FROM_PASS_COL(xIn, pass) \</div><div class='add'>+   (((xIn)&lt;&lt;PNG_PASS_COL_SHIFT(pass))+PNG_PASS_START_COL(pass))</div><div class='add'>+#define PNG_PASS_MASK(pass,off) ( \</div><div class='add'>+   ((0x110145AFU&gt;&gt;(((7-(off))-(pass))&lt;&lt;2)) &amp; 0xFU) | \</div><div class='add'>+   ((0x01145AF0U&gt;&gt;(((7-(off))-(pass))&lt;&lt;2)) &amp; 0xF0U))</div><div class='add'>+#define PNG_ROW_IN_INTERLACE_PASS(y, pass) \</div><div class='add'>+   ((PNG_PASS_MASK(pass,0) &gt;&gt; ((y)&amp;7)) &amp; 1)</div><div class='add'>+#define PNG_COL_IN_INTERLACE_PASS(x, pass) \</div><div class='add'>+   ((PNG_PASS_MASK(pass,1) &gt;&gt; ((x)&amp;7)) &amp; 1)</div><div class='add'>+</div><div class='add'>+/* These are needed too for the defualt build: */</div><div class='add'>+#define PNG_WRITE_16BIT_SUPPORTED</div><div class='add'>+#define PNG_READ_16BIT_SUPPORTED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include "zlib.h"   /* For crc32 */</div><div class='add'>+</div><div class='add'>+#include &lt;float.h&gt;  /* For floating point constants */</div><div class='add'>+#include &lt;stdlib.h&gt; /* For malloc */</div><div class='add'>+#include &lt;string.h&gt; /* For memcpy, memset */</div><div class='add'>+#include &lt;math.h&gt;   /* For floor */</div><div class='add'>+</div><div class='add'>+/* Unused formal parameter errors are removed using the following macro which is</div><div class='add'>+ * expected to have no bad effects on performance.</div><div class='add'>+ */</div><div class='add'>+#ifndef UNUSED</div><div class='add'>+#  if defined(__GNUC__) || defined(_MSC_VER)</div><div class='add'>+#     define UNUSED(param) (void)param;</div><div class='add'>+#  else</div><div class='add'>+#     define UNUSED(param)</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/***************************** EXCEPTION HANDLING *****************************/</div><div class='add'>+#include "contrib/visupng/cexcept.h"</div><div class='add'>+struct png_store;</div><div class='add'>+define_exception_type(struct png_store*);</div><div class='add'>+</div><div class='add'>+/* The following are macros to reduce typing everywhere where the well known</div><div class='add'>+ * name 'the_exception_context' must be defined.</div><div class='add'>+ */</div><div class='add'>+#define anon_context(ps) struct exception_context *the_exception_context = \</div><div class='add'>+   &amp;(ps)-&gt;exception_context</div><div class='add'>+#define context(ps,fault) anon_context(ps); png_store *fault</div><div class='add'>+</div><div class='add'>+/******************************* UTILITIES ************************************/</div><div class='add'>+/* Error handling is particularly problematic in production code - error</div><div class='add'>+ * handlers often themselves have bugs which lead to programs that detect</div><div class='add'>+ * minor errors crashing.  The following functions deal with one very</div><div class='add'>+ * common class of errors in error handlers - attempting to format error or</div><div class='add'>+ * warning messages into buffers that are too small.</div><div class='add'>+ */</div><div class='add'>+static size_t safecat(char *buffer, size_t bufsize, size_t pos,</div><div class='add'>+   PNG_CONST char *cat)</div><div class='add'>+{</div><div class='add'>+   while (pos &lt; bufsize &amp;&amp; cat != NULL &amp;&amp; *cat != 0)</div><div class='add'>+      buffer[pos++] = *cat++;</div><div class='add'>+</div><div class='add'>+   if (pos &gt;= bufsize)</div><div class='add'>+      pos = bufsize-1;</div><div class='add'>+</div><div class='add'>+   buffer[pos] = 0;</div><div class='add'>+   return pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t safecatn(char *buffer, size_t bufsize, size_t pos, int n)</div><div class='add'>+{</div><div class='add'>+   char number[64];</div><div class='add'>+   sprintf(number, "%d", n);</div><div class='add'>+   return safecat(buffer, bufsize, pos, number);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t safecatd(char *buffer, size_t bufsize, size_t pos, double d,</div><div class='add'>+    int precision)</div><div class='add'>+{</div><div class='add'>+   char number[64];</div><div class='add'>+   sprintf(number, "%.*f", precision, d);</div><div class='add'>+   return safecat(buffer, bufsize, pos, number);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static PNG_CONST char invalid[] = "invalid";</div><div class='add'>+static PNG_CONST char sep[] = ": ";</div><div class='add'>+</div><div class='add'>+/* NOTE: this is indexed by ln2(bit_depth)! */</div><div class='add'>+static PNG_CONST char *bit_depths[8] =</div><div class='add'>+{</div><div class='add'>+   "1", "2", "4", "8", "16", invalid, invalid, invalid</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static PNG_CONST char *colour_types[8] =</div><div class='add'>+{</div><div class='add'>+   "greyscale", invalid, "truecolour", "indexed-colour",</div><div class='add'>+   "greyscale with alpha", invalid, "truecolour with alpha", invalid</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* To get log-bit-depth from bit depth, returns 0 to 7 (7 on error). */</div><div class='add'>+static unsigned int</div><div class='add'>+log2depth(png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   switch (bit_depth)</div><div class='add'>+   {</div><div class='add'>+      case 1:</div><div class='add'>+         return 0;</div><div class='add'>+</div><div class='add'>+      case 2:</div><div class='add'>+         return 1;</div><div class='add'>+</div><div class='add'>+      case 4:</div><div class='add'>+         return 2;</div><div class='add'>+</div><div class='add'>+      case 8:</div><div class='add'>+         return 3;</div><div class='add'>+</div><div class='add'>+      case 16:</div><div class='add'>+         return 4;</div><div class='add'>+</div><div class='add'>+      default:</div><div class='add'>+         return 7;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* A numeric ID based on PNG file characteristics.  The 'do_interlace' field</div><div class='add'>+ * simply records whether pngvalid did the interlace itself or whether it</div><div class='add'>+ * was done by libpng.  Width and height must be less than 256.</div><div class='add'>+ */</div><div class='add'>+#define FILEID(col, depth, interlace, width, height, do_interlace) \</div><div class='add'>+   ((png_uint_32)((col) + ((depth)&lt;&lt;3) + ((interlace)&lt;&lt;8) + \</div><div class='add'>+    (((do_interlace)!=0)&lt;&lt;15) + ((width)&lt;&lt;16) + ((height)&lt;&lt;24)))</div><div class='add'>+</div><div class='add'>+#define COL_FROM_ID(id) ((png_byte)((id)&amp; 0x7U))</div><div class='add'>+#define DEPTH_FROM_ID(id) ((png_byte)(((id) &gt;&gt; 3) &amp; 0x1fU))</div><div class='add'>+#define INTERLACE_FROM_ID(id) ((int)(((id) &gt;&gt; 8) &amp; 0x3))</div><div class='add'>+#define DO_INTERLACE_FROM_ID(id) ((int)(((id)&gt;&gt;15) &amp; 1))</div><div class='add'>+#define WIDTH_FROM_ID(id) (((id)&gt;&gt;16) &amp; 0xff)</div><div class='add'>+#define HEIGHT_FROM_ID(id) (((id)&gt;&gt;24) &amp; 0xff)</div><div class='add'>+</div><div class='add'>+/* Utility to construct a standard name for a standard image. */</div><div class='add'>+static size_t</div><div class='add'>+standard_name(char *buffer, size_t bufsize, size_t pos, png_byte colour_type,</div><div class='add'>+    int log_bit_depth, int interlace_type, png_uint_32 w, png_uint_32 h,</div><div class='add'>+    int do_interlace)</div><div class='add'>+{</div><div class='add'>+   pos = safecat(buffer, bufsize, pos, colour_types[colour_type]);</div><div class='add'>+   pos = safecat(buffer, bufsize, pos, " ");</div><div class='add'>+   pos = safecat(buffer, bufsize, pos, bit_depths[log_bit_depth]);</div><div class='add'>+   pos = safecat(buffer, bufsize, pos, " bit ");</div><div class='add'>+</div><div class='add'>+   if (interlace_type != PNG_INTERLACE_NONE)</div><div class='add'>+      pos = safecat(buffer, bufsize, pos, "interlaced");</div><div class='add'>+   if (do_interlace)</div><div class='add'>+      pos = safecat(buffer, bufsize, pos, "(pngvalid)");</div><div class='add'>+   else</div><div class='add'>+      pos = safecat(buffer, bufsize, pos, "(libpng)");</div><div class='add'>+   if (w &gt; 0 || h &gt; 0)</div><div class='add'>+   {</div><div class='add'>+      pos = safecat(buffer, bufsize, pos, " ");</div><div class='add'>+      pos = safecatn(buffer, bufsize, pos, w);</div><div class='add'>+      pos = safecat(buffer, bufsize, pos, "x");</div><div class='add'>+      pos = safecatn(buffer, bufsize, pos, h);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t</div><div class='add'>+standard_name_from_id(char *buffer, size_t bufsize, size_t pos, png_uint_32 id)</div><div class='add'>+{</div><div class='add'>+   return standard_name(buffer, bufsize, pos, COL_FROM_ID(id),</div><div class='add'>+      log2depth(DEPTH_FROM_ID(id)), INTERLACE_FROM_ID(id),</div><div class='add'>+      WIDTH_FROM_ID(id), HEIGHT_FROM_ID(id), DO_INTERLACE_FROM_ID(id));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convenience API and defines to list valid formats.  Note that 16 bit read and</div><div class='add'>+ * write support is required to do 16 bit read tests (we must be able to make a</div><div class='add'>+ * 16 bit image to test!)</div><div class='add'>+ */</div><div class='add'>+#ifdef PNG_WRITE_16BIT_SUPPORTED</div><div class='add'>+#  define WRITE_BDHI 4</div><div class='add'>+#  ifdef PNG_READ_16BIT_SUPPORTED</div><div class='add'>+#     define READ_BDHI 4</div><div class='add'>+#     define DO_16BIT</div><div class='add'>+#  endif</div><div class='add'>+#else</div><div class='add'>+#  define WRITE_BDHI 3</div><div class='add'>+#endif</div><div class='add'>+#ifndef DO_16BIT</div><div class='add'>+#  define READ_BDHI 3</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+next_format(png_bytep colour_type, png_bytep bit_depth)</div><div class='add'>+{</div><div class='add'>+   if (*bit_depth == 0)</div><div class='add'>+   {</div><div class='add'>+      *colour_type = 0, *bit_depth = 1;</div><div class='add'>+      return 1;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   *bit_depth = (png_byte)(*bit_depth &lt;&lt; 1);</div><div class='add'>+</div><div class='add'>+   /* Palette images are restricted to 8 bit depth */</div><div class='add'>+   if (*bit_depth &lt;= 8</div><div class='add'>+#     ifdef DO_16BIT</div><div class='add'>+         || (*colour_type != 3 &amp;&amp; *bit_depth &lt;= 16)</div><div class='add'>+#     endif</div><div class='add'>+      )</div><div class='add'>+      return 1;</div><div class='add'>+</div><div class='add'>+   /* Move to the next color type, or return 0 at the end. */</div><div class='add'>+   switch (*colour_type)</div><div class='add'>+   {</div><div class='add'>+      case 0:</div><div class='add'>+         *colour_type = 2;</div><div class='add'>+         *bit_depth = 8;</div><div class='add'>+         return 1;</div><div class='add'>+</div><div class='add'>+      case 2:</div><div class='add'>+         *colour_type = 3;</div><div class='add'>+         *bit_depth = 1;</div><div class='add'>+         return 1;</div><div class='add'>+</div><div class='add'>+      case 3:</div><div class='add'>+         *colour_type = 4;</div><div class='add'>+         *bit_depth = 8;</div><div class='add'>+         return 1;</div><div class='add'>+</div><div class='add'>+      case 4:</div><div class='add'>+         *colour_type = 6;</div><div class='add'>+         *bit_depth = 8;</div><div class='add'>+         return 1;</div><div class='add'>+</div><div class='add'>+      default:</div><div class='add'>+         return 0;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int</div><div class='add'>+sample(png_const_bytep row, png_byte colour_type, png_byte bit_depth,</div><div class='add'>+    png_uint_32 x, unsigned int sample_index)</div><div class='add'>+{</div><div class='add'>+   png_uint_32 bit_index, result;</div><div class='add'>+</div><div class='add'>+   /* Find a sample index for the desired sample: */</div><div class='add'>+   x *= bit_depth;</div><div class='add'>+   bit_index = x;</div><div class='add'>+</div><div class='add'>+   if ((colour_type &amp; 1) == 0) /* !palette */</div><div class='add'>+   {</div><div class='add'>+      if (colour_type &amp; 2)</div><div class='add'>+         bit_index *= 3;</div><div class='add'>+</div><div class='add'>+      if (colour_type &amp; 4)</div><div class='add'>+         bit_index += x; /* Alpha channel */</div><div class='add'>+</div><div class='add'>+      if (colour_type &amp; (2+4))</div><div class='add'>+         bit_index += sample_index * bit_depth; /* Multiple channels: select one */</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* Return the sample from the row as an integer. */</div><div class='add'>+   row += bit_index &gt;&gt; 3;</div><div class='add'>+   result = *row;</div><div class='add'>+</div><div class='add'>+   if (bit_depth == 8)</div><div class='add'>+      return result;</div><div class='add'>+</div><div class='add'>+   else if (bit_depth &gt; 8)</div><div class='add'>+      return (result &lt;&lt; 8) + *++row;</div><div class='add'>+</div><div class='add'>+   /* Less than 8 bits per sample. */</div><div class='add'>+   bit_index &amp;= 7;</div><div class='add'>+   return (result &gt;&gt; (8-bit_index-bit_depth)) &amp; ((1U&lt;&lt;bit_depth)-1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Copy a single pixel, of a given size, from one buffer to another -</div><div class='add'>+ * while this is basically bit addressed there is an implicit assumption</div><div class='add'>+ * that pixels 8 or more bits in size are byte aligned and that pixels</div><div class='add'>+ * do not otherwise cross byte boundaries.  (This is, so far as I know,</div><div class='add'>+ * universally true in bitmap computer graphics.  [JCB 20101212])</div><div class='add'>+ *</div><div class='add'>+ * NOTE: The to and from buffers may be the same.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+pixel_copy(png_bytep toBuffer, png_uint_32 toIndex,</div><div class='add'>+   png_const_bytep fromBuffer, png_uint_32 fromIndex, unsigned int pixelSize)</div><div class='add'>+{</div><div class='add'>+   /* Assume we can multiply by 'size' without overflow because we are</div><div class='add'>+    * just working in a single buffer.</div><div class='add'>+    */</div><div class='add'>+   toIndex *= pixelSize;</div><div class='add'>+   fromIndex *= pixelSize;</div><div class='add'>+   if (pixelSize &lt; 8) /* Sub-byte */</div><div class='add'>+   {</div><div class='add'>+      /* Mask to select the location of the copied pixel: */</div><div class='add'>+      unsigned int destMask = ((1U&lt;&lt;pixelSize)-1) &lt;&lt; (8-pixelSize-(toIndex&amp;7));</div><div class='add'>+      /* The following read the entire pixels and clears the extra: */</div><div class='add'>+      unsigned int destByte = toBuffer[toIndex &gt;&gt; 3] &amp; ~destMask;</div><div class='add'>+      unsigned int sourceByte = fromBuffer[fromIndex &gt;&gt; 3];</div><div class='add'>+</div><div class='add'>+      /* Don't rely on &lt;&lt; or &gt;&gt; supporting '0' here, just in case: */</div><div class='add'>+      fromIndex &amp;= 7;</div><div class='add'>+      if (fromIndex &gt; 0) sourceByte &lt;&lt;= fromIndex;</div><div class='add'>+      if ((toIndex &amp; 7) &gt; 0) sourceByte &gt;&gt;= toIndex &amp; 7;</div><div class='add'>+</div><div class='add'>+      toBuffer[toIndex &gt;&gt; 3] = (png_byte)(destByte | (sourceByte &amp; destMask));</div><div class='add'>+   }</div><div class='add'>+   else /* One or more bytes */</div><div class='add'>+      memmove(toBuffer+(toIndex&gt;&gt;3), fromBuffer+(fromIndex&gt;&gt;3), pixelSize&gt;&gt;3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Compare pixels - they are assumed to start at the first byte in the</div><div class='add'>+ * given buffers.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+pixel_cmp(png_const_bytep pa, png_const_bytep pb, png_uint_32 bit_width)</div><div class='add'>+{</div><div class='add'>+   if (memcmp(pa, pb, bit_width&gt;&gt;3) == 0)</div><div class='add'>+   {</div><div class='add'>+      png_uint_32 p;</div><div class='add'>+</div><div class='add'>+      if ((bit_width &amp; 7) == 0) return 0;</div><div class='add'>+</div><div class='add'>+      /* Ok, any differences? */</div><div class='add'>+      p = pa[bit_width &gt;&gt; 3];</div><div class='add'>+      p ^= pb[bit_width &gt;&gt; 3];</div><div class='add'>+</div><div class='add'>+      if (p == 0) return 0;</div><div class='add'>+</div><div class='add'>+      /* There are, but they may not be significant, remove the bits</div><div class='add'>+       * after the end (the low order bits in PNG.)</div><div class='add'>+       */</div><div class='add'>+      bit_width &amp;= 7;</div><div class='add'>+      p &gt;&gt;= 8-bit_width;</div><div class='add'>+</div><div class='add'>+      if (p == 0) return 0;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return 1; /* Different */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*************************** BASIC PNG FILE WRITING ***************************/</div><div class='add'>+/* A png_store takes data from the sequential writer or provides data</div><div class='add'>+ * to the sequential reader.  It can also store the result of a PNG</div><div class='add'>+ * write for later retrieval.</div><div class='add'>+ */</div><div class='add'>+#define STORE_BUFFER_SIZE 500 /* arbitrary */</div><div class='add'>+typedef struct png_store_buffer</div><div class='add'>+{</div><div class='add'>+   struct png_store_buffer*  prev;    /* NOTE: stored in reverse order */</div><div class='add'>+   png_byte                  buffer[STORE_BUFFER_SIZE];</div><div class='add'>+} png_store_buffer;</div><div class='add'>+</div><div class='add'>+#define FILE_NAME_SIZE 64</div><div class='add'>+</div><div class='add'>+typedef struct png_store_file</div><div class='add'>+{</div><div class='add'>+   struct png_store_file*  next;      /* as many as you like... */</div><div class='add'>+   char                    name[FILE_NAME_SIZE];</div><div class='add'>+   png_uint_32             id;        /* must be correct (see FILEID) */</div><div class='add'>+   png_size_t              datacount; /* In this (the last) buffer */</div><div class='add'>+   png_store_buffer        data;      /* Last buffer in file */</div><div class='add'>+} png_store_file;</div><div class='add'>+</div><div class='add'>+/* The following is a pool of memory allocated by a single libpng read or write</div><div class='add'>+ * operation.</div><div class='add'>+ */</div><div class='add'>+typedef struct store_pool</div><div class='add'>+{</div><div class='add'>+   struct png_store    *store;   /* Back pointer */</div><div class='add'>+   struct store_memory *list;    /* List of allocated memory */</div><div class='add'>+   png_byte             mark[4]; /* Before and after data */</div><div class='add'>+</div><div class='add'>+   /* Statistics for this run. */</div><div class='add'>+   png_alloc_size_t     max;     /* Maximum single allocation */</div><div class='add'>+   png_alloc_size_t     current; /* Current allocation */</div><div class='add'>+   png_alloc_size_t     limit;   /* Highest current allocation */</div><div class='add'>+   png_alloc_size_t     total;   /* Total allocation */</div><div class='add'>+</div><div class='add'>+   /* Overall statistics (retained across successive runs). */</div><div class='add'>+   png_alloc_size_t     max_max;</div><div class='add'>+   png_alloc_size_t     max_limit;</div><div class='add'>+   png_alloc_size_t     max_total;</div><div class='add'>+} store_pool;</div><div class='add'>+</div><div class='add'>+typedef struct png_store</div><div class='add'>+{</div><div class='add'>+   /* For cexcept.h exception handling - simply store one of these;</div><div class='add'>+    * the context is a self pointer but it may point to a different</div><div class='add'>+    * png_store (in fact it never does in this program.)</div><div class='add'>+    */</div><div class='add'>+   struct exception_context</div><div class='add'>+                      exception_context;</div><div class='add'>+</div><div class='add'>+   unsigned int       verbose :1;</div><div class='add'>+   unsigned int       treat_warnings_as_errors :1;</div><div class='add'>+   unsigned int       expect_error :1;</div><div class='add'>+   unsigned int       expect_warning :1;</div><div class='add'>+   unsigned int       saw_warning :1;</div><div class='add'>+   unsigned int       speed :1;</div><div class='add'>+   unsigned int       progressive :1; /* use progressive read */</div><div class='add'>+   unsigned int       validated :1;   /* used as a temporary flag */</div><div class='add'>+   int                nerrors;</div><div class='add'>+   int                nwarnings;</div><div class='add'>+   char               test[128]; /* Name of test */</div><div class='add'>+   char               error[256];</div><div class='add'>+</div><div class='add'>+   /* Read fields */</div><div class='add'>+   png_structp        pread;    /* Used to read a saved file */</div><div class='add'>+   png_infop          piread;</div><div class='add'>+   png_store_file*    current;  /* Set when reading */</div><div class='add'>+   png_store_buffer*  next;     /* Set when reading */</div><div class='add'>+   png_size_t         readpos;  /* Position in *next */</div><div class='add'>+   png_byte*          image;    /* Buffer for reading interlaced images */</div><div class='add'>+   size_t             cb_image; /* Size of this buffer */</div><div class='add'>+   store_pool         read_memory_pool;</div><div class='add'>+</div><div class='add'>+   /* Write fields */</div><div class='add'>+   png_store_file*    saved;</div><div class='add'>+   png_structp        pwrite;   /* Used when writing a new file */</div><div class='add'>+   png_infop          piwrite;</div><div class='add'>+   png_size_t         writepos; /* Position in .new */</div><div class='add'>+   char               wname[FILE_NAME_SIZE];</div><div class='add'>+   png_store_buffer   new;      /* The end of the new PNG file being written. */</div><div class='add'>+   store_pool         write_memory_pool;</div><div class='add'>+} png_store;</div><div class='add'>+</div><div class='add'>+/* Initialization and cleanup */</div><div class='add'>+static void</div><div class='add'>+store_pool_mark(png_byte *mark)</div><div class='add'>+{</div><div class='add'>+   /* Generate a new mark.  This uses a boring repeatable algorithm and it is</div><div class='add'>+    * implemented here so that it gives the same set of numbers on every</div><div class='add'>+    * architecture.  It's a linear congruential generator (Knuth or Sedgewick</div><div class='add'>+    * "Algorithms") but it comes from the 'feedback taps' table in Horowitz and</div><div class='add'>+    * Hill, "The Art of Electronics".</div><div class='add'>+    */</div><div class='add'>+   static png_uint_32 u0 = 0x12345678, u1 = 1;</div><div class='add'>+</div><div class='add'>+   /* There are thirty three bits, the next bit in the sequence is bit-33 XOR</div><div class='add'>+    * bit-20.  The top 1 bit is in u1, the bottom 32 are in u0.</div><div class='add'>+    */</div><div class='add'>+   int i;</div><div class='add'>+   for (i=0; i&lt;4; ++i)</div><div class='add'>+   {</div><div class='add'>+      /* First generate 8 new bits then shift them in at the end. */</div><div class='add'>+      png_uint_32 u = ((u0 &gt;&gt; (20-8)) ^ ((u1 &lt;&lt; 7) | (u0 &gt;&gt; (32-7)))) &amp; 0xff;</div><div class='add'>+      u1 &lt;&lt;= 8;</div><div class='add'>+      u1 |= u0 &gt;&gt; 24;</div><div class='add'>+      u0 &lt;&lt;= 8;</div><div class='add'>+      u0 |= u;</div><div class='add'>+      *mark++ = (png_byte)u;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Use this for random 32 bit values, this function makes sure the result is</div><div class='add'>+ * non-zero.</div><div class='add'>+ */</div><div class='add'>+static png_uint_32</div><div class='add'>+random_32(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+   for(;;)</div><div class='add'>+   {</div><div class='add'>+      png_byte mark[4];</div><div class='add'>+      png_uint_32 result;</div><div class='add'>+</div><div class='add'>+      store_pool_mark(mark);</div><div class='add'>+      result = png_get_uint_32(mark);</div><div class='add'>+</div><div class='add'>+      if (result != 0)</div><div class='add'>+         return result;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+store_pool_init(png_store *ps, store_pool *pool)</div><div class='add'>+{</div><div class='add'>+   memset(pool, 0, sizeof *pool);</div><div class='add'>+</div><div class='add'>+   pool-&gt;store = ps;</div><div class='add'>+   pool-&gt;list = NULL;</div><div class='add'>+   pool-&gt;max = pool-&gt;current = pool-&gt;limit = pool-&gt;total = 0;</div><div class='add'>+   pool-&gt;max_max = pool-&gt;max_limit = pool-&gt;max_total = 0;</div><div class='add'>+   store_pool_mark(pool-&gt;mark);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+store_init(png_store* ps)</div><div class='add'>+{</div><div class='add'>+   memset(ps, 0, sizeof *ps);</div><div class='add'>+   init_exception_context(&amp;ps-&gt;exception_context);</div><div class='add'>+   store_pool_init(ps, &amp;ps-&gt;read_memory_pool);</div><div class='add'>+   store_pool_init(ps, &amp;ps-&gt;write_memory_pool);</div><div class='add'>+   ps-&gt;verbose = 0;</div><div class='add'>+   ps-&gt;treat_warnings_as_errors = 0;</div><div class='add'>+   ps-&gt;expect_error = 0;</div><div class='add'>+   ps-&gt;expect_warning = 0;</div><div class='add'>+   ps-&gt;saw_warning = 0;</div><div class='add'>+   ps-&gt;speed = 0;</div><div class='add'>+   ps-&gt;progressive = 0;</div><div class='add'>+   ps-&gt;validated = 0;</div><div class='add'>+   ps-&gt;nerrors = ps-&gt;nwarnings = 0;</div><div class='add'>+   ps-&gt;pread = NULL;</div><div class='add'>+   ps-&gt;piread = NULL;</div><div class='add'>+   ps-&gt;saved = ps-&gt;current = NULL;</div><div class='add'>+   ps-&gt;next = NULL;</div><div class='add'>+   ps-&gt;readpos = 0;</div><div class='add'>+   ps-&gt;image = NULL;</div><div class='add'>+   ps-&gt;cb_image = 0;</div><div class='add'>+   ps-&gt;pwrite = NULL;</div><div class='add'>+   ps-&gt;piwrite = NULL;</div><div class='add'>+   ps-&gt;writepos = 0;</div><div class='add'>+   ps-&gt;new.prev = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This somewhat odd function is used when reading an image to ensure that the</div><div class='add'>+ * buffer is big enough - this is why a png_structp is available.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+store_ensure_image(png_store *ps, png_structp pp, size_t cb)</div><div class='add'>+{</div><div class='add'>+   if (ps-&gt;cb_image &lt; cb)</div><div class='add'>+   {</div><div class='add'>+      if (ps-&gt;image != NULL)</div><div class='add'>+      {</div><div class='add'>+         free(ps-&gt;image-1);</div><div class='add'>+         ps-&gt;cb_image = 0;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* The buffer is deliberately mis-aligned. */</div><div class='add'>+      ps-&gt;image = malloc(cb+1);</div><div class='add'>+      if (ps-&gt;image == NULL)</div><div class='add'>+         png_error(pp, "OOM allocating image buffer");</div><div class='add'>+</div><div class='add'>+      ++(ps-&gt;image);</div><div class='add'>+      ps-&gt;cb_image = cb;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* And, for error checking, the whole buffer is set to '1' - this</div><div class='add'>+    * matches what happens with the 'size' test images on write and also</div><div class='add'>+    * matches the unused bits in the test rows.</div><div class='add'>+    */</div><div class='add'>+   memset(ps-&gt;image, 0xff, cb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+store_freebuffer(png_store_buffer* psb)</div><div class='add'>+{</div><div class='add'>+   if (psb-&gt;prev)</div><div class='add'>+   {</div><div class='add'>+      store_freebuffer(psb-&gt;prev);</div><div class='add'>+      free(psb-&gt;prev);</div><div class='add'>+      psb-&gt;prev = NULL;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+store_freenew(png_store *ps)</div><div class='add'>+{</div><div class='add'>+   store_freebuffer(&amp;ps-&gt;new);</div><div class='add'>+   ps-&gt;writepos = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+store_storenew(png_store *ps)</div><div class='add'>+{</div><div class='add'>+   png_store_buffer *pb;</div><div class='add'>+</div><div class='add'>+   if (ps-&gt;writepos != STORE_BUFFER_SIZE)</div><div class='add'>+      png_error(ps-&gt;pwrite, "invalid store call");</div><div class='add'>+</div><div class='add'>+   pb = malloc(sizeof *pb);</div><div class='add'>+</div><div class='add'>+   if (pb == NULL)</div><div class='add'>+      png_error(ps-&gt;pwrite, "store new: OOM");</div><div class='add'>+</div><div class='add'>+   *pb = ps-&gt;new;</div><div class='add'>+   ps-&gt;new.prev = pb;</div><div class='add'>+   ps-&gt;writepos = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+store_freefile(png_store_file **ppf)</div><div class='add'>+{</div><div class='add'>+   if (*ppf != NULL)</div><div class='add'>+   {</div><div class='add'>+      store_freefile(&amp;(*ppf)-&gt;next);</div><div class='add'>+</div><div class='add'>+      store_freebuffer(&amp;(*ppf)-&gt;data);</div><div class='add'>+      (*ppf)-&gt;datacount = 0;</div><div class='add'>+      free(*ppf);</div><div class='add'>+      *ppf = NULL;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Main interface to file storeage, after writing a new PNG file (see the API</div><div class='add'>+ * below) call store_storefile to store the result with the given name and id.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+store_storefile(png_store *ps, png_uint_32 id)</div><div class='add'>+{</div><div class='add'>+   png_store_file *pf = malloc(sizeof *pf);</div><div class='add'>+   if (pf == NULL)</div><div class='add'>+      png_error(ps-&gt;pwrite, "storefile: OOM");</div><div class='add'>+   safecat(pf-&gt;name, sizeof pf-&gt;name, 0, ps-&gt;wname);</div><div class='add'>+   pf-&gt;id = id;</div><div class='add'>+   pf-&gt;data = ps-&gt;new;</div><div class='add'>+   pf-&gt;datacount = ps-&gt;writepos;</div><div class='add'>+   ps-&gt;new.prev = NULL;</div><div class='add'>+   ps-&gt;writepos = 0;</div><div class='add'>+</div><div class='add'>+   /* And save it. */</div><div class='add'>+   pf-&gt;next = ps-&gt;saved;</div><div class='add'>+   ps-&gt;saved = pf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Generate an error message (in the given buffer) */</div><div class='add'>+static size_t</div><div class='add'>+store_message(png_store *ps, png_structp pp, char *buffer, size_t bufsize,</div><div class='add'>+   size_t pos, PNG_CONST char *msg)</div><div class='add'>+{</div><div class='add'>+   if (pp != NULL &amp;&amp; pp == ps-&gt;pread)</div><div class='add'>+   {</div><div class='add'>+      /* Reading a file */</div><div class='add'>+      pos = safecat(buffer, bufsize, pos, "read: ");</div><div class='add'>+</div><div class='add'>+      if (ps-&gt;current != NULL)</div><div class='add'>+      {</div><div class='add'>+         pos = safecat(buffer, bufsize, pos, ps-&gt;current-&gt;name);</div><div class='add'>+         pos = safecat(buffer, bufsize, pos, sep);</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   else if (pp != NULL &amp;&amp; pp == ps-&gt;pwrite)</div><div class='add'>+   {</div><div class='add'>+      /* Writing a file */</div><div class='add'>+      pos = safecat(buffer, bufsize, pos, "write: ");</div><div class='add'>+      pos = safecat(buffer, bufsize, pos, ps-&gt;wname);</div><div class='add'>+      pos = safecat(buffer, bufsize, pos, sep);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   else</div><div class='add'>+   {</div><div class='add'>+      /* Neither reading nor writing (or a memory error in struct delete) */</div><div class='add'>+      pos = safecat(buffer, bufsize, pos, "pngvalid: ");</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   if (ps-&gt;test[0] != 0)</div><div class='add'>+   {</div><div class='add'>+      pos = safecat(buffer, bufsize, pos, ps-&gt;test);</div><div class='add'>+      pos = safecat(buffer, bufsize, pos, sep);</div><div class='add'>+   }</div><div class='add'>+   pos = safecat(buffer, bufsize, pos, msg);</div><div class='add'>+   return pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Log an error or warning - the relevant count is always incremented. */</div><div class='add'>+static void</div><div class='add'>+store_log(png_store* ps, png_structp pp, png_const_charp message, int is_error)</div><div class='add'>+{</div><div class='add'>+   /* The warning is copied to the error buffer if there are no errors and it is</div><div class='add'>+    * the first warning.  The error is copied to the error buffer if it is the</div><div class='add'>+    * first error (overwriting any prior warnings).</div><div class='add'>+    */</div><div class='add'>+   if (is_error ? (ps-&gt;nerrors)++ == 0 :</div><div class='add'>+       (ps-&gt;nwarnings)++ == 0 &amp;&amp; ps-&gt;nerrors == 0)</div><div class='add'>+      store_message(ps, pp, ps-&gt;error, sizeof ps-&gt;error, 0, message);</div><div class='add'>+</div><div class='add'>+   if (ps-&gt;verbose)</div><div class='add'>+   {</div><div class='add'>+      char buffer[256];</div><div class='add'>+      size_t pos;</div><div class='add'>+</div><div class='add'>+      if (is_error)</div><div class='add'>+         pos = safecat(buffer, sizeof buffer, 0, "error: ");</div><div class='add'>+      else</div><div class='add'>+         pos = safecat(buffer, sizeof buffer, 0, "warning: ");</div><div class='add'>+</div><div class='add'>+      store_message(ps, pp, buffer, sizeof buffer, pos, message);</div><div class='add'>+      fputs(buffer, stderr);</div><div class='add'>+      fputc('\n', stderr);</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Functions to use as PNG callbacks. */</div><div class='add'>+static void</div><div class='add'>+store_error(png_structp pp, png_const_charp message) /* PNG_NORETURN */</div><div class='add'>+{</div><div class='add'>+   png_store *ps = png_get_error_ptr(pp);</div><div class='add'>+</div><div class='add'>+   if (!ps-&gt;expect_error)</div><div class='add'>+      store_log(ps, pp, message, 1 /* error */);</div><div class='add'>+</div><div class='add'>+   /* And finally throw an exception. */</div><div class='add'>+   {</div><div class='add'>+      struct exception_context *the_exception_context = &amp;ps-&gt;exception_context;</div><div class='add'>+      Throw ps;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+store_warning(png_structp pp, png_const_charp message)</div><div class='add'>+{</div><div class='add'>+   png_store *ps = png_get_error_ptr(pp);</div><div class='add'>+</div><div class='add'>+   if (!ps-&gt;expect_warning)</div><div class='add'>+      store_log(ps, pp, message, 0 /* warning */);</div><div class='add'>+   else</div><div class='add'>+      ps-&gt;saw_warning = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+store_write(png_structp pp, png_bytep pb, png_size_t st)</div><div class='add'>+{</div><div class='add'>+   png_store *ps = png_get_io_ptr(pp);</div><div class='add'>+</div><div class='add'>+   if (ps-&gt;pwrite != pp)</div><div class='add'>+      png_error(pp, "store state damaged");</div><div class='add'>+</div><div class='add'>+   while (st &gt; 0)</div><div class='add'>+   {</div><div class='add'>+      size_t cb;</div><div class='add'>+</div><div class='add'>+      if (ps-&gt;writepos &gt;= STORE_BUFFER_SIZE)</div><div class='add'>+         store_storenew(ps);</div><div class='add'>+</div><div class='add'>+      cb = st;</div><div class='add'>+</div><div class='add'>+      if (cb &gt; STORE_BUFFER_SIZE - ps-&gt;writepos)</div><div class='add'>+         cb = STORE_BUFFER_SIZE - ps-&gt;writepos;</div><div class='add'>+</div><div class='add'>+      memcpy(ps-&gt;new.buffer + ps-&gt;writepos, pb, cb);</div><div class='add'>+      pb += cb;</div><div class='add'>+      st -= cb;</div><div class='add'>+      ps-&gt;writepos += cb;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+store_flush(png_structp pp)</div><div class='add'>+{</div><div class='add'>+   UNUSED(pp) /*DOES NOTHING*/</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t</div><div class='add'>+store_read_buffer_size(png_store *ps)</div><div class='add'>+{</div><div class='add'>+   /* Return the bytes available for read in the current buffer. */</div><div class='add'>+   if (ps-&gt;next != &amp;ps-&gt;current-&gt;data)</div><div class='add'>+      return STORE_BUFFER_SIZE;</div><div class='add'>+</div><div class='add'>+   return ps-&gt;current-&gt;datacount;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return total bytes available for read. */</div><div class='add'>+static size_t</div><div class='add'>+store_read_buffer_avail(png_store *ps)</div><div class='add'>+{</div><div class='add'>+   if (ps-&gt;current != NULL &amp;&amp; ps-&gt;next != NULL)</div><div class='add'>+   {</div><div class='add'>+      png_store_buffer *next = &amp;ps-&gt;current-&gt;data;</div><div class='add'>+      size_t cbAvail = ps-&gt;current-&gt;datacount;</div><div class='add'>+</div><div class='add'>+      while (next != ps-&gt;next &amp;&amp; next != NULL)</div><div class='add'>+      {</div><div class='add'>+         next = next-&gt;prev;</div><div class='add'>+         cbAvail += STORE_BUFFER_SIZE;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      if (next != ps-&gt;next)</div><div class='add'>+         png_error(ps-&gt;pread, "buffer read error");</div><div class='add'>+</div><div class='add'>+      if (cbAvail &gt; ps-&gt;readpos)</div><div class='add'>+         return cbAvail - ps-&gt;readpos;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+store_read_buffer_next(png_store *ps)</div><div class='add'>+{</div><div class='add'>+   png_store_buffer *pbOld = ps-&gt;next;</div><div class='add'>+   png_store_buffer *pbNew = &amp;ps-&gt;current-&gt;data;</div><div class='add'>+   if (pbOld != pbNew)</div><div class='add'>+   {</div><div class='add'>+      while (pbNew != NULL &amp;&amp; pbNew-&gt;prev != pbOld)</div><div class='add'>+         pbNew = pbNew-&gt;prev;</div><div class='add'>+</div><div class='add'>+      if (pbNew != NULL)</div><div class='add'>+      {</div><div class='add'>+         ps-&gt;next = pbNew;</div><div class='add'>+         ps-&gt;readpos = 0;</div><div class='add'>+         return 1;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      png_error(ps-&gt;pread, "buffer lost");</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return 0; /* EOF or error */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Need separate implementation and callback to allow use of the same code</div><div class='add'>+ * during progressive read, where the io_ptr is set internally by libpng.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+store_read_imp(png_store *ps, png_bytep pb, png_size_t st)</div><div class='add'>+{</div><div class='add'>+   if (ps-&gt;current == NULL || ps-&gt;next == NULL)</div><div class='add'>+      png_error(ps-&gt;pread, "store state damaged");</div><div class='add'>+</div><div class='add'>+   while (st &gt; 0)</div><div class='add'>+   {</div><div class='add'>+      size_t cbAvail = store_read_buffer_size(ps) - ps-&gt;readpos;</div><div class='add'>+</div><div class='add'>+      if (cbAvail &gt; 0)</div><div class='add'>+      {</div><div class='add'>+         if (cbAvail &gt; st) cbAvail = st;</div><div class='add'>+         memcpy(pb, ps-&gt;next-&gt;buffer + ps-&gt;readpos, cbAvail);</div><div class='add'>+         st -= cbAvail;</div><div class='add'>+         pb += cbAvail;</div><div class='add'>+         ps-&gt;readpos += cbAvail;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      else if (!store_read_buffer_next(ps))</div><div class='add'>+         png_error(ps-&gt;pread, "read beyond end of file");</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+store_read(png_structp pp, png_bytep pb, png_size_t st)</div><div class='add'>+{</div><div class='add'>+   png_store *ps = png_get_io_ptr(pp);</div><div class='add'>+</div><div class='add'>+   if (ps == NULL || ps-&gt;pread != pp)</div><div class='add'>+      png_error(pp, "bad store read call");</div><div class='add'>+</div><div class='add'>+   store_read_imp(ps, pb, st);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+store_progressive_read(png_store *ps, png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   /* Notice that a call to store_read will cause this function to fail because</div><div class='add'>+    * readpos will be set.</div><div class='add'>+    */</div><div class='add'>+   if (ps-&gt;pread != pp || ps-&gt;current == NULL || ps-&gt;next == NULL)</div><div class='add'>+      png_error(pp, "store state damaged (progressive)");</div><div class='add'>+</div><div class='add'>+   do</div><div class='add'>+   {</div><div class='add'>+      if (ps-&gt;readpos != 0)</div><div class='add'>+         png_error(pp, "store_read called during progressive read");</div><div class='add'>+</div><div class='add'>+      png_process_data(pp, pi, ps-&gt;next-&gt;buffer, store_read_buffer_size(ps));</div><div class='add'>+   }</div><div class='add'>+   while (store_read_buffer_next(ps));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************** MEMORY MANAGEMENT*** ***************************/</div><div class='add'>+/* A store_memory is simply the header for an allocated block of memory.  The</div><div class='add'>+ * pointer returned to libpng is just after the end of the header block, the</div><div class='add'>+ * allocated memory is followed by a second copy of the 'mark'.</div><div class='add'>+ */</div><div class='add'>+typedef struct store_memory</div><div class='add'>+{</div><div class='add'>+   store_pool          *pool;    /* Originating pool */</div><div class='add'>+   struct store_memory *next;    /* Singly linked list */</div><div class='add'>+   png_alloc_size_t     size;    /* Size of memory allocated */</div><div class='add'>+   png_byte             mark[4]; /* ID marker */</div><div class='add'>+} store_memory;</div><div class='add'>+</div><div class='add'>+/* Handle a fatal error in memory allocation.  This calls png_error if the</div><div class='add'>+ * libpng struct is non-NULL, else it outputs a message and returns.  This means</div><div class='add'>+ * that a memory problem while libpng is running will abort (png_error) the</div><div class='add'>+ * handling of particular file while one in cleanup (after the destroy of the</div><div class='add'>+ * struct has returned) will simply keep going and free (or attempt to free)</div><div class='add'>+ * all the memory.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+store_pool_error(png_store *ps, png_structp pp, PNG_CONST char *msg)</div><div class='add'>+{</div><div class='add'>+   if (pp != NULL)</div><div class='add'>+      png_error(pp, msg);</div><div class='add'>+</div><div class='add'>+   /* Else we have to do it ourselves.  png_error eventually calls store_log,</div><div class='add'>+    * above.  store_log accepts a NULL png_structp - it just changes what gets</div><div class='add'>+    * output by store_message.</div><div class='add'>+    */</div><div class='add'>+   store_log(ps, pp, msg, 1 /* error */);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+store_memory_free(png_structp pp, store_pool *pool, store_memory *memory)</div><div class='add'>+{</div><div class='add'>+   /* Note that pp may be NULL (see store_pool_delete below), the caller has</div><div class='add'>+    * found 'memory' in pool-&gt;list *and* unlinked this entry, so this is a valid</div><div class='add'>+    * pointer (for sure), but the contents may have been trashed.</div><div class='add'>+    */</div><div class='add'>+   if (memory-&gt;pool != pool)</div><div class='add'>+      store_pool_error(pool-&gt;store, pp, "memory corrupted (pool)");</div><div class='add'>+</div><div class='add'>+   else if (memcmp(memory-&gt;mark, pool-&gt;mark, sizeof memory-&gt;mark) != 0)</div><div class='add'>+      store_pool_error(pool-&gt;store, pp, "memory corrupted (start)");</div><div class='add'>+</div><div class='add'>+   /* It should be safe to read the size field now. */</div><div class='add'>+   else</div><div class='add'>+   {</div><div class='add'>+      png_alloc_size_t cb = memory-&gt;size;</div><div class='add'>+</div><div class='add'>+      if (cb &gt; pool-&gt;max)</div><div class='add'>+         store_pool_error(pool-&gt;store, pp, "memory corrupted (size)");</div><div class='add'>+</div><div class='add'>+      else if (memcmp((png_bytep)(memory+1)+cb, pool-&gt;mark, sizeof pool-&gt;mark)</div><div class='add'>+         != 0)</div><div class='add'>+         store_pool_error(pool-&gt;store, pp, "memory corrupted (end)");</div><div class='add'>+</div><div class='add'>+      /* Finally give the library a chance to find problems too: */</div><div class='add'>+      else</div><div class='add'>+         {</div><div class='add'>+         pool-&gt;current -= cb;</div><div class='add'>+         free(memory);</div><div class='add'>+         }</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+store_pool_delete(png_store *ps, store_pool *pool)</div><div class='add'>+{</div><div class='add'>+   if (pool-&gt;list != NULL)</div><div class='add'>+   {</div><div class='add'>+      fprintf(stderr, "%s: %s %s: memory lost (list follows):\n", ps-&gt;test,</div><div class='add'>+         pool == &amp;ps-&gt;read_memory_pool ? "read" : "write",</div><div class='add'>+         pool == &amp;ps-&gt;read_memory_pool ? (ps-&gt;current != NULL ?</div><div class='add'>+            ps-&gt;current-&gt;name : "unknown file") : ps-&gt;wname);</div><div class='add'>+      ++ps-&gt;nerrors;</div><div class='add'>+</div><div class='add'>+      do</div><div class='add'>+      {</div><div class='add'>+         store_memory *next = pool-&gt;list;</div><div class='add'>+         pool-&gt;list = next-&gt;next;</div><div class='add'>+         next-&gt;next = NULL;</div><div class='add'>+</div><div class='add'>+         fprintf(stderr, "\t%lu bytes @ %p\n",</div><div class='add'>+             (unsigned long)next-&gt;size, next+1);</div><div class='add'>+         /* The NULL means this will always return, even if the memory is</div><div class='add'>+          * corrupted.</div><div class='add'>+          */</div><div class='add'>+         store_memory_free(NULL, pool, next);</div><div class='add'>+      }</div><div class='add'>+      while (pool-&gt;list != NULL);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* And reset the other fields too for the next time. */</div><div class='add'>+   if (pool-&gt;max &gt; pool-&gt;max_max) pool-&gt;max_max = pool-&gt;max;</div><div class='add'>+   pool-&gt;max = 0;</div><div class='add'>+   if (pool-&gt;current != 0) /* unexpected internal error */</div><div class='add'>+      fprintf(stderr, "%s: %s %s: memory counter mismatch (internal error)\n",</div><div class='add'>+         ps-&gt;test, pool == &amp;ps-&gt;read_memory_pool ? "read" : "write",</div><div class='add'>+         pool == &amp;ps-&gt;read_memory_pool ? (ps-&gt;current != NULL ?</div><div class='add'>+            ps-&gt;current-&gt;name : "unknown file") : ps-&gt;wname);</div><div class='add'>+   pool-&gt;current = 0;</div><div class='add'>+</div><div class='add'>+   if (pool-&gt;limit &gt; pool-&gt;max_limit)</div><div class='add'>+      pool-&gt;max_limit = pool-&gt;limit;</div><div class='add'>+</div><div class='add'>+   pool-&gt;limit = 0;</div><div class='add'>+</div><div class='add'>+   if (pool-&gt;total &gt; pool-&gt;max_total)</div><div class='add'>+      pool-&gt;max_total = pool-&gt;total;</div><div class='add'>+</div><div class='add'>+   pool-&gt;total = 0;</div><div class='add'>+</div><div class='add'>+   /* Get a new mark too. */</div><div class='add'>+   store_pool_mark(pool-&gt;mark);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The memory callbacks: */</div><div class='add'>+static png_voidp</div><div class='add'>+store_malloc(png_structp pp, png_alloc_size_t cb)</div><div class='add'>+{</div><div class='add'>+   store_pool *pool = png_get_mem_ptr(pp);</div><div class='add'>+   store_memory *new = malloc(cb + (sizeof *new) + (sizeof pool-&gt;mark));</div><div class='add'>+</div><div class='add'>+   if (new != NULL)</div><div class='add'>+   {</div><div class='add'>+      if (cb &gt; pool-&gt;max)</div><div class='add'>+         pool-&gt;max = cb;</div><div class='add'>+</div><div class='add'>+      pool-&gt;current += cb;</div><div class='add'>+</div><div class='add'>+      if (pool-&gt;current &gt; pool-&gt;limit)</div><div class='add'>+         pool-&gt;limit = pool-&gt;current;</div><div class='add'>+</div><div class='add'>+      pool-&gt;total += cb;</div><div class='add'>+</div><div class='add'>+      new-&gt;size = cb;</div><div class='add'>+      memcpy(new-&gt;mark, pool-&gt;mark, sizeof new-&gt;mark);</div><div class='add'>+      memcpy((png_byte*)(new+1) + cb, pool-&gt;mark, sizeof pool-&gt;mark);</div><div class='add'>+      new-&gt;pool = pool;</div><div class='add'>+      new-&gt;next = pool-&gt;list;</div><div class='add'>+      pool-&gt;list = new;</div><div class='add'>+      ++new;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   else</div><div class='add'>+      store_pool_error(pool-&gt;store, pp, "out of memory");</div><div class='add'>+</div><div class='add'>+   return new;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+store_free(png_structp pp, png_voidp memory)</div><div class='add'>+{</div><div class='add'>+   store_pool *pool = png_get_mem_ptr(pp);</div><div class='add'>+   store_memory *this = memory, **test;</div><div class='add'>+</div><div class='add'>+   /* First check that this 'memory' really is valid memory - it must be in the</div><div class='add'>+    * pool list.  If it is, use the shared memory_free function to free it.</div><div class='add'>+    */</div><div class='add'>+   --this;</div><div class='add'>+   for (test = &amp;pool-&gt;list; *test != this; test = &amp;(*test)-&gt;next)</div><div class='add'>+   {</div><div class='add'>+      if (*test == NULL)</div><div class='add'>+      {</div><div class='add'>+         store_pool_error(pool-&gt;store, pp, "bad pointer to free");</div><div class='add'>+         return;</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* Unlink this entry, *test == this. */</div><div class='add'>+   *test = this-&gt;next;</div><div class='add'>+   this-&gt;next = NULL;</div><div class='add'>+   store_memory_free(pp, pool, this);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Setup functions. */</div><div class='add'>+/* Cleanup when aborting a write or after storing the new file. */</div><div class='add'>+static void</div><div class='add'>+store_write_reset(png_store *ps)</div><div class='add'>+{</div><div class='add'>+   if (ps-&gt;pwrite != NULL)</div><div class='add'>+   {</div><div class='add'>+      anon_context(ps);</div><div class='add'>+</div><div class='add'>+      Try</div><div class='add'>+         png_destroy_write_struct(&amp;ps-&gt;pwrite, &amp;ps-&gt;piwrite);</div><div class='add'>+</div><div class='add'>+      Catch_anonymous</div><div class='add'>+      {</div><div class='add'>+         /* memory corruption: continue. */</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      ps-&gt;pwrite = NULL;</div><div class='add'>+      ps-&gt;piwrite = NULL;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* And make sure that all the memory has been freed - this will output</div><div class='add'>+    * spurious errors in the case of memory corruption above, but this is safe.</div><div class='add'>+    */</div><div class='add'>+   store_pool_delete(ps, &amp;ps-&gt;write_memory_pool);</div><div class='add'>+</div><div class='add'>+   store_freenew(ps);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The following is the main write function, it returns a png_struct and,</div><div class='add'>+ * optionally, a png_info suitable for writiing a new PNG file.  Use</div><div class='add'>+ * store_storefile above to record this file after it has been written.  The</div><div class='add'>+ * returned libpng structures as destroyed by store_write_reset above.</div><div class='add'>+ */</div><div class='add'>+static png_structp</div><div class='add'>+set_store_for_write(png_store *ps, png_infopp ppi,</div><div class='add'>+   PNG_CONST char * volatile name)</div><div class='add'>+{</div><div class='add'>+   anon_context(ps);</div><div class='add'>+</div><div class='add'>+   Try</div><div class='add'>+   {</div><div class='add'>+      if (ps-&gt;pwrite != NULL)</div><div class='add'>+         png_error(ps-&gt;pwrite, "write store already in use");</div><div class='add'>+</div><div class='add'>+      store_write_reset(ps);</div><div class='add'>+      safecat(ps-&gt;wname, sizeof ps-&gt;wname, 0, name);</div><div class='add'>+</div><div class='add'>+      /* Don't do the slow memory checks if doing a speed test. */</div><div class='add'>+      if (ps-&gt;speed)</div><div class='add'>+         ps-&gt;pwrite = png_create_write_struct(PNG_LIBPNG_VER_STRING,</div><div class='add'>+            ps, store_error, store_warning);</div><div class='add'>+</div><div class='add'>+      else</div><div class='add'>+         ps-&gt;pwrite = png_create_write_struct_2(PNG_LIBPNG_VER_STRING,</div><div class='add'>+            ps, store_error, store_warning, &amp;ps-&gt;write_memory_pool,</div><div class='add'>+            store_malloc, store_free);</div><div class='add'>+</div><div class='add'>+      png_set_write_fn(ps-&gt;pwrite, ps, store_write, store_flush);</div><div class='add'>+</div><div class='add'>+      if (ppi != NULL)</div><div class='add'>+         *ppi = ps-&gt;piwrite = png_create_info_struct(ps-&gt;pwrite);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   Catch_anonymous</div><div class='add'>+      return NULL;</div><div class='add'>+</div><div class='add'>+   return ps-&gt;pwrite;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Cleanup when finished reading (either due to error or in the success case).</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+store_read_reset(png_store *ps)</div><div class='add'>+{</div><div class='add'>+   if (ps-&gt;pread != NULL)</div><div class='add'>+   {</div><div class='add'>+      anon_context(ps);</div><div class='add'>+</div><div class='add'>+      Try</div><div class='add'>+         png_destroy_read_struct(&amp;ps-&gt;pread, &amp;ps-&gt;piread, NULL);</div><div class='add'>+</div><div class='add'>+      Catch_anonymous</div><div class='add'>+      {</div><div class='add'>+         /* error already output: continue */</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      ps-&gt;pread = NULL;</div><div class='add'>+      ps-&gt;piread = NULL;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* Always do this to be safe. */</div><div class='add'>+   store_pool_delete(ps, &amp;ps-&gt;read_memory_pool);</div><div class='add'>+</div><div class='add'>+   ps-&gt;current = NULL;</div><div class='add'>+   ps-&gt;next = NULL;</div><div class='add'>+   ps-&gt;readpos = 0;</div><div class='add'>+   ps-&gt;validated = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+store_read_set(png_store *ps, png_uint_32 id)</div><div class='add'>+{</div><div class='add'>+   png_store_file *pf = ps-&gt;saved;</div><div class='add'>+</div><div class='add'>+   while (pf != NULL)</div><div class='add'>+   {</div><div class='add'>+      if (pf-&gt;id == id)</div><div class='add'>+      {</div><div class='add'>+         ps-&gt;current = pf;</div><div class='add'>+         ps-&gt;next = NULL;</div><div class='add'>+         store_read_buffer_next(ps);</div><div class='add'>+         return;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      pf = pf-&gt;next;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+      {</div><div class='add'>+      size_t pos;</div><div class='add'>+      char msg[FILE_NAME_SIZE+64];</div><div class='add'>+</div><div class='add'>+      pos = standard_name_from_id(msg, sizeof msg, 0, id);</div><div class='add'>+      pos = safecat(msg, sizeof msg, pos, ": file not found");</div><div class='add'>+      png_error(ps-&gt;pread, msg);</div><div class='add'>+      }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The main interface for reading a saved file - pass the id number of the file</div><div class='add'>+ * to retrieve.  Ids must be unique or the earlier file will be hidden.  The API</div><div class='add'>+ * returns a png_struct and, optionally, a png_info.  Both of these will be</div><div class='add'>+ * destroyed by store_read_reset above.</div><div class='add'>+ */</div><div class='add'>+static png_structp</div><div class='add'>+set_store_for_read(png_store *ps, png_infopp ppi, png_uint_32 id,</div><div class='add'>+   PNG_CONST char *name)</div><div class='add'>+{</div><div class='add'>+   /* Set the name for png_error */</div><div class='add'>+   safecat(ps-&gt;test, sizeof ps-&gt;test, 0, name);</div><div class='add'>+</div><div class='add'>+   if (ps-&gt;pread != NULL)</div><div class='add'>+      png_error(ps-&gt;pread, "read store already in use");</div><div class='add'>+</div><div class='add'>+   store_read_reset(ps);</div><div class='add'>+</div><div class='add'>+   /* Both the create APIs can return NULL if used in their default mode</div><div class='add'>+    * (because there is no other way of handling an error because the jmp_buf</div><div class='add'>+    * by default is stored in png_struct and that has not been allocated!)</div><div class='add'>+    * However, given that store_error works correctly in these circumstances</div><div class='add'>+    * we don't ever expect NULL in this program.</div><div class='add'>+    */</div><div class='add'>+   if (ps-&gt;speed)</div><div class='add'>+      ps-&gt;pread = png_create_read_struct(PNG_LIBPNG_VER_STRING, ps,</div><div class='add'>+          store_error, store_warning);</div><div class='add'>+</div><div class='add'>+   else</div><div class='add'>+      ps-&gt;pread = png_create_read_struct_2(PNG_LIBPNG_VER_STRING, ps,</div><div class='add'>+          store_error, store_warning, &amp;ps-&gt;read_memory_pool, store_malloc,</div><div class='add'>+          store_free);</div><div class='add'>+</div><div class='add'>+   if (ps-&gt;pread == NULL)</div><div class='add'>+   {</div><div class='add'>+      struct exception_context *the_exception_context = &amp;ps-&gt;exception_context;</div><div class='add'>+</div><div class='add'>+      store_log(ps, NULL, "png_create_read_struct returned NULL (unexpected)",</div><div class='add'>+         1 /*error*/);</div><div class='add'>+</div><div class='add'>+      Throw ps;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   store_read_set(ps, id);</div><div class='add'>+</div><div class='add'>+   if (ppi != NULL)</div><div class='add'>+      *ppi = ps-&gt;piread = png_create_info_struct(ps-&gt;pread);</div><div class='add'>+</div><div class='add'>+   return ps-&gt;pread;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The overall cleanup of a store simply calls the above then removes all the</div><div class='add'>+ * saved files.  This does not delete the store itself.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+store_delete(png_store *ps)</div><div class='add'>+{</div><div class='add'>+   store_write_reset(ps);</div><div class='add'>+   store_read_reset(ps);</div><div class='add'>+   store_freefile(&amp;ps-&gt;saved);</div><div class='add'>+</div><div class='add'>+   if (ps-&gt;image != NULL)</div><div class='add'>+   {</div><div class='add'>+      free(ps-&gt;image-1);</div><div class='add'>+      ps-&gt;image = NULL;</div><div class='add'>+      ps-&gt;cb_image = 0;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*********************** PNG FILE MODIFICATION ON READ ************************/</div><div class='add'>+/* Files may be modified on read.  The following structure contains a complete</div><div class='add'>+ * png_store together with extra members to handle modification and a special</div><div class='add'>+ * read callback for libpng.  To use this the 'modifications' field must be set</div><div class='add'>+ * to a list of png_modification structures that actually perform the</div><div class='add'>+ * modification, otherwise a png_modifier is functionally equivalent to a</div><div class='add'>+ * png_store.  There is a special read function, set_modifier_for_read, which</div><div class='add'>+ * replaces set_store_for_read.</div><div class='add'>+ */</div><div class='add'>+typedef struct png_modifier</div><div class='add'>+{</div><div class='add'>+   png_store               this;             /* I am a png_store */</div><div class='add'>+   struct png_modification *modifications;   /* Changes to make */</div><div class='add'>+</div><div class='add'>+   enum modifier_state</div><div class='add'>+   {</div><div class='add'>+      modifier_start,                        /* Initial value */</div><div class='add'>+      modifier_signature,                    /* Have a signature */</div><div class='add'>+      modifier_IHDR                          /* Have an IHDR */</div><div class='add'>+   }                        state;           /* My state */</div><div class='add'>+</div><div class='add'>+   /* Information from IHDR: */</div><div class='add'>+   png_byte                 bit_depth;       /* From IHDR */</div><div class='add'>+   png_byte                 colour_type;     /* From IHDR */</div><div class='add'>+</div><div class='add'>+   /* While handling PLTE, IDAT and IEND these chunks may be pended to allow</div><div class='add'>+    * other chunks to be inserted.</div><div class='add'>+    */</div><div class='add'>+   png_uint_32              pending_len;</div><div class='add'>+   png_uint_32              pending_chunk;</div><div class='add'>+</div><div class='add'>+   /* Test values */</div><div class='add'>+   double                  *gammas;</div><div class='add'>+   unsigned int             ngammas;</div><div class='add'>+</div><div class='add'>+   /* Lowest sbit to test (libpng fails for sbit &lt; 8) */</div><div class='add'>+   png_byte                 sbitlow;</div><div class='add'>+</div><div class='add'>+   /* Error control - these are the limits on errors accepted by the gamma tests</div><div class='add'>+    * below.</div><div class='add'>+    */</div><div class='add'>+   double                   maxout8;  /* Maximum output value error */</div><div class='add'>+   double                   maxabs8;  /* Absolute sample error 0..1 */</div><div class='add'>+   double                   maxpc8;   /* Percentage sample error 0..100% */</div><div class='add'>+   double                   maxout16; /* Maximum output value error */</div><div class='add'>+   double                   maxabs16; /* Absolute sample error 0..1 */</div><div class='add'>+   double                   maxpc16;  /* Percentage sample error 0..100% */</div><div class='add'>+</div><div class='add'>+   /* Logged 8 and 16 bit errors ('output' values): */</div><div class='add'>+   double                   error_gray_2;</div><div class='add'>+   double                   error_gray_4;</div><div class='add'>+   double                   error_gray_8;</div><div class='add'>+   double                   error_gray_16;</div><div class='add'>+   double                   error_color_8;</div><div class='add'>+   double                   error_color_16;</div><div class='add'>+</div><div class='add'>+   /* Flags: */</div><div class='add'>+   /* Whether or not to interlace. */</div><div class='add'>+   int                      interlace_type :9; /* int, but must store '1' */</div><div class='add'>+</div><div class='add'>+   /* Run the standard tests? */</div><div class='add'>+   unsigned int             test_standard :1;</div><div class='add'>+</div><div class='add'>+   /* Run the odd-sized image and interlace read/write tests? */</div><div class='add'>+   unsigned int             test_size :1;</div><div class='add'>+</div><div class='add'>+   /* Run tests on reading with a combiniation of transforms, */</div><div class='add'>+   unsigned int             test_transform :1;</div><div class='add'>+</div><div class='add'>+   /* When to use the use_input_precision option: */</div><div class='add'>+   unsigned int             use_input_precision :1;</div><div class='add'>+   unsigned int             use_input_precision_sbit :1;</div><div class='add'>+   unsigned int             use_input_precision_16to8 :1;</div><div class='add'>+</div><div class='add'>+   /* Which gamma tests to run: */</div><div class='add'>+   unsigned int             test_gamma_threshold :1;</div><div class='add'>+   unsigned int             test_gamma_transform :1; /* main tests */</div><div class='add'>+   unsigned int             test_gamma_sbit :1;</div><div class='add'>+   unsigned int             test_gamma_strip16 :1;</div><div class='add'>+</div><div class='add'>+   unsigned int             log :1;   /* Log max error */</div><div class='add'>+</div><div class='add'>+   /* Buffer information, the buffer size limits the size of the chunks that can</div><div class='add'>+    * be modified - they must fit (including header and CRC) into the buffer!</div><div class='add'>+    */</div><div class='add'>+   size_t                   flush;           /* Count of bytes to flush */</div><div class='add'>+   size_t                   buffer_count;    /* Bytes in buffer */</div><div class='add'>+   size_t                   buffer_position; /* Position in buffer */</div><div class='add'>+   png_byte                 buffer[1024];</div><div class='add'>+} png_modifier;</div><div class='add'>+</div><div class='add'>+static double abserr(png_modifier *pm, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   return bit_depth == 16 ? pm-&gt;maxabs16 : pm-&gt;maxabs8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static double pcerr(png_modifier *pm, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   return (bit_depth == 16 ? pm-&gt;maxpc16 : pm-&gt;maxpc8) * .01;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static double outerr(png_modifier *pm, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   /* There is a serious error in the 2 and 4 bit grayscale transform because</div><div class='add'>+    * the gamma table value (8 bits) is simply shifted, not rounded, so the</div><div class='add'>+    * error in 4 bit greyscale gamma is up to the value below.  This is a hack</div><div class='add'>+    * to allow pngvalid to succeed:</div><div class='add'>+    */</div><div class='add'>+   if (bit_depth == 2)</div><div class='add'>+      return .73182-.5;</div><div class='add'>+</div><div class='add'>+   if (bit_depth == 4)</div><div class='add'>+      return .90644-.5;</div><div class='add'>+</div><div class='add'>+   if (bit_depth == 16)</div><div class='add'>+     return pm-&gt;maxout16;</div><div class='add'>+</div><div class='add'>+   return pm-&gt;maxout8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This returns true if the test should be stopped now because it has already</div><div class='add'>+ * failed and it is running silently.</div><div class='add'>+ */</div><div class='add'>+static int fail(png_modifier *pm)</div><div class='add'>+{</div><div class='add'>+   return !pm-&gt;log &amp;&amp; !pm-&gt;this.verbose &amp;&amp; (pm-&gt;this.nerrors &gt; 0 ||</div><div class='add'>+       (pm-&gt;this.treat_warnings_as_errors &amp;&amp; pm-&gt;this.nwarnings &gt; 0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+modifier_init(png_modifier *pm)</div><div class='add'>+{</div><div class='add'>+   memset(pm, 0, sizeof *pm);</div><div class='add'>+   store_init(&amp;pm-&gt;this);</div><div class='add'>+   pm-&gt;modifications = NULL;</div><div class='add'>+   pm-&gt;state = modifier_start;</div><div class='add'>+   pm-&gt;sbitlow = 1U;</div><div class='add'>+   pm-&gt;maxout8 = pm-&gt;maxpc8 = pm-&gt;maxabs8 = 0;</div><div class='add'>+   pm-&gt;maxout16 = pm-&gt;maxpc16 = pm-&gt;maxabs16 = 0;</div><div class='add'>+   pm-&gt;error_gray_2 = pm-&gt;error_gray_4 = pm-&gt;error_gray_8 = 0;</div><div class='add'>+   pm-&gt;error_gray_16 = pm-&gt;error_color_8 = pm-&gt;error_color_16 = 0;</div><div class='add'>+   pm-&gt;interlace_type = PNG_INTERLACE_NONE;</div><div class='add'>+   pm-&gt;test_standard = 0;</div><div class='add'>+   pm-&gt;test_size = 0;</div><div class='add'>+   pm-&gt;test_transform = 0;</div><div class='add'>+   pm-&gt;use_input_precision = 0;</div><div class='add'>+   pm-&gt;use_input_precision_sbit = 0;</div><div class='add'>+   pm-&gt;use_input_precision_16to8 = 0;</div><div class='add'>+   pm-&gt;test_gamma_threshold = 0;</div><div class='add'>+   pm-&gt;test_gamma_transform = 0;</div><div class='add'>+   pm-&gt;test_gamma_sbit = 0;</div><div class='add'>+   pm-&gt;test_gamma_strip16 = 0;</div><div class='add'>+   pm-&gt;log = 0;</div><div class='add'>+</div><div class='add'>+   /* Rely on the memset for all the other fields - there are no pointers */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* One modification structure must be provided for each chunk to be modified (in</div><div class='add'>+ * fact more than one can be provided if multiple separate changes are desired</div><div class='add'>+ * for a single chunk.)  Modifications include adding a new chunk when a</div><div class='add'>+ * suitable chunk does not exist.</div><div class='add'>+ *</div><div class='add'>+ * The caller of modify_fn will reset the CRC of the chunk and record 'modified'</div><div class='add'>+ * or 'added' as appropriate if the modify_fn returns 1 (true).  If the</div><div class='add'>+ * modify_fn is NULL the chunk is simply removed.</div><div class='add'>+ */</div><div class='add'>+typedef struct png_modification</div><div class='add'>+{</div><div class='add'>+   struct png_modification *next;</div><div class='add'>+   png_uint_32              chunk;</div><div class='add'>+</div><div class='add'>+   /* If the following is NULL all matching chunks will be removed: */</div><div class='add'>+   int                    (*modify_fn)(struct png_modifier *pm,</div><div class='add'>+                               struct png_modification *me, int add);</div><div class='add'>+</div><div class='add'>+   /* If the following is set to PLTE, IDAT or IEND and the chunk has not been</div><div class='add'>+    * found and modified (and there is a modify_fn) the modify_fn will be called</div><div class='add'>+    * to add the chunk before the relevant chunk.</div><div class='add'>+    */</div><div class='add'>+   png_uint_32              add;</div><div class='add'>+   unsigned int             modified :1;     /* Chunk was modified */</div><div class='add'>+   unsigned int             added    :1;     /* Chunk was added */</div><div class='add'>+   unsigned int             removed  :1;     /* Chunk was removed */</div><div class='add'>+} png_modification;</div><div class='add'>+</div><div class='add'>+static void modification_reset(png_modification *pmm)</div><div class='add'>+{</div><div class='add'>+   if (pmm != NULL)</div><div class='add'>+   {</div><div class='add'>+      pmm-&gt;modified = 0;</div><div class='add'>+      pmm-&gt;added = 0;</div><div class='add'>+      pmm-&gt;removed = 0;</div><div class='add'>+      modification_reset(pmm-&gt;next);</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+modification_init(png_modification *pmm)</div><div class='add'>+{</div><div class='add'>+   memset(pmm, 0, sizeof *pmm);</div><div class='add'>+   pmm-&gt;next = NULL;</div><div class='add'>+   pmm-&gt;chunk = 0;</div><div class='add'>+   pmm-&gt;modify_fn = NULL;</div><div class='add'>+   pmm-&gt;add = 0;</div><div class='add'>+   modification_reset(pmm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+modifier_reset(png_modifier *pm)</div><div class='add'>+{</div><div class='add'>+   store_read_reset(&amp;pm-&gt;this);</div><div class='add'>+   pm-&gt;modifications = NULL;</div><div class='add'>+   pm-&gt;state = modifier_start;</div><div class='add'>+   pm-&gt;bit_depth = pm-&gt;colour_type = 0;</div><div class='add'>+   pm-&gt;pending_len = pm-&gt;pending_chunk = 0;</div><div class='add'>+   pm-&gt;flush = pm-&gt;buffer_count = pm-&gt;buffer_position = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convenience macros. */</div><div class='add'>+#define CHUNK(a,b,c,d) (((a)&lt;&lt;24)+((b)&lt;&lt;16)+((c)&lt;&lt;8)+(d))</div><div class='add'>+#define CHUNK_IHDR CHUNK(73,72,68,82)</div><div class='add'>+#define CHUNK_PLTE CHUNK(80,76,84,69)</div><div class='add'>+#define CHUNK_IDAT CHUNK(73,68,65,84)</div><div class='add'>+#define CHUNK_IEND CHUNK(73,69,78,68)</div><div class='add'>+#define CHUNK_cHRM CHUNK(99,72,82,77)</div><div class='add'>+#define CHUNK_gAMA CHUNK(103,65,77,65)</div><div class='add'>+#define CHUNK_sBIT CHUNK(115,66,73,84)</div><div class='add'>+#define CHUNK_sRGB CHUNK(115,82,71,66)</div><div class='add'>+</div><div class='add'>+/* The guts of modification are performed during a read. */</div><div class='add'>+static void</div><div class='add'>+modifier_crc(png_bytep buffer)</div><div class='add'>+{</div><div class='add'>+   /* Recalculate the chunk CRC - a complete chunk must be in</div><div class='add'>+    * the buffer, at the start.</div><div class='add'>+    */</div><div class='add'>+   uInt datalen = png_get_uint_32(buffer);</div><div class='add'>+   png_save_uint_32(buffer+datalen+8, crc32(0L, buffer+4, datalen+4));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+modifier_setbuffer(png_modifier *pm)</div><div class='add'>+{</div><div class='add'>+   modifier_crc(pm-&gt;buffer);</div><div class='add'>+   pm-&gt;buffer_count = png_get_uint_32(pm-&gt;buffer)+12;</div><div class='add'>+   pm-&gt;buffer_position = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Separate the callback into the actual implementation (which is passed the</div><div class='add'>+ * png_modifier explicitly) and the callback, which gets the modifier from the</div><div class='add'>+ * png_struct.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+modifier_read_imp(png_modifier *pm, png_bytep pb, png_size_t st)</div><div class='add'>+{</div><div class='add'>+   while (st &gt; 0)</div><div class='add'>+   {</div><div class='add'>+      size_t cb;</div><div class='add'>+      png_uint_32 len, chunk;</div><div class='add'>+      png_modification *mod;</div><div class='add'>+</div><div class='add'>+      if (pm-&gt;buffer_position &gt;= pm-&gt;buffer_count) switch (pm-&gt;state)</div><div class='add'>+      {</div><div class='add'>+         static png_byte sign[8] = { 137, 80, 78, 71, 13, 10, 26, 10 };</div><div class='add'>+         case modifier_start:</div><div class='add'>+            store_read_imp(&amp;pm-&gt;this, pm-&gt;buffer, 8); /* size of signature. */</div><div class='add'>+            pm-&gt;buffer_count = 8;</div><div class='add'>+            pm-&gt;buffer_position = 0;</div><div class='add'>+</div><div class='add'>+            if (memcmp(pm-&gt;buffer, sign, 8) != 0)</div><div class='add'>+               png_error(pm-&gt;this.pread, "invalid PNG file signature");</div><div class='add'>+            pm-&gt;state = modifier_signature;</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         case modifier_signature:</div><div class='add'>+            store_read_imp(&amp;pm-&gt;this, pm-&gt;buffer, 13+12); /* size of IHDR */</div><div class='add'>+            pm-&gt;buffer_count = 13+12;</div><div class='add'>+            pm-&gt;buffer_position = 0;</div><div class='add'>+</div><div class='add'>+            if (png_get_uint_32(pm-&gt;buffer) != 13 ||</div><div class='add'>+                png_get_uint_32(pm-&gt;buffer+4) != CHUNK_IHDR)</div><div class='add'>+               png_error(pm-&gt;this.pread, "invalid IHDR");</div><div class='add'>+</div><div class='add'>+            /* Check the list of modifiers for modifications to the IHDR. */</div><div class='add'>+            mod = pm-&gt;modifications;</div><div class='add'>+            while (mod != NULL)</div><div class='add'>+            {</div><div class='add'>+               if (mod-&gt;chunk == CHUNK_IHDR &amp;&amp; mod-&gt;modify_fn &amp;&amp;</div><div class='add'>+                   (*mod-&gt;modify_fn)(pm, mod, 0))</div><div class='add'>+                  {</div><div class='add'>+                  mod-&gt;modified = 1;</div><div class='add'>+                  modifier_setbuffer(pm);</div><div class='add'>+                  }</div><div class='add'>+</div><div class='add'>+               /* Ignore removal or add if IHDR! */</div><div class='add'>+               mod = mod-&gt;next;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            /* Cache information from the IHDR (the modified one.) */</div><div class='add'>+            pm-&gt;bit_depth = pm-&gt;buffer[8+8];</div><div class='add'>+            pm-&gt;colour_type = pm-&gt;buffer[8+8+1];</div><div class='add'>+</div><div class='add'>+            pm-&gt;state = modifier_IHDR;</div><div class='add'>+            pm-&gt;flush = 0;</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         case modifier_IHDR:</div><div class='add'>+         default:</div><div class='add'>+            /* Read a new chunk and process it until we see PLTE, IDAT or</div><div class='add'>+             * IEND.  'flush' indicates that there is still some data to</div><div class='add'>+             * output from the preceding chunk.</div><div class='add'>+             */</div><div class='add'>+            if ((cb = pm-&gt;flush) &gt; 0)</div><div class='add'>+            {</div><div class='add'>+               if (cb &gt; st) cb = st;</div><div class='add'>+               pm-&gt;flush -= cb;</div><div class='add'>+               store_read_imp(&amp;pm-&gt;this, pb, cb);</div><div class='add'>+               pb += cb;</div><div class='add'>+               st -= cb;</div><div class='add'>+               if (st &lt;= 0) return;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            /* No more bytes to flush, read a header, or handle a pending</div><div class='add'>+             * chunk.</div><div class='add'>+             */</div><div class='add'>+            if (pm-&gt;pending_chunk != 0)</div><div class='add'>+            {</div><div class='add'>+               png_save_uint_32(pm-&gt;buffer, pm-&gt;pending_len);</div><div class='add'>+               png_save_uint_32(pm-&gt;buffer+4, pm-&gt;pending_chunk);</div><div class='add'>+               pm-&gt;pending_len = 0;</div><div class='add'>+               pm-&gt;pending_chunk = 0;</div><div class='add'>+            }</div><div class='add'>+            else</div><div class='add'>+               store_read_imp(&amp;pm-&gt;this, pm-&gt;buffer, 8);</div><div class='add'>+</div><div class='add'>+            pm-&gt;buffer_count = 8;</div><div class='add'>+            pm-&gt;buffer_position = 0;</div><div class='add'>+</div><div class='add'>+            /* Check for something to modify or a terminator chunk. */</div><div class='add'>+            len = png_get_uint_32(pm-&gt;buffer);</div><div class='add'>+            chunk = png_get_uint_32(pm-&gt;buffer+4);</div><div class='add'>+</div><div class='add'>+            /* Terminators first, they may have to be delayed for added</div><div class='add'>+             * chunks</div><div class='add'>+             */</div><div class='add'>+            if (chunk == CHUNK_PLTE || chunk == CHUNK_IDAT ||</div><div class='add'>+                chunk == CHUNK_IEND)</div><div class='add'>+            {</div><div class='add'>+               mod = pm-&gt;modifications;</div><div class='add'>+</div><div class='add'>+               while (mod != NULL)</div><div class='add'>+               {</div><div class='add'>+                  if ((mod-&gt;add == chunk ||</div><div class='add'>+                      (mod-&gt;add == CHUNK_PLTE &amp;&amp; chunk == CHUNK_IDAT)) &amp;&amp;</div><div class='add'>+                      mod-&gt;modify_fn != NULL &amp;&amp; !mod-&gt;modified &amp;&amp; !mod-&gt;added)</div><div class='add'>+                  {</div><div class='add'>+                     /* Regardless of what the modify function does do not run</div><div class='add'>+                      * this again.</div><div class='add'>+                      */</div><div class='add'>+                     mod-&gt;added = 1;</div><div class='add'>+</div><div class='add'>+                     if ((*mod-&gt;modify_fn)(pm, mod, 1 /*add*/))</div><div class='add'>+                     {</div><div class='add'>+                        /* Reset the CRC on a new chunk */</div><div class='add'>+                        if (pm-&gt;buffer_count &gt; 0)</div><div class='add'>+                           modifier_setbuffer(pm);</div><div class='add'>+</div><div class='add'>+                        else</div><div class='add'>+                           {</div><div class='add'>+                           pm-&gt;buffer_position = 0;</div><div class='add'>+                           mod-&gt;removed = 1;</div><div class='add'>+                           }</div><div class='add'>+</div><div class='add'>+                        /* The buffer has been filled with something (we assume)</div><div class='add'>+                         * so output this.  Pend the current chunk.</div><div class='add'>+                         */</div><div class='add'>+                        pm-&gt;pending_len = len;</div><div class='add'>+                        pm-&gt;pending_chunk = chunk;</div><div class='add'>+                        break; /* out of while */</div><div class='add'>+                     }</div><div class='add'>+                  }</div><div class='add'>+</div><div class='add'>+                  mod = mod-&gt;next;</div><div class='add'>+               }</div><div class='add'>+</div><div class='add'>+               /* Don't do any further processing if the buffer was modified -</div><div class='add'>+                * otherwise the code will end up modifying a chunk that was</div><div class='add'>+                * just added.</div><div class='add'>+                */</div><div class='add'>+               if (mod != NULL)</div><div class='add'>+                  break; /* out of switch */</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            /* If we get to here then this chunk may need to be modified.  To</div><div class='add'>+             * do this it must be less than 1024 bytes in total size, otherwise</div><div class='add'>+             * it just gets flushed.</div><div class='add'>+             */</div><div class='add'>+            if (len+12 &lt;= sizeof pm-&gt;buffer)</div><div class='add'>+            {</div><div class='add'>+               store_read_imp(&amp;pm-&gt;this, pm-&gt;buffer+pm-&gt;buffer_count,</div><div class='add'>+                   len+12-pm-&gt;buffer_count);</div><div class='add'>+               pm-&gt;buffer_count = len+12;</div><div class='add'>+</div><div class='add'>+               /* Check for a modification, else leave it be. */</div><div class='add'>+               mod = pm-&gt;modifications;</div><div class='add'>+               while (mod != NULL)</div><div class='add'>+               {</div><div class='add'>+                  if (mod-&gt;chunk == chunk)</div><div class='add'>+                  {</div><div class='add'>+                     if (mod-&gt;modify_fn == NULL)</div><div class='add'>+                     {</div><div class='add'>+                        /* Remove this chunk */</div><div class='add'>+                        pm-&gt;buffer_count = pm-&gt;buffer_position = 0;</div><div class='add'>+                        mod-&gt;removed = 1;</div><div class='add'>+                        break; /* Terminate the while loop */</div><div class='add'>+                     }</div><div class='add'>+</div><div class='add'>+                     else if ((*mod-&gt;modify_fn)(pm, mod, 0))</div><div class='add'>+                     {</div><div class='add'>+                        mod-&gt;modified = 1;</div><div class='add'>+                        /* The chunk may have been removed: */</div><div class='add'>+                        if (pm-&gt;buffer_count == 0)</div><div class='add'>+                        {</div><div class='add'>+                           pm-&gt;buffer_position = 0;</div><div class='add'>+                           break;</div><div class='add'>+                        }</div><div class='add'>+                        modifier_setbuffer(pm);</div><div class='add'>+                     }</div><div class='add'>+                  }</div><div class='add'>+</div><div class='add'>+                  mod = mod-&gt;next;</div><div class='add'>+               }</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            else</div><div class='add'>+               pm-&gt;flush = len+12 - pm-&gt;buffer_count; /* data + crc */</div><div class='add'>+</div><div class='add'>+            /* Take the data from the buffer (if there is any). */</div><div class='add'>+            break;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* Here to read from the modifier buffer (not directly from</div><div class='add'>+       * the store, as in the flush case above.)</div><div class='add'>+       */</div><div class='add'>+      cb = pm-&gt;buffer_count - pm-&gt;buffer_position;</div><div class='add'>+</div><div class='add'>+      if (cb &gt; st)</div><div class='add'>+         cb = st;</div><div class='add'>+</div><div class='add'>+      memcpy(pb, pm-&gt;buffer + pm-&gt;buffer_position, cb);</div><div class='add'>+      st -= cb;</div><div class='add'>+      pb += cb;</div><div class='add'>+      pm-&gt;buffer_position += cb;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The callback: */</div><div class='add'>+static void</div><div class='add'>+modifier_read(png_structp pp, png_bytep pb, png_size_t st)</div><div class='add'>+{</div><div class='add'>+   png_modifier *pm = png_get_io_ptr(pp);</div><div class='add'>+</div><div class='add'>+   if (pm == NULL || pm-&gt;this.pread != pp)</div><div class='add'>+      png_error(pp, "bad modifier_read call");</div><div class='add'>+</div><div class='add'>+   modifier_read_imp(pm, pb, st);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Like store_progressive_read but the data is getting changed as we go so we</div><div class='add'>+ * need a local buffer.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+modifier_progressive_read(png_modifier *pm, png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   if (pm-&gt;this.pread != pp || pm-&gt;this.current == NULL ||</div><div class='add'>+       pm-&gt;this.next == NULL)</div><div class='add'>+      png_error(pp, "store state damaged (progressive)");</div><div class='add'>+</div><div class='add'>+   /* This is another Horowitz and Hill random noise generator.  In this case</div><div class='add'>+    * the aim is to stress the progressive reader with truely horrible variable</div><div class='add'>+    * buffer sizes in the range 1..500, so a sequence of 9 bit random numbers</div><div class='add'>+    * is generated.  We could probably just count from 1 to 32767 and get as</div><div class='add'>+    * good a result.</div><div class='add'>+    */</div><div class='add'>+   for (;;)</div><div class='add'>+   {</div><div class='add'>+      static png_uint_32 noise = 1;</div><div class='add'>+      png_size_t cb, cbAvail;</div><div class='add'>+      png_byte buffer[512];</div><div class='add'>+</div><div class='add'>+      /* Generate 15 more bits of stuff: */</div><div class='add'>+      noise = (noise &lt;&lt; 9) | ((noise ^ (noise &gt;&gt; (9-5))) &amp; 0x1ff);</div><div class='add'>+      cb = noise &amp; 0x1ff;</div><div class='add'>+</div><div class='add'>+      /* Check that this number of bytes are available (in the current buffer.)</div><div class='add'>+       * (This doesn't quite work - the modifier might delete a chunk; unlikely</div><div class='add'>+       * but possible, it doesn't happen at present because the modifier only</div><div class='add'>+       * adds chunks to standard images.)</div><div class='add'>+       */</div><div class='add'>+      cbAvail = store_read_buffer_avail(&amp;pm-&gt;this);</div><div class='add'>+      if (pm-&gt;buffer_count &gt; pm-&gt;buffer_position)</div><div class='add'>+         cbAvail += pm-&gt;buffer_count - pm-&gt;buffer_position;</div><div class='add'>+</div><div class='add'>+      if (cb &gt; cbAvail)</div><div class='add'>+      {</div><div class='add'>+         /* Check for EOF: */</div><div class='add'>+         if (cbAvail == 0)</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         cb = cbAvail;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      modifier_read_imp(pm, buffer, cb);</div><div class='add'>+      png_process_data(pp, pi, buffer, cb);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* Check the invariants at the end (if this fails it's a problem in this</div><div class='add'>+    * file!)</div><div class='add'>+    */</div><div class='add'>+   if (pm-&gt;buffer_count &gt; pm-&gt;buffer_position ||</div><div class='add'>+       pm-&gt;this.next != &amp;pm-&gt;this.current-&gt;data ||</div><div class='add'>+       pm-&gt;this.readpos &lt; pm-&gt;this.current-&gt;datacount)</div><div class='add'>+      png_error(pp, "progressive read implementation error");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set up a modifier. */</div><div class='add'>+static png_structp</div><div class='add'>+set_modifier_for_read(png_modifier *pm, png_infopp ppi, png_uint_32 id,</div><div class='add'>+    PNG_CONST char *name)</div><div class='add'>+{</div><div class='add'>+   /* Do this first so that the modifier fields are cleared even if an error</div><div class='add'>+    * happens allocating the png_struct.  No allocation is done here so no</div><div class='add'>+    * cleanup is required.</div><div class='add'>+    */</div><div class='add'>+   pm-&gt;state = modifier_start;</div><div class='add'>+   pm-&gt;bit_depth = 0;</div><div class='add'>+   pm-&gt;colour_type = 255;</div><div class='add'>+</div><div class='add'>+   pm-&gt;pending_len = 0;</div><div class='add'>+   pm-&gt;pending_chunk = 0;</div><div class='add'>+   pm-&gt;flush = 0;</div><div class='add'>+   pm-&gt;buffer_count = 0;</div><div class='add'>+   pm-&gt;buffer_position = 0;</div><div class='add'>+</div><div class='add'>+   return set_store_for_read(&amp;pm-&gt;this, ppi, id, name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***************************** STANDARD PNG FILES *****************************/</div><div class='add'>+/* Standard files - write and save standard files. */</div><div class='add'>+/* There are two basic forms of standard images.  Those which attempt to have</div><div class='add'>+ * all the possible pixel values (not possible for 16bpp images, but a range of</div><div class='add'>+ * values are produced) and those which have a range of image sizes.  The former</div><div class='add'>+ * are used for testing transforms, in particular gamma correction and bit</div><div class='add'>+ * reduction and increase.  The latter are reserved for testing the behavior of</div><div class='add'>+ * libpng with respect to 'odd' image sizes - particularly small images where</div><div class='add'>+ * rows become 1 byte and interlace passes disappear.</div><div class='add'>+ *</div><div class='add'>+ * The first, most useful, set are the 'transform' images, the second set of</div><div class='add'>+ * small images are the 'size' images.</div><div class='add'>+ *</div><div class='add'>+ * The transform files are constructed with rows which fit into a 1024 byte row</div><div class='add'>+ * buffer.  This makes allocation easier below.  Further regardless of the file</div><div class='add'>+ * format every row has 128 pixels (giving 1024 bytes for 64bpp formats).</div><div class='add'>+ *</div><div class='add'>+ * Files are stored with no gAMA or sBIT chunks, with a PLTE only when needed</div><div class='add'>+ * and with an ID derived from the colour type, bit depth and interlace type</div><div class='add'>+ * as above (FILEID).  The width (128) and height (variable) are not stored in</div><div class='add'>+ * the FILEID - instead the fields are set to 0, indicating a transform file.</div><div class='add'>+ *</div><div class='add'>+ * The size files ar constructed with rows a maximum of 128 bytes wide, allowing</div><div class='add'>+ * a maximum width of 16 pixels (for the 64bpp case.)  They also have a maximum</div><div class='add'>+ * height of 16 rows.  The width and height are stored in the FILEID and, being</div><div class='add'>+ * non-zero, indicate a size file.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* The number of passes is related to the interlace type. There wass no libpng</div><div class='add'>+ * API to determine this prior to 1.5, so we need an inquiry function:</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+npasses_from_interlace_type(png_structp pp, int interlace_type)</div><div class='add'>+{</div><div class='add'>+   switch (interlace_type)</div><div class='add'>+   {</div><div class='add'>+   default:</div><div class='add'>+      png_error(pp, "invalid interlace type");</div><div class='add'>+</div><div class='add'>+   case PNG_INTERLACE_NONE:</div><div class='add'>+      return 1;</div><div class='add'>+</div><div class='add'>+   case PNG_INTERLACE_ADAM7:</div><div class='add'>+      return PNG_INTERLACE_ADAM7_PASSES;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int</div><div class='add'>+bit_size(png_structp pp, png_byte colour_type, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   switch (colour_type)</div><div class='add'>+   {</div><div class='add'>+      case 0:  return bit_depth;</div><div class='add'>+</div><div class='add'>+      case 2:  return 3*bit_depth;</div><div class='add'>+</div><div class='add'>+      case 3:  return bit_depth;</div><div class='add'>+</div><div class='add'>+      case 4:  return 2*bit_depth;</div><div class='add'>+</div><div class='add'>+      case 6:  return 4*bit_depth;</div><div class='add'>+</div><div class='add'>+      default: png_error(pp, "invalid color type");</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define TRANSFORM_WIDTH  128U</div><div class='add'>+#define TRANSFORM_ROWMAX (TRANSFORM_WIDTH*8U)</div><div class='add'>+#define SIZE_ROWMAX (16*8U) /* 16 pixels, max 8 bytes each - 128 bytes */</div><div class='add'>+#define STANDARD_ROWMAX TRANSFORM_ROWMAX /* The larger of the two */</div><div class='add'>+</div><div class='add'>+/* So the maximum image sizes are as follows.  A 'transform' image may require</div><div class='add'>+ * more than 65535 bytes.  The size images are a maximum of 2046 bytes.</div><div class='add'>+ */</div><div class='add'>+#define TRANSFORM_IMAGEMAX (TRANSFORM_ROWMAX * (png_uint_32)2048)</div><div class='add'>+#define SIZE_IMAGEMAX (SIZE_ROWMAX * 16U)</div><div class='add'>+</div><div class='add'>+static size_t</div><div class='add'>+transform_rowsize(png_structp pp, png_byte colour_type, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   return (TRANSFORM_WIDTH * bit_size(pp, colour_type, bit_depth)) / 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* transform_width(pp, colour_type, bit_depth) current returns the same number</div><div class='add'>+ * every time, so just use a macro:</div><div class='add'>+ */</div><div class='add'>+#define transform_width(pp, colour_type, bit_depth) TRANSFORM_WIDTH</div><div class='add'>+</div><div class='add'>+static png_uint_32</div><div class='add'>+transform_height(png_structp pp, png_byte colour_type, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   switch (bit_size(pp, colour_type, bit_depth))</div><div class='add'>+   {</div><div class='add'>+      case 1:</div><div class='add'>+      case 2:</div><div class='add'>+      case 4:</div><div class='add'>+         return 1;   /* Total of 128 pixels */</div><div class='add'>+</div><div class='add'>+      case 8:</div><div class='add'>+         return 2;   /* Total of 256 pixels/bytes */</div><div class='add'>+</div><div class='add'>+      case 16:</div><div class='add'>+         return 512; /* Total of 65536 pixels */</div><div class='add'>+</div><div class='add'>+      case 24:</div><div class='add'>+      case 32:</div><div class='add'>+         return 512; /* 65536 pixels */</div><div class='add'>+</div><div class='add'>+      case 48:</div><div class='add'>+      case 64:</div><div class='add'>+         return 2048;/* 4 x 65536 pixels. */</div><div class='add'>+</div><div class='add'>+      default:</div><div class='add'>+         return 0;   /* Error, will be caught later */</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The following can only be defined here, now we have the definitions</div><div class='add'>+ * of the transform image sizes.</div><div class='add'>+ */</div><div class='add'>+static png_uint_32</div><div class='add'>+standard_width(png_structp pp, png_uint_32 id)</div><div class='add'>+{</div><div class='add'>+   png_uint_32 width = WIDTH_FROM_ID(id);</div><div class='add'>+   UNUSED(pp)</div><div class='add'>+</div><div class='add'>+   if (width == 0)</div><div class='add'>+      width = transform_width(pp, COL_FROM_ID(id), DEPTH_FROM_ID(id));</div><div class='add'>+</div><div class='add'>+   return width;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static png_uint_32</div><div class='add'>+standard_height(png_structp pp, png_uint_32 id)</div><div class='add'>+{</div><div class='add'>+   png_uint_32 height = HEIGHT_FROM_ID(id);</div><div class='add'>+</div><div class='add'>+   if (height == 0)</div><div class='add'>+      height = transform_height(pp, COL_FROM_ID(id), DEPTH_FROM_ID(id));</div><div class='add'>+</div><div class='add'>+   return height;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static png_uint_32</div><div class='add'>+standard_rowsize(png_structp pp, png_uint_32 id)</div><div class='add'>+{</div><div class='add'>+   png_uint_32 width = standard_width(pp, id);</div><div class='add'>+</div><div class='add'>+   /* This won't overflow: */</div><div class='add'>+   width *= bit_size(pp, COL_FROM_ID(id), DEPTH_FROM_ID(id));</div><div class='add'>+   return (width + 7) / 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+transform_row(png_structp pp, png_byte buffer[TRANSFORM_ROWMAX],</div><div class='add'>+   png_byte colour_type, png_byte bit_depth, png_uint_32 y)</div><div class='add'>+{</div><div class='add'>+   png_uint_32 v = y &lt;&lt; 7;</div><div class='add'>+   png_uint_32 i = 0;</div><div class='add'>+</div><div class='add'>+   switch (bit_size(pp, colour_type, bit_depth))</div><div class='add'>+   {</div><div class='add'>+      case 1:</div><div class='add'>+         while (i&lt;128/8) buffer[i] = v &amp; 0xff, v += 17, ++i;</div><div class='add'>+         return;</div><div class='add'>+</div><div class='add'>+      case 2:</div><div class='add'>+         while (i&lt;128/4) buffer[i] = v &amp; 0xff, v += 33, ++i;</div><div class='add'>+         return;</div><div class='add'>+</div><div class='add'>+      case 4:</div><div class='add'>+         while (i&lt;128/2) buffer[i] = v &amp; 0xff, v += 65, ++i;</div><div class='add'>+         return;</div><div class='add'>+</div><div class='add'>+      case 8:</div><div class='add'>+         /* 256 bytes total, 128 bytes in each row set as follows: */</div><div class='add'>+         while (i&lt;128) buffer[i] = v &amp; 0xff, ++v, ++i;</div><div class='add'>+         return;</div><div class='add'>+</div><div class='add'>+      case 16:</div><div class='add'>+         /* Generate all 65536 pixel values in order, which includes the 8 bit</div><div class='add'>+          * GA case as well as the 16 bit G case.</div><div class='add'>+          */</div><div class='add'>+         while (i&lt;128)</div><div class='add'>+            buffer[2*i] = (v&gt;&gt;8) &amp; 0xff, buffer[2*i+1] = v &amp; 0xff, ++v, ++i;</div><div class='add'>+</div><div class='add'>+         return;</div><div class='add'>+</div><div class='add'>+      case 24:</div><div class='add'>+         /* 65535 pixels, but rotate the values. */</div><div class='add'>+         while (i&lt;128)</div><div class='add'>+         {</div><div class='add'>+            /* Three bytes per pixel, r, g, b, make b by r^g */</div><div class='add'>+            buffer[3*i+0] = (v &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+            buffer[3*i+1] = v &amp; 0xff;</div><div class='add'>+            buffer[3*i+2] = ((v &gt;&gt; 8) ^ v) &amp; 0xff;</div><div class='add'>+            ++v;</div><div class='add'>+            ++i;</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         return;</div><div class='add'>+</div><div class='add'>+      case 32:</div><div class='add'>+         /* 65535 pixels, r, g, b, a; just replicate */</div><div class='add'>+         while (i&lt;128)</div><div class='add'>+         {</div><div class='add'>+            buffer[4*i+0] = (v &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+            buffer[4*i+1] = v &amp; 0xff;</div><div class='add'>+            buffer[4*i+2] = (v &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+            buffer[4*i+3] = v &amp; 0xff;</div><div class='add'>+            ++v;</div><div class='add'>+            ++i;</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         return;</div><div class='add'>+</div><div class='add'>+      case 48:</div><div class='add'>+         /* y is maximum 2047, giving 4x65536 pixels, make 'r' increase by 1 at</div><div class='add'>+          * each pixel, g increase by 257 (0x101) and 'b' by 0x1111:</div><div class='add'>+          */</div><div class='add'>+         while (i&lt;128)</div><div class='add'>+         {</div><div class='add'>+            png_uint_32 t = v++;</div><div class='add'>+            buffer[6*i+0] = (t &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+            buffer[6*i+1] = t &amp; 0xff;</div><div class='add'>+            t *= 257;</div><div class='add'>+            buffer[6*i+2] = (t &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+            buffer[6*i+3] = t &amp; 0xff;</div><div class='add'>+            t *= 17;</div><div class='add'>+            buffer[6*i+4] = (t &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+            buffer[6*i+5] = t &amp; 0xff;</div><div class='add'>+            ++i;</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         return;</div><div class='add'>+</div><div class='add'>+      case 64:</div><div class='add'>+         /* As above in the 32 bit case. */</div><div class='add'>+         while (i&lt;128)</div><div class='add'>+         {</div><div class='add'>+            png_uint_32 t = v++;</div><div class='add'>+            buffer[8*i+0] = (t &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+            buffer[8*i+1] = t &amp; 0xff;</div><div class='add'>+            buffer[8*i+4] = (t &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+            buffer[8*i+5] = t &amp; 0xff;</div><div class='add'>+            t *= 257;</div><div class='add'>+            buffer[8*i+2] = (t &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+            buffer[8*i+3] = t &amp; 0xff;</div><div class='add'>+            buffer[8*i+6] = (t &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+            buffer[8*i+7] = t &amp; 0xff;</div><div class='add'>+            ++i;</div><div class='add'>+         }</div><div class='add'>+         return;</div><div class='add'>+</div><div class='add'>+      default:</div><div class='add'>+         break;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   png_error(pp, "internal error");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This is just to do the right cast - could be changed to a function to check</div><div class='add'>+ * 'bd' but there isn't much point.</div><div class='add'>+ */</div><div class='add'>+#define DEPTH(bd) ((png_byte)(1U &lt;&lt; (bd)))</div><div class='add'>+</div><div class='add'>+/* Make a standardized image given a an image colour type, bit depth and</div><div class='add'>+ * interlace type.  The standard images have a very restricted range of</div><div class='add'>+ * rows and heights and are used for testing transforms rather than image</div><div class='add'>+ * layout details.  See make_size_images below for a way to make images</div><div class='add'>+ * that test odd sizes along with the libpng interlace handling.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+make_transform_image(png_store* PNG_CONST ps, png_byte PNG_CONST colour_type,</div><div class='add'>+    png_byte PNG_CONST bit_depth, int interlace_type, png_const_charp name)</div><div class='add'>+{</div><div class='add'>+   context(ps, fault);</div><div class='add'>+</div><div class='add'>+   Try</div><div class='add'>+   {</div><div class='add'>+      png_infop pi;</div><div class='add'>+      png_structp pp = set_store_for_write(ps, &amp;pi, name);</div><div class='add'>+      png_uint_32 h;</div><div class='add'>+</div><div class='add'>+      /* In the event of a problem return control to the Catch statement below</div><div class='add'>+       * to do the clean up - it is not possible to 'return' directly from a Try</div><div class='add'>+       * block.</div><div class='add'>+       */</div><div class='add'>+      if (pp == NULL)</div><div class='add'>+         Throw ps;</div><div class='add'>+</div><div class='add'>+      h = transform_height(pp, colour_type, bit_depth);</div><div class='add'>+</div><div class='add'>+      png_set_IHDR(pp, pi, transform_width(pp, colour_type, bit_depth), h,</div><div class='add'>+         bit_depth, colour_type, interlace_type,</div><div class='add'>+         PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);</div><div class='add'>+</div><div class='add'>+      if (colour_type == 3) /* palette */</div><div class='add'>+      {</div><div class='add'>+         unsigned int i = 0;</div><div class='add'>+         png_color pal[256];</div><div class='add'>+</div><div class='add'>+         do</div><div class='add'>+            pal[i].red = pal[i].green = pal[i].blue = (png_byte)i;</div><div class='add'>+         while(++i &lt; 256U);</div><div class='add'>+</div><div class='add'>+         png_set_PLTE(pp, pi, pal, 256);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      png_write_info(pp, pi);</div><div class='add'>+</div><div class='add'>+      if (png_get_rowbytes(pp, pi) !=</div><div class='add'>+          transform_rowsize(pp, colour_type, bit_depth))</div><div class='add'>+         png_error(pp, "row size incorrect");</div><div class='add'>+</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         /* Somewhat confusingly this must be called *after* png_write_info</div><div class='add'>+          * because if it is called before, the information in *pp has not been</div><div class='add'>+          * updated to reflect the interlaced image.</div><div class='add'>+          */</div><div class='add'>+         int npasses = png_set_interlace_handling(pp);</div><div class='add'>+         int pass;</div><div class='add'>+</div><div class='add'>+         if (npasses != npasses_from_interlace_type(pp, interlace_type))</div><div class='add'>+            png_error(pp, "write: png_set_interlace_handling failed");</div><div class='add'>+</div><div class='add'>+         for (pass=0; pass&lt;npasses; ++pass)</div><div class='add'>+         {</div><div class='add'>+            png_uint_32 y;</div><div class='add'>+</div><div class='add'>+            for (y=0; y&lt;h; ++y)</div><div class='add'>+            {</div><div class='add'>+               png_byte buffer[TRANSFORM_ROWMAX];</div><div class='add'>+</div><div class='add'>+               transform_row(pp, buffer, colour_type, bit_depth, y);</div><div class='add'>+               png_write_row(pp, buffer);</div><div class='add'>+            }</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      png_write_end(pp, pi);</div><div class='add'>+</div><div class='add'>+      /* And store this under the appropriate id, then clean up. */</div><div class='add'>+      store_storefile(ps, FILEID(colour_type, bit_depth, interlace_type,</div><div class='add'>+         0, 0, 0));</div><div class='add'>+</div><div class='add'>+      store_write_reset(ps);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   Catch(fault)</div><div class='add'>+   {</div><div class='add'>+      /* Use the png_store returned by the exception. This may help the compiler</div><div class='add'>+       * because 'ps' is not used in this branch of the setjmp.  Note that fault</div><div class='add'>+       * and ps will always be the same value.</div><div class='add'>+       */</div><div class='add'>+      store_write_reset(fault);</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+make_standard(png_store* PNG_CONST ps, png_byte PNG_CONST colour_type, int bdlo,</div><div class='add'>+    int PNG_CONST bdhi)</div><div class='add'>+{</div><div class='add'>+   for (; bdlo &lt;= bdhi; ++bdlo)</div><div class='add'>+   {</div><div class='add'>+      int interlace_type;</div><div class='add'>+</div><div class='add'>+      for (interlace_type = PNG_INTERLACE_NONE;</div><div class='add'>+           interlace_type &lt; PNG_INTERLACE_LAST; ++interlace_type)</div><div class='add'>+      {</div><div class='add'>+         char name[FILE_NAME_SIZE];</div><div class='add'>+</div><div class='add'>+         standard_name(name, sizeof name, 0, colour_type, bdlo, interlace_type,</div><div class='add'>+            0, 0, 0);</div><div class='add'>+         make_transform_image(ps, colour_type, DEPTH(bdlo), interlace_type,</div><div class='add'>+            name);</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+make_transform_images(png_store *ps)</div><div class='add'>+{</div><div class='add'>+   /* This is in case of errors. */</div><div class='add'>+   safecat(ps-&gt;test, sizeof ps-&gt;test, 0, "make standard images");</div><div class='add'>+</div><div class='add'>+   /* Arguments are colour_type, low bit depth, high bit depth</div><div class='add'>+    */</div><div class='add'>+   make_standard(ps, 0, 0, WRITE_BDHI);</div><div class='add'>+   make_standard(ps, 2, 3, WRITE_BDHI);</div><div class='add'>+   make_standard(ps, 3, 0, 3 /*palette: max 8 bits*/);</div><div class='add'>+   make_standard(ps, 4, 3, WRITE_BDHI);</div><div class='add'>+   make_standard(ps, 6, 3, WRITE_BDHI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The following two routines use the PNG interlace support macros from</div><div class='add'>+ * png.h to interlace or deinterlace rows.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+interlace_row(png_bytep buffer, png_const_bytep imageRow,</div><div class='add'>+   unsigned int pixel_size, png_uint_32 w, int pass)</div><div class='add'>+{</div><div class='add'>+   png_uint_32 xin, xout, xstep;</div><div class='add'>+</div><div class='add'>+   /* Note that this can, trivially, be optimized to a memcpy on pass 7, the</div><div class='add'>+    * code is presented this way to make it easier to understand.  In practice</div><div class='add'>+    * consult the code in the libpng source to see other ways of doing this.</div><div class='add'>+    */</div><div class='add'>+   xin = PNG_PASS_START_COL(pass);</div><div class='add'>+   xstep = 1U&lt;&lt;PNG_PASS_COL_SHIFT(pass);</div><div class='add'>+</div><div class='add'>+   for (xout=0; xin&lt;w; xin+=xstep)</div><div class='add'>+   {</div><div class='add'>+      pixel_copy(buffer, xout, imageRow, xin, pixel_size);</div><div class='add'>+      ++xout;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+deinterlace_row(png_bytep buffer, png_const_bytep row,</div><div class='add'>+   unsigned int pixel_size, png_uint_32 w, int pass)</div><div class='add'>+{</div><div class='add'>+   /* The inverse of the above, 'row' is part of row 'y' of the output image,</div><div class='add'>+    * in 'buffer'.  The image is 'w' wide and this is pass 'pass', distribute</div><div class='add'>+    * the pixels of row into buffer and return the number written (to allow</div><div class='add'>+    * this to be checked).</div><div class='add'>+    */</div><div class='add'>+   png_uint_32 xin, xout, xstep;</div><div class='add'>+</div><div class='add'>+   xout = PNG_PASS_START_COL(pass);</div><div class='add'>+   xstep = 1U&lt;&lt;PNG_PASS_COL_SHIFT(pass);</div><div class='add'>+</div><div class='add'>+   for (xin=0; xout&lt;w; xout+=xstep)</div><div class='add'>+   {</div><div class='add'>+      pixel_copy(buffer, xout, row, xin, pixel_size);</div><div class='add'>+      ++xin;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Build a single row for the 'size' test images, this fills in only the</div><div class='add'>+ * first bit_width bits of the sample row.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+size_row(png_byte buffer[SIZE_ROWMAX], png_uint_32 bit_width, png_uint_32 y)</div><div class='add'>+{</div><div class='add'>+   /* height is in the range 1 to 16, so: */</div><div class='add'>+   y = ((y &amp; 1) &lt;&lt; 7) + ((y &amp; 2) &lt;&lt; 6) + ((y &amp; 4) &lt;&lt; 5) + ((y &amp; 8) &lt;&lt; 4);</div><div class='add'>+   /* the following ensures bits are set in small images: */</div><div class='add'>+   y ^= 0xA5;</div><div class='add'>+</div><div class='add'>+   while (bit_width &gt;= 8)</div><div class='add'>+      *buffer++ = (png_byte)y++, bit_width -= 8;</div><div class='add'>+</div><div class='add'>+   /* There may be up to 7 remaining bits, these go in the most significant</div><div class='add'>+    * bits of the byte.</div><div class='add'>+    */</div><div class='add'>+   if (bit_width &gt; 0)</div><div class='add'>+   {</div><div class='add'>+      png_uint_32 mask = (1U&lt;&lt;(8-bit_width))-1;</div><div class='add'>+      *buffer = (png_byte)((*buffer &amp; mask) | (y &amp; ~mask));</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+make_size_image(png_store* PNG_CONST ps, png_byte PNG_CONST colour_type,</div><div class='add'>+    png_byte PNG_CONST bit_depth, int PNG_CONST interlace_type,</div><div class='add'>+    png_uint_32 PNG_CONST w, png_uint_32 PNG_CONST h,</div><div class='add'>+    int PNG_CONST do_interlace)</div><div class='add'>+{</div><div class='add'>+   context(ps, fault);</div><div class='add'>+</div><div class='add'>+   Try</div><div class='add'>+   {</div><div class='add'>+      png_infop pi;</div><div class='add'>+      png_structp pp;</div><div class='add'>+      unsigned int pixel_size;</div><div class='add'>+</div><div class='add'>+      /* Make a name and get an appropriate id for the store: */</div><div class='add'>+      char name[FILE_NAME_SIZE];</div><div class='add'>+      PNG_CONST png_uint_32 id = FILEID(colour_type, bit_depth, interlace_type,</div><div class='add'>+         w, h, do_interlace);</div><div class='add'>+</div><div class='add'>+      standard_name_from_id(name, sizeof name, 0, id);</div><div class='add'>+      pp = set_store_for_write(ps, &amp;pi, name);</div><div class='add'>+</div><div class='add'>+      /* In the event of a problem return control to the Catch statement below</div><div class='add'>+       * to do the clean up - it is not possible to 'return' directly from a Try</div><div class='add'>+       * block.</div><div class='add'>+       */</div><div class='add'>+      if (pp == NULL)</div><div class='add'>+         Throw ps;</div><div class='add'>+</div><div class='add'>+      png_set_IHDR(pp, pi, w, h, bit_depth, colour_type, interlace_type,</div><div class='add'>+         PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);</div><div class='add'>+</div><div class='add'>+      /* Same palette as make_transform_image - I don' think there is any</div><div class='add'>+       * benefit from using a different one (JB 20101211)</div><div class='add'>+       */</div><div class='add'>+      if (colour_type == 3) /* palette */</div><div class='add'>+      {</div><div class='add'>+         unsigned int i = 0;</div><div class='add'>+         png_color pal[256];</div><div class='add'>+</div><div class='add'>+         do</div><div class='add'>+            pal[i].red = pal[i].green = pal[i].blue = (png_byte)i;</div><div class='add'>+         while(++i &lt; 256U);</div><div class='add'>+</div><div class='add'>+         png_set_PLTE(pp, pi, pal, 256);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      png_write_info(pp, pi);</div><div class='add'>+</div><div class='add'>+      /* Calculate the bit size, divide by 8 to get the byte size - this won't</div><div class='add'>+       * overflow because we know the w values are all small enough even for</div><div class='add'>+       * a system where 'unsigned int' is only 16 bits.</div><div class='add'>+       */</div><div class='add'>+      pixel_size = bit_size(pp, colour_type, bit_depth);</div><div class='add'>+      if (png_get_rowbytes(pp, pi) != ((w * pixel_size) + 7) / 8)</div><div class='add'>+         png_error(pp, "row size incorrect");</div><div class='add'>+</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         int npasses = npasses_from_interlace_type(pp, interlace_type);</div><div class='add'>+         png_uint_32 y;</div><div class='add'>+         int pass;</div><div class='add'>+         png_byte image[16][SIZE_ROWMAX];</div><div class='add'>+</div><div class='add'>+         /* To help consistent error detection make the parts of this buffer</div><div class='add'>+          * that aren't set below all '1':</div><div class='add'>+          */</div><div class='add'>+         memset(image, 0xff, sizeof image);</div><div class='add'>+</div><div class='add'>+         if (!do_interlace &amp;&amp; npasses != png_set_interlace_handling(pp))</div><div class='add'>+            png_error(pp, "write: png_set_interlace_handling failed");</div><div class='add'>+</div><div class='add'>+         /* Prepare the whole image first to avoid making it 7 times: */</div><div class='add'>+         for (y=0; y&lt;h; ++y)</div><div class='add'>+            size_row(image[y], w * pixel_size, y);</div><div class='add'>+</div><div class='add'>+         for (pass=0; pass&lt;npasses; ++pass)</div><div class='add'>+         {</div><div class='add'>+            /* The following two are for checking the macros: */</div><div class='add'>+            PNG_CONST png_uint_32 wPass = PNG_PASS_COLS(w, pass);</div><div class='add'>+</div><div class='add'>+            /* If do_interlace is set we don't call png_write_row for every</div><div class='add'>+             * row because some of them are empty.  In fact, for a 1x1 image,</div><div class='add'>+             * most of them are empty!</div><div class='add'>+             */</div><div class='add'>+            for (y=0; y&lt;h; ++y)</div><div class='add'>+            {</div><div class='add'>+               png_const_bytep row = image[y];</div><div class='add'>+               png_byte tempRow[SIZE_ROWMAX];</div><div class='add'>+</div><div class='add'>+               /* If do_interlace *and* the image is interlaced we</div><div class='add'>+                * need a reduced interlace row, this may be reduced</div><div class='add'>+                * to empty.</div><div class='add'>+                */</div><div class='add'>+               if (do_interlace &amp;&amp; interlace_type == PNG_INTERLACE_ADAM7)</div><div class='add'>+               {</div><div class='add'>+                  /* The row must not be written if it doesn't exist, notice</div><div class='add'>+                   * that there are two conditions here, either the row isn't</div><div class='add'>+                   * ever in the pass or the row would be but isn't wide</div><div class='add'>+                   * enough to contribute any pixels.  In fact the wPass test</div><div class='add'>+                   * can be used to skip the whole y loop in this case.</div><div class='add'>+                   */</div><div class='add'>+                  if (PNG_ROW_IN_INTERLACE_PASS(y, pass) &amp;&amp; wPass &gt; 0)</div><div class='add'>+                  {</div><div class='add'>+                     /* Set to all 1's for error detection (libpng tends to</div><div class='add'>+                      * set unset things to 0).</div><div class='add'>+                      */</div><div class='add'>+                     memset(tempRow, 0xff, sizeof tempRow);</div><div class='add'>+                     interlace_row(tempRow, row, pixel_size, w, pass);</div><div class='add'>+                     row = tempRow;</div><div class='add'>+                  }</div><div class='add'>+                  else</div><div class='add'>+                     continue;</div><div class='add'>+               }</div><div class='add'>+</div><div class='add'>+               /* Only get to here if the row has some pixels in it. */</div><div class='add'>+               png_write_row(pp, row);</div><div class='add'>+            }</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      png_write_end(pp, pi);</div><div class='add'>+</div><div class='add'>+      /* And store this under the appropriate id, then clean up. */</div><div class='add'>+      store_storefile(ps, id);</div><div class='add'>+</div><div class='add'>+      store_write_reset(ps);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   Catch(fault)</div><div class='add'>+   {</div><div class='add'>+      /* Use the png_store returned by the exception. This may help the compiler</div><div class='add'>+       * because 'ps' is not used in this branch of the setjmp.  Note that fault</div><div class='add'>+       * and ps will always be the same value.</div><div class='add'>+       */</div><div class='add'>+      store_write_reset(fault);</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+make_size(png_store* PNG_CONST ps, png_byte PNG_CONST colour_type, int bdlo,</div><div class='add'>+    int PNG_CONST bdhi)</div><div class='add'>+{</div><div class='add'>+   for (; bdlo &lt;= bdhi; ++bdlo)</div><div class='add'>+   {</div><div class='add'>+      png_uint_32 width;</div><div class='add'>+</div><div class='add'>+      for (width = 1; width &lt;= 16; ++width)</div><div class='add'>+      {</div><div class='add'>+         png_uint_32 height;</div><div class='add'>+</div><div class='add'>+         for (height = 1; height &lt;= 16; ++height)</div><div class='add'>+         {</div><div class='add'>+            /* The four combinations of DIY interlace and interlace or not -</div><div class='add'>+             * no interlace + DIY should be identical to no interlace with</div><div class='add'>+             * libpng doing it.</div><div class='add'>+             */</div><div class='add'>+            make_size_image(ps, colour_type, DEPTH(bdlo), PNG_INTERLACE_NONE,</div><div class='add'>+               width, height, 0);</div><div class='add'>+            make_size_image(ps, colour_type, DEPTH(bdlo), PNG_INTERLACE_NONE,</div><div class='add'>+               width, height, 1);</div><div class='add'>+            make_size_image(ps, colour_type, DEPTH(bdlo), PNG_INTERLACE_ADAM7,</div><div class='add'>+               width, height, 0);</div><div class='add'>+            make_size_image(ps, colour_type, DEPTH(bdlo), PNG_INTERLACE_ADAM7,</div><div class='add'>+               width, height, 1);</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+make_size_images(png_store *ps)</div><div class='add'>+{</div><div class='add'>+   /* This is in case of errors. */</div><div class='add'>+   safecat(ps-&gt;test, sizeof ps-&gt;test, 0, "make size images");</div><div class='add'>+</div><div class='add'>+   /* Arguments are colour_type, low bit depth, high bit depth</div><div class='add'>+    */</div><div class='add'>+   make_size(ps, 0, 0, WRITE_BDHI);</div><div class='add'>+   make_size(ps, 2, 3, WRITE_BDHI);</div><div class='add'>+   make_size(ps, 3, 0, 3 /*palette: max 8 bits*/);</div><div class='add'>+   make_size(ps, 4, 3, WRITE_BDHI);</div><div class='add'>+   make_size(ps, 6, 3, WRITE_BDHI);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return a row based on image id and 'y' for checking: */</div><div class='add'>+static void</div><div class='add'>+standard_row(png_structp pp, png_byte std[STANDARD_ROWMAX], png_uint_32 id,</div><div class='add'>+   png_uint_32 y)</div><div class='add'>+{</div><div class='add'>+   if (WIDTH_FROM_ID(id) == 0)</div><div class='add'>+      transform_row(pp, std, COL_FROM_ID(id), DEPTH_FROM_ID(id), y);</div><div class='add'>+   else</div><div class='add'>+      size_row(std, WIDTH_FROM_ID(id) * bit_size(pp, COL_FROM_ID(id),</div><div class='add'>+         DEPTH_FROM_ID(id)), y);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Tests - individual test cases */</div><div class='add'>+/* Like 'make_standard' but errors are deliberately introduced into the calls</div><div class='add'>+ * to ensure that they get detected - it should not be possible to write an</div><div class='add'>+ * invalid image with libpng!</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+sBIT0_error_fn(png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   /* 0 is invalid... */</div><div class='add'>+   png_color_8 bad;</div><div class='add'>+   bad.red = bad.green = bad.blue = bad.gray = bad.alpha = 0;</div><div class='add'>+   png_set_sBIT(pp, pi, &amp;bad);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sBIT_error_fn(png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   png_byte bit_depth;</div><div class='add'>+   png_color_8 bad;</div><div class='add'>+</div><div class='add'>+   if (png_get_color_type(pp, pi) == PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+      bit_depth = 8;</div><div class='add'>+</div><div class='add'>+   else</div><div class='add'>+      bit_depth = png_get_bit_depth(pp, pi);</div><div class='add'>+</div><div class='add'>+   /* Now we know the bit depth we can easily generate an invalid sBIT entry */</div><div class='add'>+   bad.red = bad.green = bad.blue = bad.gray = bad.alpha =</div><div class='add'>+      (png_byte)(bit_depth+1);</div><div class='add'>+   png_set_sBIT(pp, pi, &amp;bad);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static PNG_CONST struct</div><div class='add'>+{</div><div class='add'>+   void          (*fn)(png_structp, png_infop);</div><div class='add'>+   PNG_CONST char *msg;</div><div class='add'>+   unsigned int    warning :1; /* the error is a warning... */</div><div class='add'>+} error_test[] =</div><div class='add'>+    {</div><div class='add'>+       { sBIT0_error_fn, "sBIT(0): failed to detect error", 1 },</div><div class='add'>+       { sBIT_error_fn, "sBIT(too big): failed to detect error", 1 },</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+make_error(png_store* volatile ps, png_byte PNG_CONST colour_type,</div><div class='add'>+    png_byte bit_depth, int interlace_type, int test, png_const_charp name)</div><div class='add'>+{</div><div class='add'>+   context(ps, fault);</div><div class='add'>+</div><div class='add'>+   Try</div><div class='add'>+   {</div><div class='add'>+      png_structp pp;</div><div class='add'>+      png_infop pi;</div><div class='add'>+</div><div class='add'>+      pp = set_store_for_write(ps, &amp;pi, name);</div><div class='add'>+</div><div class='add'>+      if (pp == NULL)</div><div class='add'>+         Throw ps;</div><div class='add'>+</div><div class='add'>+      png_set_IHDR(pp, pi, transform_width(pp, colour_type, bit_depth),</div><div class='add'>+         transform_height(pp, colour_type, bit_depth), bit_depth, colour_type,</div><div class='add'>+         interlace_type, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);</div><div class='add'>+</div><div class='add'>+      if (colour_type == 3) /* palette */</div><div class='add'>+      {</div><div class='add'>+         unsigned int i = 0;</div><div class='add'>+         png_color pal[256];</div><div class='add'>+</div><div class='add'>+         do</div><div class='add'>+            pal[i].red = pal[i].green = pal[i].blue = (png_byte)i;</div><div class='add'>+         while(++i &lt; 256U);</div><div class='add'>+</div><div class='add'>+         png_set_PLTE(pp, pi, pal, 256);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* Time for a few errors, these are in various optional chunks, the</div><div class='add'>+       * standard tests test the standard chunks pretty well.</div><div class='add'>+       */</div><div class='add'>+#     define exception__prev exception_prev_1</div><div class='add'>+#     define exception__env exception_env_1</div><div class='add'>+      Try</div><div class='add'>+      {</div><div class='add'>+         /* Expect this to throw: */</div><div class='add'>+         ps-&gt;expect_error = !error_test[test].warning;</div><div class='add'>+         ps-&gt;expect_warning = error_test[test].warning;</div><div class='add'>+         ps-&gt;saw_warning = 0;</div><div class='add'>+         error_test[test].fn(pp, pi);</div><div class='add'>+</div><div class='add'>+         /* Normally the error is only detected here: */</div><div class='add'>+         png_write_info(pp, pi);</div><div class='add'>+</div><div class='add'>+         /* And handle the case where it was only a warning: */</div><div class='add'>+         if (ps-&gt;expect_warning &amp;&amp; ps-&gt;saw_warning)</div><div class='add'>+            Throw ps;</div><div class='add'>+</div><div class='add'>+         /* If we get here there is a problem, we have success - no error or</div><div class='add'>+          * no warning - when we shouldn't have success.  Log an error.</div><div class='add'>+          */</div><div class='add'>+         store_log(ps, pp, error_test[test].msg, 1 /*error*/);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      Catch (fault)</div><div class='add'>+         ps = fault; /* expected exit, make sure ps is not clobbered */</div><div class='add'>+#undef exception__prev</div><div class='add'>+#undef exception__env</div><div class='add'>+</div><div class='add'>+      /* And clear these flags */</div><div class='add'>+      ps-&gt;expect_error = 0;</div><div class='add'>+      ps-&gt;expect_warning = 0;</div><div class='add'>+</div><div class='add'>+      /* Now write the whole image, just to make sure that the detected, or</div><div class='add'>+       * undetected, errro has not created problems inside libpng.</div><div class='add'>+       */</div><div class='add'>+      if (png_get_rowbytes(pp, pi) !=</div><div class='add'>+          transform_rowsize(pp, colour_type, bit_depth))</div><div class='add'>+         png_error(pp, "row size incorrect");</div><div class='add'>+</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         png_uint_32 h = transform_height(pp, colour_type, bit_depth);</div><div class='add'>+         int npasses = png_set_interlace_handling(pp);</div><div class='add'>+         int pass;</div><div class='add'>+</div><div class='add'>+         if (npasses != npasses_from_interlace_type(pp, interlace_type))</div><div class='add'>+            png_error(pp, "write: png_set_interlace_handling failed");</div><div class='add'>+</div><div class='add'>+         for (pass=0; pass&lt;npasses; ++pass)</div><div class='add'>+         {</div><div class='add'>+            png_uint_32 y;</div><div class='add'>+</div><div class='add'>+            for (y=0; y&lt;h; ++y)</div><div class='add'>+            {</div><div class='add'>+               png_byte buffer[TRANSFORM_ROWMAX];</div><div class='add'>+</div><div class='add'>+               transform_row(pp, buffer, colour_type, bit_depth, y);</div><div class='add'>+               png_write_row(pp, buffer);</div><div class='add'>+            }</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      png_write_end(pp, pi);</div><div class='add'>+</div><div class='add'>+      /* The following deletes the file that was just written. */</div><div class='add'>+      store_write_reset(ps);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   Catch(fault)</div><div class='add'>+   {</div><div class='add'>+      store_write_reset(fault);</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+make_errors(png_modifier* PNG_CONST pm, png_byte PNG_CONST colour_type,</div><div class='add'>+    int bdlo, int PNG_CONST bdhi)</div><div class='add'>+{</div><div class='add'>+   for (; bdlo &lt;= bdhi; ++bdlo)</div><div class='add'>+   {</div><div class='add'>+      int interlace_type;</div><div class='add'>+</div><div class='add'>+      for (interlace_type = PNG_INTERLACE_NONE;</div><div class='add'>+           interlace_type &lt; PNG_INTERLACE_LAST; ++interlace_type)</div><div class='add'>+      {</div><div class='add'>+         unsigned int test;</div><div class='add'>+         char name[FILE_NAME_SIZE];</div><div class='add'>+</div><div class='add'>+         standard_name(name, sizeof name, 0, colour_type, bdlo, interlace_type,</div><div class='add'>+            0, 0, 0);</div><div class='add'>+</div><div class='add'>+         for (test=0; test&lt;(sizeof error_test)/(sizeof error_test[0]); ++test)</div><div class='add'>+         {</div><div class='add'>+            make_error(&amp;pm-&gt;this, colour_type, DEPTH(bdlo), interlace_type,</div><div class='add'>+               test, name);</div><div class='add'>+</div><div class='add'>+            if (fail(pm))</div><div class='add'>+               return 0;</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return 1; /* keep going */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+perform_error_test(png_modifier *pm)</div><div class='add'>+{</div><div class='add'>+   /* Need to do this here because we just write in this test. */</div><div class='add'>+   safecat(pm-&gt;this.test, sizeof pm-&gt;this.test, 0, "error test");</div><div class='add'>+</div><div class='add'>+   if (!make_errors(pm, 0, 0, WRITE_BDHI))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   if (!make_errors(pm, 2, 3, WRITE_BDHI))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   if (!make_errors(pm, 3, 0, 3))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   if (!make_errors(pm, 4, 3, WRITE_BDHI))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   if (!make_errors(pm, 6, 3, WRITE_BDHI))</div><div class='add'>+      return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Because we want to use the same code in both the progressive reader and the</div><div class='add'>+ * sequential reader it is necessary to deal with the fact that the progressive</div><div class='add'>+ * reader callbacks only have one parameter (png_get_progressive_ptr()), so this</div><div class='add'>+ * must contain all the test parameters and all the local variables directly</div><div class='add'>+ * accessible to the sequential reader implementation.</div><div class='add'>+ *</div><div class='add'>+ * The technique adopted is to reinvent part of what Dijkstra termed a</div><div class='add'>+ * 'display'; an array of pointers to the stack frames of enclosing functions so</div><div class='add'>+ * that a nested function definition can access the local (C auto) variables of</div><div class='add'>+ * the functions that contain its definition.  In fact C provides the first</div><div class='add'>+ * pointer (the local variables - the stack frame pointer) and the last (the</div><div class='add'>+ * global variables - the BCPL global vector typically implemented as global</div><div class='add'>+ * addresses), this code requires one more pointer to make the display - the</div><div class='add'>+ * local variables (and function call parameters) of the function that actually</div><div class='add'>+ * invokes either the progressive or sequential reader.</div><div class='add'>+ *</div><div class='add'>+ * Perhaps confusingly this technique is confounded with classes - the</div><div class='add'>+ * 'standard_display' defined here is sub-classed as the 'gamma_display' below.</div><div class='add'>+ * A gamma_display is a standard_display, taking advantage of the ANSI-C</div><div class='add'>+ * requirement that the pointer to the first member of a structure must be the</div><div class='add'>+ * same as the pointer to the structure.  This allows us to reuse standard_</div><div class='add'>+ * functions in the gamma test code; something that could not be done with</div><div class='add'>+ * nested funtions!</div><div class='add'>+ */</div><div class='add'>+typedef struct standard_palette_entry /* pngvalid format palette! */</div><div class='add'>+{</div><div class='add'>+   png_byte red;</div><div class='add'>+   png_byte green;</div><div class='add'>+   png_byte blue;</div><div class='add'>+   png_byte alpha;</div><div class='add'>+} standard_palette[256];</div><div class='add'>+</div><div class='add'>+typedef struct standard_display</div><div class='add'>+{</div><div class='add'>+   png_store*  ps;             /* Test parameters (passed to the function) */</div><div class='add'>+   png_byte    colour_type;</div><div class='add'>+   png_byte    bit_depth;</div><div class='add'>+   png_byte    red_sBIT;       /* Input data sBIT values. */</div><div class='add'>+   png_byte    green_sBIT;</div><div class='add'>+   png_byte    blue_sBIT;</div><div class='add'>+   png_byte    alpha_sBIT;</div><div class='add'>+   int         interlace_type;</div><div class='add'>+   png_uint_32 id;             /* Calculated file ID */</div><div class='add'>+   png_uint_32 w;              /* Width of image */</div><div class='add'>+   png_uint_32 h;              /* Height of image */</div><div class='add'>+   int         npasses;        /* Number of interlaced passes */</div><div class='add'>+   png_uint_32 pixel_size;     /* Width of one pixel in bits */</div><div class='add'>+   png_uint_32 bit_width;      /* Width of output row in bits */</div><div class='add'>+   size_t      cbRow;          /* Bytes in a row of the output image */</div><div class='add'>+   int         do_interlace;   /* Do interlacing internally */</div><div class='add'>+   int         is_transparent; /* Transparecy information was present. */</div><div class='add'>+   struct</div><div class='add'>+   {</div><div class='add'>+      png_uint_16 red;</div><div class='add'>+      png_uint_16 green;</div><div class='add'>+      png_uint_16 blue;</div><div class='add'>+   }           transparent;    /* The transparent color, if set. */</div><div class='add'>+   standard_palette</div><div class='add'>+               palette;</div><div class='add'>+} standard_display;</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+standard_display_init(standard_display *dp, png_store* ps, png_uint_32 id,</div><div class='add'>+   int do_interlace)</div><div class='add'>+{</div><div class='add'>+   dp-&gt;ps = ps;</div><div class='add'>+   dp-&gt;colour_type = COL_FROM_ID(id);</div><div class='add'>+   dp-&gt;bit_depth = DEPTH_FROM_ID(id);</div><div class='add'>+   dp-&gt;alpha_sBIT = dp-&gt;blue_sBIT = dp-&gt;green_sBIT = dp-&gt;alpha_sBIT =</div><div class='add'>+      dp-&gt;bit_depth;</div><div class='add'>+   dp-&gt;interlace_type = INTERLACE_FROM_ID(id);</div><div class='add'>+   dp-&gt;id = id;</div><div class='add'>+   /* All the rest are filled in after the read_info: */</div><div class='add'>+   dp-&gt;w = 0;</div><div class='add'>+   dp-&gt;h = 0;</div><div class='add'>+   dp-&gt;npasses = 0;</div><div class='add'>+   dp-&gt;pixel_size = 0;</div><div class='add'>+   dp-&gt;bit_width = 0;</div><div class='add'>+   dp-&gt;cbRow = 0;</div><div class='add'>+   dp-&gt;do_interlace = do_interlace;</div><div class='add'>+   dp-&gt;is_transparent = 0;</div><div class='add'>+   /* Preset the transparent color to black: */</div><div class='add'>+   memset(&amp;dp-&gt;transparent, 0, sizeof dp-&gt;transparent);</div><div class='add'>+   /* Preset the palette to full intensity/opaque througout: */</div><div class='add'>+   memset(dp-&gt;palette, 0xff, sizeof dp-&gt;palette);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Call this only if the colour type is 3 - PNG_COLOR_TYPE_PALETTE - otherwise</div><div class='add'>+ * it will png_error out.  The API returns true if tRNS information was</div><div class='add'>+ * present.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+standard_palette_init(standard_palette palette, png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   png_colorp pal;</div><div class='add'>+   png_bytep trans_alpha;</div><div class='add'>+   int num;</div><div class='add'>+</div><div class='add'>+   pal = 0;</div><div class='add'>+   num = -1;</div><div class='add'>+   if (png_get_PLTE(pp, pi, &amp;pal, &amp;num) &amp; PNG_INFO_PLTE)</div><div class='add'>+   {</div><div class='add'>+      int i;</div><div class='add'>+</div><div class='add'>+      for (i=0; i&lt;num; ++i)</div><div class='add'>+      {</div><div class='add'>+         palette[i].red = pal[i].red;</div><div class='add'>+         palette[i].green = pal[i].green;</div><div class='add'>+         palette[i].blue = pal[i].blue;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* Mark the remainder of the entries with a flag value: */</div><div class='add'>+      for (; i&lt;256; ++i)</div><div class='add'>+         palette[i].red = palette[i].green = palette[i].blue = 126;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   else /* !png_get_PLTE */</div><div class='add'>+      png_error(pp, "validate: missing PLTE with color type 3");</div><div class='add'>+</div><div class='add'>+   trans_alpha = 0;</div><div class='add'>+   num = -1;</div><div class='add'>+   if (png_get_tRNS(pp, pi, &amp;trans_alpha, &amp;num, 0) &amp; PNG_INFO_tRNS)</div><div class='add'>+   {</div><div class='add'>+      int i;</div><div class='add'>+</div><div class='add'>+      /* Any of these are crash-worthy - given the implementation of</div><div class='add'>+       * png_get_tRNS up to 1.5 an app won't crash if it just checks the</div><div class='add'>+       * result above and fails to check that the variables it passed have</div><div class='add'>+       * actually been filled in!  Note that if the app were to pass the</div><div class='add'>+       * last, png_color_16p, variable too it couldn't rely on this.</div><div class='add'>+       */</div><div class='add'>+      if (trans_alpha == 0 || num &lt;= 0 || num &gt; 256)</div><div class='add'>+         png_error(pp, "validate: unexpected png_get_tRNS (palette) result");</div><div class='add'>+</div><div class='add'>+      for (i=0; i&lt;num; ++i)</div><div class='add'>+         palette[i].alpha = trans_alpha[i];</div><div class='add'>+</div><div class='add'>+      for (; i&lt;256; ++i)</div><div class='add'>+         palette[i].alpha = 255;</div><div class='add'>+</div><div class='add'>+      return 1; /* transparency */</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   else</div><div class='add'>+   {</div><div class='add'>+      /* No transparency - just set the alpha channel to opaque. */</div><div class='add'>+      int i;</div><div class='add'>+</div><div class='add'>+      for (i=0; i&lt;256; ++i)</div><div class='add'>+         palette[i].alpha = 255;</div><div class='add'>+</div><div class='add'>+      return 0; /* no transparency */</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* By passing a 'standard_display' the progressive callbacks can be used</div><div class='add'>+ * directly by the sequential code, the functions suffixed "_imp" are the</div><div class='add'>+ * implementations, the functions without the suffix are the callbacks.</div><div class='add'>+ *</div><div class='add'>+ * The code for the info callback is split into two because this callback calls</div><div class='add'>+ * png_read_update_info or png_start_read_image and what gets called depends on</div><div class='add'>+ * whether the info needs updating (we want to test both calls in pngvalid.)</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+standard_info_part1(standard_display *dp, png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   if (png_get_bit_depth(pp, pi) != dp-&gt;bit_depth)</div><div class='add'>+      png_error(pp, "validate: bit depth changed");</div><div class='add'>+</div><div class='add'>+   if (png_get_color_type(pp, pi) != dp-&gt;colour_type)</div><div class='add'>+      png_error(pp, "validate: color type changed");</div><div class='add'>+</div><div class='add'>+   if (png_get_filter_type(pp, pi) != PNG_FILTER_TYPE_BASE)</div><div class='add'>+      png_error(pp, "validate: filter type changed");</div><div class='add'>+</div><div class='add'>+   if (png_get_interlace_type(pp, pi) != dp-&gt;interlace_type)</div><div class='add'>+      png_error(pp, "validate: interlacing changed");</div><div class='add'>+</div><div class='add'>+   if (png_get_compression_type(pp, pi) != PNG_COMPRESSION_TYPE_BASE)</div><div class='add'>+      png_error(pp, "validate: compression type changed");</div><div class='add'>+</div><div class='add'>+   dp-&gt;w = png_get_image_width(pp, pi);</div><div class='add'>+</div><div class='add'>+   if (dp-&gt;w != standard_width(pp, dp-&gt;id))</div><div class='add'>+      png_error(pp, "validate: image width changed");</div><div class='add'>+</div><div class='add'>+   dp-&gt;h = png_get_image_height(pp, pi);</div><div class='add'>+</div><div class='add'>+   if (dp-&gt;h != standard_height(pp, dp-&gt;id))</div><div class='add'>+      png_error(pp, "validate: image height changed");</div><div class='add'>+</div><div class='add'>+   /* Record (but don't check at present) the input sBIT according to the colour</div><div class='add'>+    * type information.</div><div class='add'>+    */</div><div class='add'>+   {</div><div class='add'>+      png_color_8p sBIT = 0;</div><div class='add'>+</div><div class='add'>+      if (png_get_sBIT(pp, pi, &amp;sBIT) &amp; PNG_INFO_sBIT)</div><div class='add'>+      {</div><div class='add'>+         int sBIT_invalid = 0;</div><div class='add'>+</div><div class='add'>+         if (sBIT == 0)</div><div class='add'>+            png_error(pp, "validate: unexpected png_get_sBIT result");</div><div class='add'>+</div><div class='add'>+         if (dp-&gt;colour_type &amp; PNG_COLOR_MASK_COLOR)</div><div class='add'>+         {</div><div class='add'>+            if (sBIT-&gt;red == 0 || sBIT-&gt;red &gt; dp-&gt;bit_depth)</div><div class='add'>+               sBIT_invalid = 1;</div><div class='add'>+            else</div><div class='add'>+               dp-&gt;red_sBIT = sBIT-&gt;red;</div><div class='add'>+</div><div class='add'>+            if (sBIT-&gt;green == 0 || sBIT-&gt;green &gt; dp-&gt;bit_depth)</div><div class='add'>+               sBIT_invalid = 1;</div><div class='add'>+            else</div><div class='add'>+               dp-&gt;green_sBIT = sBIT-&gt;green;</div><div class='add'>+</div><div class='add'>+            if (sBIT-&gt;blue == 0 || sBIT-&gt;blue &gt; dp-&gt;bit_depth)</div><div class='add'>+               sBIT_invalid = 1;</div><div class='add'>+            else</div><div class='add'>+               dp-&gt;blue_sBIT = sBIT-&gt;blue;</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         else /* !COLOR */</div><div class='add'>+         {</div><div class='add'>+            if (sBIT-&gt;gray == 0 || sBIT-&gt;gray &gt; dp-&gt;bit_depth)</div><div class='add'>+               sBIT_invalid = 1;</div><div class='add'>+            else</div><div class='add'>+               dp-&gt;blue_sBIT = dp-&gt;green_sBIT = dp-&gt;red_sBIT = sBIT-&gt;gray;</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         /* All 8 bits in tRNS for a palette image are significant - see the</div><div class='add'>+          * spec.</div><div class='add'>+          */</div><div class='add'>+         if (dp-&gt;colour_type &amp; PNG_COLOR_MASK_ALPHA)</div><div class='add'>+         {</div><div class='add'>+            if (sBIT-&gt;alpha == 0 || sBIT-&gt;alpha &gt; dp-&gt;bit_depth)</div><div class='add'>+               sBIT_invalid = 1;</div><div class='add'>+            else</div><div class='add'>+               dp-&gt;alpha_sBIT = sBIT-&gt;alpha;</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         if (sBIT_invalid)</div><div class='add'>+            png_error(pp, "validate: sBIT value out of range");</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* Important: this is validating the value *before* any transforms have been</div><div class='add'>+    * put in place.  It doesn't matter for the standard tests, where there are</div><div class='add'>+    * no transforms, but it does for other tests where rowbytes may change after</div><div class='add'>+    * png_read_update_info.</div><div class='add'>+    */</div><div class='add'>+   if (png_get_rowbytes(pp, pi) != standard_rowsize(pp, dp-&gt;id))</div><div class='add'>+      png_error(pp, "validate: row size changed");</div><div class='add'>+</div><div class='add'>+   /* The palette is never read for non-palette images, even though it is valid</div><div class='add'>+    * - this could be changed.</div><div class='add'>+    */</div><div class='add'>+   if (dp-&gt;colour_type == 3) /* palette */</div><div class='add'>+   {</div><div class='add'>+      int i;</div><div class='add'>+</div><div class='add'>+      dp-&gt;is_transparent = standard_palette_init(dp-&gt;palette, pp, pi);</div><div class='add'>+</div><div class='add'>+      /* And validate the result. */</div><div class='add'>+      for (i=0; i&lt;256; ++i)</div><div class='add'>+         if (dp-&gt;palette[i].red != i || dp-&gt;palette[i].green != i ||</div><div class='add'>+            dp-&gt;palette[i].blue != i)</div><div class='add'>+            png_error(pp, "validate: color type 3 PLTE chunk changed");</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* In any case always check for a tranparent color: */</div><div class='add'>+   {</div><div class='add'>+      png_color_16p trans_color = 0;</div><div class='add'>+</div><div class='add'>+      if (png_get_tRNS(pp, pi, 0, 0, &amp;trans_color) &amp; PNG_INFO_tRNS)</div><div class='add'>+      {</div><div class='add'>+         if (trans_color == 0)</div><div class='add'>+            png_error(pp, "validate: unexpected png_get_tRNS (color) result");</div><div class='add'>+</div><div class='add'>+         switch (dp-&gt;colour_type)</div><div class='add'>+         {</div><div class='add'>+         case 0:</div><div class='add'>+            dp-&gt;transparent.red = dp-&gt;transparent.green = dp-&gt;transparent.blue =</div><div class='add'>+               trans_color-&gt;gray;</div><div class='add'>+            dp-&gt;is_transparent = 1;</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         case 2:</div><div class='add'>+            dp-&gt;transparent.red = trans_color-&gt;red;</div><div class='add'>+            dp-&gt;transparent.green = trans_color-&gt;green;</div><div class='add'>+            dp-&gt;transparent.blue = trans_color-&gt;blue;</div><div class='add'>+            dp-&gt;is_transparent = 1;</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         case 3:</div><div class='add'>+            /* Not expected because it should result in the array case</div><div class='add'>+             * above.</div><div class='add'>+             */</div><div class='add'>+            png_error(pp, "validate: unexpected png_get_tRNS result");</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         default:</div><div class='add'>+            png_error(pp, "validate: invalid tRNS chunk with alpha image");</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* Read the number of passes - expected to match the value used when</div><div class='add'>+    * creating the image (interlaced or not).  This has the side effect of</div><div class='add'>+    * turning on interlace handling (if do_interlace is not set.)</div><div class='add'>+    */</div><div class='add'>+   dp-&gt;npasses = npasses_from_interlace_type(pp, dp-&gt;interlace_type);</div><div class='add'>+   if (!dp-&gt;do_interlace &amp;&amp; dp-&gt;npasses != png_set_interlace_handling(pp))</div><div class='add'>+      png_error(pp, "validate: file changed interlace type");</div><div class='add'>+</div><div class='add'>+   /* Caller calls png_read_update_info or png_start_read_image now, then calls</div><div class='add'>+    * part2.</div><div class='add'>+    */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This must be called *after* the png_read_update_info call to get the correct</div><div class='add'>+ * 'rowbytes' value, otherwise png_get_rowbytes will refer to the untransformed</div><div class='add'>+ * image.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+standard_info_part2(standard_display *dp, png_structp pp, png_infop pi,</div><div class='add'>+    int nImages)</div><div class='add'>+{</div><div class='add'>+   /* Record cbRow now that it can be found. */</div><div class='add'>+   dp-&gt;pixel_size = bit_size(pp, png_get_color_type(pp, pi),</div><div class='add'>+      png_get_bit_depth(pp, pi));</div><div class='add'>+   dp-&gt;bit_width = png_get_image_width(pp, pi) * dp-&gt;pixel_size;</div><div class='add'>+   dp-&gt;cbRow = png_get_rowbytes(pp, pi);</div><div class='add'>+</div><div class='add'>+   /* Validate the rowbytes here again. */</div><div class='add'>+   if (dp-&gt;cbRow != (dp-&gt;bit_width+7)/8)</div><div class='add'>+      png_error(pp, "bad png_get_rowbytes calculation");</div><div class='add'>+</div><div class='add'>+   /* Then ensure there is enough space for the output image(s). */</div><div class='add'>+   store_ensure_image(dp-&gt;ps, pp, nImages * dp-&gt;cbRow * dp-&gt;h);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+standard_info_imp(standard_display *dp, png_structp pp, png_infop pi,</div><div class='add'>+    int nImages)</div><div class='add'>+{</div><div class='add'>+   /* Note that the validation routine has the side effect of turning on</div><div class='add'>+    * interlace handling in the subsequent code.</div><div class='add'>+    */</div><div class='add'>+   standard_info_part1(dp, pp, pi);</div><div class='add'>+</div><div class='add'>+   /* And the info callback has to call this (or png_read_update_info - see</div><div class='add'>+    * below in the png_modifier code for that variant.</div><div class='add'>+    */</div><div class='add'>+   png_start_read_image(pp);</div><div class='add'>+</div><div class='add'>+   /* Validate the height, width and rowbytes plus ensure that sufficient buffer</div><div class='add'>+    * exists for decoding the image.</div><div class='add'>+    */</div><div class='add'>+   standard_info_part2(dp, pp, pi, nImages);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+standard_info(png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   standard_display *dp = png_get_progressive_ptr(pp);</div><div class='add'>+</div><div class='add'>+   /* Call with nImages==1 because the progressive reader can only produce one</div><div class='add'>+    * image.</div><div class='add'>+    */</div><div class='add'>+   standard_info_imp(dp, pp, pi, 1 /*only one image*/);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+progressive_row(png_structp pp, png_bytep new_row, png_uint_32 y, int pass)</div><div class='add'>+{</div><div class='add'>+   PNG_CONST standard_display *dp = png_get_progressive_ptr(pp);</div><div class='add'>+</div><div class='add'>+   /* When handling interlacing some rows will be absent in each pass, the</div><div class='add'>+    * callback still gets called, but with a NULL pointer.  This is checked</div><div class='add'>+    * in the 'else' clause below.  We need our own 'cbRow', but we can't call</div><div class='add'>+    * png_get_rowbytes because we got no info structure.</div><div class='add'>+    */</div><div class='add'>+   if (new_row != NULL)</div><div class='add'>+   {</div><div class='add'>+      png_bytep row;</div><div class='add'>+</div><div class='add'>+      /* In the case where the reader doesn't do the interlace it gives</div><div class='add'>+       * us the y in the sub-image:</div><div class='add'>+       */</div><div class='add'>+      if (dp-&gt;do_interlace &amp;&amp; dp-&gt;interlace_type == PNG_INTERLACE_ADAM7)</div><div class='add'>+         y = PNG_ROW_FROM_PASS_ROW(y, pass);</div><div class='add'>+</div><div class='add'>+      /* Validate this just in case. */</div><div class='add'>+      if (y &gt;= dp-&gt;h)</div><div class='add'>+         png_error(pp, "invalid y to progressive row callback");</div><div class='add'>+</div><div class='add'>+      row = dp-&gt;ps-&gt;image + y * dp-&gt;cbRow;</div><div class='add'>+</div><div class='add'>+      /* Combine the new row into the old: */</div><div class='add'>+      if (dp-&gt;do_interlace)</div><div class='add'>+      {</div><div class='add'>+         if (dp-&gt;interlace_type == PNG_INTERLACE_ADAM7)</div><div class='add'>+            deinterlace_row(row, new_row, dp-&gt;pixel_size, dp-&gt;w, pass);</div><div class='add'>+         else</div><div class='add'>+            memcpy(row, new_row, dp-&gt;cbRow);</div><div class='add'>+      }</div><div class='add'>+      else</div><div class='add'>+         png_progressive_combine_row(pp, row, new_row);</div><div class='add'>+   } else if (dp-&gt;interlace_type == PNG_INTERLACE_ADAM7 &amp;&amp;</div><div class='add'>+      PNG_ROW_IN_INTERLACE_PASS(y, pass) &amp;&amp;</div><div class='add'>+      PNG_PASS_COLS(dp-&gt;w, pass) &gt; 0)</div><div class='add'>+      png_error(pp, "missing row in progressive de-interlacing");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sequential_row(standard_display *dp, png_structp pp, png_infop pi,</div><div class='add'>+    PNG_CONST png_bytep pImage, PNG_CONST png_bytep pDisplay)</div><div class='add'>+{</div><div class='add'>+   PNG_CONST int         npasses = dp-&gt;npasses;</div><div class='add'>+   PNG_CONST int         do_interlace = dp-&gt;do_interlace &amp;&amp;</div><div class='add'>+      dp-&gt;interlace_type == PNG_INTERLACE_ADAM7;</div><div class='add'>+   PNG_CONST png_uint_32 height = standard_height(pp, dp-&gt;id);</div><div class='add'>+   PNG_CONST png_uint_32 width = standard_width(pp, dp-&gt;id);</div><div class='add'>+   PNG_CONST size_t      cbRow = dp-&gt;cbRow;</div><div class='add'>+   int pass;</div><div class='add'>+</div><div class='add'>+   for (pass=0; pass&lt;npasses; ++pass)</div><div class='add'>+   {</div><div class='add'>+      png_uint_32 y;</div><div class='add'>+      png_uint_32 wPass = PNG_PASS_COLS(width, pass);</div><div class='add'>+      png_bytep pRow1 = pImage;</div><div class='add'>+      png_bytep pRow2 = pDisplay;</div><div class='add'>+</div><div class='add'>+      for (y=0; y&lt;height; ++y)</div><div class='add'>+      {</div><div class='add'>+         if (do_interlace)</div><div class='add'>+         {</div><div class='add'>+            /* wPass may be zero or this row may not be in this pass.</div><div class='add'>+             * png_read_row must not be called in either case.</div><div class='add'>+             */</div><div class='add'>+            if (wPass &gt; 0 &amp;&amp; PNG_ROW_IN_INTERLACE_PASS(y, pass))</div><div class='add'>+            {</div><div class='add'>+               /* Read the row into a pair of temporary buffers, then do the</div><div class='add'>+                * merge here into the output rows.</div><div class='add'>+                */</div><div class='add'>+               png_byte row[STANDARD_ROWMAX], display[STANDARD_ROWMAX];</div><div class='add'>+</div><div class='add'>+               /* The following aids (to some extent) error detection - we can</div><div class='add'>+                * see where png_read_row wrote.  Use opposite values in row and</div><div class='add'>+                * display to make this easier.</div><div class='add'>+                */</div><div class='add'>+               memset(row, 0xff, sizeof row);</div><div class='add'>+               memset(display, 0, sizeof display);</div><div class='add'>+</div><div class='add'>+               png_read_row(pp, row, display);</div><div class='add'>+</div><div class='add'>+               if (pRow1 != NULL)</div><div class='add'>+                  deinterlace_row(pRow1, row, dp-&gt;pixel_size, dp-&gt;w, pass);</div><div class='add'>+</div><div class='add'>+               if (pRow2 != NULL)</div><div class='add'>+                  deinterlace_row(pRow2, display, dp-&gt;pixel_size, dp-&gt;w, pass);</div><div class='add'>+            }</div><div class='add'>+         }</div><div class='add'>+         else</div><div class='add'>+            png_read_row(pp, pRow1, pRow2);</div><div class='add'>+</div><div class='add'>+         if (pRow1 != NULL)</div><div class='add'>+            pRow1 += cbRow;</div><div class='add'>+</div><div class='add'>+         if (pRow2 != NULL)</div><div class='add'>+            pRow2 += cbRow;</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* And finish the read operation (only really necessary if the caller wants</div><div class='add'>+    * to find additional data in png_info from chunks after the last IDAT.)</div><div class='add'>+    */</div><div class='add'>+   png_read_end(pp, pi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+standard_row_validate(standard_display *dp, png_structp pp, png_const_bytep row,</div><div class='add'>+   png_const_bytep display, png_uint_32 y)</div><div class='add'>+{</div><div class='add'>+   png_byte std[STANDARD_ROWMAX];</div><div class='add'>+</div><div class='add'>+   memset(std, 0xff, sizeof std);</div><div class='add'>+   standard_row(pp, std, dp-&gt;id, y);</div><div class='add'>+</div><div class='add'>+   /* At the end both the 'row' and 'display' arrays should end up identical.</div><div class='add'>+    * In earlier passes 'row' will be partially filled in, with only the pixels</div><div class='add'>+    * that have been read so far, but 'display' will have those pixels</div><div class='add'>+    * replicated to fill the unread pixels while reading an interlaced image.</div><div class='add'>+    * The side effect inside the libpng sequential reader is that the 'row'</div><div class='add'>+    * array retains the correct values for unwritten pixels within the row</div><div class='add'>+    * bytes, while the 'display' array gets bits off the end of the image (in</div><div class='add'>+    * the last byte) trashed.  Unfortunately in the progressive reader the</div><div class='add'>+    * row bytes are always trashed, so we always do a pixel_cmp here even though</div><div class='add'>+    * a memcmp of all cbRow bytes will succeed for the sequential reader.</div><div class='add'>+    */</div><div class='add'>+   if (row != NULL &amp;&amp; pixel_cmp(std, row, dp-&gt;bit_width) != 0)</div><div class='add'>+   {</div><div class='add'>+      char msg[64];</div><div class='add'>+      sprintf(msg, "PNG image row %d changed", y);</div><div class='add'>+      png_error(pp, msg);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* In this case use pixel_cmp because we need to compare a partial</div><div class='add'>+    * byte at the end of the row if the row is not an exact multiple</div><div class='add'>+    * of 8 bits wide.</div><div class='add'>+    */</div><div class='add'>+   if (display != NULL &amp;&amp; pixel_cmp(std, display, dp-&gt;bit_width) != 0)</div><div class='add'>+   {</div><div class='add'>+      char msg[64];</div><div class='add'>+      sprintf(msg, "display row %d changed", y);</div><div class='add'>+      png_error(pp, msg);</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+standard_image_validate(standard_display *dp, png_structp pp,</div><div class='add'>+   png_const_bytep pImage, png_const_bytep pDisplay)</div><div class='add'>+{</div><div class='add'>+   png_uint_32 y;</div><div class='add'>+</div><div class='add'>+   for (y=0; y&lt;dp-&gt;h; ++y)</div><div class='add'>+   {</div><div class='add'>+      standard_row_validate(dp, pp, pImage, pDisplay, y);</div><div class='add'>+</div><div class='add'>+      if (pImage != NULL)</div><div class='add'>+         pImage += dp-&gt;cbRow;</div><div class='add'>+</div><div class='add'>+      if (pDisplay != NULL)</div><div class='add'>+         pDisplay += dp-&gt;cbRow;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* This avoids false positives if the validation code is never called! */</div><div class='add'>+   dp-&gt;ps-&gt;validated = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+standard_end(png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   standard_display *dp = png_get_progressive_ptr(pp);</div><div class='add'>+</div><div class='add'>+   UNUSED(pi)</div><div class='add'>+</div><div class='add'>+   /* Validate the image - progressive reading only produces one variant for</div><div class='add'>+    * interlaced images.</div><div class='add'>+    */</div><div class='add'>+   standard_image_validate(dp, pp, dp-&gt;ps-&gt;image, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* A single test run checking the standard image to ensure it is not damaged. */</div><div class='add'>+static void</div><div class='add'>+standard_test(png_store* PNG_CONST psIn, png_uint_32 PNG_CONST id,</div><div class='add'>+   int do_interlace)</div><div class='add'>+{</div><div class='add'>+   standard_display d;</div><div class='add'>+   context(psIn, fault);</div><div class='add'>+</div><div class='add'>+   /* Set up the display (stack frame) variables from the arguments to the</div><div class='add'>+    * function and initialize the locals that are filled in later.</div><div class='add'>+    */</div><div class='add'>+   standard_display_init(&amp;d, psIn, id, do_interlace);</div><div class='add'>+</div><div class='add'>+   /* Everything is protected by a Try/Catch.  The functions called also</div><div class='add'>+    * typically have local Try/Catch blocks.</div><div class='add'>+    */</div><div class='add'>+   Try</div><div class='add'>+   {</div><div class='add'>+      png_structp pp;</div><div class='add'>+      png_infop pi;</div><div class='add'>+</div><div class='add'>+      /* Get a png_struct for reading the image. This will throw an error if it</div><div class='add'>+       * fails, so we don't need to check the result.</div><div class='add'>+       */</div><div class='add'>+      pp = set_store_for_read(d.ps, &amp;pi, d.id,</div><div class='add'>+         d.do_interlace ?  (d.ps-&gt;progressive ?</div><div class='add'>+            "pngvalid progressive deinterlacer" :</div><div class='add'>+            "pngvalid sequential deinterlacer") : (d.ps-&gt;progressive ?</div><div class='add'>+               "progressive reader" : "sequential reader"));</div><div class='add'>+</div><div class='add'>+      /* Introduce the correct read function. */</div><div class='add'>+      if (d.ps-&gt;progressive)</div><div class='add'>+      {</div><div class='add'>+         png_set_progressive_read_fn(pp, &amp;d, standard_info, progressive_row,</div><div class='add'>+            standard_end);</div><div class='add'>+</div><div class='add'>+         /* Now feed data into the reader until we reach the end: */</div><div class='add'>+         store_progressive_read(d.ps, pp, pi);</div><div class='add'>+      }</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         /* Note that this takes the store, not the display. */</div><div class='add'>+         png_set_read_fn(pp, d.ps, store_read);</div><div class='add'>+</div><div class='add'>+         /* Check the header values: */</div><div class='add'>+         png_read_info(pp, pi);</div><div class='add'>+</div><div class='add'>+         /* The code tests both versions of the images that the sequential</div><div class='add'>+          * reader can produce.</div><div class='add'>+          */</div><div class='add'>+         standard_info_imp(&amp;d, pp, pi, 2 /*images*/);</div><div class='add'>+</div><div class='add'>+         /* Need the total bytes in the image below; we can't get to this point</div><div class='add'>+          * unless the PNG file values have been checked against the expected</div><div class='add'>+          * values.</div><div class='add'>+          */</div><div class='add'>+         {</div><div class='add'>+            PNG_CONST png_bytep pImage = d.ps-&gt;image;</div><div class='add'>+            PNG_CONST png_bytep pDisplay = pImage + d.cbRow * d.h;</div><div class='add'>+</div><div class='add'>+            sequential_row(&amp;d, pp, pi, pImage, pDisplay);</div><div class='add'>+</div><div class='add'>+            /* After the last pass loop over the rows again to check that the</div><div class='add'>+             * image is correct.</div><div class='add'>+             */</div><div class='add'>+            standard_image_validate(&amp;d, pp, pImage, pDisplay);</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* Check for validation. */</div><div class='add'>+      if (!d.ps-&gt;validated)</div><div class='add'>+         png_error(pp, "image read failed silently");</div><div class='add'>+</div><div class='add'>+      /* Successful completion. */</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   Catch(fault)</div><div class='add'>+      d.ps = fault; /* make sure this hasn't been clobbered. */</div><div class='add'>+</div><div class='add'>+   /* In either case clean up the store. */</div><div class='add'>+   store_read_reset(d.ps);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+test_standard(png_modifier* PNG_CONST pm, png_byte PNG_CONST colour_type,</div><div class='add'>+    int bdlo, int PNG_CONST bdhi)</div><div class='add'>+{</div><div class='add'>+   for (; bdlo &lt;= bdhi; ++bdlo)</div><div class='add'>+   {</div><div class='add'>+      int interlace_type;</div><div class='add'>+</div><div class='add'>+      for (interlace_type = PNG_INTERLACE_NONE;</div><div class='add'>+           interlace_type &lt; PNG_INTERLACE_LAST; ++interlace_type)</div><div class='add'>+      {</div><div class='add'>+         standard_test(&amp;pm-&gt;this, FILEID(colour_type, DEPTH(bdlo),</div><div class='add'>+            interlace_type, 0, 0, 0), 0/*do_interlace*/);</div><div class='add'>+</div><div class='add'>+         if (fail(pm))</div><div class='add'>+            return 0;</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return 1; /* keep going */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+perform_standard_test(png_modifier *pm)</div><div class='add'>+{</div><div class='add'>+   /* Test each colour type over the valid range of bit depths (expressed as</div><div class='add'>+    * log2(bit_depth) in turn, stop as soon as any error is detected.</div><div class='add'>+    */</div><div class='add'>+   if (!test_standard(pm, 0, 0, READ_BDHI))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   if (!test_standard(pm, 2, 3, READ_BDHI))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   if (!test_standard(pm, 3, 0, 3))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   if (!test_standard(pm, 4, 3, READ_BDHI))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   if (!test_standard(pm, 6, 3, READ_BDHI))</div><div class='add'>+      return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/********************************** SIZE TESTS ********************************/</div><div class='add'>+static int</div><div class='add'>+test_size(png_modifier* PNG_CONST pm, png_byte PNG_CONST colour_type,</div><div class='add'>+    int bdlo, int PNG_CONST bdhi)</div><div class='add'>+{</div><div class='add'>+   /* Run the tests on each combination.</div><div class='add'>+    *</div><div class='add'>+    * NOTE: on my 32 bit x86 each of the following blocks takes</div><div class='add'>+    * a total of 3.5 seconds if done across every combo of bit depth</div><div class='add'>+    * width and height.  This is a waste of time in practice, hence the</div><div class='add'>+    * hinc and winc stuff:</div><div class='add'>+    */</div><div class='add'>+   static PNG_CONST png_byte hinc[] = {1, 3, 11, 1, 5};</div><div class='add'>+   static PNG_CONST png_byte winc[] = {1, 9, 5, 7, 1};</div><div class='add'>+   for (; bdlo &lt;= bdhi; ++bdlo)</div><div class='add'>+   {</div><div class='add'>+      png_uint_32 h, w;</div><div class='add'>+</div><div class='add'>+      for (h=1; h&lt;=16; h+=hinc[bdlo]) for (w=1; w&lt;=16; w+=winc[bdlo])</div><div class='add'>+      {</div><div class='add'>+         /* First test all the 'size' images against the sequential</div><div class='add'>+          * reader using libpng to deinterlace (where required.)  This</div><div class='add'>+          * validates the write side of libpng.  There are four possibilities</div><div class='add'>+          * to validate.</div><div class='add'>+          */</div><div class='add'>+         standard_test(&amp;pm-&gt;this, FILEID(colour_type, DEPTH(bdlo),</div><div class='add'>+            PNG_INTERLACE_NONE, w, h, 0), 0/*do_interlace*/);</div><div class='add'>+</div><div class='add'>+         if (fail(pm))</div><div class='add'>+            return 0;</div><div class='add'>+</div><div class='add'>+         standard_test(&amp;pm-&gt;this, FILEID(colour_type, DEPTH(bdlo),</div><div class='add'>+            PNG_INTERLACE_NONE, w, h, 1), 0/*do_interlace*/);</div><div class='add'>+</div><div class='add'>+         if (fail(pm))</div><div class='add'>+            return 0;</div><div class='add'>+</div><div class='add'>+         standard_test(&amp;pm-&gt;this, FILEID(colour_type, DEPTH(bdlo),</div><div class='add'>+            PNG_INTERLACE_ADAM7, w, h, 0), 0/*do_interlace*/);</div><div class='add'>+</div><div class='add'>+         if (fail(pm))</div><div class='add'>+            return 0;</div><div class='add'>+</div><div class='add'>+         standard_test(&amp;pm-&gt;this, FILEID(colour_type, DEPTH(bdlo),</div><div class='add'>+            PNG_INTERLACE_ADAM7, w, h, 1), 0/*do_interlace*/);</div><div class='add'>+</div><div class='add'>+         if (fail(pm))</div><div class='add'>+            return 0;</div><div class='add'>+</div><div class='add'>+         /* Now validate the interlaced read side - do_interlace true,</div><div class='add'>+          * in the progressive case this does actually make a difference</div><div class='add'>+          * to the code used in the non-interlaced case too.</div><div class='add'>+          */</div><div class='add'>+         standard_test(&amp;pm-&gt;this, FILEID(colour_type, DEPTH(bdlo),</div><div class='add'>+            PNG_INTERLACE_NONE, w, h, 0), 1/*do_interlace*/);</div><div class='add'>+</div><div class='add'>+         if (fail(pm))</div><div class='add'>+            return 0;</div><div class='add'>+</div><div class='add'>+         standard_test(&amp;pm-&gt;this, FILEID(colour_type, DEPTH(bdlo),</div><div class='add'>+            PNG_INTERLACE_ADAM7, w, h, 0), 1/*do_interlace*/);</div><div class='add'>+</div><div class='add'>+         if (fail(pm))</div><div class='add'>+            return 0;</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return 1; /* keep going */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+perform_size_test(png_modifier *pm)</div><div class='add'>+{</div><div class='add'>+   /* Test each colour type over the valid range of bit depths (expressed as</div><div class='add'>+    * log2(bit_depth) in turn, stop as soon as any error is detected.</div><div class='add'>+    */</div><div class='add'>+   if (!test_size(pm, 0, 0, READ_BDHI))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   if (!test_size(pm, 2, 3, READ_BDHI))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   /* For the moment don't do the palette test - it's a waste of time when</div><div class='add'>+    * compared to the greyscale test.</div><div class='add'>+    */</div><div class='add'>+#if 0</div><div class='add'>+   if (!test_size(pm, 3, 0, 3))</div><div class='add'>+      return;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+   if (!test_size(pm, 4, 3, READ_BDHI))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   if (!test_size(pm, 6, 3, READ_BDHI))</div><div class='add'>+      return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/******************************* TRANSFORM TESTS ******************************/</div><div class='add'>+/* A set of tests to validate libpng image transforms.  The possibilities here</div><div class='add'>+ * are legion because the transforms can be combined in a combinatorial</div><div class='add'>+ * fashion.  To deal with this some measure of restraint is required, otherwise</div><div class='add'>+ * the tests would take forever.</div><div class='add'>+ */</div><div class='add'>+typedef struct image_pixel</div><div class='add'>+{</div><div class='add'>+   /* A local (pngvalid) representation of a PNG pixel, in all its</div><div class='add'>+    * various forms.</div><div class='add'>+    */</div><div class='add'>+   unsigned int red, green, blue, alpha; /* For non-palette images. */</div><div class='add'>+   unsigned int palette_index;           /* For a palette image. */</div><div class='add'>+   png_byte colour_type;                 /* As in the spec. */</div><div class='add'>+   png_byte bit_depth;                   /* Defines bit size in row */</div><div class='add'>+   png_byte sample_depth;                /* Scale of samples */</div><div class='add'>+   int      have_tRNS;                   /* tRNS chunk may need processing */</div><div class='add'>+</div><div class='add'>+   /* For checking the code calculates double precision floating point values</div><div class='add'>+    * along with an error value, accumulated from the transforms.  Because an</div><div class='add'>+    * sBIT setting allows larger error bounds (indeed, by the spec, apparently</div><div class='add'>+    * up to just less than +/-1 in the scaled value) the *lowest* sBIT for each</div><div class='add'>+    * channel is stored.  This sBIT value is folded in to the stored error value</div><div class='add'>+    * at the end of the application of the transforms to the pixel.</div><div class='add'>+    */</div><div class='add'>+   double   redf, greenf, bluef, alphaf;</div><div class='add'>+   double   rede, greene, bluee, alphae;</div><div class='add'>+   png_byte red_sBIT, green_sBIT, blue_sBIT, alpha_sBIT;</div><div class='add'>+} image_pixel;</div><div class='add'>+</div><div class='add'>+/* Shared utility function, see below. */</div><div class='add'>+static void</div><div class='add'>+image_pixel_setf(image_pixel *this, unsigned int max)</div><div class='add'>+{</div><div class='add'>+   this-&gt;redf = this-&gt;red / (double)max;</div><div class='add'>+   this-&gt;greenf = this-&gt;green / (double)max;</div><div class='add'>+   this-&gt;bluef = this-&gt;blue / (double)max;</div><div class='add'>+   this-&gt;alphaf = this-&gt;alpha / (double)max;</div><div class='add'>+</div><div class='add'>+   if (this-&gt;red &lt; max)</div><div class='add'>+      this-&gt;rede = this-&gt;redf * DBL_EPSILON;</div><div class='add'>+   else</div><div class='add'>+      this-&gt;rede = 0;</div><div class='add'>+   if (this-&gt;green &lt; max)</div><div class='add'>+      this-&gt;greene = this-&gt;greenf * DBL_EPSILON;</div><div class='add'>+   else</div><div class='add'>+      this-&gt;greene = 0;</div><div class='add'>+   if (this-&gt;blue &lt; max)</div><div class='add'>+      this-&gt;bluee = this-&gt;bluef * DBL_EPSILON;</div><div class='add'>+   else</div><div class='add'>+      this-&gt;bluee = 0;</div><div class='add'>+   if (this-&gt;alpha &lt; max)</div><div class='add'>+      this-&gt;alphae = this-&gt;alphaf * DBL_EPSILON;</div><div class='add'>+   else</div><div class='add'>+      this-&gt;alphae = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Initialize the structure for the next pixel - call this before doing any</div><div class='add'>+ * transforms and call it for each pixel since all the fields may need to be</div><div class='add'>+ * reset.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+image_pixel_init(image_pixel *this, png_const_bytep row, png_byte colour_type,</div><div class='add'>+    png_byte bit_depth, png_uint_32 x, standard_palette palette)</div><div class='add'>+{</div><div class='add'>+   PNG_CONST png_byte sample_depth = (png_byte)(colour_type ==</div><div class='add'>+      PNG_COLOR_TYPE_PALETTE ? 8 : bit_depth);</div><div class='add'>+   PNG_CONST unsigned int max = (1U&lt;&lt;sample_depth)-1;</div><div class='add'>+</div><div class='add'>+   /* Initially just set everything to the same number and the alpha to opaque.</div><div class='add'>+    * Note that this currently assumes a simple palette where entry x has colour</div><div class='add'>+    * rgb(x,x,x)!</div><div class='add'>+    */</div><div class='add'>+   this-&gt;palette_index = this-&gt;red = this-&gt;green = this-&gt;blue =</div><div class='add'>+      sample(row, colour_type, bit_depth, x, 0);</div><div class='add'>+   this-&gt;alpha = max;</div><div class='add'>+   this-&gt;red_sBIT = this-&gt;green_sBIT = this-&gt;blue_sBIT = this-&gt;alpha_sBIT =</div><div class='add'>+      sample_depth;</div><div class='add'>+</div><div class='add'>+   /* Then override as appropriate: */</div><div class='add'>+   if (colour_type == 3) /* palette */</div><div class='add'>+   {</div><div class='add'>+      /* This permits the caller to default to the sample value. */</div><div class='add'>+      if (palette != 0)</div><div class='add'>+      {</div><div class='add'>+         PNG_CONST unsigned int i = this-&gt;palette_index;</div><div class='add'>+</div><div class='add'>+         this-&gt;red = palette[i].red;</div><div class='add'>+         this-&gt;green = palette[i].green;</div><div class='add'>+         this-&gt;blue = palette[i].blue;</div><div class='add'>+         this-&gt;alpha = palette[i].alpha;</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   else /* not palette */</div><div class='add'>+   {</div><div class='add'>+      unsigned int i = 0;</div><div class='add'>+</div><div class='add'>+      if (colour_type &amp; 2)</div><div class='add'>+      {</div><div class='add'>+         this-&gt;green = sample(row, colour_type, bit_depth, x, 1);</div><div class='add'>+         this-&gt;blue = sample(row, colour_type, bit_depth, x, 2);</div><div class='add'>+         i = 2;</div><div class='add'>+      }</div><div class='add'>+      if (colour_type &amp; 4)</div><div class='add'>+         this-&gt;alpha = sample(row, colour_type, bit_depth, x, ++i);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* Calculate the scaled values, these are simply the values divided by</div><div class='add'>+    * 'max' and the error is initialized to the double precision epsilon value</div><div class='add'>+    * from the header file.</div><div class='add'>+    */</div><div class='add'>+   image_pixel_setf(this, max);</div><div class='add'>+</div><div class='add'>+   /* Store the input information for use in the transforms - these will</div><div class='add'>+    * modify the information.</div><div class='add'>+    */</div><div class='add'>+   this-&gt;colour_type = colour_type;</div><div class='add'>+   this-&gt;bit_depth = bit_depth;</div><div class='add'>+   this-&gt;sample_depth = sample_depth;</div><div class='add'>+   this-&gt;have_tRNS = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert a palette image to an rgb image.  This necessarily converts the tRNS</div><div class='add'>+ * chunk at the same time, because the tRNS will be in palette form.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+image_pixel_convert_PLTE(image_pixel *this, const standard_display *display)</div><div class='add'>+{</div><div class='add'>+   if (this-&gt;colour_type == PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+   {</div><div class='add'>+      PNG_CONST unsigned int i = this-&gt;palette_index;</div><div class='add'>+</div><div class='add'>+      this-&gt;bit_depth = this-&gt;sample_depth;</div><div class='add'>+      this-&gt;red = display-&gt;palette[i].red;</div><div class='add'>+      this-&gt;green = display-&gt;palette[i].green;</div><div class='add'>+      this-&gt;blue = display-&gt;palette[i].blue;</div><div class='add'>+      this-&gt;red_sBIT = display-&gt;red_sBIT;</div><div class='add'>+      this-&gt;green_sBIT = display-&gt;green_sBIT;</div><div class='add'>+      this-&gt;blue_sBIT = display-&gt;blue_sBIT;</div><div class='add'>+</div><div class='add'>+      if (this-&gt;have_tRNS)</div><div class='add'>+      {</div><div class='add'>+         this-&gt;alpha = display-&gt;palette[i].alpha;</div><div class='add'>+         this-&gt;colour_type = PNG_COLOR_TYPE_RGB_ALPHA;</div><div class='add'>+         this-&gt;have_tRNS = 0;</div><div class='add'>+      }</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         this-&gt;alpha = 255;</div><div class='add'>+         this-&gt;colour_type = PNG_COLOR_TYPE_RGB;</div><div class='add'>+      }</div><div class='add'>+      this-&gt;alpha_sBIT = 8;</div><div class='add'>+</div><div class='add'>+      /* And regenerate the scaled values and all the errors, which are now set</div><div class='add'>+       * back to the initial values.</div><div class='add'>+       */</div><div class='add'>+      image_pixel_setf(this, 255);</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Add an alpha channel, this will glom in the tRNS information because tRNS is</div><div class='add'>+ * not valid in an alpha image.  The bit depth will invariably be set to at</div><div class='add'>+ * least 8.  Palette images will be converted to alpha (using the above API).</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+image_pixel_add_alpha(image_pixel *this, const standard_display *display)</div><div class='add'>+{</div><div class='add'>+   if (this-&gt;colour_type == PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+      image_pixel_convert_PLTE(this, display);</div><div class='add'>+</div><div class='add'>+   if ((this-&gt;colour_type &amp; PNG_COLOR_MASK_ALPHA) == 0)</div><div class='add'>+   {</div><div class='add'>+      if (this-&gt;colour_type == PNG_COLOR_TYPE_GRAY)</div><div class='add'>+      {</div><div class='add'>+         if (this-&gt;bit_depth &lt; 8)</div><div class='add'>+            this-&gt;bit_depth = 8;</div><div class='add'>+</div><div class='add'>+         if (this-&gt;have_tRNS)</div><div class='add'>+         {</div><div class='add'>+            this-&gt;have_tRNS = 0;</div><div class='add'>+</div><div class='add'>+            /* Check the input, original, channel value here against the</div><div class='add'>+             * original tRNS gray chunk valie.</div><div class='add'>+             */</div><div class='add'>+            if (this-&gt;red == display-&gt;transparent.red)</div><div class='add'>+               this-&gt;alphaf = 0;</div><div class='add'>+            else</div><div class='add'>+               this-&gt;alphaf = 1;</div><div class='add'>+         }</div><div class='add'>+         else</div><div class='add'>+            this-&gt;alphaf = 1;</div><div class='add'>+</div><div class='add'>+         this-&gt;colour_type = PNG_COLOR_TYPE_GRAY_ALPHA;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      else if (this-&gt;colour_type == PNG_COLOR_TYPE_RGB)</div><div class='add'>+      {</div><div class='add'>+         if (this-&gt;have_tRNS)</div><div class='add'>+         {</div><div class='add'>+            this-&gt;have_tRNS = 0;</div><div class='add'>+</div><div class='add'>+            /* Again, check the exact input values, not the current transformed</div><div class='add'>+             * value!</div><div class='add'>+             */</div><div class='add'>+            if (this-&gt;red == display-&gt;transparent.red &amp;&amp;</div><div class='add'>+               this-&gt;green == display-&gt;transparent.green &amp;&amp;</div><div class='add'>+               this-&gt;blue == display-&gt;transparent.blue)</div><div class='add'>+               this-&gt;alphaf = 0;</div><div class='add'>+            else</div><div class='add'>+               this-&gt;alphaf = 1;</div><div class='add'>+</div><div class='add'>+            this-&gt;colour_type = PNG_COLOR_TYPE_RGB_ALPHA;</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* The error in the alpha is zero and the sBIT value comes from the</div><div class='add'>+       * original sBIT data (actually it will always be the original bit depth).</div><div class='add'>+       */</div><div class='add'>+      this-&gt;alphae = 0;</div><div class='add'>+      this-&gt;alpha_sBIT = display-&gt;alpha_sBIT;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct transform_display;</div><div class='add'>+typedef struct image_transform</div><div class='add'>+{</div><div class='add'>+   /* The name of this transform: a string. */</div><div class='add'>+   PNG_CONST char *name;</div><div class='add'>+</div><div class='add'>+   /* Each transform can be disabled from the command line: */</div><div class='add'>+   int enable;</div><div class='add'>+</div><div class='add'>+   /* The global list of transforms; read only. */</div><div class='add'>+   struct image_transform *PNG_CONST list;</div><div class='add'>+</div><div class='add'>+   /* The global count of the number of times this transform has been set on an</div><div class='add'>+    * image.</div><div class='add'>+    */</div><div class='add'>+   unsigned int global_use;</div><div class='add'>+</div><div class='add'>+   /* The local count of the number of times this transform has been set. */</div><div class='add'>+   unsigned int local_use;</div><div class='add'>+</div><div class='add'>+   /* The next transform in the list, each transform must call its own next</div><div class='add'>+    * transform after it has processed the pixel successfully.</div><div class='add'>+    */</div><div class='add'>+   PNG_CONST struct image_transform *next;</div><div class='add'>+</div><div class='add'>+   /* A single transform for the image, expressed as a series of function</div><div class='add'>+    * callbacks and some space for values.</div><div class='add'>+    *</div><div class='add'>+    * First a callback to set the transform on the current png_read_struct:</div><div class='add'>+    */</div><div class='add'>+   void (*set)(PNG_CONST struct image_transform *this,</div><div class='add'>+      struct transform_display *that, png_structp pp, png_infop pi);</div><div class='add'>+</div><div class='add'>+   /* Then a transform that takes an input pixel in one PNG format or another</div><div class='add'>+    * and modifies it by a pngvalid implementation of the transform (thus</div><div class='add'>+    * duplicating the libpng intent without, we hope, duplicating the bugs</div><div class='add'>+    * in the libpng implementation!)  The png_structp is solely to allow error</div><div class='add'>+    * reporting via png_error and png_warning.</div><div class='add'>+    */</div><div class='add'>+   void (*mod)(PNG_CONST struct image_transform *this, image_pixel *that,</div><div class='add'>+      png_structp pp, PNG_CONST struct transform_display *display);</div><div class='add'>+</div><div class='add'>+   /* Add this transform to the list and return true if the transform is</div><div class='add'>+    * meaningful for this colour type and bit depth - if false then the</div><div class='add'>+    * transform should have no effect on the image so there's not a lot of</div><div class='add'>+    * point running it.</div><div class='add'>+    */</div><div class='add'>+   int (*add)(struct image_transform *this,</div><div class='add'>+      PNG_CONST struct image_transform **that, png_byte colour_type,</div><div class='add'>+      png_byte bit_depth);</div><div class='add'>+} image_transform;</div><div class='add'>+</div><div class='add'>+typedef struct transform_display</div><div class='add'>+{</div><div class='add'>+   standard_display this;</div><div class='add'>+</div><div class='add'>+   /* Parameters */</div><div class='add'>+   png_modifier*              pm;</div><div class='add'>+   PNG_CONST image_transform* transform_list;</div><div class='add'>+</div><div class='add'>+   /* Local variables */</div><div class='add'>+   png_byte output_colour_type;</div><div class='add'>+   png_byte output_bit_depth;</div><div class='add'>+} transform_display;</div><div class='add'>+</div><div class='add'>+/* Two functions to end the list: */</div><div class='add'>+static void</div><div class='add'>+image_transform_set_end(PNG_CONST image_transform *this,</div><div class='add'>+   transform_display *that, png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   UNUSED(this)</div><div class='add'>+   UNUSED(that)</div><div class='add'>+   UNUSED(pp)</div><div class='add'>+   UNUSED(pi)</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* At the end of the list recalculate the output image pixel value from the</div><div class='add'>+ * double precision values set up by the preceding 'mod' calls:</div><div class='add'>+ */</div><div class='add'>+static unsigned int</div><div class='add'>+sample_scale(double sample_value, unsigned int scale)</div><div class='add'>+{</div><div class='add'>+   sample_value = floor(sample_value * scale + .5);</div><div class='add'>+</div><div class='add'>+   /* Return NaN as 0: */</div><div class='add'>+   if (!(sample_value &gt; 0))</div><div class='add'>+      sample_value = 0;</div><div class='add'>+   else if (sample_value &gt; scale)</div><div class='add'>+      sample_value = scale;</div><div class='add'>+</div><div class='add'>+   return (unsigned int)sample_value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+image_transform_mod_end(PNG_CONST image_transform *this, image_pixel *that,</div><div class='add'>+    png_structp pp, PNG_CONST transform_display *display)</div><div class='add'>+{</div><div class='add'>+   PNG_CONST unsigned int scale = (1U&lt;&lt;that-&gt;sample_depth)-1;</div><div class='add'>+</div><div class='add'>+   UNUSED(this)</div><div class='add'>+   UNUSED(pp)</div><div class='add'>+   UNUSED(display)</div><div class='add'>+</div><div class='add'>+   /* At the end recalculate the digitized red green and blue values according</div><div class='add'>+    * to the current sample_depth of the pixel.</div><div class='add'>+    *</div><div class='add'>+    * The sample value is simply scaled to the maximum, checking for over</div><div class='add'>+    * and underflow (which can both happen for some image transforms,</div><div class='add'>+    * including simple size scaling, though libpng doesn't do that at present.</div><div class='add'>+    */</div><div class='add'>+   that-&gt;red = sample_scale(that-&gt;redf, scale);</div><div class='add'>+</div><div class='add'>+   /* The error value is increased, at the end, according to the lowest sBIT</div><div class='add'>+    * value seen.  Common sense tells us that the intermediate integer</div><div class='add'>+    * representations are no more accurate than +/- 0.5 in the integral values,</div><div class='add'>+    * the sBIT allows the implementation to be worse than this.  In addition the</div><div class='add'>+    * PNG specification actually permits any error within the range (-1..+1),</div><div class='add'>+    * but that is ignored here.  Instead the final digitized value is compared,</div><div class='add'>+    * below to the digitized value of the error limits - this has the net effect</div><div class='add'>+    * of allowing (almost) +/-1 in the output value.  It's difficult to see how</div><div class='add'>+    * any algorithm that digitizes intermediate results can be more accurate.</div><div class='add'>+    */</div><div class='add'>+   that-&gt;rede += 1./(2*((1U&lt;&lt;that-&gt;red_sBIT)-1));</div><div class='add'>+</div><div class='add'>+   if (that-&gt;colour_type &amp; PNG_COLOR_MASK_COLOR)</div><div class='add'>+   {</div><div class='add'>+      that-&gt;green = sample_scale(that-&gt;greenf, scale);</div><div class='add'>+      that-&gt;blue = sample_scale(that-&gt;bluef, scale);</div><div class='add'>+      that-&gt;greene += 1./(2*((1U&lt;&lt;that-&gt;green_sBIT)-1));</div><div class='add'>+      that-&gt;bluee += 1./(2*((1U&lt;&lt;that-&gt;blue_sBIT)-1));</div><div class='add'>+   }</div><div class='add'>+   else</div><div class='add'>+   {</div><div class='add'>+      that-&gt;blue = that-&gt;green = that-&gt;red;</div><div class='add'>+      that-&gt;bluef = that-&gt;greenf = that-&gt;redf;</div><div class='add'>+      that-&gt;bluee = that-&gt;greene = that-&gt;rede;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   if ((that-&gt;colour_type &amp; PNG_COLOR_MASK_ALPHA) ||</div><div class='add'>+      that-&gt;colour_type == PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+   {</div><div class='add'>+      that-&gt;alpha = sample_scale(that-&gt;alphaf, scale);</div><div class='add'>+      that-&gt;alphae += 1./(2*((1U&lt;&lt;that-&gt;alpha_sBIT)-1));</div><div class='add'>+   }</div><div class='add'>+   else</div><div class='add'>+   {</div><div class='add'>+      that-&gt;alpha = scale; /* opaque */</div><div class='add'>+      that-&gt;alpha = 1;     /* Override this. */</div><div class='add'>+      that-&gt;alphae = 0;    /* It's exact ;-) */</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Static 'end' structure: */</div><div class='add'>+static image_transform image_transform_end =</div><div class='add'>+{</div><div class='add'>+   "(end)", /* name */</div><div class='add'>+   1, /* enable */</div><div class='add'>+   0, /* list */</div><div class='add'>+   0, /* global_use */</div><div class='add'>+   0, /* local_use */</div><div class='add'>+   0, /* next */</div><div class='add'>+   image_transform_set_end,</div><div class='add'>+   image_transform_mod_end,</div><div class='add'>+   0 /* never called, I want it to crash if it is! */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Reader callbacks and implementations, where they differ from the standard</div><div class='add'>+ * ones.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+transform_display_init(transform_display *dp, png_modifier *pm, png_uint_32 id,</div><div class='add'>+    PNG_CONST image_transform *transform_list)</div><div class='add'>+{</div><div class='add'>+   /* Standard fields */</div><div class='add'>+   standard_display_init(&amp;dp-&gt;this, &amp;pm-&gt;this, id, 0/*do_interlace*/);</div><div class='add'>+</div><div class='add'>+   /* Parameter fields */</div><div class='add'>+   dp-&gt;pm = pm;</div><div class='add'>+   dp-&gt;transform_list = transform_list;</div><div class='add'>+</div><div class='add'>+   /* Local variable fields */</div><div class='add'>+   dp-&gt;output_colour_type = 255; /* invalid */</div><div class='add'>+   dp-&gt;output_bit_depth = 255;  /* invalid */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+transform_info_imp(transform_display *dp, png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   /* Reuse the standard stuff as appropriate. */</div><div class='add'>+   standard_info_part1(&amp;dp-&gt;this, pp, pi);</div><div class='add'>+</div><div class='add'>+   /* Now set the list of transforms. */</div><div class='add'>+   dp-&gt;transform_list-&gt;set(dp-&gt;transform_list, dp, pp, pi);</div><div class='add'>+</div><div class='add'>+   /* Update the info structure for these transforms: */</div><div class='add'>+   png_read_update_info(pp, pi);</div><div class='add'>+</div><div class='add'>+   /* And get the output information into the standard_display */</div><div class='add'>+   standard_info_part2(&amp;dp-&gt;this, pp, pi, 1/*images*/);</div><div class='add'>+</div><div class='add'>+   /* Plus the extra stuff we need for the transform tests: */</div><div class='add'>+   dp-&gt;output_colour_type = png_get_color_type(pp, pi);</div><div class='add'>+   dp-&gt;output_bit_depth = png_get_bit_depth(pp, pi);</div><div class='add'>+</div><div class='add'>+   /* Validate the combination of colour type and bit depth that we are getting</div><div class='add'>+    * out of libpng; the semantics of something not in the PNG spec are, at</div><div class='add'>+    * best, unclear.</div><div class='add'>+    */</div><div class='add'>+   switch (dp-&gt;output_colour_type)</div><div class='add'>+   {</div><div class='add'>+   case PNG_COLOR_TYPE_PALETTE:</div><div class='add'>+      if (dp-&gt;output_bit_depth &gt; 8) goto error;</div><div class='add'>+      /*FALL THROUGH*/</div><div class='add'>+   case PNG_COLOR_TYPE_GRAY:</div><div class='add'>+      if (dp-&gt;output_bit_depth == 1 || dp-&gt;output_bit_depth == 2 ||</div><div class='add'>+         dp-&gt;output_bit_depth == 4)</div><div class='add'>+         break;</div><div class='add'>+      /*FALL THROUGH*/</div><div class='add'>+   default:</div><div class='add'>+      if (dp-&gt;output_bit_depth == 8 || dp-&gt;output_bit_depth == 16)</div><div class='add'>+         break;</div><div class='add'>+      /*FALL THROUGH*/</div><div class='add'>+   error:</div><div class='add'>+      {</div><div class='add'>+         char message[128];</div><div class='add'>+         size_t pos;</div><div class='add'>+</div><div class='add'>+         pos = safecat(message, sizeof message, 0,</div><div class='add'>+            "invalid final bit depth: colour type(");</div><div class='add'>+         pos = safecatn(message, sizeof message, pos, dp-&gt;output_colour_type);</div><div class='add'>+         pos = safecat(message, sizeof message, pos, ") with bit depth: ");</div><div class='add'>+         pos = safecatn(message, sizeof message, pos, dp-&gt;output_bit_depth);</div><div class='add'>+</div><div class='add'>+         png_error(pp, message);</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* Use a test pixel to check that the output agrees with what we expect -</div><div class='add'>+    * this avoids running the whole test if the output is unexpected.</div><div class='add'>+    */</div><div class='add'>+   {</div><div class='add'>+      image_pixel test_pixel;</div><div class='add'>+</div><div class='add'>+      memset(&amp;test_pixel, 0, sizeof test_pixel);</div><div class='add'>+      test_pixel.colour_type = dp-&gt;this.colour_type; /* input */</div><div class='add'>+      test_pixel.bit_depth = dp-&gt;this.bit_depth;</div><div class='add'>+      if (test_pixel.colour_type == PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+         test_pixel.sample_depth = 8;</div><div class='add'>+      else</div><div class='add'>+         test_pixel.sample_depth = test_pixel.bit_depth;</div><div class='add'>+      /* Don't need sBIT here */</div><div class='add'>+      test_pixel.have_tRNS = dp-&gt;this.is_transparent;</div><div class='add'>+</div><div class='add'>+      dp-&gt;transform_list-&gt;mod(dp-&gt;transform_list, &amp;test_pixel, pp, dp);</div><div class='add'>+</div><div class='add'>+      if (test_pixel.colour_type != dp-&gt;output_colour_type)</div><div class='add'>+      {</div><div class='add'>+         char message[128];</div><div class='add'>+         size_t pos = safecat(message, sizeof message, 0, "colour type ");</div><div class='add'>+</div><div class='add'>+         pos = safecatn(message, sizeof message, pos, dp-&gt;output_colour_type);</div><div class='add'>+         pos = safecat(message, sizeof message, pos, " expected ");</div><div class='add'>+         pos = safecatn(message, sizeof message, pos, test_pixel.colour_type);</div><div class='add'>+</div><div class='add'>+         png_error(pp, message);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      if (test_pixel.bit_depth != dp-&gt;output_bit_depth)</div><div class='add'>+      {</div><div class='add'>+         char message[128];</div><div class='add'>+         size_t pos = safecat(message, sizeof message, 0, "bit depth ");</div><div class='add'>+</div><div class='add'>+         pos = safecatn(message, sizeof message, pos, dp-&gt;output_bit_depth);</div><div class='add'>+         pos = safecat(message, sizeof message, pos, " expected ");</div><div class='add'>+         pos = safecatn(message, sizeof message, pos, test_pixel.bit_depth);</div><div class='add'>+</div><div class='add'>+         png_error(pp, message);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* If both bit depth and colour type are correct check the sample depth.</div><div class='add'>+       * I believe these are both internal errors.</div><div class='add'>+       */</div><div class='add'>+      if (test_pixel.colour_type == PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+      {</div><div class='add'>+         if (test_pixel.sample_depth != 8) /* oops - internal error! */</div><div class='add'>+            png_error(pp, "pngvalid: internal: palette sample depth not 8");</div><div class='add'>+      }</div><div class='add'>+      else if (test_pixel.sample_depth != dp-&gt;output_bit_depth)</div><div class='add'>+      {</div><div class='add'>+         char message[128];</div><div class='add'>+         size_t pos = safecat(message, sizeof message, 0,</div><div class='add'>+            "internal: sample depth ");</div><div class='add'>+</div><div class='add'>+         pos = safecatn(message, sizeof message, pos, dp-&gt;output_bit_depth);</div><div class='add'>+         pos = safecat(message, sizeof message, pos, " expected ");</div><div class='add'>+         pos = safecatn(message, sizeof message, pos, test_pixel.sample_depth);</div><div class='add'>+</div><div class='add'>+         png_error(pp, message);</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+transform_info(png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   transform_info_imp(png_get_progressive_ptr(pp), pp, pi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+transform_range_check(png_structp pp, unsigned int r, unsigned int g,</div><div class='add'>+   unsigned int b, unsigned int a, unsigned int in_digitized, double in,</div><div class='add'>+   unsigned int out, png_byte sample_depth, double err, PNG_CONST char *name)</div><div class='add'>+{</div><div class='add'>+   /* Compare the scaled, digitzed, values of our local calculation (in+-err)</div><div class='add'>+    * with the digitized values libpng produced;  'sample_depth' is the actual</div><div class='add'>+    * digitization depth of the libpng output colors (the bit depth except for</div><div class='add'>+    * palette images where it is always 8.)</div><div class='add'>+    */</div><div class='add'>+   unsigned int max = (1U&lt;&lt;sample_depth)-1;</div><div class='add'>+   double in_min = ceil((in-err)*max - .5);</div><div class='add'>+   double in_max = floor((in+err)*max + .5);</div><div class='add'>+   if (!(out &gt;= in_min &amp;&amp; out &lt;= in_max))</div><div class='add'>+   {</div><div class='add'>+      char message[256];</div><div class='add'>+      size_t pos;</div><div class='add'>+</div><div class='add'>+      pos = safecat(message, sizeof message, 0, name);</div><div class='add'>+      pos = safecat(message, sizeof message, pos, " output value error: rgba(");</div><div class='add'>+      pos = safecatn(message, sizeof message, pos, r);</div><div class='add'>+      pos = safecat(message, sizeof message, pos, ",");</div><div class='add'>+      pos = safecatn(message, sizeof message, pos, g);</div><div class='add'>+      pos = safecat(message, sizeof message, pos, ",");</div><div class='add'>+      pos = safecatn(message, sizeof message, pos, b);</div><div class='add'>+      pos = safecat(message, sizeof message, pos, ",");</div><div class='add'>+      pos = safecatn(message, sizeof message, pos, a);</div><div class='add'>+      pos = safecat(message, sizeof message, pos, "): ");</div><div class='add'>+      pos = safecatn(message, sizeof message, pos, out);</div><div class='add'>+      pos = safecat(message, sizeof message, pos, " expected: ");</div><div class='add'>+      pos = safecatn(message, sizeof message, pos, in_digitized);</div><div class='add'>+      pos = safecat(message, sizeof message, pos, " (");</div><div class='add'>+      pos = safecatd(message, sizeof message, pos, (in-err)*max, 3);</div><div class='add'>+      pos = safecat(message, sizeof message, pos, "..");</div><div class='add'>+      pos = safecatd(message, sizeof message, pos, (in+err)*max, 3);</div><div class='add'>+      pos = safecat(message, sizeof message, pos, ")");</div><div class='add'>+</div><div class='add'>+      png_error(pp, message);</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+transform_image_validate(transform_display *dp, png_structp pp, png_infop pi,</div><div class='add'>+    png_const_bytep pRow)</div><div class='add'>+{</div><div class='add'>+   /* Constants for the loop below: */</div><div class='add'>+   PNG_CONST png_byte in_ct = dp-&gt;this.colour_type;</div><div class='add'>+   PNG_CONST png_byte in_bd = dp-&gt;this.bit_depth;</div><div class='add'>+   PNG_CONST png_uint_32 w = dp-&gt;this.w;</div><div class='add'>+   PNG_CONST png_uint_32 h = dp-&gt;this.h;</div><div class='add'>+   PNG_CONST size_t cbRow = dp-&gt;this.cbRow;</div><div class='add'>+   PNG_CONST png_byte out_ct = dp-&gt;output_colour_type;</div><div class='add'>+   PNG_CONST png_byte out_bd = dp-&gt;output_bit_depth;</div><div class='add'>+   PNG_CONST png_byte sample_depth = (png_byte)(out_ct ==</div><div class='add'>+      PNG_COLOR_TYPE_PALETTE ? 8 : out_bd);</div><div class='add'>+   PNG_CONST png_byte red_sBIT = dp-&gt;this.red_sBIT;</div><div class='add'>+   PNG_CONST png_byte green_sBIT = dp-&gt;this.green_sBIT;</div><div class='add'>+   PNG_CONST png_byte blue_sBIT = dp-&gt;this.blue_sBIT;</div><div class='add'>+   PNG_CONST png_byte alpha_sBIT = dp-&gt;this.alpha_sBIT;</div><div class='add'>+   PNG_CONST int have_tRNS = dp-&gt;this.is_transparent;</div><div class='add'>+</div><div class='add'>+   standard_palette out_palette;</div><div class='add'>+   png_uint_32 y;</div><div class='add'>+</div><div class='add'>+   UNUSED(pi)</div><div class='add'>+</div><div class='add'>+   /* Read the palette corresponding to the output if the output colour type</div><div class='add'>+    * indicates a palette, othewise set out_palette to garbage.</div><div class='add'>+    */</div><div class='add'>+   if (out_ct == PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+      (void)standard_palette_init(out_palette, pp, pi);</div><div class='add'>+   else</div><div class='add'>+      memset(out_palette, 0x5e, sizeof out_palette);</div><div class='add'>+</div><div class='add'>+   for (y=0; y&lt;h; ++y, pRow += cbRow)</div><div class='add'>+   {</div><div class='add'>+      png_uint_32 x;</div><div class='add'>+</div><div class='add'>+      /* The original, standard, row pre-transforms. */</div><div class='add'>+      png_byte std[STANDARD_ROWMAX];</div><div class='add'>+</div><div class='add'>+      transform_row(pp, std, in_ct, in_bd, y);</div><div class='add'>+</div><div class='add'>+      /* Go through each original pixel transforming it and comparing with what</div><div class='add'>+       * libpng did to the same pixel.</div><div class='add'>+       */</div><div class='add'>+      for (x=0; x&lt;w; ++x)</div><div class='add'>+      {</div><div class='add'>+         image_pixel in_pixel, out_pixel;</div><div class='add'>+         unsigned int r, g, b, a;</div><div class='add'>+</div><div class='add'>+         /* Find out what we think the pixel should be: */</div><div class='add'>+         image_pixel_init(&amp;in_pixel, std, in_ct, in_bd, x, dp-&gt;this.palette);</div><div class='add'>+</div><div class='add'>+         in_pixel.red_sBIT = red_sBIT;</div><div class='add'>+         in_pixel.green_sBIT = green_sBIT;</div><div class='add'>+         in_pixel.blue_sBIT = blue_sBIT;</div><div class='add'>+         in_pixel.alpha_sBIT = alpha_sBIT;</div><div class='add'>+         in_pixel.have_tRNS = have_tRNS;</div><div class='add'>+</div><div class='add'>+         /* For error detection, below. */</div><div class='add'>+         r = in_pixel.red;</div><div class='add'>+         g = in_pixel.green;</div><div class='add'>+         b = in_pixel.blue;</div><div class='add'>+         a = in_pixel.alpha;</div><div class='add'>+</div><div class='add'>+         dp-&gt;transform_list-&gt;mod(dp-&gt;transform_list, &amp;in_pixel, pp, dp);</div><div class='add'>+</div><div class='add'>+         /* Read the output pixel and compare it to what we got, we don't</div><div class='add'>+          * use the error field here, so no need to update sBIT.</div><div class='add'>+          */</div><div class='add'>+         image_pixel_init(&amp;out_pixel, pRow, out_ct, out_bd, x, out_palette);</div><div class='add'>+</div><div class='add'>+         /* We don't expect changes to the index here even if the bit depth is</div><div class='add'>+          * changed.</div><div class='add'>+          */</div><div class='add'>+         if (in_ct == PNG_COLOR_TYPE_PALETTE &amp;&amp;</div><div class='add'>+            out_ct == PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+         {</div><div class='add'>+            if (in_pixel.palette_index != out_pixel.palette_index)</div><div class='add'>+               png_error(pp, "unexpected transformed palette index");</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         /* Check the colours for palette images too - in fact the palette could</div><div class='add'>+          * be separately verified itself in most cases.</div><div class='add'>+          */</div><div class='add'>+         if (in_pixel.red != out_pixel.red)</div><div class='add'>+            transform_range_check(pp, r, g, b, a, in_pixel.red, in_pixel.redf,</div><div class='add'>+               out_pixel.red, sample_depth, in_pixel.rede, "red/gray");</div><div class='add'>+</div><div class='add'>+         if ((out_ct &amp; PNG_COLOR_MASK_COLOR) != 0 &amp;&amp;</div><div class='add'>+            in_pixel.green != out_pixel.green)</div><div class='add'>+            transform_range_check(pp, r, g, b, a, in_pixel.green,</div><div class='add'>+               in_pixel.greenf, out_pixel.green, sample_depth, in_pixel.greene,</div><div class='add'>+               "green");</div><div class='add'>+</div><div class='add'>+         if ((out_ct &amp; PNG_COLOR_MASK_COLOR) != 0 &amp;&amp;</div><div class='add'>+            in_pixel.blue != out_pixel.blue)</div><div class='add'>+            transform_range_check(pp, r, g, b, a, in_pixel.blue, in_pixel.bluef,</div><div class='add'>+               out_pixel.blue, sample_depth, in_pixel.bluee, "blue");</div><div class='add'>+</div><div class='add'>+         if ((out_ct &amp; PNG_COLOR_MASK_ALPHA) != 0 &amp;&amp;</div><div class='add'>+            in_pixel.alpha != out_pixel.alpha)</div><div class='add'>+            transform_range_check(pp, r, g, b, a, in_pixel.alpha,</div><div class='add'>+               in_pixel.alphaf, out_pixel.alpha, sample_depth, in_pixel.alphae,</div><div class='add'>+               "alpha");</div><div class='add'>+      } /* pixel (x) loop */</div><div class='add'>+   } /* row (y) loop */</div><div class='add'>+</div><div class='add'>+   /* Record that something was actually checked to avoid a false positive. */</div><div class='add'>+   dp-&gt;this.ps-&gt;validated = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+transform_end(png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   transform_display *dp = png_get_progressive_ptr(pp);</div><div class='add'>+</div><div class='add'>+   transform_image_validate(dp, pp, pi, dp-&gt;this.ps-&gt;image);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* A single test run. */</div><div class='add'>+static void</div><div class='add'>+transform_test(png_modifier *pmIn, PNG_CONST png_uint_32 idIn,</div><div class='add'>+    PNG_CONST image_transform* transform_listIn, PNG_CONST char *name)</div><div class='add'>+{</div><div class='add'>+   transform_display d;</div><div class='add'>+   context(&amp;pmIn-&gt;this, fault);</div><div class='add'>+</div><div class='add'>+   transform_display_init(&amp;d, pmIn, idIn, transform_listIn);</div><div class='add'>+</div><div class='add'>+   Try</div><div class='add'>+   {</div><div class='add'>+      png_structp pp;</div><div class='add'>+      png_infop pi;</div><div class='add'>+</div><div class='add'>+      /* Get a png_struct for writing the image. */</div><div class='add'>+      pp = set_modifier_for_read(d.pm, &amp;pi, d.this.id, name);</div><div class='add'>+</div><div class='add'>+#     if 0</div><div class='add'>+         /* Logging (debugging only) */</div><div class='add'>+         {</div><div class='add'>+            char buffer[256];</div><div class='add'>+</div><div class='add'>+            (void)store_message(&amp;d.pm-&gt;this, pp, buffer, sizeof buffer, 0,</div><div class='add'>+               "running test");</div><div class='add'>+</div><div class='add'>+            fprintf(stderr, "%s\n", buffer);</div><div class='add'>+         }</div><div class='add'>+#     endif</div><div class='add'>+</div><div class='add'>+      /* Introduce the correct read function. */</div><div class='add'>+      if (d.pm-&gt;this.progressive)</div><div class='add'>+      {</div><div class='add'>+         /* Share the row function with the standard implementation. */</div><div class='add'>+         png_set_progressive_read_fn(pp, &amp;d, transform_info, progressive_row,</div><div class='add'>+            transform_end);</div><div class='add'>+</div><div class='add'>+         /* Now feed data into the reader until we reach the end: */</div><div class='add'>+         modifier_progressive_read(d.pm, pp, pi);</div><div class='add'>+      }</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         /* modifier_read expects a png_modifier* */</div><div class='add'>+         png_set_read_fn(pp, d.pm, modifier_read);</div><div class='add'>+</div><div class='add'>+         /* Check the header values: */</div><div class='add'>+         png_read_info(pp, pi);</div><div class='add'>+</div><div class='add'>+         /* Process the 'info' requirements. Only one image is generated */</div><div class='add'>+         transform_info_imp(&amp;d, pp, pi);</div><div class='add'>+</div><div class='add'>+         sequential_row(&amp;d.this, pp, pi, NULL, d.this.ps-&gt;image);</div><div class='add'>+</div><div class='add'>+         transform_image_validate(&amp;d, pp, pi, d.this.ps-&gt;image);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      modifier_reset(d.pm);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   Catch(fault)</div><div class='add'>+      modifier_reset((png_modifier*)fault);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The transforms: */</div><div class='add'>+#define ITSTRUCT(name) image_transform_##name</div><div class='add'>+#define IT(name,prev)\</div><div class='add'>+static image_transform ITSTRUCT(name) =\</div><div class='add'>+{\</div><div class='add'>+   #name,\</div><div class='add'>+   1, /*enable*/\</div><div class='add'>+   &amp;ITSTRUCT(prev), /*list*/\</div><div class='add'>+   0, /*global_use*/\</div><div class='add'>+   0, /*local_use*/\</div><div class='add'>+   0, /*next*/\</div><div class='add'>+   image_transform_png_set_##name##_set,\</div><div class='add'>+   image_transform_png_set_##name##_mod,\</div><div class='add'>+   image_transform_png_set_##name##_add\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* To save code: */</div><div class='add'>+static int</div><div class='add'>+image_transform_default_add(image_transform *this,</div><div class='add'>+    PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   UNUSED(colour_type)</div><div class='add'>+   UNUSED(bit_depth)</div><div class='add'>+</div><div class='add'>+   this-&gt;next = *that;</div><div class='add'>+   *that = this;</div><div class='add'>+</div><div class='add'>+   return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* png_set_palette_to_rgb */</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_palette_to_rgb_set(PNG_CONST image_transform *this,</div><div class='add'>+    transform_display *that, png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   png_set_palette_to_rgb(pp);</div><div class='add'>+   this-&gt;next-&gt;set(this-&gt;next, that, pp, pi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_palette_to_rgb_mod(PNG_CONST image_transform *this,</div><div class='add'>+    image_pixel *that, png_structp pp, PNG_CONST transform_display *display)</div><div class='add'>+{</div><div class='add'>+   if (that-&gt;colour_type == PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+      image_pixel_convert_PLTE(that, &amp;display-&gt;this);</div><div class='add'>+</div><div class='add'>+   this-&gt;next-&gt;mod(this-&gt;next, that, pp, display);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+image_transform_png_set_palette_to_rgb_add(image_transform *this,</div><div class='add'>+    PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   UNUSED(bit_depth)</div><div class='add'>+</div><div class='add'>+   this-&gt;next = *that;</div><div class='add'>+   *that = this;</div><div class='add'>+</div><div class='add'>+   return colour_type == PNG_COLOR_TYPE_PALETTE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+IT(palette_to_rgb, end);</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* png_set_tRNS_to_alpha */</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_tRNS_to_alpha_set(PNG_CONST image_transform *this,</div><div class='add'>+   transform_display *that, png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   png_set_tRNS_to_alpha(pp);</div><div class='add'>+   this-&gt;next-&gt;set(this-&gt;next, that, pp, pi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_tRNS_to_alpha_mod(PNG_CONST image_transform *this,</div><div class='add'>+   image_pixel *that, png_structp pp, PNG_CONST transform_display *display)</div><div class='add'>+{</div><div class='add'>+   /* LIBPNG BUG: this always forces palette images to RGB. */</div><div class='add'>+   if (that-&gt;colour_type == PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+      image_pixel_convert_PLTE(that, &amp;display-&gt;this);</div><div class='add'>+</div><div class='add'>+   /* This effectively does an 'expand' only if there is some transparency to</div><div class='add'>+    * covert to an alpha channel.</div><div class='add'>+    */</div><div class='add'>+   if (that-&gt;have_tRNS)</div><div class='add'>+      image_pixel_add_alpha(that, &amp;display-&gt;this);</div><div class='add'>+</div><div class='add'>+   /* LIBPNG BUG: otherwise libpng still expands to 8 bits! */</div><div class='add'>+   else</div><div class='add'>+   {</div><div class='add'>+      if (that-&gt;bit_depth &lt; 8)</div><div class='add'>+         that-&gt;bit_depth =8;</div><div class='add'>+      if (that-&gt;sample_depth &lt; 8)</div><div class='add'>+         that-&gt;sample_depth = 8;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   this-&gt;next-&gt;mod(this-&gt;next, that, pp, display);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+image_transform_png_set_tRNS_to_alpha_add(image_transform *this,</div><div class='add'>+    PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   UNUSED(bit_depth)</div><div class='add'>+</div><div class='add'>+   this-&gt;next = *that;</div><div class='add'>+   *that = this;</div><div class='add'>+</div><div class='add'>+   /* We don't know yet whether there will be a tRNS chunk, but we know that</div><div class='add'>+    * this transformation should do nothing if there already is an alpha</div><div class='add'>+    * channel.</div><div class='add'>+    */</div><div class='add'>+   return (colour_type &amp; PNG_COLOR_MASK_ALPHA) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+IT(tRNS_to_alpha,palette_to_rgb);</div><div class='add'>+</div><div class='add'>+/* png_set_gray_to_rgb */</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_gray_to_rgb_set(PNG_CONST image_transform *this,</div><div class='add'>+    transform_display *that, png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   png_set_gray_to_rgb(pp);</div><div class='add'>+   this-&gt;next-&gt;set(this-&gt;next, that, pp, pi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_gray_to_rgb_mod(PNG_CONST image_transform *this,</div><div class='add'>+    image_pixel *that, png_structp pp, PNG_CONST transform_display *display)</div><div class='add'>+{</div><div class='add'>+   /* NOTE: we can actually pend the tRNS processing at this point because we</div><div class='add'>+    * can correctly recognize the original pixel value even though we have</div><div class='add'>+    * mapped the one gray channel to the three RGB ones, but in fact libpng</div><div class='add'>+    * doesn't do this, so we don't either.</div><div class='add'>+    */</div><div class='add'>+   if ((that-&gt;colour_type &amp; PNG_COLOR_MASK_COLOR) == 0 &amp;&amp; that-&gt;have_tRNS)</div><div class='add'>+      image_pixel_add_alpha(that, &amp;display-&gt;this);</div><div class='add'>+</div><div class='add'>+   /* Simply expand the bit depth and alter the colour type as required. */</div><div class='add'>+   if (that-&gt;colour_type == PNG_COLOR_TYPE_GRAY)</div><div class='add'>+   {</div><div class='add'>+      /* RGB images have a bit depth at least equal to '8' */</div><div class='add'>+      if (that-&gt;bit_depth &lt; 8)</div><div class='add'>+         that-&gt;sample_depth = that-&gt;bit_depth = 8;</div><div class='add'>+</div><div class='add'>+      /* And just changing the colour type works here because the green and blue</div><div class='add'>+       * channels are being maintained in lock-step with the red/gray:</div><div class='add'>+       */</div><div class='add'>+      that-&gt;colour_type = PNG_COLOR_TYPE_RGB;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   else if (that-&gt;colour_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='add'>+      that-&gt;colour_type = PNG_COLOR_TYPE_RGB_ALPHA;</div><div class='add'>+</div><div class='add'>+   this-&gt;next-&gt;mod(this-&gt;next, that, pp, display);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+image_transform_png_set_gray_to_rgb_add(image_transform *this,</div><div class='add'>+    PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   UNUSED(bit_depth)</div><div class='add'>+</div><div class='add'>+   this-&gt;next = *that;</div><div class='add'>+   *that = this;</div><div class='add'>+</div><div class='add'>+   return (colour_type &amp; PNG_COLOR_MASK_COLOR) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+IT(gray_to_rgb,tRNS_to_alpha);</div><div class='add'>+</div><div class='add'>+/* png_set_expand */</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_expand_set(PNG_CONST image_transform *this,</div><div class='add'>+    transform_display *that, png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   png_set_expand(pp);</div><div class='add'>+   this-&gt;next-&gt;set(this-&gt;next, that, pp, pi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_expand_mod(PNG_CONST image_transform *this,</div><div class='add'>+    image_pixel *that, png_structp pp, PNG_CONST transform_display *display)</div><div class='add'>+{</div><div class='add'>+   /* The general expand case depends on what the colour type is: */</div><div class='add'>+   if (that-&gt;colour_type == PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+      image_pixel_convert_PLTE(that, &amp;display-&gt;this);</div><div class='add'>+   else if (that-&gt;bit_depth &lt; 8) /* grayscale */</div><div class='add'>+      that-&gt;sample_depth = that-&gt;bit_depth = 8;</div><div class='add'>+</div><div class='add'>+   if (that-&gt;have_tRNS)</div><div class='add'>+      image_pixel_add_alpha(that, &amp;display-&gt;this);</div><div class='add'>+</div><div class='add'>+   this-&gt;next-&gt;mod(this-&gt;next, that, pp, display);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+image_transform_png_set_expand_add(image_transform *this,</div><div class='add'>+    PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   UNUSED(bit_depth)</div><div class='add'>+</div><div class='add'>+   this-&gt;next = *that;</div><div class='add'>+   *that = this;</div><div class='add'>+</div><div class='add'>+   /* 'expand' should do nothing for RGBA or GA input - no tRNS and the bit</div><div class='add'>+    * depth is at least 8 already.</div><div class='add'>+    */</div><div class='add'>+   return (colour_type &amp; PNG_COLOR_MASK_ALPHA) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+IT(expand,gray_to_rgb);</div><div class='add'>+</div><div class='add'>+/* png_set_expand_gray_1_2_4_to_8</div><div class='add'>+ * LIBPNG BUG: this just does an 'expand'</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_expand_gray_1_2_4_to_8_set(</div><div class='add'>+    PNG_CONST image_transform *this, transform_display *that, png_structp pp,</div><div class='add'>+    png_infop pi)</div><div class='add'>+{</div><div class='add'>+   png_set_expand_gray_1_2_4_to_8(pp);</div><div class='add'>+   this-&gt;next-&gt;set(this-&gt;next, that, pp, pi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_expand_gray_1_2_4_to_8_mod(</div><div class='add'>+    PNG_CONST image_transform *this, image_pixel *that, png_structp pp,</div><div class='add'>+    PNG_CONST transform_display *display)</div><div class='add'>+{</div><div class='add'>+   image_transform_png_set_expand_mod(this, that, pp, display);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+image_transform_png_set_expand_gray_1_2_4_to_8_add(image_transform *this,</div><div class='add'>+    PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   return image_transform_png_set_expand_add(this, that, colour_type,</div><div class='add'>+      bit_depth);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+IT(expand_gray_1_2_4_to_8, expand);</div><div class='add'>+</div><div class='add'>+/* png_set_strip_16 */</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_strip_16_set(PNG_CONST image_transform *this,</div><div class='add'>+    transform_display *that, png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   png_set_strip_16(pp);</div><div class='add'>+   this-&gt;next-&gt;set(this-&gt;next, that, pp, pi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_strip_16_mod(PNG_CONST image_transform *this,</div><div class='add'>+    image_pixel *that, png_structp pp, PNG_CONST transform_display *display)</div><div class='add'>+{</div><div class='add'>+   if (that-&gt;bit_depth == 16)</div><div class='add'>+   {</div><div class='add'>+      that-&gt;sample_depth = that-&gt;bit_depth = 8;</div><div class='add'>+      if (that-&gt;red_sBIT &gt; 8) that-&gt;red_sBIT = 8;</div><div class='add'>+      if (that-&gt;green_sBIT &gt; 8) that-&gt;green_sBIT = 8;</div><div class='add'>+      if (that-&gt;blue_sBIT &gt; 8) that-&gt;blue_sBIT = 8;</div><div class='add'>+      if (that-&gt;alpha_sBIT &gt; 8) that-&gt;alpha_sBIT = 8;</div><div class='add'>+</div><div class='add'>+#     ifndef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED</div><div class='add'>+         /* The strip 16 algoirithm drops the low 8 bits rather than calculating</div><div class='add'>+          * 1/257, so we need to adjust the permitted errors appropriately:</div><div class='add'>+          */</div><div class='add'>+         {</div><div class='add'>+            PNG_CONST double d = (255-128.5)/65535;</div><div class='add'>+            that-&gt;rede += d;</div><div class='add'>+            that-&gt;greene += d;</div><div class='add'>+            that-&gt;bluee += d;</div><div class='add'>+            that-&gt;alphae += d;</div><div class='add'>+         }</div><div class='add'>+#     endif</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   this-&gt;next-&gt;mod(this-&gt;next, that, pp, display);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+image_transform_png_set_strip_16_add(image_transform *this,</div><div class='add'>+    PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   UNUSED(colour_type)</div><div class='add'>+</div><div class='add'>+   this-&gt;next = *that;</div><div class='add'>+   *that = this;</div><div class='add'>+</div><div class='add'>+   return bit_depth &gt; 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+IT(strip_16, expand_gray_1_2_4_to_8);</div><div class='add'>+</div><div class='add'>+/* png_set_strip_alpha */</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_strip_alpha_set(PNG_CONST image_transform *this,</div><div class='add'>+    transform_display *that, png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   png_set_strip_alpha(pp);</div><div class='add'>+   this-&gt;next-&gt;set(this-&gt;next, that, pp, pi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_strip_alpha_mod(PNG_CONST image_transform *this,</div><div class='add'>+    image_pixel *that, png_structp pp, PNG_CONST transform_display *display)</div><div class='add'>+{</div><div class='add'>+   if (that-&gt;colour_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='add'>+      that-&gt;colour_type = PNG_COLOR_TYPE_GRAY;</div><div class='add'>+   else if (that-&gt;colour_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='add'>+      that-&gt;colour_type = PNG_COLOR_TYPE_RGB;</div><div class='add'>+</div><div class='add'>+   that-&gt;have_tRNS = 0;</div><div class='add'>+   that-&gt;alphaf = 1;</div><div class='add'>+   that-&gt;alphae = 0;</div><div class='add'>+</div><div class='add'>+   this-&gt;next-&gt;mod(this-&gt;next, that, pp, display);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+image_transform_png_set_strip_alpha_add(image_transform *this,</div><div class='add'>+    PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   UNUSED(bit_depth)</div><div class='add'>+</div><div class='add'>+   this-&gt;next = *that;</div><div class='add'>+   *that = this;</div><div class='add'>+</div><div class='add'>+   return (colour_type &amp; PNG_COLOR_MASK_ALPHA) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+IT(strip_alpha,strip_16);</div><div class='add'>+</div><div class='add'>+/* png_set_rgb_to_gray(png_structp, int err_action, double red, double green)</div><div class='add'>+ * png_set_rgb_to_gray_fixed(png_structp, int err_action, png_fixed_point red,</div><div class='add'>+ *    png_fixed_point green)</div><div class='add'>+ * png_get_rgb_to_gray_status</div><div class='add'>+ *</div><div class='add'>+ * At present the APIs are simply tested using the 16.16 fixed point conversion</div><div class='add'>+ * values known to be used inside libpng:</div><div class='add'>+ *</div><div class='add'>+ *   red:    6968</div><div class='add'>+ *   green: 23434</div><div class='add'>+ *   blue:   2366</div><div class='add'>+ *</div><div class='add'>+ * NOTE: this currently ignores the gamma because no gamma is being set, the</div><div class='add'>+ * tests on gamma need to happen in the gamma test set.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_rgb_to_gray_set(PNG_CONST image_transform *this,</div><div class='add'>+    transform_display *that, png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   PNG_CONST int error_action = 1; /* no error, no defines in png.h */</div><div class='add'>+</div><div class='add'>+#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+      png_set_rgb_to_gray(pp, error_action, -1, -1);</div><div class='add'>+#  else</div><div class='add'>+      png_set_rgb_to_gray_fixed(pp, error_action, -1, -1);</div><div class='add'>+#  endif</div><div class='add'>+</div><div class='add'>+   this-&gt;next-&gt;set(this-&gt;next, that, pp, pi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_rgb_to_gray_mod(PNG_CONST image_transform *this,</div><div class='add'>+    image_pixel *that, png_structp pp, PNG_CONST transform_display *display)</div><div class='add'>+{</div><div class='add'>+   if ((that-&gt;colour_type &amp; PNG_COLOR_MASK_COLOR) != 0)</div><div class='add'>+   {</div><div class='add'>+      if (that-&gt;colour_type == PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+         image_pixel_convert_PLTE(that, &amp;display-&gt;this);</div><div class='add'>+</div><div class='add'>+      /* Image now has RGB channels... */</div><div class='add'>+      that-&gt;bluef = that-&gt;greenf = that-&gt;redf = (that-&gt;redf * 6968 +</div><div class='add'>+         that-&gt;greenf * 23434 + that-&gt;bluef * 2366) / 32768;</div><div class='add'>+      that-&gt;bluee = that-&gt;greene = that-&gt;rede = (that-&gt;rede * 6968 +</div><div class='add'>+         that-&gt;greene * 23434 + that-&gt;bluee * 2366) / 32768 *</div><div class='add'>+         (1 + DBL_EPSILON * 6);</div><div class='add'>+</div><div class='add'>+      /* The sBIT is the minium of the three colour channel sBITs. */</div><div class='add'>+      if (that-&gt;red_sBIT &gt; that-&gt;green_sBIT)</div><div class='add'>+         that-&gt;red_sBIT = that-&gt;green_sBIT;</div><div class='add'>+      if (that-&gt;red_sBIT &gt; that-&gt;blue_sBIT)</div><div class='add'>+         that-&gt;red_sBIT = that-&gt;blue_sBIT;</div><div class='add'>+      that-&gt;blue_sBIT = that-&gt;green_sBIT = that-&gt;red_sBIT;</div><div class='add'>+</div><div class='add'>+      /* And zap the colour bit in the type: */</div><div class='add'>+      if (that-&gt;colour_type == PNG_COLOR_TYPE_RGB)</div><div class='add'>+         that-&gt;colour_type = PNG_COLOR_TYPE_GRAY;</div><div class='add'>+      else if (that-&gt;colour_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='add'>+         that-&gt;colour_type = PNG_COLOR_TYPE_GRAY_ALPHA;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   this-&gt;next-&gt;mod(this-&gt;next, that, pp, display);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+image_transform_png_set_rgb_to_gray_add(image_transform *this,</div><div class='add'>+    PNG_CONST image_transform **that, png_byte colour_type, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   UNUSED(bit_depth)</div><div class='add'>+</div><div class='add'>+   this-&gt;next = *that;</div><div class='add'>+   *that = this;</div><div class='add'>+</div><div class='add'>+   return (colour_type &amp; PNG_COLOR_MASK_COLOR) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+IT(rgb_to_gray,strip_alpha);</div><div class='add'>+</div><div class='add'>+/* png_set_background(png_structp, png_const_color_16p background_color,</div><div class='add'>+ *    int background_gamma_code, int need_expand, double background_gamma)</div><div class='add'>+ * png_set_background_fixed(png_structp, png_const_color_16p background_color,</div><div class='add'>+ *    int background_gamma_code, int need_expand,</div><div class='add'>+ *    png_fixed_point background_gamma)</div><div class='add'>+ *</div><div class='add'>+ * As with rgb_to_gray this ignores the gamma.</div><div class='add'>+*/</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_background_set(PNG_CONST image_transform *this,</div><div class='add'>+    transform_display *that, png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   png_color_16 back;</div><div class='add'>+</div><div class='add'>+   /* Since we don't know the output bit depth at this point we must use the</div><div class='add'>+    * input values and ask libpng to expand the chunk as required.</div><div class='add'>+    */</div><div class='add'>+   back.index = 255; /* Should not be used */</div><div class='add'>+   back.gray = back.blue = back.green = back.red =</div><div class='add'>+      (png_uint_16)((1U &lt;&lt; that-&gt;this.bit_depth) &gt;&gt; 1);</div><div class='add'>+</div><div class='add'>+#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+      png_set_background(pp, &amp;back, PNG_BACKGROUND_GAMMA_FILE, 1, 0);</div><div class='add'>+#  else</div><div class='add'>+      png_set_background_fixed(pp, &amp;back, PNG_BACKGROUND_GAMMA_FILE, 1, 0);</div><div class='add'>+#  endif</div><div class='add'>+</div><div class='add'>+   this-&gt;next-&gt;set(this-&gt;next, that, pp, pi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_background_mod(PNG_CONST image_transform *this,</div><div class='add'>+    image_pixel *that, png_structp pp, PNG_CONST transform_display *display)</div><div class='add'>+{</div><div class='add'>+   /* Check for tRNS first: */</div><div class='add'>+   if (that-&gt;have_tRNS &amp;&amp; that-&gt;colour_type != PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+      image_pixel_add_alpha(that, &amp;display-&gt;this);</div><div class='add'>+</div><div class='add'>+   /* This is only necessary if the alpha value is less than 1. */</div><div class='add'>+   if (that-&gt;alphaf &lt; 1)</div><div class='add'>+   {</div><div class='add'>+      /* Repeat the calculation above and scale the result: */</div><div class='add'>+      unsigned int tmp = (1U &lt;&lt; display-&gt;this.bit_depth);</div><div class='add'>+      double component = (tmp &gt;&gt; 1)/(double)(tmp-1);</div><div class='add'>+</div><div class='add'>+      /* Now we do the background calculation without any gamma correction. */</div><div class='add'>+      if (that-&gt;alphaf &lt;= 0)</div><div class='add'>+      {</div><div class='add'>+         that-&gt;bluef = that-&gt;greenf = that-&gt;redf = component;</div><div class='add'>+         that-&gt;bluee = that-&gt;greene = that-&gt;rede = component * DBL_EPSILON;</div><div class='add'>+         that-&gt;blue_sBIT = that-&gt;green_sBIT = that-&gt;red_sBIT = that-&gt;bit_depth;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         component *= 1-that-&gt;alphaf;</div><div class='add'>+         that-&gt;redf = that-&gt;redf * that-&gt;alphaf + component;</div><div class='add'>+         that-&gt;rede = that-&gt;rede * that-&gt;alphaf + that-&gt;redf * 3 * DBL_EPSILON;</div><div class='add'>+         that-&gt;greenf = that-&gt;greenf * that-&gt;alphaf + component;</div><div class='add'>+         that-&gt;greene = that-&gt;greene * that-&gt;alphaf + that-&gt;greenf * 3 *</div><div class='add'>+            DBL_EPSILON;</div><div class='add'>+         that-&gt;bluef = that-&gt;bluef * that-&gt;alphaf + component;</div><div class='add'>+         that-&gt;bluee = that-&gt;bluee * that-&gt;alphaf + that-&gt;bluef * 3 *</div><div class='add'>+            DBL_EPSILON;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* Remove the alpha type and set the alpha. */</div><div class='add'>+      that-&gt;alphaf = 1;</div><div class='add'>+      that-&gt;alphae = 0;</div><div class='add'>+</div><div class='add'>+      if (that-&gt;colour_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='add'>+         that-&gt;colour_type = PNG_COLOR_TYPE_RGB;</div><div class='add'>+      else if (that-&gt;colour_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='add'>+         that-&gt;colour_type = PNG_COLOR_TYPE_GRAY;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   this-&gt;next-&gt;mod(this-&gt;next, that, pp, display);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define image_transform_png_set_background_add image_transform_default_add</div><div class='add'>+</div><div class='add'>+IT(background,rgb_to_gray);</div><div class='add'>+</div><div class='add'>+static image_transform *PNG_CONST image_transform_first = &amp;ITSTRUCT(background);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+transform_enable(PNG_CONST char *name)</div><div class='add'>+{</div><div class='add'>+   /* Everything starts out enabled, so if we see an 'enable' disabled</div><div class='add'>+    * everything else the first time round.</div><div class='add'>+    */</div><div class='add'>+   static int all_disabled = 0;</div><div class='add'>+   int found_it = 0;</div><div class='add'>+   image_transform *list = image_transform_first;</div><div class='add'>+</div><div class='add'>+   while (list != &amp;image_transform_end)</div><div class='add'>+   {</div><div class='add'>+      if (strcmp(list-&gt;name, name) == 0)</div><div class='add'>+      {</div><div class='add'>+         list-&gt;enable = 1;</div><div class='add'>+         found_it = 1;</div><div class='add'>+      }</div><div class='add'>+      else if (!all_disabled)</div><div class='add'>+         list-&gt;enable = 0;</div><div class='add'>+</div><div class='add'>+      list = list-&gt;list;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   all_disabled = 1;</div><div class='add'>+</div><div class='add'>+   if (!found_it)</div><div class='add'>+   {</div><div class='add'>+      fprintf(stderr, "pngvalid: --transform-enable=%s: unknown transform\n",</div><div class='add'>+         name);</div><div class='add'>+      exit(1);</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+transform_disable(PNG_CONST char *name)</div><div class='add'>+{</div><div class='add'>+   image_transform *list = image_transform_first;</div><div class='add'>+</div><div class='add'>+   while (list != &amp;image_transform_end)</div><div class='add'>+   {</div><div class='add'>+      if (strcmp(list-&gt;name, name) == 0)</div><div class='add'>+      {</div><div class='add'>+         list-&gt;enable = 0;</div><div class='add'>+         return;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      list = list-&gt;list;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   fprintf(stderr, "pngvalid: --transform-disable=%s: unknown transform\n",</div><div class='add'>+      name);</div><div class='add'>+   exit(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+image_transform_reset_count(void)</div><div class='add'>+{</div><div class='add'>+   image_transform *next = image_transform_first;</div><div class='add'>+   int count = 0;</div><div class='add'>+</div><div class='add'>+   while (next != &amp;image_transform_end)</div><div class='add'>+   {</div><div class='add'>+      next-&gt;local_use = 0;</div><div class='add'>+      next-&gt;next = 0;</div><div class='add'>+      next = next-&gt;list;</div><div class='add'>+      ++count;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* This can only happen if we every have more than 32 transforms (excluding</div><div class='add'>+    * the end) in the list.</div><div class='add'>+    */</div><div class='add'>+   if (count &gt; 32) abort();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+image_transform_test_counter(png_uint_32 counter, unsigned int max)</div><div class='add'>+{</div><div class='add'>+   /* Test the list to see if there is any point contining, given a current</div><div class='add'>+    * counter and a 'max' value.</div><div class='add'>+    */</div><div class='add'>+   image_transform *next = image_transform_first;</div><div class='add'>+</div><div class='add'>+   while (next != &amp;image_transform_end)</div><div class='add'>+   {</div><div class='add'>+      /* For max 0 or 1 continue until the counter overflows: */</div><div class='add'>+      counter &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+      /* Continue if any entry hasn't reacked the max. */</div><div class='add'>+      if (max &gt; 1 &amp;&amp; next-&gt;local_use &lt; max)</div><div class='add'>+         return 1;</div><div class='add'>+      next = next-&gt;list;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return max &lt;= 1 &amp;&amp; counter == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static png_uint_32</div><div class='add'>+image_transform_add(PNG_CONST image_transform **this, unsigned int max,</div><div class='add'>+   png_uint_32 counter, char *name, size_t sizeof_name, size_t *pos,</div><div class='add'>+   png_byte colour_type, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   for (;;) /* until we manage to add something */</div><div class='add'>+   {</div><div class='add'>+      png_uint_32 mask;</div><div class='add'>+      image_transform *list;</div><div class='add'>+</div><div class='add'>+      /* Find the next counter value, if the counter is zero this is the start</div><div class='add'>+       * of the list.  This routine always returns the current counter (not the</div><div class='add'>+       * next) so it returns 0 at the end and expects 0 at the beginning.</div><div class='add'>+       */</div><div class='add'>+      if (counter == 0) /* first time */</div><div class='add'>+      {</div><div class='add'>+         image_transform_reset_count();</div><div class='add'>+         if (max &lt;= 1)</div><div class='add'>+            counter = 1;</div><div class='add'>+         else</div><div class='add'>+            counter = random_32();</div><div class='add'>+      }</div><div class='add'>+      else /* advance the counter */</div><div class='add'>+      {</div><div class='add'>+         switch (max)</div><div class='add'>+         {</div><div class='add'>+            case 0:  ++counter; break;</div><div class='add'>+            case 1:  counter &lt;&lt;= 1; break;</div><div class='add'>+            default: counter = random_32(); break;</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* Now add all these items, if possible */</div><div class='add'>+      *this = &amp;image_transform_end;</div><div class='add'>+      list = image_transform_first;</div><div class='add'>+      mask = 1;</div><div class='add'>+</div><div class='add'>+      /* Go through the whole list adding anything that the counter selects: */</div><div class='add'>+      while (list != &amp;image_transform_end)</div><div class='add'>+      {</div><div class='add'>+         if ((counter &amp; mask) != 0 &amp;&amp; list-&gt;enable &amp;&amp;</div><div class='add'>+             (max == 0 || list-&gt;local_use &lt; max))</div><div class='add'>+         {</div><div class='add'>+            /* Candidate to add: */</div><div class='add'>+            if (list-&gt;add(list, this, colour_type, bit_depth) || max == 0)</div><div class='add'>+            {</div><div class='add'>+               /* Added, so add to the name too. */</div><div class='add'>+               *pos = safecat(name, sizeof_name, *pos, " +");</div><div class='add'>+               *pos = safecat(name, sizeof_name, *pos, list-&gt;name);</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            else</div><div class='add'>+            {</div><div class='add'>+               /* Not useful and max&gt;0, so remvoe it from *this: */</div><div class='add'>+               *this = list-&gt;next;</div><div class='add'>+               list-&gt;next = 0;</div><div class='add'>+</div><div class='add'>+               /* And, since we know it isn't useful, stop it being added again</div><div class='add'>+                * in this run:</div><div class='add'>+                */</div><div class='add'>+               list-&gt;local_use = max;</div><div class='add'>+            }</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         mask &lt;&lt;= 1;</div><div class='add'>+         list = list-&gt;list;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* Now if anything was added we have something to do. */</div><div class='add'>+      if (*this != &amp;image_transform_end)</div><div class='add'>+         return counter;</div><div class='add'>+</div><div class='add'>+      /* Nothing added, but was there anything in there to add? */</div><div class='add'>+      if (!image_transform_test_counter(counter, max))</div><div class='add'>+         return 0;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef THIS_IS_THE_PROFORMA</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_@_set(PNG_CONST image_transform *this,</div><div class='add'>+    transform_display *that, png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   png_set_@(pp);</div><div class='add'>+   this-&gt;next-&gt;set(this-&gt;next, that, pp, pi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+image_transform_png_set_@_mod(PNG_CONST image_transform *this,</div><div class='add'>+    image_pixel *that, png_structp pp, PNG_CONST transform_display *display)</div><div class='add'>+{</div><div class='add'>+   this-&gt;next-&gt;mod(this-&gt;next, that, pp, display);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+image_transform_png_set_@_add(image_transform *this,</div><div class='add'>+    PNG_CONST image_transform **that, char *name, size_t sizeof_name,</div><div class='add'>+    size_t *pos, png_byte colour_type, png_byte bit_depth)</div><div class='add'>+{</div><div class='add'>+   this-&gt;next = *that;</div><div class='add'>+   *that = this;</div><div class='add'>+</div><div class='add'>+   *pos = safecat(name, sizeof_name, *pos, " +@");</div><div class='add'>+</div><div class='add'>+   return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+IT(@);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* png_set_quantize(png_structp, png_colorp palette, int num_palette,</div><div class='add'>+ *    int maximum_colors, png_const_uint_16p histogram, int full_quantize)</div><div class='add'>+ *</div><div class='add'>+ * Very difficult to validate this!</div><div class='add'>+ */</div><div class='add'>+/*NOTE: TBD NYI */</div><div class='add'>+</div><div class='add'>+/* The data layout transforms are handled by swapping our own channel data,</div><div class='add'>+ * necessarily these need to happen at the end of the transform list because the</div><div class='add'>+ * semantic of the channels changes after these are executed.  Some of these,</div><div class='add'>+ * like set_shift and set_packing, can't be done at present because they change</div><div class='add'>+ * the layout of the data at the sub-sample level so sample() won't get the</div><div class='add'>+ * right answer.</div><div class='add'>+ */</div><div class='add'>+/* png_set_invert_alpha */</div><div class='add'>+/*NOTE: TBD NYI */</div><div class='add'>+</div><div class='add'>+/* png_set_bgr */</div><div class='add'>+/*NOTE: TBD NYI */</div><div class='add'>+</div><div class='add'>+/* png_set_swap_alpha */</div><div class='add'>+/*NOTE: TBD NYI */</div><div class='add'>+</div><div class='add'>+/* png_set_swap */</div><div class='add'>+/*NOTE: TBD NYI */</div><div class='add'>+</div><div class='add'>+/* png_set_filler, (png_structp png_ptr, png_uint_32 filler, int flags)); */</div><div class='add'>+/*NOTE: TBD NYI */</div><div class='add'>+</div><div class='add'>+/* png_set_add_alpha, (png_structp png_ptr, png_uint_32 filler, int flags)); */</div><div class='add'>+/*NOTE: TBD NYI */</div><div class='add'>+</div><div class='add'>+/* png_set_packing */</div><div class='add'>+/*NOTE: TBD NYI */</div><div class='add'>+</div><div class='add'>+/* png_set_packswap */</div><div class='add'>+/*NOTE: TBD NYI */</div><div class='add'>+</div><div class='add'>+/* png_set_invert_mono */</div><div class='add'>+/*NOTE: TBD NYI */</div><div class='add'>+</div><div class='add'>+/* png_set_shift(png_structp, png_const_color_8p true_bits) */</div><div class='add'>+/*NOTE: TBD NYI */</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+test_transform(png_modifier* PNG_CONST pm, png_byte PNG_CONST colour_type,</div><div class='add'>+    int bdlo, int PNG_CONST bdhi, png_uint_32 max)</div><div class='add'>+{</div><div class='add'>+   for (; bdlo &lt;= bdhi; ++bdlo)</div><div class='add'>+   {</div><div class='add'>+      PNG_CONST png_byte bit_depth = DEPTH(bdlo);</div><div class='add'>+      png_uint_32 counter = 0;</div><div class='add'>+      size_t base_pos;</div><div class='add'>+      char name[64];</div><div class='add'>+</div><div class='add'>+      base_pos = safecat(name, sizeof name, 0, "transform:");</div><div class='add'>+</div><div class='add'>+      for (;;)</div><div class='add'>+      {</div><div class='add'>+         size_t pos = base_pos;</div><div class='add'>+         PNG_CONST image_transform *list = 0;</div><div class='add'>+</div><div class='add'>+         counter = image_transform_add(&amp;list, max, counter, name, sizeof name,</div><div class='add'>+            &amp;pos, colour_type, bit_depth);</div><div class='add'>+</div><div class='add'>+         if (counter == 0)</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         /* The command line can change this to checking interlaced images. */</div><div class='add'>+         transform_test(pm, FILEID(colour_type, bit_depth, pm-&gt;interlace_type,</div><div class='add'>+            0, 0, 0), list, name);</div><div class='add'>+</div><div class='add'>+         if (fail(pm))</div><div class='add'>+            return 0;</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return 1; /* keep going */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+perform_transform_test(png_modifier *pm)</div><div class='add'>+{</div><div class='add'>+   /* Test each colour type over the valid range of bit depths (expressed as</div><div class='add'>+    * log2(bit_depth) in turn, stop as soon as any error is detected.</div><div class='add'>+    */</div><div class='add'>+   if (!test_transform(pm, 0, 0, READ_BDHI, 1))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   if (!test_transform(pm, 2, 3, READ_BDHI, 1))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   if (!test_transform(pm, 3, 0, 3, 1))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   if (!test_transform(pm, 4, 3, READ_BDHI, 1))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   if (!test_transform(pm, 6, 3, READ_BDHI, 1))</div><div class='add'>+      return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/********************************* GAMMA TESTS ********************************/</div><div class='add'>+/* Gamma test images. */</div><div class='add'>+typedef struct gamma_modification</div><div class='add'>+{</div><div class='add'>+   png_modification this;</div><div class='add'>+   png_fixed_point  gamma;</div><div class='add'>+} gamma_modification;</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+gamma_modify(png_modifier *pm, png_modification *me, int add)</div><div class='add'>+{</div><div class='add'>+   UNUSED(add)</div><div class='add'>+   /* This simply dumps the given gamma value into the buffer. */</div><div class='add'>+   png_save_uint_32(pm-&gt;buffer, 4);</div><div class='add'>+   png_save_uint_32(pm-&gt;buffer+4, CHUNK_gAMA);</div><div class='add'>+   png_save_uint_32(pm-&gt;buffer+8, ((gamma_modification*)me)-&gt;gamma);</div><div class='add'>+   return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+gamma_modification_init(gamma_modification *me, png_modifier *pm, double gammad)</div><div class='add'>+{</div><div class='add'>+   double g;</div><div class='add'>+</div><div class='add'>+   modification_init(&amp;me-&gt;this);</div><div class='add'>+   me-&gt;this.chunk = CHUNK_gAMA;</div><div class='add'>+   me-&gt;this.modify_fn = gamma_modify;</div><div class='add'>+   me-&gt;this.add = CHUNK_PLTE;</div><div class='add'>+   g = floor(gammad * 100000 + .5);</div><div class='add'>+   me-&gt;gamma = (png_fixed_point)g;</div><div class='add'>+   me-&gt;this.next = pm-&gt;modifications;</div><div class='add'>+   pm-&gt;modifications = &amp;me-&gt;this;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+typedef struct srgb_modification</div><div class='add'>+{</div><div class='add'>+   png_modification this;</div><div class='add'>+   png_byte         intent;</div><div class='add'>+} srgb_modification;</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+srgb_modify(png_modifier *pm, png_modification *me, int add)</div><div class='add'>+{</div><div class='add'>+   UNUSED(add)</div><div class='add'>+   /* As above, ignore add and just make a new chunk */</div><div class='add'>+   png_save_uint_32(pm-&gt;buffer, 1);</div><div class='add'>+   png_save_uint_32(pm-&gt;buffer+4, CHUNK_sRGB);</div><div class='add'>+   pm-&gt;buffer[8] = ((srgb_modification*)me)-&gt;intent;</div><div class='add'>+   return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+srgb_modification_init(srgb_modification *me, png_modifier *pm, png_byte intent)</div><div class='add'>+{</div><div class='add'>+   modification_init(&amp;me-&gt;this);</div><div class='add'>+   me-&gt;this.chunk = CHUNK_sBIT;</div><div class='add'>+</div><div class='add'>+   if (intent &lt;= 3) /* if valid, else *delete* sRGB chunks */</div><div class='add'>+   {</div><div class='add'>+      me-&gt;this.modify_fn = srgb_modify;</div><div class='add'>+      me-&gt;this.add = CHUNK_PLTE;</div><div class='add'>+      me-&gt;intent = intent;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   else</div><div class='add'>+   {</div><div class='add'>+      me-&gt;this.modify_fn = 0;</div><div class='add'>+      me-&gt;this.add = 0;</div><div class='add'>+      me-&gt;intent = 0;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   me-&gt;this.next = pm-&gt;modifications;</div><div class='add'>+   pm-&gt;modifications = &amp;me-&gt;this;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+typedef struct sbit_modification</div><div class='add'>+{</div><div class='add'>+   png_modification this;</div><div class='add'>+   png_byte         sbit;</div><div class='add'>+} sbit_modification;</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+sbit_modify(png_modifier *pm, png_modification *me, int add)</div><div class='add'>+{</div><div class='add'>+   png_byte sbit = ((sbit_modification*)me)-&gt;sbit;</div><div class='add'>+   if (pm-&gt;bit_depth &gt; sbit)</div><div class='add'>+   {</div><div class='add'>+      int cb = 0;</div><div class='add'>+      switch (pm-&gt;colour_type)</div><div class='add'>+      {</div><div class='add'>+         case 0:</div><div class='add'>+            cb = 1;</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         case 2:</div><div class='add'>+         case 3:</div><div class='add'>+            cb = 3;</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         case 4:</div><div class='add'>+            cb = 2;</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         case 6:</div><div class='add'>+            cb = 4;</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         default:</div><div class='add'>+            png_error(pm-&gt;this.pread,</div><div class='add'>+               "unexpected colour type in sBIT modification");</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      png_save_uint_32(pm-&gt;buffer, cb);</div><div class='add'>+      png_save_uint_32(pm-&gt;buffer+4, CHUNK_sBIT);</div><div class='add'>+</div><div class='add'>+      while (cb &gt; 0)</div><div class='add'>+         (pm-&gt;buffer+8)[--cb] = sbit;</div><div class='add'>+</div><div class='add'>+      return 1;</div><div class='add'>+   }</div><div class='add'>+   else if (!add)</div><div class='add'>+   {</div><div class='add'>+      /* Remove the sBIT chunk */</div><div class='add'>+      pm-&gt;buffer_count = pm-&gt;buffer_position = 0;</div><div class='add'>+      return 1;</div><div class='add'>+   }</div><div class='add'>+   else</div><div class='add'>+      return 0; /* do nothing */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sbit_modification_init(sbit_modification *me, png_modifier *pm, png_byte sbit)</div><div class='add'>+{</div><div class='add'>+   modification_init(&amp;me-&gt;this);</div><div class='add'>+   me-&gt;this.chunk = CHUNK_sBIT;</div><div class='add'>+   me-&gt;this.modify_fn = sbit_modify;</div><div class='add'>+   me-&gt;this.add = CHUNK_PLTE;</div><div class='add'>+   me-&gt;sbit = sbit;</div><div class='add'>+   me-&gt;this.next = pm-&gt;modifications;</div><div class='add'>+   pm-&gt;modifications = &amp;me-&gt;this;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Reader callbacks and implementations, where they differ from the standard</div><div class='add'>+ * ones.</div><div class='add'>+ */</div><div class='add'>+typedef struct gamma_display</div><div class='add'>+{</div><div class='add'>+   standard_display this;</div><div class='add'>+</div><div class='add'>+   /* Parameters */</div><div class='add'>+   png_modifier*    pm;</div><div class='add'>+   double           file_gamma;</div><div class='add'>+   double           screen_gamma;</div><div class='add'>+   png_byte         sbit;</div><div class='add'>+   int              threshold_test;</div><div class='add'>+   PNG_CONST char*  name;</div><div class='add'>+   int              speed;</div><div class='add'>+   int              use_input_precision;</div><div class='add'>+   int              strip16;</div><div class='add'>+</div><div class='add'>+   /* Local variables */</div><div class='add'>+   double       maxerrout;</div><div class='add'>+   double       maxerrpc;</div><div class='add'>+   double       maxerrabs;</div><div class='add'>+} gamma_display;</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+gamma_display_init(gamma_display *dp, png_modifier *pm, png_uint_32 id,</div><div class='add'>+    double file_gamma, double screen_gamma, png_byte sbit, int threshold_test,</div><div class='add'>+    int speed, int use_input_precision, int strip16)</div><div class='add'>+{</div><div class='add'>+   /* Standard fields */</div><div class='add'>+   standard_display_init(&amp;dp-&gt;this, &amp;pm-&gt;this, id, 0/*do_interlace*/);</div><div class='add'>+</div><div class='add'>+   /* Parameter fields */</div><div class='add'>+   dp-&gt;pm = pm;</div><div class='add'>+   dp-&gt;file_gamma = file_gamma;</div><div class='add'>+   dp-&gt;screen_gamma = screen_gamma;</div><div class='add'>+   dp-&gt;sbit = sbit;</div><div class='add'>+   dp-&gt;threshold_test = threshold_test;</div><div class='add'>+   dp-&gt;speed = speed;</div><div class='add'>+   dp-&gt;use_input_precision = use_input_precision;</div><div class='add'>+   dp-&gt;strip16 = strip16;</div><div class='add'>+</div><div class='add'>+   /* Local variable fields */</div><div class='add'>+   dp-&gt;maxerrout = dp-&gt;maxerrpc = dp-&gt;maxerrabs = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+gamma_info_imp(gamma_display *dp, png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   /* Reuse the standard stuff as appropriate. */</div><div class='add'>+   standard_info_part1(&amp;dp-&gt;this, pp, pi);</div><div class='add'>+</div><div class='add'>+   /* If requested strip 16 to 8 bits - this is handled automagically below</div><div class='add'>+    * because the output bit depth is read from the library.  Note that there</div><div class='add'>+    * are interactions with sBIT but, internally, libpng makes sbit at most</div><div class='add'>+    * PNG_MAX_GAMMA_8 when doing the following.</div><div class='add'>+    */</div><div class='add'>+   if (dp-&gt;strip16)</div><div class='add'>+#     ifdef PNG_READ_16_TO_8_SUPPORTED</div><div class='add'>+         png_set_strip_16(pp);</div><div class='add'>+#     else</div><div class='add'>+         png_error(pp, "strip16 (16 to 8 bit conversion) not supported");</div><div class='add'>+#     endif</div><div class='add'>+</div><div class='add'>+   png_read_update_info(pp, pi);</div><div class='add'>+</div><div class='add'>+   /* Now we may get a different cbRow: */</div><div class='add'>+   standard_info_part2(&amp;dp-&gt;this, pp, pi, 1 /*images*/);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+gamma_info(png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   gamma_info_imp(png_get_progressive_ptr(pp), pp, pi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+gamma_image_validate(gamma_display *dp, png_structp pp, png_infop pi,</div><div class='add'>+    png_const_bytep pRow)</div><div class='add'>+{</div><div class='add'>+   /* Get some constants derived from the input and output file formats: */</div><div class='add'>+   PNG_CONST png_byte sbit = dp-&gt;sbit;</div><div class='add'>+   PNG_CONST double file_gamma = dp-&gt;file_gamma;</div><div class='add'>+   PNG_CONST double screen_gamma = dp-&gt;screen_gamma;</div><div class='add'>+   PNG_CONST int use_input_precision = dp-&gt;use_input_precision;</div><div class='add'>+   PNG_CONST int speed = dp-&gt;speed;</div><div class='add'>+   PNG_CONST png_byte in_ct = dp-&gt;this.colour_type;</div><div class='add'>+   PNG_CONST png_byte in_bd = dp-&gt;this.bit_depth;</div><div class='add'>+   PNG_CONST png_uint_32 w = dp-&gt;this.w;</div><div class='add'>+   PNG_CONST png_uint_32 h = dp-&gt;this.h;</div><div class='add'>+   PNG_CONST size_t cbRow = dp-&gt;this.cbRow;</div><div class='add'>+   PNG_CONST png_byte out_ct = png_get_color_type(pp, pi);</div><div class='add'>+   PNG_CONST png_byte out_bd = png_get_bit_depth(pp, pi);</div><div class='add'>+   PNG_CONST unsigned int outmax = (1U&lt;&lt;out_bd)-1;</div><div class='add'>+   PNG_CONST double maxabs = abserr(dp-&gt;pm, out_bd);</div><div class='add'>+   PNG_CONST double maxout = outerr(dp-&gt;pm, out_bd);</div><div class='add'>+   PNG_CONST double maxpc = pcerr(dp-&gt;pm, out_bd);</div><div class='add'>+</div><div class='add'>+   /* There are three sources of error, firstly the quantization in the</div><div class='add'>+    * file encoding, determined by sbit and/or the file depth, secondly</div><div class='add'>+    * the output (screen) gamma and thirdly the output file encoding.</div><div class='add'>+    *</div><div class='add'>+    * Since this API receives the screen and file gamma in double</div><div class='add'>+    * precision it is possible to calculate an exact answer given an input</div><div class='add'>+    * pixel value.  Therefore we assume that the *input* value is exact -</div><div class='add'>+    * sample/maxsample - calculate the corresponding gamma corrected</div><div class='add'>+    * output to the limits of double precision arithmetic and compare with</div><div class='add'>+    * what libpng returns.</div><div class='add'>+    *</div><div class='add'>+    * Since the library must quantize the output to 8 or 16 bits there is</div><div class='add'>+    * a fundamental limit on the accuracy of the output of +/-.5 - this</div><div class='add'>+    * quantization limit is included in addition to the other limits</div><div class='add'>+    * specified by the paramaters to the API.  (Effectively, add .5</div><div class='add'>+    * everywhere.)</div><div class='add'>+    *</div><div class='add'>+    * The behavior of the 'sbit' paramter is defined by section 12.5</div><div class='add'>+    * (sample depth scaling) of the PNG spec.  That section forces the</div><div class='add'>+    * decoder to assume that the PNG values have been scaled if sBIT is</div><div class='add'>+    * present:</div><div class='add'>+    *</div><div class='add'>+    *     png-sample = floor( input-sample * (max-out/max-in) + .5);</div><div class='add'>+    *</div><div class='add'>+    * This means that only a subset of the possible PNG values should</div><div class='add'>+    * appear in the input. However, the spec allows the encoder to use a</div><div class='add'>+    * variety of approximations to the above and doesn't require any</div><div class='add'>+    * restriction of the values produced.</div><div class='add'>+    *</div><div class='add'>+    * Nevertheless the spec requires that the upper 'sBIT' bits of the</div><div class='add'>+    * value stored in a PNG file be the original sample bits.</div><div class='add'>+    * Consequently the code below simply scales the top sbit bits by</div><div class='add'>+    * (1&lt;&lt;sbit)-1 to obtain an original sample value.</div><div class='add'>+    *</div><div class='add'>+    * Because there is limited precision in the input it is arguable that</div><div class='add'>+    * an acceptable result is any valid result from input-.5 to input+.5.</div><div class='add'>+    * The basic tests below do not do this, however if</div><div class='add'>+    * 'use_input_precision' is set a subsequent test is performed below.</div><div class='add'>+    */</div><div class='add'>+   PNG_CONST int processing = (fabs(screen_gamma*file_gamma-1) &gt;=</div><div class='add'>+      PNG_GAMMA_THRESHOLD &amp;&amp; !dp-&gt;threshold_test &amp;&amp; !speed &amp;&amp; in_ct != 3) ||</div><div class='add'>+      in_bd != out_bd;</div><div class='add'>+</div><div class='add'>+   PNG_CONST unsigned int samples_per_pixel = (out_ct &amp; 2U) ? 3U : 1U;</div><div class='add'>+</div><div class='add'>+   PNG_CONST double gamma_correction = 1/(file_gamma*screen_gamma);/* Overall */</div><div class='add'>+</div><div class='add'>+   double maxerrout = 0, maxerrabs = 0, maxerrpc = 0;</div><div class='add'>+   png_uint_32 y;</div><div class='add'>+</div><div class='add'>+   for (y=0; y&lt;h; ++y, pRow += cbRow)</div><div class='add'>+   {</div><div class='add'>+      unsigned int s, x;</div><div class='add'>+      png_byte std[STANDARD_ROWMAX];</div><div class='add'>+</div><div class='add'>+      transform_row(pp, std, in_ct, in_bd, y);</div><div class='add'>+</div><div class='add'>+      if (processing)</div><div class='add'>+      {</div><div class='add'>+         for (x=0; x&lt;w; ++x) for (s=0; s&lt;samples_per_pixel; ++s)</div><div class='add'>+         {</div><div class='add'>+            /* Input sample values: */</div><div class='add'>+            PNG_CONST unsigned int</div><div class='add'>+               id = sample(std, in_ct, in_bd, x, s);</div><div class='add'>+</div><div class='add'>+            PNG_CONST unsigned int</div><div class='add'>+               od = sample(pRow, out_ct, out_bd, x, s);</div><div class='add'>+</div><div class='add'>+            PNG_CONST unsigned int</div><div class='add'>+               isbit = id &gt;&gt; (in_bd-sbit);</div><div class='add'>+</div><div class='add'>+            double i, input_sample, encoded_sample, output;</div><div class='add'>+            double encoded_error, error;</div><div class='add'>+            double es_lo, es_hi;</div><div class='add'>+</div><div class='add'>+            /* First check on the 'perfect' result obtained from the</div><div class='add'>+             * digitized input value, id, and compare this against the</div><div class='add'>+             * actual digitized result, 'od'.  'i' is the input result</div><div class='add'>+             * in the range 0..1:</div><div class='add'>+             *</div><div class='add'>+             * NOTE: sBIT should be taken into account here but isn't,</div><div class='add'>+             * as described above.</div><div class='add'>+             */</div><div class='add'>+            i = isbit; i /= (1U&lt;&lt;sbit)-1;</div><div class='add'>+</div><div class='add'>+            /* Then get the gamma corrected version of 'i' and compare</div><div class='add'>+             * to 'od', any error less than .5 is insignificant - just</div><div class='add'>+             * quantization of the output value to the nearest digital</div><div class='add'>+             * value (nevertheless the error is still recorded - it's</div><div class='add'>+             * interesting ;-)</div><div class='add'>+             */</div><div class='add'>+            encoded_sample = pow(i, gamma_correction) * outmax;</div><div class='add'>+            encoded_error = fabs(od-encoded_sample);</div><div class='add'>+</div><div class='add'>+            if (encoded_error &gt; maxerrout)</div><div class='add'>+               maxerrout = encoded_error;</div><div class='add'>+</div><div class='add'>+            if (encoded_error &lt; .5+maxout)</div><div class='add'>+               continue;</div><div class='add'>+</div><div class='add'>+            /* There may be an error, so calculate the actual sample</div><div class='add'>+             * values - unencoded light intensity values.  Note that</div><div class='add'>+             * in practice these are not unencoded because they</div><div class='add'>+             * include a 'viewing correction' to decrease or</div><div class='add'>+             * (normally) increase the perceptual contrast of the</div><div class='add'>+             * image.  There's nothing we can do about this - we don't</div><div class='add'>+             * know what it is - so assume the unencoded value is</div><div class='add'>+             * perceptually linear.</div><div class='add'>+             */</div><div class='add'>+            input_sample = pow(i, 1/file_gamma); /* In range 0..1 */</div><div class='add'>+            output = od;</div><div class='add'>+            output /= outmax;</div><div class='add'>+            output = pow(output, screen_gamma);</div><div class='add'>+</div><div class='add'>+            /* Now we have the numbers for real errors, both absolute</div><div class='add'>+             * values as as a percentage of the correct value (output):</div><div class='add'>+             */</div><div class='add'>+            error = fabs(input_sample-output);</div><div class='add'>+</div><div class='add'>+            if (error &gt; maxerrabs)</div><div class='add'>+               maxerrabs = error;</div><div class='add'>+</div><div class='add'>+            /* The following is an attempt to ignore the tendency of</div><div class='add'>+             * quantization to dominate the percentage errors for low</div><div class='add'>+             * output sample values:</div><div class='add'>+             */</div><div class='add'>+            if (input_sample*maxpc &gt; .5+maxabs)</div><div class='add'>+            {</div><div class='add'>+               double percentage_error = error/input_sample;</div><div class='add'>+               if (percentage_error &gt; maxerrpc) maxerrpc = percentage_error;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            /* Now calculate the digitization limits for</div><div class='add'>+             * 'encoded_sample' using the 'max' values.  Note that</div><div class='add'>+             * maxout is in the encoded space but maxpc and maxabs are</div><div class='add'>+             * in linear light space.</div><div class='add'>+             *</div><div class='add'>+             * First find the maximum error in linear light space,</div><div class='add'>+             * range 0..1:</div><div class='add'>+             */</div><div class='add'>+            {</div><div class='add'>+               double tmp = input_sample * maxpc;</div><div class='add'>+               if (tmp &lt; maxabs) tmp = maxabs;</div><div class='add'>+</div><div class='add'>+               /* Low bound - the minimum of the three: */</div><div class='add'>+               es_lo = encoded_sample - maxout;</div><div class='add'>+</div><div class='add'>+               if (es_lo &gt; 0 &amp;&amp; input_sample-tmp &gt; 0)</div><div class='add'>+               {</div><div class='add'>+                  double low_value = outmax * pow(input_sample-tmp,</div><div class='add'>+                     1/screen_gamma);</div><div class='add'>+                  if (low_value &lt; es_lo) es_lo = low_value;</div><div class='add'>+               }</div><div class='add'>+</div><div class='add'>+               else</div><div class='add'>+                  es_lo = 0;</div><div class='add'>+</div><div class='add'>+               es_hi = encoded_sample + maxout;</div><div class='add'>+</div><div class='add'>+               if (es_hi &lt; outmax &amp;&amp; input_sample+tmp &lt; 1)</div><div class='add'>+               {</div><div class='add'>+                  double high_value = outmax * pow(input_sample+tmp,</div><div class='add'>+                     1/screen_gamma);</div><div class='add'>+                  if (high_value &gt; es_hi) es_hi = high_value;</div><div class='add'>+               }</div><div class='add'>+</div><div class='add'>+               else</div><div class='add'>+                  es_hi = outmax;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            /* The primary test is that the final encoded value</div><div class='add'>+             * returned by the library should be between the two limits</div><div class='add'>+             * (inclusive) that were calculated above.  At this point</div><div class='add'>+             * quantization of the output must be taken into account.</div><div class='add'>+             */</div><div class='add'>+            if (od+.5 &lt; es_lo || od-.5 &gt; es_hi)</div><div class='add'>+            {</div><div class='add'>+               /* There has been an error in processing. */</div><div class='add'>+               double is_lo, is_hi;</div><div class='add'>+</div><div class='add'>+               if (use_input_precision)</div><div class='add'>+               {</div><div class='add'>+                  /* Ok, something is wrong - this actually happens in</div><div class='add'>+                   * current libpng sbit processing.  Assume that the</div><div class='add'>+                   * input value (id, adjusted for sbit) can be</div><div class='add'>+                   * anywhere between value-.5 and value+.5 - quite a</div><div class='add'>+                   * large range if sbit is low.</div><div class='add'>+                   */</div><div class='add'>+                  double tmp = (isbit - .5)/((1U&lt;&lt;sbit)-1);</div><div class='add'>+</div><div class='add'>+                  if (tmp &gt; 0)</div><div class='add'>+                  {</div><div class='add'>+                     is_lo = outmax * pow(tmp, gamma_correction) - maxout;</div><div class='add'>+                     if (is_lo &lt; 0) is_lo = 0;</div><div class='add'>+                  }</div><div class='add'>+</div><div class='add'>+                  else</div><div class='add'>+                     is_lo = 0;</div><div class='add'>+</div><div class='add'>+                  tmp = (isbit + .5)/((1U&lt;&lt;sbit)-1);</div><div class='add'>+</div><div class='add'>+                  if (tmp &lt; 1)</div><div class='add'>+                  {</div><div class='add'>+                     is_hi = outmax * pow(tmp, gamma_correction) + maxout;</div><div class='add'>+                     if (is_hi &gt; outmax) is_hi = outmax;</div><div class='add'>+                  }</div><div class='add'>+</div><div class='add'>+                  else</div><div class='add'>+                     is_hi = outmax;</div><div class='add'>+</div><div class='add'>+                  if (!(od+.5 &lt; is_lo || od-.5 &gt; is_hi))</div><div class='add'>+                     continue;</div><div class='add'>+               }</div><div class='add'>+               else</div><div class='add'>+                  is_lo = es_lo, is_hi = es_hi;</div><div class='add'>+</div><div class='add'>+               {</div><div class='add'>+                  char msg[256];</div><div class='add'>+</div><div class='add'>+                  sprintf(msg,</div><div class='add'>+                   "error: %.3f; %u{%u;%u} -&gt; %u not %.2f (%.1f-%.1f)",</div><div class='add'>+                     od-encoded_sample, id, sbit, isbit, od,</div><div class='add'>+                     encoded_sample, is_lo, is_hi);</div><div class='add'>+</div><div class='add'>+                  png_warning(pp, msg);</div><div class='add'>+               }</div><div class='add'>+            }</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      else if (!speed &amp;&amp; memcmp(std, pRow, cbRow) != 0)</div><div class='add'>+      {</div><div class='add'>+         char msg[64];</div><div class='add'>+</div><div class='add'>+         /* No transform is expected on the threshold tests. */</div><div class='add'>+         sprintf(msg, "gamma: below threshold row %d changed", y);</div><div class='add'>+</div><div class='add'>+         png_error(pp, msg);</div><div class='add'>+      }</div><div class='add'>+   } /* row (y) loop */</div><div class='add'>+</div><div class='add'>+   dp-&gt;maxerrout = maxerrout;</div><div class='add'>+   dp-&gt;maxerrabs = maxerrabs;</div><div class='add'>+   dp-&gt;maxerrpc = maxerrpc;</div><div class='add'>+   dp-&gt;this.ps-&gt;validated = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+gamma_end(png_structp pp, png_infop pi)</div><div class='add'>+{</div><div class='add'>+   gamma_display *dp = png_get_progressive_ptr(pp);</div><div class='add'>+</div><div class='add'>+   gamma_image_validate(dp, pp, pi, dp-&gt;this.ps-&gt;image);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* A single test run checking a gamma transformation.</div><div class='add'>+ *</div><div class='add'>+ * maxabs: maximum absolute error as a fraction</div><div class='add'>+ * maxout: maximum output error in the output units</div><div class='add'>+ * maxpc:  maximum percentage error (as a percentage)</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+gamma_test(png_modifier *pmIn, PNG_CONST png_byte colour_typeIn,</div><div class='add'>+    PNG_CONST png_byte bit_depthIn, PNG_CONST int interlace_typeIn,</div><div class='add'>+    PNG_CONST double file_gammaIn, PNG_CONST double screen_gammaIn,</div><div class='add'>+    PNG_CONST png_byte sbitIn, PNG_CONST int threshold_testIn,</div><div class='add'>+    PNG_CONST char *name, PNG_CONST int speedIn,</div><div class='add'>+    PNG_CONST int use_input_precisionIn, PNG_CONST int strip16In)</div><div class='add'>+{</div><div class='add'>+   gamma_display d;</div><div class='add'>+   context(&amp;pmIn-&gt;this, fault);</div><div class='add'>+</div><div class='add'>+   gamma_display_init(&amp;d, pmIn, FILEID(colour_typeIn, bit_depthIn,</div><div class='add'>+      interlace_typeIn, 0, 0, 0), file_gammaIn, screen_gammaIn, sbitIn,</div><div class='add'>+      threshold_testIn, speedIn, use_input_precisionIn, strip16In);</div><div class='add'>+</div><div class='add'>+   Try</div><div class='add'>+   {</div><div class='add'>+      png_structp pp;</div><div class='add'>+      png_infop pi;</div><div class='add'>+      gamma_modification gamma_mod;</div><div class='add'>+      srgb_modification srgb_mod;</div><div class='add'>+      sbit_modification sbit_mod;</div><div class='add'>+</div><div class='add'>+      /* Make an appropriate modifier to set the PNG file gamma to the</div><div class='add'>+       * given gamma value and the sBIT chunk to the given precision.</div><div class='add'>+       */</div><div class='add'>+      d.pm-&gt;modifications = NULL;</div><div class='add'>+      gamma_modification_init(&amp;gamma_mod, d.pm, d.file_gamma);</div><div class='add'>+      srgb_modification_init(&amp;srgb_mod, d.pm, 127 /*delete*/);</div><div class='add'>+      sbit_modification_init(&amp;sbit_mod, d.pm, d.sbit);</div><div class='add'>+</div><div class='add'>+      modification_reset(d.pm-&gt;modifications);</div><div class='add'>+</div><div class='add'>+      /* Get a png_struct for writing the image. */</div><div class='add'>+      pp = set_modifier_for_read(d.pm, &amp;pi, d.this.id, name);</div><div class='add'>+</div><div class='add'>+      /* Set up gamma processing. */</div><div class='add'>+#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+      png_set_gamma(pp, d.screen_gamma, d.file_gamma);</div><div class='add'>+#else</div><div class='add'>+      {</div><div class='add'>+         png_fixed_point s = floor(d.screen_gamma*100000+.5);</div><div class='add'>+         png_fixed_point f = floor(d.file_gamma*100000+.5);</div><div class='add'>+         png_set_gamma_fixed(pp, s, f);</div><div class='add'>+      }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+      /* Introduce the correct read function. */</div><div class='add'>+      if (d.pm-&gt;this.progressive)</div><div class='add'>+      {</div><div class='add'>+         /* Share the row function with the standard implementation. */</div><div class='add'>+         png_set_progressive_read_fn(pp, &amp;d, gamma_info, progressive_row,</div><div class='add'>+            gamma_end);</div><div class='add'>+</div><div class='add'>+         /* Now feed data into the reader until we reach the end: */</div><div class='add'>+         modifier_progressive_read(d.pm, pp, pi);</div><div class='add'>+      }</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         /* modifier_read expects a png_modifier* */</div><div class='add'>+         png_set_read_fn(pp, d.pm, modifier_read);</div><div class='add'>+</div><div class='add'>+         /* Check the header values: */</div><div class='add'>+         png_read_info(pp, pi);</div><div class='add'>+</div><div class='add'>+         /* Process the 'info' requirements. Only one image is generated */</div><div class='add'>+         gamma_info_imp(&amp;d, pp, pi);</div><div class='add'>+</div><div class='add'>+         sequential_row(&amp;d.this, pp, pi, NULL, d.this.ps-&gt;image);</div><div class='add'>+</div><div class='add'>+         gamma_image_validate(&amp;d, pp, pi, d.this.ps-&gt;image);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      modifier_reset(d.pm);</div><div class='add'>+</div><div class='add'>+      if (d.pm-&gt;log &amp;&amp; !d.threshold_test &amp;&amp; !d.speed)</div><div class='add'>+         fprintf(stderr, "%d bit %s %s: max error %f (%.2g, %2g%%)\n",</div><div class='add'>+            d.this.bit_depth, colour_types[d.this.colour_type], d.name,</div><div class='add'>+            d.maxerrout, d.maxerrabs, 100*d.maxerrpc);</div><div class='add'>+</div><div class='add'>+      /* Log the summary values too. */</div><div class='add'>+      if (d.this.colour_type == 0 || d.this.colour_type == 4)</div><div class='add'>+      {</div><div class='add'>+         switch (d.this.bit_depth)</div><div class='add'>+         {</div><div class='add'>+         case 1:</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         case 2:</div><div class='add'>+            if (d.maxerrout &gt; d.pm-&gt;error_gray_2)</div><div class='add'>+               d.pm-&gt;error_gray_2 = d.maxerrout;</div><div class='add'>+</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         case 4:</div><div class='add'>+            if (d.maxerrout &gt; d.pm-&gt;error_gray_4)</div><div class='add'>+               d.pm-&gt;error_gray_4 = d.maxerrout;</div><div class='add'>+</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         case 8:</div><div class='add'>+            if (d.maxerrout &gt; d.pm-&gt;error_gray_8)</div><div class='add'>+               d.pm-&gt;error_gray_8 = d.maxerrout;</div><div class='add'>+</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         case 16:</div><div class='add'>+            if (d.maxerrout &gt; d.pm-&gt;error_gray_16)</div><div class='add'>+               d.pm-&gt;error_gray_16 = d.maxerrout;</div><div class='add'>+</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         default:</div><div class='add'>+            png_error(pp, "bad bit depth (internal: 1)");</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      else if (d.this.colour_type == 2 || d.this.colour_type == 6)</div><div class='add'>+      {</div><div class='add'>+         switch (d.this.bit_depth)</div><div class='add'>+         {</div><div class='add'>+         case 8:</div><div class='add'>+</div><div class='add'>+            if (d.maxerrout &gt; d.pm-&gt;error_color_8)</div><div class='add'>+               d.pm-&gt;error_color_8 = d.maxerrout;</div><div class='add'>+</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         case 16:</div><div class='add'>+</div><div class='add'>+            if (d.maxerrout &gt; d.pm-&gt;error_color_16)</div><div class='add'>+               d.pm-&gt;error_color_16 = d.maxerrout;</div><div class='add'>+</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+         default:</div><div class='add'>+            png_error(pp, "bad bit depth (internal: 2)");</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   Catch(fault)</div><div class='add'>+      modifier_reset((png_modifier*)fault);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gamma_threshold_test(png_modifier *pm, png_byte colour_type,</div><div class='add'>+    png_byte bit_depth, int interlace_type, double file_gamma,</div><div class='add'>+    double screen_gamma)</div><div class='add'>+{</div><div class='add'>+   size_t pos = 0;</div><div class='add'>+   char name[64];</div><div class='add'>+   pos = safecat(name, sizeof name, pos, "threshold ");</div><div class='add'>+   pos = safecatd(name, sizeof name, pos, file_gamma, 3);</div><div class='add'>+   pos = safecat(name, sizeof name, pos, "/");</div><div class='add'>+   pos = safecatd(name, sizeof name, pos, screen_gamma, 3);</div><div class='add'>+</div><div class='add'>+   (void)gamma_test(pm, colour_type, bit_depth, interlace_type, file_gamma,</div><div class='add'>+      screen_gamma, bit_depth, 1, name, 0 /*speed*/, 0 /*no input precision*/,</div><div class='add'>+      0 /*no strip16*/);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+perform_gamma_threshold_tests(png_modifier *pm)</div><div class='add'>+{</div><div class='add'>+   png_byte colour_type = 0;</div><div class='add'>+   png_byte bit_depth = 0;</div><div class='add'>+</div><div class='add'>+   while (next_format(&amp;colour_type, &amp;bit_depth))</div><div class='add'>+   {</div><div class='add'>+      double test_gamma = 1.0;</div><div class='add'>+      while (test_gamma &gt;= .4)</div><div class='add'>+      {</div><div class='add'>+         /* There's little point testing the interlacing vs non-interlacing,</div><div class='add'>+          * but this can be set from the command line.</div><div class='add'>+          */</div><div class='add'>+         gamma_threshold_test(pm, colour_type, bit_depth, pm-&gt;interlace_type,</div><div class='add'>+            test_gamma, 1/test_gamma);</div><div class='add'>+         test_gamma *= .95;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* And a special test for sRGB */</div><div class='add'>+      gamma_threshold_test(pm, colour_type, bit_depth, pm-&gt;interlace_type,</div><div class='add'>+          .45455, 2.2);</div><div class='add'>+</div><div class='add'>+      if (fail(pm))</div><div class='add'>+         return;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gamma_transform_test(png_modifier *pm,</div><div class='add'>+   PNG_CONST png_byte colour_type, PNG_CONST png_byte bit_depth,</div><div class='add'>+   PNG_CONST int interlace_type, PNG_CONST double file_gamma,</div><div class='add'>+   PNG_CONST double screen_gamma, PNG_CONST png_byte sbit, PNG_CONST int speed,</div><div class='add'>+   PNG_CONST int use_input_precision, PNG_CONST int strip16)</div><div class='add'>+{</div><div class='add'>+   size_t pos = 0;</div><div class='add'>+   char name[64];</div><div class='add'>+</div><div class='add'>+   if (sbit != bit_depth)</div><div class='add'>+   {</div><div class='add'>+      pos = safecat(name, sizeof name, pos, "sbit(");</div><div class='add'>+      pos = safecatn(name, sizeof name, pos, sbit);</div><div class='add'>+      pos = safecat(name, sizeof name, pos, ") ");</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   else</div><div class='add'>+      pos = safecat(name, sizeof name, pos, "gamma ");</div><div class='add'>+</div><div class='add'>+   if (strip16)</div><div class='add'>+      pos = safecat(name, sizeof name, pos, "16to8 ");</div><div class='add'>+</div><div class='add'>+   pos = safecatd(name, sizeof name, pos, file_gamma, 3);</div><div class='add'>+   pos = safecat(name, sizeof name, pos, "-&gt;");</div><div class='add'>+   pos = safecatd(name, sizeof name, pos, screen_gamma, 3);</div><div class='add'>+</div><div class='add'>+   gamma_test(pm, colour_type, bit_depth, interlace_type, file_gamma,</div><div class='add'>+      screen_gamma, sbit, 0, name, speed, use_input_precision, strip16);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void perform_gamma_transform_tests(png_modifier *pm, int speed)</div><div class='add'>+{</div><div class='add'>+   png_byte colour_type = 0;</div><div class='add'>+   png_byte bit_depth = 0;</div><div class='add'>+</div><div class='add'>+   /* Ignore palette images - the gamma correction happens on the palette entry,</div><div class='add'>+    * haven't got the tests for this yet.</div><div class='add'>+    */</div><div class='add'>+   while (next_format(&amp;colour_type, &amp;bit_depth)) if (colour_type != 3)</div><div class='add'>+   {</div><div class='add'>+      unsigned int i, j;</div><div class='add'>+</div><div class='add'>+      for (i=0; i&lt;pm-&gt;ngammas; ++i) for (j=0; j&lt;pm-&gt;ngammas; ++j) if (i != j)</div><div class='add'>+      {</div><div class='add'>+         gamma_transform_test(pm, colour_type, bit_depth, pm-&gt;interlace_type,</div><div class='add'>+            1/pm-&gt;gammas[i], pm-&gt;gammas[j], bit_depth, speed,</div><div class='add'>+            pm-&gt;use_input_precision, 0 /*do not strip16*/);</div><div class='add'>+</div><div class='add'>+         if (fail(pm))</div><div class='add'>+            return;</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void perform_gamma_sbit_tests(png_modifier *pm, int speed)</div><div class='add'>+{</div><div class='add'>+   png_byte sbit;</div><div class='add'>+</div><div class='add'>+   /* The only interesting cases are colour and grayscale, alpha is ignored here</div><div class='add'>+    * for overall speed.  Only bit depths 8 and 16 are tested.</div><div class='add'>+    */</div><div class='add'>+   for (sbit=pm-&gt;sbitlow; sbit&lt;(1&lt;&lt;READ_BDHI); ++sbit)</div><div class='add'>+   {</div><div class='add'>+      unsigned int i, j;</div><div class='add'>+</div><div class='add'>+      for (i=0; i&lt;pm-&gt;ngammas; ++i)</div><div class='add'>+      {</div><div class='add'>+         for (j=0; j&lt;pm-&gt;ngammas; ++j)</div><div class='add'>+         {</div><div class='add'>+            if (i != j)</div><div class='add'>+            {</div><div class='add'>+               if (sbit &lt; 8)</div><div class='add'>+               {</div><div class='add'>+                  gamma_transform_test(pm, 0, 8, pm-&gt;interlace_type,</div><div class='add'>+                      1/pm-&gt;gammas[i], pm-&gt;gammas[j], sbit, speed,</div><div class='add'>+                      pm-&gt;use_input_precision_sbit, 0 /*strip16*/);</div><div class='add'>+</div><div class='add'>+                  if (fail(pm))</div><div class='add'>+                     return;</div><div class='add'>+</div><div class='add'>+                  gamma_transform_test(pm, 2, 8, pm-&gt;interlace_type,</div><div class='add'>+                      1/pm-&gt;gammas[i], pm-&gt;gammas[j], sbit, speed,</div><div class='add'>+                      pm-&gt;use_input_precision_sbit, 0 /*strip16*/);</div><div class='add'>+</div><div class='add'>+                  if (fail(pm))</div><div class='add'>+                     return;</div><div class='add'>+               }</div><div class='add'>+</div><div class='add'>+#ifdef DO_16BIT</div><div class='add'>+               gamma_transform_test(pm, 0, 16, pm-&gt;interlace_type,</div><div class='add'>+                   1/pm-&gt;gammas[i], pm-&gt;gammas[j], sbit, speed,</div><div class='add'>+                   pm-&gt;use_input_precision_sbit, 0 /*strip16*/);</div><div class='add'>+</div><div class='add'>+               if (fail(pm))</div><div class='add'>+                  return;</div><div class='add'>+</div><div class='add'>+               gamma_transform_test(pm, 2, 16, pm-&gt;interlace_type,</div><div class='add'>+                   1/pm-&gt;gammas[i], pm-&gt;gammas[j], sbit, speed,</div><div class='add'>+                   pm-&gt;use_input_precision_sbit, 0 /*strip16*/);</div><div class='add'>+</div><div class='add'>+               if (fail(pm))</div><div class='add'>+                  return;</div><div class='add'>+#endif</div><div class='add'>+            }</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Note that this requires a 16 bit source image but produces 8 bit output, so</div><div class='add'>+ * we only need the 16bit write support.</div><div class='add'>+ */</div><div class='add'>+#ifdef PNG_READ_16_TO_8_SUPPORTED</div><div class='add'>+static void perform_gamma_strip16_tests(png_modifier *pm, int speed)</div><div class='add'>+{</div><div class='add'>+#  ifndef PNG_MAX_GAMMA_8</div><div class='add'>+#     define PNG_MAX_GAMMA_8 11</div><div class='add'>+#  endif</div><div class='add'>+   /* Include the alpha cases here. Note that sbit matches the internal value</div><div class='add'>+    * used by the library - otherwise we will get spurious errors from the</div><div class='add'>+    * internal sbit style approximation.</div><div class='add'>+    *</div><div class='add'>+    * The threshold test is here because otherwise the 16 to 8 conversion will</div><div class='add'>+    * proceed *without* gamma correction, and the tests above will fail (but not</div><div class='add'>+    * by much) - this could be fixed, it only appears with the -g option.</div><div class='add'>+    */</div><div class='add'>+   unsigned int i, j;</div><div class='add'>+   for (i=0; i&lt;pm-&gt;ngammas; ++i)</div><div class='add'>+   {</div><div class='add'>+      for (j=0; j&lt;pm-&gt;ngammas; ++j)</div><div class='add'>+      {</div><div class='add'>+         if (i != j &amp;&amp;</div><div class='add'>+             fabs(pm-&gt;gammas[j]/pm-&gt;gammas[i]-1) &gt;= PNG_GAMMA_THRESHOLD)</div><div class='add'>+         {</div><div class='add'>+            gamma_transform_test(pm, 0, 16, pm-&gt;interlace_type, 1/pm-&gt;gammas[i],</div><div class='add'>+                pm-&gt;gammas[j], PNG_MAX_GAMMA_8, speed,</div><div class='add'>+                pm-&gt;use_input_precision_16to8, 1 /*strip16*/);</div><div class='add'>+</div><div class='add'>+            if (fail(pm))</div><div class='add'>+               return;</div><div class='add'>+</div><div class='add'>+            gamma_transform_test(pm, 2, 16, pm-&gt;interlace_type, 1/pm-&gt;gammas[i],</div><div class='add'>+                pm-&gt;gammas[j], PNG_MAX_GAMMA_8, speed,</div><div class='add'>+                pm-&gt;use_input_precision_16to8, 1 /*strip16*/);</div><div class='add'>+</div><div class='add'>+            if (fail(pm))</div><div class='add'>+               return;</div><div class='add'>+</div><div class='add'>+            gamma_transform_test(pm, 4, 16, pm-&gt;interlace_type, 1/pm-&gt;gammas[i],</div><div class='add'>+                pm-&gt;gammas[j], PNG_MAX_GAMMA_8, speed,</div><div class='add'>+                pm-&gt;use_input_precision_16to8, 1 /*strip16*/);</div><div class='add'>+</div><div class='add'>+            if (fail(pm))</div><div class='add'>+               return;</div><div class='add'>+</div><div class='add'>+            gamma_transform_test(pm, 6, 16, pm-&gt;interlace_type, 1/pm-&gt;gammas[i],</div><div class='add'>+                pm-&gt;gammas[j], PNG_MAX_GAMMA_8, speed,</div><div class='add'>+                pm-&gt;use_input_precision_16to8, 1 /*strip16*/);</div><div class='add'>+</div><div class='add'>+            if (fail(pm))</div><div class='add'>+               return;</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+#endif /* 16 to 8 bit conversion */</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+perform_gamma_test(png_modifier *pm, int speed, int summary)</div><div class='add'>+{</div><div class='add'>+   /* First some arbitrary no-transform tests: */</div><div class='add'>+   if (!speed &amp;&amp; pm-&gt;test_gamma_threshold)</div><div class='add'>+   {</div><div class='add'>+      perform_gamma_threshold_tests(pm);</div><div class='add'>+</div><div class='add'>+      if (fail(pm))</div><div class='add'>+         return;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* Now some real transforms. */</div><div class='add'>+   if (pm-&gt;test_gamma_transform)</div><div class='add'>+   {</div><div class='add'>+      perform_gamma_transform_tests(pm, speed);</div><div class='add'>+</div><div class='add'>+      if (summary)</div><div class='add'>+      {</div><div class='add'>+         printf("Gamma correction error summary\n\n");</div><div class='add'>+         printf("The printed value is the maximum error in the pixel values\n");</div><div class='add'>+         printf("calculated by the libpng gamma correction code.  The error\n");</div><div class='add'>+         printf("is calculated as the difference between the output pixel\n");</div><div class='add'>+         printf("value (always an integer) and the ideal value from the\n");</div><div class='add'>+         printf("libpng specification (typically not an integer).\n\n");</div><div class='add'>+</div><div class='add'>+         printf("Expect this value to be less than .5 for 8 bit formats,\n");</div><div class='add'>+         printf("less than 1 for formats with fewer than 8 bits and a small\n");</div><div class='add'>+         printf("number (typically less than 5) for the 16 bit formats.\n");</div><div class='add'>+         printf("For performance reasons the value for 16 bit formats\n");</div><div class='add'>+         printf("increases when the image file includes an sBIT chunk.\n\n");</div><div class='add'>+</div><div class='add'>+         printf("  2 bit gray:  %.5f\n", pm-&gt;error_gray_2);</div><div class='add'>+         printf("  4 bit gray:  %.5f\n", pm-&gt;error_gray_4);</div><div class='add'>+         printf("  8 bit gray:  %.5f\n", pm-&gt;error_gray_8);</div><div class='add'>+         printf("  8 bit color: %.5f\n", pm-&gt;error_color_8);</div><div class='add'>+#ifdef DO_16BIT</div><div class='add'>+         printf(" 16 bit gray:  %.5f\n", pm-&gt;error_gray_16);</div><div class='add'>+         printf(" 16 bit color: %.5f\n", pm-&gt;error_color_16);</div><div class='add'>+#endif</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* The sbit tests produce much larger errors: */</div><div class='add'>+   if (pm-&gt;test_gamma_sbit)</div><div class='add'>+   {</div><div class='add'>+      pm-&gt;error_gray_2 = pm-&gt;error_gray_4 = pm-&gt;error_gray_8 =</div><div class='add'>+      pm-&gt;error_gray_16 = pm-&gt;error_color_8 = pm-&gt;error_color_16 = 0;</div><div class='add'>+      perform_gamma_sbit_tests(pm, speed);</div><div class='add'>+</div><div class='add'>+      if (summary)</div><div class='add'>+      {</div><div class='add'>+         printf("Gamma correction with sBIT:\n");</div><div class='add'>+</div><div class='add'>+         if (pm-&gt;sbitlow &lt; 8U)</div><div class='add'>+         {</div><div class='add'>+            printf("  2 bit gray:  %.5f\n", pm-&gt;error_gray_2);</div><div class='add'>+            printf("  4 bit gray:  %.5f\n", pm-&gt;error_gray_4);</div><div class='add'>+            printf("  8 bit gray:  %.5f\n", pm-&gt;error_gray_8);</div><div class='add'>+            printf("  8 bit color: %.5f\n", pm-&gt;error_color_8);</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+   #ifdef DO_16BIT</div><div class='add'>+         printf(" 16 bit gray:  %.5f\n", pm-&gt;error_gray_16);</div><div class='add'>+         printf(" 16 bit color: %.5f\n", pm-&gt;error_color_16);</div><div class='add'>+   #endif</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+#ifdef PNG_READ_16_TO_8_SUPPORTED</div><div class='add'>+   if (pm-&gt;test_gamma_strip16)</div><div class='add'>+   {</div><div class='add'>+      /* The 16 to 8 bit strip operations: */</div><div class='add'>+      pm-&gt;error_gray_2 = pm-&gt;error_gray_4 = pm-&gt;error_gray_8 =</div><div class='add'>+      pm-&gt;error_gray_16 = pm-&gt;error_color_8 = pm-&gt;error_color_16 = 0;</div><div class='add'>+      perform_gamma_strip16_tests(pm, speed);</div><div class='add'>+</div><div class='add'>+      if (summary)</div><div class='add'>+      {</div><div class='add'>+         printf("Gamma correction with 16 to 8 bit reduction:\n");</div><div class='add'>+         printf(" 16 bit gray:  %.5f\n", pm-&gt;error_gray_16);</div><div class='add'>+         printf(" 16 bit color: %.5f\n", pm-&gt;error_color_16);</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* INTERLACE MACRO VALIDATION */</div><div class='add'>+/* This is copied verbatim from the specification, it is simply the pass</div><div class='add'>+ * number in which each pixel in each 8x8 tile appears.  The array must</div><div class='add'>+ * be indexed adam7[y][x] and notice that the pass numbers are based at</div><div class='add'>+ * 1, not 0 - the base libpng uses.</div><div class='add'>+ */</div><div class='add'>+static PNG_CONST</div><div class='add'>+png_byte adam7[8][8] =</div><div class='add'>+{</div><div class='add'>+   { 1,6,4,6,2,6,4,6 },</div><div class='add'>+   { 7,7,7,7,7,7,7,7 },</div><div class='add'>+   { 5,6,5,6,5,6,5,6 },</div><div class='add'>+   { 7,7,7,7,7,7,7,7 },</div><div class='add'>+   { 3,6,4,6,3,6,4,6 },</div><div class='add'>+   { 7,7,7,7,7,7,7,7 },</div><div class='add'>+   { 5,6,5,6,5,6,5,6 },</div><div class='add'>+   { 7,7,7,7,7,7,7,7 }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This routine validates all the interlace support macros in png.h for</div><div class='add'>+ * a variety of valid PNG widths and heights.  It uses a number of similarly</div><div class='add'>+ * named internal routines that feed off the above array.</div><div class='add'>+ */</div><div class='add'>+static png_uint_32</div><div class='add'>+png_pass_start_row(int pass)</div><div class='add'>+{</div><div class='add'>+   int x, y;</div><div class='add'>+   ++pass;</div><div class='add'>+   for (y=0; y&lt;8; ++y) for (x=0; x&lt;8; ++x) if (adam7[y][x] == pass)</div><div class='add'>+      return y;</div><div class='add'>+   return 0xf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static png_uint_32</div><div class='add'>+png_pass_start_col(int pass)</div><div class='add'>+{</div><div class='add'>+   int x, y;</div><div class='add'>+   ++pass;</div><div class='add'>+   for (x=0; x&lt;8; ++x) for (y=0; y&lt;8; ++y) if (adam7[y][x] == pass)</div><div class='add'>+      return x;</div><div class='add'>+   return 0xf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+png_pass_row_shift(int pass)</div><div class='add'>+{</div><div class='add'>+   int x, y, base=(-1), inc=8;</div><div class='add'>+   ++pass;</div><div class='add'>+   for (y=0; y&lt;8; ++y) for (x=0; x&lt;8; ++x) if (adam7[y][x] == pass)</div><div class='add'>+   {</div><div class='add'>+      if (base == (-1))</div><div class='add'>+         base = y;</div><div class='add'>+      else if (base == y)</div><div class='add'>+         {}</div><div class='add'>+      else if (inc == y-base)</div><div class='add'>+         base=y;</div><div class='add'>+      else if (inc == 8)</div><div class='add'>+         inc = y-base, base=y;</div><div class='add'>+      else if (inc != y-base)</div><div class='add'>+         return 0xff; /* error - more than one 'inc' value! */</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   if (base == (-1)) return 0xfe; /* error - no row in pass! */</div><div class='add'>+</div><div class='add'>+   /* The shift is always 1, 2 or 3 - no pass has all the rows! */</div><div class='add'>+   switch (inc)</div><div class='add'>+   {</div><div class='add'>+case 2: return 1;</div><div class='add'>+case 4: return 2;</div><div class='add'>+case 8: return 3;</div><div class='add'>+default: break;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* error - unrecognized 'inc' */</div><div class='add'>+   return (inc &lt;&lt; 8) + 0xfd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+png_pass_col_shift(int pass)</div><div class='add'>+{</div><div class='add'>+   int x, y, base=(-1), inc=8;</div><div class='add'>+   ++pass;</div><div class='add'>+   for (x=0; x&lt;8; ++x) for (y=0; y&lt;8; ++y) if (adam7[y][x] == pass)</div><div class='add'>+   {</div><div class='add'>+      if (base == (-1))</div><div class='add'>+         base = x;</div><div class='add'>+      else if (base == x)</div><div class='add'>+         {}</div><div class='add'>+      else if (inc == x-base)</div><div class='add'>+         base=x;</div><div class='add'>+      else if (inc == 8)</div><div class='add'>+         inc = x-base, base=x;</div><div class='add'>+      else if (inc != x-base)</div><div class='add'>+         return 0xff; /* error - more than one 'inc' value! */</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   if (base == (-1)) return 0xfe; /* error - no row in pass! */</div><div class='add'>+</div><div class='add'>+   /* The shift is always 1, 2 or 3 - no pass has all the rows! */</div><div class='add'>+   switch (inc)</div><div class='add'>+   {</div><div class='add'>+case 1: return 0; /* pass 7 has all the columns */</div><div class='add'>+case 2: return 1;</div><div class='add'>+case 4: return 2;</div><div class='add'>+case 8: return 3;</div><div class='add'>+default: break;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* error - unrecognized 'inc' */</div><div class='add'>+   return (inc &lt;&lt; 8) + 0xfd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static png_uint_32</div><div class='add'>+png_row_from_pass_row(png_uint_32 yIn, int pass)</div><div class='add'>+{</div><div class='add'>+   /* By examination of the array: */</div><div class='add'>+   switch (pass)</div><div class='add'>+   {</div><div class='add'>+case 0: return yIn * 8;</div><div class='add'>+case 1: return yIn * 8;</div><div class='add'>+case 2: return yIn * 8 + 4;</div><div class='add'>+case 3: return yIn * 4;</div><div class='add'>+case 4: return yIn * 4 + 2;</div><div class='add'>+case 5: return yIn * 2;</div><div class='add'>+case 6: return yIn * 2 + 1;</div><div class='add'>+default: break;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return 0xff; /* bad pass number */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static png_uint_32</div><div class='add'>+png_col_from_pass_col(png_uint_32 xIn, int pass)</div><div class='add'>+{</div><div class='add'>+   /* By examination of the array: */</div><div class='add'>+   switch (pass)</div><div class='add'>+   {</div><div class='add'>+case 0: return xIn * 8;</div><div class='add'>+case 1: return xIn * 8 + 4;</div><div class='add'>+case 2: return xIn * 4;</div><div class='add'>+case 3: return xIn * 4 + 2;</div><div class='add'>+case 4: return xIn * 2;</div><div class='add'>+case 5: return xIn * 2 + 1;</div><div class='add'>+case 6: return xIn;</div><div class='add'>+default: break;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return 0xff; /* bad pass number */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+png_row_in_interlace_pass(png_uint_32 y, int pass)</div><div class='add'>+{</div><div class='add'>+   /* Is row 'y' in pass 'pass'? */</div><div class='add'>+   int x;</div><div class='add'>+   y &amp;= 7;</div><div class='add'>+   ++pass;</div><div class='add'>+   for (x=0; x&lt;8; ++x) if (adam7[y][x] == pass)</div><div class='add'>+      return 1;</div><div class='add'>+</div><div class='add'>+   return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+png_col_in_interlace_pass(png_uint_32 x, int pass)</div><div class='add'>+{</div><div class='add'>+   /* Is column 'x' in pass 'pass'? */</div><div class='add'>+   int y;</div><div class='add'>+   x &amp;= 7;</div><div class='add'>+   ++pass;</div><div class='add'>+   for (y=0; y&lt;8; ++y) if (adam7[y][x] == pass)</div><div class='add'>+      return 1;</div><div class='add'>+</div><div class='add'>+   return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static png_uint_32</div><div class='add'>+png_pass_rows(png_uint_32 height, int pass)</div><div class='add'>+{</div><div class='add'>+   png_uint_32 tiles = height&gt;&gt;3;</div><div class='add'>+   png_uint_32 rows = 0;</div><div class='add'>+   unsigned int x, y;</div><div class='add'>+</div><div class='add'>+   height &amp;= 7;</div><div class='add'>+   ++pass;</div><div class='add'>+   for (y=0; y&lt;8; ++y) for (x=0; x&lt;8; ++x) if (adam7[y][x] == pass)</div><div class='add'>+   {</div><div class='add'>+      rows += tiles;</div><div class='add'>+      if (y &lt; height) ++rows;</div><div class='add'>+      break; /* i.e. break the 'x', column, loop. */</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return rows;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static png_uint_32</div><div class='add'>+png_pass_cols(png_uint_32 width, int pass)</div><div class='add'>+{</div><div class='add'>+   png_uint_32 tiles = width&gt;&gt;3;</div><div class='add'>+   png_uint_32 cols = 0;</div><div class='add'>+   unsigned int x, y;</div><div class='add'>+</div><div class='add'>+   width &amp;= 7;</div><div class='add'>+   ++pass;</div><div class='add'>+   for (x=0; x&lt;8; ++x) for (y=0; y&lt;8; ++y) if (adam7[y][x] == pass)</div><div class='add'>+   {</div><div class='add'>+      cols += tiles;</div><div class='add'>+      if (x &lt; width) ++cols;</div><div class='add'>+      break; /* i.e. break the 'y', row, loop. */</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return cols;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+perform_interlace_macro_validation(void)</div><div class='add'>+{</div><div class='add'>+   /* The macros to validate, first those that depend only on pass:</div><div class='add'>+    *</div><div class='add'>+    * PNG_PASS_START_ROW(pass)</div><div class='add'>+    * PNG_PASS_START_COL(pass)</div><div class='add'>+    * PNG_PASS_ROW_SHIFT(pass)</div><div class='add'>+    * PNG_PASS_COL_SHIFT(pass)</div><div class='add'>+    */</div><div class='add'>+   int pass;</div><div class='add'>+</div><div class='add'>+   for (pass=0; pass&lt;7; ++pass)</div><div class='add'>+   {</div><div class='add'>+      png_uint_32 m, f, v;</div><div class='add'>+</div><div class='add'>+      m = PNG_PASS_START_ROW(pass);</div><div class='add'>+      f = png_pass_start_row(pass);</div><div class='add'>+      if (m != f)</div><div class='add'>+      {</div><div class='add'>+         fprintf(stderr, "PNG_PASS_START_ROW(%d) = %u != %x\n", pass, m, f);</div><div class='add'>+         exit(1);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      m = PNG_PASS_START_COL(pass);</div><div class='add'>+      f = png_pass_start_col(pass);</div><div class='add'>+      if (m != f)</div><div class='add'>+      {</div><div class='add'>+         fprintf(stderr, "PNG_PASS_START_COL(%d) = %u != %x\n", pass, m, f);</div><div class='add'>+         exit(1);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      m = PNG_PASS_ROW_SHIFT(pass);</div><div class='add'>+      f = png_pass_row_shift(pass);</div><div class='add'>+      if (m != f)</div><div class='add'>+      {</div><div class='add'>+         fprintf(stderr, "PNG_PASS_ROW_SHIFT(%d) = %u != %x\n", pass, m, f);</div><div class='add'>+         exit(1);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      m = PNG_PASS_COL_SHIFT(pass);</div><div class='add'>+      f = png_pass_col_shift(pass);</div><div class='add'>+      if (m != f)</div><div class='add'>+      {</div><div class='add'>+         fprintf(stderr, "PNG_PASS_COL_SHIFT(%d) = %u != %x\n", pass, m, f);</div><div class='add'>+         exit(1);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* Macros that depend on the image or sub-image height too:</div><div class='add'>+       *</div><div class='add'>+       * PNG_PASS_ROWS(height, pass)</div><div class='add'>+       * PNG_PASS_COLS(width, pass)</div><div class='add'>+       * PNG_ROW_FROM_PASS_ROW(yIn, pass)</div><div class='add'>+       * PNG_COL_FROM_PASS_COL(xIn, pass)</div><div class='add'>+       * PNG_ROW_IN_INTERLACE_PASS(y, pass)</div><div class='add'>+       * PNG_COL_IN_INTERLACE_PASS(x, pass)</div><div class='add'>+       */</div><div class='add'>+      for (v=0;;)</div><div class='add'>+      {</div><div class='add'>+         /* First the base 0 stuff: */</div><div class='add'>+         m = PNG_ROW_FROM_PASS_ROW(v, pass);</div><div class='add'>+         f = png_row_from_pass_row(v, pass);</div><div class='add'>+         if (m != f)</div><div class='add'>+         {</div><div class='add'>+            fprintf(stderr, "PNG_ROW_FROM_PASS_ROW(%u, %d) = %u != %x\n",</div><div class='add'>+               v, pass, m, f);</div><div class='add'>+            exit(1);</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         m = PNG_COL_FROM_PASS_COL(v, pass);</div><div class='add'>+         f = png_col_from_pass_col(v, pass);</div><div class='add'>+         if (m != f)</div><div class='add'>+         {</div><div class='add'>+            fprintf(stderr, "PNG_COL_FROM_PASS_COL(%u, %d) = %u != %x\n",</div><div class='add'>+               v, pass, m, f);</div><div class='add'>+            exit(1);</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         m = PNG_ROW_IN_INTERLACE_PASS(v, pass);</div><div class='add'>+         f = png_row_in_interlace_pass(v, pass);</div><div class='add'>+         if (m != f)</div><div class='add'>+         {</div><div class='add'>+            fprintf(stderr, "PNG_ROW_IN_INTERLACE_PASS(%u, %d) = %u != %x\n",</div><div class='add'>+               v, pass, m, f);</div><div class='add'>+            exit(1);</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         m = PNG_COL_IN_INTERLACE_PASS(v, pass);</div><div class='add'>+         f = png_col_in_interlace_pass(v, pass);</div><div class='add'>+         if (m != f)</div><div class='add'>+         {</div><div class='add'>+            fprintf(stderr, "PNG_COL_IN_INTERLACE_PASS(%u, %d) = %u != %x\n",</div><div class='add'>+               v, pass, m, f);</div><div class='add'>+            exit(1);</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         /* Then the base 1 stuff: */</div><div class='add'>+         ++v;</div><div class='add'>+         m = PNG_PASS_ROWS(v, pass);</div><div class='add'>+         f = png_pass_rows(v, pass);</div><div class='add'>+         if (m != f)</div><div class='add'>+         {</div><div class='add'>+            fprintf(stderr, "PNG_PASS_ROWS(%u, %d) = %u != %x\n",</div><div class='add'>+               v, pass, m, f);</div><div class='add'>+            exit(1);</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         m = PNG_PASS_COLS(v, pass);</div><div class='add'>+         f = png_pass_cols(v, pass);</div><div class='add'>+         if (m != f)</div><div class='add'>+         {</div><div class='add'>+            fprintf(stderr, "PNG_PASS_COLS(%u, %d) = %u != %x\n",</div><div class='add'>+               v, pass, m, f);</div><div class='add'>+            exit(1);</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         /* Move to the next v - the stepping algorithm starts skipping</div><div class='add'>+          * values above 1024.</div><div class='add'>+          */</div><div class='add'>+         if (v &gt; 1024)</div><div class='add'>+         {</div><div class='add'>+            if (v == PNG_UINT_31_MAX)</div><div class='add'>+               break;</div><div class='add'>+</div><div class='add'>+            v = (v &lt;&lt; 1) ^ v;</div><div class='add'>+            if (v &gt;= PNG_UINT_31_MAX)</div><div class='add'>+               v = PNG_UINT_31_MAX-1;</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* main program */</div><div class='add'>+int main(int argc, PNG_CONST char **argv)</div><div class='add'>+{</div><div class='add'>+   volatile int summary = 1;  /* Print the error summary at the end */</div><div class='add'>+</div><div class='add'>+   /* Create the given output file on success: */</div><div class='add'>+   PNG_CONST char *volatile touch = NULL;</div><div class='add'>+</div><div class='add'>+   /* This is an array of standard gamma values (believe it or not I've seen</div><div class='add'>+    * every one of these mentioned somewhere.)</div><div class='add'>+    *</div><div class='add'>+    * In the following list the most useful values are first!</div><div class='add'>+    */</div><div class='add'>+   static double</div><div class='add'>+      gammas[]={2.2, 1.0, 2.2/1.45, 1.8, 1.5, 2.4, 2.5, 2.62, 2.9};</div><div class='add'>+</div><div class='add'>+   png_modifier pm;</div><div class='add'>+   context(&amp;pm.this, fault);</div><div class='add'>+</div><div class='add'>+   modifier_init(&amp;pm);</div><div class='add'>+</div><div class='add'>+   /* Preallocate the image buffer, because we know how big it needs to be,</div><div class='add'>+    * note that, for testing purposes, it is deliberately mis-aligned.</div><div class='add'>+    */</div><div class='add'>+   pm.this.image = malloc(2*TRANSFORM_IMAGEMAX+1);</div><div class='add'>+</div><div class='add'>+   if (pm.this.image != NULL)</div><div class='add'>+   {</div><div class='add'>+      /* Ignore OOM at this point - the 'ensure' routine above will allocate</div><div class='add'>+       * the array appropriately.</div><div class='add'>+       */</div><div class='add'>+      ++(pm.this.image);</div><div class='add'>+      pm.this.cb_image = 2*TRANSFORM_IMAGEMAX;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* Default to error on warning: */</div><div class='add'>+   pm.this.treat_warnings_as_errors = 1;</div><div class='add'>+</div><div class='add'>+   /* Store the test gammas */</div><div class='add'>+   pm.gammas = gammas;</div><div class='add'>+   pm.ngammas = 0; /* default to off */</div><div class='add'>+   pm.sbitlow = 8U; /* because libpng doesn't do sBIT below 8! */</div><div class='add'>+   pm.use_input_precision_16to8 = 1U; /* Because of the way libpng does it */</div><div class='add'>+</div><div class='add'>+   /* Some default values (set the behavior for 'make check' here).</div><div class='add'>+    * These values simply control the maximum error permitted in the gamma</div><div class='add'>+    * transformations.  The practial limits for human perception are described</div><div class='add'>+    * below (the setting for maxpc16), however for 8 bit encodings it isn't</div><div class='add'>+    * possible to meet the accepted capabilities of human vision - i.e. 8 bit</div><div class='add'>+    * images can never be good enough, regardless of encoding.</div><div class='add'>+    */</div><div class='add'>+   pm.maxout8 = .1;     /* Arithmetic error in *encoded* value */</div><div class='add'>+   pm.maxabs8 = .00005; /* 1/20000 */</div><div class='add'>+   pm.maxpc8 = .499;    /* I.e., .499% fractional error */</div><div class='add'>+   pm.maxout16 = .499;  /* Error in *encoded* value */</div><div class='add'>+   pm.maxabs16 = .00005;/* 1/20000 */</div><div class='add'>+</div><div class='add'>+   /* NOTE: this is a reasonable perceptual limit. We assume that humans can</div><div class='add'>+    * perceive light level differences of 1% over a 100:1 range, so we need to</div><div class='add'>+    * maintain 1 in 10000 accuracy (in linear light space), which is what the</div><div class='add'>+    * following guarantees.  It also allows significantly higher errors at</div><div class='add'>+    * higher 16 bit values, which is important for performance.  The actual</div><div class='add'>+    * maximum 16 bit error is about +/-1.9 in the fixed point implementation but</div><div class='add'>+    * this is only allowed for values &gt;38149 by the following:</div><div class='add'>+    */</div><div class='add'>+   pm.maxpc16 = .005;   /* I.e., 1/200% - 1/20000 */</div><div class='add'>+</div><div class='add'>+   /* Now parse the command line options. */</div><div class='add'>+   while (--argc &gt;= 1)</div><div class='add'>+   {</div><div class='add'>+      if (strcmp(*++argv, "-v") == 0)</div><div class='add'>+         pm.this.verbose = 1;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "-l") == 0)</div><div class='add'>+         pm.log = 1;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "-q") == 0)</div><div class='add'>+         summary = pm.this.verbose = pm.log = 0;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "-w") == 0)</div><div class='add'>+         pm.this.treat_warnings_as_errors = 0;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--speed") == 0)</div><div class='add'>+         pm.this.speed = 1, pm.ngammas = (sizeof gammas)/(sizeof gammas[0]),</div><div class='add'>+            pm.test_standard = 0;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--size") == 0)</div><div class='add'>+         pm.test_size = 1;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--nosize") == 0)</div><div class='add'>+         pm.test_size = 0;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--standard") == 0)</div><div class='add'>+         pm.test_standard = 1;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--nostandard") == 0)</div><div class='add'>+         pm.test_standard = 0;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--transform") == 0)</div><div class='add'>+         pm.test_transform = 1;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--notransform") == 0)</div><div class='add'>+         pm.test_transform = 0;</div><div class='add'>+</div><div class='add'>+      else if (strncmp(*argv, "--transform-disable=",</div><div class='add'>+         sizeof "--transform-disable") == 0)</div><div class='add'>+         {</div><div class='add'>+         pm.test_transform = 1;</div><div class='add'>+         transform_disable(*argv + sizeof "--transform-disable");</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+      else if (strncmp(*argv, "--transform-enable=",</div><div class='add'>+         sizeof "--transform-enable") == 0)</div><div class='add'>+         {</div><div class='add'>+         pm.test_transform = 1;</div><div class='add'>+         transform_enable(*argv + sizeof "--transform-enable");</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--gamma") == 0)</div><div class='add'>+         {</div><div class='add'>+         /* Just do two gamma tests here (2.2 and linear) for speed: */</div><div class='add'>+         pm.ngammas = 2U;</div><div class='add'>+         pm.test_gamma_threshold = 1;</div><div class='add'>+         pm.test_gamma_transform = 1;</div><div class='add'>+         pm.test_gamma_sbit = 1;</div><div class='add'>+         pm.test_gamma_strip16 = 1;</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--nogamma") == 0)</div><div class='add'>+         pm.ngammas = 0;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--gamma-threshold") == 0)</div><div class='add'>+         pm.ngammas = 2U, pm.test_gamma_threshold = 1;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--nogamma-threshold") == 0)</div><div class='add'>+         pm.test_gamma_threshold = 0;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--gamma-transform") == 0)</div><div class='add'>+         pm.ngammas = 2U, pm.test_gamma_transform = 1;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--nogamma-transform") == 0)</div><div class='add'>+         pm.test_gamma_transform = 0;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--gamma-sbit") == 0)</div><div class='add'>+         pm.ngammas = 2U, pm.test_gamma_sbit = 1;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--nogamma-sbit") == 0)</div><div class='add'>+         pm.test_gamma_sbit = 0;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--gamma-16-to-8") == 0)</div><div class='add'>+         pm.ngammas = 2U, pm.test_gamma_strip16 = 1;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--nogamma-16-to-8") == 0)</div><div class='add'>+         pm.test_gamma_strip16 = 0;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--all-gammas") == 0)</div><div class='add'>+         pm.ngammas = (sizeof gammas)/(sizeof gammas[0]);</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--progressive-read") == 0)</div><div class='add'>+         pm.this.progressive = 1;</div><div class='add'>+</div><div class='add'>+      else if (strcmp(*argv, "--interlace") == 0)</div><div class='add'>+         pm.interlace_type = PNG_INTERLACE_ADAM7;</div><div class='add'>+</div><div class='add'>+      else if (argc &gt;= 1 &amp;&amp; strcmp(*argv, "--sbitlow") == 0)</div><div class='add'>+         --argc, pm.sbitlow = (png_byte)atoi(*++argv);</div><div class='add'>+</div><div class='add'>+      else if (argc &gt;= 1 &amp;&amp; strcmp(*argv, "--touch") == 0)</div><div class='add'>+         --argc, touch = *++argv;</div><div class='add'>+</div><div class='add'>+      else if (argc &gt;= 1 &amp;&amp; strncmp(*argv, "--max", 4) == 0)</div><div class='add'>+      {</div><div class='add'>+         --argc;</div><div class='add'>+</div><div class='add'>+         if (strcmp(4+*argv, "abs8") == 0)</div><div class='add'>+            pm.maxabs8 = atof(*++argv);</div><div class='add'>+</div><div class='add'>+         else if (strcmp(4+*argv, "abs16") == 0)</div><div class='add'>+            pm.maxabs16 = atof(*++argv);</div><div class='add'>+</div><div class='add'>+         else if (strcmp(4+*argv, "out8") == 0)</div><div class='add'>+            pm.maxout8 = atof(*++argv);</div><div class='add'>+</div><div class='add'>+         else if (strcmp(4+*argv, "out16") == 0)</div><div class='add'>+            pm.maxout16 = atof(*++argv);</div><div class='add'>+</div><div class='add'>+         else if (strcmp(4+*argv, "pc8") == 0)</div><div class='add'>+            pm.maxpc8 = atof(*++argv);</div><div class='add'>+</div><div class='add'>+         else if (strcmp(4+*argv, "pc16") == 0)</div><div class='add'>+            pm.maxpc16 = atof(*++argv);</div><div class='add'>+</div><div class='add'>+         else</div><div class='add'>+         {</div><div class='add'>+            fprintf(stderr, "pngvalid: %s: unknown 'max' option\n", *argv);</div><div class='add'>+            exit(1);</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         fprintf(stderr, "pngvalid: %s: unknown argument\n", *argv);</div><div class='add'>+         exit(1);</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* If pngvalid is run with no arguments default to a reasonable set of the</div><div class='add'>+    * tests.</div><div class='add'>+    */</div><div class='add'>+   if (pm.test_standard == 0 &amp;&amp; pm.test_size == 0 &amp;&amp; pm.test_transform == 0 &amp;&amp;</div><div class='add'>+      pm.ngammas == 0)</div><div class='add'>+   {</div><div class='add'>+      pm.test_standard = 1;</div><div class='add'>+      pm.test_size = 1;</div><div class='add'>+      pm.test_transform = 1;</div><div class='add'>+      pm.ngammas = 3U;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   if (pm.ngammas &gt; 0 &amp;&amp;</div><div class='add'>+      pm.test_gamma_threshold == 0 &amp;&amp; pm.test_gamma_transform == 0 &amp;&amp;</div><div class='add'>+      pm.test_gamma_sbit == 0 &amp;&amp; pm.test_gamma_strip16 == 0)</div><div class='add'>+   {</div><div class='add'>+      pm.test_gamma_threshold = 1;</div><div class='add'>+      pm.test_gamma_transform = 1;</div><div class='add'>+      pm.test_gamma_sbit = 1;</div><div class='add'>+      pm.test_gamma_strip16 = 1;</div><div class='add'>+   }</div><div class='add'>+   </div><div class='add'>+   else if (pm.ngammas == 0)</div><div class='add'>+   {</div><div class='add'>+      /* Nothing to test so turn everything off: */</div><div class='add'>+      pm.test_gamma_threshold = 0;</div><div class='add'>+      pm.test_gamma_transform = 0;</div><div class='add'>+      pm.test_gamma_sbit = 0;</div><div class='add'>+      pm.test_gamma_strip16 = 0;</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   Try</div><div class='add'>+   {</div><div class='add'>+      /* Make useful base images */</div><div class='add'>+      make_transform_images(&amp;pm.this);</div><div class='add'>+</div><div class='add'>+      /* Perform the standard and gamma tests. */</div><div class='add'>+      if (pm.test_standard)</div><div class='add'>+      {</div><div class='add'>+         perform_interlace_macro_validation();</div><div class='add'>+         perform_standard_test(&amp;pm);</div><div class='add'>+         perform_error_test(&amp;pm);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* Various oddly sized images: */</div><div class='add'>+      if (pm.test_size)</div><div class='add'>+      {</div><div class='add'>+         make_size_images(&amp;pm.this);</div><div class='add'>+         perform_size_test(&amp;pm);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* Combinatorial transforms: */</div><div class='add'>+      if (pm.test_transform)</div><div class='add'>+         perform_transform_test(&amp;pm);</div><div class='add'>+</div><div class='add'>+      if (pm.ngammas &gt; 0)</div><div class='add'>+         perform_gamma_test(&amp;pm, pm.this.speed != 0,</div><div class='add'>+            summary &amp;&amp; !pm.this.speed);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   Catch(fault)</div><div class='add'>+   {</div><div class='add'>+      fprintf(stderr, "pngvalid: test aborted (probably failed in cleanup)\n");</div><div class='add'>+      if (!pm.this.verbose)</div><div class='add'>+      {</div><div class='add'>+         if (pm.this.error[0] != 0)</div><div class='add'>+            fprintf(stderr, "pngvalid: first error: %s\n", pm.this.error);</div><div class='add'>+</div><div class='add'>+         fprintf(stderr, "pngvalid: run with -v to see what happened\n");</div><div class='add'>+      }</div><div class='add'>+      exit(1);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   if (summary &amp;&amp; !pm.this.speed)</div><div class='add'>+   {</div><div class='add'>+      printf("Results using %s point arithmetic %s\n",</div><div class='add'>+#if defined(PNG_FLOATING_ARITHMETIC_SUPPORTED) || PNG_LIBPNG_VER &lt; 10500</div><div class='add'>+         "floating",</div><div class='add'>+#else</div><div class='add'>+         "fixed",</div><div class='add'>+#endif</div><div class='add'>+         (pm.this.nerrors || (pm.this.treat_warnings_as_errors &amp;&amp;</div><div class='add'>+            pm.this.nwarnings)) ? "(errors)" : (pm.this.nwarnings ?</div><div class='add'>+               "(warnings)" : "(no errors or warnings)")</div><div class='add'>+      );</div><div class='add'>+      printf("Allocated memory statistics (in bytes):\n"</div><div class='add'>+         "\tread  %lu maximum single, %lu peak, %lu total\n"</div><div class='add'>+         "\twrite %lu maximum single, %lu peak, %lu total\n",</div><div class='add'>+         (unsigned long)pm.this.read_memory_pool.max_max,</div><div class='add'>+         (unsigned long)pm.this.read_memory_pool.max_limit,</div><div class='add'>+         (unsigned long)pm.this.read_memory_pool.max_total,</div><div class='add'>+         (unsigned long)pm.this.write_memory_pool.max_max,</div><div class='add'>+         (unsigned long)pm.this.write_memory_pool.max_limit,</div><div class='add'>+         (unsigned long)pm.this.write_memory_pool.max_total);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* Do this here to provoke memory corruption errors in memory not directly</div><div class='add'>+    * allocated by libpng - not a complete test, but better than nothing.</div><div class='add'>+    */</div><div class='add'>+   store_delete(&amp;pm.this);</div><div class='add'>+</div><div class='add'>+   /* Error exit if there are any errors, and maybe if there are any</div><div class='add'>+    * warnings.</div><div class='add'>+    */</div><div class='add'>+   if (pm.this.nerrors || (pm.this.treat_warnings_as_errors &amp;&amp;</div><div class='add'>+       pm.this.nwarnings))</div><div class='add'>+   {</div><div class='add'>+      if (!pm.this.verbose)</div><div class='add'>+         fprintf(stderr, "pngvalid: %s\n", pm.this.error);</div><div class='add'>+</div><div class='add'>+      fprintf(stderr, "pngvalid: %d errors, %d warnings\n", pm.this.nerrors,</div><div class='add'>+          pm.this.nwarnings);</div><div class='add'>+</div><div class='add'>+      exit(1);</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   /* Success case. */</div><div class='add'>+   if (touch != NULL)</div><div class='add'>+   {</div><div class='add'>+      FILE *fsuccess = fopen(touch, "wt");</div><div class='add'>+</div><div class='add'>+      if (fsuccess != NULL)</div><div class='add'>+      {</div><div class='add'>+         int error = 0;</div><div class='add'>+         fprintf(fsuccess, "PNG validation succeeded\n");</div><div class='add'>+         fflush(fsuccess);</div><div class='add'>+         error = ferror(fsuccess);</div><div class='add'>+</div><div class='add'>+         if (fclose(fsuccess) || error)</div><div class='add'>+         {</div><div class='add'>+            fprintf(stderr, "%s: write failed\n", touch);</div><div class='add'>+            exit(1);</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+   }</div><div class='add'>+</div><div class='add'>+   return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/src/3rdparty/libpng/pngwio.c b/src/3rdparty/libpng/pngwio.c<br/>index f4d995b..95ffb34 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngwio.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngwio.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngwio.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngwio.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> </div><div class='ctx'> /* pngwio.c - functions for data output</div><div class='ctx'>  *</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Last changed in libpng 1.5.0 [January 6, 2011]</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -18,11 +18,10 @@</div><div class='ctx'>  * them at run time with png_set_write_fn(...).</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define PNG_NO_PEDANTIC_WARNINGS</div><div class='del'>-#include "png.h"</div><div class='del'>-#ifdef PNG_WRITE_SUPPORTED</div><div class='ctx'> #include "pngpriv.h"</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_WRITE_SUPPORTED</div><div class='add'>+</div><div class='ctx'> /* Write the data to whatever output you are using.  The default routine</div><div class='ctx'>  * writes to a file pointer.  Note that this routine sometimes gets called</div><div class='ctx'>  * with very small lengths, so you should implement some kind of simple</div><div class='hunk'>@@ -31,10 +30,12 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_write_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='add'>+png_write_data(png_structp png_ptr, png_const_bytep data, png_size_t length)</div><div class='ctx'> {</div><div class='add'>+   /* NOTE: write_data_fn must not change the buffer! */</div><div class='ctx'>    if (png_ptr-&gt;write_data_fn != NULL )</div><div class='del'>-      (*(png_ptr-&gt;write_data_fn))(png_ptr, data, length);</div><div class='add'>+      (*(png_ptr-&gt;write_data_fn))(png_ptr, (png_bytep)data, length);</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       png_error(png_ptr, "Call to NULL write function");</div><div class='ctx'> }</div><div class='hunk'>@@ -46,14 +47,16 @@ png_write_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'>  * than changing the library.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef USE_FAR_KEYWORD</div><div class='del'>-void PNGAPI</div><div class='add'>+void PNGCBAPI</div><div class='ctx'> png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> {</div><div class='del'>-   png_uint_32 check;</div><div class='add'>+   png_size_t check;</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    check = fwrite(data, 1, length, (png_FILE_p)(png_ptr-&gt;io_ptr));</div><div class='add'>+</div><div class='ctx'>    if (check != length)</div><div class='ctx'>       png_error(png_ptr, "Write Error");</div><div class='ctx'> }</div><div class='hunk'>@@ -66,7 +69,7 @@ png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> #define NEAR_BUF_SIZE 1024</div><div class='ctx'> #define MIN(a,b) (a &lt;= b ? a : b)</div><div class='ctx'> </div><div class='del'>-void PNGAPI</div><div class='add'>+void PNGCBAPI</div><div class='ctx'> png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> {</div><div class='ctx'>    png_uint_32 check;</div><div class='hunk'>@@ -75,24 +78,29 @@ png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    /* Check if data really is near. If so, use usual code. */</div><div class='ctx'>    near_data = (png_byte *)CVT_PTR_NOCHECK(data);</div><div class='ctx'>    io_ptr = (png_FILE_p)CVT_PTR(png_ptr-&gt;io_ptr);</div><div class='add'>+</div><div class='ctx'>    if ((png_bytep)near_data == data)</div><div class='ctx'>    {</div><div class='ctx'>       check = fwrite(near_data, 1, length, io_ptr);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='ctx'>       png_byte buf[NEAR_BUF_SIZE];</div><div class='ctx'>       png_size_t written, remaining, err;</div><div class='ctx'>       check = 0;</div><div class='ctx'>       remaining = length;</div><div class='add'>+</div><div class='ctx'>       do</div><div class='ctx'>       {</div><div class='ctx'>          written = MIN(NEAR_BUF_SIZE, remaining);</div><div class='ctx'>          png_memcpy(buf, data, written); /* Copy far buffer to near buffer */</div><div class='ctx'>          err = fwrite(buf, 1, written, io_ptr);</div><div class='add'>+</div><div class='ctx'>          if (err != written)</div><div class='ctx'>             break;</div><div class='ctx'> </div><div class='hunk'>@@ -104,6 +112,7 @@ png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'>       }</div><div class='ctx'>       while (remaining != 0);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (check != length)</div><div class='ctx'>       png_error(png_ptr, "Write Error");</div><div class='ctx'> }</div><div class='hunk'>@@ -123,17 +132,19 @@ png_flush(png_structp png_ptr)</div><div class='ctx'>       (*(png_ptr-&gt;output_flush_fn))(png_ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_STDIO_SUPPORTED</div><div class='del'>-void PNGAPI</div><div class='add'>+#  ifdef PNG_STDIO_SUPPORTED</div><div class='add'>+void PNGCBAPI</div><div class='ctx'> png_default_flush(png_structp png_ptr)</div><div class='ctx'> {</div><div class='ctx'>    png_FILE_p io_ptr;</div><div class='add'>+</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    io_ptr = (png_FILE_p)CVT_PTR((png_ptr-&gt;io_ptr));</div><div class='ctx'>    fflush(io_ptr);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* This function allows the application to supply new output functions for</div><div class='hunk'>@@ -155,7 +166,7 @@ png_default_flush(png_structp png_ptr)</div><div class='ctx'>  *                 arguments a pointer to a png_struct.  After a call to</div><div class='ctx'>  *                 the flush function, there should be no data in any buffers</div><div class='ctx'>  *                 or pending transmission.  If the output method doesn't do</div><div class='del'>- *                 any buffering of ouput, a function prototype must still be</div><div class='add'>+ *                 any buffering of output, a function prototype must still be</div><div class='ctx'>  *                 supplied although it doesn't have to do anything.  If</div><div class='ctx'>  *                 PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile</div><div class='ctx'>  *                 time, output_flush_fn will be ignored, although it must be</div><div class='hunk'>@@ -167,7 +178,7 @@ png_default_flush(png_structp png_ptr)</div><div class='ctx'>  */</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_write_fn(png_structp png_ptr, png_voidp io_ptr,</div><div class='del'>-   png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn)</div><div class='add'>+    png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='hunk'>@@ -185,30 +196,32 @@ png_set_write_fn(png_structp png_ptr, png_voidp io_ptr,</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_FLUSH_SUPPORTED</div><div class='del'>-#ifdef PNG_STDIO_SUPPORTED</div><div class='add'>+#  ifdef PNG_STDIO_SUPPORTED</div><div class='add'>+</div><div class='ctx'>    if (output_flush_fn != NULL)</div><div class='ctx'>       png_ptr-&gt;output_flush_fn = output_flush_fn;</div><div class='ctx'> </div><div class='ctx'>    else</div><div class='ctx'>       png_ptr-&gt;output_flush_fn = png_default_flush;</div><div class='del'>-#else</div><div class='add'>+</div><div class='add'>+#  else</div><div class='ctx'>    png_ptr-&gt;output_flush_fn = output_flush_fn;</div><div class='del'>-#endif</div><div class='add'>+#  endif</div><div class='ctx'> #endif /* PNG_WRITE_FLUSH_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'>    /* It is an error to read while writing a png file */</div><div class='ctx'>    if (png_ptr-&gt;read_data_fn != NULL)</div><div class='ctx'>    {</div><div class='ctx'>       png_ptr-&gt;read_data_fn = NULL;</div><div class='add'>+</div><div class='ctx'>       png_warning(png_ptr,</div><div class='del'>-         "Attempted to set both read_data_fn and write_data_fn in");</div><div class='del'>-      png_warning(png_ptr,</div><div class='del'>-         "the same structure.  Resetting read_data_fn to NULL");</div><div class='add'>+          "Can't set both read_data_fn and write_data_fn in the"</div><div class='add'>+          " same structure");</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef USE_FAR_KEYWORD</div><div class='del'>-#ifdef _MSC_VER</div><div class='add'>+#  ifdef _MSC_VER</div><div class='ctx'> void *png_far_to_near(png_structp png_ptr, png_voidp ptr, int check)</div><div class='ctx'> {</div><div class='ctx'>    void *near_ptr;</div><div class='hunk'>@@ -236,6 +249,6 @@ void *png_far_to_near(png_structp png_ptr, png_voidp ptr, int check)</div><div class='ctx'> </div><div class='ctx'>    return(near_ptr);</div><div class='ctx'> }</div><div class='del'>-#   endif</div><div class='del'>-#   endif</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='ctx'> #endif /* PNG_WRITE_SUPPORTED */</div><div class='head'>diff --git a/src/3rdparty/libpng/pngwrite.c b/src/3rdparty/libpng/pngwrite.c<br/>index 01a7f60..d90f449 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngwrite.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngwrite.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngwrite.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngwrite.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> </div><div class='ctx'> /* pngwrite.c - general routines to write a PNG file</div><div class='ctx'>  *</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Last changed in libpng 1.5.1 [February 3, 2011]</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,12 +11,10 @@</div><div class='ctx'>  * and license in png.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* Get internal access to png.h */</div><div class='del'>-#define PNG_NO_PEDANTIC_WARNINGS</div><div class='del'>-#include "png.h"</div><div class='del'>-#ifdef PNG_WRITE_SUPPORTED</div><div class='ctx'> #include "pngpriv.h"</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_WRITE_SUPPORTED</div><div class='add'>+</div><div class='ctx'> /* Writes all the PNG information.  This is the suggested way to use the</div><div class='ctx'>  * library.  If you have a new chunk to add, make a function to write it,</div><div class='ctx'>  * and put it in the correct location here.  If you want the chunk written</div><div class='hunk'>@@ -33,49 +31,46 @@ png_write_info_before_PLTE(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL || info_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_WROTE_INFO_BEFORE_PLTE))</div><div class='ctx'>    {</div><div class='ctx'>    /* Write PNG signature */</div><div class='ctx'>    png_write_sig(png_ptr);</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_MNG_FEATURES_SUPPORTED</div><div class='del'>-   if ((png_ptr-&gt;mode&amp;PNG_HAVE_PNG_SIGNATURE)&amp;&amp;(png_ptr-&gt;mng_features_permitted))</div><div class='add'>+   if ((png_ptr-&gt;mode&amp;PNG_HAVE_PNG_SIGNATURE) &amp;&amp; \</div><div class='add'>+       (png_ptr-&gt;mng_features_permitted))</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");</div><div class='ctx'>       png_ptr-&gt;mng_features_permitted = 0;</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'>    /* Write IHDR information. */</div><div class='ctx'>    png_write_IHDR(png_ptr, info_ptr-&gt;width, info_ptr-&gt;height,</div><div class='del'>-      info_ptr-&gt;bit_depth, info_ptr-&gt;color_type, info_ptr-&gt;compression_type,</div><div class='del'>-      info_ptr-&gt;filter_type,</div><div class='add'>+       info_ptr-&gt;bit_depth, info_ptr-&gt;color_type, info_ptr-&gt;compression_type,</div><div class='add'>+       info_ptr-&gt;filter_type,</div><div class='ctx'> #ifdef PNG_WRITE_INTERLACING_SUPPORTED</div><div class='del'>-      info_ptr-&gt;interlace_type);</div><div class='add'>+       info_ptr-&gt;interlace_type);</div><div class='ctx'> #else</div><div class='del'>-      0);</div><div class='add'>+       0);</div><div class='ctx'> #endif</div><div class='ctx'>    /* The rest of these check to see if the valid field has the appropriate</div><div class='ctx'>     * flag set, and if it does, writes the chunk.</div><div class='ctx'>     */</div><div class='ctx'> #ifdef PNG_WRITE_gAMA_SUPPORTED</div><div class='ctx'>    if (info_ptr-&gt;valid &amp; PNG_INFO_gAMA)</div><div class='del'>-   {</div><div class='del'>-#  ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-      png_write_gAMA(png_ptr, info_ptr-&gt;gamma);</div><div class='del'>-#else</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-      png_write_gAMA_fixed(png_ptr, info_ptr-&gt;int_gamma);</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-   }</div><div class='add'>+      png_write_gAMA_fixed(png_ptr, info_ptr-&gt;gamma);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef PNG_WRITE_sRGB_SUPPORTED</div><div class='ctx'>    if (info_ptr-&gt;valid &amp; PNG_INFO_sRGB)</div><div class='ctx'>       png_write_sRGB(png_ptr, (int)info_ptr-&gt;srgb_intent);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_WRITE_iCCP_SUPPORTED</div><div class='ctx'>    if (info_ptr-&gt;valid &amp; PNG_INFO_iCCP)</div><div class='ctx'>       png_write_iCCP(png_ptr, info_ptr-&gt;iccp_name, PNG_COMPRESSION_TYPE_BASE,</div><div class='del'>-                     info_ptr-&gt;iccp_profile, (int)info_ptr-&gt;iccp_proflen);</div><div class='add'>+          (png_charp)info_ptr-&gt;iccp_profile, (int)info_ptr-&gt;iccp_proflen);</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef PNG_WRITE_sBIT_SUPPORTED</div><div class='ctx'>    if (info_ptr-&gt;valid &amp; PNG_INFO_sBIT)</div><div class='hunk'>@@ -83,24 +78,13 @@ png_write_info_before_PLTE(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef PNG_WRITE_cHRM_SUPPORTED</div><div class='ctx'>    if (info_ptr-&gt;valid &amp; PNG_INFO_cHRM)</div><div class='del'>-   {</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-      png_write_cHRM(png_ptr,</div><div class='del'>-         info_ptr-&gt;x_white, info_ptr-&gt;y_white,</div><div class='del'>-         info_ptr-&gt;x_red, info_ptr-&gt;y_red,</div><div class='del'>-         info_ptr-&gt;x_green, info_ptr-&gt;y_green,</div><div class='del'>-         info_ptr-&gt;x_blue, info_ptr-&gt;y_blue);</div><div class='del'>-#else</div><div class='del'>-#  ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='ctx'>       png_write_cHRM_fixed(png_ptr,</div><div class='del'>-         info_ptr-&gt;int_x_white, info_ptr-&gt;int_y_white,</div><div class='del'>-         info_ptr-&gt;int_x_red, info_ptr-&gt;int_y_red,</div><div class='del'>-         info_ptr-&gt;int_x_green, info_ptr-&gt;int_y_green,</div><div class='del'>-         info_ptr-&gt;int_x_blue, info_ptr-&gt;int_y_blue);</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-   }</div><div class='add'>+          info_ptr-&gt;x_white, info_ptr-&gt;y_white,</div><div class='add'>+          info_ptr-&gt;x_red, info_ptr-&gt;y_red,</div><div class='add'>+          info_ptr-&gt;x_green, info_ptr-&gt;y_green,</div><div class='add'>+          info_ptr-&gt;x_blue, info_ptr-&gt;y_blue);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED</div><div class='ctx'>    if (info_ptr-&gt;unknown_chunks_num)</div><div class='ctx'>    {</div><div class='hunk'>@@ -113,14 +97,16 @@ png_write_info_before_PLTE(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>            up++)</div><div class='ctx'>       {</div><div class='ctx'>          int keep = png_handle_as_unknown(png_ptr, up-&gt;name);</div><div class='add'>+</div><div class='ctx'>          if (keep != PNG_HANDLE_CHUNK_NEVER &amp;&amp;</div><div class='del'>-            up-&gt;location &amp;&amp; !(up-&gt;location &amp; PNG_HAVE_PLTE) &amp;&amp;</div><div class='del'>-            !(up-&gt;location &amp; PNG_HAVE_IDAT) &amp;&amp;</div><div class='del'>-            ((up-&gt;name[3] &amp; 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||</div><div class='del'>-            (png_ptr-&gt;flags &amp; PNG_FLAG_KEEP_UNSAFE_CHUNKS)))</div><div class='add'>+             up-&gt;location &amp;&amp; !(up-&gt;location &amp; PNG_HAVE_PLTE) &amp;&amp;</div><div class='add'>+             !(up-&gt;location &amp; PNG_HAVE_IDAT) &amp;&amp;</div><div class='add'>+             ((up-&gt;name[3] &amp; 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||</div><div class='add'>+             (png_ptr-&gt;flags &amp; PNG_FLAG_KEEP_UNSAFE_CHUNKS)))</div><div class='ctx'>          {</div><div class='ctx'>             if (up-&gt;size == 0)</div><div class='ctx'>                png_warning(png_ptr, "Writing zero-length unknown chunk");</div><div class='add'>+</div><div class='ctx'>             png_write_chunk(png_ptr, up-&gt;name, up-&gt;data, up-&gt;size);</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='hunk'>@@ -146,7 +132,8 @@ png_write_info(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> </div><div class='ctx'>    if (info_ptr-&gt;valid &amp; PNG_INFO_PLTE)</div><div class='ctx'>       png_write_PLTE(png_ptr, info_ptr-&gt;palette,</div><div class='del'>-         (png_uint_32)info_ptr-&gt;num_palette);</div><div class='add'>+          (png_uint_32)info_ptr-&gt;num_palette);</div><div class='add'>+</div><div class='ctx'>    else if (info_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>       png_error(png_ptr, "Valid palette required for paletted images");</div><div class='ctx'> </div><div class='hunk'>@@ -156,59 +143,51 @@ png_write_info(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> #ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED</div><div class='ctx'>       /* Invert the alpha channel (in tRNS) */</div><div class='ctx'>       if ((png_ptr-&gt;transformations &amp; PNG_INVERT_ALPHA) &amp;&amp;</div><div class='del'>-         info_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+          info_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>       {</div><div class='ctx'>          int j;</div><div class='ctx'>          for (j = 0; j&lt;(int)info_ptr-&gt;num_trans; j++)</div><div class='del'>-            info_ptr-&gt;trans_alpha[j] = (png_byte)(255 - info_ptr-&gt;trans_alpha[j]);</div><div class='add'>+            info_ptr-&gt;trans_alpha[j] =</div><div class='add'>+               (png_byte)(255 - info_ptr-&gt;trans_alpha[j]);</div><div class='ctx'>       }</div><div class='ctx'> #endif</div><div class='ctx'>       png_write_tRNS(png_ptr, info_ptr-&gt;trans_alpha, &amp;(info_ptr-&gt;trans_color),</div><div class='del'>-         info_ptr-&gt;num_trans, info_ptr-&gt;color_type);</div><div class='add'>+          info_ptr-&gt;num_trans, info_ptr-&gt;color_type);</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef PNG_WRITE_bKGD_SUPPORTED</div><div class='ctx'>    if (info_ptr-&gt;valid &amp; PNG_INFO_bKGD)</div><div class='ctx'>       png_write_bKGD(png_ptr, &amp;(info_ptr-&gt;background), info_ptr-&gt;color_type);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_WRITE_hIST_SUPPORTED</div><div class='ctx'>    if (info_ptr-&gt;valid &amp; PNG_INFO_hIST)</div><div class='ctx'>       png_write_hIST(png_ptr, info_ptr-&gt;hist, info_ptr-&gt;num_palette);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_WRITE_oFFs_SUPPORTED</div><div class='ctx'>    if (info_ptr-&gt;valid &amp; PNG_INFO_oFFs)</div><div class='ctx'>       png_write_oFFs(png_ptr, info_ptr-&gt;x_offset, info_ptr-&gt;y_offset,</div><div class='del'>-         info_ptr-&gt;offset_unit_type);</div><div class='add'>+          info_ptr-&gt;offset_unit_type);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_WRITE_pCAL_SUPPORTED</div><div class='ctx'>    if (info_ptr-&gt;valid &amp; PNG_INFO_pCAL)</div><div class='ctx'>       png_write_pCAL(png_ptr, info_ptr-&gt;pcal_purpose, info_ptr-&gt;pcal_X0,</div><div class='del'>-         info_ptr-&gt;pcal_X1, info_ptr-&gt;pcal_type, info_ptr-&gt;pcal_nparams,</div><div class='del'>-         info_ptr-&gt;pcal_units, info_ptr-&gt;pcal_params);</div><div class='add'>+          info_ptr-&gt;pcal_X1, info_ptr-&gt;pcal_type, info_ptr-&gt;pcal_nparams,</div><div class='add'>+          info_ptr-&gt;pcal_units, info_ptr-&gt;pcal_params);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_sCAL_SUPPORTED</div><div class='del'>-   if (info_ptr-&gt;valid &amp; PNG_INFO_sCAL)</div><div class='ctx'> #ifdef PNG_WRITE_sCAL_SUPPORTED</div><div class='del'>-#if defined(PNG_FLOATING_POINT_SUPPORTED) &amp;&amp; defined(PNG_STDIO_SUPPORTED)</div><div class='del'>-      png_write_sCAL(png_ptr, (int)info_ptr-&gt;scal_unit,</div><div class='del'>-          info_ptr-&gt;scal_pixel_width, info_ptr-&gt;scal_pixel_height);</div><div class='del'>-#else /* !FLOATING_POINT */</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+   if (info_ptr-&gt;valid &amp; PNG_INFO_sCAL)</div><div class='ctx'>       png_write_sCAL_s(png_ptr, (int)info_ptr-&gt;scal_unit,</div><div class='ctx'>           info_ptr-&gt;scal_s_width, info_ptr-&gt;scal_s_height);</div><div class='del'>-#endif /* FIXED_POINT */</div><div class='del'>-#endif /* FLOATING_POINT */</div><div class='del'>-#else  /* !WRITE_sCAL */</div><div class='del'>-      png_warning(png_ptr,</div><div class='del'>-          "png_write_sCAL not supported; sCAL chunk not written");</div><div class='del'>-#endif /* WRITE_sCAL */</div><div class='ctx'> #endif /* sCAL */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_pHYs_SUPPORTED</div><div class='ctx'>    if (info_ptr-&gt;valid &amp; PNG_INFO_pHYs)</div><div class='ctx'>       png_write_pHYs(png_ptr, info_ptr-&gt;x_pixels_per_unit,</div><div class='del'>-         info_ptr-&gt;y_pixels_per_unit, info_ptr-&gt;phys_unit_type);</div><div class='add'>+          info_ptr-&gt;y_pixels_per_unit, info_ptr-&gt;phys_unit_type);</div><div class='ctx'> #endif /* pHYs */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_tIME_SUPPORTED</div><div class='hunk'>@@ -221,8 +200,8 @@ png_write_info(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_sPLT_SUPPORTED</div><div class='ctx'>    if (info_ptr-&gt;valid &amp; PNG_INFO_sPLT)</div><div class='del'>-     for (i = 0; i &lt; (int)info_ptr-&gt;splt_palettes_num; i++)</div><div class='del'>-       png_write_sPLT(png_ptr, info_ptr-&gt;splt_palettes + i);</div><div class='add'>+      for (i = 0; i &lt; (int)info_ptr-&gt;splt_palettes_num; i++)</div><div class='add'>+         png_write_sPLT(png_ptr, info_ptr-&gt;splt_palettes + i);</div><div class='ctx'> #endif /* sPLT */</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_TEXT_SUPPORTED</div><div class='hunk'>@@ -230,45 +209,47 @@ png_write_info(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>    for (i = 0; i &lt; info_ptr-&gt;num_text; i++)</div><div class='ctx'>    {</div><div class='ctx'>       png_debug2(2, "Writing header text chunk %d, type %d", i,</div><div class='del'>-         info_ptr-&gt;text[i].compression);</div><div class='add'>+          info_ptr-&gt;text[i].compression);</div><div class='ctx'>       /* An internationalized chunk? */</div><div class='ctx'>       if (info_ptr-&gt;text[i].compression &gt; 0)</div><div class='ctx'>       {</div><div class='ctx'> #ifdef PNG_WRITE_iTXt_SUPPORTED</div><div class='del'>-          /* Write international chunk */</div><div class='del'>-          png_write_iTXt(png_ptr,</div><div class='del'>-                         info_ptr-&gt;text[i].compression,</div><div class='del'>-                         info_ptr-&gt;text[i].key,</div><div class='del'>-                         info_ptr-&gt;text[i].lang,</div><div class='del'>-                         info_ptr-&gt;text[i].lang_key,</div><div class='del'>-                         info_ptr-&gt;text[i].text);</div><div class='add'>+         /* Write international chunk */</div><div class='add'>+         png_write_iTXt(png_ptr,</div><div class='add'>+             info_ptr-&gt;text[i].compression,</div><div class='add'>+             info_ptr-&gt;text[i].key,</div><div class='add'>+             info_ptr-&gt;text[i].lang,</div><div class='add'>+             info_ptr-&gt;text[i].lang_key,</div><div class='add'>+             info_ptr-&gt;text[i].text);</div><div class='ctx'> #else</div><div class='ctx'>           png_warning(png_ptr, "Unable to write international text");</div><div class='ctx'> #endif</div><div class='ctx'>           /* Mark this chunk as written */</div><div class='ctx'>           info_ptr-&gt;text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       /* If we want a compressed text chunk */</div><div class='ctx'>       else if (info_ptr-&gt;text[i].compression == PNG_TEXT_COMPRESSION_zTXt)</div><div class='ctx'>       {</div><div class='ctx'> #ifdef PNG_WRITE_zTXt_SUPPORTED</div><div class='ctx'>          /* Write compressed chunk */</div><div class='ctx'>          png_write_zTXt(png_ptr, info_ptr-&gt;text[i].key,</div><div class='del'>-            info_ptr-&gt;text[i].text, 0,</div><div class='del'>-            info_ptr-&gt;text[i].compression);</div><div class='add'>+             info_ptr-&gt;text[i].text, 0,</div><div class='add'>+             info_ptr-&gt;text[i].compression);</div><div class='ctx'> #else</div><div class='ctx'>          png_warning(png_ptr, "Unable to write compressed text");</div><div class='ctx'> #endif</div><div class='ctx'>          /* Mark this chunk as written */</div><div class='ctx'>          info_ptr-&gt;text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if (info_ptr-&gt;text[i].compression == PNG_TEXT_COMPRESSION_NONE)</div><div class='ctx'>       {</div><div class='ctx'> #ifdef PNG_WRITE_tEXt_SUPPORTED</div><div class='ctx'>          /* Write uncompressed chunk */</div><div class='ctx'>          png_write_tEXt(png_ptr, info_ptr-&gt;text[i].key,</div><div class='del'>-                         info_ptr-&gt;text[i].text,</div><div class='del'>-                         0);</div><div class='add'>+             info_ptr-&gt;text[i].text,</div><div class='add'>+             0);</div><div class='ctx'>          /* Mark this chunk as written */</div><div class='ctx'>          info_ptr-&gt;text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;</div><div class='ctx'> #else</div><div class='hunk'>@@ -292,10 +273,10 @@ png_write_info(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>       {</div><div class='ctx'>          int keep = png_handle_as_unknown(png_ptr, up-&gt;name);</div><div class='ctx'>          if (keep != PNG_HANDLE_CHUNK_NEVER &amp;&amp;</div><div class='del'>-            up-&gt;location &amp;&amp; (up-&gt;location &amp; PNG_HAVE_PLTE) &amp;&amp;</div><div class='del'>-            !(up-&gt;location &amp; PNG_HAVE_IDAT) &amp;&amp;</div><div class='del'>-            ((up-&gt;name[3] &amp; 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||</div><div class='del'>-            (png_ptr-&gt;flags &amp; PNG_FLAG_KEEP_UNSAFE_CHUNKS)))</div><div class='add'>+             up-&gt;location &amp;&amp; (up-&gt;location &amp; PNG_HAVE_PLTE) &amp;&amp;</div><div class='add'>+             !(up-&gt;location &amp; PNG_HAVE_IDAT) &amp;&amp;</div><div class='add'>+             ((up-&gt;name[3] &amp; 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||</div><div class='add'>+             (png_ptr-&gt;flags &amp; PNG_FLAG_KEEP_UNSAFE_CHUNKS)))</div><div class='ctx'>          {</div><div class='ctx'>             png_write_chunk(png_ptr, up-&gt;name, up-&gt;data, up-&gt;size);</div><div class='ctx'>          }</div><div class='hunk'>@@ -316,6 +297,7 @@ png_write_end(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    if (!(png_ptr-&gt;mode &amp; PNG_HAVE_IDAT))</div><div class='ctx'>       png_error(png_ptr, "No IDATs written into file");</div><div class='ctx'> </div><div class='hunk'>@@ -328,8 +310,9 @@ png_write_end(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> #ifdef PNG_WRITE_tIME_SUPPORTED</div><div class='ctx'>       /* Check to see if user has supplied a time chunk */</div><div class='ctx'>       if ((info_ptr-&gt;valid &amp; PNG_INFO_tIME) &amp;&amp;</div><div class='del'>-         !(png_ptr-&gt;mode &amp; PNG_WROTE_tIME))</div><div class='add'>+          !(png_ptr-&gt;mode &amp; PNG_WROTE_tIME))</div><div class='ctx'>          png_write_tIME(png_ptr, &amp;(info_ptr-&gt;mod_time));</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef PNG_WRITE_TEXT_SUPPORTED</div><div class='ctx'>       /* Loop through comment chunks */</div><div class='hunk'>@@ -343,36 +326,38 @@ png_write_end(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> #ifdef PNG_WRITE_iTXt_SUPPORTED</div><div class='ctx'>             /* Write international chunk */</div><div class='ctx'>             png_write_iTXt(png_ptr,</div><div class='del'>-                        info_ptr-&gt;text[i].compression,</div><div class='del'>-                        info_ptr-&gt;text[i].key,</div><div class='del'>-                        info_ptr-&gt;text[i].lang,</div><div class='del'>-                        info_ptr-&gt;text[i].lang_key,</div><div class='del'>-                        info_ptr-&gt;text[i].text);</div><div class='add'>+                info_ptr-&gt;text[i].compression,</div><div class='add'>+                info_ptr-&gt;text[i].key,</div><div class='add'>+                info_ptr-&gt;text[i].lang,</div><div class='add'>+                info_ptr-&gt;text[i].lang_key,</div><div class='add'>+                info_ptr-&gt;text[i].text);</div><div class='ctx'> #else</div><div class='ctx'>             png_warning(png_ptr, "Unable to write international text");</div><div class='ctx'> #endif</div><div class='ctx'>             /* Mark this chunk as written */</div><div class='ctx'>             info_ptr-&gt;text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          else if (info_ptr-&gt;text[i].compression &gt;= PNG_TEXT_COMPRESSION_zTXt)</div><div class='ctx'>          {</div><div class='ctx'> #ifdef PNG_WRITE_zTXt_SUPPORTED</div><div class='ctx'>             /* Write compressed chunk */</div><div class='ctx'>             png_write_zTXt(png_ptr, info_ptr-&gt;text[i].key,</div><div class='del'>-               info_ptr-&gt;text[i].text, 0,</div><div class='del'>-               info_ptr-&gt;text[i].compression);</div><div class='add'>+                info_ptr-&gt;text[i].text, 0,</div><div class='add'>+                info_ptr-&gt;text[i].compression);</div><div class='ctx'> #else</div><div class='ctx'>             png_warning(png_ptr, "Unable to write compressed text");</div><div class='ctx'> #endif</div><div class='ctx'>             /* Mark this chunk as written */</div><div class='ctx'>             info_ptr-&gt;text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          else if (info_ptr-&gt;text[i].compression == PNG_TEXT_COMPRESSION_NONE)</div><div class='ctx'>          {</div><div class='ctx'> #ifdef PNG_WRITE_tEXt_SUPPORTED</div><div class='ctx'>             /* Write uncompressed chunk */</div><div class='ctx'>             png_write_tEXt(png_ptr, info_ptr-&gt;text[i].key,</div><div class='del'>-               info_ptr-&gt;text[i].text, 0);</div><div class='add'>+                info_ptr-&gt;text[i].text, 0);</div><div class='ctx'> #else</div><div class='ctx'>             png_warning(png_ptr, "Unable to write uncompressed text");</div><div class='ctx'> #endif</div><div class='hunk'>@@ -395,9 +380,9 @@ png_write_end(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'>       {</div><div class='ctx'>          int keep = png_handle_as_unknown(png_ptr, up-&gt;name);</div><div class='ctx'>          if (keep != PNG_HANDLE_CHUNK_NEVER &amp;&amp;</div><div class='del'>-            up-&gt;location &amp;&amp; (up-&gt;location &amp; PNG_AFTER_IDAT) &amp;&amp;</div><div class='del'>-            ((up-&gt;name[3] &amp; 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||</div><div class='del'>-            (png_ptr-&gt;flags &amp; PNG_FLAG_KEEP_UNSAFE_CHUNKS)))</div><div class='add'>+             up-&gt;location &amp;&amp; (up-&gt;location &amp; PNG_AFTER_IDAT) &amp;&amp;</div><div class='add'>+             ((up-&gt;name[3] &amp; 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||</div><div class='add'>+             (png_ptr-&gt;flags &amp; PNG_FLAG_KEEP_UNSAFE_CHUNKS)))</div><div class='ctx'>          {</div><div class='ctx'>             png_write_chunk(png_ptr, up-&gt;name, up-&gt;data, up-&gt;size);</div><div class='ctx'>          }</div><div class='hunk'>@@ -427,7 +412,7 @@ png_write_end(png_structp png_ptr, png_infop info_ptr)</div><div class='ctx'> #ifdef PNG_CONVERT_tIME_SUPPORTED</div><div class='ctx'> /* "tm" structure is not supported on WindowsCE */</div><div class='ctx'> void PNGAPI</div><div class='del'>-png_convert_from_struct_tm(png_timep ptime, struct tm FAR * ttime)</div><div class='add'>+png_convert_from_struct_tm(png_timep ptime, PNG_CONST struct tm FAR * ttime)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_convert_from_struct_tm");</div><div class='ctx'> </div><div class='hunk'>@@ -452,20 +437,22 @@ png_convert_from_time_t(png_timep ptime, time_t ttime)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Initialize png_ptr structure, and allocate any memory needed */</div><div class='del'>-png_structp PNGAPI</div><div class='del'>-png_create_write_struct(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='del'>-   png_error_ptr error_fn, png_error_ptr warn_fn)</div><div class='add'>+PNG_FUNCTION(png_structp,PNGAPI</div><div class='add'>+png_create_write_struct,(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='add'>+    png_error_ptr error_fn, png_error_ptr warn_fn),PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='ctx'> #ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>    return (png_create_write_struct_2(user_png_ver, error_ptr, error_fn,</div><div class='del'>-      warn_fn, NULL, NULL, NULL));</div><div class='add'>+       warn_fn, NULL, NULL, NULL));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Alternate initialize png_ptr structure, and allocate any memory needed */</div><div class='del'>-png_structp PNGAPI</div><div class='del'>-png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='del'>-   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,</div><div class='del'>-   png_malloc_ptr malloc_fn, png_free_ptr free_fn)</div><div class='add'>+static void png_reset_filter_heuristics(png_structp png_ptr); /* forward decl */</div><div class='add'>+</div><div class='add'>+PNG_FUNCTION(png_structp,PNGAPI</div><div class='add'>+png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='add'>+    png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,</div><div class='add'>+    png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)</div><div class='ctx'> {</div><div class='ctx'> #endif /* PNG_USER_MEM_SUPPORTED */</div><div class='ctx'>    volatile int png_cleanup_needed = 0;</div><div class='hunk'>@@ -475,7 +462,7 @@ png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='ctx'>    png_structp png_ptr;</div><div class='ctx'> #ifdef PNG_SETJMP_SUPPORTED</div><div class='ctx'> #ifdef USE_FAR_KEYWORD</div><div class='del'>-   jmp_buf jmpbuf;</div><div class='add'>+   jmp_buf png_jmpbuf;</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'>    int i;</div><div class='hunk'>@@ -484,7 +471,7 @@ png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>    png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,</div><div class='del'>-      (png_malloc_ptr)malloc_fn, (png_voidp)mem_ptr);</div><div class='add'>+       (png_malloc_ptr)malloc_fn, (png_voidp)mem_ptr);</div><div class='ctx'> #else</div><div class='ctx'>    png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);</div><div class='ctx'> #endif /* PNG_USER_MEM_SUPPORTED */</div><div class='hunk'>@@ -502,12 +489,12 @@ png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='ctx'>    encounter a png_error() will longjmp here.  Since the jmpbuf is</div><div class='ctx'>    then meaningless we abort instead of returning. */</div><div class='ctx'> #ifdef USE_FAR_KEYWORD</div><div class='del'>-   if (setjmp(jmpbuf))</div><div class='add'>+   if (setjmp(png_jmpbuf))</div><div class='ctx'> #else</div><div class='ctx'>    if (setjmp(png_jmpbuf(png_ptr))) /* sets longjmp to match setjmp */</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef USE_FAR_KEYWORD</div><div class='del'>-   png_memcpy(png_jmpbuf(png_ptr), jmpbuf, png_sizeof(jmp_buf));</div><div class='add'>+   png_memcpy(png_jmpbuf(png_ptr), png_jmpbuf, png_sizeof(jmp_buf));</div><div class='ctx'> #endif</div><div class='ctx'>       PNG_ABORT();</div><div class='ctx'> #endif</div><div class='hunk'>@@ -538,38 +525,40 @@ png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='ctx'>          (user_png_ver[0] == '1' &amp;&amp; user_png_ver[2] != png_libpng_ver[2]) ||</div><div class='ctx'>          (user_png_ver[0] == '0' &amp;&amp; user_png_ver[2] &lt; '9'))</div><div class='ctx'>      {</div><div class='del'>-#ifdef PNG_STDIO_SUPPORTED</div><div class='add'>+#ifdef PNG_CONSOLE_IO_SUPPORTED</div><div class='ctx'>         char msg[80];</div><div class='add'>+</div><div class='ctx'>         if (user_png_ver)</div><div class='ctx'>         {</div><div class='del'>-           png_snprintf(msg, 80,</div><div class='del'>-              "Application was compiled with png.h from libpng-%.20s",</div><div class='del'>-              user_png_ver);</div><div class='del'>-           png_warning(png_ptr, msg);</div><div class='del'>-        }</div><div class='del'>-        png_snprintf(msg, 80,</div><div class='del'>-           "Application  is  running with png.c from libpng-%.20s",</div><div class='del'>-           png_libpng_ver);</div><div class='del'>-        png_warning(png_ptr, msg);</div><div class='add'>+            png_snprintf2(msg, 80,</div><div class='add'>+                "Application built with libpng-%.20s"</div><div class='add'>+                " but running with %.20s",</div><div class='add'>+                user_png_ver,</div><div class='add'>+                png_libpng_ver);</div><div class='add'>+            png_warning(png_ptr, msg);</div><div class='add'>+         }</div><div class='add'>+#else</div><div class='add'>+         png_warning(png_ptr,</div><div class='add'>+             "Incompatible libpng version in application and library");</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef PNG_ERROR_NUMBERS_SUPPORTED</div><div class='ctx'>         png_ptr-&gt;flags = 0;</div><div class='ctx'> #endif</div><div class='del'>-        png_warning(png_ptr,</div><div class='del'>-           "Incompatible libpng version in application and library");</div><div class='ctx'>         png_cleanup_needed = 1;</div><div class='ctx'>      }</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    /* Initialize zbuf - compression buffer */</div><div class='ctx'>    png_ptr-&gt;zbuf_size = PNG_ZBUF_SIZE;</div><div class='add'>+</div><div class='ctx'>    if (!png_cleanup_needed)</div><div class='ctx'>    {</div><div class='ctx'>       png_ptr-&gt;zbuf = (png_bytep)png_malloc_warn(png_ptr,</div><div class='del'>-         png_ptr-&gt;zbuf_size);</div><div class='add'>+          png_ptr-&gt;zbuf_size);</div><div class='ctx'>       if (png_ptr-&gt;zbuf == NULL)</div><div class='ctx'>          png_cleanup_needed = 1;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (png_cleanup_needed)</div><div class='ctx'>    {</div><div class='ctx'>        /* Clean up PNG structure and deallocate any memory. */</div><div class='hunk'>@@ -577,7 +566,7 @@ png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='ctx'>        png_ptr-&gt;zbuf = NULL;</div><div class='ctx'> #ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>        png_destroy_struct_2((png_voidp)png_ptr,</div><div class='del'>-          (png_free_ptr)free_fn, (png_voidp)mem_ptr);</div><div class='add'>+           (png_free_ptr)free_fn, (png_voidp)mem_ptr);</div><div class='ctx'> #else</div><div class='ctx'>        png_destroy_struct((png_voidp)png_ptr);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -587,8 +576,7 @@ png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='ctx'>    png_set_write_fn(png_ptr, NULL, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED</div><div class='del'>-   png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT,</div><div class='del'>-      1, NULL, NULL);</div><div class='add'>+   png_reset_filter_heuristics(png_ptr);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>    return (png_ptr);</div><div class='hunk'>@@ -602,7 +590,7 @@ png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,</div><div class='ctx'>  */</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_write_rows(png_structp png_ptr, png_bytepp row,</div><div class='del'>-   png_uint_32 num_rows)</div><div class='add'>+    png_uint_32 num_rows)</div><div class='ctx'> {</div><div class='ctx'>    png_uint_32 i; /* row counter */</div><div class='ctx'>    png_bytepp rp; /* row pointer */</div><div class='hunk'>@@ -655,12 +643,12 @@ png_write_image(png_structp png_ptr, png_bytepp image)</div><div class='ctx'> </div><div class='ctx'> /* Called by user to write a row of image data */</div><div class='ctx'> void PNGAPI</div><div class='del'>-png_write_row(png_structp png_ptr, png_bytep row)</div><div class='add'>+png_write_row(png_structp png_ptr, png_const_bytep row)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='del'>-   png_debug2(1, "in png_write_row (row %ld, pass %d)",</div><div class='add'>+   png_debug2(1, "in png_write_row (row %u, pass %d)",</div><div class='ctx'>       png_ptr-&gt;row_number, png_ptr-&gt;pass);</div><div class='ctx'> </div><div class='ctx'>    /* Initialize transformations and other stuff if first time */</div><div class='hunk'>@@ -669,33 +657,40 @@ png_write_row(png_structp png_ptr, png_bytep row)</div><div class='ctx'>       /* Make sure we wrote the header info */</div><div class='ctx'>       if (!(png_ptr-&gt;mode &amp; PNG_WROTE_INFO_BEFORE_PLTE))</div><div class='ctx'>          png_error(png_ptr,</div><div class='del'>-            "png_write_info was never called before png_write_row");</div><div class='add'>+             "png_write_info was never called before png_write_row");</div><div class='ctx'> </div><div class='ctx'>       /* Check for transforms that have been set but were defined out */</div><div class='ctx'> #if !defined(PNG_WRITE_INVERT_SUPPORTED) &amp;&amp; defined(PNG_READ_INVERT_SUPPORTED)</div><div class='ctx'>       if (png_ptr-&gt;transformations &amp; PNG_INVERT_MONO)</div><div class='ctx'>          png_warning(png_ptr, "PNG_WRITE_INVERT_SUPPORTED is not defined");</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #if !defined(PNG_WRITE_FILLER_SUPPORTED) &amp;&amp; defined(PNG_READ_FILLER_SUPPORTED)</div><div class='ctx'>       if (png_ptr-&gt;transformations &amp; PNG_FILLER)</div><div class='ctx'>          png_warning(png_ptr, "PNG_WRITE_FILLER_SUPPORTED is not defined");</div><div class='ctx'> #endif</div><div class='del'>-#if !defined(PNG_WRITE_PACKSWAP_SUPPORTED) &amp;&amp; defined(PNG_READ_PACKSWAP_SUPPORTED)</div><div class='add'>+#if !defined(PNG_WRITE_PACKSWAP_SUPPORTED) &amp;&amp; \</div><div class='add'>+    defined(PNG_READ_PACKSWAP_SUPPORTED)</div><div class='ctx'>       if (png_ptr-&gt;transformations &amp; PNG_PACKSWAP)</div><div class='del'>-         png_warning(png_ptr, "PNG_WRITE_PACKSWAP_SUPPORTED is not defined");</div><div class='add'>+         png_warning(png_ptr,</div><div class='add'>+             "PNG_WRITE_PACKSWAP_SUPPORTED is not defined");</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #if !defined(PNG_WRITE_PACK_SUPPORTED) &amp;&amp; defined(PNG_READ_PACK_SUPPORTED)</div><div class='ctx'>       if (png_ptr-&gt;transformations &amp; PNG_PACK)</div><div class='ctx'>          png_warning(png_ptr, "PNG_WRITE_PACK_SUPPORTED is not defined");</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #if !defined(PNG_WRITE_SHIFT_SUPPORTED) &amp;&amp; defined(PNG_READ_SHIFT_SUPPORTED)</div><div class='ctx'>       if (png_ptr-&gt;transformations &amp; PNG_SHIFT)</div><div class='ctx'>          png_warning(png_ptr, "PNG_WRITE_SHIFT_SUPPORTED is not defined");</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #if !defined(PNG_WRITE_BGR_SUPPORTED) &amp;&amp; defined(PNG_READ_BGR_SUPPORTED)</div><div class='ctx'>       if (png_ptr-&gt;transformations &amp; PNG_BGR)</div><div class='ctx'>          png_warning(png_ptr, "PNG_WRITE_BGR_SUPPORTED is not defined");</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #if !defined(PNG_WRITE_SWAP_SUPPORTED) &amp;&amp; defined(PNG_READ_SWAP_SUPPORTED)</div><div class='ctx'>       if (png_ptr-&gt;transformations &amp; PNG_SWAP_BYTES)</div><div class='ctx'>          png_warning(png_ptr, "PNG_WRITE_SWAP_SUPPORTED is not defined");</div><div class='hunk'>@@ -717,6 +712,7 @@ png_write_row(png_structp png_ptr, png_bytep row)</div><div class='ctx'>                return;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='add'>+</div><div class='ctx'>          case 1:</div><div class='ctx'>             if ((png_ptr-&gt;row_number &amp; 0x07) || png_ptr-&gt;width &lt; 5)</div><div class='ctx'>             {</div><div class='hunk'>@@ -724,6 +720,7 @@ png_write_row(png_structp png_ptr, png_bytep row)</div><div class='ctx'>                return;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='add'>+</div><div class='ctx'>          case 2:</div><div class='ctx'>             if ((png_ptr-&gt;row_number &amp; 0x07) != 4)</div><div class='ctx'>             {</div><div class='hunk'>@@ -731,6 +728,7 @@ png_write_row(png_structp png_ptr, png_bytep row)</div><div class='ctx'>                return;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='add'>+</div><div class='ctx'>          case 3:</div><div class='ctx'>             if ((png_ptr-&gt;row_number &amp; 0x03) || png_ptr-&gt;width &lt; 3)</div><div class='ctx'>             {</div><div class='hunk'>@@ -738,6 +736,7 @@ png_write_row(png_structp png_ptr, png_bytep row)</div><div class='ctx'>                return;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='add'>+</div><div class='ctx'>          case 4:</div><div class='ctx'>             if ((png_ptr-&gt;row_number &amp; 0x03) != 2)</div><div class='ctx'>             {</div><div class='hunk'>@@ -745,6 +744,7 @@ png_write_row(png_structp png_ptr, png_bytep row)</div><div class='ctx'>                return;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='add'>+</div><div class='ctx'>          case 5:</div><div class='ctx'>             if ((png_ptr-&gt;row_number &amp; 0x01) || png_ptr-&gt;width &lt; 2)</div><div class='ctx'>             {</div><div class='hunk'>@@ -752,6 +752,7 @@ png_write_row(png_structp png_ptr, png_bytep row)</div><div class='ctx'>                return;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='add'>+</div><div class='ctx'>          case 6:</div><div class='ctx'>             if (!(png_ptr-&gt;row_number &amp; 0x01))</div><div class='ctx'>             {</div><div class='hunk'>@@ -759,6 +760,9 @@ png_write_row(png_structp png_ptr, png_bytep row)</div><div class='ctx'>                return;</div><div class='ctx'>             }</div><div class='ctx'>             break;</div><div class='add'>+</div><div class='add'>+         default: /* error: ignore it */</div><div class='add'>+            break;</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -775,11 +779,12 @@ png_write_row(png_structp png_ptr, png_bytep row)</div><div class='ctx'>       png_ptr-&gt;row_info.width);</div><div class='ctx'> </div><div class='ctx'>    png_debug1(3, "row_info-&gt;color_type = %d", png_ptr-&gt;row_info.color_type);</div><div class='del'>-   png_debug1(3, "row_info-&gt;width = %lu", png_ptr-&gt;row_info.width);</div><div class='add'>+   png_debug1(3, "row_info-&gt;width = %u", png_ptr-&gt;row_info.width);</div><div class='ctx'>    png_debug1(3, "row_info-&gt;channels = %d", png_ptr-&gt;row_info.channels);</div><div class='ctx'>    png_debug1(3, "row_info-&gt;bit_depth = %d", png_ptr-&gt;row_info.bit_depth);</div><div class='ctx'>    png_debug1(3, "row_info-&gt;pixel_depth = %d", png_ptr-&gt;row_info.pixel_depth);</div><div class='del'>-   png_debug1(3, "row_info-&gt;rowbytes = %lu", png_ptr-&gt;row_info.rowbytes);</div><div class='add'>+   png_debug1(3, "row_info-&gt;rowbytes = %lu",</div><div class='add'>+       (unsigned long)png_ptr-&gt;row_info.rowbytes);</div><div class='ctx'> </div><div class='ctx'>    /* Copy user's row into buffer, leaving room for filter byte. */</div><div class='ctx'>    png_memcpy(png_ptr-&gt;row_buf + 1, row, png_ptr-&gt;row_info.rowbytes);</div><div class='hunk'>@@ -787,10 +792,10 @@ png_write_row(png_structp png_ptr, png_bytep row)</div><div class='ctx'> #ifdef PNG_WRITE_INTERLACING_SUPPORTED</div><div class='ctx'>    /* Handle interlacing */</div><div class='ctx'>    if (png_ptr-&gt;interlaced &amp;&amp; png_ptr-&gt;pass &lt; 6 &amp;&amp;</div><div class='del'>-      (png_ptr-&gt;transformations &amp; PNG_INTERLACE))</div><div class='add'>+       (png_ptr-&gt;transformations &amp; PNG_INTERLACE))</div><div class='ctx'>    {</div><div class='ctx'>       png_do_write_interlace(&amp;(png_ptr-&gt;row_info),</div><div class='del'>-         png_ptr-&gt;row_buf + 1, png_ptr-&gt;pass);</div><div class='add'>+          png_ptr-&gt;row_buf + 1, png_ptr-&gt;pass);</div><div class='ctx'>       /* This should always get caught above, but still ... */</div><div class='ctx'>       if (!(png_ptr-&gt;row_info.width))</div><div class='ctx'>       {</div><div class='hunk'>@@ -815,7 +820,7 @@ png_write_row(png_structp png_ptr, png_bytep row)</div><div class='ctx'>     * 5. The color_type is RGB or RGBA</div><div class='ctx'>     */</div><div class='ctx'>    if ((png_ptr-&gt;mng_features_permitted &amp; PNG_FLAG_MNG_FILTER_64) &amp;&amp;</div><div class='del'>-      (png_ptr-&gt;filter_type == PNG_INTRAPIXEL_DIFFERENCING))</div><div class='add'>+       (png_ptr-&gt;filter_type == PNG_INTRAPIXEL_DIFFERENCING))</div><div class='ctx'>    {</div><div class='ctx'>       /* Intrapixel differencing */</div><div class='ctx'>       png_do_write_intrapixel(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1);</div><div class='hunk'>@@ -838,6 +843,7 @@ png_set_flush(png_structp png_ptr, int nrows)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;flush_dist = (nrows &lt; 0 ? 0 : nrows);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -851,6 +857,7 @@ png_write_flush(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    /* We have already written out all of the data */</div><div class='ctx'>    if (png_ptr-&gt;row_number &gt;= png_ptr-&gt;num_rows)</div><div class='ctx'>       return;</div><div class='hunk'>@@ -868,6 +875,7 @@ png_write_flush(png_structp png_ptr)</div><div class='ctx'>       {</div><div class='ctx'>          if (png_ptr-&gt;zstream.msg != NULL)</div><div class='ctx'>             png_error(png_ptr, png_ptr-&gt;zstream.msg);</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             png_error(png_ptr, "zlib error");</div><div class='ctx'>       }</div><div class='hunk'>@@ -875,20 +883,19 @@ png_write_flush(png_structp png_ptr)</div><div class='ctx'>       if (!(png_ptr-&gt;zstream.avail_out))</div><div class='ctx'>       {</div><div class='ctx'>          /* Write the IDAT and reset the zlib output buffer */</div><div class='del'>-         png_write_IDAT(png_ptr, png_ptr-&gt;zbuf,</div><div class='del'>-                        png_ptr-&gt;zbuf_size);</div><div class='add'>+         png_write_IDAT(png_ptr, png_ptr-&gt;zbuf, png_ptr-&gt;zbuf_size);</div><div class='ctx'>          png_ptr-&gt;zstream.next_out = png_ptr-&gt;zbuf;</div><div class='ctx'>          png_ptr-&gt;zstream.avail_out = (uInt)png_ptr-&gt;zbuf_size;</div><div class='ctx'>          wrote_IDAT = 1;</div><div class='ctx'>       }</div><div class='del'>-   } while(wrote_IDAT == 1);</div><div class='add'>+   } while (wrote_IDAT == 1);</div><div class='ctx'> </div><div class='ctx'>    /* If there is any data left to be output, write it into a new IDAT */</div><div class='ctx'>    if (png_ptr-&gt;zbuf_size != png_ptr-&gt;zstream.avail_out)</div><div class='ctx'>    {</div><div class='ctx'>       /* Write the IDAT and reset the zlib output buffer */</div><div class='ctx'>       png_write_IDAT(png_ptr, png_ptr-&gt;zbuf,</div><div class='del'>-                     png_ptr-&gt;zbuf_size - png_ptr-&gt;zstream.avail_out);</div><div class='add'>+          png_ptr-&gt;zbuf_size - png_ptr-&gt;zstream.avail_out);</div><div class='ctx'>       png_ptr-&gt;zstream.next_out = png_ptr-&gt;zbuf;</div><div class='ctx'>       png_ptr-&gt;zstream.avail_out = (uInt)png_ptr-&gt;zbuf_size;</div><div class='ctx'>    }</div><div class='hunk'>@@ -934,20 +941,20 @@ png_destroy_write_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)</div><div class='ctx'>    {</div><div class='ctx'>       if (png_ptr != NULL)</div><div class='ctx'>       {</div><div class='del'>-        png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);</div><div class='add'>+         png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);</div><div class='ctx'> </div><div class='del'>-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED</div><div class='del'>-        if (png_ptr-&gt;num_chunk_list)</div><div class='del'>-        {</div><div class='del'>-           png_free(png_ptr, png_ptr-&gt;chunk_list);</div><div class='del'>-           png_ptr-&gt;num_chunk_list = 0;</div><div class='del'>-        }</div><div class='add'>+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED</div><div class='add'>+         if (png_ptr-&gt;num_chunk_list)</div><div class='add'>+         {</div><div class='add'>+            png_free(png_ptr, png_ptr-&gt;chunk_list);</div><div class='add'>+            png_ptr-&gt;num_chunk_list = 0;</div><div class='add'>+         }</div><div class='ctx'> #endif</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>       png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,</div><div class='del'>-         (png_voidp)mem_ptr);</div><div class='add'>+          (png_voidp)mem_ptr);</div><div class='ctx'> #else</div><div class='ctx'>       png_destroy_struct((png_voidp)info_ptr);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -959,7 +966,7 @@ png_destroy_write_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)</div><div class='ctx'>       png_write_destroy(png_ptr);</div><div class='ctx'> #ifdef PNG_USER_MEM_SUPPORTED</div><div class='ctx'>       png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,</div><div class='del'>-         (png_voidp)mem_ptr);</div><div class='add'>+          (png_voidp)mem_ptr);</div><div class='ctx'> #else</div><div class='ctx'>       png_destroy_struct((png_voidp)png_ptr);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1003,16 +1010,15 @@ png_write_destroy(png_structp png_ptr)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED</div><div class='del'>-   png_free(png_ptr, png_ptr-&gt;prev_filters);</div><div class='del'>-   png_free(png_ptr, png_ptr-&gt;filter_weights);</div><div class='del'>-   png_free(png_ptr, png_ptr-&gt;inv_filter_weights);</div><div class='add'>+   /* Use this to save a little code space, it doesn't free the filter_costs */</div><div class='add'>+   png_reset_filter_heuristics(png_ptr);</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;filter_costs);</div><div class='ctx'>    png_free(png_ptr, png_ptr-&gt;inv_filter_costs);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_SETJMP_SUPPORTED</div><div class='ctx'>    /* Reset structure */</div><div class='del'>-   png_memcpy(tmp_jmp, png_ptr-&gt;jmpbuf, png_sizeof(jmp_buf));</div><div class='add'>+   png_memcpy(tmp_jmp, png_ptr-&gt;png_jmpbuf, png_sizeof(jmp_buf));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>    error_fn = png_ptr-&gt;error_fn;</div><div class='hunk'>@@ -1032,7 +1038,7 @@ png_write_destroy(png_structp png_ptr)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_SETJMP_SUPPORTED</div><div class='del'>-   png_memcpy(png_ptr-&gt;jmpbuf, tmp_jmp, png_sizeof(jmp_buf));</div><div class='add'>+   png_memcpy(png_ptr-&gt;png_jmpbuf, tmp_jmp, png_sizeof(jmp_buf));</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1044,10 +1050,12 @@ png_set_filter(png_structp png_ptr, int method, int filters)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_MNG_FEATURES_SUPPORTED</div><div class='ctx'>    if ((png_ptr-&gt;mng_features_permitted &amp; PNG_FLAG_MNG_FILTER_64) &amp;&amp;</div><div class='del'>-      (method == PNG_INTRAPIXEL_DIFFERENCING))</div><div class='del'>-         method = PNG_FILTER_TYPE_BASE;</div><div class='add'>+       (method == PNG_INTRAPIXEL_DIFFERENCING))</div><div class='add'>+      method = PNG_FILTER_TYPE_BASE;</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'>    if (method == PNG_FILTER_TYPE_BASE)</div><div class='ctx'>    {</div><div class='hunk'>@@ -1059,19 +1067,26 @@ png_set_filter(png_structp png_ptr, int method, int filters)</div><div class='ctx'>          case 7: png_warning(png_ptr, "Unknown row filter for method 0");</div><div class='ctx'> #endif /* PNG_WRITE_FILTER_SUPPORTED */</div><div class='ctx'>          case PNG_FILTER_VALUE_NONE:</div><div class='del'>-              png_ptr-&gt;do_filter = PNG_FILTER_NONE; break;</div><div class='add'>+            png_ptr-&gt;do_filter = PNG_FILTER_NONE; break;</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_WRITE_FILTER_SUPPORTED</div><div class='ctx'>          case PNG_FILTER_VALUE_SUB:</div><div class='del'>-              png_ptr-&gt;do_filter = PNG_FILTER_SUB; break;</div><div class='add'>+            png_ptr-&gt;do_filter = PNG_FILTER_SUB; break;</div><div class='add'>+</div><div class='ctx'>          case PNG_FILTER_VALUE_UP:</div><div class='del'>-              png_ptr-&gt;do_filter = PNG_FILTER_UP; break;</div><div class='add'>+            png_ptr-&gt;do_filter = PNG_FILTER_UP; break;</div><div class='add'>+</div><div class='ctx'>          case PNG_FILTER_VALUE_AVG:</div><div class='del'>-              png_ptr-&gt;do_filter = PNG_FILTER_AVG; break;</div><div class='add'>+            png_ptr-&gt;do_filter = PNG_FILTER_AVG; break;</div><div class='add'>+</div><div class='ctx'>          case PNG_FILTER_VALUE_PAETH:</div><div class='del'>-              png_ptr-&gt;do_filter = PNG_FILTER_PAETH; break;</div><div class='del'>-         default: png_ptr-&gt;do_filter = (png_byte)filters; break;</div><div class='add'>+            png_ptr-&gt;do_filter = PNG_FILTER_PAETH; break;</div><div class='add'>+</div><div class='add'>+         default:</div><div class='add'>+            png_ptr-&gt;do_filter = (png_byte)filters; break;</div><div class='ctx'> #else</div><div class='del'>-         default: png_warning(png_ptr, "Unknown row filter for method 0");</div><div class='add'>+         default:</div><div class='add'>+            png_warning(png_ptr, "Unknown row filter for method 0");</div><div class='ctx'> #endif /* PNG_WRITE_FILTER_SUPPORTED */</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='hunk'>@@ -1090,7 +1105,7 @@ png_set_filter(png_structp png_ptr, int method, int filters)</div><div class='ctx'>          if ((png_ptr-&gt;do_filter &amp; PNG_FILTER_SUB) &amp;&amp; png_ptr-&gt;sub_row == NULL)</div><div class='ctx'>          {</div><div class='ctx'>             png_ptr-&gt;sub_row = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-              (png_ptr-&gt;rowbytes + 1));</div><div class='add'>+                (png_ptr-&gt;rowbytes + 1));</div><div class='ctx'>             png_ptr-&gt;sub_row[0] = PNG_FILTER_VALUE_SUB;</div><div class='ctx'>          }</div><div class='ctx'> </div><div class='hunk'>@@ -1099,12 +1114,14 @@ png_set_filter(png_structp png_ptr, int method, int filters)</div><div class='ctx'>             if (png_ptr-&gt;prev_row == NULL)</div><div class='ctx'>             {</div><div class='ctx'>                png_warning(png_ptr, "Can't add Up filter after starting");</div><div class='del'>-               png_ptr-&gt;do_filter &amp;= ~PNG_FILTER_UP;</div><div class='add'>+               png_ptr-&gt;do_filter = (png_byte)(png_ptr-&gt;do_filter &amp;</div><div class='add'>+                   ~PNG_FILTER_UP);</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'>             {</div><div class='ctx'>                png_ptr-&gt;up_row = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-                  (png_ptr-&gt;rowbytes + 1));</div><div class='add'>+                   (png_ptr-&gt;rowbytes + 1));</div><div class='ctx'>                png_ptr-&gt;up_row[0] = PNG_FILTER_VALUE_UP;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='hunk'>@@ -1114,12 +1131,14 @@ png_set_filter(png_structp png_ptr, int method, int filters)</div><div class='ctx'>             if (png_ptr-&gt;prev_row == NULL)</div><div class='ctx'>             {</div><div class='ctx'>                png_warning(png_ptr, "Can't add Average filter after starting");</div><div class='del'>-               png_ptr-&gt;do_filter &amp;= ~PNG_FILTER_AVG;</div><div class='add'>+               png_ptr-&gt;do_filter = (png_byte)(png_ptr-&gt;do_filter &amp;</div><div class='add'>+                   ~PNG_FILTER_AVG);</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'>             {</div><div class='ctx'>                png_ptr-&gt;avg_row = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-                  (png_ptr-&gt;rowbytes + 1));</div><div class='add'>+                   (png_ptr-&gt;rowbytes + 1));</div><div class='ctx'>                png_ptr-&gt;avg_row[0] = PNG_FILTER_VALUE_AVG;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='hunk'>@@ -1132,10 +1151,11 @@ png_set_filter(png_structp png_ptr, int method, int filters)</div><div class='ctx'>                png_warning(png_ptr, "Can't add Paeth filter after starting");</div><div class='ctx'>                png_ptr-&gt;do_filter &amp;= (png_byte)(~PNG_FILTER_PAETH);</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             else</div><div class='ctx'>             {</div><div class='ctx'>                png_ptr-&gt;paeth_row = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-                  (png_ptr-&gt;rowbytes + 1));</div><div class='add'>+                   (png_ptr-&gt;rowbytes + 1));</div><div class='ctx'>                png_ptr-&gt;paeth_row[0] = PNG_FILTER_VALUE_PAETH;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='hunk'>@@ -1157,123 +1177,242 @@ png_set_filter(png_structp png_ptr, int method, int filters)</div><div class='ctx'>  * better compression.</div><div class='ctx'>  */</div><div class='ctx'> #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED      /* GRR 970116 */</div><div class='del'>-void PNGAPI</div><div class='del'>-png_set_filter_heuristics(png_structp png_ptr, int heuristic_method,</div><div class='del'>-   int num_weights, png_doublep filter_weights,</div><div class='del'>-   png_doublep filter_costs)</div><div class='add'>+/* Conveneince reset API. */</div><div class='add'>+static void</div><div class='add'>+png_reset_filter_heuristics(png_structp png_ptr)</div><div class='ctx'> {</div><div class='del'>-   int i;</div><div class='del'>-</div><div class='del'>-   png_debug(1, "in png_set_filter_heuristics");</div><div class='del'>-</div><div class='del'>-   if (png_ptr == NULL)</div><div class='del'>-      return;</div><div class='del'>-   if (heuristic_method &gt;= PNG_FILTER_HEURISTIC_LAST)</div><div class='add'>+   /* Clear out any old values in the 'weights' - this must be done because if</div><div class='add'>+    * the app calls set_filter_heuristics multiple times with different</div><div class='add'>+    * 'num_weights' values we would otherwise potentially have wrong sized</div><div class='add'>+    * arrays.</div><div class='add'>+    */</div><div class='add'>+   png_ptr-&gt;num_prev_filters = 0;</div><div class='add'>+   png_ptr-&gt;heuristic_method = PNG_FILTER_HEURISTIC_UNWEIGHTED;</div><div class='add'>+   if (png_ptr-&gt;prev_filters != NULL)</div><div class='ctx'>    {</div><div class='del'>-      png_warning(png_ptr, "Unknown filter heuristic method");</div><div class='del'>-      return;</div><div class='add'>+      png_bytep old = png_ptr-&gt;prev_filters;</div><div class='add'>+      png_ptr-&gt;prev_filters = NULL;</div><div class='add'>+      png_free(png_ptr, old);</div><div class='ctx'>    }</div><div class='del'>-</div><div class='del'>-   if (heuristic_method == PNG_FILTER_HEURISTIC_DEFAULT)</div><div class='add'>+   if (png_ptr-&gt;filter_weights != NULL)</div><div class='ctx'>    {</div><div class='del'>-      heuristic_method = PNG_FILTER_HEURISTIC_UNWEIGHTED;</div><div class='add'>+      png_uint_16p old = png_ptr-&gt;filter_weights;</div><div class='add'>+      png_ptr-&gt;filter_weights = NULL;</div><div class='add'>+      png_free(png_ptr, old);</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-   if (num_weights &lt; 0 || filter_weights == NULL ||</div><div class='del'>-      heuristic_method == PNG_FILTER_HEURISTIC_UNWEIGHTED)</div><div class='add'>+   if (png_ptr-&gt;inv_filter_weights != NULL)</div><div class='ctx'>    {</div><div class='del'>-      num_weights = 0;</div><div class='add'>+      png_uint_16p old = png_ptr-&gt;inv_filter_weights;</div><div class='add'>+      png_ptr-&gt;inv_filter_weights = NULL;</div><div class='add'>+      png_free(png_ptr, old);</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-   png_ptr-&gt;num_prev_filters = (png_byte)num_weights;</div><div class='del'>-   png_ptr-&gt;heuristic_method = (png_byte)heuristic_method;</div><div class='add'>+   /* Leave the filter_costs - this array is fixed size. */</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-   if (num_weights &gt; 0)</div><div class='add'>+static int</div><div class='add'>+png_init_filter_heuristics(png_structp png_ptr, int heuristic_method,</div><div class='add'>+   int num_weights)</div><div class='add'>+{</div><div class='add'>+   if (png_ptr == NULL)</div><div class='add'>+      return 0;</div><div class='add'>+</div><div class='add'>+   /* Clear out the arrays */</div><div class='add'>+   png_reset_filter_heuristics(png_ptr);</div><div class='add'>+</div><div class='add'>+   /* Check arguments; the 'reset' function makes the correct settings for the</div><div class='add'>+    * unweighted case, but we must handle the weight case by initializing the</div><div class='add'>+    * arrays for the caller.</div><div class='add'>+    */</div><div class='add'>+   if (heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)</div><div class='ctx'>    {</div><div class='del'>-      if (png_ptr-&gt;prev_filters == NULL)</div><div class='add'>+      int i;</div><div class='add'>+</div><div class='add'>+      if (num_weights &gt; 0)</div><div class='ctx'>       {</div><div class='ctx'>          png_ptr-&gt;prev_filters = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-            (png_uint_32)(png_sizeof(png_byte) * num_weights));</div><div class='add'>+             (png_uint_32)(png_sizeof(png_byte) * num_weights));</div><div class='ctx'> </div><div class='ctx'>          /* To make sure that the weighting starts out fairly */</div><div class='ctx'>          for (i = 0; i &lt; num_weights; i++)</div><div class='ctx'>          {</div><div class='ctx'>             png_ptr-&gt;prev_filters[i] = 255;</div><div class='ctx'>          }</div><div class='del'>-      }</div><div class='ctx'> </div><div class='del'>-      if (png_ptr-&gt;filter_weights == NULL)</div><div class='del'>-      {</div><div class='ctx'>          png_ptr-&gt;filter_weights = (png_uint_16p)png_malloc(png_ptr,</div><div class='del'>-            (png_uint_32)(png_sizeof(png_uint_16) * num_weights));</div><div class='add'>+             (png_uint_32)(png_sizeof(png_uint_16) * num_weights));</div><div class='ctx'> </div><div class='ctx'>          png_ptr-&gt;inv_filter_weights = (png_uint_16p)png_malloc(png_ptr,</div><div class='del'>-            (png_uint_32)(png_sizeof(png_uint_16) * num_weights));</div><div class='add'>+             (png_uint_32)(png_sizeof(png_uint_16) * num_weights));</div><div class='add'>+</div><div class='ctx'>          for (i = 0; i &lt; num_weights; i++)</div><div class='ctx'>          {</div><div class='ctx'>             png_ptr-&gt;inv_filter_weights[i] =</div><div class='ctx'>             png_ptr-&gt;filter_weights[i] = PNG_WEIGHT_FACTOR;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='add'>+         /* Safe to set this now */</div><div class='add'>+         png_ptr-&gt;num_prev_filters = (png_byte)num_weights;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* If, in the future, there are other filter methods, this would</div><div class='add'>+       * need to be based on png_ptr-&gt;filter.</div><div class='add'>+       */</div><div class='add'>+      if (png_ptr-&gt;filter_costs == NULL)</div><div class='add'>+      {</div><div class='add'>+         png_ptr-&gt;filter_costs = (png_uint_16p)png_malloc(png_ptr,</div><div class='add'>+             (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));</div><div class='add'>+</div><div class='add'>+         png_ptr-&gt;inv_filter_costs = (png_uint_16p)png_malloc(png_ptr,</div><div class='add'>+             (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      for (i = 0; i &lt; PNG_FILTER_VALUE_LAST; i++)</div><div class='add'>+      {</div><div class='add'>+         png_ptr-&gt;inv_filter_costs[i] =</div><div class='add'>+         png_ptr-&gt;filter_costs[i] = PNG_COST_FACTOR;</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='add'>+      /* All the arrays are inited, safe to set this: */</div><div class='add'>+      png_ptr-&gt;heuristic_method = PNG_FILTER_HEURISTIC_WEIGHTED;</div><div class='add'>+</div><div class='add'>+      /* Return the 'ok' code. */</div><div class='add'>+      return 1;</div><div class='add'>+   }</div><div class='add'>+   else if (heuristic_method == PNG_FILTER_HEURISTIC_DEFAULT ||</div><div class='add'>+      heuristic_method == PNG_FILTER_HEURISTIC_UNWEIGHTED)</div><div class='add'>+   {</div><div class='add'>+      return 1;</div><div class='add'>+   }</div><div class='add'>+   else</div><div class='add'>+   {</div><div class='add'>+      png_warning(png_ptr, "Unknown filter heuristic method");</div><div class='add'>+      return 0;</div><div class='add'>+   }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Provide floating and fixed point APIs */</div><div class='add'>+#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='add'>+void PNGAPI</div><div class='add'>+png_set_filter_heuristics(png_structp png_ptr, int heuristic_method,</div><div class='add'>+    int num_weights, png_const_doublep filter_weights,</div><div class='add'>+    png_const_doublep filter_costs)</div><div class='add'>+{</div><div class='add'>+   png_debug(1, "in png_set_filter_heuristics");</div><div class='add'>+</div><div class='add'>+   /* The internal API allocates all the arrays and ensures that the elements of</div><div class='add'>+    * those arrays are set to the default value.</div><div class='add'>+    */</div><div class='add'>+   if (!png_init_filter_heuristics(png_ptr, heuristic_method, num_weights))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   /* If using the weighted method copy in the weights. */</div><div class='add'>+   if (heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)</div><div class='add'>+   {</div><div class='add'>+      int i;</div><div class='ctx'>       for (i = 0; i &lt; num_weights; i++)</div><div class='ctx'>       {</div><div class='del'>-         if (filter_weights[i] &lt; 0.0)</div><div class='add'>+         if (filter_weights[i] &lt;= 0.0)</div><div class='ctx'>          {</div><div class='ctx'>             png_ptr-&gt;inv_filter_weights[i] =</div><div class='ctx'>             png_ptr-&gt;filter_weights[i] = PNG_WEIGHT_FACTOR;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>          {</div><div class='ctx'>             png_ptr-&gt;inv_filter_weights[i] =</div><div class='del'>-               (png_uint_16)((double)PNG_WEIGHT_FACTOR*filter_weights[i]+0.5);</div><div class='add'>+                (png_uint_16)(PNG_WEIGHT_FACTOR*filter_weights[i]+.5);</div><div class='add'>+</div><div class='ctx'>             png_ptr-&gt;filter_weights[i] =</div><div class='del'>-               (png_uint_16)((double)PNG_WEIGHT_FACTOR/filter_weights[i]+0.5);</div><div class='add'>+                (png_uint_16)(PNG_WEIGHT_FACTOR/filter_weights[i]+.5);</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='del'>-   }</div><div class='del'>-</div><div class='del'>-   /* If, in the future, there are other filter methods, this would</div><div class='del'>-    * need to be based on png_ptr-&gt;filter.</div><div class='del'>-    */</div><div class='del'>-   if (png_ptr-&gt;filter_costs == NULL)</div><div class='del'>-   {</div><div class='del'>-      png_ptr-&gt;filter_costs = (png_uint_16p)png_malloc(png_ptr,</div><div class='del'>-         (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));</div><div class='del'>-</div><div class='del'>-      png_ptr-&gt;inv_filter_costs = (png_uint_16p)png_malloc(png_ptr,</div><div class='del'>-         (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));</div><div class='ctx'> </div><div class='del'>-      for (i = 0; i &lt; PNG_FILTER_VALUE_LAST; i++)</div><div class='add'>+      /* Here is where we set the relative costs of the different filters.  We</div><div class='add'>+       * should take the desired compression level into account when setting</div><div class='add'>+       * the costs, so that Paeth, for instance, has a high relative cost at low</div><div class='add'>+       * compression levels, while it has a lower relative cost at higher</div><div class='add'>+       * compression settings.  The filter types are in order of increasing</div><div class='add'>+       * relative cost, so it would be possible to do this with an algorithm.</div><div class='add'>+       */</div><div class='add'>+      for (i = 0; i &lt; PNG_FILTER_VALUE_LAST; i++) if (filter_costs[i] &gt;= 1.0)</div><div class='ctx'>       {</div><div class='ctx'>          png_ptr-&gt;inv_filter_costs[i] =</div><div class='del'>-         png_ptr-&gt;filter_costs[i] = PNG_COST_FACTOR;</div><div class='add'>+             (png_uint_16)(PNG_COST_FACTOR / filter_costs[i] + .5);</div><div class='add'>+</div><div class='add'>+         png_ptr-&gt;filter_costs[i] =</div><div class='add'>+             (png_uint_16)(PNG_COST_FACTOR * filter_costs[i] + .5);</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='add'>+}</div><div class='add'>+#endif /* FLOATING_POINT */</div><div class='add'>+</div><div class='add'>+#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='add'>+void PNGAPI</div><div class='add'>+png_set_filter_heuristics_fixed(png_structp png_ptr, int heuristic_method,</div><div class='add'>+    int num_weights, png_const_fixed_point_p filter_weights,</div><div class='add'>+    png_const_fixed_point_p filter_costs)</div><div class='add'>+{</div><div class='add'>+   png_debug(1, "in png_set_filter_heuristics_fixed");</div><div class='ctx'> </div><div class='del'>-   /* Here is where we set the relative costs of the different filters.  We</div><div class='del'>-    * should take the desired compression level into account when setting</div><div class='del'>-    * the costs, so that Paeth, for instance, has a high relative cost at low</div><div class='del'>-    * compression levels, while it has a lower relative cost at higher</div><div class='del'>-    * compression settings.  The filter types are in order of increasing</div><div class='del'>-    * relative cost, so it would be possible to do this with an algorithm.</div><div class='add'>+   /* The internal API allocates all the arrays and ensures that the elements of</div><div class='add'>+    * those arrays are set to the default value.</div><div class='ctx'>     */</div><div class='del'>-   for (i = 0; i &lt; PNG_FILTER_VALUE_LAST; i++)</div><div class='add'>+   if (!png_init_filter_heuristics(png_ptr, heuristic_method, num_weights))</div><div class='add'>+      return;</div><div class='add'>+</div><div class='add'>+   /* If using the weighted method copy in the weights. */</div><div class='add'>+   if (heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)</div><div class='ctx'>    {</div><div class='del'>-      if (filter_costs == NULL || filter_costs[i] &lt; 0.0)</div><div class='add'>+      int i;</div><div class='add'>+      for (i = 0; i &lt; num_weights; i++)</div><div class='ctx'>       {</div><div class='del'>-         png_ptr-&gt;inv_filter_costs[i] =</div><div class='del'>-         png_ptr-&gt;filter_costs[i] = PNG_COST_FACTOR;</div><div class='add'>+         if (filter_weights[i] &lt;= 0)</div><div class='add'>+         {</div><div class='add'>+            png_ptr-&gt;inv_filter_weights[i] =</div><div class='add'>+            png_ptr-&gt;filter_weights[i] = PNG_WEIGHT_FACTOR;</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         else</div><div class='add'>+         {</div><div class='add'>+            png_ptr-&gt;inv_filter_weights[i] = (png_uint_16)</div><div class='add'>+               ((PNG_WEIGHT_FACTOR*filter_weights[i]+PNG_FP_HALF)/PNG_FP_1);</div><div class='add'>+</div><div class='add'>+            png_ptr-&gt;filter_weights[i] = (png_uint_16)((PNG_WEIGHT_FACTOR*</div><div class='add'>+               PNG_FP_1+(filter_weights[i]/2))/filter_weights[i]);</div><div class='add'>+         }</div><div class='ctx'>       }</div><div class='del'>-      else if (filter_costs[i] &gt;= 1.0)</div><div class='add'>+</div><div class='add'>+      /* Here is where we set the relative costs of the different filters.  We</div><div class='add'>+       * should take the desired compression level into account when setting</div><div class='add'>+       * the costs, so that Paeth, for instance, has a high relative cost at low</div><div class='add'>+       * compression levels, while it has a lower relative cost at higher</div><div class='add'>+       * compression settings.  The filter types are in order of increasing</div><div class='add'>+       * relative cost, so it would be possible to do this with an algorithm.</div><div class='add'>+       */</div><div class='add'>+      for (i = 0; i &lt; PNG_FILTER_VALUE_LAST; i++)</div><div class='add'>+         if (filter_costs[i] &gt;= PNG_FP_1)</div><div class='ctx'>       {</div><div class='del'>-         png_ptr-&gt;inv_filter_costs[i] =</div><div class='del'>-            (png_uint_16)((double)PNG_COST_FACTOR / filter_costs[i] + 0.5);</div><div class='del'>-         png_ptr-&gt;filter_costs[i] =</div><div class='del'>-            (png_uint_16)((double)PNG_COST_FACTOR * filter_costs[i] + 0.5);</div><div class='add'>+         png_uint_32 tmp;</div><div class='add'>+</div><div class='add'>+         /* Use a 32 bit unsigned temporary here because otherwise the</div><div class='add'>+          * intermediate value will be a 32 bit *signed* integer (ANSI rules)</div><div class='add'>+          * and this will get the wrong answer on division.</div><div class='add'>+          */</div><div class='add'>+         tmp = PNG_COST_FACTOR*PNG_FP_1 + (filter_costs[i]/2);</div><div class='add'>+         tmp /= filter_costs[i];</div><div class='add'>+</div><div class='add'>+         png_ptr-&gt;inv_filter_costs[i] = (png_uint_16)tmp;</div><div class='add'>+</div><div class='add'>+         tmp = PNG_COST_FACTOR * filter_costs[i] + PNG_FP_HALF;</div><div class='add'>+         tmp /= PNG_FP_1;</div><div class='add'>+</div><div class='add'>+         png_ptr-&gt;filter_costs[i] = (png_uint_16)tmp;</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='add'>+#endif /* FIXED_POINT */</div><div class='ctx'> #endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */</div><div class='ctx'> </div><div class='ctx'> void PNGAPI</div><div class='hunk'>@@ -1283,6 +1422,7 @@ png_set_compression_level(png_structp png_ptr, int level)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;flags |= PNG_FLAG_ZLIB_CUSTOM_LEVEL;</div><div class='ctx'>    png_ptr-&gt;zlib_level = level;</div><div class='ctx'> }</div><div class='hunk'>@@ -1294,6 +1434,7 @@ png_set_compression_mem_level(png_structp png_ptr, int mem_level)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;flags |= PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL;</div><div class='ctx'>    png_ptr-&gt;zlib_mem_level = mem_level;</div><div class='ctx'> }</div><div class='hunk'>@@ -1305,6 +1446,7 @@ png_set_compression_strategy(png_structp png_ptr, int strategy)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;flags |= PNG_FLAG_ZLIB_CUSTOM_STRATEGY;</div><div class='ctx'>    png_ptr-&gt;zlib_strategy = strategy;</div><div class='ctx'> }</div><div class='hunk'>@@ -1314,17 +1456,21 @@ png_set_compression_window_bits(png_structp png_ptr, int window_bits)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    if (window_bits &gt; 15)</div><div class='ctx'>       png_warning(png_ptr, "Only compression windows &lt;= 32k supported by PNG");</div><div class='add'>+</div><div class='ctx'>    else if (window_bits &lt; 8)</div><div class='ctx'>       png_warning(png_ptr, "Only compression windows &gt;= 256 supported by PNG");</div><div class='add'>+</div><div class='ctx'> #ifndef WBITS_8_OK</div><div class='ctx'>    /* Avoid libpng bug with 256-byte windows */</div><div class='ctx'>    if (window_bits == 8)</div><div class='del'>-     {</div><div class='del'>-       png_warning(png_ptr, "Compression window is being reset to 512");</div><div class='del'>-       window_bits = 9;</div><div class='del'>-     }</div><div class='add'>+      {</div><div class='add'>+        png_warning(png_ptr, "Compression window is being reset to 512");</div><div class='add'>+        window_bits = 9;</div><div class='add'>+      }</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'>    png_ptr-&gt;flags |= PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS;</div><div class='ctx'>    png_ptr-&gt;zlib_window_bits = window_bits;</div><div class='hunk'>@@ -1337,8 +1483,10 @@ png_set_compression_method(png_structp png_ptr, int method)</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    if (method != 8)</div><div class='ctx'>       png_warning(png_ptr, "Only compression method 8 is supported by PNG");</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;flags |= PNG_FLAG_ZLIB_CUSTOM_METHOD;</div><div class='ctx'>    png_ptr-&gt;zlib_method = method;</div><div class='ctx'> }</div><div class='hunk'>@@ -1348,18 +1496,20 @@ png_set_write_status_fn(png_structp png_ptr, png_write_status_ptr write_row_fn)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;write_row_fn = write_row_fn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_set_write_user_transform_fn(png_structp png_ptr, png_user_transform_ptr</div><div class='del'>-   write_user_transform_fn)</div><div class='add'>+    write_user_transform_fn)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_set_write_user_transform_fn");</div><div class='ctx'> </div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;transformations |= PNG_USER_TRANSFORM;</div><div class='ctx'>    png_ptr-&gt;write_user_transform_fn = write_user_transform_fn;</div><div class='ctx'> }</div><div class='hunk'>@@ -1369,7 +1519,7 @@ png_set_write_user_transform_fn(png_structp png_ptr, png_user_transform_ptr</div><div class='ctx'> #ifdef PNG_INFO_IMAGE_SUPPORTED</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_write_png(png_structp png_ptr, png_infop info_ptr,</div><div class='del'>-              int transforms, voidp params)</div><div class='add'>+    int transforms, voidp params)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL || info_ptr == NULL)</div><div class='ctx'>       return;</div><div class='hunk'>@@ -1390,7 +1540,7 @@ png_write_png(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>     * as appropriate to correctly scale the image.</div><div class='ctx'>     */</div><div class='ctx'>    if ((transforms &amp; PNG_TRANSFORM_SHIFT)</div><div class='del'>-               &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_sBIT))</div><div class='add'>+       &amp;&amp; (info_ptr-&gt;valid &amp; PNG_INFO_sBIT))</div><div class='ctx'>       png_set_shift(png_ptr, &amp;info_ptr-&gt;sig_bit);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1410,6 +1560,7 @@ png_write_png(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>    /* Pack XRGB/RGBX/ARGB/RGBA into * RGB (4 channels -&gt; 3 channels) */</div><div class='ctx'>    if (transforms &amp; PNG_TRANSFORM_STRIP_FILLER_AFTER)</div><div class='ctx'>       png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);</div><div class='add'>+</div><div class='ctx'>    else if (transforms &amp; PNG_TRANSFORM_STRIP_FILLER_BEFORE)</div><div class='ctx'>       png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1447,8 +1598,8 @@ png_write_png(png_structp png_ptr, png_infop info_ptr,</div><div class='ctx'>    /* It is REQUIRED to call this to finish writing the rest of the file */</div><div class='ctx'>    png_write_end(png_ptr, info_ptr);</div><div class='ctx'> </div><div class='del'>-   transforms = transforms; /* Quiet compiler warnings */</div><div class='del'>-   params = params;</div><div class='add'>+   PNG_UNUSED(transforms)   /* Quiet compiler warnings */</div><div class='add'>+   PNG_UNUSED(params)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> #endif /* PNG_WRITE_SUPPORTED */</div><div class='head'>diff --git a/src/3rdparty/libpng/pngwtran.c b/src/3rdparty/libpng/pngwtran.c<br/>index 9c8a6e7..115ca37 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngwtran.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngwtran.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngwtran.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngwtran.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> </div><div class='ctx'> /* pngwtran.c - transforms the data in a row for PNG writers</div><div class='ctx'>  *</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Last changed in libpng 1.5.0 [January 6, 2011]</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,11 +11,10 @@</div><div class='ctx'>  * and license in png.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define PNG_NO_PEDANTIC_WARNINGS</div><div class='del'>-#include "png.h"</div><div class='del'>-#ifdef PNG_WRITE_SUPPORTED</div><div class='ctx'> #include "pngpriv.h"</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_WRITE_SUPPORTED</div><div class='add'>+</div><div class='ctx'> /* Transform the data according to the user's wishes.  The order of</div><div class='ctx'>  * transformations is significant.</div><div class='ctx'>  */</div><div class='hunk'>@@ -30,52 +29,62 @@ png_do_write_transformations(png_structp png_ptr)</div><div class='ctx'> #ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_USER_TRANSFORM)</div><div class='ctx'>       if (png_ptr-&gt;write_user_transform_fn != NULL)</div><div class='del'>-        (*(png_ptr-&gt;write_user_transform_fn)) /* User write transform function */</div><div class='del'>-          (png_ptr,                    /* png_ptr */</div><div class='del'>-           &amp;(png_ptr-&gt;row_info),       /* row_info:     */</div><div class='del'>-             /*  png_uint_32 width;          width of row */</div><div class='del'>-             /*  png_uint_32 rowbytes;       number of bytes in row */</div><div class='del'>-             /*  png_byte color_type;        color type of pixels */</div><div class='del'>-             /*  png_byte bit_depth;         bit depth of samples */</div><div class='del'>-             /*  png_byte channels;          number of channels (1-4) */</div><div class='del'>-             /*  png_byte pixel_depth;       bits per pixel (depth*channels) */</div><div class='del'>-           png_ptr-&gt;row_buf + 1);      /* start of pixel data for row */</div><div class='add'>+         (*(png_ptr-&gt;write_user_transform_fn)) /* User write transform</div><div class='add'>+                                                 function */</div><div class='add'>+             (png_ptr,                    /* png_ptr */</div><div class='add'>+             &amp;(png_ptr-&gt;row_info),           /* row_info: */</div><div class='add'>+                /*  png_uint_32 width;       width of row */</div><div class='add'>+                /*  png_size_t rowbytes;     number of bytes in row */</div><div class='add'>+                /*  png_byte color_type;     color type of pixels */</div><div class='add'>+                /*  png_byte bit_depth;      bit depth of samples */</div><div class='add'>+                /*  png_byte channels;       number of channels (1-4) */</div><div class='add'>+                /*  png_byte pixel_depth;    bits per pixel (depth*channels) */</div><div class='add'>+             png_ptr-&gt;row_buf + 1);      /* start of pixel data for row */</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_WRITE_FILLER_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_FILLER)</div><div class='ctx'>       png_do_strip_filler(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1,</div><div class='del'>-         png_ptr-&gt;flags);</div><div class='add'>+          png_ptr-&gt;flags);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_WRITE_PACKSWAP_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_PACKSWAP)</div><div class='ctx'>       png_do_packswap(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_WRITE_PACK_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_PACK)</div><div class='ctx'>       png_do_pack(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1,</div><div class='del'>-         (png_uint_32)png_ptr-&gt;bit_depth);</div><div class='add'>+          (png_uint_32)png_ptr-&gt;bit_depth);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_WRITE_SWAP_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_SWAP_BYTES)</div><div class='ctx'>       png_do_swap(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_WRITE_SHIFT_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_SHIFT)</div><div class='ctx'>       png_do_shift(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1,</div><div class='del'>-         &amp;(png_ptr-&gt;shift));</div><div class='add'>+          &amp;(png_ptr-&gt;shift));</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_SWAP_ALPHA)</div><div class='ctx'>       png_do_write_swap_alpha(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_INVERT_ALPHA)</div><div class='ctx'>       png_do_write_invert_alpha(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_WRITE_BGR_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_BGR)</div><div class='ctx'>       png_do_bgr(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifdef PNG_WRITE_INVERT_SUPPORTED</div><div class='ctx'>    if (png_ptr-&gt;transformations &amp; PNG_INVERT_MONO)</div><div class='ctx'>       png_do_invert(&amp;(png_ptr-&gt;row_info), png_ptr-&gt;row_buf + 1);</div><div class='hunk'>@@ -113,9 +122,12 @@ png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)</div><div class='ctx'>             {</div><div class='ctx'>                if (*sp != 0)</div><div class='ctx'>                   v |= mask;</div><div class='add'>+</div><div class='ctx'>                sp++;</div><div class='add'>+</div><div class='ctx'>                if (mask &gt; 1)</div><div class='ctx'>                   mask &gt;&gt;= 1;</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                {</div><div class='ctx'>                   mask = 0x80;</div><div class='hunk'>@@ -124,10 +136,13 @@ png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)</div><div class='ctx'>                   v = 0;</div><div class='ctx'>                }</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             if (mask != 0x80)</div><div class='ctx'>                *dp = (png_byte)v;</div><div class='add'>+</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          case 2:</div><div class='ctx'>          {</div><div class='ctx'>             png_bytep sp, dp;</div><div class='hunk'>@@ -139,12 +154,14 @@ png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)</div><div class='ctx'>             dp = row;</div><div class='ctx'>             shift = 6;</div><div class='ctx'>             v = 0;</div><div class='add'>+</div><div class='ctx'>             for (i = 0; i &lt; row_width; i++)</div><div class='ctx'>             {</div><div class='ctx'>                png_byte value;</div><div class='ctx'> </div><div class='ctx'>                value = (png_byte)(*sp &amp; 0x03);</div><div class='ctx'>                v |= (value &lt;&lt; shift);</div><div class='add'>+</div><div class='ctx'>                if (shift == 0)</div><div class='ctx'>                {</div><div class='ctx'>                   shift = 6;</div><div class='hunk'>@@ -152,14 +169,19 @@ png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)</div><div class='ctx'>                   dp++;</div><div class='ctx'>                   v = 0;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   shift -= 2;</div><div class='add'>+</div><div class='ctx'>                sp++;</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             if (shift != 6)</div><div class='ctx'>                *dp = (png_byte)v;</div><div class='add'>+</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          case 4:</div><div class='ctx'>          {</div><div class='ctx'>             png_bytep sp, dp;</div><div class='hunk'>@@ -171,6 +193,7 @@ png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)</div><div class='ctx'>             dp = row;</div><div class='ctx'>             shift = 4;</div><div class='ctx'>             v = 0;</div><div class='add'>+</div><div class='ctx'>             for (i = 0; i &lt; row_width; i++)</div><div class='ctx'>             {</div><div class='ctx'>                png_byte value;</div><div class='hunk'>@@ -185,20 +208,27 @@ png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)</div><div class='ctx'>                   dp++;</div><div class='ctx'>                   v = 0;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   shift -= 4;</div><div class='ctx'> </div><div class='ctx'>                sp++;</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             if (shift != 4)</div><div class='ctx'>                *dp = (png_byte)v;</div><div class='add'>+</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='add'>+         default:</div><div class='add'>+            break;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       row_info-&gt;bit_depth = (png_byte)bit_depth;</div><div class='ctx'>       row_info-&gt;pixel_depth = (png_byte)(bit_depth * row_info-&gt;channels);</div><div class='ctx'>       row_info-&gt;rowbytes = PNG_ROWBYTES(row_info-&gt;pixel_depth,</div><div class='del'>-         row_info-&gt;width);</div><div class='add'>+          row_info-&gt;width);</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -212,12 +242,12 @@ png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)</div><div class='ctx'>  * data to 0 to 15.</div><div class='ctx'>  */</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_do_shift(png_row_infop row_info, png_bytep row, png_color_8p bit_depth)</div><div class='add'>+png_do_shift(png_row_infop row_info, png_bytep row,</div><div class='add'>+    png_const_color_8p bit_depth)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_do_shift");</div><div class='ctx'> </div><div class='del'>-   if (</div><div class='del'>-      row_info-&gt;color_type != PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+   if (row_info-&gt;color_type != PNG_COLOR_TYPE_PALETTE)</div><div class='ctx'>    {</div><div class='ctx'>       int shift_start[4], shift_dec[4];</div><div class='ctx'>       int channels = 0;</div><div class='hunk'>@@ -227,19 +257,23 @@ png_do_shift(png_row_infop row_info, png_bytep row, png_color_8p bit_depth)</div><div class='ctx'>          shift_start[channels] = row_info-&gt;bit_depth - bit_depth-&gt;red;</div><div class='ctx'>          shift_dec[channels] = bit_depth-&gt;red;</div><div class='ctx'>          channels++;</div><div class='add'>+</div><div class='ctx'>          shift_start[channels] = row_info-&gt;bit_depth - bit_depth-&gt;green;</div><div class='ctx'>          shift_dec[channels] = bit_depth-&gt;green;</div><div class='ctx'>          channels++;</div><div class='add'>+</div><div class='ctx'>          shift_start[channels] = row_info-&gt;bit_depth - bit_depth-&gt;blue;</div><div class='ctx'>          shift_dec[channels] = bit_depth-&gt;blue;</div><div class='ctx'>          channels++;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          shift_start[channels] = row_info-&gt;bit_depth - bit_depth-&gt;gray;</div><div class='ctx'>          shift_dec[channels] = bit_depth-&gt;gray;</div><div class='ctx'>          channels++;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       if (row_info-&gt;color_type &amp; PNG_COLOR_MASK_ALPHA)</div><div class='ctx'>       {</div><div class='ctx'>          shift_start[channels] = row_info-&gt;bit_depth - bit_depth-&gt;alpha;</div><div class='hunk'>@@ -251,14 +285,16 @@ png_do_shift(png_row_infop row_info, png_bytep row, png_color_8p bit_depth)</div><div class='ctx'>       if (row_info-&gt;bit_depth &lt; 8)</div><div class='ctx'>       {</div><div class='ctx'>          png_bytep bp = row;</div><div class='del'>-         png_uint_32 i;</div><div class='add'>+         png_size_t i;</div><div class='ctx'>          png_byte mask;</div><div class='del'>-         png_uint_32 row_bytes = row_info-&gt;rowbytes;</div><div class='add'>+         png_size_t row_bytes = row_info-&gt;rowbytes;</div><div class='ctx'> </div><div class='ctx'>          if (bit_depth-&gt;gray == 1 &amp;&amp; row_info-&gt;bit_depth == 2)</div><div class='ctx'>             mask = 0x55;</div><div class='add'>+</div><div class='ctx'>          else if (row_info-&gt;bit_depth == 4 &amp;&amp; bit_depth-&gt;gray == 3)</div><div class='ctx'>             mask = 0x11;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             mask = 0xff;</div><div class='ctx'> </div><div class='hunk'>@@ -269,15 +305,18 @@ png_do_shift(png_row_infop row_info, png_bytep row, png_color_8p bit_depth)</div><div class='ctx'> </div><div class='ctx'>             v = *bp;</div><div class='ctx'>             *bp = 0;</div><div class='add'>+</div><div class='ctx'>             for (j = shift_start[0]; j &gt; -shift_dec[0]; j -= shift_dec[0])</div><div class='ctx'>             {</div><div class='ctx'>                if (j &gt; 0)</div><div class='ctx'>                   *bp |= (png_byte)((v &lt;&lt; j) &amp; 0xff);</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   *bp |= (png_byte)((v &gt;&gt; (-j)) &amp; mask);</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>       {</div><div class='ctx'>          png_bytep bp = row;</div><div class='hunk'>@@ -293,15 +332,18 @@ png_do_shift(png_row_infop row_info, png_bytep row, png_color_8p bit_depth)</div><div class='ctx'> </div><div class='ctx'>             v = *bp;</div><div class='ctx'>             *bp = 0;</div><div class='add'>+</div><div class='ctx'>             for (j = shift_start[c]; j &gt; -shift_dec[c]; j -= shift_dec[c])</div><div class='ctx'>             {</div><div class='ctx'>                if (j &gt; 0)</div><div class='ctx'>                   *bp |= (png_byte)((v &lt;&lt; j) &amp; 0xff);</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   *bp |= (png_byte)((v &gt;&gt; (-j)) &amp; 0xff);</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          png_bytep bp;</div><div class='hunk'>@@ -316,10 +358,12 @@ png_do_shift(png_row_infop row_info, png_bytep row, png_color_8p bit_depth)</div><div class='ctx'> </div><div class='ctx'>             v = (png_uint_16)(((png_uint_16)(*bp) &lt;&lt; 8) + *(bp + 1));</div><div class='ctx'>             value = 0;</div><div class='add'>+</div><div class='ctx'>             for (j = shift_start[c]; j &gt; -shift_dec[c]; j -= shift_dec[c])</div><div class='ctx'>             {</div><div class='ctx'>                if (j &gt; 0)</div><div class='ctx'>                   value |= (png_uint_16)((v &lt;&lt; j) &amp; (png_uint_16)0xffff);</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   value |= (png_uint_16)((v &gt;&gt; (-j)) &amp; (png_uint_16)0xffff);</div><div class='ctx'>             }</div><div class='hunk'>@@ -340,12 +384,13 @@ png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'>    {</div><div class='ctx'>       if (row_info-&gt;color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='ctx'>       {</div><div class='del'>-         /* This converts from ARGB to RGBA */</div><div class='ctx'>          if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>          {</div><div class='add'>+            /* This converts from ARGB to RGBA */</div><div class='ctx'>             png_bytep sp, dp;</div><div class='ctx'>             png_uint_32 i;</div><div class='ctx'>             png_uint_32 row_width = row_info-&gt;width;</div><div class='add'>+</div><div class='ctx'>             for (i = 0, sp = dp = row; i &lt; row_width; i++)</div><div class='ctx'>             {</div><div class='ctx'>                png_byte save = *(sp++);</div><div class='hunk'>@@ -355,9 +400,11 @@ png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'>                *(dp++) = save;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='del'>-         /* This converts from AARRGGBB to RRGGBBAA */</div><div class='add'>+</div><div class='add'>+#ifdef PNG_WRITE_16BIT_SUPPORTED</div><div class='ctx'>          else</div><div class='ctx'>          {</div><div class='add'>+            /* This converts from AARRGGBB to RRGGBBAA */</div><div class='ctx'>             png_bytep sp, dp;</div><div class='ctx'>             png_uint_32 i;</div><div class='ctx'>             png_uint_32 row_width = row_info-&gt;width;</div><div class='hunk'>@@ -377,12 +424,14 @@ png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'>                *(dp++) = save[1];</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='add'>+#endif /* PNG_WRITE_16BIT_SUPPORTED */</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if (row_info-&gt;color_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='ctx'>       {</div><div class='del'>-         /* This converts from AG to GA */</div><div class='ctx'>          if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>          {</div><div class='add'>+            /* This converts from AG to GA */</div><div class='ctx'>             png_bytep sp, dp;</div><div class='ctx'>             png_uint_32 i;</div><div class='ctx'>             png_uint_32 row_width = row_info-&gt;width;</div><div class='hunk'>@@ -394,9 +443,11 @@ png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'>                *(dp++) = save;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='del'>-         /* This converts from AAGG to GGAA */</div><div class='add'>+</div><div class='add'>+#ifdef PNG_WRITE_16BIT_SUPPORTED</div><div class='ctx'>          else</div><div class='ctx'>          {</div><div class='add'>+            /* This converts from AAGG to GGAA */</div><div class='ctx'>             png_bytep sp, dp;</div><div class='ctx'>             png_uint_32 i;</div><div class='ctx'>             png_uint_32 row_width = row_info-&gt;width;</div><div class='hunk'>@@ -412,6 +463,7 @@ png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'>                *(dp++) = save[1];</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='add'>+#endif /* PNG_WRITE_16BIT_SUPPORTED */</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='hunk'>@@ -426,12 +478,13 @@ png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'>    {</div><div class='ctx'>       if (row_info-&gt;color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='ctx'>       {</div><div class='del'>-         /* This inverts the alpha channel in RGBA */</div><div class='ctx'>          if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>          {</div><div class='add'>+            /* This inverts the alpha channel in RGBA */</div><div class='ctx'>             png_bytep sp, dp;</div><div class='ctx'>             png_uint_32 i;</div><div class='ctx'>             png_uint_32 row_width = row_info-&gt;width;</div><div class='add'>+</div><div class='ctx'>             for (i = 0, sp = dp = row; i &lt; row_width; i++)</div><div class='ctx'>             {</div><div class='ctx'>                /* Does nothing</div><div class='hunk'>@@ -443,9 +496,11 @@ png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'>                *(dp++) = (png_byte)(255 - *(sp++));</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='del'>-         /* This inverts the alpha channel in RRGGBBAA */</div><div class='add'>+</div><div class='add'>+#ifdef PNG_WRITE_16BIT_SUPPORTED</div><div class='ctx'>          else</div><div class='ctx'>          {</div><div class='add'>+            /* This inverts the alpha channel in RRGGBBAA */</div><div class='ctx'>             png_bytep sp, dp;</div><div class='ctx'>             png_uint_32 i;</div><div class='ctx'>             png_uint_32 row_width = row_info-&gt;width;</div><div class='hunk'>@@ -465,12 +520,14 @@ png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'>                *(dp++) = (png_byte)(255 - *(sp++));</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='add'>+#endif /* PNG_WRITE_16BIT_SUPPORTED */</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if (row_info-&gt;color_type == PNG_COLOR_TYPE_GRAY_ALPHA)</div><div class='ctx'>       {</div><div class='del'>-         /* This inverts the alpha channel in GA */</div><div class='ctx'>          if (row_info-&gt;bit_depth == 8)</div><div class='ctx'>          {</div><div class='add'>+            /* This inverts the alpha channel in GA */</div><div class='ctx'>             png_bytep sp, dp;</div><div class='ctx'>             png_uint_32 i;</div><div class='ctx'>             png_uint_32 row_width = row_info-&gt;width;</div><div class='hunk'>@@ -481,9 +538,11 @@ png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'>                *(dp++) = (png_byte)(255 - *(sp++));</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='del'>-         /* This inverts the alpha channel in GGAA */</div><div class='add'>+</div><div class='add'>+#ifdef PNG_WRITE_16BIT_SUPPORTED</div><div class='ctx'>          else</div><div class='ctx'>          {</div><div class='add'>+            /* This inverts the alpha channel in GGAA */</div><div class='ctx'>             png_bytep sp, dp;</div><div class='ctx'>             png_uint_32 i;</div><div class='ctx'>             png_uint_32 row_width = row_info-&gt;width;</div><div class='hunk'>@@ -499,6 +558,7 @@ png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)</div><div class='ctx'>                *(dp++) = (png_byte)(255 - *(sp++));</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='add'>+#endif /* PNG_WRITE_16BIT_SUPPORTED */</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='hunk'>@@ -511,8 +571,7 @@ png_do_write_intrapixel(png_row_infop row_info, png_bytep row)</div><div class='ctx'> {</div><div class='ctx'>    png_debug(1, "in png_do_write_intrapixel");</div><div class='ctx'> </div><div class='del'>-   if (</div><div class='del'>-       (row_info-&gt;color_type &amp; PNG_COLOR_MASK_COLOR))</div><div class='add'>+   if ((row_info-&gt;color_type &amp; PNG_COLOR_MASK_COLOR))</div><div class='ctx'>    {</div><div class='ctx'>       int bytes_per_pixel;</div><div class='ctx'>       png_uint_32 row_width = row_info-&gt;width;</div><div class='hunk'>@@ -523,17 +582,21 @@ png_do_write_intrapixel(png_row_infop row_info, png_bytep row)</div><div class='ctx'> </div><div class='ctx'>          if (row_info-&gt;color_type == PNG_COLOR_TYPE_RGB)</div><div class='ctx'>             bytes_per_pixel = 3;</div><div class='add'>+</div><div class='ctx'>          else if (row_info-&gt;color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='ctx'>             bytes_per_pixel = 4;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             return;</div><div class='ctx'> </div><div class='ctx'>          for (i = 0, rp = row; i &lt; row_width; i++, rp += bytes_per_pixel)</div><div class='ctx'>          {</div><div class='del'>-            *(rp)   = (png_byte)((*rp     - *(rp+1))&amp;0xff);</div><div class='del'>-            *(rp+2) = (png_byte)((*(rp+2) - *(rp+1))&amp;0xff);</div><div class='add'>+            *(rp)     = (png_byte)((*rp       - *(rp + 1)) &amp; 0xff);</div><div class='add'>+            *(rp + 2) = (png_byte)((*(rp + 2) - *(rp + 1)) &amp; 0xff);</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+</div><div class='add'>+#ifdef PNG_WRITE_16BIT_SUPPORTED</div><div class='ctx'>       else if (row_info-&gt;bit_depth == 16)</div><div class='ctx'>       {</div><div class='ctx'>          png_bytep rp;</div><div class='hunk'>@@ -541,24 +604,27 @@ png_do_write_intrapixel(png_row_infop row_info, png_bytep row)</div><div class='ctx'> </div><div class='ctx'>          if (row_info-&gt;color_type == PNG_COLOR_TYPE_RGB)</div><div class='ctx'>             bytes_per_pixel = 6;</div><div class='add'>+</div><div class='ctx'>          else if (row_info-&gt;color_type == PNG_COLOR_TYPE_RGB_ALPHA)</div><div class='ctx'>             bytes_per_pixel = 8;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             return;</div><div class='ctx'> </div><div class='ctx'>          for (i = 0, rp = row; i &lt; row_width; i++, rp += bytes_per_pixel)</div><div class='ctx'>          {</div><div class='del'>-            png_uint_32 s0   = (*(rp  ) &lt;&lt; 8) | *(rp+1);</div><div class='del'>-            png_uint_32 s1   = (*(rp+2) &lt;&lt; 8) | *(rp+3);</div><div class='del'>-            png_uint_32 s2   = (*(rp+4) &lt;&lt; 8) | *(rp+5);</div><div class='add'>+            png_uint_32 s0   = (*(rp    ) &lt;&lt; 8) | *(rp + 1);</div><div class='add'>+            png_uint_32 s1   = (*(rp + 2) &lt;&lt; 8) | *(rp + 3);</div><div class='add'>+            png_uint_32 s2   = (*(rp + 4) &lt;&lt; 8) | *(rp + 5);</div><div class='ctx'>             png_uint_32 red  = (png_uint_32)((s0 - s1) &amp; 0xffffL);</div><div class='ctx'>             png_uint_32 blue = (png_uint_32)((s2 - s1) &amp; 0xffffL);</div><div class='del'>-            *(rp  ) = (png_byte)((red &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-            *(rp+1) = (png_byte)(red &amp; 0xff);</div><div class='del'>-            *(rp+4) = (png_byte)((blue &gt;&gt; 8) &amp; 0xff);</div><div class='del'>-            *(rp+5) = (png_byte)(blue &amp; 0xff);</div><div class='add'>+            *(rp    ) = (png_byte)((red &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+            *(rp + 1) = (png_byte)(red &amp; 0xff);</div><div class='add'>+            *(rp + 4) = (png_byte)((blue &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+            *(rp + 5) = (png_byte)(blue &amp; 0xff);</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+#endif /* PNG_WRITE_16BIT_SUPPORTED */</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> #endif /* PNG_MNG_FEATURES_SUPPORTED */</div><div class='head'>diff --git a/src/3rdparty/libpng/pngwutil.c b/src/3rdparty/libpng/pngwutil.c<br/>index eddac5b..2c35785 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngwutil.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/pngwutil.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/pngwutil.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libpng/pngwutil.c</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='ctx'> </div><div class='ctx'> /* pngwutil.c - utilities to write a PNG file</div><div class='ctx'>  *</div><div class='del'>- * Last changed in libpng 1.4.0 [January 3, 2010]</div><div class='del'>- * Copyright (c) 1998-2010 Glenn Randers-Pehrson</div><div class='add'>+ * Last changed in libpng 1.5.0 [January 6, 2011]</div><div class='add'>+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson</div><div class='ctx'>  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)</div><div class='ctx'>  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)</div><div class='ctx'>  *</div><div class='hunk'>@@ -11,11 +11,11 @@</div><div class='ctx'>  * and license in png.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define PNG_NO_PEDANTIC_WARNINGS</div><div class='del'>-#include "png.h"</div><div class='del'>-#ifdef PNG_WRITE_SUPPORTED</div><div class='ctx'> #include "pngpriv.h"</div><div class='ctx'> </div><div class='add'>+#ifdef PNG_WRITE_SUPPORTED</div><div class='add'>+</div><div class='add'>+#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED</div><div class='ctx'> /* Place a 32-bit number into a buffer in PNG byte order.  We work</div><div class='ctx'>  * with unsigned numbers for convenience, although one supported</div><div class='ctx'>  * ancillary chunk uses signed (two's complement) numbers.</div><div class='hunk'>@@ -32,7 +32,9 @@ png_save_uint_32(png_bytep buf, png_uint_32 i)</div><div class='ctx'> #ifdef PNG_SAVE_INT_32_SUPPORTED</div><div class='ctx'> /* The png_save_int_32 function assumes integers are stored in two's</div><div class='ctx'>  * complement format.  If this isn't the case, then this routine needs to</div><div class='del'>- * be modified to write data in two's complement format.</div><div class='add'>+ * be modified to write data in two's complement format.  Note that,</div><div class='add'>+ * the following works correctly even if png_int_32 has more than 32 bits</div><div class='add'>+ * (compare the more complex code required on read for sign extention.)</div><div class='ctx'>  */</div><div class='ctx'> void PNGAPI</div><div class='ctx'> png_save_int_32(png_bytep buf, png_int_32 i)</div><div class='hunk'>@@ -54,6 +56,7 @@ png_save_uint_16(png_bytep buf, unsigned int i)</div><div class='ctx'>    buf[0] = (png_byte)((i &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>    buf[1] = (png_byte)(i &amp; 0xff);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* Simple function to write the signature.  If we have already written</div><div class='ctx'>  * the magic bytes of the signature, or more likely, the PNG stream is</div><div class='hunk'>@@ -74,6 +77,7 @@ png_write_sig(png_structp png_ptr)</div><div class='ctx'>    /* Write the rest of the 8 byte signature */</div><div class='ctx'>    png_write_data(png_ptr, &amp;png_signature[png_ptr-&gt;sig_bytes],</div><div class='ctx'>       (png_size_t)(8 - png_ptr-&gt;sig_bytes));</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;sig_bytes &lt; 3)</div><div class='ctx'>       png_ptr-&gt;mode |= PNG_HAVE_PNG_SIGNATURE;</div><div class='ctx'> }</div><div class='hunk'>@@ -88,11 +92,12 @@ png_write_sig(png_structp png_ptr)</div><div class='ctx'>  * functions instead.</div><div class='ctx'>  */</div><div class='ctx'> void PNGAPI</div><div class='del'>-png_write_chunk(png_structp png_ptr, png_bytep chunk_name,</div><div class='del'>-   png_bytep data, png_size_t length)</div><div class='add'>+png_write_chunk(png_structp png_ptr, png_const_bytep chunk_name,</div><div class='add'>+   png_const_bytep data, png_size_t length)</div><div class='ctx'> {</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    png_write_chunk_start(png_ptr, chunk_name, (png_uint_32)length);</div><div class='ctx'>    png_write_chunk_data(png_ptr, data, (png_size_t)length);</div><div class='ctx'>    png_write_chunk_end(png_ptr);</div><div class='hunk'>@@ -103,8 +108,8 @@ png_write_chunk(png_structp png_ptr, png_bytep chunk_name,</div><div class='ctx'>  * passing in png_write_chunk_data().</div><div class='ctx'>  */</div><div class='ctx'> void PNGAPI</div><div class='del'>-png_write_chunk_start(png_structp png_ptr, png_bytep chunk_name,</div><div class='del'>-   png_uint_32 length)</div><div class='add'>+png_write_chunk_start(png_structp png_ptr, png_const_bytep chunk_name,</div><div class='add'>+    png_uint_32 length)</div><div class='ctx'> {</div><div class='ctx'>    png_byte buf[8];</div><div class='ctx'> </div><div class='hunk'>@@ -125,10 +130,13 @@ png_write_chunk_start(png_structp png_ptr, png_bytep chunk_name,</div><div class='ctx'>    png_save_uint_32(buf, length);</div><div class='ctx'>    png_memcpy(buf + 4, chunk_name, 4);</div><div class='ctx'>    png_write_data(png_ptr, buf, (png_size_t)8);</div><div class='add'>+</div><div class='ctx'>    /* Put the chunk name into png_ptr-&gt;chunk_name */</div><div class='ctx'>    png_memcpy(png_ptr-&gt;chunk_name, chunk_name, 4);</div><div class='add'>+</div><div class='ctx'>    /* Reset the crc and run it over the chunk name */</div><div class='ctx'>    png_reset_crc(png_ptr);</div><div class='add'>+</div><div class='ctx'>    png_calculate_crc(png_ptr, chunk_name, 4);</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_IO_STATE_SUPPORTED</div><div class='hunk'>@@ -145,14 +153,17 @@ png_write_chunk_start(png_structp png_ptr, png_bytep chunk_name,</div><div class='ctx'>  * given to png_write_chunk_start().</div><div class='ctx'>  */</div><div class='ctx'> void PNGAPI</div><div class='del'>-png_write_chunk_data(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='add'>+png_write_chunk_data(png_structp png_ptr, png_const_bytep data,</div><div class='add'>+    png_size_t length)</div><div class='ctx'> {</div><div class='ctx'>    /* Write the data, and run the CRC over it */</div><div class='ctx'>    if (png_ptr == NULL)</div><div class='ctx'>       return;</div><div class='add'>+</div><div class='ctx'>    if (data != NULL &amp;&amp; length &gt; 0)</div><div class='ctx'>    {</div><div class='ctx'>       png_write_data(png_ptr, data, length);</div><div class='add'>+</div><div class='ctx'>       /* Update the CRC after writing the data,</div><div class='ctx'>        * in case that the user I/O routine alters it.</div><div class='ctx'>        */</div><div class='hunk'>@@ -190,18 +201,18 @@ png_write_chunk_end(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'> typedef struct</div><div class='ctx'> {</div><div class='del'>-   char *input;   /* The uncompressed input data */</div><div class='del'>-   int input_len;   /* Its length */</div><div class='del'>-   int num_output_ptr; /* Number of output pointers used */</div><div class='del'>-   int max_output_ptr; /* Size of output_ptr */</div><div class='del'>-   png_charpp output_ptr; /* Array of pointers to output */</div><div class='add'>+   png_const_bytep input;   /* The uncompressed input data */</div><div class='add'>+   png_size_t input_len;    /* Its length */</div><div class='add'>+   int num_output_ptr;      /* Number of output pointers used */</div><div class='add'>+   int max_output_ptr;      /* Size of output_ptr */</div><div class='add'>+   png_bytep *output_ptr;   /* Array of pointers to output */</div><div class='ctx'> } compression_state;</div><div class='ctx'> </div><div class='ctx'> /* Compress given text into storage in the png_ptr structure */</div><div class='ctx'> static int /* PRIVATE */</div><div class='ctx'> png_text_compress(png_structp png_ptr,</div><div class='del'>-        png_charp text, png_size_t text_len, int compression,</div><div class='del'>-        compression_state *comp)</div><div class='add'>+    png_const_charp text, png_size_t text_len, int compression,</div><div class='add'>+    compression_state *comp)</div><div class='ctx'> {</div><div class='ctx'>    int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -214,14 +225,14 @@ png_text_compress(png_structp png_ptr,</div><div class='ctx'>    /* We may just want to pass the text right through */</div><div class='ctx'>    if (compression == PNG_TEXT_COMPRESSION_NONE)</div><div class='ctx'>    {</div><div class='del'>-       comp-&gt;input = text;</div><div class='del'>-       comp-&gt;input_len = text_len;</div><div class='del'>-       return((int)text_len);</div><div class='add'>+      comp-&gt;input = (png_const_bytep)text;</div><div class='add'>+      comp-&gt;input_len = text_len;</div><div class='add'>+      return((int)text_len);</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    if (compression &gt;= PNG_TEXT_COMPRESSION_LAST)</div><div class='ctx'>    {</div><div class='del'>-#ifdef PNG_STDIO_SUPPORTED</div><div class='add'>+#ifdef PNG_CONSOLE_IO_SUPPORTED</div><div class='ctx'>       char msg[50];</div><div class='ctx'>       png_snprintf(msg, 50, "Unknown compression type %d", compression);</div><div class='ctx'>       png_warning(png_ptr, msg);</div><div class='hunk'>@@ -246,24 +257,29 @@ png_text_compress(png_structp png_ptr,</div><div class='ctx'>     */</div><div class='ctx'> </div><div class='ctx'>    /* Set up the compression buffers */</div><div class='add'>+   /* TODO: the following cast hides a potential overflow problem. */</div><div class='ctx'>    png_ptr-&gt;zstream.avail_in = (uInt)text_len;</div><div class='add'>+   /* NOTE: assume zlib doesn't overwrite the input */</div><div class='ctx'>    png_ptr-&gt;zstream.next_in = (Bytef *)text;</div><div class='del'>-   png_ptr-&gt;zstream.avail_out = (uInt)png_ptr-&gt;zbuf_size;</div><div class='del'>-   png_ptr-&gt;zstream.next_out = (Bytef *)png_ptr-&gt;zbuf;</div><div class='add'>+   png_ptr-&gt;zstream.avail_out = png_ptr-&gt;zbuf_size;</div><div class='add'>+   png_ptr-&gt;zstream.next_out = png_ptr-&gt;zbuf;</div><div class='ctx'> </div><div class='ctx'>    /* This is the same compression loop as in png_write_row() */</div><div class='ctx'>    do</div><div class='ctx'>    {</div><div class='ctx'>       /* Compress the data */</div><div class='ctx'>       ret = deflate(&amp;png_ptr-&gt;zstream, Z_NO_FLUSH);</div><div class='add'>+</div><div class='ctx'>       if (ret != Z_OK)</div><div class='ctx'>       {</div><div class='ctx'>          /* Error */</div><div class='ctx'>          if (png_ptr-&gt;zstream.msg != NULL)</div><div class='ctx'>             png_error(png_ptr, png_ptr-&gt;zstream.msg);</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             png_error(png_ptr, "zlib error");</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       /* Check to see if we need more room */</div><div class='ctx'>       if (!(png_ptr-&gt;zstream.avail_out))</div><div class='ctx'>       {</div><div class='hunk'>@@ -276,28 +292,33 @@ png_text_compress(png_structp png_ptr,</div><div class='ctx'>             comp-&gt;max_output_ptr = comp-&gt;num_output_ptr + 4;</div><div class='ctx'>             if (comp-&gt;output_ptr != NULL)</div><div class='ctx'>             {</div><div class='del'>-               png_charpp old_ptr;</div><div class='add'>+               png_bytepp old_ptr;</div><div class='ctx'> </div><div class='ctx'>                old_ptr = comp-&gt;output_ptr;</div><div class='del'>-               comp-&gt;output_ptr = (png_charpp)png_malloc(png_ptr,</div><div class='del'>-                  (png_alloc_size_t)</div><div class='del'>-                  (comp-&gt;max_output_ptr * png_sizeof(png_charpp)));</div><div class='add'>+</div><div class='add'>+               comp-&gt;output_ptr = (png_bytepp)png_malloc(png_ptr,</div><div class='add'>+                   (png_alloc_size_t)</div><div class='add'>+                   (comp-&gt;max_output_ptr * png_sizeof(png_charpp)));</div><div class='add'>+</div><div class='ctx'>                png_memcpy(comp-&gt;output_ptr, old_ptr, old_max</div><div class='del'>-                  * png_sizeof(png_charp));</div><div class='add'>+                   * png_sizeof(png_charp));</div><div class='add'>+</div><div class='ctx'>                png_free(png_ptr, old_ptr);</div><div class='ctx'>             }</div><div class='ctx'>             else</div><div class='del'>-               comp-&gt;output_ptr = (png_charpp)png_malloc(png_ptr,</div><div class='del'>-                  (png_alloc_size_t)</div><div class='del'>-                  (comp-&gt;max_output_ptr * png_sizeof(png_charp)));</div><div class='add'>+               comp-&gt;output_ptr = (png_bytepp)png_malloc(png_ptr,</div><div class='add'>+                   (png_alloc_size_t)</div><div class='add'>+                   (comp-&gt;max_output_ptr * png_sizeof(png_charp)));</div><div class='ctx'>          }</div><div class='ctx'> </div><div class='ctx'>          /* Save the data */</div><div class='ctx'>          comp-&gt;output_ptr[comp-&gt;num_output_ptr] =</div><div class='del'>-            (png_charp)png_malloc(png_ptr,</div><div class='del'>-            (png_alloc_size_t)png_ptr-&gt;zbuf_size);</div><div class='add'>+             (png_bytep)png_malloc(png_ptr,</div><div class='add'>+             (png_alloc_size_t)png_ptr-&gt;zbuf_size);</div><div class='add'>+</div><div class='ctx'>          png_memcpy(comp-&gt;output_ptr[comp-&gt;num_output_ptr], png_ptr-&gt;zbuf,</div><div class='del'>-            png_ptr-&gt;zbuf_size);</div><div class='add'>+             png_ptr-&gt;zbuf_size);</div><div class='add'>+</div><div class='ctx'>          comp-&gt;num_output_ptr++;</div><div class='ctx'> </div><div class='ctx'>          /* and reset the buffer */</div><div class='hunk'>@@ -327,29 +348,35 @@ png_text_compress(png_structp png_ptr,</div><div class='ctx'>                comp-&gt;max_output_ptr = comp-&gt;num_output_ptr + 4;</div><div class='ctx'>                if (comp-&gt;output_ptr != NULL)</div><div class='ctx'>                {</div><div class='del'>-                  png_charpp old_ptr;</div><div class='add'>+                  png_bytepp old_ptr;</div><div class='ctx'> </div><div class='ctx'>                   old_ptr = comp-&gt;output_ptr;</div><div class='add'>+</div><div class='ctx'>                   /* This could be optimized to realloc() */</div><div class='del'>-                  comp-&gt;output_ptr = (png_charpp)png_malloc(png_ptr,</div><div class='del'>-                     (png_alloc_size_t)(comp-&gt;max_output_ptr *</div><div class='del'>-                     png_sizeof(png_charp)));</div><div class='add'>+                  comp-&gt;output_ptr = (png_bytepp)png_malloc(png_ptr,</div><div class='add'>+                      (png_alloc_size_t)(comp-&gt;max_output_ptr *</div><div class='add'>+                      png_sizeof(png_charp)));</div><div class='add'>+</div><div class='ctx'>                   png_memcpy(comp-&gt;output_ptr, old_ptr,</div><div class='del'>-                     old_max * png_sizeof(png_charp));</div><div class='add'>+                      old_max * png_sizeof(png_charp));</div><div class='add'>+</div><div class='ctx'>                   png_free(png_ptr, old_ptr);</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='del'>-                  comp-&gt;output_ptr = (png_charpp)png_malloc(png_ptr,</div><div class='del'>-                     (png_alloc_size_t)(comp-&gt;max_output_ptr *</div><div class='del'>-                     png_sizeof(png_charp)));</div><div class='add'>+                  comp-&gt;output_ptr = (png_bytepp)png_malloc(png_ptr,</div><div class='add'>+                      (png_alloc_size_t)(comp-&gt;max_output_ptr *</div><div class='add'>+                      png_sizeof(png_charp)));</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'>             /* Save the data */</div><div class='ctx'>             comp-&gt;output_ptr[comp-&gt;num_output_ptr] =</div><div class='del'>-               (png_charp)png_malloc(png_ptr,</div><div class='del'>-               (png_alloc_size_t)png_ptr-&gt;zbuf_size);</div><div class='add'>+                (png_bytep)png_malloc(png_ptr,</div><div class='add'>+                (png_alloc_size_t)png_ptr-&gt;zbuf_size);</div><div class='add'>+</div><div class='ctx'>             png_memcpy(comp-&gt;output_ptr[comp-&gt;num_output_ptr], png_ptr-&gt;zbuf,</div><div class='del'>-               png_ptr-&gt;zbuf_size);</div><div class='add'>+                png_ptr-&gt;zbuf_size);</div><div class='add'>+</div><div class='ctx'>             comp-&gt;num_output_ptr++;</div><div class='ctx'> </div><div class='ctx'>             /* and reset the buffer pointers */</div><div class='hunk'>@@ -362,6 +389,7 @@ png_text_compress(png_structp png_ptr,</div><div class='ctx'>          /* We got an error */</div><div class='ctx'>          if (png_ptr-&gt;zstream.msg != NULL)</div><div class='ctx'>             png_error(png_ptr, png_ptr-&gt;zstream.msg);</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             png_error(png_ptr, "zlib error");</div><div class='ctx'>       }</div><div class='hunk'>@@ -369,6 +397,7 @@ png_text_compress(png_structp png_ptr,</div><div class='ctx'> </div><div class='ctx'>    /* Text length is number of buffers plus last buffer */</div><div class='ctx'>    text_len = png_ptr-&gt;zbuf_size * comp-&gt;num_output_ptr;</div><div class='add'>+</div><div class='ctx'>    if (png_ptr-&gt;zstream.avail_out &lt; png_ptr-&gt;zbuf_size)</div><div class='ctx'>       text_len += png_ptr-&gt;zbuf_size - (png_size_t)png_ptr-&gt;zstream.avail_out;</div><div class='ctx'> </div><div class='hunk'>@@ -384,24 +413,27 @@ png_write_compressed_data_out(png_structp png_ptr, compression_state *comp)</div><div class='ctx'>    /* Handle the no-compression case */</div><div class='ctx'>    if (comp-&gt;input)</div><div class='ctx'>    {</div><div class='del'>-      png_write_chunk_data(png_ptr, (png_bytep)comp-&gt;input,</div><div class='del'>-                            (png_size_t)comp-&gt;input_len);</div><div class='add'>+      png_write_chunk_data(png_ptr, comp-&gt;input, comp-&gt;input_len);</div><div class='add'>+</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    /* Write saved output buffers, if any */</div><div class='ctx'>    for (i = 0; i &lt; comp-&gt;num_output_ptr; i++)</div><div class='ctx'>    {</div><div class='del'>-      png_write_chunk_data(png_ptr, (png_bytep)comp-&gt;output_ptr[i],</div><div class='del'>-         (png_size_t)png_ptr-&gt;zbuf_size);</div><div class='add'>+      png_write_chunk_data(png_ptr, comp-&gt;output_ptr[i],</div><div class='add'>+          (png_size_t)png_ptr-&gt;zbuf_size);</div><div class='add'>+</div><div class='ctx'>       png_free(png_ptr, comp-&gt;output_ptr[i]);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (comp-&gt;max_output_ptr != 0)</div><div class='ctx'>       png_free(png_ptr, comp-&gt;output_ptr);</div><div class='add'>+</div><div class='ctx'>    /* Write anything left in zbuf */</div><div class='ctx'>    if (png_ptr-&gt;zstream.avail_out &lt; (png_uint_32)png_ptr-&gt;zbuf_size)</div><div class='ctx'>       png_write_chunk_data(png_ptr, png_ptr-&gt;zbuf,</div><div class='del'>-         (png_size_t)(png_ptr-&gt;zbuf_size - png_ptr-&gt;zstream.avail_out));</div><div class='add'>+          (png_size_t)(png_ptr-&gt;zbuf_size - png_ptr-&gt;zstream.avail_out));</div><div class='ctx'> </div><div class='ctx'>    /* Reset zlib for another zTXt/iTXt or image data */</div><div class='ctx'>    deflateReset(&amp;png_ptr-&gt;zstream);</div><div class='hunk'>@@ -415,8 +447,8 @@ png_write_compressed_data_out(png_structp png_ptr, compression_state *comp)</div><div class='ctx'>  */</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,</div><div class='del'>-   int bit_depth, int color_type, int compression_type, int filter_type,</div><div class='del'>-   int interlace_type)</div><div class='add'>+    int bit_depth, int color_type, int compression_type, int filter_type,</div><div class='add'>+    int interlace_type)</div><div class='ctx'> {</div><div class='ctx'>    PNG_IHDR;</div><div class='ctx'>    int ret;</div><div class='hunk'>@@ -435,35 +467,61 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,</div><div class='ctx'>             case 2:</div><div class='ctx'>             case 4:</div><div class='ctx'>             case 8:</div><div class='del'>-            case 16: png_ptr-&gt;channels = 1; break;</div><div class='del'>-            default: png_error(png_ptr, "Invalid bit depth for grayscale image");</div><div class='add'>+#ifdef PNG_WRITE_16BIT_SUPPORTED</div><div class='add'>+            case 16:</div><div class='add'>+#endif</div><div class='add'>+               png_ptr-&gt;channels = 1; break;</div><div class='add'>+</div><div class='add'>+            default:</div><div class='add'>+               png_error(png_ptr,</div><div class='add'>+                   "Invalid bit depth for grayscale image");</div><div class='ctx'>          }</div><div class='ctx'>          break;</div><div class='add'>+</div><div class='ctx'>       case PNG_COLOR_TYPE_RGB:</div><div class='add'>+#ifdef PNG_WRITE_16BIT_SUPPORTED</div><div class='ctx'>          if (bit_depth != 8 &amp;&amp; bit_depth != 16)</div><div class='add'>+#else</div><div class='add'>+         if (bit_depth != 8)</div><div class='add'>+#endif</div><div class='ctx'>             png_error(png_ptr, "Invalid bit depth for RGB image");</div><div class='add'>+</div><div class='ctx'>          png_ptr-&gt;channels = 3;</div><div class='ctx'>          break;</div><div class='add'>+</div><div class='ctx'>       case PNG_COLOR_TYPE_PALETTE:</div><div class='ctx'>          switch (bit_depth)</div><div class='ctx'>          {</div><div class='ctx'>             case 1:</div><div class='ctx'>             case 2:</div><div class='ctx'>             case 4:</div><div class='del'>-            case 8: png_ptr-&gt;channels = 1; break;</div><div class='del'>-            default: png_error(png_ptr, "Invalid bit depth for paletted image");</div><div class='add'>+            case 8:</div><div class='add'>+               png_ptr-&gt;channels = 1;</div><div class='add'>+               break;</div><div class='add'>+</div><div class='add'>+            default:</div><div class='add'>+               png_error(png_ptr, "Invalid bit depth for paletted image");</div><div class='ctx'>          }</div><div class='ctx'>          break;</div><div class='add'>+</div><div class='ctx'>       case PNG_COLOR_TYPE_GRAY_ALPHA:</div><div class='ctx'>          if (bit_depth != 8 &amp;&amp; bit_depth != 16)</div><div class='ctx'>             png_error(png_ptr, "Invalid bit depth for grayscale+alpha image");</div><div class='add'>+</div><div class='ctx'>          png_ptr-&gt;channels = 2;</div><div class='ctx'>          break;</div><div class='add'>+</div><div class='ctx'>       case PNG_COLOR_TYPE_RGB_ALPHA:</div><div class='add'>+#ifdef PNG_WRITE_16BIT_SUPPORTED</div><div class='ctx'>          if (bit_depth != 8 &amp;&amp; bit_depth != 16)</div><div class='add'>+#else</div><div class='add'>+         if (bit_depth != 8)</div><div class='add'>+#endif</div><div class='ctx'>             png_error(png_ptr, "Invalid bit depth for RGBA image");</div><div class='add'>+</div><div class='ctx'>          png_ptr-&gt;channels = 4;</div><div class='ctx'>          break;</div><div class='add'>+</div><div class='ctx'>       default:</div><div class='ctx'>          png_error(png_ptr, "Invalid image color type specified");</div><div class='ctx'>    }</div><div class='hunk'>@@ -485,13 +543,13 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,</div><div class='ctx'>     */</div><div class='ctx'>    if (</div><div class='ctx'> #ifdef PNG_MNG_FEATURES_SUPPORTED</div><div class='del'>-      !((png_ptr-&gt;mng_features_permitted &amp; PNG_FLAG_MNG_FILTER_64) &amp;&amp;</div><div class='del'>-      ((png_ptr-&gt;mode&amp;PNG_HAVE_PNG_SIGNATURE) == 0) &amp;&amp;</div><div class='del'>-      (color_type == PNG_COLOR_TYPE_RGB ||</div><div class='del'>-       color_type == PNG_COLOR_TYPE_RGB_ALPHA) &amp;&amp;</div><div class='del'>-      (filter_type == PNG_INTRAPIXEL_DIFFERENCING)) &amp;&amp;</div><div class='add'>+       !((png_ptr-&gt;mng_features_permitted &amp; PNG_FLAG_MNG_FILTER_64) &amp;&amp;</div><div class='add'>+       ((png_ptr-&gt;mode&amp;PNG_HAVE_PNG_SIGNATURE) == 0) &amp;&amp;</div><div class='add'>+       (color_type == PNG_COLOR_TYPE_RGB ||</div><div class='add'>+        color_type == PNG_COLOR_TYPE_RGB_ALPHA) &amp;&amp;</div><div class='add'>+       (filter_type == PNG_INTRAPIXEL_DIFFERENCING)) &amp;&amp;</div><div class='ctx'> #endif</div><div class='del'>-      filter_type != PNG_FILTER_TYPE_BASE)</div><div class='add'>+       filter_type != PNG_FILTER_TYPE_BASE)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid filter type specified");</div><div class='ctx'>       filter_type = PNG_FILTER_TYPE_BASE;</div><div class='hunk'>@@ -499,7 +557,7 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_INTERLACING_SUPPORTED</div><div class='ctx'>    if (interlace_type != PNG_INTERLACE_NONE &amp;&amp;</div><div class='del'>-      interlace_type != PNG_INTERLACE_ADAM7)</div><div class='add'>+       interlace_type != PNG_INTERLACE_ADAM7)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Invalid interlace type specified");</div><div class='ctx'>       interlace_type = PNG_INTERLACE_ADAM7;</div><div class='hunk'>@@ -536,52 +594,70 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,</div><div class='ctx'>    buf[12] = (png_byte)interlace_type;</div><div class='ctx'> </div><div class='ctx'>    /* Write the chunk */</div><div class='del'>-   png_write_chunk(png_ptr, (png_bytep)png_IHDR, buf, (png_size_t)13);</div><div class='add'>+   png_write_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);</div><div class='ctx'> </div><div class='ctx'>    /* Initialize zlib with PNG info */</div><div class='ctx'>    png_ptr-&gt;zstream.zalloc = png_zalloc;</div><div class='ctx'>    png_ptr-&gt;zstream.zfree = png_zfree;</div><div class='ctx'>    png_ptr-&gt;zstream.opaque = (voidpf)png_ptr;</div><div class='add'>+</div><div class='ctx'>    if (!(png_ptr-&gt;do_filter))</div><div class='ctx'>    {</div><div class='ctx'>       if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE ||</div><div class='del'>-         png_ptr-&gt;bit_depth &lt; 8)</div><div class='add'>+          png_ptr-&gt;bit_depth &lt; 8)</div><div class='ctx'>          png_ptr-&gt;do_filter = PNG_FILTER_NONE;</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>          png_ptr-&gt;do_filter = PNG_ALL_FILTERS;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (!(png_ptr-&gt;flags &amp; PNG_FLAG_ZLIB_CUSTOM_STRATEGY))</div><div class='ctx'>    {</div><div class='ctx'>       if (png_ptr-&gt;do_filter != PNG_FILTER_NONE)</div><div class='ctx'>          png_ptr-&gt;zlib_strategy = Z_FILTERED;</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>          png_ptr-&gt;zlib_strategy = Z_DEFAULT_STRATEGY;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    if (!(png_ptr-&gt;flags &amp; PNG_FLAG_ZLIB_CUSTOM_LEVEL))</div><div class='ctx'>       png_ptr-&gt;zlib_level = Z_DEFAULT_COMPRESSION;</div><div class='add'>+</div><div class='ctx'>    if (!(png_ptr-&gt;flags &amp; PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL))</div><div class='ctx'>       png_ptr-&gt;zlib_mem_level = 8;</div><div class='add'>+</div><div class='ctx'>    if (!(png_ptr-&gt;flags &amp; PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS))</div><div class='ctx'>       png_ptr-&gt;zlib_window_bits = 15;</div><div class='add'>+</div><div class='ctx'>    if (!(png_ptr-&gt;flags &amp; PNG_FLAG_ZLIB_CUSTOM_METHOD))</div><div class='ctx'>       png_ptr-&gt;zlib_method = 8;</div><div class='add'>+</div><div class='ctx'>    ret = deflateInit2(&amp;png_ptr-&gt;zstream, png_ptr-&gt;zlib_level,</div><div class='del'>-         png_ptr-&gt;zlib_method, png_ptr-&gt;zlib_window_bits,</div><div class='del'>-         png_ptr-&gt;zlib_mem_level, png_ptr-&gt;zlib_strategy);</div><div class='add'>+       png_ptr-&gt;zlib_method, png_ptr-&gt;zlib_window_bits,</div><div class='add'>+       png_ptr-&gt;zlib_mem_level, png_ptr-&gt;zlib_strategy);</div><div class='add'>+</div><div class='ctx'>    if (ret != Z_OK)</div><div class='ctx'>    {</div><div class='del'>-      if (ret == Z_VERSION_ERROR) png_error(png_ptr,</div><div class='del'>-          "zlib failed to initialize compressor -- version error");</div><div class='del'>-      if (ret == Z_STREAM_ERROR) png_error(png_ptr,</div><div class='del'>-           "zlib failed to initialize compressor -- stream error");</div><div class='del'>-      if (ret == Z_MEM_ERROR) png_error(png_ptr,</div><div class='del'>-           "zlib failed to initialize compressor -- mem error");</div><div class='add'>+      if (ret == Z_VERSION_ERROR)</div><div class='add'>+         png_error(png_ptr,</div><div class='add'>+            "zlib failed to initialize compressor -- version error");</div><div class='add'>+</div><div class='add'>+      if (ret == Z_STREAM_ERROR)</div><div class='add'>+         png_error(png_ptr,</div><div class='add'>+             "zlib failed to initialize compressor -- stream error");</div><div class='add'>+</div><div class='add'>+      if (ret == Z_MEM_ERROR)</div><div class='add'>+         png_error(png_ptr,</div><div class='add'>+             "zlib failed to initialize compressor -- mem error");</div><div class='add'>+</div><div class='ctx'>       png_error(png_ptr, "zlib failed to initialize compressor");</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;zstream.next_out = png_ptr-&gt;zbuf;</div><div class='ctx'>    png_ptr-&gt;zstream.avail_out = (uInt)png_ptr-&gt;zbuf_size;</div><div class='del'>-   /* libpng is not interested in zstream.data_type */</div><div class='del'>-   /* Set it to a predefined value, to avoid its evaluation inside zlib */</div><div class='add'>+   /* libpng is not interested in zstream.data_type, so set it</div><div class='add'>+    * to a predefined value, to avoid its evaluation inside zlib</div><div class='add'>+    */</div><div class='ctx'>    png_ptr-&gt;zstream.data_type = Z_BINARY;</div><div class='ctx'> </div><div class='ctx'>    png_ptr-&gt;mode = PNG_HAVE_IHDR;</div><div class='hunk'>@@ -592,45 +668,48 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,</div><div class='ctx'>  * structure.</div><div class='ctx'>  */</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_write_PLTE(png_structp png_ptr, png_colorp palette, png_uint_32 num_pal)</div><div class='add'>+png_write_PLTE(png_structp png_ptr, png_const_colorp palette,</div><div class='add'>+    png_uint_32 num_pal)</div><div class='ctx'> {</div><div class='ctx'>    PNG_PLTE;</div><div class='ctx'>    png_uint_32 i;</div><div class='del'>-   png_colorp pal_ptr;</div><div class='add'>+   png_const_colorp pal_ptr;</div><div class='ctx'>    png_byte buf[3];</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_write_PLTE");</div><div class='ctx'> </div><div class='ctx'>    if ((</div><div class='ctx'> #ifdef PNG_MNG_FEATURES_SUPPORTED</div><div class='del'>-        !(png_ptr-&gt;mng_features_permitted &amp; PNG_FLAG_MNG_EMPTY_PLTE) &amp;&amp;</div><div class='add'>+       !(png_ptr-&gt;mng_features_permitted &amp; PNG_FLAG_MNG_EMPTY_PLTE) &amp;&amp;</div><div class='ctx'> #endif</div><div class='del'>-        num_pal == 0) || num_pal &gt; 256)</div><div class='add'>+       num_pal == 0) || num_pal &gt; 256)</div><div class='ctx'>    {</div><div class='del'>-     if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='del'>-     {</div><div class='del'>-        png_error(png_ptr, "Invalid number of colors in palette");</div><div class='del'>-     }</div><div class='del'>-     else</div><div class='del'>-     {</div><div class='del'>-        png_warning(png_ptr, "Invalid number of colors in palette");</div><div class='del'>-        return;</div><div class='del'>-     }</div><div class='add'>+      if (png_ptr-&gt;color_type == PNG_COLOR_TYPE_PALETTE)</div><div class='add'>+      {</div><div class='add'>+         png_error(png_ptr, "Invalid number of colors in palette");</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      else</div><div class='add'>+      {</div><div class='add'>+         png_warning(png_ptr, "Invalid number of colors in palette");</div><div class='add'>+         return;</div><div class='add'>+      }</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    if (!(png_ptr-&gt;color_type&amp;PNG_COLOR_MASK_COLOR))</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr,</div><div class='del'>-        "Ignoring request to write a PLTE chunk in grayscale PNG");</div><div class='add'>+          "Ignoring request to write a PLTE chunk in grayscale PNG");</div><div class='add'>+</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_ptr-&gt;num_palette = (png_uint_16)num_pal;</div><div class='ctx'>    png_debug1(3, "num_palette = %d", png_ptr-&gt;num_palette);</div><div class='ctx'> </div><div class='del'>-   png_write_chunk_start(png_ptr, (png_bytep)png_PLTE,</div><div class='del'>-     (png_uint_32)(num_pal * 3));</div><div class='add'>+   png_write_chunk_start(png_ptr, png_PLTE, (png_uint_32)(num_pal * 3));</div><div class='ctx'> #ifdef PNG_POINTER_INDEXING_SUPPORTED</div><div class='add'>+</div><div class='ctx'>    for (i = 0, pal_ptr = palette; i &lt; num_pal; i++, pal_ptr++)</div><div class='ctx'>    {</div><div class='ctx'>       buf[0] = pal_ptr-&gt;red;</div><div class='hunk'>@@ -638,9 +717,13 @@ png_write_PLTE(png_structp png_ptr, png_colorp palette, png_uint_32 num_pal)</div><div class='ctx'>       buf[2] = pal_ptr-&gt;blue;</div><div class='ctx'>       png_write_chunk_data(png_ptr, buf, (png_size_t)3);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'> #else</div><div class='del'>-   /* This is a little slower but some buggy compilers need to do this instead */</div><div class='add'>+   /* This is a little slower but some buggy compilers need to do this</div><div class='add'>+    * instead</div><div class='add'>+    */</div><div class='ctx'>    pal_ptr=palette;</div><div class='add'>+</div><div class='ctx'>    for (i = 0; i &lt; num_pal; i++)</div><div class='ctx'>    {</div><div class='ctx'>       buf[0] = pal_ptr[i].red;</div><div class='hunk'>@@ -648,6 +731,7 @@ png_write_PLTE(png_structp png_ptr, png_colorp palette, png_uint_32 num_pal)</div><div class='ctx'>       buf[2] = pal_ptr[i].blue;</div><div class='ctx'>       png_write_chunk_data(png_ptr, buf, (png_size_t)3);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'>    png_write_chunk_end(png_ptr);</div><div class='ctx'>    png_ptr-&gt;mode |= PNG_HAVE_PLTE;</div><div class='hunk'>@@ -678,31 +762,36 @@ png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)</div><div class='ctx'>              png_ptr-&gt;height &lt; 16384 &amp;&amp; png_ptr-&gt;width &lt; 16384)</div><div class='ctx'>          {</div><div class='ctx'>             png_uint_32 uncompressed_idat_size = png_ptr-&gt;height *</div><div class='del'>-               ((png_ptr-&gt;width *</div><div class='del'>-               png_ptr-&gt;channels * png_ptr-&gt;bit_depth + 15) &gt;&gt; 3);</div><div class='add'>+                ((png_ptr-&gt;width *</div><div class='add'>+                png_ptr-&gt;channels * png_ptr-&gt;bit_depth + 15) &gt;&gt; 3);</div><div class='ctx'>             unsigned int z_cinfo = z_cmf &gt;&gt; 4;</div><div class='ctx'>             unsigned int half_z_window_size = 1 &lt;&lt; (z_cinfo + 7);</div><div class='ctx'>             while (uncompressed_idat_size &lt;= half_z_window_size &amp;&amp;</div><div class='del'>-                   half_z_window_size &gt;= 256)</div><div class='add'>+                half_z_window_size &gt;= 256)</div><div class='ctx'>             {</div><div class='ctx'>                z_cinfo--;</div><div class='ctx'>                half_z_window_size &gt;&gt;= 1;</div><div class='ctx'>             }</div><div class='add'>+</div><div class='ctx'>             z_cmf = (z_cmf &amp; 0x0f) | (z_cinfo &lt;&lt; 4);</div><div class='del'>-            if (data[0] != (png_byte)z_cmf)</div><div class='add'>+</div><div class='add'>+            if (data[0] != z_cmf)</div><div class='ctx'>             {</div><div class='add'>+               int tmp;</div><div class='ctx'>                data[0] = (png_byte)z_cmf;</div><div class='del'>-               data[1] &amp;= 0xe0;</div><div class='del'>-               data[1] += (png_byte)(0x1f - ((z_cmf &lt;&lt; 8) + data[1]) % 0x1f);</div><div class='add'>+               tmp = data[1] &amp; 0xe0;</div><div class='add'>+               tmp += 0x1f - ((z_cmf &lt;&lt; 8) + tmp) % 0x1f;</div><div class='add'>+               data[1] = (png_byte)tmp;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>          png_error(png_ptr,</div><div class='del'>-            "Invalid zlib compression method or flags in IDAT");</div><div class='add'>+             "Invalid zlib compression method or flags in IDAT");</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-   png_write_chunk(png_ptr, (png_bytep)png_IDAT, data, length);</div><div class='add'>+   png_write_chunk(png_ptr, png_IDAT, data, length);</div><div class='ctx'>    png_ptr-&gt;mode |= PNG_HAVE_IDAT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -714,30 +803,12 @@ png_write_IEND(png_structp png_ptr)</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_write_IEND");</div><div class='ctx'> </div><div class='del'>-   png_write_chunk(png_ptr, (png_bytep)png_IEND, NULL,</div><div class='del'>-     (png_size_t)0);</div><div class='add'>+   png_write_chunk(png_ptr, png_IEND, NULL, (png_size_t)0);</div><div class='ctx'>    png_ptr-&gt;mode |= PNG_HAVE_IEND;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_gAMA_SUPPORTED</div><div class='ctx'> /* Write a gAMA chunk */</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-void /* PRIVATE */</div><div class='del'>-png_write_gAMA(png_structp png_ptr, double file_gamma)</div><div class='del'>-{</div><div class='del'>-   PNG_gAMA;</div><div class='del'>-   png_uint_32 igamma;</div><div class='del'>-   png_byte buf[4];</div><div class='del'>-</div><div class='del'>-   png_debug(1, "in png_write_gAMA");</div><div class='del'>-</div><div class='del'>-   /* file_gamma is saved in 1/100,000ths */</div><div class='del'>-   igamma = (png_uint_32)(file_gamma * 100000.0 + 0.5);</div><div class='del'>-   png_save_uint_32(buf, igamma);</div><div class='del'>-   png_write_chunk(png_ptr, (png_bytep)png_gAMA, buf, (png_size_t)4);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_write_gAMA_fixed(png_structp png_ptr, png_fixed_point file_gamma)</div><div class='ctx'> {</div><div class='hunk'>@@ -748,10 +819,9 @@ png_write_gAMA_fixed(png_structp png_ptr, png_fixed_point file_gamma)</div><div class='ctx'> </div><div class='ctx'>    /* file_gamma is saved in 1/100,000ths */</div><div class='ctx'>    png_save_uint_32(buf, (png_uint_32)file_gamma);</div><div class='del'>-   png_write_chunk(png_ptr, (png_bytep)png_gAMA, buf, (png_size_t)4);</div><div class='add'>+   png_write_chunk(png_ptr, png_gAMA, buf, (png_size_t)4);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_sRGB_SUPPORTED</div><div class='ctx'> /* Write a sRGB chunk */</div><div class='hunk'>@@ -764,18 +834,19 @@ png_write_sRGB(png_structp png_ptr, int srgb_intent)</div><div class='ctx'>    png_debug(1, "in png_write_sRGB");</div><div class='ctx'> </div><div class='ctx'>    if (srgb_intent &gt;= PNG_sRGB_INTENT_LAST)</div><div class='del'>-         png_warning(png_ptr,</div><div class='del'>-            "Invalid sRGB rendering intent specified");</div><div class='add'>+      png_warning(png_ptr,</div><div class='add'>+          "Invalid sRGB rendering intent specified");</div><div class='add'>+</div><div class='ctx'>    buf[0]=(png_byte)srgb_intent;</div><div class='del'>-   png_write_chunk(png_ptr, (png_bytep)png_sRGB, buf, (png_size_t)1);</div><div class='add'>+   png_write_chunk(png_ptr, png_sRGB, buf, (png_size_t)1);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_iCCP_SUPPORTED</div><div class='ctx'> /* Write an iCCP chunk */</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_write_iCCP(png_structp png_ptr, png_charp name, int compression_type,</div><div class='del'>-   png_charp profile, int profile_len)</div><div class='add'>+png_write_iCCP(png_structp png_ptr, png_const_charp name, int compression_type,</div><div class='add'>+    png_const_charp profile, int profile_len)</div><div class='ctx'> {</div><div class='ctx'>    PNG_iCCP;</div><div class='ctx'>    png_size_t name_len;</div><div class='hunk'>@@ -791,8 +862,7 @@ png_write_iCCP(png_structp png_ptr, png_charp name, int compression_type,</div><div class='ctx'>    comp.input = NULL;</div><div class='ctx'>    comp.input_len = 0;</div><div class='ctx'> </div><div class='del'>-   if ((name_len = png_check_keyword(png_ptr, name,</div><div class='del'>-      &amp;new_name)) == 0)</div><div class='add'>+   if ((name_len = png_check_keyword(png_ptr, name, &amp;new_name)) == 0)</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='ctx'>    if (compression_type != PNG_COMPRESSION_TYPE_BASE)</div><div class='hunk'>@@ -803,15 +873,16 @@ png_write_iCCP(png_structp png_ptr, png_charp name, int compression_type,</div><div class='ctx'> </div><div class='ctx'>    if (profile_len &gt; 3)</div><div class='ctx'>       embedded_profile_len =</div><div class='del'>-          ((*( (png_bytep)profile    ))&lt;&lt;24) |</div><div class='del'>-          ((*( (png_bytep)profile + 1))&lt;&lt;16) |</div><div class='del'>-          ((*( (png_bytep)profile + 2))&lt;&lt; 8) |</div><div class='del'>-          ((*( (png_bytep)profile + 3))    );</div><div class='add'>+          ((*( (png_const_bytep)profile    ))&lt;&lt;24) |</div><div class='add'>+          ((*( (png_const_bytep)profile + 1))&lt;&lt;16) |</div><div class='add'>+          ((*( (png_const_bytep)profile + 2))&lt;&lt; 8) |</div><div class='add'>+          ((*( (png_const_bytep)profile + 3))    );</div><div class='ctx'> </div><div class='ctx'>    if (embedded_profile_len &lt; 0)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr,</div><div class='del'>-        "Embedded profile length in iCCP chunk is negative");</div><div class='add'>+          "Embedded profile length in iCCP chunk is negative");</div><div class='add'>+</div><div class='ctx'>       png_free(png_ptr, new_name);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='hunk'>@@ -819,7 +890,8 @@ png_write_iCCP(png_structp png_ptr, png_charp name, int compression_type,</div><div class='ctx'>    if (profile_len &lt; embedded_profile_len)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr,</div><div class='del'>-        "Embedded profile length too large in iCCP chunk");</div><div class='add'>+          "Embedded profile length too large in iCCP chunk");</div><div class='add'>+</div><div class='ctx'>       png_free(png_ptr, new_name);</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='hunk'>@@ -827,20 +899,23 @@ png_write_iCCP(png_structp png_ptr, png_charp name, int compression_type,</div><div class='ctx'>    if (profile_len &gt; embedded_profile_len)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr,</div><div class='del'>-        "Truncating profile to actual length in iCCP chunk");</div><div class='add'>+          "Truncating profile to actual length in iCCP chunk");</div><div class='add'>+</div><div class='ctx'>       profile_len = embedded_profile_len;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    if (profile_len)</div><div class='ctx'>       profile_len = png_text_compress(png_ptr, profile,</div><div class='del'>-        (png_size_t)profile_len, PNG_COMPRESSION_TYPE_BASE, &amp;comp);</div><div class='add'>+          (png_size_t)profile_len, PNG_COMPRESSION_TYPE_BASE, &amp;comp);</div><div class='ctx'> </div><div class='ctx'>    /* Make sure we include the NULL after the name and the compression type */</div><div class='del'>-   png_write_chunk_start(png_ptr, (png_bytep)png_iCCP,</div><div class='del'>-          (png_uint_32)(name_len + profile_len + 2));</div><div class='add'>+   png_write_chunk_start(png_ptr, png_iCCP,</div><div class='add'>+       (png_uint_32)(name_len + profile_len + 2));</div><div class='add'>+</div><div class='ctx'>    new_name[name_len + 1] = 0x00;</div><div class='add'>+</div><div class='ctx'>    png_write_chunk_data(png_ptr, (png_bytep)new_name,</div><div class='del'>-     (png_size_t)(name_len + 2));</div><div class='add'>+       (png_size_t)(name_len + 2));</div><div class='ctx'> </div><div class='ctx'>    if (profile_len)</div><div class='ctx'>       png_write_compressed_data_out(png_ptr, &amp;comp);</div><div class='hunk'>@@ -853,7 +928,7 @@ png_write_iCCP(png_structp png_ptr, png_charp name, int compression_type,</div><div class='ctx'> #ifdef PNG_WRITE_sPLT_SUPPORTED</div><div class='ctx'> /* Write a sPLT chunk */</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_write_sPLT(png_structp png_ptr, png_sPLT_tp spalette)</div><div class='add'>+png_write_sPLT(png_structp png_ptr, png_const_sPLT_tp spalette)</div><div class='ctx'> {</div><div class='ctx'>    PNG_sPLT;</div><div class='ctx'>    png_size_t name_len;</div><div class='hunk'>@@ -872,11 +947,13 @@ png_write_sPLT(png_structp png_ptr, png_sPLT_tp spalette)</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='ctx'>    /* Make sure we include the NULL after the name */</div><div class='del'>-   png_write_chunk_start(png_ptr, (png_bytep)png_sPLT,</div><div class='del'>-     (png_uint_32)(name_len + 2 + palette_size));</div><div class='add'>+   png_write_chunk_start(png_ptr, png_sPLT,</div><div class='add'>+       (png_uint_32)(name_len + 2 + palette_size));</div><div class='add'>+</div><div class='ctx'>    png_write_chunk_data(png_ptr, (png_bytep)new_name,</div><div class='del'>-     (png_size_t)(name_len + 1));</div><div class='del'>-   png_write_chunk_data(png_ptr, (png_bytep)&amp;spalette-&gt;depth, (png_size_t)1);</div><div class='add'>+       (png_size_t)(name_len + 1));</div><div class='add'>+</div><div class='add'>+   png_write_chunk_data(png_ptr, &amp;spalette-&gt;depth, (png_size_t)1);</div><div class='ctx'> </div><div class='ctx'>    /* Loop through each palette entry, writing appropriately */</div><div class='ctx'> #ifdef PNG_POINTER_INDEXING_SUPPORTED</div><div class='hunk'>@@ -884,42 +961,46 @@ png_write_sPLT(png_structp png_ptr, png_sPLT_tp spalette)</div><div class='ctx'>    {</div><div class='ctx'>       if (spalette-&gt;depth == 8)</div><div class='ctx'>       {</div><div class='del'>-          entrybuf[0] = (png_byte)ep-&gt;red;</div><div class='del'>-          entrybuf[1] = (png_byte)ep-&gt;green;</div><div class='del'>-          entrybuf[2] = (png_byte)ep-&gt;blue;</div><div class='del'>-          entrybuf[3] = (png_byte)ep-&gt;alpha;</div><div class='del'>-          png_save_uint_16(entrybuf + 4, ep-&gt;frequency);</div><div class='add'>+         entrybuf[0] = (png_byte)ep-&gt;red;</div><div class='add'>+         entrybuf[1] = (png_byte)ep-&gt;green;</div><div class='add'>+         entrybuf[2] = (png_byte)ep-&gt;blue;</div><div class='add'>+         entrybuf[3] = (png_byte)ep-&gt;alpha;</div><div class='add'>+         png_save_uint_16(entrybuf + 4, ep-&gt;frequency);</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='del'>-          png_save_uint_16(entrybuf + 0, ep-&gt;red);</div><div class='del'>-          png_save_uint_16(entrybuf + 2, ep-&gt;green);</div><div class='del'>-          png_save_uint_16(entrybuf + 4, ep-&gt;blue);</div><div class='del'>-          png_save_uint_16(entrybuf + 6, ep-&gt;alpha);</div><div class='del'>-          png_save_uint_16(entrybuf + 8, ep-&gt;frequency);</div><div class='add'>+         png_save_uint_16(entrybuf + 0, ep-&gt;red);</div><div class='add'>+         png_save_uint_16(entrybuf + 2, ep-&gt;green);</div><div class='add'>+         png_save_uint_16(entrybuf + 4, ep-&gt;blue);</div><div class='add'>+         png_save_uint_16(entrybuf + 6, ep-&gt;alpha);</div><div class='add'>+         png_save_uint_16(entrybuf + 8, ep-&gt;frequency);</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       png_write_chunk_data(png_ptr, entrybuf, (png_size_t)entry_size);</div><div class='ctx'>    }</div><div class='ctx'> #else</div><div class='ctx'>    ep=spalette-&gt;entries;</div><div class='del'>-   for (i=0; i&gt;spalette-&gt;nentries; i++)</div><div class='add'>+   for (i = 0; i&gt;spalette-&gt;nentries; i++)</div><div class='ctx'>    {</div><div class='ctx'>       if (spalette-&gt;depth == 8)</div><div class='ctx'>       {</div><div class='del'>-          entrybuf[0] = (png_byte)ep[i].red;</div><div class='del'>-          entrybuf[1] = (png_byte)ep[i].green;</div><div class='del'>-          entrybuf[2] = (png_byte)ep[i].blue;</div><div class='del'>-          entrybuf[3] = (png_byte)ep[i].alpha;</div><div class='del'>-          png_save_uint_16(entrybuf + 4, ep[i].frequency);</div><div class='add'>+         entrybuf[0] = (png_byte)ep[i].red;</div><div class='add'>+         entrybuf[1] = (png_byte)ep[i].green;</div><div class='add'>+         entrybuf[2] = (png_byte)ep[i].blue;</div><div class='add'>+         entrybuf[3] = (png_byte)ep[i].alpha;</div><div class='add'>+         png_save_uint_16(entrybuf + 4, ep[i].frequency);</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='del'>-          png_save_uint_16(entrybuf + 0, ep[i].red);</div><div class='del'>-          png_save_uint_16(entrybuf + 2, ep[i].green);</div><div class='del'>-          png_save_uint_16(entrybuf + 4, ep[i].blue);</div><div class='del'>-          png_save_uint_16(entrybuf + 6, ep[i].alpha);</div><div class='del'>-          png_save_uint_16(entrybuf + 8, ep[i].frequency);</div><div class='add'>+         png_save_uint_16(entrybuf + 0, ep[i].red);</div><div class='add'>+         png_save_uint_16(entrybuf + 2, ep[i].green);</div><div class='add'>+         png_save_uint_16(entrybuf + 4, ep[i].blue);</div><div class='add'>+         png_save_uint_16(entrybuf + 6, ep[i].alpha);</div><div class='add'>+         png_save_uint_16(entrybuf + 8, ep[i].frequency);</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       png_write_chunk_data(png_ptr, entrybuf, (png_size_t)entry_size);</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -932,7 +1013,7 @@ png_write_sPLT(png_structp png_ptr, png_sPLT_tp spalette)</div><div class='ctx'> #ifdef PNG_WRITE_sBIT_SUPPORTED</div><div class='ctx'> /* Write the sBIT chunk */</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_write_sBIT(png_structp png_ptr, png_color_8p sbit, int color_type)</div><div class='add'>+png_write_sBIT(png_structp png_ptr, png_const_color_8p sbit, int color_type)</div><div class='ctx'> {</div><div class='ctx'>    PNG_sBIT;</div><div class='ctx'>    png_byte buf[4];</div><div class='hunk'>@@ -946,7 +1027,8 @@ png_write_sBIT(png_structp png_ptr, png_color_8p sbit, int color_type)</div><div class='ctx'>       png_byte maxbits;</div><div class='ctx'> </div><div class='ctx'>       maxbits = (png_byte)(color_type==PNG_COLOR_TYPE_PALETTE ? 8 :</div><div class='del'>-                png_ptr-&gt;usr_bit_depth);</div><div class='add'>+          png_ptr-&gt;usr_bit_depth);</div><div class='add'>+</div><div class='ctx'>       if (sbit-&gt;red == 0 || sbit-&gt;red &gt; maxbits ||</div><div class='ctx'>           sbit-&gt;green == 0 || sbit-&gt;green &gt; maxbits ||</div><div class='ctx'>           sbit-&gt;blue == 0 || sbit-&gt;blue &gt; maxbits)</div><div class='hunk'>@@ -954,11 +1036,13 @@ png_write_sBIT(png_structp png_ptr, png_color_8p sbit, int color_type)</div><div class='ctx'>          png_warning(png_ptr, "Invalid sBIT depth specified");</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       buf[0] = sbit-&gt;red;</div><div class='ctx'>       buf[1] = sbit-&gt;green;</div><div class='ctx'>       buf[2] = sbit-&gt;blue;</div><div class='ctx'>       size = 3;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='ctx'>       if (sbit-&gt;gray == 0 || sbit-&gt;gray &gt; png_ptr-&gt;usr_bit_depth)</div><div class='hunk'>@@ -966,6 +1050,7 @@ png_write_sBIT(png_structp png_ptr, png_color_8p sbit, int color_type)</div><div class='ctx'>          png_warning(png_ptr, "Invalid sBIT depth specified");</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       buf[0] = sbit-&gt;gray;</div><div class='ctx'>       size = 1;</div><div class='ctx'>    }</div><div class='hunk'>@@ -977,67 +1062,21 @@ png_write_sBIT(png_structp png_ptr, png_color_8p sbit, int color_type)</div><div class='ctx'>          png_warning(png_ptr, "Invalid sBIT depth specified");</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       buf[size++] = sbit-&gt;alpha;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-   png_write_chunk(png_ptr, (png_bytep)png_sBIT, buf, size);</div><div class='add'>+   png_write_chunk(png_ptr, png_sBIT, buf, size);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_cHRM_SUPPORTED</div><div class='ctx'> /* Write the cHRM chunk */</div><div class='del'>-#ifdef PNG_FLOATING_POINT_SUPPORTED</div><div class='del'>-void /* PRIVATE */</div><div class='del'>-png_write_cHRM(png_structp png_ptr, double white_x, double white_y,</div><div class='del'>-   double red_x, double red_y, double green_x, double green_y,</div><div class='del'>-   double blue_x, double blue_y)</div><div class='del'>-{</div><div class='del'>-   PNG_cHRM;</div><div class='del'>-   png_byte buf[32];</div><div class='del'>-</div><div class='del'>-   png_fixed_point int_white_x, int_white_y, int_red_x, int_red_y,</div><div class='del'>-      int_green_x, int_green_y, int_blue_x, int_blue_y;</div><div class='del'>-</div><div class='del'>-   png_debug(1, "in png_write_cHRM");</div><div class='del'>-</div><div class='del'>-   int_white_x = (png_uint_32)(white_x * 100000.0 + 0.5);</div><div class='del'>-   int_white_y = (png_uint_32)(white_y * 100000.0 + 0.5);</div><div class='del'>-   int_red_x   = (png_uint_32)(red_x   * 100000.0 + 0.5);</div><div class='del'>-   int_red_y   = (png_uint_32)(red_y   * 100000.0 + 0.5);</div><div class='del'>-   int_green_x = (png_uint_32)(green_x * 100000.0 + 0.5);</div><div class='del'>-   int_green_y = (png_uint_32)(green_y * 100000.0 + 0.5);</div><div class='del'>-   int_blue_x  = (png_uint_32)(blue_x  * 100000.0 + 0.5);</div><div class='del'>-   int_blue_y  = (png_uint_32)(blue_y  * 100000.0 + 0.5);</div><div class='del'>-</div><div class='del'>-#ifdef PNG_CHECK_cHRM_SUPPORTED</div><div class='del'>-   if (png_check_cHRM_fixed(png_ptr, int_white_x, int_white_y,</div><div class='del'>-      int_red_x, int_red_y, int_green_x, int_green_y, int_blue_x, int_blue_y))</div><div class='del'>-#endif</div><div class='del'>-   {</div><div class='del'>-      /* Each value is saved in 1/100,000ths */</div><div class='del'>-</div><div class='del'>-      png_save_uint_32(buf, int_white_x);</div><div class='del'>-      png_save_uint_32(buf + 4, int_white_y);</div><div class='del'>-</div><div class='del'>-      png_save_uint_32(buf + 8, int_red_x);</div><div class='del'>-      png_save_uint_32(buf + 12, int_red_y);</div><div class='del'>-</div><div class='del'>-      png_save_uint_32(buf + 16, int_green_x);</div><div class='del'>-      png_save_uint_32(buf + 20, int_green_y);</div><div class='del'>-</div><div class='del'>-      png_save_uint_32(buf + 24, int_blue_x);</div><div class='del'>-      png_save_uint_32(buf + 28, int_blue_y);</div><div class='del'>-</div><div class='del'>-      png_write_chunk(png_ptr, (png_bytep)png_cHRM, buf, (png_size_t)32);</div><div class='del'>-   }</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_write_cHRM_fixed(png_structp png_ptr, png_fixed_point white_x,</div><div class='del'>-   png_fixed_point white_y, png_fixed_point red_x, png_fixed_point red_y,</div><div class='del'>-   png_fixed_point green_x, png_fixed_point green_y, png_fixed_point blue_x,</div><div class='del'>-   png_fixed_point blue_y)</div><div class='add'>+    png_fixed_point white_y, png_fixed_point red_x, png_fixed_point red_y,</div><div class='add'>+    png_fixed_point green_x, png_fixed_point green_y, png_fixed_point blue_x,</div><div class='add'>+    png_fixed_point blue_y)</div><div class='ctx'> {</div><div class='ctx'>    PNG_cHRM;</div><div class='ctx'>    png_byte buf[32];</div><div class='hunk'>@@ -1047,7 +1086,7 @@ png_write_cHRM_fixed(png_structp png_ptr, png_fixed_point white_x,</div><div class='ctx'>    /* Each value is saved in 1/100,000ths */</div><div class='ctx'> #ifdef PNG_CHECK_cHRM_SUPPORTED</div><div class='ctx'>    if (png_check_cHRM_fixed(png_ptr, white_x, white_y, red_x, red_y,</div><div class='del'>-      green_x, green_y, blue_x, blue_y))</div><div class='add'>+       green_x, green_y, blue_x, blue_y))</div><div class='ctx'> #endif</div><div class='ctx'>    {</div><div class='ctx'>       png_save_uint_32(buf, (png_uint_32)white_x);</div><div class='hunk'>@@ -1062,17 +1101,16 @@ png_write_cHRM_fixed(png_structp png_ptr, png_fixed_point white_x,</div><div class='ctx'>       png_save_uint_32(buf + 24, (png_uint_32)blue_x);</div><div class='ctx'>       png_save_uint_32(buf + 28, (png_uint_32)blue_y);</div><div class='ctx'> </div><div class='del'>-      png_write_chunk(png_ptr, (png_bytep)png_cHRM, buf, (png_size_t)32);</div><div class='add'>+      png_write_chunk(png_ptr, png_cHRM, buf, (png_size_t)32);</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_tRNS_SUPPORTED</div><div class='ctx'> /* Write the tRNS chunk */</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_write_tRNS(png_structp png_ptr, png_bytep trans_alpha, png_color_16p tran,</div><div class='del'>-   int num_trans, int color_type)</div><div class='add'>+png_write_tRNS(png_structp png_ptr, png_const_bytep trans_alpha,</div><div class='add'>+    png_const_color_16p tran, int num_trans, int color_type)</div><div class='ctx'> {</div><div class='ctx'>    PNG_tRNS;</div><div class='ctx'>    png_byte buf[6];</div><div class='hunk'>@@ -1086,36 +1124,46 @@ png_write_tRNS(png_structp png_ptr, png_bytep trans_alpha, png_color_16p tran,</div><div class='ctx'>          png_warning(png_ptr, "Invalid number of transparent colors specified");</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       /* Write the chunk out as it is */</div><div class='del'>-      png_write_chunk(png_ptr, (png_bytep)png_tRNS, trans_alpha,</div><div class='del'>-        (png_size_t)num_trans);</div><div class='add'>+      png_write_chunk(png_ptr, png_tRNS, trans_alpha, (png_size_t)num_trans);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (color_type == PNG_COLOR_TYPE_GRAY)</div><div class='ctx'>    {</div><div class='ctx'>       /* One 16 bit value */</div><div class='ctx'>       if (tran-&gt;gray &gt;= (1 &lt;&lt; png_ptr-&gt;bit_depth))</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr,</div><div class='del'>-           "Ignoring attempt to write tRNS chunk out-of-range for bit_depth");</div><div class='add'>+             "Ignoring attempt to write tRNS chunk out-of-range for bit_depth");</div><div class='add'>+</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       png_save_uint_16(buf, tran-&gt;gray);</div><div class='del'>-      png_write_chunk(png_ptr, (png_bytep)png_tRNS, buf, (png_size_t)2);</div><div class='add'>+      png_write_chunk(png_ptr, png_tRNS, buf, (png_size_t)2);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (color_type == PNG_COLOR_TYPE_RGB)</div><div class='ctx'>    {</div><div class='ctx'>       /* Three 16 bit values */</div><div class='ctx'>       png_save_uint_16(buf, tran-&gt;red);</div><div class='ctx'>       png_save_uint_16(buf + 2, tran-&gt;green);</div><div class='ctx'>       png_save_uint_16(buf + 4, tran-&gt;blue);</div><div class='add'>+#ifdef PNG_WRITE_16BIT_SUPPORTED</div><div class='ctx'>       if (png_ptr-&gt;bit_depth == 8 &amp;&amp; (buf[0] | buf[2] | buf[4]))</div><div class='add'>+#else</div><div class='add'>+      if (buf[0] | buf[2] | buf[4])</div><div class='add'>+#endif</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr,</div><div class='ctx'>            "Ignoring attempt to write 16-bit tRNS chunk when bit_depth is 8");</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='del'>-      png_write_chunk(png_ptr, (png_bytep)png_tRNS, buf, (png_size_t)6);</div><div class='add'>+</div><div class='add'>+      png_write_chunk(png_ptr, png_tRNS, buf, (png_size_t)6);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Can't write tRNS with an alpha channel");</div><div class='hunk'>@@ -1126,7 +1174,7 @@ png_write_tRNS(png_structp png_ptr, png_bytep trans_alpha, png_color_16p tran,</div><div class='ctx'> #ifdef PNG_WRITE_bKGD_SUPPORTED</div><div class='ctx'> /* Write the background chunk */</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_write_bKGD(png_structp png_ptr, png_color_16p back, int color_type)</div><div class='add'>+png_write_bKGD(png_structp png_ptr, png_const_color_16p back, int color_type)</div><div class='ctx'> {</div><div class='ctx'>    PNG_bKGD;</div><div class='ctx'>    png_byte buf[6];</div><div class='hunk'>@@ -1145,32 +1193,43 @@ png_write_bKGD(png_structp png_ptr, png_color_16p back, int color_type)</div><div class='ctx'>          png_warning(png_ptr, "Invalid background palette index");</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       buf[0] = back-&gt;index;</div><div class='del'>-      png_write_chunk(png_ptr, (png_bytep)png_bKGD, buf, (png_size_t)1);</div><div class='add'>+      png_write_chunk(png_ptr, png_bKGD, buf, (png_size_t)1);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else if (color_type &amp; PNG_COLOR_MASK_COLOR)</div><div class='ctx'>    {</div><div class='ctx'>       png_save_uint_16(buf, back-&gt;red);</div><div class='ctx'>       png_save_uint_16(buf + 2, back-&gt;green);</div><div class='ctx'>       png_save_uint_16(buf + 4, back-&gt;blue);</div><div class='add'>+#ifdef PNG_WRITE_16BIT_SUPPORTED</div><div class='ctx'>       if (png_ptr-&gt;bit_depth == 8 &amp;&amp; (buf[0] | buf[2] | buf[4]))</div><div class='add'>+#else</div><div class='add'>+      if (buf[0] | buf[2] | buf[4])</div><div class='add'>+#endif</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr,</div><div class='del'>-           "Ignoring attempt to write 16-bit bKGD chunk when bit_depth is 8");</div><div class='add'>+             "Ignoring attempt to write 16-bit bKGD chunk when bit_depth is 8");</div><div class='add'>+</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='del'>-      png_write_chunk(png_ptr, (png_bytep)png_bKGD, buf, (png_size_t)6);</div><div class='add'>+</div><div class='add'>+      png_write_chunk(png_ptr, png_bKGD, buf, (png_size_t)6);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>    {</div><div class='ctx'>       if (back-&gt;gray &gt;= (1 &lt;&lt; png_ptr-&gt;bit_depth))</div><div class='ctx'>       {</div><div class='ctx'>          png_warning(png_ptr,</div><div class='del'>-           "Ignoring attempt to write bKGD chunk out-of-range for bit_depth");</div><div class='add'>+             "Ignoring attempt to write bKGD chunk out-of-range for bit_depth");</div><div class='add'>+</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       png_save_uint_16(buf, back-&gt;gray);</div><div class='del'>-      png_write_chunk(png_ptr, (png_bytep)png_bKGD, buf, (png_size_t)2);</div><div class='add'>+      png_write_chunk(png_ptr, png_bKGD, buf, (png_size_t)2);</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1178,7 +1237,7 @@ png_write_bKGD(png_structp png_ptr, png_color_16p back, int color_type)</div><div class='ctx'> #ifdef PNG_WRITE_hIST_SUPPORTED</div><div class='ctx'> /* Write the histogram */</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_write_hIST(png_structp png_ptr, png_uint_16p hist, int num_hist)</div><div class='add'>+png_write_hIST(png_structp png_ptr, png_const_uint_16p hist, int num_hist)</div><div class='ctx'> {</div><div class='ctx'>    PNG_hIST;</div><div class='ctx'>    int i;</div><div class='hunk'>@@ -1189,18 +1248,20 @@ png_write_hIST(png_structp png_ptr, png_uint_16p hist, int num_hist)</div><div class='ctx'>    if (num_hist &gt; (int)png_ptr-&gt;num_palette)</div><div class='ctx'>    {</div><div class='ctx'>       png_debug2(3, "num_hist = %d, num_palette = %d", num_hist,</div><div class='del'>-         png_ptr-&gt;num_palette);</div><div class='add'>+          png_ptr-&gt;num_palette);</div><div class='add'>+</div><div class='ctx'>       png_warning(png_ptr, "Invalid number of histogram entries specified");</div><div class='ctx'>       return;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='del'>-   png_write_chunk_start(png_ptr, (png_bytep)png_hIST,</div><div class='del'>-     (png_uint_32)(num_hist * 2));</div><div class='add'>+   png_write_chunk_start(png_ptr, png_hIST, (png_uint_32)(num_hist * 2));</div><div class='add'>+</div><div class='ctx'>    for (i = 0; i &lt; num_hist; i++)</div><div class='ctx'>    {</div><div class='ctx'>       png_save_uint_16(buf, hist[i]);</div><div class='ctx'>       png_write_chunk_data(png_ptr, buf, (png_size_t)2);</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    png_write_chunk_end(png_ptr);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1218,9 +1279,10 @@ png_write_hIST(png_structp png_ptr, png_uint_16p hist, int num_hist)</div><div class='ctx'>  * static keywords without having to have duplicate copies of the strings.</div><div class='ctx'>  */</div><div class='ctx'> png_size_t /* PRIVATE */</div><div class='del'>-png_check_keyword(png_structp png_ptr, png_charp key, png_charpp new_key)</div><div class='add'>+png_check_keyword(png_structp png_ptr, png_const_charp key, png_charpp new_key)</div><div class='ctx'> {</div><div class='ctx'>    png_size_t key_len;</div><div class='add'>+   png_const_charp ikp;</div><div class='ctx'>    png_charp kp, dp;</div><div class='ctx'>    int kflag;</div><div class='ctx'>    int kwarn=0;</div><div class='hunk'>@@ -1238,6 +1300,7 @@ png_check_keyword(png_structp png_ptr, png_charp key, png_charpp new_key)</div><div class='ctx'>    png_debug1(2, "Keyword to be checked is '%s'", key);</div><div class='ctx'> </div><div class='ctx'>    *new_key = (png_charp)png_malloc_warn(png_ptr, (png_uint_32)(key_len + 2));</div><div class='add'>+</div><div class='ctx'>    if (*new_key == NULL)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Out of memory while procesing keyword");</div><div class='hunk'>@@ -1245,25 +1308,26 @@ png_check_keyword(png_structp png_ptr, png_charp key, png_charpp new_key)</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    /* Replace non-printing characters with a blank and print a warning */</div><div class='del'>-   for (kp = key, dp = *new_key; *kp != '\0'; kp++, dp++)</div><div class='add'>+   for (ikp = key, dp = *new_key; *ikp != '\0'; ikp++, dp++)</div><div class='ctx'>    {</div><div class='del'>-      if ((png_byte)*kp &lt; 0x20 ||</div><div class='del'>-         ((png_byte)*kp &gt; 0x7E &amp;&amp; (png_byte)*kp &lt; 0xA1))</div><div class='add'>+      if ((png_byte)*ikp &lt; 0x20 ||</div><div class='add'>+         ((png_byte)*ikp &gt; 0x7E &amp;&amp; (png_byte)*ikp &lt; 0xA1))</div><div class='ctx'>       {</div><div class='del'>-#ifdef PNG_STDIO_SUPPORTED</div><div class='add'>+#ifdef PNG_CONSOLE_IO_SUPPORTED</div><div class='ctx'>          char msg[40];</div><div class='ctx'> </div><div class='ctx'>          png_snprintf(msg, 40,</div><div class='del'>-           "invalid keyword character 0x%02X", (png_byte)*kp);</div><div class='add'>+             "invalid keyword character 0x%02X", (png_byte)*ikp);</div><div class='ctx'>          png_warning(png_ptr, msg);</div><div class='ctx'> #else</div><div class='ctx'>          png_warning(png_ptr, "invalid character in keyword");</div><div class='ctx'> #endif</div><div class='ctx'>          *dp = ' ';</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='del'>-         *dp = *kp;</div><div class='add'>+         *dp = *ikp;</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='ctx'>    *dp = '\0';</div><div class='hunk'>@@ -1304,11 +1368,13 @@ png_check_keyword(png_structp png_ptr, png_charp key, png_charpp new_key)</div><div class='ctx'>          *(dp++) = *kp;</div><div class='ctx'>          kflag = 1;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if (*kp == ' ')</div><div class='ctx'>       {</div><div class='ctx'>          key_len--;</div><div class='del'>-         kwarn=1;</div><div class='add'>+         kwarn = 1;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          *(dp++) = *kp;</div><div class='hunk'>@@ -1339,8 +1405,8 @@ png_check_keyword(png_structp png_ptr, png_charp key, png_charpp new_key)</div><div class='ctx'> #ifdef PNG_WRITE_tEXt_SUPPORTED</div><div class='ctx'> /* Write a tEXt chunk */</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_write_tEXt(png_structp png_ptr, png_charp key, png_charp text,</div><div class='del'>-   png_size_t text_len)</div><div class='add'>+png_write_tEXt(png_structp png_ptr, png_const_charp key, png_const_charp text,</div><div class='add'>+    png_size_t text_len)</div><div class='ctx'> {</div><div class='ctx'>    PNG_tEXt;</div><div class='ctx'>    png_size_t key_len;</div><div class='hunk'>@@ -1353,12 +1419,13 @@ png_write_tEXt(png_structp png_ptr, png_charp key, png_charp text,</div><div class='ctx'> </div><div class='ctx'>    if (text == NULL || *text == '\0')</div><div class='ctx'>       text_len = 0;</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       text_len = png_strlen(text);</div><div class='ctx'> </div><div class='ctx'>    /* Make sure we include the 0 after the key */</div><div class='del'>-   png_write_chunk_start(png_ptr, (png_bytep)png_tEXt,</div><div class='del'>-      (png_uint_32)(key_len + text_len + 1));</div><div class='add'>+   png_write_chunk_start(png_ptr, png_tEXt,</div><div class='add'>+       (png_uint_32)(key_len + text_len + 1));</div><div class='ctx'>    /*</div><div class='ctx'>     * We leave it to the application to meet PNG-1.0 requirements on the</div><div class='ctx'>     * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of</div><div class='hunk'>@@ -1366,9 +1433,11 @@ png_write_tEXt(png_structp png_ptr, png_charp key, png_charp text,</div><div class='ctx'>     * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.</div><div class='ctx'>     */</div><div class='ctx'>    png_write_chunk_data(png_ptr, (png_bytep)new_key,</div><div class='del'>-     (png_size_t)(key_len + 1));</div><div class='add'>+       (png_size_t)(key_len + 1));</div><div class='add'>+</div><div class='ctx'>    if (text_len)</div><div class='del'>-      png_write_chunk_data(png_ptr, (png_bytep)text, (png_size_t)text_len);</div><div class='add'>+      png_write_chunk_data(png_ptr, (png_const_bytep)text,</div><div class='add'>+          (png_size_t)text_len);</div><div class='ctx'> </div><div class='ctx'>    png_write_chunk_end(png_ptr);</div><div class='ctx'>    png_free(png_ptr, new_key);</div><div class='hunk'>@@ -1378,12 +1447,12 @@ png_write_tEXt(png_structp png_ptr, png_charp key, png_charp text,</div><div class='ctx'> #ifdef PNG_WRITE_zTXt_SUPPORTED</div><div class='ctx'> /* Write a compressed text chunk */</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_write_zTXt(png_structp png_ptr, png_charp key, png_charp text,</div><div class='del'>-   png_size_t text_len, int compression)</div><div class='add'>+png_write_zTXt(png_structp png_ptr, png_const_charp key, png_const_charp text,</div><div class='add'>+    png_size_t text_len, int compression)</div><div class='ctx'> {</div><div class='ctx'>    PNG_zTXt;</div><div class='ctx'>    png_size_t key_len;</div><div class='del'>-   char buf[1];</div><div class='add'>+   png_byte buf;</div><div class='ctx'>    png_charp new_key;</div><div class='ctx'>    compression_state comp;</div><div class='ctx'> </div><div class='hunk'>@@ -1395,7 +1464,7 @@ png_write_zTXt(png_structp png_ptr, png_charp key, png_charp text,</div><div class='ctx'>    comp.input = NULL;</div><div class='ctx'>    comp.input_len = 0;</div><div class='ctx'> </div><div class='del'>-   if ((key_len = png_check_keyword(png_ptr, key, &amp;new_key))==0)</div><div class='add'>+   if ((key_len = png_check_keyword(png_ptr, key, &amp;new_key)) == 0)</div><div class='ctx'>    {</div><div class='ctx'>       png_free(png_ptr, new_key);</div><div class='ctx'>       return;</div><div class='hunk'>@@ -1415,16 +1484,20 @@ png_write_zTXt(png_structp png_ptr, png_charp key, png_charp text,</div><div class='ctx'>        &amp;comp);</div><div class='ctx'> </div><div class='ctx'>    /* Write start of chunk */</div><div class='del'>-   png_write_chunk_start(png_ptr, (png_bytep)png_zTXt,</div><div class='del'>-     (png_uint_32)(key_len+text_len + 2));</div><div class='add'>+   png_write_chunk_start(png_ptr, png_zTXt,</div><div class='add'>+       (png_uint_32)(key_len+text_len + 2));</div><div class='add'>+</div><div class='ctx'>    /* Write key */</div><div class='ctx'>    png_write_chunk_data(png_ptr, (png_bytep)new_key,</div><div class='del'>-     (png_size_t)(key_len + 1));</div><div class='add'>+       (png_size_t)(key_len + 1));</div><div class='add'>+</div><div class='ctx'>    png_free(png_ptr, new_key);</div><div class='ctx'> </div><div class='del'>-   buf[0] = (png_byte)compression;</div><div class='add'>+   buf = (png_byte)compression;</div><div class='add'>+</div><div class='ctx'>    /* Write compression */</div><div class='del'>-   png_write_chunk_data(png_ptr, (png_bytep)buf, (png_size_t)1);</div><div class='add'>+   png_write_chunk_data(png_ptr, &amp;buf, (png_size_t)1);</div><div class='add'>+</div><div class='ctx'>    /* Write the compressed data */</div><div class='ctx'>    png_write_compressed_data_out(png_ptr, &amp;comp);</div><div class='ctx'> </div><div class='hunk'>@@ -1436,8 +1509,8 @@ png_write_zTXt(png_structp png_ptr, png_charp key, png_charp text,</div><div class='ctx'> #ifdef PNG_WRITE_iTXt_SUPPORTED</div><div class='ctx'> /* Write an iTXt chunk */</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_write_iTXt(png_structp png_ptr, int compression, png_charp key,</div><div class='del'>-    png_charp lang, png_charp lang_key, png_charp text)</div><div class='add'>+png_write_iTXt(png_structp png_ptr, int compression, png_const_charp key,</div><div class='add'>+    png_const_charp lang, png_const_charp lang_key, png_const_charp text)</div><div class='ctx'> {</div><div class='ctx'>    PNG_iTXt;</div><div class='ctx'>    png_size_t lang_len, key_len, lang_key_len, text_len;</div><div class='hunk'>@@ -1453,10 +1526,10 @@ png_write_iTXt(png_structp png_ptr, int compression, png_charp key,</div><div class='ctx'>    comp.output_ptr = NULL;</div><div class='ctx'>    comp.input = NULL;</div><div class='ctx'> </div><div class='del'>-   if ((key_len = png_check_keyword(png_ptr, key, &amp;new_key))==0)</div><div class='add'>+   if ((key_len = png_check_keyword(png_ptr, key, &amp;new_key)) == 0)</div><div class='ctx'>       return;</div><div class='ctx'> </div><div class='del'>-   if ((lang_len = png_check_keyword(png_ptr, lang, &amp;new_lang))==0)</div><div class='add'>+   if ((lang_len = png_check_keyword(png_ptr, lang, &amp;new_lang)) == 0)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Empty language field in iTXt chunk");</div><div class='ctx'>       new_lang = NULL;</div><div class='hunk'>@@ -1465,24 +1538,26 @@ png_write_iTXt(png_structp png_ptr, int compression, png_charp key,</div><div class='ctx'> </div><div class='ctx'>    if (lang_key == NULL)</div><div class='ctx'>       lang_key_len = 0;</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       lang_key_len = png_strlen(lang_key);</div><div class='ctx'> </div><div class='ctx'>    if (text == NULL)</div><div class='ctx'>       text_len = 0;</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'>       text_len = png_strlen(text);</div><div class='ctx'> </div><div class='ctx'>    /* Compute the compressed data; do it now for the length */</div><div class='del'>-   text_len = png_text_compress(png_ptr, text, text_len, compression-2,</div><div class='del'>-      &amp;comp);</div><div class='add'>+   text_len = png_text_compress(png_ptr, text, text_len, compression - 2,</div><div class='add'>+       &amp;comp);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>    /* Make sure we include the compression flag, the compression byte,</div><div class='del'>-    * and the NULs after the key, lang, and lang_key parts */</div><div class='add'>+    * and the NULs after the key, lang, and lang_key parts</div><div class='add'>+    */</div><div class='ctx'> </div><div class='del'>-   png_write_chunk_start(png_ptr, (png_bytep)png_iTXt,</div><div class='del'>-          (png_uint_32)(</div><div class='add'>+   png_write_chunk_start(png_ptr, png_iTXt, (png_uint_32)(</div><div class='ctx'>         5 /* comp byte, comp flag, terminators for key, lang and lang_key */</div><div class='ctx'>         + key_len</div><div class='ctx'>         + lang_len</div><div class='hunk'>@@ -1494,27 +1569,32 @@ png_write_iTXt(png_structp png_ptr, int compression, png_charp key,</div><div class='ctx'>     * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.</div><div class='ctx'>     * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.</div><div class='ctx'>     */</div><div class='del'>-   png_write_chunk_data(png_ptr, (png_bytep)new_key,</div><div class='del'>-     (png_size_t)(key_len + 1));</div><div class='add'>+   png_write_chunk_data(png_ptr, (png_bytep)new_key, (png_size_t)(key_len + 1));</div><div class='ctx'> </div><div class='ctx'>    /* Set the compression flag */</div><div class='del'>-   if (compression == PNG_ITXT_COMPRESSION_NONE || \</div><div class='add'>+   if (compression == PNG_ITXT_COMPRESSION_NONE ||</div><div class='ctx'>        compression == PNG_TEXT_COMPRESSION_NONE)</div><div class='del'>-       cbuf[0] = 0;</div><div class='add'>+      cbuf[0] = 0;</div><div class='add'>+</div><div class='ctx'>    else /* compression == PNG_ITXT_COMPRESSION_zTXt */</div><div class='del'>-       cbuf[0] = 1;</div><div class='add'>+      cbuf[0] = 1;</div><div class='add'>+</div><div class='ctx'>    /* Set the compression method */</div><div class='ctx'>    cbuf[1] = 0;</div><div class='add'>+</div><div class='ctx'>    png_write_chunk_data(png_ptr, cbuf, (png_size_t)2);</div><div class='ctx'> </div><div class='ctx'>    cbuf[0] = 0;</div><div class='del'>-   png_write_chunk_data(png_ptr, (new_lang ? (png_bytep)new_lang : cbuf),</div><div class='del'>-     (png_size_t)(lang_len + 1));</div><div class='del'>-   png_write_chunk_data(png_ptr, (lang_key ? (png_bytep)lang_key : cbuf),</div><div class='del'>-     (png_size_t)(lang_key_len + 1));</div><div class='add'>+   png_write_chunk_data(png_ptr, (new_lang ? (png_const_bytep)new_lang : cbuf),</div><div class='add'>+       (png_size_t)(lang_len + 1));</div><div class='add'>+</div><div class='add'>+   png_write_chunk_data(png_ptr, (lang_key ? (png_const_bytep)lang_key : cbuf),</div><div class='add'>+       (png_size_t)(lang_key_len + 1));</div><div class='add'>+</div><div class='ctx'>    png_write_compressed_data_out(png_ptr, &amp;comp);</div><div class='ctx'> </div><div class='ctx'>    png_write_chunk_end(png_ptr);</div><div class='add'>+</div><div class='ctx'>    png_free(png_ptr, new_key);</div><div class='ctx'>    png_free(png_ptr, new_lang);</div><div class='ctx'> }</div><div class='hunk'>@@ -1524,7 +1604,7 @@ png_write_iTXt(png_structp png_ptr, int compression, png_charp key,</div><div class='ctx'> /* Write the oFFs chunk */</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_write_oFFs(png_structp png_ptr, png_int_32 x_offset, png_int_32 y_offset,</div><div class='del'>-   int unit_type)</div><div class='add'>+    int unit_type)</div><div class='ctx'> {</div><div class='ctx'>    PNG_oFFs;</div><div class='ctx'>    png_byte buf[9];</div><div class='hunk'>@@ -1538,14 +1618,15 @@ png_write_oFFs(png_structp png_ptr, png_int_32 x_offset, png_int_32 y_offset,</div><div class='ctx'>    png_save_int_32(buf + 4, y_offset);</div><div class='ctx'>    buf[8] = (png_byte)unit_type;</div><div class='ctx'> </div><div class='del'>-   png_write_chunk(png_ptr, (png_bytep)png_oFFs, buf, (png_size_t)9);</div><div class='add'>+   png_write_chunk(png_ptr, png_oFFs, buf, (png_size_t)9);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> #ifdef PNG_WRITE_pCAL_SUPPORTED</div><div class='ctx'> /* Write the pCAL chunk (described in the PNG extensions document) */</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0,</div><div class='del'>-   png_int_32 X1, int type, int nparams, png_charp units, png_charpp params)</div><div class='add'>+    png_int_32 X1, int type, int nparams, png_const_charp units,</div><div class='add'>+    png_charpp params)</div><div class='ctx'> {</div><div class='ctx'>    PNG_pCAL;</div><div class='ctx'>    png_size_t purpose_len, units_len, total_len;</div><div class='hunk'>@@ -1566,35 +1647,36 @@ png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0,</div><div class='ctx'>    total_len = purpose_len + units_len + 10;</div><div class='ctx'> </div><div class='ctx'>    params_len = (png_uint_32p)png_malloc(png_ptr,</div><div class='del'>-      (png_alloc_size_t)(nparams * png_sizeof(png_uint_32)));</div><div class='add'>+       (png_alloc_size_t)(nparams * png_sizeof(png_uint_32)));</div><div class='ctx'> </div><div class='ctx'>    /* Find the length of each parameter, making sure we don't count the</div><div class='del'>-      null terminator for the last parameter. */</div><div class='add'>+    * null terminator for the last parameter.</div><div class='add'>+    */</div><div class='ctx'>    for (i = 0; i &lt; nparams; i++)</div><div class='ctx'>    {</div><div class='ctx'>       params_len[i] = png_strlen(params[i]) + (i == nparams - 1 ? 0 : 1);</div><div class='ctx'>       png_debug2(3, "pCAL parameter %d length = %lu", i,</div><div class='del'>-        (unsigned long) params_len[i]);</div><div class='add'>+          (unsigned long)params_len[i]);</div><div class='ctx'>       total_len += (png_size_t)params_len[i];</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_debug1(3, "pCAL total length = %d", (int)total_len);</div><div class='del'>-   png_write_chunk_start(png_ptr, (png_bytep)png_pCAL, (png_uint_32)total_len);</div><div class='del'>-   png_write_chunk_data(png_ptr, (png_bytep)new_purpose,</div><div class='del'>-     (png_size_t)purpose_len);</div><div class='add'>+   png_write_chunk_start(png_ptr, png_pCAL, (png_uint_32)total_len);</div><div class='add'>+   png_write_chunk_data(png_ptr, (png_const_bytep)new_purpose,</div><div class='add'>+       (png_size_t)purpose_len);</div><div class='ctx'>    png_save_int_32(buf, X0);</div><div class='ctx'>    png_save_int_32(buf + 4, X1);</div><div class='ctx'>    buf[8] = (png_byte)type;</div><div class='ctx'>    buf[9] = (png_byte)nparams;</div><div class='ctx'>    png_write_chunk_data(png_ptr, buf, (png_size_t)10);</div><div class='del'>-   png_write_chunk_data(png_ptr, (png_bytep)units, (png_size_t)units_len);</div><div class='add'>+   png_write_chunk_data(png_ptr, (png_const_bytep)units, (png_size_t)units_len);</div><div class='ctx'> </div><div class='ctx'>    png_free(png_ptr, new_purpose);</div><div class='ctx'> </div><div class='ctx'>    for (i = 0; i &lt; nparams; i++)</div><div class='ctx'>    {</div><div class='del'>-      png_write_chunk_data(png_ptr, (png_bytep)params[i],</div><div class='del'>-         (png_size_t)params_len[i]);</div><div class='add'>+      png_write_chunk_data(png_ptr, (png_const_bytep)params[i],</div><div class='add'>+          (png_size_t)params_len[i]);</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    png_free(png_ptr, params_len);</div><div class='hunk'>@@ -1604,30 +1686,9 @@ png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0,</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_sCAL_SUPPORTED</div><div class='ctx'> /* Write the sCAL chunk */</div><div class='del'>-#if defined(PNG_FLOATING_POINT_SUPPORTED) &amp;&amp; defined(PNG_STDIO_SUPPORTED)</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_write_sCAL(png_structp png_ptr, int unit, double width, double height)</div><div class='del'>-{</div><div class='del'>-   PNG_sCAL;</div><div class='del'>-   char buf[64];</div><div class='del'>-   png_size_t total_len;</div><div class='del'>-</div><div class='del'>-   png_debug(1, "in png_write_sCAL");</div><div class='del'>-</div><div class='del'>-   buf[0] = (char)unit;</div><div class='del'>-   png_snprintf(buf + 1, 63, "%12.12e", width);</div><div class='del'>-   total_len = 1 + png_strlen(buf + 1) + 1;</div><div class='del'>-   png_snprintf(buf + total_len, 64-total_len, "%12.12e", height);</div><div class='del'>-   total_len += png_strlen(buf + total_len);</div><div class='del'>-</div><div class='del'>-   png_debug1(3, "sCAL total length = %u", (unsigned int)total_len);</div><div class='del'>-   png_write_chunk(png_ptr, (png_bytep)png_sCAL, (png_bytep)buf, total_len);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#ifdef PNG_FIXED_POINT_SUPPORTED</div><div class='del'>-void /* PRIVATE */</div><div class='del'>-png_write_sCAL_s(png_structp png_ptr, int unit, png_charp width,</div><div class='del'>-   png_charp height)</div><div class='add'>+png_write_sCAL_s(png_structp png_ptr, int unit, png_const_charp width,</div><div class='add'>+    png_const_charp height)</div><div class='ctx'> {</div><div class='ctx'>    PNG_sCAL;</div><div class='ctx'>    png_byte buf[64];</div><div class='hunk'>@@ -1638,6 +1699,7 @@ png_write_sCAL_s(png_structp png_ptr, int unit, png_charp width,</div><div class='ctx'>    wlen = png_strlen(width);</div><div class='ctx'>    hlen = png_strlen(height);</div><div class='ctx'>    total_len = wlen + hlen + 2;</div><div class='add'>+</div><div class='ctx'>    if (total_len &gt; 64)</div><div class='ctx'>    {</div><div class='ctx'>       png_warning(png_ptr, "Can't write sCAL (buffer too small)");</div><div class='hunk'>@@ -1649,18 +1711,16 @@ png_write_sCAL_s(png_structp png_ptr, int unit, png_charp width,</div><div class='ctx'>    png_memcpy(buf + wlen + 2, height, hlen);  /* Do NOT append the '\0' here */</div><div class='ctx'> </div><div class='ctx'>    png_debug1(3, "sCAL total length = %u", (unsigned int)total_len);</div><div class='del'>-   png_write_chunk(png_ptr, (png_bytep)png_sCAL, buf, total_len);</div><div class='add'>+   png_write_chunk(png_ptr, png_sCAL, buf, total_len);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_pHYs_SUPPORTED</div><div class='ctx'> /* Write the pHYs chunk */</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_write_pHYs(png_structp png_ptr, png_uint_32 x_pixels_per_unit,</div><div class='del'>-   png_uint_32 y_pixels_per_unit,</div><div class='del'>-   int unit_type)</div><div class='add'>+    png_uint_32 y_pixels_per_unit,</div><div class='add'>+    int unit_type)</div><div class='ctx'> {</div><div class='ctx'>    PNG_pHYs;</div><div class='ctx'>    png_byte buf[9];</div><div class='hunk'>@@ -1674,7 +1734,7 @@ png_write_pHYs(png_structp png_ptr, png_uint_32 x_pixels_per_unit,</div><div class='ctx'>    png_save_uint_32(buf + 4, y_pixels_per_unit);</div><div class='ctx'>    buf[8] = (png_byte)unit_type;</div><div class='ctx'> </div><div class='del'>-   png_write_chunk(png_ptr, (png_bytep)png_pHYs, buf, (png_size_t)9);</div><div class='add'>+   png_write_chunk(png_ptr, png_pHYs, buf, (png_size_t)9);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1683,7 +1743,7 @@ png_write_pHYs(png_structp png_ptr, png_uint_32 x_pixels_per_unit,</div><div class='ctx'>  * or png_convert_from_time_t(), or fill in the structure yourself.</div><div class='ctx'>  */</div><div class='ctx'> void /* PRIVATE */</div><div class='del'>-png_write_tIME(png_structp png_ptr, png_timep mod_time)</div><div class='add'>+png_write_tIME(png_structp png_ptr, png_const_timep mod_time)</div><div class='ctx'> {</div><div class='ctx'>    PNG_tIME;</div><div class='ctx'>    png_byte buf[7];</div><div class='hunk'>@@ -1705,7 +1765,7 @@ png_write_tIME(png_structp png_ptr, png_timep mod_time)</div><div class='ctx'>    buf[5] = mod_time-&gt;minute;</div><div class='ctx'>    buf[6] = mod_time-&gt;second;</div><div class='ctx'> </div><div class='del'>-   png_write_chunk(png_ptr, (png_bytep)png_tIME, buf, (png_size_t)7);</div><div class='add'>+   png_write_chunk(png_ptr, png_tIME, buf, (png_size_t)7);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1734,19 +1794,20 @@ png_write_start_row(png_structp png_ptr)</div><div class='ctx'>    png_debug(1, "in png_write_start_row");</div><div class='ctx'> </div><div class='ctx'>    buf_size = (png_size_t)(PNG_ROWBYTES(</div><div class='del'>-      png_ptr-&gt;usr_channels*png_ptr-&gt;usr_bit_depth, png_ptr-&gt;width) + 1);</div><div class='add'>+       png_ptr-&gt;usr_channels*png_ptr-&gt;usr_bit_depth, png_ptr-&gt;width) + 1);</div><div class='ctx'> </div><div class='ctx'>    /* Set up row buffer */</div><div class='ctx'>    png_ptr-&gt;row_buf = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-     (png_alloc_size_t)buf_size);</div><div class='add'>+       (png_alloc_size_t)buf_size);</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;row_buf[0] = PNG_FILTER_VALUE_NONE;</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_FILTER_SUPPORTED</div><div class='ctx'>    /* Set up filtering buffer, if using this filter */</div><div class='ctx'>    if (png_ptr-&gt;do_filter &amp; PNG_FILTER_SUB)</div><div class='ctx'>    {</div><div class='del'>-      png_ptr-&gt;sub_row = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-         (png_alloc_size_t)(png_ptr-&gt;rowbytes + 1));</div><div class='add'>+      png_ptr-&gt;sub_row = (png_bytep)png_malloc(png_ptr, png_ptr-&gt;rowbytes + 1);</div><div class='add'>+</div><div class='ctx'>       png_ptr-&gt;sub_row[0] = PNG_FILTER_VALUE_SUB;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='hunk'>@@ -1755,26 +1816,29 @@ png_write_start_row(png_structp png_ptr)</div><div class='ctx'>    {</div><div class='ctx'>       /* Set up previous row buffer */</div><div class='ctx'>       png_ptr-&gt;prev_row = (png_bytep)png_calloc(png_ptr,</div><div class='del'>-         (png_alloc_size_t)buf_size);</div><div class='add'>+          (png_alloc_size_t)buf_size);</div><div class='ctx'> </div><div class='ctx'>       if (png_ptr-&gt;do_filter &amp; PNG_FILTER_UP)</div><div class='ctx'>       {</div><div class='ctx'>          png_ptr-&gt;up_row = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-            (png_size_t)(png_ptr-&gt;rowbytes + 1));</div><div class='add'>+            png_ptr-&gt;rowbytes + 1);</div><div class='add'>+</div><div class='ctx'>          png_ptr-&gt;up_row[0] = PNG_FILTER_VALUE_UP;</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='ctx'>       if (png_ptr-&gt;do_filter &amp; PNG_FILTER_AVG)</div><div class='ctx'>       {</div><div class='ctx'>          png_ptr-&gt;avg_row = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-            (png_alloc_size_t)(png_ptr-&gt;rowbytes + 1));</div><div class='add'>+             png_ptr-&gt;rowbytes + 1);</div><div class='add'>+</div><div class='ctx'>          png_ptr-&gt;avg_row[0] = PNG_FILTER_VALUE_AVG;</div><div class='ctx'>       }</div><div class='ctx'> </div><div class='ctx'>       if (png_ptr-&gt;do_filter &amp; PNG_FILTER_PAETH)</div><div class='ctx'>       {</div><div class='ctx'>          png_ptr-&gt;paeth_row = (png_bytep)png_malloc(png_ptr,</div><div class='del'>-            (png_size_t)(png_ptr-&gt;rowbytes + 1));</div><div class='add'>+             png_ptr-&gt;rowbytes + 1);</div><div class='add'>+</div><div class='ctx'>          png_ptr-&gt;paeth_row[0] = PNG_FILTER_VALUE_PAETH;</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='hunk'>@@ -1787,22 +1851,26 @@ png_write_start_row(png_structp png_ptr)</div><div class='ctx'>       if (!(png_ptr-&gt;transformations &amp; PNG_INTERLACE))</div><div class='ctx'>       {</div><div class='ctx'>          png_ptr-&gt;num_rows = (png_ptr-&gt;height + png_pass_yinc[0] - 1 -</div><div class='del'>-            png_pass_ystart[0]) / png_pass_yinc[0];</div><div class='add'>+             png_pass_ystart[0]) / png_pass_yinc[0];</div><div class='add'>+</div><div class='ctx'>          png_ptr-&gt;usr_width = (png_ptr-&gt;width + png_pass_inc[0] - 1 -</div><div class='del'>-            png_pass_start[0]) / png_pass_inc[0];</div><div class='add'>+             png_pass_start[0]) / png_pass_inc[0];</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          png_ptr-&gt;num_rows = png_ptr-&gt;height;</div><div class='ctx'>          png_ptr-&gt;usr_width = png_ptr-&gt;width;</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    else</div><div class='ctx'> #endif</div><div class='ctx'>    {</div><div class='ctx'>       png_ptr-&gt;num_rows = png_ptr-&gt;height;</div><div class='ctx'>       png_ptr-&gt;usr_width = png_ptr-&gt;width;</div><div class='ctx'>    }</div><div class='add'>+</div><div class='ctx'>    png_ptr-&gt;zstream.avail_out = (uInt)png_ptr-&gt;zbuf_size;</div><div class='ctx'>    png_ptr-&gt;zstream.next_out = png_ptr-&gt;zbuf;</div><div class='ctx'> }</div><div class='hunk'>@@ -1847,24 +1915,30 @@ png_write_finish_row(png_structp png_ptr)</div><div class='ctx'>       {</div><div class='ctx'>          png_ptr-&gt;pass++;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else</div><div class='ctx'>       {</div><div class='ctx'>          /* Loop until we find a non-zero width or height pass */</div><div class='ctx'>          do</div><div class='ctx'>          {</div><div class='ctx'>             png_ptr-&gt;pass++;</div><div class='add'>+</div><div class='ctx'>             if (png_ptr-&gt;pass &gt;= 7)</div><div class='ctx'>                break;</div><div class='add'>+</div><div class='ctx'>             png_ptr-&gt;usr_width = (png_ptr-&gt;width +</div><div class='del'>-               png_pass_inc[png_ptr-&gt;pass] - 1 -</div><div class='del'>-               png_pass_start[png_ptr-&gt;pass]) /</div><div class='del'>-               png_pass_inc[png_ptr-&gt;pass];</div><div class='add'>+                png_pass_inc[png_ptr-&gt;pass] - 1 -</div><div class='add'>+                png_pass_start[png_ptr-&gt;pass]) /</div><div class='add'>+                png_pass_inc[png_ptr-&gt;pass];</div><div class='add'>+</div><div class='ctx'>             png_ptr-&gt;num_rows = (png_ptr-&gt;height +</div><div class='del'>-               png_pass_yinc[png_ptr-&gt;pass] - 1 -</div><div class='del'>-               png_pass_ystart[png_ptr-&gt;pass]) /</div><div class='del'>-               png_pass_yinc[png_ptr-&gt;pass];</div><div class='add'>+                png_pass_yinc[png_ptr-&gt;pass] - 1 -</div><div class='add'>+                png_pass_ystart[png_ptr-&gt;pass]) /</div><div class='add'>+                png_pass_yinc[png_ptr-&gt;pass];</div><div class='add'>+</div><div class='ctx'>             if (png_ptr-&gt;transformations &amp; PNG_INTERLACE)</div><div class='ctx'>                break;</div><div class='add'>+</div><div class='ctx'>          } while (png_ptr-&gt;usr_width == 0 || png_ptr-&gt;num_rows == 0);</div><div class='ctx'> </div><div class='ctx'>       }</div><div class='hunk'>@@ -1874,8 +1948,9 @@ png_write_finish_row(png_structp png_ptr)</div><div class='ctx'>       {</div><div class='ctx'>          if (png_ptr-&gt;prev_row != NULL)</div><div class='ctx'>             png_memset(png_ptr-&gt;prev_row, 0,</div><div class='del'>-               (png_size_t)(PNG_ROWBYTES(png_ptr-&gt;usr_channels*</div><div class='del'>-               png_ptr-&gt;usr_bit_depth, png_ptr-&gt;width)) + 1);</div><div class='add'>+                (png_size_t)(PNG_ROWBYTES(png_ptr-&gt;usr_channels*</div><div class='add'>+                png_ptr-&gt;usr_bit_depth, png_ptr-&gt;width)) + 1);</div><div class='add'>+</div><div class='ctx'>          return;</div><div class='ctx'>       }</div><div class='ctx'>    }</div><div class='hunk'>@@ -1887,6 +1962,7 @@ png_write_finish_row(png_structp png_ptr)</div><div class='ctx'>    {</div><div class='ctx'>       /* Tell the compressor we are done */</div><div class='ctx'>       ret = deflate(&amp;png_ptr-&gt;zstream, Z_FINISH);</div><div class='add'>+</div><div class='ctx'>       /* Check for an error */</div><div class='ctx'>       if (ret == Z_OK)</div><div class='ctx'>       {</div><div class='hunk'>@@ -1898,10 +1974,12 @@ png_write_finish_row(png_structp png_ptr)</div><div class='ctx'>             png_ptr-&gt;zstream.avail_out = (uInt)png_ptr-&gt;zbuf_size;</div><div class='ctx'>          }</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       else if (ret != Z_STREAM_END)</div><div class='ctx'>       {</div><div class='ctx'>          if (png_ptr-&gt;zstream.msg != NULL)</div><div class='ctx'>             png_error(png_ptr, png_ptr-&gt;zstream.msg);</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             png_error(png_ptr, "zlib error");</div><div class='ctx'>       }</div><div class='hunk'>@@ -1911,7 +1989,7 @@ png_write_finish_row(png_structp png_ptr)</div><div class='ctx'>    if (png_ptr-&gt;zstream.avail_out &lt; png_ptr-&gt;zbuf_size)</div><div class='ctx'>    {</div><div class='ctx'>       png_write_IDAT(png_ptr, png_ptr-&gt;zbuf, png_ptr-&gt;zbuf_size -</div><div class='del'>-         png_ptr-&gt;zstream.avail_out);</div><div class='add'>+          png_ptr-&gt;zstream.avail_out);</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='ctx'>    deflateReset(&amp;png_ptr-&gt;zstream);</div><div class='hunk'>@@ -1958,6 +2036,7 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)</div><div class='ctx'>             dp = row;</div><div class='ctx'>             d = 0;</div><div class='ctx'>             shift = 7;</div><div class='add'>+</div><div class='ctx'>             for (i = png_pass_start[pass]; i &lt; row_width;</div><div class='ctx'>                i += png_pass_inc[pass])</div><div class='ctx'>             {</div><div class='hunk'>@@ -1971,14 +2050,17 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)</div><div class='ctx'>                   *dp++ = (png_byte)d;</div><div class='ctx'>                   d = 0;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   shift--;</div><div class='ctx'> </div><div class='ctx'>             }</div><div class='ctx'>             if (shift != 7)</div><div class='ctx'>                *dp = (png_byte)d;</div><div class='add'>+</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          case 2:</div><div class='ctx'>          {</div><div class='ctx'>             png_bytep sp;</div><div class='hunk'>@@ -1992,6 +2074,7 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)</div><div class='ctx'>             dp = row;</div><div class='ctx'>             shift = 6;</div><div class='ctx'>             d = 0;</div><div class='add'>+</div><div class='ctx'>             for (i = png_pass_start[pass]; i &lt; row_width;</div><div class='ctx'>                i += png_pass_inc[pass])</div><div class='ctx'>             {</div><div class='hunk'>@@ -2005,13 +2088,16 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)</div><div class='ctx'>                   *dp++ = (png_byte)d;</div><div class='ctx'>                   d = 0;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   shift -= 2;</div><div class='ctx'>             }</div><div class='ctx'>             if (shift != 6)</div><div class='del'>-                   *dp = (png_byte)d;</div><div class='add'>+               *dp = (png_byte)d;</div><div class='add'>+</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          case 4:</div><div class='ctx'>          {</div><div class='ctx'>             png_bytep sp;</div><div class='hunk'>@@ -2026,7 +2112,7 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)</div><div class='ctx'>             shift = 4;</div><div class='ctx'>             d = 0;</div><div class='ctx'>             for (i = png_pass_start[pass]; i &lt; row_width;</div><div class='del'>-               i += png_pass_inc[pass])</div><div class='add'>+                i += png_pass_inc[pass])</div><div class='ctx'>             {</div><div class='ctx'>                sp = row + (png_size_t)(i &gt;&gt; 1);</div><div class='ctx'>                value = (*sp &gt;&gt; ((1 - (int)(i &amp; 0x01)) &lt;&lt; 2)) &amp; 0x0f;</div><div class='hunk'>@@ -2038,13 +2124,16 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)</div><div class='ctx'>                   *dp++ = (png_byte)d;</div><div class='ctx'>                   d = 0;</div><div class='ctx'>                }</div><div class='add'>+</div><div class='ctx'>                else</div><div class='ctx'>                   shift -= 4;</div><div class='ctx'>             }</div><div class='ctx'>             if (shift != 4)</div><div class='ctx'>                *dp = (png_byte)d;</div><div class='add'>+</div><div class='ctx'>             break;</div><div class='ctx'>          }</div><div class='add'>+</div><div class='ctx'>          default:</div><div class='ctx'>          {</div><div class='ctx'>             png_bytep sp;</div><div class='hunk'>@@ -2055,18 +2144,21 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)</div><div class='ctx'> </div><div class='ctx'>             /* Start at the beginning */</div><div class='ctx'>             dp = row;</div><div class='add'>+</div><div class='ctx'>             /* Find out how many bytes each pixel takes up */</div><div class='ctx'>             pixel_bytes = (row_info-&gt;pixel_depth &gt;&gt; 3);</div><div class='del'>-            /* Loop through the row, only looking at the pixels that</div><div class='del'>-               matter */</div><div class='add'>+</div><div class='add'>+            /* Loop through the row, only looking at the pixels that matter */</div><div class='ctx'>             for (i = png_pass_start[pass]; i &lt; row_width;</div><div class='ctx'>                i += png_pass_inc[pass])</div><div class='ctx'>             {</div><div class='ctx'>                /* Find out where the original pixel is */</div><div class='ctx'>                sp = row + (png_size_t)i * pixel_bytes;</div><div class='add'>+</div><div class='ctx'>                /* Move the pixel */</div><div class='ctx'>                if (dp != sp)</div><div class='ctx'>                   png_memcpy(dp, sp, pixel_bytes);</div><div class='add'>+</div><div class='ctx'>                /* Next pixel */</div><div class='ctx'>                dp += pixel_bytes;</div><div class='ctx'>             }</div><div class='hunk'>@@ -2075,11 +2167,12 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)</div><div class='ctx'>       }</div><div class='ctx'>       /* Set new row width */</div><div class='ctx'>       row_info-&gt;width = (row_info-&gt;width +</div><div class='del'>-         png_pass_inc[pass] - 1 -</div><div class='del'>-         png_pass_start[pass]) /</div><div class='del'>-         png_pass_inc[pass];</div><div class='del'>-         row_info-&gt;rowbytes = PNG_ROWBYTES(row_info-&gt;pixel_depth,</div><div class='del'>-            row_info-&gt;width);</div><div class='add'>+          png_pass_inc[pass] - 1 -</div><div class='add'>+          png_pass_start[pass]) /</div><div class='add'>+          png_pass_inc[pass];</div><div class='add'>+</div><div class='add'>+      row_info-&gt;rowbytes = PNG_ROWBYTES(row_info-&gt;pixel_depth,</div><div class='add'>+          row_info-&gt;width);</div><div class='ctx'>    }</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2100,20 +2193,20 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>    png_bytep prev_row, row_buf;</div><div class='ctx'>    png_uint_32 mins, bpp;</div><div class='ctx'>    png_byte filter_to_do = png_ptr-&gt;do_filter;</div><div class='del'>-   png_uint_32 row_bytes = row_info-&gt;rowbytes;</div><div class='add'>+   png_size_t row_bytes = row_info-&gt;rowbytes;</div><div class='ctx'> #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED</div><div class='ctx'>    int num_p_filters = (int)png_ptr-&gt;num_prev_filters;</div><div class='del'>-#endif </div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'>    png_debug(1, "in png_write_find_filter");</div><div class='ctx'> </div><div class='ctx'> #ifndef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED</div><div class='ctx'>   if (png_ptr-&gt;row_number == 0 &amp;&amp; filter_to_do == PNG_ALL_FILTERS)</div><div class='ctx'>   {</div><div class='del'>-      /* These will never be selected so we need not test them. */</div><div class='del'>-      filter_to_do &amp;= ~(PNG_FILTER_UP | PNG_FILTER_PAETH);</div><div class='add'>+     /* These will never be selected so we need not test them. */</div><div class='add'>+     filter_to_do &amp;= ~(PNG_FILTER_UP | PNG_FILTER_PAETH);</div><div class='ctx'>   }</div><div class='del'>-#endif </div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'>    /* Find out how many bytes offset each pixel is */</div><div class='ctx'>    bpp = (row_info-&gt;pixel_depth + 7) &gt;&gt; 3;</div><div class='hunk'>@@ -2137,11 +2230,14 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>     * computationally expensive).</div><div class='ctx'>     *</div><div class='ctx'>     * GRR 980525:  consider also</div><div class='add'>+    *</div><div class='ctx'>     *   (1) minimum sum of absolute differences from running average (i.e.,</div><div class='ctx'>     *       keep running sum of non-absolute differences &amp; count of bytes)</div><div class='ctx'>     *       [track dispersion, too?  restart average if dispersion too large?]</div><div class='add'>+    *</div><div class='ctx'>     *  (1b) minimum sum of absolute differences from sliding average, probably</div><div class='ctx'>     *       with window size &lt;= deflate window (usually 32K)</div><div class='add'>+    *</div><div class='ctx'>     *   (2) minimum sum of squared differences from zero or running average</div><div class='ctx'>     *       (i.e., ~ root-mean-square approach)</div><div class='ctx'>     */</div><div class='hunk'>@@ -2150,12 +2246,11 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>    /* We don't need to test the 'no filter' case if this is the only filter</div><div class='ctx'>     * that has been chosen, as it doesn't actually do anything to the data.</div><div class='ctx'>     */</div><div class='del'>-   if ((filter_to_do &amp; PNG_FILTER_NONE) &amp;&amp;</div><div class='del'>-       filter_to_do != PNG_FILTER_NONE)</div><div class='add'>+   if ((filter_to_do &amp; PNG_FILTER_NONE) &amp;&amp; filter_to_do != PNG_FILTER_NONE)</div><div class='ctx'>    {</div><div class='ctx'>       png_bytep rp;</div><div class='ctx'>       png_uint_32 sum = 0;</div><div class='del'>-      png_uint_32 i;</div><div class='add'>+      png_size_t i;</div><div class='ctx'>       int v;</div><div class='ctx'> </div><div class='ctx'>       for (i = 0, rp = row_buf + 1; i &lt; row_bytes; i++, rp++)</div><div class='hunk'>@@ -2178,9 +2273,10 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>             if (png_ptr-&gt;prev_filters[j] == PNG_FILTER_VALUE_NONE)</div><div class='ctx'>             {</div><div class='ctx'>                sumlo = (sumlo * png_ptr-&gt;filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='add'>+</div><div class='ctx'>                sumhi = (sumhi * png_ptr-&gt;filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'> </div><div class='hunk'>@@ -2189,12 +2285,14 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>           * it has the minimum possible computational cost - none).</div><div class='ctx'>           */</div><div class='ctx'>          sumlo = (sumlo * png_ptr-&gt;filter_costs[PNG_FILTER_VALUE_NONE]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='add'>+</div><div class='ctx'>          sumhi = (sumhi * png_ptr-&gt;filter_costs[PNG_FILTER_VALUE_NONE]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='ctx'> </div><div class='ctx'>          if (sumhi &gt; PNG_HIMASK)</div><div class='ctx'>             sum = PNG_MAXSUM;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             sum = (sumhi &lt;&lt; PNG_HISHIFT) + sumlo;</div><div class='ctx'>       }</div><div class='hunk'>@@ -2207,17 +2305,20 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>    /* It's the only filter so no testing is needed */</div><div class='ctx'>    {</div><div class='ctx'>       png_bytep rp, lp, dp;</div><div class='del'>-      png_uint_32 i;</div><div class='add'>+      png_size_t i;</div><div class='add'>+</div><div class='ctx'>       for (i = 0, rp = row_buf + 1, dp = png_ptr-&gt;sub_row + 1; i &lt; bpp;</div><div class='ctx'>            i++, rp++, dp++)</div><div class='ctx'>       {</div><div class='ctx'>          *dp = *rp;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       for (lp = row_buf + 1; i &lt; row_bytes;</div><div class='ctx'>          i++, rp++, lp++, dp++)</div><div class='ctx'>       {</div><div class='ctx'>          *dp = (png_byte)(((int)*rp - (int)*lp) &amp; 0xff);</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       best_row = png_ptr-&gt;sub_row;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='hunk'>@@ -2225,7 +2326,7 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>    {</div><div class='ctx'>       png_bytep rp, dp, lp;</div><div class='ctx'>       png_uint_32 sum = 0, lmins = mins;</div><div class='del'>-      png_uint_32 i;</div><div class='add'>+      png_size_t i;</div><div class='ctx'>       int v;</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED</div><div class='hunk'>@@ -2245,19 +2346,22 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>             if (png_ptr-&gt;prev_filters[j] == PNG_FILTER_VALUE_SUB)</div><div class='ctx'>             {</div><div class='ctx'>                lmlo = (lmlo * png_ptr-&gt;inv_filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='add'>+</div><div class='ctx'>                lmhi = (lmhi * png_ptr-&gt;inv_filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'> </div><div class='ctx'>          lmlo = (lmlo * png_ptr-&gt;inv_filter_costs[PNG_FILTER_VALUE_SUB]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='add'>+</div><div class='ctx'>          lmhi = (lmhi * png_ptr-&gt;inv_filter_costs[PNG_FILTER_VALUE_SUB]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='ctx'> </div><div class='ctx'>          if (lmhi &gt; PNG_HIMASK)</div><div class='ctx'>             lmins = PNG_MAXSUM;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             lmins = (lmhi &lt;&lt; PNG_HISHIFT) + lmlo;</div><div class='ctx'>       }</div><div class='hunk'>@@ -2270,6 +2374,7 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'> </div><div class='ctx'>          sum += (v &lt; 128) ? v : 256 - v;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       for (lp = row_buf + 1; i &lt; row_bytes;</div><div class='ctx'>          i++, rp++, lp++, dp++)</div><div class='ctx'>       {</div><div class='hunk'>@@ -2294,19 +2399,22 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>             if (png_ptr-&gt;prev_filters[j] == PNG_FILTER_VALUE_SUB)</div><div class='ctx'>             {</div><div class='ctx'>                sumlo = (sumlo * png_ptr-&gt;inv_filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='add'>+</div><div class='ctx'>                sumhi = (sumhi * png_ptr-&gt;inv_filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'> </div><div class='ctx'>          sumlo = (sumlo * png_ptr-&gt;inv_filter_costs[PNG_FILTER_VALUE_SUB]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='add'>+</div><div class='ctx'>          sumhi = (sumhi * png_ptr-&gt;inv_filter_costs[PNG_FILTER_VALUE_SUB]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='ctx'> </div><div class='ctx'>          if (sumhi &gt; PNG_HIMASK)</div><div class='ctx'>             sum = PNG_MAXSUM;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             sum = (sumhi &lt;&lt; PNG_HISHIFT) + sumlo;</div><div class='ctx'>       }</div><div class='hunk'>@@ -2323,14 +2431,15 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>    if (filter_to_do == PNG_FILTER_UP)</div><div class='ctx'>    {</div><div class='ctx'>       png_bytep rp, dp, pp;</div><div class='del'>-      png_uint_32 i;</div><div class='add'>+      png_size_t i;</div><div class='ctx'> </div><div class='ctx'>       for (i = 0, rp = row_buf + 1, dp = png_ptr-&gt;up_row + 1,</div><div class='del'>-           pp = prev_row + 1; i &lt; row_bytes;</div><div class='del'>-           i++, rp++, pp++, dp++)</div><div class='add'>+          pp = prev_row + 1; i &lt; row_bytes;</div><div class='add'>+          i++, rp++, pp++, dp++)</div><div class='ctx'>       {</div><div class='ctx'>          *dp = (png_byte)(((int)*rp - (int)*pp) &amp; 0xff);</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       best_row = png_ptr-&gt;up_row;</div><div class='ctx'>    }</div><div class='ctx'> </div><div class='hunk'>@@ -2338,7 +2447,7 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>    {</div><div class='ctx'>       png_bytep rp, dp, pp;</div><div class='ctx'>       png_uint_32 sum = 0, lmins = mins;</div><div class='del'>-      png_uint_32 i;</div><div class='add'>+      png_size_t i;</div><div class='ctx'>       int v;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2355,26 +2464,29 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>             if (png_ptr-&gt;prev_filters[j] == PNG_FILTER_VALUE_UP)</div><div class='ctx'>             {</div><div class='ctx'>                lmlo = (lmlo * png_ptr-&gt;inv_filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='add'>+</div><div class='ctx'>                lmhi = (lmhi * png_ptr-&gt;inv_filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'> </div><div class='ctx'>          lmlo = (lmlo * png_ptr-&gt;inv_filter_costs[PNG_FILTER_VALUE_UP]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='add'>+</div><div class='ctx'>          lmhi = (lmhi * png_ptr-&gt;inv_filter_costs[PNG_FILTER_VALUE_UP]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='ctx'> </div><div class='ctx'>          if (lmhi &gt; PNG_HIMASK)</div><div class='ctx'>             lmins = PNG_MAXSUM;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             lmins = (lmhi &lt;&lt; PNG_HISHIFT) + lmlo;</div><div class='ctx'>       }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>       for (i = 0, rp = row_buf + 1, dp = png_ptr-&gt;up_row + 1,</div><div class='del'>-           pp = prev_row + 1; i &lt; row_bytes; i++)</div><div class='add'>+          pp = prev_row + 1; i &lt; row_bytes; i++)</div><div class='ctx'>       {</div><div class='ctx'>          v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) &amp; 0xff);</div><div class='ctx'> </div><div class='hunk'>@@ -2397,19 +2509,22 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>             if (png_ptr-&gt;prev_filters[j] == PNG_FILTER_VALUE_UP)</div><div class='ctx'>             {</div><div class='ctx'>                sumlo = (sumlo * png_ptr-&gt;filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='add'>+</div><div class='ctx'>                sumhi = (sumhi * png_ptr-&gt;filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'> </div><div class='ctx'>          sumlo = (sumlo * png_ptr-&gt;filter_costs[PNG_FILTER_VALUE_UP]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='add'>+</div><div class='ctx'>          sumhi = (sumhi * png_ptr-&gt;filter_costs[PNG_FILTER_VALUE_UP]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='ctx'> </div><div class='ctx'>          if (sumhi &gt; PNG_HIMASK)</div><div class='ctx'>             sum = PNG_MAXSUM;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             sum = (sumhi &lt;&lt; PNG_HISHIFT) + sumlo;</div><div class='ctx'>       }</div><div class='hunk'>@@ -2427,11 +2542,13 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>    {</div><div class='ctx'>       png_bytep rp, dp, pp, lp;</div><div class='ctx'>       png_uint_32 i;</div><div class='add'>+</div><div class='ctx'>       for (i = 0, rp = row_buf + 1, dp = png_ptr-&gt;avg_row + 1,</div><div class='ctx'>            pp = prev_row + 1; i &lt; bpp; i++)</div><div class='ctx'>       {</div><div class='ctx'>          *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) &amp; 0xff);</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       for (lp = row_buf + 1; i &lt; row_bytes; i++)</div><div class='ctx'>       {</div><div class='ctx'>          *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2))</div><div class='hunk'>@@ -2444,7 +2561,7 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>    {</div><div class='ctx'>       png_bytep rp, dp, pp, lp;</div><div class='ctx'>       png_uint_32 sum = 0, lmins = mins;</div><div class='del'>-      png_uint_32 i;</div><div class='add'>+      png_size_t i;</div><div class='ctx'>       int v;</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED</div><div class='hunk'>@@ -2460,19 +2577,22 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>             if (png_ptr-&gt;prev_filters[j] == PNG_FILTER_VALUE_AVG)</div><div class='ctx'>             {</div><div class='ctx'>                lmlo = (lmlo * png_ptr-&gt;inv_filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='add'>+</div><div class='ctx'>                lmhi = (lmhi * png_ptr-&gt;inv_filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'> </div><div class='ctx'>          lmlo = (lmlo * png_ptr-&gt;inv_filter_costs[PNG_FILTER_VALUE_AVG]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='add'>+</div><div class='ctx'>          lmhi = (lmhi * png_ptr-&gt;inv_filter_costs[PNG_FILTER_VALUE_AVG]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='ctx'> </div><div class='ctx'>          if (lmhi &gt; PNG_HIMASK)</div><div class='ctx'>             lmins = PNG_MAXSUM;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             lmins = (lmhi &lt;&lt; PNG_HISHIFT) + lmlo;</div><div class='ctx'>       }</div><div class='hunk'>@@ -2485,10 +2605,11 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'> </div><div class='ctx'>          sum += (v &lt; 128) ? v : 256 - v;</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       for (lp = row_buf + 1; i &lt; row_bytes; i++)</div><div class='ctx'>       {</div><div class='ctx'>          v = *dp++ =</div><div class='del'>-          (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2)) &amp; 0xff);</div><div class='add'>+             (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2)) &amp; 0xff);</div><div class='ctx'> </div><div class='ctx'>          sum += (v &lt; 128) ? v : 256 - v;</div><div class='ctx'> </div><div class='hunk'>@@ -2509,19 +2630,22 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>             if (png_ptr-&gt;prev_filters[j] == PNG_FILTER_VALUE_NONE)</div><div class='ctx'>             {</div><div class='ctx'>                sumlo = (sumlo * png_ptr-&gt;filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='add'>+</div><div class='ctx'>                sumhi = (sumhi * png_ptr-&gt;filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'> </div><div class='ctx'>          sumlo = (sumlo * png_ptr-&gt;filter_costs[PNG_FILTER_VALUE_AVG]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='add'>+</div><div class='ctx'>          sumhi = (sumhi * png_ptr-&gt;filter_costs[PNG_FILTER_VALUE_AVG]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='ctx'> </div><div class='ctx'>          if (sumhi &gt; PNG_HIMASK)</div><div class='ctx'>             sum = PNG_MAXSUM;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             sum = (sumhi &lt;&lt; PNG_HISHIFT) + sumlo;</div><div class='ctx'>       }</div><div class='hunk'>@@ -2538,9 +2662,10 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>    if (filter_to_do == PNG_FILTER_PAETH)</div><div class='ctx'>    {</div><div class='ctx'>       png_bytep rp, dp, pp, cp, lp;</div><div class='del'>-      png_uint_32 i;</div><div class='add'>+      png_size_t i;</div><div class='add'>+</div><div class='ctx'>       for (i = 0, rp = row_buf + 1, dp = png_ptr-&gt;paeth_row + 1,</div><div class='del'>-           pp = prev_row + 1; i &lt; bpp; i++)</div><div class='add'>+          pp = prev_row + 1; i &lt; bpp; i++)</div><div class='ctx'>       {</div><div class='ctx'>          *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) &amp; 0xff);</div><div class='ctx'>       }</div><div class='hunk'>@@ -2577,7 +2702,7 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>    {</div><div class='ctx'>       png_bytep rp, dp, pp, cp, lp;</div><div class='ctx'>       png_uint_32 sum = 0, lmins = mins;</div><div class='del'>-      png_uint_32 i;</div><div class='add'>+      png_size_t i;</div><div class='ctx'>       int v;</div><div class='ctx'> </div><div class='ctx'> #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED</div><div class='hunk'>@@ -2593,26 +2718,29 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>             if (png_ptr-&gt;prev_filters[j] == PNG_FILTER_VALUE_PAETH)</div><div class='ctx'>             {</div><div class='ctx'>                lmlo = (lmlo * png_ptr-&gt;inv_filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='add'>+</div><div class='ctx'>                lmhi = (lmhi * png_ptr-&gt;inv_filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'> </div><div class='ctx'>          lmlo = (lmlo * png_ptr-&gt;inv_filter_costs[PNG_FILTER_VALUE_PAETH]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='add'>+</div><div class='ctx'>          lmhi = (lmhi * png_ptr-&gt;inv_filter_costs[PNG_FILTER_VALUE_PAETH]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='ctx'> </div><div class='ctx'>          if (lmhi &gt; PNG_HIMASK)</div><div class='ctx'>             lmins = PNG_MAXSUM;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             lmins = (lmhi &lt;&lt; PNG_HISHIFT) + lmlo;</div><div class='ctx'>       }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>       for (i = 0, rp = row_buf + 1, dp = png_ptr-&gt;paeth_row + 1,</div><div class='del'>-           pp = prev_row + 1; i &lt; bpp; i++)</div><div class='add'>+          pp = prev_row + 1; i &lt; bpp; i++)</div><div class='ctx'>       {</div><div class='ctx'>          v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) &amp; 0xff);</div><div class='ctx'> </div><div class='hunk'>@@ -2645,10 +2773,13 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>          pa = abs(p - a);</div><div class='ctx'>          pb = abs(p - b);</div><div class='ctx'>          pc = abs(p - c);</div><div class='add'>+</div><div class='ctx'>          if (pa &lt;= pb &amp;&amp; pa &lt;= pc)</div><div class='ctx'>             p = a;</div><div class='add'>+</div><div class='ctx'>          else if (pb &lt;= pc)</div><div class='ctx'>             p = b;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             p = c;</div><div class='ctx'> #endif /* PNG_SLOW_PAETH */</div><div class='hunk'>@@ -2674,19 +2805,22 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>             if (png_ptr-&gt;prev_filters[j] == PNG_FILTER_VALUE_PAETH)</div><div class='ctx'>             {</div><div class='ctx'>                sumlo = (sumlo * png_ptr-&gt;filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='add'>+</div><div class='ctx'>                sumhi = (sumhi * png_ptr-&gt;filter_weights[j]) &gt;&gt;</div><div class='del'>-                  PNG_WEIGHT_SHIFT;</div><div class='add'>+                   PNG_WEIGHT_SHIFT;</div><div class='ctx'>             }</div><div class='ctx'>          }</div><div class='ctx'> </div><div class='ctx'>          sumlo = (sumlo * png_ptr-&gt;filter_costs[PNG_FILTER_VALUE_PAETH]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='add'>+</div><div class='ctx'>          sumhi = (sumhi * png_ptr-&gt;filter_costs[PNG_FILTER_VALUE_PAETH]) &gt;&gt;</div><div class='del'>-            PNG_COST_SHIFT;</div><div class='add'>+             PNG_COST_SHIFT;</div><div class='ctx'> </div><div class='ctx'>          if (sumhi &gt; PNG_HIMASK)</div><div class='ctx'>             sum = PNG_MAXSUM;</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             sum = (sumhi &lt;&lt; PNG_HISHIFT) + sumlo;</div><div class='ctx'>       }</div><div class='hunk'>@@ -2708,10 +2842,12 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'>    if (png_ptr-&gt;num_prev_filters &gt; 0)</div><div class='ctx'>    {</div><div class='ctx'>       int j;</div><div class='add'>+</div><div class='ctx'>       for (j = 1; j &lt; num_p_filters; j++)</div><div class='ctx'>       {</div><div class='ctx'>          png_ptr-&gt;prev_filters[j] = png_ptr-&gt;prev_filters[j - 1];</div><div class='ctx'>       }</div><div class='add'>+</div><div class='ctx'>       png_ptr-&gt;prev_filters[j] = best_row[0];</div><div class='ctx'>    }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -2723,25 +2859,54 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)</div><div class='ctx'> void /* PRIVATE */</div><div class='ctx'> png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row)</div><div class='ctx'> {</div><div class='add'>+   png_size_t avail;</div><div class='add'>+</div><div class='ctx'>    png_debug(1, "in png_write_filtered_row");</div><div class='ctx'> </div><div class='ctx'>    png_debug1(2, "filter = %d", filtered_row[0]);</div><div class='ctx'>    /* Set up the zlib input buffer */</div><div class='ctx'> </div><div class='ctx'>    png_ptr-&gt;zstream.next_in = filtered_row;</div><div class='del'>-   png_ptr-&gt;zstream.avail_in = (uInt)png_ptr-&gt;row_info.rowbytes + 1;</div><div class='add'>+   png_ptr-&gt;zstream.avail_in = 0;</div><div class='add'>+   avail = png_ptr-&gt;row_info.rowbytes + 1;</div><div class='ctx'>    /* Repeat until we have compressed all the data */</div><div class='ctx'>    do</div><div class='ctx'>    {</div><div class='ctx'>       int ret; /* Return of zlib */</div><div class='ctx'> </div><div class='add'>+      /* Record the number of bytes available - zlib supports at least 65535</div><div class='add'>+       * bytes at one step, depending on the size of the zlib type 'uInt', the</div><div class='add'>+       * maximum size zlib can write at once is ZLIB_IO_MAX (from pngpriv.h).</div><div class='add'>+       * Use this because on 16 bit systems 'rowbytes' can be up to 65536 (i.e.</div><div class='add'>+       * one more than 16 bits) and, in this case 'rowbytes+1' can overflow a</div><div class='add'>+       * uInt.  ZLIB_IO_MAX can be safely reduced to cause zlib to be called</div><div class='add'>+       * with smaller chunks of data.</div><div class='add'>+       */</div><div class='add'>+      if (png_ptr-&gt;zstream.avail_in == 0)</div><div class='add'>+      {</div><div class='add'>+         if (avail &gt; ZLIB_IO_MAX)</div><div class='add'>+         {</div><div class='add'>+            png_ptr-&gt;zstream.avail_in  = ZLIB_IO_MAX;</div><div class='add'>+            avail -= ZLIB_IO_MAX;</div><div class='add'>+         }</div><div class='add'>+</div><div class='add'>+         else</div><div class='add'>+         {</div><div class='add'>+            /* So this will fit in the available uInt space: */</div><div class='add'>+            png_ptr-&gt;zstream.avail_in = (uInt)avail;</div><div class='add'>+            avail = 0;</div><div class='add'>+         }</div><div class='add'>+      }</div><div class='add'>+</div><div class='ctx'>       /* Compress the data */</div><div class='ctx'>       ret = deflate(&amp;png_ptr-&gt;zstream, Z_NO_FLUSH);</div><div class='add'>+</div><div class='ctx'>       /* Check for compression errors */</div><div class='ctx'>       if (ret != Z_OK)</div><div class='ctx'>       {</div><div class='ctx'>          if (png_ptr-&gt;zstream.msg != NULL)</div><div class='ctx'>             png_error(png_ptr, png_ptr-&gt;zstream.msg);</div><div class='add'>+</div><div class='ctx'>          else</div><div class='ctx'>             png_error(png_ptr, "zlib error");</div><div class='ctx'>       }</div><div class='hunk'>@@ -2755,7 +2920,7 @@ png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row)</div><div class='ctx'>          png_ptr-&gt;zstream.avail_out = (uInt)png_ptr-&gt;zbuf_size;</div><div class='ctx'>       }</div><div class='ctx'>    /* Repeat until all data has been compressed */</div><div class='del'>-   } while (png_ptr-&gt;zstream.avail_in);</div><div class='add'>+   } while (avail &gt; 0 || png_ptr-&gt;zstream.avail_in &gt; 0);</div><div class='ctx'> </div><div class='ctx'>    /* Swap the current and previous rows */</div><div class='ctx'>    if (png_ptr-&gt;prev_row != NULL)</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/cbuilder5/README.txt b/src/3rdparty/libpng/projects/cbuilder5/README.txt<br/>deleted file mode 100644<br/>index 9efaa4b..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/cbuilder5/README.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/README.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-The cbuilder5 project has not been updated to libpng-1.4.0.</div><div class='del'>-</div><div class='del'>-It needs to depend on pngpriv.h</div><div class='del'>-</div><div class='del'>-It needs to *not* depend on pnggccrd.c or pngvcrd.c</div><div class='del'>-</div><div class='del'>-It needs to DEFINE PNG_NO_PEDANTIC_WARNING while building</div><div class='del'>-the library, but not while building an application.</div><div class='del'>-</div><div class='del'>-If an updated version is not received, this project will</div><div class='del'>-be removed when libpng-1.4.0 is released.</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/cbuilder5/libpng.bpf b/src/3rdparty/libpng/projects/cbuilder5/libpng.bpf<br/>deleted file mode 100644<br/>index ee6d929..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/cbuilder5/libpng.bpf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/libpng.bpf</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-USEUNIT("libpng.cpp");
</div><div class='del'>-USEUNIT("..\..\png.c");
</div><div class='del'>-USEUNIT("..\..\pngerror.c");
</div><div class='del'>-USEUNIT("..\..\pngget.c");
</div><div class='del'>-USEUNIT("..\..\pngmem.c");
</div><div class='del'>-USEUNIT("..\..\pngpread.c");
</div><div class='del'>-USEUNIT("..\..\pngread.c");
</div><div class='del'>-USEUNIT("..\..\pngrio.c");
</div><div class='del'>-USEUNIT("..\..\pngrtran.c");
</div><div class='del'>-USEUNIT("..\..\pngrutil.c");
</div><div class='del'>-USEUNIT("..\..\pngset.c");
</div><div class='del'>-USEUNIT("..\..\pngtrans.c");
</div><div class='del'>-USEUNIT("..\..\pngwio.c");
</div><div class='del'>-USEUNIT("..\..\pngwrite.c");
</div><div class='del'>-USEUNIT("..\..\pngwtran.c");
</div><div class='del'>-USEUNIT("..\..\pngwutil.c");
</div><div class='del'>-USELIB("..\..\..\zlib\zlib.lib");
</div><div class='del'>-//---------------------------------------------------------------------------
</div><div class='del'>-This file is used by the project manager only and should be treated like the project file
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-DllEntryPoint
</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/cbuilder5/libpng.bpg b/src/3rdparty/libpng/projects/cbuilder5/libpng.bpg<br/>deleted file mode 100644<br/>index c6c6a4e..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/cbuilder5/libpng.bpg?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/libpng.bpg</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,25 +0,0 @@</div><div class='del'>-#------------------------------------------------------------------------------
</div><div class='del'>-VERSION = BWS.01
</div><div class='del'>-#------------------------------------------------------------------------------
</div><div class='del'>-!ifndef ROOT
</div><div class='del'>-ROOT = $(MAKEDIR)\..
</div><div class='del'>-!endif
</div><div class='del'>-#------------------------------------------------------------------------------
</div><div class='del'>-MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
</div><div class='del'>-DCC = $(ROOT)\bin\dcc32.exe $**
</div><div class='del'>-BRCC = $(ROOT)\bin\brcc32.exe $**
</div><div class='del'>-#------------------------------------------------------------------------------
</div><div class='del'>-PROJECTS = libpngstat.lib libpng.dll
</div><div class='del'>-#------------------------------------------------------------------------------
</div><div class='del'>-default: $(PROJECTS)
</div><div class='del'>-#------------------------------------------------------------------------------
</div><div class='del'>-
</div><div class='del'>-libpngstat.lib: libpngstat.bpr
</div><div class='del'>-  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
</div><div class='del'>-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
</div><div class='del'>-
</div><div class='del'>-libpng.dll: libpng.bpr
</div><div class='del'>-  $(ROOT)\bin\bpr2mak $**
</div><div class='del'>-  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
</div><div class='del'>-
</div><div class='del'>-
</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/cbuilder5/libpng.bpr b/src/3rdparty/libpng/projects/cbuilder5/libpng.bpr<br/>deleted file mode 100644<br/>index 7e09dda..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/cbuilder5/libpng.bpr?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/libpng.bpr</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,157 +0,0 @@</div><div class='del'>-&lt;?xml version='1.0' encoding='utf-8' ?&gt;
</div><div class='del'>-&lt;!-- C++Builder XML Project --&gt;
</div><div class='del'>-&lt;PROJECT&gt;
</div><div class='del'>-  &lt;MACROS&gt;
</div><div class='del'>-    &lt;VERSION value="BCB.05.03"/&gt;
</div><div class='del'>-    &lt;PROJECT value="libpng.dll"/&gt;
</div><div class='del'>-    &lt;OBJFILES value="libpng.obj ..\..\pngwutil.obj ..\..\pngerror.obj ..\..\pngget.obj 
</div><div class='del'>-      ..\..\pngmem.obj ..\..\pngpread.obj ..\..\pngread.obj ..\..\pngrio.obj 
</div><div class='del'>-      ..\..\pngrtran.obj ..\..\pngrutil.obj ..\..\pngset.obj ..\..\pngtrans.obj 
</div><div class='del'>-      ..\..\pngwio.obj ..\..\pngwrite.obj ..\..\pngwtran.obj ..\..\png.obj"/&gt;
</div><div class='del'>-    &lt;RESFILES value=""/&gt;
</div><div class='del'>-    &lt;DEFFILE value=""/&gt;
</div><div class='del'>-    &lt;RESDEPEN value="$(RESFILES)"/&gt;
</div><div class='del'>-    &lt;LIBFILES value="..\..\..\zlib\zlib.lib"/&gt;
</div><div class='del'>-    &lt;LIBRARIES value="bcbsmp50.lib dclocx50.lib NMFast50.lib Tee50.lib Vclx50.lib Vcl50.lib"/&gt;
</div><div class='del'>-    &lt;SPARELIBS value="Vcl50.lib Vclx50.lib Tee50.lib NMFast50.lib dclocx50.lib bcbsmp50.lib"/&gt;
</div><div class='del'>-    &lt;PACKAGES value="Vcl50.bpi Vclx50.bpi bcbsmp50.bpi Qrpt50.bpi Vcldb50.bpi Vclbde50.bpi 
</div><div class='del'>-      ibsmp50.bpi vcldbx50.bpi TeeUI50.bpi TeeDB50.bpi Tee50.bpi TeeQR50.bpi 
</div><div class='del'>-      VCLIB50.bpi bcbie50.bpi vclie50.bpi Inetdb50.bpi Inet50.bpi NMFast50.bpi 
</div><div class='del'>-      dclocx50.bpi bcb97axserver50.bpi SIMULUSCOMPONENTS.bpi Simulus2.bpi"/&gt;
</div><div class='del'>-    &lt;PATHCPP value=".;..\.."/&gt;
</div><div class='del'>-    &lt;PATHPAS value=".;"/&gt;
</div><div class='del'>-    &lt;PATHRC value=".;"/&gt;
</div><div class='del'>-    &lt;PATHASM value=".;"/&gt;
</div><div class='del'>-    &lt;DEBUGLIBPATH value="$(BCB)\lib\debug"/&gt;
</div><div class='del'>-    &lt;RELEASELIBPATH value="$(BCB)\lib\release"/&gt;
</div><div class='del'>-    &lt;LINKER value="tlink32"/&gt;
</div><div class='del'>-    &lt;USERDEFINES value="PNG_BUILD_DLL;PNG_NO_MODULEDEF"/&gt;
</div><div class='del'>-    &lt;SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL"/&gt;
</div><div class='del'>-    &lt;MAINSOURCE value="libpng.bpf"/&gt;
</div><div class='del'>-    &lt;INCLUDEPATH value="..\..;..\..\..\zlib;$(BCB)\include"/&gt;
</div><div class='del'>-    &lt;LIBPATH value="..\..;$(BCB)\lib\obj;$(BCB)\lib"/&gt;
</div><div class='del'>-    &lt;WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wucp -wstv -wstu -wsig -wpin 
</div><div class='del'>-      -wnod -wnak -wdef -wcln -wbbf -wasm -wamp -wamb"/&gt;
</div><div class='del'>-  &lt;/MACROS&gt;
</div><div class='del'>-  &lt;OPTIONS&gt;
</div><div class='del'>-    &lt;CFLAG1 value="-WD -O2 -w -Vx -Ve -x- -RT- -X- -a8 -5 -b- -d -k- -vi -tWD -tWM -c"/&gt;
</div><div class='del'>-    &lt;PFLAGS value="-$Y- -$L- -$D- -$C- -v -JPHNE -M"/&gt;
</div><div class='del'>-    &lt;RFLAGS value=""/&gt;
</div><div class='del'>-    &lt;AFLAGS value="/mx /w2 /zn"/&gt;
</div><div class='del'>-    &lt;LFLAGS value="-D&amp;quot;&amp;quot; -aa -Tpd -x -Gn -Gi -w"/&gt;
</div><div class='del'>-  &lt;/OPTIONS&gt;
</div><div class='del'>-  &lt;LINKER&gt;
</div><div class='del'>-    &lt;ALLOBJ value="c0d32.obj $(OBJFILES)"/&gt;
</div><div class='del'>-    &lt;ALLRES value="$(RESFILES)"/&gt;
</div><div class='del'>-    &lt;ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mti.lib"/&gt;
</div><div class='del'>-  &lt;/LINKER&gt;
</div><div class='del'>-  &lt;IDEOPTIONS&gt;
</div><div class='del'>-[Version Info]
</div><div class='del'>-IncludeVerInfo=0
</div><div class='del'>-AutoIncBuild=0
</div><div class='del'>-MajorVer=1
</div><div class='del'>-MinorVer=0
</div><div class='del'>-Release=0
</div><div class='del'>-Build=0
</div><div class='del'>-Debug=0
</div><div class='del'>-PreRelease=0
</div><div class='del'>-Special=0
</div><div class='del'>-Private=0
</div><div class='del'>-DLL=1
</div><div class='del'>-Locale=2057
</div><div class='del'>-CodePage=1252
</div><div class='del'>-
</div><div class='del'>-[Version Info Keys]
</div><div class='del'>-CompanyName=
</div><div class='del'>-FileDescription=
</div><div class='del'>-FileVersion=1.0.0.0
</div><div class='del'>-InternalName=
</div><div class='del'>-LegalCopyright=
</div><div class='del'>-LegalTrademarks=
</div><div class='del'>-OriginalFilename=
</div><div class='del'>-ProductName=
</div><div class='del'>-ProductVersion=
</div><div class='del'>-Comments=
</div><div class='del'>-
</div><div class='del'>-[HistoryLists\hlIncludePath]
</div><div class='del'>-Count=18
</div><div class='del'>-Item0=..\..;..\..\..\zlib;$(BCB)\include
</div><div class='del'>-Item1=..\..;P:\My Documents\Source\PNG+ZLib\zlib;$(BCB)\include
</div><div class='del'>-Item2=..\..;..\Source\ThirdParty\PortableNetworkGraphics\external;..\Source\ThirdParty\PortableNetworkGraphics;..\Source\ThirdParty\ZLibCompression\external;$(BCB)\include
</div><div class='del'>-Item3=..\Source\ThirdParty\PortableNetworkGraphics\external;..\Source\ThirdParty\PortableNetworkGraphics;..\Source\ThirdParty\ZLibCompression\external;$(BCB)\include
</div><div class='del'>-Item4=..\Source\ThirdParty\PortableNetworkGraphics\external;..\Source\ThirdParty\PortableNetworkGraphics;..\Source\ThirdParty\ZLibCompression;$(BCB)\include
</div><div class='del'>-Item5=..\Source\ThirdParty\PortableNetworkGraphics;..\Source\ThirdParty\ZLibCompression;$(BCB)\include
</div><div class='del'>-Item6=..\Source\ThirdParty\PortableNetworkGraphics;P:\Development\Source\ThirdParty\ZLibCompression;$(BCB)\include
</div><div class='del'>-Item7=..\Source\ThirdParty\PortableNetworkGraphics;$(BCB)\include
</div><div class='del'>-Item8=$(BCB)\include
</div><div class='del'>-Item9=..\Source;..\Source\General\Templates;..\Source\SIMUtilities;$(BCB)\include;$(BCB)\include\vcl
</div><div class='del'>-Item10=P:\Development\Source\;P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities\;$(BCB)\include;$(BCB)\include\vcl
</div><div class='del'>-Item11=P:\Development\Source;P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities\;$(BCB)\include;$(BCB)\include\vcl
</div><div class='del'>-Item12=P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities\;$(BCB)\include;$(BCB)\include\vcl
</div><div class='del'>-Item13=P:\Development\Source\General\Templates\;P:\Development\Source\SIMUtilities;$(BCB)\include;$(BCB)\include\vcl
</div><div class='del'>-Item14=P:\Development\Source\General\Templates\;$(BCB)\include;$(BCB)\include\vcl
</div><div class='del'>-Item15=P:\Development\Source\General\Templates;$(BCB)\include;$(BCB)\include\vcl
</div><div class='del'>-Item16=P:\Development\Source;$(BCB)\include;$(BCB)\include\vcl
</div><div class='del'>-Item17=$(BCB)\include;$(BCB)\include\vcl
</div><div class='del'>-
</div><div class='del'>-[HistoryLists\hlLibraryPath]
</div><div class='del'>-Count=10
</div><div class='del'>-Item0=..\..;$(BCB)\lib\obj;$(BCB)\lib
</div><div class='del'>-Item1=..\..;..\Source\ThirdParty\PortableNetworkGraphics\external;..\Source\ThirdParty\PortableNetworkGraphics;$(BCB)\lib\obj;$(BCB)\lib
</div><div class='del'>-Item2=..\Source\ThirdParty\PortableNetworkGraphics\external;..\Source\ThirdParty\PortableNetworkGraphics;$(BCB)\lib\obj;$(BCB)\lib
</div><div class='del'>-Item3=..\Source\ThirdParty\PortableNetworkGraphics;$(BCB)\lib\obj;$(BCB)\lib
</div><div class='del'>-Item4=$(BCB)\lib\obj;$(BCB)\lib
</div><div class='del'>-Item5=..\Source\SIMUtilities;..\Source;$(BCB)\lib\obj;$(BCB)\lib
</div><div class='del'>-Item6=P:\Development\Source\SIMUtilities\;P:\Development\Source\;$(BCB)\lib\obj;$(BCB)\lib
</div><div class='del'>-Item7=P:\Development\Source\SIMUtilities;P:\Development\Source\;$(BCB)\lib\obj;$(BCB)\lib
</div><div class='del'>-Item8=P:\Development\Source\;$(BCB)\lib\obj;$(BCB)\lib
</div><div class='del'>-Item9=P:\Development\Source;$(BCB)\lib\obj;$(BCB)\lib
</div><div class='del'>-
</div><div class='del'>-[HistoryLists\hlDebugSourcePath]
</div><div class='del'>-Count=1
</div><div class='del'>-Item0=$(BCB)\source\vcl
</div><div class='del'>-
</div><div class='del'>-[HistoryLists\hlConditionals]
</div><div class='del'>-Count=20
</div><div class='del'>-Item0=ZLIB_DLL;Z_PREFIX;PNG_BUILD_DLL;PNG_NO_MODULEDEF
</div><div class='del'>-Item1=_DEBUG;ZLIB_DLL;Z_PREFIX;PNG_BUILD_DLL;PNG_NO_MODULEDEF
</div><div class='del'>-Item2=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_NO_MODULEDEF
</div><div class='del'>-Item3=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG=5;PNG_NO_MODULEDEF;PNG_NO_GLOBAL_ARRAYS
</div><div class='del'>-Item4=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG=5;PNG_NO_MODULEDEF;PNG_SETJMP_NOT_SUPPORTED;PNG_DEBUG_FILE=stderr
</div><div class='del'>-Item5=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG;PNG_NO_MODULEDEF;PNG_SETJMP_NOT_SUPPORTED
</div><div class='del'>-Item6=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG=5;PNG_NO_MODULEDEF;PNG_SETJMP_NOT_SUPPORTED
</div><div class='del'>-Item7=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG=5;PNG_NO_MODULEDEF
</div><div class='del'>-Item8=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG;PNG_DEBUG=5
</div><div class='del'>-Item9=PNG_BUILD_DLL;ZLIB_DLL;_DEBUG
</div><div class='del'>-Item10=PNG_BUILD_DLL;ZLIB_DLL
</div><div class='del'>-Item11=PNG_BUILD_DLL
</div><div class='del'>-Item12=PNG_DLL;PNG_BUILD_DLL;ZLIB_DLL
</div><div class='del'>-Item13=PNG_DLL;PNG_BUILD_DLL;PNG_NO_GLOBAL_ARRAYS;ZLIB_DLL
</div><div class='del'>-Item14=PNG_DLL;PNG_BUILD_DLL;PNG_NO_GLOBAL_ARRAYS
</div><div class='del'>-Item15=PNG_DLL;PNG_BUILD_DLL
</div><div class='del'>-Item16=PNG_DLL;PNG_BUILD_DLL;PNG_MODULEDEF
</div><div class='del'>-Item17=_HTML_FORM
</div><div class='del'>-Item18=_DEBUG;_HTML_FORM
</div><div class='del'>-Item19=_DEBUG
</div><div class='del'>-
</div><div class='del'>-[HistoryLists\hlIntOutputDir]
</div><div class='del'>-Count=2
</div><div class='del'>-Item0=..\Obj
</div><div class='del'>-Item1=P:\Development\Obj
</div><div class='del'>-
</div><div class='del'>-[Debugging]
</div><div class='del'>-DebugSourceDirs=
</div><div class='del'>-
</div><div class='del'>-[Parameters]
</div><div class='del'>-RunParams=
</div><div class='del'>-HostApplication=P:\Development\Executables\LibPNGTestApp.exe
</div><div class='del'>-RemoteHost=
</div><div class='del'>-RemotePath=
</div><div class='del'>-RemoteDebug=0
</div><div class='del'>-
</div><div class='del'>-[Compiler]
</div><div class='del'>-ShowInfoMsgs=0
</div><div class='del'>-LinkDebugVcl=0
</div><div class='del'>-LinkCGLIB=0
</div><div class='del'>-  &lt;/IDEOPTIONS&gt;
</div><div class='del'>-&lt;/PROJECT&gt;
\ No newline at end of file</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/cbuilder5/libpng.cpp b/src/3rdparty/libpng/projects/cbuilder5/libpng.cpp<br/>deleted file mode 100644<br/>index 97865f5..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/cbuilder5/libpng.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/libpng.cpp</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-//---------------------------------------------------------------------------
</div><div class='del'>-#include &lt;windows.h&gt;
</div><div class='del'>-//---------------------------------------------------------------------------
</div><div class='del'>-//   Important note about DLL memory management when your DLL uses the
</div><div class='del'>-//   static version of the RunTime Library:
</div><div class='del'>-//
</div><div class='del'>-//   If your DLL exports any functions that pass String objects (or structs/
</div><div class='del'>-//   classes containing nested Strings) as parameter or function results,
</div><div class='del'>-//   you will need to add the library MEMMGR.LIB to both the DLL project and
</div><div class='del'>-//   any other projects that use the DLL.  You will also need to use MEMMGR.LIB
</div><div class='del'>-//   if any other projects which use the DLL will be performing new or delete
</div><div class='del'>-//   operations on any non-TObject-derived classes which are exported from the
</div><div class='del'>-//   DLL. Adding MEMMGR.LIB to your project will change the DLL and its calling
</div><div class='del'>-//   EXE's to use the BORLNDMM.DLL as their memory manager.  In these cases,
</div><div class='del'>-//   the file BORLNDMM.DLL should be deployed along with your DLL.
</div><div class='del'>-//
</div><div class='del'>-//   To avoid using BORLNDMM.DLL, pass string information using "char *" or
</div><div class='del'>-//   ShortString parameters.
</div><div class='del'>-//
</div><div class='del'>-//   If your DLL uses the dynamic version of the RTL, you do not need to
</div><div class='del'>-//   explicitly add MEMMGR.LIB as this will be done implicitly for you
</div><div class='del'>-//---------------------------------------------------------------------------
</div><div class='del'>-
</div><div class='del'>-int WINAPI DllEntryPoint(HINSTANCE, unsigned long, void*)
</div><div class='del'>-{
</div><div class='del'>-    return 1;
</div><div class='del'>-}
</div><div class='del'>-//---------------------------------------------------------------------------
</div><div class='del'>- 
\ No newline at end of file</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/cbuilder5/libpng.readme.txt b/src/3rdparty/libpng/projects/cbuilder5/libpng.readme.txt<br/>deleted file mode 100644<br/>index c99c1e9..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/cbuilder5/libpng.readme.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/libpng.readme.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,25 +0,0 @@</div><div class='del'>-Project files to build libpng using Borland C++ Builder v5.0</div><div class='del'>-</div><div class='del'>-In order to build and use libpng, please follow these steps:</div><div class='del'>-</div><div class='del'>- 1). Install zlib in a directory at the same level with libpng.</div><div class='del'>-</div><div class='del'>- 2). In a console window, go to the zlib directory and type:</div><div class='del'>-       make -f win32\Makefile.bor</div><div class='del'>-     After performing this step, you should have a file named</div><div class='del'>-     zlib.lib in the zlib directory.</div><div class='del'>-</div><div class='del'>- 3). Add the following conditional define to your project:</div><div class='del'>-       PNG_USE_DLL</div><div class='del'>-</div><div class='del'>- 4). Add libpng.lib or libpngstat.lib to the project.</div><div class='del'>-     Build the project.</div><div class='del'>-</div><div class='del'>- 5). If the build fails, add the paths to png.h and zlib.h to</div><div class='del'>-     your include path, and restart the build.</div><div class='del'>-</div><div class='del'>-By default, the libpng project uses zlib as a static library.  If</div><div class='del'>-you wish to use zlib as a DLL, please read the important notes from</div><div class='del'>-the zlib DLL FAQ, found inside the zlib distribution.</div><div class='del'>-</div><div class='del'>-See the libpng documentation for instructions on how to use the code.</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/cbuilder5/libpngstat.bpf b/src/3rdparty/libpng/projects/cbuilder5/libpngstat.bpf<br/>deleted file mode 100644<br/>index f736b62..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/cbuilder5/libpngstat.bpf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/libpngstat.bpf</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-USEUNIT("..\..\png.c");
</div><div class='del'>-USEUNIT("..\..\pngerror.c");
</div><div class='del'>-USEUNIT("..\..\pngget.c");
</div><div class='del'>-USEUNIT("..\..\pngmem.c");
</div><div class='del'>-USEUNIT("..\..\pngpread.c");
</div><div class='del'>-USEUNIT("..\..\pngread.c");
</div><div class='del'>-USEUNIT("..\..\pngrio.c");
</div><div class='del'>-USEUNIT("..\..\pngrtran.c");
</div><div class='del'>-USEUNIT("..\..\pngrutil.c");
</div><div class='del'>-USEUNIT("..\..\pngset.c");
</div><div class='del'>-USEUNIT("..\..\pngtrans.c");
</div><div class='del'>-USEUNIT("..\..\pngwio.c");
</div><div class='del'>-USEUNIT("..\..\pngwrite.c");
</div><div class='del'>-USEUNIT("..\..\pngwtran.c");
</div><div class='del'>-USEUNIT("..\..\pngwutil.c");
</div><div class='del'>-USELIB("..\..\..\zlib\zlib.lib");
</div><div class='del'>-//---------------------------------------------------------------------------
</div><div class='del'>-#define Library
</div><div class='del'>-
</div><div class='del'>-// To add a file to the library use the Project menu 'Add to Project'.
</div><div class='del'>-
</div><div class='del'>- 
\ No newline at end of file</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/cbuilder5/libpngstat.bpr b/src/3rdparty/libpng/projects/cbuilder5/libpngstat.bpr<br/>deleted file mode 100644<br/>index 68abb8d..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/cbuilder5/libpngstat.bpr?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/libpngstat.bpr</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,109 +0,0 @@</div><div class='del'>-&lt;?xml version='1.0' encoding='utf-8' ?&gt;
</div><div class='del'>-&lt;!-- C++Builder XML Project --&gt;
</div><div class='del'>-&lt;PROJECT&gt;
</div><div class='del'>-  &lt;MACROS&gt;
</div><div class='del'>-    &lt;VERSION value="BCB.05.03"/&gt;
</div><div class='del'>-    &lt;PROJECT value="libpngstat.lib"/&gt;
</div><div class='del'>-    &lt;OBJFILES value="..\..\pngerror.obj ..\..\png.obj ..\..\pngwutil.obj ..\..\pngmem.obj 
</div><div class='del'>-      ..\..\pngpread.obj ..\..\pngread.obj ..\..\pngrio.obj ..\..\pngrtran.obj 
</div><div class='del'>-      ..\..\pngrutil.obj ..\..\pngset.obj ..\..\pngtrans.obj ..\..\pngwio.obj 
</div><div class='del'>-      ..\..\pngwrite.obj ..\..\pngwtran.obj ..\..\pngget.obj"/&gt;
</div><div class='del'>-    &lt;RESFILES value=""/&gt;
</div><div class='del'>-    &lt;DEFFILE value=""/&gt;
</div><div class='del'>-    &lt;RESDEPEN value="$(RESFILES)"/&gt;
</div><div class='del'>-    &lt;LIBFILES value="..\..\..\zlib\zlib.lib"/&gt;
</div><div class='del'>-    &lt;LIBRARIES value=""/&gt;
</div><div class='del'>-    &lt;PACKAGES value=""/&gt;
</div><div class='del'>-    &lt;PATHCPP value=".;..\.."/&gt;
</div><div class='del'>-    &lt;PATHPAS value=".;"/&gt;
</div><div class='del'>-    &lt;PATHRC value=".;"/&gt;
</div><div class='del'>-    &lt;PATHASM value=".;"/&gt;
</div><div class='del'>-    &lt;LINKER value="TLib"/&gt;
</div><div class='del'>-    &lt;USERDEFINES value=""/&gt;
</div><div class='del'>-    &lt;SYSDEFINES value="_RTLDLL;NO_STRICT"/&gt;
</div><div class='del'>-    &lt;MAINSOURCE value="libpngstat.bpf"/&gt;
</div><div class='del'>-    &lt;INCLUDEPATH value="..\..;..\..\..\zlib;$(BCB)\include"/&gt;
</div><div class='del'>-    &lt;LIBPATH value="..\..;$(BCB)\lib\obj;$(BCB)\lib"/&gt;
</div><div class='del'>-    &lt;WARNINGS value="-w-par"/&gt;
</div><div class='del'>-    &lt;LISTFILE value=""/&gt;
</div><div class='del'>-  &lt;/MACROS&gt;
</div><div class='del'>-  &lt;OPTIONS&gt;
</div><div class='del'>-    &lt;CFLAG1 value="-O2 -w -Vx -Ve -X- -a8 -5 -b- -d -k- -vi -c -tW -tWM"/&gt;
</div><div class='del'>-    &lt;PFLAGS value="-$Y- -$L- -$D- -$C- -v -JPHNE -M"/&gt;
</div><div class='del'>-    &lt;AFLAGS value="/mx /w2 /zn"/&gt;
</div><div class='del'>-    &lt;LFLAGS value=""/&gt;
</div><div class='del'>-  &lt;/OPTIONS&gt;
</div><div class='del'>-  &lt;LINKER&gt;
</div><div class='del'>-    &lt;ALLOBJ value="$(OBJFILES)"/&gt;
</div><div class='del'>-    &lt;ALLLIB value=""/&gt;
</div><div class='del'>-  &lt;/LINKER&gt;
</div><div class='del'>-  &lt;IDEOPTIONS&gt;
</div><div class='del'>-[Version Info]
</div><div class='del'>-IncludeVerInfo=0
</div><div class='del'>-AutoIncBuild=0
</div><div class='del'>-MajorVer=1
</div><div class='del'>-MinorVer=0
</div><div class='del'>-Release=0
</div><div class='del'>-Build=0
</div><div class='del'>-Debug=0
</div><div class='del'>-PreRelease=0
</div><div class='del'>-Special=0
</div><div class='del'>-Private=0
</div><div class='del'>-DLL=0
</div><div class='del'>-Locale=2057
</div><div class='del'>-CodePage=1252
</div><div class='del'>-
</div><div class='del'>-[Version Info Keys]
</div><div class='del'>-CompanyName=
</div><div class='del'>-FileDescription=
</div><div class='del'>-FileVersion=1.0.0.0
</div><div class='del'>-InternalName=
</div><div class='del'>-LegalCopyright=
</div><div class='del'>-LegalTrademarks=
</div><div class='del'>-OriginalFilename=
</div><div class='del'>-ProductName=
</div><div class='del'>-ProductVersion=1.0.0.0
</div><div class='del'>-Comments=
</div><div class='del'>-
</div><div class='del'>-[HistoryLists\hlIncludePath]
</div><div class='del'>-Count=2
</div><div class='del'>-Item0=..\..;P:\My Documents\Source\PNG+ZLib\zlib;$(BCB)\include
</div><div class='del'>-Item1=..\..;$(BCB)\include;$(BCB)\include\vcl
</div><div class='del'>-
</div><div class='del'>-[HistoryLists\hlLibraryPath]
</div><div class='del'>-Count=1
</div><div class='del'>-Item0=..\..;$(BCB)\lib\obj;$(BCB)\lib
</div><div class='del'>-
</div><div class='del'>-[HistoryLists\hlDebugSourcePath]
</div><div class='del'>-Count=1
</div><div class='del'>-Item0=$(BCB)\source\vcl
</div><div class='del'>-
</div><div class='del'>-[HistoryLists\hlConditionals]
</div><div class='del'>-Count=1
</div><div class='del'>-Item0=_DEBUG
</div><div class='del'>-
</div><div class='del'>-[HistoryLists\hlTlibPageSize]
</div><div class='del'>-Count=1
</div><div class='del'>-Item0=0x0010
</div><div class='del'>-
</div><div class='del'>-[Debugging]
</div><div class='del'>-DebugSourceDirs=$(BCB)\source\vcl
</div><div class='del'>-
</div><div class='del'>-[Parameters]
</div><div class='del'>-RunParams=
</div><div class='del'>-HostApplication=
</div><div class='del'>-RemoteHost=
</div><div class='del'>-RemotePath=
</div><div class='del'>-RemoteDebug=0
</div><div class='del'>-
</div><div class='del'>-[Compiler]
</div><div class='del'>-ShowInfoMsgs=0
</div><div class='del'>-LinkDebugVcl=0
</div><div class='del'>-LinkCGLIB=0
</div><div class='del'>-
</div><div class='del'>-[Language]
</div><div class='del'>-ActiveLang=
</div><div class='del'>-ProjectLang=
</div><div class='del'>-RootDir=
</div><div class='del'>-  &lt;/IDEOPTIONS&gt;
</div><div class='del'>-&lt;/PROJECT&gt;
\ No newline at end of file</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/cbuilder5/zlib.readme.txt b/src/3rdparty/libpng/projects/cbuilder5/zlib.readme.txt<br/>deleted file mode 100644<br/>index cb6a7a8..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/cbuilder5/zlib.readme.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/cbuilder5/zlib.readme.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-The project that builds libpng under Borland C++ Builder does not</div><div class='del'>-explicitly build zlib.  By taking this decision, there is no need</div><div class='del'>-to update the libpng project each time when there is a change in</div><div class='del'>-the list of zlib source files.  After all, this list is private to</div><div class='del'>-zlib, and applications (such as libpng) should not assume anything</div><div class='del'>-about it.</div><div class='del'>-</div><div class='del'>-If you wish to contribute a project that builds zlib under Borland</div><div class='del'>-C++ Builder, please submit it to the zlib developers, not to the</div><div class='del'>-libpng developers.</div><div class='del'>-</div><div class='del'>-By default, the libpng project uses zlib as a static library.  If</div><div class='del'>-you wish to use zlib as a DLL, please read the important notes from</div><div class='del'>-the zlib DLL FAQ, found inside the zlib distribution.</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/visualc6/README.txt b/src/3rdparty/libpng/projects/visualc6/README.txt<br/>deleted file mode 100644<br/>index b650e9e..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/visualc6/README.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/visualc6/README.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-Microsoft Developer Studio Project File, Format Version 6.00 for libpng.</div><div class='del'>-</div><div class='del'>-Copyright (C) 2000-2004 Simon-Pierre Cadieux.</div><div class='del'>-Copyright (C) 2004 Cosmin Truta.</div><div class='del'>-</div><div class='del'>-This code is released under the libpng license.</div><div class='del'>-For conditions of distribution and use, see copyright notice in png.h</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Assumptions:</div><div class='del'>-* The libpng source files are in ..\..</div><div class='del'>-* The zlib source files are in ..\..\..\zlib</div><div class='del'>-* The zlib project files are in ..\..\..\zlib\projects\visualc6</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-To use:</div><div class='del'>-</div><div class='del'>-1) On the main menu, select "File | Open Workspace".</div><div class='del'>-   Open "libpng.dsw".</div><div class='del'>-</div><div class='del'>-2) Select "Build | Set Active Configuration".</div><div class='del'>-   Choose the configuration you wish to build.</div><div class='del'>-   (Choose libpng or pngtest; zlib will be built automatically.)</div><div class='del'>-</div><div class='del'>-3) Select "Build | Clean".</div><div class='del'>-</div><div class='del'>-4) Select "Build | Build ... (F7)".  Ignore warning messages about</div><div class='del'>-   not being able to find certain include files (e.g. alloc.h).</div><div class='del'>-</div><div class='del'>-5) If you built the sample program (pngtest),</div><div class='del'>-   select "Build | Execute ... (Ctrl+F5)".</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-This project builds the libpng binaries as follows:</div><div class='del'>-</div><div class='del'>-* Win32_DLL_Release\libpng14.dll      DLL build</div><div class='del'>-* Win32_DLL_Debug\libpng14d.dll       DLL build (debug version)</div><div class='del'>-* Win32_DLL_VB\libpng14vb.dll         DLL build for Visual Basic, using stdcall</div><div class='del'>-* Win32_LIB_Release\libpng.lib        static build</div><div class='del'>-* Win32_LIB_Debug\libpngd.lib         static build (debug version)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Notes:</div><div class='del'>-</div><div class='del'>-If you change anything in the source files, or select different compiler</div><div class='del'>-settings, please change the DLL name to something different than any of</div><div class='del'>-the above names. Also, make sure that in your "pngusr.h" you define</div><div class='del'>-PNG_USER_PRIVATEBUILD and PNG_USER_DLLFNAME_POSTFIX according to the</div><div class='del'>-instructions provided in "pngconf.h".</div><div class='del'>-</div><div class='del'>-All DLLs built by this project use the Microsoft dynamic C runtime library</div><div class='del'>-MSVCRT.DLL (MSVCRTD.DLL for debug versions).  If you distribute any of the</div><div class='del'>-above mentioned libraries you should also include this DLL in your package.</div><div class='del'>-For a list of files that are redistributable in Visual C++ 6.0, see</div><div class='del'>-Common\Redist\Redist.txt on Disc 1 of the Visual C++ 6.0 product CDs.</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/visualc6/libpng.dsp b/src/3rdparty/libpng/projects/visualc6/libpng.dsp<br/>deleted file mode 100644<br/>index 6704255..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/visualc6/libpng.dsp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/visualc6/libpng.dsp</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,328 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Project File - Name="libpng" - Package Owner=&lt;4&gt;
</div><div class='del'>-# Microsoft Developer Studio Generated Build File, Format Version 6.00
</div><div class='del'>-# ** DO NOT EDIT **
</div><div class='del'>-
</div><div class='del'>-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
</div><div class='del'>-# TARGTYPE "Win32 (x86) Static Library" 0x0104
</div><div class='del'>-
</div><div class='del'>-CFG=libpng - Win32 DLL Release
</div><div class='del'>-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
</div><div class='del'>-!MESSAGE use the Export Makefile command and run
</div><div class='del'>-!MESSAGE
</div><div class='del'>-!MESSAGE NMAKE /f "libpng.mak".
</div><div class='del'>-!MESSAGE
</div><div class='del'>-!MESSAGE You can specify a configuration when running NMAKE
</div><div class='del'>-!MESSAGE by defining the macro CFG on the command line. For example:
</div><div class='del'>-!MESSAGE
</div><div class='del'>-!MESSAGE NMAKE /f "libpng.mak" CFG="libpng - Win32 DLL Release"
</div><div class='del'>-!MESSAGE
</div><div class='del'>-!MESSAGE Possible choices for configuration are:
</div><div class='del'>-!MESSAGE
</div><div class='del'>-!MESSAGE "libpng - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
</div><div class='del'>-!MESSAGE "libpng - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
</div><div class='del'>-!MESSAGE "libpng - Win32 DLL VB" (based on "Win32 (x86) Dynamic-Link Library")
</div><div class='del'>-!MESSAGE "libpng - Win32 LIB Release" (based on "Win32 (x86) Static Library")
</div><div class='del'>-!MESSAGE "libpng - Win32 LIB Debug" (based on "Win32 (x86) Static Library")
</div><div class='del'>-!MESSAGE
</div><div class='del'>-
</div><div class='del'>-# Begin Project
</div><div class='del'>-# PROP AllowPerConfigDependencies 0
</div><div class='del'>-# PROP Scc_ProjName ""
</div><div class='del'>-# PROP Scc_LocalPath ""
</div><div class='del'>-
</div><div class='del'>-!IF  "$(CFG)" == "libpng - Win32 DLL Release"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "libpng___Win32_DLL_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "libpng___Win32_DLL_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_Release"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_Release"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-CPP=cl.exe
</div><div class='del'>-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX /Yc /Yu
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX /Yc /Yu
</div><div class='del'>-MTL=midl.exe
</div><div class='del'>-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
</div><div class='del'>-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
</div><div class='del'>-RSC=rc.exe
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 /nologo /dll /machine:I386
</div><div class='del'>-# ADD LINK32 zlib1.lib /nologo /dll /machine:I386 /out:"Win32_DLL_Release\libpng14.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_Release"
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "libpng - Win32 DLL Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 1
</div><div class='del'>-# PROP BASE Output_Dir "libpng___Win32_DLL_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "libpng___Win32_DLL_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 1
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_Debug"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_Debug"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-CPP=cl.exe
</div><div class='del'>-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX /Yc /Yu
</div><div class='del'>-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /FD /GZ /c
</div><div class='del'>-# SUBTRACT CPP /YX /Yc /Yu
</div><div class='del'>-MTL=midl.exe
</div><div class='del'>-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
</div><div class='del'>-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
</div><div class='del'>-RSC=rc.exe
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG" /d PNG_DEBUG=1
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-# ADD LINK32 zlib1d.lib /nologo /dll /debug /machine:I386 /out:"Win32_DLL_Debug\libpng14d.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_Debug"
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "libpng - Win32 DLL VB"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "libpng___Win32_DLL_VB"
</div><div class='del'>-# PROP BASE Intermediate_Dir "libpng___Win32_DLL_VB"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_VB"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_VB"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-CPP=cl.exe
</div><div class='del'>-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX /Yc /Yu
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D PNGAPI=__stdcall /D "PNG_NO_MODULEDEF" /D "PNG_LIBPNG_SPECIALBUILD" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX /Yc /Yu
</div><div class='del'>-MTL=midl.exe
</div><div class='del'>-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
</div><div class='del'>-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
</div><div class='del'>-RSC=rc.exe
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG" /dPNG_LIBPNG_DLLFNAME_POSTFIX=""""VB"""" /dPNG_LIBPNG_SPECIALBUILD=""""__stdcall calling convention used for exported functions""""
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 /nologo /dll /machine:I386
</div><div class='del'>-# ADD LINK32 zlib1.lib /nologo /dll /machine:I386 /out:"Win32_DLL_VB\libpng14vb.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_Release"
</div><div class='del'>-# Begin Special Build Tool
</div><div class='del'>-OutDir=.\Win32_DLL_VB
</div><div class='del'>-TargetName=libpng14vb
</div><div class='del'>-SOURCE="$(InputPath)"
</div><div class='del'>-PostBuild_Cmds=echo    Deleting $(targetname) import library and export file (Not required for VB projects)	del $(outdir)\$(targetname).lib	del $(outdir)\$(targetname).exp
</div><div class='del'>-# End Special Build Tool
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "libpng - Win32 LIB Release"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "libpng___Win32_LIB_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "libpng___Win32_LIB_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_LIB_Release"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_LIB_Release"
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-CPP=cl.exe
</div><div class='del'>-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX /Yc /Yu
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX /Yc /Yu
</div><div class='del'>-RSC=rc.exe
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LIB32=link.exe -lib
</div><div class='del'>-# ADD BASE LIB32 /nologo
</div><div class='del'>-# ADD LIB32 /nologo
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "libpng - Win32 LIB Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 1
</div><div class='del'>-# PROP BASE Output_Dir "libpng___Win32_LIB_Debug"
</div><div class='del'>-# PROP BASE Intermediate_Dir "libpng___Win32_LIB_Debug"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 1
</div><div class='del'>-# PROP Output_Dir "Win32_LIB_Debug"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_LIB_Debug"
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-CPP=cl.exe
</div><div class='del'>-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX /Yc /Yu
</div><div class='del'>-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /FD /GZ /c
</div><div class='del'>-# SUBTRACT CPP /YX /Yc /Yu
</div><div class='del'>-RSC=rc.exe
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LIB32=link.exe -lib
</div><div class='del'>-# ADD BASE LIB32 /nologo
</div><div class='del'>-# ADD LIB32 /nologo /out:"Win32_LIB_Debug\libpngd.lib"
</div><div class='del'>-
</div><div class='del'>-!ENDIF 
</div><div class='del'>-
</div><div class='del'>-# Begin Target
</div><div class='del'>-
</div><div class='del'>-# Name "libpng - Win32 DLL Release"
</div><div class='del'>-# Name "libpng - Win32 DLL Debug"
</div><div class='del'>-# Name "libpng - Win32 DLL VB"
</div><div class='del'>-# Name "libpng - Win32 LIB Release"
</div><div class='del'>-# Name "libpng - Win32 LIB Debug"
</div><div class='del'>-# Begin Group "Source Files"
</div><div class='del'>-
</div><div class='del'>-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\png.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngerror.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngget.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngmem.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngpread.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngread.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngrio.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngrtran.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngrutil.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngset.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngtrans.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\scripts\pngwin.def
</div><div class='del'>-
</div><div class='del'>-!IF  "$(CFG)" == "libpng - Win32 DLL Release"
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "libpng - Win32 DLL Debug"
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "libpng - Win32 DLL VB"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "libpng - Win32 LIB Release"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "libpng - Win32 LIB Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ENDIF 
</div><div class='del'>-
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngwio.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngwrite.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngwtran.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngwutil.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# End Group
</div><div class='del'>-# Begin Group "Header Files"
</div><div class='del'>-
</div><div class='del'>-# PROP Default_Filter "h;hpp;hxx;hm;inl"
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\png.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngconf.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngpriv.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# End Group
</div><div class='del'>-# Begin Group "Resource Files"
</div><div class='del'>-
</div><div class='del'>-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\scripts\pngwin.rc
</div><div class='del'>-
</div><div class='del'>-!IF  "$(CFG)" == "libpng - Win32 DLL Release"
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "libpng - Win32 DLL Debug"
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "libpng - Win32 DLL VB"
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "libpng - Win32 LIB Release"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "libpng - Win32 LIB Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ENDIF 
</div><div class='del'>-
</div><div class='del'>-# End Source File
</div><div class='del'>-# End Group
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=.\README.txt
</div><div class='del'>-# End Source File
</div><div class='del'>-# End Target
</div><div class='del'>-# End Project
</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/visualc6/libpng.dsw b/src/3rdparty/libpng/projects/visualc6/libpng.dsw<br/>deleted file mode 100644<br/>index 2a98646..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/visualc6/libpng.dsw?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/visualc6/libpng.dsw</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-Microsoft Developer Studio Workspace File, Format Version 6.00
</div><div class='del'>-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
</div><div class='del'>-
</div><div class='del'>-###############################################################################
</div><div class='del'>-
</div><div class='del'>-Project: "libpng"=".\libpng.dsp" - Package Owner=&lt;4&gt;
</div><div class='del'>-
</div><div class='del'>-Package=&lt;5&gt;
</div><div class='del'>-{{{
</div><div class='del'>-}}}
</div><div class='del'>-
</div><div class='del'>-Package=&lt;4&gt;
</div><div class='del'>-{{{
</div><div class='del'>-    Begin Project Dependency
</div><div class='del'>-    Project_Dep_Name zlib
</div><div class='del'>-    End Project Dependency
</div><div class='del'>-}}}
</div><div class='del'>-
</div><div class='del'>-###############################################################################
</div><div class='del'>-
</div><div class='del'>-Project: "pngtest"=".\pngtest.dsp" - Package Owner=&lt;4&gt;
</div><div class='del'>-
</div><div class='del'>-Package=&lt;5&gt;
</div><div class='del'>-{{{
</div><div class='del'>-}}}
</div><div class='del'>-
</div><div class='del'>-Package=&lt;4&gt;
</div><div class='del'>-{{{
</div><div class='del'>-    Begin Project Dependency
</div><div class='del'>-    Project_Dep_Name libpng
</div><div class='del'>-    End Project Dependency
</div><div class='del'>-}}}
</div><div class='del'>-
</div><div class='del'>-###############################################################################
</div><div class='del'>-
</div><div class='del'>-Project: "zlib"="..\..\..\zlib\projects\visualc6\zlib.dsp" - Package Owner=&lt;4&gt;
</div><div class='del'>-
</div><div class='del'>-Package=&lt;5&gt;
</div><div class='del'>-{{{
</div><div class='del'>-}}}
</div><div class='del'>-
</div><div class='del'>-Package=&lt;4&gt;
</div><div class='del'>-{{{
</div><div class='del'>-}}}
</div><div class='del'>-
</div><div class='del'>-###############################################################################
</div><div class='del'>-
</div><div class='del'>-Global:
</div><div class='del'>-
</div><div class='del'>-Package=&lt;5&gt;
</div><div class='del'>-{{{
</div><div class='del'>-}}}
</div><div class='del'>-
</div><div class='del'>-Package=&lt;3&gt;
</div><div class='del'>-{{{
</div><div class='del'>-}}}
</div><div class='del'>-
</div><div class='del'>-###############################################################################
</div><div class='del'>-
</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/visualc6/pngtest.dsp b/src/3rdparty/libpng/projects/visualc6/pngtest.dsp<br/>deleted file mode 100644<br/>index d3cb068..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/visualc6/pngtest.dsp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/visualc6/pngtest.dsp</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,178 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Project File - Name="pngtest" - Package Owner=&lt;4&gt;
</div><div class='del'>-# Microsoft Developer Studio Generated Build File, Format Version 6.00
</div><div class='del'>-# ** DO NOT EDIT **
</div><div class='del'>-
</div><div class='del'>-# TARGTYPE "Win32 (x86) Console Application" 0x0103
</div><div class='del'>-
</div><div class='del'>-CFG=pngtest - Win32 DLL Release
</div><div class='del'>-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
</div><div class='del'>-!MESSAGE use the Export Makefile command and run
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE NMAKE /f "pngtest.mak".
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE You can specify a configuration when running NMAKE
</div><div class='del'>-!MESSAGE by defining the macro CFG on the command line. For example:
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE NMAKE /f "pngtest.mak" CFG="pngtest - Win32 DLL Release"
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE Possible choices for configuration are:
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE "pngtest - Win32 DLL Release" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "pngtest - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "pngtest - Win32 LIB Release" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "pngtest - Win32 LIB Debug" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-
</div><div class='del'>-# Begin Project
</div><div class='del'>-# PROP AllowPerConfigDependencies 0
</div><div class='del'>-# PROP Scc_ProjName ""
</div><div class='del'>-# PROP Scc_LocalPath ""
</div><div class='del'>-CPP=cl.exe
</div><div class='del'>-RSC=rc.exe
</div><div class='del'>-
</div><div class='del'>-!IF  "$(CFG)" == "pngtest - Win32 DLL Release"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "pngtest___Win32_DLL_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "pngtest___Win32_DLL_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_Release"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_Release"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_DLL" /D "PNG_NO_STDIO" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 /nologo /subsystem:console /machine:I386
</div><div class='del'>-# ADD LINK32 Win32_DLL_Release\libpng14.lib ..\..\..\zlib\projects\visualc6\Win32_DLL_Release\zlib1.lib /nologo /subsystem:console /machine:I386
</div><div class='del'>-# Begin Special Build Tool
</div><div class='del'>-OutDir=.\Win32_DLL_Release
</div><div class='del'>-SOURCE="$(InputPath)"
</div><div class='del'>-PostBuild_Desc=[Run Test]
</div><div class='del'>-PostBuild_Cmds=set path=$(outdir);..\..\..\zlib\projects\visualc6\Win32_DLL_Release;	$(outdir)\pngtest.exe ..\..\pngtest.png
</div><div class='del'>-# End Special Build Tool
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "pngtest - Win32 DLL Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 1
</div><div class='del'>-# PROP BASE Output_Dir "pngtest___Win32_DLL_Debug"
</div><div class='del'>-# PROP BASE Intermediate_Dir "pngtest___Win32_DLL_Debug"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 1
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_Debug"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_Debug"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "PNG_DLL" /D "PNG_NO_STDIO" /FD /GZ /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-# ADD LINK32 Win32_DLL_Debug\libpng14d.lib ..\..\..\zlib\projects\visualc6\Win32_DLL_Debug\zlib1d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-# Begin Special Build Tool
</div><div class='del'>-OutDir=.\Win32_DLL_Debug
</div><div class='del'>-SOURCE="$(InputPath)"
</div><div class='del'>-PostBuild_Desc=[Run Test]
</div><div class='del'>-PostBuild_Cmds=set path=$(outdir);..\..\..\zlib\projects\visualc6\Win32_DLL_Debug;	$(outdir)\pngtest.exe ..\..\pngtest.png
</div><div class='del'>-# End Special Build Tool
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "pngtest - Win32 LIB Release"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "pngtest___Win32_LIB_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "pngtest___Win32_LIB_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_LIB_Release"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_LIB_Release"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 /nologo /subsystem:console /machine:I386
</div><div class='del'>-# ADD LINK32 Win32_LIB_Release\libpng.lib ..\..\..\zlib\projects\visualc6\Win32_LIB_Release\zlib.lib /nologo /subsystem:console /machine:I386
</div><div class='del'>-# Begin Special Build Tool
</div><div class='del'>-OutDir=.\Win32_LIB_Release
</div><div class='del'>-SOURCE="$(InputPath)"
</div><div class='del'>-PostBuild_Desc=[Run Test]
</div><div class='del'>-PostBuild_Cmds=$(outdir)\pngtest.exe ..\..\pngtest.png
</div><div class='del'>-# End Special Build Tool
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "pngtest - Win32 LIB Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 1
</div><div class='del'>-# PROP BASE Output_Dir "pngtest___Win32_LIB_Debug"
</div><div class='del'>-# PROP BASE Intermediate_Dir "pngtest___Win32_LIB_Debug"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 1
</div><div class='del'>-# PROP Output_Dir "Win32_LIB_Debug"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_LIB_Debug"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-# ADD LINK32 Win32_LIB_Debug\libpngd.lib ..\..\..\zlib\projects\visualc6\Win32_LIB_Debug\zlibd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-# Begin Special Build Tool
</div><div class='del'>-OutDir=.\Win32_LIB_Debug
</div><div class='del'>-SOURCE="$(InputPath)"
</div><div class='del'>-PostBuild_Desc=[Run Test]
</div><div class='del'>-PostBuild_Cmds=$(outdir)\pngtest.exe ..\..\pngtest.png
</div><div class='del'>-# End Special Build Tool
</div><div class='del'>-
</div><div class='del'>-!ENDIF 
</div><div class='del'>-
</div><div class='del'>-# Begin Target
</div><div class='del'>-
</div><div class='del'>-# Name "pngtest - Win32 DLL Release"
</div><div class='del'>-# Name "pngtest - Win32 DLL Debug"
</div><div class='del'>-# Name "pngtest - Win32 LIB Release"
</div><div class='del'>-# Name "pngtest - Win32 LIB Debug"
</div><div class='del'>-# Begin Group "Source Files"
</div><div class='del'>-
</div><div class='del'>-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\pngtest.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# End Group
</div><div class='del'>-# End Target
</div><div class='del'>-# End Project
</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/visualc71/PRJ0041.mak b/src/3rdparty/libpng/projects/visualc71/PRJ0041.mak<br/>deleted file mode 100644<br/>index e15e12b..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/visualc71/PRJ0041.mak?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/visualc71/PRJ0041.mak</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-# Prevent "Cannot find missing dependency..." warnings while compiling</div><div class='del'>-# pngwin.rc (PRJ0041).</div><div class='del'>-</div><div class='del'>-all: $(IntDir)\alloc.h \</div><div class='del'>-	 $(IntDir)\fp.h \</div><div class='del'>-	 $(IntDir)\m68881.h \</div><div class='del'>-	 $(IntDir)\mem.h \</div><div class='del'>-	 $(IntDir)\pngusr.h \</div><div class='del'>-	 $(IntDir)\strings.h \</div><div class='del'>-	 $(IntDir)\unistd.h \</div><div class='del'>-	 $(IntDir)\unixio.h</div><div class='del'>-	 </div><div class='del'>-$(IntDir)\alloc.h \</div><div class='del'>-$(IntDir)\fp.h \</div><div class='del'>-$(IntDir)\m68881.h \</div><div class='del'>-$(IntDir)\mem.h \</div><div class='del'>-$(IntDir)\pngusr.h \</div><div class='del'>-$(IntDir)\strings.h \</div><div class='del'>-$(IntDir)\unistd.h \</div><div class='del'>-$(IntDir)\unixio.h:</div><div class='del'>-	@!echo.&gt;$@</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/visualc71/README.txt b/src/3rdparty/libpng/projects/visualc71/README.txt<br/>deleted file mode 100644<br/>index 7d51eed..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/visualc71/README.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/visualc71/README.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-Microsoft Developer Studio Project File, Format Version 7.10 for libpng.</div><div class='del'>-</div><div class='del'>-Copyright (C) 2004 Simon-Pierre Cadieux.</div><div class='del'>-</div><div class='del'>-This code is released under the libpng license.</div><div class='del'>-For conditions of distribution and use, see copyright notice in png.h</div><div class='del'>-</div><div class='del'>-Assumptions:</div><div class='del'>-* The libpng source files are in ..\..</div><div class='del'>-* The zlib source files are in ..\..\..\zlib</div><div class='del'>-* The zlib project file is in . /* Warning: This is until the zlib project</div><div class='del'>-  files get intergrated into the next zlib release. The final zlib project</div><div class='del'>-  directory will then be ..\..\..\zlib\projects\visualc71. */</div><div class='del'>-</div><div class='del'>-To use:</div><div class='del'>-</div><div class='del'>-1) On the main menu, select "File | Open Solution".</div><div class='del'>-   Open "libpng.sln".</div><div class='del'>-</div><div class='del'>-2) Display the Solution Explorer view (Ctrl+Alt+L)</div><div class='del'>-</div><div class='del'>-3) Set one of the project as the StartUp project. If you just want to build the</div><div class='del'>-   binaries set "libpng" as the startup project (Select "libpng" tree view</div><div class='del'>-   item + Project | Set as StartUp project). If you want to build and test the</div><div class='del'>-   binaries set it to "pngtest" (Select "pngtest" tree view item +</div><div class='del'>-   Project | Set as StartUp project)</div><div class='del'>-</div><div class='del'>-4) Select "Build | Configuration Manager...".</div><div class='del'>-   Choose the configuration you wish to build.</div><div class='del'>-</div><div class='del'>-5) Select "Build | Clean Solution".</div><div class='del'>-</div><div class='del'>-6) Select "Build | Build Solution (Ctrl-Shift-B)"</div><div class='del'>-</div><div class='del'>-This project builds the libpng binaries as follows:</div><div class='del'>-</div><div class='del'>-* Win32_DLL_Release\libpng14.dll      DLL build</div><div class='del'>-* Win32_DLL_Debug\libpng14d.dll       DLL build (debug version)</div><div class='del'>-* Win32_DLL_VB\libpng14vb.dll         DLL build for Visual Basic, using stdcall</div><div class='del'>-* Win32_LIB_Release\libpng.lib        static build</div><div class='del'>-* Win32_LIB_Debug\libpngd.lib         static build (debug version)</div><div class='del'>-</div><div class='del'>-Notes:</div><div class='del'>-</div><div class='del'>-If you change anything in the source files, or select different compiler</div><div class='del'>-settings, please change the DLL name to something different than any of</div><div class='del'>-the above names. Also, make sure that in your "pngusr.h" you define</div><div class='del'>-PNG_USER_PRIVATEBUILD and PNG_USER_DLLFNAME_POSTFIX according to the</div><div class='del'>-instructions provided in "pngconf.h".</div><div class='del'>-</div><div class='del'>-All DLLs built by this project use the Microsoft dynamic C runtime library</div><div class='del'>-MSVCR71.DLL (MSVCR71D.DLL for debug versions).  If you distribute any of the</div><div class='del'>-above mentioned libraries you may have to include this DLL in your package.</div><div class='del'>-For a list of files that are redistributable in Visual Studio see</div><div class='del'>-$(VCINSTALLDIR)\redist.txt.</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/visualc71/README_zlib.txt b/src/3rdparty/libpng/projects/visualc71/README_zlib.txt<br/>deleted file mode 100644<br/>index cc73899..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/visualc71/README_zlib.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/visualc71/README_zlib.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-/* WARNING: This file was put in the LibPNG distribution for convenience only.</div><div class='del'>-            It is expected to be part of the next zlib release under</div><div class='del'>-            "projects\visualc71\README.txt." */</div><div class='del'>-</div><div class='del'>-Microsoft Developer Studio Project File, Format Version 7.10 for zlib.</div><div class='del'>-</div><div class='del'>-Copyright (C) 2004 Simon-Pierre Cadieux.</div><div class='del'>-Copyright (C) 2004 Cosmin Truta.</div><div class='del'>-</div><div class='del'>-This code is released under the libpng license.</div><div class='del'>-For conditions of distribution and use, see copyright notice in zlib.h.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-To use:</div><div class='del'>-</div><div class='del'>-1) On the main menu, select "File | Open Solution".</div><div class='del'>-   Open "zlib.sln".</div><div class='del'>-</div><div class='del'>-2) Display the Solution Explorer view (Ctrl+Alt+L)</div><div class='del'>-</div><div class='del'>-3) Set one of the project as the StartUp project. If you just want to build the</div><div class='del'>-   binaries set "zlib" as the startup project (Select "zlib" tree view item +</div><div class='del'>-   Project | Set as StartUp project). If you want to build and test the</div><div class='del'>-   binaries set it to "example" (Select "example" tree view item + Project |</div><div class='del'>-   Set as StartUp project), If you want to build the minigzip utility set it to</div><div class='del'>-   "minigzip" (Select "minigzip" tree view item + Project | Set as StartUp</div><div class='del'>-   project</div><div class='del'>-</div><div class='del'>-4) Select "Build | Configuration Manager...".</div><div class='del'>-   Choose the configuration you wish to build.</div><div class='del'>-</div><div class='del'>-5) Select "Build | Clean Solution".</div><div class='del'>-</div><div class='del'>-6) Select "Build | Build Solution (Ctrl-Shift-B)"</div><div class='del'>-</div><div class='del'>-This project builds the zlib binaries as follows:</div><div class='del'>-</div><div class='del'>-* Win32_DLL_Release\zlib1.dll       DLL build</div><div class='del'>-* Win32_DLL_Debug\zlib1d.dll        DLL build (debug version)</div><div class='del'>-* Win32_LIB_Release\zlib.lib        static build</div><div class='del'>-* Win32_LIB_Debug\zlibd.lib         static build (debug version)</div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/xcode/Info.plist b/src/3rdparty/libpng/projects/xcode/Info.plist<br/>deleted file mode 100644<br/>index 0b525df..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/xcode/Info.plist?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/xcode/Info.plist</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="UTF-8"?&gt;</div><div class='del'>-&lt;!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"&gt;</div><div class='del'>-&lt;plist version="1.0"&gt;</div><div class='del'>-&lt;dict&gt;</div><div class='del'>-	&lt;key&gt;CFBundleDevelopmentRegion&lt;/key&gt;</div><div class='del'>-	&lt;string&gt;English&lt;/string&gt;</div><div class='del'>-	&lt;key&gt;CFBundleExecutable&lt;/key&gt;</div><div class='del'>-	&lt;string&gt;libpng&lt;/string&gt;</div><div class='del'>-	&lt;key&gt;CFBundleIconFile&lt;/key&gt;</div><div class='del'>-	&lt;string&gt;&lt;/string&gt;</div><div class='del'>-	&lt;key&gt;CFBundleIdentifier&lt;/key&gt;</div><div class='del'>-	&lt;string&gt;com.apple.carbonframeworktemplate&lt;/string&gt;</div><div class='del'>-	&lt;key&gt;CFBundleInfoDictionaryVersion&lt;/key&gt;</div><div class='del'>-	&lt;string&gt;6.0&lt;/string&gt;</div><div class='del'>-	&lt;key&gt;CFBundlePackageType&lt;/key&gt;</div><div class='del'>-	&lt;string&gt;FMWK&lt;/string&gt;</div><div class='del'>-	&lt;key&gt;CFBundleSignature&lt;/key&gt;</div><div class='del'>-	&lt;string&gt;????&lt;/string&gt;</div><div class='del'>-	&lt;key&gt;CFBundleVersion&lt;/key&gt;</div><div class='del'>-	&lt;string&gt;1.0&lt;/string&gt;</div><div class='del'>-        &lt;key&gt;CFBundleShortVersionString&lt;/key&gt;</div><div class='del'>-        &lt;string&gt;1.0&lt;/string&gt;</div><div class='del'>-	&lt;key&gt;CSResourcesFileMapped&lt;/key&gt;</div><div class='del'>-	&lt;true/&gt;</div><div class='del'>-&lt;/dict&gt;</div><div class='del'>-&lt;/plist&gt;</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/xcode/README.txt b/src/3rdparty/libpng/projects/xcode/README.txt<br/>deleted file mode 100644<br/>index 440149d..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/xcode/README.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/xcode/README.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-The xcode project has not been entirely updated to libpng-1.4.0.</div><div class='del'>-</div><div class='del'>-It needs to *not* depend on pnggccrd.c or pngvcrd.c</div><div class='del'>-</div><div class='del'>-It needs to PNG_NO_PEDANTIC_WARNINGS in the CFLAGS while building</div><div class='del'>-the library, but not while building an application.</div><div class='del'>-</div><div class='del'>-If an updated version is not received, this project will</div><div class='del'>-be removed when libpng-1.4.0 is released.</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/xcode/libpng.xcodeproj/.gitignore b/src/3rdparty/libpng/projects/xcode/libpng.xcodeproj/.gitignore<br/>deleted file mode 100644<br/>index 0a2b14b..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/xcode/libpng.xcodeproj/.gitignore?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/xcode/libpng.xcodeproj/.gitignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-*.mode1*</div><div class='del'>-*.pbxuser</div><div class='head'>diff --git a/src/3rdparty/libpng/projects/xcode/libpng.xcodeproj/project.pbxproj b/src/3rdparty/libpng/projects/xcode/libpng.xcodeproj/project.pbxproj<br/>deleted file mode 100644<br/>index 1171a39..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/projects/xcode/libpng.xcodeproj/project.pbxproj?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/projects/xcode/libpng.xcodeproj/project.pbxproj</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,353 +0,0 @@</div><div class='del'>-// !$*UTF8*$!</div><div class='del'>-{</div><div class='del'>-	archiveVersion = 1;</div><div class='del'>-	classes = {</div><div class='del'>-	};</div><div class='del'>-	objectVersion = 44;</div><div class='del'>-	objects = {</div><div class='del'>-</div><div class='del'>-/* Begin PBXBuildFile section */</div><div class='del'>-		14461C7109C3C37F005840C0 /* png.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C5D09C3C37F005840C0 /* png.c */; };</div><div class='del'>-		14461C7209C3C37F005840C0 /* png.h in Headers */ = {isa = PBXBuildFile; fileRef = 14461C5E09C3C37F005840C0 /* png.h */; settings = {ATTRIBUTES = (Public, ); }; };</div><div class='del'>-		14461C7309C3C37F005840C0 /* pngconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 14461C5F09C3C37F005840C0 /* pngconf.h */; settings = {ATTRIBUTES = (Public, ); }; };</div><div class='del'>-		14461C7409C3C37F005840C0 /* pngerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6009C3C37F005840C0 /* pngerror.c */; };</div><div class='del'>-		14461C7509C3C37F005840C0 /* pnggccrd.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6109C3C37F005840C0 /* pnggccrd.c */; };</div><div class='del'>-		14461C7609C3C37F005840C0 /* pngget.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6209C3C37F005840C0 /* pngget.c */; };</div><div class='del'>-		14461C7709C3C37F005840C0 /* pngmem.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6309C3C37F005840C0 /* pngmem.c */; };</div><div class='del'>-		14461C7809C3C37F005840C0 /* pngpread.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6409C3C37F005840C0 /* pngpread.c */; };</div><div class='del'>-		14461C7909C3C37F005840C0 /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6509C3C37F005840C0 /* pngread.c */; };</div><div class='del'>-		14461C7A09C3C37F005840C0 /* pngrio.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6609C3C37F005840C0 /* pngrio.c */; };</div><div class='del'>-		14461C7B09C3C37F005840C0 /* pngrtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6709C3C37F005840C0 /* pngrtran.c */; };</div><div class='del'>-		14461C7C09C3C37F005840C0 /* pngrutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6809C3C37F005840C0 /* pngrutil.c */; };</div><div class='del'>-		14461C7D09C3C37F005840C0 /* pngset.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6909C3C37F005840C0 /* pngset.c */; };</div><div class='del'>-		14461C7F09C3C37F005840C0 /* pngtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6B09C3C37F005840C0 /* pngtrans.c */; };</div><div class='del'>-		14461C8009C3C37F005840C0 /* pngvcrd.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6C09C3C37F005840C0 /* pngvcrd.c */; };</div><div class='del'>-		14461C8109C3C37F005840C0 /* pngwio.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6D09C3C37F005840C0 /* pngwio.c */; };</div><div class='del'>-		14461C8209C3C37F005840C0 /* pngwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6E09C3C37F005840C0 /* pngwrite.c */; };</div><div class='del'>-		14461C8309C3C37F005840C0 /* pngwtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C6F09C3C37F005840C0 /* pngwtran.c */; };</div><div class='del'>-		14461C8409C3C37F005840C0 /* pngwutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 14461C7009C3C37F005840C0 /* pngwutil.c */; };</div><div class='del'>-		67FA470510693F6B0078FB9E /* pngpriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 67FA470410693F6B0078FB9E /* pngpriv.h */; };</div><div class='del'>-/* End PBXBuildFile section */</div><div class='del'>-</div><div class='del'>-/* Begin PBXFileReference section */</div><div class='del'>-		14461C5D09C3C37F005840C0 /* png.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = png.c; path = ../../png.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C5E09C3C37F005840C0 /* png.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = png.h; path = ../../png.h; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C5F09C3C37F005840C0 /* pngconf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pngconf.h; path = ../../pngconf.h; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C6009C3C37F005840C0 /* pngerror.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngerror.c; path = ../../pngerror.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C6109C3C37F005840C0 /* pnggccrd.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pnggccrd.c; path = ../../pnggccrd.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C6209C3C37F005840C0 /* pngget.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngget.c; path = ../../pngget.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C6309C3C37F005840C0 /* pngmem.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngmem.c; path = ../../pngmem.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C6409C3C37F005840C0 /* pngpread.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngpread.c; path = ../../pngpread.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C6509C3C37F005840C0 /* pngread.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngread.c; path = ../../pngread.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C6609C3C37F005840C0 /* pngrio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngrio.c; path = ../../pngrio.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C6709C3C37F005840C0 /* pngrtran.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngrtran.c; path = ../../pngrtran.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C6809C3C37F005840C0 /* pngrutil.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngrutil.c; path = ../../pngrutil.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C6909C3C37F005840C0 /* pngset.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngset.c; path = ../../pngset.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C6B09C3C37F005840C0 /* pngtrans.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngtrans.c; path = ../../pngtrans.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C6C09C3C37F005840C0 /* pngvcrd.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngvcrd.c; path = ../../pngvcrd.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C6D09C3C37F005840C0 /* pngwio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngwio.c; path = ../../pngwio.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C6E09C3C37F005840C0 /* pngwrite.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngwrite.c; path = ../../pngwrite.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C6F09C3C37F005840C0 /* pngwtran.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngwtran.c; path = ../../pngwtran.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		14461C7009C3C37F005840C0 /* pngwutil.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngwutil.c; path = ../../pngwutil.c; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		67FA470410693F6B0078FB9E /* pngpriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pngpriv.h; path = ../../pngpriv.h; sourceTree = SOURCE_ROOT; };</div><div class='del'>-		8D07F2C70486CC7A007CD1D0 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "&lt;group&gt;"; };</div><div class='del'>-		8D07F2C80486CC7A007CD1D0 /* libpng.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libpng.framework; sourceTree = BUILT_PRODUCTS_DIR; };</div><div class='del'>-/* End PBXFileReference section */</div><div class='del'>-</div><div class='del'>-/* Begin PBXFrameworksBuildPhase section */</div><div class='del'>-		8D07F2C30486CC7A007CD1D0 /* Frameworks */ = {</div><div class='del'>-			isa = PBXFrameworksBuildPhase;</div><div class='del'>-			buildActionMask = 2147483647;</div><div class='del'>-			files = (</div><div class='del'>-			);</div><div class='del'>-			runOnlyForDeploymentPostprocessing = 0;</div><div class='del'>-		};</div><div class='del'>-/* End PBXFrameworksBuildPhase section */</div><div class='del'>-</div><div class='del'>-/* Begin PBXGroup section */</div><div class='del'>-		034768DDFF38A45A11DB9C8B /* Products */ = {</div><div class='del'>-			isa = PBXGroup;</div><div class='del'>-			children = (</div><div class='del'>-				8D07F2C80486CC7A007CD1D0 /* libpng.framework */,</div><div class='del'>-			);</div><div class='del'>-			name = Products;</div><div class='del'>-			sourceTree = "&lt;group&gt;";</div><div class='del'>-		};</div><div class='del'>-		0867D691FE84028FC02AAC07 /* libpng */ = {</div><div class='del'>-			isa = PBXGroup;</div><div class='del'>-			children = (</div><div class='del'>-				08FB77ACFE841707C02AAC07 /* Source */,</div><div class='del'>-				089C1665FE841158C02AAC07 /* Resources */,</div><div class='del'>-				034768DDFF38A45A11DB9C8B /* Products */,</div><div class='del'>-			);</div><div class='del'>-			name = libpng;</div><div class='del'>-			sourceTree = "&lt;group&gt;";</div><div class='del'>-		};</div><div class='del'>-		089C1665FE841158C02AAC07 /* Resources */ = {</div><div class='del'>-			isa = PBXGroup;</div><div class='del'>-			children = (</div><div class='del'>-				8D07F2C70486CC7A007CD1D0 /* Info.plist */,</div><div class='del'>-			);</div><div class='del'>-			name = Resources;</div><div class='del'>-			sourceTree = "&lt;group&gt;";</div><div class='del'>-		};</div><div class='del'>-		08FB77ACFE841707C02AAC07 /* Source */ = {</div><div class='del'>-			isa = PBXGroup;</div><div class='del'>-			children = (</div><div class='del'>-				67FA470410693F6B0078FB9E /* pngpriv.h */,</div><div class='del'>-				14461C5D09C3C37F005840C0 /* png.c */,</div><div class='del'>-				14461C5E09C3C37F005840C0 /* png.h */,</div><div class='del'>-				14461C5F09C3C37F005840C0 /* pngconf.h */,</div><div class='del'>-				14461C6009C3C37F005840C0 /* pngerror.c */,</div><div class='del'>-				14461C6109C3C37F005840C0 /* pnggccrd.c */,</div><div class='del'>-				14461C6209C3C37F005840C0 /* pngget.c */,</div><div class='del'>-				14461C6309C3C37F005840C0 /* pngmem.c */,</div><div class='del'>-				14461C6409C3C37F005840C0 /* pngpread.c */,</div><div class='del'>-				14461C6509C3C37F005840C0 /* pngread.c */,</div><div class='del'>-				14461C6609C3C37F005840C0 /* pngrio.c */,</div><div class='del'>-				14461C6709C3C37F005840C0 /* pngrtran.c */,</div><div class='del'>-				14461C6809C3C37F005840C0 /* pngrutil.c */,</div><div class='del'>-				14461C6909C3C37F005840C0 /* pngset.c */,</div><div class='del'>-				14461C6B09C3C37F005840C0 /* pngtrans.c */,</div><div class='del'>-				14461C6C09C3C37F005840C0 /* pngvcrd.c */,</div><div class='del'>-				14461C6D09C3C37F005840C0 /* pngwio.c */,</div><div class='del'>-				14461C6E09C3C37F005840C0 /* pngwrite.c */,</div><div class='del'>-				14461C6F09C3C37F005840C0 /* pngwtran.c */,</div><div class='del'>-				14461C7009C3C37F005840C0 /* pngwutil.c */,</div><div class='del'>-			);</div><div class='del'>-			name = Source;</div><div class='del'>-			sourceTree = "&lt;group&gt;";</div><div class='del'>-		};</div><div class='del'>-/* End PBXGroup section */</div><div class='del'>-</div><div class='del'>-/* Begin PBXHeadersBuildPhase section */</div><div class='del'>-		8D07F2BD0486CC7A007CD1D0 /* Headers */ = {</div><div class='del'>-			isa = PBXHeadersBuildPhase;</div><div class='del'>-			buildActionMask = 2147483647;</div><div class='del'>-			files = (</div><div class='del'>-				14461C7209C3C37F005840C0 /* png.h in Headers */,</div><div class='del'>-				14461C7309C3C37F005840C0 /* pngconf.h in Headers */,</div><div class='del'>-				67FA470510693F6B0078FB9E /* pngpriv.h in Headers */,</div><div class='del'>-			);</div><div class='del'>-			runOnlyForDeploymentPostprocessing = 0;</div><div class='del'>-		};</div><div class='del'>-/* End PBXHeadersBuildPhase section */</div><div class='del'>-</div><div class='del'>-/* Begin PBXNativeTarget section */</div><div class='del'>-		8D07F2BC0486CC7A007CD1D0 /* libpng */ = {</div><div class='del'>-			isa = PBXNativeTarget;</div><div class='del'>-			buildConfigurationList = 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "libpng" */;</div><div class='del'>-			buildPhases = (</div><div class='del'>-				8D07F2BD0486CC7A007CD1D0 /* Headers */,</div><div class='del'>-				8D07F2BF0486CC7A007CD1D0 /* Resources */,</div><div class='del'>-				8D07F2C10486CC7A007CD1D0 /* Sources */,</div><div class='del'>-				8D07F2C30486CC7A007CD1D0 /* Frameworks */,</div><div class='del'>-				8D07F2C50486CC7A007CD1D0 /* Rez */,</div><div class='del'>-			);</div><div class='del'>-			buildRules = (</div><div class='del'>-			);</div><div class='del'>-			dependencies = (</div><div class='del'>-			);</div><div class='del'>-			name = libpng;</div><div class='del'>-			productInstallPath = "$(HOME)/Library/Frameworks";</div><div class='del'>-			productName = libpng;</div><div class='del'>-			productReference = 8D07F2C80486CC7A007CD1D0 /* libpng.framework */;</div><div class='del'>-			productType = "com.apple.product-type.framework";</div><div class='del'>-		};</div><div class='del'>-/* End PBXNativeTarget section */</div><div class='del'>-</div><div class='del'>-/* Begin PBXProject section */</div><div class='del'>-		0867D690FE84028FC02AAC07 /* Project object */ = {</div><div class='del'>-			isa = PBXProject;</div><div class='del'>-			buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "libpng" */;</div><div class='del'>-			compatibilityVersion = "Xcode 2.4";</div><div class='del'>-			hasScannedForEncodings = 1;</div><div class='del'>-			mainGroup = 0867D691FE84028FC02AAC07 /* libpng */;</div><div class='del'>-			productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */;</div><div class='del'>-			projectDirPath = "";</div><div class='del'>-			projectRoot = ../..;</div><div class='del'>-			targets = (</div><div class='del'>-				8D07F2BC0486CC7A007CD1D0 /* libpng */,</div><div class='del'>-			);</div><div class='del'>-		};</div><div class='del'>-/* End PBXProject section */</div><div class='del'>-</div><div class='del'>-/* Begin PBXResourcesBuildPhase section */</div><div class='del'>-		8D07F2BF0486CC7A007CD1D0 /* Resources */ = {</div><div class='del'>-			isa = PBXResourcesBuildPhase;</div><div class='del'>-			buildActionMask = 2147483647;</div><div class='del'>-			files = (</div><div class='del'>-			);</div><div class='del'>-			runOnlyForDeploymentPostprocessing = 0;</div><div class='del'>-		};</div><div class='del'>-/* End PBXResourcesBuildPhase section */</div><div class='del'>-</div><div class='del'>-/* Begin PBXRezBuildPhase section */</div><div class='del'>-		8D07F2C50486CC7A007CD1D0 /* Rez */ = {</div><div class='del'>-			isa = PBXRezBuildPhase;</div><div class='del'>-			buildActionMask = 2147483647;</div><div class='del'>-			files = (</div><div class='del'>-			);</div><div class='del'>-			runOnlyForDeploymentPostprocessing = 0;</div><div class='del'>-		};</div><div class='del'>-/* End PBXRezBuildPhase section */</div><div class='del'>-</div><div class='del'>-/* Begin PBXSourcesBuildPhase section */</div><div class='del'>-		8D07F2C10486CC7A007CD1D0 /* Sources */ = {</div><div class='del'>-			isa = PBXSourcesBuildPhase;</div><div class='del'>-			buildActionMask = 2147483647;</div><div class='del'>-			files = (</div><div class='del'>-				14461C7109C3C37F005840C0 /* png.c in Sources */,</div><div class='del'>-				14461C7409C3C37F005840C0 /* pngerror.c in Sources */,</div><div class='del'>-				14461C7509C3C37F005840C0 /* pnggccrd.c in Sources */,</div><div class='del'>-				14461C7609C3C37F005840C0 /* pngget.c in Sources */,</div><div class='del'>-				14461C7709C3C37F005840C0 /* pngmem.c in Sources */,</div><div class='del'>-				14461C7809C3C37F005840C0 /* pngpread.c in Sources */,</div><div class='del'>-				14461C7909C3C37F005840C0 /* pngread.c in Sources */,</div><div class='del'>-				14461C7A09C3C37F005840C0 /* pngrio.c in Sources */,</div><div class='del'>-				14461C7B09C3C37F005840C0 /* pngrtran.c in Sources */,</div><div class='del'>-				14461C7C09C3C37F005840C0 /* pngrutil.c in Sources */,</div><div class='del'>-				14461C7D09C3C37F005840C0 /* pngset.c in Sources */,</div><div class='del'>-				14461C7F09C3C37F005840C0 /* pngtrans.c in Sources */,</div><div class='del'>-				14461C8009C3C37F005840C0 /* pngvcrd.c in Sources */,</div><div class='del'>-				14461C8109C3C37F005840C0 /* pngwio.c in Sources */,</div><div class='del'>-				14461C8209C3C37F005840C0 /* pngwrite.c in Sources */,</div><div class='del'>-				14461C8309C3C37F005840C0 /* pngwtran.c in Sources */,</div><div class='del'>-				14461C8409C3C37F005840C0 /* pngwutil.c in Sources */,</div><div class='del'>-			);</div><div class='del'>-			runOnlyForDeploymentPostprocessing = 0;</div><div class='del'>-		};</div><div class='del'>-/* End PBXSourcesBuildPhase section */</div><div class='del'>-</div><div class='del'>-/* Begin XCBuildConfiguration section */</div><div class='del'>-		4FADC24308B4156D00ABE55E /* Debug */ = {</div><div class='del'>-			isa = XCBuildConfiguration;</div><div class='del'>-			buildSettings = {</div><div class='del'>-				COPY_PHASE_STRIP = NO;</div><div class='del'>-				DYLIB_COMPATIBILITY_VERSION = 14;</div><div class='del'>-				DYLIB_CURRENT_VERSION = 14;</div><div class='del'>-				FRAMEWORK_VERSION = 1.4.0;</div><div class='del'>-				GCC_PRECOMPILE_PREFIX_HEADER = NO;</div><div class='del'>-				GCC_PREFIX_HEADER = "";</div><div class='del'>-				INFOPLIST_FILE = Info.plist;</div><div class='del'>-				INSTALL_PATH = "@executable_path/../Frameworks";</div><div class='del'>-				LIBRARY_STYLE = DYNAMIC;</div><div class='del'>-				MACH_O_TYPE = mh_dylib;</div><div class='del'>-				OTHER_LDFLAGS = "-lz";</div><div class='del'>-				PRODUCT_NAME = libpng;</div><div class='del'>-				WRAPPER_EXTENSION = framework;</div><div class='del'>-			};</div><div class='del'>-			name = Debug;</div><div class='del'>-		};</div><div class='del'>-		4FADC24408B4156D00ABE55E /* Release */ = {</div><div class='del'>-			isa = XCBuildConfiguration;</div><div class='del'>-			buildSettings = {</div><div class='del'>-				DYLIB_COMPATIBILITY_VERSION = 14;</div><div class='del'>-				DYLIB_CURRENT_VERSION = 14;</div><div class='del'>-				FRAMEWORK_VERSION = 1.4.0;</div><div class='del'>-				GCC_PRECOMPILE_PREFIX_HEADER = NO;</div><div class='del'>-				GCC_PREFIX_HEADER = "";</div><div class='del'>-				INFOPLIST_FILE = Info.plist;</div><div class='del'>-				INSTALL_PATH = "@executable_path/../Frameworks";</div><div class='del'>-				LIBRARY_STYLE = DYNAMIC;</div><div class='del'>-				MACH_O_TYPE = mh_dylib;</div><div class='del'>-				OTHER_LDFLAGS = "-lz";</div><div class='del'>-				PRODUCT_NAME = libpng;</div><div class='del'>-				WRAPPER_EXTENSION = framework;</div><div class='del'>-			};</div><div class='del'>-			name = Release;</div><div class='del'>-		};</div><div class='del'>-		4FADC24708B4156D00ABE55E /* Debug */ = {</div><div class='del'>-			isa = XCBuildConfiguration;</div><div class='del'>-			buildSettings = {</div><div class='del'>-				ARCHS = (</div><div class='del'>-					i386,</div><div class='del'>-					ppc,</div><div class='del'>-					ppc64,</div><div class='del'>-					x86_64,</div><div class='del'>-				);</div><div class='del'>-				DEPLOYMENT_POSTPROCESSING = YES;</div><div class='del'>-				GCC_ENABLE_CPP_EXCEPTIONS = NO;</div><div class='del'>-				GCC_ENABLE_CPP_RTTI = NO;</div><div class='del'>-				GCC_ENABLE_FIX_AND_CONTINUE = YES;</div><div class='del'>-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;</div><div class='del'>-				GCC_OPTIMIZATION_LEVEL = 0;</div><div class='del'>-				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;</div><div class='del'>-				GCC_VERSION_i386 = 4.0;</div><div class='del'>-				GCC_VERSION_ppc = 3.3;</div><div class='del'>-				GCC_WARN_ABOUT_RETURN_TYPE = YES;</div><div class='del'>-				GCC_WARN_UNUSED_VARIABLE = YES;</div><div class='del'>-				MACOSX_DEPLOYMENT_TARGET = 10.5;</div><div class='del'>-				"MACOSX_DEPLOYMENT_TARGET[arch=i386]" = 10.4;</div><div class='del'>-				"MACOSX_DEPLOYMENT_TARGET[arch=ppc]" = 10.2;</div><div class='del'>-				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;</div><div class='del'>-				MACOSX_DEPLOYMENT_TARGET_ppc = 10.2;</div><div class='del'>-				PREBINDING = NO;</div><div class='del'>-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";</div><div class='del'>-				"SDKROOT[arch=i386]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";</div><div class='del'>-				"SDKROOT[arch=ppc]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.3.9.sdk";</div><div class='del'>-				SDKROOT_i386 = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";</div><div class='del'>-				SDKROOT_ppc = "$(DEVELOPER_SDK_DIR)/MacOSX10.3.9.sdk";</div><div class='del'>-				ZERO_LINK = NO;</div><div class='del'>-			};</div><div class='del'>-			name = Debug;</div><div class='del'>-		};</div><div class='del'>-		4FADC24808B4156D00ABE55E /* Release */ = {</div><div class='del'>-			isa = XCBuildConfiguration;</div><div class='del'>-			buildSettings = {</div><div class='del'>-				ARCHS = (</div><div class='del'>-					i386,</div><div class='del'>-					ppc,</div><div class='del'>-					ppc64,</div><div class='del'>-					x86_64,</div><div class='del'>-				);</div><div class='del'>-				GCC_ENABLE_CPP_EXCEPTIONS = NO;</div><div class='del'>-				GCC_ENABLE_CPP_RTTI = NO;</div><div class='del'>-				GCC_ENABLE_FIX_AND_CONTINUE = NO;</div><div class='del'>-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;</div><div class='del'>-				GCC_OPTIMIZATION_LEVEL = 2;</div><div class='del'>-				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;</div><div class='del'>-				GCC_VERSION_i386 = 4.0;</div><div class='del'>-				GCC_VERSION_ppc = 3.3;</div><div class='del'>-				GCC_WARN_ABOUT_RETURN_TYPE = YES;</div><div class='del'>-				GCC_WARN_UNUSED_VARIABLE = YES;</div><div class='del'>-				MACOSX_DEPLOYMENT_TARGET = 10.5;</div><div class='del'>-				"MACOSX_DEPLOYMENT_TARGET[arch=i386]" = 10.4;</div><div class='del'>-				"MACOSX_DEPLOYMENT_TARGET[arch=ppc]" = 10.2;</div><div class='del'>-				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;</div><div class='del'>-				MACOSX_DEPLOYMENT_TARGET_ppc = 10.2;</div><div class='del'>-				PREBINDING = NO;</div><div class='del'>-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";</div><div class='del'>-				"SDKROOT[arch=i386]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";</div><div class='del'>-				"SDKROOT[arch=ppc]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.3.9.sdk";</div><div class='del'>-				SDKROOT_i386 = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk";</div><div class='del'>-				SDKROOT_ppc = "$(DEVELOPER_SDK_DIR)/MacOSX10.3.9.sdk";</div><div class='del'>-				ZERO_LINK = NO;</div><div class='del'>-			};</div><div class='del'>-			name = Release;</div><div class='del'>-		};</div><div class='del'>-/* End XCBuildConfiguration section */</div><div class='del'>-</div><div class='del'>-/* Begin XCConfigurationList section */</div><div class='del'>-		4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "libpng" */ = {</div><div class='del'>-			isa = XCConfigurationList;</div><div class='del'>-			buildConfigurations = (</div><div class='del'>-				4FADC24308B4156D00ABE55E /* Debug */,</div><div class='del'>-				4FADC24408B4156D00ABE55E /* Release */,</div><div class='del'>-			);</div><div class='del'>-			defaultConfigurationIsVisible = 0;</div><div class='del'>-			defaultConfigurationName = Release;</div><div class='del'>-		};</div><div class='del'>-		4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "libpng" */ = {</div><div class='del'>-			isa = XCConfigurationList;</div><div class='del'>-			buildConfigurations = (</div><div class='del'>-				4FADC24708B4156D00ABE55E /* Debug */,</div><div class='del'>-				4FADC24808B4156D00ABE55E /* Release */,</div><div class='del'>-			);</div><div class='del'>-			defaultConfigurationIsVisible = 0;</div><div class='del'>-			defaultConfigurationName = Release;</div><div class='del'>-		};</div><div class='del'>-/* End XCConfigurationList section */</div><div class='del'>-	};</div><div class='del'>-	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;</div><div class='del'>-}</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/README.txt b/src/3rdparty/libpng/scripts/README.txt<br/>deleted file mode 100644<br/>index fa7ffed..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/README.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/README.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +0,0 @@</div><div class='del'>-</div><div class='del'>-Makefiles for  libpng version 1.4.0 - January 3, 2010</div><div class='del'>-</div><div class='del'>- makefile.linux    =&gt;  Linux/ELF makefile</div><div class='del'>-                       (gcc, creates libpng14.so.14.1.4.0)</div><div class='del'>- makefile.gcc      =&gt;  Generic makefile (gcc, creates static libpng.a)</div><div class='del'>- makefile.knr      =&gt;  Archaic UNIX Makefile that converts files with</div><div class='del'>-                       ansi2knr (Requires ansi2knr.c from</div><div class='del'>-                       ftp://ftp.cs.wisc.edu/ghost)</div><div class='del'>- makefile.acorn    =&gt;  Acorn makefile</div><div class='del'>- makefile.aix      =&gt;  AIX/gcc makefile</div><div class='del'>- makefile.amiga    =&gt;  Amiga makefile</div><div class='del'>- makefile.atari    =&gt;  Atari makefile</div><div class='del'>- makefile.bc32     =&gt;  32-bit Borland C++ (all modules compiled in C mode)</div><div class='del'>- makefile.beos     =&gt;  beos makefile</div><div class='del'>- makefile.bor      =&gt;  Borland makefile (uses bcc)</div><div class='del'>- makefile.cegcc    =&gt;  minge32ce for Windows CE makefile</div><div class='del'>- makefile.cygwin   =&gt;  Cygwin/gcc makefile</div><div class='del'>- makefile.darwin   =&gt;  Darwin makefile, can use on MacosX</div><div class='del'>- makefile.dec      =&gt;  DEC Alpha UNIX makefile</div><div class='del'>- makefile.dj2      =&gt;  DJGPP 2 makefile</div><div class='del'>- makefile.elf      =&gt;  Linux/ELF makefile symbol versioning,</div><div class='del'>-                       gcc, creates libpng14.so.14.1.4.0)</div><div class='del'>- makefile.freebsd  =&gt;  FreeBSD makefile</div><div class='del'>- makefile.gcc      =&gt;  Generic gcc makefile</div><div class='del'>- makefile.hpgcc    =&gt;  HPUX makefile using gcc</div><div class='del'>- makefile.hpux     =&gt;  HPUX (10.20 and 11.00) makefile</div><div class='del'>- makefile.hp64     =&gt;  HPUX (10.20 and 11.00) makefile, 64-bit</div><div class='del'>- makefile.ibmc     =&gt;  IBM C/C++ version 3.x for Win32 and OS/2 (static)</div><div class='del'>- makefile.intel    =&gt;  Intel C/C++ version 4.0 and later</div><div class='del'>- makefile.mingw    =&gt;  Mingw makefile</div><div class='del'>- makefile.mips     =&gt;  MIPS makefile</div><div class='del'>- makefile.msc      =&gt;  Microsoft C makefile</div><div class='del'>- makefile.netbsd   =&gt;  NetBSD/cc makefile, makes libpng.so.</div><div class='del'>- makefile.openbsd  =&gt;  OpenBSD makefile</div><div class='del'>- makefile.os2      =&gt;  OS/2 Makefile (gcc and emx, requires pngos2.def)</div><div class='del'>- makefile.sco      =&gt;  For SCO OSr5  ELF and Unixware 7 with Native cc</div><div class='del'>- makefile.sggcc    =&gt;  Silicon Graphics (gcc,</div><div class='del'>-                       creates libpng14.so.14.1.4.0)</div><div class='del'>- makefile.sgi      =&gt;  Silicon Graphics IRIX makefile (cc, creates static lib)</div><div class='del'>- makefile.solaris  =&gt;  Solaris 2.X makefile (gcc,</div><div class='del'>-                       creates libpng14.so.14.1.4.0)</div><div class='del'>- makefile.so9      =&gt;  Solaris 9 makefile (gcc,</div><div class='del'>-                       creates libpng14.so.14.1.4.0)</div><div class='del'>- makefile.std      =&gt;  Generic UNIX makefile (cc, creates static libpng.a)</div><div class='del'>- makefile.sunos    =&gt;  Sun makefile</div><div class='del'>- makefile.32sunu   =&gt;  Sun Ultra 32-bit makefile</div><div class='del'>- makefile.64sunu   =&gt;  Sun Ultra 64-bit makefile</div><div class='del'>- makefile.tc3      =&gt;  Turbo C 3.0 makefile</div><div class='del'>- makefile.vcwin32  =&gt;  makefile for Microsoft Visual C++ 4.0 and later</div><div class='del'>- makefile.watcom   =&gt;  Watcom 10a+ Makefile, 32-bit flat memory model</div><div class='del'>- makevms.com       =&gt;  VMS build script</div><div class='del'>- smakefile.ppc     =&gt;  AMIGA smakefile for SAS C V6.58/7.00 PPC compiler</div><div class='del'>-                       (Requires SCOPTIONS, copied from scripts/SCOPTIONS.ppc)</div><div class='del'>-</div><div class='del'>-Other supporting scripts:</div><div class='del'>- descrip.mms       =&gt;  VMS makefile for MMS or MMK</div><div class='del'>- libpng-config-body.in =&gt; used by several makefiles to create libpng-config</div><div class='del'>- libpng-config-head.in =&gt; used by several makefiles to create libpng-config</div><div class='del'>- libpng.pc.in      =&gt;  Used by several makefiles to create libpng.pc</div><div class='del'>- pngos2.def        =&gt;  OS/2 module definition file used by makefile.os2</div><div class='del'>- pngwin.def        =&gt;  Module definitions for makefile.cygwin and mingw</div><div class='del'>- png32ce.def       =&gt;  Module definition file used by makefile.cegcc</div><div class='del'>- pngwin.rc         =&gt;  Used by the visualc6 and visualc71 projects.</div><div class='del'>- SCOPTIONS.ppc     =&gt;  Used with smakefile.ppc</div><div class='del'>-</div><div class='del'>-Further information can be found in comments in the individual makefiles.</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/SCOPTIONS.ppc b/src/3rdparty/libpng/scripts/SCOPTIONS.ppc<br/>deleted file mode 100644<br/>index 2c3503e..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/SCOPTIONS.ppc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/SCOPTIONS.ppc</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-OPTIMIZE</div><div class='del'>-OPTPEEP</div><div class='del'>-OPTTIME</div><div class='del'>-OPTSCHED</div><div class='del'>-AUTOREGISTER</div><div class='del'>-PARMS=REGISTERS</div><div class='del'>-INCLUDEDIR=hlp:ppc/include</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/descrip.mms b/src/3rdparty/libpng/scripts/descrip.mms<br/>deleted file mode 100644<br/>index d0642c0..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/descrip.mms?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/descrip.mms</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-</div><div class='del'>-cc_defs = /inc=$(ZLIBSRC)</div><div class='del'>-c_deb =</div><div class='del'>-</div><div class='del'>-.ifdef __DECC__</div><div class='del'>-pref = /prefix=all</div><div class='del'>-.endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-OBJS = png.obj, pngset.obj, pngget.obj, pngrutil.obj, pngtrans.obj,\</div><div class='del'>-	pngwutil.obj, pngread.obj, pngmem.obj, pngwrite.obj, pngrtran.obj,\</div><div class='del'>-	pngwtran.obj, pngrio.obj, pngwio.obj, pngerror.obj, pngpread.obj</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CFLAGS= $(C_DEB) $(CC_DEFS) $(PREF)</div><div class='del'>-</div><div class='del'>-all : pngtest.exe libpng.olb</div><div class='del'>-		@ write sys$output " pngtest available"</div><div class='del'>-</div><div class='del'>-libpng.olb : libpng.olb($(OBJS))</div><div class='del'>-	@ write sys$output " Libpng available"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-pngtest.exe : pngtest.obj libpng.olb</div><div class='del'>-              link pngtest,libpng.olb/lib,$(ZLIBSRC)libz.olb/lib</div><div class='del'>-</div><div class='del'>-test : pngtest.exe</div><div class='del'>-   run pngtest</div><div class='del'>-</div><div class='del'>-clean :</div><div class='del'>-	delete *.obj;*,*.exe;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Other dependencies.</div><div class='del'>-png.obj : png.h, pngconf.h, pngpriv.h</div><div class='del'>-pngpread.obj : png.h, pngconf.h, pngpriv.h</div><div class='del'>-pngset.obj : png.h, pngconf.h, pngpriv.h</div><div class='del'>-pngget.obj : png.h, pngconf.h, pngpriv.h</div><div class='del'>-pngread.obj : png.h, pngconf.h, pngpriv.h</div><div class='del'>-pngrtran.obj : png.h, pngconf.h, pngpriv.h</div><div class='del'>-pngrutil.obj : png.h, pngconf.h, pngpriv.h</div><div class='del'>-pngerror.obj : png.h, pngconf.h, pngpriv.h</div><div class='del'>-pngmem.obj : png.h, pngconf.h, pngpriv.h</div><div class='del'>-pngrio.obj : png.h, pngconf.h, pngpriv.h</div><div class='del'>-pngwio.obj : png.h, pngconf.h, pngpriv.h</div><div class='del'>-pngtrans.obj : png.h, pngconf.h, pngpriv.h</div><div class='del'>-pngwrite.obj : png.h, pngconf.h, pngpriv.h</div><div class='del'>-pngwtran.obj : png.h, pngconf.h, pngpriv.h</div><div class='del'>-pngwutil.obj : png.h, pngconf.h, pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.obj : png.h, pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/libpng-config-body.in b/src/3rdparty/libpng/scripts/libpng-config-body.in<br/>deleted file mode 100755<br/>index b466432..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/libpng-config-body.in?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/libpng-config-body.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,96 +0,0 @@</div><div class='del'>-</div><div class='del'>-usage()</div><div class='del'>-{</div><div class='del'>-    cat &lt;&lt;EOF</div><div class='del'>-Usage: libpng-config [OPTION] ...</div><div class='del'>-</div><div class='del'>-Known values for OPTION are:</div><div class='del'>-</div><div class='del'>-  --prefix        print libpng prefix</div><div class='del'>-  --libdir        print path to directory containing library</div><div class='del'>-  --libs          print library linking information</div><div class='del'>-  --ccopts        print compiler options</div><div class='del'>-  --cppflags      print pre-processor flags</div><div class='del'>-  --cflags        print preprocessor flags, I_opts, and compiler options</div><div class='del'>-  --I_opts        print "-I" include options</div><div class='del'>-  --L_opts        print linker "-L" flags for dynamic linking</div><div class='del'>-  --R_opts        print dynamic linker "-R" or "-rpath" flags</div><div class='del'>-  --ldopts        print linker options</div><div class='del'>-  --ldflags       print linker flags (ldopts, L_opts, R_opts, and libs)</div><div class='del'>-  --static        revise subsequent outputs for static linking</div><div class='del'>-  --help          print this help and exit</div><div class='del'>-  --version       print version information</div><div class='del'>-EOF</div><div class='del'>-</div><div class='del'>-    exit $1</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-if test $# -eq 0; then</div><div class='del'>-    usage 1</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-while test $# -gt 0; do</div><div class='del'>-    case "$1" in</div><div class='del'>-</div><div class='del'>-    --prefix)</div><div class='del'>-        echo ${prefix}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --version)</div><div class='del'>-        echo ${version}</div><div class='del'>-        exit 0</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --help)</div><div class='del'>-        usage 0</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --ccopts)</div><div class='del'>-        echo ${ccopts}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --cppflags)</div><div class='del'>-        echo ${cppflags}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --cflags)</div><div class='del'>-        echo ${I_opts} ${cppflags} ${ccopts}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --libdir)</div><div class='del'>-        echo ${libdir}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --libs)</div><div class='del'>-        echo ${libs}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --I_opts)</div><div class='del'>-        echo ${I_opts}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --L_opts)</div><div class='del'>-        echo ${L_opts}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --R_opts)</div><div class='del'>-        echo ${R_opts}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --ldflags)</div><div class='del'>-        echo ${ldflags} ${L_opts} ${R_opts} ${libs}</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    --static)</div><div class='del'>-        R_opts=""</div><div class='del'>-        ;;</div><div class='del'>-</div><div class='del'>-    *)</div><div class='del'>-        usage</div><div class='del'>-        exit 1</div><div class='del'>-        ;;</div><div class='del'>-    esac</div><div class='del'>-    shift</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-exit 0</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/libpng-config-head.in b/src/3rdparty/libpng/scripts/libpng-config-head.in<br/>deleted file mode 100755<br/>index 01e7254..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/libpng-config-head.in?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/libpng-config-head.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-#! /bin/sh</div><div class='del'>-</div><div class='del'>-# libpng-config</div><div class='del'>-# provides configuration info for libpng.</div><div class='del'>-</div><div class='del'>-# Copyright (C) 2002 Glenn Randers-Pehrson</div><div class='del'>-</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Modeled after libxml-config.</div><div class='del'>-</div><div class='del'>-version=1.4.0</div><div class='del'>-prefix=""</div><div class='del'>-libdir=""</div><div class='del'>-libs=""</div><div class='del'>-I_opts=""</div><div class='del'>-L_opts=""</div><div class='del'>-R_opts=""</div><div class='del'>-cppflags=""</div><div class='del'>-ccopts=""</div><div class='del'>-ldopts=""</div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/libpng.pc.in b/src/3rdparty/libpng/scripts/libpng.pc.in<br/>deleted file mode 100644<br/>index 573df5a..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/libpng.pc.in?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/libpng.pc.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-prefix=@prefix@</div><div class='del'>-exec_prefix=@exec_prefix@</div><div class='del'>-libdir=@libdir@</div><div class='del'>-includedir=@includedir@/libpng14</div><div class='del'>-</div><div class='del'>-Name: libpng</div><div class='del'>-Description: Loads and saves PNG files</div><div class='del'>-Version: 1.4.0</div><div class='del'>-Libs: -L${libdir} -lpng14</div><div class='del'>-Cflags: -I${includedir}</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.32sunu b/src/3rdparty/libpng/scripts/makefile.32sunu<br/>deleted file mode 100644<br/>index 3ae51f6..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.32sunu?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.32sunu</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,257 +0,0 @@</div><div class='del'>-# makefile for libpng on Solaris 2.x with cc</div><div class='del'>-# Contributed by William L. Sebok, based on makefile.linux</div><div class='del'>-# Copyright (C) 2002, 2006 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1998 Greg Roelofs</div><div class='del'>-# Copyright (C) 1996, 1997 Andreas Dilger</div><div class='del'>-</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Library name:</div><div class='del'>-LIBNAME=libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Shared library names:</div><div class='del'>-LIBSO=$(LIBNAME).so</div><div class='del'>-LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)</div><div class='del'>-LIBSOVER=$(LIBNAME).so.$(PNGVER)</div><div class='del'>-OLDSO=libpng.so</div><div class='del'>-OLDSOMAJ=libpng.so.14</div><div class='del'>-OLDSOVER=libpng.so.14.$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Utilities:</div><div class='del'>-CC=cc</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-MKDIR_P=mkdir -p</div><div class='del'>-LN_SF=ln -f -s</div><div class='del'>-RANLIB=echo</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-SUN_CC_FLAGS=-fast -xtarget=ultra</div><div class='del'>-SUN_LD_FLAGS=-fast -xtarget=ultra</div><div class='del'>-</div><div class='del'>-# where make install puts libpng.a, libpng14.so and libpng14/png.h</div><div class='del'>-prefix=/a</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-# Changing these to ../zlib poses a security risk.  If you want</div><div class='del'>-# to have zlib in an adjacent directory, specify the full path instead of "..".</div><div class='del'>-#ZLIBLIB=../zlib</div><div class='del'>-#ZLIBINC=../zlib</div><div class='del'>-</div><div class='del'>-ZLIBLIB=/usr/lib</div><div class='del'>-ZLIBINC=/usr/include</div><div class='del'>-</div><div class='del'>-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \</div><div class='del'>-	-Wmissing-declarations -Wtraditional -Wcast-align \</div><div class='del'>-	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion</div><div class='del'>-CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \</div><div class='del'>-	# $(WARNMORE) -g -DPNG_DEBUG=5</div><div class='del'>-LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm</div><div class='del'>-</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DB=$(DESTDIR)$(BINPATH)</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-DM=$(DESTDIR)$(MANPATH)</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-OBJSDLL = $(OBJS:.o=.pic.o)</div><div class='del'>-</div><div class='del'>-.SUFFIXES:      .c .o .pic.o</div><div class='del'>-</div><div class='del'>-.c.pic.o:</div><div class='del'>-	$(CC) -c $(CFLAGS) -KPIC -o $@ $*.c</div><div class='del'>-</div><div class='del'>-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-libpng.pc:</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz\ -lm! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config:</div><div class='del'>-	( cat scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo libdir=\"$(LIBPATH)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo L_opts=\"-L$(LIBPATH)\"; \</div><div class='del'>-	echo R_opts=\"-R$(LIBPATH)\"; \</div><div class='del'>-	echo ccopts=\"-xtarget=ultra\"; \</div><div class='del'>-	echo ldopts=\"-xtarget=ultra\"; \</div><div class='del'>-	echo libs=\"-lpng14 -lz -lm\"; \</div><div class='del'>-	cat scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-$(LIBSO): $(LIBSOMAJ)</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)</div><div class='del'>-</div><div class='del'>-$(LIBSOMAJ): $(LIBSOVER)</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(LIBSOVER): $(OBJSDLL)</div><div class='del'>-	@case "`type ld`" in *ucb*) \</div><div class='del'>-	echo; \</div><div class='del'>-	echo '## WARNING:'; \</div><div class='del'>-	echo '## The commands "CC" and "LD" must NOT refer to /usr/ucb/cc'; \</div><div class='del'>-	echo '## and /usr/ucb/ld.  If they do, you need to adjust your PATH'; \</div><div class='del'>-	echo '## environment variable to put /usr/ccs/bin ahead of /usr/ucb.'; \</div><div class='del'>-	echo '## The environment variable LD_LIBRARY_PATH should not be set'; \</div><div class='del'>-	echo '## at all.  If it is, things are likely to break because of'; \</div><div class='del'>-	echo '## the libucb dependency that is created.'; \</div><div class='del'>-	echo; \</div><div class='del'>-	;; \</div><div class='del'>-	esac</div><div class='del'>-	$(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBSOMAJ) \</div><div class='del'>-	 -o $(LIBSOVER) $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-$(OLDSOVER): $(OBJSDLL)</div><div class='del'>-	$(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(OLDSOMAJ) \</div><div class='del'>-	 -o $(OLDSOVER)  $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o $(LIBSO)</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install-headers: png.h pngconf.h</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-static: install-headers libpng.a</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	cp libpng.a $(DL)/$(LIBNAME).a</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME).a</div><div class='del'>-	-@$(RM_F) $(DL)/libpng.a</div><div class='del'>-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)</div><div class='del'>-</div><div class='del'>-install-shared: install-headers $(LIBSOVER) libpng.pc \</div><div class='del'>-	$(OLDSOVER)</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ).$(PNGVER)*</div><div class='del'>-	cp $(LIBSOVER) $(DL)</div><div class='del'>-	cp $(OLDSOVER) $(DL)</div><div class='del'>-	chmod 755 $(DL)/$(LIBSOVER)</div><div class='del'>-	chmod 755 $(DL)/$(OLDSOVER)</div><div class='del'>-	(cd $(DL); \</div><div class='del'>-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \</div><div class='del'>-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO))</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-man: libpng.3 libpngpf.3 png.5</div><div class='del'>-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi</div><div class='del'>-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpng.3</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpngpf.3</div><div class='del'>-	cp libpng.3 $(DM)/man3</div><div class='del'>-	cp libpngpf.3 $(DM)/man3</div><div class='del'>-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man5/png.5</div><div class='del'>-	cp png.5 $(DM)/man5</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@$(RM_F) $(DB)/libpng-config</div><div class='del'>-	-@$(RM_F) $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) $(SUN_CC_FLAGS) -I$(DI) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/$(LIBNAME)-config --ldflags` \</div><div class='del'>-	   $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library.</div><div class='del'>-	$(CC) $(SUN_CC_FLAGS) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \</div><div class='del'>-	   $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)</div><div class='del'>-	./pngtesti pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o libpng.a pngtest pngtesti pngout.png \</div><div class='del'>-	libpng-config $(LIBSO) $(LIBSOMAJ)* \</div><div class='del'>-	$(OLDSOVER) \</div><div class='del'>-	libpng.pc</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o png.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o pngerror.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o pngrio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o pngwio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o pngmem.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o pngset.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o pngget.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o pngread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o pngrtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o pngrutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o pngtrans.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o pngwrite.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.64sunu b/src/3rdparty/libpng/scripts/makefile.64sunu<br/>deleted file mode 100644<br/>index 3a04d97..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.64sunu?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.64sunu</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,257 +0,0 @@</div><div class='del'>-# makefile for libpng on Solaris 2.x with cc</div><div class='del'>-# Contributed by William L. Sebok, based on makefile.linux</div><div class='del'>-# Copyright (C) 2002, 2006 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1998 Greg Roelofs</div><div class='del'>-# Copyright (C) 1996, 1997 Andreas Dilger</div><div class='del'>-</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Library name:</div><div class='del'>-LIBNAME=libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Shared library names:</div><div class='del'>-LIBSO=$(LIBNAME).so</div><div class='del'>-LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)</div><div class='del'>-LIBSOVER=$(LIBNAME).so.$(PNGVER)</div><div class='del'>-OLDSO=libpng.so</div><div class='del'>-OLDSOMAJ=libpng.so.14</div><div class='del'>-OLDSOVER=libpng.so.14.$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Utilities:</div><div class='del'>-CC=cc</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-MKDIR_P=mkdir -p</div><div class='del'>-LN_SF=ln -f -s</div><div class='del'>-RANLIB=echo</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-SUN_CC_FLAGS=-fast -xtarget=ultra -xarch=v9</div><div class='del'>-SUN_LD_FLAGS=-fast -xtarget=ultra -xarch=v9</div><div class='del'>-</div><div class='del'>-# where make install puts libpng.a, libpng14.so and libpng14/png.h</div><div class='del'>-prefix=/a</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-# Changing these to ../zlib poses a security risk.  If you want</div><div class='del'>-# to have zlib in an adjacent directory, specify the full path instead of "..".</div><div class='del'>-#ZLIBLIB=../zlib</div><div class='del'>-#ZLIBINC=../zlib</div><div class='del'>-</div><div class='del'>-ZLIBLIB=/usr/lib</div><div class='del'>-ZLIBINC=/usr/include</div><div class='del'>-</div><div class='del'>-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \</div><div class='del'>-	-Wmissing-declarations -Wtraditional -Wcast-align \</div><div class='del'>-	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion</div><div class='del'>-CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \</div><div class='del'>-	# $(WARNMORE) -g -DPNG_DEBUG=5</div><div class='del'>-LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm</div><div class='del'>-</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DB=$(DESTDIR)$(BINPATH)</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-DM=$(DESTDIR)$(MANPATH)</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-OBJSDLL = $(OBJS:.o=.pic.o)</div><div class='del'>-</div><div class='del'>-.SUFFIXES:      .c .o .pic.o</div><div class='del'>-</div><div class='del'>-.c.pic.o:</div><div class='del'>-	$(CC) -c $(CFLAGS) -KPIC -o $@ $*.c</div><div class='del'>-</div><div class='del'>-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-libpng.pc:</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz\ -lm! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config:</div><div class='del'>-	( cat scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo libdir=\"$(LIBPATH)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo L_opts=\"-L$(LIBPATH)\"; \</div><div class='del'>-	echo R_opts=\"-R$(LIBPATH)\"; \</div><div class='del'>-	echo ccopts=\"-xtarget=ultra -xarch=v9\"; \</div><div class='del'>-	echo ldopts=\"-xtarget=ultra -xarch=v9\"; \</div><div class='del'>-	echo libs=\"-lpng14 -lz -lm\"; \</div><div class='del'>-	cat scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-$(LIBSO): $(LIBSOMAJ)</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)</div><div class='del'>-</div><div class='del'>-$(LIBSOMAJ): $(LIBSOVER)</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(LIBSOVER): $(OBJSDLL)</div><div class='del'>-	@case "`type ld`" in *ucb*) \</div><div class='del'>-	echo; \</div><div class='del'>-	echo '## WARNING:'; \</div><div class='del'>-	echo '## The commands "CC" and "LD" must NOT refer to /usr/ucb/cc'; \</div><div class='del'>-	echo '## and /usr/ucb/ld.  If they do, you need to adjust your PATH'; \</div><div class='del'>-	echo '## environment variable to put /usr/ccs/bin ahead of /usr/ucb.'; \</div><div class='del'>-	echo '## The environment variable LD_LIBRARY_PATH should not be set'; \</div><div class='del'>-	echo '## at all.  If it is, things are likely to break because of'; \</div><div class='del'>-	echo '## the libucb dependency that is created.'; \</div><div class='del'>-	echo; \</div><div class='del'>-	;; \</div><div class='del'>-	esac</div><div class='del'>-	$(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBSOMAJ) \</div><div class='del'>-	 -o $(LIBSOVER) $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-$(OLDSOVER): $(OBJSDLL)</div><div class='del'>-	$(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(OLDSOMAJ) \</div><div class='del'>-	 -o $(OLDSOVER)  $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o $(LIBSO)</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install-headers: png.h pngconf.h</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-static: install-headers libpng.a</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	cp libpng.a $(DL)/$(LIBNAME).a</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME).a</div><div class='del'>-	-@$(RM_F) $(DL)/libpng.a</div><div class='del'>-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)</div><div class='del'>-</div><div class='del'>-install-shared: install-headers $(LIBSOVER) libpng.pc \</div><div class='del'>-	$(OLDSOVER)</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ).$(PNGVER)*</div><div class='del'>-	cp $(LIBSOVER) $(DL)</div><div class='del'>-	cp $(OLDSOVER) $(DL)</div><div class='del'>-	chmod 755 $(DL)/$(LIBSOVER)</div><div class='del'>-	chmod 755 $(DL)/$(OLDSOVER)</div><div class='del'>-	(cd $(DL); \</div><div class='del'>-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \</div><div class='del'>-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO))</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-man: libpng.3 libpngpf.3 png.5</div><div class='del'>-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi</div><div class='del'>-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpng.3</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpngpf.3</div><div class='del'>-	cp libpng.3 $(DM)/man3</div><div class='del'>-	cp libpngpf.3 $(DM)/man3</div><div class='del'>-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man5/png.5</div><div class='del'>-	cp png.5 $(DM)/man5</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@$(RM_F) $(DB)/libpng-config</div><div class='del'>-	-@$(RM_F) $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) $(SUN_CC_FLAGS) -I$(DI) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/$(LIBNAME)-config --ldflags` \</div><div class='del'>-	   $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library.</div><div class='del'>-	$(CC) $(SUN_CC_FLAGS) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \</div><div class='del'>-	   $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)</div><div class='del'>-	./pngtesti pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o libpng.a pngtest pngtesti pngout.png \</div><div class='del'>-	libpng-config $(LIBSO) $(LIBSOMAJ)* \</div><div class='del'>-	$(OLDSOVER) \</div><div class='del'>-	libpng.pc</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o png.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o pngerror.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o pngrio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o pngwio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o pngmem.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o pngset.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o pngget.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o pngread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o pngrtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o pngrutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o pngtrans.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o pngwrite.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.acorn b/src/3rdparty/libpng/scripts/makefile.acorn<br/>deleted file mode 100644<br/>index a0e577b..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.acorn?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.acorn</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-# Project:   libpng</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Toolflags:</div><div class='del'>-CCflags = -c -depend !Depend -IC:,Zlib: -g -throwback  -DRISCOS  -fnah</div><div class='del'>-C++flags = -c -depend !Depend -IC: -throwback</div><div class='del'>-Linkflags = -aif -c++ -o $@</div><div class='del'>-ObjAsmflags = -throwback -NoCache -depend !Depend</div><div class='del'>-CMHGflags =</div><div class='del'>-LibFileflags = -c -l -o $@</div><div class='del'>-Squeezeflags = -o $@</div><div class='del'>-</div><div class='del'>-# Final targets:</div><div class='del'>-@.libpng-lib:   @.o.png @.o.pngerror @.o.pngrio @.o.pngwio @.o.pngmem \</div><div class='del'>-	@.o.pngpread @.o.pngset @.o.pngget @.o.pngread @.o.pngrtran \</div><div class='del'>-	@.o.pngrutil @.o.pngtrans @.o.pngwrite @.o.pngwtran @.o.pngwutil</div><div class='del'>-	LibFile $(LibFileflags) @.o.png @.o.pngerror @.o.pngrio @.o.pngrtran \</div><div class='del'>-	@.o.pngmem @.o.pngpread @.o.pngset @.o.pngget @.o.pngread @.o.pngwio \</div><div class='del'>-	@.o.pngrutil @.o.pngtrans  @.o.pngwrite @.o.pngwtran @.o.pngwutil</div><div class='del'>-@.mm-libpng-lib:   @.mm.png @.mm.pngerror @.mm.pngrio @.mm.pngwio @.mm.pngmem \</div><div class='del'>-	@.mm.pngpread @.mm.pngset @.mm.pngget @.mm.pngread @.mm.pngrtran \</div><div class='del'>-	@.mm.pngrutil @.mm.pngtrans @.mm.pngwrite @.mm.pngwtran @.mm.pngwutil</div><div class='del'>-	LibFile $(LibFileflags) @.mm.png @.mm.pngerror @.mm.pngrio \</div><div class='del'>-	@.mm.pngwio @.mm.pngmem @.mm.pngpread @.mm.pngset @.mm.pngget \</div><div class='del'>-	@.mm.pngread @.mm.pngrtran @.mm.pngrutil @.mm.pngtrans @.mm.pngwrite \</div><div class='del'>-	@.mm.pngwtran @.mm.pngwutil</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# User-editable dependencies:</div><div class='del'>-# (C) Copyright 1997 Tom Tanner</div><div class='del'>-Test: @.pngtest</div><div class='del'>-	&lt;Prefix$Dir&gt;.pngtest</div><div class='del'>-	@remove &lt;Prefix$Dir&gt;.pngtest</div><div class='del'>-</div><div class='del'>-#It would be nice if you could stop "make" listing from here on!</div><div class='del'>-@.pngtest:   @.o.pngtest @.libpng-lib C:o.Stubs Zlib:zlib_lib</div><div class='del'>-	Link $(Linkflags) @.o.pngtest @.libpng-lib C:o.Stubs Zlib:zlib_lib</div><div class='del'>-</div><div class='del'>-.SUFFIXES: .o .mm .c</div><div class='del'>-</div><div class='del'>-.c.mm:</div><div class='del'>-	MemCheck.CC cc $(ccflags) -o $@ LibPng:$&lt;</div><div class='del'>-.c.o:</div><div class='del'>-	cc $(ccflags) -o $@ $&lt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Static dependencies:</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Dynamic dependencies:</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.aix b/src/3rdparty/libpng/scripts/makefile.aix<br/>deleted file mode 100644<br/>index e6e1a89..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.aix?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.aix</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,116 +0,0 @@</div><div class='del'>-# makefile for libpng using gcc (generic, static library)</div><div class='del'>-# Copyright (C) 2002, 2006-2009 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 2000 Cosmin Truta</div><div class='del'>-# Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc)</div><div class='del'>-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Location of the zlib library and include files</div><div class='del'>-ZLIBINC = ../zlib</div><div class='del'>-ZLIBLIB = ../zlib</div><div class='del'>-</div><div class='del'>-# Compiler, linker, lib and other tools</div><div class='del'>-CC = gcc</div><div class='del'>-LD = $(CC)</div><div class='del'>-AR_RC = ar rcs</div><div class='del'>-MKDIR_P = mkdir -p</div><div class='del'>-RANLIB = ranlib</div><div class='del'>-RM_F = rm -f</div><div class='del'>-LN_SF = ln -f -s</div><div class='del'>-</div><div class='del'>-LIBNAME=libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-prefix=/usr/local</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(prefix)/lib</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-</div><div class='del'>-CDEBUG = -g -DPNG_DEBUG=5</div><div class='del'>-LDDEBUG =</div><div class='del'>-CRELEASE = -O2</div><div class='del'>-LDRELEASE = -s</div><div class='del'>-WARNMORE=-W -Wall</div><div class='del'>-CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE)</div><div class='del'>-LDFLAGS = -L. -L$(ZLIBLIB) -lpng14 -lz -lm $(LDRELEASE)</div><div class='del'>-</div><div class='del'>-# File extensions</div><div class='del'>-O=.o</div><div class='del'>-A=.a</div><div class='del'>-E=</div><div class='del'>-</div><div class='del'>-# Variables</div><div class='del'>-OBJS =  png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \</div><div class='del'>-	pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \</div><div class='del'>-	pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)</div><div class='del'>-</div><div class='del'>-# Targets</div><div class='del'>-all: $(LIBNAME)$(A) pngtest$(E)</div><div class='del'>-</div><div class='del'>-$(LIBNAME)$(A): $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-test: pngtest$(E)</div><div class='del'>-	./pngtest$(E)</div><div class='del'>-</div><div class='del'>-pngtest$(E): pngtest$(O) $(LIBNAME)$(A)</div><div class='del'>-	$(LD) -o $@ pngtest$(O) $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-install: $(LIBNAME)$(A)</div><div class='del'>-	-@if [ ! -d $(DI)  ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME)  ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@$(RM_F) $(DI)/$(LIBNAME)/png.h</div><div class='del'>-	-@$(RM_F) $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/png.h</div><div class='del'>-	-@$(RM_F) $(DI)/pngconf.h</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h \</div><div class='del'>-	$(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) -r $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBNAME)$(A)</div><div class='del'>-	-@$(RM_F) $(DL)/libpng$(A)</div><div class='del'>-	cp $(LIBNAME)$(A) $(DL)/$(LIBNAME)$(A)</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME)$(A)</div><div class='del'>-	(cd $(DL); $(LN_SF) $(LIBNAME)$(A) libpng$(A))</div><div class='del'>-	(cd $(DI); $(LN_SF) libpng/* .;)</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o $(LIBNAME)$(A) pngtest pngout.png</div><div class='del'>-</div><div class='del'>-png$(O):      png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngget$(O):   png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem$(O):   png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngread$(O):  png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio$(O):   png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngset$(O):   png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio$(O):   png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest$(O):  png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.amiga b/src/3rdparty/libpng/scripts/makefile.amiga<br/>deleted file mode 100644<br/>index 8bf0f45..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.amiga?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.amiga</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-# Commodore Amiga Makefile</div><div class='del'>-# makefile for libpng and SAS C V6.5x compiler</div><div class='del'>-# Copyright (C) 1995-2000 Wolf Faust</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-#</div><div class='del'>-# Note: Use #define PNG_READ_BIG_ENDIAN_SUPPORTED in pngconf.h</div><div class='del'>-#</div><div class='del'>-# Location/path of zlib include files</div><div class='del'>-ZLIB=/zlib</div><div class='del'>-#compiler</div><div class='del'>-CC=sc</div><div class='del'>-#compiler flags</div><div class='del'>-# WARNING: a bug in V6.51 causes bad code with OPTGO</div><div class='del'>-#          So use V6.55 or set NOOPTGO!!!!!!!!!</div><div class='del'>-CFLAGS= NOSTKCHK PARMS=REG OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL\</div><div class='del'>-	OPTLOOP OPTRDEP=4 OPTDEP=4 OPTCOMP=4 INCLUDEDIR=$(ZLIB) \</div><div class='del'>-	DEFINE=PNG_INTERNAL</div><div class='del'>-#linker flags</div><div class='del'>-LDFLAGS= SD ND BATCH</div><div class='del'>-#link libs</div><div class='del'>-LDLIBS= libpng.lib libgz.lib LIB:scm.lib LIB:sc.lib Lib:amiga.lib</div><div class='del'>-# linker</div><div class='del'>-LN= slink</div><div class='del'>-# file deletion command</div><div class='del'>-RM= delete quiet</div><div class='del'>-# library (.lib) file creation command</div><div class='del'>-AR= oml</div><div class='del'>-# make directory command</div><div class='del'>-MKDIR= makedir</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-all: libpng.lib pngtest</div><div class='del'>-</div><div class='del'>-libpng.lib: $(OBJS)</div><div class='del'>--$(RM) libpng.lib</div><div class='del'>-$(AR) libpng.lib r $(OBJS)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o libpng.lib</div><div class='del'>-$(LN) &lt;WITH &lt;</div><div class='del'>-$(LDFLAGS)</div><div class='del'>-TO pngtest</div><div class='del'>-FROM LIB:c.o pngtest.o</div><div class='del'>-LIB $(LDLIBS)</div><div class='del'>-&lt;</div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.atari b/src/3rdparty/libpng/scripts/makefile.atari<br/>deleted file mode 100644<br/>index 0e1ca72..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.atari?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.atari</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-# makefile for libpng</div><div class='del'>-# Copyright (C) 2002 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-#</div><div class='del'>-# Modified for LC56/ATARI assumes libz.lib is in same dir and uses default</div><div class='del'>-# rules for library management</div><div class='del'>-#</div><div class='del'>-CFLAGS=-I..\zlib -O</div><div class='del'>-LBR = png.lib</div><div class='del'>-LDFLAGS=-lpng -lz -lm</div><div class='del'>-</div><div class='del'>-# where make install puts libpng.a and png.h</div><div class='del'>-prefix=/usr/local</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(prefix)/lib</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-OBJS = $(LBR)(png.o) $(LBR)(pngset.o) $(LBR)(pngget.o) $(LBR)(pngrutil.o)\</div><div class='del'>-	$(LBR)(pngtrans.o) $(LBR)(pngwutil.o)\</div><div class='del'>-	$(LBR)(pngread.o) $(LBR)(pngerror.o) $(LBR)(pngwrite.o)\</div><div class='del'>-	$(LBR)(pngrtran.o) $(LBR)(pngwtran.o)\</div><div class='del'>-	$(LBR)(pngmem.o) $(LBR)(pngrio.o) $(LBR)(pngwio.o) $(LBR)(pngpread.o)</div><div class='del'>-</div><div class='del'>-all: $(LBR) pngtest.ttp</div><div class='del'>-</div><div class='del'>-$(LBR): $(OBJS)</div><div class='del'>-</div><div class='del'>-pngtest.ttp: pngtest.o $(LBR)</div><div class='del'>-	$(CC) $(CFLAGS) $(LDFLAGS) -o$@ pngtest.o</div><div class='del'>-</div><div class='del'>-install: libpng.a</div><div class='del'>-	-@mkdir $(DESTDIR)$(INCPATH)</div><div class='del'>-	-@mkdir $(DESTDIR)$(INCPATH)/libpng</div><div class='del'>-	-@mkdir $(DESTDIR)$(LIBPATH)</div><div class='del'>-	-@rm -f $(DESTDIR)$(INCPATH)/png.h</div><div class='del'>-	-@rm -f $(DESTDIR)$(INCPATH)/pngconf.h</div><div class='del'>-	cp png.h $(DESTDIR)$(INCPATH)/libpng</div><div class='del'>-	cp pngconf.h $(DESTDIR)$(INCPATH)/libpng</div><div class='del'>-	chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h</div><div class='del'>-	chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h</div><div class='del'>-	(cd $(DESTDIR)$(INCPATH); ln -f -s $(LIBNAME) libpng; \</div><div class='del'>-	ln -f -s $(LIBNAME)/* .)</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.bc32 b/src/3rdparty/libpng/scripts/makefile.bc32<br/>deleted file mode 100644<br/>index 2020e6e..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.bc32?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.bc32</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,145 +0,0 @@</div><div class='del'>-# Makefile for libpng</div><div class='del'>-# 32-bit Borland C++ (Note: All modules are compiled in C mode)</div><div class='del'>-# To build the library, do:</div><div class='del'>-#       "make -fmakefile.bc32"</div><div class='del'>-#</div><div class='del'>-# -------------------- 32-bit Borland C++ --------------------</div><div class='del'>-</div><div class='del'>-### Absolutely necessary for this makefile to work</div><div class='del'>-.AUTODEPEND</div><div class='del'>-</div><div class='del'>-## Where zlib.h, zconf.h and zlib.lib are</div><div class='del'>-ZLIB_DIR=..\zlib</div><div class='del'>-</div><div class='del'>-## Compiler, linker and lib stuff</div><div class='del'>-CC=bcc32</div><div class='del'>-LD=bcc32</div><div class='del'>-LIB=tlib</div><div class='del'>-</div><div class='del'>-# -3 = 386, -4 = 486, -5 = Pentium etc.</div><div class='del'>-!ifndef TARGET_CPU</div><div class='del'>-#TARGET_CPU=-6</div><div class='del'>-!endif</div><div class='del'>-</div><div class='del'>-# Use this if you don't want Borland's fancy exception handling</div><div class='del'>-# (Caution: doesn't work with CBuilderX)</div><div class='del'>-#NOEHLIB=noeh32.lib</div><div class='del'>-</div><div class='del'>-!ifdef DEBUG</div><div class='del'>-CDEBUG=-v</div><div class='del'>-LDEBUG=-v</div><div class='del'>-!else</div><div class='del'>-CDEBUG=</div><div class='del'>-LDEBUG=</div><div class='del'>-!endif</div><div class='del'>-</div><div class='del'>-# STACKOFLOW=1</div><div class='del'>-!ifdef STACKOFLOW</div><div class='del'>-CDEBUG=$(CDEBUG) -N</div><div class='del'>-LDEBUG=$(LDEBUG) -N</div><div class='del'>-!endif</div><div class='del'>-</div><div class='del'>-# -O2 optimize for speed</div><div class='del'>-# -d  merge duplicate strings</div><div class='del'>-# -k- turn off standard stack frame</div><div class='del'>-# -w  display all warnings</div><div class='del'>-CFLAGS=-I$(ZLIB_DIR) -O2 -d -k- -w $(TARGET_CPU) $(CDEBUG)</div><div class='del'>-</div><div class='del'>-# -M  generate map file</div><div class='del'>-LDFLAGS=-L$(ZLIB_DIR) -M $(LDEBUG)</div><div class='del'>-</div><div class='del'>-## Variables</div><div class='del'>-OBJS = \</div><div class='del'>-	png.obj \</div><div class='del'>-	pngerror.obj \</div><div class='del'>-	pngget.obj \</div><div class='del'>-	pngmem.obj \</div><div class='del'>-	pngpread.obj \</div><div class='del'>-	pngread.obj \</div><div class='del'>-	pngrio.obj \</div><div class='del'>-	pngrtran.obj \</div><div class='del'>-	pngrutil.obj \</div><div class='del'>-	pngset.obj \</div><div class='del'>-	pngtrans.obj \</div><div class='del'>-	pngwio.obj \</div><div class='del'>-	pngwrite.obj \</div><div class='del'>-	pngwtran.obj \</div><div class='del'>-	pngwutil.obj</div><div class='del'>-</div><div class='del'>-LIBOBJS = \</div><div class='del'>-	+png.obj \</div><div class='del'>-	+pngerror.obj \</div><div class='del'>-	+pngget.obj \</div><div class='del'>-	+pngmem.obj \</div><div class='del'>-	+pngpread.obj \</div><div class='del'>-	+pngread.obj \</div><div class='del'>-	+pngrio.obj \</div><div class='del'>-	+pngrtran.obj \</div><div class='del'>-	+pngrutil.obj \</div><div class='del'>-	+pngset.obj \</div><div class='del'>-	+pngtrans.obj \</div><div class='del'>-	+pngwio.obj \</div><div class='del'>-	+pngwrite.obj \</div><div class='del'>-	+pngwtran.obj \</div><div class='del'>-	+pngwutil.obj</div><div class='del'>-</div><div class='del'>-LIBNAME=libpng.lib</div><div class='del'>-</div><div class='del'>-## Implicit rules</div><div class='del'>-# Braces let make "batch" calls to the compiler,</div><div class='del'>-# 2 calls instead of 12; space is important.</div><div class='del'>-.c.obj:</div><div class='del'>-	$(CC) $(CFLAGS) -c {$*.c }</div><div class='del'>-</div><div class='del'>-.c.exe:</div><div class='del'>-	$(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBNAME) zlib.lib $(NOEHLIB)</div><div class='del'>-</div><div class='del'>-.obj.exe:</div><div class='del'>-	$(LD) $(LDFLAGS) $*.obj $(LIBNAME) zlib.lib $(NOEHLIB)</div><div class='del'>-</div><div class='del'>-## Major targets</div><div class='del'>-all: libpng pngtest</div><div class='del'>-</div><div class='del'>-libpng: $(LIBNAME)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.exe</div><div class='del'>-</div><div class='del'>-test: pngtest.exe</div><div class='del'>-	pngtest</div><div class='del'>-</div><div class='del'>-## Minor Targets</div><div class='del'>-</div><div class='del'>-png.obj: png.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.obj: pngerror.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.obj: pngget.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.obj: pngmem.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.obj: pngpread.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.obj: pngread.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.obj: pngrio.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.obj: pngrtran.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.obj: pngrutil.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.obj: pngset.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.obj: pngtrans.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.obj: pngwio.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.obj: pngwrite.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.obj: pngwtran.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.obj: pngwutil.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngtest.obj: pngtest.c png.h pngconf.h</div><div class='del'>-</div><div class='del'>-$(LIBNAME): $(OBJS)</div><div class='del'>-	-del $(LIBNAME)</div><div class='del'>-	$(LIB) $(LIBNAME) @&amp;&amp;|</div><div class='del'>-$(LIBOBJS), libpng</div><div class='del'>-|</div><div class='del'>-</div><div class='del'>-# Cleanup</div><div class='del'>-clean:</div><div class='del'>-	-del *.obj</div><div class='del'>-	-del $(LIBNAME)</div><div class='del'>-	-del pngtest.exe</div><div class='del'>-	-del *.lst</div><div class='del'>-	-del *.map</div><div class='del'>-	-del *.tds</div><div class='del'>-	-del pngout.png</div><div class='del'>-</div><div class='del'>-# End of makefile for libpng</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.beos b/src/3rdparty/libpng/scripts/makefile.beos<br/>deleted file mode 100644<br/>index 0b184d6..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.beos?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.beos</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,230 +0,0 @@</div><div class='del'>-# makefile for libpng on BeOS x86 ELF with gcc</div><div class='del'>-# modified from makefile.linux by Sander Stoks</div><div class='del'>-# Copyright (C) 2002, 2006, 2008 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1999 Greg Roelofs</div><div class='del'>-# Copyright (C) 1996, 1997 Andreas Dilger</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Library name:</div><div class='del'>-LIBNAME=libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Shared library names:</div><div class='del'>-LIBSO=$(LIBNAME).so</div><div class='del'>-LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)</div><div class='del'>-LIBSOVER=$(LIBNAME).so.$(PNGVER)</div><div class='del'>-OLDSO=libpng.so</div><div class='del'>-OLDSOMAJ=libpng.so.14</div><div class='del'>-OLDSOVER=libpng.so.14.$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Utilities:</div><div class='del'>-CC=gcc</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-MKDIR_P=mkdir -p</div><div class='del'>-LN_SF=ln -sf</div><div class='del'>-RANLIB=ranlib</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-ZLIBLIB=/usr/local/lib</div><div class='del'>-ZLIBINC=/usr/local/include</div><div class='del'>-</div><div class='del'>-ALIGN=</div><div class='del'>-# For i386:</div><div class='del'>-# ALIGN=-malign-loops=2 -malign-functions=2</div><div class='del'>-</div><div class='del'>-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \</div><div class='del'>-	-Wmissing-declarations -Wtraditional -Wcast-align \</div><div class='del'>-	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion</div><div class='del'>-</div><div class='del'>-# On BeOS, -O1 is actually better than -O3.  This is a known bug but it's</div><div class='del'>-# still here in R4.5</div><div class='del'>-CFLAGS=-I$(ZLIBINC) -W -Wall -O1 -funroll-loops \</div><div class='del'>-	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5</div><div class='del'>-# LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz</div><div class='del'>-LDFLAGS=-L. -Wl,-soname=$(LIBSOMAJ) -L$(ZLIBLIB) -lz</div><div class='del'>-</div><div class='del'>-# where make install puts libpng.a, libpng14.so*, and png.h</div><div class='del'>-prefix=/usr/local</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DB=$(DESTDIR)$(BINPATH)</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-DM=$(DESTDIR)$(MANPATH)</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-OBJSDLL = $(OBJS)</div><div class='del'>-</div><div class='del'>-.SUFFIXES:      .c .o</div><div class='del'>-</div><div class='del'>-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-libpng.pc:</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz\ -lm! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config:</div><div class='del'>-	( cat scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo libs=\"-lpng14 -lz \"; \</div><div class='del'>-	cat scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-$(LIBSO): $(LIBSOMAJ)</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)</div><div class='del'>-	cp $(LIBSO)* /boot/home/config/lib</div><div class='del'>-</div><div class='del'>-$(LIBSOMAJ): $(LIBSOVER)</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(LIBSOVER): $(OBJSDLL)</div><div class='del'>-	$(CC) -nostart -Wl,-soname,$(LIBSOMAJ) -o \</div><div class='del'>-	$(LIBSOVER) $(OBJSDLL) $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-$(OLDSOVER): $(OBJSDLL)</div><div class='del'>-	$(CC) -nostart -Wl,-soname,$(OLDSOMAJ) -o \</div><div class='del'>-	$(OLDSOVER) $(OBJSDLL) $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o $(LIBSO)</div><div class='del'>-	$(CC) -L$(ZLIBLIB) -L. -lz -lpng14 -o pngtest pngtest.o</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install-headers: png.h pngconf.h</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-static: install-headers libpng.a</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	cp libpng.a $(DL)/$(LIBNAME).a</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME).a</div><div class='del'>-	-@$(RM_F) $(DL)/libpng.a</div><div class='del'>-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)</div><div class='del'>-</div><div class='del'>-install-shared: install-headers $(LIBSOVER) libpng.pc \</div><div class='del'>-	$(OLDSOVER)</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOVER)*</div><div class='del'>-	cp $(LIBSOVER) $(DL)</div><div class='del'>-	cp $(OLDSOVER) $(DL)</div><div class='del'>-	chmod 755 $(DL)/$(LIBSOVER)</div><div class='del'>-	chmod 755 $(DL)/$(OLDSOVER)</div><div class='del'>-	(cd $(DL); \</div><div class='del'>-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \</div><div class='del'>-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO))</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-man: libpng.3 libpngpf.3 png.5</div><div class='del'>-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi</div><div class='del'>-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpng.3</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpngpf.3</div><div class='del'>-	cp libpng.3 $(DM)/man3</div><div class='del'>-	cp libpngpf.3 $(DM)/man3</div><div class='del'>-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man5/png.5</div><div class='del'>-	cp png.5 $(DM)/man5</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@$(RM_F) $(DB)/libpng-config</div><div class='del'>-	-@$(RM_F) $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) -I$(DI) $(CFLAGS) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(DL) -L$(ZLIBLIB) -Wl,-rpath $(ZLIBLIB):$(DL) \</div><div class='del'>-	   -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	$(CC) $(CFLAGS) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \</div><div class='del'>-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtesti pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o libpng.a pngtest pngout.png libpng-config \</div><div class='del'>-	$(LIBSO) $(LIBSOMAJ)* pngtesti \</div><div class='del'>-	$(OLDSOVER) \</div><div class='del'>-	libpng.pc</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o png.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o pngerror.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o pngrio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o pngwio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o pngmem.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o pngset.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o pngget.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o pngread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o pngrtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o pngrutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o pngtrans.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o pngwrite.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.bor b/src/3rdparty/libpng/scripts/makefile.bor<br/>deleted file mode 100644<br/>index dcc3c63..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.bor?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.bor</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,156 +0,0 @@</div><div class='del'>-# Makefile for libpng</div><div class='del'>-# 16-bit Borland C++ (Note: All modules are compiled in C mode)</div><div class='del'>-# To build the library, do:</div><div class='del'>-#       "make -fmakefile.bor -DMODEL=c"</div><div class='del'>-# or:   "make -fmakefile.bor -DMODEL=l"</div><div class='del'>-#</div><div class='del'>-# ------------ Borland C++ ------------</div><div class='del'>-</div><div class='del'>-### Absolutely necessary for this makefile to work</div><div class='del'>-.AUTODEPEND</div><div class='del'>-</div><div class='del'>-## Where zlib.h, zconf.h and zlib_MODEL.lib are</div><div class='del'>-ZLIB_DIR=..\zlib</div><div class='del'>-</div><div class='del'>-## Compiler, linker and lib stuff</div><div class='del'>-CC=bcc</div><div class='del'>-LD=bcc</div><div class='del'>-LIB=tlib</div><div class='del'>-</div><div class='del'>-!ifndef MODEL</div><div class='del'>-MODEL=l</div><div class='del'>-!endif</div><div class='del'>-</div><div class='del'>-MODEL_ARG=-m$(MODEL)</div><div class='del'>-</div><div class='del'>-#TARGET_CPU=3</div><div class='del'>-# 2 = 286, 3 = 386, etc.</div><div class='del'>-!ifndef TARGET_CPU</div><div class='del'>-TARGET_CPU=2</div><div class='del'>-!endif</div><div class='del'>-</div><div class='del'>-# Use this if you don't want Borland's fancy exception handling</div><div class='del'>-# (for Borland C++ 4.0 or later)</div><div class='del'>-#NOEHLIB=noeh$(MODEL).lib</div><div class='del'>-</div><div class='del'>-!ifdef DEBUG</div><div class='del'>-CDEBUG=-v</div><div class='del'>-LDEBUG=-v</div><div class='del'>-!else</div><div class='del'>-CDEBUG=</div><div class='del'>-LDEBUG=</div><div class='del'>-!endif</div><div class='del'>-</div><div class='del'>-# STACKOFLOW=1</div><div class='del'>-!ifdef STACKOFLOW</div><div class='del'>-CDEBUG=$(CDEBUG) -N</div><div class='del'>-LDEBUG=$(LDEBUG) -N</div><div class='del'>-!endif</div><div class='del'>-</div><div class='del'>-# -X- turn on dependency generation in the object file</div><div class='del'>-# -w  set all warnings on</div><div class='del'>-# -O2 optimize for speed</div><div class='del'>-# -Z  global optimization</div><div class='del'>-CFLAGS=-O2 -Z -X- -w -I$(ZLIB_DIR) -$(TARGET_CPU) $(MODEL_ARG) $(CDEBUG)</div><div class='del'>-</div><div class='del'>-# -M  generate map file</div><div class='del'>-LDFLAGS=-M -L$(ZLIB_DIR) $(MODEL_ARG) $(LDEBUG)</div><div class='del'>-</div><div class='del'>-## Variables</div><div class='del'>-</div><div class='del'>-OBJS = \</div><div class='del'>-	png.obj \</div><div class='del'>-	pngerror.obj \</div><div class='del'>-	pngget.obj \</div><div class='del'>-	pngmem.obj \</div><div class='del'>-	pngpread.obj \</div><div class='del'>-	pngread.obj \</div><div class='del'>-	pngrio.obj \</div><div class='del'>-	pngrtran.obj \</div><div class='del'>-	pngrutil.obj \</div><div class='del'>-	pngset.obj \</div><div class='del'>-	pngtrans.obj \</div><div class='del'>-	pngwio.obj \</div><div class='del'>-	pngwrite.obj \</div><div class='del'>-	pngwtran.obj \</div><div class='del'>-	pngwutil.obj</div><div class='del'>-</div><div class='del'>-LIBOBJS = \</div><div class='del'>-	+png.obj \</div><div class='del'>-	+pngerror.obj \</div><div class='del'>-	+pngget.obj \</div><div class='del'>-	+pngmem.obj \</div><div class='del'>-	+pngpread.obj \</div><div class='del'>-	+pngread.obj \</div><div class='del'>-	+pngrio.obj \</div><div class='del'>-	+pngrtran.obj \</div><div class='del'>-	+pngrutil.obj \</div><div class='del'>-	+pngset.obj \</div><div class='del'>-	+pngtrans.obj \</div><div class='del'>-	+pngwio.obj \</div><div class='del'>-	+pngwrite.obj \</div><div class='del'>-	+pngwtran.obj \</div><div class='del'>-	+pngwutil.obj</div><div class='del'>-</div><div class='del'>-LIBNAME=libpng$(MODEL).lib</div><div class='del'>-</div><div class='del'>-## Implicit rules</div><div class='del'>-</div><div class='del'>-# Braces let make "batch" calls to the compiler,</div><div class='del'>-# 2 calls instead of 12; space is important.</div><div class='del'>-.c.obj:</div><div class='del'>-	$(CC) $(CFLAGS) -c {$*.c }</div><div class='del'>-</div><div class='del'>-.c.exe:</div><div class='del'>-	$(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBNAME) zlib_$(MODEL).lib $(NOEHLIB)</div><div class='del'>-</div><div class='del'>-## Major targets</div><div class='del'>-</div><div class='del'>-all: libpng pngtest</div><div class='del'>-</div><div class='del'>-libpng: $(LIBNAME)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest$(MODEL).exe</div><div class='del'>-</div><div class='del'>-test: pngtest$(MODEL).exe</div><div class='del'>-	pngtest$(MODEL)</div><div class='del'>-</div><div class='del'>-## Minor Targets</div><div class='del'>-</div><div class='del'>-png.obj: png.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.obj: pngerror.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.obj: pngget.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.obj: pngmem.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.obj: pngpread.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.obj: pngread.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.obj: pngrio.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.obj: pngrtran.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.obj: pngrutil.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.obj: pngset.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.obj: pngtrans.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.obj: pngwio.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.obj: pngwrite.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.obj: pngwtran.c png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.obj: pngwutil.c png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-$(LIBNAME): $(OBJS)</div><div class='del'>-	-del $(LIBNAME)</div><div class='del'>-	$(LIB) $(LIBNAME) @&amp;&amp;|</div><div class='del'>-$(LIBOBJS), libpng$(MODEL)</div><div class='del'>-|</div><div class='del'>-</div><div class='del'>-pngtest$(MODEL).obj: pngtest.c png.h pngconf.h</div><div class='del'>-	$(CC) $(CFLAGS) -opngtest$(MODEL) -c pngtest.c</div><div class='del'>-</div><div class='del'>-pngtest$(MODEL).exe: pngtest$(MODEL).obj</div><div class='del'>-	$(LD) $(LDFLAGS) pngtest$(MODEL).obj $(LIBNAME) zlib_$(MODEL).lib $(NOEHLIB)</div><div class='del'>-</div><div class='del'>-# Clean up anything else you want</div><div class='del'>-clean:</div><div class='del'>-	-del *.obj</div><div class='del'>-	-del *.exe</div><div class='del'>-	-del *.lib</div><div class='del'>-	-del *.lst</div><div class='del'>-	-del *.map</div><div class='del'>-</div><div class='del'>-# End of makefile for libpng</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.cegcc b/src/3rdparty/libpng/scripts/makefile.cegcc<br/>deleted file mode 100644<br/>index 5b023df..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.cegcc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.cegcc</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,113 +0,0 @@</div><div class='del'>-# Makefile for creating Windows CE release archives, with the</div><div class='del'>-# mingw32ce compiler.</div><div class='del'>-</div><div class='del'>-# Last updated: 22-Jul-2008</div><div class='del'>-</div><div class='del'>-# Copyright (C) 2008 Vincent Torri</div><div class='del'>-</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# To get some help, type</div><div class='del'>-#</div><div class='del'>-# make help</div><div class='del'>-#</div><div class='del'>-# To create the archives</div><div class='del'>-#</div><div class='del'>-# make</div><div class='del'>-#</div><div class='del'>-# To remove everything, type:</div><div class='del'>-#</div><div class='del'>-# make clean</div><div class='del'>-</div><div class='del'>-VERMAJ = 1</div><div class='del'>-VERMIN = 4</div><div class='del'>-VERMIC = 0</div><div class='del'>-VER = $(VERMAJ).$(VERMIN).$(VERMIC)</div><div class='del'>-NAME = libpng</div><div class='del'>-PACKAGE = $(NAME)-$(VER)</div><div class='del'>-</div><div class='del'>-BIN = libpng14-0.dll libpng-14.dll</div><div class='del'>-LIB = libpng14.a libpng14.dll.a libpng.a libpng.dll.a scripts/png32ce.def</div><div class='del'>-INCLUDE = png.h pngconf.h pngpriv.h</div><div class='del'>-PC = libpng14.pc libpng.pc</div><div class='del'>-</div><div class='del'>-MANIFESTVERBIN = "Libpng-$(VER): Binary files"</div><div class='del'>-MANIFESTVERDEV = "Libpng-$(VER): Developer files"</div><div class='del'>-MANIFESTVERDESC = "Libpng: the official PNG reference library"</div><div class='del'>-</div><div class='del'>-all: $(NAME)</div><div class='del'>-</div><div class='del'>-$(NAME): remove-old copy-src compilation copy manifest archive</div><div class='del'>-	@echo " * Removal of the directories"</div><div class='del'>-	@rm -rf $(PACKAGE)/ $(PACKAGE)-bin/ $(PACKAGE)-dev/</div><div class='del'>-</div><div class='del'>-remove-old:</div><div class='del'>-	@echo " * Removal of the old files"</div><div class='del'>-	@rm -rf $(PACKAGE)-bin*</div><div class='del'>-	@rm -rf $(PACKAGE)-dev*</div><div class='del'>-</div><div class='del'>-copy-src:</div><div class='del'>-	@echo " * Copy of source files"</div><div class='del'>-	@cp -R ../src/$(PACKAGE) .</div><div class='del'>-	@echo " * Creation of directories and files"</div><div class='del'>-	@mkdir -p $(PACKAGE)-bin/bin</div><div class='del'>-	@mkdir -p $(PACKAGE)-bin/manifest</div><div class='del'>-	@mkdir -p $(PACKAGE)-dev/lib/pkgconfig</div><div class='del'>-	@mkdir -p $(PACKAGE)-dev/include/$(NAME)$(VERMAJ)$(VERMIN)</div><div class='del'>-	@mkdir -p $(PACKAGE)-dev/manifest</div><div class='del'>-	@touch $(PACKAGE)-bin/manifest/$(PACKAGE)-bin.mft</div><div class='del'>-	@touch $(PACKAGE)-bin/manifest/$(PACKAGE)-bin.ver</div><div class='del'>-	@touch $(PACKAGE)-dev/manifest/$(PACKAGE)-dev.mft</div><div class='del'>-	@touch $(PACKAGE)-dev/manifest/$(PACKAGE)-dev.ver</div><div class='del'>-</div><div class='del'>-compilation:</div><div class='del'>-	@echo " * Compilation of $(PACKAGE)"</div><div class='del'>-	cd $(PACKAGE) &amp;&amp; CPPFLAGS="$(CPPFLAGS) -DPNG_BUILD_DLL -DPNG_CONSOLE_IO_SUPPORTED -DPNG_NO_MMX_CODE -D_WIN32_WCE=0x0420" CFLAGS="$(CFLAGS) -mms-bitfields -O3 -pipe -fomit-frame-pointer" LDFLAGS="$(LDFLAGS) -Wl,--enable-auto-import -Wl,-s" ./configure --prefix=/opt/wince --host=arm-mingw32ce &amp;&amp; make</div><div class='del'>-</div><div class='del'>-copy:</div><div class='del'>-	@echo " * Copy of binary and development files"</div><div class='del'>-	@for i in $(BIN); do \</div><div class='del'>-	  cp $(PACKAGE)/.libs/$$i $(PACKAGE)-bin/bin; \</div><div class='del'>-	done</div><div class='del'>-	@for i in $(LIB); do \</div><div class='del'>-	  cp $(PACKAGE)/.libs/$$i $(PACKAGE)-dev/lib; \</div><div class='del'>-	done</div><div class='del'>-	@for i in $(INCLUDE); do \</div><div class='del'>-	  cp $(PACKAGE)/$$i $(PACKAGE)-dev/include/$(NAME)$(VERMAJ)$(VERMIN); \</div><div class='del'>-	done</div><div class='del'>-	@for i in $(PC); do \</div><div class='del'>-	  cp $(PACKAGE)/$$i $(PACKAGE)-dev/lib/pkgconfig; \</div><div class='del'>-	done</div><div class='del'>-</div><div class='del'>-manifest:</div><div class='del'>-	@echo " * Creation of the manifest"</div><div class='del'>-	@cd $(PACKAGE)-bin &amp;&amp; find * &gt;&gt; manifest/$(PACKAGE)-bin.mft</div><div class='del'>-	@cd $(PACKAGE)-bin &amp;&amp; \</div><div class='del'>-	  echo $(MANIFESTVERBIN) &gt;&gt; manifest/$(PACKAGE)-bin.ver &amp;&amp; \</div><div class='del'>-	  echo $(MANIFESTVERDESC) &gt;&gt; manifest/$(PACKAGE)-bin.ver</div><div class='del'>-	@cd $(PACKAGE)-dev &amp;&amp; find * &gt;&gt; manifest/$(PACKAGE)-dev.mft</div><div class='del'>-	@cd $(PACKAGE)-dev &amp;&amp; \</div><div class='del'>-	  echo $(MANIFESTVERDEV) &gt;&gt; manifest/$(PACKAGE)-dev.ver &amp;&amp; \</div><div class='del'>-	  echo $(MANIFESTVERDESC) &gt;&gt; manifest/$(PACKAGE)-dev.ver</div><div class='del'>-</div><div class='del'>-archive:</div><div class='del'>-	@echo " * Creation of the archives"</div><div class='del'>-	@tar cf $(PACKAGE)-bin.tar $(PACKAGE)-bin</div><div class='del'>-	@bzip2 -9 $(PACKAGE)-bin.tar</div><div class='del'>-	@tar cf $(PACKAGE)-dev.tar $(PACKAGE)-dev</div><div class='del'>-	@bzip2 -9 $(PACKAGE)-dev.tar</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	@echo " * Cleaning"</div><div class='del'>-	@rm -rf $(PACKAGE)*</div><div class='del'>-</div><div class='del'>-help:</div><div class='del'>-	@echo</div><div class='del'>-	@echo "To create the archives, type:"</div><div class='del'>-	@echo " make"</div><div class='del'>-	@echo</div><div class='del'>-	@echo "To remove everything, type:"</div><div class='del'>-	@echo " make clean"</div><div class='del'>-	@echo</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.cygwin b/src/3rdparty/libpng/scripts/makefile.cygwin<br/>deleted file mode 100644<br/>index bdd904e..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.cygwin?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.cygwin</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,293 +0,0 @@</div><div class='del'>-# makefile for cygwin on x86</div><div class='del'>-#   Builds both dll (with import lib) and static lib versions</div><div class='del'>-#   of the library, and builds two copies of pngtest: one</div><div class='del'>-#   statically linked and one dynamically linked.</div><div class='del'>-#</div><div class='del'>-# Copyright (C) 2002, 2006-2008 Soren Anderson, Charles Wilson,</div><div class='del'>-#    and Glenn Randers-Pehrson, based on makefile for linux-elf w/mmx by:</div><div class='del'>-# Copyright (C) 1998-2000 Greg Roelofs</div><div class='del'>-# Copyright (C) 1996, 1997 Andreas Dilger</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# This makefile intends to support building outside the src directory</div><div class='del'>-# if desired. When invoking it, specify an argument to SRCDIR on the</div><div class='del'>-# command line that points to the top of the directory where your source</div><div class='del'>-# is located.</div><div class='del'>-</div><div class='del'>-ifdef SRCDIR</div><div class='del'>-VPATH = $(SRCDIR)</div><div class='del'>-else</div><div class='del'>-SRCDIR = .</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-# Override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-CC=gcc</div><div class='del'>-ifdef MINGW</div><div class='del'>-MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw</div><div class='del'>-MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-# Where "make install" puts libpng*.a, *png*.dll, png.h, and pngconf.h</div><div class='del'>-ifndef prefix</div><div class='del'>-prefix=/usr</div><div class='del'>-$(warning You haven't specified a 'prefix=' location. Defaulting to "/usr")</div><div class='del'>-endif</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-ZLIBLIB= /usr/lib</div><div class='del'>-ZLIBINC=</div><div class='del'>-#ZLIBLIB=../zlib</div><div class='del'>-#ZLIBINC=../zlib</div><div class='del'>-</div><div class='del'>-ALIGN=</div><div class='del'>-# for i386:</div><div class='del'>-#ALIGN=-malign-loops=2 -malign-functions=2</div><div class='del'>-</div><div class='del'>-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \</div><div class='del'>-	-Wmissing-declarations -Wtraditional -Wcast-align \</div><div class='del'>-	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion</div><div class='del'>-</div><div class='del'>-CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \</div><div class='del'>-        -W -Wall -O3 $(ALIGN) -funroll-loops \</div><div class='del'>-	-fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5</div><div class='del'>-</div><div class='del'>-LIBNAME = libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-CYGDLL = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-SHAREDLIB=cygpng$(CYGDLL).dll</div><div class='del'>-STATLIB=libpng.a</div><div class='del'>-IMPLIB=libpng.dll.a</div><div class='del'>-SHAREDDEF=libpng.def</div><div class='del'>-LIBS=$(SHAREDLIB) $(STATLIB)</div><div class='del'>-EXE=.exe</div><div class='del'>-</div><div class='del'>-LDFLAGS=$(strip -L. $(MINGW_LDFLAGS) -lpng $(addprefix -L,$(ZLIBLIB)) -lz)</div><div class='del'>-LDSFLAGS=$(strip -shared -L.  $(MINGW_LDFLAGS) -Wl,--export-all)</div><div class='del'>-LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz</div><div class='del'>-</div><div class='del'>-MKDIR_P=/bin/mkdir -pv</div><div class='del'>-RANLIB=ranlib</div><div class='del'>-#RANLIB=echo</div><div class='del'>-</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-MAN3PATH=$(MANPATH)/man3</div><div class='del'>-MAN5PATH=$(MANPATH)/man5</div><div class='del'>-</div><div class='del'>-# cosmetic: shortened strings:</div><div class='del'>-S =$(SRCDIR)</div><div class='del'>-D =$(DESTDIR)</div><div class='del'>-DB =$(D)$(BINPATH)</div><div class='del'>-DI =$(D)$(INCPATH)</div><div class='del'>-DL =$(D)$(LIBPATH)</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-OBJSDLL = $(OBJS:.o=.pic.o)</div><div class='del'>-</div><div class='del'>-.SUFFIXES: .c .o .pic.o</div><div class='del'>-</div><div class='del'>-%.o : %.c</div><div class='del'>-	$(CC) -c $(CFLAGS) -o $@ $&lt;</div><div class='del'>-%.pic.o : CFLAGS += -DPNG_BUILD_DLL</div><div class='del'>-%.pic.o : %.c</div><div class='del'>-	$(CC) -c $(CFLAGS) -o $@ $&lt;</div><div class='del'>-</div><div class='del'>-all: all-static all-shared libpng.pc libpng-config libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-# Make this to verify that "make [...] install" will do what you want.</div><div class='del'>-buildsetup-tell:</div><div class='del'>-	@echo  VPATH is set to: \"$(VPATH)\"</div><div class='del'>-	@echo  prefix is set to: \"$(prefix)\"</div><div class='del'>-	@echo -e INCPATH,LIBPATH, etc. are set to:'\n' \</div><div class='del'>- $(addprefix $(D),$(INCPATH)'\n' $(LIBPATH)'\n' $(BINPATH)'\n' \</div><div class='del'>-   $(MANPATH)'\n' $(MAN3PATH)'\n' $(MAN5PATH)'\n')'\n'</div><div class='del'>-</div><div class='del'>-libpng.pc: scripts/libpng.pc.in</div><div class='del'>-	@echo -e Making pkg-config file for this libpng installation..'\n' \</div><div class='del'>-           using PREFIX=\"$(prefix)\"'\n'</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in</div><div class='del'>-	@echo -e Making $(LIBNAME) libpng-config file for this libpng \</div><div class='del'>- installation..'\n' using PREFIX=\"$(prefix)\"'\n'</div><div class='del'>-	( cat $(S)/scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo L_opts=\"-L$(LIBPATH)\"; \</div><div class='del'>-	echo libs=\"-lpng$(CYGDLL) -lz\"; \</div><div class='del'>-	cat $(S)/scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-static: all-static</div><div class='del'>-shared: all-shared</div><div class='del'>-all-static: $(STATLIB) pngtest-stat$(EXE)</div><div class='del'>-all-shared: $(SHAREDLIB) pngtest$(EXE)</div><div class='del'>-</div><div class='del'>-$(STATLIB): $(OBJS)</div><div class='del'>-	ar rc $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-$(SHAREDDEF): scripts/pngwin.def</div><div class='del'>-	cat $&lt; | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' | \</div><div class='del'>-	sed -e 's/\([^;]*\);/;/' &gt; $@</div><div class='del'>-</div><div class='del'>-$(SHAREDLIB): $(OBJSDLL) $(SHAREDDEF)</div><div class='del'>-	$(CC) $(LDSFLAGS) -o $@ $(OBJSDLL) -L. $(LDEXTRA)</div><div class='del'>-</div><div class='del'>-pngtest$(EXE): pngtest.pic.o $(SHAREDLIB)</div><div class='del'>-	$(CC) $(CFLAGS) $&lt; $(LDFLAGS) -o $@</div><div class='del'>-</div><div class='del'>-pngtest-stat$(EXE): pngtest.o $(STATLIB)</div><div class='del'>-	$(CC) -static $(CFLAGS) $&lt; $(LDFLAGS) -o $@</div><div class='del'>-</div><div class='del'>-pngtest.pic.o: pngtest.c</div><div class='del'>-	$(CC) $(CFLAGS) -c $&lt; -o $@</div><div class='del'>-</div><div class='del'>-pngtest.o: pngtest.c png.h pngconf.h</div><div class='del'>-	$(CC) $(CFLAGS) -c $&lt; -o $@</div><div class='del'>-</div><div class='del'>-test: test-static test-shared</div><div class='del'>-</div><div class='del'>-test-static: pngtest-stat$(EXE)</div><div class='del'>-	./pngtest-stat $(S)/pngtest.png</div><div class='del'>-</div><div class='del'>-test-shared: pngtest$(EXE)</div><div class='del'>-	./pngtest $(S)/pngtest.png</div><div class='del'>-</div><div class='del'>-install-static: $(STATLIB) install-headers install-man</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	install -m 644 $(STATLIB) $(DL)/$(LIBNAME).a</div><div class='del'>-	-@rm -f $(DL)/$(STATLIB)</div><div class='del'>-	(cd $(DL); ln -sf $(LIBNAME).a $(STATLIB))</div><div class='del'>-</div><div class='del'>-install-shared: $(SHAREDLIB) libpng.pc libpng-config install-headers install-man</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@/bin/rm -f $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	install -m 644 $(IMPLIB) $(DL)/$(LIBNAME).dll.a</div><div class='del'>-	-@rm -f $(DL)/$(IMPLIB)</div><div class='del'>-	(cd $(DL); ln -sf $(LIBNAME).dll.a $(IMPLIB))</div><div class='del'>-	install -s -m 755 $(SHAREDLIB) $(DB)</div><div class='del'>-	install -m 644 libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-headers:</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	-@rm -f $(DI)/png.h</div><div class='del'>-	-@rm -f $(DI)/pngconf.h</div><div class='del'>-	install -m 644 $(S)/png.h $(S)/pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	-@rm -f $(DI)/libpng</div><div class='del'>-	(cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-man:</div><div class='del'>-	-@if [ ! -d $(D)$(MAN3PATH) ]; then $(MKDIR_P) $(D)$(MAN3PATH); fi</div><div class='del'>-	-@if [ ! -d $(D)$(MAN5PATH) ]; then $(MKDIR_P) $(D)$(MAN5PATH); fi</div><div class='del'>-	install -m 644 $(S)/libpngpf.3 $(S)/libpng.3 $(D)$(MAN3PATH)</div><div class='del'>-	install -m 644 $(S)/png.5 $(D)$(MAN5PATH)</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@/bin/rm -f $(DB)/libpng-config</div><div class='del'>-	-@/bin/rm -f $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); ln -sf $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-# Run this to verify that a future `configure' run will pick up the settings</div><div class='del'>-# you want.</div><div class='del'>-test-config-install: SHELL=/bin/bash</div><div class='del'>-test-config-install: $(DB)/libpng-config</div><div class='del'>-	@echo -e Testing libpng-config functions...'\n'</div><div class='del'>-	@ for TYRA in LDFLAGS CPPFLAGS CFLAGS LIBS VERSION; \</div><div class='del'>-   do \</div><div class='del'>-    printf "(%d)\t %10s =%s\n" $$(($$gytiu + 1)) $$TYRA \</div><div class='del'>-    "$$($(DB)/libpng-config `echo --$$TYRA |tr '[:upper:]' '[:lower:]'`)"; \</div><div class='del'>-    gytiu=$$(( $$gytiu + 1 )); \</div><div class='del'>-   done</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) -I$(DI) $(CFLAGS) \</div><div class='del'>-	   `$(BINPATH)/libpng14-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(DL) -L$(ZLIBLIB) \</div><div class='del'>-	   -o pngtestd `$(BINPATH)/libpng14-config --ldflags`</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	$(CC) $(CFLAGS) \</div><div class='del'>-	   `$(BINPATH)/libpng14-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(ZLIBLIB) \</div><div class='del'>-	   -o pngtesti$(EXE) `$(BINPATH)/libpng14-config --ldflags`</div><div class='del'>-	./pngtesti$(EXE) pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	/bin/rm -f *.pic.o *.o $(STATLIB) $(IMPLIB) $(SHAREDLIB) \</div><div class='del'>-	pngtest-stat$(EXE) pngtest$(EXE) pngout.png $(SHAREDDEF) \</div><div class='del'>-	libpng-config libpng.pc pngtesti$(EXE)</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-.PHONY: buildsetup-tell libpng.pc libpng-config test-config-install clean</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o png.pic.o:		png.h pngconf.h pngpriv.h png.c</div><div class='del'>-pngerror.o pngerror.pic.o:	png.h pngconf.h pngpriv.h pngerror.c</div><div class='del'>-pngrio.o pngrio.pic.o:		png.h pngconf.h pngpriv.h pngrio.c</div><div class='del'>-pngwio.o pngwio.pic.o:		png.h pngconf.h pngpriv.h pngwio.c</div><div class='del'>-pngmem.o pngmem.pic.o:		png.h pngconf.h pngpriv.h pngmem.c</div><div class='del'>-pngset.o pngset.pic.o:		png.h pngconf.h pngpriv.h pngset.c</div><div class='del'>-pngget.o pngget.pic.o:		png.h pngconf.h pngpriv.h pngget.c</div><div class='del'>-pngread.o pngread.pic.o:	png.h pngconf.h pngpriv.h pngread.c</div><div class='del'>-pngrtran.o pngrtran.pic.o:	png.h pngconf.h pngpriv.h pngrtran.c</div><div class='del'>-pngrutil.o pngrutil.pic.o:	png.h pngconf.h pngpriv.h pngrutil.c</div><div class='del'>-pngtrans.o pngtrans.pic.o:	png.h pngconf.h pngpriv.h pngtrans.c</div><div class='del'>-pngwrite.o pngwrite.pic.o:	png.h pngconf.h pngpriv.h pngwrite.c</div><div class='del'>-pngwtran.o pngwtran.pic.o:	png.h pngconf.h pngpriv.h pngwtran.c</div><div class='del'>-pngwutil.o pngwutil.pic.o:	png.h pngconf.h pngpriv.h pngwutil.c</div><div class='del'>-pngpread.o pngpread.pic.o:	png.h pngconf.h pngpriv.h pngpread.c</div><div class='del'>-</div><div class='del'>-pngtest.o:			png.h pngconf.h pngtest.c</div><div class='del'>-pngtest-stat.o:			png.h pngconf.h pngtest.c</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.darwin b/src/3rdparty/libpng/scripts/makefile.darwin<br/>deleted file mode 100644<br/>index a35ad70..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.darwin?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.darwin</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,237 +0,0 @@</div><div class='del'>-# makefile for libpng on Darwin / Mac OS X</div><div class='del'>-# Copyright (C) 2002, 2004, 2006, 2008 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 2001 Christoph Pfisterer</div><div class='del'>-# derived from makefile.linux:</div><div class='del'>-#  Copyright (C) 1998, 1999 Greg Roelofs</div><div class='del'>-#  Copyright (C) 1996, 1997 Andreas Dilger</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# where "make install" puts libpng.a, libpng14.dylib, png.h and pngconf.h</div><div class='del'>-prefix=/usr/local</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-#ZLIBLIB=/usr/local/lib</div><div class='del'>-#ZLIBINC=/usr/local/include</div><div class='del'>-ZLIBLIB=../zlib</div><div class='del'>-ZLIBINC=../zlib</div><div class='del'>-</div><div class='del'>-# Library name:</div><div class='del'>-LIBNAME = libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Shared library names:</div><div class='del'>-LIBSO=$(LIBNAME).dylib</div><div class='del'>-LIBSOMAJ=$(LIBNAME).$(PNGMAJ).dylib</div><div class='del'>-LIBSOVER=$(LIBNAME).$(PNGVER).dylib</div><div class='del'>-OLDSO=libpng.dylib</div><div class='del'>-OLDSOMAJ=libpng.14.dylib</div><div class='del'>-OLDSOVER=libpng.14.$(PNGMIN).dylib</div><div class='del'>-</div><div class='del'>-# Utilities:</div><div class='del'>-CC=cc</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-MKDIR_P=mkdir -p</div><div class='del'>-LN_SF=ln -sf</div><div class='del'>-RANLIB=ranlib</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-# CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops</div><div class='del'>-CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops</div><div class='del'>-LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz</div><div class='del'>-</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DB=$(DESTDIR)$(BINPATH)</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-DM=$(DESTDIR)$(MANPATH)</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-OBJSDLL = $(OBJS:.o=.pic.o)</div><div class='del'>-</div><div class='del'>-.SUFFIXES:      .c .o .pic.o</div><div class='del'>-</div><div class='del'>-.c.pic.o:</div><div class='del'>-	$(CC) -c $(CFLAGS) -fno-common -o $@ $*.c</div><div class='del'>-</div><div class='del'>-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-libpng.pc:</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config:</div><div class='del'>-	( cat scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo L_opts=\"-L$(LIBPATH)\"; \</div><div class='del'>-	echo libs=\"-lpng14 -lz\"; \</div><div class='del'>-	cat scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-$(LIBSO): $(LIBSOMAJ)</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)</div><div class='del'>-</div><div class='del'>-$(LIBSOMAJ): $(LIBSOVER)</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(LIBSOVER): $(OBJSDLL)</div><div class='del'>-	$(CC) -dynamiclib \</div><div class='del'>-	 -install_name $(LIBPATH)/$(LIBSOMAJ) \</div><div class='del'>-	 -current_version 14 -compatibility_version 14 \</div><div class='del'>-	 -o $(LIBSOVER) \</div><div class='del'>-	 $(OBJSDLL) -L$(ZLIBLIB) -lz</div><div class='del'>-</div><div class='del'>-$(OLDSOVER): $(OBJSDLL)</div><div class='del'>-	$(CC) -dynamiclib \</div><div class='del'>-	 -install_name $(LIBPATH)/$(OLDSOMAJ) \</div><div class='del'>-	 -current_version 14 -compatibility_version 14 \</div><div class='del'>-	 -o $(OLDSOVER) \</div><div class='del'>-	 $(OBJSDLL) -L$(ZLIBLIB) -lz</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o $(LIBSO)</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install-headers: png.h pngconf.h</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-static: install-headers libpng.a</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	cp libpng.a $(DL)/$(LIBNAME).a</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME).a</div><div class='del'>-	$(RANLIB) $(DL)/$(LIBNAME).a</div><div class='del'>-	-@$(RM_F) $(DL)/libpng.a</div><div class='del'>-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)</div><div class='del'>-</div><div class='del'>-install-shared: install-headers $(LIBSO) libpng.pc \</div><div class='del'>-	$(OLDSOVER)</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBNAME).$(PNGVER)*.dylib</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBNAME).$(PNGMAJ)*.dylib</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/libpng.3.$(PNGMIN)*.dylib</div><div class='del'>-	cp $(LIBSOVER) $(DL)</div><div class='del'>-	cp $(OLDSOVER) $(DL)</div><div class='del'>-	chmod 755 $(DL)/$(LIBSOVER)</div><div class='del'>-	chmod 755 $(DL)/$(OLDSOVER)</div><div class='del'>-	(cd $(DL); \</div><div class='del'>-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \</div><div class='del'>-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO))</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-man: libpng.3 libpngpf.3 png.5</div><div class='del'>-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi</div><div class='del'>-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpng.3</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpngpf.3</div><div class='del'>-	cp libpng.3 $(DM)/man3</div><div class='del'>-	cp libpngpf.3 $(DM)/man3</div><div class='del'>-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man5/png.5</div><div class='del'>-	cp png.5 $(DM)/man5</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@$(RM_F) $(DB)/libpng-config</div><div class='del'>-	-@$(RM_F) $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) -I$(DI) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(DL) -L$(ZLIBLIB) \</div><div class='del'>-	   -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	$(CC) $(CFLAGS) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(ZLIBLIB) \</div><div class='del'>-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtesti pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o libpng.a pngtest pngout.png libpng-config \</div><div class='del'>-	$(OLDSOVER) \</div><div class='del'>-	libpng.pc $(LIBNAME).*dylib pngtesti</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o png.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o pngerror.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o pngrio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o pngwio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o pngmem.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o pngset.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o pngget.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o pngread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o pngrtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o pngrutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o pngtrans.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o pngwrite.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.dec b/src/3rdparty/libpng/scripts/makefile.dec<br/>deleted file mode 100644<br/>index eb1fd14..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.dec?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.dec</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,217 +0,0 @@</div><div class='del'>-# makefile for libpng on DEC Alpha Unix</div><div class='del'>-# Copyright (C) 2000-2002, 2006 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Library name:</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-LIBNAME = libpng14</div><div class='del'>-</div><div class='del'>-# Shared library names:</div><div class='del'>-LIBSO=$(LIBNAME).so</div><div class='del'>-LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)</div><div class='del'>-LIBSOVER=$(LIBNAME).so.$(PNGVER)</div><div class='del'>-OLDSO=libpng.so</div><div class='del'>-OLDSOMAJ=libpng.so.14</div><div class='del'>-OLDSOVER=libpng.so.14.$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Utilities:</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-CC=cc</div><div class='del'>-MKDIR_P=mkdir</div><div class='del'>-LN_SF=ln -f -s</div><div class='del'>-RANLIB=ranlib</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-# where make install puts libpng.a and png.h</div><div class='del'>-prefix=/usr/local</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DB=$(DESTDIR)$(BINPATH)</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-DM=$(DESTDIR)$(MANPATH)</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-#ZLIBLIB=/usr/local/lib</div><div class='del'>-#ZLIBINC=/usr/local/include</div><div class='del'>-ZLIBLIB=../zlib</div><div class='del'>-ZLIBINC=../zlib</div><div class='del'>-</div><div class='del'>-CFLAGS=-std -w1 -I$(ZLIBINC) -O # -g -DPNG_DEBUG=1</div><div class='del'>-LDFLAGS=-L$(ZLIBLIB) -rpath $(ZLIBLIB) libpng.a -lz -lm</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-all: $(LIBSO) libpng.a pngtest libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@  $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-libpng.pc:</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz\ -lm! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config:</div><div class='del'>-	( cat scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo ccopts=\"-std\"; \</div><div class='del'>-	echo L_opts=\"-L$(LIBPATH)\"; \</div><div class='del'>-	echo libs=\"-lpng14 -lz -lm\"; \</div><div class='del'>-	cat scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-$(LIBSO): $(LIBSOMAJ)</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)</div><div class='del'>-</div><div class='del'>-$(LIBSOMAJ): $(LIBSOVER)</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(LIBSOVER): $(OBJS)</div><div class='del'>-	$(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \</div><div class='del'>-	-soname $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(OLDSOVER): $(OBJS)</div><div class='del'>-	$(CC) -shared -o $@ $(OBJS) -L$(ZLIBLIB) \</div><div class='del'>-	-soname $(OLDSOMAJ)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o libpng.a</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install-headers: png.h pngconf.h</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h</div><div class='del'>-	-@/bin/rm -f $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF)(LIBNAME) libpng; $(LN_SF)(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-static: install-headers libpng.a</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	cp libpng.a $(DL)/$(LIBNAME).a</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME).a</div><div class='del'>-	-@/bin/rm -f $(DL)/libpng.a</div><div class='del'>-	(cd $(DL); $(LN_SF)(LIBNAME).a libpng.a)</div><div class='del'>-</div><div class='del'>-install-shared: install-headers $(LIBSOVER) libpng.pc \</div><div class='del'>-	$(OLDSOVER)</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@/bin/rm -f $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)</div><div class='del'>-	-@/bin/rm -f $(DL)/$(LIBSOMAJ)</div><div class='del'>-	-@/bin/rm -f $(DL)/$(OLDSO)</div><div class='del'>-	-@/bin/rm -f $(DL)/$(OLDSOMAJ)</div><div class='del'>-	-@/bin/rm -f $(DL)/$(OLDSOVER)*</div><div class='del'>-	cp $(LIBSOVER) $(DL)</div><div class='del'>-	cp $(OLDSOVER) $(DL)</div><div class='del'>-	chmod 755 $(DL)/$(LIBSOVER)</div><div class='del'>-	chmod 755 $(DL)/$(OLDSOVER)</div><div class='del'>-	(cd $(DL); \</div><div class='del'>-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \</div><div class='del'>-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \</div><div class='del'>-	$(LN_SF)(LIBSOVER) $(LIBSOMAJ); \</div><div class='del'>-	$(LN_SF)(LIBSOMAJ) $(LIBSO))</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@/bin/rm -f $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; $(LN_SF)(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-man: libpng.3 libpngpf.3 png.5</div><div class='del'>-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi</div><div class='del'>-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi</div><div class='del'>-	-@/bin/rm -f $(DM)/man3/libpng.3</div><div class='del'>-	-@/bin/rm -f $(DM)/man3/libpngpf.3</div><div class='del'>-	cp libpng.3 $(DM)/man3</div><div class='del'>-	cp libpngpf.3 $(DM)/man3</div><div class='del'>-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi</div><div class='del'>-	-@/bin/rm -f $(DM)/man5/png.5</div><div class='del'>-	cp png.5 $(DM)/man5</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@/bin/rm -f $(DB)/libpng-config</div><div class='del'>-	-@/bin/rm -f $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); $(LN_SF)(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) -w1 -I$(DI) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(DL) -L$(ZLIBLIB)  -R$(ZLIBLIB) -R$(DL) \</div><div class='del'>-	   -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library.</div><div class='del'>-	$(CC) -w1 -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(ZLIBLIB) -R$(ZLIBLIB) \</div><div class='del'>-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtesti pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	/bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \</div><div class='del'>-	libpng-config $(LIBSO) $(LIBSOMAJ)* \</div><div class='del'>-	$(OLDSOVER) \</div><div class='del'>-	libpng.pc</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.dj2 b/src/3rdparty/libpng/scripts/makefile.dj2<br/>deleted file mode 100644<br/>index 021e969..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.dj2?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.dj2</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-# DJGPP (DOS gcc) makefile for libpng</div><div class='del'>-# Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# where make install will put libpng.a and png.h</div><div class='del'>-#prefix=/usr/local</div><div class='del'>-prefix=.</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(prefix)/lib</div><div class='del'>-</div><div class='del'>-CC=gcc</div><div class='del'>-CFLAGS=-I../zlib -O</div><div class='del'>-LDFLAGS=-L. -L../zlib/ -lpng -lz -lm</div><div class='del'>-</div><div class='del'>-RANLIB=ranlib</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o pngwtran.o \</div><div class='del'>-	pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-all: libpng.a pngtest</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	ar rc $@  $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o libpng.a</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-	coff2exe pngtest</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-clean:</div><div class='del'>-	rm -f *.o libpng.a pngtest pngout.png</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.elf b/src/3rdparty/libpng/scripts/makefile.elf<br/>deleted file mode 100644<br/>index 7d70af1..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.elf?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.elf</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,279 +0,0 @@</div><div class='del'>-# makefile for libpng.a and libpng14.so on Linux ELF with gcc</div><div class='del'>-# Copyright (C) 1998, 1999, 2002, 2006, 2008 Greg Roelofs</div><div class='del'>-# and Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1996, 1997 Andreas Dilger</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Modified for Debian by Junichi Uekawa and Josselin Mouette</div><div class='del'>-# Major modifications are:</div><div class='del'>-#    * link libpng explicitly with libz and libm</div><div class='del'>-#    * $(OLDSO).14 is a symlink rather than a different library</div><div class='del'>-#    * versioned symbols</div><div class='del'>-</div><div class='del'>-# Library name:</div><div class='del'>-LIBNAME = libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Shared library names:</div><div class='del'>-LIBSO=$(LIBNAME).so</div><div class='del'>-LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)</div><div class='del'>-LIBSOVER=$(LIBNAME).so.$(PNGVER)</div><div class='del'>-OLDSO=libpng.so</div><div class='del'>-OLDSOMAJ=libpng.so.14</div><div class='del'>-OLDSOVER=libpng.so.14.$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Utilities:</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-CC=gcc</div><div class='del'>-MKDIR_P=mkdir -p</div><div class='del'>-LN_SF=ln -sf</div><div class='del'>-RANLIB=ranlib</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-# where "make install" puts libpng14.a, libpng14.so*,</div><div class='del'>-# libpng14/png.h and libpng14/pngconf.h</div><div class='del'>-# Prefix must be a full pathname.</div><div class='del'>-prefix=/usr/local</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located.</div><div class='del'>-ZLIBLIB=/usr/local/lib</div><div class='del'>-ZLIBINC=/usr/local/include</div><div class='del'>-# ZLIBLIB=../zlib</div><div class='del'>-# ZLIBINC=../zlib</div><div class='del'>-</div><div class='del'>-ALIGN=</div><div class='del'>-# for i386:</div><div class='del'>-#ALIGN=-malign-loops=2 -malign-functions=2</div><div class='del'>-</div><div class='del'>-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \</div><div class='del'>-	-Wmissing-declarations -Wtraditional -Wcast-align \</div><div class='del'>-	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion</div><div class='del'>-</div><div class='del'>-# for pgcc version 2.95.1, -O3 is buggy; don't use it.</div><div class='del'>-</div><div class='del'>-CFLAGS=-W -Wall -D_REENTRANT -O2 \</div><div class='del'>-	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5</div><div class='del'>-</div><div class='del'>-LDFLAGS=-L. -lpng14</div><div class='del'>-LDFLAGS_A=libpng.a -lz -lm</div><div class='del'>-LIBADDFLAGS=-lz -lm</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DB=$(DESTDIR)$(BINPATH)</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-DM=$(DESTDIR)$(MANPATH)</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-OBJSDLL = $(OBJS:.o=.pic.o)</div><div class='del'>-</div><div class='del'>-.SUFFIXES:      .c .o .pic.o</div><div class='del'>-</div><div class='del'>-.c.pic.o:</div><div class='del'>-	$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c</div><div class='del'>-</div><div class='del'>-all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-libpng.pc:</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz\ -lm! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng.syms: png.h pngconf.h</div><div class='del'>-	$(CC) $(CFLAGS) -E -DPNG_BUILDSYMS -DPNG_INTERNAL png.h |\</div><div class='del'>-	awk -F '[\t [\\]();]' -v PNGMAJ=$(PNGMAJ) 'BEGIN{printf("PNG14_%s {global:\n",PNGMAJ)}\</div><div class='del'>-	{ for (i=1;i+2&lt;=NF;++i)\</div><div class='del'>-		if ($$(i)=="PNG_FUNCTION_EXPORT" &amp;&amp; $$(i+2)=="END")\</div><div class='del'>-			print $$(i+1) ";";\</div><div class='del'>-	for (i=1;i+1&lt;=NF;++i)\</div><div class='del'>-		if ($$(i)=="PNG_DATA_EXPORT")\</div><div class='del'>-			print $$(i+1) ";";}\</div><div class='del'>-	END{print "local: *; };"}' &gt;$@.new</div><div class='del'>-	$(RM_F) $@</div><div class='del'>-	mv $@.new $@</div><div class='del'>-</div><div class='del'>-libpng-config:</div><div class='del'>-	( cat scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo L_opts=\"\"; \</div><div class='del'>-	echo R_opts=\"\"; \</div><div class='del'>-	echo libs=\"-lpng14\"; \</div><div class='del'>-	echo all_libs=\"-lpng14 $(LIBADDFLAGS)\"; \</div><div class='del'>-	cat scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-$(LIBSO): $(LIBSOMAJ)</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)</div><div class='del'>-</div><div class='del'>-$(LIBSOMAJ): $(LIBSOVER)</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(LIBSOVER): $(OBJSDLL) libpng.syms</div><div class='del'>-	$(CC) -shared -Wl,-soname,$(LIBSOMAJ) \</div><div class='del'>-	-Wl,-version-script,libpng.syms \</div><div class='del'>-	-o $(LIBSOVER) \</div><div class='del'>-	$(OBJSDLL)</div><div class='del'>-</div><div class='del'>-$(OLDSOVER): $(OBJSDLL) libpng.syms</div><div class='del'>-	$(CC) -shared -Wl,-soname,$(OLDSOMAJ) \</div><div class='del'>-	-Wl,-version-script,libpng.syms \</div><div class='del'>-	-o $(OLDSOVER) \</div><div class='del'>-	$(OBJSDLL)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o $(LIBSO)</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-pngtest-static: pngtest.o libpng.a</div><div class='del'>-	$(CC) -o pngtest-static $(CFLAGS) pngtest.o $(LDFLAGS_A)</div><div class='del'>-</div><div class='del'>-test: pngtest pngtest-static</div><div class='del'>-	@echo ""</div><div class='del'>-	@echo "   Running pngtest dynamically linked with $(LIBSO):"</div><div class='del'>-	@echo ""</div><div class='del'>-	LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}" ./pngtest</div><div class='del'>-	@echo ""</div><div class='del'>-	@echo "   Running pngtest statically linked with libpng.a:"</div><div class='del'>-	@echo ""</div><div class='del'>-	./pngtest-static</div><div class='del'>-</div><div class='del'>-install-headers: png.h pngconf.h</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-static: install-headers libpng.a</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	cp libpng.a $(DL)/$(LIBNAME).a</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME).a</div><div class='del'>-	-@$(RM_F) $(DL)/libpng.a</div><div class='del'>-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)</div><div class='del'>-</div><div class='del'>-install-shared: install-headers $(LIBSOVER) libpng.pc \</div><div class='del'>-	$(OLDSOVER)</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOVER)*</div><div class='del'>-	cp $(LIBSOVER) $(DL)</div><div class='del'>-	cp $(OLDSOVER) $(DL)</div><div class='del'>-	chmod 755 $(DL)/$(LIBSOVER)</div><div class='del'>-	chmod 755 $(DL)/$(OLDSOVER)</div><div class='del'>-	(cd $(DL); \</div><div class='del'>-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \</div><div class='del'>-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO))</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-man: libpng.3 libpngpf.3 png.5</div><div class='del'>-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi</div><div class='del'>-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpng.3</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpngpf.3</div><div class='del'>-	cp libpng.3 $(DM)/man3</div><div class='del'>-	cp libpngpf.3 $(DM)/man3</div><div class='del'>-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man5/png.5</div><div class='del'>-	cp png.5 $(DM)/man5</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@$(RM_F) $(DB)/libpng-config</div><div class='del'>-	-@$(RM_F) $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) -I$(DI) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(DL) -L$(ZLIBLIB) -Wl, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \</div><div class='del'>-	   -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	$(CC) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \</div><div class='del'>-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtesti pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o libpng.a libpng.syms pngtest pngout.png libpng-config \</div><div class='del'>-	$(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \</div><div class='del'>-	$(OLDSOVER) \</div><div class='del'>-	libpng.pc</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o png.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o pngerror.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o pngrio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o pngwio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o pngmem.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o pngset.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o pngget.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o pngread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o pngrtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o pngrutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o pngtrans.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o pngwrite.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.freebsd b/src/3rdparty/libpng/scripts/makefile.freebsd<br/>deleted file mode 100644<br/>index c0014af..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.freebsd?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.freebsd</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-# makefile for libpng under FreeBSD</div><div class='del'>-# Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-PREFIX?=        /usr/local</div><div class='del'>-SHLIB_VER?=     14</div><div class='del'>-</div><div class='del'>-LIB=		png</div><div class='del'>-SHLIB_MAJOR=	${SHLIB_VER}</div><div class='del'>-SHLIB_MINOR=	0</div><div class='del'>-NOPROFILE=	YES</div><div class='del'>-NOOBJ=          YES</div><div class='del'>-</div><div class='del'>-# where make install puts libpng.a and png.h</div><div class='del'>-DESTDIR=	${PREFIX}</div><div class='del'>-LIBDIR=		/lib</div><div class='del'>-INCS=		png.h pngconf.h pngpriv.h</div><div class='del'>-INCSDIR=	/include/libpng</div><div class='del'>-INCDIR=		${INCSDIR}		# for 4.x bsd.lib.mk</div><div class='del'>-MAN=		libpng.3 libpngpf.3 png.5</div><div class='del'>-MANDIR=		/man/man</div><div class='del'>-SYMLINKS=       libpng/png.h ${INCSDIR}/../png.h \</div><div class='del'>-		libpng/pngconf.h ${INCSDIR}/../pngconf.h</div><div class='del'>-LDADD+=         -lm -lz</div><div class='del'>-DPADD+=         ${LIBM} ${LIBZ}</div><div class='del'>-</div><div class='del'>-CFLAGS+= -I.</div><div class='del'>-</div><div class='del'>-SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \</div><div class='del'>-	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \</div><div class='del'>-	pngwtran.c pngmem.c pngerror.c pngpread.c</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o libpng.a</div><div class='del'>-	${CC} ${CFLAGS} -L. -static -o pngtest pngtest.o -lpng -lz -lm</div><div class='del'>-</div><div class='del'>-CLEANFILES= pngtest pngtest.o pngout.png</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-.include &lt;bsd.lib.mk&gt;</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.gcc b/src/3rdparty/libpng/scripts/makefile.gcc<br/>deleted file mode 100644<br/>index b31adee..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.gcc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.gcc</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +0,0 @@</div><div class='del'>-# makefile for libpng using gcc (generic, static library)</div><div class='del'>-# Copyright (C) 2008 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 2000 Cosmin Truta</div><div class='del'>-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Location of the zlib library and include files</div><div class='del'>-ZLIBINC = ../zlib</div><div class='del'>-ZLIBLIB = ../zlib</div><div class='del'>-</div><div class='del'>-# Compiler, linker, lib and other tools</div><div class='del'>-CC = gcc</div><div class='del'>-LD = $(CC)</div><div class='del'>-AR_RC = ar rcs</div><div class='del'>-RANLIB = ranlib</div><div class='del'>-RM_F = rm -f</div><div class='del'>-</div><div class='del'>-CDEBUG = -g -DPNG_DEBUG=5</div><div class='del'>-LDDEBUG =</div><div class='del'>-CRELEASE = -O2</div><div class='del'>-LDRELEASE = -s</div><div class='del'>-#CFLAGS = -W -Wall $(CDEBUG)</div><div class='del'>-CFLAGS = -W -Wall $(CRELEASE)</div><div class='del'>-#LDFLAGS = $(LDDEBUG)</div><div class='del'>-LDFLAGS = $(LDRELEASE)</div><div class='del'>-LIBS = -lz -lm</div><div class='del'>-</div><div class='del'>-# File extensions</div><div class='del'>-O=.o</div><div class='del'>-A=.a</div><div class='del'>-EXE=</div><div class='del'>-</div><div class='del'>-# Variables</div><div class='del'>-OBJS =  png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \</div><div class='del'>-	pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \</div><div class='del'>-	pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)</div><div class='del'>-</div><div class='del'>-# Targets</div><div class='del'>-all: static</div><div class='del'>-</div><div class='del'>-.c$(O):</div><div class='del'>-	$(CC) -c $(CFLAGS) -I$(ZLIBINC) $&lt;</div><div class='del'>-</div><div class='del'>-static: libpng$(A) pngtest$(EXE)</div><div class='del'>-</div><div class='del'>-shared:</div><div class='del'>-	@echo This is a generic makefile that cannot create shared libraries.</div><div class='del'>-	@echo Please use a configuration that is specific to your platform.</div><div class='del'>-	@false</div><div class='del'>-</div><div class='del'>-libpng$(A): $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-test: pngtest$(EXE)</div><div class='del'>-	./pngtest$(EXE)</div><div class='del'>-</div><div class='del'>-pngtest$(EXE): pngtest$(O) libpng$(A)</div><div class='del'>-	$(LD) $(LDFLAGS) -L$(ZLIBLIB) -o $@ pngtest$(O) libpng$(A) $(LIBS)</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *$(O) libpng$(A) pngtest$(EXE) pngout.png</div><div class='del'>-</div><div class='del'>-png$(O):      png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngget$(O):   png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem$(O):   png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngread$(O):  png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio$(O):   png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngset$(O):   png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio$(O):   png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest$(O):  png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.hp64 b/src/3rdparty/libpng/scripts/makefile.hp64<br/>deleted file mode 100644<br/>index 300421a..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.hp64?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.hp64</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,239 +0,0 @@</div><div class='del'>-# makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product.</div><div class='del'>-# Copyright (C) 1999-2002, 2006, 2009 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1995 Guy Eric Schalnat, Group 42</div><div class='del'>-# contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-ZLIBLIB=/opt/zlib/lib</div><div class='del'>-ZLIBINC=/opt/zlib/include</div><div class='del'>-</div><div class='del'>-# Note that if you plan to build a libpng shared library, zlib must also</div><div class='del'>-# be a shared library, which zlib's configure does not do.  After running</div><div class='del'>-# zlib's configure, edit the appropriate lines of makefile to read:</div><div class='del'>-#   CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \</div><div class='del'>-#   LDSHARED=ld -b</div><div class='del'>-#   SHAREDLIB=libz.sl</div><div class='del'>-</div><div class='del'>-# Library name:</div><div class='del'>-LIBNAME = libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Shared library names:</div><div class='del'>-LIBSO=$(LIBNAME).sl</div><div class='del'>-LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)</div><div class='del'>-LIBSOVER=$(LIBNAME).sl.$(PNGVER)</div><div class='del'>-OLDSO=libpng.sl</div><div class='del'>-OLDSOMAJ=libpng.sl.14</div><div class='del'>-OLDSOVER=libpng.sl.14.$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Utilities:</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-CC=cc</div><div class='del'>-MKDIR_P=mkdir -p</div><div class='del'>-LN_SF=ln -sf</div><div class='del'>-RANLIB=ranlib</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-CFLAGS=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \</div><div class='del'>--D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +Z -DHAVE_UNISTD_H -DUSE_MMAP</div><div class='del'>-# Caution: be sure you have built zlib with the same CFLAGS.</div><div class='del'>-CCFLAGS=-I$(ZLIBINC) -O -Ae -Wl,+vnocompatwarnings +DD64 \</div><div class='del'>--D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +Z -DHAVE_UNISTD_H -DUSE_MMAP</div><div class='del'>-</div><div class='del'>-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm</div><div class='del'>-</div><div class='del'>-# where make install puts libpng.a, libpng14.sl, and png.h</div><div class='del'>-prefix=/opt/libpng</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DB=$(DESTDIR)$(BINPATH)</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-DM=$(DESTDIR)$(MANPATH)</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-OBJSDLL = $(OBJS:.o=.pic.o)</div><div class='del'>-</div><div class='del'>-.SUFFIXES:	.c .o .pic.o</div><div class='del'>-</div><div class='del'>-.c.pic.o:</div><div class='del'>-	$(CC) -c $(CFLAGS) +z -o $@ $*.c</div><div class='del'>-</div><div class='del'>-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-libpng.pc:</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz\ -lm! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config:</div><div class='del'>-	( cat scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \</div><div class='del'>-	echo L_opts=\"-L$(LIBPATH)\"; \</div><div class='del'>-	echo libs=\"-lpng14 -lz -lm\"; \</div><div class='del'>-	cat scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-$(LIBSO): $(LIBSOMAJ)</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)</div><div class='del'>-</div><div class='del'>-$(LIBSOMAJ): $(LIBSOVER)</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(LIBSOVER): $(OBJSDLL)</div><div class='del'>-	$(LD) -b +s \</div><div class='del'>-	+h $(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-$(OLDSOVER): $(OBJSDLL)</div><div class='del'>-	$(LD) -b +s \</div><div class='del'>-	+h $(OLDSOMAJ) -o $(OLDSOVER) $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o libpng.a</div><div class='del'>-	$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install-headers: png.h pngconf.h</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-static: install-headers libpng.a</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	cp libpng.a $(DL)/$(LIBNAME).a</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME).a</div><div class='del'>-	-@$(RM_F) $(DL)/libpng.a</div><div class='del'>-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)</div><div class='del'>-</div><div class='del'>-install-shared: install-headers $(LIBSOVER) libpng.pc \</div><div class='del'>-	$(OLDSOVER)</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOVER)*</div><div class='del'>-	cp $(LIBSOVER) $(DL)</div><div class='del'>-	cp $(OLDSOVER) $(DL)</div><div class='del'>-	chmod 755 $(DL)/$(LIBSOVER)</div><div class='del'>-	chmod 755 $(DL)/$(OLDSOVER)</div><div class='del'>-	(cd $(DL); \</div><div class='del'>-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \</div><div class='del'>-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO))</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-man: libpng.3 libpngpf.3 png.5</div><div class='del'>-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi</div><div class='del'>-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpng.3</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpngpf.3</div><div class='del'>-	cp libpng.3 $(DM)/man3</div><div class='del'>-	cp libpngpf.3 $(DM)/man3</div><div class='del'>-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man5/png.5</div><div class='del'>-	cp png.5 $(DM)/man5</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@$(RM_F) $(DB)/libpng-config</div><div class='del'>-	-@$(RM_F) $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) -I$(DI) -I$(ZLIBINC) $(CCFLAGS) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(DL) -L$(ZLIBLIB) \</div><div class='del'>-	   -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library.</div><div class='del'>-	$(CC) $(CCFLAGS) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(ZLIBLIB) \</div><div class='del'>-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtesti pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o libpng.a pngtest pngtesti pngout.png \</div><div class='del'>-	libpng-config $(LIBSO) $(LIBSOMAJ)* \</div><div class='del'>-	$(OLDSOVER) \</div><div class='del'>-	libpng.pc</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.hpgcc b/src/3rdparty/libpng/scripts/makefile.hpgcc<br/>deleted file mode 100644<br/>index 5a147e6..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.hpgcc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.hpgcc</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,248 +0,0 @@</div><div class='del'>-# makefile for libpng on HP-UX using GCC with the HP ANSI/C linker.</div><div class='del'>-# Copyright (C) 2002, 2006-2008 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 2001, Laurent faillie</div><div class='del'>-# Copyright (C) 1998, 1999 Greg Roelofs</div><div class='del'>-# Copyright (C) 1996, 1997 Andreas Dilger</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Library name:</div><div class='del'>-LIBNAME = libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Shared library names:</div><div class='del'>-LIBSO=$(LIBNAME).sl</div><div class='del'>-LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)</div><div class='del'>-LIBSOVER=$(LIBNAME).sl.$(PNGVER)</div><div class='del'>-OLDSO=libpng.sl</div><div class='del'>-OLDSOMAJ=libpng.sl.14</div><div class='del'>-OLDSOVER=libpng.sl.14.$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Utilities:</div><div class='del'>-CC=gcc</div><div class='del'>-LD=ld</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-MKDIR_P=mkdir -p</div><div class='del'>-LN_SF=ln -sf</div><div class='del'>-RANLIB=ranlib</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-# where "make install" puts libpng.a, $(OLDSO)*, png.h and pngconf.h</div><div class='del'>-prefix=/usr/local</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-ZLIBLIB=/opt/zlib/lib</div><div class='del'>-ZLIBINC=/opt/zlib/include</div><div class='del'>-</div><div class='del'>-# Note that if you plan to build a libpng shared library, zlib must also</div><div class='del'>-# be a shared library, which zlib's configure does not do.  After running</div><div class='del'>-# zlib's configure, edit the appropriate lines of makefile to read:</div><div class='del'>-#   CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \</div><div class='del'>-#   LDSHARED=ld -b</div><div class='del'>-#   SHAREDLIB=libz.sl</div><div class='del'>-</div><div class='del'>-ALIGN=</div><div class='del'>-# for i386:</div><div class='del'>-#ALIGN=-malign-loops=2 -malign-functions=2</div><div class='del'>-</div><div class='del'>-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \</div><div class='del'>-	-Wmissing-declarations -Wtraditional -Wcast-align \</div><div class='del'>-	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion</div><div class='del'>-</div><div class='del'>-# for pgcc version 2.95.1, -O3 is buggy; don't use it.</div><div class='del'>-</div><div class='del'>-CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \</div><div class='del'>-	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5</div><div class='del'>-#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng14 -lz -lm</div><div class='del'>-LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz -lm</div><div class='del'>-</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DB=$(DESTDIR)$(BINPATH)</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-DM=$(DESTDIR)$(MANPATH)</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-OBJSDLL = $(OBJS:.o=.pic.o)</div><div class='del'>-</div><div class='del'>-.SUFFIXES:      .c .o .pic.o</div><div class='del'>-</div><div class='del'>-.c.pic.o:</div><div class='del'>-	$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c</div><div class='del'>-</div><div class='del'>-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-libpng.pc:</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz\ -lm! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config:</div><div class='del'>-	( cat scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo libs=\"-lpng14 -lz -lm\"; \</div><div class='del'>-	cat scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-$(LIBSO): $(LIBSOMAJ)</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)</div><div class='del'>-</div><div class='del'>-$(LIBSOMAJ): $(LIBSOVER)</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(LIBSOVER): $(OBJSDLL)</div><div class='del'>-	$(LD) -b +s \</div><div class='del'>-	+h $(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-$(OLDSOVER): $(OBJSDLL)</div><div class='del'>-	$(LD) -b +s \</div><div class='del'>-	+h $(OLDSOMAJ) -o $(OLDSOVER) $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o $(LIBSO)</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-install-headers: png.h pngconf.h</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-static: install-headers libpng.a</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	cp libpng.a $(DL)/$(LIBNAME).a</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME).a</div><div class='del'>-	-@$(RM_F) $(DL)/libpng.a</div><div class='del'>-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)</div><div class='del'>-</div><div class='del'>-install-shared: install-headers $(LIBSOVER) libpng.pc \</div><div class='del'>-	$(OLDSOVER)</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOVER)*</div><div class='del'>-	cp $(LIBSOVER) $(DL)</div><div class='del'>-	cp $(OLDSOVER) $(DL)</div><div class='del'>-	chmod 755 $(DL)/$(LIBSOVER)</div><div class='del'>-	chmod 755 $(DL)/$(OLDSOVER)</div><div class='del'>-	(cd $(DL); \</div><div class='del'>-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \</div><div class='del'>-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO))</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-man: libpng.3 libpngpf.3 png.5</div><div class='del'>-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi</div><div class='del'>-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpng.3</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpngpf.3</div><div class='del'>-	cp libpng.3 $(DM)/man3</div><div class='del'>-	cp libpngpf.3 $(DM)/man3</div><div class='del'>-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man5/png.5</div><div class='del'>-	cp png.5 $(DM)/man5</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@$(RM_F) $(DB)/libpng-config</div><div class='del'>-	-@$(RM_F) $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) -I$(DI) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(DL) -L$(ZLIBLIB) -Wl,-rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \</div><div class='del'>-	   -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library.</div><div class='del'>-	$(CC) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \</div><div class='del'>-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtesti pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o libpng.a pngtest pngtesti pngout.png \</div><div class='del'>-	libpng-config $(LIBSO) $(LIBSOMAJ)* \</div><div class='del'>-	$(OLDSOVER) \</div><div class='del'>-	libpng.pc</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o png.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o pngerror.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o pngrio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o pngwio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o pngmem.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o pngset.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o pngget.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o pngread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o pngrtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o pngrutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o pngtrans.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o pngwrite.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.hpux b/src/3rdparty/libpng/scripts/makefile.hpux<br/>deleted file mode 100644<br/>index 4966fa9..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.hpux?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.hpux</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,236 +0,0 @@</div><div class='del'>-# makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product.</div><div class='del'>-# Copyright (C) 1999-2002, 2006 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1995 Guy Eric Schalnat, Group 42</div><div class='del'>-# contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-ZLIBLIB=/opt/zlib/lib</div><div class='del'>-ZLIBINC=/opt/zlib/include</div><div class='del'>-</div><div class='del'>-# Note that if you plan to build a libpng shared library, zlib must also</div><div class='del'>-# be a shared library, which zlib's configure does not do.  After running</div><div class='del'>-# zlib's configure, edit the appropriate lines of makefile to read:</div><div class='del'>-#   CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \</div><div class='del'>-#   LDSHARED=ld -b</div><div class='del'>-#   SHAREDLIB=libz.sl</div><div class='del'>-</div><div class='del'>-# Library name:</div><div class='del'>-LIBNAME = libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Shared library names:</div><div class='del'>-LIBSO=$(LIBNAME).sl</div><div class='del'>-LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)</div><div class='del'>-LIBSOVER=$(LIBNAME).sl.$(PNGVER)</div><div class='del'>-OLDSO=libpng.sl</div><div class='del'>-OLDSOMAJ=libpng.sl.14</div><div class='del'>-OLDSOVER=libpng.sl.14.$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Utilities:</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-CC=cc</div><div class='del'>-MKDIR_P=mkdir -p</div><div class='del'>-LN_SF=ln -sf</div><div class='del'>-RANLIB=ranlib</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-# where make install puts libpng.a, libpng14.sl, and png.h</div><div class='del'>-prefix=/opt/libpng</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-</div><div class='del'>-CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0</div><div class='del'>-# Caution: be sure you have built zlib with the same CFLAGS.</div><div class='del'>-CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0</div><div class='del'>-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DB=$(DESTDIR)$(BINPATH)</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-DM=$(DESTDIR)$(MANPATH)</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-OBJSDLL = $(OBJS:.o=.pic.o)</div><div class='del'>-</div><div class='del'>-.SUFFIXES:	.c .o .pic.o</div><div class='del'>-</div><div class='del'>-.c.pic.o:</div><div class='del'>-	$(CC) -c $(CFLAGS) +z -o $@ $*.c</div><div class='del'>-</div><div class='del'>-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-libpng.pc:</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz\ -lm! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config:</div><div class='del'>-	( cat scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \</div><div class='del'>-	echo L_opts=\"-L$(LIBPATH)\"; \</div><div class='del'>-	echo libs=\"-lpng14 -lz -lm\"; \</div><div class='del'>-	cat scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-$(LIBSO): $(LIBSOMAJ)</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)</div><div class='del'>-</div><div class='del'>-$(LIBSOMAJ): $(LIBSOVER)</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(LIBSOVER): $(OBJSDLL)</div><div class='del'>-	$(LD) -b +s \</div><div class='del'>-	+h $(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-$(OLDSOVER): $(OBJSDLL)</div><div class='del'>-	$(LD) -b +s \</div><div class='del'>-	+h $(OLDSOMAJ) -o $(OLDSOVER) $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o libpng.a</div><div class='del'>-	$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install-headers: png.h pngconf.h</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-static: install-headers libpng.a</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	cp libpng.a $(DL)/$(LIBNAME).a</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME).a</div><div class='del'>-	-@$(RM_F) $(DL)/libpng.a</div><div class='del'>-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)</div><div class='del'>-</div><div class='del'>-install-shared: install-headers $(LIBSOVER) libpng.pc \</div><div class='del'>-	$(OLDSOVER)</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOVER)*</div><div class='del'>-	cp $(LIBSOVER) $(DL)</div><div class='del'>-	cp $(OLDSOVER) $(DL)</div><div class='del'>-	chmod 755 $(DL)/$(LIBSOVER)</div><div class='del'>-	chmod 755 $(DL)/$(OLDSOVER)</div><div class='del'>-	(cd $(DL); \</div><div class='del'>-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \</div><div class='del'>-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO))</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-man: libpng.3 libpngpf.3 png.5</div><div class='del'>-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi</div><div class='del'>-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpng.3</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpngpf.3</div><div class='del'>-	cp libpng.3 $(DM)/man3</div><div class='del'>-	cp libpngpf.3 $(DM)/man3</div><div class='del'>-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man5/png.5</div><div class='del'>-	cp png.5 $(DM)/man5</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@$(RM_F) $(DB)/libpng-config</div><div class='del'>-	-@$(RM_F) $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) -I$(DI) -I$(ZLIBINC) $(CCFLAGS) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(DL) -L$(ZLIBLIB) \</div><div class='del'>-	   -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library.</div><div class='del'>-	$(CC) $(CCFLAGS) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(ZLIBLIB) \</div><div class='del'>-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtesti pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o libpng.a pngtest pngtesti pngout.png \</div><div class='del'>-	libpng-config $(LIBSO) $(LIBSOMAJ)* \</div><div class='del'>-	$(OLDSOVER) \</div><div class='del'>-	libpng.pc</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.ibmc b/src/3rdparty/libpng/scripts/makefile.ibmc<br/>deleted file mode 100644<br/>index b0b445a..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.ibmc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.ibmc</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-# Makefile for libpng (static)</div><div class='del'>-# IBM C version 3.x for Win32 and OS/2</div><div class='del'>-# Copyright (C) 2006 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 2000 Cosmin Truta</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-#</div><div class='del'>-# Notes:</div><div class='del'>-#   Derived from makefile.std</div><div class='del'>-#   All modules are compiled in C mode</div><div class='del'>-#   Tested under Win32, expected to work under OS/2</div><div class='del'>-#   Can be easily adapted for IBM VisualAge/C++ for AIX</div><div class='del'>-</div><div class='del'>-# Location of the zlib library and include files</div><div class='del'>-ZLIBINC = ../zlib</div><div class='del'>-ZLIBLIB = ../zlib</div><div class='del'>-</div><div class='del'>-# Compiler, linker, lib and other tools</div><div class='del'>-CC = icc</div><div class='del'>-LD = ilink</div><div class='del'>-AR = ilib</div><div class='del'>-RM = del</div><div class='del'>-</div><div class='del'>-CFLAGS = -I$(ZLIBINC) -Mc -O2 -W3</div><div class='del'>-LDFLAGS =</div><div class='del'>-</div><div class='del'>-# File extensions</div><div class='del'>-O=.obj</div><div class='del'>-A=.lib</div><div class='del'>-E=.exe</div><div class='del'>-</div><div class='del'>-# Variables</div><div class='del'>-OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \</div><div class='del'>-	pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \</div><div class='del'>-	pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)</div><div class='del'>-</div><div class='del'>-LIBS = libpng$(A) $(ZLIBLIB)/zlib$(A)</div><div class='del'>-</div><div class='del'>-# Targets</div><div class='del'>-all: libpng$(A) pngtest$(E)</div><div class='del'>-</div><div class='del'>-libpng$(A): $(OBJS)</div><div class='del'>-	$(AR) -out:$@ $(OBJS)</div><div class='del'>-</div><div class='del'>-test: pngtest$(E)</div><div class='del'>-	pngtest$(E)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest$(E)</div><div class='del'>-</div><div class='del'>-pngtest$(E): pngtest$(O) libpng$(A)</div><div class='del'>-	$(LD) $(LDFLAGS) pngtest$(O) $(LIBS)</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM) *$(O)</div><div class='del'>-	$(RM) libpng$(A)</div><div class='del'>-	$(RM) pngtest$(E)</div><div class='del'>-	$(RM) pngout.png</div><div class='del'>-</div><div class='del'>-png$(O):      png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngget$(O):   png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem$(O):   png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngread$(O):  png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio$(O):   png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngset$(O):   png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio$(O):   png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest$(O):  png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.intel b/src/3rdparty/libpng/scripts/makefile.intel<br/>deleted file mode 100644<br/>index fb705e1..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.intel?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.intel</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,106 +0,0 @@</div><div class='del'>-# Makefile for libpng</div><div class='del'>-# Microsoft Visual C++ with Intel C/C++ Compiler 4.0 and later</div><div class='del'>-</div><div class='del'>-# Copyright (C) 2006 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is</div><div class='del'>-# copyright 1995 Guy Eric Schalnat, Group 42, Inc.</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-#</div><div class='del'>-# To use, do "nmake /f scripts\makefile.intel"</div><div class='del'>-#</div><div class='del'>-# ------------------- Intel C/C++ Compiler 4.0 and later -------------------</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-ZLIBLIB=..\zlib</div><div class='del'>-ZLIBINC=..\zlib</div><div class='del'>-</div><div class='del'>-# Target CPU</div><div class='del'>-CPU=6		# Pentium II</div><div class='del'>-#CPU=5		# Pentium</div><div class='del'>-</div><div class='del'>-# Calling convention</div><div class='del'>-CALLING=r	# __fastcall</div><div class='del'>-#CALLING=z	# __stdcall</div><div class='del'>-#CALLING=d	# __cdecl</div><div class='del'>-</div><div class='del'>-# Uncomment next to put error messages in a file</div><div class='del'>-#ERRFILE=&gt;&gt;pngerrs</div><div class='del'>-</div><div class='del'>-# --------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-CC=icl -c</div><div class='del'>-CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) -nologo</div><div class='del'>-LD=link</div><div class='del'>-LDFLAGS=/SUBSYSTEM:CONSOLE /NOLOGO</div><div class='del'>-</div><div class='del'>-O=.obj</div><div class='del'>-</div><div class='del'>-OBJS=png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O) \</div><div class='del'>-pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O) \</div><div class='del'>-pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)</div><div class='del'>-</div><div class='del'>-all: test</div><div class='del'>-</div><div class='del'>-png$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngset$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngget$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngread$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngpread$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngrtran$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngrutil$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngerror$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngmem$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngrio$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngwio$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngtrans$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngwrite$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngwtran$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngwutil$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-libpng.lib: $(OBJS)</div><div class='del'>-	if exist libpng.lib del libpng.lib</div><div class='del'>-	lib /NOLOGO /OUT:libpng.lib $(OBJS)</div><div class='del'>-</div><div class='del'>-pngtest.exe: pngtest.obj libpng.lib</div><div class='del'>-	$(LD) $(LDFLAGS) /OUT:pngtest.exe pngtest.obj libpng.lib $(ZLIBLIB)\zlib.lib</div><div class='del'>-</div><div class='del'>-pngtest$(O): png.h pngconf.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-test: pngtest.exe</div><div class='del'>-	pngtest.exe</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# End of makefile for libpng</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.knr b/src/3rdparty/libpng/scripts/makefile.knr<br/>deleted file mode 100644<br/>index 75cb1b5..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.knr?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.knr</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,103 +0,0 @@</div><div class='del'>-# makefile for libpng</div><div class='del'>-# Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-#</div><div class='del'>-# This makefile requires the file ansi2knr.c, which you can get</div><div class='del'>-# from the Ghostscript ftp site at ftp://ftp.cs.wisc.edu/ghost/</div><div class='del'>-# If you have libjpeg, you probably already have ansi2knr.c in the jpeg</div><div class='del'>-# source distribution.</div><div class='del'>-</div><div class='del'>-# where make install puts libpng.a and png.h</div><div class='del'>-prefix=/usr/local</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(prefix)/lib</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-CC=cc</div><div class='del'>-CFLAGS=-I../zlib -O</div><div class='del'>-LDFLAGS=-L. -L../zlib/ -lpng -lz -lm</div><div class='del'>-# flags for ansi2knr</div><div class='del'>-ANSI2KNRFLAGS=</div><div class='del'>-</div><div class='del'>-RANLIB=ranlib</div><div class='del'>-#RANLIB=echo</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-all: ansi2knr libpng.a pngtest</div><div class='del'>-</div><div class='del'>-# general rule to allow ansi2knr to work</div><div class='del'>-.c.o:</div><div class='del'>-	./ansi2knr $*.c T$*.c</div><div class='del'>-	$(CC) $(CFLAGS) -c T$*.c</div><div class='del'>-	rm -f T$*.c $*.o</div><div class='del'>-	mv T$*.o $*.o</div><div class='del'>-</div><div class='del'>-ansi2knr: ansi2knr.c</div><div class='del'>-	$(CC) $(CFLAGS) $(ANSI2KNRFLAGS) -o ansi2knr ansi2knr.c</div><div class='del'>-</div><div class='del'>-libpng.a: ansi2knr $(OBJS)</div><div class='del'>-	ar rc $@  $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o libpng.a</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install: libpng.a png.h pngconf.h</div><div class='del'>-	-@mkdir $(DESTDIR)$(INCPATH)</div><div class='del'>-	-@mkdir $(DESTDIR)$(INCPATH)/libpng</div><div class='del'>-	-@mkdir $(DESTDIR)$(LIBPATH)</div><div class='del'>-	-@rm -f $(DESTDIR)$(INCPATH)/png.h</div><div class='del'>-	-@rm -f $(DESTDIR)$(INCPATH)/pngconf.h</div><div class='del'>-	cp png.h $(DESTDIR)$(INCPATH)/libpng</div><div class='del'>-	cp pngconf.h $(DESTDIR)$(INCPATH)/libpng</div><div class='del'>-	chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h</div><div class='del'>-	chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h</div><div class='del'>-	(cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)</div><div class='del'>-	cp libpng.a $(DESTDIR)$(LIBPATH)</div><div class='del'>-	chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	rm -f *.o libpng.a pngtest pngout.png ansi2knr</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.linux b/src/3rdparty/libpng/scripts/makefile.linux<br/>deleted file mode 100644<br/>index 8d02d5a..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.linux?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.linux</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,253 +0,0 @@</div><div class='del'>-# makefile for libpng.a and libpng14.so on Linux ELF with gcc</div><div class='del'>-# Copyright (C) 1998, 1999, 2002, 2006, 2008 Greg Roelofs and</div><div class='del'>-# Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1996, 1997 Andreas Dilger</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Library name:</div><div class='del'>-LIBNAME = libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Shared library names:</div><div class='del'>-LIBSO=$(LIBNAME).so</div><div class='del'>-LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)</div><div class='del'>-LIBSOVER=$(LIBNAME).so.$(PNGVER)</div><div class='del'>-OLDSO=libpng.so</div><div class='del'>-OLDSOMAJ=libpng.so.14</div><div class='del'>-OLDSOVER=libpng.so.14.$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Utilities:</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-CC=gcc</div><div class='del'>-MKDIR_P=mkdir -p</div><div class='del'>-LN_SF=ln -sf</div><div class='del'>-RANLIB=ranlib</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-# where "make install" puts libpng14.a, libpng14.so*,</div><div class='del'>-# libpng14/png.h and libpng14/pngconf.h</div><div class='del'>-# Prefix must be a full pathname.</div><div class='del'>-prefix=/usr/local</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located.</div><div class='del'>-#ZLIBLIB=/usr/local/lib</div><div class='del'>-#ZLIBINC=/usr/local/include</div><div class='del'>-ZLIBLIB=../zlib</div><div class='del'>-ZLIBINC=../zlib</div><div class='del'>-</div><div class='del'>-ALIGN=</div><div class='del'>-# for i386:</div><div class='del'>-#ALIGN=-malign-loops=2 -malign-functions=2</div><div class='del'>-</div><div class='del'>-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \</div><div class='del'>-	-Wmissing-declarations -Wtraditional -Wcast-align \</div><div class='del'>-	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion</div><div class='del'>-</div><div class='del'>-# for pgcc version 2.95.1, -O3 is buggy; don't use it.</div><div class='del'>-</div><div class='del'>-CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops \</div><div class='del'>-	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5</div><div class='del'>-</div><div class='del'>-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng14 -lz -lm</div><div class='del'>-LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm</div><div class='del'>-</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DB=$(DESTDIR)$(BINPATH)</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-DM=$(DESTDIR)$(MANPATH)</div><div class='del'>-</div><div class='del'>-OBJS =  png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-OBJSDLL = $(OBJS:.o=.pic.o)</div><div class='del'>-</div><div class='del'>-.SUFFIXES:      .c .o .pic.o</div><div class='del'>-</div><div class='del'>-.c.pic.o:</div><div class='del'>-	$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c</div><div class='del'>-</div><div class='del'>-all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-libpng.pc:</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz\ -lm! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config:</div><div class='del'>-	( cat scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo L_opts=\"-L$(LIBPATH)\"; \</div><div class='del'>-	echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \</div><div class='del'>-	echo libs=\"-lpng14 -lz -lm\"; \</div><div class='del'>-	cat scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-$(LIBSO): $(LIBSOMAJ)</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)</div><div class='del'>-</div><div class='del'>-$(LIBSOMAJ): $(LIBSOVER)</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(LIBSOVER): $(OBJSDLL)</div><div class='del'>-	$(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-$(OLDSOVER): $(OBJSDLL)</div><div class='del'>-	$(CC) -shared -Wl,-soname,$(OLDSOMAJ) \</div><div class='del'>-	-o $(OLDSOVER) \</div><div class='del'>-	$(OBJSDLL)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o $(LIBSO)</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-pngtest-static: pngtest.o libpng.a</div><div class='del'>-	$(CC) -o pngtest-static $(CFLAGS) pngtest.o $(LDFLAGS_A)</div><div class='del'>-</div><div class='del'>-test: pngtest pngtest-static</div><div class='del'>-	@echo ""</div><div class='del'>-	@echo "   Running pngtest dynamically linked with $(LIBSO):"</div><div class='del'>-	@echo ""</div><div class='del'>-	./pngtest</div><div class='del'>-	@echo ""</div><div class='del'>-	@echo "   Running pngtest statically linked with libpng.a:"</div><div class='del'>-	@echo ""</div><div class='del'>-	./pngtest-static</div><div class='del'>-</div><div class='del'>-install-headers: png.h pngconf.h</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-static: install-headers libpng.a</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	cp libpng.a $(DL)/$(LIBNAME).a</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME).a</div><div class='del'>-	-@$(RM_F) $(DL)/libpng.a</div><div class='del'>-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)</div><div class='del'>-</div><div class='del'>-install-shared: install-headers $(LIBSOVER) libpng.pc \</div><div class='del'>-	$(OLDSOVER)</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOVER)*</div><div class='del'>-	cp $(LIBSOVER) $(DL)</div><div class='del'>-	cp $(OLDSOVER) $(DL)</div><div class='del'>-	chmod 755 $(DL)/$(LIBSOVER)</div><div class='del'>-	chmod 755 $(DL)/$(OLDSOVER)</div><div class='del'>-	(cd $(DL); \</div><div class='del'>-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \</div><div class='del'>-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO))</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-man: libpng.3 libpngpf.3 png.5</div><div class='del'>-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi</div><div class='del'>-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpng.3</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpngpf.3</div><div class='del'>-	cp libpng.3 $(DM)/man3</div><div class='del'>-	cp libpngpf.3 $(DM)/man3</div><div class='del'>-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man5/png.5</div><div class='del'>-	cp png.5 $(DM)/man5</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@$(RM_F) $(DB)/libpng-config</div><div class='del'>-	-@$(RM_F) $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) -I$(DI) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(DL) -L$(ZLIBLIB) -Wl, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \</div><div class='del'>-	   -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	$(CC) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \</div><div class='del'>-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtesti pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o libpng.a pngtest pngout.png libpng-config \</div><div class='del'>-	$(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \</div><div class='del'>-	$(OLDSOVER) \</div><div class='del'>-	libpng.pc</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o png.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o pngerror.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o pngrio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o pngwio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o pngmem.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o pngset.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o pngget.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o pngread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o pngrtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o pngrutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o pngtrans.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o pngwrite.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.mingw b/src/3rdparty/libpng/scripts/makefile.mingw<br/>deleted file mode 100644<br/>index 8faad93..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.mingw?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.mingw</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,280 +0,0 @@</div><div class='del'>-# makefile for mingw on x86</div><div class='del'>-#   Builds both dll (with import lib) and static lib versions</div><div class='del'>-#   of the library, and builds two copies of pngtest: one</div><div class='del'>-#   statically linked and one dynamically linked.</div><div class='del'>-#</div><div class='del'>-# Copyright (C) 2002, 2006, 2008 Soren Anderson, Charles Wilson,</div><div class='del'>-#    and Glenn Randers-Pehrson, based on makefile for linux-elf w/mmx by:</div><div class='del'>-# Copyright (C) 1998-2000, 2007 Greg Roelofs</div><div class='del'>-# Copyright (C) 1996, 1997 Andreas Dilger</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Built from makefile.cygwin</div><div class='del'>-</div><div class='del'>-# This makefile intends to support building outside the src directory</div><div class='del'>-# if desired. When invoking it, specify an argument to SRCDIR on the</div><div class='del'>-# command line that points to the top of the directory where your source</div><div class='del'>-# is located.</div><div class='del'>-ifdef SRCDIR</div><div class='del'>-VPATH = $(SRCDIR)</div><div class='del'>-else</div><div class='del'>-SRCDIR = .</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-# Override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-# If you're using a cross-compiler, add the appropriate prefix (e.g.,</div><div class='del'>-# "i386-mingw32msvc-") to the following three commands:</div><div class='del'>-CC=gcc</div><div class='del'>-AR=ar</div><div class='del'>-RANLIB=ranlib</div><div class='del'>-</div><div class='del'>-MKDIR_P=/bin/mkdir -pv</div><div class='del'>-</div><div class='del'>-# Where "make install" puts libpng*.a, *png*.dll, png.h, and pngconf.h</div><div class='del'>-ifndef prefix</div><div class='del'>-prefix=/usr</div><div class='del'>-$(warning "You haven't specified a 'prefix=' location. Defaulting to '/usr'")</div><div class='del'>-endif</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-ZLIBLIB= /usr/lib</div><div class='del'>-ZLIBINC=</div><div class='del'>-</div><div class='del'>-ALIGN=</div><div class='del'>-# for i386:</div><div class='del'>-#ALIGN=-malign-loops=2 -malign-functions=2</div><div class='del'>-</div><div class='del'>-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \</div><div class='del'>-	-Wmissing-declarations -Wtraditional -Wcast-align \</div><div class='del'>-	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion</div><div class='del'>-</div><div class='del'>-CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \</div><div class='del'>-        -W -Wall -O3 $(ALIGN) -funroll-loops \</div><div class='del'>-	-fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5</div><div class='del'>-</div><div class='del'>-LIBNAME = libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-MINGDLL = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-SHAREDLIB=libpng$(MINGDLL).dll</div><div class='del'>-STATLIB=libpng.a</div><div class='del'>-IMPLIB=libpng.dll.a</div><div class='del'>-SHAREDDEF=libpng.def</div><div class='del'>-LIBS=$(SHAREDLIB) $(STATLIB)</div><div class='del'>-EXE=.exe</div><div class='del'>-</div><div class='del'>-LDFLAGS=$(strip -L. $(MINGW_LDFLAGS) -lpng $(addprefix -L,$(ZLIBLIB)) -lz)</div><div class='del'>-LDSFLAGS=$(strip -shared -L.  $(MINGW_LDFLAGS))</div><div class='del'>-LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz</div><div class='del'>-</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-MAN3PATH=$(MANPATH)/man3</div><div class='del'>-MAN5PATH=$(MANPATH)/man5</div><div class='del'>-</div><div class='del'>-# cosmetic: shortened strings:</div><div class='del'>-S =$(SRCDIR)</div><div class='del'>-D =$(DESTDIR)</div><div class='del'>-DB =$(D)$(BINPATH)</div><div class='del'>-DI =$(D)$(INCPATH)</div><div class='del'>-DL =$(D)$(LIBPATH)</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-OBJSDLL = $(OBJS:.o=.pic.o)</div><div class='del'>-</div><div class='del'>-.SUFFIXES: .c .o .pic.o</div><div class='del'>-</div><div class='del'>-%.o : %.c</div><div class='del'>-	$(CC) -c $(CFLAGS) -o $@ $&lt;</div><div class='del'>-%.pic.o : CFLAGS += -DPNG_BUILD_DLL</div><div class='del'>-%.pic.o : %.c</div><div class='del'>-	$(CC) -c $(CFLAGS) -o $@ $&lt;</div><div class='del'>-</div><div class='del'>-all: all-static all-shared libpng.pc libpng-config libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-# Make this to verify that "make [...] install" will do what you want.</div><div class='del'>-buildsetup-tell:</div><div class='del'>-	@echo  VPATH is set to: \"$(VPATH)\"</div><div class='del'>-	@echo  prefix is set to: \"$(prefix)\"</div><div class='del'>-	@echo -e INCPATH,LIBPATH, etc. are set to:'\n' \</div><div class='del'>- $(addprefix $(D),$(INCPATH)'\n' $(LIBPATH)'\n' $(BINPATH)'\n' \</div><div class='del'>-   $(MANPATH)'\n' $(MAN3PATH)'\n' $(MAN5PATH)'\n')'\n'</div><div class='del'>-</div><div class='del'>-libpng.pc: scripts/libpng.pc.in</div><div class='del'>-	@echo -e Making pkg-config file for this libpng installation..'\n' \</div><div class='del'>-           using PREFIX=\"$(prefix)\"'\n'</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz\ -lm! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config: scripts/libpng-config-head.in scripts/libpng-config-body.in</div><div class='del'>-	@echo -e Making $(LIBNAME) libpng-config file for this libpng \</div><div class='del'>- installation..'\n' using PREFIX=\"$(prefix)\"'\n'</div><div class='del'>-	( cat $(S)/scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo L_opts=\"-L$(LIBPATH)\"; \</div><div class='del'>-	echo libs=\"-lpng$(MINGDLL) -lz\"; \</div><div class='del'>-	cat $(S)/scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-static: all-static</div><div class='del'>-shared: all-shared</div><div class='del'>-all-static: $(STATLIB) pngtest-stat$(EXE)</div><div class='del'>-all-shared: $(SHAREDLIB) pngtest$(EXE)</div><div class='del'>-</div><div class='del'>-$(STATLIB): $(OBJS)</div><div class='del'>-	$(AR) rc $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-$(SHAREDDEF): scripts/pngwin.def</div><div class='del'>-	cat $&lt; | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' | \</div><div class='del'>-	sed -e 's/\([^;]*\);/;/' &gt; $@</div><div class='del'>-</div><div class='del'>-$(SHAREDLIB): $(OBJSDLL) $(SHAREDDEF)</div><div class='del'>-	$(CC) $(LDSFLAGS) -o $@ $(OBJSDLL) -L. $(LDEXTRA)</div><div class='del'>-</div><div class='del'>-pngtest$(EXE): pngtest.pic.o $(SHAREDLIB)</div><div class='del'>-	$(CC) $(CFLAGS) $&lt; $(LDFLAGS) -o $@</div><div class='del'>-</div><div class='del'>-pngtest-stat$(EXE): pngtest.o $(STATLIB)</div><div class='del'>-	$(CC) -static $(CFLAGS) $&lt; $(LDFLAGS) -o $@</div><div class='del'>-</div><div class='del'>-test: test-static test-shared</div><div class='del'>-</div><div class='del'>-test-static: pngtest-stat$(EXE)</div><div class='del'>-	./pngtest-stat $(S)/pngtest.png</div><div class='del'>-</div><div class='del'>-test-shared: pngtest$(EXE)</div><div class='del'>-	./pngtest $(S)/pngtest.png</div><div class='del'>-</div><div class='del'>-install-static: $(STATLIB) install-headers install-man</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	install -m 644 $(STATLIB) $(DL)/$(LIBNAME).a</div><div class='del'>-	-@rm -f $(DL)/$(STATLIB)</div><div class='del'>-	(cd $(DL); ln -sf $(LIBNAME).a $(STATLIB))</div><div class='del'>-</div><div class='del'>-install-shared: $(SHAREDLIB) libpng.pc libpng-config install-headers install-man</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@/bin/rm -f $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	install -m 644 $(IMPLIB) $(DL)/$(LIBNAME).dll.a</div><div class='del'>-	-@rm -f $(DL)/$(IMPLIB)</div><div class='del'>-	(cd $(DL); ln -sf $(LIBNAME).dll.a $(IMPLIB))</div><div class='del'>-	install -s -m 755 $(SHAREDLIB) $(DB)</div><div class='del'>-	install -m 644 libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-headers:</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	-@rm -f $(DI)/png.h</div><div class='del'>-	-@rm -f $(DI)/pngconf.h</div><div class='del'>-	install -m 644 $(S)/png.h $(S)/pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	-@rm -f $(DI)/libpng</div><div class='del'>-	(cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-man:</div><div class='del'>-	-@if [ ! -d $(D)$(MAN3PATH) ]; then $(MKDIR_P) $(D)$(MAN3PATH); fi</div><div class='del'>-	-@if [ ! -d $(D)$(MAN5PATH) ]; then $(MKDIR_P) $(D)$(MAN5PATH); fi</div><div class='del'>-	install -m 644 $(S)/libpngpf.3 $(S)/libpng.3 $(D)$(MAN3PATH)</div><div class='del'>-	install -m 644 $(S)/png.5 $(D)$(MAN5PATH)</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@/bin/rm -f $(DB)/libpng-config</div><div class='del'>-	-@/bin/rm -f $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); ln -sf $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-# Run this to verify that a future `configure' run will pick up the settings</div><div class='del'>-# you want.</div><div class='del'>-test-config-install: SHELL=/bin/bash</div><div class='del'>-test-config-install: $(DB)/libpng-config</div><div class='del'>-	@echo -e Testing libpng-config functions...'\n'</div><div class='del'>-	@ for TYRA in LDFLAGS CPPFLAGS CFLAGS LIBS VERSION; \</div><div class='del'>-   do \</div><div class='del'>-    printf "(%d)\t %10s =%s\n" $$(($$gytiu + 1)) $$TYRA \</div><div class='del'>-    "$$($(DB)/libpng-config `echo --$$TYRA |tr '[:upper:]' '[:lower:]'`)"; \</div><div class='del'>-    gytiu=$$(( $$gytiu + 1 )); \</div><div class='del'>-   done</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) -I$(DI) $(CFLAGS) \</div><div class='del'>-	   `$(BINPATH)/libpng14-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(DL) -L$(ZLIBLIB) \</div><div class='del'>-	   -o pngtestd `$(BINPATH)/libpng14-config --ldflags`</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	$(CC) $(CFLAGS) \</div><div class='del'>-	   `$(BINPATH)/libpng14-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(ZLIBLIB) \</div><div class='del'>-	   -o pngtesti$(EXE) `$(BINPATH)/libpng14-config --ldflags`</div><div class='del'>-	./pngtesti$(EXE) pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	/bin/rm -f *.pic.o *.o $(STATLIB) $(IMPLIB) $(SHAREDLIB) \</div><div class='del'>-	   pngtest-stat$(EXE) pngtest$(EXE) pngout.png $(SHAREDDEF) \</div><div class='del'>-	   libpng-config libpng.pc pngtesti$(EXE)</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-.PHONY: buildsetup-tell libpng.pc libpng-config test-config-install clean</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o png.pic.o:		png.h pngconf.h pngpriv.h png.c</div><div class='del'>-pngerror.o pngerror.pic.o:	png.h pngconf.h pngpriv.h pngerror.c</div><div class='del'>-pngrio.o pngrio.pic.o:		png.h pngconf.h pngpriv.h pngrio.c</div><div class='del'>-pngwio.o pngwio.pic.o:		png.h pngconf.h pngpriv.h pngwio.c</div><div class='del'>-pngmem.o pngmem.pic.o:		png.h pngconf.h pngpriv.h pngmem.c</div><div class='del'>-pngset.o pngset.pic.o:		png.h pngconf.h pngpriv.h pngset.c</div><div class='del'>-pngget.o pngget.pic.o:		png.h pngconf.h pngpriv.h pngget.c</div><div class='del'>-pngread.o pngread.pic.o:	png.h pngconf.h pngpriv.h pngread.c</div><div class='del'>-pngrtran.o pngrtran.pic.o:	png.h pngconf.h pngpriv.h pngrtran.c</div><div class='del'>-pngrutil.o pngrutil.pic.o:	png.h pngconf.h pngpriv.h pngrutil.c</div><div class='del'>-pngtrans.o pngtrans.pic.o:	png.h pngconf.h pngpriv.h pngtrans.c</div><div class='del'>-pngwrite.o pngwrite.pic.o:	png.h pngconf.h pngpriv.h pngwrite.c</div><div class='del'>-pngwtran.o pngwtran.pic.o:	png.h pngconf.h pngpriv.h pngwtran.c</div><div class='del'>-pngwutil.o pngwutil.pic.o:	png.h pngconf.h pngpriv.h pngwutil.c</div><div class='del'>-pngpread.o pngpread.pic.o:	png.h pngconf.h pngpriv.h pngpread.c</div><div class='del'>-</div><div class='del'>-pngtest.o pngtest.pic.o:	png.h pngconf.h pngtest.c</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.mips b/src/3rdparty/libpng/scripts/makefile.mips<br/>deleted file mode 100644<br/>index 5e1040e..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.mips?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.mips</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,87 +0,0 @@</div><div class='del'>-# makefile for libpng</div><div class='del'>-# Copyright (C) Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# where make install puts libpng.a and png.h</div><div class='del'>-prefix=/usr/local</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(prefix)/lib</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-CC=cc</div><div class='del'>-CFLAGS=-I../zlib -O -systype sysv -DSYSV -w -Dmips</div><div class='del'>-#CFLAGS=-O</div><div class='del'>-LDFLAGS=-L. -L../zlib/ -lpng -lz -lm</div><div class='del'>-</div><div class='del'>-#RANLIB=ranlib</div><div class='del'>-RANLIB=echo</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-all: libpng.a pngtest</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	ar rc $@  $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o libpng.a</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install: libpng.a</div><div class='del'>-	-@mkdir $(DESTDIR)$(INCPATH)</div><div class='del'>-	-@mkdir $(DESTDIR)$(INCPATH)/libpng</div><div class='del'>-	-@mkdir $(DESTDIR)$(LIBPATH)</div><div class='del'>-	-@rm -f $(DESTDIR)$(INCPATH)/png.h</div><div class='del'>-	-@rm -f $(DESTDIR)$(INCPATH)/pngconf.h</div><div class='del'>-	cp png.h $(DESTDIR)$(INCPATH)/libpng</div><div class='del'>-	cp pngconf.h $(DESTDIR)$(INCPATH)/libpng</div><div class='del'>-	chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h</div><div class='del'>-	chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h</div><div class='del'>-	(cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)</div><div class='del'>-	cp libpng.a $(DESTDIR)$(LIBPATH)</div><div class='del'>-	chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	rm -f *.o libpng.a pngtest pngout.png</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.msc b/src/3rdparty/libpng/scripts/makefile.msc<br/>deleted file mode 100644<br/>index e744644..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.msc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.msc</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,91 +0,0 @@</div><div class='del'>-# makefile for libpng</div><div class='del'>-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.</div><div class='del'>-# Copyright (C) 2006, 2009 Glenn Randers-Pehrson</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-#</div><div class='del'>-# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib</div><div class='del'>-</div><div class='del'>-# -------- Microsoft C 5.1 and later, does not use assembler code --------</div><div class='del'>-MODEL=L</div><div class='del'>-CFLAGS=-Oait -Gs -nologo -W3 -A$(MODEL) -I..\zlib</div><div class='del'>-#-Ox generates bad code with MSC 5.1</div><div class='del'>-CC=cl</div><div class='del'>-LD=link</div><div class='del'>-LDFLAGS=/e/st:0x1500/noe</div><div class='del'>-O=.obj</div><div class='del'>-</div><div class='del'>-#uncomment next to put error messages in a file</div><div class='del'>-ERRFILE= &gt;&gt; pngerrs</div><div class='del'>-</div><div class='del'>-# variables</div><div class='del'>-OBJS1 = png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O)</div><div class='del'>-OBJS2 = pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O)</div><div class='del'>-OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)</div><div class='del'>-</div><div class='del'>-all: libpng.lib</div><div class='del'>-</div><div class='del'>-png$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-		  $(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngset$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngget$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngread$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngpread$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-		  $(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngrtran$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngrutil$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngerror$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngmem$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngrio$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngwio$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngtrans$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngwrite$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngwtran$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngwutil$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-libpng.lib: $(OBJS1) $(OBJS2) $(OBJS3)</div><div class='del'>-	del libpng.lib</div><div class='del'>-	lib libpng $(OBJS1);</div><div class='del'>-	lib libpng $(OBJS2);</div><div class='del'>-	lib libpng $(OBJS3);</div><div class='del'>-</div><div class='del'>-pngtest$(O): png.h pngconf.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngtest.exe: pngtest.obj libpng.lib</div><div class='del'>-	$(LD) $(LDFLAGS) pngtest.obj,,,libpng.lib ..\zlib\zlib.lib ;</div><div class='del'>-</div><div class='del'>-test: pngtest.exe</div><div class='del'>-	pngtest</div><div class='del'>-</div><div class='del'>-# End of makefile for libpng</div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.ne12bsd b/src/3rdparty/libpng/scripts/makefile.ne12bsd<br/>deleted file mode 100644<br/>index acf9c3c..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.ne12bsd?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.ne12bsd</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-# makefile for libpng for NetBSD for the standard</div><div class='del'>-# make obj &amp;&amp; make depend &amp;&amp; make &amp;&amp; make test</div><div class='del'>-# make includes &amp;&amp; make install</div><div class='del'>-# Copyright (C) 2002 Patrick R.L. Welche</div><div class='del'>-# Copyright (C) 2007, 2009 Glenn Randers-Pehrson</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# You should also run makefile.netbsd</div><div class='del'>-</div><div class='del'>-LOCALBASE?=/usr/local</div><div class='del'>-LIBDIR=	${LOCALBASE}/lib</div><div class='del'>-MANDIR= ${LOCALBASE}/man</div><div class='del'>-INCSDIR=${LOCALBASE}/include/libpng14</div><div class='del'>-</div><div class='del'>-LIB=	png14</div><div class='del'>-SHLIB_MAJOR=	0</div><div class='del'>-SHLIB_MINOR=	1.4.0</div><div class='del'>-SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \</div><div class='del'>-	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \</div><div class='del'>-	pngwtran.c pngmem.c pngerror.c pngpread.c</div><div class='del'>-INCS=	png.h pngconf.h</div><div class='del'>-MAN=	libpng.3 libpngpf.3 png.5</div><div class='del'>-</div><div class='del'>-CPPFLAGS+=-I${.CURDIR}</div><div class='del'>-</div><div class='del'>-# We should be able to do something like this instead of the manual</div><div class='del'>-# uncommenting, but it core dumps for me at the moment:</div><div class='del'>-# .if ${MACHINE_ARCH} == "i386"</div><div class='del'>-#   MKLINT= no</div><div class='del'>-# .endif</div><div class='del'>-</div><div class='del'>-CLEANFILES+=pngtest.o pngtest</div><div class='del'>-</div><div class='del'>-pngtest.o:	pngtest.c</div><div class='del'>-	${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}</div><div class='del'>-</div><div class='del'>-pngtest:	pngtest.o libpng.a</div><div class='del'>-	${CC} ${LDFLAGS} ${.ALLSRC} -o${.TARGET} -lz -lm</div><div class='del'>-</div><div class='del'>-test:	pngtest</div><div class='del'>-	cd ${.CURDIR} &amp;&amp; ${.OBJDIR}/pngtest</div><div class='del'>-</div><div class='del'>-.include &lt;bsd.lib.mk&gt;</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.netbsd b/src/3rdparty/libpng/scripts/makefile.netbsd<br/>deleted file mode 100644<br/>index ef470f8..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.netbsd?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.netbsd</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-# makefile for libpng for NetBSD for the standard</div><div class='del'>-# make obj &amp;&amp; make depend &amp;&amp; make &amp;&amp; make test</div><div class='del'>-# make includes &amp;&amp; make install</div><div class='del'>-# Copyright (C) 2002 Patrick R.L. Welche</div><div class='del'>-# Copyright (C) 2007-2009 Glenn Randers-Pehrson</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# You should also run makefile.ne14bsd</div><div class='del'>-</div><div class='del'>-LOCALBASE?=/usr/local</div><div class='del'>-LIBDIR=	${LOCALBASE}/lib</div><div class='del'>-MANDIR= ${LOCALBASE}/man</div><div class='del'>-INCSDIR=${LOCALBASE}/include</div><div class='del'>-</div><div class='del'>-LIB=	png</div><div class='del'>-SHLIB_MAJOR=	3</div><div class='del'>-SHLIB_MINOR=	1.4.0</div><div class='del'>-SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \</div><div class='del'>-	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \</div><div class='del'>-	pngwtran.c pngmem.c pngerror.c pngpread.c</div><div class='del'>-INCS=	png.h pngconf.h</div><div class='del'>-MAN=	libpng.3 libpngpf.3 png.5</div><div class='del'>-</div><div class='del'>-CPPFLAGS+=-I${.CURDIR}</div><div class='del'>-</div><div class='del'>-# We should be able to do something like this instead of the manual</div><div class='del'>-# uncommenting, but it core dumps for me at the moment:</div><div class='del'>-# .if ${MACHINE_ARCH} == "i386"</div><div class='del'>-#   MKLINT= no</div><div class='del'>-# .endif</div><div class='del'>-</div><div class='del'>-CLEANFILES+=pngtest.o pngtest</div><div class='del'>-</div><div class='del'>-pngtest.o:	pngtest.c</div><div class='del'>-	${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET}</div><div class='del'>-</div><div class='del'>-pngtest:	pngtest.o libpng.a</div><div class='del'>-	${CC} ${LDFLAGS} ${.ALLSRC} -o${.TARGET} -lz -lm</div><div class='del'>-</div><div class='del'>-test:	pngtest</div><div class='del'>-	cd ${.CURDIR} &amp;&amp; ${.OBJDIR}/pngtest</div><div class='del'>-</div><div class='del'>-.include &lt;bsd.lib.mk&gt;</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.openbsd b/src/3rdparty/libpng/scripts/makefile.openbsd<br/>deleted file mode 100644<br/>index c924284..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.openbsd?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.openbsd</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,76 +0,0 @@</div><div class='del'>-# makefile for libpng</div><div class='del'>-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.</div><div class='del'>-# Copyright (C) 2007-2009 Glenn Randers-Pehrson</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-PREFIX?= /usr/local</div><div class='del'>-LIBDIR=	${PREFIX}/lib</div><div class='del'>-MANDIR= ${PREFIX}/man/cat</div><div class='del'>-</div><div class='del'>-SHLIB_MAJOR=	0</div><div class='del'>-SHLIB_MINOR=	1.4.0</div><div class='del'>-</div><div class='del'>-LIB=	png</div><div class='del'>-SRCS=	png.c pngerror.c pngget.c pngmem.c pngpread.c \</div><div class='del'>-	pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtrans.c \</div><div class='del'>-	pngwio.c pngwrite.c pngwtran.c pngwutil.c</div><div class='del'>-</div><div class='del'>-HDRS=	png.h pngconf.h</div><div class='del'>-</div><div class='del'>-CFLAGS+= -W -Wall</div><div class='del'>-CPPFLAGS+= -I${.CURDIR}</div><div class='del'>-</div><div class='del'>-NOPROFILE= Yes</div><div class='del'>-</div><div class='del'>-CLEANFILES+= pngtest.o pngtest</div><div class='del'>-</div><div class='del'>-MAN=	libpng.3 libpngpf.3 png.5</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO libpng.txt</div><div class='del'>-</div><div class='del'>-pngtest.o:	pngtest.c</div><div class='del'>-	${CC} ${CPPFLAGS} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}</div><div class='del'>-</div><div class='del'>-pngtest:	pngtest.o</div><div class='del'>-	${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} -L${.OBJDIR} -lpng -lz -lm</div><div class='del'>-</div><div class='del'>-test:	pngtest</div><div class='del'>-	cd ${.OBJDIR} &amp;&amp; env \</div><div class='del'>-		LD_LIBRARY_PATH="${.OBJDIR}" ${.OBJDIR}/pngtest</div><div class='del'>-</div><div class='del'>-beforeinstall:</div><div class='del'>-	if [ ! -d ${DESTDIR}${PREFIX}/include/libpng ]; then \</div><div class='del'>-	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/include; \</div><div class='del'>-	fi</div><div class='del'>-	if [ ! -d ${DESTDIR}${LIBDIR} ]; then \</div><div class='del'>-	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}; \</div><div class='del'>-	fi</div><div class='del'>-	if [ ! -d ${DESTDIR}${LIBDIR}/debug ]; then \</div><div class='del'>-	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${LIBDIR}/debug; \</div><div class='del'>-	fi</div><div class='del'>-	if [ ! -d ${DESTDIR}${MANDIR}3 ]; then \</div><div class='del'>-	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}3; \</div><div class='del'>-	fi</div><div class='del'>-	if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \</div><div class='del'>-	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${MANDIR}5; \</div><div class='del'>-	fi</div><div class='del'>-	if [ ! -d ${DESTDIR}${PREFIX}/share/doc/png ]; then \</div><div class='del'>-	  ${INSTALL} -d -o root -g wheel ${DESTDIR}${PREFIX}/share/doc/png; \</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-afterinstall:</div><div class='del'>-	@rm -f ${DESTDIR}${LIBDIR}/libpng_pic.a</div><div class='del'>-	@rm -f ${DESTDIR}${LIBDIR}/debug/libpng.a</div><div class='del'>-	@rm -f ${DESTDIR}${PREFIX}/include/png.h</div><div class='del'>-	@rm -f ${DESTDIR}${PREFIX}/include/pngconf.h</div><div class='del'>-	@rmdir ${DESTDIR}${LIBDIR}/debug 2&gt;/dev/null || true</div><div class='del'>-	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \</div><div class='del'>-		-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include</div><div class='del'>-	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \</div><div class='del'>-		-m ${NONBINMODE} ${HDRS} ${DESTDIR}${PREFIX}/include</div><div class='del'>-	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} \</div><div class='del'>-		-m ${NONBINMODE} ${DOCS} ${DESTDIR}${PREFIX}/share/doc/png</div><div class='del'>-</div><div class='del'>-.include &lt;bsd.lib.mk&gt;</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.os2 b/src/3rdparty/libpng/scripts/makefile.os2<br/>deleted file mode 100644<br/>index affb03c..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.os2?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.os2</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,72 +0,0 @@</div><div class='del'>-# makefile for libpng on OS/2 with gcc</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Related files: pngos2.def</div><div class='del'>-</div><div class='del'>-CC=gcc -Zomf -s</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-ZLIBLIB=../zlib</div><div class='del'>-ZLIBINC=../zlib</div><div class='del'>-</div><div class='del'>-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \</div><div class='del'>-	-Wmissing-declarations -Wtraditional -Wcast-align \</div><div class='del'>-	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion</div><div class='del'>-CFLAGS=-I$(ZLIBINC) -W -Wall -O6 -funroll-loops -malign-loops=2 \</div><div class='del'>-	-malign-functions=2 #$(WARNMORE) -g -DPNG_DEBUG=5</div><div class='del'>-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lzdll -Zcrtdll</div><div class='del'>-AR=emxomfar</div><div class='del'>-</div><div class='del'>-PNGLIB=png.lib</div><div class='del'>-IMPLIB=emximp</div><div class='del'>-SHAREDLIB=png.dll</div><div class='del'>-SHAREDLIBIMP=pngdll.lib</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-.SUFFIXES:      .c .o</div><div class='del'>-</div><div class='del'>-all: $(PNGLIB) $(SHAREDLIB) $(SHAREDLIBIMP)</div><div class='del'>-</div><div class='del'>-$(PNGLIB): $(OBJS)</div><div class='del'>-	$(AR) rc $@ $(OBJS)</div><div class='del'>-</div><div class='del'>-$(SHAREDLIB): $(OBJS) pngos2.def</div><div class='del'>-	$(CC) $(LDFLAGS) -Zdll -o $@ $^</div><div class='del'>-</div><div class='del'>-$(SHAREDLIBIMP): pngos2.def</div><div class='del'>-	$(IMPLIB) -o $@ $^</div><div class='del'>-</div><div class='del'>-pngtest.exe: pngtest.o png.dll pngdll.lib</div><div class='del'>-	$(CC) -o $@ $(CFLAGS) $&lt; $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest.exe</div><div class='del'>-	./pngtest.exe</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	rm -f *.o $(PNGLIB) png.dll pngdll.lib pngtest.exe pngout.png</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o png.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o pngerror.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o pngrio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o pngwio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o pngmem.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o pngset.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o pngget.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o pngread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o pngrtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o pngrutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o pngtrans.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o pngwrite.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.sco b/src/3rdparty/libpng/scripts/makefile.sco<br/>deleted file mode 100644<br/>index 22bb976..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.sco?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.sco</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,232 +0,0 @@</div><div class='del'>-# makefile for SCO OSr5  ELF and Unixware 7 with Native cc</div><div class='del'>-# Contributed by Mike Hopkirk (hops@sco.com) modified from Makefile.lnx</div><div class='del'>-#   force ELF build dynamic linking, SONAME setting in lib and RPATH in app</div><div class='del'>-# Copyright (C) 2002, 2006 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1998 Greg Roelofs</div><div class='del'>-# Copyright (C) 1996, 1997 Andreas Dilger</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Library name:</div><div class='del'>-LIBNAME = libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Shared library names:</div><div class='del'>-LIBSO=$(LIBNAME).so</div><div class='del'>-LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)</div><div class='del'>-LIBSOVER=$(LIBNAME).so.$(PNGVER)</div><div class='del'>-OLDSO=libpng.so</div><div class='del'>-OLDSOMAJ=libpng.so.14</div><div class='del'>-OLDSOVER=libpng.so.14.$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Utilities:</div><div class='del'>-CC=cc</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-MKDIR_P=mkdir</div><div class='del'>-LN_SF=ln -f -s</div><div class='del'>-RANLIB=echo</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-# where make install puts libpng.a, $(OLDSO)*, and png.h</div><div class='del'>-prefix=/usr/local</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-#ZLIBLIB=/usr/local/lib</div><div class='del'>-#ZLIBINC=/usr/local/include</div><div class='del'>-ZLIBLIB=../zlib</div><div class='del'>-ZLIBINC=../zlib</div><div class='del'>-</div><div class='del'>-CFLAGS= -dy -belf -I$(ZLIBINC) -O3</div><div class='del'>-LDFLAGS=-L. -L$(ZLIBLIB) -lpng14 -lz -lm</div><div class='del'>-</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DB=$(DESTDIR)$(BINPATH)</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-DM=$(DESTDIR)$(MANPATH)</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-OBJSDLL = $(OBJS:.o=.pic.o)</div><div class='del'>-</div><div class='del'>-.SUFFIXES:      .c .o .pic.o</div><div class='del'>-</div><div class='del'>-.c.pic.o:</div><div class='del'>-	$(CC) -c $(CFLAGS) -KPIC -o $@ $*.c</div><div class='del'>-</div><div class='del'>-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-libpng.pc:</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz\ -lm! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config:</div><div class='del'>-	( cat scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo ccopts=\"-belf\"; \</div><div class='del'>-	echo L_opts=\"-L$(LIBPATH)\"; \</div><div class='del'>-	echo libs=\"-lpng14 -lz -lm\"; \</div><div class='del'>-	cat scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-$(LIBSO): $(LIBSOMAJ)</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)</div><div class='del'>-</div><div class='del'>-$(LIBSOMAJ): $(LIBSOVER)</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(LIBSOVER): $(OBJSDLL)</div><div class='del'>-	$(CC) -G  -Wl,-h,$(LIBSOMAJ) -o $(LIBSOVER) \</div><div class='del'>-	 $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-$(OLDSOVER): $(OBJSDLL)</div><div class='del'>-	$(CC) -G  -Wl,-h,$(OLDSOMAJ) -o $(OLDSOVER) \</div><div class='del'>-	$(OBJSDLL)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o $(LIBSO)</div><div class='del'>-	LD_RUN_PATH=.:$(ZLIBLIB) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install-headers: png.h pngconf.h</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	-@$(RM_F) $(DI)/png.h</div><div class='del'>-	-@$(RM_F) $(DI)/pngconf.h</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-static: install-headers libpng.a</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	cp libpng.a $(DL)/$(LIBNAME).a</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME).a</div><div class='del'>-	-@$(RM_F) $(DL)/libpng.a</div><div class='del'>-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)</div><div class='del'>-</div><div class='del'>-install-shared: install-headers $(LIBSOVER) libpng.pc \</div><div class='del'>-	$(OLDSOVER)</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOVER)*</div><div class='del'>-	cp $(LIBSOVER) $(DL)</div><div class='del'>-	cp $(OLDSOVER) $(DL)</div><div class='del'>-	chmod 755 $(DL)/$(LIBSOVER)</div><div class='del'>-	chmod 755 $(DL)/$(OLDSOVER)</div><div class='del'>-	(cd $(DL); \</div><div class='del'>-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \</div><div class='del'>-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO))</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-man: libpng.3 libpngpf.3 png.5</div><div class='del'>-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi</div><div class='del'>-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpng.3</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpngpf.3</div><div class='del'>-	cp libpng.3 $(DM)/man3</div><div class='del'>-	cp libpngpf.3 $(DM)/man3</div><div class='del'>-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man5/png.5</div><div class='del'>-	cp png.5 $(DM)/man5</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@$(RM_F) $(DB)/libpng-config</div><div class='del'>-	-@$(RM_F) $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) -I$(DI) $(CFLAGS) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(DL) -L$(ZLIBLIB) \</div><div class='del'>-	   -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	$(CC) $(CFLAGS) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(ZLIBLIB) \</div><div class='del'>-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtesti pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o libpng.a pngtest pngout.png libpng-config \</div><div class='del'>-	$(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \</div><div class='del'>-	$(OLDSOVER) \</div><div class='del'>-	libpng.pc</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o png.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o pngerror.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o pngrio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o pngwio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o pngmem.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o pngset.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o pngget.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o pngread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o pngrtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o pngrutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o pngtrans.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o pngwrite.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.sggcc b/src/3rdparty/libpng/scripts/makefile.sggcc<br/>deleted file mode 100644<br/>index bcc9d01..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.sggcc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.sggcc</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,243 +0,0 @@</div><div class='del'>-# makefile for libpng.a and libpng14.so, SGI IRIX with 'cc'</div><div class='del'>-# Copyright (C) 2001-2002, 2006 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Library name:</div><div class='del'>-LIBNAME=libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Shared library names:</div><div class='del'>-LIBSO=$(LIBNAME).so</div><div class='del'>-LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)</div><div class='del'>-LIBSOVER=$(LIBNAME).so.$(PNGVER)</div><div class='del'>-OLDSO=libpng.so</div><div class='del'>-OLDSOMAJ=libpng.so.14</div><div class='del'>-OLDSOVER=libpng.so.14.$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Utilities:</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-CC=gcc</div><div class='del'>-MKDIR_P=mkdir -p</div><div class='del'>-LN_SF=ln -sf</div><div class='del'>-RANLIB=echo</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-# Where make install puts libpng.a, libpng14.so, and libpng14/png.h</div><div class='del'>-# Prefix must be a full pathname.</div><div class='del'>-</div><div class='del'>-prefix=/usr/local</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-#ZLIBLIB=/usr/local/lib32</div><div class='del'>-#ZLIBINC=/usr/local/include</div><div class='del'>-#ZLIBLIB=/usr/local/lib</div><div class='del'>-#ZLIBINC=/usr/local/include</div><div class='del'>-ZLIBLIB=../zlib</div><div class='del'>-ZLIBINC=../zlib</div><div class='del'>-</div><div class='del'>-# ABI can be blank to use default for your system, -32, -o32, -n32, or -64</div><div class='del'>-# See "man abi".  zlib must be built with the same ABI.</div><div class='del'>-ABI=</div><div class='del'>-</div><div class='del'>-WARNMORE= # -g -DPNG_DEBUG=5</div><div class='del'>-CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -fPIC -mabi=n32</div><div class='del'>-LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm</div><div class='del'>-LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \</div><div class='del'>-  -set_version sgi$(PNGMAJ).0</div><div class='del'>-LDLEGACY=cc $(ABI) -shared -soname $(OLDSOMAJ) \</div><div class='del'>-  -set_version sgi$3.0</div><div class='del'>-# See "man dso" for info about shared objects</div><div class='del'>-</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-#LIBPATH=$(exec_prefix)/lib32</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DB=$(DESTDIR)$(BINPATH)</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-DM=$(DESTDIR)$(MANPATH)</div><div class='del'>-</div><div class='del'>-OBJS =  png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-all: libpng.a pngtest shared libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-shared: $(LIBSOVER)</div><div class='del'>-</div><div class='del'>-libpng.pc:</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz\ -lm! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config:</div><div class='del'>-	( cat scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo ccopts=\"$(ABI)\"; \</div><div class='del'>-	echo cppflags=\"\"; \</div><div class='del'>-	echo ldopts=\"$(ABI)\"; \</div><div class='del'>-	echo L_opts=\"-L$(LIBPATH)\"; \</div><div class='del'>-	echo libdir=\"$(LIBPATH)\"; \</div><div class='del'>-	echo libs=\"-lpng14 -lz -lm\"; \</div><div class='del'>-	cat scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-$(LIBSO): $(LIBSOMAJ)</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)</div><div class='del'>-</div><div class='del'>-$(LIBSOMAJ): $(LIBSOVER)</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(LIBSOVER): $(OBJS)</div><div class='del'>-	$(LDSHARED) -o $@ $(OBJS)</div><div class='del'>-	$(RM_F) $(LIBSO) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(OLDSOVER): $(OBJS)</div><div class='del'>-	$(LDLEGACY) -o $@ $(OBJS)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o libpng.a</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	echo</div><div class='del'>-	echo Testing local static library.</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install-headers: png.h pngconf.h</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-static: install-headers libpng.a</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	cp libpng.a $(DL)/$(LIBNAME).a</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME).a</div><div class='del'>-	-@$(RM_F) $(DL)/libpng.a</div><div class='del'>-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)</div><div class='del'>-</div><div class='del'>-install-shared: install-headers $(LIBSOVER) libpng.pc \</div><div class='del'>-	$(OLDSOVER)</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOVER)*</div><div class='del'>-	cp $(LIBSOVER) $(DL)</div><div class='del'>-	cp $(OLDSOVER) $(DL)</div><div class='del'>-	chmod 755 $(DL)/$(LIBSOVER)</div><div class='del'>-	chmod 755 $(DL)/$(OLDSOVER)</div><div class='del'>-	(cd $(DL); \</div><div class='del'>-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \</div><div class='del'>-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO))</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-man: libpng.3 libpngpf.3 png.5</div><div class='del'>-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi</div><div class='del'>-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpng.3</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpngpf.3</div><div class='del'>-	cp libpng.3 $(DM)/man3</div><div class='del'>-	cp libpngpf.3 $(DM)/man3</div><div class='del'>-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man5/png.5</div><div class='del'>-	cp png.5 $(DM)/man5</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@$(RM_F) $(DB)/libpng-config</div><div class='del'>-	-@$(RM_F) $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) -I$(DI) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(DL) -L$(ZLIBLIB) \</div><div class='del'>-           -rpath $(ZLIBLIB):$(DL) \</div><div class='del'>-	   -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library.</div><div class='del'>-	$(CC) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(ZLIBLIB) \</div><div class='del'>-           -rpath $(ZLIBLIB):`$(BINPATH)/$(LIBNAME)-config --libdir` \</div><div class='del'>-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtesti pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) libpng.a pngtest pngtesti pngout.png libpng.pc \</div><div class='del'>-        so_locations libpng-config $(LIBSO) $(LIBSOMAJ)* $(OLDSOVER)</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.sgi b/src/3rdparty/libpng/scripts/makefile.sgi<br/>deleted file mode 100644<br/>index c7550f1..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.sgi?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.sgi</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,247 +0,0 @@</div><div class='del'>-# makefile for libpng.a and libpng14.so, SGI IRIX with 'cc'</div><div class='del'>-# Copyright (C) 2001-2002, 2006, 2007 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Library name:</div><div class='del'>-LIBNAME=libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Shared library names:</div><div class='del'>-LIBSO=$(LIBNAME).so</div><div class='del'>-LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)</div><div class='del'>-LIBSOVER=$(LIBNAME).so.$(PNGVER)</div><div class='del'>-OLDSO=libpng.so</div><div class='del'>-OLDSOMAJ=libpng.so.14</div><div class='del'>-OLDSOVER=libpng.so.14.$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Utilities:</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-CC=cc</div><div class='del'>-MKDIR_P=mkdir -p</div><div class='del'>-LN_SF=ln -sf</div><div class='del'>-RANLIB=echo</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-# Where make install puts libpng.a, libpng14.so, and libpng14/png.h</div><div class='del'>-# Prefix must be a full pathname.</div><div class='del'>-</div><div class='del'>-prefix=/usr/local</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-#ZLIBLIB=/usr/local/lib32</div><div class='del'>-#ZLIBINC=/usr/local/include</div><div class='del'>-#ZLIBLIB=/usr/local/lib</div><div class='del'>-#ZLIBINC=/usr/local/include</div><div class='del'>-ZLIBLIB=../zlib</div><div class='del'>-ZLIBINC=../zlib</div><div class='del'>-</div><div class='del'>-# ABI can be blank to use default for your system, -32, -o32, -n32, or -64</div><div class='del'>-# See "man abi".  zlib must be built with the same ABI.</div><div class='del'>-ABI=</div><div class='del'>-</div><div class='del'>-WARNMORE=-fullwarn</div><div class='del'>-# Note: -KPIC is the default anyhow</div><div class='del'>-#CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC # -g -DPNG_DEBUG=5</div><div class='del'>-CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE)</div><div class='del'>-LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng14 -lz -lm</div><div class='del'>-LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm</div><div class='del'>-LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \</div><div class='del'>-  -set_version sgi$(PNGMAJ).0</div><div class='del'>-LDLEGACY=cc $(ABI) -shared -soname $(OLDSOMAJ) \</div><div class='del'>-  -set_version sgi$3.0</div><div class='del'>-# See "man dso" for info about shared objects</div><div class='del'>-</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-#LIBPATH=$(exec_prefix)/lib32</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DB=$(DESTDIR)$(BINPATH)</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-DM=$(DESTDIR)$(MANPATH)</div><div class='del'>-</div><div class='del'>-OBJS =  png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-all: libpng.a pngtest shared libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-shared: $(LIBSOVER)</div><div class='del'>-</div><div class='del'>-libpng.pc:</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz\ -lm! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config:</div><div class='del'>-	( cat scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo ccopts=\"$(ABI)\"; \</div><div class='del'>-	echo ldopts=\"$(ABI)\"; \</div><div class='del'>-	echo L_opts=\"-L$(LIBPATH)\"; \</div><div class='del'>-	echo libdir=\"$(LIBPATH)\"; \</div><div class='del'>-	echo libs=\"-lpng14 -lz -lm\"; \</div><div class='del'>-	cat scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-$(LIBSO): $(LIBSOMAJ)</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)</div><div class='del'>-</div><div class='del'>-$(LIBSOMAJ): $(LIBSOVER)</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(LIBSOVER): $(OBJS)</div><div class='del'>-	$(LDSHARED) -o $@ $(OBJS)</div><div class='del'>-	$(RM_F) $(LIBSO) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(OLDSOVER): $(OBJS)</div><div class='del'>-	$(LDLEGACY) -o $@ $(OBJS)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o libpng.a</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	echo</div><div class='del'>-	echo Testing local static library.</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install-headers: png.h pngconf.h</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-static: install-headers libpng.a</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	cp libpng.a $(DL)/$(LIBNAME).a</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME).a</div><div class='del'>-	-@$(RM_F) $(DL)/libpng.a</div><div class='del'>-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)</div><div class='del'>-</div><div class='del'>-install-shared: install-headers $(LIBSOVER) libpng.pc \</div><div class='del'>-	$(OLDSOVER)</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOVER)*</div><div class='del'>-	cp $(LIBSOVER) $(DL)</div><div class='del'>-	cp $(OLDSOVER) $(DL)</div><div class='del'>-	chmod 755 $(DL)/$(LIBSOVER)</div><div class='del'>-	chmod 755 $(DL)/$(OLDSOVER)</div><div class='del'>-	(cd $(DL); \</div><div class='del'>-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \</div><div class='del'>-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO))</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-man: libpng.3 libpngpf.3 png.5</div><div class='del'>-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi</div><div class='del'>-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpng.3</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpngpf.3</div><div class='del'>-	cp libpng.3 $(DM)/man3</div><div class='del'>-	cp libpngpf.3 $(DM)/man3</div><div class='del'>-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man5/png.5</div><div class='del'>-	cp png.5 $(DM)/man5</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@$(RM_F) $(DB)/libpng-config</div><div class='del'>-	-@$(RM_F) $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) -I$(DI) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(DL) -L$(ZLIBLIB) \</div><div class='del'>-           -rpath $(ZLIBLIB):$(DL) \</div><div class='del'>-	   -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library.</div><div class='del'>-	$(CC) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -L$(ZLIBLIB) \</div><div class='del'>-           -rpath $(ZLIBLIB):`$(BINPATH)/$(LIBNAME)-config --libdir` \</div><div class='del'>-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`</div><div class='del'>-	./pngtesti pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \</div><div class='del'>-	$(LIBSO) $(LIBSOMAJ)* \</div><div class='del'>-	$(OLDSOVER) \</div><div class='del'>-	so_locations</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.so9 b/src/3rdparty/libpng/scripts/makefile.so9<br/>deleted file mode 100644<br/>index fb09b9e..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.so9?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.so9</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,254 +0,0 @@</div><div class='del'>-# makefile for libpng on Solaris 9 (beta) with Forte cc</div><div class='del'>-# Updated by Chad Schrock for Solaris 9</div><div class='del'>-# Contributed by William L. Sebok, based on makefile.linux</div><div class='del'>-# Copyright (C) 2002, 2006, 2008 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1998-2001 Greg Roelofs</div><div class='del'>-# Copyright (C) 1996-1997 Andreas Dilger</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Library name:</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-LIBNAME = libpng14</div><div class='del'>-</div><div class='del'>-# Shared library names:</div><div class='del'>-LIBSO=$(LIBNAME).so</div><div class='del'>-LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)</div><div class='del'>-LIBSOVER=$(LIBNAME).so.$(PNGVER)</div><div class='del'>-OLDSO=libpng.so</div><div class='del'>-OLDSOMAJ=libpng.so.14</div><div class='del'>-OLDSOVER=libpng.so.14.$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Utilities:</div><div class='del'>-# gcc 2.95 doesn't work.</div><div class='del'>-CC=cc</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-MKDIR_P=mkdir -p</div><div class='del'>-LN_SF=ln -f -s</div><div class='del'>-RANLIB=echo</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-# Where make install puts libpng.a, $(OLDSO)*, and png.h</div><div class='del'>-prefix=/usr/local</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-# Changing these to ../zlib poses a security risk.  If you want</div><div class='del'>-# to have zlib in an adjacent directory, specify the full path instead of "..".</div><div class='del'>-#ZLIBLIB=../zlib</div><div class='del'>-#ZLIBINC=../zlib</div><div class='del'>-#ZLIBLIB=/usr/local/lib</div><div class='del'>-#ZLIBINC=/usr/local/include</div><div class='del'>-#Use the preinstalled zlib that comes with Solaris 9:</div><div class='del'>-ZLIBLIB=/usr/lib</div><div class='del'>-ZLIBINC=/usr/include</div><div class='del'>-</div><div class='del'>-#WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \</div><div class='del'>-	-Wmissing-declarations -Wtraditional -Wcast-align \</div><div class='del'>-	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion</div><div class='del'>-#CFLAGS=-I$(ZLIBINC) -W -Wall -O3 $(WARNMORE) -g -DPNG_DEBUG=5 -DPNG_NO_MMX_CODE</div><div class='del'>-CFLAGS=-I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE</div><div class='del'>-LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm</div><div class='del'>-</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DB=$(DESTDIR)$(BINPATH)</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-DM=$(DESTDIR)$(MANPATH)</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-OBJSDLL = $(OBJS:.o=.pic.o)</div><div class='del'>-</div><div class='del'>-.SUFFIXES:      .c .o .pic.o</div><div class='del'>-</div><div class='del'>-.c.pic.o:</div><div class='del'>-	$(CC) -c $(CFLAGS) -KPIC -o $@ $*.c</div><div class='del'>-</div><div class='del'>-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-libpng.pc:</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz\ -lm! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config:</div><div class='del'>-	( cat scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo L_opts=\"-L$(LIBPATH)\"; \</div><div class='del'>-	echo R_opts=\"-R$(LIBPATH)\"; \</div><div class='del'>-	echo libs=\"-lpng14 -lz -lm\"; \</div><div class='del'>-	cat scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-$(LIBSO): $(LIBSOMAJ)</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)</div><div class='del'>-</div><div class='del'>-$(LIBSOMAJ): $(LIBSOVER)</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(LIBSOVER): $(OBJSDLL)</div><div class='del'>-	@case "`type ld`" in *ucb*) \</div><div class='del'>-	echo; \</div><div class='del'>-	echo '## WARNING:'; \</div><div class='del'>-	echo '## The commands "CC" and "LD" must NOT refer to /usr/ucb/cc'; \</div><div class='del'>-	echo '## and /usr/ucb/ld.  If they do, you need to adjust your PATH'; \</div><div class='del'>-	echo '## environment variable to put /usr/ccs/bin ahead of /usr/ucb.'; \</div><div class='del'>-	echo '## The environment variable LD_LIBRARY_PATH should not be set'; \</div><div class='del'>-	echo '## at all.  If it is, things are likely to break because of'; \</div><div class='del'>-	echo '## the libucb dependency that is created.'; \</div><div class='del'>-	echo; \</div><div class='del'>-	;; \</div><div class='del'>-	esac</div><div class='del'>-	$(LD) -G -h $(LIBSOMAJ) \</div><div class='del'>-	 -o $(LIBSOVER) $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-$(OLDSOVER): $(OBJS)</div><div class='del'>-	$(LD) -G -h $(OLDSOMAJ) \</div><div class='del'>-	 -o $(OLDSOVER) $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o $(LIBSO)</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install-headers: png.h pngconf.h</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-static: install-headers libpng.a</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	cp libpng.a $(DL)/$(LIBNAME).a</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME).a</div><div class='del'>-	-@$(RM_F) $(DL)/libpng.a</div><div class='del'>-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)</div><div class='del'>-</div><div class='del'>-install-shared: install-headers $(LIBSOVER) libpng.pc \</div><div class='del'>-	$(OLDSOVER)</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOVER)*</div><div class='del'>-	cp $(LIBSOVER) $(DL)</div><div class='del'>-	cp $(OLDSOVER) $(DL)</div><div class='del'>-	chmod 755 $(DL)/$(LIBSOVER)</div><div class='del'>-	chmod 755 $(DL)/$(OLDSOVER)</div><div class='del'>-	(cd $(DL); \</div><div class='del'>-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \</div><div class='del'>-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO))</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-man: libpng.3 libpngpf.3 png.5</div><div class='del'>-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi</div><div class='del'>-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpng.3</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpngpf.3</div><div class='del'>-	cp libpng.3 $(DM)/man3</div><div class='del'>-	cp libpngpf.3 $(DM)/man3</div><div class='del'>-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man5/png.5</div><div class='del'>-	cp png.5 $(DM)/man5</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@$(RM_F) $(DB)/libpng-config</div><div class='del'>-	-@$(RM_F) $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) -I$(DI) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` \</div><div class='del'>-	   -L$(DL) -L$(ZLIBLIB)  -R$(ZLIBLIB) -R$(DL)</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library.</div><div class='del'>-	$(CC) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \</div><div class='del'>-	   -L$(ZLIBLIB) -R$(ZLIBLIB)</div><div class='del'>-	./pngtesti pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o libpng.a pngtest pngtesti pngout.png \</div><div class='del'>-	libpng-config $(LIBSO) $(LIBSOMAJ)* \</div><div class='del'>-	$(OLDSOVER) \</div><div class='del'>-	libpng.pc</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o png.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o pngerror.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o pngrio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o pngwio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o pngmem.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o pngset.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o pngget.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o pngread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o pngrtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o pngrutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o pngtrans.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o pngwrite.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.solaris b/src/3rdparty/libpng/scripts/makefile.solaris<br/>deleted file mode 100644<br/>index 6c4adfc..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.solaris?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.solaris</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,251 +0,0 @@</div><div class='del'>-# makefile for libpng on Solaris 2.x with gcc</div><div class='del'>-# Copyright (C) 2004, 2006-2008 Glenn Randers-Pehrson</div><div class='del'>-# Contributed by William L. Sebok, based on makefile.linux</div><div class='del'>-# Copyright (C) 1998 Greg Roelofs</div><div class='del'>-# Copyright (C) 1996, 1997 Andreas Dilger</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Library name:</div><div class='del'>-LIBNAME = libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Shared library names:</div><div class='del'>-LIBSO=$(LIBNAME).so</div><div class='del'>-LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)</div><div class='del'>-LIBSOVER=$(LIBNAME).so.$(PNGVER)</div><div class='del'>-OLDSO=libpng.so</div><div class='del'>-OLDSOMAJ=libpng.so.14</div><div class='del'>-OLDSOVER=libpng.so.14.$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Utilities:</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-CC=gcc</div><div class='del'>-MKDIR_P=mkdir -p</div><div class='del'>-LN_SF=ln -f -s</div><div class='del'>-RANLIB=echo</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-# Where make install puts libpng.a, libpng14.so*, and png.h</div><div class='del'>-prefix=/usr/local</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-# Changing these to ../zlib poses a security risk.  If you want</div><div class='del'>-# to have zlib in an adjacent directory, specify the full path instead of "..".</div><div class='del'>-#ZLIBLIB=../zlib</div><div class='del'>-#ZLIBINC=../zlib</div><div class='del'>-</div><div class='del'>-ZLIBLIB=/usr/local/lib</div><div class='del'>-ZLIBINC=/usr/local/include</div><div class='del'>-</div><div class='del'>-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \</div><div class='del'>-	-Wmissing-declarations -Wtraditional -Wcast-align \</div><div class='del'>-	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion</div><div class='del'>-CFLAGS=-I$(ZLIBINC) -W -Wall -O \</div><div class='del'>-	# $(WARNMORE) -g -DPNG_DEBUG=5</div><div class='del'>-LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm</div><div class='del'>-</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DB=$(DESTDIR)$(BINPATH)</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-DM=$(DESTDIR)$(MANPATH)</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-OBJSDLL = $(OBJS:.o=.pic.o)</div><div class='del'>-</div><div class='del'>-.SUFFIXES:      .c .o .pic.o</div><div class='del'>-</div><div class='del'>-.c.pic.o:</div><div class='del'>-	$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c</div><div class='del'>-</div><div class='del'>-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-libpng.pc:</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz\ -lm! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config:</div><div class='del'>-	( cat scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo cppflags=\"\"; \</div><div class='del'>-	echo L_opts=\"-L$(LIBPATH)\"; \</div><div class='del'>-	echo R_opts=\"-R$(LIBPATH)\"; \</div><div class='del'>-	echo libs=\"-lpng14 -lz -lm\"; \</div><div class='del'>-	cat scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-$(LIBSO): $(LIBSOMAJ)</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)</div><div class='del'>-</div><div class='del'>-$(LIBSOMAJ): $(LIBSOVER)</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(LIBSOVER): $(OBJSDLL)</div><div class='del'>-	@case "`type ld`" in *ucb*) \</div><div class='del'>-	echo; \</div><div class='del'>-	echo '## WARNING:'; \</div><div class='del'>-	echo '## The commands "CC" and "LD" must NOT refer to /usr/ucb/cc'; \</div><div class='del'>-	echo '## and /usr/ucb/ld.  If they do, you need to adjust your PATH'; \</div><div class='del'>-	echo '## environment variable to put /usr/ccs/bin ahead of /usr/ucb.'; \</div><div class='del'>-	echo '## The environment variable LD_LIBRARY_PATH should not be set'; \</div><div class='del'>-	echo '## at all.  If it is, things are likely to break because of'; \</div><div class='del'>-	echo '## the libucb dependency that is created.'; \</div><div class='del'>-	echo; \</div><div class='del'>-	;; \</div><div class='del'>-	esac</div><div class='del'>-	$(LD) -G -h $(LIBSOMAJ) \</div><div class='del'>-	 -o $(LIBSOVER) $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-$(OLDSOVER): $(OBJS)</div><div class='del'>-	$(LD) -G -h $(OLDSOMAJ) \</div><div class='del'>-	 -o $(OLDSOVER) $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o $(LIBSO)</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install-headers: png.h pngconf.h</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-static: install-headers libpng.a</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	cp libpng.a $(DL)/$(LIBNAME).a</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME).a</div><div class='del'>-	-@$(RM_F) $(DL)/libpng.a</div><div class='del'>-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)</div><div class='del'>-</div><div class='del'>-install-shared: install-headers $(LIBSOVER) libpng.pc \</div><div class='del'>-	$(OLDSOVER)</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOVER)*</div><div class='del'>-	cp $(LIBSOVER) $(DL)</div><div class='del'>-	cp $(OLDSOVER) $(DL)</div><div class='del'>-	chmod 755 $(DL)/$(LIBSOVER)</div><div class='del'>-	chmod 755 $(DL)/$(OLDSOVER)</div><div class='del'>-	(cd $(DL); \</div><div class='del'>-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \</div><div class='del'>-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ))</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-man: libpng.3 libpngpf.3 png.5</div><div class='del'>-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi</div><div class='del'>-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpng.3</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpngpf.3</div><div class='del'>-	cp libpng.3 $(DM)/man3</div><div class='del'>-	cp libpngpf.3 $(DM)/man3</div><div class='del'>-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man5/png.5</div><div class='del'>-	cp png.5 $(DM)/man5</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@$(RM_F) $(DB)/libpng-config</div><div class='del'>-	-@$(RM_F) $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) -I$(DI) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` \</div><div class='del'>-	   -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL)</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library.</div><div class='del'>-	$(CC) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \</div><div class='del'>-	   -L$(ZLIBLIB) -R$(ZLIBLIB)</div><div class='del'>-	./pngtesti pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o libpng.a pngtest pngtesti pngout.png \</div><div class='del'>-	libpng-config $(LIBSO) $(LIBSOMAJ)* \</div><div class='del'>-	$(OLDSOVER) \</div><div class='del'>-	libpng.pc</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o png.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o pngerror.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o pngrio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o pngwio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o pngmem.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o pngset.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o pngget.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o pngread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o pngrtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o pngrutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o pngtrans.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o pngwrite.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.solaris-x86 b/src/3rdparty/libpng/scripts/makefile.solaris-x86<br/>deleted file mode 100644<br/>index 8ee7be1..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.solaris-x86?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.solaris-x86</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,251 +0,0 @@</div><div class='del'>-# makefile for libpng on Solaris 2.x with gcc</div><div class='del'>-# Copyright (C) 2004, 2006-2008 Glenn Randers-Pehrson</div><div class='del'>-# Contributed by William L. Sebok, based on makefile.linux</div><div class='del'>-# Copyright (C) 1998 Greg Roelofs</div><div class='del'>-# Copyright (C) 1996, 1997 Andreas Dilger</div><div class='del'>-</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# Library name:</div><div class='del'>-LIBNAME = libpng14</div><div class='del'>-PNGMAJ = 14</div><div class='del'>-PNGMIN = 1.4.0</div><div class='del'>-PNGVER = $(PNGMAJ).$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Shared library names:</div><div class='del'>-LIBSO=$(LIBNAME).so</div><div class='del'>-LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)</div><div class='del'>-LIBSOVER=$(LIBNAME).so.$(PNGVER)</div><div class='del'>-OLDSO=libpng.so</div><div class='del'>-OLDSOMAJ=libpng.so.14</div><div class='del'>-OLDSOVER=libpng.so.14.$(PNGMIN)</div><div class='del'>-</div><div class='del'>-# Utilities:</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-CC=gcc</div><div class='del'>-MKDIR_P=mkdir -p</div><div class='del'>-LN_SF=ln -f -s</div><div class='del'>-RANLIB=echo</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-# Where make install puts libpng.a, libpng14.so*, and png.h</div><div class='del'>-prefix=/usr/local</div><div class='del'>-exec_prefix=$(prefix)</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-# Changing these to ../zlib poses a security risk.  If you want</div><div class='del'>-# to have zlib in an adjacent directory, specify the full path instead of "..".</div><div class='del'>-#ZLIBLIB=../zlib</div><div class='del'>-#ZLIBINC=../zlib</div><div class='del'>-</div><div class='del'>-ZLIBLIB=/usr/local/lib</div><div class='del'>-ZLIBINC=/usr/local/include</div><div class='del'>-</div><div class='del'>-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \</div><div class='del'>-	-Wmissing-declarations -Wtraditional -Wcast-align \</div><div class='del'>-	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion</div><div class='del'>-CFLAGS=-I$(ZLIBINC) -W -Wall -O \</div><div class='del'>-	# $(WARNMORE) -g -DPNG_DEBUG=5</div><div class='del'>-LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng14 -lz -lm</div><div class='del'>-</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(exec_prefix)/lib</div><div class='del'>-MANPATH=$(prefix)/man</div><div class='del'>-BINPATH=$(exec_prefix)/bin</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-DB=$(DESTDIR)$(BINPATH)</div><div class='del'>-DI=$(DESTDIR)$(INCPATH)</div><div class='del'>-DL=$(DESTDIR)$(LIBPATH)</div><div class='del'>-DM=$(DESTDIR)$(MANPATH)</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-OBJSDLL = $(OBJS:.o=.pic.o)</div><div class='del'>-</div><div class='del'>-.SUFFIXES:      .c .o .pic.o</div><div class='del'>-</div><div class='del'>-.c.pic.o:</div><div class='del'>-	$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c</div><div class='del'>-</div><div class='del'>-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@ $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-libpng.pc:</div><div class='del'>-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \</div><div class='del'>-	-e s!@exec_prefix@!$(exec_prefix)! \</div><div class='del'>-	-e s!@libdir@!$(LIBPATH)! \</div><div class='del'>-	-e s!@includedir@!$(INCPATH)! \</div><div class='del'>-	-e s!-lpng14!-lpng14\ -lz\ -lm! &gt; libpng.pc</div><div class='del'>-</div><div class='del'>-libpng-config:</div><div class='del'>-	( cat scripts/libpng-config-head.in; \</div><div class='del'>-	echo prefix=\"$(prefix)\"; \</div><div class='del'>-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \</div><div class='del'>-	echo cppflags=\""; \</div><div class='del'>-	echo L_opts=\"-L$(LIBPATH)\"; \</div><div class='del'>-	echo R_opts=\"-R$(LIBPATH)\"; \</div><div class='del'>-	echo libs=\"-lpng14 -lz -lm\"; \</div><div class='del'>-	cat scripts/libpng-config-body.in ) &gt; libpng-config</div><div class='del'>-	chmod +x libpng-config</div><div class='del'>-</div><div class='del'>-$(LIBSO): $(LIBSOMAJ)</div><div class='del'>-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)</div><div class='del'>-</div><div class='del'>-$(LIBSOMAJ): $(LIBSOVER)</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)</div><div class='del'>-</div><div class='del'>-$(LIBSOVER): $(OBJSDLL)</div><div class='del'>-	@case "`type ld`" in *ucb*) \</div><div class='del'>-	echo; \</div><div class='del'>-	echo '## WARNING:'; \</div><div class='del'>-	echo '## The commands "CC" and "LD" must NOT refer to /usr/ucb/cc'; \</div><div class='del'>-	echo '## and /usr/ucb/ld.  If they do, you need to adjust your PATH'; \</div><div class='del'>-	echo '## environment variable to put /usr/ccs/bin ahead of /usr/ucb.'; \</div><div class='del'>-	echo '## The environment variable LD_LIBRARY_PATH should not be set'; \</div><div class='del'>-	echo '## at all.  If it is, things are likely to break because of'; \</div><div class='del'>-	echo '## the libucb dependency that is created.'; \</div><div class='del'>-	echo; \</div><div class='del'>-	;; \</div><div class='del'>-	esac</div><div class='del'>-	$(LD) -G -h $(LIBSOMAJ) \</div><div class='del'>-	 -o $(LIBSOVER) $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-$(OLDSOVER): $(OBJS)</div><div class='del'>-	$(LD) -G -h $(OLDSOMAJ) \</div><div class='del'>-	 -o $(OLDSOVER) $(OBJSDLL)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o $(LIBSO)</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install-headers: png.h pngconf.h</div><div class='del'>-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi</div><div class='del'>-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi</div><div class='del'>-	cp png.h pngconf.h $(DI)/$(LIBNAME)</div><div class='del'>-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h</div><div class='del'>-	-@$(RM_F) $(DI)/libpng</div><div class='del'>-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)</div><div class='del'>-</div><div class='del'>-install-static: install-headers libpng.a</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	cp libpng.a $(DL)/$(LIBNAME).a</div><div class='del'>-	chmod 644 $(DL)/$(LIBNAME).a</div><div class='del'>-	-@$(RM_F) $(DL)/libpng.a</div><div class='del'>-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)</div><div class='del'>-</div><div class='del'>-install-shared: install-headers $(LIBSOVER) libpng.pc \</div><div class='del'>-	$(OLDSOVER)</div><div class='del'>-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(LIBSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSO)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOMAJ)</div><div class='del'>-	-@$(RM_F) $(DL)/$(OLDSOVER)*</div><div class='del'>-	cp $(LIBSOVER) $(DL)</div><div class='del'>-	cp $(OLDSOVER) $(DL)</div><div class='del'>-	chmod 755 $(DL)/$(LIBSOVER)</div><div class='del'>-	chmod 755 $(DL)/$(OLDSOVER)</div><div class='del'>-	(cd $(DL); \</div><div class='del'>-	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \</div><div class='del'>-	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSO); \</div><div class='del'>-	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ))</div><div class='del'>-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc</div><div class='del'>-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc</div><div class='del'>-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)</div><div class='del'>-</div><div class='del'>-install-man: libpng.3 libpngpf.3 png.5</div><div class='del'>-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi</div><div class='del'>-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpng.3</div><div class='del'>-	-@$(RM_F) $(DM)/man3/libpngpf.3</div><div class='del'>-	cp libpng.3 $(DM)/man3</div><div class='del'>-	cp libpngpf.3 $(DM)/man3</div><div class='del'>-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi</div><div class='del'>-	-@$(RM_F) $(DM)/man5/png.5</div><div class='del'>-	cp png.5 $(DM)/man5</div><div class='del'>-</div><div class='del'>-install-config: libpng-config</div><div class='del'>-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi</div><div class='del'>-	-@$(RM_F) $(DB)/libpng-config</div><div class='del'>-	-@$(RM_F) $(DB)/$(LIBNAME)-config</div><div class='del'>-	cp libpng-config $(DB)/$(LIBNAME)-config</div><div class='del'>-	chmod 755 $(DB)/$(LIBNAME)-config</div><div class='del'>-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)</div><div class='del'>-</div><div class='del'>-install: install-static install-shared install-man install-config</div><div class='del'>-</div><div class='del'>-# If you installed in $(DESTDIR), test-installed won't work until you</div><div class='del'>-# move the library to its final location.  Use test-dd to test it</div><div class='del'>-# before then.</div><div class='del'>-</div><div class='del'>-test-dd:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library in $(DL).</div><div class='del'>-	$(CC) -I$(DI) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags` \</div><div class='del'>-	   -L$(DL) -L$(ZLIBLIB) -R$(ZLIBLIB) -R$(DL)</div><div class='del'>-	./pngtestd pngtest.png</div><div class='del'>-</div><div class='del'>-test-installed:</div><div class='del'>-	echo</div><div class='del'>-	echo Testing installed dynamic shared library.</div><div class='del'>-	$(CC) -I$(ZLIBINC) \</div><div class='del'>-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \</div><div class='del'>-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` \</div><div class='del'>-	   -L$(ZLIBLIB) -R$(ZLIBLIB)</div><div class='del'>-	./pngtesti pngtest.png</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o libpng.a pngtest pngtesti pngout.png \</div><div class='del'>-	libpng-config $(LIBSO) $(LIBSOMAJ)* \</div><div class='del'>-	$(OLDSOVER) \</div><div class='del'>-	libpng.pc</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o png.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o pngerror.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o pngrio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o pngwio.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o pngmem.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o pngset.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o pngget.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o pngread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o pngrtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o pngrutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o pngtrans.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o pngwrite.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o pngwtran.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o pngpread.pic.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.std b/src/3rdparty/libpng/scripts/makefile.std<br/>deleted file mode 100644<br/>index afb885a..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.std?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.std</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,95 +0,0 @@</div><div class='del'>-# makefile for libpng</div><div class='del'>-# Copyright (C) 2002, 2006 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# where make install puts libpng.a and png.h</div><div class='del'>-prefix=/usr/local</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(prefix)/lib</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-#ZLIBLIB=/usr/local/lib</div><div class='del'>-#ZLIBINC=/usr/local/include</div><div class='del'>-ZLIBLIB=../zlib</div><div class='del'>-ZLIBINC=../zlib</div><div class='del'>-</div><div class='del'>-CC=cc</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-MKDIR_P=mkdir</div><div class='del'>-LN_SF=ln -sf</div><div class='del'>-RANLIB=ranlib</div><div class='del'>-RM_F=rm -f</div><div class='del'>-</div><div class='del'>-CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5</div><div class='del'>-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-all: libpng.a pngtest</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@  $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o libpng.a</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install: libpng.a</div><div class='del'>-	-@$(MKDIR_P) $(DESTDIR)$(INCPATH)</div><div class='del'>-	-@$(MKDIR_P) $(DESTDIR)$(INCPATH)/libpng</div><div class='del'>-	-@$(MKDIR_P) $(DESTDIR)$(LIBPATH)</div><div class='del'>-	-@$(RM_F) $(DESTDIR)$(INCPATH)/png.h</div><div class='del'>-	-@$(RM_F) $(DESTDIR)$(INCPATH)/pngconf.h</div><div class='del'>-	cp png.h $(DESTDIR)$(INCPATH)/libpng</div><div class='del'>-	cp pngconf.h $(DESTDIR)$(INCPATH)/libpng</div><div class='del'>-	chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h</div><div class='del'>-	chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h</div><div class='del'>-	(cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)</div><div class='del'>-	cp libpng.a $(DESTDIR)$(LIBPATH)</div><div class='del'>-	chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o libpng.a pngtest pngout.png</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.sunos b/src/3rdparty/libpng/scripts/makefile.sunos<br/>deleted file mode 100644<br/>index 984379c..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.sunos?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.sunos</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,100 +0,0 @@</div><div class='del'>-# makefile for libpng</div><div class='del'>-# Copyright (C) 2002, 2006 Glenn Randers-Pehrson</div><div class='del'>-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# where make install puts libpng.a and png.h</div><div class='del'>-prefix=/usr/local</div><div class='del'>-INCPATH=$(prefix)/include</div><div class='del'>-LIBPATH=$(prefix)/lib</div><div class='del'>-</div><div class='del'>-# override DESTDIR= on the make install command line to easily support</div><div class='del'>-# installing into a temporary location.  Example:</div><div class='del'>-#</div><div class='del'>-#    make install DESTDIR=/tmp/build/libpng</div><div class='del'>-#</div><div class='del'>-# If you're going to install into a temporary location</div><div class='del'>-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before</div><div class='del'>-# you execute make install.</div><div class='del'>-DESTDIR=</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-#ZLIBLIB=/usr/local/lib</div><div class='del'>-#ZLIBINC=/usr/local/include</div><div class='del'>-ZLIBLIB=../zlib</div><div class='del'>-ZLIBINC=../zlib</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow -Wconversion \</div><div class='del'>-	-Wmissing-declarations -Wtraditional -Wcast-align \</div><div class='del'>-	-Wstrict-prototypes -Wmissing-prototypes</div><div class='del'>-</div><div class='del'>-CC=gcc</div><div class='del'>-AR_RC=ar rc</div><div class='del'>-MKDIR_P=mkdir -p</div><div class='del'>-LN_SF=ln -f -s</div><div class='del'>-RANLIB=ranlib</div><div class='del'>-RM_F=/bin/rm -f</div><div class='del'>-</div><div class='del'>-CFLAGS=-I$(ZLIBINC) -O # $(WARNMORE) -DPNG_DEBUG=5</div><div class='del'>-LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \</div><div class='del'>-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \</div><div class='del'>-	pngwtran.o pngmem.o pngerror.o pngpread.o</div><div class='del'>-</div><div class='del'>-all: libpng.a pngtest</div><div class='del'>-</div><div class='del'>-libpng.a: $(OBJS)</div><div class='del'>-	$(AR_RC) $@  $(OBJS)</div><div class='del'>-	$(RANLIB) $@</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o libpng.a</div><div class='del'>-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-test: pngtest</div><div class='del'>-	./pngtest</div><div class='del'>-</div><div class='del'>-install: libpng.a</div><div class='del'>-	-@$(MKDIR_P) $(DESTDIR)$(INCPATH)</div><div class='del'>-	-@$(MKDIR_P) $(DESTDIR)$(INCPATH)/libpng</div><div class='del'>-	-@$(MKDIR_P) $(DESTDIR)$(LIBPATH)</div><div class='del'>-	-@$(RM_F) $(DESTDIR)$(INCPATH)/png.h</div><div class='del'>-	-@$(RM_F) $(DESTDIR)$(INCPATH)/pngconf.h</div><div class='del'>-	cp png.h $(DESTDIR)$(INCPATH)/libpng</div><div class='del'>-	cp pngconf.h $(DESTDIR)$(INCPATH)/libpng</div><div class='del'>-	chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h</div><div class='del'>-	chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h</div><div class='del'>-	(cd $(DESTDIR)$(INCPATH); $(LN_SF) libpng/* .)</div><div class='del'>-	cp libpng.a $(DESTDIR)$(LIBPATH)</div><div class='del'>-	chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM_F) *.o libpng.a pngtest pngout.png</div><div class='del'>-</div><div class='del'>-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO</div><div class='del'>-writelock:</div><div class='del'>-	chmod a-w *.[ch35] $(DOCS) scripts/*</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-png.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngerror.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwio.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngmem.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngset.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngget.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngrutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngtrans.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwrite.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwtran.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngwutil.o: png.h pngconf.h pngpriv.h</div><div class='del'>-pngpread.o: png.h pngconf.h pngpriv.h</div><div class='del'>-</div><div class='del'>-pngtest.o: png.h pngconf.h</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.tc3 b/src/3rdparty/libpng/scripts/makefile.tc3<br/>deleted file mode 100644<br/>index bf6ade6..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.tc3?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.tc3</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,89 +0,0 @@</div><div class='del'>-# Makefile for libpng</div><div class='del'>-# TurboC/C++ (Note: All modules are compiled in C mode)</div><div class='del'>-</div><div class='del'>-# To use, do "make -fmakefile.tc3"</div><div class='del'>-</div><div class='del'>-# ----- Turbo C 3.00 (can be modified to work with earlier versions) -----</div><div class='del'>-</div><div class='del'>-MODEL=l</div><div class='del'>-CFLAGS=-O2 -Z -m$(MODEL) -I..\zlib</div><div class='del'>-#CFLAGS=-D_NO_PROTO -O2 -Z -m$(MODEL) -I..\zlib  # Turbo C older than 3.00</div><div class='del'>-CC=tcc</div><div class='del'>-LD=tcc</div><div class='del'>-LIB=tlib</div><div class='del'>-LDFLAGS=-m$(MODEL) -L..\zlib</div><div class='del'>-O=.obj</div><div class='del'>-E=.exe</div><div class='del'>-</div><div class='del'>-# variables</div><div class='del'>-OBJS1 = png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O)</div><div class='del'>-OBJS2 = pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O)</div><div class='del'>-OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)</div><div class='del'>-OBJSL1 = +png$(O) +pngset$(O) +pngget$(O) +pngrutil$(O) +pngtrans$(O)</div><div class='del'>-OBJSL2 = +pngwutil$(O) +pngmem$(O) +pngpread$(O) +pngread$(O) +pngerror$(O)</div><div class='del'>-OBJSL3 = +pngwrite$(O) +pngrtran$(O) +pngwtran$(O) +pngrio$(O) +pngwio$(O)</div><div class='del'>-</div><div class='del'>-all: libpng$(MODEL).lib pngtest$(E)</div><div class='del'>-</div><div class='del'>-pngtest: pngtest$(E)</div><div class='del'>-</div><div class='del'>-test: pngtest$(E)</div><div class='del'>-	pngtest$(E)</div><div class='del'>-</div><div class='del'>-png$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-		  $(CC) -c $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-pngset$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-		  $(CC) -c $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-pngget$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-		  $(CC) -c $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-pngread$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-		  $(CC) -c $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-pngpread$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-		  $(CC) -c $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-pngrtran$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-		  $(CC) -c $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-pngrutil$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-		  $(CC) -c $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-pngerror$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-pngmem$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-pngrio$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-pngwio$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-pngtest$(O): png.h pngconf.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-pngtrans$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-pngwrite$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-pngwtran$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-pngwutil$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c</div><div class='del'>-</div><div class='del'>-libpng$(MODEL).lib: $(OBJS1) $(OBJS2) $(OBJS3)</div><div class='del'>-	$(LIB) libpng$(MODEL) +$(OBJSL1)</div><div class='del'>-	$(LIB) libpng$(MODEL) +$(OBJSL2)</div><div class='del'>-	$(LIB) libpng$(MODEL) +$(OBJSL3)</div><div class='del'>-</div><div class='del'>-pngtest$(E): pngtest$(O) libpng$(MODEL).lib</div><div class='del'>-	$(LD) $(LDFLAGS) pngtest.obj libpng$(MODEL).lib zlib_$(MODEL).lib</div><div class='del'>-</div><div class='del'>-# End of makefile for libpng</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.vcwin32 b/src/3rdparty/libpng/scripts/makefile.vcwin32<br/>deleted file mode 100644<br/>index a65f1c1..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.vcwin32?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.vcwin32</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,103 +0,0 @@</div><div class='del'>-# makefile for libpng</div><div class='del'>-# Copyright (C) 1998 Tim Wegner</div><div class='del'>-# Copyright (C) 2006,2009 Glenn Randers-Pehrson</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-#</div><div class='del'>-# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib</div><div class='del'>-# To use, do "nmake /f scripts\makefile.vcwin32"</div><div class='del'>-</div><div class='del'>-# -------- Microsoft Visual C++ 2.0 and later, no assembler code --------</div><div class='del'>-</div><div class='del'>-# Compiler, linker, librarian, and other tools</div><div class='del'>-CC = cl</div><div class='del'>-LD = link</div><div class='del'>-AR = lib</div><div class='del'>-CFLAGS  = -nologo -MD -O2 -W3 -I..\zlib</div><div class='del'>-LDFLAGS = -nologo</div><div class='del'>-ARFLAGS = -nologo</div><div class='del'>-RM = del</div><div class='del'>-</div><div class='del'>-# File extensions</div><div class='del'>-O=.obj</div><div class='del'>-</div><div class='del'>-#uncomment next to put error messages in a file</div><div class='del'>-#ERRFILE= &gt;&gt; pngerrs.log</div><div class='del'>-</div><div class='del'>-# Variables</div><div class='del'>-OBJS1 = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O)</div><div class='del'>-OBJS2 = pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O)</div><div class='del'>-OBJS3 = pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)</div><div class='del'>-OBJS  = $(OBJS1) $(OBJS2) $(OBJS3)</div><div class='del'>-</div><div class='del'>-# Targets</div><div class='del'>-all: libpng.lib</div><div class='del'>-</div><div class='del'>-png$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngset$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngget$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngread$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngpread$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngrtran$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngrutil$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngerror$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngmem$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngrio$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngwio$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngtrans$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngwrite$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngwtran$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngwutil$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-libpng.lib: $(OBJS)</div><div class='del'>-	-$(RM) $@</div><div class='del'>-	$(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngtest$(O): png.h pngconf.h</div><div class='del'>-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngtest.exe: pngtest$(O) libpng.lib</div><div class='del'>-	$(LD) $(LDFLAGS) -out:$@ pngtest$(O) libpng.lib ..\zlib\zlib.lib $(ERRFILE)</div><div class='del'>-</div><div class='del'>-test: pngtest.exe</div><div class='del'>-	pngtest</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	-$(RM) *$(O)</div><div class='del'>-	-$(RM) libpng.lib</div><div class='del'>-	-$(RM) pngtest.exe</div><div class='del'>-	-$(RM) pngout.png</div><div class='del'>-</div><div class='del'>-# End of makefile for libpng</div><div class='del'>-</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makefile.watcom b/src/3rdparty/libpng/scripts/makefile.watcom<br/>deleted file mode 100644<br/>index db4d534..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makefile.watcom?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makefile.watcom</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,112 +0,0 @@</div><div class='del'>-# Makefile for libpng</div><div class='del'>-# Watcom C/C++ 10.0 and later, 32-bit protected mode, flat memory model</div><div class='del'>-</div><div class='del'>-# Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is</div><div class='del'>-# copyright 1995 Guy Eric Schalnat, Group 42, Inc.</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-# To use, do "wmake /f scripts\makefile.watcom"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# ---------------------- Watcom C/C++ 10.0 and later -----------------------</div><div class='del'>-</div><div class='del'>-# Where the zlib library and include files are located</div><div class='del'>-ZLIBLIB=..\zlib</div><div class='del'>-ZLIBINC=..\zlib</div><div class='del'>-</div><div class='del'>-# Target OS</div><div class='del'>-OS=DOS</div><div class='del'>-#OS=NT</div><div class='del'>-</div><div class='del'>-# Target CPU</div><div class='del'>-CPU=6		# Pentium Pro</div><div class='del'>-#CPU=5		# Pentium</div><div class='del'>-</div><div class='del'>-# Calling convention</div><div class='del'>-CALLING=r	# registers</div><div class='del'>-#CALLING=s	# stack</div><div class='del'>-</div><div class='del'>-# Uncomment next to put error messages in a file</div><div class='del'>-#ERRFILE=&gt;&gt;pngerrs</div><div class='del'>-</div><div class='del'>-# --------------------------------------------------------------------------</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CC=wcc386</div><div class='del'>-CFLAGS=-$(CPU)$(CALLING) -fp$(CPU) -fpi87 -oneatx -mf -bt=$(OS) -i=$(ZLIBINC) -zq</div><div class='del'>-LD=wcl386</div><div class='del'>-LDFLAGS=-zq</div><div class='del'>-</div><div class='del'>-O=.obj</div><div class='del'>-</div><div class='del'>-OBJS1=png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O)</div><div class='del'>-OBJS2=pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O)</div><div class='del'>-OBJS3=pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-all: test</div><div class='del'>-</div><div class='del'>-png$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngset$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngget$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngread$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngpread$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngrtran$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngrutil$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngerror$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngmem$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngrio$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngwio$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngtest$(O): png.h pngconf.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngtrans$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngwrite$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngwtran$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-pngwutil$(O): png.h pngconf.h pngpriv.h</div><div class='del'>-	$(CC) $(CFLAGS) $*.c $(ERRFILE)</div><div class='del'>-</div><div class='del'>-libpng.lib: $(OBJS1) $(OBJS2) $(OBJS3)</div><div class='del'>-	wlib -b -c -n -q libpng.lib $(OBJS1)</div><div class='del'>-	wlib -b -c -q libpng.lib $(OBJS2)</div><div class='del'>-	wlib -b -c -q libpng.lib $(OBJS3)</div><div class='del'>-</div><div class='del'>-pngtest.exe: pngtest.obj libpng.lib</div><div class='del'>-	$(LD) $(LDFLAGS) pngtest.obj libpng.lib $(ZLIBLIB)\zlib.lib</div><div class='del'>-</div><div class='del'>-test: pngtest.exe .symbolic</div><div class='del'>-	pngtest.exe</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# End of makefile for libpng</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/makevms.com b/src/3rdparty/libpng/scripts/makevms.com<br/>deleted file mode 100644<br/>index 2fa9d0d..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/makevms.com?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/makevms.com</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,142 +0,0 @@</div><div class='del'>-$! make libpng under VMS</div><div class='del'>-$!</div><div class='del'>-$!</div><div class='del'>-$! Check for MMK/MMS</div><div class='del'>-$!</div><div class='del'>-$! This procedure accepts one parameter (contrib), which causes it to build</div><div class='del'>-$! the programs from the contrib directory instead of libpng.</div><div class='del'>-$!</div><div class='del'>-$ p1 = f$edit(p1,"UPCASE")</div><div class='del'>-$ if p1 .eqs. "CONTRIB"</div><div class='del'>-$ then</div><div class='del'>-$   set def [.contrib.gregbook]</div><div class='del'>-$   @makevms</div><div class='del'>-$   set def [-.pngminus]</div><div class='del'>-$   @makevms</div><div class='del'>-$   set def [--]</div><div class='del'>-$   exit</div><div class='del'>-$ endif</div><div class='del'>-$ Make = ""</div><div class='del'>-$ If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS"</div><div class='del'>-$ If F$Type (MMK) .eqs. "STRING" Then Make = "MMK"</div><div class='del'>-$!</div><div class='del'>-$! Look for the compiler used</div><div class='del'>-$!</div><div class='del'>-$ zlibsrc = "[-.zlib]"</div><div class='del'>-$ ccopt="/include=''zlibsrc'"</div><div class='del'>-$ if f$getsyi("HW_MODEL").ge.1024</div><div class='del'>-$ then</div><div class='del'>-$  ccopt = "/prefix=all"+ccopt</div><div class='del'>-$  comp  = "__decc__=1"</div><div class='del'>-$  if f$trnlnm("SYS").eqs."" then define sys sys$library:</div><div class='del'>-$ else</div><div class='del'>-$  if f$search("SYS$SYSTEM:DECC$COMPILER.EXE").eqs.""</div><div class='del'>-$   then</div><div class='del'>-$    if f$trnlnm("SYS").eqs."" then define sys sys$library:</div><div class='del'>-$    if f$search("SYS$SYSTEM:VAXC.EXE").eqs.""</div><div class='del'>-$     then</div><div class='del'>-$      comp  = "__gcc__=1"</div><div class='del'>-$      CC :== GCC</div><div class='del'>-$     else</div><div class='del'>-$      comp = "__vaxc__=1"</div><div class='del'>-$     endif</div><div class='del'>-$   else</div><div class='del'>-$    if f$trnlnm("SYS").eqs."" then define sys decc$library_include:</div><div class='del'>-$    ccopt = "/decc/prefix=all"+ccopt</div><div class='del'>-$    comp  = "__decc__=1"</div><div class='del'>-$  endif</div><div class='del'>-$ endif</div><div class='del'>-$!</div><div class='del'>-$! Build the thing plain or with mms/mmk</div><div class='del'>-$!</div><div class='del'>-$ write sys$output "Compiling Libpng sources ..."</div><div class='del'>-$ if make.eqs.""</div><div class='del'>-$  then</div><div class='del'>-$   dele pngtest.obj;*</div><div class='del'>-$   CALL MAKE png.OBJ "cc ''CCOPT' png" -</div><div class='del'>-	png.c png.h pngconf.h pngpriv.h</div><div class='del'>-$   CALL MAKE pngset.OBJ "cc ''CCOPT' pngset" -</div><div class='del'>-	pngset.c png.h pngconf.h pngpriv.h</div><div class='del'>-$   CALL MAKE pngget.OBJ "cc ''CCOPT' pngget" -</div><div class='del'>-	pngget.c png.h pngconf.h pngpriv.h</div><div class='del'>-$   CALL MAKE pngread.OBJ "cc ''CCOPT' pngread" -</div><div class='del'>-	pngread.c png.h pngconf.h pngpriv.h</div><div class='del'>-$   CALL MAKE pngpread.OBJ "cc ''CCOPT' pngpread" -</div><div class='del'>-	pngpread.c png.h pngconf.h pngpriv.h</div><div class='del'>-$   CALL MAKE pngrtran.OBJ "cc ''CCOPT' pngrtran" -</div><div class='del'>-	pngrtran.c png.h pngconf.h pngpriv.h</div><div class='del'>-$   CALL MAKE pngrutil.OBJ "cc ''CCOPT' pngrutil" -</div><div class='del'>-	pngrutil.c png.h pngconf.h pngpriv.h</div><div class='del'>-$   CALL MAKE pngerror.OBJ "cc ''CCOPT' pngerror" -</div><div class='del'>-	pngerror.c png.h pngconf.h pngpriv.h</div><div class='del'>-$   CALL MAKE pngmem.OBJ "cc ''CCOPT' pngmem" -</div><div class='del'>-	pngmem.c png.h pngconf.h pngpriv.h</div><div class='del'>-$   CALL MAKE pngrio.OBJ "cc ''CCOPT' pngrio" -</div><div class='del'>-	pngrio.c png.h pngconf.h pngpriv.h</div><div class='del'>-$   CALL MAKE pngwio.OBJ "cc ''CCOPT' pngwio" -</div><div class='del'>-	pngwio.c png.h pngconf.h pngpriv.h</div><div class='del'>-$   CALL MAKE pngtrans.OBJ "cc ''CCOPT' pngtrans" -</div><div class='del'>-	pngtrans.c png.h pngconf.h pngpriv.h</div><div class='del'>-$   CALL MAKE pngwrite.OBJ "cc ''CCOPT' pngwrite" -</div><div class='del'>-	pngwrite.c png.h pngconf.h pngpriv.h</div><div class='del'>-$   CALL MAKE pngwtran.OBJ "cc ''CCOPT' pngwtran" -</div><div class='del'>-	pngwtran.c png.h pngconf.h pngpriv.h</div><div class='del'>-$   CALL MAKE pngwutil.OBJ "cc ''CCOPT' pngwutil" -</div><div class='del'>-	pngwutil.c png.h pngconf.h pngpriv.h</div><div class='del'>-$   write sys$output "Building Libpng ..."</div><div class='del'>-$   CALL MAKE libpng.OLB "lib/crea libpng.olb *.obj" *.OBJ</div><div class='del'>-$   write sys$output "Building pngtest..."</div><div class='del'>-$   CALL MAKE pngtest.OBJ "cc ''CCOPT' pngtest" -</div><div class='del'>-	pngtest.c png.h pngconf.h</div><div class='del'>-$   call make pngtest.exe -</div><div class='del'>-	"LINK pngtest,libpng.olb/lib,''zlibsrc'libz.olb/lib" -</div><div class='del'>-	pngtest.obj libpng.olb</div><div class='del'>-$   write sys$output "Testing Libpng..."</div><div class='del'>-$   run pngtest</div><div class='del'>-$  else</div><div class='del'>-$   if f$search("DESCRIP.MMS") .eqs. "" then copy/nolog [.SCRIPTS]DESCRIP.MMS []</div><div class='del'>-$   'make'/macro=('comp',zlibsrc='zlibsrc')</div><div class='del'>-$  endif</div><div class='del'>-$ write sys$output "Libpng build completed"</div><div class='del'>-$ exit</div><div class='del'>-$!</div><div class='del'>-$!</div><div class='del'>-$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES</div><div class='del'>-$ V = 'F$Verify(0)</div><div class='del'>-$! P1 = What we are trying to make</div><div class='del'>-$! P2 = Command to make it</div><div class='del'>-$! P3 - P8  What it depends on</div><div class='del'>-$</div><div class='del'>-$ If F$Search(P1) .Eqs. "" Then Goto Makeit</div><div class='del'>-$ Time = F$CvTime(F$File(P1,"RDT"))</div><div class='del'>-$arg=3</div><div class='del'>-$Loop:</div><div class='del'>-$       Argument = P'arg</div><div class='del'>-$       If Argument .Eqs. "" Then Goto Exit</div><div class='del'>-$       El=0</div><div class='del'>-$Loop2:</div><div class='del'>-$       File = F$Element(El," ",Argument)</div><div class='del'>-$       If File .Eqs. " " Then Goto Endl</div><div class='del'>-$       AFile = ""</div><div class='del'>-$Loop3:</div><div class='del'>-$       OFile = AFile</div><div class='del'>-$       AFile = F$Search(File)</div><div class='del'>-$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl</div><div class='del'>-$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit</div><div class='del'>-$       Goto Loop3</div><div class='del'>-$NextEL:</div><div class='del'>-$       El = El + 1</div><div class='del'>-$       Goto Loop2</div><div class='del'>-$EndL:</div><div class='del'>-$ arg=arg+1</div><div class='del'>-$ If arg .Le. 8 Then Goto Loop</div><div class='del'>-$ Goto Exit</div><div class='del'>-$</div><div class='del'>-$Makeit:</div><div class='del'>-$ VV=F$VERIFY(0)</div><div class='del'>-$ write sys$output P2</div><div class='del'>-$ 'P2</div><div class='del'>-$ VV='F$Verify(VV)</div><div class='del'>-$Exit:</div><div class='del'>-$ If V Then Set Verify</div><div class='del'>-$ENDSUBROUTINE</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/png32ce.def b/src/3rdparty/libpng/scripts/png32ce.def<br/>deleted file mode 100644<br/>index 7e3b235..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/png32ce.def?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/png32ce.def</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,257 +0,0 @@</div><div class='del'>-;------------------------------------------</div><div class='del'>-; LIBPNG module definition file for Windows</div><div class='del'>-;------------------------------------------</div><div class='del'>-</div><div class='del'>-LIBRARY lpngce</div><div class='del'>-</div><div class='del'>- png_memcpy_check</div><div class='del'>- png_memset_check</div><div class='del'>- png_set_dither</div><div class='del'>- png_read_init_3</div><div class='del'>- png_write_init_3</div><div class='del'>- png_set_strip_error_numbers</div><div class='del'>- png_get_uint_32</div><div class='del'>- png_get_uint_16</div><div class='del'>- png_get_int_32</div><div class='del'>-</div><div class='del'>-EXPORTS</div><div class='del'>-;Version 1.4.0</div><div class='del'>-  png_build_grayscale_palette  @1</div><div class='del'>-;  png_check_sig        @2</div><div class='del'>-  png_chunk_error      @3</div><div class='del'>-  png_chunk_warning      @4</div><div class='del'>-;  png_convert_from_struct_tm   @5</div><div class='del'>-;  png_convert_from_time_t    @6</div><div class='del'>-  png_create_info_struct     @7</div><div class='del'>-  png_create_read_struct     @8</div><div class='del'>-  png_create_write_struct    @9</div><div class='del'>-  png_data_freer    @10</div><div class='del'>-  png_destroy_info_struct  @11</div><div class='del'>-  png_destroy_read_struct  @12</div><div class='del'>-  png_destroy_write_struct  @13</div><div class='del'>-  png_error    @14</div><div class='del'>-  png_free      @15</div><div class='del'>-  png_free_data    @16</div><div class='del'>-  png_get_IHDR    @17</div><div class='del'>-  png_get_PLTE    @18</div><div class='del'>-  png_get_bKGD    @19</div><div class='del'>-  png_get_bit_depth    @20</div><div class='del'>-  png_get_cHRM    @21</div><div class='del'>-  png_get_cHRM_fixed  @22</div><div class='del'>-  png_get_channels    @23</div><div class='del'>-  png_get_color_type  @24</div><div class='del'>-  png_get_compression_buffer_size  @25</div><div class='del'>-  png_get_compression_type  @26</div><div class='del'>-  png_get_copyright    @27</div><div class='del'>-  png_get_error_ptr    @28</div><div class='del'>-  png_get_filter_type  @29</div><div class='del'>-  png_get_gAMA    @30</div><div class='del'>-  png_get_gAMA_fixed  @31</div><div class='del'>-  png_get_hIST    @32</div><div class='del'>-  png_get_header_ver  @33</div><div class='del'>-  png_get_header_version  @34</div><div class='del'>-  png_get_iCCP    @35</div><div class='del'>-  png_get_image_height  @36</div><div class='del'>-  png_get_image_width  @37</div><div class='del'>-  png_get_interlace_type  @38</div><div class='del'>-  png_get_io_ptr    @39</div><div class='del'>-  png_get_libpng_ver  @40</div><div class='del'>-  png_get_oFFs    @41</div><div class='del'>-  png_get_pCAL    @42</div><div class='del'>-  png_get_pHYs    @43</div><div class='del'>-  png_get_pixel_aspect_ratio  @44</div><div class='del'>-  png_get_pixels_per_meter  @45</div><div class='del'>-  png_get_progressive_ptr  @46</div><div class='del'>-  png_get_rgb_to_gray_status  @47</div><div class='del'>-  png_get_rowbytes    @48</div><div class='del'>-  png_get_rows    @49</div><div class='del'>-  png_get_sBIT    @50</div><div class='del'>-  png_get_sCAL    @51</div><div class='del'>-  png_get_sPLT    @52</div><div class='del'>-  png_get_sRGB    @53</div><div class='del'>-  png_get_signature    @54</div><div class='del'>-  png_get_tIME    @55</div><div class='del'>-  png_get_tRNS    @56</div><div class='del'>-  png_get_text    @57</div><div class='del'>-  png_get_unknown_chunks  @58</div><div class='del'>-  png_get_user_chunk_ptr  @59</div><div class='del'>-  png_get_user_transform_ptr  @60</div><div class='del'>-  png_get_valid    @61</div><div class='del'>-  png_get_x_offset_microns  @62</div><div class='del'>-  png_get_x_offset_pixels  @63</div><div class='del'>-  png_get_x_pixels_per_meter  @64</div><div class='del'>-  png_get_y_offset_microns  @65</div><div class='del'>-  png_get_y_offset_pixels  @66</div><div class='del'>-  png_get_y_pixels_per_meter  @67</div><div class='del'>-  png_malloc    @68</div><div class='del'>-;  png_memcpy_check    @69</div><div class='del'>-;  png_memset_check    @70</div><div class='del'>-  png_permit_empty_plte  @71</div><div class='del'>-  png_process_data    @72</div><div class='del'>-  png_progressive_combine_row  @73</div><div class='del'>-  png_read_end    @74</div><div class='del'>-  png_read_image    @75</div><div class='del'>-  png_read_info    @76</div><div class='del'>-; png_read_init is deprecated</div><div class='del'>-  png_read_init    @77</div><div class='del'>-  png_read_png    @78</div><div class='del'>-  png_read_row    @79</div><div class='del'>-  png_read_rows    @80</div><div class='del'>-  png_read_update_info  @81</div><div class='del'>-  png_reset_zstream    @82</div><div class='del'>-  png_set_IHDR    @83</div><div class='del'>-  png_set_PLTE    @84</div><div class='del'>-  png_set_bKGD    @85</div><div class='del'>-  png_set_background  @86</div><div class='del'>-  png_set_bgr    @87</div><div class='del'>-  png_set_cHRM    @88</div><div class='del'>-  png_set_cHRM_fixed  @89</div><div class='del'>-  png_set_compression_buffer_size  @90</div><div class='del'>-  png_set_compression_level  @91</div><div class='del'>-  png_set_compression_mem_level  @92</div><div class='del'>-  png_set_compression_method  @93</div><div class='del'>-  png_set_compression_strategy  @94</div><div class='del'>-  png_set_compression_window_bits  @95</div><div class='del'>-  png_set_crc_action  @96</div><div class='del'>-;  png_set_dither    @97</div><div class='del'>-  png_set_error_fn    @98</div><div class='del'>-  png_set_expand    @99</div><div class='del'>-  png_set_filler    @100</div><div class='del'>-  png_set_filter    @101</div><div class='del'>-  png_set_filter_heuristics  @102</div><div class='del'>-  png_set_flush    @103</div><div class='del'>-  png_set_gAMA    @104</div><div class='del'>-  png_set_gAMA_fixed  @105</div><div class='del'>-  png_set_gamma    @106</div><div class='del'>-  png_set_gray_1_2_4_to_8  @107 ; deprecated</div><div class='del'>-  png_set_gray_to_rgb  @108</div><div class='del'>-  png_set_hIST    @109</div><div class='del'>-  png_set_iCCP    @110</div><div class='del'>-  png_set_interlace_handling  @111</div><div class='del'>-  png_set_invert_alpha  @112</div><div class='del'>-  png_set_invert_mono  @113</div><div class='del'>-  png_set_keep_unknown_chunks  @114</div><div class='del'>-  png_set_oFFs    @115</div><div class='del'>-  png_set_pCAL    @116</div><div class='del'>-  png_set_pHYs    @117</div><div class='del'>-  png_set_packing    @118</div><div class='del'>-  png_set_packswap    @119</div><div class='del'>-  png_set_palette_to_rgb  @120</div><div class='del'>-  png_set_progressive_read_fn  @121</div><div class='del'>-  png_set_read_fn    @122</div><div class='del'>-  png_set_read_status_fn  @123</div><div class='del'>-  png_set_read_user_chunk_fn  @124</div><div class='del'>-  png_set_read_user_transform_fn  @125</div><div class='del'>-  png_set_rgb_to_gray  @126</div><div class='del'>-  png_set_rgb_to_gray_fixed  @127</div><div class='del'>-  png_set_rows    @128</div><div class='del'>-  png_set_sBIT    @129</div><div class='del'>-  png_set_sCAL    @130</div><div class='del'>-  png_set_sPLT    @131</div><div class='del'>-  png_set_sRGB    @132</div><div class='del'>-  png_set_sRGB_gAMA_and_cHRM  @133</div><div class='del'>-  png_set_shift    @134</div><div class='del'>-  png_set_sig_bytes    @135</div><div class='del'>-  png_set_strip_16    @136</div><div class='del'>-  png_set_strip_alpha  @137</div><div class='del'>-  png_set_swap    @138</div><div class='del'>-  png_set_swap_alpha  @139</div><div class='del'>-  png_set_tIME    @140</div><div class='del'>-  png_set_tRNS    @141</div><div class='del'>-  png_set_tRNS_to_alpha  @142</div><div class='del'>-  png_set_text    @143</div><div class='del'>-  png_set_unknown_chunk_location  @144</div><div class='del'>-  png_set_unknown_chunks  @145</div><div class='del'>-  png_set_user_transform_info  @146</div><div class='del'>-  png_set_write_fn    @147</div><div class='del'>-  png_set_write_status_fn  @148</div><div class='del'>-  png_set_write_user_transform_fn  @149</div><div class='del'>-  png_sig_cmp    @150</div><div class='del'>-  png_start_read_image  @151</div><div class='del'>-  png_warning    @152</div><div class='del'>-  png_write_chunk    @153</div><div class='del'>-  png_write_chunk_data  @154</div><div class='del'>-  png_write_chunk_end  @155</div><div class='del'>-  png_write_chunk_start  @156</div><div class='del'>-  png_write_end    @157</div><div class='del'>-  png_write_flush    @158</div><div class='del'>-  png_write_image    @159</div><div class='del'>-  png_write_info    @160</div><div class='del'>-  png_write_info_before_PLTE  @161</div><div class='del'>-; png_write_init is deprecated</div><div class='del'>-  png_write_init    @162</div><div class='del'>-  png_write_png    @163</div><div class='del'>-  png_write_row    @164</div><div class='del'>-  png_write_rows    @165</div><div class='del'>-; png_read_init_2 and png_write_init_2 are deprecated.</div><div class='del'>-  png_read_init_2    @166</div><div class='del'>-  png_write_init_2    @167</div><div class='del'>-  png_access_version_number  @168</div><div class='del'>-;  png_sig_bytes    @169</div><div class='del'>-;  png_libpng_ver    @170</div><div class='del'>-  png_init_io    @171</div><div class='del'>-  png_convert_to_rfc1123     @172</div><div class='del'>-  png_set_invalid  @173</div><div class='del'>-; Added at version 1.0.12</div><div class='del'>-; For compatiblity with 1.0.7-1.0.11</div><div class='del'>-  png_info_init @174</div><div class='del'>-;  png_read_init_3    @175</div><div class='del'>-;  png_write_init_3    @176</div><div class='del'>-  png_info_init_3 @177</div><div class='del'>-  png_destroy_struct  @178</div><div class='del'>-; Added at version 1.2.0</div><div class='del'>-; For use with PNG_USER_MEM_SUPPORTED</div><div class='del'>-; png_destroy_struct_2  @179</div><div class='del'>-; png_create_read_struct_2 @180</div><div class='del'>-; png_create_write_struct_2 @181</div><div class='del'>-; png_malloc_default @182</div><div class='del'>-; png_free_default @183</div><div class='del'>-; MNG features</div><div class='del'>-; png_permit_mng_features  @184</div><div class='del'>-; MMX support</div><div class='del'>-; png_mmx_support  @185</div><div class='del'>-; png_get_mmx_flagmask  @186</div><div class='del'>-; png_get_asm_flagmask  @187</div><div class='del'>-; png_get_asm_flags  @188</div><div class='del'>-; png_get_mmx_bitdepth_threshold  @189</div><div class='del'>-; png_get_mmx_rowbytes_threshold  @190</div><div class='del'>-; png_set_asm_flags  @191</div><div class='del'>-; png_init_mmx_flags  @192</div><div class='del'>-; Strip error numbers</div><div class='del'>-; png_set_strip_error_numbers @193</div><div class='del'>-; Added at version 1.2.2</div><div class='del'>-  png_handle_as_unknown @179</div><div class='del'>-  png_zalloc @180</div><div class='del'>-  png_zfree @181</div><div class='del'>-; png_handle_as_unknown @194</div><div class='del'>-; png_zalloc @195</div><div class='del'>-; png_zfree @196</div><div class='del'>-; Added at version 1.2.6</div><div class='del'>-  png_malloc_warn @195</div><div class='del'>-  png_get_user_height_max @196</div><div class='del'>-  png_get_user_width_max @197</div><div class='del'>-  png_set_user_limits @198</div><div class='del'>-; Added at version 1.2.7</div><div class='del'>-  png_set_add_alpha @199</div><div class='del'>-; Added at version 1.2.9</div><div class='del'>-;  png_get_uint_32 @200</div><div class='del'>-  png_save_uint_32 @201</div><div class='del'>-;  png_get_uint_16 @202</div><div class='del'>-  png_save_uint_16 @203</div><div class='del'>-;  png_get_int_32 @204</div><div class='del'>-  png_save_int_32 @205</div><div class='del'>-  png_get_uint_31 @206</div><div class='del'>-  png_set_expand_gray_1_2_4_to_8  @207</div><div class='del'>-; Added at version 1.2.41</div><div class='del'>-  png_write_sig @208</div><div class='del'>-  png_benign_error @209</div><div class='del'>-  png_benign_chunk_error @210</div><div class='del'>-  png_set_benign_error @211</div><div class='del'>-  png_get_io_chunk_name @212</div><div class='del'>-  png_get_io_state @213</div><div class='del'>-  png_set_premultiply_alpha @214</div><div class='del'>-  png_get_chunk_cache_max @215</div><div class='del'>-  png_set_chunk_cache_max @216</div><div class='del'>-  png_check_cHRM_fixed @217</div><div class='del'>-  png_calloc @218</div><div class='del'>-  png_set_longjmp_fn @219</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/pngos2.def b/src/3rdparty/libpng/scripts/pngos2.def<br/>deleted file mode 100644<br/>index 2d80eb4..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/pngos2.def?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/pngos2.def</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,251 +0,0 @@</div><div class='del'>-;----------------------------------------</div><div class='del'>-; PNG.LIB module definition file for OS/2</div><div class='del'>-;----------------------------------------</div><div class='del'>-</div><div class='del'>-; Version 1.4.0</div><div class='del'>-</div><div class='del'>-LIBRARY		PNG</div><div class='del'>-DESCRIPTION	"PNG image compression library for OS/2"</div><div class='del'>-CODE		PRELOAD MOVEABLE DISCARDABLE</div><div class='del'>-DATA		PRELOAD MOVEABLE MULTIPLE</div><div class='del'>-</div><div class='del'>-EXPORTS</div><div class='del'>-</div><div class='del'>-  png_build_grayscale_palette</div><div class='del'>-  png_chunk_error</div><div class='del'>-  png_chunk_warning</div><div class='del'>-  png_convert_from_struct_tm</div><div class='del'>-  png_convert_from_time_t</div><div class='del'>-  png_create_info_struct</div><div class='del'>-  png_create_read_struct</div><div class='del'>-  png_create_write_struct</div><div class='del'>-  png_data_freer</div><div class='del'>-  png_destroy_info_struct</div><div class='del'>-  png_destroy_read_struct</div><div class='del'>-  png_destroy_write_struct</div><div class='del'>-  png_error</div><div class='del'>-  png_free</div><div class='del'>-  png_free_data</div><div class='del'>-  png_get_IHDR</div><div class='del'>-  png_get_PLTE</div><div class='del'>-  png_get_bKGD</div><div class='del'>-  png_get_bit_depth</div><div class='del'>-  png_get_cHRM</div><div class='del'>-  png_get_cHRM_fixed</div><div class='del'>-  png_get_channels</div><div class='del'>-  png_get_color_type</div><div class='del'>-  png_get_compression_buffer_size</div><div class='del'>-  png_get_compression_type</div><div class='del'>-  png_get_copyright</div><div class='del'>-  png_get_error_ptr</div><div class='del'>-  png_get_filter_type</div><div class='del'>-  png_get_gAMA</div><div class='del'>-  png_get_gAMA_fixed</div><div class='del'>-  png_get_hIST</div><div class='del'>-  png_get_header_ver</div><div class='del'>-  png_get_header_version</div><div class='del'>-  png_get_iCCP</div><div class='del'>-  png_get_image_height</div><div class='del'>-  png_get_image_width</div><div class='del'>-  png_get_interlace_type</div><div class='del'>-  png_get_io_ptr</div><div class='del'>-  png_get_libpng_ver</div><div class='del'>-  png_get_oFFs</div><div class='del'>-  png_get_pCAL</div><div class='del'>-  png_get_pHYs</div><div class='del'>-  png_get_pixel_aspect_ratio</div><div class='del'>-  png_get_pixels_per_meter</div><div class='del'>-  png_get_progressive_ptr</div><div class='del'>-  png_get_rgb_to_gray_status</div><div class='del'>-  png_get_rowbytes</div><div class='del'>-  png_get_rows</div><div class='del'>-  png_get_sBIT</div><div class='del'>-  png_get_sCAL</div><div class='del'>-  png_get_sPLT</div><div class='del'>-  png_get_sRGB</div><div class='del'>-  png_get_signature</div><div class='del'>-  png_get_tIME</div><div class='del'>-  png_get_tRNS</div><div class='del'>-  png_get_text</div><div class='del'>-  png_get_unknown_chunks</div><div class='del'>-  png_get_user_chunk_ptr</div><div class='del'>-  png_get_user_transform_ptr</div><div class='del'>-  png_get_valid</div><div class='del'>-  png_get_x_offset_microns</div><div class='del'>-  png_get_x_offset_pixels</div><div class='del'>-  png_get_x_pixels_per_meter</div><div class='del'>-  png_get_y_offset_microns</div><div class='del'>-  png_get_y_offset_pixels</div><div class='del'>-  png_get_y_pixels_per_meter</div><div class='del'>-  png_malloc</div><div class='del'>-  png_process_data</div><div class='del'>-  png_progressive_combine_row</div><div class='del'>-  png_read_end</div><div class='del'>-  png_read_image</div><div class='del'>-  png_read_info</div><div class='del'>-  png_read_png</div><div class='del'>-  png_read_row</div><div class='del'>-  png_read_rows</div><div class='del'>-  png_read_update_info</div><div class='del'>-  png_reset_zstream</div><div class='del'>-  png_set_IHDR</div><div class='del'>-  png_set_PLTE</div><div class='del'>-  png_set_bKGD</div><div class='del'>-  png_set_background</div><div class='del'>-  png_set_bgr</div><div class='del'>-  png_set_cHRM</div><div class='del'>-  png_set_cHRM_fixed</div><div class='del'>-  png_set_compression_buffer_size</div><div class='del'>-  png_set_compression_level</div><div class='del'>-  png_set_compression_mem_level</div><div class='del'>-  png_set_compression_method</div><div class='del'>-  png_set_compression_strategy</div><div class='del'>-  png_set_compression_window_bits</div><div class='del'>-  png_set_crc_action</div><div class='del'>-  png_set_error_fn</div><div class='del'>-  png_set_expand</div><div class='del'>-  png_set_filler</div><div class='del'>-  png_set_filter</div><div class='del'>-  png_set_filter_heuristics</div><div class='del'>-  png_set_flush</div><div class='del'>-  png_set_gAMA</div><div class='del'>-  png_set_gAMA_fixed</div><div class='del'>-  png_set_gamma</div><div class='del'>-  png_set_gray_to_rgb</div><div class='del'>-  png_set_hIST</div><div class='del'>-  png_set_iCCP</div><div class='del'>-  png_set_interlace_handling</div><div class='del'>-  png_set_invert_alpha</div><div class='del'>-  png_set_invert_mono</div><div class='del'>-  png_set_keep_unknown_chunks</div><div class='del'>-  png_set_oFFs</div><div class='del'>-  png_set_pCAL</div><div class='del'>-  png_set_pHYs</div><div class='del'>-  png_set_packing</div><div class='del'>-  png_set_packswap</div><div class='del'>-  png_set_palette_to_rgb</div><div class='del'>-  png_set_progressive_read_fn</div><div class='del'>-  png_set_read_fn</div><div class='del'>-  png_set_read_status_fn</div><div class='del'>-  png_set_read_user_chunk_fn</div><div class='del'>-  png_set_read_user_transform_fn</div><div class='del'>-  png_set_rgb_to_gray</div><div class='del'>-  png_set_rgb_to_gray_fixed</div><div class='del'>-  png_set_rows</div><div class='del'>-  png_set_sBIT</div><div class='del'>-  png_set_sCAL</div><div class='del'>-  png_set_sPLT</div><div class='del'>-  png_set_sRGB</div><div class='del'>-  png_set_sRGB_gAMA_and_cHRM</div><div class='del'>-  png_set_shift</div><div class='del'>-  png_set_sig_bytes</div><div class='del'>-  png_set_strip_16</div><div class='del'>-  png_set_strip_alpha</div><div class='del'>-  png_set_swap</div><div class='del'>-  png_set_swap_alpha</div><div class='del'>-  png_set_tIME</div><div class='del'>-  png_set_tRNS</div><div class='del'>-  png_set_tRNS_to_alpha</div><div class='del'>-  png_set_text</div><div class='del'>-  png_set_unknown_chunk_location</div><div class='del'>-  png_set_unknown_chunks</div><div class='del'>-  png_set_user_transform_info</div><div class='del'>-  png_set_write_fn</div><div class='del'>-  png_set_write_status_fn</div><div class='del'>-  png_set_write_user_transform_fn</div><div class='del'>-  png_sig_cmp</div><div class='del'>-  png_start_read_image</div><div class='del'>-  png_warning</div><div class='del'>-  png_write_chunk</div><div class='del'>-  png_write_chunk_data</div><div class='del'>-  png_write_chunk_end</div><div class='del'>-  png_write_chunk_start</div><div class='del'>-  png_write_end</div><div class='del'>-  png_write_flush</div><div class='del'>-  png_write_image</div><div class='del'>-  png_write_info</div><div class='del'>-  png_write_info_before_PLTE</div><div class='del'>-  png_write_png</div><div class='del'>-  png_write_row</div><div class='del'>-  png_write_rows</div><div class='del'>-  png_write_sig</div><div class='del'>-  png_access_version_number</div><div class='del'>-  png_init_io</div><div class='del'>-  png_convert_to_rfc1123</div><div class='del'>-  png_set_invalid</div><div class='del'>-</div><div class='del'>-; Added at version 1.2.0:</div><div class='del'>-  png_permit_empty_plte</div><div class='del'>-  png_permit_mng_features</div><div class='del'>-</div><div class='del'>-; Added at version 1.2.2:</div><div class='del'>-  png_handle_as_unknown</div><div class='del'>-</div><div class='del'>-; Added at version 1.2.2 and deleted from 1.2.3:</div><div class='del'>-; png_zalloc</div><div class='del'>-; png_zfree</div><div class='del'>-</div><div class='del'>-; Added at version 1.2.4</div><div class='del'>-  png_malloc_warn</div><div class='del'>-</div><div class='del'>-; Added at version 1.2.6</div><div class='del'>-  png_set_user_limits</div><div class='del'>-  png_get_user_height_max</div><div class='del'>-  png_get_user_width_max</div><div class='del'>-; Added at version 1.2.7</div><div class='del'>-  png_set_add_alpha</div><div class='del'>-</div><div class='del'>-; Added at version 1.2.9</div><div class='del'>-  png_save_uint_32</div><div class='del'>-  png_save_uint_16</div><div class='del'>-  png_save_int_32</div><div class='del'>-  png_get_uint_31</div><div class='del'>-  png_set_expand_gray_1_2_4_to_8</div><div class='del'>-</div><div class='del'>-; Added at version 1.2.41</div><div class='del'>-  png_write_sig</div><div class='del'>-; png_benign_error</div><div class='del'>-; png_benign_chunk_error</div><div class='del'>-; png_set_benign_error</div><div class='del'>-  png_get_io_chunk_name</div><div class='del'>-  png_get_io_state</div><div class='del'>-  png_set_premultiply_alpha</div><div class='del'>-  png_get_chunk_cache_max</div><div class='del'>-  png_set_chunk_cache_max</div><div class='del'>-  png_check_cHRM_fixed</div><div class='del'>-  png_calloc</div><div class='del'>-  png_set_longjmp_fn</div><div class='del'>-</div><div class='del'>-; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS</div><div class='del'>-  png_libpng_ver</div><div class='del'>-  png_pass_start</div><div class='del'>-  png_pass_inc</div><div class='del'>-  png_pass_ystart</div><div class='del'>-  png_pass_yinc</div><div class='del'>-  png_pass_mask</div><div class='del'>-  png_pass_dsp_mask</div><div class='del'>-; png_pass_width</div><div class='del'>-; png_pass_height</div><div class='del'>-</div><div class='del'>-; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS</div><div class='del'>-  png_IHDR</div><div class='del'>-  png_IDAT</div><div class='del'>-  png_IEND</div><div class='del'>-  png_PLTE</div><div class='del'>-  png_bKGD</div><div class='del'>-  png_cHRM</div><div class='del'>-  png_gAMA</div><div class='del'>-  png_hIST</div><div class='del'>-  png_iCCP</div><div class='del'>-  png_iTXt</div><div class='del'>-  png_oFFs</div><div class='del'>-  png_pCAL</div><div class='del'>-  png_pHYs</div><div class='del'>-  png_sBIT</div><div class='del'>-  png_sCAL</div><div class='del'>-  png_sPLT</div><div class='del'>-  png_sRGB</div><div class='del'>-  png_tEXt</div><div class='del'>-  png_tIME</div><div class='del'>-  png_tRNS</div><div class='del'>-  png_zTXt</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/pngwin.def b/src/3rdparty/libpng/scripts/pngwin.def<br/>deleted file mode 100644<br/>index 657e3b4..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/pngwin.def?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/pngwin.def</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,212 +0,0 @@</div><div class='del'>-;------------------------------------------</div><div class='del'>-; LIBPNG module definition file for Windows</div><div class='del'>-;------------------------------------------</div><div class='del'>-</div><div class='del'>-LIBRARY</div><div class='del'>-</div><div class='del'>-EXPORTS</div><div class='del'>-;Version 1.4.0</div><div class='del'>-  png_build_grayscale_palette</div><div class='del'>-  png_chunk_error</div><div class='del'>-  png_chunk_warning</div><div class='del'>-  png_convert_from_struct_tm</div><div class='del'>-  png_convert_from_time_t</div><div class='del'>-  png_create_info_struct</div><div class='del'>-  png_create_read_struct</div><div class='del'>-  png_create_write_struct</div><div class='del'>-  png_data_freer</div><div class='del'>-  png_destroy_info_struct</div><div class='del'>-  png_destroy_read_struct</div><div class='del'>-  png_destroy_write_struct</div><div class='del'>-  png_error</div><div class='del'>-  png_free</div><div class='del'>-  png_free_data</div><div class='del'>-  png_get_IHDR</div><div class='del'>-  png_get_PLTE</div><div class='del'>-  png_get_bKGD</div><div class='del'>-  png_get_bit_depth</div><div class='del'>-  png_get_cHRM</div><div class='del'>-  png_get_cHRM_fixed</div><div class='del'>-  png_get_channels</div><div class='del'>-  png_get_color_type</div><div class='del'>-  png_get_compression_buffer_size</div><div class='del'>-  png_get_compression_type</div><div class='del'>-  png_get_copyright</div><div class='del'>-  png_get_error_ptr</div><div class='del'>-  png_get_filter_type</div><div class='del'>-  png_get_gAMA</div><div class='del'>-  png_get_gAMA_fixed</div><div class='del'>-  png_get_hIST</div><div class='del'>-  png_get_header_ver</div><div class='del'>-  png_get_header_version</div><div class='del'>-  png_get_iCCP</div><div class='del'>-  png_get_image_height</div><div class='del'>-  png_get_image_width</div><div class='del'>-  png_get_interlace_type</div><div class='del'>-  png_get_io_ptr</div><div class='del'>-  png_get_libpng_ver</div><div class='del'>-  png_get_oFFs</div><div class='del'>-  png_get_pCAL</div><div class='del'>-  png_get_pHYs</div><div class='del'>-  png_get_pixel_aspect_ratio</div><div class='del'>-  png_get_pixels_per_meter</div><div class='del'>-  png_get_progressive_ptr</div><div class='del'>-  png_get_rgb_to_gray_status</div><div class='del'>-  png_get_rowbytes</div><div class='del'>-  png_get_rows</div><div class='del'>-  png_get_sBIT</div><div class='del'>-  png_get_sCAL</div><div class='del'>-  png_get_sPLT</div><div class='del'>-  png_get_sRGB</div><div class='del'>-  png_get_signature</div><div class='del'>-  png_get_tIME</div><div class='del'>-  png_get_tRNS</div><div class='del'>-  png_get_text</div><div class='del'>-  png_get_unknown_chunks</div><div class='del'>-  png_get_user_chunk_ptr</div><div class='del'>-  png_get_user_transform_ptr</div><div class='del'>-  png_get_valid</div><div class='del'>-  png_get_x_offset_microns</div><div class='del'>-  png_get_x_offset_pixels</div><div class='del'>-  png_get_x_pixels_per_meter</div><div class='del'>-  png_get_y_offset_microns</div><div class='del'>-  png_get_y_offset_pixels</div><div class='del'>-  png_get_y_pixels_per_meter</div><div class='del'>-  png_malloc</div><div class='del'>-  png_process_data</div><div class='del'>-  png_progressive_combine_row</div><div class='del'>-  png_read_end</div><div class='del'>-  png_read_image</div><div class='del'>-  png_read_info</div><div class='del'>-  png_read_png</div><div class='del'>-  png_read_row</div><div class='del'>-  png_read_rows</div><div class='del'>-  png_read_update_info</div><div class='del'>-  png_reset_zstream</div><div class='del'>-  png_set_IHDR</div><div class='del'>-  png_set_PLTE</div><div class='del'>-  png_set_bKGD</div><div class='del'>-  png_set_background</div><div class='del'>-  png_set_bgr</div><div class='del'>-  png_set_cHRM</div><div class='del'>-  png_set_cHRM_fixed</div><div class='del'>-  png_set_compression_buffer_size</div><div class='del'>-  png_set_compression_level</div><div class='del'>-  png_set_compression_mem_level</div><div class='del'>-  png_set_compression_method</div><div class='del'>-  png_set_compression_strategy</div><div class='del'>-  png_set_compression_window_bits</div><div class='del'>-  png_set_crc_action</div><div class='del'>-  png_set_error_fn</div><div class='del'>-  png_set_expand</div><div class='del'>-  png_set_filler</div><div class='del'>-  png_set_filter</div><div class='del'>-  png_set_filter_heuristics</div><div class='del'>-  png_set_flush</div><div class='del'>-  png_set_gAMA</div><div class='del'>-  png_set_gAMA_fixed</div><div class='del'>-  png_set_gamma</div><div class='del'>-  png_set_gray_to_rgb</div><div class='del'>-  png_set_hIST</div><div class='del'>-  png_set_iCCP</div><div class='del'>-  png_set_interlace_handling</div><div class='del'>-  png_set_invert_alpha</div><div class='del'>-  png_set_invert_mono</div><div class='del'>-  png_set_keep_unknown_chunks</div><div class='del'>-  png_set_oFFs</div><div class='del'>-  png_set_pCAL</div><div class='del'>-  png_set_pHYs</div><div class='del'>-  png_set_packing</div><div class='del'>-  png_set_packswap</div><div class='del'>-  png_set_palette_to_rgb</div><div class='del'>-  png_set_progressive_read_fn</div><div class='del'>-  png_set_read_fn</div><div class='del'>-  png_set_read_status_fn</div><div class='del'>-  png_set_read_user_chunk_fn</div><div class='del'>-  png_set_read_user_transform_fn</div><div class='del'>-  png_set_rgb_to_gray</div><div class='del'>-  png_set_rgb_to_gray_fixed</div><div class='del'>-  png_set_rows</div><div class='del'>-  png_set_sBIT</div><div class='del'>-  png_set_sCAL</div><div class='del'>-  png_set_sPLT</div><div class='del'>-  png_set_sRGB</div><div class='del'>-  png_set_sRGB_gAMA_and_cHRM</div><div class='del'>-  png_set_shift</div><div class='del'>-  png_set_sig_bytes</div><div class='del'>-  png_set_strip_16</div><div class='del'>-  png_set_strip_alpha</div><div class='del'>-  png_set_swap</div><div class='del'>-  png_set_swap_alpha</div><div class='del'>-  png_set_tIME</div><div class='del'>-  png_set_tRNS</div><div class='del'>-  png_set_tRNS_to_alpha</div><div class='del'>-  png_set_text</div><div class='del'>-  png_set_unknown_chunk_location</div><div class='del'>-  png_set_unknown_chunks</div><div class='del'>-  png_set_user_transform_info</div><div class='del'>-  png_set_write_fn</div><div class='del'>-  png_set_write_status_fn</div><div class='del'>-  png_set_write_user_transform_fn</div><div class='del'>-  png_sig_cmp</div><div class='del'>-  png_start_read_image</div><div class='del'>-  png_warning</div><div class='del'>-  png_write_chunk</div><div class='del'>-  png_write_chunk_data</div><div class='del'>-  png_write_chunk_end</div><div class='del'>-  png_write_chunk_start</div><div class='del'>-  png_write_end</div><div class='del'>-  png_write_flush</div><div class='del'>-  png_write_image</div><div class='del'>-  png_write_info</div><div class='del'>-  png_write_info_before_PLTE</div><div class='del'>-  png_write_png</div><div class='del'>-  png_write_row</div><div class='del'>-  png_write_rows</div><div class='del'>-  png_access_version_number</div><div class='del'>-  png_init_io</div><div class='del'>-  png_convert_to_rfc1123</div><div class='del'>-  png_set_invalid</div><div class='del'>-; Added at version 1.0.12</div><div class='del'>-  png_info_init_3</div><div class='del'>-  png_destroy_struct</div><div class='del'>-; Added at version 1.2.0</div><div class='del'>-; For use with PNG_USER_MEM_SUPPORTED</div><div class='del'>-  png_destroy_struct_2</div><div class='del'>-  png_create_read_struct_2</div><div class='del'>-  png_create_write_struct_2</div><div class='del'>-  png_malloc_default</div><div class='del'>-  png_free_default</div><div class='del'>-; MNG features</div><div class='del'>-  png_permit_mng_features</div><div class='del'>-; Added at version 1.2.2</div><div class='del'>-  png_handle_as_unknown</div><div class='del'>-; Added at version 1.2.2 and deleted from 1.2.3</div><div class='del'>-; png_zalloc</div><div class='del'>-; png_zfree</div><div class='del'>-; Added at version 1.2.4</div><div class='del'>-  png_malloc_warn</div><div class='del'>-  png_get_user_height_max</div><div class='del'>-  png_get_user_width_max</div><div class='del'>-  png_set_user_limits</div><div class='del'>-; Added at version 1.2.7</div><div class='del'>-  png_set_add_alpha</div><div class='del'>-; Added at version 1.2.9</div><div class='del'>-  png_save_uint_32</div><div class='del'>-  png_save_uint_16</div><div class='del'>-  png_save_int_32</div><div class='del'>-  png_get_uint_31</div><div class='del'>-  png_set_expand_gray_1_2_4_to_8</div><div class='del'>-; Added at version 1.2.41</div><div class='del'>-  png_write_sig</div><div class='del'>-; png_benign_error</div><div class='del'>-; png_benign_chunk_error</div><div class='del'>-; png_set_benign_error</div><div class='del'>-  png_get_io_chunk_name</div><div class='del'>-  png_get_io_state</div><div class='del'>-  png_set_premultiply_alpha</div><div class='del'>-  png_get_chunk_cache_max</div><div class='del'>-  png_set_chunk_cache_max</div><div class='del'>-  png_check_cHRM_fixed</div><div class='del'>-  png_calloc</div><div class='del'>-  png_set_longjmp_fn</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/pngwin.rc b/src/3rdparty/libpng/scripts/pngwin.rc<br/>deleted file mode 100644<br/>index 9335cbb..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/pngwin.rc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/pngwin.rc</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,112 +0,0 @@</div><div class='del'>-#define PNG_VERSION_INFO_ONLY</div><div class='del'>-</div><div class='del'>-#include &lt;windows.h&gt;</div><div class='del'>-#include "../png.h"</div><div class='del'>-</div><div class='del'>-#define _QUOTE(x) # x</div><div class='del'>-#define QUOTE(x) _QUOTE(x)</div><div class='del'>-</div><div class='del'>-#define PNG_LIBPNG_DLLFNAME "LIBPNG"</div><div class='del'>-</div><div class='del'>-/* Support deprecated PRIVATEBUILD macro */</div><div class='del'>-#if defined(PRIVATEBUILD) &amp;&amp; !defined(PNG_USER_PRIVATEBUILD)</div><div class='del'>-#  define PNG_USER_PRIVATEBUILD PRIVATEBUILD</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(PNG_USER_DLLFNAME_POSTFIX) &amp;&amp; !defined(PNG_USER_PRIVATEBUILD)</div><div class='del'>-#  error "PNG_USER_PRIVATEBUILD must be defined as a string describing the\</div><div class='del'>- custom changes made to the library."</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Prioritize PNG_USER_x over PNG_LIBPNG_x */</div><div class='del'>-#ifdef PNG_USER_DLLFNAME_POSTFIX</div><div class='del'>-#  undef PNG_LIBPNG_DLLFNAME_POSTFIX</div><div class='del'>-#  define PNG_LIBPNG_DLLFNAME_POSTFIX PNG_USER_DLLFNAME_POSTFIX</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PNG_USER_VERSIONINFO_COMMENTS</div><div class='del'>-#  undef PNG_LIBPNG_VERSIONINFO_COMMENTS</div><div class='del'>-#  define PNG_LIBPNG_VERSIONINFO_COMMENTS PNG_USER_VERSIONINFO_COMMENTS</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(PNG_DEBUG) &amp;&amp; (PNG_DEBUG &gt; 0)</div><div class='del'>-#  define VS_DEBUG VS_FF_DEBUG</div><div class='del'>-#  ifndef PNG_LIBPNG_DLLFNAME_POSTFIX</div><div class='del'>-#    define PNG_LIBPNG_DLLFNAME_POSTFIX "D"</div><div class='del'>-#  endif /* PNG_LIBPNG_DLLFNAME_POSTFIX */</div><div class='del'>-#  ifndef PNG_LIBPNG_VERSIONINFO_COMMENTS</div><div class='del'>-#    define PNG_LIBPNG_VERSIONINFO_COMMENTS "PNG_DEBUG=" QUOTE(PNG_DEBUG)</div><div class='del'>-#  endif /* PNG_LIBPNG_VERSIONINFO_COMMENTS */</div><div class='del'>-#else</div><div class='del'>-#  define VS_DEBUG 0</div><div class='del'>-#  ifndef PNG_LIBPNG_DLLFNAME_POSTFIX</div><div class='del'>-#     define PNG_LIBPNG_DLLFNAME_POSTFIX</div><div class='del'>-#  endif /* PNG_LIBPNG_DLLFNAME_POSTFIX */</div><div class='del'>-#endif /* defined(DEBUG)... */</div><div class='del'>-</div><div class='del'>-#ifdef PNG_USER_PRIVATEBUILD</div><div class='del'>-#  define VS_PRIVATEBUILD VS_FF_PRIVATEBUILD</div><div class='del'>-#else</div><div class='del'>-#  define VS_PRIVATEBUILD 0</div><div class='del'>-#endif /* PNG_USER_PRIVATEBUILD */</div><div class='del'>-</div><div class='del'>-#ifdef PNG_LIBPNG_SPECIALBUILD</div><div class='del'>-#  define VS_SPECIALBUILD VS_FF_SPECIALBUILD</div><div class='del'>-#else</div><div class='del'>-#  define VS_SPECIALBUILD 0</div><div class='del'>-#endif /* PNG_LIBPNG_BUILD_SPECIAL */</div><div class='del'>-</div><div class='del'>-#if ((PNG_LIBPNG_BUILD_BASE_TYPE &amp; PNG_LIBPNG_RELEASE_STATUS_MASK) !=\</div><div class='del'>-      PNG_LIBPNG_BUILD_STABLE)</div><div class='del'>-#  define VS_PRERELEASE VS_FF_PRERELEASE</div><div class='del'>-#  define VS_PATCHED 0</div><div class='del'>-#else</div><div class='del'>-#  define VS_PRERELEASE 0</div><div class='del'>-#  if (PNG_LIBPNG_BUILD_BASE_TYPE &amp; PNG_LIBPNG_BUILD_PATCHED)</div><div class='del'>-#    define VS_PATCHED VS_FF_PATCHED</div><div class='del'>-#  else</div><div class='del'>-#    define VS_PATCHED 0</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-VS_VERSION_INFO VERSIONINFO</div><div class='del'>-FILEVERSION PNG_LIBPNG_VER_MAJOR, PNG_LIBPNG_VER_MINOR, PNG_LIBPNG_VER_RELEASE, PNG_LIBPNG_VER_BUILD</div><div class='del'>-PRODUCTVERSION PNG_LIBPNG_VER_MAJOR, PNG_LIBPNG_VER_MINOR, PNG_LIBPNG_VER_RELEASE, PNG_LIBPNG_VER_BUILD</div><div class='del'>-FILEFLAGSMASK VS_FFI_FILEFLAGSMASK</div><div class='del'>-FILEFLAGS VS_DEBUG | VS_PRIVATEBUILD | VS_SPECIALBUILD | VS_PRERELEASE | VS_PATCHED</div><div class='del'>-FILEOS VOS__WINDOWS32</div><div class='del'>-FILETYPE VFT_DLL</div><div class='del'>-FILESUBTYPE VFT2_UNKNOWN</div><div class='del'>-BEGIN</div><div class='del'>-  BLOCK "StringFileInfo"</div><div class='del'>-  BEGIN BLOCK "040904E4" /* Language type = U.S English(0x0409) and Character Set = Windows, Multilingual(0x04E4) */</div><div class='del'>-    BEGIN</div><div class='del'>-#ifdef PNG_LIBPNG_VERSIONINFO_COMMENTS</div><div class='del'>-      VALUE "Comments", PNG_LIBPNG_VERSIONINFO_COMMENTS "\000"</div><div class='del'>-#endif /* PNG_LIBPNG_VERSIONINFO_COMMENTS */</div><div class='del'>-#ifdef PNG_USER_VERSIONINFO_COMPANYNAME</div><div class='del'>-      VALUE "CompanyName", PNG_USER_VERSIONINFO_COMPANYNAME "\000"</div><div class='del'>-#endif /* PNG_USER_VERSIONINFO_COMPANYNAME */</div><div class='del'>-      VALUE "FileDescription", "PNG image compression library\000"</div><div class='del'>-      VALUE "FileVersion", PNG_LIBPNG_VER_STRING "\000"</div><div class='del'>-      VALUE "InternalName", PNG_LIBPNG_DLLFNAME QUOTE(PNG_LIBPNG_VER_DLLNUM) PNG_LIBPNG_DLLFNAME_POSTFIX " (Windows 32 bit)\000"</div><div class='del'>-      VALUE "LegalCopyright", "\251 1998-2009 Glenn Randers-Pehrson et al.\000"</div><div class='del'>-#ifdef PNG_USER_VERSIONINFO_LEGALTRADEMARKS</div><div class='del'>-      VALUE "LegalTrademarks", PNG_USER_VERSIONINFO_LEGALTRADEMARKS "\000"</div><div class='del'>-#endif /* PNG_USER_VERSIONINFO_LEGALTRADEMARKS */</div><div class='del'>-      VALUE "OriginalFilename", PNG_LIBPNG_DLLFNAME QUOTE(PNG_LIBPNG_VER_DLLNUM) PNG_LIBPNG_DLLFNAME_POSTFIX ".DLL\000"</div><div class='del'>-#ifdef PNG_USER_PRIVATEBUILD</div><div class='del'>-      VALUE "PrivateBuild", PNG_USER_PRIVATEBUILD "\000"</div><div class='del'>-#endif /* PNG_USER_PRIVATEBUILD */</div><div class='del'>-      VALUE "ProductName", "LibPNG\000"</div><div class='del'>-      VALUE "ProductVersion", "1\000"</div><div class='del'>-#ifdef PNG_LIBPNG_SPECIALBUILD</div><div class='del'>-      VALUE "SpecialBuild", PNG_LIBPNG_SPECIALBUILD "\000"</div><div class='del'>-#endif /* PNG_LIBPNG_SPECIALBUILD */</div><div class='del'>-    END</div><div class='del'>-  END</div><div class='del'>-  BLOCK "VarFileInfo"</div><div class='del'>-  BEGIN</div><div class='del'>-    VALUE "Translation", 0x0409, 0x04E4</div><div class='del'>-  END</div><div class='del'>-END</div><div class='head'>diff --git a/src/3rdparty/libpng/scripts/smakefile.ppc b/src/3rdparty/libpng/scripts/smakefile.ppc<br/>deleted file mode 100644<br/>index 531c693..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/scripts/smakefile.ppc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/scripts/smakefile.ppc</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-# Amiga powerUP (TM) Makefile</div><div class='del'>-# makefile for libpng and SAS C V6.58/7.00 PPC compiler</div><div class='del'>-# Copyright (C) 1998 by Andreas R. Kleinert</div><div class='del'>-#</div><div class='del'>-# This code is released under the libpng license.</div><div class='del'>-# For conditions of distribution and use, see the disclaimer</div><div class='del'>-# and license in png.h</div><div class='del'>-</div><div class='del'>-CC       = scppc</div><div class='del'>-CFLAGS   = NOSTKCHK NOSINT OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL IDIR /zlib \</div><div class='del'>-           OPTLOOP OPTRDEP=8 OPTDEP=8 OPTCOMP=8</div><div class='del'>-LIBNAME  = libpng.a</div><div class='del'>-AR       = ppc-amigaos-ar</div><div class='del'>-AR_FLAGS = cr</div><div class='del'>-RANLIB   = ppc-amigaos-ranlib</div><div class='del'>-LDFLAGS  = -r -o</div><div class='del'>-LDLIBS   =  ../zlib/libzip.a LIB:scppc.a</div><div class='del'>-LN       = ppc-amigaos-ld</div><div class='del'>-RM       = delete quiet</div><div class='del'>-MKDIR    = makedir</div><div class='del'>-</div><div class='del'>-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o pngread.o \</div><div class='del'>-pngerror.o pngpread.o pngwrite.o pngrtran.o pngwtran.o pngrio.o pngwio.o pngmem.o</div><div class='del'>-</div><div class='del'>-all: $(LIBNAME) pngtest</div><div class='del'>-</div><div class='del'>-$(LIBNAME): $(OBJS)</div><div class='del'>-            $(AR) $(AR_FLAGS) $@ $(OBJS)</div><div class='del'>-            $(RANLIB) $@</div><div class='del'>-</div><div class='del'>-pngtest: pngtest.o $(LIBNAME)</div><div class='del'>-        $(LN) $(LDFLAGS) pngtest LIB:c_ppc.o pngtest.o $(LIBNAME) $(LDLIBS) \</div><div class='del'>-LIB:end.o</div><div class='head'>diff --git a/src/3rdparty/libpng/test-pngtest.sh b/src/3rdparty/libpng/test-pngtest.sh<br/>deleted file mode 100755<br/>index c134a8a..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libpng/test-pngtest.sh?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libpng/test-pngtest.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-#!/bin/sh</div><div class='del'>-</div><div class='del'>-./pngtest ${srcdir}/pngtest.png</div><div class='head'>diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h b/src/3rdparty/libtiff/libtiff/tif_config.h<br/>index 6d89e71..f851384 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/libtiff/libtiff/tif_config.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/libtiff/libtiff/tif_config.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/libtiff/libtiff/tif_config.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/libtiff/libtiff/tif_config.h</a></div><div class='hunk'>@@ -160,7 +160,9 @@</div><div class='ctx'> #define HAVE_SYS_TYPES_H 1</div><div class='ctx'> </div><div class='ctx'> /* Define to 1 if you have the &lt;unistd.h&gt; header file. */</div><div class='add'>+#if !defined(Q_OS_WIN)</div><div class='ctx'> #define HAVE_UNISTD_H 1</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* Define to 1 if you have the &lt;windows.h&gt; header file. */</div><div class='ctx'> /* #undef HAVE_WINDOWS_H */</div><div class='head'>diff --git a/src/3rdparty/md5/md5.cpp b/src/3rdparty/md5/md5.cpp<br/>index f32903c..ac296b5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/md5/md5.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/md5/md5.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/md5/md5.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/md5/md5.cpp</a></div><div class='hunk'>@@ -24,6 +24,7 @@</div><div class='ctx'> #ifndef _WIN32_WCE</div><div class='ctx'> #include &lt;sys/types.h&gt;		/* for stupid systems */</div><div class='ctx'> #else</div><div class='add'>+#include &lt;windef.h&gt;</div><div class='ctx'> #include &lt;types.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/src/3rdparty/patches/zlib-1.2.3-elf-visibility.patch b/src/3rdparty/patches/zlib-1.2.3-elf-visibility.patch<br/>deleted file mode 100644<br/>index 83899ad..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/patches/zlib-1.2.3-elf-visibility.patch?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/patches/zlib-1.2.3-elf-visibility.patch</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,433 +0,0 @@</div><div class='del'>---- compress.c.orig	2003-07-07 07:37:56.000000000 +0200</div><div class='del'>-+++ compress.c	2006-06-16 00:00:00.000000000 +0200</div><div class='del'>-@@ -59,7 +59,7 @@</div><div class='del'>- </div><div class='del'>- /* ===========================================================================</div><div class='del'>-  */</div><div class='del'>--int ZEXPORT compress (dest, destLen, source, sourceLen)</div><div class='del'>-+int Q_ZEXPORT compress (dest, destLen, source, sourceLen)</div><div class='del'>-     Bytef *dest;</div><div class='del'>-     uLongf *destLen;</div><div class='del'>-     const Bytef *source;</div><div class='del'>---- gzio.c.orig	2005-07-11 22:31:48.000000000 +0200</div><div class='del'>-+++ gzio.c	2006-08-25 00:00:00.000000000 +0200</div><div class='del'>-@@ -205,7 +205,7 @@</div><div class='del'>- /* ===========================================================================</div><div class='del'>-      Opens a gzip (.gz) file for reading or writing.</div><div class='del'>- */</div><div class='del'>--gzFile ZEXPORT gzopen (path, mode)</div><div class='del'>-+gzFile Q_ZEXPORT gzopen (path, mode)</div><div class='del'>-     const char *path;</div><div class='del'>-     const char *mode;</div><div class='del'>- {</div><div class='del'>-@@ -391,7 +391,7 @@</div><div class='del'>-      Reads the given number of uncompressed bytes from the compressed file.</div><div class='del'>-    gzread returns the number of bytes actually read (0 for end of file).</div><div class='del'>- */</div><div class='del'>--int ZEXPORT gzread (file, buf, len)</div><div class='del'>-+int Q_ZEXPORT gzread (file, buf, len)</div><div class='del'>-     gzFile file;</div><div class='del'>-     voidp buf;</div><div class='del'>-     unsigned len;</div><div class='del'>-@@ -600,7 +600,7 @@</div><div class='del'>- #ifdef STDC</div><div class='del'>- #include &lt;stdarg.h&gt;</div><div class='del'>- </div><div class='del'>--int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)</div><div class='del'>-+int Q_ZEXPORT gzprintf (gzFile file, const char *format, /* args */ ...)</div><div class='del'>- {</div><div class='del'>-     char buf[Z_PRINTF_BUFSIZE];</div><div class='del'>-     va_list va;</div><div class='del'>-@@ -634,7 +634,7 @@</div><div class='del'>- }</div><div class='del'>- #else /* not ANSI C */</div><div class='del'>- </div><div class='del'>--int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,</div><div class='del'>-+int Q_ZEXPORT gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,</div><div class='del'>-                        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)</div><div class='del'>-     gzFile file;</div><div class='del'>-     const char *format;</div><div class='del'>-@@ -950,7 +950,7 @@</div><div class='del'>-      Flushes all pending output if necessary, closes the compressed file</div><div class='del'>-    and deallocates all the (de)compression state.</div><div class='del'>- */</div><div class='del'>--int ZEXPORT gzclose (file)</div><div class='del'>-+int Q_ZEXPORT gzclose (file)</div><div class='del'>-     gzFile file;</div><div class='del'>- {</div><div class='del'>-     gz_stream *s = (gz_stream*)file;</div><div class='del'>---- uncompr.c.orig	2003-07-07 07:36:56.000000000 +0200</div><div class='del'>-+++ uncompr.c	2006-06-16 00:00:00.000000000 +0200</div><div class='del'>-@@ -23,7 +23,7 @@</div><div class='del'>-    enough memory, Z_BUF_ERROR if there was not enough room in the output</div><div class='del'>-    buffer, or Z_DATA_ERROR if the input data was corrupted.</div><div class='del'>- */</div><div class='del'>--int ZEXPORT uncompress (dest, destLen, source, sourceLen)</div><div class='del'>-+int Q_ZEXPORT uncompress (dest, destLen, source, sourceLen)</div><div class='del'>-     Bytef *dest;</div><div class='del'>-     uLongf *destLen;</div><div class='del'>-     const Bytef *source;</div><div class='del'>---- zlib.h.orig	2005-07-18 04:26:49.000000000 +0200</div><div class='del'>-+++ zlib.h	2006-08-25 00:00:00.000000000 +0200</div><div class='del'>-@@ -32,6 +32,7 @@</div><div class='del'>- #define ZLIB_H</div><div class='del'>- </div><div class='del'>- #include "zconf.h"</div><div class='del'>-+#include "qconfig.h"</div><div class='del'>- </div><div class='del'>- #ifdef __cplusplus</div><div class='del'>- extern "C" {</div><div class='del'>-@@ -40,6 +41,19 @@</div><div class='del'>- #define ZLIB_VERSION "1.2.3"</div><div class='del'>- #define ZLIB_VERNUM 0x1230</div><div class='del'>- </div><div class='del'>-+#if defined(QT_VISIBILITY_AVAILABLE)</div><div class='del'>-+# define Q_ZEXPORT __attribute__((visibility("default")))</div><div class='del'>-+#else</div><div class='del'>-+# ifdef QT_MAKEDLL</div><div class='del'>-+# define Q_ZEXPORT __declspec(dllexport)</div><div class='del'>-+# else</div><div class='del'>-+# define Q_ZEXPORT ZEXPORT</div><div class='del'>-+# endif</div><div class='del'>-+#endif</div><div class='del'>-+#ifdef Q_OS_TEMP</div><div class='del'>-+#include &lt;qfunctions_wce.h&gt;</div><div class='del'>-+#endif</div><div class='del'>-+</div><div class='del'>- /*</div><div class='del'>-      The 'zlib' compression library provides in-memory compression and</div><div class='del'>-   decompression functions, including integrity checks of the uncompressed</div><div class='del'>-@@ -209,7 +223,7 @@</div><div class='del'>- </div><div class='del'>-                         /* basic functions */</div><div class='del'>- </div><div class='del'>--ZEXTERN const char * ZEXPORT zlibVersion OF((void));</div><div class='del'>-+ZEXTERN Q_ZEXPORT const char * zlibVersion OF((void));</div><div class='del'>- /* The application can compare zlibVersion and ZLIB_VERSION for consistency.</div><div class='del'>-    If the first character differs, the library code actually used is</div><div class='del'>-    not compatible with the zlib.h header file used by the application.</div><div class='del'>-@@ -239,7 +253,7 @@</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT deflate OF((z_streamp strm, int flush));</div><div class='del'>- /*</div><div class='del'>-     deflate compresses as much data as possible, and stops when the input</div><div class='del'>-   buffer becomes empty or the output buffer becomes full. It may introduce some</div><div class='del'>-@@ -325,7 +339,7 @@</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT deflateEnd OF((z_streamp strm));</div><div class='del'>- /*</div><div class='del'>-      All dynamically allocated data structures for this stream are freed.</div><div class='del'>-    This function discards any unprocessed input and does not flush any</div><div class='del'>-@@ -360,7 +374,7 @@</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT inflate OF((z_streamp strm, int flush));</div><div class='del'>- /*</div><div class='del'>-     inflate decompresses as much data as possible, and stops when the input</div><div class='del'>-   buffer becomes empty or the output buffer becomes full. It may introduce</div><div class='del'>-@@ -459,7 +473,7 @@</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT inflateEnd OF((z_streamp strm));</div><div class='del'>- /*</div><div class='del'>-      All dynamically allocated data structures for this stream are freed.</div><div class='del'>-    This function discards any unprocessed input and does not flush any</div><div class='del'>-@@ -535,7 +549,7 @@</div><div class='del'>-    not perform any compression: this will be done by deflate().</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,</div><div class='del'>-+ZEXTERN int Q_ZEXPORT deflateSetDictionary OF((z_streamp strm,</div><div class='del'>-                                              const Bytef *dictionary,</div><div class='del'>-                                              uInt  dictLength));</div><div class='del'>- /*</div><div class='del'>-@@ -574,7 +588,7 @@</div><div class='del'>-    perform any compression: this will be done by deflate().</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,</div><div class='del'>-+ZEXTERN int Q_ZEXPORT deflateCopy OF((z_streamp dest,</div><div class='del'>-                                     z_streamp source));</div><div class='del'>- /*</div><div class='del'>-      Sets the destination stream as a complete copy of the source stream.</div><div class='del'>-@@ -592,7 +606,7 @@</div><div class='del'>-    destination.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT deflateReset OF((z_streamp strm));</div><div class='del'>- /*</div><div class='del'>-      This function is equivalent to deflateEnd followed by deflateInit,</div><div class='del'>-    but does not free and reallocate all the internal compression state.</div><div class='del'>-@@ -603,7 +617,7 @@</div><div class='del'>-    stream state was inconsistent (such as zalloc or state being NULL).</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,</div><div class='del'>-+ZEXTERN int Q_ZEXPORT deflateParams OF((z_streamp strm,</div><div class='del'>-                                       int level,</div><div class='del'>-                                       int strategy));</div><div class='del'>- /*</div><div class='del'>-@@ -733,7 +747,7 @@</div><div class='del'>-    and avail_out are unchanged.)</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,</div><div class='del'>-+ZEXTERN int Q_ZEXPORT inflateSetDictionary OF((z_streamp strm,</div><div class='del'>-                                              const Bytef *dictionary,</div><div class='del'>-                                              uInt  dictLength));</div><div class='del'>- /*</div><div class='del'>-@@ -755,7 +769,7 @@</div><div class='del'>-    inflate().</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT inflateSync OF((z_streamp strm));</div><div class='del'>- /*</div><div class='del'>-     Skips invalid compressed data until a full flush point (see above the</div><div class='del'>-   description of deflate with Z_FULL_FLUSH) can be found, or until all</div><div class='del'>-@@ -786,7 +800,7 @@</div><div class='del'>-    destination.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT inflateReset OF((z_streamp strm));</div><div class='del'>- /*</div><div class='del'>-      This function is equivalent to inflateEnd followed by inflateInit,</div><div class='del'>-    but does not free and reallocate all the internal decompression state.</div><div class='del'>-@@ -1006,7 +1020,7 @@</div><div class='del'>-    utility functions can easily be modified if you need special options.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,</div><div class='del'>-+ZEXTERN int Q_ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,</div><div class='del'>-                                  const Bytef *source, uLong sourceLen));</div><div class='del'>- /*</div><div class='del'>-      Compresses the source buffer into the destination buffer.  sourceLen is</div><div class='del'>-@@ -1021,7 +1035,7 @@</div><div class='del'>-    buffer.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,</div><div class='del'>-+ZEXTERN int Q_ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,</div><div class='del'>-                                   const Bytef *source, uLong sourceLen,</div><div class='del'>-                                   int level));</div><div class='del'>- /*</div><div class='del'>-@@ -1044,7 +1058,7 @@</div><div class='del'>-    a compress() or compress2() call to allocate the destination buffer.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,</div><div class='del'>-+ZEXTERN int Q_ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,</div><div class='del'>-                                    const Bytef *source, uLong sourceLen));</div><div class='del'>- /*</div><div class='del'>-      Decompresses the source buffer into the destination buffer.  sourceLen is</div><div class='del'>-@@ -1065,7 +1079,7 @@</div><div class='del'>- </div><div class='del'>- typedef voidp gzFile;</div><div class='del'>- </div><div class='del'>--ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));</div><div class='del'>-+ZEXTERN gzFile Q_ZEXPORT gzopen  OF((const char *path, const char *mode));</div><div class='del'>- /*</div><div class='del'>-      Opens a gzip (.gz) file for reading or writing. The mode parameter</div><div class='del'>-    is as in fopen ("rb" or "wb") but can also include a compression level</div><div class='del'>-@@ -1082,7 +1096,7 @@</div><div class='del'>-    can be checked to distinguish the two cases (if errno is zero, the</div><div class='del'>-    zlib error is Z_MEM_ERROR).  */</div><div class='del'>- </div><div class='del'>--ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));</div><div class='del'>-+ZEXTERN gzFile Q_ZEXPORT gzdopen  OF((int fd, const char *mode));</div><div class='del'>- /*</div><div class='del'>-      gzdopen() associates a gzFile with the file descriptor fd.  File</div><div class='del'>-    descriptors are obtained from calls like open, dup, creat, pipe or</div><div class='del'>-@@ -1095,7 +1109,7 @@</div><div class='del'>-    the (de)compression state.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));</div><div class='del'>- /*</div><div class='del'>-      Dynamically update the compression level or strategy. See the description</div><div class='del'>-    of deflateInit2 for the meaning of these parameters.</div><div class='del'>-@@ -1103,7 +1117,7 @@</div><div class='del'>-    opened for writing.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));</div><div class='del'>- /*</div><div class='del'>-      Reads the given number of uncompressed bytes from the compressed file.</div><div class='del'>-    If the input file was not in gzip format, gzread copies the given number</div><div class='del'>-@@ -1111,7 +1125,7 @@</div><div class='del'>-      gzread returns the number of uncompressed bytes actually read (0 for</div><div class='del'>-    end of file, -1 for error). */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,</div><div class='del'>-+ZEXTERN int Q_ZEXPORT    gzwrite OF((gzFile file,</div><div class='del'>-                                    voidpc buf, unsigned len));</div><div class='del'>- /*</div><div class='del'>-      Writes the given number of uncompressed bytes into the compressed file.</div><div class='del'>-@@ -1119,7 +1133,7 @@</div><div class='del'>-    (0 in case of error).</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT gzprintf OF((gzFile file, const char *format, ...));</div><div class='del'>- /*</div><div class='del'>-      Converts, formats, and writes the args to the compressed file under</div><div class='del'>-    control of the format string, as in fprintf. gzprintf returns the number of</div><div class='del'>-@@ -1132,14 +1146,14 @@</div><div class='del'>-    because the secure snprintf() or vsnprintf() functions were not available.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT gzputs OF((gzFile file, const char *s));</div><div class='del'>- /*</div><div class='del'>-       Writes the given null-terminated string to the compressed file, excluding</div><div class='del'>-    the terminating null character.</div><div class='del'>-       gzputs returns the number of characters written, or -1 in case of error.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));</div><div class='del'>-+ZEXTERN Q_ZEXPORT char * gzgets OF((gzFile file, char *buf, int len));</div><div class='del'>- /*</div><div class='del'>-       Reads bytes from the compressed file until len-1 characters are read, or</div><div class='del'>-    a newline character is read and transferred to buf, or an end-of-file</div><div class='del'>-@@ -1148,13 +1162,13 @@</div><div class='del'>-       gzgets returns buf, or Z_NULL in case of error.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT    gzputc OF((gzFile file, int c));</div><div class='del'>- /*</div><div class='del'>-       Writes c, converted to an unsigned char, into the compressed file.</div><div class='del'>-    gzputc returns the value that was written, or -1 in case of error.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT    gzgetc OF((gzFile file));</div><div class='del'>- /*</div><div class='del'>-       Reads one byte from the compressed file. gzgetc returns this byte</div><div class='del'>-    or -1 in case of end of file or error.</div><div class='del'>-@@ -1170,7 +1184,7 @@</div><div class='del'>-    or gzrewind().</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT    gzflush OF((gzFile file, int flush));</div><div class='del'>- /*</div><div class='del'>-      Flushes all pending output into the compressed file. The parameter</div><div class='del'>-    flush is as in the deflate() function. The return value is the zlib</div><div class='del'>-@@ -1180,7 +1194,7 @@</div><div class='del'>-    degrade compression.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,</div><div class='del'>-+ZEXTERN z_off_t Q_ZEXPORT    gzseek OF((gzFile file,</div><div class='del'>-                                       z_off_t offset, int whence));</div><div class='del'>- /*</div><div class='del'>-       Sets the starting position for the next gzread or gzwrite on the</div><div class='del'>-@@ -1198,14 +1212,14 @@</div><div class='del'>-    would be before the current position.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT    gzrewind OF((gzFile file));</div><div class='del'>- /*</div><div class='del'>-      Rewinds the given file. This function is supported only for reading.</div><div class='del'>- </div><div class='del'>-    gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));</div><div class='del'>-+ZEXTERN z_off_t Q_ZEXPORT    gztell OF((gzFile file));</div><div class='del'>- /*</div><div class='del'>-      Returns the starting position for the next gzread or gzwrite on the</div><div class='del'>-    given compressed file. This position represents a number of bytes in the</div><div class='del'>-@@ -1214,7 +1228,7 @@</div><div class='del'>-    gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT gzeof OF((gzFile file));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT gzeof OF((gzFile file));</div><div class='del'>- /*</div><div class='del'>-      Returns 1 when EOF has previously been detected reading the given</div><div class='del'>-    input stream, otherwise zero.</div><div class='del'>-@@ -1226,14 +1240,14 @@</div><div class='del'>-    zero.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN int ZEXPORT    gzclose OF((gzFile file));</div><div class='del'>-+ZEXTERN int Q_ZEXPORT    gzclose OF((gzFile file));</div><div class='del'>- /*</div><div class='del'>-      Flushes all pending output if necessary, closes the compressed file</div><div class='del'>-    and deallocates all the (de)compression state. The return value is the zlib</div><div class='del'>-    error number (see function gzerror below).</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));</div><div class='del'>-+ZEXTERN Q_ZEXPORT const char * gzerror OF((gzFile file, int *errnum));</div><div class='del'>- /*</div><div class='del'>-      Returns the error message for the last error which occurred on the</div><div class='del'>-    given compressed file. errnum is set to zlib error number. If an</div><div class='del'>-@@ -1257,7 +1271,7 @@</div><div class='del'>-    compression library.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));</div><div class='del'>-+ZEXTERN uLong Q_ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));</div><div class='del'>- /*</div><div class='del'>-      Update a running Adler-32 checksum with the bytes buf[0..len-1] and</div><div class='del'>-    return the updated checksum. If buf is NULL, this function returns</div><div class='del'>-@@ -1282,7 +1296,7 @@</div><div class='del'>-    seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>--ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));</div><div class='del'>-+ZEXTERN uLong Q_ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));</div><div class='del'>- /*</div><div class='del'>-      Update a running CRC-32 with the bytes buf[0..len-1] and return the</div><div class='del'>-    updated CRC-32. If buf is NULL, this function returns the required initial</div><div class='del'>-@@ -1314,15 +1328,15 @@</div><div class='del'>- /* deflateInit and inflateInit are macros to allow checking the zlib version</div><div class='del'>-  * and the compiler's view of z_stream:</div><div class='del'>-  */</div><div class='del'>--ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,</div><div class='del'>-+ZEXTERN int Q_ZEXPORT deflateInit_ OF((z_streamp strm, int level,</div><div class='del'>-                                      const char *version, int stream_size));</div><div class='del'>--ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,</div><div class='del'>-+ZEXTERN int Q_ZEXPORT inflateInit_ OF((z_streamp strm,</div><div class='del'>-                                      const char *version, int stream_size));</div><div class='del'>--ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,</div><div class='del'>-+ZEXTERN int Q_ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,</div><div class='del'>-                                       int windowBits, int memLevel,</div><div class='del'>-                                       int strategy, const char *version,</div><div class='del'>-                                       int stream_size));</div><div class='del'>--ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,</div><div class='del'>-+ZEXTERN int Q_ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,</div><div class='del'>-                                       const char *version, int stream_size));</div><div class='del'>- ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,</div><div class='del'>-                                          unsigned char FAR *window,</div><div class='del'>-@@ -1346,9 +1360,9 @@</div><div class='del'>-     struct internal_state {int dummy;}; /* hack for buggy compilers */</div><div class='del'>- #endif</div><div class='del'>- </div><div class='del'>--ZEXTERN const char   * ZEXPORT zError           OF((int));</div><div class='del'>--ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));</div><div class='del'>--ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));</div><div class='del'>-+ZEXTERN Q_ZEXPORT const char   * zError           OF((int));</div><div class='del'>-+ZEXTERN int            Q_ZEXPORT inflateSyncPoint OF((z_streamp z));</div><div class='del'>-+ZEXTERN Q_ZEXPORT const uLongf * get_crc_table    OF((void));</div><div class='del'>- </div><div class='del'>- #ifdef __cplusplus</div><div class='del'>- }</div><div class='head'>diff --git a/src/3rdparty/phonon/gstreamer/devicemanager.cpp b/src/3rdparty/phonon/gstreamer/devicemanager.cpp<br/>index c3826eb..518aa85 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/phonon/gstreamer/devicemanager.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/phonon/gstreamer/devicemanager.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/phonon/gstreamer/devicemanager.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/phonon/gstreamer/devicemanager.cpp</a></div><div class='hunk'>@@ -22,7 +22,9 @@</div><div class='ctx'> #include "videowidget.h"</div><div class='ctx'> #include "glrenderer.h"</div><div class='ctx'> #include "widgetrenderer.h"</div><div class='add'>+#ifdef Q_WS_X11</div><div class='ctx'> #include "x11renderer.h"</div><div class='add'>+#endif</div><div class='ctx'> #include "artssink.h"</div><div class='ctx'> #include "pulsesupport.h"</div><div class='ctx'> </div><div class='hunk'>@@ -264,7 +266,7 @@ AbstractRenderer *DeviceManager::createVideoRenderer(VideoWidget *parent)</div><div class='ctx'>     if (m_videoSinkWidget == "software") {</div><div class='ctx'>         return new WidgetRenderer(parent);</div><div class='ctx'>     }</div><div class='del'>-#ifndef Q_WS_QWS</div><div class='add'>+#ifdef Q_WS_X11</div><div class='ctx'>     else if (m_videoSinkWidget == "xwindow") {</div><div class='ctx'>         return new X11Renderer(parent);</div><div class='ctx'>     } else {</div><div class='head'>diff --git a/src/3rdparty/phonon/gstreamer/videowidget.cpp b/src/3rdparty/phonon/gstreamer/videowidget.cpp<br/>index e1f0ec9..a4c6f79 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/phonon/gstreamer/videowidget.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/phonon/gstreamer/videowidget.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/phonon/gstreamer/videowidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/phonon/gstreamer/videowidget.cpp</a></div><div class='hunk'>@@ -31,7 +31,9 @@</div><div class='ctx'> </div><div class='ctx'> #include "glrenderer.h"</div><div class='ctx'> #include "widgetrenderer.h"</div><div class='add'>+#ifdef Q_WS_X11</div><div class='ctx'> #include "x11renderer.h"</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_PHONON_VIDEO</div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='hunk'>@@ -116,10 +118,12 @@ void VideoWidget::setupVideoBin()</div><div class='ctx'>             GstPad *videopad = gst_element_get_pad (queue, "sink");</div><div class='ctx'>             gst_element_add_pad (m_videoBin, gst_ghost_pad_new ("sink", videopad));</div><div class='ctx'>             gst_object_unref (videopad);</div><div class='add'>+#ifndef Q_WS_QPA</div><div class='ctx'>             QWidget *parentWidget = qobject_cast&lt;QWidget*&gt;(parent());</div><div class='ctx'>             if (parentWidget)</div><div class='ctx'>                 parentWidget-&gt;winId();  // Due to some existing issues with alien in 4.4,</div><div class='ctx'>                                         //  we must currently force the creation of a parent widget.</div><div class='add'>+#endif</div><div class='ctx'>             m_isValid = true; //initialization ok, accept input</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='head'>diff --git a/src/3rdparty/phonon/gstreamer/x11renderer.h b/src/3rdparty/phonon/gstreamer/x11renderer.h<br/>index f7140da..8e2ea19 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/phonon/gstreamer/x11renderer.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/phonon/gstreamer/x11renderer.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/phonon/gstreamer/x11renderer.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/phonon/gstreamer/x11renderer.h</a></div><div class='hunk'>@@ -27,8 +27,6 @@</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='del'>-#ifndef Q_WS_QWS</div><div class='del'>-</div><div class='ctx'> class QString;</div><div class='ctx'> </div><div class='ctx'> namespace Phonon</div><div class='hunk'>@@ -61,8 +59,6 @@ private:</div><div class='ctx'> }</div><div class='ctx'> } //namespace Phonon::Gstreamer</div><div class='ctx'> </div><div class='del'>-#endif // Q_WS_QWS</div><div class='del'>-</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> #endif // Phonon_GSTREAMER_X11RENDERER_H</div><div class='head'>diff --git a/src/3rdparty/phonon/phonon/mediacontroller.cpp b/src/3rdparty/phonon/phonon/mediacontroller.cpp<br/>index 37af3f7..3dc22b7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/phonon/phonon/mediacontroller.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/phonon/phonon/mediacontroller.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/phonon/phonon/mediacontroller.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/phonon/phonon/mediacontroller.cpp</a></div><div class='hunk'>@@ -216,14 +216,14 @@ void MediaController::setCurrentAudioChannel(const Phonon::AudioChannelDescripti</div><div class='ctx'> {</div><div class='ctx'>     IFACE;</div><div class='ctx'>     iface-&gt;interfaceCall(AddonInterface::AudioChannelInterface,</div><div class='del'>-        AddonInterface::setCurrentAudioChannel, QList&lt;QVariant&gt;() &lt;&lt; qVariantFromValue(stream));</div><div class='add'>+        AddonInterface::setCurrentAudioChannel, QList&lt;QVariant&gt;() &lt;&lt; QVariant::fromValue(stream));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void MediaController::setCurrentSubtitle(const Phonon::SubtitleDescription &amp;stream)</div><div class='ctx'> {</div><div class='ctx'>     IFACE;</div><div class='ctx'>     iface-&gt;interfaceCall(AddonInterface::SubtitleInterface,</div><div class='del'>-        AddonInterface::setCurrentSubtitle, QList&lt;QVariant&gt;() &lt;&lt; qVariantFromValue(stream));</div><div class='add'>+        AddonInterface::setCurrentSubtitle, QList&lt;QVariant&gt;() &lt;&lt; QVariant::fromValue(stream));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #undef IFACE</div><div class='head'>diff --git a/src/3rdparty/phonon/phonon/objectdescriptionmodel.h b/src/3rdparty/phonon/phonon/objectdescriptionmodel.h<br/>index 8fd622f..d994600 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/phonon/phonon/objectdescriptionmodel.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/phonon/phonon/objectdescriptionmodel.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/phonon/phonon/objectdescriptionmodel.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/phonon/phonon/objectdescriptionmodel.h</a></div><div class='hunk'>@@ -141,10 +141,11 @@ namespace Phonon</div><div class='ctx'> </div><div class='ctx'> /* Required to ensure template class vtables are exported on both symbian</div><div class='ctx'> and existing builds. */</div><div class='del'>-#if defined(Q_OS_SYMBIAN) &amp;&amp; defined(Q_CC_RVCT)</div><div class='add'>+#if (defined(Q_OS_SYMBIAN) &amp;&amp; defined(Q_CC_RVCT)) || defined(Q_CC_CLANG)</div><div class='ctx'> // RVCT compiler (2.2.686) requires the export declaration to be on the class to export vtables</div><div class='ctx'> // MWC compiler works both ways</div><div class='ctx'> // GCCE compiler is unknown (it can't compile QtCore yet)</div><div class='add'>+// Clang also requires the export declaration to be on the class to export vtables</div><div class='ctx'> #define PHONON_TEMPLATE_CLASS_EXPORT PHONON_EXPORT</div><div class='ctx'> #define PHONON_TEMPLATE_CLASS_MEMBER_EXPORT</div><div class='ctx'> #else</div><div class='head'>diff --git a/src/3rdparty/phonon/phonon/qsettingsgroup_p.h b/src/3rdparty/phonon/phonon/qsettingsgroup_p.h<br/>index f28ecaa..f25b15e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/phonon/phonon/qsettingsgroup_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/phonon/phonon/qsettingsgroup_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/phonon/phonon/qsettingsgroup_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/phonon/phonon/qsettingsgroup_p.h</a></div><div class='hunk'>@@ -54,7 +54,7 @@ class QSettingsGroup</div><div class='ctx'>         template&lt;typename T&gt;</div><div class='ctx'>         inline T value(const QString &amp;key, const T &amp;def) const</div><div class='ctx'>         {</div><div class='del'>-            return qvariant_cast&lt;T&gt;(value(key, qVariantFromValue(def)));</div><div class='add'>+            return qvariant_cast&lt;T&gt;(value(key, QVariant::fromValue(def)));</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         inline QVariant value(const QString &amp;key, const QVariant &amp;def) const</div><div class='hunk'>@@ -66,7 +66,7 @@ class QSettingsGroup</div><div class='ctx'>         inline void setValue(const QString &amp;key, const T &amp;value)</div><div class='ctx'>         {</div><div class='ctx'>             Q_ASSERT(m_mutableSettings);</div><div class='del'>-            m_mutableSettings-&gt;setValue(m_group + key, qVariantFromValue(value));</div><div class='add'>+            m_mutableSettings-&gt;setValue(m_group + key, QVariant::fromValue(value));</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         inline void removeEntry(const QString &amp;key)</div><div class='head'>diff --git a/src/3rdparty/phonon/qt7/videowidget.mm b/src/3rdparty/phonon/qt7/videowidget.mm<br/>index 736dcdf..0600268 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/phonon/qt7/videowidget.mm?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/phonon/qt7/videowidget.mm</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/phonon/qt7/videowidget.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/phonon/qt7/videowidget.mm</a></div><div class='hunk'>@@ -278,7 +278,7 @@ public:</div><div class='ctx'>         glMatrixMode(GL_PROJECTION);</div><div class='ctx'>         glLoadIdentity();</div><div class='ctx'>         glViewport(0, 0, GLsizei(w), GLsizei(h));</div><div class='del'>-        gluOrtho2D(0, GLsizei(w), 0, GLsizei(h));</div><div class='add'>+        glOrtho(0, GLsizei(w), 0, GLsizei(h), -1, 1);</div><div class='ctx'>         updateGL();</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='hunk'>@@ -446,10 +446,12 @@ public:</div><div class='ctx'> </div><div class='ctx'>     void setDrawFrameRect(const QRect &amp;rect)</div><div class='ctx'>     {</div><div class='del'>-        m_movieLayer.frame.origin.x = rect.x();</div><div class='del'>-        m_movieLayer.frame.origin.y = rect.y();</div><div class='del'>-        m_movieLayer.frame.size.width = rect.width();</div><div class='del'>-        m_movieLayer.frame.size.height = rect.height();</div><div class='add'>+        CGRect frame = m_movieLayer.frame;</div><div class='add'>+        frame.origin.x = rect.x();</div><div class='add'>+        frame.origin.y = rect.y();</div><div class='add'>+        frame.size.width = rect.width();</div><div class='add'>+        frame.size.height = rect.height();</div><div class='add'>+        m_movieLayer.frame = frame;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'> #else // QT_MAC_USE_COCOA == false</div><div class='head'>diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro<br/>index c70a168..ccb6707 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/webkit/WebCore/WebCore.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/webkit/WebCore/WebCore.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/webkit/WebCore/WebCore.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/webkit/WebCore/WebCore.pro</a></div><div class='hunk'>@@ -55,6 +55,7 @@ TEMPLATE = lib</div><div class='ctx'> TARGET = QtWebKit</div><div class='ctx'> </div><div class='ctx'> contains(QT_CONFIG, embedded):CONFIG += embedded</div><div class='add'>+contains(QT_CONFIG, qpa):CONFIG += embedded</div><div class='ctx'> </div><div class='ctx'> CONFIG(standalone_package) {</div><div class='ctx'>     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/generated</div><div class='hunk'>@@ -84,9 +85,7 @@ moduleFile=$$PWD/../WebKit/qt/qt_webkit_version.pri</div><div class='ctx'> isEmpty(QT_BUILD_TREE):include($$moduleFile)</div><div class='ctx'> VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION}</div><div class='ctx'> </div><div class='del'>-unix {</div><div class='del'>-    QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork</div><div class='del'>-}</div><div class='add'>+unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork</div><div class='ctx'> </div><div class='ctx'> unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections </div><div class='ctx'> unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections</div><div class='hunk'>@@ -2179,11 +2178,11 @@ contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {</div><div class='ctx'>     </div><div class='ctx'>             mac {</div><div class='ctx'>                 SOURCES += \</div><div class='del'>-                    plugins/mac/PluginPackageMac.cpp \</div><div class='del'>-                    plugins/mac/PluginViewMac.mm</div><div class='add'>+                    plugins/mac/PluginPackageMac.cpp</div><div class='ctx'>                 OBJECTIVE_SOURCES += \</div><div class='ctx'>                     platform/text/mac/StringImplMac.mm \</div><div class='del'>-                    platform/mac/WebCoreNSStringExtras.mm</div><div class='add'>+                    platform/mac/WebCoreNSStringExtras.mm \</div><div class='add'>+                    plugins/mac/PluginViewMac.mm</div><div class='ctx'>                 INCLUDEPATH += platform/mac</div><div class='ctx'>                 # Note: XP_MACOSX is defined in npapi.h</div><div class='ctx'>             } else {</div><div class='head'>diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h b/src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h<br/>index 40f7e40..0df23a2 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.h</a></div><div class='hunk'>@@ -225,7 +225,7 @@ namespace WebCore {</div><div class='ctx'>     {</div><div class='ctx'>         if (!node)</div><div class='ctx'>             return JSC::jsNull();</div><div class='del'>-        if (JSNode* wrapper = getCachedDOMNodeWrapper(exec, node-&gt;document(), node))</div><div class='add'>+        if (JSC::JSCell* wrapper = getCachedDOMNodeWrapper(exec, node-&gt;document(), node))</div><div class='ctx'>             return wrapper;</div><div class='ctx'>         return createDOMNodeWrapper&lt;WrapperClass&gt;(exec, globalObject, node);</div><div class='ctx'>     }</div><div class='head'>diff --git a/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp b/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp<br/>index 2212f58..7f5d37d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.cpp</a></div><div class='hunk'>@@ -567,7 +567,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type</div><div class='ctx'>                     if (qstring.mid(lastSlash + 1).contains(QLatin1Char('i')))</div><div class='ctx'>                         realRe.setCaseSensitivity(Qt::CaseInsensitive);</div><div class='ctx'> </div><div class='del'>-                    ret = qVariantFromValue(realRe);</div><div class='add'>+                    ret = QVariant::fromValue(realRe);</div><div class='ctx'>                     dist = 0;</div><div class='ctx'>                 } else {</div><div class='ctx'>                     qConvDebug() &lt;&lt; "couldn't parse a JS regexp";</div><div class='hunk'>@@ -578,7 +578,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type</div><div class='ctx'> </div><div class='ctx'>                 QRegExp re(qstring);</div><div class='ctx'>                 if (re.isValid()) {</div><div class='del'>-                    ret = qVariantFromValue(re);</div><div class='add'>+                    ret = QVariant::fromValue(re);</div><div class='ctx'>                     dist = 10;</div><div class='ctx'>                 }</div><div class='ctx'>             }</div><div class='hunk'>@@ -590,7 +590,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type</div><div class='ctx'>                 if (qtinst) {</div><div class='ctx'>                     if (qtinst-&gt;getObject()) {</div><div class='ctx'>                         qConvDebug() &lt;&lt; "found instance, with object:" &lt;&lt; (void*) qtinst-&gt;getObject();</div><div class='del'>-                        ret = qVariantFromValue(qtinst-&gt;getObject());</div><div class='add'>+                        ret = QVariant::fromValue(qtinst-&gt;getObject());</div><div class='ctx'>                         qConvDebug() &lt;&lt; ret;</div><div class='ctx'>                         dist = 0;</div><div class='ctx'>                     } else {</div><div class='hunk'>@@ -601,7 +601,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type</div><div class='ctx'>                 }</div><div class='ctx'>             } else if (type == Null) {</div><div class='ctx'>                 QObject* nullobj = 0;</div><div class='del'>-                ret = qVariantFromValue(nullobj);</div><div class='add'>+                ret = QVariant::fromValue(nullobj);</div><div class='ctx'>                 dist = 0;</div><div class='ctx'>             } else {</div><div class='ctx'>                 qConvDebug() &lt;&lt; "previous type was not an object:" &lt;&lt; type;</div><div class='hunk'>@@ -614,7 +614,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type</div><div class='ctx'>                 if (qtinst) {</div><div class='ctx'>                     if (qtinst-&gt;getObject()) {</div><div class='ctx'>                         qConvDebug() &lt;&lt; "found instance, with object:" &lt;&lt; (void*) qtinst-&gt;getObject();</div><div class='del'>-                        ret = qVariantFromValue((void *)qtinst-&gt;getObject());</div><div class='add'>+                        ret = QVariant::fromValue((void *)qtinst-&gt;getObject());</div><div class='ctx'>                         qConvDebug() &lt;&lt; ret;</div><div class='ctx'>                         dist = 0;</div><div class='ctx'>                     } else {</div><div class='hunk'>@@ -624,7 +624,7 @@ QVariant convertValueToQVariant(ExecState* exec, JSValue value, QMetaType::Type</div><div class='ctx'>                     qConvDebug() &lt;&lt; "wasn't a qtinstance";</div><div class='ctx'>                 }</div><div class='ctx'>             } else if (type == Null) {</div><div class='del'>-                ret = qVariantFromValue((void*)0);</div><div class='add'>+                ret = QVariant::fromValue((void*)0);</div><div class='ctx'>                 dist = 0;</div><div class='ctx'>             } else if (type == Number) {</div><div class='ctx'>                 // I don't think that converting a double to a pointer is a wise</div><div class='head'>diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp<br/>index 88c7a1c..9de5c08 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp</a></div><div class='hunk'>@@ -101,7 +101,7 @@ MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)</div><div class='ctx'> </div><div class='ctx'>     // Make sure we get updates for each frame</div><div class='ctx'>     m_videoWidget-&gt;installEventFilter(this);</div><div class='del'>-    foreach (QWidget* widget, qFindChildren&lt;QWidget*&gt;(m_videoWidget))</div><div class='add'>+    foreach (QWidget* widget, m_videoWidget-&gt;findChildren&lt;QWidget*&gt;())</div><div class='ctx'>         widget-&gt;installEventFilter(this);</div><div class='ctx'> </div><div class='ctx'>     connect(m_mediaObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)),</div><div class='head'>diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp<br/>index 7708191..965c0ef 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/webkit/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp</a></div><div class='hunk'>@@ -185,7 +185,7 @@ void MediaPlayerPrivate::load(const String&amp; url)</div><div class='ctx'>             // Don't set the header if there are no cookies.</div><div class='ctx'>             // This prevents a warning from being emitted.</div><div class='ctx'>             if (!cookies.isEmpty())</div><div class='del'>-                request.setHeader(QNetworkRequest::CookieHeader, qVariantFromValue(cookies));</div><div class='add'>+                request.setHeader(QNetworkRequest::CookieHeader, QVariant::fromValue(cookies));</div><div class='ctx'> </div><div class='ctx'>             // Set the refferer, but not when requesting insecure content from a secure page</div><div class='ctx'>             QUrl documentUrl = QUrl(QString(document-&gt;documentURI()));</div><div class='head'>diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp<br/>index e584f97..dcae35f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp</a></div><div class='hunk'>@@ -306,7 +306,7 @@ public:</div><div class='ctx'>     }</div><div class='ctx'>     Q_INVOKABLE QObjectList myInvokableWithQObjectListArg(const QObjectList &amp;lst) {</div><div class='ctx'>         m_qtFunctionInvoked = 14;</div><div class='del'>-        m_actuals &lt;&lt; qVariantFromValue(lst);</div><div class='add'>+        m_actuals &lt;&lt; QVariant::fromValue(lst);</div><div class='ctx'>         return lst;</div><div class='ctx'>     }</div><div class='ctx'>     Q_INVOKABLE QVariant myInvokableWithVariantArg(const QVariant &amp;v) {</div><div class='hunk'>@@ -321,38 +321,38 @@ public:</div><div class='ctx'>     }</div><div class='ctx'>     Q_INVOKABLE QList&lt;int&gt; myInvokableWithListOfIntArg(const QList&lt;int&gt; &amp;lst) {</div><div class='ctx'>         m_qtFunctionInvoked = 17;</div><div class='del'>-        m_actuals &lt;&lt; qVariantFromValue(lst);</div><div class='add'>+        m_actuals &lt;&lt; QVariant::fromValue(lst);</div><div class='ctx'>         return lst;</div><div class='ctx'>     }</div><div class='ctx'>     Q_INVOKABLE QObject* myInvokableWithQObjectStarArg(QObject* obj) {</div><div class='ctx'>         m_qtFunctionInvoked = 18;</div><div class='del'>-        m_actuals &lt;&lt; qVariantFromValue(obj);</div><div class='add'>+        m_actuals &lt;&lt; QVariant::fromValue(obj);</div><div class='ctx'>         return obj;</div><div class='ctx'>     }</div><div class='ctx'>     Q_INVOKABLE QBrush myInvokableWithQBrushArg(const QBrush &amp;brush) {</div><div class='ctx'>         m_qtFunctionInvoked = 19;</div><div class='del'>-        m_actuals &lt;&lt; qVariantFromValue(brush);</div><div class='add'>+        m_actuals &lt;&lt; QVariant::fromValue(brush);</div><div class='ctx'>         return brush;</div><div class='ctx'>     }</div><div class='ctx'>     Q_INVOKABLE void myInvokableWithBrushStyleArg(Qt::BrushStyle style) {</div><div class='ctx'>         m_qtFunctionInvoked = 43;</div><div class='del'>-        m_actuals &lt;&lt; qVariantFromValue(style);</div><div class='add'>+        m_actuals &lt;&lt; QVariant::fromValue(style);</div><div class='ctx'>     }</div><div class='ctx'>     Q_INVOKABLE void myInvokableWithVoidStarArg(void* arg) {</div><div class='ctx'>         m_qtFunctionInvoked = 44;</div><div class='del'>-        m_actuals &lt;&lt; qVariantFromValue(arg);</div><div class='add'>+        m_actuals &lt;&lt; QVariant::fromValue(arg);</div><div class='ctx'>     }</div><div class='ctx'>     Q_INVOKABLE void myInvokableWithAmbiguousArg(int arg) {</div><div class='ctx'>         m_qtFunctionInvoked = 45;</div><div class='del'>-        m_actuals &lt;&lt; qVariantFromValue(arg);</div><div class='add'>+        m_actuals &lt;&lt; QVariant::fromValue(arg);</div><div class='ctx'>     }</div><div class='ctx'>     Q_INVOKABLE void myInvokableWithAmbiguousArg(uint arg) {</div><div class='ctx'>         m_qtFunctionInvoked = 46;</div><div class='del'>-        m_actuals &lt;&lt; qVariantFromValue(arg);</div><div class='add'>+        m_actuals &lt;&lt; QVariant::fromValue(arg);</div><div class='ctx'>     }</div><div class='ctx'>     Q_INVOKABLE void myInvokableWithDefaultArgs(int arg1, const QString &amp;arg2 = "") {</div><div class='ctx'>         m_qtFunctionInvoked = 47;</div><div class='del'>-        m_actuals &lt;&lt; qVariantFromValue(arg1) &lt;&lt; qVariantFromValue(arg2);</div><div class='add'>+        m_actuals &lt;&lt; QVariant::fromValue(arg1) &lt;&lt; qVariantFromValue(arg2);</div><div class='ctx'>     }</div><div class='ctx'>     Q_INVOKABLE QObject&amp; myInvokableReturningRef() {</div><div class='ctx'>         m_qtFunctionInvoked = 48;</div><div class='hunk'>@@ -364,11 +364,11 @@ public:</div><div class='ctx'>     }</div><div class='ctx'>     Q_INVOKABLE void myInvokableWithPointArg(const QPoint &amp;arg) {</div><div class='ctx'>         const_cast&lt;MyQObject*&gt;(this)-&gt;m_qtFunctionInvoked = 50;</div><div class='del'>-        m_actuals &lt;&lt; qVariantFromValue(arg);</div><div class='add'>+        m_actuals &lt;&lt; QVariant::fromValue(arg);</div><div class='ctx'>     }</div><div class='ctx'>     Q_INVOKABLE void myInvokableWithPointArg(const QPointF &amp;arg) {</div><div class='ctx'>         const_cast&lt;MyQObject*&gt;(this)-&gt;m_qtFunctionInvoked = 51;</div><div class='del'>-        m_actuals &lt;&lt; qVariantFromValue(arg);</div><div class='add'>+        m_actuals &lt;&lt; QVariant::fromValue(arg);</div><div class='ctx'>     }</div><div class='ctx'>     Q_INVOKABLE void myInvokableWithBoolArg(bool arg) {</div><div class='ctx'>         m_qtFunctionInvoked = 52;</div><div class='hunk'>@@ -416,7 +416,7 @@ public Q_SLOTS:</div><div class='ctx'>     }</div><div class='ctx'>     void myOverloadedSlot(QObject* arg) {</div><div class='ctx'>         m_qtFunctionInvoked = 41;</div><div class='del'>-        m_actuals &lt;&lt; qVariantFromValue(arg);</div><div class='add'>+        m_actuals &lt;&lt; QVariant::fromValue(arg);</div><div class='ctx'>     }</div><div class='ctx'>     void myOverloadedSlot(bool arg) {</div><div class='ctx'>         m_qtFunctionInvoked = 25;</div><div class='hunk'>@@ -818,7 +818,7 @@ void tst_QWebFrame::getSetStaticProperty()</div><div class='ctx'>     QCOMPARE(evalJS("myObject.variantProperty === 'bar'"), sTrue);</div><div class='ctx'>     m_myObject-&gt;setVariantProperty(42);</div><div class='ctx'>     QCOMPARE(evalJS("myObject.variantProperty === 42"), sTrue);</div><div class='del'>-    m_myObject-&gt;setVariantProperty(qVariantFromValue(QBrush()));</div><div class='add'>+    m_myObject-&gt;setVariantProperty(QVariant::fromValue(QBrush()));</div><div class='ctx'> //XFAIL</div><div class='ctx'> //  QCOMPARE(evalJS("typeof myObject.variantProperty"), sVariant);</div><div class='ctx'> </div><div class='hunk'>@@ -1240,7 +1240,7 @@ void tst_QWebFrame::callQtInvokable()</div><div class='ctx'>     /* XFAIL - variant support</div><div class='ctx'>     m_myObject-&gt;resetQtFunctionInvoked();</div><div class='ctx'>     {</div><div class='del'>-        m_myObject-&gt;setVariantProperty(qVariantFromValue(QBrush()));</div><div class='add'>+        m_myObject-&gt;setVariantProperty(QVariant::fromValue(QBrush()));</div><div class='ctx'>         QVariant ret = evalJS("myObject.myInvokableWithVariantArg(myObject.variantProperty)");</div><div class='ctx'>         QVERIFY(ret.isVariant());</div><div class='ctx'>         QCOMPARE(m_myObject-&gt;qtFunctionInvoked(), 15);</div><div class='head'>diff --git a/src/3rdparty/zlib.pri b/src/3rdparty/zlib.pri<br/>index bae3221..b8c4d44 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib.pri</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib.pri</a></div><div class='hunk'>@@ -5,7 +5,11 @@ SOURCES+= \</div><div class='ctx'>     $$PWD/zlib/compress.c \</div><div class='ctx'>     $$PWD/zlib/crc32.c \</div><div class='ctx'>     $$PWD/zlib/deflate.c \</div><div class='del'>-    $$PWD/zlib/gzio.c \</div><div class='add'>+    $$PWD/zlib/gzclose.c \</div><div class='add'>+    $$PWD/zlib/gzlib.c \</div><div class='add'>+    $$PWD/zlib/gzread.c \</div><div class='add'>+    $$PWD/zlib/gzwrite.c \</div><div class='add'>+    $$PWD/zlib/infback.c \</div><div class='ctx'>     $$PWD/zlib/inffast.c \</div><div class='ctx'>     $$PWD/zlib/inflate.c \</div><div class='ctx'>     $$PWD/zlib/inftrees.c \</div><div class='head'>diff --git a/src/3rdparty/zlib/CMakeLists.txt b/src/3rdparty/zlib/CMakeLists.txt<br/>new file mode 100644<br/>index 0000000..a64fe0b<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/CMakeLists.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/CMakeLists.txt</a></div><div class='hunk'>@@ -0,0 +1,190 @@</div><div class='add'>+cmake_minimum_required(VERSION 2.4.4)</div><div class='add'>+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)</div><div class='add'>+</div><div class='add'>+project(zlib C)</div><div class='add'>+</div><div class='add'>+if(NOT DEFINED BUILD_SHARED_LIBS)</div><div class='add'>+    option(BUILD_SHARED_LIBS "Build a shared library form of zlib" ON)</div><div class='add'>+endif()</div><div class='add'>+</div><div class='add'>+include(CheckTypeSize)</div><div class='add'>+include(CheckFunctionExists)</div><div class='add'>+include(CheckIncludeFile)</div><div class='add'>+include(CheckCSourceCompiles)</div><div class='add'>+enable_testing()</div><div class='add'>+</div><div class='add'>+check_include_file(sys/types.h HAVE_SYS_TYPES_H)</div><div class='add'>+check_include_file(stdint.h    HAVE_STDINT_H)</div><div class='add'>+check_include_file(stddef.h    HAVE_STDDEF_H)</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Check to see if we have large file support</div><div class='add'>+#</div><div class='add'>+set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)</div><div class='add'>+# We add these other definitions here because CheckTypeSize.cmake</div><div class='add'>+# in CMake 2.4.x does not automatically do so and we want</div><div class='add'>+# compatibility with CMake 2.4.x.</div><div class='add'>+if(HAVE_SYS_TYPES_H)</div><div class='add'>+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)</div><div class='add'>+endif()</div><div class='add'>+if(HAVE_STDINT_H)</div><div class='add'>+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)</div><div class='add'>+endif()</div><div class='add'>+if(HAVE_STDDEF_H)</div><div class='add'>+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)</div><div class='add'>+endif()</div><div class='add'>+check_type_size(off64_t OFF64_T)</div><div class='add'>+if(HAVE_OFF64_T)</div><div class='add'>+   add_definitions(-D_LARGEFILE64_SOURCE=1)</div><div class='add'>+endif()</div><div class='add'>+set(CMAKE_REQUIRED_DEFINITIONS) # clear variable</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Check for fseeko</div><div class='add'>+#</div><div class='add'>+check_function_exists(fseeko HAVE_FSEEKO)</div><div class='add'>+if(NOT HAVE_FSEEKO)</div><div class='add'>+    add_definitions(-DNO_FSEEKO)</div><div class='add'>+endif()</div><div class='add'>+</div><div class='add'>+#</div><div class='add'>+# Check for unistd.h</div><div class='add'>+#</div><div class='add'>+check_include_file(unistd.h Z_HAVE_UNISTD_H)</div><div class='add'>+</div><div class='add'>+if(MSVC)</div><div class='add'>+    set(CMAKE_DEBUG_POSTFIX "d")</div><div class='add'>+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)</div><div class='add'>+    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)</div><div class='add'>+endif()</div><div class='add'>+</div><div class='add'>+if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)</div><div class='add'>+    # If we're doing an out of source build and the user has a zconf.h</div><div class='add'>+    # in their source tree...</div><div class='add'>+    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)</div><div class='add'>+        message(FATAL_ERROR</div><div class='add'>+            "You must remove ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h "</div><div class='add'>+            "from the source tree.  This file is included with zlib "</div><div class='add'>+            "but CMake generates this file for you automatically "</div><div class='add'>+            "in the build directory.")</div><div class='add'>+  endif()</div><div class='add'>+endif()</div><div class='add'>+</div><div class='add'>+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein</div><div class='add'>+               ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)</div><div class='add'>+include_directories(${CMAKE_CURRENT_BINARY_DIR})</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#============================================================================</div><div class='add'>+# zlib</div><div class='add'>+#============================================================================</div><div class='add'>+</div><div class='add'>+set(ZLIB_PUBLIC_HDRS</div><div class='add'>+    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h</div><div class='add'>+    zlib.h</div><div class='add'>+)</div><div class='add'>+set(ZLIB_PRIVATE_HDRS</div><div class='add'>+    crc32.h</div><div class='add'>+    deflate.h</div><div class='add'>+    gzguts.h</div><div class='add'>+    inffast.h</div><div class='add'>+    inffixed.h</div><div class='add'>+    inflate.h</div><div class='add'>+    inftrees.h</div><div class='add'>+    trees.h</div><div class='add'>+    zutil.h</div><div class='add'>+)</div><div class='add'>+set(ZLIB_SRCS</div><div class='add'>+    adler32.c</div><div class='add'>+    compress.c</div><div class='add'>+    crc32.c</div><div class='add'>+    deflate.c</div><div class='add'>+    gzclose.c</div><div class='add'>+    gzlib.c</div><div class='add'>+    gzread.c</div><div class='add'>+    gzwrite.c</div><div class='add'>+    inflate.c</div><div class='add'>+    infback.c</div><div class='add'>+    inftrees.c</div><div class='add'>+    inffast.c</div><div class='add'>+    trees.c</div><div class='add'>+    uncompr.c</div><div class='add'>+    zutil.c</div><div class='add'>+    win32/zlib1.rc</div><div class='add'>+)</div><div class='add'>+</div><div class='add'>+# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION</div><div class='add'>+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)</div><div class='add'>+string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([0-9A-Za-z.]+)\".*"</div><div class='add'>+    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})</div><div class='add'>+</div><div class='add'>+if(MINGW)</div><div class='add'>+    # This gets us DLL resource information when compiling on MinGW.</div><div class='add'>+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj</div><div class='add'>+                       COMMAND windres.exe</div><div class='add'>+                            -D GCC_WINDRES</div><div class='add'>+                            -I ${CMAKE_CURRENT_SOURCE_DIR}</div><div class='add'>+                            -I ${CMAKE_CURRENT_BINARY_DIR}</div><div class='add'>+                            -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj</div><div class='add'>+                            -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)</div><div class='add'>+    set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)</div><div class='add'>+endif(MINGW)</div><div class='add'>+</div><div class='add'>+add_library(zlib ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})</div><div class='add'>+set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)</div><div class='add'>+</div><div class='add'>+set_target_properties(zlib PROPERTIES SOVERSION 1)</div><div class='add'>+</div><div class='add'>+if(NOT CYGWIN)</div><div class='add'>+    # This property causes shared libraries on Linux to have the full version</div><div class='add'>+    # encoded into their final filename.  We disable this on Cygwin because</div><div class='add'>+    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll</div><div class='add'>+    # seems to be the default.</div><div class='add'>+    #</div><div class='add'>+    # This has no effect with MSVC, on that platform the version info for</div><div class='add'>+    # the DLL comes from the resource file win32/zlib1.rc</div><div class='add'>+    set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})</div><div class='add'>+endif()</div><div class='add'>+</div><div class='add'>+if(UNIX)</div><div class='add'>+    # On unix-like platforms the library is almost always called libz</div><div class='add'>+   set_target_properties(zlib PROPERTIES OUTPUT_NAME z)</div><div class='add'>+elseif(BUILD_SHARED_LIBS AND WIN32)</div><div class='add'>+    # Creates zlib1.dll when building shared library version</div><div class='add'>+    set_target_properties(zlib PROPERTIES SUFFIX "1.dll")</div><div class='add'>+endif()</div><div class='add'>+</div><div class='add'>+if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )</div><div class='add'>+    install(TARGETS zlib</div><div class='add'>+        RUNTIME DESTINATION bin</div><div class='add'>+        ARCHIVE DESTINATION lib</div><div class='add'>+        LIBRARY DESTINATION lib )</div><div class='add'>+endif()</div><div class='add'>+if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )</div><div class='add'>+    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION include)</div><div class='add'>+endif()</div><div class='add'>+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )</div><div class='add'>+    install(FILES zlib.3 DESTINATION share/man/man3)</div><div class='add'>+endif()</div><div class='add'>+</div><div class='add'>+#============================================================================</div><div class='add'>+# Example binaries</div><div class='add'>+#============================================================================</div><div class='add'>+</div><div class='add'>+add_executable(example example.c)</div><div class='add'>+target_link_libraries(example zlib)</div><div class='add'>+add_test(example example)</div><div class='add'>+</div><div class='add'>+add_executable(minigzip minigzip.c)</div><div class='add'>+target_link_libraries(minigzip zlib)</div><div class='add'>+</div><div class='add'>+if(HAVE_OFF64_T)</div><div class='add'>+    add_executable(example64 example.c)</div><div class='add'>+    target_link_libraries(example64 zlib)</div><div class='add'>+    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")</div><div class='add'>+    add_test(example64 example64)</div><div class='add'>+</div><div class='add'>+    add_executable(minigzip64 minigzip.c)</div><div class='add'>+    target_link_libraries(minigzip64 zlib)</div><div class='add'>+    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")</div><div class='add'>+endif()</div><div class='head'>diff --git a/src/3rdparty/zlib/ChangeLog b/src/3rdparty/zlib/ChangeLog<br/>index 7f6869d..f310bb0 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/ChangeLog?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/ChangeLog</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/ChangeLog?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/ChangeLog</a></div><div class='hunk'>@@ -1,6 +1,359 @@</div><div class='ctx'> </div><div class='ctx'>                 ChangeLog file for zlib</div><div class='ctx'> </div><div class='add'>+Changes in 1.2.5 (19 Apr 2010)</div><div class='add'>+- Disable visibility attribute in win32/Makefile.gcc [Bar-Lev]</div><div class='add'>+- Default to libdir as sharedlibdir in configure [Nieder]</div><div class='add'>+- Update copyright dates on modified source files</div><div class='add'>+- Update trees.c to be able to generate modified trees.h</div><div class='add'>+- Exit configure for MinGW, suggesting win32/Makefile.gcc</div><div class='add'>+</div><div class='add'>+Changes in 1.2.4.5 (18 Apr 2010)</div><div class='add'>+- Set sharedlibdir in configure [Torok]</div><div class='add'>+- Set LDFLAGS in Makefile.in [Bar-Lev]</div><div class='add'>+- Avoid mkdir objs race condition in Makefile.in [Bowler]</div><div class='add'>+- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays</div><div class='add'>+- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C</div><div class='add'>+- Don't use hidden attribute when it is a warning generator (e.g. Solaris)</div><div class='add'>+</div><div class='add'>+Changes in 1.2.4.4 (18 Apr 2010)</div><div class='add'>+- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [Torok]</div><div class='add'>+- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty</div><div class='add'>+- Try to use bash or ksh regardless of functionality of /bin/sh</div><div class='add'>+- Fix configure incompatibility with NetBSD sh</div><div class='add'>+- Remove attempt to run under bash or ksh since have better NetBSD fix</div><div class='add'>+- Fix win32/Makefile.gcc for MinGW [Bar-Lev]</div><div class='add'>+- Add diagnostic messages when using CROSS_PREFIX in configure</div><div class='add'>+- Added --sharedlibdir option to configure [Weigelt]</div><div class='add'>+- Use hidden visibility attribute when available [Frysinger]</div><div class='add'>+</div><div class='add'>+Changes in 1.2.4.3 (10 Apr 2010)</div><div class='add'>+- Only use CROSS_PREFIX in configure for ar and ranlib if they exist</div><div class='add'>+- Use CROSS_PREFIX for nm [Bar-Lev]</div><div class='add'>+- Assume _LARGEFILE64_SOURCE defined is equivalent to true</div><div class='add'>+- Avoid use of undefined symbols in #if with &amp;&amp; and ||</div><div class='add'>+- Make *64 prototypes in gzguts.h consistent with functions</div><div class='add'>+- Add -shared load option for MinGW in configure [Bowler]</div><div class='add'>+- Move z_off64_t to public interface, use instead of off64_t</div><div class='add'>+- Remove ! from shell test in configure (not portable to Solaris)</div><div class='add'>+- Change +0 macro tests to -0 for possibly increased portability</div><div class='add'>+</div><div class='add'>+Changes in 1.2.4.2 (9 Apr 2010)</div><div class='add'>+- Add consistent carriage returns to readme.txt's in masmx86 and masmx64</div><div class='add'>+- Really provide prototypes for *64 functions when building without LFS</div><div class='add'>+- Only define unlink() in minigzip.c if unistd.h not included</div><div class='add'>+- Update README to point to contrib/vstudio project files</div><div class='add'>+- Move projects/vc6 to old/ and remove projects/</div><div class='add'>+- Include stdlib.h in minigzip.c for setmode() definition under WinCE</div><div class='add'>+- Clean up assembler builds in win32/Makefile.msc [Rowe]</div><div class='add'>+- Include sys/types.h for Microsoft for off_t definition</div><div class='add'>+- Fix memory leak on error in gz_open()</div><div class='add'>+- Symbolize nm as $NM in configure [Weigelt]</div><div class='add'>+- Use TEST_LDSHARED instead of LDSHARED to link test programs [Weigelt]</div><div class='add'>+- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined</div><div class='add'>+- Fix bug in gzeof() to take into account unused input data</div><div class='add'>+- Avoid initialization of structures with variables in puff.c</div><div class='add'>+- Updated win32/README-WIN32.txt [Rowe]</div><div class='add'>+</div><div class='add'>+Changes in 1.2.4.1 (28 Mar 2010)</div><div class='add'>+- Remove the use of [a-z] constructs for sed in configure [gentoo 310225]</div><div class='add'>+- Remove $(SHAREDLIB) from LIBS in Makefile.in [Creech]</div><div class='add'>+- Restore "for debugging" comment on sprintf() in gzlib.c</div><div class='add'>+- Remove fdopen for MVS from gzguts.h</div><div class='add'>+- Put new README-WIN32.txt in win32 [Rowe]</div><div class='add'>+- Add check for shell to configure and invoke another shell if needed</div><div class='add'>+- Fix big fat stinking bug in gzseek() on uncompressed files</div><div class='add'>+- Remove vestigial F_OPEN64 define in zutil.h</div><div class='add'>+- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE</div><div class='add'>+- Avoid errors on non-LFS systems when applications define LFS macros</div><div class='add'>+- Set EXE to ".exe" in configure for MINGW [Kahle]</div><div class='add'>+- Match crc32() in crc32.c exactly to the prototype in zlib.h [Sherrill]</div><div class='add'>+- Add prefix for cross-compilation in win32/makefile.gcc [Bar-Lev]</div><div class='add'>+- Add DLL install in win32/makefile.gcc [Bar-Lev]</div><div class='add'>+- Allow Linux* or linux* from uname in configure [Bar-Lev]</div><div class='add'>+- Allow ldconfig to be redefined in configure and Makefile.in [Bar-Lev]</div><div class='add'>+- Add cross-compilation prefixes to configure [Bar-Lev]</div><div class='add'>+- Match type exactly in gz_load() invocation in gzread.c</div><div class='add'>+- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func</div><div class='add'>+- Provide prototypes for *64 functions when building zlib without LFS</div><div class='add'>+- Don't use -lc when linking shared library on MinGW</div><div class='add'>+- Remove errno.h check in configure and vestigial errno code in zutil.h</div><div class='add'>+</div><div class='add'>+Changes in 1.2.4 (14 Mar 2010)</div><div class='add'>+- Fix VER3 extraction in configure for no fourth subversion</div><div class='add'>+- Update zlib.3, add docs to Makefile.in to make .pdf out of it</div><div class='add'>+- Add zlib.3.pdf to distribution</div><div class='add'>+- Don't set error code in gzerror() if passed pointer is NULL</div><div class='add'>+- Apply destination directory fixes to CMakeLists.txt [Lowman]</div><div class='add'>+- Move #cmakedefine's to a new zconf.in.cmakein</div><div class='add'>+- Restore zconf.h for builds that don't use configure or cmake</div><div class='add'>+- Add distclean to dummy Makefile for convenience</div><div class='add'>+- Update and improve INDEX, README, and FAQ</div><div class='add'>+- Update CMakeLists.txt for the return of zconf.h [Lowman]</div><div class='add'>+- Update contrib/vstudio/vc9 and vc10 [Vollant]</div><div class='add'>+- Change libz.dll.a back to libzdll.a in win32/Makefile.gcc</div><div class='add'>+- Apply license and readme changes to contrib/asm686 [Raiter]</div><div class='add'>+- Check file name lengths and add -c option in minigzip.c [Li]</div><div class='add'>+- Update contrib/amd64 and contrib/masmx86/ [Vollant]</div><div class='add'>+- Avoid use of "eof" parameter in trees.c to not shadow library variable</div><div class='add'>+- Update make_vms.com for removal of zlibdefs.h [Zinser]</div><div class='add'>+- Update assembler code and vstudio projects in contrib [Vollant]</div><div class='add'>+- Remove outdated assembler code contrib/masm686 and contrib/asm586</div><div class='add'>+- Remove old vc7 and vc8 from contrib/vstudio</div><div class='add'>+- Update win32/Makefile.msc, add ZLIB_VER_SUBREVISION [Rowe]</div><div class='add'>+- Fix memory leaks in gzclose_r() and gzclose_w(), file leak in gz_open()</div><div class='add'>+- Add contrib/gcc_gvmat64 for longest_match and inflate_fast [Vollant]</div><div class='add'>+- Remove *64 functions from win32/zlib.def (they're not 64-bit yet)</div><div class='add'>+- Fix bug in void-returning vsprintf() case in gzwrite.c</div><div class='add'>+- Fix name change from inflate.h in contrib/inflate86/inffas86.c</div><div class='add'>+- Check if temporary file exists before removing in make_vms.com [Zinser]</div><div class='add'>+- Fix make install and uninstall for --static option</div><div class='add'>+- Fix usage of _MSC_VER in gzguts.h and zutil.h [Truta]</div><div class='add'>+- Update readme.txt in contrib/masmx64 and masmx86 to assemble</div><div class='add'>+</div><div class='add'>+Changes in 1.2.3.9 (21 Feb 2010)</div><div class='add'>+- Expunge gzio.c</div><div class='add'>+- Move as400 build information to old</div><div class='add'>+- Fix updates in contrib/minizip and contrib/vstudio</div><div class='add'>+- Add const to vsnprintf test in configure to avoid warnings [Weigelt]</div><div class='add'>+- Delete zconf.h (made by configure) [Weigelt]</div><div class='add'>+- Change zconf.in.h to zconf.h.in per convention [Weigelt]</div><div class='add'>+- Check for NULL buf in gzgets()</div><div class='add'>+- Return empty string for gzgets() with len == 1 (like fgets())</div><div class='add'>+- Fix description of gzgets() in zlib.h for end-of-file, NULL return</div><div class='add'>+- Update minizip to 1.1 [Vollant]</div><div class='add'>+- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c</div><div class='add'>+- Note in zlib.h that gzerror() should be used to distinguish from EOF</div><div class='add'>+- Remove use of snprintf() from gzlib.c</div><div class='add'>+- Fix bug in gzseek()</div><div class='add'>+- Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant]</div><div class='add'>+- Fix zconf.h generation in CMakeLists.txt [Lowman]</div><div class='add'>+- Improve comments in zconf.h where modified by configure</div><div class='add'>+</div><div class='add'>+Changes in 1.2.3.8 (13 Feb 2010)</div><div class='add'>+- Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer]</div><div class='add'>+- Use z_off64_t in gz_zero() and gz_skip() to match state-&gt;skip</div><div class='add'>+- Avoid comparison problem when sizeof(int) == sizeof(z_off64_t)</div><div class='add'>+- Revert to Makefile.in from 1.2.3.6 (live with the clutter)</div><div class='add'>+- Fix missing error return in gzflush(), add zlib.h note</div><div class='add'>+- Add *64 functions to zlib.map [Levin]</div><div class='add'>+- Fix signed/unsigned comparison in gz_comp()</div><div class='add'>+- Use SFLAGS when testing shared linking in configure</div><div class='add'>+- Add --64 option to ./configure to use -m64 with gcc</div><div class='add'>+- Fix ./configure --help to correctly name options</div><div class='add'>+- Have make fail if a test fails [Levin]</div><div class='add'>+- Avoid buffer overrun in contrib/masmx64/gvmat64.asm [Simpson]</div><div class='add'>+- Remove assembler object files from contrib</div><div class='add'>+</div><div class='add'>+Changes in 1.2.3.7 (24 Jan 2010)</div><div class='add'>+- Always gzopen() with O_LARGEFILE if available</div><div class='add'>+- Fix gzdirect() to work immediately after gzopen() or gzdopen()</div><div class='add'>+- Make gzdirect() more precise when the state changes while reading</div><div class='add'>+- Improve zlib.h documentation in many places</div><div class='add'>+- Catch memory allocation failure in gz_open()</div><div class='add'>+- Complete close operation if seek forward in gzclose_w() fails</div><div class='add'>+- Return Z_ERRNO from gzclose_r() if close() fails</div><div class='add'>+- Return Z_STREAM_ERROR instead of EOF for gzclose() being passed NULL</div><div class='add'>+- Return zero for gzwrite() errors to match zlib.h description</div><div class='add'>+- Return -1 on gzputs() error to match zlib.h description</div><div class='add'>+- Add zconf.in.h to allow recovery from configure modification [Weigelt]</div><div class='add'>+- Fix static library permissions in Makefile.in [Weigelt]</div><div class='add'>+- Avoid warnings in configure tests that hide functionality [Weigelt]</div><div class='add'>+- Add *BSD and DragonFly to Linux case in configure [gentoo 123571]</div><div class='add'>+- Change libzdll.a to libz.dll.a in win32/Makefile.gcc [gentoo 288212]</div><div class='add'>+- Avoid access of uninitialized data for first inflateReset2 call [Gomes]</div><div class='add'>+- Keep object files in subdirectories to reduce the clutter somewhat</div><div class='add'>+- Remove default Makefile and zlibdefs.h, add dummy Makefile</div><div class='add'>+- Add new external functions to Z_PREFIX, remove duplicates, z_z_ -&gt; z_</div><div class='add'>+- Remove zlibdefs.h completely -- modify zconf.h instead</div><div class='add'>+</div><div class='add'>+Changes in 1.2.3.6 (17 Jan 2010)</div><div class='add'>+- Avoid void * arithmetic in gzread.c and gzwrite.c</div><div class='add'>+- Make compilers happier with const char * for gz_error message</div><div class='add'>+- Avoid unused parameter warning in inflate.c</div><div class='add'>+- Avoid signed-unsigned comparison warning in inflate.c</div><div class='add'>+- Indent #pragma's for traditional C</div><div class='add'>+- Fix usage of strwinerror() in glib.c, change to gz_strwinerror()</div><div class='add'>+- Correct email address in configure for system options</div><div class='add'>+- Update make_vms.com and add make_vms.com to contrib/minizip [Zinser]</div><div class='add'>+- Update zlib.map [Brown]</div><div class='add'>+- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Torok]</div><div class='add'>+- Apply various fixes to CMakeLists.txt [Lowman]</div><div class='add'>+- Add checks on len in gzread() and gzwrite()</div><div class='add'>+- Add error message for no more room for gzungetc()</div><div class='add'>+- Remove zlib version check in gzwrite()</div><div class='add'>+- Defer compression of gzprintf() result until need to</div><div class='add'>+- Use snprintf() in gzdopen() if available</div><div class='add'>+- Remove USE_MMAP configuration determination (only used by minigzip)</div><div class='add'>+- Remove examples/pigz.c (available separately)</div><div class='add'>+- Update examples/gun.c to 1.6</div><div class='add'>+</div><div class='add'>+Changes in 1.2.3.5 (8 Jan 2010)</div><div class='add'>+- Add space after #if in zutil.h for some compilers</div><div class='add'>+- Fix relatively harmless bug in deflate_fast() [Exarevsky]</div><div class='add'>+- Fix same problem in deflate_slow()</div><div class='add'>+- Add $(SHAREDLIBV) to LIBS in Makefile.in [Brown]</div><div class='add'>+- Add deflate_rle() for faster Z_RLE strategy run-length encoding</div><div class='add'>+- Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding</div><div class='add'>+- Change name of "write" variable in inffast.c to avoid library collisions</div><div class='add'>+- Fix premature EOF from gzread() in gzio.c [Brown]</div><div class='add'>+- Use zlib header window size if windowBits is 0 in inflateInit2()</div><div class='add'>+- Remove compressBound() call in deflate.c to avoid linking compress.o</div><div class='add'>+- Replace use of errno in gz* with functions, support WinCE [Alves]</div><div class='add'>+- Provide alternative to perror() in minigzip.c for WinCE [Alves]</div><div class='add'>+- Don't use _vsnprintf on later versions of MSVC [Lowman]</div><div class='add'>+- Add CMake build script and input file [Lowman]</div><div class='add'>+- Update contrib/minizip to 1.1 [Svensson, Vollant]</div><div class='add'>+- Moved nintendods directory from contrib to .</div><div class='add'>+- Replace gzio.c with a new set of routines with the same functionality</div><div class='add'>+- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above</div><div class='add'>+- Update contrib/minizip to 1.1b</div><div class='add'>+- Change gzeof() to return 0 on error instead of -1 to agree with zlib.h</div><div class='add'>+</div><div class='add'>+Changes in 1.2.3.4 (21 Dec 2009)</div><div class='add'>+- Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility</div><div class='add'>+- Update comments in configure and Makefile.in for default --shared</div><div class='add'>+- Fix test -z's in configure [Marquess]</div><div class='add'>+- Build examplesh and minigzipsh when not testing</div><div class='add'>+- Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h</div><div class='add'>+- Import LDFLAGS from the environment in configure</div><div class='add'>+- Fix configure to populate SFLAGS with discovered CFLAGS options</div><div class='add'>+- Adapt make_vms.com to the new Makefile.in [Zinser]</div><div class='add'>+- Add zlib2ansi script for C++ compilation [Marquess]</div><div class='add'>+- Add _FILE_OFFSET_BITS=64 test to make test (when applicable)</div><div class='add'>+- Add AMD64 assembler code for longest match to contrib [Teterin]</div><div class='add'>+- Include options from $SFLAGS when doing $LDSHARED</div><div class='add'>+- Simplify 64-bit file support by introducing z_off64_t type</div><div class='add'>+- Make shared object files in objs directory to work around old Sun cc</div><div class='add'>+- Use only three-part version number for Darwin shared compiles</div><div class='add'>+- Add rc option to ar in Makefile.in for when ./configure not run</div><div class='add'>+- Add -WI,-rpath,. to LDFLAGS for OSF 1 V4*</div><div class='add'>+- Set LD_LIBRARYN32_PATH for SGI IRIX shared compile</div><div class='add'>+- Protect against _FILE_OFFSET_BITS being defined when compiling zlib</div><div class='add'>+- Rename Makefile.in targets allstatic to static and allshared to shared</div><div class='add'>+- Fix static and shared Makefile.in targets to be independent</div><div class='add'>+- Correct error return bug in gz_open() by setting state [Brown]</div><div class='add'>+- Put spaces before ;;'s in configure for better sh compatibility</div><div class='add'>+- Add pigz.c (parallel implementation of gzip) to examples/</div><div class='add'>+- Correct constant in crc32.c to UL [Leventhal]</div><div class='add'>+- Reject negative lengths in crc32_combine()</div><div class='add'>+- Add inflateReset2() function to work like inflateEnd()/inflateInit2()</div><div class='add'>+- Include sys/types.h for _LARGEFILE64_SOURCE [Brown]</div><div class='add'>+- Correct typo in doc/algorithm.txt [Janik]</div><div class='add'>+- Fix bug in adler32_combine() [Zhu]</div><div class='add'>+- Catch missing-end-of-block-code error in all inflates and in puff</div><div class='add'>+    Assures that random input to inflate eventually results in an error</div><div class='add'>+- Added enough.c (calculation of ENOUGH for inftrees.h) to examples/</div><div class='add'>+- Update ENOUGH and its usage to reflect discovered bounds</div><div class='add'>+- Fix gzerror() error report on empty input file [Brown]</div><div class='add'>+- Add ush casts in trees.c to avoid pedantic runtime errors</div><div class='add'>+- Fix typo in zlib.h uncompress() description [Reiss]</div><div class='add'>+- Correct inflate() comments with regard to automatic header detection</div><div class='add'>+- Remove deprecation comment on Z_PARTIAL_FLUSH (it stays)</div><div class='add'>+- Put new version of gzlog (2.0) in examples with interruption recovery</div><div class='add'>+- Add puff compile option to permit invalid distance-too-far streams</div><div class='add'>+- Add puff TEST command options, ability to read piped input</div><div class='add'>+- Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but</div><div class='add'>+  _LARGEFILE64_SOURCE not defined</div><div class='add'>+- Fix Z_FULL_FLUSH to truly erase the past by resetting s-&gt;strstart</div><div class='add'>+- Fix deflateSetDictionary() to use all 32K for output consistency</div><div class='add'>+- Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h)</div><div class='add'>+- Clear bytes after deflate lookahead to avoid use of uninitialized data</div><div class='add'>+- Change a limit in inftrees.c to be more transparent to Coverity Prevent</div><div class='add'>+- Update win32/zlib.def with exported symbols from zlib.h</div><div class='add'>+- Correct spelling error in zlib.h [Willem]</div><div class='add'>+- Allow Z_BLOCK for deflate() to force a new block</div><div class='add'>+- Allow negative bits in inflatePrime() to delete existing bit buffer</div><div class='add'>+- Add Z_TREES flush option to inflate() to return at end of trees</div><div class='add'>+- Add inflateMark() to return current state information for random access</div><div class='add'>+- Add Makefile for NintendoDS to contrib [Costa]</div><div class='add'>+- Add -w in configure compile tests to avoid spurious warnings [Beucler]</div><div class='add'>+- Fix typos in zlib.h comments for deflateSetDictionary()</div><div class='add'>+- Fix EOF detection in transparent gzread() [Maier]</div><div class='add'>+</div><div class='add'>+Changes in 1.2.3.3 (2 October 2006)</div><div class='add'>+- Make --shared the default for configure, add a --static option</div><div class='add'>+- Add compile option to permit invalid distance-too-far streams</div><div class='add'>+- Add inflateUndermine() function which is required to enable above</div><div class='add'>+- Remove use of "this" variable name for C++ compatibility [Marquess]</div><div class='add'>+- Add testing of shared library in make test, if shared library built</div><div class='add'>+- Use ftello() and fseeko() if available instead of ftell() and fseek()</div><div class='add'>+- Provide two versions of all functions that use the z_off_t type for</div><div class='add'>+  binary compatibility -- a normal version and a 64-bit offset version,</div><div class='add'>+  per the Large File Support Extension when _LARGEFILE64_SOURCE is</div><div class='add'>+  defined; use the 64-bit versions by default when _FILE_OFFSET_BITS</div><div class='add'>+  is defined to be 64</div><div class='add'>+- Add a --uname= option to configure to perhaps help with cross-compiling</div><div class='add'>+</div><div class='add'>+Changes in 1.2.3.2 (3 September 2006)</div><div class='add'>+- Turn off silly Borland warnings [Hay]</div><div class='add'>+- Use off64_t and define _LARGEFILE64_SOURCE when present</div><div class='add'>+- Fix missing dependency on inffixed.h in Makefile.in</div><div class='add'>+- Rig configure --shared to build both shared and static [Teredesai, Truta]</div><div class='add'>+- Remove zconf.in.h and instead create a new zlibdefs.h file</div><div class='add'>+- Fix contrib/minizip/unzip.c non-encrypted after encrypted [Vollant]</div><div class='add'>+- Add treebuild.xml (see http://treebuild.metux.de/) [Weigelt]</div><div class='add'>+</div><div class='add'>+Changes in 1.2.3.1 (16 August 2006)</div><div class='add'>+- Add watcom directory with OpenWatcom make files [Daniel]</div><div class='add'>+- Remove #undef of FAR in zconf.in.h for MVS [Fedtke]</div><div class='add'>+- Update make_vms.com [Zinser]</div><div class='add'>+- Use -fPIC for shared build in configure [Teredesai, Nicholson]</div><div class='add'>+- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]</div><div class='add'>+- Use fdopen() (not _fdopen()) for Interix in zutil.h [BŠck]</div><div class='add'>+- Add some FAQ entries about the contrib directory</div><div class='add'>+- Update the MVS question in the FAQ</div><div class='add'>+- Avoid extraneous reads after EOF in gzio.c [Brown]</div><div class='add'>+- Correct spelling of "successfully" in gzio.c [Randers-Pehrson]</div><div class='add'>+- Add comments to zlib.h about gzerror() usage [Brown]</div><div class='add'>+- Set extra flags in gzip header in gzopen() like deflate() does</div><div class='add'>+- Make configure options more compatible with double-dash conventions</div><div class='add'>+  [Weigelt]</div><div class='add'>+- Clean up compilation under Solaris SunStudio cc [Rowe, Reinholdtsen]</div><div class='add'>+- Fix uninstall target in Makefile.in [Truta]</div><div class='add'>+- Add pkgconfig support [Weigelt]</div><div class='add'>+- Use $(DESTDIR) macro in Makefile.in [Reinholdtsen, Weigelt]</div><div class='add'>+- Replace set_data_type() with a more accurate detect_data_type() in</div><div class='add'>+  trees.c, according to the txtvsbin.txt document [Truta]</div><div class='add'>+- Swap the order of #include &lt;stdio.h&gt; and #include "zlib.h" in</div><div class='add'>+  gzio.c, example.c and minigzip.c [Truta]</div><div class='add'>+- Shut up annoying VS2005 warnings about standard C deprecation [Rowe,</div><div class='add'>+  Truta] (where?)</div><div class='add'>+- Fix target "clean" from win32/Makefile.bor [Truta]</div><div class='add'>+- Create .pdb and .manifest files in win32/makefile.msc [Ziegler, Rowe]</div><div class='add'>+- Update zlib www home address in win32/DLL_FAQ.txt [Truta]</div><div class='add'>+- Update contrib/masmx86/inffas32.asm for VS2005 [Vollant, Van Wassenhove]</div><div class='add'>+- Enable browse info in the "Debug" and "ASM Debug" configurations in</div><div class='add'>+  the Visual C++ 6 project, and set (non-ASM) "Debug" as default [Truta]</div><div class='add'>+- Add pkgconfig support [Weigelt]</div><div class='add'>+- Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h,</div><div class='add'>+  for use in win32/zlib1.rc [Polushin, Rowe, Truta]</div><div class='add'>+- Add a document that explains the new text detection scheme to</div><div class='add'>+  doc/txtvsbin.txt [Truta]</div><div class='add'>+- Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ [Truta]</div><div class='add'>+- Move algorithm.txt into doc/ [Truta]</div><div class='add'>+- Synchronize FAQ with website</div><div class='add'>+- Fix compressBound(), was low for some pathological cases [Fearnley]</div><div class='add'>+- Take into account wrapper variations in deflateBound()</div><div class='add'>+- Set examples/zpipe.c input and output to binary mode for Windows</div><div class='add'>+- Update examples/zlib_how.html with new zpipe.c (also web site)</div><div class='add'>+- Fix some warnings in examples/gzlog.c and examples/zran.c (it seems</div><div class='add'>+  that gcc became pickier in 4.0)</div><div class='add'>+- Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain</div><div class='add'>+  un-versioned, the patch adds versioning only for symbols introduced in</div><div class='add'>+  zlib-1.2.0 or later.  It also declares as local those symbols which are</div><div class='add'>+  not designed to be exported." [Levin]</div><div class='add'>+- Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure</div><div class='add'>+- Do not initialize global static by default in trees.c, add a response</div><div class='add'>+  NO_INIT_GLOBAL_POINTERS to initialize them if needed [Marquess]</div><div class='add'>+- Don't use strerror() in gzio.c under WinCE [Yakimov]</div><div class='add'>+- Don't use errno.h in zutil.h under WinCE [Yakimov]</div><div class='add'>+- Move arguments for AR to its usage to allow replacing ar [Marot]</div><div class='add'>+- Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla [Randers-Pehrson]</div><div class='add'>+- Improve inflateInit() and inflateInit2() documentation</div><div class='add'>+- Fix structure size comment in inflate.h</div><div class='add'>+- Change configure help option from --h* to --help [Santos]</div><div class='add'>+</div><div class='ctx'> Changes in 1.2.3 (18 July 2005)</div><div class='ctx'> - Apply security vulnerability fixes to contrib/infback9 as well</div><div class='ctx'> - Clean up some text files (carriage returns, trailing space)</div><div class='hunk'>@@ -13,7 +366,7 @@ Changes in 1.2.2.4 (11 July 2005)</div><div class='ctx'>   compile</div><div class='ctx'> - Fix some spelling errors in comments [Betts]</div><div class='ctx'> - Correct inflateInit2() error return documentation in zlib.h</div><div class='del'>-- Added zran.c example of compressed data random access to examples</div><div class='add'>+- Add zran.c example of compressed data random access to examples</div><div class='ctx'>   directory, shows use of inflatePrime()</div><div class='ctx'> - Fix cast for assignments to strm-&gt;state in inflate.c and infback.c</div><div class='ctx'> - Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]</div><div class='head'>diff --git a/src/3rdparty/zlib/FAQ b/src/3rdparty/zlib/FAQ<br/>index 441d910..1a22750 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/FAQ?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/FAQ</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/FAQ?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/FAQ</a></div><div class='hunk'>@@ -3,8 +3,8 @@</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> If your question is not there, please check the zlib home page</div><div class='del'>-http://www.zlib.org which may have more recent information.</div><div class='del'>-The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html</div><div class='add'>+http://zlib.net/ which may have more recent information.</div><div class='add'>+The lastest zlib FAQ is at http://zlib.net/zlib_faq.html</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>  1. Is zlib Y2K-compliant?</div><div class='hunk'>@@ -13,54 +13,51 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html</div><div class='ctx'> </div><div class='ctx'>  2. Where can I get a Windows DLL version?</div><div class='ctx'> </div><div class='del'>-    The zlib sources can be compiled without change to produce a DLL.</div><div class='del'>-    See the file win32/DLL_FAQ.txt in the zlib distribution.</div><div class='del'>-    Pointers to the precompiled DLL are found in the zlib web site at</div><div class='del'>-    http://www.zlib.org.</div><div class='add'>+    The zlib sources can be compiled without change to produce a DLL.  See the</div><div class='add'>+    file win32/DLL_FAQ.txt in the zlib distribution.  Pointers to the</div><div class='add'>+    precompiled DLL are found in the zlib web site at http://zlib.net/ .</div><div class='ctx'> </div><div class='ctx'>  3. Where can I get a Visual Basic interface to zlib?</div><div class='ctx'> </div><div class='ctx'>     See</div><div class='del'>-        * http://www.dogma.net/markn/articles/zlibtool/zlibtool.htm</div><div class='del'>-        * contrib/visual-basic.txt in the zlib distribution</div><div class='add'>+        * http://marknelson.us/1997/01/01/zlib-engine/</div><div class='ctx'>         * win32/DLL_FAQ.txt in the zlib distribution</div><div class='ctx'> </div><div class='ctx'>  4. compress() returns Z_BUF_ERROR.</div><div class='ctx'> </div><div class='del'>-    Make sure that before the call of compress, the length of the compressed</div><div class='del'>-    buffer is equal to the total size of the compressed buffer and not</div><div class='del'>-    zero. For Visual Basic, check that this parameter is passed by reference</div><div class='add'>+    Make sure that before the call of compress(), the length of the compressed</div><div class='add'>+    buffer is equal to the available size of the compressed buffer and not</div><div class='add'>+    zero.  For Visual Basic, check that this parameter is passed by reference</div><div class='ctx'>     ("as any"), not by value ("as long").</div><div class='ctx'> </div><div class='ctx'>  5. deflate() or inflate() returns Z_BUF_ERROR.</div><div class='ctx'> </div><div class='del'>-    Before making the call, make sure that avail_in and avail_out are not</div><div class='del'>-    zero. When setting the parameter flush equal to Z_FINISH, also make sure</div><div class='del'>-    that avail_out is big enough to allow processing all pending input.</div><div class='del'>-    Note that a Z_BUF_ERROR is not fatal--another call to deflate() or</div><div class='del'>-    inflate() can be made with more input or output space. A Z_BUF_ERROR</div><div class='del'>-    may in fact be unavoidable depending on how the functions are used, since</div><div class='del'>-    it is not possible to tell whether or not there is more output pending</div><div class='del'>-    when strm.avail_out returns with zero.</div><div class='add'>+    Before making the call, make sure that avail_in and avail_out are not zero.</div><div class='add'>+    When setting the parameter flush equal to Z_FINISH, also make sure that</div><div class='add'>+    avail_out is big enough to allow processing all pending input.  Note that a</div><div class='add'>+    Z_BUF_ERROR is not fatal--another call to deflate() or inflate() can be</div><div class='add'>+    made with more input or output space.  A Z_BUF_ERROR may in fact be</div><div class='add'>+    unavoidable depending on how the functions are used, since it is not</div><div class='add'>+    possible to tell whether or not there is more output pending when</div><div class='add'>+    strm.avail_out returns with zero.  See http://zlib.net/zlib_how.html for a</div><div class='add'>+    heavily annotated example.</div><div class='ctx'> </div><div class='ctx'>  6. Where's the zlib documentation (man pages, etc.)?</div><div class='ctx'> </div><div class='del'>-    It's in zlib.h for the moment, and Francis S. Lin has converted it to a</div><div class='del'>-    web page zlib.html. Volunteers to transform this to Unix-style man pages,</div><div class='del'>-    please contact us (zlib@gzip.org). Examples of zlib usage are in the files</div><div class='del'>-    example.c and minigzip.c.</div><div class='add'>+    It's in zlib.h .  Examples of zlib usage are in the files example.c and</div><div class='add'>+    minigzip.c, with more in examples/ .</div><div class='ctx'> </div><div class='ctx'>  7. Why don't you use GNU autoconf or libtool or ...?</div><div class='ctx'> </div><div class='del'>-    Because we would like to keep zlib as a very small and simple</div><div class='del'>-    package. zlib is rather portable and doesn't need much configuration.</div><div class='add'>+    Because we would like to keep zlib as a very small and simple package.</div><div class='add'>+    zlib is rather portable and doesn't need much configuration.</div><div class='ctx'> </div><div class='ctx'>  8. I found a bug in zlib.</div><div class='ctx'> </div><div class='del'>-    Most of the time, such problems are due to an incorrect usage of</div><div class='del'>-    zlib. Please try to reproduce the problem with a small program and send</div><div class='del'>-    the corresponding source to us at zlib@gzip.org . Do not send</div><div class='del'>-    multi-megabyte data files without prior agreement.</div><div class='add'>+    Most of the time, such problems are due to an incorrect usage of zlib.</div><div class='add'>+    Please try to reproduce the problem with a small program and send the</div><div class='add'>+    corresponding source to us at zlib@gzip.org .  Do not send multi-megabyte</div><div class='add'>+    data files without prior agreement.</div><div class='ctx'> </div><div class='ctx'>  9. Why do I get "undefined reference to gzputc"?</div><div class='ctx'> </div><div class='hunk'>@@ -82,7 +79,7 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html</div><div class='ctx'> </div><div class='ctx'> 12. Can zlib handle .Z files?</div><div class='ctx'> </div><div class='del'>-    No, sorry. You have to spawn an uncompress or gunzip subprocess, or adapt</div><div class='add'>+    No, sorry.  You have to spawn an uncompress or gunzip subprocess, or adapt</div><div class='ctx'>     the code of uncompress on your own.</div><div class='ctx'> </div><div class='ctx'> 13. How can I make a Unix shared library?</div><div class='hunk'>@@ -99,8 +96,10 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html</div><div class='ctx'> </div><div class='ctx'>     However, many flavors of Unix come with a shared zlib already installed.</div><div class='ctx'>     Before going to the trouble of compiling a shared version of zlib and</div><div class='del'>-    trying to install it, you may want to check if it's already there! If you</div><div class='del'>-    can #include &lt;zlib.h&gt;, it's there. The -lz option will probably link to it.</div><div class='add'>+    trying to install it, you may want to check if it's already there!  If you</div><div class='add'>+    can #include &lt;zlib.h&gt;, it's there.  The -lz option will probably link to</div><div class='add'>+    it.  You can check the version at the top of zlib.h or with the</div><div class='add'>+    ZLIB_VERSION symbol defined in zlib.h .</div><div class='ctx'> </div><div class='ctx'> 15. I have a question about OttoPDF.</div><div class='ctx'> </div><div class='hunk'>@@ -109,8 +108,8 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html</div><div class='ctx'> </div><div class='ctx'> 16. Can zlib decode Flate data in an Adobe PDF file?</div><div class='ctx'> </div><div class='del'>-    Yes. See http://www.fastio.com/ (ClibPDF), or http://www.pdflib.com/ .</div><div class='del'>-    To modify PDF forms, see http://sourceforge.net/projects/acroformtool/ .</div><div class='add'>+    Yes. See http://www.pdflib.com/ . To modify PDF forms, see</div><div class='add'>+    http://sourceforge.net/projects/acroformtool/ .</div><div class='ctx'> </div><div class='ctx'> 17. Why am I getting this "register_frame_info not found" error on Solaris?</div><div class='ctx'> </div><div class='hunk'>@@ -121,67 +120,67 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html</div><div class='ctx'>         symbol __register_frame_info: referenced symbol not found</div><div class='ctx'> </div><div class='ctx'>     The symbol __register_frame_info is not part of zlib, it is generated by</div><div class='del'>-    the C compiler (cc or gcc). You must recompile applications using zlib</div><div class='del'>-    which have this problem. This problem is specific to Solaris. See</div><div class='add'>+    the C compiler (cc or gcc).  You must recompile applications using zlib</div><div class='add'>+    which have this problem.  This problem is specific to Solaris.  See</div><div class='ctx'>     http://www.sunfreeware.com for Solaris versions of zlib and applications</div><div class='ctx'>     using zlib.</div><div class='ctx'> </div><div class='ctx'> 18. Why does gzip give an error on a file I make with compress/deflate?</div><div class='ctx'> </div><div class='ctx'>     The compress and deflate functions produce data in the zlib format, which</div><div class='del'>-    is different and incompatible with the gzip format. The gz* functions in</div><div class='del'>-    zlib on the other hand use the gzip format. Both the zlib and gzip</div><div class='del'>-    formats use the same compressed data format internally, but have different</div><div class='del'>-    headers and trailers around the compressed data.</div><div class='add'>+    is different and incompatible with the gzip format.  The gz* functions in</div><div class='add'>+    zlib on the other hand use the gzip format.  Both the zlib and gzip formats</div><div class='add'>+    use the same compressed data format internally, but have different headers</div><div class='add'>+    and trailers around the compressed data.</div><div class='ctx'> </div><div class='ctx'> 19. Ok, so why are there two different formats?</div><div class='ctx'> </div><div class='del'>-    The gzip format was designed to retain the directory information about</div><div class='del'>-    a single file, such as the name and last modification date. The zlib</div><div class='del'>-    format on the other hand was designed for in-memory and communication</div><div class='del'>-    channel applications, and has a much more compact header and trailer and</div><div class='del'>-    uses a faster integrity check than gzip.</div><div class='add'>+    The gzip format was designed to retain the directory information about a</div><div class='add'>+    single file, such as the name and last modification date.  The zlib format</div><div class='add'>+    on the other hand was designed for in-memory and communication channel</div><div class='add'>+    applications, and has a much more compact header and trailer and uses a</div><div class='add'>+    faster integrity check than gzip.</div><div class='ctx'> </div><div class='ctx'> 20. Well that's nice, but how do I make a gzip file in memory?</div><div class='ctx'> </div><div class='ctx'>     You can request that deflate write the gzip format instead of the zlib</div><div class='del'>-    format using deflateInit2(). You can also request that inflate decode</div><div class='del'>-    the gzip format using inflateInit2(). Read zlib.h for more details.</div><div class='add'>+    format using deflateInit2().  You can also request that inflate decode the</div><div class='add'>+    gzip format using inflateInit2().  Read zlib.h for more details.</div><div class='ctx'> </div><div class='ctx'> 21. Is zlib thread-safe?</div><div class='ctx'> </div><div class='del'>-    Yes. However any library routines that zlib uses and any application-</div><div class='del'>-    provided memory allocation routines must also be thread-safe. zlib's gz*</div><div class='add'>+    Yes.  However any library routines that zlib uses and any application-</div><div class='add'>+    provided memory allocation routines must also be thread-safe.  zlib's gz*</div><div class='ctx'>     functions use stdio library routines, and most of zlib's functions use the</div><div class='del'>-    library memory allocation routines by default. zlib's Init functions allow</div><div class='del'>-    for the application to provide custom memory allocation routines.</div><div class='add'>+    library memory allocation routines by default.  zlib's *Init* functions</div><div class='add'>+    allow for the application to provide custom memory allocation routines.</div><div class='ctx'> </div><div class='ctx'>     Of course, you should only operate on any given zlib or gzip stream from a</div><div class='ctx'>     single thread at a time.</div><div class='ctx'> </div><div class='ctx'> 22. Can I use zlib in my commercial application?</div><div class='ctx'> </div><div class='del'>-    Yes. Please read the license in zlib.h.</div><div class='add'>+    Yes.  Please read the license in zlib.h.</div><div class='ctx'> </div><div class='ctx'> 23. Is zlib under the GNU license?</div><div class='ctx'> </div><div class='del'>-    No. Please read the license in zlib.h.</div><div class='add'>+    No.  Please read the license in zlib.h.</div><div class='ctx'> </div><div class='ctx'> 24. The license says that altered source versions must be "plainly marked". So</div><div class='ctx'>     what exactly do I need to do to meet that requirement?</div><div class='ctx'> </div><div class='del'>-    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h. In</div><div class='add'>+    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h.  In</div><div class='ctx'>     particular, the final version number needs to be changed to "f", and an</div><div class='del'>-    identification string should be appended to ZLIB_VERSION. Version numbers</div><div class='add'>+    identification string should be appended to ZLIB_VERSION.  Version numbers</div><div class='ctx'>     x.x.x.f are reserved for modifications to zlib by others than the zlib</div><div class='del'>-    maintainers. For example, if the version of the base zlib you are altering</div><div class='add'>+    maintainers.  For example, if the version of the base zlib you are altering</div><div class='ctx'>     is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and</div><div class='del'>-    ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3". You can also</div><div class='add'>+    ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3".  You can also</div><div class='ctx'>     update the version strings in deflate.c and inftrees.c.</div><div class='ctx'> </div><div class='ctx'>     For altered source distributions, you should also note the origin and</div><div class='ctx'>     nature of the changes in zlib.h, as well as in ChangeLog and README, along</div><div class='del'>-    with the dates of the alterations. The origin should include at least your</div><div class='add'>+    with the dates of the alterations.  The origin should include at least your</div><div class='ctx'>     name (or your company's name), and an email address to contact for help or</div><div class='ctx'>     issues with the library.</div><div class='ctx'> </div><div class='hunk'>@@ -197,105 +196,112 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html</div><div class='ctx'> </div><div class='ctx'> 26. Will zlib work on a 64-bit machine?</div><div class='ctx'> </div><div class='del'>-    It should. It has been tested on 64-bit machines, and has no dependence</div><div class='del'>-    on any data types being limited to 32-bits in length. If you have any</div><div class='add'>+    Yes.  It has been tested on 64-bit machines, and has no dependence on any</div><div class='add'>+    data types being limited to 32-bits in length.  If you have any</div><div class='ctx'>     difficulties, please provide a complete problem report to zlib@gzip.org</div><div class='ctx'> </div><div class='ctx'> 27. Will zlib decompress data from the PKWare Data Compression Library?</div><div class='ctx'> </div><div class='del'>-    No. The PKWare DCL uses a completely different compressed data format</div><div class='del'>-    than does PKZIP and zlib. However, you can look in zlib's contrib/blast</div><div class='add'>+    No.  The PKWare DCL uses a completely different compressed data format than</div><div class='add'>+    does PKZIP and zlib.  However, you can look in zlib's contrib/blast</div><div class='ctx'>     directory for a possible solution to your problem.</div><div class='ctx'> </div><div class='ctx'> 28. Can I access data randomly in a compressed stream?</div><div class='ctx'> </div><div class='del'>-    No, not without some preparation. If when compressing you periodically</div><div class='del'>-    use Z_FULL_FLUSH, carefully write all the pending data at those points,</div><div class='del'>-    and keep an index of those locations, then you can start decompression</div><div class='del'>-    at those points. You have to be careful to not use Z_FULL_FLUSH too</div><div class='del'>-    often, since it can significantly degrade compression.</div><div class='add'>+    No, not without some preparation.  If when compressing you periodically use</div><div class='add'>+    Z_FULL_FLUSH, carefully write all the pending data at those points, and</div><div class='add'>+    keep an index of those locations, then you can start decompression at those</div><div class='add'>+    points.  You have to be careful to not use Z_FULL_FLUSH too often, since it</div><div class='add'>+    can significantly degrade compression.  Alternatively, you can scan a</div><div class='add'>+    deflate stream once to generate an index, and then use that index for</div><div class='add'>+    random access.  See examples/zran.c .</div><div class='ctx'> </div><div class='ctx'> 29. Does zlib work on MVS, OS/390, CICS, etc.?</div><div class='ctx'> </div><div class='del'>-    We don't know for sure. We have heard occasional reports of success on</div><div class='del'>-    these systems. If you do use it on one of these, please provide us with</div><div class='del'>-    a report, instructions, and patches that we can reference when we get</div><div class='del'>-    these questions. Thanks.</div><div class='add'>+    It has in the past, but we have not heard of any recent evidence.  There</div><div class='add'>+    were working ports of zlib 1.1.4 to MVS, but those links no longer work.</div><div class='add'>+    If you know of recent, successful applications of zlib on these operating</div><div class='add'>+    systems, please let us know.  Thanks.</div><div class='ctx'> </div><div class='del'>-30. Is there some simpler, easier to read version of inflate I can look at</div><div class='del'>-    to understand the deflate format?</div><div class='add'>+30. Is there some simpler, easier to read version of inflate I can look at to</div><div class='add'>+    understand the deflate format?</div><div class='ctx'> </div><div class='del'>-    First off, you should read RFC 1951. Second, yes. Look in zlib's</div><div class='add'>+    First off, you should read RFC 1951.  Second, yes.  Look in zlib's</div><div class='ctx'>     contrib/puff directory.</div><div class='ctx'> </div><div class='ctx'> 31. Does zlib infringe on any patents?</div><div class='ctx'> </div><div class='del'>-    As far as we know, no. In fact, that was originally the whole point behind</div><div class='del'>-    zlib. Look here for some more information:</div><div class='add'>+    As far as we know, no.  In fact, that was originally the whole point behind</div><div class='add'>+    zlib.  Look here for some more information:</div><div class='ctx'> </div><div class='ctx'>     http://www.gzip.org/#faq11</div><div class='ctx'> </div><div class='ctx'> 32. Can zlib work with greater than 4 GB of data?</div><div class='ctx'> </div><div class='del'>-    Yes. inflate() and deflate() will process any amount of data correctly.</div><div class='add'>+    Yes.  inflate() and deflate() will process any amount of data correctly.</div><div class='ctx'>     Each call of inflate() or deflate() is limited to input and output chunks</div><div class='ctx'>     of the maximum value that can be stored in the compiler's "unsigned int"</div><div class='del'>-    type, but there is no limit to the number of chunks. Note however that the</div><div class='del'>-    strm.total_in and strm_total_out counters may be limited to 4 GB. These</div><div class='add'>+    type, but there is no limit to the number of chunks.  Note however that the</div><div class='add'>+    strm.total_in and strm_total_out counters may be limited to 4 GB.  These</div><div class='ctx'>     counters are provided as a convenience and are not used internally by</div><div class='del'>-    inflate() or deflate(). The application can easily set up its own counters</div><div class='add'>+    inflate() or deflate().  The application can easily set up its own counters</div><div class='ctx'>     updated after each call of inflate() or deflate() to count beyond 4 GB.</div><div class='ctx'>     compress() and uncompress() may be limited to 4 GB, since they operate in a</div><div class='del'>-    single call. gzseek() and gztell() may be limited to 4 GB depending on how</div><div class='del'>-    zlib is compiled. See the zlibCompileFlags() function in zlib.h.</div><div class='add'>+    single call.  gzseek() and gztell() may be limited to 4 GB depending on how</div><div class='add'>+    zlib is compiled.  See the zlibCompileFlags() function in zlib.h.</div><div class='ctx'> </div><div class='del'>-    The word "may" appears several times above since there is a 4 GB limit</div><div class='del'>-    only if the compiler's "long" type is 32 bits. If the compiler's "long"</div><div class='del'>-    type is 64 bits, then the limit is 16 exabytes.</div><div class='add'>+    The word "may" appears several times above since there is a 4 GB limit only</div><div class='add'>+    if the compiler's "long" type is 32 bits.  If the compiler's "long" type is</div><div class='add'>+    64 bits, then the limit is 16 exabytes.</div><div class='ctx'> </div><div class='ctx'> 33. Does zlib have any security vulnerabilities?</div><div class='ctx'> </div><div class='del'>-    The only one that we are aware of is potentially in gzprintf(). If zlib</div><div class='del'>-    is compiled to use sprintf() or vsprintf(), then there is no protection</div><div class='del'>-    against a buffer overflow of a 4K string space, other than the caller of</div><div class='del'>-    gzprintf() assuring that the output will not exceed 4K. On the other</div><div class='del'>-    hand, if zlib is compiled to use snprintf() or vsnprintf(), which should</div><div class='del'>-    normally be the case, then there is no vulnerability. The ./configure</div><div class='del'>-    script will display warnings if an insecure variation of sprintf() will</div><div class='del'>-    be used by gzprintf(). Also the zlibCompileFlags() function will return</div><div class='del'>-    information on what variant of sprintf() is used by gzprintf().</div><div class='add'>+    The only one that we are aware of is potentially in gzprintf().  If zlib is</div><div class='add'>+    compiled to use sprintf() or vsprintf(), then there is no protection</div><div class='add'>+    against a buffer overflow of an 8K string space (or other value as set by</div><div class='add'>+    gzbuffer()), other than the caller of gzprintf() assuring that the output</div><div class='add'>+    will not exceed 8K.  On the other hand, if zlib is compiled to use</div><div class='add'>+    snprintf() or vsnprintf(), which should normally be the case, then there is</div><div class='add'>+    no vulnerability.  The ./configure script will display warnings if an</div><div class='add'>+    insecure variation of sprintf() will be used by gzprintf().  Also the</div><div class='add'>+    zlibCompileFlags() function will return information on what variant of</div><div class='add'>+    sprintf() is used by gzprintf().</div><div class='ctx'> </div><div class='ctx'>     If you don't have snprintf() or vsnprintf() and would like one, you can</div><div class='ctx'>     find a portable implementation here:</div><div class='ctx'> </div><div class='ctx'>         http://www.ijs.si/software/snprintf/</div><div class='ctx'> </div><div class='del'>-    Note that you should be using the most recent version of zlib. Versions</div><div class='del'>-    1.1.3 and before were subject to a double-free vulnerability.</div><div class='add'>+    Note that you should be using the most recent version of zlib.  Versions</div><div class='add'>+    1.1.3 and before were subject to a double-free vulnerability, and versions</div><div class='add'>+    1.2.1 and 1.2.2 were subject to an access exception when decompressing</div><div class='add'>+    invalid compressed data.</div><div class='ctx'> </div><div class='ctx'> 34. Is there a Java version of zlib?</div><div class='ctx'> </div><div class='ctx'>     Probably what you want is to use zlib in Java. zlib is already included</div><div class='ctx'>     as part of the Java SDK in the java.util.zip package. If you really want</div><div class='ctx'>     a version of zlib written in the Java language, look on the zlib home</div><div class='del'>-    page for links: http://www.zlib.org/</div><div class='add'>+    page for links: http://zlib.net/ .</div><div class='ctx'> </div><div class='ctx'> 35. I get this or that compiler or source-code scanner warning when I crank it</div><div class='ctx'>     up to maximally-pedantic. Can't you guys write proper code?</div><div class='ctx'> </div><div class='ctx'>     Many years ago, we gave up attempting to avoid warnings on every compiler</div><div class='del'>-    in the universe. It just got to be a waste of time, and some compilers</div><div class='del'>-    were downright silly. So now, we simply make sure that the code always</div><div class='del'>-    works.</div><div class='add'>+    in the universe.  It just got to be a waste of time, and some compilers</div><div class='add'>+    were downright silly as well as contradicted each other.  So now, we simply</div><div class='add'>+    make sure that the code always works.</div><div class='ctx'> </div><div class='ctx'> 36. Valgrind (or some similar memory access checker) says that deflate is</div><div class='ctx'>     performing a conditional jump that depends on an uninitialized value.</div><div class='ctx'>     Isn't that a bug?</div><div class='ctx'> </div><div class='del'>-    No.  That is intentional for performance reasons, and the output of</div><div class='del'>-    deflate is not affected.  This only started showing up recently since</div><div class='del'>-    zlib 1.2.x uses malloc() by default for allocations, whereas earlier</div><div class='del'>-    versions used calloc(), which zeros out the allocated memory.</div><div class='add'>+    No.  That is intentional for performance reasons, and the output of deflate</div><div class='add'>+    is not affected.  This only started showing up recently since zlib 1.2.x</div><div class='add'>+    uses malloc() by default for allocations, whereas earlier versions used</div><div class='add'>+    calloc(), which zeros out the allocated memory.  Even though the code was</div><div class='add'>+    correct, versions 1.2.4 and later was changed to not stimulate these</div><div class='add'>+    checkers.</div><div class='ctx'> </div><div class='ctx'> 37. Will zlib read the (insert any ancient or arcane format here) compressed</div><div class='ctx'>     data format?</div><div class='hunk'>@@ -305,20 +311,21 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html</div><div class='ctx'> </div><div class='ctx'> 38. How can I encrypt/decrypt zip files with zlib?</div><div class='ctx'> </div><div class='del'>-    zlib doesn't support encryption. The original PKZIP encryption is very weak</div><div class='del'>-    and can be broken with freely available programs. To get strong encryption,</div><div class='del'>-    use GnuPG, http://www.gnupg.org/ , which already includes zlib compression.</div><div class='del'>-    For PKZIP compatible "encryption", look at http://www.info-zip.org/</div><div class='add'>+    zlib doesn't support encryption.  The original PKZIP encryption is very</div><div class='add'>+    weak and can be broken with freely available programs.  To get strong</div><div class='add'>+    encryption, use GnuPG, http://www.gnupg.org/ , which already includes zlib</div><div class='add'>+    compression.  For PKZIP compatible "encryption", look at</div><div class='add'>+    http://www.info-zip.org/</div><div class='ctx'> </div><div class='ctx'> 39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?</div><div class='ctx'> </div><div class='del'>-    "gzip" is the gzip format, and "deflate" is the zlib format. They should</div><div class='del'>-    probably have called the second one "zlib" instead to avoid confusion</div><div class='del'>-    with the raw deflate compressed data format. While the HTTP 1.1 RFC 2616</div><div class='add'>+    "gzip" is the gzip format, and "deflate" is the zlib format.  They should</div><div class='add'>+    probably have called the second one "zlib" instead to avoid confusion with</div><div class='add'>+    the raw deflate compressed data format.  While the HTTP 1.1 RFC 2616</div><div class='ctx'>     correctly points to the zlib specification in RFC 1950 for the "deflate"</div><div class='ctx'>     transfer encoding, there have been reports of servers and browsers that</div><div class='ctx'>     incorrectly produce or expect raw deflate data per the deflate</div><div class='del'>-    specficiation in RFC 1951, most notably Microsoft. So even though the</div><div class='add'>+    specficiation in RFC 1951, most notably Microsoft.  So even though the</div><div class='ctx'>     "deflate" transfer encoding using the zlib format would be the more</div><div class='ctx'>     efficient approach (and in fact exactly what the zlib format was designed</div><div class='ctx'>     for), using the "gzip" transfer encoding is probably more reliable due to</div><div class='hunk'>@@ -328,12 +335,32 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html</div><div class='ctx'> </div><div class='ctx'> 40. Does zlib support the new "Deflate64" format introduced by PKWare?</div><div class='ctx'> </div><div class='del'>-    No. PKWare has apparently decided to keep that format proprietary, since</div><div class='del'>-    they have not documented it as they have previous compression formats.</div><div class='del'>-    In any case, the compression improvements are so modest compared to other</div><div class='del'>-    more modern approaches, that it's not worth the effort to implement.</div><div class='add'>+    No.  PKWare has apparently decided to keep that format proprietary, since</div><div class='add'>+    they have not documented it as they have previous compression formats.  In</div><div class='add'>+    any case, the compression improvements are so modest compared to other more</div><div class='add'>+    modern approaches, that it's not worth the effort to implement.</div><div class='ctx'> </div><div class='del'>-41. Can you please sign these lengthy legal documents and fax them back to us</div><div class='add'>+41. I'm having a problem with the zip functions in zlib, can you help?</div><div class='add'>+</div><div class='add'>+    There are no zip functions in zlib.  You are probably using minizip by</div><div class='add'>+    Giles Vollant, which is found in the contrib directory of zlib.  It is not</div><div class='add'>+    part of zlib.  In fact none of the stuff in contrib is part of zlib.  The</div><div class='add'>+    files in there are not supported by the zlib authors.  You need to contact</div><div class='add'>+    the authors of the respective contribution for help.</div><div class='add'>+</div><div class='add'>+42. The match.asm code in contrib is under the GNU General Public License.</div><div class='add'>+    Since it's part of zlib, doesn't that mean that all of zlib falls under the</div><div class='add'>+    GNU GPL?</div><div class='add'>+</div><div class='add'>+    No.  The files in contrib are not part of zlib.  They were contributed by</div><div class='add'>+    other authors and are provided as a convenience to the user within the zlib</div><div class='add'>+    distribution.  Each item in contrib has its own license.</div><div class='add'>+</div><div class='add'>+43. Is zlib subject to export controls?  What is its ECCN?</div><div class='add'>+</div><div class='add'>+    zlib is not subject to export controls, and so is classified as EAR99.</div><div class='add'>+</div><div class='add'>+44. Can you please sign these lengthy legal documents and fax them back to us</div><div class='ctx'>     so that we can use your software in our product?</div><div class='ctx'> </div><div class='ctx'>     No. Go away. Shoo.</div><div class='head'>diff --git a/src/3rdparty/zlib/INDEX b/src/3rdparty/zlib/INDEX<br/>index 0587e59..f6c51ca 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/INDEX?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/INDEX</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/INDEX?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/INDEX</a></div><div class='hunk'>@@ -1,23 +1,32 @@</div><div class='add'>+CMakeLists.txt  cmake build file</div><div class='ctx'> ChangeLog       history of changes</div><div class='ctx'> FAQ             Frequently Asked Questions about zlib</div><div class='ctx'> INDEX           this file</div><div class='del'>-Makefile        makefile for Unix (generated by configure)</div><div class='del'>-Makefile.in     makefile for Unix (template for configure)</div><div class='add'>+Makefile        dummy Makefile that tells you to ./configure</div><div class='add'>+Makefile.in     template for Unix Makefile</div><div class='ctx'> README          guess what</div><div class='del'>-algorithm.txt   description of the (de)compression algorithm</div><div class='ctx'> configure       configure script for Unix</div><div class='del'>-zconf.in.h      template for zconf.h (used by configure)</div><div class='add'>+make_vms.com    makefile for VMS</div><div class='add'>+treebuild.xml   XML description of source file dependencies</div><div class='add'>+zconf.h.cmakein zconf.h template for cmake</div><div class='add'>+zconf.h.in      zconf.h template for configure</div><div class='add'>+zlib.3          Man page for zlib</div><div class='add'>+zlib.3.pdf      Man page in PDF format</div><div class='add'>+zlib.map        Linux symbol information</div><div class='add'>+zlib.pc.in      Template for pkg-config descriptor</div><div class='add'>+zlib2ansi       perl script to convert source files for C++ compilation</div><div class='ctx'> </div><div class='ctx'> amiga/          makefiles for Amiga SAS C</div><div class='del'>-as400/          makefiles for IBM AS/400</div><div class='add'>+doc/            documentation for formats and algorithms</div><div class='ctx'> msdos/          makefiles for MSDOS</div><div class='add'>+nintendods/     makefile for Nintendo DS</div><div class='ctx'> old/            makefiles for various architectures and zlib documentation</div><div class='ctx'>                 files that have not yet been updated for zlib 1.2.x</div><div class='del'>-projects/       projects for various Integrated Development Environments</div><div class='ctx'> qnx/            makefiles for QNX</div><div class='add'>+watcom/         makefiles for OpenWatcom</div><div class='ctx'> win32/          makefiles for Windows</div><div class='ctx'> </div><div class='del'>-                zlib public header files (must be kept):</div><div class='add'>+                zlib public header files (required for library use):</div><div class='ctx'> zconf.h</div><div class='ctx'> zlib.h</div><div class='ctx'> </div><div class='hunk'>@@ -28,7 +37,11 @@ crc32.c</div><div class='ctx'> crc32.h</div><div class='ctx'> deflate.c</div><div class='ctx'> deflate.h</div><div class='del'>-gzio.c</div><div class='add'>+gzclose.c</div><div class='add'>+gzguts.h</div><div class='add'>+gzlib.c</div><div class='add'>+gzread.c</div><div class='add'>+gzwrite.c</div><div class='ctx'> infback.c</div><div class='ctx'> inffast.c</div><div class='ctx'> inffast.h</div><div class='hunk'>@@ -46,6 +59,7 @@ zutil.h</div><div class='ctx'>                 source files for sample programs:</div><div class='ctx'> example.c</div><div class='ctx'> minigzip.c</div><div class='add'>+See examples/README.examples for more</div><div class='ctx'> </div><div class='ctx'>                 unsupported contribution by third parties</div><div class='ctx'> See contrib/README.contrib</div><div class='head'>diff --git a/src/3rdparty/zlib/Makefile b/src/3rdparty/zlib/Makefile<br/>deleted file mode 100644<br/>index 2fd6e45..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/Makefile?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,154 +0,0 @@</div><div class='del'>-# Makefile for zlib</div><div class='del'>-# Copyright (C) 1995-2005 Jean-loup Gailly.</div><div class='del'>-# For conditions of distribution and use, see copyright notice in zlib.h</div><div class='del'>-</div><div class='del'>-# To compile and test, type:</div><div class='del'>-#    ./configure; make test</div><div class='del'>-# The call of configure is optional if you don't have special requirements</div><div class='del'>-# If you wish to build zlib as a shared library, use: ./configure -s</div><div class='del'>-</div><div class='del'>-# To use the asm code, type:</div><div class='del'>-#    cp contrib/asm?86/match.S ./match.S</div><div class='del'>-#    make LOC=-DASMV OBJA=match.o</div><div class='del'>-</div><div class='del'>-# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:</div><div class='del'>-#    make install</div><div class='del'>-# To install in $HOME instead of /usr/local, use:</div><div class='del'>-#    make install prefix=$HOME</div><div class='del'>-</div><div class='del'>-CC=cc</div><div class='del'>-</div><div class='del'>-CFLAGS=-O</div><div class='del'>-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7</div><div class='del'>-#CFLAGS=-g -DDEBUG</div><div class='del'>-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \</div><div class='del'>-#           -Wstrict-prototypes -Wmissing-prototypes</div><div class='del'>-</div><div class='del'>-LDFLAGS=libz.a</div><div class='del'>-LDSHARED=$(CC)</div><div class='del'>-CPP=$(CC) -E</div><div class='del'>-</div><div class='del'>-LIBS=libz.a</div><div class='del'>-SHAREDLIB=libz.so</div><div class='del'>-SHAREDLIBV=libz.so.1.2.3</div><div class='del'>-SHAREDLIBM=libz.so.1</div><div class='del'>-</div><div class='del'>-AR=ar rc</div><div class='del'>-RANLIB=ranlib</div><div class='del'>-TAR=tar</div><div class='del'>-SHELL=/bin/sh</div><div class='del'>-EXE=</div><div class='del'>-</div><div class='del'>-prefix = /usr/local</div><div class='del'>-exec_prefix = ${prefix}</div><div class='del'>-libdir = ${exec_prefix}/lib</div><div class='del'>-includedir = ${prefix}/include</div><div class='del'>-mandir = ${prefix}/share/man</div><div class='del'>-man3dir = ${mandir}/man3</div><div class='del'>-</div><div class='del'>-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \</div><div class='del'>-       zutil.o inflate.o infback.o inftrees.o inffast.o</div><div class='del'>-</div><div class='del'>-OBJA =</div><div class='del'>-# to use the asm code: make OBJA=match.o</div><div class='del'>-</div><div class='del'>-TEST_OBJS = example.o minigzip.o</div><div class='del'>-</div><div class='del'>-all: example$(EXE) minigzip$(EXE)</div><div class='del'>-</div><div class='del'>-check: test</div><div class='del'>-test: all</div><div class='del'>-	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \</div><div class='del'>-	echo hello world | ./minigzip | ./minigzip -d || \</div><div class='del'>-	  echo '		*** minigzip test FAILED ***' ; \</div><div class='del'>-	if ./example; then \</div><div class='del'>-	  echo '		*** zlib test OK ***'; \</div><div class='del'>-	else \</div><div class='del'>-	  echo '		*** zlib test FAILED ***'; \</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-libz.a: $(OBJS) $(OBJA)</div><div class='del'>-	$(AR) $@ $(OBJS) $(OBJA)</div><div class='del'>-	-@ ($(RANLIB) $@ || true) &gt;/dev/null 2&gt;&amp;1</div><div class='del'>-</div><div class='del'>-match.o: match.S</div><div class='del'>-	$(CPP) match.S &gt; _match.s</div><div class='del'>-	$(CC) -c _match.s</div><div class='del'>-	mv _match.o match.o</div><div class='del'>-	rm -f _match.s</div><div class='del'>-</div><div class='del'>-$(SHAREDLIBV): $(OBJS)</div><div class='del'>-	$(LDSHARED) -o $@ $(OBJS)</div><div class='del'>-	rm -f $(SHAREDLIB) $(SHAREDLIBM)</div><div class='del'>-	ln -s $@ $(SHAREDLIB)</div><div class='del'>-	ln -s $@ $(SHAREDLIBM)</div><div class='del'>-</div><div class='del'>-example$(EXE): example.o $(LIBS)</div><div class='del'>-	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-minigzip$(EXE): minigzip.o $(LIBS)</div><div class='del'>-	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-install: $(LIBS)</div><div class='del'>-	-@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi</div><div class='del'>-	-@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi</div><div class='del'>-	-@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi</div><div class='del'>-	-@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi</div><div class='del'>-	cp zlib.h zconf.h $(includedir)</div><div class='del'>-	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h</div><div class='del'>-	cp $(LIBS) $(libdir)</div><div class='del'>-	cd $(libdir); chmod 755 $(LIBS)</div><div class='del'>-	-@(cd $(libdir); $(RANLIB) libz.a || true) &gt;/dev/null 2&gt;&amp;1</div><div class='del'>-	cd $(libdir); if test -f $(SHAREDLIBV); then \</div><div class='del'>-	  rm -f $(SHAREDLIB) $(SHAREDLIBM); \</div><div class='del'>-	  ln -s $(SHAREDLIBV) $(SHAREDLIB); \</div><div class='del'>-	  ln -s $(SHAREDLIBV) $(SHAREDLIBM); \</div><div class='del'>-	  (ldconfig || true)  &gt;/dev/null 2&gt;&amp;1; \</div><div class='del'>-	fi</div><div class='del'>-	cp zlib.3 $(man3dir)</div><div class='del'>-	chmod 644 $(man3dir)/zlib.3</div><div class='del'>-# The ranlib in install is needed on NeXTSTEP which checks file times</div><div class='del'>-# ldconfig is for Linux</div><div class='del'>-</div><div class='del'>-uninstall:</div><div class='del'>-	cd $(includedir); \</div><div class='del'>-	cd $(libdir); rm -f libz.a; \</div><div class='del'>-	if test -f $(SHAREDLIBV); then \</div><div class='del'>-	  rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \</div><div class='del'>-	fi</div><div class='del'>-	cd $(man3dir); rm -f zlib.3</div><div class='del'>-</div><div class='del'>-mostlyclean: clean</div><div class='del'>-clean:</div><div class='del'>-	rm -f *.o *~ example$(EXE) minigzip$(EXE) \</div><div class='del'>-	   libz.* foo.gz so_locations \</div><div class='del'>-	   _match.s maketree contrib/infback9/*.o</div><div class='del'>-</div><div class='del'>-maintainer-clean: distclean</div><div class='del'>-distclean: clean</div><div class='del'>-	cp -p Makefile.in Makefile</div><div class='del'>-	cp -p zconf.in.h zconf.h</div><div class='del'>-	rm -f .DS_Store</div><div class='del'>-</div><div class='del'>-tags:</div><div class='del'>-	etags *.[ch]</div><div class='del'>-</div><div class='del'>-depend:</div><div class='del'>-	makedepend -- $(CFLAGS) -- *.[ch]</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-adler32.o: zlib.h zconf.h</div><div class='del'>-compress.o: zlib.h zconf.h</div><div class='del'>-crc32.o: crc32.h zlib.h zconf.h</div><div class='del'>-deflate.o: deflate.h zutil.h zlib.h zconf.h</div><div class='del'>-example.o: zlib.h zconf.h</div><div class='del'>-gzio.o: zutil.h zlib.h zconf.h</div><div class='del'>-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h</div><div class='del'>-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h</div><div class='del'>-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h</div><div class='del'>-inftrees.o: zutil.h zlib.h zconf.h inftrees.h</div><div class='del'>-minigzip.o: zlib.h zconf.h</div><div class='del'>-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h</div><div class='del'>-uncompr.o: zlib.h zconf.h</div><div class='del'>-zutil.o: zutil.h zlib.h zconf.h</div><div class='head'>diff --git a/src/3rdparty/zlib/Makefile.in b/src/3rdparty/zlib/Makefile.in<br/>deleted file mode 100644<br/>index 2fd6e45..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/Makefile.in?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/Makefile.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,154 +0,0 @@</div><div class='del'>-# Makefile for zlib</div><div class='del'>-# Copyright (C) 1995-2005 Jean-loup Gailly.</div><div class='del'>-# For conditions of distribution and use, see copyright notice in zlib.h</div><div class='del'>-</div><div class='del'>-# To compile and test, type:</div><div class='del'>-#    ./configure; make test</div><div class='del'>-# The call of configure is optional if you don't have special requirements</div><div class='del'>-# If you wish to build zlib as a shared library, use: ./configure -s</div><div class='del'>-</div><div class='del'>-# To use the asm code, type:</div><div class='del'>-#    cp contrib/asm?86/match.S ./match.S</div><div class='del'>-#    make LOC=-DASMV OBJA=match.o</div><div class='del'>-</div><div class='del'>-# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:</div><div class='del'>-#    make install</div><div class='del'>-# To install in $HOME instead of /usr/local, use:</div><div class='del'>-#    make install prefix=$HOME</div><div class='del'>-</div><div class='del'>-CC=cc</div><div class='del'>-</div><div class='del'>-CFLAGS=-O</div><div class='del'>-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7</div><div class='del'>-#CFLAGS=-g -DDEBUG</div><div class='del'>-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \</div><div class='del'>-#           -Wstrict-prototypes -Wmissing-prototypes</div><div class='del'>-</div><div class='del'>-LDFLAGS=libz.a</div><div class='del'>-LDSHARED=$(CC)</div><div class='del'>-CPP=$(CC) -E</div><div class='del'>-</div><div class='del'>-LIBS=libz.a</div><div class='del'>-SHAREDLIB=libz.so</div><div class='del'>-SHAREDLIBV=libz.so.1.2.3</div><div class='del'>-SHAREDLIBM=libz.so.1</div><div class='del'>-</div><div class='del'>-AR=ar rc</div><div class='del'>-RANLIB=ranlib</div><div class='del'>-TAR=tar</div><div class='del'>-SHELL=/bin/sh</div><div class='del'>-EXE=</div><div class='del'>-</div><div class='del'>-prefix = /usr/local</div><div class='del'>-exec_prefix = ${prefix}</div><div class='del'>-libdir = ${exec_prefix}/lib</div><div class='del'>-includedir = ${prefix}/include</div><div class='del'>-mandir = ${prefix}/share/man</div><div class='del'>-man3dir = ${mandir}/man3</div><div class='del'>-</div><div class='del'>-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \</div><div class='del'>-       zutil.o inflate.o infback.o inftrees.o inffast.o</div><div class='del'>-</div><div class='del'>-OBJA =</div><div class='del'>-# to use the asm code: make OBJA=match.o</div><div class='del'>-</div><div class='del'>-TEST_OBJS = example.o minigzip.o</div><div class='del'>-</div><div class='del'>-all: example$(EXE) minigzip$(EXE)</div><div class='del'>-</div><div class='del'>-check: test</div><div class='del'>-test: all</div><div class='del'>-	@LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \</div><div class='del'>-	echo hello world | ./minigzip | ./minigzip -d || \</div><div class='del'>-	  echo '		*** minigzip test FAILED ***' ; \</div><div class='del'>-	if ./example; then \</div><div class='del'>-	  echo '		*** zlib test OK ***'; \</div><div class='del'>-	else \</div><div class='del'>-	  echo '		*** zlib test FAILED ***'; \</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-libz.a: $(OBJS) $(OBJA)</div><div class='del'>-	$(AR) $@ $(OBJS) $(OBJA)</div><div class='del'>-	-@ ($(RANLIB) $@ || true) &gt;/dev/null 2&gt;&amp;1</div><div class='del'>-</div><div class='del'>-match.o: match.S</div><div class='del'>-	$(CPP) match.S &gt; _match.s</div><div class='del'>-	$(CC) -c _match.s</div><div class='del'>-	mv _match.o match.o</div><div class='del'>-	rm -f _match.s</div><div class='del'>-</div><div class='del'>-$(SHAREDLIBV): $(OBJS)</div><div class='del'>-	$(LDSHARED) -o $@ $(OBJS)</div><div class='del'>-	rm -f $(SHAREDLIB) $(SHAREDLIBM)</div><div class='del'>-	ln -s $@ $(SHAREDLIB)</div><div class='del'>-	ln -s $@ $(SHAREDLIBM)</div><div class='del'>-</div><div class='del'>-example$(EXE): example.o $(LIBS)</div><div class='del'>-	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-minigzip$(EXE): minigzip.o $(LIBS)</div><div class='del'>-	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)</div><div class='del'>-</div><div class='del'>-install: $(LIBS)</div><div class='del'>-	-@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi</div><div class='del'>-	-@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi</div><div class='del'>-	-@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi</div><div class='del'>-	-@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi</div><div class='del'>-	cp zlib.h zconf.h $(includedir)</div><div class='del'>-	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h</div><div class='del'>-	cp $(LIBS) $(libdir)</div><div class='del'>-	cd $(libdir); chmod 755 $(LIBS)</div><div class='del'>-	-@(cd $(libdir); $(RANLIB) libz.a || true) &gt;/dev/null 2&gt;&amp;1</div><div class='del'>-	cd $(libdir); if test -f $(SHAREDLIBV); then \</div><div class='del'>-	  rm -f $(SHAREDLIB) $(SHAREDLIBM); \</div><div class='del'>-	  ln -s $(SHAREDLIBV) $(SHAREDLIB); \</div><div class='del'>-	  ln -s $(SHAREDLIBV) $(SHAREDLIBM); \</div><div class='del'>-	  (ldconfig || true)  &gt;/dev/null 2&gt;&amp;1; \</div><div class='del'>-	fi</div><div class='del'>-	cp zlib.3 $(man3dir)</div><div class='del'>-	chmod 644 $(man3dir)/zlib.3</div><div class='del'>-# The ranlib in install is needed on NeXTSTEP which checks file times</div><div class='del'>-# ldconfig is for Linux</div><div class='del'>-</div><div class='del'>-uninstall:</div><div class='del'>-	cd $(includedir); \</div><div class='del'>-	cd $(libdir); rm -f libz.a; \</div><div class='del'>-	if test -f $(SHAREDLIBV); then \</div><div class='del'>-	  rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \</div><div class='del'>-	fi</div><div class='del'>-	cd $(man3dir); rm -f zlib.3</div><div class='del'>-</div><div class='del'>-mostlyclean: clean</div><div class='del'>-clean:</div><div class='del'>-	rm -f *.o *~ example$(EXE) minigzip$(EXE) \</div><div class='del'>-	   libz.* foo.gz so_locations \</div><div class='del'>-	   _match.s maketree contrib/infback9/*.o</div><div class='del'>-</div><div class='del'>-maintainer-clean: distclean</div><div class='del'>-distclean: clean</div><div class='del'>-	cp -p Makefile.in Makefile</div><div class='del'>-	cp -p zconf.in.h zconf.h</div><div class='del'>-	rm -f .DS_Store</div><div class='del'>-</div><div class='del'>-tags:</div><div class='del'>-	etags *.[ch]</div><div class='del'>-</div><div class='del'>-depend:</div><div class='del'>-	makedepend -- $(CFLAGS) -- *.[ch]</div><div class='del'>-</div><div class='del'>-# DO NOT DELETE THIS LINE -- make depend depends on it.</div><div class='del'>-</div><div class='del'>-adler32.o: zlib.h zconf.h</div><div class='del'>-compress.o: zlib.h zconf.h</div><div class='del'>-crc32.o: crc32.h zlib.h zconf.h</div><div class='del'>-deflate.o: deflate.h zutil.h zlib.h zconf.h</div><div class='del'>-example.o: zlib.h zconf.h</div><div class='del'>-gzio.o: zutil.h zlib.h zconf.h</div><div class='del'>-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h</div><div class='del'>-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h</div><div class='del'>-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h</div><div class='del'>-inftrees.o: zutil.h zlib.h zconf.h inftrees.h</div><div class='del'>-minigzip.o: zlib.h zconf.h</div><div class='del'>-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h</div><div class='del'>-uncompr.o: zlib.h zconf.h</div><div class='del'>-zutil.o: zutil.h zlib.h zconf.h</div><div class='head'>diff --git a/src/3rdparty/zlib/README b/src/3rdparty/zlib/README<br/>index 758cc50..d4219bf 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/README?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/README</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/README?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/README</a></div><div class='hunk'>@@ -1,56 +1,52 @@</div><div class='ctx'> ZLIB DATA COMPRESSION LIBRARY</div><div class='ctx'> </div><div class='del'>-zlib 1.2.3 is a general purpose data compression library.  All the code is</div><div class='add'>+zlib 1.2.5 is a general purpose data compression library.  All the code is</div><div class='ctx'> thread safe.  The data format used by the zlib library is described by RFCs</div><div class='ctx'> (Request for Comments) 1950 to 1952 in the files</div><div class='ctx'> http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)</div><div class='del'>-and rfc1952.txt (gzip format). These documents are also available in other</div><div class='del'>-formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html</div><div class='add'>+and rfc1952.txt (gzip format).</div><div class='ctx'> </div><div class='ctx'> All functions of the compression library are documented in the file zlib.h</div><div class='del'>-(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example</div><div class='add'>+(volunteer to write man pages welcome, contact zlib@gzip.org).  A usage example</div><div class='ctx'> of the library is given in the file example.c which also tests that the library</div><div class='del'>-is working correctly. Another example is given in the file minigzip.c. The</div><div class='add'>+is working correctly.  Another example is given in the file minigzip.c.  The</div><div class='ctx'> compression library itself is composed of all source files except example.c and</div><div class='ctx'> minigzip.c.</div><div class='ctx'> </div><div class='ctx'> To compile all files and run the test program, follow the instructions given at</div><div class='del'>-the top of Makefile. In short "make test; make install" should work for most</div><div class='del'>-machines. For Unix: "./configure; make test; make install". For MSDOS, use one</div><div class='del'>-of the special makefiles such as Makefile.msc. For VMS, use make_vms.com.</div><div class='add'>+the top of Makefile.in.  In short "./configure; make test", and if that goes</div><div class='add'>+well, "make install" should work for most flavors of Unix.  For Windows, use one</div><div class='add'>+of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use</div><div class='add'>+make_vms.com.</div><div class='ctx'> </div><div class='ctx'> Questions about zlib should be sent to &lt;zlib@gzip.org&gt;, or to Gilles Vollant</div><div class='del'>-&lt;info@winimage.com&gt; for the Windows DLL version. The zlib home page is</div><div class='del'>-http://www.zlib.org or http://www.gzip.org/zlib/ Before reporting a problem,</div><div class='del'>-please check this site to verify that you have the latest version of zlib;</div><div class='del'>-otherwise get the latest version and check whether the problem still exists or</div><div class='del'>-not.</div><div class='add'>+&lt;info@winimage.com&gt; for the Windows DLL version.  The zlib home page is</div><div class='add'>+http://zlib.net/ .  Before reporting a problem, please check this site to</div><div class='add'>+verify that you have the latest version of zlib; otherwise get the latest</div><div class='add'>+version and check whether the problem still exists or not.</div><div class='ctx'> </div><div class='del'>-PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html before asking</div><div class='del'>-for help.</div><div class='add'>+PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.</div><div class='ctx'> </div><div class='del'>-Mark Nelson &lt;markn@ieee.org&gt; wrote an article about zlib for the Jan. 1997</div><div class='del'>-issue of  Dr. Dobb's Journal; a copy of the article is available in</div><div class='del'>-http://dogma.net/markn/articles/zlibtool/zlibtool.htm</div><div class='add'>+Mark Nelson &lt;markn@ieee.org&gt; wrote an article about zlib for the Jan.  1997</div><div class='add'>+issue of Dr.  Dobb's Journal; a copy of the article is available at</div><div class='add'>+http://marknelson.us/1997/01/01/zlib-engine/ .</div><div class='ctx'> </div><div class='del'>-The changes made in version 1.2.3 are documented in the file ChangeLog.</div><div class='add'>+The changes made in version 1.2.5 are documented in the file ChangeLog.</div><div class='ctx'> </div><div class='del'>-Unsupported third party contributions are provided in directory "contrib".</div><div class='add'>+Unsupported third party contributions are provided in directory contrib/ .</div><div class='ctx'> </div><div class='del'>-A Java implementation of zlib is available in the Java Development Kit</div><div class='del'>-http://java.sun.com/j2se/1.4.2/docs/api/java/util/zip/package-summary.html</div><div class='del'>-See the zlib home page http://www.zlib.org for details.</div><div class='add'>+zlib is available in Java using the java.util.zip package, documented at</div><div class='add'>+http://java.sun.com/developer/technicalArticles/Programming/compression/ .</div><div class='ctx'> </div><div class='del'>-A Perl interface to zlib written by Paul Marquess &lt;pmqs@cpan.org&gt; is in the</div><div class='del'>-CPAN (Comprehensive Perl Archive Network) sites</div><div class='del'>-http://www.cpan.org/modules/by-module/Compress/</div><div class='add'>+A Perl interface to zlib written by Paul Marquess &lt;pmqs@cpan.org&gt; is available</div><div class='add'>+at CPAN (Comprehensive Perl Archive Network) sites, including</div><div class='add'>+http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .</div><div class='ctx'> </div><div class='ctx'> A Python interface to zlib written by A.M. Kuchling &lt;amk@amk.ca&gt; is</div><div class='ctx'> available in Python 1.5 and later versions, see</div><div class='del'>-http://www.python.org/doc/lib/module-zlib.html</div><div class='add'>+http://www.python.org/doc/lib/module-zlib.html .</div><div class='ctx'> </div><div class='del'>-A zlib binding for TCL written by Andreas Kupries &lt;a.kupries@westend.com&gt; is</div><div class='del'>-availlable at http://www.oche.de/~akupries/soft/trf/trf_zip.html</div><div class='add'>+zlib is built into tcl: http://wiki.tcl.tk/4610 .</div><div class='ctx'> </div><div class='ctx'> An experimental package to read and write files in .zip format, written on top</div><div class='ctx'> of zlib by Gilles Vollant &lt;info@winimage.com&gt;, is available in the</div><div class='hunk'>@@ -74,25 +70,21 @@ Notes for some targets:</div><div class='ctx'> - zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with</div><div class='ctx'>   other compilers. Use "make test" to check your compiler.</div><div class='ctx'> </div><div class='del'>-- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers.</div><div class='add'>+- gzdopen is not supported on RISCOS or BEOS.</div><div class='ctx'> </div><div class='ctx'> - For PalmOs, see http://palmzlib.sourceforge.net/</div><div class='ctx'> </div><div class='del'>-- When building a shared, i.e. dynamic library on Mac OS X, the library must be</div><div class='del'>-  installed before testing (do "make install" before "make test"), since the</div><div class='del'>-  library location is specified in the library.</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> Acknowledgments:</div><div class='ctx'> </div><div class='del'>-  The deflate format used by zlib was defined by Phil Katz. The deflate</div><div class='del'>-  and zlib specifications were written by L. Peter Deutsch. Thanks to all the</div><div class='del'>-  people who reported problems and suggested various improvements in zlib;</div><div class='del'>-  they are too numerous to cite here.</div><div class='add'>+  The deflate format used by zlib was defined by Phil Katz.  The deflate and</div><div class='add'>+  zlib specifications were written by L.  Peter Deutsch.  Thanks to all the</div><div class='add'>+  people who reported problems and suggested various improvements in zlib; they</div><div class='add'>+  are too numerous to cite here.</div><div class='ctx'> </div><div class='ctx'> Copyright notice:</div><div class='ctx'> </div><div class='del'>- (C) 1995-2004 Jean-loup Gailly and Mark Adler</div><div class='add'>+ (C) 1995-2010 Jean-loup Gailly and Mark Adler</div><div class='ctx'> </div><div class='ctx'>   This software is provided 'as-is', without any express or implied</div><div class='ctx'>   warranty.  In no event will the authors be held liable for any damages</div><div class='hunk'>@@ -113,13 +105,11 @@ Copyright notice:</div><div class='ctx'>   Jean-loup Gailly        Mark Adler</div><div class='ctx'>   jloup@gzip.org          madler@alumni.caltech.edu</div><div class='ctx'> </div><div class='del'>-If you use the zlib library in a product, we would appreciate *not*</div><div class='del'>-receiving lengthy legal documents to sign. The sources are provided</div><div class='del'>-for free but without warranty of any kind.  The library has been</div><div class='del'>-entirely written by Jean-loup Gailly and Mark Adler; it does not</div><div class='del'>-include third-party code.</div><div class='add'>+If you use the zlib library in a product, we would appreciate *not* receiving</div><div class='add'>+lengthy legal documents to sign.  The sources are provided for free but without</div><div class='add'>+warranty of any kind.  The library has been entirely written by Jean-loup</div><div class='add'>+Gailly and Mark Adler; it does not include third-party code.</div><div class='ctx'> </div><div class='del'>-If you redistribute modified sources, we would appreciate that you include</div><div class='del'>-in the file ChangeLog history information documenting your changes. Please</div><div class='del'>-read the FAQ for more information on the distribution of modified source</div><div class='del'>-versions.</div><div class='add'>+If you redistribute modified sources, we would appreciate that you include in</div><div class='add'>+the file ChangeLog history information documenting your changes.  Please read</div><div class='add'>+the FAQ for more information on the distribution of modified source versions.</div><div class='head'>diff --git a/src/3rdparty/zlib/adler32.c b/src/3rdparty/zlib/adler32.c<br/>index 007ba26..65ad6a5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/adler32.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/adler32.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/adler32.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/adler32.c</a></div><div class='hunk'>@@ -1,12 +1,15 @@</div><div class='ctx'> /* adler32.c -- compute the Adler-32 checksum of a data stream</div><div class='del'>- * Copyright (C) 1995-2004 Mark Adler</div><div class='add'>+ * Copyright (C) 1995-2007 Mark Adler</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* @(#) $Id$ */</div><div class='ctx'> </div><div class='del'>-#define ZLIB_INTERNAL</div><div class='del'>-#include "zlib.h"</div><div class='add'>+#include "zutil.h"</div><div class='add'>+</div><div class='add'>+#define local static</div><div class='add'>+</div><div class='add'>+local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2);</div><div class='ctx'> </div><div class='ctx'> #define BASE 65521UL    /* largest prime smaller than 65536 */</div><div class='ctx'> #define NMAX 5552</div><div class='hunk'>@@ -125,10 +128,10 @@ uLong ZEXPORT adler32(adler, buf, len)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ========================================================================= */</div><div class='del'>-uLong ZEXPORT adler32_combine(adler1, adler2, len2)</div><div class='add'>+local uLong adler32_combine_(adler1, adler2, len2)</div><div class='ctx'>     uLong adler1;</div><div class='ctx'>     uLong adler2;</div><div class='del'>-    z_off_t len2;</div><div class='add'>+    z_off64_t len2;</div><div class='ctx'> {</div><div class='ctx'>     unsigned long sum1;</div><div class='ctx'>     unsigned long sum2;</div><div class='hunk'>@@ -141,9 +144,26 @@ uLong ZEXPORT adler32_combine(adler1, adler2, len2)</div><div class='ctx'>     MOD(sum2);</div><div class='ctx'>     sum1 += (adler2 &amp; 0xffff) + BASE - 1;</div><div class='ctx'>     sum2 += ((adler1 &gt;&gt; 16) &amp; 0xffff) + ((adler2 &gt;&gt; 16) &amp; 0xffff) + BASE - rem;</div><div class='del'>-    if (sum1 &gt; BASE) sum1 -= BASE;</div><div class='del'>-    if (sum1 &gt; BASE) sum1 -= BASE;</div><div class='del'>-    if (sum2 &gt; (BASE &lt;&lt; 1)) sum2 -= (BASE &lt;&lt; 1);</div><div class='del'>-    if (sum2 &gt; BASE) sum2 -= BASE;</div><div class='add'>+    if (sum1 &gt;= BASE) sum1 -= BASE;</div><div class='add'>+    if (sum1 &gt;= BASE) sum1 -= BASE;</div><div class='add'>+    if (sum2 &gt;= (BASE &lt;&lt; 1)) sum2 -= (BASE &lt;&lt; 1);</div><div class='add'>+    if (sum2 &gt;= BASE) sum2 -= BASE;</div><div class='ctx'>     return sum1 | (sum2 &lt;&lt; 16);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* ========================================================================= */</div><div class='add'>+uLong ZEXPORT adler32_combine(adler1, adler2, len2)</div><div class='add'>+    uLong adler1;</div><div class='add'>+    uLong adler2;</div><div class='add'>+    z_off_t len2;</div><div class='add'>+{</div><div class='add'>+    return adler32_combine_(adler1, adler2, len2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+uLong ZEXPORT adler32_combine64(adler1, adler2, len2)</div><div class='add'>+    uLong adler1;</div><div class='add'>+    uLong adler2;</div><div class='add'>+    z_off64_t len2;</div><div class='add'>+{</div><div class='add'>+    return adler32_combine_(adler1, adler2, len2);</div><div class='add'>+}</div><div class='head'>diff --git a/src/3rdparty/zlib/algorithm.txt b/src/3rdparty/zlib/algorithm.txt<br/>deleted file mode 100644<br/>index b022dde..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/algorithm.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/algorithm.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,209 +0,0 @@</div><div class='del'>-1. Compression algorithm (deflate)</div><div class='del'>-</div><div class='del'>-The deflation algorithm used by gzip (also zip and zlib) is a variation of</div><div class='del'>-LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in</div><div class='del'>-the input data.  The second occurrence of a string is replaced by a</div><div class='del'>-pointer to the previous string, in the form of a pair (distance,</div><div class='del'>-length).  Distances are limited to 32K bytes, and lengths are limited</div><div class='del'>-to 258 bytes. When a string does not occur anywhere in the previous</div><div class='del'>-32K bytes, it is emitted as a sequence of literal bytes.  (In this</div><div class='del'>-description, `string' must be taken as an arbitrary sequence of bytes,</div><div class='del'>-and is not restricted to printable characters.)</div><div class='del'>-</div><div class='del'>-Literals or match lengths are compressed with one Huffman tree, and</div><div class='del'>-match distances are compressed with another tree. The trees are stored</div><div class='del'>-in a compact form at the start of each block. The blocks can have any</div><div class='del'>-size (except that the compressed data for one block must fit in</div><div class='del'>-available memory). A block is terminated when deflate() determines that</div><div class='del'>-it would be useful to start another block with fresh trees. (This is</div><div class='del'>-somewhat similar to the behavior of LZW-based _compress_.)</div><div class='del'>-</div><div class='del'>-Duplicated strings are found using a hash table. All input strings of</div><div class='del'>-length 3 are inserted in the hash table. A hash index is computed for</div><div class='del'>-the next 3 bytes. If the hash chain for this index is not empty, all</div><div class='del'>-strings in the chain are compared with the current input string, and</div><div class='del'>-the longest match is selected.</div><div class='del'>-</div><div class='del'>-The hash chains are searched starting with the most recent strings, to</div><div class='del'>-favor small distances and thus take advantage of the Huffman encoding.</div><div class='del'>-The hash chains are singly linked. There are no deletions from the</div><div class='del'>-hash chains, the algorithm simply discards matches that are too old.</div><div class='del'>-</div><div class='del'>-To avoid a worst-case situation, very long hash chains are arbitrarily</div><div class='del'>-truncated at a certain length, determined by a runtime option (level</div><div class='del'>-parameter of deflateInit). So deflate() does not always find the longest</div><div class='del'>-possible match but generally finds a match which is long enough.</div><div class='del'>-</div><div class='del'>-deflate() also defers the selection of matches with a lazy evaluation</div><div class='del'>-mechanism. After a match of length N has been found, deflate() searches for</div><div class='del'>-a longer match at the next input byte. If a longer match is found, the</div><div class='del'>-previous match is truncated to a length of one (thus producing a single</div><div class='del'>-literal byte) and the process of lazy evaluation begins again. Otherwise,</div><div class='del'>-the original match is kept, and the next match search is attempted only N</div><div class='del'>-steps later.</div><div class='del'>-</div><div class='del'>-The lazy match evaluation is also subject to a runtime parameter. If</div><div class='del'>-the current match is long enough, deflate() reduces the search for a longer</div><div class='del'>-match, thus speeding up the whole process. If compression ratio is more</div><div class='del'>-important than speed, deflate() attempts a complete second search even if</div><div class='del'>-the first match is already long enough.</div><div class='del'>-</div><div class='del'>-The lazy match evaluation is not performed for the fastest compression</div><div class='del'>-modes (level parameter 1 to 3). For these fast modes, new strings</div><div class='del'>-are inserted in the hash table only when no match was found, or</div><div class='del'>-when the match is not too long. This degrades the compression ratio</div><div class='del'>-but saves time since there are both fewer insertions and fewer searches.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2. Decompression algorithm (inflate)</div><div class='del'>-</div><div class='del'>-2.1 Introduction</div><div class='del'>-</div><div class='del'>-The key question is how to represent a Huffman code (or any prefix code) so</div><div class='del'>-that you can decode fast.  The most important characteristic is that shorter</div><div class='del'>-codes are much more common than longer codes, so pay attention to decoding the</div><div class='del'>-short codes fast, and let the long codes take longer to decode.</div><div class='del'>-</div><div class='del'>-inflate() sets up a first level table that covers some number of bits of</div><div class='del'>-input less than the length of longest code.  It gets that many bits from the</div><div class='del'>-stream, and looks it up in the table.  The table will tell if the next</div><div class='del'>-code is that many bits or less and how many, and if it is, it will tell</div><div class='del'>-the value, else it will point to the next level table for which inflate()</div><div class='del'>-grabs more bits and tries to decode a longer code.</div><div class='del'>-</div><div class='del'>-How many bits to make the first lookup is a tradeoff between the time it</div><div class='del'>-takes to decode and the time it takes to build the table.  If building the</div><div class='del'>-table took no time (and if you had infinite memory), then there would only</div><div class='del'>-be a first level table to cover all the way to the longest code.  However,</div><div class='del'>-building the table ends up taking a lot longer for more bits since short</div><div class='del'>-codes are replicated many times in such a table.  What inflate() does is</div><div class='del'>-simply to make the number of bits in the first table a variable, and  then</div><div class='del'>-to set that variable for the maximum speed.</div><div class='del'>-</div><div class='del'>-For inflate, which has 286 possible codes for the literal/length tree, the size</div><div class='del'>-of the first table is nine bits.  Also the distance trees have 30 possible</div><div class='del'>-values, and the size of the first table is six bits.  Note that for each of</div><div class='del'>-those cases, the table ended up one bit longer than the ``average'' code</div><div class='del'>-length, i.e. the code length of an approximately flat code which would be a</div><div class='del'>-little more than eight bits for 286 symbols and a little less than five bits</div><div class='del'>-for 30 symbols.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2.2 More details on the inflate table lookup</div><div class='del'>-</div><div class='del'>-Ok, you want to know what this cleverly obfuscated inflate tree actually</div><div class='del'>-looks like.  You are correct that it's not a Huffman tree.  It is simply a</div><div class='del'>-lookup table for the first, let's say, nine bits of a Huffman symbol.  The</div><div class='del'>-symbol could be as short as one bit or as long as 15 bits.  If a particular</div><div class='del'>-symbol is shorter than nine bits, then that symbol's translation is duplicated</div><div class='del'>-in all those entries that start with that symbol's bits.  For example, if the</div><div class='del'>-symbol is four bits, then it's duplicated 32 times in a nine-bit table.  If a</div><div class='del'>-symbol is nine bits long, it appears in the table once.</div><div class='del'>-</div><div class='del'>-If the symbol is longer than nine bits, then that entry in the table points</div><div class='del'>-to another similar table for the remaining bits.  Again, there are duplicated</div><div class='del'>-entries as needed.  The idea is that most of the time the symbol will be short</div><div class='del'>-and there will only be one table look up.  (That's whole idea behind data</div><div class='del'>-compression in the first place.)  For the less frequent long symbols, there</div><div class='del'>-will be two lookups.  If you had a compression method with really long</div><div class='del'>-symbols, you could have as many levels of lookups as is efficient.  For</div><div class='del'>-inflate, two is enough.</div><div class='del'>-</div><div class='del'>-So a table entry either points to another table (in which case nine bits in</div><div class='del'>-the above example are gobbled), or it contains the translation for the symbol</div><div class='del'>-and the number of bits to gobble.  Then you start again with the next</div><div class='del'>-ungobbled bit.</div><div class='del'>-</div><div class='del'>-You may wonder: why not just have one lookup table for how ever many bits the</div><div class='del'>-longest symbol is?  The reason is that if you do that, you end up spending</div><div class='del'>-more time filling in duplicate symbol entries than you do actually decoding.</div><div class='del'>-At least for deflate's output that generates new trees every several 10's of</div><div class='del'>-kbytes.  You can imagine that filling in a 2^15 entry table for a 15-bit code</div><div class='del'>-would take too long if you're only decoding several thousand symbols.  At the</div><div class='del'>-other extreme, you could make a new table for every bit in the code.  In fact,</div><div class='del'>-that's essentially a Huffman tree.  But then you spend two much time</div><div class='del'>-traversing the tree while decoding, even for short symbols.</div><div class='del'>-</div><div class='del'>-So the number of bits for the first lookup table is a trade of the time to</div><div class='del'>-fill out the table vs. the time spent looking at the second level and above of</div><div class='del'>-the table.</div><div class='del'>-</div><div class='del'>-Here is an example, scaled down:</div><div class='del'>-</div><div class='del'>-The code being decoded, with 10 symbols, from 1 to 6 bits long:</div><div class='del'>-</div><div class='del'>-A: 0</div><div class='del'>-B: 10</div><div class='del'>-C: 1100</div><div class='del'>-D: 11010</div><div class='del'>-E: 11011</div><div class='del'>-F: 11100</div><div class='del'>-G: 11101</div><div class='del'>-H: 11110</div><div class='del'>-I: 111110</div><div class='del'>-J: 111111</div><div class='del'>-</div><div class='del'>-Let's make the first table three bits long (eight entries):</div><div class='del'>-</div><div class='del'>-000: A,1</div><div class='del'>-001: A,1</div><div class='del'>-010: A,1</div><div class='del'>-011: A,1</div><div class='del'>-100: B,2</div><div class='del'>-101: B,2</div><div class='del'>-110: -&gt; table X (gobble 3 bits)</div><div class='del'>-111: -&gt; table Y (gobble 3 bits)</div><div class='del'>-</div><div class='del'>-Each entry is what the bits decode as and how many bits that is, i.e. how</div><div class='del'>-many bits to gobble.  Or the entry points to another table, with the number of</div><div class='del'>-bits to gobble implicit in the size of the table.</div><div class='del'>-</div><div class='del'>-Table X is two bits long since the longest code starting with 110 is five bits</div><div class='del'>-long:</div><div class='del'>-</div><div class='del'>-00: C,1</div><div class='del'>-01: C,1</div><div class='del'>-10: D,2</div><div class='del'>-11: E,2</div><div class='del'>-</div><div class='del'>-Table Y is three bits long since the longest code starting with 111 is six</div><div class='del'>-bits long:</div><div class='del'>-</div><div class='del'>-000: F,2</div><div class='del'>-001: F,2</div><div class='del'>-010: G,2</div><div class='del'>-011: G,2</div><div class='del'>-100: H,2</div><div class='del'>-101: H,2</div><div class='del'>-110: I,3</div><div class='del'>-111: J,3</div><div class='del'>-</div><div class='del'>-So what we have here are three tables with a total of 20 entries that had to</div><div class='del'>-be constructed.  That's compared to 64 entries for a single table.  Or</div><div class='del'>-compared to 16 entries for a Huffman tree (six two entry tables and one four</div><div class='del'>-entry table).  Assuming that the code ideally represents the probability of</div><div class='del'>-the symbols, it takes on the average 1.25 lookups per symbol.  That's compared</div><div class='del'>-to one lookup for the single table, or 1.66 lookups per symbol for the</div><div class='del'>-Huffman tree.</div><div class='del'>-</div><div class='del'>-There, I think that gives you a picture of what's going on.  For inflate, the</div><div class='del'>-meaning of a particular symbol is often more than just a letter.  It can be a</div><div class='del'>-byte (a "literal"), or it can be either a length or a distance which</div><div class='del'>-indicates a base value and a number of bits to fetch after the code that is</div><div class='del'>-added to the base value.  Or it might be the special end-of-block code.  The</div><div class='del'>-data structures created in inftrees.c try to encode all that information</div><div class='del'>-compactly in the tables.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Jean-loup Gailly        Mark Adler</div><div class='del'>-jloup@gzip.org          madler@alumni.caltech.edu</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-References:</div><div class='del'>-</div><div class='del'>-[LZ77] Ziv J., Lempel A., ``A Universal Algorithm for Sequential Data</div><div class='del'>-Compression,'' IEEE Transactions on Information Theory, Vol. 23, No. 3,</div><div class='del'>-pp. 337-343.</div><div class='del'>-</div><div class='del'>-``DEFLATE Compressed Data Format Specification'' available in</div><div class='del'>-http://www.ietf.org/rfc/rfc1951.txt</div><div class='head'>diff --git a/src/3rdparty/zlib/compress.c b/src/3rdparty/zlib/compress.c<br/>index df80134..ea4dfbe 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/compress.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/compress.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/compress.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/compress.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* compress.c -- compress a memory buffer</div><div class='del'>- * Copyright (C) 1995-2003 Jean-loup Gailly.</div><div class='add'>+ * Copyright (C) 1995-2005 Jean-loup Gailly.</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -59,7 +59,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)</div><div class='ctx'> </div><div class='ctx'> /* ===========================================================================</div><div class='ctx'>  */</div><div class='del'>-int Q_ZEXPORT compress (dest, destLen, source, sourceLen)</div><div class='add'>+int ZEXPORT compress (dest, destLen, source, sourceLen)</div><div class='ctx'>     Bytef *dest;</div><div class='ctx'>     uLongf *destLen;</div><div class='ctx'>     const Bytef *source;</div><div class='hunk'>@@ -75,5 +75,6 @@ int Q_ZEXPORT compress (dest, destLen, source, sourceLen)</div><div class='ctx'> uLong ZEXPORT compressBound (sourceLen)</div><div class='ctx'>     uLong sourceLen;</div><div class='ctx'> {</div><div class='del'>-    return sourceLen + (sourceLen &gt;&gt; 12) + (sourceLen &gt;&gt; 14) + 11;</div><div class='add'>+    return sourceLen + (sourceLen &gt;&gt; 12) + (sourceLen &gt;&gt; 14) +</div><div class='add'>+           (sourceLen &gt;&gt; 25) + 13;</div><div class='ctx'> }</div><div class='head'>diff --git a/src/3rdparty/zlib/configure b/src/3rdparty/zlib/configure<br/>deleted file mode 100755<br/>index d7ffdc3..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/configure?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/configure</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,459 +0,0 @@</div><div class='del'>-#!/bin/sh</div><div class='del'>-# configure script for zlib. This script is needed only if</div><div class='del'>-# you wish to build a shared library and your system supports them,</div><div class='del'>-# of if you need special compiler, flags or install directory.</div><div class='del'>-# Otherwise, you can just use directly "make test; make install"</div><div class='del'>-#</div><div class='del'>-# To create a shared library, use "configure --shared"; by default a static</div><div class='del'>-# library is created. If the primitive shared library support provided here</div><div class='del'>-# does not work, use ftp://prep.ai.mit.edu/pub/gnu/libtool-*.tar.gz</div><div class='del'>-#</div><div class='del'>-# To impose specific compiler or flags or install directory, use for example:</div><div class='del'>-#    prefix=$HOME CC=cc CFLAGS="-O4" ./configure</div><div class='del'>-# or for csh/tcsh users:</div><div class='del'>-#    (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure)</div><div class='del'>-# LDSHARED is the command to be used to create a shared library</div><div class='del'>-</div><div class='del'>-# Incorrect settings of CC or CFLAGS may prevent creating a shared library.</div><div class='del'>-# If you have problems, try without defining CC and CFLAGS before reporting</div><div class='del'>-# an error.</div><div class='del'>-</div><div class='del'>-LIBS=libz.a</div><div class='del'>-LDFLAGS="-L. ${LIBS}"</div><div class='del'>-VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' &lt; zlib.h`</div><div class='del'>-VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' &lt; zlib.h`</div><div class='del'>-VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' &lt; zlib.h`</div><div class='del'>-AR=${AR-"ar rc"}</div><div class='del'>-RANLIB=${RANLIB-"ranlib"}</div><div class='del'>-prefix=${prefix-/usr/local}</div><div class='del'>-exec_prefix=${exec_prefix-'${prefix}'}</div><div class='del'>-libdir=${libdir-'${exec_prefix}/lib'}</div><div class='del'>-includedir=${includedir-'${prefix}/include'}</div><div class='del'>-mandir=${mandir-'${prefix}/share/man'}</div><div class='del'>-shared_ext='.so'</div><div class='del'>-shared=0</div><div class='del'>-gcc=0</div><div class='del'>-old_cc="$CC"</div><div class='del'>-old_cflags="$CFLAGS"</div><div class='del'>-</div><div class='del'>-while test $# -ge 1</div><div class='del'>-do</div><div class='del'>-case "$1" in</div><div class='del'>-    -h* | --h*)</div><div class='del'>-      echo 'usage:'</div><div class='del'>-      echo '  configure [--shared] [--prefix=PREFIX]  [--exec_prefix=EXPREFIX]'</div><div class='del'>-      echo '     [--libdir=LIBDIR] [--includedir=INCLUDEDIR]'</div><div class='del'>-        exit 0;;</div><div class='del'>-    -p*=* | --p*=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;</div><div class='del'>-    -e*=* | --e*=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;</div><div class='del'>-    -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;</div><div class='del'>-    -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift;;</div><div class='del'>-    -p* | --p*) prefix="$2"; shift; shift;;</div><div class='del'>-    -e* | --e*) exec_prefix="$2"; shift; shift;;</div><div class='del'>-    -l* | --l*) libdir="$2"; shift; shift;;</div><div class='del'>-    -i* | --i*) includedir="$2"; shift; shift;;</div><div class='del'>-    -s* | --s*) shared=1; shift;;</div><div class='del'>-    *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1;;</div><div class='del'>-    esac</div><div class='del'>-done</div><div class='del'>-</div><div class='del'>-test=ztest$$</div><div class='del'>-cat &gt; $test.c &lt;&lt;EOF</div><div class='del'>-extern int getchar();</div><div class='del'>-int hello() {return getchar();}</div><div class='del'>-EOF</div><div class='del'>-</div><div class='del'>-test -z "$CC" &amp;&amp; echo Checking for gcc...</div><div class='del'>-cc=${CC-gcc}</div><div class='del'>-cflags=${CFLAGS-"-O3"}</div><div class='del'>-# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure</div><div class='del'>-case "$cc" in</div><div class='del'>-  *gcc*) gcc=1;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-if test "$gcc" -eq 1 &amp;&amp; ($cc -c $cflags $test.c) 2&gt;/dev/null; then</div><div class='del'>-  CC="$cc"</div><div class='del'>-  SFLAGS=${CFLAGS-"-fPIC -O3"}</div><div class='del'>-  CFLAGS="$cflags"</div><div class='del'>-  case `(uname -s || echo unknown) 2&gt;/dev/null` in</div><div class='del'>-  Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;</div><div class='del'>-  CYGWIN* | Cygwin* | cygwin* | OS/2* )</div><div class='del'>-             EXE='.exe';;</div><div class='del'>-  QNX*)  # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4</div><div class='del'>-         # (alain.bonnefoy@icbt.com)</div><div class='del'>-                 LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};;</div><div class='del'>-  HP-UX*)</div><div class='del'>-         LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}</div><div class='del'>-         case `(uname -m || echo unknown) 2&gt;/dev/null` in</div><div class='del'>-         ia64)</div><div class='del'>-                 shared_ext='.so'</div><div class='del'>-                 SHAREDLIB='libz.so';;</div><div class='del'>-         *)</div><div class='del'>-                 shared_ext='.sl'</div><div class='del'>-                 SHAREDLIB='libz.sl';;</div><div class='del'>-         esac;;</div><div class='del'>-  Darwin*)   shared_ext='.dylib'</div><div class='del'>-             SHAREDLIB=libz$shared_ext</div><div class='del'>-             SHAREDLIBV=libz.$VER$shared_ext</div><div class='del'>-             SHAREDLIBM=libz.$VER1$shared_ext</div><div class='del'>-             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};;</div><div class='del'>-  *)             LDSHARED=${LDSHARED-"$cc -shared"};;</div><div class='del'>-  esac</div><div class='del'>-else</div><div class='del'>-  # find system name and corresponding cc options</div><div class='del'>-  CC=${CC-cc}</div><div class='del'>-  case `(uname -sr || echo unknown) 2&gt;/dev/null` in</div><div class='del'>-  HP-UX*)    SFLAGS=${CFLAGS-"-O +z"}</div><div class='del'>-             CFLAGS=${CFLAGS-"-O"}</div><div class='del'>-#            LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}</div><div class='del'>-             LDSHARED=${LDSHARED-"ld -b"}</div><div class='del'>-         case `(uname -m || echo unknown) 2&gt;/dev/null` in</div><div class='del'>-         ia64)</div><div class='del'>-             shared_ext='.so'</div><div class='del'>-             SHAREDLIB='libz.so';;</div><div class='del'>-         *)</div><div class='del'>-             shared_ext='.sl'</div><div class='del'>-             SHAREDLIB='libz.sl';;</div><div class='del'>-         esac;;</div><div class='del'>-  IRIX*)     SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}</div><div class='del'>-             CFLAGS=${CFLAGS-"-ansi -O2"}</div><div class='del'>-             LDSHARED=${LDSHARED-"cc -shared"};;</div><div class='del'>-  OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"}</div><div class='del'>-             CFLAGS=${CFLAGS-"-O -std1"}</div><div class='del'>-             LDSHARED=${LDSHARED-"cc -shared  -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"};;</div><div class='del'>-  OSF1*)     SFLAGS=${CFLAGS-"-O -std1"}</div><div class='del'>-             CFLAGS=${CFLAGS-"-O -std1"}</div><div class='del'>-             LDSHARED=${LDSHARED-"cc -shared"};;</div><div class='del'>-  QNX*)      SFLAGS=${CFLAGS-"-4 -O"}</div><div class='del'>-             CFLAGS=${CFLAGS-"-4 -O"}</div><div class='del'>-             LDSHARED=${LDSHARED-"cc"}</div><div class='del'>-             RANLIB=${RANLIB-"true"}</div><div class='del'>-             AR="cc -A";;</div><div class='del'>-  SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}</div><div class='del'>-             CFLAGS=${CFLAGS-"-O3"}</div><div class='del'>-             LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};;</div><div class='del'>-  SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."}</div><div class='del'>-             CFLAGS=${CFLAGS-"-fast -xcg89"}</div><div class='del'>-             LDSHARED=${LDSHARED-"cc -G"};;</div><div class='del'>-  SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}</div><div class='del'>-             CFLAGS=${CFLAGS-"-O2"}</div><div class='del'>-             LDSHARED=${LDSHARED-"ld"};;</div><div class='del'>-  SunStudio\ 9*) SFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"}</div><div class='del'>-             CFLAGS=${CFLAGS-"-DUSE_MMAP -fast -xtarget=ultra3 -xarch=v9b"}</div><div class='del'>-             LDSHARED=${LDSHARED-"cc -xarch=v9b"};;</div><div class='del'>-  UNIX_System_V\ 4.2.0)</div><div class='del'>-             SFLAGS=${CFLAGS-"-KPIC -O"}</div><div class='del'>-             CFLAGS=${CFLAGS-"-O"}</div><div class='del'>-             LDSHARED=${LDSHARED-"cc -G"};;</div><div class='del'>-  UNIX_SV\ 4.2MP)</div><div class='del'>-             SFLAGS=${CFLAGS-"-Kconform_pic -O"}</div><div class='del'>-             CFLAGS=${CFLAGS-"-O"}</div><div class='del'>-             LDSHARED=${LDSHARED-"cc -G"};;</div><div class='del'>-  OpenUNIX\ 5)</div><div class='del'>-             SFLAGS=${CFLAGS-"-KPIC -O"}</div><div class='del'>-             CFLAGS=${CFLAGS-"-O"}</div><div class='del'>-             LDSHARED=${LDSHARED-"cc -G"};;</div><div class='del'>-  AIX*)  # Courtesy of dbakker@arrayasolutions.com</div><div class='del'>-             SFLAGS=${CFLAGS-"-O -qmaxmem=8192"}</div><div class='del'>-             CFLAGS=${CFLAGS-"-O -qmaxmem=8192"}</div><div class='del'>-             LDSHARED=${LDSHARED-"xlc -G"};;</div><div class='del'>-  # send working options for other systems to support@gzip.org</div><div class='del'>-  *)         SFLAGS=${CFLAGS-"-O"}</div><div class='del'>-             CFLAGS=${CFLAGS-"-O"}</div><div class='del'>-             LDSHARED=${LDSHARED-"cc -shared"};;</div><div class='del'>-  esac</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-SHAREDLIB=${SHAREDLIB-"libz$shared_ext"}</div><div class='del'>-SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"}</div><div class='del'>-SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}</div><div class='del'>-</div><div class='del'>-if test $shared -eq 1; then</div><div class='del'>-  echo Checking for shared library support...</div><div class='del'>-  # we must test in two steps (cc then ld), required at least on SunOS 4.x</div><div class='del'>-  if test "`($CC -c $SFLAGS $test.c) 2&gt;&amp;1`" = "" &amp;&amp;</div><div class='del'>-     test "`($LDSHARED -o $test$shared_ext $test.o) 2&gt;&amp;1`" = ""; then</div><div class='del'>-    CFLAGS="$SFLAGS"</div><div class='del'>-    LIBS="$SHAREDLIBV"</div><div class='del'>-    echo Building shared library $SHAREDLIBV with $CC.</div><div class='del'>-  elif test -z "$old_cc" -a -z "$old_cflags"; then</div><div class='del'>-    echo No shared library support.</div><div class='del'>-    shared=0;</div><div class='del'>-  else</div><div class='del'>-    echo 'No shared library support; try without defining CC and CFLAGS'</div><div class='del'>-    shared=0;</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-if test $shared -eq 0; then</div><div class='del'>-  LDSHARED="$CC"</div><div class='del'>-  echo Building static library $LIBS version $VER with $CC.</div><div class='del'>-else</div><div class='del'>-  LDFLAGS="-L. ${SHAREDLIBV}"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-cat &gt; $test.c &lt;&lt;EOF</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-int main() { return 0; }</div><div class='del'>-EOF</div><div class='del'>-if test "`($CC -c $CFLAGS $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-  sed &lt; zconf.in.h "/HAVE_UNISTD_H/s%0%1%" &gt; zconf.h</div><div class='del'>-  echo "Checking for unistd.h... Yes."</div><div class='del'>-else</div><div class='del'>-  cp -p zconf.in.h zconf.h</div><div class='del'>-  echo "Checking for unistd.h... No."</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-cat &gt; $test.c &lt;&lt;EOF</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-#include "zconf.h"</div><div class='del'>-</div><div class='del'>-int main()</div><div class='del'>-{</div><div class='del'>-#ifndef STDC</div><div class='del'>-  choke me</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-EOF</div><div class='del'>-</div><div class='del'>-if test "`($CC -c $CFLAGS $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-  echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()"</div><div class='del'>-</div><div class='del'>-  cat &gt; $test.c &lt;&lt;EOF</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-</div><div class='del'>-int mytest(char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-  char buf[20];</div><div class='del'>-  va_list ap;</div><div class='del'>-</div><div class='del'>-  va_start(ap, fmt);</div><div class='del'>-  vsnprintf(buf, sizeof(buf), fmt, ap);</div><div class='del'>-  va_end(ap);</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main()</div><div class='del'>-{</div><div class='del'>-  return (mytest("Hello%d\n", 1));</div><div class='del'>-}</div><div class='del'>-EOF</div><div class='del'>-</div><div class='del'>-  if test "`($CC $CFLAGS -o $test $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-    echo "Checking for vsnprintf() in stdio.h... Yes."</div><div class='del'>-</div><div class='del'>-    cat &gt;$test.c &lt;&lt;EOF</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-</div><div class='del'>-int mytest(char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-  int n;</div><div class='del'>-  char buf[20];</div><div class='del'>-  va_list ap;</div><div class='del'>-</div><div class='del'>-  va_start(ap, fmt);</div><div class='del'>-  n = vsnprintf(buf, sizeof(buf), fmt, ap);</div><div class='del'>-  va_end(ap);</div><div class='del'>-  return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main()</div><div class='del'>-{</div><div class='del'>-  return (mytest("Hello%d\n", 1));</div><div class='del'>-}</div><div class='del'>-EOF</div><div class='del'>-</div><div class='del'>-    if test "`($CC -c $CFLAGS $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-      echo "Checking for return value of vsnprintf()... Yes."</div><div class='del'>-    else</div><div class='del'>-      CFLAGS="$CFLAGS -DHAS_vsnprintf_void"</div><div class='del'>-      echo "Checking for return value of vsnprintf()... No."</div><div class='del'>-      echo "  WARNING: apparently vsnprintf() does not return a value. zlib"</div><div class='del'>-      echo "  can build but will be open to possible string-format security"</div><div class='del'>-      echo "  vulnerabilities."</div><div class='del'>-    fi</div><div class='del'>-  else</div><div class='del'>-    CFLAGS="$CFLAGS -DNO_vsnprintf"</div><div class='del'>-    echo "Checking for vsnprintf() in stdio.h... No."</div><div class='del'>-    echo "  WARNING: vsnprintf() not found, falling back to vsprintf(). zlib"</div><div class='del'>-    echo "  can build but will be open to possible buffer-overflow security"</div><div class='del'>-    echo "  vulnerabilities."</div><div class='del'>-</div><div class='del'>-    cat &gt;$test.c &lt;&lt;EOF</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-</div><div class='del'>-int mytest(char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-  int n;</div><div class='del'>-  char buf[20];</div><div class='del'>-  va_list ap;</div><div class='del'>-</div><div class='del'>-  va_start(ap, fmt);</div><div class='del'>-  n = vsprintf(buf, fmt, ap);</div><div class='del'>-  va_end(ap);</div><div class='del'>-  return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main()</div><div class='del'>-{</div><div class='del'>-  return (mytest("Hello%d\n", 1));</div><div class='del'>-}</div><div class='del'>-EOF</div><div class='del'>-</div><div class='del'>-    if test "`($CC -c $CFLAGS $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-      echo "Checking for return value of vsprintf()... Yes."</div><div class='del'>-    else</div><div class='del'>-      CFLAGS="$CFLAGS -DHAS_vsprintf_void"</div><div class='del'>-      echo "Checking for return value of vsprintf()... No."</div><div class='del'>-      echo "  WARNING: apparently vsprintf() does not return a value. zlib"</div><div class='del'>-      echo "  can build but will be open to possible string-format security"</div><div class='del'>-      echo "  vulnerabilities."</div><div class='del'>-    fi</div><div class='del'>-  fi</div><div class='del'>-else</div><div class='del'>-  echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()"</div><div class='del'>-</div><div class='del'>-  cat &gt;$test.c &lt;&lt;EOF</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-int mytest()</div><div class='del'>-{</div><div class='del'>-  char buf[20];</div><div class='del'>-</div><div class='del'>-  snprintf(buf, sizeof(buf), "%s", "foo");</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main()</div><div class='del'>-{</div><div class='del'>-  return (mytest());</div><div class='del'>-}</div><div class='del'>-EOF</div><div class='del'>-</div><div class='del'>-  if test "`($CC $CFLAGS -o $test $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-    echo "Checking for snprintf() in stdio.h... Yes."</div><div class='del'>-</div><div class='del'>-    cat &gt;$test.c &lt;&lt;EOF</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-int mytest()</div><div class='del'>-{</div><div class='del'>-  char buf[20];</div><div class='del'>-</div><div class='del'>-  return snprintf(buf, sizeof(buf), "%s", "foo");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main()</div><div class='del'>-{</div><div class='del'>-  return (mytest());</div><div class='del'>-}</div><div class='del'>-EOF</div><div class='del'>-</div><div class='del'>-    if test "`($CC -c $CFLAGS $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-      echo "Checking for return value of snprintf()... Yes."</div><div class='del'>-    else</div><div class='del'>-      CFLAGS="$CFLAGS -DHAS_snprintf_void"</div><div class='del'>-      echo "Checking for return value of snprintf()... No."</div><div class='del'>-      echo "  WARNING: apparently snprintf() does not return a value. zlib"</div><div class='del'>-      echo "  can build but will be open to possible string-format security"</div><div class='del'>-      echo "  vulnerabilities."</div><div class='del'>-    fi</div><div class='del'>-  else</div><div class='del'>-    CFLAGS="$CFLAGS -DNO_snprintf"</div><div class='del'>-    echo "Checking for snprintf() in stdio.h... No."</div><div class='del'>-    echo "  WARNING: snprintf() not found, falling back to sprintf(). zlib"</div><div class='del'>-    echo "  can build but will be open to possible buffer-overflow security"</div><div class='del'>-    echo "  vulnerabilities."</div><div class='del'>-</div><div class='del'>-    cat &gt;$test.c &lt;&lt;EOF</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-int mytest()</div><div class='del'>-{</div><div class='del'>-  char buf[20];</div><div class='del'>-</div><div class='del'>-  return sprintf(buf, "%s", "foo");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main()</div><div class='del'>-{</div><div class='del'>-  return (mytest());</div><div class='del'>-}</div><div class='del'>-EOF</div><div class='del'>-</div><div class='del'>-    if test "`($CC -c $CFLAGS $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-      echo "Checking for return value of sprintf()... Yes."</div><div class='del'>-    else</div><div class='del'>-      CFLAGS="$CFLAGS -DHAS_sprintf_void"</div><div class='del'>-      echo "Checking for return value of sprintf()... No."</div><div class='del'>-      echo "  WARNING: apparently sprintf() does not return a value. zlib"</div><div class='del'>-      echo "  can build but will be open to possible string-format security"</div><div class='del'>-      echo "  vulnerabilities."</div><div class='del'>-    fi</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-cat &gt;$test.c &lt;&lt;EOF</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-int main() { return 0; }</div><div class='del'>-EOF</div><div class='del'>-if test "`($CC -c $CFLAGS $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-  echo "Checking for errno.h... Yes."</div><div class='del'>-else</div><div class='del'>-  echo "Checking for errno.h... No."</div><div class='del'>-  CFLAGS="$CFLAGS -DNO_ERRNO_H"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-cat &gt; $test.c &lt;&lt;EOF</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/mman.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-caddr_t hello() {</div><div class='del'>-  return mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0);</div><div class='del'>-}</div><div class='del'>-EOF</div><div class='del'>-if test "`($CC -c $CFLAGS $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-  CFLAGS="$CFLAGS -DUSE_MMAP"</div><div class='del'>-  echo Checking for mmap support... Yes.</div><div class='del'>-else</div><div class='del'>-  echo Checking for mmap support... No.</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-CPP=${CPP-"$CC -E"}</div><div class='del'>-case $CFLAGS in</div><div class='del'>-  *ASMV*)</div><div class='del'>-    if test "`nm $test.o | grep _hello`" = ""; then</div><div class='del'>-      CPP="$CPP -DNO_UNDERLINE"</div><div class='del'>-      echo Checking for underline in external names... No.</div><div class='del'>-    else</div><div class='del'>-      echo Checking for underline in external names... Yes.</div><div class='del'>-    fi;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-rm -f $test.[co] $test $test$shared_ext</div><div class='del'>-</div><div class='del'>-# udpate Makefile</div><div class='del'>-sed &lt; Makefile.in "</div><div class='del'>-/^CC *=/s#=.*#=$CC#</div><div class='del'>-/^CFLAGS *=/s#=.*#=$CFLAGS#</div><div class='del'>-/^CPP *=/s#=.*#=$CPP#</div><div class='del'>-/^LDSHARED *=/s#=.*#=$LDSHARED#</div><div class='del'>-/^LIBS *=/s#=.*#=$LIBS#</div><div class='del'>-/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#</div><div class='del'>-/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#</div><div class='del'>-/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#</div><div class='del'>-/^AR *=/s#=.*#=$AR#</div><div class='del'>-/^RANLIB *=/s#=.*#=$RANLIB#</div><div class='del'>-/^EXE *=/s#=.*#=$EXE#</div><div class='del'>-/^prefix *=/s#=.*#=$prefix#</div><div class='del'>-/^exec_prefix *=/s#=.*#=$exec_prefix#</div><div class='del'>-/^libdir *=/s#=.*#=$libdir#</div><div class='del'>-/^includedir *=/s#=.*#=$includedir#</div><div class='del'>-/^mandir *=/s#=.*#=$mandir#</div><div class='del'>-/^LDFLAGS *=/s#=.*#=$LDFLAGS#</div><div class='del'>-" &gt; Makefile</div><div class='head'>diff --git a/src/3rdparty/zlib/crc32.c b/src/3rdparty/zlib/crc32.c<br/>index f658a9e..91be372 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/crc32.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/crc32.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/crc32.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/crc32.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* crc32.c -- compute the CRC-32 of a data stream</div><div class='del'>- * Copyright (C) 1995-2005 Mark Adler</div><div class='add'>+ * Copyright (C) 1995-2006, 2010 Mark Adler</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  *</div><div class='ctx'>  * Thanks to Rodney Brown &lt;rbrown64@csc.com.au&gt; for his contribution of faster</div><div class='hunk'>@@ -53,7 +53,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Definitions for doing the crc four data bytes at a time. */</div><div class='ctx'> #ifdef BYFOUR</div><div class='del'>-#  define REV(w) (((w)&gt;&gt;24)+(((w)&gt;&gt;8)&amp;0xff00)+ \</div><div class='add'>+#  define REV(w) ((((w)&gt;&gt;24)&amp;0xff)+(((w)&gt;&gt;8)&amp;0xff00)+ \</div><div class='ctx'>                 (((w)&amp;0xff00)&lt;&lt;8)+(((w)&amp;0xff)&lt;&lt;24))</div><div class='ctx'>    local unsigned long crc32_little OF((unsigned long,</div><div class='ctx'>                         const unsigned char FAR *, unsigned));</div><div class='hunk'>@@ -68,6 +68,8 @@</div><div class='ctx'> local unsigned long gf2_matrix_times OF((unsigned long *mat,</div><div class='ctx'>                                          unsigned long vec));</div><div class='ctx'> local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));</div><div class='add'>+local uLong crc32_combine_(uLong crc1, uLong crc2, z_off64_t len2);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #ifdef DYNAMIC_CRC_TABLE</div><div class='ctx'> </div><div class='hunk'>@@ -219,7 +221,7 @@ const unsigned long FAR * ZEXPORT get_crc_table()</div><div class='ctx'> unsigned long ZEXPORT crc32(crc, buf, len)</div><div class='ctx'>     unsigned long crc;</div><div class='ctx'>     const unsigned char FAR *buf;</div><div class='del'>-    unsigned len;</div><div class='add'>+    uInt len;</div><div class='ctx'> {</div><div class='ctx'>     if (buf == Z_NULL) return 0UL;</div><div class='ctx'> </div><div class='hunk'>@@ -367,22 +369,22 @@ local void gf2_matrix_square(square, mat)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ========================================================================= */</div><div class='del'>-uLong ZEXPORT crc32_combine(crc1, crc2, len2)</div><div class='add'>+local uLong crc32_combine_(crc1, crc2, len2)</div><div class='ctx'>     uLong crc1;</div><div class='ctx'>     uLong crc2;</div><div class='del'>-    z_off_t len2;</div><div class='add'>+    z_off64_t len2;</div><div class='ctx'> {</div><div class='ctx'>     int n;</div><div class='ctx'>     unsigned long row;</div><div class='ctx'>     unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */</div><div class='ctx'>     unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */</div><div class='ctx'> </div><div class='del'>-    /* degenerate case */</div><div class='del'>-    if (len2 == 0)</div><div class='add'>+    /* degenerate case (also disallow negative lengths) */</div><div class='add'>+    if (len2 &lt;= 0)</div><div class='ctx'>         return crc1;</div><div class='ctx'> </div><div class='ctx'>     /* put operator for one zero bit in odd */</div><div class='del'>-    odd[0] = 0xedb88320L;           /* CRC-32 polynomial */</div><div class='add'>+    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */</div><div class='ctx'>     row = 1;</div><div class='ctx'>     for (n = 1; n &lt; GF2_DIM; n++) {</div><div class='ctx'>         odd[n] = row;</div><div class='hunk'>@@ -421,3 +423,20 @@ uLong ZEXPORT crc32_combine(crc1, crc2, len2)</div><div class='ctx'>     crc1 ^= crc2;</div><div class='ctx'>     return crc1;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* ========================================================================= */</div><div class='add'>+uLong ZEXPORT crc32_combine(crc1, crc2, len2)</div><div class='add'>+    uLong crc1;</div><div class='add'>+    uLong crc2;</div><div class='add'>+    z_off_t len2;</div><div class='add'>+{</div><div class='add'>+    return crc32_combine_(crc1, crc2, len2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+uLong ZEXPORT crc32_combine64(crc1, crc2, len2)</div><div class='add'>+    uLong crc1;</div><div class='add'>+    uLong crc2;</div><div class='add'>+    z_off64_t len2;</div><div class='add'>+{</div><div class='add'>+    return crc32_combine_(crc1, crc2, len2);</div><div class='add'>+}</div><div class='head'>diff --git a/src/3rdparty/zlib/deflate.c b/src/3rdparty/zlib/deflate.c<br/>index 29ce1f6..5c4022f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/deflate.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/deflate.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/deflate.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/deflate.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* deflate.c -- compress data using the deflation algorithm</div><div class='del'>- * Copyright (C) 1995-2005 Jean-loup Gailly.</div><div class='add'>+ * Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -52,7 +52,7 @@</div><div class='ctx'> #include "deflate.h"</div><div class='ctx'> </div><div class='ctx'> const char deflate_copyright[] =</div><div class='del'>-   " deflate 1.2.3 Copyright 1995-2005 Jean-loup Gailly ";</div><div class='add'>+   " deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";</div><div class='ctx'> /*</div><div class='ctx'>   If you use the zlib library in a product, an acknowledgment is welcome</div><div class='ctx'>   in the documentation of your product. If for some reason you cannot</div><div class='hunk'>@@ -79,19 +79,18 @@ local block_state deflate_fast   OF((deflate_state *s, int flush));</div><div class='ctx'> #ifndef FASTEST</div><div class='ctx'> local block_state deflate_slow   OF((deflate_state *s, int flush));</div><div class='ctx'> #endif</div><div class='add'>+local block_state deflate_rle    OF((deflate_state *s, int flush));</div><div class='add'>+local block_state deflate_huff   OF((deflate_state *s, int flush));</div><div class='ctx'> local void lm_init        OF((deflate_state *s));</div><div class='ctx'> local void putShortMSB    OF((deflate_state *s, uInt b));</div><div class='ctx'> local void flush_pending  OF((z_streamp strm));</div><div class='ctx'> local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));</div><div class='del'>-#ifndef FASTEST</div><div class='ctx'> #ifdef ASMV</div><div class='ctx'>       void match_init OF((void)); /* asm code initialization */</div><div class='ctx'>       uInt longest_match  OF((deflate_state *s, IPos cur_match));</div><div class='ctx'> #else</div><div class='ctx'> local uInt longest_match  OF((deflate_state *s, IPos cur_match));</div><div class='ctx'> #endif</div><div class='del'>-#endif</div><div class='del'>-local uInt longest_match_fast OF((deflate_state *s, IPos cur_match));</div><div class='ctx'> </div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> local  void check_match OF((deflate_state *s, IPos start, IPos match,</div><div class='hunk'>@@ -110,11 +109,6 @@ local  void check_match OF((deflate_state *s, IPos start, IPos match,</div><div class='ctx'> #endif</div><div class='ctx'> /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */</div><div class='ctx'> </div><div class='del'>-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)</div><div class='del'>-/* Minimum amount of lookahead, except at the end of the input file.</div><div class='del'>- * See deflate.c for comments about the MIN_MATCH+1.</div><div class='del'>- */</div><div class='del'>-</div><div class='ctx'> /* Values for max_lazy_match, good_match and max_chain_length, depending on</div><div class='ctx'>  * the desired pack level (0..9). The values given below have been tuned to</div><div class='ctx'>  * exclude worst case performance for pathological files. Better values may be</div><div class='hunk'>@@ -288,6 +282,8 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,</div><div class='ctx'>     s-&gt;prev   = (Posf *)  ZALLOC(strm, s-&gt;w_size, sizeof(Pos));</div><div class='ctx'>     s-&gt;head   = (Posf *)  ZALLOC(strm, s-&gt;hash_size, sizeof(Pos));</div><div class='ctx'> </div><div class='add'>+    s-&gt;high_water = 0;      /* nothing written to s-&gt;window yet */</div><div class='add'>+</div><div class='ctx'>     s-&gt;lit_bufsize = 1 &lt;&lt; (memLevel + 6); /* 16K elements by default */</div><div class='ctx'> </div><div class='ctx'>     overlay = (ushf *) ZALLOC(strm, s-&gt;lit_bufsize, sizeof(ush)+2);</div><div class='hunk'>@@ -332,8 +328,8 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)</div><div class='ctx'>         strm-&gt;adler = adler32(strm-&gt;adler, dictionary, dictLength);</div><div class='ctx'> </div><div class='ctx'>     if (length &lt; MIN_MATCH) return Z_OK;</div><div class='del'>-    if (length &gt; MAX_DIST(s)) {</div><div class='del'>-        length = MAX_DIST(s);</div><div class='add'>+    if (length &gt; s-&gt;w_size) {</div><div class='add'>+        length = s-&gt;w_size;</div><div class='ctx'>         dictionary += dictLength - length; /* use the tail of the dictionary */</div><div class='ctx'>     }</div><div class='ctx'>     zmemcpy(s-&gt;window, dictionary, length);</div><div class='hunk'>@@ -435,9 +431,10 @@ int ZEXPORT deflateParams(strm, level, strategy)</div><div class='ctx'>     }</div><div class='ctx'>     func = configuration_table[s-&gt;level].func;</div><div class='ctx'> </div><div class='del'>-    if (func != configuration_table[level].func &amp;&amp; strm-&gt;total_in != 0) {</div><div class='add'>+    if ((strategy != s-&gt;strategy || func != configuration_table[level].func) &amp;&amp;</div><div class='add'>+        strm-&gt;total_in != 0) {</div><div class='ctx'>         /* Flush the last buffer: */</div><div class='del'>-        err = deflate(strm, Z_PARTIAL_FLUSH);</div><div class='add'>+        err = deflate(strm, Z_BLOCK);</div><div class='ctx'>     }</div><div class='ctx'>     if (s-&gt;level != level) {</div><div class='ctx'>         s-&gt;level = level;</div><div class='hunk'>@@ -481,33 +478,66 @@ int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)</div><div class='ctx'>  * resulting from using fixed blocks instead of stored blocks, which deflate</div><div class='ctx'>  * can emit on compressed data for some combinations of the parameters.</div><div class='ctx'>  *</div><div class='del'>- * This function could be more sophisticated to provide closer upper bounds</div><div class='del'>- * for every combination of windowBits and memLevel, as well as wrap.</div><div class='del'>- * But even the conservative upper bound of about 14% expansion does not</div><div class='del'>- * seem onerous for output buffer allocation.</div><div class='add'>+ * This function could be more sophisticated to provide closer upper bounds for</div><div class='add'>+ * every combination of windowBits and memLevel.  But even the conservative</div><div class='add'>+ * upper bound of about 14% expansion does not seem onerous for output buffer</div><div class='add'>+ * allocation.</div><div class='ctx'>  */</div><div class='ctx'> uLong ZEXPORT deflateBound(strm, sourceLen)</div><div class='ctx'>     z_streamp strm;</div><div class='ctx'>     uLong sourceLen;</div><div class='ctx'> {</div><div class='ctx'>     deflate_state *s;</div><div class='del'>-    uLong destLen;</div><div class='add'>+    uLong complen, wraplen;</div><div class='add'>+    Bytef *str;</div><div class='ctx'> </div><div class='del'>-    /* conservative upper bound */</div><div class='del'>-    destLen = sourceLen +</div><div class='del'>-              ((sourceLen + 7) &gt;&gt; 3) + ((sourceLen + 63) &gt;&gt; 6) + 11;</div><div class='add'>+    /* conservative upper bound for compressed data */</div><div class='add'>+    complen = sourceLen +</div><div class='add'>+              ((sourceLen + 7) &gt;&gt; 3) + ((sourceLen + 63) &gt;&gt; 6) + 5;</div><div class='ctx'> </div><div class='del'>-    /* if can't get parameters, return conservative bound */</div><div class='add'>+    /* if can't get parameters, return conservative bound plus zlib wrapper */</div><div class='ctx'>     if (strm == Z_NULL || strm-&gt;state == Z_NULL)</div><div class='del'>-        return destLen;</div><div class='add'>+        return complen + 6;</div><div class='ctx'> </div><div class='del'>-    /* if not default parameters, return conservative bound */</div><div class='add'>+    /* compute wrapper length */</div><div class='ctx'>     s = strm-&gt;state;</div><div class='add'>+    switch (s-&gt;wrap) {</div><div class='add'>+    case 0:                                 /* raw deflate */</div><div class='add'>+        wraplen = 0;</div><div class='add'>+        break;</div><div class='add'>+    case 1:                                 /* zlib wrapper */</div><div class='add'>+        wraplen = 6 + (s-&gt;strstart ? 4 : 0);</div><div class='add'>+        break;</div><div class='add'>+    case 2:                                 /* gzip wrapper */</div><div class='add'>+        wraplen = 18;</div><div class='add'>+        if (s-&gt;gzhead != Z_NULL) {          /* user-supplied gzip header */</div><div class='add'>+            if (s-&gt;gzhead-&gt;extra != Z_NULL)</div><div class='add'>+                wraplen += 2 + s-&gt;gzhead-&gt;extra_len;</div><div class='add'>+            str = s-&gt;gzhead-&gt;name;</div><div class='add'>+            if (str != Z_NULL)</div><div class='add'>+                do {</div><div class='add'>+                    wraplen++;</div><div class='add'>+                } while (*str++);</div><div class='add'>+            str = s-&gt;gzhead-&gt;comment;</div><div class='add'>+            if (str != Z_NULL)</div><div class='add'>+                do {</div><div class='add'>+                    wraplen++;</div><div class='add'>+                } while (*str++);</div><div class='add'>+            if (s-&gt;gzhead-&gt;hcrc)</div><div class='add'>+                wraplen += 2;</div><div class='add'>+        }</div><div class='add'>+        break;</div><div class='add'>+    default:                                /* for compiler happiness */</div><div class='add'>+        wraplen = 6;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* if not default parameters, return conservative bound */</div><div class='ctx'>     if (s-&gt;w_bits != 15 || s-&gt;hash_bits != 8 + 7)</div><div class='del'>-        return destLen;</div><div class='add'>+        return complen + wraplen;</div><div class='ctx'> </div><div class='ctx'>     /* default settings: return tight bound for that case */</div><div class='del'>-    return compressBound(sourceLen);</div><div class='add'>+    return sourceLen + (sourceLen &gt;&gt; 12) + (sourceLen &gt;&gt; 14) +</div><div class='add'>+           (sourceLen &gt;&gt; 25) + 13 - 6 + wraplen;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* =========================================================================</div><div class='hunk'>@@ -557,7 +587,7 @@ int ZEXPORT deflate (strm, flush)</div><div class='ctx'>     deflate_state *s;</div><div class='ctx'> </div><div class='ctx'>     if (strm == Z_NULL || strm-&gt;state == Z_NULL ||</div><div class='del'>-        flush &gt; Z_FINISH || flush &lt; 0) {</div><div class='add'>+        flush &gt; Z_BLOCK || flush &lt; 0) {</div><div class='ctx'>         return Z_STREAM_ERROR;</div><div class='ctx'>     }</div><div class='ctx'>     s = strm-&gt;state;</div><div class='hunk'>@@ -581,7 +611,7 @@ int ZEXPORT deflate (strm, flush)</div><div class='ctx'>             put_byte(s, 31);</div><div class='ctx'>             put_byte(s, 139);</div><div class='ctx'>             put_byte(s, 8);</div><div class='del'>-            if (s-&gt;gzhead == NULL) {</div><div class='add'>+            if (s-&gt;gzhead == Z_NULL) {</div><div class='ctx'>                 put_byte(s, 0);</div><div class='ctx'>                 put_byte(s, 0);</div><div class='ctx'>                 put_byte(s, 0);</div><div class='hunk'>@@ -608,7 +638,7 @@ int ZEXPORT deflate (strm, flush)</div><div class='ctx'>                             (s-&gt;strategy &gt;= Z_HUFFMAN_ONLY || s-&gt;level &lt; 2 ?</div><div class='ctx'>                              4 : 0));</div><div class='ctx'>                 put_byte(s, s-&gt;gzhead-&gt;os &amp; 0xff);</div><div class='del'>-                if (s-&gt;gzhead-&gt;extra != NULL) {</div><div class='add'>+                if (s-&gt;gzhead-&gt;extra != Z_NULL) {</div><div class='ctx'>                     put_byte(s, s-&gt;gzhead-&gt;extra_len &amp; 0xff);</div><div class='ctx'>                     put_byte(s, (s-&gt;gzhead-&gt;extra_len &gt;&gt; 8) &amp; 0xff);</div><div class='ctx'>                 }</div><div class='hunk'>@@ -650,7 +680,7 @@ int ZEXPORT deflate (strm, flush)</div><div class='ctx'>     }</div><div class='ctx'> #ifdef GZIP</div><div class='ctx'>     if (s-&gt;status == EXTRA_STATE) {</div><div class='del'>-        if (s-&gt;gzhead-&gt;extra != NULL) {</div><div class='add'>+        if (s-&gt;gzhead-&gt;extra != Z_NULL) {</div><div class='ctx'>             uInt beg = s-&gt;pending;  /* start of bytes to update crc */</div><div class='ctx'> </div><div class='ctx'>             while (s-&gt;gzindex &lt; (s-&gt;gzhead-&gt;extra_len &amp; 0xffff)) {</div><div class='hunk'>@@ -678,7 +708,7 @@ int ZEXPORT deflate (strm, flush)</div><div class='ctx'>             s-&gt;status = NAME_STATE;</div><div class='ctx'>     }</div><div class='ctx'>     if (s-&gt;status == NAME_STATE) {</div><div class='del'>-        if (s-&gt;gzhead-&gt;name != NULL) {</div><div class='add'>+        if (s-&gt;gzhead-&gt;name != Z_NULL) {</div><div class='ctx'>             uInt beg = s-&gt;pending;  /* start of bytes to update crc */</div><div class='ctx'>             int val;</div><div class='ctx'> </div><div class='hunk'>@@ -709,7 +739,7 @@ int ZEXPORT deflate (strm, flush)</div><div class='ctx'>             s-&gt;status = COMMENT_STATE;</div><div class='ctx'>     }</div><div class='ctx'>     if (s-&gt;status == COMMENT_STATE) {</div><div class='del'>-        if (s-&gt;gzhead-&gt;comment != NULL) {</div><div class='add'>+        if (s-&gt;gzhead-&gt;comment != Z_NULL) {</div><div class='ctx'>             uInt beg = s-&gt;pending;  /* start of bytes to update crc */</div><div class='ctx'>             int val;</div><div class='ctx'> </div><div class='hunk'>@@ -787,7 +817,9 @@ int ZEXPORT deflate (strm, flush)</div><div class='ctx'>         (flush != Z_NO_FLUSH &amp;&amp; s-&gt;status != FINISH_STATE)) {</div><div class='ctx'>         block_state bstate;</div><div class='ctx'> </div><div class='del'>-        bstate = (*(configuration_table[s-&gt;level].func))(s, flush);</div><div class='add'>+        bstate = s-&gt;strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :</div><div class='add'>+                    (s-&gt;strategy == Z_RLE ? deflate_rle(s, flush) :</div><div class='add'>+                        (*(configuration_table[s-&gt;level].func))(s, flush));</div><div class='ctx'> </div><div class='ctx'>         if (bstate == finish_started || bstate == finish_done) {</div><div class='ctx'>             s-&gt;status = FINISH_STATE;</div><div class='hunk'>@@ -808,13 +840,17 @@ int ZEXPORT deflate (strm, flush)</div><div class='ctx'>         if (bstate == block_done) {</div><div class='ctx'>             if (flush == Z_PARTIAL_FLUSH) {</div><div class='ctx'>                 _tr_align(s);</div><div class='del'>-            } else { /* FULL_FLUSH or SYNC_FLUSH */</div><div class='add'>+            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */</div><div class='ctx'>                 _tr_stored_block(s, (char*)0, 0L, 0);</div><div class='ctx'>                 /* For a full flush, this empty block will be recognized</div><div class='ctx'>                  * as a special marker by inflate_sync().</div><div class='ctx'>                  */</div><div class='ctx'>                 if (flush == Z_FULL_FLUSH) {</div><div class='ctx'>                     CLEAR_HASH(s);             /* forget history */</div><div class='add'>+                    if (s-&gt;lookahead == 0) {</div><div class='add'>+                        s-&gt;strstart = 0;</div><div class='add'>+                        s-&gt;block_start = 0L;</div><div class='add'>+                    }</div><div class='ctx'>                 }</div><div class='ctx'>             }</div><div class='ctx'>             flush_pending(strm);</div><div class='hunk'>@@ -1167,12 +1203,13 @@ local uInt longest_match(s, cur_match)</div><div class='ctx'>     return s-&gt;lookahead;</div><div class='ctx'> }</div><div class='ctx'> #endif /* ASMV */</div><div class='del'>-#endif /* FASTEST */</div><div class='add'>+</div><div class='add'>+#else /* FASTEST */</div><div class='ctx'> </div><div class='ctx'> /* ---------------------------------------------------------------------------</div><div class='del'>- * Optimized version for level == 1 or strategy == Z_RLE only</div><div class='add'>+ * Optimized version for FASTEST only</div><div class='ctx'>  */</div><div class='del'>-local uInt longest_match_fast(s, cur_match)</div><div class='add'>+local uInt longest_match(s, cur_match)</div><div class='ctx'>     deflate_state *s;</div><div class='ctx'>     IPos cur_match;                             /* current match */</div><div class='ctx'> {</div><div class='hunk'>@@ -1225,6 +1262,8 @@ local uInt longest_match_fast(s, cur_match)</div><div class='ctx'>     return (uInt)len &lt;= s-&gt;lookahead ? (uInt)len : s-&gt;lookahead;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#endif /* FASTEST */</div><div class='add'>+</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> /* ===========================================================================</div><div class='ctx'>  * Check that the match at match_start is indeed a match.</div><div class='hunk'>@@ -1303,7 +1342,6 @@ local void fill_window(s)</div><div class='ctx'>                later. (Using level 0 permanently is not an optimal usage of</div><div class='ctx'>                zlib, so we don't care about this pathological case.)</div><div class='ctx'>              */</div><div class='del'>-            /* %%% avoid this when Z_RLE */</div><div class='ctx'>             n = s-&gt;hash_size;</div><div class='ctx'>             p = &amp;s-&gt;head[n];</div><div class='ctx'>             do {</div><div class='hunk'>@@ -1355,27 +1393,61 @@ local void fill_window(s)</div><div class='ctx'>          */</div><div class='ctx'> </div><div class='ctx'>     } while (s-&gt;lookahead &lt; MIN_LOOKAHEAD &amp;&amp; s-&gt;strm-&gt;avail_in != 0);</div><div class='add'>+</div><div class='add'>+    /* If the WIN_INIT bytes after the end of the current data have never been</div><div class='add'>+     * written, then zero those bytes in order to avoid memory check reports of</div><div class='add'>+     * the use of uninitialized (or uninitialised as Julian writes) bytes by</div><div class='add'>+     * the longest match routines.  Update the high water mark for the next</div><div class='add'>+     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match</div><div class='add'>+     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.</div><div class='add'>+     */</div><div class='add'>+    if (s-&gt;high_water &lt; s-&gt;window_size) {</div><div class='add'>+        ulg curr = s-&gt;strstart + (ulg)(s-&gt;lookahead);</div><div class='add'>+        ulg init;</div><div class='add'>+</div><div class='add'>+        if (s-&gt;high_water &lt; curr) {</div><div class='add'>+            /* Previous high water mark below current data -- zero WIN_INIT</div><div class='add'>+             * bytes or up to end of window, whichever is less.</div><div class='add'>+             */</div><div class='add'>+            init = s-&gt;window_size - curr;</div><div class='add'>+            if (init &gt; WIN_INIT)</div><div class='add'>+                init = WIN_INIT;</div><div class='add'>+            zmemzero(s-&gt;window + curr, (unsigned)init);</div><div class='add'>+            s-&gt;high_water = curr + init;</div><div class='add'>+        }</div><div class='add'>+        else if (s-&gt;high_water &lt; (ulg)curr + WIN_INIT) {</div><div class='add'>+            /* High water mark at or above current data, but below current data</div><div class='add'>+             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up</div><div class='add'>+             * to end of window, whichever is less.</div><div class='add'>+             */</div><div class='add'>+            init = (ulg)curr + WIN_INIT - s-&gt;high_water;</div><div class='add'>+            if (init &gt; s-&gt;window_size - s-&gt;high_water)</div><div class='add'>+                init = s-&gt;window_size - s-&gt;high_water;</div><div class='add'>+            zmemzero(s-&gt;window + s-&gt;high_water, (unsigned)init);</div><div class='add'>+            s-&gt;high_water += init;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ===========================================================================</div><div class='ctx'>  * Flush the current block, with given end-of-file flag.</div><div class='ctx'>  * IN assertion: strstart is set to the end of the current match.</div><div class='ctx'>  */</div><div class='del'>-#define FLUSH_BLOCK_ONLY(s, eof) { \</div><div class='add'>+#define FLUSH_BLOCK_ONLY(s, last) { \</div><div class='ctx'>    _tr_flush_block(s, (s-&gt;block_start &gt;= 0L ? \</div><div class='ctx'>                    (charf *)&amp;s-&gt;window[(unsigned)s-&gt;block_start] : \</div><div class='ctx'>                    (charf *)Z_NULL), \</div><div class='ctx'>                 (ulg)((long)s-&gt;strstart - s-&gt;block_start), \</div><div class='del'>-                (eof)); \</div><div class='add'>+                (last)); \</div><div class='ctx'>    s-&gt;block_start = s-&gt;strstart; \</div><div class='ctx'>    flush_pending(s-&gt;strm); \</div><div class='ctx'>    Tracev((stderr,"[FLUSH]")); \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Same but force premature exit if necessary. */</div><div class='del'>-#define FLUSH_BLOCK(s, eof) { \</div><div class='del'>-   FLUSH_BLOCK_ONLY(s, eof); \</div><div class='del'>-   if (s-&gt;strm-&gt;avail_out == 0) return (eof) ? finish_started : need_more; \</div><div class='add'>+#define FLUSH_BLOCK(s, last) { \</div><div class='add'>+   FLUSH_BLOCK_ONLY(s, last); \</div><div class='add'>+   if (s-&gt;strm-&gt;avail_out == 0) return (last) ? finish_started : need_more; \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ===========================================================================</div><div class='hunk'>@@ -1449,7 +1521,7 @@ local block_state deflate_fast(s, flush)</div><div class='ctx'>     deflate_state *s;</div><div class='ctx'>     int flush;</div><div class='ctx'> {</div><div class='del'>-    IPos hash_head = NIL; /* head of the hash chain */</div><div class='add'>+    IPos hash_head;       /* head of the hash chain */</div><div class='ctx'>     int bflush;           /* set if current block must be flushed */</div><div class='ctx'> </div><div class='ctx'>     for (;;) {</div><div class='hunk'>@@ -1469,6 +1541,7 @@ local block_state deflate_fast(s, flush)</div><div class='ctx'>         /* Insert the string window[strstart .. strstart+2] in the</div><div class='ctx'>          * dictionary, and set hash_head to the head of the hash chain:</div><div class='ctx'>          */</div><div class='add'>+        hash_head = NIL;</div><div class='ctx'>         if (s-&gt;lookahead &gt;= MIN_MATCH) {</div><div class='ctx'>             INSERT_STRING(s, s-&gt;strstart, hash_head);</div><div class='ctx'>         }</div><div class='hunk'>@@ -1481,19 +1554,8 @@ local block_state deflate_fast(s, flush)</div><div class='ctx'>              * of window index 0 (in particular we have to avoid a match</div><div class='ctx'>              * of the string with itself at the start of the input file).</div><div class='ctx'>              */</div><div class='del'>-#ifdef FASTEST</div><div class='del'>-            if ((s-&gt;strategy != Z_HUFFMAN_ONLY &amp;&amp; s-&gt;strategy != Z_RLE) ||</div><div class='del'>-                (s-&gt;strategy == Z_RLE &amp;&amp; s-&gt;strstart - hash_head == 1)) {</div><div class='del'>-                s-&gt;match_length = longest_match_fast (s, hash_head);</div><div class='del'>-            }</div><div class='del'>-#else</div><div class='del'>-            if (s-&gt;strategy != Z_HUFFMAN_ONLY &amp;&amp; s-&gt;strategy != Z_RLE) {</div><div class='del'>-                s-&gt;match_length = longest_match (s, hash_head);</div><div class='del'>-            } else if (s-&gt;strategy == Z_RLE &amp;&amp; s-&gt;strstart - hash_head == 1) {</div><div class='del'>-                s-&gt;match_length = longest_match_fast (s, hash_head);</div><div class='del'>-            }</div><div class='del'>-#endif</div><div class='del'>-            /* longest_match() or longest_match_fast() sets match_start */</div><div class='add'>+            s-&gt;match_length = longest_match (s, hash_head);</div><div class='add'>+            /* longest_match() sets match_start */</div><div class='ctx'>         }</div><div class='ctx'>         if (s-&gt;match_length &gt;= MIN_MATCH) {</div><div class='ctx'>             check_match(s, s-&gt;strstart, s-&gt;match_start, s-&gt;match_length);</div><div class='hunk'>@@ -1555,7 +1617,7 @@ local block_state deflate_slow(s, flush)</div><div class='ctx'>     deflate_state *s;</div><div class='ctx'>     int flush;</div><div class='ctx'> {</div><div class='del'>-    IPos hash_head = NIL;    /* head of hash chain */</div><div class='add'>+    IPos hash_head;          /* head of hash chain */</div><div class='ctx'>     int bflush;              /* set if current block must be flushed */</div><div class='ctx'> </div><div class='ctx'>     /* Process the input block. */</div><div class='hunk'>@@ -1576,6 +1638,7 @@ local block_state deflate_slow(s, flush)</div><div class='ctx'>         /* Insert the string window[strstart .. strstart+2] in the</div><div class='ctx'>          * dictionary, and set hash_head to the head of the hash chain:</div><div class='ctx'>          */</div><div class='add'>+        hash_head = NIL;</div><div class='ctx'>         if (s-&gt;lookahead &gt;= MIN_MATCH) {</div><div class='ctx'>             INSERT_STRING(s, s-&gt;strstart, hash_head);</div><div class='ctx'>         }</div><div class='hunk'>@@ -1591,12 +1654,8 @@ local block_state deflate_slow(s, flush)</div><div class='ctx'>              * of window index 0 (in particular we have to avoid a match</div><div class='ctx'>              * of the string with itself at the start of the input file).</div><div class='ctx'>              */</div><div class='del'>-            if (s-&gt;strategy != Z_HUFFMAN_ONLY &amp;&amp; s-&gt;strategy != Z_RLE) {</div><div class='del'>-                s-&gt;match_length = longest_match (s, hash_head);</div><div class='del'>-            } else if (s-&gt;strategy == Z_RLE &amp;&amp; s-&gt;strstart - hash_head == 1) {</div><div class='del'>-                s-&gt;match_length = longest_match_fast (s, hash_head);</div><div class='del'>-            }</div><div class='del'>-            /* longest_match() or longest_match_fast() sets match_start */</div><div class='add'>+            s-&gt;match_length = longest_match (s, hash_head);</div><div class='add'>+            /* longest_match() sets match_start */</div><div class='ctx'> </div><div class='ctx'>             if (s-&gt;match_length &lt;= 5 &amp;&amp; (s-&gt;strategy == Z_FILTERED</div><div class='ctx'> #if TOO_FAR &lt;= 32767</div><div class='hunk'>@@ -1674,7 +1733,6 @@ local block_state deflate_slow(s, flush)</div><div class='ctx'> }</div><div class='ctx'> #endif /* FASTEST */</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='ctx'> /* ===========================================================================</div><div class='ctx'>  * For Z_RLE, simply look for runs of bytes, generate matches only of distance</div><div class='ctx'>  * one.  Do not maintain a hash table.  (It will be regenerated if this run of</div><div class='hunk'>@@ -1684,11 +1742,9 @@ local block_state deflate_rle(s, flush)</div><div class='ctx'>     deflate_state *s;</div><div class='ctx'>     int flush;</div><div class='ctx'> {</div><div class='del'>-    int bflush;         /* set if current block must be flushed */</div><div class='del'>-    uInt run;           /* length of run */</div><div class='del'>-    uInt max;           /* maximum length of run */</div><div class='del'>-    uInt prev;          /* byte at distance one to match */</div><div class='del'>-    Bytef *scan;        /* scan for end of run */</div><div class='add'>+    int bflush;             /* set if current block must be flushed */</div><div class='add'>+    uInt prev;              /* byte at distance one to match */</div><div class='add'>+    Bytef *scan, *strend;   /* scan goes up to strend for length of run */</div><div class='ctx'> </div><div class='ctx'>     for (;;) {</div><div class='ctx'>         /* Make sure that we always have enough lookahead, except</div><div class='hunk'>@@ -1704,23 +1760,33 @@ local block_state deflate_rle(s, flush)</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         /* See how many times the previous byte repeats */</div><div class='del'>-        run = 0;</div><div class='del'>-        if (s-&gt;strstart &gt; 0) {      /* if there is a previous byte, that is */</div><div class='del'>-            max = s-&gt;lookahead &lt; MAX_MATCH ? s-&gt;lookahead : MAX_MATCH;</div><div class='add'>+        s-&gt;match_length = 0;</div><div class='add'>+        if (s-&gt;lookahead &gt;= MIN_MATCH &amp;&amp; s-&gt;strstart &gt; 0) {</div><div class='ctx'>             scan = s-&gt;window + s-&gt;strstart - 1;</div><div class='del'>-            prev = *scan++;</div><div class='del'>-            do {</div><div class='del'>-                if (*scan++ != prev)</div><div class='del'>-                    break;</div><div class='del'>-            } while (++run &lt; max);</div><div class='add'>+            prev = *scan;</div><div class='add'>+            if (prev == *++scan &amp;&amp; prev == *++scan &amp;&amp; prev == *++scan) {</div><div class='add'>+                strend = s-&gt;window + s-&gt;strstart + MAX_MATCH;</div><div class='add'>+                do {</div><div class='add'>+                } while (prev == *++scan &amp;&amp; prev == *++scan &amp;&amp;</div><div class='add'>+                         prev == *++scan &amp;&amp; prev == *++scan &amp;&amp;</div><div class='add'>+                         prev == *++scan &amp;&amp; prev == *++scan &amp;&amp;</div><div class='add'>+                         prev == *++scan &amp;&amp; prev == *++scan &amp;&amp;</div><div class='add'>+                         scan &lt; strend);</div><div class='add'>+                s-&gt;match_length = MAX_MATCH - (int)(strend - scan);</div><div class='add'>+                if (s-&gt;match_length &gt; s-&gt;lookahead)</div><div class='add'>+                    s-&gt;match_length = s-&gt;lookahead;</div><div class='add'>+            }</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         /* Emit match if have run of MIN_MATCH or longer, else emit literal */</div><div class='del'>-        if (run &gt;= MIN_MATCH) {</div><div class='del'>-            check_match(s, s-&gt;strstart, s-&gt;strstart - 1, run);</div><div class='del'>-            _tr_tally_dist(s, 1, run - MIN_MATCH, bflush);</div><div class='del'>-            s-&gt;lookahead -= run;</div><div class='del'>-            s-&gt;strstart += run;</div><div class='add'>+        if (s-&gt;match_length &gt;= MIN_MATCH) {</div><div class='add'>+            check_match(s, s-&gt;strstart, s-&gt;strstart - 1, s-&gt;match_length);</div><div class='add'>+</div><div class='add'>+            _tr_tally_dist(s, 1, s-&gt;match_length - MIN_MATCH, bflush);</div><div class='add'>+</div><div class='add'>+            s-&gt;lookahead -= s-&gt;match_length;</div><div class='add'>+            s-&gt;strstart += s-&gt;match_length;</div><div class='add'>+            s-&gt;match_length = 0;</div><div class='ctx'>         } else {</div><div class='ctx'>             /* No match, output a literal byte */</div><div class='ctx'>             Tracevv((stderr,"%c", s-&gt;window[s-&gt;strstart]));</div><div class='hunk'>@@ -1733,4 +1799,36 @@ local block_state deflate_rle(s, flush)</div><div class='ctx'>     FLUSH_BLOCK(s, flush == Z_FINISH);</div><div class='ctx'>     return flush == Z_FINISH ? finish_done : block_done;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+/* ===========================================================================</div><div class='add'>+ * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.</div><div class='add'>+ * (It will be regenerated if this run of deflate switches away from Huffman.)</div><div class='add'>+ */</div><div class='add'>+local block_state deflate_huff(s, flush)</div><div class='add'>+    deflate_state *s;</div><div class='add'>+    int flush;</div><div class='add'>+{</div><div class='add'>+    int bflush;             /* set if current block must be flushed */</div><div class='add'>+</div><div class='add'>+    for (;;) {</div><div class='add'>+        /* Make sure that we have a literal to write. */</div><div class='add'>+        if (s-&gt;lookahead == 0) {</div><div class='add'>+            fill_window(s);</div><div class='add'>+            if (s-&gt;lookahead == 0) {</div><div class='add'>+                if (flush == Z_NO_FLUSH)</div><div class='add'>+                    return need_more;</div><div class='add'>+                break;      /* flush the current block */</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        /* Output a literal byte */</div><div class='add'>+        s-&gt;match_length = 0;</div><div class='add'>+        Tracevv((stderr,"%c", s-&gt;window[s-&gt;strstart]));</div><div class='add'>+        _tr_tally_lit (s, s-&gt;window[s-&gt;strstart], bflush);</div><div class='add'>+        s-&gt;lookahead--;</div><div class='add'>+        s-&gt;strstart++;</div><div class='add'>+        if (bflush) FLUSH_BLOCK(s, 0);</div><div class='add'>+    }</div><div class='add'>+    FLUSH_BLOCK(s, flush == Z_FINISH);</div><div class='add'>+    return flush == Z_FINISH ? finish_done : block_done;</div><div class='add'>+}</div><div class='head'>diff --git a/src/3rdparty/zlib/deflate.h b/src/3rdparty/zlib/deflate.h<br/>index 05a5ab3..cbf0d1e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/deflate.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/deflate.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/deflate.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/deflate.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* deflate.h -- internal compression state</div><div class='del'>- * Copyright (C) 1995-2004 Jean-loup Gailly</div><div class='add'>+ * Copyright (C) 1995-2010 Jean-loup Gailly</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -260,6 +260,13 @@ typedef struct internal_state {</div><div class='ctx'>      * are always zero.</div><div class='ctx'>      */</div><div class='ctx'> </div><div class='add'>+    ulg high_water;</div><div class='add'>+    /* High water mark offset in window for initialized bytes -- bytes above</div><div class='add'>+     * this are set to zero in order to avoid memory check warnings when</div><div class='add'>+     * longest match routines access bytes past the input.  This is then</div><div class='add'>+     * updated to the new high water mark.</div><div class='add'>+     */</div><div class='add'>+</div><div class='ctx'> } FAR deflate_state;</div><div class='ctx'> </div><div class='ctx'> /* Output a byte on the stream.</div><div class='hunk'>@@ -278,14 +285,18 @@ typedef struct internal_state {</div><div class='ctx'>  * distances are limited to MAX_DIST instead of WSIZE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define WIN_INIT MAX_MATCH</div><div class='add'>+/* Number of bytes after end of data in window to initialize in order to avoid</div><div class='add'>+   memory checker errors from longest match routines */</div><div class='add'>+</div><div class='ctx'>         /* in trees.c */</div><div class='del'>-void _tr_init         OF((deflate_state *s));</div><div class='del'>-int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));</div><div class='del'>-void _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,</div><div class='del'>-                          int eof));</div><div class='del'>-void _tr_align        OF((deflate_state *s));</div><div class='del'>-void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,</div><div class='del'>-                          int eof));</div><div class='add'>+void ZLIB_INTERNAL _tr_init OF((deflate_state *s));</div><div class='add'>+int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));</div><div class='add'>+void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,</div><div class='add'>+                        ulg stored_len, int last));</div><div class='add'>+void ZLIB_INTERNAL _tr_align OF((deflate_state *s));</div><div class='add'>+void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,</div><div class='add'>+                        ulg stored_len, int last));</div><div class='ctx'> </div><div class='ctx'> #define d_code(dist) \</div><div class='ctx'>    ((dist) &lt; 256 ? _dist_code[dist] : _dist_code[256+((dist)&gt;&gt;7)])</div><div class='hunk'>@@ -298,11 +309,11 @@ void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,</div><div class='ctx'> /* Inline versions of _tr_tally for speed: */</div><div class='ctx'> </div><div class='ctx'> #if defined(GEN_TREES_H) || !defined(STDC)</div><div class='del'>-  extern uch _length_code[];</div><div class='del'>-  extern uch _dist_code[];</div><div class='add'>+  extern uch ZLIB_INTERNAL _length_code[];</div><div class='add'>+  extern uch ZLIB_INTERNAL _dist_code[];</div><div class='ctx'> #else</div><div class='del'>-  extern const uch _length_code[];</div><div class='del'>-  extern const uch _dist_code[];</div><div class='add'>+  extern const uch ZLIB_INTERNAL _length_code[];</div><div class='add'>+  extern const uch ZLIB_INTERNAL _dist_code[];</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> # define _tr_tally_lit(s, c, flush) \</div><div class='head'>diff --git a/src/3rdparty/zlib/doc/algorithm.txt b/src/3rdparty/zlib/doc/algorithm.txt<br/>new file mode 100644<br/>index 0000000..34960bd<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/doc/algorithm.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/doc/algorithm.txt</a></div><div class='hunk'>@@ -0,0 +1,209 @@</div><div class='add'>+1. Compression algorithm (deflate)</div><div class='add'>+</div><div class='add'>+The deflation algorithm used by gzip (also zip and zlib) is a variation of</div><div class='add'>+LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in</div><div class='add'>+the input data.  The second occurrence of a string is replaced by a</div><div class='add'>+pointer to the previous string, in the form of a pair (distance,</div><div class='add'>+length).  Distances are limited to 32K bytes, and lengths are limited</div><div class='add'>+to 258 bytes. When a string does not occur anywhere in the previous</div><div class='add'>+32K bytes, it is emitted as a sequence of literal bytes.  (In this</div><div class='add'>+description, `string' must be taken as an arbitrary sequence of bytes,</div><div class='add'>+and is not restricted to printable characters.)</div><div class='add'>+</div><div class='add'>+Literals or match lengths are compressed with one Huffman tree, and</div><div class='add'>+match distances are compressed with another tree. The trees are stored</div><div class='add'>+in a compact form at the start of each block. The blocks can have any</div><div class='add'>+size (except that the compressed data for one block must fit in</div><div class='add'>+available memory). A block is terminated when deflate() determines that</div><div class='add'>+it would be useful to start another block with fresh trees. (This is</div><div class='add'>+somewhat similar to the behavior of LZW-based _compress_.)</div><div class='add'>+</div><div class='add'>+Duplicated strings are found using a hash table. All input strings of</div><div class='add'>+length 3 are inserted in the hash table. A hash index is computed for</div><div class='add'>+the next 3 bytes. If the hash chain for this index is not empty, all</div><div class='add'>+strings in the chain are compared with the current input string, and</div><div class='add'>+the longest match is selected.</div><div class='add'>+</div><div class='add'>+The hash chains are searched starting with the most recent strings, to</div><div class='add'>+favor small distances and thus take advantage of the Huffman encoding.</div><div class='add'>+The hash chains are singly linked. There are no deletions from the</div><div class='add'>+hash chains, the algorithm simply discards matches that are too old.</div><div class='add'>+</div><div class='add'>+To avoid a worst-case situation, very long hash chains are arbitrarily</div><div class='add'>+truncated at a certain length, determined by a runtime option (level</div><div class='add'>+parameter of deflateInit). So deflate() does not always find the longest</div><div class='add'>+possible match but generally finds a match which is long enough.</div><div class='add'>+</div><div class='add'>+deflate() also defers the selection of matches with a lazy evaluation</div><div class='add'>+mechanism. After a match of length N has been found, deflate() searches for</div><div class='add'>+a longer match at the next input byte. If a longer match is found, the</div><div class='add'>+previous match is truncated to a length of one (thus producing a single</div><div class='add'>+literal byte) and the process of lazy evaluation begins again. Otherwise,</div><div class='add'>+the original match is kept, and the next match search is attempted only N</div><div class='add'>+steps later.</div><div class='add'>+</div><div class='add'>+The lazy match evaluation is also subject to a runtime parameter. If</div><div class='add'>+the current match is long enough, deflate() reduces the search for a longer</div><div class='add'>+match, thus speeding up the whole process. If compression ratio is more</div><div class='add'>+important than speed, deflate() attempts a complete second search even if</div><div class='add'>+the first match is already long enough.</div><div class='add'>+</div><div class='add'>+The lazy match evaluation is not performed for the fastest compression</div><div class='add'>+modes (level parameter 1 to 3). For these fast modes, new strings</div><div class='add'>+are inserted in the hash table only when no match was found, or</div><div class='add'>+when the match is not too long. This degrades the compression ratio</div><div class='add'>+but saves time since there are both fewer insertions and fewer searches.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2. Decompression algorithm (inflate)</div><div class='add'>+</div><div class='add'>+2.1 Introduction</div><div class='add'>+</div><div class='add'>+The key question is how to represent a Huffman code (or any prefix code) so</div><div class='add'>+that you can decode fast.  The most important characteristic is that shorter</div><div class='add'>+codes are much more common than longer codes, so pay attention to decoding the</div><div class='add'>+short codes fast, and let the long codes take longer to decode.</div><div class='add'>+</div><div class='add'>+inflate() sets up a first level table that covers some number of bits of</div><div class='add'>+input less than the length of longest code.  It gets that many bits from the</div><div class='add'>+stream, and looks it up in the table.  The table will tell if the next</div><div class='add'>+code is that many bits or less and how many, and if it is, it will tell</div><div class='add'>+the value, else it will point to the next level table for which inflate()</div><div class='add'>+grabs more bits and tries to decode a longer code.</div><div class='add'>+</div><div class='add'>+How many bits to make the first lookup is a tradeoff between the time it</div><div class='add'>+takes to decode and the time it takes to build the table.  If building the</div><div class='add'>+table took no time (and if you had infinite memory), then there would only</div><div class='add'>+be a first level table to cover all the way to the longest code.  However,</div><div class='add'>+building the table ends up taking a lot longer for more bits since short</div><div class='add'>+codes are replicated many times in such a table.  What inflate() does is</div><div class='add'>+simply to make the number of bits in the first table a variable, and  then</div><div class='add'>+to set that variable for the maximum speed.</div><div class='add'>+</div><div class='add'>+For inflate, which has 286 possible codes for the literal/length tree, the size</div><div class='add'>+of the first table is nine bits.  Also the distance trees have 30 possible</div><div class='add'>+values, and the size of the first table is six bits.  Note that for each of</div><div class='add'>+those cases, the table ended up one bit longer than the ``average'' code</div><div class='add'>+length, i.e. the code length of an approximately flat code which would be a</div><div class='add'>+little more than eight bits for 286 symbols and a little less than five bits</div><div class='add'>+for 30 symbols.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2.2 More details on the inflate table lookup</div><div class='add'>+</div><div class='add'>+Ok, you want to know what this cleverly obfuscated inflate tree actually</div><div class='add'>+looks like.  You are correct that it's not a Huffman tree.  It is simply a</div><div class='add'>+lookup table for the first, let's say, nine bits of a Huffman symbol.  The</div><div class='add'>+symbol could be as short as one bit or as long as 15 bits.  If a particular</div><div class='add'>+symbol is shorter than nine bits, then that symbol's translation is duplicated</div><div class='add'>+in all those entries that start with that symbol's bits.  For example, if the</div><div class='add'>+symbol is four bits, then it's duplicated 32 times in a nine-bit table.  If a</div><div class='add'>+symbol is nine bits long, it appears in the table once.</div><div class='add'>+</div><div class='add'>+If the symbol is longer than nine bits, then that entry in the table points</div><div class='add'>+to another similar table for the remaining bits.  Again, there are duplicated</div><div class='add'>+entries as needed.  The idea is that most of the time the symbol will be short</div><div class='add'>+and there will only be one table look up.  (That's whole idea behind data</div><div class='add'>+compression in the first place.)  For the less frequent long symbols, there</div><div class='add'>+will be two lookups.  If you had a compression method with really long</div><div class='add'>+symbols, you could have as many levels of lookups as is efficient.  For</div><div class='add'>+inflate, two is enough.</div><div class='add'>+</div><div class='add'>+So a table entry either points to another table (in which case nine bits in</div><div class='add'>+the above example are gobbled), or it contains the translation for the symbol</div><div class='add'>+and the number of bits to gobble.  Then you start again with the next</div><div class='add'>+ungobbled bit.</div><div class='add'>+</div><div class='add'>+You may wonder: why not just have one lookup table for how ever many bits the</div><div class='add'>+longest symbol is?  The reason is that if you do that, you end up spending</div><div class='add'>+more time filling in duplicate symbol entries than you do actually decoding.</div><div class='add'>+At least for deflate's output that generates new trees every several 10's of</div><div class='add'>+kbytes.  You can imagine that filling in a 2^15 entry table for a 15-bit code</div><div class='add'>+would take too long if you're only decoding several thousand symbols.  At the</div><div class='add'>+other extreme, you could make a new table for every bit in the code.  In fact,</div><div class='add'>+that's essentially a Huffman tree.  But then you spend too much time</div><div class='add'>+traversing the tree while decoding, even for short symbols.</div><div class='add'>+</div><div class='add'>+So the number of bits for the first lookup table is a trade of the time to</div><div class='add'>+fill out the table vs. the time spent looking at the second level and above of</div><div class='add'>+the table.</div><div class='add'>+</div><div class='add'>+Here is an example, scaled down:</div><div class='add'>+</div><div class='add'>+The code being decoded, with 10 symbols, from 1 to 6 bits long:</div><div class='add'>+</div><div class='add'>+A: 0</div><div class='add'>+B: 10</div><div class='add'>+C: 1100</div><div class='add'>+D: 11010</div><div class='add'>+E: 11011</div><div class='add'>+F: 11100</div><div class='add'>+G: 11101</div><div class='add'>+H: 11110</div><div class='add'>+I: 111110</div><div class='add'>+J: 111111</div><div class='add'>+</div><div class='add'>+Let's make the first table three bits long (eight entries):</div><div class='add'>+</div><div class='add'>+000: A,1</div><div class='add'>+001: A,1</div><div class='add'>+010: A,1</div><div class='add'>+011: A,1</div><div class='add'>+100: B,2</div><div class='add'>+101: B,2</div><div class='add'>+110: -&gt; table X (gobble 3 bits)</div><div class='add'>+111: -&gt; table Y (gobble 3 bits)</div><div class='add'>+</div><div class='add'>+Each entry is what the bits decode as and how many bits that is, i.e. how</div><div class='add'>+many bits to gobble.  Or the entry points to another table, with the number of</div><div class='add'>+bits to gobble implicit in the size of the table.</div><div class='add'>+</div><div class='add'>+Table X is two bits long since the longest code starting with 110 is five bits</div><div class='add'>+long:</div><div class='add'>+</div><div class='add'>+00: C,1</div><div class='add'>+01: C,1</div><div class='add'>+10: D,2</div><div class='add'>+11: E,2</div><div class='add'>+</div><div class='add'>+Table Y is three bits long since the longest code starting with 111 is six</div><div class='add'>+bits long:</div><div class='add'>+</div><div class='add'>+000: F,2</div><div class='add'>+001: F,2</div><div class='add'>+010: G,2</div><div class='add'>+011: G,2</div><div class='add'>+100: H,2</div><div class='add'>+101: H,2</div><div class='add'>+110: I,3</div><div class='add'>+111: J,3</div><div class='add'>+</div><div class='add'>+So what we have here are three tables with a total of 20 entries that had to</div><div class='add'>+be constructed.  That's compared to 64 entries for a single table.  Or</div><div class='add'>+compared to 16 entries for a Huffman tree (six two entry tables and one four</div><div class='add'>+entry table).  Assuming that the code ideally represents the probability of</div><div class='add'>+the symbols, it takes on the average 1.25 lookups per symbol.  That's compared</div><div class='add'>+to one lookup for the single table, or 1.66 lookups per symbol for the</div><div class='add'>+Huffman tree.</div><div class='add'>+</div><div class='add'>+There, I think that gives you a picture of what's going on.  For inflate, the</div><div class='add'>+meaning of a particular symbol is often more than just a letter.  It can be a</div><div class='add'>+byte (a "literal"), or it can be either a length or a distance which</div><div class='add'>+indicates a base value and a number of bits to fetch after the code that is</div><div class='add'>+added to the base value.  Or it might be the special end-of-block code.  The</div><div class='add'>+data structures created in inftrees.c try to encode all that information</div><div class='add'>+compactly in the tables.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Jean-loup Gailly        Mark Adler</div><div class='add'>+jloup@gzip.org          madler@alumni.caltech.edu</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+References:</div><div class='add'>+</div><div class='add'>+[LZ77] Ziv J., Lempel A., ``A Universal Algorithm for Sequential Data</div><div class='add'>+Compression,'' IEEE Transactions on Information Theory, Vol. 23, No. 3,</div><div class='add'>+pp. 337-343.</div><div class='add'>+</div><div class='add'>+``DEFLATE Compressed Data Format Specification'' available in</div><div class='add'>+http://www.ietf.org/rfc/rfc1951.txt</div><div class='head'>diff --git a/src/3rdparty/zlib/doc/rfc1950.txt b/src/3rdparty/zlib/doc/rfc1950.txt<br/>new file mode 100644<br/>index 0000000..ce6428a<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/doc/rfc1950.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/doc/rfc1950.txt</a></div><div class='hunk'>@@ -0,0 +1,619 @@</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Network Working Group                                         P. Deutsch</div><div class='add'>+Request for Comments: 1950                           Aladdin Enterprises</div><div class='add'>+Category: Informational                                      J-L. Gailly</div><div class='add'>+                                                                Info-ZIP</div><div class='add'>+                                                                May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+         ZLIB Compressed Data Format Specification version 3.3</div><div class='add'>+</div><div class='add'>+Status of This Memo</div><div class='add'>+</div><div class='add'>+   This memo provides information for the Internet community.  This memo</div><div class='add'>+   does not specify an Internet standard of any kind.  Distribution of</div><div class='add'>+   this memo is unlimited.</div><div class='add'>+</div><div class='add'>+IESG Note:</div><div class='add'>+</div><div class='add'>+   The IESG takes no position on the validity of any Intellectual</div><div class='add'>+   Property Rights statements contained in this document.</div><div class='add'>+</div><div class='add'>+Notices</div><div class='add'>+</div><div class='add'>+   Copyright (c) 1996 L. Peter Deutsch and Jean-Loup Gailly</div><div class='add'>+</div><div class='add'>+   Permission is granted to copy and distribute this document for any</div><div class='add'>+   purpose and without charge, including translations into other</div><div class='add'>+   languages and incorporation into compilations, provided that the</div><div class='add'>+   copyright notice and this notice are preserved, and that any</div><div class='add'>+   substantive changes or deletions from the original are clearly</div><div class='add'>+   marked.</div><div class='add'>+</div><div class='add'>+   A pointer to the latest version of this and related documentation in</div><div class='add'>+   HTML format can be found at the URL</div><div class='add'>+   &lt;ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html&gt;.</div><div class='add'>+</div><div class='add'>+Abstract</div><div class='add'>+</div><div class='add'>+   This specification defines a lossless compressed data format.  The</div><div class='add'>+   data can be produced or consumed, even for an arbitrarily long</div><div class='add'>+   sequentially presented input data stream, using only an a priori</div><div class='add'>+   bounded amount of intermediate storage.  The format presently uses</div><div class='add'>+   the DEFLATE compression method but can be easily extended to use</div><div class='add'>+   other compression methods.  It can be implemented readily in a manner</div><div class='add'>+   not covered by patents.  This specification also defines the ADLER-32</div><div class='add'>+   checksum (an extension and improvement of the Fletcher checksum),</div><div class='add'>+   used for detection of data corruption, and provides an algorithm for</div><div class='add'>+   computing it.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch &amp; Gailly             Informational                      [Page 1]</div><div class='add'>+</div><div class='add'>+RFC 1950       ZLIB Compressed Data Format Specification        May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Table of Contents</div><div class='add'>+</div><div class='add'>+   1. Introduction ................................................... 2</div><div class='add'>+      1.1. Purpose ................................................... 2</div><div class='add'>+      1.2. Intended audience ......................................... 3</div><div class='add'>+      1.3. Scope ..................................................... 3</div><div class='add'>+      1.4. Compliance ................................................ 3</div><div class='add'>+      1.5.  Definitions of terms and conventions used ................ 3</div><div class='add'>+      1.6. Changes from previous versions ............................ 3</div><div class='add'>+   2. Detailed specification ......................................... 3</div><div class='add'>+      2.1. Overall conventions ....................................... 3</div><div class='add'>+      2.2. Data format ............................................... 4</div><div class='add'>+      2.3. Compliance ................................................ 7</div><div class='add'>+   3. References ..................................................... 7</div><div class='add'>+   4. Source code .................................................... 8</div><div class='add'>+   5. Security Considerations ........................................ 8</div><div class='add'>+   6. Acknowledgements ............................................... 8</div><div class='add'>+   7. Authors' Addresses ............................................. 8</div><div class='add'>+   8. Appendix: Rationale ............................................ 9</div><div class='add'>+   9. Appendix: Sample code ..........................................10</div><div class='add'>+</div><div class='add'>+1. Introduction</div><div class='add'>+</div><div class='add'>+   1.1. Purpose</div><div class='add'>+</div><div class='add'>+      The purpose of this specification is to define a lossless</div><div class='add'>+      compressed data format that:</div><div class='add'>+</div><div class='add'>+          * Is independent of CPU type, operating system, file system,</div><div class='add'>+            and character set, and hence can be used for interchange;</div><div class='add'>+</div><div class='add'>+          * Can be produced or consumed, even for an arbitrarily long</div><div class='add'>+            sequentially presented input data stream, using only an a</div><div class='add'>+            priori bounded amount of intermediate storage, and hence can</div><div class='add'>+            be used in data communications or similar structures such as</div><div class='add'>+            Unix filters;</div><div class='add'>+</div><div class='add'>+          * Can use a number of different compression methods;</div><div class='add'>+</div><div class='add'>+          * Can be implemented readily in a manner not covered by</div><div class='add'>+            patents, and hence can be practiced freely.</div><div class='add'>+</div><div class='add'>+      The data format defined by this specification does not attempt to</div><div class='add'>+      allow random access to compressed data.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch &amp; Gailly             Informational                      [Page 2]</div><div class='add'>+</div><div class='add'>+RFC 1950       ZLIB Compressed Data Format Specification        May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+   1.2. Intended audience</div><div class='add'>+</div><div class='add'>+      This specification is intended for use by implementors of software</div><div class='add'>+      to compress data into zlib format and/or decompress data from zlib</div><div class='add'>+      format.</div><div class='add'>+</div><div class='add'>+      The text of the specification assumes a basic background in</div><div class='add'>+      programming at the level of bits and other primitive data</div><div class='add'>+      representations.</div><div class='add'>+</div><div class='add'>+   1.3. Scope</div><div class='add'>+</div><div class='add'>+      The specification specifies a compressed data format that can be</div><div class='add'>+      used for in-memory compression of a sequence of arbitrary bytes.</div><div class='add'>+</div><div class='add'>+   1.4. Compliance</div><div class='add'>+</div><div class='add'>+      Unless otherwise indicated below, a compliant decompressor must be</div><div class='add'>+      able to accept and decompress any data set that conforms to all</div><div class='add'>+      the specifications presented here; a compliant compressor must</div><div class='add'>+      produce data sets that conform to all the specifications presented</div><div class='add'>+      here.</div><div class='add'>+</div><div class='add'>+   1.5.  Definitions of terms and conventions used</div><div class='add'>+</div><div class='add'>+      byte: 8 bits stored or transmitted as a unit (same as an octet).</div><div class='add'>+      (For this specification, a byte is exactly 8 bits, even on</div><div class='add'>+      machines which store a character on a number of bits different</div><div class='add'>+      from 8.) See below, for the numbering of bits within a byte.</div><div class='add'>+</div><div class='add'>+   1.6. Changes from previous versions</div><div class='add'>+</div><div class='add'>+      Version 3.1 was the first public release of this specification.</div><div class='add'>+      In version 3.2, some terminology was changed and the Adler-32</div><div class='add'>+      sample code was rewritten for clarity.  In version 3.3, the</div><div class='add'>+      support for a preset dictionary was introduced, and the</div><div class='add'>+      specification was converted to RFC style.</div><div class='add'>+</div><div class='add'>+2. Detailed specification</div><div class='add'>+</div><div class='add'>+   2.1. Overall conventions</div><div class='add'>+</div><div class='add'>+      In the diagrams below, a box like this:</div><div class='add'>+</div><div class='add'>+         +---+</div><div class='add'>+         |   | &lt;-- the vertical bars might be missing</div><div class='add'>+         +---+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch &amp; Gailly             Informational                      [Page 3]</div><div class='add'>+</div><div class='add'>+RFC 1950       ZLIB Compressed Data Format Specification        May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+      represents one byte; a box like this:</div><div class='add'>+</div><div class='add'>+         +==============+</div><div class='add'>+         |              |</div><div class='add'>+         +==============+</div><div class='add'>+</div><div class='add'>+      represents a variable number of bytes.</div><div class='add'>+</div><div class='add'>+      Bytes stored within a computer do not have a "bit order", since</div><div class='add'>+      they are always treated as a unit.  However, a byte considered as</div><div class='add'>+      an integer between 0 and 255 does have a most- and least-</div><div class='add'>+      significant bit, and since we write numbers with the most-</div><div class='add'>+      significant digit on the left, we also write bytes with the most-</div><div class='add'>+      significant bit on the left.  In the diagrams below, we number the</div><div class='add'>+      bits of a byte so that bit 0 is the least-significant bit, i.e.,</div><div class='add'>+      the bits are numbered:</div><div class='add'>+</div><div class='add'>+         +--------+</div><div class='add'>+         |76543210|</div><div class='add'>+         +--------+</div><div class='add'>+</div><div class='add'>+      Within a computer, a number may occupy multiple bytes.  All</div><div class='add'>+      multi-byte numbers in the format described here are stored with</div><div class='add'>+      the MOST-significant byte first (at the lower memory address).</div><div class='add'>+      For example, the decimal number 520 is stored as:</div><div class='add'>+</div><div class='add'>+             0     1</div><div class='add'>+         +--------+--------+</div><div class='add'>+         |00000010|00001000|</div><div class='add'>+         +--------+--------+</div><div class='add'>+          ^        ^</div><div class='add'>+          |        |</div><div class='add'>+          |        + less significant byte = 8</div><div class='add'>+          + more significant byte = 2 x 256</div><div class='add'>+</div><div class='add'>+   2.2. Data format</div><div class='add'>+</div><div class='add'>+      A zlib stream has the following structure:</div><div class='add'>+</div><div class='add'>+           0   1</div><div class='add'>+         +---+---+</div><div class='add'>+         |CMF|FLG|   (more--&gt;)</div><div class='add'>+         +---+---+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch &amp; Gailly             Informational                      [Page 4]</div><div class='add'>+</div><div class='add'>+RFC 1950       ZLIB Compressed Data Format Specification        May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+      (if FLG.FDICT set)</div><div class='add'>+</div><div class='add'>+           0   1   2   3</div><div class='add'>+         +---+---+---+---+</div><div class='add'>+         |     DICTID    |   (more--&gt;)</div><div class='add'>+         +---+---+---+---+</div><div class='add'>+</div><div class='add'>+         +=====================+---+---+---+---+</div><div class='add'>+         |...compressed data...|    ADLER32    |</div><div class='add'>+         +=====================+---+---+---+---+</div><div class='add'>+</div><div class='add'>+      Any data which may appear after ADLER32 are not part of the zlib</div><div class='add'>+      stream.</div><div class='add'>+</div><div class='add'>+      CMF (Compression Method and flags)</div><div class='add'>+         This byte is divided into a 4-bit compression method and a 4-</div><div class='add'>+         bit information field depending on the compression method.</div><div class='add'>+</div><div class='add'>+            bits 0 to 3  CM     Compression method</div><div class='add'>+            bits 4 to 7  CINFO  Compression info</div><div class='add'>+</div><div class='add'>+      CM (Compression method)</div><div class='add'>+         This identifies the compression method used in the file. CM = 8</div><div class='add'>+         denotes the "deflate" compression method with a window size up</div><div class='add'>+         to 32K.  This is the method used by gzip and PNG (see</div><div class='add'>+         references [1] and [2] in Chapter 3, below, for the reference</div><div class='add'>+         documents).  CM = 15 is reserved.  It might be used in a future</div><div class='add'>+         version of this specification to indicate the presence of an</div><div class='add'>+         extra field before the compressed data.</div><div class='add'>+</div><div class='add'>+      CINFO (Compression info)</div><div class='add'>+         For CM = 8, CINFO is the base-2 logarithm of the LZ77 window</div><div class='add'>+         size, minus eight (CINFO=7 indicates a 32K window size). Values</div><div class='add'>+         of CINFO above 7 are not allowed in this version of the</div><div class='add'>+         specification.  CINFO is not defined in this specification for</div><div class='add'>+         CM not equal to 8.</div><div class='add'>+</div><div class='add'>+      FLG (FLaGs)</div><div class='add'>+         This flag byte is divided as follows:</div><div class='add'>+</div><div class='add'>+            bits 0 to 4  FCHECK  (check bits for CMF and FLG)</div><div class='add'>+            bit  5       FDICT   (preset dictionary)</div><div class='add'>+            bits 6 to 7  FLEVEL  (compression level)</div><div class='add'>+</div><div class='add'>+         The FCHECK value must be such that CMF and FLG, when viewed as</div><div class='add'>+         a 16-bit unsigned integer stored in MSB order (CMF*256 + FLG),</div><div class='add'>+         is a multiple of 31.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch &amp; Gailly             Informational                      [Page 5]</div><div class='add'>+</div><div class='add'>+RFC 1950       ZLIB Compressed Data Format Specification        May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+      FDICT (Preset dictionary)</div><div class='add'>+         If FDICT is set, a DICT dictionary identifier is present</div><div class='add'>+         immediately after the FLG byte. The dictionary is a sequence of</div><div class='add'>+         bytes which are initially fed to the compressor without</div><div class='add'>+         producing any compressed output. DICT is the Adler-32 checksum</div><div class='add'>+         of this sequence of bytes (see the definition of ADLER32</div><div class='add'>+         below).  The decompressor can use this identifier to determine</div><div class='add'>+         which dictionary has been used by the compressor.</div><div class='add'>+</div><div class='add'>+      FLEVEL (Compression level)</div><div class='add'>+         These flags are available for use by specific compression</div><div class='add'>+         methods.  The "deflate" method (CM = 8) sets these flags as</div><div class='add'>+         follows:</div><div class='add'>+</div><div class='add'>+            0 - compressor used fastest algorithm</div><div class='add'>+            1 - compressor used fast algorithm</div><div class='add'>+            2 - compressor used default algorithm</div><div class='add'>+            3 - compressor used maximum compression, slowest algorithm</div><div class='add'>+</div><div class='add'>+         The information in FLEVEL is not needed for decompression; it</div><div class='add'>+         is there to indicate if recompression might be worthwhile.</div><div class='add'>+</div><div class='add'>+      compressed data</div><div class='add'>+         For compression method 8, the compressed data is stored in the</div><div class='add'>+         deflate compressed data format as described in the document</div><div class='add'>+         "DEFLATE Compressed Data Format Specification" by L. Peter</div><div class='add'>+         Deutsch. (See reference [3] in Chapter 3, below)</div><div class='add'>+</div><div class='add'>+         Other compressed data formats are not specified in this version</div><div class='add'>+         of the zlib specification.</div><div class='add'>+</div><div class='add'>+      ADLER32 (Adler-32 checksum)</div><div class='add'>+         This contains a checksum value of the uncompressed data</div><div class='add'>+         (excluding any dictionary data) computed according to Adler-32</div><div class='add'>+         algorithm. This algorithm is a 32-bit extension and improvement</div><div class='add'>+         of the Fletcher algorithm, used in the ITU-T X.224 / ISO 8073</div><div class='add'>+         standard. See references [4] and [5] in Chapter 3, below)</div><div class='add'>+</div><div class='add'>+         Adler-32 is composed of two sums accumulated per byte: s1 is</div><div class='add'>+         the sum of all bytes, s2 is the sum of all s1 values. Both sums</div><div class='add'>+         are done modulo 65521. s1 is initialized to 1, s2 to zero.  The</div><div class='add'>+         Adler-32 checksum is stored as s2*65536 + s1 in most-</div><div class='add'>+         significant-byte first (network) order.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch &amp; Gailly             Informational                      [Page 6]</div><div class='add'>+</div><div class='add'>+RFC 1950       ZLIB Compressed Data Format Specification        May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+   2.3. Compliance</div><div class='add'>+</div><div class='add'>+      A compliant compressor must produce streams with correct CMF, FLG</div><div class='add'>+      and ADLER32, but need not support preset dictionaries.  When the</div><div class='add'>+      zlib data format is used as part of another standard data format,</div><div class='add'>+      the compressor may use only preset dictionaries that are specified</div><div class='add'>+      by this other data format.  If this other format does not use the</div><div class='add'>+      preset dictionary feature, the compressor must not set the FDICT</div><div class='add'>+      flag.</div><div class='add'>+</div><div class='add'>+      A compliant decompressor must check CMF, FLG, and ADLER32, and</div><div class='add'>+      provide an error indication if any of these have incorrect values.</div><div class='add'>+      A compliant decompressor must give an error indication if CM is</div><div class='add'>+      not one of the values defined in this specification (only the</div><div class='add'>+      value 8 is permitted in this version), since another value could</div><div class='add'>+      indicate the presence of new features that would cause subsequent</div><div class='add'>+      data to be interpreted incorrectly.  A compliant decompressor must</div><div class='add'>+      give an error indication if FDICT is set and DICTID is not the</div><div class='add'>+      identifier of a known preset dictionary.  A decompressor may</div><div class='add'>+      ignore FLEVEL and still be compliant.  When the zlib data format</div><div class='add'>+      is being used as a part of another standard format, a compliant</div><div class='add'>+      decompressor must support all the preset dictionaries specified by</div><div class='add'>+      the other format. When the other format does not use the preset</div><div class='add'>+      dictionary feature, a compliant decompressor must reject any</div><div class='add'>+      stream in which the FDICT flag is set.</div><div class='add'>+</div><div class='add'>+3. References</div><div class='add'>+</div><div class='add'>+   [1] Deutsch, L.P.,"GZIP Compressed Data Format Specification",</div><div class='add'>+       available in ftp://ftp.uu.net/pub/archiving/zip/doc/</div><div class='add'>+</div><div class='add'>+   [2] Thomas Boutell, "PNG (Portable Network Graphics) specification",</div><div class='add'>+       available in ftp://ftp.uu.net/graphics/png/documents/</div><div class='add'>+</div><div class='add'>+   [3] Deutsch, L.P.,"DEFLATE Compressed Data Format Specification",</div><div class='add'>+       available in ftp://ftp.uu.net/pub/archiving/zip/doc/</div><div class='add'>+</div><div class='add'>+   [4] Fletcher, J. G., "An Arithmetic Checksum for Serial</div><div class='add'>+       Transmissions," IEEE Transactions on Communications, Vol. COM-30,</div><div class='add'>+       No. 1, January 1982, pp. 247-252.</div><div class='add'>+</div><div class='add'>+   [5] ITU-T Recommendation X.224, Annex D, "Checksum Algorithms,"</div><div class='add'>+       November, 1993, pp. 144, 145. (Available from</div><div class='add'>+       gopher://info.itu.ch). ITU-T X.244 is also the same as ISO 8073.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch &amp; Gailly             Informational                      [Page 7]</div><div class='add'>+</div><div class='add'>+RFC 1950       ZLIB Compressed Data Format Specification        May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+4. Source code</div><div class='add'>+</div><div class='add'>+   Source code for a C language implementation of a "zlib" compliant</div><div class='add'>+   library is available at ftp://ftp.uu.net/pub/archiving/zip/zlib/.</div><div class='add'>+</div><div class='add'>+5. Security Considerations</div><div class='add'>+</div><div class='add'>+   A decoder that fails to check the ADLER32 checksum value may be</div><div class='add'>+   subject to undetected data corruption.</div><div class='add'>+</div><div class='add'>+6. Acknowledgements</div><div class='add'>+</div><div class='add'>+   Trademarks cited in this document are the property of their</div><div class='add'>+   respective owners.</div><div class='add'>+</div><div class='add'>+   Jean-Loup Gailly and Mark Adler designed the zlib format and wrote</div><div class='add'>+   the related software described in this specification.  Glenn</div><div class='add'>+   Randers-Pehrson converted this document to RFC and HTML format.</div><div class='add'>+</div><div class='add'>+7. Authors' Addresses</div><div class='add'>+</div><div class='add'>+   L. Peter Deutsch</div><div class='add'>+   Aladdin Enterprises</div><div class='add'>+   203 Santa Margarita Ave.</div><div class='add'>+   Menlo Park, CA 94025</div><div class='add'>+</div><div class='add'>+   Phone: (415) 322-0103 (AM only)</div><div class='add'>+   FAX:   (415) 322-1734</div><div class='add'>+   EMail: &lt;ghost@aladdin.com&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+   Jean-Loup Gailly</div><div class='add'>+</div><div class='add'>+   EMail: &lt;gzip@prep.ai.mit.edu&gt;</div><div class='add'>+</div><div class='add'>+   Questions about the technical content of this specification can be</div><div class='add'>+   sent by email to</div><div class='add'>+</div><div class='add'>+   Jean-Loup Gailly &lt;gzip@prep.ai.mit.edu&gt; and</div><div class='add'>+   Mark Adler &lt;madler@alumni.caltech.edu&gt;</div><div class='add'>+</div><div class='add'>+   Editorial comments on this specification can be sent by email to</div><div class='add'>+</div><div class='add'>+   L. Peter Deutsch &lt;ghost@aladdin.com&gt; and</div><div class='add'>+   Glenn Randers-Pehrson &lt;randeg@alumni.rpi.edu&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch &amp; Gailly             Informational                      [Page 8]</div><div class='add'>+</div><div class='add'>+RFC 1950       ZLIB Compressed Data Format Specification        May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+8. Appendix: Rationale</div><div class='add'>+</div><div class='add'>+   8.1. Preset dictionaries</div><div class='add'>+</div><div class='add'>+      A preset dictionary is specially useful to compress short input</div><div class='add'>+      sequences. The compressor can take advantage of the dictionary</div><div class='add'>+      context to encode the input in a more compact manner. The</div><div class='add'>+      decompressor can be initialized with the appropriate context by</div><div class='add'>+      virtually decompressing a compressed version of the dictionary</div><div class='add'>+      without producing any output. However for certain compression</div><div class='add'>+      algorithms such as the deflate algorithm this operation can be</div><div class='add'>+      achieved without actually performing any decompression.</div><div class='add'>+</div><div class='add'>+      The compressor and the decompressor must use exactly the same</div><div class='add'>+      dictionary. The dictionary may be fixed or may be chosen among a</div><div class='add'>+      certain number of predefined dictionaries, according to the kind</div><div class='add'>+      of input data. The decompressor can determine which dictionary has</div><div class='add'>+      been chosen by the compressor by checking the dictionary</div><div class='add'>+      identifier. This document does not specify the contents of</div><div class='add'>+      predefined dictionaries, since the optimal dictionaries are</div><div class='add'>+      application specific. Standard data formats using this feature of</div><div class='add'>+      the zlib specification must precisely define the allowed</div><div class='add'>+      dictionaries.</div><div class='add'>+</div><div class='add'>+   8.2. The Adler-32 algorithm</div><div class='add'>+</div><div class='add'>+      The Adler-32 algorithm is much faster than the CRC32 algorithm yet</div><div class='add'>+      still provides an extremely low probability of undetected errors.</div><div class='add'>+</div><div class='add'>+      The modulo on unsigned long accumulators can be delayed for 5552</div><div class='add'>+      bytes, so the modulo operation time is negligible.  If the bytes</div><div class='add'>+      are a, b, c, the second sum is 3a + 2b + c + 3, and so is position</div><div class='add'>+      and order sensitive, unlike the first sum, which is just a</div><div class='add'>+      checksum.  That 65521 is prime is important to avoid a possible</div><div class='add'>+      large class of two-byte errors that leave the check unchanged.</div><div class='add'>+      (The Fletcher checksum uses 255, which is not prime and which also</div><div class='add'>+      makes the Fletcher check insensitive to single byte changes 0 &lt;-&gt;</div><div class='add'>+      255.)</div><div class='add'>+</div><div class='add'>+      The sum s1 is initialized to 1 instead of zero to make the length</div><div class='add'>+      of the sequence part of s2, so that the length does not have to be</div><div class='add'>+      checked separately. (Any sequence of zeroes has a Fletcher</div><div class='add'>+      checksum of zero.)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch &amp; Gailly             Informational                      [Page 9]</div><div class='add'>+</div><div class='add'>+RFC 1950       ZLIB Compressed Data Format Specification        May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+9. Appendix: Sample code</div><div class='add'>+</div><div class='add'>+   The following C code computes the Adler-32 checksum of a data buffer.</div><div class='add'>+   It is written for clarity, not for speed.  The sample code is in the</div><div class='add'>+   ANSI C programming language. Non C users may find it easier to read</div><div class='add'>+   with these hints:</div><div class='add'>+</div><div class='add'>+      &amp;      Bitwise AND operator.</div><div class='add'>+      &gt;&gt;     Bitwise right shift operator. When applied to an</div><div class='add'>+             unsigned quantity, as here, right shift inserts zero bit(s)</div><div class='add'>+             at the left.</div><div class='add'>+      &lt;&lt;     Bitwise left shift operator. Left shift inserts zero</div><div class='add'>+             bit(s) at the right.</div><div class='add'>+      ++     "n++" increments the variable n.</div><div class='add'>+      %      modulo operator: a % b is the remainder of a divided by b.</div><div class='add'>+</div><div class='add'>+      #define BASE 65521 /* largest prime smaller than 65536 */</div><div class='add'>+</div><div class='add'>+      /*</div><div class='add'>+         Update a running Adler-32 checksum with the bytes buf[0..len-1]</div><div class='add'>+       and return the updated checksum. The Adler-32 checksum should be</div><div class='add'>+       initialized to 1.</div><div class='add'>+</div><div class='add'>+       Usage example:</div><div class='add'>+</div><div class='add'>+         unsigned long adler = 1L;</div><div class='add'>+</div><div class='add'>+         while (read_buffer(buffer, length) != EOF) {</div><div class='add'>+           adler = update_adler32(adler, buffer, length);</div><div class='add'>+         }</div><div class='add'>+         if (adler != original_adler) error();</div><div class='add'>+      */</div><div class='add'>+      unsigned long update_adler32(unsigned long adler,</div><div class='add'>+         unsigned char *buf, int len)</div><div class='add'>+      {</div><div class='add'>+        unsigned long s1 = adler &amp; 0xffff;</div><div class='add'>+        unsigned long s2 = (adler &gt;&gt; 16) &amp; 0xffff;</div><div class='add'>+        int n;</div><div class='add'>+</div><div class='add'>+        for (n = 0; n &lt; len; n++) {</div><div class='add'>+          s1 = (s1 + buf[n]) % BASE;</div><div class='add'>+          s2 = (s2 + s1)     % BASE;</div><div class='add'>+        }</div><div class='add'>+        return (s2 &lt;&lt; 16) + s1;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* Return the adler32 of the bytes buf[0..len-1] */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch &amp; Gailly             Informational                     [Page 10]</div><div class='add'>+</div><div class='add'>+RFC 1950       ZLIB Compressed Data Format Specification        May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+      unsigned long adler32(unsigned char *buf, int len)</div><div class='add'>+      {</div><div class='add'>+        return update_adler32(1L, buf, len);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch &amp; Gailly             Informational                     [Page 11]</div><div class='add'>+</div><div class='head'>diff --git a/src/3rdparty/zlib/doc/rfc1951.txt b/src/3rdparty/zlib/doc/rfc1951.txt<br/>new file mode 100644<br/>index 0000000..403c8c7<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/doc/rfc1951.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/doc/rfc1951.txt</a></div><div class='hunk'>@@ -0,0 +1,955 @@</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Network Working Group                                         P. Deutsch</div><div class='add'>+Request for Comments: 1951                           Aladdin Enterprises</div><div class='add'>+Category: Informational                                         May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+        DEFLATE Compressed Data Format Specification version 1.3</div><div class='add'>+</div><div class='add'>+Status of This Memo</div><div class='add'>+</div><div class='add'>+   This memo provides information for the Internet community.  This memo</div><div class='add'>+   does not specify an Internet standard of any kind.  Distribution of</div><div class='add'>+   this memo is unlimited.</div><div class='add'>+</div><div class='add'>+IESG Note:</div><div class='add'>+</div><div class='add'>+   The IESG takes no position on the validity of any Intellectual</div><div class='add'>+   Property Rights statements contained in this document.</div><div class='add'>+</div><div class='add'>+Notices</div><div class='add'>+</div><div class='add'>+   Copyright (c) 1996 L. Peter Deutsch</div><div class='add'>+</div><div class='add'>+   Permission is granted to copy and distribute this document for any</div><div class='add'>+   purpose and without charge, including translations into other</div><div class='add'>+   languages and incorporation into compilations, provided that the</div><div class='add'>+   copyright notice and this notice are preserved, and that any</div><div class='add'>+   substantive changes or deletions from the original are clearly</div><div class='add'>+   marked.</div><div class='add'>+</div><div class='add'>+   A pointer to the latest version of this and related documentation in</div><div class='add'>+   HTML format can be found at the URL</div><div class='add'>+   &lt;ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html&gt;.</div><div class='add'>+</div><div class='add'>+Abstract</div><div class='add'>+</div><div class='add'>+   This specification defines a lossless compressed data format that</div><div class='add'>+   compresses data using a combination of the LZ77 algorithm and Huffman</div><div class='add'>+   coding, with efficiency comparable to the best currently available</div><div class='add'>+   general-purpose compression methods.  The data can be produced or</div><div class='add'>+   consumed, even for an arbitrarily long sequentially presented input</div><div class='add'>+   data stream, using only an a priori bounded amount of intermediate</div><div class='add'>+   storage.  The format can be implemented readily in a manner not</div><div class='add'>+   covered by patents.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 1]</div><div class='add'>+</div><div class='add'>+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Table of Contents</div><div class='add'>+</div><div class='add'>+   1. Introduction ................................................... 2</div><div class='add'>+      1.1. Purpose ................................................... 2</div><div class='add'>+      1.2. Intended audience ......................................... 3</div><div class='add'>+      1.3. Scope ..................................................... 3</div><div class='add'>+      1.4. Compliance ................................................ 3</div><div class='add'>+      1.5.  Definitions of terms and conventions used ................ 3</div><div class='add'>+      1.6. Changes from previous versions ............................ 4</div><div class='add'>+   2. Compressed representation overview ............................. 4</div><div class='add'>+   3. Detailed specification ......................................... 5</div><div class='add'>+      3.1. Overall conventions ....................................... 5</div><div class='add'>+          3.1.1. Packing into bytes .................................. 5</div><div class='add'>+      3.2. Compressed block format ................................... 6</div><div class='add'>+          3.2.1. Synopsis of prefix and Huffman coding ............... 6</div><div class='add'>+          3.2.2. Use of Huffman coding in the "deflate" format ....... 7</div><div class='add'>+          3.2.3. Details of block format ............................. 9</div><div class='add'>+          3.2.4. Non-compressed blocks (BTYPE=00) ................... 11</div><div class='add'>+          3.2.5. Compressed blocks (length and distance codes) ...... 11</div><div class='add'>+          3.2.6. Compression with fixed Huffman codes (BTYPE=01) .... 12</div><div class='add'>+          3.2.7. Compression with dynamic Huffman codes (BTYPE=10) .. 13</div><div class='add'>+      3.3. Compliance ............................................... 14</div><div class='add'>+   4. Compression algorithm details ................................. 14</div><div class='add'>+   5. References .................................................... 16</div><div class='add'>+   6. Security Considerations ....................................... 16</div><div class='add'>+   7. Source code ................................................... 16</div><div class='add'>+   8. Acknowledgements .............................................. 16</div><div class='add'>+   9. Author's Address .............................................. 17</div><div class='add'>+</div><div class='add'>+1. Introduction</div><div class='add'>+</div><div class='add'>+   1.1. Purpose</div><div class='add'>+</div><div class='add'>+      The purpose of this specification is to define a lossless</div><div class='add'>+      compressed data format that:</div><div class='add'>+          * Is independent of CPU type, operating system, file system,</div><div class='add'>+            and character set, and hence can be used for interchange;</div><div class='add'>+          * Can be produced or consumed, even for an arbitrarily long</div><div class='add'>+            sequentially presented input data stream, using only an a</div><div class='add'>+            priori bounded amount of intermediate storage, and hence</div><div class='add'>+            can be used in data communications or similar structures</div><div class='add'>+            such as Unix filters;</div><div class='add'>+          * Compresses data with efficiency comparable to the best</div><div class='add'>+            currently available general-purpose compression methods,</div><div class='add'>+            and in particular considerably better than the "compress"</div><div class='add'>+            program;</div><div class='add'>+          * Can be implemented readily in a manner not covered by</div><div class='add'>+            patents, and hence can be practiced freely;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 2]</div><div class='add'>+</div><div class='add'>+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+          * Is compatible with the file format produced by the current</div><div class='add'>+            widely used gzip utility, in that conforming decompressors</div><div class='add'>+            will be able to read data produced by the existing gzip</div><div class='add'>+            compressor.</div><div class='add'>+</div><div class='add'>+      The data format defined by this specification does not attempt to:</div><div class='add'>+</div><div class='add'>+          * Allow random access to compressed data;</div><div class='add'>+          * Compress specialized data (e.g., raster graphics) as well</div><div class='add'>+            as the best currently available specialized algorithms.</div><div class='add'>+</div><div class='add'>+      A simple counting argument shows that no lossless compression</div><div class='add'>+      algorithm can compress every possible input data set.  For the</div><div class='add'>+      format defined here, the worst case expansion is 5 bytes per 32K-</div><div class='add'>+      byte block, i.e., a size increase of 0.015% for large data sets.</div><div class='add'>+      English text usually compresses by a factor of 2.5 to 3;</div><div class='add'>+      executable files usually compress somewhat less; graphical data</div><div class='add'>+      such as raster images may compress much more.</div><div class='add'>+</div><div class='add'>+   1.2. Intended audience</div><div class='add'>+</div><div class='add'>+      This specification is intended for use by implementors of software</div><div class='add'>+      to compress data into "deflate" format and/or decompress data from</div><div class='add'>+      "deflate" format.</div><div class='add'>+</div><div class='add'>+      The text of the specification assumes a basic background in</div><div class='add'>+      programming at the level of bits and other primitive data</div><div class='add'>+      representations.  Familiarity with the technique of Huffman coding</div><div class='add'>+      is helpful but not required.</div><div class='add'>+</div><div class='add'>+   1.3. Scope</div><div class='add'>+</div><div class='add'>+      The specification specifies a method for representing a sequence</div><div class='add'>+      of bytes as a (usually shorter) sequence of bits, and a method for</div><div class='add'>+      packing the latter bit sequence into bytes.</div><div class='add'>+</div><div class='add'>+   1.4. Compliance</div><div class='add'>+</div><div class='add'>+      Unless otherwise indicated below, a compliant decompressor must be</div><div class='add'>+      able to accept and decompress any data set that conforms to all</div><div class='add'>+      the specifications presented here; a compliant compressor must</div><div class='add'>+      produce data sets that conform to all the specifications presented</div><div class='add'>+      here.</div><div class='add'>+</div><div class='add'>+   1.5.  Definitions of terms and conventions used</div><div class='add'>+</div><div class='add'>+      Byte: 8 bits stored or transmitted as a unit (same as an octet).</div><div class='add'>+      For this specification, a byte is exactly 8 bits, even on machines</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 3]</div><div class='add'>+</div><div class='add'>+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+      which store a character on a number of bits different from eight.</div><div class='add'>+      See below, for the numbering of bits within a byte.</div><div class='add'>+</div><div class='add'>+      String: a sequence of arbitrary bytes.</div><div class='add'>+</div><div class='add'>+   1.6. Changes from previous versions</div><div class='add'>+</div><div class='add'>+      There have been no technical changes to the deflate format since</div><div class='add'>+      version 1.1 of this specification.  In version 1.2, some</div><div class='add'>+      terminology was changed.  Version 1.3 is a conversion of the</div><div class='add'>+      specification to RFC style.</div><div class='add'>+</div><div class='add'>+2. Compressed representation overview</div><div class='add'>+</div><div class='add'>+   A compressed data set consists of a series of blocks, corresponding</div><div class='add'>+   to successive blocks of input data.  The block sizes are arbitrary,</div><div class='add'>+   except that non-compressible blocks are limited to 65,535 bytes.</div><div class='add'>+</div><div class='add'>+   Each block is compressed using a combination of the LZ77 algorithm</div><div class='add'>+   and Huffman coding. The Huffman trees for each block are independent</div><div class='add'>+   of those for previous or subsequent blocks; the LZ77 algorithm may</div><div class='add'>+   use a reference to a duplicated string occurring in a previous block,</div><div class='add'>+   up to 32K input bytes before.</div><div class='add'>+</div><div class='add'>+   Each block consists of two parts: a pair of Huffman code trees that</div><div class='add'>+   describe the representation of the compressed data part, and a</div><div class='add'>+   compressed data part.  (The Huffman trees themselves are compressed</div><div class='add'>+   using Huffman encoding.)  The compressed data consists of a series of</div><div class='add'>+   elements of two types: literal bytes (of strings that have not been</div><div class='add'>+   detected as duplicated within the previous 32K input bytes), and</div><div class='add'>+   pointers to duplicated strings, where a pointer is represented as a</div><div class='add'>+   pair &lt;length, backward distance&gt;.  The representation used in the</div><div class='add'>+   "deflate" format limits distances to 32K bytes and lengths to 258</div><div class='add'>+   bytes, but does not limit the size of a block, except for</div><div class='add'>+   uncompressible blocks, which are limited as noted above.</div><div class='add'>+</div><div class='add'>+   Each type of value (literals, distances, and lengths) in the</div><div class='add'>+   compressed data is represented using a Huffman code, using one code</div><div class='add'>+   tree for literals and lengths and a separate code tree for distances.</div><div class='add'>+   The code trees for each block appear in a compact form just before</div><div class='add'>+   the compressed data for that block.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 4]</div><div class='add'>+</div><div class='add'>+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+3. Detailed specification</div><div class='add'>+</div><div class='add'>+   3.1. Overall conventions In the diagrams below, a box like this:</div><div class='add'>+</div><div class='add'>+         +---+</div><div class='add'>+         |   | &lt;-- the vertical bars might be missing</div><div class='add'>+         +---+</div><div class='add'>+</div><div class='add'>+      represents one byte; a box like this:</div><div class='add'>+</div><div class='add'>+         +==============+</div><div class='add'>+         |              |</div><div class='add'>+         +==============+</div><div class='add'>+</div><div class='add'>+      represents a variable number of bytes.</div><div class='add'>+</div><div class='add'>+      Bytes stored within a computer do not have a "bit order", since</div><div class='add'>+      they are always treated as a unit.  However, a byte considered as</div><div class='add'>+      an integer between 0 and 255 does have a most- and least-</div><div class='add'>+      significant bit, and since we write numbers with the most-</div><div class='add'>+      significant digit on the left, we also write bytes with the most-</div><div class='add'>+      significant bit on the left.  In the diagrams below, we number the</div><div class='add'>+      bits of a byte so that bit 0 is the least-significant bit, i.e.,</div><div class='add'>+      the bits are numbered:</div><div class='add'>+</div><div class='add'>+         +--------+</div><div class='add'>+         |76543210|</div><div class='add'>+         +--------+</div><div class='add'>+</div><div class='add'>+      Within a computer, a number may occupy multiple bytes.  All</div><div class='add'>+      multi-byte numbers in the format described here are stored with</div><div class='add'>+      the least-significant byte first (at the lower memory address).</div><div class='add'>+      For example, the decimal number 520 is stored as:</div><div class='add'>+</div><div class='add'>+             0        1</div><div class='add'>+         +--------+--------+</div><div class='add'>+         |00001000|00000010|</div><div class='add'>+         +--------+--------+</div><div class='add'>+          ^        ^</div><div class='add'>+          |        |</div><div class='add'>+          |        + more significant byte = 2 x 256</div><div class='add'>+          + less significant byte = 8</div><div class='add'>+</div><div class='add'>+      3.1.1. Packing into bytes</div><div class='add'>+</div><div class='add'>+         This document does not address the issue of the order in which</div><div class='add'>+         bits of a byte are transmitted on a bit-sequential medium,</div><div class='add'>+         since the final data format described here is byte- rather than</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 5]</div><div class='add'>+</div><div class='add'>+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+         bit-oriented.  However, we describe the compressed block format</div><div class='add'>+         in below, as a sequence of data elements of various bit</div><div class='add'>+         lengths, not a sequence of bytes.  We must therefore specify</div><div class='add'>+         how to pack these data elements into bytes to form the final</div><div class='add'>+         compressed byte sequence:</div><div class='add'>+</div><div class='add'>+             * Data elements are packed into bytes in order of</div><div class='add'>+               increasing bit number within the byte, i.e., starting</div><div class='add'>+               with the least-significant bit of the byte.</div><div class='add'>+             * Data elements other than Huffman codes are packed</div><div class='add'>+               starting with the least-significant bit of the data</div><div class='add'>+               element.</div><div class='add'>+             * Huffman codes are packed starting with the most-</div><div class='add'>+               significant bit of the code.</div><div class='add'>+</div><div class='add'>+         In other words, if one were to print out the compressed data as</div><div class='add'>+         a sequence of bytes, starting with the first byte at the</div><div class='add'>+         *right* margin and proceeding to the *left*, with the most-</div><div class='add'>+         significant bit of each byte on the left as usual, one would be</div><div class='add'>+         able to parse the result from right to left, with fixed-width</div><div class='add'>+         elements in the correct MSB-to-LSB order and Huffman codes in</div><div class='add'>+         bit-reversed order (i.e., with the first bit of the code in the</div><div class='add'>+         relative LSB position).</div><div class='add'>+</div><div class='add'>+   3.2. Compressed block format</div><div class='add'>+</div><div class='add'>+      3.2.1. Synopsis of prefix and Huffman coding</div><div class='add'>+</div><div class='add'>+         Prefix coding represents symbols from an a priori known</div><div class='add'>+         alphabet by bit sequences (codes), one code for each symbol, in</div><div class='add'>+         a manner such that different symbols may be represented by bit</div><div class='add'>+         sequences of different lengths, but a parser can always parse</div><div class='add'>+         an encoded string unambiguously symbol-by-symbol.</div><div class='add'>+</div><div class='add'>+         We define a prefix code in terms of a binary tree in which the</div><div class='add'>+         two edges descending from each non-leaf node are labeled 0 and</div><div class='add'>+         1 and in which the leaf nodes correspond one-for-one with (are</div><div class='add'>+         labeled with) the symbols of the alphabet; then the code for a</div><div class='add'>+         symbol is the sequence of 0's and 1's on the edges leading from</div><div class='add'>+         the root to the leaf labeled with that symbol.  For example:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 6]</div><div class='add'>+</div><div class='add'>+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+                          /\              Symbol    Code</div><div class='add'>+                         0  1             ------    ----</div><div class='add'>+                        /    \                A      00</div><div class='add'>+                       /\     B               B       1</div><div class='add'>+                      0  1                    C     011</div><div class='add'>+                     /    \                   D     010</div><div class='add'>+                    A     /\</div><div class='add'>+                         0  1</div><div class='add'>+                        /    \</div><div class='add'>+                       D      C</div><div class='add'>+</div><div class='add'>+         A parser can decode the next symbol from an encoded input</div><div class='add'>+         stream by walking down the tree from the root, at each step</div><div class='add'>+         choosing the edge corresponding to the next input bit.</div><div class='add'>+</div><div class='add'>+         Given an alphabet with known symbol frequencies, the Huffman</div><div class='add'>+         algorithm allows the construction of an optimal prefix code</div><div class='add'>+         (one which represents strings with those symbol frequencies</div><div class='add'>+         using the fewest bits of any possible prefix codes for that</div><div class='add'>+         alphabet).  Such a code is called a Huffman code.  (See</div><div class='add'>+         reference [1] in Chapter 5, references for additional</div><div class='add'>+         information on Huffman codes.)</div><div class='add'>+</div><div class='add'>+         Note that in the "deflate" format, the Huffman codes for the</div><div class='add'>+         various alphabets must not exceed certain maximum code lengths.</div><div class='add'>+         This constraint complicates the algorithm for computing code</div><div class='add'>+         lengths from symbol frequencies.  Again, see Chapter 5,</div><div class='add'>+         references for details.</div><div class='add'>+</div><div class='add'>+      3.2.2. Use of Huffman coding in the "deflate" format</div><div class='add'>+</div><div class='add'>+         The Huffman codes used for each alphabet in the "deflate"</div><div class='add'>+         format have two additional rules:</div><div class='add'>+</div><div class='add'>+             * All codes of a given bit length have lexicographically</div><div class='add'>+               consecutive values, in the same order as the symbols</div><div class='add'>+               they represent;</div><div class='add'>+</div><div class='add'>+             * Shorter codes lexicographically precede longer codes.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 7]</div><div class='add'>+</div><div class='add'>+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+         We could recode the example above to follow this rule as</div><div class='add'>+         follows, assuming that the order of the alphabet is ABCD:</div><div class='add'>+</div><div class='add'>+            Symbol  Code</div><div class='add'>+            ------  ----</div><div class='add'>+            A       10</div><div class='add'>+            B       0</div><div class='add'>+            C       110</div><div class='add'>+            D       111</div><div class='add'>+</div><div class='add'>+         I.e., 0 precedes 10 which precedes 11x, and 110 and 111 are</div><div class='add'>+         lexicographically consecutive.</div><div class='add'>+</div><div class='add'>+         Given this rule, we can define the Huffman code for an alphabet</div><div class='add'>+         just by giving the bit lengths of the codes for each symbol of</div><div class='add'>+         the alphabet in order; this is sufficient to determine the</div><div class='add'>+         actual codes.  In our example, the code is completely defined</div><div class='add'>+         by the sequence of bit lengths (2, 1, 3, 3).  The following</div><div class='add'>+         algorithm generates the codes as integers, intended to be read</div><div class='add'>+         from most- to least-significant bit.  The code lengths are</div><div class='add'>+         initially in tree[I].Len; the codes are produced in</div><div class='add'>+         tree[I].Code.</div><div class='add'>+</div><div class='add'>+         1)  Count the number of codes for each code length.  Let</div><div class='add'>+             bl_count[N] be the number of codes of length N, N &gt;= 1.</div><div class='add'>+</div><div class='add'>+         2)  Find the numerical value of the smallest code for each</div><div class='add'>+             code length:</div><div class='add'>+</div><div class='add'>+                code = 0;</div><div class='add'>+                bl_count[0] = 0;</div><div class='add'>+                for (bits = 1; bits &lt;= MAX_BITS; bits++) {</div><div class='add'>+                    code = (code + bl_count[bits-1]) &lt;&lt; 1;</div><div class='add'>+                    next_code[bits] = code;</div><div class='add'>+                }</div><div class='add'>+</div><div class='add'>+         3)  Assign numerical values to all codes, using consecutive</div><div class='add'>+             values for all codes of the same length with the base</div><div class='add'>+             values determined at step 2. Codes that are never used</div><div class='add'>+             (which have a bit length of zero) must not be assigned a</div><div class='add'>+             value.</div><div class='add'>+</div><div class='add'>+                for (n = 0;  n &lt;= max_code; n++) {</div><div class='add'>+                    len = tree[n].Len;</div><div class='add'>+                    if (len != 0) {</div><div class='add'>+                        tree[n].Code = next_code[len];</div><div class='add'>+                        next_code[len]++;</div><div class='add'>+                    }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 8]</div><div class='add'>+</div><div class='add'>+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+                }</div><div class='add'>+</div><div class='add'>+         Example:</div><div class='add'>+</div><div class='add'>+         Consider the alphabet ABCDEFGH, with bit lengths (3, 3, 3, 3,</div><div class='add'>+         3, 2, 4, 4).  After step 1, we have:</div><div class='add'>+</div><div class='add'>+            N      bl_count[N]</div><div class='add'>+            -      -----------</div><div class='add'>+            2      1</div><div class='add'>+            3      5</div><div class='add'>+            4      2</div><div class='add'>+</div><div class='add'>+         Step 2 computes the following next_code values:</div><div class='add'>+</div><div class='add'>+            N      next_code[N]</div><div class='add'>+            -      ------------</div><div class='add'>+            1      0</div><div class='add'>+            2      0</div><div class='add'>+            3      2</div><div class='add'>+            4      14</div><div class='add'>+</div><div class='add'>+         Step 3 produces the following code values:</div><div class='add'>+</div><div class='add'>+            Symbol Length   Code</div><div class='add'>+            ------ ------   ----</div><div class='add'>+            A       3        010</div><div class='add'>+            B       3        011</div><div class='add'>+            C       3        100</div><div class='add'>+            D       3        101</div><div class='add'>+            E       3        110</div><div class='add'>+            F       2         00</div><div class='add'>+            G       4       1110</div><div class='add'>+            H       4       1111</div><div class='add'>+</div><div class='add'>+      3.2.3. Details of block format</div><div class='add'>+</div><div class='add'>+         Each block of compressed data begins with 3 header bits</div><div class='add'>+         containing the following data:</div><div class='add'>+</div><div class='add'>+            first bit       BFINAL</div><div class='add'>+            next 2 bits     BTYPE</div><div class='add'>+</div><div class='add'>+         Note that the header bits do not necessarily begin on a byte</div><div class='add'>+         boundary, since a block does not necessarily occupy an integral</div><div class='add'>+         number of bytes.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 9]</div><div class='add'>+</div><div class='add'>+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+         BFINAL is set if and only if this is the last block of the data</div><div class='add'>+         set.</div><div class='add'>+</div><div class='add'>+         BTYPE specifies how the data are compressed, as follows:</div><div class='add'>+</div><div class='add'>+            00 - no compression</div><div class='add'>+            01 - compressed with fixed Huffman codes</div><div class='add'>+            10 - compressed with dynamic Huffman codes</div><div class='add'>+            11 - reserved (error)</div><div class='add'>+</div><div class='add'>+         The only difference between the two compressed cases is how the</div><div class='add'>+         Huffman codes for the literal/length and distance alphabets are</div><div class='add'>+         defined.</div><div class='add'>+</div><div class='add'>+         In all cases, the decoding algorithm for the actual data is as</div><div class='add'>+         follows:</div><div class='add'>+</div><div class='add'>+            do</div><div class='add'>+               read block header from input stream.</div><div class='add'>+               if stored with no compression</div><div class='add'>+                  skip any remaining bits in current partially</div><div class='add'>+                     processed byte</div><div class='add'>+                  read LEN and NLEN (see next section)</div><div class='add'>+                  copy LEN bytes of data to output</div><div class='add'>+               otherwise</div><div class='add'>+                  if compressed with dynamic Huffman codes</div><div class='add'>+                     read representation of code trees (see</div><div class='add'>+                        subsection below)</div><div class='add'>+                  loop (until end of block code recognized)</div><div class='add'>+                     decode literal/length value from input stream</div><div class='add'>+                     if value &lt; 256</div><div class='add'>+                        copy value (literal byte) to output stream</div><div class='add'>+                     otherwise</div><div class='add'>+                        if value = end of block (256)</div><div class='add'>+                           break from loop</div><div class='add'>+                        otherwise (value = 257..285)</div><div class='add'>+                           decode distance from input stream</div><div class='add'>+</div><div class='add'>+                           move backwards distance bytes in the output</div><div class='add'>+                           stream, and copy length bytes from this</div><div class='add'>+                           position to the output stream.</div><div class='add'>+                  end loop</div><div class='add'>+            while not last block</div><div class='add'>+</div><div class='add'>+         Note that a duplicated string reference may refer to a string</div><div class='add'>+         in a previous block; i.e., the backward distance may cross one</div><div class='add'>+         or more block boundaries.  However a distance cannot refer past</div><div class='add'>+         the beginning of the output stream.  (An application using a</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                     [Page 10]</div><div class='add'>+</div><div class='add'>+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+         preset dictionary might discard part of the output stream; a</div><div class='add'>+         distance can refer to that part of the output stream anyway)</div><div class='add'>+         Note also that the referenced string may overlap the current</div><div class='add'>+         position; for example, if the last 2 bytes decoded have values</div><div class='add'>+         X and Y, a string reference with &lt;length = 5, distance = 2&gt;</div><div class='add'>+         adds X,Y,X,Y,X to the output stream.</div><div class='add'>+</div><div class='add'>+         We now specify each compression method in turn.</div><div class='add'>+</div><div class='add'>+      3.2.4. Non-compressed blocks (BTYPE=00)</div><div class='add'>+</div><div class='add'>+         Any bits of input up to the next byte boundary are ignored.</div><div class='add'>+         The rest of the block consists of the following information:</div><div class='add'>+</div><div class='add'>+              0   1   2   3   4...</div><div class='add'>+            +---+---+---+---+================================+</div><div class='add'>+            |  LEN  | NLEN  |... LEN bytes of literal data...|</div><div class='add'>+            +---+---+---+---+================================+</div><div class='add'>+</div><div class='add'>+         LEN is the number of data bytes in the block.  NLEN is the</div><div class='add'>+         one's complement of LEN.</div><div class='add'>+</div><div class='add'>+      3.2.5. Compressed blocks (length and distance codes)</div><div class='add'>+</div><div class='add'>+         As noted above, encoded data blocks in the "deflate" format</div><div class='add'>+         consist of sequences of symbols drawn from three conceptually</div><div class='add'>+         distinct alphabets: either literal bytes, from the alphabet of</div><div class='add'>+         byte values (0..255), or &lt;length, backward distance&gt; pairs,</div><div class='add'>+         where the length is drawn from (3..258) and the distance is</div><div class='add'>+         drawn from (1..32,768).  In fact, the literal and length</div><div class='add'>+         alphabets are merged into a single alphabet (0..285), where</div><div class='add'>+         values 0..255 represent literal bytes, the value 256 indicates</div><div class='add'>+         end-of-block, and values 257..285 represent length codes</div><div class='add'>+         (possibly in conjunction with extra bits following the symbol</div><div class='add'>+         code) as follows:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                     [Page 11]</div><div class='add'>+</div><div class='add'>+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+                 Extra               Extra               Extra</div><div class='add'>+            Code Bits Length(s) Code Bits Lengths   Code Bits Length(s)</div><div class='add'>+            ---- ---- ------     ---- ---- -------   ---- ---- -------</div><div class='add'>+             257   0     3       267   1   15,16     277   4   67-82</div><div class='add'>+             258   0     4       268   1   17,18     278   4   83-98</div><div class='add'>+             259   0     5       269   2   19-22     279   4   99-114</div><div class='add'>+             260   0     6       270   2   23-26     280   4  115-130</div><div class='add'>+             261   0     7       271   2   27-30     281   5  131-162</div><div class='add'>+             262   0     8       272   2   31-34     282   5  163-194</div><div class='add'>+             263   0     9       273   3   35-42     283   5  195-226</div><div class='add'>+             264   0    10       274   3   43-50     284   5  227-257</div><div class='add'>+             265   1  11,12      275   3   51-58     285   0    258</div><div class='add'>+             266   1  13,14      276   3   59-66</div><div class='add'>+</div><div class='add'>+         The extra bits should be interpreted as a machine integer</div><div class='add'>+         stored with the most-significant bit first, e.g., bits 1110</div><div class='add'>+         represent the value 14.</div><div class='add'>+</div><div class='add'>+                  Extra           Extra               Extra</div><div class='add'>+             Code Bits Dist  Code Bits   Dist     Code Bits Distance</div><div class='add'>+             ---- ---- ----  ---- ----  ------    ---- ---- --------</div><div class='add'>+               0   0    1     10   4     33-48    20    9   1025-1536</div><div class='add'>+               1   0    2     11   4     49-64    21    9   1537-2048</div><div class='add'>+               2   0    3     12   5     65-96    22   10   2049-3072</div><div class='add'>+               3   0    4     13   5     97-128   23   10   3073-4096</div><div class='add'>+               4   1   5,6    14   6    129-192   24   11   4097-6144</div><div class='add'>+               5   1   7,8    15   6    193-256   25   11   6145-8192</div><div class='add'>+               6   2   9-12   16   7    257-384   26   12  8193-12288</div><div class='add'>+               7   2  13-16   17   7    385-512   27   12 12289-16384</div><div class='add'>+               8   3  17-24   18   8    513-768   28   13 16385-24576</div><div class='add'>+               9   3  25-32   19   8   769-1024   29   13 24577-32768</div><div class='add'>+</div><div class='add'>+      3.2.6. Compression with fixed Huffman codes (BTYPE=01)</div><div class='add'>+</div><div class='add'>+         The Huffman codes for the two alphabets are fixed, and are not</div><div class='add'>+         represented explicitly in the data.  The Huffman code lengths</div><div class='add'>+         for the literal/length alphabet are:</div><div class='add'>+</div><div class='add'>+                   Lit Value    Bits        Codes</div><div class='add'>+                   ---------    ----        -----</div><div class='add'>+                     0 - 143     8          00110000 through</div><div class='add'>+                                            10111111</div><div class='add'>+                   144 - 255     9          110010000 through</div><div class='add'>+                                            111111111</div><div class='add'>+                   256 - 279     7          0000000 through</div><div class='add'>+                                            0010111</div><div class='add'>+                   280 - 287     8          11000000 through</div><div class='add'>+                                            11000111</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                     [Page 12]</div><div class='add'>+</div><div class='add'>+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+         The code lengths are sufficient to generate the actual codes,</div><div class='add'>+         as described above; we show the codes in the table for added</div><div class='add'>+         clarity.  Literal/length values 286-287 will never actually</div><div class='add'>+         occur in the compressed data, but participate in the code</div><div class='add'>+         construction.</div><div class='add'>+</div><div class='add'>+         Distance codes 0-31 are represented by (fixed-length) 5-bit</div><div class='add'>+         codes, with possible additional bits as shown in the table</div><div class='add'>+         shown in Paragraph 3.2.5, above.  Note that distance codes 30-</div><div class='add'>+         31 will never actually occur in the compressed data.</div><div class='add'>+</div><div class='add'>+      3.2.7. Compression with dynamic Huffman codes (BTYPE=10)</div><div class='add'>+</div><div class='add'>+         The Huffman codes for the two alphabets appear in the block</div><div class='add'>+         immediately after the header bits and before the actual</div><div class='add'>+         compressed data, first the literal/length code and then the</div><div class='add'>+         distance code.  Each code is defined by a sequence of code</div><div class='add'>+         lengths, as discussed in Paragraph 3.2.2, above.  For even</div><div class='add'>+         greater compactness, the code length sequences themselves are</div><div class='add'>+         compressed using a Huffman code.  The alphabet for code lengths</div><div class='add'>+         is as follows:</div><div class='add'>+</div><div class='add'>+               0 - 15: Represent code lengths of 0 - 15</div><div class='add'>+                   16: Copy the previous code length 3 - 6 times.</div><div class='add'>+                       The next 2 bits indicate repeat length</div><div class='add'>+                             (0 = 3, ... , 3 = 6)</div><div class='add'>+                          Example:  Codes 8, 16 (+2 bits 11),</div><div class='add'>+                                    16 (+2 bits 10) will expand to</div><div class='add'>+                                    12 code lengths of 8 (1 + 6 + 5)</div><div class='add'>+                   17: Repeat a code length of 0 for 3 - 10 times.</div><div class='add'>+                       (3 bits of length)</div><div class='add'>+                   18: Repeat a code length of 0 for 11 - 138 times</div><div class='add'>+                       (7 bits of length)</div><div class='add'>+</div><div class='add'>+         A code length of 0 indicates that the corresponding symbol in</div><div class='add'>+         the literal/length or distance alphabet will not occur in the</div><div class='add'>+         block, and should not participate in the Huffman code</div><div class='add'>+         construction algorithm given earlier.  If only one distance</div><div class='add'>+         code is used, it is encoded using one bit, not zero bits; in</div><div class='add'>+         this case there is a single code length of one, with one unused</div><div class='add'>+         code.  One distance code of zero bits means that there are no</div><div class='add'>+         distance codes used at all (the data is all literals).</div><div class='add'>+</div><div class='add'>+         We can now define the format of the block:</div><div class='add'>+</div><div class='add'>+               5 Bits: HLIT, # of Literal/Length codes - 257 (257 - 286)</div><div class='add'>+               5 Bits: HDIST, # of Distance codes - 1        (1 - 32)</div><div class='add'>+               4 Bits: HCLEN, # of Code Length codes - 4     (4 - 19)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                     [Page 13]</div><div class='add'>+</div><div class='add'>+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+               (HCLEN + 4) x 3 bits: code lengths for the code length</div><div class='add'>+                  alphabet given just above, in the order: 16, 17, 18,</div><div class='add'>+                  0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15</div><div class='add'>+</div><div class='add'>+                  These code lengths are interpreted as 3-bit integers</div><div class='add'>+                  (0-7); as above, a code length of 0 means the</div><div class='add'>+                  corresponding symbol (literal/length or distance code</div><div class='add'>+                  length) is not used.</div><div class='add'>+</div><div class='add'>+               HLIT + 257 code lengths for the literal/length alphabet,</div><div class='add'>+                  encoded using the code length Huffman code</div><div class='add'>+</div><div class='add'>+               HDIST + 1 code lengths for the distance alphabet,</div><div class='add'>+                  encoded using the code length Huffman code</div><div class='add'>+</div><div class='add'>+               The actual compressed data of the block,</div><div class='add'>+                  encoded using the literal/length and distance Huffman</div><div class='add'>+                  codes</div><div class='add'>+</div><div class='add'>+               The literal/length symbol 256 (end of data),</div><div class='add'>+                  encoded using the literal/length Huffman code</div><div class='add'>+</div><div class='add'>+         The code length repeat codes can cross from HLIT + 257 to the</div><div class='add'>+         HDIST + 1 code lengths.  In other words, all code lengths form</div><div class='add'>+         a single sequence of HLIT + HDIST + 258 values.</div><div class='add'>+</div><div class='add'>+   3.3. Compliance</div><div class='add'>+</div><div class='add'>+      A compressor may limit further the ranges of values specified in</div><div class='add'>+      the previous section and still be compliant; for example, it may</div><div class='add'>+      limit the range of backward pointers to some value smaller than</div><div class='add'>+      32K.  Similarly, a compressor may limit the size of blocks so that</div><div class='add'>+      a compressible block fits in memory.</div><div class='add'>+</div><div class='add'>+      A compliant decompressor must accept the full range of possible</div><div class='add'>+      values defined in the previous section, and must accept blocks of</div><div class='add'>+      arbitrary size.</div><div class='add'>+</div><div class='add'>+4. Compression algorithm details</div><div class='add'>+</div><div class='add'>+   While it is the intent of this document to define the "deflate"</div><div class='add'>+   compressed data format without reference to any particular</div><div class='add'>+   compression algorithm, the format is related to the compressed</div><div class='add'>+   formats produced by LZ77 (Lempel-Ziv 1977, see reference [2] below);</div><div class='add'>+   since many variations of LZ77 are patented, it is strongly</div><div class='add'>+   recommended that the implementor of a compressor follow the general</div><div class='add'>+   algorithm presented here, which is known not to be patented per se.</div><div class='add'>+   The material in this section is not part of the definition of the</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                     [Page 14]</div><div class='add'>+</div><div class='add'>+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+   specification per se, and a compressor need not follow it in order to</div><div class='add'>+   be compliant.</div><div class='add'>+</div><div class='add'>+   The compressor terminates a block when it determines that starting a</div><div class='add'>+   new block with fresh trees would be useful, or when the block size</div><div class='add'>+   fills up the compressor's block buffer.</div><div class='add'>+</div><div class='add'>+   The compressor uses a chained hash table to find duplicated strings,</div><div class='add'>+   using a hash function that operates on 3-byte sequences.  At any</div><div class='add'>+   given point during compression, let XYZ be the next 3 input bytes to</div><div class='add'>+   be examined (not necessarily all different, of course).  First, the</div><div class='add'>+   compressor examines the hash chain for XYZ.  If the chain is empty,</div><div class='add'>+   the compressor simply writes out X as a literal byte and advances one</div><div class='add'>+   byte in the input.  If the hash chain is not empty, indicating that</div><div class='add'>+   the sequence XYZ (or, if we are unlucky, some other 3 bytes with the</div><div class='add'>+   same hash function value) has occurred recently, the compressor</div><div class='add'>+   compares all strings on the XYZ hash chain with the actual input data</div><div class='add'>+   sequence starting at the current point, and selects the longest</div><div class='add'>+   match.</div><div class='add'>+</div><div class='add'>+   The compressor searches the hash chains starting with the most recent</div><div class='add'>+   strings, to favor small distances and thus take advantage of the</div><div class='add'>+   Huffman encoding.  The hash chains are singly linked. There are no</div><div class='add'>+   deletions from the hash chains; the algorithm simply discards matches</div><div class='add'>+   that are too old.  To avoid a worst-case situation, very long hash</div><div class='add'>+   chains are arbitrarily truncated at a certain length, determined by a</div><div class='add'>+   run-time parameter.</div><div class='add'>+</div><div class='add'>+   To improve overall compression, the compressor optionally defers the</div><div class='add'>+   selection of matches ("lazy matching"): after a match of length N has</div><div class='add'>+   been found, the compressor searches for a longer match starting at</div><div class='add'>+   the next input byte.  If it finds a longer match, it truncates the</div><div class='add'>+   previous match to a length of one (thus producing a single literal</div><div class='add'>+   byte) and then emits the longer match.  Otherwise, it emits the</div><div class='add'>+   original match, and, as described above, advances N bytes before</div><div class='add'>+   continuing.</div><div class='add'>+</div><div class='add'>+   Run-time parameters also control this "lazy match" procedure.  If</div><div class='add'>+   compression ratio is most important, the compressor attempts a</div><div class='add'>+   complete second search regardless of the length of the first match.</div><div class='add'>+   In the normal case, if the current match is "long enough", the</div><div class='add'>+   compressor reduces the search for a longer match, thus speeding up</div><div class='add'>+   the process.  If speed is most important, the compressor inserts new</div><div class='add'>+   strings in the hash table only when no match was found, or when the</div><div class='add'>+   match is not "too long".  This degrades the compression ratio but</div><div class='add'>+   saves time since there are both fewer insertions and fewer searches.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                     [Page 15]</div><div class='add'>+</div><div class='add'>+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+5. References</div><div class='add'>+</div><div class='add'>+   [1] Huffman, D. A., "A Method for the Construction of Minimum</div><div class='add'>+       Redundancy Codes", Proceedings of the Institute of Radio</div><div class='add'>+       Engineers, September 1952, Volume 40, Number 9, pp. 1098-1101.</div><div class='add'>+</div><div class='add'>+   [2] Ziv J., Lempel A., "A Universal Algorithm for Sequential Data</div><div class='add'>+       Compression", IEEE Transactions on Information Theory, Vol. 23,</div><div class='add'>+       No. 3, pp. 337-343.</div><div class='add'>+</div><div class='add'>+   [3] Gailly, J.-L., and Adler, M., ZLIB documentation and sources,</div><div class='add'>+       available in ftp://ftp.uu.net/pub/archiving/zip/doc/</div><div class='add'>+</div><div class='add'>+   [4] Gailly, J.-L., and Adler, M., GZIP documentation and sources,</div><div class='add'>+       available as gzip-*.tar in ftp://prep.ai.mit.edu/pub/gnu/</div><div class='add'>+</div><div class='add'>+   [5] Schwartz, E. S., and Kallick, B. "Generating a canonical prefix</div><div class='add'>+       encoding." Comm. ACM, 7,3 (Mar. 1964), pp. 166-169.</div><div class='add'>+</div><div class='add'>+   [6] Hirschberg and Lelewer, "Efficient decoding of prefix codes,"</div><div class='add'>+       Comm. ACM, 33,4, April 1990, pp. 449-459.</div><div class='add'>+</div><div class='add'>+6. Security Considerations</div><div class='add'>+</div><div class='add'>+   Any data compression method involves the reduction of redundancy in</div><div class='add'>+   the data.  Consequently, any corruption of the data is likely to have</div><div class='add'>+   severe effects and be difficult to correct.  Uncompressed text, on</div><div class='add'>+   the other hand, will probably still be readable despite the presence</div><div class='add'>+   of some corrupted bytes.</div><div class='add'>+</div><div class='add'>+   It is recommended that systems using this data format provide some</div><div class='add'>+   means of validating the integrity of the compressed data.  See</div><div class='add'>+   reference [3], for example.</div><div class='add'>+</div><div class='add'>+7. Source code</div><div class='add'>+</div><div class='add'>+   Source code for a C language implementation of a "deflate" compliant</div><div class='add'>+   compressor and decompressor is available within the zlib package at</div><div class='add'>+   ftp://ftp.uu.net/pub/archiving/zip/zlib/.</div><div class='add'>+</div><div class='add'>+8. Acknowledgements</div><div class='add'>+</div><div class='add'>+   Trademarks cited in this document are the property of their</div><div class='add'>+   respective owners.</div><div class='add'>+</div><div class='add'>+   Phil Katz designed the deflate format.  Jean-Loup Gailly and Mark</div><div class='add'>+   Adler wrote the related software described in this specification.</div><div class='add'>+   Glenn Randers-Pehrson converted this document to RFC and HTML format.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                     [Page 16]</div><div class='add'>+</div><div class='add'>+RFC 1951      DEFLATE Compressed Data Format Specification      May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+9. Author's Address</div><div class='add'>+</div><div class='add'>+   L. Peter Deutsch</div><div class='add'>+   Aladdin Enterprises</div><div class='add'>+   203 Santa Margarita Ave.</div><div class='add'>+   Menlo Park, CA 94025</div><div class='add'>+</div><div class='add'>+   Phone: (415) 322-0103 (AM only)</div><div class='add'>+   FAX:   (415) 322-1734</div><div class='add'>+   EMail: &lt;ghost@aladdin.com&gt;</div><div class='add'>+</div><div class='add'>+   Questions about the technical content of this specification can be</div><div class='add'>+   sent by email to:</div><div class='add'>+</div><div class='add'>+   Jean-Loup Gailly &lt;gzip@prep.ai.mit.edu&gt; and</div><div class='add'>+   Mark Adler &lt;madler@alumni.caltech.edu&gt;</div><div class='add'>+</div><div class='add'>+   Editorial comments on this specification can be sent by email to:</div><div class='add'>+</div><div class='add'>+   L. Peter Deutsch &lt;ghost@aladdin.com&gt; and</div><div class='add'>+   Glenn Randers-Pehrson &lt;randeg@alumni.rpi.edu&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                     [Page 17]</div><div class='add'>+</div><div class='head'>diff --git a/src/3rdparty/zlib/doc/rfc1952.txt b/src/3rdparty/zlib/doc/rfc1952.txt<br/>new file mode 100644<br/>index 0000000..a8e51b4<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/doc/rfc1952.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/doc/rfc1952.txt</a></div><div class='hunk'>@@ -0,0 +1,675 @@</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Network Working Group                                         P. Deutsch</div><div class='add'>+Request for Comments: 1952                           Aladdin Enterprises</div><div class='add'>+Category: Informational                                         May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+               GZIP file format specification version 4.3</div><div class='add'>+</div><div class='add'>+Status of This Memo</div><div class='add'>+</div><div class='add'>+   This memo provides information for the Internet community.  This memo</div><div class='add'>+   does not specify an Internet standard of any kind.  Distribution of</div><div class='add'>+   this memo is unlimited.</div><div class='add'>+</div><div class='add'>+IESG Note:</div><div class='add'>+</div><div class='add'>+   The IESG takes no position on the validity of any Intellectual</div><div class='add'>+   Property Rights statements contained in this document.</div><div class='add'>+</div><div class='add'>+Notices</div><div class='add'>+</div><div class='add'>+   Copyright (c) 1996 L. Peter Deutsch</div><div class='add'>+</div><div class='add'>+   Permission is granted to copy and distribute this document for any</div><div class='add'>+   purpose and without charge, including translations into other</div><div class='add'>+   languages and incorporation into compilations, provided that the</div><div class='add'>+   copyright notice and this notice are preserved, and that any</div><div class='add'>+   substantive changes or deletions from the original are clearly</div><div class='add'>+   marked.</div><div class='add'>+</div><div class='add'>+   A pointer to the latest version of this and related documentation in</div><div class='add'>+   HTML format can be found at the URL</div><div class='add'>+   &lt;ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html&gt;.</div><div class='add'>+</div><div class='add'>+Abstract</div><div class='add'>+</div><div class='add'>+   This specification defines a lossless compressed data format that is</div><div class='add'>+   compatible with the widely used GZIP utility.  The format includes a</div><div class='add'>+   cyclic redundancy check value for detecting data corruption.  The</div><div class='add'>+   format presently uses the DEFLATE method of compression but can be</div><div class='add'>+   easily extended to use other compression methods.  The format can be</div><div class='add'>+   implemented readily in a manner not covered by patents.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 1]</div><div class='add'>+</div><div class='add'>+RFC 1952             GZIP File Format Specification             May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Table of Contents</div><div class='add'>+</div><div class='add'>+   1. Introduction ................................................... 2</div><div class='add'>+      1.1. Purpose ................................................... 2</div><div class='add'>+      1.2. Intended audience ......................................... 3</div><div class='add'>+      1.3. Scope ..................................................... 3</div><div class='add'>+      1.4. Compliance ................................................ 3</div><div class='add'>+      1.5. Definitions of terms and conventions used ................. 3</div><div class='add'>+      1.6. Changes from previous versions ............................ 3</div><div class='add'>+   2. Detailed specification ......................................... 4</div><div class='add'>+      2.1. Overall conventions ....................................... 4</div><div class='add'>+      2.2. File format ............................................... 5</div><div class='add'>+      2.3. Member format ............................................. 5</div><div class='add'>+          2.3.1. Member header and trailer ........................... 6</div><div class='add'>+              2.3.1.1. Extra field ................................... 8</div><div class='add'>+              2.3.1.2. Compliance .................................... 9</div><div class='add'>+      3. References .................................................. 9</div><div class='add'>+      4. Security Considerations .................................... 10</div><div class='add'>+      5. Acknowledgements ........................................... 10</div><div class='add'>+      6. Author's Address ........................................... 10</div><div class='add'>+      7. Appendix: Jean-Loup Gailly's gzip utility .................. 11</div><div class='add'>+      8. Appendix: Sample CRC Code .................................. 11</div><div class='add'>+</div><div class='add'>+1. Introduction</div><div class='add'>+</div><div class='add'>+   1.1. Purpose</div><div class='add'>+</div><div class='add'>+      The purpose of this specification is to define a lossless</div><div class='add'>+      compressed data format that:</div><div class='add'>+</div><div class='add'>+          * Is independent of CPU type, operating system, file system,</div><div class='add'>+            and character set, and hence can be used for interchange;</div><div class='add'>+          * Can compress or decompress a data stream (as opposed to a</div><div class='add'>+            randomly accessible file) to produce another data stream,</div><div class='add'>+            using only an a priori bounded amount of intermediate</div><div class='add'>+            storage, and hence can be used in data communications or</div><div class='add'>+            similar structures such as Unix filters;</div><div class='add'>+          * Compresses data with efficiency comparable to the best</div><div class='add'>+            currently available general-purpose compression methods,</div><div class='add'>+            and in particular considerably better than the "compress"</div><div class='add'>+            program;</div><div class='add'>+          * Can be implemented readily in a manner not covered by</div><div class='add'>+            patents, and hence can be practiced freely;</div><div class='add'>+          * Is compatible with the file format produced by the current</div><div class='add'>+            widely used gzip utility, in that conforming decompressors</div><div class='add'>+            will be able to read data produced by the existing gzip</div><div class='add'>+            compressor.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 2]</div><div class='add'>+</div><div class='add'>+RFC 1952             GZIP File Format Specification             May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+      The data format defined by this specification does not attempt to:</div><div class='add'>+</div><div class='add'>+          * Provide random access to compressed data;</div><div class='add'>+          * Compress specialized data (e.g., raster graphics) as well as</div><div class='add'>+            the best currently available specialized algorithms.</div><div class='add'>+</div><div class='add'>+   1.2. Intended audience</div><div class='add'>+</div><div class='add'>+      This specification is intended for use by implementors of software</div><div class='add'>+      to compress data into gzip format and/or decompress data from gzip</div><div class='add'>+      format.</div><div class='add'>+</div><div class='add'>+      The text of the specification assumes a basic background in</div><div class='add'>+      programming at the level of bits and other primitive data</div><div class='add'>+      representations.</div><div class='add'>+</div><div class='add'>+   1.3. Scope</div><div class='add'>+</div><div class='add'>+      The specification specifies a compression method and a file format</div><div class='add'>+      (the latter assuming only that a file can store a sequence of</div><div class='add'>+      arbitrary bytes).  It does not specify any particular interface to</div><div class='add'>+      a file system or anything about character sets or encodings</div><div class='add'>+      (except for file names and comments, which are optional).</div><div class='add'>+</div><div class='add'>+   1.4. Compliance</div><div class='add'>+</div><div class='add'>+      Unless otherwise indicated below, a compliant decompressor must be</div><div class='add'>+      able to accept and decompress any file that conforms to all the</div><div class='add'>+      specifications presented here; a compliant compressor must produce</div><div class='add'>+      files that conform to all the specifications presented here.  The</div><div class='add'>+      material in the appendices is not part of the specification per se</div><div class='add'>+      and is not relevant to compliance.</div><div class='add'>+</div><div class='add'>+   1.5. Definitions of terms and conventions used</div><div class='add'>+</div><div class='add'>+      byte: 8 bits stored or transmitted as a unit (same as an octet).</div><div class='add'>+      (For this specification, a byte is exactly 8 bits, even on</div><div class='add'>+      machines which store a character on a number of bits different</div><div class='add'>+      from 8.)  See below for the numbering of bits within a byte.</div><div class='add'>+</div><div class='add'>+   1.6. Changes from previous versions</div><div class='add'>+</div><div class='add'>+      There have been no technical changes to the gzip format since</div><div class='add'>+      version 4.1 of this specification.  In version 4.2, some</div><div class='add'>+      terminology was changed, and the sample CRC code was rewritten for</div><div class='add'>+      clarity and to eliminate the requirement for the caller to do pre-</div><div class='add'>+      and post-conditioning.  Version 4.3 is a conversion of the</div><div class='add'>+      specification to RFC style.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 3]</div><div class='add'>+</div><div class='add'>+RFC 1952             GZIP File Format Specification             May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+2. Detailed specification</div><div class='add'>+</div><div class='add'>+   2.1. Overall conventions</div><div class='add'>+</div><div class='add'>+      In the diagrams below, a box like this:</div><div class='add'>+</div><div class='add'>+         +---+</div><div class='add'>+         |   | &lt;-- the vertical bars might be missing</div><div class='add'>+         +---+</div><div class='add'>+</div><div class='add'>+      represents one byte; a box like this:</div><div class='add'>+</div><div class='add'>+         +==============+</div><div class='add'>+         |              |</div><div class='add'>+         +==============+</div><div class='add'>+</div><div class='add'>+      represents a variable number of bytes.</div><div class='add'>+</div><div class='add'>+      Bytes stored within a computer do not have a "bit order", since</div><div class='add'>+      they are always treated as a unit.  However, a byte considered as</div><div class='add'>+      an integer between 0 and 255 does have a most- and least-</div><div class='add'>+      significant bit, and since we write numbers with the most-</div><div class='add'>+      significant digit on the left, we also write bytes with the most-</div><div class='add'>+      significant bit on the left.  In the diagrams below, we number the</div><div class='add'>+      bits of a byte so that bit 0 is the least-significant bit, i.e.,</div><div class='add'>+      the bits are numbered:</div><div class='add'>+</div><div class='add'>+         +--------+</div><div class='add'>+         |76543210|</div><div class='add'>+         +--------+</div><div class='add'>+</div><div class='add'>+      This document does not address the issue of the order in which</div><div class='add'>+      bits of a byte are transmitted on a bit-sequential medium, since</div><div class='add'>+      the data format described here is byte- rather than bit-oriented.</div><div class='add'>+</div><div class='add'>+      Within a computer, a number may occupy multiple bytes.  All</div><div class='add'>+      multi-byte numbers in the format described here are stored with</div><div class='add'>+      the least-significant byte first (at the lower memory address).</div><div class='add'>+      For example, the decimal number 520 is stored as:</div><div class='add'>+</div><div class='add'>+             0        1</div><div class='add'>+         +--------+--------+</div><div class='add'>+         |00001000|00000010|</div><div class='add'>+         +--------+--------+</div><div class='add'>+          ^        ^</div><div class='add'>+          |        |</div><div class='add'>+          |        + more significant byte = 2 x 256</div><div class='add'>+          + less significant byte = 8</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 4]</div><div class='add'>+</div><div class='add'>+RFC 1952             GZIP File Format Specification             May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+   2.2. File format</div><div class='add'>+</div><div class='add'>+      A gzip file consists of a series of "members" (compressed data</div><div class='add'>+      sets).  The format of each member is specified in the following</div><div class='add'>+      section.  The members simply appear one after another in the file,</div><div class='add'>+      with no additional information before, between, or after them.</div><div class='add'>+</div><div class='add'>+   2.3. Member format</div><div class='add'>+</div><div class='add'>+      Each member has the following structure:</div><div class='add'>+</div><div class='add'>+         +---+---+---+---+---+---+---+---+---+---+</div><div class='add'>+         |ID1|ID2|CM |FLG|     MTIME     |XFL|OS | (more--&gt;)</div><div class='add'>+         +---+---+---+---+---+---+---+---+---+---+</div><div class='add'>+</div><div class='add'>+      (if FLG.FEXTRA set)</div><div class='add'>+</div><div class='add'>+         +---+---+=================================+</div><div class='add'>+         | XLEN  |...XLEN bytes of "extra field"...| (more--&gt;)</div><div class='add'>+         +---+---+=================================+</div><div class='add'>+</div><div class='add'>+      (if FLG.FNAME set)</div><div class='add'>+</div><div class='add'>+         +=========================================+</div><div class='add'>+         |...original file name, zero-terminated...| (more--&gt;)</div><div class='add'>+         +=========================================+</div><div class='add'>+</div><div class='add'>+      (if FLG.FCOMMENT set)</div><div class='add'>+</div><div class='add'>+         +===================================+</div><div class='add'>+         |...file comment, zero-terminated...| (more--&gt;)</div><div class='add'>+         +===================================+</div><div class='add'>+</div><div class='add'>+      (if FLG.FHCRC set)</div><div class='add'>+</div><div class='add'>+         +---+---+</div><div class='add'>+         | CRC16 |</div><div class='add'>+         +---+---+</div><div class='add'>+</div><div class='add'>+         +=======================+</div><div class='add'>+         |...compressed blocks...| (more--&gt;)</div><div class='add'>+         +=======================+</div><div class='add'>+</div><div class='add'>+           0   1   2   3   4   5   6   7</div><div class='add'>+         +---+---+---+---+---+---+---+---+</div><div class='add'>+         |     CRC32     |     ISIZE     |</div><div class='add'>+         +---+---+---+---+---+---+---+---+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 5]</div><div class='add'>+</div><div class='add'>+RFC 1952             GZIP File Format Specification             May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+      2.3.1. Member header and trailer</div><div class='add'>+</div><div class='add'>+         ID1 (IDentification 1)</div><div class='add'>+         ID2 (IDentification 2)</div><div class='add'>+            These have the fixed values ID1 = 31 (0x1f, \037), ID2 = 139</div><div class='add'>+            (0x8b, \213), to identify the file as being in gzip format.</div><div class='add'>+</div><div class='add'>+         CM (Compression Method)</div><div class='add'>+            This identifies the compression method used in the file.  CM</div><div class='add'>+            = 0-7 are reserved.  CM = 8 denotes the "deflate"</div><div class='add'>+            compression method, which is the one customarily used by</div><div class='add'>+            gzip and which is documented elsewhere.</div><div class='add'>+</div><div class='add'>+         FLG (FLaGs)</div><div class='add'>+            This flag byte is divided into individual bits as follows:</div><div class='add'>+</div><div class='add'>+               bit 0   FTEXT</div><div class='add'>+               bit 1   FHCRC</div><div class='add'>+               bit 2   FEXTRA</div><div class='add'>+               bit 3   FNAME</div><div class='add'>+               bit 4   FCOMMENT</div><div class='add'>+               bit 5   reserved</div><div class='add'>+               bit 6   reserved</div><div class='add'>+               bit 7   reserved</div><div class='add'>+</div><div class='add'>+            If FTEXT is set, the file is probably ASCII text.  This is</div><div class='add'>+            an optional indication, which the compressor may set by</div><div class='add'>+            checking a small amount of the input data to see whether any</div><div class='add'>+            non-ASCII characters are present.  In case of doubt, FTEXT</div><div class='add'>+            is cleared, indicating binary data. For systems which have</div><div class='add'>+            different file formats for ascii text and binary data, the</div><div class='add'>+            decompressor can use FTEXT to choose the appropriate format.</div><div class='add'>+            We deliberately do not specify the algorithm used to set</div><div class='add'>+            this bit, since a compressor always has the option of</div><div class='add'>+            leaving it cleared and a decompressor always has the option</div><div class='add'>+            of ignoring it and letting some other program handle issues</div><div class='add'>+            of data conversion.</div><div class='add'>+</div><div class='add'>+            If FHCRC is set, a CRC16 for the gzip header is present,</div><div class='add'>+            immediately before the compressed data. The CRC16 consists</div><div class='add'>+            of the two least significant bytes of the CRC32 for all</div><div class='add'>+            bytes of the gzip header up to and not including the CRC16.</div><div class='add'>+            [The FHCRC bit was never set by versions of gzip up to</div><div class='add'>+            1.2.4, even though it was documented with a different</div><div class='add'>+            meaning in gzip 1.2.4.]</div><div class='add'>+</div><div class='add'>+            If FEXTRA is set, optional extra fields are present, as</div><div class='add'>+            described in a following section.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 6]</div><div class='add'>+</div><div class='add'>+RFC 1952             GZIP File Format Specification             May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+            If FNAME is set, an original file name is present,</div><div class='add'>+            terminated by a zero byte.  The name must consist of ISO</div><div class='add'>+            8859-1 (LATIN-1) characters; on operating systems using</div><div class='add'>+            EBCDIC or any other character set for file names, the name</div><div class='add'>+            must be translated to the ISO LATIN-1 character set.  This</div><div class='add'>+            is the original name of the file being compressed, with any</div><div class='add'>+            directory components removed, and, if the file being</div><div class='add'>+            compressed is on a file system with case insensitive names,</div><div class='add'>+            forced to lower case. There is no original file name if the</div><div class='add'>+            data was compressed from a source other than a named file;</div><div class='add'>+            for example, if the source was stdin on a Unix system, there</div><div class='add'>+            is no file name.</div><div class='add'>+</div><div class='add'>+            If FCOMMENT is set, a zero-terminated file comment is</div><div class='add'>+            present.  This comment is not interpreted; it is only</div><div class='add'>+            intended for human consumption.  The comment must consist of</div><div class='add'>+            ISO 8859-1 (LATIN-1) characters.  Line breaks should be</div><div class='add'>+            denoted by a single line feed character (10 decimal).</div><div class='add'>+</div><div class='add'>+            Reserved FLG bits must be zero.</div><div class='add'>+</div><div class='add'>+         MTIME (Modification TIME)</div><div class='add'>+            This gives the most recent modification time of the original</div><div class='add'>+            file being compressed.  The time is in Unix format, i.e.,</div><div class='add'>+            seconds since 00:00:00 GMT, Jan.  1, 1970.  (Note that this</div><div class='add'>+            may cause problems for MS-DOS and other systems that use</div><div class='add'>+            local rather than Universal time.)  If the compressed data</div><div class='add'>+            did not come from a file, MTIME is set to the time at which</div><div class='add'>+            compression started.  MTIME = 0 means no time stamp is</div><div class='add'>+            available.</div><div class='add'>+</div><div class='add'>+         XFL (eXtra FLags)</div><div class='add'>+            These flags are available for use by specific compression</div><div class='add'>+            methods.  The "deflate" method (CM = 8) sets these flags as</div><div class='add'>+            follows:</div><div class='add'>+</div><div class='add'>+               XFL = 2 - compressor used maximum compression,</div><div class='add'>+                         slowest algorithm</div><div class='add'>+               XFL = 4 - compressor used fastest algorithm</div><div class='add'>+</div><div class='add'>+         OS (Operating System)</div><div class='add'>+            This identifies the type of file system on which compression</div><div class='add'>+            took place.  This may be useful in determining end-of-line</div><div class='add'>+            convention for text files.  The currently defined values are</div><div class='add'>+            as follows:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 7]</div><div class='add'>+</div><div class='add'>+RFC 1952             GZIP File Format Specification             May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+                 0 - FAT filesystem (MS-DOS, OS/2, NT/Win32)</div><div class='add'>+                 1 - Amiga</div><div class='add'>+                 2 - VMS (or OpenVMS)</div><div class='add'>+                 3 - Unix</div><div class='add'>+                 4 - VM/CMS</div><div class='add'>+                 5 - Atari TOS</div><div class='add'>+                 6 - HPFS filesystem (OS/2, NT)</div><div class='add'>+                 7 - Macintosh</div><div class='add'>+                 8 - Z-System</div><div class='add'>+                 9 - CP/M</div><div class='add'>+                10 - TOPS-20</div><div class='add'>+                11 - NTFS filesystem (NT)</div><div class='add'>+                12 - QDOS</div><div class='add'>+                13 - Acorn RISCOS</div><div class='add'>+               255 - unknown</div><div class='add'>+</div><div class='add'>+         XLEN (eXtra LENgth)</div><div class='add'>+            If FLG.FEXTRA is set, this gives the length of the optional</div><div class='add'>+            extra field.  See below for details.</div><div class='add'>+</div><div class='add'>+         CRC32 (CRC-32)</div><div class='add'>+            This contains a Cyclic Redundancy Check value of the</div><div class='add'>+            uncompressed data computed according to CRC-32 algorithm</div><div class='add'>+            used in the ISO 3309 standard and in section 8.1.1.6.2 of</div><div class='add'>+            ITU-T recommendation V.42.  (See http://www.iso.ch for</div><div class='add'>+            ordering ISO documents. See gopher://info.itu.ch for an</div><div class='add'>+            online version of ITU-T V.42.)</div><div class='add'>+</div><div class='add'>+         ISIZE (Input SIZE)</div><div class='add'>+            This contains the size of the original (uncompressed) input</div><div class='add'>+            data modulo 2^32.</div><div class='add'>+</div><div class='add'>+      2.3.1.1. Extra field</div><div class='add'>+</div><div class='add'>+         If the FLG.FEXTRA bit is set, an "extra field" is present in</div><div class='add'>+         the header, with total length XLEN bytes.  It consists of a</div><div class='add'>+         series of subfields, each of the form:</div><div class='add'>+</div><div class='add'>+            +---+---+---+---+==================================+</div><div class='add'>+            |SI1|SI2|  LEN  |... LEN bytes of subfield data ...|</div><div class='add'>+            +---+---+---+---+==================================+</div><div class='add'>+</div><div class='add'>+         SI1 and SI2 provide a subfield ID, typically two ASCII letters</div><div class='add'>+         with some mnemonic value.  Jean-Loup Gailly</div><div class='add'>+         &lt;gzip@prep.ai.mit.edu&gt; is maintaining a registry of subfield</div><div class='add'>+         IDs; please send him any subfield ID you wish to use.  Subfield</div><div class='add'>+         IDs with SI2 = 0 are reserved for future use.  The following</div><div class='add'>+         IDs are currently defined:</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 8]</div><div class='add'>+</div><div class='add'>+RFC 1952             GZIP File Format Specification             May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+            SI1         SI2         Data</div><div class='add'>+            ----------  ----------  ----</div><div class='add'>+            0x41 ('A')  0x70 ('P')  Apollo file type information</div><div class='add'>+</div><div class='add'>+         LEN gives the length of the subfield data, excluding the 4</div><div class='add'>+         initial bytes.</div><div class='add'>+</div><div class='add'>+      2.3.1.2. Compliance</div><div class='add'>+</div><div class='add'>+         A compliant compressor must produce files with correct ID1,</div><div class='add'>+         ID2, CM, CRC32, and ISIZE, but may set all the other fields in</div><div class='add'>+         the fixed-length part of the header to default values (255 for</div><div class='add'>+         OS, 0 for all others).  The compressor must set all reserved</div><div class='add'>+         bits to zero.</div><div class='add'>+</div><div class='add'>+         A compliant decompressor must check ID1, ID2, and CM, and</div><div class='add'>+         provide an error indication if any of these have incorrect</div><div class='add'>+         values.  It must examine FEXTRA/XLEN, FNAME, FCOMMENT and FHCRC</div><div class='add'>+         at least so it can skip over the optional fields if they are</div><div class='add'>+         present.  It need not examine any other part of the header or</div><div class='add'>+         trailer; in particular, a decompressor may ignore FTEXT and OS</div><div class='add'>+         and always produce binary output, and still be compliant.  A</div><div class='add'>+         compliant decompressor must give an error indication if any</div><div class='add'>+         reserved bit is non-zero, since such a bit could indicate the</div><div class='add'>+         presence of a new field that would cause subsequent data to be</div><div class='add'>+         interpreted incorrectly.</div><div class='add'>+</div><div class='add'>+3. References</div><div class='add'>+</div><div class='add'>+   [1] "Information Processing - 8-bit single-byte coded graphic</div><div class='add'>+       character sets - Part 1: Latin alphabet No.1" (ISO 8859-1:1987).</div><div class='add'>+       The ISO 8859-1 (Latin-1) character set is a superset of 7-bit</div><div class='add'>+       ASCII. Files defining this character set are available as</div><div class='add'>+       iso_8859-1.* in ftp://ftp.uu.net/graphics/png/documents/</div><div class='add'>+</div><div class='add'>+   [2] ISO 3309</div><div class='add'>+</div><div class='add'>+   [3] ITU-T recommendation V.42</div><div class='add'>+</div><div class='add'>+   [4] Deutsch, L.P.,"DEFLATE Compressed Data Format Specification",</div><div class='add'>+       available in ftp://ftp.uu.net/pub/archiving/zip/doc/</div><div class='add'>+</div><div class='add'>+   [5] Gailly, J.-L., GZIP documentation, available as gzip-*.tar in</div><div class='add'>+       ftp://prep.ai.mit.edu/pub/gnu/</div><div class='add'>+</div><div class='add'>+   [6] Sarwate, D.V., "Computation of Cyclic Redundancy Checks via Table</div><div class='add'>+       Look-Up", Communications of the ACM, 31(8), pp.1008-1013.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                      [Page 9]</div><div class='add'>+</div><div class='add'>+RFC 1952             GZIP File Format Specification             May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+   [7] Schwaderer, W.D., "CRC Calculation", April 85 PC Tech Journal,</div><div class='add'>+       pp.118-133.</div><div class='add'>+</div><div class='add'>+   [8] ftp://ftp.adelaide.edu.au/pub/rocksoft/papers/crc_v3.txt,</div><div class='add'>+       describing the CRC concept.</div><div class='add'>+</div><div class='add'>+4. Security Considerations</div><div class='add'>+</div><div class='add'>+   Any data compression method involves the reduction of redundancy in</div><div class='add'>+   the data.  Consequently, any corruption of the data is likely to have</div><div class='add'>+   severe effects and be difficult to correct.  Uncompressed text, on</div><div class='add'>+   the other hand, will probably still be readable despite the presence</div><div class='add'>+   of some corrupted bytes.</div><div class='add'>+</div><div class='add'>+   It is recommended that systems using this data format provide some</div><div class='add'>+   means of validating the integrity of the compressed data, such as by</div><div class='add'>+   setting and checking the CRC-32 check value.</div><div class='add'>+</div><div class='add'>+5. Acknowledgements</div><div class='add'>+</div><div class='add'>+   Trademarks cited in this document are the property of their</div><div class='add'>+   respective owners.</div><div class='add'>+</div><div class='add'>+   Jean-Loup Gailly designed the gzip format and wrote, with Mark Adler,</div><div class='add'>+   the related software described in this specification.  Glenn</div><div class='add'>+   Randers-Pehrson converted this document to RFC and HTML format.</div><div class='add'>+</div><div class='add'>+6. Author's Address</div><div class='add'>+</div><div class='add'>+   L. Peter Deutsch</div><div class='add'>+   Aladdin Enterprises</div><div class='add'>+   203 Santa Margarita Ave.</div><div class='add'>+   Menlo Park, CA 94025</div><div class='add'>+</div><div class='add'>+   Phone: (415) 322-0103 (AM only)</div><div class='add'>+   FAX:   (415) 322-1734</div><div class='add'>+   EMail: &lt;ghost@aladdin.com&gt;</div><div class='add'>+</div><div class='add'>+   Questions about the technical content of this specification can be</div><div class='add'>+   sent by email to:</div><div class='add'>+</div><div class='add'>+   Jean-Loup Gailly &lt;gzip@prep.ai.mit.edu&gt; and</div><div class='add'>+   Mark Adler &lt;madler@alumni.caltech.edu&gt;</div><div class='add'>+</div><div class='add'>+   Editorial comments on this specification can be sent by email to:</div><div class='add'>+</div><div class='add'>+   L. Peter Deutsch &lt;ghost@aladdin.com&gt; and</div><div class='add'>+   Glenn Randers-Pehrson &lt;randeg@alumni.rpi.edu&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                     [Page 10]</div><div class='add'>+</div><div class='add'>+RFC 1952             GZIP File Format Specification             May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+7. Appendix: Jean-Loup Gailly's gzip utility</div><div class='add'>+</div><div class='add'>+   The most widely used implementation of gzip compression, and the</div><div class='add'>+   original documentation on which this specification is based, were</div><div class='add'>+   created by Jean-Loup Gailly &lt;gzip@prep.ai.mit.edu&gt;.  Since this</div><div class='add'>+   implementation is a de facto standard, we mention some more of its</div><div class='add'>+   features here.  Again, the material in this section is not part of</div><div class='add'>+   the specification per se, and implementations need not follow it to</div><div class='add'>+   be compliant.</div><div class='add'>+</div><div class='add'>+   When compressing or decompressing a file, gzip preserves the</div><div class='add'>+   protection, ownership, and modification time attributes on the local</div><div class='add'>+   file system, since there is no provision for representing protection</div><div class='add'>+   attributes in the gzip file format itself.  Since the file format</div><div class='add'>+   includes a modification time, the gzip decompressor provides a</div><div class='add'>+   command line switch that assigns the modification time from the file,</div><div class='add'>+   rather than the local modification time of the compressed input, to</div><div class='add'>+   the decompressed output.</div><div class='add'>+</div><div class='add'>+8. Appendix: Sample CRC Code</div><div class='add'>+</div><div class='add'>+   The following sample code represents a practical implementation of</div><div class='add'>+   the CRC (Cyclic Redundancy Check). (See also ISO 3309 and ITU-T V.42</div><div class='add'>+   for a formal specification.)</div><div class='add'>+</div><div class='add'>+   The sample code is in the ANSI C programming language. Non C users</div><div class='add'>+   may find it easier to read with these hints:</div><div class='add'>+</div><div class='add'>+      &amp;      Bitwise AND operator.</div><div class='add'>+      ^      Bitwise exclusive-OR operator.</div><div class='add'>+      &gt;&gt;     Bitwise right shift operator. When applied to an</div><div class='add'>+             unsigned quantity, as here, right shift inserts zero</div><div class='add'>+             bit(s) at the left.</div><div class='add'>+      !      Logical NOT operator.</div><div class='add'>+      ++     "n++" increments the variable n.</div><div class='add'>+      0xNNN  0x introduces a hexadecimal (base 16) constant.</div><div class='add'>+             Suffix L indicates a long value (at least 32 bits).</div><div class='add'>+</div><div class='add'>+      /* Table of CRCs of all 8-bit messages. */</div><div class='add'>+      unsigned long crc_table[256];</div><div class='add'>+</div><div class='add'>+      /* Flag: has the table been computed? Initially false. */</div><div class='add'>+      int crc_table_computed = 0;</div><div class='add'>+</div><div class='add'>+      /* Make the table for a fast CRC. */</div><div class='add'>+      void make_crc_table(void)</div><div class='add'>+      {</div><div class='add'>+        unsigned long c;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                     [Page 11]</div><div class='add'>+</div><div class='add'>+RFC 1952             GZIP File Format Specification             May 1996</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+        int n, k;</div><div class='add'>+        for (n = 0; n &lt; 256; n++) {</div><div class='add'>+          c = (unsigned long) n;</div><div class='add'>+          for (k = 0; k &lt; 8; k++) {</div><div class='add'>+            if (c &amp; 1) {</div><div class='add'>+              c = 0xedb88320L ^ (c &gt;&gt; 1);</div><div class='add'>+            } else {</div><div class='add'>+              c = c &gt;&gt; 1;</div><div class='add'>+            }</div><div class='add'>+          }</div><div class='add'>+          crc_table[n] = c;</div><div class='add'>+        }</div><div class='add'>+        crc_table_computed = 1;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /*</div><div class='add'>+         Update a running crc with the bytes buf[0..len-1] and return</div><div class='add'>+       the updated crc. The crc should be initialized to zero. Pre- and</div><div class='add'>+       post-conditioning (one's complement) is performed within this</div><div class='add'>+       function so it shouldn't be done by the caller. Usage example:</div><div class='add'>+</div><div class='add'>+         unsigned long crc = 0L;</div><div class='add'>+</div><div class='add'>+         while (read_buffer(buffer, length) != EOF) {</div><div class='add'>+           crc = update_crc(crc, buffer, length);</div><div class='add'>+         }</div><div class='add'>+         if (crc != original_crc) error();</div><div class='add'>+      */</div><div class='add'>+      unsigned long update_crc(unsigned long crc,</div><div class='add'>+                      unsigned char *buf, int len)</div><div class='add'>+      {</div><div class='add'>+        unsigned long c = crc ^ 0xffffffffL;</div><div class='add'>+        int n;</div><div class='add'>+</div><div class='add'>+        if (!crc_table_computed)</div><div class='add'>+          make_crc_table();</div><div class='add'>+        for (n = 0; n &lt; len; n++) {</div><div class='add'>+          c = crc_table[(c ^ buf[n]) &amp; 0xff] ^ (c &gt;&gt; 8);</div><div class='add'>+        }</div><div class='add'>+        return c ^ 0xffffffffL;</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+      /* Return the CRC of the bytes buf[0..len-1]. */</div><div class='add'>+      unsigned long crc(unsigned char *buf, int len)</div><div class='add'>+      {</div><div class='add'>+        return update_crc(0L, buf, len);</div><div class='add'>+      }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Deutsch                      Informational                     [Page 12]</div><div class='add'>+</div><div class='head'>diff --git a/src/3rdparty/zlib/doc/txtvsbin.txt b/src/3rdparty/zlib/doc/txtvsbin.txt<br/>new file mode 100644<br/>index 0000000..3d0f063<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/doc/txtvsbin.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/doc/txtvsbin.txt</a></div><div class='hunk'>@@ -0,0 +1,107 @@</div><div class='add'>+A Fast Method for Identifying Plain Text Files</div><div class='add'>+==============================================</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Introduction</div><div class='add'>+------------</div><div class='add'>+</div><div class='add'>+Given a file coming from an unknown source, it is sometimes desirable</div><div class='add'>+to find out whether the format of that file is plain text.  Although</div><div class='add'>+this may appear like a simple task, a fully accurate detection of the</div><div class='add'>+file type requires heavy-duty semantic analysis on the file contents.</div><div class='add'>+It is, however, possible to obtain satisfactory results by employing</div><div class='add'>+various heuristics.</div><div class='add'>+</div><div class='add'>+Previous versions of PKZip and other zip-compatible compression tools</div><div class='add'>+were using a crude detection scheme: if more than 80% (4/5) of the bytes</div><div class='add'>+found in a certain buffer are within the range [7..127], the file is</div><div class='add'>+labeled as plain text, otherwise it is labeled as binary.  A prominent</div><div class='add'>+limitation of this scheme is the restriction to Latin-based alphabets.</div><div class='add'>+Other alphabets, like Greek, Cyrillic or Asian, make extensive use of</div><div class='add'>+the bytes within the range [128..255], and texts using these alphabets</div><div class='add'>+are most often misidentified by this scheme; in other words, the rate</div><div class='add'>+of false negatives is sometimes too high, which means that the recall</div><div class='add'>+is low.  Another weakness of this scheme is a reduced precision, due to</div><div class='add'>+the false positives that may occur when binary files containing large</div><div class='add'>+amounts of textual characters are misidentified as plain text.</div><div class='add'>+</div><div class='add'>+In this article we propose a new, simple detection scheme that features</div><div class='add'>+a much increased precision and a near-100% recall.  This scheme is</div><div class='add'>+designed to work on ASCII, Unicode and other ASCII-derived alphabets,</div><div class='add'>+and it handles single-byte encodings (ISO-8859, MacRoman, KOI8, etc.)</div><div class='add'>+and variable-sized encodings (ISO-2022, UTF-8, etc.).  Wider encodings</div><div class='add'>+(UCS-2/UTF-16 and UCS-4/UTF-32) are not handled, however.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+The Algorithm</div><div class='add'>+-------------</div><div class='add'>+</div><div class='add'>+The algorithm works by dividing the set of bytecodes [0..255] into three</div><div class='add'>+categories:</div><div class='add'>+- The white list of textual bytecodes:</div><div class='add'>+  9 (TAB), 10 (LF), 13 (CR), 32 (SPACE) to 255.</div><div class='add'>+- The gray list of tolerated bytecodes:</div><div class='add'>+  7 (BEL), 8 (BS), 11 (VT), 12 (FF), 26 (SUB), 27 (ESC).</div><div class='add'>+- The black list of undesired, non-textual bytecodes:</div><div class='add'>+  0 (NUL) to 6, 14 to 31.</div><div class='add'>+</div><div class='add'>+If a file contains at least one byte that belongs to the white list and</div><div class='add'>+no byte that belongs to the black list, then the file is categorized as</div><div class='add'>+plain text; otherwise, it is categorized as binary.  (The boundary case,</div><div class='add'>+when the file is empty, automatically falls into the latter category.)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+Rationale</div><div class='add'>+---------</div><div class='add'>+</div><div class='add'>+The idea behind this algorithm relies on two observations.</div><div class='add'>+</div><div class='add'>+The first observation is that, although the full range of 7-bit codes</div><div class='add'>+[0..127] is properly specified by the ASCII standard, most control</div><div class='add'>+characters in the range [0..31] are not used in practice.  The only</div><div class='add'>+widely-used, almost universally-portable control codes are 9 (TAB),</div><div class='add'>+10 (LF) and 13 (CR).  There are a few more control codes that are</div><div class='add'>+recognized on a reduced range of platforms and text viewers/editors:</div><div class='add'>+7 (BEL), 8 (BS), 11 (VT), 12 (FF), 26 (SUB) and 27 (ESC); but these</div><div class='add'>+codes are rarely (if ever) used alone, without being accompanied by</div><div class='add'>+some printable text.  Even the newer, portable text formats such as</div><div class='add'>+XML avoid using control characters outside the list mentioned here.</div><div class='add'>+</div><div class='add'>+The second observation is that most of the binary files tend to contain</div><div class='add'>+control characters, especially 0 (NUL).  Even though the older text</div><div class='add'>+detection schemes observe the presence of non-ASCII codes from the range</div><div class='add'>+[128..255], the precision rarely has to suffer if this upper range is</div><div class='add'>+labeled as textual, because the files that are genuinely binary tend to</div><div class='add'>+contain both control characters and codes from the upper range.  On the</div><div class='add'>+other hand, the upper range needs to be labeled as textual, because it</div><div class='add'>+is used by virtually all ASCII extensions.  In particular, this range is</div><div class='add'>+used for encoding non-Latin scripts.</div><div class='add'>+</div><div class='add'>+Since there is no counting involved, other than simply observing the</div><div class='add'>+presence or the absence of some byte values, the algorithm produces</div><div class='add'>+consistent results, regardless what alphabet encoding is being used.</div><div class='add'>+(If counting were involved, it could be possible to obtain different</div><div class='add'>+results on a text encoded, say, using ISO-8859-16 versus UTF-8.)</div><div class='add'>+</div><div class='add'>+There is an extra category of plain text files that are "polluted" with</div><div class='add'>+one or more black-listed codes, either by mistake or by peculiar design</div><div class='add'>+considerations.  In such cases, a scheme that tolerates a small fraction</div><div class='add'>+of black-listed codes would provide an increased recall (i.e. more true</div><div class='add'>+positives).  This, however, incurs a reduced precision overall, since</div><div class='add'>+false positives are more likely to appear in binary files that contain</div><div class='add'>+large chunks of textual data.  Furthermore, "polluted" plain text should</div><div class='add'>+be regarded as binary by general-purpose text detection schemes, because</div><div class='add'>+general-purpose text processing algorithms might not be applicable.</div><div class='add'>+Under this premise, it is safe to say that our detection method provides</div><div class='add'>+a near-100% recall.</div><div class='add'>+</div><div class='add'>+Experiments have been run on many files coming from various platforms</div><div class='add'>+and applications.  We tried plain text files, system logs, source code,</div><div class='add'>+formatted office documents, compiled object code, etc.  The results</div><div class='add'>+confirm the optimistic assumptions about the capabilities of this</div><div class='add'>+algorithm.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+--</div><div class='add'>+Cosmin Truta</div><div class='add'>+Last updated: 2006-May-28</div><div class='head'>diff --git a/src/3rdparty/zlib/example.c b/src/3rdparty/zlib/example.c<br/>index 6c8a0ee..604736f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/example.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/example.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/example.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/example.c</a></div><div class='hunk'>@@ -1,12 +1,12 @@</div><div class='ctx'> /* example.c -- usage example of the zlib compression library</div><div class='del'>- * Copyright (C) 1995-2004 Jean-loup Gailly.</div><div class='add'>+ * Copyright (C) 1995-2006 Jean-loup Gailly.</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* @(#) $Id$ */</div><div class='ctx'> </div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='ctx'> #include "zlib.h"</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef STDC</div><div class='ctx'> #  include &lt;string.h&gt;</div><div class='head'>diff --git a/src/3rdparty/zlib/examples/README.examples b/src/3rdparty/zlib/examples/README.examples<br/>deleted file mode 100644<br/>index 5632d7a..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/examples/README.examples?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/README.examples</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-This directory contains examples of the use of zlib.</div><div class='del'>-</div><div class='del'>-fitblk.c</div><div class='del'>-    compress just enough input to nearly fill a requested output size</div><div class='del'>-    - zlib isn't designed to do this, but fitblk does it anyway</div><div class='del'>-</div><div class='del'>-gun.c</div><div class='del'>-    uncompress a gzip file</div><div class='del'>-    - illustrates the use of inflateBack() for high speed file-to-file</div><div class='del'>-      decompression using call-back functions</div><div class='del'>-    - is approximately twice as fast as gzip -d</div><div class='del'>-    - also provides Unix uncompress functionality, again twice as fast</div><div class='del'>-</div><div class='del'>-gzappend.c</div><div class='del'>-    append to a gzip file</div><div class='del'>-    - illustrates the use of the Z_BLOCK flush parameter for inflate()</div><div class='del'>-    - illustrates the use of deflatePrime() to start at any bit</div><div class='del'>-</div><div class='del'>-gzjoin.c</div><div class='del'>-    join gzip files without recalculating the crc or recompressing</div><div class='del'>-    - illustrates the use of the Z_BLOCK flush parameter for inflate()</div><div class='del'>-    - illustrates the use of crc32_combine()</div><div class='del'>-</div><div class='del'>-gzlog.c</div><div class='del'>-gzlog.h</div><div class='del'>-    efficiently maintain a message log file in gzip format</div><div class='del'>-    - illustrates use of raw deflate and Z_SYNC_FLUSH</div><div class='del'>-    - illustrates use of gzip header extra field</div><div class='del'>-</div><div class='del'>-zlib_how.html</div><div class='del'>-    painfully comprehensive description of zpipe.c (see below)</div><div class='del'>-    - describes in excruciating detail the use of deflate() and inflate()</div><div class='del'>-</div><div class='del'>-zpipe.c</div><div class='del'>-    reads and writes zlib streams from stdin to stdout</div><div class='del'>-    - illustrates the proper use of deflate() and inflate()</div><div class='del'>-    - deeply commented in zlib_how.html (see above)</div><div class='del'>-</div><div class='del'>-zran.c</div><div class='del'>-    index a zlib or gzip stream and randomly access it</div><div class='del'>-    - illustrates the use of Z_BLOCK, inflatePrime(), and</div><div class='del'>-      inflateSetDictionary() to provide random access</div><div class='head'>diff --git a/src/3rdparty/zlib/examples/fitblk.c b/src/3rdparty/zlib/examples/fitblk.c<br/>deleted file mode 100644<br/>index c61de5c..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/examples/fitblk.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/fitblk.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,233 +0,0 @@</div><div class='del'>-/* fitblk.c: example of fitting compressed output to a specified size</div><div class='del'>-   Not copyrighted -- provided to the public domain</div><div class='del'>-   Version 1.1  25 November 2004  Mark Adler */</div><div class='del'>-</div><div class='del'>-/* Version history:</div><div class='del'>-   1.0  24 Nov 2004  First version</div><div class='del'>-   1.1  25 Nov 2004  Change deflateInit2() to deflateInit()</div><div class='del'>-                     Use fixed-size, stack-allocated raw buffers</div><div class='del'>-                     Simplify code moving compression to subroutines</div><div class='del'>-                     Use assert() for internal errors</div><div class='del'>-                     Add detailed description of approach</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Approach to just fitting a requested compressed size:</div><div class='del'>-</div><div class='del'>-   fitblk performs three compression passes on a portion of the input</div><div class='del'>-   data in order to determine how much of that input will compress to</div><div class='del'>-   nearly the requested output block size.  The first pass generates</div><div class='del'>-   enough deflate blocks to produce output to fill the requested</div><div class='del'>-   output size plus a specfied excess amount (see the EXCESS define</div><div class='del'>-   below).  The last deflate block may go quite a bit past that, but</div><div class='del'>-   is discarded.  The second pass decompresses and recompresses just</div><div class='del'>-   the compressed data that fit in the requested plus excess sized</div><div class='del'>-   buffer.  The deflate process is terminated after that amount of</div><div class='del'>-   input, which is less than the amount consumed on the first pass.</div><div class='del'>-   The last deflate block of the result will be of a comparable size</div><div class='del'>-   to the final product, so that the header for that deflate block and</div><div class='del'>-   the compression ratio for that block will be about the same as in</div><div class='del'>-   the final product.  The third compression pass decompresses the</div><div class='del'>-   result of the second step, but only the compressed data up to the</div><div class='del'>-   requested size minus an amount to allow the compressed stream to</div><div class='del'>-   complete (see the MARGIN define below).  That will result in a</div><div class='del'>-   final compressed stream whose length is less than or equal to the</div><div class='del'>-   requested size.  Assuming sufficient input and a requested size</div><div class='del'>-   greater than a few hundred bytes, the shortfall will typically be</div><div class='del'>-   less than ten bytes.</div><div class='del'>-</div><div class='del'>-   If the input is short enough that the first compression completes</div><div class='del'>-   before filling the requested output size, then that compressed</div><div class='del'>-   stream is return with no recompression.</div><div class='del'>-</div><div class='del'>-   EXCESS is chosen to be just greater than the shortfall seen in a</div><div class='del'>-   two pass approach similar to the above.  That shortfall is due to</div><div class='del'>-   the last deflate block compressing more efficiently with a smaller</div><div class='del'>-   header on the second pass.  EXCESS is set to be large enough so</div><div class='del'>-   that there is enough uncompressed data for the second pass to fill</div><div class='del'>-   out the requested size, and small enough so that the final deflate</div><div class='del'>-   block of the second pass will be close in size to the final deflate</div><div class='del'>-   block of the third and final pass.  MARGIN is chosen to be just</div><div class='del'>-   large enough to assure that the final compression has enough room</div><div class='del'>-   to complete in all cases.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;assert.h&gt;</div><div class='del'>-#include "zlib.h"</div><div class='del'>-</div><div class='del'>-#define local static</div><div class='del'>-</div><div class='del'>-/* print nastygram and leave */</div><div class='del'>-local void quit(char *why)</div><div class='del'>-{</div><div class='del'>-    fprintf(stderr, "fitblk abort: %s\n", why);</div><div class='del'>-    exit(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define RAWLEN 4096    /* intermediate uncompressed buffer size */</div><div class='del'>-</div><div class='del'>-/* compress from file to def until provided buffer is full or end of</div><div class='del'>-   input reached; return last deflate() return value, or Z_ERRNO if</div><div class='del'>-   there was read error on the file */</div><div class='del'>-local int partcompress(FILE *in, z_streamp def)</div><div class='del'>-{</div><div class='del'>-    int ret, flush;</div><div class='del'>-    unsigned char raw[RAWLEN];</div><div class='del'>-</div><div class='del'>-    flush = Z_NO_FLUSH;</div><div class='del'>-    do {</div><div class='del'>-        def-&gt;avail_in = fread(raw, 1, RAWLEN, in);</div><div class='del'>-        if (ferror(in))</div><div class='del'>-            return Z_ERRNO;</div><div class='del'>-        def-&gt;next_in = raw;</div><div class='del'>-        if (feof(in))</div><div class='del'>-            flush = Z_FINISH;</div><div class='del'>-        ret = deflate(def, flush);</div><div class='del'>-        assert(ret != Z_STREAM_ERROR);</div><div class='del'>-    } while (def-&gt;avail_out != 0 &amp;&amp; flush == Z_NO_FLUSH);</div><div class='del'>-    return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* recompress from inf's input to def's output; the input for inf and</div><div class='del'>-   the output for def are set in those structures before calling;</div><div class='del'>-   return last deflate() return value, or Z_MEM_ERROR if inflate()</div><div class='del'>-   was not able to allocate enough memory when it needed to */</div><div class='del'>-local int recompress(z_streamp inf, z_streamp def)</div><div class='del'>-{</div><div class='del'>-    int ret, flush;</div><div class='del'>-    unsigned char raw[RAWLEN];</div><div class='del'>-</div><div class='del'>-    flush = Z_NO_FLUSH;</div><div class='del'>-    do {</div><div class='del'>-        /* decompress */</div><div class='del'>-        inf-&gt;avail_out = RAWLEN;</div><div class='del'>-        inf-&gt;next_out = raw;</div><div class='del'>-        ret = inflate(inf, Z_NO_FLUSH);</div><div class='del'>-        assert(ret != Z_STREAM_ERROR &amp;&amp; ret != Z_DATA_ERROR &amp;&amp;</div><div class='del'>-               ret != Z_NEED_DICT);</div><div class='del'>-        if (ret == Z_MEM_ERROR)</div><div class='del'>-            return ret;</div><div class='del'>-</div><div class='del'>-        /* compress what was decompresed until done or no room */</div><div class='del'>-        def-&gt;avail_in = RAWLEN - inf-&gt;avail_out;</div><div class='del'>-        def-&gt;next_in = raw;</div><div class='del'>-        if (inf-&gt;avail_out != 0)</div><div class='del'>-            flush = Z_FINISH;</div><div class='del'>-        ret = deflate(def, flush);</div><div class='del'>-        assert(ret != Z_STREAM_ERROR);</div><div class='del'>-    } while (ret != Z_STREAM_END &amp;&amp; def-&gt;avail_out != 0);</div><div class='del'>-    return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define EXCESS 256      /* empirically determined stream overage */</div><div class='del'>-#define MARGIN 8        /* amount to back off for completion */</div><div class='del'>-</div><div class='del'>-/* compress from stdin to fixed-size block on stdout */</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-    int ret;                /* return code */</div><div class='del'>-    unsigned size;          /* requested fixed output block size */</div><div class='del'>-    unsigned have;          /* bytes written by deflate() call */</div><div class='del'>-    unsigned char *blk;     /* intermediate and final stream */</div><div class='del'>-    unsigned char *tmp;     /* close to desired size stream */</div><div class='del'>-    z_stream def, inf;      /* zlib deflate and inflate states */</div><div class='del'>-</div><div class='del'>-    /* get requested output size */</div><div class='del'>-    if (argc != 2)</div><div class='del'>-        quit("need one argument: size of output block");</div><div class='del'>-    ret = strtol(argv[1], argv + 1, 10);</div><div class='del'>-    if (argv[1][0] != 0)</div><div class='del'>-        quit("argument must be a number");</div><div class='del'>-    if (ret &lt; 8)            /* 8 is minimum zlib stream size */</div><div class='del'>-        quit("need positive size of 8 or greater");</div><div class='del'>-    size = (unsigned)ret;</div><div class='del'>-</div><div class='del'>-    /* allocate memory for buffers and compression engine */</div><div class='del'>-    blk = malloc(size + EXCESS);</div><div class='del'>-    def.zalloc = Z_NULL;</div><div class='del'>-    def.zfree = Z_NULL;</div><div class='del'>-    def.opaque = Z_NULL;</div><div class='del'>-    ret = deflateInit(&amp;def, Z_DEFAULT_COMPRESSION);</div><div class='del'>-    if (ret != Z_OK || blk == NULL)</div><div class='del'>-        quit("out of memory");</div><div class='del'>-</div><div class='del'>-    /* compress from stdin until output full, or no more input */</div><div class='del'>-    def.avail_out = size + EXCESS;</div><div class='del'>-    def.next_out = blk;</div><div class='del'>-    ret = partcompress(stdin, &amp;def);</div><div class='del'>-    if (ret == Z_ERRNO)</div><div class='del'>-        quit("error reading input");</div><div class='del'>-</div><div class='del'>-    /* if it all fit, then size was undersubscribed -- done! */</div><div class='del'>-    if (ret == Z_STREAM_END &amp;&amp; def.avail_out &gt;= EXCESS) {</div><div class='del'>-        /* write block to stdout */</div><div class='del'>-        have = size + EXCESS - def.avail_out;</div><div class='del'>-        if (fwrite(blk, 1, have, stdout) != have || ferror(stdout))</div><div class='del'>-            quit("error writing output");</div><div class='del'>-</div><div class='del'>-        /* clean up and print results to stderr */</div><div class='del'>-        ret = deflateEnd(&amp;def);</div><div class='del'>-        assert(ret != Z_STREAM_ERROR);</div><div class='del'>-        free(blk);</div><div class='del'>-        fprintf(stderr,</div><div class='del'>-                "%u bytes unused out of %u requested (all input)\n",</div><div class='del'>-                size - have, size);</div><div class='del'>-        return 0;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* it didn't all fit -- set up for recompression */</div><div class='del'>-    inf.zalloc = Z_NULL;</div><div class='del'>-    inf.zfree = Z_NULL;</div><div class='del'>-    inf.opaque = Z_NULL;</div><div class='del'>-    inf.avail_in = 0;</div><div class='del'>-    inf.next_in = Z_NULL;</div><div class='del'>-    ret = inflateInit(&amp;inf);</div><div class='del'>-    tmp = malloc(size + EXCESS);</div><div class='del'>-    if (ret != Z_OK || tmp == NULL)</div><div class='del'>-        quit("out of memory");</div><div class='del'>-    ret = deflateReset(&amp;def);</div><div class='del'>-    assert(ret != Z_STREAM_ERROR);</div><div class='del'>-</div><div class='del'>-    /* do first recompression close to the right amount */</div><div class='del'>-    inf.avail_in = size + EXCESS;</div><div class='del'>-    inf.next_in = blk;</div><div class='del'>-    def.avail_out = size + EXCESS;</div><div class='del'>-    def.next_out = tmp;</div><div class='del'>-    ret = recompress(&amp;inf, &amp;def);</div><div class='del'>-    if (ret == Z_MEM_ERROR)</div><div class='del'>-        quit("out of memory");</div><div class='del'>-</div><div class='del'>-    /* set up for next reocmpression */</div><div class='del'>-    ret = inflateReset(&amp;inf);</div><div class='del'>-    assert(ret != Z_STREAM_ERROR);</div><div class='del'>-    ret = deflateReset(&amp;def);</div><div class='del'>-    assert(ret != Z_STREAM_ERROR);</div><div class='del'>-</div><div class='del'>-    /* do second and final recompression (third compression) */</div><div class='del'>-    inf.avail_in = size - MARGIN;   /* assure stream will complete */</div><div class='del'>-    inf.next_in = tmp;</div><div class='del'>-    def.avail_out = size;</div><div class='del'>-    def.next_out = blk;</div><div class='del'>-    ret = recompress(&amp;inf, &amp;def);</div><div class='del'>-    if (ret == Z_MEM_ERROR)</div><div class='del'>-        quit("out of memory");</div><div class='del'>-    assert(ret == Z_STREAM_END);    /* otherwise MARGIN too small */</div><div class='del'>-</div><div class='del'>-    /* done -- write block to stdout */</div><div class='del'>-    have = size - def.avail_out;</div><div class='del'>-    if (fwrite(blk, 1, have, stdout) != have || ferror(stdout))</div><div class='del'>-        quit("error writing output");</div><div class='del'>-</div><div class='del'>-    /* clean up and print results to stderr */</div><div class='del'>-    free(tmp);</div><div class='del'>-    ret = inflateEnd(&amp;inf);</div><div class='del'>-    assert(ret != Z_STREAM_ERROR);</div><div class='del'>-    ret = deflateEnd(&amp;def);</div><div class='del'>-    assert(ret != Z_STREAM_ERROR);</div><div class='del'>-    free(blk);</div><div class='del'>-    fprintf(stderr,</div><div class='del'>-            "%u bytes unused out of %u requested (%lu input)\n",</div><div class='del'>-            size - have, size, def.total_in);</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/src/3rdparty/zlib/examples/gun.c b/src/3rdparty/zlib/examples/gun.c<br/>deleted file mode 100644<br/>index bfec590..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/examples/gun.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/gun.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,693 +0,0 @@</div><div class='del'>-/* gun.c -- simple gunzip to give an example of the use of inflateBack()</div><div class='del'>- * Copyright (C) 2003, 2005 Mark Adler</div><div class='del'>- * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='del'>-   Version 1.3  12 June 2005  Mark Adler */</div><div class='del'>-</div><div class='del'>-/* Version history:</div><div class='del'>-   1.0  16 Feb 2003  First version for testing of inflateBack()</div><div class='del'>-   1.1  21 Feb 2005  Decompress concatenated gzip streams</div><div class='del'>-                     Remove use of "this" variable (C++ keyword)</div><div class='del'>-                     Fix return value for in()</div><div class='del'>-                     Improve allocation failure checking</div><div class='del'>-                     Add typecasting for void * structures</div><div class='del'>-                     Add -h option for command version and usage</div><div class='del'>-                     Add a bunch of comments</div><div class='del'>-   1.2  20 Mar 2005  Add Unix compress (LZW) decompression</div><div class='del'>-                     Copy file attributes from input file to output file</div><div class='del'>-   1.3  12 Jun 2005  Add casts for error messages [Oberhumer]</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-   gun [ -t ] [ name ... ]</div><div class='del'>-</div><div class='del'>-   decompresses the data in the named gzip files.  If no arguments are given,</div><div class='del'>-   gun will decompress from stdin to stdout.  The names must end in .gz, -gz,</div><div class='del'>-   .z, -z, _z, or .Z.  The uncompressed data will be written to a file name</div><div class='del'>-   with the suffix stripped.  On success, the original file is deleted.  On</div><div class='del'>-   failure, the output file is deleted.  For most failures, the command will</div><div class='del'>-   continue to process the remaining names on the command line.  A memory</div><div class='del'>-   allocation failure will abort the command.  If -t is specified, then the</div><div class='del'>-   listed files or stdin will be tested as gzip files for integrity (without</div><div class='del'>-   checking for a proper suffix), no output will be written, and no files</div><div class='del'>-   will be deleted.</div><div class='del'>-</div><div class='del'>-   Like gzip, gun allows concatenated gzip streams and will decompress them,</div><div class='del'>-   writing all of the uncompressed data to the output.  Unlike gzip, gun allows</div><div class='del'>-   an empty file on input, and will produce no error writing an empty output</div><div class='del'>-   file.</div><div class='del'>-</div><div class='del'>-   gun will also decompress files made by Unix compress, which uses LZW</div><div class='del'>-   compression.  These files are automatically detected by virtue of their</div><div class='del'>-   magic header bytes.  Since the end of Unix compress stream is marked by the</div><div class='del'>-   end-of-file, they cannot be concantenated.  If a Unix compress stream is</div><div class='del'>-   encountered in an input file, it is the last stream in that file.</div><div class='del'>-</div><div class='del'>-   Like gunzip and uncompress, the file attributes of the orignal compressed</div><div class='del'>-   file are maintained in the final uncompressed file, to the extent that the</div><div class='del'>-   user permissions allow it.</div><div class='del'>-</div><div class='del'>-   On my Mac OS X PowerPC G4, gun is almost twice as fast as gunzip (version</div><div class='del'>-   1.2.4) is on the same file, when gun is linked with zlib 1.2.2.  Also the</div><div class='del'>-   LZW decompression provided by gun is about twice as fast as the standard</div><div class='del'>-   Unix uncompress command.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* external functions and related types and constants */</div><div class='del'>-#include &lt;stdio.h&gt;          /* fprintf() */</div><div class='del'>-#include &lt;stdlib.h&gt;         /* malloc(), free() */</div><div class='del'>-#include &lt;string.h&gt;         /* strerror(), strcmp(), strlen(), memcpy() */</div><div class='del'>-#include &lt;errno.h&gt;          /* errno */</div><div class='del'>-#include &lt;fcntl.h&gt;          /* open() */</div><div class='del'>-#include &lt;unistd.h&gt;         /* read(), write(), close(), chown(), unlink() */</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;       /* stat(), chmod() */</div><div class='del'>-#include &lt;utime.h&gt;          /* utime() */</div><div class='del'>-#include "zlib.h"           /* inflateBackInit(), inflateBack(), */</div><div class='del'>-                            /* inflateBackEnd(), crc32() */</div><div class='del'>-</div><div class='del'>-/* function declaration */</div><div class='del'>-#define local static</div><div class='del'>-</div><div class='del'>-/* buffer constants */</div><div class='del'>-#define SIZE 32768U         /* input and output buffer sizes */</div><div class='del'>-#define PIECE 16384         /* limits i/o chunks for 16-bit int case */</div><div class='del'>-</div><div class='del'>-/* structure for infback() to pass to input function in() -- it maintains the</div><div class='del'>-   input file and a buffer of size SIZE */</div><div class='del'>-struct ind {</div><div class='del'>-    int infile;</div><div class='del'>-    unsigned char *inbuf;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Load input buffer, assumed to be empty, and return bytes loaded and a</div><div class='del'>-   pointer to them.  read() is called until the buffer is full, or until it</div><div class='del'>-   returns end-of-file or error.  Return 0 on error. */</div><div class='del'>-local unsigned in(void *in_desc, unsigned char **buf)</div><div class='del'>-{</div><div class='del'>-    int ret;</div><div class='del'>-    unsigned len;</div><div class='del'>-    unsigned char *next;</div><div class='del'>-    struct ind *me = (struct ind *)in_desc;</div><div class='del'>-</div><div class='del'>-    next = me-&gt;inbuf;</div><div class='del'>-    *buf = next;</div><div class='del'>-    len = 0;</div><div class='del'>-    do {</div><div class='del'>-        ret = PIECE;</div><div class='del'>-        if ((unsigned)ret &gt; SIZE - len)</div><div class='del'>-            ret = (int)(SIZE - len);</div><div class='del'>-        ret = (int)read(me-&gt;infile, next, ret);</div><div class='del'>-        if (ret == -1) {</div><div class='del'>-            len = 0;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        next += ret;</div><div class='del'>-        len += ret;</div><div class='del'>-    } while (ret != 0 &amp;&amp; len &lt; SIZE);</div><div class='del'>-    return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* structure for infback() to pass to output function out() -- it maintains the</div><div class='del'>-   output file, a running CRC-32 check on the output and the total number of</div><div class='del'>-   bytes output, both for checking against the gzip trailer.  (The length in</div><div class='del'>-   the gzip trailer is stored modulo 2^32, so it's ok if a long is 32 bits and</div><div class='del'>-   the output is greater than 4 GB.) */</div><div class='del'>-struct outd {</div><div class='del'>-    int outfile;</div><div class='del'>-    int check;                  /* true if checking crc and total */</div><div class='del'>-    unsigned long crc;</div><div class='del'>-    unsigned long total;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Write output buffer and update the CRC-32 and total bytes written.  write()</div><div class='del'>-   is called until all of the output is written or an error is encountered.</div><div class='del'>-   On success out() returns 0.  For a write failure, out() returns 1.  If the</div><div class='del'>-   output file descriptor is -1, then nothing is written.</div><div class='del'>- */</div><div class='del'>-local int out(void *out_desc, unsigned char *buf, unsigned len)</div><div class='del'>-{</div><div class='del'>-    int ret;</div><div class='del'>-    struct outd *me = (struct outd *)out_desc;</div><div class='del'>-</div><div class='del'>-    if (me-&gt;check) {</div><div class='del'>-        me-&gt;crc = crc32(me-&gt;crc, buf, len);</div><div class='del'>-        me-&gt;total += len;</div><div class='del'>-    }</div><div class='del'>-    if (me-&gt;outfile != -1)</div><div class='del'>-        do {</div><div class='del'>-            ret = PIECE;</div><div class='del'>-            if ((unsigned)ret &gt; len)</div><div class='del'>-                ret = (int)len;</div><div class='del'>-            ret = (int)write(me-&gt;outfile, buf, ret);</div><div class='del'>-            if (ret == -1)</div><div class='del'>-                return 1;</div><div class='del'>-            buf += ret;</div><div class='del'>-            len -= ret;</div><div class='del'>-        } while (len != 0);</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* next input byte macro for use inside lunpipe() and gunpipe() */</div><div class='del'>-#define NEXT() (have ? 0 : (have = in(indp, &amp;next)), \</div><div class='del'>-                last = have ? (have--, (int)(*next++)) : -1)</div><div class='del'>-</div><div class='del'>-/* memory for gunpipe() and lunpipe() --</div><div class='del'>-   the first 256 entries of prefix[] and suffix[] are never used, could</div><div class='del'>-   have offset the index, but it's faster to waste the memory */</div><div class='del'>-unsigned char inbuf[SIZE];              /* input buffer */</div><div class='del'>-unsigned char outbuf[SIZE];             /* output buffer */</div><div class='del'>-unsigned short prefix[65536];           /* index to LZW prefix string */</div><div class='del'>-unsigned char suffix[65536];            /* one-character LZW suffix */</div><div class='del'>-unsigned char match[65280 + 2];         /* buffer for reversed match or gzip</div><div class='del'>-                                           32K sliding window */</div><div class='del'>-</div><div class='del'>-/* throw out what's left in the current bits byte buffer (this is a vestigial</div><div class='del'>-   aspect of the compressed data format derived from an implementation that</div><div class='del'>-   made use of a special VAX machine instruction!) */</div><div class='del'>-#define FLUSHCODE() \</div><div class='del'>-    do { \</div><div class='del'>-        left = 0; \</div><div class='del'>-        rem = 0; \</div><div class='del'>-        if (chunk &gt; have) { \</div><div class='del'>-            chunk -= have; \</div><div class='del'>-            have = 0; \</div><div class='del'>-            if (NEXT() == -1) \</div><div class='del'>-                break; \</div><div class='del'>-            chunk--; \</div><div class='del'>-            if (chunk &gt; have) { \</div><div class='del'>-                chunk = have = 0; \</div><div class='del'>-                break; \</div><div class='del'>-            } \</div><div class='del'>-        } \</div><div class='del'>-        have -= chunk; \</div><div class='del'>-        next += chunk; \</div><div class='del'>-        chunk = 0; \</div><div class='del'>-    } while (0)</div><div class='del'>-</div><div class='del'>-/* Decompress a compress (LZW) file from indp to outfile.  The compress magic</div><div class='del'>-   header (two bytes) has already been read and verified.  There are have bytes</div><div class='del'>-   of buffered input at next.  strm is used for passing error information back</div><div class='del'>-   to gunpipe().</div><div class='del'>-</div><div class='del'>-   lunpipe() will return Z_OK on success, Z_BUF_ERROR for an unexpected end of</div><div class='del'>-   file, read error, or write error (a write error indicated by strm-&gt;next_in</div><div class='del'>-   not equal to Z_NULL), or Z_DATA_ERROR for invalid input.</div><div class='del'>- */</div><div class='del'>-local int lunpipe(unsigned have, unsigned char *next, struct ind *indp,</div><div class='del'>-                  int outfile, z_stream *strm)</div><div class='del'>-{</div><div class='del'>-    int last;                   /* last byte read by NEXT(), or -1 if EOF */</div><div class='del'>-    int chunk;                  /* bytes left in current chunk */</div><div class='del'>-    int left;                   /* bits left in rem */</div><div class='del'>-    unsigned rem;               /* unused bits from input */</div><div class='del'>-    int bits;                   /* current bits per code */</div><div class='del'>-    unsigned code;              /* code, table traversal index */</div><div class='del'>-    unsigned mask;              /* mask for current bits codes */</div><div class='del'>-    int max;                    /* maximum bits per code for this stream */</div><div class='del'>-    int flags;                  /* compress flags, then block compress flag */</div><div class='del'>-    unsigned end;               /* last valid entry in prefix/suffix tables */</div><div class='del'>-    unsigned temp;              /* current code */</div><div class='del'>-    unsigned prev;              /* previous code */</div><div class='del'>-    unsigned final;             /* last character written for previous code */</div><div class='del'>-    unsigned stack;             /* next position for reversed string */</div><div class='del'>-    unsigned outcnt;            /* bytes in output buffer */</div><div class='del'>-    struct outd outd;           /* output structure */</div><div class='del'>-</div><div class='del'>-    /* set up output */</div><div class='del'>-    outd.outfile = outfile;</div><div class='del'>-    outd.check = 0;</div><div class='del'>-</div><div class='del'>-    /* process remainder of compress header -- a flags byte */</div><div class='del'>-    flags = NEXT();</div><div class='del'>-    if (last == -1)</div><div class='del'>-        return Z_BUF_ERROR;</div><div class='del'>-    if (flags &amp; 0x60) {</div><div class='del'>-        strm-&gt;msg = (char *)"unknown lzw flags set";</div><div class='del'>-        return Z_DATA_ERROR;</div><div class='del'>-    }</div><div class='del'>-    max = flags &amp; 0x1f;</div><div class='del'>-    if (max &lt; 9 || max &gt; 16) {</div><div class='del'>-        strm-&gt;msg = (char *)"lzw bits out of range";</div><div class='del'>-        return Z_DATA_ERROR;</div><div class='del'>-    }</div><div class='del'>-    if (max == 9)                           /* 9 doesn't really mean 9 */</div><div class='del'>-        max = 10;</div><div class='del'>-    flags &amp;= 0x80;                          /* true if block compress */</div><div class='del'>-</div><div class='del'>-    /* clear table */</div><div class='del'>-    bits = 9;</div><div class='del'>-    mask = 0x1ff;</div><div class='del'>-    end = flags ? 256 : 255;</div><div class='del'>-</div><div class='del'>-    /* set up: get first 9-bit code, which is the first decompressed byte, but</div><div class='del'>-       don't create a table entry until the next code */</div><div class='del'>-    if (NEXT() == -1)                       /* no compressed data is ok */</div><div class='del'>-        return Z_OK;</div><div class='del'>-    final = prev = (unsigned)last;          /* low 8 bits of code */</div><div class='del'>-    if (NEXT() == -1)                       /* missing a bit */</div><div class='del'>-        return Z_BUF_ERROR;</div><div class='del'>-    if (last &amp; 1) {                         /* code must be &lt; 256 */</div><div class='del'>-        strm-&gt;msg = (char *)"invalid lzw code";</div><div class='del'>-        return Z_DATA_ERROR;</div><div class='del'>-    }</div><div class='del'>-    rem = (unsigned)last &gt;&gt; 1;              /* remaining 7 bits */</div><div class='del'>-    left = 7;</div><div class='del'>-    chunk = bits - 2;                       /* 7 bytes left in this chunk */</div><div class='del'>-    outbuf[0] = (unsigned char)final;       /* write first decompressed byte */</div><div class='del'>-    outcnt = 1;</div><div class='del'>-</div><div class='del'>-    /* decode codes */</div><div class='del'>-    stack = 0;</div><div class='del'>-    for (;;) {</div><div class='del'>-        /* if the table will be full after this, increment the code size */</div><div class='del'>-        if (end &gt;= mask &amp;&amp; bits &lt; max) {</div><div class='del'>-            FLUSHCODE();</div><div class='del'>-            bits++;</div><div class='del'>-            mask &lt;&lt;= 1;</div><div class='del'>-            mask++;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* get a code of length bits */</div><div class='del'>-        if (chunk == 0)                     /* decrement chunk modulo bits */</div><div class='del'>-            chunk = bits;</div><div class='del'>-        code = rem;                         /* low bits of code */</div><div class='del'>-        if (NEXT() == -1) {                 /* EOF is end of compressed data */</div><div class='del'>-            /* write remaining buffered output */</div><div class='del'>-            if (outcnt &amp;&amp; out(&amp;outd, outbuf, outcnt)) {</div><div class='del'>-                strm-&gt;next_in = outbuf;     /* signal write error */</div><div class='del'>-                return Z_BUF_ERROR;</div><div class='del'>-            }</div><div class='del'>-            return Z_OK;</div><div class='del'>-        }</div><div class='del'>-        code += (unsigned)last &lt;&lt; left;     /* middle (or high) bits of code */</div><div class='del'>-        left += 8;</div><div class='del'>-        chunk--;</div><div class='del'>-        if (bits &gt; left) {                  /* need more bits */</div><div class='del'>-            if (NEXT() == -1)               /* can't end in middle of code */</div><div class='del'>-                return Z_BUF_ERROR;</div><div class='del'>-            code += (unsigned)last &lt;&lt; left; /* high bits of code */</div><div class='del'>-            left += 8;</div><div class='del'>-            chunk--;</div><div class='del'>-        }</div><div class='del'>-        code &amp;= mask;                       /* mask to current code length */</div><div class='del'>-        left -= bits;                       /* number of unused bits */</div><div class='del'>-        rem = (unsigned)last &gt;&gt; (8 - left); /* unused bits from last byte */</div><div class='del'>-</div><div class='del'>-        /* process clear code (256) */</div><div class='del'>-        if (code == 256 &amp;&amp; flags) {</div><div class='del'>-            FLUSHCODE();</div><div class='del'>-            bits = 9;                       /* initialize bits and mask */</div><div class='del'>-            mask = 0x1ff;</div><div class='del'>-            end = 255;                      /* empty table */</div><div class='del'>-            continue;                       /* get next code */</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* special code to reuse last match */</div><div class='del'>-        temp = code;                        /* save the current code */</div><div class='del'>-        if (code &gt; end) {</div><div class='del'>-            /* Be picky on the allowed code here, and make sure that the code</div><div class='del'>-               we drop through (prev) will be a valid index so that random</div><div class='del'>-               input does not cause an exception.  The code != end + 1 check is</div><div class='del'>-               empirically derived, and not checked in the original uncompress</div><div class='del'>-               code.  If this ever causes a problem, that check could be safely</div><div class='del'>-               removed.  Leaving this check in greatly improves gun's ability</div><div class='del'>-               to detect random or corrupted input after a compress header.</div><div class='del'>-               In any case, the prev &gt; end check must be retained. */</div><div class='del'>-            if (code != end + 1 || prev &gt; end) {</div><div class='del'>-                strm-&gt;msg = (char *)"invalid lzw code";</div><div class='del'>-                return Z_DATA_ERROR;</div><div class='del'>-            }</div><div class='del'>-            match[stack++] = (unsigned char)final;</div><div class='del'>-            code = prev;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* walk through linked list to generate output in reverse order */</div><div class='del'>-        while (code &gt;= 256) {</div><div class='del'>-            match[stack++] = suffix[code];</div><div class='del'>-            code = prefix[code];</div><div class='del'>-        }</div><div class='del'>-        match[stack++] = (unsigned char)code;</div><div class='del'>-        final = code;</div><div class='del'>-</div><div class='del'>-        /* link new table entry */</div><div class='del'>-        if (end &lt; mask) {</div><div class='del'>-            end++;</div><div class='del'>-            prefix[end] = (unsigned short)prev;</div><div class='del'>-            suffix[end] = (unsigned char)final;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* set previous code for next iteration */</div><div class='del'>-        prev = temp;</div><div class='del'>-</div><div class='del'>-        /* write output in forward order */</div><div class='del'>-        while (stack &gt; SIZE - outcnt) {</div><div class='del'>-            while (outcnt &lt; SIZE)</div><div class='del'>-                outbuf[outcnt++] = match[--stack];</div><div class='del'>-            if (out(&amp;outd, outbuf, outcnt)) {</div><div class='del'>-                strm-&gt;next_in = outbuf; /* signal write error */</div><div class='del'>-                return Z_BUF_ERROR;</div><div class='del'>-            }</div><div class='del'>-            outcnt = 0;</div><div class='del'>-        }</div><div class='del'>-        do {</div><div class='del'>-            outbuf[outcnt++] = match[--stack];</div><div class='del'>-        } while (stack);</div><div class='del'>-</div><div class='del'>-        /* loop for next code with final and prev as the last match, rem and</div><div class='del'>-           left provide the first 0..7 bits of the next code, end is the last</div><div class='del'>-           valid table entry */</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Decompress a gzip file from infile to outfile.  strm is assumed to have been</div><div class='del'>-   successfully initialized with inflateBackInit().  The input file may consist</div><div class='del'>-   of a series of gzip streams, in which case all of them will be decompressed</div><div class='del'>-   to the output file.  If outfile is -1, then the gzip stream(s) integrity is</div><div class='del'>-   checked and nothing is written.</div><div class='del'>-</div><div class='del'>-   The return value is a zlib error code: Z_MEM_ERROR if out of memory,</div><div class='del'>-   Z_DATA_ERROR if the header or the compressed data is invalid, or if the</div><div class='del'>-   trailer CRC-32 check or length doesn't match, Z_BUF_ERROR if the input ends</div><div class='del'>-   prematurely or a write error occurs, or Z_ERRNO if junk (not a another gzip</div><div class='del'>-   stream) follows a valid gzip stream.</div><div class='del'>- */</div><div class='del'>-local int gunpipe(z_stream *strm, int infile, int outfile)</div><div class='del'>-{</div><div class='del'>-    int ret, first, last;</div><div class='del'>-    unsigned have, flags, len;</div><div class='del'>-    unsigned char *next;</div><div class='del'>-    struct ind ind, *indp;</div><div class='del'>-    struct outd outd;</div><div class='del'>-</div><div class='del'>-    /* setup input buffer */</div><div class='del'>-    ind.infile = infile;</div><div class='del'>-    ind.inbuf = inbuf;</div><div class='del'>-    indp = &amp;ind;</div><div class='del'>-</div><div class='del'>-    /* decompress concatenated gzip streams */</div><div class='del'>-    have = 0;                               /* no input data read in yet */</div><div class='del'>-    first = 1;                              /* looking for first gzip header */</div><div class='del'>-    strm-&gt;next_in = Z_NULL;                 /* so Z_BUF_ERROR means EOF */</div><div class='del'>-    for (;;) {</div><div class='del'>-        /* look for the two magic header bytes for a gzip stream */</div><div class='del'>-        if (NEXT() == -1) {</div><div class='del'>-            ret = Z_OK;</div><div class='del'>-            break;                          /* empty gzip stream is ok */</div><div class='del'>-        }</div><div class='del'>-        if (last != 31 || (NEXT() != 139 &amp;&amp; last != 157)) {</div><div class='del'>-            strm-&gt;msg = (char *)"incorrect header check";</div><div class='del'>-            ret = first ? Z_DATA_ERROR : Z_ERRNO;</div><div class='del'>-            break;                          /* not a gzip or compress header */</div><div class='del'>-        }</div><div class='del'>-        first = 0;                          /* next non-header is junk */</div><div class='del'>-</div><div class='del'>-        /* process a compress (LZW) file -- can't be concatenated after this */</div><div class='del'>-        if (last == 157) {</div><div class='del'>-            ret = lunpipe(have, next, indp, outfile, strm);</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* process remainder of gzip header */</div><div class='del'>-        ret = Z_BUF_ERROR;</div><div class='del'>-        if (NEXT() != 8) {                  /* only deflate method allowed */</div><div class='del'>-            if (last == -1) break;</div><div class='del'>-            strm-&gt;msg = (char *)"unknown compression method";</div><div class='del'>-            ret = Z_DATA_ERROR;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        flags = NEXT();                     /* header flags */</div><div class='del'>-        NEXT();                             /* discard mod time, xflgs, os */</div><div class='del'>-        NEXT();</div><div class='del'>-        NEXT();</div><div class='del'>-        NEXT();</div><div class='del'>-        NEXT();</div><div class='del'>-        NEXT();</div><div class='del'>-        if (last == -1) break;</div><div class='del'>-        if (flags &amp; 0xe0) {</div><div class='del'>-            strm-&gt;msg = (char *)"unknown header flags set";</div><div class='del'>-            ret = Z_DATA_ERROR;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        if (flags &amp; 4) {                    /* extra field */</div><div class='del'>-            len = NEXT();</div><div class='del'>-            len += (unsigned)(NEXT()) &lt;&lt; 8;</div><div class='del'>-            if (last == -1) break;</div><div class='del'>-            while (len &gt; have) {</div><div class='del'>-                len -= have;</div><div class='del'>-                have = 0;</div><div class='del'>-                if (NEXT() == -1) break;</div><div class='del'>-                len--;</div><div class='del'>-            }</div><div class='del'>-            if (last == -1) break;</div><div class='del'>-            have -= len;</div><div class='del'>-            next += len;</div><div class='del'>-        }</div><div class='del'>-        if (flags &amp; 8)                      /* file name */</div><div class='del'>-            while (NEXT() != 0 &amp;&amp; last != -1)</div><div class='del'>-                ;</div><div class='del'>-        if (flags &amp; 16)                     /* comment */</div><div class='del'>-            while (NEXT() != 0 &amp;&amp; last != -1)</div><div class='del'>-                ;</div><div class='del'>-        if (flags &amp; 2) {                    /* header crc */</div><div class='del'>-            NEXT();</div><div class='del'>-            NEXT();</div><div class='del'>-        }</div><div class='del'>-        if (last == -1) break;</div><div class='del'>-</div><div class='del'>-        /* set up output */</div><div class='del'>-        outd.outfile = outfile;</div><div class='del'>-        outd.check = 1;</div><div class='del'>-        outd.crc = crc32(0L, Z_NULL, 0);</div><div class='del'>-        outd.total = 0;</div><div class='del'>-</div><div class='del'>-        /* decompress data to output */</div><div class='del'>-        strm-&gt;next_in = next;</div><div class='del'>-        strm-&gt;avail_in = have;</div><div class='del'>-        ret = inflateBack(strm, in, indp, out, &amp;outd);</div><div class='del'>-        if (ret != Z_STREAM_END) break;</div><div class='del'>-        next = strm-&gt;next_in;</div><div class='del'>-        have = strm-&gt;avail_in;</div><div class='del'>-        strm-&gt;next_in = Z_NULL;             /* so Z_BUF_ERROR means EOF */</div><div class='del'>-</div><div class='del'>-        /* check trailer */</div><div class='del'>-        ret = Z_BUF_ERROR;</div><div class='del'>-        if (NEXT() != (outd.crc &amp; 0xff) ||</div><div class='del'>-            NEXT() != ((outd.crc &gt;&gt; 8) &amp; 0xff) ||</div><div class='del'>-            NEXT() != ((outd.crc &gt;&gt; 16) &amp; 0xff) ||</div><div class='del'>-            NEXT() != ((outd.crc &gt;&gt; 24) &amp; 0xff)) {</div><div class='del'>-            /* crc error */</div><div class='del'>-            if (last != -1) {</div><div class='del'>-                strm-&gt;msg = (char *)"incorrect data check";</div><div class='del'>-                ret = Z_DATA_ERROR;</div><div class='del'>-            }</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        if (NEXT() != (outd.total &amp; 0xff) ||</div><div class='del'>-            NEXT() != ((outd.total &gt;&gt; 8) &amp; 0xff) ||</div><div class='del'>-            NEXT() != ((outd.total &gt;&gt; 16) &amp; 0xff) ||</div><div class='del'>-            NEXT() != ((outd.total &gt;&gt; 24) &amp; 0xff)) {</div><div class='del'>-            /* length error */</div><div class='del'>-            if (last != -1) {</div><div class='del'>-                strm-&gt;msg = (char *)"incorrect length check";</div><div class='del'>-                ret = Z_DATA_ERROR;</div><div class='del'>-            }</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* go back and look for another gzip stream */</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* clean up and return */</div><div class='del'>-    return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Copy file attributes, from -&gt; to, as best we can.  This is best effort, so</div><div class='del'>-   no errors are reported.  The mode bits, including suid, sgid, and the sticky</div><div class='del'>-   bit are copied (if allowed), the owner's user id and group id are copied</div><div class='del'>-   (again if allowed), and the access and modify times are copied. */</div><div class='del'>-local void copymeta(char *from, char *to)</div><div class='del'>-{</div><div class='del'>-    struct stat was;</div><div class='del'>-    struct utimbuf when;</div><div class='del'>-</div><div class='del'>-    /* get all of from's Unix meta data, return if not a regular file */</div><div class='del'>-    if (stat(from, &amp;was) != 0 || (was.st_mode &amp; S_IFMT) != S_IFREG)</div><div class='del'>-        return;</div><div class='del'>-</div><div class='del'>-    /* set to's mode bits, ignore errors */</div><div class='del'>-    (void)chmod(to, was.st_mode &amp; 07777);</div><div class='del'>-</div><div class='del'>-    /* copy owner's user and group, ignore errors */</div><div class='del'>-    (void)chown(to, was.st_uid, was.st_gid);</div><div class='del'>-</div><div class='del'>-    /* copy access and modify times, ignore errors */</div><div class='del'>-    when.actime = was.st_atime;</div><div class='del'>-    when.modtime = was.st_mtime;</div><div class='del'>-    (void)utime(to, &amp;when);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Decompress the file inname to the file outnname, of if test is true, just</div><div class='del'>-   decompress without writing and check the gzip trailer for integrity.  If</div><div class='del'>-   inname is NULL or an empty string, read from stdin.  If outname is NULL or</div><div class='del'>-   an empty string, write to stdout.  strm is a pre-initialized inflateBack</div><div class='del'>-   structure.  When appropriate, copy the file attributes from inname to</div><div class='del'>-   outname.</div><div class='del'>-</div><div class='del'>-   gunzip() returns 1 if there is an out-of-memory error or an unexpected</div><div class='del'>-   return code from gunpipe().  Otherwise it returns 0.</div><div class='del'>- */</div><div class='del'>-local int gunzip(z_stream *strm, char *inname, char *outname, int test)</div><div class='del'>-{</div><div class='del'>-    int ret;</div><div class='del'>-    int infile, outfile;</div><div class='del'>-</div><div class='del'>-    /* open files */</div><div class='del'>-    if (inname == NULL || *inname == 0) {</div><div class='del'>-        inname = "-";</div><div class='del'>-        infile = 0;     /* stdin */</div><div class='del'>-    }</div><div class='del'>-    else {</div><div class='del'>-        infile = open(inname, O_RDONLY, 0);</div><div class='del'>-        if (infile == -1) {</div><div class='del'>-            fprintf(stderr, "gun cannot open %s\n", inname);</div><div class='del'>-            return 0;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    if (test)</div><div class='del'>-        outfile = -1;</div><div class='del'>-    else if (outname == NULL || *outname == 0) {</div><div class='del'>-        outname = "-";</div><div class='del'>-        outfile = 1;    /* stdout */</div><div class='del'>-    }</div><div class='del'>-    else {</div><div class='del'>-        outfile = open(outname, O_CREAT | O_TRUNC | O_WRONLY, 0666);</div><div class='del'>-        if (outfile == -1) {</div><div class='del'>-            close(infile);</div><div class='del'>-            fprintf(stderr, "gun cannot create %s\n", outname);</div><div class='del'>-            return 0;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    errno = 0;</div><div class='del'>-</div><div class='del'>-    /* decompress */</div><div class='del'>-    ret = gunpipe(strm, infile, outfile);</div><div class='del'>-    if (outfile &gt; 2) close(outfile);</div><div class='del'>-    if (infile &gt; 2) close(infile);</div><div class='del'>-</div><div class='del'>-    /* interpret result */</div><div class='del'>-    switch (ret) {</div><div class='del'>-    case Z_OK:</div><div class='del'>-    case Z_ERRNO:</div><div class='del'>-        if (infile &gt; 2 &amp;&amp; outfile &gt; 2) {</div><div class='del'>-            copymeta(inname, outname);          /* copy attributes */</div><div class='del'>-            unlink(inname);</div><div class='del'>-        }</div><div class='del'>-        if (ret == Z_ERRNO)</div><div class='del'>-            fprintf(stderr, "gun warning: trailing garbage ignored in %s\n",</div><div class='del'>-                    inname);</div><div class='del'>-        break;</div><div class='del'>-    case Z_DATA_ERROR:</div><div class='del'>-        if (outfile &gt; 2) unlink(outname);</div><div class='del'>-        fprintf(stderr, "gun data error on %s: %s\n", inname, strm-&gt;msg);</div><div class='del'>-        break;</div><div class='del'>-    case Z_MEM_ERROR:</div><div class='del'>-        if (outfile &gt; 2) unlink(outname);</div><div class='del'>-        fprintf(stderr, "gun out of memory error--aborting\n");</div><div class='del'>-        return 1;</div><div class='del'>-    case Z_BUF_ERROR:</div><div class='del'>-        if (outfile &gt; 2) unlink(outname);</div><div class='del'>-        if (strm-&gt;next_in != Z_NULL) {</div><div class='del'>-            fprintf(stderr, "gun write error on %s: %s\n",</div><div class='del'>-                    outname, strerror(errno));</div><div class='del'>-        }</div><div class='del'>-        else if (errno) {</div><div class='del'>-            fprintf(stderr, "gun read error on %s: %s\n",</div><div class='del'>-                    inname, strerror(errno));</div><div class='del'>-        }</div><div class='del'>-        else {</div><div class='del'>-            fprintf(stderr, "gun unexpected end of file on %s\n",</div><div class='del'>-                    inname);</div><div class='del'>-        }</div><div class='del'>-        break;</div><div class='del'>-    default:</div><div class='del'>-        if (outfile &gt; 2) unlink(outname);</div><div class='del'>-        fprintf(stderr, "gun internal error--aborting\n");</div><div class='del'>-        return 1;</div><div class='del'>-    }</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Process the gun command line arguments.  See the command syntax near the</div><div class='del'>-   beginning of this source file. */</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-    int ret, len, test;</div><div class='del'>-    char *outname;</div><div class='del'>-    unsigned char *window;</div><div class='del'>-    z_stream strm;</div><div class='del'>-</div><div class='del'>-    /* initialize inflateBack state for repeated use */</div><div class='del'>-    window = match;                         /* reuse LZW match buffer */</div><div class='del'>-    strm.zalloc = Z_NULL;</div><div class='del'>-    strm.zfree = Z_NULL;</div><div class='del'>-    strm.opaque = Z_NULL;</div><div class='del'>-    ret = inflateBackInit(&amp;strm, 15, window);</div><div class='del'>-    if (ret != Z_OK) {</div><div class='del'>-        fprintf(stderr, "gun out of memory error--aborting\n");</div><div class='del'>-        return 1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* decompress each file to the same name with the suffix removed */</div><div class='del'>-    argc--;</div><div class='del'>-    argv++;</div><div class='del'>-    test = 0;</div><div class='del'>-    if (argc &amp;&amp; strcmp(*argv, "-h") == 0) {</div><div class='del'>-        fprintf(stderr, "gun 1.3 (12 Jun 2005)\n");</div><div class='del'>-        fprintf(stderr, "Copyright (c) 2005 Mark Adler\n");</div><div class='del'>-        fprintf(stderr, "usage: gun [-t] [file1.gz [file2.Z ...]]\n");</div><div class='del'>-        return 0;</div><div class='del'>-    }</div><div class='del'>-    if (argc &amp;&amp; strcmp(*argv, "-t") == 0) {</div><div class='del'>-        test = 1;</div><div class='del'>-        argc--;</div><div class='del'>-        argv++;</div><div class='del'>-    }</div><div class='del'>-    if (argc)</div><div class='del'>-        do {</div><div class='del'>-            if (test)</div><div class='del'>-                outname = NULL;</div><div class='del'>-            else {</div><div class='del'>-                len = (int)strlen(*argv);</div><div class='del'>-                if (strcmp(*argv + len - 3, ".gz") == 0 ||</div><div class='del'>-                    strcmp(*argv + len - 3, "-gz") == 0)</div><div class='del'>-                    len -= 3;</div><div class='del'>-                else if (strcmp(*argv + len - 2, ".z") == 0 ||</div><div class='del'>-                    strcmp(*argv + len - 2, "-z") == 0 ||</div><div class='del'>-                    strcmp(*argv + len - 2, "_z") == 0 ||</div><div class='del'>-                    strcmp(*argv + len - 2, ".Z") == 0)</div><div class='del'>-                    len -= 2;</div><div class='del'>-                else {</div><div class='del'>-                    fprintf(stderr, "gun error: no gz type on %s--skipping\n",</div><div class='del'>-                            *argv);</div><div class='del'>-                    continue;</div><div class='del'>-                }</div><div class='del'>-                outname = malloc(len + 1);</div><div class='del'>-                if (outname == NULL) {</div><div class='del'>-                    fprintf(stderr, "gun out of memory error--aborting\n");</div><div class='del'>-                    ret = 1;</div><div class='del'>-                    break;</div><div class='del'>-                }</div><div class='del'>-                memcpy(outname, *argv, len);</div><div class='del'>-                outname[len] = 0;</div><div class='del'>-            }</div><div class='del'>-            ret = gunzip(&amp;strm, *argv, outname, test);</div><div class='del'>-            if (outname != NULL) free(outname);</div><div class='del'>-            if (ret) break;</div><div class='del'>-        } while (argv++, --argc);</div><div class='del'>-    else</div><div class='del'>-        ret = gunzip(&amp;strm, NULL, NULL, test);</div><div class='del'>-</div><div class='del'>-    /* clean up */</div><div class='del'>-    inflateBackEnd(&amp;strm);</div><div class='del'>-    return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/src/3rdparty/zlib/examples/gzappend.c b/src/3rdparty/zlib/examples/gzappend.c<br/>deleted file mode 100644<br/>index e9e878e..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/examples/gzappend.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/gzappend.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,500 +0,0 @@</div><div class='del'>-/* gzappend -- command to append to a gzip file</div><div class='del'>-</div><div class='del'>-  Copyright (C) 2003 Mark Adler, all rights reserved</div><div class='del'>-  version 1.1, 4 Nov 2003</div><div class='del'>-</div><div class='del'>-  This software is provided 'as-is', without any express or implied</div><div class='del'>-  warranty.  In no event will the author be held liable for any damages</div><div class='del'>-  arising from the use of this software.</div><div class='del'>-</div><div class='del'>-  Permission is granted to anyone to use this software for any purpose,</div><div class='del'>-  including commercial applications, and to alter it and redistribute it</div><div class='del'>-  freely, subject to the following restrictions:</div><div class='del'>-</div><div class='del'>-  1. The origin of this software must not be misrepresented; you must not</div><div class='del'>-     claim that you wrote the original software. If you use this software</div><div class='del'>-     in a product, an acknowledgment in the product documentation would be</div><div class='del'>-     appreciated but is not required.</div><div class='del'>-  2. Altered source versions must be plainly marked as such, and must not be</div><div class='del'>-     misrepresented as being the original software.</div><div class='del'>-  3. This notice may not be removed or altered from any source distribution.</div><div class='del'>-</div><div class='del'>-  Mark Adler    madler@alumni.caltech.edu</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Change history:</div><div class='del'>- *</div><div class='del'>- * 1.0  19 Oct 2003     - First version</div><div class='del'>- * 1.1   4 Nov 2003     - Expand and clarify some comments and notes</div><div class='del'>- *                      - Add version and copyright to help</div><div class='del'>- *                      - Send help to stdout instead of stderr</div><div class='del'>- *                      - Add some preemptive typecasts</div><div class='del'>- *                      - Add L to constants in lseek() calls</div><div class='del'>- *                      - Remove some debugging information in error messages</div><div class='del'>- *                      - Use new data_type definition for zlib 1.2.1</div><div class='del'>- *                      - Simplfy and unify file operations</div><div class='del'>- *                      - Finish off gzip file in gztack()</div><div class='del'>- *                      - Use deflatePrime() instead of adding empty blocks</div><div class='del'>- *                      - Keep gzip file clean on appended file read errors</div><div class='del'>- *                      - Use in-place rotate instead of auxiliary buffer</div><div class='del'>- *                        (Why you ask?  Because it was fun to write!)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-   gzappend takes a gzip file and appends to it, compressing files from the</div><div class='del'>-   command line or data from stdin.  The gzip file is written to directly, to</div><div class='del'>-   avoid copying that file, in case it's large.  Note that this results in the</div><div class='del'>-   unfriendly behavior that if gzappend fails, the gzip file is corrupted.</div><div class='del'>-</div><div class='del'>-   This program was written to illustrate the use of the new Z_BLOCK option of</div><div class='del'>-   zlib 1.2.x's inflate() function.  This option returns from inflate() at each</div><div class='del'>-   block boundary to facilitate locating and modifying the last block bit at</div><div class='del'>-   the start of the final deflate block.  Also whether using Z_BLOCK or not,</div><div class='del'>-   another required feature of zlib 1.2.x is that inflate() now provides the</div><div class='del'>-   number of unusued bits in the last input byte used.  gzappend will not work</div><div class='del'>-   with versions of zlib earlier than 1.2.1.</div><div class='del'>-</div><div class='del'>-   gzappend first decompresses the gzip file internally, discarding all but</div><div class='del'>-   the last 32K of uncompressed data, and noting the location of the last block</div><div class='del'>-   bit and the number of unused bits in the last byte of the compressed data.</div><div class='del'>-   The gzip trailer containing the CRC-32 and length of the uncompressed data</div><div class='del'>-   is verified.  This trailer will be later overwritten.</div><div class='del'>-</div><div class='del'>-   Then the last block bit is cleared by seeking back in the file and rewriting</div><div class='del'>-   the byte that contains it.  Seeking forward, the last byte of the compressed</div><div class='del'>-   data is saved along with the number of unused bits to initialize deflate.</div><div class='del'>-</div><div class='del'>-   A deflate process is initialized, using the last 32K of the uncompressed</div><div class='del'>-   data from the gzip file to initialize the dictionary.  If the total</div><div class='del'>-   uncompressed data was less than 32K, then all of it is used to initialize</div><div class='del'>-   the dictionary.  The deflate output bit buffer is also initialized with the</div><div class='del'>-   last bits from the original deflate stream.  From here on, the data to</div><div class='del'>-   append is simply compressed using deflate, and written to the gzip file.</div><div class='del'>-   When that is complete, the new CRC-32 and uncompressed length are written</div><div class='del'>-   as the trailer of the gzip file.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include "zlib.h"</div><div class='del'>-</div><div class='del'>-#define local static</div><div class='del'>-#define LGCHUNK 14</div><div class='del'>-#define CHUNK (1U &lt;&lt; LGCHUNK)</div><div class='del'>-#define DSIZE 32768U</div><div class='del'>-</div><div class='del'>-/* print an error message and terminate with extreme prejudice */</div><div class='del'>-local void bye(char *msg1, char *msg2)</div><div class='del'>-{</div><div class='del'>-    fprintf(stderr, "gzappend error: %s%s\n", msg1, msg2);</div><div class='del'>-    exit(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* return the greatest common divisor of a and b using Euclid's algorithm,</div><div class='del'>-   modified to be fast when one argument much greater than the other, and</div><div class='del'>-   coded to avoid unnecessary swapping */</div><div class='del'>-local unsigned gcd(unsigned a, unsigned b)</div><div class='del'>-{</div><div class='del'>-    unsigned c;</div><div class='del'>-</div><div class='del'>-    while (a &amp;&amp; b)</div><div class='del'>-        if (a &gt; b) {</div><div class='del'>-            c = b;</div><div class='del'>-            while (a - c &gt;= c)</div><div class='del'>-                c &lt;&lt;= 1;</div><div class='del'>-            a -= c;</div><div class='del'>-        }</div><div class='del'>-        else {</div><div class='del'>-            c = a;</div><div class='del'>-            while (b - c &gt;= c)</div><div class='del'>-                c &lt;&lt;= 1;</div><div class='del'>-            b -= c;</div><div class='del'>-        }</div><div class='del'>-    return a + b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* rotate list[0..len-1] left by rot positions, in place */</div><div class='del'>-local void rotate(unsigned char *list, unsigned len, unsigned rot)</div><div class='del'>-{</div><div class='del'>-    unsigned char tmp;</div><div class='del'>-    unsigned cycles;</div><div class='del'>-    unsigned char *start, *last, *to, *from;</div><div class='del'>-</div><div class='del'>-    /* normalize rot and handle degenerate cases */</div><div class='del'>-    if (len &lt; 2) return;</div><div class='del'>-    if (rot &gt;= len) rot %= len;</div><div class='del'>-    if (rot == 0) return;</div><div class='del'>-</div><div class='del'>-    /* pointer to last entry in list */</div><div class='del'>-    last = list + (len - 1);</div><div class='del'>-</div><div class='del'>-    /* do simple left shift by one */</div><div class='del'>-    if (rot == 1) {</div><div class='del'>-        tmp = *list;</div><div class='del'>-        memcpy(list, list + 1, len - 1);</div><div class='del'>-        *last = tmp;</div><div class='del'>-        return;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* do simple right shift by one */</div><div class='del'>-    if (rot == len - 1) {</div><div class='del'>-        tmp = *last;</div><div class='del'>-        memmove(list + 1, list, len - 1);</div><div class='del'>-        *list = tmp;</div><div class='del'>-        return;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* otherwise do rotate as a set of cycles in place */</div><div class='del'>-    cycles = gcd(len, rot);             /* number of cycles */</div><div class='del'>-    do {</div><div class='del'>-        start = from = list + cycles;   /* start index is arbitrary */</div><div class='del'>-        tmp = *from;                    /* save entry to be overwritten */</div><div class='del'>-        for (;;) {</div><div class='del'>-            to = from;                  /* next step in cycle */</div><div class='del'>-            from += rot;                /* go right rot positions */</div><div class='del'>-            if (from &gt; last) from -= len;   /* (pointer better not wrap) */</div><div class='del'>-            if (from == start) break;   /* all but one shifted */</div><div class='del'>-            *to = *from;                /* shift left */</div><div class='del'>-        }</div><div class='del'>-        *to = tmp;                      /* complete the circle */</div><div class='del'>-    } while (--cycles);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* structure for gzip file read operations */</div><div class='del'>-typedef struct {</div><div class='del'>-    int fd;                     /* file descriptor */</div><div class='del'>-    int size;                   /* 1 &lt;&lt; size is bytes in buf */</div><div class='del'>-    unsigned left;              /* bytes available at next */</div><div class='del'>-    unsigned char *buf;         /* buffer */</div><div class='del'>-    unsigned char *next;        /* next byte in buffer */</div><div class='del'>-    char *name;                 /* file name for error messages */</div><div class='del'>-} file;</div><div class='del'>-</div><div class='del'>-/* reload buffer */</div><div class='del'>-local int readin(file *in)</div><div class='del'>-{</div><div class='del'>-    int len;</div><div class='del'>-</div><div class='del'>-    len = read(in-&gt;fd, in-&gt;buf, 1 &lt;&lt; in-&gt;size);</div><div class='del'>-    if (len == -1) bye("error reading ", in-&gt;name);</div><div class='del'>-    in-&gt;left = (unsigned)len;</div><div class='del'>-    in-&gt;next = in-&gt;buf;</div><div class='del'>-    return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* read from file in, exit if end-of-file */</div><div class='del'>-local int readmore(file *in)</div><div class='del'>-{</div><div class='del'>-    if (readin(in) == 0) bye("unexpected end of ", in-&gt;name);</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define read1(in) (in-&gt;left == 0 ? readmore(in) : 0, \</div><div class='del'>-                   in-&gt;left--, *(in-&gt;next)++)</div><div class='del'>-</div><div class='del'>-/* skip over n bytes of in */</div><div class='del'>-local void skip(file *in, unsigned n)</div><div class='del'>-{</div><div class='del'>-    unsigned bypass;</div><div class='del'>-</div><div class='del'>-    if (n &gt; in-&gt;left) {</div><div class='del'>-        n -= in-&gt;left;</div><div class='del'>-        bypass = n &amp; ~((1U &lt;&lt; in-&gt;size) - 1);</div><div class='del'>-        if (bypass) {</div><div class='del'>-            if (lseek(in-&gt;fd, (off_t)bypass, SEEK_CUR) == -1)</div><div class='del'>-                bye("seeking ", in-&gt;name);</div><div class='del'>-            n -= bypass;</div><div class='del'>-        }</div><div class='del'>-        readmore(in);</div><div class='del'>-        if (n &gt; in-&gt;left)</div><div class='del'>-            bye("unexpected end of ", in-&gt;name);</div><div class='del'>-    }</div><div class='del'>-    in-&gt;left -= n;</div><div class='del'>-    in-&gt;next += n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* read a four-byte unsigned integer, little-endian, from in */</div><div class='del'>-unsigned long read4(file *in)</div><div class='del'>-{</div><div class='del'>-    unsigned long val;</div><div class='del'>-</div><div class='del'>-    val = read1(in);</div><div class='del'>-    val += (unsigned)read1(in) &lt;&lt; 8;</div><div class='del'>-    val += (unsigned long)read1(in) &lt;&lt; 16;</div><div class='del'>-    val += (unsigned long)read1(in) &lt;&lt; 24;</div><div class='del'>-    return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* skip over gzip header */</div><div class='del'>-local void gzheader(file *in)</div><div class='del'>-{</div><div class='del'>-    int flags;</div><div class='del'>-    unsigned n;</div><div class='del'>-</div><div class='del'>-    if (read1(in) != 31 || read1(in) != 139) bye(in-&gt;name, " not a gzip file");</div><div class='del'>-    if (read1(in) != 8) bye("unknown compression method in", in-&gt;name);</div><div class='del'>-    flags = read1(in);</div><div class='del'>-    if (flags &amp; 0xe0) bye("unknown header flags set in", in-&gt;name);</div><div class='del'>-    skip(in, 6);</div><div class='del'>-    if (flags &amp; 4) {</div><div class='del'>-        n = read1(in);</div><div class='del'>-        n += (unsigned)(read1(in)) &lt;&lt; 8;</div><div class='del'>-        skip(in, n);</div><div class='del'>-    }</div><div class='del'>-    if (flags &amp; 8) while (read1(in) != 0) ;</div><div class='del'>-    if (flags &amp; 16) while (read1(in) != 0) ;</div><div class='del'>-    if (flags &amp; 2) skip(in, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* decompress gzip file "name", return strm with a deflate stream ready to</div><div class='del'>-   continue compression of the data in the gzip file, and return a file</div><div class='del'>-   descriptor pointing to where to write the compressed data -- the deflate</div><div class='del'>-   stream is initialized to compress using level "level" */</div><div class='del'>-local int gzscan(char *name, z_stream *strm, int level)</div><div class='del'>-{</div><div class='del'>-    int ret, lastbit, left, full;</div><div class='del'>-    unsigned have;</div><div class='del'>-    unsigned long crc, tot;</div><div class='del'>-    unsigned char *window;</div><div class='del'>-    off_t lastoff, end;</div><div class='del'>-    file gz;</div><div class='del'>-</div><div class='del'>-    /* open gzip file */</div><div class='del'>-    gz.name = name;</div><div class='del'>-    gz.fd = open(name, O_RDWR, 0);</div><div class='del'>-    if (gz.fd == -1) bye("cannot open ", name);</div><div class='del'>-    gz.buf = malloc(CHUNK);</div><div class='del'>-    if (gz.buf == NULL) bye("out of memory", "");</div><div class='del'>-    gz.size = LGCHUNK;</div><div class='del'>-    gz.left = 0;</div><div class='del'>-</div><div class='del'>-    /* skip gzip header */</div><div class='del'>-    gzheader(&amp;gz);</div><div class='del'>-</div><div class='del'>-    /* prepare to decompress */</div><div class='del'>-    window = malloc(DSIZE);</div><div class='del'>-    if (window == NULL) bye("out of memory", "");</div><div class='del'>-    strm-&gt;zalloc = Z_NULL;</div><div class='del'>-    strm-&gt;zfree = Z_NULL;</div><div class='del'>-    strm-&gt;opaque = Z_NULL;</div><div class='del'>-    ret = inflateInit2(strm, -15);</div><div class='del'>-    if (ret != Z_OK) bye("out of memory", " or library mismatch");</div><div class='del'>-</div><div class='del'>-    /* decompress the deflate stream, saving append information */</div><div class='del'>-    lastbit = 0;</div><div class='del'>-    lastoff = lseek(gz.fd, 0L, SEEK_CUR) - gz.left;</div><div class='del'>-    left = 0;</div><div class='del'>-    strm-&gt;avail_in = gz.left;</div><div class='del'>-    strm-&gt;next_in = gz.next;</div><div class='del'>-    crc = crc32(0L, Z_NULL, 0);</div><div class='del'>-    have = full = 0;</div><div class='del'>-    do {</div><div class='del'>-        /* if needed, get more input */</div><div class='del'>-        if (strm-&gt;avail_in == 0) {</div><div class='del'>-            readmore(&amp;gz);</div><div class='del'>-            strm-&gt;avail_in = gz.left;</div><div class='del'>-            strm-&gt;next_in = gz.next;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* set up output to next available section of sliding window */</div><div class='del'>-        strm-&gt;avail_out = DSIZE - have;</div><div class='del'>-        strm-&gt;next_out = window + have;</div><div class='del'>-</div><div class='del'>-        /* inflate and check for errors */</div><div class='del'>-        ret = inflate(strm, Z_BLOCK);</div><div class='del'>-        if (ret == Z_STREAM_ERROR) bye("internal stream error!", "");</div><div class='del'>-        if (ret == Z_MEM_ERROR) bye("out of memory", "");</div><div class='del'>-        if (ret == Z_DATA_ERROR)</div><div class='del'>-            bye("invalid compressed data--format violated in", name);</div><div class='del'>-</div><div class='del'>-        /* update crc and sliding window pointer */</div><div class='del'>-        crc = crc32(crc, window + have, DSIZE - have - strm-&gt;avail_out);</div><div class='del'>-        if (strm-&gt;avail_out)</div><div class='del'>-            have = DSIZE - strm-&gt;avail_out;</div><div class='del'>-        else {</div><div class='del'>-            have = 0;</div><div class='del'>-            full = 1;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* process end of block */</div><div class='del'>-        if (strm-&gt;data_type &amp; 128) {</div><div class='del'>-            if (strm-&gt;data_type &amp; 64)</div><div class='del'>-                left = strm-&gt;data_type &amp; 0x1f;</div><div class='del'>-            else {</div><div class='del'>-                lastbit = strm-&gt;data_type &amp; 0x1f;</div><div class='del'>-                lastoff = lseek(gz.fd, 0L, SEEK_CUR) - strm-&gt;avail_in;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    } while (ret != Z_STREAM_END);</div><div class='del'>-    inflateEnd(strm);</div><div class='del'>-    gz.left = strm-&gt;avail_in;</div><div class='del'>-    gz.next = strm-&gt;next_in;</div><div class='del'>-</div><div class='del'>-    /* save the location of the end of the compressed data */</div><div class='del'>-    end = lseek(gz.fd, 0L, SEEK_CUR) - gz.left;</div><div class='del'>-</div><div class='del'>-    /* check gzip trailer and save total for deflate */</div><div class='del'>-    if (crc != read4(&amp;gz))</div><div class='del'>-        bye("invalid compressed data--crc mismatch in ", name);</div><div class='del'>-    tot = strm-&gt;total_out;</div><div class='del'>-    if ((tot &amp; 0xffffffffUL) != read4(&amp;gz))</div><div class='del'>-        bye("invalid compressed data--length mismatch in", name);</div><div class='del'>-</div><div class='del'>-    /* if not at end of file, warn */</div><div class='del'>-    if (gz.left || readin(&amp;gz))</div><div class='del'>-        fprintf(stderr,</div><div class='del'>-            "gzappend warning: junk at end of gzip file overwritten\n");</div><div class='del'>-</div><div class='del'>-    /* clear last block bit */</div><div class='del'>-    lseek(gz.fd, lastoff - (lastbit != 0), SEEK_SET);</div><div class='del'>-    if (read(gz.fd, gz.buf, 1) != 1) bye("reading after seek on ", name);</div><div class='del'>-    *gz.buf = (unsigned char)(*gz.buf ^ (1 &lt;&lt; ((8 - lastbit) &amp; 7)));</div><div class='del'>-    lseek(gz.fd, -1L, SEEK_CUR);</div><div class='del'>-    if (write(gz.fd, gz.buf, 1) != 1) bye("writing after seek to ", name);</div><div class='del'>-</div><div class='del'>-    /* if window wrapped, build dictionary from window by rotating */</div><div class='del'>-    if (full) {</div><div class='del'>-        rotate(window, DSIZE, have);</div><div class='del'>-        have = DSIZE;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* set up deflate stream with window, crc, total_in, and leftover bits */</div><div class='del'>-    ret = deflateInit2(strm, level, Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY);</div><div class='del'>-    if (ret != Z_OK) bye("out of memory", "");</div><div class='del'>-    deflateSetDictionary(strm, window, have);</div><div class='del'>-    strm-&gt;adler = crc;</div><div class='del'>-    strm-&gt;total_in = tot;</div><div class='del'>-    if (left) {</div><div class='del'>-        lseek(gz.fd, --end, SEEK_SET);</div><div class='del'>-        if (read(gz.fd, gz.buf, 1) != 1) bye("reading after seek on ", name);</div><div class='del'>-        deflatePrime(strm, 8 - left, *gz.buf);</div><div class='del'>-    }</div><div class='del'>-    lseek(gz.fd, end, SEEK_SET);</div><div class='del'>-</div><div class='del'>-    /* clean up and return */</div><div class='del'>-    free(window);</div><div class='del'>-    free(gz.buf);</div><div class='del'>-    return gz.fd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* append file "name" to gzip file gd using deflate stream strm -- if last</div><div class='del'>-   is true, then finish off the deflate stream at the end */</div><div class='del'>-local void gztack(char *name, int gd, z_stream *strm, int last)</div><div class='del'>-{</div><div class='del'>-    int fd, len, ret;</div><div class='del'>-    unsigned left;</div><div class='del'>-    unsigned char *in, *out;</div><div class='del'>-</div><div class='del'>-    /* open file to compress and append */</div><div class='del'>-    fd = 0;</div><div class='del'>-    if (name != NULL) {</div><div class='del'>-        fd = open(name, O_RDONLY, 0);</div><div class='del'>-        if (fd == -1)</div><div class='del'>-            fprintf(stderr, "gzappend warning: %s not found, skipping ...\n",</div><div class='del'>-                    name);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* allocate buffers */</div><div class='del'>-    in = fd == -1 ? NULL : malloc(CHUNK);</div><div class='del'>-    out = malloc(CHUNK);</div><div class='del'>-    if (out == NULL) bye("out of memory", "");</div><div class='del'>-</div><div class='del'>-    /* compress input file and append to gzip file */</div><div class='del'>-    do {</div><div class='del'>-        /* get more input */</div><div class='del'>-        len = fd == -1 ? 0 : read(fd, in, CHUNK);</div><div class='del'>-        if (len == -1) {</div><div class='del'>-            fprintf(stderr,</div><div class='del'>-                    "gzappend warning: error reading %s, skipping rest ...\n",</div><div class='del'>-                    name);</div><div class='del'>-            len = 0;</div><div class='del'>-        }</div><div class='del'>-        strm-&gt;avail_in = (unsigned)len;</div><div class='del'>-        strm-&gt;next_in = in;</div><div class='del'>-        if (len) strm-&gt;adler = crc32(strm-&gt;adler, in, (unsigned)len);</div><div class='del'>-</div><div class='del'>-        /* compress and write all available output */</div><div class='del'>-        do {</div><div class='del'>-            strm-&gt;avail_out = CHUNK;</div><div class='del'>-            strm-&gt;next_out = out;</div><div class='del'>-            ret = deflate(strm, last &amp;&amp; len == 0 ? Z_FINISH : Z_NO_FLUSH);</div><div class='del'>-            left = CHUNK - strm-&gt;avail_out;</div><div class='del'>-            while (left) {</div><div class='del'>-                len = write(gd, out + CHUNK - strm-&gt;avail_out - left, left);</div><div class='del'>-                if (len == -1) bye("writing gzip file", "");</div><div class='del'>-                left -= (unsigned)len;</div><div class='del'>-            }</div><div class='del'>-        } while (strm-&gt;avail_out == 0 &amp;&amp; ret != Z_STREAM_END);</div><div class='del'>-    } while (len != 0);</div><div class='del'>-</div><div class='del'>-    /* write trailer after last entry */</div><div class='del'>-    if (last) {</div><div class='del'>-        deflateEnd(strm);</div><div class='del'>-        out[0] = (unsigned char)(strm-&gt;adler);</div><div class='del'>-        out[1] = (unsigned char)(strm-&gt;adler &gt;&gt; 8);</div><div class='del'>-        out[2] = (unsigned char)(strm-&gt;adler &gt;&gt; 16);</div><div class='del'>-        out[3] = (unsigned char)(strm-&gt;adler &gt;&gt; 24);</div><div class='del'>-        out[4] = (unsigned char)(strm-&gt;total_in);</div><div class='del'>-        out[5] = (unsigned char)(strm-&gt;total_in &gt;&gt; 8);</div><div class='del'>-        out[6] = (unsigned char)(strm-&gt;total_in &gt;&gt; 16);</div><div class='del'>-        out[7] = (unsigned char)(strm-&gt;total_in &gt;&gt; 24);</div><div class='del'>-        len = 8;</div><div class='del'>-        do {</div><div class='del'>-            ret = write(gd, out + 8 - len, len);</div><div class='del'>-            if (ret == -1) bye("writing gzip file", "");</div><div class='del'>-            len -= ret;</div><div class='del'>-        } while (len);</div><div class='del'>-        close(gd);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* clean up and return */</div><div class='del'>-    free(out);</div><div class='del'>-    if (in != NULL) free(in);</div><div class='del'>-    if (fd &gt; 0) close(fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* process the compression level option if present, scan the gzip file, and</div><div class='del'>-   append the specified files, or append the data from stdin if no other file</div><div class='del'>-   names are provided on the command line -- the gzip file must be writable</div><div class='del'>-   and seekable */</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-    int gd, level;</div><div class='del'>-    z_stream strm;</div><div class='del'>-</div><div class='del'>-    /* ignore command name */</div><div class='del'>-    argv++;</div><div class='del'>-</div><div class='del'>-    /* provide usage if no arguments */</div><div class='del'>-    if (*argv == NULL) {</div><div class='del'>-        printf("gzappend 1.1 (4 Nov 2003) Copyright (C) 2003 Mark Adler\n");</div><div class='del'>-        printf(</div><div class='del'>-            "usage: gzappend [-level] file.gz [ addthis [ andthis ... ]]\n");</div><div class='del'>-        return 0;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* set compression level */</div><div class='del'>-    level = Z_DEFAULT_COMPRESSION;</div><div class='del'>-    if (argv[0][0] == '-') {</div><div class='del'>-        if (argv[0][1] &lt; '0' || argv[0][1] &gt; '9' || argv[0][2] != 0)</div><div class='del'>-            bye("invalid compression level", "");</div><div class='del'>-        level = argv[0][1] - '0';</div><div class='del'>-        if (*++argv == NULL) bye("no gzip file name after options", "");</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* prepare to append to gzip file */</div><div class='del'>-    gd = gzscan(*argv++, &amp;strm, level);</div><div class='del'>-</div><div class='del'>-    /* append files on command line, or from stdin if none */</div><div class='del'>-    if (*argv == NULL)</div><div class='del'>-        gztack(NULL, gd, &amp;strm, 1);</div><div class='del'>-    else</div><div class='del'>-        do {</div><div class='del'>-            gztack(*argv, gd, &amp;strm, argv[1] == NULL);</div><div class='del'>-        } while (*++argv != NULL);</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/src/3rdparty/zlib/examples/gzjoin.c b/src/3rdparty/zlib/examples/gzjoin.c<br/>deleted file mode 100644<br/>index 129347c..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/examples/gzjoin.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/gzjoin.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,448 +0,0 @@</div><div class='del'>-/* gzjoin -- command to join gzip files into one gzip file</div><div class='del'>-</div><div class='del'>-  Copyright (C) 2004 Mark Adler, all rights reserved</div><div class='del'>-  version 1.0, 11 Dec 2004</div><div class='del'>-</div><div class='del'>-  This software is provided 'as-is', without any express or implied</div><div class='del'>-  warranty.  In no event will the author be held liable for any damages</div><div class='del'>-  arising from the use of this software.</div><div class='del'>-</div><div class='del'>-  Permission is granted to anyone to use this software for any purpose,</div><div class='del'>-  including commercial applications, and to alter it and redistribute it</div><div class='del'>-  freely, subject to the following restrictions:</div><div class='del'>-</div><div class='del'>-  1. The origin of this software must not be misrepresented; you must not</div><div class='del'>-     claim that you wrote the original software. If you use this software</div><div class='del'>-     in a product, an acknowledgment in the product documentation would be</div><div class='del'>-     appreciated but is not required.</div><div class='del'>-  2. Altered source versions must be plainly marked as such, and must not be</div><div class='del'>-     misrepresented as being the original software.</div><div class='del'>-  3. This notice may not be removed or altered from any source distribution.</div><div class='del'>-</div><div class='del'>-  Mark Adler    madler@alumni.caltech.edu</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Change history:</div><div class='del'>- *</div><div class='del'>- * 1.0  11 Dec 2004     - First version</div><div class='del'>- * 1.1  12 Jun 2005     - Changed ssize_t to long for portability</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-   gzjoin takes one or more gzip files on the command line and writes out a</div><div class='del'>-   single gzip file that will uncompress to the concatenation of the</div><div class='del'>-   uncompressed data from the individual gzip files.  gzjoin does this without</div><div class='del'>-   having to recompress any of the data and without having to calculate a new</div><div class='del'>-   crc32 for the concatenated uncompressed data.  gzjoin does however have to</div><div class='del'>-   decompress all of the input data in order to find the bits in the compressed</div><div class='del'>-   data that need to be modified to concatenate the streams.</div><div class='del'>-</div><div class='del'>-   gzjoin does not do an integrity check on the input gzip files other than</div><div class='del'>-   checking the gzip header and decompressing the compressed data.  They are</div><div class='del'>-   otherwise assumed to be complete and correct.</div><div class='del'>-</div><div class='del'>-   Each joint between gzip files removes at least 18 bytes of previous trailer</div><div class='del'>-   and subsequent header, and inserts an average of about three bytes to the</div><div class='del'>-   compressed data in order to connect the streams.  The output gzip file</div><div class='del'>-   has a minimal ten-byte gzip header with no file name or modification time.</div><div class='del'>-</div><div class='del'>-   This program was written to illustrate the use of the Z_BLOCK option of</div><div class='del'>-   inflate() and the crc32_combine() function.  gzjoin will not compile with</div><div class='del'>-   versions of zlib earlier than 1.2.3.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;      /* fputs(), fprintf(), fwrite(), putc() */</div><div class='del'>-#include &lt;stdlib.h&gt;     /* exit(), malloc(), free() */</div><div class='del'>-#include &lt;fcntl.h&gt;      /* open() */</div><div class='del'>-#include &lt;unistd.h&gt;     /* close(), read(), lseek() */</div><div class='del'>-#include "zlib.h"</div><div class='del'>-    /* crc32(), crc32_combine(), inflateInit2(), inflate(), inflateEnd() */</div><div class='del'>-</div><div class='del'>-#define local static</div><div class='del'>-</div><div class='del'>-/* exit with an error (return a value to allow use in an expression) */</div><div class='del'>-local int bail(char *why1, char *why2)</div><div class='del'>-{</div><div class='del'>-    fprintf(stderr, "gzjoin error: %s%s, output incomplete\n", why1, why2);</div><div class='del'>-    exit(1);</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* -- simple buffered file input with access to the buffer -- */</div><div class='del'>-</div><div class='del'>-#define CHUNK 32768         /* must be a power of two and fit in unsigned */</div><div class='del'>-</div><div class='del'>-/* bin buffered input file type */</div><div class='del'>-typedef struct {</div><div class='del'>-    char *name;             /* name of file for error messages */</div><div class='del'>-    int fd;                 /* file descriptor */</div><div class='del'>-    unsigned left;          /* bytes remaining at next */</div><div class='del'>-    unsigned char *next;    /* next byte to read */</div><div class='del'>-    unsigned char *buf;     /* allocated buffer of length CHUNK */</div><div class='del'>-} bin;</div><div class='del'>-</div><div class='del'>-/* close a buffered file and free allocated memory */</div><div class='del'>-local void bclose(bin *in)</div><div class='del'>-{</div><div class='del'>-    if (in != NULL) {</div><div class='del'>-        if (in-&gt;fd != -1)</div><div class='del'>-            close(in-&gt;fd);</div><div class='del'>-        if (in-&gt;buf != NULL)</div><div class='del'>-            free(in-&gt;buf);</div><div class='del'>-        free(in);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* open a buffered file for input, return a pointer to type bin, or NULL on</div><div class='del'>-   failure */</div><div class='del'>-local bin *bopen(char *name)</div><div class='del'>-{</div><div class='del'>-    bin *in;</div><div class='del'>-</div><div class='del'>-    in = malloc(sizeof(bin));</div><div class='del'>-    if (in == NULL)</div><div class='del'>-        return NULL;</div><div class='del'>-    in-&gt;buf = malloc(CHUNK);</div><div class='del'>-    in-&gt;fd = open(name, O_RDONLY, 0);</div><div class='del'>-    if (in-&gt;buf == NULL || in-&gt;fd == -1) {</div><div class='del'>-        bclose(in);</div><div class='del'>-        return NULL;</div><div class='del'>-    }</div><div class='del'>-    in-&gt;left = 0;</div><div class='del'>-    in-&gt;next = in-&gt;buf;</div><div class='del'>-    in-&gt;name = name;</div><div class='del'>-    return in;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* load buffer from file, return -1 on read error, 0 or 1 on success, with</div><div class='del'>-   1 indicating that end-of-file was reached */</div><div class='del'>-local int bload(bin *in)</div><div class='del'>-{</div><div class='del'>-    long len;</div><div class='del'>-</div><div class='del'>-    if (in == NULL)</div><div class='del'>-        return -1;</div><div class='del'>-    if (in-&gt;left != 0)</div><div class='del'>-        return 0;</div><div class='del'>-    in-&gt;next = in-&gt;buf;</div><div class='del'>-    do {</div><div class='del'>-        len = (long)read(in-&gt;fd, in-&gt;buf + in-&gt;left, CHUNK - in-&gt;left);</div><div class='del'>-        if (len &lt; 0)</div><div class='del'>-            return -1;</div><div class='del'>-        in-&gt;left += (unsigned)len;</div><div class='del'>-    } while (len != 0 &amp;&amp; in-&gt;left &lt; CHUNK);</div><div class='del'>-    return len == 0 ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get a byte from the file, bail if end of file */</div><div class='del'>-#define bget(in) (in-&gt;left ? 0 : bload(in), \</div><div class='del'>-                  in-&gt;left ? (in-&gt;left--, *(in-&gt;next)++) : \</div><div class='del'>-                    bail("unexpected end of file on ", in-&gt;name))</div><div class='del'>-</div><div class='del'>-/* get a four-byte little-endian unsigned integer from file */</div><div class='del'>-local unsigned long bget4(bin *in)</div><div class='del'>-{</div><div class='del'>-    unsigned long val;</div><div class='del'>-</div><div class='del'>-    val = bget(in);</div><div class='del'>-    val += (unsigned long)(bget(in)) &lt;&lt; 8;</div><div class='del'>-    val += (unsigned long)(bget(in)) &lt;&lt; 16;</div><div class='del'>-    val += (unsigned long)(bget(in)) &lt;&lt; 24;</div><div class='del'>-    return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* skip bytes in file */</div><div class='del'>-local void bskip(bin *in, unsigned skip)</div><div class='del'>-{</div><div class='del'>-    /* check pointer */</div><div class='del'>-    if (in == NULL)</div><div class='del'>-        return;</div><div class='del'>-</div><div class='del'>-    /* easy case -- skip bytes in buffer */</div><div class='del'>-    if (skip &lt;= in-&gt;left) {</div><div class='del'>-        in-&gt;left -= skip;</div><div class='del'>-        in-&gt;next += skip;</div><div class='del'>-        return;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* skip what's in buffer, discard buffer contents */</div><div class='del'>-    skip -= in-&gt;left;</div><div class='del'>-    in-&gt;left = 0;</div><div class='del'>-</div><div class='del'>-    /* seek past multiples of CHUNK bytes */</div><div class='del'>-    if (skip &gt; CHUNK) {</div><div class='del'>-        unsigned left;</div><div class='del'>-</div><div class='del'>-        left = skip &amp; (CHUNK - 1);</div><div class='del'>-        if (left == 0) {</div><div class='del'>-            /* exact number of chunks: seek all the way minus one byte to check</div><div class='del'>-               for end-of-file with a read */</div><div class='del'>-            lseek(in-&gt;fd, skip - 1, SEEK_CUR);</div><div class='del'>-            if (read(in-&gt;fd, in-&gt;buf, 1) != 1)</div><div class='del'>-                bail("unexpected end of file on ", in-&gt;name);</div><div class='del'>-            return;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* skip the integral chunks, update skip with remainder */</div><div class='del'>-        lseek(in-&gt;fd, skip - left, SEEK_CUR);</div><div class='del'>-        skip = left;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* read more input and skip remainder */</div><div class='del'>-    bload(in);</div><div class='del'>-    if (skip &gt; in-&gt;left)</div><div class='del'>-        bail("unexpected end of file on ", in-&gt;name);</div><div class='del'>-    in-&gt;left -= skip;</div><div class='del'>-    in-&gt;next += skip;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* -- end of buffered input functions -- */</div><div class='del'>-</div><div class='del'>-/* skip the gzip header from file in */</div><div class='del'>-local void gzhead(bin *in)</div><div class='del'>-{</div><div class='del'>-    int flags;</div><div class='del'>-</div><div class='del'>-    /* verify gzip magic header and compression method */</div><div class='del'>-    if (bget(in) != 0x1f || bget(in) != 0x8b || bget(in) != 8)</div><div class='del'>-        bail(in-&gt;name, " is not a valid gzip file");</div><div class='del'>-</div><div class='del'>-    /* get and verify flags */</div><div class='del'>-    flags = bget(in);</div><div class='del'>-    if ((flags &amp; 0xe0) != 0)</div><div class='del'>-        bail("unknown reserved bits set in ", in-&gt;name);</div><div class='del'>-</div><div class='del'>-    /* skip modification time, extra flags, and os */</div><div class='del'>-    bskip(in, 6);</div><div class='del'>-</div><div class='del'>-    /* skip extra field if present */</div><div class='del'>-    if (flags &amp; 4) {</div><div class='del'>-        unsigned len;</div><div class='del'>-</div><div class='del'>-        len = bget(in);</div><div class='del'>-        len += (unsigned)(bget(in)) &lt;&lt; 8;</div><div class='del'>-        bskip(in, len);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* skip file name if present */</div><div class='del'>-    if (flags &amp; 8)</div><div class='del'>-        while (bget(in) != 0)</div><div class='del'>-            ;</div><div class='del'>-</div><div class='del'>-    /* skip comment if present */</div><div class='del'>-    if (flags &amp; 16)</div><div class='del'>-        while (bget(in) != 0)</div><div class='del'>-            ;</div><div class='del'>-</div><div class='del'>-    /* skip header crc if present */</div><div class='del'>-    if (flags &amp; 2)</div><div class='del'>-        bskip(in, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* write a four-byte little-endian unsigned integer to out */</div><div class='del'>-local void put4(unsigned long val, FILE *out)</div><div class='del'>-{</div><div class='del'>-    putc(val &amp; 0xff, out);</div><div class='del'>-    putc((val &gt;&gt; 8) &amp; 0xff, out);</div><div class='del'>-    putc((val &gt;&gt; 16) &amp; 0xff, out);</div><div class='del'>-    putc((val &gt;&gt; 24) &amp; 0xff, out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Load up zlib stream from buffered input, bail if end of file */</div><div class='del'>-local void zpull(z_streamp strm, bin *in)</div><div class='del'>-{</div><div class='del'>-    if (in-&gt;left == 0)</div><div class='del'>-        bload(in);</div><div class='del'>-    if (in-&gt;left == 0)</div><div class='del'>-        bail("unexpected end of file on ", in-&gt;name);</div><div class='del'>-    strm-&gt;avail_in = in-&gt;left;</div><div class='del'>-    strm-&gt;next_in = in-&gt;next;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Write header for gzip file to out and initialize trailer. */</div><div class='del'>-local void gzinit(unsigned long *crc, unsigned long *tot, FILE *out)</div><div class='del'>-{</div><div class='del'>-    fwrite("\x1f\x8b\x08\0\0\0\0\0\0\xff", 1, 10, out);</div><div class='del'>-    *crc = crc32(0L, Z_NULL, 0);</div><div class='del'>-    *tot = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Copy the compressed data from name, zeroing the last block bit of the last</div><div class='del'>-   block if clr is true, and adding empty blocks as needed to get to a byte</div><div class='del'>-   boundary.  If clr is false, then the last block becomes the last block of</div><div class='del'>-   the output, and the gzip trailer is written.  crc and tot maintains the</div><div class='del'>-   crc and length (modulo 2^32) of the output for the trailer.  The resulting</div><div class='del'>-   gzip file is written to out.  gzinit() must be called before the first call</div><div class='del'>-   of gzcopy() to write the gzip header and to initialize crc and tot. */</div><div class='del'>-local void gzcopy(char *name, int clr, unsigned long *crc, unsigned long *tot,</div><div class='del'>-                  FILE *out)</div><div class='del'>-{</div><div class='del'>-    int ret;                /* return value from zlib functions */</div><div class='del'>-    int pos;                /* where the "last block" bit is in byte */</div><div class='del'>-    int last;               /* true if processing the last block */</div><div class='del'>-    bin *in;                /* buffered input file */</div><div class='del'>-    unsigned char *start;   /* start of compressed data in buffer */</div><div class='del'>-    unsigned char *junk;    /* buffer for uncompressed data -- discarded */</div><div class='del'>-    z_off_t len;            /* length of uncompressed data (support &gt; 4 GB) */</div><div class='del'>-    z_stream strm;          /* zlib inflate stream */</div><div class='del'>-</div><div class='del'>-    /* open gzip file and skip header */</div><div class='del'>-    in = bopen(name);</div><div class='del'>-    if (in == NULL)</div><div class='del'>-        bail("could not open ", name);</div><div class='del'>-    gzhead(in);</div><div class='del'>-</div><div class='del'>-    /* allocate buffer for uncompressed data and initialize raw inflate</div><div class='del'>-       stream */</div><div class='del'>-    junk = malloc(CHUNK);</div><div class='del'>-    strm.zalloc = Z_NULL;</div><div class='del'>-    strm.zfree = Z_NULL;</div><div class='del'>-    strm.opaque = Z_NULL;</div><div class='del'>-    strm.avail_in = 0;</div><div class='del'>-    strm.next_in = Z_NULL;</div><div class='del'>-    ret = inflateInit2(&amp;strm, -15);</div><div class='del'>-    if (junk == NULL || ret != Z_OK)</div><div class='del'>-        bail("out of memory", "");</div><div class='del'>-</div><div class='del'>-    /* inflate and copy compressed data, clear last-block bit if requested */</div><div class='del'>-    len = 0;</div><div class='del'>-    zpull(&amp;strm, in);</div><div class='del'>-    start = strm.next_in;</div><div class='del'>-    last = start[0] &amp; 1;</div><div class='del'>-    if (last &amp;&amp; clr)</div><div class='del'>-        start[0] &amp;= ~1;</div><div class='del'>-    strm.avail_out = 0;</div><div class='del'>-    for (;;) {</div><div class='del'>-        /* if input used and output done, write used input and get more */</div><div class='del'>-        if (strm.avail_in == 0 &amp;&amp; strm.avail_out != 0) {</div><div class='del'>-            fwrite(start, 1, strm.next_in - start, out);</div><div class='del'>-            start = in-&gt;buf;</div><div class='del'>-            in-&gt;left = 0;</div><div class='del'>-            zpull(&amp;strm, in);</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* decompress -- return early when end-of-block reached */</div><div class='del'>-        strm.avail_out = CHUNK;</div><div class='del'>-        strm.next_out = junk;</div><div class='del'>-        ret = inflate(&amp;strm, Z_BLOCK);</div><div class='del'>-        switch (ret) {</div><div class='del'>-        case Z_MEM_ERROR:</div><div class='del'>-            bail("out of memory", "");</div><div class='del'>-        case Z_DATA_ERROR:</div><div class='del'>-            bail("invalid compressed data in ", in-&gt;name);</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* update length of uncompressed data */</div><div class='del'>-        len += CHUNK - strm.avail_out;</div><div class='del'>-</div><div class='del'>-        /* check for block boundary (only get this when block copied out) */</div><div class='del'>-        if (strm.data_type &amp; 128) {</div><div class='del'>-            /* if that was the last block, then done */</div><div class='del'>-            if (last)</div><div class='del'>-                break;</div><div class='del'>-</div><div class='del'>-            /* number of unused bits in last byte */</div><div class='del'>-            pos = strm.data_type &amp; 7;</div><div class='del'>-</div><div class='del'>-            /* find the next last-block bit */</div><div class='del'>-            if (pos != 0) {</div><div class='del'>-                /* next last-block bit is in last used byte */</div><div class='del'>-                pos = 0x100 &gt;&gt; pos;</div><div class='del'>-                last = strm.next_in[-1] &amp; pos;</div><div class='del'>-                if (last &amp;&amp; clr)</div><div class='del'>-                    strm.next_in[-1] &amp;= ~pos;</div><div class='del'>-            }</div><div class='del'>-            else {</div><div class='del'>-                /* next last-block bit is in next unused byte */</div><div class='del'>-                if (strm.avail_in == 0) {</div><div class='del'>-                    /* don't have that byte yet -- get it */</div><div class='del'>-                    fwrite(start, 1, strm.next_in - start, out);</div><div class='del'>-                    start = in-&gt;buf;</div><div class='del'>-                    in-&gt;left = 0;</div><div class='del'>-                    zpull(&amp;strm, in);</div><div class='del'>-                }</div><div class='del'>-                last = strm.next_in[0] &amp; 1;</div><div class='del'>-                if (last &amp;&amp; clr)</div><div class='del'>-                    strm.next_in[0] &amp;= ~1;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* update buffer with unused input */</div><div class='del'>-    in-&gt;left = strm.avail_in;</div><div class='del'>-    in-&gt;next = strm.next_in;</div><div class='del'>-</div><div class='del'>-    /* copy used input, write empty blocks to get to byte boundary */</div><div class='del'>-    pos = strm.data_type &amp; 7;</div><div class='del'>-    fwrite(start, 1, in-&gt;next - start - 1, out);</div><div class='del'>-    last = in-&gt;next[-1];</div><div class='del'>-    if (pos == 0 || !clr)</div><div class='del'>-        /* already at byte boundary, or last file: write last byte */</div><div class='del'>-        putc(last, out);</div><div class='del'>-    else {</div><div class='del'>-        /* append empty blocks to last byte */</div><div class='del'>-        last &amp;= ((0x100 &gt;&gt; pos) - 1);       /* assure unused bits are zero */</div><div class='del'>-        if (pos &amp; 1) {</div><div class='del'>-            /* odd -- append an empty stored block */</div><div class='del'>-            putc(last, out);</div><div class='del'>-            if (pos == 1)</div><div class='del'>-                putc(0, out);               /* two more bits in block header */</div><div class='del'>-            fwrite("\0\0\xff\xff", 1, 4, out);</div><div class='del'>-        }</div><div class='del'>-        else {</div><div class='del'>-            /* even -- append 1, 2, or 3 empty fixed blocks */</div><div class='del'>-            switch (pos) {</div><div class='del'>-            case 6:</div><div class='del'>-                putc(last | 8, out);</div><div class='del'>-                last = 0;</div><div class='del'>-            case 4:</div><div class='del'>-                putc(last | 0x20, out);</div><div class='del'>-                last = 0;</div><div class='del'>-            case 2:</div><div class='del'>-                putc(last | 0x80, out);</div><div class='del'>-                putc(0, out);</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* update crc and tot */</div><div class='del'>-    *crc = crc32_combine(*crc, bget4(in), len);</div><div class='del'>-    *tot += (unsigned long)len;</div><div class='del'>-</div><div class='del'>-    /* clean up */</div><div class='del'>-    inflateEnd(&amp;strm);</div><div class='del'>-    free(junk);</div><div class='del'>-    bclose(in);</div><div class='del'>-</div><div class='del'>-    /* write trailer if this is the last gzip file */</div><div class='del'>-    if (!clr) {</div><div class='del'>-        put4(*crc, out);</div><div class='del'>-        put4(*tot, out);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* join the gzip files on the command line, write result to stdout */</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-    unsigned long crc, tot;     /* running crc and total uncompressed length */</div><div class='del'>-</div><div class='del'>-    /* skip command name */</div><div class='del'>-    argc--;</div><div class='del'>-    argv++;</div><div class='del'>-</div><div class='del'>-    /* show usage if no arguments */</div><div class='del'>-    if (argc == 0) {</div><div class='del'>-        fputs("gzjoin usage: gzjoin f1.gz [f2.gz [f3.gz ...]] &gt; fjoin.gz\n",</div><div class='del'>-              stderr);</div><div class='del'>-        return 0;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* join gzip files on command line and write to stdout */</div><div class='del'>-    gzinit(&amp;crc, &amp;tot, stdout);</div><div class='del'>-    while (argc--)</div><div class='del'>-        gzcopy(*argv++, argc, &amp;crc, &amp;tot, stdout);</div><div class='del'>-</div><div class='del'>-    /* done */</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/src/3rdparty/zlib/examples/gzlog.c b/src/3rdparty/zlib/examples/gzlog.c<br/>deleted file mode 100644<br/>index f71f817..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/examples/gzlog.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/gzlog.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,413 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * gzlog.c</div><div class='del'>- * Copyright (C) 2004 Mark Adler</div><div class='del'>- * For conditions of distribution and use, see copyright notice in gzlog.h</div><div class='del'>- * version 1.0, 26 Nov 2004</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;             /* memcmp() */</div><div class='del'>-#include &lt;stdlib.h&gt;             /* malloc(), free(), NULL */</div><div class='del'>-#include &lt;sys/types.h&gt;          /* size_t, off_t */</div><div class='del'>-#include &lt;unistd.h&gt;             /* read(), close(), sleep(), ftruncate(), */</div><div class='del'>-                                /* lseek() */</div><div class='del'>-#include &lt;fcntl.h&gt;              /* open() */</div><div class='del'>-#include &lt;sys/file.h&gt;           /* flock() */</div><div class='del'>-#include "zlib.h"               /* deflateInit2(), deflate(), deflateEnd() */</div><div class='del'>-</div><div class='del'>-#include "gzlog.h"              /* interface */</div><div class='del'>-#define local static</div><div class='del'>-</div><div class='del'>-/* log object structure */</div><div class='del'>-typedef struct {</div><div class='del'>-    int id;                 /* object identifier */</div><div class='del'>-    int fd;                 /* log file descriptor */</div><div class='del'>-    off_t extra;            /* offset of extra "ap" subfield */</div><div class='del'>-    off_t mark_off;         /* offset of marked data */</div><div class='del'>-    off_t last_off;         /* offset of last block */</div><div class='del'>-    unsigned long crc;      /* uncompressed crc */</div><div class='del'>-    unsigned long len;      /* uncompressed length (modulo 2^32) */</div><div class='del'>-    unsigned stored;        /* length of current stored block */</div><div class='del'>-} gz_log;</div><div class='del'>-</div><div class='del'>-#define GZLOGID 19334       /* gz_log object identifier */</div><div class='del'>-</div><div class='del'>-#define LOCK_RETRY 1            /* retry lock once a second */</div><div class='del'>-#define LOCK_PATIENCE 1200      /* try about twenty minutes before forcing */</div><div class='del'>-</div><div class='del'>-/* acquire a lock on a file */</div><div class='del'>-local int lock(int fd)</div><div class='del'>-{</div><div class='del'>-    int patience;</div><div class='del'>-</div><div class='del'>-    /* try to lock every LOCK_RETRY seconds for LOCK_PATIENCE seconds */</div><div class='del'>-    patience = LOCK_PATIENCE;</div><div class='del'>-    do {</div><div class='del'>-        if (flock(fd, LOCK_EX + LOCK_NB) == 0)</div><div class='del'>-            return 0;</div><div class='del'>-        (void)sleep(LOCK_RETRY);</div><div class='del'>-        patience -= LOCK_RETRY;</div><div class='del'>-    } while (patience &gt; 0);</div><div class='del'>-</div><div class='del'>-    /* we've run out of patience -- give up */</div><div class='del'>-    return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* release lock */</div><div class='del'>-local void unlock(int fd)</div><div class='del'>-{</div><div class='del'>-    (void)flock(fd, LOCK_UN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* release a log object */</div><div class='del'>-local void log_clean(gz_log *log)</div><div class='del'>-{</div><div class='del'>-    unlock(log-&gt;fd);</div><div class='del'>-    (void)close(log-&gt;fd);</div><div class='del'>-    free(log);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* read an unsigned long from a byte buffer little-endian */</div><div class='del'>-local unsigned long make_ulg(unsigned char *buf)</div><div class='del'>-{</div><div class='del'>-    int n;</div><div class='del'>-    unsigned long val;</div><div class='del'>-</div><div class='del'>-    val = (unsigned long)(*buf++);</div><div class='del'>-    for (n = 8; n &lt; 32; n += 8)</div><div class='del'>-        val += (unsigned long)(*buf++) &lt;&lt; n;</div><div class='del'>-    return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* read an off_t from a byte buffer little-endian */</div><div class='del'>-local off_t make_off(unsigned char *buf)</div><div class='del'>-{</div><div class='del'>-    int n;</div><div class='del'>-    off_t val;</div><div class='del'>-</div><div class='del'>-    val = (off_t)(*buf++);</div><div class='del'>-    for (n = 8; n &lt; 64; n += 8)</div><div class='del'>-        val += (off_t)(*buf++) &lt;&lt; n;</div><div class='del'>-    return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* write an unsigned long little-endian to byte buffer */</div><div class='del'>-local void dice_ulg(unsigned long val, unsigned char *buf)</div><div class='del'>-{</div><div class='del'>-    int n;</div><div class='del'>-</div><div class='del'>-    for (n = 0; n &lt; 4; n++) {</div><div class='del'>-        *buf++ = val &amp; 0xff;</div><div class='del'>-        val &gt;&gt;= 8;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* write an off_t little-endian to byte buffer */</div><div class='del'>-local void dice_off(off_t val, unsigned char *buf)</div><div class='del'>-{</div><div class='del'>-    int n;</div><div class='del'>-</div><div class='del'>-    for (n = 0; n &lt; 8; n++) {</div><div class='del'>-        *buf++ = val &amp; 0xff;</div><div class='del'>-        val &gt;&gt;= 8;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* initial, empty gzip file for appending */</div><div class='del'>-local char empty_gz[] = {</div><div class='del'>-    0x1f, 0x8b,                 /* magic gzip id */</div><div class='del'>-    8,                          /* compression method is deflate */</div><div class='del'>-    4,                          /* there is an extra field */</div><div class='del'>-    0, 0, 0, 0,                 /* no modification time provided */</div><div class='del'>-    0, 0xff,                    /* no extra flags, no OS */</div><div class='del'>-    20, 0, 'a', 'p', 16, 0,     /* extra field with "ap" subfield */</div><div class='del'>-    32, 0, 0, 0, 0, 0, 0, 0,    /* offset of uncompressed data */</div><div class='del'>-    32, 0, 0, 0, 0, 0, 0, 0,    /* offset of last block */</div><div class='del'>-    1, 0, 0, 0xff, 0xff,        /* empty stored block (last) */</div><div class='del'>-    0, 0, 0, 0,                 /* crc */</div><div class='del'>-    0, 0, 0, 0                  /* uncompressed length */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* initialize a log object with locking */</div><div class='del'>-void *gzlog_open(char *path)</div><div class='del'>-{</div><div class='del'>-    unsigned xlen;</div><div class='del'>-    unsigned char temp[20];</div><div class='del'>-    unsigned sub_len;</div><div class='del'>-    int good;</div><div class='del'>-    gz_log *log;</div><div class='del'>-</div><div class='del'>-    /* allocate log structure */</div><div class='del'>-    log = malloc(sizeof(gz_log));</div><div class='del'>-    if (log == NULL)</div><div class='del'>-        return NULL;</div><div class='del'>-    log-&gt;id = GZLOGID;</div><div class='del'>-</div><div class='del'>-    /* open file, creating it if necessary, and locking it */</div><div class='del'>-    log-&gt;fd = open(path, O_RDWR | O_CREAT, 0600);</div><div class='del'>-    if (log-&gt;fd &lt; 0) {</div><div class='del'>-        free(log);</div><div class='del'>-        return NULL;</div><div class='del'>-    }</div><div class='del'>-    if (lock(log-&gt;fd)) {</div><div class='del'>-        close(log-&gt;fd);</div><div class='del'>-        free(log);</div><div class='del'>-        return NULL;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* if file is empty, write new gzip stream */</div><div class='del'>-    if (lseek(log-&gt;fd, 0, SEEK_END) == 0) {</div><div class='del'>-        if (write(log-&gt;fd, empty_gz, sizeof(empty_gz)) != sizeof(empty_gz)) {</div><div class='del'>-            log_clean(log);</div><div class='del'>-            return NULL;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* check gzip header */</div><div class='del'>-    (void)lseek(log-&gt;fd, 0, SEEK_SET);</div><div class='del'>-    if (read(log-&gt;fd, temp, 12) != 12 || temp[0] != 0x1f ||</div><div class='del'>-        temp[1] != 0x8b || temp[2] != 8 || (temp[3] &amp; 4) == 0) {</div><div class='del'>-        log_clean(log);</div><div class='del'>-        return NULL;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* process extra field to find "ap" sub-field */</div><div class='del'>-    xlen = temp[10] + (temp[11] &lt;&lt; 8);</div><div class='del'>-    good = 0;</div><div class='del'>-    while (xlen) {</div><div class='del'>-        if (xlen &lt; 4 || read(log-&gt;fd, temp, 4) != 4)</div><div class='del'>-            break;</div><div class='del'>-        sub_len = temp[2];</div><div class='del'>-        sub_len += temp[3] &lt;&lt; 8;</div><div class='del'>-        xlen -= 4;</div><div class='del'>-        if (memcmp(temp, "ap", 2) == 0 &amp;&amp; sub_len == 16) {</div><div class='del'>-            good = 1;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        if (xlen &lt; sub_len)</div><div class='del'>-            break;</div><div class='del'>-        (void)lseek(log-&gt;fd, sub_len, SEEK_CUR);</div><div class='del'>-        xlen -= sub_len;</div><div class='del'>-    }</div><div class='del'>-    if (!good) {</div><div class='del'>-        log_clean(log);</div><div class='del'>-        return NULL;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* read in "ap" sub-field */</div><div class='del'>-    log-&gt;extra = lseek(log-&gt;fd, 0, SEEK_CUR);</div><div class='del'>-    if (read(log-&gt;fd, temp, 16) != 16) {</div><div class='del'>-        log_clean(log);</div><div class='del'>-        return NULL;</div><div class='del'>-    }</div><div class='del'>-    log-&gt;mark_off = make_off(temp);</div><div class='del'>-    log-&gt;last_off = make_off(temp + 8);</div><div class='del'>-</div><div class='del'>-    /* get crc, length of gzip file */</div><div class='del'>-    (void)lseek(log-&gt;fd, log-&gt;last_off, SEEK_SET);</div><div class='del'>-    if (read(log-&gt;fd, temp, 13) != 13 ||</div><div class='del'>-        memcmp(temp, "\001\000\000\377\377", 5) != 0) {</div><div class='del'>-        log_clean(log);</div><div class='del'>-        return NULL;</div><div class='del'>-    }</div><div class='del'>-    log-&gt;crc = make_ulg(temp + 5);</div><div class='del'>-    log-&gt;len = make_ulg(temp + 9);</div><div class='del'>-</div><div class='del'>-    /* set up to write over empty last block */</div><div class='del'>-    (void)lseek(log-&gt;fd, log-&gt;last_off + 5, SEEK_SET);</div><div class='del'>-    log-&gt;stored = 0;</div><div class='del'>-    return (void *)log;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* maximum amount to put in a stored block before starting a new one */</div><div class='del'>-#define MAX_BLOCK 16384</div><div class='del'>-</div><div class='del'>-/* write a block to a log object */</div><div class='del'>-int gzlog_write(void *obj, char *data, size_t len)</div><div class='del'>-{</div><div class='del'>-    size_t some;</div><div class='del'>-    unsigned char temp[5];</div><div class='del'>-    gz_log *log;</div><div class='del'>-</div><div class='del'>-    /* check object */</div><div class='del'>-    log = (gz_log *)obj;</div><div class='del'>-    if (log == NULL || log-&gt;id != GZLOGID)</div><div class='del'>-        return 1;</div><div class='del'>-</div><div class='del'>-    /* write stored blocks until all of the input is written */</div><div class='del'>-    do {</div><div class='del'>-        some = MAX_BLOCK - log-&gt;stored;</div><div class='del'>-        if (some &gt; len)</div><div class='del'>-            some = len;</div><div class='del'>-        if (write(log-&gt;fd, data, some) != some)</div><div class='del'>-            return 1;</div><div class='del'>-        log-&gt;crc = crc32(log-&gt;crc, data, some);</div><div class='del'>-        log-&gt;len += some;</div><div class='del'>-        len -= some;</div><div class='del'>-        data += some;</div><div class='del'>-        log-&gt;stored += some;</div><div class='del'>-</div><div class='del'>-        /* if the stored block is full, end it and start another */</div><div class='del'>-        if (log-&gt;stored == MAX_BLOCK) {</div><div class='del'>-            (void)lseek(log-&gt;fd, log-&gt;last_off, SEEK_SET);</div><div class='del'>-            temp[0] = 0;</div><div class='del'>-            dice_ulg(log-&gt;stored + ((unsigned long)(~log-&gt;stored) &lt;&lt; 16),</div><div class='del'>-                     temp + 1);</div><div class='del'>-            if (write(log-&gt;fd, temp, 5) != 5)</div><div class='del'>-                return 1;</div><div class='del'>-            log-&gt;last_off = lseek(log-&gt;fd, log-&gt;stored, SEEK_CUR);</div><div class='del'>-            (void)lseek(log-&gt;fd, 5, SEEK_CUR);</div><div class='del'>-            log-&gt;stored = 0;</div><div class='del'>-        }</div><div class='del'>-    } while (len);</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* recompress the remaining stored deflate data in place */</div><div class='del'>-local int recomp(gz_log *log)</div><div class='del'>-{</div><div class='del'>-    z_stream strm;</div><div class='del'>-    size_t len, max;</div><div class='del'>-    unsigned char *in;</div><div class='del'>-    unsigned char *out;</div><div class='del'>-    unsigned char temp[16];</div><div class='del'>-</div><div class='del'>-    /* allocate space and read it all in (it's around 1 MB) */</div><div class='del'>-    len = log-&gt;last_off - log-&gt;mark_off;</div><div class='del'>-    max = len + (len &gt;&gt; 12) + (len &gt;&gt; 14) + 11;</div><div class='del'>-    out = malloc(max);</div><div class='del'>-    if (out == NULL)</div><div class='del'>-        return 1;</div><div class='del'>-    in = malloc(len);</div><div class='del'>-    if (in == NULL) {</div><div class='del'>-        free(out);</div><div class='del'>-        return 1;</div><div class='del'>-    }</div><div class='del'>-    (void)lseek(log-&gt;fd, log-&gt;mark_off, SEEK_SET);</div><div class='del'>-    if (read(log-&gt;fd, in, len) != len) {</div><div class='del'>-        free(in);</div><div class='del'>-        free(out);</div><div class='del'>-        return 1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* recompress in memory, decoding stored data as we go */</div><div class='del'>-    /* note: this assumes that unsigned is four bytes or more */</div><div class='del'>-    /*       consider not making that assumption */</div><div class='del'>-    strm.zalloc = Z_NULL;</div><div class='del'>-    strm.zfree = Z_NULL;</div><div class='del'>-    strm.opaque = Z_NULL;</div><div class='del'>-    if (deflateInit2(&amp;strm, Z_BEST_COMPRESSION, Z_DEFLATED, -15, 8,</div><div class='del'>-        Z_DEFAULT_STRATEGY) != Z_OK) {</div><div class='del'>-        free(in);</div><div class='del'>-        free(out);</div><div class='del'>-        return 1;</div><div class='del'>-    }</div><div class='del'>-    strm.next_in = in;</div><div class='del'>-    strm.avail_out = max;</div><div class='del'>-    strm.next_out = out;</div><div class='del'>-    while (len &gt;= 5) {</div><div class='del'>-        if (strm.next_in[0] != 0)</div><div class='del'>-            break;</div><div class='del'>-        strm.avail_in = strm.next_in[1] + (strm.next_in[2] &lt;&lt; 8);</div><div class='del'>-        strm.next_in += 5;</div><div class='del'>-        len -= 5;</div><div class='del'>-        if (strm.avail_in != 0) {</div><div class='del'>-            if (len &lt; strm.avail_in)</div><div class='del'>-                break;</div><div class='del'>-            len -= strm.avail_in;</div><div class='del'>-            (void)deflate(&amp;strm, Z_NO_FLUSH);</div><div class='del'>-            if (strm.avail_in != 0 || strm.avail_out == 0)</div><div class='del'>-                break;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    (void)deflate(&amp;strm, Z_SYNC_FLUSH);</div><div class='del'>-    (void)deflateEnd(&amp;strm);</div><div class='del'>-    free(in);</div><div class='del'>-    if (len != 0 || strm.avail_out == 0) {</div><div class='del'>-        free(out);</div><div class='del'>-        return 1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* overwrite stored data with compressed data */</div><div class='del'>-    (void)lseek(log-&gt;fd, log-&gt;mark_off, SEEK_SET);</div><div class='del'>-    len = max - strm.avail_out;</div><div class='del'>-    if (write(log-&gt;fd, out, len) != len) {</div><div class='del'>-        free(out);</div><div class='del'>-        return 1;</div><div class='del'>-    }</div><div class='del'>-    free(out);</div><div class='del'>-</div><div class='del'>-    /* write last empty block, crc, and length */</div><div class='del'>-    log-&gt;mark_off = log-&gt;last_off = lseek(log-&gt;fd, 0, SEEK_CUR);</div><div class='del'>-    temp[0] = 1;</div><div class='del'>-    dice_ulg(0xffffL &lt;&lt; 16, temp + 1);</div><div class='del'>-    dice_ulg(log-&gt;crc, temp + 5);</div><div class='del'>-    dice_ulg(log-&gt;len, temp + 9);</div><div class='del'>-    if (write(log-&gt;fd, temp, 13) != 13)</div><div class='del'>-        return 1;</div><div class='del'>-</div><div class='del'>-    /* truncate file to discard remaining stored data and old trailer */</div><div class='del'>-    ftruncate(log-&gt;fd, lseek(log-&gt;fd, 0, SEEK_CUR));</div><div class='del'>-</div><div class='del'>-    /* update extra field to point to new last empty block */</div><div class='del'>-    (void)lseek(log-&gt;fd, log-&gt;extra, SEEK_SET);</div><div class='del'>-    dice_off(log-&gt;mark_off, temp);</div><div class='del'>-    dice_off(log-&gt;last_off, temp + 8);</div><div class='del'>-    if (write(log-&gt;fd, temp, 16) != 16)</div><div class='del'>-        return 1;</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* maximum accumulation of stored blocks before compressing */</div><div class='del'>-#define MAX_STORED 1048576</div><div class='del'>-</div><div class='del'>-/* close log object */</div><div class='del'>-int gzlog_close(void *obj)</div><div class='del'>-{</div><div class='del'>-    unsigned char temp[8];</div><div class='del'>-    gz_log *log;</div><div class='del'>-</div><div class='del'>-    /* check object */</div><div class='del'>-    log = (gz_log *)obj;</div><div class='del'>-    if (log == NULL || log-&gt;id != GZLOGID)</div><div class='del'>-        return 1;</div><div class='del'>-</div><div class='del'>-    /* go to start of most recent block being written */</div><div class='del'>-    (void)lseek(log-&gt;fd, log-&gt;last_off, SEEK_SET);</div><div class='del'>-</div><div class='del'>-    /* if some stuff was put there, update block */</div><div class='del'>-    if (log-&gt;stored) {</div><div class='del'>-        temp[0] = 0;</div><div class='del'>-        dice_ulg(log-&gt;stored + ((unsigned long)(~log-&gt;stored) &lt;&lt; 16),</div><div class='del'>-                 temp + 1);</div><div class='del'>-        if (write(log-&gt;fd, temp, 5) != 5)</div><div class='del'>-            return 1;</div><div class='del'>-        log-&gt;last_off = lseek(log-&gt;fd, log-&gt;stored, SEEK_CUR);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* write last block (empty) */</div><div class='del'>-    if (write(log-&gt;fd, "\001\000\000\377\377", 5) != 5)</div><div class='del'>-        return 1;</div><div class='del'>-</div><div class='del'>-    /* write updated crc and uncompressed length */</div><div class='del'>-    dice_ulg(log-&gt;crc, temp);</div><div class='del'>-    dice_ulg(log-&gt;len, temp + 4);</div><div class='del'>-    if (write(log-&gt;fd, temp, 8) != 8)</div><div class='del'>-        return 1;</div><div class='del'>-</div><div class='del'>-    /* put offset of that last block in gzip extra block */</div><div class='del'>-    (void)lseek(log-&gt;fd, log-&gt;extra + 8, SEEK_SET);</div><div class='del'>-    dice_off(log-&gt;last_off, temp);</div><div class='del'>-    if (write(log-&gt;fd, temp, 8) != 8)</div><div class='del'>-        return 1;</div><div class='del'>-</div><div class='del'>-    /* if more than 1 MB stored, then time to compress it */</div><div class='del'>-    if (log-&gt;last_off - log-&gt;mark_off &gt; MAX_STORED) {</div><div class='del'>-        if (recomp(log))</div><div class='del'>-            return 1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* unlock and close file */</div><div class='del'>-    log_clean(log);</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/src/3rdparty/zlib/examples/gzlog.h b/src/3rdparty/zlib/examples/gzlog.h<br/>deleted file mode 100644<br/>index a800bd5..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/examples/gzlog.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/gzlog.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/* gzlog.h</div><div class='del'>-  Copyright (C) 2004 Mark Adler, all rights reserved</div><div class='del'>-  version 1.0, 26 Nov 2004</div><div class='del'>-</div><div class='del'>-  This software is provided 'as-is', without any express or implied</div><div class='del'>-  warranty.  In no event will the author be held liable for any damages</div><div class='del'>-  arising from the use of this software.</div><div class='del'>-</div><div class='del'>-  Permission is granted to anyone to use this software for any purpose,</div><div class='del'>-  including commercial applications, and to alter it and redistribute it</div><div class='del'>-  freely, subject to the following restrictions:</div><div class='del'>-</div><div class='del'>-  1. The origin of this software must not be misrepresented; you must not</div><div class='del'>-     claim that you wrote the original software. If you use this software</div><div class='del'>-     in a product, an acknowledgment in the product documentation would be</div><div class='del'>-     appreciated but is not required.</div><div class='del'>-  2. Altered source versions must be plainly marked as such, and must not be</div><div class='del'>-     misrepresented as being the original software.</div><div class='del'>-  3. This notice may not be removed or altered from any source distribution.</div><div class='del'>-</div><div class='del'>-  Mark Adler    madler@alumni.caltech.edu</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-   The gzlog object allows writing short messages to a gzipped log file,</div><div class='del'>-   opening the log file locked for small bursts, and then closing it.  The log</div><div class='del'>-   object works by appending stored data to the gzip file until 1 MB has been</div><div class='del'>-   accumulated.  At that time, the stored data is compressed, and replaces the</div><div class='del'>-   uncompressed data in the file.  The log file is truncated to its new size at</div><div class='del'>-   that time.  After closing, the log file is always valid gzip file that can</div><div class='del'>-   decompressed to recover what was written.</div><div class='del'>-</div><div class='del'>-   A gzip header "extra" field contains two file offsets for appending.  The</div><div class='del'>-   first points to just after the last compressed data.  The second points to</div><div class='del'>-   the last stored block in the deflate stream, which is empty.  All of the</div><div class='del'>-   data between those pointers is uncompressed.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Open a gzlog object, creating the log file if it does not exist.  Return</div><div class='del'>-   NULL on error.  Note that gzlog_open() could take a long time to return if</div><div class='del'>-   there is difficulty in locking the file. */</div><div class='del'>-void *gzlog_open(char *path);</div><div class='del'>-</div><div class='del'>-/* Write to a gzlog object.  Return non-zero on error.  This function will</div><div class='del'>-   simply write data to the file uncompressed.  Compression of the data</div><div class='del'>-   will not occur until gzlog_close() is called.  It is expected that</div><div class='del'>-   gzlog_write() is used for a short message, and then gzlog_close() is</div><div class='del'>-   called.  If a large amount of data is to be written, then the application</div><div class='del'>-   should write no more than 1 MB at a time with gzlog_write() before</div><div class='del'>-   calling gzlog_close() and then gzlog_open() again. */</div><div class='del'>-int gzlog_write(void *log, char *data, size_t len);</div><div class='del'>-</div><div class='del'>-/* Close a gzlog object.  Return non-zero on error.  The log file is locked</div><div class='del'>-   until this function is called.  This function will compress stored data</div><div class='del'>-   at the end of the gzip file if at least 1 MB has been accumulated.  Note</div><div class='del'>-   that the file will not be a valid gzip file until this function completes.</div><div class='del'>- */</div><div class='del'>-int gzlog_close(void *log);</div><div class='head'>diff --git a/src/3rdparty/zlib/examples/zlib_how.html b/src/3rdparty/zlib/examples/zlib_how.html<br/>deleted file mode 100644<br/>index 40998db..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/examples/zlib_how.html?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/zlib_how.html</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,523 +0,0 @@</div><div class='del'>-&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"</div><div class='del'>-  "http://www.w3.org/TR/REC-html40/loose.dtd"&gt;</div><div class='del'>-&lt;html&gt;</div><div class='del'>-&lt;head&gt;</div><div class='del'>-&lt;meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"&gt;</div><div class='del'>-&lt;title&gt;zlib Usage Example&lt;/title&gt;</div><div class='del'>-&lt;!--  Copyright (c) 2004 Mark Adler.  --&gt;</div><div class='del'>-&lt;/head&gt;</div><div class='del'>-&lt;body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#00A000"&gt;</div><div class='del'>-&lt;h2 align="center"&gt; zlib Usage Example &lt;/h2&gt;</div><div class='del'>-We often get questions about how the &lt;tt&gt;deflate()&lt;/tt&gt; and &lt;tt&gt;inflate()&lt;/tt&gt; functions should be used.</div><div class='del'>-Users wonder when they should provide more input, when they should use more output,</div><div class='del'>-what to do with a &lt;tt&gt;Z_BUF_ERROR&lt;/tt&gt;, how to make sure the process terminates properly, and</div><div class='del'>-so on.  So for those who have read &lt;tt&gt;zlib.h&lt;/tt&gt; (a few times), and</div><div class='del'>-would like further edification, below is an annotated example in C of simple routines to compress and decompress</div><div class='del'>-from an input file to an output file using &lt;tt&gt;deflate()&lt;/tt&gt; and &lt;tt&gt;inflate()&lt;/tt&gt; respectively.  The</div><div class='del'>-annotations are interspersed between lines of the code.  So please read between the lines.</div><div class='del'>-We hope this helps explain some of the intricacies of &lt;em&gt;zlib&lt;/em&gt;.</div><div class='del'>-&lt;p&gt;</div><div class='del'>-Without further adieu, here is the program &lt;a href="zpipe.c"&gt;&lt;tt&gt;zpipe.c&lt;/tt&gt;&lt;/a&gt;:</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-/* zpipe.c: example of proper use of zlib's inflate() and deflate()</div><div class='del'>-   Not copyrighted -- provided to the public domain</div><div class='del'>-   Version 1.2  9 November 2004  Mark Adler */</div><div class='del'>-</div><div class='del'>-/* Version history:</div><div class='del'>-   1.0  30 Oct 2004  First version</div><div class='del'>-   1.1   8 Nov 2004  Add void casting for unused return values</div><div class='del'>-                     Use switch statement for inflate() return values</div><div class='del'>-   1.2   9 Nov 2004  Add assertions to document zlib guarantees</div><div class='del'>- */</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;&lt;!-- --&gt;</div><div class='del'>-We now include the header files for the required definitions.  From</div><div class='del'>-&lt;tt&gt;stdio.h&lt;/tt&gt; we use &lt;tt&gt;fopen()&lt;/tt&gt;, &lt;tt&gt;fread()&lt;/tt&gt;, &lt;tt&gt;fwrite()&lt;/tt&gt;,</div><div class='del'>-&lt;tt&gt;feof()&lt;/tt&gt;, &lt;tt&gt;ferror()&lt;/tt&gt;, and &lt;tt&gt;fclose()&lt;/tt&gt; for file i/o, and</div><div class='del'>-&lt;tt&gt;fputs()&lt;/tt&gt; for error messages.  From &lt;tt&gt;string.h&lt;/tt&gt; we use</div><div class='del'>-&lt;tt&gt;strcmp()&lt;/tt&gt; for command line argument processing.</div><div class='del'>-From &lt;tt&gt;assert.h&lt;/tt&gt; we use the &lt;tt&gt;assert()&lt;/tt&gt; macro.</div><div class='del'>-From &lt;tt&gt;zlib.h&lt;/tt&gt;</div><div class='del'>-we use the basic compression functions &lt;tt&gt;deflateInit()&lt;/tt&gt;,</div><div class='del'>-&lt;tt&gt;deflate()&lt;/tt&gt;, and &lt;tt&gt;deflateEnd()&lt;/tt&gt;, and the basic decompression</div><div class='del'>-functions &lt;tt&gt;inflateInit()&lt;/tt&gt;, &lt;tt&gt;inflate()&lt;/tt&gt;, and</div><div class='del'>-&lt;tt&gt;inflateEnd()&lt;/tt&gt;.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-#include &amp;lt;stdio.h&amp;gt;</div><div class='del'>-#include &amp;lt;string.h&amp;gt;</div><div class='del'>-#include &amp;lt;assert.h&amp;gt;</div><div class='del'>-#include "zlib.h"</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;&lt;!-- --&gt;</div><div class='del'>-&lt;tt&gt;CHUNK&lt;/tt&gt; is simply the buffer size for feeding data to and pulling data</div><div class='del'>-from the &lt;em&gt;zlib&lt;/em&gt; routines.  Larger buffer sizes would be more efficient,</div><div class='del'>-especially for &lt;tt&gt;inflate()&lt;/tt&gt;.  If the memory is available, buffers sizes</div><div class='del'>-on the order of 128K or 256K bytes should be used.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-#define CHUNK 16384</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;&lt;!-- --&gt;</div><div class='del'>-The &lt;tt&gt;def()&lt;/tt&gt; routine compresses data from an input file to an output file.  The output data</div><div class='del'>-will be in the &lt;em&gt;zlib&lt;/em&gt; format, which is different from the &lt;em&gt;gzip&lt;/em&gt; or &lt;em&gt;zip&lt;/em&gt;</div><div class='del'>-formats.  The &lt;em&gt;zlib&lt;/em&gt; format has a very small header of only two bytes to identify it as</div><div class='del'>-a &lt;em&gt;zlib&lt;/em&gt; stream and to provide decoding information, and a four-byte trailer with a fast</div><div class='del'>-check value to verify the integrity of the uncompressed data after decoding.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-/* Compress from file source to file dest until EOF on source.</div><div class='del'>-   def() returns Z_OK on success, Z_MEM_ERROR if memory could not be</div><div class='del'>-   allocated for processing, Z_STREAM_ERROR if an invalid compression</div><div class='del'>-   level is supplied, Z_VERSION_ERROR if the version of zlib.h and the</div><div class='del'>-   version of the library linked do not match, or Z_ERRNO if there is</div><div class='del'>-   an error reading or writing the files. */</div><div class='del'>-int def(FILE *source, FILE *dest, int level)</div><div class='del'>-{</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;</div><div class='del'>-Here are the local variables for &lt;tt&gt;def()&lt;/tt&gt;.  &lt;tt&gt;ret&lt;/tt&gt; will be used for &lt;em&gt;zlib&lt;/em&gt;</div><div class='del'>-return codes.  &lt;tt&gt;flush&lt;/tt&gt; will keep track of the current flushing state for &lt;tt&gt;deflate()&lt;/tt&gt;,</div><div class='del'>-which is either no flushing, or flush to completion after the end of the input file is reached.</div><div class='del'>-&lt;tt&gt;have&lt;/tt&gt; is the amount of data returned from &lt;tt&gt;deflate()&lt;/tt&gt;.  The &lt;tt&gt;strm&lt;/tt&gt; structure</div><div class='del'>-is used to pass information to and from the &lt;em&gt;zlib&lt;/em&gt; routines, and to maintain the</div><div class='del'>-&lt;tt&gt;deflate()&lt;/tt&gt; state.  &lt;tt&gt;in&lt;/tt&gt; and &lt;tt&gt;out&lt;/tt&gt; are the input and output buffers for</div><div class='del'>-&lt;tt&gt;deflate()&lt;/tt&gt;.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-    int ret, flush;</div><div class='del'>-    unsigned have;</div><div class='del'>-    z_stream strm;</div><div class='del'>-    char in[CHUNK];</div><div class='del'>-    char out[CHUNK];</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;&lt;!-- --&gt;</div><div class='del'>-The first thing we do is to initialize the &lt;em&gt;zlib&lt;/em&gt; state for compression using</div><div class='del'>-&lt;tt&gt;deflateInit()&lt;/tt&gt;.  This must be done before the first use of &lt;tt&gt;deflate()&lt;/tt&gt;.</div><div class='del'>-The &lt;tt&gt;zalloc&lt;/tt&gt;, &lt;tt&gt;zfree&lt;/tt&gt;, and &lt;tt&gt;opaque&lt;/tt&gt; fields in the &lt;tt&gt;strm&lt;/tt&gt;</div><div class='del'>-structure must be initialized before calling &lt;tt&gt;deflateInit()&lt;/tt&gt;.  Here they are</div><div class='del'>-set to the &lt;em&gt;zlib&lt;/em&gt; constant &lt;tt&gt;Z_NULL&lt;/tt&gt; to request that &lt;em&gt;zlib&lt;/em&gt; use</div><div class='del'>-the default memory allocation routines.  An application may also choose to provide</div><div class='del'>-custom memory allocation routines here.  &lt;tt&gt;deflateInit()&lt;/tt&gt; will allocate on the</div><div class='del'>-order of 256K bytes for the internal state.</div><div class='del'>-(See &lt;a href="zlib_tech.html"&gt;&lt;em&gt;zlib Technical Details&lt;/em&gt;&lt;/a&gt;.)</div><div class='del'>-&lt;p&gt;</div><div class='del'>-&lt;tt&gt;deflateInit()&lt;/tt&gt; is called with a pointer to the structure to be initialized and</div><div class='del'>-the compression level, which is an integer in the range of -1 to 9.  Lower compression</div><div class='del'>-levels result in faster execution, but less compression.  Higher levels result in</div><div class='del'>-greater compression, but slower execution.  The &lt;em&gt;zlib&lt;/em&gt; constant Z_DEFAULT_COMPRESSION,</div><div class='del'>-equal to -1,</div><div class='del'>-provides a good compromise between compression and speed and is equivalent to level 6.</div><div class='del'>-Level 0 actually does no compression at all, and in fact expands the data slightly to produce</div><div class='del'>-the &lt;em&gt;zlib&lt;/em&gt; format (it is not a byte-for-byte copy of the input).</div><div class='del'>-More advanced applications of &lt;em&gt;zlib&lt;/em&gt;</div><div class='del'>-may use &lt;tt&gt;deflateInit2()&lt;/tt&gt; here instead.  Such an application may want to reduce how</div><div class='del'>-much memory will be used, at some price in compression.  Or it may need to request a</div><div class='del'>-&lt;em&gt;gzip&lt;/em&gt; header and trailer instead of a &lt;em&gt;zlib&lt;/em&gt; header and trailer, or raw</div><div class='del'>-encoding with no header or trailer at all.</div><div class='del'>-&lt;p&gt;</div><div class='del'>-We must check the return value of &lt;tt&gt;deflateInit()&lt;/tt&gt; against the &lt;em&gt;zlib&lt;/em&gt; constant</div><div class='del'>-&lt;tt&gt;Z_OK&lt;/tt&gt; to make sure that it was able to</div><div class='del'>-allocate memory for the internal state, and that the provided arguments were valid.</div><div class='del'>-&lt;tt&gt;deflateInit()&lt;/tt&gt; will also check that the version of &lt;em&gt;zlib&lt;/em&gt; that the &lt;tt&gt;zlib.h&lt;/tt&gt;</div><div class='del'>-file came from matches the version of &lt;em&gt;zlib&lt;/em&gt; actually linked with the program.  This</div><div class='del'>-is especially important for environments in which &lt;em&gt;zlib&lt;/em&gt; is a shared library.</div><div class='del'>-&lt;p&gt;</div><div class='del'>-Note that an application can initialize multiple, independent &lt;em&gt;zlib&lt;/em&gt; streams, which can</div><div class='del'>-operate in parallel.  The state information maintained in the structure allows the &lt;em&gt;zlib&lt;/em&gt;</div><div class='del'>-routines to be reentrant.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-    /* allocate deflate state */</div><div class='del'>-    strm.zalloc = Z_NULL;</div><div class='del'>-    strm.zfree = Z_NULL;</div><div class='del'>-    strm.opaque = Z_NULL;</div><div class='del'>-    ret = deflateInit(&amp;amp;strm, level);</div><div class='del'>-    if (ret != Z_OK)</div><div class='del'>-        return ret;</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;&lt;!-- --&gt;</div><div class='del'>-With the pleasantries out of the way, now we can get down to business.  The outer &lt;tt&gt;do&lt;/tt&gt;-loop</div><div class='del'>-reads all of the input file and exits at the bottom of the loop once end-of-file is reached.</div><div class='del'>-This loop contains the only call of &lt;tt&gt;deflate()&lt;/tt&gt;.  So we must make sure that all of the</div><div class='del'>-input data has been processed and that all of the output data has been generated and consumed</div><div class='del'>-before we fall out of the loop at the bottom.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-    /* compress until end of file */</div><div class='del'>-    do {</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;</div><div class='del'>-We start off by reading data from the input file.  The number of bytes read is put directly</div><div class='del'>-into &lt;tt&gt;avail_in&lt;/tt&gt;, and a pointer to those bytes is put into &lt;tt&gt;next_in&lt;/tt&gt;.  We also</div><div class='del'>-check to see if end-of-file on the input has been reached.  If we are at the end of file, then &lt;tt&gt;flush&lt;/tt&gt; is set to the</div><div class='del'>-&lt;em&gt;zlib&lt;/em&gt; constant &lt;tt&gt;Z_FINISH&lt;/tt&gt;, which is later passed to &lt;tt&gt;deflate()&lt;/tt&gt; to</div><div class='del'>-indicate that this is the last chunk of input data to compress.  We need to use &lt;tt&gt;feof()&lt;/tt&gt;</div><div class='del'>-to check for end-of-file as opposed to seeing if fewer than &lt;tt&gt;CHUNK&lt;/tt&gt; bytes have been read.  The</div><div class='del'>-reason is that if the input file length is an exact multiple of &lt;tt&gt;CHUNK&lt;/tt&gt;, we will miss</div><div class='del'>-the fact that we got to the end-of-file, and not know to tell &lt;tt&gt;deflate()&lt;/tt&gt; to finish</div><div class='del'>-up the compressed stream.  If we are not yet at the end of the input, then the &lt;em&gt;zlib&lt;/em&gt;</div><div class='del'>-constant &lt;tt&gt;Z_NO_FLUSH&lt;/tt&gt; will be passed to &lt;tt&gt;deflate&lt;/tt&gt; to indicate that we are still</div><div class='del'>-in the middle of the uncompressed data.</div><div class='del'>-&lt;p&gt;</div><div class='del'>-If there is an error in reading from the input file, the process is aborted with</div><div class='del'>-&lt;tt&gt;deflateEnd()&lt;/tt&gt; being called to free the allocated &lt;em&gt;zlib&lt;/em&gt; state before returning</div><div class='del'>-the error.  We wouldn't want a memory leak, now would we?  &lt;tt&gt;deflateEnd()&lt;/tt&gt; can be called</div><div class='del'>-at any time after the state has been initialized.  Once that's done, &lt;tt&gt;deflateInit()&lt;/tt&gt; (or</div><div class='del'>-&lt;tt&gt;deflateInit2()&lt;/tt&gt;) would have to be called to start a new compression process.  There is</div><div class='del'>-no point here in checking the &lt;tt&gt;deflateEnd()&lt;/tt&gt; return code.  The deallocation can't fail.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-        strm.avail_in = fread(in, 1, CHUNK, source);</div><div class='del'>-        if (ferror(source)) {</div><div class='del'>-            (void)deflateEnd(&amp;amp;strm);</div><div class='del'>-            return Z_ERRNO;</div><div class='del'>-        }</div><div class='del'>-        flush = feof(source) ? Z_FINISH : Z_NO_FLUSH;</div><div class='del'>-        strm.next_in = in;</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;&lt;!-- --&gt;</div><div class='del'>-The inner &lt;tt&gt;do&lt;/tt&gt;-loop passes our chunk of input data to &lt;tt&gt;deflate()&lt;/tt&gt;, and then</div><div class='del'>-keeps calling &lt;tt&gt;deflate()&lt;/tt&gt; until it is done producing output.  Once there is no more</div><div class='del'>-new output, &lt;tt&gt;deflate()&lt;/tt&gt; is guaranteed to have consumed all of the input, i.e.,</div><div class='del'>-&lt;tt&gt;avail_in&lt;/tt&gt; will be zero.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-        /* run deflate() on input until output buffer not full, finish</div><div class='del'>-           compression if all of source has been read in */</div><div class='del'>-        do {</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;</div><div class='del'>-Output space is provided to &lt;tt&gt;deflate()&lt;/tt&gt; by setting &lt;tt&gt;avail_out&lt;/tt&gt; to the number</div><div class='del'>-of available output bytes and &lt;tt&gt;next_out&lt;/tt&gt; to a pointer to that space.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-            strm.avail_out = CHUNK;</div><div class='del'>-            strm.next_out = out;</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;</div><div class='del'>-Now we call the compression engine itself, &lt;tt&gt;deflate()&lt;/tt&gt;.  It takes as many of the</div><div class='del'>-&lt;tt&gt;avail_in&lt;/tt&gt; bytes at &lt;tt&gt;next_in&lt;/tt&gt; as it can process, and writes as many as</div><div class='del'>-&lt;tt&gt;avail_out&lt;/tt&gt; bytes to &lt;tt&gt;next_out&lt;/tt&gt;.  Those counters and pointers are then</div><div class='del'>-updated past the input data consumed and the output data written.  It is the amount of</div><div class='del'>-output space available that may limit how much input is consumed.</div><div class='del'>-Hence the inner loop to make sure that</div><div class='del'>-all of the input is consumed by providing more output space each time.  Since &lt;tt&gt;avail_in&lt;/tt&gt;</div><div class='del'>-and &lt;tt&gt;next_in&lt;/tt&gt; are updated by &lt;tt&gt;deflate()&lt;/tt&gt;, we don't have to mess with those</div><div class='del'>-between &lt;tt&gt;deflate()&lt;/tt&gt; calls until it's all used up.</div><div class='del'>-&lt;p&gt;</div><div class='del'>-The parameters to &lt;tt&gt;deflate()&lt;/tt&gt; are a pointer to the &lt;tt&gt;strm&lt;/tt&gt; structure containing</div><div class='del'>-the input and output information and the internal compression engine state, and a parameter</div><div class='del'>-indicating whether and how to flush data to the output.  Normally &lt;tt&gt;deflate&lt;/tt&gt; will consume</div><div class='del'>-several K bytes of input data before producing any output (except for the header), in order</div><div class='del'>-to accumulate statistics on the data for optimum compression.  It will then put out a burst of</div><div class='del'>-compressed data, and proceed to consume more input before the next burst.  Eventually,</div><div class='del'>-&lt;tt&gt;deflate()&lt;/tt&gt;</div><div class='del'>-must be told to terminate the stream, complete the compression with provided input data, and</div><div class='del'>-write out the trailer check value.  &lt;tt&gt;deflate()&lt;/tt&gt; will continue to compress normally as long</div><div class='del'>-as the flush parameter is &lt;tt&gt;Z_NO_FLUSH&lt;/tt&gt;.  Once the &lt;tt&gt;Z_FINISH&lt;/tt&gt; parameter is provided,</div><div class='del'>-&lt;tt&gt;deflate()&lt;/tt&gt; will begin to complete the compressed output stream.  However depending on how</div><div class='del'>-much output space is provided, &lt;tt&gt;deflate()&lt;/tt&gt; may have to be called several times until it</div><div class='del'>-has provided the complete compressed stream, even after it has consumed all of the input.  The flush</div><div class='del'>-parameter must continue to be &lt;tt&gt;Z_FINISH&lt;/tt&gt; for those subsequent calls.</div><div class='del'>-&lt;p&gt;</div><div class='del'>-There are other values of the flush parameter that are used in more advanced applications.  You can</div><div class='del'>-force &lt;tt&gt;deflate()&lt;/tt&gt; to produce a burst of output that encodes all of the input data provided</div><div class='del'>-so far, even if it wouldn't have otherwise, for example to control data latency on a link with</div><div class='del'>-compressed data.  You can also ask that &lt;tt&gt;deflate()&lt;/tt&gt; do that as well as erase any history up to</div><div class='del'>-that point so that what follows can be decompressed independently, for example for random access</div><div class='del'>-applications.  Both requests will degrade compression by an amount depending on how often such</div><div class='del'>-requests are made.</div><div class='del'>-&lt;p&gt;</div><div class='del'>-&lt;tt&gt;deflate()&lt;/tt&gt; has a return value that can indicate errors, yet we do not check it here.  Why</div><div class='del'>-not?  Well, it turns out that &lt;tt&gt;deflate()&lt;/tt&gt; can do no wrong here.  Let's go through</div><div class='del'>-&lt;tt&gt;deflate()&lt;/tt&gt;'s return values and dispense with them one by one.  The possible values are</div><div class='del'>-&lt;tt&gt;Z_OK&lt;/tt&gt;, &lt;tt&gt;Z_STREAM_END&lt;/tt&gt;, &lt;tt&gt;Z_STREAM_ERROR&lt;/tt&gt;, or &lt;tt&gt;Z_BUF_ERROR&lt;/tt&gt;.  &lt;tt&gt;Z_OK&lt;/tt&gt;</div><div class='del'>-is, well, ok.  &lt;tt&gt;Z_STREAM_END&lt;/tt&gt; is also ok and will be returned for the last call of</div><div class='del'>-&lt;tt&gt;deflate()&lt;/tt&gt;.  This is already guaranteed by calling &lt;tt&gt;deflate()&lt;/tt&gt; with &lt;tt&gt;Z_FINISH&lt;/tt&gt;</div><div class='del'>-until it has no more output.  &lt;tt&gt;Z_STREAM_ERROR&lt;/tt&gt; is only possible if the stream is not</div><div class='del'>-initialized properly, but we did initialize it properly.  There is no harm in checking for</div><div class='del'>-&lt;tt&gt;Z_STREAM_ERROR&lt;/tt&gt; here, for example to check for the possibility that some</div><div class='del'>-other part of the application inadvertently clobbered the memory containing the &lt;em&gt;zlib&lt;/em&gt; state.</div><div class='del'>-&lt;tt&gt;Z_BUF_ERROR&lt;/tt&gt; will be explained further below, but</div><div class='del'>-suffice it to say that this is simply an indication that &lt;tt&gt;deflate()&lt;/tt&gt; could not consume</div><div class='del'>-more input or produce more output.  &lt;tt&gt;deflate()&lt;/tt&gt; can be called again with more output space</div><div class='del'>-or more available input, which it will be in this code.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-            ret = deflate(&amp;amp;strm, flush);    /* no bad return value */</div><div class='del'>-            assert(ret != Z_STREAM_ERROR);  /* state not clobbered */</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;</div><div class='del'>-Now we compute how much output &lt;tt&gt;deflate()&lt;/tt&gt; provided on the last call, which is the</div><div class='del'>-difference between how much space was provided before the call, and how much output space</div><div class='del'>-is still available after the call.  Then that data, if any, is written to the output file.</div><div class='del'>-We can then reuse the output buffer for the next call of &lt;tt&gt;deflate()&lt;/tt&gt;.  Again if there</div><div class='del'>-is a file i/o error, we call &lt;tt&gt;deflateEnd()&lt;/tt&gt; before returning to avoid a memory leak.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-            have = CHUNK - strm.avail_out;</div><div class='del'>-            if (fwrite(out, 1, have, dest) != have || ferror(dest)) {</div><div class='del'>-                (void)deflateEnd(&amp;amp;strm);</div><div class='del'>-                return Z_ERRNO;</div><div class='del'>-            }</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;</div><div class='del'>-The inner &lt;tt&gt;do&lt;/tt&gt;-loop is repeated until the last &lt;tt&gt;deflate()&lt;/tt&gt; call fails to fill the</div><div class='del'>-provided output buffer.  Then we know that &lt;tt&gt;deflate()&lt;/tt&gt; has done as much as it can with</div><div class='del'>-the provided input, and that all of that input has been consumed.  We can then fall out of this</div><div class='del'>-loop and reuse the input buffer.</div><div class='del'>-&lt;p&gt;</div><div class='del'>-The way we tell that &lt;tt&gt;deflate()&lt;/tt&gt; has no more output is by seeing that it did not fill</div><div class='del'>-the output buffer, leaving &lt;tt&gt;avail_out&lt;/tt&gt; greater than zero.  However suppose that</div><div class='del'>-&lt;tt&gt;deflate()&lt;/tt&gt; has no more output, but just so happened to exactly fill the output buffer!</div><div class='del'>-&lt;tt&gt;avail_out&lt;/tt&gt; is zero, and we can't tell that &lt;tt&gt;deflate()&lt;/tt&gt; has done all it can.</div><div class='del'>-As far as we know, &lt;tt&gt;deflate()&lt;/tt&gt;</div><div class='del'>-has more output for us.  So we call it again.  But now &lt;tt&gt;deflate()&lt;/tt&gt; produces no output</div><div class='del'>-at all, and &lt;tt&gt;avail_out&lt;/tt&gt; remains unchanged as &lt;tt&gt;CHUNK&lt;/tt&gt;.  That &lt;tt&gt;deflate()&lt;/tt&gt; call</div><div class='del'>-wasn't able to do anything, either consume input or produce output, and so it returns</div><div class='del'>-&lt;tt&gt;Z_BUF_ERROR&lt;/tt&gt;.  (See, I told you I'd cover this later.)  However this is not a problem at</div><div class='del'>-all.  Now we finally have the desired indication that &lt;tt&gt;deflate()&lt;/tt&gt; is really done,</div><div class='del'>-and so we drop out of the inner loop to provide more input to &lt;tt&gt;deflate()&lt;/tt&gt;.</div><div class='del'>-&lt;p&gt;</div><div class='del'>-With &lt;tt&gt;flush&lt;/tt&gt; set to &lt;tt&gt;Z_FINISH&lt;/tt&gt;, this final set of &lt;tt&gt;deflate()&lt;/tt&gt; calls will</div><div class='del'>-complete the output stream.  Once that is done, subsequent calls of &lt;tt&gt;deflate()&lt;/tt&gt; would return</div><div class='del'>-&lt;tt&gt;Z_STREAM_ERROR&lt;/tt&gt; if the flush parameter is not &lt;tt&gt;Z_FINISH&lt;/tt&gt;, and do no more processing</div><div class='del'>-until the state is reinitialized.</div><div class='del'>-&lt;p&gt;</div><div class='del'>-Some applications of &lt;em&gt;zlib&lt;/em&gt; have two loops that call &lt;tt&gt;deflate()&lt;/tt&gt;</div><div class='del'>-instead of the single inner loop we have here.  The first loop would call</div><div class='del'>-without flushing and feed all of the data to &lt;tt&gt;deflate()&lt;/tt&gt;.  The second loop would call</div><div class='del'>-&lt;tt&gt;deflate()&lt;/tt&gt; with no more</div><div class='del'>-data and the &lt;tt&gt;Z_FINISH&lt;/tt&gt; parameter to complete the process.  As you can see from this</div><div class='del'>-example, that can be avoided by simply keeping track of the current flush state.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-        } while (strm.avail_out == 0);</div><div class='del'>-        assert(strm.avail_in == 0);     /* all input will be used */</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;&lt;!-- --&gt;</div><div class='del'>-Now we check to see if we have already processed all of the input file.  That information was</div><div class='del'>-saved in the &lt;tt&gt;flush&lt;/tt&gt; variable, so we see if that was set to &lt;tt&gt;Z_FINISH&lt;/tt&gt;.  If so,</div><div class='del'>-then we're done and we fall out of the outer loop.  We're guaranteed to get &lt;tt&gt;Z_STREAM_END&lt;/tt&gt;</div><div class='del'>-from the last &lt;tt&gt;deflate()&lt;/tt&gt; call, since we ran it until the last chunk of input was</div><div class='del'>-consumed and all of the output was generated.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-        /* done when last data in file processed */</div><div class='del'>-    } while (flush != Z_FINISH);</div><div class='del'>-    assert(ret == Z_STREAM_END);        /* stream will be complete */</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;&lt;!-- --&gt;</div><div class='del'>-The process is complete, but we still need to deallocate the state to avoid a memory leak</div><div class='del'>-(or rather more like a memory hemorrhage if you didn't do this).  Then</div><div class='del'>-finally we can return with a happy return value.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-    /* clean up and return */</div><div class='del'>-    (void)deflateEnd(&amp;amp;strm);</div><div class='del'>-    return Z_OK;</div><div class='del'>-}</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;&lt;!-- --&gt;</div><div class='del'>-Now we do the same thing for decompression in the &lt;tt&gt;inf()&lt;/tt&gt; routine. &lt;tt&gt;inf()&lt;/tt&gt;</div><div class='del'>-decompresses what is hopefully a valid &lt;em&gt;zlib&lt;/em&gt; stream from the input file and writes the</div><div class='del'>-uncompressed data to the output file.  Much of the discussion above for &lt;tt&gt;def()&lt;/tt&gt;</div><div class='del'>-applies to &lt;tt&gt;inf()&lt;/tt&gt; as well, so the discussion here will focus on the differences between</div><div class='del'>-the two.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-/* Decompress from file source to file dest until stream ends or EOF.</div><div class='del'>-   inf() returns Z_OK on success, Z_MEM_ERROR if memory could not be</div><div class='del'>-   allocated for processing, Z_DATA_ERROR if the deflate data is</div><div class='del'>-   invalid or incomplete, Z_VERSION_ERROR if the version of zlib.h and</div><div class='del'>-   the version of the library linked do not match, or Z_ERRNO if there</div><div class='del'>-   is an error reading or writing the files. */</div><div class='del'>-int inf(FILE *source, FILE *dest)</div><div class='del'>-{</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;</div><div class='del'>-The local variables have the same functionality as they do for &lt;tt&gt;def()&lt;/tt&gt;.  The</div><div class='del'>-only difference is that there is no &lt;tt&gt;flush&lt;/tt&gt; variable, since &lt;tt&gt;inflate()&lt;/tt&gt;</div><div class='del'>-can tell from the &lt;em&gt;zlib&lt;/em&gt; stream itself when the stream is complete.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-    int ret;</div><div class='del'>-    unsigned have;</div><div class='del'>-    z_stream strm;</div><div class='del'>-    char in[CHUNK];</div><div class='del'>-    char out[CHUNK];</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;&lt;!-- --&gt;</div><div class='del'>-The initialization of the state is the same, except that there is no compression level,</div><div class='del'>-of course, and two more elements of the structure are initialized.  &lt;tt&gt;avail_in&lt;/tt&gt;</div><div class='del'>-and &lt;tt&gt;next_in&lt;/tt&gt; must be initialized before calling &lt;tt&gt;inflateInit()&lt;/tt&gt;.  This</div><div class='del'>-is because the application has the option to provide the start of the zlib stream in</div><div class='del'>-order for &lt;tt&gt;inflateInit()&lt;/tt&gt; to have access to information about the compression</div><div class='del'>-method to aid in memory allocation.  In the current implementation of &lt;em&gt;zlib&lt;/em&gt;</div><div class='del'>-(up through versions 1.2.x), the method-dependent memory allocations are deferred to the first call of</div><div class='del'>-&lt;tt&gt;inflate()&lt;/tt&gt; anyway.  However those fields must be initialized since later versions</div><div class='del'>-of &lt;em&gt;zlib&lt;/em&gt; that provide more compression methods may take advantage of this interface.</div><div class='del'>-In any case, no decompression is performed by &lt;tt&gt;inflateInit()&lt;/tt&gt;, so the</div><div class='del'>-&lt;tt&gt;avail_out&lt;/tt&gt; and &lt;tt&gt;next_out&lt;/tt&gt; fields do not need to be initialized before calling.</div><div class='del'>-&lt;p&gt;</div><div class='del'>-Here &lt;tt&gt;avail_in&lt;/tt&gt; is set to zero and &lt;tt&gt;next_in&lt;/tt&gt; is set to &lt;tt&gt;Z_NULL&lt;/tt&gt; to</div><div class='del'>-indicate that no input data is being provided.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-    /* allocate inflate state */</div><div class='del'>-    strm.zalloc = Z_NULL;</div><div class='del'>-    strm.zfree = Z_NULL;</div><div class='del'>-    strm.opaque = Z_NULL;</div><div class='del'>-    strm.avail_in = 0;</div><div class='del'>-    strm.next_in = Z_NULL;</div><div class='del'>-    ret = inflateInit(&amp;amp;strm);</div><div class='del'>-    if (ret != Z_OK)</div><div class='del'>-        return ret;</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;&lt;!-- --&gt;</div><div class='del'>-The outer &lt;tt&gt;do&lt;/tt&gt;-loop decompresses input until &lt;tt&gt;inflate()&lt;/tt&gt; indicates</div><div class='del'>-that it has reached the end of the compressed data and has produced all of the uncompressed</div><div class='del'>-output.  This is in contrast to &lt;tt&gt;def()&lt;/tt&gt; which processes all of the input file.</div><div class='del'>-If end-of-file is reached before the compressed data self-terminates, then the compressed</div><div class='del'>-data is incomplete and an error is returned.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-    /* decompress until deflate stream ends or end of file */</div><div class='del'>-    do {</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;</div><div class='del'>-We read input data and set the &lt;tt&gt;strm&lt;/tt&gt; structure accordingly.  If we've reached the</div><div class='del'>-end of the input file, then we leave the outer loop and report an error, since the</div><div class='del'>-compressed data is incomplete.  Note that we may read more data than is eventually consumed</div><div class='del'>-by &lt;tt&gt;inflate()&lt;/tt&gt;, if the input file continues past the &lt;em&gt;zlib&lt;/em&gt; stream.</div><div class='del'>-For applications where &lt;em&gt;zlib&lt;/em&gt; streams are embedded in other data, this routine would</div><div class='del'>-need to be modified to return the unused data, or at least indicate how much of the input</div><div class='del'>-data was not used, so the application would know where to pick up after the &lt;em&gt;zlib&lt;/em&gt; stream.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-        strm.avail_in = fread(in, 1, CHUNK, source);</div><div class='del'>-        if (ferror(source)) {</div><div class='del'>-            (void)inflateEnd(&amp;amp;strm);</div><div class='del'>-            return Z_ERRNO;</div><div class='del'>-        }</div><div class='del'>-        if (strm.avail_in == 0)</div><div class='del'>-            break;</div><div class='del'>-        strm.next_in = in;</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;&lt;!-- --&gt;</div><div class='del'>-The inner &lt;tt&gt;do&lt;/tt&gt;-loop has the same function it did in &lt;tt&gt;def()&lt;/tt&gt;, which is to</div><div class='del'>-keep calling &lt;tt&gt;inflate()&lt;/tt&gt; until has generated all of the output it can with the</div><div class='del'>-provided input.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-        /* run inflate() on input until output buffer not full */</div><div class='del'>-        do {</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;</div><div class='del'>-Just like in &lt;tt&gt;def()&lt;/tt&gt;, the same output space is provided for each call of &lt;tt&gt;inflate()&lt;/tt&gt;.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-            strm.avail_out = CHUNK;</div><div class='del'>-            strm.next_out = out;</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;</div><div class='del'>-Now we run the decompression engine itself.  There is no need to adjust the flush parameter, since</div><div class='del'>-the &lt;em&gt;zlib&lt;/em&gt; format is self-terminating. The main difference here is that there are</div><div class='del'>-return values that we need to pay attention to.  &lt;tt&gt;Z_DATA_ERROR&lt;/tt&gt;</div><div class='del'>-indicates that &lt;tt&gt;inflate()&lt;/tt&gt; detected an error in the &lt;em&gt;zlib&lt;/em&gt; compressed data format,</div><div class='del'>-which means that either the data is not a &lt;em&gt;zlib&lt;/em&gt; stream to begin with, or that the data was</div><div class='del'>-corrupted somewhere along the way since it was compressed.  The other error to be processed is</div><div class='del'>-&lt;tt&gt;Z_MEM_ERROR&lt;/tt&gt;, which can occur since memory allocation is deferred until &lt;tt&gt;inflate()&lt;/tt&gt;</div><div class='del'>-needs it, unlike &lt;tt&gt;deflate()&lt;/tt&gt;, whose memory is allocated at the start by &lt;tt&gt;deflateInit()&lt;/tt&gt;.</div><div class='del'>-&lt;p&gt;</div><div class='del'>-Advanced applications may use</div><div class='del'>-&lt;tt&gt;deflateSetDictionary()&lt;/tt&gt; to prime &lt;tt&gt;deflate()&lt;/tt&gt; with a set of likely data to improve the</div><div class='del'>-first 32K or so of compression.  This is noted in the &lt;em&gt;zlib&lt;/em&gt; header, so &lt;tt&gt;inflate()&lt;/tt&gt;</div><div class='del'>-requests that that dictionary be provided before it can start to decompress.  Without the dictionary,</div><div class='del'>-correct decompression is not possible.  For this routine, we have no idea what the dictionary is,</div><div class='del'>-so the &lt;tt&gt;Z_NEED_DICT&lt;/tt&gt; indication is converted to a &lt;tt&gt;Z_DATA_ERROR&lt;/tt&gt;.</div><div class='del'>-&lt;p&gt;</div><div class='del'>-&lt;tt&gt;inflate()&lt;/tt&gt; can also return &lt;tt&gt;Z_STREAM_ERROR&lt;/tt&gt;, which should not be possible here,</div><div class='del'>-but could be checked for as noted above for &lt;tt&gt;def()&lt;/tt&gt;.  &lt;tt&gt;Z_BUF_ERROR&lt;/tt&gt; does not need to be</div><div class='del'>-checked for here, for the same reasons noted for &lt;tt&gt;def()&lt;/tt&gt;.  &lt;tt&gt;Z_STREAM_END&lt;/tt&gt; will be</div><div class='del'>-checked for later.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-            ret = inflate(&amp;amp;strm, Z_NO_FLUSH);</div><div class='del'>-            assert(ret != Z_STREAM_ERROR);  /* state not clobbered */</div><div class='del'>-            switch (ret) {</div><div class='del'>-            case Z_NEED_DICT:</div><div class='del'>-                ret = Z_DATA_ERROR;     /* and fall through */</div><div class='del'>-            case Z_DATA_ERROR:</div><div class='del'>-            case Z_MEM_ERROR:</div><div class='del'>-                (void)inflateEnd(&amp;amp;strm);</div><div class='del'>-                return ret;</div><div class='del'>-            }</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;</div><div class='del'>-The output of &lt;tt&gt;inflate()&lt;/tt&gt; is handled identically to that of &lt;tt&gt;deflate()&lt;/tt&gt;.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-            have = CHUNK - strm.avail_out;</div><div class='del'>-            if (fwrite(out, 1, have, dest) != have || ferror(dest)) {</div><div class='del'>-                (void)inflateEnd(&amp;amp;strm);</div><div class='del'>-                return Z_ERRNO;</div><div class='del'>-            }</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;</div><div class='del'>-The inner &lt;tt&gt;do&lt;/tt&gt;-loop ends when &lt;tt&gt;inflate()&lt;/tt&gt; has no more output as indicated</div><div class='del'>-by not filling the output buffer, just as for &lt;tt&gt;deflate()&lt;/tt&gt;.  In this case, we cannot</div><div class='del'>-assert that &lt;tt&gt;strm.avail_in&lt;/tt&gt; will be zero, since the deflate stream may end before the file</div><div class='del'>-does.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-        } while (strm.avail_out == 0);</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;&lt;!-- --&gt;</div><div class='del'>-The outer &lt;tt&gt;do&lt;/tt&gt;-loop ends when &lt;tt&gt;inflate()&lt;/tt&gt; reports that it has reached the</div><div class='del'>-end of the input &lt;em&gt;zlib&lt;/em&gt; stream, has completed the decompression and integrity</div><div class='del'>-check, and has provided all of the output.  This is indicated by the &lt;tt&gt;inflate()&lt;/tt&gt;</div><div class='del'>-return value &lt;tt&gt;Z_STREAM_END&lt;/tt&gt;.  The inner loop is guaranteed to leave &lt;tt&gt;ret&lt;/tt&gt;</div><div class='del'>-equal to &lt;tt&gt;Z_STREAM_END&lt;/tt&gt; if the last chunk of the input file read contained the end</div><div class='del'>-of the &lt;em&gt;zlib&lt;/em&gt; stream.  So if the return value is not &lt;tt&gt;Z_STREAM_END&lt;/tt&gt;, the</div><div class='del'>-loop continues to read more input.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-        /* done when inflate() says it's done */</div><div class='del'>-    } while (ret != Z_STREAM_END);</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;&lt;!-- --&gt;</div><div class='del'>-At this point, decompression successfully completed, or we broke out of the loop due to no</div><div class='del'>-more data being available from the input file.  If the last &lt;tt&gt;inflate()&lt;/tt&gt; return value</div><div class='del'>-is not &lt;tt&gt;Z_STREAM_END&lt;/tt&gt;, then the &lt;em&gt;zlib&lt;/em&gt; stream was incomplete and a data error</div><div class='del'>-is returned.  Otherwise, we return with a happy return value.  Of course, &lt;tt&gt;inflateEnd()&lt;/tt&gt;</div><div class='del'>-is called first to avoid a memory leak.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-    /* clean up and return */</div><div class='del'>-    (void)inflateEnd(&amp;amp;strm);</div><div class='del'>-    return ret == Z_STREAM_END ? Z_OK : Z_DATA_ERROR;</div><div class='del'>-}</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;&lt;!-- --&gt;</div><div class='del'>-That ends the routines that directly use &lt;em&gt;zlib&lt;/em&gt;.  The following routines make this</div><div class='del'>-a command-line program by running data through the above routines from &lt;tt&gt;stdin&lt;/tt&gt; to</div><div class='del'>-&lt;tt&gt;stdout&lt;/tt&gt;, and handling any errors reported by &lt;tt&gt;def()&lt;/tt&gt; or &lt;tt&gt;inf()&lt;/tt&gt;.</div><div class='del'>-&lt;p&gt;</div><div class='del'>-&lt;tt&gt;zerr()&lt;/tt&gt; is used to interpret the possible error codes from &lt;tt&gt;def()&lt;/tt&gt;</div><div class='del'>-and &lt;tt&gt;inf()&lt;/tt&gt;, as detailed in their comments above, and print out an error message.</div><div class='del'>-Note that these are only a subset of the possible return values from &lt;tt&gt;deflate()&lt;/tt&gt;</div><div class='del'>-and &lt;tt&gt;inflate()&lt;/tt&gt;.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-/* report a zlib or i/o error */</div><div class='del'>-void zerr(int ret)</div><div class='del'>-{</div><div class='del'>-    fputs("zpipe: ", stderr);</div><div class='del'>-    switch (ret) {</div><div class='del'>-    case Z_ERRNO:</div><div class='del'>-        if (ferror(stdin))</div><div class='del'>-            fputs("error reading stdin\n", stderr);</div><div class='del'>-        if (ferror(stdout))</div><div class='del'>-            fputs("error writing stdout\n", stderr);</div><div class='del'>-        break;</div><div class='del'>-    case Z_STREAM_ERROR:</div><div class='del'>-        fputs("invalid compression level\n", stderr);</div><div class='del'>-        break;</div><div class='del'>-    case Z_DATA_ERROR:</div><div class='del'>-        fputs("invalid or incomplete deflate data\n", stderr);</div><div class='del'>-        break;</div><div class='del'>-    case Z_MEM_ERROR:</div><div class='del'>-        fputs("out of memory\n", stderr);</div><div class='del'>-        break;</div><div class='del'>-    case Z_VERSION_ERROR:</div><div class='del'>-        fputs("zlib version mismatch!\n", stderr);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;&lt;!-- --&gt;</div><div class='del'>-Here is the &lt;tt&gt;main()&lt;/tt&gt; routine used to test &lt;tt&gt;def()&lt;/tt&gt; and &lt;tt&gt;inf()&lt;/tt&gt;.  The</div><div class='del'>-&lt;tt&gt;zpipe&lt;/tt&gt; command is simply a compression pipe from &lt;tt&gt;stdin&lt;/tt&gt; to &lt;tt&gt;stdout&lt;/tt&gt;, if</div><div class='del'>-no arguments are given, or it is a decompression pipe if &lt;tt&gt;zpipe -d&lt;/tt&gt; is used.  If any other</div><div class='del'>-arguments are provided, no compression or decompression is performed.  Instead a usage</div><div class='del'>-message is displayed.  Examples are &lt;tt&gt;zpipe &lt; foo.txt &gt; foo.txt.z&lt;/tt&gt; to compress, and</div><div class='del'>-&lt;tt&gt;zpipe -d &lt; foo.txt.z &gt; foo.txt&lt;/tt&gt; to decompress.</div><div class='del'>-&lt;pre&gt;&lt;b&gt;</div><div class='del'>-/* compress or decompress from stdin to stdout */</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-    int ret;</div><div class='del'>-</div><div class='del'>-    /* do compression if no arguments */</div><div class='del'>-    if (argc == 1) {</div><div class='del'>-        ret = def(stdin, stdout, Z_DEFAULT_COMPRESSION);</div><div class='del'>-        if (ret != Z_OK)</div><div class='del'>-            zerr(ret);</div><div class='del'>-        return ret;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* do decompression if -d specified */</div><div class='del'>-    else if (argc == 2 &amp;amp;&amp;amp; strcmp(argv[1], "-d") == 0) {</div><div class='del'>-        ret = inf(stdin, stdout);</div><div class='del'>-        if (ret != Z_OK)</div><div class='del'>-            zerr(ret);</div><div class='del'>-        return ret;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* otherwise, report usage */</div><div class='del'>-    else {</div><div class='del'>-        fputs("zpipe usage: zpipe [-d] &amp;lt; source &amp;gt; dest\n", stderr);</div><div class='del'>-        return 1;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-&lt;/b&gt;&lt;/pre&gt;</div><div class='del'>-&lt;hr&gt;</div><div class='del'>-&lt;i&gt;Copyright (c) 2004 by Mark Adler&lt;br&gt;Last modified 13 November 2004&lt;/i&gt;</div><div class='del'>-&lt;/body&gt;</div><div class='del'>-&lt;/html&gt;</div><div class='head'>diff --git a/src/3rdparty/zlib/examples/zpipe.c b/src/3rdparty/zlib/examples/zpipe.c<br/>deleted file mode 100644<br/>index 26abb56..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/examples/zpipe.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/zpipe.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,191 +0,0 @@</div><div class='del'>-/* zpipe.c: example of proper use of zlib's inflate() and deflate()</div><div class='del'>-   Not copyrighted -- provided to the public domain</div><div class='del'>-   Version 1.2  9 November 2004  Mark Adler */</div><div class='del'>-</div><div class='del'>-/* Version history:</div><div class='del'>-   1.0  30 Oct 2004  First version</div><div class='del'>-   1.1   8 Nov 2004  Add void casting for unused return values</div><div class='del'>-                     Use switch statement for inflate() return values</div><div class='del'>-   1.2   9 Nov 2004  Add assertions to document zlib guarantees</div><div class='del'>-   1.3   6 Apr 2005  Remove incorrect assertion in inf()</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;assert.h&gt;</div><div class='del'>-#include "zlib.h"</div><div class='del'>-</div><div class='del'>-#define CHUNK 16384</div><div class='del'>-</div><div class='del'>-/* Compress from file source to file dest until EOF on source.</div><div class='del'>-   def() returns Z_OK on success, Z_MEM_ERROR if memory could not be</div><div class='del'>-   allocated for processing, Z_STREAM_ERROR if an invalid compression</div><div class='del'>-   level is supplied, Z_VERSION_ERROR if the version of zlib.h and the</div><div class='del'>-   version of the library linked do not match, or Z_ERRNO if there is</div><div class='del'>-   an error reading or writing the files. */</div><div class='del'>-int def(FILE *source, FILE *dest, int level)</div><div class='del'>-{</div><div class='del'>-    int ret, flush;</div><div class='del'>-    unsigned have;</div><div class='del'>-    z_stream strm;</div><div class='del'>-    char in[CHUNK];</div><div class='del'>-    char out[CHUNK];</div><div class='del'>-</div><div class='del'>-    /* allocate deflate state */</div><div class='del'>-    strm.zalloc = Z_NULL;</div><div class='del'>-    strm.zfree = Z_NULL;</div><div class='del'>-    strm.opaque = Z_NULL;</div><div class='del'>-    ret = deflateInit(&amp;strm, level);</div><div class='del'>-    if (ret != Z_OK)</div><div class='del'>-        return ret;</div><div class='del'>-</div><div class='del'>-    /* compress until end of file */</div><div class='del'>-    do {</div><div class='del'>-        strm.avail_in = fread(in, 1, CHUNK, source);</div><div class='del'>-        if (ferror(source)) {</div><div class='del'>-            (void)deflateEnd(&amp;strm);</div><div class='del'>-            return Z_ERRNO;</div><div class='del'>-        }</div><div class='del'>-        flush = feof(source) ? Z_FINISH : Z_NO_FLUSH;</div><div class='del'>-        strm.next_in = in;</div><div class='del'>-</div><div class='del'>-        /* run deflate() on input until output buffer not full, finish</div><div class='del'>-           compression if all of source has been read in */</div><div class='del'>-        do {</div><div class='del'>-            strm.avail_out = CHUNK;</div><div class='del'>-            strm.next_out = out;</div><div class='del'>-            ret = deflate(&amp;strm, flush);    /* no bad return value */</div><div class='del'>-            assert(ret != Z_STREAM_ERROR);  /* state not clobbered */</div><div class='del'>-            have = CHUNK - strm.avail_out;</div><div class='del'>-            if (fwrite(out, 1, have, dest) != have || ferror(dest)) {</div><div class='del'>-                (void)deflateEnd(&amp;strm);</div><div class='del'>-                return Z_ERRNO;</div><div class='del'>-            }</div><div class='del'>-        } while (strm.avail_out == 0);</div><div class='del'>-        assert(strm.avail_in == 0);     /* all input will be used */</div><div class='del'>-</div><div class='del'>-        /* done when last data in file processed */</div><div class='del'>-    } while (flush != Z_FINISH);</div><div class='del'>-    assert(ret == Z_STREAM_END);        /* stream will be complete */</div><div class='del'>-</div><div class='del'>-    /* clean up and return */</div><div class='del'>-    (void)deflateEnd(&amp;strm);</div><div class='del'>-    return Z_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Decompress from file source to file dest until stream ends or EOF.</div><div class='del'>-   inf() returns Z_OK on success, Z_MEM_ERROR if memory could not be</div><div class='del'>-   allocated for processing, Z_DATA_ERROR if the deflate data is</div><div class='del'>-   invalid or incomplete, Z_VERSION_ERROR if the version of zlib.h and</div><div class='del'>-   the version of the library linked do not match, or Z_ERRNO if there</div><div class='del'>-   is an error reading or writing the files. */</div><div class='del'>-int inf(FILE *source, FILE *dest)</div><div class='del'>-{</div><div class='del'>-    int ret;</div><div class='del'>-    unsigned have;</div><div class='del'>-    z_stream strm;</div><div class='del'>-    char in[CHUNK];</div><div class='del'>-    char out[CHUNK];</div><div class='del'>-</div><div class='del'>-    /* allocate inflate state */</div><div class='del'>-    strm.zalloc = Z_NULL;</div><div class='del'>-    strm.zfree = Z_NULL;</div><div class='del'>-    strm.opaque = Z_NULL;</div><div class='del'>-    strm.avail_in = 0;</div><div class='del'>-    strm.next_in = Z_NULL;</div><div class='del'>-    ret = inflateInit(&amp;strm);</div><div class='del'>-    if (ret != Z_OK)</div><div class='del'>-        return ret;</div><div class='del'>-</div><div class='del'>-    /* decompress until deflate stream ends or end of file */</div><div class='del'>-    do {</div><div class='del'>-        strm.avail_in = fread(in, 1, CHUNK, source);</div><div class='del'>-        if (ferror(source)) {</div><div class='del'>-            (void)inflateEnd(&amp;strm);</div><div class='del'>-            return Z_ERRNO;</div><div class='del'>-        }</div><div class='del'>-        if (strm.avail_in == 0)</div><div class='del'>-            break;</div><div class='del'>-        strm.next_in = in;</div><div class='del'>-</div><div class='del'>-        /* run inflate() on input until output buffer not full */</div><div class='del'>-        do {</div><div class='del'>-            strm.avail_out = CHUNK;</div><div class='del'>-            strm.next_out = out;</div><div class='del'>-            ret = inflate(&amp;strm, Z_NO_FLUSH);</div><div class='del'>-            assert(ret != Z_STREAM_ERROR);  /* state not clobbered */</div><div class='del'>-            switch (ret) {</div><div class='del'>-            case Z_NEED_DICT:</div><div class='del'>-                ret = Z_DATA_ERROR;     /* and fall through */</div><div class='del'>-            case Z_DATA_ERROR:</div><div class='del'>-            case Z_MEM_ERROR:</div><div class='del'>-                (void)inflateEnd(&amp;strm);</div><div class='del'>-                return ret;</div><div class='del'>-            }</div><div class='del'>-            have = CHUNK - strm.avail_out;</div><div class='del'>-            if (fwrite(out, 1, have, dest) != have || ferror(dest)) {</div><div class='del'>-                (void)inflateEnd(&amp;strm);</div><div class='del'>-                return Z_ERRNO;</div><div class='del'>-            }</div><div class='del'>-        } while (strm.avail_out == 0);</div><div class='del'>-</div><div class='del'>-        /* done when inflate() says it's done */</div><div class='del'>-    } while (ret != Z_STREAM_END);</div><div class='del'>-</div><div class='del'>-    /* clean up and return */</div><div class='del'>-    (void)inflateEnd(&amp;strm);</div><div class='del'>-    return ret == Z_STREAM_END ? Z_OK : Z_DATA_ERROR;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* report a zlib or i/o error */</div><div class='del'>-void zerr(int ret)</div><div class='del'>-{</div><div class='del'>-    fputs("zpipe: ", stderr);</div><div class='del'>-    switch (ret) {</div><div class='del'>-    case Z_ERRNO:</div><div class='del'>-        if (ferror(stdin))</div><div class='del'>-            fputs("error reading stdin\n", stderr);</div><div class='del'>-        if (ferror(stdout))</div><div class='del'>-            fputs("error writing stdout\n", stderr);</div><div class='del'>-        break;</div><div class='del'>-    case Z_STREAM_ERROR:</div><div class='del'>-        fputs("invalid compression level\n", stderr);</div><div class='del'>-        break;</div><div class='del'>-    case Z_DATA_ERROR:</div><div class='del'>-        fputs("invalid or incomplete deflate data\n", stderr);</div><div class='del'>-        break;</div><div class='del'>-    case Z_MEM_ERROR:</div><div class='del'>-        fputs("out of memory\n", stderr);</div><div class='del'>-        break;</div><div class='del'>-    case Z_VERSION_ERROR:</div><div class='del'>-        fputs("zlib version mismatch!\n", stderr);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* compress or decompress from stdin to stdout */</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-    int ret;</div><div class='del'>-</div><div class='del'>-    /* do compression if no arguments */</div><div class='del'>-    if (argc == 1) {</div><div class='del'>-        ret = def(stdin, stdout, Z_DEFAULT_COMPRESSION);</div><div class='del'>-        if (ret != Z_OK)</div><div class='del'>-            zerr(ret);</div><div class='del'>-        return ret;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* do decompression if -d specified */</div><div class='del'>-    else if (argc == 2 &amp;&amp; strcmp(argv[1], "-d") == 0) {</div><div class='del'>-        ret = inf(stdin, stdout);</div><div class='del'>-        if (ret != Z_OK)</div><div class='del'>-            zerr(ret);</div><div class='del'>-        return ret;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* otherwise, report usage */</div><div class='del'>-    else {</div><div class='del'>-        fputs("zpipe usage: zpipe [-d] &lt; source &gt; dest\n", stderr);</div><div class='del'>-        return 1;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='head'>diff --git a/src/3rdparty/zlib/examples/zran.c b/src/3rdparty/zlib/examples/zran.c<br/>deleted file mode 100644<br/>index 8c7717e..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/examples/zran.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/examples/zran.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,404 +0,0 @@</div><div class='del'>-/* zran.c -- example of zlib/gzip stream indexing and random access</div><div class='del'>- * Copyright (C) 2005 Mark Adler</div><div class='del'>- * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='del'>-   Version 1.0  29 May 2005  Mark Adler */</div><div class='del'>-</div><div class='del'>-/* Illustrate the use of Z_BLOCK, inflatePrime(), and inflateSetDictionary()</div><div class='del'>-   for random access of a compressed file.  A file containing a zlib or gzip</div><div class='del'>-   stream is provided on the command line.  The compressed stream is decoded in</div><div class='del'>-   its entirety, and an index built with access points about every SPAN bytes</div><div class='del'>-   in the uncompressed output.  The compressed file is left open, and can then</div><div class='del'>-   be read randomly, having to decompress on the average SPAN/2 uncompressed</div><div class='del'>-   bytes before getting to the desired block of data.</div><div class='del'>-</div><div class='del'>-   An access point can be created at the start of any deflate block, by saving</div><div class='del'>-   the starting file offset and bit of that block, and the 32K bytes of</div><div class='del'>-   uncompressed data that precede that block.  Also the uncompressed offset of</div><div class='del'>-   that block is saved to provide a referece for locating a desired starting</div><div class='del'>-   point in the uncompressed stream.  build_index() works by decompressing the</div><div class='del'>-   input zlib or gzip stream a block at a time, and at the end of each block</div><div class='del'>-   deciding if enough uncompressed data has gone by to justify the creation of</div><div class='del'>-   a new access point.  If so, that point is saved in a data structure that</div><div class='del'>-   grows as needed to accommodate the points.</div><div class='del'>-</div><div class='del'>-   To use the index, an offset in the uncompressed data is provided, for which</div><div class='del'>-   the latest accees point at or preceding that offset is located in the index.</div><div class='del'>-   The input file is positioned to the specified location in the index, and if</div><div class='del'>-   necessary the first few bits of the compressed data is read from the file.</div><div class='del'>-   inflate is initialized with those bits and the 32K of uncompressed data, and</div><div class='del'>-   the decompression then proceeds until the desired offset in the file is</div><div class='del'>-   reached.  Then the decompression continues to read the desired uncompressed</div><div class='del'>-   data from the file.</div><div class='del'>-</div><div class='del'>-   Another approach would be to generate the index on demand.  In that case,</div><div class='del'>-   requests for random access reads from the compressed data would try to use</div><div class='del'>-   the index, but if a read far enough past the end of the index is required,</div><div class='del'>-   then further index entries would be generated and added.</div><div class='del'>-</div><div class='del'>-   There is some fair bit of overhead to starting inflation for the random</div><div class='del'>-   access, mainly copying the 32K byte dictionary.  So if small pieces of the</div><div class='del'>-   file are being accessed, it would make sense to implement a cache to hold</div><div class='del'>-   some lookahead and avoid many calls to extract() for small lengths.</div><div class='del'>-</div><div class='del'>-   Another way to build an index would be to use inflateCopy().  That would</div><div class='del'>-   not be constrained to have access points at block boundaries, but requires</div><div class='del'>-   more memory per access point, and also cannot be saved to file due to the</div><div class='del'>-   use of pointers in the state.  The approach here allows for storage of the</div><div class='del'>-   index in a file.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "zlib.h"</div><div class='del'>-</div><div class='del'>-#define local static</div><div class='del'>-</div><div class='del'>-#define SPAN 1048576L       /* desired distance between access points */</div><div class='del'>-#define WINSIZE 32768U      /* sliding window size */</div><div class='del'>-#define CHUNK 16384         /* file input buffer size */</div><div class='del'>-</div><div class='del'>-/* access point entry */</div><div class='del'>-struct point {</div><div class='del'>-    off_t out;          /* corresponding offset in uncompressed data */</div><div class='del'>-    off_t in;           /* offset in input file of first full byte */</div><div class='del'>-    int bits;           /* number of bits (1-7) from byte at in - 1, or 0 */</div><div class='del'>-    unsigned char window[WINSIZE];  /* preceding 32K of uncompressed data */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* access point list */</div><div class='del'>-struct access {</div><div class='del'>-    int have;           /* number of list entries filled in */</div><div class='del'>-    int size;           /* number of list entries allocated */</div><div class='del'>-    struct point *list; /* allocated list */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Deallocate an index built by build_index() */</div><div class='del'>-local void free_index(struct access *index)</div><div class='del'>-{</div><div class='del'>-    if (index != NULL) {</div><div class='del'>-        free(index-&gt;list);</div><div class='del'>-        free(index);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Add an entry to the access point list.  If out of memory, deallocate the</div><div class='del'>-   existing list and return NULL. */</div><div class='del'>-local struct access *addpoint(struct access *index, int bits,</div><div class='del'>-    off_t in, off_t out, unsigned left, unsigned char *window)</div><div class='del'>-{</div><div class='del'>-    struct point *next;</div><div class='del'>-</div><div class='del'>-    /* if list is empty, create it (start with eight points) */</div><div class='del'>-    if (index == NULL) {</div><div class='del'>-        index = malloc(sizeof(struct access));</div><div class='del'>-        if (index == NULL) return NULL;</div><div class='del'>-        index-&gt;list = malloc(sizeof(struct point) &lt;&lt; 3);</div><div class='del'>-        if (index-&gt;list == NULL) {</div><div class='del'>-            free(index);</div><div class='del'>-            return NULL;</div><div class='del'>-        }</div><div class='del'>-        index-&gt;size = 8;</div><div class='del'>-        index-&gt;have = 0;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* if list is full, make it bigger */</div><div class='del'>-    else if (index-&gt;have == index-&gt;size) {</div><div class='del'>-        index-&gt;size &lt;&lt;= 1;</div><div class='del'>-        next = realloc(index-&gt;list, sizeof(struct point) * index-&gt;size);</div><div class='del'>-        if (next == NULL) {</div><div class='del'>-            free_index(index);</div><div class='del'>-            return NULL;</div><div class='del'>-        }</div><div class='del'>-        index-&gt;list = next;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* fill in entry and increment how many we have */</div><div class='del'>-    next = index-&gt;list + index-&gt;have;</div><div class='del'>-    next-&gt;bits = bits;</div><div class='del'>-    next-&gt;in = in;</div><div class='del'>-    next-&gt;out = out;</div><div class='del'>-    if (left)</div><div class='del'>-        memcpy(next-&gt;window, window + WINSIZE - left, left);</div><div class='del'>-    if (left &lt; WINSIZE)</div><div class='del'>-        memcpy(next-&gt;window + left, window, WINSIZE - left);</div><div class='del'>-    index-&gt;have++;</div><div class='del'>-</div><div class='del'>-    /* return list, possibly reallocated */</div><div class='del'>-    return index;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Make one entire pass through the compressed stream and build an index, with</div><div class='del'>-   access points about every span bytes of uncompressed output -- span is</div><div class='del'>-   chosen to balance the speed of random access against the memory requirements</div><div class='del'>-   of the list, about 32K bytes per access point.  Note that data after the end</div><div class='del'>-   of the first zlib or gzip stream in the file is ignored.  build_index()</div><div class='del'>-   returns the number of access points on success (&gt;= 1), Z_MEM_ERROR for out</div><div class='del'>-   of memory, Z_DATA_ERROR for an error in the input file, or Z_ERRNO for a</div><div class='del'>-   file read error.  On success, *built points to the resulting index. */</div><div class='del'>-local int build_index(FILE *in, off_t span, struct access **built)</div><div class='del'>-{</div><div class='del'>-    int ret;</div><div class='del'>-    off_t totin, totout;        /* our own total counters to avoid 4GB limit */</div><div class='del'>-    off_t last;                 /* totout value of last access point */</div><div class='del'>-    struct access *index;       /* access points being generated */</div><div class='del'>-    z_stream strm;</div><div class='del'>-    unsigned char input[CHUNK];</div><div class='del'>-    unsigned char window[WINSIZE];</div><div class='del'>-</div><div class='del'>-    /* initialize inflate */</div><div class='del'>-    strm.zalloc = Z_NULL;</div><div class='del'>-    strm.zfree = Z_NULL;</div><div class='del'>-    strm.opaque = Z_NULL;</div><div class='del'>-    strm.avail_in = 0;</div><div class='del'>-    strm.next_in = Z_NULL;</div><div class='del'>-    ret = inflateInit2(&amp;strm, 47);      /* automatic zlib or gzip decoding */</div><div class='del'>-    if (ret != Z_OK)</div><div class='del'>-        return ret;</div><div class='del'>-</div><div class='del'>-    /* inflate the input, maintain a sliding window, and build an index -- this</div><div class='del'>-       also validates the integrity of the compressed data using the check</div><div class='del'>-       information at the end of the gzip or zlib stream */</div><div class='del'>-    totin = totout = last = 0;</div><div class='del'>-    index = NULL;               /* will be allocated by first addpoint() */</div><div class='del'>-    strm.avail_out = 0;</div><div class='del'>-    do {</div><div class='del'>-        /* get some compressed data from input file */</div><div class='del'>-        strm.avail_in = fread(input, 1, CHUNK, in);</div><div class='del'>-        if (ferror(in)) {</div><div class='del'>-            ret = Z_ERRNO;</div><div class='del'>-            goto build_index_error;</div><div class='del'>-        }</div><div class='del'>-        if (strm.avail_in == 0) {</div><div class='del'>-            ret = Z_DATA_ERROR;</div><div class='del'>-            goto build_index_error;</div><div class='del'>-        }</div><div class='del'>-        strm.next_in = input;</div><div class='del'>-</div><div class='del'>-        /* process all of that, or until end of stream */</div><div class='del'>-        do {</div><div class='del'>-            /* reset sliding window if necessary */</div><div class='del'>-            if (strm.avail_out == 0) {</div><div class='del'>-                strm.avail_out = WINSIZE;</div><div class='del'>-                strm.next_out = window;</div><div class='del'>-            }</div><div class='del'>-</div><div class='del'>-            /* inflate until out of input, output, or at end of block --</div><div class='del'>-               update the total input and output counters */</div><div class='del'>-            totin += strm.avail_in;</div><div class='del'>-            totout += strm.avail_out;</div><div class='del'>-            ret = inflate(&amp;strm, Z_BLOCK);      /* return at end of block */</div><div class='del'>-            totin -= strm.avail_in;</div><div class='del'>-            totout -= strm.avail_out;</div><div class='del'>-            if (ret == Z_NEED_DICT)</div><div class='del'>-                ret = Z_DATA_ERROR;</div><div class='del'>-            if (ret == Z_MEM_ERROR || ret == Z_DATA_ERROR)</div><div class='del'>-                goto build_index_error;</div><div class='del'>-            if (ret == Z_STREAM_END)</div><div class='del'>-                break;</div><div class='del'>-</div><div class='del'>-            /* if at end of block, consider adding an index entry (note that if</div><div class='del'>-               data_type indicates an end-of-block, then all of the</div><div class='del'>-               uncompressed data from that block has been delivered, and none</div><div class='del'>-               of the compressed data after that block has been consumed,</div><div class='del'>-               except for up to seven bits) -- the totout == 0 provides an</div><div class='del'>-               entry point after the zlib or gzip header, and assures that the</div><div class='del'>-               index always has at least one access point; we avoid creating an</div><div class='del'>-               access point after the last block by checking bit 6 of data_type</div><div class='del'>-             */</div><div class='del'>-            if ((strm.data_type &amp; 128) &amp;&amp; !(strm.data_type &amp; 64) &amp;&amp;</div><div class='del'>-                (totout == 0 || totout - last &gt; span)) {</div><div class='del'>-                index = addpoint(index, strm.data_type &amp; 7, totin,</div><div class='del'>-                                 totout, strm.avail_out, window);</div><div class='del'>-                if (index == NULL) {</div><div class='del'>-                    ret = Z_MEM_ERROR;</div><div class='del'>-                    goto build_index_error;</div><div class='del'>-                }</div><div class='del'>-                last = totout;</div><div class='del'>-            }</div><div class='del'>-        } while (strm.avail_in != 0);</div><div class='del'>-    } while (ret != Z_STREAM_END);</div><div class='del'>-</div><div class='del'>-    /* clean up and return index (release unused entries in list) */</div><div class='del'>-    (void)inflateEnd(&amp;strm);</div><div class='del'>-    index = realloc(index, sizeof(struct point) * index-&gt;have);</div><div class='del'>-    index-&gt;size = index-&gt;have;</div><div class='del'>-    *built = index;</div><div class='del'>-    return index-&gt;size;</div><div class='del'>-</div><div class='del'>-    /* return error */</div><div class='del'>-  build_index_error:</div><div class='del'>-    (void)inflateEnd(&amp;strm);</div><div class='del'>-    if (index != NULL)</div><div class='del'>-        free_index(index);</div><div class='del'>-    return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Use the index to read len bytes from offset into buf, return bytes read or</div><div class='del'>-   negative for error (Z_DATA_ERROR or Z_MEM_ERROR).  If data is requested past</div><div class='del'>-   the end of the uncompressed data, then extract() will return a value less</div><div class='del'>-   than len, indicating how much as actually read into buf.  This function</div><div class='del'>-   should not return a data error unless the file was modified since the index</div><div class='del'>-   was generated.  extract() may also return Z_ERRNO if there is an error on</div><div class='del'>-   reading or seeking the input file. */</div><div class='del'>-local int extract(FILE *in, struct access *index, off_t offset,</div><div class='del'>-                  unsigned char *buf, int len)</div><div class='del'>-{</div><div class='del'>-    int ret, skip;</div><div class='del'>-    z_stream strm;</div><div class='del'>-    struct point *here;</div><div class='del'>-    unsigned char input[CHUNK];</div><div class='del'>-    unsigned char discard[WINSIZE];</div><div class='del'>-</div><div class='del'>-    /* proceed only if something reasonable to do */</div><div class='del'>-    if (len &lt; 0)</div><div class='del'>-        return 0;</div><div class='del'>-</div><div class='del'>-    /* find where in stream to start */</div><div class='del'>-    here = index-&gt;list;</div><div class='del'>-    ret = index-&gt;have;</div><div class='del'>-    while (--ret &amp;&amp; here[1].out &lt;= offset)</div><div class='del'>-        here++;</div><div class='del'>-</div><div class='del'>-    /* initialize file and inflate state to start there */</div><div class='del'>-    strm.zalloc = Z_NULL;</div><div class='del'>-    strm.zfree = Z_NULL;</div><div class='del'>-    strm.opaque = Z_NULL;</div><div class='del'>-    strm.avail_in = 0;</div><div class='del'>-    strm.next_in = Z_NULL;</div><div class='del'>-    ret = inflateInit2(&amp;strm, -15);         /* raw inflate */</div><div class='del'>-    if (ret != Z_OK)</div><div class='del'>-        return ret;</div><div class='del'>-    ret = fseeko(in, here-&gt;in - (here-&gt;bits ? 1 : 0), SEEK_SET);</div><div class='del'>-    if (ret == -1)</div><div class='del'>-        goto extract_ret;</div><div class='del'>-    if (here-&gt;bits) {</div><div class='del'>-        ret = getc(in);</div><div class='del'>-        if (ret == -1) {</div><div class='del'>-            ret = ferror(in) ? Z_ERRNO : Z_DATA_ERROR;</div><div class='del'>-            goto extract_ret;</div><div class='del'>-        }</div><div class='del'>-        (void)inflatePrime(&amp;strm, here-&gt;bits, ret &gt;&gt; (8 - here-&gt;bits));</div><div class='del'>-    }</div><div class='del'>-    (void)inflateSetDictionary(&amp;strm, here-&gt;window, WINSIZE);</div><div class='del'>-</div><div class='del'>-    /* skip uncompressed bytes until offset reached, then satisfy request */</div><div class='del'>-    offset -= here-&gt;out;</div><div class='del'>-    strm.avail_in = 0;</div><div class='del'>-    skip = 1;                               /* while skipping to offset */</div><div class='del'>-    do {</div><div class='del'>-        /* define where to put uncompressed data, and how much */</div><div class='del'>-        if (offset == 0 &amp;&amp; skip) {          /* at offset now */</div><div class='del'>-            strm.avail_out = len;</div><div class='del'>-            strm.next_out = buf;</div><div class='del'>-            skip = 0;                       /* only do this once */</div><div class='del'>-        }</div><div class='del'>-        if (offset &gt; WINSIZE) {             /* skip WINSIZE bytes */</div><div class='del'>-            strm.avail_out = WINSIZE;</div><div class='del'>-            strm.next_out = discard;</div><div class='del'>-            offset -= WINSIZE;</div><div class='del'>-        }</div><div class='del'>-        else if (offset != 0) {             /* last skip */</div><div class='del'>-            strm.avail_out = (unsigned)offset;</div><div class='del'>-            strm.next_out = discard;</div><div class='del'>-            offset = 0;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* uncompress until avail_out filled, or end of stream */</div><div class='del'>-        do {</div><div class='del'>-            if (strm.avail_in == 0) {</div><div class='del'>-                strm.avail_in = fread(input, 1, CHUNK, in);</div><div class='del'>-                if (ferror(in)) {</div><div class='del'>-                    ret = Z_ERRNO;</div><div class='del'>-                    goto extract_ret;</div><div class='del'>-                }</div><div class='del'>-                if (strm.avail_in == 0) {</div><div class='del'>-                    ret = Z_DATA_ERROR;</div><div class='del'>-                    goto extract_ret;</div><div class='del'>-                }</div><div class='del'>-                strm.next_in = input;</div><div class='del'>-            }</div><div class='del'>-            ret = inflate(&amp;strm, Z_NO_FLUSH);       /* normal inflate */</div><div class='del'>-            if (ret == Z_NEED_DICT)</div><div class='del'>-                ret = Z_DATA_ERROR;</div><div class='del'>-            if (ret == Z_MEM_ERROR || ret == Z_DATA_ERROR)</div><div class='del'>-                goto extract_ret;</div><div class='del'>-            if (ret == Z_STREAM_END)</div><div class='del'>-                break;</div><div class='del'>-        } while (strm.avail_out != 0);</div><div class='del'>-</div><div class='del'>-        /* if reach end of stream, then don't keep trying to get more */</div><div class='del'>-        if (ret == Z_STREAM_END)</div><div class='del'>-            break;</div><div class='del'>-</div><div class='del'>-        /* do until offset reached and requested data read, or stream ends */</div><div class='del'>-    } while (skip);</div><div class='del'>-</div><div class='del'>-    /* compute number of uncompressed bytes read after offset */</div><div class='del'>-    ret = skip ? 0 : len - strm.avail_out;</div><div class='del'>-</div><div class='del'>-    /* clean up and return bytes read or error */</div><div class='del'>-  extract_ret:</div><div class='del'>-    (void)inflateEnd(&amp;strm);</div><div class='del'>-    return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Demonstrate the use of build_index() and extract() by processing the file</div><div class='del'>-   provided on the command line, and the extracting 16K from about 2/3rds of</div><div class='del'>-   the way through the uncompressed output, and writing that to stdout. */</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-    int len;</div><div class='del'>-    off_t offset;</div><div class='del'>-    FILE *in;</div><div class='del'>-    struct access *index;</div><div class='del'>-    unsigned char buf[CHUNK];</div><div class='del'>-</div><div class='del'>-    /* open input file */</div><div class='del'>-    if (argc != 2) {</div><div class='del'>-        fprintf(stderr, "usage: zran file.gz\n");</div><div class='del'>-        return 1;</div><div class='del'>-    }</div><div class='del'>-    in = fopen(argv[1], "rb");</div><div class='del'>-    if (in == NULL) {</div><div class='del'>-        fprintf(stderr, "zran: could not open %s for reading\n", argv[1]);</div><div class='del'>-        return 1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* build index */</div><div class='del'>-    len = build_index(in, SPAN, &amp;index);</div><div class='del'>-    if (len &lt; 0) {</div><div class='del'>-        fclose(in);</div><div class='del'>-        switch (len) {</div><div class='del'>-        case Z_MEM_ERROR:</div><div class='del'>-            fprintf(stderr, "zran: out of memory\n");</div><div class='del'>-            break;</div><div class='del'>-        case Z_DATA_ERROR:</div><div class='del'>-            fprintf(stderr, "zran: compressed data error in %s\n", argv[1]);</div><div class='del'>-            break;</div><div class='del'>-        case Z_ERRNO:</div><div class='del'>-            fprintf(stderr, "zran: read error on %s\n", argv[1]);</div><div class='del'>-            break;</div><div class='del'>-        default:</div><div class='del'>-            fprintf(stderr, "zran: error %d while building index\n", len);</div><div class='del'>-        }</div><div class='del'>-        return 1;</div><div class='del'>-    }</div><div class='del'>-    fprintf(stderr, "zran: built index with %d access points\n", len);</div><div class='del'>-</div><div class='del'>-    /* use index by reading some bytes from an arbitrary offset */</div><div class='del'>-    offset = (index-&gt;list[index-&gt;have - 1].out &lt;&lt; 1) / 3;</div><div class='del'>-    len = extract(in, index, offset, buf, CHUNK);</div><div class='del'>-    if (len &lt; 0)</div><div class='del'>-        fprintf(stderr, "zran: extraction failed: %s error\n",</div><div class='del'>-                len == Z_MEM_ERROR ? "out of memory" : "input corrupted");</div><div class='del'>-    else {</div><div class='del'>-        fwrite(buf, 1, len, stdout);</div><div class='del'>-        fprintf(stderr, "zran: extracted %d bytes at %llu\n", len, offset);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* clean up and exit */</div><div class='del'>-    free_index(index);</div><div class='del'>-    fclose(in);</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/src/3rdparty/zlib/gzclose.c b/src/3rdparty/zlib/gzclose.c<br/>new file mode 100644<br/>index 0000000..caeb99a<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/gzclose.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/gzclose.c</a></div><div class='hunk'>@@ -0,0 +1,25 @@</div><div class='add'>+/* gzclose.c -- zlib gzclose() function</div><div class='add'>+ * Copyright (C) 2004, 2010 Mark Adler</div><div class='add'>+ * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "gzguts.h"</div><div class='add'>+</div><div class='add'>+/* gzclose() is in a separate file so that it is linked in only if it is used.</div><div class='add'>+   That way the other gzclose functions can be used instead to avoid linking in</div><div class='add'>+   unneeded compression or decompression routines. */</div><div class='add'>+int ZEXPORT gzclose(file)</div><div class='add'>+    gzFile file;</div><div class='add'>+{</div><div class='add'>+#ifndef NO_GZCOMPRESS</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return Z_STREAM_ERROR;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+</div><div class='add'>+    return state-&gt;mode == GZ_READ ? gzclose_r(file) : gzclose_w(file);</div><div class='add'>+#else</div><div class='add'>+    return gzclose_r(file);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='head'>diff --git a/src/3rdparty/zlib/gzguts.h b/src/3rdparty/zlib/gzguts.h<br/>new file mode 100644<br/>index 0000000..c752b57<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/gzguts.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/gzguts.h</a></div><div class='hunk'>@@ -0,0 +1,140 @@</div><div class='add'>+/* gzguts.h -- zlib internal header definitions for gz* operations</div><div class='add'>+ * Copyright (C) 2004, 2005, 2010 Mark Adler</div><div class='add'>+ * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef _MSC_VER</div><div class='add'>+#  define _CRT_SECURE_NO_DEPRECATE</div><div class='add'>+#  define _CRT_NONSTDC_NO_DEPRECATE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef _LARGEFILE64_SOURCE</div><div class='add'>+#  ifndef _LARGEFILE_SOURCE</div><div class='add'>+#    define _LARGEFILE_SOURCE 1</div><div class='add'>+#  endif</div><div class='add'>+#  ifdef _FILE_OFFSET_BITS</div><div class='add'>+#    undef _FILE_OFFSET_BITS</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include "qconfig.h"</div><div class='add'>+#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 &gt;= 33) &amp;&amp; !defined(NO_VIZ) &amp;&amp; defined(QT_VISIBILITY_AVAILABLE)</div><div class='add'>+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))</div><div class='add'>+#else</div><div class='add'>+#  define ZLIB_INTERNAL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include "zlib.h"</div><div class='add'>+#ifdef STDC</div><div class='add'>+#  include &lt;string.h&gt;</div><div class='add'>+#  include &lt;stdlib.h&gt;</div><div class='add'>+#  include &lt;limits.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#if !defined(_WIN32_WCE)</div><div class='add'>+#include &lt;fcntl.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef NO_DEFLATE       /* for compatibility with old definition */</div><div class='add'>+#  define NO_GZCOMPRESS</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef _MSC_VER</div><div class='add'>+#  include &lt;io.h&gt;</div><div class='add'>+#  define vsnprintf _vsnprintf</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef local</div><div class='add'>+#  define local static</div><div class='add'>+#endif</div><div class='add'>+/* compile with -Dlocal if your debugger can't find static symbols */</div><div class='add'>+</div><div class='add'>+/* gz* functions always use library allocation functions */</div><div class='add'>+#ifndef STDC</div><div class='add'>+  extern voidp  malloc OF((uInt size));</div><div class='add'>+  extern void   free   OF((voidpf ptr));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* get errno and strerror definition */</div><div class='add'>+#if defined UNDER_CE</div><div class='add'>+#  include &lt;windows.h&gt;</div><div class='add'>+#  define zstrerror() gz_strwinerror((DWORD)GetLastError())</div><div class='add'>+#else</div><div class='add'>+#  ifdef STDC</div><div class='add'>+#    include &lt;errno.h&gt;</div><div class='add'>+#    define zstrerror() strerror(errno)</div><div class='add'>+#  else</div><div class='add'>+#    define zstrerror() "stdio error (consult errno)"</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* provide prototypes for these when building zlib without LFS */</div><div class='add'>+#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0</div><div class='add'>+    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));</div><div class='add'>+    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));</div><div class='add'>+    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));</div><div class='add'>+    ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* default i/o buffer size -- double this for output when reading */</div><div class='add'>+#define GZBUFSIZE 8192</div><div class='add'>+</div><div class='add'>+/* gzip modes, also provide a little integrity check on the passed structure */</div><div class='add'>+#define GZ_NONE 0</div><div class='add'>+#define GZ_READ 7247</div><div class='add'>+#define GZ_WRITE 31153</div><div class='add'>+#define GZ_APPEND 1     /* mode set to GZ_WRITE after the file is opened */</div><div class='add'>+</div><div class='add'>+/* values for gz_state how */</div><div class='add'>+#define LOOK 0      /* look for a gzip header */</div><div class='add'>+#define COPY 1      /* copy input directly */</div><div class='add'>+#define GZIP 2      /* decompress a gzip stream */</div><div class='add'>+</div><div class='add'>+/* internal gzip file state data structure */</div><div class='add'>+typedef struct {</div><div class='add'>+        /* used for both reading and writing */</div><div class='add'>+    int mode;               /* see gzip modes above */</div><div class='add'>+    int fd;                 /* file descriptor */</div><div class='add'>+    char *path;             /* path or fd for error messages */</div><div class='add'>+    z_off64_t pos;          /* current position in uncompressed data */</div><div class='add'>+    unsigned size;          /* buffer size, zero if not allocated yet */</div><div class='add'>+    unsigned want;          /* requested buffer size, default is GZBUFSIZE */</div><div class='add'>+    unsigned char *in;      /* input buffer */</div><div class='add'>+    unsigned char *out;     /* output buffer (double-sized when reading) */</div><div class='add'>+    unsigned char *next;    /* next output data to deliver or write */</div><div class='add'>+        /* just for reading */</div><div class='add'>+    unsigned have;          /* amount of output data unused at next */</div><div class='add'>+    int eof;                /* true if end of input file reached */</div><div class='add'>+    z_off64_t start;        /* where the gzip data started, for rewinding */</div><div class='add'>+    z_off64_t raw;          /* where the raw data started, for seeking */</div><div class='add'>+    int how;                /* 0: get header, 1: copy, 2: decompress */</div><div class='add'>+    int direct;             /* true if last read direct, false if gzip */</div><div class='add'>+        /* just for writing */</div><div class='add'>+    int level;              /* compression level */</div><div class='add'>+    int strategy;           /* compression strategy */</div><div class='add'>+        /* seek request */</div><div class='add'>+    z_off64_t skip;         /* amount to skip (already rewound if backwards) */</div><div class='add'>+    int seek;               /* true if seek request pending */</div><div class='add'>+        /* error information */</div><div class='add'>+    int err;                /* error code */</div><div class='add'>+    char *msg;              /* error message */</div><div class='add'>+        /* zlib inflate or deflate stream */</div><div class='add'>+    z_stream strm;          /* stream structure in-place (not a pointer) */</div><div class='add'>+} gz_state;</div><div class='add'>+typedef gz_state FAR *gz_statep;</div><div class='add'>+</div><div class='add'>+/* shared functions */</div><div class='add'>+void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));</div><div class='add'>+#if defined UNDER_CE</div><div class='add'>+char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* GT_OFF(x), where x is an unsigned value, is true if x &gt; maximum z_off64_t</div><div class='add'>+   value -- needed when comparing unsigned to z_off64_t, which is signed</div><div class='add'>+   (possible z_off64_t types off_t, off64_t, and long are all signed) */</div><div class='add'>+#ifdef INT_MAX</div><div class='add'>+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) &amp;&amp; (x) &gt; INT_MAX)</div><div class='add'>+#else</div><div class='add'>+unsigned ZLIB_INTERNAL gz_intmax OF((void));</div><div class='add'>+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) &amp;&amp; (x) &gt; gz_intmax())</div><div class='add'>+#endif</div><div class='head'>diff --git a/src/3rdparty/zlib/gzio.c b/src/3rdparty/zlib/gzio.c<br/>deleted file mode 100644<br/>index 25850ad..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/gzio.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/gzio.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1026 +0,0 @@</div><div class='del'>-/* gzio.c -- IO on .gz files</div><div class='del'>- * Copyright (C) 1995-2005 Jean-loup Gailly.</div><div class='del'>- * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='del'>- *</div><div class='del'>- * Compile this file with -DNO_GZCOMPRESS to avoid the compression code.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* @(#) $Id$ */</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-#include "zutil.h"</div><div class='del'>-</div><div class='del'>-#ifdef NO_DEFLATE       /* for compatibility with old definition */</div><div class='del'>-#  define NO_GZCOMPRESS</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef NO_DUMMY_DECL</div><div class='del'>-struct internal_state {int dummy;}; /* for buggy compilers */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef Z_BUFSIZE</div><div class='del'>-#  ifdef MAXSEG_64K</div><div class='del'>-#    define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */</div><div class='del'>-#  else</div><div class='del'>-#    define Z_BUFSIZE 16384</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#ifndef Z_PRINTF_BUFSIZE</div><div class='del'>-#  define Z_PRINTF_BUFSIZE 4096</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __MVS__</div><div class='del'>-#  pragma map (fdopen , "\174\174FDOPEN")</div><div class='del'>-   FILE *fdopen(int, const char *);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef STDC</div><div class='del'>-extern voidp  malloc OF((uInt size));</div><div class='del'>-extern void   free   OF((voidpf ptr));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define ALLOC(size) malloc(size)</div><div class='del'>-#define TRYFREE(p) {if (p) free(p);}</div><div class='del'>-</div><div class='del'>-static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */</div><div class='del'>-</div><div class='del'>-/* gzip flag byte */</div><div class='del'>-#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */</div><div class='del'>-#define HEAD_CRC     0x02 /* bit 1 set: header CRC present */</div><div class='del'>-#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */</div><div class='del'>-#define ORIG_NAME    0x08 /* bit 3 set: original file name present */</div><div class='del'>-#define COMMENT      0x10 /* bit 4 set: file comment present */</div><div class='del'>-#define RESERVED     0xE0 /* bits 5..7: reserved */</div><div class='del'>-</div><div class='del'>-typedef struct gz_stream {</div><div class='del'>-    z_stream stream;</div><div class='del'>-    int      z_err;   /* error code for last stream operation */</div><div class='del'>-    int      z_eof;   /* set if end of input file */</div><div class='del'>-    FILE     *file;   /* .gz file */</div><div class='del'>-    Byte     *inbuf;  /* input buffer */</div><div class='del'>-    Byte     *outbuf; /* output buffer */</div><div class='del'>-    uLong    crc;     /* crc32 of uncompressed data */</div><div class='del'>-    char     *msg;    /* error message */</div><div class='del'>-    char     *path;   /* path name for debugging only */</div><div class='del'>-    int      transparent; /* 1 if input file is not a .gz file */</div><div class='del'>-    char     mode;    /* 'w' or 'r' */</div><div class='del'>-    z_off_t  start;   /* start of compressed data in file (header skipped) */</div><div class='del'>-    z_off_t  in;      /* bytes into deflate or inflate */</div><div class='del'>-    z_off_t  out;     /* bytes out of deflate or inflate */</div><div class='del'>-    int      back;    /* one character push-back */</div><div class='del'>-    int      last;    /* true if push-back is last character */</div><div class='del'>-} gz_stream;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-local gzFile gz_open      OF((const char *path, const char *mode, int  fd));</div><div class='del'>-local int do_flush        OF((gzFile file, int flush));</div><div class='del'>-local int    get_byte     OF((gz_stream *s));</div><div class='del'>-local void   check_header OF((gz_stream *s));</div><div class='del'>-local int    destroy      OF((gz_stream *s));</div><div class='del'>-local void   putLong      OF((FILE *file, uLong x));</div><div class='del'>-local uLong  getLong      OF((gz_stream *s));</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-     Opens a gzip (.gz) file for reading or writing. The mode parameter</div><div class='del'>-   is as in fopen ("rb" or "wb"). The file is given either by file descriptor</div><div class='del'>-   or path name (if fd == -1).</div><div class='del'>-     gz_open returns NULL if the file could not be opened or if there was</div><div class='del'>-   insufficient memory to allocate the (de)compression state; errno</div><div class='del'>-   can be checked to distinguish the two cases (if errno is zero, the</div><div class='del'>-   zlib error is Z_MEM_ERROR).</div><div class='del'>-*/</div><div class='del'>-local gzFile gz_open (path, mode, fd)</div><div class='del'>-    const char *path;</div><div class='del'>-    const char *mode;</div><div class='del'>-    int  fd;</div><div class='del'>-{</div><div class='del'>-    int err;</div><div class='del'>-    int level = Z_DEFAULT_COMPRESSION; /* compression level */</div><div class='del'>-    int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */</div><div class='del'>-    char *p = (char*)mode;</div><div class='del'>-    gz_stream *s;</div><div class='del'>-    char fmode[80]; /* copy of mode, without the compression level */</div><div class='del'>-    char *m = fmode;</div><div class='del'>-</div><div class='del'>-    if (!path || !mode) return Z_NULL;</div><div class='del'>-</div><div class='del'>-    s = (gz_stream *)ALLOC(sizeof(gz_stream));</div><div class='del'>-    if (!s) return Z_NULL;</div><div class='del'>-</div><div class='del'>-    s-&gt;stream.zalloc = (alloc_func)0;</div><div class='del'>-    s-&gt;stream.zfree = (free_func)0;</div><div class='del'>-    s-&gt;stream.opaque = (voidpf)0;</div><div class='del'>-    s-&gt;stream.next_in = s-&gt;inbuf = Z_NULL;</div><div class='del'>-    s-&gt;stream.next_out = s-&gt;outbuf = Z_NULL;</div><div class='del'>-    s-&gt;stream.avail_in = s-&gt;stream.avail_out = 0;</div><div class='del'>-    s-&gt;file = NULL;</div><div class='del'>-    s-&gt;z_err = Z_OK;</div><div class='del'>-    s-&gt;z_eof = 0;</div><div class='del'>-    s-&gt;in = 0;</div><div class='del'>-    s-&gt;out = 0;</div><div class='del'>-    s-&gt;back = EOF;</div><div class='del'>-    s-&gt;crc = crc32(0L, Z_NULL, 0);</div><div class='del'>-    s-&gt;msg = NULL;</div><div class='del'>-    s-&gt;transparent = 0;</div><div class='del'>-</div><div class='del'>-    s-&gt;path = (char*)ALLOC(strlen(path)+1);</div><div class='del'>-    if (s-&gt;path == NULL) {</div><div class='del'>-        return destroy(s), (gzFile)Z_NULL;</div><div class='del'>-    }</div><div class='del'>-    strcpy(s-&gt;path, path); /* do this early for debugging */</div><div class='del'>-</div><div class='del'>-    s-&gt;mode = '\0';</div><div class='del'>-    do {</div><div class='del'>-        if (*p == 'r') s-&gt;mode = 'r';</div><div class='del'>-        if (*p == 'w' || *p == 'a') s-&gt;mode = 'w';</div><div class='del'>-        if (*p &gt;= '0' &amp;&amp; *p &lt;= '9') {</div><div class='del'>-            level = *p - '0';</div><div class='del'>-        } else if (*p == 'f') {</div><div class='del'>-          strategy = Z_FILTERED;</div><div class='del'>-        } else if (*p == 'h') {</div><div class='del'>-          strategy = Z_HUFFMAN_ONLY;</div><div class='del'>-        } else if (*p == 'R') {</div><div class='del'>-          strategy = Z_RLE;</div><div class='del'>-        } else {</div><div class='del'>-            *m++ = *p; /* copy the mode */</div><div class='del'>-        }</div><div class='del'>-    } while (*p++ &amp;&amp; m != fmode + sizeof(fmode));</div><div class='del'>-    if (s-&gt;mode == '\0') return destroy(s), (gzFile)Z_NULL;</div><div class='del'>-</div><div class='del'>-    if (s-&gt;mode == 'w') {</div><div class='del'>-#ifdef NO_GZCOMPRESS</div><div class='del'>-        err = Z_STREAM_ERROR;</div><div class='del'>-#else</div><div class='del'>-        err = deflateInit2(&amp;(s-&gt;stream), level,</div><div class='del'>-                           Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);</div><div class='del'>-        /* windowBits is passed &lt; 0 to suppress zlib header */</div><div class='del'>-</div><div class='del'>-        s-&gt;stream.next_out = s-&gt;outbuf = (Byte*)ALLOC(Z_BUFSIZE);</div><div class='del'>-#endif</div><div class='del'>-        if (err != Z_OK || s-&gt;outbuf == Z_NULL) {</div><div class='del'>-            return destroy(s), (gzFile)Z_NULL;</div><div class='del'>-        }</div><div class='del'>-    } else {</div><div class='del'>-        s-&gt;stream.next_in  = s-&gt;inbuf = (Byte*)ALLOC(Z_BUFSIZE);</div><div class='del'>-</div><div class='del'>-        err = inflateInit2(&amp;(s-&gt;stream), -MAX_WBITS);</div><div class='del'>-        /* windowBits is passed &lt; 0 to tell that there is no zlib header.</div><div class='del'>-         * Note that in this case inflate *requires* an extra "dummy" byte</div><div class='del'>-         * after the compressed stream in order to complete decompression and</div><div class='del'>-         * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are</div><div class='del'>-         * present after the compressed stream.</div><div class='del'>-         */</div><div class='del'>-        if (err != Z_OK || s-&gt;inbuf == Z_NULL) {</div><div class='del'>-            return destroy(s), (gzFile)Z_NULL;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    s-&gt;stream.avail_out = Z_BUFSIZE;</div><div class='del'>-</div><div class='del'>-    errno = 0;</div><div class='del'>-    s-&gt;file = fd &lt; 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode);</div><div class='del'>-</div><div class='del'>-    if (s-&gt;file == NULL) {</div><div class='del'>-        return destroy(s), (gzFile)Z_NULL;</div><div class='del'>-    }</div><div class='del'>-    if (s-&gt;mode == 'w') {</div><div class='del'>-        /* Write a very simple .gz header:</div><div class='del'>-         */</div><div class='del'>-        fprintf(s-&gt;file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],</div><div class='del'>-             Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);</div><div class='del'>-        s-&gt;start = 10L;</div><div class='del'>-        /* We use 10L instead of ftell(s-&gt;file) to because ftell causes an</div><div class='del'>-         * fflush on some systems. This version of the library doesn't use</div><div class='del'>-         * start anyway in write mode, so this initialization is not</div><div class='del'>-         * necessary.</div><div class='del'>-         */</div><div class='del'>-    } else {</div><div class='del'>-        check_header(s); /* skip the .gz header */</div><div class='del'>-        s-&gt;start = ftell(s-&gt;file) - s-&gt;stream.avail_in;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return (gzFile)s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-     Opens a gzip (.gz) file for reading or writing.</div><div class='del'>-*/</div><div class='del'>-gzFile Q_ZEXPORT gzopen (path, mode)</div><div class='del'>-    const char *path;</div><div class='del'>-    const char *mode;</div><div class='del'>-{</div><div class='del'>-    return gz_open (path, mode, -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-     Associate a gzFile with the file descriptor fd. fd is not dup'ed here</div><div class='del'>-   to mimic the behavio(u)r of fdopen.</div><div class='del'>-*/</div><div class='del'>-gzFile ZEXPORT gzdopen (fd, mode)</div><div class='del'>-    int fd;</div><div class='del'>-    const char *mode;</div><div class='del'>-{</div><div class='del'>-    char name[46];      /* allow for up to 128-bit integers */</div><div class='del'>-</div><div class='del'>-    if (fd &lt; 0) return (gzFile)Z_NULL;</div><div class='del'>-    sprintf(name, "&lt;fd:%d&gt;", fd); /* for debugging */</div><div class='del'>-</div><div class='del'>-    return gz_open (name, mode, fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>- * Update the compression level and strategy</div><div class='del'>- */</div><div class='del'>-int ZEXPORT gzsetparams (file, level, strategy)</div><div class='del'>-    gzFile file;</div><div class='del'>-    int level;</div><div class='del'>-    int strategy;</div><div class='del'>-{</div><div class='del'>-    gz_stream *s = (gz_stream*)file;</div><div class='del'>-</div><div class='del'>-    if (s == NULL || s-&gt;mode != 'w') return Z_STREAM_ERROR;</div><div class='del'>-</div><div class='del'>-    /* Make room to allow flushing */</div><div class='del'>-    if (s-&gt;stream.avail_out == 0) {</div><div class='del'>-</div><div class='del'>-        s-&gt;stream.next_out = s-&gt;outbuf;</div><div class='del'>-        if (fwrite(s-&gt;outbuf, 1, Z_BUFSIZE, s-&gt;file) != Z_BUFSIZE) {</div><div class='del'>-            s-&gt;z_err = Z_ERRNO;</div><div class='del'>-        }</div><div class='del'>-        s-&gt;stream.avail_out = Z_BUFSIZE;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return deflateParams (&amp;(s-&gt;stream), level, strategy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF</div><div class='del'>-   for end of file.</div><div class='del'>-   IN assertion: the stream s has been sucessfully opened for reading.</div><div class='del'>-*/</div><div class='del'>-local int get_byte(s)</div><div class='del'>-    gz_stream *s;</div><div class='del'>-{</div><div class='del'>-    if (s-&gt;z_eof) return EOF;</div><div class='del'>-    if (s-&gt;stream.avail_in == 0) {</div><div class='del'>-        errno = 0;</div><div class='del'>-        s-&gt;stream.avail_in = (uInt)fread(s-&gt;inbuf, 1, Z_BUFSIZE, s-&gt;file);</div><div class='del'>-        if (s-&gt;stream.avail_in == 0) {</div><div class='del'>-            s-&gt;z_eof = 1;</div><div class='del'>-            if (ferror(s-&gt;file)) s-&gt;z_err = Z_ERRNO;</div><div class='del'>-            return EOF;</div><div class='del'>-        }</div><div class='del'>-        s-&gt;stream.next_in = s-&gt;inbuf;</div><div class='del'>-    }</div><div class='del'>-    s-&gt;stream.avail_in--;</div><div class='del'>-    return *(s-&gt;stream.next_in)++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-      Check the gzip header of a gz_stream opened for reading. Set the stream</div><div class='del'>-    mode to transparent if the gzip magic header is not present; set s-&gt;err</div><div class='del'>-    to Z_DATA_ERROR if the magic header is present but the rest of the header</div><div class='del'>-    is incorrect.</div><div class='del'>-    IN assertion: the stream s has already been created sucessfully;</div><div class='del'>-       s-&gt;stream.avail_in is zero for the first time, but may be non-zero</div><div class='del'>-       for concatenated .gz files.</div><div class='del'>-*/</div><div class='del'>-local void check_header(s)</div><div class='del'>-    gz_stream *s;</div><div class='del'>-{</div><div class='del'>-    int method; /* method byte */</div><div class='del'>-    int flags;  /* flags byte */</div><div class='del'>-    uInt len;</div><div class='del'>-    int c;</div><div class='del'>-</div><div class='del'>-    /* Assure two bytes in the buffer so we can peek ahead -- handle case</div><div class='del'>-       where first byte of header is at the end of the buffer after the last</div><div class='del'>-       gzip segment */</div><div class='del'>-    len = s-&gt;stream.avail_in;</div><div class='del'>-    if (len &lt; 2) {</div><div class='del'>-        if (len) s-&gt;inbuf[0] = s-&gt;stream.next_in[0];</div><div class='del'>-        errno = 0;</div><div class='del'>-        len = (uInt)fread(s-&gt;inbuf + len, 1, Z_BUFSIZE &gt;&gt; len, s-&gt;file);</div><div class='del'>-        if (len == 0 &amp;&amp; ferror(s-&gt;file)) s-&gt;z_err = Z_ERRNO;</div><div class='del'>-        s-&gt;stream.avail_in += len;</div><div class='del'>-        s-&gt;stream.next_in = s-&gt;inbuf;</div><div class='del'>-        if (s-&gt;stream.avail_in &lt; 2) {</div><div class='del'>-            s-&gt;transparent = s-&gt;stream.avail_in;</div><div class='del'>-            return;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* Peek ahead to check the gzip magic header */</div><div class='del'>-    if (s-&gt;stream.next_in[0] != gz_magic[0] ||</div><div class='del'>-        s-&gt;stream.next_in[1] != gz_magic[1]) {</div><div class='del'>-        s-&gt;transparent = 1;</div><div class='del'>-        return;</div><div class='del'>-    }</div><div class='del'>-    s-&gt;stream.avail_in -= 2;</div><div class='del'>-    s-&gt;stream.next_in += 2;</div><div class='del'>-</div><div class='del'>-    /* Check the rest of the gzip header */</div><div class='del'>-    method = get_byte(s);</div><div class='del'>-    flags = get_byte(s);</div><div class='del'>-    if (method != Z_DEFLATED || (flags &amp; RESERVED) != 0) {</div><div class='del'>-        s-&gt;z_err = Z_DATA_ERROR;</div><div class='del'>-        return;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* Discard time, xflags and OS code: */</div><div class='del'>-    for (len = 0; len &lt; 6; len++) (void)get_byte(s);</div><div class='del'>-</div><div class='del'>-    if ((flags &amp; EXTRA_FIELD) != 0) { /* skip the extra field */</div><div class='del'>-        len  =  (uInt)get_byte(s);</div><div class='del'>-        len += ((uInt)get_byte(s))&lt;&lt;8;</div><div class='del'>-        /* len is garbage if EOF but the loop below will quit anyway */</div><div class='del'>-        while (len-- != 0 &amp;&amp; get_byte(s) != EOF) ;</div><div class='del'>-    }</div><div class='del'>-    if ((flags &amp; ORIG_NAME) != 0) { /* skip the original file name */</div><div class='del'>-        while ((c = get_byte(s)) != 0 &amp;&amp; c != EOF) ;</div><div class='del'>-    }</div><div class='del'>-    if ((flags &amp; COMMENT) != 0) {   /* skip the .gz file comment */</div><div class='del'>-        while ((c = get_byte(s)) != 0 &amp;&amp; c != EOF) ;</div><div class='del'>-    }</div><div class='del'>-    if ((flags &amp; HEAD_CRC) != 0) {  /* skip the header crc */</div><div class='del'>-        for (len = 0; len &lt; 2; len++) (void)get_byte(s);</div><div class='del'>-    }</div><div class='del'>-    s-&gt;z_err = s-&gt;z_eof ? Z_DATA_ERROR : Z_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>- /* ===========================================================================</div><div class='del'>- * Cleanup then free the given gz_stream. Return a zlib error code.</div><div class='del'>-   Try freeing in the reverse order of allocations.</div><div class='del'>- */</div><div class='del'>-local int destroy (s)</div><div class='del'>-    gz_stream *s;</div><div class='del'>-{</div><div class='del'>-    int err = Z_OK;</div><div class='del'>-</div><div class='del'>-    if (!s) return Z_STREAM_ERROR;</div><div class='del'>-</div><div class='del'>-    TRYFREE(s-&gt;msg);</div><div class='del'>-</div><div class='del'>-    if (s-&gt;stream.state != NULL) {</div><div class='del'>-        if (s-&gt;mode == 'w') {</div><div class='del'>-#ifdef NO_GZCOMPRESS</div><div class='del'>-            err = Z_STREAM_ERROR;</div><div class='del'>-#else</div><div class='del'>-            err = deflateEnd(&amp;(s-&gt;stream));</div><div class='del'>-#endif</div><div class='del'>-        } else if (s-&gt;mode == 'r') {</div><div class='del'>-            err = inflateEnd(&amp;(s-&gt;stream));</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    if (s-&gt;file != NULL &amp;&amp; fclose(s-&gt;file)) {</div><div class='del'>-#ifdef ESPIPE</div><div class='del'>-        if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */</div><div class='del'>-#endif</div><div class='del'>-            err = Z_ERRNO;</div><div class='del'>-    }</div><div class='del'>-    if (s-&gt;z_err &lt; 0) err = s-&gt;z_err;</div><div class='del'>-</div><div class='del'>-    TRYFREE(s-&gt;inbuf);</div><div class='del'>-    TRYFREE(s-&gt;outbuf);</div><div class='del'>-    TRYFREE(s-&gt;path);</div><div class='del'>-    TRYFREE(s);</div><div class='del'>-    return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-     Reads the given number of uncompressed bytes from the compressed file.</div><div class='del'>-   gzread returns the number of bytes actually read (0 for end of file).</div><div class='del'>-*/</div><div class='del'>-int Q_ZEXPORT gzread (file, buf, len)</div><div class='del'>-    gzFile file;</div><div class='del'>-    voidp buf;</div><div class='del'>-    unsigned len;</div><div class='del'>-{</div><div class='del'>-    gz_stream *s = (gz_stream*)file;</div><div class='del'>-    Bytef *start = (Bytef*)buf; /* starting point for crc computation */</div><div class='del'>-    Byte  *next_out; /* == stream.next_out but not forced far (for MSDOS) */</div><div class='del'>-</div><div class='del'>-    if (s == NULL || s-&gt;mode != 'r') return Z_STREAM_ERROR;</div><div class='del'>-</div><div class='del'>-    if (s-&gt;z_err == Z_DATA_ERROR || s-&gt;z_err == Z_ERRNO) return -1;</div><div class='del'>-    if (s-&gt;z_err == Z_STREAM_END) return 0;  /* EOF */</div><div class='del'>-</div><div class='del'>-    next_out = (Byte*)buf;</div><div class='del'>-    s-&gt;stream.next_out = (Bytef*)buf;</div><div class='del'>-    s-&gt;stream.avail_out = len;</div><div class='del'>-</div><div class='del'>-    if (s-&gt;stream.avail_out &amp;&amp; s-&gt;back != EOF) {</div><div class='del'>-        *next_out++ = s-&gt;back;</div><div class='del'>-        s-&gt;stream.next_out++;</div><div class='del'>-        s-&gt;stream.avail_out--;</div><div class='del'>-        s-&gt;back = EOF;</div><div class='del'>-        s-&gt;out++;</div><div class='del'>-        start++;</div><div class='del'>-        if (s-&gt;last) {</div><div class='del'>-            s-&gt;z_err = Z_STREAM_END;</div><div class='del'>-            return 1;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    while (s-&gt;stream.avail_out != 0) {</div><div class='del'>-</div><div class='del'>-        if (s-&gt;transparent) {</div><div class='del'>-            /* Copy first the lookahead bytes: */</div><div class='del'>-            uInt n = s-&gt;stream.avail_in;</div><div class='del'>-            if (n &gt; s-&gt;stream.avail_out) n = s-&gt;stream.avail_out;</div><div class='del'>-            if (n &gt; 0) {</div><div class='del'>-                zmemcpy(s-&gt;stream.next_out, s-&gt;stream.next_in, n);</div><div class='del'>-                next_out += n;</div><div class='del'>-                s-&gt;stream.next_out = next_out;</div><div class='del'>-                s-&gt;stream.next_in   += n;</div><div class='del'>-                s-&gt;stream.avail_out -= n;</div><div class='del'>-                s-&gt;stream.avail_in  -= n;</div><div class='del'>-            }</div><div class='del'>-            if (s-&gt;stream.avail_out &gt; 0) {</div><div class='del'>-                s-&gt;stream.avail_out -=</div><div class='del'>-                    (uInt)fread(next_out, 1, s-&gt;stream.avail_out, s-&gt;file);</div><div class='del'>-            }</div><div class='del'>-            len -= s-&gt;stream.avail_out;</div><div class='del'>-            s-&gt;in  += len;</div><div class='del'>-            s-&gt;out += len;</div><div class='del'>-            if (len == 0) s-&gt;z_eof = 1;</div><div class='del'>-            return (int)len;</div><div class='del'>-        }</div><div class='del'>-        if (s-&gt;stream.avail_in == 0 &amp;&amp; !s-&gt;z_eof) {</div><div class='del'>-</div><div class='del'>-            errno = 0;</div><div class='del'>-            s-&gt;stream.avail_in = (uInt)fread(s-&gt;inbuf, 1, Z_BUFSIZE, s-&gt;file);</div><div class='del'>-            if (s-&gt;stream.avail_in == 0) {</div><div class='del'>-                s-&gt;z_eof = 1;</div><div class='del'>-                if (ferror(s-&gt;file)) {</div><div class='del'>-                    s-&gt;z_err = Z_ERRNO;</div><div class='del'>-                    break;</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-            s-&gt;stream.next_in = s-&gt;inbuf;</div><div class='del'>-        }</div><div class='del'>-        s-&gt;in += s-&gt;stream.avail_in;</div><div class='del'>-        s-&gt;out += s-&gt;stream.avail_out;</div><div class='del'>-        s-&gt;z_err = inflate(&amp;(s-&gt;stream), Z_NO_FLUSH);</div><div class='del'>-        s-&gt;in -= s-&gt;stream.avail_in;</div><div class='del'>-        s-&gt;out -= s-&gt;stream.avail_out;</div><div class='del'>-</div><div class='del'>-        if (s-&gt;z_err == Z_STREAM_END) {</div><div class='del'>-            /* Check CRC and original size */</div><div class='del'>-            s-&gt;crc = crc32(s-&gt;crc, start, (uInt)(s-&gt;stream.next_out - start));</div><div class='del'>-            start = s-&gt;stream.next_out;</div><div class='del'>-</div><div class='del'>-            if (getLong(s) != s-&gt;crc) {</div><div class='del'>-                s-&gt;z_err = Z_DATA_ERROR;</div><div class='del'>-            } else {</div><div class='del'>-                (void)getLong(s);</div><div class='del'>-                /* The uncompressed length returned by above getlong() may be</div><div class='del'>-                 * different from s-&gt;out in case of concatenated .gz files.</div><div class='del'>-                 * Check for such files:</div><div class='del'>-                 */</div><div class='del'>-                check_header(s);</div><div class='del'>-                if (s-&gt;z_err == Z_OK) {</div><div class='del'>-                    inflateReset(&amp;(s-&gt;stream));</div><div class='del'>-                    s-&gt;crc = crc32(0L, Z_NULL, 0);</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        if (s-&gt;z_err != Z_OK || s-&gt;z_eof) break;</div><div class='del'>-    }</div><div class='del'>-    s-&gt;crc = crc32(s-&gt;crc, start, (uInt)(s-&gt;stream.next_out - start));</div><div class='del'>-</div><div class='del'>-    if (len == s-&gt;stream.avail_out &amp;&amp;</div><div class='del'>-        (s-&gt;z_err == Z_DATA_ERROR || s-&gt;z_err == Z_ERRNO))</div><div class='del'>-        return -1;</div><div class='del'>-    return (int)(len - s-&gt;stream.avail_out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-      Reads one byte from the compressed file. gzgetc returns this byte</div><div class='del'>-   or -1 in case of end of file or error.</div><div class='del'>-*/</div><div class='del'>-int ZEXPORT gzgetc(file)</div><div class='del'>-    gzFile file;</div><div class='del'>-{</div><div class='del'>-    unsigned char c;</div><div class='del'>-</div><div class='del'>-    return gzread(file, &amp;c, 1) == 1 ? c : -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-      Push one byte back onto the stream.</div><div class='del'>-*/</div><div class='del'>-int ZEXPORT gzungetc(c, file)</div><div class='del'>-    int c;</div><div class='del'>-    gzFile file;</div><div class='del'>-{</div><div class='del'>-    gz_stream *s = (gz_stream*)file;</div><div class='del'>-</div><div class='del'>-    if (s == NULL || s-&gt;mode != 'r' || c == EOF || s-&gt;back != EOF) return EOF;</div><div class='del'>-    s-&gt;back = c;</div><div class='del'>-    s-&gt;out--;</div><div class='del'>-    s-&gt;last = (s-&gt;z_err == Z_STREAM_END);</div><div class='del'>-    if (s-&gt;last) s-&gt;z_err = Z_OK;</div><div class='del'>-    s-&gt;z_eof = 0;</div><div class='del'>-    return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-      Reads bytes from the compressed file until len-1 characters are</div><div class='del'>-   read, or a newline character is read and transferred to buf, or an</div><div class='del'>-   end-of-file condition is encountered.  The string is then terminated</div><div class='del'>-   with a null character.</div><div class='del'>-      gzgets returns buf, or Z_NULL in case of error.</div><div class='del'>-</div><div class='del'>-      The current implementation is not optimized at all.</div><div class='del'>-*/</div><div class='del'>-char * ZEXPORT gzgets(file, buf, len)</div><div class='del'>-    gzFile file;</div><div class='del'>-    char *buf;</div><div class='del'>-    int len;</div><div class='del'>-{</div><div class='del'>-    char *b = buf;</div><div class='del'>-    if (buf == Z_NULL || len &lt;= 0) return Z_NULL;</div><div class='del'>-</div><div class='del'>-    while (--len &gt; 0 &amp;&amp; gzread(file, buf, 1) == 1 &amp;&amp; *buf++ != '\n') ;</div><div class='del'>-    *buf = '\0';</div><div class='del'>-    return b == buf &amp;&amp; len &gt; 0 ? Z_NULL : b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef NO_GZCOMPRESS</div><div class='del'>-/* ===========================================================================</div><div class='del'>-     Writes the given number of uncompressed bytes into the compressed file.</div><div class='del'>-   gzwrite returns the number of bytes actually written (0 in case of error).</div><div class='del'>-*/</div><div class='del'>-int ZEXPORT gzwrite (file, buf, len)</div><div class='del'>-    gzFile file;</div><div class='del'>-    voidpc buf;</div><div class='del'>-    unsigned len;</div><div class='del'>-{</div><div class='del'>-    gz_stream *s = (gz_stream*)file;</div><div class='del'>-</div><div class='del'>-    if (s == NULL || s-&gt;mode != 'w') return Z_STREAM_ERROR;</div><div class='del'>-</div><div class='del'>-    s-&gt;stream.next_in = (Bytef*)buf;</div><div class='del'>-    s-&gt;stream.avail_in = len;</div><div class='del'>-</div><div class='del'>-    while (s-&gt;stream.avail_in != 0) {</div><div class='del'>-</div><div class='del'>-        if (s-&gt;stream.avail_out == 0) {</div><div class='del'>-</div><div class='del'>-            s-&gt;stream.next_out = s-&gt;outbuf;</div><div class='del'>-            if (fwrite(s-&gt;outbuf, 1, Z_BUFSIZE, s-&gt;file) != Z_BUFSIZE) {</div><div class='del'>-                s-&gt;z_err = Z_ERRNO;</div><div class='del'>-                break;</div><div class='del'>-            }</div><div class='del'>-            s-&gt;stream.avail_out = Z_BUFSIZE;</div><div class='del'>-        }</div><div class='del'>-        s-&gt;in += s-&gt;stream.avail_in;</div><div class='del'>-        s-&gt;out += s-&gt;stream.avail_out;</div><div class='del'>-        s-&gt;z_err = deflate(&amp;(s-&gt;stream), Z_NO_FLUSH);</div><div class='del'>-        s-&gt;in -= s-&gt;stream.avail_in;</div><div class='del'>-        s-&gt;out -= s-&gt;stream.avail_out;</div><div class='del'>-        if (s-&gt;z_err != Z_OK) break;</div><div class='del'>-    }</div><div class='del'>-    s-&gt;crc = crc32(s-&gt;crc, (const Bytef *)buf, len);</div><div class='del'>-</div><div class='del'>-    return (int)(len - s-&gt;stream.avail_in);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-     Converts, formats, and writes the args to the compressed file under</div><div class='del'>-   control of the format string, as in fprintf. gzprintf returns the number of</div><div class='del'>-   uncompressed bytes actually written (0 in case of error).</div><div class='del'>-*/</div><div class='del'>-#ifdef STDC</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-</div><div class='del'>-int Q_ZEXPORT gzprintf (gzFile file, const char *format, /* args */ ...)</div><div class='del'>-{</div><div class='del'>-    char buf[Z_PRINTF_BUFSIZE];</div><div class='del'>-    va_list va;</div><div class='del'>-    int len;</div><div class='del'>-</div><div class='del'>-    buf[sizeof(buf) - 1] = 0;</div><div class='del'>-    va_start(va, format);</div><div class='del'>-#ifdef NO_vsnprintf</div><div class='del'>-#  ifdef HAS_vsprintf_void</div><div class='del'>-    (void)vsprintf(buf, format, va);</div><div class='del'>-    va_end(va);</div><div class='del'>-    for (len = 0; len &lt; sizeof(buf); len++)</div><div class='del'>-        if (buf[len] == 0) break;</div><div class='del'>-#  else</div><div class='del'>-    len = vsprintf(buf, format, va);</div><div class='del'>-    va_end(va);</div><div class='del'>-#  endif</div><div class='del'>-#else</div><div class='del'>-#  ifdef HAS_vsnprintf_void</div><div class='del'>-    (void)vsnprintf(buf, sizeof(buf), format, va);</div><div class='del'>-    va_end(va);</div><div class='del'>-    len = strlen(buf);</div><div class='del'>-#  else</div><div class='del'>-    len = vsnprintf(buf, sizeof(buf), format, va);</div><div class='del'>-    va_end(va);</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-    if (len &lt;= 0 || len &gt;= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0)</div><div class='del'>-        return 0;</div><div class='del'>-    return gzwrite(file, buf, (unsigned)len);</div><div class='del'>-}</div><div class='del'>-#else /* not ANSI C */</div><div class='del'>-</div><div class='del'>-int Q_ZEXPORT gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,</div><div class='del'>-                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)</div><div class='del'>-    gzFile file;</div><div class='del'>-    const char *format;</div><div class='del'>-    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,</div><div class='del'>-        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;</div><div class='del'>-{</div><div class='del'>-    char buf[Z_PRINTF_BUFSIZE];</div><div class='del'>-    int len;</div><div class='del'>-</div><div class='del'>-    buf[sizeof(buf) - 1] = 0;</div><div class='del'>-#ifdef NO_snprintf</div><div class='del'>-#  ifdef HAS_sprintf_void</div><div class='del'>-    sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,</div><div class='del'>-            a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);</div><div class='del'>-    for (len = 0; len &lt; sizeof(buf); len++)</div><div class='del'>-        if (buf[len] == 0) break;</div><div class='del'>-#  else</div><div class='del'>-    len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,</div><div class='del'>-                a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);</div><div class='del'>-#  endif</div><div class='del'>-#else</div><div class='del'>-#  ifdef HAS_snprintf_void</div><div class='del'>-    snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,</div><div class='del'>-             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);</div><div class='del'>-    len = strlen(buf);</div><div class='del'>-#  else</div><div class='del'>-    len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,</div><div class='del'>-                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-    if (len &lt;= 0 || len &gt;= sizeof(buf) || buf[sizeof(buf) - 1] != 0)</div><div class='del'>-        return 0;</div><div class='del'>-    return gzwrite(file, buf, len);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-      Writes c, converted to an unsigned char, into the compressed file.</div><div class='del'>-   gzputc returns the value that was written, or -1 in case of error.</div><div class='del'>-*/</div><div class='del'>-int ZEXPORT gzputc(file, c)</div><div class='del'>-    gzFile file;</div><div class='del'>-    int c;</div><div class='del'>-{</div><div class='del'>-    unsigned char cc = (unsigned char) c; /* required for big endian systems */</div><div class='del'>-</div><div class='del'>-    return gzwrite(file, &amp;cc, 1) == 1 ? (int)cc : -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-      Writes the given null-terminated string to the compressed file, excluding</div><div class='del'>-   the terminating null character.</div><div class='del'>-      gzputs returns the number of characters written, or -1 in case of error.</div><div class='del'>-*/</div><div class='del'>-int ZEXPORT gzputs(file, s)</div><div class='del'>-    gzFile file;</div><div class='del'>-    const char *s;</div><div class='del'>-{</div><div class='del'>-    return gzwrite(file, (char*)s, (unsigned)strlen(s));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-     Flushes all pending output into the compressed file. The parameter</div><div class='del'>-   flush is as in the deflate() function.</div><div class='del'>-*/</div><div class='del'>-local int do_flush (file, flush)</div><div class='del'>-    gzFile file;</div><div class='del'>-    int flush;</div><div class='del'>-{</div><div class='del'>-    uInt len;</div><div class='del'>-    int done = 0;</div><div class='del'>-    gz_stream *s = (gz_stream*)file;</div><div class='del'>-</div><div class='del'>-    if (s == NULL || s-&gt;mode != 'w') return Z_STREAM_ERROR;</div><div class='del'>-</div><div class='del'>-    s-&gt;stream.avail_in = 0; /* should be zero already anyway */</div><div class='del'>-</div><div class='del'>-    for (;;) {</div><div class='del'>-        len = Z_BUFSIZE - s-&gt;stream.avail_out;</div><div class='del'>-</div><div class='del'>-        if (len != 0) {</div><div class='del'>-            if ((uInt)fwrite(s-&gt;outbuf, 1, len, s-&gt;file) != len) {</div><div class='del'>-                s-&gt;z_err = Z_ERRNO;</div><div class='del'>-                return Z_ERRNO;</div><div class='del'>-            }</div><div class='del'>-            s-&gt;stream.next_out = s-&gt;outbuf;</div><div class='del'>-            s-&gt;stream.avail_out = Z_BUFSIZE;</div><div class='del'>-        }</div><div class='del'>-        if (done) break;</div><div class='del'>-        s-&gt;out += s-&gt;stream.avail_out;</div><div class='del'>-        s-&gt;z_err = deflate(&amp;(s-&gt;stream), flush);</div><div class='del'>-        s-&gt;out -= s-&gt;stream.avail_out;</div><div class='del'>-</div><div class='del'>-        /* Ignore the second of two consecutive flushes: */</div><div class='del'>-        if (len == 0 &amp;&amp; s-&gt;z_err == Z_BUF_ERROR) s-&gt;z_err = Z_OK;</div><div class='del'>-</div><div class='del'>-        /* deflate has finished flushing only when it hasn't used up</div><div class='del'>-         * all the available space in the output buffer:</div><div class='del'>-         */</div><div class='del'>-        done = (s-&gt;stream.avail_out != 0 || s-&gt;z_err == Z_STREAM_END);</div><div class='del'>-</div><div class='del'>-        if (s-&gt;z_err != Z_OK &amp;&amp; s-&gt;z_err != Z_STREAM_END) break;</div><div class='del'>-    }</div><div class='del'>-    return  s-&gt;z_err == Z_STREAM_END ? Z_OK : s-&gt;z_err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int ZEXPORT gzflush (file, flush)</div><div class='del'>-     gzFile file;</div><div class='del'>-     int flush;</div><div class='del'>-{</div><div class='del'>-    gz_stream *s = (gz_stream*)file;</div><div class='del'>-    int err = do_flush (file, flush);</div><div class='del'>-</div><div class='del'>-    if (err) return err;</div><div class='del'>-    fflush(s-&gt;file);</div><div class='del'>-    return  s-&gt;z_err == Z_STREAM_END ? Z_OK : s-&gt;z_err;</div><div class='del'>-}</div><div class='del'>-#endif /* NO_GZCOMPRESS */</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-      Sets the starting position for the next gzread or gzwrite on the given</div><div class='del'>-   compressed file. The offset represents a number of bytes in the</div><div class='del'>-      gzseek returns the resulting offset location as measured in bytes from</div><div class='del'>-   the beginning of the uncompressed stream, or -1 in case of error.</div><div class='del'>-      SEEK_END is not implemented, returns error.</div><div class='del'>-      In this version of the library, gzseek can be extremely slow.</div><div class='del'>-*/</div><div class='del'>-z_off_t ZEXPORT gzseek (file, offset, whence)</div><div class='del'>-    gzFile file;</div><div class='del'>-    z_off_t offset;</div><div class='del'>-    int whence;</div><div class='del'>-{</div><div class='del'>-    gz_stream *s = (gz_stream*)file;</div><div class='del'>-</div><div class='del'>-    if (s == NULL || whence == SEEK_END ||</div><div class='del'>-        s-&gt;z_err == Z_ERRNO || s-&gt;z_err == Z_DATA_ERROR) {</div><div class='del'>-        return -1L;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (s-&gt;mode == 'w') {</div><div class='del'>-#ifdef NO_GZCOMPRESS</div><div class='del'>-        return -1L;</div><div class='del'>-#else</div><div class='del'>-        if (whence == SEEK_SET) {</div><div class='del'>-            offset -= s-&gt;in;</div><div class='del'>-        }</div><div class='del'>-        if (offset &lt; 0) return -1L;</div><div class='del'>-</div><div class='del'>-        /* At this point, offset is the number of zero bytes to write. */</div><div class='del'>-        if (s-&gt;inbuf == Z_NULL) {</div><div class='del'>-            s-&gt;inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */</div><div class='del'>-            if (s-&gt;inbuf == Z_NULL) return -1L;</div><div class='del'>-            zmemzero(s-&gt;inbuf, Z_BUFSIZE);</div><div class='del'>-        }</div><div class='del'>-        while (offset &gt; 0)  {</div><div class='del'>-            uInt size = Z_BUFSIZE;</div><div class='del'>-            if (offset &lt; Z_BUFSIZE) size = (uInt)offset;</div><div class='del'>-</div><div class='del'>-            size = gzwrite(file, s-&gt;inbuf, size);</div><div class='del'>-            if (size == 0) return -1L;</div><div class='del'>-</div><div class='del'>-            offset -= size;</div><div class='del'>-        }</div><div class='del'>-        return s-&gt;in;</div><div class='del'>-#endif</div><div class='del'>-    }</div><div class='del'>-    /* Rest of function is for reading only */</div><div class='del'>-</div><div class='del'>-    /* compute absolute position */</div><div class='del'>-    if (whence == SEEK_CUR) {</div><div class='del'>-        offset += s-&gt;out;</div><div class='del'>-    }</div><div class='del'>-    if (offset &lt; 0) return -1L;</div><div class='del'>-</div><div class='del'>-    if (s-&gt;transparent) {</div><div class='del'>-        /* map to fseek */</div><div class='del'>-        s-&gt;back = EOF;</div><div class='del'>-        s-&gt;stream.avail_in = 0;</div><div class='del'>-        s-&gt;stream.next_in = s-&gt;inbuf;</div><div class='del'>-        if (fseek(s-&gt;file, offset, SEEK_SET) &lt; 0) return -1L;</div><div class='del'>-</div><div class='del'>-        s-&gt;in = s-&gt;out = offset;</div><div class='del'>-        return offset;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* For a negative seek, rewind and use positive seek */</div><div class='del'>-    if (offset &gt;= s-&gt;out) {</div><div class='del'>-        offset -= s-&gt;out;</div><div class='del'>-    } else if (gzrewind(file) &lt; 0) {</div><div class='del'>-        return -1L;</div><div class='del'>-    }</div><div class='del'>-    /* offset is now the number of bytes to skip. */</div><div class='del'>-</div><div class='del'>-    if (offset != 0 &amp;&amp; s-&gt;outbuf == Z_NULL) {</div><div class='del'>-        s-&gt;outbuf = (Byte*)ALLOC(Z_BUFSIZE);</div><div class='del'>-        if (s-&gt;outbuf == Z_NULL) return -1L;</div><div class='del'>-    }</div><div class='del'>-    if (offset &amp;&amp; s-&gt;back != EOF) {</div><div class='del'>-        s-&gt;back = EOF;</div><div class='del'>-        s-&gt;out++;</div><div class='del'>-        offset--;</div><div class='del'>-        if (s-&gt;last) s-&gt;z_err = Z_STREAM_END;</div><div class='del'>-    }</div><div class='del'>-    while (offset &gt; 0)  {</div><div class='del'>-        int size = Z_BUFSIZE;</div><div class='del'>-        if (offset &lt; Z_BUFSIZE) size = (int)offset;</div><div class='del'>-</div><div class='del'>-        size = gzread(file, s-&gt;outbuf, (uInt)size);</div><div class='del'>-        if (size &lt;= 0) return -1L;</div><div class='del'>-        offset -= size;</div><div class='del'>-    }</div><div class='del'>-    return s-&gt;out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-     Rewinds input file.</div><div class='del'>-*/</div><div class='del'>-int ZEXPORT gzrewind (file)</div><div class='del'>-    gzFile file;</div><div class='del'>-{</div><div class='del'>-    gz_stream *s = (gz_stream*)file;</div><div class='del'>-</div><div class='del'>-    if (s == NULL || s-&gt;mode != 'r') return -1;</div><div class='del'>-</div><div class='del'>-    s-&gt;z_err = Z_OK;</div><div class='del'>-    s-&gt;z_eof = 0;</div><div class='del'>-    s-&gt;back = EOF;</div><div class='del'>-    s-&gt;stream.avail_in = 0;</div><div class='del'>-    s-&gt;stream.next_in = s-&gt;inbuf;</div><div class='del'>-    s-&gt;crc = crc32(0L, Z_NULL, 0);</div><div class='del'>-    if (!s-&gt;transparent) (void)inflateReset(&amp;s-&gt;stream);</div><div class='del'>-    s-&gt;in = 0;</div><div class='del'>-    s-&gt;out = 0;</div><div class='del'>-    return fseek(s-&gt;file, s-&gt;start, SEEK_SET);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-     Returns the starting position for the next gzread or gzwrite on the</div><div class='del'>-   given compressed file. This position represents a number of bytes in the</div><div class='del'>-   uncompressed data stream.</div><div class='del'>-*/</div><div class='del'>-z_off_t ZEXPORT gztell (file)</div><div class='del'>-    gzFile file;</div><div class='del'>-{</div><div class='del'>-    return gzseek(file, 0L, SEEK_CUR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-     Returns 1 when EOF has previously been detected reading the given</div><div class='del'>-   input stream, otherwise zero.</div><div class='del'>-*/</div><div class='del'>-int ZEXPORT gzeof (file)</div><div class='del'>-    gzFile file;</div><div class='del'>-{</div><div class='del'>-    gz_stream *s = (gz_stream*)file;</div><div class='del'>-</div><div class='del'>-    /* With concatenated compressed files that can have embedded</div><div class='del'>-     * crc trailers, z_eof is no longer the only/best indicator of EOF</div><div class='del'>-     * on a gz_stream. Handle end-of-stream error explicitly here.</div><div class='del'>-     */</div><div class='del'>-    if (s == NULL || s-&gt;mode != 'r') return 0;</div><div class='del'>-    if (s-&gt;z_eof) return 1;</div><div class='del'>-    return s-&gt;z_err == Z_STREAM_END;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-     Returns 1 if reading and doing so transparently, otherwise zero.</div><div class='del'>-*/</div><div class='del'>-int ZEXPORT gzdirect (file)</div><div class='del'>-    gzFile file;</div><div class='del'>-{</div><div class='del'>-    gz_stream *s = (gz_stream*)file;</div><div class='del'>-</div><div class='del'>-    if (s == NULL || s-&gt;mode != 'r') return 0;</div><div class='del'>-    return s-&gt;transparent;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-   Outputs a long in LSB order to the given file</div><div class='del'>-*/</div><div class='del'>-local void putLong (file, x)</div><div class='del'>-    FILE *file;</div><div class='del'>-    uLong x;</div><div class='del'>-{</div><div class='del'>-    int n;</div><div class='del'>-    for (n = 0; n &lt; 4; n++) {</div><div class='del'>-        fputc((int)(x &amp; 0xff), file);</div><div class='del'>-        x &gt;&gt;= 8;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-   Reads a long in LSB order from the given gz_stream. Sets z_err in case</div><div class='del'>-   of error.</div><div class='del'>-*/</div><div class='del'>-local uLong getLong (s)</div><div class='del'>-    gz_stream *s;</div><div class='del'>-{</div><div class='del'>-    uLong x = (uLong)get_byte(s);</div><div class='del'>-    int c;</div><div class='del'>-</div><div class='del'>-    x += ((uLong)get_byte(s))&lt;&lt;8;</div><div class='del'>-    x += ((uLong)get_byte(s))&lt;&lt;16;</div><div class='del'>-    c = get_byte(s);</div><div class='del'>-    if (c == EOF) s-&gt;z_err = Z_DATA_ERROR;</div><div class='del'>-    x += ((uLong)c)&lt;&lt;24;</div><div class='del'>-    return x;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-     Flushes all pending output if necessary, closes the compressed file</div><div class='del'>-   and deallocates all the (de)compression state.</div><div class='del'>-*/</div><div class='del'>-int Q_ZEXPORT gzclose (file)</div><div class='del'>-    gzFile file;</div><div class='del'>-{</div><div class='del'>-    gz_stream *s = (gz_stream*)file;</div><div class='del'>-</div><div class='del'>-    if (s == NULL) return Z_STREAM_ERROR;</div><div class='del'>-</div><div class='del'>-    if (s-&gt;mode == 'w') {</div><div class='del'>-#ifdef NO_GZCOMPRESS</div><div class='del'>-        return Z_STREAM_ERROR;</div><div class='del'>-#else</div><div class='del'>-        if (do_flush (file, Z_FINISH) != Z_OK)</div><div class='del'>-            return destroy((gz_stream*)file);</div><div class='del'>-</div><div class='del'>-        putLong (s-&gt;file, s-&gt;crc);</div><div class='del'>-        putLong (s-&gt;file, (uLong)(s-&gt;in &amp; 0xffffffff));</div><div class='del'>-#endif</div><div class='del'>-    }</div><div class='del'>-    return destroy((gz_stream*)file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if defined(STDC) &amp;&amp; !defined(_WIN32_WCE)</div><div class='del'>-#  define zstrerror(errnum) strerror(errnum)</div><div class='del'>-#else</div><div class='del'>-#  define zstrerror(errnum) ""</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-     Returns the error message for the last error which occurred on the</div><div class='del'>-   given compressed file. errnum is set to zlib error number. If an</div><div class='del'>-   error occurred in the file system and not in the compression library,</div><div class='del'>-   errnum is set to Z_ERRNO and the application may consult errno</div><div class='del'>-   to get the exact error code.</div><div class='del'>-*/</div><div class='del'>-const char * ZEXPORT gzerror (file, errnum)</div><div class='del'>-    gzFile file;</div><div class='del'>-    int *errnum;</div><div class='del'>-{</div><div class='del'>-    char *m;</div><div class='del'>-    gz_stream *s = (gz_stream*)file;</div><div class='del'>-</div><div class='del'>-    if (s == NULL) {</div><div class='del'>-        *errnum = Z_STREAM_ERROR;</div><div class='del'>-        return (const char*)ERR_MSG(Z_STREAM_ERROR);</div><div class='del'>-    }</div><div class='del'>-    *errnum = s-&gt;z_err;</div><div class='del'>-    if (*errnum == Z_OK) return (const char*)"";</div><div class='del'>-</div><div class='del'>-    m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s-&gt;stream.msg);</div><div class='del'>-</div><div class='del'>-    if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s-&gt;z_err);</div><div class='del'>-</div><div class='del'>-    TRYFREE(s-&gt;msg);</div><div class='del'>-    s-&gt;msg = (char*)ALLOC(strlen(s-&gt;path) + strlen(m) + 3);</div><div class='del'>-    if (s-&gt;msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR);</div><div class='del'>-    strcpy(s-&gt;msg, s-&gt;path);</div><div class='del'>-    strcat(s-&gt;msg, ": ");</div><div class='del'>-    strcat(s-&gt;msg, m);</div><div class='del'>-    return (const char*)s-&gt;msg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ===========================================================================</div><div class='del'>-     Clear the error and end-of-file flags, and do the same for the real file.</div><div class='del'>-*/</div><div class='del'>-void ZEXPORT gzclearerr (file)</div><div class='del'>-    gzFile file;</div><div class='del'>-{</div><div class='del'>-    gz_stream *s = (gz_stream*)file;</div><div class='del'>-</div><div class='del'>-    if (s == NULL) return;</div><div class='del'>-    if (s-&gt;z_err != Z_STREAM_END) s-&gt;z_err = Z_OK;</div><div class='del'>-    s-&gt;z_eof = 0;</div><div class='del'>-    clearerr(s-&gt;file);</div><div class='del'>-}</div><div class='head'>diff --git a/src/3rdparty/zlib/gzlib.c b/src/3rdparty/zlib/gzlib.c<br/>new file mode 100644<br/>index 0000000..603e60e<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/gzlib.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/gzlib.c</a></div><div class='hunk'>@@ -0,0 +1,537 @@</div><div class='add'>+/* gzlib.c -- zlib functions common to reading and writing gzip files</div><div class='add'>+ * Copyright (C) 2004, 2010 Mark Adler</div><div class='add'>+ * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "gzguts.h"</div><div class='add'>+</div><div class='add'>+#if defined(_LARGEFILE64_SOURCE) &amp;&amp; _LFS64_LARGEFILE-0</div><div class='add'>+#  define LSEEK lseek64</div><div class='add'>+#else</div><div class='add'>+#  define LSEEK lseek</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Local functions */</div><div class='add'>+local void gz_reset OF((gz_statep));</div><div class='add'>+local gzFile gz_open OF((const char *, int, const char *));</div><div class='add'>+</div><div class='add'>+#if defined UNDER_CE</div><div class='add'>+</div><div class='add'>+/* Map the Windows error number in ERROR to a locale-dependent error message</div><div class='add'>+   string and return a pointer to it.  Typically, the values for ERROR come</div><div class='add'>+   from GetLastError.</div><div class='add'>+</div><div class='add'>+   The string pointed to shall not be modified by the application, but may be</div><div class='add'>+   overwritten by a subsequent call to gz_strwinerror</div><div class='add'>+</div><div class='add'>+   The gz_strwinerror function does not change the current setting of</div><div class='add'>+   GetLastError. */</div><div class='add'>+char ZLIB_INTERNAL *gz_strwinerror (error)</div><div class='add'>+     DWORD error;</div><div class='add'>+{</div><div class='add'>+    static char buf[1024];</div><div class='add'>+</div><div class='add'>+    wchar_t *msgbuf;</div><div class='add'>+    DWORD lasterr = GetLastError();</div><div class='add'>+    DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM</div><div class='add'>+        | FORMAT_MESSAGE_ALLOCATE_BUFFER,</div><div class='add'>+        NULL,</div><div class='add'>+        error,</div><div class='add'>+        0, /* Default language */</div><div class='add'>+        (LPVOID)&amp;msgbuf,</div><div class='add'>+        0,</div><div class='add'>+        NULL);</div><div class='add'>+    if (chars != 0) {</div><div class='add'>+        /* If there is an \r\n appended, zap it.  */</div><div class='add'>+        if (chars &gt;= 2</div><div class='add'>+            &amp;&amp; msgbuf[chars - 2] == '\r' &amp;&amp; msgbuf[chars - 1] == '\n') {</div><div class='add'>+            chars -= 2;</div><div class='add'>+            msgbuf[chars] = 0;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if (chars &gt; sizeof (buf) - 1) {</div><div class='add'>+            chars = sizeof (buf) - 1;</div><div class='add'>+            msgbuf[chars] = 0;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        wcstombs(buf, msgbuf, chars + 1);</div><div class='add'>+        LocalFree(msgbuf);</div><div class='add'>+    }</div><div class='add'>+    else {</div><div class='add'>+        sprintf(buf, "unknown win32 error (%ld)", error);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    SetLastError(lasterr);</div><div class='add'>+    return buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* UNDER_CE */</div><div class='add'>+</div><div class='add'>+/* Reset gzip file state */</div><div class='add'>+local void gz_reset(state)</div><div class='add'>+    gz_statep state;</div><div class='add'>+{</div><div class='add'>+    if (state-&gt;mode == GZ_READ) {   /* for reading ... */</div><div class='add'>+        state-&gt;have = 0;            /* no output data available */</div><div class='add'>+        state-&gt;eof = 0;             /* not at end of file */</div><div class='add'>+        state-&gt;how = LOOK;          /* look for gzip header */</div><div class='add'>+        state-&gt;direct = 1;          /* default for empty file */</div><div class='add'>+    }</div><div class='add'>+    state-&gt;seek = 0;                /* no seek request pending */</div><div class='add'>+    gz_error(state, Z_OK, NULL);    /* clear error */</div><div class='add'>+    state-&gt;pos = 0;                 /* no uncompressed data yet */</div><div class='add'>+    state-&gt;strm.avail_in = 0;       /* no input data yet */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Open a gzip file either by name or file descriptor. */</div><div class='add'>+local gzFile gz_open(path, fd, mode)</div><div class='add'>+    const char *path;</div><div class='add'>+    int fd;</div><div class='add'>+    const char *mode;</div><div class='add'>+{</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    /* allocate gzFile structure to return */</div><div class='add'>+    state = malloc(sizeof(gz_state));</div><div class='add'>+    if (state == NULL)</div><div class='add'>+        return NULL;</div><div class='add'>+    state-&gt;size = 0;            /* no buffers allocated yet */</div><div class='add'>+    state-&gt;want = GZBUFSIZE;    /* requested buffer size */</div><div class='add'>+    state-&gt;msg = NULL;          /* no error message yet */</div><div class='add'>+</div><div class='add'>+    /* interpret mode */</div><div class='add'>+    state-&gt;mode = GZ_NONE;</div><div class='add'>+    state-&gt;level = Z_DEFAULT_COMPRESSION;</div><div class='add'>+    state-&gt;strategy = Z_DEFAULT_STRATEGY;</div><div class='add'>+    while (*mode) {</div><div class='add'>+        if (*mode &gt;= '0' &amp;&amp; *mode &lt;= '9')</div><div class='add'>+            state-&gt;level = *mode - '0';</div><div class='add'>+        else</div><div class='add'>+            switch (*mode) {</div><div class='add'>+            case 'r':</div><div class='add'>+                state-&gt;mode = GZ_READ;</div><div class='add'>+                break;</div><div class='add'>+#ifndef NO_GZCOMPRESS</div><div class='add'>+            case 'w':</div><div class='add'>+                state-&gt;mode = GZ_WRITE;</div><div class='add'>+                break;</div><div class='add'>+            case 'a':</div><div class='add'>+                state-&gt;mode = GZ_APPEND;</div><div class='add'>+                break;</div><div class='add'>+#endif</div><div class='add'>+            case '+':       /* can't read and write at the same time */</div><div class='add'>+                free(state);</div><div class='add'>+                return NULL;</div><div class='add'>+            case 'b':       /* ignore -- will request binary anyway */</div><div class='add'>+                break;</div><div class='add'>+            case 'f':</div><div class='add'>+                state-&gt;strategy = Z_FILTERED;</div><div class='add'>+                break;</div><div class='add'>+            case 'h':</div><div class='add'>+                state-&gt;strategy = Z_HUFFMAN_ONLY;</div><div class='add'>+                break;</div><div class='add'>+            case 'R':</div><div class='add'>+                state-&gt;strategy = Z_RLE;</div><div class='add'>+                break;</div><div class='add'>+            case 'F':</div><div class='add'>+                state-&gt;strategy = Z_FIXED;</div><div class='add'>+            default:        /* could consider as an error, but just ignore */</div><div class='add'>+                ;</div><div class='add'>+            }</div><div class='add'>+        mode++;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* must provide an "r", "w", or "a" */</div><div class='add'>+    if (state-&gt;mode == GZ_NONE) {</div><div class='add'>+        free(state);</div><div class='add'>+        return NULL;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* save the path name for error messages */</div><div class='add'>+    state-&gt;path = malloc(strlen(path) + 1);</div><div class='add'>+    if (state-&gt;path == NULL) {</div><div class='add'>+        free(state);</div><div class='add'>+        return NULL;</div><div class='add'>+    }</div><div class='add'>+    strcpy(state-&gt;path, path);</div><div class='add'>+</div><div class='add'>+    /* open the file with the appropriate mode (or just use fd) */</div><div class='add'>+    state-&gt;fd = fd != -1 ? fd :</div><div class='add'>+        open(path,</div><div class='add'>+#ifdef O_LARGEFILE</div><div class='add'>+            O_LARGEFILE |</div><div class='add'>+#endif</div><div class='add'>+#ifdef O_BINARY</div><div class='add'>+            O_BINARY |</div><div class='add'>+#endif</div><div class='add'>+            (state-&gt;mode == GZ_READ ?</div><div class='add'>+                O_RDONLY :</div><div class='add'>+                (O_WRONLY | O_CREAT | (</div><div class='add'>+                    state-&gt;mode == GZ_WRITE ?</div><div class='add'>+                        O_TRUNC :</div><div class='add'>+                        O_APPEND))),</div><div class='add'>+            0666);</div><div class='add'>+    if (state-&gt;fd == -1) {</div><div class='add'>+        free(state-&gt;path);</div><div class='add'>+        free(state);</div><div class='add'>+        return NULL;</div><div class='add'>+    }</div><div class='add'>+    if (state-&gt;mode == GZ_APPEND)</div><div class='add'>+        state-&gt;mode = GZ_WRITE;         /* simplify later checks */</div><div class='add'>+</div><div class='add'>+    /* save the current position for rewinding (only if reading) */</div><div class='add'>+    if (state-&gt;mode == GZ_READ) {</div><div class='add'>+        state-&gt;start = LSEEK(state-&gt;fd, 0, SEEK_CUR);</div><div class='add'>+        if (state-&gt;start == -1) state-&gt;start = 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* initialize stream */</div><div class='add'>+    gz_reset(state);</div><div class='add'>+</div><div class='add'>+    /* return stream */</div><div class='add'>+    return (gzFile)state;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+gzFile ZEXPORT gzopen(path, mode)</div><div class='add'>+    const char *path;</div><div class='add'>+    const char *mode;</div><div class='add'>+{</div><div class='add'>+    return gz_open(path, -1, mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+gzFile ZEXPORT gzopen64(path, mode)</div><div class='add'>+    const char *path;</div><div class='add'>+    const char *mode;</div><div class='add'>+{</div><div class='add'>+    return gz_open(path, -1, mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+gzFile ZEXPORT gzdopen(fd, mode)</div><div class='add'>+    int fd;</div><div class='add'>+    const char *mode;</div><div class='add'>+{</div><div class='add'>+    char *path;         /* identifier for error messages */</div><div class='add'>+    gzFile gz;</div><div class='add'>+</div><div class='add'>+    if (fd == -1 || (path = malloc(7 + 3 * sizeof(int))) == NULL)</div><div class='add'>+        return NULL;</div><div class='add'>+    sprintf(path, "&lt;fd:%d&gt;", fd);   /* for debugging */</div><div class='add'>+    gz = gz_open(path, fd, mode);</div><div class='add'>+    free(path);</div><div class='add'>+    return gz;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+int ZEXPORT gzbuffer(file, size)</div><div class='add'>+    gzFile file;</div><div class='add'>+    unsigned size;</div><div class='add'>+{</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    /* get internal structure and check integrity */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return -1;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+    if (state-&gt;mode != GZ_READ &amp;&amp; state-&gt;mode != GZ_WRITE)</div><div class='add'>+        return -1;</div><div class='add'>+</div><div class='add'>+    /* make sure we haven't already allocated memory */</div><div class='add'>+    if (state-&gt;size != 0)</div><div class='add'>+        return -1;</div><div class='add'>+</div><div class='add'>+    /* check and set requested size */</div><div class='add'>+    if (size == 0)</div><div class='add'>+        return -1;</div><div class='add'>+    state-&gt;want = size;</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+int ZEXPORT gzrewind(file)</div><div class='add'>+    gzFile file;</div><div class='add'>+{</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    /* get internal structure */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return -1;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+</div><div class='add'>+    /* check that we're reading and that there's no error */</div><div class='add'>+    if (state-&gt;mode != GZ_READ || state-&gt;err != Z_OK)</div><div class='add'>+        return -1;</div><div class='add'>+</div><div class='add'>+    /* back up and start over */</div><div class='add'>+    if (LSEEK(state-&gt;fd, state-&gt;start, SEEK_SET) == -1)</div><div class='add'>+        return -1;</div><div class='add'>+    gz_reset(state);</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+z_off64_t ZEXPORT gzseek64(file, offset, whence)</div><div class='add'>+    gzFile file;</div><div class='add'>+    z_off64_t offset;</div><div class='add'>+    int whence;</div><div class='add'>+{</div><div class='add'>+    unsigned n;</div><div class='add'>+    z_off64_t ret;</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    /* get internal structure and check integrity */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return -1;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+    if (state-&gt;mode != GZ_READ &amp;&amp; state-&gt;mode != GZ_WRITE)</div><div class='add'>+        return -1;</div><div class='add'>+</div><div class='add'>+    /* check that there's no error */</div><div class='add'>+    if (state-&gt;err != Z_OK)</div><div class='add'>+        return -1;</div><div class='add'>+</div><div class='add'>+    /* can only seek from start or relative to current position */</div><div class='add'>+    if (whence != SEEK_SET &amp;&amp; whence != SEEK_CUR)</div><div class='add'>+        return -1;</div><div class='add'>+</div><div class='add'>+    /* normalize offset to a SEEK_CUR specification */</div><div class='add'>+    if (whence == SEEK_SET)</div><div class='add'>+        offset -= state-&gt;pos;</div><div class='add'>+    else if (state-&gt;seek)</div><div class='add'>+        offset += state-&gt;skip;</div><div class='add'>+    state-&gt;seek = 0;</div><div class='add'>+</div><div class='add'>+    /* if within raw area while reading, just go there */</div><div class='add'>+    if (state-&gt;mode == GZ_READ &amp;&amp; state-&gt;how == COPY &amp;&amp;</div><div class='add'>+        state-&gt;pos + offset &gt;= state-&gt;raw) {</div><div class='add'>+        ret = LSEEK(state-&gt;fd, offset - state-&gt;have, SEEK_CUR);</div><div class='add'>+        if (ret == -1)</div><div class='add'>+            return -1;</div><div class='add'>+        state-&gt;have = 0;</div><div class='add'>+        state-&gt;eof = 0;</div><div class='add'>+        state-&gt;seek = 0;</div><div class='add'>+        gz_error(state, Z_OK, NULL);</div><div class='add'>+        state-&gt;strm.avail_in = 0;</div><div class='add'>+        state-&gt;pos += offset;</div><div class='add'>+        return state-&gt;pos;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* calculate skip amount, rewinding if needed for back seek when reading */</div><div class='add'>+    if (offset &lt; 0) {</div><div class='add'>+        if (state-&gt;mode != GZ_READ)         /* writing -- can't go backwards */</div><div class='add'>+            return -1;</div><div class='add'>+        offset += state-&gt;pos;</div><div class='add'>+        if (offset &lt; 0)                     /* before start of file! */</div><div class='add'>+            return -1;</div><div class='add'>+        if (gzrewind(file) == -1)           /* rewind, then skip to offset */</div><div class='add'>+            return -1;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* if reading, skip what's in output buffer (one less gzgetc() check) */</div><div class='add'>+    if (state-&gt;mode == GZ_READ) {</div><div class='add'>+        n = GT_OFF(state-&gt;have) || (z_off64_t)state-&gt;have &gt; offset ?</div><div class='add'>+            (unsigned)offset : state-&gt;have;</div><div class='add'>+        state-&gt;have -= n;</div><div class='add'>+        state-&gt;next += n;</div><div class='add'>+        state-&gt;pos += n;</div><div class='add'>+        offset -= n;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* request skip (if not zero) */</div><div class='add'>+    if (offset) {</div><div class='add'>+        state-&gt;seek = 1;</div><div class='add'>+        state-&gt;skip = offset;</div><div class='add'>+    }</div><div class='add'>+    return state-&gt;pos + offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+z_off_t ZEXPORT gzseek(file, offset, whence)</div><div class='add'>+    gzFile file;</div><div class='add'>+    z_off_t offset;</div><div class='add'>+    int whence;</div><div class='add'>+{</div><div class='add'>+    z_off64_t ret;</div><div class='add'>+</div><div class='add'>+    ret = gzseek64(file, (z_off64_t)offset, whence);</div><div class='add'>+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+z_off64_t ZEXPORT gztell64(file)</div><div class='add'>+    gzFile file;</div><div class='add'>+{</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    /* get internal structure and check integrity */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return -1;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+    if (state-&gt;mode != GZ_READ &amp;&amp; state-&gt;mode != GZ_WRITE)</div><div class='add'>+        return -1;</div><div class='add'>+</div><div class='add'>+    /* return position */</div><div class='add'>+    return state-&gt;pos + (state-&gt;seek ? state-&gt;skip : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+z_off_t ZEXPORT gztell(file)</div><div class='add'>+    gzFile file;</div><div class='add'>+{</div><div class='add'>+    z_off64_t ret;</div><div class='add'>+</div><div class='add'>+    ret = gztell64(file);</div><div class='add'>+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+z_off64_t ZEXPORT gzoffset64(file)</div><div class='add'>+    gzFile file;</div><div class='add'>+{</div><div class='add'>+    z_off64_t offset;</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    /* get internal structure and check integrity */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return -1;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+    if (state-&gt;mode != GZ_READ &amp;&amp; state-&gt;mode != GZ_WRITE)</div><div class='add'>+        return -1;</div><div class='add'>+</div><div class='add'>+    /* compute and return effective offset in file */</div><div class='add'>+    offset = LSEEK(state-&gt;fd, 0, SEEK_CUR);</div><div class='add'>+    if (offset == -1)</div><div class='add'>+        return -1;</div><div class='add'>+    if (state-&gt;mode == GZ_READ)             /* reading */</div><div class='add'>+        offset -= state-&gt;strm.avail_in;     /* don't count buffered input */</div><div class='add'>+    return offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+z_off_t ZEXPORT gzoffset(file)</div><div class='add'>+    gzFile file;</div><div class='add'>+{</div><div class='add'>+    z_off64_t ret;</div><div class='add'>+</div><div class='add'>+    ret = gzoffset64(file);</div><div class='add'>+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+int ZEXPORT gzeof(file)</div><div class='add'>+    gzFile file;</div><div class='add'>+{</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    /* get internal structure and check integrity */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return 0;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+    if (state-&gt;mode != GZ_READ &amp;&amp; state-&gt;mode != GZ_WRITE)</div><div class='add'>+        return 0;</div><div class='add'>+</div><div class='add'>+    /* return end-of-file state */</div><div class='add'>+    return state-&gt;mode == GZ_READ ?</div><div class='add'>+        (state-&gt;eof &amp;&amp; state-&gt;strm.avail_in == 0 &amp;&amp; state-&gt;have == 0) : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+const char * ZEXPORT gzerror(file, errnum)</div><div class='add'>+    gzFile file;</div><div class='add'>+    int *errnum;</div><div class='add'>+{</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    /* get internal structure and check integrity */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return NULL;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+    if (state-&gt;mode != GZ_READ &amp;&amp; state-&gt;mode != GZ_WRITE)</div><div class='add'>+        return NULL;</div><div class='add'>+</div><div class='add'>+    /* return error information */</div><div class='add'>+    if (errnum != NULL)</div><div class='add'>+        *errnum = state-&gt;err;</div><div class='add'>+    return state-&gt;msg == NULL ? "" : state-&gt;msg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+void ZEXPORT gzclearerr(file)</div><div class='add'>+    gzFile file;</div><div class='add'>+{</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    /* get internal structure and check integrity */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+    if (state-&gt;mode != GZ_READ &amp;&amp; state-&gt;mode != GZ_WRITE)</div><div class='add'>+        return;</div><div class='add'>+</div><div class='add'>+    /* clear error and end-of-file */</div><div class='add'>+    if (state-&gt;mode == GZ_READ)</div><div class='add'>+        state-&gt;eof = 0;</div><div class='add'>+    gz_error(state, Z_OK, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Create an error message in allocated memory and set state-&gt;err and</div><div class='add'>+   state-&gt;msg accordingly.  Free any previous error message already there.  Do</div><div class='add'>+   not try to free or allocate space if the error is Z_MEM_ERROR (out of</div><div class='add'>+   memory).  Simply save the error message as a static string.  If there is an</div><div class='add'>+   allocation failure constructing the error message, then convert the error to</div><div class='add'>+   out of memory. */</div><div class='add'>+void ZLIB_INTERNAL gz_error(state, err, msg)</div><div class='add'>+    gz_statep state;</div><div class='add'>+    int err;</div><div class='add'>+    const char *msg;</div><div class='add'>+{</div><div class='add'>+    /* free previously allocated message and clear */</div><div class='add'>+    if (state-&gt;msg != NULL) {</div><div class='add'>+        if (state-&gt;err != Z_MEM_ERROR)</div><div class='add'>+            free(state-&gt;msg);</div><div class='add'>+        state-&gt;msg = NULL;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* set error code, and if no message, then done */</div><div class='add'>+    state-&gt;err = err;</div><div class='add'>+    if (msg == NULL)</div><div class='add'>+        return;</div><div class='add'>+</div><div class='add'>+    /* for an out of memory error, save as static string */</div><div class='add'>+    if (err == Z_MEM_ERROR) {</div><div class='add'>+        state-&gt;msg = (char *)msg;</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* construct error message with path */</div><div class='add'>+    if ((state-&gt;msg = malloc(strlen(state-&gt;path) + strlen(msg) + 3)) == NULL) {</div><div class='add'>+        state-&gt;err = Z_MEM_ERROR;</div><div class='add'>+        state-&gt;msg = (char *)"out of memory";</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+    strcpy(state-&gt;msg, state-&gt;path);</div><div class='add'>+    strcat(state-&gt;msg, ": ");</div><div class='add'>+    strcat(state-&gt;msg, msg);</div><div class='add'>+    return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef INT_MAX</div><div class='add'>+/* portably return maximum value for an int (when limits.h presumed not</div><div class='add'>+   available) -- we need to do this to cover cases where 2's complement not</div><div class='add'>+   used, since C standard permits 1's complement and sign-bit representations,</div><div class='add'>+   otherwise we could just use ((unsigned)-1) &gt;&gt; 1 */</div><div class='add'>+unsigned ZLIB_INTERNAL gz_intmax()</div><div class='add'>+{</div><div class='add'>+    unsigned p, q;</div><div class='add'>+</div><div class='add'>+    p = 1;</div><div class='add'>+    do {</div><div class='add'>+        q = p;</div><div class='add'>+        p &lt;&lt;= 1;</div><div class='add'>+        p++;</div><div class='add'>+    } while (p &gt; q);</div><div class='add'>+    return q &gt;&gt; 1;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/src/3rdparty/zlib/gzread.c b/src/3rdparty/zlib/gzread.c<br/>new file mode 100644<br/>index 0000000..548201a<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/gzread.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/gzread.c</a></div><div class='hunk'>@@ -0,0 +1,653 @@</div><div class='add'>+/* gzread.c -- zlib functions for reading gzip files</div><div class='add'>+ * Copyright (C) 2004, 2005, 2010 Mark Adler</div><div class='add'>+ * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "gzguts.h"</div><div class='add'>+</div><div class='add'>+/* Local functions */</div><div class='add'>+local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));</div><div class='add'>+local int gz_avail OF((gz_statep));</div><div class='add'>+local int gz_next4 OF((gz_statep, unsigned long *));</div><div class='add'>+local int gz_head OF((gz_statep));</div><div class='add'>+local int gz_decomp OF((gz_statep));</div><div class='add'>+local int gz_make OF((gz_statep));</div><div class='add'>+local int gz_skip OF((gz_statep, z_off64_t));</div><div class='add'>+</div><div class='add'>+/* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from</div><div class='add'>+   state-&gt;fd, and update state-&gt;eof, state-&gt;err, and state-&gt;msg as appropriate.</div><div class='add'>+   This function needs to loop on read(), since read() is not guaranteed to</div><div class='add'>+   read the number of bytes requested, depending on the type of descriptor. */</div><div class='add'>+local int gz_load(state, buf, len, have)</div><div class='add'>+    gz_statep state;</div><div class='add'>+    unsigned char *buf;</div><div class='add'>+    unsigned len;</div><div class='add'>+    unsigned *have;</div><div class='add'>+{</div><div class='add'>+    int ret;</div><div class='add'>+</div><div class='add'>+    *have = 0;</div><div class='add'>+    do {</div><div class='add'>+        ret = read(state-&gt;fd, buf + *have, len - *have);</div><div class='add'>+        if (ret &lt;= 0)</div><div class='add'>+            break;</div><div class='add'>+        *have += ret;</div><div class='add'>+    } while (*have &lt; len);</div><div class='add'>+    if (ret &lt; 0) {</div><div class='add'>+        gz_error(state, Z_ERRNO, zstrerror());</div><div class='add'>+        return -1;</div><div class='add'>+    }</div><div class='add'>+    if (ret == 0)</div><div class='add'>+        state-&gt;eof = 1;</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Load up input buffer and set eof flag if last data loaded -- return -1 on</div><div class='add'>+   error, 0 otherwise.  Note that the eof flag is set when the end of the input</div><div class='add'>+   file is reached, even though there may be unused data in the buffer.  Once</div><div class='add'>+   that data has been used, no more attempts will be made to read the file.</div><div class='add'>+   gz_avail() assumes that strm-&gt;avail_in == 0. */</div><div class='add'>+local int gz_avail(state)</div><div class='add'>+    gz_statep state;</div><div class='add'>+{</div><div class='add'>+    z_streamp strm = &amp;(state-&gt;strm);</div><div class='add'>+</div><div class='add'>+    if (state-&gt;err != Z_OK)</div><div class='add'>+        return -1;</div><div class='add'>+    if (state-&gt;eof == 0) {</div><div class='add'>+        if (gz_load(state, state-&gt;in, state-&gt;size,</div><div class='add'>+                (unsigned *)&amp;(strm-&gt;avail_in)) == -1)</div><div class='add'>+            return -1;</div><div class='add'>+        strm-&gt;next_in = state-&gt;in;</div><div class='add'>+    }</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get next byte from input, or -1 if end or error. */</div><div class='add'>+#define NEXT() ((strm-&gt;avail_in == 0 &amp;&amp; gz_avail(state) == -1) ? -1 : \</div><div class='add'>+                (strm-&gt;avail_in == 0 ? -1 : \</div><div class='add'>+                 (strm-&gt;avail_in--, *(strm-&gt;next_in)++)))</div><div class='add'>+</div><div class='add'>+/* Get a four-byte little-endian integer and return 0 on success and the value</div><div class='add'>+   in *ret.  Otherwise -1 is returned and *ret is not modified. */</div><div class='add'>+local int gz_next4(state, ret)</div><div class='add'>+    gz_statep state;</div><div class='add'>+    unsigned long *ret;</div><div class='add'>+{</div><div class='add'>+    int ch;</div><div class='add'>+    unsigned long val;</div><div class='add'>+    z_streamp strm = &amp;(state-&gt;strm);</div><div class='add'>+</div><div class='add'>+    val = NEXT();</div><div class='add'>+    val += (unsigned)NEXT() &lt;&lt; 8;</div><div class='add'>+    val += (unsigned long)NEXT() &lt;&lt; 16;</div><div class='add'>+    ch = NEXT();</div><div class='add'>+    if (ch == -1)</div><div class='add'>+        return -1;</div><div class='add'>+    val += (unsigned long)ch &lt;&lt; 24;</div><div class='add'>+    *ret = val;</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Look for gzip header, set up for inflate or copy.  state-&gt;have must be zero.</div><div class='add'>+   If this is the first time in, allocate required memory.  state-&gt;how will be</div><div class='add'>+   left unchanged if there is no more input data available, will be set to COPY</div><div class='add'>+   if there is no gzip header and direct copying will be performed, or it will</div><div class='add'>+   be set to GZIP for decompression, and the gzip header will be skipped so</div><div class='add'>+   that the next available input data is the raw deflate stream.  If direct</div><div class='add'>+   copying, then leftover input data from the input buffer will be copied to</div><div class='add'>+   the output buffer.  In that case, all further file reads will be directly to</div><div class='add'>+   either the output buffer or a user buffer.  If decompressing, the inflate</div><div class='add'>+   state and the check value will be initialized.  gz_head() will return 0 on</div><div class='add'>+   success or -1 on failure.  Failures may include read errors or gzip header</div><div class='add'>+   errors.  */</div><div class='add'>+local int gz_head(state)</div><div class='add'>+    gz_statep state;</div><div class='add'>+{</div><div class='add'>+    z_streamp strm = &amp;(state-&gt;strm);</div><div class='add'>+    int flags;</div><div class='add'>+    unsigned len;</div><div class='add'>+</div><div class='add'>+    /* allocate read buffers and inflate memory */</div><div class='add'>+    if (state-&gt;size == 0) {</div><div class='add'>+        /* allocate buffers */</div><div class='add'>+        state-&gt;in = malloc(state-&gt;want);</div><div class='add'>+        state-&gt;out = malloc(state-&gt;want &lt;&lt; 1);</div><div class='add'>+        if (state-&gt;in == NULL || state-&gt;out == NULL) {</div><div class='add'>+            if (state-&gt;out != NULL)</div><div class='add'>+                free(state-&gt;out);</div><div class='add'>+            if (state-&gt;in != NULL)</div><div class='add'>+                free(state-&gt;in);</div><div class='add'>+            gz_error(state, Z_MEM_ERROR, "out of memory");</div><div class='add'>+            return -1;</div><div class='add'>+        }</div><div class='add'>+        state-&gt;size = state-&gt;want;</div><div class='add'>+</div><div class='add'>+        /* allocate inflate memory */</div><div class='add'>+        state-&gt;strm.zalloc = Z_NULL;</div><div class='add'>+        state-&gt;strm.zfree = Z_NULL;</div><div class='add'>+        state-&gt;strm.opaque = Z_NULL;</div><div class='add'>+        state-&gt;strm.avail_in = 0;</div><div class='add'>+        state-&gt;strm.next_in = Z_NULL;</div><div class='add'>+        if (inflateInit2(&amp;(state-&gt;strm), -15) != Z_OK) {    /* raw inflate */</div><div class='add'>+            free(state-&gt;out);</div><div class='add'>+            free(state-&gt;in);</div><div class='add'>+            state-&gt;size = 0;</div><div class='add'>+            gz_error(state, Z_MEM_ERROR, "out of memory");</div><div class='add'>+            return -1;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* get some data in the input buffer */</div><div class='add'>+    if (strm-&gt;avail_in == 0) {</div><div class='add'>+        if (gz_avail(state) == -1)</div><div class='add'>+            return -1;</div><div class='add'>+        if (strm-&gt;avail_in == 0)</div><div class='add'>+            return 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* look for the gzip magic header bytes 31 and 139 */</div><div class='add'>+    if (strm-&gt;next_in[0] == 31) {</div><div class='add'>+        strm-&gt;avail_in--;</div><div class='add'>+        strm-&gt;next_in++;</div><div class='add'>+        if (strm-&gt;avail_in == 0 &amp;&amp; gz_avail(state) == -1)</div><div class='add'>+            return -1;</div><div class='add'>+        if (strm-&gt;avail_in &amp;&amp; strm-&gt;next_in[0] == 139) {</div><div class='add'>+            /* we have a gzip header, woo hoo! */</div><div class='add'>+            strm-&gt;avail_in--;</div><div class='add'>+            strm-&gt;next_in++;</div><div class='add'>+</div><div class='add'>+            /* skip rest of header */</div><div class='add'>+            if (NEXT() != 8) {      /* compression method */</div><div class='add'>+                gz_error(state, Z_DATA_ERROR, "unknown compression method");</div><div class='add'>+                return -1;</div><div class='add'>+            }</div><div class='add'>+            flags = NEXT();</div><div class='add'>+            if (flags &amp; 0xe0) {     /* reserved flag bits */</div><div class='add'>+                gz_error(state, Z_DATA_ERROR, "unknown header flags set");</div><div class='add'>+                return -1;</div><div class='add'>+            }</div><div class='add'>+            NEXT();                 /* modification time */</div><div class='add'>+            NEXT();</div><div class='add'>+            NEXT();</div><div class='add'>+            NEXT();</div><div class='add'>+            NEXT();                 /* extra flags */</div><div class='add'>+            NEXT();                 /* operating system */</div><div class='add'>+            if (flags &amp; 4) {        /* extra field */</div><div class='add'>+                len = (unsigned)NEXT();</div><div class='add'>+                len += (unsigned)NEXT() &lt;&lt; 8;</div><div class='add'>+                while (len--)</div><div class='add'>+                    if (NEXT() &lt; 0)</div><div class='add'>+                        break;</div><div class='add'>+            }</div><div class='add'>+            if (flags &amp; 8)          /* file name */</div><div class='add'>+                while (NEXT() &gt; 0)</div><div class='add'>+                    ;</div><div class='add'>+            if (flags &amp; 16)         /* comment */</div><div class='add'>+                while (NEXT() &gt; 0)</div><div class='add'>+                    ;</div><div class='add'>+            if (flags &amp; 2) {        /* header crc */</div><div class='add'>+                NEXT();</div><div class='add'>+                NEXT();</div><div class='add'>+            }</div><div class='add'>+            /* an unexpected end of file is not checked for here -- it will be</div><div class='add'>+               noticed on the first request for uncompressed data */</div><div class='add'>+</div><div class='add'>+            /* set up for decompression */</div><div class='add'>+            inflateReset(strm);</div><div class='add'>+            strm-&gt;adler = crc32(0L, Z_NULL, 0);</div><div class='add'>+            state-&gt;how = GZIP;</div><div class='add'>+            state-&gt;direct = 0;</div><div class='add'>+            return 0;</div><div class='add'>+        }</div><div class='add'>+        else {</div><div class='add'>+            /* not a gzip file -- save first byte (31) and fall to raw i/o */</div><div class='add'>+            state-&gt;out[0] = 31;</div><div class='add'>+            state-&gt;have = 1;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* doing raw i/o, save start of raw data for seeking, copy any leftover</div><div class='add'>+       input to output -- this assumes that the output buffer is larger than</div><div class='add'>+       the input buffer, which also assures space for gzungetc() */</div><div class='add'>+    state-&gt;raw = state-&gt;pos;</div><div class='add'>+    state-&gt;next = state-&gt;out;</div><div class='add'>+    if (strm-&gt;avail_in) {</div><div class='add'>+        memcpy(state-&gt;next + state-&gt;have, strm-&gt;next_in, strm-&gt;avail_in);</div><div class='add'>+        state-&gt;have += strm-&gt;avail_in;</div><div class='add'>+        strm-&gt;avail_in = 0;</div><div class='add'>+    }</div><div class='add'>+    state-&gt;how = COPY;</div><div class='add'>+    state-&gt;direct = 1;</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Decompress from input to the provided next_out and avail_out in the state.</div><div class='add'>+   If the end of the compressed data is reached, then verify the gzip trailer</div><div class='add'>+   check value and length (modulo 2^32).  state-&gt;have and state-&gt;next are set</div><div class='add'>+   to point to the just decompressed data, and the crc is updated.  If the</div><div class='add'>+   trailer is verified, state-&gt;how is reset to LOOK to look for the next gzip</div><div class='add'>+   stream or raw data, once state-&gt;have is depleted.  Returns 0 on success, -1</div><div class='add'>+   on failure.  Failures may include invalid compressed data or a failed gzip</div><div class='add'>+   trailer verification. */</div><div class='add'>+local int gz_decomp(state)</div><div class='add'>+    gz_statep state;</div><div class='add'>+{</div><div class='add'>+    int ret;</div><div class='add'>+    unsigned had;</div><div class='add'>+    unsigned long crc, len;</div><div class='add'>+    z_streamp strm = &amp;(state-&gt;strm);</div><div class='add'>+</div><div class='add'>+    /* fill output buffer up to end of deflate stream */</div><div class='add'>+    had = strm-&gt;avail_out;</div><div class='add'>+    do {</div><div class='add'>+        /* get more input for inflate() */</div><div class='add'>+        if (strm-&gt;avail_in == 0 &amp;&amp; gz_avail(state) == -1)</div><div class='add'>+            return -1;</div><div class='add'>+        if (strm-&gt;avail_in == 0) {</div><div class='add'>+            gz_error(state, Z_DATA_ERROR, "unexpected end of file");</div><div class='add'>+            return -1;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        /* decompress and handle errors */</div><div class='add'>+        ret = inflate(strm, Z_NO_FLUSH);</div><div class='add'>+        if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {</div><div class='add'>+            gz_error(state, Z_STREAM_ERROR,</div><div class='add'>+                      "internal error: inflate stream corrupt");</div><div class='add'>+            return -1;</div><div class='add'>+        }</div><div class='add'>+        if (ret == Z_MEM_ERROR) {</div><div class='add'>+            gz_error(state, Z_MEM_ERROR, "out of memory");</div><div class='add'>+            return -1;</div><div class='add'>+        }</div><div class='add'>+        if (ret == Z_DATA_ERROR) {              /* deflate stream invalid */</div><div class='add'>+            gz_error(state, Z_DATA_ERROR,</div><div class='add'>+                      strm-&gt;msg == NULL ? "compressed data error" : strm-&gt;msg);</div><div class='add'>+            return -1;</div><div class='add'>+        }</div><div class='add'>+    } while (strm-&gt;avail_out &amp;&amp; ret != Z_STREAM_END);</div><div class='add'>+</div><div class='add'>+    /* update available output and crc check value */</div><div class='add'>+    state-&gt;have = had - strm-&gt;avail_out;</div><div class='add'>+    state-&gt;next = strm-&gt;next_out - state-&gt;have;</div><div class='add'>+    strm-&gt;adler = crc32(strm-&gt;adler, state-&gt;next, state-&gt;have);</div><div class='add'>+</div><div class='add'>+    /* check gzip trailer if at end of deflate stream */</div><div class='add'>+    if (ret == Z_STREAM_END) {</div><div class='add'>+        if (gz_next4(state, &amp;crc) == -1 || gz_next4(state, &amp;len) == -1) {</div><div class='add'>+            gz_error(state, Z_DATA_ERROR, "unexpected end of file");</div><div class='add'>+            return -1;</div><div class='add'>+        }</div><div class='add'>+        if (crc != strm-&gt;adler) {</div><div class='add'>+            gz_error(state, Z_DATA_ERROR, "incorrect data check");</div><div class='add'>+            return -1;</div><div class='add'>+        }</div><div class='add'>+        if (len != (strm-&gt;total_out &amp; 0xffffffffL)) {</div><div class='add'>+            gz_error(state, Z_DATA_ERROR, "incorrect length check");</div><div class='add'>+            return -1;</div><div class='add'>+        }</div><div class='add'>+        state-&gt;how = LOOK;      /* ready for next stream, once have is 0 (leave</div><div class='add'>+                                   state-&gt;direct unchanged to remember how) */</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* good decompression */</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Make data and put in the output buffer.  Assumes that state-&gt;have == 0.</div><div class='add'>+   Data is either copied from the input file or decompressed from the input</div><div class='add'>+   file depending on state-&gt;how.  If state-&gt;how is LOOK, then a gzip header is</div><div class='add'>+   looked for (and skipped if found) to determine wither to copy or decompress.</div><div class='add'>+   Returns -1 on error, otherwise 0.  gz_make() will leave state-&gt;have as COPY</div><div class='add'>+   or GZIP unless the end of the input file has been reached and all data has</div><div class='add'>+   been processed.  */</div><div class='add'>+local int gz_make(state)</div><div class='add'>+    gz_statep state;</div><div class='add'>+{</div><div class='add'>+    z_streamp strm = &amp;(state-&gt;strm);</div><div class='add'>+</div><div class='add'>+    if (state-&gt;how == LOOK) {           /* look for gzip header */</div><div class='add'>+        if (gz_head(state) == -1)</div><div class='add'>+            return -1;</div><div class='add'>+        if (state-&gt;have)                /* got some data from gz_head() */</div><div class='add'>+            return 0;</div><div class='add'>+    }</div><div class='add'>+    if (state-&gt;how == COPY) {           /* straight copy */</div><div class='add'>+        if (gz_load(state, state-&gt;out, state-&gt;size &lt;&lt; 1, &amp;(state-&gt;have)) == -1)</div><div class='add'>+            return -1;</div><div class='add'>+        state-&gt;next = state-&gt;out;</div><div class='add'>+    }</div><div class='add'>+    else if (state-&gt;how == GZIP) {      /* decompress */</div><div class='add'>+        strm-&gt;avail_out = state-&gt;size &lt;&lt; 1;</div><div class='add'>+        strm-&gt;next_out = state-&gt;out;</div><div class='add'>+        if (gz_decomp(state) == -1)</div><div class='add'>+            return -1;</div><div class='add'>+    }</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Skip len uncompressed bytes of output.  Return -1 on error, 0 on success. */</div><div class='add'>+local int gz_skip(state, len)</div><div class='add'>+    gz_statep state;</div><div class='add'>+    z_off64_t len;</div><div class='add'>+{</div><div class='add'>+    unsigned n;</div><div class='add'>+</div><div class='add'>+    /* skip over len bytes or reach end-of-file, whichever comes first */</div><div class='add'>+    while (len)</div><div class='add'>+        /* skip over whatever is in output buffer */</div><div class='add'>+        if (state-&gt;have) {</div><div class='add'>+            n = GT_OFF(state-&gt;have) || (z_off64_t)state-&gt;have &gt; len ?</div><div class='add'>+                (unsigned)len : state-&gt;have;</div><div class='add'>+            state-&gt;have -= n;</div><div class='add'>+            state-&gt;next += n;</div><div class='add'>+            state-&gt;pos += n;</div><div class='add'>+            len -= n;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        /* output buffer empty -- return if we're at the end of the input */</div><div class='add'>+        else if (state-&gt;eof &amp;&amp; state-&gt;strm.avail_in == 0)</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+        /* need more data to skip -- load up output buffer */</div><div class='add'>+        else {</div><div class='add'>+            /* get more output, looking for header if required */</div><div class='add'>+            if (gz_make(state) == -1)</div><div class='add'>+                return -1;</div><div class='add'>+        }</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+int ZEXPORT gzread(file, buf, len)</div><div class='add'>+    gzFile file;</div><div class='add'>+    voidp buf;</div><div class='add'>+    unsigned len;</div><div class='add'>+{</div><div class='add'>+    unsigned got, n;</div><div class='add'>+    gz_statep state;</div><div class='add'>+    z_streamp strm;</div><div class='add'>+</div><div class='add'>+    /* get internal structure */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return -1;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+    strm = &amp;(state-&gt;strm);</div><div class='add'>+</div><div class='add'>+    /* check that we're reading and that there's no error */</div><div class='add'>+    if (state-&gt;mode != GZ_READ || state-&gt;err != Z_OK)</div><div class='add'>+        return -1;</div><div class='add'>+</div><div class='add'>+    /* since an int is returned, make sure len fits in one, otherwise return</div><div class='add'>+       with an error (this avoids the flaw in the interface) */</div><div class='add'>+    if ((int)len &lt; 0) {</div><div class='add'>+        gz_error(state, Z_BUF_ERROR, "requested length does not fit in int");</div><div class='add'>+        return -1;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* if len is zero, avoid unnecessary operations */</div><div class='add'>+    if (len == 0)</div><div class='add'>+        return 0;</div><div class='add'>+</div><div class='add'>+    /* process a skip request */</div><div class='add'>+    if (state-&gt;seek) {</div><div class='add'>+        state-&gt;seek = 0;</div><div class='add'>+        if (gz_skip(state, state-&gt;skip) == -1)</div><div class='add'>+            return -1;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* get len bytes to buf, or less than len if at the end */</div><div class='add'>+    got = 0;</div><div class='add'>+    do {</div><div class='add'>+        /* first just try copying data from the output buffer */</div><div class='add'>+        if (state-&gt;have) {</div><div class='add'>+            n = state-&gt;have &gt; len ? len : state-&gt;have;</div><div class='add'>+            memcpy(buf, state-&gt;next, n);</div><div class='add'>+            state-&gt;next += n;</div><div class='add'>+            state-&gt;have -= n;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        /* output buffer empty -- return if we're at the end of the input */</div><div class='add'>+        else if (state-&gt;eof &amp;&amp; strm-&gt;avail_in == 0)</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+        /* need output data -- for small len or new stream load up our output</div><div class='add'>+           buffer */</div><div class='add'>+        else if (state-&gt;how == LOOK || len &lt; (state-&gt;size &lt;&lt; 1)) {</div><div class='add'>+            /* get more output, looking for header if required */</div><div class='add'>+            if (gz_make(state) == -1)</div><div class='add'>+                return -1;</div><div class='add'>+            continue;       /* no progress yet -- go back to memcpy() above */</div><div class='add'>+            /* the copy above assures that we will leave with space in the</div><div class='add'>+               output buffer, allowing at least one gzungetc() to succeed */</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        /* large len -- read directly into user buffer */</div><div class='add'>+        else if (state-&gt;how == COPY) {      /* read directly */</div><div class='add'>+            if (gz_load(state, buf, len, &amp;n) == -1)</div><div class='add'>+                return -1;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        /* large len -- decompress directly into user buffer */</div><div class='add'>+        else {  /* state-&gt;how == GZIP */</div><div class='add'>+            strm-&gt;avail_out = len;</div><div class='add'>+            strm-&gt;next_out = buf;</div><div class='add'>+            if (gz_decomp(state) == -1)</div><div class='add'>+                return -1;</div><div class='add'>+            n = state-&gt;have;</div><div class='add'>+            state-&gt;have = 0;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        /* update progress */</div><div class='add'>+        len -= n;</div><div class='add'>+        buf = (char *)buf + n;</div><div class='add'>+        got += n;</div><div class='add'>+        state-&gt;pos += n;</div><div class='add'>+    } while (len);</div><div class='add'>+</div><div class='add'>+    /* return number of bytes read into user buffer (will fit in int) */</div><div class='add'>+    return (int)got;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+int ZEXPORT gzgetc(file)</div><div class='add'>+    gzFile file;</div><div class='add'>+{</div><div class='add'>+    int ret;</div><div class='add'>+    unsigned char buf[1];</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    /* get internal structure */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return -1;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+</div><div class='add'>+    /* check that we're reading and that there's no error */</div><div class='add'>+    if (state-&gt;mode != GZ_READ || state-&gt;err != Z_OK)</div><div class='add'>+        return -1;</div><div class='add'>+</div><div class='add'>+    /* try output buffer (no need to check for skip request) */</div><div class='add'>+    if (state-&gt;have) {</div><div class='add'>+        state-&gt;have--;</div><div class='add'>+        state-&gt;pos++;</div><div class='add'>+        return *(state-&gt;next)++;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* nothing there -- try gzread() */</div><div class='add'>+    ret = gzread(file, buf, 1);</div><div class='add'>+    return ret &lt; 1 ? -1 : buf[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+int ZEXPORT gzungetc(c, file)</div><div class='add'>+    int c;</div><div class='add'>+    gzFile file;</div><div class='add'>+{</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    /* get internal structure */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return -1;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+</div><div class='add'>+    /* check that we're reading and that there's no error */</div><div class='add'>+    if (state-&gt;mode != GZ_READ || state-&gt;err != Z_OK)</div><div class='add'>+        return -1;</div><div class='add'>+</div><div class='add'>+    /* process a skip request */</div><div class='add'>+    if (state-&gt;seek) {</div><div class='add'>+        state-&gt;seek = 0;</div><div class='add'>+        if (gz_skip(state, state-&gt;skip) == -1)</div><div class='add'>+            return -1;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* can't push EOF */</div><div class='add'>+    if (c &lt; 0)</div><div class='add'>+        return -1;</div><div class='add'>+</div><div class='add'>+    /* if output buffer empty, put byte at end (allows more pushing) */</div><div class='add'>+    if (state-&gt;have == 0) {</div><div class='add'>+        state-&gt;have = 1;</div><div class='add'>+        state-&gt;next = state-&gt;out + (state-&gt;size &lt;&lt; 1) - 1;</div><div class='add'>+        state-&gt;next[0] = c;</div><div class='add'>+        state-&gt;pos--;</div><div class='add'>+        return c;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* if no room, give up (must have already done a gzungetc()) */</div><div class='add'>+    if (state-&gt;have == (state-&gt;size &lt;&lt; 1)) {</div><div class='add'>+        gz_error(state, Z_BUF_ERROR, "out of room to push characters");</div><div class='add'>+        return -1;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* slide output data if needed and insert byte before existing data */</div><div class='add'>+    if (state-&gt;next == state-&gt;out) {</div><div class='add'>+        unsigned char *src = state-&gt;out + state-&gt;have;</div><div class='add'>+        unsigned char *dest = state-&gt;out + (state-&gt;size &lt;&lt; 1);</div><div class='add'>+        while (src &gt; state-&gt;out)</div><div class='add'>+            *--dest = *--src;</div><div class='add'>+        state-&gt;next = dest;</div><div class='add'>+    }</div><div class='add'>+    state-&gt;have++;</div><div class='add'>+    state-&gt;next--;</div><div class='add'>+    state-&gt;next[0] = c;</div><div class='add'>+    state-&gt;pos--;</div><div class='add'>+    return c;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+char * ZEXPORT gzgets(file, buf, len)</div><div class='add'>+    gzFile file;</div><div class='add'>+    char *buf;</div><div class='add'>+    int len;</div><div class='add'>+{</div><div class='add'>+    unsigned left, n;</div><div class='add'>+    char *str;</div><div class='add'>+    unsigned char *eol;</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    /* check parameters and get internal structure */</div><div class='add'>+    if (file == NULL || buf == NULL || len &lt; 1)</div><div class='add'>+        return NULL;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+</div><div class='add'>+    /* check that we're reading and that there's no error */</div><div class='add'>+    if (state-&gt;mode != GZ_READ || state-&gt;err != Z_OK)</div><div class='add'>+        return NULL;</div><div class='add'>+</div><div class='add'>+    /* process a skip request */</div><div class='add'>+    if (state-&gt;seek) {</div><div class='add'>+        state-&gt;seek = 0;</div><div class='add'>+        if (gz_skip(state, state-&gt;skip) == -1)</div><div class='add'>+            return NULL;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* copy output bytes up to new line or len - 1, whichever comes first --</div><div class='add'>+       append a terminating zero to the string (we don't check for a zero in</div><div class='add'>+       the contents, let the user worry about that) */</div><div class='add'>+    str = buf;</div><div class='add'>+    left = (unsigned)len - 1;</div><div class='add'>+    if (left) do {</div><div class='add'>+        /* assure that something is in the output buffer */</div><div class='add'>+        if (state-&gt;have == 0) {</div><div class='add'>+            if (gz_make(state) == -1)</div><div class='add'>+                return NULL;            /* error */</div><div class='add'>+            if (state-&gt;have == 0) {     /* end of file */</div><div class='add'>+                if (buf == str)         /* got bupkus */</div><div class='add'>+                    return NULL;</div><div class='add'>+                break;                  /* got something -- return it */</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        /* look for end-of-line in current output buffer */</div><div class='add'>+        n = state-&gt;have &gt; left ? left : state-&gt;have;</div><div class='add'>+        eol = memchr(state-&gt;next, '\n', n);</div><div class='add'>+        if (eol != NULL)</div><div class='add'>+            n = (unsigned)(eol - state-&gt;next) + 1;</div><div class='add'>+</div><div class='add'>+        /* copy through end-of-line, or remainder if not found */</div><div class='add'>+        memcpy(buf, state-&gt;next, n);</div><div class='add'>+        state-&gt;have -= n;</div><div class='add'>+        state-&gt;next += n;</div><div class='add'>+        state-&gt;pos += n;</div><div class='add'>+        left -= n;</div><div class='add'>+        buf += n;</div><div class='add'>+    } while (left &amp;&amp; eol == NULL);</div><div class='add'>+</div><div class='add'>+    /* found end-of-line or out of space -- terminate string and return it */</div><div class='add'>+    buf[0] = 0;</div><div class='add'>+    return str;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+int ZEXPORT gzdirect(file)</div><div class='add'>+    gzFile file;</div><div class='add'>+{</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    /* get internal structure */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return 0;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+</div><div class='add'>+    /* check that we're reading */</div><div class='add'>+    if (state-&gt;mode != GZ_READ)</div><div class='add'>+        return 0;</div><div class='add'>+</div><div class='add'>+    /* if the state is not known, but we can find out, then do so (this is</div><div class='add'>+       mainly for right after a gzopen() or gzdopen()) */</div><div class='add'>+    if (state-&gt;how == LOOK &amp;&amp; state-&gt;have == 0)</div><div class='add'>+        (void)gz_head(state);</div><div class='add'>+</div><div class='add'>+    /* return 1 if reading direct, 0 if decompressing a gzip stream */</div><div class='add'>+    return state-&gt;direct;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+int ZEXPORT gzclose_r(file)</div><div class='add'>+    gzFile file;</div><div class='add'>+{</div><div class='add'>+    int ret;</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    /* get internal structure */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return Z_STREAM_ERROR;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+</div><div class='add'>+    /* check that we're reading */</div><div class='add'>+    if (state-&gt;mode != GZ_READ)</div><div class='add'>+        return Z_STREAM_ERROR;</div><div class='add'>+</div><div class='add'>+    /* free memory and close file */</div><div class='add'>+    if (state-&gt;size) {</div><div class='add'>+        inflateEnd(&amp;(state-&gt;strm));</div><div class='add'>+        free(state-&gt;out);</div><div class='add'>+        free(state-&gt;in);</div><div class='add'>+    }</div><div class='add'>+    gz_error(state, Z_OK, NULL);</div><div class='add'>+    free(state-&gt;path);</div><div class='add'>+    ret = close(state-&gt;fd);</div><div class='add'>+    free(state);</div><div class='add'>+    return ret ? Z_ERRNO : Z_OK;</div><div class='add'>+}</div><div class='head'>diff --git a/src/3rdparty/zlib/gzwrite.c b/src/3rdparty/zlib/gzwrite.c<br/>new file mode 100644<br/>index 0000000..e8defc6<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/gzwrite.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/gzwrite.c</a></div><div class='hunk'>@@ -0,0 +1,531 @@</div><div class='add'>+/* gzwrite.c -- zlib functions for writing gzip files</div><div class='add'>+ * Copyright (C) 2004, 2005, 2010 Mark Adler</div><div class='add'>+ * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "gzguts.h"</div><div class='add'>+</div><div class='add'>+/* Local functions */</div><div class='add'>+local int gz_init OF((gz_statep));</div><div class='add'>+local int gz_comp OF((gz_statep, int));</div><div class='add'>+local int gz_zero OF((gz_statep, z_off64_t));</div><div class='add'>+</div><div class='add'>+/* Initialize state for writing a gzip file.  Mark initialization by setting</div><div class='add'>+   state-&gt;size to non-zero.  Return -1 on failure or 0 on success. */</div><div class='add'>+local int gz_init(state)</div><div class='add'>+    gz_statep state;</div><div class='add'>+{</div><div class='add'>+    int ret;</div><div class='add'>+    z_streamp strm = &amp;(state-&gt;strm);</div><div class='add'>+</div><div class='add'>+    /* allocate input and output buffers */</div><div class='add'>+    state-&gt;in = malloc(state-&gt;want);</div><div class='add'>+    state-&gt;out = malloc(state-&gt;want);</div><div class='add'>+    if (state-&gt;in == NULL || state-&gt;out == NULL) {</div><div class='add'>+        if (state-&gt;out != NULL)</div><div class='add'>+            free(state-&gt;out);</div><div class='add'>+        if (state-&gt;in != NULL)</div><div class='add'>+            free(state-&gt;in);</div><div class='add'>+        gz_error(state, Z_MEM_ERROR, "out of memory");</div><div class='add'>+        return -1;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* allocate deflate memory, set up for gzip compression */</div><div class='add'>+    strm-&gt;zalloc = Z_NULL;</div><div class='add'>+    strm-&gt;zfree = Z_NULL;</div><div class='add'>+    strm-&gt;opaque = Z_NULL;</div><div class='add'>+    ret = deflateInit2(strm, state-&gt;level, Z_DEFLATED,</div><div class='add'>+                       15 + 16, 8, state-&gt;strategy);</div><div class='add'>+    if (ret != Z_OK) {</div><div class='add'>+        free(state-&gt;in);</div><div class='add'>+        gz_error(state, Z_MEM_ERROR, "out of memory");</div><div class='add'>+        return -1;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* mark state as initialized */</div><div class='add'>+    state-&gt;size = state-&gt;want;</div><div class='add'>+</div><div class='add'>+    /* initialize write buffer */</div><div class='add'>+    strm-&gt;avail_out = state-&gt;size;</div><div class='add'>+    strm-&gt;next_out = state-&gt;out;</div><div class='add'>+    state-&gt;next = strm-&gt;next_out;</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Compress whatever is at avail_in and next_in and write to the output file.</div><div class='add'>+   Return -1 if there is an error writing to the output file, otherwise 0.</div><div class='add'>+   flush is assumed to be a valid deflate() flush value.  If flush is Z_FINISH,</div><div class='add'>+   then the deflate() state is reset to start a new gzip stream. */</div><div class='add'>+local int gz_comp(state, flush)</div><div class='add'>+    gz_statep state;</div><div class='add'>+    int flush;</div><div class='add'>+{</div><div class='add'>+    int ret, got;</div><div class='add'>+    unsigned have;</div><div class='add'>+    z_streamp strm = &amp;(state-&gt;strm);</div><div class='add'>+</div><div class='add'>+    /* allocate memory if this is the first time through */</div><div class='add'>+    if (state-&gt;size == 0 &amp;&amp; gz_init(state) == -1)</div><div class='add'>+        return -1;</div><div class='add'>+</div><div class='add'>+    /* run deflate() on provided input until it produces no more output */</div><div class='add'>+    ret = Z_OK;</div><div class='add'>+    do {</div><div class='add'>+        /* write out current buffer contents if full, or if flushing, but if</div><div class='add'>+           doing Z_FINISH then don't write until we get to Z_STREAM_END */</div><div class='add'>+        if (strm-&gt;avail_out == 0 || (flush != Z_NO_FLUSH &amp;&amp;</div><div class='add'>+            (flush != Z_FINISH || ret == Z_STREAM_END))) {</div><div class='add'>+            have = (unsigned)(strm-&gt;next_out - state-&gt;next);</div><div class='add'>+            if (have &amp;&amp; ((got = write(state-&gt;fd, state-&gt;next, have)) &lt; 0 ||</div><div class='add'>+                         (unsigned)got != have)) {</div><div class='add'>+                gz_error(state, Z_ERRNO, zstrerror());</div><div class='add'>+                return -1;</div><div class='add'>+            }</div><div class='add'>+            if (strm-&gt;avail_out == 0) {</div><div class='add'>+                strm-&gt;avail_out = state-&gt;size;</div><div class='add'>+                strm-&gt;next_out = state-&gt;out;</div><div class='add'>+            }</div><div class='add'>+            state-&gt;next = strm-&gt;next_out;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        /* compress */</div><div class='add'>+        have = strm-&gt;avail_out;</div><div class='add'>+        ret = deflate(strm, flush);</div><div class='add'>+        if (ret == Z_STREAM_ERROR) {</div><div class='add'>+            gz_error(state, Z_STREAM_ERROR,</div><div class='add'>+                      "internal error: deflate stream corrupt");</div><div class='add'>+            return -1;</div><div class='add'>+        }</div><div class='add'>+        have -= strm-&gt;avail_out;</div><div class='add'>+    } while (have);</div><div class='add'>+</div><div class='add'>+    /* if that completed a deflate stream, allow another to start */</div><div class='add'>+    if (flush == Z_FINISH)</div><div class='add'>+        deflateReset(strm);</div><div class='add'>+</div><div class='add'>+    /* all done, no errors */</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Compress len zeros to output.  Return -1 on error, 0 on success. */</div><div class='add'>+local int gz_zero(state, len)</div><div class='add'>+    gz_statep state;</div><div class='add'>+    z_off64_t len;</div><div class='add'>+{</div><div class='add'>+    int first;</div><div class='add'>+    unsigned n;</div><div class='add'>+    z_streamp strm = &amp;(state-&gt;strm);</div><div class='add'>+</div><div class='add'>+    /* consume whatever's left in the input buffer */</div><div class='add'>+    if (strm-&gt;avail_in &amp;&amp; gz_comp(state, Z_NO_FLUSH) == -1)</div><div class='add'>+        return -1;</div><div class='add'>+</div><div class='add'>+    /* compress len zeros (len guaranteed &gt; 0) */</div><div class='add'>+    first = 1;</div><div class='add'>+    while (len) {</div><div class='add'>+        n = GT_OFF(state-&gt;size) || (z_off64_t)state-&gt;size &gt; len ?</div><div class='add'>+            (unsigned)len : state-&gt;size;</div><div class='add'>+        if (first) {</div><div class='add'>+            memset(state-&gt;in, 0, n);</div><div class='add'>+            first = 0;</div><div class='add'>+        }</div><div class='add'>+        strm-&gt;avail_in = n;</div><div class='add'>+        strm-&gt;next_in = state-&gt;in;</div><div class='add'>+        state-&gt;pos += n;</div><div class='add'>+        if (gz_comp(state, Z_NO_FLUSH) == -1)</div><div class='add'>+            return -1;</div><div class='add'>+        len -= n;</div><div class='add'>+    }</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+int ZEXPORT gzwrite(file, buf, len)</div><div class='add'>+    gzFile file;</div><div class='add'>+    voidpc buf;</div><div class='add'>+    unsigned len;</div><div class='add'>+{</div><div class='add'>+    unsigned put = len;</div><div class='add'>+    unsigned n;</div><div class='add'>+    gz_statep state;</div><div class='add'>+    z_streamp strm;</div><div class='add'>+</div><div class='add'>+    /* get internal structure */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return 0;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+    strm = &amp;(state-&gt;strm);</div><div class='add'>+</div><div class='add'>+    /* check that we're writing and that there's no error */</div><div class='add'>+    if (state-&gt;mode != GZ_WRITE || state-&gt;err != Z_OK)</div><div class='add'>+        return 0;</div><div class='add'>+</div><div class='add'>+    /* since an int is returned, make sure len fits in one, otherwise return</div><div class='add'>+       with an error (this avoids the flaw in the interface) */</div><div class='add'>+    if ((int)len &lt; 0) {</div><div class='add'>+        gz_error(state, Z_BUF_ERROR, "requested length does not fit in int");</div><div class='add'>+        return 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* if len is zero, avoid unnecessary operations */</div><div class='add'>+    if (len == 0)</div><div class='add'>+        return 0;</div><div class='add'>+</div><div class='add'>+    /* allocate memory if this is the first time through */</div><div class='add'>+    if (state-&gt;size == 0 &amp;&amp; gz_init(state) == -1)</div><div class='add'>+        return 0;</div><div class='add'>+</div><div class='add'>+    /* check for seek request */</div><div class='add'>+    if (state-&gt;seek) {</div><div class='add'>+        state-&gt;seek = 0;</div><div class='add'>+        if (gz_zero(state, state-&gt;skip) == -1)</div><div class='add'>+            return 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* for small len, copy to input buffer, otherwise compress directly */</div><div class='add'>+    if (len &lt; state-&gt;size) {</div><div class='add'>+        /* copy to input buffer, compress when full */</div><div class='add'>+        do {</div><div class='add'>+            if (strm-&gt;avail_in == 0)</div><div class='add'>+                strm-&gt;next_in = state-&gt;in;</div><div class='add'>+            n = state-&gt;size - strm-&gt;avail_in;</div><div class='add'>+            if (n &gt; len)</div><div class='add'>+                n = len;</div><div class='add'>+            memcpy(strm-&gt;next_in + strm-&gt;avail_in, buf, n);</div><div class='add'>+            strm-&gt;avail_in += n;</div><div class='add'>+            state-&gt;pos += n;</div><div class='add'>+            buf = (char *)buf + n;</div><div class='add'>+            len -= n;</div><div class='add'>+            if (len &amp;&amp; gz_comp(state, Z_NO_FLUSH) == -1)</div><div class='add'>+                return 0;</div><div class='add'>+        } while (len);</div><div class='add'>+    }</div><div class='add'>+    else {</div><div class='add'>+        /* consume whatever's left in the input buffer */</div><div class='add'>+        if (strm-&gt;avail_in &amp;&amp; gz_comp(state, Z_NO_FLUSH) == -1)</div><div class='add'>+            return 0;</div><div class='add'>+</div><div class='add'>+        /* directly compress user buffer to file */</div><div class='add'>+        strm-&gt;avail_in = len;</div><div class='add'>+        strm-&gt;next_in = (voidp)buf;</div><div class='add'>+        state-&gt;pos += len;</div><div class='add'>+        if (gz_comp(state, Z_NO_FLUSH) == -1)</div><div class='add'>+            return 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* input was all buffered or compressed (put will fit in int) */</div><div class='add'>+    return (int)put;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+int ZEXPORT gzputc(file, c)</div><div class='add'>+    gzFile file;</div><div class='add'>+    int c;</div><div class='add'>+{</div><div class='add'>+    unsigned char buf[1];</div><div class='add'>+    gz_statep state;</div><div class='add'>+    z_streamp strm;</div><div class='add'>+</div><div class='add'>+    /* get internal structure */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return -1;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+    strm = &amp;(state-&gt;strm);</div><div class='add'>+</div><div class='add'>+    /* check that we're writing and that there's no error */</div><div class='add'>+    if (state-&gt;mode != GZ_WRITE || state-&gt;err != Z_OK)</div><div class='add'>+        return -1;</div><div class='add'>+</div><div class='add'>+    /* check for seek request */</div><div class='add'>+    if (state-&gt;seek) {</div><div class='add'>+        state-&gt;seek = 0;</div><div class='add'>+        if (gz_zero(state, state-&gt;skip) == -1)</div><div class='add'>+            return -1;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* try writing to input buffer for speed (state-&gt;size == 0 if buffer not</div><div class='add'>+       initialized) */</div><div class='add'>+    if (strm-&gt;avail_in &lt; state-&gt;size) {</div><div class='add'>+        if (strm-&gt;avail_in == 0)</div><div class='add'>+            strm-&gt;next_in = state-&gt;in;</div><div class='add'>+        strm-&gt;next_in[strm-&gt;avail_in++] = c;</div><div class='add'>+        state-&gt;pos++;</div><div class='add'>+        return c;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* no room in buffer or not initialized, use gz_write() */</div><div class='add'>+    buf[0] = c;</div><div class='add'>+    if (gzwrite(file, buf, 1) != 1)</div><div class='add'>+        return -1;</div><div class='add'>+    return c;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+int ZEXPORT gzputs(file, str)</div><div class='add'>+    gzFile file;</div><div class='add'>+    const char *str;</div><div class='add'>+{</div><div class='add'>+    int ret;</div><div class='add'>+    unsigned len;</div><div class='add'>+</div><div class='add'>+    /* write string */</div><div class='add'>+    len = (unsigned)strlen(str);</div><div class='add'>+    ret = gzwrite(file, str, len);</div><div class='add'>+    return ret == 0 &amp;&amp; len != 0 ? -1 : ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef STDC</div><div class='add'>+#include &lt;stdarg.h&gt;</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+int ZEXPORTVA gzprintf (gzFile file, const char *format, ...)</div><div class='add'>+{</div><div class='add'>+    int size, len;</div><div class='add'>+    gz_statep state;</div><div class='add'>+    z_streamp strm;</div><div class='add'>+    va_list va;</div><div class='add'>+</div><div class='add'>+    /* get internal structure */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return -1;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+    strm = &amp;(state-&gt;strm);</div><div class='add'>+</div><div class='add'>+    /* check that we're writing and that there's no error */</div><div class='add'>+    if (state-&gt;mode != GZ_WRITE || state-&gt;err != Z_OK)</div><div class='add'>+        return 0;</div><div class='add'>+</div><div class='add'>+    /* make sure we have some buffer space */</div><div class='add'>+    if (state-&gt;size == 0 &amp;&amp; gz_init(state) == -1)</div><div class='add'>+        return 0;</div><div class='add'>+</div><div class='add'>+    /* check for seek request */</div><div class='add'>+    if (state-&gt;seek) {</div><div class='add'>+        state-&gt;seek = 0;</div><div class='add'>+        if (gz_zero(state, state-&gt;skip) == -1)</div><div class='add'>+            return 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* consume whatever's left in the input buffer */</div><div class='add'>+    if (strm-&gt;avail_in &amp;&amp; gz_comp(state, Z_NO_FLUSH) == -1)</div><div class='add'>+        return 0;</div><div class='add'>+</div><div class='add'>+    /* do the printf() into the input buffer, put length in len */</div><div class='add'>+    size = (int)(state-&gt;size);</div><div class='add'>+    state-&gt;in[size - 1] = 0;</div><div class='add'>+    va_start(va, format);</div><div class='add'>+#ifdef NO_vsnprintf</div><div class='add'>+#  ifdef HAS_vsprintf_void</div><div class='add'>+    (void)vsprintf(state-&gt;in, format, va);</div><div class='add'>+    va_end(va);</div><div class='add'>+    for (len = 0; len &lt; size; len++)</div><div class='add'>+        if (state-&gt;in[len] == 0) break;</div><div class='add'>+#  else</div><div class='add'>+    len = vsprintf(state-&gt;in, format, va);</div><div class='add'>+    va_end(va);</div><div class='add'>+#  endif</div><div class='add'>+#else</div><div class='add'>+#  ifdef HAS_vsnprintf_void</div><div class='add'>+    (void)vsnprintf(state-&gt;in, size, format, va);</div><div class='add'>+    va_end(va);</div><div class='add'>+    len = strlen(state-&gt;in);</div><div class='add'>+#  else</div><div class='add'>+    len = vsnprintf((char *)(state-&gt;in), size, format, va);</div><div class='add'>+    va_end(va);</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    /* check that printf() results fit in buffer */</div><div class='add'>+    if (len &lt;= 0 || len &gt;= (int)size || state-&gt;in[size - 1] != 0)</div><div class='add'>+        return 0;</div><div class='add'>+</div><div class='add'>+    /* update buffer and position, defer compression until needed */</div><div class='add'>+    strm-&gt;avail_in = (unsigned)len;</div><div class='add'>+    strm-&gt;next_in = state-&gt;in;</div><div class='add'>+    state-&gt;pos += len;</div><div class='add'>+    return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else /* !STDC */</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,</div><div class='add'>+                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)</div><div class='add'>+    gzFile file;</div><div class='add'>+    const char *format;</div><div class='add'>+    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,</div><div class='add'>+        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;</div><div class='add'>+{</div><div class='add'>+    int size, len;</div><div class='add'>+    gz_statep state;</div><div class='add'>+    z_streamp strm;</div><div class='add'>+</div><div class='add'>+    /* get internal structure */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return -1;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+    strm = &amp;(state-&gt;strm);</div><div class='add'>+</div><div class='add'>+    /* check that we're writing and that there's no error */</div><div class='add'>+    if (state-&gt;mode != GZ_WRITE || state-&gt;err != Z_OK)</div><div class='add'>+        return 0;</div><div class='add'>+</div><div class='add'>+    /* make sure we have some buffer space */</div><div class='add'>+    if (state-&gt;size == 0 &amp;&amp; gz_init(state) == -1)</div><div class='add'>+        return 0;</div><div class='add'>+</div><div class='add'>+    /* check for seek request */</div><div class='add'>+    if (state-&gt;seek) {</div><div class='add'>+        state-&gt;seek = 0;</div><div class='add'>+        if (gz_zero(state, state-&gt;skip) == -1)</div><div class='add'>+            return 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* consume whatever's left in the input buffer */</div><div class='add'>+    if (strm-&gt;avail_in &amp;&amp; gz_comp(state, Z_NO_FLUSH) == -1)</div><div class='add'>+        return 0;</div><div class='add'>+</div><div class='add'>+    /* do the printf() into the input buffer, put length in len */</div><div class='add'>+    size = (int)(state-&gt;size);</div><div class='add'>+    state-&gt;in[size - 1] = 0;</div><div class='add'>+#ifdef NO_snprintf</div><div class='add'>+#  ifdef HAS_sprintf_void</div><div class='add'>+    sprintf(state-&gt;in, format, a1, a2, a3, a4, a5, a6, a7, a8,</div><div class='add'>+            a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);</div><div class='add'>+    for (len = 0; len &lt; size; len++)</div><div class='add'>+        if (state-&gt;in[len] == 0) break;</div><div class='add'>+#  else</div><div class='add'>+    len = sprintf(state-&gt;in, format, a1, a2, a3, a4, a5, a6, a7, a8,</div><div class='add'>+                a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);</div><div class='add'>+#  endif</div><div class='add'>+#else</div><div class='add'>+#  ifdef HAS_snprintf_void</div><div class='add'>+    snprintf(state-&gt;in, size, format, a1, a2, a3, a4, a5, a6, a7, a8,</div><div class='add'>+             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);</div><div class='add'>+    len = strlen(state-&gt;in);</div><div class='add'>+#  else</div><div class='add'>+    len = snprintf(state-&gt;in, size, format, a1, a2, a3, a4, a5, a6, a7, a8,</div><div class='add'>+                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    /* check that printf() results fit in buffer */</div><div class='add'>+    if (len &lt;= 0 || len &gt;= (int)size || state-&gt;in[size - 1] != 0)</div><div class='add'>+        return 0;</div><div class='add'>+</div><div class='add'>+    /* update buffer and position, defer compression until needed */</div><div class='add'>+    strm-&gt;avail_in = (unsigned)len;</div><div class='add'>+    strm-&gt;next_in = state-&gt;in;</div><div class='add'>+    state-&gt;pos += len;</div><div class='add'>+    return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+int ZEXPORT gzflush(file, flush)</div><div class='add'>+    gzFile file;</div><div class='add'>+    int flush;</div><div class='add'>+{</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    /* get internal structure */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return -1;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+</div><div class='add'>+    /* check that we're writing and that there's no error */</div><div class='add'>+    if (state-&gt;mode != GZ_WRITE || state-&gt;err != Z_OK)</div><div class='add'>+        return Z_STREAM_ERROR;</div><div class='add'>+</div><div class='add'>+    /* check flush parameter */</div><div class='add'>+    if (flush &lt; 0 || flush &gt; Z_FINISH)</div><div class='add'>+        return Z_STREAM_ERROR;</div><div class='add'>+</div><div class='add'>+    /* check for seek request */</div><div class='add'>+    if (state-&gt;seek) {</div><div class='add'>+        state-&gt;seek = 0;</div><div class='add'>+        if (gz_zero(state, state-&gt;skip) == -1)</div><div class='add'>+            return -1;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* compress remaining data with requested flush */</div><div class='add'>+    gz_comp(state, flush);</div><div class='add'>+    return state-&gt;err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+int ZEXPORT gzsetparams(file, level, strategy)</div><div class='add'>+    gzFile file;</div><div class='add'>+    int level;</div><div class='add'>+    int strategy;</div><div class='add'>+{</div><div class='add'>+    gz_statep state;</div><div class='add'>+    z_streamp strm;</div><div class='add'>+</div><div class='add'>+    /* get internal structure */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return Z_STREAM_ERROR;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+    strm = &amp;(state-&gt;strm);</div><div class='add'>+</div><div class='add'>+    /* check that we're writing and that there's no error */</div><div class='add'>+    if (state-&gt;mode != GZ_WRITE || state-&gt;err != Z_OK)</div><div class='add'>+        return Z_STREAM_ERROR;</div><div class='add'>+</div><div class='add'>+    /* if no change is requested, then do nothing */</div><div class='add'>+    if (level == state-&gt;level &amp;&amp; strategy == state-&gt;strategy)</div><div class='add'>+        return Z_OK;</div><div class='add'>+</div><div class='add'>+    /* check for seek request */</div><div class='add'>+    if (state-&gt;seek) {</div><div class='add'>+        state-&gt;seek = 0;</div><div class='add'>+        if (gz_zero(state, state-&gt;skip) == -1)</div><div class='add'>+            return -1;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* change compression parameters for subsequent input */</div><div class='add'>+    if (state-&gt;size) {</div><div class='add'>+        /* flush previous input with previous parameters before changing */</div><div class='add'>+        if (strm-&gt;avail_in &amp;&amp; gz_comp(state, Z_PARTIAL_FLUSH) == -1)</div><div class='add'>+            return state-&gt;err;</div><div class='add'>+        deflateParams(strm, level, strategy);</div><div class='add'>+    }</div><div class='add'>+    state-&gt;level = level;</div><div class='add'>+    state-&gt;strategy = strategy;</div><div class='add'>+    return Z_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* -- see zlib.h -- */</div><div class='add'>+int ZEXPORT gzclose_w(file)</div><div class='add'>+    gzFile file;</div><div class='add'>+{</div><div class='add'>+    int ret = 0;</div><div class='add'>+    gz_statep state;</div><div class='add'>+</div><div class='add'>+    /* get internal structure */</div><div class='add'>+    if (file == NULL)</div><div class='add'>+        return Z_STREAM_ERROR;</div><div class='add'>+    state = (gz_statep)file;</div><div class='add'>+</div><div class='add'>+    /* check that we're writing */</div><div class='add'>+    if (state-&gt;mode != GZ_WRITE)</div><div class='add'>+        return Z_STREAM_ERROR;</div><div class='add'>+</div><div class='add'>+    /* check for seek request */</div><div class='add'>+    if (state-&gt;seek) {</div><div class='add'>+        state-&gt;seek = 0;</div><div class='add'>+        ret += gz_zero(state, state-&gt;skip);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* flush, free memory, and close file */</div><div class='add'>+    ret += gz_comp(state, Z_FINISH);</div><div class='add'>+    (void)deflateEnd(&amp;(state-&gt;strm));</div><div class='add'>+    free(state-&gt;out);</div><div class='add'>+    free(state-&gt;in);</div><div class='add'>+    gz_error(state, Z_OK, NULL);</div><div class='add'>+    free(state-&gt;path);</div><div class='add'>+    ret += close(state-&gt;fd);</div><div class='add'>+    free(state);</div><div class='add'>+    return ret ? Z_ERRNO : Z_OK;</div><div class='add'>+}</div><div class='head'>diff --git a/src/3rdparty/zlib/infback.c b/src/3rdparty/zlib/infback.c<br/>index 455dbc9..af3a8c9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/infback.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/infback.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/infback.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/infback.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* infback.c -- inflate using a call-back interface</div><div class='del'>- * Copyright (C) 1995-2005 Mark Adler</div><div class='add'>+ * Copyright (C) 1995-2009 Mark Adler</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -55,7 +55,7 @@ int stream_size;</div><div class='ctx'>     state-&gt;wbits = windowBits;</div><div class='ctx'>     state-&gt;wsize = 1U &lt;&lt; windowBits;</div><div class='ctx'>     state-&gt;window = window;</div><div class='del'>-    state-&gt;write = 0;</div><div class='add'>+    state-&gt;wnext = 0;</div><div class='ctx'>     state-&gt;whave = 0;</div><div class='ctx'>     return Z_OK;</div><div class='ctx'> }</div><div class='hunk'>@@ -253,7 +253,7 @@ void FAR *out_desc;</div><div class='ctx'>     unsigned bits;              /* bits in bit buffer */</div><div class='ctx'>     unsigned copy;              /* number of stored or match bytes to copy */</div><div class='ctx'>     unsigned char FAR *from;    /* where to copy match bytes from */</div><div class='del'>-    code this;                  /* current decoding table entry */</div><div class='add'>+    code here;                  /* current decoding table entry */</div><div class='ctx'>     code last;                  /* parent table entry */</div><div class='ctx'>     unsigned len;               /* length to copy for repeats, bits to drop */</div><div class='ctx'>     int ret;                    /* return code */</div><div class='hunk'>@@ -389,19 +389,19 @@ void FAR *out_desc;</div><div class='ctx'>             state-&gt;have = 0;</div><div class='ctx'>             while (state-&gt;have &lt; state-&gt;nlen + state-&gt;ndist) {</div><div class='ctx'>                 for (;;) {</div><div class='del'>-                    this = state-&gt;lencode[BITS(state-&gt;lenbits)];</div><div class='del'>-                    if ((unsigned)(this.bits) &lt;= bits) break;</div><div class='add'>+                    here = state-&gt;lencode[BITS(state-&gt;lenbits)];</div><div class='add'>+                    if ((unsigned)(here.bits) &lt;= bits) break;</div><div class='ctx'>                     PULLBYTE();</div><div class='ctx'>                 }</div><div class='del'>-                if (this.val &lt; 16) {</div><div class='del'>-                    NEEDBITS(this.bits);</div><div class='del'>-                    DROPBITS(this.bits);</div><div class='del'>-                    state-&gt;lens[state-&gt;have++] = this.val;</div><div class='add'>+                if (here.val &lt; 16) {</div><div class='add'>+                    NEEDBITS(here.bits);</div><div class='add'>+                    DROPBITS(here.bits);</div><div class='add'>+                    state-&gt;lens[state-&gt;have++] = here.val;</div><div class='ctx'>                 }</div><div class='ctx'>                 else {</div><div class='del'>-                    if (this.val == 16) {</div><div class='del'>-                        NEEDBITS(this.bits + 2);</div><div class='del'>-                        DROPBITS(this.bits);</div><div class='add'>+                    if (here.val == 16) {</div><div class='add'>+                        NEEDBITS(here.bits + 2);</div><div class='add'>+                        DROPBITS(here.bits);</div><div class='ctx'>                         if (state-&gt;have == 0) {</div><div class='ctx'>                             strm-&gt;msg = (char *)"invalid bit length repeat";</div><div class='ctx'>                             state-&gt;mode = BAD;</div><div class='hunk'>@@ -411,16 +411,16 @@ void FAR *out_desc;</div><div class='ctx'>                         copy = 3 + BITS(2);</div><div class='ctx'>                         DROPBITS(2);</div><div class='ctx'>                     }</div><div class='del'>-                    else if (this.val == 17) {</div><div class='del'>-                        NEEDBITS(this.bits + 3);</div><div class='del'>-                        DROPBITS(this.bits);</div><div class='add'>+                    else if (here.val == 17) {</div><div class='add'>+                        NEEDBITS(here.bits + 3);</div><div class='add'>+                        DROPBITS(here.bits);</div><div class='ctx'>                         len = 0;</div><div class='ctx'>                         copy = 3 + BITS(3);</div><div class='ctx'>                         DROPBITS(3);</div><div class='ctx'>                     }</div><div class='ctx'>                     else {</div><div class='del'>-                        NEEDBITS(this.bits + 7);</div><div class='del'>-                        DROPBITS(this.bits);</div><div class='add'>+                        NEEDBITS(here.bits + 7);</div><div class='add'>+                        DROPBITS(here.bits);</div><div class='ctx'>                         len = 0;</div><div class='ctx'>                         copy = 11 + BITS(7);</div><div class='ctx'>                         DROPBITS(7);</div><div class='hunk'>@@ -438,7 +438,16 @@ void FAR *out_desc;</div><div class='ctx'>             /* handle error breaks in while */</div><div class='ctx'>             if (state-&gt;mode == BAD) break;</div><div class='ctx'> </div><div class='del'>-            /* build code tables */</div><div class='add'>+            /* check for end-of-block code (better have one) */</div><div class='add'>+            if (state-&gt;lens[256] == 0) {</div><div class='add'>+                strm-&gt;msg = (char *)"invalid code -- missing end-of-block";</div><div class='add'>+                state-&gt;mode = BAD;</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            /* build code tables -- note: do not change the lenbits or distbits</div><div class='add'>+               values here (9 and 6) without reading the comments in inftrees.h</div><div class='add'>+               concerning the ENOUGH constants, which depend on those values */</div><div class='ctx'>             state-&gt;next = state-&gt;codes;</div><div class='ctx'>             state-&gt;lencode = (code const FAR *)(state-&gt;next);</div><div class='ctx'>             state-&gt;lenbits = 9;</div><div class='hunk'>@@ -474,28 +483,28 @@ void FAR *out_desc;</div><div class='ctx'> </div><div class='ctx'>             /* get a literal, length, or end-of-block code */</div><div class='ctx'>             for (;;) {</div><div class='del'>-                this = state-&gt;lencode[BITS(state-&gt;lenbits)];</div><div class='del'>-                if ((unsigned)(this.bits) &lt;= bits) break;</div><div class='add'>+                here = state-&gt;lencode[BITS(state-&gt;lenbits)];</div><div class='add'>+                if ((unsigned)(here.bits) &lt;= bits) break;</div><div class='ctx'>                 PULLBYTE();</div><div class='ctx'>             }</div><div class='del'>-            if (this.op &amp;&amp; (this.op &amp; 0xf0) == 0) {</div><div class='del'>-                last = this;</div><div class='add'>+            if (here.op &amp;&amp; (here.op &amp; 0xf0) == 0) {</div><div class='add'>+                last = here;</div><div class='ctx'>                 for (;;) {</div><div class='del'>-                    this = state-&gt;lencode[last.val +</div><div class='add'>+                    here = state-&gt;lencode[last.val +</div><div class='ctx'>                             (BITS(last.bits + last.op) &gt;&gt; last.bits)];</div><div class='del'>-                    if ((unsigned)(last.bits + this.bits) &lt;= bits) break;</div><div class='add'>+                    if ((unsigned)(last.bits + here.bits) &lt;= bits) break;</div><div class='ctx'>                     PULLBYTE();</div><div class='ctx'>                 }</div><div class='ctx'>                 DROPBITS(last.bits);</div><div class='ctx'>             }</div><div class='del'>-            DROPBITS(this.bits);</div><div class='del'>-            state-&gt;length = (unsigned)this.val;</div><div class='add'>+            DROPBITS(here.bits);</div><div class='add'>+            state-&gt;length = (unsigned)here.val;</div><div class='ctx'> </div><div class='ctx'>             /* process literal */</div><div class='del'>-            if (this.op == 0) {</div><div class='del'>-                Tracevv((stderr, this.val &gt;= 0x20 &amp;&amp; this.val &lt; 0x7f ?</div><div class='add'>+            if (here.op == 0) {</div><div class='add'>+                Tracevv((stderr, here.val &gt;= 0x20 &amp;&amp; here.val &lt; 0x7f ?</div><div class='ctx'>                         "inflate:         literal '%c'\n" :</div><div class='del'>-                        "inflate:         literal 0x%02x\n", this.val));</div><div class='add'>+                        "inflate:         literal 0x%02x\n", here.val));</div><div class='ctx'>                 ROOM();</div><div class='ctx'>                 *put++ = (unsigned char)(state-&gt;length);</div><div class='ctx'>                 left--;</div><div class='hunk'>@@ -504,21 +513,21 @@ void FAR *out_desc;</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'>             /* process end of block */</div><div class='del'>-            if (this.op &amp; 32) {</div><div class='add'>+            if (here.op &amp; 32) {</div><div class='ctx'>                 Tracevv((stderr, "inflate:         end of block\n"));</div><div class='ctx'>                 state-&gt;mode = TYPE;</div><div class='ctx'>                 break;</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'>             /* invalid code */</div><div class='del'>-            if (this.op &amp; 64) {</div><div class='add'>+            if (here.op &amp; 64) {</div><div class='ctx'>                 strm-&gt;msg = (char *)"invalid literal/length code";</div><div class='ctx'>                 state-&gt;mode = BAD;</div><div class='ctx'>                 break;</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'>             /* length code -- get extra bits, if any */</div><div class='del'>-            state-&gt;extra = (unsigned)(this.op) &amp; 15;</div><div class='add'>+            state-&gt;extra = (unsigned)(here.op) &amp; 15;</div><div class='ctx'>             if (state-&gt;extra != 0) {</div><div class='ctx'>                 NEEDBITS(state-&gt;extra);</div><div class='ctx'>                 state-&gt;length += BITS(state-&gt;extra);</div><div class='hunk'>@@ -528,30 +537,30 @@ void FAR *out_desc;</div><div class='ctx'> </div><div class='ctx'>             /* get distance code */</div><div class='ctx'>             for (;;) {</div><div class='del'>-                this = state-&gt;distcode[BITS(state-&gt;distbits)];</div><div class='del'>-                if ((unsigned)(this.bits) &lt;= bits) break;</div><div class='add'>+                here = state-&gt;distcode[BITS(state-&gt;distbits)];</div><div class='add'>+                if ((unsigned)(here.bits) &lt;= bits) break;</div><div class='ctx'>                 PULLBYTE();</div><div class='ctx'>             }</div><div class='del'>-            if ((this.op &amp; 0xf0) == 0) {</div><div class='del'>-                last = this;</div><div class='add'>+            if ((here.op &amp; 0xf0) == 0) {</div><div class='add'>+                last = here;</div><div class='ctx'>                 for (;;) {</div><div class='del'>-                    this = state-&gt;distcode[last.val +</div><div class='add'>+                    here = state-&gt;distcode[last.val +</div><div class='ctx'>                             (BITS(last.bits + last.op) &gt;&gt; last.bits)];</div><div class='del'>-                    if ((unsigned)(last.bits + this.bits) &lt;= bits) break;</div><div class='add'>+                    if ((unsigned)(last.bits + here.bits) &lt;= bits) break;</div><div class='ctx'>                     PULLBYTE();</div><div class='ctx'>                 }</div><div class='ctx'>                 DROPBITS(last.bits);</div><div class='ctx'>             }</div><div class='del'>-            DROPBITS(this.bits);</div><div class='del'>-            if (this.op &amp; 64) {</div><div class='add'>+            DROPBITS(here.bits);</div><div class='add'>+            if (here.op &amp; 64) {</div><div class='ctx'>                 strm-&gt;msg = (char *)"invalid distance code";</div><div class='ctx'>                 state-&gt;mode = BAD;</div><div class='ctx'>                 break;</div><div class='ctx'>             }</div><div class='del'>-            state-&gt;offset = (unsigned)this.val;</div><div class='add'>+            state-&gt;offset = (unsigned)here.val;</div><div class='ctx'> </div><div class='ctx'>             /* get distance extra bits, if any */</div><div class='del'>-            state-&gt;extra = (unsigned)(this.op) &amp; 15;</div><div class='add'>+            state-&gt;extra = (unsigned)(here.op) &amp; 15;</div><div class='ctx'>             if (state-&gt;extra != 0) {</div><div class='ctx'>                 NEEDBITS(state-&gt;extra);</div><div class='ctx'>                 state-&gt;offset += BITS(state-&gt;extra);</div><div class='head'>diff --git a/src/3rdparty/zlib/inffast.c b/src/3rdparty/zlib/inffast.c<br/>index bbee92e..2f1d60b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/inffast.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/inffast.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/inffast.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/inffast.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* inffast.c -- fast decoding</div><div class='del'>- * Copyright (C) 1995-2004 Mark Adler</div><div class='add'>+ * Copyright (C) 1995-2008, 2010 Mark Adler</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -64,7 +64,7 @@</div><div class='ctx'>       requires strm-&gt;avail_out &gt;= 258 for each loop to avoid checking for</div><div class='ctx'>       output space.</div><div class='ctx'>  */</div><div class='del'>-void inflate_fast(strm, start)</div><div class='add'>+void ZLIB_INTERNAL inflate_fast(strm, start)</div><div class='ctx'> z_streamp strm;</div><div class='ctx'> unsigned start;         /* inflate()'s starting value for strm-&gt;avail_out */</div><div class='ctx'> {</div><div class='hunk'>@@ -79,7 +79,7 @@ unsigned start;         /* inflate()'s starting value for strm-&gt;avail_out */</div><div class='ctx'> #endif</div><div class='ctx'>     unsigned wsize;             /* window size or zero if not using window */</div><div class='ctx'>     unsigned whave;             /* valid bytes in the window */</div><div class='del'>-    unsigned write;             /* window write index */</div><div class='add'>+    unsigned wnext;             /* window write index */</div><div class='ctx'>     unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */</div><div class='ctx'>     unsigned long hold;         /* local strm-&gt;hold */</div><div class='ctx'>     unsigned bits;              /* local strm-&gt;bits */</div><div class='hunk'>@@ -87,7 +87,7 @@ unsigned start;         /* inflate()'s starting value for strm-&gt;avail_out */</div><div class='ctx'>     code const FAR *dcode;      /* local strm-&gt;distcode */</div><div class='ctx'>     unsigned lmask;             /* mask for first level of length codes */</div><div class='ctx'>     unsigned dmask;             /* mask for first level of distance codes */</div><div class='del'>-    code this;                  /* retrieved table entry */</div><div class='add'>+    code here;                  /* retrieved table entry */</div><div class='ctx'>     unsigned op;                /* code bits, operation, extra bits, or */</div><div class='ctx'>                                 /*  window position, window bytes to copy */</div><div class='ctx'>     unsigned len;               /* match length, unused bytes */</div><div class='hunk'>@@ -106,7 +106,7 @@ unsigned start;         /* inflate()'s starting value for strm-&gt;avail_out */</div><div class='ctx'> #endif</div><div class='ctx'>     wsize = state-&gt;wsize;</div><div class='ctx'>     whave = state-&gt;whave;</div><div class='del'>-    write = state-&gt;write;</div><div class='add'>+    wnext = state-&gt;wnext;</div><div class='ctx'>     window = state-&gt;window;</div><div class='ctx'>     hold = state-&gt;hold;</div><div class='ctx'>     bits = state-&gt;bits;</div><div class='hunk'>@@ -124,20 +124,20 @@ unsigned start;         /* inflate()'s starting value for strm-&gt;avail_out */</div><div class='ctx'>             hold += (unsigned long)(PUP(in)) &lt;&lt; bits;</div><div class='ctx'>             bits += 8;</div><div class='ctx'>         }</div><div class='del'>-        this = lcode[hold &amp; lmask];</div><div class='add'>+        here = lcode[hold &amp; lmask];</div><div class='ctx'>       dolen:</div><div class='del'>-        op = (unsigned)(this.bits);</div><div class='add'>+        op = (unsigned)(here.bits);</div><div class='ctx'>         hold &gt;&gt;= op;</div><div class='ctx'>         bits -= op;</div><div class='del'>-        op = (unsigned)(this.op);</div><div class='add'>+        op = (unsigned)(here.op);</div><div class='ctx'>         if (op == 0) {                          /* literal */</div><div class='del'>-            Tracevv((stderr, this.val &gt;= 0x20 &amp;&amp; this.val &lt; 0x7f ?</div><div class='add'>+            Tracevv((stderr, here.val &gt;= 0x20 &amp;&amp; here.val &lt; 0x7f ?</div><div class='ctx'>                     "inflate:         literal '%c'\n" :</div><div class='del'>-                    "inflate:         literal 0x%02x\n", this.val));</div><div class='del'>-            PUP(out) = (unsigned char)(this.val);</div><div class='add'>+                    "inflate:         literal 0x%02x\n", here.val));</div><div class='add'>+            PUP(out) = (unsigned char)(here.val);</div><div class='ctx'>         }</div><div class='ctx'>         else if (op &amp; 16) {                     /* length base */</div><div class='del'>-            len = (unsigned)(this.val);</div><div class='add'>+            len = (unsigned)(here.val);</div><div class='ctx'>             op &amp;= 15;                           /* number of extra bits */</div><div class='ctx'>             if (op) {</div><div class='ctx'>                 if (bits &lt; op) {</div><div class='hunk'>@@ -155,14 +155,14 @@ unsigned start;         /* inflate()'s starting value for strm-&gt;avail_out */</div><div class='ctx'>                 hold += (unsigned long)(PUP(in)) &lt;&lt; bits;</div><div class='ctx'>                 bits += 8;</div><div class='ctx'>             }</div><div class='del'>-            this = dcode[hold &amp; dmask];</div><div class='add'>+            here = dcode[hold &amp; dmask];</div><div class='ctx'>           dodist:</div><div class='del'>-            op = (unsigned)(this.bits);</div><div class='add'>+            op = (unsigned)(here.bits);</div><div class='ctx'>             hold &gt;&gt;= op;</div><div class='ctx'>             bits -= op;</div><div class='del'>-            op = (unsigned)(this.op);</div><div class='add'>+            op = (unsigned)(here.op);</div><div class='ctx'>             if (op &amp; 16) {                      /* distance base */</div><div class='del'>-                dist = (unsigned)(this.val);</div><div class='add'>+                dist = (unsigned)(here.val);</div><div class='ctx'>                 op &amp;= 15;                       /* number of extra bits */</div><div class='ctx'>                 if (bits &lt; op) {</div><div class='ctx'>                     hold += (unsigned long)(PUP(in)) &lt;&lt; bits;</div><div class='hunk'>@@ -187,12 +187,34 @@ unsigned start;         /* inflate()'s starting value for strm-&gt;avail_out */</div><div class='ctx'>                 if (dist &gt; op) {                /* see if copy from window */</div><div class='ctx'>                     op = dist - op;             /* distance back in window */</div><div class='ctx'>                     if (op &gt; whave) {</div><div class='del'>-                        strm-&gt;msg = (char *)"invalid distance too far back";</div><div class='del'>-                        state-&gt;mode = BAD;</div><div class='del'>-                        break;</div><div class='add'>+                        if (state-&gt;sane) {</div><div class='add'>+                            strm-&gt;msg =</div><div class='add'>+                                (char *)"invalid distance too far back";</div><div class='add'>+                            state-&gt;mode = BAD;</div><div class='add'>+                            break;</div><div class='add'>+                        }</div><div class='add'>+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR</div><div class='add'>+                        if (len &lt;= op - whave) {</div><div class='add'>+                            do {</div><div class='add'>+                                PUP(out) = 0;</div><div class='add'>+                            } while (--len);</div><div class='add'>+                            continue;</div><div class='add'>+                        }</div><div class='add'>+                        len -= op - whave;</div><div class='add'>+                        do {</div><div class='add'>+                            PUP(out) = 0;</div><div class='add'>+                        } while (--op &gt; whave);</div><div class='add'>+                        if (op == 0) {</div><div class='add'>+                            from = out - dist;</div><div class='add'>+                            do {</div><div class='add'>+                                PUP(out) = PUP(from);</div><div class='add'>+                            } while (--len);</div><div class='add'>+                            continue;</div><div class='add'>+                        }</div><div class='add'>+#endif</div><div class='ctx'>                     }</div><div class='ctx'>                     from = window - OFF;</div><div class='del'>-                    if (write == 0) {           /* very common case */</div><div class='add'>+                    if (wnext == 0) {           /* very common case */</div><div class='ctx'>                         from += wsize - op;</div><div class='ctx'>                         if (op &lt; len) {         /* some from window */</div><div class='ctx'>                             len -= op;</div><div class='hunk'>@@ -202,17 +224,17 @@ unsigned start;         /* inflate()'s starting value for strm-&gt;avail_out */</div><div class='ctx'>                             from = out - dist;  /* rest from output */</div><div class='ctx'>                         }</div><div class='ctx'>                     }</div><div class='del'>-                    else if (write &lt; op) {      /* wrap around window */</div><div class='del'>-                        from += wsize + write - op;</div><div class='del'>-                        op -= write;</div><div class='add'>+                    else if (wnext &lt; op) {      /* wrap around window */</div><div class='add'>+                        from += wsize + wnext - op;</div><div class='add'>+                        op -= wnext;</div><div class='ctx'>                         if (op &lt; len) {         /* some from end of window */</div><div class='ctx'>                             len -= op;</div><div class='ctx'>                             do {</div><div class='ctx'>                                 PUP(out) = PUP(from);</div><div class='ctx'>                             } while (--op);</div><div class='ctx'>                             from = window - OFF;</div><div class='del'>-                            if (write &lt; len) {  /* some from start of window */</div><div class='del'>-                                op = write;</div><div class='add'>+                            if (wnext &lt; len) {  /* some from start of window */</div><div class='add'>+                                op = wnext;</div><div class='ctx'>                                 len -= op;</div><div class='ctx'>                                 do {</div><div class='ctx'>                                     PUP(out) = PUP(from);</div><div class='hunk'>@@ -222,7 +244,7 @@ unsigned start;         /* inflate()'s starting value for strm-&gt;avail_out */</div><div class='ctx'>                         }</div><div class='ctx'>                     }</div><div class='ctx'>                     else {                      /* contiguous in window */</div><div class='del'>-                        from += write - op;</div><div class='add'>+                        from += wnext - op;</div><div class='ctx'>                         if (op &lt; len) {         /* some from window */</div><div class='ctx'>                             len -= op;</div><div class='ctx'>                             do {</div><div class='hunk'>@@ -259,7 +281,7 @@ unsigned start;         /* inflate()'s starting value for strm-&gt;avail_out */</div><div class='ctx'>                 }</div><div class='ctx'>             }</div><div class='ctx'>             else if ((op &amp; 64) == 0) {          /* 2nd level distance code */</div><div class='del'>-                this = dcode[this.val + (hold &amp; ((1U &lt;&lt; op) - 1))];</div><div class='add'>+                here = dcode[here.val + (hold &amp; ((1U &lt;&lt; op) - 1))];</div><div class='ctx'>                 goto dodist;</div><div class='ctx'>             }</div><div class='ctx'>             else {</div><div class='hunk'>@@ -269,7 +291,7 @@ unsigned start;         /* inflate()'s starting value for strm-&gt;avail_out */</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='ctx'>         else if ((op &amp; 64) == 0) {              /* 2nd level length code */</div><div class='del'>-            this = lcode[this.val + (hold &amp; ((1U &lt;&lt; op) - 1))];</div><div class='add'>+            here = lcode[here.val + (hold &amp; ((1U &lt;&lt; op) - 1))];</div><div class='ctx'>             goto dolen;</div><div class='ctx'>         }</div><div class='ctx'>         else if (op &amp; 32) {                     /* end-of-block */</div><div class='hunk'>@@ -305,7 +327,7 @@ unsigned start;         /* inflate()'s starting value for strm-&gt;avail_out */</div><div class='ctx'>    inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):</div><div class='ctx'>    - Using bit fields for code structure</div><div class='ctx'>    - Different op definition to avoid &amp; for extra bits (do &amp; for table bits)</div><div class='del'>-   - Three separate decoding do-loops for direct, window, and write == 0</div><div class='add'>+   - Three separate decoding do-loops for direct, window, and wnext == 0</div><div class='ctx'>    - Special case for distance &gt; 1 copies to do overlapped load and store copy</div><div class='ctx'>    - Explicit branch predictions (based on measured branch probabilities)</div><div class='ctx'>    - Deferring match copy and interspersed it with decoding subsequent codes</div><div class='head'>diff --git a/src/3rdparty/zlib/inffast.h b/src/3rdparty/zlib/inffast.h<br/>index 1e88d2d..e5c1aa4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/inffast.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/inffast.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/inffast.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/inffast.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* inffast.h -- header to use inffast.c</div><div class='del'>- * Copyright (C) 1995-2003 Mark Adler</div><div class='add'>+ * Copyright (C) 1995-2003, 2010 Mark Adler</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -8,4 +8,4 @@</div><div class='ctx'>    subject to change. Applications should only use zlib.h.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-void inflate_fast OF((z_streamp strm, unsigned start));</div><div class='add'>+void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));</div><div class='head'>diff --git a/src/3rdparty/zlib/inflate.c b/src/3rdparty/zlib/inflate.c<br/>index 792fdee..a8431ab 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/inflate.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/inflate.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/inflate.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/inflate.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* inflate.c -- zlib decompression</div><div class='del'>- * Copyright (C) 1995-2005 Mark Adler</div><div class='add'>+ * Copyright (C) 1995-2010 Mark Adler</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -45,7 +45,7 @@</div><div class='ctx'>  * - Rearrange window copies in inflate_fast() for speed and simplification</div><div class='ctx'>  * - Unroll last copy for window match in inflate_fast()</div><div class='ctx'>  * - Use local copies of window variables in inflate_fast() for speed</div><div class='del'>- * - Pull out common write == 0 case for speed in inflate_fast()</div><div class='add'>+ * - Pull out common wnext == 0 case for speed in inflate_fast()</div><div class='ctx'>  * - Make op and len in inflate_fast() unsigned for consistency</div><div class='ctx'>  * - Add FAR to lcode and dcode declarations in inflate_fast()</div><div class='ctx'>  * - Simplified bad distance check in inflate_fast()</div><div class='hunk'>@@ -117,28 +117,52 @@ z_streamp strm;</div><div class='ctx'>     state-&gt;head = Z_NULL;</div><div class='ctx'>     state-&gt;wsize = 0;</div><div class='ctx'>     state-&gt;whave = 0;</div><div class='del'>-    state-&gt;write = 0;</div><div class='add'>+    state-&gt;wnext = 0;</div><div class='ctx'>     state-&gt;hold = 0;</div><div class='ctx'>     state-&gt;bits = 0;</div><div class='ctx'>     state-&gt;lencode = state-&gt;distcode = state-&gt;next = state-&gt;codes;</div><div class='add'>+    state-&gt;sane = 1;</div><div class='add'>+    state-&gt;back = -1;</div><div class='ctx'>     Tracev((stderr, "inflate: reset\n"));</div><div class='ctx'>     return Z_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ZEXPORT inflatePrime(strm, bits, value)</div><div class='add'>+int ZEXPORT inflateReset2(strm, windowBits)</div><div class='ctx'> z_streamp strm;</div><div class='del'>-int bits;</div><div class='del'>-int value;</div><div class='add'>+int windowBits;</div><div class='ctx'> {</div><div class='add'>+    int wrap;</div><div class='ctx'>     struct inflate_state FAR *state;</div><div class='ctx'> </div><div class='add'>+    /* get the state */</div><div class='ctx'>     if (strm == Z_NULL || strm-&gt;state == Z_NULL) return Z_STREAM_ERROR;</div><div class='ctx'>     state = (struct inflate_state FAR *)strm-&gt;state;</div><div class='del'>-    if (bits &gt; 16 || state-&gt;bits + bits &gt; 32) return Z_STREAM_ERROR;</div><div class='del'>-    value &amp;= (1L &lt;&lt; bits) - 1;</div><div class='del'>-    state-&gt;hold += value &lt;&lt; state-&gt;bits;</div><div class='del'>-    state-&gt;bits += bits;</div><div class='del'>-    return Z_OK;</div><div class='add'>+</div><div class='add'>+    /* extract wrap request from windowBits parameter */</div><div class='add'>+    if (windowBits &lt; 0) {</div><div class='add'>+        wrap = 0;</div><div class='add'>+        windowBits = -windowBits;</div><div class='add'>+    }</div><div class='add'>+    else {</div><div class='add'>+        wrap = (windowBits &gt;&gt; 4) + 1;</div><div class='add'>+#ifdef GUNZIP</div><div class='add'>+        if (windowBits &lt; 48)</div><div class='add'>+            windowBits &amp;= 15;</div><div class='add'>+#endif</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* set number of window bits, free window if different */</div><div class='add'>+    if (windowBits &amp;&amp; (windowBits &lt; 8 || windowBits &gt; 15))</div><div class='add'>+        return Z_STREAM_ERROR;</div><div class='add'>+    if (state-&gt;window != Z_NULL &amp;&amp; state-&gt;wbits != (unsigned)windowBits) {</div><div class='add'>+        ZFREE(strm, state-&gt;window);</div><div class='add'>+        state-&gt;window = Z_NULL;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* update state and reset the rest of it */</div><div class='add'>+    state-&gt;wrap = wrap;</div><div class='add'>+    state-&gt;wbits = (unsigned)windowBits;</div><div class='add'>+    return inflateReset(strm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)</div><div class='hunk'>@@ -147,6 +171,7 @@ int windowBits;</div><div class='ctx'> const char *version;</div><div class='ctx'> int stream_size;</div><div class='ctx'> {</div><div class='add'>+    int ret;</div><div class='ctx'>     struct inflate_state FAR *state;</div><div class='ctx'> </div><div class='ctx'>     if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||</div><div class='hunk'>@@ -164,24 +189,13 @@ int stream_size;</div><div class='ctx'>     if (state == Z_NULL) return Z_MEM_ERROR;</div><div class='ctx'>     Tracev((stderr, "inflate: allocated\n"));</div><div class='ctx'>     strm-&gt;state = (struct internal_state FAR *)state;</div><div class='del'>-    if (windowBits &lt; 0) {</div><div class='del'>-        state-&gt;wrap = 0;</div><div class='del'>-        windowBits = -windowBits;</div><div class='del'>-    }</div><div class='del'>-    else {</div><div class='del'>-        state-&gt;wrap = (windowBits &gt;&gt; 4) + 1;</div><div class='del'>-#ifdef GUNZIP</div><div class='del'>-        if (windowBits &lt; 48) windowBits &amp;= 15;</div><div class='del'>-#endif</div><div class='del'>-    }</div><div class='del'>-    if (windowBits &lt; 8 || windowBits &gt; 15) {</div><div class='add'>+    state-&gt;window = Z_NULL;</div><div class='add'>+    ret = inflateReset2(strm, windowBits);</div><div class='add'>+    if (ret != Z_OK) {</div><div class='ctx'>         ZFREE(strm, state);</div><div class='ctx'>         strm-&gt;state = Z_NULL;</div><div class='del'>-        return Z_STREAM_ERROR;</div><div class='ctx'>     }</div><div class='del'>-    state-&gt;wbits = (unsigned)windowBits;</div><div class='del'>-    state-&gt;window = Z_NULL;</div><div class='del'>-    return inflateReset(strm);</div><div class='add'>+    return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ZEXPORT inflateInit_(strm, version, stream_size)</div><div class='hunk'>@@ -192,6 +206,27 @@ int stream_size;</div><div class='ctx'>     return inflateInit2_(strm, DEF_WBITS, version, stream_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int ZEXPORT inflatePrime(strm, bits, value)</div><div class='add'>+z_streamp strm;</div><div class='add'>+int bits;</div><div class='add'>+int value;</div><div class='add'>+{</div><div class='add'>+    struct inflate_state FAR *state;</div><div class='add'>+</div><div class='add'>+    if (strm == Z_NULL || strm-&gt;state == Z_NULL) return Z_STREAM_ERROR;</div><div class='add'>+    state = (struct inflate_state FAR *)strm-&gt;state;</div><div class='add'>+    if (bits &lt; 0) {</div><div class='add'>+        state-&gt;hold = 0;</div><div class='add'>+        state-&gt;bits = 0;</div><div class='add'>+        return Z_OK;</div><div class='add'>+    }</div><div class='add'>+    if (bits &gt; 16 || state-&gt;bits + bits &gt; 32) return Z_STREAM_ERROR;</div><div class='add'>+    value &amp;= (1L &lt;&lt; bits) - 1;</div><div class='add'>+    state-&gt;hold += value &lt;&lt; state-&gt;bits;</div><div class='add'>+    state-&gt;bits += bits;</div><div class='add'>+    return Z_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>    Return state with length and distance decoding tables and index sizes set to</div><div class='ctx'>    fixed code decoding.  Normally this returns fixed tables from inffixed.h.</div><div class='hunk'>@@ -340,7 +375,7 @@ unsigned out;</div><div class='ctx'>     /* if window not in use yet, initialize */</div><div class='ctx'>     if (state-&gt;wsize == 0) {</div><div class='ctx'>         state-&gt;wsize = 1U &lt;&lt; state-&gt;wbits;</div><div class='del'>-        state-&gt;write = 0;</div><div class='add'>+        state-&gt;wnext = 0;</div><div class='ctx'>         state-&gt;whave = 0;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='hunk'>@@ -348,22 +383,22 @@ unsigned out;</div><div class='ctx'>     copy = out - strm-&gt;avail_out;</div><div class='ctx'>     if (copy &gt;= state-&gt;wsize) {</div><div class='ctx'>         zmemcpy(state-&gt;window, strm-&gt;next_out - state-&gt;wsize, state-&gt;wsize);</div><div class='del'>-        state-&gt;write = 0;</div><div class='add'>+        state-&gt;wnext = 0;</div><div class='ctx'>         state-&gt;whave = state-&gt;wsize;</div><div class='ctx'>     }</div><div class='ctx'>     else {</div><div class='del'>-        dist = state-&gt;wsize - state-&gt;write;</div><div class='add'>+        dist = state-&gt;wsize - state-&gt;wnext;</div><div class='ctx'>         if (dist &gt; copy) dist = copy;</div><div class='del'>-        zmemcpy(state-&gt;window + state-&gt;write, strm-&gt;next_out - copy, dist);</div><div class='add'>+        zmemcpy(state-&gt;window + state-&gt;wnext, strm-&gt;next_out - copy, dist);</div><div class='ctx'>         copy -= dist;</div><div class='ctx'>         if (copy) {</div><div class='ctx'>             zmemcpy(state-&gt;window, strm-&gt;next_out - copy, copy);</div><div class='del'>-            state-&gt;write = copy;</div><div class='add'>+            state-&gt;wnext = copy;</div><div class='ctx'>             state-&gt;whave = state-&gt;wsize;</div><div class='ctx'>         }</div><div class='ctx'>         else {</div><div class='del'>-            state-&gt;write += dist;</div><div class='del'>-            if (state-&gt;write == state-&gt;wsize) state-&gt;write = 0;</div><div class='add'>+            state-&gt;wnext += dist;</div><div class='add'>+            if (state-&gt;wnext == state-&gt;wsize) state-&gt;wnext = 0;</div><div class='ctx'>             if (state-&gt;whave &lt; state-&gt;wsize) state-&gt;whave += dist;</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='hunk'>@@ -564,7 +599,7 @@ int flush;</div><div class='ctx'>     unsigned in, out;           /* save starting available input and output */</div><div class='ctx'>     unsigned copy;              /* number of stored or match bytes to copy */</div><div class='ctx'>     unsigned char FAR *from;    /* where to copy match bytes from */</div><div class='del'>-    code this;                  /* current decoding table entry */</div><div class='add'>+    code here;                  /* current decoding table entry */</div><div class='ctx'>     code last;                  /* parent table entry */</div><div class='ctx'>     unsigned len;               /* length to copy for repeats, bits to drop */</div><div class='ctx'>     int ret;                    /* return code */</div><div class='hunk'>@@ -619,7 +654,9 @@ int flush;</div><div class='ctx'>             }</div><div class='ctx'>             DROPBITS(4);</div><div class='ctx'>             len = BITS(4) + 8;</div><div class='del'>-            if (len &gt; state-&gt;wbits) {</div><div class='add'>+            if (state-&gt;wbits == 0)</div><div class='add'>+                state-&gt;wbits = len;</div><div class='add'>+            else if (len &gt; state-&gt;wbits) {</div><div class='ctx'>                 strm-&gt;msg = (char *)"invalid window size";</div><div class='ctx'>                 state-&gt;mode = BAD;</div><div class='ctx'>                 break;</div><div class='hunk'>@@ -771,7 +808,7 @@ int flush;</div><div class='ctx'>             strm-&gt;adler = state-&gt;check = adler32(0L, Z_NULL, 0);</div><div class='ctx'>             state-&gt;mode = TYPE;</div><div class='ctx'>         case TYPE:</div><div class='del'>-            if (flush == Z_BLOCK) goto inf_leave;</div><div class='add'>+            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;</div><div class='ctx'>         case TYPEDO:</div><div class='ctx'>             if (state-&gt;last) {</div><div class='ctx'>                 BYTEBITS();</div><div class='hunk'>@@ -791,7 +828,11 @@ int flush;</div><div class='ctx'>                 fixedtables(state);</div><div class='ctx'>                 Tracev((stderr, "inflate:     fixed codes block%s\n",</div><div class='ctx'>                         state-&gt;last ? " (last)" : ""));</div><div class='del'>-                state-&gt;mode = LEN;              /* decode codes */</div><div class='add'>+                state-&gt;mode = LEN_;             /* decode codes */</div><div class='add'>+                if (flush == Z_TREES) {</div><div class='add'>+                    DROPBITS(2);</div><div class='add'>+                    goto inf_leave;</div><div class='add'>+                }</div><div class='ctx'>                 break;</div><div class='ctx'>             case 2:                             /* dynamic block */</div><div class='ctx'>                 Tracev((stderr, "inflate:     dynamic codes block%s\n",</div><div class='hunk'>@@ -816,6 +857,9 @@ int flush;</div><div class='ctx'>             Tracev((stderr, "inflate:       stored length %u\n",</div><div class='ctx'>                     state-&gt;length));</div><div class='ctx'>             INITBITS();</div><div class='add'>+            state-&gt;mode = COPY_;</div><div class='add'>+            if (flush == Z_TREES) goto inf_leave;</div><div class='add'>+        case COPY_:</div><div class='ctx'>             state-&gt;mode = COPY;</div><div class='ctx'>         case COPY:</div><div class='ctx'>             copy = state-&gt;length;</div><div class='hunk'>@@ -876,19 +920,19 @@ int flush;</div><div class='ctx'>         case CODELENS:</div><div class='ctx'>             while (state-&gt;have &lt; state-&gt;nlen + state-&gt;ndist) {</div><div class='ctx'>                 for (;;) {</div><div class='del'>-                    this = state-&gt;lencode[BITS(state-&gt;lenbits)];</div><div class='del'>-                    if ((unsigned)(this.bits) &lt;= bits) break;</div><div class='add'>+                    here = state-&gt;lencode[BITS(state-&gt;lenbits)];</div><div class='add'>+                    if ((unsigned)(here.bits) &lt;= bits) break;</div><div class='ctx'>                     PULLBYTE();</div><div class='ctx'>                 }</div><div class='del'>-                if (this.val &lt; 16) {</div><div class='del'>-                    NEEDBITS(this.bits);</div><div class='del'>-                    DROPBITS(this.bits);</div><div class='del'>-                    state-&gt;lens[state-&gt;have++] = this.val;</div><div class='add'>+                if (here.val &lt; 16) {</div><div class='add'>+                    NEEDBITS(here.bits);</div><div class='add'>+                    DROPBITS(here.bits);</div><div class='add'>+                    state-&gt;lens[state-&gt;have++] = here.val;</div><div class='ctx'>                 }</div><div class='ctx'>                 else {</div><div class='del'>-                    if (this.val == 16) {</div><div class='del'>-                        NEEDBITS(this.bits + 2);</div><div class='del'>-                        DROPBITS(this.bits);</div><div class='add'>+                    if (here.val == 16) {</div><div class='add'>+                        NEEDBITS(here.bits + 2);</div><div class='add'>+                        DROPBITS(here.bits);</div><div class='ctx'>                         if (state-&gt;have == 0) {</div><div class='ctx'>                             strm-&gt;msg = (char *)"invalid bit length repeat";</div><div class='ctx'>                             state-&gt;mode = BAD;</div><div class='hunk'>@@ -898,16 +942,16 @@ int flush;</div><div class='ctx'>                         copy = 3 + BITS(2);</div><div class='ctx'>                         DROPBITS(2);</div><div class='ctx'>                     }</div><div class='del'>-                    else if (this.val == 17) {</div><div class='del'>-                        NEEDBITS(this.bits + 3);</div><div class='del'>-                        DROPBITS(this.bits);</div><div class='add'>+                    else if (here.val == 17) {</div><div class='add'>+                        NEEDBITS(here.bits + 3);</div><div class='add'>+                        DROPBITS(here.bits);</div><div class='ctx'>                         len = 0;</div><div class='ctx'>                         copy = 3 + BITS(3);</div><div class='ctx'>                         DROPBITS(3);</div><div class='ctx'>                     }</div><div class='ctx'>                     else {</div><div class='del'>-                        NEEDBITS(this.bits + 7);</div><div class='del'>-                        DROPBITS(this.bits);</div><div class='add'>+                        NEEDBITS(here.bits + 7);</div><div class='add'>+                        DROPBITS(here.bits);</div><div class='ctx'>                         len = 0;</div><div class='ctx'>                         copy = 11 + BITS(7);</div><div class='ctx'>                         DROPBITS(7);</div><div class='hunk'>@@ -925,7 +969,16 @@ int flush;</div><div class='ctx'>             /* handle error breaks in while */</div><div class='ctx'>             if (state-&gt;mode == BAD) break;</div><div class='ctx'> </div><div class='del'>-            /* build code tables */</div><div class='add'>+            /* check for end-of-block code (better have one) */</div><div class='add'>+            if (state-&gt;lens[256] == 0) {</div><div class='add'>+                strm-&gt;msg = (char *)"invalid code -- missing end-of-block";</div><div class='add'>+                state-&gt;mode = BAD;</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            /* build code tables -- note: do not change the lenbits or distbits</div><div class='add'>+               values here (9 and 6) without reading the comments in inftrees.h</div><div class='add'>+               concerning the ENOUGH constants, which depend on those values */</div><div class='ctx'>             state-&gt;next = state-&gt;codes;</div><div class='ctx'>             state-&gt;lencode = (code const FAR *)(state-&gt;next);</div><div class='ctx'>             state-&gt;lenbits = 9;</div><div class='hunk'>@@ -946,88 +999,102 @@ int flush;</div><div class='ctx'>                 break;</div><div class='ctx'>             }</div><div class='ctx'>             Tracev((stderr, "inflate:       codes ok\n"));</div><div class='add'>+            state-&gt;mode = LEN_;</div><div class='add'>+            if (flush == Z_TREES) goto inf_leave;</div><div class='add'>+        case LEN_:</div><div class='ctx'>             state-&gt;mode = LEN;</div><div class='ctx'>         case LEN:</div><div class='ctx'>             if (have &gt;= 6 &amp;&amp; left &gt;= 258) {</div><div class='ctx'>                 RESTORE();</div><div class='ctx'>                 inflate_fast(strm, out);</div><div class='ctx'>                 LOAD();</div><div class='add'>+                if (state-&gt;mode == TYPE)</div><div class='add'>+                    state-&gt;back = -1;</div><div class='ctx'>                 break;</div><div class='ctx'>             }</div><div class='add'>+            state-&gt;back = 0;</div><div class='ctx'>             for (;;) {</div><div class='del'>-                this = state-&gt;lencode[BITS(state-&gt;lenbits)];</div><div class='del'>-                if ((unsigned)(this.bits) &lt;= bits) break;</div><div class='add'>+                here = state-&gt;lencode[BITS(state-&gt;lenbits)];</div><div class='add'>+                if ((unsigned)(here.bits) &lt;= bits) break;</div><div class='ctx'>                 PULLBYTE();</div><div class='ctx'>             }</div><div class='del'>-            if (this.op &amp;&amp; (this.op &amp; 0xf0) == 0) {</div><div class='del'>-                last = this;</div><div class='add'>+            if (here.op &amp;&amp; (here.op &amp; 0xf0) == 0) {</div><div class='add'>+                last = here;</div><div class='ctx'>                 for (;;) {</div><div class='del'>-                    this = state-&gt;lencode[last.val +</div><div class='add'>+                    here = state-&gt;lencode[last.val +</div><div class='ctx'>                             (BITS(last.bits + last.op) &gt;&gt; last.bits)];</div><div class='del'>-                    if ((unsigned)(last.bits + this.bits) &lt;= bits) break;</div><div class='add'>+                    if ((unsigned)(last.bits + here.bits) &lt;= bits) break;</div><div class='ctx'>                     PULLBYTE();</div><div class='ctx'>                 }</div><div class='ctx'>                 DROPBITS(last.bits);</div><div class='add'>+                state-&gt;back += last.bits;</div><div class='ctx'>             }</div><div class='del'>-            DROPBITS(this.bits);</div><div class='del'>-            state-&gt;length = (unsigned)this.val;</div><div class='del'>-            if ((int)(this.op) == 0) {</div><div class='del'>-                Tracevv((stderr, this.val &gt;= 0x20 &amp;&amp; this.val &lt; 0x7f ?</div><div class='add'>+            DROPBITS(here.bits);</div><div class='add'>+            state-&gt;back += here.bits;</div><div class='add'>+            state-&gt;length = (unsigned)here.val;</div><div class='add'>+            if ((int)(here.op) == 0) {</div><div class='add'>+                Tracevv((stderr, here.val &gt;= 0x20 &amp;&amp; here.val &lt; 0x7f ?</div><div class='ctx'>                         "inflate:         literal '%c'\n" :</div><div class='del'>-                        "inflate:         literal 0x%02x\n", this.val));</div><div class='add'>+                        "inflate:         literal 0x%02x\n", here.val));</div><div class='ctx'>                 state-&gt;mode = LIT;</div><div class='ctx'>                 break;</div><div class='ctx'>             }</div><div class='del'>-            if (this.op &amp; 32) {</div><div class='add'>+            if (here.op &amp; 32) {</div><div class='ctx'>                 Tracevv((stderr, "inflate:         end of block\n"));</div><div class='add'>+                state-&gt;back = -1;</div><div class='ctx'>                 state-&gt;mode = TYPE;</div><div class='ctx'>                 break;</div><div class='ctx'>             }</div><div class='del'>-            if (this.op &amp; 64) {</div><div class='add'>+            if (here.op &amp; 64) {</div><div class='ctx'>                 strm-&gt;msg = (char *)"invalid literal/length code";</div><div class='ctx'>                 state-&gt;mode = BAD;</div><div class='ctx'>                 break;</div><div class='ctx'>             }</div><div class='del'>-            state-&gt;extra = (unsigned)(this.op) &amp; 15;</div><div class='add'>+            state-&gt;extra = (unsigned)(here.op) &amp; 15;</div><div class='ctx'>             state-&gt;mode = LENEXT;</div><div class='ctx'>         case LENEXT:</div><div class='ctx'>             if (state-&gt;extra) {</div><div class='ctx'>                 NEEDBITS(state-&gt;extra);</div><div class='ctx'>                 state-&gt;length += BITS(state-&gt;extra);</div><div class='ctx'>                 DROPBITS(state-&gt;extra);</div><div class='add'>+                state-&gt;back += state-&gt;extra;</div><div class='ctx'>             }</div><div class='ctx'>             Tracevv((stderr, "inflate:         length %u\n", state-&gt;length));</div><div class='add'>+            state-&gt;was = state-&gt;length;</div><div class='ctx'>             state-&gt;mode = DIST;</div><div class='ctx'>         case DIST:</div><div class='ctx'>             for (;;) {</div><div class='del'>-                this = state-&gt;distcode[BITS(state-&gt;distbits)];</div><div class='del'>-                if ((unsigned)(this.bits) &lt;= bits) break;</div><div class='add'>+                here = state-&gt;distcode[BITS(state-&gt;distbits)];</div><div class='add'>+                if ((unsigned)(here.bits) &lt;= bits) break;</div><div class='ctx'>                 PULLBYTE();</div><div class='ctx'>             }</div><div class='del'>-            if ((this.op &amp; 0xf0) == 0) {</div><div class='del'>-                last = this;</div><div class='add'>+            if ((here.op &amp; 0xf0) == 0) {</div><div class='add'>+                last = here;</div><div class='ctx'>                 for (;;) {</div><div class='del'>-                    this = state-&gt;distcode[last.val +</div><div class='add'>+                    here = state-&gt;distcode[last.val +</div><div class='ctx'>                             (BITS(last.bits + last.op) &gt;&gt; last.bits)];</div><div class='del'>-                    if ((unsigned)(last.bits + this.bits) &lt;= bits) break;</div><div class='add'>+                    if ((unsigned)(last.bits + here.bits) &lt;= bits) break;</div><div class='ctx'>                     PULLBYTE();</div><div class='ctx'>                 }</div><div class='ctx'>                 DROPBITS(last.bits);</div><div class='add'>+                state-&gt;back += last.bits;</div><div class='ctx'>             }</div><div class='del'>-            DROPBITS(this.bits);</div><div class='del'>-            if (this.op &amp; 64) {</div><div class='add'>+            DROPBITS(here.bits);</div><div class='add'>+            state-&gt;back += here.bits;</div><div class='add'>+            if (here.op &amp; 64) {</div><div class='ctx'>                 strm-&gt;msg = (char *)"invalid distance code";</div><div class='ctx'>                 state-&gt;mode = BAD;</div><div class='ctx'>                 break;</div><div class='ctx'>             }</div><div class='del'>-            state-&gt;offset = (unsigned)this.val;</div><div class='del'>-            state-&gt;extra = (unsigned)(this.op) &amp; 15;</div><div class='add'>+            state-&gt;offset = (unsigned)here.val;</div><div class='add'>+            state-&gt;extra = (unsigned)(here.op) &amp; 15;</div><div class='ctx'>             state-&gt;mode = DISTEXT;</div><div class='ctx'>         case DISTEXT:</div><div class='ctx'>             if (state-&gt;extra) {</div><div class='ctx'>                 NEEDBITS(state-&gt;extra);</div><div class='ctx'>                 state-&gt;offset += BITS(state-&gt;extra);</div><div class='ctx'>                 DROPBITS(state-&gt;extra);</div><div class='add'>+                state-&gt;back += state-&gt;extra;</div><div class='ctx'>             }</div><div class='ctx'> #ifdef INFLATE_STRICT</div><div class='ctx'>             if (state-&gt;offset &gt; state-&gt;dmax) {</div><div class='hunk'>@@ -1036,11 +1103,6 @@ int flush;</div><div class='ctx'>                 break;</div><div class='ctx'>             }</div><div class='ctx'> #endif</div><div class='del'>-            if (state-&gt;offset &gt; state-&gt;whave + out - left) {</div><div class='del'>-                strm-&gt;msg = (char *)"invalid distance too far back";</div><div class='del'>-                state-&gt;mode = BAD;</div><div class='del'>-                break;</div><div class='del'>-            }</div><div class='ctx'>             Tracevv((stderr, "inflate:         distance %u\n", state-&gt;offset));</div><div class='ctx'>             state-&gt;mode = MATCH;</div><div class='ctx'>         case MATCH:</div><div class='hunk'>@@ -1048,12 +1110,32 @@ int flush;</div><div class='ctx'>             copy = out - left;</div><div class='ctx'>             if (state-&gt;offset &gt; copy) {         /* copy from window */</div><div class='ctx'>                 copy = state-&gt;offset - copy;</div><div class='del'>-                if (copy &gt; state-&gt;write) {</div><div class='del'>-                    copy -= state-&gt;write;</div><div class='add'>+                if (copy &gt; state-&gt;whave) {</div><div class='add'>+                    if (state-&gt;sane) {</div><div class='add'>+                        strm-&gt;msg = (char *)"invalid distance too far back";</div><div class='add'>+                        state-&gt;mode = BAD;</div><div class='add'>+                        break;</div><div class='add'>+                    }</div><div class='add'>+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR</div><div class='add'>+                    Trace((stderr, "inflate.c too far\n"));</div><div class='add'>+                    copy -= state-&gt;whave;</div><div class='add'>+                    if (copy &gt; state-&gt;length) copy = state-&gt;length;</div><div class='add'>+                    if (copy &gt; left) copy = left;</div><div class='add'>+                    left -= copy;</div><div class='add'>+                    state-&gt;length -= copy;</div><div class='add'>+                    do {</div><div class='add'>+                        *put++ = 0;</div><div class='add'>+                    } while (--copy);</div><div class='add'>+                    if (state-&gt;length == 0) state-&gt;mode = LEN;</div><div class='add'>+                    break;</div><div class='add'>+#endif</div><div class='add'>+                }</div><div class='add'>+                if (copy &gt; state-&gt;wnext) {</div><div class='add'>+                    copy -= state-&gt;wnext;</div><div class='ctx'>                     from = state-&gt;window + (state-&gt;wsize - copy);</div><div class='ctx'>                 }</div><div class='ctx'>                 else</div><div class='del'>-                    from = state-&gt;window + (state-&gt;write - copy);</div><div class='add'>+                    from = state-&gt;window + (state-&gt;wnext - copy);</div><div class='ctx'>                 if (copy &gt; state-&gt;length) copy = state-&gt;length;</div><div class='ctx'>             }</div><div class='ctx'>             else {                              /* copy from output */</div><div class='hunk'>@@ -1146,7 +1228,8 @@ int flush;</div><div class='ctx'>         strm-&gt;adler = state-&gt;check =</div><div class='ctx'>             UPDATE(state-&gt;check, strm-&gt;next_out - out, out);</div><div class='ctx'>     strm-&gt;data_type = state-&gt;bits + (state-&gt;last ? 64 : 0) +</div><div class='del'>-                      (state-&gt;mode == TYPE ? 128 : 0);</div><div class='add'>+                      (state-&gt;mode == TYPE ? 128 : 0) +</div><div class='add'>+                      (state-&gt;mode == LEN_ || state-&gt;mode == COPY_ ? 256 : 0);</div><div class='ctx'>     if (((in == 0 &amp;&amp; out == 0) || flush == Z_FINISH) &amp;&amp; ret == Z_OK)</div><div class='ctx'>         ret = Z_BUF_ERROR;</div><div class='ctx'>     return ret;</div><div class='hunk'>@@ -1366,3 +1449,32 @@ z_streamp source;</div><div class='ctx'>     dest-&gt;state = (struct internal_state FAR *)copy;</div><div class='ctx'>     return Z_OK;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int ZEXPORT inflateUndermine(strm, subvert)</div><div class='add'>+z_streamp strm;</div><div class='add'>+int subvert;</div><div class='add'>+{</div><div class='add'>+    struct inflate_state FAR *state;</div><div class='add'>+</div><div class='add'>+    if (strm == Z_NULL || strm-&gt;state == Z_NULL) return Z_STREAM_ERROR;</div><div class='add'>+    state = (struct inflate_state FAR *)strm-&gt;state;</div><div class='add'>+    state-&gt;sane = !subvert;</div><div class='add'>+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR</div><div class='add'>+    return Z_OK;</div><div class='add'>+#else</div><div class='add'>+    state-&gt;sane = 1;</div><div class='add'>+    return Z_DATA_ERROR;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+long ZEXPORT inflateMark(strm)</div><div class='add'>+z_streamp strm;</div><div class='add'>+{</div><div class='add'>+    struct inflate_state FAR *state;</div><div class='add'>+</div><div class='add'>+    if (strm == Z_NULL || strm-&gt;state == Z_NULL) return -1L &lt;&lt; 16;</div><div class='add'>+    state = (struct inflate_state FAR *)strm-&gt;state;</div><div class='add'>+    return ((long)(state-&gt;back) &lt;&lt; 16) +</div><div class='add'>+        (state-&gt;mode == COPY ? state-&gt;length :</div><div class='add'>+            (state-&gt;mode == MATCH ? state-&gt;was - state-&gt;length : 0));</div><div class='add'>+}</div><div class='head'>diff --git a/src/3rdparty/zlib/inflate.h b/src/3rdparty/zlib/inflate.h<br/>index 07bd3e7..95f4986 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/inflate.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/inflate.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/inflate.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/inflate.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* inflate.h -- internal inflate state definition</div><div class='del'>- * Copyright (C) 1995-2004 Mark Adler</div><div class='add'>+ * Copyright (C) 1995-2009 Mark Adler</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -32,11 +32,13 @@ typedef enum {</div><div class='ctx'>         TYPE,       /* i: waiting for type bits, including last-flag bit */</div><div class='ctx'>         TYPEDO,     /* i: same, but skip check to exit inflate on new block */</div><div class='ctx'>         STORED,     /* i: waiting for stored size (length and complement) */</div><div class='add'>+        COPY_,      /* i/o: same as COPY below, but only first time in */</div><div class='ctx'>         COPY,       /* i/o: waiting for input or output to copy stored block */</div><div class='ctx'>         TABLE,      /* i: waiting for dynamic block table lengths */</div><div class='ctx'>         LENLENS,    /* i: waiting for code length code lengths */</div><div class='ctx'>         CODELENS,   /* i: waiting for length/lit and distance code lengths */</div><div class='del'>-            LEN,        /* i: waiting for length/lit code */</div><div class='add'>+            LEN_,       /* i: same as LEN below, but only first time in */</div><div class='add'>+            LEN,        /* i: waiting for length/lit/eob code */</div><div class='ctx'>             LENEXT,     /* i: waiting for length extra bits */</div><div class='ctx'>             DIST,       /* i: waiting for distance code */</div><div class='ctx'>             DISTEXT,    /* i: waiting for distance extra bits */</div><div class='hunk'>@@ -53,19 +55,21 @@ typedef enum {</div><div class='ctx'> /*</div><div class='ctx'>     State transitions between above modes -</div><div class='ctx'> </div><div class='del'>-    (most modes can go to the BAD or MEM mode -- not shown for clarity)</div><div class='add'>+    (most modes can go to BAD or MEM on error -- not shown for clarity)</div><div class='ctx'> </div><div class='ctx'>     Process header:</div><div class='del'>-        HEAD -&gt; (gzip) or (zlib)</div><div class='del'>-        (gzip) -&gt; FLAGS -&gt; TIME -&gt; OS -&gt; EXLEN -&gt; EXTRA -&gt; NAME</div><div class='del'>-        NAME -&gt; COMMENT -&gt; HCRC -&gt; TYPE</div><div class='add'>+        HEAD -&gt; (gzip) or (zlib) or (raw)</div><div class='add'>+        (gzip) -&gt; FLAGS -&gt; TIME -&gt; OS -&gt; EXLEN -&gt; EXTRA -&gt; NAME -&gt; COMMENT -&gt;</div><div class='add'>+                  HCRC -&gt; TYPE</div><div class='ctx'>         (zlib) -&gt; DICTID or TYPE</div><div class='ctx'>         DICTID -&gt; DICT -&gt; TYPE</div><div class='add'>+        (raw) -&gt; TYPEDO</div><div class='ctx'>     Read deflate blocks:</div><div class='del'>-            TYPE -&gt; STORED or TABLE or LEN or CHECK</div><div class='del'>-            STORED -&gt; COPY -&gt; TYPE</div><div class='del'>-            TABLE -&gt; LENLENS -&gt; CODELENS -&gt; LEN</div><div class='del'>-    Read deflate codes:</div><div class='add'>+            TYPE -&gt; TYPEDO -&gt; STORED or TABLE or LEN_ or CHECK</div><div class='add'>+            STORED -&gt; COPY_ -&gt; COPY -&gt; TYPE</div><div class='add'>+            TABLE -&gt; LENLENS -&gt; CODELENS -&gt; LEN_</div><div class='add'>+            LEN_ -&gt; LEN</div><div class='add'>+    Read deflate codes in fixed or dynamic block:</div><div class='ctx'>                 LEN -&gt; LENEXT or LIT or TYPE</div><div class='ctx'>                 LENEXT -&gt; DIST -&gt; DISTEXT -&gt; MATCH -&gt; LEN</div><div class='ctx'>                 LIT -&gt; LEN</div><div class='hunk'>@@ -73,7 +77,7 @@ typedef enum {</div><div class='ctx'>         CHECK -&gt; LENGTH -&gt; DONE</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* state maintained between inflate() calls.  Approximately 7K bytes. */</div><div class='add'>+/* state maintained between inflate() calls.  Approximately 10K bytes. */</div><div class='ctx'> struct inflate_state {</div><div class='ctx'>     inflate_mode mode;          /* current inflate mode */</div><div class='ctx'>     int last;                   /* true if processing last block */</div><div class='hunk'>@@ -88,7 +92,7 @@ struct inflate_state {</div><div class='ctx'>     unsigned wbits;             /* log base 2 of requested window size */</div><div class='ctx'>     unsigned wsize;             /* window size or zero if not using window */</div><div class='ctx'>     unsigned whave;             /* valid bytes in the window */</div><div class='del'>-    unsigned write;             /* window write index */</div><div class='add'>+    unsigned wnext;             /* window write index */</div><div class='ctx'>     unsigned char FAR *window;  /* allocated sliding window, if needed */</div><div class='ctx'>         /* bit accumulator */</div><div class='ctx'>     unsigned long hold;         /* input bit accumulator */</div><div class='hunk'>@@ -112,4 +116,7 @@ struct inflate_state {</div><div class='ctx'>     unsigned short lens[320];   /* temporary storage for code lengths */</div><div class='ctx'>     unsigned short work[288];   /* work area for code table building */</div><div class='ctx'>     code codes[ENOUGH];         /* space for code tables */</div><div class='add'>+    int sane;                   /* if false, allow invalid distance too far */</div><div class='add'>+    int back;                   /* bits back of last unprocessed length/lit */</div><div class='add'>+    unsigned was;               /* initial length of match */</div><div class='ctx'> };</div><div class='head'>diff --git a/src/3rdparty/zlib/inftrees.c b/src/3rdparty/zlib/inftrees.c<br/>index 8a9c13f..11e9c52 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/inftrees.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/inftrees.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/inftrees.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/inftrees.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* inftrees.c -- generate Huffman trees for efficient decoding</div><div class='del'>- * Copyright (C) 1995-2005 Mark Adler</div><div class='add'>+ * Copyright (C) 1995-2010 Mark Adler</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #define MAXBITS 15</div><div class='ctx'> </div><div class='ctx'> const char inflate_copyright[] =</div><div class='del'>-   " inflate 1.2.3 Copyright 1995-2005 Mark Adler ";</div><div class='add'>+   " inflate 1.2.5 Copyright 1995-2010 Mark Adler ";</div><div class='ctx'> /*</div><div class='ctx'>   If you use the zlib library in a product, an acknowledgment is welcome</div><div class='ctx'>   in the documentation of your product. If for some reason you cannot</div><div class='hunk'>@@ -29,7 +29,7 @@ const char inflate_copyright[] =</div><div class='ctx'>    table index bits.  It will differ if the request is greater than the</div><div class='ctx'>    longest code or if it is less than the shortest code.</div><div class='ctx'>  */</div><div class='del'>-int inflate_table(type, lens, codes, table, bits, work)</div><div class='add'>+int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)</div><div class='ctx'> codetype type;</div><div class='ctx'> unsigned short FAR *lens;</div><div class='ctx'> unsigned codes;</div><div class='hunk'>@@ -50,7 +50,7 @@ unsigned short FAR *work;</div><div class='ctx'>     unsigned fill;              /* index for replicating entries */</div><div class='ctx'>     unsigned low;               /* low bits for current root entry */</div><div class='ctx'>     unsigned mask;              /* mask for low root bits */</div><div class='del'>-    code this;                  /* table entry for duplication */</div><div class='add'>+    code here;                  /* table entry for duplication */</div><div class='ctx'>     code FAR *next;             /* next available space in table */</div><div class='ctx'>     const unsigned short FAR *base;     /* base value table to use */</div><div class='ctx'>     const unsigned short FAR *extra;    /* extra bits table to use */</div><div class='hunk'>@@ -62,7 +62,7 @@ unsigned short FAR *work;</div><div class='ctx'>         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};</div><div class='ctx'>     static const unsigned short lext[31] = { /* Length codes 257..285 extra */</div><div class='ctx'>         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,</div><div class='del'>-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196};</div><div class='add'>+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 73, 195};</div><div class='ctx'>     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */</div><div class='ctx'>         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,</div><div class='ctx'>         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,</div><div class='hunk'>@@ -115,15 +115,15 @@ unsigned short FAR *work;</div><div class='ctx'>         if (count[max] != 0) break;</div><div class='ctx'>     if (root &gt; max) root = max;</div><div class='ctx'>     if (max == 0) {                     /* no symbols to code at all */</div><div class='del'>-        this.op = (unsigned char)64;    /* invalid code marker */</div><div class='del'>-        this.bits = (unsigned char)1;</div><div class='del'>-        this.val = (unsigned short)0;</div><div class='del'>-        *(*table)++ = this;             /* make a table to force an error */</div><div class='del'>-        *(*table)++ = this;</div><div class='add'>+        here.op = (unsigned char)64;    /* invalid code marker */</div><div class='add'>+        here.bits = (unsigned char)1;</div><div class='add'>+        here.val = (unsigned short)0;</div><div class='add'>+        *(*table)++ = here;             /* make a table to force an error */</div><div class='add'>+        *(*table)++ = here;</div><div class='ctx'>         *bits = 1;</div><div class='ctx'>         return 0;     /* no symbols, but wait for decoding to report error */</div><div class='ctx'>     }</div><div class='del'>-    for (min = 1; min &lt;= MAXBITS; min++)</div><div class='add'>+    for (min = 1; min &lt; max; min++)</div><div class='ctx'>         if (count[min] != 0) break;</div><div class='ctx'>     if (root &lt; min) root = min;</div><div class='ctx'> </div><div class='hunk'>@@ -166,11 +166,10 @@ unsigned short FAR *work;</div><div class='ctx'>        entered in the tables.</div><div class='ctx'> </div><div class='ctx'>        used keeps track of how many table entries have been allocated from the</div><div class='del'>-       provided *table space.  It is checked when a LENS table is being made</div><div class='del'>-       against the space in *table, ENOUGH, minus the maximum space needed by</div><div class='del'>-       the worst case distance code, MAXD.  This should never happen, but the</div><div class='del'>-       sufficiency of ENOUGH has not been proven exhaustively, hence the check.</div><div class='del'>-       This assumes that when type == LENS, bits == 9.</div><div class='add'>+       provided *table space.  It is checked for LENS and DIST tables against</div><div class='add'>+       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in</div><div class='add'>+       the initial root table size constants.  See the comments in inftrees.h</div><div class='add'>+       for more information.</div><div class='ctx'> </div><div class='ctx'>        sym increments through all symbols, and the loop terminates when</div><div class='ctx'>        all codes of length max, i.e. all codes, have been processed.  This</div><div class='hunk'>@@ -209,24 +208,25 @@ unsigned short FAR *work;</div><div class='ctx'>     mask = used - 1;            /* mask for comparing low */</div><div class='ctx'> </div><div class='ctx'>     /* check available table space */</div><div class='del'>-    if (type == LENS &amp;&amp; used &gt;= ENOUGH - MAXD)</div><div class='add'>+    if ((type == LENS &amp;&amp; used &gt;= ENOUGH_LENS) ||</div><div class='add'>+        (type == DISTS &amp;&amp; used &gt;= ENOUGH_DISTS))</div><div class='ctx'>         return 1;</div><div class='ctx'> </div><div class='ctx'>     /* process all codes and make table entries */</div><div class='ctx'>     for (;;) {</div><div class='ctx'>         /* create table entry */</div><div class='del'>-        this.bits = (unsigned char)(len - drop);</div><div class='add'>+        here.bits = (unsigned char)(len - drop);</div><div class='ctx'>         if ((int)(work[sym]) &lt; end) {</div><div class='del'>-            this.op = (unsigned char)0;</div><div class='del'>-            this.val = work[sym];</div><div class='add'>+            here.op = (unsigned char)0;</div><div class='add'>+            here.val = work[sym];</div><div class='ctx'>         }</div><div class='ctx'>         else if ((int)(work[sym]) &gt; end) {</div><div class='del'>-            this.op = (unsigned char)(extra[work[sym]]);</div><div class='del'>-            this.val = base[work[sym]];</div><div class='add'>+            here.op = (unsigned char)(extra[work[sym]]);</div><div class='add'>+            here.val = base[work[sym]];</div><div class='ctx'>         }</div><div class='ctx'>         else {</div><div class='del'>-            this.op = (unsigned char)(32 + 64);         /* end of block */</div><div class='del'>-            this.val = 0;</div><div class='add'>+            here.op = (unsigned char)(32 + 64);         /* end of block */</div><div class='add'>+            here.val = 0;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         /* replicate for those indices with low len bits equal to huff */</div><div class='hunk'>@@ -235,7 +235,7 @@ unsigned short FAR *work;</div><div class='ctx'>         min = fill;                 /* save offset to next table */</div><div class='ctx'>         do {</div><div class='ctx'>             fill -= incr;</div><div class='del'>-            next[(huff &gt;&gt; drop) + fill] = this;</div><div class='add'>+            next[(huff &gt;&gt; drop) + fill] = here;</div><div class='ctx'>         } while (fill != 0);</div><div class='ctx'> </div><div class='ctx'>         /* backwards increment the len-bit code huff */</div><div class='hunk'>@@ -277,7 +277,8 @@ unsigned short FAR *work;</div><div class='ctx'> </div><div class='ctx'>             /* check for enough space */</div><div class='ctx'>             used += 1U &lt;&lt; curr;</div><div class='del'>-            if (type == LENS &amp;&amp; used &gt;= ENOUGH - MAXD)</div><div class='add'>+            if ((type == LENS &amp;&amp; used &gt;= ENOUGH_LENS) ||</div><div class='add'>+                (type == DISTS &amp;&amp; used &gt;= ENOUGH_DISTS))</div><div class='ctx'>                 return 1;</div><div class='ctx'> </div><div class='ctx'>             /* point entry in root table to sub-table */</div><div class='hunk'>@@ -295,20 +296,20 @@ unsigned short FAR *work;</div><div class='ctx'>        through high index bits.  When the current sub-table is filled, the loop</div><div class='ctx'>        drops back to the root table to fill in any remaining entries there.</div><div class='ctx'>      */</div><div class='del'>-    this.op = (unsigned char)64;                /* invalid code marker */</div><div class='del'>-    this.bits = (unsigned char)(len - drop);</div><div class='del'>-    this.val = (unsigned short)0;</div><div class='add'>+    here.op = (unsigned char)64;                /* invalid code marker */</div><div class='add'>+    here.bits = (unsigned char)(len - drop);</div><div class='add'>+    here.val = (unsigned short)0;</div><div class='ctx'>     while (huff != 0) {</div><div class='ctx'>         /* when done with sub-table, drop back to root table */</div><div class='ctx'>         if (drop != 0 &amp;&amp; (huff &amp; mask) != low) {</div><div class='ctx'>             drop = 0;</div><div class='ctx'>             len = root;</div><div class='ctx'>             next = *table;</div><div class='del'>-            this.bits = (unsigned char)len;</div><div class='add'>+            here.bits = (unsigned char)len;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         /* put invalid code marker in table */</div><div class='del'>-        next[huff &gt;&gt; drop] = this;</div><div class='add'>+        next[huff &gt;&gt; drop] = here;</div><div class='ctx'> </div><div class='ctx'>         /* backwards increment the len-bit code huff */</div><div class='ctx'>         incr = 1U &lt;&lt; (len - 1);</div><div class='head'>diff --git a/src/3rdparty/zlib/inftrees.h b/src/3rdparty/zlib/inftrees.h<br/>index b1104c8..baa53a0 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/inftrees.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/inftrees.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/inftrees.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/inftrees.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* inftrees.h -- header to use inftrees.c</div><div class='del'>- * Copyright (C) 1995-2005 Mark Adler</div><div class='add'>+ * Copyright (C) 1995-2005, 2010 Mark Adler</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -35,21 +35,28 @@ typedef struct {</div><div class='ctx'>     01000000 - invalid code</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* Maximum size of dynamic tree.  The maximum found in a long but non-</div><div class='del'>-   exhaustive search was 1444 code structures (852 for length/literals</div><div class='del'>-   and 592 for distances, the latter actually the result of an</div><div class='del'>-   exhaustive search).  The true maximum is not known, but the value</div><div class='del'>-   below is more than safe. */</div><div class='del'>-#define ENOUGH 2048</div><div class='del'>-#define MAXD 592</div><div class='add'>+/* Maximum size of the dynamic table.  The maximum number of code structures is</div><div class='add'>+   1444, which is the sum of 852 for literal/length codes and 592 for distance</div><div class='add'>+   codes.  These values were found by exhaustive searches using the program</div><div class='add'>+   examples/enough.c found in the zlib distribtution.  The arguments to that</div><div class='add'>+   program are the number of symbols, the initial root table size, and the</div><div class='add'>+   maximum bit length of a code.  "enough 286 9 15" for literal/length codes</div><div class='add'>+   returns returns 852, and "enough 30 6 15" for distance codes returns 592.</div><div class='add'>+   The initial root table size (9 or 6) is found in the fifth argument of the</div><div class='add'>+   inflate_table() calls in inflate.c and infback.c.  If the root table size is</div><div class='add'>+   changed, then these maximum sizes would be need to be recalculated and</div><div class='add'>+   updated. */</div><div class='add'>+#define ENOUGH_LENS 852</div><div class='add'>+#define ENOUGH_DISTS 592</div><div class='add'>+#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)</div><div class='ctx'> </div><div class='del'>-/* Type of code to build for inftable() */</div><div class='add'>+/* Type of code to build for inflate_table() */</div><div class='ctx'> typedef enum {</div><div class='ctx'>     CODES,</div><div class='ctx'>     LENS,</div><div class='ctx'>     DISTS</div><div class='ctx'> } codetype;</div><div class='ctx'> </div><div class='del'>-extern int inflate_table OF((codetype type, unsigned short FAR *lens,</div><div class='add'>+int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,</div><div class='ctx'>                              unsigned codes, code FAR * FAR *table,</div><div class='ctx'>                              unsigned FAR *bits, unsigned short FAR *work));</div><div class='head'>diff --git a/src/3rdparty/zlib/make_vms.com b/src/3rdparty/zlib/make_vms.com<br/>deleted file mode 100644<br/>index c2a1fb5..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/make_vms.com?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/make_vms.com</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,461 +0,0 @@</div><div class='del'>-$! make libz under VMS written by</div><div class='del'>-$! Martin P.J. Zinser</div><div class='del'>-$! &lt;zinser@zinser.no-ip.info or zinser@sysdev.deutsche-boerse.com&gt;</div><div class='del'>-$!</div><div class='del'>-$ on error then goto err_exit</div><div class='del'>-$!</div><div class='del'>-$!</div><div class='del'>-$! Just some general constants...</div><div class='del'>-$!</div><div class='del'>-$ true  = 1</div><div class='del'>-$ false = 0</div><div class='del'>-$ tmpnam = "temp_" + f$getjpi("","pid")</div><div class='del'>-$ SAY = "WRITE SYS$OUTPUT"</div><div class='del'>-$!</div><div class='del'>-$! Setup variables holding "config" information</div><div class='del'>-$!</div><div class='del'>-$ Make     = ""</div><div class='del'>-$ name     = "Zlib"</div><div class='del'>-$ version  = "?.?.?"</div><div class='del'>-$ v_string = "ZLIB_VERSION"</div><div class='del'>-$ v_file   = "zlib.h"</div><div class='del'>-$ ccopt    = ""</div><div class='del'>-$ lopts    = ""</div><div class='del'>-$ linkonly = false</div><div class='del'>-$ optfile  = name + ".opt"</div><div class='del'>-$ its_decc = false</div><div class='del'>-$ its_vaxc = false</div><div class='del'>-$ its_gnuc = false</div><div class='del'>-$ axp      = f$getsyi("HW_MODEL").ge.1024</div><div class='del'>-$ s_case   = false</div><div class='del'>-$! Check for MMK/MMS</div><div class='del'>-$!</div><div class='del'>-$ If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS"</div><div class='del'>-$ If F$Type (MMK) .eqs. "STRING" Then Make = "MMK"</div><div class='del'>-$!</div><div class='del'>-$!</div><div class='del'>-$ gosub find_version</div><div class='del'>-$!</div><div class='del'>-$ gosub check_opts</div><div class='del'>-$!</div><div class='del'>-$! Look for the compiler used</div><div class='del'>-$!</div><div class='del'>-$ gosub check_compiler</div><div class='del'>-$ if its_decc</div><div class='del'>-$ then</div><div class='del'>-$   ccopt = "/prefix=all" + ccopt</div><div class='del'>-$   if f$trnlnm("SYS") .eqs. ""</div><div class='del'>-$   then</div><div class='del'>-$     if axp</div><div class='del'>-$     then</div><div class='del'>-$       define sys sys$library:</div><div class='del'>-$     else</div><div class='del'>-$       ccopt = "/decc" + ccopt</div><div class='del'>-$       define sys decc$library_include:</div><div class='del'>-$     endif</div><div class='del'>-$   endif</div><div class='del'>-$ endif</div><div class='del'>-$ if its_vaxc .or. its_gnuc</div><div class='del'>-$ then</div><div class='del'>-$    if f$trnlnm("SYS").eqs."" then define sys sys$library:</div><div class='del'>-$ endif</div><div class='del'>-$!</div><div class='del'>-$! Build the thing plain or with mms</div><div class='del'>-$!</div><div class='del'>-$ write sys$output "Compiling Zlib sources ..."</div><div class='del'>-$ if make.eqs.""</div><div class='del'>-$  then</div><div class='del'>-$   dele example.obj;*,minigzip.obj;*</div><div class='del'>-$   CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -</div><div class='del'>-                adler32.c zlib.h zconf.h</div><div class='del'>-$   CALL MAKE compress.OBJ "CC ''CCOPT' compress" -</div><div class='del'>-                compress.c zlib.h zconf.h</div><div class='del'>-$   CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -</div><div class='del'>-                crc32.c zlib.h zconf.h</div><div class='del'>-$   CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -</div><div class='del'>-                deflate.c deflate.h zutil.h zlib.h zconf.h</div><div class='del'>-$   CALL MAKE gzio.OBJ "CC ''CCOPT' gzio" -</div><div class='del'>-                gzio.c zutil.h zlib.h zconf.h</div><div class='del'>-$   CALL MAKE infback.OBJ "CC ''CCOPT' infback" -</div><div class='del'>-                infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h</div><div class='del'>-$   CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -</div><div class='del'>-                inffast.c zutil.h zlib.h zconf.h inffast.h</div><div class='del'>-$   CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -</div><div class='del'>-                inflate.c zutil.h zlib.h zconf.h infblock.h</div><div class='del'>-$   CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -</div><div class='del'>-                inftrees.c zutil.h zlib.h zconf.h inftrees.h</div><div class='del'>-$   CALL MAKE trees.OBJ "CC ''CCOPT' trees" -</div><div class='del'>-                trees.c deflate.h zutil.h zlib.h zconf.h</div><div class='del'>-$   CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -</div><div class='del'>-                uncompr.c zlib.h zconf.h</div><div class='del'>-$   CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -</div><div class='del'>-                zutil.c zutil.h zlib.h zconf.h</div><div class='del'>-$   write sys$output "Building Zlib ..."</div><div class='del'>-$   CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ</div><div class='del'>-$   write sys$output "Building example..."</div><div class='del'>-$   CALL MAKE example.OBJ "CC ''CCOPT' example" -</div><div class='del'>-                example.c zlib.h zconf.h</div><div class='del'>-$   call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb</div><div class='del'>-$   if f$search("x11vms:xvmsutils.olb") .nes. ""</div><div class='del'>-$   then</div><div class='del'>-$     write sys$output "Building minigzip..."</div><div class='del'>-$     CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" -</div><div class='del'>-                minigzip.c zlib.h zconf.h</div><div class='del'>-$     call make minigzip.exe -</div><div class='del'>-                "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" -</div><div class='del'>-                minigzip.obj libz.olb</div><div class='del'>-$   endif</div><div class='del'>-$  else</div><div class='del'>-$   gosub crea_mms</div><div class='del'>-$   SAY "Make ''name' ''version' with ''Make' "</div><div class='del'>-$   'make'</div><div class='del'>-$  endif</div><div class='del'>-$!</div><div class='del'>-$! Alpha gets a shareable image</div><div class='del'>-$!</div><div class='del'>-$ If axp</div><div class='del'>-$ Then</div><div class='del'>-$   gosub crea_olist</div><div class='del'>-$   write sys$output "Creating libzshr.exe"</div><div class='del'>-$   call anal_obj_axp modules.opt _link.opt</div><div class='del'>-$   if s_case</div><div class='del'>-$   then</div><div class='del'>-$      open/append optf modules.opt</div><div class='del'>-$      write optf "case_sensitive=YES"</div><div class='del'>-$      close optf</div><div class='del'>-$   endif</div><div class='del'>-$   LINK_'lopts'/SHARE=libzshr.exe modules.opt/opt,_link.opt/opt</div><div class='del'>-$ endif</div><div class='del'>-$ write sys$output "Zlib build completed"</div><div class='del'>-$ exit</div><div class='del'>-$CC_ERR:</div><div class='del'>-$ write sys$output "C compiler required to build ''name'"</div><div class='del'>-$ goto err_exit</div><div class='del'>-$ERR_EXIT:</div><div class='del'>-$ set message/facil/ident/sever/text</div><div class='del'>-$ write sys$output "Exiting..."</div><div class='del'>-$ exit 2</div><div class='del'>-$!</div><div class='del'>-$!</div><div class='del'>-$MAKE: SUBROUTINE   !SUBROUTINE TO CHECK DEPENDENCIES</div><div class='del'>-$ V = 'F$Verify(0)</div><div class='del'>-$! P1 = What we are trying to make</div><div class='del'>-$! P2 = Command to make it</div><div class='del'>-$! P3 - P8  What it depends on</div><div class='del'>-$</div><div class='del'>-$ If F$Search(P1) .Eqs. "" Then Goto Makeit</div><div class='del'>-$ Time = F$CvTime(F$File(P1,"RDT"))</div><div class='del'>-$arg=3</div><div class='del'>-$Loop:</div><div class='del'>-$       Argument = P'arg</div><div class='del'>-$       If Argument .Eqs. "" Then Goto Exit</div><div class='del'>-$       El=0</div><div class='del'>-$Loop2:</div><div class='del'>-$       File = F$Element(El," ",Argument)</div><div class='del'>-$       If File .Eqs. " " Then Goto Endl</div><div class='del'>-$       AFile = ""</div><div class='del'>-$Loop3:</div><div class='del'>-$       OFile = AFile</div><div class='del'>-$       AFile = F$Search(File)</div><div class='del'>-$       If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl</div><div class='del'>-$       If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit</div><div class='del'>-$       Goto Loop3</div><div class='del'>-$NextEL:</div><div class='del'>-$       El = El + 1</div><div class='del'>-$       Goto Loop2</div><div class='del'>-$EndL:</div><div class='del'>-$ arg=arg+1</div><div class='del'>-$ If arg .Le. 8 Then Goto Loop</div><div class='del'>-$ Goto Exit</div><div class='del'>-$</div><div class='del'>-$Makeit:</div><div class='del'>-$ VV=F$VERIFY(0)</div><div class='del'>-$ write sys$output P2</div><div class='del'>-$ 'P2</div><div class='del'>-$ VV='F$Verify(VV)</div><div class='del'>-$Exit:</div><div class='del'>-$ If V Then Set Verify</div><div class='del'>-$ENDSUBROUTINE</div><div class='del'>-$!------------------------------------------------------------------------------</div><div class='del'>-$!</div><div class='del'>-$! Check command line options and set symbols accordingly</div><div class='del'>-$!</div><div class='del'>-$ CHECK_OPTS:</div><div class='del'>-$ i = 1</div><div class='del'>-$ OPT_LOOP:</div><div class='del'>-$ if i .lt. 9</div><div class='del'>-$ then</div><div class='del'>-$   cparm = f$edit(p'i',"upcase")</div><div class='del'>-$   if cparm .eqs. "DEBUG"</div><div class='del'>-$   then</div><div class='del'>-$     ccopt = ccopt + "/noopt/deb"</div><div class='del'>-$     lopts = lopts + "/deb"</div><div class='del'>-$   endif</div><div class='del'>-$   if f$locate("CCOPT=",cparm) .lt. f$length(cparm)</div><div class='del'>-$   then</div><div class='del'>-$     start = f$locate("=",cparm) + 1</div><div class='del'>-$     len   = f$length(cparm) - start</div><div class='del'>-$     ccopt = ccopt + f$extract(start,len,cparm)</div><div class='del'>-$     if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) -</div><div class='del'>-         then s_case = true</div><div class='del'>-$   endif</div><div class='del'>-$   if cparm .eqs. "LINK" then linkonly = true</div><div class='del'>-$   if f$locate("LOPTS=",cparm) .lt. f$length(cparm)</div><div class='del'>-$   then</div><div class='del'>-$     start = f$locate("=",cparm) + 1</div><div class='del'>-$     len   = f$length(cparm) - start</div><div class='del'>-$     lopts = lopts + f$extract(start,len,cparm)</div><div class='del'>-$   endif</div><div class='del'>-$   if f$locate("CC=",cparm) .lt. f$length(cparm)</div><div class='del'>-$   then</div><div class='del'>-$     start  = f$locate("=",cparm) + 1</div><div class='del'>-$     len    = f$length(cparm) - start</div><div class='del'>-$     cc_com = f$extract(start,len,cparm)</div><div class='del'>-      if (cc_com .nes. "DECC") .and. -</div><div class='del'>-         (cc_com .nes. "VAXC") .and. -</div><div class='del'>-	 (cc_com .nes. "GNUC")</div><div class='del'>-$     then</div><div class='del'>-$       write sys$output "Unsupported compiler choice ''cc_com' ignored"</div><div class='del'>-$       write sys$output "Use DECC, VAXC, or GNUC instead"</div><div class='del'>-$     else</div><div class='del'>-$     	if cc_com .eqs. "DECC" then its_decc = true</div><div class='del'>-$     	if cc_com .eqs. "VAXC" then its_vaxc = true</div><div class='del'>-$     	if cc_com .eqs. "GNUC" then its_gnuc = true</div><div class='del'>-$     endif</div><div class='del'>-$   endif</div><div class='del'>-$   if f$locate("MAKE=",cparm) .lt. f$length(cparm)</div><div class='del'>-$   then</div><div class='del'>-$     start  = f$locate("=",cparm) + 1</div><div class='del'>-$     len    = f$length(cparm) - start</div><div class='del'>-$     mmks = f$extract(start,len,cparm)</div><div class='del'>-$     if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS")</div><div class='del'>-$     then</div><div class='del'>-$       make = mmks</div><div class='del'>-$     else</div><div class='del'>-$       write sys$output "Unsupported make choice ''mmks' ignored"</div><div class='del'>-$       write sys$output "Use MMK or MMS instead"</div><div class='del'>-$     endif</div><div class='del'>-$   endif</div><div class='del'>-$   i = i + 1</div><div class='del'>-$   goto opt_loop</div><div class='del'>-$ endif</div><div class='del'>-$ return</div><div class='del'>-$!------------------------------------------------------------------------------</div><div class='del'>-$!</div><div class='del'>-$! Look for the compiler used</div><div class='del'>-$!</div><div class='del'>-$CHECK_COMPILER:</div><div class='del'>-$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))</div><div class='del'>-$ then</div><div class='del'>-$   its_decc = (f$search("SYS$SYSTEM:DECC$COMPILER.EXE") .nes. "")</div><div class='del'>-$   its_vaxc = .not. its_decc .and. (F$Search("SYS$System:VAXC.Exe") .nes. "")</div><div class='del'>-$   its_gnuc = .not. (its_decc .or. its_vaxc) .and. (f$trnlnm("gnu_cc") .nes. "")</div><div class='del'>-$ endif</div><div class='del'>-$!</div><div class='del'>-$! Exit if no compiler available</div><div class='del'>-$!</div><div class='del'>-$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))</div><div class='del'>-$ then goto CC_ERR</div><div class='del'>-$ else</div><div class='del'>-$   if its_decc then write sys$output "CC compiler check ... Compaq C"</div><div class='del'>-$   if its_vaxc then write sys$output "CC compiler check ... VAX C"</div><div class='del'>-$   if its_gnuc then write sys$output "CC compiler check ... GNU C"</div><div class='del'>-$ endif</div><div class='del'>-$ return</div><div class='del'>-$!------------------------------------------------------------------------------</div><div class='del'>-$!</div><div class='del'>-$! If MMS/MMK are available dump out the descrip.mms if required</div><div class='del'>-$!</div><div class='del'>-$CREA_MMS:</div><div class='del'>-$ write sys$output "Creating descrip.mms..."</div><div class='del'>-$ create descrip.mms</div><div class='del'>-$ open/append out descrip.mms</div><div class='del'>-$ copy sys$input: out</div><div class='del'>-$ deck</div><div class='del'>-# descrip.mms: MMS description file for building zlib on VMS</div><div class='del'>-# written by Martin P.J. Zinser</div><div class='del'>-# &lt;zinser@zinser.no-ip.info or zinser@sysdev.deutsche-boerse.com&gt;</div><div class='del'>-</div><div class='del'>-OBJS = adler32.obj, compress.obj, crc32.obj, gzio.obj, uncompr.obj, infback.obj\</div><div class='del'>-       deflate.obj, trees.obj, zutil.obj, inflate.obj, \</div><div class='del'>-       inftrees.obj, inffast.obj</div><div class='del'>-</div><div class='del'>-$ eod</div><div class='del'>-$ write out "CFLAGS=", ccopt</div><div class='del'>-$ write out "LOPTS=", lopts</div><div class='del'>-$ copy sys$input: out</div><div class='del'>-$ deck</div><div class='del'>-</div><div class='del'>-all : example.exe minigzip.exe libz.olb</div><div class='del'>-        @ write sys$output " Example applications available"</div><div class='del'>-</div><div class='del'>-libz.olb : libz.olb($(OBJS))</div><div class='del'>-	@ write sys$output " libz available"</div><div class='del'>-</div><div class='del'>-example.exe : example.obj libz.olb</div><div class='del'>-              link $(LOPTS) example,libz.olb/lib</div><div class='del'>-</div><div class='del'>-minigzip.exe : minigzip.obj libz.olb</div><div class='del'>-              link $(LOPTS) minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib</div><div class='del'>-</div><div class='del'>-clean :</div><div class='del'>-	delete *.obj;*,libz.olb;*,*.opt;*,*.exe;*</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Other dependencies.</div><div class='del'>-adler32.obj  : adler32.c zutil.h zlib.h zconf.h</div><div class='del'>-compress.obj : compress.c zlib.h zconf.h</div><div class='del'>-crc32.obj    : crc32.c zutil.h zlib.h zconf.h</div><div class='del'>-deflate.obj  : deflate.c deflate.h zutil.h zlib.h zconf.h</div><div class='del'>-example.obj  : example.c zlib.h zconf.h</div><div class='del'>-gzio.obj     : gzio.c zutil.h zlib.h zconf.h</div><div class='del'>-inffast.obj  : inffast.c zutil.h zlib.h zconf.h inftrees.h inffast.h</div><div class='del'>-inflate.obj  : inflate.c zutil.h zlib.h zconf.h</div><div class='del'>-inftrees.obj : inftrees.c zutil.h zlib.h zconf.h inftrees.h</div><div class='del'>-minigzip.obj : minigzip.c zlib.h zconf.h</div><div class='del'>-trees.obj    : trees.c deflate.h zutil.h zlib.h zconf.h</div><div class='del'>-uncompr.obj  : uncompr.c zlib.h zconf.h</div><div class='del'>-zutil.obj    : zutil.c zutil.h zlib.h zconf.h</div><div class='del'>-infback.obj  : infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h</div><div class='del'>-$ eod</div><div class='del'>-$ close out</div><div class='del'>-$ return</div><div class='del'>-$!------------------------------------------------------------------------------</div><div class='del'>-$!</div><div class='del'>-$! Read list of core library sources from makefile.in and create options</div><div class='del'>-$! needed to build shareable image</div><div class='del'>-$!</div><div class='del'>-$CREA_OLIST:</div><div class='del'>-$ open/read min makefile.in</div><div class='del'>-$ open/write mod modules.opt</div><div class='del'>-$ src_check = "OBJS ="</div><div class='del'>-$MRLOOP:</div><div class='del'>-$ read/end=mrdone min rec</div><div class='del'>-$ if (f$extract(0,6,rec) .nes. src_check) then goto mrloop</div><div class='del'>-$ rec = rec - src_check</div><div class='del'>-$ gosub extra_filnam</div><div class='del'>-$ if (f$element(1,"\",rec) .eqs. "\") then goto mrdone</div><div class='del'>-$MRSLOOP:</div><div class='del'>-$ read/end=mrdone min rec</div><div class='del'>-$ gosub extra_filnam</div><div class='del'>-$ if (f$element(1,"\",rec) .nes. "\") then goto mrsloop</div><div class='del'>-$MRDONE:</div><div class='del'>-$ close min</div><div class='del'>-$ close mod</div><div class='del'>-$ return</div><div class='del'>-$!------------------------------------------------------------------------------</div><div class='del'>-$!</div><div class='del'>-$! Take record extracted in crea_olist and split it into single filenames</div><div class='del'>-$!</div><div class='del'>-$EXTRA_FILNAM:</div><div class='del'>-$ myrec = f$edit(rec - "\", "trim,compress")</div><div class='del'>-$ i = 0</div><div class='del'>-$FELOOP:</div><div class='del'>-$ srcfil = f$element(i," ", myrec)</div><div class='del'>-$ if (srcfil .nes. " ")</div><div class='del'>-$ then</div><div class='del'>-$   write mod f$parse(srcfil,,,"NAME"), ".obj"</div><div class='del'>-$   i = i + 1</div><div class='del'>-$   goto feloop</div><div class='del'>-$ endif</div><div class='del'>-$ return</div><div class='del'>-$!------------------------------------------------------------------------------</div><div class='del'>-$!</div><div class='del'>-$! Find current Zlib version number</div><div class='del'>-$!</div><div class='del'>-$FIND_VERSION:</div><div class='del'>-$ open/read h_in 'v_file'</div><div class='del'>-$hloop:</div><div class='del'>-$ read/end=hdone h_in rec</div><div class='del'>-$ rec = f$edit(rec,"TRIM")</div><div class='del'>-$ if (f$extract(0,1,rec) .nes. "#") then goto hloop</div><div class='del'>-$ rec = f$edit(rec - "#", "TRIM")</div><div class='del'>-$ if f$element(0," ",rec) .nes. "define" then goto hloop</div><div class='del'>-$ if f$element(1," ",rec) .eqs. v_string</div><div class='del'>-$ then</div><div class='del'>-$   version = 'f$element(2," ",rec)'</div><div class='del'>-$   goto hdone</div><div class='del'>-$ endif</div><div class='del'>-$ goto hloop</div><div class='del'>-$hdone:</div><div class='del'>-$ close h_in</div><div class='del'>-$ return</div><div class='del'>-$!------------------------------------------------------------------------------</div><div class='del'>-$!</div><div class='del'>-$! Analyze Object files for OpenVMS AXP to extract Procedure and Data</div><div class='del'>-$! information to build a symbol vector for a shareable image</div><div class='del'>-$! All the "brains" of this logic was suggested by Hartmut Becker</div><div class='del'>-$! (Hartmut.Becker@compaq.com). All the bugs were introduced by me</div><div class='del'>-$! (zinser@decus.de), so if you do have problem reports please do not</div><div class='del'>-$! bother Hartmut/HP, but get in touch with me</div><div class='del'>-$!</div><div class='del'>-$ ANAL_OBJ_AXP: Subroutine</div><div class='del'>-$ V = 'F$Verify(0)</div><div class='del'>-$ SAY := "WRITE_ SYS$OUTPUT"</div><div class='del'>-$</div><div class='del'>-$ IF F$SEARCH("''P1'") .EQS. ""</div><div class='del'>-$ THEN</div><div class='del'>-$    SAY "ANAL_OBJ_AXP-E-NOSUCHFILE:  Error, inputfile ''p1' not available"</div><div class='del'>-$    goto exit_aa</div><div class='del'>-$ ENDIF</div><div class='del'>-$ IF "''P2'" .EQS. ""</div><div class='del'>-$ THEN</div><div class='del'>-$    SAY "ANAL_OBJ_AXP:  Error, no output file provided"</div><div class='del'>-$    goto exit_aa</div><div class='del'>-$ ENDIF</div><div class='del'>-$</div><div class='del'>-$ open/read in 'p1</div><div class='del'>-$ create a.tmp</div><div class='del'>-$ open/append atmp a.tmp</div><div class='del'>-$ loop:</div><div class='del'>-$ read/end=end_loop in line</div><div class='del'>-$ f= f$search(line)</div><div class='del'>-$ if f .eqs. ""</div><div class='del'>-$ then</div><div class='del'>-$	write sys$output "ANAL_OBJ_AXP-w-nosuchfile, ''line'"</div><div class='del'>-$	goto loop</div><div class='del'>-$ endif</div><div class='del'>-$ define/user sys$output nl:</div><div class='del'>-$ define/user sys$error nl:</div><div class='del'>-$ anal/obj/gsd 'f /out=x.tmp</div><div class='del'>-$ open/read xtmp x.tmp</div><div class='del'>-$ XLOOP:</div><div class='del'>-$ read/end=end_xloop xtmp xline</div><div class='del'>-$ xline = f$edit(xline,"compress")</div><div class='del'>-$ write atmp xline</div><div class='del'>-$ goto xloop</div><div class='del'>-$ END_XLOOP:</div><div class='del'>-$ close xtmp</div><div class='del'>-$ goto loop</div><div class='del'>-$ end_loop:</div><div class='del'>-$ close in</div><div class='del'>-$ close atmp</div><div class='del'>-$ if f$search("a.tmp") .eqs. "" -</div><div class='del'>-	then $ exit</div><div class='del'>-$ ! all global definitions</div><div class='del'>-$ search a.tmp "symbol:","EGSY$V_DEF 1","EGSY$V_NORM 1"/out=b.tmp</div><div class='del'>-$ ! all procedures</div><div class='del'>-$ search b.tmp "EGSY$V_NORM 1"/wind=(0,1) /out=c.tmp</div><div class='del'>-$ search c.tmp "symbol:"/out=d.tmp</div><div class='del'>-$ define/user sys$output nl:</div><div class='del'>-$ edito/edt/command=sys$input d.tmp</div><div class='del'>-sub/symbol: "/symbol_vector=(/whole</div><div class='del'>-sub/"/=PROCEDURE)/whole</div><div class='del'>-exit</div><div class='del'>-$ ! all data</div><div class='del'>-$ search b.tmp "EGSY$V_DEF 1"/wind=(0,1) /out=e.tmp</div><div class='del'>-$ search e.tmp "symbol:"/out=f.tmp</div><div class='del'>-$ define/user sys$output nl:</div><div class='del'>-$ edito/edt/command=sys$input f.tmp</div><div class='del'>-sub/symbol: "/symbol_vector=(/whole</div><div class='del'>-sub/"/=DATA)/whole</div><div class='del'>-exit</div><div class='del'>-$ sort/nodupl d.tmp,f.tmp 'p2'</div><div class='del'>-$ delete a.tmp;*,b.tmp;*,c.tmp;*,d.tmp;*,e.tmp;*,f.tmp;*</div><div class='del'>-$ if f$search("x.tmp") .nes. "" -</div><div class='del'>-	then $ delete x.tmp;*</div><div class='del'>-$!</div><div class='del'>-$ EXIT_AA:</div><div class='del'>-$ if V then set verify</div><div class='del'>-$ endsubroutine</div><div class='del'>-$!------------------------------------------------------------------------------</div><div class='head'>diff --git a/src/3rdparty/zlib/minigzip.c b/src/3rdparty/zlib/minigzip.c<br/>index 4524b96..9825ccc 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/minigzip.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/minigzip.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/minigzip.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/minigzip.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* minigzip.c -- simulate gzip using the zlib compression library</div><div class='del'>- * Copyright (C) 1995-2005 Jean-loup Gailly.</div><div class='add'>+ * Copyright (C) 1995-2006, 2010 Jean-loup Gailly.</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -15,8 +15,8 @@</div><div class='ctx'> </div><div class='ctx'> /* @(#) $Id$ */</div><div class='ctx'> </div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='ctx'> #include "zlib.h"</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef STDC</div><div class='ctx'> #  include &lt;string.h&gt;</div><div class='hunk'>@@ -32,6 +32,9 @@</div><div class='ctx'> #if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)</div><div class='ctx'> #  include &lt;fcntl.h&gt;</div><div class='ctx'> #  include &lt;io.h&gt;</div><div class='add'>+#  ifdef UNDER_CE</div><div class='add'>+#    include &lt;stdlib.h&gt;</div><div class='add'>+#  endif</div><div class='ctx'> #  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)</div><div class='ctx'> #else</div><div class='ctx'> #  define SET_BINARY_MODE(file)</div><div class='hunk'>@@ -50,9 +53,75 @@</div><div class='ctx'> #  include &lt;unix.h&gt; /* for fileno */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if !defined(Z_HAVE_UNISTD_H) &amp;&amp; !defined(_LARGEFILE64_SOURCE)</div><div class='ctx'> #ifndef WIN32 /* unlink already in stdio.h for WIN32 */</div><div class='ctx'>   extern int unlink OF((const char *));</div><div class='ctx'> #endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(UNDER_CE)</div><div class='add'>+#  include &lt;windows.h&gt;</div><div class='add'>+#  define perror(s) pwinerror(s)</div><div class='add'>+</div><div class='add'>+/* Map the Windows error number in ERROR to a locale-dependent error</div><div class='add'>+   message string and return a pointer to it.  Typically, the values</div><div class='add'>+   for ERROR come from GetLastError.</div><div class='add'>+</div><div class='add'>+   The string pointed to shall not be modified by the application,</div><div class='add'>+   but may be overwritten by a subsequent call to strwinerror</div><div class='add'>+</div><div class='add'>+   The strwinerror function does not change the current setting</div><div class='add'>+   of GetLastError.  */</div><div class='add'>+</div><div class='add'>+static char *strwinerror (error)</div><div class='add'>+     DWORD error;</div><div class='add'>+{</div><div class='add'>+    static char buf[1024];</div><div class='add'>+</div><div class='add'>+    wchar_t *msgbuf;</div><div class='add'>+    DWORD lasterr = GetLastError();</div><div class='add'>+    DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM</div><div class='add'>+        | FORMAT_MESSAGE_ALLOCATE_BUFFER,</div><div class='add'>+        NULL,</div><div class='add'>+        error,</div><div class='add'>+        0, /* Default language */</div><div class='add'>+        (LPVOID)&amp;msgbuf,</div><div class='add'>+        0,</div><div class='add'>+        NULL);</div><div class='add'>+    if (chars != 0) {</div><div class='add'>+        /* If there is an \r\n appended, zap it.  */</div><div class='add'>+        if (chars &gt;= 2</div><div class='add'>+            &amp;&amp; msgbuf[chars - 2] == '\r' &amp;&amp; msgbuf[chars - 1] == '\n') {</div><div class='add'>+            chars -= 2;</div><div class='add'>+            msgbuf[chars] = 0;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if (chars &gt; sizeof (buf) - 1) {</div><div class='add'>+            chars = sizeof (buf) - 1;</div><div class='add'>+            msgbuf[chars] = 0;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        wcstombs(buf, msgbuf, chars + 1);</div><div class='add'>+        LocalFree(msgbuf);</div><div class='add'>+    }</div><div class='add'>+    else {</div><div class='add'>+        sprintf(buf, "unknown win32 error (%ld)", error);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    SetLastError(lasterr);</div><div class='add'>+    return buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pwinerror (s)</div><div class='add'>+    const char *s;</div><div class='add'>+{</div><div class='add'>+    if (s &amp;&amp; *s)</div><div class='add'>+        fprintf(stderr, "%s: %s\n", s, strwinerror(GetLastError ()));</div><div class='add'>+    else</div><div class='add'>+        fprintf(stderr, "%s\n", strwinerror(GetLastError ()));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* UNDER_CE */</div><div class='ctx'> </div><div class='ctx'> #ifndef GZ_SUFFIX</div><div class='ctx'> #  define GZ_SUFFIX ".gz"</div><div class='hunk'>@@ -198,6 +267,11 @@ void file_compress(file, mode)</div><div class='ctx'>     FILE  *in;</div><div class='ctx'>     gzFile out;</div><div class='ctx'> </div><div class='add'>+    if (strlen(file) + strlen(GZ_SUFFIX) &gt;= sizeof(outfile)) {</div><div class='add'>+        fprintf(stderr, "%s: filename too long\n", prog);</div><div class='add'>+        exit(1);</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     strcpy(outfile, file);</div><div class='ctx'>     strcat(outfile, GZ_SUFFIX);</div><div class='ctx'> </div><div class='hunk'>@@ -227,7 +301,12 @@ void file_uncompress(file)</div><div class='ctx'>     char *infile, *outfile;</div><div class='ctx'>     FILE  *out;</div><div class='ctx'>     gzFile in;</div><div class='del'>-    uInt len = (uInt)strlen(file);</div><div class='add'>+    size_t len = strlen(file);</div><div class='add'>+</div><div class='add'>+    if (len + strlen(GZ_SUFFIX) &gt;= sizeof(buf)) {</div><div class='add'>+        fprintf(stderr, "%s: filename too long\n", prog);</div><div class='add'>+        exit(1);</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     strcpy(buf, file);</div><div class='ctx'> </div><div class='hunk'>@@ -258,7 +337,8 @@ void file_uncompress(file)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* ===========================================================================</div><div class='del'>- * Usage:  minigzip [-d] [-f] [-h] [-r] [-1 to -9] [files...]</div><div class='add'>+ * Usage:  minigzip [-c] [-d] [-f] [-h] [-r] [-1 to -9] [files...]</div><div class='add'>+ *   -c : write to standard output</div><div class='ctx'>  *   -d : decompress</div><div class='ctx'>  *   -f : compress with Z_FILTERED</div><div class='ctx'>  *   -h : compress with Z_HUFFMAN_ONLY</div><div class='hunk'>@@ -270,17 +350,30 @@ int main(argc, argv)</div><div class='ctx'>     int argc;</div><div class='ctx'>     char *argv[];</div><div class='ctx'> {</div><div class='add'>+    int copyout = 0;</div><div class='ctx'>     int uncompr = 0;</div><div class='ctx'>     gzFile file;</div><div class='del'>-    char outmode[20];</div><div class='add'>+    char *bname, outmode[20];</div><div class='ctx'> </div><div class='ctx'>     strcpy(outmode, "wb6 ");</div><div class='ctx'> </div><div class='ctx'>     prog = argv[0];</div><div class='add'>+    bname = strrchr(argv[0], '/');</div><div class='add'>+    if (bname)</div><div class='add'>+      bname++;</div><div class='add'>+    else</div><div class='add'>+      bname = argv[0];</div><div class='ctx'>     argc--, argv++;</div><div class='ctx'> </div><div class='add'>+    if (!strcmp(bname, "gunzip"))</div><div class='add'>+      uncompr = 1;</div><div class='add'>+    else if (!strcmp(bname, "zcat"))</div><div class='add'>+      copyout = uncompr = 1;</div><div class='add'>+</div><div class='ctx'>     while (argc &gt; 0) {</div><div class='del'>-      if (strcmp(*argv, "-d") == 0)</div><div class='add'>+      if (strcmp(*argv, "-c") == 0)</div><div class='add'>+        copyout = 1;</div><div class='add'>+      else if (strcmp(*argv, "-d") == 0)</div><div class='ctx'>         uncompr = 1;</div><div class='ctx'>       else if (strcmp(*argv, "-f") == 0)</div><div class='ctx'>         outmode[3] = 'f';</div><div class='hunk'>@@ -310,11 +403,36 @@ int main(argc, argv)</div><div class='ctx'>             gz_compress(stdin, file);</div><div class='ctx'>         }</div><div class='ctx'>     } else {</div><div class='add'>+        if (copyout) {</div><div class='add'>+            SET_BINARY_MODE(stdout);</div><div class='add'>+        }</div><div class='ctx'>         do {</div><div class='ctx'>             if (uncompr) {</div><div class='del'>-                file_uncompress(*argv);</div><div class='add'>+                if (copyout) {</div><div class='add'>+                    file = gzopen(*argv, "rb");</div><div class='add'>+                    if (file == NULL)</div><div class='add'>+                        fprintf(stderr, "%s: can't gzopen %s\n", prog, *argv);</div><div class='add'>+                    else</div><div class='add'>+                        gz_uncompress(file, stdout);</div><div class='add'>+                } else {</div><div class='add'>+                    file_uncompress(*argv);</div><div class='add'>+                }</div><div class='ctx'>             } else {</div><div class='del'>-                file_compress(*argv, outmode);</div><div class='add'>+                if (copyout) {</div><div class='add'>+                    FILE * in = fopen(*argv, "rb");</div><div class='add'>+</div><div class='add'>+                    if (in == NULL) {</div><div class='add'>+                        perror(*argv);</div><div class='add'>+                    } else {</div><div class='add'>+                        file = gzdopen(fileno(stdout), outmode);</div><div class='add'>+                        if (file == NULL) error("can't gzdopen stdout");</div><div class='add'>+</div><div class='add'>+                        gz_compress(in, file);</div><div class='add'>+                    }</div><div class='add'>+</div><div class='add'>+                } else {</div><div class='add'>+                    file_compress(*argv, outmode);</div><div class='add'>+                }</div><div class='ctx'>             }</div><div class='ctx'>         } while (argv++, --argc);</div><div class='ctx'>     }</div><div class='head'>diff --git a/src/3rdparty/zlib/projects/README.projects b/src/3rdparty/zlib/projects/README.projects<br/>deleted file mode 100644<br/>index 1c029e4..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/projects/README.projects?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/projects/README.projects</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-This directory contains project files for building zlib under various</div><div class='del'>-Integrated Development Environments (IDE).</div><div class='del'>-</div><div class='del'>-If you wish to submit a new project to this directory, you should comply</div><div class='del'>-to the following requirements.  Otherwise (e.g. if you wish to integrate</div><div class='del'>-a custom piece of code that changes the zlib interface or its behavior),</div><div class='del'>-please consider submitting the project to the contrib directory.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Requirements</div><div class='del'>-============</div><div class='del'>-</div><div class='del'>-- The project must build zlib using the source files from the official</div><div class='del'>-  zlib source distribution, exclusively.</div><div class='del'>-</div><div class='del'>-- If the project produces redistributable builds (e.g. shared objects</div><div class='del'>-  or DLL files), these builds must be compatible to those produced by</div><div class='del'>-  makefiles, if such makefiles exist in the zlib distribution.</div><div class='del'>-  In particular, if the project produces a DLL build for the Win32</div><div class='del'>-  platform, this build must comply to the officially-ammended Win32 DLL</div><div class='del'>-  Application Binary Interface (ABI), described in win32/DLL_FAQ.txt.</div><div class='del'>-</div><div class='del'>-- The project may provide additional build targets, which depend on</div><div class='del'>-  3rd-party (unofficially-supported) software, present in the contrib</div><div class='del'>-  directory.  For example, it is possible to provide an "ASM build",</div><div class='del'>-  besides the officially-supported build, and have ASM source files</div><div class='del'>-  among its dependencies.</div><div class='del'>-</div><div class='del'>-- If there are significant differences between the project files created</div><div class='del'>-  by different versions of an IDE (e.g. Visual C++ 6.0 vs. 7.0), the name</div><div class='del'>-  of the project directory should contain the version number of the IDE</div><div class='del'>-  for which the project is intended (e.g. "visualc6" for Visual C++ 6.0,</div><div class='del'>-  or "visualc7" for Visual C++ 7.0 and 7.1).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Current projects</div><div class='del'>-================</div><div class='del'>-</div><div class='del'>-visualc6/   by Simon-Pierre Cadieux &lt;methodex@methodex.ca&gt;</div><div class='del'>-            and Cosmin Truta &lt;cosmint@cs.ubbcluj.ro&gt;</div><div class='del'>-        Project for Microsoft Visual C++ 6.0</div><div class='head'>diff --git a/src/3rdparty/zlib/projects/visualc6/README.txt b/src/3rdparty/zlib/projects/visualc6/README.txt<br/>deleted file mode 100644<br/>index d0296c2..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/projects/visualc6/README.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/projects/visualc6/README.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-Microsoft Developer Studio Project Files, Format Version 6.00 for zlib.
</div><div class='del'>-
</div><div class='del'>-Copyright (C) 2000-2004 Simon-Pierre Cadieux.
</div><div class='del'>-Copyright (C) 2004 Cosmin Truta.
</div><div class='del'>-For conditions of distribution and use, see copyright notice in zlib.h.
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-This project builds the zlib binaries as follows:
</div><div class='del'>-
</div><div class='del'>-* Win32_DLL_Release\zlib1.dll       DLL build
</div><div class='del'>-* Win32_DLL_Debug\zlib1d.dll        DLL build (debug version)
</div><div class='del'>-* Win32_DLL_ASM_Release\zlib1.dll   DLL build using ASM code
</div><div class='del'>-* Win32_DLL_ASM_Debug\zlib1d.dll    DLL build using ASM code (debug version)
</div><div class='del'>-* Win32_LIB_Release\zlib.lib        static build
</div><div class='del'>-* Win32_LIB_Debug\zlibd.lib         static build (debug version)
</div><div class='del'>-* Win32_LIB_ASM_Release\zlib.lib    static build using ASM code
</div><div class='del'>-* Win32_LIB_ASM_Debug\zlibd.lib     static build using ASM code (debug version)
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-For more information regarding the DLL builds, please see the DLL FAQ
</div><div class='del'>-in ..\..\win32\DLL_FAQ.txt.
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-To build and test:
</div><div class='del'>-
</div><div class='del'>-1) On the main menu, select "File | Open Workspace".
</div><div class='del'>-   Open "zlib.dsw".
</div><div class='del'>-
</div><div class='del'>-2) Select "Build | Set Active Configuration".
</div><div class='del'>-   Choose the configuration you wish to build.
</div><div class='del'>-
</div><div class='del'>-3) Select "Build | Clean".
</div><div class='del'>-
</div><div class='del'>-4) Select "Build | Build ... (F7)".  Ignore warning messages about
</div><div class='del'>-   not being able to find certain include files (e.g. alloc.h).
</div><div class='del'>-
</div><div class='del'>-5) If you built one of the sample programs (example or minigzip),
</div><div class='del'>-   select "Build | Execute ... (Ctrl+F5)".
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-To use:
</div><div class='del'>-
</div><div class='del'>-1) Select "Project | Settings (Alt+F7)".
</div><div class='del'>-   Make note of the configuration names used in your project.
</div><div class='del'>-   Usually, these names are "Win32 Release" and "Win32 Debug".
</div><div class='del'>-
</div><div class='del'>-2) In the Workspace window, select the "FileView" tab.
</div><div class='del'>-   Right-click on the root item "Workspace '...'".
</div><div class='del'>-   Select "Insert Project into Workspace".
</div><div class='del'>-   Switch on the checkbox "Dependency of:", and select the name
</div><div class='del'>-   of your project.  Open "zlib.dsp".
</div><div class='del'>-
</div><div class='del'>-3) Select "Build | Configurations".
</div><div class='del'>-   For each configuration of your project:
</div><div class='del'>-   3.1) Choose the zlib configuration you wish to use.
</div><div class='del'>-   3.2) Click on "Add".
</div><div class='del'>-   3.3) Set the new zlib configuration name to the name used by
</div><div class='del'>-        the configuration from the current iteration.
</div><div class='del'>-
</div><div class='del'>-4) Select "Build | Set Active Configuration".
</div><div class='del'>-   Choose the configuration you wish to build.
</div><div class='del'>-
</div><div class='del'>-5) Select "Build | Build ... (F7)".
</div><div class='del'>-
</div><div class='del'>-6) If you built an executable program, select
</div><div class='del'>-   "Build | Execute ... (Ctrl+F5)".
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-Note:
</div><div class='del'>-
</div><div class='del'>-To build the ASM-enabled code, you need Microsoft Assembler
</div><div class='del'>-(ML.EXE).  You can get it by downloading and installing the
</div><div class='del'>-latest Processor Pack for Visual C++ 6.0.
</div><div class='head'>diff --git a/src/3rdparty/zlib/projects/visualc6/example.dsp b/src/3rdparty/zlib/projects/visualc6/example.dsp<br/>deleted file mode 100644<br/>index e072a37..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/projects/visualc6/example.dsp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/projects/visualc6/example.dsp</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,278 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Project File - Name="example" - Package Owner=&lt;4&gt;
</div><div class='del'>-# Microsoft Developer Studio Generated Build File, Format Version 6.00
</div><div class='del'>-# ** DO NOT EDIT **
</div><div class='del'>-
</div><div class='del'>-# TARGTYPE "Win32 (x86) Console Application" 0x0103
</div><div class='del'>-
</div><div class='del'>-CFG=example - Win32 LIB Debug
</div><div class='del'>-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
</div><div class='del'>-!MESSAGE use the Export Makefile command and run
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE NMAKE /f "example.mak".
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE You can specify a configuration when running NMAKE
</div><div class='del'>-!MESSAGE by defining the macro CFG on the command line. For example:
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE NMAKE /f "example.mak" CFG="example - Win32 LIB Debug"
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE Possible choices for configuration are:
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE "example - Win32 DLL Release" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "example - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "example - Win32 DLL ASM Release" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "example - Win32 DLL ASM Debug" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "example - Win32 LIB Release" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "example - Win32 LIB Debug" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "example - Win32 LIB ASM Release" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "example - Win32 LIB ASM Debug" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-
</div><div class='del'>-# Begin Project
</div><div class='del'>-# PROP AllowPerConfigDependencies 0
</div><div class='del'>-# PROP Scc_ProjName ""
</div><div class='del'>-# PROP Scc_LocalPath ""
</div><div class='del'>-CPP=cl.exe
</div><div class='del'>-RSC=rc.exe
</div><div class='del'>-
</div><div class='del'>-!IF  "$(CFG)" == "example - Win32 DLL Release"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "example___Win32_DLL_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "example___Win32_DLL_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_Release"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_Release"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
</div><div class='del'>-# ADD LINK32 /nologo /subsystem:console /machine:I386
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "example - Win32 DLL Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 1
</div><div class='del'>-# PROP BASE Output_Dir "example___Win32_DLL_Debug"
</div><div class='del'>-# PROP BASE Intermediate_Dir "example___Win32_DLL_Debug"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 1
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_Debug"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_Debug"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "example - Win32 DLL ASM Release"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "example___Win32_DLL_ASM_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "example___Win32_DLL_ASM_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_ASM_Release"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_ASM_Release"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
</div><div class='del'>-# ADD LINK32 /nologo /subsystem:console /machine:I386
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "example - Win32 DLL ASM Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 1
</div><div class='del'>-# PROP BASE Output_Dir "example___Win32_DLL_ASM_Debug"
</div><div class='del'>-# PROP BASE Intermediate_Dir "example___Win32_DLL_ASM_Debug"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 1
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_ASM_Debug"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_ASM_Debug"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "example - Win32 LIB Release"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "example___Win32_LIB_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "example___Win32_LIB_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_LIB_Release"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_LIB_Release"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
</div><div class='del'>-# ADD LINK32 /nologo /subsystem:console /machine:I386
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "example - Win32 LIB Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 1
</div><div class='del'>-# PROP BASE Output_Dir "example___Win32_LIB_Debug"
</div><div class='del'>-# PROP BASE Intermediate_Dir "example___Win32_LIB_Debug"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 1
</div><div class='del'>-# PROP Output_Dir "Win32_LIB_Debug"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_LIB_Debug"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "example - Win32 LIB ASM Release"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "example___Win32_LIB_ASM_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "example___Win32_LIB_ASM_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_LIB_ASM_Release"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_LIB_ASM_Release"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
</div><div class='del'>-# ADD LINK32 /nologo /subsystem:console /machine:I386
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "example - Win32 LIB ASM Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 1
</div><div class='del'>-# PROP BASE Output_Dir "example___Win32_LIB_ASM_Debug"
</div><div class='del'>-# PROP BASE Intermediate_Dir "example___Win32_LIB_ASM_Debug"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 1
</div><div class='del'>-# PROP Output_Dir "Win32_LIB_ASM_Debug"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_LIB_ASM_Debug"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-
</div><div class='del'>-!ENDIF 
</div><div class='del'>-
</div><div class='del'>-# Begin Target
</div><div class='del'>-
</div><div class='del'>-# Name "example - Win32 DLL Release"
</div><div class='del'>-# Name "example - Win32 DLL Debug"
</div><div class='del'>-# Name "example - Win32 DLL ASM Release"
</div><div class='del'>-# Name "example - Win32 DLL ASM Debug"
</div><div class='del'>-# Name "example - Win32 LIB Release"
</div><div class='del'>-# Name "example - Win32 LIB Debug"
</div><div class='del'>-# Name "example - Win32 LIB ASM Release"
</div><div class='del'>-# Name "example - Win32 LIB ASM Debug"
</div><div class='del'>-# Begin Group "Source Files"
</div><div class='del'>-
</div><div class='del'>-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\example.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# End Group
</div><div class='del'>-# Begin Group "Header Files"
</div><div class='del'>-
</div><div class='del'>-# PROP Default_Filter "h;hpp;hxx;hm;inl"
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\zconf.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\zlib.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# End Group
</div><div class='del'>-# End Target
</div><div class='del'>-# End Project
</div><div class='head'>diff --git a/src/3rdparty/zlib/projects/visualc6/minigzip.dsp b/src/3rdparty/zlib/projects/visualc6/minigzip.dsp<br/>deleted file mode 100644<br/>index f32024e..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/projects/visualc6/minigzip.dsp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/projects/visualc6/minigzip.dsp</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,278 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Project File - Name="minigzip" - Package Owner=&lt;4&gt;
</div><div class='del'>-# Microsoft Developer Studio Generated Build File, Format Version 6.00
</div><div class='del'>-# ** DO NOT EDIT **
</div><div class='del'>-
</div><div class='del'>-# TARGTYPE "Win32 (x86) Console Application" 0x0103
</div><div class='del'>-
</div><div class='del'>-CFG=minigzip - Win32 LIB Debug
</div><div class='del'>-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
</div><div class='del'>-!MESSAGE use the Export Makefile command and run
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE NMAKE /f "minigzip.mak".
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE You can specify a configuration when running NMAKE
</div><div class='del'>-!MESSAGE by defining the macro CFG on the command line. For example:
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE NMAKE /f "minigzip.mak" CFG="minigzip - Win32 LIB Debug"
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE Possible choices for configuration are:
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE "minigzip - Win32 DLL Release" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "minigzip - Win32 DLL Debug" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "minigzip - Win32 DLL ASM Release" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "minigzip - Win32 DLL ASM Debug" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "minigzip - Win32 LIB Release" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "minigzip - Win32 LIB Debug" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "minigzip - Win32 LIB ASM Release" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE "minigzip - Win32 LIB ASM Debug" (based on "Win32 (x86) Console Application")
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-
</div><div class='del'>-# Begin Project
</div><div class='del'>-# PROP AllowPerConfigDependencies 0
</div><div class='del'>-# PROP Scc_ProjName ""
</div><div class='del'>-# PROP Scc_LocalPath ""
</div><div class='del'>-CPP=cl.exe
</div><div class='del'>-RSC=rc.exe
</div><div class='del'>-
</div><div class='del'>-!IF  "$(CFG)" == "minigzip - Win32 DLL Release"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "minigzip___Win32_DLL_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "minigzip___Win32_DLL_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_Release"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_Release"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
</div><div class='del'>-# ADD LINK32 /nologo /subsystem:console /machine:I386
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "minigzip - Win32 DLL Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 1
</div><div class='del'>-# PROP BASE Output_Dir "minigzip___Win32_DLL_Debug"
</div><div class='del'>-# PROP BASE Intermediate_Dir "minigzip___Win32_DLL_Debug"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 1
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_Debug"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_Debug"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "minigzip - Win32 DLL ASM Release"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "minigzip___Win32_DLL_ASM_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "minigzip___Win32_DLL_ASM_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_ASM_Release"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_ASM_Release"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
</div><div class='del'>-# ADD LINK32 /nologo /subsystem:console /machine:I386
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "minigzip - Win32 DLL ASM Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 1
</div><div class='del'>-# PROP BASE Output_Dir "minigzip___Win32_DLL_ASM_Debug"
</div><div class='del'>-# PROP BASE Intermediate_Dir "minigzip___Win32_DLL_ASM_Debug"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 1
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_ASM_Debug"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_ASM_Debug"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "minigzip - Win32 LIB Release"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "minigzip___Win32_LIB_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "minigzip___Win32_LIB_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_LIB_Release"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_LIB_Release"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
</div><div class='del'>-# ADD LINK32 /nologo /subsystem:console /machine:I386
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "minigzip - Win32 LIB Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 1
</div><div class='del'>-# PROP BASE Output_Dir "minigzip___Win32_LIB_Debug"
</div><div class='del'>-# PROP BASE Intermediate_Dir "minigzip___Win32_LIB_Debug"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 1
</div><div class='del'>-# PROP Output_Dir "Win32_LIB_Debug"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_LIB_Debug"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "minigzip - Win32 LIB ASM Release"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "minigzip___Win32_LIB_ASM_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "minigzip___Win32_LIB_ASM_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_LIB_ASM_Release"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_LIB_ASM_Release"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
</div><div class='del'>-# ADD LINK32 /nologo /subsystem:console /machine:I386
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "minigzip - Win32 LIB ASM Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 1
</div><div class='del'>-# PROP BASE Output_Dir "minigzip___Win32_LIB_ASM_Debug"
</div><div class='del'>-# PROP BASE Intermediate_Dir "minigzip___Win32_LIB_ASM_Debug"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 1
</div><div class='del'>-# PROP Output_Dir "Win32_LIB_ASM_Debug"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_LIB_ASM_Debug"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX
</div><div class='del'>-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT CPP /YX
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-
</div><div class='del'>-!ENDIF 
</div><div class='del'>-
</div><div class='del'>-# Begin Target
</div><div class='del'>-
</div><div class='del'>-# Name "minigzip - Win32 DLL Release"
</div><div class='del'>-# Name "minigzip - Win32 DLL Debug"
</div><div class='del'>-# Name "minigzip - Win32 DLL ASM Release"
</div><div class='del'>-# Name "minigzip - Win32 DLL ASM Debug"
</div><div class='del'>-# Name "minigzip - Win32 LIB Release"
</div><div class='del'>-# Name "minigzip - Win32 LIB Debug"
</div><div class='del'>-# Name "minigzip - Win32 LIB ASM Release"
</div><div class='del'>-# Name "minigzip - Win32 LIB ASM Debug"
</div><div class='del'>-# Begin Group "Source Files"
</div><div class='del'>-
</div><div class='del'>-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\minigzip.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# End Group
</div><div class='del'>-# Begin Group "Header Files"
</div><div class='del'>-
</div><div class='del'>-# PROP Default_Filter "h;hpp;hxx;hm;inl"
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\zconf.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\zlib.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# End Group
</div><div class='del'>-# End Target
</div><div class='del'>-# End Project
</div><div class='head'>diff --git a/src/3rdparty/zlib/projects/visualc6/zlib.dsp b/src/3rdparty/zlib/projects/visualc6/zlib.dsp<br/>deleted file mode 100644<br/>index 0fe0604..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/projects/visualc6/zlib.dsp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/projects/visualc6/zlib.dsp</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,609 +0,0 @@</div><div class='del'>-# Microsoft Developer Studio Project File - Name="zlib" - Package Owner=&lt;4&gt;
</div><div class='del'>-# Microsoft Developer Studio Generated Build File, Format Version 6.00
</div><div class='del'>-# ** DO NOT EDIT **
</div><div class='del'>-
</div><div class='del'>-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
</div><div class='del'>-# TARGTYPE "Win32 (x86) Static Library" 0x0104
</div><div class='del'>-
</div><div class='del'>-CFG=zlib - Win32 LIB Debug
</div><div class='del'>-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
</div><div class='del'>-!MESSAGE use the Export Makefile command and run
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE NMAKE /f "zlib.mak".
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE You can specify a configuration when running NMAKE
</div><div class='del'>-!MESSAGE by defining the macro CFG on the command line. For example:
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 LIB Debug"
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE Possible choices for configuration are:
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-!MESSAGE "zlib - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
</div><div class='del'>-!MESSAGE "zlib - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
</div><div class='del'>-!MESSAGE "zlib - Win32 DLL ASM Release" (based on "Win32 (x86) Dynamic-Link Library")
</div><div class='del'>-!MESSAGE "zlib - Win32 DLL ASM Debug" (based on "Win32 (x86) Dynamic-Link Library")
</div><div class='del'>-!MESSAGE "zlib - Win32 LIB Release" (based on "Win32 (x86) Static Library")
</div><div class='del'>-!MESSAGE "zlib - Win32 LIB Debug" (based on "Win32 (x86) Static Library")
</div><div class='del'>-!MESSAGE "zlib - Win32 LIB ASM Release" (based on "Win32 (x86) Static Library")
</div><div class='del'>-!MESSAGE "zlib - Win32 LIB ASM Debug" (based on "Win32 (x86) Static Library")
</div><div class='del'>-!MESSAGE 
</div><div class='del'>-
</div><div class='del'>-# Begin Project
</div><div class='del'>-# PROP AllowPerConfigDependencies 0
</div><div class='del'>-# PROP Scc_ProjName ""
</div><div class='del'>-# PROP Scc_LocalPath ""
</div><div class='del'>-
</div><div class='del'>-!IF  "$(CFG)" == "zlib - Win32 DLL Release"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "zlib___Win32_DLL_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "zlib___Win32_DLL_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_Release"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_Release"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-CPP=cl.exe
</div><div class='del'>-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX /Yc /Yu
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX /Yc /Yu
</div><div class='del'>-MTL=midl.exe
</div><div class='del'>-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
</div><div class='del'>-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
</div><div class='del'>-RSC=rc.exe
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
</div><div class='del'>-# ADD LINK32 /nologo /dll /machine:I386 /out:"Win32_DLL_Release\zlib1.dll"
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 1
</div><div class='del'>-# PROP BASE Output_Dir "zlib___Win32_DLL_Debug"
</div><div class='del'>-# PROP BASE Intermediate_Dir "zlib___Win32_DLL_Debug"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 1
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_Debug"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_Debug"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-CPP=cl.exe
</div><div class='del'>-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX /Yc /Yu
</div><div class='del'>-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT CPP /YX /Yc /Yu
</div><div class='del'>-MTL=midl.exe
</div><div class='del'>-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
</div><div class='del'>-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
</div><div class='del'>-RSC=rc.exe
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Win32_DLL_Debug\zlib1d.dll" /pdbtype:sept
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "zlib___Win32_DLL_ASM_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "zlib___Win32_DLL_ASM_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_ASM_Release"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_ASM_Release"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-CPP=cl.exe
</div><div class='del'>-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX /Yc /Yu
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "ASMV" /D "ASMINF" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX /Yc /Yu
</div><div class='del'>-MTL=midl.exe
</div><div class='del'>-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
</div><div class='del'>-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
</div><div class='del'>-RSC=rc.exe
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
</div><div class='del'>-# ADD LINK32 /nologo /dll /machine:I386 /out:"Win32_DLL_ASM_Release\zlib1.dll"
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 1
</div><div class='del'>-# PROP BASE Output_Dir "zlib___Win32_DLL_ASM_Debug"
</div><div class='del'>-# PROP BASE Intermediate_Dir "zlib___Win32_DLL_ASM_Debug"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 1
</div><div class='del'>-# PROP Output_Dir "Win32_DLL_ASM_Debug"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_DLL_ASM_Debug"
</div><div class='del'>-# PROP Ignore_Export_Lib 0
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-CPP=cl.exe
</div><div class='del'>-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX /Yc /Yu
</div><div class='del'>-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "ASMV" /D "ASMINF" /FD /GZ /c
</div><div class='del'>-# SUBTRACT CPP /YX /Yc /Yu
</div><div class='del'>-MTL=midl.exe
</div><div class='del'>-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
</div><div class='del'>-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
</div><div class='del'>-RSC=rc.exe
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LINK32=link.exe
</div><div class='del'>-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
</div><div class='del'>-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Win32_DLL_ASM_Debug\zlib1d.dll" /pdbtype:sept
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Release"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "zlib___Win32_LIB_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "zlib___Win32_LIB_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_LIB_Release"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_LIB_Release"
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-CPP=cl.exe
</div><div class='del'>-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX /Yc /Yu
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX /Yc /Yu
</div><div class='del'>-RSC=rc.exe
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LIB32=link.exe -lib
</div><div class='del'>-# ADD BASE LIB32 /nologo
</div><div class='del'>-# ADD LIB32 /nologo
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 1
</div><div class='del'>-# PROP BASE Output_Dir "zlib___Win32_LIB_Debug"
</div><div class='del'>-# PROP BASE Intermediate_Dir "zlib___Win32_LIB_Debug"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 1
</div><div class='del'>-# PROP Output_Dir "Win32_LIB_Debug"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_LIB_Debug"
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-CPP=cl.exe
</div><div class='del'>-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX /Yc /Yu
</div><div class='del'>-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT CPP /YX /Yc /Yu
</div><div class='del'>-RSC=rc.exe
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LIB32=link.exe -lib
</div><div class='del'>-# ADD BASE LIB32 /nologo
</div><div class='del'>-# ADD LIB32 /nologo /out:"Win32_LIB_Debug\zlibd.lib"
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Release"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 0
</div><div class='del'>-# PROP BASE Output_Dir "zlib___Win32_LIB_ASM_Release"
</div><div class='del'>-# PROP BASE Intermediate_Dir "zlib___Win32_LIB_ASM_Release"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 0
</div><div class='del'>-# PROP Output_Dir "Win32_LIB_ASM_Release"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_LIB_ASM_Release"
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-CPP=cl.exe
</div><div class='del'>-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX /Yc /Yu
</div><div class='del'>-# ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "ASMV" /D "ASMINF" /FD /c
</div><div class='del'>-# SUBTRACT CPP /YX /Yc /Yu
</div><div class='del'>-RSC=rc.exe
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "NDEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LIB32=link.exe -lib
</div><div class='del'>-# ADD BASE LIB32 /nologo
</div><div class='del'>-# ADD LIB32 /nologo
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP BASE Use_MFC 0
</div><div class='del'>-# PROP BASE Use_Debug_Libraries 1
</div><div class='del'>-# PROP BASE Output_Dir "zlib___Win32_LIB_ASM_Debug"
</div><div class='del'>-# PROP BASE Intermediate_Dir "zlib___Win32_LIB_ASM_Debug"
</div><div class='del'>-# PROP BASE Target_Dir ""
</div><div class='del'>-# PROP Use_MFC 0
</div><div class='del'>-# PROP Use_Debug_Libraries 1
</div><div class='del'>-# PROP Output_Dir "Win32_LIB_ASM_Debug"
</div><div class='del'>-# PROP Intermediate_Dir "Win32_LIB_ASM_Debug"
</div><div class='del'>-# PROP Target_Dir ""
</div><div class='del'>-CPP=cl.exe
</div><div class='del'>-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c
</div><div class='del'>-# SUBTRACT BASE CPP /YX /Yc /Yu
</div><div class='del'>-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "ASMV" /D "ASMINF" /FD /GZ /c
</div><div class='del'>-# SUBTRACT CPP /YX /Yc /Yu
</div><div class='del'>-RSC=rc.exe
</div><div class='del'>-# ADD BASE RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-# ADD RSC /l 0x409 /d "_DEBUG"
</div><div class='del'>-BSC32=bscmake.exe
</div><div class='del'>-# ADD BASE BSC32 /nologo
</div><div class='del'>-# ADD BSC32 /nologo
</div><div class='del'>-LIB32=link.exe -lib
</div><div class='del'>-# ADD BASE LIB32 /nologo
</div><div class='del'>-# ADD LIB32 /nologo /out:"Win32_LIB_ASM_Debug\zlibd.lib"
</div><div class='del'>-
</div><div class='del'>-!ENDIF 
</div><div class='del'>-
</div><div class='del'>-# Begin Target
</div><div class='del'>-
</div><div class='del'>-# Name "zlib - Win32 DLL Release"
</div><div class='del'>-# Name "zlib - Win32 DLL Debug"
</div><div class='del'>-# Name "zlib - Win32 DLL ASM Release"
</div><div class='del'>-# Name "zlib - Win32 DLL ASM Debug"
</div><div class='del'>-# Name "zlib - Win32 LIB Release"
</div><div class='del'>-# Name "zlib - Win32 LIB Debug"
</div><div class='del'>-# Name "zlib - Win32 LIB ASM Release"
</div><div class='del'>-# Name "zlib - Win32 LIB ASM Debug"
</div><div class='del'>-# Begin Group "Source Files"
</div><div class='del'>-
</div><div class='del'>-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\adler32.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\compress.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\crc32.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\deflate.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\gzio.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\infback.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\inffast.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\inflate.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\inftrees.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\trees.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\uncompr.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\win32\zlib.def
</div><div class='del'>-
</div><div class='del'>-!IF  "$(CFG)" == "zlib - Win32 DLL Release"
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Debug"
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Debug"
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Release"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Release"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ENDIF 
</div><div class='del'>-
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\zutil.c
</div><div class='del'>-# End Source File
</div><div class='del'>-# End Group
</div><div class='del'>-# Begin Group "Header Files"
</div><div class='del'>-
</div><div class='del'>-# PROP Default_Filter "h;hpp;hxx;hm;inl"
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\crc32.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\deflate.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\inffast.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\inffixed.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\inflate.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\inftrees.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\trees.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\zconf.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\zlib.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\zutil.h
</div><div class='del'>-# End Source File
</div><div class='del'>-# End Group
</div><div class='del'>-# Begin Group "Resource Files"
</div><div class='del'>-
</div><div class='del'>-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\win32\zlib1.rc
</div><div class='del'>-# End Source File
</div><div class='del'>-# End Group
</div><div class='del'>-# Begin Group "Assembler Files (Unsupported)"
</div><div class='del'>-
</div><div class='del'>-# PROP Default_Filter "asm;obj;c;cpp;cxx;h;hpp;hxx"
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\contrib\masmx86\gvmat32.asm
</div><div class='del'>-
</div><div class='del'>-!IF  "$(CFG)" == "zlib - Win32 DLL Release"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
</div><div class='del'>-
</div><div class='del'>-# Begin Custom Build - Assembling...
</div><div class='del'>-IntDir=.\Win32_DLL_ASM_Release
</div><div class='del'>-InputPath=..\..\contrib\masmx86\gvmat32.asm
</div><div class='del'>-InputName=gvmat32
</div><div class='del'>-
</div><div class='del'>-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
</div><div class='del'>-	ml.exe /nologo /c /coff /Cx /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
</div><div class='del'>-
</div><div class='del'>-# End Custom Build
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Debug"
</div><div class='del'>-
</div><div class='del'>-# Begin Custom Build - Assembling...
</div><div class='del'>-IntDir=.\Win32_DLL_ASM_Debug
</div><div class='del'>-InputPath=..\..\contrib\masmx86\gvmat32.asm
</div><div class='del'>-InputName=gvmat32
</div><div class='del'>-
</div><div class='del'>-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
</div><div class='del'>-	ml.exe /nologo /c /coff /Cx /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
</div><div class='del'>-
</div><div class='del'>-# End Custom Build
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Release"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Release"
</div><div class='del'>-
</div><div class='del'>-# Begin Custom Build - Assembling...
</div><div class='del'>-IntDir=.\Win32_LIB_ASM_Release
</div><div class='del'>-InputPath=..\..\contrib\masmx86\gvmat32.asm
</div><div class='del'>-InputName=gvmat32
</div><div class='del'>-
</div><div class='del'>-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
</div><div class='del'>-	ml.exe /nologo /c /coff /Cx /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
</div><div class='del'>-
</div><div class='del'>-# End Custom Build
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Debug"
</div><div class='del'>-
</div><div class='del'>-# Begin Custom Build - Assembling...
</div><div class='del'>-IntDir=.\Win32_LIB_ASM_Debug
</div><div class='del'>-InputPath=..\..\contrib\masmx86\gvmat32.asm
</div><div class='del'>-InputName=gvmat32
</div><div class='del'>-
</div><div class='del'>-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
</div><div class='del'>-	ml.exe /nologo /c /coff /Cx /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
</div><div class='del'>-
</div><div class='del'>-# End Custom Build
</div><div class='del'>-
</div><div class='del'>-!ENDIF 
</div><div class='del'>-
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\contrib\masmx86\gvmat32c.c
</div><div class='del'>-
</div><div class='del'>-!IF  "$(CFG)" == "zlib - Win32 DLL Release"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-# ADD CPP /I "..\.."
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-# ADD CPP /I "..\.."
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
</div><div class='del'>-
</div><div class='del'>-# ADD CPP /I "..\.."
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Debug"
</div><div class='del'>-
</div><div class='del'>-# ADD CPP /I "..\.."
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Release"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-# ADD CPP /I "..\.."
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-# ADD CPP /I "..\.."
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Release"
</div><div class='del'>-
</div><div class='del'>-# ADD CPP /I "..\.."
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Debug"
</div><div class='del'>-
</div><div class='del'>-# ADD CPP /I "..\.."
</div><div class='del'>-
</div><div class='del'>-!ENDIF 
</div><div class='del'>-
</div><div class='del'>-# End Source File
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=..\..\contrib\masmx86\inffas32.asm
</div><div class='del'>-
</div><div class='del'>-!IF  "$(CFG)" == "zlib - Win32 DLL Release"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 DLL Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Release"
</div><div class='del'>-
</div><div class='del'>-# Begin Custom Build - Assembling...
</div><div class='del'>-IntDir=.\Win32_DLL_ASM_Release
</div><div class='del'>-InputPath=..\..\contrib\masmx86\inffas32.asm
</div><div class='del'>-InputName=inffas32
</div><div class='del'>-
</div><div class='del'>-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
</div><div class='del'>-	ml.exe /nologo /c /coff /Cx /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
</div><div class='del'>-
</div><div class='del'>-# End Custom Build
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 DLL ASM Debug"
</div><div class='del'>-
</div><div class='del'>-# Begin Custom Build - Assembling...
</div><div class='del'>-IntDir=.\Win32_DLL_ASM_Debug
</div><div class='del'>-InputPath=..\..\contrib\masmx86\inffas32.asm
</div><div class='del'>-InputName=inffas32
</div><div class='del'>-
</div><div class='del'>-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
</div><div class='del'>-	ml.exe /nologo /c /coff /Cx /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
</div><div class='del'>-
</div><div class='del'>-# End Custom Build
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Release"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB Debug"
</div><div class='del'>-
</div><div class='del'>-# PROP Exclude_From_Build 1
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Release"
</div><div class='del'>-
</div><div class='del'>-# Begin Custom Build - Assembling...
</div><div class='del'>-IntDir=.\Win32_LIB_ASM_Release
</div><div class='del'>-InputPath=..\..\contrib\masmx86\inffas32.asm
</div><div class='del'>-InputName=inffas32
</div><div class='del'>-
</div><div class='del'>-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
</div><div class='del'>-	ml.exe /nologo /c /coff /Cx /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
</div><div class='del'>-
</div><div class='del'>-# End Custom Build
</div><div class='del'>-
</div><div class='del'>-!ELSEIF  "$(CFG)" == "zlib - Win32 LIB ASM Debug"
</div><div class='del'>-
</div><div class='del'>-# Begin Custom Build - Assembling...
</div><div class='del'>-IntDir=.\Win32_LIB_ASM_Debug
</div><div class='del'>-InputPath=..\..\contrib\masmx86\inffas32.asm
</div><div class='del'>-InputName=inffas32
</div><div class='del'>-
</div><div class='del'>-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
</div><div class='del'>-	ml.exe /nologo /c /coff /Cx /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)"
</div><div class='del'>-
</div><div class='del'>-# End Custom Build
</div><div class='del'>-
</div><div class='del'>-!ENDIF 
</div><div class='del'>-
</div><div class='del'>-# End Source File
</div><div class='del'>-# End Group
</div><div class='del'>-# Begin Source File
</div><div class='del'>-
</div><div class='del'>-SOURCE=.\README.txt
</div><div class='del'>-# End Source File
</div><div class='del'>-# End Target
</div><div class='del'>-# End Project
</div><div class='head'>diff --git a/src/3rdparty/zlib/projects/visualc6/zlib.dsw b/src/3rdparty/zlib/projects/visualc6/zlib.dsw<br/>deleted file mode 100644<br/>index 3a771fc..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/projects/visualc6/zlib.dsw?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/projects/visualc6/zlib.dsw</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-Microsoft Developer Studio Workspace File, Format Version 6.00
</div><div class='del'>-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
</div><div class='del'>-
</div><div class='del'>-###############################################################################
</div><div class='del'>-
</div><div class='del'>-Project: "example"=.\example.dsp - Package Owner=&lt;4&gt;
</div><div class='del'>-
</div><div class='del'>-Package=&lt;5&gt;
</div><div class='del'>-{{{
</div><div class='del'>-}}}
</div><div class='del'>-
</div><div class='del'>-Package=&lt;4&gt;
</div><div class='del'>-{{{
</div><div class='del'>-    Begin Project Dependency
</div><div class='del'>-    Project_Dep_Name zlib
</div><div class='del'>-    End Project Dependency
</div><div class='del'>-}}}
</div><div class='del'>-
</div><div class='del'>-###############################################################################
</div><div class='del'>-
</div><div class='del'>-Project: "minigzip"=.\minigzip.dsp - Package Owner=&lt;4&gt;
</div><div class='del'>-
</div><div class='del'>-Package=&lt;5&gt;
</div><div class='del'>-{{{
</div><div class='del'>-}}}
</div><div class='del'>-
</div><div class='del'>-Package=&lt;4&gt;
</div><div class='del'>-{{{
</div><div class='del'>-    Begin Project Dependency
</div><div class='del'>-    Project_Dep_Name zlib
</div><div class='del'>-    End Project Dependency
</div><div class='del'>-}}}
</div><div class='del'>-
</div><div class='del'>-###############################################################################
</div><div class='del'>-
</div><div class='del'>-Project: "zlib"=.\zlib.dsp - Package Owner=&lt;4&gt;
</div><div class='del'>-
</div><div class='del'>-Package=&lt;5&gt;
</div><div class='del'>-{{{
</div><div class='del'>-}}}
</div><div class='del'>-
</div><div class='del'>-Package=&lt;4&gt;
</div><div class='del'>-{{{
</div><div class='del'>-}}}
</div><div class='del'>-
</div><div class='del'>-###############################################################################
</div><div class='del'>-
</div><div class='del'>-Global:
</div><div class='del'>-
</div><div class='del'>-Package=&lt;5&gt;
</div><div class='del'>-{{{
</div><div class='del'>-}}}
</div><div class='del'>-
</div><div class='del'>-Package=&lt;3&gt;
</div><div class='del'>-{{{
</div><div class='del'>-}}}
</div><div class='del'>-
</div><div class='del'>-###############################################################################
</div><div class='del'>-
</div><div class='head'>diff --git a/src/3rdparty/zlib/treebuild.xml b/src/3rdparty/zlib/treebuild.xml<br/>new file mode 100644<br/>index 0000000..6b8f542<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/treebuild.xml?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/treebuild.xml</a></div><div class='hunk'>@@ -0,0 +1,116 @@</div><div class='add'>+&lt;?xml version="1.0" ?&gt;</div><div class='add'>+&lt;package name="zlib" version="1.2.5"&gt;</div><div class='add'>+    &lt;library name="zlib" dlversion="1.2.5" dlname="z"&gt;</div><div class='add'>+	&lt;property name="description"&gt; zip compression library &lt;/property&gt;</div><div class='add'>+	&lt;property name="include-target-dir" value="$(@PACKAGE/install-includedir)" /&gt;</div><div class='add'>+</div><div class='add'>+	&lt;!-- fixme: not implemented yet --&gt;</div><div class='add'>+	&lt;property name="compiler/c/inline" value="yes" /&gt;</div><div class='add'>+</div><div class='add'>+	&lt;include-file name="zlib.h" scope="public" mode="644" /&gt;</div><div class='add'>+	&lt;include-file name="zconf.h" scope="public" mode="644" /&gt;</div><div class='add'>+</div><div class='add'>+	&lt;source name="adler32.c"&gt;</div><div class='add'>+	    &lt;depend name="zlib.h" /&gt;</div><div class='add'>+	    &lt;depend name="zconf.h" /&gt;</div><div class='add'>+	&lt;/source&gt;</div><div class='add'>+	&lt;source name="compress.c"&gt;</div><div class='add'>+	    &lt;depend name="zlib.h" /&gt;</div><div class='add'>+	    &lt;depend name="zconf.h" /&gt;</div><div class='add'>+	&lt;/source&gt;</div><div class='add'>+	&lt;source name="crc32.c"&gt;</div><div class='add'>+	    &lt;depend name="zlib.h" /&gt;</div><div class='add'>+	    &lt;depend name="zconf.h" /&gt;</div><div class='add'>+	    &lt;depend name="crc32.h" /&gt;</div><div class='add'>+	&lt;/source&gt;</div><div class='add'>+	&lt;source name="gzclose.c"&gt;</div><div class='add'>+	    &lt;depend name="zlib.h" /&gt;</div><div class='add'>+	    &lt;depend name="zconf.h" /&gt;</div><div class='add'>+	    &lt;depend name="gzguts.h" /&gt;</div><div class='add'>+	&lt;/source&gt;</div><div class='add'>+	&lt;source name="gzlib.c"&gt;</div><div class='add'>+	    &lt;depend name="zlib.h" /&gt;</div><div class='add'>+	    &lt;depend name="zconf.h" /&gt;</div><div class='add'>+	    &lt;depend name="gzguts.h" /&gt;</div><div class='add'>+	&lt;/source&gt;</div><div class='add'>+	&lt;source name="gzread.c"&gt;</div><div class='add'>+	    &lt;depend name="zlib.h" /&gt;</div><div class='add'>+	    &lt;depend name="zconf.h" /&gt;</div><div class='add'>+	    &lt;depend name="gzguts.h" /&gt;</div><div class='add'>+	&lt;/source&gt;</div><div class='add'>+	&lt;source name="gzwrite.c"&gt;</div><div class='add'>+	    &lt;depend name="zlib.h" /&gt;</div><div class='add'>+	    &lt;depend name="zconf.h" /&gt;</div><div class='add'>+	    &lt;depend name="gzguts.h" /&gt;</div><div class='add'>+	&lt;/source&gt;</div><div class='add'>+	&lt;source name="uncompr.c"&gt;</div><div class='add'>+	    &lt;depend name="zlib.h" /&gt;</div><div class='add'>+	    &lt;depend name="zconf.h" /&gt;</div><div class='add'>+	&lt;/source&gt;</div><div class='add'>+	&lt;source name="deflate.c"&gt;</div><div class='add'>+	    &lt;depend name="zlib.h" /&gt;</div><div class='add'>+	    &lt;depend name="zconf.h" /&gt;</div><div class='add'>+	    &lt;depend name="zutil.h" /&gt;</div><div class='add'>+	    &lt;depend name="deflate.h" /&gt;</div><div class='add'>+	&lt;/source&gt;</div><div class='add'>+	&lt;source name="trees.c"&gt;</div><div class='add'>+	    &lt;depend name="zlib.h" /&gt;</div><div class='add'>+	    &lt;depend name="zconf.h" /&gt;</div><div class='add'>+	    &lt;depend name="zutil.h" /&gt;</div><div class='add'>+	    &lt;depend name="deflate.h" /&gt;</div><div class='add'>+	    &lt;depend name="trees.h" /&gt;</div><div class='add'>+	&lt;/source&gt;</div><div class='add'>+	&lt;source name="zutil.c"&gt;</div><div class='add'>+	    &lt;depend name="zlib.h" /&gt;</div><div class='add'>+	    &lt;depend name="zconf.h" /&gt;</div><div class='add'>+	    &lt;depend name="zutil.h" /&gt;</div><div class='add'>+	&lt;/source&gt;</div><div class='add'>+	&lt;source name="inflate.c"&gt;</div><div class='add'>+	    &lt;depend name="zlib.h" /&gt;</div><div class='add'>+	    &lt;depend name="zconf.h" /&gt;</div><div class='add'>+	    &lt;depend name="zutil.h" /&gt;</div><div class='add'>+	    &lt;depend name="inftrees.h" /&gt;</div><div class='add'>+	    &lt;depend name="inflate.h" /&gt;</div><div class='add'>+	    &lt;depend name="inffast.h" /&gt;</div><div class='add'>+	&lt;/source&gt;</div><div class='add'>+	&lt;source name="infback.c"&gt;</div><div class='add'>+	    &lt;depend name="zlib.h" /&gt;</div><div class='add'>+	    &lt;depend name="zconf.h" /&gt;</div><div class='add'>+	    &lt;depend name="zutil.h" /&gt;</div><div class='add'>+	    &lt;depend name="inftrees.h" /&gt;</div><div class='add'>+	    &lt;depend name="inflate.h" /&gt;</div><div class='add'>+	    &lt;depend name="inffast.h" /&gt;</div><div class='add'>+	&lt;/source&gt;</div><div class='add'>+	&lt;source name="inftrees.c"&gt;</div><div class='add'>+	    &lt;depend name="zlib.h" /&gt;</div><div class='add'>+	    &lt;depend name="zconf.h" /&gt;</div><div class='add'>+	    &lt;depend name="zutil.h" /&gt;</div><div class='add'>+	    &lt;depend name="inftrees.h" /&gt;</div><div class='add'>+	&lt;/source&gt;</div><div class='add'>+	&lt;source name="inffast.c"&gt;</div><div class='add'>+	    &lt;depend name="zlib.h" /&gt;</div><div class='add'>+	    &lt;depend name="zconf.h" /&gt;</div><div class='add'>+	    &lt;depend name="zutil.h" /&gt;</div><div class='add'>+	    &lt;depend name="inftrees.h" /&gt;</div><div class='add'>+	    &lt;depend name="inflate.h" /&gt;</div><div class='add'>+	    &lt;depend name="inffast.h" /&gt;</div><div class='add'>+	&lt;/source&gt;</div><div class='add'>+    &lt;/library&gt;</div><div class='add'>+&lt;/package&gt;</div><div class='add'>+</div><div class='add'>+&lt;!--</div><div class='add'>+CFLAGS=-O</div><div class='add'>+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7</div><div class='add'>+#CFLAGS=-g -DDEBUG</div><div class='add'>+#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \</div><div class='add'>+#           -Wstrict-prototypes -Wmissing-prototypes</div><div class='add'>+</div><div class='add'>+# OBJA =</div><div class='add'>+# to use the asm code: make OBJA=match.o</div><div class='add'>+#</div><div class='add'>+match.o: match.S</div><div class='add'>+	$(CPP) match.S &gt; _match.s</div><div class='add'>+	$(CC) -c _match.s</div><div class='add'>+	mv _match.o match.o</div><div class='add'>+	rm -f _match.s</div><div class='add'>+--&gt;</div><div class='head'>diff --git a/src/3rdparty/zlib/trees.c b/src/3rdparty/zlib/trees.c<br/>index 395e4e1..56e9bb1 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/trees.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/trees.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/trees.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/trees.c</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> /* trees.c -- output deflated data using Huffman coding</div><div class='del'>- * Copyright (C) 1995-2005 Jean-loup Gailly</div><div class='add'>+ * Copyright (C) 1995-2010 Jean-loup Gailly</div><div class='add'>+ * detect_data_type() function provided freely by Cosmin Truta, 2006</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -152,7 +153,7 @@ local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,</div><div class='ctx'>                               int blcodes));</div><div class='ctx'> local void compress_block OF((deflate_state *s, ct_data *ltree,</div><div class='ctx'>                               ct_data *dtree));</div><div class='del'>-local void set_data_type  OF((deflate_state *s));</div><div class='add'>+local int  detect_data_type OF((deflate_state *s));</div><div class='ctx'> local unsigned bi_reverse OF((unsigned value, int length));</div><div class='ctx'> local void bi_windup      OF((deflate_state *s));</div><div class='ctx'> local void bi_flush       OF((deflate_state *s));</div><div class='hunk'>@@ -203,12 +204,12 @@ local void send_bits(s, value, length)</div><div class='ctx'>      * unused bits in value.</div><div class='ctx'>      */</div><div class='ctx'>     if (s-&gt;bi_valid &gt; (int)Buf_size - length) {</div><div class='del'>-        s-&gt;bi_buf |= (value &lt;&lt; s-&gt;bi_valid);</div><div class='add'>+        s-&gt;bi_buf |= (ush)value &lt;&lt; s-&gt;bi_valid;</div><div class='ctx'>         put_short(s, s-&gt;bi_buf);</div><div class='ctx'>         s-&gt;bi_buf = (ush)value &gt;&gt; (Buf_size - s-&gt;bi_valid);</div><div class='ctx'>         s-&gt;bi_valid += length - Buf_size;</div><div class='ctx'>     } else {</div><div class='del'>-        s-&gt;bi_buf |= value &lt;&lt; s-&gt;bi_valid;</div><div class='add'>+        s-&gt;bi_buf |= (ush)value &lt;&lt; s-&gt;bi_valid;</div><div class='ctx'>         s-&gt;bi_valid += length;</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='hunk'>@@ -218,12 +219,12 @@ local void send_bits(s, value, length)</div><div class='ctx'> { int len = length;\</div><div class='ctx'>   if (s-&gt;bi_valid &gt; (int)Buf_size - len) {\</div><div class='ctx'>     int val = value;\</div><div class='del'>-    s-&gt;bi_buf |= (val &lt;&lt; s-&gt;bi_valid);\</div><div class='add'>+    s-&gt;bi_buf |= (ush)val &lt;&lt; s-&gt;bi_valid;\</div><div class='ctx'>     put_short(s, s-&gt;bi_buf);\</div><div class='ctx'>     s-&gt;bi_buf = (ush)val &gt;&gt; (Buf_size - s-&gt;bi_valid);\</div><div class='ctx'>     s-&gt;bi_valid += len - Buf_size;\</div><div class='ctx'>   } else {\</div><div class='del'>-    s-&gt;bi_buf |= (value) &lt;&lt; s-&gt;bi_valid;\</div><div class='add'>+    s-&gt;bi_buf |= (ush)(value) &lt;&lt; s-&gt;bi_valid;\</div><div class='ctx'>     s-&gt;bi_valid += len;\</div><div class='ctx'>   }\</div><div class='ctx'> }</div><div class='hunk'>@@ -250,11 +251,13 @@ local void tr_static_init()</div><div class='ctx'>     if (static_init_done) return;</div><div class='ctx'> </div><div class='ctx'>     /* For some embedded targets, global variables are not initialized: */</div><div class='add'>+#ifdef NO_INIT_GLOBAL_POINTERS</div><div class='ctx'>     static_l_desc.static_tree = static_ltree;</div><div class='ctx'>     static_l_desc.extra_bits = extra_lbits;</div><div class='ctx'>     static_d_desc.static_tree = static_dtree;</div><div class='ctx'>     static_d_desc.extra_bits = extra_dbits;</div><div class='ctx'>     static_bl_desc.extra_bits = extra_blbits;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'>     /* Initialize the mapping length (0..255) -&gt; length code (0..28) */</div><div class='ctx'>     length = 0;</div><div class='hunk'>@@ -348,13 +351,14 @@ void gen_trees_header()</div><div class='ctx'>                 static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");</div><div class='add'>+    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");</div><div class='ctx'>     for (i = 0; i &lt; DIST_CODE_LEN; i++) {</div><div class='ctx'>         fprintf(header, "%2u%s", _dist_code[i],</div><div class='ctx'>                 SEPARATOR(i, DIST_CODE_LEN-1, 20));</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");</div><div class='add'>+    fprintf(header,</div><div class='add'>+        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");</div><div class='ctx'>     for (i = 0; i &lt; MAX_MATCH-MIN_MATCH+1; i++) {</div><div class='ctx'>         fprintf(header, "%2u%s", _length_code[i],</div><div class='ctx'>                 SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));</div><div class='hunk'>@@ -379,7 +383,7 @@ void gen_trees_header()</div><div class='ctx'> /* ===========================================================================</div><div class='ctx'>  * Initialize the tree data structures for a new zlib stream.</div><div class='ctx'>  */</div><div class='del'>-void _tr_init(s)</div><div class='add'>+void ZLIB_INTERNAL _tr_init(s)</div><div class='ctx'>     deflate_state *s;</div><div class='ctx'> {</div><div class='ctx'>     tr_static_init();</div><div class='hunk'>@@ -864,13 +868,13 @@ local void send_all_trees(s, lcodes, dcodes, blcodes)</div><div class='ctx'> /* ===========================================================================</div><div class='ctx'>  * Send a stored block</div><div class='ctx'>  */</div><div class='del'>-void _tr_stored_block(s, buf, stored_len, eof)</div><div class='add'>+void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)</div><div class='ctx'>     deflate_state *s;</div><div class='ctx'>     charf *buf;       /* input block */</div><div class='ctx'>     ulg stored_len;   /* length of input block */</div><div class='del'>-    int eof;          /* true if this is the last block for a file */</div><div class='add'>+    int last;         /* one if this is the last block for a file */</div><div class='ctx'> {</div><div class='del'>-    send_bits(s, (STORED_BLOCK&lt;&lt;1)+eof, 3);  /* send block type */</div><div class='add'>+    send_bits(s, (STORED_BLOCK&lt;&lt;1)+last, 3);    /* send block type */</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'>     s-&gt;compressed_len = (s-&gt;compressed_len + 3 + 7) &amp; (ulg)~7L;</div><div class='ctx'>     s-&gt;compressed_len += (stored_len + 4) &lt;&lt; 3;</div><div class='hunk'>@@ -889,7 +893,7 @@ void _tr_stored_block(s, buf, stored_len, eof)</div><div class='ctx'>  * To simplify the code, we assume the worst case of last real code encoded</div><div class='ctx'>  * on one bit only.</div><div class='ctx'>  */</div><div class='del'>-void _tr_align(s)</div><div class='add'>+void ZLIB_INTERNAL _tr_align(s)</div><div class='ctx'>     deflate_state *s;</div><div class='ctx'> {</div><div class='ctx'>     send_bits(s, STATIC_TREES&lt;&lt;1, 3);</div><div class='hunk'>@@ -918,11 +922,11 @@ void _tr_align(s)</div><div class='ctx'>  * Determine the best encoding for the current block: dynamic trees, static</div><div class='ctx'>  * trees or store, and output the encoded block to the zip file.</div><div class='ctx'>  */</div><div class='del'>-void _tr_flush_block(s, buf, stored_len, eof)</div><div class='add'>+void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)</div><div class='ctx'>     deflate_state *s;</div><div class='ctx'>     charf *buf;       /* input block, or NULL if too old */</div><div class='ctx'>     ulg stored_len;   /* length of input block */</div><div class='del'>-    int eof;          /* true if this is the last block for a file */</div><div class='add'>+    int last;         /* one if this is the last block for a file */</div><div class='ctx'> {</div><div class='ctx'>     ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */</div><div class='ctx'>     int max_blindex = 0;  /* index of last bit length code of non zero freq */</div><div class='hunk'>@@ -931,8 +935,8 @@ void _tr_flush_block(s, buf, stored_len, eof)</div><div class='ctx'>     if (s-&gt;level &gt; 0) {</div><div class='ctx'> </div><div class='ctx'>         /* Check if the file is binary or text */</div><div class='del'>-        if (stored_len &gt; 0 &amp;&amp; s-&gt;strm-&gt;data_type == Z_UNKNOWN)</div><div class='del'>-            set_data_type(s);</div><div class='add'>+        if (s-&gt;strm-&gt;data_type == Z_UNKNOWN)</div><div class='add'>+            s-&gt;strm-&gt;data_type = detect_data_type(s);</div><div class='ctx'> </div><div class='ctx'>         /* Construct the literal and distance trees */</div><div class='ctx'>         build_tree(s, (tree_desc *)(&amp;(s-&gt;l_desc)));</div><div class='hunk'>@@ -978,20 +982,20 @@ void _tr_flush_block(s, buf, stored_len, eof)</div><div class='ctx'>          * successful. If LIT_BUFSIZE &lt;= WSIZE, it is never too late to</div><div class='ctx'>          * transform a block into a stored block.</div><div class='ctx'>          */</div><div class='del'>-        _tr_stored_block(s, buf, stored_len, eof);</div><div class='add'>+        _tr_stored_block(s, buf, stored_len, last);</div><div class='ctx'> </div><div class='ctx'> #ifdef FORCE_STATIC</div><div class='ctx'>     } else if (static_lenb &gt;= 0) { /* force static trees */</div><div class='ctx'> #else</div><div class='ctx'>     } else if (s-&gt;strategy == Z_FIXED || static_lenb == opt_lenb) {</div><div class='ctx'> #endif</div><div class='del'>-        send_bits(s, (STATIC_TREES&lt;&lt;1)+eof, 3);</div><div class='add'>+        send_bits(s, (STATIC_TREES&lt;&lt;1)+last, 3);</div><div class='ctx'>         compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'>         s-&gt;compressed_len += 3 + s-&gt;static_len;</div><div class='ctx'> #endif</div><div class='ctx'>     } else {</div><div class='del'>-        send_bits(s, (DYN_TREES&lt;&lt;1)+eof, 3);</div><div class='add'>+        send_bits(s, (DYN_TREES&lt;&lt;1)+last, 3);</div><div class='ctx'>         send_all_trees(s, s-&gt;l_desc.max_code+1, s-&gt;d_desc.max_code+1,</div><div class='ctx'>                        max_blindex+1);</div><div class='ctx'>         compress_block(s, (ct_data *)s-&gt;dyn_ltree, (ct_data *)s-&gt;dyn_dtree);</div><div class='hunk'>@@ -1005,21 +1009,21 @@ void _tr_flush_block(s, buf, stored_len, eof)</div><div class='ctx'>      */</div><div class='ctx'>     init_block(s);</div><div class='ctx'> </div><div class='del'>-    if (eof) {</div><div class='add'>+    if (last) {</div><div class='ctx'>         bi_windup(s);</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'>         s-&gt;compressed_len += 7;  /* align on byte boundary */</div><div class='ctx'> #endif</div><div class='ctx'>     }</div><div class='ctx'>     Tracev((stderr,"\ncomprlen %lu(%lu) ", s-&gt;compressed_len&gt;&gt;3,</div><div class='del'>-           s-&gt;compressed_len-7*eof));</div><div class='add'>+           s-&gt;compressed_len-7*last));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ===========================================================================</div><div class='ctx'>  * Save the match info and tally the frequency counts. Return true if</div><div class='ctx'>  * the current block must be flushed.</div><div class='ctx'>  */</div><div class='del'>-int _tr_tally (s, dist, lc)</div><div class='add'>+int ZLIB_INTERNAL _tr_tally (s, dist, lc)</div><div class='ctx'>     deflate_state *s;</div><div class='ctx'>     unsigned dist;  /* distance of matched string */</div><div class='ctx'>     unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */</div><div class='hunk'>@@ -1118,24 +1122,45 @@ local void compress_block(s, ltree, dtree)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ===========================================================================</div><div class='del'>- * Set the data type to BINARY or TEXT, using a crude approximation:</div><div class='del'>- * set it to Z_TEXT if all symbols are either printable characters (33 to 255)</div><div class='del'>- * or white spaces (9 to 13, or 32); or set it to Z_BINARY otherwise.</div><div class='add'>+ * Check if the data type is TEXT or BINARY, using the following algorithm:</div><div class='add'>+ * - TEXT if the two conditions below are satisfied:</div><div class='add'>+ *    a) There are no non-portable control characters belonging to the</div><div class='add'>+ *       "black list" (0..6, 14..25, 28..31).</div><div class='add'>+ *    b) There is at least one printable character belonging to the</div><div class='add'>+ *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).</div><div class='add'>+ * - BINARY otherwise.</div><div class='add'>+ * - The following partially-portable control characters form a</div><div class='add'>+ *   "gray list" that is ignored in this detection algorithm:</div><div class='add'>+ *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).</div><div class='ctx'>  * IN assertion: the fields Freq of dyn_ltree are set.</div><div class='ctx'>  */</div><div class='del'>-local void set_data_type(s)</div><div class='add'>+local int detect_data_type(s)</div><div class='ctx'>     deflate_state *s;</div><div class='ctx'> {</div><div class='add'>+    /* black_mask is the bit mask of black-listed bytes</div><div class='add'>+     * set bits 0..6, 14..25, and 28..31</div><div class='add'>+     * 0xf3ffc07f = binary 11110011111111111100000001111111</div><div class='add'>+     */</div><div class='add'>+    unsigned long black_mask = 0xf3ffc07fUL;</div><div class='ctx'>     int n;</div><div class='ctx'> </div><div class='del'>-    for (n = 0; n &lt; 9; n++)</div><div class='add'>+    /* Check for non-textual ("black-listed") bytes. */</div><div class='add'>+    for (n = 0; n &lt;= 31; n++, black_mask &gt;&gt;= 1)</div><div class='add'>+        if ((black_mask &amp; 1) &amp;&amp; (s-&gt;dyn_ltree[n].Freq != 0))</div><div class='add'>+            return Z_BINARY;</div><div class='add'>+</div><div class='add'>+    /* Check for textual ("white-listed") bytes. */</div><div class='add'>+    if (s-&gt;dyn_ltree[9].Freq != 0 || s-&gt;dyn_ltree[10].Freq != 0</div><div class='add'>+            || s-&gt;dyn_ltree[13].Freq != 0)</div><div class='add'>+        return Z_TEXT;</div><div class='add'>+    for (n = 32; n &lt; LITERALS; n++)</div><div class='ctx'>         if (s-&gt;dyn_ltree[n].Freq != 0)</div><div class='del'>-            break;</div><div class='del'>-    if (n == 9)</div><div class='del'>-        for (n = 14; n &lt; 32; n++)</div><div class='del'>-            if (s-&gt;dyn_ltree[n].Freq != 0)</div><div class='del'>-                break;</div><div class='del'>-    s-&gt;strm-&gt;data_type = (n == 32) ? Z_TEXT : Z_BINARY;</div><div class='add'>+            return Z_TEXT;</div><div class='add'>+</div><div class='add'>+    /* There are no "black-listed" or "white-listed" bytes:</div><div class='add'>+     * this stream either is empty or has tolerated ("gray-listed") bytes only.</div><div class='add'>+     */</div><div class='add'>+    return Z_BINARY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ===========================================================================</div><div class='head'>diff --git a/src/3rdparty/zlib/trees.h b/src/3rdparty/zlib/trees.h<br/>index 72facf9..d35639d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/trees.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/trees.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/trees.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/trees.h</a></div><div class='hunk'>@@ -70,7 +70,7 @@ local const ct_data static_dtree[D_CODES] = {</div><div class='ctx'> {{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const uch _dist_code[DIST_CODE_LEN] = {</div><div class='add'>+const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {</div><div class='ctx'>  0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,</div><div class='ctx'>  8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,</div><div class='ctx'> 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,</div><div class='hunk'>@@ -99,7 +99,7 @@ const uch _dist_code[DIST_CODE_LEN] = {</div><div class='ctx'> 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {</div><div class='add'>+const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {</div><div class='ctx'>  0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,</div><div class='ctx'> 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,</div><div class='ctx'> 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,</div><div class='head'>diff --git a/src/3rdparty/zlib/uncompr.c b/src/3rdparty/zlib/uncompr.c<br/>index 9304b9d..ad98be3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/uncompr.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/uncompr.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/uncompr.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/uncompr.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* uncompr.c -- decompress a memory buffer</div><div class='del'>- * Copyright (C) 1995-2003 Jean-loup Gailly.</div><div class='add'>+ * Copyright (C) 1995-2003, 2010 Jean-loup Gailly.</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -16,14 +16,12 @@</div><div class='ctx'>    been saved previously by the compressor and transmitted to the decompressor</div><div class='ctx'>    by some mechanism outside the scope of this compression library.)</div><div class='ctx'>    Upon exit, destLen is the actual size of the compressed buffer.</div><div class='del'>-     This function can be used to decompress a whole file at once if the</div><div class='del'>-   input file is mmap'ed.</div><div class='ctx'> </div><div class='ctx'>      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not</div><div class='ctx'>    enough memory, Z_BUF_ERROR if there was not enough room in the output</div><div class='ctx'>    buffer, or Z_DATA_ERROR if the input data was corrupted.</div><div class='ctx'> */</div><div class='del'>-int Q_ZEXPORT uncompress (dest, destLen, source, sourceLen)</div><div class='add'>+int ZEXPORT uncompress (dest, destLen, source, sourceLen)</div><div class='ctx'>     Bytef *dest;</div><div class='ctx'>     uLongf *destLen;</div><div class='ctx'>     const Bytef *source;</div><div class='head'>diff --git a/src/3rdparty/zlib/win32/DLL_FAQ.txt b/src/3rdparty/zlib/win32/DLL_FAQ.txt<br/>deleted file mode 100644<br/>index fb18e07..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/win32/DLL_FAQ.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/win32/DLL_FAQ.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,397 +0,0 @@</div><div class='del'>-</div><div class='del'>-            Frequently Asked Questions about ZLIB1.DLL</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-This document describes the design, the rationale, and the usage</div><div class='del'>-of the official DLL build of zlib, named ZLIB1.DLL.  If you have</div><div class='del'>-general questions about zlib, you should see the file "FAQ" found</div><div class='del'>-in the zlib distribution, or at the following location:</div><div class='del'>-  http://www.gzip.org/zlib/zlib_faq.html</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- 1. What is ZLIB1.DLL, and how can I get it?</div><div class='del'>-</div><div class='del'>-  - ZLIB1.DLL is the official build of zlib as a DLL.</div><div class='del'>-    (Please remark the character '1' in the name.)</div><div class='del'>-</div><div class='del'>-    Pointers to a precompiled ZLIB1.DLL can be found in the zlib</div><div class='del'>-    web site at:</div><div class='del'>-      http://www.zlib.org/</div><div class='del'>-</div><div class='del'>-    Applications that link to ZLIB1.DLL can rely on the following</div><div class='del'>-    specification:</div><div class='del'>-</div><div class='del'>-    * The exported symbols are exclusively defined in the source</div><div class='del'>-      files "zlib.h" and "zlib.def", found in an official zlib</div><div class='del'>-      source distribution.</div><div class='del'>-    * The symbols are exported by name, not by ordinal.</div><div class='del'>-    * The exported names are undecorated.</div><div class='del'>-    * The calling convention of functions is "C" (CDECL).</div><div class='del'>-    * The ZLIB1.DLL binary is linked to MSVCRT.DLL.</div><div class='del'>-</div><div class='del'>-    The archive in which ZLIB1.DLL is bundled contains compiled</div><div class='del'>-    test programs that must run with a valid build of ZLIB1.DLL.</div><div class='del'>-    It is recommended to download the prebuilt DLL from the zlib</div><div class='del'>-    web site, instead of building it yourself, to avoid potential</div><div class='del'>-    incompatibilities that could be introduced by your compiler</div><div class='del'>-    and build settings.  If you do build the DLL yourself, please</div><div class='del'>-    make sure that it complies with all the above requirements,</div><div class='del'>-    and it runs with the precompiled test programs, bundled with</div><div class='del'>-    the original ZLIB1.DLL distribution.</div><div class='del'>-</div><div class='del'>-    If, for any reason, you need to build an incompatible DLL,</div><div class='del'>-    please use a different file name.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- 2. Why did you change the name of the DLL to ZLIB1.DLL?</div><div class='del'>-    What happened to the old ZLIB.DLL?</div><div class='del'>-</div><div class='del'>-  - The old ZLIB.DLL, built from zlib-1.1.4 or earlier, required</div><div class='del'>-    compilation settings that were incompatible to those used by</div><div class='del'>-    a static build.  The DLL settings were supposed to be enabled</div><div class='del'>-    by defining the macro ZLIB_DLL, before including "zlib.h".</div><div class='del'>-    Incorrect handling of this macro was silently accepted at</div><div class='del'>-    build time, resulting in two major problems:</div><div class='del'>-</div><div class='del'>-    * ZLIB_DLL was missing from the old makefile.  When building</div><div class='del'>-      the DLL, not all people added it to the build options.  In</div><div class='del'>-      consequence, incompatible incarnations of ZLIB.DLL started</div><div class='del'>-      to circulate around the net.</div><div class='del'>-</div><div class='del'>-    * When switching from using the static library to using the</div><div class='del'>-      DLL, applications had to define the ZLIB_DLL macro and</div><div class='del'>-      to recompile all the sources that contained calls to zlib</div><div class='del'>-      functions.  Failure to do so resulted in creating binaries</div><div class='del'>-      that were unable to run with the official ZLIB.DLL build.</div><div class='del'>-</div><div class='del'>-    The only possible solution that we could foresee was to make</div><div class='del'>-    a binary-incompatible change in the DLL interface, in order to</div><div class='del'>-    remove the dependency on the ZLIB_DLL macro, and to release</div><div class='del'>-    the new DLL under a different name.</div><div class='del'>-</div><div class='del'>-    We chose the name ZLIB1.DLL, where '1' indicates the major</div><div class='del'>-    zlib version number.  We hope that we will not have to break</div><div class='del'>-    the binary compatibility again, at least not as long as the</div><div class='del'>-    zlib-1.x series will last.</div><div class='del'>-</div><div class='del'>-    There is still a ZLIB_DLL macro, that can trigger a more</div><div class='del'>-    efficient build and use of the DLL, but compatibility no</div><div class='del'>-    longer dependents on it.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- 3. Can I build ZLIB.DLL from the new zlib sources, and replace</div><div class='del'>-    an old ZLIB.DLL, that was built from zlib-1.1.4 or earlier?</div><div class='del'>-</div><div class='del'>-  - In principle, you can do it by assigning calling convention</div><div class='del'>-    keywords to the macros ZEXPORT and ZEXPORTVA.  In practice,</div><div class='del'>-    it depends on what you mean by "an old ZLIB.DLL", because the</div><div class='del'>-    old DLL exists in several mutually-incompatible versions.</div><div class='del'>-    You have to find out first what kind of calling convention is</div><div class='del'>-    being used in your particular ZLIB.DLL build, and to use the</div><div class='del'>-    same one in the new build.  If you don't know what this is all</div><div class='del'>-    about, you might be better off if you would just leave the old</div><div class='del'>-    DLL intact.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- 4. Can I compile my application using the new zlib interface, and</div><div class='del'>-    link it to an old ZLIB.DLL, that was built from zlib-1.1.4 or</div><div class='del'>-    earlier?</div><div class='del'>-</div><div class='del'>-  - The official answer is "no"; the real answer depends again on</div><div class='del'>-    what kind of ZLIB.DLL you have.  Even if you are lucky, this</div><div class='del'>-    course of action is unreliable.</div><div class='del'>-</div><div class='del'>-    If you rebuild your application and you intend to use a newer</div><div class='del'>-    version of zlib (post- 1.1.4), it is strongly recommended to</div><div class='del'>-    link it to the new ZLIB1.DLL.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- 5. Why are the zlib symbols exported by name, and not by ordinal?</div><div class='del'>-</div><div class='del'>-  - Although exporting symbols by ordinal is a little faster, it</div><div class='del'>-    is risky.  Any single glitch in the maintenance or use of the</div><div class='del'>-    DEF file that contains the ordinals can result in incompatible</div><div class='del'>-    builds and frustrating crashes.  Simply put, the benefits of</div><div class='del'>-    exporting symbols by ordinal do not justify the risks.</div><div class='del'>-</div><div class='del'>-    Technically, it should be possible to maintain ordinals in</div><div class='del'>-    the DEF file, and still export the symbols by name.  Ordinals</div><div class='del'>-    exist in every DLL, and even if the dynamic linking performed</div><div class='del'>-    at the DLL startup is searching for names, ordinals serve as</div><div class='del'>-    hints, for a faster name lookup.  However, if the DEF file</div><div class='del'>-    contains ordinals, the Microsoft linker automatically builds</div><div class='del'>-    an implib that will cause the executables linked to it to use</div><div class='del'>-    those ordinals, and not the names.  It is interesting to</div><div class='del'>-    notice that the GNU linker for Win32 does not suffer from this</div><div class='del'>-    problem.</div><div class='del'>-</div><div class='del'>-    It is possible to avoid the DEF file if the exported symbols</div><div class='del'>-    are accompanied by a "__declspec(dllexport)" attribute in the</div><div class='del'>-    source files.  You can do this in zlib by predefining the</div><div class='del'>-    ZLIB_DLL macro.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- 6. I see that the ZLIB1.DLL functions use the "C" (CDECL) calling</div><div class='del'>-    convention.  Why not use the STDCALL convention?</div><div class='del'>-    STDCALL is the standard convention in Win32, and I need it in</div><div class='del'>-    my Visual Basic project!</div><div class='del'>-</div><div class='del'>-    (For readability, we use CDECL to refer to the convention</div><div class='del'>-     triggered by the "__cdecl" keyword, STDCALL to refer to</div><div class='del'>-     the convention triggered by "__stdcall", and FASTCALL to</div><div class='del'>-     refer to the convention triggered by "__fastcall".)</div><div class='del'>-</div><div class='del'>-  - Most of the native Windows API functions (without varargs) use</div><div class='del'>-    indeed the WINAPI convention (which translates to STDCALL in</div><div class='del'>-    Win32), but the standard C functions use CDECL.  If a user</div><div class='del'>-    application is intrinsically tied to the Windows API (e.g.</div><div class='del'>-    it calls native Windows API functions such as CreateFile()),</div><div class='del'>-    sometimes it makes sense to decorate its own functions with</div><div class='del'>-    WINAPI.  But if ANSI C or POSIX portability is a goal (e.g.</div><div class='del'>-    it calls standard C functions such as fopen()), it is not a</div><div class='del'>-    sound decision to request the inclusion of &lt;windows.h&gt;, or to</div><div class='del'>-    use non-ANSI constructs, for the sole purpose to make the user</div><div class='del'>-    functions STDCALL-able.</div><div class='del'>-</div><div class='del'>-    The functionality offered by zlib is not in the category of</div><div class='del'>-    "Windows functionality", but is more like "C functionality".</div><div class='del'>-</div><div class='del'>-    Technically, STDCALL is not bad; in fact, it is slightly</div><div class='del'>-    faster than CDECL, and it works with variable-argument</div><div class='del'>-    functions, just like CDECL.  It is unfortunate that, in spite</div><div class='del'>-    of using STDCALL in the Windows API, it is not the default</div><div class='del'>-    convention used by the C compilers that run under Windows.</div><div class='del'>-    The roots of the problem reside deep inside the unsafety of</div><div class='del'>-    the K&amp;R-style function prototypes, where the argument types</div><div class='del'>-    are not specified; but that is another story for another day.</div><div class='del'>-</div><div class='del'>-    The remaining fact is that CDECL is the default convention.</div><div class='del'>-    Even if an explicit convention is hard-coded into the function</div><div class='del'>-    prototypes inside C headers, problems may appear.  The</div><div class='del'>-    necessity to expose the convention in users' callbacks is one</div><div class='del'>-    of these problems.</div><div class='del'>-</div><div class='del'>-    The calling convention issues are also important when using</div><div class='del'>-    zlib in other programming languages.  Some of them, like Ada</div><div class='del'>-    (GNAT) and Fortran (GNU G77), have C bindings implemented</div><div class='del'>-    initially on Unix, and relying on the C calling convention.</div><div class='del'>-    On the other hand, the pre- .NET versions of Microsoft Visual</div><div class='del'>-    Basic require STDCALL, while Borland Delphi prefers, although</div><div class='del'>-    it does not require, FASTCALL.</div><div class='del'>-</div><div class='del'>-    In fairness to all possible uses of zlib outside the C</div><div class='del'>-    programming language, we choose the default "C" convention.</div><div class='del'>-    Anyone interested in different bindings or conventions is</div><div class='del'>-    encouraged to maintain specialized projects.  The "contrib/"</div><div class='del'>-    directory from the zlib distribution already holds a couple</div><div class='del'>-    of foreign bindings, such as Ada, C++, and Delphi.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- 7. I need a DLL for my Visual Basic project.  What can I do?</div><div class='del'>-</div><div class='del'>-  - Define the ZLIB_WINAPI macro before including "zlib.h", when</div><div class='del'>-    building both the DLL and the user application (except that</div><div class='del'>-    you don't need to define anything when using the DLL in Visual</div><div class='del'>-    Basic).  The ZLIB_WINAPI macro will switch on the WINAPI</div><div class='del'>-    (STDCALL) convention.  The name of this DLL must be different</div><div class='del'>-    than the official ZLIB1.DLL.</div><div class='del'>-</div><div class='del'>-    Gilles Vollant has contributed a build named ZLIBWAPI.DLL,</div><div class='del'>-    with the ZLIB_WINAPI macro turned on, and with the minizip</div><div class='del'>-    functionality built in.  For more information, please read</div><div class='del'>-    the notes inside "contrib/vstudio/readme.txt", found in the</div><div class='del'>-    zlib distribution.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- 8. I need to use zlib in my Microsoft .NET project.  What can I</div><div class='del'>-    do?</div><div class='del'>-</div><div class='del'>-  - Henrik Ravn has contributed a .NET wrapper around zlib.  Look</div><div class='del'>-    into contrib/dotzlib/, inside the zlib distribution.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- 9. If my application uses ZLIB1.DLL, should I link it to</div><div class='del'>-    MSVCRT.DLL?  Why?</div><div class='del'>-</div><div class='del'>-  - It is not required, but it is recommended to link your</div><div class='del'>-    application to MSVCRT.DLL, if it uses ZLIB1.DLL.</div><div class='del'>-</div><div class='del'>-    The executables (.EXE, .DLL, etc.) that are involved in the</div><div class='del'>-    same process and are using the C run-time library (i.e. they</div><div class='del'>-    are calling standard C functions), must link to the same</div><div class='del'>-    library.  There are several libraries in the Win32 system:</div><div class='del'>-    CRTDLL.DLL, MSVCRT.DLL, the static C libraries, etc.</div><div class='del'>-    Since ZLIB1.DLL is linked to MSVCRT.DLL, the executables that</div><div class='del'>-    depend on it should also be linked to MSVCRT.DLL.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-10. Why are you saying that ZLIB1.DLL and my application should</div><div class='del'>-    be linked to the same C run-time (CRT) library?  I linked my</div><div class='del'>-    application and my DLLs to different C libraries (e.g. my</div><div class='del'>-    application to a static library, and my DLLs to MSVCRT.DLL),</div><div class='del'>-    and everything works fine.</div><div class='del'>-</div><div class='del'>-  - If a user library invokes only pure Win32 API (accessible via</div><div class='del'>-    &lt;windows.h&gt; and the related headers), its DLL build will work</div><div class='del'>-    in any context.  But if this library invokes standard C API,</div><div class='del'>-    things get more complicated.</div><div class='del'>-</div><div class='del'>-    There is a single Win32 library in a Win32 system.  Every</div><div class='del'>-    function in this library resides in a single DLL module, that</div><div class='del'>-    is safe to call from anywhere.  On the other hand, there are</div><div class='del'>-    multiple versions of the C library, and each of them has its</div><div class='del'>-    own separate internal state.  Standalone executables and user</div><div class='del'>-    DLLs that call standard C functions must link to a C run-time</div><div class='del'>-    (CRT) library, be it static or shared (DLL).  Intermixing</div><div class='del'>-    occurs when an executable (not necessarily standalone) and a</div><div class='del'>-    DLL are linked to different CRTs, and both are running in the</div><div class='del'>-    same process.</div><div class='del'>-</div><div class='del'>-    Intermixing multiple CRTs is possible, as long as their</div><div class='del'>-    internal states are kept intact.  The Microsoft Knowledge Base</div><div class='del'>-    articles KB94248 "HOWTO: Use the C Run-Time" and KB140584</div><div class='del'>-    "HOWTO: Link with the Correct C Run-Time (CRT) Library"</div><div class='del'>-    mention the potential problems raised by intermixing.</div><div class='del'>-</div><div class='del'>-    If intermixing works for you, it's because your application</div><div class='del'>-    and DLLs are avoiding the corruption of each of the CRTs'</div><div class='del'>-    internal states, maybe by careful design, or maybe by fortune.</div><div class='del'>-</div><div class='del'>-    Also note that linking ZLIB1.DLL to non-Microsoft CRTs, such</div><div class='del'>-    as those provided by Borland, raises similar problems.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-11. Why are you linking ZLIB1.DLL to MSVCRT.DLL?</div><div class='del'>-</div><div class='del'>-  - MSVCRT.DLL exists on every Windows 95 with a new service pack</div><div class='del'>-    installed, or with Microsoft Internet Explorer 4 or later, and</div><div class='del'>-    on all other Windows 4.x or later (Windows 98, Windows NT 4,</div><div class='del'>-    or later).  It is freely distributable; if not present in the</div><div class='del'>-    system, it can be downloaded from Microsoft or from other</div><div class='del'>-    software provider for free.</div><div class='del'>-</div><div class='del'>-    The fact that MSVCRT.DLL does not exist on a virgin Windows 95</div><div class='del'>-    is not so problematic.  Windows 95 is scarcely found nowadays,</div><div class='del'>-    Microsoft ended its support a long time ago, and many recent</div><div class='del'>-    applications from various vendors, including Microsoft, do not</div><div class='del'>-    even run on it.  Furthermore, no serious user should run</div><div class='del'>-    Windows 95 without a proper update installed.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-12. Why are you not linking ZLIB1.DLL to</div><div class='del'>-    &lt;&lt;my favorite C run-time library&gt;&gt; ?</div><div class='del'>-</div><div class='del'>-  - We considered and abandoned the following alternatives:</div><div class='del'>-</div><div class='del'>-    * Linking ZLIB1.DLL to a static C library (LIBC.LIB, or</div><div class='del'>-      LIBCMT.LIB) is not a good option.  People are using the DLL</div><div class='del'>-      mainly to save disk space.  If you are linking your program</div><div class='del'>-      to a static C library, you may as well consider linking zlib</div><div class='del'>-      in statically, too.</div><div class='del'>-</div><div class='del'>-    * Linking ZLIB1.DLL to CRTDLL.DLL looks appealing, because</div><div class='del'>-      CRTDLL.DLL is present on every Win32 installation.</div><div class='del'>-      Unfortunately, it has a series of problems: it does not</div><div class='del'>-      work properly with Microsoft's C++ libraries, it does not</div><div class='del'>-      provide support for 64-bit file offsets, (and so on...),</div><div class='del'>-      and Microsoft discontinued its support a long time ago.</div><div class='del'>-</div><div class='del'>-    * Linking ZLIB1.DLL to MSVCR70.DLL or MSVCR71.DLL, supplied</div><div class='del'>-      with the Microsoft .NET platform, and Visual C++ 7.0/7.1,</div><div class='del'>-      raises problems related to the status of ZLIB1.DLL as a</div><div class='del'>-      system component.  According to the Microsoft Knowledge Base</div><div class='del'>-      article KB326922 "INFO: Redistribution of the Shared C</div><div class='del'>-      Runtime Component in Visual C++ .NET", MSVCR70.DLL and</div><div class='del'>-      MSVCR71.DLL are not supposed to function as system DLLs,</div><div class='del'>-      because they may clash with MSVCRT.DLL.  Instead, the</div><div class='del'>-      application's installer is supposed to put these DLLs</div><div class='del'>-      (if needed) in the application's private directory.</div><div class='del'>-      If ZLIB1.DLL depends on a non-system runtime, it cannot</div><div class='del'>-      function as a redistributable system component.</div><div class='del'>-</div><div class='del'>-    * Linking ZLIB1.DLL to non-Microsoft runtimes, such as</div><div class='del'>-      Borland's, or Cygwin's, raises problems related to the</div><div class='del'>-      reliable presence of these runtimes on Win32 systems.</div><div class='del'>-      It's easier to let the DLL build of zlib up to the people</div><div class='del'>-      who distribute these runtimes, and who may proceed as</div><div class='del'>-      explained in the answer to Question 14.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-13. If ZLIB1.DLL cannot be linked to MSVCR70.DLL or MSVCR71.DLL,</div><div class='del'>-    how can I build/use ZLIB1.DLL in Microsoft Visual C++ 7.0</div><div class='del'>-    (Visual Studio .NET) or newer?</div><div class='del'>-</div><div class='del'>-  - Due to the problems explained in the Microsoft Knowledge Base</div><div class='del'>-    article KB326922 (see the previous answer), the C runtime that</div><div class='del'>-    comes with the VC7 environment is no longer considered a</div><div class='del'>-    system component.  That is, it should not be assumed that this</div><div class='del'>-    runtime exists, or may be installed in a system directory.</div><div class='del'>-    Since ZLIB1.DLL is supposed to be a system component, it may</div><div class='del'>-    not depend on a non-system component.</div><div class='del'>-</div><div class='del'>-    In order to link ZLIB1.DLL and your application to MSVCRT.DLL</div><div class='del'>-    in VC7, you need the library of Visual C++ 6.0 or older.  If</div><div class='del'>-    you don't have this library at hand, it's probably best not to</div><div class='del'>-    use ZLIB1.DLL.</div><div class='del'>-</div><div class='del'>-    We are hoping that, in the future, Microsoft will provide a</div><div class='del'>-    way to build applications linked to a proper system runtime,</div><div class='del'>-    from the Visual C++ environment.  Until then, you have a</div><div class='del'>-    couple of alternatives, such as linking zlib in statically.</div><div class='del'>-    If your application requires dynamic linking, you may proceed</div><div class='del'>-    as explained in the answer to Question 14.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-14. I need to link my own DLL build to a CRT different than</div><div class='del'>-    MSVCRT.DLL.  What can I do?</div><div class='del'>-</div><div class='del'>-  - Feel free to rebuild the DLL from the zlib sources, and link</div><div class='del'>-    it the way you want.  You should, however, clearly state that</div><div class='del'>-    your build is unofficial.  You should give it a different file</div><div class='del'>-    name, and/or install it in a private directory that can be</div><div class='del'>-    accessed by your application only, and is not visible to the</div><div class='del'>-    others (e.g. it's not in the SYSTEM or the SYSTEM32 directory,</div><div class='del'>-    and it's not in the PATH).  Otherwise, your build may clash</div><div class='del'>-    with applications that link to the official build.</div><div class='del'>-</div><div class='del'>-    For example, in Cygwin, zlib is linked to the Cygwin runtime</div><div class='del'>-    CYGWIN1.DLL, and it is distributed under the name CYGZ.DLL.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-15. May I include additional pieces of code that I find useful,</div><div class='del'>-    link them in ZLIB1.DLL, and export them?</div><div class='del'>-</div><div class='del'>-  - No.  A legitimate build of ZLIB1.DLL must not include code</div><div class='del'>-    that does not originate from the official zlib source code.</div><div class='del'>-    But you can make your own private DLL build, under a different</div><div class='del'>-    file name, as suggested in the previous answer.</div><div class='del'>-</div><div class='del'>-    For example, zlib is a part of the VCL library, distributed</div><div class='del'>-    with Borland Delphi and C++ Builder.  The DLL build of VCL</div><div class='del'>-    is a redistributable file, named VCLxx.DLL.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-16. May I remove some functionality out of ZLIB1.DLL, by enabling</div><div class='del'>-    macros like NO_GZCOMPRESS or NO_GZIP at compile time?</div><div class='del'>-</div><div class='del'>-  - No.  A legitimate build of ZLIB1.DLL must provide the complete</div><div class='del'>-    zlib functionality, as implemented in the official zlib source</div><div class='del'>-    code.  But you can make your own private DLL build, under a</div><div class='del'>-    different file name, as suggested in the previous answer.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-17. I made my own ZLIB1.DLL build.  Can I test it for compliance?</div><div class='del'>-</div><div class='del'>-  - We prefer that you download the official DLL from the zlib</div><div class='del'>-    web site.  If you need something peculiar from this DLL, you</div><div class='del'>-    can send your suggestion to the zlib mailing list.</div><div class='del'>-</div><div class='del'>-    However, in case you do rebuild the DLL yourself, you can run</div><div class='del'>-    it with the test programs found in the DLL distribution.</div><div class='del'>-    Running these test programs is not a guarantee of compliance,</div><div class='del'>-    but a failure can imply a detected problem.</div><div class='del'>-</div><div class='del'>-**</div><div class='del'>-</div><div class='del'>-This document is written and maintained by</div><div class='del'>-Cosmin Truta &lt;cosmint@cs.ubbcluj.ro&gt;</div><div class='head'>diff --git a/src/3rdparty/zlib/win32/Makefile.bor b/src/3rdparty/zlib/win32/Makefile.bor<br/>deleted file mode 100644<br/>index b802519..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/win32/Makefile.bor?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/win32/Makefile.bor</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,107 +0,0 @@</div><div class='del'>-# Makefile for zlib</div><div class='del'>-# Borland C++ for Win32</div><div class='del'>-#</div><div class='del'>-# Updated for zlib 1.2.x by Cosmin Truta, 11-Mar-2003</div><div class='del'>-# Last updated: 28-Aug-2003</div><div class='del'>-#</div><div class='del'>-# Usage:</div><div class='del'>-#  make -f win32/Makefile.bor</div><div class='del'>-#  make -f win32/Makefile.bor LOCAL_ZLIB=-DASMV OBJA=match.obj OBJPA=+match.obj</div><div class='del'>-</div><div class='del'>-# ------------ Borland C++ ------------</div><div class='del'>-</div><div class='del'>-# Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7)</div><div class='del'>-# should be added to the environment via "set LOCAL_ZLIB=-DFOO" or</div><div class='del'>-# added to the declaration of LOC here:</div><div class='del'>-LOC = $(LOCAL_ZLIB)</div><div class='del'>-</div><div class='del'>-CC = bcc32</div><div class='del'>-AS = bcc32</div><div class='del'>-LD = bcc32</div><div class='del'>-AR = tlib</div><div class='del'>-CFLAGS  = -a -d -k- -O2 $(LOC)</div><div class='del'>-ASFLAGS = $(LOC)</div><div class='del'>-LDFLAGS = $(LOC)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# variables</div><div class='del'>-ZLIB_LIB = zlib.lib</div><div class='del'>-</div><div class='del'>-OBJ1  = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj</div><div class='del'>-OBJ2  = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj</div><div class='del'>-#OBJA =</div><div class='del'>-OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj</div><div class='del'>-OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj</div><div class='del'>-#OBJPA=</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# targets</div><div class='del'>-all: $(ZLIB_LIB) example.exe minigzip.exe</div><div class='del'>-</div><div class='del'>-.c.obj:</div><div class='del'>-	$(CC) -c $(CFLAGS) $&lt;</div><div class='del'>-</div><div class='del'>-.asm.obj:</div><div class='del'>-	$(AS) -c $(ASFLAGS) $&lt;</div><div class='del'>-</div><div class='del'>-adler32.obj: adler32.c zlib.h zconf.h</div><div class='del'>-</div><div class='del'>-compress.obj: compress.c zlib.h zconf.h</div><div class='del'>-</div><div class='del'>-crc32.obj: crc32.c zlib.h zconf.h crc32.h</div><div class='del'>-</div><div class='del'>-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h</div><div class='del'>-</div><div class='del'>-gzio.obj: gzio.c zutil.h zlib.h zconf.h</div><div class='del'>-</div><div class='del'>-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \</div><div class='del'>- inffast.h inffixed.h</div><div class='del'>-</div><div class='del'>-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \</div><div class='del'>- inffast.h</div><div class='del'>-</div><div class='del'>-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \</div><div class='del'>- inffast.h inffixed.h</div><div class='del'>-</div><div class='del'>-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h</div><div class='del'>-</div><div class='del'>-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h</div><div class='del'>-</div><div class='del'>-uncompr.obj: uncompr.c zlib.h zconf.h</div><div class='del'>-</div><div class='del'>-zutil.obj: zutil.c zutil.h zlib.h zconf.h</div><div class='del'>-</div><div class='del'>-example.obj: example.c zlib.h zconf.h</div><div class='del'>-</div><div class='del'>-minigzip.obj: minigzip.c zlib.h zconf.h</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# For the sake of the old Borland make,</div><div class='del'>-# the command line is cut to fit in the MS-DOS 128 byte limit:</div><div class='del'>-$(ZLIB_LIB): $(OBJ1) $(OBJ2) $(OBJA)</div><div class='del'>-	-del $(ZLIB_LIB)</div><div class='del'>-	$(AR) $(ZLIB_LIB) $(OBJP1)</div><div class='del'>-	$(AR) $(ZLIB_LIB) $(OBJP2)</div><div class='del'>-	$(AR) $(ZLIB_LIB) $(OBJPA)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# testing</div><div class='del'>-test: example.exe minigzip.exe</div><div class='del'>-	example</div><div class='del'>-	echo hello world | minigzip | minigzip -d</div><div class='del'>-</div><div class='del'>-example.exe: example.obj $(ZLIB_LIB)</div><div class='del'>-	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)</div><div class='del'>-</div><div class='del'>-minigzip.exe: minigzip.obj $(ZLIB_LIB)</div><div class='del'>-	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# cleanup</div><div class='del'>-clean:</div><div class='del'>-	-del *.obj</div><div class='del'>-	-del *.lib</div><div class='del'>-	-del *.exe</div><div class='del'>-	-del *.tds</div><div class='del'>-	-del zlib.bak</div><div class='del'>-	-del foo.gz</div><div class='head'>diff --git a/src/3rdparty/zlib/win32/Makefile.emx b/src/3rdparty/zlib/win32/Makefile.emx<br/>deleted file mode 100644<br/>index 7b08424..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/win32/Makefile.emx?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/win32/Makefile.emx</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-# Makefile for zlib.  Modified for emx/rsxnt by Chr. Spieler, 6/16/98.</div><div class='del'>-# Copyright (C) 1995-1998 Jean-loup Gailly.</div><div class='del'>-# For conditions of distribution and use, see copyright notice in zlib.h</div><div class='del'>-</div><div class='del'>-# To compile, or to compile and test, type:</div><div class='del'>-#</div><div class='del'>-#   make -fmakefile.emx;  make test -fmakefile.emx</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-CC=gcc -Zwin32</div><div class='del'>-</div><div class='del'>-#CFLAGS=-MMD -O</div><div class='del'>-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7</div><div class='del'>-#CFLAGS=-MMD -g -DDEBUG</div><div class='del'>-CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \</div><div class='del'>-             -Wstrict-prototypes -Wmissing-prototypes</div><div class='del'>-</div><div class='del'>-# If cp.exe is available, replace "copy /Y" with "cp -fp" .</div><div class='del'>-CP=copy /Y</div><div class='del'>-# If gnu install.exe is available, replace $(CP) with ginstall.</div><div class='del'>-INSTALL=$(CP)</div><div class='del'>-# The default value of RM is "rm -f."  If "rm.exe" is found, comment out:</div><div class='del'>-RM=del</div><div class='del'>-LDLIBS=-L. -lzlib</div><div class='del'>-LD=$(CC) -s -o</div><div class='del'>-LDSHARED=$(CC)</div><div class='del'>-</div><div class='del'>-INCL=zlib.h zconf.h</div><div class='del'>-LIBS=zlib.a</div><div class='del'>-</div><div class='del'>-AR=ar rcs</div><div class='del'>-</div><div class='del'>-prefix=/usr/local</div><div class='del'>-exec_prefix = $(prefix)</div><div class='del'>-</div><div class='del'>-OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \</div><div class='del'>-       zutil.o inflate.o infback.o inftrees.o inffast.o</div><div class='del'>-</div><div class='del'>-TEST_OBJS = example.o minigzip.o</div><div class='del'>-</div><div class='del'>-all: example.exe minigzip.exe</div><div class='del'>-</div><div class='del'>-test: all</div><div class='del'>-	./example</div><div class='del'>-	echo hello world | .\minigzip | .\minigzip -d</div><div class='del'>-</div><div class='del'>-%.o : %.c</div><div class='del'>-	$(CC) $(CFLAGS) -c $&lt; -o $@</div><div class='del'>-</div><div class='del'>-zlib.a: $(OBJS)</div><div class='del'>-	$(AR) $@ $(OBJS)</div><div class='del'>-</div><div class='del'>-%.exe : %.o $(LIBS)</div><div class='del'>-	$(LD) $@ $&lt; $(LDLIBS)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-.PHONY : clean</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	$(RM) *.d</div><div class='del'>-	$(RM) *.o</div><div class='del'>-	$(RM) *.exe</div><div class='del'>-	$(RM) zlib.a</div><div class='del'>-	$(RM) foo.gz</div><div class='del'>-</div><div class='del'>-DEPS := $(wildcard *.d)</div><div class='del'>-ifneq ($(DEPS),)</div><div class='del'>-include $(DEPS)</div><div class='del'>-endif</div><div class='head'>diff --git a/src/3rdparty/zlib/win32/Makefile.gcc b/src/3rdparty/zlib/win32/Makefile.gcc<br/>deleted file mode 100644<br/>index 62a8430..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/win32/Makefile.gcc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/win32/Makefile.gcc</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,141 +0,0 @@</div><div class='del'>-# Makefile for zlib, derived from Makefile.dj2.</div><div class='del'>-# Modified for mingw32 by C. Spieler, 6/16/98.</div><div class='del'>-# Updated for zlib 1.2.x by Christian Spieler and Cosmin Truta, Mar-2003.</div><div class='del'>-# Last updated: 1-Aug-2003.</div><div class='del'>-# Tested under Cygwin and MinGW.</div><div class='del'>-</div><div class='del'>-# Copyright (C) 1995-2003 Jean-loup Gailly.</div><div class='del'>-# For conditions of distribution and use, see copyright notice in zlib.h</div><div class='del'>-</div><div class='del'>-# To compile, or to compile and test, type:</div><div class='del'>-#</div><div class='del'>-#   make -fmakefile.gcc;  make test testdll -fmakefile.gcc</div><div class='del'>-#</div><div class='del'>-# To use the asm code, type:</div><div class='del'>-#   cp contrib/asm?86/match.S ./match.S</div><div class='del'>-#   make LOC=-DASMV OBJA=match.o -fmakefile.gcc</div><div class='del'>-#</div><div class='del'>-# To install libz.a, zconf.h and zlib.h in the system directories, type:</div><div class='del'>-#</div><div class='del'>-#   make install -fmakefile.gcc</div><div class='del'>-</div><div class='del'>-# Note:</div><div class='del'>-# If the platform is *not* MinGW (e.g. it is Cygwin or UWIN),</div><div class='del'>-# the DLL name should be changed from "zlib1.dll".</div><div class='del'>-</div><div class='del'>-STATICLIB = libz.a</div><div class='del'>-SHAREDLIB = zlib1.dll</div><div class='del'>-IMPLIB    = libzdll.a</div><div class='del'>-</div><div class='del'>-#LOC = -DASMV</div><div class='del'>-#LOC = -DDEBUG -g</div><div class='del'>-</div><div class='del'>-CC = gcc</div><div class='del'>-CFLAGS = $(LOC) -O3 -Wall</div><div class='del'>-</div><div class='del'>-AS = $(CC)</div><div class='del'>-ASFLAGS = $(LOC) -Wall</div><div class='del'>-</div><div class='del'>-LD = $(CC)</div><div class='del'>-LDFLAGS = $(LOC) -s</div><div class='del'>-</div><div class='del'>-AR = ar</div><div class='del'>-ARFLAGS = rcs</div><div class='del'>-</div><div class='del'>-RC = windres</div><div class='del'>-RCFLAGS = --define GCC_WINDRES</div><div class='del'>-</div><div class='del'>-CP = cp -fp</div><div class='del'>-# If GNU install is available, replace $(CP) with install.</div><div class='del'>-INSTALL = $(CP)</div><div class='del'>-RM = rm -f</div><div class='del'>-</div><div class='del'>-prefix = /usr/local</div><div class='del'>-exec_prefix = $(prefix)</div><div class='del'>-</div><div class='del'>-OBJS = adler32.o compress.o crc32.o deflate.o gzio.o infback.o \</div><div class='del'>-       inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o</div><div class='del'>-OBJA =</div><div class='del'>-</div><div class='del'>-all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example minigzip example_d minigzip_d</div><div class='del'>-</div><div class='del'>-test: example minigzip</div><div class='del'>-	./example</div><div class='del'>-	echo hello world | ./minigzip | ./minigzip -d</div><div class='del'>-</div><div class='del'>-testdll: example_d minigzip_d</div><div class='del'>-	./example_d</div><div class='del'>-	echo hello world | ./minigzip_d | ./minigzip_d -d</div><div class='del'>-</div><div class='del'>-.c.o:</div><div class='del'>-	$(CC) $(CFLAGS) -c -o $@ $&lt;</div><div class='del'>-</div><div class='del'>-.S.o:</div><div class='del'>-	$(AS) $(ASFLAGS) -c -o $@ $&lt;</div><div class='del'>-</div><div class='del'>-$(STATICLIB): $(OBJS) $(OBJA)</div><div class='del'>-	$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)</div><div class='del'>-</div><div class='del'>-$(IMPLIB): $(SHAREDLIB)</div><div class='del'>-</div><div class='del'>-$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o</div><div class='del'>-	dllwrap --driver-name $(CC) --def win32/zlib.def \</div><div class='del'>-	  --implib $(IMPLIB) -o $@ $(OBJS) $(OBJA) zlibrc.o</div><div class='del'>-	strip $@</div><div class='del'>-</div><div class='del'>-example: example.o $(STATICLIB)</div><div class='del'>-	$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)</div><div class='del'>-</div><div class='del'>-minigzip: minigzip.o $(STATICLIB)</div><div class='del'>-	$(LD) $(LDFLAGS) -o $@ minigzip.o $(STATICLIB)</div><div class='del'>-</div><div class='del'>-example_d: example.o $(IMPLIB)</div><div class='del'>-	$(LD) $(LDFLAGS) -o $@ example.o $(IMPLIB)</div><div class='del'>-</div><div class='del'>-minigzip_d: minigzip.o $(IMPLIB)</div><div class='del'>-	$(LD) $(LDFLAGS) -o $@ minigzip.o $(IMPLIB)</div><div class='del'>-</div><div class='del'>-zlibrc.o: win32/zlib1.rc</div><div class='del'>-	$(RC) $(RCFLAGS) -o $@ win32/zlib1.rc</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# INCLUDE_PATH and LIBRARY_PATH must be set.</div><div class='del'>-</div><div class='del'>-.PHONY: install uninstall clean</div><div class='del'>-</div><div class='del'>-install: zlib.h zconf.h $(LIB)</div><div class='del'>-	-@if not exist $(INCLUDE_PATH)/nul mkdir $(INCLUDE_PATH)</div><div class='del'>-	-@if not exist $(LIBRARY_PATH)/nul mkdir $(LIBRARY_PATH)</div><div class='del'>-	-$(INSTALL) zlib.h $(INCLUDE_PATH)</div><div class='del'>-	-$(INSTALL) zconf.h $(INCLUDE_PATH)</div><div class='del'>-	-$(INSTALL) $(STATICLIB) $(LIBRARY_PATH)</div><div class='del'>-	-$(INSTALL) $(IMPLIB) $(LIBRARY_PATH)</div><div class='del'>-</div><div class='del'>-uninstall:</div><div class='del'>-	-$(RM) $(INCLUDE_PATH)/zlib.h</div><div class='del'>-	-$(RM) $(INCLUDE_PATH)/zconf.h</div><div class='del'>-	-$(RM) $(LIBRARY_PATH)/$(STATICLIB)</div><div class='del'>-	-$(RM) $(LIBRARY_PATH)/$(IMPLIB)</div><div class='del'>-</div><div class='del'>-clean:</div><div class='del'>-	-$(RM) $(STATICLIB)</div><div class='del'>-	-$(RM) $(SHAREDLIB)</div><div class='del'>-	-$(RM) $(IMPLIB)</div><div class='del'>-	-$(RM) *.o</div><div class='del'>-	-$(RM) *.exe</div><div class='del'>-	-$(RM) foo.gz</div><div class='del'>-</div><div class='del'>-adler32.o: zlib.h zconf.h</div><div class='del'>-compress.o: zlib.h zconf.h</div><div class='del'>-crc32.o: crc32.h zlib.h zconf.h</div><div class='del'>-deflate.o: deflate.h zutil.h zlib.h zconf.h</div><div class='del'>-example.o: zlib.h zconf.h</div><div class='del'>-gzio.o: zutil.h zlib.h zconf.h</div><div class='del'>-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h</div><div class='del'>-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h</div><div class='del'>-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h</div><div class='del'>-inftrees.o: zutil.h zlib.h zconf.h inftrees.h</div><div class='del'>-minigzip.o: zlib.h zconf.h</div><div class='del'>-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h</div><div class='del'>-uncompr.o: zlib.h zconf.h</div><div class='del'>-zutil.o: zutil.h zlib.h zconf.h</div><div class='head'>diff --git a/src/3rdparty/zlib/win32/Makefile.msc b/src/3rdparty/zlib/win32/Makefile.msc<br/>deleted file mode 100644<br/>index 528ecaa..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/win32/Makefile.msc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/win32/Makefile.msc</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,126 +0,0 @@</div><div class='del'>-# Makefile for zlib -- Microsoft (Visual) C</div><div class='del'>-#</div><div class='del'>-# Authors:</div><div class='del'>-#   Cosmin Truta, 11-Mar-2003</div><div class='del'>-#   Christian Spieler, 19-Mar-2003</div><div class='del'>-#</div><div class='del'>-# Last updated:</div><div class='del'>-#   Cosmin Truta, 27-Aug-2003</div><div class='del'>-#</div><div class='del'>-# Usage:</div><div class='del'>-#   nmake -f win32/Makefile.msc            (standard build)</div><div class='del'>-#   nmake -f win32/Makefile.msc LOC=-DFOO  (nonstandard build)</div><div class='del'>-#   nmake -f win32/Makefile.msc LOC=-DASMV OBJA=match.obj  (use ASM code)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# optional build flags</div><div class='del'>-LOC =</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# variables</div><div class='del'>-STATICLIB = zlib.lib</div><div class='del'>-SHAREDLIB = zlib1.dll</div><div class='del'>-IMPLIB    = zdll.lib</div><div class='del'>-</div><div class='del'>-CC = cl</div><div class='del'>-AS = ml</div><div class='del'>-LD = link</div><div class='del'>-AR = lib</div><div class='del'>-RC = rc</div><div class='del'>-CFLAGS  = -nologo -MD -O2 $(LOC)</div><div class='del'>-ASFLAGS = -coff</div><div class='del'>-LDFLAGS = -nologo -release</div><div class='del'>-ARFLAGS = -nologo</div><div class='del'>-RCFLAGS = /dWIN32 /r</div><div class='del'>-</div><div class='del'>-OBJS = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj \</div><div class='del'>-       inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj</div><div class='del'>-OBJA =</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# targets</div><div class='del'>-all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) \</div><div class='del'>-     example.exe minigzip.exe example_d.exe minigzip_d.exe</div><div class='del'>-</div><div class='del'>-$(STATICLIB): $(OBJS) $(OBJA)</div><div class='del'>-	$(AR) $(ARFLAGS) -out:$@ $(OBJS) $(OBJA)</div><div class='del'>-</div><div class='del'>-$(IMPLIB): $(SHAREDLIB)</div><div class='del'>-</div><div class='del'>-$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlib1.res</div><div class='del'>-	$(LD) $(LDFLAGS) -def:win32/zlib.def -dll -implib:$(IMPLIB) \</div><div class='del'>-	  -out:$@ $(OBJS) $(OBJA) zlib1.res</div><div class='del'>-</div><div class='del'>-example.exe: example.obj $(STATICLIB)</div><div class='del'>-	$(LD) $(LDFLAGS) example.obj $(STATICLIB)</div><div class='del'>-</div><div class='del'>-minigzip.exe: minigzip.obj $(STATICLIB)</div><div class='del'>-	$(LD) $(LDFLAGS) minigzip.obj $(STATICLIB)</div><div class='del'>-</div><div class='del'>-example_d.exe: example.obj $(IMPLIB)</div><div class='del'>-	$(LD) $(LDFLAGS) -out:$@ example.obj $(IMPLIB)</div><div class='del'>-</div><div class='del'>-minigzip_d.exe: minigzip.obj $(IMPLIB)</div><div class='del'>-	$(LD) $(LDFLAGS) -out:$@ minigzip.obj $(IMPLIB)</div><div class='del'>-</div><div class='del'>-.c.obj:</div><div class='del'>-	$(CC) -c $(CFLAGS) $&lt;</div><div class='del'>-</div><div class='del'>-.asm.obj:</div><div class='del'>-	$(AS) -c $(ASFLAGS) $&lt;</div><div class='del'>-</div><div class='del'>-adler32.obj: adler32.c zlib.h zconf.h</div><div class='del'>-</div><div class='del'>-compress.obj: compress.c zlib.h zconf.h</div><div class='del'>-</div><div class='del'>-crc32.obj: crc32.c zlib.h zconf.h crc32.h</div><div class='del'>-</div><div class='del'>-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h</div><div class='del'>-</div><div class='del'>-gzio.obj: gzio.c zutil.h zlib.h zconf.h</div><div class='del'>-</div><div class='del'>-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \</div><div class='del'>-             inffast.h inffixed.h</div><div class='del'>-</div><div class='del'>-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \</div><div class='del'>-             inffast.h</div><div class='del'>-</div><div class='del'>-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \</div><div class='del'>-             inffast.h inffixed.h</div><div class='del'>-</div><div class='del'>-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h</div><div class='del'>-</div><div class='del'>-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h</div><div class='del'>-</div><div class='del'>-uncompr.obj: uncompr.c zlib.h zconf.h</div><div class='del'>-</div><div class='del'>-zutil.obj: zutil.c zutil.h zlib.h zconf.h</div><div class='del'>-</div><div class='del'>-example.obj: example.c zlib.h zconf.h</div><div class='del'>-</div><div class='del'>-minigzip.obj: minigzip.c zlib.h zconf.h</div><div class='del'>-</div><div class='del'>-zlib1.res: win32/zlib1.rc</div><div class='del'>-	$(RC) $(RCFLAGS) /fo$@ win32/zlib1.rc</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# testing</div><div class='del'>-test: example.exe minigzip.exe</div><div class='del'>-	example</div><div class='del'>-	echo hello world | minigzip | minigzip -d</div><div class='del'>-</div><div class='del'>-testdll: example_d.exe minigzip_d.exe</div><div class='del'>-	example_d</div><div class='del'>-	echo hello world | minigzip_d | minigzip_d -d</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# cleanup</div><div class='del'>-clean:</div><div class='del'>-	-del $(STATICLIB)</div><div class='del'>-	-del $(SHAREDLIB)</div><div class='del'>-	-del $(IMPLIB)</div><div class='del'>-	-del *.obj</div><div class='del'>-	-del *.res</div><div class='del'>-	-del *.exp</div><div class='del'>-	-del *.exe</div><div class='del'>-	-del foo.gz</div><div class='head'>diff --git a/src/3rdparty/zlib/win32/VisualC.txt b/src/3rdparty/zlib/win32/VisualC.txt<br/>deleted file mode 100644<br/>index 579a5fc..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/win32/VisualC.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/win32/VisualC.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-</div><div class='del'>-To build zlib using the Microsoft Visual C++ environment,</div><div class='del'>-use the appropriate project from the projects/ directory.</div><div class='head'>diff --git a/src/3rdparty/zlib/win32/zlib.def b/src/3rdparty/zlib/win32/zlib.def<br/>deleted file mode 100644<br/>index a47cbc1..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/win32/zlib.def?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/win32/zlib.def</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,60 +0,0 @@</div><div class='del'>-LIBRARY</div><div class='del'>-; zlib data compression library</div><div class='del'>-</div><div class='del'>-EXPORTS</div><div class='del'>-; basic functions</div><div class='del'>-    zlibVersion</div><div class='del'>-    deflate</div><div class='del'>-    deflateEnd</div><div class='del'>-    inflate</div><div class='del'>-    inflateEnd</div><div class='del'>-; advanced functions</div><div class='del'>-    deflateSetDictionary</div><div class='del'>-    deflateCopy</div><div class='del'>-    deflateReset</div><div class='del'>-    deflateParams</div><div class='del'>-    deflateBound</div><div class='del'>-    deflatePrime</div><div class='del'>-    inflateSetDictionary</div><div class='del'>-    inflateSync</div><div class='del'>-    inflateCopy</div><div class='del'>-    inflateReset</div><div class='del'>-    inflateBack</div><div class='del'>-    inflateBackEnd</div><div class='del'>-    zlibCompileFlags</div><div class='del'>-; utility functions</div><div class='del'>-    compress</div><div class='del'>-    compress2</div><div class='del'>-    compressBound</div><div class='del'>-    uncompress</div><div class='del'>-    gzopen</div><div class='del'>-    gzdopen</div><div class='del'>-    gzsetparams</div><div class='del'>-    gzread</div><div class='del'>-    gzwrite</div><div class='del'>-    gzprintf</div><div class='del'>-    gzputs</div><div class='del'>-    gzgets</div><div class='del'>-    gzputc</div><div class='del'>-    gzgetc</div><div class='del'>-    gzungetc</div><div class='del'>-    gzflush</div><div class='del'>-    gzseek</div><div class='del'>-    gzrewind</div><div class='del'>-    gztell</div><div class='del'>-    gzeof</div><div class='del'>-    gzclose</div><div class='del'>-    gzerror</div><div class='del'>-    gzclearerr</div><div class='del'>-; checksum functions</div><div class='del'>-    adler32</div><div class='del'>-    crc32</div><div class='del'>-; various hacks, don't look :)</div><div class='del'>-    deflateInit_</div><div class='del'>-    deflateInit2_</div><div class='del'>-    inflateInit_</div><div class='del'>-    inflateInit2_</div><div class='del'>-    inflateBackInit_</div><div class='del'>-    inflateSyncPoint</div><div class='del'>-    get_crc_table</div><div class='del'>-    zError</div><div class='head'>diff --git a/src/3rdparty/zlib/win32/zlib1.rc b/src/3rdparty/zlib/win32/zlib1.rc<br/>deleted file mode 100644<br/>index 99025c9..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/win32/zlib1.rc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/win32/zlib1.rc</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-#include &lt;windows.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef GCC_WINDRES</div><div class='del'>-VS_VERSION_INFO		VERSIONINFO</div><div class='del'>-#else</div><div class='del'>-VS_VERSION_INFO		VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE</div><div class='del'>-#endif</div><div class='del'>-  FILEVERSION		1,2,2,0</div><div class='del'>-  PRODUCTVERSION	1,2,2,0</div><div class='del'>-  FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK</div><div class='del'>-#ifdef _DEBUG</div><div class='del'>-  FILEFLAGS		1</div><div class='del'>-#else</div><div class='del'>-  FILEFLAGS		0</div><div class='del'>-#endif</div><div class='del'>-  FILEOS		VOS_DOS_WINDOWS32</div><div class='del'>-  FILETYPE		VFT_DLL</div><div class='del'>-  FILESUBTYPE		0	// not used</div><div class='del'>-BEGIN</div><div class='del'>-  BLOCK "StringFileInfo"</div><div class='del'>-  BEGIN</div><div class='del'>-    BLOCK "040904E4"</div><div class='del'>-    //language ID = U.S. English, char set = Windows, Multilingual</div><div class='del'>-    BEGIN</div><div class='del'>-      VALUE "FileDescription",	"zlib data compression library\0"</div><div class='del'>-      VALUE "FileVersion",	"1.2.3\0"</div><div class='del'>-      VALUE "InternalName",	"zlib1.dll\0"</div><div class='del'>-      VALUE "LegalCopyright",	"(C) 1995-2004 Jean-loup Gailly &amp; Mark Adler\0"</div><div class='del'>-      VALUE "OriginalFilename",	"zlib1.dll\0"</div><div class='del'>-      VALUE "ProductName",	"zlib\0"</div><div class='del'>-      VALUE "ProductVersion",	"1.2.3\0"</div><div class='del'>-      VALUE "Comments","DLL support by Alessandro Iacopetti &amp; Gilles Vollant\0"</div><div class='del'>-    END</div><div class='del'>-  END</div><div class='del'>-  BLOCK "VarFileInfo"</div><div class='del'>-  BEGIN</div><div class='del'>-    VALUE "Translation", 0x0409, 1252</div><div class='del'>-  END</div><div class='del'>-END</div><div class='head'>diff --git a/src/3rdparty/zlib/zconf.h b/src/3rdparty/zlib/zconf.h<br/>index 03a9431..806a51e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/zconf.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/zconf.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/zconf.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/zconf.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* zconf.h -- configuration of the zlib compression library</div><div class='del'>- * Copyright (C) 1995-2005 Jean-loup Gailly.</div><div class='add'>+ * Copyright (C) 1995-2010 Jean-loup Gailly.</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -11,52 +11,124 @@</div><div class='ctx'> /*</div><div class='ctx'>  * If you *really* need a unique prefix for all types and library functions,</div><div class='ctx'>  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.</div><div class='add'>+ * Even better than compiling with -DZ_PREFIX would be to use configure to set</div><div class='add'>+ * this permanently in zconf.h using "./configure --zprefix".</div><div class='ctx'>  */</div><div class='del'>-#ifdef Z_PREFIX</div><div class='del'>-#  define deflateInit_          z_deflateInit_</div><div class='add'>+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */</div><div class='add'>+</div><div class='add'>+/* all linked symbols */</div><div class='add'>+#  define _dist_code            z__dist_code</div><div class='add'>+#  define _length_code          z__length_code</div><div class='add'>+#  define _tr_align             z__tr_align</div><div class='add'>+#  define _tr_flush_block       z__tr_flush_block</div><div class='add'>+#  define _tr_init              z__tr_init</div><div class='add'>+#  define _tr_stored_block      z__tr_stored_block</div><div class='add'>+#  define _tr_tally             z__tr_tally</div><div class='add'>+#  define adler32               z_adler32</div><div class='add'>+#  define adler32_combine       z_adler32_combine</div><div class='add'>+#  define adler32_combine64     z_adler32_combine64</div><div class='add'>+#  define compress              z_compress</div><div class='add'>+#  define compress2             z_compress2</div><div class='add'>+#  define compressBound         z_compressBound</div><div class='add'>+#  define crc32                 z_crc32</div><div class='add'>+#  define crc32_combine         z_crc32_combine</div><div class='add'>+#  define crc32_combine64       z_crc32_combine64</div><div class='ctx'> #  define deflate               z_deflate</div><div class='add'>+#  define deflateBound          z_deflateBound</div><div class='add'>+#  define deflateCopy           z_deflateCopy</div><div class='ctx'> #  define deflateEnd            z_deflateEnd</div><div class='del'>-#  define inflateInit_          z_inflateInit_</div><div class='del'>-#  define inflate               z_inflate</div><div class='del'>-#  define inflateEnd            z_inflateEnd</div><div class='ctx'> #  define deflateInit2_         z_deflateInit2_</div><div class='del'>-#  define deflateSetDictionary  z_deflateSetDictionary</div><div class='del'>-#  define deflateCopy           z_deflateCopy</div><div class='del'>-#  define deflateReset          z_deflateReset</div><div class='add'>+#  define deflateInit_          z_deflateInit_</div><div class='ctx'> #  define deflateParams         z_deflateParams</div><div class='del'>-#  define deflateBound          z_deflateBound</div><div class='ctx'> #  define deflatePrime          z_deflatePrime</div><div class='add'>+#  define deflateReset          z_deflateReset</div><div class='add'>+#  define deflateSetDictionary  z_deflateSetDictionary</div><div class='add'>+#  define deflateSetHeader      z_deflateSetHeader</div><div class='add'>+#  define deflateTune           z_deflateTune</div><div class='add'>+#  define deflate_copyright     z_deflate_copyright</div><div class='add'>+#  define get_crc_table         z_get_crc_table</div><div class='add'>+#  define gz_error              z_gz_error</div><div class='add'>+#  define gz_intmax             z_gz_intmax</div><div class='add'>+#  define gz_strwinerror        z_gz_strwinerror</div><div class='add'>+#  define gzbuffer              z_gzbuffer</div><div class='add'>+#  define gzclearerr            z_gzclearerr</div><div class='add'>+#  define gzclose               z_gzclose</div><div class='add'>+#  define gzclose_r             z_gzclose_r</div><div class='add'>+#  define gzclose_w             z_gzclose_w</div><div class='add'>+#  define gzdirect              z_gzdirect</div><div class='add'>+#  define gzdopen               z_gzdopen</div><div class='add'>+#  define gzeof                 z_gzeof</div><div class='add'>+#  define gzerror               z_gzerror</div><div class='add'>+#  define gzflush               z_gzflush</div><div class='add'>+#  define gzgetc                z_gzgetc</div><div class='add'>+#  define gzgets                z_gzgets</div><div class='add'>+#  define gzoffset              z_gzoffset</div><div class='add'>+#  define gzoffset64            z_gzoffset64</div><div class='add'>+#  define gzopen                z_gzopen</div><div class='add'>+#  define gzopen64              z_gzopen64</div><div class='add'>+#  define gzprintf              z_gzprintf</div><div class='add'>+#  define gzputc                z_gzputc</div><div class='add'>+#  define gzputs                z_gzputs</div><div class='add'>+#  define gzread                z_gzread</div><div class='add'>+#  define gzrewind              z_gzrewind</div><div class='add'>+#  define gzseek                z_gzseek</div><div class='add'>+#  define gzseek64              z_gzseek64</div><div class='add'>+#  define gzsetparams           z_gzsetparams</div><div class='add'>+#  define gztell                z_gztell</div><div class='add'>+#  define gztell64              z_gztell64</div><div class='add'>+#  define gzungetc              z_gzungetc</div><div class='add'>+#  define gzwrite               z_gzwrite</div><div class='add'>+#  define inflate               z_inflate</div><div class='add'>+#  define inflateBack           z_inflateBack</div><div class='add'>+#  define inflateBackEnd        z_inflateBackEnd</div><div class='add'>+#  define inflateBackInit_      z_inflateBackInit_</div><div class='add'>+#  define inflateCopy           z_inflateCopy</div><div class='add'>+#  define inflateEnd            z_inflateEnd</div><div class='add'>+#  define inflateGetHeader      z_inflateGetHeader</div><div class='ctx'> #  define inflateInit2_         z_inflateInit2_</div><div class='add'>+#  define inflateInit_          z_inflateInit_</div><div class='add'>+#  define inflateMark           z_inflateMark</div><div class='add'>+#  define inflatePrime          z_inflatePrime</div><div class='add'>+#  define inflateReset          z_inflateReset</div><div class='add'>+#  define inflateReset2         z_inflateReset2</div><div class='ctx'> #  define inflateSetDictionary  z_inflateSetDictionary</div><div class='ctx'> #  define inflateSync           z_inflateSync</div><div class='ctx'> #  define inflateSyncPoint      z_inflateSyncPoint</div><div class='del'>-#  define inflateCopy           z_inflateCopy</div><div class='del'>-#  define inflateReset          z_inflateReset</div><div class='del'>-#  define inflateBack           z_inflateBack</div><div class='del'>-#  define inflateBackEnd        z_inflateBackEnd</div><div class='del'>-#  define compress              z_compress</div><div class='del'>-#  define compress2             z_compress2</div><div class='del'>-#  define compressBound         z_compressBound</div><div class='add'>+#  define inflateUndermine      z_inflateUndermine</div><div class='add'>+#  define inflate_copyright     z_inflate_copyright</div><div class='add'>+#  define inflate_fast          z_inflate_fast</div><div class='add'>+#  define inflate_table         z_inflate_table</div><div class='ctx'> #  define uncompress            z_uncompress</div><div class='del'>-#  define adler32               z_adler32</div><div class='del'>-#  define crc32                 z_crc32</div><div class='del'>-#  define get_crc_table         z_get_crc_table</div><div class='ctx'> #  define zError                z_zError</div><div class='add'>+#  define zcalloc               z_zcalloc</div><div class='add'>+#  define zcfree                z_zcfree</div><div class='add'>+#  define zlibCompileFlags      z_zlibCompileFlags</div><div class='add'>+#  define zlibVersion           z_zlibVersion</div><div class='ctx'> </div><div class='add'>+/* all zlib typedefs in zlib.h and zconf.h */</div><div class='add'>+#  define Byte                  z_Byte</div><div class='add'>+#  define Bytef                 z_Bytef</div><div class='ctx'> #  define alloc_func            z_alloc_func</div><div class='add'>+#  define charf                 z_charf</div><div class='ctx'> #  define free_func             z_free_func</div><div class='add'>+#  define gzFile                z_gzFile</div><div class='add'>+#  define gz_header             z_gz_header</div><div class='add'>+#  define gz_headerp            z_gz_headerp</div><div class='ctx'> #  define in_func               z_in_func</div><div class='add'>+#  define intf                  z_intf</div><div class='ctx'> #  define out_func              z_out_func</div><div class='del'>-#  define Byte                  z_Byte</div><div class='ctx'> #  define uInt                  z_uInt</div><div class='del'>-#  define uLong                 z_uLong</div><div class='del'>-#  define Bytef                 z_Bytef</div><div class='del'>-#  define charf                 z_charf</div><div class='del'>-#  define intf                  z_intf</div><div class='ctx'> #  define uIntf                 z_uIntf</div><div class='add'>+#  define uLong                 z_uLong</div><div class='ctx'> #  define uLongf                z_uLongf</div><div class='del'>-#  define voidpf                z_voidpf</div><div class='ctx'> #  define voidp                 z_voidp</div><div class='add'>+#  define voidpc                z_voidpc</div><div class='add'>+#  define voidpf                z_voidpf</div><div class='add'>+</div><div class='add'>+/* all zlib structs in zlib.h and zconf.h */</div><div class='add'>+#  define gz_header_s           z_gz_header_s</div><div class='add'>+#  define internal_state        z_internal_state</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(__MSDOS__) &amp;&amp; !defined(MSDOS)</div><div class='hunk'>@@ -284,49 +356,73 @@ typedef uLong FAR uLongf;</div><div class='ctx'>    typedef Byte       *voidp;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */</div><div class='del'>-#  include &lt;sys/types.h&gt; /* for off_t */</div><div class='del'>-#  include &lt;unistd.h&gt;    /* for SEEK_* and off_t */</div><div class='add'>+#if defined(HAVE_UNISTD_H) || !defined(WIN32)</div><div class='add'>+#  define Z_HAVE_UNISTD_H</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(STDC) &amp;&amp; !defined(_WIN32_WCE)</div><div class='add'>+#  include &lt;sys/types.h&gt;    /* for off_t */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and</div><div class='add'>+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even</div><div class='add'>+ * though the former does not conform to the LFS document), but considering</div><div class='add'>+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as</div><div class='add'>+ * equivalently requesting no 64-bit operations</div><div class='add'>+ */</div><div class='add'>+#if -_LARGEFILE64_SOURCE - -1 == 1</div><div class='add'>+#  undef _LARGEFILE64_SOURCE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)</div><div class='add'>+#  include &lt;unistd.h&gt;       /* for SEEK_* and off_t */</div><div class='ctx'> #  ifdef VMS</div><div class='del'>-#    include &lt;unixio.h&gt;   /* for off_t */</div><div class='add'>+#    include &lt;unixio.h&gt;     /* for off_t */</div><div class='add'>+#  endif</div><div class='add'>+#  ifndef z_off_t</div><div class='add'>+#    define z_off_t off_t</div><div class='ctx'> #  endif</div><div class='del'>-#  define z_off_t off_t</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifndef SEEK_SET</div><div class='ctx'> #  define SEEK_SET        0       /* Seek from beginning of file.  */</div><div class='ctx'> #  define SEEK_CUR        1       /* Seek from current position.  */</div><div class='ctx'> #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #ifndef z_off_t</div><div class='ctx'> #  define z_off_t long</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(_LARGEFILE64_SOURCE) &amp;&amp; _LFS64_LARGEFILE-0</div><div class='add'>+#  define z_off64_t off64_t</div><div class='add'>+#else</div><div class='add'>+#  define z_off64_t z_off_t</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if defined(__OS400__)</div><div class='ctx'> #  define NO_vsnprintf</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if defined(__MVS__)</div><div class='ctx'> #  define NO_vsnprintf</div><div class='del'>-#  ifdef FAR</div><div class='del'>-#    undef FAR</div><div class='del'>-#  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* MVS linker does not support external names larger than 8 bytes */</div><div class='ctx'> #if defined(__MVS__)</div><div class='del'>-#   pragma map(deflateInit_,"DEIN")</div><div class='del'>-#   pragma map(deflateInit2_,"DEIN2")</div><div class='del'>-#   pragma map(deflateEnd,"DEEND")</div><div class='del'>-#   pragma map(deflateBound,"DEBND")</div><div class='del'>-#   pragma map(inflateInit_,"ININ")</div><div class='del'>-#   pragma map(inflateInit2_,"ININ2")</div><div class='del'>-#   pragma map(inflateEnd,"INEND")</div><div class='del'>-#   pragma map(inflateSync,"INSY")</div><div class='del'>-#   pragma map(inflateSetDictionary,"INSEDI")</div><div class='del'>-#   pragma map(compressBound,"CMBND")</div><div class='del'>-#   pragma map(inflate_table,"INTABL")</div><div class='del'>-#   pragma map(inflate_fast,"INFA")</div><div class='del'>-#   pragma map(inflate_copyright,"INCOPY")</div><div class='add'>+  #pragma map(deflateInit_,"DEIN")</div><div class='add'>+  #pragma map(deflateInit2_,"DEIN2")</div><div class='add'>+  #pragma map(deflateEnd,"DEEND")</div><div class='add'>+  #pragma map(deflateBound,"DEBND")</div><div class='add'>+  #pragma map(inflateInit_,"ININ")</div><div class='add'>+  #pragma map(inflateInit2_,"ININ2")</div><div class='add'>+  #pragma map(inflateEnd,"INEND")</div><div class='add'>+  #pragma map(inflateSync,"INSY")</div><div class='add'>+  #pragma map(inflateSetDictionary,"INSEDI")</div><div class='add'>+  #pragma map(compressBound,"CMBND")</div><div class='add'>+  #pragma map(inflate_table,"INTABL")</div><div class='add'>+  #pragma map(inflate_fast,"INFA")</div><div class='add'>+  #pragma map(inflate_copyright,"INCOPY")</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #endif /* ZCONF_H */</div><div class='head'>diff --git a/src/3rdparty/zlib/zconf.h.cmakein b/src/3rdparty/zlib/zconf.h.cmakein<br/>new file mode 100644<br/>index 0000000..a2f71b1<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/zconf.h.cmakein?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/zconf.h.cmakein</a></div><div class='hunk'>@@ -0,0 +1,430 @@</div><div class='add'>+/* zconf.h -- configuration of the zlib compression library</div><div class='add'>+ * Copyright (C) 1995-2010 Jean-loup Gailly.</div><div class='add'>+ * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* @(#) $Id$ */</div><div class='add'>+</div><div class='add'>+#ifndef ZCONF_H</div><div class='add'>+#define ZCONF_H</div><div class='add'>+#cmakedefine Z_PREFIX</div><div class='add'>+#cmakedefine Z_HAVE_UNISTD_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If you *really* need a unique prefix for all types and library functions,</div><div class='add'>+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.</div><div class='add'>+ * Even better than compiling with -DZ_PREFIX would be to use configure to set</div><div class='add'>+ * this permanently in zconf.h using "./configure --zprefix".</div><div class='add'>+ */</div><div class='add'>+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */</div><div class='add'>+</div><div class='add'>+/* all linked symbols */</div><div class='add'>+#  define _dist_code            z__dist_code</div><div class='add'>+#  define _length_code          z__length_code</div><div class='add'>+#  define _tr_align             z__tr_align</div><div class='add'>+#  define _tr_flush_block       z__tr_flush_block</div><div class='add'>+#  define _tr_init              z__tr_init</div><div class='add'>+#  define _tr_stored_block      z__tr_stored_block</div><div class='add'>+#  define _tr_tally             z__tr_tally</div><div class='add'>+#  define adler32               z_adler32</div><div class='add'>+#  define adler32_combine       z_adler32_combine</div><div class='add'>+#  define adler32_combine64     z_adler32_combine64</div><div class='add'>+#  define compress              z_compress</div><div class='add'>+#  define compress2             z_compress2</div><div class='add'>+#  define compressBound         z_compressBound</div><div class='add'>+#  define crc32                 z_crc32</div><div class='add'>+#  define crc32_combine         z_crc32_combine</div><div class='add'>+#  define crc32_combine64       z_crc32_combine64</div><div class='add'>+#  define deflate               z_deflate</div><div class='add'>+#  define deflateBound          z_deflateBound</div><div class='add'>+#  define deflateCopy           z_deflateCopy</div><div class='add'>+#  define deflateEnd            z_deflateEnd</div><div class='add'>+#  define deflateInit2_         z_deflateInit2_</div><div class='add'>+#  define deflateInit_          z_deflateInit_</div><div class='add'>+#  define deflateParams         z_deflateParams</div><div class='add'>+#  define deflatePrime          z_deflatePrime</div><div class='add'>+#  define deflateReset          z_deflateReset</div><div class='add'>+#  define deflateSetDictionary  z_deflateSetDictionary</div><div class='add'>+#  define deflateSetHeader      z_deflateSetHeader</div><div class='add'>+#  define deflateTune           z_deflateTune</div><div class='add'>+#  define deflate_copyright     z_deflate_copyright</div><div class='add'>+#  define get_crc_table         z_get_crc_table</div><div class='add'>+#  define gz_error              z_gz_error</div><div class='add'>+#  define gz_intmax             z_gz_intmax</div><div class='add'>+#  define gz_strwinerror        z_gz_strwinerror</div><div class='add'>+#  define gzbuffer              z_gzbuffer</div><div class='add'>+#  define gzclearerr            z_gzclearerr</div><div class='add'>+#  define gzclose               z_gzclose</div><div class='add'>+#  define gzclose_r             z_gzclose_r</div><div class='add'>+#  define gzclose_w             z_gzclose_w</div><div class='add'>+#  define gzdirect              z_gzdirect</div><div class='add'>+#  define gzdopen               z_gzdopen</div><div class='add'>+#  define gzeof                 z_gzeof</div><div class='add'>+#  define gzerror               z_gzerror</div><div class='add'>+#  define gzflush               z_gzflush</div><div class='add'>+#  define gzgetc                z_gzgetc</div><div class='add'>+#  define gzgets                z_gzgets</div><div class='add'>+#  define gzoffset              z_gzoffset</div><div class='add'>+#  define gzoffset64            z_gzoffset64</div><div class='add'>+#  define gzopen                z_gzopen</div><div class='add'>+#  define gzopen64              z_gzopen64</div><div class='add'>+#  define gzprintf              z_gzprintf</div><div class='add'>+#  define gzputc                z_gzputc</div><div class='add'>+#  define gzputs                z_gzputs</div><div class='add'>+#  define gzread                z_gzread</div><div class='add'>+#  define gzrewind              z_gzrewind</div><div class='add'>+#  define gzseek                z_gzseek</div><div class='add'>+#  define gzseek64              z_gzseek64</div><div class='add'>+#  define gzsetparams           z_gzsetparams</div><div class='add'>+#  define gztell                z_gztell</div><div class='add'>+#  define gztell64              z_gztell64</div><div class='add'>+#  define gzungetc              z_gzungetc</div><div class='add'>+#  define gzwrite               z_gzwrite</div><div class='add'>+#  define inflate               z_inflate</div><div class='add'>+#  define inflateBack           z_inflateBack</div><div class='add'>+#  define inflateBackEnd        z_inflateBackEnd</div><div class='add'>+#  define inflateBackInit_      z_inflateBackInit_</div><div class='add'>+#  define inflateCopy           z_inflateCopy</div><div class='add'>+#  define inflateEnd            z_inflateEnd</div><div class='add'>+#  define inflateGetHeader      z_inflateGetHeader</div><div class='add'>+#  define inflateInit2_         z_inflateInit2_</div><div class='add'>+#  define inflateInit_          z_inflateInit_</div><div class='add'>+#  define inflateMark           z_inflateMark</div><div class='add'>+#  define inflatePrime          z_inflatePrime</div><div class='add'>+#  define inflateReset          z_inflateReset</div><div class='add'>+#  define inflateReset2         z_inflateReset2</div><div class='add'>+#  define inflateSetDictionary  z_inflateSetDictionary</div><div class='add'>+#  define inflateSync           z_inflateSync</div><div class='add'>+#  define inflateSyncPoint      z_inflateSyncPoint</div><div class='add'>+#  define inflateUndermine      z_inflateUndermine</div><div class='add'>+#  define inflate_copyright     z_inflate_copyright</div><div class='add'>+#  define inflate_fast          z_inflate_fast</div><div class='add'>+#  define inflate_table         z_inflate_table</div><div class='add'>+#  define uncompress            z_uncompress</div><div class='add'>+#  define zError                z_zError</div><div class='add'>+#  define zcalloc               z_zcalloc</div><div class='add'>+#  define zcfree                z_zcfree</div><div class='add'>+#  define zlibCompileFlags      z_zlibCompileFlags</div><div class='add'>+#  define zlibVersion           z_zlibVersion</div><div class='add'>+</div><div class='add'>+/* all zlib typedefs in zlib.h and zconf.h */</div><div class='add'>+#  define Byte                  z_Byte</div><div class='add'>+#  define Bytef                 z_Bytef</div><div class='add'>+#  define alloc_func            z_alloc_func</div><div class='add'>+#  define charf                 z_charf</div><div class='add'>+#  define free_func             z_free_func</div><div class='add'>+#  define gzFile                z_gzFile</div><div class='add'>+#  define gz_header             z_gz_header</div><div class='add'>+#  define gz_headerp            z_gz_headerp</div><div class='add'>+#  define in_func               z_in_func</div><div class='add'>+#  define intf                  z_intf</div><div class='add'>+#  define out_func              z_out_func</div><div class='add'>+#  define uInt                  z_uInt</div><div class='add'>+#  define uIntf                 z_uIntf</div><div class='add'>+#  define uLong                 z_uLong</div><div class='add'>+#  define uLongf                z_uLongf</div><div class='add'>+#  define voidp                 z_voidp</div><div class='add'>+#  define voidpc                z_voidpc</div><div class='add'>+#  define voidpf                z_voidpf</div><div class='add'>+</div><div class='add'>+/* all zlib structs in zlib.h and zconf.h */</div><div class='add'>+#  define gz_header_s           z_gz_header_s</div><div class='add'>+#  define internal_state        z_internal_state</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(__MSDOS__) &amp;&amp; !defined(MSDOS)</div><div class='add'>+#  define MSDOS</div><div class='add'>+#endif</div><div class='add'>+#if (defined(OS_2) || defined(__OS2__)) &amp;&amp; !defined(OS2)</div><div class='add'>+#  define OS2</div><div class='add'>+#endif</div><div class='add'>+#if defined(_WINDOWS) &amp;&amp; !defined(WINDOWS)</div><div class='add'>+#  define WINDOWS</div><div class='add'>+#endif</div><div class='add'>+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)</div><div class='add'>+#  ifndef WIN32</div><div class='add'>+#    define WIN32</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) &amp;&amp; !defined(WIN32)</div><div class='add'>+#  if !defined(__GNUC__) &amp;&amp; !defined(__FLAT__) &amp;&amp; !defined(__386__)</div><div class='add'>+#    ifndef SYS16BIT</div><div class='add'>+#      define SYS16BIT</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more</div><div class='add'>+ * than 64k bytes at a time (needed on systems with 16-bit int).</div><div class='add'>+ */</div><div class='add'>+#ifdef SYS16BIT</div><div class='add'>+#  define MAXSEG_64K</div><div class='add'>+#endif</div><div class='add'>+#ifdef MSDOS</div><div class='add'>+#  define UNALIGNED_OK</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef __STDC_VERSION__</div><div class='add'>+#  ifndef STDC</div><div class='add'>+#    define STDC</div><div class='add'>+#  endif</div><div class='add'>+#  if __STDC_VERSION__ &gt;= 199901L</div><div class='add'>+#    ifndef STDC99</div><div class='add'>+#      define STDC99</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+#if !defined(STDC) &amp;&amp; (defined(__STDC__) || defined(__cplusplus))</div><div class='add'>+#  define STDC</div><div class='add'>+#endif</div><div class='add'>+#if !defined(STDC) &amp;&amp; (defined(__GNUC__) || defined(__BORLANDC__))</div><div class='add'>+#  define STDC</div><div class='add'>+#endif</div><div class='add'>+#if !defined(STDC) &amp;&amp; (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))</div><div class='add'>+#  define STDC</div><div class='add'>+#endif</div><div class='add'>+#if !defined(STDC) &amp;&amp; (defined(OS2) || defined(__HOS_AIX__))</div><div class='add'>+#  define STDC</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(__OS400__) &amp;&amp; !defined(STDC)    /* iSeries (formerly AS/400). */</div><div class='add'>+#  define STDC</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef STDC</div><div class='add'>+#  ifndef const /* cannot use !defined(STDC) &amp;&amp; !defined(const) on Mac */</div><div class='add'>+#    define const       /* note: need a more gentle solution here */</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Some Mac compilers merge all .h files incorrectly: */</div><div class='add'>+#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)</div><div class='add'>+#  define NO_DUMMY_DECL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Maximum value for memLevel in deflateInit2 */</div><div class='add'>+#ifndef MAX_MEM_LEVEL</div><div class='add'>+#  ifdef MAXSEG_64K</div><div class='add'>+#    define MAX_MEM_LEVEL 8</div><div class='add'>+#  else</div><div class='add'>+#    define MAX_MEM_LEVEL 9</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Maximum value for windowBits in deflateInit2 and inflateInit2.</div><div class='add'>+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files</div><div class='add'>+ * created by gzip. (Files created by minigzip can still be extracted by</div><div class='add'>+ * gzip.)</div><div class='add'>+ */</div><div class='add'>+#ifndef MAX_WBITS</div><div class='add'>+#  define MAX_WBITS   15 /* 32K LZ77 window */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* The memory requirements for deflate are (in bytes):</div><div class='add'>+            (1 &lt;&lt; (windowBits+2)) +  (1 &lt;&lt; (memLevel+9))</div><div class='add'>+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)</div><div class='add'>+ plus a few kilobytes for small objects. For example, if you want to reduce</div><div class='add'>+ the default memory requirements from 256K to 128K, compile with</div><div class='add'>+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"</div><div class='add'>+ Of course this will generally degrade compression (there's no free lunch).</div><div class='add'>+</div><div class='add'>+   The memory requirements for inflate are (in bytes) 1 &lt;&lt; windowBits</div><div class='add'>+ that is, 32K for windowBits=15 (default value) plus a few kilobytes</div><div class='add'>+ for small objects.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+                        /* Type declarations */</div><div class='add'>+</div><div class='add'>+#ifndef OF /* function prototypes */</div><div class='add'>+#  ifdef STDC</div><div class='add'>+#    define OF(args)  args</div><div class='add'>+#  else</div><div class='add'>+#    define OF(args)  ()</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* The following definitions for FAR are needed only for MSDOS mixed</div><div class='add'>+ * model programming (small or medium model with some far allocations).</div><div class='add'>+ * This was tested only with MSC; for other MSDOS compilers you may have</div><div class='add'>+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,</div><div class='add'>+ * just define FAR to be empty.</div><div class='add'>+ */</div><div class='add'>+#ifdef SYS16BIT</div><div class='add'>+#  if defined(M_I86SM) || defined(M_I86MM)</div><div class='add'>+     /* MSC small or medium model */</div><div class='add'>+#    define SMALL_MEDIUM</div><div class='add'>+#    ifdef _MSC_VER</div><div class='add'>+#      define FAR _far</div><div class='add'>+#    else</div><div class='add'>+#      define FAR far</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='add'>+#  if (defined(__SMALL__) || defined(__MEDIUM__))</div><div class='add'>+     /* Turbo C small or medium model */</div><div class='add'>+#    define SMALL_MEDIUM</div><div class='add'>+#    ifdef __BORLANDC__</div><div class='add'>+#      define FAR _far</div><div class='add'>+#    else</div><div class='add'>+#      define FAR far</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(WINDOWS) || defined(WIN32)</div><div class='add'>+   /* If building or using zlib as a DLL, define ZLIB_DLL.</div><div class='add'>+    * This is not mandatory, but it offers a little performance increase.</div><div class='add'>+    */</div><div class='add'>+#  ifdef ZLIB_DLL</div><div class='add'>+#    if defined(WIN32) &amp;&amp; (!defined(__BORLANDC__) || (__BORLANDC__ &gt;= 0x500))</div><div class='add'>+#      ifdef ZLIB_INTERNAL</div><div class='add'>+#        define ZEXTERN extern __declspec(dllexport)</div><div class='add'>+#      else</div><div class='add'>+#        define ZEXTERN extern __declspec(dllimport)</div><div class='add'>+#      endif</div><div class='add'>+#    endif</div><div class='add'>+#  endif  /* ZLIB_DLL */</div><div class='add'>+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,</div><div class='add'>+    * define ZLIB_WINAPI.</div><div class='add'>+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.</div><div class='add'>+    */</div><div class='add'>+#  ifdef ZLIB_WINAPI</div><div class='add'>+#    ifdef FAR</div><div class='add'>+#      undef FAR</div><div class='add'>+#    endif</div><div class='add'>+#    include &lt;windows.h&gt;</div><div class='add'>+     /* No need for _export, use ZLIB.DEF instead. */</div><div class='add'>+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */</div><div class='add'>+#    define ZEXPORT WINAPI</div><div class='add'>+#    ifdef WIN32</div><div class='add'>+#      define ZEXPORTVA WINAPIV</div><div class='add'>+#    else</div><div class='add'>+#      define ZEXPORTVA FAR CDECL</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined (__BEOS__)</div><div class='add'>+#  ifdef ZLIB_DLL</div><div class='add'>+#    ifdef ZLIB_INTERNAL</div><div class='add'>+#      define ZEXPORT   __declspec(dllexport)</div><div class='add'>+#      define ZEXPORTVA __declspec(dllexport)</div><div class='add'>+#    else</div><div class='add'>+#      define ZEXPORT   __declspec(dllimport)</div><div class='add'>+#      define ZEXPORTVA __declspec(dllimport)</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef ZEXTERN</div><div class='add'>+#  define ZEXTERN extern</div><div class='add'>+#endif</div><div class='add'>+#ifndef ZEXPORT</div><div class='add'>+#  define ZEXPORT</div><div class='add'>+#endif</div><div class='add'>+#ifndef ZEXPORTVA</div><div class='add'>+#  define ZEXPORTVA</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef FAR</div><div class='add'>+#  define FAR</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if !defined(__MACTYPES__)</div><div class='add'>+typedef unsigned char  Byte;  /* 8 bits */</div><div class='add'>+#endif</div><div class='add'>+typedef unsigned int   uInt;  /* 16 bits or more */</div><div class='add'>+typedef unsigned long  uLong; /* 32 bits or more */</div><div class='add'>+</div><div class='add'>+#ifdef SMALL_MEDIUM</div><div class='add'>+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */</div><div class='add'>+#  define Bytef Byte FAR</div><div class='add'>+#else</div><div class='add'>+   typedef Byte  FAR Bytef;</div><div class='add'>+#endif</div><div class='add'>+typedef char  FAR charf;</div><div class='add'>+typedef int   FAR intf;</div><div class='add'>+typedef uInt  FAR uIntf;</div><div class='add'>+typedef uLong FAR uLongf;</div><div class='add'>+</div><div class='add'>+#ifdef STDC</div><div class='add'>+   typedef void const *voidpc;</div><div class='add'>+   typedef void FAR   *voidpf;</div><div class='add'>+   typedef void       *voidp;</div><div class='add'>+#else</div><div class='add'>+   typedef Byte const *voidpc;</div><div class='add'>+   typedef Byte FAR   *voidpf;</div><div class='add'>+   typedef Byte       *voidp;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */</div><div class='add'>+#  define Z_HAVE_UNISTD_H</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef STDC</div><div class='add'>+#  include &lt;sys/types.h&gt;    /* for off_t */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and</div><div class='add'>+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even</div><div class='add'>+ * though the former does not conform to the LFS document), but considering</div><div class='add'>+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as</div><div class='add'>+ * equivalently requesting no 64-bit operations</div><div class='add'>+ */</div><div class='add'>+#if -_LARGEFILE64_SOURCE - -1 == 1</div><div class='add'>+#  undef _LARGEFILE64_SOURCE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)</div><div class='add'>+#  include &lt;unistd.h&gt;       /* for SEEK_* and off_t */</div><div class='add'>+#  ifdef VMS</div><div class='add'>+#    include &lt;unixio.h&gt;     /* for off_t */</div><div class='add'>+#  endif</div><div class='add'>+#  ifndef z_off_t</div><div class='add'>+#    define z_off_t off_t</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef SEEK_SET</div><div class='add'>+#  define SEEK_SET        0       /* Seek from beginning of file.  */</div><div class='add'>+#  define SEEK_CUR        1       /* Seek from current position.  */</div><div class='add'>+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef z_off_t</div><div class='add'>+#  define z_off_t long</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(_LARGEFILE64_SOURCE) &amp;&amp; _LFS64_LARGEFILE-0</div><div class='add'>+#  define z_off64_t off64_t</div><div class='add'>+#else</div><div class='add'>+#  define z_off64_t z_off_t</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(__OS400__)</div><div class='add'>+#  define NO_vsnprintf</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(__MVS__)</div><div class='add'>+#  define NO_vsnprintf</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* MVS linker does not support external names larger than 8 bytes */</div><div class='add'>+#if defined(__MVS__)</div><div class='add'>+  #pragma map(deflateInit_,"DEIN")</div><div class='add'>+  #pragma map(deflateInit2_,"DEIN2")</div><div class='add'>+  #pragma map(deflateEnd,"DEEND")</div><div class='add'>+  #pragma map(deflateBound,"DEBND")</div><div class='add'>+  #pragma map(inflateInit_,"ININ")</div><div class='add'>+  #pragma map(inflateInit2_,"ININ2")</div><div class='add'>+  #pragma map(inflateEnd,"INEND")</div><div class='add'>+  #pragma map(inflateSync,"INSY")</div><div class='add'>+  #pragma map(inflateSetDictionary,"INSEDI")</div><div class='add'>+  #pragma map(compressBound,"CMBND")</div><div class='add'>+  #pragma map(inflate_table,"INTABL")</div><div class='add'>+  #pragma map(inflate_fast,"INFA")</div><div class='add'>+  #pragma map(inflate_copyright,"INCOPY")</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* ZCONF_H */</div><div class='head'>diff --git a/src/3rdparty/zlib/zconf.h.in b/src/3rdparty/zlib/zconf.h.in<br/>new file mode 100644<br/>index 0000000..02ce56c<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/zconf.h.in?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/zconf.h.in</a></div><div class='hunk'>@@ -0,0 +1,428 @@</div><div class='add'>+/* zconf.h -- configuration of the zlib compression library</div><div class='add'>+ * Copyright (C) 1995-2010 Jean-loup Gailly.</div><div class='add'>+ * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* @(#) $Id$ */</div><div class='add'>+</div><div class='add'>+#ifndef ZCONF_H</div><div class='add'>+#define ZCONF_H</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * If you *really* need a unique prefix for all types and library functions,</div><div class='add'>+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.</div><div class='add'>+ * Even better than compiling with -DZ_PREFIX would be to use configure to set</div><div class='add'>+ * this permanently in zconf.h using "./configure --zprefix".</div><div class='add'>+ */</div><div class='add'>+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */</div><div class='add'>+</div><div class='add'>+/* all linked symbols */</div><div class='add'>+#  define _dist_code            z__dist_code</div><div class='add'>+#  define _length_code          z__length_code</div><div class='add'>+#  define _tr_align             z__tr_align</div><div class='add'>+#  define _tr_flush_block       z__tr_flush_block</div><div class='add'>+#  define _tr_init              z__tr_init</div><div class='add'>+#  define _tr_stored_block      z__tr_stored_block</div><div class='add'>+#  define _tr_tally             z__tr_tally</div><div class='add'>+#  define adler32               z_adler32</div><div class='add'>+#  define adler32_combine       z_adler32_combine</div><div class='add'>+#  define adler32_combine64     z_adler32_combine64</div><div class='add'>+#  define compress              z_compress</div><div class='add'>+#  define compress2             z_compress2</div><div class='add'>+#  define compressBound         z_compressBound</div><div class='add'>+#  define crc32                 z_crc32</div><div class='add'>+#  define crc32_combine         z_crc32_combine</div><div class='add'>+#  define crc32_combine64       z_crc32_combine64</div><div class='add'>+#  define deflate               z_deflate</div><div class='add'>+#  define deflateBound          z_deflateBound</div><div class='add'>+#  define deflateCopy           z_deflateCopy</div><div class='add'>+#  define deflateEnd            z_deflateEnd</div><div class='add'>+#  define deflateInit2_         z_deflateInit2_</div><div class='add'>+#  define deflateInit_          z_deflateInit_</div><div class='add'>+#  define deflateParams         z_deflateParams</div><div class='add'>+#  define deflatePrime          z_deflatePrime</div><div class='add'>+#  define deflateReset          z_deflateReset</div><div class='add'>+#  define deflateSetDictionary  z_deflateSetDictionary</div><div class='add'>+#  define deflateSetHeader      z_deflateSetHeader</div><div class='add'>+#  define deflateTune           z_deflateTune</div><div class='add'>+#  define deflate_copyright     z_deflate_copyright</div><div class='add'>+#  define get_crc_table         z_get_crc_table</div><div class='add'>+#  define gz_error              z_gz_error</div><div class='add'>+#  define gz_intmax             z_gz_intmax</div><div class='add'>+#  define gz_strwinerror        z_gz_strwinerror</div><div class='add'>+#  define gzbuffer              z_gzbuffer</div><div class='add'>+#  define gzclearerr            z_gzclearerr</div><div class='add'>+#  define gzclose               z_gzclose</div><div class='add'>+#  define gzclose_r             z_gzclose_r</div><div class='add'>+#  define gzclose_w             z_gzclose_w</div><div class='add'>+#  define gzdirect              z_gzdirect</div><div class='add'>+#  define gzdopen               z_gzdopen</div><div class='add'>+#  define gzeof                 z_gzeof</div><div class='add'>+#  define gzerror               z_gzerror</div><div class='add'>+#  define gzflush               z_gzflush</div><div class='add'>+#  define gzgetc                z_gzgetc</div><div class='add'>+#  define gzgets                z_gzgets</div><div class='add'>+#  define gzoffset              z_gzoffset</div><div class='add'>+#  define gzoffset64            z_gzoffset64</div><div class='add'>+#  define gzopen                z_gzopen</div><div class='add'>+#  define gzopen64              z_gzopen64</div><div class='add'>+#  define gzprintf              z_gzprintf</div><div class='add'>+#  define gzputc                z_gzputc</div><div class='add'>+#  define gzputs                z_gzputs</div><div class='add'>+#  define gzread                z_gzread</div><div class='add'>+#  define gzrewind              z_gzrewind</div><div class='add'>+#  define gzseek                z_gzseek</div><div class='add'>+#  define gzseek64              z_gzseek64</div><div class='add'>+#  define gzsetparams           z_gzsetparams</div><div class='add'>+#  define gztell                z_gztell</div><div class='add'>+#  define gztell64              z_gztell64</div><div class='add'>+#  define gzungetc              z_gzungetc</div><div class='add'>+#  define gzwrite               z_gzwrite</div><div class='add'>+#  define inflate               z_inflate</div><div class='add'>+#  define inflateBack           z_inflateBack</div><div class='add'>+#  define inflateBackEnd        z_inflateBackEnd</div><div class='add'>+#  define inflateBackInit_      z_inflateBackInit_</div><div class='add'>+#  define inflateCopy           z_inflateCopy</div><div class='add'>+#  define inflateEnd            z_inflateEnd</div><div class='add'>+#  define inflateGetHeader      z_inflateGetHeader</div><div class='add'>+#  define inflateInit2_         z_inflateInit2_</div><div class='add'>+#  define inflateInit_          z_inflateInit_</div><div class='add'>+#  define inflateMark           z_inflateMark</div><div class='add'>+#  define inflatePrime          z_inflatePrime</div><div class='add'>+#  define inflateReset          z_inflateReset</div><div class='add'>+#  define inflateReset2         z_inflateReset2</div><div class='add'>+#  define inflateSetDictionary  z_inflateSetDictionary</div><div class='add'>+#  define inflateSync           z_inflateSync</div><div class='add'>+#  define inflateSyncPoint      z_inflateSyncPoint</div><div class='add'>+#  define inflateUndermine      z_inflateUndermine</div><div class='add'>+#  define inflate_copyright     z_inflate_copyright</div><div class='add'>+#  define inflate_fast          z_inflate_fast</div><div class='add'>+#  define inflate_table         z_inflate_table</div><div class='add'>+#  define uncompress            z_uncompress</div><div class='add'>+#  define zError                z_zError</div><div class='add'>+#  define zcalloc               z_zcalloc</div><div class='add'>+#  define zcfree                z_zcfree</div><div class='add'>+#  define zlibCompileFlags      z_zlibCompileFlags</div><div class='add'>+#  define zlibVersion           z_zlibVersion</div><div class='add'>+</div><div class='add'>+/* all zlib typedefs in zlib.h and zconf.h */</div><div class='add'>+#  define Byte                  z_Byte</div><div class='add'>+#  define Bytef                 z_Bytef</div><div class='add'>+#  define alloc_func            z_alloc_func</div><div class='add'>+#  define charf                 z_charf</div><div class='add'>+#  define free_func             z_free_func</div><div class='add'>+#  define gzFile                z_gzFile</div><div class='add'>+#  define gz_header             z_gz_header</div><div class='add'>+#  define gz_headerp            z_gz_headerp</div><div class='add'>+#  define in_func               z_in_func</div><div class='add'>+#  define intf                  z_intf</div><div class='add'>+#  define out_func              z_out_func</div><div class='add'>+#  define uInt                  z_uInt</div><div class='add'>+#  define uIntf                 z_uIntf</div><div class='add'>+#  define uLong                 z_uLong</div><div class='add'>+#  define uLongf                z_uLongf</div><div class='add'>+#  define voidp                 z_voidp</div><div class='add'>+#  define voidpc                z_voidpc</div><div class='add'>+#  define voidpf                z_voidpf</div><div class='add'>+</div><div class='add'>+/* all zlib structs in zlib.h and zconf.h */</div><div class='add'>+#  define gz_header_s           z_gz_header_s</div><div class='add'>+#  define internal_state        z_internal_state</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(__MSDOS__) &amp;&amp; !defined(MSDOS)</div><div class='add'>+#  define MSDOS</div><div class='add'>+#endif</div><div class='add'>+#if (defined(OS_2) || defined(__OS2__)) &amp;&amp; !defined(OS2)</div><div class='add'>+#  define OS2</div><div class='add'>+#endif</div><div class='add'>+#if defined(_WINDOWS) &amp;&amp; !defined(WINDOWS)</div><div class='add'>+#  define WINDOWS</div><div class='add'>+#endif</div><div class='add'>+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)</div><div class='add'>+#  ifndef WIN32</div><div class='add'>+#    define WIN32</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) &amp;&amp; !defined(WIN32)</div><div class='add'>+#  if !defined(__GNUC__) &amp;&amp; !defined(__FLAT__) &amp;&amp; !defined(__386__)</div><div class='add'>+#    ifndef SYS16BIT</div><div class='add'>+#      define SYS16BIT</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more</div><div class='add'>+ * than 64k bytes at a time (needed on systems with 16-bit int).</div><div class='add'>+ */</div><div class='add'>+#ifdef SYS16BIT</div><div class='add'>+#  define MAXSEG_64K</div><div class='add'>+#endif</div><div class='add'>+#ifdef MSDOS</div><div class='add'>+#  define UNALIGNED_OK</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef __STDC_VERSION__</div><div class='add'>+#  ifndef STDC</div><div class='add'>+#    define STDC</div><div class='add'>+#  endif</div><div class='add'>+#  if __STDC_VERSION__ &gt;= 199901L</div><div class='add'>+#    ifndef STDC99</div><div class='add'>+#      define STDC99</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+#if !defined(STDC) &amp;&amp; (defined(__STDC__) || defined(__cplusplus))</div><div class='add'>+#  define STDC</div><div class='add'>+#endif</div><div class='add'>+#if !defined(STDC) &amp;&amp; (defined(__GNUC__) || defined(__BORLANDC__))</div><div class='add'>+#  define STDC</div><div class='add'>+#endif</div><div class='add'>+#if !defined(STDC) &amp;&amp; (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))</div><div class='add'>+#  define STDC</div><div class='add'>+#endif</div><div class='add'>+#if !defined(STDC) &amp;&amp; (defined(OS2) || defined(__HOS_AIX__))</div><div class='add'>+#  define STDC</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(__OS400__) &amp;&amp; !defined(STDC)    /* iSeries (formerly AS/400). */</div><div class='add'>+#  define STDC</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef STDC</div><div class='add'>+#  ifndef const /* cannot use !defined(STDC) &amp;&amp; !defined(const) on Mac */</div><div class='add'>+#    define const       /* note: need a more gentle solution here */</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Some Mac compilers merge all .h files incorrectly: */</div><div class='add'>+#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)</div><div class='add'>+#  define NO_DUMMY_DECL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Maximum value for memLevel in deflateInit2 */</div><div class='add'>+#ifndef MAX_MEM_LEVEL</div><div class='add'>+#  ifdef MAXSEG_64K</div><div class='add'>+#    define MAX_MEM_LEVEL 8</div><div class='add'>+#  else</div><div class='add'>+#    define MAX_MEM_LEVEL 9</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Maximum value for windowBits in deflateInit2 and inflateInit2.</div><div class='add'>+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files</div><div class='add'>+ * created by gzip. (Files created by minigzip can still be extracted by</div><div class='add'>+ * gzip.)</div><div class='add'>+ */</div><div class='add'>+#ifndef MAX_WBITS</div><div class='add'>+#  define MAX_WBITS   15 /* 32K LZ77 window */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* The memory requirements for deflate are (in bytes):</div><div class='add'>+            (1 &lt;&lt; (windowBits+2)) +  (1 &lt;&lt; (memLevel+9))</div><div class='add'>+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)</div><div class='add'>+ plus a few kilobytes for small objects. For example, if you want to reduce</div><div class='add'>+ the default memory requirements from 256K to 128K, compile with</div><div class='add'>+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"</div><div class='add'>+ Of course this will generally degrade compression (there's no free lunch).</div><div class='add'>+</div><div class='add'>+   The memory requirements for inflate are (in bytes) 1 &lt;&lt; windowBits</div><div class='add'>+ that is, 32K for windowBits=15 (default value) plus a few kilobytes</div><div class='add'>+ for small objects.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+                        /* Type declarations */</div><div class='add'>+</div><div class='add'>+#ifndef OF /* function prototypes */</div><div class='add'>+#  ifdef STDC</div><div class='add'>+#    define OF(args)  args</div><div class='add'>+#  else</div><div class='add'>+#    define OF(args)  ()</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* The following definitions for FAR are needed only for MSDOS mixed</div><div class='add'>+ * model programming (small or medium model with some far allocations).</div><div class='add'>+ * This was tested only with MSC; for other MSDOS compilers you may have</div><div class='add'>+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,</div><div class='add'>+ * just define FAR to be empty.</div><div class='add'>+ */</div><div class='add'>+#ifdef SYS16BIT</div><div class='add'>+#  if defined(M_I86SM) || defined(M_I86MM)</div><div class='add'>+     /* MSC small or medium model */</div><div class='add'>+#    define SMALL_MEDIUM</div><div class='add'>+#    ifdef _MSC_VER</div><div class='add'>+#      define FAR _far</div><div class='add'>+#    else</div><div class='add'>+#      define FAR far</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='add'>+#  if (defined(__SMALL__) || defined(__MEDIUM__))</div><div class='add'>+     /* Turbo C small or medium model */</div><div class='add'>+#    define SMALL_MEDIUM</div><div class='add'>+#    ifdef __BORLANDC__</div><div class='add'>+#      define FAR _far</div><div class='add'>+#    else</div><div class='add'>+#      define FAR far</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(WINDOWS) || defined(WIN32)</div><div class='add'>+   /* If building or using zlib as a DLL, define ZLIB_DLL.</div><div class='add'>+    * This is not mandatory, but it offers a little performance increase.</div><div class='add'>+    */</div><div class='add'>+#  ifdef ZLIB_DLL</div><div class='add'>+#    if defined(WIN32) &amp;&amp; (!defined(__BORLANDC__) || (__BORLANDC__ &gt;= 0x500))</div><div class='add'>+#      ifdef ZLIB_INTERNAL</div><div class='add'>+#        define ZEXTERN extern __declspec(dllexport)</div><div class='add'>+#      else</div><div class='add'>+#        define ZEXTERN extern __declspec(dllimport)</div><div class='add'>+#      endif</div><div class='add'>+#    endif</div><div class='add'>+#  endif  /* ZLIB_DLL */</div><div class='add'>+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,</div><div class='add'>+    * define ZLIB_WINAPI.</div><div class='add'>+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.</div><div class='add'>+    */</div><div class='add'>+#  ifdef ZLIB_WINAPI</div><div class='add'>+#    ifdef FAR</div><div class='add'>+#      undef FAR</div><div class='add'>+#    endif</div><div class='add'>+#    include &lt;windows.h&gt;</div><div class='add'>+     /* No need for _export, use ZLIB.DEF instead. */</div><div class='add'>+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */</div><div class='add'>+#    define ZEXPORT WINAPI</div><div class='add'>+#    ifdef WIN32</div><div class='add'>+#      define ZEXPORTVA WINAPIV</div><div class='add'>+#    else</div><div class='add'>+#      define ZEXPORTVA FAR CDECL</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined (__BEOS__)</div><div class='add'>+#  ifdef ZLIB_DLL</div><div class='add'>+#    ifdef ZLIB_INTERNAL</div><div class='add'>+#      define ZEXPORT   __declspec(dllexport)</div><div class='add'>+#      define ZEXPORTVA __declspec(dllexport)</div><div class='add'>+#    else</div><div class='add'>+#      define ZEXPORT   __declspec(dllimport)</div><div class='add'>+#      define ZEXPORTVA __declspec(dllimport)</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef ZEXTERN</div><div class='add'>+#  define ZEXTERN extern</div><div class='add'>+#endif</div><div class='add'>+#ifndef ZEXPORT</div><div class='add'>+#  define ZEXPORT</div><div class='add'>+#endif</div><div class='add'>+#ifndef ZEXPORTVA</div><div class='add'>+#  define ZEXPORTVA</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef FAR</div><div class='add'>+#  define FAR</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if !defined(__MACTYPES__)</div><div class='add'>+typedef unsigned char  Byte;  /* 8 bits */</div><div class='add'>+#endif</div><div class='add'>+typedef unsigned int   uInt;  /* 16 bits or more */</div><div class='add'>+typedef unsigned long  uLong; /* 32 bits or more */</div><div class='add'>+</div><div class='add'>+#ifdef SMALL_MEDIUM</div><div class='add'>+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */</div><div class='add'>+#  define Bytef Byte FAR</div><div class='add'>+#else</div><div class='add'>+   typedef Byte  FAR Bytef;</div><div class='add'>+#endif</div><div class='add'>+typedef char  FAR charf;</div><div class='add'>+typedef int   FAR intf;</div><div class='add'>+typedef uInt  FAR uIntf;</div><div class='add'>+typedef uLong FAR uLongf;</div><div class='add'>+</div><div class='add'>+#ifdef STDC</div><div class='add'>+   typedef void const *voidpc;</div><div class='add'>+   typedef void FAR   *voidpf;</div><div class='add'>+   typedef void       *voidp;</div><div class='add'>+#else</div><div class='add'>+   typedef Byte const *voidpc;</div><div class='add'>+   typedef Byte FAR   *voidpf;</div><div class='add'>+   typedef Byte       *voidp;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */</div><div class='add'>+#  define Z_HAVE_UNISTD_H</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef STDC</div><div class='add'>+#  include &lt;sys/types.h&gt;    /* for off_t */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and</div><div class='add'>+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even</div><div class='add'>+ * though the former does not conform to the LFS document), but considering</div><div class='add'>+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as</div><div class='add'>+ * equivalently requesting no 64-bit operations</div><div class='add'>+ */</div><div class='add'>+#if -_LARGEFILE64_SOURCE - -1 == 1</div><div class='add'>+#  undef _LARGEFILE64_SOURCE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)</div><div class='add'>+#  include &lt;unistd.h&gt;       /* for SEEK_* and off_t */</div><div class='add'>+#  ifdef VMS</div><div class='add'>+#    include &lt;unixio.h&gt;     /* for off_t */</div><div class='add'>+#  endif</div><div class='add'>+#  ifndef z_off_t</div><div class='add'>+#    define z_off_t off_t</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef SEEK_SET</div><div class='add'>+#  define SEEK_SET        0       /* Seek from beginning of file.  */</div><div class='add'>+#  define SEEK_CUR        1       /* Seek from current position.  */</div><div class='add'>+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef z_off_t</div><div class='add'>+#  define z_off_t long</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(_LARGEFILE64_SOURCE) &amp;&amp; _LFS64_LARGEFILE-0</div><div class='add'>+#  define z_off64_t off64_t</div><div class='add'>+#else</div><div class='add'>+#  define z_off64_t z_off_t</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(__OS400__)</div><div class='add'>+#  define NO_vsnprintf</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(__MVS__)</div><div class='add'>+#  define NO_vsnprintf</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* MVS linker does not support external names larger than 8 bytes */</div><div class='add'>+#if defined(__MVS__)</div><div class='add'>+  #pragma map(deflateInit_,"DEIN")</div><div class='add'>+  #pragma map(deflateInit2_,"DEIN2")</div><div class='add'>+  #pragma map(deflateEnd,"DEEND")</div><div class='add'>+  #pragma map(deflateBound,"DEBND")</div><div class='add'>+  #pragma map(inflateInit_,"ININ")</div><div class='add'>+  #pragma map(inflateInit2_,"ININ2")</div><div class='add'>+  #pragma map(inflateEnd,"INEND")</div><div class='add'>+  #pragma map(inflateSync,"INSY")</div><div class='add'>+  #pragma map(inflateSetDictionary,"INSEDI")</div><div class='add'>+  #pragma map(compressBound,"CMBND")</div><div class='add'>+  #pragma map(inflate_table,"INTABL")</div><div class='add'>+  #pragma map(inflate_fast,"INFA")</div><div class='add'>+  #pragma map(inflate_copyright,"INCOPY")</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* ZCONF_H */</div><div class='head'>diff --git a/src/3rdparty/zlib/zconf.in.h b/src/3rdparty/zlib/zconf.in.h<br/>deleted file mode 100644<br/>index 03a9431..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/zconf.in.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/zconf.in.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,332 +0,0 @@</div><div class='del'>-/* zconf.h -- configuration of the zlib compression library</div><div class='del'>- * Copyright (C) 1995-2005 Jean-loup Gailly.</div><div class='del'>- * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* @(#) $Id$ */</div><div class='del'>-</div><div class='del'>-#ifndef ZCONF_H</div><div class='del'>-#define ZCONF_H</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If you *really* need a unique prefix for all types and library functions,</div><div class='del'>- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.</div><div class='del'>- */</div><div class='del'>-#ifdef Z_PREFIX</div><div class='del'>-#  define deflateInit_          z_deflateInit_</div><div class='del'>-#  define deflate               z_deflate</div><div class='del'>-#  define deflateEnd            z_deflateEnd</div><div class='del'>-#  define inflateInit_          z_inflateInit_</div><div class='del'>-#  define inflate               z_inflate</div><div class='del'>-#  define inflateEnd            z_inflateEnd</div><div class='del'>-#  define deflateInit2_         z_deflateInit2_</div><div class='del'>-#  define deflateSetDictionary  z_deflateSetDictionary</div><div class='del'>-#  define deflateCopy           z_deflateCopy</div><div class='del'>-#  define deflateReset          z_deflateReset</div><div class='del'>-#  define deflateParams         z_deflateParams</div><div class='del'>-#  define deflateBound          z_deflateBound</div><div class='del'>-#  define deflatePrime          z_deflatePrime</div><div class='del'>-#  define inflateInit2_         z_inflateInit2_</div><div class='del'>-#  define inflateSetDictionary  z_inflateSetDictionary</div><div class='del'>-#  define inflateSync           z_inflateSync</div><div class='del'>-#  define inflateSyncPoint      z_inflateSyncPoint</div><div class='del'>-#  define inflateCopy           z_inflateCopy</div><div class='del'>-#  define inflateReset          z_inflateReset</div><div class='del'>-#  define inflateBack           z_inflateBack</div><div class='del'>-#  define inflateBackEnd        z_inflateBackEnd</div><div class='del'>-#  define compress              z_compress</div><div class='del'>-#  define compress2             z_compress2</div><div class='del'>-#  define compressBound         z_compressBound</div><div class='del'>-#  define uncompress            z_uncompress</div><div class='del'>-#  define adler32               z_adler32</div><div class='del'>-#  define crc32                 z_crc32</div><div class='del'>-#  define get_crc_table         z_get_crc_table</div><div class='del'>-#  define zError                z_zError</div><div class='del'>-</div><div class='del'>-#  define alloc_func            z_alloc_func</div><div class='del'>-#  define free_func             z_free_func</div><div class='del'>-#  define in_func               z_in_func</div><div class='del'>-#  define out_func              z_out_func</div><div class='del'>-#  define Byte                  z_Byte</div><div class='del'>-#  define uInt                  z_uInt</div><div class='del'>-#  define uLong                 z_uLong</div><div class='del'>-#  define Bytef                 z_Bytef</div><div class='del'>-#  define charf                 z_charf</div><div class='del'>-#  define intf                  z_intf</div><div class='del'>-#  define uIntf                 z_uIntf</div><div class='del'>-#  define uLongf                z_uLongf</div><div class='del'>-#  define voidpf                z_voidpf</div><div class='del'>-#  define voidp                 z_voidp</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(__MSDOS__) &amp;&amp; !defined(MSDOS)</div><div class='del'>-#  define MSDOS</div><div class='del'>-#endif</div><div class='del'>-#if (defined(OS_2) || defined(__OS2__)) &amp;&amp; !defined(OS2)</div><div class='del'>-#  define OS2</div><div class='del'>-#endif</div><div class='del'>-#if defined(_WINDOWS) &amp;&amp; !defined(WINDOWS)</div><div class='del'>-#  define WINDOWS</div><div class='del'>-#endif</div><div class='del'>-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)</div><div class='del'>-#  ifndef WIN32</div><div class='del'>-#    define WIN32</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) &amp;&amp; !defined(WIN32)</div><div class='del'>-#  if !defined(__GNUC__) &amp;&amp; !defined(__FLAT__) &amp;&amp; !defined(__386__)</div><div class='del'>-#    ifndef SYS16BIT</div><div class='del'>-#      define SYS16BIT</div><div class='del'>-#    endif</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more</div><div class='del'>- * than 64k bytes at a time (needed on systems with 16-bit int).</div><div class='del'>- */</div><div class='del'>-#ifdef SYS16BIT</div><div class='del'>-#  define MAXSEG_64K</div><div class='del'>-#endif</div><div class='del'>-#ifdef MSDOS</div><div class='del'>-#  define UNALIGNED_OK</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __STDC_VERSION__</div><div class='del'>-#  ifndef STDC</div><div class='del'>-#    define STDC</div><div class='del'>-#  endif</div><div class='del'>-#  if __STDC_VERSION__ &gt;= 199901L</div><div class='del'>-#    ifndef STDC99</div><div class='del'>-#      define STDC99</div><div class='del'>-#    endif</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-#if !defined(STDC) &amp;&amp; (defined(__STDC__) || defined(__cplusplus))</div><div class='del'>-#  define STDC</div><div class='del'>-#endif</div><div class='del'>-#if !defined(STDC) &amp;&amp; (defined(__GNUC__) || defined(__BORLANDC__))</div><div class='del'>-#  define STDC</div><div class='del'>-#endif</div><div class='del'>-#if !defined(STDC) &amp;&amp; (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))</div><div class='del'>-#  define STDC</div><div class='del'>-#endif</div><div class='del'>-#if !defined(STDC) &amp;&amp; (defined(OS2) || defined(__HOS_AIX__))</div><div class='del'>-#  define STDC</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(__OS400__) &amp;&amp; !defined(STDC)    /* iSeries (formerly AS/400). */</div><div class='del'>-#  define STDC</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef STDC</div><div class='del'>-#  ifndef const /* cannot use !defined(STDC) &amp;&amp; !defined(const) on Mac */</div><div class='del'>-#    define const       /* note: need a more gentle solution here */</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Some Mac compilers merge all .h files incorrectly: */</div><div class='del'>-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)</div><div class='del'>-#  define NO_DUMMY_DECL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Maximum value for memLevel in deflateInit2 */</div><div class='del'>-#ifndef MAX_MEM_LEVEL</div><div class='del'>-#  ifdef MAXSEG_64K</div><div class='del'>-#    define MAX_MEM_LEVEL 8</div><div class='del'>-#  else</div><div class='del'>-#    define MAX_MEM_LEVEL 9</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Maximum value for windowBits in deflateInit2 and inflateInit2.</div><div class='del'>- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files</div><div class='del'>- * created by gzip. (Files created by minigzip can still be extracted by</div><div class='del'>- * gzip.)</div><div class='del'>- */</div><div class='del'>-#ifndef MAX_WBITS</div><div class='del'>-#  define MAX_WBITS   15 /* 32K LZ77 window */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* The memory requirements for deflate are (in bytes):</div><div class='del'>-            (1 &lt;&lt; (windowBits+2)) +  (1 &lt;&lt; (memLevel+9))</div><div class='del'>- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)</div><div class='del'>- plus a few kilobytes for small objects. For example, if you want to reduce</div><div class='del'>- the default memory requirements from 256K to 128K, compile with</div><div class='del'>-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"</div><div class='del'>- Of course this will generally degrade compression (there's no free lunch).</div><div class='del'>-</div><div class='del'>-   The memory requirements for inflate are (in bytes) 1 &lt;&lt; windowBits</div><div class='del'>- that is, 32K for windowBits=15 (default value) plus a few kilobytes</div><div class='del'>- for small objects.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-                        /* Type declarations */</div><div class='del'>-</div><div class='del'>-#ifndef OF /* function prototypes */</div><div class='del'>-#  ifdef STDC</div><div class='del'>-#    define OF(args)  args</div><div class='del'>-#  else</div><div class='del'>-#    define OF(args)  ()</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* The following definitions for FAR are needed only for MSDOS mixed</div><div class='del'>- * model programming (small or medium model with some far allocations).</div><div class='del'>- * This was tested only with MSC; for other MSDOS compilers you may have</div><div class='del'>- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,</div><div class='del'>- * just define FAR to be empty.</div><div class='del'>- */</div><div class='del'>-#ifdef SYS16BIT</div><div class='del'>-#  if defined(M_I86SM) || defined(M_I86MM)</div><div class='del'>-     /* MSC small or medium model */</div><div class='del'>-#    define SMALL_MEDIUM</div><div class='del'>-#    ifdef _MSC_VER</div><div class='del'>-#      define FAR _far</div><div class='del'>-#    else</div><div class='del'>-#      define FAR far</div><div class='del'>-#    endif</div><div class='del'>-#  endif</div><div class='del'>-#  if (defined(__SMALL__) || defined(__MEDIUM__))</div><div class='del'>-     /* Turbo C small or medium model */</div><div class='del'>-#    define SMALL_MEDIUM</div><div class='del'>-#    ifdef __BORLANDC__</div><div class='del'>-#      define FAR _far</div><div class='del'>-#    else</div><div class='del'>-#      define FAR far</div><div class='del'>-#    endif</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(WINDOWS) || defined(WIN32)</div><div class='del'>-   /* If building or using zlib as a DLL, define ZLIB_DLL.</div><div class='del'>-    * This is not mandatory, but it offers a little performance increase.</div><div class='del'>-    */</div><div class='del'>-#  ifdef ZLIB_DLL</div><div class='del'>-#    if defined(WIN32) &amp;&amp; (!defined(__BORLANDC__) || (__BORLANDC__ &gt;= 0x500))</div><div class='del'>-#      ifdef ZLIB_INTERNAL</div><div class='del'>-#        define ZEXTERN extern __declspec(dllexport)</div><div class='del'>-#      else</div><div class='del'>-#        define ZEXTERN extern __declspec(dllimport)</div><div class='del'>-#      endif</div><div class='del'>-#    endif</div><div class='del'>-#  endif  /* ZLIB_DLL */</div><div class='del'>-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,</div><div class='del'>-    * define ZLIB_WINAPI.</div><div class='del'>-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.</div><div class='del'>-    */</div><div class='del'>-#  ifdef ZLIB_WINAPI</div><div class='del'>-#    ifdef FAR</div><div class='del'>-#      undef FAR</div><div class='del'>-#    endif</div><div class='del'>-#    include &lt;windows.h&gt;</div><div class='del'>-     /* No need for _export, use ZLIB.DEF instead. */</div><div class='del'>-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */</div><div class='del'>-#    define ZEXPORT WINAPI</div><div class='del'>-#    ifdef WIN32</div><div class='del'>-#      define ZEXPORTVA WINAPIV</div><div class='del'>-#    else</div><div class='del'>-#      define ZEXPORTVA FAR CDECL</div><div class='del'>-#    endif</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined (__BEOS__)</div><div class='del'>-#  ifdef ZLIB_DLL</div><div class='del'>-#    ifdef ZLIB_INTERNAL</div><div class='del'>-#      define ZEXPORT   __declspec(dllexport)</div><div class='del'>-#      define ZEXPORTVA __declspec(dllexport)</div><div class='del'>-#    else</div><div class='del'>-#      define ZEXPORT   __declspec(dllimport)</div><div class='del'>-#      define ZEXPORTVA __declspec(dllimport)</div><div class='del'>-#    endif</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef ZEXTERN</div><div class='del'>-#  define ZEXTERN extern</div><div class='del'>-#endif</div><div class='del'>-#ifndef ZEXPORT</div><div class='del'>-#  define ZEXPORT</div><div class='del'>-#endif</div><div class='del'>-#ifndef ZEXPORTVA</div><div class='del'>-#  define ZEXPORTVA</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef FAR</div><div class='del'>-#  define FAR</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if !defined(__MACTYPES__)</div><div class='del'>-typedef unsigned char  Byte;  /* 8 bits */</div><div class='del'>-#endif</div><div class='del'>-typedef unsigned int   uInt;  /* 16 bits or more */</div><div class='del'>-typedef unsigned long  uLong; /* 32 bits or more */</div><div class='del'>-</div><div class='del'>-#ifdef SMALL_MEDIUM</div><div class='del'>-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */</div><div class='del'>-#  define Bytef Byte FAR</div><div class='del'>-#else</div><div class='del'>-   typedef Byte  FAR Bytef;</div><div class='del'>-#endif</div><div class='del'>-typedef char  FAR charf;</div><div class='del'>-typedef int   FAR intf;</div><div class='del'>-typedef uInt  FAR uIntf;</div><div class='del'>-typedef uLong FAR uLongf;</div><div class='del'>-</div><div class='del'>-#ifdef STDC</div><div class='del'>-   typedef void const *voidpc;</div><div class='del'>-   typedef void FAR   *voidpf;</div><div class='del'>-   typedef void       *voidp;</div><div class='del'>-#else</div><div class='del'>-   typedef Byte const *voidpc;</div><div class='del'>-   typedef Byte FAR   *voidpf;</div><div class='del'>-   typedef Byte       *voidp;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */</div><div class='del'>-#  include &lt;sys/types.h&gt; /* for off_t */</div><div class='del'>-#  include &lt;unistd.h&gt;    /* for SEEK_* and off_t */</div><div class='del'>-#  ifdef VMS</div><div class='del'>-#    include &lt;unixio.h&gt;   /* for off_t */</div><div class='del'>-#  endif</div><div class='del'>-#  define z_off_t off_t</div><div class='del'>-#endif</div><div class='del'>-#ifndef SEEK_SET</div><div class='del'>-#  define SEEK_SET        0       /* Seek from beginning of file.  */</div><div class='del'>-#  define SEEK_CUR        1       /* Seek from current position.  */</div><div class='del'>-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */</div><div class='del'>-#endif</div><div class='del'>-#ifndef z_off_t</div><div class='del'>-#  define z_off_t long</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(__OS400__)</div><div class='del'>-#  define NO_vsnprintf</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(__MVS__)</div><div class='del'>-#  define NO_vsnprintf</div><div class='del'>-#  ifdef FAR</div><div class='del'>-#    undef FAR</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* MVS linker does not support external names larger than 8 bytes */</div><div class='del'>-#if defined(__MVS__)</div><div class='del'>-#   pragma map(deflateInit_,"DEIN")</div><div class='del'>-#   pragma map(deflateInit2_,"DEIN2")</div><div class='del'>-#   pragma map(deflateEnd,"DEEND")</div><div class='del'>-#   pragma map(deflateBound,"DEBND")</div><div class='del'>-#   pragma map(inflateInit_,"ININ")</div><div class='del'>-#   pragma map(inflateInit2_,"ININ2")</div><div class='del'>-#   pragma map(inflateEnd,"INEND")</div><div class='del'>-#   pragma map(inflateSync,"INSY")</div><div class='del'>-#   pragma map(inflateSetDictionary,"INSEDI")</div><div class='del'>-#   pragma map(compressBound,"CMBND")</div><div class='del'>-#   pragma map(inflate_table,"INTABL")</div><div class='del'>-#   pragma map(inflate_fast,"INFA")</div><div class='del'>-#   pragma map(inflate_copyright,"INCOPY")</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* ZCONF_H */</div><div class='head'>diff --git a/src/3rdparty/zlib/zlib.3 b/src/3rdparty/zlib/zlib.3<br/>index 90b8162..27adc4c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/zlib.3?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/zlib.3</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/zlib.3?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/zlib.3</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-.TH ZLIB 3 "18 July 2005"</div><div class='add'>+.TH ZLIB 3 "19 Apr 2010"</div><div class='ctx'> .SH NAME</div><div class='ctx'> zlib \- compression/decompression library</div><div class='ctx'> .SH SYNOPSIS</div><div class='hunk'>@@ -9,15 +9,15 @@ for full description]</div><div class='ctx'> The</div><div class='ctx'> .I zlib</div><div class='ctx'> library is a general purpose data compression library.</div><div class='del'>-The code is thread safe.</div><div class='add'>+The code is thread safe, assuming that the standard library functions</div><div class='add'>+used are thread safe, such as memory allocation routines.</div><div class='ctx'> It provides in-memory compression and decompression functions,</div><div class='ctx'> including integrity checks of the uncompressed data.</div><div class='ctx'> This version of the library supports only one compression method (deflation)</div><div class='del'>-but other algorithms will be added later</div><div class='del'>-and will have the same stream interface.</div><div class='add'>+but other algorithms may be added later</div><div class='add'>+with the same stream interface.</div><div class='ctx'> .LP</div><div class='ctx'> Compression can be done in a single step if the buffers are large enough</div><div class='del'>-(for example if an input file is mmap'ed),</div><div class='ctx'> or can be done by repeated calls of the compression function.</div><div class='ctx'> In the latter case,</div><div class='ctx'> the application must provide more input and/or consume the output</div><div class='hunk'>@@ -30,7 +30,7 @@ with an interface similar to that of stdio.</div><div class='ctx'> .LP</div><div class='ctx'> The library does not install any signal handler.</div><div class='ctx'> The decoder checks the consistency of the compressed data,</div><div class='del'>-so the library should never crash even in case of corrupted input.</div><div class='add'>+so the library should never crash even in the case of corrupted input.</div><div class='ctx'> .LP</div><div class='ctx'> All functions of the compression library are documented in the file</div><div class='ctx'> .IR zlib.h .</div><div class='hunk'>@@ -38,18 +38,19 @@ The distribution source includes examples of use of the library</div><div class='ctx'> in the files</div><div class='ctx'> .I example.c</div><div class='ctx'> and</div><div class='del'>-.IR minigzip.c .</div><div class='add'>+.IR minigzip.c,</div><div class='add'>+as well as other examples in the</div><div class='add'>+.IR examples/</div><div class='add'>+directory.</div><div class='ctx'> .LP</div><div class='ctx'> Changes to this version are documented in the file</div><div class='ctx'> .I ChangeLog</div><div class='del'>-that accompanies the source,</div><div class='del'>-and are concerned primarily with bug fixes and portability enhancements.</div><div class='add'>+that accompanies the source.</div><div class='ctx'> .LP</div><div class='del'>-A Java implementation of</div><div class='ctx'> .I zlib</div><div class='del'>-is available in the Java Development Kit 1.1:</div><div class='add'>+is available in Java using the java.util.zip package:</div><div class='ctx'> .IP</div><div class='del'>-http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html</div><div class='add'>+http://java.sun.com/developer/technicalArticles/Programming/compression/</div><div class='ctx'> .LP</div><div class='ctx'> A Perl interface to</div><div class='ctx'> .IR zlib ,</div><div class='hunk'>@@ -57,7 +58,7 @@ written by Paul Marquess (pmqs@cpan.org),</div><div class='ctx'> is available at CPAN (Comprehensive Perl Archive Network) sites,</div><div class='ctx'> including:</div><div class='ctx'> .IP</div><div class='del'>-http://www.cpan.org/modules/by-module/Compress/</div><div class='add'>+http://search.cpan.org/~pmqs/IO-Compress-Zlib/</div><div class='ctx'> .LP</div><div class='ctx'> A Python interface to</div><div class='ctx'> .IR zlib ,</div><div class='hunk'>@@ -66,14 +67,11 @@ is available in Python 1.5 and later versions:</div><div class='ctx'> .IP</div><div class='ctx'> http://www.python.org/doc/lib/module-zlib.html</div><div class='ctx'> .LP</div><div class='del'>-A</div><div class='ctx'> .I zlib</div><div class='del'>-binding for</div><div class='del'>-.IR tcl (1),</div><div class='del'>-written by Andreas Kupries (a.kupries@westend.com),</div><div class='del'>-is availlable at:</div><div class='add'>+is built into</div><div class='add'>+.IR tcl:</div><div class='ctx'> .IP</div><div class='del'>-http://www.westend.com/~kupries/doc/trf/man/man.html</div><div class='add'>+http://wiki.tcl.tk/4610</div><div class='ctx'> .LP</div><div class='ctx'> An experimental package to read and write files in .zip format,</div><div class='ctx'> written on top of</div><div class='hunk'>@@ -81,40 +79,34 @@ written on top of</div><div class='ctx'> by Gilles Vollant (info@winimage.com),</div><div class='ctx'> is available at:</div><div class='ctx'> .IP</div><div class='del'>-http://www.winimage.com/zLibDll/unzip.html</div><div class='add'>+http://www.winimage.com/zLibDll/minizip.html</div><div class='ctx'> and also in the</div><div class='ctx'> .I contrib/minizip</div><div class='ctx'> directory of the main</div><div class='ctx'> .I zlib</div><div class='del'>-web site.</div><div class='add'>+source distribution.</div><div class='ctx'> .SH "SEE ALSO"</div><div class='ctx'> The</div><div class='ctx'> .I zlib</div><div class='del'>-web site can be found at either of these locations:</div><div class='add'>+web site can be found at:</div><div class='ctx'> .IP</div><div class='del'>-http://www.zlib.org</div><div class='del'>-.br</div><div class='del'>-http://www.gzip.org/zlib/</div><div class='add'>+http://zlib.net/</div><div class='ctx'> .LP</div><div class='ctx'> The data format used by the zlib library is described by RFC</div><div class='ctx'> (Request for Comments) 1950 to 1952 in the files:</div><div class='ctx'> .IP</div><div class='del'>-http://www.ietf.org/rfc/rfc1950.txt (concerning zlib format)</div><div class='add'>+http://www.ietf.org/rfc/rfc1950.txt (for the zlib header and trailer format)</div><div class='ctx'> .br</div><div class='del'>-http://www.ietf.org/rfc/rfc1951.txt (concerning deflate format)</div><div class='add'>+http://www.ietf.org/rfc/rfc1951.txt (for the deflate compressed data format)</div><div class='ctx'> .br</div><div class='del'>-http://www.ietf.org/rfc/rfc1952.txt (concerning gzip format)</div><div class='del'>-.LP</div><div class='del'>-These documents are also available in other formats from:</div><div class='del'>-.IP</div><div class='del'>-ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html</div><div class='add'>+http://www.ietf.org/rfc/rfc1952.txt (for the gzip header and trailer format)</div><div class='ctx'> .LP</div><div class='del'>-Mark Nelson (markn@ieee.org) wrote an article about</div><div class='add'>+Mark Nelson wrote an article about</div><div class='ctx'> .I zlib</div><div class='ctx'> for the Jan. 1997 issue of  Dr. Dobb's Journal;</div><div class='ctx'> a copy of the article is available at:</div><div class='ctx'> .IP</div><div class='del'>-http://dogma.net/markn/articles/zlibtool/zlibtool.htm</div><div class='add'>+http://marknelson.us/1997/01/01/zlib-engine/</div><div class='ctx'> .SH "REPORTING PROBLEMS"</div><div class='ctx'> Before reporting a problem,</div><div class='ctx'> please check the</div><div class='hunk'>@@ -127,14 +119,14 @@ Please read the</div><div class='ctx'> .I zlib</div><div class='ctx'> FAQ at:</div><div class='ctx'> .IP</div><div class='del'>-http://www.gzip.org/zlib/zlib_faq.html</div><div class='add'>+http://zlib.net/zlib_faq.html</div><div class='ctx'> .LP</div><div class='ctx'> before asking for help.</div><div class='ctx'> Send questions and/or comments to zlib@gzip.org,</div><div class='ctx'> or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).</div><div class='ctx'> .SH AUTHORS</div><div class='del'>-Version 1.2.3</div><div class='del'>-Copyright (C) 1995-2005 Jean-loup Gailly (jloup@gzip.org)</div><div class='add'>+Version 1.2.5</div><div class='add'>+Copyright (C) 1995-2010 Jean-loup Gailly (jloup@gzip.org)</div><div class='ctx'> and Mark Adler (madler@alumni.caltech.edu).</div><div class='ctx'> .LP</div><div class='ctx'> This software is provided "as-is,"</div><div class='head'>diff --git a/src/3rdparty/zlib/zlib.3.pdf b/src/3rdparty/zlib/zlib.3.pdf<br/>new file mode 100644<br/>index 0000000..9f8a2c3<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/zlib.3.pdf?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/zlib.3.pdf</a></div>Binary files differ<div class='head'>diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h<br/>index 9e5b467..4069724 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/zlib.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/zlib.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/zlib.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/zlib.h</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> /* zlib.h -- interface of the 'zlib' general purpose compression library</div><div class='del'>-  version 1.2.3, July 18th, 2005</div><div class='add'>+  version 1.2.5, April 19th, 2010</div><div class='ctx'> </div><div class='del'>-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler</div><div class='add'>+  Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler</div><div class='ctx'> </div><div class='ctx'>   This software is provided 'as-is', without any express or implied</div><div class='ctx'>   warranty.  In no event will the authors be held liable for any damages</div><div class='hunk'>@@ -32,57 +32,58 @@</div><div class='ctx'> #define ZLIB_H</div><div class='ctx'> </div><div class='ctx'> #include "zconf.h"</div><div class='add'>+</div><div class='ctx'> #include "qconfig.h"</div><div class='add'>+#if defined(QT_VISIBILITY_AVAILABLE)</div><div class='add'>+# undef ZEXTERN</div><div class='add'>+# define ZEXTERN __attribute__((visibility("default")))</div><div class='add'>+#elif defined(QT_MAKEDLL)</div><div class='add'>+# undef ZEXTERN</div><div class='add'>+# define ZEXTERN __declspec(dllexport)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef __cplusplus</div><div class='ctx'> extern "C" {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define ZLIB_VERSION "1.2.3"</div><div class='del'>-#define ZLIB_VERNUM 0x1230</div><div class='del'>-</div><div class='del'>-#if defined(QT_VISIBILITY_AVAILABLE)</div><div class='del'>-# define Q_ZEXPORT __attribute__((visibility("default")))</div><div class='del'>-#else</div><div class='del'>-# ifdef QT_MAKEDLL</div><div class='del'>-# define Q_ZEXPORT __declspec(dllexport)</div><div class='del'>-# else</div><div class='del'>-# define Q_ZEXPORT ZEXPORT</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='add'>+#define ZLIB_VERSION "1.2.5"</div><div class='add'>+#define ZLIB_VERNUM 0x1250</div><div class='add'>+#define ZLIB_VER_MAJOR 1</div><div class='add'>+#define ZLIB_VER_MINOR 2</div><div class='add'>+#define ZLIB_VER_REVISION 5</div><div class='add'>+#define ZLIB_VER_SUBREVISION 0</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>-     The 'zlib' compression library provides in-memory compression and</div><div class='del'>-  decompression functions, including integrity checks of the uncompressed</div><div class='del'>-  data.  This version of the library supports only one compression method</div><div class='del'>-  (deflation) but other algorithms will be added later and will have the same</div><div class='del'>-  stream interface.</div><div class='del'>-</div><div class='del'>-     Compression can be done in a single step if the buffers are large</div><div class='del'>-  enough (for example if an input file is mmap'ed), or can be done by</div><div class='del'>-  repeated calls of the compression function.  In the latter case, the</div><div class='del'>-  application must provide more input and/or consume the output</div><div class='add'>+    The 'zlib' compression library provides in-memory compression and</div><div class='add'>+  decompression functions, including integrity checks of the uncompressed data.</div><div class='add'>+  This version of the library supports only one compression method (deflation)</div><div class='add'>+  but other algorithms will be added later and will have the same stream</div><div class='add'>+  interface.</div><div class='add'>+</div><div class='add'>+    Compression can be done in a single step if the buffers are large enough,</div><div class='add'>+  or can be done by repeated calls of the compression function.  In the latter</div><div class='add'>+  case, the application must provide more input and/or consume the output</div><div class='ctx'>   (providing more output space) before each call.</div><div class='ctx'> </div><div class='del'>-     The compressed data format used by default by the in-memory functions is</div><div class='add'>+    The compressed data format used by default by the in-memory functions is</div><div class='ctx'>   the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped</div><div class='ctx'>   around a deflate stream, which is itself documented in RFC 1951.</div><div class='ctx'> </div><div class='del'>-     The library also supports reading and writing files in gzip (.gz) format</div><div class='add'>+    The library also supports reading and writing files in gzip (.gz) format</div><div class='ctx'>   with an interface similar to that of stdio using the functions that start</div><div class='ctx'>   with "gz".  The gzip format is different from the zlib format.  gzip is a</div><div class='ctx'>   gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.</div><div class='ctx'> </div><div class='del'>-     This library can optionally read and write gzip streams in memory as well.</div><div class='add'>+    This library can optionally read and write gzip streams in memory as well.</div><div class='ctx'> </div><div class='del'>-     The zlib format was designed to be compact and fast for use in memory</div><div class='add'>+    The zlib format was designed to be compact and fast for use in memory</div><div class='ctx'>   and on communications channels.  The gzip format was designed for single-</div><div class='ctx'>   file compression on file systems, has a larger header than zlib to maintain</div><div class='ctx'>   directory information, and uses a different, slower check method than zlib.</div><div class='ctx'> </div><div class='del'>-     The library does not install any signal handler. The decoder checks</div><div class='del'>-  the consistency of the compressed data, so the library should never</div><div class='del'>-  crash even in case of corrupted input.</div><div class='add'>+    The library does not install any signal handler.  The decoder checks</div><div class='add'>+  the consistency of the compressed data, so the library should never crash</div><div class='add'>+  even in case of corrupted input.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));</div><div class='hunk'>@@ -137,45 +138,45 @@ typedef struct gz_header_s {</div><div class='ctx'> typedef gz_header FAR *gz_headerp;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>-   The application must update next_in and avail_in when avail_in has</div><div class='del'>-   dropped to zero. It must update next_out and avail_out when avail_out</div><div class='del'>-   has dropped to zero. The application must initialize zalloc, zfree and</div><div class='del'>-   opaque before calling the init function. All other fields are set by the</div><div class='del'>-   compression library and must not be updated by the application.</div><div class='del'>-</div><div class='del'>-   The opaque value provided by the application will be passed as the first</div><div class='del'>-   parameter for calls of zalloc and zfree. This can be useful for custom</div><div class='del'>-   memory management. The compression library attaches no meaning to the</div><div class='add'>+     The application must update next_in and avail_in when avail_in has dropped</div><div class='add'>+   to zero.  It must update next_out and avail_out when avail_out has dropped</div><div class='add'>+   to zero.  The application must initialize zalloc, zfree and opaque before</div><div class='add'>+   calling the init function.  All other fields are set by the compression</div><div class='add'>+   library and must not be updated by the application.</div><div class='add'>+</div><div class='add'>+     The opaque value provided by the application will be passed as the first</div><div class='add'>+   parameter for calls of zalloc and zfree.  This can be useful for custom</div><div class='add'>+   memory management.  The compression library attaches no meaning to the</div><div class='ctx'>    opaque value.</div><div class='ctx'> </div><div class='del'>-   zalloc must return Z_NULL if there is not enough memory for the object.</div><div class='add'>+     zalloc must return Z_NULL if there is not enough memory for the object.</div><div class='ctx'>    If zlib is used in a multi-threaded application, zalloc and zfree must be</div><div class='ctx'>    thread safe.</div><div class='ctx'> </div><div class='del'>-   On 16-bit systems, the functions zalloc and zfree must be able to allocate</div><div class='del'>-   exactly 65536 bytes, but will not be required to allocate more than this</div><div class='del'>-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,</div><div class='del'>-   pointers returned by zalloc for objects of exactly 65536 bytes *must*</div><div class='del'>-   have their offset normalized to zero. The default allocation function</div><div class='del'>-   provided by this library ensures this (see zutil.c). To reduce memory</div><div class='del'>-   requirements and avoid any allocation of 64K objects, at the expense of</div><div class='del'>-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).</div><div class='del'>-</div><div class='del'>-   The fields total_in and total_out can be used for statistics or</div><div class='del'>-   progress reports. After compression, total_in holds the total size of</div><div class='del'>-   the uncompressed data and may be saved for use in the decompressor</div><div class='del'>-   (particularly if the decompressor wants to decompress everything in</div><div class='del'>-   a single step).</div><div class='add'>+     On 16-bit systems, the functions zalloc and zfree must be able to allocate</div><div class='add'>+   exactly 65536 bytes, but will not be required to allocate more than this if</div><div class='add'>+   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers</div><div class='add'>+   returned by zalloc for objects of exactly 65536 bytes *must* have their</div><div class='add'>+   offset normalized to zero.  The default allocation function provided by this</div><div class='add'>+   library ensures this (see zutil.c).  To reduce memory requirements and avoid</div><div class='add'>+   any allocation of 64K objects, at the expense of compression ratio, compile</div><div class='add'>+   the library with -DMAX_WBITS=14 (see zconf.h).</div><div class='add'>+</div><div class='add'>+     The fields total_in and total_out can be used for statistics or progress</div><div class='add'>+   reports.  After compression, total_in holds the total size of the</div><div class='add'>+   uncompressed data and may be saved for use in the decompressor (particularly</div><div class='add'>+   if the decompressor wants to decompress everything in a single step).</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'>                         /* constants */</div><div class='ctx'> </div><div class='ctx'> #define Z_NO_FLUSH      0</div><div class='del'>-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */</div><div class='add'>+#define Z_PARTIAL_FLUSH 1</div><div class='ctx'> #define Z_SYNC_FLUSH    2</div><div class='ctx'> #define Z_FULL_FLUSH    3</div><div class='ctx'> #define Z_FINISH        4</div><div class='ctx'> #define Z_BLOCK         5</div><div class='add'>+#define Z_TREES         6</div><div class='ctx'> /* Allowed flush values; see deflate() and inflate() below for details */</div><div class='ctx'> </div><div class='ctx'> #define Z_OK            0</div><div class='hunk'>@@ -187,8 +188,8 @@ typedef gz_header FAR *gz_headerp;</div><div class='ctx'> #define Z_MEM_ERROR    (-4)</div><div class='ctx'> #define Z_BUF_ERROR    (-5)</div><div class='ctx'> #define Z_VERSION_ERROR (-6)</div><div class='del'>-/* Return codes for the compression/decompression functions. Negative</div><div class='del'>- * values are errors, positive values are used for special but normal events.</div><div class='add'>+/* Return codes for the compression/decompression functions. Negative values</div><div class='add'>+ * are errors, positive values are used for special but normal events.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define Z_NO_COMPRESSION         0</div><div class='hunk'>@@ -218,134 +219,155 @@ typedef gz_header FAR *gz_headerp;</div><div class='ctx'> #define zlib_version zlibVersion()</div><div class='ctx'> /* for compatibility with versions &lt; 1.0.2 */</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'>                         /* basic functions */</div><div class='ctx'> </div><div class='del'>-ZEXTERN Q_ZEXPORT const char * zlibVersion OF((void));</div><div class='add'>+ZEXTERN const char * ZEXPORT zlibVersion OF((void));</div><div class='ctx'> /* The application can compare zlibVersion and ZLIB_VERSION for consistency.</div><div class='del'>-   If the first character differs, the library code actually used is</div><div class='del'>-   not compatible with the zlib.h header file used by the application.</div><div class='del'>-   This check is automatically made by deflateInit and inflateInit.</div><div class='add'>+   If the first character differs, the library code actually used is not</div><div class='add'>+   compatible with the zlib.h header file used by the application.  This check</div><div class='add'>+   is automatically made by deflateInit and inflateInit.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'> ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));</div><div class='ctx'> </div><div class='del'>-     Initializes the internal stream state for compression. The fields</div><div class='del'>-   zalloc, zfree and opaque must be initialized before by the caller.</div><div class='del'>-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to</div><div class='del'>-   use default allocation functions.</div><div class='add'>+     Initializes the internal stream state for compression.  The fields</div><div class='add'>+   zalloc, zfree and opaque must be initialized before by the caller.  If</div><div class='add'>+   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default</div><div class='add'>+   allocation functions.</div><div class='ctx'> </div><div class='ctx'>      The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:</div><div class='del'>-   1 gives best speed, 9 gives best compression, 0 gives no compression at</div><div class='del'>-   all (the input data is simply copied a block at a time).</div><div class='del'>-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and</div><div class='del'>-   compression (currently equivalent to level 6).</div><div class='add'>+   1 gives best speed, 9 gives best compression, 0 gives no compression at all</div><div class='add'>+   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION</div><div class='add'>+   requests a default compromise between speed and compression (currently</div><div class='add'>+   equivalent to level 6).</div><div class='ctx'> </div><div class='del'>-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not</div><div class='del'>-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,</div><div class='add'>+     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough</div><div class='add'>+   memory, Z_STREAM_ERROR if level is not a valid compression level, or</div><div class='ctx'>    Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible</div><div class='del'>-   with the version assumed by the caller (ZLIB_VERSION).</div><div class='del'>-   msg is set to null if there is no error message.  deflateInit does not</div><div class='del'>-   perform any compression: this will be done by deflate().</div><div class='add'>+   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null</div><div class='add'>+   if there is no error message.  deflateInit does not perform any compression:</div><div class='add'>+   this will be done by deflate().</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT deflate OF((z_streamp strm, int flush));</div><div class='add'>+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));</div><div class='ctx'> /*</div><div class='ctx'>     deflate compresses as much data as possible, and stops when the input</div><div class='del'>-  buffer becomes empty or the output buffer becomes full. It may introduce some</div><div class='del'>-  output latency (reading input without producing any output) except when</div><div class='add'>+  buffer becomes empty or the output buffer becomes full.  It may introduce</div><div class='add'>+  some output latency (reading input without producing any output) except when</div><div class='ctx'>   forced to flush.</div><div class='ctx'> </div><div class='del'>-    The detailed semantics are as follows. deflate performs one or both of the</div><div class='add'>+    The detailed semantics are as follows.  deflate performs one or both of the</div><div class='ctx'>   following actions:</div><div class='ctx'> </div><div class='ctx'>   - Compress more input starting at next_in and update next_in and avail_in</div><div class='del'>-    accordingly. If not all input can be processed (because there is not</div><div class='add'>+    accordingly.  If not all input can be processed (because there is not</div><div class='ctx'>     enough room in the output buffer), next_in and avail_in are updated and</div><div class='ctx'>     processing will resume at this point for the next call of deflate().</div><div class='ctx'> </div><div class='ctx'>   - Provide more output starting at next_out and update next_out and avail_out</div><div class='del'>-    accordingly. This action is forced if the parameter flush is non zero.</div><div class='add'>+    accordingly.  This action is forced if the parameter flush is non zero.</div><div class='ctx'>     Forcing flush frequently degrades the compression ratio, so this parameter</div><div class='del'>-    should be set only when necessary (in interactive applications).</div><div class='del'>-    Some output may be provided even if flush is not set.</div><div class='del'>-</div><div class='del'>-  Before the call of deflate(), the application should ensure that at least</div><div class='del'>-  one of the actions is possible, by providing more input and/or consuming</div><div class='del'>-  more output, and updating avail_in or avail_out accordingly; avail_out</div><div class='del'>-  should never be zero before the call. The application can consume the</div><div class='del'>-  compressed output when it wants, for example when the output buffer is full</div><div class='del'>-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK</div><div class='del'>-  and with zero avail_out, it must be called again after making room in the</div><div class='del'>-  output buffer because there might be more output pending.</div><div class='add'>+    should be set only when necessary (in interactive applications).  Some</div><div class='add'>+    output may be provided even if flush is not set.</div><div class='add'>+</div><div class='add'>+    Before the call of deflate(), the application should ensure that at least</div><div class='add'>+  one of the actions is possible, by providing more input and/or consuming more</div><div class='add'>+  output, and updating avail_in or avail_out accordingly; avail_out should</div><div class='add'>+  never be zero before the call.  The application can consume the compressed</div><div class='add'>+  output when it wants, for example when the output buffer is full (avail_out</div><div class='add'>+  == 0), or after each call of deflate().  If deflate returns Z_OK and with</div><div class='add'>+  zero avail_out, it must be called again after making room in the output</div><div class='add'>+  buffer because there might be more output pending.</div><div class='ctx'> </div><div class='ctx'>     Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to</div><div class='del'>-  decide how much data to accumualte before producing output, in order to</div><div class='add'>+  decide how much data to accumulate before producing output, in order to</div><div class='ctx'>   maximize compression.</div><div class='ctx'> </div><div class='ctx'>     If the parameter flush is set to Z_SYNC_FLUSH, all pending output is</div><div class='ctx'>   flushed to the output buffer and the output is aligned on a byte boundary, so</div><div class='del'>-  that the decompressor can get all input data available so far. (In particular</div><div class='del'>-  avail_in is zero after the call if enough output space has been provided</div><div class='del'>-  before the call.)  Flushing may degrade compression for some compression</div><div class='del'>-  algorithms and so it should be used only when necessary.</div><div class='add'>+  that the decompressor can get all input data available so far.  (In</div><div class='add'>+  particular avail_in is zero after the call if enough output space has been</div><div class='add'>+  provided before the call.) Flushing may degrade compression for some</div><div class='add'>+  compression algorithms and so it should be used only when necessary.  This</div><div class='add'>+  completes the current deflate block and follows it with an empty stored block</div><div class='add'>+  that is three bits plus filler bits to the next byte, followed by four bytes</div><div class='add'>+  (00 00 ff ff).</div><div class='add'>+</div><div class='add'>+    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the</div><div class='add'>+  output buffer, but the output is not aligned to a byte boundary.  All of the</div><div class='add'>+  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.</div><div class='add'>+  This completes the current deflate block and follows it with an empty fixed</div><div class='add'>+  codes block that is 10 bits long.  This assures that enough bytes are output</div><div class='add'>+  in order for the decompressor to finish the block before the empty fixed code</div><div class='add'>+  block.</div><div class='add'>+</div><div class='add'>+    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as</div><div class='add'>+  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to</div><div class='add'>+  seven bits of the current block are held to be written as the next byte after</div><div class='add'>+  the next deflate block is completed.  In this case, the decompressor may not</div><div class='add'>+  be provided enough bits at this point in order to complete decompression of</div><div class='add'>+  the data provided so far to the compressor.  It may need to wait for the next</div><div class='add'>+  block to be emitted.  This is for advanced applications that need to control</div><div class='add'>+  the emission of deflate blocks.</div><div class='ctx'> </div><div class='ctx'>     If flush is set to Z_FULL_FLUSH, all output is flushed as with</div><div class='ctx'>   Z_SYNC_FLUSH, and the compression state is reset so that decompression can</div><div class='ctx'>   restart from this point if previous compressed data has been damaged or if</div><div class='del'>-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade</div><div class='add'>+  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade</div><div class='ctx'>   compression.</div><div class='ctx'> </div><div class='ctx'>     If deflate returns with avail_out == 0, this function must be called again</div><div class='ctx'>   with the same value of the flush parameter and more output space (updated</div><div class='ctx'>   avail_out), until the flush is complete (deflate returns with non-zero</div><div class='del'>-  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that</div><div class='add'>+  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that</div><div class='ctx'>   avail_out is greater than six to avoid repeated flush markers due to</div><div class='ctx'>   avail_out == 0 on return.</div><div class='ctx'> </div><div class='ctx'>     If the parameter flush is set to Z_FINISH, pending input is processed,</div><div class='del'>-  pending output is flushed and deflate returns with Z_STREAM_END if there</div><div class='del'>-  was enough output space; if deflate returns with Z_OK, this function must be</div><div class='add'>+  pending output is flushed and deflate returns with Z_STREAM_END if there was</div><div class='add'>+  enough output space; if deflate returns with Z_OK, this function must be</div><div class='ctx'>   called again with Z_FINISH and more output space (updated avail_out) but no</div><div class='del'>-  more input data, until it returns with Z_STREAM_END or an error. After</div><div class='del'>-  deflate has returned Z_STREAM_END, the only possible operations on the</div><div class='del'>-  stream are deflateReset or deflateEnd.</div><div class='add'>+  more input data, until it returns with Z_STREAM_END or an error.  After</div><div class='add'>+  deflate has returned Z_STREAM_END, the only possible operations on the stream</div><div class='add'>+  are deflateReset or deflateEnd.</div><div class='ctx'> </div><div class='ctx'>     Z_FINISH can be used immediately after deflateInit if all the compression</div><div class='del'>-  is to be done in a single step. In this case, avail_out must be at least</div><div class='del'>-  the value returned by deflateBound (see below). If deflate does not return</div><div class='add'>+  is to be done in a single step.  In this case, avail_out must be at least the</div><div class='add'>+  value returned by deflateBound (see below).  If deflate does not return</div><div class='ctx'>   Z_STREAM_END, then it must be called again as described above.</div><div class='ctx'> </div><div class='ctx'>     deflate() sets strm-&gt;adler to the adler32 checksum of all input read</div><div class='ctx'>   so far (that is, total_in bytes).</div><div class='ctx'> </div><div class='ctx'>     deflate() may update strm-&gt;data_type if it can make a good guess about</div><div class='del'>-  the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered</div><div class='del'>-  binary. This field is only for information purposes and does not affect</div><div class='del'>-  the compression algorithm in any manner.</div><div class='add'>+  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered</div><div class='add'>+  binary.  This field is only for information purposes and does not affect the</div><div class='add'>+  compression algorithm in any manner.</div><div class='ctx'> </div><div class='ctx'>     deflate() returns Z_OK if some progress has been made (more input</div><div class='ctx'>   processed or more output produced), Z_STREAM_END if all input has been</div><div class='ctx'>   consumed and all output has been produced (only when flush is set to</div><div class='ctx'>   Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example</div><div class='del'>-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible</div><div class='del'>-  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not</div><div class='add'>+  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible</div><div class='add'>+  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not</div><div class='ctx'>   fatal, and deflate() can be called again with more input and more output</div><div class='ctx'>   space to continue compressing.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT deflateEnd OF((z_streamp strm));</div><div class='add'>+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));</div><div class='ctx'> /*</div><div class='ctx'>      All dynamically allocated data structures for this stream are freed.</div><div class='del'>-   This function discards any unprocessed input and does not flush any</div><div class='del'>-   pending output.</div><div class='add'>+   This function discards any unprocessed input and does not flush any pending</div><div class='add'>+   output.</div><div class='ctx'> </div><div class='ctx'>      deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the</div><div class='ctx'>    stream state was inconsistent, Z_DATA_ERROR if the stream was freed</div><div class='del'>-   prematurely (some input or output was discarded). In the error case,</div><div class='del'>-   msg may be set but then points to a static string (which must not be</div><div class='add'>+   prematurely (some input or output was discarded).  In the error case, msg</div><div class='add'>+   may be set but then points to a static string (which must not be</div><div class='ctx'>    deallocated).</div><div class='ctx'> */</div><div class='ctx'> </div><div class='hunk'>@@ -353,10 +375,10 @@ ZEXTERN int Q_ZEXPORT deflateEnd OF((z_streamp strm));</div><div class='ctx'> /*</div><div class='ctx'> ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));</div><div class='ctx'> </div><div class='del'>-     Initializes the internal stream state for decompression. The fields</div><div class='add'>+     Initializes the internal stream state for decompression.  The fields</div><div class='ctx'>    next_in, avail_in, zalloc, zfree and opaque must be initialized before by</div><div class='del'>-   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact</div><div class='del'>-   value depends on the compression method), inflateInit determines the</div><div class='add'>+   the caller.  If next_in is not Z_NULL and avail_in is large enough (the</div><div class='add'>+   exact value depends on the compression method), inflateInit determines the</div><div class='ctx'>    compression method from the zlib header and allocates all data structures</div><div class='ctx'>    accordingly; otherwise the allocation will be deferred to the first call of</div><div class='ctx'>    inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to</div><div class='hunk'>@@ -364,95 +386,108 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));</div><div class='ctx'> </div><div class='ctx'>      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough</div><div class='ctx'>    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the</div><div class='del'>-   version assumed by the caller.  msg is set to null if there is no error</div><div class='del'>-   message. inflateInit does not perform any decompression apart from reading</div><div class='del'>-   the zlib header if present: this will be done by inflate().  (So next_in and</div><div class='del'>-   avail_in may be modified, but next_out and avail_out are unchanged.)</div><div class='add'>+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are</div><div class='add'>+   invalid, such as a null pointer to the structure.  msg is set to null if</div><div class='add'>+   there is no error message.  inflateInit does not perform any decompression</div><div class='add'>+   apart from possibly reading the zlib header if present: actual decompression</div><div class='add'>+   will be done by inflate().  (So next_in and avail_in may be modified, but</div><div class='add'>+   next_out and avail_out are unused and unchanged.) The current implementation</div><div class='add'>+   of inflateInit() does not process any header information -- that is deferred</div><div class='add'>+   until inflate() is called.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT inflate OF((z_streamp strm, int flush));</div><div class='add'>+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));</div><div class='ctx'> /*</div><div class='ctx'>     inflate decompresses as much data as possible, and stops when the input</div><div class='del'>-  buffer becomes empty or the output buffer becomes full. It may introduce</div><div class='add'>+  buffer becomes empty or the output buffer becomes full.  It may introduce</div><div class='ctx'>   some output latency (reading input without producing any output) except when</div><div class='ctx'>   forced to flush.</div><div class='ctx'> </div><div class='del'>-  The detailed semantics are as follows. inflate performs one or both of the</div><div class='add'>+  The detailed semantics are as follows.  inflate performs one or both of the</div><div class='ctx'>   following actions:</div><div class='ctx'> </div><div class='ctx'>   - Decompress more input starting at next_in and update next_in and avail_in</div><div class='del'>-    accordingly. If not all input can be processed (because there is not</div><div class='del'>-    enough room in the output buffer), next_in is updated and processing</div><div class='del'>-    will resume at this point for the next call of inflate().</div><div class='add'>+    accordingly.  If not all input can be processed (because there is not</div><div class='add'>+    enough room in the output buffer), next_in is updated and processing will</div><div class='add'>+    resume at this point for the next call of inflate().</div><div class='ctx'> </div><div class='ctx'>   - Provide more output starting at next_out and update next_out and avail_out</div><div class='del'>-    accordingly.  inflate() provides as much output as possible, until there</div><div class='del'>-    is no more input data or no more space in the output buffer (see below</div><div class='del'>-    about the flush parameter).</div><div class='del'>-</div><div class='del'>-  Before the call of inflate(), the application should ensure that at least</div><div class='del'>-  one of the actions is possible, by providing more input and/or consuming</div><div class='del'>-  more output, and updating the next_* and avail_* values accordingly.</div><div class='del'>-  The application can consume the uncompressed output when it wants, for</div><div class='del'>-  example when the output buffer is full (avail_out == 0), or after each</div><div class='del'>-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it</div><div class='del'>-  must be called again after making room in the output buffer because there</div><div class='del'>-  might be more output pending.</div><div class='del'>-</div><div class='del'>-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,</div><div class='del'>-  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much</div><div class='del'>-  output as possible to the output buffer. Z_BLOCK requests that inflate() stop</div><div class='del'>-  if and when it gets to the next deflate block boundary. When decoding the</div><div class='del'>-  zlib or gzip format, this will cause inflate() to return immediately after</div><div class='del'>-  the header and before the first block. When doing a raw inflate, inflate()</div><div class='del'>-  will go ahead and process the first block, and will return when it gets to</div><div class='del'>-  the end of that block, or when it runs out of data.</div><div class='add'>+    accordingly.  inflate() provides as much output as possible, until there is</div><div class='add'>+    no more input data or no more space in the output buffer (see below about</div><div class='add'>+    the flush parameter).</div><div class='add'>+</div><div class='add'>+    Before the call of inflate(), the application should ensure that at least</div><div class='add'>+  one of the actions is possible, by providing more input and/or consuming more</div><div class='add'>+  output, and updating the next_* and avail_* values accordingly.  The</div><div class='add'>+  application can consume the uncompressed output when it wants, for example</div><div class='add'>+  when the output buffer is full (avail_out == 0), or after each call of</div><div class='add'>+  inflate().  If inflate returns Z_OK and with zero avail_out, it must be</div><div class='add'>+  called again after making room in the output buffer because there might be</div><div class='add'>+  more output pending.</div><div class='add'>+</div><div class='add'>+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,</div><div class='add'>+  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much</div><div class='add'>+  output as possible to the output buffer.  Z_BLOCK requests that inflate()</div><div class='add'>+  stop if and when it gets to the next deflate block boundary.  When decoding</div><div class='add'>+  the zlib or gzip format, this will cause inflate() to return immediately</div><div class='add'>+  after the header and before the first block.  When doing a raw inflate,</div><div class='add'>+  inflate() will go ahead and process the first block, and will return when it</div><div class='add'>+  gets to the end of that block, or when it runs out of data.</div><div class='ctx'> </div><div class='ctx'>     The Z_BLOCK option assists in appending to or combining deflate streams.</div><div class='ctx'>   Also to assist in this, on return inflate() will set strm-&gt;data_type to the</div><div class='del'>-  number of unused bits in the last byte taken from strm-&gt;next_in, plus 64</div><div class='del'>-  if inflate() is currently decoding the last block in the deflate stream,</div><div class='del'>-  plus 128 if inflate() returned immediately after decoding an end-of-block</div><div class='del'>-  code or decoding the complete header up to just before the first byte of the</div><div class='del'>-  deflate stream. The end-of-block will not be indicated until all of the</div><div class='del'>-  uncompressed data from that block has been written to strm-&gt;next_out.  The</div><div class='del'>-  number of unused bits may in general be greater than seven, except when</div><div class='del'>-  bit 7 of data_type is set, in which case the number of unused bits will be</div><div class='del'>-  less than eight.</div><div class='add'>+  number of unused bits in the last byte taken from strm-&gt;next_in, plus 64 if</div><div class='add'>+  inflate() is currently decoding the last block in the deflate stream, plus</div><div class='add'>+  128 if inflate() returned immediately after decoding an end-of-block code or</div><div class='add'>+  decoding the complete header up to just before the first byte of the deflate</div><div class='add'>+  stream.  The end-of-block will not be indicated until all of the uncompressed</div><div class='add'>+  data from that block has been written to strm-&gt;next_out.  The number of</div><div class='add'>+  unused bits may in general be greater than seven, except when bit 7 of</div><div class='add'>+  data_type is set, in which case the number of unused bits will be less than</div><div class='add'>+  eight.  data_type is set as noted here every time inflate() returns for all</div><div class='add'>+  flush options, and so can be used to determine the amount of currently</div><div class='add'>+  consumed input in bits.</div><div class='add'>+</div><div class='add'>+    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the</div><div class='add'>+  end of each deflate block header is reached, before any actual data in that</div><div class='add'>+  block is decoded.  This allows the caller to determine the length of the</div><div class='add'>+  deflate block header for later use in random access within a deflate block.</div><div class='add'>+  256 is added to the value of strm-&gt;data_type when inflate() returns</div><div class='add'>+  immediately after reaching the end of the deflate block header.</div><div class='ctx'> </div><div class='ctx'>     inflate() should normally be called until it returns Z_STREAM_END or an</div><div class='del'>-  error. However if all decompression is to be performed in a single step</div><div class='del'>-  (a single call of inflate), the parameter flush should be set to</div><div class='del'>-  Z_FINISH. In this case all pending input is processed and all pending</div><div class='del'>-  output is flushed; avail_out must be large enough to hold all the</div><div class='del'>-  uncompressed data. (The size of the uncompressed data may have been saved</div><div class='del'>-  by the compressor for this purpose.) The next operation on this stream must</div><div class='del'>-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH</div><div class='del'>-  is never required, but can be used to inform inflate that a faster approach</div><div class='del'>-  may be used for the single inflate() call.</div><div class='add'>+  error.  However if all decompression is to be performed in a single step (a</div><div class='add'>+  single call of inflate), the parameter flush should be set to Z_FINISH.  In</div><div class='add'>+  this case all pending input is processed and all pending output is flushed;</div><div class='add'>+  avail_out must be large enough to hold all the uncompressed data.  (The size</div><div class='add'>+  of the uncompressed data may have been saved by the compressor for this</div><div class='add'>+  purpose.) The next operation on this stream must be inflateEnd to deallocate</div><div class='add'>+  the decompression state.  The use of Z_FINISH is never required, but can be</div><div class='add'>+  used to inform inflate that a faster approach may be used for the single</div><div class='add'>+  inflate() call.</div><div class='ctx'> </div><div class='ctx'>      In this implementation, inflate() always flushes as much output as</div><div class='ctx'>   possible to the output buffer, and always uses the faster approach on the</div><div class='del'>-  first call. So the only effect of the flush parameter in this implementation</div><div class='add'>+  first call.  So the only effect of the flush parameter in this implementation</div><div class='ctx'>   is on the return value of inflate(), as noted below, or when it returns early</div><div class='del'>-  because Z_BLOCK is used.</div><div class='add'>+  because Z_BLOCK or Z_TREES is used.</div><div class='ctx'> </div><div class='ctx'>      If a preset dictionary is needed after this call (see inflateSetDictionary</div><div class='ctx'>   below), inflate sets strm-&gt;adler to the adler32 checksum of the dictionary</div><div class='ctx'>   chosen by the compressor and returns Z_NEED_DICT; otherwise it sets</div><div class='ctx'>   strm-&gt;adler to the adler32 checksum of all output produced so far (that is,</div><div class='ctx'>   total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described</div><div class='del'>-  below. At the end of the stream, inflate() checks that its computed adler32</div><div class='add'>+  below.  At the end of the stream, inflate() checks that its computed adler32</div><div class='ctx'>   checksum is equal to that saved by the compressor and returns Z_STREAM_END</div><div class='ctx'>   only if the checksum is correct.</div><div class='ctx'> </div><div class='del'>-    inflate() will decompress and check either zlib-wrapped or gzip-wrapped</div><div class='del'>-  deflate data.  The header type is detected automatically.  Any information</div><div class='del'>-  contained in the gzip header is not retained, so applications that need that</div><div class='del'>-  information should instead use raw inflate, see inflateInit2() below, or</div><div class='del'>-  inflateBack() and perform their own processing of the gzip header and</div><div class='del'>-  trailer.</div><div class='add'>+    inflate() can decompress and check either zlib-wrapped or gzip-wrapped</div><div class='add'>+  deflate data.  The header type is detected automatically, if requested when</div><div class='add'>+  initializing with inflateInit2().  Any information contained in the gzip</div><div class='add'>+  header is not retained, so applications that need that information should</div><div class='add'>+  instead use raw inflate, see inflateInit2() below, or inflateBack() and</div><div class='add'>+  perform their own processing of the gzip header and trailer.</div><div class='ctx'> </div><div class='ctx'>     inflate() returns Z_OK if some progress has been made (more input processed</div><div class='ctx'>   or more output produced), Z_STREAM_END if the end of the compressed data has</div><div class='hunk'>@@ -460,27 +495,28 @@ ZEXTERN int Q_ZEXPORT inflate OF((z_streamp strm, int flush));</div><div class='ctx'>   preset dictionary is needed at this point, Z_DATA_ERROR if the input data was</div><div class='ctx'>   corrupted (input stream not conforming to the zlib format or incorrect check</div><div class='ctx'>   value), Z_STREAM_ERROR if the stream structure was inconsistent (for example</div><div class='del'>-  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,</div><div class='add'>+  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,</div><div class='ctx'>   Z_BUF_ERROR if no progress is possible or if there was not enough room in the</div><div class='del'>-  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and</div><div class='add'>+  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and</div><div class='ctx'>   inflate() can be called again with more input and more output space to</div><div class='del'>-  continue decompressing. If Z_DATA_ERROR is returned, the application may then</div><div class='del'>-  call inflateSync() to look for a good compression block if a partial recovery</div><div class='del'>-  of the data is desired.</div><div class='add'>+  continue decompressing.  If Z_DATA_ERROR is returned, the application may</div><div class='add'>+  then call inflateSync() to look for a good compression block if a partial</div><div class='add'>+  recovery of the data is desired.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT inflateEnd OF((z_streamp strm));</div><div class='add'>+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));</div><div class='ctx'> /*</div><div class='ctx'>      All dynamically allocated data structures for this stream are freed.</div><div class='del'>-   This function discards any unprocessed input and does not flush any</div><div class='del'>-   pending output.</div><div class='add'>+   This function discards any unprocessed input and does not flush any pending</div><div class='add'>+   output.</div><div class='ctx'> </div><div class='ctx'>      inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state</div><div class='del'>-   was inconsistent. In the error case, msg may be set but then points to a</div><div class='add'>+   was inconsistent.  In the error case, msg may be set but then points to a</div><div class='ctx'>    static string (which must not be deallocated).</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'>                         /* Advanced functions */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -495,144 +531,146 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,</div><div class='ctx'>                                      int  memLevel,</div><div class='ctx'>                                      int  strategy));</div><div class='ctx'> </div><div class='del'>-     This is another version of deflateInit with more compression options. The</div><div class='del'>-   fields next_in, zalloc, zfree and opaque must be initialized before by</div><div class='del'>-   the caller.</div><div class='add'>+     This is another version of deflateInit with more compression options.  The</div><div class='add'>+   fields next_in, zalloc, zfree and opaque must be initialized before by the</div><div class='add'>+   caller.</div><div class='ctx'> </div><div class='del'>-     The method parameter is the compression method. It must be Z_DEFLATED in</div><div class='add'>+     The method parameter is the compression method.  It must be Z_DEFLATED in</div><div class='ctx'>    this version of the library.</div><div class='ctx'> </div><div class='ctx'>      The windowBits parameter is the base two logarithm of the window size</div><div class='del'>-   (the size of the history buffer). It should be in the range 8..15 for this</div><div class='del'>-   version of the library. Larger values of this parameter result in better</div><div class='del'>-   compression at the expense of memory usage. The default value is 15 if</div><div class='add'>+   (the size of the history buffer).  It should be in the range 8..15 for this</div><div class='add'>+   version of the library.  Larger values of this parameter result in better</div><div class='add'>+   compression at the expense of memory usage.  The default value is 15 if</div><div class='ctx'>    deflateInit is used instead.</div><div class='ctx'> </div><div class='del'>-     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits</div><div class='del'>-   determines the window size. deflate() will then generate raw deflate data</div><div class='add'>+     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits</div><div class='add'>+   determines the window size.  deflate() will then generate raw deflate data</div><div class='ctx'>    with no zlib header or trailer, and will not compute an adler32 check value.</div><div class='ctx'> </div><div class='del'>-     windowBits can also be greater than 15 for optional gzip encoding. Add</div><div class='add'>+     windowBits can also be greater than 15 for optional gzip encoding.  Add</div><div class='ctx'>    16 to windowBits to write a simple gzip header and trailer around the</div><div class='del'>-   compressed data instead of a zlib wrapper. The gzip header will have no</div><div class='del'>-   file name, no extra data, no comment, no modification time (set to zero),</div><div class='del'>-   no header crc, and the operating system will be set to 255 (unknown).  If a</div><div class='add'>+   compressed data instead of a zlib wrapper.  The gzip header will have no</div><div class='add'>+   file name, no extra data, no comment, no modification time (set to zero), no</div><div class='add'>+   header crc, and the operating system will be set to 255 (unknown).  If a</div><div class='ctx'>    gzip stream is being written, strm-&gt;adler is a crc32 instead of an adler32.</div><div class='ctx'> </div><div class='ctx'>      The memLevel parameter specifies how much memory should be allocated</div><div class='del'>-   for the internal compression state. memLevel=1 uses minimum memory but</div><div class='del'>-   is slow and reduces compression ratio; memLevel=9 uses maximum memory</div><div class='del'>-   for optimal speed. The default value is 8. See zconf.h for total memory</div><div class='del'>-   usage as a function of windowBits and memLevel.</div><div class='add'>+   for the internal compression state.  memLevel=1 uses minimum memory but is</div><div class='add'>+   slow and reduces compression ratio; memLevel=9 uses maximum memory for</div><div class='add'>+   optimal speed.  The default value is 8.  See zconf.h for total memory usage</div><div class='add'>+   as a function of windowBits and memLevel.</div><div class='ctx'> </div><div class='del'>-     The strategy parameter is used to tune the compression algorithm. Use the</div><div class='add'>+     The strategy parameter is used to tune the compression algorithm.  Use the</div><div class='ctx'>    value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a</div><div class='ctx'>    filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no</div><div class='ctx'>    string match), or Z_RLE to limit match distances to one (run-length</div><div class='del'>-   encoding). Filtered data consists mostly of small values with a somewhat</div><div class='del'>-   random distribution. In this case, the compression algorithm is tuned to</div><div class='del'>-   compress them better. The effect of Z_FILTERED is to force more Huffman</div><div class='add'>+   encoding).  Filtered data consists mostly of small values with a somewhat</div><div class='add'>+   random distribution.  In this case, the compression algorithm is tuned to</div><div class='add'>+   compress them better.  The effect of Z_FILTERED is to force more Huffman</div><div class='ctx'>    coding and less string matching; it is somewhat intermediate between</div><div class='del'>-   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as</div><div class='del'>-   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy</div><div class='del'>-   parameter only affects the compression ratio but not the correctness of the</div><div class='del'>-   compressed output even if it is not set appropriately.  Z_FIXED prevents the</div><div class='del'>-   use of dynamic Huffman codes, allowing for a simpler decoder for special</div><div class='del'>-   applications.</div><div class='del'>-</div><div class='del'>-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough</div><div class='del'>-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid</div><div class='del'>-   method). msg is set to null if there is no error message.  deflateInit2 does</div><div class='del'>-   not perform any compression: this will be done by deflate().</div><div class='add'>+   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as</div><div class='add'>+   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The</div><div class='add'>+   strategy parameter only affects the compression ratio but not the</div><div class='add'>+   correctness of the compressed output even if it is not set appropriately.</div><div class='add'>+   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler</div><div class='add'>+   decoder for special applications.</div><div class='add'>+</div><div class='add'>+     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough</div><div class='add'>+   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid</div><div class='add'>+   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is</div><div class='add'>+   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is</div><div class='add'>+   set to null if there is no error message.  deflateInit2 does not perform any</div><div class='add'>+   compression: this will be done by deflate().</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT deflateSetDictionary OF((z_streamp strm,</div><div class='add'>+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,</div><div class='ctx'>                                              const Bytef *dictionary,</div><div class='ctx'>                                              uInt  dictLength));</div><div class='ctx'> /*</div><div class='ctx'>      Initializes the compression dictionary from the given byte sequence</div><div class='del'>-   without producing any compressed output. This function must be called</div><div class='del'>-   immediately after deflateInit, deflateInit2 or deflateReset, before any</div><div class='del'>-   call of deflate. The compressor and decompressor must use exactly the same</div><div class='add'>+   without producing any compressed output.  This function must be called</div><div class='add'>+   immediately after deflateInit, deflateInit2 or deflateReset, before any call</div><div class='add'>+   of deflate.  The compressor and decompressor must use exactly the same</div><div class='ctx'>    dictionary (see inflateSetDictionary).</div><div class='ctx'> </div><div class='ctx'>      The dictionary should consist of strings (byte sequences) that are likely</div><div class='ctx'>    to be encountered later in the data to be compressed, with the most commonly</div><div class='del'>-   used strings preferably put towards the end of the dictionary. Using a</div><div class='add'>+   used strings preferably put towards the end of the dictionary.  Using a</div><div class='ctx'>    dictionary is most useful when the data to be compressed is short and can be</div><div class='ctx'>    predicted with good accuracy; the data can then be compressed better than</div><div class='ctx'>    with the default empty dictionary.</div><div class='ctx'> </div><div class='ctx'>      Depending on the size of the compression data structures selected by</div><div class='ctx'>    deflateInit or deflateInit2, a part of the dictionary may in effect be</div><div class='del'>-   discarded, for example if the dictionary is larger than the window size in</div><div class='del'>-   deflate or deflate2. Thus the strings most likely to be useful should be</div><div class='del'>-   put at the end of the dictionary, not at the front. In addition, the</div><div class='del'>-   current implementation of deflate will use at most the window size minus</div><div class='del'>-   262 bytes of the provided dictionary.</div><div class='add'>+   discarded, for example if the dictionary is larger than the window size</div><div class='add'>+   provided in deflateInit or deflateInit2.  Thus the strings most likely to be</div><div class='add'>+   useful should be put at the end of the dictionary, not at the front.  In</div><div class='add'>+   addition, the current implementation of deflate will use at most the window</div><div class='add'>+   size minus 262 bytes of the provided dictionary.</div><div class='ctx'> </div><div class='ctx'>      Upon return of this function, strm-&gt;adler is set to the adler32 value</div><div class='ctx'>    of the dictionary; the decompressor may later use this value to determine</div><div class='del'>-   which dictionary has been used by the compressor. (The adler32 value</div><div class='add'>+   which dictionary has been used by the compressor.  (The adler32 value</div><div class='ctx'>    applies to the whole dictionary even if only a subset of the dictionary is</div><div class='ctx'>    actually used by the compressor.) If a raw deflate was requested, then the</div><div class='ctx'>    adler32 value is not computed and strm-&gt;adler is not set.</div><div class='ctx'> </div><div class='ctx'>      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a</div><div class='del'>-   parameter is invalid (such as NULL dictionary) or the stream state is</div><div class='add'>+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is</div><div class='ctx'>    inconsistent (for example if deflate has already been called for this stream</div><div class='del'>-   or if the compression method is bsort). deflateSetDictionary does not</div><div class='add'>+   or if the compression method is bsort).  deflateSetDictionary does not</div><div class='ctx'>    perform any compression: this will be done by deflate().</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT deflateCopy OF((z_streamp dest,</div><div class='add'>+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,</div><div class='ctx'>                                     z_streamp source));</div><div class='ctx'> /*</div><div class='ctx'>      Sets the destination stream as a complete copy of the source stream.</div><div class='ctx'> </div><div class='ctx'>      This function can be useful when several compression strategies will be</div><div class='ctx'>    tried, for example when there are several ways of pre-processing the input</div><div class='del'>-   data with a filter. The streams that will be discarded should then be freed</div><div class='add'>+   data with a filter.  The streams that will be discarded should then be freed</div><div class='ctx'>    by calling deflateEnd.  Note that deflateCopy duplicates the internal</div><div class='del'>-   compression state which can be quite large, so this strategy is slow and</div><div class='del'>-   can consume lots of memory.</div><div class='add'>+   compression state which can be quite large, so this strategy is slow and can</div><div class='add'>+   consume lots of memory.</div><div class='ctx'> </div><div class='ctx'>      deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not</div><div class='ctx'>    enough memory, Z_STREAM_ERROR if the source stream state was inconsistent</div><div class='del'>-   (such as zalloc being NULL). msg is left unchanged in both source and</div><div class='add'>+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and</div><div class='ctx'>    destination.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT deflateReset OF((z_streamp strm));</div><div class='add'>+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));</div><div class='ctx'> /*</div><div class='ctx'>      This function is equivalent to deflateEnd followed by deflateInit,</div><div class='del'>-   but does not free and reallocate all the internal compression state.</div><div class='del'>-   The stream will keep the same compression level and any other attributes</div><div class='del'>-   that may have been set by deflateInit2.</div><div class='add'>+   but does not free and reallocate all the internal compression state.  The</div><div class='add'>+   stream will keep the same compression level and any other attributes that</div><div class='add'>+   may have been set by deflateInit2.</div><div class='ctx'> </div><div class='del'>-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source</div><div class='del'>-   stream state was inconsistent (such as zalloc or state being NULL).</div><div class='add'>+     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source</div><div class='add'>+   stream state was inconsistent (such as zalloc or state being Z_NULL).</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT deflateParams OF((z_streamp strm,</div><div class='add'>+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,</div><div class='ctx'>                                       int level,</div><div class='ctx'>                                       int strategy));</div><div class='ctx'> /*</div><div class='ctx'>      Dynamically update the compression level and compression strategy.  The</div><div class='ctx'>    interpretation of level and strategy is as in deflateInit2.  This can be</div><div class='ctx'>    used to switch between compression and straight copy of the input data, or</div><div class='del'>-   to switch to a different kind of input data requiring a different</div><div class='del'>-   strategy. If the compression level is changed, the input available so far</div><div class='del'>-   is compressed with the old level (and may be flushed); the new level will</div><div class='del'>-   take effect only at the next call of deflate().</div><div class='add'>+   to switch to a different kind of input data requiring a different strategy.</div><div class='add'>+   If the compression level is changed, the input available so far is</div><div class='add'>+   compressed with the old level (and may be flushed); the new level will take</div><div class='add'>+   effect only at the next call of deflate().</div><div class='ctx'> </div><div class='ctx'>      Before the call of deflateParams, the stream state must be set as for</div><div class='del'>-   a call of deflate(), since the currently available input may have to</div><div class='del'>-   be compressed and flushed. In particular, strm-&gt;avail_out must be non-zero.</div><div class='add'>+   a call of deflate(), since the currently available input may have to be</div><div class='add'>+   compressed and flushed.  In particular, strm-&gt;avail_out must be non-zero.</div><div class='ctx'> </div><div class='ctx'>      deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source</div><div class='del'>-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR</div><div class='del'>-   if strm-&gt;avail_out was zero.</div><div class='add'>+   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if</div><div class='add'>+   strm-&gt;avail_out was zero.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,</div><div class='hunk'>@@ -656,9 +694,10 @@ ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,</div><div class='ctx'>                                        uLong sourceLen));</div><div class='ctx'> /*</div><div class='ctx'>      deflateBound() returns an upper bound on the compressed size after</div><div class='del'>-   deflation of sourceLen bytes.  It must be called after deflateInit()</div><div class='del'>-   or deflateInit2().  This would be used to allocate an output buffer</div><div class='del'>-   for deflation in a single pass, and so would be called before deflate().</div><div class='add'>+   deflation of sourceLen bytes.  It must be called after deflateInit() or</div><div class='add'>+   deflateInit2(), and after deflateSetHeader(), if used.  This would be used</div><div class='add'>+   to allocate an output buffer for deflation in a single pass, and so would be</div><div class='add'>+   called before deflate().</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,</div><div class='hunk'>@@ -666,21 +705,21 @@ ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,</div><div class='ctx'>                                      int value));</div><div class='ctx'> /*</div><div class='ctx'>      deflatePrime() inserts bits in the deflate output stream.  The intent</div><div class='del'>-  is that this function is used to start off the deflate output with the</div><div class='del'>-  bits leftover from a previous deflate stream when appending to it.  As such,</div><div class='del'>-  this function can only be used for raw deflate, and must be used before the</div><div class='del'>-  first deflate() call after a deflateInit2() or deflateReset().  bits must be</div><div class='del'>-  less than or equal to 16, and that many of the least significant bits of</div><div class='del'>-  value will be inserted in the output.</div><div class='del'>-</div><div class='del'>-      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source</div><div class='add'>+   is that this function is used to start off the deflate output with the bits</div><div class='add'>+   leftover from a previous deflate stream when appending to it.  As such, this</div><div class='add'>+   function can only be used for raw deflate, and must be used before the first</div><div class='add'>+   deflate() call after a deflateInit2() or deflateReset().  bits must be less</div><div class='add'>+   than or equal to 16, and that many of the least significant bits of value</div><div class='add'>+   will be inserted in the output.</div><div class='add'>+</div><div class='add'>+     deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source</div><div class='ctx'>    stream state was inconsistent.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,</div><div class='ctx'>                                          gz_headerp head));</div><div class='ctx'> /*</div><div class='del'>-      deflateSetHeader() provides gzip header information for when a gzip</div><div class='add'>+     deflateSetHeader() provides gzip header information for when a gzip</div><div class='ctx'>    stream is requested by deflateInit2().  deflateSetHeader() may be called</div><div class='ctx'>    after deflateInit2() or deflateReset() and before the first call of</div><div class='ctx'>    deflate().  The text, time, os, extra field, name, and comment information</div><div class='hunk'>@@ -693,11 +732,11 @@ ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,</div><div class='ctx'>    1.3.x) do not support header crc's, and will report that it is a "multi-part</div><div class='ctx'>    gzip file" and give up.</div><div class='ctx'> </div><div class='del'>-      If deflateSetHeader is not used, the default gzip header has text false,</div><div class='add'>+     If deflateSetHeader is not used, the default gzip header has text false,</div><div class='ctx'>    the time set to zero, and os set to 255, with no extra, name, or comment</div><div class='ctx'>    fields.  The gzip header is returned to the default state by deflateReset().</div><div class='ctx'> </div><div class='del'>-      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source</div><div class='add'>+     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source</div><div class='ctx'>    stream state was inconsistent.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='hunk'>@@ -705,52 +744,59 @@ ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,</div><div class='ctx'> ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,</div><div class='ctx'>                                      int  windowBits));</div><div class='ctx'> </div><div class='del'>-     This is another version of inflateInit with an extra parameter. The</div><div class='add'>+     This is another version of inflateInit with an extra parameter.  The</div><div class='ctx'>    fields next_in, avail_in, zalloc, zfree and opaque must be initialized</div><div class='ctx'>    before by the caller.</div><div class='ctx'> </div><div class='ctx'>      The windowBits parameter is the base two logarithm of the maximum window</div><div class='ctx'>    size (the size of the history buffer).  It should be in the range 8..15 for</div><div class='del'>-   this version of the library. The default value is 15 if inflateInit is used</div><div class='del'>-   instead. windowBits must be greater than or equal to the windowBits value</div><div class='add'>+   this version of the library.  The default value is 15 if inflateInit is used</div><div class='add'>+   instead.  windowBits must be greater than or equal to the windowBits value</div><div class='ctx'>    provided to deflateInit2() while compressing, or it must be equal to 15 if</div><div class='del'>-   deflateInit2() was not used. If a compressed stream with a larger window</div><div class='add'>+   deflateInit2() was not used.  If a compressed stream with a larger window</div><div class='ctx'>    size is given as input, inflate() will return with the error code</div><div class='ctx'>    Z_DATA_ERROR instead of trying to allocate a larger window.</div><div class='ctx'> </div><div class='del'>-     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits</div><div class='del'>-   determines the window size. inflate() will then process raw deflate data,</div><div class='add'>+     windowBits can also be zero to request that inflate use the window size in</div><div class='add'>+   the zlib header of the compressed stream.</div><div class='add'>+</div><div class='add'>+     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits</div><div class='add'>+   determines the window size.  inflate() will then process raw deflate data,</div><div class='ctx'>    not looking for a zlib or gzip header, not generating a check value, and not</div><div class='del'>-   looking for any check values for comparison at the end of the stream. This</div><div class='add'>+   looking for any check values for comparison at the end of the stream.  This</div><div class='ctx'>    is for use with other formats that use the deflate compressed data format</div><div class='del'>-   such as zip.  Those formats provide their own check values. If a custom</div><div class='add'>+   such as zip.  Those formats provide their own check values.  If a custom</div><div class='ctx'>    format is developed using the raw deflate format for compressed data, it is</div><div class='ctx'>    recommended that a check value such as an adler32 or a crc32 be applied to</div><div class='ctx'>    the uncompressed data as is done in the zlib, gzip, and zip formats.  For</div><div class='del'>-   most applications, the zlib format should be used as is. Note that comments</div><div class='add'>+   most applications, the zlib format should be used as is.  Note that comments</div><div class='ctx'>    above on the use in deflateInit2() applies to the magnitude of windowBits.</div><div class='ctx'> </div><div class='del'>-     windowBits can also be greater than 15 for optional gzip decoding. Add</div><div class='add'>+     windowBits can also be greater than 15 for optional gzip decoding.  Add</div><div class='ctx'>    32 to windowBits to enable zlib and gzip decoding with automatic header</div><div class='ctx'>    detection, or add 16 to decode only the gzip format (the zlib format will</div><div class='del'>-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm-&gt;adler is</div><div class='del'>-   a crc32 instead of an adler32.</div><div class='add'>+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm-&gt;adler is a</div><div class='add'>+   crc32 instead of an adler32.</div><div class='ctx'> </div><div class='ctx'>      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough</div><div class='del'>-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg</div><div class='del'>-   is set to null if there is no error message.  inflateInit2 does not perform</div><div class='del'>-   any decompression apart from reading the zlib header if present: this will</div><div class='del'>-   be done by inflate(). (So next_in and avail_in may be modified, but next_out</div><div class='del'>-   and avail_out are unchanged.)</div><div class='add'>+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the</div><div class='add'>+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are</div><div class='add'>+   invalid, such as a null pointer to the structure.  msg is set to null if</div><div class='add'>+   there is no error message.  inflateInit2 does not perform any decompression</div><div class='add'>+   apart from possibly reading the zlib header if present: actual decompression</div><div class='add'>+   will be done by inflate().  (So next_in and avail_in may be modified, but</div><div class='add'>+   next_out and avail_out are unused and unchanged.) The current implementation</div><div class='add'>+   of inflateInit2() does not process any header information -- that is</div><div class='add'>+   deferred until inflate() is called.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT inflateSetDictionary OF((z_streamp strm,</div><div class='add'>+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,</div><div class='ctx'>                                              const Bytef *dictionary,</div><div class='ctx'>                                              uInt  dictLength));</div><div class='ctx'> /*</div><div class='ctx'>      Initializes the decompression dictionary from the given uncompressed byte</div><div class='del'>-   sequence. This function must be called immediately after a call of inflate,</div><div class='del'>-   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor</div><div class='add'>+   sequence.  This function must be called immediately after a call of inflate,</div><div class='add'>+   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor</div><div class='ctx'>    can be determined from the adler32 value returned by that call of inflate.</div><div class='ctx'>    The compressor and decompressor must use exactly the same dictionary (see</div><div class='ctx'>    deflateSetDictionary).  For raw inflate, this function can be called</div><div class='hunk'>@@ -759,26 +805,26 @@ ZEXTERN int Q_ZEXPORT inflateSetDictionary OF((z_streamp strm,</div><div class='ctx'>    dictionary that was used for compression is provided.</div><div class='ctx'> </div><div class='ctx'>      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a</div><div class='del'>-   parameter is invalid (such as NULL dictionary) or the stream state is</div><div class='add'>+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is</div><div class='ctx'>    inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the</div><div class='del'>-   expected one (incorrect adler32 value). inflateSetDictionary does not</div><div class='add'>+   expected one (incorrect adler32 value).  inflateSetDictionary does not</div><div class='ctx'>    perform any decompression: this will be done by subsequent calls of</div><div class='ctx'>    inflate().</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT inflateSync OF((z_streamp strm));</div><div class='add'>+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));</div><div class='ctx'> /*</div><div class='del'>-    Skips invalid compressed data until a full flush point (see above the</div><div class='del'>-  description of deflate with Z_FULL_FLUSH) can be found, or until all</div><div class='del'>-  available input is skipped. No output is provided.</div><div class='del'>-</div><div class='del'>-    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR</div><div class='del'>-  if no more input was provided, Z_DATA_ERROR if no flush point has been found,</div><div class='del'>-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success</div><div class='del'>-  case, the application may save the current current value of total_in which</div><div class='del'>-  indicates where valid compressed data was found. In the error case, the</div><div class='del'>-  application may repeatedly call inflateSync, providing more input each time,</div><div class='del'>-  until success or end of the input data.</div><div class='add'>+     Skips invalid compressed data until a full flush point (see above the</div><div class='add'>+   description of deflate with Z_FULL_FLUSH) can be found, or until all</div><div class='add'>+   available input is skipped.  No output is provided.</div><div class='add'>+</div><div class='add'>+     inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR</div><div class='add'>+   if no more input was provided, Z_DATA_ERROR if no flush point has been</div><div class='add'>+   found, or Z_STREAM_ERROR if the stream structure was inconsistent.  In the</div><div class='add'>+   success case, the application may save the current current value of total_in</div><div class='add'>+   which indicates where valid compressed data was found.  In the error case,</div><div class='add'>+   the application may repeatedly call inflateSync, providing more input each</div><div class='add'>+   time, until success or end of the input data.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,</div><div class='hunk'>@@ -793,18 +839,30 @@ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,</div><div class='ctx'> </div><div class='ctx'>      inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not</div><div class='ctx'>    enough memory, Z_STREAM_ERROR if the source stream state was inconsistent</div><div class='del'>-   (such as zalloc being NULL). msg is left unchanged in both source and</div><div class='add'>+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and</div><div class='ctx'>    destination.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT inflateReset OF((z_streamp strm));</div><div class='add'>+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));</div><div class='ctx'> /*</div><div class='ctx'>      This function is equivalent to inflateEnd followed by inflateInit,</div><div class='del'>-   but does not free and reallocate all the internal decompression state.</div><div class='del'>-   The stream will keep attributes that may have been set by inflateInit2.</div><div class='add'>+   but does not free and reallocate all the internal decompression state.  The</div><div class='add'>+   stream will keep attributes that may have been set by inflateInit2.</div><div class='add'>+</div><div class='add'>+     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source</div><div class='add'>+   stream state was inconsistent (such as zalloc or state being Z_NULL).</div><div class='add'>+*/</div><div class='ctx'> </div><div class='del'>-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source</div><div class='del'>-   stream state was inconsistent (such as zalloc or state being NULL).</div><div class='add'>+ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,</div><div class='add'>+                                      int windowBits));</div><div class='add'>+/*</div><div class='add'>+     This function is the same as inflateReset, but it also permits changing</div><div class='add'>+   the wrap and window size requests.  The windowBits parameter is interpreted</div><div class='add'>+   the same as it is for inflateInit2.</div><div class='add'>+</div><div class='add'>+     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source</div><div class='add'>+   stream state was inconsistent (such as zalloc or state being Z_NULL), or if</div><div class='add'>+   the windowBits parameter is invalid.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,</div><div class='hunk'>@@ -812,54 +870,87 @@ ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,</div><div class='ctx'>                                      int value));</div><div class='ctx'> /*</div><div class='ctx'>      This function inserts bits in the inflate input stream.  The intent is</div><div class='del'>-  that this function is used to start inflating at a bit position in the</div><div class='del'>-  middle of a byte.  The provided bits will be used before any bytes are used</div><div class='del'>-  from next_in.  This function should only be used with raw inflate, and</div><div class='del'>-  should be used before the first inflate() call after inflateInit2() or</div><div class='del'>-  inflateReset().  bits must be less than or equal to 16, and that many of the</div><div class='del'>-  least significant bits of value will be inserted in the input.</div><div class='del'>-</div><div class='del'>-      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source</div><div class='add'>+   that this function is used to start inflating at a bit position in the</div><div class='add'>+   middle of a byte.  The provided bits will be used before any bytes are used</div><div class='add'>+   from next_in.  This function should only be used with raw inflate, and</div><div class='add'>+   should be used before the first inflate() call after inflateInit2() or</div><div class='add'>+   inflateReset().  bits must be less than or equal to 16, and that many of the</div><div class='add'>+   least significant bits of value will be inserted in the input.</div><div class='add'>+</div><div class='add'>+     If bits is negative, then the input stream bit buffer is emptied.  Then</div><div class='add'>+   inflatePrime() can be called again to put bits in the buffer.  This is used</div><div class='add'>+   to clear out bits leftover after feeding inflate a block description prior</div><div class='add'>+   to feeding inflate codes.</div><div class='add'>+</div><div class='add'>+     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source</div><div class='ctx'>    stream state was inconsistent.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));</div><div class='add'>+/*</div><div class='add'>+     This function returns two values, one in the lower 16 bits of the return</div><div class='add'>+   value, and the other in the remaining upper bits, obtained by shifting the</div><div class='add'>+   return value down 16 bits.  If the upper value is -1 and the lower value is</div><div class='add'>+   zero, then inflate() is currently decoding information outside of a block.</div><div class='add'>+   If the upper value is -1 and the lower value is non-zero, then inflate is in</div><div class='add'>+   the middle of a stored block, with the lower value equaling the number of</div><div class='add'>+   bytes from the input remaining to copy.  If the upper value is not -1, then</div><div class='add'>+   it is the number of bits back from the current bit position in the input of</div><div class='add'>+   the code (literal or length/distance pair) currently being processed.  In</div><div class='add'>+   that case the lower value is the number of bytes already emitted for that</div><div class='add'>+   code.</div><div class='add'>+</div><div class='add'>+     A code is being processed if inflate is waiting for more input to complete</div><div class='add'>+   decoding of the code, or if it has completed decoding but is waiting for</div><div class='add'>+   more output space to write the literal or match data.</div><div class='add'>+</div><div class='add'>+     inflateMark() is used to mark locations in the input data for random</div><div class='add'>+   access, which may be at bit positions, and to note those cases where the</div><div class='add'>+   output of a code may span boundaries of random access blocks.  The current</div><div class='add'>+   location in the input stream can be determined from avail_in and data_type</div><div class='add'>+   as noted in the description for the Z_BLOCK flush parameter for inflate.</div><div class='add'>+</div><div class='add'>+     inflateMark returns the value noted above or -1 &lt;&lt; 16 if the provided</div><div class='add'>+   source stream state was inconsistent.</div><div class='add'>+*/</div><div class='add'>+</div><div class='ctx'> ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,</div><div class='ctx'>                                          gz_headerp head));</div><div class='ctx'> /*</div><div class='del'>-      inflateGetHeader() requests that gzip header information be stored in the</div><div class='add'>+     inflateGetHeader() requests that gzip header information be stored in the</div><div class='ctx'>    provided gz_header structure.  inflateGetHeader() may be called after</div><div class='ctx'>    inflateInit2() or inflateReset(), and before the first call of inflate().</div><div class='ctx'>    As inflate() processes the gzip stream, head-&gt;done is zero until the header</div><div class='ctx'>    is completed, at which time head-&gt;done is set to one.  If a zlib stream is</div><div class='ctx'>    being decoded, then head-&gt;done is set to -1 to indicate that there will be</div><div class='del'>-   no gzip header information forthcoming.  Note that Z_BLOCK can be used to</div><div class='del'>-   force inflate() to return immediately after header processing is complete</div><div class='del'>-   and before any actual data is decompressed.</div><div class='add'>+   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be</div><div class='add'>+   used to force inflate() to return immediately after header processing is</div><div class='add'>+   complete and before any actual data is decompressed.</div><div class='ctx'> </div><div class='del'>-      The text, time, xflags, and os fields are filled in with the gzip header</div><div class='add'>+     The text, time, xflags, and os fields are filled in with the gzip header</div><div class='ctx'>    contents.  hcrc is set to true if there is a header CRC.  (The header CRC</div><div class='del'>-   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max</div><div class='add'>+   was valid if done is set to one.) If extra is not Z_NULL, then extra_max</div><div class='ctx'>    contains the maximum number of bytes to write to extra.  Once done is true,</div><div class='ctx'>    extra_len contains the actual extra field length, and extra contains the</div><div class='ctx'>    extra field, or that field truncated if extra_max is less than extra_len.</div><div class='ctx'>    If name is not Z_NULL, then up to name_max characters are written there,</div><div class='ctx'>    terminated with a zero unless the length is greater than name_max.  If</div><div class='ctx'>    comment is not Z_NULL, then up to comm_max characters are written there,</div><div class='del'>-   terminated with a zero unless the length is greater than comm_max.  When</div><div class='del'>-   any of extra, name, or comment are not Z_NULL and the respective field is</div><div class='del'>-   not present in the header, then that field is set to Z_NULL to signal its</div><div class='add'>+   terminated with a zero unless the length is greater than comm_max.  When any</div><div class='add'>+   of extra, name, or comment are not Z_NULL and the respective field is not</div><div class='add'>+   present in the header, then that field is set to Z_NULL to signal its</div><div class='ctx'>    absence.  This allows the use of deflateSetHeader() with the returned</div><div class='ctx'>    structure to duplicate the header.  However if those fields are set to</div><div class='ctx'>    allocated memory, then the application will need to save those pointers</div><div class='ctx'>    elsewhere so that they can be eventually freed.</div><div class='ctx'> </div><div class='del'>-      If inflateGetHeader is not used, then the header information is simply</div><div class='add'>+     If inflateGetHeader is not used, then the header information is simply</div><div class='ctx'>    discarded.  The header is always checked for validity, including the header</div><div class='ctx'>    CRC if present.  inflateReset() will reset the process to discard the header</div><div class='ctx'>    information.  The application would need to call inflateGetHeader() again to</div><div class='ctx'>    retrieve the header from the next gzip stream.</div><div class='ctx'> </div><div class='del'>-      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source</div><div class='add'>+     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source</div><div class='ctx'>    stream state was inconsistent.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='hunk'>@@ -880,9 +971,9 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,</div><div class='ctx'>      See inflateBack() for the usage of these routines.</div><div class='ctx'> </div><div class='ctx'>      inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of</div><div class='del'>-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not</div><div class='del'>-   be allocated, or Z_VERSION_ERROR if the version of the library does not</div><div class='del'>-   match the version of the header file.</div><div class='add'>+   the paramaters are invalid, Z_MEM_ERROR if the internal state could not be</div><div class='add'>+   allocated, or Z_VERSION_ERROR if the version of the library does not match</div><div class='add'>+   the version of the header file.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));</div><div class='hunk'>@@ -902,15 +993,15 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,</div><div class='ctx'>      inflateBackInit() must be called first to allocate the internal state</div><div class='ctx'>    and to initialize the state with the user-provided window buffer.</div><div class='ctx'>    inflateBack() may then be used multiple times to inflate a complete, raw</div><div class='del'>-   deflate stream with each call.  inflateBackEnd() is then called to free</div><div class='del'>-   the allocated state.</div><div class='add'>+   deflate stream with each call.  inflateBackEnd() is then called to free the</div><div class='add'>+   allocated state.</div><div class='ctx'> </div><div class='ctx'>      A raw deflate stream is one with no zlib or gzip header or trailer.</div><div class='ctx'>    This routine would normally be used in a utility that reads zip or gzip</div><div class='ctx'>    files and writes out uncompressed files.  The utility would decode the</div><div class='del'>-   header and process the trailer on its own, hence this routine expects</div><div class='del'>-   only the raw deflate stream to decompress.  This is different from the</div><div class='del'>-   normal behavior of inflate(), which expects either a zlib or gzip header and</div><div class='add'>+   header and process the trailer on its own, hence this routine expects only</div><div class='add'>+   the raw deflate stream to decompress.  This is different from the normal</div><div class='add'>+   behavior of inflate(), which expects either a zlib or gzip header and</div><div class='ctx'>    trailer around the deflate stream.</div><div class='ctx'> </div><div class='ctx'>      inflateBack() uses two subroutines supplied by the caller that are then</div><div class='hunk'>@@ -936,7 +1027,7 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,</div><div class='ctx'>    calling inflateBack().  If strm-&gt;next_in is Z_NULL, then in() will be called</div><div class='ctx'>    immediately for input.  If strm-&gt;next_in is not Z_NULL, then strm-&gt;avail_in</div><div class='ctx'>    must also be initialized, and then if strm-&gt;avail_in is not zero, input will</div><div class='del'>-   initially be taken from strm-&gt;next_in[0 .. strm-&gt;avail_in - 1].</div><div class='add'>+   initially be taken from strm-&gt;next_in[0 ..  strm-&gt;avail_in - 1].</div><div class='ctx'> </div><div class='ctx'>      The in_desc and out_desc parameters of inflateBack() is passed as the</div><div class='ctx'>    first parameter of in() and out() respectively when they are called.  These</div><div class='hunk'>@@ -946,15 +1037,15 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,</div><div class='ctx'>      On return, inflateBack() will set strm-&gt;next_in and strm-&gt;avail_in to</div><div class='ctx'>    pass back any unused input that was provided by the last in() call.  The</div><div class='ctx'>    return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR</div><div class='del'>-   if in() or out() returned an error, Z_DATA_ERROR if there was a format</div><div class='del'>-   error in the deflate stream (in which case strm-&gt;msg is set to indicate the</div><div class='del'>-   nature of the error), or Z_STREAM_ERROR if the stream was not properly</div><div class='del'>-   initialized.  In the case of Z_BUF_ERROR, an input or output error can be</div><div class='del'>-   distinguished using strm-&gt;next_in which will be Z_NULL only if in() returned</div><div class='del'>-   an error.  If strm-&gt;next is not Z_NULL, then the Z_BUF_ERROR was due to</div><div class='del'>-   out() returning non-zero.  (in() will always be called before out(), so</div><div class='del'>-   strm-&gt;next_in is assured to be defined if out() returns non-zero.)  Note</div><div class='del'>-   that inflateBack() cannot return Z_OK.</div><div class='add'>+   if in() or out() returned an error, Z_DATA_ERROR if there was a format error</div><div class='add'>+   in the deflate stream (in which case strm-&gt;msg is set to indicate the nature</div><div class='add'>+   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.</div><div class='add'>+   In the case of Z_BUF_ERROR, an input or output error can be distinguished</div><div class='add'>+   using strm-&gt;next_in which will be Z_NULL only if in() returned an error.  If</div><div class='add'>+   strm-&gt;next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning</div><div class='add'>+   non-zero.  (in() will always be called before out(), so strm-&gt;next_in is</div><div class='add'>+   assured to be defined if out() returns non-zero.) Note that inflateBack()</div><div class='add'>+   cannot return Z_OK.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));</div><div class='hunk'>@@ -1010,37 +1101,36 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));</div><div class='ctx'>                         /* utility functions */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>-     The following utility functions are implemented on top of the</div><div class='del'>-   basic stream-oriented functions. To simplify the interface, some</div><div class='del'>-   default options are assumed (compression level and memory usage,</div><div class='del'>-   standard memory allocation functions). The source code of these</div><div class='del'>-   utility functions can easily be modified if you need special options.</div><div class='add'>+     The following utility functions are implemented on top of the basic</div><div class='add'>+   stream-oriented functions.  To simplify the interface, some default options</div><div class='add'>+   are assumed (compression level and memory usage, standard memory allocation</div><div class='add'>+   functions).  The source code of these utility functions can be modified if</div><div class='add'>+   you need special options.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,</div><div class='add'>+ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,</div><div class='ctx'>                                  const Bytef *source, uLong sourceLen));</div><div class='ctx'> /*</div><div class='ctx'>      Compresses the source buffer into the destination buffer.  sourceLen is</div><div class='del'>-   the byte length of the source buffer. Upon entry, destLen is the total</div><div class='del'>-   size of the destination buffer, which must be at least the value returned</div><div class='del'>-   by compressBound(sourceLen). Upon exit, destLen is the actual size of the</div><div class='add'>+   the byte length of the source buffer.  Upon entry, destLen is the total size</div><div class='add'>+   of the destination buffer, which must be at least the value returned by</div><div class='add'>+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the</div><div class='ctx'>    compressed buffer.</div><div class='del'>-     This function can be used to compress a whole file at once if the</div><div class='del'>-   input file is mmap'ed.</div><div class='add'>+</div><div class='ctx'>      compress returns Z_OK if success, Z_MEM_ERROR if there was not</div><div class='ctx'>    enough memory, Z_BUF_ERROR if there was not enough room in the output</div><div class='ctx'>    buffer.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,</div><div class='add'>+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,</div><div class='ctx'>                                   const Bytef *source, uLong sourceLen,</div><div class='ctx'>                                   int level));</div><div class='ctx'> /*</div><div class='del'>-     Compresses the source buffer into the destination buffer. The level</div><div class='add'>+     Compresses the source buffer into the destination buffer.  The level</div><div class='ctx'>    parameter has the same meaning as in deflateInit.  sourceLen is the byte</div><div class='del'>-   length of the source buffer. Upon entry, destLen is the total size of the</div><div class='add'>+   length of the source buffer.  Upon entry, destLen is the total size of the</div><div class='ctx'>    destination buffer, which must be at least the value returned by</div><div class='del'>-   compressBound(sourceLen). Upon exit, destLen is the actual size of the</div><div class='add'>+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the</div><div class='ctx'>    compressed buffer.</div><div class='ctx'> </div><div class='ctx'>      compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough</div><div class='hunk'>@@ -1051,22 +1141,20 @@ ZEXTERN int Q_ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,</div><div class='ctx'> ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));</div><div class='ctx'> /*</div><div class='ctx'>      compressBound() returns an upper bound on the compressed size after</div><div class='del'>-   compress() or compress2() on sourceLen bytes.  It would be used before</div><div class='del'>-   a compress() or compress2() call to allocate the destination buffer.</div><div class='add'>+   compress() or compress2() on sourceLen bytes.  It would be used before a</div><div class='add'>+   compress() or compress2() call to allocate the destination buffer.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,</div><div class='add'>+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,</div><div class='ctx'>                                    const Bytef *source, uLong sourceLen));</div><div class='ctx'> /*</div><div class='ctx'>      Decompresses the source buffer into the destination buffer.  sourceLen is</div><div class='del'>-   the byte length of the source buffer. Upon entry, destLen is the total</div><div class='del'>-   size of the destination buffer, which must be large enough to hold the</div><div class='del'>-   entire uncompressed data. (The size of the uncompressed data must have</div><div class='del'>-   been saved previously by the compressor and transmitted to the decompressor</div><div class='del'>-   by some mechanism outside the scope of this compression library.)</div><div class='del'>-   Upon exit, destLen is the actual size of the compressed buffer.</div><div class='del'>-     This function can be used to decompress a whole file at once if the</div><div class='del'>-   input file is mmap'ed.</div><div class='add'>+   the byte length of the source buffer.  Upon entry, destLen is the total size</div><div class='add'>+   of the destination buffer, which must be large enough to hold the entire</div><div class='add'>+   uncompressed data.  (The size of the uncompressed data must have been saved</div><div class='add'>+   previously by the compressor and transmitted to the decompressor by some</div><div class='add'>+   mechanism outside the scope of this compression library.) Upon exit, destLen</div><div class='add'>+   is the actual size of the uncompressed buffer.</div><div class='ctx'> </div><div class='ctx'>      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not</div><div class='ctx'>    enough memory, Z_BUF_ERROR if there was not enough room in the output</div><div class='hunk'>@@ -1074,207 +1162,329 @@ ZEXTERN int Q_ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-typedef voidp gzFile;</div><div class='add'>+                        /* gzip file access functions */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+     This library supports reading and writing files in gzip (.gz) format with</div><div class='add'>+   an interface similar to that of stdio, using the functions that start with</div><div class='add'>+   "gz".  The gzip format is different from the zlib format.  gzip is a gzip</div><div class='add'>+   wrapper, documented in RFC 1952, wrapped around a deflate stream.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+typedef voidp gzFile;       /* opaque gzip file descriptor */</div><div class='ctx'> </div><div class='del'>-ZEXTERN gzFile Q_ZEXPORT gzopen  OF((const char *path, const char *mode));</div><div class='ctx'> /*</div><div class='del'>-     Opens a gzip (.gz) file for reading or writing. The mode parameter</div><div class='del'>-   is as in fopen ("rb" or "wb") but can also include a compression level</div><div class='del'>-   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for</div><div class='del'>-   Huffman only compression as in "wb1h", or 'R' for run-length encoding</div><div class='del'>-   as in "wb1R". (See the description of deflateInit2 for more information</div><div class='del'>-   about the strategy parameter.)</div><div class='add'>+ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));</div><div class='add'>+</div><div class='add'>+     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as</div><div class='add'>+   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or</div><div class='add'>+   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only</div><div class='add'>+   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'</div><div class='add'>+   for fixed code compression as in "wb9F".  (See the description of</div><div class='add'>+   deflateInit2 for more information about the strategy parameter.) Also "a"</div><div class='add'>+   can be used instead of "w" to request that the gzip stream that will be</div><div class='add'>+   written be appended to the file.  "+" will result in an error, since reading</div><div class='add'>+   and writing to the same gzip file is not supported.</div><div class='ctx'> </div><div class='ctx'>      gzopen can be used to read a file which is not in gzip format; in this</div><div class='ctx'>    case gzread will directly read from the file without decompression.</div><div class='ctx'> </div><div class='del'>-     gzopen returns NULL if the file could not be opened or if there was</div><div class='del'>-   insufficient memory to allocate the (de)compression state; errno</div><div class='del'>-   can be checked to distinguish the two cases (if errno is zero, the</div><div class='del'>-   zlib error is Z_MEM_ERROR).  */</div><div class='add'>+     gzopen returns NULL if the file could not be opened, if there was</div><div class='add'>+   insufficient memory to allocate the gzFile state, or if an invalid mode was</div><div class='add'>+   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).</div><div class='add'>+   errno can be checked to determine if the reason gzopen failed was that the</div><div class='add'>+   file could not be opened.</div><div class='add'>+*/</div><div class='ctx'> </div><div class='del'>-ZEXTERN gzFile Q_ZEXPORT gzdopen  OF((int fd, const char *mode));</div><div class='add'>+ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));</div><div class='ctx'> /*</div><div class='del'>-     gzdopen() associates a gzFile with the file descriptor fd.  File</div><div class='del'>-   descriptors are obtained from calls like open, dup, creat, pipe or</div><div class='del'>-   fileno (in the file has been previously opened with fopen).</div><div class='del'>-   The mode parameter is as in gzopen.</div><div class='del'>-     The next call of gzclose on the returned gzFile will also close the</div><div class='del'>-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file</div><div class='del'>-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).</div><div class='del'>-     gzdopen returns NULL if there was insufficient memory to allocate</div><div class='del'>-   the (de)compression state.</div><div class='add'>+     gzdopen associates a gzFile with the file descriptor fd.  File descriptors</div><div class='add'>+   are obtained from calls like open, dup, creat, pipe or fileno (if the file</div><div class='add'>+   has been previously opened with fopen).  The mode parameter is as in gzopen.</div><div class='add'>+</div><div class='add'>+     The next call of gzclose on the returned gzFile will also close the file</div><div class='add'>+   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor</div><div class='add'>+   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,</div><div class='add'>+   mode);.  The duplicated descriptor should be saved to avoid a leak, since</div><div class='add'>+   gzdopen does not close fd if it fails.</div><div class='add'>+</div><div class='add'>+     gzdopen returns NULL if there was insufficient memory to allocate the</div><div class='add'>+   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not</div><div class='add'>+   provided, or '+' was provided), or if fd is -1.  The file descriptor is not</div><div class='add'>+   used until the next gz* read, write, seek, or close operation, so gzdopen</div><div class='add'>+   will not detect if fd is invalid (unless fd is -1).</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));</div><div class='add'>+ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));</div><div class='ctx'> /*</div><div class='del'>-     Dynamically update the compression level or strategy. See the description</div><div class='add'>+     Set the internal buffer size used by this library's functions.  The</div><div class='add'>+   default buffer size is 8192 bytes.  This function must be called after</div><div class='add'>+   gzopen() or gzdopen(), and before any other calls that read or write the</div><div class='add'>+   file.  The buffer memory allocation is always deferred to the first read or</div><div class='add'>+   write.  Two buffers are allocated, either both of the specified size when</div><div class='add'>+   writing, or one of the specified size and the other twice that size when</div><div class='add'>+   reading.  A larger buffer size of, for example, 64K or 128K bytes will</div><div class='add'>+   noticeably increase the speed of decompression (reading).</div><div class='add'>+</div><div class='add'>+     The new buffer size also affects the maximum length for gzprintf().</div><div class='add'>+</div><div class='add'>+     gzbuffer() returns 0 on success, or -1 on failure, such as being called</div><div class='add'>+   too late.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));</div><div class='add'>+/*</div><div class='add'>+     Dynamically update the compression level or strategy.  See the description</div><div class='ctx'>    of deflateInit2 for the meaning of these parameters.</div><div class='add'>+</div><div class='ctx'>      gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not</div><div class='ctx'>    opened for writing.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));</div><div class='add'>+ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));</div><div class='ctx'> /*</div><div class='del'>-     Reads the given number of uncompressed bytes from the compressed file.</div><div class='del'>-   If the input file was not in gzip format, gzread copies the given number</div><div class='del'>-   of bytes into the buffer.</div><div class='del'>-     gzread returns the number of uncompressed bytes actually read (0 for</div><div class='del'>-   end of file, -1 for error). */</div><div class='add'>+     Reads the given number of uncompressed bytes from the compressed file.  If</div><div class='add'>+   the input file was not in gzip format, gzread copies the given number of</div><div class='add'>+   bytes into the buffer.</div><div class='add'>+</div><div class='add'>+     After reaching the end of a gzip stream in the input, gzread will continue</div><div class='add'>+   to read, looking for another gzip stream, or failing that, reading the rest</div><div class='add'>+   of the input file directly without decompression.  The entire input file</div><div class='add'>+   will be read if gzread is called until it returns less than the requested</div><div class='add'>+   len.</div><div class='add'>+</div><div class='add'>+     gzread returns the number of uncompressed bytes actually read, less than</div><div class='add'>+   len for end of file, or -1 for error.</div><div class='add'>+*/</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT    gzwrite OF((gzFile file,</div><div class='del'>-                                   voidpc buf, unsigned len));</div><div class='add'>+ZEXTERN int ZEXPORT gzwrite OF((gzFile file,</div><div class='add'>+                                voidpc buf, unsigned len));</div><div class='ctx'> /*</div><div class='ctx'>      Writes the given number of uncompressed bytes into the compressed file.</div><div class='del'>-   gzwrite returns the number of uncompressed bytes actually written</div><div class='del'>-   (0 in case of error).</div><div class='add'>+   gzwrite returns the number of uncompressed bytes written or 0 in case of</div><div class='add'>+   error.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT gzprintf OF((gzFile file, const char *format, ...));</div><div class='add'>+ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));</div><div class='ctx'> /*</div><div class='del'>-     Converts, formats, and writes the args to the compressed file under</div><div class='del'>-   control of the format string, as in fprintf. gzprintf returns the number of</div><div class='del'>-   uncompressed bytes actually written (0 in case of error).  The number of</div><div class='del'>-   uncompressed bytes written is limited to 4095. The caller should assure that</div><div class='del'>-   this limit is not exceeded. If it is exceeded, then gzprintf() will return</div><div class='del'>-   return an error (0) with nothing written. In this case, there may also be a</div><div class='del'>-   buffer overflow with unpredictable consequences, which is possible only if</div><div class='del'>-   zlib was compiled with the insecure functions sprintf() or vsprintf()</div><div class='del'>-   because the secure snprintf() or vsnprintf() functions were not available.</div><div class='add'>+     Converts, formats, and writes the arguments to the compressed file under</div><div class='add'>+   control of the format string, as in fprintf.  gzprintf returns the number of</div><div class='add'>+   uncompressed bytes actually written, or 0 in case of error.  The number of</div><div class='add'>+   uncompressed bytes written is limited to 8191, or one less than the buffer</div><div class='add'>+   size given to gzbuffer().  The caller should assure that this limit is not</div><div class='add'>+   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with</div><div class='add'>+   nothing written.  In this case, there may also be a buffer overflow with</div><div class='add'>+   unpredictable consequences, which is possible only if zlib was compiled with</div><div class='add'>+   the insecure functions sprintf() or vsprintf() because the secure snprintf()</div><div class='add'>+   or vsnprintf() functions were not available.  This can be determined using</div><div class='add'>+   zlibCompileFlags().</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT gzputs OF((gzFile file, const char *s));</div><div class='add'>+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));</div><div class='ctx'> /*</div><div class='del'>-      Writes the given null-terminated string to the compressed file, excluding</div><div class='add'>+     Writes the given null-terminated string to the compressed file, excluding</div><div class='ctx'>    the terminating null character.</div><div class='del'>-      gzputs returns the number of characters written, or -1 in case of error.</div><div class='add'>+</div><div class='add'>+     gzputs returns the number of characters written, or -1 in case of error.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN Q_ZEXPORT char * gzgets OF((gzFile file, char *buf, int len));</div><div class='add'>+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));</div><div class='ctx'> /*</div><div class='del'>-      Reads bytes from the compressed file until len-1 characters are read, or</div><div class='del'>-   a newline character is read and transferred to buf, or an end-of-file</div><div class='del'>-   condition is encountered.  The string is then terminated with a null</div><div class='del'>-   character.</div><div class='del'>-      gzgets returns buf, or Z_NULL in case of error.</div><div class='add'>+     Reads bytes from the compressed file until len-1 characters are read, or a</div><div class='add'>+   newline character is read and transferred to buf, or an end-of-file</div><div class='add'>+   condition is encountered.  If any characters are read or if len == 1, the</div><div class='add'>+   string is terminated with a null character.  If no characters are read due</div><div class='add'>+   to an end-of-file or len &lt; 1, then the buffer is left untouched.</div><div class='add'>+</div><div class='add'>+     gzgets returns buf which is a null-terminated string, or it returns NULL</div><div class='add'>+   for end-of-file or in case of error.  If there was an error, the contents at</div><div class='add'>+   buf are indeterminate.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT    gzputc OF((gzFile file, int c));</div><div class='add'>+ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));</div><div class='ctx'> /*</div><div class='del'>-      Writes c, converted to an unsigned char, into the compressed file.</div><div class='del'>-   gzputc returns the value that was written, or -1 in case of error.</div><div class='add'>+     Writes c, converted to an unsigned char, into the compressed file.  gzputc</div><div class='add'>+   returns the value that was written, or -1 in case of error.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT    gzgetc OF((gzFile file));</div><div class='add'>+ZEXTERN int ZEXPORT gzgetc OF((gzFile file));</div><div class='ctx'> /*</div><div class='del'>-      Reads one byte from the compressed file. gzgetc returns this byte</div><div class='del'>-   or -1 in case of end of file or error.</div><div class='add'>+     Reads one byte from the compressed file.  gzgetc returns this byte or -1</div><div class='add'>+   in case of end of file or error.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));</div><div class='add'>+ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));</div><div class='ctx'> /*</div><div class='del'>-      Push one character back onto the stream to be read again later.</div><div class='del'>-   Only one character of push-back is allowed.  gzungetc() returns the</div><div class='del'>-   character pushed, or -1 on failure.  gzungetc() will fail if a</div><div class='del'>-   character has been pushed but not read yet, or if c is -1. The pushed</div><div class='del'>-   character will be discarded if the stream is repositioned with gzseek()</div><div class='del'>-   or gzrewind().</div><div class='add'>+     Push one character back onto the stream to be read as the first character</div><div class='add'>+   on the next read.  At least one character of push-back is allowed.</div><div class='add'>+   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will</div><div class='add'>+   fail if c is -1, and may fail if a character has been pushed but not read</div><div class='add'>+   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the</div><div class='add'>+   output buffer size of pushed characters is allowed.  (See gzbuffer above.)</div><div class='add'>+   The pushed character will be discarded if the stream is repositioned with</div><div class='add'>+   gzseek() or gzrewind().</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT    gzflush OF((gzFile file, int flush));</div><div class='add'>+ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));</div><div class='ctx'> /*</div><div class='del'>-     Flushes all pending output into the compressed file. The parameter</div><div class='del'>-   flush is as in the deflate() function. The return value is the zlib</div><div class='del'>-   error number (see function gzerror below). gzflush returns Z_OK if</div><div class='del'>-   the flush parameter is Z_FINISH and all output could be flushed.</div><div class='del'>-     gzflush should be called only when strictly necessary because it can</div><div class='del'>-   degrade compression.</div><div class='add'>+     Flushes all pending output into the compressed file.  The parameter flush</div><div class='add'>+   is as in the deflate() function.  The return value is the zlib error number</div><div class='add'>+   (see function gzerror below).  gzflush is only permitted when writing.</div><div class='add'>+</div><div class='add'>+     If the flush parameter is Z_FINISH, the remaining data is written and the</div><div class='add'>+   gzip stream is completed in the output.  If gzwrite() is called again, a new</div><div class='add'>+   gzip stream will be started in the output.  gzread() is able to read such</div><div class='add'>+   concatented gzip streams.</div><div class='add'>+</div><div class='add'>+     gzflush should be called only when strictly necessary because it will</div><div class='add'>+   degrade compression if called too often.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN z_off_t Q_ZEXPORT    gzseek OF((gzFile file,</div><div class='del'>-                                      z_off_t offset, int whence));</div><div class='ctx'> /*</div><div class='del'>-      Sets the starting position for the next gzread or gzwrite on the</div><div class='del'>-   given compressed file. The offset represents a number of bytes in the</div><div class='del'>-   uncompressed data stream. The whence parameter is defined as in lseek(2);</div><div class='add'>+ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,</div><div class='add'>+                                   z_off_t offset, int whence));</div><div class='add'>+</div><div class='add'>+     Sets the starting position for the next gzread or gzwrite on the given</div><div class='add'>+   compressed file.  The offset represents a number of bytes in the</div><div class='add'>+   uncompressed data stream.  The whence parameter is defined as in lseek(2);</div><div class='ctx'>    the value SEEK_END is not supported.</div><div class='add'>+</div><div class='ctx'>      If the file is opened for reading, this function is emulated but can be</div><div class='del'>-   extremely slow. If the file is opened for writing, only forward seeks are</div><div class='add'>+   extremely slow.  If the file is opened for writing, only forward seeks are</div><div class='ctx'>    supported; gzseek then compresses a sequence of zeroes up to the new</div><div class='ctx'>    starting position.</div><div class='ctx'> </div><div class='del'>-      gzseek returns the resulting offset location as measured in bytes from</div><div class='add'>+     gzseek returns the resulting offset location as measured in bytes from</div><div class='ctx'>    the beginning of the uncompressed stream, or -1 in case of error, in</div><div class='ctx'>    particular if the file is opened for writing and the new starting position</div><div class='ctx'>    would be before the current position.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT    gzrewind OF((gzFile file));</div><div class='add'>+ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));</div><div class='ctx'> /*</div><div class='ctx'>      Rewinds the given file. This function is supported only for reading.</div><div class='ctx'> </div><div class='del'>-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)</div><div class='add'>+     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));</div><div class='add'>+</div><div class='add'>+     Returns the starting position for the next gzread or gzwrite on the given</div><div class='add'>+   compressed file.  This position represents a number of bytes in the</div><div class='add'>+   uncompressed data stream, and is zero when starting, even if appending or</div><div class='add'>+   reading a gzip stream from the middle of a file using gzdopen().</div><div class='add'>+</div><div class='add'>+     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN z_off_t Q_ZEXPORT    gztell OF((gzFile file));</div><div class='ctx'> /*</div><div class='del'>-     Returns the starting position for the next gzread or gzwrite on the</div><div class='del'>-   given compressed file. This position represents a number of bytes in the</div><div class='del'>-   uncompressed data stream.</div><div class='add'>+ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));</div><div class='ctx'> </div><div class='del'>-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)</div><div class='add'>+     Returns the current offset in the file being read or written.  This offset</div><div class='add'>+   includes the count of bytes that precede the gzip stream, for example when</div><div class='add'>+   appending or when using gzdopen() for reading.  When reading, the offset</div><div class='add'>+   does not include as yet unused buffered input.  This information can be used</div><div class='add'>+   for a progress indicator.  On error, gzoffset() returns -1.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT gzeof OF((gzFile file));</div><div class='add'>+ZEXTERN int ZEXPORT gzeof OF((gzFile file));</div><div class='ctx'> /*</div><div class='del'>-     Returns 1 when EOF has previously been detected reading the given</div><div class='del'>-   input stream, otherwise zero.</div><div class='add'>+     Returns true (1) if the end-of-file indicator has been set while reading,</div><div class='add'>+   false (0) otherwise.  Note that the end-of-file indicator is set only if the</div><div class='add'>+   read tried to go past the end of the input, but came up short.  Therefore,</div><div class='add'>+   just like feof(), gzeof() may return false even if there is no more data to</div><div class='add'>+   read, in the event that the last read request was for the exact number of</div><div class='add'>+   bytes remaining in the input file.  This will happen if the input file size</div><div class='add'>+   is an exact multiple of the buffer size.</div><div class='add'>+</div><div class='add'>+     If gzeof() returns true, then the read functions will return no more data,</div><div class='add'>+   unless the end-of-file indicator is reset by gzclearerr() and the input file</div><div class='add'>+   has grown since the previous end of file was detected.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> ZEXTERN int ZEXPORT gzdirect OF((gzFile file));</div><div class='ctx'> /*</div><div class='del'>-     Returns 1 if file is being read directly without decompression, otherwise</div><div class='del'>-   zero.</div><div class='add'>+     Returns true (1) if file is being copied directly while reading, or false</div><div class='add'>+   (0) if file is a gzip stream being decompressed.  This state can change from</div><div class='add'>+   false to true while reading the input file if the end of a gzip stream is</div><div class='add'>+   reached, but is followed by data that is not another gzip stream.</div><div class='add'>+</div><div class='add'>+     If the input file is empty, gzdirect() will return true, since the input</div><div class='add'>+   does not contain a gzip stream.</div><div class='add'>+</div><div class='add'>+     If gzdirect() is used immediately after gzopen() or gzdopen() it will</div><div class='add'>+   cause buffers to be allocated to allow reading the file to determine if it</div><div class='add'>+   is a gzip file.  Therefore if gzbuffer() is used, it should be called before</div><div class='add'>+   gzdirect().</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+ZEXTERN int ZEXPORT    gzclose OF((gzFile file));</div><div class='add'>+/*</div><div class='add'>+     Flushes all pending output if necessary, closes the compressed file and</div><div class='add'>+   deallocates the (de)compression state.  Note that once file is closed, you</div><div class='add'>+   cannot call gzerror with file, since its structures have been deallocated.</div><div class='add'>+   gzclose must not be called more than once on the same file, just as free</div><div class='add'>+   must not be called more than once on the same allocation.</div><div class='add'>+</div><div class='add'>+     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a</div><div class='add'>+   file operation error, or Z_OK on success.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN int Q_ZEXPORT    gzclose OF((gzFile file));</div><div class='add'>+ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));</div><div class='add'>+ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));</div><div class='ctx'> /*</div><div class='del'>-     Flushes all pending output if necessary, closes the compressed file</div><div class='del'>-   and deallocates all the (de)compression state. The return value is the zlib</div><div class='del'>-   error number (see function gzerror below).</div><div class='add'>+     Same as gzclose(), but gzclose_r() is only for use when reading, and</div><div class='add'>+   gzclose_w() is only for use when writing or appending.  The advantage to</div><div class='add'>+   using these instead of gzclose() is that they avoid linking in zlib</div><div class='add'>+   compression or decompression code that is not used when only reading or only</div><div class='add'>+   writing respectively.  If gzclose() is used, then both compression and</div><div class='add'>+   decompression code will be included the application when linking to a static</div><div class='add'>+   zlib library.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN Q_ZEXPORT const char * gzerror OF((gzFile file, int *errnum));</div><div class='add'>+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));</div><div class='ctx'> /*</div><div class='del'>-     Returns the error message for the last error which occurred on the</div><div class='del'>-   given compressed file. errnum is set to zlib error number. If an</div><div class='del'>-   error occurred in the file system and not in the compression library,</div><div class='del'>-   errnum is set to Z_ERRNO and the application may consult errno</div><div class='del'>-   to get the exact error code.</div><div class='add'>+     Returns the error message for the last error which occurred on the given</div><div class='add'>+   compressed file.  errnum is set to zlib error number.  If an error occurred</div><div class='add'>+   in the file system and not in the compression library, errnum is set to</div><div class='add'>+   Z_ERRNO and the application may consult errno to get the exact error code.</div><div class='add'>+</div><div class='add'>+     The application must not modify the returned string.  Future calls to</div><div class='add'>+   this function may invalidate the previously returned string.  If file is</div><div class='add'>+   closed, then the string previously returned by gzerror will no longer be</div><div class='add'>+   available.</div><div class='add'>+</div><div class='add'>+     gzerror() should be used to distinguish errors from end-of-file for those</div><div class='add'>+   functions above that do not distinguish those cases in their return values.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));</div><div class='ctx'> /*</div><div class='del'>-     Clears the error and end-of-file flags for file. This is analogous to the</div><div class='del'>-   clearerr() function in stdio. This is useful for continuing to read a gzip</div><div class='add'>+     Clears the error and end-of-file flags for file.  This is analogous to the</div><div class='add'>+   clearerr() function in stdio.  This is useful for continuing to read a gzip</div><div class='ctx'>    file that is being written concurrently.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'>                         /* checksum functions */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>      These functions are not related to compression but are exported</div><div class='del'>-   anyway because they might be useful in applications using the</div><div class='del'>-   compression library.</div><div class='add'>+   anyway because they might be useful in applications using the compression</div><div class='add'>+   library.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN uLong Q_ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));</div><div class='add'>+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));</div><div class='ctx'> /*</div><div class='ctx'>      Update a running Adler-32 checksum with the bytes buf[0..len-1] and</div><div class='del'>-   return the updated checksum. If buf is NULL, this function returns</div><div class='del'>-   the required initial value for the checksum.</div><div class='del'>-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed</div><div class='del'>-   much faster. Usage example:</div><div class='add'>+   return the updated checksum.  If buf is Z_NULL, this function returns the</div><div class='add'>+   required initial value for the checksum.</div><div class='add'>+</div><div class='add'>+     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed</div><div class='add'>+   much faster.</div><div class='add'>+</div><div class='add'>+   Usage example:</div><div class='ctx'> </div><div class='ctx'>      uLong adler = adler32(0L, Z_NULL, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -1284,21 +1494,24 @@ ZEXTERN uLong Q_ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));</div><div class='ctx'>      if (adler != original_adler) error();</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='ctx'> ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,</div><div class='ctx'>                                           z_off_t len2));</div><div class='del'>-/*</div><div class='add'>+</div><div class='ctx'>      Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1</div><div class='ctx'>    and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for</div><div class='ctx'>    each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of</div><div class='ctx'>    seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-ZEXTERN uLong Q_ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));</div><div class='add'>+ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));</div><div class='ctx'> /*</div><div class='ctx'>      Update a running CRC-32 with the bytes buf[0..len-1] and return the</div><div class='del'>-   updated CRC-32. If buf is NULL, this function returns the required initial</div><div class='del'>-   value for the for the crc. Pre- and post-conditioning (one's complement) is</div><div class='del'>-   performed within this function so it shouldn't be done by the application.</div><div class='add'>+   updated CRC-32.  If buf is Z_NULL, this function returns the required</div><div class='add'>+   initial value for the for the crc.  Pre- and post-conditioning (one's</div><div class='add'>+   complement) is performed within this function so it shouldn't be done by the</div><div class='add'>+   application.</div><div class='add'>+</div><div class='ctx'>    Usage example:</div><div class='ctx'> </div><div class='ctx'>      uLong crc = crc32(0L, Z_NULL, 0);</div><div class='hunk'>@@ -1309,9 +1522,9 @@ ZEXTERN uLong Q_ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));</div><div class='ctx'>      if (crc != original_crc) error();</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+/*</div><div class='ctx'> ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));</div><div class='ctx'> </div><div class='del'>-/*</div><div class='ctx'>      Combine two CRC-32 check values into one.  For two sequences of bytes,</div><div class='ctx'>    seq1 and seq2 with lengths len1 and len2, CRC-32 check values were</div><div class='ctx'>    calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32</div><div class='hunk'>@@ -1325,15 +1538,15 @@ ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));</div><div class='ctx'> /* deflateInit and inflateInit are macros to allow checking the zlib version</div><div class='ctx'>  * and the compiler's view of z_stream:</div><div class='ctx'>  */</div><div class='del'>-ZEXTERN int Q_ZEXPORT deflateInit_ OF((z_streamp strm, int level,</div><div class='add'>+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,</div><div class='ctx'>                                      const char *version, int stream_size));</div><div class='del'>-ZEXTERN int Q_ZEXPORT inflateInit_ OF((z_streamp strm,</div><div class='add'>+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,</div><div class='ctx'>                                      const char *version, int stream_size));</div><div class='del'>-ZEXTERN int Q_ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,</div><div class='add'>+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,</div><div class='ctx'>                                       int windowBits, int memLevel,</div><div class='ctx'>                                       int strategy, const char *version,</div><div class='ctx'>                                       int stream_size));</div><div class='del'>-ZEXTERN int Q_ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,</div><div class='add'>+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,</div><div class='ctx'>                                       const char *version, int stream_size));</div><div class='ctx'> ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,</div><div class='ctx'>                                          unsigned char FAR *window,</div><div class='hunk'>@@ -1350,16 +1563,57 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,</div><div class='ctx'>         inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))</div><div class='ctx'> #define inflateBackInit(strm, windowBits, window) \</div><div class='ctx'>         inflateBackInit_((strm), (windowBits), (window), \</div><div class='del'>-        ZLIB_VERSION, sizeof(z_stream))</div><div class='add'>+                                            ZLIB_VERSION, sizeof(z_stream))</div><div class='add'>+</div><div class='add'>+/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or</div><div class='add'>+ * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if</div><div class='add'>+ * both are true, the application gets the *64 functions, and the regular</div><div class='add'>+ * functions are changed to 64 bits) -- in case these are set on systems</div><div class='add'>+ * without large file support, _LFS64_LARGEFILE must also be true</div><div class='add'>+ */</div><div class='add'>+#if defined(_LARGEFILE64_SOURCE) &amp;&amp; _LFS64_LARGEFILE-0</div><div class='add'>+   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));</div><div class='add'>+   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));</div><div class='add'>+   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));</div><div class='add'>+   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));</div><div class='add'>+   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));</div><div class='add'>+   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+#if !defined(ZLIB_INTERNAL) &amp;&amp; _FILE_OFFSET_BITS-0 == 64 &amp;&amp; _LFS64_LARGEFILE-0</div><div class='add'>+#  define gzopen gzopen64</div><div class='add'>+#  define gzseek gzseek64</div><div class='add'>+#  define gztell gztell64</div><div class='add'>+#  define gzoffset gzoffset64</div><div class='add'>+#  define adler32_combine adler32_combine64</div><div class='add'>+#  define crc32_combine crc32_combine64</div><div class='add'>+#  ifdef _LARGEFILE64_SOURCE</div><div class='add'>+     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));</div><div class='add'>+     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));</div><div class='add'>+     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));</div><div class='add'>+     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));</div><div class='add'>+     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));</div><div class='add'>+     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));</div><div class='add'>+#  endif</div><div class='add'>+#else</div><div class='add'>+   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));</div><div class='add'>+   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));</div><div class='add'>+   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));</div><div class='add'>+   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));</div><div class='add'>+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));</div><div class='add'>+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+/* hack for buggy compilers */</div><div class='ctx'> #if !defined(ZUTIL_H) &amp;&amp; !defined(NO_DUMMY_DECL)</div><div class='del'>-    struct internal_state {int dummy;}; /* hack for buggy compilers */</div><div class='add'>+    struct internal_state {int dummy;};</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-ZEXTERN Q_ZEXPORT const char   * zError           OF((int));</div><div class='del'>-ZEXTERN int            Q_ZEXPORT inflateSyncPoint OF((z_streamp z));</div><div class='del'>-ZEXTERN Q_ZEXPORT const uLongf * get_crc_table    OF((void));</div><div class='add'>+/* undocumented functions */</div><div class='add'>+ZEXTERN const char   * ZEXPORT zError           OF((int));</div><div class='add'>+ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));</div><div class='add'>+ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));</div><div class='add'>+ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));</div><div class='ctx'> </div><div class='ctx'> #ifdef __cplusplus</div><div class='ctx'> }</div><div class='head'>diff --git a/src/3rdparty/zlib/zlib.pc.in b/src/3rdparty/zlib/zlib.pc.in<br/>new file mode 100644<br/>index 0000000..7e5acf9<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/zlib.pc.in?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/zlib.pc.in</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+prefix=@prefix@</div><div class='add'>+exec_prefix=@exec_prefix@</div><div class='add'>+libdir=@libdir@</div><div class='add'>+sharedlibdir=@sharedlibdir@</div><div class='add'>+includedir=@includedir@</div><div class='add'>+</div><div class='add'>+Name: zlib</div><div class='add'>+Description: zlib compression library</div><div class='add'>+Version: @VERSION@</div><div class='add'>+</div><div class='add'>+Requires:</div><div class='add'>+Libs: -L${libdir} -L${sharedlibdir} -lz</div><div class='add'>+Cflags: -I${includedir}</div><div class='head'>diff --git a/src/3rdparty/zlib/zutil.c b/src/3rdparty/zlib/zutil.c<br/>index d55f594..898ed34 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/zutil.c?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/zutil.c</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/zutil.c?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/zutil.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* zutil.c -- target dependent utility functions for the compression library</div><div class='del'>- * Copyright (C) 1995-2005 Jean-loup Gailly.</div><div class='add'>+ * Copyright (C) 1995-2005, 2010 Jean-loup Gailly.</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -34,25 +34,25 @@ uLong ZEXPORT zlibCompileFlags()</div><div class='ctx'>     uLong flags;</div><div class='ctx'> </div><div class='ctx'>     flags = 0;</div><div class='del'>-    switch (sizeof(uInt)) {</div><div class='add'>+    switch ((int)(sizeof(uInt))) {</div><div class='ctx'>     case 2:     break;</div><div class='ctx'>     case 4:     flags += 1;     break;</div><div class='ctx'>     case 8:     flags += 2;     break;</div><div class='ctx'>     default:    flags += 3;</div><div class='ctx'>     }</div><div class='del'>-    switch (sizeof(uLong)) {</div><div class='add'>+    switch ((int)(sizeof(uLong))) {</div><div class='ctx'>     case 2:     break;</div><div class='ctx'>     case 4:     flags += 1 &lt;&lt; 2;        break;</div><div class='ctx'>     case 8:     flags += 2 &lt;&lt; 2;        break;</div><div class='ctx'>     default:    flags += 3 &lt;&lt; 2;</div><div class='ctx'>     }</div><div class='del'>-    switch (sizeof(voidpf)) {</div><div class='add'>+    switch ((int)(sizeof(voidpf))) {</div><div class='ctx'>     case 2:     break;</div><div class='ctx'>     case 4:     flags += 1 &lt;&lt; 4;        break;</div><div class='ctx'>     case 8:     flags += 2 &lt;&lt; 4;        break;</div><div class='ctx'>     default:    flags += 3 &lt;&lt; 4;</div><div class='ctx'>     }</div><div class='del'>-    switch (sizeof(z_off_t)) {</div><div class='add'>+    switch ((int)(sizeof(z_off_t))) {</div><div class='ctx'>     case 2:     break;</div><div class='ctx'>     case 4:     flags += 1 &lt;&lt; 6;        break;</div><div class='ctx'>     case 8:     flags += 2 &lt;&lt; 6;        break;</div><div class='hunk'>@@ -117,9 +117,9 @@ uLong ZEXPORT zlibCompileFlags()</div><div class='ctx'> #  ifndef verbose</div><div class='ctx'> #    define verbose 0</div><div class='ctx'> #  endif</div><div class='del'>-int z_verbose = verbose;</div><div class='add'>+int ZLIB_INTERNAL z_verbose = verbose;</div><div class='ctx'> </div><div class='del'>-void z_error (m)</div><div class='add'>+void ZLIB_INTERNAL z_error (m)</div><div class='ctx'>     char *m;</div><div class='ctx'> {</div><div class='ctx'>     fprintf(stderr, "%s\n", m);</div><div class='hunk'>@@ -146,7 +146,7 @@ const char * ZEXPORT zError(err)</div><div class='ctx'> </div><div class='ctx'> #ifndef HAVE_MEMCPY</div><div class='ctx'> </div><div class='del'>-void zmemcpy(dest, source, len)</div><div class='add'>+void ZLIB_INTERNAL zmemcpy(dest, source, len)</div><div class='ctx'>     Bytef* dest;</div><div class='ctx'>     const Bytef* source;</div><div class='ctx'>     uInt  len;</div><div class='hunk'>@@ -157,7 +157,7 @@ void zmemcpy(dest, source, len)</div><div class='ctx'>     } while (--len != 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int zmemcmp(s1, s2, len)</div><div class='add'>+int ZLIB_INTERNAL zmemcmp(s1, s2, len)</div><div class='ctx'>     const Bytef* s1;</div><div class='ctx'>     const Bytef* s2;</div><div class='ctx'>     uInt  len;</div><div class='hunk'>@@ -170,7 +170,7 @@ int zmemcmp(s1, s2, len)</div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void zmemzero(dest, len)</div><div class='add'>+void ZLIB_INTERNAL zmemzero(dest, len)</div><div class='ctx'>     Bytef* dest;</div><div class='ctx'>     uInt  len;</div><div class='ctx'> {</div><div class='hunk'>@@ -213,7 +213,7 @@ local ptr_table table[MAX_PTR];</div><div class='ctx'>  * a protected system like OS/2. Use Microsoft C instead.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)</div><div class='add'>+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)</div><div class='ctx'> {</div><div class='ctx'>     voidpf buf = opaque; /* just to make some compilers happy */</div><div class='ctx'>     ulg bsize = (ulg)items*size;</div><div class='hunk'>@@ -237,7 +237,7 @@ voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)</div><div class='ctx'>     return buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void  zcfree (voidpf opaque, voidpf ptr)</div><div class='add'>+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)</div><div class='ctx'> {</div><div class='ctx'>     int n;</div><div class='ctx'>     if (*(ush*)&amp;ptr != 0) { /* object &lt; 64K */</div><div class='hunk'>@@ -272,13 +272,13 @@ void  zcfree (voidpf opaque, voidpf ptr)</div><div class='ctx'> #  define _hfree   hfree</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)</div><div class='add'>+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)</div><div class='ctx'> {</div><div class='ctx'>     if (opaque) opaque = 0; /* to make compiler happy */</div><div class='ctx'>     return _halloc((long)items, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void  zcfree (voidpf opaque, voidpf ptr)</div><div class='add'>+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)</div><div class='ctx'> {</div><div class='ctx'>     if (opaque) opaque = 0; /* to make compiler happy */</div><div class='ctx'>     _hfree(ptr);</div><div class='hunk'>@@ -297,7 +297,7 @@ extern voidp  calloc OF((uInt items, uInt size));</div><div class='ctx'> extern void   free   OF((voidpf ptr));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-voidpf zcalloc (opaque, items, size)</div><div class='add'>+voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)</div><div class='ctx'>     voidpf opaque;</div><div class='ctx'>     unsigned items;</div><div class='ctx'>     unsigned size;</div><div class='hunk'>@@ -307,7 +307,7 @@ voidpf zcalloc (opaque, items, size)</div><div class='ctx'>                               (voidpf)calloc(items, size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void  zcfree (opaque, ptr)</div><div class='add'>+void ZLIB_INTERNAL zcfree (opaque, ptr)</div><div class='ctx'>     voidpf opaque;</div><div class='ctx'>     voidpf ptr;</div><div class='ctx'> {</div><div class='head'>diff --git a/src/3rdparty/zlib/zutil.h b/src/3rdparty/zlib/zutil.h<br/>index b7d5eff..8e535ac 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/zutil.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/3rdparty/zlib/zutil.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/3rdparty/zlib/zutil.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/3rdparty/zlib/zutil.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* zutil.h -- internal interface and configuration of the compression library</div><div class='del'>- * Copyright (C) 1995-2005 Jean-loup Gailly.</div><div class='add'>+ * Copyright (C) 1995-2010 Jean-loup Gailly.</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -13,31 +13,22 @@</div><div class='ctx'> #ifndef ZUTIL_H</div><div class='ctx'> #define ZUTIL_H</div><div class='ctx'> </div><div class='del'>-#define ZLIB_INTERNAL</div><div class='add'>+#include "qconfig.h"</div><div class='add'>+#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 &gt;= 33) &amp;&amp; !defined(NO_VIZ) &amp;&amp; defined(QT_VISIBILITY_AVAILABLE)</div><div class='add'>+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))</div><div class='add'>+#else</div><div class='add'>+#  define ZLIB_INTERNAL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #include "zlib.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef STDC</div><div class='del'>-#  ifndef _WIN32_WCE</div><div class='add'>+#  if !(defined(_WIN32_WCE) &amp;&amp; defined(_MSC_VER))</div><div class='ctx'> #    include &lt;stddef.h&gt;</div><div class='ctx'> #  endif</div><div class='ctx'> #  include &lt;string.h&gt;</div><div class='ctx'> #  include &lt;stdlib.h&gt;</div><div class='ctx'> #endif</div><div class='del'>-#ifdef NO_ERRNO_H</div><div class='del'>-#   ifdef _WIN32_WCE</div><div class='del'>-      /* The Microsoft C Run-Time Library for Windows CE doesn't have</div><div class='del'>-       * errno.  We define it as a global variable to simplify porting.</div><div class='del'>-       * Its value is always 0 and should not be used.  We rename it to</div><div class='del'>-       * avoid conflict with other libraries that use the same workaround.</div><div class='del'>-       */</div><div class='del'>-#     define errno z_errno</div><div class='del'>-#   endif</div><div class='del'>-    extern int errno;</div><div class='del'>-#else</div><div class='del'>-#  ifndef _WIN32_WCE</div><div class='del'>-#    include &lt;errno.h&gt;</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifndef local</div><div class='ctx'> #  define local static</div><div class='hunk'>@@ -89,7 +80,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */</div><div class='ctx'> #if defined(MSDOS) || (defined(WINDOWS) &amp;&amp; !defined(WIN32))</div><div class='ctx'> #  define OS_CODE  0x00</div><div class='ctx'> #  if defined(__TURBOC__) || defined(__BORLANDC__)</div><div class='del'>-#    if(__STDC__ == 1) &amp;&amp; (defined(__LARGE__) || defined(__COMPACT__))</div><div class='add'>+#    if (__STDC__ == 1) &amp;&amp; (defined(__LARGE__) || defined(__COMPACT__))</div><div class='ctx'>        /* Allow compilation with ANSI keywords only enabled */</div><div class='ctx'>        void _Cdecl farfree( void *block );</div><div class='ctx'>        void *_Cdecl farmalloc( unsigned long nbytes );</div><div class='hunk'>@@ -118,7 +109,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */</div><div class='ctx'> #ifdef OS2</div><div class='ctx'> #  define OS_CODE  0x06</div><div class='ctx'> #  ifdef M_I86</div><div class='del'>-     #include &lt;malloc.h&gt;</div><div class='add'>+#    include &lt;malloc.h&gt;</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -151,7 +142,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */</div><div class='ctx'> #  define fdopen(fd,mode) NULL /* No fdopen() */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if (defined(_MSC_VER) &amp;&amp; (_MSC_VER &gt; 600))</div><div class='add'>+#if (defined(_MSC_VER) &amp;&amp; (_MSC_VER &gt; 600)) &amp;&amp; !defined __INTERIX</div><div class='ctx'> #  if defined(_WIN32_WCE)</div><div class='ctx'> #    define fdopen(fd,mode) NULL /* No fdopen() */</div><div class='ctx'> #    ifndef _PTRDIFF_T_DEFINED</div><div class='hunk'>@@ -163,6 +154,18 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(__BORLANDC__)</div><div class='add'>+  #pragma warn -8004</div><div class='add'>+  #pragma warn -8008</div><div class='add'>+  #pragma warn -8066</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* provide prototypes for these when building zlib without LFS */</div><div class='add'>+#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0</div><div class='add'>+    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));</div><div class='add'>+    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'>         /* common defaults */</div><div class='ctx'> </div><div class='ctx'> #ifndef OS_CODE</div><div class='hunk'>@@ -197,7 +200,9 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */</div><div class='ctx'> #  ifdef WIN32</div><div class='ctx'>      /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */</div><div class='ctx'> #    if !defined(vsnprintf) &amp;&amp; !defined(NO_vsnprintf)</div><div class='del'>-#      define vsnprintf _vsnprintf</div><div class='add'>+#      if !defined(_MSC_VER) || ( defined(_MSC_VER) &amp;&amp; _MSC_VER &lt; 1500 )</div><div class='add'>+#         define vsnprintf _vsnprintf</div><div class='add'>+#      endif</div><div class='ctx'> #    endif</div><div class='ctx'> #  endif</div><div class='ctx'> #  ifdef __SASC</div><div class='hunk'>@@ -232,16 +237,16 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */</div><div class='ctx'> #    define zmemzero(dest, len) memset(dest, 0, len)</div><div class='ctx'> #  endif</div><div class='ctx'> #else</div><div class='del'>-   extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));</div><div class='del'>-   extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));</div><div class='del'>-   extern void zmemzero OF((Bytef* dest, uInt len));</div><div class='add'>+   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));</div><div class='add'>+   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));</div><div class='add'>+   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Diagnostic functions */</div><div class='ctx'> #ifdef DEBUG</div><div class='ctx'> #  include &lt;stdio.h&gt;</div><div class='del'>-   extern int z_verbose;</div><div class='del'>-   extern void z_error    OF((char *m));</div><div class='add'>+   extern int ZLIB_INTERNAL z_verbose;</div><div class='add'>+   extern void ZLIB_INTERNAL z_error OF((char *m));</div><div class='ctx'> #  define Assert(cond,msg) {if(!(cond)) z_error(msg);}</div><div class='ctx'> #  define Trace(x) {if (z_verbose&gt;=0) fprintf x ;}</div><div class='ctx'> #  define Tracev(x) {if (z_verbose&gt;0) fprintf x ;}</div><div class='hunk'>@@ -258,8 +263,9 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));</div><div class='del'>-void   zcfree  OF((voidpf opaque, voidpf ptr));</div><div class='add'>+voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,</div><div class='add'>+                        unsigned size));</div><div class='add'>+void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));</div><div class='ctx'> </div><div class='ctx'> #define ZALLOC(strm, items, size) \</div><div class='ctx'>            (*((strm)-&gt;zalloc))((strm)-&gt;opaque, (items), (size))</div><div class='head'>diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp<br/>index a798cd3..aa51925 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/activeqt/container/qaxbase.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/activeqt/container/qaxbase.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/activeqt/container/qaxbase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/activeqt/container/qaxbase.cpp</a></div><div class='hunk'>@@ -3539,7 +3539,7 @@ int QAxBase::internalProperty(QMetaObject::Call call, int index, void **v)</div><div class='ctx'>                     proptype = 0;</div><div class='ctx'>                 } else if (t == QVariant::UserType) {</div><div class='ctx'>                     qvar = QVariant(qRegisterMetaType&lt;void*&gt;(prop.typeName()), (void**)v[0]);</div><div class='del'>-//                    qVariantSetValue(qvar, *(void**)v[0], prop.typeName());</div><div class='add'>+//                    qvar.setValue(*(void**)v[0], prop.typeName());</div><div class='ctx'>                 } else {</div><div class='ctx'>                     proptype = d-&gt;metaObject()-&gt;propertyType(propname);</div><div class='ctx'>                     qvar = QVariant(t, v[0]);</div><div class='hunk'>@@ -3627,9 +3627,9 @@ int QAxBase::internalInvoke(QMetaObject::Call call, int index, void **v)</div><div class='ctx'> </div><div class='ctx'>         if (!qvar.isValid()) {</div><div class='ctx'>             if (type == "IDispatch*")</div><div class='del'>-                qVariantSetValue(qvar, *(IDispatch**)v[p+1]);</div><div class='add'>+                qvar.setValue(*(IDispatch**)v[p+1]);</div><div class='ctx'>             else if (type == "IUnknown*")</div><div class='del'>-                qVariantSetValue(qvar, *(IUnknown**)v[p+1]);</div><div class='add'>+                qvar.setValue(*(IUnknown**)v[p+1]);</div><div class='ctx'>             else if (type == "QVariant")</div><div class='ctx'>                 qvar = *(QVariant*)v[p + 1];</div><div class='ctx'>             else if (mo-&gt;indexOfEnumerator(type) != -1)</div><div class='hunk'>@@ -4394,15 +4394,15 @@ QVariant QAxBase::asVariant() const</div><div class='ctx'>     QByteArray cn(className());</div><div class='ctx'>     if (cn == "QAxObject" || cn == "QAxWidget" || cn == "QAxBase") {</div><div class='ctx'>         if (d-&gt;dispatch())</div><div class='del'>-            qVariantSetValue(qvar, d-&gt;dispatch());</div><div class='add'>+            qvar.setValue(d-&gt;dispatch());</div><div class='ctx'>         else if (d-&gt;ptr)</div><div class='del'>-            qVariantSetValue(qvar, d-&gt;ptr);</div><div class='add'>+            qvar.setValue(d-&gt;ptr);</div><div class='ctx'>     } else {</div><div class='ctx'>         cn = cn.mid(cn.lastIndexOf(':') + 1);</div><div class='ctx'>         QObject *object = qObject();</div><div class='ctx'>         if (QMetaType::type(cn))</div><div class='ctx'>             qvar = QVariant(qRegisterMetaType&lt;QObject*&gt;(cn + '*'), &amp;object);</div><div class='del'>-//            qVariantSetValue(qvar, qObject(), cn + '*');</div><div class='add'>+//            qvar.setValue(qObject(), cn + '*');</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     return qvar;</div><div class='head'>diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp<br/>index 8583d52..f69ef95 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/activeqt/container/qaxwidget.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/activeqt/container/qaxwidget.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/activeqt/container/qaxwidget.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/activeqt/container/qaxwidget.cpp</a></div><div class='hunk'>@@ -1163,7 +1163,7 @@ HRESULT WINAPI QAxClientSite::InsertMenus(HMENU /*hmenuShared*/, LPOLEMENUGROUPW</div><div class='ctx'>     AX_DEBUG(QAxClientSite::InsertMenus);</div><div class='ctx'>     QMenuBar *mb = menuBar;</div><div class='ctx'>     if (!mb)</div><div class='del'>-        mb = qFindChild&lt;QMenuBar*&gt;(widget-&gt;window());</div><div class='add'>+        mb = widget-&gt;window()-&gt;findChild&lt;QMenuBar*&gt;();</div><div class='ctx'>     if (!mb)</div><div class='ctx'>         return E_NOTIMPL;</div><div class='ctx'>     menuBar = mb;</div><div class='hunk'>@@ -1309,7 +1309,7 @@ HRESULT WINAPI QAxClientSite::SetMenu(HMENU hmenuShared, HOLEMENU holemenu, HWND</div><div class='ctx'>         m_menuOwner = hwndActiveObject;</div><div class='ctx'>         QMenuBar *mb = menuBar;</div><div class='ctx'>         if (!mb)</div><div class='del'>-            mb = qFindChild&lt;QMenuBar*&gt;(widget-&gt;window());</div><div class='add'>+            mb = widget-&gt;window()-&gt;findChild&lt;QMenuBar*&gt;();</div><div class='ctx'>         if (!mb)</div><div class='ctx'>             return E_NOTIMPL;</div><div class='ctx'>         menuBar = mb;</div><div class='head'>diff --git a/src/activeqt/control/qaxserver.cpp b/src/activeqt/control/qaxserver.cpp<br/>index 88b6ce5..1726f92 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/activeqt/control/qaxserver.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/activeqt/control/qaxserver.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/activeqt/control/qaxserver.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/activeqt/control/qaxserver.cpp</a></div><div class='hunk'>@@ -285,7 +285,7 @@ HRESULT UpdateRegistry(BOOL bRegister)</div><div class='ctx'>                     |OLEMISC_RECOMPOSEONRESIZE;</div><div class='ctx'>                 if (!control)</div><div class='ctx'>                     olemisc |= OLEMISC_INVISIBLEATRUNTIME;</div><div class='del'>-                else if (qFindChild&lt;QMenuBar*&gt;(object) &amp;&amp; !qax_disable_inplaceframe)</div><div class='add'>+                else if (object-&gt;findChild&lt;QMenuBar*&gt;() &amp;&amp; !qax_disable_inplaceframe)</div><div class='ctx'>                     olemisc |= OLEMISC_WANTSTOMENUMERGE;</div><div class='ctx'>                 </div><div class='ctx'>                 settings.setValue(QLatin1Char('/') + module + QLatin1Char('.') + className + QLatin1Char('.') + classMajorVersion + QLatin1String("/."), className + QLatin1String(" Class"));</div><div class='head'>diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp<br/>index b7a1a18..a2f9579 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/activeqt/control/qaxserverbase.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/activeqt/control/qaxserverbase.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/activeqt/control/qaxserverbase.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/activeqt/control/qaxserverbase.cpp</a></div><div class='hunk'>@@ -1313,7 +1313,7 @@ bool QAxServerBase::internalCreate()</div><div class='ctx'>     // install an event filter for stock events</div><div class='ctx'>     if (isWidget) {</div><div class='ctx'>         qt.object-&gt;installEventFilter(this);</div><div class='del'>-        const QList&lt;QWidget*&gt; children = qFindChildren&lt;QWidget*&gt;(qt.object);</div><div class='add'>+        const QList&lt;QWidget*&gt; children = qt.object-&gt;findChildren&lt;QWidget*&gt;();</div><div class='ctx'>         QList&lt;QWidget*&gt;::ConstIterator it = children.constBegin();</div><div class='ctx'>         while (it != children.constEnd()) {</div><div class='ctx'>             (*it)-&gt;installEventFilter(this);</div><div class='hunk'>@@ -2047,10 +2047,10 @@ int QAxServerBase::qt_metacall(QMetaObject::Call call, int index, void **argv)</div><div class='ctx'>                         if (vt == QVariant::UserType) {</div><div class='ctx'>                             if (ptype.endsWith('*')) {</div><div class='ctx'>                                 variant = QVariant(QMetaType::type(ptype), (void**)argv[p+1]);</div><div class='del'>-                                // qVariantSetValue(variant, *(void**)(argv[p + 1]), ptype);</div><div class='add'>+                                // variant.setValue(*(void**)(argv[p + 1]), ptype);</div><div class='ctx'>                             } else {</div><div class='ctx'>                                 variant = QVariant(QMetaType::type(ptype), argv[p+1]);</div><div class='del'>-                                // qVariantSetValue(variant, argv[p + 1], ptype);</div><div class='add'>+                                // variant.setValue(argv[p + 1], ptype);</div><div class='ctx'>                             }</div><div class='ctx'>                         } else {</div><div class='ctx'>                             variant = QVariant(vt, argv[p + 1]);</div><div class='hunk'>@@ -2537,7 +2537,7 @@ HRESULT WINAPI QAxServerBase::Invoke(DISPID dispidMember, REFIID riid,</div><div class='ctx'>                 if (!type.isEmpty() &amp;&amp; pvarResult) {</div><div class='ctx'>                     if (!varp[0].isValid() &amp;&amp; type != "QVariant")</div><div class='ctx'>                         varp[0] = QVariant(QMetaType::type(type), argv_pointer);</div><div class='del'>-//                        qVariantSetValue(varp[0], argv_pointer[0], type);</div><div class='add'>+//                        varp[0].setValue(argv_pointer[0], type);</div><div class='ctx'> 		    ok = QVariantToVARIANT(varp[0], *pvarResult, type);</div><div class='ctx'>                 }</div><div class='ctx'> 	    }</div><div class='hunk'>@@ -3325,7 +3325,7 @@ HRESULT WINAPI QAxServerBase::OnAmbientPropertyChange(DISPID dispID)</div><div class='ctx'> 	    break;</div><div class='ctx'> 	{</div><div class='ctx'>             QVariant qvar = VARIANTToQVariant(var, "QFont", QVariant::Font);</div><div class='del'>-            QFont qfont = qVariantValue&lt;QFont&gt;(qvar);</div><div class='add'>+            QFont qfont = qvariant_cast&lt;QFont&gt;(qvar);</div><div class='ctx'>             qt.widget-&gt;setFont(qfont);</div><div class='ctx'> 	}</div><div class='ctx'> 	break;</div><div class='hunk'>@@ -3818,7 +3818,7 @@ HRESULT QAxServerBase::internalActivate()</div><div class='ctx'> 	// Gone active by now, take care of UIACTIVATE</div><div class='ctx'> 	canTakeFocus = qt.widget-&gt;focusPolicy() != Qt::NoFocus &amp;&amp; !inDesignMode;</div><div class='ctx'> 	if (!canTakeFocus &amp;&amp; !inDesignMode) {</div><div class='del'>-	    QList&lt;QWidget*&gt; widgets = qFindChildren&lt;QWidget*&gt;(qt.widget);</div><div class='add'>+	    QList&lt;QWidget*&gt; widgets = qt.widget-&gt;findChildren&lt;QWidget*&gt;();</div><div class='ctx'> 	    for (int w = 0; w &lt; widgets.count(); ++w) {</div><div class='ctx'> 		QWidget *widget = widgets[w];</div><div class='ctx'> 		canTakeFocus = widget-&gt;focusPolicy() != Qt::NoFocus;</div><div class='hunk'>@@ -3844,13 +3844,13 @@ HRESULT QAxServerBase::internalActivate()</div><div class='ctx'> 	    if (m_spInPlaceFrame) {</div><div class='ctx'> 		hr = m_spInPlaceFrame-&gt;SetActiveObject(this, QStringToBSTR(class_name));</div><div class='ctx'> 		if (!FAILED(hr)) {</div><div class='del'>-		    menuBar = (qt.widget &amp;&amp; !qax_disable_inplaceframe) ? qFindChild&lt;QMenuBar*&gt;(qt.widget) : 0;</div><div class='add'>+		    menuBar = (qt.widget &amp;&amp; !qax_disable_inplaceframe) ? qt.widget-&gt;findChild&lt;QMenuBar*&gt;() : 0;</div><div class='ctx'> 		    if (menuBar &amp;&amp; !menuBar-&gt;isVisible()) {</div><div class='ctx'> 			createMenu(menuBar);</div><div class='ctx'> 			menuBar-&gt;hide();</div><div class='ctx'> 			menuBar-&gt;installEventFilter(this);</div><div class='ctx'> 		    }</div><div class='del'>-		    statusBar = qt.widget ? qFindChild&lt;QStatusBar*&gt;(qt.widget) : 0;</div><div class='add'>+		    statusBar = qt.widget ? qt.widget-&gt;findChild&lt;QStatusBar*&gt;() : 0;</div><div class='ctx'> 		    if (statusBar &amp;&amp; !statusBar-&gt;isVisible()) {</div><div class='ctx'> 			const int index = statusBar-&gt;metaObject()-&gt;indexOfSignal("messageChanged(QString)");</div><div class='ctx'> 			QMetaObject::connect(statusBar, index, this, -1);</div><div class='head'>diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp<br/>index b741620..8835caf 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/activeqt/shared/qaxtypes.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/activeqt/shared/qaxtypes.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/activeqt/shared/qaxtypes.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/activeqt/shared/qaxtypes.cpp</a></div><div class='hunk'>@@ -954,20 +954,20 @@ QVariant VARIANTToQVariant(const VARIANT &amp;arg, const QByteArray &amp;typeName, uint</div><div class='ctx'>         break;</div><div class='ctx'>     case VT_I4:</div><div class='ctx'>         if (type == QVariant::Color || (!type &amp;&amp; typeName == "QColor"))</div><div class='del'>-            var = qVariantFromValue(OLEColorToQColor(arg.lVal));</div><div class='add'>+            var = QVariant::fromValue(OLEColorToQColor(arg.lVal));</div><div class='ctx'> #ifndef QT_NO_CURSOR</div><div class='ctx'>         else if (type == QVariant::Cursor || (!type &amp;&amp; (typeName == "QCursor" || typeName == "QCursor*")))</div><div class='del'>-            var = qVariantFromValue(QCursor(static_cast&lt;Qt::CursorShape&gt;(arg.lVal)));</div><div class='add'>+            var = QVariant::fromValue(QCursor(static_cast&lt;Qt::CursorShape&gt;(arg.lVal)));</div><div class='ctx'> #endif</div><div class='ctx'>         else</div><div class='ctx'>             var = (int)arg.lVal;</div><div class='ctx'>         break;</div><div class='ctx'>     case VT_I4|VT_BYREF:</div><div class='ctx'>         if (type == QVariant::Color || (!type &amp;&amp; typeName == "QColor"))</div><div class='del'>-            var = qVariantFromValue(OLEColorToQColor((int)*arg.plVal));</div><div class='add'>+            var = QVariant::fromValue(OLEColorToQColor((int)*arg.plVal));</div><div class='ctx'> #ifndef QT_NO_CURSOR</div><div class='ctx'>         else if (type == QVariant::Cursor || (!type &amp;&amp; (typeName == "QCursor" || typeName == "QCursor*")))</div><div class='del'>-            var = qVariantFromValue(QCursor(static_cast&lt;Qt::CursorShape&gt;(*arg.plVal)));</div><div class='add'>+            var = QVariant::fromValue(QCursor(static_cast&lt;Qt::CursorShape&gt;(*arg.plVal)));</div><div class='ctx'> #endif</div><div class='ctx'>         else</div><div class='ctx'>             var = (int)*arg.plVal;</div><div class='hunk'>@@ -992,20 +992,20 @@ QVariant VARIANTToQVariant(const VARIANT &amp;arg, const QByteArray &amp;typeName, uint</div><div class='ctx'>         break;</div><div class='ctx'>     case VT_UI4:</div><div class='ctx'>         if (type == QVariant::Color || (!type &amp;&amp; typeName == "QColor"))</div><div class='del'>-            var = qVariantFromValue(OLEColorToQColor(arg.ulVal));</div><div class='add'>+            var = QVariant::fromValue(OLEColorToQColor(arg.ulVal));</div><div class='ctx'> #ifndef QT_NO_CURSOR</div><div class='ctx'>         else if (type == QVariant::Cursor || (!type &amp;&amp; (typeName == "QCursor" || typeName == "QCursor*")))</div><div class='del'>-            var = qVariantFromValue(QCursor(static_cast&lt;Qt::CursorShape&gt;(arg.ulVal)));</div><div class='add'>+            var = QVariant::fromValue(QCursor(static_cast&lt;Qt::CursorShape&gt;(arg.ulVal)));</div><div class='ctx'> #endif</div><div class='ctx'>         else</div><div class='ctx'>             var = (int)arg.ulVal;</div><div class='ctx'>         break;</div><div class='ctx'>     case VT_UI4|VT_BYREF:</div><div class='ctx'>         if (type == QVariant::Color || (!type &amp;&amp; typeName == "QColor"))</div><div class='del'>-            var = qVariantFromValue(OLEColorToQColor((uint)*arg.pulVal));</div><div class='add'>+            var = QVariant::fromValue(OLEColorToQColor((uint)*arg.pulVal));</div><div class='ctx'> #ifndef QT_NO_CURSOR</div><div class='ctx'>         else if (type == QVariant::Cursor || (!type &amp;&amp; (typeName == "QCursor" || typeName == "QCursor*")))</div><div class='del'>-            var = qVariantFromValue(QCursor(static_cast&lt;Qt::CursorShape&gt;(*arg.pulVal)));</div><div class='add'>+            var = QVariant::fromValue(QCursor(static_cast&lt;Qt::CursorShape&gt;(*arg.pulVal)));</div><div class='ctx'> #endif</div><div class='ctx'>         else</div><div class='ctx'>             var = (int)*arg.pulVal;</div><div class='hunk'>@@ -1084,20 +1084,20 @@ QVariant VARIANTToQVariant(const VARIANT &amp;arg, const QByteArray &amp;typeName, uint</div><div class='ctx'>                 if (disp)</div><div class='ctx'>                     disp-&gt;QueryInterface(IID_IFont, (void**)&amp;ifont);</div><div class='ctx'>                 if (ifont) {</div><div class='del'>-                    var = qVariantFromValue(IFontToQFont(ifont));</div><div class='add'>+                    var = QVariant::fromValue(IFontToQFont(ifont));</div><div class='ctx'>                     ifont-&gt;Release();</div><div class='ctx'>                 } else {</div><div class='del'>-                    var = qVariantFromValue(QFont());</div><div class='add'>+                    var = QVariant::fromValue(QFont());</div><div class='ctx'>                 }</div><div class='ctx'>             } else if (type == QVariant::Pixmap || (!type &amp;&amp; (typeName == "QPixmap" || typeName == "QPixmap*"))) {</div><div class='ctx'>                 IPicture *ipic = 0;</div><div class='ctx'>                 if (disp)</div><div class='ctx'>                     disp-&gt;QueryInterface(IID_IPicture, (void**)&amp;ipic);</div><div class='ctx'>                 if (ipic) {</div><div class='del'>-                    var = qVariantFromValue(IPictureToQPixmap(ipic));</div><div class='add'>+                    var = QVariant::fromValue(IPictureToQPixmap(ipic));</div><div class='ctx'>                     ipic-&gt;Release();</div><div class='ctx'>                 } else {</div><div class='del'>-                    var = qVariantFromValue(QPixmap());</div><div class='add'>+                    var = QVariant::fromValue(QPixmap());</div><div class='ctx'>                 }</div><div class='ctx'>             } else {</div><div class='ctx'> #ifdef QAX_SERVER</div><div class='hunk'>@@ -1118,7 +1118,7 @@ QVariant VARIANTToQVariant(const VARIANT &amp;arg, const QByteArray &amp;typeName, uint</div><div class='ctx'> #ifndef QAX_SERVER</div><div class='ctx'>                             if (typeName == "QVariant") {</div><div class='ctx'>                                 QAxObject *object = new QAxObject(disp);</div><div class='del'>-                                var = qVariantFromValue&lt;QAxObject*&gt;(object);</div><div class='add'>+                                var = QVariant::fromValue&lt;QAxObject*&gt;(object);</div><div class='ctx'>                             } else if (typeName != "IDispatch*" &amp;&amp; QMetaType::type(typeName)) {</div><div class='ctx'>                                 QByteArray typeNameStr = QByteArray(typeName);</div><div class='ctx'>                                 int pIndex = typeName.lastIndexOf('*');</div><div class='hunk'>@@ -1145,7 +1145,7 @@ QVariant VARIANTToQVariant(const VARIANT &amp;arg, const QByteArray &amp;typeName, uint</div><div class='ctx'>                 unkn = *arg.ppunkVal;</div><div class='ctx'>             else</div><div class='ctx'>                 unkn = arg.punkVal;</div><div class='del'>-            qVariantSetValue(var, unkn);</div><div class='add'>+            var.setValue(unkn);</div><div class='ctx'>         }</div><div class='ctx'>         break;</div><div class='ctx'>     case VT_ARRAY|VT_VARIANT:</div><div class='head'>diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp<br/>index 7b3dcce..a91f282 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/animation/qabstractanimation.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/animation/qabstractanimation.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/animation/qabstractanimation.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/animation/qabstractanimation.cpp</a></div><div class='hunk'>@@ -166,11 +166,12 @@ Q_GLOBAL_STATIC(QThreadStorage&lt;QUnifiedTimer *&gt;, unifiedTimer)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> QUnifiedTimer::QUnifiedTimer() :</div><div class='del'>-    QObject(), lastTick(0), timingInterval(DEFAULT_TIMER_INTERVAL),</div><div class='del'>-    insideTick(false), currentAnimationIdx(0), consistentTiming(false), slowMode(false),</div><div class='add'>+    QObject(), defaultDriver(this), lastTick(0), timingInterval(DEFAULT_TIMER_INTERVAL),</div><div class='add'>+    currentAnimationIdx(0), insideTick(false), consistentTiming(false), slowMode(false),</div><div class='ctx'>     slowdownFactor(5.0f), isPauseTimerActive(false), runningLeafAnimations(0)</div><div class='ctx'> {</div><div class='ctx'>     time.invalidate();</div><div class='add'>+    driver = &amp;defaultDriver;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -253,14 +254,28 @@ void QUnifiedTimer::restartAnimationTimer()</div><div class='ctx'>             qDebug() &lt;&lt; runningPauseAnimations;</div><div class='ctx'>             qDebug() &lt;&lt; closestPauseAnimationTimeToFinish();</div><div class='ctx'>         }</div><div class='add'>+        driver-&gt;stop();</div><div class='ctx'>         animationTimer.start(closestTimeToFinish, this);</div><div class='ctx'>         isPauseTimerActive = true;</div><div class='del'>-    } else if (!animationTimer.isActive() || isPauseTimerActive) {</div><div class='del'>-        animationTimer.start(timingInterval, this);</div><div class='add'>+    } else if (!driver-&gt;isRunning() || isPauseTimerActive) {</div><div class='add'>+        driver-&gt;start();</div><div class='ctx'>         isPauseTimerActive = false;</div><div class='add'>+    } else if (runningLeafAnimations == 0)</div><div class='add'>+        driver-&gt;stop();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QUnifiedTimer::setTimingInterval(int interval)</div><div class='add'>+{</div><div class='add'>+    timingInterval = interval;</div><div class='add'>+</div><div class='add'>+    if (driver-&gt;isRunning() &amp;&amp; !isPauseTimerActive) {</div><div class='add'>+        //we changed the timing interval</div><div class='add'>+        driver-&gt;stop();</div><div class='add'>+        driver-&gt;start();</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> void QUnifiedTimer::timerEvent(QTimerEvent *event)</div><div class='ctx'> {</div><div class='ctx'>     //in the case of consistent timing we make sure the orders in which events come is always the same</div><div class='hunk'>@@ -375,6 +390,140 @@ int QUnifiedTimer::closestPauseAnimationTimeToFinish()</div><div class='ctx'>     return closestTimeToFinish;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void QUnifiedTimer::installAnimationDriver(QAnimationDriver *d)</div><div class='add'>+{</div><div class='add'>+    if (driver-&gt;isRunning()) {</div><div class='add'>+        qWarning("QUnifiedTimer: Cannot change animation driver while animations are running");</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (driver &amp;&amp; driver != &amp;defaultDriver)</div><div class='add'>+        delete driver;</div><div class='add'>+</div><div class='add'>+    driver = d;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+   \class QAnimationDriver</div><div class='add'>+</div><div class='add'>+   \brief The QAnimationDriver class is used to exchange the mechanism that drives animations.</div><div class='add'>+</div><div class='add'>+   The default animation system is driven by a timer that fires at regular intervals.</div><div class='add'>+   In some scenarios, it is better to drive the animation based on other synchronization</div><div class='add'>+   mechanisms, such as the vertical refresh rate of the screen.</div><div class='add'>+</div><div class='add'>+   \internal</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+QAnimationDriver::QAnimationDriver(QObject *parent)</div><div class='add'>+    : QObject(*(new QAnimationDriverPrivate), parent)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QAnimationDriver::QAnimationDriver(QAnimationDriverPrivate &amp;dd, QObject *parent)</div><div class='add'>+    : QObject(dd, parent)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    Advances the animation based on the current time. This function should</div><div class='add'>+    be continuously called by the driver while the animation is running.</div><div class='add'>+</div><div class='add'>+    \internal</div><div class='add'>+ */</div><div class='add'>+void QAnimationDriver::advance()</div><div class='add'>+{</div><div class='add'>+    QUnifiedTimer *instance = QUnifiedTimer::instance();</div><div class='add'>+</div><div class='add'>+    // update current time on all top level animations</div><div class='add'>+    instance-&gt;updateAnimationsTime();</div><div class='add'>+    instance-&gt;restartAnimationTimer();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    Installs this animation driver. The animation driver is thread local and</div><div class='add'>+    will only apply for the thread its installed in.</div><div class='add'>+</div><div class='add'>+    \internal</div><div class='add'>+ */</div><div class='add'>+void QAnimationDriver::install()</div><div class='add'>+{</div><div class='add'>+    QUnifiedTimer *timer = QUnifiedTimer::instance(true);</div><div class='add'>+    timer-&gt;installAnimationDriver(this);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QAnimationDriver::isRunning() const</div><div class='add'>+{</div><div class='add'>+    return d_func()-&gt;running;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void QAnimationDriver::start()</div><div class='add'>+{</div><div class='add'>+    Q_D(QAnimationDriver);</div><div class='add'>+    if (!d-&gt;running) {</div><div class='add'>+        started();</div><div class='add'>+        d-&gt;running = true;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void QAnimationDriver::stop()</div><div class='add'>+{</div><div class='add'>+    Q_D(QAnimationDriver);</div><div class='add'>+    if (d-&gt;running) {</div><div class='add'>+        stopped();</div><div class='add'>+        d-&gt;running = false;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn QAnimationDriver::started()</div><div class='add'>+</div><div class='add'>+    This function is called by the animation framework to notify the driver</div><div class='add'>+    that it should start running.</div><div class='add'>+</div><div class='add'>+    \internal</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn QAnimationDriver::stopped()</div><div class='add'>+</div><div class='add'>+    This function is called by the animation framework to notify the driver</div><div class='add'>+    that it should stop running.</div><div class='add'>+</div><div class='add'>+    \internal</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+   The default animation driver just spins the timer...</div><div class='add'>+ */</div><div class='add'>+QDefaultAnimationDriver::QDefaultAnimationDriver(QUnifiedTimer *timer)</div><div class='add'>+    : QAnimationDriver(0), m_unified_timer(timer)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QDefaultAnimationDriver::timerEvent(QTimerEvent *e)</div><div class='add'>+{</div><div class='add'>+    Q_ASSERT(e-&gt;timerId() == m_timer.timerId());</div><div class='add'>+    Q_UNUSED(e); // if the assertions are disabled</div><div class='add'>+    advance();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QDefaultAnimationDriver::started()</div><div class='add'>+{</div><div class='add'>+    m_timer.start(m_unified_timer-&gt;timingInterval, this);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QDefaultAnimationDriver::stopped()</div><div class='add'>+{</div><div class='add'>+    m_timer.stop();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> void QAbstractAnimationPrivate::setState(QAbstractAnimation::State newState)</div><div class='ctx'> {</div><div class='ctx'>     Q_Q(QAbstractAnimation);</div><div class='hunk'>@@ -800,6 +949,9 @@ void QAbstractAnimation::stop()</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QAbstractAnimation);</div><div class='ctx'> </div><div class='add'>+    if (d-&gt;state == Stopped)</div><div class='add'>+        return;</div><div class='add'>+</div><div class='ctx'>     d-&gt;setState(Stopped);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h<br/>index 655ffc3..0ef952d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/animation/qabstractanimation.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/animation/qabstractanimation.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/animation/qabstractanimation.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/animation/qabstractanimation.h</a></div><div class='hunk'>@@ -54,6 +54,7 @@ QT_MODULE(Core)</div><div class='ctx'> </div><div class='ctx'> class QAnimationGroup;</div><div class='ctx'> class QSequentialAnimationGroup;</div><div class='add'>+class QAnimationDriver;</div><div class='ctx'> </div><div class='ctx'> class QAbstractAnimationPrivate;</div><div class='ctx'> class Q_CORE_EXPORT QAbstractAnimation : public QObject</div><div class='hunk'>@@ -132,6 +133,36 @@ private:</div><div class='ctx'>     Q_DECLARE_PRIVATE(QAbstractAnimation)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+class QAnimationDriverPrivate;</div><div class='add'>+class Q_CORE_EXPORT QAnimationDriver : public QObject</div><div class='add'>+{</div><div class='add'>+    Q_OBJECT</div><div class='add'>+    Q_DECLARE_PRIVATE(QAnimationDriver)</div><div class='add'>+</div><div class='add'>+public:</div><div class='add'>+    QAnimationDriver(QObject *parent = 0);</div><div class='add'>+</div><div class='add'>+    void advance();</div><div class='add'>+    void install();</div><div class='add'>+</div><div class='add'>+    bool isRunning() const;</div><div class='add'>+</div><div class='add'>+protected:</div><div class='add'>+    virtual void started() {};</div><div class='add'>+    virtual void stopped() {};</div><div class='add'>+</div><div class='add'>+    QAnimationDriver(QAnimationDriverPrivate &amp;dd, QObject *parent = 0);</div><div class='add'>+</div><div class='add'>+private:</div><div class='add'>+    friend class QUnifiedTimer;</div><div class='add'>+</div><div class='add'>+    void start();</div><div class='add'>+    void stop();</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #endif //QT_NO_ANIMATION</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/animation/qabstractanimation_p.h b/src/corelib/animation/qabstractanimation_p.h<br/>index c089373..4a6d377 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/animation/qabstractanimation_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/animation/qabstractanimation_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/animation/qabstractanimation_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/animation/qabstractanimation_p.h</a></div><div class='hunk'>@@ -58,6 +58,7 @@</div><div class='ctx'> #include &lt;QtCore/qtimer.h&gt;</div><div class='ctx'> #include &lt;QtCore/qelapsedtimer.h&gt;</div><div class='ctx'> #include &lt;private/qobject_p.h&gt;</div><div class='add'>+#include &lt;qabstractanimation.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef Q_OS_WIN</div><div class='ctx'> #include &lt;qt_windows.h&gt;</div><div class='hunk'>@@ -114,30 +115,47 @@ private:</div><div class='ctx'>     Q_DECLARE_PUBLIC(QAbstractAnimation)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+class QUnifiedTimer;</div><div class='add'>+class QDefaultAnimationDriver : public QAnimationDriver</div><div class='add'>+{</div><div class='add'>+    Q_OBJECT</div><div class='add'>+public:</div><div class='add'>+    QDefaultAnimationDriver(QUnifiedTimer *timer);</div><div class='add'>+    void timerEvent(QTimerEvent *e);</div><div class='add'>+</div><div class='add'>+    void started();</div><div class='add'>+    void stopped();</div><div class='add'>+</div><div class='add'>+private:</div><div class='add'>+    QBasicTimer m_timer;</div><div class='add'>+    QUnifiedTimer *m_unified_timer;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+class Q_CORE_EXPORT QAnimationDriverPrivate : public QObjectPrivate</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    QAnimationDriverPrivate() : running(false) {}</div><div class='add'>+    bool running;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> typedef QElapsedTimer ElapsedTimer;</div><div class='ctx'> </div><div class='del'>-class QUnifiedTimer : public QObject</div><div class='add'>+class Q_CORE_EXPORT QUnifiedTimer : public QObject</div><div class='ctx'> {</div><div class='ctx'> private:</div><div class='ctx'>     QUnifiedTimer();</div><div class='ctx'> </div><div class='ctx'> public:</div><div class='ctx'>     //XXX this is needed by dui</div><div class='del'>-    static Q_CORE_EXPORT QUnifiedTimer *instance();</div><div class='add'>+    static QUnifiedTimer *instance();</div><div class='ctx'>     static QUnifiedTimer *instance(bool create);</div><div class='ctx'> </div><div class='ctx'>     static void registerAnimation(QAbstractAnimation *animation, bool isTopLevel);</div><div class='ctx'>     static void unregisterAnimation(QAbstractAnimation *animation);</div><div class='ctx'> </div><div class='ctx'>     //defines the timing interval. Default is DEFAULT_TIMER_INTERVAL</div><div class='del'>-    void setTimingInterval(int interval)</div><div class='del'>-    {</div><div class='del'>-        timingInterval = interval;</div><div class='del'>-        if (animationTimer.isActive() &amp;&amp; !isPauseTimerActive) {</div><div class='del'>-            //we changed the timing interval</div><div class='del'>-            animationTimer.start(timingInterval, this);</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='add'>+    void setTimingInterval(int interval);</div><div class='ctx'> </div><div class='ctx'>     /*</div><div class='ctx'>        this allows to have a consistent timer interval at each tick from the timer</div><div class='hunk'>@@ -161,11 +179,23 @@ public:</div><div class='ctx'>     */</div><div class='ctx'>     static void updateAnimationTimer();</div><div class='ctx'> </div><div class='add'>+    void installAnimationDriver(QAnimationDriver *driver);</div><div class='add'>+</div><div class='add'>+    void restartAnimationTimer();</div><div class='add'>+    void updateAnimationsTime();</div><div class='add'>+</div><div class='add'>+    //useful for profiling/debugging</div><div class='add'>+    int runningAnimationCount() { return animations.count(); }</div><div class='add'>+</div><div class='ctx'> protected:</div><div class='ctx'>     void timerEvent(QTimerEvent *);</div><div class='ctx'> </div><div class='ctx'> private:</div><div class='del'>-    // timer used for all active (running) animations</div><div class='add'>+    friend class QDefaultAnimationDriver;</div><div class='add'>+</div><div class='add'>+    QAnimationDriver *driver;</div><div class='add'>+    QDefaultAnimationDriver defaultDriver;</div><div class='add'>+</div><div class='ctx'>     QBasicTimer animationTimer;</div><div class='ctx'>     // timer used to delay the check if we should start/stop the animation timer</div><div class='ctx'>     QBasicTimer startStopAnimationTimer;</div><div class='hunk'>@@ -196,9 +226,6 @@ private:</div><div class='ctx'>     void registerRunningAnimation(QAbstractAnimation *animation);</div><div class='ctx'>     void unregisterRunningAnimation(QAbstractAnimation *animation);</div><div class='ctx'> </div><div class='del'>-    void restartAnimationTimer();</div><div class='del'>-</div><div class='del'>-    void updateAnimationsTime();</div><div class='ctx'>     int closestPauseAnimationTimeToFinish();</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri<br/>index 57bc80a..cd23e5e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/arch/arch.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/arch.pri</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/arch/arch.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/arch/arch.pri</a></div><div class='hunk'>@@ -12,6 +12,8 @@ symbian:HEADERS +=  arch/qatomic_symbian.h \</div><div class='ctx'> </div><div class='ctx'> vxworks:HEADERS += arch/qatomic_vxworks.h</div><div class='ctx'> </div><div class='add'>+integrity:HEADERS += arch/qatomic_integrity.h</div><div class='add'>+</div><div class='ctx'> !wince*:!win32:!mac:!symbian:HEADERS += arch/qatomic_alpha.h \</div><div class='ctx'>                        arch/qatomic_avr32.h \</div><div class='ctx'>                        arch/qatomic_ia64.h \</div><div class='hunk'>@@ -21,7 +23,9 @@ vxworks:HEADERS += arch/qatomic_vxworks.h</div><div class='ctx'>                        arch/qatomic_generic.h \</div><div class='ctx'>                        arch/qatomic_powerpc.h \</div><div class='ctx'>                        arch/qatomic_arm.h \</div><div class='add'>+                       arch/qatomic_armv5.h \</div><div class='ctx'>                        arch/qatomic_armv6.h \</div><div class='add'>+                       arch/qatomic_armv7.h \</div><div class='ctx'>                        arch/qatomic_i386.h \</div><div class='ctx'>                        arch/qatomic_mips.h \</div><div class='ctx'>                        arch/qatomic_s390.h \</div><div class='head'>diff --git a/src/corelib/arch/armv6/arch.pri b/src/corelib/arch/armv6/arch.pri<br/>deleted file mode 100644<br/>index fd0cce1..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/arch/armv6/arch.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/armv6/arch.pri</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# ARMv6</div><div class='del'>-#</div><div class='head'>diff --git a/src/corelib/arch/integrity/arch.pri b/src/corelib/arch/integrity/arch.pri<br/>new file mode 100644<br/>index 0000000..2c4196e<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/arch/integrity/arch.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/arch/integrity/arch.pri</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+#</div><div class='add'>+# INTEGRITY RTOS architecture</div><div class='add'>+#</div><div class='head'>diff --git a/src/corelib/arch/qatomic_arch.h b/src/corelib/arch/qatomic_arch.h<br/>index ecf78f7..45b56f6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/arch/qatomic_arch.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/qatomic_arch.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/arch/qatomic_arch.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/arch/qatomic_arch.h</a></div><div class='hunk'>@@ -46,7 +46,9 @@ QT_BEGIN_HEADER</div><div class='ctx'> </div><div class='ctx'> #include "QtCore/qglobal.h"</div><div class='ctx'> </div><div class='del'>-#if defined(QT_ARCH_VXWORKS)</div><div class='add'>+#if defined(QT_ARCH_INTEGRITY)</div><div class='add'>+#  include "QtCore/qatomic_integrity.h"</div><div class='add'>+#elif defined(QT_ARCH_VXWORKS)</div><div class='ctx'> #  include "QtCore/qatomic_vxworks.h"</div><div class='ctx'> #elif defined(QT_ARCH_ALPHA)</div><div class='ctx'> #  include "QtCore/qatomic_alpha.h"</div><div class='hunk'>@@ -88,6 +90,8 @@ QT_BEGIN_HEADER</div><div class='ctx'> #  include "QtCore/qatomic_sh.h"</div><div class='ctx'> #elif defined(QT_ARCH_SH4A)</div><div class='ctx'> #  include "QtCore/qatomic_sh4a.h"</div><div class='add'>+#elif defined(QT_ARCH_NACL)</div><div class='add'>+#  include "QtCore/qatomic_generic.h"</div><div class='ctx'> #else</div><div class='ctx'> #  error "Qt has not been ported to this architecture"</div><div class='ctx'> #endif</div><div class='head'>diff --git a/src/corelib/arch/qatomic_arm.h b/src/corelib/arch/qatomic_arm.h<br/>index 5ac3acc..0f27009 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/arch/qatomic_arm.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/qatomic_arm.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/arch/qatomic_arm.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/arch/qatomic_arm.h</a></div><div class='hunk'>@@ -44,387 +44,32 @@</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_HEADER</div><div class='ctx'> </div><div class='del'>-QT_BEGIN_NAMESPACE</div><div class='del'>-</div><div class='del'>-#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_NOT_NATIVE</div><div class='del'>-</div><div class='del'>-inline bool QBasicAtomicInt::isReferenceCountingNative()</div><div class='del'>-{ return false; }</div><div class='del'>-inline bool QBasicAtomicInt::isReferenceCountingWaitFree()</div><div class='del'>-{ return false; }</div><div class='del'>-</div><div class='del'>-#define Q_ATOMIC_INT_TEST_AND_SET_IS_NOT_NATIVE</div><div class='del'>-</div><div class='del'>-inline bool QBasicAtomicInt::isTestAndSetNative()</div><div class='del'>-{ return false; }</div><div class='del'>-inline bool QBasicAtomicInt::isTestAndSetWaitFree()</div><div class='del'>-{ return false; }</div><div class='del'>-</div><div class='del'>-#define Q_ATOMIC_INT_FETCH_AND_STORE_IS_ALWAYS_NATIVE</div><div class='del'>-#define Q_ATOMIC_INT_FETCH_AND_STORE_IS_WAIT_FREE</div><div class='del'>-</div><div class='del'>-inline bool QBasicAtomicInt::isFetchAndStoreNative()</div><div class='del'>-{ return true; }</div><div class='del'>-inline bool QBasicAtomicInt::isFetchAndStoreWaitFree()</div><div class='del'>-{ return true; }</div><div class='del'>-</div><div class='del'>-#define Q_ATOMIC_INT_FETCH_AND_ADD_IS_NOT_NATIVE</div><div class='del'>-</div><div class='del'>-inline bool QBasicAtomicInt::isFetchAndAddNative()</div><div class='del'>-{ return false; }</div><div class='del'>-inline bool QBasicAtomicInt::isFetchAndAddWaitFree()</div><div class='del'>-{ return false; }</div><div class='del'>-</div><div class='del'>-#define Q_ATOMIC_POINTER_TEST_AND_SET_IS_NOT_NATIVE</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isTestAndSetNative()</div><div class='del'>-{ return false; }</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isTestAndSetWaitFree()</div><div class='del'>-{ return false; }</div><div class='del'>-</div><div class='del'>-#define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_ALWAYS_NATIVE</div><div class='del'>-#define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_WAIT_FREE</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isFetchAndStoreNative()</div><div class='del'>-{ return true; }</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isFetchAndStoreWaitFree()</div><div class='del'>-{ return true; }</div><div class='del'>-</div><div class='del'>-#define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_NOT_NATIVE</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isFetchAndAddNative()</div><div class='del'>-{ return false; }</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isFetchAndAddWaitFree()</div><div class='del'>-{ return false; }</div><div class='del'>-</div><div class='del'>-#ifndef QT_NO_ARM_EABI</div><div class='del'>-</div><div class='del'>-// kernel places a restartable cmpxchg implementation at a fixed address</div><div class='del'>-extern "C" typedef int (qt_atomic_eabi_cmpxchg_int_t)(int oldval, int newval, volatile int *ptr);</div><div class='del'>-extern "C" typedef int (qt_atomic_eabi_cmpxchg_ptr_t)(const void *oldval, const void *newval, volatile void *ptr);</div><div class='del'>-#define qt_atomic_eabi_cmpxchg_int (*reinterpret_cast&lt;qt_atomic_eabi_cmpxchg_int_t *&gt;(0xffff0fc0))</div><div class='del'>-#define qt_atomic_eabi_cmpxchg_ptr (*reinterpret_cast&lt;qt_atomic_eabi_cmpxchg_ptr_t *&gt;(0xffff0fc0)) </div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-extern Q_CORE_EXPORT char q_atomic_lock;</div><div class='del'>-Q_CORE_EXPORT void qt_atomic_yield(int *);</div><div class='del'>-</div><div class='del'>-#ifdef Q_CC_RVCT</div><div class='del'>-</div><div class='del'>-Q_CORE_EXPORT __asm char q_atomic_swp(volatile char *ptr, char newval);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-inline char q_atomic_swp(volatile char *ptr, char newval)</div><div class='del'>-{</div><div class='del'>-    register char ret;</div><div class='del'>-    asm volatile("swpb %0,%2,[%3]"</div><div class='del'>-                 : "=&amp;r"(ret), "=m" (*ptr)</div><div class='del'>-                 : "r"(newval), "r"(ptr)</div><div class='del'>-                 : "cc", "memory");</div><div class='del'>-    return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif // Q_CC_RVCT</div><div class='del'>-</div><div class='del'>-#endif // QT_NO_ARM_EABI</div><div class='del'>-</div><div class='del'>-// Reference counting</div><div class='del'>-</div><div class='del'>-inline bool QBasicAtomicInt::ref()</div><div class='del'>-{</div><div class='del'>-#ifndef QT_NO_ARM_EABI</div><div class='del'>-    register int originalValue;</div><div class='del'>-    register int newValue;</div><div class='del'>-    do {</div><div class='del'>-        originalValue = _q_value;</div><div class='del'>-        newValue = originalValue + 1;</div><div class='del'>-    } while (qt_atomic_eabi_cmpxchg_int(originalValue, newValue, &amp;_q_value) != 0);</div><div class='del'>-    return newValue != 0;</div><div class='del'>-#else</div><div class='del'>-    int count = 0;</div><div class='del'>-    while (q_atomic_swp(&amp;q_atomic_lock, ~0) != 0)</div><div class='del'>-        qt_atomic_yield(&amp;count);</div><div class='del'>-    int originalValue = _q_value++;</div><div class='del'>-    q_atomic_swp(&amp;q_atomic_lock, 0);</div><div class='del'>-    return originalValue != -1;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline bool QBasicAtomicInt::deref()</div><div class='del'>-{</div><div class='del'>-#ifndef QT_NO_ARM_EABI</div><div class='del'>-    register int originalValue;</div><div class='del'>-    register int newValue;</div><div class='del'>-    do {</div><div class='del'>-        originalValue = _q_value;</div><div class='del'>-        newValue = originalValue - 1;</div><div class='del'>-    } while (qt_atomic_eabi_cmpxchg_int(originalValue, newValue, &amp;_q_value) != 0);</div><div class='del'>-    return newValue != 0;</div><div class='del'>-#else</div><div class='del'>-    int count = 0;</div><div class='del'>-    while (q_atomic_swp(&amp;q_atomic_lock, ~0) != 0)</div><div class='del'>-        qt_atomic_yield(&amp;count);</div><div class='del'>-    int originalValue = _q_value--;</div><div class='del'>-    q_atomic_swp(&amp;q_atomic_lock, 0);</div><div class='del'>-    return originalValue != 1;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// Test and set for integers</div><div class='del'>-</div><div class='del'>-inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)</div><div class='del'>-{</div><div class='del'>-#ifndef QT_NO_ARM_EABI</div><div class='del'>-    register int originalValue;</div><div class='del'>-    do {</div><div class='del'>-        originalValue = _q_value;</div><div class='del'>-        if (originalValue != expectedValue)</div><div class='del'>-            return false;</div><div class='del'>-    } while (qt_atomic_eabi_cmpxchg_int(expectedValue, newValue, &amp;_q_value) != 0);</div><div class='del'>-    return true;</div><div class='del'>-#else</div><div class='del'>-    bool returnValue = false;</div><div class='del'>-    int count = 0;</div><div class='del'>-    while (q_atomic_swp(&amp;q_atomic_lock, ~0) != 0)</div><div class='del'>-        qt_atomic_yield(&amp;count);</div><div class='del'>-    if (_q_value == expectedValue) {</div><div class='del'>-	_q_value = newValue;</div><div class='del'>-	returnValue = true;</div><div class='del'>-    }</div><div class='del'>-    q_atomic_swp(&amp;q_atomic_lock, 0);</div><div class='del'>-    return returnValue;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)</div><div class='del'>-{</div><div class='del'>-    return testAndSetOrdered(expectedValue, newValue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue)</div><div class='del'>-{</div><div class='del'>-    return testAndSetOrdered(expectedValue, newValue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)</div><div class='del'>-{</div><div class='del'>-    return testAndSetOrdered(expectedValue, newValue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// Fetch and store for integers</div><div class='del'>-</div><div class='del'>-#ifndef Q_CC_RVCT</div><div class='del'>-</div><div class='del'>-inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)</div><div class='del'>-{</div><div class='del'>-    int originalValue;</div><div class='del'>-    asm volatile("swp %0,%2,[%3]"</div><div class='del'>-                 : "=&amp;r"(originalValue), "=m" (_q_value)</div><div class='del'>-                 : "r"(newValue), "r"(&amp;_q_value)</div><div class='del'>-                 : "cc", "memory");</div><div class='del'>-    return originalValue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)</div><div class='del'>-{</div><div class='del'>-    return fetchAndStoreOrdered(newValue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue)</div><div class='del'>-{</div><div class='del'>-    return fetchAndStoreOrdered(newValue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue)</div><div class='del'>-{</div><div class='del'>-    return fetchAndStoreOrdered(newValue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// Fetch and add for integers</div><div class='del'>-</div><div class='del'>-inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)</div><div class='del'>-{</div><div class='del'>-#ifndef QT_NO_ARM_EABI</div><div class='del'>-    register int originalValue;</div><div class='del'>-    register int newValue;</div><div class='del'>-    do {</div><div class='del'>-        originalValue = _q_value;</div><div class='del'>-        newValue = originalValue + valueToAdd;</div><div class='del'>-    } while (qt_atomic_eabi_cmpxchg_int(originalValue, newValue, &amp;_q_value) != 0);</div><div class='del'>-    return originalValue;</div><div class='del'>-#else</div><div class='del'>-    int count = 0;</div><div class='del'>-    while (q_atomic_swp(&amp;q_atomic_lock, ~0) != 0)</div><div class='del'>-        qt_atomic_yield(&amp;count);</div><div class='del'>-    int originalValue = _q_value;</div><div class='del'>-    _q_value += valueToAdd;</div><div class='del'>-    q_atomic_swp(&amp;q_atomic_lock, 0);</div><div class='del'>-    return originalValue;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)</div><div class='del'>-{</div><div class='del'>-    return fetchAndAddOrdered(valueToAdd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd)</div><div class='del'>-{</div><div class='del'>-    return fetchAndAddOrdered(valueToAdd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)</div><div class='del'>-{</div><div class='del'>-    return fetchAndAddOrdered(valueToAdd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// Test and set for pointers</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetOrdered(T *expectedValue, T *newValue)</div><div class='del'>-{</div><div class='del'>-#ifndef QT_NO_ARM_EABI</div><div class='del'>-    register T *originalValue;</div><div class='del'>-    do {</div><div class='del'>-        originalValue = _q_value;</div><div class='del'>-        if (originalValue != expectedValue)</div><div class='del'>-            return false;</div><div class='del'>-    } while (qt_atomic_eabi_cmpxchg_ptr(expectedValue, newValue, &amp;_q_value) != 0);</div><div class='del'>-    return true;</div><div class='add'>+#if defined(__ARM_ARCH_7__) \</div><div class='add'>+    || defined(__ARM_ARCH_7A__) \</div><div class='add'>+    || defined(__ARM_ARCH_7R__) \</div><div class='add'>+    || defined(__ARM_ARCH_7M__)</div><div class='add'>+# define QT_ARCH_ARMV7</div><div class='add'>+QT_BEGIN_INCLUDE_HEADER</div><div class='add'>+# include "QtCore/qatomic_armv7.h"</div><div class='add'>+QT_END_INCLUDE_HEADER</div><div class='add'>+#elif defined(__ARM_ARCH_6__) \</div><div class='add'>+    || defined(__ARM_ARCH_6J__) \</div><div class='add'>+    || defined(__ARM_ARCH_6T2__) \</div><div class='add'>+    || defined(__ARM_ARCH_6Z__) \</div><div class='add'>+    || defined(__ARM_ARCH_6K__) \</div><div class='add'>+    || defined(__ARM_ARCH_6ZK__) \</div><div class='add'>+    || defined(__ARM_ARCH_6M__) \</div><div class='add'>+    || (defined(__TARGET_ARCH_ARM) &amp;&amp; (__TARGET_ARCH_ARM-0 &gt;= 6))</div><div class='add'>+# define QT_ARCH_ARMV6</div><div class='add'>+QT_BEGIN_INCLUDE_HEADER</div><div class='add'>+# include "QtCore/qatomic_armv6.h"</div><div class='add'>+QT_END_INCLUDE_HEADER</div><div class='ctx'> #else</div><div class='del'>-    bool returnValue = false;</div><div class='del'>-    int count = 0;</div><div class='del'>-    while (q_atomic_swp(&amp;q_atomic_lock, ~0) != 0)</div><div class='del'>-        qt_atomic_yield(&amp;count);</div><div class='del'>-    if (_q_value == expectedValue) {</div><div class='del'>-	_q_value = newValue;</div><div class='del'>-	returnValue = true;</div><div class='del'>-    }</div><div class='del'>-    q_atomic_swp(&amp;q_atomic_lock, 0);</div><div class='del'>-    return returnValue;</div><div class='add'>+# define QT_ARCH_ARMV5</div><div class='add'>+QT_BEGIN_INCLUDE_HEADER</div><div class='add'>+# include "QtCore/qatomic_armv5.h"</div><div class='add'>+QT_END_INCLUDE_HEADER</div><div class='ctx'> #endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetRelaxed(T *expectedValue, T *newValue)</div><div class='del'>-{</div><div class='del'>-    return testAndSetOrdered(expectedValue, newValue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetAcquire(T *expectedValue, T *newValue)</div><div class='del'>-{</div><div class='del'>-    return testAndSetOrdered(expectedValue, newValue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetRelease(T *expectedValue, T *newValue)</div><div class='del'>-{</div><div class='del'>-    return testAndSetOrdered(expectedValue, newValue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// Fetch and store for pointers</div><div class='del'>-</div><div class='del'>-#ifdef Q_CC_RVCT</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-__asm T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreOrdered(T *newValue)</div><div class='del'>-{</div><div class='del'>-    add r2, pc, #0</div><div class='del'>-    bx r2</div><div class='del'>-    arm</div><div class='del'>-    swp r2,r1,[r0]</div><div class='del'>-    mov r0, r2</div><div class='del'>-    bx lr</div><div class='del'>-    thumb</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreOrdered(T *newValue)</div><div class='del'>-{</div><div class='del'>-    T *originalValue;</div><div class='del'>-    asm volatile("swp %0,%2,[%3]"</div><div class='del'>-                 : "=&amp;r"(originalValue), "=m" (_q_value)</div><div class='del'>-                 : "r"(newValue), "r"(&amp;_q_value)</div><div class='del'>-                 : "cc", "memory");</div><div class='del'>-    return originalValue;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif // Q_CC_RVCT</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreRelaxed(T *newValue)</div><div class='del'>-{</div><div class='del'>-    return fetchAndStoreOrdered(newValue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreAcquire(T *newValue)</div><div class='del'>-{</div><div class='del'>-    return fetchAndStoreOrdered(newValue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreRelease(T *newValue)</div><div class='del'>-{</div><div class='del'>-    return fetchAndStoreOrdered(newValue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// Fetch and add for pointers</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddOrdered(qptrdiff valueToAdd)</div><div class='del'>-{</div><div class='del'>-#ifndef QT_NO_ARM_EABI</div><div class='del'>-    register T *originalValue;</div><div class='del'>-    register T *newValue;</div><div class='del'>-    do {</div><div class='del'>-        originalValue = _q_value;</div><div class='del'>-        newValue = originalValue + valueToAdd;</div><div class='del'>-    } while (qt_atomic_eabi_cmpxchg_ptr(originalValue, newValue, &amp;_q_value) != 0);</div><div class='del'>-    return originalValue;</div><div class='del'>-#else</div><div class='del'>-    int count = 0;</div><div class='del'>-    while (q_atomic_swp(&amp;q_atomic_lock, ~0) != 0)</div><div class='del'>-        qt_atomic_yield(&amp;count);</div><div class='del'>-    T *originalValue = (_q_value);</div><div class='del'>-    _q_value += valueToAdd;</div><div class='del'>-    q_atomic_swp(&amp;q_atomic_lock, 0);</div><div class='del'>-    return originalValue;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddRelaxed(qptrdiff valueToAdd)</div><div class='del'>-{</div><div class='del'>-    return fetchAndAddOrdered(valueToAdd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddAcquire(qptrdiff valueToAdd)</div><div class='del'>-{</div><div class='del'>-    return fetchAndAddOrdered(valueToAdd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddRelease(qptrdiff valueToAdd)</div><div class='del'>-{</div><div class='del'>-    return fetchAndAddOrdered(valueToAdd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> QT_END_HEADER</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/arch/qatomic_armv5.h b/src/corelib/arch/qatomic_armv5.h<br/>new file mode 100644<br/>index 0000000..2a18042<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/arch/qatomic_armv5.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/arch/qatomic_armv5.h</a></div><div class='hunk'>@@ -0,0 +1,431 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QATOMIC_ARMV5_H</div><div class='add'>+#define QATOMIC_ARMV5_H</div><div class='add'>+</div><div class='add'>+QT_BEGIN_HEADER</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_NOT_NATIVE</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::isReferenceCountingNative()</div><div class='add'>+{ return false; }</div><div class='add'>+inline bool QBasicAtomicInt::isReferenceCountingWaitFree()</div><div class='add'>+{ return false; }</div><div class='add'>+</div><div class='add'>+#define Q_ATOMIC_INT_TEST_AND_SET_IS_NOT_NATIVE</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::isTestAndSetNative()</div><div class='add'>+{ return false; }</div><div class='add'>+inline bool QBasicAtomicInt::isTestAndSetWaitFree()</div><div class='add'>+{ return false; }</div><div class='add'>+</div><div class='add'>+#define Q_ATOMIC_INT_FETCH_AND_STORE_IS_ALWAYS_NATIVE</div><div class='add'>+#define Q_ATOMIC_INT_FETCH_AND_STORE_IS_WAIT_FREE</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::isFetchAndStoreNative()</div><div class='add'>+{ return true; }</div><div class='add'>+inline bool QBasicAtomicInt::isFetchAndStoreWaitFree()</div><div class='add'>+{ return true; }</div><div class='add'>+</div><div class='add'>+#define Q_ATOMIC_INT_FETCH_AND_ADD_IS_NOT_NATIVE</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::isFetchAndAddNative()</div><div class='add'>+{ return false; }</div><div class='add'>+inline bool QBasicAtomicInt::isFetchAndAddWaitFree()</div><div class='add'>+{ return false; }</div><div class='add'>+</div><div class='add'>+#define Q_ATOMIC_POINTER_TEST_AND_SET_IS_NOT_NATIVE</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isTestAndSetNative()</div><div class='add'>+{ return false; }</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isTestAndSetWaitFree()</div><div class='add'>+{ return false; }</div><div class='add'>+</div><div class='add'>+#define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_ALWAYS_NATIVE</div><div class='add'>+#define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_WAIT_FREE</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isFetchAndStoreNative()</div><div class='add'>+{ return true; }</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isFetchAndStoreWaitFree()</div><div class='add'>+{ return true; }</div><div class='add'>+</div><div class='add'>+#define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_NOT_NATIVE</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isFetchAndAddNative()</div><div class='add'>+{ return false; }</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isFetchAndAddWaitFree()</div><div class='add'>+{ return false; }</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_ARM_EABI</div><div class='add'>+</div><div class='add'>+// kernel places a restartable cmpxchg implementation at a fixed address</div><div class='add'>+extern "C" typedef int (qt_atomic_eabi_cmpxchg_int_t)(int oldval, int newval, volatile int *ptr);</div><div class='add'>+extern "C" typedef int (qt_atomic_eabi_cmpxchg_ptr_t)(const void *oldval, const void *newval, volatile void *ptr);</div><div class='add'>+#define qt_atomic_eabi_cmpxchg_int (*reinterpret_cast&lt;qt_atomic_eabi_cmpxchg_int_t *&gt;(0xffff0fc0))</div><div class='add'>+#define qt_atomic_eabi_cmpxchg_ptr (*reinterpret_cast&lt;qt_atomic_eabi_cmpxchg_ptr_t *&gt;(0xffff0fc0)) </div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+extern Q_CORE_EXPORT char q_atomic_lock;</div><div class='add'>+Q_CORE_EXPORT void qt_atomic_yield(int *);</div><div class='add'>+</div><div class='add'>+#ifdef Q_CC_RVCT</div><div class='add'>+</div><div class='add'>+Q_CORE_EXPORT __asm char q_atomic_swp(volatile char *ptr, char newval);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+inline char q_atomic_swp(volatile char *ptr, char newval)</div><div class='add'>+{</div><div class='add'>+    register char ret;</div><div class='add'>+    asm volatile("swpb %0,%2,[%3]"</div><div class='add'>+                 : "=&amp;r"(ret), "=m" (*ptr)</div><div class='add'>+                 : "r"(newval), "r"(ptr)</div><div class='add'>+                 : "cc", "memory");</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif // Q_CC_RVCT</div><div class='add'>+</div><div class='add'>+#endif // QT_NO_ARM_EABI</div><div class='add'>+</div><div class='add'>+// Reference counting</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::ref()</div><div class='add'>+{</div><div class='add'>+#ifndef QT_NO_ARM_EABI</div><div class='add'>+    register int originalValue;</div><div class='add'>+    register int newValue;</div><div class='add'>+    do {</div><div class='add'>+        originalValue = _q_value;</div><div class='add'>+        newValue = originalValue + 1;</div><div class='add'>+    } while (qt_atomic_eabi_cmpxchg_int(originalValue, newValue, &amp;_q_value) != 0);</div><div class='add'>+    return newValue != 0;</div><div class='add'>+#else</div><div class='add'>+    int count = 0;</div><div class='add'>+    while (q_atomic_swp(&amp;q_atomic_lock, ~0) != 0)</div><div class='add'>+        qt_atomic_yield(&amp;count);</div><div class='add'>+    int originalValue = _q_value++;</div><div class='add'>+    q_atomic_swp(&amp;q_atomic_lock, 0);</div><div class='add'>+    return originalValue != -1;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::deref()</div><div class='add'>+{</div><div class='add'>+#ifndef QT_NO_ARM_EABI</div><div class='add'>+    register int originalValue;</div><div class='add'>+    register int newValue;</div><div class='add'>+    do {</div><div class='add'>+        originalValue = _q_value;</div><div class='add'>+        newValue = originalValue - 1;</div><div class='add'>+    } while (qt_atomic_eabi_cmpxchg_int(originalValue, newValue, &amp;_q_value) != 0);</div><div class='add'>+    return newValue != 0;</div><div class='add'>+#else</div><div class='add'>+    int count = 0;</div><div class='add'>+    while (q_atomic_swp(&amp;q_atomic_lock, ~0) != 0)</div><div class='add'>+        qt_atomic_yield(&amp;count);</div><div class='add'>+    int originalValue = _q_value--;</div><div class='add'>+    q_atomic_swp(&amp;q_atomic_lock, 0);</div><div class='add'>+    return originalValue != 1;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Test and set for integers</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)</div><div class='add'>+{</div><div class='add'>+#ifndef QT_NO_ARM_EABI</div><div class='add'>+    register int originalValue;</div><div class='add'>+    do {</div><div class='add'>+        originalValue = _q_value;</div><div class='add'>+        if (originalValue != expectedValue)</div><div class='add'>+            return false;</div><div class='add'>+    } while (qt_atomic_eabi_cmpxchg_int(expectedValue, newValue, &amp;_q_value) != 0);</div><div class='add'>+    return true;</div><div class='add'>+#else</div><div class='add'>+    bool returnValue = false;</div><div class='add'>+    int count = 0;</div><div class='add'>+    while (q_atomic_swp(&amp;q_atomic_lock, ~0) != 0)</div><div class='add'>+        qt_atomic_yield(&amp;count);</div><div class='add'>+    if (_q_value == expectedValue) {</div><div class='add'>+	_q_value = newValue;</div><div class='add'>+	returnValue = true;</div><div class='add'>+    }</div><div class='add'>+    q_atomic_swp(&amp;q_atomic_lock, 0);</div><div class='add'>+    return returnValue;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)</div><div class='add'>+{</div><div class='add'>+    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue)</div><div class='add'>+{</div><div class='add'>+    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)</div><div class='add'>+{</div><div class='add'>+    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Fetch and store for integers</div><div class='add'>+</div><div class='add'>+#ifndef Q_CC_RVCT</div><div class='add'>+</div><div class='add'>+inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)</div><div class='add'>+{</div><div class='add'>+    int originalValue;</div><div class='add'>+    asm volatile("swp %0,%2,[%3]"</div><div class='add'>+                 : "=&amp;r"(originalValue), "=m" (_q_value)</div><div class='add'>+                 : "r"(newValue), "r"(&amp;_q_value)</div><div class='add'>+                 : "cc", "memory");</div><div class='add'>+    return originalValue;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)</div><div class='add'>+{</div><div class='add'>+    return fetchAndStoreOrdered(newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue)</div><div class='add'>+{</div><div class='add'>+    return fetchAndStoreOrdered(newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue)</div><div class='add'>+{</div><div class='add'>+    return fetchAndStoreOrdered(newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Fetch and add for integers</div><div class='add'>+</div><div class='add'>+inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)</div><div class='add'>+{</div><div class='add'>+#ifndef QT_NO_ARM_EABI</div><div class='add'>+    register int originalValue;</div><div class='add'>+    register int newValue;</div><div class='add'>+    do {</div><div class='add'>+        originalValue = _q_value;</div><div class='add'>+        newValue = originalValue + valueToAdd;</div><div class='add'>+    } while (qt_atomic_eabi_cmpxchg_int(originalValue, newValue, &amp;_q_value) != 0);</div><div class='add'>+    return originalValue;</div><div class='add'>+#else</div><div class='add'>+    int count = 0;</div><div class='add'>+    while (q_atomic_swp(&amp;q_atomic_lock, ~0) != 0)</div><div class='add'>+        qt_atomic_yield(&amp;count);</div><div class='add'>+    int originalValue = _q_value;</div><div class='add'>+    _q_value += valueToAdd;</div><div class='add'>+    q_atomic_swp(&amp;q_atomic_lock, 0);</div><div class='add'>+    return originalValue;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)</div><div class='add'>+{</div><div class='add'>+    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd)</div><div class='add'>+{</div><div class='add'>+    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)</div><div class='add'>+{</div><div class='add'>+    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Test and set for pointers</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetOrdered(T *expectedValue, T *newValue)</div><div class='add'>+{</div><div class='add'>+#ifndef QT_NO_ARM_EABI</div><div class='add'>+    register T *originalValue;</div><div class='add'>+    do {</div><div class='add'>+        originalValue = _q_value;</div><div class='add'>+        if (originalValue != expectedValue)</div><div class='add'>+            return false;</div><div class='add'>+    } while (qt_atomic_eabi_cmpxchg_ptr(expectedValue, newValue, &amp;_q_value) != 0);</div><div class='add'>+    return true;</div><div class='add'>+#else</div><div class='add'>+    bool returnValue = false;</div><div class='add'>+    int count = 0;</div><div class='add'>+    while (q_atomic_swp(&amp;q_atomic_lock, ~0) != 0)</div><div class='add'>+        qt_atomic_yield(&amp;count);</div><div class='add'>+    if (_q_value == expectedValue) {</div><div class='add'>+	_q_value = newValue;</div><div class='add'>+	returnValue = true;</div><div class='add'>+    }</div><div class='add'>+    q_atomic_swp(&amp;q_atomic_lock, 0);</div><div class='add'>+    return returnValue;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetRelaxed(T *expectedValue, T *newValue)</div><div class='add'>+{</div><div class='add'>+    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetAcquire(T *expectedValue, T *newValue)</div><div class='add'>+{</div><div class='add'>+    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetRelease(T *expectedValue, T *newValue)</div><div class='add'>+{</div><div class='add'>+    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Fetch and store for pointers</div><div class='add'>+</div><div class='add'>+#ifdef Q_CC_RVCT</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+__asm T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreOrdered(T *newValue)</div><div class='add'>+{</div><div class='add'>+    add r2, pc, #0</div><div class='add'>+    bx r2</div><div class='add'>+    arm</div><div class='add'>+    swp r2,r1,[r0]</div><div class='add'>+    mov r0, r2</div><div class='add'>+    bx lr</div><div class='add'>+    thumb</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreOrdered(T *newValue)</div><div class='add'>+{</div><div class='add'>+    T *originalValue;</div><div class='add'>+    asm volatile("swp %0,%2,[%3]"</div><div class='add'>+                 : "=&amp;r"(originalValue), "=m" (_q_value)</div><div class='add'>+                 : "r"(newValue), "r"(&amp;_q_value)</div><div class='add'>+                 : "cc", "memory");</div><div class='add'>+    return originalValue;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif // Q_CC_RVCT</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreRelaxed(T *newValue)</div><div class='add'>+{</div><div class='add'>+    return fetchAndStoreOrdered(newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreAcquire(T *newValue)</div><div class='add'>+{</div><div class='add'>+    return fetchAndStoreOrdered(newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreRelease(T *newValue)</div><div class='add'>+{</div><div class='add'>+    return fetchAndStoreOrdered(newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Fetch and add for pointers</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddOrdered(qptrdiff valueToAdd)</div><div class='add'>+{</div><div class='add'>+#ifndef QT_NO_ARM_EABI</div><div class='add'>+    register T *originalValue;</div><div class='add'>+    register T *newValue;</div><div class='add'>+    do {</div><div class='add'>+        originalValue = _q_value;</div><div class='add'>+        newValue = originalValue + valueToAdd;</div><div class='add'>+    } while (qt_atomic_eabi_cmpxchg_ptr(originalValue, newValue, &amp;_q_value) != 0);</div><div class='add'>+    return originalValue;</div><div class='add'>+#else</div><div class='add'>+    int count = 0;</div><div class='add'>+    while (q_atomic_swp(&amp;q_atomic_lock, ~0) != 0)</div><div class='add'>+        qt_atomic_yield(&amp;count);</div><div class='add'>+    T *originalValue = (_q_value);</div><div class='add'>+    _q_value += valueToAdd;</div><div class='add'>+    q_atomic_swp(&amp;q_atomic_lock, 0);</div><div class='add'>+    return originalValue;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddRelaxed(qptrdiff valueToAdd)</div><div class='add'>+{</div><div class='add'>+    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddAcquire(qptrdiff valueToAdd)</div><div class='add'>+{</div><div class='add'>+    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddRelease(qptrdiff valueToAdd)</div><div class='add'>+{</div><div class='add'>+    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+QT_END_HEADER</div><div class='add'>+</div><div class='add'>+#endif // QATOMIC_ARMV5_H</div><div class='head'>diff --git a/src/corelib/arch/qatomic_armv6.h b/src/corelib/arch/qatomic_armv6.h<br/>index 4b58953..96b561e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/arch/qatomic_armv6.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/qatomic_armv6.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/arch/qatomic_armv6.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/arch/qatomic_armv6.h</a></div><div class='hunk'>@@ -45,6 +45,7 @@</div><div class='ctx'> QT_BEGIN_HEADER</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='ctx'> #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE</div><div class='ctx'> </div><div class='ctx'> inline bool QBasicAtomicInt::isReferenceCountingNative()</div><div class='hunk'>@@ -102,6 +103,13 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isFetchAndAddWaitFree()</div><div class='ctx'> </div><div class='ctx'> #ifndef Q_CC_RVCT</div><div class='ctx'> </div><div class='add'>+#ifndef Q_DATA_MEMORY_BARRIER</div><div class='add'>+# define Q_DATA_MEMORY_BARRIER asm volatile("":::"memory")</div><div class='add'>+#endif</div><div class='add'>+#ifndef Q_COMPILER_MEMORY_BARRIER</div><div class='add'>+# define Q_COMPILER_MEMORY_BARRIER asm volatile("":::"memory")</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> inline bool QBasicAtomicInt::ref()</div><div class='ctx'> {</div><div class='ctx'>     register int newValue;</div><div class='hunk'>@@ -138,7 +146,7 @@ inline bool QBasicAtomicInt::deref()</div><div class='ctx'>     return newValue != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)</div><div class='add'>+inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)</div><div class='ctx'> {</div><div class='ctx'>     register int result;</div><div class='ctx'>     asm volatile("0:\n"</div><div class='hunk'>@@ -152,11 +160,11 @@ inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)</div><div class='ctx'>                  : [expectedValue] "r" (expectedValue),</div><div class='ctx'>                    [newValue] "r" (newValue),</div><div class='ctx'>                    [_q_value] "r" (&amp;_q_value)</div><div class='del'>-                 : "cc", "memory");</div><div class='add'>+                 : "cc");</div><div class='ctx'>     return result == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)</div><div class='add'>+inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)</div><div class='ctx'> {</div><div class='ctx'>     register int originalValue;</div><div class='ctx'>     register int result;</div><div class='hunk'>@@ -170,11 +178,11 @@ inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)</div><div class='ctx'>                    "+m" (_q_value)</div><div class='ctx'>                  : [newValue] "r" (newValue),</div><div class='ctx'>                    [_q_value] "r" (&amp;_q_value)</div><div class='del'>-                 : "cc", "memory");</div><div class='add'>+                 : "cc");</div><div class='ctx'>     return originalValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)</div><div class='add'>+inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)</div><div class='ctx'> {</div><div class='ctx'>     register int originalValue;</div><div class='ctx'>     register int newValue;</div><div class='hunk'>@@ -191,12 +199,12 @@ inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)</div><div class='ctx'>                    "+m" (_q_value)</div><div class='ctx'>                  : [valueToAdd] "r" (valueToAdd),</div><div class='ctx'>                    [_q_value] "r" (&amp;_q_value)</div><div class='del'>-                 : "cc", "memory");</div><div class='add'>+                 : "cc");</div><div class='ctx'>     return originalValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetOrdered(T *expectedValue, T *newValue)</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetRelaxed(T *expectedValue, T *newValue)</div><div class='ctx'> {</div><div class='ctx'>     register T *result;</div><div class='ctx'>     asm volatile("0:\n"</div><div class='hunk'>@@ -210,12 +218,12 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetOrdered(T *expectedValu</div><div class='ctx'>                  : [expectedValue] "r" (expectedValue),</div><div class='ctx'>                    [newValue] "r" (newValue),</div><div class='ctx'>                    [_q_value] "r" (&amp;_q_value)</div><div class='del'>-                 : "cc", "memory");</div><div class='add'>+                 : "cc");</div><div class='ctx'>     return result == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreOrdered(T *newValue)</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreRelaxed(T *newValue)</div><div class='ctx'> {</div><div class='ctx'>     register T *originalValue;</div><div class='ctx'>     register int result;</div><div class='hunk'>@@ -229,12 +237,12 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreOrdered(T *newValue)</div><div class='ctx'>                    "+m" (_q_value)</div><div class='ctx'>                  : [newValue] "r" (newValue),</div><div class='ctx'>                    [_q_value] "r" (&amp;_q_value)</div><div class='del'>-                 : "cc", "memory");</div><div class='add'>+                 : "cc");</div><div class='ctx'>     return originalValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddOrdered(qptrdiff valueToAdd)</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddRelaxed(qptrdiff valueToAdd)</div><div class='ctx'> {</div><div class='ctx'>     register T *originalValue;</div><div class='ctx'>     register T *newValue;</div><div class='hunk'>@@ -251,7 +259,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddOrdered(qptrdiff valueTo</div><div class='ctx'>                    "+m" (_q_value)</div><div class='ctx'>                  : [valueToAdd] "r" (valueToAdd * sizeof(T)),</div><div class='ctx'>                    [_q_value] "r" (&amp;_q_value)</div><div class='del'>-                 : "cc", "memory");</div><div class='add'>+                 : "cc");</div><div class='ctx'>     return originalValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -263,9 +271,18 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddOrdered(qptrdiff valueTo</div><div class='ctx'> // RVCT embedded assembly documentation:</div><div class='ctx'> // http://www.keil.com/support/man/docs/armcc/armcc_chddbeib.htm</div><div class='ctx'> </div><div class='del'>-// save our pragma state and switch to ARM mode</div><div class='del'>-#pragma push</div><div class='del'>-#pragma arm</div><div class='add'>+#if __TARGET_ARCH_THUMB-0 &lt; 4</div><div class='add'>+// save our pragma state and switch to ARM mode (unless using Thumb2)</div><div class='add'>+# pragma push</div><div class='add'>+# pragma arm</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef Q_DATA_MEMORY_BARRIER</div><div class='add'>+# define Q_DATA_MEMORY_BARRIER __schedule_barrier()</div><div class='add'>+#endif</div><div class='add'>+#ifndef Q_COMPILER_MEMORY_BARRIER</div><div class='add'>+# define Q_COMPILER_MEMORY_BARRIER __schedule_barrier()</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> inline bool QBasicAtomicInt::ref()</div><div class='ctx'> {</div><div class='hunk'>@@ -297,7 +314,7 @@ inline bool QBasicAtomicInt::deref()</div><div class='ctx'>     return newValue != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)</div><div class='add'>+inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)</div><div class='ctx'> {</div><div class='ctx'>     register int result;</div><div class='ctx'>     retry:</div><div class='hunk'>@@ -311,7 +328,7 @@ inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)</div><div class='ctx'>     return result == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)</div><div class='add'>+inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)</div><div class='ctx'> {</div><div class='ctx'>     register int originalValue;</div><div class='ctx'>     register int result;</div><div class='hunk'>@@ -325,7 +342,7 @@ inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)</div><div class='ctx'>     return originalValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)</div><div class='add'>+inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)</div><div class='ctx'> {</div><div class='ctx'>     register int originalValue;</div><div class='ctx'>     register int newValue;</div><div class='hunk'>@@ -342,7 +359,7 @@ inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetOrdered(T *expectedValue, T *newValue)</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetRelaxed(T *expectedValue, T *newValue)</div><div class='ctx'> {</div><div class='ctx'>     register T *result;</div><div class='ctx'>     retry:</div><div class='hunk'>@@ -357,7 +374,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetOrdered(T *expectedValu</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreOrdered(T *newValue)</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreRelaxed(T *newValue)</div><div class='ctx'> {</div><div class='ctx'>     register T *originalValue;</div><div class='ctx'>     register int result;</div><div class='hunk'>@@ -372,7 +389,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreOrdered(T *newValue)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddOrdered(qptrdiff valueToAdd)</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddRelaxed(qptrdiff valueToAdd)</div><div class='ctx'> {</div><div class='ctx'>     register T *originalValue;</div><div class='ctx'>     register T *newValue;</div><div class='hunk'>@@ -388,111 +405,153 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddOrdered(qptrdiff valueTo</div><div class='ctx'>     return originalValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// go back to the previous pragma state (probably Thumb mode)</div><div class='del'>-#pragma pop</div><div class='add'>+#if __TARGET_ARCH_THUMB-0 &lt; 4</div><div class='add'>+# pragma pop</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-// common code</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)</div><div class='del'>-{</div><div class='del'>-    return testAndSetOrdered(expectedValue, newValue);</div><div class='del'>-}</div><div class='add'>+// common code</div><div class='ctx'> </div><div class='ctx'> inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue)</div><div class='ctx'> {</div><div class='del'>-    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+    bool returnValue = testAndSetRelaxed(expectedValue, newValue);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    return returnValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)</div><div class='ctx'> {</div><div class='del'>-    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    return testAndSetRelaxed(expectedValue, newValue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)</div><div class='add'>+inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)</div><div class='ctx'> {</div><div class='del'>-    return fetchAndStoreOrdered(newValue);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    bool returnValue = testAndSetRelaxed(expectedValue, newValue);</div><div class='add'>+    Q_COMPILER_MEMORY_BARRIER;</div><div class='add'>+    return returnValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue)</div><div class='ctx'> {</div><div class='del'>-    return fetchAndStoreOrdered(newValue);</div><div class='add'>+    int returnValue = fetchAndStoreRelaxed(newValue);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    return returnValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue)</div><div class='ctx'> {</div><div class='del'>-    return fetchAndStoreOrdered(newValue);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    return fetchAndStoreRelaxed(newValue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)</div><div class='add'>+inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)</div><div class='ctx'> {</div><div class='del'>-    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    int returnValue = fetchAndStoreRelaxed(newValue);</div><div class='add'>+    Q_COMPILER_MEMORY_BARRIER;</div><div class='add'>+    return returnValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd)</div><div class='ctx'> {</div><div class='del'>-    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+    int returnValue = fetchAndAddRelaxed(valueToAdd);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    return returnValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)</div><div class='ctx'> {</div><div class='del'>-    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    return fetchAndAddRelaxed(valueToAdd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetRelaxed(T *expectedValue, T *newValue)</div><div class='add'>+inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)</div><div class='ctx'> {</div><div class='del'>-    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    int returnValue = fetchAndAddRelaxed(valueToAdd);</div><div class='add'>+    Q_COMPILER_MEMORY_BARRIER;</div><div class='add'>+    return returnValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T&gt;</div><div class='ctx'> Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetAcquire(T *expectedValue, T *newValue)</div><div class='ctx'> {</div><div class='del'>-    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+    bool returnValue = testAndSetRelaxed(expectedValue, newValue);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    return returnValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T&gt;</div><div class='ctx'> Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetRelease(T *expectedValue, T *newValue)</div><div class='ctx'> {</div><div class='del'>-    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    return testAndSetRelaxed(expectedValue, newValue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreRelaxed(T *newValue)</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetOrdered(T *expectedValue, T *newValue)</div><div class='ctx'> {</div><div class='del'>-    return fetchAndStoreOrdered(newValue);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    bool returnValue = testAndSetAcquire(expectedValue, newValue);</div><div class='add'>+    Q_COMPILER_MEMORY_BARRIER;</div><div class='add'>+    return returnValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T&gt;</div><div class='ctx'> Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreAcquire(T *newValue)</div><div class='ctx'> {</div><div class='del'>-    return fetchAndStoreOrdered(newValue);</div><div class='add'>+    T *returnValue = fetchAndStoreRelaxed(newValue);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    return returnValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T&gt;</div><div class='ctx'> Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreRelease(T *newValue)</div><div class='ctx'> {</div><div class='del'>-    return fetchAndStoreOrdered(newValue);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    return fetchAndStoreRelaxed(newValue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T&gt;</div><div class='del'>-Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddRelaxed(qptrdiff valueToAdd)</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreOrdered(T *newValue)</div><div class='ctx'> {</div><div class='del'>-    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    T *returnValue = fetchAndStoreRelaxed(newValue);</div><div class='add'>+    Q_COMPILER_MEMORY_BARRIER;</div><div class='add'>+    return returnValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T&gt;</div><div class='ctx'> Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddAcquire(qptrdiff valueToAdd)</div><div class='ctx'> {</div><div class='del'>-    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+    T *returnValue = fetchAndAddRelaxed(valueToAdd);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    return returnValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T&gt;</div><div class='ctx'> Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddRelease(qptrdiff valueToAdd)</div><div class='ctx'> {</div><div class='del'>-    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    return fetchAndAddRelaxed(valueToAdd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddOrdered(qptrdiff valueToAdd)</div><div class='add'>+{</div><div class='add'>+    Q_DATA_MEMORY_BARRIER;</div><div class='add'>+    T *returnValue = fetchAndAddRelaxed(valueToAdd);</div><div class='add'>+    Q_COMPILER_MEMORY_BARRIER;</div><div class='add'>+    return returnValue;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#undef Q_DATA_MEMORY_BARRIER</div><div class='add'>+#undef Q_COMPILER_MEMORY_BARRIER</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> QT_END_HEADER</div><div class='head'>diff --git a/src/corelib/arch/qatomic_armv7.h b/src/corelib/arch/qatomic_armv7.h<br/>new file mode 100644<br/>index 0000000..3554cd4<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/arch/qatomic_armv7.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/arch/qatomic_armv7.h</a></div><div class='hunk'>@@ -0,0 +1,61 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QATOMIC_ARMV7_H</div><div class='add'>+#define QATOMIC_ARMV7_H</div><div class='add'>+</div><div class='add'>+QT_BEGIN_HEADER</div><div class='add'>+</div><div class='add'>+// use the DMB instruction when compiling for ARMv7, ...</div><div class='add'>+#ifndef Q_CC_RCVT</div><div class='add'>+# define Q_DATA_MEMORY_BARRIER asm volatile("dmb\n":::"memory")</div><div class='add'>+#else</div><div class='add'>+# define Q_DATA_MEMORY_BARRIER do{__asm { dmb } __schedule_barrier();}while(0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+// ... but the implementation is otherwise identical to that for ARMv6</div><div class='add'>+QT_BEGIN_INCLUDE_HEADER</div><div class='add'>+#include "QtCore/qatomic_armv6.h"</div><div class='add'>+QT_END_INCLUDE_HEADER</div><div class='add'>+</div><div class='add'>+QT_END_HEADER</div><div class='add'>+</div><div class='add'>+#endif // QATOMIC_ARMV7_H</div><div class='head'>diff --git a/src/corelib/arch/qatomic_integrity.h b/src/corelib/arch/qatomic_integrity.h<br/>new file mode 100644<br/>index 0000000..f957297<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/arch/qatomic_integrity.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/arch/qatomic_integrity.h</a></div><div class='hunk'>@@ -0,0 +1,289 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtGui module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QATOMIC_INTEGRITY_H</div><div class='add'>+#define QATOMIC_INTEGRITY_H</div><div class='add'>+</div><div class='add'>+#include &lt;INTEGRITY.h&gt;</div><div class='add'>+</div><div class='add'>+QT_BEGIN_HEADER</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+#define qt_i2addr(a) reinterpret_cast&lt;Address *&gt;(const_cast&lt;int *&gt;(a))</div><div class='add'>+#define qt_p2addr(a) reinterpret_cast&lt;Address *&gt;(const_cast&lt;void *&gt;(a))</div><div class='add'>+#define qt_addr(a) reinterpret_cast&lt;Address&gt;(a)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_NOT_NATIVE</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::isReferenceCountingNative()</div><div class='add'>+{ return false; }</div><div class='add'>+inline bool QBasicAtomicInt::isReferenceCountingWaitFree()</div><div class='add'>+{ return false; }</div><div class='add'>+</div><div class='add'>+#define Q_ATOMIC_INT_TEST_AND_SET_IS_NOT_NATIVE</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::isTestAndSetNative()</div><div class='add'>+{ return true; }</div><div class='add'>+inline bool QBasicAtomicInt::isTestAndSetWaitFree()</div><div class='add'>+{ return true; }</div><div class='add'>+</div><div class='add'>+#define Q_ATOMIC_INT_FETCH_AND_STORE_IS_NOT_NATIVE</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::isFetchAndStoreNative()</div><div class='add'>+{ return true; }</div><div class='add'>+inline bool QBasicAtomicInt::isFetchAndStoreWaitFree()</div><div class='add'>+{ return true; }</div><div class='add'>+</div><div class='add'>+#define Q_ATOMIC_INT_FETCH_AND_ADD_IS_NOT_NATIVE</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::isFetchAndAddNative()</div><div class='add'>+{ return true; }</div><div class='add'>+inline bool QBasicAtomicInt::isFetchAndAddWaitFree()</div><div class='add'>+{ return true; }</div><div class='add'>+</div><div class='add'>+#define Q_ATOMIC_POINTER_TEST_AND_SET_IS_NOT_NATIVE</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isTestAndSetNative()</div><div class='add'>+{ return true; }</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isTestAndSetWaitFree()</div><div class='add'>+{ return true; }</div><div class='add'>+</div><div class='add'>+#define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_NOT_NATIVE</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isFetchAndStoreNative()</div><div class='add'>+{ return true; }</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isFetchAndStoreWaitFree()</div><div class='add'>+{ return true; }</div><div class='add'>+</div><div class='add'>+#define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_NOT_NATIVE</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isFetchAndAddNative()</div><div class='add'>+{ return true; }</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::isFetchAndAddWaitFree()</div><div class='add'>+{ return true; }</div><div class='add'>+</div><div class='add'>+// Reference counting</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::ref()</div><div class='add'>+{</div><div class='add'>+    int oldval;</div><div class='add'>+    AtomicModify(qt_i2addr(&amp;_q_value), qt_i2addr(&amp;oldval), 0, 1);</div><div class='add'>+    return _q_value != -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::deref()</div><div class='add'>+{</div><div class='add'>+    int oldval;</div><div class='add'>+    AtomicModify(qt_i2addr(&amp;_q_value), qt_i2addr(&amp;oldval), 0, -1U);</div><div class='add'>+    return _q_value != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Test and set for integers</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)</div><div class='add'>+{</div><div class='add'>+    return TestAndSet(qt_i2addr(&amp;_q_value), expectedValue, newValue) == Success;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)</div><div class='add'>+{</div><div class='add'>+    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue)</div><div class='add'>+{</div><div class='add'>+    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)</div><div class='add'>+{</div><div class='add'>+    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Fetch and store for integers</div><div class='add'>+</div><div class='add'>+inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)</div><div class='add'>+{</div><div class='add'>+    int old_val;</div><div class='add'>+    do {</div><div class='add'>+        old_val = _q_value;</div><div class='add'>+    } while (TestAndSet(qt_i2addr(&amp;_q_value), old_val, newValue) != Success);</div><div class='add'>+    return old_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)</div><div class='add'>+{</div><div class='add'>+    return fetchAndStoreOrdered(newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue)</div><div class='add'>+{</div><div class='add'>+    return fetchAndStoreOrdered(newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue)</div><div class='add'>+{</div><div class='add'>+    return fetchAndStoreOrdered(newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Fetch and add for integers</div><div class='add'>+</div><div class='add'>+inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)</div><div class='add'>+{</div><div class='add'>+    int old_val;</div><div class='add'>+    do {</div><div class='add'>+        old_val = _q_value;</div><div class='add'>+    } while (TestAndSet(qt_i2addr(&amp;_q_value), old_val, old_val + valueToAdd) != Success);</div><div class='add'>+    return old_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)</div><div class='add'>+{</div><div class='add'>+    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd)</div><div class='add'>+{</div><div class='add'>+    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)</div><div class='add'>+{</div><div class='add'>+    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Test and set for pointers</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetOrdered(T *expectedValue, T *newValue)</div><div class='add'>+{</div><div class='add'>+    return TestAndSet((Address*)&amp;_q_value, qt_addr(expectedValue), qt_addr(newValue)) == Success;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetRelaxed(T *expectedValue, T *newValue)</div><div class='add'>+{</div><div class='add'>+    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetAcquire(T *expectedValue, T *newValue)</div><div class='add'>+{</div><div class='add'>+    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE bool QBasicAtomicPointer&lt;T&gt;::testAndSetRelease(T *expectedValue, T *newValue)</div><div class='add'>+{</div><div class='add'>+    return testAndSetOrdered(expectedValue, newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Fetch and store for pointers</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreOrdered(T *newValue)</div><div class='add'>+{</div><div class='add'>+    Address old_val;</div><div class='add'>+    do {</div><div class='add'>+        old_val = *reinterpret_cast&lt;Address *&gt;(const_cast&lt;T *&gt;(newValue));</div><div class='add'>+    } while (TestAndSet(reinterpret_cast&lt;Address *&gt;(const_cast&lt;T **&gt;(&amp;_q_value)), old_val, qt_addr(newValue)) != Success);</div><div class='add'>+    return reinterpret_cast&lt;T *&gt;(old_val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreRelaxed(T *newValue)</div><div class='add'>+{</div><div class='add'>+    return fetchAndStoreOrdered(newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreAcquire(T *newValue)</div><div class='add'>+{</div><div class='add'>+    return fetchAndStoreOrdered(newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndStoreRelease(T *newValue)</div><div class='add'>+{</div><div class='add'>+    return fetchAndStoreOrdered(newValue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Fetch and add for pointers</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddOrdered(qptrdiff valueToAdd)</div><div class='add'>+{</div><div class='add'>+    AtomicModify(qt_p2addr(&amp;_q_value), qt_addr(_q_value), qt_addr(_q_value) + valueToAdd * sizeof(T));</div><div class='add'>+    return _q_value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddRelaxed(qptrdiff valueToAdd)</div><div class='add'>+{</div><div class='add'>+    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddAcquire(qptrdiff valueToAdd)</div><div class='add'>+{</div><div class='add'>+    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+Q_INLINE_TEMPLATE T *QBasicAtomicPointer&lt;T&gt;::fetchAndAddRelease(qptrdiff valueToAdd)</div><div class='add'>+{</div><div class='add'>+    return fetchAndAddOrdered(valueToAdd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+QT_END_HEADER</div><div class='add'>+</div><div class='add'>+#endif // QATOMIC_INTEGRITY_H</div><div class='add'>+</div><div class='head'>diff --git a/src/corelib/arch/symbian/arch.pri b/src/corelib/arch/symbian/arch.pri<br/>index 70daee3..2e2a9b6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/arch/symbian/arch.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/symbian/arch.pri</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/arch/symbian/arch.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/arch/symbian/arch.pri</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> # Symbian architecture</div><div class='ctx'> #</div><div class='ctx'> SOURCES +=  $$QT_ARCH_CPP/qatomic_symbian.cpp \</div><div class='del'>-            $$QT_ARCH_CPP/../armv6/qatomic_generic_armv6.cpp \</div><div class='add'>+            $$QT_ARCH_CPP/qatomic_generic_armv6.cpp \</div><div class='ctx'>             $$QT_ARCH_CPP/heap_hybrid.cpp \</div><div class='ctx'>             $$QT_ARCH_CPP/debugfunction.cpp \</div><div class='ctx'>             $$QT_ARCH_CPP/qt_heapsetup_symbian.cpp</div><div class='head'>diff --git a/src/corelib/arch/armv6/qatomic_generic_armv6.cpp b/src/corelib/arch/symbian/qatomic_generic_armv6.cpp<br/>index 02a6719..02a6719 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/arch/armv6/qatomic_generic_armv6.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/armv6/qatomic_generic_armv6.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/arch/symbian/qatomic_generic_armv6.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/arch/symbian/qatomic_generic_armv6.cpp</a></div><div class='head'>diff --git a/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h b/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h<br/>index 676f9ec..f62fa17 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/arch/symbian/qt_hybridheap_symbian_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/arch/symbian/qt_hybridheap_symbian_p.h</a></div><div class='hunk'>@@ -43,8 +43,9 @@</div><div class='ctx'> #define QT_HYBRIDHEAP_SYMBIAN_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;qglobal.h&gt;</div><div class='add'>+#include &lt;e32cmn.h&gt;</div><div class='ctx'> </div><div class='del'>-#if !defined(SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS) &amp;&amp; !defined(__WINS__)</div><div class='add'>+#if !defined(__SYMBIAN_KERNEL_HYBRID_HEAP__) &amp;&amp; !defined(__WINS__)</div><div class='ctx'> //Enable the (backported) new allocator. When it is available in OS,</div><div class='ctx'> //this flag should be disabled for that OS version onward</div><div class='ctx'> #define QT_USE_NEW_SYMBIAN_ALLOCATOR</div><div class='head'>diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp<br/>index eda1ad4..fb27f6d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/codecs/qiconvcodec.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/codecs/qiconvcodec.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/codecs/qiconvcodec.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/codecs/qiconvcodec.cpp</a></div><div class='hunk'>@@ -173,6 +173,7 @@ QString QIconvCodec::convertToUnicode(const char* chars, int len, ConverterState</div><div class='ctx'>     int invalidCount = 0;</div><div class='ctx'>     int remainingCount = 0;</div><div class='ctx'>     char *remainingBuffer = 0;</div><div class='add'>+    IconvState *temporaryState = 0;</div><div class='ctx'>     IconvState **pstate;</div><div class='ctx'> </div><div class='ctx'>     if (convState) {</div><div class='hunk'>@@ -193,11 +194,11 @@ QString QIconvCodec::convertToUnicode(const char* chars, int len, ConverterState</div><div class='ctx'>             // we're running after the Q_GLOBAL_STATIC has been deleted</div><div class='ctx'>             // or before the QCoreApplication initialization</div><div class='ctx'>             // bad programmer, no cookie for you</div><div class='del'>-            return QString::fromLatin1(chars, len);</div><div class='add'>+            pstate = &amp;temporaryState;</div><div class='add'>+        } else {</div><div class='add'>+            // stateless conversion -- use thread-local data</div><div class='add'>+            pstate = &amp;toUnicodeState()-&gt;localData();</div><div class='ctx'>         }</div><div class='del'>-</div><div class='del'>-        // stateless conversion -- use thread-local data</div><div class='del'>-        pstate = &amp;toUnicodeState()-&gt;localData();</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if (!*pstate) {</div><div class='hunk'>@@ -280,6 +281,7 @@ QString QIconvCodec::convertToUnicode(const char* chars, int len, ConverterState</div><div class='ctx'>                 iconv(state-&gt;cd, 0, &amp;inBytesLeft, 0, &amp;outBytesLeft);</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='add'>+            delete temporaryState;</div><div class='ctx'>             return QString::fromLatin1(chars, len);</div><div class='ctx'>         }</div><div class='ctx'>     } while (inBytesLeft != 0);</div><div class='hunk'>@@ -294,6 +296,7 @@ QString QIconvCodec::convertToUnicode(const char* chars, int len, ConverterState</div><div class='ctx'>         iconv(state-&gt;cd, 0, &amp;inBytesLeft, 0, &amp;outBytesLeft);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='add'>+    delete temporaryState;</div><div class='ctx'>     return s;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -337,30 +340,22 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt</div><div class='ctx'>     char **inBytesPtr = &amp;inBytes;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+    IconvState *temporaryState = 0;</div><div class='ctx'>     QThreadStorage&lt;QIconvCodec::IconvState *&gt; *ts = fromUnicodeState();</div><div class='del'>-    if (!qt_locale_initialized || !ts) {</div><div class='del'>-        // we're running after the Q_GLOBAL_STATIC has been deleted</div><div class='del'>-        // or before the QCoreApplication initialization</div><div class='del'>-        // bad programmer, no cookie for you</div><div class='del'>-        if (!len)</div><div class='del'>-            // this is a special case - zero-sized string should be</div><div class='del'>-            // translated to empty but not-null QByteArray.</div><div class='del'>-            return QByteArray("");</div><div class='del'>-        return QString::fromRawData(uc, len).toLatin1();</div><div class='del'>-    }</div><div class='del'>-    IconvState *&amp;state = ts-&gt;localData();</div><div class='add'>+    IconvState *&amp;state = (qt_locale_initialized &amp;&amp; ts) ? ts-&gt;localData() : temporaryState;</div><div class='ctx'>     if (!state) {</div><div class='del'>-        state = new IconvState(QIconvCodec::createIconv_t(0, UTF16));</div><div class='del'>-        if (state-&gt;cd == reinterpret_cast&lt;iconv_t&gt;(-1)) {</div><div class='del'>-            if (!setByteOrder(state-&gt;cd)) {</div><div class='add'>+        iconv_t cd = QIconvCodec::createIconv_t(0, UTF16);</div><div class='add'>+        if (cd != reinterpret_cast&lt;iconv_t&gt;(-1)) {</div><div class='add'>+            if (!setByteOrder(cd)) {</div><div class='ctx'>                 perror("QIconvCodec::convertFromUnicode: using Latin-1 for conversion, iconv failed for BOM");</div><div class='ctx'> </div><div class='del'>-                iconv_close(state-&gt;cd);</div><div class='del'>-                state-&gt;cd = reinterpret_cast&lt;iconv_t&gt;(-1);</div><div class='add'>+                iconv_close(cd);</div><div class='add'>+                cd = reinterpret_cast&lt;iconv_t&gt;(-1);</div><div class='ctx'> </div><div class='ctx'>                 return QString(uc, len).toLatin1();</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='add'>+        state = new IconvState(cd);</div><div class='ctx'>     }</div><div class='ctx'>     if (state-&gt;cd == reinterpret_cast&lt;iconv_t&gt;(-1)) {</div><div class='ctx'>         static int reported = 0;</div><div class='hunk'>@@ -368,6 +363,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt</div><div class='ctx'>             fprintf(stderr,</div><div class='ctx'>                     "QIconvCodec::convertFromUnicode: using Latin-1 for conversion, iconv_open failed\n");</div><div class='ctx'>         }</div><div class='add'>+        delete temporaryState;</div><div class='ctx'>         return QString(uc, len).toLatin1();</div><div class='ctx'>     }</div><div class='ctx'>  </div><div class='hunk'>@@ -430,6 +426,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt</div><div class='ctx'>                     // reset to initial state</div><div class='ctx'>                     iconv(state-&gt;cd, 0, &amp;inBytesLeft, 0, &amp;outBytesLeft);</div><div class='ctx'> </div><div class='add'>+                    delete temporaryState;</div><div class='ctx'>                     return QString(uc, len).toLatin1();</div><div class='ctx'>                 }</div><div class='ctx'>             }</div><div class='hunk'>@@ -445,6 +442,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt</div><div class='ctx'>     if (convState)</div><div class='ctx'>         convState-&gt;invalidChars = invalidCount;</div><div class='ctx'> </div><div class='add'>+    delete temporaryState;</div><div class='ctx'>     return ba;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp<br/>index 0a37f27..985f515 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/codecs/qtextcodec.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/codecs/qtextcodec.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/codecs/qtextcodec.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/codecs/qtextcodec.cpp</a></div><div class='hunk'>@@ -64,7 +64,7 @@</div><div class='ctx'> #ifndef QT_NO_CODECS</div><div class='ctx'> #  include "qtsciicodec_p.h"</div><div class='ctx'> #  include "qisciicodec_p.h"</div><div class='del'>-#ifndef Q_OS_SYMBIAN</div><div class='add'>+#if !defined(Q_OS_SYMBIAN) &amp;&amp; !defined(Q_OS_INTEGRITY)</div><div class='ctx'> #  if defined(QT_NO_ICONV) &amp;&amp; !defined(QT_BOOTSTRAPPED)</div><div class='ctx'> // no iconv(3) support, must build all codecs into the library</div><div class='ctx'> #    include "../../plugins/codecs/cn/qgb18030codec.h"</div><div class='hunk'>@@ -772,7 +772,7 @@ static void setup()</div><div class='ctx'> #  endif // Q_WS_X11</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifndef Q_OS_SYMBIAN</div><div class='add'>+#if !defined(Q_OS_SYMBIAN) &amp;&amp; !defined(Q_OS_INTEGRITY)</div><div class='ctx'> #  if defined(QT_NO_ICONV) &amp;&amp; !defined(QT_BOOTSTRAPPED)</div><div class='ctx'>     // no asian codecs when bootstrapping, sorry</div><div class='ctx'>     (void)new QGb18030Codec;</div><div class='hunk'>@@ -805,7 +805,7 @@ static void setup()</div><div class='ctx'>     (void)new QLatin1Codec;</div><div class='ctx'>     (void)new QUtf8Codec;</div><div class='ctx'> </div><div class='del'>-#ifndef Q_OS_SYMBIAN</div><div class='add'>+#if !defined(Q_OS_SYMBIAN) &amp;&amp; !defined(Q_OS_INTEGRITY)</div><div class='ctx'> #if defined(Q_OS_UNIX) &amp;&amp; !defined(QT_NO_ICONV) &amp;&amp; !defined(QT_BOOTSTRAPPED)</div><div class='ctx'>     // QIconvCodec depends on the UTF-16 codec, so it needs to be created last</div><div class='ctx'>     (void) new QIconvCodec();</div><div class='head'>diff --git a/src/corelib/concurrent/qfuture.h b/src/corelib/concurrent/qfuture.h<br/>index d21b6a7..911fb7e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qfuture.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qfuture.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qfuture.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/concurrent/qfuture.h</a></div><div class='hunk'>@@ -210,7 +210,7 @@ public:</div><div class='ctx'>     bool operator==(const QFuture &amp;other) const { return (d == other.d); }</div><div class='ctx'>     bool operator!=(const QFuture &amp;other) const { return (d != other.d); }</div><div class='ctx'> </div><div class='del'>-#if !defined(QT_NO_MEMBER_TEMPLATES) &amp;&amp; !defined(Q_CC_XLC)</div><div class='add'>+#if !defined(Q_CC_XLC)</div><div class='ctx'>     template &lt;typename T&gt;</div><div class='ctx'>     QFuture(const QFuture&lt;T&gt; &amp;other)</div><div class='ctx'>         : d(other.d)</div><div class='head'>diff --git a/src/corelib/concurrent/qfuturewatcher.cpp b/src/corelib/concurrent/qfuturewatcher.cpp<br/>index e99c1db..0bef4a6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qfuturewatcher.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qfuturewatcher.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qfuturewatcher.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/concurrent/qfuturewatcher.cpp</a></div><div class='hunk'>@@ -359,6 +359,15 @@ void QFutureWatcherBase::connectNotify(const char * signal)</div><div class='ctx'>     Q_D(QFutureWatcherBase);</div><div class='ctx'>     if (qstrcmp(signal, SIGNAL(resultReadyAt(int))) == 0)</div><div class='ctx'>         d-&gt;resultAtConnected.ref();</div><div class='add'>+#ifndef QT_NO_DEBUG</div><div class='add'>+    if (qstrcmp(signal, SIGNAL(finished())) == 0) {</div><div class='add'>+        if (futureInterface().isRunning()) {</div><div class='add'>+            //connections should be established before calling stFuture to avoid race.</div><div class='add'>+            // (The future could finish before the connection is made.)</div><div class='add'>+            qWarning("QFutureWatcher::connect: connecting after calling setFuture() is likely to produce race");</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void QFutureWatcherBase::disconnectNotify(const char * signal)</div><div class='hunk'>@@ -580,4 +589,16 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event)</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='del'>-#endif // QT_NO_CONCURRENT</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+// On Symbian winscw target QT_NO_QFUTURE and QT_NO_CONCURRENT are both defined.</div><div class='add'>+// However moc will be run without having them set, so provide a dummy stub at</div><div class='add'>+// least for the slots to prevent linker errors.</div><div class='add'>+</div><div class='add'>+void QFutureWatcherBase::cancel() { }</div><div class='add'>+void QFutureWatcherBase::setPaused(bool) { }</div><div class='add'>+void QFutureWatcherBase::pause() { }</div><div class='add'>+void QFutureWatcherBase::resume() { }</div><div class='add'>+void QFutureWatcherBase::togglePaused() { }</div><div class='add'>+</div><div class='add'>+#endif // QT_NO_QFUTURE</div><div class='head'>diff --git a/src/corelib/concurrent/qfuturewatcher.h b/src/corelib/concurrent/qfuturewatcher.h<br/>index a5f723c..6ae87c7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qfuturewatcher.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qfuturewatcher.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qfuturewatcher.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/concurrent/qfuturewatcher.h</a></div><div class='hunk'>@@ -44,8 +44,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;QtCore/qfuture.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef QT_NO_QFUTURE</div><div class='del'>-</div><div class='ctx'> #include &lt;QtCore/qobject.h&gt;</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_HEADER</div><div class='hunk'>@@ -56,6 +54,11 @@ QT_MODULE(Core)</div><div class='ctx'> class QEvent;</div><div class='ctx'> </div><div class='ctx'> class QFutureWatcherBasePrivate;</div><div class='add'>+</div><div class='add'>+#ifdef QT_NO_QFUTURE</div><div class='add'>+class QFutureInterfaceBase;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> class Q_CORE_EXPORT QFutureWatcherBase : public QObject</div><div class='ctx'> {</div><div class='ctx'>     Q_OBJECT</div><div class='hunk'>@@ -114,6 +117,8 @@ private:</div><div class='ctx'>     virtual QFutureInterfaceBase &amp;futureInterface() = 0;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifndef QT_NO_QFUTURE</div><div class='add'>+</div><div class='ctx'> template &lt;typename T&gt;</div><div class='ctx'> class QFutureWatcher : public QFutureWatcherBase</div><div class='ctx'> {</div><div class='hunk'>@@ -214,9 +219,9 @@ Q_INLINE_TEMPLATE void QFutureWatcher&lt;void&gt;::setFuture(const QFuture&lt;void&gt; &amp;_fut</div><div class='ctx'>     connectOutputInterface();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#endif // QT_NO_QFUTURE</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> QT_END_HEADER</div><div class='ctx'> </div><div class='del'>-#endif // QT_NO_CONCURRENT</div><div class='del'>-</div><div class='ctx'> #endif // QFUTUREWATCHER_H</div><div class='head'>diff --git a/src/corelib/concurrent/qtconcurrentcompilertest.h b/src/corelib/concurrent/qtconcurrentcompilertest.h<br/>index e1a5b04..c139c7a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentcompilertest.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentcompilertest.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentcompilertest.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/concurrent/qtconcurrentcompilertest.h</a></div><div class='hunk'>@@ -51,18 +51,26 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> QT_MODULE(Core)</div><div class='ctx'> </div><div class='del'>-#ifdef Q_CC_MSVC</div><div class='del'>-#  if _MSC_VER &lt; 1300</div><div class='del'>-#    define QT_CONURRENT_NONSTANDARD_COMPILER</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined (Q_CC_MSVC) &amp;&amp; (_MSC_VER &lt; 1300)</div><div class='ctx'> #  define QT_TYPENAME</div><div class='ctx'> #else</div><div class='ctx'> #  define QT_TYPENAME typename</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+namespace QtPrivate {</div><div class='add'>+</div><div class='add'>+template&lt;class T&gt;</div><div class='add'>+class HasResultType {</div><div class='add'>+    typedef char Yes;</div><div class='add'>+    typedef void *No;</div><div class='add'>+    template&lt;typename U&gt; static Yes test(int, const typename U::result_type * = 0);</div><div class='add'>+    template&lt;typename U&gt; static No test(double);</div><div class='add'>+public:</div><div class='add'>+    enum { Value = (sizeof(test&lt;T&gt;(0)) == sizeof(Yes)) };</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> QT_END_HEADER</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/concurrent/qtconcurrentexception.cpp b/src/corelib/concurrent/qtconcurrentexception.cpp<br/>index 55a9b33..933ad3c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentexception.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentexception.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentexception.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/concurrent/qtconcurrentexception.cpp</a></div><div class='hunk'>@@ -203,12 +203,7 @@ ExceptionHolder ExceptionStore::exception()</div><div class='ctx'> </div><div class='ctx'> void ExceptionStore::throwPossibleException()</div><div class='ctx'> {</div><div class='del'>-    /* On win32-g++, with GCC 3.4.2 std::uncaught_exception() isn't reliable. */</div><div class='del'>-    if (hasException()</div><div class='del'>-#ifndef Q_CC_MINGW</div><div class='del'>-        &amp;&amp; std::uncaught_exception() == false</div><div class='del'>-#endif</div><div class='del'>-            ) {</div><div class='add'>+    if (hasException() ) {</div><div class='ctx'>         exceptionHolder.base-&gt;hasThrown = true;</div><div class='ctx'>         exceptionHolder.exception()-&gt;raise();</div><div class='ctx'>     }</div><div class='head'>diff --git a/src/corelib/concurrent/qtconcurrentfilter.h b/src/corelib/concurrent/qtconcurrentfilter.h<br/>index 139a545..4b9c4ae 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentfilter.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentfilter.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentfilter.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/concurrent/qtconcurrentfilter.h</a></div><div class='hunk'>@@ -115,19 +115,7 @@ ThreadEngineStarter&lt;void&gt; filterInternal(Sequence &amp;sequence, KeepFunctor keep, T</div><div class='ctx'> template &lt;typename Sequence, typename KeepFunctor&gt;</div><div class='ctx'> QFuture&lt;void&gt; filter(Sequence &amp;sequence, KeepFunctor keep)</div><div class='ctx'> {</div><div class='del'>-    return filterInternal(sequence, keep, &amp;Sequence::push_back);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T&gt;</div><div class='del'>-QFuture&lt;void&gt; filter(Sequence &amp;sequence, bool (keep)(T))</div><div class='del'>-{</div><div class='del'>-    return filterInternal(sequence, FunctionWrapper1&lt;bool, T&gt;(keep), &amp;Sequence::push_back);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename C&gt;</div><div class='del'>-QFuture&lt;void&gt; filter(Sequence &amp;sequence, bool (C::*keep)() const)</div><div class='del'>-{</div><div class='del'>-    return filterInternal(sequence, ConstMemberFunctionWrapper&lt;bool, C&gt;(keep), &amp;Sequence::push_back);</div><div class='add'>+    return filterInternal(sequence, QtPrivate::createFunctionWrapper(keep), &amp;Sequence::push_back);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // filteredReduced() on sequences</div><div class='hunk'>@@ -137,103 +125,20 @@ QFuture&lt;ResultType&gt; filteredReduced(const Sequence &amp;sequence,</div><div class='ctx'>                                     ReduceFunctor reduce,</div><div class='ctx'>                                     ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='ctx'> {</div><div class='del'>-    return startFilteredReduced&lt;ResultType&gt;(sequence, keep, reduce, options);</div><div class='del'>- }</div><div class='del'>-</div><div class='del'>-template &lt;typename ResultType, typename Sequence, typename T, typename ReduceFunctor&gt;</div><div class='del'>-QFuture&lt;ResultType&gt; filteredReduced(const Sequence &amp;sequence,</div><div class='del'>-                                    bool (filter)(T),</div><div class='del'>-                                    ReduceFunctor reduce,</div><div class='del'>-                                    ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return filteredReduced&lt;ResultType&gt;(sequence,</div><div class='del'>-                                       FunctionWrapper1&lt;bool, T&gt;(filter),</div><div class='del'>-                                       reduce,</div><div class='del'>-                                       options);</div><div class='add'>+    return startFilteredReduced&lt;ResultType&gt;(sequence, QtPrivate::createFunctionWrapper(keep), QtPrivate::createFunctionWrapper(reduce), options);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-template &lt;typename ResultType, typename Sequence, typename C, typename ReduceFunctor&gt;</div><div class='del'>-QFuture&lt;ResultType&gt; filteredReduced(const Sequence &amp;sequence,</div><div class='del'>-                                    bool (C::*filter)() const,</div><div class='add'>+template &lt;typename Sequence, typename KeepFunctor, typename ReduceFunctor&gt;</div><div class='add'>+QFuture&lt;typename QtPrivate::ReduceResultType&lt;ReduceFunctor&gt;::ResultType&gt; filteredReduced(const Sequence &amp;sequence,</div><div class='add'>+                                    KeepFunctor keep,</div><div class='ctx'>                                     ReduceFunctor reduce,</div><div class='ctx'>                                     ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='ctx'> {</div><div class='del'>-    return filteredReduced&lt;ResultType&gt;(sequence,</div><div class='del'>-                                       ConstMemberFunctionWrapper&lt;bool, C&gt;(filter),</div><div class='del'>-                                       reduce,</div><div class='del'>-                                       options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename KeepFunctor, typename T, typename U, typename V&gt;</div><div class='del'>-QFuture&lt;U&gt; filteredReduced(const Sequence &amp;sequence,</div><div class='del'>-                           KeepFunctor keep,</div><div class='del'>-                           T (reduce)(U &amp;, V),</div><div class='del'>-                           ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return filteredReduced&lt;U&gt;(sequence,</div><div class='del'>-                              keep,</div><div class='del'>-                              FunctionWrapper2&lt;T, U &amp;, V&gt;(reduce),</div><div class='del'>-                              options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename KeepFunctor, typename T, typename C, typename U&gt;</div><div class='del'>-QFuture&lt;C&gt; filteredReduced(const Sequence &amp;sequence,</div><div class='del'>-                           KeepFunctor keep,</div><div class='del'>-                           T (C::*reduce)(U),</div><div class='del'>-                           ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return filteredReduced&lt;C&gt;(sequence,</div><div class='del'>-                              keep,</div><div class='del'>-                              MemberFunctionWrapper1&lt;T, C, U&gt;(reduce),</div><div class='del'>-                              options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename U, typename V, typename W&gt;</div><div class='del'>-QFuture&lt;V&gt; filteredReduced(const Sequence &amp;sequence,</div><div class='del'>-                           bool (keep)(T),</div><div class='del'>-                           U (reduce)(V &amp;, W),</div><div class='del'>-                           ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return filteredReduced&lt;V&gt;(sequence,</div><div class='del'>-                              FunctionWrapper1&lt;bool, T&gt;(keep),</div><div class='del'>-                              FunctionWrapper2&lt;U, V &amp;, W&gt;(reduce),</div><div class='del'>-                              options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename C, typename T, typename U, typename V&gt;</div><div class='del'>-QFuture&lt;U&gt; filteredReduced(const Sequence &amp;sequence,</div><div class='del'>-                           bool (C::*keep)() const,</div><div class='del'>-                           T (reduce)(U &amp;, V),</div><div class='del'>-                           ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return filteredReduced&lt;U&gt;(sequence,</div><div class='del'>-                              ConstMemberFunctionWrapper&lt;bool, C&gt;(keep),</div><div class='del'>-                              FunctionWrapper2&lt;T, U &amp;, V&gt;(reduce),</div><div class='del'>-                              options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename U, typename C, typename V&gt;</div><div class='del'>-QFuture&lt;C&gt; filteredReduced(const Sequence &amp;sequence,</div><div class='del'>-                           bool (keep)(T),</div><div class='del'>-                           U (C::*reduce)(V),</div><div class='del'>-                           ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return filteredReduced&lt;C&gt;(sequence,</div><div class='del'>-                              FunctionWrapper1&lt;bool, T&gt;(keep),</div><div class='del'>-                              MemberFunctionWrapper1&lt;U, C, V&gt;(reduce),</div><div class='del'>-                              options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename C, typename T, typename D, typename U&gt;</div><div class='del'>-QFuture&lt;D&gt; filteredReduced(const Sequence &amp;sequence,</div><div class='del'>-                           bool (C::*keep)() const,</div><div class='del'>-                           T (D::*reduce)(U),</div><div class='del'>-                           ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return filteredReduced&lt;D&gt;(sequence,</div><div class='del'>-                              ConstMemberFunctionWrapper&lt;bool, C&gt;(keep),</div><div class='del'>-                              MemberFunctionWrapper1&lt;T, D, U&gt;(reduce),</div><div class='del'>-                              options);</div><div class='add'>+    return startFilteredReduced&lt;typename QtPrivate::ReduceResultType&lt;ReduceFunctor&gt;::ResultType&gt;</div><div class='add'>+            (sequence,</div><div class='add'>+             QtPrivate::createFunctionWrapper(keep),</div><div class='add'>+             QtPrivate::createFunctionWrapper(reduce),</div><div class='add'>+             options);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // filteredReduced() on iterators</div><div class='hunk'>@@ -244,184 +149,42 @@ QFuture&lt;ResultType&gt; filteredReduced(Iterator begin,</div><div class='ctx'>                                     ReduceFunctor reduce,</div><div class='ctx'>                                     ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='ctx'> {</div><div class='del'>-   return startFilteredReduced&lt;ResultType&gt;(begin, end, keep, reduce, options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename ResultType, typename Iterator, typename T, typename ReduceFunctor&gt;</div><div class='del'>-QFuture&lt;ResultType&gt; filteredReduced(Iterator begin,</div><div class='del'>-                                    Iterator end,</div><div class='del'>-                                    bool (filter)(T),</div><div class='del'>-                                    ReduceFunctor reduce,</div><div class='del'>-                                    ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return filteredReduced&lt;ResultType&gt;(begin,</div><div class='del'>-                                       end,</div><div class='del'>-                                       FunctionWrapper1&lt;bool, T&gt;(filter),</div><div class='del'>-                                       reduce,</div><div class='del'>-                                       options);</div><div class='add'>+   return startFilteredReduced&lt;ResultType&gt;(begin, end, QtPrivate::createFunctionWrapper(keep), QtPrivate::createFunctionWrapper(reduce), options);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-template &lt;typename ResultType, typename Iterator, typename C, typename ReduceFunctor&gt;</div><div class='del'>-QFuture&lt;ResultType&gt; filteredReduced(Iterator begin,</div><div class='add'>+template &lt;typename Iterator, typename KeepFunctor, typename ReduceFunctor&gt;</div><div class='add'>+QFuture&lt;typename QtPrivate::ReduceResultType&lt;ReduceFunctor&gt;::ResultType&gt; filteredReduced(Iterator begin,</div><div class='ctx'>                                     Iterator end,</div><div class='del'>-                                    bool (C::*filter)() const,</div><div class='add'>+                                    KeepFunctor keep,</div><div class='ctx'>                                     ReduceFunctor reduce,</div><div class='ctx'>                                     ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='ctx'> {</div><div class='del'>-    return filteredReduced&lt;ResultType&gt;(begin,</div><div class='del'>-                                       end,</div><div class='del'>-                                       ConstMemberFunctionWrapper&lt;bool, C&gt;(filter),</div><div class='del'>-                                       reduce,</div><div class='del'>-                                       options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename KeepFunctor, typename T, typename U, typename V&gt;</div><div class='del'>-QFuture&lt;U&gt; filteredReduced(Iterator begin,</div><div class='del'>-                           Iterator end,</div><div class='del'>-                           KeepFunctor keep,</div><div class='del'>-                           T (reduce)(U &amp;, V),</div><div class='del'>-                           ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return filteredReduced&lt;U&gt;(begin,</div><div class='del'>-                              end,</div><div class='del'>-                              keep,</div><div class='del'>-                              FunctionWrapper2&lt;T, U &amp;, V&gt;(reduce),</div><div class='del'>-                              options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename KeepFunctor, typename T, typename C, typename U&gt;</div><div class='del'>-QFuture&lt;C&gt; filteredReduced(Iterator begin,</div><div class='del'>-                           Iterator end,</div><div class='del'>-                           KeepFunctor keep,</div><div class='del'>-                           T (C::*reduce)(U),</div><div class='del'>-                           ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return filteredReduced&lt;C&gt;(begin,</div><div class='del'>-                              end,</div><div class='del'>-                              keep,</div><div class='del'>-                              MemberFunctionWrapper1&lt;T, C, U&gt;(reduce),</div><div class='del'>-                              options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename U, typename V, typename W&gt;</div><div class='del'>-QFuture&lt;V&gt; filteredReduced(Iterator begin,</div><div class='del'>-                           Iterator end,</div><div class='del'>-                           bool (keep)(T),</div><div class='del'>-                           U (reduce)(V &amp;, W),</div><div class='del'>-                           ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return filteredReduced&lt;V&gt;(begin,</div><div class='del'>-                              end,</div><div class='del'>-                              FunctionWrapper1&lt;bool, T&gt;(keep),</div><div class='del'>-                              FunctionWrapper2&lt;U, V &amp;, W&gt;(reduce),</div><div class='del'>-                              options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename C, typename T, typename U, typename V&gt;</div><div class='del'>-QFuture&lt;U&gt; filteredReduced(Iterator begin,</div><div class='del'>-                           Iterator end,</div><div class='del'>-                           bool (C::*keep)() const,</div><div class='del'>-                           T (reduce)(U &amp;, V),</div><div class='del'>-                           ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return filteredReduced&lt;U&gt;(begin,</div><div class='del'>-                              end,</div><div class='del'>-                              ConstMemberFunctionWrapper&lt;bool, C&gt;(keep),</div><div class='del'>-                              FunctionWrapper2&lt;T, U &amp;, V&gt;(reduce),</div><div class='del'>-                              options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename U, typename C, typename V&gt;</div><div class='del'>-QFuture&lt;C&gt; filteredReduced(Iterator begin,</div><div class='del'>-                           Iterator end,</div><div class='del'>-                           bool (keep)(T),</div><div class='del'>-                           U (C::*reduce)(V),</div><div class='del'>-                           ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return filteredReduced&lt;C&gt;(begin,</div><div class='del'>-                              end,</div><div class='del'>-                              FunctionWrapper1&lt;bool, T&gt;(keep),</div><div class='del'>-                              MemberFunctionWrapper1&lt;U, C, V&gt;(reduce),</div><div class='del'>-                              options);</div><div class='add'>+   return startFilteredReduced&lt;typename QtPrivate::ReduceResultType&lt;ReduceFunctor&gt;::ResultType&gt;</div><div class='add'>+           (begin, end,</div><div class='add'>+            QtPrivate::createFunctionWrapper(keep),</div><div class='add'>+            QtPrivate::createFunctionWrapper(reduce),</div><div class='add'>+            options);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-template &lt;typename Iterator, typename C, typename T, typename D, typename U&gt;</div><div class='del'>-QFuture&lt;D&gt; filteredReduced(Iterator begin,</div><div class='del'>-                           Iterator end,</div><div class='del'>-                           bool (C::*keep)() const,</div><div class='del'>-                           T (D::*reduce)(U),</div><div class='del'>-                           ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return filteredReduced&lt;D&gt;(begin,</div><div class='del'>-                              end,</div><div class='del'>-                              ConstMemberFunctionWrapper&lt;bool, C&gt;(keep),</div><div class='del'>-                              MemberFunctionWrapper1&lt;T, D, U&gt;(reduce),</div><div class='del'>-                              options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> // filtered() on sequences</div><div class='ctx'> template &lt;typename Sequence, typename KeepFunctor&gt;</div><div class='ctx'> QFuture&lt;typename Sequence::value_type&gt; filtered(const Sequence &amp;sequence, KeepFunctor keep)</div><div class='ctx'> {</div><div class='del'>-    return startFiltered(sequence, keep);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T&gt;</div><div class='del'>-QFuture&lt;typename Sequence::value_type&gt; filtered(const Sequence &amp;sequence, bool (keep)(T))</div><div class='del'>-{</div><div class='del'>-    return startFiltered(sequence, FunctionWrapper1&lt;bool, T&gt;(keep));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename C&gt;</div><div class='del'>-QFuture&lt;typename Sequence::value_type&gt; filtered(const Sequence &amp;sequence, bool (C::*keep)() const)</div><div class='del'>-{</div><div class='del'>-    return startFiltered(sequence, ConstMemberFunctionWrapper&lt;bool, C&gt;(keep));</div><div class='add'>+    return startFiltered(sequence, QtPrivate::createFunctionWrapper(keep));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // filtered() on iterators</div><div class='ctx'> template &lt;typename Iterator, typename KeepFunctor&gt;</div><div class='ctx'> QFuture&lt;typename qValueType&lt;Iterator&gt;::value_type&gt; filtered(Iterator begin, Iterator end, KeepFunctor keep)</div><div class='ctx'> {</div><div class='del'>-    return startFiltered(begin, end, keep);</div><div class='add'>+    return startFiltered(begin, end, QtPrivate::createFunctionWrapper(keep));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-template &lt;typename Iterator, typename T&gt;</div><div class='del'>-QFuture&lt;typename qValueType&lt;Iterator&gt;::value_type&gt; filtered(Iterator begin, Iterator end, bool (keep)(T))</div><div class='del'>-{</div><div class='del'>-    return startFiltered(begin, end, FunctionWrapper1&lt;bool, T&gt;(keep));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename C&gt;</div><div class='del'>-QFuture&lt;typename qValueType&lt;Iterator&gt;::value_type&gt; filtered(Iterator begin,</div><div class='del'>-                                                Iterator end,</div><div class='del'>-                                                bool (C::*keep)() const)</div><div class='del'>-{</div><div class='del'>-    return startFiltered(begin, end, ConstMemberFunctionWrapper&lt;bool, C&gt;(keep));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> // blocking filter() on sequences</div><div class='ctx'> template &lt;typename Sequence, typename KeepFunctor&gt;</div><div class='ctx'> void blockingFilter(Sequence &amp;sequence, KeepFunctor keep)</div><div class='ctx'> {</div><div class='del'>-    filterInternal(sequence, keep, &amp;Sequence::push_back).startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T&gt;</div><div class='del'>-void blockingFilter(Sequence &amp;sequence, bool (keep)(T))</div><div class='del'>-{</div><div class='del'>-    filterInternal(sequence, FunctionWrapper1&lt;bool, T&gt;(keep), &amp;Sequence::push_back)</div><div class='del'>-        .startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename C&gt;</div><div class='del'>-void blockingFilter(Sequence &amp;sequence, bool (C::*keep)() const)</div><div class='del'>-{</div><div class='del'>-    filterInternal(sequence,</div><div class='del'>-                   ConstMemberFunctionWrapper&lt;bool, C&gt;(keep),</div><div class='del'>-                   &amp;Sequence::push_back)</div><div class='del'>-        .startBlocking();</div><div class='add'>+    filterInternal(sequence, QtPrivate::createFunctionWrapper(keep), &amp;Sequence::push_back).startBlocking();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // blocking filteredReduced() on sequences</div><div class='hunk'>@@ -431,111 +194,20 @@ ResultType blockingFilteredReduced(const Sequence &amp;sequence,</div><div class='ctx'>                                    ReduceFunctor reduce,</div><div class='ctx'>                                    ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='ctx'> {</div><div class='del'>-    return startFilteredReduced&lt;ResultType&gt;(sequence, keep, reduce, options)</div><div class='add'>+    return startFilteredReduced&lt;ResultType&gt;(sequence, QtPrivate::createFunctionWrapper(keep), QtPrivate::createFunctionWrapper(reduce), options)</div><div class='ctx'>         .startBlocking();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-template &lt;typename ResultType, typename Sequence, typename T, typename ReduceFunctor&gt;</div><div class='del'>-ResultType blockingFilteredReduced(const Sequence &amp;sequence,</div><div class='del'>-                                   bool (filter)(T),</div><div class='del'>-                                   ReduceFunctor reduce,</div><div class='del'>-                                   ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced&lt;ResultType&gt;</div><div class='del'>-        (sequence,</div><div class='del'>-         FunctionWrapper1&lt;bool, T&gt;(filter),</div><div class='del'>-         reduce,</div><div class='del'>-         options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename ResultType, typename Sequence, typename C, typename ReduceFunctor&gt;</div><div class='del'>-ResultType blockingFilteredReduced(const Sequence &amp;sequence,</div><div class='del'>-                                   bool (C::*filter)() const,</div><div class='add'>+template &lt;typename Sequence, typename KeepFunctor, typename ReduceFunctor&gt;</div><div class='add'>+typename QtPrivate::ReduceResultType&lt;ReduceFunctor&gt;::ResultType blockingFilteredReduced(const Sequence &amp;sequence,</div><div class='add'>+                                   KeepFunctor keep,</div><div class='ctx'>                                    ReduceFunctor reduce,</div><div class='ctx'>                                    ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='ctx'> {</div><div class='del'>-    return blockingFilteredReduced&lt;ResultType&gt;</div><div class='del'>-        (sequence,</div><div class='del'>-         ConstMemberFunctionWrapper&lt;bool, C&gt;(filter),</div><div class='del'>-         reduce,</div><div class='del'>-         options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename KeepFunctor, typename T, typename U, typename V&gt;</div><div class='del'>-U blockingFilteredReduced(const Sequence &amp;sequence,</div><div class='del'>-                          KeepFunctor keep,</div><div class='del'>-                          T (reduce)(U &amp;, V),</div><div class='del'>-                          ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced&lt;U&gt;</div><div class='del'>-        (sequence,</div><div class='del'>-         keep,</div><div class='del'>-         FunctionWrapper2&lt;T, U &amp;, V&gt;(reduce),</div><div class='del'>-         options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename KeepFunctor, typename T, typename C, typename U&gt;</div><div class='del'>-C blockingFilteredReduced(const Sequence &amp;sequence,</div><div class='del'>-                          KeepFunctor keep,</div><div class='del'>-                          T (C::*reduce)(U),</div><div class='del'>-                          ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced&lt;C&gt;</div><div class='add'>+    return blockingFilteredReduced&lt;typename QtPrivate::ReduceResultType&lt;ReduceFunctor&gt;::ResultType&gt;</div><div class='ctx'>         (sequence,</div><div class='del'>-         keep,</div><div class='del'>-         MemberFunctionWrapper1&lt;T, C, U&gt;(reduce),</div><div class='del'>-         options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename U, typename V, typename W&gt;</div><div class='del'>-V blockingFilteredReduced(const Sequence &amp;sequence,</div><div class='del'>-                          bool (keep)(T),</div><div class='del'>-                          U (reduce)(V &amp;, W),</div><div class='del'>-                          ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced&lt;V&gt;</div><div class='del'>-        (sequence,</div><div class='del'>-         FunctionWrapper1&lt;bool, T&gt;(keep),</div><div class='del'>-         FunctionWrapper2&lt;U, V &amp;, W&gt;(reduce),</div><div class='del'>-         options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename C, typename T, typename U, typename V&gt;</div><div class='del'>-U blockingFilteredReduced(const Sequence &amp;sequence,</div><div class='del'>-                          bool (C::*keep)() const,</div><div class='del'>-                          T (reduce)(U &amp;, V),</div><div class='del'>-                          ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced&lt;U&gt;</div><div class='del'>-        (sequence,</div><div class='del'>-         ConstMemberFunctionWrapper&lt;bool, C&gt;(keep),</div><div class='del'>-         FunctionWrapper2&lt;T, U &amp;, V&gt;(reduce),</div><div class='del'>-         options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename U, typename C, typename V&gt;</div><div class='del'>-C blockingFilteredReduced(const Sequence &amp;sequence,</div><div class='del'>-                          bool (keep)(T),</div><div class='del'>-                          U (C::*reduce)(V),</div><div class='del'>-                          ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced&lt;C&gt;</div><div class='del'>-        (sequence,</div><div class='del'>-         FunctionWrapper1&lt;bool, T&gt;(keep),</div><div class='del'>-         MemberFunctionWrapper1&lt;U, C, V&gt;(reduce),</div><div class='del'>-         options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename C, typename T, typename D, typename U&gt;</div><div class='del'>-D blockingFilteredReduced(const Sequence &amp;sequence,</div><div class='del'>-                          bool (C::*keep)() const,</div><div class='del'>-                          T (D::*reduce)(U),</div><div class='del'>-                          ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced&lt;D&gt;</div><div class='del'>-        (sequence,</div><div class='del'>-         ConstMemberFunctionWrapper&lt;bool, C&gt;(keep),</div><div class='del'>-         MemberFunctionWrapper1&lt;T, D, U&gt;(reduce),</div><div class='add'>+         QtPrivate::createFunctionWrapper(keep),</div><div class='add'>+         QtPrivate::createFunctionWrapper(reduce),</div><div class='ctx'>          options);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -547,150 +219,34 @@ ResultType blockingFilteredReduced(Iterator begin,</div><div class='ctx'>                                    ReduceFunctor reduce,</div><div class='ctx'>                                    ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='ctx'> {</div><div class='del'>-    return startFilteredReduced&lt;ResultType&gt;(begin, end, keep, reduce, options)</div><div class='add'>+    return startFilteredReduced&lt;ResultType&gt;</div><div class='add'>+        (begin, end,</div><div class='add'>+         QtPrivate::createFunctionWrapper(keep),</div><div class='add'>+         QtPrivate::createFunctionWrapper(reduce),</div><div class='add'>+         options)</div><div class='ctx'>         .startBlocking();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-template &lt;typename ResultType, typename Iterator, typename T, typename ReduceFunctor&gt;</div><div class='del'>-ResultType blockingFilteredReduced(Iterator begin,</div><div class='del'>-                                   Iterator end,</div><div class='del'>-                                   bool (filter)(T),</div><div class='del'>-                                   ReduceFunctor reduce,</div><div class='del'>-                                   ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced&lt;ResultType&gt;</div><div class='del'>-        (begin,</div><div class='del'>-         end,</div><div class='del'>-         FunctionWrapper1&lt;bool, T&gt;(filter),</div><div class='del'>-         reduce,</div><div class='del'>-         options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename ResultType, typename Iterator, typename C, typename ReduceFunctor&gt;</div><div class='del'>-ResultType blockingFilteredReduced(Iterator begin,</div><div class='add'>+template &lt;typename Iterator, typename KeepFunctor, typename ReduceFunctor&gt;</div><div class='add'>+typename QtPrivate::ReduceResultType&lt;ReduceFunctor&gt;::ResultType blockingFilteredReduced(Iterator begin,</div><div class='ctx'>                                    Iterator end,</div><div class='del'>-                                   bool (C::*filter)() const,</div><div class='add'>+                                   KeepFunctor keep,</div><div class='ctx'>                                    ReduceFunctor reduce,</div><div class='ctx'>                                    ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='ctx'> {</div><div class='del'>-    return blockingFilteredReduced&lt;ResultType&gt;</div><div class='del'>-        (begin,</div><div class='del'>-         end,</div><div class='del'>-         ConstMemberFunctionWrapper&lt;bool, C&gt;(filter),</div><div class='del'>-         reduce,</div><div class='del'>-         options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename KeepFunctor, typename T, typename U, typename V&gt;</div><div class='del'>-U blockingFilteredReduced(Iterator begin,</div><div class='del'>-                          Iterator end,</div><div class='del'>-                          KeepFunctor keep,</div><div class='del'>-                          T (reduce)(U &amp;, V),</div><div class='del'>-                          ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced&lt;U&gt;</div><div class='del'>-        (begin,</div><div class='del'>-         end,</div><div class='del'>-         keep,</div><div class='del'>-         FunctionWrapper2&lt;T, U &amp;, V&gt;(reduce),</div><div class='del'>-         options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename KeepFunctor, typename T, typename C, typename U&gt;</div><div class='del'>-C blockingFilteredReduced(Iterator begin,</div><div class='del'>-                          Iterator end,</div><div class='del'>-                          KeepFunctor keep,</div><div class='del'>-                          T (C::*reduce)(U),</div><div class='del'>-                          ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced&lt;C&gt;</div><div class='del'>-        (begin,</div><div class='del'>-         end,</div><div class='del'>-         keep,</div><div class='del'>-         MemberFunctionWrapper1&lt;T, C, U&gt;(reduce),</div><div class='del'>-         options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename U, typename V, typename W&gt;</div><div class='del'>-V blockingFilteredReduced(Iterator begin,</div><div class='del'>-                          Iterator end,</div><div class='del'>-                          bool (keep)(T),</div><div class='del'>-                          U (reduce)(V &amp;, W),</div><div class='del'>-                          ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced&lt;V&gt;</div><div class='del'>-        (begin,</div><div class='del'>-         end,</div><div class='del'>-         FunctionWrapper1&lt;bool, T&gt;(keep),</div><div class='del'>-         FunctionWrapper2&lt;U, V &amp;, W&gt;(reduce),</div><div class='del'>-         options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename C, typename T, typename U, typename V&gt;</div><div class='del'>-U blockingFilteredReduced(Iterator begin,</div><div class='del'>-                          Iterator end,</div><div class='del'>-                          bool (C::*keep)() const,</div><div class='del'>-                          T (reduce)(U &amp;, V),</div><div class='del'>-                          ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced&lt;U&gt;</div><div class='del'>-        (begin,</div><div class='del'>-         end,</div><div class='del'>-         ConstMemberFunctionWrapper&lt;bool, C&gt;(keep),</div><div class='del'>-         FunctionWrapper2&lt;T, U &amp;, V&gt;(reduce),</div><div class='del'>-         options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename U, typename C, typename V&gt;</div><div class='del'>-C blockingFilteredReduced(Iterator begin,</div><div class='del'>-                          Iterator end,</div><div class='del'>-                          bool (keep)(T),</div><div class='del'>-                          U (C::*reduce)(V),</div><div class='del'>-                          ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced&lt;C&gt;</div><div class='del'>-        (begin,</div><div class='del'>-         end,</div><div class='del'>-         FunctionWrapper1&lt;bool, T&gt;(keep),</div><div class='del'>-         MemberFunctionWrapper1&lt;U, C, V&gt;(reduce),</div><div class='del'>-         options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename C, typename T, typename D, typename U&gt;</div><div class='del'>-D blockingFilteredReduced(Iterator begin,</div><div class='del'>-                          Iterator end,</div><div class='del'>-                          bool (C::*keep)() const,</div><div class='del'>-                          T (D::*reduce)(U),</div><div class='del'>-                          ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced&lt;D&gt;</div><div class='del'>-        (begin,</div><div class='del'>-         end,</div><div class='del'>-         ConstMemberFunctionWrapper&lt;bool, C&gt;(keep),</div><div class='del'>-         MemberFunctionWrapper1&lt;T, D, U&gt;(reduce),</div><div class='del'>-         options);</div><div class='add'>+    return startFilteredReduced&lt;typename QtPrivate::ReduceResultType&lt;ReduceFunctor&gt;::ResultType&gt;</div><div class='add'>+        (begin, end,</div><div class='add'>+         QtPrivate::createFunctionWrapper(keep),</div><div class='add'>+         QtPrivate::createFunctionWrapper(reduce),</div><div class='add'>+         options)</div><div class='add'>+        .startBlocking();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // blocking filtered() on sequences</div><div class='ctx'> template &lt;typename Sequence, typename KeepFunctor&gt;</div><div class='ctx'> Sequence blockingFiltered(const Sequence &amp;sequence, KeepFunctor keep)</div><div class='ctx'> {</div><div class='del'>-    return blockingFilteredReduced(sequence, keep, &amp;Sequence::push_back, OrderedReduce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T&gt;</div><div class='del'>-Sequence blockingFiltered(const Sequence &amp;sequence, bool (keep)(T))</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced(sequence, keep, &amp;Sequence::push_back, OrderedReduce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename C&gt;</div><div class='del'>-Sequence blockingFiltered(const Sequence &amp;sequence, bool (C::*filter)() const)</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced(sequence,</div><div class='del'>-                                   filter,</div><div class='del'>-                                   &amp;Sequence::push_back,</div><div class='del'>-                                   OrderedReduce);</div><div class='add'>+    return blockingFilteredReduced(sequence, QtPrivate::createFunctionWrapper(keep), &amp;Sequence::push_back, OrderedReduce);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // blocking filtered() on iterators</div><div class='hunk'>@@ -699,27 +255,7 @@ OutputSequence blockingFiltered(Iterator begin, Iterator end, KeepFunctor keep)</div><div class='ctx'> {</div><div class='ctx'>     return blockingFilteredReduced(begin,</div><div class='ctx'>                                    end,</div><div class='del'>-                                   keep,</div><div class='del'>-                                   &amp;OutputSequence::push_back,</div><div class='del'>-                                   OrderedReduce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename OutputSequence, typename Iterator, typename T&gt;</div><div class='del'>-OutputSequence blockingFiltered(Iterator begin, Iterator end, bool (keep)(T))</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced(begin,</div><div class='del'>-                                   end,</div><div class='del'>-                                   keep,</div><div class='del'>-                                   &amp;OutputSequence::push_back,</div><div class='del'>-                                   OrderedReduce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename OutputSequence, typename Iterator, typename C&gt;</div><div class='del'>-OutputSequence blockingFiltered(Iterator begin, Iterator end, bool (C::*filter)() const)</div><div class='del'>-{</div><div class='del'>-    return blockingFilteredReduced(begin,</div><div class='del'>-                                   end,</div><div class='del'>-                                   filter,</div><div class='add'>+                                   QtPrivate::createFunctionWrapper(keep),</div><div class='ctx'>                                    &amp;OutputSequence::push_back,</div><div class='ctx'>                                    OrderedReduce);</div><div class='ctx'> }</div><div class='head'>diff --git a/src/corelib/concurrent/qtconcurrentfunctionwrappers.h b/src/corelib/concurrent/qtconcurrentfunctionwrappers.h<br/>index 7f83697..4bf2736 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentfunctionwrappers.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentfunctionwrappers.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentfunctionwrappers.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/concurrent/qtconcurrentfunctionwrappers.h</a></div><div class='hunk'>@@ -163,6 +163,118 @@ private:</div><div class='ctx'> </div><div class='ctx'> } // namespace QtConcurrent.</div><div class='ctx'> </div><div class='add'>+namespace QtPrivate {</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+const T&amp; createFunctionWrapper(const T&amp; t)</div><div class='add'>+{</div><div class='add'>+    return t;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T, typename U&gt;</div><div class='add'>+QtConcurrent::FunctionWrapper1&lt;T, U&gt; createFunctionWrapper(T (*func)(U))</div><div class='add'>+{</div><div class='add'>+    return QtConcurrent::FunctionWrapper1&lt;T, U&gt;(func);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T, typename C&gt;</div><div class='add'>+QtConcurrent::MemberFunctionWrapper&lt;T, C&gt; createFunctionWrapper(T (C::*func)())</div><div class='add'>+{</div><div class='add'>+    return QtConcurrent::MemberFunctionWrapper&lt;T, C&gt;(func);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T, typename C, typename U&gt;</div><div class='add'>+QtConcurrent::MemberFunctionWrapper1&lt;T, C, U&gt; createFunctionWrapper(T (C::*func)(U))</div><div class='add'>+{</div><div class='add'>+    return QtConcurrent::MemberFunctionWrapper1&lt;T, C, U&gt;(func);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T, typename C&gt;</div><div class='add'>+QtConcurrent::ConstMemberFunctionWrapper&lt;T, C&gt; createFunctionWrapper(T (C::*func)() const)</div><div class='add'>+{</div><div class='add'>+    return QtConcurrent::ConstMemberFunctionWrapper&lt;T, C&gt;(func);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename Functor, bool foo = HasResultType&lt;Functor&gt;::Value&gt;</div><div class='add'>+struct LazyResultType { typedef typename Functor::result_type Type; };</div><div class='add'>+template &lt;typename Functor&gt;</div><div class='add'>+struct LazyResultType&lt;Functor, false&gt; { typedef void Type; };</div><div class='add'>+</div><div class='add'>+template &lt;class T&gt;</div><div class='add'>+struct ReduceResultType;</div><div class='add'>+</div><div class='add'>+template &lt;class U, class V&gt;</div><div class='add'>+struct ReduceResultType&lt;void(*)(U&amp;,V)&gt;</div><div class='add'>+{</div><div class='add'>+    typedef U ResultType;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+template &lt;class T, class C, class U&gt;</div><div class='add'>+struct ReduceResultType&lt;T(C::*)(U)&gt;</div><div class='add'>+{</div><div class='add'>+    typedef C ResultType;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+template &lt;class InputSequence, class MapFunctor&gt;</div><div class='add'>+struct MapResultType</div><div class='add'>+{</div><div class='add'>+    typedef typename LazyResultType&lt;MapFunctor&gt;::Type ResultType;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+template &lt;class U, class V&gt;</div><div class='add'>+struct MapResultType&lt;void, U (*)(V)&gt;</div><div class='add'>+{</div><div class='add'>+    typedef U ResultType;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+template &lt;class T, class C&gt;</div><div class='add'>+struct MapResultType&lt;void, T(C::*)() const&gt;</div><div class='add'>+{</div><div class='add'>+    typedef T ResultType;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_TEMPLATE_TEMPLATE_PARAMETERS</div><div class='add'>+</div><div class='add'>+template &lt;template &lt;typename&gt; class InputSequence, typename MapFunctor, typename T&gt;</div><div class='add'>+struct MapResultType&lt;InputSequence&lt;T&gt;, MapFunctor&gt;</div><div class='add'>+{</div><div class='add'>+    typedef InputSequence&lt;typename LazyResultType&lt;MapFunctor&gt;::Type&gt; ResultType;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+template &lt;template &lt;typename&gt; class InputSequence, class T, class U, class V&gt;</div><div class='add'>+struct MapResultType&lt;InputSequence&lt;T&gt;, U (*)(V)&gt;</div><div class='add'>+{</div><div class='add'>+    typedef InputSequence&lt;U&gt; ResultType;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+template &lt;template &lt;typename&gt; class InputSequence, class T, class U, class C&gt;</div><div class='add'>+struct MapResultType&lt;InputSequence&lt;T&gt;, U(C::*)() const&gt;</div><div class='add'>+{</div><div class='add'>+    typedef InputSequence&lt;U&gt; ResultType;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif // QT_NO_TEMPLATE_TEMPLATE_PARAMETER</div><div class='add'>+</div><div class='add'>+template &lt;class MapFunctor&gt;</div><div class='add'>+struct MapResultType&lt;QStringList, MapFunctor&gt;</div><div class='add'>+{</div><div class='add'>+    typedef QList&lt;typename LazyResultType&lt;MapFunctor&gt;::Type&gt; ResultType;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+template &lt;class U, class V&gt;</div><div class='add'>+struct MapResultType&lt;QStringList, U (*)(V)&gt;</div><div class='add'>+{</div><div class='add'>+    typedef QList&lt;U&gt; ResultType;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+template &lt;class U, class C&gt;</div><div class='add'>+struct MapResultType&lt;QStringList, U(C::*)() const&gt;</div><div class='add'>+{</div><div class='add'>+    typedef QList&lt;U&gt; ResultType;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+} // namespace QtPrivate.</div><div class='add'>+</div><div class='ctx'> #endif //qdoc</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/concurrent/qtconcurrentiteratekernel.h b/src/corelib/concurrent/qtconcurrentiteratekernel.h<br/>index d14ea54..3aaf5dd 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentiteratekernel.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentiteratekernel.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentiteratekernel.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/concurrent/qtconcurrentiteratekernel.h</a></div><div class='hunk'>@@ -184,12 +184,9 @@ public:</div><div class='ctx'> #if defined (QT_NO_STL)</div><div class='ctx'>         : begin(_begin), end(_end), current(_begin), currentIndex(0),</div><div class='ctx'>            forIteration(false), progressReportingEnabled(true)</div><div class='del'>-#elif !defined(QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION)</div><div class='add'>+#else</div><div class='ctx'>         : begin(_begin), end(_end), current(_begin), currentIndex(0),</div><div class='ctx'>            forIteration(selectIteration(typename std::iterator_traits&lt;Iterator&gt;::iterator_category())), progressReportingEnabled(true)</div><div class='del'>-#else</div><div class='del'>-        : begin(_begin), end(_end), currentIndex(0),</div><div class='del'>-          forIteration(selectIteration(std::iterator_category(_begin))), progressReportingEnabled(true)</div><div class='ctx'> #endif</div><div class='ctx'>     {</div><div class='ctx'> #if defined (QT_NO_STL)</div><div class='head'>diff --git a/src/corelib/concurrent/qtconcurrentmap.h b/src/corelib/concurrent/qtconcurrentmap.h<br/>index 6615117..37a4143 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentmap.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentmap.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentmap.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/concurrent/qtconcurrentmap.h</a></div><div class='hunk'>@@ -110,38 +110,14 @@ namespace QtConcurrent {</div><div class='ctx'> template &lt;typename Sequence, typename MapFunctor&gt;</div><div class='ctx'> QFuture&lt;void&gt; map(Sequence &amp;sequence, MapFunctor map)</div><div class='ctx'> {</div><div class='del'>-    return startMap(sequence.begin(), sequence.end(), map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename U&gt;</div><div class='del'>-QFuture&lt;void&gt; map(Sequence &amp;sequence, T (map)(U))</div><div class='del'>-{</div><div class='del'>-    return startMap(sequence.begin(), sequence.end(), FunctionWrapper1&lt;T, U&gt;(map));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename C&gt;</div><div class='del'>-QFuture&lt;void&gt; map(Sequence &amp;sequence, T (C::*map)())</div><div class='del'>-{</div><div class='del'>-    return startMap(sequence.begin(), sequence.end(), MemberFunctionWrapper&lt;T, C&gt;(map));</div><div class='add'>+    return startMap(sequence.begin(), sequence.end(), QtPrivate::createFunctionWrapper(map));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // map() on iterators</div><div class='ctx'> template &lt;typename Iterator, typename MapFunctor&gt;</div><div class='ctx'> QFuture&lt;void&gt; map(Iterator begin, Iterator end, MapFunctor map)</div><div class='ctx'> {</div><div class='del'>-    return startMap(begin, end, map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename U&gt;</div><div class='del'>-QFuture&lt;void&gt; map(Iterator begin, Iterator end, T (map)(U))</div><div class='del'>-{</div><div class='del'>-    return startMap(begin, end, FunctionWrapper1&lt;T, U&gt;(map));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename C&gt;</div><div class='del'>-QFuture&lt;void&gt; map(Iterator begin, Iterator end, T (C::*map)())</div><div class='del'>-{</div><div class='del'>-    return startMap(begin, end, MemberFunctionWrapper&lt;T, C&gt;(map));</div><div class='add'>+    return startMap(begin, end, QtPrivate::createFunctionWrapper(map));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // mappedReduced() for sequences.</div><div class='hunk'>@@ -151,88 +127,24 @@ QFuture&lt;ResultType&gt; mappedReduced(const Sequence &amp;sequence,</div><div class='ctx'>                                   ReduceFunctor reduce,</div><div class='ctx'>                                   ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='ctx'> {</div><div class='del'>-    return startMappedReduced&lt;typename MapFunctor::result_type, ResultType&gt;</div><div class='del'>-    (sequence, map, reduce, options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename MapFunctor, typename T, typename U, typename V&gt;</div><div class='del'>-QFuture&lt;U&gt; mappedReduced(const Sequence &amp;sequence,</div><div class='del'>-                         MapFunctor map,</div><div class='del'>-                         T (reduce)(U &amp;, V),</div><div class='del'>-                         ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return startMappedReduced&lt;typename MapFunctor::result_type, U&gt;</div><div class='del'>-    (sequence, map, FunctionWrapper2&lt;T, U &amp;, V&gt;(reduce), options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename MapFunctor, typename T, typename C, typename U&gt;</div><div class='del'>-QFuture&lt;C&gt; mappedReduced(const Sequence &amp;sequence,</div><div class='del'>-                         MapFunctor map,</div><div class='del'>-                         T (C::*reduce)(U),</div><div class='del'>-                         ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return startMappedReduced&lt;typename MapFunctor::result_type, C&gt;</div><div class='del'>-    (sequence, map, MemberFunctionWrapper1&lt;T, C, U&gt;(reduce), options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename ResultType, typename Sequence, typename T, typename U, typename ReduceFunctor&gt;</div><div class='del'>-QFuture&lt;ResultType&gt; mappedReduced(const Sequence &amp;sequence,</div><div class='del'>-                                  T (map)(U),</div><div class='del'>-                                  ReduceFunctor reduce,</div><div class='del'>-                                  ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return startMappedReduced&lt;T, ResultType&gt;</div><div class='del'>-    (sequence, FunctionWrapper1&lt;T, U&gt;(map), reduce, options);</div><div class='add'>+    return startMappedReduced&lt;typename QtPrivate::MapResultType&lt;void, MapFunctor&gt;::ResultType, ResultType&gt;</div><div class='add'>+        (sequence,</div><div class='add'>+         QtPrivate::createFunctionWrapper(map),</div><div class='add'>+         QtPrivate::createFunctionWrapper(reduce),</div><div class='add'>+         options);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-template &lt;typename ResultType, typename Sequence, typename T, typename C, typename ReduceFunctor&gt;</div><div class='del'>-QFuture&lt;ResultType&gt; mappedReduced(const Sequence &amp;sequence,</div><div class='del'>-                                  T (C::*map)() const,</div><div class='add'>+template &lt;typename Sequence, typename MapFunctor, typename ReduceFunctor&gt;</div><div class='add'>+QFuture&lt;typename QtPrivate::ReduceResultType&lt;ReduceFunctor&gt;::ResultType&gt; mappedReduced(const Sequence &amp;sequence,</div><div class='add'>+                                  MapFunctor map,</div><div class='ctx'>                                   ReduceFunctor reduce,</div><div class='ctx'>                                   ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='ctx'> {</div><div class='del'>-    return startMappedReduced&lt;T, ResultType&gt;</div><div class='del'>-    (sequence, ConstMemberFunctionWrapper&lt;T, C&gt;(map), reduce, options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename U, typename V, typename W, typename X&gt;</div><div class='del'>-QFuture&lt;W&gt; mappedReduced(const Sequence &amp;sequence,</div><div class='del'>-                         T (map)(U),</div><div class='del'>-                         V (reduce)(W &amp;, X),</div><div class='del'>-                         ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return startMappedReduced&lt;T, W&gt;</div><div class='del'>-    (sequence, FunctionWrapper1&lt;T, U&gt;(map), FunctionWrapper2&lt;V, W &amp;, X&gt;(reduce), options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename C, typename U, typename V, typename W&gt;</div><div class='del'>-QFuture&lt;V&gt; mappedReduced(const Sequence &amp;sequence,</div><div class='del'>-                         T (C::*map)() const,</div><div class='del'>-                         U (reduce)(V &amp;, W),</div><div class='del'>-                         ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return startMappedReduced&lt;T, V&gt; (sequence, ConstMemberFunctionWrapper&lt;T, C&gt;(map),</div><div class='del'>-                                    FunctionWrapper2&lt;U, V &amp;, W&gt;(reduce), options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename U, typename V, typename C, typename W&gt;</div><div class='del'>-QFuture&lt;C&gt; mappedReduced(const Sequence &amp;sequence,</div><div class='del'>-                         T (map)(U),</div><div class='del'>-                         V (C::*reduce)(W),</div><div class='del'>-                         ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return startMappedReduced&lt;T, C&gt; (sequence, FunctionWrapper1&lt;T, U&gt;(map),</div><div class='del'>-                                     MemberFunctionWrapper1&lt;V, C, W&gt;(reduce), options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename C, typename U,typename D, typename V&gt;</div><div class='del'>-QFuture&lt;D&gt; mappedReduced(const Sequence &amp;sequence,</div><div class='del'>-                         T (C::*map)() const,</div><div class='del'>-                         U (D::*reduce)(V),</div><div class='del'>-                         ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return startMappedReduced&lt;T, D&gt;(sequence, ConstMemberFunctionWrapper&lt;T, C&gt;(map),</div><div class='del'>-                                    MemberFunctionWrapper1&lt;U, D, V&gt;(reduce), options);</div><div class='add'>+    return startMappedReduced&lt;typename QtPrivate::MapResultType&lt;void, MapFunctor&gt;::ResultType, typename QtPrivate::ReduceResultType&lt;ReduceFunctor&gt;::ResultType&gt;</div><div class='add'>+        (sequence,</div><div class='add'>+         QtPrivate::createFunctionWrapper(map),</div><div class='add'>+         QtPrivate::createFunctionWrapper(reduce),</div><div class='add'>+         options);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // mappedReduced() for iterators</div><div class='hunk'>@@ -243,295 +155,85 @@ QFuture&lt;ResultType&gt; mappedReduced(Iterator begin,</div><div class='ctx'>                                   ReduceFunctor reduce,</div><div class='ctx'>                                   ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='ctx'> {</div><div class='del'>-    return startMappedReduced&lt;ResultType, typename MapFunctor::result_type&gt;</div><div class='del'>-    (begin, end, map, reduce, options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename MapFunctor, typename T, typename U, typename V&gt;</div><div class='del'>-QFuture&lt;U&gt; mappedReduced(Iterator begin,</div><div class='del'>-                         Iterator end,</div><div class='del'>-                         MapFunctor map,</div><div class='del'>-                         T (reduce)(U &amp;, V),</div><div class='del'>-                         ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return startMappedReduced&lt;typename MapFunctor::result_type, U&gt;</div><div class='del'>-    (begin, end, map, FunctionWrapper2&lt;T, U &amp;, V&gt;(reduce), options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename MapFunctor, typename T, typename C, typename U&gt;</div><div class='del'>-QFuture&lt;C&gt; mappedReduced(Iterator begin,</div><div class='del'>-                         Iterator end,</div><div class='del'>-                         MapFunctor map,</div><div class='del'>-                         T (C::*reduce)(U),</div><div class='del'>-                         ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return startMappedReduced&lt;typename MapFunctor::result_type, C&gt;</div><div class='del'>-    (begin, end, map, MemberFunctionWrapper1&lt;T, C, U&gt;(reduce), options);</div><div class='add'>+    return startMappedReduced&lt;typename QtPrivate::MapResultType&lt;void, MapFunctor&gt;::ResultType, ResultType&gt;</div><div class='add'>+        (begin, end,</div><div class='add'>+         QtPrivate::createFunctionWrapper(map),</div><div class='add'>+         QtPrivate::createFunctionWrapper(reduce),</div><div class='add'>+         options);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-template &lt;typename ResultType, typename Iterator, typename T, typename U, typename ReduceFunctor&gt;</div><div class='del'>-QFuture&lt;ResultType&gt; mappedReduced(Iterator begin,</div><div class='add'>+template &lt;typename Iterator, typename MapFunctor, typename ReduceFunctor&gt;</div><div class='add'>+QFuture&lt;typename QtPrivate::ReduceResultType&lt;ReduceFunctor&gt;::ResultType&gt; mappedReduced(Iterator begin,</div><div class='ctx'>                                   Iterator end,</div><div class='del'>-                                  T (map)(U),</div><div class='del'>-                                  ReduceFunctor reduce,</div><div class='del'>-                                  ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return startMappedReduced&lt;T, ResultType&gt;</div><div class='del'>-    (begin, end, FunctionWrapper1&lt;T, U&gt;(map), reduce, options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename ResultType, typename Iterator, typename T, typename C, typename ReduceFunctor&gt;</div><div class='del'>-QFuture&lt;ResultType&gt; mappedReduced(Iterator begin,</div><div class='del'>-                                  Iterator end,</div><div class='del'>-                                  T (C::*map)() const,</div><div class='add'>+                                  MapFunctor map,</div><div class='ctx'>                                   ReduceFunctor reduce,</div><div class='ctx'>                                   ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='ctx'> {</div><div class='del'>-    return startMappedReduced&lt;T, ResultType&gt;</div><div class='del'>-    (begin, end, ConstMemberFunctionWrapper&lt;T, C&gt;(map), reduce, options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename U, typename V, typename W, typename X&gt;</div><div class='del'>-QFuture&lt;W&gt; mappedReduced(Iterator begin,</div><div class='del'>-                         Iterator end,</div><div class='del'>-                         T (map)(U),</div><div class='del'>-                         V (reduce)(W &amp;, X),</div><div class='del'>-                         ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return startMappedReduced&lt;T, W&gt;</div><div class='del'>-    (begin, end, FunctionWrapper1&lt;T, U&gt;(map), FunctionWrapper2&lt;V, W &amp;, X&gt;(reduce), options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename C, typename U, typename V, typename W&gt;</div><div class='del'>-QFuture&lt;V&gt; mappedReduced(Iterator begin,</div><div class='del'>-                         Iterator end,</div><div class='del'>-                         T (C::*map)() const,</div><div class='del'>-                         U (reduce)(V &amp;, W),</div><div class='del'>-                         ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return startMappedReduced&lt;T, V&gt;(begin, end, ConstMemberFunctionWrapper&lt;T, C&gt;(map),</div><div class='del'>-                                   FunctionWrapper2&lt;U, V &amp;, W&gt;(reduce), options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename U, typename V, typename C, typename W&gt;</div><div class='del'>-QFuture&lt;C&gt; mappedReduced(Iterator begin,</div><div class='del'>-                         Iterator end,</div><div class='del'>-                         T (map)(U),</div><div class='del'>-                         V (C::*reduce)(W),</div><div class='del'>-                         ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return startMappedReduced&lt;T, C&gt;</div><div class='del'>-    (begin, end, FunctionWrapper1&lt;T, U&gt;(map), MemberFunctionWrapper1&lt;V, C, W&gt;(reduce), options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename C, typename U,typename D, typename V&gt;</div><div class='del'>-QFuture&lt;D&gt; mappedReduced(Iterator begin,</div><div class='del'>-                         Iterator end,</div><div class='del'>-                         T (C::*map)() const,</div><div class='del'>-                         U (D::*reduce)(V),</div><div class='del'>-                         ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return startMappedReduced&lt;T, D&gt;(begin, end, ConstMemberFunctionWrapper&lt;T, C&gt;(map),</div><div class='del'>-                                    MemberFunctionWrapper1&lt;U, D, V&gt;(reduce), options);</div><div class='add'>+    return startMappedReduced&lt;typename QtPrivate::MapResultType&lt;void, MapFunctor&gt;::ResultType, typename QtPrivate::ReduceResultType&lt;ReduceFunctor&gt;::ResultType&gt;</div><div class='add'>+        (begin, end,</div><div class='add'>+         QtPrivate::createFunctionWrapper(map),</div><div class='add'>+         QtPrivate::createFunctionWrapper(reduce),</div><div class='add'>+         options);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // mapped() for sequences</div><div class='ctx'> template &lt;typename Sequence, typename MapFunctor&gt;</div><div class='del'>-QFuture&lt;typename MapFunctor::result_type&gt; mapped(const Sequence &amp;sequence, MapFunctor map)</div><div class='add'>+QFuture&lt;typename QtPrivate::MapResultType&lt;void, MapFunctor&gt;::ResultType&gt; mapped(const Sequence &amp;sequence, MapFunctor map)</div><div class='ctx'> {</div><div class='del'>-    return startMapped&lt;typename MapFunctor::result_type&gt;(sequence, map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename U&gt;</div><div class='del'>-QFuture&lt;T&gt; mapped(const Sequence &amp;sequence, T (map)(U))</div><div class='del'>-{</div><div class='del'>-   return startMapped&lt;T&gt;(sequence, FunctionWrapper1&lt;T, U&gt;(map));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename C&gt;</div><div class='del'>-QFuture&lt;T&gt; mapped(const Sequence &amp;sequence, T (C::*map)() const)</div><div class='del'>-{</div><div class='del'>-    return startMapped&lt;T&gt;(sequence, ConstMemberFunctionWrapper&lt;T, C&gt;(map));</div><div class='add'>+    return startMapped&lt;typename QtPrivate::MapResultType&lt;void, MapFunctor&gt;::ResultType&gt;(sequence, QtPrivate::createFunctionWrapper(map));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // mapped() for iterator ranges.</div><div class='ctx'> template &lt;typename Iterator, typename MapFunctor&gt;</div><div class='del'>-QFuture&lt;typename MapFunctor::result_type&gt; mapped(Iterator begin, Iterator end, MapFunctor map)</div><div class='del'>-{</div><div class='del'>-    return startMapped&lt;Q_TYPENAME MapFunctor::result_type&gt;(begin, end, map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename U&gt;</div><div class='del'>-QFuture&lt;T&gt; mapped(Iterator begin, Iterator end, T (map)(U))</div><div class='add'>+QFuture&lt;typename QtPrivate::MapResultType&lt;void, MapFunctor&gt;::ResultType&gt; mapped(Iterator begin, Iterator end, MapFunctor map)</div><div class='ctx'> {</div><div class='del'>-    return startMapped&lt;T&gt;(begin, end, FunctionWrapper1&lt;T, U&gt;(map));</div><div class='add'>+    return startMapped&lt;typename QtPrivate::MapResultType&lt;void, MapFunctor&gt;::ResultType&gt;(begin, end, QtPrivate::createFunctionWrapper(map));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-template &lt;typename Iterator, typename T, typename C&gt;</div><div class='del'>-QFuture&lt;T&gt; mapped(Iterator begin, Iterator end, T (C::*map)() const)</div><div class='del'>-{</div><div class='del'>-    return startMapped&lt;T&gt;(begin, end, ConstMemberFunctionWrapper&lt;T, C&gt;(map));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+// blockingMap() for sequences</div><div class='ctx'> template &lt;typename Sequence, typename MapFunctor&gt;</div><div class='ctx'> void blockingMap(Sequence &amp;sequence, MapFunctor map)</div><div class='ctx'> {</div><div class='del'>-    startMap(sequence.begin(), sequence.end(), map).startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename U&gt;</div><div class='del'>-void blockingMap(Sequence &amp;sequence, T (map)(U))</div><div class='del'>-{</div><div class='del'>-    startMap(sequence.begin(), sequence.end(), QtConcurrent::FunctionWrapper1&lt;T, U&gt;(map)).startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename C&gt;</div><div class='del'>-void blockingMap(Sequence &amp;sequence, T (C::*map)())</div><div class='del'>-{</div><div class='del'>-    startMap(sequence.begin(), sequence.end(), QtConcurrent::MemberFunctionWrapper&lt;T, C&gt;(map)).startBlocking();</div><div class='add'>+    startMap(sequence.begin(), sequence.end(), QtPrivate::createFunctionWrapper(map)).startBlocking();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+// blockingMap() for iterator ranges</div><div class='ctx'> template &lt;typename Iterator, typename MapFunctor&gt;</div><div class='ctx'> void blockingMap(Iterator begin, Iterator end, MapFunctor map)</div><div class='ctx'> {</div><div class='del'>-    startMap(begin, end, map).startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename U&gt;</div><div class='del'>-void blockingMap(Iterator begin, Iterator end, T (map)(U))</div><div class='del'>-{</div><div class='del'>-    startMap(begin, end, QtConcurrent::FunctionWrapper1&lt;T, U&gt;(map)).startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename C&gt;</div><div class='del'>-void blockingMap(Iterator begin, Iterator end, T (C::*map)())</div><div class='del'>-{</div><div class='del'>-    startMap(begin, end, QtConcurrent::MemberFunctionWrapper&lt;T, C&gt;(map)).startBlocking();</div><div class='add'>+    startMap(begin, end, QtPrivate::createFunctionWrapper(map)).startBlocking();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+// blockingMappedReduced() for sequences</div><div class='ctx'> template &lt;typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor&gt;</div><div class='ctx'> ResultType blockingMappedReduced(const Sequence &amp;sequence,</div><div class='ctx'>                                  MapFunctor map,</div><div class='ctx'>                                  ReduceFunctor reduce,</div><div class='ctx'>                                  ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='ctx'> {</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;typename MapFunctor::result_type, ResultType&gt;</div><div class='del'>-    (sequence, map, reduce, options).startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename MapFunctor, typename T, typename U, typename V&gt;</div><div class='del'>-U blockingMappedReduced(const Sequence &amp;sequence,</div><div class='del'>-                        MapFunctor map,</div><div class='del'>-                        T (reduce)(U &amp;, V),</div><div class='del'>-                        QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;typename MapFunctor::result_type, U&gt;</div><div class='del'>-        (sequence,</div><div class='del'>-         map,</div><div class='del'>-         QtConcurrent::FunctionWrapper2&lt;T, U &amp;, V&gt;(reduce),</div><div class='del'>-         options)</div><div class='del'>-        .startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename MapFunctor, typename T, typename C, typename U&gt;</div><div class='del'>-C blockingMappedReduced(const Sequence &amp;sequence,</div><div class='del'>-                        MapFunctor map,</div><div class='del'>-                        T (C::*reduce)(U),</div><div class='del'>-                        QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;typename MapFunctor::result_type, C&gt;</div><div class='del'>-        (sequence,</div><div class='del'>-         map,</div><div class='del'>-         QtConcurrent::MemberFunctionWrapper1&lt;T, C, U&gt;(reduce),</div><div class='del'>-         options)</div><div class='del'>-        .startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename ResultType, typename Sequence, typename T, typename U, typename ReduceFunctor&gt;</div><div class='del'>-ResultType blockingMappedReduced(const Sequence &amp;sequence,</div><div class='del'>-                                 T (map)(U),</div><div class='del'>-                                 ReduceFunctor reduce,</div><div class='del'>-                                 QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;T, ResultType&gt;</div><div class='add'>+    return QtConcurrent::startMappedReduced&lt;typename QtPrivate::MapResultType&lt;void, MapFunctor&gt;::ResultType, ResultType&gt;</div><div class='ctx'>         (sequence,</div><div class='del'>-         QtConcurrent::FunctionWrapper1&lt;T, U&gt;(map),</div><div class='del'>-         reduce,</div><div class='add'>+         QtPrivate::createFunctionWrapper(map),</div><div class='add'>+         QtPrivate::createFunctionWrapper(reduce),</div><div class='ctx'>          options)</div><div class='ctx'>         .startBlocking();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-template &lt;typename ResultType, typename Sequence, typename T, typename C, typename ReduceFunctor&gt;</div><div class='del'>-ResultType blockingMappedReduced(const Sequence &amp;sequence,</div><div class='del'>-                                 T (C::*map)() const,</div><div class='add'>+template &lt;typename MapFunctor, typename ReduceFunctor, typename Sequence&gt;</div><div class='add'>+typename QtPrivate::ReduceResultType&lt;ReduceFunctor&gt;::ResultType blockingMappedReduced(const Sequence &amp;sequence,</div><div class='add'>+                                 MapFunctor map,</div><div class='ctx'>                                  ReduceFunctor reduce,</div><div class='del'>-                                 QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;T, ResultType&gt;</div><div class='del'>-        (sequence,</div><div class='del'>-         QtConcurrent::ConstMemberFunctionWrapper&lt;T, C&gt;(map),</div><div class='del'>-         reduce,</div><div class='del'>-         options)</div><div class='del'>-        .startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename U, typename V, typename W, typename X&gt;</div><div class='del'>-W blockingMappedReduced(const Sequence &amp;sequence,</div><div class='del'>-                        T (map)(U),</div><div class='del'>-                        V (reduce)(W &amp;, X),</div><div class='del'>-                        QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;T, W&gt;</div><div class='del'>-        (sequence,</div><div class='del'>-         QtConcurrent::FunctionWrapper1&lt;T, U&gt;(map),</div><div class='del'>-         QtConcurrent::FunctionWrapper2&lt;V, W &amp;, X&gt;(reduce),</div><div class='del'>-         options)</div><div class='del'>-        .startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename C, typename U, typename V, typename W&gt;</div><div class='del'>-V blockingMappedReduced(const Sequence &amp;sequence,</div><div class='del'>-                        T (C::*map)() const,</div><div class='del'>-                        U (reduce)(V &amp;, W),</div><div class='del'>-                        QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;T, V&gt;</div><div class='del'>-        (sequence,</div><div class='del'>-         QtConcurrent::ConstMemberFunctionWrapper&lt;T, C&gt;(map),</div><div class='del'>-         QtConcurrent::FunctionWrapper2&lt;U, V &amp;, W&gt;(reduce),</div><div class='del'>-         options)</div><div class='del'>-        .startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename U, typename V, typename C, typename W&gt;</div><div class='del'>-C blockingMappedReduced(const Sequence &amp;sequence,</div><div class='del'>-                        T (map)(U),</div><div class='del'>-                        V (C::*reduce)(W),</div><div class='del'>-                        QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;T, C&gt;</div><div class='del'>-        (sequence,</div><div class='del'>-         QtConcurrent::FunctionWrapper1&lt;T, U&gt;(map),</div><div class='del'>-         QtConcurrent::MemberFunctionWrapper1&lt;V, C, W&gt;(reduce),</div><div class='del'>-         options)</div><div class='del'>-        .startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename T, typename C, typename U,typename D, typename V&gt;</div><div class='del'>-D blockingMappedReduced(const Sequence &amp;sequence,</div><div class='del'>-                        T (C::*map)() const,</div><div class='del'>-                        U (D::*reduce)(V),</div><div class='del'>-                        QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='add'>+                                 ReduceOptions options = ReduceOptions(UnorderedReduce | SequentialReduce))</div><div class='ctx'> {</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;T, D&gt;</div><div class='add'>+    return QtConcurrent::startMappedReduced&lt;typename QtPrivate::MapResultType&lt;void, MapFunctor&gt;::ResultType, typename QtPrivate::ReduceResultType&lt;ReduceFunctor&gt;::ResultType&gt;</div><div class='ctx'>         (sequence,</div><div class='del'>-         QtConcurrent::ConstMemberFunctionWrapper&lt;T, C&gt;(map),</div><div class='del'>-         QtConcurrent::MemberFunctionWrapper1&lt;U, D, V&gt;(reduce),</div><div class='add'>+         QtPrivate::createFunctionWrapper(map),</div><div class='add'>+         QtPrivate::createFunctionWrapper(reduce),</div><div class='ctx'>          options)</div><div class='ctx'>         .startBlocking();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+// blockingMappedReduced() for iterator ranges</div><div class='ctx'> template &lt;typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor&gt;</div><div class='ctx'> ResultType blockingMappedReduced(Iterator begin,</div><div class='ctx'>                                  Iterator end,</div><div class='hunk'>@@ -539,134 +241,25 @@ ResultType blockingMappedReduced(Iterator begin,</div><div class='ctx'>                                  ReduceFunctor reduce,</div><div class='ctx'>                                  QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='ctx'> {</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;typename MapFunctor::result_type, ResultType&gt;</div><div class='del'>-        (begin, end, map, reduce, options).startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename MapFunctor, typename T, typename U, typename V&gt;</div><div class='del'>-U blockingMappedReduced(Iterator begin,</div><div class='del'>-                        Iterator end,</div><div class='del'>-                        MapFunctor map,</div><div class='del'>-                        T (reduce)(U &amp;, V),</div><div class='del'>-                        QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;typename MapFunctor::result_type, U&gt;</div><div class='del'>-        (begin,</div><div class='del'>-         end,</div><div class='del'>-         map,</div><div class='del'>-         QtConcurrent::FunctionWrapper2&lt;T, U &amp;, V&gt;(reduce),</div><div class='del'>-         options)</div><div class='del'>-        .startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename MapFunctor, typename T, typename C, typename U&gt;</div><div class='del'>-C blockingMappedReduced(Iterator begin,</div><div class='del'>-                        Iterator end,</div><div class='del'>-                        MapFunctor map,</div><div class='del'>-                        T (C::*reduce)(U),</div><div class='del'>-                        QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;typename MapFunctor::result_type, C&gt;</div><div class='del'>-        (begin,</div><div class='del'>-         end,</div><div class='del'>-         map,</div><div class='del'>-         QtConcurrent::MemberFunctionWrapper1&lt;T, C, U&gt;(reduce),</div><div class='add'>+    return QtConcurrent::startMappedReduced&lt;typename QtPrivate::MapResultType&lt;void, MapFunctor&gt;::ResultType, ResultType&gt;</div><div class='add'>+        (begin, end,</div><div class='add'>+         QtPrivate::createFunctionWrapper(map),</div><div class='add'>+         QtPrivate::createFunctionWrapper(reduce),</div><div class='ctx'>          options)</div><div class='ctx'>         .startBlocking();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-template &lt;typename ResultType, typename Iterator, typename T, typename U, typename ReduceFunctor&gt;</div><div class='del'>-ResultType blockingMappedReduced(Iterator begin,</div><div class='add'>+template &lt;typename Iterator, typename MapFunctor, typename ReduceFunctor&gt;</div><div class='add'>+typename QtPrivate::ReduceResultType&lt;ReduceFunctor&gt;::ResultType blockingMappedReduced(Iterator begin,</div><div class='ctx'>                                  Iterator end,</div><div class='del'>-                                 T (map)(U),</div><div class='del'>-                                 ReduceFunctor reduce,</div><div class='del'>-                                 QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;T, ResultType&gt;</div><div class='del'>-        (begin,</div><div class='del'>-         end,</div><div class='del'>-         QtConcurrent::FunctionWrapper1&lt;T, U&gt;(map),</div><div class='del'>-         reduce,</div><div class='del'>-         options)</div><div class='del'>-        .startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename ResultType, typename Iterator, typename T, typename C, typename ReduceFunctor&gt;</div><div class='del'>-ResultType blockingMappedReduced(Iterator begin,</div><div class='del'>-                                 Iterator end,</div><div class='del'>-                                 T (C::*map)() const,</div><div class='add'>+                                 MapFunctor map,</div><div class='ctx'>                                  ReduceFunctor reduce,</div><div class='ctx'>                                  QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='ctx'> {</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;T, ResultType&gt;</div><div class='del'>-        (begin,</div><div class='del'>-         end,</div><div class='del'>-         QtConcurrent::ConstMemberFunctionWrapper&lt;T, C&gt;(map),</div><div class='del'>-         reduce,</div><div class='del'>-         options)</div><div class='del'>-        .startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename U, typename V, typename W, typename X&gt;</div><div class='del'>-W blockingMappedReduced(Iterator begin,</div><div class='del'>-                        Iterator end,</div><div class='del'>-                        T (map)(U),</div><div class='del'>-                        V (reduce)(W &amp;, X),</div><div class='del'>-                        QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;T, W&gt;</div><div class='del'>-        (begin,</div><div class='del'>-         end,</div><div class='del'>-         QtConcurrent::FunctionWrapper1&lt;T, U&gt;(map),</div><div class='del'>-         QtConcurrent::FunctionWrapper2&lt;V, W &amp;, X&gt;(reduce),</div><div class='del'>-         options)</div><div class='del'>-        .startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename C, typename U, typename V, typename W&gt;</div><div class='del'>-V blockingMappedReduced(Iterator begin,</div><div class='del'>-                        Iterator end,</div><div class='del'>-                        T (C::*map)() const,</div><div class='del'>-                        U (reduce)(V &amp;, W),</div><div class='del'>-                        QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;T, V&gt;</div><div class='del'>-        (begin,</div><div class='del'>-         end,</div><div class='del'>-         QtConcurrent::ConstMemberFunctionWrapper&lt;T, C&gt;(map),</div><div class='del'>-         QtConcurrent::FunctionWrapper2&lt;U, V &amp;, W&gt;(reduce),</div><div class='del'>-         options)</div><div class='del'>-        .startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename U, typename V, typename C, typename W&gt;</div><div class='del'>-C blockingMappedReduced(Iterator begin,</div><div class='del'>-                        Iterator end,</div><div class='del'>-                        T (map)(U),</div><div class='del'>-                        V (C::*reduce)(W),</div><div class='del'>-                        QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;T, C&gt;</div><div class='del'>-        (begin,</div><div class='del'>-         end,</div><div class='del'>-         QtConcurrent::FunctionWrapper1&lt;T, U&gt;(map),</div><div class='del'>-         QtConcurrent::MemberFunctionWrapper1&lt;V, C, W&gt;(reduce),</div><div class='del'>-         options)</div><div class='del'>-        .startBlocking();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Iterator, typename T, typename C, typename U,typename D, typename V&gt;</div><div class='del'>-D blockingMappedReduced(Iterator begin,</div><div class='del'>-                        Iterator end,</div><div class='del'>-                        T (C::*map)() const,</div><div class='del'>-                        U (D::*reduce)(V),</div><div class='del'>-                        QtConcurrent::ReduceOptions options = QtConcurrent::ReduceOptions(QtConcurrent::UnorderedReduce | QtConcurrent::SequentialReduce))</div><div class='del'>-{</div><div class='del'>-    return QtConcurrent::startMappedReduced&lt;T, D&gt;</div><div class='del'>-        (begin,</div><div class='del'>-         end,</div><div class='del'>-         QtConcurrent::ConstMemberFunctionWrapper&lt;T, C&gt;(map),</div><div class='del'>-         QtConcurrent::MemberFunctionWrapper1&lt;U, D, V&gt;(reduce),</div><div class='add'>+    return QtConcurrent::startMappedReduced&lt;typename QtPrivate::MapResultType&lt;void, MapFunctor&gt;::ResultType, typename QtPrivate::ReduceResultType&lt;ReduceFunctor&gt;::ResultType&gt;</div><div class='add'>+        (begin, end,</div><div class='add'>+         QtPrivate::createFunctionWrapper(map),</div><div class='add'>+         QtPrivate::createFunctionWrapper(reduce),</div><div class='ctx'>          options)</div><div class='ctx'>         .startBlocking();</div><div class='ctx'> }</div><div class='hunk'>@@ -675,97 +268,44 @@ D blockingMappedReduced(Iterator begin,</div><div class='ctx'> template &lt;typename OutputSequence, typename InputSequence, typename MapFunctor&gt;</div><div class='ctx'> OutputSequence blockingMapped(const InputSequence &amp;sequence, MapFunctor map)</div><div class='ctx'> {</div><div class='del'>-    return blockingMappedReduced(sequence, map, &amp;OutputSequence::push_back,</div><div class='del'>-                                 QtConcurrent::OrderedReduce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename OutputSequence, typename InputSequence, typename T, typename U&gt;</div><div class='del'>-OutputSequence blockingMapped(const InputSequence &amp;sequence, T (map)(U))</div><div class='del'>-{</div><div class='del'>-    return blockingMappedReduced(sequence, map, &amp;OutputSequence::push_back,</div><div class='del'>-                                 QtConcurrent::OrderedReduce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename OutputSequence, typename InputSequence, typename T, typename C&gt;</div><div class='del'>-OutputSequence blockingMapped(const InputSequence &amp;sequence, T (C::*map)() const)</div><div class='del'>-{</div><div class='del'>-    return blockingMappedReduced(sequence, map, &amp;OutputSequence::push_back,</div><div class='del'>-                                 QtConcurrent::OrderedReduce);</div><div class='del'>-}</div><div class='del'>-#ifndef QT_NO_TEMPLATE_TEMPLATE_PARAMETERS</div><div class='del'>-</div><div class='del'>-// overloads for changing the container value type:</div><div class='del'>-template &lt;template &lt;typename&gt; class Sequence, typename MapFunctor, typename T&gt;</div><div class='del'>-Sequence&lt;typename MapFunctor::result_type&gt; blockingMapped(const Sequence&lt;T&gt; &amp;sequence, MapFunctor map)</div><div class='del'>-{</div><div class='del'>-    typedef Sequence&lt;typename MapFunctor::result_type&gt; OutputSequence;</div><div class='del'>-    return blockingMappedReduced(sequence, map, &amp;OutputSequence::push_back,</div><div class='del'>-                                               QtConcurrent::OrderedReduce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;template &lt;typename&gt; class Sequence, typename T, typename U, typename V&gt;</div><div class='del'>-Sequence&lt;U&gt; blockingMapped(const Sequence&lt;T&gt; &amp;sequence, U (map)(V))</div><div class='del'>-{</div><div class='del'>-    typedef Sequence&lt;U&gt; OutputSequence;</div><div class='del'>-    return blockingMappedReduced(sequence, map, &amp;OutputSequence::push_back,</div><div class='del'>-                                               QtConcurrent::OrderedReduce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;template &lt;typename&gt; class Sequence, typename T, typename U, typename C&gt;</div><div class='del'>-Sequence&lt;U&gt; blockingMapped(const Sequence&lt;T&gt; &amp;sequence, U (C::*map)() const)</div><div class='del'>-{</div><div class='del'>-    typedef Sequence&lt;U&gt; OutputSequence;</div><div class='del'>-    return blockingMappedReduced(sequence, map, &amp;OutputSequence::push_back,</div><div class='del'>-                                               QtConcurrent::OrderedReduce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif // QT_NO_TEMPLATE_TEMPLATE_PARAMETER</div><div class='del'>-</div><div class='del'>-// overloads for changing the container value type from a QStringList:</div><div class='del'>-template &lt;typename MapFunctor&gt;</div><div class='del'>-QList&lt;typename MapFunctor::result_type&gt; blockingMapped(const QStringList &amp;sequence, MapFunctor map)</div><div class='del'>-{</div><div class='del'>-    typedef QList&lt;typename MapFunctor::result_type&gt; OutputSequence;</div><div class='del'>-    return blockingMappedReduced(sequence, map, &amp;OutputSequence::push_back,</div><div class='del'>-                                 QtConcurrent::OrderedReduce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename U, typename V&gt;</div><div class='del'>-QList&lt;U&gt; blockingMapped(const QStringList &amp;sequence, U (map)(V))</div><div class='del'>-{</div><div class='del'>-    typedef QList&lt;U&gt; OutputSequence;</div><div class='del'>-    return blockingMappedReduced(sequence, map, &amp;OutputSequence::push_back,</div><div class='del'>-                                 QtConcurrent::OrderedReduce);</div><div class='add'>+    return blockingMappedReduced&lt;OutputSequence&gt;</div><div class='add'>+        (sequence,</div><div class='add'>+         QtPrivate::createFunctionWrapper(map),</div><div class='add'>+         &amp;OutputSequence::push_back,</div><div class='add'>+         QtConcurrent::OrderedReduce);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-template &lt;typename U, typename C&gt;</div><div class='del'>-QList&lt;U&gt; blockingMapped(const QStringList &amp;sequence, U (C::*map)() const)</div><div class='add'>+template &lt;typename MapFunctor, typename InputSequence&gt;</div><div class='add'>+typename QtPrivate::MapResultType&lt;InputSequence, MapFunctor&gt;::ResultType blockingMapped(const InputSequence &amp;sequence, MapFunctor map)</div><div class='ctx'> {</div><div class='del'>-    typedef QList&lt;U&gt; OutputSequence;</div><div class='del'>-    return blockingMappedReduced(sequence, map, &amp;OutputSequence::push_back,</div><div class='del'>-                                 QtConcurrent::OrderedReduce);</div><div class='add'>+    typedef typename QtPrivate::MapResultType&lt;InputSequence, MapFunctor&gt;::ResultType OutputSequence;</div><div class='add'>+    return blockingMappedReduced&lt;OutputSequence&gt;</div><div class='add'>+        (sequence,</div><div class='add'>+         QtPrivate::createFunctionWrapper(map),</div><div class='add'>+         &amp;OutputSequence::push_back,</div><div class='add'>+         QtConcurrent::OrderedReduce);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> // mapped()  for iterator ranges</div><div class='ctx'> template &lt;typename Sequence, typename Iterator, typename MapFunctor&gt;</div><div class='ctx'> Sequence blockingMapped(Iterator begin, Iterator end, MapFunctor map)</div><div class='ctx'> {</div><div class='del'>-    return blockingMappedReduced(begin, end, map, &amp;Sequence::push_back,</div><div class='del'>-                                 QtConcurrent::OrderedReduce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-template &lt;typename Sequence, typename Iterator, typename T, typename U&gt;</div><div class='del'>-Sequence blockingMapped(Iterator begin, Iterator end, T (map)(U))</div><div class='del'>-{</div><div class='del'>-    return blockingMappedReduced(begin, end, map, &amp;Sequence::push_back,</div><div class='del'>-                                 QtConcurrent::OrderedReduce);</div><div class='add'>+    return blockingMappedReduced&lt;Sequence&gt;</div><div class='add'>+        (begin, end,</div><div class='add'>+         QtPrivate::createFunctionWrapper(map),</div><div class='add'>+         &amp;Sequence::push_back,</div><div class='add'>+         QtConcurrent::OrderedReduce);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-template &lt;typename Sequence, typename Iterator, typename T, typename C&gt;</div><div class='del'>-Sequence blockingMapped(Iterator begin, Iterator end, T (C::*map)() const)</div><div class='del'>-{</div><div class='del'>-    return blockingMappedReduced(begin, end, map, &amp;Sequence::push_back,</div><div class='del'>-                                 QtConcurrent::OrderedReduce);</div><div class='add'>+template &lt;typename Iterator, typename MapFunctor&gt;</div><div class='add'>+typename QtPrivate::MapResultType&lt;Iterator, MapFunctor&gt;::ResultType blockingMapped(Iterator begin, Iterator end, MapFunctor map)</div><div class='add'>+{</div><div class='add'>+    typedef typename QtPrivate::MapResultType&lt;Iterator, MapFunctor&gt;::ResultType OutputSequence;</div><div class='add'>+    return blockingMappedReduced&lt;OutputSequence&gt;</div><div class='add'>+        (begin, end,</div><div class='add'>+         QtPrivate::createFunctionWrapper(map),</div><div class='add'>+         &amp;OutputSequence::push_back,</div><div class='add'>+         QtConcurrent::OrderedReduce);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> } // namespace QtConcurrent</div><div class='head'>diff --git a/src/corelib/concurrent/qtconcurrentrun.h b/src/corelib/concurrent/qtconcurrentrun.h<br/>index 8611fba..ef51b2a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentrun.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentrun.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentrun.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/concurrent/qtconcurrentrun.h</a></div><div class='hunk'>@@ -71,63 +71,114 @@ namespace QtConcurrent {</div><div class='ctx'> template &lt;typename T&gt;</div><div class='ctx'> QFuture&lt;T&gt; run(T (*functionPointer)())</div><div class='ctx'> {</div><div class='del'>-    return (new QT_TYPENAME SelectStoredFunctorCall0&lt;T, T (*)()&gt;::type(functionPointer))-&gt;start();</div><div class='add'>+    return (new StoredFunctorCall0&lt;T, T (*)()&gt;(functionPointer))-&gt;start();</div><div class='ctx'> }</div><div class='ctx'> template &lt;typename T, typename Param1, typename Arg1&gt;</div><div class='ctx'> QFuture&lt;T&gt; run(T (*functionPointer)(Param1), const Arg1 &amp;arg1)</div><div class='ctx'> {</div><div class='del'>-    return (new QT_TYPENAME SelectStoredFunctorCall1&lt;T, T (*)(Param1), Arg1&gt;::type(functionPointer, arg1))-&gt;start();</div><div class='add'>+    return (new StoredFunctorCall1&lt;T, T (*)(Param1), Arg1&gt;(functionPointer, arg1))-&gt;start();</div><div class='ctx'> }</div><div class='ctx'> template &lt;typename T, typename Param1, typename Arg1, typename Param2, typename Arg2&gt;</div><div class='ctx'> QFuture&lt;T&gt; run(T (*functionPointer)(Param1, Param2), const Arg1 &amp;arg1, const Arg2 &amp;arg2)</div><div class='ctx'> {</div><div class='del'>-    return (new QT_TYPENAME SelectStoredFunctorCall2&lt;T, T (*)(Param1, Param2), Arg1, Arg2&gt;::type(functionPointer, arg1, arg2))-&gt;start();</div><div class='add'>+    return (new StoredFunctorCall2&lt;T, T (*)(Param1, Param2), Arg1, Arg2&gt;(functionPointer, arg1, arg2))-&gt;start();</div><div class='ctx'> }</div><div class='ctx'> template &lt;typename T, typename Param1, typename Arg1, typename Param2, typename Arg2, typename Param3, typename Arg3&gt;</div><div class='ctx'> QFuture&lt;T&gt; run(T (*functionPointer)(Param1, Param2, Param3), const Arg1 &amp;arg1, const Arg2 &amp;arg2, const Arg3 &amp;arg3)</div><div class='ctx'> {</div><div class='del'>-    return (new QT_TYPENAME SelectStoredFunctorCall3&lt;T, T (*)(Param1, Param2, Param3), Arg1, Arg2, Arg3&gt;::type(functionPointer, arg1, arg2, arg3))-&gt;start();</div><div class='add'>+    return (new StoredFunctorCall3&lt;T, T (*)(Param1, Param2, Param3), Arg1, Arg2, Arg3&gt;(functionPointer, arg1, arg2, arg3))-&gt;start();</div><div class='ctx'> }</div><div class='ctx'> template &lt;typename T, typename Param1, typename Arg1, typename Param2, typename Arg2, typename Param3, typename Arg3, typename Param4, typename Arg4&gt;</div><div class='ctx'> QFuture&lt;T&gt; run(T (*functionPointer)(Param1, Param2, Param3, Param4), const Arg1 &amp;arg1, const Arg2 &amp;arg2, const Arg3 &amp;arg3, const Arg4 &amp;arg4)</div><div class='ctx'> {</div><div class='del'>-    return (new QT_TYPENAME SelectStoredFunctorCall4&lt;T, T (*)(Param1, Param2, Param3, Param4), Arg1, Arg2, Arg3, Arg4&gt;::type(functionPointer, arg1, arg2, arg3, arg4))-&gt;start();</div><div class='add'>+    return (new StoredFunctorCall4&lt;T, T (*)(Param1, Param2, Param3, Param4), Arg1, Arg2, Arg3, Arg4&gt;(functionPointer, arg1, arg2, arg3, arg4))-&gt;start();</div><div class='ctx'> }</div><div class='ctx'> template &lt;typename T, typename Param1, typename Arg1, typename Param2, typename Arg2, typename Param3, typename Arg3, typename Param4, typename Arg4, typename Param5, typename Arg5&gt;</div><div class='ctx'> QFuture&lt;T&gt; run(T (*functionPointer)(Param1, Param2, Param3, Param4, Param5), const Arg1 &amp;arg1, const Arg2 &amp;arg2, const Arg3 &amp;arg3, const Arg4 &amp;arg4, const Arg5 &amp;arg5)</div><div class='ctx'> {</div><div class='del'>-    return (new QT_TYPENAME SelectStoredFunctorCall5&lt;T, T (*)(Param1, Param2, Param3, Param4, Param5), Arg1, Arg2, Arg3, Arg4, Arg5&gt;::type(functionPointer, arg1, arg2, arg3, arg4, arg5))-&gt;start();</div><div class='add'>+    return (new StoredFunctorCall5&lt;T, T (*)(Param1, Param2, Param3, Param4, Param5), Arg1, Arg2, Arg3, Arg4, Arg5&gt;(functionPointer, arg1, arg2, arg3, arg4, arg5))-&gt;start();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef Q_COMPILER_DECLTYPE</div><div class='add'>+</div><div class='add'>+template &lt;typename Functor&gt;</div><div class='add'>+auto run(Functor functor) -&gt; typename QtPrivate::QEnableIf&lt;!QtPrivate::HasResultType&lt;Functor&gt;::Value, QFuture&lt;decltype(functor())&gt; &gt;::Type</div><div class='add'>+{</div><div class='add'>+    typedef decltype(functor()) result_type;</div><div class='add'>+    return (new StoredFunctorCall0&lt;result_type, Functor&gt;(functor))-&gt;start();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename Functor, typename Arg1&gt;</div><div class='add'>+auto run(Functor functor, const Arg1 &amp;arg1)</div><div class='add'>+    -&gt; typename QtPrivate::QEnableIf&lt;!QtPrivate::HasResultType&lt;Functor&gt;::Value, QFuture&lt;decltype(functor(arg1))&gt; &gt;::Type</div><div class='add'>+{</div><div class='add'>+    typedef decltype(functor(arg1)) result_type;</div><div class='add'>+    return (new StoredFunctorCall1&lt;result_type, Functor, Arg1&gt;(functor, arg1))-&gt;start();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename Functor, typename Arg1, typename Arg2&gt;</div><div class='add'>+auto run(Functor functor, const Arg1 &amp;arg1, const Arg2 &amp;arg2)</div><div class='add'>+    -&gt; typename QtPrivate::QEnableIf&lt;!QtPrivate::HasResultType&lt;Functor&gt;::Value, QFuture&lt;decltype(functor(arg1, arg2))&gt; &gt;::Type</div><div class='add'>+{</div><div class='add'>+    typedef decltype(functor(arg1, arg2)) result_type;</div><div class='add'>+    return (new StoredFunctorCall2&lt;result_type, Functor, Arg1, Arg2&gt;(functor, arg1, arg2))-&gt;start();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename Functor, typename Arg1, typename Arg2, typename Arg3&gt;</div><div class='add'>+auto run(Functor functor, const Arg1 &amp;arg1, const Arg2 &amp;arg2, const Arg3 &amp;arg3)</div><div class='add'>+    -&gt; typename QtPrivate::QEnableIf&lt;!QtPrivate::HasResultType&lt;Functor&gt;::Value, QFuture&lt;decltype(functor(arg1, arg2, arg3))&gt; &gt;::Type</div><div class='add'>+{</div><div class='add'>+    typedef decltype(functor(arg1, arg2, arg3)) result_type;</div><div class='add'>+    return (new StoredFunctorCall3&lt;result_type, Functor, Arg1, Arg2, Arg3&gt;(functor, arg1, arg2, arg3))-&gt;start();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename Functor, typename Arg1, typename Arg2, typename Arg3, typename Arg4&gt;</div><div class='add'>+auto run(Functor functor, const Arg1 &amp;arg1, const Arg2 &amp;arg2, const Arg3 &amp;arg3, const Arg4 &amp;arg4)</div><div class='add'>+    -&gt; typename QtPrivate::QEnableIf&lt;!QtPrivate::HasResultType&lt;Functor&gt;::Value, QFuture&lt;decltype(functor(arg1, arg2, arg3, arg4))&gt; &gt;::Type</div><div class='add'>+{</div><div class='add'>+    typedef decltype(functor(arg1, arg2, arg3, arg4)) result_type;</div><div class='add'>+    return (new StoredFunctorCall4&lt;result_type, Functor, Arg1, Arg2, Arg3, Arg4&gt;(functor, arg1, arg2, arg3, arg4))-&gt;start();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename Functor, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5&gt;</div><div class='add'>+auto run(Functor functor, const Arg1 &amp;arg1, const Arg2 &amp;arg2, const Arg3 &amp;arg3, const Arg4 &amp;arg4, const Arg5 &amp;arg5)</div><div class='add'>+    -&gt; typename QtPrivate::QEnableIf&lt;!QtPrivate::HasResultType&lt;Functor&gt;::Value, QFuture&lt;decltype(functor(arg1, arg2, arg3, arg4, arg5))&gt; &gt;::Type</div><div class='add'>+{</div><div class='add'>+    typedef decltype(functor(arg1, arg2, arg3, arg4, arg5)) result_type;</div><div class='add'>+    return (new StoredFunctorCall5&lt;result_type, Functor, Arg1, Arg2, Arg3, Arg4, Arg5&gt;(functor, arg1, arg2, arg3, arg4, arg5))-&gt;start();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> template &lt;typename FunctionObject&gt;</div><div class='ctx'> QFuture&lt;typename FunctionObject::result_type&gt; run(FunctionObject functionObject)</div><div class='ctx'> {</div><div class='del'>-    return (new QT_TYPENAME SelectStoredFunctorCall0&lt;QT_TYPENAME FunctionObject::result_type, FunctionObject&gt;::type(functionObject))-&gt;start();</div><div class='add'>+    return (new StoredFunctorCall0&lt;QT_TYPENAME FunctionObject::result_type, FunctionObject&gt;(functionObject))-&gt;start();</div><div class='ctx'> }</div><div class='ctx'> template &lt;typename FunctionObject, typename Arg1&gt;</div><div class='ctx'> QFuture&lt;typename FunctionObject::result_type&gt; run(FunctionObject functionObject, const Arg1 &amp;arg1)</div><div class='ctx'> {</div><div class='del'>-    return (new QT_TYPENAME SelectStoredFunctorCall1&lt;QT_TYPENAME FunctionObject::result_type, FunctionObject, Arg1&gt;::type(functionObject, arg1))-&gt;start();</div><div class='add'>+    return (new StoredFunctorCall1&lt;QT_TYPENAME FunctionObject::result_type, FunctionObject, Arg1&gt;(functionObject, arg1))-&gt;start();</div><div class='ctx'> }</div><div class='ctx'> template &lt;typename FunctionObject, typename Arg1, typename Arg2&gt;</div><div class='ctx'> QFuture&lt;typename FunctionObject::result_type&gt; run(FunctionObject functionObject, const Arg1 &amp;arg1, const Arg2 &amp;arg2)</div><div class='ctx'> {</div><div class='del'>-    return (new QT_TYPENAME SelectStoredFunctorCall2&lt;QT_TYPENAME FunctionObject::result_type, FunctionObject, Arg1, Arg2&gt;::type(functionObject, arg1, arg2))-&gt;start();</div><div class='add'>+    return (new StoredFunctorCall2&lt;QT_TYPENAME FunctionObject::result_type, FunctionObject, Arg1, Arg2&gt;(functionObject, arg1, arg2))-&gt;start();</div><div class='ctx'> }</div><div class='ctx'> template &lt;typename FunctionObject, typename Arg1, typename Arg2, typename Arg3&gt;</div><div class='ctx'> QFuture&lt;typename FunctionObject::result_type&gt; run(FunctionObject functionObject, const Arg1 &amp;arg1, const Arg2 &amp;arg2, const Arg3 &amp;arg3)</div><div class='ctx'> {</div><div class='del'>-    return (new QT_TYPENAME SelectStoredFunctorCall3&lt;QT_TYPENAME FunctionObject::result_type, FunctionObject, Arg1, Arg2, Arg3&gt;::type(functionObject, arg1, arg2, arg3))-&gt;start();</div><div class='add'>+    return (new StoredFunctorCall3&lt;QT_TYPENAME FunctionObject::result_type, FunctionObject, Arg1, Arg2, Arg3&gt;(functionObject, arg1, arg2, arg3))-&gt;start();</div><div class='ctx'> }</div><div class='ctx'> template &lt;typename FunctionObject, typename Arg1, typename Arg2, typename Arg3, typename Arg4&gt;</div><div class='ctx'> QFuture&lt;typename FunctionObject::result_type&gt; run(FunctionObject functionObject, const Arg1 &amp;arg1, const Arg2 &amp;arg2, const Arg3 &amp;arg3, const Arg4 &amp;arg4)</div><div class='ctx'> {</div><div class='del'>-    return (new QT_TYPENAME SelectStoredFunctorCall4&lt;QT_TYPENAME FunctionObject::result_type, FunctionObject, Arg1, Arg2, Arg3, Arg4&gt;::type(functionObject, arg1, arg2, arg3, arg4))-&gt;start();</div><div class='add'>+    return (new StoredFunctorCall4&lt;QT_TYPENAME FunctionObject::result_type, FunctionObject, Arg1, Arg2, Arg3, Arg4&gt;(functionObject, arg1, arg2, arg3, arg4))-&gt;start();</div><div class='ctx'> }</div><div class='ctx'> template &lt;typename FunctionObject, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5&gt;</div><div class='ctx'> QFuture&lt;typename FunctionObject::result_type&gt; run(FunctionObject functionObject, const Arg1 &amp;arg1, const Arg2 &amp;arg2, const Arg3 &amp;arg3, const Arg4 &amp;arg4, const Arg5 &amp;arg5)</div><div class='ctx'> {</div><div class='del'>-    return (new QT_TYPENAME SelectStoredFunctorCall5&lt;QT_TYPENAME FunctionObject::result_type, FunctionObject, Arg1, Arg2, Arg3, Arg4, Arg5&gt;::type(functionObject, arg1, arg2, arg3, arg4, arg5))-&gt;start();</div><div class='add'>+    return (new StoredFunctorCall5&lt;QT_TYPENAME FunctionObject::result_type, FunctionObject, Arg1, Arg2, Arg3, Arg4, Arg5&gt;(functionObject, arg1, arg2, arg3, arg4, arg5))-&gt;start();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> template &lt;typename FunctionObject&gt;</div><div class='head'>diff --git a/src/corelib/concurrent/qtconcurrentrunbase.h b/src/corelib/concurrent/qtconcurrentrunbase.h<br/>index c608af6..22ea0da 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentrunbase.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentrunbase.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentrunbase.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/concurrent/qtconcurrentrunbase.h</a></div><div class='hunk'>@@ -100,7 +100,18 @@ public:</div><div class='ctx'>             this-&gt;reportFinished();</div><div class='ctx'>             return;</div><div class='ctx'>         }</div><div class='del'>-        this-&gt;runFunctor();</div><div class='add'>+#ifndef QT_NO_EXCEPTIONS</div><div class='add'>+        try {</div><div class='add'>+#endif</div><div class='add'>+            this-&gt;runFunctor();</div><div class='add'>+#ifndef QT_NO_EXCEPTIONS</div><div class='add'>+        } catch (QtConcurrent::Exception &amp;e) {</div><div class='add'>+            QFutureInterface&lt;T&gt;::reportException(e);</div><div class='add'>+        } catch (...) {</div><div class='add'>+            QFutureInterface&lt;T&gt;::reportException(QtConcurrent::UnhandledException());</div><div class='add'>+        }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'>         this-&gt;reportResult(result);</div><div class='ctx'>         this-&gt;reportFinished();</div><div class='ctx'>     }</div><div class='hunk'>@@ -117,7 +128,17 @@ public:</div><div class='ctx'>             this-&gt;reportFinished();</div><div class='ctx'>             return;</div><div class='ctx'>         }</div><div class='del'>-        this-&gt;runFunctor();</div><div class='add'>+#ifndef QT_NO_EXCEPTIONS</div><div class='add'>+        try {</div><div class='add'>+#endif</div><div class='add'>+            this-&gt;runFunctor();</div><div class='add'>+#ifndef QT_NO_EXCEPTIONS</div><div class='add'>+        } catch (QtConcurrent::Exception &amp;e) {</div><div class='add'>+            QFutureInterface&lt;void&gt;::reportException(e);</div><div class='add'>+        } catch (...) {</div><div class='add'>+            QFutureInterface&lt;void&gt;::reportException(QtConcurrent::UnhandledException());</div><div class='add'>+        }</div><div class='add'>+#endif</div><div class='ctx'>         this-&gt;reportFinished();</div><div class='ctx'>     }</div><div class='ctx'> };</div><div class='head'>diff --git a/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h b/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h<br/>index c61f9b8..9beb0b9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qtconcurrentstoredfunctioncall.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/concurrent/qtconcurrentstoredfunctioncall.h</a></div><div class='hunk'>@@ -66,10 +66,10 @@ struct StoredFunctorCall0: public RunFunctionTask&lt;T&gt;</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-template &lt;typename T, typename FunctionPointer&gt;</div><div class='del'>-struct VoidStoredFunctorCall0: public RunFunctionTask&lt;T&gt;</div><div class='add'>+template &lt;typename FunctionPointer&gt;</div><div class='add'>+struct StoredFunctorCall0&lt;void, FunctionPointer&gt;: public RunFunctionTask&lt;void&gt;</div><div class='ctx'> {</div><div class='del'>-    inline VoidStoredFunctorCall0(FunctionPointer _function)</div><div class='add'>+    inline StoredFunctorCall0(FunctionPointer _function)</div><div class='ctx'>       : function(_function) {}</div><div class='ctx'>     void runFunctor() { function(); }</div><div class='ctx'>     FunctionPointer function;</div><div class='hunk'>@@ -77,13 +77,6 @@ struct VoidStoredFunctorCall0: public RunFunctionTask&lt;T&gt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T, typename FunctionPointer&gt;</div><div class='del'>-struct SelectStoredFunctorCall0</div><div class='del'>-{</div><div class='del'>-    typedef typename SelectSpecialization&lt;T&gt;::template</div><div class='del'>-        Type&lt;StoredFunctorCall0    &lt;T, FunctionPointer&gt;,</div><div class='del'>-             VoidStoredFunctorCall0&lt;T, FunctionPointer&gt; &gt;::type type;</div><div class='del'>-};</div><div class='del'>-template &lt;typename T, typename FunctionPointer&gt;</div><div class='ctx'> struct StoredFunctorPointerCall0: public RunFunctionTask&lt;T&gt;</div><div class='ctx'> {</div><div class='ctx'>     inline StoredFunctorPointerCall0(FunctionPointer * _function)</div><div class='hunk'>@@ -276,10 +269,10 @@ struct StoredFunctorCall1: public RunFunctionTask&lt;T&gt;</div><div class='ctx'>     Arg1 arg1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-template &lt;typename T, typename FunctionPointer, typename Arg1&gt;</div><div class='del'>-struct VoidStoredFunctorCall1: public RunFunctionTask&lt;T&gt;</div><div class='add'>+template &lt;typename FunctionPointer, typename Arg1&gt;</div><div class='add'>+struct StoredFunctorCall1&lt;void, FunctionPointer, Arg1&gt;: public RunFunctionTask&lt;void&gt;</div><div class='ctx'> {</div><div class='del'>-    inline VoidStoredFunctorCall1(FunctionPointer _function, const Arg1 &amp;_arg1)</div><div class='add'>+    inline StoredFunctorCall1(FunctionPointer _function, const Arg1 &amp;_arg1)</div><div class='ctx'>       : function(_function), arg1(_arg1) {}</div><div class='ctx'>     void runFunctor() { function(arg1); }</div><div class='ctx'>     FunctionPointer function;</div><div class='hunk'>@@ -287,13 +280,6 @@ struct VoidStoredFunctorCall1: public RunFunctionTask&lt;T&gt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T, typename FunctionPointer, typename Arg1&gt;</div><div class='del'>-struct SelectStoredFunctorCall1</div><div class='del'>-{</div><div class='del'>-    typedef typename SelectSpecialization&lt;T&gt;::template</div><div class='del'>-        Type&lt;StoredFunctorCall1    &lt;T, FunctionPointer, Arg1&gt;,</div><div class='del'>-             VoidStoredFunctorCall1&lt;T, FunctionPointer, Arg1&gt; &gt;::type type;</div><div class='del'>-};</div><div class='del'>-template &lt;typename T, typename FunctionPointer, typename Arg1&gt;</div><div class='ctx'> struct StoredFunctorPointerCall1: public RunFunctionTask&lt;T&gt;</div><div class='ctx'> {</div><div class='ctx'>     inline StoredFunctorPointerCall1(FunctionPointer * _function, const Arg1 &amp;_arg1)</div><div class='hunk'>@@ -486,10 +472,10 @@ struct StoredFunctorCall2: public RunFunctionTask&lt;T&gt;</div><div class='ctx'>     Arg1 arg1; Arg2 arg2;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-template &lt;typename T, typename FunctionPointer, typename Arg1, typename Arg2&gt;</div><div class='del'>-struct VoidStoredFunctorCall2: public RunFunctionTask&lt;T&gt;</div><div class='add'>+template &lt;typename FunctionPointer, typename Arg1, typename Arg2&gt;</div><div class='add'>+struct StoredFunctorCall2&lt;void, FunctionPointer, Arg1, Arg2&gt;: public RunFunctionTask&lt;void&gt;</div><div class='ctx'> {</div><div class='del'>-    inline VoidStoredFunctorCall2(FunctionPointer _function, const Arg1 &amp;_arg1, const Arg2 &amp;_arg2)</div><div class='add'>+    inline StoredFunctorCall2(FunctionPointer _function, const Arg1 &amp;_arg1, const Arg2 &amp;_arg2)</div><div class='ctx'>       : function(_function), arg1(_arg1), arg2(_arg2) {}</div><div class='ctx'>     void runFunctor() { function(arg1, arg2); }</div><div class='ctx'>     FunctionPointer function;</div><div class='hunk'>@@ -497,13 +483,6 @@ struct VoidStoredFunctorCall2: public RunFunctionTask&lt;T&gt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T, typename FunctionPointer, typename Arg1, typename Arg2&gt;</div><div class='del'>-struct SelectStoredFunctorCall2</div><div class='del'>-{</div><div class='del'>-    typedef typename SelectSpecialization&lt;T&gt;::template</div><div class='del'>-        Type&lt;StoredFunctorCall2    &lt;T, FunctionPointer, Arg1, Arg2&gt;,</div><div class='del'>-             VoidStoredFunctorCall2&lt;T, FunctionPointer, Arg1, Arg2&gt; &gt;::type type;</div><div class='del'>-};</div><div class='del'>-template &lt;typename T, typename FunctionPointer, typename Arg1, typename Arg2&gt;</div><div class='ctx'> struct StoredFunctorPointerCall2: public RunFunctionTask&lt;T&gt;</div><div class='ctx'> {</div><div class='ctx'>     inline StoredFunctorPointerCall2(FunctionPointer * _function, const Arg1 &amp;_arg1, const Arg2 &amp;_arg2)</div><div class='hunk'>@@ -696,10 +675,10 @@ struct StoredFunctorCall3: public RunFunctionTask&lt;T&gt;</div><div class='ctx'>     Arg1 arg1; Arg2 arg2; Arg3 arg3;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-template &lt;typename T, typename FunctionPointer, typename Arg1, typename Arg2, typename Arg3&gt;</div><div class='del'>-struct VoidStoredFunctorCall3: public RunFunctionTask&lt;T&gt;</div><div class='add'>+template &lt;typename FunctionPointer, typename Arg1, typename Arg2, typename Arg3&gt;</div><div class='add'>+struct StoredFunctorCall3&lt;void, FunctionPointer, Arg1, Arg2, Arg3&gt;: public RunFunctionTask&lt;void&gt;</div><div class='ctx'> {</div><div class='del'>-    inline VoidStoredFunctorCall3(FunctionPointer _function, const Arg1 &amp;_arg1, const Arg2 &amp;_arg2, const Arg3 &amp;_arg3)</div><div class='add'>+    inline StoredFunctorCall3(FunctionPointer _function, const Arg1 &amp;_arg1, const Arg2 &amp;_arg2, const Arg3 &amp;_arg3)</div><div class='ctx'>       : function(_function), arg1(_arg1), arg2(_arg2), arg3(_arg3) {}</div><div class='ctx'>     void runFunctor() { function(arg1, arg2, arg3); }</div><div class='ctx'>     FunctionPointer function;</div><div class='hunk'>@@ -707,13 +686,6 @@ struct VoidStoredFunctorCall3: public RunFunctionTask&lt;T&gt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T, typename FunctionPointer, typename Arg1, typename Arg2, typename Arg3&gt;</div><div class='del'>-struct SelectStoredFunctorCall3</div><div class='del'>-{</div><div class='del'>-    typedef typename SelectSpecialization&lt;T&gt;::template</div><div class='del'>-        Type&lt;StoredFunctorCall3    &lt;T, FunctionPointer, Arg1, Arg2, Arg3&gt;,</div><div class='del'>-             VoidStoredFunctorCall3&lt;T, FunctionPointer, Arg1, Arg2, Arg3&gt; &gt;::type type;</div><div class='del'>-};</div><div class='del'>-template &lt;typename T, typename FunctionPointer, typename Arg1, typename Arg2, typename Arg3&gt;</div><div class='ctx'> struct StoredFunctorPointerCall3: public RunFunctionTask&lt;T&gt;</div><div class='ctx'> {</div><div class='ctx'>     inline StoredFunctorPointerCall3(FunctionPointer * _function, const Arg1 &amp;_arg1, const Arg2 &amp;_arg2, const Arg3 &amp;_arg3)</div><div class='hunk'>@@ -906,10 +878,10 @@ struct StoredFunctorCall4: public RunFunctionTask&lt;T&gt;</div><div class='ctx'>     Arg1 arg1; Arg2 arg2; Arg3 arg3; Arg4 arg4;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-template &lt;typename T, typename FunctionPointer, typename Arg1, typename Arg2, typename Arg3, typename Arg4&gt;</div><div class='del'>-struct VoidStoredFunctorCall4: public RunFunctionTask&lt;T&gt;</div><div class='add'>+template &lt;typename FunctionPointer, typename Arg1, typename Arg2, typename Arg3, typename Arg4&gt;</div><div class='add'>+struct StoredFunctorCall4&lt;void, FunctionPointer, Arg1, Arg2, Arg3, Arg4&gt;: public RunFunctionTask&lt;void&gt;</div><div class='ctx'> {</div><div class='del'>-    inline VoidStoredFunctorCall4(FunctionPointer _function, const Arg1 &amp;_arg1, const Arg2 &amp;_arg2, const Arg3 &amp;_arg3, const Arg4 &amp;_arg4)</div><div class='add'>+    inline StoredFunctorCall4(FunctionPointer _function, const Arg1 &amp;_arg1, const Arg2 &amp;_arg2, const Arg3 &amp;_arg3, const Arg4 &amp;_arg4)</div><div class='ctx'>       : function(_function), arg1(_arg1), arg2(_arg2), arg3(_arg3), arg4(_arg4) {}</div><div class='ctx'>     void runFunctor() { function(arg1, arg2, arg3, arg4); }</div><div class='ctx'>     FunctionPointer function;</div><div class='hunk'>@@ -917,13 +889,6 @@ struct VoidStoredFunctorCall4: public RunFunctionTask&lt;T&gt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T, typename FunctionPointer, typename Arg1, typename Arg2, typename Arg3, typename Arg4&gt;</div><div class='del'>-struct SelectStoredFunctorCall4</div><div class='del'>-{</div><div class='del'>-    typedef typename SelectSpecialization&lt;T&gt;::template</div><div class='del'>-        Type&lt;StoredFunctorCall4    &lt;T, FunctionPointer, Arg1, Arg2, Arg3, Arg4&gt;,</div><div class='del'>-             VoidStoredFunctorCall4&lt;T, FunctionPointer, Arg1, Arg2, Arg3, Arg4&gt; &gt;::type type;</div><div class='del'>-};</div><div class='del'>-template &lt;typename T, typename FunctionPointer, typename Arg1, typename Arg2, typename Arg3, typename Arg4&gt;</div><div class='ctx'> struct StoredFunctorPointerCall4: public RunFunctionTask&lt;T&gt;</div><div class='ctx'> {</div><div class='ctx'>     inline StoredFunctorPointerCall4(FunctionPointer * _function, const Arg1 &amp;_arg1, const Arg2 &amp;_arg2, const Arg3 &amp;_arg3, const Arg4 &amp;_arg4)</div><div class='hunk'>@@ -1116,10 +1081,10 @@ struct StoredFunctorCall5: public RunFunctionTask&lt;T&gt;</div><div class='ctx'>     Arg1 arg1; Arg2 arg2; Arg3 arg3; Arg4 arg4; Arg5 arg5;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-template &lt;typename T, typename FunctionPointer, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5&gt;</div><div class='del'>-struct VoidStoredFunctorCall5: public RunFunctionTask&lt;T&gt;</div><div class='add'>+template &lt;typename FunctionPointer, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5&gt;</div><div class='add'>+struct StoredFunctorCall5&lt;void, FunctionPointer, Arg1, Arg2, Arg3, Arg4, Arg5&gt;: public RunFunctionTask&lt;void&gt;</div><div class='ctx'> {</div><div class='del'>-    inline VoidStoredFunctorCall5(FunctionPointer _function, const Arg1 &amp;_arg1, const Arg2 &amp;_arg2, const Arg3 &amp;_arg3, const Arg4 &amp;_arg4, const Arg5 &amp;_arg5)</div><div class='add'>+    inline StoredFunctorCall5(FunctionPointer _function, const Arg1 &amp;_arg1, const Arg2 &amp;_arg2, const Arg3 &amp;_arg3, const Arg4 &amp;_arg4, const Arg5 &amp;_arg5)</div><div class='ctx'>       : function(_function), arg1(_arg1), arg2(_arg2), arg3(_arg3), arg4(_arg4), arg5(_arg5) {}</div><div class='ctx'>     void runFunctor() { function(arg1, arg2, arg3, arg4, arg5); }</div><div class='ctx'>     FunctionPointer function;</div><div class='hunk'>@@ -1127,13 +1092,6 @@ struct VoidStoredFunctorCall5: public RunFunctionTask&lt;T&gt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T, typename FunctionPointer, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5&gt;</div><div class='del'>-struct SelectStoredFunctorCall5</div><div class='del'>-{</div><div class='del'>-    typedef typename SelectSpecialization&lt;T&gt;::template</div><div class='del'>-        Type&lt;StoredFunctorCall5    &lt;T, FunctionPointer, Arg1, Arg2, Arg3, Arg4, Arg5&gt;,</div><div class='del'>-             VoidStoredFunctorCall5&lt;T, FunctionPointer, Arg1, Arg2, Arg3, Arg4, Arg5&gt; &gt;::type type;</div><div class='del'>-};</div><div class='del'>-template &lt;typename T, typename FunctionPointer, typename Arg1, typename Arg2, typename Arg3, typename Arg4, typename Arg5&gt;</div><div class='ctx'> struct StoredFunctorPointerCall5: public RunFunctionTask&lt;T&gt;</div><div class='ctx'> {</div><div class='ctx'>     inline StoredFunctorPointerCall5(FunctionPointer * _function, const Arg1 &amp;_arg1, const Arg2 &amp;_arg2, const Arg3 &amp;_arg3, const Arg4 &amp;_arg4, const Arg5 &amp;_arg5)</div><div class='hunk'>@@ -1316,6 +1274,33 @@ struct SelectStoredConstMemberFunctionPointerCall5</div><div class='ctx'>         Type&lt;StoredConstMemberFunctionPointerCall5    &lt;T, Class, Param1, Arg1, Param2, Arg2, Param3, Arg3, Param4, Arg4, Param5, Arg5&gt;,</div><div class='ctx'>              VoidStoredConstMemberFunctionPointerCall5&lt;T, Class, Param1, Arg1, Param2, Arg2, Param3, Arg3, Param4, Arg4, Param5, Arg5&gt; &gt;::type type;</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+template &lt;typename T, typename Functor&gt;</div><div class='add'>+class StoredFunctorCall : public RunFunctionTask&lt;T&gt;</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    StoredFunctorCall(const Functor &amp;f) : functor(f) { }</div><div class='add'>+    void runFunctor()</div><div class='add'>+    {</div><div class='add'>+        this-&gt;result = functor();</div><div class='add'>+    }</div><div class='add'>+private:</div><div class='add'>+    Functor functor;</div><div class='add'>+};</div><div class='add'>+template &lt;typename Functor&gt;</div><div class='add'>+class StoredFunctorCall&lt;void, Functor&gt; : public RunFunctionTask&lt;void&gt;</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    StoredFunctorCall(const Functor &amp;f) : functor(f) { }</div><div class='add'>+    void runFunctor()</div><div class='add'>+    {</div><div class='add'>+        functor();</div><div class='add'>+    }</div><div class='add'>+private:</div><div class='add'>+    Functor functor;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> } //namespace QtConcurrent</div><div class='ctx'> </div><div class='ctx'> #endif // qdoc</div><div class='head'>diff --git a/src/corelib/concurrent/qthreadpool.cpp b/src/corelib/concurrent/qthreadpool.cpp<br/>index e75cc7e..91e77d9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qthreadpool.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qthreadpool.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qthreadpool.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/concurrent/qthreadpool.cpp</a></div><div class='hunk'>@@ -41,6 +41,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "qthreadpool.h"</div><div class='ctx'> #include "qthreadpool_p.h"</div><div class='add'>+#include "qelapsedtimer.h"</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_THREAD</div><div class='ctx'> </div><div class='hunk'>@@ -249,6 +250,7 @@ bool QThreadPoolPrivate::tooManyThreadsActive() const</div><div class='ctx'> void QThreadPoolPrivate::startThread(QRunnable *runnable)</div><div class='ctx'> {</div><div class='ctx'>     QScopedPointer &lt;QThreadPoolThread&gt; thread(new QThreadPoolThread(this));</div><div class='add'>+    thread-&gt;setObjectName(QLatin1String("Thread (pooled)"));</div><div class='ctx'>     allThreads.insert(thread.data());</div><div class='ctx'>     ++activeThreads;</div><div class='ctx'> </div><div class='hunk'>@@ -288,11 +290,21 @@ void QThreadPoolPrivate::reset()</div><div class='ctx'>     isExiting = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void QThreadPoolPrivate::waitForDone()</div><div class='add'>+bool QThreadPoolPrivate::waitForDone(int msecs)</div><div class='ctx'> {</div><div class='ctx'>     QMutexLocker locker(&amp;mutex);</div><div class='del'>-    while (!(queue.isEmpty() &amp;&amp; activeThreads == 0))</div><div class='del'>-        noActiveThreads.wait(locker.mutex());</div><div class='add'>+    if (msecs &lt; 0) {</div><div class='add'>+        while (!(queue.isEmpty() &amp;&amp; activeThreads == 0))</div><div class='add'>+            noActiveThreads.wait(locker.mutex());</div><div class='add'>+    } else {</div><div class='add'>+        QElapsedTimer timer;</div><div class='add'>+        timer.start();</div><div class='add'>+        int t;</div><div class='add'>+        while (!(queue.isEmpty() &amp;&amp; activeThreads == 0) &amp;&amp; </div><div class='add'>+               ((t = msecs - timer.elapsed()) &gt; 0))</div><div class='add'>+            noActiveThreads.wait(locker.mutex(), t);</div><div class='add'>+    }</div><div class='add'>+    return queue.isEmpty() &amp;&amp; activeThreads == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*! \internal</div><div class='hunk'>@@ -617,6 +629,23 @@ void QThreadPool::waitForDone()</div><div class='ctx'>     d-&gt;reset();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*!</div><div class='add'>+    \overload waitForDone()</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Waits up to \a msecs milliseconds for all threads to exit and removes all </div><div class='add'>+    threads from the thread pool. Returns true if all threads were removed; </div><div class='add'>+    otherwise it returns false.</div><div class='add'>+*/</div><div class='add'>+bool QThreadPool::waitForDone(int msecs)</div><div class='add'>+{</div><div class='add'>+    Q_D(QThreadPool);</div><div class='add'>+    bool rc = d-&gt;waitForDone(msecs);</div><div class='add'>+    if (rc)</div><div class='add'>+      d-&gt;reset();</div><div class='add'>+    return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/src/corelib/concurrent/qthreadpool.h b/src/corelib/concurrent/qthreadpool.h<br/>index ca13320..d857073 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qthreadpool.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qthreadpool.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qthreadpool.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/concurrent/qthreadpool.h</a></div><div class='hunk'>@@ -85,6 +85,7 @@ public:</div><div class='ctx'>     void releaseThread();</div><div class='ctx'> </div><div class='ctx'>     void waitForDone();</div><div class='add'>+    bool waitForDone(int msecs);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/concurrent/qthreadpool_p.h b/src/corelib/concurrent/qthreadpool_p.h<br/>index 9697919..db50ec9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qthreadpool_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/concurrent/qthreadpool_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/concurrent/qthreadpool_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/concurrent/qthreadpool_p.h</a></div><div class='hunk'>@@ -82,7 +82,7 @@ public:</div><div class='ctx'> </div><div class='ctx'>     void startThread(QRunnable *runnable = 0);</div><div class='ctx'>     void reset();</div><div class='del'>-    void waitForDone();</div><div class='add'>+    bool waitForDone(int msecs = -1);</div><div class='ctx'>     bool startFrontRunnable();</div><div class='ctx'>     void stealRunnable(QRunnable *);</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro<br/>index 06aa191..58d2c7b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/corelib.pro?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/corelib.pro</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/corelib.pro?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/corelib.pro</a></div><div class='hunk'>@@ -19,8 +19,14 @@ include(codecs/codecs.pri)</div><div class='ctx'> include(statemachine/statemachine.pri)</div><div class='ctx'> include(xml/xml.pri)</div><div class='ctx'> </div><div class='del'>-mac|darwin:LIBS_PRIVATE += -framework ApplicationServices</div><div class='del'>-</div><div class='add'>+!qpa:mac|darwin:LIBS_PRIVATE += -framework ApplicationServices</div><div class='add'>+qpa {</div><div class='add'>+    contains(QT_CONFIG, coreservices) {</div><div class='add'>+        LIBS_PRIVATE += -framework CoreServices</div><div class='add'>+    }</div><div class='add'>+} else:mac|darwin {</div><div class='add'>+        LIBS_PRIVATE += -framework CoreFoundation</div><div class='add'>+}</div><div class='ctx'> mac:lib_bundle:DEFINES += QT_NO_DEBUG_PLUGIN_CHECK</div><div class='ctx'> win32:DEFINES-=QT_NO_CAST_TO_ASCII</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri<br/>index 8ff423e..68582bf 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/global/global.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/global.pri</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/global/global.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/global/global.pri</a></div><div class='hunk'>@@ -19,7 +19,7 @@ INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global</div><div class='ctx'> # Only used on platforms with CONFIG += precompile_header</div><div class='ctx'> PRECOMPILED_HEADER = global/qt_pch.h</div><div class='ctx'> </div><div class='del'>-linux*:!static:!symbian-armcc:!symbian-gcce {</div><div class='add'>+linux*:!static:!symbian-gcce:!*-armcc* {</div><div class='ctx'>    QMAKE_LFLAGS += -Wl,-e,qt_core_boilerplate</div><div class='ctx'>    prog=$$quote(if (/program interpreter: (.*)]/) { print $1; })</div><div class='ctx'>    DEFINES += ELF_INTERPRETER=\\\"$$system(readelf -l /bin/ls | perl -n -e \'$$prog\')\\\"</div><div class='head'>diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h<br/>new file mode 100644<br/>index 0000000..18ae261<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/global/qconfig-nacl.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/global/qconfig-nacl.h</a></div><div class='hunk'>@@ -0,0 +1,371 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#define QT_FONTS_ARE_RESOURCES</div><div class='add'>+</div><div class='add'>+/* Data structures */</div><div class='add'>+#ifndef QT_NO_QUUID_STRING</div><div class='add'>+#  define QT_NO_QUUID_STRING</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_STL</div><div class='add'>+#  define QT_NO_STL</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_TEXTDATE</div><div class='add'>+#  define QT_NO_TEXTDATE</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_DATESTRING</div><div class='add'>+#  define QT_NO_DATESTRING</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Dialogs */</div><div class='add'>+#ifndef QT_NO_FILEDIALOG</div><div class='add'>+#  define QT_NO_FILEDIALOG</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_PRINTDIALOG</div><div class='add'>+#  define QT_NO_PRINTDIALOG</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_PRINTPREVIEWDIALOG</div><div class='add'>+#  define QT_NO_PRINTPREVIEWDIALOG</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* File I/O */</div><div class='add'>+#ifndef QT_NO_DOM</div><div class='add'>+#  define QT_NO_DOM</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_FILESYSTEMWATCHER</div><div class='add'>+#  define QT_NO_FILESYSTEMWATCHER</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_FSFILEENGINE</div><div class='add'>+#  define QT_NO_FSFILEENGINE</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_FILESYSTEMMODEL</div><div class='add'>+#  define QT_NO_FILESYSTEMMODEL</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_FILESYSTEMMODEL</div><div class='add'>+#  define QT_NO_FILESYSTEMMODEL</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_PROCESS</div><div class='add'>+#  define QT_NO_PROCESS</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_TEMPORARYFILE</div><div class='add'>+#  define QT_NO_TEMPORARYFILE</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_SETTINGS</div><div class='add'>+#  define QT_NO_SETTINGS</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_LIBRARY</div><div class='add'>+#  define QT_NO_LIBRARY</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Fonts */</div><div class='add'>+#ifndef QT_NO_QWS_QPF2</div><div class='add'>+#  define QT_NO_QWS_QPF2</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Images */</div><div class='add'>+#ifndef QT_NO_IMAGEFORMATPLUGIN</div><div class='add'>+#  define QT_NO_IMAGEFORMATPLUGIN</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_IMAGE_HEURISTIC_MASK</div><div class='add'>+#  define QT_NO_IMAGE_HEURISTIC_MASK</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_IMAGE_TEXT</div><div class='add'>+#  define QT_NO_IMAGE_TEXT</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_MOVIE</div><div class='add'>+#  define QT_NO_MOVIE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Internationalization */</div><div class='add'>+#ifndef QT_NO_BIG_CODECS</div><div class='add'>+#  define QT_NO_BIG_CODECS</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_INPUTMETHODS</div><div class='add'>+#  define QT_NO_QWS_INPUTMETHODS</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_TEXTCODEC</div><div class='add'>+#  define QT_NO_TEXTCODEC</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_CODECS</div><div class='add'>+#  define QT_NO_CODECS</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_TEXTCODECPLUGIN</div><div class='add'>+#  define QT_NO_TEXTCODECPLUGIN</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_TRANSLATION</div><div class='add'>+#  define QT_NO_TRANSLATION</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_TRANSLATION_UTF8</div><div class='add'>+#  define QT_NO_TRANSLATION_UTF8</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* ItemViews */</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_DIRMODEL</div><div class='add'>+#  define QT_NO_DIRMODEL</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Kernel */</div><div class='add'>+#ifndef QT_NO_CLIPBOARD</div><div class='add'>+#  define QT_NO_CLIPBOARD</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_CSSPARSER</div><div class='add'>+#  define QT_NO_CSSPARSER</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_CURSOR</div><div class='add'>+#  define QT_NO_CURSOR</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_DRAGANDDROP</div><div class='add'>+#  define QT_NO_DRAGANDDROP</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_EFFECTS</div><div class='add'>+#  define QT_NO_EFFECTS</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_SESSIONMANAGER</div><div class='add'>+#  define QT_NO_SESSIONMANAGER</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_SHAREDMEMORY</div><div class='add'>+#  define QT_NO_SHAREDMEMORY</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_SOUND</div><div class='add'>+#  define QT_NO_SOUND</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+#  define QT_NO_SYSTEMSEMAPHORE</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_SYSTEMSEMAPHORE</div><div class='add'>+#  define QT_NO_SYSTEMSEMAPHORE</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_TABLETEVENT</div><div class='add'>+#  define QT_NO_TABLETEVENT</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_CRASHHANDLER</div><div class='add'>+#  define QT_NO_CRASHHANDLER</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_CONCURRENT</div><div class='add'>+#  define QT_NO_CONCURRENT</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_XMLSTREAM</div><div class='add'>+#  define QT_NO_XMLSTREAM</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_XMLSTREAMREADER</div><div class='add'>+#  define QT_NO_XMLSTREAMREADER</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_XMLSTREAMWRITER</div><div class='add'>+#  define QT_NO_XMLSTREAMWRITER</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Networking */</div><div class='add'>+#ifndef QT_NO_COP</div><div class='add'>+#  define QT_NO_COP</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_HOSTINFO</div><div class='add'>+#  define QT_NO_HOSTINFO</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_HTTP</div><div class='add'>+#  define QT_NO_HTTP</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_NETWORKPROXY</div><div class='add'>+#  define QT_NO_NETWORKPROXY</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_SOCKS5</div><div class='add'>+#  define QT_NO_SOCKS5</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_UDPSOCKET</div><div class='add'>+#  define QT_NO_UDPSOCKET</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_URLINFO</div><div class='add'>+#  define QT_NO_URLINFO</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_FTP</div><div class='add'>+#  define QT_NO_FTP</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Painting */</div><div class='add'>+#ifndef QT_NO_COLORNAMES</div><div class='add'>+#  define QT_NO_COLORNAMES</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_DIRECTPAINTER</div><div class='add'>+#  define QT_NO_DIRECTPAINTER</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_PAINTONSCREEN</div><div class='add'>+#  define QT_NO_PAINTONSCREEN</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_PAINT_DEBUG</div><div class='add'>+#  define QT_NO_PAINT_DEBUG</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_PICTURE</div><div class='add'>+#  define QT_NO_PICTURE</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_PRINTER</div><div class='add'>+#  define QT_NO_PRINTER</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_CUPS</div><div class='add'>+#  define QT_NO_CUPS</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Qt for Embedded Linux */</div><div class='add'>+#ifndef QT_NO_QWSEMBEDWIDGET</div><div class='add'>+#  define QT_NO_QWSEMBEDWIDGET</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_ALPHA_CURSOR</div><div class='add'>+#  define QT_NO_QWS_ALPHA_CURSOR</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_CURSOR</div><div class='add'>+#  define QT_NO_QWS_CURSOR</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_DECORATION_DEFAULT</div><div class='add'>+#  define QT_NO_QWS_DECORATION_DEFAULT</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_DECORATION_STYLED</div><div class='add'>+#  define QT_NO_QWS_DECORATION_STYLED</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_DECORATION_WINDOWS</div><div class='add'>+#  define QT_NO_QWS_DECORATION_WINDOWS</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_MANAGER</div><div class='add'>+#  define QT_NO_QWS_MANAGER</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_KEYBOARD</div><div class='add'>+#  define QT_NO_QWS_KEYBOARD</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_MOUSE</div><div class='add'>+#  define QT_NO_QWS_MOUSE</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_MOUSE_AUTO</div><div class='add'>+#  define QT_NO_QWS_MOUSE_AUTO</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_MOUSE_MANUAL</div><div class='add'>+#  define QT_NO_QWS_MOUSE_MANUAL</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_MULTIPROCESS</div><div class='add'>+#  define QT_NO_QWS_MULTIPROCESS</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_SOUNDSERVER</div><div class='add'>+#  define QT_NO_QWS_SOUNDSERVER</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_SXE</div><div class='add'>+#  define QT_NO_SXE</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_PROPERTIES</div><div class='add'>+#  define QT_NO_QWS_PROPERTIES</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_PROXYSCREEN</div><div class='add'>+#  define QT_NO_QWS_PROXYSCREEN</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_DYNAMICSCREENTRANSFORMATION</div><div class='add'>+#  define QT_NO_QWS_DYNAMICSCREENTRANSFORMATION</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_LINUXFB</div><div class='add'>+#  define QT_NO_QWS_LINUXFB</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_MOUSE_PC</div><div class='add'>+#  define QT_NO_QWS_MOUSE_PC</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_MOUSE_LINUXTP</div><div class='add'>+#  define QT_NO_QWS_MOUSE_LINUXTP</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QWS_QPF</div><div class='add'>+#  define QT_NO_QWS_QPF</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* SVG */</div><div class='add'>+#ifndef QT_NO_SVG</div><div class='add'>+#  define QT_NO_SVG</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_GRAPHICSSVGITEM</div><div class='add'>+#  define QT_NO_GRAPHICSSVGITEM</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_SVGGENERATOR</div><div class='add'>+#  define QT_NO_SVGGENERATOR</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_SVGRENDERER</div><div class='add'>+#  define QT_NO_SVGRENDERER</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_SVGWIDGET</div><div class='add'>+#  define QT_NO_SVGWIDGET</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Styles */</div><div class='add'>+#ifndef QT_NO_STYLE_MOTIF</div><div class='add'>+#  define QT_NO_STYLE_MOTIF</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_STYLE_CDE</div><div class='add'>+#  define QT_NO_STYLE_CDE</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_STYLE_STYLESHEET</div><div class='add'>+#  define QT_NO_STYLE_STYLESHEET</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_STYLE_WINDOWSCE</div><div class='add'>+#  define QT_NO_STYLE_WINDOWSCE</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_STYLE_WINDOWSMOBILE</div><div class='add'>+#  define QT_NO_STYLE_WINDOWSMOBILE</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_STYLE_WINDOWSVISTA</div><div class='add'>+#  define QT_NO_STYLE_WINDOWSVISTA</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_STYLE_WINDOWSXP</div><div class='add'>+#  define QT_NO_STYLE_WINDOWSXP</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Utilities */</div><div class='add'>+#ifndef QT_NO_ACCESSIBILITY</div><div class='add'>+#  define QT_NO_ACCESSIBILITY</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_COMPLETER</div><div class='add'>+#  define QT_NO_COMPLETER</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_DESKTOPSERVICES</div><div class='add'>+#  define QT_NO_DESKTOPSERVICES</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_SCRIPT</div><div class='add'>+#  define QT_NO_SCRIPT</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_SYSTEMTRAYICON</div><div class='add'>+#  define QT_NO_SYSTEMTRAYICON</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Windows */</div><div class='add'>+#ifndef QT_NO_WIN_ACTIVEQT</div><div class='add'>+#  define QT_NO_WIN_ACTIVEQT</div><div class='add'>+#endif</div><div class='head'>diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h<br/>index b2ab140..8a17af5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/global/qendian.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qendian.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/global/qendian.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/global/qendian.h</a></div><div class='hunk'>@@ -88,7 +88,7 @@ template &lt;typename T&gt; inline void qToUnaligned(const T src, uchar *dest)</div><div class='ctx'>  * and return the value in host-endian encoding.</div><div class='ctx'>  * There is no requirement that \a src must be aligned.</div><div class='ctx'> */</div><div class='del'>-#if defined Q_CC_MSVC &amp;&amp; _MSC_VER &lt; 1300 || defined Q_CC_SUN</div><div class='add'>+#if defined Q_CC_SUN</div><div class='ctx'> inline quint64 qFromLittleEndian_helper(const uchar *src, quint64 *dest)</div><div class='ctx'> {</div><div class='ctx'>     return 0</div><div class='hunk'>@@ -176,7 +176,7 @@ template &lt;&gt; inline qint16 qFromLittleEndian&lt;qint16&gt;(const uchar *src)</div><div class='ctx'>  * and return the value in host-endian encoding.</div><div class='ctx'>  * There is no requirement that \a src must be aligned.</div><div class='ctx'> */</div><div class='del'>-#if defined Q_CC_MSVC &amp;&amp; _MSC_VER &lt; 1300 || defined Q_CC_SUN</div><div class='add'>+#if defined Q_CC_SUN</div><div class='ctx'> inline quint64 qFromBigEndian_helper(const uchar *src, quint64 *dest)</div><div class='ctx'> {</div><div class='ctx'>     return 0</div><div class='hunk'>@@ -363,6 +363,11 @@ template &lt;typename T&gt; inline void qToLittleEndian(T src, uchar *dest)</div><div class='ctx'> </div><div class='ctx'> #endif // Q_BYTE_ORDER == Q_BIG_ENDIAN</div><div class='ctx'> </div><div class='add'>+template &lt;&gt; inline quint8 qbswap&lt;quint8&gt;(quint8 source)</div><div class='add'>+{</div><div class='add'>+    return source;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> QT_END_HEADER</div><div class='head'>diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h<br/>index 7d37377..e0b8a8f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/global/qfeatures.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qfeatures.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/global/qfeatures.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/global/qfeatures.h</a></div><div class='hunk'>@@ -79,6 +79,9 @@</div><div class='ctx'> // Effects</div><div class='ctx'> //#define QT_NO_EFFECTS</div><div class='ctx'> </div><div class='add'>+// QFileSystemIterator</div><div class='add'>+//#define QT_NO_FILESYSTEMITERATOR</div><div class='add'>+</div><div class='ctx'> // QFileSystemWatcher</div><div class='ctx'> //#define QT_NO_FILESYSTEMWATCHER</div><div class='ctx'> </div><div class='hunk'>@@ -523,11 +526,6 @@</div><div class='ctx'> #define QT_NO_FTP</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-// Hyper Text Transfer Protocol</div><div class='del'>-#if !defined(QT_NO_HTTP) &amp;&amp; (defined(QT_NO_HOSTINFO))</div><div class='del'>-#define QT_NO_HTTP</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> // QInputContext</div><div class='ctx'> #if !defined(QT_NO_IM) &amp;&amp; (defined(QT_NO_LIBRARY))</div><div class='ctx'> #define QT_NO_IM</div><div class='hunk'>@@ -583,6 +581,11 @@</div><div class='ctx'> #define QT_NO_GRAPHICSVIEW</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+// Hyper Text Transfer Protocol</div><div class='add'>+#if !defined(QT_NO_HTTP) &amp;&amp; defined(QT_NO_HOSTINFO)</div><div class='add'>+#define QT_NO_HTTP</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> // QMdiArea</div><div class='ctx'> #if !defined(QT_NO_MDIAREA) &amp;&amp; (defined(QT_NO_SCROLLAREA))</div><div class='ctx'> #define QT_NO_MDIAREA</div><div class='head'>diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt<br/>index 4d938a9..6b861d4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/global/qfeatures.txt?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qfeatures.txt</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/global/qfeatures.txt?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/global/qfeatures.txt</a></div><div class='hunk'>@@ -242,6 +242,14 @@ Requires:</div><div class='ctx'> Name: QFileSystemWatcher</div><div class='ctx'> SeeAlso: ???</div><div class='ctx'> </div><div class='add'>+Feature: FILESYSTEMITERATOR</div><div class='add'>+Description: Provides fast file-system iteration.</div><div class='add'>+for modications.</div><div class='add'>+Section: File I/O</div><div class='add'>+Requires:</div><div class='add'>+Name: QFileSystemIterator</div><div class='add'>+SeeAlso: ???</div><div class='add'>+</div><div class='ctx'> # Widgets</div><div class='ctx'> </div><div class='ctx'> Feature: TREEWIDGET</div><div class='head'>diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp<br/>index 283cb02..c144871 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/global/qglobal.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qglobal.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/global/qglobal.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/global/qglobal.cpp</a></div><div class='hunk'>@@ -74,7 +74,7 @@</div><div class='ctx'> #  include &lt;envLib.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(Q_CC_MWERKS) &amp;&amp; defined(Q_OS_MACX)</div><div class='add'>+#if defined(Q_OS_MACX) &amp;&amp; !defined(QT_NO_CORESERVICES)</div><div class='ctx'> #include &lt;CoreServices/CoreServices.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1173,6 +1173,7 @@ bool qSharedBuild()</div><div class='ctx'>     \value MV_10_4     Mac OS X 10.4</div><div class='ctx'>     \value MV_10_5     Mac OS X 10.5</div><div class='ctx'>     \value MV_10_6     Mac OS X 10.6</div><div class='add'>+    \value MV_10_7     Mac OS X 10.7</div><div class='ctx'>     \value MV_Unknown  An unknown and currently unsupported platform</div><div class='ctx'> </div><div class='ctx'>     \value MV_CHEETAH  Apple codename for MV_10_0</div><div class='hunk'>@@ -1182,6 +1183,7 @@ bool qSharedBuild()</div><div class='ctx'>     \value MV_TIGER    Apple codename for MV_10_4</div><div class='ctx'>     \value MV_LEOPARD  Apple codename for MV_10_5</div><div class='ctx'>     \value MV_SNOWLEOPARD  Apple codename for MV_10_6</div><div class='add'>+    \value MV_LION     Apple codename for MV_10_7</div><div class='ctx'> </div><div class='ctx'>     \sa WinVersion, SymbianVersion</div><div class='ctx'> */</div><div class='hunk'>@@ -1235,7 +1237,7 @@ bool qSharedBuild()</div><div class='ctx'> </div><div class='ctx'>     Defined on Mac OS X.</div><div class='ctx'> </div><div class='del'>-    \sa Q_WS_WIN, Q_WS_X11, Q_WS_QWS, Q_WS_S60</div><div class='add'>+    \sa Q_WS_WIN, Q_WS_X11, Q_WS_QWS, Q_WS_QPA, Q_WS_S60</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -1244,7 +1246,7 @@ bool qSharedBuild()</div><div class='ctx'> </div><div class='ctx'>     Defined on Windows.</div><div class='ctx'> </div><div class='del'>-    \sa Q_WS_MAC, Q_WS_X11, Q_WS_QWS, Q_WS_S60</div><div class='add'>+    \sa Q_WS_MAC, Q_WS_X11, Q_WS_QWS, Q_WS_QPA, Q_WS_S60</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -1253,7 +1255,7 @@ bool qSharedBuild()</div><div class='ctx'> </div><div class='ctx'>     Defined on X11.</div><div class='ctx'> </div><div class='del'>-    \sa Q_WS_MAC, Q_WS_WIN, Q_WS_QWS, Q_WS_S60</div><div class='add'>+    \sa Q_WS_MAC, Q_WS_WIN, Q_WS_QWS, Q_WS_QPA, Q_WS_S60</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -1262,7 +1264,16 @@ bool qSharedBuild()</div><div class='ctx'> </div><div class='ctx'>     Defined on Qt for Embedded Linux.</div><div class='ctx'> </div><div class='del'>-    \sa Q_WS_MAC, Q_WS_WIN, Q_WS_X11, Q_WS_S60</div><div class='add'>+    \sa Q_WS_MAC, Q_WS_WIN, Q_WS_X11, Q_WS_QPA, Q_WS_S60</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \macro Q_WS_QPA</div><div class='add'>+    \relates &lt;QtGlobal&gt;</div><div class='add'>+</div><div class='add'>+    Defined on Qt for Embedded Linux, Lite version.</div><div class='add'>+</div><div class='add'>+    \sa Q_WS_MAC, Q_WS_WIN, Q_WS_X11, Q_WS_QWS, Q_WS_S60</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -1637,7 +1648,7 @@ static const unsigned int qt_one = 1;</div><div class='ctx'> const int QSysInfo::ByteOrder = ((*((unsigned char *) &amp;qt_one) == 0) ? BigEndian : LittleEndian);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if !defined(QWS) &amp;&amp; defined(Q_OS_MAC)</div><div class='add'>+#if !defined(QWS) &amp;&amp; !defined(Q_WS_QPA) &amp;&amp; defined(Q_OS_MAC)</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_INCLUDE_NAMESPACE</div><div class='ctx'> #include "private/qcore_mac_p.h"</div><div class='hunk'>@@ -1691,15 +1702,18 @@ Q_CORE_EXPORT void qt_mac_to_pascal_string(QString s, Str255 str, TextEncoding e</div><div class='ctx'> Q_CORE_EXPORT QString qt_mac_from_pascal_string(const Str255 pstr) {</div><div class='ctx'>     return QCFString(CFStringCreateWithPascalString(0, pstr, CFStringGetSystemEncoding()));</div><div class='ctx'> }</div><div class='add'>+#endif //!defined(QWS) &amp;&amp; !defined(Q_WS_QPA) &amp;&amp; defined(Q_OS_MAC)</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+#if !defined(QWS) &amp;&amp; defined(Q_OS_MAC)</div><div class='ctx'> </div><div class='ctx'> static QSysInfo::MacVersion macVersion()</div><div class='ctx'> {</div><div class='add'>+#ifndef QT_NO_CORESERVICES</div><div class='ctx'>     SInt32 gestalt_version;</div><div class='ctx'>     if (Gestalt(gestaltSystemVersion, &amp;gestalt_version) == noErr) {</div><div class='ctx'>         return QSysInfo::MacVersion(((gestalt_version &amp; 0x00F0) &gt;&gt; 4) + 2);</div><div class='ctx'>     }</div><div class='add'>+#endif</div><div class='ctx'>     return QSysInfo::MV_Unknown;</div><div class='ctx'> }</div><div class='ctx'> const QSysInfo::MacVersion QSysInfo::MacintoshVersion = macVersion();</div><div class='hunk'>@@ -1729,7 +1743,7 @@ QSysInfo::WinVersion QSysInfo::windowsVersion()</div><div class='ctx'>     if (winver)</div><div class='ctx'>         return winver;</div><div class='ctx'>     winver = QSysInfo::WV_NT;</div><div class='del'>-    OSVERSIONINFOW osver;</div><div class='add'>+    OSVERSIONINFO osver;</div><div class='ctx'>     osver.dwOSVersionInfoSize = sizeof(osver);</div><div class='ctx'>     GetVersionEx(&amp;osver);</div><div class='ctx'> #ifdef Q_OS_WINCE</div><div class='hunk'>@@ -2016,7 +2030,7 @@ QSysInfo::S60Version QSysInfo::s60Version()</div><div class='ctx'> */</div><div class='ctx'> void qt_check_pointer(const char *n, int l)</div><div class='ctx'> {</div><div class='del'>-    qWarning("In file %s, line %d: Out of memory", n, l);</div><div class='add'>+    qFatal("In file %s, line %d: Out of memory", n, l);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* \internal</div><div class='hunk'>@@ -2247,7 +2261,8 @@ void qt_message_output(QtMsgType msgType, const char *buf)</div><div class='ctx'>         _LIT(format, "[Qt Message] %S");</div><div class='ctx'>         const int maxBlockSize = 256 - ((const TDesC &amp;)format).Length();</div><div class='ctx'>         const TPtrC8 ptr(reinterpret_cast&lt;const TUint8*&gt;(buf));</div><div class='del'>-        HBufC* hbuffer = q_check_ptr(HBufC::New(qMin(maxBlockSize, ptr.Length())));</div><div class='add'>+        HBufC* hbuffer = HBufC::New(qMin(maxBlockSize, ptr.Length()));</div><div class='add'>+        Q_CHECK_PTR(hbuffer);</div><div class='ctx'>         for (int i = 0; i &lt; ptr.Length(); i += hbuffer-&gt;Length()) {</div><div class='ctx'>             hbuffer-&gt;Des().Copy(ptr.Mid(i, qMin(maxBlockSize, ptr.Length()-i)));</div><div class='ctx'>             RDebug::Print(format, hbuffer);</div><div class='hunk'>@@ -2585,7 +2600,7 @@ bool qputenv(const char *varName, const QByteArray&amp; value)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if (defined(Q_OS_UNIX) || defined(Q_OS_WIN)) &amp;&amp; !defined(QT_NO_THREAD)</div><div class='add'>+#if defined(Q_OS_UNIX) &amp;&amp; !defined(Q_OS_SYMBIAN) &amp;&amp; !defined(QT_NO_THREAD)</div><div class='ctx'> </div><div class='ctx'> #  if defined(Q_OS_INTEGRITY) &amp;&amp; defined(__GHS_VERSION_NUMBER) &amp;&amp; (__GHS_VERSION_NUMBER &lt; 500)</div><div class='ctx'> // older versions of INTEGRITY used a long instead of a uint for the seed.</div><div class='hunk'>@@ -2616,7 +2631,7 @@ Q_GLOBAL_STATIC(SeedStorage, randTLS)  // Thread Local Storage for seed value</div><div class='ctx'> */</div><div class='ctx'> void qsrand(uint seed)</div><div class='ctx'> {</div><div class='del'>-#if defined(Q_OS_UNIX) &amp;&amp; !defined(QT_NO_THREAD) &amp;&amp; !defined(Q_OS_SYMBIAN)</div><div class='add'>+#if defined(Q_OS_UNIX) &amp;&amp; !defined(Q_OS_SYMBIAN) &amp;&amp; !defined(QT_NO_THREAD)</div><div class='ctx'>     SeedStorage *seedStorage = randTLS();</div><div class='ctx'>     if (seedStorage) {</div><div class='ctx'>         SeedStorageType *pseed = seedStorage-&gt;localData();</div><div class='hunk'>@@ -2624,10 +2639,10 @@ void qsrand(uint seed)</div><div class='ctx'>             seedStorage-&gt;setLocalData(pseed = new SeedStorageType);</div><div class='ctx'>         *pseed = seed;</div><div class='ctx'>     } else {</div><div class='del'>-        //golbal static seed storage should always exist,</div><div class='add'>+        //global static seed storage should always exist,</div><div class='ctx'>         //except after being deleted by QGlobalStaticDeleter.</div><div class='ctx'>         //But since it still can be called from destructor of another</div><div class='del'>-        //global static object, fallback to sqrand(seed)</div><div class='add'>+        //global static object, fallback to srand(seed)</div><div class='ctx'>         srand(seed);</div><div class='ctx'>     }</div><div class='ctx'> #else</div><div class='hunk'>@@ -2655,7 +2670,7 @@ void qsrand(uint seed)</div><div class='ctx'> */</div><div class='ctx'> int qrand()</div><div class='ctx'> {</div><div class='del'>-#if defined(Q_OS_UNIX) &amp;&amp; !defined(QT_NO_THREAD) &amp;&amp; !defined(Q_OS_SYMBIAN)</div><div class='add'>+#if defined(Q_OS_UNIX) &amp;&amp; !defined(Q_OS_SYMBIAN) &amp;&amp; !defined(QT_NO_THREAD)</div><div class='ctx'>     SeedStorage *seedStorage = randTLS();</div><div class='ctx'>     if (seedStorage) {</div><div class='ctx'>         SeedStorageType *pseed = seedStorage-&gt;localData();</div><div class='hunk'>@@ -2665,10 +2680,10 @@ int qrand()</div><div class='ctx'>         }</div><div class='ctx'>         return rand_r(pseed);</div><div class='ctx'>     } else {</div><div class='del'>-        //golbal static seed storage should always exist,</div><div class='add'>+        //global static seed storage should always exist,</div><div class='ctx'>         //except after being deleted by QGlobalStaticDeleter.</div><div class='ctx'>         //But since it still can be called from destructor of another</div><div class='del'>-        //global static object, fallback to qrand()</div><div class='add'>+        //global static object, fallback to rand()</div><div class='ctx'>         return rand();</div><div class='ctx'>     }</div><div class='ctx'> #else</div><div class='hunk'>@@ -2864,6 +2879,40 @@ int qrand()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \macro Q_LIKELY(expr)</div><div class='add'>+    \relates &lt;QtGlobal&gt;</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    \brief Hints the compiler that the enclosed condition is likely to evaluate</div><div class='add'>+    to \c true.</div><div class='add'>+</div><div class='add'>+    Use of this macro can help the compiler to optimize the code.</div><div class='add'>+</div><div class='add'>+    Example:</div><div class='add'>+</div><div class='add'>+    \snippet doc/src/snippets/code/src_corelib_global_qglobal.cpp qlikely</div><div class='add'>+</div><div class='add'>+    \sa Q_UNLIKELY()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \macro Q_UNLIKELY(expr)</div><div class='add'>+    \relates &lt;QtGlobal&gt;</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    \brief Hints the compiler that the enclosed condition is likely to evaluate</div><div class='add'>+    to \c false.</div><div class='add'>+</div><div class='add'>+    Use of this macro can help the compiler to optimize the code.</div><div class='add'>+</div><div class='add'>+    Example:</div><div class='add'>+</div><div class='add'>+    \snippet doc/src/snippets/code/src_corelib_global_qglobal.cpp qunlikely</div><div class='add'>+</div><div class='add'>+    \sa Q_LIKELY()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='ctx'>     \macro QT_POINTER_SIZE</div><div class='ctx'>     \relates &lt;QtGlobal&gt;</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h<br/>index b8f3bb0..1454cb3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/global/qglobal.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qglobal.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/global/qglobal.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/global/qglobal.h</a></div><div class='hunk'>@@ -44,11 +44,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;stddef.h&gt;</div><div class='ctx'> </div><div class='del'>-#define QT_VERSION_STR   "4.7.4"</div><div class='add'>+#define QT_VERSION_STR   "4.8.0"</div><div class='ctx'> /*</div><div class='ctx'>    QT_VERSION is (major &lt;&lt; 16) + (minor &lt;&lt; 8) + patch.</div><div class='ctx'> */</div><div class='del'>-#define QT_VERSION 0x040704</div><div class='add'>+#define QT_VERSION 0x040800</div><div class='ctx'> /*</div><div class='ctx'>    can be used like #if (QT_VERSION &gt;= QT_VERSION_CHECK(4, 4, 0))</div><div class='ctx'> */</div><div class='hunk'>@@ -64,6 +64,10 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef __cplusplus</div><div class='ctx'> </div><div class='add'>+#ifndef QT_NO_STL</div><div class='add'>+#include &lt;algorithm&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef QT_NAMESPACE /* user namespace */</div><div class='ctx'> </div><div class='ctx'> # define QT_PREPEND_NAMESPACE(name) ::name</div><div class='hunk'>@@ -216,6 +220,8 @@ namespace QT_NAMESPACE {}</div><div class='ctx'> #  define Q_OS_ULTRIX</div><div class='ctx'> #elif defined(sinix)</div><div class='ctx'> #  define Q_OS_RELIANT</div><div class='add'>+#elif defined(__native_client__)</div><div class='add'>+#  define Q_OS_NACL</div><div class='ctx'> #elif defined(__linux__) || defined(__linux)</div><div class='ctx'> #  define Q_OS_LINUX</div><div class='ctx'> #elif defined(__FreeBSD__) || defined(__DragonFly__)</div><div class='hunk'>@@ -284,7 +290,7 @@ namespace QT_NAMESPACE {}</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(Q_OS_MAC64) &amp;&amp; !defined(QT_MAC_USE_COCOA) &amp;&amp; !defined(QT_BUILD_QMAKE) &amp;&amp; !defined(QT_BOOTSTRAPPED)</div><div class='add'>+#if defined(Q_WS_MAC64) &amp;&amp; !defined(QT_MAC_USE_COCOA) &amp;&amp; !defined(QT_BUILD_QMAKE) &amp;&amp; !defined(QT_BOOTSTRAPPED)</div><div class='ctx'> #error "You are building a 64-bit application, but using a 32-bit version of Qt. Check your build configuration."</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -316,7 +322,10 @@ namespace QT_NAMESPACE {}</div><div class='ctx'> #  if !defined(MAC_OS_X_VERSION_10_6)</div><div class='ctx'> #       define MAC_OS_X_VERSION_10_6 MAC_OS_X_VERSION_10_5 + 1</div><div class='ctx'> #  endif</div><div class='del'>-#  if (MAC_OS_X_VERSION_MAX_ALLOWED &gt; MAC_OS_X_VERSION_10_6)</div><div class='add'>+#  if !defined(MAC_OS_X_VERSION_10_7)</div><div class='add'>+#       define MAC_OS_X_VERSION_10_7 MAC_OS_X_VERSION_10_6 + 1</div><div class='add'>+#  endif</div><div class='add'>+#  if (MAC_OS_X_VERSION_MAX_ALLOWED &gt; MAC_OS_X_VERSION_10_7)</div><div class='ctx'> #    warning "This version of Mac OS X is unsupported"</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='hunk'>@@ -356,13 +365,27 @@ namespace QT_NAMESPACE {}</div><div class='ctx'>      GCCE     - GCCE (Symbian GCCE builds)</div><div class='ctx'>      RVCT     - ARM Realview Compiler Suite</div><div class='ctx'>      NOKIAX86 - Nokia x86 (Symbian WINSCW builds)</div><div class='add'>+     CLANG    - C++ front-end for the LLVM compiler</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'>    Should be sorted most to least authoritative.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #if defined(__ghs)</div><div class='del'>-#  define Q_OUTOFLINE_TEMPLATE inline</div><div class='add'>+# define Q_OUTOFLINE_TEMPLATE inline</div><div class='add'>+</div><div class='add'>+/* the following are necessary because the GHS C++ name mangling relies on __*/</div><div class='add'>+# define Q_CONSTRUCTOR_FUNCTION0(AFUNC) \</div><div class='add'>+   static const int AFUNC ## _init_variable_ = AFUNC();</div><div class='add'>+# define Q_CONSTRUCTOR_FUNCTION(AFUNC) Q_CONSTRUCTOR_FUNCTION0(AFUNC)</div><div class='add'>+# define Q_DESTRUCTOR_FUNCTION0(AFUNC) \</div><div class='add'>+    class AFUNC ## _dest_class_ { \</div><div class='add'>+    public: \</div><div class='add'>+       inline AFUNC ## _dest_class_() { } \</div><div class='add'>+       inline ~ AFUNC ## _dest_class_() { AFUNC(); } \</div><div class='add'>+    } AFUNC ## _dest_instance_;</div><div class='add'>+# define Q_DESTRUCTOR_FUNCTION(AFUNC) Q_DESTRUCTOR_FUNCTION0(AFUNC)</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* Symantec C++ is now Digital Mars */</div><div class='hunk'>@@ -383,31 +406,12 @@ namespace QT_NAMESPACE {}</div><div class='ctx'> </div><div class='ctx'> #elif defined(_MSC_VER)</div><div class='ctx'> #  define Q_CC_MSVC</div><div class='del'>-/* proper support of bool for _MSC_VER &gt;= 1100 */</div><div class='add'>+#  define Q_CC_MSVC_NET</div><div class='ctx'> #  define Q_CANNOT_DELETE_CONSTANT</div><div class='ctx'> #  define Q_OUTOFLINE_TEMPLATE inline</div><div class='ctx'> #  define Q_NO_TEMPLATE_FRIENDS</div><div class='del'>-#  define QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION</div><div class='del'>-#    define Q_ALIGNOF(type)   __alignof(type)</div><div class='del'>-#    define Q_DECL_ALIGN(n)   __declspec(align(n))</div><div class='del'>-</div><div class='del'>-/* Visual C++.Net issues for _MSC_VER &gt;= 1300 */</div><div class='del'>-#  if _MSC_VER &gt;= 1300</div><div class='del'>-#    define Q_CC_MSVC_NET</div><div class='del'>-#    if _MSC_VER &lt; 1310 || (defined(Q_OS_WIN64) &amp;&amp; defined(_M_IA64))</div><div class='del'>-#      define Q_TYPENAME</div><div class='del'>-#    else</div><div class='del'>-#      undef QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION</div><div class='del'>-#    endif</div><div class='del'>-#  else</div><div class='del'>-#    define Q_NO_USING_KEYWORD</div><div class='del'>-#    define QT_NO_MEMBER_TEMPLATES</div><div class='del'>-#  endif</div><div class='del'>-#  if _MSC_VER &lt; 1310</div><div class='del'>-#     define QT_NO_QOBJECT_CHECK</div><div class='del'>-#     define Q_TYPENAME</div><div class='del'>-#     define QT_NO_TEMPLATE_TEMPLATE_PARAMETERS</div><div class='del'>-#  endif</div><div class='add'>+#  define Q_ALIGNOF(type) __alignof(type)</div><div class='add'>+#  define Q_DECL_ALIGN(n) __declspec(align(n))</div><div class='ctx'> /* Intel C++ disguising as Visual C++: the `using' keyword avoids warnings */</div><div class='ctx'> #  if defined(__INTEL_COMPILER)</div><div class='ctx'> #    define Q_CC_INTEL</div><div class='hunk'>@@ -419,6 +423,16 @@ namespace QT_NAMESPACE {}</div><div class='ctx'> #    undef QT_HAVE_3DNOW</div><div class='ctx'> #  endif</div><div class='ctx'> </div><div class='add'>+#if defined(Q_CC_MSVC) &amp;&amp; _MSC_VER &gt;= 1600</div><div class='add'>+#      define Q_COMPILER_RVALUE_REFS</div><div class='add'>+#      define Q_COMPILER_AUTO_TYPE</div><div class='add'>+#      define Q_COMPILER_LAMBDA</div><div class='add'>+#      define Q_COMPILER_DECLTYPE</div><div class='add'>+//  MSCV has std::initilizer_list, but do not support the braces initialization</div><div class='add'>+//#      define Q_COMPILER_INITIALIZER_LISTS</div><div class='add'>+#  endif</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #elif defined(__BORLANDC__) || defined(__TURBOC__)</div><div class='ctx'> #  define Q_CC_BOR</div><div class='ctx'> #  define Q_INLINE_TEMPLATE</div><div class='hunk'>@@ -447,6 +461,9 @@ namespace QT_NAMESPACE {}</div><div class='ctx'> #  if __TARGET_ARCH_ARM &gt;= 6</div><div class='ctx'> #    define QT_HAVE_ARMV6</div><div class='ctx'> #  endif</div><div class='add'>+/* work-around for missing compiler intrinsics */</div><div class='add'>+#  define __is_empty(X) false</div><div class='add'>+#  define __is_pod(X) false</div><div class='ctx'> #elif defined(__GNUC__)</div><div class='ctx'> #  define Q_CC_GNU</div><div class='ctx'> #  define Q_C_CALLBACKS</div><div class='hunk'>@@ -456,7 +473,10 @@ namespace QT_NAMESPACE {}</div><div class='ctx'> #  if defined(__INTEL_COMPILER)</div><div class='ctx'> /* Intel C++ also masquerades as GCC 3.2.0 */</div><div class='ctx'> #    define Q_CC_INTEL</div><div class='del'>-#    define Q_NO_TEMPLATE_FRIENDS</div><div class='add'>+#  endif</div><div class='add'>+#  if defined(__clang__)</div><div class='add'>+/* Clang also masquerades as GCC 4.2.1 */</div><div class='add'>+#    define Q_CC_CLANG</div><div class='ctx'> #  endif</div><div class='ctx'> #  ifdef __APPLE__</div><div class='ctx'> #    define Q_NO_DEPRECATED_CONSTRUCTORS</div><div class='hunk'>@@ -474,6 +494,10 @@ namespace QT_NAMESPACE {}</div><div class='ctx'> #    define Q_TYPEOF(expr)    __typeof__(expr)</div><div class='ctx'> #    define Q_DECL_ALIGN(n)   __attribute__((__aligned__(n)))</div><div class='ctx'> #  endif</div><div class='add'>+#  if __GNUC__ &gt; 2 || (__GNUC__ == 2 &amp;&amp; __GNUC_MINOR__ &gt;= 96)</div><div class='add'>+#    define Q_LIKELY(expr)    __builtin_expect(!!(expr), true)</div><div class='add'>+#    define Q_UNLIKELY(expr)  __builtin_expect(!!(expr), false)</div><div class='add'>+#  endif</div><div class='ctx'> /* GCC 3.1 and GCC 3.2 wrongly define _SB_CTYPE_MACROS on HP-UX */</div><div class='ctx'> #  if defined(Q_OS_HPUX) &amp;&amp; __GNUC__ == 3 &amp;&amp; __GNUC_MINOR__ &gt;= 1</div><div class='ctx'> #    define Q_WRONG_SB_CTYPE_MACROS</div><div class='hunk'>@@ -493,6 +517,27 @@ namespace QT_NAMESPACE {}</div><div class='ctx'> #      define QT_NO_ARM_EABI</div><div class='ctx'> #    endif</div><div class='ctx'> #  endif</div><div class='add'>+#  if defined(__GXX_EXPERIMENTAL_CXX0X__)</div><div class='add'>+#    if (__GNUC__ * 100 + __GNUC_MINOR__) &gt;= 403</div><div class='add'>+       /* C++0x features supported in GCC 4.3: */</div><div class='add'>+#      define Q_COMPILER_RVALUE_REFS</div><div class='add'>+#      define Q_COMPILER_DECLTYPE</div><div class='add'>+#    endif</div><div class='add'>+#    if (__GNUC__ * 100 + __GNUC_MINOR__) &gt;= 404</div><div class='add'>+       /* C++0x features supported in GCC 4.4: */</div><div class='add'>+#      define Q_COMPILER_VARIADIC_TEMPLATES</div><div class='add'>+#      define Q_COMPILER_AUTO_TYPE</div><div class='add'>+#      define Q_COMPILER_EXTERN_TEMPLATES</div><div class='add'>+#      define Q_COMPILER_DEFAULT_DELETE_MEMBERS</div><div class='add'>+#      define Q_COMPILER_CLASS_ENUM</div><div class='add'>+#      define Q_COMPILER_INITIALIZER_LISTS</div><div class='add'>+#    endif</div><div class='add'>+#    if (__GNUC__ * 100 + __GNUC_MINOR__) &gt;= 405</div><div class='add'>+       /* C++0x features supported in GCC 4.5: */</div><div class='add'>+#      define Q_COMPILER_LAMBDA</div><div class='add'>+#      define Q_COMPILER_UNICODE_STRINGS</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='ctx'> </div><div class='ctx'> /* IBM compiler versions are a bit messy. There are actually two products:</div><div class='ctx'>    the C product, and the C++ product. The C++ compiler is always packaged</div><div class='hunk'>@@ -712,10 +757,11 @@ namespace QT_NAMESPACE {}</div><div class='ctx'> #      define Q_DECL_IMPORT     __declspec(dllimport)</div><div class='ctx'> #    endif</div><div class='ctx'> #    if __HP_aCC-0 &gt;= 061200</div><div class='del'>-#      define Q_DECL_ALIGNED(n) __attribute__((aligned(n)))</div><div class='add'>+#      define Q_DECL_ALIGN(n) __attribute__((aligned(n)))</div><div class='ctx'> #    endif</div><div class='ctx'> #    if __HP_aCC-0 &gt;= 062000</div><div class='ctx'> #      define Q_DECL_EXPORT     __attribute__((visibility("default")))</div><div class='add'>+#      define Q_DECL_HIDDEN     __attribute__((visibility("hidden")))</div><div class='ctx'> #      define Q_DECL_IMPORT     Q_DECL_EXPORT</div><div class='ctx'> #    endif</div><div class='ctx'> #  else</div><div class='hunk'>@@ -730,16 +776,42 @@ namespace QT_NAMESPACE {}</div><div class='ctx'> #elif defined(__WINSCW__) &amp;&amp; !defined(Q_CC_NOKIAX86)</div><div class='ctx'> #  define Q_CC_NOKIAX86</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #else</div><div class='ctx'> #  error "Qt has not been tested with this compiler - talk to qt-bugs@trolltech.com"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+#ifdef Q_CC_INTEL</div><div class='add'>+#  if __INTEL_COMPILER &lt; 1200</div><div class='add'>+#    define Q_NO_TEMPLATE_FRIENDS</div><div class='add'>+#  endif</div><div class='add'>+#  if defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__GXX_EXPERIMENTAL_CPP0X__)</div><div class='add'>+#    if __INTEL_COMPILER &gt;= 1100</div><div class='add'>+#      define Q_COMPILER_RVALUE_REFS</div><div class='add'>+#      define Q_COMPILER_EXTERN_TEMPLATES</div><div class='add'>+#      define Q_COMPILER_DECLTYPE</div><div class='add'>+#    elif __INTEL_COMPILER &gt;= 1200</div><div class='add'>+#      define Q_COMPILER_VARIADIC_TEMPLATES</div><div class='add'>+#      define Q_COMPILER_AUTO_TYPE</div><div class='add'>+#      define Q_COMPILER_DEFAULT_DELETE_MEMBERS</div><div class='add'>+#      define Q_COMPILER_CLASS_ENUM</div><div class='add'>+#      define Q_COMPILER_LAMBDA</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef Q_PACKED</div><div class='ctx'> #  define Q_PACKED</div><div class='ctx'> #  undef Q_NO_PACKED_REFERENCE</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef Q_LIKELY</div><div class='add'>+#  define Q_LIKELY(x) (x)</div><div class='add'>+#endif</div><div class='add'>+#ifndef Q_UNLIKELY</div><div class='add'>+#  define Q_UNLIKELY(x) (x)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef Q_CONSTRUCTOR_FUNCTION</div><div class='ctx'> # define Q_CONSTRUCTOR_FUNCTION0(AFUNC) \</div><div class='ctx'>    static const int AFUNC ## __init_variable__ = AFUNC();</div><div class='hunk'>@@ -803,7 +875,7 @@ namespace QT_NAMESPACE {}</div><div class='ctx'> #  define Q_WS_PM</div><div class='ctx'> #  error "Qt does not work with OS/2 Presentation Manager or Workplace Shell"</div><div class='ctx'> #elif defined(Q_OS_UNIX)</div><div class='del'>-#  if defined(Q_OS_MAC) &amp;&amp; !defined(__USE_WS_X11__) &amp;&amp; !defined(Q_WS_QWS)</div><div class='add'>+#  if defined(Q_OS_MAC) &amp;&amp; !defined(__USE_WS_X11__) &amp;&amp; !defined(Q_WS_QWS) &amp;&amp; !defined(Q_WS_QPA)</div><div class='ctx'> #    define Q_WS_MAC</div><div class='ctx'> #    define Q_WS_MACX</div><div class='ctx'> #    if defined(Q_OS_MAC64)</div><div class='hunk'>@@ -815,7 +887,7 @@ namespace QT_NAMESPACE {}</div><div class='ctx'> #    if !defined(QT_NO_S60)</div><div class='ctx'> #      define Q_WS_S60</div><div class='ctx'> #    endif</div><div class='del'>-#  elif !defined(Q_WS_QWS)</div><div class='add'>+#  elif !defined(Q_WS_QWS) &amp;&amp; !defined(Q_WS_QPA)</div><div class='ctx'> #    define Q_WS_X11</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='hunk'>@@ -924,10 +996,10 @@ redefine to built-in booleans to make autotests work properly */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>-   Proper for-scoping in VC++6 and MIPSpro CC</div><div class='add'>+   Proper for-scoping in MIPSpro CC</div><div class='ctx'> */</div><div class='ctx'> #ifndef QT_NO_KEYWORDS</div><div class='del'>-#  if (defined(Q_CC_MSVC) &amp;&amp; !defined(Q_CC_MSVC_NET) &amp;&amp; !defined(Q_CC_INTEL)) || defined(Q_CC_MIPS) || (defined(Q_CC_HPACC) &amp;&amp; defined(__ia64))</div><div class='add'>+#  if defined(Q_CC_MIPS) || (defined(Q_CC_HPACC) &amp;&amp; defined(__ia64))</div><div class='ctx'> #    define for if(0){}else for</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='hunk'>@@ -951,7 +1023,7 @@ redefine to built-in booleans to make autotests work properly */</div><div class='ctx'> #  define Q_DECL_DEPRECATED Q_DECL_DEPRECATED</div><div class='ctx'> #elif (defined(Q_CC_GNU) &amp;&amp; !defined(Q_CC_INTEL) &amp;&amp; (__GNUC__ - 0 &gt; 3 || (__GNUC__ - 0 == 3 &amp;&amp; __GNUC_MINOR__ - 0 &gt;= 2))) || defined(Q_CC_RVCT)</div><div class='ctx'> #  define Q_DECL_DEPRECATED __attribute__ ((__deprecated__))</div><div class='del'>-#elif defined(Q_CC_MSVC) &amp;&amp; (_MSC_VER &gt;= 1300)</div><div class='add'>+#elif defined(Q_CC_MSVC)</div><div class='ctx'> #  define Q_DECL_DEPRECATED __declspec(deprecated)</div><div class='ctx'> #  if defined (Q_CC_INTEL)</div><div class='ctx'> #    define Q_DECL_VARIABLE_DEPRECATED</div><div class='hunk'>@@ -1050,12 +1122,12 @@ redefine to built-in booleans to make autotests work properly */</div><div class='ctx'> </div><div class='ctx'> #if defined(__i386__) || defined(_WIN32) || defined(_WIN32_WCE)</div><div class='ctx'> #  if defined(Q_CC_GNU)</div><div class='del'>-#if ((100*(__GNUC__ - 0) + 10*(__GNUC_MINOR__ - 0) + __GNUC_PATCHLEVEL__) &gt;= 332)</div><div class='add'>+#if !defined(Q_CC_INTEL) &amp;&amp; ((100*(__GNUC__ - 0) + 10*(__GNUC_MINOR__ - 0) + __GNUC_PATCHLEVEL__) &gt;= 332)</div><div class='ctx'> #    define QT_FASTCALL __attribute__((regparm(3)))</div><div class='ctx'> #else</div><div class='ctx'> #    define QT_FASTCALL</div><div class='ctx'> #endif</div><div class='del'>-#  elif defined(Q_CC_MSVC) &amp;&amp; (_MSC_VER &gt; 1300 || defined(Q_CC_INTEL))</div><div class='add'>+#  elif defined(Q_CC_MSVC)</div><div class='ctx'> #    define QT_FASTCALL __fastcall</div><div class='ctx'> #  else</div><div class='ctx'> #     define QT_FASTCALL</div><div class='hunk'>@@ -1077,7 +1149,7 @@ redefine to built-in booleans to make autotests work properly */</div><div class='ctx'> </div><div class='ctx'> typedef int QNoImplicitBoolCast;</div><div class='ctx'> </div><div class='del'>-#if defined(QT_ARCH_ARM) || defined(QT_ARCH_ARMV6) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_MIPS) &amp;&amp; (defined(Q_WS_QWS) || defined(Q_OS_WINCE))) || defined(QT_ARCH_SH) || defined(QT_ARCH_SH4A)</div><div class='add'>+#if defined(QT_ARCH_ARM) || defined(QT_ARCH_ARMV6) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_MIPS) &amp;&amp; (defined(Q_WS_QWS) || defined(Q_WS_QPA) || defined(Q_OS_WINCE))) || defined(QT_ARCH_SH) || defined(QT_ARCH_SH4A)</div><div class='ctx'> #define QT_NO_FPU</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1098,14 +1170,14 @@ template &lt;typename T&gt;</div><div class='ctx'> inline T qAbs(const T &amp;t) { return t &gt;= 0 ? t : -t; }</div><div class='ctx'> </div><div class='ctx'> inline int qRound(qreal d)</div><div class='del'>-{ return d &gt;= 0.0 ? int(d + 0.5) : int(d - int(d-1) + 0.5) + int(d-1); }</div><div class='add'>+{ return d &gt;= qreal(0.0) ? int(d + qreal(0.5)) : int(d - int(d-1) + qreal(0.5)) + int(d-1); }</div><div class='ctx'> </div><div class='ctx'> #if defined(QT_NO_FPU) || defined(QT_ARCH_ARM) || defined(QT_ARCH_WINDOWSCE) || defined(QT_ARCH_SYMBIAN)</div><div class='ctx'> inline qint64 qRound64(double d)</div><div class='ctx'> { return d &gt;= 0.0 ? qint64(d + 0.5) : qint64(d - qreal(qint64(d-1)) + 0.5) + qint64(d-1); }</div><div class='ctx'> #else</div><div class='ctx'> inline qint64 qRound64(qreal d)</div><div class='del'>-{ return d &gt;= 0.0 ? qint64(d + 0.5) : qint64(d - qreal(qint64(d-1)) + 0.5) + qint64(d-1); }</div><div class='add'>+{ return d &gt;= qreal(0.0) ? qint64(d + qreal(0.5)) : qint64(d - qreal(qint64(d-1)) + qreal(0.5)) + qint64(d-1); }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T&gt;</div><div class='hunk'>@@ -1174,11 +1246,18 @@ class QDataStream;</div><div class='ctx'> </div><div class='ctx'> #define QT_SUPPORTS(FEATURE) (!defined(QT_NO_##FEATURE))</div><div class='ctx'> </div><div class='add'>+#if defined(Q_OS_LINUX) &amp;&amp; defined(Q_CC_RVCT)</div><div class='add'>+#  define Q_DECL_EXPORT     __attribute__((visibility("default")))</div><div class='add'>+#  define Q_DECL_IMPORT     __attribute__((visibility("default")))</div><div class='add'>+#  define Q_DECL_HIDDEN     __attribute__((visibility("hidden")))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef Q_DECL_EXPORT</div><div class='ctx'> #  if defined(Q_OS_WIN) || defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT)</div><div class='ctx'> #    define Q_DECL_EXPORT __declspec(dllexport)</div><div class='ctx'> #  elif defined(QT_VISIBILITY_AVAILABLE)</div><div class='ctx'> #    define Q_DECL_EXPORT __attribute__((visibility("default")))</div><div class='add'>+#    define Q_DECL_HIDDEN __attribute__((visibility("hidden")))</div><div class='ctx'> #  endif</div><div class='ctx'> #  ifndef Q_DECL_EXPORT</div><div class='ctx'> #    define Q_DECL_EXPORT</div><div class='hunk'>@@ -1191,6 +1270,10 @@ class QDataStream;</div><div class='ctx'> #    define Q_DECL_IMPORT</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='add'>+#ifndef Q_DECL_HIDDEN</div><div class='add'>+#  define Q_DECL_HIDDEN</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>    Create Qt DLL if QT_DLL is defined (Windows and Symbian only)</div><div class='hunk'>@@ -1362,15 +1445,22 @@ class QDataStream;</div><div class='ctx'> #    else</div><div class='ctx'> #      define Q_GUI_EXPORT_INLINE inline</div><div class='ctx'> #    endif</div><div class='add'>+#    if defined(QT_BUILD_COMPAT_LIB)</div><div class='add'>+#      define Q_COMPAT_EXPORT_INLINE Q_COMPAT_EXPORT inline</div><div class='add'>+#    else</div><div class='add'>+#      define Q_COMPAT_EXPORT_INLINE inline</div><div class='add'>+#    endif</div><div class='ctx'> #elif defined(Q_CC_RVCT)</div><div class='ctx'> // we force RVCT not to export inlines by passing --visibility_inlines_hidden</div><div class='ctx'> // so we need to just inline it, rather than exporting and inlining</div><div class='ctx'> // note: this affects the contents of the DEF files (ie. these functions do not appear)</div><div class='ctx'> #    define Q_CORE_EXPORT_INLINE inline</div><div class='ctx'> #    define Q_GUI_EXPORT_INLINE inline</div><div class='add'>+#    define Q_COMPAT_EXPORT_INLINE inline</div><div class='ctx'> #else</div><div class='ctx'> #    define Q_CORE_EXPORT_INLINE Q_CORE_EXPORT inline</div><div class='ctx'> #    define Q_GUI_EXPORT_INLINE Q_GUI_EXPORT inline</div><div class='add'>+#    define Q_COMPAT_EXPORT_INLINE Q_COMPAT_EXPORT inline</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1388,7 +1478,7 @@ class QDataStream;</div><div class='ctx'> #    define Q_AUTOTEST_EXPORT</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-inline void qt_noop() {}</div><div class='add'>+inline void qt_noop(void) {}</div><div class='ctx'> </div><div class='ctx'> /* These wrap try/catch so we can switch off exceptions later.</div><div class='ctx'> </div><div class='hunk'>@@ -1501,6 +1591,7 @@ public:</div><div class='ctx'>         MV_10_4 = 0x0006,</div><div class='ctx'>         MV_10_5 = 0x0007,</div><div class='ctx'>         MV_10_6 = 0x0008,</div><div class='add'>+        MV_10_7 = 0x0009,</div><div class='ctx'> </div><div class='ctx'>         /* codenames */</div><div class='ctx'>         MV_CHEETAH = MV_10_0,</div><div class='hunk'>@@ -1509,7 +1600,8 @@ public:</div><div class='ctx'>         MV_PANTHER = MV_10_3,</div><div class='ctx'>         MV_TIGER = MV_10_4,</div><div class='ctx'>         MV_LEOPARD = MV_10_5,</div><div class='del'>-        MV_SNOWLEOPARD = MV_10_6</div><div class='add'>+        MV_SNOWLEOPARD = MV_10_6,</div><div class='add'>+        MV_LION = MV_10_7</div><div class='ctx'>     };</div><div class='ctx'>     static const MacVersion MacintoshVersion;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1613,7 +1705,7 @@ inline void qUnused(T &amp;x) { (void)x; }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef qPrintable</div><div class='del'>-#  define qPrintable(string) (string).toLocal8Bit().constData()</div><div class='add'>+#  define qPrintable(string) QString(string).toLocal8Bit().constData()</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> Q_CORE_EXPORT void qDebug(const char *, ...) /* print debug message */</div><div class='hunk'>@@ -1705,7 +1797,7 @@ Q_CORE_EXPORT void qBadAlloc();</div><div class='ctx'> </div><div class='ctx'> #ifdef QT_NO_EXCEPTIONS</div><div class='ctx'> #  if defined(QT_NO_DEBUG)</div><div class='del'>-#    define Q_CHECK_PTR(p) qt_noop();</div><div class='add'>+#    define Q_CHECK_PTR(p) qt_noop()</div><div class='ctx'> #  else</div><div class='ctx'> #    define Q_CHECK_PTR(p) do {if(!(p))qt_check_pointer(__FILE__,__LINE__);} while (0)</div><div class='ctx'> #  endif</div><div class='hunk'>@@ -1719,12 +1811,7 @@ inline T *q_check_ptr(T *p) { Q_CHECK_PTR(p); return p; }</div><div class='ctx'> #if (defined(Q_CC_GNU) &amp;&amp; !defined(Q_OS_SOLARIS)) || defined(Q_CC_HPACC) || defined(Q_CC_DIAB)</div><div class='ctx'> #  define Q_FUNC_INFO __PRETTY_FUNCTION__</div><div class='ctx'> #elif defined(_MSC_VER)</div><div class='del'>-    /* MSVC 2002 doesn't have __FUNCSIG__ nor can it handle QT_STRINGIFY. */</div><div class='del'>-#  if _MSC_VER &lt;= 1300</div><div class='del'>-#      define Q_FUNC_INFO __FILE__ "(line number unavailable)"</div><div class='del'>-#  else</div><div class='del'>-#      define Q_FUNC_INFO __FUNCSIG__</div><div class='del'>-#  endif</div><div class='add'>+#  define Q_FUNC_INFO __FUNCSIG__</div><div class='ctx'> #else</div><div class='ctx'> #   if defined(Q_OS_SOLARIS) || defined(Q_CC_XLC) || defined(Q_OS_SYMBIAN)</div><div class='ctx'> #      define Q_FUNC_INFO __FILE__ "(line number unavailable)"</div><div class='hunk'>@@ -1766,32 +1853,32 @@ public:</div><div class='ctx'>     inline ~QGlobalStatic() { pointer = 0; }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define Q_GLOBAL_STATIC(TYPE, NAME)                              \</div><div class='del'>-    static TYPE *NAME()                                          \</div><div class='del'>-    {                                                            \</div><div class='del'>-        static TYPE this_##NAME;                                 \</div><div class='del'>-        static QGlobalStatic&lt;TYPE &gt; global_##NAME(&amp;this_##NAME); \</div><div class='del'>-        return global_##NAME.pointer;                            \</div><div class='add'>+#define Q_GLOBAL_STATIC(TYPE, NAME)                                  \</div><div class='add'>+    static TYPE *NAME()                                              \</div><div class='add'>+    {                                                                \</div><div class='add'>+        static TYPE thisVariable;                                    \</div><div class='add'>+        static QGlobalStatic&lt;TYPE &gt; thisGlobalStatic(&amp;thisVariable); \</div><div class='add'>+        return thisGlobalStatic.pointer;                             \</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-#define Q_GLOBAL_STATIC_WITH_ARGS(TYPE, NAME, ARGS)              \</div><div class='del'>-    static TYPE *NAME()                                          \</div><div class='del'>-    {                                                            \</div><div class='del'>-        static TYPE this_##NAME ARGS;                            \</div><div class='del'>-        static QGlobalStatic&lt;TYPE &gt; global_##NAME(&amp;this_##NAME); \</div><div class='del'>-        return global_##NAME.pointer;                            \</div><div class='add'>+#define Q_GLOBAL_STATIC_WITH_ARGS(TYPE, NAME, ARGS)                  \</div><div class='add'>+    static TYPE *NAME()                                              \</div><div class='add'>+    {                                                                \</div><div class='add'>+        static TYPE thisVariable ARGS;                               \</div><div class='add'>+        static QGlobalStatic&lt;TYPE &gt; thisGlobalStatic(&amp;thisVariable); \</div><div class='add'>+        return thisGlobalStatic.pointer;                             \</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-#define Q_GLOBAL_STATIC_WITH_INITIALIZER(TYPE, NAME, INITIALIZER) \</div><div class='del'>-    static TYPE *NAME()                                           \</div><div class='del'>-    {                                                             \</div><div class='del'>-        static TYPE this_##NAME;                                  \</div><div class='del'>-        static QGlobalStatic&lt;TYPE &gt; global_##NAME(0);             \</div><div class='del'>-        if (!global_##NAME.pointer) {                             \</div><div class='del'>-            TYPE *x = global_##NAME.pointer = &amp;this_##NAME;       \</div><div class='del'>-            INITIALIZER;                                          \</div><div class='del'>-        }                                                         \</div><div class='del'>-        return global_##NAME.pointer;                             \</div><div class='add'>+#define Q_GLOBAL_STATIC_WITH_INITIALIZER(TYPE, NAME, INITIALIZER)    \</div><div class='add'>+    static TYPE *NAME()                                              \</div><div class='add'>+    {                                                                \</div><div class='add'>+        static TYPE thisVariable;                                    \</div><div class='add'>+        static QGlobalStatic&lt;TYPE &gt; thisGlobalStatic(0);             \</div><div class='add'>+        if (!thisGlobalStatic.pointer) {                             \</div><div class='add'>+            TYPE *x = thisGlobalStatic.pointer = &amp;thisVariable;      \</div><div class='add'>+            INITIALIZER;                                             \</div><div class='add'>+        }                                                            \</div><div class='add'>+        return thisGlobalStatic.pointer;                             \</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='hunk'>@@ -1826,50 +1913,50 @@ public:</div><div class='ctx'>     }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define Q_GLOBAL_STATIC_INIT(TYPE, NAME)                              \</div><div class='del'>-    static QGlobalStatic&lt;TYPE &gt; this_##NAME = { Q_BASIC_ATOMIC_INITIALIZER(0), false }</div><div class='del'>-</div><div class='del'>-#define Q_GLOBAL_STATIC(TYPE, NAME)                                     \</div><div class='del'>-    Q_GLOBAL_STATIC_INIT(TYPE, NAME);                                   \</div><div class='del'>-    static TYPE *NAME()                                                 \</div><div class='del'>-    {                                                                   \</div><div class='del'>-        if (!this_##NAME.pointer &amp;&amp; !this_##NAME.destroyed) {           \</div><div class='del'>-            TYPE *x = new TYPE;                                         \</div><div class='del'>-            if (!this_##NAME.pointer.testAndSetOrdered(0, x))           \</div><div class='del'>-                delete x;                                               \</div><div class='del'>-            else                                                        \</div><div class='del'>-                static QGlobalStaticDeleter&lt;TYPE &gt; cleanup(this_##NAME); \</div><div class='del'>-        }                                                               \</div><div class='del'>-        return this_##NAME.pointer;                                     \</div><div class='add'>+#define Q_GLOBAL_STATIC(TYPE, NAME)                                           \</div><div class='add'>+    static TYPE *NAME()                                                       \</div><div class='add'>+    {                                                                         \</div><div class='add'>+        static QGlobalStatic&lt;TYPE &gt; thisGlobalStatic                          \</div><div class='add'>+                            = { Q_BASIC_ATOMIC_INITIALIZER(0), false };       \</div><div class='add'>+        if (!thisGlobalStatic.pointer &amp;&amp; !thisGlobalStatic.destroyed) {       \</div><div class='add'>+            TYPE *x = new TYPE;                                               \</div><div class='add'>+            if (!thisGlobalStatic.pointer.testAndSetOrdered(0, x))            \</div><div class='add'>+                delete x;                                                     \</div><div class='add'>+            else                                                              \</div><div class='add'>+                static QGlobalStaticDeleter&lt;TYPE &gt; cleanup(thisGlobalStatic); \</div><div class='add'>+        }                                                                     \</div><div class='add'>+        return thisGlobalStatic.pointer;                                      \</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-#define Q_GLOBAL_STATIC_WITH_ARGS(TYPE, NAME, ARGS)                     \</div><div class='del'>-    Q_GLOBAL_STATIC_INIT(TYPE, NAME);                                   \</div><div class='del'>-    static TYPE *NAME()                                                 \</div><div class='del'>-    {                                                                   \</div><div class='del'>-        if (!this_##NAME.pointer &amp;&amp; !this_##NAME.destroyed) {           \</div><div class='del'>-            TYPE *x = new TYPE ARGS;                                    \</div><div class='del'>-            if (!this_##NAME.pointer.testAndSetOrdered(0, x))           \</div><div class='del'>-                delete x;                                               \</div><div class='del'>-            else                                                        \</div><div class='del'>-                static QGlobalStaticDeleter&lt;TYPE &gt; cleanup(this_##NAME); \</div><div class='del'>-        }                                                               \</div><div class='del'>-        return this_##NAME.pointer;                                     \</div><div class='add'>+#define Q_GLOBAL_STATIC_WITH_ARGS(TYPE, NAME, ARGS)                           \</div><div class='add'>+    static TYPE *NAME()                                                       \</div><div class='add'>+    {                                                                         \</div><div class='add'>+        static QGlobalStatic&lt;TYPE &gt; thisGlobalStatic                          \</div><div class='add'>+                            = { Q_BASIC_ATOMIC_INITIALIZER(0), false };       \</div><div class='add'>+        if (!thisGlobalStatic.pointer &amp;&amp; !thisGlobalStatic.destroyed) {       \</div><div class='add'>+            TYPE *x = new TYPE ARGS;                                          \</div><div class='add'>+            if (!thisGlobalStatic.pointer.testAndSetOrdered(0, x))            \</div><div class='add'>+                delete x;                                                     \</div><div class='add'>+            else                                                              \</div><div class='add'>+                static QGlobalStaticDeleter&lt;TYPE &gt; cleanup(thisGlobalStatic); \</div><div class='add'>+        }                                                                     \</div><div class='add'>+        return thisGlobalStatic.pointer;                                      \</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-#define Q_GLOBAL_STATIC_WITH_INITIALIZER(TYPE, NAME, INITIALIZER)       \</div><div class='del'>-    Q_GLOBAL_STATIC_INIT(TYPE, NAME);                                   \</div><div class='del'>-    static TYPE *NAME()                                                 \</div><div class='del'>-    {                                                                   \</div><div class='del'>-        if (!this_##NAME.pointer &amp;&amp; !this_##NAME.destroyed) {           \</div><div class='del'>-            QScopedPointer&lt;TYPE &gt; x(new TYPE);                          \</div><div class='del'>-            INITIALIZER;                                                \</div><div class='del'>-            if (this_##NAME.pointer.testAndSetOrdered(0, x.data())) {   \</div><div class='del'>-                static QGlobalStaticDeleter&lt;TYPE &gt; cleanup(this_##NAME); \</div><div class='del'>-                x.take();                                               \</div><div class='del'>-            }                                                           \</div><div class='del'>-        }                                                               \</div><div class='del'>-        return this_##NAME.pointer;                                     \</div><div class='add'>+#define Q_GLOBAL_STATIC_WITH_INITIALIZER(TYPE, NAME, INITIALIZER)             \</div><div class='add'>+    static TYPE *NAME()                                                       \</div><div class='add'>+    {                                                                         \</div><div class='add'>+        static QGlobalStatic&lt;TYPE &gt; thisGlobalStatic                          \</div><div class='add'>+                            = { Q_BASIC_ATOMIC_INITIALIZER(0), false };       \</div><div class='add'>+        if (!thisGlobalStatic.pointer &amp;&amp; !thisGlobalStatic.destroyed) {       \</div><div class='add'>+            QScopedPointer&lt;TYPE &gt; x(new TYPE);                                \</div><div class='add'>+            INITIALIZER;                                                      \</div><div class='add'>+            if (thisGlobalStatic.pointer.testAndSetOrdered(0, x.data())) {    \</div><div class='add'>+                static QGlobalStaticDeleter&lt;TYPE &gt; cleanup(thisGlobalStatic); \</div><div class='add'>+                x.take();                                                     \</div><div class='add'>+            }                                                                 \</div><div class='add'>+        }                                                                     \</div><div class='add'>+        return thisGlobalStatic.pointer;                                      \</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='hunk'>@@ -1974,8 +2061,6 @@ static inline bool qIsNull(float f)</div><div class='ctx'>    qIsDetached   - data sharing functionality</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#ifndef QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>   The catch-all template.</div><div class='ctx'> */</div><div class='hunk'>@@ -2008,28 +2093,6 @@ public:</div><div class='ctx'>     };</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt; char QTypeInfoHelper(T*(*)());</div><div class='del'>-void* QTypeInfoHelper(...);</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt; inline bool qIsDetached(T &amp;) { return true; }</div><div class='del'>-</div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-class QTypeInfo</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    enum {</div><div class='del'>-        isPointer = (1 == sizeof(QTypeInfoHelper((T(*)())0))),</div><div class='del'>-        isComplex = !isPointer,</div><div class='del'>-        isStatic = !isPointer,</div><div class='del'>-        isLarge = (sizeof(T)&gt;sizeof(void*)),</div><div class='del'>-        isDummy = false</div><div class='del'>-    };</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION */</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>    Specialize a specific type with:</div><div class='ctx'> </div><div class='hunk'>@@ -2046,8 +2109,7 @@ enum { /* TYPEINFO flags */</div><div class='ctx'>     Q_DUMMY_TYPE = 0x4</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define Q_DECLARE_TYPEINFO(TYPE, FLAGS) \</div><div class='del'>-template &lt;&gt; \</div><div class='add'>+#define Q_DECLARE_TYPEINFO_BODY(TYPE, FLAGS) \</div><div class='ctx'> class QTypeInfo&lt;TYPE &gt; \</div><div class='ctx'> { \</div><div class='ctx'> public: \</div><div class='hunk'>@@ -2061,12 +2123,22 @@ public: \</div><div class='ctx'>     static inline const char *name() { return #TYPE; } \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define Q_DECLARE_TYPEINFO(TYPE, FLAGS) \</div><div class='add'>+template&lt;&gt; \</div><div class='add'>+Q_DECLARE_TYPEINFO_BODY(TYPE, FLAGS)</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> template &lt;typename T&gt;</div><div class='ctx'> inline void qSwap(T &amp;value1, T &amp;value2)</div><div class='ctx'> {</div><div class='add'>+#ifdef QT_NO_STL</div><div class='ctx'>     const T t = value1;</div><div class='ctx'>     value1 = value2;</div><div class='ctx'>     value2 = t;</div><div class='add'>+#else</div><div class='add'>+    using std::swap;</div><div class='add'>+    swap(value1, value2);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2078,12 +2150,23 @@ inline void qSwap(T &amp;value1, T &amp;value2)</div><div class='ctx'>    types must declare a 'bool isDetached(void) const;' member for this</div><div class='ctx'>    to work.</div><div class='ctx'> */</div><div class='add'>+#ifdef QT_NO_STL</div><div class='add'>+#define Q_DECLARE_SHARED_STL(TYPE)</div><div class='add'>+#else</div><div class='add'>+#define Q_DECLARE_SHARED_STL(TYPE) \</div><div class='add'>+QT_END_NAMESPACE \</div><div class='add'>+namespace std { \</div><div class='add'>+    template&lt;&gt; inline void swap&lt;QT_PREPEND_NAMESPACE(TYPE)&gt;(QT_PREPEND_NAMESPACE(TYPE) &amp;value1, QT_PREPEND_NAMESPACE(TYPE) &amp;value2) \</div><div class='add'>+    { swap(value1.data_ptr(), value2.data_ptr()); } \</div><div class='add'>+} \</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define Q_DECLARE_SHARED(TYPE)                                          \</div><div class='ctx'> template &lt;&gt; inline bool qIsDetached&lt;TYPE&gt;(TYPE &amp;t) { return t.isDetached(); } \</div><div class='ctx'> template &lt;&gt; inline void qSwap&lt;TYPE&gt;(TYPE &amp;value1, TYPE &amp;value2) \</div><div class='del'>-{ \</div><div class='del'>-    qSwap(value1.data_ptr(), value2.data_ptr()); \</div><div class='del'>-}</div><div class='add'>+{ qSwap(value1.data_ptr(), value2.data_ptr()); } \</div><div class='add'>+Q_DECLARE_SHARED_STL(TYPE)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>    QTypeInfo primitive specializations</div><div class='hunk'>@@ -2143,10 +2226,6 @@ Q_CORE_EXPORT void *qMemSet(void *dest, int c, size_t n);</div><div class='ctx'> #    pragma warning(disable: 4231) /* nonstandard extension used : 'extern' before template explicit instantiation */</div><div class='ctx'> #    pragma warning(disable: 4710) /* function not inlined */</div><div class='ctx'> #    pragma warning(disable: 4530) /* C++ exception handler used, but unwind semantics are not enabled. Specify -GX */</div><div class='del'>-#    if _MSC_VER &lt; 1300</div><div class='del'>-#      pragma warning(disable: 4284) /* return type for 'type1::operator -&gt;' is 'type2 *' */</div><div class='del'>-                                     /* (ie; not a UDT or reference to a UDT.  Will produce errors if applied using infix notation) */</div><div class='del'>-#    endif</div><div class='ctx'> #  elif defined(Q_CC_BOR)</div><div class='ctx'> #    pragma option -w-inl</div><div class='ctx'> #    pragma option -w-aus</div><div class='hunk'>@@ -2220,13 +2299,9 @@ public:</div><div class='ctx'> #define Q_DECLARE_FLAGS(Flags, Enum)\</div><div class='ctx'> typedef QFlags&lt;Enum&gt; Flags;</div><div class='ctx'> </div><div class='del'>-#if defined Q_CC_MSVC &amp;&amp; _MSC_VER &lt; 1300</div><div class='del'>-# define Q_DECLARE_INCOMPATIBLE_FLAGS(Flags)</div><div class='del'>-#else</div><div class='del'>-# define Q_DECLARE_INCOMPATIBLE_FLAGS(Flags) \</div><div class='add'>+#define Q_DECLARE_INCOMPATIBLE_FLAGS(Flags) \</div><div class='ctx'> inline QIncompatibleFlag operator|(Flags::enum_type f1, int f2) \</div><div class='ctx'> { return QIncompatibleFlag(int(f1) | f2); }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #define Q_DECLARE_OPERATORS_FOR_FLAGS(Flags) \</div><div class='ctx'> inline QFlags&lt;Flags::enum_type&gt; operator|(Flags::enum_type f1, Flags::enum_type f2) \</div><div class='hunk'>@@ -2283,9 +2358,9 @@ template &lt;typename T&gt;</div><div class='ctx'> inline const QForeachContainer&lt;T&gt; *qForeachContainer(const QForeachContainerBase *base, const T *)</div><div class='ctx'> { return static_cast&lt;const QForeachContainer&lt;T&gt; *&gt;(base); }</div><div class='ctx'> </div><div class='del'>-#if (defined(Q_CC_MSVC) &amp;&amp; !defined(Q_CC_MSVC_NET) &amp;&amp; !defined(Q_CC_INTEL)) || defined(Q_CC_MIPS)</div><div class='add'>+#if defined(Q_CC_MIPS)</div><div class='ctx'> /*</div><div class='del'>-   Proper for-scoping in VC++6 and MIPSpro CC</div><div class='add'>+   Proper for-scoping in MIPSpro CC</div><div class='ctx'> */</div><div class='ctx'> #  define Q_FOREACH(variable,container)                                                             \</div><div class='ctx'>     if(0){}else                                                                                     \</div><div class='hunk'>@@ -2469,6 +2544,16 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf();</div><div class='ctx'> //Symbian does not support data imports from a DLL</div><div class='ctx'> #define Q_NO_DATA_RELOCATION</div><div class='ctx'> </div><div class='add'>+// Winscw compiler is unable to compile QtConcurrent.</div><div class='add'>+#ifdef Q_CC_NOKIAX86</div><div class='add'>+#ifndef QT_NO_CONCURRENT</div><div class='add'>+#define QT_NO_CONCURRENT</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_QFUTURE</div><div class='add'>+#define QT_NO_QFUTURE</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> // forward declare std::exception</div><div class='ctx'> #ifdef __cplusplus</div><div class='hunk'>@@ -2653,12 +2738,6 @@ QT_LICENSED_MODULE(DBus)</div><div class='ctx'> #  define QT_NO_QFUTURE</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-// MSVC 6.0 and MSVC .NET 2002,  can`t handle the map(), etc templates,</div><div class='del'>-// but the QFuture class compiles.</div><div class='del'>-#if (defined(Q_CC_MSVC) &amp;&amp; _MSC_VER &lt;= 1300)</div><div class='del'>-#  define QT_NO_CONCURRENT</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> // gcc 3 version has problems with some of the</div><div class='ctx'> // map/filter overloads.</div><div class='ctx'> #if defined(Q_CC_GNU) &amp;&amp; (__GNUC__ &lt; 4)</div><div class='hunk'>@@ -2677,6 +2756,25 @@ QT_LICENSED_MODULE(DBus)</div><div class='ctx'> #  define QT_NO_PROCESS</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined (__ELF__)</div><div class='add'>+#  if defined (Q_OS_LINUX) || defined (Q_OS_SOLARIS) || defined (Q_OS_FREEBSD) || defined (Q_OS_OPENBSD) || defined (Q_OS_IRIX)</div><div class='add'>+#    define Q_OF_ELF</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if !(defined(Q_WS_WIN) &amp;&amp; !defined(Q_WS_WINCE)) \</div><div class='add'>+    &amp;&amp; !(defined(Q_WS_MAC) &amp;&amp; defined(QT_MAC_USE_COCOA)) \</div><div class='add'>+    &amp;&amp; !(defined(Q_WS_X11) &amp;&amp; !defined(QT_NO_FREETYPE)) \</div><div class='add'>+    &amp;&amp; !(defined(Q_WS_QPA))</div><div class='add'>+#  define QT_NO_RAWFONT</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+namespace QtPrivate {</div><div class='add'>+//like std::enable_if</div><div class='add'>+template &lt;bool B, typename T = void&gt; struct QEnableIf;</div><div class='add'>+template &lt;typename T&gt; struct QEnableIf&lt;true, T&gt; { typedef T Type; };</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> QT_END_HEADER</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp<br/>index a8aaccb..5333b71 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/global/qlibraryinfo.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qlibraryinfo.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/global/qlibraryinfo.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/global/qlibraryinfo.cpp</a></div><div class='hunk'>@@ -531,6 +531,9 @@ void qt_core_boilerplate()</div><div class='ctx'> #ifdef QT_BUILD_KEY_COMPAT2</div><div class='ctx'>            "| " QT_BUILD_KEY_COMPAT2 " "</div><div class='ctx'> #endif</div><div class='add'>+#ifdef QT_BUILD_KEY_COMPAT3</div><div class='add'>+           "| " QT_BUILD_KEY_COMPAT3 " "</div><div class='add'>+#endif</div><div class='ctx'>            "|\n"</div><div class='ctx'>            "Build date:          %s\n"</div><div class='ctx'>            "Installation prefix: %s\n"</div><div class='head'>diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h<br/>index f23473a..99479d0 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/global/qnamespace.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qnamespace.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/global/qnamespace.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/global/qnamespace.h</a></div><div class='hunk'>@@ -94,6 +94,7 @@ Qt {</div><div class='ctx'>     Q_ENUMS(GestureState)</div><div class='ctx'>     Q_ENUMS(GestureType)</div><div class='ctx'> #endif</div><div class='add'>+    Q_ENUMS(CursorMoveStyle)</div><div class='ctx'> #endif // (defined(Q_MOC_RUN) || defined(QT_JAMBI_RUN))</div><div class='ctx'> </div><div class='ctx'> #if defined(Q_MOC_RUN)</div><div class='hunk'>@@ -525,8 +526,8 @@ public:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>         WA_X11DoNotAcceptFocus = 132,</div><div class='del'>-</div><div class='ctx'>         WA_SymbianNoSystemRotation = 133,</div><div class='add'>+        WA_MacNoShadow = 134,</div><div class='ctx'> </div><div class='ctx'>         // Add new attributes before this line</div><div class='ctx'>         WA_AttributeCount</div><div class='hunk'>@@ -544,6 +545,7 @@ public:</div><div class='ctx'>         AA_MacDontSwapCtrlAndMeta = 7,</div><div class='ctx'>         AA_S60DontConstructApplicationPanes = 8,</div><div class='ctx'>         AA_S60DisablePartialScreenInputMode = 9,</div><div class='add'>+        AA_X11InitThreads = 10,</div><div class='ctx'> </div><div class='ctx'>         // Add new attributes before this line</div><div class='ctx'>         AA_AttributeCount</div><div class='hunk'>@@ -1627,6 +1629,7 @@ public:</div><div class='ctx'>         AccessibleDescriptionRole = 12,</div><div class='ctx'>         // More general purpose</div><div class='ctx'>         SizeHintRole = 13,</div><div class='add'>+        InitialSortOrderRole = 14,</div><div class='ctx'>         // Internal UiLib roles. Start worrying when public roles go that high.</div><div class='ctx'>         DisplayPropertyRole = 27,</div><div class='ctx'>         DecorationPropertyRole = 28,</div><div class='hunk'>@@ -1669,7 +1672,7 @@ public:</div><div class='ctx'>     typedef void *HANDLE;</div><div class='ctx'> #elif defined(Q_WS_X11)</div><div class='ctx'>     typedef unsigned long HANDLE;</div><div class='del'>-#elif defined(Q_WS_QWS)</div><div class='add'>+#elif defined(Q_WS_QWS) || defined(Q_WS_QPA)</div><div class='ctx'>     typedef void * HANDLE;</div><div class='ctx'> #elif defined(Q_OS_SYMBIAN)</div><div class='ctx'>     typedef unsigned long int HANDLE; // equivalent to TUint32</div><div class='hunk'>@@ -1782,6 +1785,11 @@ public:</div><div class='ctx'>         NavigationModeCursorAuto,</div><div class='ctx'>         NavigationModeCursorForceVisible</div><div class='ctx'>     };</div><div class='add'>+</div><div class='add'>+    enum CursorMoveStyle {</div><div class='add'>+        LogicalMoveStyle,</div><div class='add'>+        VisualMoveStyle</div><div class='add'>+    };</div><div class='ctx'> }</div><div class='ctx'> #ifdef Q_MOC_RUN</div><div class='ctx'>  ;</div><div class='head'>diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc<br/>index 87b8255..9f59c6e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/global/qnamespace.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/global/qnamespace.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/global/qnamespace.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/global/qnamespace.qdoc</a></div><div class='hunk'>@@ -163,6 +163,10 @@</div><div class='ctx'>            is ensured that the focused text widget is visible. This is only supported in</div><div class='ctx'>            Symbian^3. (internal)</div><div class='ctx'> </div><div class='add'>+    \value AA_X11InitThreads Calls XInitThreads() as part of the QApplication</div><div class='add'>+           construction in order to make Xlib calls thread-safe. This</div><div class='add'>+           attribute must be set before QApplication is constructed.</div><div class='add'>+</div><div class='ctx'>     \omitvalue AA_AttributeCount</div><div class='ctx'> */</div><div class='ctx'> </div><div class='hunk'>@@ -1213,6 +1217,9 @@</div><div class='ctx'>     ignoring changes to the display's orientation with respect to the user.</div><div class='ctx'>     \value WA_AutoOrientation Causes the widget to change orientation whenever the</div><div class='ctx'>     display changes orientation with respect to the user.</div><div class='add'>+    </div><div class='add'>+    \value WA_MacNoShadow Since Qt 4.8, this attribute disables drop shadows</div><div class='add'>+    for this top level window. Only affects Cocoa builds of Qt for Mac OS X.</div><div class='ctx'> </div><div class='ctx'>     \omitvalue WA_SetLayoutDirection</div><div class='ctx'>     \omitvalue WA_InputMethodTransparent</div><div class='hunk'>@@ -2637,19 +2644,22 @@</div><div class='ctx'> </div><div class='ctx'>     Roles describing appearance and meta data (with associated types):</div><div class='ctx'> </div><div class='del'>-    \value FontRole            The font used for items rendered with the default</div><div class='del'>-                               delegate. (QFont)</div><div class='del'>-    \value TextAlignmentRole   The alignment of the text for items rendered with the</div><div class='del'>-                               default delegate. (Qt::AlignmentFlag)</div><div class='del'>-    \value BackgroundRole      The background brush used for items rendered with</div><div class='del'>-                               the default delegate. (QBrush)</div><div class='del'>-    \value BackgroundColorRole This role is obsolete. Use BackgroundRole instead.</div><div class='del'>-    \value ForegroundRole      The foreground brush (text color, typically)</div><div class='del'>-                               used for items rendered with the default delegate.</div><div class='del'>-                               (QBrush)</div><div class='del'>-    \value TextColorRole       This role is obsolete. Use ForegroundRole instead.</div><div class='del'>-    \value CheckStateRole      This role is used to obtain the checked state of</div><div class='del'>-                               an item. (Qt::CheckState)</div><div class='add'>+    \value FontRole             The font used for items rendered with the default</div><div class='add'>+                                delegate. (QFont)</div><div class='add'>+    \value TextAlignmentRole    The alignment of the text for items rendered with the</div><div class='add'>+                                default delegate. (Qt::AlignmentFlag)</div><div class='add'>+    \value BackgroundRole       The background brush used for items rendered with</div><div class='add'>+                                the default delegate. (QBrush)</div><div class='add'>+    \value BackgroundColorRole  This role is obsolete. Use BackgroundRole instead.</div><div class='add'>+    \value ForegroundRole       The foreground brush (text color, typically)</div><div class='add'>+                                used for items rendered with the default delegate.</div><div class='add'>+                                (QBrush)</div><div class='add'>+    \value TextColorRole        This role is obsolete. Use ForegroundRole instead.</div><div class='add'>+    \value CheckStateRole       This role is used to obtain the checked state of</div><div class='add'>+                                an item. (Qt::CheckState)</div><div class='add'>+    \value InitialSortOrderRole This role is used to obtain the initial sort order</div><div class='add'>+                                of a header view section. (Qt::SortOrder). This</div><div class='add'>+                                role was introduced in Qt 4.8.</div><div class='ctx'> </div><div class='ctx'>     Accessibility roles (with associated types):</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri<br/>index 3d964c6..e411f8f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/io.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/io.pri</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/io.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/io.pri</a></div><div class='hunk'>@@ -9,6 +9,7 @@ HEADERS +=  \</div><div class='ctx'>         io/qdataurl_p.h \</div><div class='ctx'>         io/qdebug.h \</div><div class='ctx'>         io/qdir.h \</div><div class='add'>+        io/qdir_p.h \</div><div class='ctx'>         io/qdiriterator.h \</div><div class='ctx'>         io/qfile.h \</div><div class='ctx'>         io/qfileinfo.h \</div><div class='hunk'>@@ -23,19 +24,26 @@ HEADERS +=  \</div><div class='ctx'>         io/qresource_p.h \</div><div class='ctx'>         io/qresource_iterator_p.h \</div><div class='ctx'>         io/qurl.h \</div><div class='add'>+        io/qurltlds_p.h \</div><div class='add'>+        io/qtldurl_p.h \</div><div class='ctx'>         io/qsettings.h \</div><div class='ctx'>         io/qsettings_p.h \</div><div class='ctx'>         io/qfsfileengine.h \</div><div class='ctx'>         io/qfsfileengine_p.h \</div><div class='ctx'>         io/qfsfileengine_iterator_p.h \</div><div class='ctx'>         io/qfilesystemwatcher.h \</div><div class='del'>-        io/qfilesystemwatcher_p.h</div><div class='add'>+        io/qfilesystemwatcher_p.h \</div><div class='add'>+        io/qfilesystementry_p.h \</div><div class='add'>+        io/qfilesystemengine_p.h \</div><div class='add'>+        io/qfilesystemmetadata_p.h \</div><div class='add'>+        io/qfilesystemiterator_p.h</div><div class='ctx'> </div><div class='ctx'> SOURCES += \</div><div class='ctx'>         io/qabstractfileengine.cpp \</div><div class='ctx'>         io/qbuffer.cpp \</div><div class='ctx'>         io/qdatastream.cpp \</div><div class='ctx'>         io/qdataurl.cpp \</div><div class='add'>+        io/qtldurl.cpp \</div><div class='ctx'>         io/qdebug.cpp \</div><div class='ctx'>         io/qdir.cpp \</div><div class='ctx'>         io/qdiriterator.cpp \</div><div class='hunk'>@@ -52,25 +60,35 @@ SOURCES += \</div><div class='ctx'>         io/qsettings.cpp \</div><div class='ctx'>         io/qfsfileengine.cpp \</div><div class='ctx'>         io/qfsfileengine_iterator.cpp \</div><div class='del'>-        io/qfilesystemwatcher.cpp</div><div class='add'>+        io/qfilesystemwatcher.cpp \</div><div class='add'>+        io/qfilesystementry.cpp \</div><div class='add'>+        io/qfilesystemengine.cpp</div><div class='ctx'> </div><div class='ctx'> win32 {</div><div class='ctx'>         SOURCES += io/qsettings_win.cpp</div><div class='ctx'>         SOURCES += io/qprocess_win.cpp</div><div class='ctx'>         SOURCES += io/qfsfileengine_win.cpp</div><div class='ctx'> </div><div class='del'>-        SOURCES += io/qfsfileengine_iterator_win.cpp</div><div class='ctx'>         SOURCES += io/qfilesystemwatcher_win.cpp</div><div class='ctx'>         HEADERS += io/qfilesystemwatcher_win_p.h</div><div class='ctx'>         HEADERS += io/qwindowspipewriter_p.h</div><div class='ctx'>         SOURCES += io/qwindowspipewriter.cpp</div><div class='add'>+        SOURCES += io/qfilesystemengine_win.cpp</div><div class='add'>+        SOURCES += io/qfilesystemiterator_win.cpp</div><div class='ctx'> } else:unix {</div><div class='ctx'>         SOURCES += io/qfsfileengine_unix.cpp</div><div class='del'>-        SOURCES += io/qfsfileengine_iterator_unix.cpp</div><div class='del'>-        symbian:SOURCES += io/qprocess_symbian.cpp</div><div class='del'>-        else:SOURCES += io/qprocess_unix.cpp</div><div class='del'>-        macx-*: {</div><div class='add'>+        symbian {</div><div class='add'>+            SOURCES += io/qfilesystemengine_symbian.cpp</div><div class='add'>+            SOURCES += io/qprocess_symbian.cpp</div><div class='add'>+            SOURCES += io/qfilesystemiterator_symbian.cpp</div><div class='add'>+        } else {</div><div class='add'>+            SOURCES += io/qfilesystemengine_unix.cpp</div><div class='add'>+            SOURCES += io/qprocess_unix.cpp</div><div class='add'>+            SOURCES += io/qfilesystemiterator_unix.cpp</div><div class='add'>+        }</div><div class='add'>+        !nacl:macx-*: {</div><div class='ctx'>             HEADERS += io/qfilesystemwatcher_fsevents_p.h</div><div class='add'>+            SOURCES += io/qfilesystemengine_mac.cpp</div><div class='ctx'>             SOURCES += io/qsettings_mac.cpp io/qfilesystemwatcher_fsevents.cpp</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='hunk'>@@ -84,15 +102,21 @@ win32 {</div><div class='ctx'>                     io/qfilesystemwatcher_dnotify_p.h</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-        freebsd-*|macx-*|darwin-*|openbsd-*:{</div><div class='del'>-            SOURCES += io/qfilesystemwatcher_kqueue.cpp</div><div class='del'>-            HEADERS += io/qfilesystemwatcher_kqueue_p.h</div><div class='add'>+        !nacl {</div><div class='add'>+            freebsd-*|macx-*|darwin-*|openbsd-*:{</div><div class='add'>+                SOURCES += io/qfilesystemwatcher_kqueue.cpp</div><div class='add'>+                HEADERS += io/qfilesystemwatcher_kqueue_p.h</div><div class='add'>+            }</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         symbian {</div><div class='ctx'>             SOURCES += io/qfilesystemwatcher_symbian.cpp</div><div class='ctx'>             HEADERS += io/qfilesystemwatcher_symbian_p.h</div><div class='ctx'>             INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE</div><div class='del'>-            LIBS += -lplatformenv</div><div class='add'>+            LIBS += -lplatformenv -lesock</div><div class='ctx'>         }</div><div class='ctx'> }</div><div class='add'>+integrity {</div><div class='add'>+	SOURCES += io/qfsfileengine_unix.cpp \</div><div class='add'>+	           io/qfsfileengine_iterator_unix.cpp</div><div class='add'>+}</div><div class='head'>diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp<br/>index 3118478..d2b250d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qabstractfileengine.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qabstractfileengine.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qabstractfileengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qabstractfileengine.cpp</a></div><div class='hunk'>@@ -41,12 +41,20 @@</div><div class='ctx'> </div><div class='ctx'> #include "qabstractfileengine.h"</div><div class='ctx'> #include "private/qabstractfileengine_p.h"</div><div class='add'>+#ifdef QT_BUILD_CORE_LIB</div><div class='add'>+#include "private/qresource_p.h"</div><div class='add'>+#endif</div><div class='ctx'> #include "qdatetime.h"</div><div class='ctx'> #include "qreadwritelock.h"</div><div class='ctx'> #include "qvariant.h"</div><div class='ctx'> // built-in handlers</div><div class='ctx'> #include "qfsfileengine.h"</div><div class='ctx'> #include "qdiriterator.h"</div><div class='add'>+#include "qstringbuilder.h"</div><div class='add'>+</div><div class='add'>+#include &lt;QtCore/private/qfilesystementry_p.h&gt;</div><div class='add'>+#include &lt;QtCore/private/qfilesystemmetadata_p.h&gt;</div><div class='add'>+#include &lt;QtCore/private/qfilesystemengine_p.h&gt;</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='hunk'>@@ -94,6 +102,8 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'>     \sa QAbstractFileEngine, QAbstractFileEngine::create()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+static bool qt_file_engine_handlers_in_use = false;</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>     All application-wide handlers are stored in this list. The mutex must be</div><div class='ctx'>     acquired to ensure thread safety.</div><div class='hunk'>@@ -123,6 +133,7 @@ Q_GLOBAL_STATIC(QAbstractFileEngineHandlerList, fileEngineHandlers)</div><div class='ctx'> QAbstractFileEngineHandler::QAbstractFileEngineHandler()</div><div class='ctx'> {</div><div class='ctx'>     QWriteLocker locker(fileEngineHandlerMutex());</div><div class='add'>+    qt_file_engine_handlers_in_use = true;</div><div class='ctx'>     fileEngineHandlers()-&gt;prepend(this);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -134,8 +145,35 @@ QAbstractFileEngineHandler::~QAbstractFileEngineHandler()</div><div class='ctx'> {</div><div class='ctx'>     QWriteLocker locker(fileEngineHandlerMutex());</div><div class='ctx'>     // Remove this handler from the handler list only if the list is valid.</div><div class='del'>-    if (!qt_abstractfileenginehandlerlist_shutDown)</div><div class='del'>-        fileEngineHandlers()-&gt;removeAll(this);</div><div class='add'>+    if (!qt_abstractfileenginehandlerlist_shutDown) {</div><div class='add'>+        QAbstractFileEngineHandlerList *handlers = fileEngineHandlers();</div><div class='add'>+        handlers-&gt;removeOne(this);</div><div class='add'>+        if (handlers-&gt;isEmpty())</div><div class='add'>+            qt_file_engine_handlers_in_use = false;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+   \ìnternal</div><div class='add'>+</div><div class='add'>+   Handles calls to custom file engine handlers.</div><div class='add'>+*/</div><div class='add'>+QAbstractFileEngine *qt_custom_file_engine_handler_create(const QString &amp;path)</div><div class='add'>+{</div><div class='add'>+    QAbstractFileEngine *engine = 0;</div><div class='add'>+</div><div class='add'>+    if (qt_file_engine_handlers_in_use) {</div><div class='add'>+        QReadLocker locker(fileEngineHandlerMutex());</div><div class='add'>+</div><div class='add'>+        // check for registered handlers that can load the file</div><div class='add'>+        QAbstractFileEngineHandlerList *handlers = fileEngineHandlers();</div><div class='add'>+        for (int i = 0; i &lt; handlers-&gt;size(); i++) {</div><div class='add'>+            if ((engine = handlers-&gt;at(i)-&gt;create(path)))</div><div class='add'>+                break;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return engine;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -166,42 +204,17 @@ QAbstractFileEngineHandler::~QAbstractFileEngineHandler()</div><div class='ctx'> */</div><div class='ctx'> QAbstractFileEngine *QAbstractFileEngine::create(const QString &amp;fileName)</div><div class='ctx'> {</div><div class='del'>-    {</div><div class='del'>-        QReadLocker locker(fileEngineHandlerMutex());</div><div class='del'>-</div><div class='del'>-        // check for registered handlers that can load the file</div><div class='del'>-        for (int i = 0; i &lt; fileEngineHandlers()-&gt;size(); i++) {</div><div class='del'>-            if (QAbstractFileEngine *ret = fileEngineHandlers()-&gt;at(i)-&gt;create(fileName))</div><div class='del'>-                return ret;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-#ifdef QT_BUILD_CORE_LIB</div><div class='del'>-    if (!fileName.startsWith(QLatin1Char('/'))) {</div><div class='del'>-        int prefixSeparator = fileName.indexOf(QLatin1Char(':'));</div><div class='del'>-        if (prefixSeparator &gt; 1) {</div><div class='del'>-            QString prefix = fileName.left(prefixSeparator);</div><div class='del'>-            QString fileNameWithoutPrefix = fileName.mid(prefixSeparator + 1).prepend(QLatin1Char('/'));</div><div class='del'>-            const QStringList &amp;paths = QDir::searchPaths(prefix);</div><div class='del'>-            for (int i = 0; i &lt; paths.count(); i++) {</div><div class='del'>-                QString path = paths.at(i);</div><div class='del'>-                path.append(fileNameWithoutPrefix);</div><div class='del'>-                QAbstractFileEngine *engine = create(path);</div><div class='del'>-                if (engine &amp;&amp; (engine-&gt;fileFlags(QAbstractFileEngine::FlagsMask) &amp; QAbstractFileEngine::ExistsFlag)) {</div><div class='del'>-                    return engine;</div><div class='del'>-                }</div><div class='del'>-                delete engine;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='add'>+    QFileSystemEntry entry(fileName);</div><div class='add'>+    QFileSystemMetaData metaData;</div><div class='add'>+    QAbstractFileEngine *engine = QFileSystemEngine::resolveEntryAndCreateLegacyEngine(entry, metaData);</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_FSFILEENGINE</div><div class='add'>+    if (!engine)</div><div class='add'>+        // fall back to regular file engine</div><div class='add'>+        return new QFSFileEngine(entry.filePath());</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef QT_NO_FSFILEENGINE</div><div class='del'>-    return 0;</div><div class='del'>-#else</div><div class='del'>-    // fall back to regular file engine</div><div class='del'>-    return new QFSFileEngine(fileName);</div><div class='del'>-#endif</div><div class='add'>+    return engine;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='head'>diff --git a/src/corelib/io/qabstractfileengine_p.h b/src/corelib/io/qabstractfileengine_p.h<br/>index 810f2a2..dd9a707 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qabstractfileengine_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qabstractfileengine_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qabstractfileengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qabstractfileengine_p.h</a></div><div class='hunk'>@@ -74,6 +74,8 @@ public:</div><div class='ctx'>     Q_DECLARE_PUBLIC(QAbstractFileEngine)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+QAbstractFileEngine *qt_custom_file_engine_handler_create(const QString &amp;path);</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> #endif // QABSTRACTFILEENGINE_P_H</div><div class='head'>diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp<br/>index c7d11a0..8c27430 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qdatastream.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qdatastream.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qdatastream.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qdatastream.cpp</a></div><div class='hunk'>@@ -223,6 +223,7 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'>     \value ReadPastEnd      The data stream has read past the end of the</div><div class='ctx'>                             data in the underlying device.</div><div class='ctx'>     \value ReadCorruptData  The data stream has read corrupt data.</div><div class='add'>+    \value WriteFailed      The data stream cannot write to the underlying device.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************</div><div class='hunk'>@@ -243,6 +244,11 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'>     }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define CHECK_STREAM_WRITE_PRECOND(retVal) \</div><div class='add'>+    CHECK_STREAM_PRECOND(retVal) \</div><div class='add'>+    if (q_status != Ok) \</div><div class='add'>+        return retVal;</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'>     DefaultStreamVersion = QDataStream::Qt_4_6</div><div class='ctx'> };</div><div class='hunk'>@@ -495,6 +501,9 @@ void QDataStream::resetStatus()</div><div class='ctx'> /*!</div><div class='ctx'>     Sets the status of the data stream to the \a status given.</div><div class='ctx'> </div><div class='add'>+    Subsequent calls to setStatus() are ignored until resetStatus()</div><div class='add'>+    is called.</div><div class='add'>+</div><div class='ctx'>     \sa Status status() resetStatus()</div><div class='ctx'> */</div><div class='ctx'> void QDataStream::setStatus(Status status)</div><div class='hunk'>@@ -992,8 +1001,9 @@ int QDataStream::readRawData(char *s, int len)</div><div class='ctx'> </div><div class='ctx'> QDataStream &amp;QDataStream::operator&lt;&lt;(qint8 i)</div><div class='ctx'> {</div><div class='del'>-    CHECK_STREAM_PRECOND(*this)</div><div class='del'>-    dev-&gt;putChar(i);</div><div class='add'>+    CHECK_STREAM_WRITE_PRECOND(*this)</div><div class='add'>+    if (!dev-&gt;putChar(i))</div><div class='add'>+        q_status = WriteFailed;</div><div class='ctx'>     return *this;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1015,11 +1025,12 @@ QDataStream &amp;QDataStream::operator&lt;&lt;(qint8 i)</div><div class='ctx'> </div><div class='ctx'> QDataStream &amp;QDataStream::operator&lt;&lt;(qint16 i)</div><div class='ctx'> {</div><div class='del'>-    CHECK_STREAM_PRECOND(*this)</div><div class='add'>+    CHECK_STREAM_WRITE_PRECOND(*this)</div><div class='ctx'>     if (!noswap) {</div><div class='ctx'>         i = qbswap(i);</div><div class='ctx'>     }</div><div class='del'>-    dev-&gt;write((char *)&amp;i, sizeof(qint16));</div><div class='add'>+    if (dev-&gt;write((char *)&amp;i, sizeof(qint16)) != sizeof(qint16))</div><div class='add'>+        q_status = WriteFailed;</div><div class='ctx'>     return *this;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1032,11 +1043,12 @@ QDataStream &amp;QDataStream::operator&lt;&lt;(qint16 i)</div><div class='ctx'> </div><div class='ctx'> QDataStream &amp;QDataStream::operator&lt;&lt;(qint32 i)</div><div class='ctx'> {</div><div class='del'>-    CHECK_STREAM_PRECOND(*this)</div><div class='add'>+    CHECK_STREAM_WRITE_PRECOND(*this)</div><div class='ctx'>     if (!noswap) {</div><div class='ctx'>         i = qbswap(i);</div><div class='ctx'>     }</div><div class='del'>-    dev-&gt;write((char *)&amp;i, sizeof(qint32));</div><div class='add'>+    if (dev-&gt;write((char *)&amp;i, sizeof(qint32)) != sizeof(qint32))</div><div class='add'>+        q_status = WriteFailed;</div><div class='ctx'>     return *this;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1057,7 +1069,7 @@ QDataStream &amp;QDataStream::operator&lt;&lt;(qint32 i)</div><div class='ctx'> </div><div class='ctx'> QDataStream &amp;QDataStream::operator&lt;&lt;(qint64 i)</div><div class='ctx'> {</div><div class='del'>-    CHECK_STREAM_PRECOND(*this)</div><div class='add'>+    CHECK_STREAM_WRITE_PRECOND(*this)</div><div class='ctx'>     if (version() &lt; 6) {</div><div class='ctx'>         quint32 i1 = i &amp; 0xffffffff;</div><div class='ctx'>         quint32 i2 = i &gt;&gt; 32;</div><div class='hunk'>@@ -1066,7 +1078,8 @@ QDataStream &amp;QDataStream::operator&lt;&lt;(qint64 i)</div><div class='ctx'>         if (!noswap) {</div><div class='ctx'>             i = qbswap(i);</div><div class='ctx'>         }</div><div class='del'>-        dev-&gt;write((char *)&amp;i, sizeof(qint64));</div><div class='add'>+        if (dev-&gt;write((char *)&amp;i, sizeof(qint64)) != sizeof(qint64))</div><div class='add'>+            q_status = WriteFailed;</div><div class='ctx'>     }</div><div class='ctx'>     return *this;</div><div class='ctx'> }</div><div class='hunk'>@@ -1086,8 +1099,9 @@ QDataStream &amp;QDataStream::operator&lt;&lt;(qint64 i)</div><div class='ctx'> </div><div class='ctx'> QDataStream &amp;QDataStream::operator&lt;&lt;(bool i)</div><div class='ctx'> {</div><div class='del'>-    CHECK_STREAM_PRECOND(*this)</div><div class='del'>-    dev-&gt;putChar(qint8(i));</div><div class='add'>+    CHECK_STREAM_WRITE_PRECOND(*this)</div><div class='add'>+    if (!dev-&gt;putChar(qint8(i)))</div><div class='add'>+        q_status = WriteFailed;</div><div class='ctx'>     return *this;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1108,7 +1122,7 @@ QDataStream &amp;QDataStream::operator&lt;&lt;(float f)</div><div class='ctx'>         return *this;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    CHECK_STREAM_PRECOND(*this)</div><div class='add'>+    CHECK_STREAM_WRITE_PRECOND(*this)</div><div class='ctx'>     float g = f;                                // fixes float-on-stack problem</div><div class='ctx'>     if (!noswap) {</div><div class='ctx'>         union {</div><div class='hunk'>@@ -1119,7 +1133,8 @@ QDataStream &amp;QDataStream::operator&lt;&lt;(float f)</div><div class='ctx'>         x.val2 = qbswap(x.val2);</div><div class='ctx'>         g = x.val1;</div><div class='ctx'>     }</div><div class='del'>-    dev-&gt;write((char *)&amp;g, sizeof(float));</div><div class='add'>+    if (dev-&gt;write((char *)&amp;g, sizeof(float)) != sizeof(float))</div><div class='add'>+        q_status = WriteFailed;</div><div class='ctx'>     return *this;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1141,10 +1156,11 @@ QDataStream &amp;QDataStream::operator&lt;&lt;(double f)</div><div class='ctx'>         return *this;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    CHECK_STREAM_PRECOND(*this)</div><div class='add'>+    CHECK_STREAM_WRITE_PRECOND(*this)</div><div class='ctx'> #ifndef Q_DOUBLE_FORMAT</div><div class='ctx'>     if (noswap) {</div><div class='del'>-        dev-&gt;write((char *)&amp;f, sizeof(double));</div><div class='add'>+        if (dev-&gt;write((char *)&amp;f, sizeof(double)) != sizeof(double))</div><div class='add'>+            q_status = WriteFailed;</div><div class='ctx'>     } else {</div><div class='ctx'>         union {</div><div class='ctx'>             double val1;</div><div class='hunk'>@@ -1152,7 +1168,8 @@ QDataStream &amp;QDataStream::operator&lt;&lt;(double f)</div><div class='ctx'>         } x;</div><div class='ctx'>         x.val1 = f;</div><div class='ctx'>         x.val2 = qbswap(x.val2);</div><div class='del'>-        dev-&gt;write((char *)&amp;x.val2, sizeof(double));</div><div class='add'>+        if (dev-&gt;write((char *)&amp;x.val2, sizeof(double)) != sizeof(double))</div><div class='add'>+            q_status = WriteFailed;</div><div class='ctx'>     }</div><div class='ctx'> #else</div><div class='ctx'>     union {</div><div class='hunk'>@@ -1181,7 +1198,8 @@ QDataStream &amp;QDataStream::operator&lt;&lt;(double f)</div><div class='ctx'>         b[Q_DF(1)] = *p++;</div><div class='ctx'>         b[Q_DF(0)] = *p;</div><div class='ctx'>     }</div><div class='del'>-    dev-&gt;write(b, 8);</div><div class='add'>+    if (dev-&gt;write(b, 8) != 8)</div><div class='add'>+        q_status = WriteFailed;</div><div class='ctx'> #endif</div><div class='ctx'>     return *this;</div><div class='ctx'> }</div><div class='hunk'>@@ -1221,7 +1239,7 @@ QDataStream &amp;QDataStream::operator&lt;&lt;(const char *s)</div><div class='ctx'> </div><div class='ctx'> QDataStream &amp;QDataStream::writeBytes(const char *s, uint len)</div><div class='ctx'> {</div><div class='del'>-    CHECK_STREAM_PRECOND(*this)</div><div class='add'>+    CHECK_STREAM_WRITE_PRECOND(*this)</div><div class='ctx'>     *this &lt;&lt; (quint32)len;                        // write length specifier</div><div class='ctx'>     if (len)</div><div class='ctx'>         writeRawData(s, len);</div><div class='hunk'>@@ -1239,8 +1257,11 @@ QDataStream &amp;QDataStream::writeBytes(const char *s, uint len)</div><div class='ctx'> </div><div class='ctx'> int QDataStream::writeRawData(const char *s, int len)</div><div class='ctx'> {</div><div class='del'>-    CHECK_STREAM_PRECOND(-1)</div><div class='del'>-    return dev-&gt;write(s, len);</div><div class='add'>+    CHECK_STREAM_WRITE_PRECOND(-1)</div><div class='add'>+    int ret = dev-&gt;write(s, len);</div><div class='add'>+    if (ret != len)</div><div class='add'>+        q_status = WriteFailed;</div><div class='add'>+    return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='head'>diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h<br/>index 4ee900d..0b69458 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qdatastream.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qdatastream.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qdatastream.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qdatastream.h</a></div><div class='hunk'>@@ -85,10 +85,11 @@ public:</div><div class='ctx'>         Qt_4_4 = 10,</div><div class='ctx'>         Qt_4_5 = 11,</div><div class='ctx'>         Qt_4_6 = 12,</div><div class='del'>-        Qt_4_7 = Qt_4_6</div><div class='del'>-#if QT_VERSION &gt;= 0x040800</div><div class='del'>-#error Add the datastream version for this Qt version</div><div class='add'>+        Qt_4_7 = Qt_4_6,</div><div class='ctx'>         Qt_4_8 = Qt_4_7</div><div class='add'>+#if QT_VERSION &gt;= 0x040900</div><div class='add'>+#error Add the datastream version for this Qt version</div><div class='add'>+        Qt_4_9 = Qt_4_8</div><div class='ctx'> #endif</div><div class='ctx'>     };</div><div class='ctx'> </div><div class='hunk'>@@ -100,7 +101,8 @@ public:</div><div class='ctx'>     enum Status {</div><div class='ctx'>         Ok,</div><div class='ctx'>         ReadPastEnd,</div><div class='del'>-	ReadCorruptData</div><div class='add'>+        ReadCorruptData,</div><div class='add'>+        WriteFailed</div><div class='ctx'>     };</div><div class='ctx'> </div><div class='ctx'>     enum FloatingPointPrecision {</div><div class='head'>diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h<br/>index 452c1a2..67221c7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qdebug.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qdebug.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qdebug.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qdebug.h</a></div><div class='hunk'>@@ -137,10 +137,8 @@ public:</div><div class='ctx'>     inline QNoDebug &amp;nospace() { return *this; }</div><div class='ctx'>     inline QNoDebug &amp;maybeSpace() { return *this; }</div><div class='ctx'> </div><div class='del'>-#ifndef QT_NO_MEMBER_TEMPLATES</div><div class='ctx'>     template&lt;typename T&gt;</div><div class='ctx'>     inline QNoDebug &amp;operator&lt;&lt;(const T &amp;) { return *this; }</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> Q_CORE_EXPORT_INLINE QDebug qCritical() { return QDebug(QtCriticalMsg); }</div><div class='hunk'>@@ -285,11 +283,6 @@ Q_CORE_EXPORT_INLINE QDebug qDebug() { return QDebug(QtDebugMsg); }</div><div class='ctx'> inline QNoDebug qDebug() { return QNoDebug(); }</div><div class='ctx'> #define qDebug QT_NO_QDEBUG_MACRO</div><div class='ctx'> </div><div class='del'>-#ifdef QT_NO_MEMBER_TEMPLATES</div><div class='del'>-template&lt;typename T&gt;</div><div class='del'>-inline QNoDebug operator&lt;&lt;(QNoDebug debug, const T &amp;) { return debug; }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if !defined(QT_NO_WARNING_OUTPUT)</div><div class='head'>diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp<br/>index 2d3844f..b31cf69 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qdir.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qdir.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qdir.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qdir.cpp</a></div><div class='hunk'>@@ -41,6 +41,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "qplatformdefs.h"</div><div class='ctx'> #include "qdir.h"</div><div class='add'>+#include "qdir_p.h"</div><div class='ctx'> #include "qabstractfileengine.h"</div><div class='ctx'> #ifndef QT_NO_DEBUG_STREAM</div><div class='ctx'> #include "qdebug.h"</div><div class='hunk'>@@ -53,6 +54,10 @@</div><div class='ctx'> #include "qvector.h"</div><div class='ctx'> #include "qalgorithms.h"</div><div class='ctx'> #include "qvarlengtharray.h"</div><div class='add'>+#include "qfilesystementry_p.h"</div><div class='add'>+#include "qfilesystemmetadata_p.h"</div><div class='add'>+#include "qfilesystemengine_p.h"</div><div class='add'>+#include &lt;qstringbuilder.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef QT_BUILD_CORE_LIB</div><div class='ctx'> #  include "qresource.h"</div><div class='hunk'>@@ -81,129 +86,130 @@ static QString driveSpec(const QString &amp;path)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> //************* QDirPrivate</div><div class='del'>-class QDirPrivate</div><div class='del'>-    : public QSharedData</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    QDirPrivate(const QString &amp;path,</div><div class='del'>-            const QStringList &amp;nameFilters_ = QStringList(),</div><div class='del'>-            QDir::SortFlags sort_ = QDir::SortFlags(QDir::Name | QDir::IgnoreCase),</div><div class='del'>-            QDir::Filters filters_ = QDir::AllEntries)</div><div class='del'>-        : QSharedData()</div><div class='del'>-        , nameFilters(nameFilters_)</div><div class='del'>-        , sort(sort_)</div><div class='del'>-        , filters(filters_)</div><div class='add'>+QDirPrivate::QDirPrivate(const QString &amp;path, const QStringList &amp;nameFilters_, QDir::SortFlags sort_, QDir::Filters filters_)</div><div class='add'>+    : QSharedData()</div><div class='add'>+    , nameFilters(nameFilters_)</div><div class='add'>+    , sort(sort_)</div><div class='add'>+    , filters(filters_)</div><div class='ctx'> #ifdef QT3_SUPPORT</div><div class='del'>-        , filterSepChar(0)</div><div class='del'>-        , matchAllDirs(false)</div><div class='add'>+    , filterSepChar(0)</div><div class='add'>+    , matchAllDirs(false)</div><div class='ctx'> #endif</div><div class='del'>-        , fileListsInitialized(false)</div><div class='del'>-    {</div><div class='del'>-        setPath(path.isEmpty() ? QString::fromLatin1(".") : path);</div><div class='del'>-</div><div class='del'>-        bool empty = nameFilters.isEmpty();</div><div class='del'>-        if (!empty) {</div><div class='del'>-            empty = true;</div><div class='del'>-            for (int i = 0; i &lt; nameFilters.size(); ++i) {</div><div class='del'>-                if (!nameFilters.at(i).isEmpty()) {</div><div class='del'>-                    empty = false;</div><div class='del'>-                    break;</div><div class='del'>-                }</div><div class='add'>+    , fileListsInitialized(false)</div><div class='add'>+{</div><div class='add'>+    setPath(path.isEmpty() ? QString::fromLatin1(".") : path);</div><div class='add'>+</div><div class='add'>+    bool empty = nameFilters.isEmpty();</div><div class='add'>+    if (!empty) {</div><div class='add'>+        empty = true;</div><div class='add'>+        for (int i = 0; i &lt; nameFilters.size(); ++i) {</div><div class='add'>+            if (!nameFilters.at(i).isEmpty()) {</div><div class='add'>+                empty = false;</div><div class='add'>+                break;</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='del'>-        if (empty)</div><div class='del'>-            nameFilters = QStringList(QString::fromLatin1("*"));</div><div class='ctx'>     }</div><div class='add'>+    if (empty)</div><div class='add'>+        nameFilters = QStringList(QString::fromLatin1("*"));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-    QDirPrivate(const QDirPrivate &amp;copy)</div><div class='del'>-        : QSharedData(copy)</div><div class='del'>-        , path(copy.path)</div><div class='del'>-        , nameFilters(copy.nameFilters)</div><div class='del'>-        , sort(copy.sort)</div><div class='del'>-        , filters(copy.filters)</div><div class='add'>+QDirPrivate::QDirPrivate(const QDirPrivate &amp;copy)</div><div class='add'>+    : QSharedData(copy)</div><div class='add'>+    , nameFilters(copy.nameFilters)</div><div class='add'>+    , sort(copy.sort)</div><div class='add'>+    , filters(copy.filters)</div><div class='ctx'> #ifdef QT3_SUPPORT</div><div class='del'>-        , filterSepChar(copy.filterSepChar)</div><div class='del'>-        , matchAllDirs(copy.matchAllDirs)</div><div class='add'>+    , filterSepChar(copy.filterSepChar)</div><div class='add'>+    , matchAllDirs(copy.matchAllDirs)</div><div class='ctx'> #endif</div><div class='del'>-        , fileListsInitialized(false)</div><div class='del'>-    {</div><div class='del'>-    }</div><div class='add'>+    , fileListsInitialized(false)</div><div class='add'>+    , dirEntry(copy.dirEntry)</div><div class='add'>+    , metaData(copy.metaData)</div><div class='add'>+{</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-    bool exists() const</div><div class='del'>-    {</div><div class='del'>-        const QAbstractFileEngine::FileFlags info =</div><div class='del'>-            fileEngine-&gt;fileFlags(QAbstractFileEngine::DirectoryType</div><div class='del'>-                                           | QAbstractFileEngine::ExistsFlag</div><div class='del'>-                                           | QAbstractFileEngine::Refresh);</div><div class='del'>-        if (!(info &amp; QAbstractFileEngine::DirectoryType))</div><div class='del'>-            return false;</div><div class='del'>-        return info &amp; QAbstractFileEngine::ExistsFlag;</div><div class='add'>+bool QDirPrivate::exists() const</div><div class='add'>+{</div><div class='add'>+    if (fileEngine.isNull()) {</div><div class='add'>+        QFileSystemEngine::fillMetaData(dirEntry, metaData,</div><div class='add'>+                QFileSystemMetaData::ExistsAttribute | QFileSystemMetaData::DirectoryType); // always stat</div><div class='add'>+        return metaData.exists() &amp;&amp; metaData.isDirectory();</div><div class='ctx'>     }</div><div class='add'>+    const QAbstractFileEngine::FileFlags info =</div><div class='add'>+        fileEngine-&gt;fileFlags(QAbstractFileEngine::DirectoryType</div><div class='add'>+                                       | QAbstractFileEngine::ExistsFlag</div><div class='add'>+                                       | QAbstractFileEngine::Refresh);</div><div class='add'>+    if (!(info &amp; QAbstractFileEngine::DirectoryType))</div><div class='add'>+        return false;</div><div class='add'>+    return info &amp; QAbstractFileEngine::ExistsFlag;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-    void initFileEngine();</div><div class='del'>-    void initFileLists() const;</div><div class='del'>-</div><div class='del'>-    static void sortFileList(QDir::SortFlags, QFileInfoList &amp;, QStringList *, QFileInfoList *);</div><div class='del'>-</div><div class='del'>-    static inline QChar getFilterSepChar(const QString &amp;nameFilter)</div><div class='del'>-    {</div><div class='del'>-        QChar sep(QLatin1Char(';'));</div><div class='del'>-        int i = nameFilter.indexOf(sep, 0);</div><div class='del'>-        if (i == -1 &amp;&amp; nameFilter.indexOf(QLatin1Char(' '), 0) != -1)</div><div class='del'>-            sep = QChar(QLatin1Char(' '));</div><div class='del'>-        return sep;</div><div class='del'>-    }</div><div class='add'>+// static</div><div class='add'>+inline QChar QDirPrivate::getFilterSepChar(const QString &amp;nameFilter)</div><div class='add'>+{</div><div class='add'>+    QChar sep(QLatin1Char(';'));</div><div class='add'>+    int i = nameFilter.indexOf(sep, 0);</div><div class='add'>+    if (i == -1 &amp;&amp; nameFilter.indexOf(QLatin1Char(' '), 0) != -1)</div><div class='add'>+        sep = QChar(QLatin1Char(' '));</div><div class='add'>+    return sep;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-    static inline QStringList splitFilters(const QString &amp;nameFilter, QChar sep = 0)</div><div class='del'>-    {</div><div class='del'>-        if (sep == 0)</div><div class='del'>-            sep = getFilterSepChar(nameFilter);</div><div class='del'>-        QStringList ret = nameFilter.split(sep);</div><div class='del'>-        for (int i = 0; i &lt; ret.count(); ++i)</div><div class='del'>-            ret[i] = ret[i].trimmed();</div><div class='del'>-        return ret;</div><div class='del'>-    }</div><div class='add'>+// static</div><div class='add'>+inline QStringList QDirPrivate::splitFilters(const QString &amp;nameFilter, QChar sep)</div><div class='add'>+{</div><div class='add'>+    if (sep == 0)</div><div class='add'>+        sep = getFilterSepChar(nameFilter);</div><div class='add'>+    QStringList ret = nameFilter.split(sep);</div><div class='add'>+    for (int i = 0; i &lt; ret.count(); ++i)</div><div class='add'>+        ret[i] = ret[i].trimmed();</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-    inline void setPath(QString p)</div><div class='del'>-    {</div><div class='del'>-        if ((p.endsWith(QLatin1Char('/')) || p.endsWith(QLatin1Char('\\')))</div><div class='del'>-                &amp;&amp; p.length() &gt; 1) {</div><div class='add'>+inline void QDirPrivate::setPath(const QString &amp;path)</div><div class='add'>+{</div><div class='add'>+    QString p = QDir::fromNativeSeparators(path);</div><div class='add'>+    if (p.endsWith(QLatin1Char('/'))</div><div class='add'>+            &amp;&amp; p.length() &gt; 1</div><div class='ctx'> #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)</div><div class='del'>-            if (!(p.length() == 3 &amp;&amp; p.at(1) == QLatin1Char(':')))</div><div class='add'>+        &amp;&amp; (!(p.length() == 3 &amp;&amp; p.at(1).unicode() == ':' &amp;&amp; p.at(0).isLetter()))</div><div class='ctx'> #endif</div><div class='del'>-                p.truncate(p.length() - 1);</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        path = p;</div><div class='del'>-        initFileEngine();</div><div class='del'>-</div><div class='del'>-        // set the path to be the qt friendly version so then we can operate on it using just /</div><div class='del'>-        path = fileEngine-&gt;fileName(QAbstractFileEngine::DefaultName);</div><div class='del'>-        clearFileLists();</div><div class='add'>+    ) {</div><div class='add'>+            p.truncate(p.length() - 1);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    inline void clearFileLists() {</div><div class='del'>-        fileListsInitialized = false;</div><div class='del'>-        files.clear();</div><div class='del'>-        fileInfos.clear();</div><div class='del'>-    }</div><div class='add'>+    dirEntry = QFileSystemEntry(p, QFileSystemEntry::FromInternalPath());</div><div class='add'>+    metaData.clear();</div><div class='add'>+    initFileEngine();</div><div class='add'>+    clearFileLists();</div><div class='add'>+    absoluteDirEntry = QFileSystemEntry();</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-    QString path;</div><div class='del'>-    QStringList nameFilters;</div><div class='del'>-    QDir::SortFlags sort;</div><div class='del'>-    QDir::Filters filters;</div><div class='add'>+inline void QDirPrivate::clearFileLists()</div><div class='add'>+{</div><div class='add'>+    fileListsInitialized = false;</div><div class='add'>+    files.clear();</div><div class='add'>+    fileInfos.clear();</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#ifdef QT3_SUPPORT</div><div class='del'>-    QChar filterSepChar;</div><div class='del'>-    bool matchAllDirs;</div><div class='del'>-#endif</div><div class='add'>+inline void QDirPrivate::resolveAbsoluteEntry() const</div><div class='add'>+{</div><div class='add'>+    if (!absoluteDirEntry.isEmpty() || dirEntry.isEmpty())</div><div class='add'>+        return;</div><div class='add'>+</div><div class='add'>+    QString absoluteName;</div><div class='add'>+    if (fileEngine.isNull()) {</div><div class='add'>+        if (!dirEntry.isRelative()) {</div><div class='add'>+            absoluteDirEntry = dirEntry;</div><div class='add'>+            return;</div><div class='add'>+        }</div><div class='ctx'> </div><div class='del'>-    QScopedPointer&lt;QAbstractFileEngine&gt; fileEngine;</div><div class='add'>+        absoluteName = QFileSystemEngine::absoluteName(dirEntry).filePath();</div><div class='add'>+    } else {</div><div class='add'>+        absoluteName = fileEngine-&gt;fileName(QAbstractFileEngine::AbsoluteName);</div><div class='add'>+    }</div><div class='ctx'> </div><div class='del'>-    mutable bool fileListsInitialized;</div><div class='del'>-    mutable QStringList files;</div><div class='del'>-    mutable QFileInfoList fileInfos;</div><div class='del'>-};</div><div class='add'>+    absoluteDirEntry = QFileSystemEntry(QDir::cleanPath(absoluteName), QFileSystemEntry::FromInternalPath());</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* For sorting */</div><div class='ctx'> struct QDirSortItem</div><div class='hunk'>@@ -315,12 +321,11 @@ inline void QDirPrivate::sortFileList(QDir::SortFlags sort, QFileInfoList &amp;l,</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-inline void QDirPrivate::initFileLists() const</div><div class='add'>+inline void QDirPrivate::initFileLists(const QDir &amp;dir) const</div><div class='ctx'> {</div><div class='ctx'>     if (!fileListsInitialized) {</div><div class='ctx'>         QFileInfoList l;</div><div class='del'>-        QDirIterator it(path, nameFilters, filters);</div><div class='add'>+        QDirIterator it(dir);</div><div class='ctx'>         while (it.hasNext()) {</div><div class='ctx'>             it.next();</div><div class='ctx'>             l.append(it.fileInfo());</div><div class='hunk'>@@ -332,7 +337,7 @@ inline void QDirPrivate::initFileLists() const</div><div class='ctx'> </div><div class='ctx'> inline void QDirPrivate::initFileEngine()</div><div class='ctx'> {</div><div class='del'>-    fileEngine.reset(QAbstractFileEngine::create(path));</div><div class='add'>+    fileEngine.reset(QFileSystemEngine::resolveEntryAndCreateLegacyEngine(dirEntry, metaData));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -597,7 +602,7 @@ void QDir::setPath(const QString &amp;path)</div><div class='ctx'> QString QDir::path() const</div><div class='ctx'> {</div><div class='ctx'>     const QDirPrivate* d = d_ptr.constData();</div><div class='del'>-    return d-&gt;path;</div><div class='add'>+    return d-&gt;dirEntry.filePath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -611,10 +616,8 @@ QString QDir::path() const</div><div class='ctx'> QString QDir::absolutePath() const</div><div class='ctx'> {</div><div class='ctx'>     const QDirPrivate* d = d_ptr.constData();</div><div class='del'>-    QString ret = d-&gt;path;</div><div class='del'>-    if (QDir::isRelativePath(ret))</div><div class='del'>-        ret = absoluteFilePath(QString::fromLatin1(""));</div><div class='del'>-    return cleanPath(ret);</div><div class='add'>+    d-&gt;resolveAbsoluteEntry();</div><div class='add'>+    return d-&gt;absoluteDirEntry.filePath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -635,7 +638,12 @@ QString QDir::absolutePath() const</div><div class='ctx'> */</div><div class='ctx'> QString QDir::canonicalPath() const</div><div class='ctx'> {</div><div class='del'>-    return cleanPath(d_ptr-&gt;fileEngine-&gt;fileName(QAbstractFileEngine::CanonicalName));</div><div class='add'>+    const QDirPrivate* d = d_ptr.constData();</div><div class='add'>+    if (d-&gt;fileEngine.isNull()) {</div><div class='add'>+        QFileSystemEntry answer = QFileSystemEngine::canonicalName(d-&gt;dirEntry, d-&gt;metaData);</div><div class='add'>+        return answer.filePath();</div><div class='add'>+    }</div><div class='add'>+    return d-&gt;fileEngine-&gt;fileName(QAbstractFileEngine::CanonicalName);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -652,10 +660,7 @@ QString QDir::canonicalPath() const</div><div class='ctx'> QString QDir::dirName() const</div><div class='ctx'> {</div><div class='ctx'>     const QDirPrivate* d = d_ptr.constData();</div><div class='del'>-    int pos = d-&gt;path.lastIndexOf(QLatin1Char('/'));</div><div class='del'>-    if (pos == -1)</div><div class='del'>-        return d-&gt;path;</div><div class='del'>-    return d-&gt;path.mid(pos + 1);</div><div class='add'>+    return d-&gt;dirEntry.fileName();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -673,7 +678,7 @@ QString QDir::filePath(const QString &amp;fileName) const</div><div class='ctx'>     if (isAbsolutePath(fileName))</div><div class='ctx'>         return QString(fileName);</div><div class='ctx'> </div><div class='del'>-    QString ret = d-&gt;path;</div><div class='add'>+    QString ret = d-&gt;dirEntry.filePath();</div><div class='ctx'>     if (!fileName.isEmpty()) {</div><div class='ctx'>         if (!ret.isEmpty() &amp;&amp; ret[(int)ret.length()-1] != QLatin1Char('/') &amp;&amp; fileName[0] != QLatin1Char('/'))</div><div class='ctx'>             ret += QLatin1Char('/');</div><div class='hunk'>@@ -696,22 +701,12 @@ QString QDir::absoluteFilePath(const QString &amp;fileName) const</div><div class='ctx'>     if (isAbsolutePath(fileName))</div><div class='ctx'>         return fileName;</div><div class='ctx'> </div><div class='del'>-    QString ret;</div><div class='del'>-#ifndef QT_NO_FSFILEENGINE</div><div class='del'>-    if (isRelativePath(d-&gt;path)) //get pwd</div><div class='del'>-        ret = QFSFileEngine::currentPath(fileName);</div><div class='del'>-#endif</div><div class='del'>-    if (!d-&gt;path.isEmpty() &amp;&amp; d-&gt;path != QLatin1String(".")) {</div><div class='del'>-        if (!ret.isEmpty() &amp;&amp; !ret.endsWith(QLatin1Char('/')))</div><div class='del'>-            ret += QLatin1Char('/');</div><div class='del'>-        ret += d-&gt;path;</div><div class='del'>-    }</div><div class='del'>-    if (!fileName.isEmpty()) {</div><div class='del'>-        if (!ret.isEmpty() &amp;&amp; !ret.endsWith(QLatin1Char('/')))</div><div class='del'>-            ret += QLatin1Char('/');</div><div class='del'>-        ret += fileName;</div><div class='del'>-    }</div><div class='del'>-    return ret;</div><div class='add'>+    d-&gt;resolveAbsoluteEntry();</div><div class='add'>+    if (fileName.isEmpty())</div><div class='add'>+        return d-&gt;absoluteDirEntry.filePath();</div><div class='add'>+    if (!d-&gt;absoluteDirEntry.isRoot())</div><div class='add'>+        return d-&gt;absoluteDirEntry.filePath() % QLatin1Char('/') % fileName;</div><div class='add'>+    return d-&gt;absoluteDirEntry.filePath() % fileName;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -723,7 +718,7 @@ QString QDir::absoluteFilePath(const QString &amp;fileName) const</div><div class='ctx'> */</div><div class='ctx'> QString QDir::relativeFilePath(const QString &amp;fileName) const</div><div class='ctx'> {</div><div class='del'>-    QString dir = absolutePath();</div><div class='add'>+    QString dir = cleanPath(absolutePath());</div><div class='ctx'>     QString file = cleanPath(fileName);</div><div class='ctx'> </div><div class='ctx'>     if (isRelativePath(file) || isRelativePath(dir))</div><div class='hunk'>@@ -778,6 +773,7 @@ QString QDir::relativeFilePath(const QString &amp;fileName) const</div><div class='ctx'>     return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef QT_NO_DEPRECATED</div><div class='ctx'> /*!</div><div class='ctx'>     \obsolete</div><div class='ctx'> </div><div class='hunk'>@@ -787,6 +783,7 @@ QString QDir::convertSeparators(const QString &amp;pathName)</div><div class='ctx'> {</div><div class='ctx'>     return toNativeSeparators(pathName);</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     \since 4.2</div><div class='hunk'>@@ -857,21 +854,22 @@ bool QDir::cd(const QString &amp;dirName)</div><div class='ctx'> </div><div class='ctx'>     if (dirName.isEmpty() || dirName == QLatin1String("."))</div><div class='ctx'>         return true;</div><div class='del'>-    QString newPath = d-&gt;path;</div><div class='add'>+    QString newPath;</div><div class='ctx'>     if (isAbsolutePath(dirName)) {</div><div class='ctx'>         newPath = cleanPath(dirName);</div><div class='ctx'>     } else {</div><div class='ctx'>         if (isRoot()) {</div><div class='ctx'>             if (dirName == QLatin1String(".."))</div><div class='ctx'>                 return false;</div><div class='add'>+            newPath = d-&gt;dirEntry.filePath();</div><div class='ctx'>         } else {</div><div class='del'>-            newPath += QLatin1Char('/');</div><div class='add'>+            newPath = d-&gt;dirEntry.filePath() % QLatin1Char('/');</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         newPath += dirName;</div><div class='ctx'>         if (dirName.indexOf(QLatin1Char('/')) &gt;= 0</div><div class='del'>-            || d-&gt;path == QLatin1String(".")</div><div class='del'>-            || dirName == QLatin1String("..")) {</div><div class='add'>+            || dirName == QLatin1String("..")</div><div class='add'>+            || d-&gt;dirEntry.filePath() == QLatin1String(".")) {</div><div class='ctx'>             newPath = cleanPath(newPath);</div><div class='ctx'>             /*</div><div class='ctx'>               If newPath starts with .., we convert it to absolute to</div><div class='hunk'>@@ -889,7 +887,6 @@ bool QDir::cd(const QString &amp;dirName)</div><div class='ctx'> </div><div class='ctx'>     QScopedPointer&lt;QDirPrivate&gt; dir(new QDirPrivate(*d_ptr.constData()));</div><div class='ctx'>     dir-&gt;setPath(newPath);</div><div class='del'>-</div><div class='ctx'>     if (!dir-&gt;exists())</div><div class='ctx'>         return false;</div><div class='ctx'> </div><div class='hunk'>@@ -1202,7 +1199,7 @@ void QDir::setSorting(SortFlags sort)</div><div class='ctx'> uint QDir::count() const</div><div class='ctx'> {</div><div class='ctx'>     const QDirPrivate* d = d_ptr.constData();</div><div class='del'>-    d-&gt;initFileLists();</div><div class='add'>+    d-&gt;initFileLists(*this);</div><div class='ctx'>     return d-&gt;files.count();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1216,7 +1213,7 @@ uint QDir::count() const</div><div class='ctx'> QString QDir::operator[](int pos) const</div><div class='ctx'> {</div><div class='ctx'>     const QDirPrivate* d = d_ptr.constData();</div><div class='del'>-    d-&gt;initFileLists();</div><div class='add'>+    d-&gt;initFileLists(*this);</div><div class='ctx'>     return d-&gt;files[pos];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1299,12 +1296,12 @@ QStringList QDir::entryList(const QStringList &amp;nameFilters, Filters filters,</div><div class='ctx'>         sort = d-&gt;sort;</div><div class='ctx'> </div><div class='ctx'>     if (filters == d-&gt;filters &amp;&amp; sort == d-&gt;sort &amp;&amp; nameFilters == d-&gt;nameFilters) {</div><div class='del'>-        d-&gt;initFileLists();</div><div class='add'>+        d-&gt;initFileLists(*this);</div><div class='ctx'>         return d-&gt;files;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     QFileInfoList l;</div><div class='del'>-    QDirIterator it(d-&gt;path, nameFilters, filters);</div><div class='add'>+    QDirIterator it(d-&gt;dirEntry.filePath(), nameFilters, filters);</div><div class='ctx'>     while (it.hasNext()) {</div><div class='ctx'>         it.next();</div><div class='ctx'>         l.append(it.fileInfo());</div><div class='hunk'>@@ -1345,12 +1342,12 @@ QFileInfoList QDir::entryInfoList(const QStringList &amp;nameFilters, Filters filter</div><div class='ctx'>         sort = d-&gt;sort;</div><div class='ctx'> </div><div class='ctx'>     if (filters == d-&gt;filters &amp;&amp; sort == d-&gt;sort &amp;&amp; nameFilters == d-&gt;nameFilters) {</div><div class='del'>-        d-&gt;initFileLists();</div><div class='add'>+        d-&gt;initFileLists(*this);</div><div class='ctx'>         return d-&gt;fileInfos;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     QFileInfoList l;</div><div class='del'>-    QDirIterator it(d-&gt;path, nameFilters, filters);</div><div class='add'>+    QDirIterator it(d-&gt;dirEntry.filePath(), nameFilters, filters);</div><div class='ctx'>     while (it.hasNext()) {</div><div class='ctx'>         it.next();</div><div class='ctx'>         l.append(it.fileInfo());</div><div class='hunk'>@@ -1365,8 +1362,11 @@ QFileInfoList QDir::entryInfoList(const QStringList &amp;nameFilters, Filters filter</div><div class='ctx'> </div><div class='ctx'>     Returns true on success; otherwise returns false.</div><div class='ctx'> </div><div class='add'>+    If the directory already exists when this function is called, it will return false.</div><div class='add'>+</div><div class='ctx'>     \sa rmdir()</div><div class='ctx'> */</div><div class='add'>+// ### Qt5: behaviour when directory already exists should be made consistent for mkdir and mkpath</div><div class='ctx'> bool QDir::mkdir(const QString &amp;dirName) const</div><div class='ctx'> {</div><div class='ctx'>     const QDirPrivate* d = d_ptr.constData();</div><div class='hunk'>@@ -1377,6 +1377,8 @@ bool QDir::mkdir(const QString &amp;dirName) const</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     QString fn = filePath(dirName);</div><div class='add'>+    if (d-&gt;fileEngine.isNull())</div><div class='add'>+        return QFileSystemEngine::createDirectory(QFileSystemEntry(fn), false);</div><div class='ctx'>     return d-&gt;fileEngine-&gt;mkdir(fn, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1399,6 +1401,9 @@ bool QDir::rmdir(const QString &amp;dirName) const</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     QString fn = filePath(dirName);</div><div class='add'>+    if (d-&gt;fileEngine.isNull())</div><div class='add'>+        return QFileSystemEngine::removeDirectory(QFileSystemEntry(fn), false);</div><div class='add'>+</div><div class='ctx'>     return d-&gt;fileEngine-&gt;rmdir(fn, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1410,8 +1415,11 @@ bool QDir::rmdir(const QString &amp;dirName) const</div><div class='ctx'> </div><div class='ctx'>     Returns true if successful; otherwise returns false.</div><div class='ctx'> </div><div class='add'>+    If the path already exists when this function is called, it will return true.</div><div class='add'>+</div><div class='ctx'>     \sa rmpath()</div><div class='ctx'> */</div><div class='add'>+// ### Qt5: behaviour when directory already exists should be made consistent for mkdir and mkpath</div><div class='ctx'> bool QDir::mkpath(const QString &amp;dirPath) const</div><div class='ctx'> {</div><div class='ctx'>     const QDirPrivate* d = d_ptr.constData();</div><div class='hunk'>@@ -1422,6 +1430,8 @@ bool QDir::mkpath(const QString &amp;dirPath) const</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     QString fn = filePath(dirPath);</div><div class='add'>+    if (d-&gt;fileEngine.isNull())</div><div class='add'>+        return QFileSystemEngine::createDirectory(QFileSystemEntry(fn), true);</div><div class='ctx'>     return d-&gt;fileEngine-&gt;mkdir(fn, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1446,6 +1456,8 @@ bool QDir::rmpath(const QString &amp;dirPath) const</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     QString fn = filePath(dirPath);</div><div class='add'>+    if (d-&gt;fileEngine.isNull())</div><div class='add'>+        return QFileSystemEngine::removeDirectory(QFileSystemEntry(fn), true);</div><div class='ctx'>     return d-&gt;fileEngine-&gt;rmdir(fn, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1462,6 +1474,13 @@ bool QDir::isReadable() const</div><div class='ctx'> {</div><div class='ctx'>     const QDirPrivate* d = d_ptr.constData();</div><div class='ctx'> </div><div class='add'>+    if (d-&gt;fileEngine.isNull()) {</div><div class='add'>+        if (!d-&gt;metaData.hasFlags(QFileSystemMetaData::UserReadPermission))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;dirEntry, d-&gt;metaData, QFileSystemMetaData::UserReadPermission);</div><div class='add'>+</div><div class='add'>+        return (d-&gt;metaData.permissions() &amp; QFile::ReadUser) != 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     const QAbstractFileEngine::FileFlags info =</div><div class='ctx'>         d-&gt;fileEngine-&gt;fileFlags(QAbstractFileEngine::DirectoryType</div><div class='ctx'>                                        | QAbstractFileEngine::PermsMask);</div><div class='hunk'>@@ -1500,6 +1519,8 @@ bool QDir::exists() const</div><div class='ctx'> */</div><div class='ctx'> bool QDir::isRoot() const</div><div class='ctx'> {</div><div class='add'>+    if (d_ptr-&gt;fileEngine.isNull())</div><div class='add'>+        return d_ptr-&gt;dirEntry.isRoot();</div><div class='ctx'>     return d_ptr-&gt;fileEngine-&gt;fileFlags(QAbstractFileEngine::FlagsMask) &amp; QAbstractFileEngine::RootFlag;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1530,6 +1551,8 @@ bool QDir::isRoot() const</div><div class='ctx'> */</div><div class='ctx'> bool QDir::isRelative() const</div><div class='ctx'> {</div><div class='add'>+    if (d_ptr-&gt;fileEngine.isNull())</div><div class='add'>+        return d_ptr-&gt;dirEntry.isRelative();</div><div class='ctx'>     return d_ptr-&gt;fileEngine-&gt;isRelativePath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1541,20 +1564,23 @@ bool QDir::isRelative() const</div><div class='ctx'> </div><div class='ctx'>     \sa isAbsolute() isAbsolutePath() isRelative() cleanPath()</div><div class='ctx'> */</div><div class='del'>-bool QDir::makeAbsolute() // ### What do the return values signify?</div><div class='add'>+bool QDir::makeAbsolute()</div><div class='ctx'> {</div><div class='del'>-    QString absolutePath = d_ptr.constData()-&gt;fileEngine-&gt;fileName(QAbstractFileEngine::AbsoluteName);</div><div class='del'>-    if (QDir::isRelativePath(absolutePath))</div><div class='del'>-        return false;</div><div class='del'>-</div><div class='del'>-    QScopedPointer&lt;QDirPrivate&gt; dir(new QDirPrivate(*d_ptr.constData()));</div><div class='del'>-    dir-&gt;setPath(absolutePath);</div><div class='del'>-</div><div class='del'>-    d_ptr = dir.take();</div><div class='del'>-</div><div class='del'>-    if (!(d_ptr-&gt;fileEngine-&gt;fileFlags(QAbstractFileEngine::TypesMask) &amp; QAbstractFileEngine::DirectoryType))</div><div class='del'>-        return false;</div><div class='add'>+    const QDirPrivate *d = d_ptr.constData();</div><div class='add'>+    QScopedPointer&lt;QDirPrivate&gt; dir;</div><div class='add'>+    if (!d-&gt;fileEngine.isNull()) {</div><div class='add'>+        QString absolutePath = d-&gt;fileEngine-&gt;fileName(QAbstractFileEngine::AbsoluteName);</div><div class='add'>+        if (QDir::isRelativePath(absolutePath))</div><div class='add'>+            return false;</div><div class='ctx'> </div><div class='add'>+        dir.reset(new QDirPrivate(*d_ptr.constData()));</div><div class='add'>+        dir-&gt;setPath(absolutePath);</div><div class='add'>+    } else { // native FS</div><div class='add'>+        d-&gt;resolveAbsoluteEntry();</div><div class='add'>+        dir.reset(new QDirPrivate(*d_ptr.constData()));</div><div class='add'>+        dir-&gt;setPath(d-&gt;absoluteDirEntry.filePath());</div><div class='add'>+    }</div><div class='add'>+    d_ptr = dir.take(); // actually detach</div><div class='ctx'>     return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1574,17 +1600,24 @@ bool QDir::operator==(const QDir &amp;dir) const</div><div class='ctx'> </div><div class='ctx'>     if (d == other)</div><div class='ctx'>         return true;</div><div class='del'>-    if (d-&gt;fileEngine-&gt;caseSensitive() != other-&gt;fileEngine-&gt;caseSensitive())</div><div class='del'>-        return false;</div><div class='add'>+    Qt::CaseSensitivity sensitive;</div><div class='add'>+    if (d-&gt;fileEngine.isNull() || other-&gt;fileEngine.isNull()) {</div><div class='add'>+        if (d-&gt;fileEngine.data() != other-&gt;fileEngine.data()) // one is native, the other is a custom file-engine</div><div class='add'>+            return false;</div><div class='add'>+</div><div class='add'>+        sensitive = QFileSystemEngine::isCaseSensitive() ? Qt::CaseSensitive : Qt::CaseInsensitive;</div><div class='add'>+    } else {</div><div class='add'>+        if (d-&gt;fileEngine-&gt;caseSensitive() != other-&gt;fileEngine-&gt;caseSensitive())</div><div class='add'>+            return false;</div><div class='add'>+        sensitive = d-&gt;fileEngine-&gt;caseSensitive() ? Qt::CaseSensitive : Qt::CaseInsensitive;</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     if (d-&gt;filters == other-&gt;filters</div><div class='ctx'>        &amp;&amp; d-&gt;sort == other-&gt;sort</div><div class='ctx'>        &amp;&amp; d-&gt;nameFilters == other-&gt;nameFilters) {</div><div class='del'>-        QString dir1 = absolutePath(), dir2 = dir.absolutePath();</div><div class='del'>-        if (!other-&gt;fileEngine-&gt;caseSensitive())</div><div class='del'>-            return (dir1.toLower() == dir2.toLower());</div><div class='del'>-</div><div class='del'>-        return (dir1 == dir2);</div><div class='del'>-</div><div class='add'>+        d-&gt;resolveAbsoluteEntry();</div><div class='add'>+        other-&gt;resolveAbsoluteEntry();</div><div class='add'>+        return d-&gt;absoluteDirEntry.filePath().compare(other-&gt;absoluteDirEntry.filePath(), sensitive) == 0;</div><div class='ctx'>     }</div><div class='ctx'>     return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -1733,12 +1766,7 @@ QChar QDir::separator()</div><div class='ctx'> */</div><div class='ctx'> bool QDir::setCurrent(const QString &amp;path)</div><div class='ctx'> {</div><div class='del'>-#ifdef QT_NO_FSFILEENGINE</div><div class='del'>-    Q_UNUSED(path);</div><div class='del'>-    return false;</div><div class='del'>-#else</div><div class='del'>-    return QFSFileEngine::setCurrentPath(path);</div><div class='del'>-#endif</div><div class='add'>+    return QFileSystemEngine::setCurrentPath(QFileSystemEntry(path));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -1759,11 +1787,7 @@ bool QDir::setCurrent(const QString &amp;path)</div><div class='ctx'> */</div><div class='ctx'> QString QDir::currentPath()</div><div class='ctx'> {</div><div class='del'>-#ifdef QT_NO_FSFILEENGINE</div><div class='del'>-    return QString();</div><div class='del'>-#else</div><div class='del'>-    return QFSFileEngine::currentPath();</div><div class='del'>-#endif</div><div class='add'>+    return QFileSystemEngine::currentPath().filePath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -1821,11 +1845,7 @@ QString QDir::currentPath()</div><div class='ctx'> */</div><div class='ctx'> QString QDir::homePath()</div><div class='ctx'> {</div><div class='del'>-#ifdef QT_NO_FSFILEENGINE</div><div class='del'>-    return QString();</div><div class='del'>-#else</div><div class='del'>-    return cleanPath(QFSFileEngine::homePath());</div><div class='del'>-#endif</div><div class='add'>+    return QFileSystemEngine::homePath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -1854,7 +1874,8 @@ QString QDir::homePath()</div><div class='ctx'> /*!</div><div class='ctx'>     Returns the absolute path of the system's temporary directory.</div><div class='ctx'> </div><div class='del'>-    On Unix/Linux systems this is usually \c{/tmp}; on Windows this is</div><div class='add'>+    On Unix/Linux systems this is the path in the \c TMPDIR environment</div><div class='add'>+    variable or \c{/tmp} if \c TMPDIR is not defined. On Windows this is</div><div class='ctx'>     usually the path in the \c TEMP or \c TMP environment</div><div class='ctx'>     variable. Whether a directory separator is added to the end or</div><div class='ctx'>     not, depends on the operating system.</div><div class='hunk'>@@ -1863,11 +1884,7 @@ QString QDir::homePath()</div><div class='ctx'> */</div><div class='ctx'> QString QDir::tempPath()</div><div class='ctx'> {</div><div class='del'>-#ifdef QT_NO_FSFILEENGINE</div><div class='del'>-    return QString();</div><div class='del'>-#else</div><div class='del'>-    return cleanPath(QFSFileEngine::tempPath());</div><div class='del'>-#endif</div><div class='add'>+    return QFileSystemEngine::tempPath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -1894,11 +1911,7 @@ QString QDir::tempPath()</div><div class='ctx'> */</div><div class='ctx'> QString QDir::rootPath()</div><div class='ctx'> {</div><div class='del'>-#ifdef QT_NO_FSFILEENGINE</div><div class='del'>-    return QString();</div><div class='del'>-#else</div><div class='del'>-    return QFSFileEngine::rootPath();</div><div class='del'>-#endif</div><div class='add'>+    return QFileSystemEngine::rootPath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -2095,6 +2108,7 @@ bool QDir::isRelativePath(const QString &amp;path)</div><div class='ctx'> void QDir::refresh() const</div><div class='ctx'> {</div><div class='ctx'>     QDirPrivate *d = const_cast&lt;QDir*&gt;(this)-&gt;d_ptr.data();</div><div class='add'>+    d-&gt;metaData.clear();</div><div class='ctx'>     d-&gt;initFileEngine();</div><div class='ctx'>     d-&gt;clearFileLists();</div><div class='ctx'> }</div><div class='head'>diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h<br/>index 78c6a7a..e2f43f0 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qdir.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qdir.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qdir.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qdir.h</a></div><div class='hunk'>@@ -128,6 +128,10 @@ public:</div><div class='ctx'> </div><div class='ctx'>     QDir &amp;operator=(const QDir &amp;);</div><div class='ctx'>     QDir &amp;operator=(const QString &amp;path);</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    inline QDir &amp;operator=(QDir &amp;&amp;other)</div><div class='add'>+    { qSwap(d_ptr, other.d_ptr); return *this; }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'>     void setPath(const QString &amp;path);</div><div class='ctx'>     QString path() const;</div><div class='head'>diff --git a/src/corelib/io/qdir_p.h b/src/corelib/io/qdir_p.h<br/>new file mode 100644<br/>index 0000000..3e00529<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qdir_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qdir_p.h</a></div><div class='hunk'>@@ -0,0 +1,98 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QDIR_PRIVATE_H</div><div class='add'>+#define QDIR_PRIVATE_H</div><div class='add'>+</div><div class='add'>+#include "qfilesystementry_p.h"</div><div class='add'>+#include "qfilesystemmetadata_p.h"</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+class QDirPrivate : public QSharedData</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    QDirPrivate(const QString &amp;path, const QStringList &amp;nameFilters_ = QStringList(),</div><div class='add'>+            QDir::SortFlags sort_ = QDir::SortFlags(QDir::Name | QDir::IgnoreCase),</div><div class='add'>+            QDir::Filters filters_ = QDir::AllEntries);</div><div class='add'>+</div><div class='add'>+    QDirPrivate(const QDirPrivate &amp;copy);</div><div class='add'>+</div><div class='add'>+    bool exists() const;</div><div class='add'>+</div><div class='add'>+    void initFileEngine();</div><div class='add'>+    void initFileLists(const QDir &amp;dir) const;</div><div class='add'>+</div><div class='add'>+    static void sortFileList(QDir::SortFlags, QFileInfoList &amp;, QStringList *, QFileInfoList *);</div><div class='add'>+</div><div class='add'>+    static inline QChar getFilterSepChar(const QString &amp;nameFilter);</div><div class='add'>+</div><div class='add'>+    static inline QStringList splitFilters(const QString &amp;nameFilter, QChar sep = 0);</div><div class='add'>+</div><div class='add'>+    inline void setPath(const QString &amp;path);</div><div class='add'>+</div><div class='add'>+    inline void clearFileLists();</div><div class='add'>+</div><div class='add'>+    inline void resolveAbsoluteEntry() const;</div><div class='add'>+</div><div class='add'>+    QStringList nameFilters;</div><div class='add'>+    QDir::SortFlags sort;</div><div class='add'>+    QDir::Filters filters;</div><div class='add'>+</div><div class='add'>+#ifdef QT3_SUPPORT</div><div class='add'>+    QChar filterSepChar;</div><div class='add'>+    bool matchAllDirs;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    QScopedPointer&lt;QAbstractFileEngine&gt; fileEngine;</div><div class='add'>+</div><div class='add'>+    mutable bool fileListsInitialized;</div><div class='add'>+    mutable QStringList files;</div><div class='add'>+    mutable QFileInfoList fileInfos;</div><div class='add'>+</div><div class='add'>+    QFileSystemEntry dirEntry;</div><div class='add'>+    mutable QFileSystemEntry absoluteDirEntry;</div><div class='add'>+    mutable QFileSystemMetaData metaData;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp<br/>index 10402e9..0b02adb 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qdiriterator.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qdiriterator.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qdiriterator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qdiriterator.cpp</a></div><div class='hunk'>@@ -90,6 +90,7 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #include "qdiriterator.h"</div><div class='add'>+#include "qdir_p.h"</div><div class='ctx'> </div><div class='ctx'> #include "qabstractfileengine.h"</div><div class='ctx'> </div><div class='hunk'>@@ -97,36 +98,41 @@</div><div class='ctx'> #include &lt;QtCore/qstack.h&gt;</div><div class='ctx'> #include &lt;QtCore/qvariant.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;QtCore/private/qfilesystemiterator_p.h&gt;</div><div class='add'>+#include &lt;QtCore/private/qfilesystementry_p.h&gt;</div><div class='add'>+#include &lt;QtCore/private/qfilesystemmetadata_p.h&gt;</div><div class='add'>+#include &lt;QtCore/private/qfilesystemengine_p.h&gt;</div><div class='add'>+#include &lt;QtCore/qfsfileengine.h&gt;</div><div class='add'>+#include &lt;QtCore/private/qfileinfo_p.h&gt;</div><div class='add'>+</div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='del'>-class QDirIteratorPrivateIteratorStack : public QStack&lt;QAbstractFileEngineIterator *&gt;</div><div class='add'>+template &lt;class Iterator&gt;</div><div class='add'>+class QDirIteratorPrivateIteratorStack : public QStack&lt;Iterator *&gt;</div><div class='ctx'> {</div><div class='ctx'> public:</div><div class='del'>-    ~QDirIteratorPrivateIteratorStack();</div><div class='add'>+    ~QDirIteratorPrivateIteratorStack()</div><div class='add'>+    {</div><div class='add'>+        qDeleteAll(*this);</div><div class='add'>+    }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-QDirIteratorPrivateIteratorStack::~QDirIteratorPrivateIteratorStack()</div><div class='del'>-{</div><div class='del'>-    qDeleteAll(*this);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> class QDirIteratorPrivate</div><div class='ctx'> {</div><div class='ctx'> public:</div><div class='del'>-    QDirIteratorPrivate(const QString &amp;path, const QStringList &amp;nameFilters,</div><div class='del'>-                        QDir::Filters filters, QDirIterator::IteratorFlags flags);</div><div class='del'>-    ~QDirIteratorPrivate();</div><div class='add'>+    QDirIteratorPrivate(const QFileSystemEntry &amp;entry, const QStringList &amp;nameFilters,</div><div class='add'>+                        QDir::Filters filters, QDirIterator::IteratorFlags flags, bool resolveEngine = true);</div><div class='ctx'> </div><div class='ctx'>     void advance();</div><div class='ctx'> </div><div class='add'>+    bool entryMatches(const QString &amp; fileName, const QFileInfo &amp;fileInfo);</div><div class='ctx'>     void pushDirectory(const QFileInfo &amp;fileInfo);</div><div class='ctx'>     void checkAndPushDirectory(const QFileInfo &amp;);</div><div class='ctx'>     bool matchesFilters(const QString &amp;fileName, const QFileInfo &amp;fi) const;</div><div class='ctx'> </div><div class='ctx'>     QScopedPointer&lt;QAbstractFileEngine&gt; engine;</div><div class='ctx'> </div><div class='del'>-    const QString path;</div><div class='add'>+    QFileSystemEntry dirEntry;</div><div class='ctx'>     const QStringList nameFilters;</div><div class='ctx'>     const QDir::Filters filters;</div><div class='ctx'>     const QDirIterator::IteratorFlags iteratorFlags;</div><div class='hunk'>@@ -135,23 +141,24 @@ public:</div><div class='ctx'>     QVector&lt;QRegExp&gt; nameRegExps;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-    QDirIteratorPrivateIteratorStack fileEngineIterators;</div><div class='add'>+    QDirIteratorPrivateIteratorStack&lt;QAbstractFileEngineIterator&gt; fileEngineIterators;</div><div class='add'>+#ifndef QT_NO_FILESYSTEMITERATOR</div><div class='add'>+    QDirIteratorPrivateIteratorStack&lt;QFileSystemIterator&gt; nativeIterators;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'>     QFileInfo currentFileInfo;</div><div class='ctx'>     QFileInfo nextFileInfo;</div><div class='ctx'> </div><div class='ctx'>     // Loop protection</div><div class='ctx'>     QSet&lt;QString&gt; visitedLinks;</div><div class='del'>-</div><div class='del'>-    QDirIterator *q;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     \internal</div><div class='ctx'> */</div><div class='del'>-QDirIteratorPrivate::QDirIteratorPrivate(const QString &amp;path, const QStringList &amp;nameFilters,</div><div class='del'>-                                         QDir::Filters filters, QDirIterator::IteratorFlags flags)</div><div class='del'>-    : engine(QAbstractFileEngine::create(path))</div><div class='del'>-      , path(path)</div><div class='add'>+QDirIteratorPrivate::QDirIteratorPrivate(const QFileSystemEntry &amp;entry, const QStringList &amp;nameFilters,</div><div class='add'>+                                         QDir::Filters filters, QDirIterator::IteratorFlags flags, bool resolveEngine)</div><div class='add'>+    : dirEntry(entry)</div><div class='ctx'>       , nameFilters(nameFilters.contains(QLatin1String("*")) ? QStringList() : nameFilters)</div><div class='ctx'>       , filters(QDir::NoFilter == filters ? QDir::AllEntries : filters)</div><div class='ctx'>       , iteratorFlags(flags)</div><div class='hunk'>@@ -164,22 +171,19 @@ QDirIteratorPrivate::QDirIteratorPrivate(const QString &amp;path, const QStringList</div><div class='ctx'>                     (filters &amp; QDir::CaseSensitive) ? Qt::CaseSensitive : Qt::CaseInsensitive,</div><div class='ctx'>                     QRegExp::Wildcard));</div><div class='ctx'> #endif</div><div class='add'>+    QFileSystemMetaData metaData;</div><div class='add'>+    if (resolveEngine)</div><div class='add'>+        engine.reset(QFileSystemEngine::resolveEntryAndCreateLegacyEngine(dirEntry, metaData));</div><div class='add'>+    QFileInfo fileInfo(new QFileInfoPrivate(dirEntry, metaData));</div><div class='ctx'> </div><div class='ctx'>     // Populate fields for hasNext() and next()</div><div class='del'>-    pushDirectory(QFileInfo(path));</div><div class='add'>+    pushDirectory(fileInfo);</div><div class='ctx'>     advance();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     \internal</div><div class='ctx'> */</div><div class='del'>-QDirIteratorPrivate::~QDirIteratorPrivate()</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-    \internal</div><div class='del'>-*/</div><div class='ctx'> void QDirIteratorPrivate::pushDirectory(const QFileInfo &amp;fileInfo)</div><div class='ctx'> {</div><div class='ctx'>     QString path = fileInfo.filePath();</div><div class='hunk'>@@ -201,34 +205,67 @@ void QDirIteratorPrivate::pushDirectory(const QFileInfo &amp;fileInfo)</div><div class='ctx'>         } else {</div><div class='ctx'>             // No iterator; no entry list.</div><div class='ctx'>         }</div><div class='add'>+    } else {</div><div class='add'>+#ifndef QT_NO_FILESYSTEMITERATOR</div><div class='add'>+        QFileSystemIterator *it = new QFileSystemIterator(fileInfo.d_ptr-&gt;fileEntry,</div><div class='add'>+            filters, nameFilters, iteratorFlags);</div><div class='add'>+        nativeIterators &lt;&lt; it;</div><div class='add'>+#endif</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*!</div><div class='del'>-    \internal</div><div class='del'>-*/</div><div class='del'>-void QDirIteratorPrivate::advance()</div><div class='add'>+inline bool QDirIteratorPrivate::entryMatches(const QString &amp; fileName, const QFileInfo &amp;fileInfo)</div><div class='ctx'> {</div><div class='del'>-    while (!fileEngineIterators.isEmpty()) {</div><div class='add'>+    checkAndPushDirectory(fileInfo);</div><div class='ctx'> </div><div class='del'>-        // Find the next valid iterator that matches the filters.</div><div class='del'>-        while (fileEngineIterators.top()-&gt;hasNext()) {</div><div class='del'>-            QAbstractFileEngineIterator *it = fileEngineIterators.top();</div><div class='del'>-            it-&gt;next();</div><div class='add'>+    if (matchesFilters(fileName, fileInfo)) {</div><div class='add'>+        currentFileInfo = nextFileInfo;</div><div class='add'>+        nextFileInfo = fileInfo;</div><div class='ctx'> </div><div class='del'>-            const QFileInfo info = it-&gt;currentFileInfo();</div><div class='del'>-            checkAndPushDirectory(it-&gt;currentFileInfo());</div><div class='add'>+        //We found a matching entry.</div><div class='add'>+        return true;</div><div class='add'>+    }</div><div class='ctx'> </div><div class='del'>-            if (matchesFilters(it-&gt;currentFileName(), info)) {</div><div class='del'>-                currentFileInfo = nextFileInfo;</div><div class='del'>-                nextFileInfo = info;</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-                //We found a matching entry.</div><div class='del'>-                return;</div><div class='add'>+/*!</div><div class='add'>+    \internal</div><div class='add'>+*/</div><div class='add'>+void QDirIteratorPrivate::advance()</div><div class='add'>+{</div><div class='add'>+    if (engine) {</div><div class='add'>+        while (!fileEngineIterators.isEmpty()) {</div><div class='add'>+            // Find the next valid iterator that matches the filters.</div><div class='add'>+            QAbstractFileEngineIterator *it;</div><div class='add'>+            while (it = fileEngineIterators.top(), it-&gt;hasNext()) {</div><div class='add'>+                it-&gt;next();</div><div class='add'>+                if (entryMatches(it-&gt;currentFileName(), it-&gt;currentFileInfo()))</div><div class='add'>+                    return;</div><div class='ctx'>             }</div><div class='add'>+</div><div class='add'>+            fileEngineIterators.pop();</div><div class='add'>+            delete it;</div><div class='ctx'>         }</div><div class='add'>+    } else {</div><div class='add'>+#ifndef QT_NO_FILESYSTEMITERATOR</div><div class='add'>+        QFileSystemEntry nextEntry;</div><div class='add'>+        QFileSystemMetaData nextMetaData;</div><div class='add'>+</div><div class='add'>+        while (!nativeIterators.isEmpty()) {</div><div class='add'>+            // Find the next valid iterator that matches the filters.</div><div class='add'>+            QFileSystemIterator *it;</div><div class='add'>+            while (it = nativeIterators.top(), it-&gt;advance(nextEntry, nextMetaData)) {</div><div class='add'>+                QFileInfo info(new QFileInfoPrivate(nextEntry, nextMetaData));</div><div class='add'>+</div><div class='add'>+                if (entryMatches(nextEntry.fileName(), info))</div><div class='add'>+                    return;</div><div class='add'>+            }</div><div class='ctx'> </div><div class='del'>-        delete fileEngineIterators.pop();</div><div class='add'>+            nativeIterators.pop();</div><div class='add'>+            delete it;</div><div class='add'>+        }</div><div class='add'>+#endif</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     currentFileInfo = nextFileInfo;</div><div class='hunk'>@@ -262,7 +299,8 @@ void QDirIteratorPrivate::checkAndPushDirectory(const QFileInfo &amp;fileInfo)</div><div class='ctx'>         return;</div><div class='ctx'> </div><div class='ctx'>     // Stop link loops</div><div class='del'>-    if (visitedLinks.contains(fileInfo.canonicalFilePath()))</div><div class='add'>+    if (!visitedLinks.isEmpty() &amp;&amp;</div><div class='add'>+        visitedLinks.contains(fileInfo.canonicalFilePath()))</div><div class='ctx'>         return;</div><div class='ctx'> </div><div class='ctx'>     pushDirectory(fileInfo);</div><div class='hunk'>@@ -375,9 +413,11 @@ bool QDirIteratorPrivate::matchesFilters(const QString &amp;fileName, const QFileInf</div><div class='ctx'>     \sa hasNext(), next(), IteratorFlags</div><div class='ctx'> */</div><div class='ctx'> QDirIterator::QDirIterator(const QDir &amp;dir, IteratorFlags flags)</div><div class='del'>-    : d(new QDirIteratorPrivate(dir.path(), dir.nameFilters(), dir.filter(), flags))</div><div class='ctx'> {</div><div class='del'>-    d-&gt;q = this;</div><div class='add'>+    // little trick to get hold of the QDirPrivate while there is no API on QDir to give it to us</div><div class='add'>+    class MyQDir : public QDir { public: const QDirPrivate *priv() const { return d_ptr.constData(); } };</div><div class='add'>+    const QDirPrivate *other = static_cast&lt;const MyQDir*&gt;(&amp;dir)-&gt;priv();</div><div class='add'>+    d.reset(new QDirIteratorPrivate(other-&gt;dirEntry, other-&gt;nameFilters, other-&gt;filters, flags, !other-&gt;fileEngine.isNull()));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -394,9 +434,8 @@ QDirIterator::QDirIterator(const QDir &amp;dir, IteratorFlags flags)</div><div class='ctx'>     \sa hasNext(), next(), IteratorFlags</div><div class='ctx'> */</div><div class='ctx'> QDirIterator::QDirIterator(const QString &amp;path, QDir::Filters filters, IteratorFlags flags)</div><div class='del'>-    : d(new QDirIteratorPrivate(path, QStringList(), filters, flags))</div><div class='add'>+    : d(new QDirIteratorPrivate(QFileSystemEntry(path), QStringList(), filters, flags))</div><div class='ctx'> {</div><div class='del'>-    d-&gt;q = this;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -412,9 +451,8 @@ QDirIterator::QDirIterator(const QString &amp;path, QDir::Filters filters, IteratorF</div><div class='ctx'>     \sa hasNext(), next(), IteratorFlags</div><div class='ctx'> */</div><div class='ctx'> QDirIterator::QDirIterator(const QString &amp;path, IteratorFlags flags)</div><div class='del'>-    : d(new QDirIteratorPrivate(path, QStringList(), QDir::NoFilter, flags))</div><div class='add'>+    : d(new QDirIteratorPrivate(QFileSystemEntry(path), QStringList(), QDir::NoFilter, flags))</div><div class='ctx'> {</div><div class='del'>-    d-&gt;q = this;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -432,9 +470,8 @@ QDirIterator::QDirIterator(const QString &amp;path, IteratorFlags flags)</div><div class='ctx'> */</div><div class='ctx'> QDirIterator::QDirIterator(const QString &amp;path, const QStringList &amp;nameFilters,</div><div class='ctx'>                            QDir::Filters filters, IteratorFlags flags)</div><div class='del'>-    : d(new QDirIteratorPrivate(path, nameFilters, filters, flags))</div><div class='add'>+    : d(new QDirIteratorPrivate(QFileSystemEntry(path), nameFilters, filters, flags))</div><div class='ctx'> {</div><div class='del'>-    d-&gt;q = this;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -468,7 +505,14 @@ QString QDirIterator::next()</div><div class='ctx'> */</div><div class='ctx'> bool QDirIterator::hasNext() const</div><div class='ctx'> {</div><div class='del'>-    return !d-&gt;fileEngineIterators.isEmpty();</div><div class='add'>+    if (d-&gt;engine)</div><div class='add'>+        return !d-&gt;fileEngineIterators.isEmpty();</div><div class='add'>+    else</div><div class='add'>+#ifndef QT_NO_FILESYSTEMITERATOR</div><div class='add'>+        return !d-&gt;nativeIterators.isEmpty();</div><div class='add'>+#else</div><div class='add'>+        return false;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -511,7 +555,7 @@ QFileInfo QDirIterator::fileInfo() const</div><div class='ctx'> */</div><div class='ctx'> QString QDirIterator::path() const</div><div class='ctx'> {</div><div class='del'>-    return d-&gt;path;</div><div class='add'>+    return d-&gt;dirEntry.filePath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp<br/>index e79856d..9d6641c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfile.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfile.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfile.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfile.cpp</a></div><div class='hunk'>@@ -48,6 +48,7 @@</div><div class='ctx'> #include "qfileinfo.h"</div><div class='ctx'> #include "private/qiodevice_p.h"</div><div class='ctx'> #include "private/qfile_p.h"</div><div class='add'>+#include "private/qsystemerror_p.h"</div><div class='ctx'> #if defined(QT_BUILD_CORE_LIB)</div><div class='ctx'> # include "qcoreapplication.h"</div><div class='ctx'> #endif</div><div class='hunk'>@@ -102,7 +103,7 @@ QFilePrivate::~QFilePrivate()</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool</div><div class='del'>-QFilePrivate::openExternalFile(int flags, int fd)</div><div class='add'>+QFilePrivate::openExternalFile(int flags, int fd, QFile::FileHandleFlags handleFlags)</div><div class='ctx'> {</div><div class='ctx'> #ifdef QT_NO_FSFILEENGINE</div><div class='ctx'>     Q_UNUSED(flags);</div><div class='hunk'>@@ -112,14 +113,13 @@ QFilePrivate::openExternalFile(int flags, int fd)</div><div class='ctx'>     delete fileEngine;</div><div class='ctx'>     fileEngine = 0;</div><div class='ctx'>     QFSFileEngine *fe = new QFSFileEngine;</div><div class='del'>-    fe-&gt;setFileName(fileName);</div><div class='ctx'>     fileEngine = fe;</div><div class='del'>-    return fe-&gt;open(QIODevice::OpenMode(flags), fd);</div><div class='add'>+    return fe-&gt;open(QIODevice::OpenMode(flags), fd, handleFlags);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool</div><div class='del'>-QFilePrivate::openExternalFile(int flags, FILE *fh)</div><div class='add'>+QFilePrivate::openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handleFlags)</div><div class='ctx'> {</div><div class='ctx'> #ifdef QT_NO_FSFILEENGINE</div><div class='ctx'>     Q_UNUSED(flags);</div><div class='hunk'>@@ -129,12 +129,28 @@ QFilePrivate::openExternalFile(int flags, FILE *fh)</div><div class='ctx'>     delete fileEngine;</div><div class='ctx'>     fileEngine = 0;</div><div class='ctx'>     QFSFileEngine *fe = new QFSFileEngine;</div><div class='del'>-    fe-&gt;setFileName(fileName);</div><div class='ctx'>     fileEngine = fe;</div><div class='del'>-    return fe-&gt;open(QIODevice::OpenMode(flags), fh);</div><div class='add'>+    return fe-&gt;open(QIODevice::OpenMode(flags), fh, handleFlags);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+bool QFilePrivate::openExternalFile(int flags, const RFile &amp;f, QFile::FileHandleFlags handleFlags)</div><div class='add'>+{</div><div class='add'>+#ifdef QT_NO_FSFILEENGINE</div><div class='add'>+    Q_UNUSED(flags);</div><div class='add'>+    Q_UNUSED(fh);</div><div class='add'>+    return false;</div><div class='add'>+#else</div><div class='add'>+    delete fileEngine;</div><div class='add'>+    fileEngine = 0;</div><div class='add'>+    QFSFileEngine *fe = new QFSFileEngine;</div><div class='add'>+    fileEngine = fe;</div><div class='add'>+    return fe-&gt;open(QIODevice::OpenMode(flags), f, handleFlags);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> inline bool QFilePrivate::ensureFlushed() const</div><div class='ctx'> {</div><div class='ctx'>     // This function ensures that the write buffer has been flushed (const</div><div class='hunk'>@@ -340,6 +356,20 @@ QFilePrivate::setError(QFile::FileError err, int errNum)</div><div class='ctx'>     \snippet doc/src/snippets/ntfsp.cpp 1</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+/*!</div><div class='add'>+    \enum QFile::FileHandleFlag</div><div class='add'>+</div><div class='add'>+    This enum is used when opening a file to specify additional</div><div class='add'>+    options which only apply to files and not to a generic</div><div class='add'>+    QIODevice.</div><div class='add'>+</div><div class='add'>+    \value AutoCloseHandle The file handle passed into open() should be</div><div class='add'>+    closed by close(), the default behaviour is that close just flushes</div><div class='add'>+    the file and the app is responsible for closing the file handle. When</div><div class='add'>+    opening a file by name, this flag is ignored as Qt always "owns" the</div><div class='add'>+    file handle and must close it.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> #ifdef QT3_SUPPORT</div><div class='ctx'> /*!</div><div class='ctx'>     \typedef QFile::PermissionSpec</div><div class='hunk'>@@ -992,8 +1022,14 @@ bool QFile::open(OpenMode mode)</div><div class='ctx'>         return false;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+    // For symbian, the unbuffered flag is used to control write-behind cache behaviour</div><div class='add'>+    if (fileEngine()-&gt;open(mode))</div><div class='add'>+#else</div><div class='ctx'>     // QIODevice provides the buffering, so there's no need to request it from the file engine.</div><div class='del'>-    if (fileEngine()-&gt;open(mode | QIODevice::Unbuffered)) {</div><div class='add'>+    if (fileEngine()-&gt;open(mode | QIODevice::Unbuffered))</div><div class='add'>+#endif</div><div class='add'>+    {</div><div class='ctx'>         QIODevice::open(mode);</div><div class='ctx'>         if (mode &amp; Append)</div><div class='ctx'>             seek(size());</div><div class='hunk'>@@ -1051,8 +1087,57 @@ bool QFile::open(OpenMode mode)</div><div class='ctx'> </div><div class='ctx'>     \snippet doc/src/snippets/code/src_corelib_io_qfile.cpp 4</div><div class='ctx'> */</div><div class='add'>+// ### Qt5: merge this into new overload with a default parameter</div><div class='ctx'> bool QFile::open(FILE *fh, OpenMode mode)</div><div class='ctx'> {</div><div class='add'>+    return open(fh, mode, DontCloseHandle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \overload</div><div class='add'>+</div><div class='add'>+    Opens the existing file handle \a fh in the given \a mode.</div><div class='add'>+    Returns true if successful; otherwise returns false.</div><div class='add'>+</div><div class='add'>+    Example:</div><div class='add'>+    \snippet doc/src/snippets/code/src_corelib_io_qfile.cpp 3</div><div class='add'>+</div><div class='add'>+    When a QFile is opened using this function, behaviour of close() is</div><div class='add'>+    controlled by the AutoCloseHandle flag.</div><div class='add'>+    If AutoCloseHandle is specified, and this function succeeds,</div><div class='add'>+    then calling close() closes the adopted handle.</div><div class='add'>+    Otherwise, close() does not actually close the file, but only flushes it.</div><div class='add'>+</div><div class='add'>+    \bold{Warning:}</div><div class='add'>+    \list 1</div><div class='add'>+        \o If \a fh does not refer to a regular file, e.g., it is \c stdin,</div><div class='add'>+           \c stdout, or \c stderr, you may not be able to seek(). size()</div><div class='add'>+           returns \c 0 in those cases. See QIODevice::isSequential() for</div><div class='add'>+           more information.</div><div class='add'>+        \o Since this function opens the file without specifying the file name,</div><div class='add'>+           you cannot use this QFile with a QFileInfo.</div><div class='add'>+    \endlist</div><div class='add'>+</div><div class='add'>+    \note For Windows CE you may not be able to call resize().</div><div class='add'>+</div><div class='add'>+    \sa close(), {qmake Variable Reference#CONFIG}{qmake Variable Reference}</div><div class='add'>+</div><div class='add'>+    \bold{Note for the Windows Platform}</div><div class='add'>+</div><div class='add'>+    \a fh must be opened in binary mode (i.e., the mode string must contain</div><div class='add'>+    'b', as in "rb" or "wb") when accessing files and other random-access</div><div class='add'>+    devices. Qt will translate the end-of-line characters if you pass</div><div class='add'>+    QIODevice::Text to \a mode. Sequential devices, such as stdin and stdout,</div><div class='add'>+    are unaffected by this limitation.</div><div class='add'>+</div><div class='add'>+    You need to enable support for console applications in order to use the</div><div class='add'>+    stdin, stdout and stderr streams at the console. To do this, add the</div><div class='add'>+    following declaration to your application's project file:</div><div class='add'>+</div><div class='add'>+    \snippet doc/src/snippets/code/src_corelib_io_qfile.cpp 4</div><div class='add'>+*/</div><div class='add'>+bool QFile::open(FILE *fh, OpenMode mode, FileHandleFlags handleFlags)</div><div class='add'>+{</div><div class='ctx'>     Q_D(QFile);</div><div class='ctx'>     if (isOpen()) {</div><div class='ctx'>         qWarning("QFile::open: File (%s) already open", qPrintable(fileName()));</div><div class='hunk'>@@ -1065,7 +1150,7 @@ bool QFile::open(FILE *fh, OpenMode mode)</div><div class='ctx'>         qWarning("QFile::open: File access not specified");</div><div class='ctx'>         return false;</div><div class='ctx'>     }</div><div class='del'>-    if(d-&gt;openExternalFile(mode, fh)) {</div><div class='add'>+    if (d-&gt;openExternalFile(mode, fh, handleFlags)) {</div><div class='ctx'>         QIODevice::open(mode);</div><div class='ctx'>         if (mode &amp; Append) {</div><div class='ctx'>             seek(size());</div><div class='hunk'>@@ -1111,8 +1196,44 @@ bool QFile::open(FILE *fh, OpenMode mode)</div><div class='ctx'> </div><div class='ctx'>     \sa close()</div><div class='ctx'> */</div><div class='add'>+// ### Qt5: merge this into new overload with a default parameter</div><div class='ctx'> bool QFile::open(int fd, OpenMode mode)</div><div class='ctx'> {</div><div class='add'>+    return open(fd, mode, DontCloseHandle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \overload</div><div class='add'>+</div><div class='add'>+    Opens the existing file descriptor \a fd in the given \a mode.</div><div class='add'>+    Returns true if successful; otherwise returns false.</div><div class='add'>+</div><div class='add'>+    When a QFile is opened using this function, behaviour of close() is</div><div class='add'>+    controlled by the AutoCloseHandle flag.</div><div class='add'>+    If AutoCloseHandle is specified, and this function succeeds,</div><div class='add'>+    then calling close() closes the adopted handle.</div><div class='add'>+    Otherwise, close() does not actually close the file, but only flushes it.</div><div class='add'>+</div><div class='add'>+    The QFile that is opened using this function is automatically set</div><div class='add'>+    to be in raw mode; this means that the file input/output functions</div><div class='add'>+    are slow. If you run into performance issues, you should try to</div><div class='add'>+    use one of the other open functions.</div><div class='add'>+</div><div class='add'>+    \warning If \a fd is not a regular file, e.g, it is 0 (\c stdin),</div><div class='add'>+    1 (\c stdout), or 2 (\c stderr), you may not be able to seek(). In</div><div class='add'>+    those cases, size() returns \c 0.  See QIODevice::isSequential()</div><div class='add'>+    for more information.</div><div class='add'>+</div><div class='add'>+    \warning For Windows CE you may not be able to call seek(), setSize(),</div><div class='add'>+    fileTime(). size() returns \c 0.</div><div class='add'>+</div><div class='add'>+    \warning Since this function opens the file without specifying the file name,</div><div class='add'>+             you cannot use this QFile with a QFileInfo.</div><div class='add'>+</div><div class='add'>+    \sa close()</div><div class='add'>+*/</div><div class='add'>+bool QFile::open(int fd, OpenMode mode, FileHandleFlags handleFlags)</div><div class='add'>+{</div><div class='ctx'>     Q_D(QFile);</div><div class='ctx'>     if (isOpen()) {</div><div class='ctx'>         qWarning("QFile::open: File (%s) already open", qPrintable(fileName()));</div><div class='hunk'>@@ -1125,7 +1246,7 @@ bool QFile::open(int fd, OpenMode mode)</div><div class='ctx'>         qWarning("QFile::open: File access not specified");</div><div class='ctx'>         return false;</div><div class='ctx'>     }</div><div class='del'>-    if(d-&gt;openExternalFile(mode, fd)) {</div><div class='add'>+    if (d-&gt;openExternalFile(mode, fd, handleFlags)) {</div><div class='ctx'>         QIODevice::open(mode);</div><div class='ctx'>         if (mode &amp; Append) {</div><div class='ctx'>             seek(size());</div><div class='hunk'>@@ -1139,6 +1260,63 @@ bool QFile::open(int fd, OpenMode mode)</div><div class='ctx'>     return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+/*!</div><div class='add'>+    \overload</div><div class='add'>+</div><div class='add'>+    Opens the existing file object \a f in the given \a mode.</div><div class='add'>+    Returns true if successful; otherwise returns false.</div><div class='add'>+</div><div class='add'>+    When a QFile is opened using this function, behaviour of close() is</div><div class='add'>+    controlled by the AutoCloseHandle flag.</div><div class='add'>+    If AutoCloseHandle is specified, and this function succeeds,</div><div class='add'>+    then calling close() closes the adopted handle.</div><div class='add'>+    Otherwise, close() does not actually close the file, but only flushes it.</div><div class='add'>+</div><div class='add'>+    \warning If the file handle is adopted from another process,</div><div class='add'>+             you may not be able to use this QFile with a QFileInfo.</div><div class='add'>+</div><div class='add'>+    \sa close()</div><div class='add'>+*/</div><div class='add'>+bool QFile::open(const RFile &amp;f, OpenMode mode, FileHandleFlags handleFlags)</div><div class='add'>+{</div><div class='add'>+    Q_D(QFile);</div><div class='add'>+    if (isOpen()) {</div><div class='add'>+        qWarning("QFile::open: File (%s) already open", qPrintable(fileName()));</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+    if (mode &amp; Append)</div><div class='add'>+        mode |= WriteOnly;</div><div class='add'>+    unsetError();</div><div class='add'>+    if ((mode &amp; (ReadOnly | WriteOnly)) == 0) {</div><div class='add'>+        qWarning("QFile::open: File access not specified");</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+    if (d-&gt;openExternalFile(mode, f, handleFlags)) {</div><div class='add'>+        bool ok = QIODevice::open(mode);</div><div class='add'>+        if (ok) {</div><div class='add'>+            if (mode &amp; Append) {</div><div class='add'>+                ok = seek(size());</div><div class='add'>+            } else {</div><div class='add'>+                qint64 pos = 0;</div><div class='add'>+                TInt err;</div><div class='add'>+#ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API</div><div class='add'>+                err = static_cast&lt;const RFile64&amp;&gt;(f).Seek(ESeekCurrent, pos);</div><div class='add'>+#else</div><div class='add'>+                TInt pos32 = 0;</div><div class='add'>+                err = f.Seek(ESeekCurrent, pos32);</div><div class='add'>+                pos = pos32;</div><div class='add'>+#endif</div><div class='add'>+                ok = ok &amp;&amp; (err == KErrNone);</div><div class='add'>+                ok = ok &amp;&amp; seek(pos);</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        return ok;</div><div class='add'>+    }</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*!</div><div class='ctx'>   Returns the file handle of the file.</div><div class='ctx'> </div><div class='hunk'>@@ -1223,6 +1401,7 @@ bool QFile::unmap(uchar *address)</div><div class='ctx'>             d-&gt;setError(d-&gt;fileEngine-&gt;error(), d-&gt;fileEngine-&gt;errorString());</div><div class='ctx'>         return success;</div><div class='ctx'>     }</div><div class='add'>+    d-&gt;setError(PermissionsError, tr("No file engine available or engine does not support UnMapExtension"));</div><div class='ctx'>     return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1477,7 +1656,17 @@ bool QFile::atEnd() const</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='del'>-  \reimp</div><div class='add'>+    For random-access devices, this function sets the current position</div><div class='add'>+    to \a pos, returning true on success, or false if an error occurred.</div><div class='add'>+    For sequential devices, the default behavior is to do nothing and</div><div class='add'>+    return false.</div><div class='add'>+</div><div class='add'>+    Seeking beyond the end of a file:</div><div class='add'>+    If the position is beyond the end of a file, then seek() shall not</div><div class='add'>+    immediately extend the file. If a write is performed at this position,</div><div class='add'>+    then the file shall be extended. The content of the file between the</div><div class='add'>+    previous end of file and the newly written data is UNDEFINED and</div><div class='add'>+    varies between platforms and file systems.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> bool QFile::seek(qint64 off)</div><div class='head'>diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h<br/>index 7613071..e4a7485 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfile.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfile.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfile.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfile.h</a></div><div class='hunk'>@@ -45,6 +45,9 @@</div><div class='ctx'> #include &lt;QtCore/qiodevice.h&gt;</div><div class='ctx'> #include &lt;QtCore/qstring.h&gt;</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+#include &lt;f32file.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef open</div><div class='ctx'> #error qfile.h must be included before any header file that defines open</div><div class='hunk'>@@ -97,6 +100,12 @@ public:</div><div class='ctx'>     };</div><div class='ctx'>     Q_DECLARE_FLAGS(Permissions, Permission)</div><div class='ctx'> </div><div class='add'>+    enum FileHandleFlag {</div><div class='add'>+        AutoCloseHandle = 0x0001,</div><div class='add'>+        DontCloseHandle = 0</div><div class='add'>+    };</div><div class='add'>+    Q_DECLARE_FLAGS(FileHandleFlags, FileHandleFlag)</div><div class='add'>+</div><div class='ctx'>     QFile();</div><div class='ctx'>     QFile(const QString &amp;name);</div><div class='ctx'> #ifndef QT_NO_QOBJECT</div><div class='hunk'>@@ -145,6 +154,11 @@ public:</div><div class='ctx'>     bool open(OpenMode flags);</div><div class='ctx'>     bool open(FILE *f, OpenMode flags);</div><div class='ctx'>     bool open(int fd, OpenMode flags);</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+    bool open(const RFile &amp;f, OpenMode flags, FileHandleFlags handleFlags = DontCloseHandle);</div><div class='add'>+#endif</div><div class='add'>+    bool open(FILE *f, OpenMode ioFlags, FileHandleFlags handleFlags);</div><div class='add'>+    bool open(int fd, OpenMode ioFlags, FileHandleFlags handleFlags);</div><div class='ctx'>     virtual void close();</div><div class='ctx'> </div><div class='ctx'>     qint64 size() const;</div><div class='head'>diff --git a/src/corelib/io/qfile_p.h b/src/corelib/io/qfile_p.h<br/>index 15d1a8f..3072f5b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfile_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfile_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfile_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfile_p.h</a></div><div class='hunk'>@@ -67,8 +67,11 @@ protected:</div><div class='ctx'>     QFilePrivate();</div><div class='ctx'>     ~QFilePrivate();</div><div class='ctx'> </div><div class='del'>-    bool openExternalFile(int flags, int fd);</div><div class='del'>-    bool openExternalFile(int flags, FILE *fh);</div><div class='add'>+    bool openExternalFile(int flags, int fd, QFile::FileHandleFlags handleFlags);</div><div class='add'>+    bool openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handleFlags);</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+    bool openExternalFile(int flags, const RFile&amp; f, QFile::FileHandleFlags handleFlags);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'>     QString fileName;</div><div class='ctx'>     mutable QAbstractFileEngine *fileEngine;</div><div class='head'>diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp<br/>index ddd9c07..ca42c87 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfileinfo.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfileinfo.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfileinfo.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfileinfo.cpp</a></div><div class='hunk'>@@ -51,7 +51,47 @@ QString QFileInfoPrivate::getFileName(QAbstractFileEngine::FileName name) const</div><div class='ctx'> {</div><div class='ctx'>     if (cache_enabled &amp;&amp; !fileNames[(int)name].isNull())</div><div class='ctx'>         return fileNames[(int)name];</div><div class='del'>-    QString ret = fileEngine-&gt;fileName(name);</div><div class='add'>+</div><div class='add'>+    QString ret;</div><div class='add'>+    if (fileEngine == 0) { // local file; use the QFileSystemEngine directly</div><div class='add'>+        switch (name) {</div><div class='add'>+            case QAbstractFileEngine::CanonicalName:</div><div class='add'>+            case QAbstractFileEngine::CanonicalPathName: {</div><div class='add'>+                QFileSystemEntry entry = QFileSystemEngine::canonicalName(fileEntry, metaData);</div><div class='add'>+                if (cache_enabled) { // be smart and store both</div><div class='add'>+                    fileNames[QAbstractFileEngine::CanonicalName] = entry.filePath();</div><div class='add'>+                    fileNames[QAbstractFileEngine::CanonicalPathName] = entry.path();</div><div class='add'>+                }</div><div class='add'>+                if (name == QAbstractFileEngine::CanonicalName)</div><div class='add'>+                    ret = entry.filePath();</div><div class='add'>+                else</div><div class='add'>+                    ret = entry.path();</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+            case QAbstractFileEngine::LinkName:</div><div class='add'>+                ret = QFileSystemEngine::getLinkTarget(fileEntry, metaData).filePath();</div><div class='add'>+                break;</div><div class='add'>+            case QAbstractFileEngine::BundleName:</div><div class='add'>+                ret = QFileSystemEngine::bundleName(fileEntry);</div><div class='add'>+                break;</div><div class='add'>+            case QAbstractFileEngine::AbsoluteName:</div><div class='add'>+            case QAbstractFileEngine::AbsolutePathName: {</div><div class='add'>+                QFileSystemEntry entry = QFileSystemEngine::absoluteName(fileEntry);</div><div class='add'>+                if (cache_enabled) { // be smart and store both</div><div class='add'>+                    fileNames[QAbstractFileEngine::AbsoluteName] = entry.filePath();</div><div class='add'>+                    fileNames[QAbstractFileEngine::AbsolutePathName] = entry.path();</div><div class='add'>+                }</div><div class='add'>+                if (name == QAbstractFileEngine::AbsoluteName)</div><div class='add'>+                    ret = entry.filePath();</div><div class='add'>+                else</div><div class='add'>+                    ret = entry.path();</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+            default: break;</div><div class='add'>+        }</div><div class='add'>+    } else {</div><div class='add'>+        ret = fileEngine-&gt;fileName(name);</div><div class='add'>+    }</div><div class='ctx'>     if (ret.isNull())</div><div class='ctx'>         ret = QLatin1String("");</div><div class='ctx'>     if (cache_enabled)</div><div class='hunk'>@@ -63,7 +103,19 @@ QString QFileInfoPrivate::getFileOwner(QAbstractFileEngine::FileOwner own) const</div><div class='ctx'> {</div><div class='ctx'>     if (cache_enabled &amp;&amp; !fileOwners[(int)own].isNull())</div><div class='ctx'>         return fileOwners[(int)own];</div><div class='del'>-    QString ret = fileEngine-&gt;owner(own);</div><div class='add'>+    QString ret;</div><div class='add'>+    if (fileEngine == 0) {</div><div class='add'>+        switch (own) {</div><div class='add'>+        case QAbstractFileEngine::OwnerUser:</div><div class='add'>+            ret = QFileSystemEngine::resolveUserName(fileEntry, metaData);</div><div class='add'>+            break;</div><div class='add'>+        case QAbstractFileEngine::OwnerGroup:</div><div class='add'>+            ret = QFileSystemEngine::resolveGroupName(fileEntry, metaData);</div><div class='add'>+            break;</div><div class='add'>+        }</div><div class='add'>+     } else {</div><div class='add'>+        ret = fileEngine-&gt;owner(own);</div><div class='add'>+    }</div><div class='ctx'>     if (ret.isNull())</div><div class='ctx'>         ret = QLatin1String("");</div><div class='ctx'>     if (cache_enabled)</div><div class='hunk'>@@ -73,6 +125,7 @@ QString QFileInfoPrivate::getFileOwner(QAbstractFileEngine::FileOwner own) const</div><div class='ctx'> </div><div class='ctx'> uint QFileInfoPrivate::getFileFlags(QAbstractFileEngine::FileFlags request) const</div><div class='ctx'> {</div><div class='add'>+    Q_ASSERT(fileEngine); // should never be called when using the native FS</div><div class='ctx'>     // We split the testing into tests for for LinkType, BundleType, PermsMask</div><div class='ctx'>     // and the rest.</div><div class='ctx'>     // Tests for file permissions on Windows can be slow, expecially on network</div><div class='hunk'>@@ -133,6 +186,7 @@ uint QFileInfoPrivate::getFileFlags(QAbstractFileEngine::FileFlags request) cons</div><div class='ctx'> </div><div class='ctx'> QDateTime &amp;QFileInfoPrivate::getFileTime(QAbstractFileEngine::FileTime request) const</div><div class='ctx'> {</div><div class='add'>+    Q_ASSERT(fileEngine); // should never be called when using the native FS</div><div class='ctx'>     if (!cache_enabled)</div><div class='ctx'>         clearFlags();</div><div class='ctx'>     uint cf;</div><div class='hunk'>@@ -237,6 +291,13 @@ QDateTime &amp;QFileInfoPrivate::getFileTime(QAbstractFileEngine::FileTime request)</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \internal</div><div class='add'>+*/</div><div class='add'>+QFileInfo::QFileInfo(QFileInfoPrivate *p) : d_ptr(p)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='ctx'>     Constructs an empty QFileInfo object.</div><div class='ctx'> </div><div class='ctx'>     Note that an empty QFileInfo object contain no file reference.</div><div class='hunk'>@@ -330,23 +391,22 @@ bool QFileInfo::operator==(const QFileInfo &amp;fileinfo) const</div><div class='ctx'>         return true;</div><div class='ctx'>     if (d-&gt;isDefaultConstructed || fileinfo.d_ptr-&gt;isDefaultConstructed)</div><div class='ctx'>         return false;</div><div class='del'>-    if (d-&gt;fileEngine-&gt;caseSensitive() != fileinfo.d_ptr-&gt;fileEngine-&gt;caseSensitive())</div><div class='del'>-        return false;</div><div class='del'>-    if (fileinfo.size() == size()) { //if the size isn't the same...</div><div class='del'>-        QString file1 = canonicalFilePath(),</div><div class='del'>-                file2 = fileinfo.canonicalFilePath();</div><div class='del'>-        if (file1.length() == file2.length()) {</div><div class='del'>-            if (!fileinfo.d_ptr-&gt;fileEngine-&gt;caseSensitive()) {</div><div class='del'>-                for (int i = 0; i &lt; file1.length(); i++) {</div><div class='del'>-                    if (file1.at(i).toLower() != file2.at(i).toLower())</div><div class='del'>-                        return false;</div><div class='del'>-                }</div><div class='del'>-                return true;</div><div class='del'>-            }</div><div class='del'>-            return (file1 == file2);</div><div class='del'>-        }</div><div class='add'>+    Qt::CaseSensitivity sensitive;</div><div class='add'>+    if (d-&gt;fileEngine == 0 || fileinfo.d_ptr-&gt;fileEngine == 0) {</div><div class='add'>+        if (d-&gt;fileEngine != fileinfo.d_ptr-&gt;fileEngine) // one is native, the other is a custom file-engine</div><div class='add'>+            return false;</div><div class='add'>+</div><div class='add'>+        sensitive = QFileSystemEngine::isCaseSensitive() ? Qt::CaseSensitive : Qt::CaseInsensitive;</div><div class='add'>+    } else {</div><div class='add'>+        if (d-&gt;fileEngine-&gt;caseSensitive() != fileinfo.d_ptr-&gt;fileEngine-&gt;caseSensitive())</div><div class='add'>+            return false;</div><div class='add'>+        sensitive = d-&gt;fileEngine-&gt;caseSensitive() ? Qt::CaseSensitive : Qt::CaseInsensitive;</div><div class='ctx'>     }</div><div class='del'>-    return false;</div><div class='add'>+</div><div class='add'>+    if (fileinfo.size() != size()) //if the size isn't the same...</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+   return canonicalFilePath().compare(fileinfo.canonicalFilePath(), sensitive) == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -502,7 +562,7 @@ QString QFileInfo::absolutePath() const</div><div class='ctx'> </div><div class='ctx'>     if (d-&gt;isDefaultConstructed) {</div><div class='ctx'>         return QLatin1String("");</div><div class='del'>-    } else if (d-&gt;fileName.isEmpty()) {</div><div class='add'>+    } else if (d-&gt;fileEntry.isEmpty()) {</div><div class='ctx'>         qWarning("QFileInfo::absolutePath: Constructed with empty filename");</div><div class='ctx'>         return QLatin1String("");</div><div class='ctx'>     }</div><div class='hunk'>@@ -539,7 +599,7 @@ QString QFileInfo::path() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return QLatin1String("");</div><div class='del'>-    return d-&gt;getFileName(QAbstractFileEngine::PathName);</div><div class='add'>+    return d-&gt;fileEntry.path();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -563,6 +623,8 @@ bool QFileInfo::isRelative() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return true;</div><div class='add'>+    if (d-&gt;fileEngine == 0)</div><div class='add'>+        return d-&gt;fileEntry.isRelative();</div><div class='ctx'>     return d-&gt;fileEngine-&gt;isRelativePath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -576,12 +638,10 @@ bool QFileInfo::isRelative() const</div><div class='ctx'> bool QFileInfo::makeAbsolute()</div><div class='ctx'> {</div><div class='ctx'>     if (d_ptr.constData()-&gt;isDefaultConstructed</div><div class='del'>-            || !d_ptr.constData()-&gt;fileEngine-&gt;isRelativePath())</div><div class='add'>+            || !d_ptr.constData()-&gt;fileEntry.isRelative())</div><div class='ctx'>         return false;</div><div class='del'>-    QString absFileName = d_ptr.constData()-&gt;getFileName(QAbstractFileEngine::AbsoluteName);</div><div class='del'>-    // QSharedDataPointer::operator-&gt;() will detach.</div><div class='ctx'> </div><div class='del'>-    setFile(absFileName);</div><div class='add'>+    setFile(absoluteFilePath());</div><div class='ctx'>     return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -596,6 +656,11 @@ bool QFileInfo::exists() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return false;</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::ExistsAttribute))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::ExistsAttribute);</div><div class='add'>+        return d-&gt;metaData.exists();</div><div class='add'>+    }</div><div class='ctx'>     return d-&gt;getFileFlags(QAbstractFileEngine::ExistsFlag);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -623,7 +688,7 @@ QString QFileInfo::filePath() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return QLatin1String("");</div><div class='del'>-    return d-&gt;getFileName(QAbstractFileEngine::DefaultName);</div><div class='add'>+    return d-&gt;fileEntry.filePath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -642,7 +707,7 @@ QString QFileInfo::fileName() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return QLatin1String("");</div><div class='del'>-    return d-&gt;getFileName(QAbstractFileEngine::BaseName);</div><div class='add'>+    return d-&gt;fileEntry.fileName();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -686,7 +751,7 @@ QString QFileInfo::baseName() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return QLatin1String("");</div><div class='del'>-    return d-&gt;getFileName(QAbstractFileEngine::BaseName).section(QLatin1Char('.'), 0, 0);</div><div class='add'>+    return d-&gt;fileEntry.baseName();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -705,9 +770,7 @@ QString QFileInfo::completeBaseName() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return QLatin1String("");</div><div class='del'>-    QString name = d-&gt;getFileName(QAbstractFileEngine::BaseName);</div><div class='del'>-    int index = name.lastIndexOf(QLatin1Char('.'));</div><div class='del'>-    return (index == -1) ? name : name.left(index);</div><div class='add'>+    return d-&gt;fileEntry.completeBaseName();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -726,11 +789,7 @@ QString QFileInfo::completeSuffix() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return QLatin1String("");</div><div class='del'>-    QString fileName = d-&gt;getFileName(QAbstractFileEngine::BaseName);</div><div class='del'>-    int firstDot = fileName.indexOf(QLatin1Char('.'));</div><div class='del'>-    if (firstDot == -1)</div><div class='del'>-        return QLatin1String("");</div><div class='del'>-    return fileName.mid(firstDot + 1);</div><div class='add'>+    return d-&gt;fileEntry.completeSuffix();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -753,11 +812,7 @@ QString QFileInfo::suffix() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return QLatin1String("");</div><div class='del'>-    QString fileName = d-&gt;getFileName(QAbstractFileEngine::BaseName);</div><div class='del'>-    int lastDot = fileName.lastIndexOf(QLatin1Char('.'));</div><div class='del'>-    if (lastDot == -1)</div><div class='del'>-        return QLatin1String("");</div><div class='del'>-    return fileName.mid(lastDot + 1);</div><div class='add'>+    return d-&gt;fileEntry.suffix();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -781,8 +836,9 @@ QString QFileInfo::suffix() const</div><div class='ctx'> */</div><div class='ctx'> QDir QFileInfo::dir() const</div><div class='ctx'> {</div><div class='add'>+    Q_D(const QFileInfo);</div><div class='ctx'>     // ### Qt5: Maybe rename this to parentDirectory(), considering what it actually do?</div><div class='del'>-    return QDir(path());</div><div class='add'>+    return QDir(d-&gt;fileEntry.path());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -818,6 +874,11 @@ bool QFileInfo::isReadable() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return false;</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::UserReadPermission))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::UserReadPermission);</div><div class='add'>+        return (d-&gt;metaData.permissions() &amp; QFile::ReadUser) != 0;</div><div class='add'>+    }</div><div class='ctx'>     return d-&gt;getFileFlags(QAbstractFileEngine::ReadUserPerm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -831,6 +892,11 @@ bool QFileInfo::isWritable() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return false;</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::UserWritePermission))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::UserWritePermission);</div><div class='add'>+        return (d-&gt;metaData.permissions() &amp; QFile::WriteUser) != 0;</div><div class='add'>+    }</div><div class='ctx'>     return d-&gt;getFileFlags(QAbstractFileEngine::WriteUserPerm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -844,6 +910,11 @@ bool QFileInfo::isExecutable() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return false;</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::UserExecutePermission))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::UserExecutePermission);</div><div class='add'>+        return (d-&gt;metaData.permissions() &amp; QFile::ExeUser) != 0;</div><div class='add'>+    }</div><div class='ctx'>     return d-&gt;getFileFlags(QAbstractFileEngine::ExeUserPerm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -858,6 +929,11 @@ bool QFileInfo::isHidden() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return false;</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::HiddenAttribute))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::HiddenAttribute);</div><div class='add'>+        return d-&gt;metaData.isHidden();</div><div class='add'>+    }</div><div class='ctx'>     return d-&gt;getFileFlags(QAbstractFileEngine::HiddenFlag);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -873,6 +949,11 @@ bool QFileInfo::isFile() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return false;</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::FileType))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::FileType);</div><div class='add'>+        return d-&gt;metaData.isFile();</div><div class='add'>+    }</div><div class='ctx'>     return d-&gt;getFileFlags(QAbstractFileEngine::FileType);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -887,6 +968,11 @@ bool QFileInfo::isDir() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return false;</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::DirectoryType))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::DirectoryType);</div><div class='add'>+        return d-&gt;metaData.isDirectory();</div><div class='add'>+    }</div><div class='ctx'>     return d-&gt;getFileFlags(QAbstractFileEngine::DirectoryType);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -903,6 +989,11 @@ bool QFileInfo::isBundle() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return false;</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::BundleType))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::BundleType);</div><div class='add'>+        return d-&gt;metaData.isBundle();</div><div class='add'>+    }</div><div class='ctx'>     return d-&gt;getFileFlags(QAbstractFileEngine::BundleType);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -928,6 +1019,11 @@ bool QFileInfo::isSymLink() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return false;</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::LegacyLinkType))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::LegacyLinkType);</div><div class='add'>+        return d-&gt;metaData.isLegacyLink();</div><div class='add'>+    }</div><div class='ctx'>     return d-&gt;getFileFlags(QAbstractFileEngine::LinkType);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -941,6 +1037,20 @@ bool QFileInfo::isRoot() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return true;</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (d-&gt;fileEntry.isRoot()) {</div><div class='add'>+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) </div><div class='add'>+            //the path is a drive root, but the drive may not exist</div><div class='add'>+            //for backward compatibility, return true only if the drive exists</div><div class='add'>+            if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::ExistsAttribute))</div><div class='add'>+                QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::ExistsAttribute);</div><div class='add'>+            return d-&gt;metaData.exists();</div><div class='add'>+#else</div><div class='add'>+            return true;</div><div class='add'>+#endif</div><div class='add'>+        }</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='ctx'>     return d-&gt;getFileFlags(QAbstractFileEngine::RootFlag);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1003,6 +1113,11 @@ uint QFileInfo::ownerId() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return 0;</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::UserId))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::UserId);</div><div class='add'>+        return d-&gt;metaData.userId();</div><div class='add'>+    }</div><div class='ctx'>     return d-&gt;fileEngine-&gt;ownerId(QAbstractFileEngine::OwnerUser);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1037,6 +1152,11 @@ uint QFileInfo::groupId() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return 0;</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::GroupId))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::GroupId);</div><div class='add'>+        return d-&gt;metaData.groupId();</div><div class='add'>+    }</div><div class='ctx'>     return d-&gt;fileEngine-&gt;ownerId(QAbstractFileEngine::OwnerGroup);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1058,6 +1178,13 @@ bool QFileInfo::permission(QFile::Permissions permissions) const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return false;</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        // the QFileSystemMetaData::MetaDataFlag and QFile::Permissions overlap, so just static cast.</div><div class='add'>+        QFileSystemMetaData::MetaDataFlag permissionFlags = static_cast&lt;QFileSystemMetaData::MetaDataFlag&gt;((int)permissions);</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(permissionFlags))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, permissionFlags);</div><div class='add'>+        return (d-&gt;metaData.permissions() &amp; permissions) == permissions;</div><div class='add'>+    }</div><div class='ctx'>     return d-&gt;getFileFlags(QAbstractFileEngine::FileFlags((int)permissions)) == (uint)permissions;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1070,6 +1197,11 @@ QFile::Permissions QFileInfo::permissions() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return 0;</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::Permissions))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::Permissions);</div><div class='add'>+        return d-&gt;metaData.permissions();</div><div class='add'>+    }</div><div class='ctx'>     return QFile::Permissions(d-&gt;getFileFlags(QAbstractFileEngine::PermsMask) &amp; QAbstractFileEngine::PermsMask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1085,6 +1217,11 @@ qint64 QFileInfo::size() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return 0;</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::SizeAttribute))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::SizeAttribute);</div><div class='add'>+        return d-&gt;metaData.size();</div><div class='add'>+    }</div><div class='ctx'>     if (!d-&gt;getCachedFlag(QFileInfoPrivate::CachedSize)) {</div><div class='ctx'>         d-&gt;setCachedFlag(QFileInfoPrivate::CachedSize);</div><div class='ctx'>         d-&gt;fileSize = d-&gt;fileEngine-&gt;size();</div><div class='hunk'>@@ -1110,6 +1247,11 @@ QDateTime QFileInfo::created() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return QDateTime();</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::CreationTime))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::CreationTime);</div><div class='add'>+        return d-&gt;metaData.creationTime();</div><div class='add'>+    }</div><div class='ctx'>     return d-&gt;getFileTime(QAbstractFileEngine::CreationTime);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1123,6 +1265,11 @@ QDateTime QFileInfo::lastModified() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return QDateTime();</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::ModificationTime))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::ModificationTime);</div><div class='add'>+        return d-&gt;metaData.modificationTime();</div><div class='add'>+    }</div><div class='ctx'>     return d-&gt;getFileTime(QAbstractFileEngine::ModificationTime);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1139,6 +1286,11 @@ QDateTime QFileInfo::lastRead() const</div><div class='ctx'>     Q_D(const QFileInfo);</div><div class='ctx'>     if (d-&gt;isDefaultConstructed)</div><div class='ctx'>         return QDateTime();</div><div class='add'>+    if (d-&gt;fileEngine == 0) {</div><div class='add'>+        if (!d-&gt;cache_enabled || !d-&gt;metaData.hasFlags(QFileSystemMetaData::AccessTime))</div><div class='add'>+            QFileSystemEngine::fillMetaData(d-&gt;fileEntry, d-&gt;metaData, QFileSystemMetaData::AccessTime);</div><div class='add'>+        return d-&gt;metaData.accessTime();</div><div class='add'>+    }</div><div class='ctx'>     return d-&gt;getFileTime(QAbstractFileEngine::AccessTime);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h<br/>index a2dc7b4..5b1b48b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfileinfo.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfileinfo.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfileinfo.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfileinfo.h</a></div><div class='hunk'>@@ -53,12 +53,16 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'> QT_MODULE(Core)</div><div class='ctx'> </div><div class='ctx'> class QDir;</div><div class='add'>+class QDirIteratorPrivate;</div><div class='ctx'> class QDateTime;</div><div class='ctx'> class QFileInfoPrivate;</div><div class='ctx'> </div><div class='ctx'> class Q_CORE_EXPORT QFileInfo</div><div class='ctx'> {</div><div class='add'>+    friend class QDirIteratorPrivate;</div><div class='ctx'> public:</div><div class='add'>+    explicit QFileInfo(QFileInfoPrivate *d);</div><div class='add'>+</div><div class='ctx'>     QFileInfo();</div><div class='ctx'>     QFileInfo(const QString &amp;file);</div><div class='ctx'>     QFileInfo(const QFile &amp;file);</div><div class='hunk'>@@ -67,6 +71,10 @@ public:</div><div class='ctx'>     ~QFileInfo();</div><div class='ctx'> </div><div class='ctx'>     QFileInfo &amp;operator=(const QFileInfo &amp;fileinfo);</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    inline QFileInfo&amp;operator=(QFileInfo &amp;&amp;other)</div><div class='add'>+    { qSwap(d_ptr, other.d_ptr); return *this; }</div><div class='add'>+#endif</div><div class='ctx'>     bool operator==(const QFileInfo &amp;fileinfo); // 5.0 - remove me</div><div class='ctx'>     bool operator==(const QFileInfo &amp;fileinfo) const;</div><div class='ctx'>     inline bool operator!=(const QFileInfo &amp;fileinfo) { return !(operator==(fileinfo)); } // 5.0 - remove me</div><div class='head'>diff --git a/src/corelib/io/qfileinfo_p.h b/src/corelib/io/qfileinfo_p.h<br/>index 6099910..23ea022 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfileinfo_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfileinfo_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfileinfo_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfileinfo_p.h</a></div><div class='hunk'>@@ -58,13 +58,16 @@</div><div class='ctx'> #include "qdatetime.h"</div><div class='ctx'> #include "qatomic.h"</div><div class='ctx'> #include "qshareddata.h"</div><div class='add'>+#include "qfilesystemengine_p.h"</div><div class='add'>+</div><div class='add'>+#include &lt;QtCore/private/qfilesystementry_p.h&gt;</div><div class='add'>+#include &lt;QtCore/private/qfilesystemmetadata_p.h&gt;</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> class QFileInfoPrivate : public QSharedData</div><div class='ctx'> {</div><div class='ctx'> public:</div><div class='del'>-</div><div class='ctx'>     enum { CachedFileFlags=0x01, CachedLinkTypeFlag=0x02, CachedBundleTypeFlag=0x04,</div><div class='ctx'>            CachedMTime=0x10, CachedCTime=0x20, CachedATime=0x40,</div><div class='ctx'>            CachedSize =0x08, CachedPerms=0x80 };</div><div class='hunk'>@@ -76,8 +79,10 @@ public:</div><div class='ctx'>         cache_enabled(true), fileFlags(0), fileSize(0)</div><div class='ctx'>     {}</div><div class='ctx'>     inline QFileInfoPrivate(const QFileInfoPrivate &amp;copy)</div><div class='del'>-        : QSharedData(copy), fileEngine(QAbstractFileEngine::create(copy.fileName)),</div><div class='del'>-        fileName(copy.fileName),</div><div class='add'>+        : QSharedData(copy),</div><div class='add'>+        fileEntry(copy.fileEntry),</div><div class='add'>+        metaData(copy.metaData),</div><div class='add'>+        fileEngine(QFileSystemEngine::resolveEntryAndCreateLegacyEngine(fileEntry, metaData)),</div><div class='ctx'>         cachedFlags(0),</div><div class='ctx'> #ifndef QT_NO_FSFILEENGINE</div><div class='ctx'>         isDefaultConstructed(false),</div><div class='hunk'>@@ -87,8 +92,8 @@ public:</div><div class='ctx'>         cache_enabled(copy.cache_enabled), fileFlags(0), fileSize(0)</div><div class='ctx'>     {}</div><div class='ctx'>     inline QFileInfoPrivate(const QString &amp;file)</div><div class='del'>-        : QSharedData(), fileEngine(QAbstractFileEngine::create(file)),</div><div class='del'>-        fileName(file),</div><div class='add'>+        : fileEntry(QDir::fromNativeSeparators(file)),</div><div class='add'>+        fileEngine(QFileSystemEngine::resolveEntryAndCreateLegacyEngine(fileEntry, metaData)),</div><div class='ctx'>         cachedFlags(0),</div><div class='ctx'> #ifndef QT_NO_FSFILEENGINE</div><div class='ctx'>         isDefaultConstructed(false),</div><div class='hunk'>@@ -99,6 +104,16 @@ public:</div><div class='ctx'>     {</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='add'>+    inline QFileInfoPrivate(const QFileSystemEntry &amp;file, const QFileSystemMetaData &amp;data)</div><div class='add'>+        : QSharedData(),</div><div class='add'>+        fileEntry(file),</div><div class='add'>+        metaData(data),</div><div class='add'>+        cachedFlags(0),</div><div class='add'>+        isDefaultConstructed(false),</div><div class='add'>+        cache_enabled(true), fileFlags(0), fileSize(0)</div><div class='add'>+    {</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     inline void clearFlags() const {</div><div class='ctx'>         fileFlags = 0;</div><div class='ctx'>         cachedFlags = 0;</div><div class='hunk'>@@ -106,6 +121,7 @@ public:</div><div class='ctx'>             (void)fileEngine-&gt;fileFlags(QAbstractFileEngine::Refresh);</div><div class='ctx'>     }</div><div class='ctx'>     inline void clear() {</div><div class='add'>+        metaData.clear();</div><div class='ctx'>         clearFlags();</div><div class='ctx'>         for (int i = QAbstractFileEngine::NFileNames - 1 ; i &gt;= 0 ; --i)</div><div class='ctx'>             fileNames[i].clear();</div><div class='hunk'>@@ -118,9 +134,11 @@ public:</div><div class='ctx'>     QString getFileName(QAbstractFileEngine::FileName) const;</div><div class='ctx'>     QString getFileOwner(QAbstractFileEngine::FileOwner own) const;</div><div class='ctx'> </div><div class='add'>+    QFileSystemEntry fileEntry;</div><div class='add'>+    mutable QFileSystemMetaData metaData;</div><div class='add'>+</div><div class='ctx'>     QScopedPointer&lt;QAbstractFileEngine&gt; const fileEngine;</div><div class='ctx'> </div><div class='del'>-    mutable QString fileName;</div><div class='ctx'>     mutable QString fileNames[QAbstractFileEngine::NFileNames];</div><div class='ctx'>     mutable QString fileOwners[2];</div><div class='ctx'> </div><div class='hunk'>@@ -134,6 +152,7 @@ public:</div><div class='ctx'>     { return cache_enabled ? (cachedFlags &amp; c) : 0; }</div><div class='ctx'>     inline void setCachedFlag(uint c) const</div><div class='ctx'>     { if (cache_enabled) cachedFlags |= c; }</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qfilesystemengine.cpp b/src/corelib/io/qfilesystemengine.cpp<br/>new file mode 100644<br/>index 0000000..9590e39<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemengine.cpp</a></div><div class='hunk'>@@ -0,0 +1,391 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qfilesystemengine_p.h"</div><div class='add'>+#include &lt;QtCore/qdir.h&gt;</div><div class='add'>+#include &lt;QtCore/qset.h&gt;</div><div class='add'>+#include &lt;QtCore/qstringbuilder.h&gt;</div><div class='add'>+#include &lt;QtCore/private/qabstractfileengine_p.h&gt;</div><div class='add'>+#ifdef QT_BUILD_CORE_LIB</div><div class='add'>+#include &lt;QtCore/private/qresource_p.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \internal</div><div class='add'>+</div><div class='add'>+    Returns the canonicalized form of \a path (i.e., with all symlinks</div><div class='add'>+    resolved, and all redundant path elements removed.</div><div class='add'>+*/</div><div class='add'>+QString QFileSystemEngine::slowCanonicalized(const QString &amp;path)</div><div class='add'>+{</div><div class='add'>+    if (path.isEmpty())</div><div class='add'>+        return path;</div><div class='add'>+</div><div class='add'>+    QFileInfo fi;</div><div class='add'>+    const QChar slash(QLatin1Char('/'));</div><div class='add'>+    QString tmpPath = path;</div><div class='add'>+    int separatorPos = 0;</div><div class='add'>+    QSet&lt;QString&gt; nonSymlinks;</div><div class='add'>+    QSet&lt;QString&gt; known;</div><div class='add'>+</div><div class='add'>+    known.insert(path);</div><div class='add'>+    do {</div><div class='add'>+#ifdef Q_OS_WIN</div><div class='add'>+        if (separatorPos == 0) {</div><div class='add'>+            if (tmpPath.size() &gt;= 2 &amp;&amp; tmpPath.at(0) == slash &amp;&amp; tmpPath.at(1) == slash) {</div><div class='add'>+                // UNC, skip past the first two elements</div><div class='add'>+                separatorPos = tmpPath.indexOf(slash, 2);</div><div class='add'>+            } else if (tmpPath.size() &gt;= 3 &amp;&amp; tmpPath.at(1) == QLatin1Char(':') &amp;&amp; tmpPath.at(2) == slash) {</div><div class='add'>+                // volume root, skip since it can not be a symlink</div><div class='add'>+                separatorPos = 2;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        if (separatorPos != -1)</div><div class='add'>+#endif</div><div class='add'>+        separatorPos = tmpPath.indexOf(slash, separatorPos + 1);</div><div class='add'>+        QString prefix = separatorPos == -1 ? tmpPath : tmpPath.left(separatorPos);</div><div class='add'>+        if (</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+            // Symbian doesn't support directory symlinks, so do not check for link unless we</div><div class='add'>+            // are handling the last path element. This not only slightly improves performance,</div><div class='add'>+            // but also saves us from lot of unnecessary platform security check failures</div><div class='add'>+            // when dealing with files under *:/private directories.</div><div class='add'>+            separatorPos == -1 &amp;&amp;</div><div class='add'>+#endif</div><div class='add'>+            !nonSymlinks.contains(prefix)) {</div><div class='add'>+            fi.setFile(prefix);</div><div class='add'>+            if (fi.isSymLink()) {</div><div class='add'>+                QString target = fi.symLinkTarget();</div><div class='add'>+                if(QFileInfo(target).isRelative())</div><div class='add'>+                    target = fi.absolutePath() + slash + target;</div><div class='add'>+                if (separatorPos != -1) {</div><div class='add'>+                    if (fi.isDir() &amp;&amp; !target.endsWith(slash))</div><div class='add'>+                        target.append(slash);</div><div class='add'>+                    target.append(tmpPath.mid(separatorPos));</div><div class='add'>+                }</div><div class='add'>+                tmpPath = QDir::cleanPath(target);</div><div class='add'>+                separatorPos = 0;</div><div class='add'>+</div><div class='add'>+                if (known.contains(tmpPath))</div><div class='add'>+                    return QString();</div><div class='add'>+                known.insert(tmpPath);</div><div class='add'>+            } else {</div><div class='add'>+                nonSymlinks.insert(prefix);</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    } while (separatorPos != -1);</div><div class='add'>+</div><div class='add'>+    return QDir::cleanPath(tmpPath);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool _q_checkEntry(QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;data, bool resolvingEntry)</div><div class='add'>+{</div><div class='add'>+    if (resolvingEntry) {</div><div class='add'>+        if (!QFileSystemEngine::fillMetaData(entry, data, QFileSystemMetaData::ExistsAttribute)</div><div class='add'>+                || !data.exists()) {</div><div class='add'>+            data.clear();</div><div class='add'>+            return false;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool _q_checkEntry(QAbstractFileEngine *&amp;engine, bool resolvingEntry)</div><div class='add'>+{</div><div class='add'>+    if (resolvingEntry) {</div><div class='add'>+        if (!(engine-&gt;fileFlags(QAbstractFileEngine::FlagsMask) &amp; QAbstractFileEngine::ExistsFlag)) {</div><div class='add'>+            delete engine;</div><div class='add'>+            engine = 0;</div><div class='add'>+            return false;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool _q_resolveEntryAndCreateLegacyEngine_recursive(QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;data,</div><div class='add'>+        QAbstractFileEngine *&amp;engine, bool resolvingEntry = false)</div><div class='add'>+{</div><div class='add'>+    QString const &amp;filePath = entry.filePath();</div><div class='add'>+    if ((engine = qt_custom_file_engine_handler_create(filePath)))</div><div class='add'>+        return _q_checkEntry(engine, resolvingEntry);</div><div class='add'>+</div><div class='add'>+#if defined(QT_BUILD_CORE_LIB)</div><div class='add'>+    for (int prefixSeparator = 0; prefixSeparator &lt; filePath.size(); ++prefixSeparator) {</div><div class='add'>+        QChar const ch = filePath[prefixSeparator];</div><div class='add'>+        if (ch == QLatin1Char('/'))</div><div class='add'>+            break;</div><div class='add'>+</div><div class='add'>+        if (ch == QLatin1Char(':')) {</div><div class='add'>+            if (prefixSeparator == 0) {</div><div class='add'>+                engine = new QResourceFileEngine(filePath);</div><div class='add'>+                return _q_checkEntry(engine, resolvingEntry);</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            if (prefixSeparator == 1)</div><div class='add'>+                break;</div><div class='add'>+</div><div class='add'>+            const QStringList &amp;paths = QDir::searchPaths(filePath.left(prefixSeparator));</div><div class='add'>+            for (int i = 0; i &lt; paths.count(); i++) {</div><div class='add'>+                entry = QFileSystemEntry(QDir::cleanPath(paths.at(i) % QLatin1Char('/') % filePath.mid(prefixSeparator + 1)));</div><div class='add'>+                // Recurse!</div><div class='add'>+                if (_q_resolveEntryAndCreateLegacyEngine_recursive(entry, data, engine, true))</div><div class='add'>+                    return true;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            // entry may have been clobbered at this point.</div><div class='add'>+            return false;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        //  There's no need to fully validate the prefix here. Consulting the</div><div class='add'>+        //  unicode tables could be expensive and validation is already</div><div class='add'>+        //  performed in QDir::setSearchPaths.</div><div class='add'>+        //</div><div class='add'>+        //  if (!ch.isLetterOrNumber())</div><div class='add'>+        //      break;</div><div class='add'>+    }</div><div class='add'>+#endif // defined(QT_BUILD_CORE_LIB)</div><div class='add'>+</div><div class='add'>+    return _q_checkEntry(entry, data, resolvingEntry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \internal</div><div class='add'>+</div><div class='add'>+    Resolves the \a entry (see QDir::searchPaths) and returns an engine for</div><div class='add'>+    it, but never a QFSFileEngine.</div><div class='add'>+</div><div class='add'>+    \returns a file engine that can be used to access the entry. Returns 0 if</div><div class='add'>+    QFileSystemEngine API should be used to query and interact with the file</div><div class='add'>+    system object.</div><div class='add'>+*/</div><div class='add'>+QAbstractFileEngine *QFileSystemEngine::resolveEntryAndCreateLegacyEngine(</div><div class='add'>+        QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;data) {</div><div class='add'>+    QFileSystemEntry copy = entry;</div><div class='add'>+    QAbstractFileEngine *engine = 0;</div><div class='add'>+</div><div class='add'>+    if (_q_resolveEntryAndCreateLegacyEngine_recursive(copy, data, engine))</div><div class='add'>+        // Reset entry to resolved copy.</div><div class='add'>+        entry = copy;</div><div class='add'>+    else</div><div class='add'>+        data.clear();</div><div class='add'>+</div><div class='add'>+    return engine;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//these unix functions are in this file, because they are shared by symbian port</div><div class='add'>+//for open C file handles.</div><div class='add'>+#ifdef Q_OS_UNIX</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::fillMetaData(int fd, QFileSystemMetaData &amp;data)</div><div class='add'>+{</div><div class='add'>+    data.entryFlags &amp;= ~QFileSystemMetaData::PosixStatFlags;</div><div class='add'>+    data.knownFlagsMask |= QFileSystemMetaData::PosixStatFlags;</div><div class='add'>+</div><div class='add'>+    QT_STATBUF statBuffer;</div><div class='add'>+    if (QT_FSTAT(fd, &amp;statBuffer) == 0) {</div><div class='add'>+        data.fillFromStatBuf(statBuffer);</div><div class='add'>+        return true;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QFileSystemMetaData::fillFromStatBuf(const QT_STATBUF &amp;statBuffer)</div><div class='add'>+{</div><div class='add'>+    // Permissions</div><div class='add'>+    if (statBuffer.st_mode &amp; S_IRUSR)</div><div class='add'>+        entryFlags |= QFileSystemMetaData::OwnerReadPermission;</div><div class='add'>+    if (statBuffer.st_mode &amp; S_IWUSR)</div><div class='add'>+        entryFlags |= QFileSystemMetaData::OwnerWritePermission;</div><div class='add'>+    if (statBuffer.st_mode &amp; S_IXUSR)</div><div class='add'>+        entryFlags |= QFileSystemMetaData::OwnerExecutePermission;</div><div class='add'>+</div><div class='add'>+    if (statBuffer.st_mode &amp; S_IRGRP)</div><div class='add'>+        entryFlags |= QFileSystemMetaData::GroupReadPermission;</div><div class='add'>+    if (statBuffer.st_mode &amp; S_IWGRP)</div><div class='add'>+        entryFlags |= QFileSystemMetaData::GroupWritePermission;</div><div class='add'>+    if (statBuffer.st_mode &amp; S_IXGRP)</div><div class='add'>+        entryFlags |= QFileSystemMetaData::GroupExecutePermission;</div><div class='add'>+</div><div class='add'>+    if (statBuffer.st_mode &amp; S_IROTH)</div><div class='add'>+        entryFlags |= QFileSystemMetaData::OtherReadPermission;</div><div class='add'>+    if (statBuffer.st_mode &amp; S_IWOTH)</div><div class='add'>+        entryFlags |= QFileSystemMetaData::OtherWritePermission;</div><div class='add'>+    if (statBuffer.st_mode &amp; S_IXOTH)</div><div class='add'>+        entryFlags |= QFileSystemMetaData::OtherExecutePermission;</div><div class='add'>+</div><div class='add'>+    // Type</div><div class='add'>+    if ((statBuffer.st_mode &amp; S_IFMT) == S_IFREG)</div><div class='add'>+        entryFlags |= QFileSystemMetaData::FileType;</div><div class='add'>+    else if ((statBuffer.st_mode &amp; S_IFMT) == S_IFDIR)</div><div class='add'>+        entryFlags |= QFileSystemMetaData::DirectoryType;</div><div class='add'>+    else</div><div class='add'>+        entryFlags |= QFileSystemMetaData::SequentialType;</div><div class='add'>+</div><div class='add'>+    // Attributes</div><div class='add'>+    entryFlags |= QFileSystemMetaData::ExistsAttribute;</div><div class='add'>+    size_ = statBuffer.st_size;</div><div class='add'>+#if !defined(QWS) &amp;&amp; !defined(Q_WS_QPA) &amp;&amp; defined(Q_OS_MAC) \</div><div class='add'>+        &amp;&amp; MAC_OS_X_VERSION_MAX_ALLOWED &gt;= MAC_OS_X_VERSION_10_5</div><div class='add'>+    if (statBuffer.st_flags &amp; UF_HIDDEN) {</div><div class='add'>+        entryFlags |= QFileSystemMetaData::HiddenAttribute;</div><div class='add'>+        knownFlagsMask |= QFileSystemMetaData::HiddenAttribute;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    // Times</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+    modificationTime_ = qt_symbian_time_t_To_TTime(statBuffer.st_mtime);</div><div class='add'>+#else</div><div class='add'>+    creationTime_ = statBuffer.st_ctime ? statBuffer.st_ctime : statBuffer.st_mtime;</div><div class='add'>+    modificationTime_ = statBuffer.st_mtime;</div><div class='add'>+    accessTime_ = statBuffer.st_atime;</div><div class='add'>+    userId_ = statBuffer.st_uid;</div><div class='add'>+    groupId_ = statBuffer.st_gid;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QFileSystemMetaData::fillFromDirEnt(const QT_DIRENT &amp;entry)</div><div class='add'>+{</div><div class='add'>+#if defined(_DIRENT_HAVE_D_TYPE) || defined(Q_OS_BSD4) || defined(Q_OS_SYMBIAN)</div><div class='add'>+    // BSD4 includes Mac OS X</div><div class='add'>+</div><div class='add'>+    // ### This will clear all entry flags and knownFlagsMask</div><div class='add'>+    switch (entry.d_type)</div><div class='add'>+    {</div><div class='add'>+    case DT_DIR:</div><div class='add'>+        knownFlagsMask = QFileSystemMetaData::LinkType</div><div class='add'>+            | QFileSystemMetaData::FileType</div><div class='add'>+            | QFileSystemMetaData::DirectoryType</div><div class='add'>+            | QFileSystemMetaData::SequentialType</div><div class='add'>+            | QFileSystemMetaData::ExistsAttribute;</div><div class='add'>+</div><div class='add'>+        entryFlags = QFileSystemMetaData::DirectoryType</div><div class='add'>+            | QFileSystemMetaData::ExistsAttribute;</div><div class='add'>+</div><div class='add'>+        break;</div><div class='add'>+</div><div class='add'>+    case DT_BLK:</div><div class='add'>+    case DT_CHR:</div><div class='add'>+    case DT_FIFO:</div><div class='add'>+    case DT_SOCK:</div><div class='add'>+        // ### System attribute</div><div class='add'>+        knownFlagsMask = QFileSystemMetaData::LinkType</div><div class='add'>+            | QFileSystemMetaData::FileType</div><div class='add'>+            | QFileSystemMetaData::DirectoryType</div><div class='add'>+            | QFileSystemMetaData::BundleType</div><div class='add'>+            | QFileSystemMetaData::AliasType</div><div class='add'>+            | QFileSystemMetaData::SequentialType</div><div class='add'>+            | QFileSystemMetaData::ExistsAttribute;</div><div class='add'>+</div><div class='add'>+        entryFlags = QFileSystemMetaData::SequentialType</div><div class='add'>+            | QFileSystemMetaData::ExistsAttribute;</div><div class='add'>+</div><div class='add'>+        break;</div><div class='add'>+</div><div class='add'>+    case DT_LNK:</div><div class='add'>+        knownFlagsMask = QFileSystemMetaData::LinkType;</div><div class='add'>+        entryFlags = QFileSystemMetaData::LinkType;</div><div class='add'>+        break;</div><div class='add'>+</div><div class='add'>+    case DT_REG:</div><div class='add'>+        knownFlagsMask = QFileSystemMetaData::LinkType</div><div class='add'>+            | QFileSystemMetaData::FileType</div><div class='add'>+            | QFileSystemMetaData::DirectoryType</div><div class='add'>+            | QFileSystemMetaData::BundleType</div><div class='add'>+            | QFileSystemMetaData::SequentialType</div><div class='add'>+            | QFileSystemMetaData::ExistsAttribute;</div><div class='add'>+</div><div class='add'>+        entryFlags = QFileSystemMetaData::FileType</div><div class='add'>+            | QFileSystemMetaData::ExistsAttribute;</div><div class='add'>+</div><div class='add'>+        break;</div><div class='add'>+</div><div class='add'>+    case DT_UNKNOWN:</div><div class='add'>+    default:</div><div class='add'>+        clear();</div><div class='add'>+    }</div><div class='add'>+#else</div><div class='add'>+    Q_UNUSED(entry)</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QString QFileSystemEngine::resolveUserName(const QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;metaData)</div><div class='add'>+{</div><div class='add'>+#if defined (Q_OS_SYMBIAN)</div><div class='add'>+    Q_UNUSED(entry);</div><div class='add'>+    Q_UNUSED(metaData);</div><div class='add'>+    return QString();</div><div class='add'>+#elif defined(Q_OS_WIN)</div><div class='add'>+    Q_UNUSED(metaData);</div><div class='add'>+    return QFileSystemEngine::owner(entry, QAbstractFileEngine::OwnerUser);</div><div class='add'>+#else //(Q_OS_UNIX)</div><div class='add'>+    if (!metaData.hasFlags(QFileSystemMetaData::UserId))</div><div class='add'>+        QFileSystemEngine::fillMetaData(entry, metaData, QFileSystemMetaData::UserId);</div><div class='add'>+    return resolveUserName(metaData.userId());</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QString QFileSystemEngine::resolveGroupName(const QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;metaData)</div><div class='add'>+{</div><div class='add'>+#if defined (Q_OS_SYMBIAN)</div><div class='add'>+    Q_UNUSED(entry);</div><div class='add'>+    Q_UNUSED(metaData);</div><div class='add'>+    return QString();</div><div class='add'>+#elif defined(Q_OS_WIN)</div><div class='add'>+    Q_UNUSED(metaData);</div><div class='add'>+    return QFileSystemEngine::owner(entry, QAbstractFileEngine::OwnerGroup);</div><div class='add'>+#else //(Q_OS_UNIX)</div><div class='add'>+    if (!metaData.hasFlags(QFileSystemMetaData::GroupId))</div><div class='add'>+        QFileSystemEngine::fillMetaData(entry, metaData, QFileSystemMetaData::GroupId);</div><div class='add'>+    return resolveGroupName(metaData.groupId());</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qfilesystemengine_mac.cpp b/src/corelib/io/qfilesystemengine_mac.cpp<br/>new file mode 100644<br/>index 0000000..0d15565<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemengine_mac.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemengine_mac.cpp</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qfilesystemengine_p.h"</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+// Mac-specific implementations only!</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qfilesystemengine_p.h b/src/corelib/io/qfilesystemengine_p.h<br/>new file mode 100644<br/>index 0000000..96a2019<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemengine_p.h</a></div><div class='hunk'>@@ -0,0 +1,133 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QFILESYSTEMENGINE_P_H_INCLUDED</div><div class='add'>+#define QFILESYSTEMENGINE_P_H_INCLUDED</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+//  W A R N I N G</div><div class='add'>+//  -------------</div><div class='add'>+//</div><div class='add'>+// This file is not part of the Qt API.  It exists purely as an</div><div class='add'>+// implementation detail.  This header file may change from version to</div><div class='add'>+// version without notice, or even be removed.</div><div class='add'>+//</div><div class='add'>+// We mean it.</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include "qfile.h"</div><div class='add'>+#include "qfilesystementry_p.h"</div><div class='add'>+#include "qfilesystemmetadata_p.h"</div><div class='add'>+#include &lt;QtCore/private/qsystemerror_p.h&gt;</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+class QFileSystemEngine</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    static bool isCaseSensitive();</div><div class='add'>+</div><div class='add'>+    static QFileSystemEntry getLinkTarget(const QFileSystemEntry &amp;link, QFileSystemMetaData &amp;data);</div><div class='add'>+    static QFileSystemEntry canonicalName(const QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;data);</div><div class='add'>+    static QFileSystemEntry absoluteName(const QFileSystemEntry &amp;entry);</div><div class='add'>+    static QString resolveUserName(const QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;data);</div><div class='add'>+    static QString resolveGroupName(const QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;data);</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_UNIX) &amp;&amp; !defined(Q_OS_SYMBIAN)</div><div class='add'>+    static QString resolveUserName(uint userId);</div><div class='add'>+    static QString resolveGroupName(uint groupId);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if !defined(QWS) &amp;&amp; !defined(Q_WS_QPA) &amp;&amp; defined(Q_OS_MAC)</div><div class='add'>+    static QString bundleName(const QFileSystemEntry &amp;entry);</div><div class='add'>+#else</div><div class='add'>+    static QString bundleName(const QFileSystemEntry &amp;entry) { Q_UNUSED(entry) return QString(); }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    static bool fillMetaData(const QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;data,</div><div class='add'>+                             QFileSystemMetaData::MetaDataFlags what);</div><div class='add'>+#if defined(Q_OS_UNIX)</div><div class='add'>+    static bool fillMetaData(int fd, QFileSystemMetaData &amp;data); // what = PosixStatFlags</div><div class='add'>+#endif</div><div class='add'>+#if defined(Q_OS_WIN)</div><div class='add'>+</div><div class='add'>+    static bool uncListSharesOnServer(const QString &amp;server, QStringList *list); //Used also by QFSFileEngineIterator::hasNext()</div><div class='add'>+    static bool fillMetaData(int fd, QFileSystemMetaData &amp;data,</div><div class='add'>+                             QFileSystemMetaData::MetaDataFlags what);</div><div class='add'>+    static bool fillMetaData(HANDLE fHandle, QFileSystemMetaData &amp;data,</div><div class='add'>+                             QFileSystemMetaData::MetaDataFlags what);</div><div class='add'>+    static bool fillPermissions(const QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;data,</div><div class='add'>+                                QFileSystemMetaData::MetaDataFlags what);</div><div class='add'>+    static QString owner(const QFileSystemEntry &amp;entry, QAbstractFileEngine::FileOwner own);</div><div class='add'>+    static QString nativeAbsoluteFilePath(const QString &amp;path);</div><div class='add'>+#endif</div><div class='add'>+    //homePath, rootPath and tempPath shall return clean paths</div><div class='add'>+    static QString homePath();</div><div class='add'>+    static QString rootPath();</div><div class='add'>+    static QString tempPath();</div><div class='add'>+</div><div class='add'>+    static bool createDirectory(const QFileSystemEntry &amp;entry, bool createParents);</div><div class='add'>+    static bool removeDirectory(const QFileSystemEntry &amp;entry, bool removeEmptyParents);</div><div class='add'>+</div><div class='add'>+    static bool createLink(const QFileSystemEntry &amp;source, const QFileSystemEntry &amp;target, QSystemError &amp;error);</div><div class='add'>+</div><div class='add'>+    static bool copyFile(const QFileSystemEntry &amp;source, const QFileSystemEntry &amp;target, QSystemError &amp;error);</div><div class='add'>+    static bool renameFile(const QFileSystemEntry &amp;source, const QFileSystemEntry &amp;target, QSystemError &amp;error);</div><div class='add'>+    static bool removeFile(const QFileSystemEntry &amp;entry, QSystemError &amp;error);</div><div class='add'>+</div><div class='add'>+    static bool setPermissions(const QFileSystemEntry &amp;entry, QFile::Permissions permissions, QSystemError &amp;error,</div><div class='add'>+                               QFileSystemMetaData *data = 0);</div><div class='add'>+</div><div class='add'>+    static bool setCurrentPath(const QFileSystemEntry &amp;entry);</div><div class='add'>+    static QFileSystemEntry currentPath();</div><div class='add'>+</div><div class='add'>+    static QAbstractFileEngine *resolveEntryAndCreateLegacyEngine(QFileSystemEntry &amp;entry,</div><div class='add'>+                                                                  QFileSystemMetaData &amp;data);</div><div class='add'>+private:</div><div class='add'>+    static QString slowCanonicalized(const QString &amp;path);</div><div class='add'>+#if defined(Q_OS_WIN)</div><div class='add'>+    static void clearWinStatData(QFileSystemMetaData &amp;data);</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+#endif // include guard</div><div class='head'>diff --git a/src/corelib/io/qfilesystemengine_symbian.cpp b/src/corelib/io/qfilesystemengine_symbian.cpp<br/>new file mode 100644<br/>index 0000000..18c52cb<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemengine_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemengine_symbian.cpp</a></div><div class='hunk'>@@ -0,0 +1,408 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qfilesystemengine_p.h"</div><div class='add'>+#include "qfsfileengine.h"</div><div class='add'>+#include &lt;QtCore/private/qcore_symbian_p.h&gt;</div><div class='add'>+#include &lt;QtCore/qcoreapplication.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;f32file.h&gt;</div><div class='add'>+#include &lt;pathinfo.h&gt;</div><div class='add'>+#include &lt;wchar.h&gt;</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+bool QFileSystemEngine::isCaseSensitive()</div><div class='add'>+{</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//TODO: resolve this with QDir::cleanPath, without breaking the behaviour of that</div><div class='add'>+//function which is documented only by autotest</div><div class='add'>+//input: a dirty absolute path, e.g. c:/../../foo/./</div><div class='add'>+//output: a clean absolute path, e.g. c:/foo/</div><div class='add'>+static QString symbianCleanAbsolutePath(const QString&amp; path)</div><div class='add'>+{</div><div class='add'>+    bool isDir = path.endsWith(QLatin1Char('/'));</div><div class='add'>+    //using SkipEmptyParts flag to eliminate duplicated slashes</div><div class='add'>+    QStringList components = path.split(QLatin1Char('/'), QString::SkipEmptyParts);</div><div class='add'>+    int cdups = 0;</div><div class='add'>+    for(int i=components.count() - 1; i&gt;=0; --i) {</div><div class='add'>+        if(components.at(i) == QLatin1String("..")) {</div><div class='add'>+            components.removeAt(i);</div><div class='add'>+            cdups++;</div><div class='add'>+        }</div><div class='add'>+        else if(components.at(i) == QLatin1String(".")) {</div><div class='add'>+            components.removeAt(i);</div><div class='add'>+        }</div><div class='add'>+        else if(cdups &amp;&amp; i &gt; 0) {</div><div class='add'>+            --cdups;</div><div class='add'>+            components.removeAt(i);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    QString result = components.join(QLatin1String("/"));</div><div class='add'>+    if ((isDir&amp;&amp; !result.endsWith(QLatin1Char('/')))</div><div class='add'>+        || (result.length() == 2 &amp;&amp; result.at(1).unicode() == ':'))</div><div class='add'>+        result.append(QLatin1Char('/'));</div><div class='add'>+    return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QFileSystemEntry QFileSystemEngine::getLinkTarget(const QFileSystemEntry &amp;link, QFileSystemMetaData &amp;data)</div><div class='add'>+{</div><div class='add'>+    Q_UNUSED(data);</div><div class='add'>+    return link;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;data)</div><div class='add'>+{</div><div class='add'>+    if (entry.isEmpty() || entry.isRoot())</div><div class='add'>+        return entry;</div><div class='add'>+</div><div class='add'>+    QFileSystemEntry result = absoluteName(entry);</div><div class='add'>+    if (!data.hasFlags(QFileSystemMetaData::ExistsAttribute))</div><div class='add'>+        fillMetaData(result, data, QFileSystemMetaData::ExistsAttribute);</div><div class='add'>+    if (!data.exists()) {</div><div class='add'>+        // file doesn't exist</div><div class='add'>+        return QFileSystemEntry();</div><div class='add'>+    } else {</div><div class='add'>+        return result;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QFileSystemEntry QFileSystemEngine::absoluteName(const QFileSystemEntry &amp;entry)</div><div class='add'>+{</div><div class='add'>+    QString orig = entry.filePath();</div><div class='add'>+    const bool isAbsolute = entry.isAbsolute();</div><div class='add'>+    const bool isDirty = (orig.contains(QLatin1String("/../")) || orig.contains(QLatin1String("/./")) ||</div><div class='add'>+            orig.contains(QLatin1String("//")) ||</div><div class='add'>+            orig.endsWith(QLatin1String("/..")) || orig.endsWith(QLatin1String("/.")));</div><div class='add'>+    if (isAbsolute &amp;&amp; !isDirty)</div><div class='add'>+        return entry;</div><div class='add'>+</div><div class='add'>+    const bool isRelative = entry.isRelative();</div><div class='add'>+    const bool needsDrive = (!orig.isEmpty() &amp;&amp; orig.at(0).unicode() == '/');</div><div class='add'>+    const bool isDriveLetter = !needsDrive &amp;&amp; !isAbsolute &amp;&amp; !isRelative &amp;&amp; orig.length() == 2;</div><div class='add'>+    const bool isDriveRelative = !needsDrive &amp;&amp; !isAbsolute &amp;&amp; !isRelative &amp;&amp; orig.length() &gt; 2;</div><div class='add'>+</div><div class='add'>+    QString result;</div><div class='add'>+    if (needsDrive || isDriveLetter || isDriveRelative || !isAbsolute || orig.isEmpty()) {</div><div class='add'>+        QFileSystemEntry cur(currentPath());</div><div class='add'>+        if(needsDrive)</div><div class='add'>+            result = cur.filePath().left(2);</div><div class='add'>+        else if(isDriveRelative &amp;&amp; cur.filePath().at(0) != orig.at(0))</div><div class='add'>+            result = orig.left(2); // for BC, see tst_QFileInfo::absolutePath(&lt;not current drive&gt;:my.dll)</div><div class='add'>+        else</div><div class='add'>+            result = cur.filePath();</div><div class='add'>+        if(isDriveLetter) {</div><div class='add'>+            result[0] = orig.at(0); //copy drive letter</div><div class='add'>+            orig.clear();</div><div class='add'>+        }</div><div class='add'>+        if(isDriveRelative) {</div><div class='add'>+            orig = orig.mid(2); //discard the drive specifier from orig</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    if (!orig.isEmpty() &amp;&amp; !(orig.length() == 1 &amp;&amp; orig.at(0).unicode() == '.')) {</div><div class='add'>+        if (!result.isEmpty() &amp;&amp; !result.endsWith(QLatin1Char('/')))</div><div class='add'>+            result.append(QLatin1Char('/'));</div><div class='add'>+        result.append(orig);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return QFileSystemEntry(symbianCleanAbsolutePath(result), QFileSystemEntry::FromInternalPath());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QFileSystemMetaData::fillFromTEntry(const TEntry&amp; entry)</div><div class='add'>+{</div><div class='add'>+    entryFlags &amp;= ~(QFileSystemMetaData::SymbianTEntryFlags);</div><div class='add'>+    knownFlagsMask |= QFileSystemMetaData::SymbianTEntryFlags;</div><div class='add'>+    //Symbian doesn't have unix type file permissions</div><div class='add'>+    entryFlags |= QFileSystemMetaData::ReadPermissions;</div><div class='add'>+    if(!entry.IsReadOnly()) {</div><div class='add'>+        entryFlags |= QFileSystemMetaData::WritePermissions;</div><div class='add'>+    }</div><div class='add'>+    //set the type</div><div class='add'>+    if(entry.IsDir())</div><div class='add'>+        entryFlags |= (QFileSystemMetaData::DirectoryType | QFileSystemMetaData::ExecutePermissions);</div><div class='add'>+    else</div><div class='add'>+        entryFlags |= QFileSystemMetaData::FileType;</div><div class='add'>+</div><div class='add'>+    //set the attributes</div><div class='add'>+    entryFlags |= QFileSystemMetaData::ExistsAttribute;</div><div class='add'>+    if(entry.IsHidden())</div><div class='add'>+        entryFlags |= QFileSystemMetaData::HiddenAttribute;</div><div class='add'>+</div><div class='add'>+#ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API</div><div class='add'>+    size_ = entry.FileSize();</div><div class='add'>+#else</div><div class='add'>+    size_ = (TUint)(entry.iSize);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    modificationTime_ = entry.iModified;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QFileSystemMetaData::fillFromVolumeInfo(const TVolumeInfo&amp; info)</div><div class='add'>+{</div><div class='add'>+    entryFlags &amp;= ~(QFileSystemMetaData::SymbianTEntryFlags);</div><div class='add'>+    knownFlagsMask |= QFileSystemMetaData::SymbianTEntryFlags;</div><div class='add'>+    entryFlags |= QFileSystemMetaData::ExistsAttribute;</div><div class='add'>+    entryFlags |= QFileSystemMetaData::Permissions;</div><div class='add'>+    if(info.iDrive.iDriveAtt &amp; KDriveAttRom) {</div><div class='add'>+        entryFlags &amp;= ~(QFileSystemMetaData::WritePermissions);</div><div class='add'>+    }</div><div class='add'>+    entryFlags |= QFileSystemMetaData::DirectoryType;</div><div class='add'>+    size_ = info.iSize;</div><div class='add'>+    modificationTime_ = qt_symbian_time_t_To_TTime(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::fillMetaData(const QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;data, QFileSystemMetaData::MetaDataFlags what)</div><div class='add'>+{</div><div class='add'>+    if (what &amp; QFileSystemMetaData::SymbianTEntryFlags) {</div><div class='add'>+        RFs&amp; fs(qt_s60GetRFs());</div><div class='add'>+        TInt err;</div><div class='add'>+        QFileSystemEntry absentry(absoluteName(entry));</div><div class='add'>+        if (entry.isEmpty()) {</div><div class='add'>+            err = KErrNotFound;</div><div class='add'>+        } else if (absentry.isRoot()) {</div><div class='add'>+            //Root directories don't have an entry, and Entry() returns KErrBadName.</div><div class='add'>+            //Therefore get information about the volume instead.</div><div class='add'>+            TInt drive;</div><div class='add'>+            err = RFs::CharToDrive(TChar(absentry.nativeFilePath().at(0).unicode()), drive);</div><div class='add'>+            if (!err) {</div><div class='add'>+                TVolumeInfo info;</div><div class='add'>+                err = fs.Volume(info, drive);</div><div class='add'>+                if (!err)</div><div class='add'>+                    data.fillFromVolumeInfo(info);</div><div class='add'>+            }</div><div class='add'>+        } else {</div><div class='add'>+            TEntry ent;</div><div class='add'>+            err = fs.Entry(qt_QString2TPtrC(absentry.nativeFilePath()), ent);</div><div class='add'>+            if (!err)</div><div class='add'>+                data.fillFromTEntry(ent);</div><div class='add'>+        }</div><div class='add'>+        if (err) {</div><div class='add'>+            data.size_ = 0;</div><div class='add'>+            data.modificationTime_ = TTime(0);</div><div class='add'>+            data.entryFlags &amp;= ~(QFileSystemMetaData::SymbianTEntryFlags);</div><div class='add'>+        }</div><div class='add'>+        //files in /sys/bin on any drive are executable, even though we don't normally have permission to check whether they exist or not</div><div class='add'>+        if(absentry.filePath().midRef(1,10).compare(QLatin1String(":/sys/bin/"), Qt::CaseInsensitive) == 0)</div><div class='add'>+            data.entryFlags |= QFileSystemMetaData::ExecutePermissions;</div><div class='add'>+    }</div><div class='add'>+    return data.hasFlags(what);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::createDirectory(const QFileSystemEntry &amp;entry, bool createParents)</div><div class='add'>+{</div><div class='add'>+    QString abspath = absoluteName(entry).nativeFilePath();</div><div class='add'>+    if (!abspath.endsWith(QLatin1Char('\\')))</div><div class='add'>+        abspath.append(QLatin1Char('\\'));</div><div class='add'>+    TInt r;</div><div class='add'>+    if (createParents)</div><div class='add'>+        r = qt_s60GetRFs().MkDirAll(qt_QString2TPtrC(abspath));</div><div class='add'>+    else</div><div class='add'>+        r = qt_s60GetRFs().MkDir(qt_QString2TPtrC(abspath));</div><div class='add'>+    if (createParents &amp;&amp; r == KErrAlreadyExists)</div><div class='add'>+        return true; //# Qt5 - QDir::mkdir returns false for existing dir, QDir::mkpath returns true (should be made consistent in Qt 5)</div><div class='add'>+    return (r == KErrNone);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::removeDirectory(const QFileSystemEntry &amp;entry, bool removeEmptyParents)</div><div class='add'>+{</div><div class='add'>+    QString abspath = absoluteName(entry).nativeFilePath();</div><div class='add'>+    if (!abspath.endsWith(QLatin1Char('\\')))</div><div class='add'>+        abspath.append(QLatin1Char('\\'));</div><div class='add'>+    TPtrC dir(qt_QString2TPtrC(abspath));</div><div class='add'>+    RFs&amp; fs = qt_s60GetRFs();</div><div class='add'>+    bool ok = false;</div><div class='add'>+    //behaviour of FS file engine:</div><div class='add'>+    //returns true if the directory could be removed</div><div class='add'>+    //success/failure of removing parent directories does not matter</div><div class='add'>+    while (KErrNone == fs.RmDir(dir)) {</div><div class='add'>+        ok = true;</div><div class='add'>+        if (!removeEmptyParents)</div><div class='add'>+            break;</div><div class='add'>+        //RFs::RmDir treats "c:\foo\bar" and "c:\foo\" the same, so it is sufficient to remove the last \ to the end</div><div class='add'>+        dir.Set(dir.Left(dir.LocateReverse(TChar('\\'))));</div><div class='add'>+    }</div><div class='add'>+    return ok;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::createLink(const QFileSystemEntry &amp;source, const QFileSystemEntry &amp;target, QSystemError &amp;error)</div><div class='add'>+{</div><div class='add'>+    Q_UNUSED(source)</div><div class='add'>+    Q_UNUSED(target)</div><div class='add'>+    error = QSystemError(KErrNotSupported, QSystemError::NativeError);</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::copyFile(const QFileSystemEntry &amp;source, const QFileSystemEntry &amp;target, QSystemError &amp;error)</div><div class='add'>+{</div><div class='add'>+    //CFileMan is allocated each time because it is not thread-safe</div><div class='add'>+    CFileMan *fm = 0;</div><div class='add'>+    TRAPD(err, fm = CFileMan::NewL(qt_s60GetRFs()));</div><div class='add'>+    if (err == KErrNone) {</div><div class='add'>+        err = fm-&gt;Copy(qt_QString2TPtrC(absoluteName(source).nativeFilePath()), qt_QString2TPtrC(absoluteName(target).nativeFilePath()), 0);</div><div class='add'>+        delete fm;</div><div class='add'>+    }</div><div class='add'>+    if (err == KErrNone)</div><div class='add'>+        return true;</div><div class='add'>+    error = QSystemError(err, QSystemError::NativeError);</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::renameFile(const QFileSystemEntry &amp;source, const QFileSystemEntry &amp;target, QSystemError &amp;error)</div><div class='add'>+{</div><div class='add'>+    QString sourcepath = absoluteName(source).nativeFilePath();</div><div class='add'>+    QString targetpath = absoluteName(target).nativeFilePath();</div><div class='add'>+    RFs&amp; fs(qt_s60GetRFs());</div><div class='add'>+    TInt err = fs.Rename(qt_QString2TPtrC(sourcepath), qt_QString2TPtrC(targetpath));</div><div class='add'>+    if (err == KErrNone)</div><div class='add'>+        return true;</div><div class='add'>+    error = QSystemError(err, QSystemError::NativeError);</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::removeFile(const QFileSystemEntry &amp;entry, QSystemError &amp;error)</div><div class='add'>+{</div><div class='add'>+    QString targetpath = absoluteName(entry).nativeFilePath();</div><div class='add'>+    RFs&amp; fs(qt_s60GetRFs());</div><div class='add'>+    TInt err = fs.Delete(qt_QString2TPtrC(targetpath));</div><div class='add'>+    if (err == KErrNone)</div><div class='add'>+        return true;</div><div class='add'>+    error = QSystemError(err, QSystemError::NativeError);</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::setPermissions(const QFileSystemEntry &amp;entry, QFile::Permissions permissions, QSystemError &amp;error, QFileSystemMetaData *data)</div><div class='add'>+{</div><div class='add'>+    QString targetpath = absoluteName(entry).nativeFilePath();</div><div class='add'>+    TUint setmask = 0;</div><div class='add'>+    TUint clearmask = 0;</div><div class='add'>+    RFs&amp; fs(qt_s60GetRFs());</div><div class='add'>+    if (permissions &amp; (QFile::WriteOwner | QFile::WriteUser | QFile::WriteGroup | QFile::WriteOther))</div><div class='add'>+        clearmask = KEntryAttReadOnly; //if anyone can write, it's not read-only</div><div class='add'>+    else</div><div class='add'>+        setmask = KEntryAttReadOnly;</div><div class='add'>+    TInt err = fs.SetAtt(qt_QString2TPtrC(targetpath), setmask, clearmask);</div><div class='add'>+    if (data &amp;&amp; !err) {</div><div class='add'>+        data-&gt;entryFlags &amp;= ~QFileSystemMetaData::Permissions;</div><div class='add'>+        data-&gt;entryFlags |= QFileSystemMetaData::MetaDataFlag(uint(permissions));</div><div class='add'>+        data-&gt;knownFlagsMask |= QFileSystemMetaData::Permissions;</div><div class='add'>+    }</div><div class='add'>+    if (err == KErrNone)</div><div class='add'>+        return true;</div><div class='add'>+    error = QSystemError(err, QSystemError::NativeError);</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QFileSystemEngine::homePath()</div><div class='add'>+{</div><div class='add'>+    QString home = QDir::fromNativeSeparators(qt_TDesC2QString(PathInfo::PhoneMemoryRootPath()));</div><div class='add'>+    if(home.endsWith(QLatin1Char('/')))</div><div class='add'>+        home.chop(1);</div><div class='add'>+    return home;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QFileSystemEngine::rootPath()</div><div class='add'>+{</div><div class='add'>+    TChar drive;</div><div class='add'>+    TInt err = RFs::DriveToChar(RFs::GetSystemDrive(), drive); //RFs::GetSystemDriveChar not supported on S60 3.1</div><div class='add'>+    Q_ASSERT(err == KErrNone); //RFs::GetSystemDrive() shall always return a convertible drive number on a valid OS configuration</div><div class='add'>+    return QString(QChar(drive)).append(QLatin1String(":/"));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QFileSystemEngine::tempPath()</div><div class='add'>+{</div><div class='add'>+    return rootPath().append(QLatin1String("system/temp"));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::setCurrentPath(const QFileSystemEntry &amp;entry)</div><div class='add'>+{</div><div class='add'>+    QFileSystemMetaData meta;</div><div class='add'>+    QFileSystemEntry absname = absoluteName(entry);</div><div class='add'>+    fillMetaData(absname, meta, QFileSystemMetaData::ExistsAttribute | QFileSystemMetaData::DirectoryType);</div><div class='add'>+    if(!(meta.exists() &amp;&amp; meta.isDirectory()))</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+    RFs&amp; fs = qt_s60GetRFs();</div><div class='add'>+    QString abspath = absname.nativeFilePath();</div><div class='add'>+    if(!abspath.endsWith(QLatin1Char('\\')))</div><div class='add'>+        abspath.append(QLatin1Char('\\'));</div><div class='add'>+    TInt r = fs.SetSessionPath(qt_QString2TPtrC(abspath));</div><div class='add'>+    //SetSessionPath succeeds for non existent directory, which is why it's checked above</div><div class='add'>+    if (r == KErrNone) {</div><div class='add'>+        __ASSERT_COMPILE(sizeof(wchar_t) == sizeof(unsigned short));</div><div class='add'>+        //attempt to set open C to the same path</div><div class='add'>+        r = ::wchdir(reinterpret_cast&lt;const wchar_t *&gt;(absname.filePath().utf16()));</div><div class='add'>+        if (r &lt; 0)</div><div class='add'>+            qWarning("failed to sync path to open C");</div><div class='add'>+        return true;</div><div class='add'>+    }</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QFileSystemEntry QFileSystemEngine::currentPath()</div><div class='add'>+{</div><div class='add'>+    TFileName fn;</div><div class='add'>+    QFileSystemEntry ret;</div><div class='add'>+    TInt r = qt_s60GetRFs().SessionPath(fn);</div><div class='add'>+    if(r == KErrNone) {</div><div class='add'>+        //remove terminating slash from non root paths (session path is clean, absolute and always ends in a \)</div><div class='add'>+        if(fn.Length() &gt; 3 &amp;&amp; fn[fn.Length() - 1] == '\\')</div><div class='add'>+            fn.SetLength(fn.Length() - 1);</div><div class='add'>+        ret = QFileSystemEntry(qt_TDesC2QString(fn), QFileSystemEntry::FromNativePath());</div><div class='add'>+    }</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp<br/>new file mode 100644<br/>index 0000000..f1e0758<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemengine_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemengine_unix.cpp</a></div><div class='hunk'>@@ -0,0 +1,661 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qplatformdefs.h"</div><div class='add'>+#include "qfilesystemengine_p.h"</div><div class='add'>+#include "qplatformdefs.h"</div><div class='add'>+#include "qfsfileengine.h"</div><div class='add'>+#include "qfile.h"</div><div class='add'>+</div><div class='add'>+#include &lt;QtCore/qvarlengtharray.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;stdlib.h&gt; // for realpath()</div><div class='add'>+#include &lt;unistd.h&gt;</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_MAC)</div><div class='add'>+# include &lt;QtCore/private/qcore_mac_p.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+#if !defined(QWS) &amp;&amp; !defined(Q_WS_QPA) &amp;&amp; defined(Q_OS_MAC)</div><div class='add'>+static inline bool _q_isMacHidden(const char *nativePath)</div><div class='add'>+{</div><div class='add'>+    OSErr err;</div><div class='add'>+</div><div class='add'>+    FSRef fsRef;</div><div class='add'>+    err = FSPathMakeRefWithOptions(reinterpret_cast&lt;const UInt8 *&gt;(nativePath),</div><div class='add'>+            kFSPathMakeRefDoNotFollowLeafSymlink, &amp;fsRef, 0);</div><div class='add'>+    if (err != noErr)</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+    FSCatalogInfo catInfo;</div><div class='add'>+    err = FSGetCatalogInfo(&amp;fsRef, kFSCatInfoFinderInfo, &amp;catInfo, NULL, NULL, NULL);</div><div class='add'>+    if (err != noErr)</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+    FileInfo * const fileInfo = reinterpret_cast&lt;FileInfo*&gt;(&amp;catInfo.finderInfo);</div><div class='add'>+    return (fileInfo-&gt;finderFlags &amp; kIsInvisible);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline bool _q_isMacHidden(const char *nativePath)</div><div class='add'>+{</div><div class='add'>+    Q_UNUSED(nativePath);</div><div class='add'>+    // no-op</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+bool QFileSystemEngine::isCaseSensitive()</div><div class='add'>+{</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QFileSystemEntry QFileSystemEngine::getLinkTarget(const QFileSystemEntry &amp;link, QFileSystemMetaData &amp;data)</div><div class='add'>+{</div><div class='add'>+#if defined(__GLIBC__) &amp;&amp; !defined(PATH_MAX)</div><div class='add'>+#define PATH_CHUNK_SIZE 256</div><div class='add'>+    char *s = 0;</div><div class='add'>+    int len = -1;</div><div class='add'>+    int size = PATH_CHUNK_SIZE;</div><div class='add'>+</div><div class='add'>+    while (1) {</div><div class='add'>+        s = (char *) ::realloc(s, size);</div><div class='add'>+        Q_CHECK_PTR(s);</div><div class='add'>+        len = ::readlink(link.nativeFilePath().constData(), s, size);</div><div class='add'>+        if (len &lt; 0) {</div><div class='add'>+            ::free(s);</div><div class='add'>+            break;</div><div class='add'>+        }</div><div class='add'>+        if (len &lt; size) {</div><div class='add'>+            break;</div><div class='add'>+        }</div><div class='add'>+        size *= 2;</div><div class='add'>+    }</div><div class='add'>+#else</div><div class='add'>+    char s[PATH_MAX+1];</div><div class='add'>+    int len = readlink(link.nativeFilePath().constData(), s, PATH_MAX);</div><div class='add'>+#endif</div><div class='add'>+    if (len &gt; 0) {</div><div class='add'>+        QString ret;</div><div class='add'>+        if (!data.hasFlags(QFileSystemMetaData::DirectoryType))</div><div class='add'>+            fillMetaData(link, data, QFileSystemMetaData::DirectoryType);</div><div class='add'>+        if (data.isDirectory() &amp;&amp; s[0] != '/') {</div><div class='add'>+            QDir parent(link.filePath());</div><div class='add'>+            parent.cdUp();</div><div class='add'>+            ret = parent.path();</div><div class='add'>+            if (!ret.isEmpty() &amp;&amp; !ret.endsWith(QLatin1Char('/')))</div><div class='add'>+                ret += QLatin1Char('/');</div><div class='add'>+        }</div><div class='add'>+        s[len] = '\0';</div><div class='add'>+        ret += QFile::decodeName(QByteArray(s));</div><div class='add'>+#if defined(__GLIBC__) &amp;&amp; !defined(PATH_MAX)</div><div class='add'>+        ::free(s);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+        if (!ret.startsWith(QLatin1Char('/'))) {</div><div class='add'>+            if (link.filePath().startsWith(QLatin1Char('/'))) {</div><div class='add'>+                ret.prepend(link.filePath().left(link.filePath().lastIndexOf(QLatin1Char('/')))</div><div class='add'>+                            + QLatin1Char('/'));</div><div class='add'>+            } else {</div><div class='add'>+                ret.prepend(QDir::currentPath() + QLatin1Char('/'));</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        ret = QDir::cleanPath(ret);</div><div class='add'>+        if (ret.size() &gt; 1 &amp;&amp; ret.endsWith(QLatin1Char('/')))</div><div class='add'>+            ret.chop(1);</div><div class='add'>+        return QFileSystemEntry(ret);</div><div class='add'>+    }</div><div class='add'>+#if !defined(QWS) &amp;&amp; !defined(Q_WS_QPA) &amp;&amp; defined(Q_OS_MAC)</div><div class='add'>+    {</div><div class='add'>+        FSRef fref;</div><div class='add'>+        if (FSPathMakeRef((const UInt8 *)QFile::encodeName(QDir::cleanPath(link.filePath())).data(), &amp;fref, 0) == noErr) {</div><div class='add'>+            // TODO get the meta data info from the QFileSystemMetaData object</div><div class='add'>+            Boolean isAlias, isFolder;</div><div class='add'>+            if (FSResolveAliasFile(&amp;fref, true, &amp;isFolder, &amp;isAlias) == noErr &amp;&amp; isAlias) {</div><div class='add'>+                AliasHandle alias;</div><div class='add'>+                if (FSNewAlias(0, &amp;fref, &amp;alias) == noErr &amp;&amp; alias) {</div><div class='add'>+                    QCFString cfstr;</div><div class='add'>+                    if (FSCopyAliasInfo(alias, 0, 0, &amp;cfstr, 0, 0) == noErr)</div><div class='add'>+                        return QFileSystemEntry(QCFString::toQString(cfstr));</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    return QFileSystemEntry();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;data)</div><div class='add'>+{</div><div class='add'>+    if (entry.isEmpty() || entry.isRoot())</div><div class='add'>+        return entry;</div><div class='add'>+</div><div class='add'>+#if !defined(Q_OS_MAC) &amp;&amp; _POSIX_VERSION &lt; 200809L</div><div class='add'>+    // realpath(X,0) is not supported</div><div class='add'>+    Q_UNUSED(data);</div><div class='add'>+    return QFileSystemEntry(slowCanonicalized(absoluteName(entry).filePath()));</div><div class='add'>+#else</div><div class='add'>+    char *ret = 0;</div><div class='add'>+# if defined(Q_OS_MAC) &amp;&amp; !defined(QT_NO_CORESERVICES)</div><div class='add'>+    // Mac OS X 10.5.x doesn't support the realpath(X,0) extension we use here.</div><div class='add'>+    if (QSysInfo::MacintoshVersion &gt;= QSysInfo::MV_10_6) {</div><div class='add'>+        ret = realpath(entry.nativeFilePath().constData(), (char*)0);</div><div class='add'>+    } else {</div><div class='add'>+        // on 10.5 we can use FSRef to resolve the file path.</div><div class='add'>+        QString path = QDir::cleanPath(entry.filePath());</div><div class='add'>+        FSRef fsref;</div><div class='add'>+        if (FSPathMakeRef((const UInt8 *)path.toUtf8().data(), &amp;fsref, 0) == noErr) {</div><div class='add'>+            CFURLRef urlref = CFURLCreateFromFSRef(NULL, &amp;fsref);</div><div class='add'>+            CFStringRef canonicalPath = CFURLCopyFileSystemPath(urlref, kCFURLPOSIXPathStyle);</div><div class='add'>+            QString ret = QCFString::toQString(canonicalPath);</div><div class='add'>+            CFRelease(canonicalPath);</div><div class='add'>+            CFRelease(urlref);</div><div class='add'>+            return QFileSystemEntry(ret);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+# else</div><div class='add'>+    ret = realpath(entry.nativeFilePath().constData(), (char*)0);</div><div class='add'>+# endif</div><div class='add'>+    if (ret) {</div><div class='add'>+        data.knownFlagsMask |= QFileSystemMetaData::ExistsAttribute;</div><div class='add'>+        data.entryFlags |= QFileSystemMetaData::ExistsAttribute;</div><div class='add'>+        QString canonicalPath = QDir::cleanPath(QString::fromLocal8Bit(ret));</div><div class='add'>+        free(ret);</div><div class='add'>+        return QFileSystemEntry(canonicalPath);</div><div class='add'>+    } else if (errno == ENOENT) { // file doesn't exist</div><div class='add'>+        data.knownFlagsMask |= QFileSystemMetaData::ExistsAttribute;</div><div class='add'>+        data.entryFlags &amp;= ~(QFileSystemMetaData::ExistsAttribute);</div><div class='add'>+        return QFileSystemEntry();</div><div class='add'>+    }</div><div class='add'>+    return entry;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QFileSystemEntry QFileSystemEngine::absoluteName(const QFileSystemEntry &amp;entry)</div><div class='add'>+{</div><div class='add'>+    if (entry.isAbsolute())</div><div class='add'>+        return entry;</div><div class='add'>+</div><div class='add'>+    QByteArray orig = entry.nativeFilePath();</div><div class='add'>+    QByteArray result;</div><div class='add'>+    if (orig.isEmpty() || !orig.startsWith('/')) {</div><div class='add'>+        QFileSystemEntry cur(currentPath());</div><div class='add'>+        result = cur.nativeFilePath();</div><div class='add'>+    }</div><div class='add'>+    if (!orig.isEmpty() &amp;&amp; !(orig.length() == 1 &amp;&amp; orig[0] == '.')) {</div><div class='add'>+        if (!result.isEmpty() &amp;&amp; !result.endsWith('/'))</div><div class='add'>+            result.append('/');</div><div class='add'>+        result.append(orig);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (result.length() == 1 &amp;&amp; result[0] == '/')</div><div class='add'>+        return QFileSystemEntry(result, QFileSystemEntry::FromNativePath());</div><div class='add'>+    const bool isDir = result.endsWith('/');</div><div class='add'>+</div><div class='add'>+    /* as long as QDir::cleanPath() operates on a QString we have to convert to a string here.</div><div class='add'>+     * ideally we never convert to a string since that loses information. Please fix after</div><div class='add'>+     * we get a QByteArray version of QDir::cleanPath()</div><div class='add'>+     */</div><div class='add'>+    QFileSystemEntry resultingEntry(result, QFileSystemEntry::FromNativePath());</div><div class='add'>+    QString stringVersion = QDir::cleanPath(resultingEntry.filePath());</div><div class='add'>+    if (isDir)</div><div class='add'>+        stringVersion.append(QLatin1Char('/'));</div><div class='add'>+    return QFileSystemEntry(stringVersion);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QString QFileSystemEngine::resolveUserName(uint userId)</div><div class='add'>+{</div><div class='add'>+#if !defined(QT_NO_THREAD) &amp;&amp; defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_OPENBSD)</div><div class='add'>+    int size_max = sysconf(_SC_GETPW_R_SIZE_MAX);</div><div class='add'>+    if (size_max == -1)</div><div class='add'>+        size_max = 1024;</div><div class='add'>+    QVarLengthArray&lt;char, 1024&gt; buf(size_max);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    struct passwd *pw = 0;</div><div class='add'>+#if !defined(QT_NO_THREAD) &amp;&amp; defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_OPENBSD)</div><div class='add'>+    struct passwd entry;</div><div class='add'>+    getpwuid_r(userId, &amp;entry, buf.data(), buf.size(), &amp;pw);</div><div class='add'>+#else</div><div class='add'>+    pw = getpwuid(userId);</div><div class='add'>+#endif</div><div class='add'>+    if (pw)</div><div class='add'>+        return QFile::decodeName(QByteArray(pw-&gt;pw_name));</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QString QFileSystemEngine::resolveGroupName(uint groupId)</div><div class='add'>+{</div><div class='add'>+#if !defined(QT_NO_THREAD) &amp;&amp; defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_OPENBSD)</div><div class='add'>+    int size_max = sysconf(_SC_GETPW_R_SIZE_MAX);</div><div class='add'>+    if (size_max == -1)</div><div class='add'>+        size_max = 1024;</div><div class='add'>+    QVarLengthArray&lt;char, 1024&gt; buf(size_max);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    struct group *gr = 0;</div><div class='add'>+#if !defined(QT_NO_THREAD) &amp;&amp; defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_OPENBSD)</div><div class='add'>+    size_max = sysconf(_SC_GETGR_R_SIZE_MAX);</div><div class='add'>+    if (size_max == -1)</div><div class='add'>+        size_max = 1024;</div><div class='add'>+    buf.resize(size_max);</div><div class='add'>+    struct group entry;</div><div class='add'>+    // Some large systems have more members than the POSIX max size</div><div class='add'>+    // Loop over by doubling the buffer size (upper limit 250k)</div><div class='add'>+    for (unsigned size = size_max; size &lt; 256000; size += size)</div><div class='add'>+    {</div><div class='add'>+        buf.resize(size);</div><div class='add'>+        // ERANGE indicates that the buffer was too small</div><div class='add'>+        if (!getgrgid_r(groupId, &amp;entry, buf.data(), buf.size(), &amp;gr)</div><div class='add'>+            || errno != ERANGE)</div><div class='add'>+            break;</div><div class='add'>+    }</div><div class='add'>+#else</div><div class='add'>+    gr = getgrgid(groupId);</div><div class='add'>+#endif</div><div class='add'>+    if (gr)</div><div class='add'>+        return QFile::decodeName(QByteArray(gr-&gt;gr_name));</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if !defined(QWS) &amp;&amp; !defined(Q_WS_QPA) &amp;&amp; defined(Q_OS_MAC)</div><div class='add'>+//static</div><div class='add'>+QString QFileSystemEngine::bundleName(const QFileSystemEntry &amp;entry)</div><div class='add'>+{</div><div class='add'>+    QCFType&lt;CFURLRef&gt; url = CFURLCreateWithFileSystemPath(0, QCFString(entry.filePath()),</div><div class='add'>+            kCFURLPOSIXPathStyle, true);</div><div class='add'>+    if (QCFType&lt;CFDictionaryRef&gt; dict = CFBundleCopyInfoDictionaryForURL(url)) {</div><div class='add'>+        if (CFTypeRef name = (CFTypeRef)CFDictionaryGetValue(dict, kCFBundleNameKey)) {</div><div class='add'>+            if (CFGetTypeID(name) == CFStringGetTypeID())</div><div class='add'>+                return QCFString::toQString((CFStringRef)name);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::fillMetaData(const QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;data,</div><div class='add'>+        QFileSystemMetaData::MetaDataFlags what)</div><div class='add'>+{</div><div class='add'>+#if !defined(QWS) &amp;&amp; !defined(Q_WS_QPA) &amp;&amp; defined(Q_OS_MAC)</div><div class='add'>+    if (what &amp; QFileSystemMetaData::BundleType) {</div><div class='add'>+        if (!data.hasFlags(QFileSystemMetaData::DirectoryType))</div><div class='add'>+            what |= QFileSystemMetaData::DirectoryType;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if !defined(QWS) &amp;&amp; !defined(Q_WS_QPA) &amp;&amp; defined(Q_OS_MAC) \</div><div class='add'>+        &amp;&amp; MAC_OS_X_VERSION_MAX_ALLOWED &gt;= MAC_OS_X_VERSION_10_5</div><div class='add'>+    if (what &amp; QFileSystemMetaData::HiddenAttribute) {</div><div class='add'>+        // Mac OS &gt;= 10.5: st_flags &amp; UF_HIDDEN</div><div class='add'>+        what |= QFileSystemMetaData::PosixStatFlags;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    if (what &amp; QFileSystemMetaData::PosixStatFlags)</div><div class='add'>+        what |= QFileSystemMetaData::PosixStatFlags;</div><div class='add'>+</div><div class='add'>+    if (what &amp; QFileSystemMetaData::ExistsAttribute) {</div><div class='add'>+        //  FIXME:  Would other queries being performed provide this bit?</div><div class='add'>+        what |= QFileSystemMetaData::PosixStatFlags;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    data.entryFlags &amp;= ~what;</div><div class='add'>+</div><div class='add'>+    const char * nativeFilePath;</div><div class='add'>+    int nativeFilePathLength;</div><div class='add'>+    {</div><div class='add'>+        const QByteArray &amp;path = entry.nativeFilePath();</div><div class='add'>+        nativeFilePath = path.constData();</div><div class='add'>+        nativeFilePathLength = path.size();</div><div class='add'>+        Q_UNUSED(nativeFilePathLength);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    bool entryExists = true; // innocent until proven otherwise</div><div class='add'>+</div><div class='add'>+    QT_STATBUF statBuffer;</div><div class='add'>+    bool statBufferValid = false;</div><div class='add'>+    if (what &amp; QFileSystemMetaData::LinkType) {</div><div class='add'>+        if (QT_LSTAT(nativeFilePath, &amp;statBuffer) == 0) {</div><div class='add'>+            if (S_ISLNK(statBuffer.st_mode)) {</div><div class='add'>+                data.entryFlags |= QFileSystemMetaData::LinkType;</div><div class='add'>+            } else {</div><div class='add'>+                statBufferValid = true;</div><div class='add'>+                data.entryFlags &amp;= ~QFileSystemMetaData::PosixStatFlags;</div><div class='add'>+            }</div><div class='add'>+        } else {</div><div class='add'>+            entryExists = false;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        data.knownFlagsMask |= QFileSystemMetaData::LinkType;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (statBufferValid || (what &amp; QFileSystemMetaData::PosixStatFlags)) {</div><div class='add'>+        if (entryExists &amp;&amp; !statBufferValid)</div><div class='add'>+            statBufferValid = (QT_STAT(nativeFilePath, &amp;statBuffer) == 0);</div><div class='add'>+</div><div class='add'>+        if (statBufferValid)</div><div class='add'>+            data.fillFromStatBuf(statBuffer);</div><div class='add'>+        else {</div><div class='add'>+            entryExists = false;</div><div class='add'>+            data.creationTime_ = 0;</div><div class='add'>+            data.modificationTime_ = 0;</div><div class='add'>+            data.accessTime_ = 0;</div><div class='add'>+            data.size_ = 0;</div><div class='add'>+            data.userId_ = (uint) -2;</div><div class='add'>+            data.groupId_ = (uint) -2;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        // reset the mask</div><div class='add'>+        data.knownFlagsMask |= QFileSystemMetaData::PosixStatFlags</div><div class='add'>+            | QFileSystemMetaData::ExistsAttribute;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+#if !defined(QWS) &amp;&amp; !defined(Q_WS_QPA) &amp;&amp; defined(Q_OS_MAC)</div><div class='add'>+    if (what &amp; QFileSystemMetaData::AliasType)</div><div class='add'>+    {</div><div class='add'>+        if (entryExists) {</div><div class='add'>+            FSRef fref;</div><div class='add'>+            if (FSPathMakeRef((const UInt8 *)nativeFilePath, &amp;fref, NULL) == noErr) {</div><div class='add'>+                Boolean isAlias, isFolder;</div><div class='add'>+                if (FSIsAliasFile(&amp;fref, &amp;isAlias, &amp;isFolder) == noErr) {</div><div class='add'>+                    if (isAlias)</div><div class='add'>+                        data.entryFlags |= QFileSystemMetaData::AliasType;</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        data.knownFlagsMask |= QFileSystemMetaData::AliasType;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    if (what &amp; QFileSystemMetaData::UserPermissions) {</div><div class='add'>+        // calculate user permissions</div><div class='add'>+</div><div class='add'>+        if (entryExists) {</div><div class='add'>+            if (what &amp; QFileSystemMetaData::UserReadPermission) {</div><div class='add'>+                if (QT_ACCESS(nativeFilePath, R_OK) == 0)</div><div class='add'>+                    data.entryFlags |= QFileSystemMetaData::UserReadPermission;</div><div class='add'>+            }</div><div class='add'>+            if (what &amp; QFileSystemMetaData::UserWritePermission) {</div><div class='add'>+                if (QT_ACCESS(nativeFilePath, W_OK) == 0)</div><div class='add'>+                    data.entryFlags |= QFileSystemMetaData::UserWritePermission;</div><div class='add'>+            }</div><div class='add'>+            if (what &amp; QFileSystemMetaData::UserExecutePermission) {</div><div class='add'>+                if (QT_ACCESS(nativeFilePath, X_OK) == 0)</div><div class='add'>+                    data.entryFlags |= QFileSystemMetaData::UserExecutePermission;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        data.knownFlagsMask |= (what &amp; QFileSystemMetaData::UserPermissions);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (what &amp; QFileSystemMetaData::HiddenAttribute</div><div class='add'>+            &amp;&amp; !data.isHidden()) {</div><div class='add'>+        QString fileName = entry.fileName();</div><div class='add'>+        if ((fileName.size() &gt; 0 &amp;&amp; fileName.at(0) == QLatin1Char('.'))</div><div class='add'>+                || (entryExists &amp;&amp; _q_isMacHidden(nativeFilePath)))</div><div class='add'>+            data.entryFlags |= QFileSystemMetaData::HiddenAttribute;</div><div class='add'>+        data.knownFlagsMask |= QFileSystemMetaData::HiddenAttribute;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+#if !defined(QWS) &amp;&amp; !defined(Q_WS_QPA) &amp;&amp; defined(Q_OS_MAC)</div><div class='add'>+    if (what &amp; QFileSystemMetaData::BundleType) {</div><div class='add'>+        if (entryExists &amp;&amp; data.isDirectory()) {</div><div class='add'>+            QCFType&lt;CFStringRef&gt; path = CFStringCreateWithBytes(0,</div><div class='add'>+                    (const UInt8*)nativeFilePath, nativeFilePathLength,</div><div class='add'>+                    kCFStringEncodingUTF8, false);</div><div class='add'>+            QCFType&lt;CFURLRef&gt; url = CFURLCreateWithFileSystemPath(0, path,</div><div class='add'>+                    kCFURLPOSIXPathStyle, true);</div><div class='add'>+</div><div class='add'>+            UInt32 type, creator;</div><div class='add'>+            if (CFBundleGetPackageInfoInDirectory(url, &amp;type, &amp;creator))</div><div class='add'>+                data.entryFlags |= QFileSystemMetaData::BundleType;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        data.knownFlagsMask |= QFileSystemMetaData::BundleType;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    return data.hasFlags(what);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::createDirectory(const QFileSystemEntry &amp;entry, bool createParents)</div><div class='add'>+{</div><div class='add'>+    QString dirName = entry.filePath();</div><div class='add'>+    if (createParents) {</div><div class='add'>+        dirName = QDir::cleanPath(dirName);</div><div class='add'>+        for (int oldslash = -1, slash=0; slash != -1; oldslash = slash) {</div><div class='add'>+            slash = dirName.indexOf(QDir::separator(), oldslash+1);</div><div class='add'>+            if (slash == -1) {</div><div class='add'>+                if (oldslash == dirName.length())</div><div class='add'>+                    break;</div><div class='add'>+                slash = dirName.length();</div><div class='add'>+            }</div><div class='add'>+            if (slash) {</div><div class='add'>+                QByteArray chunk = QFile::encodeName(dirName.left(slash));</div><div class='add'>+                QT_STATBUF st;</div><div class='add'>+                if (QT_STAT(chunk, &amp;st) != -1) {</div><div class='add'>+                    if ((st.st_mode &amp; S_IFMT) != S_IFDIR)</div><div class='add'>+                        return false;</div><div class='add'>+                } else if (QT_MKDIR(chunk, 0777) != 0) {</div><div class='add'>+                    return false;</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        return true;</div><div class='add'>+    }</div><div class='add'>+#if defined(Q_OS_DARWIN)  // Mac X doesn't support trailing /'s</div><div class='add'>+    if (dirName.endsWith(QLatin1Char('/')))</div><div class='add'>+        dirName.chop(1);</div><div class='add'>+#endif</div><div class='add'>+    return (QT_MKDIR(QFile::encodeName(dirName), 0777) == 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::removeDirectory(const QFileSystemEntry &amp;entry, bool removeEmptyParents)</div><div class='add'>+{</div><div class='add'>+    if (removeEmptyParents) {</div><div class='add'>+        QString dirName = QDir::cleanPath(entry.filePath());</div><div class='add'>+        for (int oldslash = 0, slash=dirName.length(); slash &gt; 0; oldslash = slash) {</div><div class='add'>+            QByteArray chunk = QFile::encodeName(dirName.left(slash));</div><div class='add'>+            QT_STATBUF st;</div><div class='add'>+            if (QT_STAT(chunk, &amp;st) != -1) {</div><div class='add'>+                if ((st.st_mode &amp; S_IFMT) != S_IFDIR)</div><div class='add'>+                    return false;</div><div class='add'>+                if (::rmdir(chunk) != 0)</div><div class='add'>+                    return oldslash != 0;</div><div class='add'>+            } else {</div><div class='add'>+                return false;</div><div class='add'>+            }</div><div class='add'>+            slash = dirName.lastIndexOf(QDir::separator(), oldslash-1);</div><div class='add'>+        }</div><div class='add'>+        return true;</div><div class='add'>+    }</div><div class='add'>+    return rmdir(QFile::encodeName(entry.filePath())) == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::createLink(const QFileSystemEntry &amp;source, const QFileSystemEntry &amp;target, QSystemError &amp;error)</div><div class='add'>+{</div><div class='add'>+    if (::symlink(source.nativeFilePath().constData(), target.nativeFilePath().constData()) == 0)</div><div class='add'>+        return true;</div><div class='add'>+    error = QSystemError(errno, QSystemError::StandardLibraryError);</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::copyFile(const QFileSystemEntry &amp;source, const QFileSystemEntry &amp;target, QSystemError &amp;error)</div><div class='add'>+{</div><div class='add'>+    Q_UNUSED(source);</div><div class='add'>+    Q_UNUSED(target);</div><div class='add'>+    error = QSystemError(ENOSYS, QSystemError::StandardLibraryError); //Function not implemented</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::renameFile(const QFileSystemEntry &amp;source, const QFileSystemEntry &amp;target, QSystemError &amp;error)</div><div class='add'>+{</div><div class='add'>+    if (::rename(source.nativeFilePath().constData(), target.nativeFilePath().constData()) == 0)</div><div class='add'>+        return true;</div><div class='add'>+    error = QSystemError(errno, QSystemError::StandardLibraryError);</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::removeFile(const QFileSystemEntry &amp;entry, QSystemError &amp;error)</div><div class='add'>+{</div><div class='add'>+    if (unlink(entry.nativeFilePath().constData()) == 0)</div><div class='add'>+        return true;</div><div class='add'>+    error = QSystemError(errno, QSystemError::StandardLibraryError);</div><div class='add'>+    return false;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::setPermissions(const QFileSystemEntry &amp;entry, QFile::Permissions permissions, QSystemError &amp;error, QFileSystemMetaData *data)</div><div class='add'>+{</div><div class='add'>+    mode_t mode = 0;</div><div class='add'>+    if (permissions &amp; QFile::ReadOwner)</div><div class='add'>+        mode |= S_IRUSR;</div><div class='add'>+    if (permissions &amp; QFile::WriteOwner)</div><div class='add'>+        mode |= S_IWUSR;</div><div class='add'>+    if (permissions &amp; QFile::ExeOwner)</div><div class='add'>+        mode |= S_IXUSR;</div><div class='add'>+    if (permissions &amp; QFile::ReadUser)</div><div class='add'>+        mode |= S_IRUSR;</div><div class='add'>+    if (permissions &amp; QFile::WriteUser)</div><div class='add'>+        mode |= S_IWUSR;</div><div class='add'>+    if (permissions &amp; QFile::ExeUser)</div><div class='add'>+        mode |= S_IXUSR;</div><div class='add'>+    if (permissions &amp; QFile::ReadGroup)</div><div class='add'>+        mode |= S_IRGRP;</div><div class='add'>+    if (permissions &amp; QFile::WriteGroup)</div><div class='add'>+        mode |= S_IWGRP;</div><div class='add'>+    if (permissions &amp; QFile::ExeGroup)</div><div class='add'>+        mode |= S_IXGRP;</div><div class='add'>+    if (permissions &amp; QFile::ReadOther)</div><div class='add'>+        mode |= S_IROTH;</div><div class='add'>+    if (permissions &amp; QFile::WriteOther)</div><div class='add'>+        mode |= S_IWOTH;</div><div class='add'>+    if (permissions &amp; QFile::ExeOther)</div><div class='add'>+        mode |= S_IXOTH;</div><div class='add'>+</div><div class='add'>+    bool success = ::chmod(entry.nativeFilePath().constData(), mode) == 0;</div><div class='add'>+    if (success &amp;&amp; data) {</div><div class='add'>+        data-&gt;entryFlags &amp;= ~QFileSystemMetaData::Permissions;</div><div class='add'>+        data-&gt;entryFlags |= QFileSystemMetaData::MetaDataFlag(uint(permissions));</div><div class='add'>+        data-&gt;knownFlagsMask |= QFileSystemMetaData::Permissions;</div><div class='add'>+    }</div><div class='add'>+    if (!success)</div><div class='add'>+        error = QSystemError(errno, QSystemError::StandardLibraryError);</div><div class='add'>+    return success;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QFileSystemEngine::homePath()</div><div class='add'>+{</div><div class='add'>+    QString home = QFile::decodeName(qgetenv("HOME"));</div><div class='add'>+    if (home.isNull())</div><div class='add'>+        home = rootPath();</div><div class='add'>+    return QDir::cleanPath(home);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QFileSystemEngine::rootPath()</div><div class='add'>+{</div><div class='add'>+    return QLatin1String("/");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QFileSystemEngine::tempPath()</div><div class='add'>+{</div><div class='add'>+#ifdef QT_UNIX_TEMP_PATH_OVERRIDE</div><div class='add'>+    return QLatin1String(QT_UNIX_TEMP_PATH_OVERRIDE);</div><div class='add'>+#else</div><div class='add'>+    QString temp = QFile::decodeName(qgetenv("TMPDIR"));</div><div class='add'>+    if (temp.isEmpty())</div><div class='add'>+        temp = QLatin1String("/tmp/");</div><div class='add'>+    return QDir::cleanPath(temp);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QFileSystemEngine::setCurrentPath(const QFileSystemEntry &amp;path)</div><div class='add'>+{</div><div class='add'>+    int r;</div><div class='add'>+    r = QT_CHDIR(path.nativeFilePath());</div><div class='add'>+    return r &gt;= 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QFileSystemEntry QFileSystemEngine::currentPath()</div><div class='add'>+{</div><div class='add'>+    QFileSystemEntry result;</div><div class='add'>+    QT_STATBUF st;</div><div class='add'>+    if (QT_STAT(".", &amp;st) == 0) {</div><div class='add'>+#if defined(__GLIBC__) &amp;&amp; !defined(PATH_MAX)</div><div class='add'>+        char *currentName = ::get_current_dir_name();</div><div class='add'>+        if (currentName) {</div><div class='add'>+            result = QFileSystemEntry(QByteArray(currentName), QFileSystemEntry::FromNativePath());</div><div class='add'>+            ::free(currentName);</div><div class='add'>+        }</div><div class='add'>+#else</div><div class='add'>+        char currentName[PATH_MAX+1];</div><div class='add'>+        if (::getcwd(currentName, PATH_MAX))</div><div class='add'>+            result = QFileSystemEntry(QByteArray(currentName), QFileSystemEntry::FromNativePath());</div><div class='add'>+# if defined(QT_DEBUG)</div><div class='add'>+        if (result.isEmpty())</div><div class='add'>+            qWarning("QFSFileEngine::currentPath: getcwd() failed");</div><div class='add'>+# endif</div><div class='add'>+#endif</div><div class='add'>+    } else {</div><div class='add'>+# if defined(QT_DEBUG)</div><div class='add'>+        qWarning("QFSFileEngine::currentPath: stat(\".\") failed");</div><div class='add'>+# endif</div><div class='add'>+    }</div><div class='add'>+    return result;</div><div class='add'>+}</div><div class='add'>+QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp<br/>new file mode 100644<br/>index 0000000..f704fc3<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemengine_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemengine_win.cpp</a></div><div class='hunk'>@@ -0,0 +1,1219 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qfilesystemengine_p.h"</div><div class='add'>+</div><div class='add'>+#define _POSIX_</div><div class='add'>+#include "qplatformdefs.h"</div><div class='add'>+#include "qabstractfileengine.h"</div><div class='add'>+#include "private/qfsfileengine_p.h"</div><div class='add'>+#include &lt;private/qsystemlibrary_p.h&gt;</div><div class='add'>+#include &lt;qdebug.h&gt;</div><div class='add'>+</div><div class='add'>+#include "qfile.h"</div><div class='add'>+#include "qdir.h"</div><div class='add'>+#include "private/qmutexpool_p.h"</div><div class='add'>+#include "qvarlengtharray.h"</div><div class='add'>+#include "qdatetime.h"</div><div class='add'>+#include "qt_windows.h"</div><div class='add'>+</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+#  include &lt;sys/types.h&gt;</div><div class='add'>+#  include &lt;direct.h&gt;</div><div class='add'>+#  include &lt;winioctl.h&gt;</div><div class='add'>+#else</div><div class='add'>+#  include &lt;types.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#include &lt;objbase.h&gt;</div><div class='add'>+#include &lt;shlobj.h&gt;</div><div class='add'>+#include &lt;initguid.h&gt;</div><div class='add'>+#include &lt;accctrl.h&gt;</div><div class='add'>+#include &lt;ctype.h&gt;</div><div class='add'>+#include &lt;limits.h&gt;</div><div class='add'>+#define SECURITY_WIN32</div><div class='add'>+#include &lt;security.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef SPI_GETPLATFORMTYPE</div><div class='add'>+#define SPI_GETPLATFORMTYPE 257</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef PATH_MAX</div><div class='add'>+#define PATH_MAX FILENAME_MAX</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef _INTPTR_T_DEFINED</div><div class='add'>+#ifdef  _WIN64</div><div class='add'>+typedef __int64             intptr_t;</div><div class='add'>+#else</div><div class='add'>+#ifdef _W64</div><div class='add'>+typedef _W64 int            intptr_t;</div><div class='add'>+#else</div><div class='add'>+typedef INT_PTR intptr_t;</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+#define _INTPTR_T_DEFINED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef INVALID_FILE_ATTRIBUTES</div><div class='add'>+#  define INVALID_FILE_ATTRIBUTES (DWORD (-1))</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+#  if !defined(REPARSE_DATA_BUFFER_HEADER_SIZE)</div><div class='add'>+typedef struct _REPARSE_DATA_BUFFER {</div><div class='add'>+    ULONG  ReparseTag;</div><div class='add'>+    USHORT ReparseDataLength;</div><div class='add'>+    USHORT Reserved;</div><div class='add'>+    union {</div><div class='add'>+        struct {</div><div class='add'>+            USHORT SubstituteNameOffset;</div><div class='add'>+            USHORT SubstituteNameLength;</div><div class='add'>+            USHORT PrintNameOffset;</div><div class='add'>+            USHORT PrintNameLength;</div><div class='add'>+            ULONG  Flags;</div><div class='add'>+            WCHAR  PathBuffer[1];</div><div class='add'>+        } SymbolicLinkReparseBuffer;</div><div class='add'>+        struct {</div><div class='add'>+            USHORT SubstituteNameOffset;</div><div class='add'>+            USHORT SubstituteNameLength;</div><div class='add'>+            USHORT PrintNameOffset;</div><div class='add'>+            USHORT PrintNameLength;</div><div class='add'>+            WCHAR  PathBuffer[1];</div><div class='add'>+        } MountPointReparseBuffer;</div><div class='add'>+        struct {</div><div class='add'>+            UCHAR  DataBuffer[1];</div><div class='add'>+        } GenericReparseBuffer;</div><div class='add'>+    };</div><div class='add'>+} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;</div><div class='add'>+#    define REPARSE_DATA_BUFFER_HEADER_SIZE  FIELD_OFFSET(REPARSE_DATA_BUFFER, GenericReparseBuffer)</div><div class='add'>+#  endif // !defined(REPARSE_DATA_BUFFER_HEADER_SIZE)</div><div class='add'>+</div><div class='add'>+#  ifndef MAXIMUM_REPARSE_DATA_BUFFER_SIZE</div><div class='add'>+#    define MAXIMUM_REPARSE_DATA_BUFFER_SIZE 16384</div><div class='add'>+#  endif</div><div class='add'>+#  ifndef IO_REPARSE_TAG_SYMLINK</div><div class='add'>+#    define IO_REPARSE_TAG_SYMLINK (0xA000000CL)</div><div class='add'>+#  endif</div><div class='add'>+#  ifndef FSCTL_GET_REPARSE_POINT</div><div class='add'>+#    define FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)</div><div class='add'>+#  endif</div><div class='add'>+#endif // !defined(Q_OS_WINCE)</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+Q_CORE_EXPORT int qt_ntfs_permission_lookup = 0;</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_WINCE)</div><div class='add'>+static QString qfsPrivateCurrentDir = QLatin1String("");</div><div class='add'>+// As none of the functions we try to resolve do exist on Windows CE</div><div class='add'>+// we use QT_NO_LIBRARY to shorten everything up a little bit.</div><div class='add'>+#define QT_NO_LIBRARY 1</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if !defined(QT_NO_LIBRARY)</div><div class='add'>+QT_BEGIN_INCLUDE_NAMESPACE</div><div class='add'>+typedef DWORD (WINAPI *PtrGetNamedSecurityInfoW)(LPWSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*);</div><div class='add'>+static PtrGetNamedSecurityInfoW ptrGetNamedSecurityInfoW = 0;</div><div class='add'>+typedef BOOL (WINAPI *PtrLookupAccountSidW)(LPCWSTR, PSID, LPWSTR, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE);</div><div class='add'>+static PtrLookupAccountSidW ptrLookupAccountSidW = 0;</div><div class='add'>+typedef VOID (WINAPI *PtrBuildTrusteeWithSidW)(PTRUSTEE_W, PSID);</div><div class='add'>+static PtrBuildTrusteeWithSidW ptrBuildTrusteeWithSidW = 0;</div><div class='add'>+typedef DWORD (WINAPI *PtrGetEffectiveRightsFromAclW)(PACL, PTRUSTEE_W, OUT PACCESS_MASK);</div><div class='add'>+static PtrGetEffectiveRightsFromAclW ptrGetEffectiveRightsFromAclW = 0;</div><div class='add'>+static TRUSTEE_W currentUserTrusteeW;</div><div class='add'>+static TRUSTEE_W worldTrusteeW;</div><div class='add'>+</div><div class='add'>+typedef BOOL (WINAPI *PtrGetUserProfileDirectoryW)(HANDLE, LPWSTR, LPDWORD);</div><div class='add'>+static PtrGetUserProfileDirectoryW ptrGetUserProfileDirectoryW = 0;</div><div class='add'>+typedef BOOL (WINAPI *PtrGetVolumePathNamesForVolumeNameW)(LPCWSTR,LPWSTR,DWORD,PDWORD);</div><div class='add'>+static PtrGetVolumePathNamesForVolumeNameW ptrGetVolumePathNamesForVolumeNameW = 0;</div><div class='add'>+QT_END_INCLUDE_NAMESPACE</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void resolveLibs()</div><div class='add'>+{</div><div class='add'>+    static bool triedResolve = false;</div><div class='add'>+    if (!triedResolve) {</div><div class='add'>+        // need to resolve the security info functions</div><div class='add'>+</div><div class='add'>+        // protect initialization</div><div class='add'>+#ifndef QT_NO_THREAD</div><div class='add'>+        QMutexLocker locker(QMutexPool::globalInstanceGet(&amp;triedResolve));</div><div class='add'>+        // check triedResolve again, since another thread may have already</div><div class='add'>+        // done the initialization</div><div class='add'>+        if (triedResolve) {</div><div class='add'>+            // another thread did initialize the security function pointers,</div><div class='add'>+            // so we shouldn't do it again.</div><div class='add'>+            return;</div><div class='add'>+        }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+        triedResolve = true;</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+        HINSTANCE advapiHnd = QSystemLibrary::load(L"advapi32");</div><div class='add'>+        if (advapiHnd) {</div><div class='add'>+            ptrGetNamedSecurityInfoW = (PtrGetNamedSecurityInfoW)GetProcAddress(advapiHnd, "GetNamedSecurityInfoW");</div><div class='add'>+            ptrLookupAccountSidW = (PtrLookupAccountSidW)GetProcAddress(advapiHnd, "LookupAccountSidW");</div><div class='add'>+            ptrBuildTrusteeWithSidW = (PtrBuildTrusteeWithSidW)GetProcAddress(advapiHnd, "BuildTrusteeWithSidW");</div><div class='add'>+            ptrGetEffectiveRightsFromAclW = (PtrGetEffectiveRightsFromAclW)GetProcAddress(advapiHnd, "GetEffectiveRightsFromAclW");</div><div class='add'>+        }</div><div class='add'>+        if (ptrBuildTrusteeWithSidW) {</div><div class='add'>+            // Create TRUSTEE for current user</div><div class='add'>+            HANDLE hnd = ::GetCurrentProcess();</div><div class='add'>+            HANDLE token = 0;</div><div class='add'>+            if (::OpenProcessToken(hnd, TOKEN_QUERY, &amp;token)) {</div><div class='add'>+                TOKEN_USER tu;</div><div class='add'>+                DWORD retsize;</div><div class='add'>+                if (::GetTokenInformation(token, TokenUser, &amp;tu, sizeof(tu), &amp;retsize))</div><div class='add'>+                    ptrBuildTrusteeWithSidW(&amp;currentUserTrusteeW, tu.User.Sid);</div><div class='add'>+                ::CloseHandle(token);</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            typedef BOOL (WINAPI *PtrAllocateAndInitializeSid)(PSID_IDENTIFIER_AUTHORITY, BYTE, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, PSID*);</div><div class='add'>+            PtrAllocateAndInitializeSid ptrAllocateAndInitializeSid = (PtrAllocateAndInitializeSid)GetProcAddress(advapiHnd, "AllocateAndInitializeSid");</div><div class='add'>+            typedef PVOID (WINAPI *PtrFreeSid)(PSID);</div><div class='add'>+            PtrFreeSid ptrFreeSid = (PtrFreeSid)GetProcAddress(advapiHnd, "FreeSid");</div><div class='add'>+            if (ptrAllocateAndInitializeSid &amp;&amp; ptrFreeSid) {</div><div class='add'>+                // Create TRUSTEE for Everyone (World)</div><div class='add'>+                SID_IDENTIFIER_AUTHORITY worldAuth = { SECURITY_WORLD_SID_AUTHORITY };</div><div class='add'>+                PSID pWorld = 0;</div><div class='add'>+                if (ptrAllocateAndInitializeSid(&amp;worldAuth, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &amp;pWorld))</div><div class='add'>+                    ptrBuildTrusteeWithSidW(&amp;worldTrusteeW, pWorld);</div><div class='add'>+                ptrFreeSid(pWorld);</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        HINSTANCE userenvHnd = QSystemLibrary::load(L"userenv");</div><div class='add'>+        if (userenvHnd)</div><div class='add'>+            ptrGetUserProfileDirectoryW = (PtrGetUserProfileDirectoryW)GetProcAddress(userenvHnd, "GetUserProfileDirectoryW");</div><div class='add'>+        HINSTANCE kernel32 = LoadLibrary(L"kernel32");</div><div class='add'>+        if(kernel32)</div><div class='add'>+            ptrGetVolumePathNamesForVolumeNameW = (PtrGetVolumePathNamesForVolumeNameW)GetProcAddress(kernel32, "GetVolumePathNamesForVolumeNameW");</div><div class='add'>+#endif</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+#endif // QT_NO_LIBRARY</div><div class='add'>+</div><div class='add'>+typedef DWORD (WINAPI *PtrNetShareEnum)(LPWSTR, DWORD, LPBYTE*, DWORD, LPDWORD, LPDWORD, LPDWORD);</div><div class='add'>+static PtrNetShareEnum ptrNetShareEnum = 0;</div><div class='add'>+typedef DWORD (WINAPI *PtrNetApiBufferFree)(LPVOID);</div><div class='add'>+static PtrNetApiBufferFree ptrNetApiBufferFree = 0;</div><div class='add'>+typedef struct _SHARE_INFO_1 {</div><div class='add'>+    LPWSTR shi1_netname;</div><div class='add'>+    DWORD shi1_type;</div><div class='add'>+    LPWSTR shi1_remark;</div><div class='add'>+} SHARE_INFO_1;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static bool resolveUNCLibs()</div><div class='add'>+{</div><div class='add'>+    static bool triedResolve = false;</div><div class='add'>+    if (!triedResolve) {</div><div class='add'>+#ifndef QT_NO_THREAD</div><div class='add'>+        QMutexLocker locker(QMutexPool::globalInstanceGet(&amp;triedResolve));</div><div class='add'>+        if (triedResolve) {</div><div class='add'>+            return ptrNetShareEnum &amp;&amp; ptrNetApiBufferFree;</div><div class='add'>+        }</div><div class='add'>+#endif</div><div class='add'>+        triedResolve = true;</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+        HINSTANCE hLib = QSystemLibrary::load(L"Netapi32");</div><div class='add'>+        if (hLib) {</div><div class='add'>+            ptrNetShareEnum = (PtrNetShareEnum)GetProcAddress(hLib, "NetShareEnum");</div><div class='add'>+            if (ptrNetShareEnum)</div><div class='add'>+                ptrNetApiBufferFree = (PtrNetApiBufferFree)GetProcAddress(hLib, "NetApiBufferFree");</div><div class='add'>+        }</div><div class='add'>+#endif</div><div class='add'>+    }</div><div class='add'>+    return ptrNetShareEnum &amp;&amp; ptrNetApiBufferFree;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static QString readSymLink(const QFileSystemEntry &amp;link)</div><div class='add'>+{</div><div class='add'>+    QString result;</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+    HANDLE handle = CreateFile((wchar_t*)link.nativeFilePath().utf16(),</div><div class='add'>+                               FILE_READ_EA,</div><div class='add'>+                               FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,</div><div class='add'>+                               0,</div><div class='add'>+                               OPEN_EXISTING,</div><div class='add'>+                               FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT,</div><div class='add'>+                               0);</div><div class='add'>+    if (handle != INVALID_HANDLE_VALUE) {</div><div class='add'>+        DWORD bufsize = MAXIMUM_REPARSE_DATA_BUFFER_SIZE;</div><div class='add'>+        REPARSE_DATA_BUFFER *rdb = (REPARSE_DATA_BUFFER*)qMalloc(bufsize);</div><div class='add'>+        DWORD retsize = 0;</div><div class='add'>+        if (::DeviceIoControl(handle, FSCTL_GET_REPARSE_POINT, 0, 0, rdb, bufsize, &amp;retsize, 0)) {</div><div class='add'>+            if (rdb-&gt;ReparseTag == IO_REPARSE_TAG_MOUNT_POINT) {</div><div class='add'>+                int length = rdb-&gt;MountPointReparseBuffer.SubstituteNameLength / sizeof(wchar_t);</div><div class='add'>+                int offset = rdb-&gt;MountPointReparseBuffer.SubstituteNameOffset / sizeof(wchar_t);</div><div class='add'>+                const wchar_t* PathBuffer = &amp;rdb-&gt;MountPointReparseBuffer.PathBuffer[offset];</div><div class='add'>+                result = QString::fromWCharArray(PathBuffer, length);</div><div class='add'>+            } else if (rdb-&gt;ReparseTag == IO_REPARSE_TAG_SYMLINK) {</div><div class='add'>+                int length = rdb-&gt;SymbolicLinkReparseBuffer.SubstituteNameLength / sizeof(wchar_t);</div><div class='add'>+                int offset = rdb-&gt;SymbolicLinkReparseBuffer.SubstituteNameOffset / sizeof(wchar_t);</div><div class='add'>+                const wchar_t* PathBuffer = &amp;rdb-&gt;SymbolicLinkReparseBuffer.PathBuffer[offset];</div><div class='add'>+                result = QString::fromWCharArray(PathBuffer, length);</div><div class='add'>+            }</div><div class='add'>+            // cut-off "//?/" and "/??/"</div><div class='add'>+            if (result.size() &gt; 4 &amp;&amp; result.at(0) == QLatin1Char('\\') &amp;&amp; result.at(2) == QLatin1Char('?') &amp;&amp; result.at(3) == QLatin1Char('\\'))</div><div class='add'>+                result = result.mid(4);</div><div class='add'>+        }</div><div class='add'>+        qFree(rdb);</div><div class='add'>+        CloseHandle(handle);</div><div class='add'>+</div><div class='add'>+#if !defined(QT_NO_LIBRARY)</div><div class='add'>+        resolveLibs();</div><div class='add'>+        if (ptrGetVolumePathNamesForVolumeNameW) {</div><div class='add'>+            QRegExp matchVolName(QLatin1String("^Volume\\{([a-z]|[0-9]|-)+\\}\\\\"), Qt::CaseInsensitive);</div><div class='add'>+            if(matchVolName.indexIn(result) == 0) {</div><div class='add'>+                DWORD len;</div><div class='add'>+                wchar_t buffer[MAX_PATH];</div><div class='add'>+                QString volumeName = result.mid(0, matchVolName.matchedLength()).prepend(QLatin1String("\\\\?\\"));</div><div class='add'>+                if(ptrGetVolumePathNamesForVolumeNameW((wchar_t*)volumeName.utf16(), buffer, MAX_PATH, &amp;len) != 0)</div><div class='add'>+                    result.replace(0,matchVolName.matchedLength(), QString::fromWCharArray(buffer));</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+#endif</div><div class='add'>+    }</div><div class='add'>+#else</div><div class='add'>+    Q_UNUSED(link);</div><div class='add'>+#endif // Q_OS_WINCE</div><div class='add'>+    return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static QString readLink(const QFileSystemEntry &amp;link)</div><div class='add'>+{</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+#if !defined(QT_NO_LIBRARY) &amp;&amp; !defined(Q_CC_MWERKS)</div><div class='add'>+    QString ret;</div><div class='add'>+</div><div class='add'>+    bool neededCoInit = false;</div><div class='add'>+    IShellLink *psl;                            // pointer to IShellLink i/f</div><div class='add'>+    WIN32_FIND_DATA wfd;</div><div class='add'>+    wchar_t szGotPath[MAX_PATH];</div><div class='add'>+</div><div class='add'>+    // Get pointer to the IShellLink interface.</div><div class='add'>+    HRESULT hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, (LPVOID *)&amp;psl);</div><div class='add'>+</div><div class='add'>+    if (hres == CO_E_NOTINITIALIZED) { // COM was not initialized</div><div class='add'>+        neededCoInit = true;</div><div class='add'>+        CoInitialize(NULL);</div><div class='add'>+        hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,</div><div class='add'>+                                    IID_IShellLink, (LPVOID *)&amp;psl);</div><div class='add'>+    }</div><div class='add'>+    if (SUCCEEDED(hres)) {    // Get pointer to the IPersistFile interface.</div><div class='add'>+        IPersistFile *ppf;</div><div class='add'>+        hres = psl-&gt;QueryInterface(IID_IPersistFile, (LPVOID *)&amp;ppf);</div><div class='add'>+        if (SUCCEEDED(hres))  {</div><div class='add'>+            hres = ppf-&gt;Load((LPOLESTR)link.nativeFilePath().utf16(), STGM_READ);</div><div class='add'>+            //The original path of the link is retrieved. If the file/folder</div><div class='add'>+            //was moved, the return value still have the old path.</div><div class='add'>+            if (SUCCEEDED(hres)) {</div><div class='add'>+                if (psl-&gt;GetPath(szGotPath, MAX_PATH, &amp;wfd, SLGP_UNCPRIORITY) == NOERROR)</div><div class='add'>+                    ret = QString::fromWCharArray(szGotPath);</div><div class='add'>+            }</div><div class='add'>+            ppf-&gt;Release();</div><div class='add'>+        }</div><div class='add'>+        psl-&gt;Release();</div><div class='add'>+    }</div><div class='add'>+    if (neededCoInit)</div><div class='add'>+        CoUninitialize();</div><div class='add'>+</div><div class='add'>+    return ret;</div><div class='add'>+#else</div><div class='add'>+    Q_UNUSED(link);</div><div class='add'>+    return QString();</div><div class='add'>+#endif // QT_NO_LIBRARY</div><div class='add'>+#else</div><div class='add'>+    wchar_t target[MAX_PATH];</div><div class='add'>+    QString result;</div><div class='add'>+    if (SHGetShortcutTarget((wchar_t*)QFileInfo(link.filePath()).absoluteFilePath().replace(QLatin1Char('/'),QLatin1Char('\\')).utf16(), target, MAX_PATH)) {</div><div class='add'>+        result = QString::fromWCharArray(target);</div><div class='add'>+        if (result.startsWith(QLatin1Char('"')))</div><div class='add'>+            result.remove(0,1);</div><div class='add'>+        if (result.endsWith(QLatin1Char('"')))</div><div class='add'>+            result.remove(result.size()-1,1);</div><div class='add'>+    }</div><div class='add'>+    return result;</div><div class='add'>+#endif // Q_OS_WINCE</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool uncShareExists(const QString &amp;server)</div><div class='add'>+{</div><div class='add'>+    // This code assumes the UNC path is always like \\?\UNC\server...</div><div class='add'>+    QStringList parts = server.split(QLatin1Char('\\'), QString::SkipEmptyParts);</div><div class='add'>+    if (parts.count() &gt;= 3) {</div><div class='add'>+        QStringList shares;</div><div class='add'>+        if (QFileSystemEngine::uncListSharesOnServer(QLatin1String("\\\\") + parts.at(2), &amp;shares))</div><div class='add'>+            return parts.count() &gt;= 4 ? shares.contains(parts.at(3), Qt::CaseInsensitive) : true;</div><div class='add'>+    }</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool getFindData(QString path, WIN32_FIND_DATA &amp;findData)</div><div class='add'>+{</div><div class='add'>+    // path should not end with a trailing slash</div><div class='add'>+    while (path.endsWith(QLatin1Char('\\')))</div><div class='add'>+        path.chop(1);</div><div class='add'>+</div><div class='add'>+    // can't handle drives</div><div class='add'>+    if (!path.endsWith(QLatin1Char(':'))) {</div><div class='add'>+        HANDLE hFind = ::FindFirstFile((wchar_t*)path.utf16(), &amp;findData);</div><div class='add'>+        if (hFind != INVALID_HANDLE_VALUE) {</div><div class='add'>+            ::FindClose(hFind);</div><div class='add'>+            return true;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QFileSystemEngine::uncListSharesOnServer(const QString &amp;server, QStringList *list)</div><div class='add'>+{</div><div class='add'>+    if (resolveUNCLibs()) {</div><div class='add'>+        SHARE_INFO_1 *BufPtr, *p;</div><div class='add'>+        DWORD res;</div><div class='add'>+        DWORD er = 0, tr = 0, resume = 0, i;</div><div class='add'>+        do {</div><div class='add'>+            res = ptrNetShareEnum((wchar_t*)server.utf16(), 1, (LPBYTE *)&amp;BufPtr, DWORD(-1), &amp;er, &amp;tr, &amp;resume);</div><div class='add'>+            if (res == ERROR_SUCCESS || res == ERROR_MORE_DATA) {</div><div class='add'>+                p = BufPtr;</div><div class='add'>+                for (i = 1; i &lt;= er; ++i) {</div><div class='add'>+                    if (list &amp;&amp; p-&gt;shi1_type == 0)</div><div class='add'>+                        list-&gt;append(QString::fromWCharArray(p-&gt;shi1_netname));</div><div class='add'>+                    p++;</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+            ptrNetApiBufferFree(BufPtr);</div><div class='add'>+        } while (res == ERROR_MORE_DATA);</div><div class='add'>+        return res == ERROR_SUCCESS;</div><div class='add'>+    }</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QFileSystemEngine::clearWinStatData(QFileSystemMetaData &amp;data)</div><div class='add'>+{</div><div class='add'>+    data.size_ = 0;</div><div class='add'>+    data.fileAttribute_ =  0;</div><div class='add'>+    data.creationTime_ = FILETIME();</div><div class='add'>+    data.lastAccessTime_ = FILETIME();</div><div class='add'>+    data.lastWriteTime_ = FILETIME();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QFileSystemEngine::isCaseSensitive()</div><div class='add'>+{</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QFileSystemEntry QFileSystemEngine::getLinkTarget(const QFileSystemEntry &amp;link,</div><div class='add'>+                                                  QFileSystemMetaData &amp;data)</div><div class='add'>+{</div><div class='add'>+   if (data.missingFlags(QFileSystemMetaData::LinkType))</div><div class='add'>+       QFileSystemEngine::fillMetaData(link, data, QFileSystemMetaData::LinkType);</div><div class='add'>+</div><div class='add'>+    QString ret;</div><div class='add'>+    if (data.isLnkFile())</div><div class='add'>+        ret = readLink(link);</div><div class='add'>+    else if (data.isLink())</div><div class='add'>+        ret = readSymLink(link);</div><div class='add'>+    return QFileSystemEntry(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;data)</div><div class='add'>+{</div><div class='add'>+    if (data.missingFlags(QFileSystemMetaData::ExistsAttribute))</div><div class='add'>+       QFileSystemEngine::fillMetaData(entry, data, QFileSystemMetaData::ExistsAttribute);</div><div class='add'>+</div><div class='add'>+    if (data.exists())</div><div class='add'>+        return QFileSystemEntry(slowCanonicalized(absoluteName(entry).filePath()));</div><div class='add'>+    else</div><div class='add'>+        return QFileSystemEntry();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QString QFileSystemEngine::nativeAbsoluteFilePath(const QString &amp;path)</div><div class='add'>+{</div><div class='add'>+    // can be //server or //server/share</div><div class='add'>+    QString absPath;</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+    QVarLengthArray&lt;wchar_t, MAX_PATH&gt; buf(qMax(MAX_PATH, path.size() + 1));</div><div class='add'>+    wchar_t *fileName = 0;</div><div class='add'>+    DWORD retLen = GetFullPathName((wchar_t*)path.utf16(), buf.size(), buf.data(), &amp;fileName);</div><div class='add'>+    if (retLen &gt; (DWORD)buf.size()) {</div><div class='add'>+        buf.resize(retLen);</div><div class='add'>+        retLen = GetFullPathName((wchar_t*)path.utf16(), buf.size(), buf.data(), &amp;fileName);</div><div class='add'>+    }</div><div class='add'>+    if (retLen != 0)</div><div class='add'>+        absPath = QString::fromWCharArray(buf.data(), retLen);</div><div class='add'>+#else</div><div class='add'>+    if (path.startsWith(QLatin1Char('/')) || path.startsWith(QLatin1Char('\\')))</div><div class='add'>+        absPath = QDir::toNativeSeparators(path);</div><div class='add'>+    else</div><div class='add'>+        absPath = QDir::toNativeSeparators(QDir::cleanPath(qfsPrivateCurrentDir + QLatin1Char('/') + path));</div><div class='add'>+#endif</div><div class='add'>+    // This is really ugly, but GetFullPathName strips off whitespace at the end.</div><div class='add'>+    // If you for instance write ". " in the lineedit of QFileDialog,</div><div class='add'>+    // (which is an invalid filename) this function will strip the space off and viola,</div><div class='add'>+    // the file is later reported as existing. Therefore, we re-add the whitespace that</div><div class='add'>+    // was at the end of path in order to keep the filename invalid.</div><div class='add'>+    if (!path.isEmpty() &amp;&amp; path.at(path.size() - 1) == QLatin1Char(' '))</div><div class='add'>+        absPath.append(QLatin1Char(' '));</div><div class='add'>+    return absPath;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QFileSystemEntry QFileSystemEngine::absoluteName(const QFileSystemEntry &amp;entry)</div><div class='add'>+{</div><div class='add'>+    QString ret;</div><div class='add'>+</div><div class='add'>+    if (!entry.isRelative()) {</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+        if (entry.isAbsolute()</div><div class='add'>+            &amp;&amp; !entry.filePath().contains(QLatin1String("/../"))</div><div class='add'>+            &amp;&amp; !entry.filePath().contains(QLatin1String("/./"))</div><div class='add'>+            &amp;&amp; !entry.filePath().endsWith(QLatin1String("/.."))</div><div class='add'>+            &amp;&amp; !entry.filePath().endsWith(QLatin1String("/."))) {</div><div class='add'>+            ret = entry.filePath();</div><div class='add'>+        }  else {</div><div class='add'>+            ret = QDir::fromNativeSeparators(nativeAbsoluteFilePath(entry.filePath()));</div><div class='add'>+        }</div><div class='add'>+#else</div><div class='add'>+        ret = entry.filePath();</div><div class='add'>+#endif</div><div class='add'>+    } else {</div><div class='add'>+        ret = QDir::cleanPath(QDir::currentPath() + QLatin1Char('/') + entry.filePath());</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    // The path should be absolute at this point.</div><div class='add'>+    // From the docs :</div><div class='add'>+    // Absolute paths begin with the directory separator "/"</div><div class='add'>+    // (optionally preceded by a drive specification under Windows).</div><div class='add'>+    if (ret.at(0) != QLatin1Char('/')) {</div><div class='add'>+        Q_ASSERT(ret.length() &gt;= 2);</div><div class='add'>+        Q_ASSERT(ret.at(0).isLetter());</div><div class='add'>+        Q_ASSERT(ret.at(1) == QLatin1Char(':'));</div><div class='add'>+</div><div class='add'>+        // Force uppercase drive letters.</div><div class='add'>+        ret[0] = ret.at(0).toUpper();</div><div class='add'>+    }</div><div class='add'>+    return QFileSystemEntry(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QString QFileSystemEngine::owner(const QFileSystemEntry &amp;entry, QAbstractFileEngine::FileOwner own)</div><div class='add'>+{</div><div class='add'>+    QString name;</div><div class='add'>+#if !defined(QT_NO_LIBRARY)</div><div class='add'>+    extern int qt_ntfs_permission_lookup;</div><div class='add'>+    if((qt_ntfs_permission_lookup &gt; 0) &amp;&amp; (QSysInfo::WindowsVersion &amp; QSysInfo::WV_NT_based)) {</div><div class='add'>+        resolveLibs();</div><div class='add'>+        if (ptrGetNamedSecurityInfoW &amp;&amp; ptrLookupAccountSidW) {</div><div class='add'>+            PSID pOwner = 0;</div><div class='add'>+            PSECURITY_DESCRIPTOR pSD;</div><div class='add'>+            if (ptrGetNamedSecurityInfoW((wchar_t*)entry.nativeFilePath().utf16(), SE_FILE_OBJECT,</div><div class='add'>+                                         own == QAbstractFileEngine::OwnerGroup ? GROUP_SECURITY_INFORMATION : OWNER_SECURITY_INFORMATION,</div><div class='add'>+                                         own == QAbstractFileEngine::OwnerUser ? &amp;pOwner : 0, own == QAbstractFileEngine::OwnerGroup ? &amp;pOwner : 0,</div><div class='add'>+                                         0, 0, &amp;pSD) == ERROR_SUCCESS) {</div><div class='add'>+                DWORD lowner = 64;</div><div class='add'>+                DWORD ldomain = 64;</div><div class='add'>+                QVarLengthArray&lt;wchar_t, 64&gt; owner(lowner);</div><div class='add'>+                QVarLengthArray&lt;wchar_t, 64&gt; domain(ldomain);</div><div class='add'>+                SID_NAME_USE use = SidTypeUnknown;</div><div class='add'>+                // First call, to determine size of the strings (with '\0').</div><div class='add'>+                if (!ptrLookupAccountSidW(NULL, pOwner, (LPWSTR)owner.data(), &amp;lowner,</div><div class='add'>+                                          (LPWSTR)domain.data(), &amp;ldomain, (SID_NAME_USE*)&amp;use)) {</div><div class='add'>+                    if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {</div><div class='add'>+                        if (lowner &gt; (DWORD)owner.size())</div><div class='add'>+                            owner.resize(lowner);</div><div class='add'>+                        if (ldomain &gt; (DWORD)domain.size())</div><div class='add'>+                            domain.resize(ldomain);</div><div class='add'>+                        // Second call, try on resized buf-s</div><div class='add'>+                        if (!ptrLookupAccountSidW(NULL, pOwner, (LPWSTR)owner.data(), &amp;lowner,</div><div class='add'>+                                                  (LPWSTR)domain.data(), &amp;ldomain, (SID_NAME_USE*)&amp;use)) {</div><div class='add'>+                            lowner = 0;</div><div class='add'>+                        }</div><div class='add'>+                    } else {</div><div class='add'>+                        lowner = 0;</div><div class='add'>+                    }</div><div class='add'>+                }</div><div class='add'>+                if (lowner != 0)</div><div class='add'>+                    name = QString::fromWCharArray(owner.data());</div><div class='add'>+                LocalFree(pSD);</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+#else</div><div class='add'>+    Q_UNUSED(entry);</div><div class='add'>+    Q_UNUSED(own);</div><div class='add'>+#endif</div><div class='add'>+    return name;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::fillPermissions(const QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;data,</div><div class='add'>+                                        QFileSystemMetaData::MetaDataFlags what)</div><div class='add'>+{</div><div class='add'>+    QAbstractFileEngine::FileFlags ret = 0;</div><div class='add'>+</div><div class='add'>+#if !defined(QT_NO_LIBRARY)</div><div class='add'>+    if((qt_ntfs_permission_lookup &gt; 0) &amp;&amp; (QSysInfo::WindowsVersion &amp; QSysInfo::WV_NT_based)) {</div><div class='add'>+        resolveLibs();</div><div class='add'>+        if(ptrGetNamedSecurityInfoW &amp;&amp; ptrBuildTrusteeWithSidW &amp;&amp; ptrGetEffectiveRightsFromAclW) {</div><div class='add'>+            enum { ReadMask = 0x00000001, WriteMask = 0x00000002, ExecMask = 0x00000020 };</div><div class='add'>+</div><div class='add'>+            QString fname = entry.filePath();</div><div class='add'>+            PSID pOwner = 0;</div><div class='add'>+            PSID pGroup = 0;</div><div class='add'>+            PACL pDacl;</div><div class='add'>+            PSECURITY_DESCRIPTOR pSD;</div><div class='add'>+            DWORD res = ptrGetNamedSecurityInfoW((wchar_t*)fname.utf16(), SE_FILE_OBJECT,</div><div class='add'>+                                                 OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION,</div><div class='add'>+                                                 &amp;pOwner, &amp;pGroup, &amp;pDacl, 0, &amp;pSD);</div><div class='add'>+            if(res == ERROR_SUCCESS) {</div><div class='add'>+                ACCESS_MASK access_mask;</div><div class='add'>+                TRUSTEE_W trustee;</div><div class='add'>+                if (what &amp; QFileSystemMetaData::UserPermissions) { // user</div><div class='add'>+                    data.knownFlagsMask |= QFileSystemMetaData::UserPermissions;</div><div class='add'>+                    if(ptrGetEffectiveRightsFromAclW(pDacl, &amp;currentUserTrusteeW, &amp;access_mask) != ERROR_SUCCESS)</div><div class='add'>+                        access_mask = (ACCESS_MASK)-1;</div><div class='add'>+                    if(access_mask &amp; ReadMask)</div><div class='add'>+                        data.entryFlags |= QFileSystemMetaData::UserReadPermission;</div><div class='add'>+                    if(access_mask &amp; WriteMask)</div><div class='add'>+                        data.entryFlags|= QFileSystemMetaData::UserWritePermission;</div><div class='add'>+                    if(access_mask &amp; ExecMask)</div><div class='add'>+                        data.entryFlags|= QFileSystemMetaData::UserExecutePermission;</div><div class='add'>+                }</div><div class='add'>+                if (what &amp; QFileSystemMetaData::OwnerPermissions) { // owner</div><div class='add'>+                    data.knownFlagsMask |= QFileSystemMetaData::OwnerPermissions;</div><div class='add'>+                    ptrBuildTrusteeWithSidW(&amp;trustee, pOwner);</div><div class='add'>+                    if(ptrGetEffectiveRightsFromAclW(pDacl, &amp;trustee, &amp;access_mask) != ERROR_SUCCESS)</div><div class='add'>+                        access_mask = (ACCESS_MASK)-1;</div><div class='add'>+                    if(access_mask &amp; ReadMask)</div><div class='add'>+                        data.entryFlags |= QFileSystemMetaData::OwnerReadPermission;</div><div class='add'>+                    if(access_mask &amp; WriteMask)</div><div class='add'>+                        data.entryFlags |= QFileSystemMetaData::OwnerWritePermission;</div><div class='add'>+                    if(access_mask &amp; ExecMask)</div><div class='add'>+                        data.entryFlags |= QFileSystemMetaData::OwnerExecutePermission;</div><div class='add'>+                }</div><div class='add'>+                if (what &amp; QFileSystemMetaData::GroupPermissions) { // group</div><div class='add'>+                    data.knownFlagsMask |= QFileSystemMetaData::GroupPermissions;</div><div class='add'>+                    ptrBuildTrusteeWithSidW(&amp;trustee, pGroup);</div><div class='add'>+                    if(ptrGetEffectiveRightsFromAclW(pDacl, &amp;trustee, &amp;access_mask) != ERROR_SUCCESS)</div><div class='add'>+                        access_mask = (ACCESS_MASK)-1;</div><div class='add'>+                    if(access_mask &amp; ReadMask)</div><div class='add'>+                        data.entryFlags |= QFileSystemMetaData::GroupReadPermission;</div><div class='add'>+                    if(access_mask &amp; WriteMask)</div><div class='add'>+                        data.entryFlags |= QFileSystemMetaData::GroupWritePermission;</div><div class='add'>+                    if(access_mask &amp; ExecMask)</div><div class='add'>+                        data.entryFlags |= QFileSystemMetaData::GroupExecutePermission;</div><div class='add'>+                }</div><div class='add'>+                if (what &amp; QFileSystemMetaData::OtherPermissions) { // other (world)</div><div class='add'>+                    data.knownFlagsMask |= QFileSystemMetaData::OtherPermissions;</div><div class='add'>+                    if(ptrGetEffectiveRightsFromAclW(pDacl, &amp;worldTrusteeW, &amp;access_mask) != ERROR_SUCCESS)</div><div class='add'>+                        access_mask = (ACCESS_MASK)-1; // ###</div><div class='add'>+                    if(access_mask &amp; ReadMask)</div><div class='add'>+                        data.entryFlags |= QFileSystemMetaData::OtherReadPermission;</div><div class='add'>+                    if(access_mask &amp; WriteMask)</div><div class='add'>+                        data.entryFlags |= QFileSystemMetaData::OtherWritePermission;</div><div class='add'>+                    if(access_mask &amp; ExecMask)</div><div class='add'>+                        data.entryFlags |= QFileSystemMetaData::OwnerExecutePermission;</div><div class='add'>+                }</div><div class='add'>+                LocalFree(pSD);</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    } else</div><div class='add'>+#endif</div><div class='add'>+    {</div><div class='add'>+        //### what to do with permissions if we don't use NTFS</div><div class='add'>+        // for now just add all permissions and what about exe missions ??</div><div class='add'>+        // also qt_ntfs_permission_lookup is now not set by default ... should it ?</div><div class='add'>+        data.entryFlags |= QFileSystemMetaData::OwnerReadPermission</div><div class='add'>+                           | QFileSystemMetaData::GroupReadPermission</div><div class='add'>+                           | QFileSystemMetaData::OtherReadPermission;</div><div class='add'>+</div><div class='add'>+        if (!(data.fileAttribute_ &amp; FILE_ATTRIBUTE_READONLY)) {</div><div class='add'>+            data.entryFlags |= QFileSystemMetaData::OwnerWritePermission</div><div class='add'>+                   | QFileSystemMetaData::GroupWritePermission</div><div class='add'>+                   | QFileSystemMetaData::OtherWritePermission;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        QString fname = entry.filePath();</div><div class='add'>+        QString ext = fname.right(4).toLower();</div><div class='add'>+        if (data.isDirectory() ||</div><div class='add'>+            ext == QLatin1String(".exe") || ext == QLatin1String(".com") || ext == QLatin1String(".bat") ||</div><div class='add'>+            ext == QLatin1String(".pif") || ext == QLatin1String(".cmd")) {</div><div class='add'>+            data.entryFlags |= QFileSystemMetaData::OwnerExecutePermission | QFileSystemMetaData::GroupExecutePermission</div><div class='add'>+                               | QFileSystemMetaData::OtherExecutePermission | QFileSystemMetaData::UserExecutePermission;</div><div class='add'>+        }</div><div class='add'>+        data.knownFlagsMask |= QFileSystemMetaData::OwnerPermissions | QFileSystemMetaData::GroupPermissions</div><div class='add'>+                                | QFileSystemMetaData::OtherPermissions | QFileSystemMetaData::UserExecutePermission;</div><div class='add'>+        // calculate user permissions</div><div class='add'>+        if (what &amp; QFileSystemMetaData::UserReadPermission) {</div><div class='add'>+            if (::_waccess((wchar_t*)entry.nativeFilePath().utf16(), R_OK) == 0)</div><div class='add'>+                data.entryFlags |= QFileSystemMetaData::UserReadPermission;</div><div class='add'>+            data.knownFlagsMask |= QFileSystemMetaData::UserReadPermission;</div><div class='add'>+        }</div><div class='add'>+        if (what &amp; QFileSystemMetaData::UserWritePermission) {</div><div class='add'>+            if (::_waccess((wchar_t*)entry.nativeFilePath().utf16(), W_OK) == 0)</div><div class='add'>+                data.entryFlags |= QFileSystemMetaData::UserWritePermission;</div><div class='add'>+            data.knownFlagsMask |= QFileSystemMetaData::UserReadPermission;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return data.hasFlags(what);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tryDriveUNCFallback(const QFileSystemEntry &amp;fname, QFileSystemMetaData &amp;data)</div><div class='add'>+{</div><div class='add'>+    bool entryExists = false;</div><div class='add'>+    DWORD fileAttrib = 0;</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+    if (fname.isDriveRoot()) {</div><div class='add'>+        // a valid drive ??</div><div class='add'>+        DWORD drivesBitmask = ::GetLogicalDrives();</div><div class='add'>+        int drivebit = 1 &lt;&lt; (fname.filePath().at(0).toUpper().unicode() - QLatin1Char('A').unicode());</div><div class='add'>+        if (drivesBitmask &amp; drivebit) {</div><div class='add'>+            fileAttrib = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM;</div><div class='add'>+            entryExists = true;</div><div class='add'>+        }</div><div class='add'>+    } else {</div><div class='add'>+#endif</div><div class='add'>+        const QString &amp;path = fname.nativeFilePath();</div><div class='add'>+        bool is_dir = false;</div><div class='add'>+        if (path.startsWith(QLatin1String("\\\\?\\UNC"))) {</div><div class='add'>+            // UNC - stat doesn't work for all cases (Windows bug)</div><div class='add'>+            int s = path.indexOf(path.at(0),7);</div><div class='add'>+            if (s &gt; 0) {</div><div class='add'>+                // "\\?\UNC\server\..."</div><div class='add'>+                s = path.indexOf(path.at(0),s+1);</div><div class='add'>+                if (s &gt; 0) {</div><div class='add'>+                    // "\\?\UNC\server\share\..."</div><div class='add'>+                    if (s == path.size() - 1) {</div><div class='add'>+                        // "\\?\UNC\server\share\"</div><div class='add'>+                        is_dir = true;</div><div class='add'>+                    } else {</div><div class='add'>+                        // "\\?\UNC\server\share\notfound"</div><div class='add'>+                    }</div><div class='add'>+                } else {</div><div class='add'>+                    // "\\?\UNC\server\share"</div><div class='add'>+                    is_dir = true;</div><div class='add'>+                }</div><div class='add'>+            } else {</div><div class='add'>+                // "\\?\UNC\server"</div><div class='add'>+                is_dir = true;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        if (is_dir &amp;&amp; uncShareExists(path)) {</div><div class='add'>+            // looks like a UNC dir, is a dir.</div><div class='add'>+            fileAttrib = FILE_ATTRIBUTE_DIRECTORY;</div><div class='add'>+            entryExists = true;</div><div class='add'>+        }</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    if (entryExists)</div><div class='add'>+        data.fillFromFileAttribute(fileAttrib);</div><div class='add'>+    return entryExists;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tryFindFallback(const QFileSystemEntry &amp;fname, QFileSystemMetaData &amp;data)</div><div class='add'>+{</div><div class='add'>+    bool filledData = false;</div><div class='add'>+    // This assumes the last call to a Windows API failed.</div><div class='add'>+    int errorCode = GetLastError();</div><div class='add'>+    if (errorCode == ERROR_ACCESS_DENIED || errorCode == ERROR_SHARING_VIOLATION) {</div><div class='add'>+        WIN32_FIND_DATA findData;</div><div class='add'>+        if (getFindData(fname.nativeFilePath(), findData)</div><div class='add'>+            &amp;&amp; findData.dwFileAttributes != INVALID_FILE_ATTRIBUTES) {</div><div class='add'>+            data.fillFromFindData(findData, true, fname.isDriveRoot());</div><div class='add'>+            filledData = true;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    return filledData;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::fillMetaData(int fd, QFileSystemMetaData &amp;data,</div><div class='add'>+                                     QFileSystemMetaData::MetaDataFlags what)</div><div class='add'>+{</div><div class='add'>+    HANDLE fHandle = (HANDLE)_get_osfhandle(fd);</div><div class='add'>+    if (fHandle  != INVALID_HANDLE_VALUE) {</div><div class='add'>+        return fillMetaData(fHandle, data, what);</div><div class='add'>+    }</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::fillMetaData(HANDLE fHandle, QFileSystemMetaData &amp;data,</div><div class='add'>+                                     QFileSystemMetaData::MetaDataFlags what)</div><div class='add'>+{</div><div class='add'>+    data.entryFlags &amp;= ~what;</div><div class='add'>+    clearWinStatData(data);</div><div class='add'>+    BY_HANDLE_FILE_INFORMATION fileInfo;</div><div class='add'>+    UINT oldmode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);</div><div class='add'>+    if (GetFileInformationByHandle(fHandle , &amp;fileInfo)) {</div><div class='add'>+        data.fillFromFindInfo(fileInfo);</div><div class='add'>+    }</div><div class='add'>+    SetErrorMode(oldmode);</div><div class='add'>+    return data.hasFlags(what);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::fillMetaData(const QFileSystemEntry &amp;entry, QFileSystemMetaData &amp;data,</div><div class='add'>+                                     QFileSystemMetaData::MetaDataFlags what)</div><div class='add'>+{</div><div class='add'>+    what |= QFileSystemMetaData::WinLnkType | QFileSystemMetaData::WinStatFlags;</div><div class='add'>+    data.entryFlags &amp;= ~what;</div><div class='add'>+</div><div class='add'>+    QFileSystemEntry fname;</div><div class='add'>+    data.knownFlagsMask |= QFileSystemMetaData::WinLnkType;</div><div class='add'>+    if(entry.filePath().endsWith(QLatin1String(".lnk"))) {</div><div class='add'>+        data.entryFlags |= QFileSystemMetaData::WinLnkType;</div><div class='add'>+        fname = QFileSystemEntry(readLink(entry));</div><div class='add'>+    } else {</div><div class='add'>+        fname = entry;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (fname.isEmpty()) {</div><div class='add'>+        data.knownFlagsMask |= what;</div><div class='add'>+        clearWinStatData(data);</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (what &amp; QFileSystemMetaData::WinStatFlags) {</div><div class='add'>+        UINT oldmode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);</div><div class='add'>+        clearWinStatData(data);</div><div class='add'>+        WIN32_FIND_DATA findData;</div><div class='add'>+        // The memory structure for WIN32_FIND_DATA is same as WIN32_FILE_ATTRIBUTE_DATA</div><div class='add'>+        // for all members used by fillFindData().</div><div class='add'>+        bool ok = ::GetFileAttributesEx((wchar_t*)fname.nativeFilePath().utf16(), GetFileExInfoStandard,</div><div class='add'>+                                        reinterpret_cast&lt;WIN32_FILE_ATTRIBUTE_DATA *&gt;(&amp;findData));</div><div class='add'>+        if (ok) {</div><div class='add'>+            data.fillFromFindData(findData, false, fname.isDriveRoot());</div><div class='add'>+        } else {</div><div class='add'>+            if (!tryFindFallback(fname, data))</div><div class='add'>+                tryDriveUNCFallback(fname, data);</div><div class='add'>+        }</div><div class='add'>+        SetErrorMode(oldmode);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (what &amp; QFileSystemMetaData::Permissions)</div><div class='add'>+        fillPermissions(fname, data, what);</div><div class='add'>+    if ((what &amp; QFileSystemMetaData::LinkType)</div><div class='add'>+        &amp;&amp; data.missingFlags(QFileSystemMetaData::LinkType)) {</div><div class='add'>+        data.knownFlagsMask |= QFileSystemMetaData::LinkType;</div><div class='add'>+        if (data.fileAttribute_ &amp; FILE_ATTRIBUTE_REPARSE_POINT) {</div><div class='add'>+            WIN32_FIND_DATA findData;</div><div class='add'>+            if (getFindData(fname.nativeFilePath(), findData))</div><div class='add'>+                data.fillFromFindData(findData, true);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    data.knownFlagsMask |= what;</div><div class='add'>+    return data.hasFlags(what);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mkDir(const QString &amp;path)</div><div class='add'>+{</div><div class='add'>+#if defined(Q_OS_WINCE)</div><div class='add'>+    // Unfortunately CreateDirectory returns true for paths longer than</div><div class='add'>+    // 256, but does not create a directory. It starts to fail, when</div><div class='add'>+    // path length &gt; MAX_PATH, which is 260 usually on CE.</div><div class='add'>+    // This only happens on a Windows Mobile device. Windows CE seems</div><div class='add'>+    // not to be affected by this.</div><div class='add'>+    static int platformId = 0;</div><div class='add'>+    if (platformId == 0) {</div><div class='add'>+        wchar_t platformString[64];</div><div class='add'>+        if (SystemParametersInfo(SPI_GETPLATFORMTYPE, sizeof(platformString)/sizeof(*platformString),platformString,0)) {</div><div class='add'>+            if (0 == wcscmp(platformString, L"PocketPC") || 0 == wcscmp(platformString, L"Smartphone"))</div><div class='add'>+                platformId = 1;</div><div class='add'>+            else</div><div class='add'>+                platformId = 2;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    if (platformId == 1 &amp;&amp; QFSFileEnginePrivate::longFileName(path).size() &gt; 256)</div><div class='add'>+        return false;</div><div class='add'>+#endif</div><div class='add'>+    return ::CreateDirectory((wchar_t*)QFSFileEnginePrivate::longFileName(path).utf16(), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool rmDir(const QString &amp;path)</div><div class='add'>+{</div><div class='add'>+    return ::RemoveDirectory((wchar_t*)QFSFileEnginePrivate::longFileName(path).utf16());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool isDirPath(const QString &amp;dirPath, bool *existed)</div><div class='add'>+{</div><div class='add'>+    QString path = dirPath;</div><div class='add'>+    if (path.length() == 2 &amp;&amp; path.at(1) == QLatin1Char(':'))</div><div class='add'>+        path += QLatin1Char('\\');</div><div class='add'>+</div><div class='add'>+    DWORD fileAttrib = ::GetFileAttributes((wchar_t*)QFSFileEnginePrivate::longFileName(path).utf16());</div><div class='add'>+    if (fileAttrib == INVALID_FILE_ATTRIBUTES) {</div><div class='add'>+        int errorCode = GetLastError();</div><div class='add'>+        if (errorCode == ERROR_ACCESS_DENIED || errorCode == ERROR_SHARING_VIOLATION) {</div><div class='add'>+            WIN32_FIND_DATA findData;</div><div class='add'>+            if (getFindData(QFSFileEnginePrivate::longFileName(path), findData))</div><div class='add'>+                fileAttrib = findData.dwFileAttributes;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (existed)</div><div class='add'>+        *existed = fileAttrib != INVALID_FILE_ATTRIBUTES;</div><div class='add'>+</div><div class='add'>+    if (fileAttrib == INVALID_FILE_ATTRIBUTES)</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+    return fileAttrib &amp; FILE_ATTRIBUTE_DIRECTORY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::createDirectory(const QFileSystemEntry &amp;entry, bool createParents)</div><div class='add'>+{</div><div class='add'>+    QString dirName = entry.filePath();</div><div class='add'>+    if (createParents) {</div><div class='add'>+        dirName = QDir::toNativeSeparators(QDir::cleanPath(dirName));</div><div class='add'>+        // We spefically search for / so \ would break it..</div><div class='add'>+        int oldslash = -1;</div><div class='add'>+        if (dirName.startsWith(QLatin1String("\\\\"))) {</div><div class='add'>+            // Don't try to create the root path of a UNC path;</div><div class='add'>+            // CreateDirectory() will just return ERROR_INVALID_NAME.</div><div class='add'>+            for (int i = 0; i &lt; dirName.size(); ++i) {</div><div class='add'>+                if (dirName.at(i) != QDir::separator()) {</div><div class='add'>+                    oldslash = i;</div><div class='add'>+                    break;</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+            if (oldslash != -1)</div><div class='add'>+                oldslash = dirName.indexOf(QDir::separator(), oldslash);</div><div class='add'>+        }</div><div class='add'>+        for (int slash=0; slash != -1; oldslash = slash) {</div><div class='add'>+            slash = dirName.indexOf(QDir::separator(), oldslash+1);</div><div class='add'>+            if (slash == -1) {</div><div class='add'>+                if (oldslash == dirName.length())</div><div class='add'>+                    break;</div><div class='add'>+                slash = dirName.length();</div><div class='add'>+            }</div><div class='add'>+            if (slash) {</div><div class='add'>+                QString chunk = dirName.left(slash);</div><div class='add'>+                bool existed = false;</div><div class='add'>+                if (!isDirPath(chunk, &amp;existed)) {</div><div class='add'>+                    if (!existed) {</div><div class='add'>+                        if (!mkDir(chunk))</div><div class='add'>+                            return false;</div><div class='add'>+                    } else {</div><div class='add'>+                        return false;</div><div class='add'>+                    }</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        return true;</div><div class='add'>+    }</div><div class='add'>+    return mkDir(entry.filePath());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::removeDirectory(const QFileSystemEntry &amp;entry, bool removeEmptyParents)</div><div class='add'>+{</div><div class='add'>+    QString dirName = entry.filePath();</div><div class='add'>+    if (removeEmptyParents) {</div><div class='add'>+        dirName = QDir::toNativeSeparators(QDir::cleanPath(dirName));</div><div class='add'>+        for (int oldslash = 0, slash=dirName.length(); slash &gt; 0; oldslash = slash) {</div><div class='add'>+            QString chunk = dirName.left(slash);</div><div class='add'>+            if (chunk.length() == 2 &amp;&amp; chunk.at(0).isLetter() &amp;&amp; chunk.at(1) == QLatin1Char(':'))</div><div class='add'>+                break;</div><div class='add'>+            if (!isDirPath(chunk, 0))</div><div class='add'>+                return false;</div><div class='add'>+            if (!rmDir(chunk))</div><div class='add'>+                return oldslash != 0;</div><div class='add'>+            slash = dirName.lastIndexOf(QDir::separator(), oldslash-1);</div><div class='add'>+        }</div><div class='add'>+        return true;</div><div class='add'>+    }</div><div class='add'>+    return rmDir(entry.filePath());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QString QFileSystemEngine::rootPath()</div><div class='add'>+{</div><div class='add'>+#if defined(Q_OS_WINCE)</div><div class='add'>+    QString ret = QLatin1String("/");</div><div class='add'>+#elif defined(Q_FS_FAT)</div><div class='add'>+    QString ret = QString::fromLatin1(qgetenv("SystemDrive").constData());</div><div class='add'>+    if (ret.isEmpty())</div><div class='add'>+        ret = QLatin1String("c:");</div><div class='add'>+    ret.append(QLatin1Char('/'));</div><div class='add'>+#elif defined(Q_OS_OS2EMX)</div><div class='add'>+    char dir[4];</div><div class='add'>+    _abspath(dir, QLatin1String("/"), _MAX_PATH);</div><div class='add'>+    QString ret(dir);</div><div class='add'>+#endif</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+QString QFileSystemEngine::homePath()</div><div class='add'>+{</div><div class='add'>+    QString ret;</div><div class='add'>+#if !defined(QT_NO_LIBRARY)</div><div class='add'>+    resolveLibs();</div><div class='add'>+    if (ptrGetUserProfileDirectoryW) {</div><div class='add'>+        HANDLE hnd = ::GetCurrentProcess();</div><div class='add'>+        HANDLE token = 0;</div><div class='add'>+        BOOL ok = ::OpenProcessToken(hnd, TOKEN_QUERY, &amp;token);</div><div class='add'>+        if (ok) {</div><div class='add'>+            DWORD dwBufferSize = 0;</div><div class='add'>+            // First call, to determine size of the strings (with '\0').</div><div class='add'>+            ok = ptrGetUserProfileDirectoryW(token, NULL, &amp;dwBufferSize);</div><div class='add'>+            if (!ok &amp;&amp; dwBufferSize != 0) {        // We got the required buffer size</div><div class='add'>+                wchar_t *userDirectory = new wchar_t[dwBufferSize];</div><div class='add'>+                // Second call, now we can fill the allocated buffer.</div><div class='add'>+                ok = ptrGetUserProfileDirectoryW(token, userDirectory, &amp;dwBufferSize);</div><div class='add'>+                if (ok)</div><div class='add'>+                    ret = QString::fromWCharArray(userDirectory);</div><div class='add'>+                delete [] userDirectory;</div><div class='add'>+            }</div><div class='add'>+            ::CloseHandle(token);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    if (ret.isEmpty() || !QFile::exists(ret)) {</div><div class='add'>+        ret = QString::fromLocal8Bit(qgetenv("USERPROFILE").constData());</div><div class='add'>+        if (ret.isEmpty() || !QFile::exists(ret)) {</div><div class='add'>+            ret = QString::fromLocal8Bit(qgetenv("HOMEDRIVE").constData())</div><div class='add'>+                  + QString::fromLocal8Bit(qgetenv("HOMEPATH").constData());</div><div class='add'>+            if (ret.isEmpty() || !QFile::exists(ret)) {</div><div class='add'>+                ret = QString::fromLocal8Bit(qgetenv("HOME").constData());</div><div class='add'>+                if (ret.isEmpty() || !QFile::exists(ret)) {</div><div class='add'>+#if defined(Q_OS_WINCE)</div><div class='add'>+                    ret = QLatin1String("\\My Documents");</div><div class='add'>+                    if (!QFile::exists(ret))</div><div class='add'>+#endif</div><div class='add'>+                        ret = rootPath();</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    return QDir::fromNativeSeparators(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QFileSystemEngine::tempPath()</div><div class='add'>+{</div><div class='add'>+    QString ret;</div><div class='add'>+    wchar_t tempPath[MAX_PATH];</div><div class='add'>+    DWORD len = GetTempPath(MAX_PATH, tempPath);</div><div class='add'>+    if (len)</div><div class='add'>+        ret = QString::fromWCharArray(tempPath, len);</div><div class='add'>+    if (!ret.isEmpty()) {</div><div class='add'>+        while (ret.endsWith(QLatin1Char('\\')))</div><div class='add'>+            ret.chop(1);</div><div class='add'>+        ret = QDir::fromNativeSeparators(ret);</div><div class='add'>+    }</div><div class='add'>+    if (ret.isEmpty()) {</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+        ret = QLatin1String("c:/tmp");</div><div class='add'>+#else</div><div class='add'>+        ret = QLatin1String("/Temp");</div><div class='add'>+#endif</div><div class='add'>+    }</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QFileSystemEngine::setCurrentPath(const QFileSystemEntry &amp;entry)</div><div class='add'>+{</div><div class='add'>+    QFileSystemMetaData meta;</div><div class='add'>+    fillMetaData(entry, meta, QFileSystemMetaData::ExistsAttribute | QFileSystemMetaData::DirectoryType);</div><div class='add'>+    if(!(meta.exists() &amp;&amp; meta.isDirectory()))</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+    //TODO: this should really be using nativeFilePath(), but that returns a path in long format \\?\c:\foo</div><div class='add'>+    //which causes many problems later on when it's returned through currentPath()</div><div class='add'>+    return ::SetCurrentDirectory(reinterpret_cast&lt;const wchar_t*&gt;(QDir::toNativeSeparators(entry.filePath()).utf16())) != 0;</div><div class='add'>+#else</div><div class='add'>+    qfsPrivateCurrentDir = entry.filePath();</div><div class='add'>+    return true;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QFileSystemEntry QFileSystemEngine::currentPath()</div><div class='add'>+{</div><div class='add'>+    QString ret;</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+    DWORD size = 0;</div><div class='add'>+    wchar_t currentName[PATH_MAX];</div><div class='add'>+    size = ::GetCurrentDirectory(PATH_MAX, currentName);</div><div class='add'>+    if (size != 0) {</div><div class='add'>+        if (size &gt; PATH_MAX) {</div><div class='add'>+            wchar_t *newCurrentName = new wchar_t[size];</div><div class='add'>+            if (::GetCurrentDirectory(PATH_MAX, newCurrentName) != 0)</div><div class='add'>+                ret = QString::fromWCharArray(newCurrentName, size);</div><div class='add'>+            delete [] newCurrentName;</div><div class='add'>+        } else {</div><div class='add'>+            ret = QString::fromWCharArray(currentName, size);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    if (ret.length() &gt;= 2 &amp;&amp; ret[1] == QLatin1Char(':'))</div><div class='add'>+        ret[0] = ret.at(0).toUpper(); // Force uppercase drive letters.</div><div class='add'>+#else</div><div class='add'>+    Q_UNUSED(fileName);</div><div class='add'>+    //TODO - a race condition exists when using currentPath / setCurrentPath from multiple threads</div><div class='add'>+    if (qfsPrivateCurrentDir.isEmpty())</div><div class='add'>+        qfsPrivateCurrentDir = QCoreApplication::applicationDirPath();</div><div class='add'>+</div><div class='add'>+    ret = qfsPrivateCurrentDir;</div><div class='add'>+#endif</div><div class='add'>+    return QFileSystemEntry(ret, QFileSystemEntry::FromNativePath());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::createLink(const QFileSystemEntry &amp;source, const QFileSystemEntry &amp;target, QSystemError &amp;error)</div><div class='add'>+{</div><div class='add'>+    Q_ASSERT(false);</div><div class='add'>+    Q_UNUSED(source)</div><div class='add'>+    Q_UNUSED(target)</div><div class='add'>+    Q_UNUSED(error)</div><div class='add'>+</div><div class='add'>+    return false; // TODO implement; - code needs to be moved from qfsfileengine_win.cpp</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::copyFile(const QFileSystemEntry &amp;source, const QFileSystemEntry &amp;target, QSystemError &amp;error)</div><div class='add'>+{</div><div class='add'>+    bool ret = ::CopyFile((wchar_t*)source.nativeFilePath().utf16(),</div><div class='add'>+                          (wchar_t*)target.nativeFilePath().utf16(), true) != 0;</div><div class='add'>+    if(!ret)</div><div class='add'>+        error = QSystemError(::GetLastError(), QSystemError::NativeError);</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::renameFile(const QFileSystemEntry &amp;source, const QFileSystemEntry &amp;target, QSystemError &amp;error)</div><div class='add'>+{</div><div class='add'>+    bool ret = ::MoveFile((wchar_t*)source.nativeFilePath().utf16(),</div><div class='add'>+                          (wchar_t*)target.nativeFilePath().utf16()) != 0;</div><div class='add'>+    if(!ret)</div><div class='add'>+        error = QSystemError(::GetLastError(), QSystemError::NativeError);</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::removeFile(const QFileSystemEntry &amp;entry, QSystemError &amp;error)</div><div class='add'>+{</div><div class='add'>+    bool ret = ::DeleteFile((wchar_t*)entry.nativeFilePath().utf16()) != 0;</div><div class='add'>+    if(!ret)</div><div class='add'>+        error = QSystemError(::GetLastError(), QSystemError::NativeError);</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+//static</div><div class='add'>+bool QFileSystemEngine::setPermissions(const QFileSystemEntry &amp;entry, QFile::Permissions permissions, QSystemError &amp;error,</div><div class='add'>+                                       QFileSystemMetaData *data)</div><div class='add'>+{</div><div class='add'>+    Q_UNUSED(data);</div><div class='add'>+    int mode = 0;</div><div class='add'>+</div><div class='add'>+    if (permissions &amp; QFile::ReadOwner || permissions &amp; QFile::ReadUser</div><div class='add'>+        || permissions &amp; QFile::ReadGroup || permissions &amp; QFile::ReadOther)</div><div class='add'>+        mode |= _S_IREAD;</div><div class='add'>+    if (permissions &amp; QFile::WriteOwner || permissions &amp; QFile::WriteUser</div><div class='add'>+        || permissions &amp; QFile::WriteGroup || permissions &amp; QFile::WriteOther)</div><div class='add'>+        mode |= _S_IWRITE;</div><div class='add'>+</div><div class='add'>+    if (mode == 0) // not supported</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+    bool ret = (::_wchmod((wchar_t*)entry.nativeFilePath().utf16(), mode) == 0);</div><div class='add'>+    if(!ret)</div><div class='add'>+        error = QSystemError(errno, QSystemError::StandardLibraryError);</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QDateTime fileTimeToQDateTime(const FILETIME *time)</div><div class='add'>+{</div><div class='add'>+    QDateTime ret;</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_WINCE)</div><div class='add'>+    SYSTEMTIME systime;</div><div class='add'>+    FILETIME ftime;</div><div class='add'>+    systime.wYear = 1970;</div><div class='add'>+    systime.wMonth = 1;</div><div class='add'>+    systime.wDay = 1;</div><div class='add'>+    systime.wHour = 0;</div><div class='add'>+    systime.wMinute = 0;</div><div class='add'>+    systime.wSecond = 0;</div><div class='add'>+    systime.wMilliseconds = 0;</div><div class='add'>+    systime.wDayOfWeek = 4;</div><div class='add'>+    SystemTimeToFileTime(&amp;systime, &amp;ftime);</div><div class='add'>+    unsigned __int64 acttime = (unsigned __int64)time-&gt;dwHighDateTime &lt;&lt; 32 | time-&gt;dwLowDateTime;</div><div class='add'>+    FileTimeToSystemTime(time, &amp;systime);</div><div class='add'>+    unsigned __int64 time1970 = (unsigned __int64)ftime.dwHighDateTime &lt;&lt; 32 | ftime.dwLowDateTime;</div><div class='add'>+    unsigned __int64 difftime = acttime - time1970;</div><div class='add'>+    difftime /= 10000000;</div><div class='add'>+    ret.setTime_t((unsigned int)difftime);</div><div class='add'>+#else</div><div class='add'>+    SYSTEMTIME sTime, lTime;</div><div class='add'>+    FileTimeToSystemTime(time, &amp;sTime);</div><div class='add'>+    SystemTimeToTzSpecificLocalTime(0, &amp;sTime, &amp;lTime);</div><div class='add'>+    ret.setDate(QDate(lTime.wYear, lTime.wMonth, lTime.wDay));</div><div class='add'>+    ret.setTime(QTime(lTime.wHour, lTime.wMinute, lTime.wSecond, lTime.wMilliseconds));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QDateTime QFileSystemMetaData::creationTime() const</div><div class='add'>+{</div><div class='add'>+    return fileTimeToQDateTime(&amp;creationTime_);</div><div class='add'>+}</div><div class='add'>+QDateTime QFileSystemMetaData::modificationTime() const</div><div class='add'>+{</div><div class='add'>+    return fileTimeToQDateTime(&amp;lastWriteTime_);</div><div class='add'>+}</div><div class='add'>+QDateTime QFileSystemMetaData::accessTime() const</div><div class='add'>+{</div><div class='add'>+    return fileTimeToQDateTime(&amp;lastAccessTime_);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qfilesystementry.cpp b/src/corelib/io/qfilesystementry.cpp<br/>new file mode 100644<br/>index 0000000..bb7cb4e<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystementry.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystementry.cpp</a></div><div class='hunk'>@@ -0,0 +1,383 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qfilesystementry_p.h"</div><div class='add'>+</div><div class='add'>+#include &lt;QtCore/qdir.h&gt;</div><div class='add'>+#include &lt;QtCore/qfile.h&gt;</div><div class='add'>+#include &lt;QtCore/private/qfsfileengine_p.h&gt;</div><div class='add'>+#ifdef Q_OS_WIN</div><div class='add'>+#include &lt;QtCore/qstringbuilder.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+#ifdef Q_OS_WIN</div><div class='add'>+static bool isUncRoot(const QString &amp;server)</div><div class='add'>+{</div><div class='add'>+    QString localPath = QDir::toNativeSeparators(server);</div><div class='add'>+    if (!localPath.startsWith(QLatin1String("\\\\")))</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+    int idx = localPath.indexOf(QLatin1Char('\\'), 2);</div><div class='add'>+    if (idx == -1 || idx + 1 == localPath.length())</div><div class='add'>+        return true;</div><div class='add'>+</div><div class='add'>+    localPath = localPath.right(localPath.length() - idx - 1).trimmed();</div><div class='add'>+    return localPath.isEmpty();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline QString fixIfRelativeUncPath(const QString &amp;path)</div><div class='add'>+{</div><div class='add'>+    QString currentPath = QDir::currentPath();</div><div class='add'>+    if (currentPath.startsWith(QLatin1String("//")))</div><div class='add'>+        return currentPath % QChar(QLatin1Char('/')) % path;</div><div class='add'>+    return path;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+QFileSystemEntry::QFileSystemEntry()</div><div class='add'>+    : m_lastSeparator(0),</div><div class='add'>+    m_firstDotInFileName(0),</div><div class='add'>+    m_lastDotInFileName(0)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+   \internal</div><div class='add'>+   Use this constructor when the path is supplied by user code, as it may contain a mix</div><div class='add'>+   of '/' and the native separator.</div><div class='add'>+ */</div><div class='add'>+QFileSystemEntry::QFileSystemEntry(const QString &amp;filePath)</div><div class='add'>+    : m_filePath(QDir::fromNativeSeparators(filePath)),</div><div class='add'>+    m_lastSeparator(-2),</div><div class='add'>+    m_firstDotInFileName(-2),</div><div class='add'>+    m_lastDotInFileName(0)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+   \internal</div><div class='add'>+   Use this constructor when the path is guaranteed to be in internal format, i.e. all</div><div class='add'>+   directory separators are '/' and not the native separator.</div><div class='add'>+ */</div><div class='add'>+QFileSystemEntry::QFileSystemEntry(const QString &amp;filePath, FromInternalPath /* dummy */)</div><div class='add'>+    : m_filePath(filePath),</div><div class='add'>+    m_lastSeparator(-2),</div><div class='add'>+    m_firstDotInFileName(-2),</div><div class='add'>+    m_lastDotInFileName(0)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+   \internal</div><div class='add'>+   Use this constructor when the path comes from a native API</div><div class='add'>+ */</div><div class='add'>+QFileSystemEntry::QFileSystemEntry(const NativePath &amp;nativeFilePath, FromNativePath /* dummy */)</div><div class='add'>+    : m_nativeFilePath(nativeFilePath),</div><div class='add'>+    m_lastSeparator(-2),</div><div class='add'>+    m_firstDotInFileName(-2),</div><div class='add'>+    m_lastDotInFileName(0)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QFileSystemEntry::QFileSystemEntry(const QString &amp;filePath, const NativePath &amp;nativeFilePath)</div><div class='add'>+    : m_filePath(QDir::fromNativeSeparators(filePath)),</div><div class='add'>+    m_nativeFilePath(nativeFilePath),</div><div class='add'>+    m_lastSeparator(-2),</div><div class='add'>+    m_firstDotInFileName(-2),</div><div class='add'>+    m_lastDotInFileName(0)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QFileSystemEntry::filePath() const</div><div class='add'>+{</div><div class='add'>+    resolveFilePath();</div><div class='add'>+    return m_filePath;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QFileSystemEntry::NativePath QFileSystemEntry::nativeFilePath() const</div><div class='add'>+{</div><div class='add'>+    resolveNativeFilePath();</div><div class='add'>+    return m_nativeFilePath;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QFileSystemEntry::resolveFilePath() const</div><div class='add'>+{</div><div class='add'>+    if (m_filePath.isEmpty() &amp;&amp; !m_nativeFilePath.isEmpty()) {</div><div class='add'>+#if defined(QFILESYSTEMENTRY_NATIVE_PATH_IS_UTF16)</div><div class='add'>+        m_filePath = QDir::fromNativeSeparators(m_nativeFilePath);</div><div class='add'>+#ifdef Q_OS_WIN</div><div class='add'>+        if (m_filePath.startsWith(QLatin1String("//?/UNC/")))</div><div class='add'>+            m_filePath = m_filePath.remove(2,6);</div><div class='add'>+        if (m_filePath.startsWith(QLatin1String("//?/")))</div><div class='add'>+            m_filePath = m_filePath.remove(0,4);</div><div class='add'>+#endif</div><div class='add'>+#else</div><div class='add'>+        m_filePath = QDir::fromNativeSeparators(QFile::decodeName(m_nativeFilePath));</div><div class='add'>+#endif</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QFileSystemEntry::resolveNativeFilePath() const</div><div class='add'>+{</div><div class='add'>+    if (!m_filePath.isEmpty() &amp;&amp; m_nativeFilePath.isEmpty()) {</div><div class='add'>+#ifdef Q_OS_WIN</div><div class='add'>+        QString filePath = m_filePath;</div><div class='add'>+        if (isRelative())</div><div class='add'>+            filePath = fixIfRelativeUncPath(m_filePath);</div><div class='add'>+        m_nativeFilePath = QFSFileEnginePrivate::longFileName(QDir::toNativeSeparators(filePath));</div><div class='add'>+#elif defined(QFILESYSTEMENTRY_NATIVE_PATH_IS_UTF16)</div><div class='add'>+        m_nativeFilePath = QDir::toNativeSeparators(m_filePath);</div><div class='add'>+#else</div><div class='add'>+        m_nativeFilePath = QFile::encodeName(QDir::toNativeSeparators(m_filePath));</div><div class='add'>+#endif</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QFileSystemEntry::fileName() const</div><div class='add'>+{</div><div class='add'>+    findLastSeparator();</div><div class='add'>+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)</div><div class='add'>+    if (m_lastSeparator == -1 &amp;&amp; m_filePath.length() &gt;= 2 &amp;&amp; m_filePath.at(1) == QLatin1Char(':'))</div><div class='add'>+        return m_filePath.mid(2);</div><div class='add'>+#endif</div><div class='add'>+    return m_filePath.mid(m_lastSeparator + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QFileSystemEntry::path() const</div><div class='add'>+{</div><div class='add'>+    findLastSeparator();</div><div class='add'>+    if (m_lastSeparator == -1) {</div><div class='add'>+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)</div><div class='add'>+        if (m_filePath.length() &gt;= 2 &amp;&amp; m_filePath.at(1) == QLatin1Char(':'))</div><div class='add'>+            return m_filePath.left(2);</div><div class='add'>+#endif</div><div class='add'>+        return QString(QLatin1Char('.'));</div><div class='add'>+    }</div><div class='add'>+    if (m_lastSeparator == 0)</div><div class='add'>+        return QString(QLatin1Char('/'));</div><div class='add'>+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)</div><div class='add'>+    if (m_lastSeparator == 2 &amp;&amp; m_filePath.at(1) == QLatin1Char(':'))</div><div class='add'>+        return m_filePath.left(m_lastSeparator + 1);</div><div class='add'>+#endif</div><div class='add'>+    return m_filePath.left(m_lastSeparator);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QFileSystemEntry::baseName() const</div><div class='add'>+{</div><div class='add'>+    findFileNameSeparators();</div><div class='add'>+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)</div><div class='add'>+    if (m_lastSeparator == -1 &amp;&amp; m_filePath.length() &gt;= 2 &amp;&amp; m_filePath.at(1) == QLatin1Char(':'))</div><div class='add'>+        return m_filePath.mid(2);</div><div class='add'>+#endif</div><div class='add'>+    int length = -1;</div><div class='add'>+    if (m_firstDotInFileName &gt;= 0) {</div><div class='add'>+        length = m_firstDotInFileName;</div><div class='add'>+        if (m_lastSeparator != -1) // avoid off by one</div><div class='add'>+            length--;</div><div class='add'>+    }</div><div class='add'>+    return m_filePath.mid(m_lastSeparator + 1, length);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QFileSystemEntry::completeBaseName() const</div><div class='add'>+{</div><div class='add'>+    findFileNameSeparators();</div><div class='add'>+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)</div><div class='add'>+    if (m_lastSeparator == -1 &amp;&amp; m_filePath.length() &gt;= 2 &amp;&amp; m_filePath.at(1) == QLatin1Char(':'))</div><div class='add'>+        return m_filePath.mid(2);</div><div class='add'>+#endif</div><div class='add'>+    int length = -1;</div><div class='add'>+    if (m_firstDotInFileName &gt;= 0) {</div><div class='add'>+        length = m_firstDotInFileName + m_lastDotInFileName;</div><div class='add'>+        if (m_lastSeparator != -1) // avoid off by one</div><div class='add'>+            length--;</div><div class='add'>+    }</div><div class='add'>+    return m_filePath.mid(m_lastSeparator + 1, length);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QFileSystemEntry::suffix() const</div><div class='add'>+{</div><div class='add'>+    findFileNameSeparators();</div><div class='add'>+</div><div class='add'>+    if (m_lastDotInFileName == -1)</div><div class='add'>+        return QString();</div><div class='add'>+</div><div class='add'>+    return m_filePath.mid(qMax((qint16)0, m_lastSeparator) + m_firstDotInFileName + m_lastDotInFileName + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QFileSystemEntry::completeSuffix() const</div><div class='add'>+{</div><div class='add'>+    findFileNameSeparators();</div><div class='add'>+    if (m_firstDotInFileName == -1)</div><div class='add'>+        return QString();</div><div class='add'>+</div><div class='add'>+    return m_filePath.mid(qMax((qint16)0, m_lastSeparator) + m_firstDotInFileName + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)</div><div class='add'>+bool QFileSystemEntry::isRelative() const</div><div class='add'>+{</div><div class='add'>+    resolveFilePath();</div><div class='add'>+    return (m_filePath.isEmpty() || (!m_filePath.isEmpty() &amp;&amp; (m_filePath[0].unicode() != '/')</div><div class='add'>+        &amp;&amp; (!(m_filePath.length() &gt;= 2 &amp;&amp; m_filePath[1].unicode() == ':'))));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QFileSystemEntry::isAbsolute() const</div><div class='add'>+{</div><div class='add'>+    resolveFilePath();</div><div class='add'>+    return (!m_filePath.isEmpty() &amp;&amp; ((m_filePath.length() &gt;= 3</div><div class='add'>+                                       &amp;&amp; (m_filePath[0].isLetter() &amp;&amp; m_filePath[1].unicode() == ':' &amp;&amp; m_filePath[2].unicode() == '/'))</div><div class='add'>+#ifdef Q_OS_WIN</div><div class='add'>+                                      || (m_filePath.length() &gt;= 2 &amp;&amp; (m_filePath.at(0) == QLatin1Char('/') &amp;&amp; m_filePath.at(1) == QLatin1Char('/')))</div><div class='add'>+#endif</div><div class='add'>+                                      ));</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+bool QFileSystemEntry::isRelative() const</div><div class='add'>+{</div><div class='add'>+    return !isAbsolute();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QFileSystemEntry::isAbsolute() const</div><div class='add'>+{</div><div class='add'>+    resolveFilePath();</div><div class='add'>+    return (!m_filePath.isEmpty() &amp;&amp; (m_filePath[0].unicode() == '/'));</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)</div><div class='add'>+bool QFileSystemEntry::isDriveRoot() const</div><div class='add'>+{</div><div class='add'>+    resolveFilePath();</div><div class='add'>+    return (m_filePath.length() == 3</div><div class='add'>+           &amp;&amp; m_filePath.at(0).isLetter() &amp;&amp; m_filePath.at(1) == QLatin1Char(':')</div><div class='add'>+           &amp;&amp; m_filePath.at(2) == QLatin1Char('/'));</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+bool QFileSystemEntry::isRoot() const</div><div class='add'>+{</div><div class='add'>+    resolveFilePath();</div><div class='add'>+    if (m_filePath == QLatin1String("/")</div><div class='add'>+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)</div><div class='add'>+            || isDriveRoot()</div><div class='add'>+#if defined(Q_OS_WIN)</div><div class='add'>+            || isUncRoot(m_filePath)</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+            )</div><div class='add'>+        return true;</div><div class='add'>+</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QFileSystemEntry::isEmpty() const</div><div class='add'>+{</div><div class='add'>+    resolveNativeFilePath();</div><div class='add'>+    return m_nativeFilePath.isEmpty();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// private methods</div><div class='add'>+</div><div class='add'>+void QFileSystemEntry::findLastSeparator() const</div><div class='add'>+{</div><div class='add'>+    if (m_lastSeparator == -2) {</div><div class='add'>+        resolveFilePath();</div><div class='add'>+        m_lastSeparator = -1;</div><div class='add'>+        for (int i = m_filePath.size() - 1; i &gt;= 0; --i) {</div><div class='add'>+            if (m_filePath[i].unicode() == '/') {</div><div class='add'>+                m_lastSeparator = i;</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QFileSystemEntry::findFileNameSeparators() const</div><div class='add'>+{</div><div class='add'>+    if (m_firstDotInFileName == -2) {</div><div class='add'>+        resolveFilePath();</div><div class='add'>+        int firstDotInFileName = -1;</div><div class='add'>+        int lastDotInFileName = -1;</div><div class='add'>+        int lastSeparator = m_lastSeparator;</div><div class='add'>+</div><div class='add'>+        int stop;</div><div class='add'>+        if (lastSeparator &lt; 0) {</div><div class='add'>+            lastSeparator = -1;</div><div class='add'>+            stop = 0;</div><div class='add'>+        } else {</div><div class='add'>+            stop = lastSeparator;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        int i = m_filePath.size() - 1;</div><div class='add'>+        for (; i &gt;= stop; --i) {</div><div class='add'>+            if (m_filePath[i].unicode() == '.') {</div><div class='add'>+                firstDotInFileName = lastDotInFileName = i;</div><div class='add'>+                break;</div><div class='add'>+            } else if (m_filePath[i].unicode() == '/') {</div><div class='add'>+                lastSeparator = i;</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if (lastSeparator != i) {</div><div class='add'>+            for (--i; i &gt;= stop; --i) {</div><div class='add'>+                if (m_filePath[i].unicode() == '.')</div><div class='add'>+                    firstDotInFileName = i;</div><div class='add'>+                else if (m_filePath[i].unicode() == '/') {</div><div class='add'>+                    lastSeparator = i;</div><div class='add'>+                    break;</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        m_lastSeparator = lastSeparator;</div><div class='add'>+        m_firstDotInFileName = firstDotInFileName == -1 ? -1 : firstDotInFileName - qMax(0, lastSeparator);</div><div class='add'>+        if (lastDotInFileName == -1)</div><div class='add'>+            m_lastDotInFileName = -1;</div><div class='add'>+        else if (firstDotInFileName == lastDotInFileName)</div><div class='add'>+            m_lastDotInFileName = 0;</div><div class='add'>+        else</div><div class='add'>+            m_lastDotInFileName = lastDotInFileName - firstDotInFileName;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qfilesystementry_p.h b/src/corelib/io/qfilesystementry_p.h<br/>new file mode 100644<br/>index 0000000..34b083a<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystementry_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystementry_p.h</a></div><div class='hunk'>@@ -0,0 +1,126 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QFILESYSTEMENTRY_P_H_INCLUDED</div><div class='add'>+#define QFILESYSTEMENTRY_P_H_INCLUDED</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+//  W A R N I N G</div><div class='add'>+//  -------------</div><div class='add'>+//</div><div class='add'>+// This file is not part of the Qt API.  It exists purely as an</div><div class='add'>+// implementation detail.  This header file may change from version to</div><div class='add'>+// version without notice, or even be removed.</div><div class='add'>+//</div><div class='add'>+// We mean it.</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;QtCore/qstring.h&gt;</div><div class='add'>+#include &lt;QtCore/qbytearray.h&gt;</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)</div><div class='add'>+#define QFILESYSTEMENTRY_NATIVE_PATH_IS_UTF16</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+class QFileSystemEntry</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+</div><div class='add'>+#ifndef QFILESYSTEMENTRY_NATIVE_PATH_IS_UTF16</div><div class='add'>+    typedef QByteArray NativePath;</div><div class='add'>+#else</div><div class='add'>+    typedef QString NativePath;</div><div class='add'>+#endif</div><div class='add'>+    struct FromNativePath{};</div><div class='add'>+    struct FromInternalPath{};</div><div class='add'>+</div><div class='add'>+    QFileSystemEntry();</div><div class='add'>+    explicit QFileSystemEntry(const QString &amp;filePath);</div><div class='add'>+</div><div class='add'>+    QFileSystemEntry(const QString &amp;filePath, FromInternalPath dummy);</div><div class='add'>+    QFileSystemEntry(const NativePath &amp;nativeFilePath, FromNativePath dummy);</div><div class='add'>+    QFileSystemEntry(const QString &amp;filePath, const NativePath &amp;nativeFilePath);</div><div class='add'>+</div><div class='add'>+    QString filePath() const;</div><div class='add'>+    QString fileName() const;</div><div class='add'>+    QString path() const;</div><div class='add'>+    NativePath nativeFilePath() const;</div><div class='add'>+    QString baseName() const;</div><div class='add'>+    QString completeBaseName() const;</div><div class='add'>+    QString suffix() const;</div><div class='add'>+    QString completeSuffix() const;</div><div class='add'>+    bool isAbsolute() const;</div><div class='add'>+    bool isRelative() const;</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)</div><div class='add'>+    bool isDriveRoot() const;</div><div class='add'>+#endif</div><div class='add'>+    bool isRoot() const;</div><div class='add'>+</div><div class='add'>+    bool isEmpty() const;</div><div class='add'>+    void clear()</div><div class='add'>+    {</div><div class='add'>+        *this = QFileSystemEntry();</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+private:</div><div class='add'>+    // creates the QString version out of the bytearray version</div><div class='add'>+    void resolveFilePath() const;</div><div class='add'>+    // creates the bytearray version out of the QString version</div><div class='add'>+    void resolveNativeFilePath() const;</div><div class='add'>+    // resolves the separator</div><div class='add'>+    void findLastSeparator() const;</div><div class='add'>+    // resolves the dots and the separator</div><div class='add'>+    void findFileNameSeparators() const;</div><div class='add'>+</div><div class='add'>+    mutable QString m_filePath; // always has slashes as separator</div><div class='add'>+    mutable NativePath m_nativeFilePath; // native encoding and separators</div><div class='add'>+</div><div class='add'>+    mutable qint16 m_lastSeparator; // index in m_filePath of last separator</div><div class='add'>+    mutable qint16 m_firstDotInFileName; // index after m_filePath for first dot (.)</div><div class='add'>+    mutable qint16 m_lastDotInFileName; // index after m_firstDotInFileName for last dot (.)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+#endif // include guard</div><div class='head'>diff --git a/src/corelib/io/qfilesystemiterator_p.h b/src/corelib/io/qfilesystemiterator_p.h<br/>new file mode 100644<br/>index 0000000..6f2d1e1<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemiterator_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemiterator_p.h</a></div><div class='hunk'>@@ -0,0 +1,120 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QFILESYSTEMITERATOR_P_H_INCLUDED</div><div class='add'>+#define QFILESYSTEMITERATOR_P_H_INCLUDED</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+//  W A R N I N G</div><div class='add'>+//  -------------</div><div class='add'>+//</div><div class='add'>+// This file is not part of the Qt API.  It exists purely as an</div><div class='add'>+// implementation detail.  This header file may change from version to</div><div class='add'>+// version without notice, or even be removed.</div><div class='add'>+//</div><div class='add'>+// We mean it.</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;QtCore/qglobal.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_FILESYSTEMITERATOR</div><div class='add'>+</div><div class='add'>+#include &lt;QtCore/qdir.h&gt;</div><div class='add'>+#include &lt;QtCore/qdiriterator.h&gt;</div><div class='add'>+#include &lt;QtCore/qstringlist.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;QtCore/private/qfilesystementry_p.h&gt;</div><div class='add'>+#include &lt;QtCore/private/qfilesystemmetadata_p.h&gt;</div><div class='add'>+</div><div class='add'>+// Platform-specific headers</div><div class='add'>+#if defined(Q_OS_WIN)</div><div class='add'>+#elif defined (Q_OS_SYMBIAN)</div><div class='add'>+#include &lt;f32file.h&gt;</div><div class='add'>+#else</div><div class='add'>+#include &lt;QtCore/qscopedpointer.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+class QFileSystemIterator</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    QFileSystemIterator(const QFileSystemEntry &amp;entry, QDir::Filters filters,</div><div class='add'>+            const QStringList &amp;nameFilters, QDirIterator::IteratorFlags flags</div><div class='add'>+                = QDirIterator::FollowSymlinks | QDirIterator::Subdirectories);</div><div class='add'>+    ~QFileSystemIterator();</div><div class='add'>+</div><div class='add'>+    bool advance(QFileSystemEntry &amp;fileEntry, QFileSystemMetaData &amp;metaData);</div><div class='add'>+</div><div class='add'>+private:</div><div class='add'>+    QFileSystemEntry::NativePath nativePath;</div><div class='add'>+</div><div class='add'>+    // Platform-specific data</div><div class='add'>+#if defined(Q_OS_WIN)</div><div class='add'>+    QFileSystemEntry::NativePath dirPath;</div><div class='add'>+    HANDLE findFileHandle;</div><div class='add'>+    QStringList uncShares;</div><div class='add'>+    bool uncFallback;</div><div class='add'>+    int uncShareIndex;</div><div class='add'>+    bool onlyDirs;</div><div class='add'>+#elif defined (Q_OS_SYMBIAN)</div><div class='add'>+    RDir dirHandle;</div><div class='add'>+    TEntryArray entries;</div><div class='add'>+    TInt lastError;</div><div class='add'>+    TInt entryIndex;</div><div class='add'>+#else</div><div class='add'>+    QT_DIR *dir;</div><div class='add'>+    QT_DIRENT *dirEntry;</div><div class='add'>+#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_CYGWIN)</div><div class='add'>+    // for readdir_r</div><div class='add'>+    QScopedPointer&lt;QT_DIRENT, QScopedPointerPodDeleter&gt; mt_file;</div><div class='add'>+#endif</div><div class='add'>+    int lastError;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    Q_DISABLE_COPY(QFileSystemIterator)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+#endif // QT_NO_FILESYSTEMITERATOR</div><div class='add'>+</div><div class='add'>+#endif // include guard</div><div class='head'>diff --git a/src/corelib/io/qfilesystemiterator_symbian.cpp b/src/corelib/io/qfilesystemiterator_symbian.cpp<br/>new file mode 100644<br/>index 0000000..4347f6a<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemiterator_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemiterator_symbian.cpp</a></div><div class='hunk'>@@ -0,0 +1,127 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qfilesystemiterator_p.h"</div><div class='add'>+#include "qfilesystemengine_p.h"</div><div class='add'>+#include &lt;QtCore/private/qcore_symbian_p.h&gt;</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &amp;path, QDir::Filters filters,</div><div class='add'>+        const QStringList &amp;nameFilters, QDirIterator::IteratorFlags iteratorFlags)</div><div class='add'>+        : lastError(KErrNone), entryIndex(-1)</div><div class='add'>+{</div><div class='add'>+    RFs&amp; fs = qt_s60GetRFs();</div><div class='add'>+</div><div class='add'>+    nativePath = path.nativeFilePath();</div><div class='add'>+    if (!nativePath.endsWith(QLatin1Char('\\')))</div><div class='add'>+        nativePath.append(QLatin1Char('\\'));</div><div class='add'>+</div><div class='add'>+    QString absPath = QFileSystemEngine::absoluteName(path).nativeFilePath();</div><div class='add'>+</div><div class='add'>+    if (!absPath.endsWith(QLatin1Char('\\')))</div><div class='add'>+        absPath.append(QLatin1Char('\\'));</div><div class='add'>+</div><div class='add'>+    int pathLen = absPath.length();</div><div class='add'>+    if (pathLen &gt; KMaxFileName) {</div><div class='add'>+        lastError = KErrBadName;</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    //set up server side filtering to reduce IPCs</div><div class='add'>+    //RDir won't accept all valid name filters e.g. "*. bar"</div><div class='add'>+    if (nameFilters.count() == 1 &amp;&amp; !(filters &amp; QDir::AllDirs) &amp;&amp; iteratorFlags</div><div class='add'>+        == QDirIterator::NoIteratorFlags &amp;&amp; pathLen + nameFilters[0].length()</div><div class='add'>+        &lt;= KMaxFileName) {</div><div class='add'>+        //server side supports one mask - skip this for recursive mode or if only files should be filtered</div><div class='add'>+        absPath.append(nameFilters[0]);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    TUint symbianMask = 0;</div><div class='add'>+    if ((filters &amp; QDir::Dirs) || (filters &amp; QDir::AllDirs) || (iteratorFlags</div><div class='add'>+        &amp; QDirIterator::Subdirectories))</div><div class='add'>+        symbianMask |= KEntryAttDir; //include directories</div><div class='add'>+    if (filters &amp; QDir::Hidden)</div><div class='add'>+        symbianMask |= KEntryAttHidden;</div><div class='add'>+    if (filters &amp; QDir::System)</div><div class='add'>+        symbianMask |= KEntryAttSystem;</div><div class='add'>+    if (((filters &amp; QDir::Files) == 0) &amp;&amp; symbianMask == KEntryAttDir)</div><div class='add'>+        symbianMask |= KEntryAttMatchExclusive; //exclude non-directories</div><div class='add'>+    else if (symbianMask == 0) {</div><div class='add'>+        if ((filters &amp; QDir::PermissionMask) == QDir::Writable)</div><div class='add'>+            symbianMask = KEntryAttMatchExclude | KEntryAttReadOnly;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    lastError = dirHandle.Open(fs, qt_QString2TPtrC(absPath), symbianMask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QFileSystemIterator::~QFileSystemIterator()</div><div class='add'>+{</div><div class='add'>+    dirHandle.Close();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QFileSystemIterator::advance(QFileSystemEntry &amp;fileEntry, QFileSystemMetaData &amp;metaData)</div><div class='add'>+{</div><div class='add'>+    //1st time, lastError is result of dirHandle.Open(), entries.Count() is 0 and entryIndex is -1 so initial read is triggered</div><div class='add'>+    //subsequent times, read is triggered each time we reach the end of the entry list</div><div class='add'>+    //final time, lastError is KErrEof so we don't need to read anymore.</div><div class='add'>+    ++entryIndex;</div><div class='add'>+    if (lastError == KErrNone &amp;&amp; entryIndex &gt;= entries.Count()) {</div><div class='add'>+        lastError = dirHandle.Read(entries);</div><div class='add'>+        entryIndex = 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    //each call to advance() gets the next entry from the entry list.</div><div class='add'>+    //from the final (or only) read call, KErrEof is returned together with a full buffer so we still need to go through the list</div><div class='add'>+    if ((lastError == KErrNone || lastError == KErrEof) &amp;&amp; entryIndex &lt; entries.Count()) {</div><div class='add'>+        Q_ASSERT(entryIndex &gt;= 0);</div><div class='add'>+        const TEntry &amp;entry(entries[entryIndex]);</div><div class='add'>+        fileEntry = QFileSystemEntry(nativePath + qt_TDesC2QString(entry.iName), QFileSystemEntry::FromNativePath());</div><div class='add'>+        metaData.fillFromTEntry(entry);</div><div class='add'>+        return true;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    //TODO: error reporting, to allow user to distinguish empty directory from error condition.</div><div class='add'>+</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qfilesystemiterator_unix.cpp b/src/corelib/io/qfilesystemiterator_unix.cpp<br/>new file mode 100644<br/>index 0000000..6987660<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemiterator_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemiterator_unix.cpp</a></div><div class='hunk'>@@ -0,0 +1,117 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qplatformdefs.h"</div><div class='add'>+#include "qfilesystemiterator_p.h"</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_FILESYSTEMITERATOR</div><div class='add'>+</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &amp;entry, QDir::Filters filters,</div><div class='add'>+                                         const QStringList &amp;nameFilters, QDirIterator::IteratorFlags flags)</div><div class='add'>+    : nativePath(entry.nativeFilePath())</div><div class='add'>+    , dir(0)</div><div class='add'>+    , dirEntry(0)</div><div class='add'>+    , lastError(0)</div><div class='add'>+{</div><div class='add'>+    Q_UNUSED(filters)</div><div class='add'>+    Q_UNUSED(nameFilters)</div><div class='add'>+    Q_UNUSED(flags)</div><div class='add'>+</div><div class='add'>+    if ((dir = QT_OPENDIR(nativePath.constData())) == 0) {</div><div class='add'>+        lastError = errno;</div><div class='add'>+    } else {</div><div class='add'>+</div><div class='add'>+        if (!nativePath.endsWith('/'))</div><div class='add'>+            nativePath.append('/');</div><div class='add'>+</div><div class='add'>+#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_CYGWIN)</div><div class='add'>+        // ### Race condition; we should use fpathconf and dirfd().</div><div class='add'>+        size_t maxPathName = ::pathconf(nativePath.constData(), _PC_NAME_MAX);</div><div class='add'>+        if (maxPathName == size_t(-1))</div><div class='add'>+            maxPathName = FILENAME_MAX;</div><div class='add'>+        maxPathName += sizeof(QT_DIRENT) + 1;</div><div class='add'>+</div><div class='add'>+        QT_DIRENT *p = reinterpret_cast&lt;QT_DIRENT*&gt;(::malloc(maxPathName));</div><div class='add'>+        Q_CHECK_PTR(p);</div><div class='add'>+</div><div class='add'>+        mt_file.reset(p);</div><div class='add'>+#endif</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QFileSystemIterator::~QFileSystemIterator()</div><div class='add'>+{</div><div class='add'>+    if (dir)</div><div class='add'>+        QT_CLOSEDIR(dir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QFileSystemIterator::advance(QFileSystemEntry &amp;fileEntry, QFileSystemMetaData &amp;metaData)</div><div class='add'>+{</div><div class='add'>+    if (!dir)</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_CYGWIN)</div><div class='add'>+    lastError = QT_READDIR_R(dir, mt_file.data(), &amp;dirEntry);</div><div class='add'>+    if (lastError)</div><div class='add'>+        return false;</div><div class='add'>+#else</div><div class='add'>+    // ### add local lock to prevent breaking reentrancy</div><div class='add'>+    dirEntry = QT_READDIR(dir);</div><div class='add'>+#endif // _POSIX_THREAD_SAFE_FUNCTIONS</div><div class='add'>+</div><div class='add'>+    if (dirEntry) {</div><div class='add'>+        fileEntry = QFileSystemEntry(nativePath + QByteArray(dirEntry-&gt;d_name), QFileSystemEntry::FromNativePath());</div><div class='add'>+        metaData.fillFromDirEnt(*dirEntry);</div><div class='add'>+        return true;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    lastError = errno;</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+#endif // QT_NO_FILESYSTEMITERATOR</div><div class='head'>diff --git a/src/corelib/io/qfilesystemiterator_win.cpp b/src/corelib/io/qfilesystemiterator_win.cpp<br/>new file mode 100644<br/>index 0000000..5fff4f8<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemiterator_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemiterator_win.cpp</a></div><div class='hunk'>@@ -0,0 +1,148 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#if _WIN32_WINNT &lt; 0x0500</div><div class='add'>+#undef _WIN32_WINNT</div><div class='add'>+#define _WIN32_WINNT 0x0500</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#include "qfilesystemiterator_p.h"</div><div class='add'>+#include "qfilesystemengine_p.h"</div><div class='add'>+#include "qplatformdefs.h"</div><div class='add'>+</div><div class='add'>+#include &lt;QtCore/qt_windows.h&gt;</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+bool done = true;</div><div class='add'>+</div><div class='add'>+QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &amp;entry, QDir::Filters filters,</div><div class='add'>+                                         const QStringList &amp;nameFilters, QDirIterator::IteratorFlags flags)</div><div class='add'>+    : nativePath(entry.nativeFilePath())</div><div class='add'>+    , dirPath(entry.filePath())</div><div class='add'>+    , findFileHandle(INVALID_HANDLE_VALUE)</div><div class='add'>+    , uncFallback(false)</div><div class='add'>+    , uncShareIndex(0)</div><div class='add'>+    , onlyDirs(false)</div><div class='add'>+{</div><div class='add'>+    Q_UNUSED(nameFilters)</div><div class='add'>+    Q_UNUSED(flags)</div><div class='add'>+    if (nativePath.endsWith(QLatin1String(".lnk"))) {</div><div class='add'>+        QFileSystemMetaData metaData;</div><div class='add'>+        QFileSystemEntry link = QFileSystemEngine::getLinkTarget(entry, metaData);</div><div class='add'>+        nativePath = link.nativeFilePath();</div><div class='add'>+    }</div><div class='add'>+    if (!nativePath.endsWith(QLatin1Char('\\')))</div><div class='add'>+        nativePath.append(QLatin1Char('\\'));</div><div class='add'>+    nativePath.append(QLatin1Char('*'));</div><div class='add'>+    if (!dirPath.endsWith(QLatin1Char('/')))</div><div class='add'>+        dirPath.append(QLatin1Char('/'));</div><div class='add'>+    if ((filters &amp; (QDir::Dirs|QDir::Drives)) &amp;&amp; (!(filters &amp; (QDir::Files))))</div><div class='add'>+        onlyDirs = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QFileSystemIterator::~QFileSystemIterator()</div><div class='add'>+{</div><div class='add'>+   if (findFileHandle != INVALID_HANDLE_VALUE)</div><div class='add'>+        FindClose(findFileHandle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QFileSystemIterator::advance(QFileSystemEntry &amp;fileEntry, QFileSystemMetaData &amp;metaData)</div><div class='add'>+{</div><div class='add'>+    bool haveData = false;</div><div class='add'>+    WIN32_FIND_DATA findData;</div><div class='add'>+</div><div class='add'>+    if (findFileHandle == INVALID_HANDLE_VALUE &amp;&amp; !uncFallback) {</div><div class='add'>+        haveData = true;</div><div class='add'>+        int infoLevel = 0 ;         // FindExInfoStandard;</div><div class='add'>+        DWORD dwAdditionalFlags  = 0;</div><div class='add'>+        if (QSysInfo::windowsVersion() &gt;= QSysInfo::WV_WINDOWS7) {</div><div class='add'>+            dwAdditionalFlags = 2;  // FIND_FIRST_EX_LARGE_FETCH</div><div class='add'>+            infoLevel = 1 ;         // FindExInfoBasic;</div><div class='add'>+        }</div><div class='add'>+        int searchOps =  0;         // FindExSearchNameMatch</div><div class='add'>+        if (onlyDirs)</div><div class='add'>+            searchOps = 1 ;         // FindExSearchLimitToDirectories</div><div class='add'>+        findFileHandle = FindFirstFileEx((const wchar_t *)nativePath.utf16(), FINDEX_INFO_LEVELS(infoLevel), &amp;findData,</div><div class='add'>+                                         FINDEX_SEARCH_OPS(searchOps), 0, dwAdditionalFlags);</div><div class='add'>+        if (findFileHandle == INVALID_HANDLE_VALUE) {</div><div class='add'>+            if (nativePath.startsWith(QLatin1String("\\\\?\\UNC\\"))) {</div><div class='add'>+                QStringList parts = nativePath.split(QLatin1Char('\\'), QString::SkipEmptyParts);</div><div class='add'>+                if (parts.count() == 4 &amp;&amp; QFileSystemEngine::uncListSharesOnServer(</div><div class='add'>+                        QLatin1String("\\\\") + parts.at(2), &amp;uncShares)) {</div><div class='add'>+                    if (uncShares.isEmpty())</div><div class='add'>+                        return false; // No shares found in the server</div><div class='add'>+                    else</div><div class='add'>+                        uncFallback = true;</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    if (findFileHandle == INVALID_HANDLE_VALUE &amp;&amp; !uncFallback)</div><div class='add'>+        return false;</div><div class='add'>+    // Retrieve the new file information.</div><div class='add'>+    if (!haveData) {</div><div class='add'>+        if (uncFallback) {</div><div class='add'>+            if (++uncShareIndex &gt;= uncShares.count())</div><div class='add'>+                return false;</div><div class='add'>+        } else {</div><div class='add'>+            if (!FindNextFile(findFileHandle, &amp;findData))</div><div class='add'>+                return false;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    // Create the new file system entry &amp; meta data.</div><div class='add'>+    if (uncFallback) {</div><div class='add'>+        fileEntry = QFileSystemEntry(dirPath + uncShares.at(uncShareIndex));</div><div class='add'>+        metaData.fillFromFileAttribute(FILE_ATTRIBUTE_DIRECTORY);</div><div class='add'>+        return true;</div><div class='add'>+    } else {</div><div class='add'>+        QString fileName = QString::fromWCharArray(findData.cFileName);</div><div class='add'>+        fileEntry = QFileSystemEntry(dirPath + fileName);</div><div class='add'>+        metaData = QFileSystemMetaData();</div><div class='add'>+        if (!fileName.endsWith(QLatin1String(".lnk"))) {</div><div class='add'>+            metaData.fillFromFindData(findData, true);</div><div class='add'>+        }</div><div class='add'>+        return true;</div><div class='add'>+    }</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qfilesystemmetadata_p.h b/src/corelib/io/qfilesystemmetadata_p.h<br/>new file mode 100644<br/>index 0000000..c961101<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemmetadata_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemmetadata_p.h</a></div><div class='hunk'>@@ -0,0 +1,400 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QFILESYSTEMMETADATA_P_H_INCLUDED</div><div class='add'>+#define QFILESYSTEMMETADATA_P_H_INCLUDED</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+//  W A R N I N G</div><div class='add'>+//  -------------</div><div class='add'>+//</div><div class='add'>+// This file is not part of the Qt API.  It exists purely as an</div><div class='add'>+// implementation detail.  This header file may change from version to</div><div class='add'>+// version without notice, or even be removed.</div><div class='add'>+//</div><div class='add'>+// We mean it.</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include "qplatformdefs.h"</div><div class='add'>+#include &lt;QtCore/qglobal.h&gt;</div><div class='add'>+#include &lt;QtCore/qdatetime.h&gt;</div><div class='add'>+#include &lt;QtCore/qabstractfileengine.h&gt;</div><div class='add'>+</div><div class='add'>+// Platform-specific includes</div><div class='add'>+#if defined(Q_OS_WIN)</div><div class='add'>+#ifndef IO_REPARSE_TAG_SYMLINK</div><div class='add'>+#define IO_REPARSE_TAG_SYMLINK (0xA000000CL)</div><div class='add'>+#endif</div><div class='add'>+#elif defined(Q_OS_SYMBIAN)</div><div class='add'>+#include &lt;f32file.h&gt;</div><div class='add'>+#include &lt;QtCore/private/qdatetime_p.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+class QFileSystemEngine;</div><div class='add'>+</div><div class='add'>+class QFileSystemMetaData</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    QFileSystemMetaData()</div><div class='add'>+        : knownFlagsMask(0)</div><div class='add'>+    {</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    enum MetaDataFlag {</div><div class='add'>+        // Permissions, overlaps with QFile::Permissions</div><div class='add'>+        OtherReadPermission = 0x00000004,   OtherWritePermission = 0x00000002,  OtherExecutePermission = 0x00000001,</div><div class='add'>+        GroupReadPermission = 0x00000040,   GroupWritePermission = 0x00000020,  GroupExecutePermission = 0x00000010,</div><div class='add'>+        UserReadPermission  = 0x00000400,   UserWritePermission  = 0x00000200,  UserExecutePermission  = 0x00000100,</div><div class='add'>+        OwnerReadPermission = 0x00004000,   OwnerWritePermission = 0x00002000,  OwnerExecutePermission = 0x00001000,</div><div class='add'>+</div><div class='add'>+        OtherPermissions    = OtherReadPermission | OtherWritePermission | OtherExecutePermission,</div><div class='add'>+        GroupPermissions    = GroupReadPermission | GroupWritePermission | GroupExecutePermission,</div><div class='add'>+        UserPermissions     = UserReadPermission  | UserWritePermission  | UserExecutePermission,</div><div class='add'>+        OwnerPermissions    = OwnerReadPermission | OwnerWritePermission | OwnerExecutePermission,</div><div class='add'>+</div><div class='add'>+        ReadPermissions     = OtherReadPermission | GroupReadPermission | UserReadPermission | OwnerReadPermission,</div><div class='add'>+        WritePermissions    = OtherWritePermission | GroupWritePermission | UserWritePermission | OwnerWritePermission,</div><div class='add'>+        ExecutePermissions  = OtherExecutePermission | GroupExecutePermission | UserExecutePermission | OwnerExecutePermission,</div><div class='add'>+</div><div class='add'>+        Permissions         = OtherPermissions | GroupPermissions | UserPermissions | OwnerPermissions,</div><div class='add'>+</div><div class='add'>+        // Type</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+        LinkType            = 0,</div><div class='add'>+#else</div><div class='add'>+        LinkType            = 0x00010000,</div><div class='add'>+#endif</div><div class='add'>+        FileType            = 0x00020000,</div><div class='add'>+        DirectoryType       = 0x00040000,</div><div class='add'>+#if !defined(QWS) &amp;&amp; !defined(Q_WS_QPA) &amp;&amp; defined(Q_OS_MAC)</div><div class='add'>+        BundleType          = 0x00080000,</div><div class='add'>+        AliasType           = 0x08000000,</div><div class='add'>+#else</div><div class='add'>+        BundleType          =        0x0,</div><div class='add'>+        AliasType           =        0x0,</div><div class='add'>+#endif</div><div class='add'>+#if defined(Q_OS_WIN)</div><div class='add'>+        WinLnkType          = 0x08000000,   // Note: Uses the same position for AliasType on Mac</div><div class='add'>+#else</div><div class='add'>+        WinLnkType          =        0x0,</div><div class='add'>+#endif</div><div class='add'>+        SequentialType      = 0x00800000,   // Note: overlaps with QAbstractFileEngine::RootFlag</div><div class='add'>+</div><div class='add'>+        LegacyLinkType      = LinkType | AliasType | WinLnkType,</div><div class='add'>+</div><div class='add'>+        Type                = LinkType | FileType | DirectoryType | BundleType | SequentialType | AliasType,</div><div class='add'>+</div><div class='add'>+        // Attributes</div><div class='add'>+        HiddenAttribute     = 0x00100000,</div><div class='add'>+        SizeAttribute       = 0x00200000,   // Note: overlaps with QAbstractFileEngine::LocalDiskFlag</div><div class='add'>+        ExistsAttribute     = 0x00400000,</div><div class='add'>+</div><div class='add'>+        Attributes          = HiddenAttribute | SizeAttribute | ExistsAttribute,</div><div class='add'>+</div><div class='add'>+        // Times</div><div class='add'>+        CreationTime        = 0x01000000,   // Note: overlaps with QAbstractFileEngine::Refresh</div><div class='add'>+        ModificationTime    = 0x02000000,</div><div class='add'>+        AccessTime          = 0x04000000,</div><div class='add'>+</div><div class='add'>+        Times               = CreationTime | ModificationTime | AccessTime,</div><div class='add'>+</div><div class='add'>+        // Owner IDs</div><div class='add'>+        UserId              = 0x10000000,</div><div class='add'>+        GroupId             = 0x20000000,</div><div class='add'>+</div><div class='add'>+        OwnerIds            = UserId | GroupId,</div><div class='add'>+</div><div class='add'>+        PosixStatFlags      = QFileSystemMetaData::OtherPermissions</div><div class='add'>+                            | QFileSystemMetaData::GroupPermissions</div><div class='add'>+                            | QFileSystemMetaData::OwnerPermissions</div><div class='add'>+                            | QFileSystemMetaData::FileType</div><div class='add'>+                            | QFileSystemMetaData::DirectoryType</div><div class='add'>+                            | QFileSystemMetaData::SequentialType</div><div class='add'>+                            | QFileSystemMetaData::SizeAttribute</div><div class='add'>+                            | QFileSystemMetaData::Times</div><div class='add'>+                            | QFileSystemMetaData::OwnerIds,</div><div class='add'>+</div><div class='add'>+        SymbianTEntryFlags  = QFileSystemMetaData::Permissions</div><div class='add'>+                            | QFileSystemMetaData::FileType</div><div class='add'>+                            | QFileSystemMetaData::DirectoryType</div><div class='add'>+                            | QFileSystemMetaData::SequentialType</div><div class='add'>+                            | QFileSystemMetaData::Attributes</div><div class='add'>+                            | QFileSystemMetaData::Times,</div><div class='add'>+#if defined(Q_OS_WIN)</div><div class='add'>+        WinStatFlags        = QFileSystemMetaData::FileType</div><div class='add'>+                            | QFileSystemMetaData::DirectoryType</div><div class='add'>+                            | QFileSystemMetaData::HiddenAttribute</div><div class='add'>+                            | QFileSystemMetaData::ExistsAttribute</div><div class='add'>+                            | QFileSystemMetaData::SizeAttribute</div><div class='add'>+                            | QFileSystemMetaData::Times,</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+        AllMetaDataFlags    = 0xFFFFFFFF</div><div class='add'>+</div><div class='add'>+    };</div><div class='add'>+    Q_DECLARE_FLAGS(MetaDataFlags, MetaDataFlag)</div><div class='add'>+</div><div class='add'>+    bool hasFlags(MetaDataFlags flags) const</div><div class='add'>+    {</div><div class='add'>+        return ((knownFlagsMask &amp; flags) == flags);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    MetaDataFlags missingFlags(MetaDataFlags flags)</div><div class='add'>+    {</div><div class='add'>+        return flags &amp; ~knownFlagsMask;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    void clear()</div><div class='add'>+    {</div><div class='add'>+        knownFlagsMask = 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    void clearFlags(MetaDataFlags flags = AllMetaDataFlags)</div><div class='add'>+    {</div><div class='add'>+        knownFlagsMask &amp;= ~flags;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    bool exists() const                     { return (entryFlags &amp; ExistsAttribute); }</div><div class='add'>+</div><div class='add'>+    bool isLink() const                     { return  (entryFlags &amp; LinkType); }</div><div class='add'>+    bool isFile() const                     { return (entryFlags &amp; FileType); }</div><div class='add'>+    bool isDirectory() const                { return (entryFlags &amp; DirectoryType); }</div><div class='add'>+    bool isBundle() const;</div><div class='add'>+    bool isAlias() const;</div><div class='add'>+    bool isLegacyLink() const               { return (entryFlags &amp; LegacyLinkType); }</div><div class='add'>+    bool isSequential() const               { return (entryFlags &amp; SequentialType); }</div><div class='add'>+    bool isHidden() const                   { return (entryFlags &amp; HiddenAttribute); }</div><div class='add'>+#if defined(Q_OS_WIN)</div><div class='add'>+    bool isLnkFile() const                  { return (entryFlags &amp; WinLnkType); }</div><div class='add'>+#else</div><div class='add'>+    bool isLnkFile() const                  { return false; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    qint64 size() const                     { return size_; }</div><div class='add'>+</div><div class='add'>+    QFile::Permissions permissions() const  { return QFile::Permissions(Permissions &amp; entryFlags); }</div><div class='add'>+</div><div class='add'>+    QDateTime creationTime() const;</div><div class='add'>+    QDateTime modificationTime() const;</div><div class='add'>+    QDateTime accessTime() const;</div><div class='add'>+</div><div class='add'>+    QDateTime fileTime(QAbstractFileEngine::FileTime time) const;</div><div class='add'>+    uint userId() const;</div><div class='add'>+    uint groupId() const;</div><div class='add'>+    uint ownerId(QAbstractFileEngine::FileOwner owner) const;</div><div class='add'>+</div><div class='add'>+#ifdef Q_OS_UNIX</div><div class='add'>+    void fillFromStatBuf(const QT_STATBUF &amp;statBuffer);</div><div class='add'>+    void fillFromDirEnt(const QT_DIRENT &amp;statBuffer);</div><div class='add'>+#endif</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+    void fillFromTEntry(const TEntry&amp; entry);</div><div class='add'>+    void fillFromVolumeInfo(const TVolumeInfo&amp; info);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_WIN)</div><div class='add'>+    inline void fillFromFileAttribute(DWORD fileAttribute, bool isDriveRoot = false);</div><div class='add'>+    inline void fillFromFindData(WIN32_FIND_DATA &amp;findData, bool setLinkType = false, bool isDriveRoot = false);</div><div class='add'>+    inline void fillFromFindInfo(BY_HANDLE_FILE_INFORMATION &amp;fileInfo);</div><div class='add'>+#endif</div><div class='add'>+private:</div><div class='add'>+    friend class QFileSystemEngine;</div><div class='add'>+</div><div class='add'>+    MetaDataFlags knownFlagsMask;</div><div class='add'>+    MetaDataFlags entryFlags;</div><div class='add'>+</div><div class='add'>+    qint64 size_;</div><div class='add'>+</div><div class='add'>+    // Platform-specific data goes here:</div><div class='add'>+#if defined(Q_OS_WIN)</div><div class='add'>+    DWORD fileAttribute_;</div><div class='add'>+    FILETIME creationTime_;</div><div class='add'>+    FILETIME lastAccessTime_;</div><div class='add'>+    FILETIME lastWriteTime_;</div><div class='add'>+#elif defined(Q_OS_SYMBIAN)</div><div class='add'>+    TTime modificationTime_;</div><div class='add'>+#else</div><div class='add'>+    time_t creationTime_;</div><div class='add'>+    time_t modificationTime_;</div><div class='add'>+    time_t accessTime_;</div><div class='add'>+</div><div class='add'>+    uint userId_;</div><div class='add'>+    uint groupId_;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+Q_DECLARE_OPERATORS_FOR_FLAGS(QFileSystemMetaData::MetaDataFlags)</div><div class='add'>+</div><div class='add'>+#if !defined(QWS) &amp;&amp; !defined(Q_WS_QPA) &amp;&amp; defined(Q_OS_MAC)</div><div class='add'>+inline bool QFileSystemMetaData::isBundle() const                   { return (entryFlags &amp; BundleType); }</div><div class='add'>+inline bool QFileSystemMetaData::isAlias() const                    { return (entryFlags &amp; AliasType); }</div><div class='add'>+#else</div><div class='add'>+inline bool QFileSystemMetaData::isBundle() const                   { return false; }</div><div class='add'>+inline bool QFileSystemMetaData::isAlias() const                    { return false; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (defined(Q_OS_UNIX) &amp;&amp; !defined (Q_OS_SYMBIAN)) || defined (Q_OS_WIN)</div><div class='add'>+inline QDateTime QFileSystemMetaData::fileTime(QAbstractFileEngine::FileTime time) const</div><div class='add'>+{</div><div class='add'>+    switch (time) {</div><div class='add'>+    case QAbstractFileEngine::ModificationTime:</div><div class='add'>+        return modificationTime();</div><div class='add'>+</div><div class='add'>+    case QAbstractFileEngine::AccessTime:</div><div class='add'>+        return accessTime();</div><div class='add'>+</div><div class='add'>+    case QAbstractFileEngine::CreationTime:</div><div class='add'>+        return creationTime();</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return QDateTime();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_UNIX) &amp;&amp; !defined (Q_OS_SYMBIAN)</div><div class='add'>+inline QDateTime QFileSystemMetaData::creationTime() const          { return QDateTime::fromTime_t(creationTime_); }</div><div class='add'>+inline QDateTime QFileSystemMetaData::modificationTime() const      { return QDateTime::fromTime_t(modificationTime_); }</div><div class='add'>+inline QDateTime QFileSystemMetaData::accessTime() const            { return QDateTime::fromTime_t(accessTime_); }</div><div class='add'>+</div><div class='add'>+inline uint QFileSystemMetaData::userId() const                     { return userId_; }</div><div class='add'>+inline uint QFileSystemMetaData::groupId() const                    { return groupId_; }</div><div class='add'>+</div><div class='add'>+inline uint QFileSystemMetaData::ownerId(QAbstractFileEngine::FileOwner owner) const</div><div class='add'>+{</div><div class='add'>+    if (owner == QAbstractFileEngine::OwnerUser)</div><div class='add'>+        return userId();</div><div class='add'>+    else</div><div class='add'>+        return groupId();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+inline QDateTime QFileSystemMetaData::creationTime() const          { return modificationTime(); }</div><div class='add'>+inline QDateTime QFileSystemMetaData::modificationTime() const      { return qt_symbian_TTime_To_QDateTime(modificationTime_); }</div><div class='add'>+inline QDateTime QFileSystemMetaData::accessTime() const            { return modificationTime(); }</div><div class='add'>+</div><div class='add'>+inline QDateTime QFileSystemMetaData::fileTime(QAbstractFileEngine::FileTime time) const</div><div class='add'>+{</div><div class='add'>+    Q_UNUSED(time);</div><div class='add'>+    return modificationTime();</div><div class='add'>+}</div><div class='add'>+inline uint QFileSystemMetaData::userId() const                     { return (uint) -2; }</div><div class='add'>+inline uint QFileSystemMetaData::groupId() const                    { return (uint) -2; }</div><div class='add'>+inline uint QFileSystemMetaData::ownerId(QAbstractFileEngine::FileOwner owner) const</div><div class='add'>+{</div><div class='add'>+    Q_UNUSED(owner);</div><div class='add'>+    return (uint) -2;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_WIN)</div><div class='add'>+inline uint QFileSystemMetaData::userId() const                     { return (uint) -2; }</div><div class='add'>+inline uint QFileSystemMetaData::groupId() const                    { return (uint) -2; }</div><div class='add'>+inline uint QFileSystemMetaData::ownerId(QAbstractFileEngine::FileOwner owner) const</div><div class='add'>+{</div><div class='add'>+    if (owner == QAbstractFileEngine::OwnerUser)</div><div class='add'>+        return userId();</div><div class='add'>+    else</div><div class='add'>+        return groupId();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline void QFileSystemMetaData::fillFromFileAttribute(DWORD fileAttribute,bool isDriveRoot)</div><div class='add'>+{</div><div class='add'>+    fileAttribute_ = fileAttribute;</div><div class='add'>+    // Ignore the hidden attribute for drives.</div><div class='add'>+    if (!isDriveRoot &amp;&amp; (fileAttribute_ &amp; FILE_ATTRIBUTE_HIDDEN))</div><div class='add'>+        entryFlags |= HiddenAttribute;</div><div class='add'>+    entryFlags |= ((fileAttribute &amp; FILE_ATTRIBUTE_DIRECTORY) ? DirectoryType: FileType);</div><div class='add'>+    entryFlags |= ExistsAttribute;</div><div class='add'>+    knownFlagsMask |= FileType | DirectoryType | HiddenAttribute | ExistsAttribute;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline void QFileSystemMetaData::fillFromFindData(WIN32_FIND_DATA &amp;findData, bool setLinkType, bool isDriveRoot)</div><div class='add'>+{</div><div class='add'>+    fillFromFileAttribute(findData.dwFileAttributes, isDriveRoot);</div><div class='add'>+    creationTime_ = findData.ftCreationTime;</div><div class='add'>+    lastAccessTime_ = findData.ftLastAccessTime;</div><div class='add'>+    lastWriteTime_ = findData.ftLastWriteTime;</div><div class='add'>+    if (fileAttribute_ &amp; FILE_ATTRIBUTE_DIRECTORY) {</div><div class='add'>+        size_ = 0;</div><div class='add'>+    } else {</div><div class='add'>+        size_ = findData.nFileSizeHigh;</div><div class='add'>+        size_ &lt;&lt;= 32;</div><div class='add'>+        size_ += findData.nFileSizeLow;</div><div class='add'>+    }</div><div class='add'>+    knownFlagsMask |=  Times | SizeAttribute;</div><div class='add'>+    if (setLinkType) {</div><div class='add'>+        knownFlagsMask |=  LinkType;</div><div class='add'>+        entryFlags &amp;= ~LinkType;</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+        if ((fileAttribute_ &amp; FILE_ATTRIBUTE_REPARSE_POINT)</div><div class='add'>+            &amp;&amp; (findData.dwReserved0 == IO_REPARSE_TAG_SYMLINK</div><div class='add'>+                || findData.dwReserved0 == IO_REPARSE_TAG_MOUNT_POINT)) {</div><div class='add'>+            entryFlags |= LinkType;</div><div class='add'>+        }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline void QFileSystemMetaData::fillFromFindInfo(BY_HANDLE_FILE_INFORMATION &amp;fileInfo)</div><div class='add'>+{</div><div class='add'>+    fillFromFileAttribute(fileInfo.dwFileAttributes);</div><div class='add'>+    creationTime_ = fileInfo.ftCreationTime;</div><div class='add'>+    lastAccessTime_ = fileInfo.ftLastAccessTime;</div><div class='add'>+    lastWriteTime_ = fileInfo.ftLastWriteTime;</div><div class='add'>+    if (fileAttribute_ &amp; FILE_ATTRIBUTE_DIRECTORY) {</div><div class='add'>+        size_ = 0;</div><div class='add'>+    } else {</div><div class='add'>+        size_ = fileInfo.nFileSizeHigh;</div><div class='add'>+        size_ &lt;&lt;= 32;</div><div class='add'>+        size_ += fileInfo.nFileSizeLow;</div><div class='add'>+    }</div><div class='add'>+    knownFlagsMask |=  Times | SizeAttribute;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+#endif // include guard</div><div class='head'>diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp<br/>index 34eff75..9739067 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemwatcher.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemwatcher.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemwatcher.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemwatcher.cpp</a></div><div class='hunk'>@@ -198,7 +198,7 @@ QStringList QPollingFileSystemWatcherEngine::removePaths(const QStringList &amp;path</div><div class='ctx'> </div><div class='ctx'> void QPollingFileSystemWatcherEngine::stop()</div><div class='ctx'> {</div><div class='del'>-    QMetaObject::invokeMethod(this, "quit");</div><div class='add'>+    quit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void QPollingFileSystemWatcherEngine::timeout()</div><div class='hunk'>@@ -432,11 +432,6 @@ QFileSystemWatcher::QFileSystemWatcher(const QStringList &amp;paths, QObject *parent</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     Destroys the file system watcher.</div><div class='del'>-</div><div class='del'>-    \note To avoid deadlocks on shutdown, all instances of QFileSystemWatcher</div><div class='del'>-    need to be destroyed before QCoreApplication. Note that passing</div><div class='del'>-    QCoreApplication::instance() as the parent object when creating</div><div class='del'>-    QFileSystemWatcher is not sufficient.</div><div class='ctx'> */</div><div class='ctx'> QFileSystemWatcher::~QFileSystemWatcher()</div><div class='ctx'> {</div><div class='head'>diff --git a/src/corelib/io/qfilesystemwatcher_fsevents.cpp b/src/corelib/io/qfilesystemwatcher_fsevents.cpp<br/>index 8fc0927..6ae6e38 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemwatcher_fsevents.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemwatcher_fsevents.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemwatcher_fsevents.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemwatcher_fsevents.cpp</a></div><div class='hunk'>@@ -45,6 +45,8 @@</div><div class='ctx'> #include "qfilesystemwatcher.h"</div><div class='ctx'> #include "qfilesystemwatcher_fsevents_p.h"</div><div class='ctx'> </div><div class='add'>+#ifndef QT_NO_FILESYSTEMWATCHER</div><div class='add'>+</div><div class='ctx'> #include &lt;qdebug.h&gt;</div><div class='ctx'> #include &lt;qfile.h&gt;</div><div class='ctx'> #include &lt;qdatetime.h&gt;</div><div class='hunk'>@@ -487,3 +489,4 @@ void QFSEventsFileSystemWatcherEngine::run()</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='add'>+#endif //QT_NO_FILESYSTEMWATCHER</div><div class='head'>diff --git a/src/corelib/io/qfilesystemwatcher_fsevents_p.h b/src/corelib/io/qfilesystemwatcher_fsevents_p.h<br/>index 9dee141..2466a6e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemwatcher_fsevents_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemwatcher_fsevents_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemwatcher_fsevents_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemwatcher_fsevents_p.h</a></div><div class='hunk'>@@ -56,6 +56,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "qfilesystemwatcher_p.h"</div><div class='ctx'> </div><div class='add'>+#ifndef QT_NO_FILESYSTEMWATCHER</div><div class='add'>+</div><div class='ctx'> #include &lt;QtCore/qmutex.h&gt;</div><div class='ctx'> #include &lt;QtCore/qwaitcondition.h&gt;</div><div class='ctx'> #include &lt;QtCore/qthread.h&gt;</div><div class='hunk'>@@ -123,6 +125,8 @@ private:</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#endif //QT_NO_FILESYSTEMWATCHER</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp<br/>index 8c81de8..5c5223e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemwatcher_inotify.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemwatcher_inotify.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemwatcher_inotify.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemwatcher_inotify.cpp</a></div><div class='hunk'>@@ -340,7 +340,7 @@ QStringList QInotifyFileSystemWatcherEngine::removePaths(const QStringList &amp;path</div><div class='ctx'> </div><div class='ctx'> void QInotifyFileSystemWatcherEngine::stop()</div><div class='ctx'> {</div><div class='del'>-    QMetaObject::invokeMethod(this, "quit");</div><div class='add'>+    quit();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void QInotifyFileSystemWatcherEngine::readFromInotify()</div><div class='hunk'>@@ -353,24 +353,24 @@ void QInotifyFileSystemWatcherEngine::readFromInotify()</div><div class='ctx'>     ioctl(inotifyFd, FIONREAD, (char *) &amp;buffSize);</div><div class='ctx'>     QVarLengthArray&lt;char, 4096&gt; buffer(buffSize);</div><div class='ctx'>     buffSize = read(inotifyFd, buffer.data(), buffSize);</div><div class='del'>-    const char *at = buffer.data();</div><div class='del'>-    const char * const end = at + buffSize;</div><div class='add'>+    char *at = buffer.data();</div><div class='add'>+    char * const end = at + buffSize;</div><div class='ctx'> </div><div class='del'>-    QMap&lt;int, inotify_event&gt; eventForId;</div><div class='add'>+    QHash&lt;int, inotify_event *&gt; eventForId;</div><div class='ctx'>     while (at &lt; end) {</div><div class='del'>-        const inotify_event *event = reinterpret_cast&lt;const inotify_event *&gt;(at);</div><div class='add'>+        inotify_event *event = reinterpret_cast&lt;inotify_event *&gt;(at);</div><div class='ctx'> </div><div class='ctx'>         if (eventForId.contains(event-&gt;wd))</div><div class='del'>-            eventForId[event-&gt;wd].mask |= event-&gt;mask;</div><div class='add'>+            eventForId[event-&gt;wd]-&gt;mask |= event-&gt;mask;</div><div class='ctx'>         else</div><div class='del'>-            eventForId.insert(event-&gt;wd, *event);</div><div class='add'>+            eventForId.insert(event-&gt;wd, event);</div><div class='ctx'> </div><div class='ctx'>         at += sizeof(inotify_event) + event-&gt;len;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    QMap&lt;int, inotify_event&gt;::const_iterator it = eventForId.constBegin();</div><div class='add'>+    QHash&lt;int, inotify_event *&gt;::const_iterator it = eventForId.constBegin();</div><div class='ctx'>     while (it != eventForId.constEnd()) {</div><div class='del'>-        inotify_event event = *it;</div><div class='add'>+        const inotify_event &amp;event = **it;</div><div class='ctx'>         ++it;</div><div class='ctx'> </div><div class='ctx'>         // qDebug() &lt;&lt; "inotify event, wd" &lt;&lt; event.wd &lt;&lt; "mask" &lt;&lt; hex &lt;&lt; event.mask;</div><div class='head'>diff --git a/src/corelib/io/qfilesystemwatcher_kqueue.cpp b/src/corelib/io/qfilesystemwatcher_kqueue.cpp<br/>index 716aa49..387a7f7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemwatcher_kqueue.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemwatcher_kqueue.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemwatcher_kqueue.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemwatcher_kqueue.cpp</a></div><div class='hunk'>@@ -45,6 +45,8 @@</div><div class='ctx'> #include "qfilesystemwatcher_kqueue_p.h"</div><div class='ctx'> #include "private/qcore_unix_p.h"</div><div class='ctx'> </div><div class='add'>+#ifndef QT_NO_FILESYSTEMWATCHER</div><div class='add'>+</div><div class='ctx'> #include &lt;qdebug.h&gt;</div><div class='ctx'> #include &lt;qfile.h&gt;</div><div class='ctx'> #include &lt;qsocketnotifier.h&gt;</div><div class='hunk'>@@ -327,4 +329,6 @@ void QKqueueFileSystemWatcherEngine::run()</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#endif //QT_NO_FILESYSTEMWATCHER</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qfilesystemwatcher_kqueue_p.h b/src/corelib/io/qfilesystemwatcher_kqueue_p.h<br/>index a8bde44..fd9d820 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemwatcher_kqueue_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemwatcher_kqueue_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemwatcher_kqueue_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemwatcher_kqueue_p.h</a></div><div class='hunk'>@@ -60,6 +60,7 @@</div><div class='ctx'> #include &lt;QtCore/qthread.h&gt;</div><div class='ctx'> #include &lt;QtCore/qvector.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifndef QT_NO_FILESYSTEMWATCHER</div><div class='ctx'> struct kevent;</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='hunk'>@@ -92,4 +93,5 @@ private:</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='add'>+#endif //QT_NO_FILESYSTEMWATCHER</div><div class='ctx'> #endif // FILEWATCHER_KQUEUE_P_H</div><div class='head'>diff --git a/src/corelib/io/qfilesystemwatcher_symbian.cpp b/src/corelib/io/qfilesystemwatcher_symbian.cpp<br/>index 0d8f22e..6e5e911 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemwatcher_symbian.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemwatcher_symbian.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemwatcher_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemwatcher_symbian.cpp</a></div><div class='hunk'>@@ -95,7 +95,10 @@ void QNotifyChangeEvent::RunL()</div><div class='ctx'>         SetActive();</div><div class='ctx'> </div><div class='ctx'>         if (!failureCount) {</div><div class='del'>-            QT_TRYCATCH_LEAVING(engine-&gt;emitPathChanged(this));</div><div class='add'>+            int err;</div><div class='add'>+            QT_TRYCATCH_ERROR(err, engine-&gt;emitPathChanged(this));</div><div class='add'>+            if (err != KErrNone)</div><div class='add'>+                qWarning("QNotifyChangeEvent::RunL() - emitPathChanged threw exception (Converted error code: %d)", err);</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='hunk'>@@ -215,7 +218,7 @@ void QSymbianFileSystemWatcherEngine::emitPathChanged(QNotifyChangeEvent *e)</div><div class='ctx'> </div><div class='ctx'> void QSymbianFileSystemWatcherEngine::stop()</div><div class='ctx'> {</div><div class='del'>-    QMetaObject::invokeMethod(this, "quit");</div><div class='add'>+    quit();</div><div class='ctx'>     wait();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp<br/>index 30fc5fc..4e94623 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemwatcher_win.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfilesystemwatcher_win.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfilesystemwatcher_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfilesystemwatcher_win.cpp</a></div><div class='hunk'>@@ -86,7 +86,8 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &amp;paths,</div><div class='ctx'>     while (it.hasNext()) {</div><div class='ctx'>         QString path = it.next();</div><div class='ctx'>         QString normalPath = path;</div><div class='del'>-        if ((normalPath.endsWith(QLatin1Char('/')) || normalPath.endsWith(QLatin1Char('\\')))</div><div class='add'>+        if ((normalPath.endsWith(QLatin1Char('/')) &amp;&amp; !normalPath.endsWith(QLatin1String(":/")))</div><div class='add'>+            || (normalPath.endsWith(QLatin1Char('\\')) &amp;&amp; !normalPath.endsWith(QLatin1String(":\\")))</div><div class='ctx'> #ifdef Q_OS_WINCE</div><div class='ctx'>             &amp;&amp; normalPath.size() &gt; 1)</div><div class='ctx'> #else</div><div class='head'>diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp<br/>index 8689c57..4894754 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfsfileengine.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfsfileengine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfsfileengine.cpp</a></div><div class='hunk'>@@ -41,6 +41,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "qfsfileengine_p.h"</div><div class='ctx'> #include "qfsfileengine_iterator_p.h"</div><div class='add'>+#include "qfilesystemengine_p.h"</div><div class='ctx'> #include "qdatetime.h"</div><div class='ctx'> #include "qdiriterator.h"</div><div class='ctx'> #include "qset.h"</div><div class='hunk'>@@ -119,6 +120,9 @@ void QFSFileEnginePrivate::init()</div><div class='ctx'>     openMode = QIODevice::NotOpen;</div><div class='ctx'>     fd = -1;</div><div class='ctx'>     fh = 0;</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+    fileHandleForMaps = -1;</div><div class='add'>+#endif</div><div class='ctx'>     lastIOCommand = IOFlushCommand;</div><div class='ctx'>     lastFlushFailed = false;</div><div class='ctx'>     closeFileHandle = false;</div><div class='hunk'>@@ -133,109 +137,13 @@ void QFSFileEnginePrivate::init()</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='del'>-    \internal</div><div class='del'>-</div><div class='del'>-    Returns the canonicalized form of \a path (i.e., with all symlinks</div><div class='del'>-    resolved, and all redundant path elements removed.</div><div class='del'>-*/</div><div class='del'>-QString QFSFileEnginePrivate::canonicalized(const QString &amp;path)</div><div class='del'>-{</div><div class='del'>-    if (path.isEmpty())</div><div class='del'>-        return path;</div><div class='del'>-</div><div class='del'>-    // FIXME let's see if this stuff works, then we might be able to remove some of the other code.</div><div class='del'>-#if defined(Q_OS_UNIX) &amp;&amp; !defined(Q_OS_SYMBIAN)</div><div class='del'>-    if (path.size() == 1 &amp;&amp; path.at(0) == QLatin1Char('/'))</div><div class='del'>-        return path;</div><div class='del'>-#endif</div><div class='del'>-#if defined(Q_OS_LINUX) || defined(Q_OS_SYMBIAN) || defined(Q_OS_MAC)</div><div class='del'>-    // ... but Linux with uClibc does not have it</div><div class='del'>-#if !defined(__UCLIBC__)</div><div class='del'>-    char *ret = 0;</div><div class='del'>-#if defined(Q_OS_MAC)</div><div class='del'>-    // Mac OS X 10.5.x doesn't support the realpath(X,0) extension we use here.</div><div class='del'>-    if (QSysInfo::MacintoshVersion &gt;= QSysInfo::MV_10_6) {</div><div class='del'>-        ret = realpath(path.toLocal8Bit().constData(), (char*)0);</div><div class='del'>-    } else {</div><div class='del'>-        // on 10.5 we can use FSRef to resolve the file path.</div><div class='del'>-        FSRef fsref;</div><div class='del'>-        if (FSPathMakeRef((const UInt8 *)QDir::cleanPath(path).toUtf8().data(), &amp;fsref, 0) == noErr) {</div><div class='del'>-            CFURLRef urlref = CFURLCreateFromFSRef(NULL, &amp;fsref);</div><div class='del'>-            CFStringRef canonicalPath = CFURLCopyFileSystemPath(urlref, kCFURLPOSIXPathStyle);</div><div class='del'>-            QString ret = QCFString::toQString(canonicalPath);</div><div class='del'>-            CFRelease(canonicalPath);</div><div class='del'>-            CFRelease(urlref);</div><div class='del'>-            return ret;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-#else</div><div class='del'>-    ret = realpath(path.toLocal8Bit().constData(), (char*)0);</div><div class='del'>-#endif</div><div class='del'>-    if (ret) {</div><div class='del'>-        QString canonicalPath = QDir::cleanPath(QString::fromLocal8Bit(ret));</div><div class='del'>-        free(ret);</div><div class='del'>-        return canonicalPath;</div><div class='del'>-    }</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-    QFileInfo fi;</div><div class='del'>-    const QChar slash(QLatin1Char('/'));</div><div class='del'>-    QString tmpPath = path;</div><div class='del'>-    int separatorPos = 0;</div><div class='del'>-    QSet&lt;QString&gt; nonSymlinks;</div><div class='del'>-    QSet&lt;QString&gt; known;</div><div class='del'>-</div><div class='del'>-    known.insert(path);</div><div class='del'>-    do {</div><div class='del'>-#ifdef Q_OS_WIN</div><div class='del'>-        // UNC, skip past the first two elements</div><div class='del'>-        if (separatorPos == 0 &amp;&amp; tmpPath.startsWith(QLatin1String("//")))</div><div class='del'>-            separatorPos = tmpPath.indexOf(slash, 2);</div><div class='del'>-        if (separatorPos != -1)</div><div class='del'>-#endif</div><div class='del'>-        separatorPos = tmpPath.indexOf(slash, separatorPos + 1);</div><div class='del'>-        QString prefix = separatorPos == -1 ? tmpPath : tmpPath.left(separatorPos);</div><div class='del'>-        if (</div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-            // Symbian doesn't support directory symlinks, so do not check for link unless we</div><div class='del'>-            // are handling the last path element. This not only slightly improves performance,</div><div class='del'>-            // but also saves us from lot of unnecessary platform security check failures</div><div class='del'>-            // when dealing with files under *:/private directories.</div><div class='del'>-            separatorPos == -1 &amp;&amp;</div><div class='del'>-#endif</div><div class='del'>-            !nonSymlinks.contains(prefix)) {</div><div class='del'>-            fi.setFile(prefix);</div><div class='del'>-            if (fi.isSymLink()) {</div><div class='del'>-                QString target = fi.symLinkTarget();</div><div class='del'>-                if (separatorPos != -1) {</div><div class='del'>-                    if (fi.isDir() &amp;&amp; !target.endsWith(slash))</div><div class='del'>-                        target.append(slash);</div><div class='del'>-                    target.append(tmpPath.mid(separatorPos));</div><div class='del'>-                }</div><div class='del'>-                tmpPath = QDir::cleanPath(target);</div><div class='del'>-                separatorPos = 0;</div><div class='del'>-</div><div class='del'>-                if (known.contains(tmpPath))</div><div class='del'>-                    return QString();</div><div class='del'>-                known.insert(tmpPath);</div><div class='del'>-            } else {</div><div class='del'>-                nonSymlinks.insert(prefix);</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    } while (separatorPos != -1);</div><div class='del'>-</div><div class='del'>-    return QDir::cleanPath(tmpPath);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*!</div><div class='ctx'>     Constructs a QFSFileEngine for the file name \a file.</div><div class='ctx'> */</div><div class='del'>-QFSFileEngine::QFSFileEngine(const QString &amp;file) : QAbstractFileEngine(*new QFSFileEnginePrivate)</div><div class='add'>+QFSFileEngine::QFSFileEngine(const QString &amp;file)</div><div class='add'>+    : QAbstractFileEngine(*new QFSFileEnginePrivate)</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='del'>-    d-&gt;filePath = QDir::fromNativeSeparators(file);</div><div class='del'>-    d-&gt;nativeInitFileName();</div><div class='add'>+    d-&gt;fileEntry = QFileSystemEntry(file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -284,8 +192,7 @@ void QFSFileEngine::setFileName(const QString &amp;file)</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='ctx'>     d-&gt;init();</div><div class='del'>-    d-&gt;filePath = QDir::fromNativeSeparators(file);</div><div class='del'>-    d-&gt;nativeInitFileName();</div><div class='add'>+    d-&gt;fileEntry = QFileSystemEntry(file);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -294,7 +201,7 @@ void QFSFileEngine::setFileName(const QString &amp;file)</div><div class='ctx'> bool QFSFileEngine::open(QIODevice::OpenMode openMode)</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='del'>-    if (d-&gt;filePath.isEmpty()) {</div><div class='add'>+    if (d-&gt;fileEntry.isEmpty()) {</div><div class='ctx'>         qWarning("QFSFileEngine::open: No file name specified");</div><div class='ctx'>         setError(QFile::OpenError, QLatin1String("No file name specified"));</div><div class='ctx'>         return false;</div><div class='hunk'>@@ -323,6 +230,11 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode)</div><div class='ctx'> */</div><div class='ctx'> bool QFSFileEngine::open(QIODevice::OpenMode openMode, FILE *fh)</div><div class='ctx'> {</div><div class='add'>+    return open(openMode, fh, QFile::DontCloseHandle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QFSFileEngine::open(QIODevice::OpenMode openMode, FILE *fh, QFile::FileHandleFlags handleFlags)</div><div class='add'>+{</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='ctx'> </div><div class='ctx'>     // Append implies WriteOnly.</div><div class='hunk'>@@ -335,9 +247,8 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode, FILE *fh)</div><div class='ctx'> </div><div class='ctx'>     d-&gt;openMode = openMode;</div><div class='ctx'>     d-&gt;lastFlushFailed = false;</div><div class='del'>-    d-&gt;closeFileHandle = false;</div><div class='del'>-    d-&gt;nativeFilePath.clear();</div><div class='del'>-    d-&gt;filePath.clear();</div><div class='add'>+    d-&gt;closeFileHandle = (handleFlags &amp; QFile::AutoCloseHandle);</div><div class='add'>+    d-&gt;fileEntry.clear();</div><div class='ctx'>     d-&gt;tried_stat = 0;</div><div class='ctx'>     d-&gt;fd = -1;</div><div class='ctx'> </div><div class='hunk'>@@ -380,6 +291,11 @@ bool QFSFileEnginePrivate::openFh(QIODevice::OpenMode openMode, FILE *fh)</div><div class='ctx'> */</div><div class='ctx'> bool QFSFileEngine::open(QIODevice::OpenMode openMode, int fd)</div><div class='ctx'> {</div><div class='add'>+    return open(openMode, fd, QFile::DontCloseHandle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QFSFileEngine::open(QIODevice::OpenMode openMode, int fd, QFile::FileHandleFlags handleFlags)</div><div class='add'>+{</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='ctx'> </div><div class='ctx'>     // Append implies WriteOnly.</div><div class='hunk'>@@ -392,9 +308,8 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode, int fd)</div><div class='ctx'> </div><div class='ctx'>     d-&gt;openMode = openMode;</div><div class='ctx'>     d-&gt;lastFlushFailed = false;</div><div class='del'>-    d-&gt;closeFileHandle = false;</div><div class='del'>-    d-&gt;nativeFilePath.clear();</div><div class='del'>-    d-&gt;filePath.clear();</div><div class='add'>+    d-&gt;closeFileHandle = (handleFlags &amp; QFile::AutoCloseHandle);</div><div class='add'>+    d-&gt;fileEntry.clear();</div><div class='ctx'>     d-&gt;fh = 0;</div><div class='ctx'>     d-&gt;fd = -1;</div><div class='ctx'>     d-&gt;tried_stat = 0;</div><div class='hunk'>@@ -450,7 +365,12 @@ bool QFSFileEngine::close()</div><div class='ctx'> bool QFSFileEnginePrivate::closeFdFh()</div><div class='ctx'> {</div><div class='ctx'>     Q_Q(QFSFileEngine);</div><div class='del'>-    if (fd == -1 &amp;&amp; !fh)</div><div class='add'>+    if (fd == -1 &amp;&amp; !fh</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+        &amp;&amp; !symbianFile.SubSessionHandle()</div><div class='add'>+        &amp;&amp; fileHandleForMaps == -1</div><div class='add'>+#endif</div><div class='add'>+        )</div><div class='ctx'>         return false;</div><div class='ctx'> </div><div class='ctx'>     // Flush the file if it's buffered, and if the last flush didn't fail.</div><div class='hunk'>@@ -458,10 +378,24 @@ bool QFSFileEnginePrivate::closeFdFh()</div><div class='ctx'>     bool closed = true;</div><div class='ctx'>     tried_stat = 0;</div><div class='ctx'> </div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+    // Map handle is always owned by us so always close it</div><div class='add'>+    if (fileHandleForMaps &gt;= 0) {</div><div class='add'>+        QT_CLOSE(fileHandleForMaps);</div><div class='add'>+        fileHandleForMaps = -1;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'>     // Close the file if we created the handle.</div><div class='ctx'>     if (closeFileHandle) {</div><div class='ctx'>         int ret;</div><div class='ctx'>         do {</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+            if (symbianFile.SubSessionHandle()) {</div><div class='add'>+                symbianFile.Close();</div><div class='add'>+                ret = 0;</div><div class='add'>+            } else</div><div class='add'>+#endif</div><div class='ctx'>             if (fh) {</div><div class='ctx'>                 // Close buffered file.</div><div class='ctx'>                 ret = fclose(fh) != 0 ? -1 : 0;</div><div class='hunk'>@@ -541,28 +475,19 @@ qint64 QFSFileEngine::size() const</div><div class='ctx'> /*!</div><div class='ctx'>     \internal</div><div class='ctx'> */</div><div class='add'>+#ifndef Q_OS_WIN</div><div class='ctx'> qint64 QFSFileEnginePrivate::sizeFdFh() const</div><div class='ctx'> {</div><div class='ctx'>     Q_Q(const QFSFileEngine);</div><div class='del'>-    // ### Fix this function, it should not stat unless the file is closed.</div><div class='del'>-    QT_STATBUF st;</div><div class='del'>-    int ret = 0;</div><div class='ctx'>     const_cast&lt;QFSFileEngine *&gt;(q)-&gt;flush();</div><div class='del'>-    if (fh &amp;&amp; nativeFilePath.isEmpty()) {</div><div class='del'>-        // Buffered stdlib mode.</div><div class='del'>-        // ### This should really be an ftell</div><div class='del'>-        ret = QT_FSTAT(QT_FILENO(fh), &amp;st);</div><div class='del'>-    } else if (fd == -1) {</div><div class='del'>-        // Stateless stat.</div><div class='del'>-        ret = QT_STAT(nativeFilePath.constData(), &amp;st);</div><div class='del'>-    } else {</div><div class='del'>-        // Unbuffered stdio mode.</div><div class='del'>-        ret = QT_FSTAT(fd, &amp;st);</div><div class='del'>-    }</div><div class='del'>-    if (ret == -1)</div><div class='add'>+</div><div class='add'>+    tried_stat = 0;</div><div class='add'>+    metaData.clearFlags(QFileSystemMetaData::SizeAttribute);</div><div class='add'>+    if (!doStat(QFileSystemMetaData::SizeAttribute))</div><div class='ctx'>         return 0;</div><div class='del'>-    return st.st_size;</div><div class='add'>+    return metaData.size();</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     \reimp</div><div class='hunk'>@@ -869,18 +794,14 @@ bool QFSFileEngine::isSequential() const</div><div class='ctx'> /*!</div><div class='ctx'>     \internal</div><div class='ctx'> */</div><div class='add'>+#ifdef Q_OS_UNIX</div><div class='ctx'> bool QFSFileEnginePrivate::isSequentialFdFh() const</div><div class='ctx'> {</div><div class='del'>-    if (!tried_stat)</div><div class='del'>-        doStat();</div><div class='del'>-    if (could_stat) {</div><div class='del'>-#ifdef Q_OS_UNIX</div><div class='del'>-        return (st.st_mode &amp; S_IFMT) != S_IFREG;</div><div class='del'>-        // ### WINDOWS!</div><div class='del'>-#endif</div><div class='del'>-    }</div><div class='add'>+    if (doStat(QFileSystemMetaData::SequentialType))</div><div class='add'>+        return metaData.isSequential();</div><div class='ctx'>     return true;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     \reimp</div><div class='head'>diff --git a/src/corelib/io/qfsfileengine.h b/src/corelib/io/qfsfileengine.h<br/>index 719ea00..2e0b1eb 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfsfileengine.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfsfileengine.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfsfileengine.h</a></div><div class='hunk'>@@ -43,6 +43,9 @@</div><div class='ctx'> #define QFSFILEENGINE_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;QtCore/qabstractfileengine.h&gt;</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+#include &lt;f32file.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_FSFILEENGINE</div><div class='ctx'> </div><div class='hunk'>@@ -101,6 +104,11 @@ public:</div><div class='ctx'> </div><div class='ctx'>     //FS only!!</div><div class='ctx'>     bool open(QIODevice::OpenMode flags, int fd);</div><div class='add'>+    bool open(QIODevice::OpenMode flags, int fd, QFile::FileHandleFlags handleFlags);</div><div class='add'>+    bool open(QIODevice::OpenMode flags, FILE *fh, QFile::FileHandleFlags handleFlags);</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+    bool open(QIODevice::OpenMode flags, const RFile &amp;f, QFile::FileHandleFlags handleFlags);</div><div class='add'>+#endif</div><div class='ctx'>     static bool setCurrentPath(const QString &amp;path);</div><div class='ctx'>     static QString currentPath(const QString &amp;path = QString());</div><div class='ctx'>     static QString homePath();</div><div class='head'>diff --git a/src/corelib/io/qfsfileengine_iterator.cpp b/src/corelib/io/qfsfileengine_iterator.cpp<br/>index 5a89879..323ab58 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfsfileengine_iterator.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine_iterator.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfsfileengine_iterator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfsfileengine_iterator.cpp</a></div><div class='hunk'>@@ -40,6 +40,7 @@</div><div class='ctx'> ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include "qfsfileengine_iterator_p.h"</div><div class='add'>+#include "qfileinfo_p.h"</div><div class='ctx'> #include "qvariant.h"</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_FSFILEENGINE</div><div class='hunk'>@@ -48,13 +49,23 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> QFSFileEngineIterator::QFSFileEngineIterator(QDir::Filters filters, const QStringList &amp;filterNames)</div><div class='ctx'>     : QAbstractFileEngineIterator(filters, filterNames)</div><div class='add'>+    , done(false)</div><div class='ctx'> {</div><div class='del'>-    newPlatformSpecifics();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QFSFileEngineIterator::~QFSFileEngineIterator()</div><div class='ctx'> {</div><div class='del'>-    deletePlatformSpecifics();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QFSFileEngineIterator::hasNext() const</div><div class='add'>+{</div><div class='add'>+    if (!done &amp;&amp; !nativeIterator) {</div><div class='add'>+        nativeIterator.reset(new QFileSystemIterator(QFileSystemEntry(path()),</div><div class='add'>+                    filters(), nameFilters()));</div><div class='add'>+        advance();</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return !done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QString QFSFileEngineIterator::next()</div><div class='hunk'>@@ -66,14 +77,28 @@ QString QFSFileEngineIterator::next()</div><div class='ctx'>     return currentFilePath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void QFSFileEngineIterator::advance() const</div><div class='add'>+{</div><div class='add'>+    currentInfo = nextInfo;</div><div class='add'>+</div><div class='add'>+    QFileSystemEntry entry;</div><div class='add'>+    QFileSystemMetaData data;</div><div class='add'>+    if (nativeIterator-&gt;advance(entry, data)) {</div><div class='add'>+        nextInfo = QFileInfo(new QFileInfoPrivate(entry, data));</div><div class='add'>+    } else {</div><div class='add'>+        done = true;</div><div class='add'>+        nativeIterator.reset();</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> QString QFSFileEngineIterator::currentFileName() const</div><div class='ctx'> {</div><div class='del'>-    return currentEntry;</div><div class='add'>+    return currentInfo.fileName();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QFileInfo QFSFileEngineIterator::currentFileInfo() const</div><div class='ctx'> {</div><div class='del'>-    return QAbstractFileEngineIterator::currentFileInfo();</div><div class='add'>+    return currentInfo;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qfsfileengine_iterator_p.h b/src/corelib/io/qfsfileengine_iterator_p.h<br/>index 9fc0332..deccb01 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfsfileengine_iterator_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine_iterator_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfsfileengine_iterator_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfsfileengine_iterator_p.h</a></div><div class='hunk'>@@ -54,6 +54,7 @@</div><div class='ctx'> //</div><div class='ctx'> </div><div class='ctx'> #include "qabstractfileengine.h"</div><div class='add'>+#include "qfilesystemiterator_p.h"</div><div class='ctx'> #include "qdir.h"</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_FSFILEENGINE</div><div class='hunk'>@@ -76,13 +77,11 @@ public:</div><div class='ctx'>     QFileInfo currentFileInfo() const;</div><div class='ctx'> </div><div class='ctx'> private:</div><div class='del'>-    QFSFileEngineIteratorPlatformSpecificData *platform;</div><div class='del'>-    friend class QFSFileEngineIteratorPlatformSpecificData;</div><div class='del'>-    void newPlatformSpecifics();</div><div class='del'>-    void deletePlatformSpecifics();</div><div class='del'>-    void advance();</div><div class='del'>-</div><div class='del'>-    QString currentEntry;</div><div class='add'>+    void advance() const;</div><div class='add'>+    mutable QScopedPointer&lt;QFileSystemIterator&gt; nativeIterator;</div><div class='add'>+    mutable QFileInfo currentInfo;</div><div class='add'>+    mutable QFileInfo nextInfo;</div><div class='add'>+    mutable bool done;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qfsfileengine_iterator_unix.cpp b/src/corelib/io/qfsfileengine_iterator_unix.cpp<br/>deleted file mode 100644<br/>index c8434ed..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfsfileengine_iterator_unix.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine_iterator_unix.cpp</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,140 +0,0 @@</div><div class='del'>-/****************************************************************************</div><div class='del'>-**</div><div class='del'>-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='del'>-** All rights reserved.</div><div class='del'>-** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='del'>-**</div><div class='del'>-** This file is part of the QtCore module of the Qt Toolkit.</div><div class='del'>-**</div><div class='del'>-** $QT_BEGIN_LICENSE:LGPL$</div><div class='del'>-** GNU Lesser General Public License Usage</div><div class='del'>-** This file may be used under the terms of the GNU Lesser General Public</div><div class='del'>-** License version 2.1 as published by the Free Software Foundation and</div><div class='del'>-** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='del'>-** file. Please review the following information to ensure the GNU Lesser</div><div class='del'>-** General Public License version 2.1 requirements will be met:</div><div class='del'>-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='del'>-**</div><div class='del'>-** In addition, as a special exception, Nokia gives you certain additional</div><div class='del'>-** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='del'>-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='del'>-**</div><div class='del'>-** GNU General Public License Usage</div><div class='del'>-** Alternatively, this file may be used under the terms of the GNU General</div><div class='del'>-** Public License version 3.0 as published by the Free Software Foundation</div><div class='del'>-** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='del'>-** file. Please review the following information to ensure the GNU General</div><div class='del'>-** Public License version 3.0 requirements will be met:</div><div class='del'>-** http://www.gnu.org/copyleft/gpl.html.</div><div class='del'>-**</div><div class='del'>-** Other Usage</div><div class='del'>-** Alternatively, this file may be used in accordance with the terms and</div><div class='del'>-** conditions contained in a signed written agreement between you and Nokia.</div><div class='del'>-**</div><div class='del'>-**</div><div class='del'>-**</div><div class='del'>-**</div><div class='del'>-**</div><div class='del'>-** $QT_END_LICENSE$</div><div class='del'>-**</div><div class='del'>-****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include "qplatformdefs.h"</div><div class='del'>-#include "qfsfileengine_iterator_p.h"</div><div class='del'>-</div><div class='del'>-#include &lt;QtCore/qvariant.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef QT_NO_FSFILEENGINE</div><div class='del'>-</div><div class='del'>-QT_BEGIN_NAMESPACE</div><div class='del'>-</div><div class='del'>-class QFSFileEngineIteratorPlatformSpecificData</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    inline QFSFileEngineIteratorPlatformSpecificData()</div><div class='del'>-        : dir(0), dirEntry(0), done(false)</div><div class='del'>-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_CYGWIN) &amp;&amp; !defined(Q_OS_SYMBIAN)</div><div class='del'>-          , mt_file(0)</div><div class='del'>-#endif</div><div class='del'>-    {}</div><div class='del'>-</div><div class='del'>-    QT_DIR *dir;</div><div class='del'>-    QT_DIRENT *dirEntry;</div><div class='del'>-    bool done;</div><div class='del'>-</div><div class='del'>-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_CYGWIN) &amp;&amp; !defined(Q_OS_SYMBIAN)</div><div class='del'>-    // for readdir_r</div><div class='del'>-    QT_DIRENT *mt_file;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void QFSFileEngineIterator::advance()</div><div class='del'>-{</div><div class='del'>-    currentEntry = platform-&gt;dirEntry ? QFile::decodeName(QByteArray(platform-&gt;dirEntry-&gt;d_name)) : QString();</div><div class='del'>-</div><div class='del'>-    if (!platform-&gt;dir)</div><div class='del'>-        return;</div><div class='del'>-</div><div class='del'>-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_CYGWIN) &amp;&amp; !defined(Q_OS_SYMBIAN)</div><div class='del'>-    if (QT_READDIR_R(platform-&gt;dir, platform-&gt;mt_file, &amp;platform-&gt;dirEntry) != 0)</div><div class='del'>-        platform-&gt;done = true;</div><div class='del'>-#else</div><div class='del'>-    // ### add local lock to prevent breaking reentrancy</div><div class='del'>-    platform-&gt;dirEntry = QT_READDIR(platform-&gt;dir);</div><div class='del'>-#endif // _POSIX_THREAD_SAFE_FUNCTIONS</div><div class='del'>-    if (!platform-&gt;dirEntry) {</div><div class='del'>-        QT_CLOSEDIR(platform-&gt;dir);</div><div class='del'>-        platform-&gt;dir = 0;</div><div class='del'>-        platform-&gt;done = true;</div><div class='del'>-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_CYGWIN) &amp;&amp; !defined(Q_OS_SYMBIAN)</div><div class='del'>-        delete [] platform-&gt;mt_file;</div><div class='del'>-        platform-&gt;mt_file = 0;</div><div class='del'>-#endif</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void QFSFileEngineIterator::newPlatformSpecifics()</div><div class='del'>-{</div><div class='del'>-    platform = new QFSFileEngineIteratorPlatformSpecificData;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void QFSFileEngineIterator::deletePlatformSpecifics()</div><div class='del'>-{</div><div class='del'>-    if (platform-&gt;dir) {</div><div class='del'>-        QT_CLOSEDIR(platform-&gt;dir);</div><div class='del'>-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_CYGWIN) &amp;&amp; !defined(Q_OS_SYMBIAN)</div><div class='del'>-        delete [] platform-&gt;mt_file;</div><div class='del'>-        platform-&gt;mt_file = 0;</div><div class='del'>-#endif</div><div class='del'>-    }</div><div class='del'>-    delete platform;</div><div class='del'>-    platform = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool QFSFileEngineIterator::hasNext() const</div><div class='del'>-{</div><div class='del'>-    if (!platform-&gt;done &amp;&amp; !platform-&gt;dir) {</div><div class='del'>-        QFSFileEngineIterator *that = const_cast&lt;QFSFileEngineIterator *&gt;(this);</div><div class='del'>-        if ((that-&gt;platform-&gt;dir = QT_OPENDIR(QFile::encodeName(path()).data())) == 0) {</div><div class='del'>-            that-&gt;platform-&gt;done = true;</div><div class='del'>-        } else {</div><div class='del'>-            // ### Race condition; we should use fpathconf and dirfd().</div><div class='del'>-            long maxPathName = ::pathconf(QFile::encodeName(path()).data(), _PC_NAME_MAX);</div><div class='del'>-            if ((int) maxPathName == -1)</div><div class='del'>-                maxPathName = FILENAME_MAX;</div><div class='del'>-            maxPathName += sizeof(QT_DIRENT) + 1;</div><div class='del'>-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_CYGWIN) &amp;&amp; !defined(Q_OS_SYMBIAN)</div><div class='del'>-            if (that-&gt;platform-&gt;mt_file)</div><div class='del'>-                delete [] that-&gt;platform-&gt;mt_file;</div><div class='del'>-            that-&gt;platform-&gt;mt_file = (QT_DIRENT *)new char[maxPathName];</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-            that-&gt;advance();</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    return !platform-&gt;done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-QT_END_NAMESPACE</div><div class='del'>-</div><div class='del'>-#endif // QT_NO_FSFILEENGINE</div><div class='head'>diff --git a/src/corelib/io/qfsfileengine_iterator_win.cpp b/src/corelib/io/qfsfileengine_iterator_win.cpp<br/>deleted file mode 100644<br/>index 5ffd1ba..0000000<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfsfileengine_iterator_win.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine_iterator_win.cpp</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,161 +0,0 @@</div><div class='del'>-/****************************************************************************</div><div class='del'>-**</div><div class='del'>-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='del'>-** All rights reserved.</div><div class='del'>-** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='del'>-**</div><div class='del'>-** This file is part of the QtCore module of the Qt Toolkit.</div><div class='del'>-**</div><div class='del'>-** $QT_BEGIN_LICENSE:LGPL$</div><div class='del'>-** GNU Lesser General Public License Usage</div><div class='del'>-** This file may be used under the terms of the GNU Lesser General Public</div><div class='del'>-** License version 2.1 as published by the Free Software Foundation and</div><div class='del'>-** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='del'>-** file. Please review the following information to ensure the GNU Lesser</div><div class='del'>-** General Public License version 2.1 requirements will be met:</div><div class='del'>-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='del'>-**</div><div class='del'>-** In addition, as a special exception, Nokia gives you certain additional</div><div class='del'>-** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='del'>-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='del'>-**</div><div class='del'>-** GNU General Public License Usage</div><div class='del'>-** Alternatively, this file may be used under the terms of the GNU General</div><div class='del'>-** Public License version 3.0 as published by the Free Software Foundation</div><div class='del'>-** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='del'>-** file. Please review the following information to ensure the GNU General</div><div class='del'>-** Public License version 3.0 requirements will be met:</div><div class='del'>-** http://www.gnu.org/copyleft/gpl.html.</div><div class='del'>-**</div><div class='del'>-** Other Usage</div><div class='del'>-** Alternatively, this file may be used in accordance with the terms and</div><div class='del'>-** conditions contained in a signed written agreement between you and Nokia.</div><div class='del'>-**</div><div class='del'>-**</div><div class='del'>-**</div><div class='del'>-**</div><div class='del'>-**</div><div class='del'>-** $QT_END_LICENSE$</div><div class='del'>-**</div><div class='del'>-****************************************************************************/</div><div class='del'>-</div><div class='del'>-#include "qfsfileengine_iterator_p.h"</div><div class='del'>-#include "qfsfileengine_p.h"</div><div class='del'>-#include "qplatformdefs.h"</div><div class='del'>-</div><div class='del'>-#include &lt;QtCore/qvariant.h&gt;</div><div class='del'>-</div><div class='del'>-QT_BEGIN_NAMESPACE</div><div class='del'>-</div><div class='del'>-class QFSFileEngineIteratorPlatformSpecificData</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    inline QFSFileEngineIteratorPlatformSpecificData()</div><div class='del'>-        : uncShareIndex(-1), findFileHandle(INVALID_HANDLE_VALUE),</div><div class='del'>-          done(false), uncFallback(false)</div><div class='del'>-    {}</div><div class='del'>-</div><div class='del'>-    QFSFileEngineIterator *it;</div><div class='del'>-</div><div class='del'>-    QStringList uncShares;</div><div class='del'>-    int uncShareIndex;</div><div class='del'>-</div><div class='del'>-    HANDLE findFileHandle;</div><div class='del'>-    WIN32_FIND_DATA findData;</div><div class='del'>-    bool done;</div><div class='del'>-    bool uncFallback;</div><div class='del'>-</div><div class='del'>-    void saveCurrentFileName();</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void QFSFileEngineIteratorPlatformSpecificData::saveCurrentFileName()</div><div class='del'>-{</div><div class='del'>-    if (uncFallback) {</div><div class='del'>-        // Windows share / UNC path</div><div class='del'>-        it-&gt;currentEntry = uncShares.at(uncShareIndex - 1);</div><div class='del'>-    } else {</div><div class='del'>-        // Local directory</div><div class='del'>-        it-&gt;currentEntry = QString::fromWCharArray(findData.cFileName);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void QFSFileEngineIterator::advance()</div><div class='del'>-{</div><div class='del'>-    platform-&gt;saveCurrentFileName();</div><div class='del'>-</div><div class='del'>-    if (platform-&gt;done)</div><div class='del'>-        return;</div><div class='del'>-</div><div class='del'>-    if (platform-&gt;uncFallback) {</div><div class='del'>-        ++platform-&gt;uncShareIndex;</div><div class='del'>-    } else if (platform-&gt;findFileHandle != INVALID_HANDLE_VALUE) {</div><div class='del'>-        if (!FindNextFile(platform-&gt;findFileHandle, &amp;platform-&gt;findData)) {</div><div class='del'>-            platform-&gt;done = true;</div><div class='del'>-            FindClose(platform-&gt;findFileHandle);</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void QFSFileEngineIterator::newPlatformSpecifics()</div><div class='del'>-{</div><div class='del'>-    platform = new QFSFileEngineIteratorPlatformSpecificData;</div><div class='del'>-    platform-&gt;it = this;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void QFSFileEngineIterator::deletePlatformSpecifics()</div><div class='del'>-{</div><div class='del'>-    delete platform;</div><div class='del'>-    platform = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool QFSFileEngineIterator::hasNext() const</div><div class='del'>-{</div><div class='del'>-    if (platform-&gt;done)</div><div class='del'>-        return false;</div><div class='del'>-</div><div class='del'>-    if (platform-&gt;uncFallback)</div><div class='del'>-        return platform-&gt;uncShareIndex &gt; 0 &amp;&amp; platform-&gt;uncShareIndex &lt;= platform-&gt;uncShares.size();</div><div class='del'>-</div><div class='del'>-    if (platform-&gt;findFileHandle == INVALID_HANDLE_VALUE) {</div><div class='del'>-        QString path = this-&gt;path();</div><div class='del'>-        // Local directory</div><div class='del'>-        if (path.endsWith(QLatin1String(".lnk")))</div><div class='del'>-            path = QFileInfo(path).readLink();</div><div class='del'>-</div><div class='del'>-        if (!path.endsWith(QLatin1Char('/')))</div><div class='del'>-            path.append(QLatin1Char('/'));</div><div class='del'>-        path.append(QLatin1String("*.*"));</div><div class='del'>-</div><div class='del'>-        QString fileName = QFSFileEnginePrivate::longFileName(path);</div><div class='del'>-        platform-&gt;findFileHandle = FindFirstFile((const wchar_t *)fileName.utf16(), &amp;platform-&gt;findData);</div><div class='del'>-</div><div class='del'>-        if (platform-&gt;findFileHandle == INVALID_HANDLE_VALUE) {</div><div class='del'>-            if (path.startsWith(QLatin1String("//"))) {</div><div class='del'>-                path = this-&gt;path();</div><div class='del'>-                // UNC</div><div class='del'>-                QStringList parts = QDir::toNativeSeparators(path).split(QLatin1Char('\\'), QString::SkipEmptyParts);</div><div class='del'>-</div><div class='del'>-                if (parts.count() == 1 &amp;&amp; QFSFileEnginePrivate::uncListSharesOnServer(QLatin1String("\\\\") + parts.at(0),</div><div class='del'>-                                                                                      &amp;platform-&gt;uncShares)) {</div><div class='del'>-                    if (platform-&gt;uncShares.isEmpty()) {</div><div class='del'>-                        platform-&gt;done = true;</div><div class='del'>-                    } else {</div><div class='del'>-                        platform-&gt;uncShareIndex = 1;</div><div class='del'>-                    }</div><div class='del'>-                    platform-&gt;uncFallback = true;</div><div class='del'>-                } else {</div><div class='del'>-                    platform-&gt;done = true;</div><div class='del'>-                }</div><div class='del'>-            } else {</div><div class='del'>-                platform-&gt;done = true;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if (!platform-&gt;done &amp;&amp; (!platform-&gt;uncFallback || !platform-&gt;uncShares.isEmpty()))</div><div class='del'>-            platform-&gt;saveCurrentFileName();</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return !platform-&gt;done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h<br/>index e61ddf8..79dda1b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfsfileengine_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfsfileengine_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfsfileengine_p.h</a></div><div class='hunk'>@@ -56,8 +56,14 @@</div><div class='ctx'> #include "qplatformdefs.h"</div><div class='ctx'> #include "QtCore/qfsfileengine.h"</div><div class='ctx'> #include "private/qabstractfileengine_p.h"</div><div class='add'>+#include &lt;QtCore/private/qfilesystementry_p.h&gt;</div><div class='add'>+#include &lt;QtCore/private/qfilesystemmetadata_p.h&gt;</div><div class='ctx'> #include &lt;qhash.h&gt;</div><div class='ctx'> </div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+#include &lt;f32file.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef QT_NO_FSFILEENGINE</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='hunk'>@@ -74,13 +80,10 @@ public:</div><div class='ctx'> #ifdef Q_WS_WIN</div><div class='ctx'>     static QString longFileName(const QString &amp;path);</div><div class='ctx'> #endif</div><div class='del'>-    static QString canonicalized(const QString &amp;path);</div><div class='ctx'> </div><div class='del'>-    QString filePath;</div><div class='del'>-    QByteArray nativeFilePath;</div><div class='add'>+    QFileSystemEntry fileEntry;</div><div class='ctx'>     QIODevice::OpenMode openMode;</div><div class='ctx'> </div><div class='del'>-    void nativeInitFileName();</div><div class='ctx'>     bool nativeOpen(QIODevice::OpenMode openMode);</div><div class='ctx'>     bool openFh(QIODevice::OpenMode flags, FILE *fh);</div><div class='ctx'>     bool openFd(QIODevice::OpenMode flags, int fd);</div><div class='hunk'>@@ -89,7 +92,9 @@ public:</div><div class='ctx'>     bool nativeFlush();</div><div class='ctx'>     bool flushFh();</div><div class='ctx'>     qint64 nativeSize() const;</div><div class='add'>+#ifndef Q_OS_WIN</div><div class='ctx'>     qint64 sizeFdFh() const;</div><div class='add'>+#endif</div><div class='ctx'>     qint64 nativePos() const;</div><div class='ctx'>     qint64 posFdFh() const;</div><div class='ctx'>     bool nativeSeek(qint64);</div><div class='hunk'>@@ -102,12 +107,42 @@ public:</div><div class='ctx'>     qint64 writeFdFh(const char *data, qint64 len);</div><div class='ctx'>     int nativeHandle() const;</div><div class='ctx'>     bool nativeIsSequential() const;</div><div class='add'>+#ifndef Q_OS_WIN</div><div class='ctx'>     bool isSequentialFdFh() const;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'>     uchar *map(qint64 offset, qint64 size, QFile::MemoryMapFlags flags);</div><div class='ctx'>     bool unmap(uchar *ptr);</div><div class='ctx'> </div><div class='add'>+    mutable QFileSystemMetaData metaData;</div><div class='add'>+</div><div class='ctx'>     FILE *fh;</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+#ifdef  SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API</div><div class='add'>+    RFile64 symbianFile;</div><div class='add'>+    TInt64 symbianFilePos;</div><div class='add'>+#else</div><div class='add'>+    RFile symbianFile;</div><div class='add'>+    </div><div class='add'>+    /**</div><div class='add'>+     * The cursor position in the underlying file.  This differs</div><div class='add'>+     * from devicePos because the latter is updated on calls to</div><div class='add'>+     * writeData, even if no data was physically transferred to</div><div class='add'>+     * the file, but instead stored in the write buffer.</div><div class='add'>+     * </div><div class='add'>+     * iFilePos is updated on calls to RFile::Read and</div><div class='add'>+     * RFile::Write.  It is also updated on calls to seek() but</div><div class='add'>+     * RFile::Seek is not called when that happens because</div><div class='add'>+     * Symbian supports positioned reads and writes, saving a file</div><div class='add'>+     * server call, and because Symbian does not support seeking</div><div class='add'>+     * past the end of a file.  </div><div class='add'>+     */</div><div class='add'>+    TInt symbianFilePos;</div><div class='add'>+#endif</div><div class='add'>+    mutable int fileHandleForMaps;</div><div class='add'>+    int getMapHandle();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifdef Q_WS_WIN</div><div class='ctx'>     HANDLE fileHandle;</div><div class='ctx'>     HANDLE mapHandle;</div><div class='hunk'>@@ -120,7 +155,6 @@ public:</div><div class='ctx'>     mutable DWORD fileAttrib;</div><div class='ctx'> #else</div><div class='ctx'>     QHash&lt;uchar *, QPair&lt;int /*offset % PageSize*/, size_t /*length + offset % PageSize*/&gt; &gt; maps;</div><div class='del'>-    mutable QT_STATBUF st;</div><div class='ctx'> #endif</div><div class='ctx'>     int fd;</div><div class='ctx'> </div><div class='hunk'>@@ -142,23 +176,17 @@ public:</div><div class='ctx'>     mutable uint is_link : 1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-    bool doStat() const;</div><div class='add'>+#if defined(Q_OS_WIN)</div><div class='add'>+    bool doStat(QFileSystemMetaData::MetaDataFlags flags) const;</div><div class='add'>+#else</div><div class='add'>+    bool doStat(QFileSystemMetaData::MetaDataFlags flags = QFileSystemMetaData::PosixStatFlags) const;</div><div class='add'>+#endif</div><div class='ctx'>     bool isSymlink() const;</div><div class='ctx'> </div><div class='ctx'> #if defined(Q_OS_WIN32)</div><div class='ctx'>     int sysOpen(const QString &amp;, int flags);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)</div><div class='del'>-    static void resolveLibs();</div><div class='del'>-    static bool resolveUNCLibs();</div><div class='del'>-    static bool uncListSharesOnServer(const QString &amp;server, QStringList *list);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-    void setSymbianError(int symbianError, QFile::FileError defaultError, QString defaultString);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> protected:</div><div class='ctx'>     QFSFileEnginePrivate();</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp<br/>index f1dd223..681e55d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfsfileengine_unix.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine_unix.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfsfileengine_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfsfileengine_unix.cpp</a></div><div class='hunk'>@@ -43,6 +43,8 @@</div><div class='ctx'> #include "qabstractfileengine.h"</div><div class='ctx'> #include "private/qfsfileengine_p.h"</div><div class='ctx'> #include "private/qcore_unix_p.h"</div><div class='add'>+#include "qfilesystementry_p.h"</div><div class='add'>+#include "qfilesystemengine_p.h"</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_FSFILEENGINE</div><div class='ctx'> </div><div class='hunk'>@@ -67,7 +69,6 @@</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #if defined(Q_OS_SYMBIAN)</div><div class='ctx'> /*!</div><div class='ctx'>     \internal</div><div class='hunk'>@@ -82,56 +83,25 @@ static bool isRelativePathSymbian(const QString&amp; fileName)</div><div class='ctx'>              || (fileName.at(0) == QLatin1Char('/') &amp;&amp; fileName.at(1) == QLatin1Char('/')))));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*!</div><div class='del'>- \internal</div><div class='del'>- convert symbian error code to the one suitable for setError.</div><div class='del'>- example usage: setSymbianError(err, QFile::CopyError, QLatin1String("copy error"))</div><div class='del'>-*/</div><div class='del'>-void QFSFileEnginePrivate::setSymbianError(int symbianError, QFile::FileError defaultError, QString defaultString)</div><div class='del'>-{</div><div class='del'>-    Q_Q(QFSFileEngine);</div><div class='del'>-    switch (symbianError) {</div><div class='del'>-    case KErrNone:</div><div class='del'>-        q-&gt;setError(QFile::NoError, QLatin1String(""));</div><div class='del'>-        break;</div><div class='del'>-    case KErrAccessDenied:</div><div class='del'>-        q-&gt;setError(QFile::PermissionsError, QLatin1String("access denied"));</div><div class='del'>-        break;</div><div class='del'>-    case KErrPermissionDenied:</div><div class='del'>-        q-&gt;setError(QFile::PermissionsError, QLatin1String("permission denied"));</div><div class='del'>-        break;</div><div class='del'>-    case KErrAbort:</div><div class='del'>-        q-&gt;setError(QFile::AbortError, QLatin1String("aborted"));</div><div class='del'>-        break;</div><div class='del'>-    case KErrCancel:</div><div class='del'>-        q-&gt;setError(QFile::AbortError, QLatin1String("cancelled"));</div><div class='del'>-        break;</div><div class='del'>-    case KErrTimedOut:</div><div class='del'>-        q-&gt;setError(QFile::TimeOutError, QLatin1String("timed out"));</div><div class='del'>-        break;</div><div class='del'>-    default:</div><div class='del'>-        q-&gt;setError(defaultError, defaultString);</div><div class='del'>-        break;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef Q_OS_SYMBIAN</div><div class='ctx'> /*!</div><div class='ctx'>     \internal</div><div class='ctx'> </div><div class='ctx'>     Returns the stdlib open string corresponding to a QIODevice::OpenMode.</div><div class='ctx'> */</div><div class='del'>-static inline QByteArray openModeToFopenMode(QIODevice::OpenMode flags, const QByteArray &amp;fileName)</div><div class='add'>+static inline QByteArray openModeToFopenMode(QIODevice::OpenMode flags, const QFileSystemEntry &amp;fileEntry,</div><div class='add'>+        QFileSystemMetaData &amp;metaData)</div><div class='ctx'> {</div><div class='ctx'>     QByteArray mode;</div><div class='ctx'>     if ((flags &amp; QIODevice::ReadOnly) &amp;&amp; !(flags &amp; QIODevice::Truncate)) {</div><div class='ctx'>         mode = "rb";</div><div class='ctx'>         if (flags &amp; QIODevice::WriteOnly) {</div><div class='del'>-            QT_STATBUF statBuf;</div><div class='del'>-            if (!fileName.isEmpty()</div><div class='del'>-                &amp;&amp; QT_STAT(fileName, &amp;statBuf) == 0</div><div class='del'>-                &amp;&amp; (statBuf.st_mode &amp; S_IFMT) == S_IFREG) {</div><div class='add'>+            metaData.clearFlags(QFileSystemMetaData::FileType);</div><div class='add'>+            if (!fileEntry.isEmpty()</div><div class='add'>+                    &amp;&amp; QFileSystemEngine::fillMetaData(fileEntry, metaData, QFileSystemMetaData::FileType)</div><div class='add'>+                    &amp;&amp; metaData.isFile()) {</div><div class='ctx'>                 mode += '+';</div><div class='ctx'>             } else {</div><div class='ctx'>                 mode = "wb+";</div><div class='hunk'>@@ -155,6 +125,7 @@ static inline QByteArray openModeToFopenMode(QIODevice::OpenMode flags, const QB</div><div class='ctx'> </div><div class='ctx'>     return mode;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     \internal</div><div class='hunk'>@@ -184,6 +155,7 @@ static inline int openModeToOpenFlags(QIODevice::OpenMode mode)</div><div class='ctx'>     return oflags;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef Q_OS_SYMBIAN</div><div class='ctx'> /*!</div><div class='ctx'>     \internal</div><div class='ctx'> </div><div class='hunk'>@@ -194,15 +166,151 @@ static inline bool setCloseOnExec(int fd)</div><div class='ctx'> {</div><div class='ctx'>     return fd != -1 &amp;&amp; fcntl(fd, F_SETFD, FD_CLOEXEC) != -1;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='ctx'> /*!</div><div class='ctx'>     \internal</div><div class='ctx'> */</div><div class='del'>-void QFSFileEnginePrivate::nativeInitFileName()</div><div class='add'>+bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)</div><div class='ctx'> {</div><div class='del'>-    nativeFilePath = QFile::encodeName(filePath);</div><div class='add'>+    Q_Q(QFSFileEngine);</div><div class='add'>+	</div><div class='add'>+	fh = 0;</div><div class='add'>+	fd = -1;</div><div class='add'>+</div><div class='add'>+    QString fn(QFileSystemEngine::absoluteName(fileEntry).nativeFilePath());</div><div class='add'>+    RFs&amp; fs = qt_s60GetRFs();</div><div class='add'>+</div><div class='add'>+    TUint symbianMode = 0;</div><div class='add'>+</div><div class='add'>+    if(openMode &amp; QIODevice::ReadOnly)</div><div class='add'>+        symbianMode |= EFileRead;</div><div class='add'>+    if(openMode &amp; QIODevice::WriteOnly)</div><div class='add'>+        symbianMode |= EFileWrite;</div><div class='add'>+    if(openMode &amp; QIODevice::Text)</div><div class='add'>+        symbianMode |= EFileStreamText;</div><div class='add'>+</div><div class='add'>+    // pre Symbian 9.4, file I/O is always unbuffered, and the enum values don't exist</div><div class='add'>+    if(QSysInfo::symbianVersion() &gt;= QSysInfo::SV_9_4) {</div><div class='add'>+        if (openMode &amp; QFile::Unbuffered) {</div><div class='add'>+            if (openMode &amp; QIODevice::WriteOnly)</div><div class='add'>+                symbianMode |= 0x00001000; //EFileWriteDirectIO;</div><div class='add'>+            // ### Unbuffered read is not used, because it prevents file open in /resource</div><div class='add'>+            // ### and has no obvious benefits</div><div class='add'>+        } else {</div><div class='add'>+            if (openMode &amp; QIODevice::WriteOnly)</div><div class='add'>+                symbianMode |= 0x00000800; //EFileWriteBuffered;</div><div class='add'>+            // use implementation defaults for read buffering</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    // Until Qt supports file sharing, we can't support EFileShareReadersOrWriters safely,</div><div class='add'>+    // but Qt does this on other platforms and autotests rely on it.</div><div class='add'>+    // The reason is that Unix locks are only advisory - the application needs to test the</div><div class='add'>+    // lock after opening the file. Symbian and Windows locks are mandatory - opening a</div><div class='add'>+    // locked file will fail.</div><div class='add'>+    symbianMode |= EFileShareReadersOrWriters;</div><div class='add'>+</div><div class='add'>+    TInt r;</div><div class='add'>+    //note QIODevice::Truncate only has meaning for read/write access</div><div class='add'>+    //write-only files are always truncated unless append is specified</div><div class='add'>+    //reference openModeToOpenFlags in qfsfileengine_unix.cpp</div><div class='add'>+    if ((openMode &amp; QIODevice::Truncate) || (!(openMode &amp; QIODevice::ReadOnly) &amp;&amp; !(openMode &amp; QIODevice::Append))) {</div><div class='add'>+        r = symbianFile.Replace(fs, qt_QString2TPtrC(fn), symbianMode);</div><div class='add'>+    } else {</div><div class='add'>+        r = symbianFile.Open(fs, qt_QString2TPtrC(fn), symbianMode);</div><div class='add'>+        if (r == KErrNotFound &amp;&amp; (openMode &amp; QIODevice::WriteOnly)) {</div><div class='add'>+            r = symbianFile.Create(fs, qt_QString2TPtrC(fn), symbianMode);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (r == KErrNone) {</div><div class='add'>+#ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API</div><div class='add'>+        TInt64 size;</div><div class='add'>+#else</div><div class='add'>+        TInt size;</div><div class='add'>+#endif</div><div class='add'>+        r = symbianFile.Size(size);</div><div class='add'>+        if (r==KErrNone) {</div><div class='add'>+            if (openMode &amp; QIODevice::Append)</div><div class='add'>+                symbianFilePos = size;</div><div class='add'>+            else</div><div class='add'>+                symbianFilePos = 0;</div><div class='add'>+            //TODO: port this (QFileSystemMetaData in open?)</div><div class='add'>+            //cachedSize = size;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (r != KErrNone) {</div><div class='add'>+        q-&gt;setError(QFile::OpenError, QSystemError(r, QSystemError::NativeError).toString());</div><div class='add'>+        symbianFile.Close();</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    closeFileHandle = true;</div><div class='add'>+    return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool QFSFileEngine::open(QIODevice::OpenMode openMode, const RFile &amp;file, QFile::FileHandleFlags handleFlags)</div><div class='add'>+{</div><div class='add'>+    Q_D(QFSFileEngine);</div><div class='add'>+</div><div class='add'>+    // Append implies WriteOnly.</div><div class='add'>+    if (openMode &amp; QFile::Append)</div><div class='add'>+        openMode |= QFile::WriteOnly;</div><div class='add'>+</div><div class='add'>+    // WriteOnly implies Truncate if neither ReadOnly nor Append are sent.</div><div class='add'>+    if ((openMode &amp; QFile::WriteOnly) &amp;&amp; !(openMode &amp; (QFile::ReadOnly | QFile::Append)))</div><div class='add'>+        openMode |= QFile::Truncate;</div><div class='add'>+</div><div class='add'>+    d-&gt;openMode = openMode;</div><div class='add'>+    d-&gt;lastFlushFailed = false;</div><div class='add'>+    d-&gt;closeFileHandle = (handleFlags &amp; QFile::AutoCloseHandle);</div><div class='add'>+    d-&gt;fileEntry.clear();</div><div class='add'>+    d-&gt;fh = 0;</div><div class='add'>+    d-&gt;fd = -1;</div><div class='add'>+    d-&gt;tried_stat = 0;</div><div class='add'>+</div><div class='add'>+#ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API</div><div class='add'>+    //RFile64 adds only functions to RFile, no data members</div><div class='add'>+    d-&gt;symbianFile = static_cast&lt;const RFile64&amp;&gt;(file);</div><div class='add'>+#else</div><div class='add'>+    d-&gt;symbianFile = file;</div><div class='add'>+#endif</div><div class='add'>+    TInt ret;</div><div class='add'>+    d-&gt;symbianFilePos = 0;</div><div class='add'>+    if (openMode &amp; QFile::Append) {</div><div class='add'>+        // Seek to the end when in Append mode.</div><div class='add'>+        ret = d-&gt;symbianFile.Size(d-&gt;symbianFilePos);</div><div class='add'>+    } else {</div><div class='add'>+        // Seek to current otherwise</div><div class='add'>+        ret = d-&gt;symbianFile.Seek(ESeekCurrent, d-&gt;symbianFilePos);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (ret != KErrNone) {</div><div class='add'>+        setError(QFile::OpenError, QSystemError(ret, QSystemError::NativeError).toString());</div><div class='add'>+</div><div class='add'>+        d-&gt;openMode = QIODevice::NotOpen;</div><div class='add'>+#ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API</div><div class='add'>+        d-&gt;symbianFile = RFile64();</div><div class='add'>+#else</div><div class='add'>+        d-&gt;symbianFile = RFile();</div><div class='add'>+#endif</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    // Extract filename (best effort)</div><div class='add'>+    TFileName fn;</div><div class='add'>+    TInt err = d-&gt;symbianFile.FullName(fn);</div><div class='add'>+    if (err == KErrNone)</div><div class='add'>+        d-&gt;fileEntry = QFileSystemEntry(qt_TDesC2QString(fn), QFileSystemEntry::FromNativePath());</div><div class='add'>+    else</div><div class='add'>+        d-&gt;fileEntry.clear();</div><div class='add'>+</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='ctx'> /*!</div><div class='ctx'>     \internal</div><div class='ctx'> */</div><div class='hunk'>@@ -215,7 +323,7 @@ bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)</div><div class='ctx'> </div><div class='ctx'>         // Try to open the file in unbuffered mode.</div><div class='ctx'>         do {</div><div class='del'>-            fd = QT_OPEN(nativeFilePath.constData(), flags, 0666);</div><div class='add'>+            fd = QT_OPEN(fileEntry.nativeFilePath().constData(), flags, 0666);</div><div class='ctx'>         } while (fd == -1 &amp;&amp; errno == EINTR);</div><div class='ctx'> </div><div class='ctx'>         // On failure, return and report the error.</div><div class='hunk'>@@ -228,13 +336,11 @@ bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)</div><div class='ctx'>         if (!(openMode &amp; QIODevice::WriteOnly)) {</div><div class='ctx'>             // we don't need this check if we tried to open for writing because then</div><div class='ctx'>             // we had received EISDIR anyway.</div><div class='del'>-            QT_STATBUF statBuf;</div><div class='del'>-            if (QT_FSTAT(fd, &amp;statBuf) != -1) {</div><div class='del'>-                if ((statBuf.st_mode &amp; S_IFMT) == S_IFDIR) {</div><div class='del'>-                    q-&gt;setError(QFile::OpenError, QLatin1String("file to open is a directory"));</div><div class='del'>-                    QT_CLOSE(fd);</div><div class='del'>-                    return false;</div><div class='del'>-                }</div><div class='add'>+            if (QFileSystemEngine::fillMetaData(fd, metaData)</div><div class='add'>+                    &amp;&amp; metaData.isDirectory()) {</div><div class='add'>+                q-&gt;setError(QFile::OpenError, QLatin1String("file to open is a directory"));</div><div class='add'>+                QT_CLOSE(fd);</div><div class='add'>+                return false;</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='hunk'>@@ -254,11 +360,11 @@ bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)</div><div class='ctx'> </div><div class='ctx'>         fh = 0;</div><div class='ctx'>     } else {</div><div class='del'>-        QByteArray fopenMode = openModeToFopenMode(openMode, nativeFilePath.constData());</div><div class='add'>+        QByteArray fopenMode = openModeToFopenMode(openMode, fileEntry, metaData);</div><div class='ctx'> </div><div class='ctx'>         // Try to open the file in buffered mode.</div><div class='ctx'>         do {</div><div class='del'>-            fh = QT_FOPEN(nativeFilePath.constData(), fopenMode.constData());</div><div class='add'>+            fh = QT_FOPEN(fileEntry.nativeFilePath().constData(), fopenMode.constData());</div><div class='ctx'>         } while (!fh &amp;&amp; errno == EINTR);</div><div class='ctx'> </div><div class='ctx'>         // On failure, return and report the error.</div><div class='hunk'>@@ -271,13 +377,11 @@ bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)</div><div class='ctx'>         if (!(openMode &amp; QIODevice::WriteOnly)) {</div><div class='ctx'>             // we don't need this check if we tried to open for writing because then</div><div class='ctx'>             // we had received EISDIR anyway.</div><div class='del'>-            QT_STATBUF statBuf;</div><div class='del'>-            if (QT_FSTAT(fileno(fh), &amp;statBuf) != -1) {</div><div class='del'>-                if ((statBuf.st_mode &amp; S_IFMT) == S_IFDIR) {</div><div class='del'>-                    q-&gt;setError(QFile::OpenError, QLatin1String("file to open is a directory"));</div><div class='del'>-                    fclose(fh);</div><div class='del'>-                    return false;</div><div class='del'>-                }</div><div class='add'>+            if (QFileSystemEngine::fillMetaData(QT_FILENO(fh), metaData)</div><div class='add'>+                    &amp;&amp; metaData.isDirectory()) {</div><div class='add'>+                q-&gt;setError(QFile::OpenError, QLatin1String("file to open is a directory"));</div><div class='add'>+                fclose(fh);</div><div class='add'>+                return false;</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='hunk'>@@ -303,6 +407,7 @@ bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)</div><div class='ctx'>     closeFileHandle = true;</div><div class='ctx'>     return true;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     \internal</div><div class='hunk'>@@ -318,6 +423,10 @@ bool QFSFileEnginePrivate::nativeClose()</div><div class='ctx'> */</div><div class='ctx'> bool QFSFileEnginePrivate::nativeFlush()</div><div class='ctx'> {</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+    if (symbianFile.SubSessionHandle())</div><div class='add'>+        return (KErrNone == symbianFile.Flush());</div><div class='add'>+#endif</div><div class='ctx'>     return fh ? flushFh() : fd != -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -328,6 +437,24 @@ qint64 QFSFileEnginePrivate::nativeRead(char *data, qint64 len)</div><div class='ctx'> {</div><div class='ctx'>     Q_Q(QFSFileEngine);</div><div class='ctx'> </div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+    if (symbianFile.SubSessionHandle()) {</div><div class='add'>+        if(len &gt; KMaxTInt) {</div><div class='add'>+            //this check is more likely to catch a corrupt length, since it isn't possible to allocate 2GB buffers (yet..)</div><div class='add'>+            q-&gt;setError(QFile::ReadError, QLatin1String("Maximum 2GB in single read on this platform"));</div><div class='add'>+            return -1;</div><div class='add'>+        }</div><div class='add'>+        TPtr8 ptr(reinterpret_cast&lt;TUint8*&gt;(data), static_cast&lt;TInt&gt;(len));</div><div class='add'>+        TInt r = symbianFile.Read(symbianFilePos, ptr);</div><div class='add'>+        if (r != KErrNone)</div><div class='add'>+        {</div><div class='add'>+            q-&gt;setError(QFile::ReadError, QSystemError(r, QSystemError::NativeError).toString());</div><div class='add'>+            return -1;</div><div class='add'>+        }</div><div class='add'>+        symbianFilePos += ptr.Length();</div><div class='add'>+        return qint64(ptr.Length());</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='ctx'>     if (fh &amp;&amp; nativeIsSequential()) {</div><div class='ctx'>         size_t readBytes = 0;</div><div class='ctx'>         int oldFlags = fcntl(QT_FILENO(fh), F_GETFL);</div><div class='hunk'>@@ -395,6 +522,40 @@ qint64 QFSFileEnginePrivate::nativeReadLine(char *data, qint64 maxlen)</div><div class='ctx'> */</div><div class='ctx'> qint64 QFSFileEnginePrivate::nativeWrite(const char *data, qint64 len)</div><div class='ctx'> {</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+    Q_Q(QFSFileEngine);</div><div class='add'>+    if (symbianFile.SubSessionHandle()) {</div><div class='add'>+        if(len &gt; KMaxTInt) {</div><div class='add'>+            //this check is more likely to catch a corrupt length, since it isn't possible to allocate 2GB buffers (yet..)</div><div class='add'>+            q-&gt;setError(QFile::WriteError, QLatin1String("Maximum 2GB in single write on this platform"));</div><div class='add'>+            return -1;</div><div class='add'>+        }</div><div class='add'>+        const TPtrC8 ptr(reinterpret_cast&lt;const TUint8*&gt;(data), static_cast&lt;TInt&gt;(len));</div><div class='add'>+#ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API</div><div class='add'>+        TInt64 eofpos = 0;</div><div class='add'>+#else</div><div class='add'>+        TInt eofpos = 0;</div><div class='add'>+#endif</div><div class='add'>+        //The end of file position is not cached because QFile is read/write sharable, therefore another</div><div class='add'>+        //process may have altered the file size.</div><div class='add'>+        TInt r = symbianFile.Seek(ESeekEnd, eofpos);</div><div class='add'>+        if (r == KErrNone &amp;&amp; symbianFilePos &gt; eofpos) {</div><div class='add'>+            //seek position is beyond end of file so file needs to be extended before write.</div><div class='add'>+            //note that SetSize does not zero-initialise (c.f. posix lseek)</div><div class='add'>+            r = symbianFile.SetSize(symbianFilePos);</div><div class='add'>+        }</div><div class='add'>+        if (r == KErrNone) {</div><div class='add'>+            //write to specific position in the file (i.e. use our own cursor rather than calling seek)</div><div class='add'>+            r = symbianFile.Write(symbianFilePos, ptr);</div><div class='add'>+        }</div><div class='add'>+        if (r != KErrNone) {</div><div class='add'>+            q-&gt;setError(QFile::WriteError, QSystemError(r, QSystemError::NativeError).toString());</div><div class='add'>+            return -1;</div><div class='add'>+        }</div><div class='add'>+        symbianFilePos += len;</div><div class='add'>+        return len;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='ctx'>     return writeFdFh(data, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -403,6 +564,12 @@ qint64 QFSFileEnginePrivate::nativeWrite(const char *data, qint64 len)</div><div class='ctx'> */</div><div class='ctx'> qint64 QFSFileEnginePrivate::nativePos() const</div><div class='ctx'> {</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+    const Q_Q(QFSFileEngine);</div><div class='add'>+    if (symbianFile.SubSessionHandle()) {</div><div class='add'>+        return symbianFilePos;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='ctx'>     return posFdFh();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -411,6 +578,19 @@ qint64 QFSFileEnginePrivate::nativePos() const</div><div class='ctx'> */</div><div class='ctx'> bool QFSFileEnginePrivate::nativeSeek(qint64 pos)</div><div class='ctx'> {</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+    Q_Q(QFSFileEngine);</div><div class='add'>+    if (symbianFile.SubSessionHandle()) {</div><div class='add'>+#ifndef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API</div><div class='add'>+        if(pos &gt; KMaxTInt) {</div><div class='add'>+            q-&gt;setError(QFile::PositionError, QLatin1String("Maximum 2GB file position on this platform"));</div><div class='add'>+            return false;</div><div class='add'>+        }</div><div class='add'>+#endif</div><div class='add'>+        symbianFilePos = pos;</div><div class='add'>+        return true;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='ctx'>     return seekFdFh(pos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -422,139 +602,110 @@ int QFSFileEnginePrivate::nativeHandle() const</div><div class='ctx'>     return fh ? fileno(fh) : fd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+int QFSFileEnginePrivate::getMapHandle()</div><div class='add'>+{</div><div class='add'>+    if (symbianFile.SubSessionHandle()) {</div><div class='add'>+        // Symbian file handle can't be used for open C mmap() so open the file with open C as well.</div><div class='add'>+        if (fileHandleForMaps &lt; 0) {</div><div class='add'>+            int flags = openModeToOpenFlags(openMode);</div><div class='add'>+            flags &amp;= ~(O_CREAT | O_TRUNC);</div><div class='add'>+            fileHandleForMaps = ::wopen((wchar_t*)(fileEntry.nativeFilePath().utf16()), flags, 0666);</div><div class='add'>+        }</div><div class='add'>+        return fileHandleForMaps;</div><div class='add'>+    }</div><div class='add'>+    return nativeHandle();</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*!</div><div class='ctx'>     \internal</div><div class='ctx'> */</div><div class='ctx'> bool QFSFileEnginePrivate::nativeIsSequential() const</div><div class='ctx'> {</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+    if (symbianFile.SubSessionHandle())</div><div class='add'>+        return false;</div><div class='add'>+#endif</div><div class='ctx'>     return isSequentialFdFh();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::remove()</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='del'>-    bool ret = unlink(d-&gt;nativeFilePath.constData()) == 0;</div><div class='del'>-    if (!ret)</div><div class='del'>-        setError(QFile::RemoveError, qt_error_string(errno));</div><div class='add'>+    QSystemError error;</div><div class='add'>+    bool ret = QFileSystemEngine::removeFile(d-&gt;fileEntry, error);</div><div class='add'>+    d-&gt;metaData.clear();</div><div class='add'>+    if (!ret) {</div><div class='add'>+        setError(QFile::RemoveError, error.toString());</div><div class='add'>+    }</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::copy(const QString &amp;newName)</div><div class='ctx'> {</div><div class='del'>-#if defined(Q_OS_SYMBIAN)</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='del'>-    RFs rfs = qt_s60GetRFs();</div><div class='del'>-    CFileMan* fm = NULL;</div><div class='del'>-    QString oldNative(QDir::toNativeSeparators(d-&gt;filePath));</div><div class='del'>-    TPtrC oldPtr(qt_QString2TPtrC(oldNative));</div><div class='del'>-    QFileInfo fi(newName);</div><div class='del'>-    QString absoluteNewName = fi.absoluteFilePath();</div><div class='del'>-    QString newNative(QDir::toNativeSeparators(absoluteNewName));</div><div class='del'>-    TPtrC newPtr(qt_QString2TPtrC(newNative));</div><div class='del'>-    TRAPD (err,</div><div class='del'>-        fm = CFileMan::NewL(rfs);</div><div class='del'>-        RFile rfile;</div><div class='del'>-        err = rfile.Open(rfs, oldPtr, EFileShareReadersOrWriters);</div><div class='del'>-        if (err == KErrNone) {</div><div class='del'>-            err = fm-&gt;Copy(rfile, newPtr);</div><div class='del'>-            rfile.Close();</div><div class='del'>-        }</div><div class='del'>-    ) // End TRAP</div><div class='del'>-    delete fm;</div><div class='del'>-    if (err == KErrNone)</div><div class='del'>-        return true;</div><div class='del'>-    d-&gt;setSymbianError(err, QFile::CopyError, QLatin1String("copy error"));</div><div class='del'>-    return false;</div><div class='del'>-#else</div><div class='del'>-    Q_UNUSED(newName);</div><div class='del'>-    // ### Add copy code for Unix here</div><div class='del'>-    setError(QFile::UnspecifiedError, QLatin1String("Not implemented!"));</div><div class='del'>-    return false;</div><div class='del'>-#endif</div><div class='add'>+    QSystemError error;</div><div class='add'>+    bool ret = QFileSystemEngine::copyFile(d-&gt;fileEntry, QFileSystemEntry(newName), error);</div><div class='add'>+    if (!ret) {</div><div class='add'>+        setError(QFile::CopyError, error.toString());</div><div class='add'>+    }</div><div class='add'>+    return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::rename(const QString &amp;newName)</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='del'>-    bool ret = ::rename(d-&gt;nativeFilePath.constData(), QFile::encodeName(newName).constData()) == 0;</div><div class='del'>-    if (!ret)</div><div class='del'>-        setError(QFile::RenameError, qt_error_string(errno));</div><div class='add'>+    QSystemError error;</div><div class='add'>+    bool ret = QFileSystemEngine::renameFile(d-&gt;fileEntry, QFileSystemEntry(newName), error);</div><div class='add'>+</div><div class='add'>+    if (!ret) {</div><div class='add'>+        setError(QFile::RenameError, error.toString());</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::link(const QString &amp;newName)</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='del'>-    bool ret = ::symlink(d-&gt;nativeFilePath.constData(), QFile::encodeName(newName).constData()) == 0;</div><div class='del'>-    if (!ret)</div><div class='del'>-        setError(QFile::RenameError, qt_error_string(errno));</div><div class='add'>+    QSystemError error;</div><div class='add'>+    bool ret = QFileSystemEngine::createLink(d-&gt;fileEntry, QFileSystemEntry(newName), error);</div><div class='add'>+    if (!ret) {</div><div class='add'>+        setError(QFile::RenameError, error.toString());</div><div class='add'>+    }</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> qint64 QFSFileEnginePrivate::nativeSize() const</div><div class='ctx'> {</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+    const Q_Q(QFSFileEngine);</div><div class='add'>+    if (symbianFile.SubSessionHandle()) {</div><div class='add'>+#ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API</div><div class='add'>+        qint64 size;</div><div class='add'>+#else</div><div class='add'>+        TInt size;</div><div class='add'>+#endif</div><div class='add'>+        TInt err = symbianFile.Size(size);</div><div class='add'>+        if(err != KErrNone) {</div><div class='add'>+            const_cast&lt;QFSFileEngine*&gt;(q)-&gt;setError(QFile::PositionError, QSystemError(err, QSystemError::NativeError).toString());</div><div class='add'>+            return 0;</div><div class='add'>+        }</div><div class='add'>+        return size;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='ctx'>     return sizeFdFh();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::mkdir(const QString &amp;name, bool createParentDirectories) const</div><div class='ctx'> {</div><div class='del'>-    QString dirName = name;</div><div class='del'>-    if (createParentDirectories) {</div><div class='del'>-        dirName = QDir::cleanPath(dirName);</div><div class='del'>-#if defined(Q_OS_SYMBIAN)</div><div class='del'>-        dirName = QDir::toNativeSeparators(dirName);</div><div class='del'>-#endif</div><div class='del'>-        for(int oldslash = -1, slash=0; slash != -1; oldslash = slash) {</div><div class='del'>-            slash = dirName.indexOf(QDir::separator(), oldslash+1);</div><div class='del'>-            if (slash == -1) {</div><div class='del'>-                if (oldslash == dirName.length())</div><div class='del'>-                    break;</div><div class='del'>-                slash = dirName.length();</div><div class='del'>-            }</div><div class='del'>-            if (slash) {</div><div class='del'>-                QByteArray chunk = QFile::encodeName(dirName.left(slash));</div><div class='del'>-                QT_STATBUF st;</div><div class='del'>-                if (QT_STAT(chunk, &amp;st) != -1) {</div><div class='del'>-                    if ((st.st_mode &amp; S_IFMT) != S_IFDIR)</div><div class='del'>-                        return false;</div><div class='del'>-                } else if (QT_MKDIR(chunk, 0777) != 0) {</div><div class='del'>-                    return false;</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        return true;</div><div class='del'>-    }</div><div class='del'>-#if defined(Q_OS_DARWIN)  // Mac X doesn't support trailing /'s</div><div class='del'>-    if (dirName.endsWith(QLatin1Char('/')))</div><div class='del'>-        dirName.chop(1);</div><div class='del'>-#endif</div><div class='del'>-    return (QT_MKDIR(QFile::encodeName(dirName), 0777) == 0);</div><div class='add'>+    return QFileSystemEngine::createDirectory(QFileSystemEntry(name), createParentDirectories);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::rmdir(const QString &amp;name, bool recurseParentDirectories) const</div><div class='ctx'> {</div><div class='del'>-    QString dirName = name;</div><div class='del'>-    if (recurseParentDirectories) {</div><div class='del'>-        dirName = QDir::cleanPath(dirName);</div><div class='del'>-#if defined(Q_OS_SYMBIAN)</div><div class='del'>-        dirName = QDir::toNativeSeparators(dirName);</div><div class='del'>-#endif</div><div class='del'>-        for(int oldslash = 0, slash=dirName.length(); slash &gt; 0; oldslash = slash) {</div><div class='del'>-            QByteArray chunk = QFile::encodeName(dirName.left(slash));</div><div class='del'>-            QT_STATBUF st;</div><div class='del'>-            if (QT_STAT(chunk, &amp;st) != -1) {</div><div class='del'>-                if ((st.st_mode &amp; S_IFMT) != S_IFDIR)</div><div class='del'>-                    return false;</div><div class='del'>-                if (::rmdir(chunk) != 0)</div><div class='del'>-                    return oldslash != 0;</div><div class='del'>-            } else {</div><div class='del'>-                return false;</div><div class='del'>-            }</div><div class='del'>-            slash = dirName.lastIndexOf(QDir::separator(), oldslash-1);</div><div class='del'>-        }</div><div class='del'>-        return true;</div><div class='del'>-    }</div><div class='del'>-    return ::rmdir(QFile::encodeName(dirName)) == 0;</div><div class='add'>+    return QFileSystemEngine::removeDirectory(QFileSystemEntry(name), recurseParentDirectories);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::caseSensitive() const</div><div class='hunk'>@@ -568,94 +719,27 @@ bool QFSFileEngine::caseSensitive() const</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::setCurrentPath(const QString &amp;path)</div><div class='ctx'> {</div><div class='del'>-    int r;</div><div class='del'>-    r = QT_CHDIR(QFile::encodeName(path));</div><div class='del'>-    return r &gt;= 0;</div><div class='add'>+    return QFileSystemEngine::setCurrentPath(QFileSystemEntry(path));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QString QFSFileEngine::currentPath(const QString &amp;)</div><div class='ctx'> {</div><div class='del'>-    QString result;</div><div class='del'>-    QT_STATBUF st;</div><div class='del'>-#if defined(Q_OS_SYMBIAN)</div><div class='del'>-    char nativeCurrentName[PATH_MAX+1];</div><div class='del'>-    if (::getcwd(nativeCurrentName, PATH_MAX))</div><div class='del'>-        result = QDir::fromNativeSeparators(QFile::decodeName(QByteArray(nativeCurrentName)));</div><div class='del'>-    if (result.isEmpty()) {</div><div class='del'>-# if defined(QT_DEBUG)</div><div class='del'>-        qWarning("QFSFileEngine::currentPath: getcwd() failed");</div><div class='del'>-# endif</div><div class='del'>-    } else</div><div class='del'>-#endif</div><div class='del'>-    if (QT_STAT(".", &amp;st) == 0) {</div><div class='del'>-#if defined(__GLIBC__) &amp;&amp; !defined(PATH_MAX)</div><div class='del'>-        char *currentName = ::get_current_dir_name();</div><div class='del'>-        if (currentName) {</div><div class='del'>-            result = QFile::decodeName(QByteArray(currentName));</div><div class='del'>-            ::free(currentName);</div><div class='del'>-        }</div><div class='del'>-#elif !defined(Q_OS_SYMBIAN)</div><div class='del'>-        char currentName[PATH_MAX+1];</div><div class='del'>-        if (::getcwd(currentName, PATH_MAX))</div><div class='del'>-            result = QFile::decodeName(QByteArray(currentName));</div><div class='del'>-# if defined(QT_DEBUG)</div><div class='del'>-        if (result.isNull())</div><div class='del'>-            qWarning("QFSFileEngine::currentPath: getcwd() failed");</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='del'>-    } else {</div><div class='del'>-#if defined(Q_OS_SYMBIAN)</div><div class='del'>-        // If current dir returned by Open C doesn't exist,</div><div class='del'>-        // try to create it (can happen with application private dirs)</div><div class='del'>-        // Ignore mkdir failures; we want to be consistent with Open C</div><div class='del'>-        // current path regardless.</div><div class='del'>-        QT_MKDIR(QFile::encodeName(QLatin1String(nativeCurrentName)), 0777);</div><div class='del'>-#else</div><div class='del'>-# if defined(QT_DEBUG)</div><div class='del'>-        qWarning("QFSFileEngine::currentPath: stat(\".\") failed");</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='del'>-    }</div><div class='del'>-    return result;</div><div class='add'>+    return QFileSystemEngine::currentPath().filePath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QString QFSFileEngine::homePath()</div><div class='ctx'> {</div><div class='del'>-#if defined(Q_OS_SYMBIAN)</div><div class='del'>-    QString home = rootPath();</div><div class='del'>-#else</div><div class='del'>-    QString home = QFile::decodeName(qgetenv("HOME"));</div><div class='del'>-    if (home.isNull())</div><div class='del'>-        home = rootPath();</div><div class='del'>-#endif</div><div class='del'>-    return home;</div><div class='add'>+    return QFileSystemEngine::homePath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QString QFSFileEngine::rootPath()</div><div class='ctx'> {</div><div class='del'>-#if defined(Q_OS_SYMBIAN)</div><div class='del'>-    TFileName symbianPath = PathInfo::PhoneMemoryRootPath();</div><div class='del'>-    return QDir::cleanPath(QDir::fromNativeSeparators(qt_TDesC2QString(symbianPath)));</div><div class='del'>-#else</div><div class='del'>-    return QLatin1String("/");</div><div class='del'>-#endif</div><div class='add'>+    return QFileSystemEngine::rootPath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QString QFSFileEngine::tempPath()</div><div class='ctx'> {</div><div class='del'>-#if defined(Q_OS_SYMBIAN)</div><div class='del'>-    TFileName symbianPath = PathInfo::PhoneMemoryRootPath();</div><div class='del'>-    QString temp = QDir::fromNativeSeparators(qt_TDesC2QString(symbianPath));</div><div class='del'>-    temp += QLatin1String( "temp/");</div><div class='del'>-</div><div class='del'>-    // Just to verify that folder really exist on hardware</div><div class='del'>-    QT_MKDIR(QFile::encodeName(temp), 0777);</div><div class='del'>-#else</div><div class='del'>-    QString temp = QFile::decodeName(qgetenv("TMPDIR"));</div><div class='del'>-    if (temp.isEmpty())</div><div class='del'>-        temp = QLatin1String("/tmp/");</div><div class='del'>-#endif</div><div class='del'>-    return temp;</div><div class='add'>+    return QFileSystemEngine::tempPath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QFileInfoList QFSFileEngine::drives()</div><div class='hunk'>@@ -683,123 +767,30 @@ QFileInfoList QFSFileEngine::drives()</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool QFSFileEnginePrivate::doStat() const</div><div class='add'>+bool QFSFileEnginePrivate::doStat(QFileSystemMetaData::MetaDataFlags flags) const</div><div class='ctx'> {</div><div class='del'>-    if (!tried_stat) {</div><div class='del'>-        tried_stat = true;</div><div class='del'>-        could_stat = false;</div><div class='del'>-</div><div class='del'>-        if (fh &amp;&amp; nativeFilePath.isEmpty()) {</div><div class='del'>-            // ### actually covers two cases: d-&gt;fh and when the file is not open</div><div class='del'>-            could_stat = (QT_FSTAT(QT_FILENO(fh), &amp;st) == 0);</div><div class='del'>-        } else if (fd == -1) {</div><div class='del'>-            // ### actually covers two cases: d-&gt;fh and when the file is not open</div><div class='del'>-#if defined(Q_OS_SYMBIAN)</div><div class='del'>-            // Optimization for Symbian where fileFlags() calls both doStat() and isSymlink(), but rarely on real links.</div><div class='del'>-            // When the filename is not a link, lstat will return the same info as stat, but this also removes</div><div class='del'>-            // any need for a further call to lstat to check if the file is a link.</div><div class='del'>-            need_lstat = false;</div><div class='del'>-            could_stat = (QT_LSTAT(nativeFilePath.constData(), &amp;st) == 0);</div><div class='del'>-            is_link = could_stat ? S_ISLNK(st.st_mode) : false;</div><div class='del'>-            // if it turns out this was a link, we can call stat too.</div><div class='del'>-            if (is_link)</div><div class='del'>-#endif</div><div class='del'>-            could_stat = (QT_STAT(nativeFilePath.constData(), &amp;st) == 0);</div><div class='del'>-        } else {</div><div class='del'>-            could_stat = (QT_FSTAT(fd, &amp;st) == 0);</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    return could_stat;</div><div class='del'>-}</div><div class='add'>+    if (!tried_stat || !metaData.hasFlags(flags)) {</div><div class='add'>+        tried_stat = 1;</div><div class='ctx'> </div><div class='del'>-bool QFSFileEnginePrivate::isSymlink() const</div><div class='del'>-{</div><div class='del'>-    if (need_lstat) {</div><div class='del'>-        need_lstat = false;</div><div class='add'>+        int localFd = fd;</div><div class='add'>+        if (fh &amp;&amp; fileEntry.isEmpty())</div><div class='add'>+            localFd = QT_FILENO(fh);</div><div class='add'>+        if (localFd != -1)</div><div class='add'>+            QFileSystemEngine::fillMetaData(localFd, metaData);</div><div class='ctx'> </div><div class='del'>-        QT_STATBUF st;          // don't clobber our main one</div><div class='del'>-        is_link = (QT_LSTAT(nativeFilePath.constData(), &amp;st) == 0) ? S_ISLNK(st.st_mode) : false;</div><div class='add'>+        if (metaData.missingFlags(flags) &amp;&amp; !fileEntry.isEmpty())</div><div class='add'>+            QFileSystemEngine::fillMetaData(fileEntry, metaData, metaData.missingFlags(flags));</div><div class='ctx'>     }</div><div class='del'>-    return is_link;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if defined(Q_OS_SYMBIAN)</div><div class='del'>-static bool _q_isSymbianHidden(const QString &amp;path, bool isDir)</div><div class='del'>-{</div><div class='del'>-    RFs rfs = qt_s60GetRFs();</div><div class='del'>-    QFileInfo fi(path);</div><div class='del'>-    QString absPath = fi.absoluteFilePath();</div><div class='del'>-    if (isDir &amp;&amp; !absPath.endsWith(QLatin1Char('/')))</div><div class='del'>-        absPath.append(QLatin1Char('/'));</div><div class='del'>-    QString native(QDir::toNativeSeparators(absPath));</div><div class='del'>-    TPtrC ptr(qt_QString2TPtrC(native));</div><div class='del'>-    TUint attributes;</div><div class='del'>-    TInt err = rfs.Att(ptr, attributes);</div><div class='del'>-    return (err == KErrNone &amp;&amp; (attributes &amp; KEntryAttHidden));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if !defined(QWS) &amp;&amp; defined(Q_OS_MAC)</div><div class='del'>-static bool _q_isMacHidden(const QString &amp;path)</div><div class='del'>-{</div><div class='del'>-    OSErr err = noErr;</div><div class='del'>-</div><div class='del'>-    FSRef fsRef;</div><div class='ctx'> </div><div class='del'>-    err = FSPathMakeRefWithOptions(reinterpret_cast&lt;const UInt8 *&gt;(QFile::encodeName(QDir::cleanPath(path)).constData()),</div><div class='del'>-                                    kFSPathMakeRefDoNotFollowLeafSymlink, &amp;fsRef, 0);</div><div class='del'>-    if (err != noErr)</div><div class='del'>-        return false;</div><div class='del'>-</div><div class='del'>-    FSCatalogInfo catInfo;</div><div class='del'>-    err = FSGetCatalogInfo(&amp;fsRef, kFSCatInfoFinderInfo, &amp;catInfo, NULL, NULL, NULL);</div><div class='del'>-    if (err != noErr)</div><div class='del'>-        return false;</div><div class='del'>-</div><div class='del'>-    FileInfo * const fileInfo = reinterpret_cast&lt;FileInfo*&gt;(&amp;catInfo.finderInfo);</div><div class='del'>-    bool result = (fileInfo-&gt;finderFlags &amp; kIsInvisible);</div><div class='del'>-    return result;</div><div class='add'>+    return metaData.exists();</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-QAbstractFileEngine::FileFlags QFSFileEnginePrivate::getPermissions(QAbstractFileEngine::FileFlags type) const</div><div class='add'>+bool QFSFileEnginePrivate::isSymlink() const</div><div class='ctx'> {</div><div class='del'>-    QAbstractFileEngine::FileFlags ret = 0;</div><div class='del'>-</div><div class='del'>-    if (st.st_mode &amp; S_IRUSR)</div><div class='del'>-        ret |= QAbstractFileEngine::ReadOwnerPerm;</div><div class='del'>-    if (st.st_mode &amp; S_IWUSR)</div><div class='del'>-        ret |= QAbstractFileEngine::WriteOwnerPerm;</div><div class='del'>-    if (st.st_mode &amp; S_IXUSR)</div><div class='del'>-        ret |= QAbstractFileEngine::ExeOwnerPerm;</div><div class='del'>-    if (st.st_mode &amp; S_IRGRP)</div><div class='del'>-        ret |= QAbstractFileEngine::ReadGroupPerm;</div><div class='del'>-    if (st.st_mode &amp; S_IWGRP)</div><div class='del'>-        ret |= QAbstractFileEngine::WriteGroupPerm;</div><div class='del'>-    if (st.st_mode &amp; S_IXGRP)</div><div class='del'>-        ret |= QAbstractFileEngine::ExeGroupPerm;</div><div class='del'>-    if (st.st_mode &amp; S_IROTH)</div><div class='del'>-        ret |= QAbstractFileEngine::ReadOtherPerm;</div><div class='del'>-    if (st.st_mode &amp; S_IWOTH)</div><div class='del'>-        ret |= QAbstractFileEngine::WriteOtherPerm;</div><div class='del'>-    if (st.st_mode &amp; S_IXOTH)</div><div class='del'>-        ret |= QAbstractFileEngine::ExeOtherPerm;</div><div class='del'>-</div><div class='del'>-    // calculate user permissions</div><div class='del'>-    if (type &amp; QAbstractFileEngine::ReadUserPerm) {</div><div class='del'>-        if (QT_ACCESS(nativeFilePath.constData(), R_OK) == 0)</div><div class='del'>-            ret |= QAbstractFileEngine::ReadUserPerm;</div><div class='del'>-    }</div><div class='del'>-    if (type &amp; QAbstractFileEngine::WriteUserPerm) {</div><div class='del'>-        if (QT_ACCESS(nativeFilePath.constData(), W_OK) == 0)</div><div class='del'>-            ret |= QAbstractFileEngine::WriteUserPerm;</div><div class='del'>-    }</div><div class='del'>-    if (type &amp; QAbstractFileEngine::ExeUserPerm) {</div><div class='del'>-        if (QT_ACCESS(nativeFilePath.constData(), X_OK) == 0)</div><div class='del'>-            ret |= QAbstractFileEngine::ExeUserPerm;</div><div class='del'>-    }</div><div class='add'>+    if (!metaData.hasFlags(QFileSystemMetaData::LinkType))</div><div class='add'>+        QFileSystemEngine::fillMetaData(fileEntry, metaData, QFileSystemMetaData::LinkType);</div><div class='ctx'> </div><div class='del'>-    return ret;</div><div class='add'>+    return metaData.isLink();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -808,360 +799,111 @@ QAbstractFileEngine::FileFlags QFSFileEnginePrivate::getPermissions(QAbstractFil</div><div class='ctx'> QAbstractFileEngine::FileFlags QFSFileEngine::fileFlags(FileFlags type) const</div><div class='ctx'> {</div><div class='ctx'>     Q_D(const QFSFileEngine);</div><div class='del'>-    // Force a stat, so that we're guaranteed to get up-to-date results</div><div class='del'>-    if (type &amp; Refresh) {</div><div class='del'>-        d-&gt;tried_stat = 0;</div><div class='del'>-        d-&gt;need_lstat = 1;</div><div class='del'>-    }</div><div class='add'>+</div><div class='add'>+    if (type &amp; Refresh)</div><div class='add'>+        d-&gt;metaData.clear();</div><div class='ctx'> </div><div class='ctx'>     QAbstractFileEngine::FileFlags ret = 0;</div><div class='add'>+</div><div class='ctx'>     if (type &amp; FlagsMask)</div><div class='ctx'>         ret |= LocalDiskFlag;</div><div class='del'>-    bool exists = d-&gt;doStat();</div><div class='del'>-    if (!exists &amp;&amp; !d-&gt;isSymlink())</div><div class='add'>+</div><div class='add'>+    bool exists;</div><div class='add'>+    {</div><div class='add'>+        QFileSystemMetaData::MetaDataFlags queryFlags = 0;</div><div class='add'>+</div><div class='add'>+        queryFlags |= QFileSystemMetaData::MetaDataFlags(uint(type))</div><div class='add'>+                &amp; QFileSystemMetaData::Permissions;</div><div class='add'>+</div><div class='add'>+        if (type &amp; TypesMask)</div><div class='add'>+            queryFlags |= QFileSystemMetaData::AliasType</div><div class='add'>+                    | QFileSystemMetaData::LinkType</div><div class='add'>+                    | QFileSystemMetaData::FileType</div><div class='add'>+                    | QFileSystemMetaData::DirectoryType</div><div class='add'>+                    | QFileSystemMetaData::BundleType;</div><div class='add'>+</div><div class='add'>+        if (type &amp; FlagsMask)</div><div class='add'>+            queryFlags |= QFileSystemMetaData::HiddenAttribute</div><div class='add'>+                    | QFileSystemMetaData::ExistsAttribute;</div><div class='add'>+</div><div class='add'>+        queryFlags |= QFileSystemMetaData::LinkType;</div><div class='add'>+</div><div class='add'>+        exists = d-&gt;doStat(queryFlags);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (!exists &amp;&amp; !d-&gt;metaData.isLink())</div><div class='ctx'>         return ret;</div><div class='ctx'> </div><div class='ctx'>     if (exists &amp;&amp; (type &amp; PermsMask))</div><div class='del'>-        ret |= d-&gt;getPermissions(type);</div><div class='add'>+        ret |= FileFlags(uint(d-&gt;metaData.permissions()));</div><div class='add'>+</div><div class='ctx'>     if (type &amp; TypesMask) {</div><div class='del'>-#if !defined(QWS) &amp;&amp; defined(Q_OS_MAC)</div><div class='del'>-        bool foundAlias = false;</div><div class='del'>-        {</div><div class='del'>-            FSRef fref;</div><div class='del'>-            if (FSPathMakeRef((const UInt8 *)QFile::encodeName(QDir::cleanPath(d-&gt;filePath)).data(),</div><div class='del'>-                             &amp;fref, NULL) == noErr) {</div><div class='del'>-                Boolean isAlias, isFolder;</div><div class='del'>-                if (FSIsAliasFile(&amp;fref, &amp;isAlias, &amp;isFolder) == noErr &amp;&amp; isAlias) {</div><div class='del'>-                    foundAlias = true;</div><div class='del'>-                    ret |= LinkType;</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        if (!foundAlias)</div><div class='del'>-#endif</div><div class='del'>-        {</div><div class='del'>-            if ((type &amp; LinkType) &amp;&amp; d-&gt;isSymlink())</div><div class='add'>+        if (d-&gt;metaData.isAlias()) {</div><div class='add'>+            ret |= LinkType;</div><div class='add'>+        } else {</div><div class='add'>+            if ((type &amp; LinkType) &amp;&amp; d-&gt;metaData.isLink())</div><div class='ctx'>                 ret |= LinkType;</div><div class='del'>-            if (exists &amp;&amp; (d-&gt;st.st_mode &amp; S_IFMT) == S_IFREG)</div><div class='del'>-                ret |= FileType;</div><div class='del'>-            else if (exists &amp;&amp; (d-&gt;st.st_mode &amp; S_IFMT) == S_IFDIR)</div><div class='del'>-                ret |= DirectoryType;</div><div class='del'>-#if !defined(QWS) &amp;&amp; defined(Q_OS_MAC)</div><div class='del'>-            if ((ret &amp; DirectoryType) &amp;&amp; (type &amp; BundleType)) {</div><div class='del'>-                QCFType&lt;CFURLRef&gt; url = CFURLCreateWithFileSystemPath(0, QCFString(d-&gt;filePath),</div><div class='del'>-                                                                      kCFURLPOSIXPathStyle, true);</div><div class='del'>-                UInt32 type, creator;</div><div class='del'>-                if (CFBundleGetPackageInfoInDirectory(url, &amp;type, &amp;creator))</div><div class='del'>-                    ret |= BundleType;</div><div class='add'>+            if (exists) {</div><div class='add'>+                if (d-&gt;metaData.isFile()) {</div><div class='add'>+                    ret |= FileType;</div><div class='add'>+                } else if (d-&gt;metaData.isDirectory()) {</div><div class='add'>+                    ret |= DirectoryType;</div><div class='add'>+                    if ((type &amp; BundleType) &amp;&amp; d-&gt;metaData.isBundle())</div><div class='add'>+                        ret |= BundleType;</div><div class='add'>+                }</div><div class='ctx'>             }</div><div class='del'>-#endif</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='add'>+</div><div class='ctx'>     if (type &amp; FlagsMask) {</div><div class='ctx'>         if (exists)</div><div class='ctx'>             ret |= ExistsFlag;</div><div class='del'>-#if defined(Q_OS_SYMBIAN)</div><div class='del'>-        if (d-&gt;filePath == QLatin1String("/")</div><div class='del'>-            || (d-&gt;filePath.length() == 3 &amp;&amp; d-&gt;filePath.at(0).isLetter()</div><div class='del'>-                &amp;&amp; d-&gt;filePath.at(1) == QLatin1Char(':') &amp;&amp; d-&gt;filePath.at(2) == QLatin1Char('/'))) {</div><div class='del'>-            ret |= RootFlag;</div><div class='del'>-        } else {</div><div class='del'>-            // In Symbian, all symlinks have hidden attribute for some reason;</div><div class='del'>-            // lets make them visible for better compatibility with other platforms.</div><div class='del'>-            // If somebody actually wants a hidden link, then they are out of luck.</div><div class='del'>-            if (!d-&gt;isSymlink() &amp;&amp; _q_isSymbianHidden(d-&gt;filePath, ret &amp; DirectoryType))</div><div class='del'>-                ret |= HiddenFlag;</div><div class='del'>-        }</div><div class='del'>-#else</div><div class='del'>-        if (d-&gt;filePath == QLatin1String("/")) {</div><div class='add'>+        if (d-&gt;fileEntry.isRoot())</div><div class='ctx'>             ret |= RootFlag;</div><div class='del'>-        } else {</div><div class='del'>-            QString baseName = fileName(BaseName);</div><div class='del'>-            if ((baseName.size() &gt; 0 &amp;&amp; baseName.at(0) == QLatin1Char('.'))</div><div class='del'>-#  if !defined(QWS) &amp;&amp; defined(Q_OS_MAC)</div><div class='del'>-                || _q_isMacHidden(d-&gt;filePath)</div><div class='del'>-#  endif</div><div class='del'>-            ) {</div><div class='del'>-                ret |= HiddenFlag;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-#endif</div><div class='add'>+        else if (d-&gt;metaData.isHidden())</div><div class='add'>+            ret |= HiddenFlag;</div><div class='ctx'>     }</div><div class='del'>-    return ret;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-#if defined(Q_OS_SYMBIAN)</div><div class='del'>-QString QFSFileEngine::fileName(FileName file) const</div><div class='del'>-{</div><div class='del'>-    Q_D(const QFSFileEngine);</div><div class='del'>-    const QLatin1Char slashChar('/');</div><div class='del'>-    if(file == BaseName) {</div><div class='del'>-        int slash = d-&gt;filePath.lastIndexOf(slashChar);</div><div class='del'>-        if(slash == -1) {</div><div class='del'>-            int colon = d-&gt;filePath.lastIndexOf(QLatin1Char(':'));</div><div class='del'>-            if(colon != -1)</div><div class='del'>-                return d-&gt;filePath.mid(colon + 1);</div><div class='del'>-            return d-&gt;filePath;</div><div class='del'>-        }</div><div class='del'>-        return d-&gt;filePath.mid(slash + 1);</div><div class='del'>-    } else if(file == PathName) {</div><div class='del'>-        if(!d-&gt;filePath.size())</div><div class='del'>-            return d-&gt;filePath;</div><div class='del'>-</div><div class='del'>-        int slash = d-&gt;filePath.lastIndexOf(slashChar);</div><div class='del'>-        if(slash == -1) {</div><div class='del'>-            if(d-&gt;filePath.length() &gt;= 2 &amp;&amp; d-&gt;filePath.at(1) == QLatin1Char(':'))</div><div class='del'>-                return d-&gt;filePath.left(2);</div><div class='del'>-            return QLatin1String(".");</div><div class='del'>-        } else {</div><div class='del'>-            if(!slash)</div><div class='del'>-                return QLatin1String("/");</div><div class='del'>-            if(slash == 2 &amp;&amp; d-&gt;filePath.length() &gt;= 2 &amp;&amp; d-&gt;filePath.at(1) == QLatin1Char(':'))</div><div class='del'>-                slash++;</div><div class='del'>-            return d-&gt;filePath.left(slash);</div><div class='del'>-        }</div><div class='del'>-    } else if(file == AbsoluteName || file == AbsolutePathName) {</div><div class='del'>-        QString ret;</div><div class='del'>-        if (!isRelativePathSymbian(d-&gt;filePath)) {</div><div class='del'>-            if (d-&gt;filePath.size() &gt; 2 &amp;&amp; d-&gt;filePath.at(1) == QLatin1Char(':')</div><div class='del'>-                &amp;&amp; d-&gt;filePath.at(2) != slashChar){</div><div class='del'>-                // It's a drive-relative path, so C:a.txt -&gt; C:/currentpath/a.txt,</div><div class='del'>-                // or if it's different drive than current, Z:a.txt -&gt; Z:/a.txt</div><div class='del'>-                QString currentPath = QDir::currentPath();</div><div class='del'>-                if (0 == currentPath.left(1).compare(d-&gt;filePath.left(1), Qt::CaseInsensitive))</div><div class='del'>-                    ret = currentPath + slashChar + d-&gt;filePath.mid(2);</div><div class='del'>-                else</div><div class='del'>-                    ret = d-&gt;filePath.left(2) + slashChar + d-&gt;filePath.mid(2);</div><div class='del'>-            } else if (d-&gt;filePath.startsWith(slashChar)) {</div><div class='del'>-                // It's a absolute path to the current drive, so /a.txt -&gt; C:/a.txt</div><div class='del'>-                ret = QDir::currentPath().left(2) + d-&gt;filePath;</div><div class='del'>-            } else {</div><div class='del'>-                ret = d-&gt;filePath;</div><div class='del'>-            }</div><div class='del'>-        } else {</div><div class='del'>-            ret = QDir::currentPath() + slashChar + d-&gt;filePath;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        // The path should be absolute at this point.</div><div class='del'>-        // From the docs :</div><div class='del'>-        // Absolute paths begin with the directory separator "/"</div><div class='del'>-        // (optionally preceded by a drive specification under Windows).</div><div class='del'>-        if (ret.at(0) != slashChar) {</div><div class='del'>-            Q_ASSERT(ret.length() &gt;= 2);</div><div class='del'>-            Q_ASSERT(ret.at(0).isLetter());</div><div class='del'>-            Q_ASSERT(ret.at(1) == QLatin1Char(':'));</div><div class='del'>-</div><div class='del'>-            // Force uppercase drive letters.</div><div class='del'>-            ret[0] = ret.at(0).toUpper();</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        // Clean up the path</div><div class='del'>-        bool isDir = ret.endsWith(slashChar);</div><div class='del'>-        ret = QDir::cleanPath(ret);</div><div class='del'>-        if (isDir &amp;&amp; !ret.endsWith(slashChar))</div><div class='del'>-            ret += slashChar;</div><div class='del'>-</div><div class='del'>-        if (file == AbsolutePathName) {</div><div class='del'>-            int slash = ret.lastIndexOf(slashChar);</div><div class='del'>-            if (slash &lt; 0)</div><div class='del'>-                return ret;</div><div class='del'>-            else if (ret.at(0) != slashChar &amp;&amp; slash == 2)</div><div class='del'>-                return ret.left(3);      // include the slash</div><div class='del'>-            else</div><div class='del'>-                return ret.left(slash &gt; 0 ? slash : 1);</div><div class='del'>-        }</div><div class='del'>-        return ret;</div><div class='del'>-    } else if(file == CanonicalName || file == CanonicalPathName) {</div><div class='del'>-        if (!(fileFlags(ExistsFlag) &amp; ExistsFlag))</div><div class='del'>-            return QString();</div><div class='del'>-</div><div class='del'>-        QString ret = QFSFileEnginePrivate::canonicalized(fileName(AbsoluteName));</div><div class='del'>-        if (file == CanonicalPathName &amp;&amp; !ret.isEmpty()) {</div><div class='del'>-            int slash = ret.lastIndexOf(slashChar);</div><div class='del'>-            if (slash == -1)</div><div class='del'>-                ret = QDir::fromNativeSeparators(QDir::currentPath());</div><div class='del'>-            else if (slash == 0)</div><div class='del'>-                ret = QLatin1String("/");</div><div class='del'>-            ret = ret.left(slash);</div><div class='del'>-        }</div><div class='del'>-        return ret;</div><div class='del'>-    } else if(file == LinkName) {</div><div class='del'>-        if (d-&gt;isSymlink()) {</div><div class='del'>-            char s[PATH_MAX+1];</div><div class='del'>-            int len = readlink(d-&gt;nativeFilePath.constData(), s, PATH_MAX);</div><div class='del'>-            if (len &gt; 0) {</div><div class='del'>-                s[len] = '\0';</div><div class='del'>-                QString ret = QFile::decodeName(QByteArray(s));</div><div class='del'>-</div><div class='del'>-                if (isRelativePathSymbian(ret)) {</div><div class='del'>-                    if (!isRelativePathSymbian(d-&gt;filePath)) {</div><div class='del'>-                        ret.prepend(d-&gt;filePath.left(d-&gt;filePath.lastIndexOf(slashChar))</div><div class='del'>-                                    + slashChar);</div><div class='del'>-                    } else {</div><div class='del'>-                        ret.prepend(QDir::currentPath() + slashChar);</div><div class='del'>-                    }</div><div class='del'>-                }</div><div class='del'>-                ret = QDir::cleanPath(ret);</div><div class='del'>-                if (ret.size() &gt; 1 &amp;&amp; ret.endsWith(slashChar))</div><div class='del'>-                    ret.chop(1);</div><div class='del'>-                return ret;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        return QString();</div><div class='del'>-    } else if(file == BundleName) {</div><div class='del'>-        return QString();</div><div class='del'>-    }</div><div class='del'>-    return d-&gt;filePath;</div><div class='add'>+    return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else</div><div class='del'>-</div><div class='ctx'> QString QFSFileEngine::fileName(FileName file) const</div><div class='ctx'> {</div><div class='ctx'>     Q_D(const QFSFileEngine);</div><div class='ctx'>     if (file == BundleName) {</div><div class='del'>-#if !defined(QWS) &amp;&amp; defined(Q_OS_MAC)</div><div class='del'>-        QCFType&lt;CFURLRef&gt; url = CFURLCreateWithFileSystemPath(0, QCFString(d-&gt;filePath),</div><div class='del'>-                                                              kCFURLPOSIXPathStyle, true);</div><div class='del'>-        if (QCFType&lt;CFDictionaryRef&gt; dict = CFBundleCopyInfoDictionaryForURL(url)) {</div><div class='del'>-            if (CFTypeRef name = (CFTypeRef)CFDictionaryGetValue(dict, kCFBundleNameKey)) {</div><div class='del'>-                if (CFGetTypeID(name) == CFStringGetTypeID())</div><div class='del'>-                    return QCFString::toQString((CFStringRef)name);</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-#endif</div><div class='del'>-        return QString();</div><div class='add'>+        return QFileSystemEngine::bundleName(d-&gt;fileEntry);</div><div class='ctx'>     } else if (file == BaseName) {</div><div class='del'>-        int slash = d-&gt;filePath.lastIndexOf(QLatin1Char('/'));</div><div class='del'>-        if (slash != -1)</div><div class='del'>-            return d-&gt;filePath.mid(slash + 1);</div><div class='add'>+        return d-&gt;fileEntry.fileName();</div><div class='ctx'>     } else if (file == PathName) {</div><div class='del'>-        int slash = d-&gt;filePath.lastIndexOf(QLatin1Char('/'));</div><div class='del'>-        if (slash == -1)</div><div class='del'>-            return QLatin1String(".");</div><div class='del'>-        else if (!slash)</div><div class='del'>-            return QLatin1String("/");</div><div class='del'>-        return d-&gt;filePath.left(slash);</div><div class='add'>+        return d-&gt;fileEntry.path();</div><div class='ctx'>     } else if (file == AbsoluteName || file == AbsolutePathName) {</div><div class='del'>-        QString ret;</div><div class='del'>-        if (d-&gt;filePath.isEmpty() || !d-&gt;filePath.startsWith(QLatin1Char('/')))</div><div class='del'>-            ret = QDir::currentPath();</div><div class='del'>-        if (!d-&gt;filePath.isEmpty() &amp;&amp; d-&gt;filePath != QLatin1String(".")) {</div><div class='del'>-            if (!ret.isEmpty() &amp;&amp; !ret.endsWith(QLatin1Char('/')))</div><div class='del'>-                ret += QLatin1Char('/');</div><div class='del'>-            ret += d-&gt;filePath;</div><div class='del'>-        }</div><div class='del'>-        if (ret == QLatin1String("/"))</div><div class='del'>-            return ret;</div><div class='del'>-        bool isDir = ret.endsWith(QLatin1Char('/'));</div><div class='del'>-        ret = QDir::cleanPath(ret);</div><div class='del'>-        if (isDir)</div><div class='del'>-            ret += QLatin1Char('/');</div><div class='add'>+        QFileSystemEntry entry(QFileSystemEngine::absoluteName(d-&gt;fileEntry));</div><div class='ctx'>         if (file == AbsolutePathName) {</div><div class='del'>-            int slash = ret.lastIndexOf(QLatin1Char('/'));</div><div class='del'>-            if (slash == -1)</div><div class='del'>-                return QDir::currentPath();</div><div class='del'>-            else if (!slash)</div><div class='del'>-                return QLatin1String("/");</div><div class='del'>-            return ret.left(slash);</div><div class='add'>+            return entry.path();</div><div class='ctx'>         }</div><div class='del'>-        return ret;</div><div class='add'>+        return entry.filePath();</div><div class='ctx'>     } else if (file == CanonicalName || file == CanonicalPathName) {</div><div class='del'>-        if (!(fileFlags(ExistsFlag) &amp; ExistsFlag))</div><div class='del'>-            return QString();</div><div class='del'>-</div><div class='del'>-        QString ret = QFSFileEnginePrivate::canonicalized(fileName(AbsoluteName));</div><div class='del'>-        if (file == CanonicalPathName &amp;&amp; !ret.isEmpty()) {</div><div class='del'>-            int slash = ret.lastIndexOf(QLatin1Char('/'));</div><div class='del'>-            if (slash == -1)</div><div class='del'>-                ret = QDir::currentPath();</div><div class='del'>-            else if (slash == 0)</div><div class='del'>-                ret = QLatin1String("/");</div><div class='del'>-            ret = ret.left(slash);</div><div class='del'>-        }</div><div class='del'>-        return ret;</div><div class='add'>+        QFileSystemEntry entry(QFileSystemEngine::canonicalName(d-&gt;fileEntry, d-&gt;metaData));</div><div class='add'>+        if (file == CanonicalPathName)</div><div class='add'>+            return entry.path();</div><div class='add'>+        return entry.filePath();</div><div class='ctx'>     } else if (file == LinkName) {</div><div class='ctx'>         if (d-&gt;isSymlink()) {</div><div class='del'>-#if defined(__GLIBC__) &amp;&amp; !defined(PATH_MAX)</div><div class='del'>-#define PATH_CHUNK_SIZE 256</div><div class='del'>-            char *s = 0;</div><div class='del'>-            int len = -1;</div><div class='del'>-            int size = PATH_CHUNK_SIZE;</div><div class='del'>-</div><div class='del'>-            while (1) {</div><div class='del'>-                s = q_check_ptr((char *) ::realloc(s, size));</div><div class='del'>-                len = ::readlink(d-&gt;nativeFilePath.constData(), s, size);</div><div class='del'>-                if (len &lt; 0) {</div><div class='del'>-                    ::free(s);</div><div class='del'>-                    break;</div><div class='del'>-                }</div><div class='del'>-                if (len &lt; size) {</div><div class='del'>-                    break;</div><div class='del'>-                }</div><div class='del'>-                size *= 2;</div><div class='del'>-            }</div><div class='del'>-#else</div><div class='del'>-            char s[PATH_MAX+1];</div><div class='del'>-            int len = readlink(d-&gt;nativeFilePath.constData(), s, PATH_MAX);</div><div class='del'>-#endif</div><div class='del'>-            if (len &gt; 0) {</div><div class='del'>-                QString ret;</div><div class='del'>-                if (d-&gt;doStat() &amp;&amp; S_ISDIR(d-&gt;st.st_mode) &amp;&amp; s[0] != '/') {</div><div class='del'>-                    QDir parent(d-&gt;filePath);</div><div class='del'>-                    parent.cdUp();</div><div class='del'>-                    ret = parent.path();</div><div class='del'>-                    if (!ret.isEmpty() &amp;&amp; !ret.endsWith(QLatin1Char('/')))</div><div class='del'>-                        ret += QLatin1Char('/');</div><div class='del'>-                }</div><div class='del'>-                s[len] = '\0';</div><div class='del'>-                ret += QFile::decodeName(QByteArray(s));</div><div class='del'>-#if defined(__GLIBC__) &amp;&amp; !defined(PATH_MAX)</div><div class='del'>-                ::free(s);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-                if (!ret.startsWith(QLatin1Char('/'))) {</div><div class='del'>-                    if (d-&gt;filePath.startsWith(QLatin1Char('/'))) {</div><div class='del'>-                        ret.prepend(d-&gt;filePath.left(d-&gt;filePath.lastIndexOf(QLatin1Char('/')))</div><div class='del'>-                                    + QLatin1Char('/'));</div><div class='del'>-                    } else {</div><div class='del'>-                        ret.prepend(QDir::currentPath() + QLatin1Char('/'));</div><div class='del'>-                    }</div><div class='del'>-                }</div><div class='del'>-                ret = QDir::cleanPath(ret);</div><div class='del'>-                if (ret.size() &gt; 1 &amp;&amp; ret.endsWith(QLatin1Char('/')))</div><div class='del'>-                    ret.chop(1);</div><div class='del'>-                return ret;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-#if !defined(QWS) &amp;&amp; defined(Q_OS_MAC)</div><div class='del'>-        {</div><div class='del'>-            FSRef fref;</div><div class='del'>-            if (FSPathMakeRef((const UInt8 *)QFile::encodeName(QDir::cleanPath(d-&gt;filePath)).data(), &amp;fref, 0) == noErr) {</div><div class='del'>-                Boolean isAlias, isFolder;</div><div class='del'>-                if (FSResolveAliasFile(&amp;fref, true, &amp;isFolder, &amp;isAlias) == noErr &amp;&amp; isAlias) {</div><div class='del'>-                    AliasHandle alias;</div><div class='del'>-                    if (FSNewAlias(0, &amp;fref, &amp;alias) == noErr &amp;&amp; alias) {</div><div class='del'>-                        QCFString cfstr;</div><div class='del'>-                        if (FSCopyAliasInfo(alias, 0, 0, &amp;cfstr, 0, 0) == noErr)</div><div class='del'>-                            return QCFString::toQString(cfstr);</div><div class='del'>-                    }</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='add'>+            QFileSystemEntry entry = QFileSystemEngine::getLinkTarget(d-&gt;fileEntry, d-&gt;metaData);</div><div class='add'>+            return entry.filePath();</div><div class='ctx'>         }</div><div class='del'>-#endif</div><div class='ctx'>         return QString();</div><div class='ctx'>     }</div><div class='del'>-    return d-&gt;filePath;</div><div class='add'>+    return d-&gt;fileEntry.filePath();</div><div class='ctx'> }</div><div class='del'>-#endif // Q_OS_SYMBIAN</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::isRelativePath() const</div><div class='ctx'> {</div><div class='ctx'>     Q_D(const QFSFileEngine);</div><div class='ctx'> #if defined(Q_OS_SYMBIAN)</div><div class='del'>-    return isRelativePathSymbian(d-&gt;filePath);</div><div class='add'>+    return isRelativePathSymbian(d-&gt;fileEntry.filePath());</div><div class='ctx'> #else</div><div class='del'>-    return d-&gt;filePath.length() ? d-&gt;filePath[0] != QLatin1Char('/') : true;</div><div class='add'>+    return d-&gt;fileEntry.filePath().length() ? d-&gt;fileEntry.filePath()[0] != QLatin1Char('/') : true;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1169,101 +911,73 @@ uint QFSFileEngine::ownerId(FileOwner own) const</div><div class='ctx'> {</div><div class='ctx'>     Q_D(const QFSFileEngine);</div><div class='ctx'>     static const uint nobodyID = (uint) -2;</div><div class='del'>-    if (d-&gt;doStat()) {</div><div class='del'>-        if (own == OwnerUser)</div><div class='del'>-            return d-&gt;st.st_uid;</div><div class='del'>-        else</div><div class='del'>-            return d-&gt;st.st_gid;</div><div class='del'>-    }</div><div class='add'>+</div><div class='add'>+    if (d-&gt;doStat(QFileSystemMetaData::OwnerIds))</div><div class='add'>+        return d-&gt;metaData.ownerId(own);</div><div class='add'>+</div><div class='ctx'>     return nobodyID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QString QFSFileEngine::owner(FileOwner own) const</div><div class='ctx'> {</div><div class='del'>-#if !defined(QT_NO_THREAD) &amp;&amp; defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_OPENBSD)</div><div class='del'>-    int size_max = sysconf(_SC_GETPW_R_SIZE_MAX);</div><div class='del'>-    if (size_max == -1)</div><div class='del'>-        size_max = 1024;</div><div class='del'>-    QVarLengthArray&lt;char, 1024&gt; buf(size_max);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-    if (own == OwnerUser) {</div><div class='del'>-        struct passwd *pw = 0;</div><div class='del'>-#if !defined(QT_NO_THREAD) &amp;&amp; defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_OPENBSD)</div><div class='del'>-        struct passwd entry;</div><div class='del'>-        getpwuid_r(ownerId(own), &amp;entry, buf.data(), buf.size(), &amp;pw);</div><div class='del'>-#else</div><div class='del'>-        pw = getpwuid(ownerId(own));</div><div class='del'>-#endif</div><div class='del'>-        if (pw)</div><div class='del'>-            return QFile::decodeName(QByteArray(pw-&gt;pw_name));</div><div class='del'>-    } else if (own == OwnerGroup) {</div><div class='del'>-#if !defined(Q_OS_SYMBIAN)</div><div class='del'>-        struct group *gr = 0;</div><div class='del'>-#if !defined(QT_NO_THREAD) &amp;&amp; defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; !defined(Q_OS_OPENBSD)</div><div class='del'>-        size_max = sysconf(_SC_GETGR_R_SIZE_MAX);</div><div class='del'>-        if (size_max == -1)</div><div class='del'>-            size_max = 1024;</div><div class='del'>-        buf.resize(size_max);</div><div class='del'>-        struct group entry;</div><div class='del'>-        // Some large systems have more members than the POSIX max size</div><div class='del'>-        // Loop over by doubling the buffer size (upper limit 250k)</div><div class='del'>-        for (unsigned size = size_max; size &lt; 256000; size += size)</div><div class='del'>-        {</div><div class='del'>-            buf.resize(size);</div><div class='del'>-            // ERANGE indicates that the buffer was too small</div><div class='del'>-            if (!getgrgid_r(ownerId(own), &amp;entry, buf.data(), buf.size(), &amp;gr)</div><div class='del'>-                || errno != ERANGE)</div><div class='del'>-                break;</div><div class='del'>-        }</div><div class='add'>+#ifndef Q_OS_SYMBIAN</div><div class='add'>+    if (own == OwnerUser)</div><div class='add'>+        return QFileSystemEngine::resolveUserName(ownerId(own));</div><div class='add'>+    return QFileSystemEngine::resolveGroupName(ownerId(own));</div><div class='ctx'> #else</div><div class='del'>-        gr = getgrgid(ownerId(own));</div><div class='del'>-#endif</div><div class='del'>-        if (gr)</div><div class='del'>-            return QFile::decodeName(QByteArray(gr-&gt;gr_name));</div><div class='del'>-#endif</div><div class='del'>-    }</div><div class='ctx'>     return QString();</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::setPermissions(uint perms)</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='add'>+    QSystemError error;</div><div class='add'>+    if (!QFileSystemEngine::setPermissions(d-&gt;fileEntry, QFile::Permissions(perms), error, 0)) {</div><div class='add'>+        setError(QFile::PermissionsError, error.toString());</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+bool QFSFileEngine::setSize(qint64 size)</div><div class='add'>+{</div><div class='add'>+    Q_D(QFSFileEngine);</div><div class='ctx'>     bool ret = false;</div><div class='del'>-    mode_t mode = 0;</div><div class='del'>-    if (perms &amp; ReadOwnerPerm)</div><div class='del'>-        mode |= S_IRUSR;</div><div class='del'>-    if (perms &amp; WriteOwnerPerm)</div><div class='del'>-        mode |= S_IWUSR;</div><div class='del'>-    if (perms &amp; ExeOwnerPerm)</div><div class='del'>-        mode |= S_IXUSR;</div><div class='del'>-    if (perms &amp; ReadUserPerm)</div><div class='del'>-        mode |= S_IRUSR;</div><div class='del'>-    if (perms &amp; WriteUserPerm)</div><div class='del'>-        mode |= S_IWUSR;</div><div class='del'>-    if (perms &amp; ExeUserPerm)</div><div class='del'>-        mode |= S_IXUSR;</div><div class='del'>-    if (perms &amp; ReadGroupPerm)</div><div class='del'>-        mode |= S_IRGRP;</div><div class='del'>-    if (perms &amp; WriteGroupPerm)</div><div class='del'>-        mode |= S_IWGRP;</div><div class='del'>-    if (perms &amp; ExeGroupPerm)</div><div class='del'>-        mode |= S_IXGRP;</div><div class='del'>-    if (perms &amp; ReadOtherPerm)</div><div class='del'>-        mode |= S_IROTH;</div><div class='del'>-    if (perms &amp; WriteOtherPerm)</div><div class='del'>-        mode |= S_IWOTH;</div><div class='del'>-    if (perms &amp; ExeOtherPerm)</div><div class='del'>-        mode |= S_IXOTH;</div><div class='del'>-    if (d-&gt;fd != -1)</div><div class='del'>-        ret = fchmod(d-&gt;fd, mode) == 0;</div><div class='del'>-    else</div><div class='del'>-        ret = ::chmod(d-&gt;nativeFilePath.constData(), mode) == 0;</div><div class='del'>-    if (!ret)</div><div class='del'>-        setError(QFile::PermissionsError, qt_error_string(errno));</div><div class='add'>+    TInt err = KErrNone;</div><div class='add'>+    if (d-&gt;symbianFile.SubSessionHandle()) {</div><div class='add'>+        TInt err = d-&gt;symbianFile.SetSize(size);</div><div class='add'>+        ret = (err == KErrNone);</div><div class='add'>+        if (ret &amp;&amp; d-&gt;symbianFilePos &gt; size)</div><div class='add'>+            d-&gt;symbianFilePos = size;</div><div class='add'>+    }</div><div class='add'>+    else if (d-&gt;fd != -1)</div><div class='add'>+        ret = QT_FTRUNCATE(d-&gt;fd, size) == 0;</div><div class='add'>+    else if (d-&gt;fh)</div><div class='add'>+        ret = QT_FTRUNCATE(QT_FILENO(d-&gt;fh), size) == 0;</div><div class='add'>+    else {</div><div class='add'>+        RFile tmp;</div><div class='add'>+        QString symbianFilename(d-&gt;fileEntry.nativeFilePath());</div><div class='add'>+        err = tmp.Open(qt_s60GetRFs(), qt_QString2TPtrC(symbianFilename), EFileWrite);</div><div class='add'>+        if (err == KErrNone)</div><div class='add'>+        {</div><div class='add'>+            err = tmp.SetSize(size);</div><div class='add'>+            tmp.Close();</div><div class='add'>+        }</div><div class='add'>+        ret = (err == KErrNone);</div><div class='add'>+    }</div><div class='add'>+    if (!ret) {</div><div class='add'>+        QSystemError error;</div><div class='add'>+        if (err)</div><div class='add'>+            error = QSystemError(err, QSystemError::NativeError);</div><div class='add'>+        else</div><div class='add'>+            error = QSystemError(errno, QSystemError::StandardLibraryError);</div><div class='add'>+        setError(QFile::ResizeError, error.toString());</div><div class='add'>+    }</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='del'>-</div><div class='add'>+#else</div><div class='ctx'> bool QFSFileEngine::setSize(qint64 size)</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='hunk'>@@ -1273,25 +987,21 @@ bool QFSFileEngine::setSize(qint64 size)</div><div class='ctx'>     else if (d-&gt;fh)</div><div class='ctx'>         ret = QT_FTRUNCATE(QT_FILENO(d-&gt;fh), size) == 0;</div><div class='ctx'>     else</div><div class='del'>-        ret = QT_TRUNCATE(d-&gt;nativeFilePath.constData(), size) == 0;</div><div class='add'>+        ret = QT_TRUNCATE(d-&gt;fileEntry.nativeFilePath().constData(), size) == 0;</div><div class='ctx'>     if (!ret)</div><div class='ctx'>         setError(QFile::ResizeError, qt_error_string(errno));</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> QDateTime QFSFileEngine::fileTime(FileTime time) const</div><div class='ctx'> {</div><div class='ctx'>     Q_D(const QFSFileEngine);</div><div class='del'>-    QDateTime ret;</div><div class='del'>-    if (d-&gt;doStat()) {</div><div class='del'>-        if (time == CreationTime)</div><div class='del'>-            ret.setTime_t(d-&gt;st.st_ctime ? d-&gt;st.st_ctime : d-&gt;st.st_mtime);</div><div class='del'>-        else if (time == ModificationTime)</div><div class='del'>-            ret.setTime_t(d-&gt;st.st_mtime);</div><div class='del'>-        else if (time == AccessTime)</div><div class='del'>-            ret.setTime_t(d-&gt;st.st_atime);</div><div class='del'>-    }</div><div class='del'>-    return ret;</div><div class='add'>+</div><div class='add'>+    if (d-&gt;doStat(QFileSystemMetaData::Times))</div><div class='add'>+        return d-&gt;metaData.fileTime(time);</div><div class='add'>+</div><div class='add'>+    return QDateTime();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFlags flags)</div><div class='hunk'>@@ -1311,15 +1021,19 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla</div><div class='ctx'> </div><div class='ctx'>     // If we know the mapping will extend beyond EOF, fail early to avoid</div><div class='ctx'>     // undefined behavior. Otherwise, let mmap have its say.</div><div class='del'>-    if (doStat()</div><div class='del'>-            &amp;&amp; (QT_OFF_T(size) &gt; st.st_size - QT_OFF_T(offset)))</div><div class='add'>+    if (doStat(QFileSystemMetaData::SizeAttribute)</div><div class='add'>+            &amp;&amp; (QT_OFF_T(size) &gt; metaData.size() - QT_OFF_T(offset)))</div><div class='ctx'>         qWarning("QFSFileEngine::map: Mapping a file beyond its size is not portable");</div><div class='ctx'> </div><div class='ctx'>     int access = 0;</div><div class='ctx'>     if (openMode &amp; QIODevice::ReadOnly) access |= PROT_READ;</div><div class='ctx'>     if (openMode &amp; QIODevice::WriteOnly) access |= PROT_WRITE;</div><div class='ctx'> </div><div class='add'>+#if defined(Q_OS_INTEGRITY)</div><div class='add'>+    int pageSize = sysconf(_SC_PAGESIZE);</div><div class='add'>+#else</div><div class='ctx'>     int pageSize = getpagesize();</div><div class='add'>+#endif</div><div class='ctx'>     int extra = offset % pageSize;</div><div class='ctx'> </div><div class='ctx'>     if (quint64(size + extra) &gt; quint64((size_t)-1)) {</div><div class='hunk'>@@ -1334,7 +1048,7 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla</div><div class='ctx'> #ifdef Q_OS_SYMBIAN</div><div class='ctx'>     void *mapAddress;</div><div class='ctx'>     TRAPD(err,     mapAddress = QT_MMAP((void*)0, realSize,</div><div class='del'>-                   access, MAP_SHARED, nativeHandle(), realOffset));</div><div class='add'>+                   access, MAP_SHARED, getMapHandle(), realOffset));</div><div class='ctx'>     if (err != KErrNone) {</div><div class='ctx'>         qWarning("OpenC bug: leave from mmap %d", err);</div><div class='ctx'>         mapAddress = MAP_FAILED;</div><div class='hunk'>@@ -1369,6 +1083,7 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEnginePrivate::unmap(uchar *ptr)</div><div class='ctx'> {</div><div class='add'>+#if !defined(Q_OS_INTEGRITY)</div><div class='ctx'>     Q_Q(QFSFileEngine);</div><div class='ctx'>     if (!maps.contains(ptr)) {</div><div class='ctx'>         q-&gt;setError(QFile::PermissionsError, qt_error_string(EACCES));</div><div class='hunk'>@@ -1383,6 +1098,9 @@ bool QFSFileEnginePrivate::unmap(uchar *ptr)</div><div class='ctx'>     }</div><div class='ctx'>     maps.remove(ptr);</div><div class='ctx'>     return true;</div><div class='add'>+#else</div><div class='add'>+    return false;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp<br/>index e48b727..8578402 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfsfileengine_win.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qfsfileengine_win.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qfsfileengine_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qfsfileengine_win.cpp</a></div><div class='hunk'>@@ -43,7 +43,7 @@</div><div class='ctx'> #include "qplatformdefs.h"</div><div class='ctx'> #include "qabstractfileengine.h"</div><div class='ctx'> #include "private/qfsfileengine_p.h"</div><div class='del'>-#include &lt;private/qsystemlibrary_p.h&gt;</div><div class='add'>+#include "qfilesystemengine_p.h"</div><div class='ctx'> #include &lt;qdebug.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "qfile.h"</div><div class='hunk'>@@ -69,226 +69,12 @@</div><div class='ctx'> #define SECURITY_WIN32</div><div class='ctx'> #include &lt;security.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifndef _INTPTR_T_DEFINED</div><div class='del'>-#ifdef  _WIN64</div><div class='del'>-typedef __int64             intptr_t;</div><div class='del'>-#else</div><div class='del'>-#ifdef _W64</div><div class='del'>-typedef _W64 int            intptr_t;</div><div class='del'>-#else</div><div class='del'>-typedef INT_PTR intptr_t;</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-#define _INTPTR_T_DEFINED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef INVALID_FILE_ATTRIBUTES</div><div class='del'>-#  define INVALID_FILE_ATTRIBUTES (DWORD (-1))</div><div class='add'>+#ifndef PATH_MAX</div><div class='add'>+#define PATH_MAX FILENAME_MAX</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if !defined(Q_OS_WINCE)</div><div class='del'>-#  if !defined(REPARSE_DATA_BUFFER_HEADER_SIZE)</div><div class='del'>-typedef struct _REPARSE_DATA_BUFFER {</div><div class='del'>-    ULONG  ReparseTag;</div><div class='del'>-    USHORT ReparseDataLength;</div><div class='del'>-    USHORT Reserved;</div><div class='del'>-    union {</div><div class='del'>-        struct {</div><div class='del'>-            USHORT SubstituteNameOffset;</div><div class='del'>-            USHORT SubstituteNameLength;</div><div class='del'>-            USHORT PrintNameOffset;</div><div class='del'>-            USHORT PrintNameLength;</div><div class='del'>-            ULONG  Flags;</div><div class='del'>-            WCHAR  PathBuffer[1];</div><div class='del'>-        } SymbolicLinkReparseBuffer;</div><div class='del'>-        struct {</div><div class='del'>-            USHORT SubstituteNameOffset;</div><div class='del'>-            USHORT SubstituteNameLength;</div><div class='del'>-            USHORT PrintNameOffset;</div><div class='del'>-            USHORT PrintNameLength;</div><div class='del'>-            WCHAR  PathBuffer[1];</div><div class='del'>-        } MountPointReparseBuffer;</div><div class='del'>-        struct {</div><div class='del'>-            UCHAR  DataBuffer[1];</div><div class='del'>-        } GenericReparseBuffer;</div><div class='del'>-    };</div><div class='del'>-} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;</div><div class='del'>-#    define REPARSE_DATA_BUFFER_HEADER_SIZE  FIELD_OFFSET(REPARSE_DATA_BUFFER, GenericReparseBuffer)</div><div class='del'>-#  endif // !defined(REPARSE_DATA_BUFFER_HEADER_SIZE)</div><div class='del'>-</div><div class='del'>-#  ifndef MAXIMUM_REPARSE_DATA_BUFFER_SIZE</div><div class='del'>-#    define MAXIMUM_REPARSE_DATA_BUFFER_SIZE 16384</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef IO_REPARSE_TAG_SYMLINK</div><div class='del'>-#    define IO_REPARSE_TAG_SYMLINK (0xA000000CL)</div><div class='del'>-#  endif</div><div class='del'>-#  ifndef FSCTL_GET_REPARSE_POINT</div><div class='del'>-#    define FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)</div><div class='del'>-#  endif</div><div class='del'>-#endif // !defined(Q_OS_WINCE)</div><div class='del'>-</div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='del'>-static QString readLink(const QString &amp;link);</div><div class='del'>-</div><div class='del'>-Q_CORE_EXPORT int qt_ntfs_permission_lookup = 0;</div><div class='del'>-</div><div class='del'>-#if defined(Q_OS_WINCE)</div><div class='del'>-static QString qfsPrivateCurrentDir = QLatin1String("");</div><div class='del'>-// As none of the functions we try to resolve do exist on Windows CE</div><div class='del'>-// we use QT_NO_LIBRARY to shorten everything up a little bit.</div><div class='del'>-#define QT_NO_LIBRARY 1</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if !defined(QT_NO_LIBRARY)</div><div class='del'>-QT_BEGIN_INCLUDE_NAMESPACE</div><div class='del'>-typedef DWORD (WINAPI *PtrGetNamedSecurityInfoW)(LPWSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*);</div><div class='del'>-static PtrGetNamedSecurityInfoW ptrGetNamedSecurityInfoW = 0;</div><div class='del'>-typedef BOOL (WINAPI *PtrLookupAccountSidW)(LPCWSTR, PSID, LPWSTR, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE);</div><div class='del'>-static PtrLookupAccountSidW ptrLookupAccountSidW = 0;</div><div class='del'>-typedef VOID (WINAPI *PtrBuildTrusteeWithSidW)(PTRUSTEE_W, PSID);</div><div class='del'>-static PtrBuildTrusteeWithSidW ptrBuildTrusteeWithSidW = 0;</div><div class='del'>-typedef DWORD (WINAPI *PtrGetEffectiveRightsFromAclW)(PACL, PTRUSTEE_W, OUT PACCESS_MASK);</div><div class='del'>-static PtrGetEffectiveRightsFromAclW ptrGetEffectiveRightsFromAclW = 0;</div><div class='del'>-static TRUSTEE_W currentUserTrusteeW;</div><div class='del'>-static TRUSTEE_W worldTrusteeW;</div><div class='del'>-</div><div class='del'>-typedef BOOL (WINAPI *PtrGetUserProfileDirectoryW)(HANDLE, LPWSTR, LPDWORD);</div><div class='del'>-static PtrGetUserProfileDirectoryW ptrGetUserProfileDirectoryW = 0;</div><div class='del'>-QT_END_INCLUDE_NAMESPACE</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void QFSFileEnginePrivate::resolveLibs()</div><div class='del'>-{</div><div class='del'>-    static bool triedResolve = false;</div><div class='del'>-    if (!triedResolve) {</div><div class='del'>-        // need to resolve the security info functions</div><div class='del'>-</div><div class='del'>-        // protect initialization</div><div class='del'>-#ifndef QT_NO_THREAD</div><div class='del'>-        QMutexLocker locker(QMutexPool::globalInstanceGet(&amp;triedResolve));</div><div class='del'>-        // check triedResolve again, since another thread may have already</div><div class='del'>-        // done the initialization</div><div class='del'>-        if (triedResolve) {</div><div class='del'>-            // another thread did initialize the security function pointers,</div><div class='del'>-            // so we shouldn't do it again.</div><div class='del'>-            return;</div><div class='del'>-        }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-        triedResolve = true;</div><div class='del'>-#if !defined(Q_OS_WINCE)</div><div class='del'>-        HINSTANCE advapiHnd = QSystemLibrary::load(L"advapi32");</div><div class='del'>-        if (advapiHnd) {</div><div class='del'>-            ptrGetNamedSecurityInfoW = (PtrGetNamedSecurityInfoW)GetProcAddress(advapiHnd, "GetNamedSecurityInfoW");</div><div class='del'>-            ptrLookupAccountSidW = (PtrLookupAccountSidW)GetProcAddress(advapiHnd, "LookupAccountSidW");</div><div class='del'>-            ptrBuildTrusteeWithSidW = (PtrBuildTrusteeWithSidW)GetProcAddress(advapiHnd, "BuildTrusteeWithSidW");</div><div class='del'>-            ptrGetEffectiveRightsFromAclW = (PtrGetEffectiveRightsFromAclW)GetProcAddress(advapiHnd, "GetEffectiveRightsFromAclW");</div><div class='del'>-        }</div><div class='del'>-        if (ptrBuildTrusteeWithSidW) {</div><div class='del'>-            // Create TRUSTEE for current user</div><div class='del'>-            HANDLE hnd = ::GetCurrentProcess();</div><div class='del'>-            HANDLE token = 0;</div><div class='del'>-            if (::OpenProcessToken(hnd, TOKEN_QUERY, &amp;token)) {</div><div class='del'>-                TOKEN_USER tu;</div><div class='del'>-                DWORD retsize;</div><div class='del'>-                if (::GetTokenInformation(token, TokenUser, &amp;tu, sizeof(tu), &amp;retsize))</div><div class='del'>-                    ptrBuildTrusteeWithSidW(&amp;currentUserTrusteeW, tu.User.Sid);</div><div class='del'>-                ::CloseHandle(token);</div><div class='del'>-            }</div><div class='del'>-</div><div class='del'>-            typedef BOOL (WINAPI *PtrAllocateAndInitializeSid)(PSID_IDENTIFIER_AUTHORITY, BYTE, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, PSID*);</div><div class='del'>-            PtrAllocateAndInitializeSid ptrAllocateAndInitializeSid = (PtrAllocateAndInitializeSid)GetProcAddress(advapiHnd, "AllocateAndInitializeSid");</div><div class='del'>-            typedef PVOID (WINAPI *PtrFreeSid)(PSID);</div><div class='del'>-            PtrFreeSid ptrFreeSid = (PtrFreeSid)GetProcAddress(advapiHnd, "FreeSid");</div><div class='del'>-            if (ptrAllocateAndInitializeSid &amp;&amp; ptrFreeSid) {</div><div class='del'>-                // Create TRUSTEE for Everyone (World)</div><div class='del'>-                SID_IDENTIFIER_AUTHORITY worldAuth = { SECURITY_WORLD_SID_AUTHORITY };</div><div class='del'>-                PSID pWorld = 0;</div><div class='del'>-                if (ptrAllocateAndInitializeSid(&amp;worldAuth, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &amp;pWorld))</div><div class='del'>-                    ptrBuildTrusteeWithSidW(&amp;worldTrusteeW, pWorld);</div><div class='del'>-                ptrFreeSid(pWorld);</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        HINSTANCE userenvHnd = QSystemLibrary::load(L"userenv");</div><div class='del'>-        if (userenvHnd)</div><div class='del'>-            ptrGetUserProfileDirectoryW = (PtrGetUserProfileDirectoryW)GetProcAddress(userenvHnd, "GetUserProfileDirectoryW");</div><div class='del'>-#endif</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-#endif // QT_NO_LIBRARY</div><div class='del'>-</div><div class='del'>-typedef DWORD (WINAPI *PtrNetShareEnum)(LPWSTR, DWORD, LPBYTE*, DWORD, LPDWORD, LPDWORD, LPDWORD);</div><div class='del'>-static PtrNetShareEnum ptrNetShareEnum = 0;</div><div class='del'>-typedef DWORD (WINAPI *PtrNetApiBufferFree)(LPVOID);</div><div class='del'>-static PtrNetApiBufferFree ptrNetApiBufferFree = 0;</div><div class='del'>-typedef struct _SHARE_INFO_1 {</div><div class='del'>-    LPWSTR shi1_netname;</div><div class='del'>-    DWORD shi1_type;</div><div class='del'>-    LPWSTR shi1_remark;</div><div class='del'>-} SHARE_INFO_1;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-bool QFSFileEnginePrivate::resolveUNCLibs()</div><div class='del'>-{</div><div class='del'>-    static bool triedResolve = false;</div><div class='del'>-    if (!triedResolve) {</div><div class='del'>-#ifndef QT_NO_THREAD</div><div class='del'>-        QMutexLocker locker(QMutexPool::globalInstanceGet(&amp;triedResolve));</div><div class='del'>-        if (triedResolve) {</div><div class='del'>-            return ptrNetShareEnum &amp;&amp; ptrNetApiBufferFree;</div><div class='del'>-        }</div><div class='del'>-#endif</div><div class='del'>-        triedResolve = true;</div><div class='del'>-#if !defined(Q_OS_WINCE)</div><div class='del'>-        HINSTANCE hLib = QSystemLibrary::load(L"Netapi32");</div><div class='del'>-        if (hLib) {</div><div class='del'>-            ptrNetShareEnum = (PtrNetShareEnum)GetProcAddress(hLib, "NetShareEnum");</div><div class='del'>-            if (ptrNetShareEnum)</div><div class='del'>-                ptrNetApiBufferFree = (PtrNetApiBufferFree)GetProcAddress(hLib, "NetApiBufferFree");</div><div class='del'>-        }</div><div class='del'>-#endif</div><div class='del'>-    }</div><div class='del'>-    return ptrNetShareEnum &amp;&amp; ptrNetApiBufferFree;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-bool QFSFileEnginePrivate::uncListSharesOnServer(const QString &amp;server, QStringList *list)</div><div class='del'>-{</div><div class='del'>-    if (resolveUNCLibs()) {</div><div class='del'>-        SHARE_INFO_1 *BufPtr, *p;</div><div class='del'>-        DWORD res;</div><div class='del'>-        DWORD er = 0, tr = 0, resume = 0, i;</div><div class='del'>-        do {</div><div class='del'>-            res = ptrNetShareEnum((wchar_t*)server.utf16(), 1, (LPBYTE *)&amp;BufPtr, DWORD(-1), &amp;er, &amp;tr, &amp;resume);</div><div class='del'>-            if (res == ERROR_SUCCESS || res == ERROR_MORE_DATA) {</div><div class='del'>-                p = BufPtr;</div><div class='del'>-                for (i = 1; i &lt;= er; ++i) {</div><div class='del'>-                    if (list &amp;&amp; p-&gt;shi1_type == 0)</div><div class='del'>-                        list-&gt;append(QString::fromWCharArray(p-&gt;shi1_netname));</div><div class='del'>-                    p++;</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-            ptrNetApiBufferFree(BufPtr);</div><div class='del'>-        } while (res == ERROR_MORE_DATA);</div><div class='del'>-        return res == ERROR_SUCCESS;</div><div class='del'>-    }</div><div class='del'>-    return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool isUncRoot(const QString &amp;server)</div><div class='del'>-{</div><div class='del'>-    QString localPath = QDir::toNativeSeparators(server);</div><div class='del'>-    if (!localPath.startsWith(QLatin1String("\\\\")))</div><div class='del'>-        return false;</div><div class='del'>-</div><div class='del'>-    int idx = localPath.indexOf(QLatin1Char('\\'), 2);</div><div class='del'>-    if (idx == -1 || idx + 1 == localPath.length())</div><div class='del'>-        return true;</div><div class='del'>-</div><div class='del'>-    localPath = localPath.right(localPath.length() - idx - 1).trimmed();</div><div class='del'>-    return localPath.isEmpty();</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #if !defined(Q_OS_WINCE)</div><div class='ctx'> static inline bool isUncPath(const QString &amp;path)</div><div class='ctx'> {</div><div class='hunk'>@@ -298,73 +84,6 @@ static inline bool isUncPath(const QString &amp;path)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline bool isRelativePath(const QString &amp;path)</div><div class='del'>-{</div><div class='del'>-    // drive, e.g. "a:", or UNC root, e.q. "//"</div><div class='del'>-    return !(path.startsWith(QLatin1Char('/'))</div><div class='del'>-           || (path.length() &gt;= 2</div><div class='del'>-           &amp;&amp; ((path.at(0).isLetter() &amp;&amp; path.at(1) == QLatin1Char(':'))</div><div class='del'>-           || (path.at(0) == QLatin1Char('/') &amp;&amp; path.at(1) == QLatin1Char('/')))));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString fixIfRelativeUncPath(const QString &amp;path)</div><div class='del'>-{</div><div class='del'>-    if (isRelativePath(path)) {</div><div class='del'>-        QString currentPath = QDir::currentPath() + QLatin1Char('/');</div><div class='del'>-        if (currentPath.startsWith(QLatin1String("//")))</div><div class='del'>-            return QString(path).prepend(currentPath);</div><div class='del'>-    }</div><div class='del'>-    return path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// can be //server or //server/share</div><div class='del'>-static bool uncShareExists(const QString &amp;server)</div><div class='del'>-{</div><div class='del'>-    QStringList parts = server.split(QLatin1Char('\\'), QString::SkipEmptyParts);</div><div class='del'>-    if (parts.count()) {</div><div class='del'>-        QStringList shares;</div><div class='del'>-        if (QFSFileEnginePrivate::uncListSharesOnServer(QLatin1String("\\\\") + parts.at(0), &amp;shares))</div><div class='del'>-            return parts.count() &gt;= 2 ? shares.contains(parts.at(1), Qt::CaseInsensitive) : true;</div><div class='del'>-    }</div><div class='del'>-    return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool isDriveRoot(const QString &amp;path)</div><div class='del'>-{</div><div class='del'>-    return (path.length() == 3</div><div class='del'>-           &amp;&amp; path.at(0).isLetter() &amp;&amp; path.at(1) == QLatin1Char(':')</div><div class='del'>-           &amp;&amp; path.at(2) == QLatin1Char('/'));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString nativeAbsoluteFilePath(const QString &amp;path)</div><div class='del'>-{</div><div class='del'>-    QString absPath;</div><div class='del'>-#if !defined(Q_OS_WINCE)</div><div class='del'>-    QVarLengthArray&lt;wchar_t, MAX_PATH&gt; buf(qMax(MAX_PATH, path.size() + 1));</div><div class='del'>-    wchar_t *fileName = 0;</div><div class='del'>-    DWORD retLen = GetFullPathName((wchar_t*)path.utf16(), buf.size(), buf.data(), &amp;fileName);</div><div class='del'>-    if (retLen &gt; (DWORD)buf.size()) {</div><div class='del'>-        buf.resize(retLen);</div><div class='del'>-        retLen = GetFullPathName((wchar_t*)path.utf16(), buf.size(), buf.data(), &amp;fileName);</div><div class='del'>-    }</div><div class='del'>-    if (retLen != 0)</div><div class='del'>-        absPath = QString::fromWCharArray(buf.data(), retLen);</div><div class='del'>-#else</div><div class='del'>-    if (path.startsWith(QLatin1Char('/')) || path.startsWith(QLatin1Char('\\')))</div><div class='del'>-        absPath = QDir::toNativeSeparators(path);</div><div class='del'>-    else</div><div class='del'>-        absPath = QDir::toNativeSeparators(QDir::cleanPath(qfsPrivateCurrentDir + QLatin1Char('/') + path));</div><div class='del'>-#endif</div><div class='del'>-    // This is really ugly, but GetFullPathName strips off whitespace at the end.</div><div class='del'>-    // If you for instance write ". " in the lineedit of QFileDialog,</div><div class='del'>-    // (which is an invalid filename) this function will strip the space off and viola,</div><div class='del'>-    // the file is later reported as existing. Therefore, we re-add the whitespace that</div><div class='del'>-    // was at the end of path in order to keep the filename invalid.</div><div class='del'>-    if (!path.isEmpty() &amp;&amp; path.at(path.size() - 1) == QLatin1Char(' '))</div><div class='del'>-        absPath.append(QLatin1Char(' '));</div><div class='del'>-    return absPath;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*!</div><div class='ctx'>     \internal</div><div class='ctx'> */</div><div class='hunk'>@@ -373,7 +92,7 @@ QString QFSFileEnginePrivate::longFileName(const QString &amp;path)</div><div class='ctx'>     if (path.startsWith(QLatin1String("\\\\.\\")))</div><div class='ctx'>         return path;</div><div class='ctx'> </div><div class='del'>-    QString absPath = nativeAbsoluteFilePath(path);</div><div class='add'>+    QString absPath = QFileSystemEngine::nativeAbsoluteFilePath(path);</div><div class='ctx'> #if !defined(Q_OS_WINCE)</div><div class='ctx'>     QString prefix = QLatin1String("\\\\?\\");</div><div class='ctx'>     if (isUncPath(absPath)) {</div><div class='hunk'>@@ -389,15 +108,6 @@ QString QFSFileEnginePrivate::longFileName(const QString &amp;path)</div><div class='ctx'> /*</div><div class='ctx'>     \internal</div><div class='ctx'> */</div><div class='del'>-void QFSFileEnginePrivate::nativeInitFileName()</div><div class='del'>-{</div><div class='del'>-    QString path = longFileName(QDir::toNativeSeparators(fixIfRelativeUncPath(filePath)));</div><div class='del'>-    nativeFilePath = QByteArray((const char *)path.utf16(), path.size() * 2 + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-    \internal</div><div class='del'>-*/</div><div class='ctx'> bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)</div><div class='ctx'> {</div><div class='ctx'>     Q_Q(QFSFileEngine);</div><div class='hunk'>@@ -415,9 +125,8 @@ bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)</div><div class='ctx'> </div><div class='ctx'>     // WriteOnly can create files, ReadOnly cannot.</div><div class='ctx'>     DWORD creationDisp = (openMode &amp; QIODevice::WriteOnly) ? OPEN_ALWAYS : OPEN_EXISTING;</div><div class='del'>-</div><div class='ctx'>     // Create the file handle.</div><div class='del'>-    fileHandle = CreateFile((const wchar_t*)nativeFilePath.constData(),</div><div class='add'>+    fileHandle = CreateFile((const wchar_t*)fileEntry.nativeFilePath().utf16(),</div><div class='ctx'>                             accessRights,</div><div class='ctx'>                             shareMode,</div><div class='ctx'>                             &amp;securityAtts,</div><div class='hunk'>@@ -507,17 +216,9 @@ qint64 QFSFileEnginePrivate::nativeSize() const</div><div class='ctx'>     // ### Don't flush; for buffered files, we should get away with ftell.</div><div class='ctx'>     thatQ-&gt;flush();</div><div class='ctx'> </div><div class='del'>-#if !defined(Q_OS_WINCE)</div><div class='del'>-    // stdlib/stdio mode.</div><div class='del'>-    if (fh || fd != -1) {</div><div class='del'>-        qint64 fileSize = _filelengthi64(fh ? QT_FILENO(fh) : fd);</div><div class='del'>-        if (fileSize == -1) {</div><div class='del'>-            fileSize = 0;</div><div class='del'>-            thatQ-&gt;setError(QFile::UnspecifiedError, qt_error_string(errno));</div><div class='del'>-        }</div><div class='del'>-        return fileSize;</div><div class='del'>-    }</div><div class='del'>-#else // Q_OS_WINCE</div><div class='add'>+    // Always retrive the current information</div><div class='add'>+    metaData.clearFlags(QFileSystemMetaData::SizeAttribute);</div><div class='add'>+#if defined(Q_OS_WINCE)</div><div class='ctx'>     // Buffered stdlib mode.</div><div class='ctx'>     if (fh) {</div><div class='ctx'>         QT_OFF_T oldPos = QT_FTELL(fh);</div><div class='hunk'>@@ -530,70 +231,22 @@ qint64 QFSFileEnginePrivate::nativeSize() const</div><div class='ctx'>         }</div><div class='ctx'>         return fileSize;</div><div class='ctx'>     }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-    // Not-open mode, where the file name is known: We'll check the</div><div class='del'>-    // file system directly.</div><div class='del'>-    if (openMode == QIODevice::NotOpen &amp;&amp; !nativeFilePath.isEmpty()) {</div><div class='del'>-        WIN32_FILE_ATTRIBUTE_DATA attribData;</div><div class='del'>-        bool ok = ::GetFileAttributesEx((const wchar_t*)nativeFilePath.constData(),</div><div class='del'>-                                        GetFileExInfoStandard, &amp;attribData);</div><div class='del'>-        if (!ok) {</div><div class='del'>-            int errorCode = GetLastError();</div><div class='del'>-            if (errorCode == ERROR_ACCESS_DENIED || errorCode == ERROR_SHARING_VIOLATION) {</div><div class='del'>-                QByteArray path = nativeFilePath;</div><div class='del'>-                // path for the FindFirstFile should not end with a trailing slash</div><div class='del'>-                while (!path.isEmpty() &amp;&amp; reinterpret_cast&lt;const wchar_t *&gt;(</div><div class='del'>-                                path.constData() + path.length())[-1] == '\\')</div><div class='del'>-                    path.chop(2);</div><div class='del'>-</div><div class='del'>-                // FindFirstFile can not handle drives</div><div class='del'>-                if (!path.isEmpty() &amp;&amp; reinterpret_cast&lt;const wchar_t *&gt;(</div><div class='del'>-                                path.constData() + path.length())[-1] != ':') {</div><div class='del'>-                    WIN32_FIND_DATA findData;</div><div class='del'>-                    HANDLE hFind = ::FindFirstFile((const wchar_t*)path.constData(),</div><div class='del'>-                                                   &amp;findData);</div><div class='del'>-                    if (hFind != INVALID_HANDLE_VALUE) {</div><div class='del'>-                        ::FindClose(hFind);</div><div class='del'>-                        ok = true;</div><div class='del'>-                        attribData.nFileSizeHigh = findData.nFileSizeHigh;</div><div class='del'>-                        attribData.nFileSizeLow = findData.nFileSizeLow;</div><div class='del'>-                    }</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        if (ok) {</div><div class='del'>-            qint64 size = attribData.nFileSizeHigh;</div><div class='del'>-            size &lt;&lt;= 32;</div><div class='del'>-            size += attribData.nFileSizeLow;</div><div class='del'>-            return size;</div><div class='del'>-        }</div><div class='del'>-        thatQ-&gt;setError(QFile::UnspecifiedError, qt_error_string());</div><div class='del'>-        return 0;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-#if defined(Q_OS_WINCE)</div><div class='del'>-    // Unbuffed stdio mode</div><div class='ctx'>     if (fd != -1) {</div><div class='ctx'>         thatQ-&gt;setError(QFile::UnspecifiedError, QLatin1String("Not implemented!"));</div><div class='ctx'>         return 0;</div><div class='ctx'>     }</div><div class='ctx'> #endif</div><div class='add'>+    bool filled = false;</div><div class='add'>+    if (fileHandle != INVALID_HANDLE_VALUE &amp;&amp; openMode != QIODevice::NotOpen )</div><div class='add'>+        filled = QFileSystemEngine::fillMetaData(fileHandle, metaData,</div><div class='add'>+                                                 QFileSystemMetaData::SizeAttribute);</div><div class='add'>+    else</div><div class='add'>+        filled = doStat(QFileSystemMetaData::SizeAttribute);</div><div class='ctx'> </div><div class='del'>-    // Windows native mode.</div><div class='del'>-    if (fileHandle == INVALID_HANDLE_VALUE)</div><div class='del'>-        return 0;</div><div class='del'>-</div><div class='del'>-    BY_HANDLE_FILE_INFORMATION fileInfo;</div><div class='del'>-    if (!GetFileInformationByHandle(fileHandle, &amp;fileInfo)) {</div><div class='del'>-        thatQ-&gt;setError(QFile::UnspecifiedError, qt_error_string());</div><div class='del'>-        return 0;</div><div class='add'>+    if (!filled) {</div><div class='add'>+        thatQ-&gt;setError(QFile::UnspecifiedError, qt_error_string(errno));</div><div class='ctx'>     }</div><div class='del'>-</div><div class='del'>-    qint64 size = fileInfo.nFileSizeHigh;</div><div class='del'>-    size &lt;&lt;= 32;</div><div class='del'>-    size += fileInfo.nFileSizeLow;</div><div class='del'>-    return size;</div><div class='add'>+    return metaData.size();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -827,159 +480,41 @@ bool QFSFileEnginePrivate::nativeIsSequential() const</div><div class='ctx'> bool QFSFileEngine::remove()</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='del'>-    bool ret = ::DeleteFile((wchar_t*)QFSFileEnginePrivate::longFileName(d-&gt;filePath).utf16()) != 0;</div><div class='add'>+    QSystemError error;</div><div class='add'>+    bool ret = QFileSystemEngine::removeFile(d-&gt;fileEntry, error);</div><div class='ctx'>     if (!ret)</div><div class='del'>-        setError(QFile::RemoveError, qt_error_string());</div><div class='add'>+        setError(QFile::RemoveError, error.toString());</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::copy(const QString &amp;copyName)</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='del'>-    bool ret = ::CopyFile((wchar_t*)QFSFileEnginePrivate::longFileName(d-&gt;filePath).utf16(),</div><div class='del'>-                          (wchar_t*)QFSFileEnginePrivate::longFileName(copyName).utf16(), true) != 0;</div><div class='add'>+    QSystemError error;</div><div class='add'>+    bool ret = QFileSystemEngine::copyFile(d-&gt;fileEntry, QFileSystemEntry(copyName), error);</div><div class='ctx'>     if (!ret)</div><div class='del'>-        setError(QFile::CopyError, qt_error_string());</div><div class='add'>+        setError(QFile::CopyError, error.toString());</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::rename(const QString &amp;newName)</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='del'>-    bool ret = ::MoveFile((wchar_t*)QFSFileEnginePrivate::longFileName(d-&gt;filePath).utf16(),</div><div class='del'>-                          (wchar_t*)QFSFileEnginePrivate::longFileName(newName).utf16()) != 0;</div><div class='add'>+    QSystemError error;</div><div class='add'>+    bool ret = QFileSystemEngine::renameFile(d-&gt;fileEntry, QFileSystemEntry(newName), error);</div><div class='ctx'>     if (!ret)</div><div class='del'>-        setError(QFile::RenameError, qt_error_string());</div><div class='add'>+        setError(QFile::RenameError, error.toString());</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool mkDir(const QString &amp;path)</div><div class='del'>-{</div><div class='del'>-#if defined(Q_OS_WINCE)</div><div class='del'>-    // Unfortunately CreateDirectory returns true for paths longer than</div><div class='del'>-    // 256, but does not create a directory. It starts to fail, when</div><div class='del'>-    // path length &gt; MAX_PATH, which is 260 usually on CE.</div><div class='del'>-    // This only happens on a Windows Mobile device. Windows CE seems</div><div class='del'>-    // not to be affected by this.</div><div class='del'>-    static int platformId = 0;</div><div class='del'>-    if (platformId == 0) {</div><div class='del'>-        wchar_t platformString[64];</div><div class='del'>-        if (SystemParametersInfo(SPI_GETPLATFORMTYPE, sizeof(platformString)/sizeof(*platformString),platformString,0)) {</div><div class='del'>-            if (0 == wcscmp(platformString, L"PocketPC") || 0 == wcscmp(platformString, L"Smartphone"))</div><div class='del'>-                platformId = 1;</div><div class='del'>-            else</div><div class='del'>-                platformId = 2;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    if (platformId == 1 &amp;&amp; QFSFileEnginePrivate::longFileName(path).size() &gt; 256)</div><div class='del'>-        return false;</div><div class='del'>-#endif</div><div class='del'>-    return ::CreateDirectory((wchar_t*)QFSFileEnginePrivate::longFileName(path).utf16(), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool rmDir(const QString &amp;path)</div><div class='del'>-{</div><div class='del'>-    return ::RemoveDirectory((wchar_t*)QFSFileEnginePrivate::longFileName(path).utf16());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool isDirPath(const QString &amp;dirPath, bool *existed)</div><div class='del'>-{</div><div class='del'>-    QString path = dirPath;</div><div class='del'>-    if (path.length() == 2 &amp;&amp; path.at(1) == QLatin1Char(':'))</div><div class='del'>-        path += QLatin1Char('\\');</div><div class='del'>-</div><div class='del'>-    DWORD fileAttrib = ::GetFileAttributes((wchar_t*)QFSFileEnginePrivate::longFileName(path).utf16());</div><div class='del'>-    if (fileAttrib == INVALID_FILE_ATTRIBUTES) {</div><div class='del'>-        int errorCode = GetLastError();</div><div class='del'>-        if (errorCode == ERROR_ACCESS_DENIED || errorCode == ERROR_SHARING_VIOLATION) {</div><div class='del'>-            // path for the FindFirstFile should not end with a trailing slash</div><div class='del'>-            while (path.endsWith(QLatin1Char('\\')))</div><div class='del'>-                path.chop(1);</div><div class='del'>-</div><div class='del'>-            // FindFirstFile can not handle drives</div><div class='del'>-            if (!path.endsWith(QLatin1Char(':'))) {</div><div class='del'>-                WIN32_FIND_DATA findData;</div><div class='del'>-                HANDLE hFind = ::FindFirstFile((wchar_t*)QFSFileEnginePrivate::longFileName(path).utf16(),</div><div class='del'>-                                               &amp;findData);</div><div class='del'>-                if (hFind != INVALID_HANDLE_VALUE) {</div><div class='del'>-                    ::FindClose(hFind);</div><div class='del'>-                    fileAttrib = findData.dwFileAttributes;</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (existed)</div><div class='del'>-        *existed = fileAttrib != INVALID_FILE_ATTRIBUTES;</div><div class='del'>-</div><div class='del'>-    if (fileAttrib == INVALID_FILE_ATTRIBUTES)</div><div class='del'>-        return false;</div><div class='del'>-</div><div class='del'>-    return fileAttrib &amp; FILE_ATTRIBUTE_DIRECTORY;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> bool QFSFileEngine::mkdir(const QString &amp;name, bool createParentDirectories) const</div><div class='ctx'> {</div><div class='del'>-    QString dirName = name;</div><div class='del'>-    if (createParentDirectories) {</div><div class='del'>-        dirName = QDir::toNativeSeparators(QDir::cleanPath(dirName));</div><div class='del'>-        // We spefically search for / so \ would break it..</div><div class='del'>-        int oldslash = -1;</div><div class='del'>-        if (dirName.startsWith(QLatin1String("\\\\"))) {</div><div class='del'>-            // Don't try to create the root path of a UNC path;</div><div class='del'>-            // CreateDirectory() will just return ERROR_INVALID_NAME.</div><div class='del'>-            for (int i = 0; i &lt; dirName.size(); ++i) {</div><div class='del'>-                if (dirName.at(i) != QDir::separator()) {</div><div class='del'>-                    oldslash = i;</div><div class='del'>-                    break;</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-            if (oldslash != -1)</div><div class='del'>-                oldslash = dirName.indexOf(QDir::separator(), oldslash);</div><div class='del'>-        }</div><div class='del'>-        for (int slash=0; slash != -1; oldslash = slash) {</div><div class='del'>-            slash = dirName.indexOf(QDir::separator(), oldslash+1);</div><div class='del'>-            if (slash == -1) {</div><div class='del'>-                if (oldslash == dirName.length())</div><div class='del'>-                    break;</div><div class='del'>-                slash = dirName.length();</div><div class='del'>-            }</div><div class='del'>-            if (slash) {</div><div class='del'>-                QString chunk = dirName.left(slash);</div><div class='del'>-                bool existed = false;</div><div class='del'>-                if (!isDirPath(chunk, &amp;existed)) {</div><div class='del'>-                    if (!existed) {</div><div class='del'>-                        if (!mkDir(chunk))</div><div class='del'>-                            return false;</div><div class='del'>-                    } else {</div><div class='del'>-                        return false;</div><div class='del'>-                    }</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        return true;</div><div class='del'>-    }</div><div class='del'>-    return mkDir(name);</div><div class='add'>+    return QFileSystemEngine::createDirectory(QFileSystemEntry(name), createParentDirectories);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::rmdir(const QString &amp;name, bool recurseParentDirectories) const</div><div class='ctx'> {</div><div class='del'>-    QString dirName = name;</div><div class='del'>-    if (recurseParentDirectories) {</div><div class='del'>-        dirName = QDir::toNativeSeparators(QDir::cleanPath(dirName));</div><div class='del'>-        for (int oldslash = 0, slash=dirName.length(); slash &gt; 0; oldslash = slash) {</div><div class='del'>-            QString chunk = dirName.left(slash);</div><div class='del'>-            if (chunk.length() == 2 &amp;&amp; chunk.at(0).isLetter() &amp;&amp; chunk.at(1) == QLatin1Char(':'))</div><div class='del'>-                break;</div><div class='del'>-            if (!isDirPath(chunk, 0))</div><div class='del'>-                return false;</div><div class='del'>-            if (!rmDir(chunk))</div><div class='del'>-                return oldslash != 0;</div><div class='del'>-            slash = dirName.lastIndexOf(QDir::separator(), oldslash-1);</div><div class='del'>-        }</div><div class='del'>-        return true;</div><div class='del'>-    }</div><div class='del'>-    return rmDir(name);</div><div class='add'>+    return QFileSystemEngine::removeDirectory(QFileSystemEntry(name), recurseParentDirectories);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::caseSensitive() const</div><div class='hunk'>@@ -989,15 +524,7 @@ bool QFSFileEngine::caseSensitive() const</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::setCurrentPath(const QString &amp;path)</div><div class='ctx'> {</div><div class='del'>-    if (!QDir(path).exists())</div><div class='del'>-        return false;</div><div class='del'>-</div><div class='del'>-#if !defined(Q_OS_WINCE)</div><div class='del'>-    return ::SetCurrentDirectory((wchar_t*)path.utf16()) != 0;</div><div class='del'>-#else</div><div class='del'>-    qfsPrivateCurrentDir = QFSFileEnginePrivate::longFileName(path);</div><div class='del'>-    return true;</div><div class='del'>-#endif</div><div class='add'>+    return QFileSystemEngine::setCurrentPath(QFileSystemEntry(path));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QString QFSFileEngine::currentPath(const QString &amp;fileName)</div><div class='hunk'>@@ -1016,115 +543,30 @@ QString QFSFileEngine::currentPath(const QString &amp;fileName)</div><div class='ctx'>     }</div><div class='ctx'>     if (ret.isEmpty()) {</div><div class='ctx'>         //just the pwd</div><div class='del'>-        DWORD size = 0;</div><div class='del'>-        wchar_t currentName[PATH_MAX];</div><div class='del'>-        size = ::GetCurrentDirectory(PATH_MAX, currentName);</div><div class='del'>-        if (size != 0) {</div><div class='del'>-            if (size &gt; PATH_MAX) {</div><div class='del'>-                wchar_t *newCurrentName = new wchar_t[size];</div><div class='del'>-                if (::GetCurrentDirectory(PATH_MAX, newCurrentName) != 0)</div><div class='del'>-                    ret = QString::fromWCharArray(newCurrentName);</div><div class='del'>-                delete [] newCurrentName;</div><div class='del'>-            } else {</div><div class='del'>-                ret = QString::fromWCharArray(currentName);</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='add'>+        ret = QFileSystemEngine::currentPath().filePath();</div><div class='ctx'>     }</div><div class='ctx'>     if (ret.length() &gt;= 2 &amp;&amp; ret[1] == QLatin1Char(':'))</div><div class='ctx'>         ret[0] = ret.at(0).toUpper(); // Force uppercase drive letters.</div><div class='del'>-    return QDir::fromNativeSeparators(ret);</div><div class='add'>+    return ret;</div><div class='ctx'> #else</div><div class='ctx'>     Q_UNUSED(fileName);</div><div class='del'>-    if (qfsPrivateCurrentDir.isEmpty())</div><div class='del'>-        qfsPrivateCurrentDir = QCoreApplication::applicationDirPath();</div><div class='del'>-</div><div class='del'>-    return QDir::fromNativeSeparators(qfsPrivateCurrentDir);</div><div class='add'>+    return QFileSystemEngine::currentPath();</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QString QFSFileEngine::homePath()</div><div class='ctx'> {</div><div class='del'>-    QString ret;</div><div class='del'>-#if !defined(QT_NO_LIBRARY)</div><div class='del'>-    QFSFileEnginePrivate::resolveLibs();</div><div class='del'>-    if (ptrGetUserProfileDirectoryW) {</div><div class='del'>-        HANDLE hnd = ::GetCurrentProcess();</div><div class='del'>-        HANDLE token = 0;</div><div class='del'>-        BOOL ok = ::OpenProcessToken(hnd, TOKEN_QUERY, &amp;token);</div><div class='del'>-        if (ok) {</div><div class='del'>-            DWORD dwBufferSize = 0;</div><div class='del'>-            // First call, to determine size of the strings (with '\0').</div><div class='del'>-            ok = ptrGetUserProfileDirectoryW(token, NULL, &amp;dwBufferSize);</div><div class='del'>-            if (!ok &amp;&amp; dwBufferSize != 0) {        // We got the required buffer size</div><div class='del'>-                wchar_t *userDirectory = new wchar_t[dwBufferSize];</div><div class='del'>-                // Second call, now we can fill the allocated buffer.</div><div class='del'>-                ok = ptrGetUserProfileDirectoryW(token, userDirectory, &amp;dwBufferSize);</div><div class='del'>-                if (ok)</div><div class='del'>-                    ret = QString::fromWCharArray(userDirectory);</div><div class='del'>-</div><div class='del'>-                delete [] userDirectory;</div><div class='del'>-            }</div><div class='del'>-            ::CloseHandle(token);</div><div class='del'>-        }</div><div class='del'>-                }</div><div class='del'>-#endif</div><div class='del'>-    if (ret.isEmpty() || !QFile::exists(ret)) {</div><div class='del'>-        ret = QString::fromLocal8Bit(qgetenv("USERPROFILE").constData());</div><div class='del'>-        if (ret.isEmpty() || !QFile::exists(ret)) {</div><div class='del'>-            ret = QString::fromLocal8Bit(qgetenv("HOMEDRIVE").constData()) + QString::fromLocal8Bit(qgetenv("HOMEPATH").constData());</div><div class='del'>-            if (ret.isEmpty() || !QFile::exists(ret)) {</div><div class='del'>-                ret = QString::fromLocal8Bit(qgetenv("HOME").constData());</div><div class='del'>-                if (ret.isEmpty() || !QFile::exists(ret)) {</div><div class='del'>-#if defined(Q_OS_WINCE)</div><div class='del'>-                    ret = QLatin1String("\\My Documents");</div><div class='del'>-                    if (!QFile::exists(ret))</div><div class='del'>-#endif</div><div class='del'>-                    ret = rootPath();</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    return QDir::fromNativeSeparators(ret);</div><div class='add'>+    return QFileSystemEngine::homePath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QString QFSFileEngine::rootPath()</div><div class='ctx'> {</div><div class='del'>-#if defined(Q_OS_WINCE)</div><div class='del'>-    QString ret = QLatin1String("/");</div><div class='del'>-#elif defined(Q_FS_FAT)</div><div class='del'>-    QString ret = QString::fromLatin1(qgetenv("SystemDrive").constData());</div><div class='del'>-    if (ret.isEmpty())</div><div class='del'>-        ret = QLatin1String("c:");</div><div class='del'>-    ret.append(QLatin1Char('/'));</div><div class='del'>-#elif defined(Q_OS_OS2EMX)</div><div class='del'>-    char dir[4];</div><div class='del'>-    _abspath(dir, QLatin1String("/"), _MAX_PATH);</div><div class='del'>-    QString ret(dir);</div><div class='del'>-#endif</div><div class='del'>-    return ret;</div><div class='add'>+    return QFileSystemEngine::rootPath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QString QFSFileEngine::tempPath()</div><div class='ctx'> {</div><div class='del'>-    QString ret;</div><div class='del'>-    {</div><div class='del'>-        wchar_t tempPath[MAX_PATH];</div><div class='del'>-        if (GetTempPath(MAX_PATH, tempPath))</div><div class='del'>-            ret = QString::fromWCharArray(tempPath);</div><div class='del'>-        if (!ret.isEmpty()) {</div><div class='del'>-            while (ret.endsWith(QLatin1Char('\\')))</div><div class='del'>-                ret.chop(1);</div><div class='del'>-            ret = QDir::fromNativeSeparators(ret);</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    if (ret.isEmpty()) {</div><div class='del'>-#if !defined(Q_OS_WINCE)</div><div class='del'>-        ret = QLatin1String("c:/tmp");</div><div class='del'>-#else</div><div class='del'>-        ret = QLatin1String("/Temp");</div><div class='del'>-#endif</div><div class='del'>-    }</div><div class='del'>-    return ret;</div><div class='add'>+    return QFileSystemEngine::tempPath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QFileInfoList QFSFileEngine::drives()</div><div class='hunk'>@@ -1154,213 +596,25 @@ QFileInfoList QFSFileEngine::drives()</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool QFSFileEnginePrivate::doStat() const</div><div class='add'>+bool QFSFileEnginePrivate::doStat(QFileSystemMetaData::MetaDataFlags flags) const</div><div class='ctx'> {</div><div class='del'>-    if (!tried_stat) {</div><div class='add'>+    if (!tried_stat || !metaData.hasFlags(flags)) {</div><div class='ctx'>         tried_stat = true;</div><div class='del'>-        could_stat = false;</div><div class='del'>-</div><div class='del'>-        if (filePath.isEmpty())</div><div class='del'>-            return could_stat;</div><div class='ctx'> </div><div class='del'>-        QString fname;</div><div class='del'>-        if(filePath.endsWith(QLatin1String(".lnk"))) {</div><div class='del'>-            fname = readLink(filePath);</div><div class='del'>-            if(fname.isEmpty())</div><div class='del'>-                return could_stat;</div><div class='del'>-        }</div><div class='del'>-        else</div><div class='del'>-            fname = filePath;</div><div class='del'>-</div><div class='del'>-        fname = fixIfRelativeUncPath(fname);</div><div class='del'>-</div><div class='del'>-        UINT oldmode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);</div><div class='del'>-</div><div class='del'>-        if (fd != -1) {</div><div class='ctx'> #if !defined(Q_OS_WINCE)</div><div class='del'>-            HANDLE fh = (HANDLE)_get_osfhandle(fd);</div><div class='del'>-            if (fh != INVALID_HANDLE_VALUE) {</div><div class='del'>-                BY_HANDLE_FILE_INFORMATION fileInfo;</div><div class='del'>-                if (GetFileInformationByHandle(fh, &amp;fileInfo)) {</div><div class='del'>-                    could_stat = true;</div><div class='del'>-                    fileAttrib = fileInfo.dwFileAttributes;</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-#else</div><div class='del'>-            DWORD tmpAttributes = GetFileAttributes((wchar_t*)QFSFileEnginePrivate::longFileName(fname).utf16());</div><div class='del'>-            if (tmpAttributes != -1) {</div><div class='del'>-                fileAttrib = tmpAttributes;</div><div class='del'>-                could_stat = true;</div><div class='del'>-            }</div><div class='add'>+        int localFd = fd;</div><div class='add'>+        if (fh &amp;&amp; fileEntry.isEmpty())</div><div class='add'>+            localFd = QT_FILENO(fh);</div><div class='add'>+        if (localFd != -1)</div><div class='add'>+            QFileSystemEngine::fillMetaData(localFd, metaData, flags);</div><div class='ctx'> #endif</div><div class='del'>-        } else {</div><div class='del'>-            fileAttrib = GetFileAttributes((wchar_t*)QFSFileEnginePrivate::longFileName(fname).utf16());</div><div class='del'>-            if (fileAttrib == INVALID_FILE_ATTRIBUTES) {</div><div class='del'>-                int errorCode = GetLastError();</div><div class='del'>-                if (errorCode == ERROR_ACCESS_DENIED || errorCode == ERROR_SHARING_VIOLATION) {</div><div class='del'>-                    QString path = QDir::toNativeSeparators(fname);</div><div class='del'>-                    // path for the FindFirstFile should not end with a trailing slash</div><div class='del'>-                    while (path.endsWith(QLatin1Char('\\')))</div><div class='del'>-                        path.chop(1);</div><div class='del'>-</div><div class='del'>-                    // FindFirstFile can not handle drives</div><div class='del'>-                    if (!path.endsWith(QLatin1Char(':'))) {</div><div class='del'>-                        WIN32_FIND_DATA findData;</div><div class='del'>-                        HANDLE hFind = ::FindFirstFile((wchar_t*)QFSFileEnginePrivate::longFileName(path).utf16(),</div><div class='del'>-                                                       &amp;findData);</div><div class='del'>-                        if (hFind != INVALID_HANDLE_VALUE) {</div><div class='del'>-                            ::FindClose(hFind);</div><div class='del'>-                            fileAttrib = findData.dwFileAttributes;</div><div class='del'>-                        }</div><div class='del'>-                    }</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-            could_stat = fileAttrib != INVALID_FILE_ATTRIBUTES;</div><div class='del'>-            if (!could_stat) {</div><div class='del'>-#if !defined(Q_OS_WINCE)</div><div class='del'>-                if (isDriveRoot(fname)) {</div><div class='del'>-                    // a valid drive ??</div><div class='del'>-                    DWORD drivesBitmask = ::GetLogicalDrives();</div><div class='del'>-                    int drivebit = 1 &lt;&lt; (fname.at(0).toUpper().unicode() - QLatin1Char('A').unicode());</div><div class='del'>-                    if (drivesBitmask &amp; drivebit) {</div><div class='del'>-                        fileAttrib = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM;</div><div class='del'>-                        could_stat = true;</div><div class='del'>-                    }</div><div class='del'>-                } else {</div><div class='del'>-#endif</div><div class='del'>-                    QString path = QDir::toNativeSeparators(fname);</div><div class='del'>-                    bool is_dir = false;</div><div class='del'>-                    if (path.startsWith(QLatin1String("\\\\"))) {</div><div class='del'>-                        // UNC - stat doesn't work for all cases (Windows bug)</div><div class='del'>-                        int s = path.indexOf(path.at(0),2);</div><div class='del'>-                        if (s &gt; 0) {</div><div class='del'>-                            // "\\server\..."</div><div class='del'>-                            s = path.indexOf(path.at(0),s+1);</div><div class='del'>-                            if (s &gt; 0) {</div><div class='del'>-                                // "\\server\share\..."</div><div class='del'>-                                if (s == path.size() - 1) {</div><div class='del'>-                                    // "\\server\share\"</div><div class='del'>-                                    is_dir = true;</div><div class='del'>-                                } else {</div><div class='del'>-                                    // "\\server\share\notfound"</div><div class='del'>-                                }</div><div class='del'>-                            } else {</div><div class='del'>-                                // "\\server\share"</div><div class='del'>-                                is_dir = true;</div><div class='del'>-                            }</div><div class='del'>-                        } else {</div><div class='del'>-                            // "\\server"</div><div class='del'>-                            is_dir = true;</div><div class='del'>-                        }</div><div class='del'>-                    }</div><div class='del'>-                    if (is_dir &amp;&amp; uncShareExists(path)) {</div><div class='del'>-                        // looks like a UNC dir, is a dir.</div><div class='del'>-                        fileAttrib = FILE_ATTRIBUTE_DIRECTORY;</div><div class='del'>-                        could_stat = true;</div><div class='del'>-                    }</div><div class='del'>-#if !defined(Q_OS_WINCE)</div><div class='del'>-                }</div><div class='del'>-#endif</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        SetErrorMode(oldmode);</div><div class='add'>+        if (metaData.missingFlags(flags) &amp;&amp; !fileEntry.isEmpty())</div><div class='add'>+            QFileSystemEngine::fillMetaData(fileEntry, metaData, metaData.missingFlags(flags));</div><div class='ctx'>     }</div><div class='del'>-    return could_stat;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static QString readSymLink(const QString &amp;link)</div><div class='del'>-{</div><div class='del'>-    QString result;</div><div class='del'>-#if !defined(Q_OS_WINCE)</div><div class='del'>-    HANDLE handle = CreateFile((wchar_t*)QFSFileEnginePrivate::longFileName(link).utf16(),</div><div class='del'>-                               FILE_READ_EA,</div><div class='del'>-                               FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,</div><div class='del'>-                               0,</div><div class='del'>-                               OPEN_EXISTING,</div><div class='del'>-                               FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT,</div><div class='del'>-                               0);</div><div class='del'>-    if (handle != INVALID_HANDLE_VALUE) {</div><div class='del'>-        DWORD bufsize = MAXIMUM_REPARSE_DATA_BUFFER_SIZE;</div><div class='del'>-        REPARSE_DATA_BUFFER *rdb = (REPARSE_DATA_BUFFER*)qMalloc(bufsize);</div><div class='del'>-        DWORD retsize = 0;</div><div class='del'>-        if (::DeviceIoControl(handle, FSCTL_GET_REPARSE_POINT, 0, 0, rdb, bufsize, &amp;retsize, 0)) {</div><div class='del'>-            if (rdb-&gt;ReparseTag == IO_REPARSE_TAG_SYMLINK) {</div><div class='del'>-                int length = rdb-&gt;SymbolicLinkReparseBuffer.SubstituteNameLength / sizeof(wchar_t);</div><div class='del'>-                int offset = rdb-&gt;SymbolicLinkReparseBuffer.SubstituteNameOffset / sizeof(wchar_t);</div><div class='del'>-                const wchar_t* PathBuffer = &amp;rdb-&gt;SymbolicLinkReparseBuffer.PathBuffer[offset];</div><div class='del'>-                result = QString::fromWCharArray(PathBuffer, length);</div><div class='del'>-            }</div><div class='del'>-            // cut-off "//?/" and "/??/"</div><div class='del'>-            if (result.size() &gt; 4 &amp;&amp; result.at(0) == QLatin1Char('\\') &amp;&amp; result.at(2) == QLatin1Char('?') &amp;&amp; result.at(3) == QLatin1Char('\\'))</div><div class='del'>-                result = result.mid(4);</div><div class='del'>-        }</div><div class='del'>-        qFree(rdb);</div><div class='del'>-        CloseHandle(handle);</div><div class='del'>-    }</div><div class='del'>-#else</div><div class='del'>-    Q_UNUSED(link);</div><div class='del'>-#endif // Q_OS_WINCE</div><div class='del'>-    return result;</div><div class='add'>+    return metaData.exists();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static QString readLink(const QString &amp;link)</div><div class='del'>-{</div><div class='del'>-#if !defined(Q_OS_WINCE)</div><div class='del'>-#if !defined(QT_NO_LIBRARY) &amp;&amp; !defined(Q_CC_MWERKS)</div><div class='del'>-    QString ret;</div><div class='del'>-</div><div class='del'>-    bool neededCoInit = false;</div><div class='del'>-    IShellLink *psl;                            // pointer to IShellLink i/f</div><div class='del'>-    WIN32_FIND_DATA wfd;</div><div class='del'>-    wchar_t szGotPath[MAX_PATH];</div><div class='del'>-</div><div class='del'>-    // Get pointer to the IShellLink interface.</div><div class='del'>-    HRESULT hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, (LPVOID *)&amp;psl);</div><div class='del'>-</div><div class='del'>-    if (hres == CO_E_NOTINITIALIZED) { // COM was not initialized</div><div class='del'>-        neededCoInit = true;</div><div class='del'>-        CoInitialize(NULL);</div><div class='del'>-        hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,</div><div class='del'>-                                    IID_IShellLink, (LPVOID *)&amp;psl);</div><div class='del'>-    }</div><div class='del'>-    if (SUCCEEDED(hres)) {    // Get pointer to the IPersistFile interface.</div><div class='del'>-        IPersistFile *ppf;</div><div class='del'>-        hres = psl-&gt;QueryInterface(IID_IPersistFile, (LPVOID *)&amp;ppf);</div><div class='del'>-        if (SUCCEEDED(hres))  {</div><div class='del'>-            hres = ppf-&gt;Load((LPOLESTR)link.utf16(), STGM_READ);</div><div class='del'>-            //The original path of the link is retrieved. If the file/folder</div><div class='del'>-            //was moved, the return value still have the old path.</div><div class='del'>-            if (SUCCEEDED(hres)) {</div><div class='del'>-                if (psl-&gt;GetPath(szGotPath, MAX_PATH, &amp;wfd, SLGP_UNCPRIORITY) == NOERROR)</div><div class='del'>-                    ret = QString::fromWCharArray(szGotPath);</div><div class='del'>-            }</div><div class='del'>-            ppf-&gt;Release();</div><div class='del'>-        }</div><div class='del'>-        psl-&gt;Release();</div><div class='del'>-    }</div><div class='del'>-    if (neededCoInit)</div><div class='del'>-        CoUninitialize();</div><div class='del'>-</div><div class='del'>-    return ret;</div><div class='del'>-#else</div><div class='del'>-    Q_UNUSED(link);</div><div class='del'>-    return QString();</div><div class='del'>-#endif // QT_NO_LIBRARY</div><div class='del'>-#else</div><div class='del'>-    wchar_t target[MAX_PATH];</div><div class='del'>-    QString result;</div><div class='del'>-    if (SHGetShortcutTarget((wchar_t*)QFileInfo(link).absoluteFilePath().replace(QLatin1Char('/'),QLatin1Char('\\')).utf16(), target, MAX_PATH)) {</div><div class='del'>-        result = QString::fromWCharArray(target);</div><div class='del'>-        if (result.startsWith(QLatin1Char('"')))</div><div class='del'>-            result.remove(0,1);</div><div class='del'>-        if (result.endsWith(QLatin1Char('"')))</div><div class='del'>-            result.remove(result.size()-1,1);</div><div class='del'>-    }</div><div class='del'>-    return result;</div><div class='del'>-#endif // Q_OS_WINCE</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::link(const QString &amp;newName)</div><div class='ctx'> {</div><div class='hunk'>@@ -1425,191 +679,63 @@ bool QFSFileEngine::link(const QString &amp;newName)</div><div class='ctx'> #endif // Q_OS_WINCE</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-QAbstractFileEngine::FileFlags QFSFileEnginePrivate::getPermissions(QAbstractFileEngine::FileFlags type) const</div><div class='add'>+/*!</div><div class='add'>+    \reimp</div><div class='add'>+*/</div><div class='add'>+QAbstractFileEngine::FileFlags QFSFileEngine::fileFlags(QAbstractFileEngine::FileFlags type) const</div><div class='ctx'> {</div><div class='add'>+    Q_D(const QFSFileEngine);</div><div class='add'>+</div><div class='add'>+    if (type &amp; Refresh)</div><div class='add'>+        d-&gt;metaData.clear();</div><div class='add'>+</div><div class='ctx'>     QAbstractFileEngine::FileFlags ret = 0;</div><div class='ctx'> </div><div class='del'>-#if !defined(QT_NO_LIBRARY)</div><div class='del'>-    if((qt_ntfs_permission_lookup &gt; 0) &amp;&amp; (QSysInfo::WindowsVersion &amp; QSysInfo::WV_NT_based)) {</div><div class='del'>-        resolveLibs();</div><div class='del'>-        if(ptrGetNamedSecurityInfoW &amp;&amp; ptrBuildTrusteeWithSidW &amp;&amp; ptrGetEffectiveRightsFromAclW) {</div><div class='del'>-            enum { ReadMask = 0x00000001, WriteMask = 0x00000002, ExecMask = 0x00000020 };</div><div class='del'>-</div><div class='del'>-            QString fname = filePath.endsWith(QLatin1String(".lnk")) ? readLink(filePath) : filePath;</div><div class='del'>-            PSID pOwner = 0;</div><div class='del'>-            PSID pGroup = 0;</div><div class='del'>-            PACL pDacl;</div><div class='del'>-            PSECURITY_DESCRIPTOR pSD;</div><div class='del'>-            DWORD res = ptrGetNamedSecurityInfoW((wchar_t*)fname.utf16(), SE_FILE_OBJECT,</div><div class='del'>-                                                 OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION,</div><div class='del'>-                                                 &amp;pOwner, &amp;pGroup, &amp;pDacl, 0, &amp;pSD);</div><div class='del'>-            if(res == ERROR_SUCCESS) {</div><div class='del'>-                ACCESS_MASK access_mask;</div><div class='del'>-                TRUSTEE_W trustee;</div><div class='del'>-                if (type &amp; 0x0700) { // user</div><div class='del'>-                    if(ptrGetEffectiveRightsFromAclW(pDacl, &amp;currentUserTrusteeW, &amp;access_mask) != ERROR_SUCCESS)</div><div class='del'>-                        access_mask = (ACCESS_MASK)-1;</div><div class='del'>-                    if(access_mask &amp; ReadMask)</div><div class='del'>-                        ret |= QAbstractFileEngine::ReadUserPerm;</div><div class='del'>-                    if(access_mask &amp; WriteMask)</div><div class='del'>-                        ret |= QAbstractFileEngine::WriteUserPerm;</div><div class='del'>-                    if(access_mask &amp; ExecMask)</div><div class='del'>-                        ret |= QAbstractFileEngine::ExeUserPerm;</div><div class='del'>-                }</div><div class='del'>-                if (type &amp; 0x7000) { // owner</div><div class='del'>-                    ptrBuildTrusteeWithSidW(&amp;trustee, pOwner);</div><div class='del'>-                    if(ptrGetEffectiveRightsFromAclW(pDacl, &amp;trustee, &amp;access_mask) != ERROR_SUCCESS)</div><div class='del'>-                        access_mask = (ACCESS_MASK)-1;</div><div class='del'>-                    if(access_mask &amp; ReadMask)</div><div class='del'>-                        ret |= QAbstractFileEngine::ReadOwnerPerm;</div><div class='del'>-                    if(access_mask &amp; WriteMask)</div><div class='del'>-                        ret |= QAbstractFileEngine::WriteOwnerPerm;</div><div class='del'>-                    if(access_mask &amp; ExecMask)</div><div class='del'>-                        ret |= QAbstractFileEngine::ExeOwnerPerm;</div><div class='del'>-                }</div><div class='del'>-                if (type &amp; 0x0070) { // group</div><div class='del'>-                    ptrBuildTrusteeWithSidW(&amp;trustee, pGroup);</div><div class='del'>-                    if(ptrGetEffectiveRightsFromAclW(pDacl, &amp;trustee, &amp;access_mask) != ERROR_SUCCESS)</div><div class='del'>-                        access_mask = (ACCESS_MASK)-1;</div><div class='del'>-                    if(access_mask &amp; ReadMask)</div><div class='del'>-                        ret |= QAbstractFileEngine::ReadGroupPerm;</div><div class='del'>-                    if(access_mask &amp; WriteMask)</div><div class='del'>-                        ret |= QAbstractFileEngine::WriteGroupPerm;</div><div class='del'>-                    if(access_mask &amp; ExecMask)</div><div class='del'>-                        ret |= QAbstractFileEngine::ExeGroupPerm;</div><div class='del'>-                }</div><div class='del'>-                if (type &amp; 0x0007) { // other (world)</div><div class='del'>-                    if(ptrGetEffectiveRightsFromAclW(pDacl, &amp;worldTrusteeW, &amp;access_mask) != ERROR_SUCCESS)</div><div class='del'>-                        access_mask = (ACCESS_MASK)-1; // ###</div><div class='del'>-                    if(access_mask &amp; ReadMask)</div><div class='del'>-                        ret |= QAbstractFileEngine::ReadOtherPerm;</div><div class='del'>-                    if(access_mask &amp; WriteMask)</div><div class='del'>-                        ret |= QAbstractFileEngine::WriteOtherPerm;</div><div class='del'>-                    if(access_mask &amp; ExecMask)</div><div class='del'>-                        ret |= QAbstractFileEngine::ExeOtherPerm;</div><div class='del'>-                }</div><div class='del'>-                LocalFree(pSD);</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    } else</div><div class='del'>-#endif</div><div class='add'>+    if (type &amp; FlagsMask)</div><div class='add'>+        ret |= LocalDiskFlag;</div><div class='add'>+</div><div class='add'>+    bool exists;</div><div class='ctx'>     {</div><div class='del'>-        //### what to do with permissions if we don't use NTFS</div><div class='del'>-        // for now just add all permissions and what about exe missions ??</div><div class='del'>-        // also qt_ntfs_permission_lookup is now not set by default ... should it ?</div><div class='del'>-        ret |= QAbstractFileEngine::ReadOwnerPerm | QAbstractFileEngine::ReadGroupPerm</div><div class='del'>-             | QAbstractFileEngine::ReadOtherPerm;</div><div class='del'>-</div><div class='del'>-        if (!(fileAttrib &amp; FILE_ATTRIBUTE_READONLY)) {</div><div class='del'>-            ret |= QAbstractFileEngine::WriteOwnerPerm | QAbstractFileEngine::WriteGroupPerm</div><div class='del'>-                 | QAbstractFileEngine::WriteOtherPerm;</div><div class='del'>-        }</div><div class='add'>+        QFileSystemMetaData::MetaDataFlags queryFlags = 0;</div><div class='ctx'> </div><div class='del'>-        QString fname = filePath.endsWith(QLatin1String(".lnk")) ? readLink(filePath) : filePath;</div><div class='del'>-        QString ext = fname.right(4).toLower();</div><div class='del'>-        if ((fileAttrib &amp; FILE_ATTRIBUTE_DIRECTORY) ||</div><div class='del'>-            ext == QLatin1String(".exe") || ext == QLatin1String(".com") || ext == QLatin1String(".bat") ||</div><div class='del'>-            ext == QLatin1String(".pif") || ext == QLatin1String(".cmd")) {</div><div class='del'>-            ret |= QAbstractFileEngine::ExeOwnerPerm | QAbstractFileEngine::ExeGroupPerm</div><div class='del'>-                 | QAbstractFileEngine::ExeOtherPerm | QAbstractFileEngine::ExeUserPerm;</div><div class='del'>-        }</div><div class='add'>+        queryFlags |= QFileSystemMetaData::MetaDataFlags(uint(type))</div><div class='add'>+                &amp; QFileSystemMetaData::Permissions;</div><div class='ctx'> </div><div class='del'>-        // calculate user permissions</div><div class='del'>-        if (type &amp; QAbstractFileEngine::ReadUserPerm) {</div><div class='del'>-            if (::_waccess((wchar_t*)longFileName(fname).utf16(), R_OK) == 0)</div><div class='del'>-                ret |= QAbstractFileEngine::ReadUserPerm;</div><div class='del'>-        }</div><div class='del'>-        if (type &amp; QAbstractFileEngine::WriteUserPerm) {</div><div class='del'>-            if (::_waccess((wchar_t*)longFileName(fname).utf16(), W_OK) == 0)</div><div class='del'>-                ret |= QAbstractFileEngine::WriteUserPerm;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    return ret;</div><div class='del'>-}</div><div class='add'>+        // AliasType and BundleType are 0x0</div><div class='add'>+        if (type &amp; TypesMask)</div><div class='add'>+            queryFlags |= QFileSystemMetaData::AliasType</div><div class='add'>+                    | QFileSystemMetaData::LinkType</div><div class='add'>+                    | QFileSystemMetaData::FileType</div><div class='add'>+                    | QFileSystemMetaData::DirectoryType</div><div class='add'>+                    | QFileSystemMetaData::BundleType;</div><div class='ctx'> </div><div class='del'>-/*!</div><div class='del'>-    \internal</div><div class='del'>-*/</div><div class='del'>-bool QFSFileEnginePrivate::isSymlink() const</div><div class='del'>-{</div><div class='del'>-#if !defined(Q_OS_WINCE)</div><div class='del'>-    if (need_lstat) {</div><div class='del'>-        need_lstat = false;</div><div class='del'>-        is_link = false;</div><div class='del'>-</div><div class='del'>-        if (fileAttrib &amp; FILE_ATTRIBUTE_REPARSE_POINT) {</div><div class='del'>-            QString path = QDir::toNativeSeparators(filePath);</div><div class='del'>-            // path for the FindFirstFile should not end with a trailing slash</div><div class='del'>-            while (path.endsWith(QLatin1Char('\\')))</div><div class='del'>-                path.chop(1);</div><div class='del'>-</div><div class='del'>-            WIN32_FIND_DATA findData;</div><div class='del'>-            HANDLE hFind = ::FindFirstFile((wchar_t*)QFSFileEnginePrivate::longFileName(path).utf16(),</div><div class='del'>-                                           &amp;findData);</div><div class='del'>-            if (hFind != INVALID_HANDLE_VALUE) {</div><div class='del'>-                ::FindClose(hFind);</div><div class='del'>-                if ((findData.dwFileAttributes &amp; FILE_ATTRIBUTE_REPARSE_POINT)</div><div class='del'>-                    &amp;&amp; findData.dwReserved0 == IO_REPARSE_TAG_SYMLINK) {</div><div class='del'>-                    is_link = true;</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    return is_link;</div><div class='del'>-#else</div><div class='del'>-    return false;</div><div class='del'>-#endif // Q_OS_WINCE</div><div class='del'>-}</div><div class='add'>+        if (type &amp; FlagsMask)</div><div class='add'>+            queryFlags |= QFileSystemMetaData::HiddenAttribute</div><div class='add'>+                    | QFileSystemMetaData::ExistsAttribute;</div><div class='ctx'> </div><div class='del'>-/*!</div><div class='del'>-    \reimp</div><div class='del'>-*/</div><div class='del'>-QAbstractFileEngine::FileFlags QFSFileEngine::fileFlags(QAbstractFileEngine::FileFlags type) const</div><div class='del'>-{</div><div class='del'>-    Q_D(const QFSFileEngine);</div><div class='del'>-    QAbstractFileEngine::FileFlags ret = 0;</div><div class='del'>-    // Force a stat, so that we're guaranteed to get up-to-date results</div><div class='del'>-    if (type &amp; Refresh) {</div><div class='del'>-        d-&gt;tried_stat = 0;</div><div class='del'>-#if !defined(Q_OS_WINCE)</div><div class='del'>-        d-&gt;need_lstat = 1;</div><div class='del'>-#endif</div><div class='del'>-    }</div><div class='add'>+        queryFlags |= QFileSystemMetaData::LinkType;</div><div class='ctx'> </div><div class='del'>-    if (type &amp; PermsMask) {</div><div class='del'>-        if (d-&gt;doStat()) {</div><div class='del'>-            ret |= ExistsFlag;</div><div class='del'>-            ret |= d-&gt;getPermissions(type);</div><div class='del'>-        }</div><div class='add'>+        exists = d-&gt;doStat(queryFlags);</div><div class='ctx'>     }</div><div class='add'>+</div><div class='add'>+    if (exists &amp;&amp; (type &amp; PermsMask))</div><div class='add'>+        ret |= FileFlags(uint(d-&gt;metaData.permissions()));</div><div class='add'>+</div><div class='ctx'>     if (type &amp; TypesMask) {</div><div class='del'>-        if (d-&gt;filePath.endsWith(QLatin1String(".lnk"))) {</div><div class='add'>+        if ((type &amp; LinkType) &amp;&amp; d-&gt;metaData.isLegacyLink())</div><div class='ctx'>             ret |= LinkType;</div><div class='del'>-            QString l = readLink(d-&gt;filePath);</div><div class='del'>-            if (!l.isEmpty()) {</div><div class='del'>-                bool existed = false;</div><div class='del'>-                if (isDirPath(l, &amp;existed) &amp;&amp; existed)</div><div class='del'>-                    ret |= DirectoryType;</div><div class='del'>-                else if (existed)</div><div class='del'>-                    ret |= FileType;</div><div class='del'>-            }</div><div class='del'>-        } else if (d-&gt;doStat()) {</div><div class='del'>-            if ((type &amp; LinkType) &amp;&amp; d-&gt;isSymlink())</div><div class='del'>-                ret |= LinkType;</div><div class='del'>-            if (d-&gt;fileAttrib &amp; FILE_ATTRIBUTE_DIRECTORY) {</div><div class='del'>-                ret |= DirectoryType;</div><div class='del'>-            } else {</div><div class='del'>-                ret |= FileType;</div><div class='del'>-            }</div><div class='add'>+        if (d-&gt;metaData.isDirectory()) {</div><div class='add'>+            ret |= DirectoryType;</div><div class='add'>+        } else {</div><div class='add'>+            ret |= FileType;</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'>     if (type &amp; FlagsMask) {</div><div class='del'>-        ret |= LocalDiskFlag;</div><div class='del'>-        if (d-&gt;doStat()) {</div><div class='add'>+        if (d-&gt;metaData.exists()) {</div><div class='ctx'>             ret |= ExistsFlag;</div><div class='del'>-            if (d-&gt;filePath == QLatin1String("/") || isDriveRoot(d-&gt;filePath) || isUncRoot(d-&gt;filePath))</div><div class='add'>+            if (d-&gt;fileEntry.isRoot())</div><div class='ctx'>                 ret |= RootFlag;</div><div class='del'>-            else if (d-&gt;fileAttrib &amp; FILE_ATTRIBUTE_HIDDEN)</div><div class='add'>+            else if (d-&gt;metaData.isHidden())</div><div class='ctx'>                 ret |= HiddenFlag;</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='hunk'>@@ -1620,48 +746,28 @@ QString QFSFileEngine::fileName(FileName file) const</div><div class='ctx'> {</div><div class='ctx'>     Q_D(const QFSFileEngine);</div><div class='ctx'>     if (file == BaseName) {</div><div class='del'>-        int slash = d-&gt;filePath.lastIndexOf(QLatin1Char('/'));</div><div class='del'>-        if (slash == -1) {</div><div class='del'>-            int colon = d-&gt;filePath.lastIndexOf(QLatin1Char(':'));</div><div class='del'>-            if (colon != -1)</div><div class='del'>-                return d-&gt;filePath.mid(colon + 1);</div><div class='del'>-            return d-&gt;filePath;</div><div class='del'>-        }</div><div class='del'>-        return d-&gt;filePath.mid(slash + 1);</div><div class='add'>+        return d-&gt;fileEntry.fileName();</div><div class='ctx'>     } else if (file == PathName) {</div><div class='del'>-        if (!d-&gt;filePath.size())</div><div class='del'>-            return d-&gt;filePath;</div><div class='del'>-</div><div class='del'>-        int slash = d-&gt;filePath.lastIndexOf(QLatin1Char('/'));</div><div class='del'>-        if (slash == -1) {</div><div class='del'>-            if (d-&gt;filePath.length() &gt;= 2 &amp;&amp; d-&gt;filePath.at(1) == QLatin1Char(':'))</div><div class='del'>-                return d-&gt;filePath.left(2);</div><div class='del'>-            return QString(QLatin1Char('.'));</div><div class='del'>-        } else {</div><div class='del'>-            if (!slash)</div><div class='del'>-                return QString(QLatin1Char('/'));</div><div class='del'>-            if (slash == 2 &amp;&amp; d-&gt;filePath.length() &gt;= 2 &amp;&amp; d-&gt;filePath.at(1) == QLatin1Char(':'))</div><div class='del'>-                slash++;</div><div class='del'>-            return d-&gt;filePath.left(slash);</div><div class='del'>-        }</div><div class='add'>+        return d-&gt;fileEntry.path();</div><div class='ctx'>     } else if (file == AbsoluteName || file == AbsolutePathName) {</div><div class='ctx'>         QString ret;</div><div class='ctx'> </div><div class='ctx'>         if (!isRelativePath()) {</div><div class='ctx'> #if !defined(Q_OS_WINCE)</div><div class='del'>-            if ((d-&gt;filePath.size() &gt; 2 &amp;&amp; d-&gt;filePath.at(1) == QLatin1Char(':')</div><div class='del'>-                &amp;&amp; d-&gt;filePath.at(2) != QLatin1Char('/')) || // It's a drive-relative path, so Z:a.txt -&gt; Z:\currentpath\a.txt</div><div class='del'>-                d-&gt;filePath.startsWith(QLatin1Char('/'))    // It's a absolute path to the current drive, so \a.txt -&gt; Z:\a.txt</div><div class='del'>-                ) {</div><div class='del'>-                ret = QDir::fromNativeSeparators(nativeAbsoluteFilePath(d-&gt;filePath));</div><div class='del'>-            } else {</div><div class='del'>-                ret = d-&gt;filePath;</div><div class='add'>+            if (d-&gt;fileEntry.filePath().startsWith(QLatin1Char('/')) || // It's a absolute path to the current drive, so \a.txt -&gt; Z:\a.txt</div><div class='add'>+                d-&gt;fileEntry.filePath().size() == 2 ||                  // It's a drive letter that needs to get a working dir appended</div><div class='add'>+                (d-&gt;fileEntry.filePath().size() &gt; 2 &amp;&amp; d-&gt;fileEntry.filePath().at(2) != QLatin1Char('/')) || // It's a drive-relative path, so Z:a.txt -&gt; Z:\currentpath\a.txt</div><div class='add'>+                d-&gt;fileEntry.filePath().contains(QLatin1String("/../")) || d-&gt;fileEntry.filePath().contains(QLatin1String("/./")) ||</div><div class='add'>+                d-&gt;fileEntry.filePath().endsWith(QLatin1String("/..")) || d-&gt;fileEntry.filePath().endsWith(QLatin1String("/.")))</div><div class='add'>+            {</div><div class='add'>+                ret = QDir::fromNativeSeparators(QFileSystemEngine::nativeAbsoluteFilePath(d-&gt;fileEntry.filePath()));</div><div class='add'>+            } else</div><div class='add'>+#endif</div><div class='add'>+            {</div><div class='add'>+                ret = d-&gt;fileEntry.filePath();</div><div class='ctx'>             }</div><div class='del'>-#else</div><div class='del'>-            ret = d-&gt;filePath;</div><div class='del'>-#endif</div><div class='ctx'>         } else {</div><div class='del'>-            ret = QDir::cleanPath(QDir::currentPath() + QLatin1Char('/') + d-&gt;filePath);</div><div class='add'>+            ret = QDir::cleanPath(QDir::currentPath() + QLatin1Char('/') + d-&gt;fileEntry.filePath());</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         // The path should be absolute at this point.</div><div class='hunk'>@@ -1690,38 +796,24 @@ QString QFSFileEngine::fileName(FileName file) const</div><div class='ctx'>     } else if (file == CanonicalName || file == CanonicalPathName) {</div><div class='ctx'>         if (!(fileFlags(ExistsFlag) &amp; ExistsFlag))</div><div class='ctx'>             return QString();</div><div class='add'>+        QFileSystemEntry entry(QFileSystemEngine::canonicalName(QFileSystemEntry(fileName(AbsoluteName)), d-&gt;metaData));</div><div class='ctx'> </div><div class='del'>-        QString ret = QFSFileEnginePrivate::canonicalized(fileName(AbsoluteName));</div><div class='del'>-        if (!ret.isEmpty() &amp;&amp; file == CanonicalPathName) {</div><div class='del'>-            int slash = ret.lastIndexOf(QLatin1Char('/'));</div><div class='del'>-            if (slash == -1)</div><div class='del'>-                ret = QDir::currentPath();</div><div class='del'>-            else if (slash == 0)</div><div class='del'>-                ret = QString(QLatin1Char('/'));</div><div class='del'>-            ret = ret.left(slash);</div><div class='del'>-        }</div><div class='del'>-        return ret;</div><div class='add'>+        if (file == CanonicalPathName)</div><div class='add'>+            return entry.path();</div><div class='add'>+        return entry.filePath();</div><div class='ctx'>     } else if (file == LinkName) {</div><div class='del'>-        QString ret;</div><div class='del'>-        if (d-&gt;filePath.endsWith(QLatin1String(".lnk")))</div><div class='del'>-            ret = readLink(d-&gt;filePath);</div><div class='del'>-        else if (d-&gt;doStat() &amp;&amp; d-&gt;isSymlink())</div><div class='del'>-            ret = readSymLink(d-&gt;filePath);</div><div class='del'>-        return QDir::fromNativeSeparators(ret);</div><div class='add'>+        return QFileSystemEngine::getLinkTarget(d-&gt;fileEntry, d-&gt;metaData).filePath();</div><div class='ctx'>     } else if (file == BundleName) {</div><div class='ctx'>         return QString();</div><div class='ctx'>     }</div><div class='del'>-    return d-&gt;filePath;</div><div class='add'>+    return d-&gt;fileEntry.filePath();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::isRelativePath() const</div><div class='ctx'> {</div><div class='ctx'>     Q_D(const QFSFileEngine);</div><div class='ctx'>     // drive, e.g. "a:", or UNC root, e.q. "//"</div><div class='del'>-    return !(d-&gt;filePath.startsWith(QLatin1Char('/'))</div><div class='del'>-        || (d-&gt;filePath.length() &gt;= 2</div><div class='del'>-        &amp;&amp; ((d-&gt;filePath.at(0).isLetter() &amp;&amp; d-&gt;filePath.at(1) == QLatin1Char(':'))</div><div class='del'>-        || (d-&gt;filePath.at(0) == QLatin1Char('/') &amp;&amp; d-&gt;filePath.at(1) == QLatin1Char('/')))));</div><div class='add'>+    return d-&gt;fileEntry.isRelative();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> uint QFSFileEngine::ownerId(FileOwner /*own*/) const</div><div class='hunk'>@@ -1732,69 +824,17 @@ uint QFSFileEngine::ownerId(FileOwner /*own*/) const</div><div class='ctx'> </div><div class='ctx'> QString QFSFileEngine::owner(FileOwner own) const</div><div class='ctx'> {</div><div class='del'>-    QString name;</div><div class='del'>-#if !defined(QT_NO_LIBRARY)</div><div class='ctx'>     Q_D(const QFSFileEngine);</div><div class='del'>-    if((qt_ntfs_permission_lookup &gt; 0) &amp;&amp; (QSysInfo::WindowsVersion &amp; QSysInfo::WV_NT_based)) {</div><div class='del'>-        QFSFileEnginePrivate::resolveLibs();</div><div class='del'>-        if (ptrGetNamedSecurityInfoW &amp;&amp; ptrLookupAccountSidW) {</div><div class='del'>-            PSID pOwner = 0;</div><div class='del'>-            PSECURITY_DESCRIPTOR pSD;</div><div class='del'>-            if (ptrGetNamedSecurityInfoW((wchar_t*)d-&gt;filePath.utf16(), SE_FILE_OBJECT,</div><div class='del'>-                                         own == OwnerGroup ? GROUP_SECURITY_INFORMATION : OWNER_SECURITY_INFORMATION,</div><div class='del'>-                                         own == OwnerUser ? &amp;pOwner : 0, own == OwnerGroup ? &amp;pOwner : 0,</div><div class='del'>-                                         0, 0, &amp;pSD) == ERROR_SUCCESS) {</div><div class='del'>-                DWORD lowner = 64;</div><div class='del'>-                DWORD ldomain = 64;</div><div class='del'>-                QVarLengthArray&lt;wchar_t, 64&gt; owner(lowner);</div><div class='del'>-                QVarLengthArray&lt;wchar_t, 64&gt; domain(ldomain);</div><div class='del'>-                SID_NAME_USE use = SidTypeUnknown;</div><div class='del'>-                // First call, to determine size of the strings (with '\0').</div><div class='del'>-                if (!ptrLookupAccountSidW(NULL, pOwner, (LPWSTR)owner.data(), &amp;lowner,</div><div class='del'>-                                          (LPWSTR)domain.data(), &amp;ldomain, (SID_NAME_USE*)&amp;use)) {</div><div class='del'>-                    if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {</div><div class='del'>-                        if (lowner &gt; (DWORD)owner.size())</div><div class='del'>-                            owner.resize(lowner);</div><div class='del'>-                        if (ldomain &gt; (DWORD)domain.size())</div><div class='del'>-                            domain.resize(ldomain);</div><div class='del'>-                        // Second call, try on resized buf-s</div><div class='del'>-                        if (!ptrLookupAccountSidW(NULL, pOwner, (LPWSTR)owner.data(), &amp;lowner,</div><div class='del'>-                                                  (LPWSTR)domain.data(), &amp;ldomain, (SID_NAME_USE*)&amp;use)) {</div><div class='del'>-                            lowner = 0;</div><div class='del'>-                        }</div><div class='del'>-                    } else {</div><div class='del'>-                        lowner = 0;</div><div class='del'>-                    }</div><div class='del'>-                }</div><div class='del'>-                if (lowner != 0)</div><div class='del'>-                    name = QString::fromWCharArray(owner.data());</div><div class='del'>-                LocalFree(pSD);</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-#else</div><div class='del'>-    Q_UNUSED(own);</div><div class='del'>-#endif</div><div class='del'>-    return name;</div><div class='add'>+    return QFileSystemEngine::owner(d-&gt;fileEntry, own);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QFSFileEngine::setPermissions(uint perms)</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='del'>-    bool ret = false;</div><div class='del'>-    int mode = 0;</div><div class='del'>-</div><div class='del'>-    if (perms &amp; QFile::ReadOwner || perms &amp; QFile::ReadUser || perms &amp; QFile::ReadGroup || perms &amp; QFile::ReadOther)</div><div class='del'>-        mode |= _S_IREAD;</div><div class='del'>-    if (perms &amp; QFile::WriteOwner || perms &amp; QFile::WriteUser || perms &amp; QFile::WriteGroup || perms &amp; QFile::WriteOther)</div><div class='del'>-        mode |= _S_IWRITE;</div><div class='del'>-</div><div class='del'>-    if (mode == 0) // not supported</div><div class='del'>-        return false;</div><div class='del'>-</div><div class='del'>-    ret = ::_wchmod((wchar_t*)QFSFileEnginePrivate::longFileName(d-&gt;filePath).utf16(), mode) == 0;</div><div class='add'>+    QSystemError error;</div><div class='add'>+    bool ret = QFileSystemEngine::setPermissions(d-&gt;fileEntry, QFile::Permissions(perms), error);</div><div class='ctx'>     if (!ret)</div><div class='del'>-        setError(QFile::PermissionsError, qt_error_string(errno));</div><div class='add'>+        setError(QFile::PermissionsError, error.toString());</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1802,12 +842,16 @@ bool QFSFileEngine::setSize(qint64 size)</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='ctx'> </div><div class='del'>-    if (d-&gt;fileHandle != INVALID_HANDLE_VALUE || d-&gt;fd != -1) {</div><div class='add'>+    if (d-&gt;fileHandle != INVALID_HANDLE_VALUE || d-&gt;fd != -1 || d-&gt;fh) {</div><div class='ctx'>         // resize open file</div><div class='ctx'>         HANDLE fh = d-&gt;fileHandle;</div><div class='ctx'> #if !defined(Q_OS_WINCE)</div><div class='del'>-        if (fh == INVALID_HANDLE_VALUE)</div><div class='del'>-            fh = (HANDLE)_get_osfhandle(d-&gt;fd);</div><div class='add'>+        if (fh == INVALID_HANDLE_VALUE) {</div><div class='add'>+            if (d-&gt;fh)</div><div class='add'>+                fh = (HANDLE)_get_osfhandle(QT_FILENO(d-&gt;fh));</div><div class='add'>+            else</div><div class='add'>+                fh = (HANDLE)_get_osfhandle(d-&gt;fd);</div><div class='add'>+        }</div><div class='ctx'> #endif</div><div class='ctx'>         if (fh == INVALID_HANDLE_VALUE)</div><div class='ctx'>             return false;</div><div class='hunk'>@@ -1822,9 +866,9 @@ bool QFSFileEngine::setSize(qint64 size)</div><div class='ctx'>         return false;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    if (!d-&gt;nativeFilePath.isEmpty()) {</div><div class='add'>+    if (!d-&gt;fileEntry.isEmpty()) {</div><div class='ctx'>         // resize file on disk</div><div class='del'>-        QFile file(d-&gt;filePath);</div><div class='add'>+        QFile file(d-&gt;fileEntry.filePath());</div><div class='ctx'>         if (file.open(QFile::ReadWrite)) {</div><div class='ctx'>             bool ret = file.resize(size);</div><div class='ctx'>             if (!ret)</div><div class='hunk'>@@ -1836,94 +880,14 @@ bool QFSFileEngine::setSize(qint64 size)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static inline QDateTime fileTimeToQDateTime(const FILETIME *time)</div><div class='del'>-{</div><div class='del'>-    QDateTime ret;</div><div class='del'>-</div><div class='del'>-#if defined(Q_OS_WINCE)</div><div class='del'>-    SYSTEMTIME systime;</div><div class='del'>-    FILETIME ftime;</div><div class='del'>-    systime.wYear = 1970;</div><div class='del'>-    systime.wMonth = 1;</div><div class='del'>-    systime.wDay = 1;</div><div class='del'>-    systime.wHour = 0;</div><div class='del'>-    systime.wMinute = 0;</div><div class='del'>-    systime.wSecond = 0;</div><div class='del'>-    systime.wMilliseconds = 0;</div><div class='del'>-    systime.wDayOfWeek = 4;</div><div class='del'>-    SystemTimeToFileTime(&amp;systime, &amp;ftime);</div><div class='del'>-    unsigned __int64 acttime = (unsigned __int64)time-&gt;dwHighDateTime &lt;&lt; 32 | time-&gt;dwLowDateTime;</div><div class='del'>-    FileTimeToSystemTime(time, &amp;systime);</div><div class='del'>-    unsigned __int64 time1970 = (unsigned __int64)ftime.dwHighDateTime &lt;&lt; 32 | ftime.dwLowDateTime;</div><div class='del'>-    unsigned __int64 difftime = acttime - time1970;</div><div class='del'>-    difftime /= 10000000;</div><div class='del'>-    ret.setTime_t((unsigned int)difftime);</div><div class='del'>-#else</div><div class='del'>-    SYSTEMTIME sTime, lTime;</div><div class='del'>-    FileTimeToSystemTime(time, &amp;sTime);</div><div class='del'>-    SystemTimeToTzSpecificLocalTime(0, &amp;sTime, &amp;lTime);</div><div class='del'>-    ret.setDate(QDate(lTime.wYear, lTime.wMonth, lTime.wDay));</div><div class='del'>-    ret.setTime(QTime(lTime.wHour, lTime.wMinute, lTime.wSecond, lTime.wMilliseconds));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-    return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> QDateTime QFSFileEngine::fileTime(FileTime time) const</div><div class='ctx'> {</div><div class='ctx'>     Q_D(const QFSFileEngine);</div><div class='del'>-    QDateTime ret;</div><div class='del'>-    if (d-&gt;fd != -1) {</div><div class='del'>-#if !defined(Q_OS_WINCE)</div><div class='del'>-        HANDLE fh = (HANDLE)_get_osfhandle(d-&gt;fd);</div><div class='del'>-        if (fh != INVALID_HANDLE_VALUE) {</div><div class='del'>-            FILETIME creationTime, lastAccessTime, lastWriteTime;</div><div class='del'>-            if (GetFileTime(fh, &amp;creationTime, &amp;lastAccessTime, &amp;lastWriteTime)) {</div><div class='del'>-                if(time == CreationTime)</div><div class='del'>-                    ret = fileTimeToQDateTime(&amp;creationTime);</div><div class='del'>-                else if(time == ModificationTime)</div><div class='del'>-                    ret = fileTimeToQDateTime(&amp;lastWriteTime);</div><div class='del'>-                else if(time == AccessTime)</div><div class='del'>-                    ret = fileTimeToQDateTime(&amp;lastAccessTime);</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-#endif</div><div class='del'>-    } else {</div><div class='del'>-        WIN32_FILE_ATTRIBUTE_DATA attribData;</div><div class='del'>-        bool ok = ::GetFileAttributesEx((wchar_t*)QFSFileEnginePrivate::longFileName(d-&gt;filePath).utf16(), GetFileExInfoStandard, &amp;attribData);</div><div class='del'>-        if (!ok) {</div><div class='del'>-            int errorCode = GetLastError();</div><div class='del'>-            if (errorCode == ERROR_ACCESS_DENIED || errorCode == ERROR_SHARING_VIOLATION) {</div><div class='del'>-                QString path = QDir::toNativeSeparators(d-&gt;filePath);</div><div class='del'>-                // path for the FindFirstFile should not end with a trailing slash</div><div class='del'>-                while (path.endsWith(QLatin1Char('\\')))</div><div class='del'>-                    path.chop(1);</div><div class='del'>-</div><div class='del'>-                // FindFirstFile can not handle drives</div><div class='del'>-                if (!path.endsWith(QLatin1Char(':'))) {</div><div class='del'>-                    WIN32_FIND_DATA findData;</div><div class='del'>-                    HANDLE hFind = ::FindFirstFile((wchar_t*)QFSFileEnginePrivate::longFileName(path).utf16(),</div><div class='del'>-                                                   &amp;findData);</div><div class='del'>-                    if (hFind != INVALID_HANDLE_VALUE) {</div><div class='del'>-                        ::FindClose(hFind);</div><div class='del'>-                        ok = true;</div><div class='del'>-                        attribData.ftCreationTime = findData.ftCreationTime;</div><div class='del'>-                        attribData.ftLastWriteTime = findData.ftLastWriteTime;</div><div class='del'>-                        attribData.ftLastAccessTime = findData.ftLastAccessTime;</div><div class='del'>-                    }</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        if (ok) {</div><div class='del'>-            if(time == CreationTime)</div><div class='del'>-                ret = fileTimeToQDateTime(&amp;attribData.ftCreationTime);</div><div class='del'>-            else if(time == ModificationTime)</div><div class='del'>-                ret = fileTimeToQDateTime(&amp;attribData.ftLastWriteTime);</div><div class='del'>-            else if(time == AccessTime)</div><div class='del'>-                ret = fileTimeToQDateTime(&amp;attribData.ftLastAccessTime);</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    return ret;</div><div class='add'>+</div><div class='add'>+    if (d-&gt;doStat(QFileSystemMetaData::Times))</div><div class='add'>+        return d-&gt;metaData.fileTime(time);</div><div class='add'>+</div><div class='add'>+    return QDateTime();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size,</div><div class='hunk'>@@ -1952,7 +916,7 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size,</div><div class='ctx'> #ifdef Q_USE_DEPRECATED_MAP_API</div><div class='ctx'>         nativeClose();</div><div class='ctx'>         // handle automatically closed by kernel with mapHandle (below).</div><div class='del'>-        handle = ::CreateFileForMapping((const wchar_t*)nativeFilePath.constData(),</div><div class='add'>+        handle = ::CreateFileForMapping((const wchar_t*)fileEntry.nativeFilePath().utf16(),</div><div class='ctx'>                 GENERIC_READ | (openMode &amp; QIODevice::WriteOnly ? GENERIC_WRITE : 0),</div><div class='ctx'>                 0,</div><div class='ctx'>                 NULL,</div><div class='head'>diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp<br/>index c2af9f5..ea00cb4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qiodevice.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qiodevice.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qiodevice.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qiodevice.cpp</a></div><div class='hunk'>@@ -1637,6 +1637,12 @@ QString QIODevice::errorString() const</div><div class='ctx'>     This function is called by QIODevice. Reimplement this function</div><div class='ctx'>     when creating a subclass of QIODevice.</div><div class='ctx'> </div><div class='add'>+    When reimplementing this function it is important that this function</div><div class='add'>+    reads all the required data before returning. This is required in order</div><div class='add'>+    for QDataStream to be able to operate on the class. QDataStream assumes</div><div class='add'>+    all the requested information was read and therefore does not retry reading</div><div class='add'>+    if there was a problem.</div><div class='add'>+</div><div class='ctx'>     \sa read() readLine() writeData()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='hunk'>@@ -1649,6 +1655,12 @@ QString QIODevice::errorString() const</div><div class='ctx'>     This function is called by QIODevice. Reimplement this function</div><div class='ctx'>     when creating a subclass of QIODevice.</div><div class='ctx'> </div><div class='add'>+    When reimplementing this function it is important that this function</div><div class='add'>+    writes all the data available before returning. This is required in order</div><div class='add'>+    for QDataStream to be able to operate on the class. QDataStream assumes</div><div class='add'>+    all the information was written and therefore does not retry writing if</div><div class='add'>+    there was a problem.</div><div class='add'>+</div><div class='ctx'>     \sa read() write()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp b/src/corelib/io/qnoncontiguousbytedevice.cpp<br/>index 61d7773..5568920 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qnoncontiguousbytedevice.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qnoncontiguousbytedevice.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qnoncontiguousbytedevice.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qnoncontiguousbytedevice.cpp</a></div><div class='hunk'>@@ -153,6 +153,7 @@ void QNonContiguousByteDevice::disableReset()</div><div class='ctx'>     resetDisabled = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+// FIXME we should scrap this whole implementation and instead change the ByteArrayImpl to be able to cope with sub-arrays?</div><div class='ctx'> QNonContiguousByteDeviceBufferImpl::QNonContiguousByteDeviceBufferImpl(QBuffer *b) : QNonContiguousByteDevice()</div><div class='ctx'> {</div><div class='ctx'>     buffer = b;</div><div class='hunk'>@@ -244,7 +245,7 @@ qint64 QNonContiguousByteDeviceByteArrayImpl::size()</div><div class='ctx'>     return byteArray-&gt;size();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-QNonContiguousByteDeviceRingBufferImpl::QNonContiguousByteDeviceRingBufferImpl(QRingBuffer *rb)</div><div class='add'>+QNonContiguousByteDeviceRingBufferImpl::QNonContiguousByteDeviceRingBufferImpl(QSharedPointer&lt;QRingBuffer&gt; rb)</div><div class='ctx'>     : QNonContiguousByteDevice(), currentPosition(0)</div><div class='ctx'> {</div><div class='ctx'>     ringBuffer = rb;</div><div class='hunk'>@@ -355,6 +356,11 @@ bool QNonContiguousByteDeviceIoDeviceImpl::advanceReadPointer(qint64 amount)</div><div class='ctx'>     // normal advancement</div><div class='ctx'>     currentReadBufferPosition += amount;</div><div class='ctx'> </div><div class='add'>+    if (size() == -1)</div><div class='add'>+        emit readProgress(totalAdvancements, totalAdvancements);</div><div class='add'>+    else</div><div class='add'>+        emit readProgress(totalAdvancements, size());</div><div class='add'>+</div><div class='ctx'>     // advancing over that what has actually been read before</div><div class='ctx'>     if (currentReadBufferPosition &gt; currentReadBufferAmount) {</div><div class='ctx'>         qint64 i = currentReadBufferPosition - currentReadBufferAmount;</div><div class='hunk'>@@ -370,10 +376,6 @@ bool QNonContiguousByteDeviceIoDeviceImpl::advanceReadPointer(qint64 amount)</div><div class='ctx'>         currentReadBufferAmount = 0;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    if (size() == -1)</div><div class='del'>-        emit readProgress(totalAdvancements, totalAdvancements);</div><div class='del'>-    else</div><div class='del'>-        emit readProgress(totalAdvancements, size());</div><div class='ctx'> </div><div class='ctx'>     return true;</div><div class='ctx'> }</div><div class='hunk'>@@ -505,7 +507,7 @@ QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QIODevice *dev</div><div class='ctx'> </div><div class='ctx'>     \internal</div><div class='ctx'> */</div><div class='del'>-QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QRingBuffer *ringBuffer)</div><div class='add'>+QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QSharedPointer&lt;QRingBuffer&gt; ringBuffer)</div><div class='ctx'> {</div><div class='ctx'>     return new QNonContiguousByteDeviceRingBufferImpl(ringBuffer);</div><div class='ctx'> }</div><div class='head'>diff --git a/src/corelib/io/qnoncontiguousbytedevice_p.h b/src/corelib/io/qnoncontiguousbytedevice_p.h<br/>index 44bf5a3..c7c9424 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qnoncontiguousbytedevice_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qnoncontiguousbytedevice_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qnoncontiguousbytedevice_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qnoncontiguousbytedevice_p.h</a></div><div class='hunk'>@@ -57,6 +57,7 @@</div><div class='ctx'> #include &lt;QtCore/qbytearray.h&gt;</div><div class='ctx'> #include &lt;QtCore/qbuffer.h&gt;</div><div class='ctx'> #include &lt;QtCore/qiodevice.h&gt;</div><div class='add'>+#include &lt;QtCore/QSharedPointer&gt;</div><div class='ctx'> #include "private/qringbuffer_p.h"</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='hunk'>@@ -70,6 +71,7 @@ public:</div><div class='ctx'>     virtual bool atEnd() = 0;</div><div class='ctx'>     virtual bool reset() = 0;</div><div class='ctx'>     void disableReset();</div><div class='add'>+    bool isResetDisabled() { return resetDisabled; }</div><div class='ctx'>     virtual qint64 size() = 0;</div><div class='ctx'> </div><div class='ctx'>     virtual ~QNonContiguousByteDevice();</div><div class='hunk'>@@ -89,7 +91,7 @@ class Q_CORE_EXPORT QNonContiguousByteDeviceFactory</div><div class='ctx'> public:</div><div class='ctx'>     static QNonContiguousByteDevice* create(QIODevice *device);</div><div class='ctx'>     static QNonContiguousByteDevice* create(QByteArray *byteArray);</div><div class='del'>-    static QNonContiguousByteDevice* create(QRingBuffer *ringBuffer);</div><div class='add'>+    static QNonContiguousByteDevice* create(QSharedPointer&lt;QRingBuffer&gt; ringBuffer);</div><div class='ctx'>     static QIODevice* wrap(QNonContiguousByteDevice* byteDevice);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -114,7 +116,7 @@ protected:</div><div class='ctx'> class QNonContiguousByteDeviceRingBufferImpl : public QNonContiguousByteDevice</div><div class='ctx'> {</div><div class='ctx'> public:</div><div class='del'>-    QNonContiguousByteDeviceRingBufferImpl(QRingBuffer *rb);</div><div class='add'>+    QNonContiguousByteDeviceRingBufferImpl(QSharedPointer&lt;QRingBuffer&gt; rb);</div><div class='ctx'>     ~QNonContiguousByteDeviceRingBufferImpl();</div><div class='ctx'>     const char* readPointer(qint64 maximumLength, qint64 &amp;len);</div><div class='ctx'>     bool advanceReadPointer(qint64 amount);</div><div class='hunk'>@@ -122,13 +124,14 @@ public:</div><div class='ctx'>     bool reset();</div><div class='ctx'>     qint64 size();</div><div class='ctx'> protected:</div><div class='del'>-    QRingBuffer* ringBuffer;</div><div class='add'>+    QSharedPointer&lt;QRingBuffer&gt; ringBuffer;</div><div class='ctx'>     qint64 currentPosition;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> class QNonContiguousByteDeviceIoDeviceImpl : public QNonContiguousByteDevice</div><div class='ctx'> {</div><div class='add'>+    Q_OBJECT</div><div class='ctx'> public:</div><div class='ctx'>     QNonContiguousByteDeviceIoDeviceImpl(QIODevice *d);</div><div class='ctx'>     ~QNonContiguousByteDeviceIoDeviceImpl();</div><div class='hunk'>@@ -150,6 +153,7 @@ protected:</div><div class='ctx'> </div><div class='ctx'> class QNonContiguousByteDeviceBufferImpl : public QNonContiguousByteDevice</div><div class='ctx'> {</div><div class='add'>+    Q_OBJECT</div><div class='ctx'> public:</div><div class='ctx'>     QNonContiguousByteDeviceBufferImpl(QBuffer *b);</div><div class='ctx'>     ~QNonContiguousByteDeviceBufferImpl();</div><div class='head'>diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp<br/>index eb16b71..70a70c2 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qprocess.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qprocess.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qprocess.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qprocess.cpp</a></div><div class='hunk'>@@ -143,55 +143,13 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='ctx'>     \sa QProcess, QProcess::systemEnvironment(), QProcess::setProcessEnvironment()</div><div class='ctx'> */</div><div class='del'>-#ifdef Q_OS_WIN</div><div class='del'>-static inline QProcessEnvironmentPrivate::Unit prepareName(const QString &amp;name)</div><div class='del'>-{ return name.toUpper(); }</div><div class='del'>-static inline QProcessEnvironmentPrivate::Unit prepareName(const QByteArray &amp;name)</div><div class='del'>-{ return QString::fromLocal8Bit(name).toUpper(); }</div><div class='del'>-static inline QString nameToString(const QProcessEnvironmentPrivate::Unit &amp;name)</div><div class='del'>-{ return name; }</div><div class='del'>-static inline QProcessEnvironmentPrivate::Unit prepareValue(const QString &amp;value)</div><div class='del'>-{ return value; }</div><div class='del'>-static inline QProcessEnvironmentPrivate::Unit prepareValue(const QByteArray &amp;value)</div><div class='del'>-{ return QString::fromLocal8Bit(value); }</div><div class='del'>-static inline QString valueToString(const QProcessEnvironmentPrivate::Unit &amp;value)</div><div class='del'>-{ return value; }</div><div class='del'>-static inline QByteArray valueToByteArray(const QProcessEnvironmentPrivate::Unit &amp;value)</div><div class='del'>-{ return value.toLocal8Bit(); }</div><div class='del'>-#else</div><div class='del'>-static inline QProcessEnvironmentPrivate::Unit prepareName(const QByteArray &amp;name)</div><div class='del'>-{ return name; }</div><div class='del'>-static inline QProcessEnvironmentPrivate::Unit prepareName(const QString &amp;name)</div><div class='del'>-{ return name.toLocal8Bit(); }</div><div class='del'>-static inline QString nameToString(const QProcessEnvironmentPrivate::Unit &amp;name)</div><div class='del'>-{ return QString::fromLocal8Bit(name); }</div><div class='del'>-static inline QProcessEnvironmentPrivate::Unit prepareValue(const QByteArray &amp;value)</div><div class='del'>-{ return value; }</div><div class='del'>-static inline QProcessEnvironmentPrivate::Unit prepareValue(const QString &amp;value)</div><div class='del'>-{ return value.toLocal8Bit(); }</div><div class='del'>-static inline QString valueToString(const QProcessEnvironmentPrivate::Unit &amp;value)</div><div class='del'>-{ return QString::fromLocal8Bit(value); }</div><div class='del'>-static inline QByteArray valueToByteArray(const QProcessEnvironmentPrivate::Unit &amp;value)</div><div class='del'>-{ return value; }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-template&lt;&gt; void QSharedDataPointer&lt;QProcessEnvironmentPrivate&gt;::detach()</div><div class='del'>-{</div><div class='del'>-    if (d &amp;&amp; d-&gt;ref == 1)</div><div class='del'>-        return;</div><div class='del'>-    QProcessEnvironmentPrivate *x = (d ? new QProcessEnvironmentPrivate(*d)</div><div class='del'>-                                     : new QProcessEnvironmentPrivate);</div><div class='del'>-    x-&gt;ref.ref();</div><div class='del'>-    if (d &amp;&amp; !d-&gt;ref.deref())</div><div class='del'>-        delete d;</div><div class='del'>-    d = x;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> QStringList QProcessEnvironmentPrivate::toList() const</div><div class='ctx'> {</div><div class='ctx'>     QStringList result;</div><div class='del'>-    QHash&lt;Unit, Unit&gt;::ConstIterator it = hash.constBegin(),</div><div class='del'>-                                    end = hash.constEnd();</div><div class='add'>+    result.reserve(hash.size());</div><div class='add'>+    Hash::ConstIterator it = hash.constBegin(),</div><div class='add'>+                       end = hash.constEnd();</div><div class='ctx'>     for ( ; it != end; ++it) {</div><div class='ctx'>         QString data = nameToString(it.key());</div><div class='ctx'>         QString value = valueToString(it.value());</div><div class='hunk'>@@ -221,6 +179,32 @@ QProcessEnvironment QProcessEnvironmentPrivate::fromList(const QStringList &amp;list</div><div class='ctx'>     return env;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+QStringList QProcessEnvironmentPrivate::keys() const</div><div class='add'>+{</div><div class='add'>+    QStringList result;</div><div class='add'>+    result.reserve(hash.size());</div><div class='add'>+    Hash::ConstIterator it = hash.constBegin(),</div><div class='add'>+                       end = hash.constEnd();</div><div class='add'>+    for ( ; it != end; ++it)</div><div class='add'>+        result &lt;&lt; nameToString(it.key());</div><div class='add'>+    return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QProcessEnvironmentPrivate::insert(const QProcessEnvironmentPrivate &amp;other)</div><div class='add'>+{</div><div class='add'>+    Hash::ConstIterator it = other.hash.constBegin(),</div><div class='add'>+                       end = other.hash.constEnd();</div><div class='add'>+    for ( ; it != end; ++it)</div><div class='add'>+        hash.insert(it.key(), it.value());</div><div class='add'>+</div><div class='add'>+#ifdef Q_OS_UNIX</div><div class='add'>+    QHash&lt;QString, Key&gt;::ConstIterator nit = other.nameMap.constBegin(),</div><div class='add'>+                                      nend = other.nameMap.constEnd();</div><div class='add'>+    for ( ; nit != nend; ++nit)</div><div class='add'>+        nameMap.insert(nit.key(), nit.value());</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*!</div><div class='ctx'>     Creates a new QProcessEnvironment object. This constructor creates an</div><div class='ctx'>     empty environment. If set on a QProcess, this will cause the current</div><div class='hunk'>@@ -299,6 +283,8 @@ void QProcessEnvironment::clear()</div><div class='ctx'> {</div><div class='ctx'>     if (d)</div><div class='ctx'>         d-&gt;hash.clear();</div><div class='add'>+    // Unix: Don't clear d-&gt;nameMap, as the environment is likely to be</div><div class='add'>+    // re-populated with the same keys again.</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -313,7 +299,7 @@ void QProcessEnvironment::clear()</div><div class='ctx'> */</div><div class='ctx'> bool QProcessEnvironment::contains(const QString &amp;name) const</div><div class='ctx'> {</div><div class='del'>-    return d ? d-&gt;hash.contains(prepareName(name)) : false;</div><div class='add'>+    return d ? d-&gt;hash.contains(d-&gt;prepareName(name)) : false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -335,7 +321,7 @@ bool QProcessEnvironment::contains(const QString &amp;name) const</div><div class='ctx'> void QProcessEnvironment::insert(const QString &amp;name, const QString &amp;value)</div><div class='ctx'> {</div><div class='ctx'>     // d detaches from null</div><div class='del'>-    d-&gt;hash.insert(prepareName(name), prepareValue(value));</div><div class='add'>+    d-&gt;hash.insert(d-&gt;prepareName(name), d-&gt;prepareValue(value));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -352,7 +338,7 @@ void QProcessEnvironment::insert(const QString &amp;name, const QString &amp;value)</div><div class='ctx'> void QProcessEnvironment::remove(const QString &amp;name)</div><div class='ctx'> {</div><div class='ctx'>     if (d)</div><div class='del'>-        d-&gt;hash.remove(prepareName(name));</div><div class='add'>+        d-&gt;hash.remove(d-&gt;prepareName(name));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -371,11 +357,11 @@ QString QProcessEnvironment::value(const QString &amp;name, const QString &amp;defaultVa</div><div class='ctx'>     if (!d)</div><div class='ctx'>         return defaultValue;</div><div class='ctx'> </div><div class='del'>-    QProcessEnvironmentPrivate::Hash::ConstIterator it = d-&gt;hash.constFind(prepareName(name));</div><div class='add'>+    QProcessEnvironmentPrivate::Hash::ConstIterator it = d-&gt;hash.constFind(d-&gt;prepareName(name));</div><div class='ctx'>     if (it == d-&gt;hash.constEnd())</div><div class='ctx'>         return defaultValue;</div><div class='ctx'> </div><div class='del'>-    return valueToString(it.value());</div><div class='add'>+    return d-&gt;valueToString(it.value());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -396,6 +382,33 @@ QStringList QProcessEnvironment::toStringList() const</div><div class='ctx'>     return d ? d-&gt;toList() : QStringList();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns a list containing all the variable names in this QProcessEnvironment</div><div class='add'>+    object.</div><div class='add'>+*/</div><div class='add'>+QStringList QProcessEnvironment::keys() const</div><div class='add'>+{</div><div class='add'>+    return d ? d-&gt;keys() : QStringList();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \overload</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Inserts the contents of \a e in this QProcessEnvironment object. Variables in</div><div class='add'>+    this object that also exist in \a e will be overwritten.</div><div class='add'>+*/</div><div class='add'>+void QProcessEnvironment::insert(const QProcessEnvironment &amp;e)</div><div class='add'>+{</div><div class='add'>+    if (!e.d)</div><div class='add'>+        return;</div><div class='add'>+</div><div class='add'>+    // d detaches from null</div><div class='add'>+    d-&gt;insert(*e.d);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void QProcessPrivate::Channel::clear()</div><div class='ctx'> {</div><div class='ctx'>     switch (type) {</div><div class='hunk'>@@ -963,9 +976,6 @@ bool QProcessPrivate::_q_canWrite()</div><div class='ctx'>         destroyPipe(stdinChannel.pipe);</div><div class='ctx'>         processError = QProcess::WriteError;</div><div class='ctx'>         q-&gt;setErrorString(QProcess::tr("Error writing to process"));</div><div class='del'>-#if defined(QPROCESS_DEBUG) &amp;&amp; !defined(Q_OS_WINCE)</div><div class='del'>-        qDebug("QProcessPrivate::canWrite(), failed to write (%s)", strerror(errno));</div><div class='del'>-#endif</div><div class='ctx'>         emit q-&gt;error(processError);</div><div class='ctx'>         return false;</div><div class='ctx'>     }</div><div class='hunk'>@@ -974,11 +984,13 @@ bool QProcessPrivate::_q_canWrite()</div><div class='ctx'>     qDebug("QProcessPrivate::canWrite(), wrote %d bytes to the process input", int(written));</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-    writeBuffer.free(written);</div><div class='del'>-    if (!emittedBytesWritten) {</div><div class='del'>-        emittedBytesWritten = true;</div><div class='del'>-        emit q-&gt;bytesWritten(written);</div><div class='del'>-        emittedBytesWritten = false;</div><div class='add'>+    if (written != 0) {</div><div class='add'>+        writeBuffer.free(written);</div><div class='add'>+        if (!emittedBytesWritten) {</div><div class='add'>+            emittedBytesWritten = true;</div><div class='add'>+            emit q-&gt;bytesWritten(written);</div><div class='add'>+            emittedBytesWritten = false;</div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='ctx'>     if (stdinChannel.notifier &amp;&amp; !writeBuffer.isEmpty())</div><div class='ctx'>         stdinChannel.notifier-&gt;setEnabled(true);</div><div class='hunk'>@@ -2083,6 +2095,9 @@ void QProcess::terminate()</div><div class='ctx'>     On Symbian, this function requires platform security capability</div><div class='ctx'>     \c PowerMgmt. If absent, the process will panic with KERN-EXEC 46.</div><div class='ctx'> </div><div class='add'>+    \note Killing running processes from other processes will typically</div><div class='add'>+    cause a panic in Symbian due to platform security.</div><div class='add'>+</div><div class='ctx'>     \sa {Symbian Platform Security Requirements}</div><div class='ctx'>     \sa terminate()</div><div class='ctx'> */</div><div class='hunk'>@@ -2233,10 +2248,10 @@ bool QProcess::startDetached(const QString &amp;program)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_INCLUDE_NAMESPACE</div><div class='del'>-#ifdef Q_OS_MAC</div><div class='add'>+#if defined(Q_OS_MAC) &amp;&amp; !defined(QT_NO_CORESERVICES)</div><div class='ctx'> # include &lt;crt_externs.h&gt;</div><div class='ctx'> # define environ (*_NSGetEnviron())</div><div class='del'>-#elif defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)</div><div class='add'>+#elif defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) || (defined(Q_OS_MAC) &amp;&amp; defined(QT_NO_CORESERVICES))</div><div class='ctx'>   static char *qt_empty_environ[] = { 0 };</div><div class='ctx'> #define environ qt_empty_environ</div><div class='ctx'> #elif !defined(Q_OS_WIN)</div><div class='hunk'>@@ -2274,6 +2289,8 @@ QStringList QProcess::systemEnvironment()</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \fn QProcessEnvironment QProcessEnvironment::systemEnvironment()</div><div class='add'>+</div><div class='ctx'>     \since 4.6</div><div class='ctx'> </div><div class='ctx'>     \brief The systemEnvironment function returns the environment of</div><div class='hunk'>@@ -2289,21 +2306,6 @@ QStringList QProcess::systemEnvironment()</div><div class='ctx'> </div><div class='ctx'>     \sa QProcess::systemEnvironment()</div><div class='ctx'> */</div><div class='del'>-QProcessEnvironment QProcessEnvironment::systemEnvironment()</div><div class='del'>-{</div><div class='del'>-    QProcessEnvironment env;</div><div class='del'>-    const char *entry;</div><div class='del'>-    for (int count = 0; (entry = environ[count]); ++count) {</div><div class='del'>-        const char *equal = strchr(entry, '=');</div><div class='del'>-        if (!equal)</div><div class='del'>-            continue;</div><div class='del'>-</div><div class='del'>-        QByteArray name(entry, equal - entry);</div><div class='del'>-        QByteArray value(equal + 1);</div><div class='del'>-        env.insert(QString::fromLocal8Bit(name), QString::fromLocal8Bit(value));</div><div class='del'>-    }</div><div class='del'>-    return env;</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     \typedef Q_PID</div><div class='head'>diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h<br/>index f0aecb5..b2a5a4c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qprocess.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qprocess.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qprocess.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qprocess.h</a></div><div class='hunk'>@@ -87,6 +87,10 @@ public:</div><div class='ctx'> </div><div class='ctx'>     QStringList toStringList() const;</div><div class='ctx'> </div><div class='add'>+    QStringList keys() const;</div><div class='add'>+</div><div class='add'>+    void insert(const QProcessEnvironment &amp;e);</div><div class='add'>+</div><div class='ctx'>     static QProcessEnvironment systemEnvironment();</div><div class='ctx'> </div><div class='ctx'> private:</div><div class='head'>diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h<br/>index c6c1f1a..9adb331 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qprocess_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qprocess_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qprocess_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qprocess_p.h</a></div><div class='hunk'>@@ -81,21 +81,119 @@ class QTimer;</div><div class='ctx'> class RProcess;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef Q_OS_WIN</div><div class='add'>+class QProcEnvKey : public QString</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    QProcEnvKey() {}</div><div class='add'>+    explicit QProcEnvKey(const QString &amp;other) : QString(other) {}</div><div class='add'>+    QProcEnvKey(const QProcEnvKey &amp;other) : QString(other) {}</div><div class='add'>+    bool operator==(const QProcEnvKey &amp;other) const { return !compare(other, Qt::CaseInsensitive); }</div><div class='add'>+};</div><div class='add'>+inline uint qHash(const QProcEnvKey &amp;key) { return qHash(key.toCaseFolded()); }</div><div class='add'>+</div><div class='add'>+typedef QString QProcEnvValue;</div><div class='add'>+#else</div><div class='add'>+class QProcEnvKey</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    QProcEnvKey() : hash(0) {}</div><div class='add'>+    explicit QProcEnvKey(const QByteArray &amp;other) : key(other), hash(qHash(key)) {}</div><div class='add'>+    QProcEnvKey(const QProcEnvKey &amp;other) { *this = other; }</div><div class='add'>+    bool operator==(const QProcEnvKey &amp;other) const { return key == other.key; }</div><div class='add'>+</div><div class='add'>+    QByteArray key;</div><div class='add'>+    uint hash;</div><div class='add'>+};</div><div class='add'>+inline uint qHash(const QProcEnvKey &amp;key) { return key.hash; }</div><div class='add'>+</div><div class='add'>+class QProcEnvValue</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    QProcEnvValue() {}</div><div class='add'>+    QProcEnvValue(const QProcEnvValue &amp;other) { *this = other; }</div><div class='add'>+    explicit QProcEnvValue(const QString &amp;value) : stringValue(value) {}</div><div class='add'>+    explicit QProcEnvValue(const QByteArray &amp;value) : byteValue(value) {}</div><div class='add'>+    bool operator==(const QProcEnvValue &amp;other) const</div><div class='add'>+    {</div><div class='add'>+        return byteValue.isEmpty() &amp;&amp; other.byteValue.isEmpty()</div><div class='add'>+                ? stringValue == other.stringValue</div><div class='add'>+                : bytes() == other.bytes();</div><div class='add'>+    }</div><div class='add'>+    QByteArray bytes() const</div><div class='add'>+    {</div><div class='add'>+        if (byteValue.isEmpty() &amp;&amp; !stringValue.isEmpty())</div><div class='add'>+            byteValue = stringValue.toLocal8Bit();</div><div class='add'>+        return byteValue;</div><div class='add'>+    }</div><div class='add'>+    QString string() const</div><div class='add'>+    {</div><div class='add'>+        if (stringValue.isEmpty() &amp;&amp; !byteValue.isEmpty())</div><div class='add'>+            stringValue = QString::fromLocal8Bit(byteValue);</div><div class='add'>+        return stringValue;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    mutable QByteArray byteValue;</div><div class='add'>+    mutable QString stringValue;</div><div class='add'>+};</div><div class='add'>+Q_DECLARE_TYPEINFO(QProcEnvValue, Q_MOVABLE_TYPE);</div><div class='add'>+#endif</div><div class='add'>+Q_DECLARE_TYPEINFO(QProcEnvKey, Q_MOVABLE_TYPE);</div><div class='add'>+</div><div class='ctx'> class QProcessEnvironmentPrivate: public QSharedData</div><div class='ctx'> {</div><div class='ctx'> public:</div><div class='add'>+    typedef QProcEnvKey Key;</div><div class='add'>+    typedef QProcEnvValue Value;</div><div class='ctx'> #ifdef Q_OS_WIN</div><div class='del'>-    typedef QString Unit;</div><div class='add'>+    inline Key prepareName(const QString &amp;name) const { return Key(name); }</div><div class='add'>+    inline QString nameToString(const Key &amp;name) const { return name; }</div><div class='add'>+    inline Value prepareValue(const QString &amp;value) const { return value; }</div><div class='add'>+    inline QString valueToString(const Value &amp;value) const { return value; }</div><div class='ctx'> #else</div><div class='del'>-    typedef QByteArray Unit;</div><div class='add'>+    inline Key prepareName(const QString &amp;name) const</div><div class='add'>+    {</div><div class='add'>+        Key &amp;ent = nameMap[name];</div><div class='add'>+        if (ent.key.isEmpty())</div><div class='add'>+            ent = Key(name.toLocal8Bit());</div><div class='add'>+        return ent;</div><div class='add'>+    }</div><div class='add'>+    inline QString nameToString(const Key &amp;name) const</div><div class='add'>+    {</div><div class='add'>+        const QString sname = QString::fromLocal8Bit(name.key);</div><div class='add'>+        nameMap[sname] = name;</div><div class='add'>+        return sname;</div><div class='add'>+    }</div><div class='add'>+    inline Value prepareValue(const QString &amp;value) const { return Value(value); }</div><div class='add'>+    inline QString valueToString(const Value &amp;value) const { return value.string(); }</div><div class='ctx'> #endif</div><div class='del'>-    typedef QHash&lt;Unit, Unit&gt; Hash;</div><div class='add'>+</div><div class='add'>+    typedef QHash&lt;Key, Value&gt; Hash;</div><div class='ctx'>     Hash hash;</div><div class='ctx'> </div><div class='add'>+#ifdef Q_OS_UNIX</div><div class='add'>+    typedef QHash&lt;QString, Key&gt; NameHash;</div><div class='add'>+    mutable NameHash nameMap;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'>     static QProcessEnvironment fromList(const QStringList &amp;list);</div><div class='ctx'>     QStringList toList() const;</div><div class='add'>+    QStringList keys() const;</div><div class='add'>+    void insert(const QProcessEnvironmentPrivate &amp;other);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+template&lt;&gt; Q_INLINE_TEMPLATE void QSharedDataPointer&lt;QProcessEnvironmentPrivate&gt;::detach()</div><div class='add'>+{</div><div class='add'>+    if (d &amp;&amp; d-&gt;ref == 1)</div><div class='add'>+        return;</div><div class='add'>+    QProcessEnvironmentPrivate *x = (d ? new QProcessEnvironmentPrivate(*d)</div><div class='add'>+                                     : new QProcessEnvironmentPrivate);</div><div class='add'>+    x-&gt;ref.ref();</div><div class='add'>+    if (d &amp;&amp; !d-&gt;ref.deref())</div><div class='add'>+        delete d;</div><div class='add'>+    d = x;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> class QProcessPrivate : public QIODevicePrivate</div><div class='ctx'> {</div><div class='ctx'> public:</div><div class='head'>diff --git a/src/corelib/io/qprocess_symbian.cpp b/src/corelib/io/qprocess_symbian.cpp<br/>index 79a7a84..9fd0c3a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qprocess_symbian.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qprocess_symbian.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qprocess_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qprocess_symbian.cpp</a></div><div class='hunk'>@@ -961,16 +961,15 @@ bool QProcessPrivate::waitForFinished(int msecs)</div><div class='ctx'>             User::WaitForRequest(logonStatus, timerStatus);</div><div class='ctx'>             QPROCESS_DEBUG_PRINT("QProcessPrivate::waitForFinished() - Wait completed");</div><div class='ctx'> </div><div class='del'>-            if (timerStatus == KErrNone)</div><div class='add'>+            if (logonStatus != KRequestPending) {</div><div class='add'>+                timer.Cancel();</div><div class='add'>+                User::WaitForRequest(timerStatus);</div><div class='add'>+            } else {</div><div class='ctx'>                 timeoutOccurred = true;</div><div class='del'>-</div><div class='del'>-            timer.Cancel();</div><div class='add'>+                symbianProcess-&gt;LogonCancel(logonStatus);</div><div class='add'>+                User::WaitForRequest(logonStatus);</div><div class='add'>+            }</div><div class='ctx'>             timer.Close();</div><div class='del'>-</div><div class='del'>-            symbianProcess-&gt;LogonCancel(logonStatus);</div><div class='del'>-</div><div class='del'>-            // Eat cancel request completion so that it won't mess up main thread scheduling later</div><div class='del'>-            User::WaitForRequest(logonStatus, timerStatus);</div><div class='ctx'>         }</div><div class='ctx'>     } else {</div><div class='ctx'>         QPROCESS_DEBUG_PRINT("QProcessPrivate::waitForFinished(), qt_rprocess_running returned false");</div><div class='hunk'>@@ -1063,6 +1062,11 @@ void QProcessPrivate::initializeProcessManager()</div><div class='ctx'>     (void) processManager();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+QProcessEnvironment QProcessEnvironment::systemEnvironment()</div><div class='add'>+{</div><div class='add'>+    return QProcessEnvironment();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> #endif // QT_NO_PROCESS</div><div class='head'>diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp<br/>index 997bfa6..07e3087 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qprocess_unix.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qprocess_unix.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qprocess_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qprocess_unix.cpp</a></div><div class='hunk'>@@ -95,7 +95,7 @@ QT_END_NAMESPACE</div><div class='ctx'> #include &lt;qfile.h&gt;</div><div class='ctx'> #include &lt;qfileinfo.h&gt;</div><div class='ctx'> #include &lt;qlist.h&gt;</div><div class='del'>-#include &lt;qmap.h&gt;</div><div class='add'>+#include &lt;qhash.h&gt;</div><div class='ctx'> #include &lt;qmutex.h&gt;</div><div class='ctx'> #include &lt;qsemaphore.h&gt;</div><div class='ctx'> #include &lt;qsocketnotifier.h&gt;</div><div class='hunk'>@@ -120,7 +120,7 @@ static inline char *strdup(const char *data)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int qt_qprocess_deadChild_pipe[2];</div><div class='del'>-static void (*qt_sa_old_sigchld_handler)(int) = 0;</div><div class='add'>+static struct sigaction qt_sa_old_sigchld_handler;</div><div class='ctx'> static void qt_sa_sigchld_handler(int signum)</div><div class='ctx'> {</div><div class='ctx'>     qt_safe_write(qt_qprocess_deadChild_pipe[1], "", 1);</div><div class='hunk'>@@ -128,8 +128,10 @@ static void qt_sa_sigchld_handler(int signum)</div><div class='ctx'>     fprintf(stderr, "*** SIGCHLD\n");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-    if (qt_sa_old_sigchld_handler &amp;&amp; qt_sa_old_sigchld_handler != SIG_IGN)</div><div class='del'>-        qt_sa_old_sigchld_handler(signum);</div><div class='add'>+    // load it as volatile</div><div class='add'>+    void (*oldAction)(int) = ((volatile struct sigaction *)&amp;qt_sa_old_sigchld_handler)-&gt;sa_handler;</div><div class='add'>+    if (oldAction &amp;&amp; oldAction != SIG_IGN)</div><div class='add'>+        oldAction(signum);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void add_fd(int &amp;nfds, int fd, fd_set *fdset)</div><div class='hunk'>@@ -163,7 +165,7 @@ public:</div><div class='ctx'> </div><div class='ctx'> private:</div><div class='ctx'>     QMutex mutex;</div><div class='del'>-    QMap&lt;int, QProcessInfo *&gt; children;</div><div class='add'>+    QHash&lt;int, QProcessInfo *&gt; children;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -190,14 +192,11 @@ QProcessManager::QProcessManager()</div><div class='ctx'> </div><div class='ctx'>     // set up the SIGCHLD handler, which writes a single byte to the dead</div><div class='ctx'>     // child pipe every time a child dies.</div><div class='del'>-    struct sigaction oldAction;</div><div class='ctx'>     struct sigaction action;</div><div class='ctx'>     memset(&amp;action, 0, sizeof(action));</div><div class='ctx'>     action.sa_handler = qt_sa_sigchld_handler;</div><div class='ctx'>     action.sa_flags = SA_NOCLDSTOP;</div><div class='del'>-    ::sigaction(SIGCHLD, &amp;action, &amp;oldAction);</div><div class='del'>-    if (oldAction.sa_handler != qt_sa_sigchld_handler)</div><div class='del'>-	qt_sa_old_sigchld_handler = oldAction.sa_handler;</div><div class='add'>+    ::sigaction(SIGCHLD, &amp;action, &amp;qt_sa_old_sigchld_handler);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QProcessManager::~QProcessManager()</div><div class='hunk'>@@ -217,14 +216,10 @@ QProcessManager::~QProcessManager()</div><div class='ctx'>     qDeleteAll(children.values());</div><div class='ctx'>     children.clear();</div><div class='ctx'> </div><div class='del'>-    struct sigaction oldAction;</div><div class='del'>-    struct sigaction action;</div><div class='del'>-    memset(&amp;action, 0, sizeof(action));</div><div class='del'>-    action.sa_handler = qt_sa_old_sigchld_handler;</div><div class='del'>-    action.sa_flags = SA_NOCLDSTOP;</div><div class='del'>-    ::sigaction(SIGCHLD, &amp;action, &amp;oldAction);</div><div class='del'>-    if (oldAction.sa_handler != qt_sa_sigchld_handler) {</div><div class='del'>-        ::sigaction(SIGCHLD, &amp;oldAction, 0);</div><div class='add'>+    struct sigaction currentAction;</div><div class='add'>+    ::sigaction(SIGCHLD, 0, &amp;currentAction);</div><div class='add'>+    if (currentAction.sa_handler == qt_sa_sigchld_handler) {</div><div class='add'>+        ::sigaction(SIGCHLD, &amp;qt_sa_old_sigchld_handler, 0);</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -267,7 +262,7 @@ void QProcessManager::catchDeadChildren()</div><div class='ctx'> </div><div class='ctx'>     // try to catch all children whose pid we have registered, and whose</div><div class='ctx'>     // deathPipe is still valid (i.e, we have not already notified it).</div><div class='del'>-    QMap&lt;int, QProcessInfo *&gt;::Iterator it = children.begin();</div><div class='add'>+    QHash&lt;int, QProcessInfo *&gt;::Iterator it = children.begin();</div><div class='ctx'>     while (it != children.end()) {</div><div class='ctx'>         // notify all children that they may have died. they need to run</div><div class='ctx'>         // waitpid() in their own thread.</div><div class='hunk'>@@ -306,15 +301,11 @@ void QProcessManager::remove(QProcess *process)</div><div class='ctx'>     QMutexLocker locker(&amp;mutex);</div><div class='ctx'> </div><div class='ctx'>     int serial = process-&gt;d_func()-&gt;serial;</div><div class='del'>-    QProcessInfo *info = children.value(serial);</div><div class='del'>-    if (!info)</div><div class='del'>-        return;</div><div class='del'>-</div><div class='add'>+    QProcessInfo *info = children.take(serial);</div><div class='ctx'> #if defined (QPROCESS_DEBUG)</div><div class='del'>-    qDebug() &lt;&lt; "QProcessManager::remove() removing pid" &lt;&lt; info-&gt;pid &lt;&lt; "process" &lt;&lt; info-&gt;process;</div><div class='add'>+    if (info)</div><div class='add'>+        qDebug() &lt;&lt; "QProcessManager::remove() removing pid" &lt;&lt; info-&gt;pid &lt;&lt; "process" &lt;&lt; info-&gt;process;</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-    children.remove(serial);</div><div class='ctx'>     delete info;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -462,7 +453,35 @@ bool QProcessPrivate::createChannel(Channel &amp;channel)</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char **_q_dupEnvironment(const QHash&lt;QByteArray, QByteArray&gt; &amp;environment, int *envc)</div><div class='add'>+QT_BEGIN_INCLUDE_NAMESPACE</div><div class='add'>+#if defined(Q_OS_MAC) &amp;&amp; !defined(QT_NO_CORESERVICES)</div><div class='add'>+# include &lt;crt_externs.h&gt;</div><div class='add'>+# define environ (*_NSGetEnviron())</div><div class='add'>+#else</div><div class='add'>+  extern char **environ;</div><div class='add'>+#endif</div><div class='add'>+QT_END_INCLUDE_NAMESPACE</div><div class='add'>+</div><div class='add'>+QProcessEnvironment QProcessEnvironment::systemEnvironment()</div><div class='add'>+{</div><div class='add'>+    QProcessEnvironment env;</div><div class='add'>+#if !defined(Q_OS_MAC) || !defined(QT_NO_CORESERVICES)</div><div class='add'>+    const char *entry;</div><div class='add'>+    for (int count = 0; (entry = environ[count]); ++count) {</div><div class='add'>+        const char *equal = strchr(entry, '=');</div><div class='add'>+        if (!equal)</div><div class='add'>+            continue;</div><div class='add'>+</div><div class='add'>+        QByteArray name(entry, equal - entry);</div><div class='add'>+        QByteArray value(equal + 1);</div><div class='add'>+        env.d-&gt;hash.insert(QProcessEnvironmentPrivate::Key(name),</div><div class='add'>+                           QProcessEnvironmentPrivate::Value(value));</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    return env;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char **_q_dupEnvironment(const QProcessEnvironmentPrivate::Hash &amp;environment, int *envc)</div><div class='ctx'> {</div><div class='ctx'>     *envc = 0;</div><div class='ctx'>     if (environment.isEmpty())</div><div class='hunk'>@@ -478,17 +497,17 @@ static char **_q_dupEnvironment(const QHash&lt;QByteArray, QByteArray&gt; &amp;environment</div><div class='ctx'> #endif</div><div class='ctx'>     const QByteArray envLibraryPath = qgetenv(libraryPath);</div><div class='ctx'>     bool needToAddLibraryPath = !envLibraryPath.isEmpty() &amp;&amp;</div><div class='del'>-                                !environment.contains(libraryPath);</div><div class='add'>+                                !environment.contains(QProcessEnvironmentPrivate::Key(QByteArray(libraryPath)));</div><div class='ctx'> </div><div class='ctx'>     char **envp = new char *[environment.count() + 2];</div><div class='ctx'>     envp[environment.count()] = 0;</div><div class='ctx'>     envp[environment.count() + 1] = 0;</div><div class='ctx'> </div><div class='del'>-    QHash&lt;QByteArray, QByteArray&gt;::ConstIterator it = environment.constBegin();</div><div class='del'>-    const QHash&lt;QByteArray, QByteArray&gt;::ConstIterator end = environment.constEnd();</div><div class='add'>+    QProcessEnvironmentPrivate::Hash::ConstIterator it = environment.constBegin();</div><div class='add'>+    const QProcessEnvironmentPrivate::Hash::ConstIterator end = environment.constEnd();</div><div class='ctx'>     for ( ; it != end; ++it) {</div><div class='del'>-        QByteArray key = it.key();</div><div class='del'>-        QByteArray value = it.value();</div><div class='add'>+        QByteArray key = it.key().key;</div><div class='add'>+        QByteArray value = it.value().bytes();</div><div class='ctx'>         key.reserve(key.length() + 1 + value.length());</div><div class='ctx'>         key.append('=');</div><div class='ctx'>         key.append(value);</div><div class='hunk'>@@ -497,8 +516,8 @@ static char **_q_dupEnvironment(const QHash&lt;QByteArray, QByteArray&gt; &amp;environment</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if (needToAddLibraryPath)</div><div class='del'>-        envp[(*envc)++] = ::strdup(QByteArray(libraryPath) + '=' +</div><div class='del'>-                                 envLibraryPath);</div><div class='add'>+        envp[(*envc)++] = ::strdup(QByteArray(QByteArray(libraryPath) + '=' +</div><div class='add'>+                                 envLibraryPath).constData());</div><div class='ctx'>     return envp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -649,7 +668,7 @@ void QProcessPrivate::startProcess()</div><div class='ctx'>     if (childPid &lt; 0) {</div><div class='ctx'>         // Cleanup, report error and return</div><div class='ctx'> #if defined (QPROCESS_DEBUG)</div><div class='del'>-        qDebug("qt_fork failed: %s", qt_error_string(lastForkErrno));</div><div class='add'>+        qDebug("qt_fork failed: %s", qPrintable(qt_error_string(lastForkErrno)));</div><div class='ctx'> #endif</div><div class='ctx'>         processManager()-&gt;unlock();</div><div class='ctx'>         q-&gt;setProcessState(QProcess::NotRunning);</div><div class='hunk'>@@ -852,7 +871,14 @@ qint64 QProcessPrivate::writeToStdin(const char *data, qint64 maxlen)</div><div class='ctx'> #if defined QPROCESS_DEBUG</div><div class='ctx'>     qDebug("QProcessPrivate::writeToStdin(%p \"%s\", %lld) == %lld",</div><div class='ctx'>            data, qt_prettyDebug(data, maxlen, 16).constData(), maxlen, written);</div><div class='add'>+    if (written == -1)</div><div class='add'>+        qDebug("QProcessPrivate::writeToStdin(), failed to write (%s)", qPrintable(qt_error_string(errno)));</div><div class='ctx'> #endif</div><div class='add'>+    // If the O_NONBLOCK flag is set and If some data can be written without blocking</div><div class='add'>+    // the process, write() will transfer what it can and return the number of bytes written.</div><div class='add'>+    // Otherwise, it will return -1 and set errno to EAGAIN</div><div class='add'>+    if (written == -1 &amp;&amp; errno == EAGAIN)</div><div class='add'>+        written = 0;</div><div class='ctx'>     return written;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp<br/>index c76cbf7..1761c0e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qprocess_win.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qprocess_win.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qprocess_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qprocess_win.cpp</a></div><div class='hunk'>@@ -278,29 +278,55 @@ static QString qt_create_commandline(const QString &amp;program, const QStringList &amp;</div><div class='ctx'>     return args;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static QByteArray qt_create_environment(const QHash&lt;QString, QString&gt; &amp;environment)</div><div class='add'>+QProcessEnvironment QProcessEnvironment::systemEnvironment()</div><div class='add'>+{</div><div class='add'>+    QProcessEnvironment env;</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+    // Calls to setenv() affect the low-level environment as well.</div><div class='add'>+    // This is not the case the other way round.</div><div class='add'>+    if (wchar_t *envStrings = GetEnvironmentStringsW()) {</div><div class='add'>+        for (const wchar_t *entry = envStrings; *entry; ) {</div><div class='add'>+            int entryLen = wcslen(entry);</div><div class='add'>+            if (const wchar_t *equal = wcschr(entry, L'=')) {</div><div class='add'>+                int nameLen = equal - entry;</div><div class='add'>+                QString name = QString::fromWCharArray(entry, nameLen);</div><div class='add'>+                QString value = QString::fromWCharArray(equal + 1, entryLen - nameLen - 1);</div><div class='add'>+                env.d-&gt;hash.insert(QProcessEnvironmentPrivate::Key(name), value);</div><div class='add'>+            }</div><div class='add'>+            entry += entryLen + 1;</div><div class='add'>+        }</div><div class='add'>+        FreeEnvironmentStringsW(envStrings);</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    return env;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+static QByteArray qt_create_environment(const QProcessEnvironmentPrivate::Hash &amp;environment)</div><div class='ctx'> {</div><div class='ctx'>     QByteArray envlist;</div><div class='ctx'>     if (!environment.isEmpty()) {</div><div class='del'>-        QHash&lt;QString, QString&gt; copy = environment;</div><div class='add'>+        QProcessEnvironmentPrivate::Hash copy = environment;</div><div class='ctx'> </div><div class='ctx'>         // add PATH if necessary (for DLL loading)</div><div class='del'>-        if (!copy.contains(QLatin1String("PATH"))) {</div><div class='add'>+        QProcessEnvironmentPrivate::Key pathKey(QLatin1String("PATH"));</div><div class='add'>+        if (!copy.contains(pathKey)) {</div><div class='ctx'>             QByteArray path = qgetenv("PATH");</div><div class='ctx'>             if (!path.isEmpty())</div><div class='del'>-                copy.insert(QLatin1String("PATH"), QString::fromLocal8Bit(path));</div><div class='add'>+                copy.insert(pathKey, QString::fromLocal8Bit(path));</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         // add systemroot if needed</div><div class='del'>-        if (!copy.contains(QLatin1String("SYSTEMROOT"))) {</div><div class='del'>-            QByteArray systemRoot = qgetenv("SYSTEMROOT");</div><div class='add'>+        QProcessEnvironmentPrivate::Key rootKey(QLatin1String("SystemRoot"));</div><div class='add'>+        if (!copy.contains(rootKey)) {</div><div class='add'>+            QByteArray systemRoot = qgetenv("SystemRoot");</div><div class='ctx'>             if (!systemRoot.isEmpty())</div><div class='del'>-                copy.insert(QLatin1String("SYSTEMROOT"), QString::fromLocal8Bit(systemRoot));</div><div class='add'>+                copy.insert(rootKey, QString::fromLocal8Bit(systemRoot));</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         int pos = 0;</div><div class='del'>-        QHash&lt;QString, QString&gt;::ConstIterator it = copy.constBegin(),</div><div class='del'>-                                              end = copy.constEnd();</div><div class='add'>+        QProcessEnvironmentPrivate::Hash::ConstIterator it = copy.constBegin(),</div><div class='add'>+                                                       end = copy.constEnd();</div><div class='ctx'> </div><div class='ctx'>         static const wchar_t equal = L'=';</div><div class='ctx'>         static const wchar_t nul = L'\0';</div><div class='hunk'>@@ -335,6 +361,7 @@ static QByteArray qt_create_environment(const QHash&lt;QString, QString&gt; &amp;environme</div><div class='ctx'>     }</div><div class='ctx'>     return envlist;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> void QProcessPrivate::startProcess()</div><div class='ctx'> {</div><div class='head'>diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp<br/>index 38af732..6ad1578 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qresource.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qresource.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qresource.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qresource.cpp</a></div><div class='hunk'>@@ -580,7 +580,7 @@ QResource::addSearchPath(const QString &amp;path)</div><div class='ctx'>   \obsolete</div><div class='ctx'> </div><div class='ctx'>   Use QDir::searchPaths() instead.</div><div class='del'>-  </div><div class='add'>+</div><div class='ctx'>   Returns the current search path list. This list is consulted when</div><div class='ctx'>   creating a relative resource.</div><div class='ctx'> </div><div class='hunk'>@@ -928,7 +928,7 @@ public:</div><div class='ctx'>     }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if defined(Q_OS_UNIX) &amp;&amp; !defined(Q_OS_SYMBIAN)</div><div class='add'>+#if defined(Q_OS_UNIX) &amp;&amp; !defined(Q_OS_SYMBIAN) &amp;&amp; !defined (Q_OS_NACL) &amp;&amp; !defined(Q_OS_INTEGRITY)</div><div class='ctx'> #define QT_USE_MMAP</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1185,21 +1185,6 @@ QResource::unregisterResource(const uchar *rccData, const QString &amp;resourceRoot)</div><div class='ctx'>     return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//file type handler</div><div class='del'>-class QResourceFileEngineHandler : public QAbstractFileEngineHandler</div><div class='del'>-{</div><div class='del'>-public:</div><div class='del'>-    QResourceFileEngineHandler() { }</div><div class='del'>-    ~QResourceFileEngineHandler() { }</div><div class='del'>-    QAbstractFileEngine *create(const QString &amp;path) const;</div><div class='del'>-};</div><div class='del'>-QAbstractFileEngine *QResourceFileEngineHandler::create(const QString &amp;path) const</div><div class='del'>-{</div><div class='del'>-    if (path.size() &gt; 0 &amp;&amp; path.startsWith(QLatin1Char(':')))</div><div class='del'>-        return new QResourceFileEngine(path);</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> //resource engine</div><div class='ctx'> class QResourceFileEnginePrivate : public QAbstractFileEnginePrivate</div><div class='ctx'> {</div><div class='hunk'>@@ -1506,12 +1491,6 @@ bool QResourceFileEnginePrivate::unmap(uchar *ptr)</div><div class='ctx'>     return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//Initialization and cleanup</div><div class='del'>-Q_GLOBAL_STATIC(QResourceFileEngineHandler, resource_file_handler)</div><div class='del'>-</div><div class='del'>-static int qt_force_resource_init() { resource_file_handler(); return 1; }</div><div class='del'>-Q_CORE_EXPORT void qInitResourceIO() { resource_file_handler(); }</div><div class='del'>-static int qt_forced_resource_init = qt_force_resource_init();</div><div class='del'>-Q_CONSTRUCTOR_FUNCTION(qt_force_resource_init)</div><div class='add'>+Q_CORE_EXPORT void qInitResourceIO() { } // ### Qt 5: remove</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp<br/>index 23e9c9c..79b2728 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qsettings.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qsettings.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qsettings.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qsettings.cpp</a></div><div class='hunk'>@@ -258,9 +258,7 @@ bool QConfFile::isWritable() const</div><div class='ctx'>     } else {</div><div class='ctx'>         // Create the directories to the file.</div><div class='ctx'>         QDir dir(fileInfo.absolutePath());</div><div class='del'>-        if (dir.exists() &amp;&amp; dir.isReadable()) {</div><div class='del'>-            return true;</div><div class='del'>-        } else {</div><div class='add'>+        if (!dir.exists()) {</div><div class='ctx'>             if (!dir.mkpath(dir.absolutePath()))</div><div class='ctx'>                 return false;</div><div class='ctx'>         }</div><div class='hunk'>@@ -983,30 +981,13 @@ QStringList QSettingsPrivate::splitArgs(const QString &amp;s, int idx)</div><div class='ctx'> // ************************************************************************</div><div class='ctx'> // QConfFileSettingsPrivate</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>-    If we don't have the permission to read the file, returns false.</div><div class='del'>-    If the file doesn't exist, returns true.</div><div class='del'>-*/</div><div class='del'>-static bool checkAccess(const QString &amp;name)</div><div class='del'>-{</div><div class='del'>-    QFileInfo fileInfo(name);</div><div class='del'>-</div><div class='del'>-    if (fileInfo.exists()) {</div><div class='del'>-        QFile file(name);</div><div class='del'>-        // if the file exists but we can't open it, report an error</div><div class='del'>-        return file.open(QFile::ReadOnly);</div><div class='del'>-    } else {</div><div class='del'>-        return true;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void QConfFileSettingsPrivate::initFormat()</div><div class='ctx'> {</div><div class='ctx'>     extension = (format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini");</div><div class='ctx'>     readFunc = 0;</div><div class='ctx'>     writeFunc = 0;</div><div class='ctx'> #if defined(Q_OS_MAC)</div><div class='del'>-    caseSensitivity = (format == QSettings::NativeFormat) ? Qt::CaseSensitive : Qt::CaseInsensitive;</div><div class='add'>+    caseSensitivity = (format == QSettings::NativeFormat) ? Qt::CaseSensitive : IniCaseSensitivity;</div><div class='ctx'> #else</div><div class='ctx'>     caseSensitivity = IniCaseSensitivity;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1028,18 +1009,13 @@ void QConfFileSettingsPrivate::initFormat()</div><div class='ctx'> </div><div class='ctx'> void QConfFileSettingsPrivate::initAccess()</div><div class='ctx'> {</div><div class='del'>-    bool readAccess = false;</div><div class='ctx'>     if (confFiles[spec]) {</div><div class='del'>-        readAccess = checkAccess(confFiles[spec]-&gt;name);</div><div class='ctx'>         if (format &gt; QSettings::IniFormat) {</div><div class='ctx'>             if (!readFunc)</div><div class='del'>-                readAccess = false;</div><div class='add'>+                setStatus(QSettings::AccessError);</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    if (!readAccess)</div><div class='del'>-        setStatus(QSettings::AccessError);</div><div class='del'>-</div><div class='ctx'>     sync();       // loads the files the first time</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1132,7 +1108,7 @@ static void initDefaultPaths(QMutexLocker *locker)</div><div class='ctx'>         if (env == 0) {</div><div class='ctx'>             userPath = homePath;</div><div class='ctx'>             userPath += QLatin1Char('/');</div><div class='del'>-#ifdef Q_WS_QWS</div><div class='add'>+#if defined(Q_WS_QWS) || defined(Q_WS_QPA)</div><div class='ctx'>             userPath += QLatin1String("Settings");</div><div class='ctx'> #else</div><div class='ctx'>             userPath += QLatin1String(".config");</div><div class='hunk'>@@ -1434,7 +1410,7 @@ void QConfFileSettingsPrivate::syncConfFile(int confFileNo)</div><div class='ctx'>         We can often optimize the read-only case, if the file on disk</div><div class='ctx'>         hasn't changed.</div><div class='ctx'>     */</div><div class='del'>-    if (readOnly) {</div><div class='add'>+    if (readOnly &amp;&amp; confFile-&gt;size &gt; 0) {</div><div class='ctx'>         QFileInfo fileInfo(confFile-&gt;name);</div><div class='ctx'>         if (confFile-&gt;size == fileInfo.size() &amp;&amp; confFile-&gt;timeStamp == fileInfo.lastModified())</div><div class='ctx'>             return;</div><div class='hunk'>@@ -1457,6 +1433,9 @@ void QConfFileSettingsPrivate::syncConfFile(int confFileNo)</div><div class='ctx'>     if (!file.isOpen())</div><div class='ctx'>         file.open(QFile::ReadOnly);</div><div class='ctx'> </div><div class='add'>+    if (!createFile &amp;&amp; !file.isOpen())</div><div class='add'>+        setStatus(QSettings::AccessError);</div><div class='add'>+</div><div class='ctx'> #ifdef Q_OS_WIN</div><div class='ctx'>     HANDLE readSemaphore = 0;</div><div class='ctx'>     HANDLE writeSemaphore = 0;</div><div class='head'>diff --git a/src/corelib/io/qsettings_p.h b/src/corelib/io/qsettings_p.h<br/>index c290761..a87acc2 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qsettings_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qsettings_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qsettings_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qsettings_p.h</a></div><div class='hunk'>@@ -70,7 +70,7 @@</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='del'>-#if defined(Q_WS_QWS)</div><div class='add'>+#if defined(Q_WS_QWS) || defined(Q_WS_QPA)</div><div class='ctx'> #define QT_QSETTINGS_ALWAYS_CASE_SENSITIVE_AND_FORGET_ORIGINAL_KEY_ORDER</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp<br/>index 4b0c6a4..0855d93 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qtemporaryfile.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qtemporaryfile.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qtemporaryfile.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qtemporaryfile.cpp</a></div><div class='hunk'>@@ -49,11 +49,8 @@</div><div class='ctx'> #include "private/qabstractfileengine_p.h"</div><div class='ctx'> #include "private/qfsfileengine_p.h"</div><div class='ctx'> </div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='ctx'> #if !defined(Q_OS_WINCE)</div><div class='ctx'> #  include &lt;errno.h&gt;</div><div class='del'>-#  include &lt;sys/stat.h&gt;</div><div class='del'>-#  include &lt;sys/types.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='hunk'>@@ -64,19 +61,8 @@</div><div class='ctx'> # include "private/qcore_unix_p.h"      // overrides QT_OPEN</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(Q_OS_WIN) &amp;&amp; !defined(Q_OS_WINCE)</div><div class='del'>-# include &lt;process.h&gt;</div><div class='del'>-# if defined(_MSC_VER) &amp;&amp; _MSC_VER &gt;= 1400</div><div class='del'>-#  include &lt;share.h&gt;</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(Q_OS_WINCE)</div><div class='del'>-#  include &lt;types.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(Q_OS_VXWORKS)</div><div class='del'>-#  include &lt;taskLib.h&gt;</div><div class='add'>+#if defined(QT_BUILD_CORE_LIB)</div><div class='add'>+#include "qcoreapplication.h"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='hunk'>@@ -109,167 +95,75 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'>  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='ctx'>  * SUCH DAMAGE.</div><div class='ctx'>  */</div><div class='del'>-static int _gettemp(char *path, int *doopen, int domkdir, int slen)</div><div class='del'>-{</div><div class='del'>-    char *start, *trv, *suffp;</div><div class='del'>-    QT_STATBUF sbuf;</div><div class='del'>-    int rval;</div><div class='del'>-#if defined(Q_OS_WIN)</div><div class='del'>-    int pid;</div><div class='del'>-#else</div><div class='del'>-    pid_t pid;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-    if (doopen &amp;&amp; domkdir) {</div><div class='del'>-        errno = EINVAL;</div><div class='del'>-        return 0;</div><div class='del'>-    }</div><div class='ctx'> </div><div class='del'>-    for (trv = path; *trv; ++trv)</div><div class='del'>-        ;</div><div class='del'>-    trv -= slen;</div><div class='del'>-    suffp = trv;</div><div class='del'>-    --trv;</div><div class='del'>-    if (trv &lt; path) {</div><div class='del'>-        errno = EINVAL;</div><div class='del'>-        return 0;</div><div class='del'>-    }</div><div class='del'>-#if defined(Q_OS_WIN) &amp;&amp; defined(_MSC_VER) &amp;&amp; _MSC_VER &gt;= 1400</div><div class='del'>-    pid = _getpid();</div><div class='del'>-#elif defined(Q_OS_VXWORKS)</div><div class='del'>-    pid = (pid_t) taskIdCurrent;</div><div class='del'>-#else</div><div class='del'>-    pid = getpid();</div><div class='del'>-#endif</div><div class='del'>-    while (trv &gt;= path &amp;&amp; *trv == 'X' &amp;&amp; pid != 0) {</div><div class='del'>-        *trv-- = (pid % 10) + '0';</div><div class='del'>-        pid /= 10;</div><div class='del'>-    }</div><div class='add'>+/*!</div><div class='add'>+    \internal</div><div class='ctx'> </div><div class='del'>-#ifndef S_ISDIR</div><div class='del'>-#  define S_ISDIR(m) (((m) &amp; S_IFMT) == S_IFDIR)</div><div class='del'>-#endif</div><div class='add'>+    Generates a unique file path and returns a native handle to the open file.</div><div class='add'>+    \a path is used as a template when generating unique paths,</div><div class='add'>+    \a placeholderStart and \a placeholderEnd delimit the sub-string that will</div><div class='add'>+    be randomized.</div><div class='ctx'> </div><div class='del'>-    while (trv &gt;= path &amp;&amp; *trv == 'X') {</div><div class='del'>-        char c;</div><div class='add'>+    Returns an open handle to the newly created file if successful, an invalid</div><div class='add'>+    handle otherwise. In both cases, the string in \a path will be changed and</div><div class='add'>+    contain the generated path name.</div><div class='add'>+*/</div><div class='add'>+static int createFileFromTemplate(char *const path,</div><div class='add'>+        char *const placeholderStart, char *const placeholderEnd)</div><div class='add'>+{</div><div class='add'>+    Q_ASSERT(placeholderEnd &gt; placeholderStart);</div><div class='ctx'> </div><div class='del'>-        // CHANGE arc4random() -&gt; random()</div><div class='del'>-        pid = (qrand() &amp; 0xffff) % (26+26);</div><div class='del'>-        if (pid &lt; 26)</div><div class='del'>-            c = pid + 'A';</div><div class='del'>-        else</div><div class='del'>-            c = (pid - 26) + 'a';</div><div class='del'>-        *trv-- = c;</div><div class='del'>-    }</div><div class='del'>-    start = trv + 1;</div><div class='del'>-</div><div class='del'>-    /*</div><div class='del'>-     * check the target directory; if you have six X's and it</div><div class='del'>-     * doesn't exist this runs for a *very* long time.</div><div class='del'>-     */</div><div class='del'>-    if (doopen || domkdir) {</div><div class='del'>-        for (;; --trv) {</div><div class='del'>-            if (trv &lt;= path)</div><div class='del'>-                break;</div><div class='del'>-            if (*trv == '/') {</div><div class='del'>-                *trv = '\0';</div><div class='del'>-#if defined (Q_OS_WIN) &amp;&amp; !defined(Q_OS_WINCE)</div><div class='del'>-                if (trv - path == 2 &amp;&amp; path[1] == ':') {</div><div class='del'>-                    // Special case for Windows drives</div><div class='del'>-                    // (e.g., "C:" =&gt; "C:\").</div><div class='del'>-                    // ### Better to use a Windows</div><div class='del'>-                    // call for this.</div><div class='del'>-                    char drive[] = "c:\\";</div><div class='del'>-                    drive[0] = path[0];</div><div class='del'>-                    rval = QT_STAT(drive, &amp;sbuf);</div><div class='del'>-                } else</div><div class='add'>+    // Initialize placeholder with random chars + PID.</div><div class='add'>+    {</div><div class='add'>+        char *rIter = placeholderEnd;</div><div class='add'>+</div><div class='add'>+#if defined(QT_BUILD_CORE_LIB)</div><div class='add'>+        qint64 pid = QCoreApplication::applicationPid();</div><div class='add'>+        do {</div><div class='add'>+            *--rIter = (pid % 10) + '0';</div><div class='add'>+            pid /= 10;</div><div class='add'>+        } while (rIter != placeholderStart &amp;&amp; pid != 0);</div><div class='ctx'> #endif</div><div class='del'>-                    rval = QT_STAT(path, &amp;sbuf);</div><div class='del'>-                *trv = '/';</div><div class='del'>-                if (rval != 0)</div><div class='del'>-                    return 0;</div><div class='del'>-                if (!S_ISDIR(sbuf.st_mode)) {</div><div class='del'>-                    errno = ENOTDIR;</div><div class='del'>-                    return 0;</div><div class='del'>-                }</div><div class='del'>-                break;</div><div class='del'>-            }</div><div class='add'>+</div><div class='add'>+        while (rIter != placeholderStart) {</div><div class='add'>+            char ch = char((qrand() &amp; 0xffff) % (26 + 26));</div><div class='add'>+            if (ch &lt; 26)</div><div class='add'>+                *--rIter = ch + 'A';</div><div class='add'>+            else</div><div class='add'>+                *--rIter = ch - 26 + 'a';</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     for (;;) {</div><div class='del'>-        if (doopen) {</div><div class='del'>-#if defined(Q_OS_WIN) &amp;&amp; !defined(Q_OS_WINCE) &amp;&amp; defined(_MSC_VER) &amp;&amp; _MSC_VER &gt;= 1400</div><div class='del'>-            if (_sopen_s(doopen, path, QT_OPEN_CREAT|O_EXCL|QT_OPEN_RDWR|QT_OPEN_BINARY</div><div class='del'>-#  ifdef QT_LARGEFILE_SUPPORT</div><div class='del'>-                                       |QT_OPEN_LARGEFILE</div><div class='del'>-#  endif</div><div class='del'>-                         , _SH_DENYNO, _S_IREAD | _S_IWRITE)== 0)</div><div class='del'>-#else // WIN &amp;&amp; !CE</div><div class='del'>-#  if defined(Q_OS_WINCE)</div><div class='del'>-            QString targetPath;</div><div class='del'>-            if (QDir::isAbsolutePath(QString::fromLatin1(path)))</div><div class='del'>-                targetPath = QLatin1String(path);</div><div class='del'>-            else</div><div class='del'>-                targetPath = QDir::currentPath().append(QLatin1Char('/')) + QLatin1String(path);</div><div class='del'>-</div><div class='del'>-            if ((*doopen =</div><div class='del'>-                QT_OPEN(targetPath.toLocal8Bit(), O_CREAT|O_EXCL|O_RDWR</div><div class='del'>-#  else // CE</div><div class='del'>-            // this is Unix or older MSVC</div><div class='del'>-            if ((*doopen =</div><div class='del'>-                QT_OPEN(path, QT_OPEN_CREAT|O_EXCL|QT_OPEN_RDWR</div><div class='del'>-#  endif</div><div class='del'>-#  ifdef QT_LARGEFILE_SUPPORT</div><div class='del'>-                           |QT_OPEN_LARGEFILE</div><div class='del'>-#  endif</div><div class='del'>-#  if defined(Q_OS_WINCE)</div><div class='del'>-                           |_O_BINARY</div><div class='del'>-#  elif defined(Q_OS_WIN)</div><div class='del'>-                           |O_BINARY</div><div class='del'>-#  endif</div><div class='del'>-                     , 0600)) &gt;= 0)</div><div class='del'>-#endif // WIN &amp;&amp; !CE</div><div class='del'>-            {</div><div class='del'>-                return 1;</div><div class='del'>-            }</div><div class='del'>-            if (errno != EEXIST)</div><div class='del'>-                return 0;</div><div class='del'>-        } else if (domkdir) {</div><div class='del'>-#ifdef Q_OS_WIN</div><div class='del'>-            if (QT_MKDIR(path) == 0)</div><div class='del'>-#else</div><div class='del'>-            if (QT_MKDIR(path, 0700) == 0)</div><div class='del'>-#endif</div><div class='del'>-                return 1;</div><div class='add'>+        // Atomically create file and obtain handle</div><div class='add'>+#ifndef Q_OS_WIN</div><div class='add'>+        {</div><div class='add'>+            int fd = QT_OPEN(path, QT_OPEN_CREAT | O_EXCL | QT_OPEN_RDWR | QT_OPEN_LARGEFILE, 0600);</div><div class='add'>+            if (fd != -1)</div><div class='add'>+                return fd;</div><div class='ctx'>             if (errno != EEXIST)</div><div class='del'>-                return 0;</div><div class='add'>+                return -1;</div><div class='ctx'>         }</div><div class='del'>-#ifndef Q_OS_WIN</div><div class='del'>-        else if (QT_LSTAT(path, &amp;sbuf))</div><div class='del'>-            return (errno == ENOENT) ? 1 : 0;</div><div class='ctx'> #else</div><div class='ctx'>         if (!QFileInfo(QLatin1String(path)).exists())</div><div class='ctx'>             return 1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>         /* tricky little algorwwithm for backward compatibility */</div><div class='del'>-        for (trv = start;;) {</div><div class='del'>-            if (!*trv)</div><div class='del'>-                return 0;</div><div class='del'>-            if (*trv == 'Z') {</div><div class='del'>-                if (trv == suffp)</div><div class='del'>-                    return 0;</div><div class='del'>-                *trv++ = 'a';</div><div class='add'>+        for (char *iter = placeholderStart;;) {</div><div class='add'>+            // Character progression: [0-9] =&gt; 'a' ... 'z' =&gt; 'A' .. 'Z'</div><div class='add'>+            // String progression: "ZZaiC" =&gt; "aabiC"</div><div class='add'>+            if (*iter == 'Z') {</div><div class='add'>+                *iter++ = 'a';</div><div class='add'>+                if (iter == placeholderEnd)</div><div class='add'>+                    return -1;</div><div class='ctx'>             } else {</div><div class='del'>-                if (isdigit(*trv))</div><div class='del'>-                    *trv = 'a';</div><div class='del'>-                else if (*trv == 'z') /* inc from z to A */</div><div class='del'>-                    *trv = 'A';</div><div class='add'>+                if (isdigit(*iter))</div><div class='add'>+                    *iter = 'a';</div><div class='add'>+                else if (*iter == 'z') /* inc from z to A */</div><div class='add'>+                    *iter = 'A';</div><div class='ctx'>                 else {</div><div class='del'>-                    if (trv == suffp)</div><div class='del'>-                        return 0;</div><div class='del'>-                    ++*trv;</div><div class='add'>+                    ++*iter;</div><div class='ctx'>                 }</div><div class='ctx'>                 break;</div><div class='ctx'>             }</div><div class='hunk'>@@ -278,14 +172,6 @@ static int _gettemp(char *path, int *doopen, int domkdir, int slen)</div><div class='ctx'>     /*NOTREACHED*/</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef Q_WS_WIN</div><div class='del'>-static int qt_mkstemps(char *path, int slen)</div><div class='del'>-{</div><div class='del'>-    int fd = 0;</div><div class='del'>-    return (_gettemp(path, &amp;fd, 0, slen) ? fd : -1);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> //************* QTemporaryFileEngine</div><div class='ctx'> class QTemporaryFileEngine : public QFSFileEngine</div><div class='ctx'> {</div><div class='hunk'>@@ -295,7 +181,7 @@ public:</div><div class='ctx'>         : QFSFileEngine(), filePathIsTemplate(fileIsTemplate)</div><div class='ctx'>     {</div><div class='ctx'>         Q_D(QFSFileEngine);</div><div class='del'>-        d-&gt;filePath = file;</div><div class='add'>+        d-&gt;fileEntry = QFileSystemEntry(file);</div><div class='ctx'> </div><div class='ctx'>         if (!filePathIsTemplate)</div><div class='ctx'>             QFSFileEngine::setFileName(file);</div><div class='hunk'>@@ -325,6 +211,9 @@ bool QTemporaryFileEngine::isReallyOpen()</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='ctx'> </div><div class='ctx'>     if (!((0 == d-&gt;fh) &amp;&amp; (-1 == d-&gt;fd)</div><div class='add'>+#if defined (Q_OS_SYMBIAN)</div><div class='add'>+                &amp;&amp; (0 == d-&gt;symbianFile.SubSessionHandle())</div><div class='add'>+#endif</div><div class='ctx'> #if defined Q_OS_WIN</div><div class='ctx'>                 &amp;&amp; (INVALID_HANDLE_VALUE == d-&gt;fileHandle)</div><div class='ctx'> #endif</div><div class='hunk'>@@ -346,7 +235,7 @@ void QTemporaryFileEngine::setFileTemplate(const QString &amp;fileTemplate)</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QFSFileEngine);</div><div class='ctx'>     if (filePathIsTemplate)</div><div class='del'>-        d-&gt;filePath = fileTemplate;</div><div class='add'>+        d-&gt;fileEntry = QFileSystemEntry(fileTemplate);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QTemporaryFileEngine::open(QIODevice::OpenMode openMode)</div><div class='hunk'>@@ -359,15 +248,50 @@ bool QTemporaryFileEngine::open(QIODevice::OpenMode openMode)</div><div class='ctx'>     if (!filePathIsTemplate)</div><div class='ctx'>         return QFSFileEngine::open(openMode);</div><div class='ctx'> </div><div class='del'>-    QString qfilename = d-&gt;filePath;</div><div class='del'>-    if(!qfilename.contains(QLatin1String("XXXXXX")))</div><div class='del'>-        qfilename += QLatin1String(".XXXXXX");</div><div class='add'>+    QString qfilename = d-&gt;fileEntry.filePath();</div><div class='ctx'> </div><div class='del'>-    int suffixLength = qfilename.length() - (qfilename.lastIndexOf(QLatin1String("XXXXXX"), -1, Qt::CaseSensitive) + 6);</div><div class='del'>-    char *filename = qstrdup(qfilename.toLocal8Bit());</div><div class='add'>+    // Find placeholder string.</div><div class='add'>+    uint phPos = qfilename.length();</div><div class='add'>+    uint phLength = 0;</div><div class='ctx'> </div><div class='del'>-#ifndef Q_WS_WIN</div><div class='del'>-    int fd = qt_mkstemps(filename, suffixLength);</div><div class='add'>+    while (phPos != 0) {</div><div class='add'>+        --phPos;</div><div class='add'>+</div><div class='add'>+        if (qfilename[phPos] == QLatin1Char('X')) {</div><div class='add'>+            ++phLength;</div><div class='add'>+            continue;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if (qfilename[phPos] == QLatin1Char('/')</div><div class='add'>+                || phLength &gt;= 6) {</div><div class='add'>+            ++phPos;</div><div class='add'>+            break;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        phLength = 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    QStringRef prefix, suffix;</div><div class='add'>+    if (phLength &lt; 6) {</div><div class='add'>+        qfilename += QLatin1Char('.');</div><div class='add'>+        prefix = QStringRef(&amp;qfilename);</div><div class='add'>+        phLength = 6;</div><div class='add'>+    } else {</div><div class='add'>+        prefix = qfilename.leftRef(phPos);</div><div class='add'>+        suffix = qfilename.midRef(phPos + phLength);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    QByteArray filename = prefix.toLocal8Bit();</div><div class='add'>+    phPos = filename.length();</div><div class='add'>+    if (suffix.isEmpty())</div><div class='add'>+        filename.resize(phPos + phLength);</div><div class='add'>+    else</div><div class='add'>+        filename.insert(phPos + phLength, suffix.toLocal8Bit());</div><div class='add'>+</div><div class='add'>+    char *path = filename.data();</div><div class='add'>+</div><div class='add'>+#ifndef Q_OS_WIN</div><div class='add'>+    int fd = createFileFromTemplate(path, path + phPos, path + phPos + phLength);</div><div class='ctx'>     if (fd != -1) {</div><div class='ctx'>         // First open the fd as an external file descriptor to</div><div class='ctx'>         // initialize the engine properly.</div><div class='hunk'>@@ -377,36 +301,29 @@ bool QTemporaryFileEngine::open(QIODevice::OpenMode openMode)</div><div class='ctx'>             d-&gt;closeFileHandle = true;</div><div class='ctx'> </div><div class='ctx'>             // Restore the file names (open() resets them).</div><div class='del'>-            d-&gt;filePath = QString::fromLocal8Bit(filename); //changed now!</div><div class='add'>+            d-&gt;fileEntry = QFileSystemEntry(QString::fromLocal8Bit(path, filename.length())); //note that filename is NOT a native path</div><div class='ctx'>             filePathIsTemplate = false;</div><div class='del'>-            d-&gt;nativeInitFileName();</div><div class='del'>-            delete [] filename;</div><div class='ctx'>             return true;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         QT_CLOSE(fd);</div><div class='ctx'>     }</div><div class='del'>-    delete [] filename;</div><div class='ctx'>     setError(errno == EMFILE ? QFile::ResourceError : QFile::OpenError, qt_error_string(errno));</div><div class='ctx'>     return false;</div><div class='ctx'> #else</div><div class='del'>-    if (!_gettemp(filename, 0, 0, suffixLength)) {</div><div class='del'>-        delete [] filename;</div><div class='add'>+    if (createFileFromTemplate(path, path + phPos, path + phPos + phLength) == -1) {</div><div class='ctx'>         return false;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    QString template_ = d-&gt;filePath;</div><div class='del'>-    d-&gt;filePath = QString::fromLocal8Bit(filename);</div><div class='del'>-    d-&gt;nativeInitFileName();</div><div class='del'>-    delete [] filename;</div><div class='add'>+    QString template_ = d-&gt;fileEntry.filePath();</div><div class='add'>+    d-&gt;fileEntry = QFileSystemEntry(QString::fromLocal8Bit(path, filename.length()));</div><div class='ctx'> </div><div class='ctx'>     if (QFSFileEngine::open(openMode)) {</div><div class='ctx'>         filePathIsTemplate = false;</div><div class='ctx'>         return true;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    d-&gt;filePath = template_;</div><div class='del'>-    d-&gt;nativeFilePath.clear();</div><div class='add'>+    d-&gt;fileEntry = QFileSystemEntry(template_);</div><div class='ctx'>     return false;</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -418,7 +335,7 @@ bool QTemporaryFileEngine::remove()</div><div class='ctx'>     // we must explicitly call QFSFileEngine::close() before we remove it.</div><div class='ctx'>     QFSFileEngine::close();</div><div class='ctx'>     if (QFSFileEngine::remove()) {</div><div class='del'>-        d-&gt;filePath.clear();</div><div class='add'>+        d-&gt;fileEntry.clear();</div><div class='ctx'>         return true;</div><div class='ctx'>     }</div><div class='ctx'>     return false;</div><div class='head'>diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp<br/>index d8fb8a2..7289bb6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qtextstream.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qtextstream.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qtextstream.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qtextstream.cpp</a></div><div class='hunk'>@@ -224,6 +224,7 @@ static const int QTEXTSTREAM_BUFFERSIZE = 16384;</div><div class='ctx'>     \value ReadPastEnd      The text stream has read past the end of the</div><div class='ctx'>                             data in the underlying device.</div><div class='ctx'>     \value ReadCorruptData  The text stream has read corrupt data.</div><div class='add'>+    \value WriteFailed      The text stream cannot write to the underlying device.</div><div class='ctx'> </div><div class='ctx'>     \sa status()</div><div class='ctx'> */</div><div class='hunk'>@@ -396,19 +397,19 @@ public:</div><div class='ctx'>         npsInvalidPrefix</div><div class='ctx'>     };</div><div class='ctx'> </div><div class='del'>-    inline bool write(const QString &amp;data);</div><div class='ctx'>     inline bool getChar(QChar *ch);</div><div class='ctx'>     inline void ungetChar(const QChar &amp;ch);</div><div class='ctx'>     NumberParsingStatus getNumber(qulonglong *l);</div><div class='ctx'>     bool getReal(double *f);</div><div class='ctx'> </div><div class='del'>-    bool putNumber(qulonglong number, bool negative);</div><div class='del'>-    inline bool putString(const QString &amp;ch, bool number = false);</div><div class='add'>+    inline void write(const QString &amp;data);</div><div class='add'>+    inline void putString(const QString &amp;ch, bool number = false);</div><div class='add'>+    void putNumber(qulonglong number, bool negative);</div><div class='ctx'> </div><div class='ctx'>     // buffers</div><div class='ctx'>     bool fillReadBuffer(qint64 maxBytes = -1);</div><div class='ctx'>     void resetReadBuffer();</div><div class='del'>-    bool flushWriteBuffer();</div><div class='add'>+    void flushWriteBuffer();</div><div class='ctx'>     QString writeBuffer;</div><div class='ctx'>     QString readBuffer;</div><div class='ctx'>     int readBufferOffset;</div><div class='hunk'>@@ -642,14 +643,20 @@ void QTextStreamPrivate::resetReadBuffer()</div><div class='ctx'> </div><div class='ctx'> /*! \internal</div><div class='ctx'> */</div><div class='del'>-bool QTextStreamPrivate::flushWriteBuffer()</div><div class='add'>+void QTextStreamPrivate::flushWriteBuffer()</div><div class='ctx'> {</div><div class='ctx'>     // no buffer next to the QString itself; this function should only</div><div class='ctx'>     // be called internally, for devices.</div><div class='ctx'>     if (string || !device)</div><div class='del'>-        return false;</div><div class='add'>+        return;</div><div class='add'>+</div><div class='add'>+    // Stream went bye-bye already. Appending further data may succeed again,</div><div class='add'>+    // but would create a corrupted stream anyway.</div><div class='add'>+    if (status != QTextStream::Ok)</div><div class='add'>+        return;</div><div class='add'>+</div><div class='ctx'>     if (writeBuffer.isEmpty())</div><div class='del'>-        return true;</div><div class='add'>+        return;</div><div class='ctx'> </div><div class='ctx'> #if defined (Q_OS_WIN)</div><div class='ctx'>     // handle text translation and bypass the Text flag in the device.</div><div class='hunk'>@@ -681,8 +688,10 @@ bool QTextStreamPrivate::flushWriteBuffer()</div><div class='ctx'>     qDebug("QTextStreamPrivate::flushWriteBuffer(), device-&gt;write(\"%s\") == %d",</div><div class='ctx'>            qt_prettyDebug(data.constData(), qMin(data.size(),32), data.size()).constData(), int(bytesWritten));</div><div class='ctx'> #endif</div><div class='del'>-    if (bytesWritten &lt;= 0)</div><div class='del'>-        return false;</div><div class='add'>+    if (bytesWritten &lt;= 0) {</div><div class='add'>+        status = QTextStream::WriteFailed;</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'> #if defined (Q_OS_WIN)</div><div class='ctx'>     // replace the text flag</div><div class='hunk'>@@ -693,7 +702,7 @@ bool QTextStreamPrivate::flushWriteBuffer()</div><div class='ctx'>     // flush the file</div><div class='ctx'> #ifndef QT_NO_QOBJECT</div><div class='ctx'>     QFile *file = qobject_cast&lt;QFile *&gt;(device);</div><div class='del'>-    bool flushed = file &amp;&amp; file-&gt;flush();</div><div class='add'>+    bool flushed = !file || file-&gt;flush();</div><div class='ctx'> #else</div><div class='ctx'>     bool flushed = true;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -702,7 +711,8 @@ bool QTextStreamPrivate::flushWriteBuffer()</div><div class='ctx'>     qDebug("QTextStreamPrivate::flushWriteBuffer() wrote %d bytes",</div><div class='ctx'>            int(bytesWritten));</div><div class='ctx'> #endif</div><div class='del'>-    return flushed &amp;&amp; bytesWritten == qint64(data.size());</div><div class='add'>+    if (!flushed || bytesWritten != qint64(data.size()))</div><div class='add'>+        status = QTextStream::WriteFailed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QString QTextStreamPrivate::read(int maxlen)</div><div class='hunk'>@@ -908,7 +918,7 @@ inline void QTextStreamPrivate::restoreToSavedConverterState()</div><div class='ctx'> </div><div class='ctx'> /*! \internal</div><div class='ctx'> */</div><div class='del'>-inline bool QTextStreamPrivate::write(const QString &amp;data)</div><div class='add'>+inline void QTextStreamPrivate::write(const QString &amp;data)</div><div class='ctx'> {</div><div class='ctx'>     if (string) {</div><div class='ctx'>         // ### What about seek()??</div><div class='hunk'>@@ -916,9 +926,8 @@ inline bool QTextStreamPrivate::write(const QString &amp;data)</div><div class='ctx'>     } else {</div><div class='ctx'>         writeBuffer += data;</div><div class='ctx'>         if (writeBuffer.size() &gt; QTEXTSTREAM_BUFFERSIZE)</div><div class='del'>-            return flushWriteBuffer();</div><div class='add'>+            flushWriteBuffer();</div><div class='ctx'>     }</div><div class='del'>-    return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*! \internal</div><div class='hunk'>@@ -959,7 +968,7 @@ inline void QTextStreamPrivate::ungetChar(const QChar &amp;ch)</div><div class='ctx'> </div><div class='ctx'> /*! \internal</div><div class='ctx'> */</div><div class='del'>-inline bool QTextStreamPrivate::putString(const QString &amp;s, bool number)</div><div class='add'>+inline void QTextStreamPrivate::putString(const QString &amp;s, bool number)</div><div class='ctx'> {</div><div class='ctx'>     QString tmp = s;</div><div class='ctx'> </div><div class='hunk'>@@ -993,7 +1002,7 @@ inline bool QTextStreamPrivate::putString(const QString &amp;s, bool number)</div><div class='ctx'>            qt_prettyDebug(a.constData(), a.size(), qMax(16, a.size())).constData(),</div><div class='ctx'>            qt_prettyDebug(b.constData(), b.size(), qMax(16, b.size())).constData());</div><div class='ctx'> #endif</div><div class='del'>-    return write(tmp);</div><div class='add'>+    write(tmp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -1255,6 +1264,7 @@ qint64 QTextStream::pos() const</div><div class='ctx'>                 return qint64(-1);</div><div class='ctx'>         }</div><div class='ctx'>         thatd-&gt;readBufferOffset = oldReadBufferOffset;</div><div class='add'>+        thatd-&gt;readConverterSavedStateOffset = 0;</div><div class='ctx'> </div><div class='ctx'>         // Return the device position.</div><div class='ctx'>         return d-&gt;device-&gt;pos();</div><div class='hunk'>@@ -1593,6 +1603,9 @@ void QTextStream::resetStatus()</div><div class='ctx'> </div><div class='ctx'>     Sets the status of the text stream to the \a status given.</div><div class='ctx'> </div><div class='add'>+    Subsequent calls to setStatus() are ignored until resetStatus()</div><div class='add'>+    is called.</div><div class='add'>+</div><div class='ctx'>     \sa Status status() resetStatus()</div><div class='ctx'> */</div><div class='ctx'> void QTextStream::setStatus(Status status)</div><div class='hunk'>@@ -2267,7 +2280,7 @@ QTextStream &amp;QTextStream::operator&gt;&gt;(char *c)</div><div class='ctx'> </div><div class='ctx'> /*! \internal</div><div class='ctx'>  */</div><div class='del'>-bool QTextStreamPrivate::putNumber(qulonglong number, bool negative)</div><div class='add'>+void QTextStreamPrivate::putNumber(qulonglong number, bool negative)</div><div class='ctx'> {</div><div class='ctx'>     QString result;</div><div class='ctx'> </div><div class='hunk'>@@ -2307,7 +2320,7 @@ bool QTextStreamPrivate::putNumber(qulonglong number, bool negative)</div><div class='ctx'>             result.prepend(QLatin1Char('0'));</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='del'>-    return putString(result, true);</div><div class='add'>+    putString(result, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='head'>diff --git a/src/corelib/io/qtextstream.h b/src/corelib/io/qtextstream.h<br/>index 5525d72..3747fab 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qtextstream.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qtextstream.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qtextstream.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qtextstream.h</a></div><div class='hunk'>@@ -89,7 +89,8 @@ public:</div><div class='ctx'>     enum Status {</div><div class='ctx'>         Ok,</div><div class='ctx'>         ReadPastEnd,</div><div class='del'>-        ReadCorruptData</div><div class='add'>+        ReadCorruptData,</div><div class='add'>+        WriteFailed</div><div class='ctx'>     };</div><div class='ctx'>     enum NumberFlag {</div><div class='ctx'>         ShowBase = 0x1,</div><div class='head'>diff --git a/src/corelib/io/qtldurl.cpp b/src/corelib/io/qtldurl.cpp<br/>new file mode 100644<br/>index 0000000..7db4bbd<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qtldurl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qtldurl.cpp</a></div><div class='hunk'>@@ -0,0 +1,117 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** No Commercial Usage</div><div class='add'>+** This file contains pre-release code and may not be distributed.</div><div class='add'>+** You may use this file in accordance with the terms and conditions</div><div class='add'>+** contained in the Technology Preview License Agreement accompanying</div><div class='add'>+** this package.</div><div class='add'>+**</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU Lesser</div><div class='add'>+** General Public License version 2.1 as published by the Free Software</div><div class='add'>+** Foundation and appearing in the file LICENSE.LGPL included in the</div><div class='add'>+** packaging of this file.  Please review the following information to</div><div class='add'>+** ensure the GNU Lesser General Public License version 2.1 requirements</div><div class='add'>+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights.  These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** If you have questions regarding the use of this file, please contact</div><div class='add'>+** Nokia at qt-info@nokia.com.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qplatformdefs.h"</div><div class='add'>+#include "qurl.h"</div><div class='add'>+#include "private/qurltlds_p.h"</div><div class='add'>+#include "private/qtldurl_p.h"</div><div class='add'>+#include "QtCore/qstringlist.h"</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+static bool containsTLDEntry(const QString &amp;entry)</div><div class='add'>+{</div><div class='add'>+    int index = qHash(entry) % tldCount;</div><div class='add'>+    int currentDomainIndex = tldIndices[index];</div><div class='add'>+    while (currentDomainIndex &lt; tldIndices[index+1]) {</div><div class='add'>+        QString currentEntry = QString::fromUtf8(tldData + currentDomainIndex);</div><div class='add'>+        if (currentEntry == entry)</div><div class='add'>+            return true;</div><div class='add'>+        currentDomainIndex += qstrlen(tldData + currentDomainIndex) + 1; // +1 for the ending \0</div><div class='add'>+    }</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \internal</div><div class='add'>+</div><div class='add'>+    Return the top-level-domain per Qt's copy of the Mozilla public suffix list of</div><div class='add'>+    \a domain.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+Q_CORE_EXPORT QString qTopLevelDomain(const QString &amp;domain)</div><div class='add'>+{</div><div class='add'>+    QStringList sections = domain.toLower().split(QLatin1Char('.'), QString::SkipEmptyParts);</div><div class='add'>+    if (sections.isEmpty())</div><div class='add'>+        return QString();</div><div class='add'>+</div><div class='add'>+    QString level, tld;</div><div class='add'>+    for (int j = sections.count() - 1; j &gt;= 0; --j) {</div><div class='add'>+        level.prepend(QLatin1Char('.') + sections.at(j));</div><div class='add'>+        if (qIsEffectiveTLD(level.right(level.size() - 1)))</div><div class='add'>+            tld = level;</div><div class='add'>+    }</div><div class='add'>+    return tld;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \internal</div><div class='add'>+</div><div class='add'>+    Return true if \a domain is a top-level-domain per Qt's copy of the Mozilla public suffix list.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+Q_CORE_EXPORT bool qIsEffectiveTLD(const QString &amp;domain)</div><div class='add'>+{</div><div class='add'>+    // for domain 'foo.bar.com':</div><div class='add'>+    // 1. return if TLD table contains 'foo.bar.com'</div><div class='add'>+    if (containsTLDEntry(domain))</div><div class='add'>+        return true;</div><div class='add'>+</div><div class='add'>+    if (domain.contains(QLatin1Char('.'))) {</div><div class='add'>+        int count = domain.size() - domain.indexOf(QLatin1Char('.'));</div><div class='add'>+        QString wildCardDomain;</div><div class='add'>+        wildCardDomain.reserve(count + 1);</div><div class='add'>+        wildCardDomain.append(QLatin1Char('*'));</div><div class='add'>+        wildCardDomain.append(domain.right(count));</div><div class='add'>+        // 2. if table contains '*.bar.com',</div><div class='add'>+        // test if table contains '!foo.bar.com'</div><div class='add'>+        if (containsTLDEntry(wildCardDomain)) {</div><div class='add'>+            QString exceptionDomain;</div><div class='add'>+            exceptionDomain.reserve(domain.size() + 1);</div><div class='add'>+            exceptionDomain.append(QLatin1Char('!'));</div><div class='add'>+            exceptionDomain.append(domain);</div><div class='add'>+            return (! containsTLDEntry(exceptionDomain));</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/io/qtldurl_p.h b/src/corelib/io/qtldurl_p.h<br/>new file mode 100644<br/>index 0000000..152ffa0<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qtldurl_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qtldurl_p.h</a></div><div class='hunk'>@@ -0,0 +1,66 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** No Commercial Usage</div><div class='add'>+** This file contains pre-release code and may not be distributed.</div><div class='add'>+** You may use this file in accordance with the terms and conditions</div><div class='add'>+** contained in the Technology Preview License Agreement accompanying</div><div class='add'>+** this package.</div><div class='add'>+**</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU Lesser</div><div class='add'>+** General Public License version 2.1 as published by the Free Software</div><div class='add'>+** Foundation and appearing in the file LICENSE.LGPL included in the</div><div class='add'>+** packaging of this file.  Please review the following information to</div><div class='add'>+** ensure the GNU Lesser General Public License version 2.1 requirements</div><div class='add'>+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights.  These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** If you have questions regarding the use of this file, please contact</div><div class='add'>+** Nokia at qt-info@nokia.com.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QTLDURL_P_H</div><div class='add'>+#define QTLDURL_P_H</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+//  W A R N I N G</div><div class='add'>+//  -------------</div><div class='add'>+//</div><div class='add'>+// This file is not part of the Qt API.  It exists for the convenience</div><div class='add'>+// of qDecodeDataUrl. This header file may change from version to</div><div class='add'>+// version without notice, or even be removed.</div><div class='add'>+//</div><div class='add'>+// We mean it.</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include "QtCore/qurl.h"</div><div class='add'>+#include "QtCore/qstring.h"</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+Q_CORE_EXPORT QString qTopLevelDomain(const QString &amp;domain);</div><div class='add'>+Q_CORE_EXPORT bool qIsEffectiveTLD(const QString &amp;domain);</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+#endif // QDATAURL_P_H</div><div class='head'>diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp<br/>index 2f0fd46..83b49ce 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qurl.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qurl.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qurl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qurl.cpp</a></div><div class='hunk'>@@ -192,7 +192,9 @@</div><div class='ctx'> #if defined QT3_SUPPORT</div><div class='ctx'> #include "qfileinfo.h"</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='add'>+#ifndef QT_BOOTSTRAPPED</div><div class='add'>+#include "qtldurl_p.h"</div><div class='add'>+#endif</div><div class='ctx'> #if defined(Q_OS_WINCE_WM)</div><div class='ctx'> #pragma optimize("g", off)</div><div class='ctx'> #endif</div><div class='hunk'>@@ -965,14 +967,14 @@ static void QT_FASTCALL _fragment(const char **ptr, QUrlParseData *parseData)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct NameprepCaseFoldingEntry {</div><div class='del'>-    int uc;</div><div class='add'>+    uint uc;</div><div class='ctx'>     ushort mapping[4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-inline bool operator&lt;(int one, const NameprepCaseFoldingEntry &amp;other)</div><div class='add'>+inline bool operator&lt;(uint one, const NameprepCaseFoldingEntry &amp;other)</div><div class='ctx'> { return one &lt; other.uc; }</div><div class='ctx'> </div><div class='del'>-inline bool operator&lt;(const NameprepCaseFoldingEntry &amp;one, int other)</div><div class='add'>+inline bool operator&lt;(const NameprepCaseFoldingEntry &amp;one, uint other)</div><div class='ctx'> { return one.uc &lt; other; }</div><div class='ctx'> </div><div class='ctx'> static const NameprepCaseFoldingEntry NameprepCaseFolding[] = {</div><div class='hunk'>@@ -1861,45 +1863,44 @@ static const NameprepCaseFoldingEntry NameprepCaseFolding[] = {</div><div class='ctx'> 	{ 0xFF38, { 0xFF58, 0x0000, 0x0000, 0x0000 } },</div><div class='ctx'> 	{ 0xFF39, { 0xFF59, 0x0000, 0x0000, 0x0000 } },</div><div class='ctx'> 	{ 0xFF3A, { 0xFF5A, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-        // #####</div><div class='del'>-/*	{ 0x10400, { 0x10428, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10401, { 0x10429, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10402, { 0x1042A, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10403, { 0x1042B, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10404, { 0x1042C, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10405, { 0x1042D, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10406, { 0x1042E, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10407, { 0x1042F, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10408, { 0x10430, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10409, { 0x10431, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x1040A, { 0x10432, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x1040B, { 0x10433, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x1040C, { 0x10434, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x1040D, { 0x10435, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x1040E, { 0x10436, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x1040F, { 0x10437, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10410, { 0x10438, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10411, { 0x10439, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10412, { 0x1043A, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10413, { 0x1043B, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10414, { 0x1043C, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10415, { 0x1043D, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10416, { 0x1043E, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10417, { 0x1043F, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10418, { 0x10440, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10419, { 0x10441, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x1041A, { 0x10442, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x1041B, { 0x10443, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x1041C, { 0x10444, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x1041D, { 0x10445, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x1041E, { 0x10446, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x1041F, { 0x10447, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10420, { 0x10448, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10421, { 0x10449, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10422, { 0x1044A, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10423, { 0x1044B, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10424, { 0x1044C, 0x0000, 0x0000, 0x0000 } },</div><div class='del'>-	{ 0x10425, { 0x1044D, 0x0000, 0x0000, 0x0000 } },*/</div><div class='add'>+	{ 0x10400, { 0xd801, 0xdc28, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10401, { 0xd801, 0xdc29, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10402, { 0xd801, 0xdc2A, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10403, { 0xd801, 0xdc2B, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10404, { 0xd801, 0xdc2C, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10405, { 0xd801, 0xdc2D, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10406, { 0xd801, 0xdc2E, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10407, { 0xd801, 0xdc2F, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10408, { 0xd801, 0xdc30, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10409, { 0xd801, 0xdc31, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x1040A, { 0xd801, 0xdc32, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x1040B, { 0xd801, 0xdc33, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x1040C, { 0xd801, 0xdc34, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x1040D, { 0xd801, 0xdc35, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x1040E, { 0xd801, 0xdc36, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x1040F, { 0xd801, 0xdc37, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10410, { 0xd801, 0xdc38, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10411, { 0xd801, 0xdc39, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10412, { 0xd801, 0xdc3A, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10413, { 0xd801, 0xdc3B, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10414, { 0xd801, 0xdc3C, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10415, { 0xd801, 0xdc3D, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10416, { 0xd801, 0xdc3E, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10417, { 0xd801, 0xdc3F, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10418, { 0xd801, 0xdc40, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10419, { 0xd801, 0xdc41, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x1041A, { 0xd801, 0xdc42, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x1041B, { 0xd801, 0xdc43, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x1041C, { 0xd801, 0xdc44, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x1041D, { 0xd801, 0xdc45, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x1041E, { 0xd801, 0xdc46, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x1041F, { 0xd801, 0xdc47, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10420, { 0xd801, 0xdc48, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10421, { 0xd801, 0xdc49, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10422, { 0xd801, 0xdc4A, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10423, { 0xd801, 0xdc4B, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10424, { 0xd801, 0xdc4C, 0x0000, 0x0000 } },</div><div class='add'>+	{ 0x10425, { 0xd801, 0xdc4D, 0x0000, 0x0000 } },</div><div class='ctx'> 	{ 0x1D400, { 0x0061, 0x0000, 0x0000, 0x0000 } },</div><div class='ctx'> 	{ 0x1D401, { 0x0062, 0x0000, 0x0000, 0x0000 } },</div><div class='ctx'> 	{ 0x1D402, { 0x0063, 0x0000, 0x0000, 0x0000 } },</div><div class='hunk'>@@ -2354,17 +2355,23 @@ static void mapToLowerCase(QString *str, int from)</div><div class='ctx'> {</div><div class='ctx'>     int N = sizeof(NameprepCaseFolding) / sizeof(NameprepCaseFolding[0]);</div><div class='ctx'> </div><div class='del'>-    QChar *d = 0;</div><div class='add'>+    ushort *d = 0;</div><div class='ctx'>     for (int i = from; i &lt; str-&gt;size(); ++i) {</div><div class='del'>-        int uc = str-&gt;at(i).unicode();</div><div class='add'>+        uint uc = str-&gt;at(i).unicode();</div><div class='ctx'>         if (uc &lt; 0x80) {</div><div class='ctx'>             if (uc &lt;= 'Z' &amp;&amp; uc &gt;= 'A') {</div><div class='del'>-                uc |= 0x20;</div><div class='ctx'>                 if (!d)</div><div class='del'>-                    d = str-&gt;data();</div><div class='del'>-                d[i] = QChar(uc);</div><div class='add'>+                    d = reinterpret_cast&lt;ushort *&gt;(str-&gt;data());</div><div class='add'>+                d[i] = (uc | 0x20);</div><div class='ctx'>             }</div><div class='ctx'>         } else {</div><div class='add'>+            if (QChar(uc).isHighSurrogate() &amp;&amp; i &lt; str-&gt;size() - 1) {</div><div class='add'>+                ushort low = str-&gt;at(i + 1).unicode();</div><div class='add'>+                if (QChar(low).isLowSurrogate()) {</div><div class='add'>+                    uc = QChar::surrogateToUcs4(uc, low);</div><div class='add'>+                    ++i;</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='ctx'>             const NameprepCaseFoldingEntry *entry = qBinaryFind(NameprepCaseFolding,</div><div class='ctx'>                                                                 NameprepCaseFolding + N,</div><div class='ctx'>                                                                 uc);</div><div class='hunk'>@@ -2373,23 +2380,26 @@ static void mapToLowerCase(QString *str, int from)</div><div class='ctx'>                 while (l &lt; 4 &amp;&amp; entry-&gt;mapping[l])</div><div class='ctx'>                     ++l;</div><div class='ctx'>                 if (l &gt; 1) {</div><div class='del'>-                    str-&gt;replace(i, 1, (const QChar *)&amp;entry-&gt;mapping[0], l);</div><div class='add'>+                    if (uc &lt;= 0xffff)</div><div class='add'>+                        str-&gt;replace(i, 1, reinterpret_cast&lt;const QChar *&gt;(&amp;entry-&gt;mapping[0]), l);</div><div class='add'>+                    else</div><div class='add'>+                        str-&gt;replace(i-1, 2, reinterpret_cast&lt;const QChar *&gt;(&amp;entry-&gt;mapping[0]), l);</div><div class='ctx'>                     d = 0;</div><div class='ctx'>                 } else {</div><div class='ctx'>                     if (!d)</div><div class='del'>-                        d = str-&gt;data();</div><div class='del'>-                    d[i] = QChar(entry-&gt;mapping[0]);</div><div class='add'>+                        d = reinterpret_cast&lt;ushort *&gt;(str-&gt;data());</div><div class='add'>+                    d[i] = entry-&gt;mapping[0];</div><div class='ctx'>                 }</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool isMappedToNothing(const QChar &amp;ch)</div><div class='add'>+static bool isMappedToNothing(uint uc)</div><div class='ctx'> {</div><div class='del'>-    if (ch.unicode() &lt; 0xad)</div><div class='add'>+    if (uc &lt; 0xad)</div><div class='ctx'>         return false;</div><div class='del'>-    switch (ch.unicode()) {</div><div class='add'>+    switch (uc) {</div><div class='ctx'>     case 0x00AD: case 0x034F: case 0x1806: case 0x180B: case 0x180C: case 0x180D:</div><div class='ctx'>     case 0x200B: case 0x200C: case 0x200D: case 0x2060: case 0xFE00: case 0xFE01:</div><div class='ctx'>     case 0xFE02: case 0xFE03: case 0xFE04: case 0xFE05: case 0xFE06: case 0xFE07:</div><div class='hunk'>@@ -2408,66 +2418,72 @@ static void stripProhibitedOutput(QString *str, int from)</div><div class='ctx'>     const ushort *in = out;</div><div class='ctx'>     const ushort *end = (ushort *)str-&gt;data() + str-&gt;size();</div><div class='ctx'>     while (in &lt; end) {</div><div class='del'>-        ushort uc = *in;</div><div class='del'>-        if (uc &lt; 0x80 ||</div><div class='del'>-            !(uc &lt;= 0x009F</div><div class='del'>-            || uc == 0x00A0</div><div class='del'>-            || uc == 0x0340</div><div class='del'>-            || uc == 0x0341</div><div class='del'>-            || uc == 0x06DD</div><div class='del'>-            || uc == 0x070F</div><div class='del'>-            || uc == 0x1680</div><div class='del'>-            || uc == 0x180E</div><div class='del'>-            || (uc &gt;= 0x2000 &amp;&amp; uc &lt;= 0x200B)</div><div class='del'>-            || uc == 0x200C</div><div class='del'>-            || uc == 0x200D</div><div class='del'>-            || uc == 0x200E</div><div class='del'>-            || uc == 0x200F</div><div class='del'>-            || (uc &gt;= 0x2028 &amp;&amp; uc &lt;= 0x202F)</div><div class='del'>-            || uc == 0x205F</div><div class='del'>-            || (uc &gt;= 0x2060 &amp;&amp; uc &lt;= 0x2063)</div><div class='del'>-            || uc == 0x206A</div><div class='del'>-            || (uc &gt;= 0x206A &amp;&amp; uc &lt;= 0x206F)</div><div class='del'>-            || (uc &gt;= 0x2FF0 &amp;&amp; uc &lt;= 0x2FFB)</div><div class='del'>-            || uc == 0x3000</div><div class='del'>-            || (uc &gt;= 0xD800 &amp;&amp; uc &lt;= 0xDFFF)</div><div class='del'>-            || (uc &gt;= 0xE000 &amp;&amp; uc &lt;= 0xF8FF)</div><div class='del'>-            || (uc &gt;= 0xFDD0 &amp;&amp; uc &lt;= 0xFDEF)</div><div class='del'>-            || uc == 0xFEFF</div><div class='del'>-            || (uc &gt;= 0xFFF9 &amp;&amp; uc &lt;= 0xFFFC)</div><div class='del'>-            || (uc &gt;= 0xFFFA &amp;&amp; (uc &lt;= 0xFFFE || uc == 0xFFFF))</div><div class='del'>-              /* ### Add NAMEPREP support for surrogates</div><div class='del'>-            || uc == 0xE0001</div><div class='del'>-            || (uc &gt;= 0x2FFFE &amp;&amp; uc &lt;= 0x2FFFF)</div><div class='del'>-            || (uc &gt;= 0x1D173 &amp;&amp; uc &lt;= 0x1D17A)</div><div class='del'>-            || (uc &gt;= 0x1FFFE &amp;&amp; uc &lt;= 0x1FFFF)</div><div class='del'>-            || (uc &gt;= 0x3FFFE &amp;&amp; uc &lt;= 0x3FFFF)</div><div class='del'>-            || (uc &gt;= 0x4FFFE &amp;&amp; uc &lt;= 0x4FFFF)</div><div class='del'>-            || (uc &gt;= 0x5FFFE &amp;&amp; uc &lt;= 0x5FFFF)</div><div class='del'>-            || (uc &gt;= 0x6FFFE &amp;&amp; uc &lt;= 0x6FFFF)</div><div class='del'>-            || (uc &gt;= 0x7FFFE &amp;&amp; uc &lt;= 0x7FFFF)</div><div class='del'>-            || (uc &gt;= 0x8FFFE &amp;&amp; uc &lt;= 0x8FFFF)</div><div class='del'>-            || (uc &gt;= 0x9FFFE &amp;&amp; uc &lt;= 0x9FFFF)</div><div class='del'>-            || (uc &gt;= 0xAFFFE &amp;&amp; uc &lt;= 0xAFFFF)</div><div class='del'>-            || (uc &gt;= 0xBFFFE &amp;&amp; uc &lt;= 0xBFFFF)</div><div class='del'>-            || (uc &gt;= 0xCFFFE &amp;&amp; uc &lt;= 0xCFFFF)</div><div class='del'>-            || (uc &gt;= 0xDFFFE &amp;&amp; uc &lt;= 0xDFFFF)</div><div class='del'>-            || (uc &gt;= 0xE0020 &amp;&amp; uc &lt;= 0xE007F)</div><div class='del'>-            || (uc &gt;= 0xEFFFE &amp;&amp; uc &lt;= 0xEFFFF)</div><div class='del'>-            || (uc &gt;= 0xF0000 &amp;&amp; uc &lt;= 0xFFFFD)</div><div class='del'>-            || (uc &gt;= 0xFFFFE &amp;&amp; uc &lt;= 0xFFFFF)</div><div class='del'>-            || (uc &gt;= 0x100000 &amp;&amp; uc &lt;= 0x10FFFD)</div><div class='del'>-            || (uc &gt;= 0x10FFFE &amp;&amp; uc &lt;= 0x10FFFF)*/))</div><div class='del'>-            *out++ = *in;</div><div class='add'>+        uint uc = *in;</div><div class='add'>+        if (QChar(uc).isHighSurrogate() &amp;&amp; in &lt; end - 1) {</div><div class='add'>+            ushort low = *(in + 1);</div><div class='add'>+            if (QChar(low).isLowSurrogate()) {</div><div class='add'>+                ++in;</div><div class='add'>+                uc = QChar::surrogateToUcs4(uc, low);</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        if (uc &lt;= 0xFFFF) {</div><div class='add'>+            if (uc &lt; 0x80 ||</div><div class='add'>+                !(uc &lt;= 0x009F</div><div class='add'>+                || uc == 0x00A0</div><div class='add'>+                || uc == 0x0340</div><div class='add'>+                || uc == 0x0341</div><div class='add'>+                || uc == 0x06DD</div><div class='add'>+                || uc == 0x070F</div><div class='add'>+                || uc == 0x1680</div><div class='add'>+                || uc == 0x180E</div><div class='add'>+                || (uc &gt;= 0x2000 &amp;&amp; uc &lt;= 0x200F)</div><div class='add'>+                || (uc &gt;= 0x2028 &amp;&amp; uc &lt;= 0x202F)</div><div class='add'>+                || uc == 0x205F</div><div class='add'>+                || (uc &gt;= 0x2060 &amp;&amp; uc &lt;= 0x2063)</div><div class='add'>+                || (uc &gt;= 0x206A &amp;&amp; uc &lt;= 0x206F)</div><div class='add'>+                || (uc &gt;= 0x2FF0 &amp;&amp; uc &lt;= 0x2FFB)</div><div class='add'>+                || uc == 0x3000</div><div class='add'>+                || (uc &gt;= 0xD800 &amp;&amp; uc &lt;= 0xDFFF)</div><div class='add'>+                || (uc &gt;= 0xE000 &amp;&amp; uc &lt;= 0xF8FF)</div><div class='add'>+                || (uc &gt;= 0xFDD0 &amp;&amp; uc &lt;= 0xFDEF)</div><div class='add'>+                || uc == 0xFEFF</div><div class='add'>+                || (uc &gt;= 0xFFF9 &amp;&amp; uc &lt;= 0xFFFF))) {</div><div class='add'>+                *out++ = *in;</div><div class='add'>+            }</div><div class='add'>+        } else {</div><div class='add'>+            if (!((uc &gt;= 0x1D173 &amp;&amp; uc &lt;= 0x1D17A)</div><div class='add'>+                || (uc &gt;= 0x1FFFE &amp;&amp; uc &lt;= 0x1FFFF)</div><div class='add'>+                || (uc &gt;= 0x2FFFE &amp;&amp; uc &lt;= 0x2FFFF)</div><div class='add'>+                || (uc &gt;= 0x3FFFE &amp;&amp; uc &lt;= 0x3FFFF)</div><div class='add'>+                || (uc &gt;= 0x4FFFE &amp;&amp; uc &lt;= 0x4FFFF)</div><div class='add'>+                || (uc &gt;= 0x5FFFE &amp;&amp; uc &lt;= 0x5FFFF)</div><div class='add'>+                || (uc &gt;= 0x6FFFE &amp;&amp; uc &lt;= 0x6FFFF)</div><div class='add'>+                || (uc &gt;= 0x7FFFE &amp;&amp; uc &lt;= 0x7FFFF)</div><div class='add'>+                || (uc &gt;= 0x8FFFE &amp;&amp; uc &lt;= 0x8FFFF)</div><div class='add'>+                || (uc &gt;= 0x9FFFE &amp;&amp; uc &lt;= 0x9FFFF)</div><div class='add'>+                || (uc &gt;= 0xAFFFE &amp;&amp; uc &lt;= 0xAFFFF)</div><div class='add'>+                || (uc &gt;= 0xBFFFE &amp;&amp; uc &lt;= 0xBFFFF)</div><div class='add'>+                || (uc &gt;= 0xCFFFE &amp;&amp; uc &lt;= 0xCFFFF)</div><div class='add'>+                || (uc &gt;= 0xDFFFE &amp;&amp; uc &lt;= 0xDFFFF)</div><div class='add'>+                || uc == 0xE0001</div><div class='add'>+                || (uc &gt;= 0xE0020 &amp;&amp; uc &lt;= 0xE007F)</div><div class='add'>+                || (uc &gt;= 0xEFFFE &amp;&amp; uc &lt;= 0xEFFFF)</div><div class='add'>+                || (uc &gt;= 0xF0000 &amp;&amp; uc &lt;= 0xFFFFD)</div><div class='add'>+                || (uc &gt;= 0xFFFFE &amp;&amp; uc &lt;= 0xFFFFF)</div><div class='add'>+                || (uc &gt;= 0x100000 &amp;&amp; uc &lt;= 0x10FFFD)</div><div class='add'>+                || (uc &gt;= 0x10FFFE &amp;&amp; uc &lt;= 0x10FFFF))) {</div><div class='add'>+                *out++ = QChar::highSurrogate(uc);</div><div class='add'>+                *out++ = QChar::lowSurrogate(uc);</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='ctx'>         ++in;</div><div class='ctx'>     }</div><div class='ctx'>     if (in != out)</div><div class='ctx'>         str-&gt;truncate(out - str-&gt;utf16());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool isBidirectionalRorAL(const QChar &amp;c)</div><div class='add'>+static bool isBidirectionalRorAL(uint uc)</div><div class='ctx'> {</div><div class='del'>-    ushort uc = c.unicode();</div><div class='ctx'>     if (uc &lt; 0x5b0)</div><div class='ctx'>         return false;</div><div class='ctx'>     return uc == 0x05BE</div><div class='hunk'>@@ -2506,9 +2522,8 @@ static bool isBidirectionalRorAL(const QChar &amp;c)</div><div class='ctx'>         || (uc &gt;= 0xFE76 &amp;&amp; uc &lt;= 0xFEFC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool isBidirectionalL(const QChar &amp;ch)</div><div class='add'>+static bool isBidirectionalL(uint uc)</div><div class='ctx'> {</div><div class='del'>-    ushort uc = ch.unicode();</div><div class='ctx'>     if (uc &lt; 0xaa)</div><div class='ctx'>         return (uc &gt;= 0x0041 &amp;&amp; uc &lt;= 0x005A)</div><div class='ctx'>             || (uc &gt;= 0x0061 &amp;&amp; uc &lt;= 0x007A);</div><div class='hunk'>@@ -2873,8 +2888,7 @@ static bool isBidirectionalL(const QChar &amp;ch)</div><div class='ctx'>         return true;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    /* ### Add NAMEPREP support for surrogates</div><div class='del'>-       || (uc &gt;= 0x10300 &amp;&amp; uc &lt;= 0x1031E)</div><div class='add'>+    if ((uc &gt;= 0x10300 &amp;&amp; uc &lt;= 0x1031E)</div><div class='ctx'>        || (uc &gt;= 0x10320 &amp;&amp; uc &lt;= 0x10323)</div><div class='ctx'>        || (uc &gt;= 0x10330 &amp;&amp; uc &lt;= 0x1034A)</div><div class='ctx'>        || (uc &gt;= 0x10400 &amp;&amp; uc &lt;= 0x10425)</div><div class='hunk'>@@ -2910,7 +2924,9 @@ static bool isBidirectionalL(const QChar &amp;ch)</div><div class='ctx'>        || (uc &gt;= 0x20000 &amp;&amp; uc &lt;= 0x2A6D6)</div><div class='ctx'>        || (uc &gt;= 0x2F800 &amp;&amp; uc &lt;= 0x2FA1D)</div><div class='ctx'>        || (uc &gt;= 0xF0000 &amp;&amp; uc &lt;= 0xFFFFD)</div><div class='del'>-       || (uc &gt;= 0x100000 &amp;&amp; uc &lt;= 0x10FFFD)*/</div><div class='add'>+       || (uc &gt;= 0x100000 &amp;&amp; uc &lt;= 0x10FFFD)) {</div><div class='add'>+        return true;</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     return false;</div><div class='ctx'> }</div><div class='hunk'>@@ -2943,13 +2959,37 @@ void qt_nameprep(QString *source, int from)</div><div class='ctx'>         return; // everything was mapped easily (lowercased, actually)</div><div class='ctx'>     int firstNonAscii = out - src;</div><div class='ctx'> </div><div class='add'>+    // Characters unassigned in Unicode 3.2 are not allowed in "stored string" scheme</div><div class='add'>+    // but allowed in "query" scheme</div><div class='add'>+    // (Table A.1)</div><div class='add'>+    const bool isUnassignedAllowed = false; // ###</div><div class='ctx'>     // Characters commonly mapped to nothing are simply removed</div><div class='ctx'>     // (Table B.1)</div><div class='ctx'>     const QChar *in = out;</div><div class='del'>-    while (in &lt; e) {</div><div class='del'>-        if (!isMappedToNothing(*in))</div><div class='del'>-            *out++ = *in;</div><div class='del'>-        ++in;</div><div class='add'>+    for ( ; in &lt; e; ++in) {</div><div class='add'>+        uint uc = in-&gt;unicode();</div><div class='add'>+        if (QChar(uc).isHighSurrogate() &amp;&amp; in &lt; e - 1) {</div><div class='add'>+            ushort low = in[1].unicode();</div><div class='add'>+            if (QChar(low).isLowSurrogate()) {</div><div class='add'>+                ++in;</div><div class='add'>+                uc = QChar::surrogateToUcs4(uc, low);</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        if (!isUnassignedAllowed) {</div><div class='add'>+            QChar::UnicodeVersion version = QChar::unicodeVersion(uc);</div><div class='add'>+            if (version == QChar::Unicode_Unassigned || version &gt; QChar::Unicode_3_2) {</div><div class='add'>+                source-&gt;resize(from); // not allowed, clear the label</div><div class='add'>+                return;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        if (!isMappedToNothing(uc)) {</div><div class='add'>+            if (uc &lt;= 0xFFFF) {</div><div class='add'>+                *out++ = *in;</div><div class='add'>+            } else {</div><div class='add'>+                *out++ = QChar::highSurrogate(uc);</div><div class='add'>+                *out++ = QChar::lowSurrogate(uc);</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='ctx'>     if (out != in)</div><div class='ctx'>         source-&gt;truncate(out - src);</div><div class='hunk'>@@ -2960,7 +3000,8 @@ void qt_nameprep(QString *source, int from)</div><div class='ctx'>     // Normalize to Unicode 3.2 form KC</div><div class='ctx'>     extern void qt_string_normalize(QString *data, QString::NormalizationForm mode,</div><div class='ctx'>                                     QChar::UnicodeVersion version, int from);</div><div class='del'>-    qt_string_normalize(source, QString::NormalizationForm_KC, QChar::Unicode_3_2, firstNonAscii);</div><div class='add'>+    qt_string_normalize(source, QString::NormalizationForm_KC, QChar::Unicode_3_2,</div><div class='add'>+                        firstNonAscii &gt; from ? firstNonAscii - 1 : from);</div><div class='ctx'> </div><div class='ctx'>     // Strip prohibited output</div><div class='ctx'>     stripProhibitedOutput(source, firstNonAscii);</div><div class='hunk'>@@ -2971,14 +3012,22 @@ void qt_nameprep(QString *source, int from)</div><div class='ctx'>     src = source-&gt;data();</div><div class='ctx'>     e = src + source-&gt;size();</div><div class='ctx'>     for (in = src + from; in &lt; e &amp;&amp; (!containsLCat || !containsRandALCat); ++in) {</div><div class='del'>-        if (isBidirectionalL(*in))</div><div class='add'>+        uint uc = in-&gt;unicode();</div><div class='add'>+        if (QChar(uc).isHighSurrogate() &amp;&amp; in &lt; e - 1) {</div><div class='add'>+            ushort low = in[1].unicode();</div><div class='add'>+            if (QChar(low).isLowSurrogate()) {</div><div class='add'>+                ++in;</div><div class='add'>+                uc = QChar::surrogateToUcs4(uc, low);</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        if (isBidirectionalL(uc))</div><div class='ctx'>             containsLCat = true;</div><div class='del'>-        else if (isBidirectionalRorAL(*in))</div><div class='add'>+        else if (isBidirectionalRorAL(uc))</div><div class='ctx'>             containsRandALCat = true;</div><div class='ctx'>     }</div><div class='ctx'>     if (containsRandALCat) {</div><div class='del'>-        if (containsLCat || (!isBidirectionalRorAL(src[from])</div><div class='del'>-                             || !isBidirectionalRorAL(e[-1])))</div><div class='add'>+        if (containsLCat || (!isBidirectionalRorAL(src[from].unicode())</div><div class='add'>+                             || !isBidirectionalRorAL(e[-1].unicode())))</div><div class='ctx'>             source-&gt;resize(from); // not allowed, clear the label</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='hunk'>@@ -5546,6 +5595,21 @@ bool QUrl::hasFragment() const</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns the TLD (Top-Level Domain) of the URL, (e.g. .co.uk, .net).</div><div class='add'>+    Note that the return value is prefixed with a '.' unless the</div><div class='add'>+    URL does not contain a valid TLD, in which case the function returns</div><div class='add'>+    an empty string.</div><div class='add'>+*/</div><div class='add'>+#ifndef QT_BOOTSTRAPPED</div><div class='add'>+QString QUrl::topLevelDomain() const</div><div class='add'>+{</div><div class='add'>+    return qTopLevelDomain(host());</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*!</div><div class='ctx'>     Returns the result of the merge of this URL with \a relative. This</div><div class='ctx'>     URL is used as a base to convert \a relative to an absolute URL.</div><div class='ctx'> </div><div class='hunk'>@@ -6002,6 +6066,14 @@ QUrl &amp;QUrl::operator =(const QString &amp;url)</div><div class='ctx'>     return *this;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*!</div><div class='add'>+    \fn void QUrl::swap(QUrl &amp;other)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Swaps URL \a other with this URL. This operation is very</div><div class='add'>+    fast and never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='ctx'> /*! \internal</div><div class='ctx'> </div><div class='ctx'>     Forces a detach.</div><div class='hunk'>@@ -6024,19 +6096,22 @@ bool QUrl::isDetached() const</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='del'>-    Returns a QUrl representation of \a localFile, interpreted as a</div><div class='del'>-    local file.</div><div class='add'>+    Returns a QUrl representation of \a localFile, interpreted as a local</div><div class='add'>+    file. This function accepts paths separated by slashes as well as the</div><div class='add'>+    native separator for this platform.</div><div class='add'>+</div><div class='add'>+    This function also accepts paths with a doubled leading slash (or</div><div class='add'>+    backslash) to indicate a remote file, as in</div><div class='add'>+    "//servername/path/to/file.txt". Note that only certain platforms can</div><div class='add'>+    actually open this file using QFile::open().</div><div class='ctx'> </div><div class='del'>-    \sa toLocalFile()</div><div class='add'>+    \sa toLocalFile(), isLocalFile(), QDir::toNativeSeparators</div><div class='ctx'> */</div><div class='ctx'> QUrl QUrl::fromLocalFile(const QString &amp;localFile)</div><div class='ctx'> {</div><div class='ctx'>     QUrl url;</div><div class='ctx'>     url.setScheme(QLatin1String("file"));</div><div class='del'>-    QString deslashified = localFile;</div><div class='del'>-    deslashified.replace(QLatin1Char('\\'), QLatin1Char('/'));</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+    QString deslashified = QDir::fromNativeSeparators(localFile);</div><div class='ctx'> </div><div class='ctx'>     // magic for drives on windows</div><div class='ctx'>     if (deslashified.length() &gt; 1 &amp;&amp; deslashified.at(1) == QLatin1Char(':') &amp;&amp; deslashified.at(0) != QLatin1Char('/')) {</div><div class='hunk'>@@ -6055,35 +6130,61 @@ QUrl QUrl::fromLocalFile(const QString &amp;localFile)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='del'>-    Returns the path of this URL formatted as a local file path.</div><div class='add'>+    Returns the path of this URL formatted as a local file path. The path</div><div class='add'>+    returned will use forward slashes, even if it was originally created</div><div class='add'>+    from one with backslashes.</div><div class='ctx'> </div><div class='del'>-    \sa fromLocalFile()</div><div class='add'>+    If this URL contains a non-empty hostname, it will be encoded in the</div><div class='add'>+    returned value in the form found on SMB networks (for example,</div><div class='add'>+    "//servername/path/to/file.txt").</div><div class='add'>+</div><div class='add'>+    \sa fromLocalFile(), isLocalFile()</div><div class='ctx'> */</div><div class='ctx'> QString QUrl::toLocalFile() const</div><div class='ctx'> {</div><div class='del'>-    if (!d) return QString();</div><div class='del'>-    if (!QURL_HASFLAG(d-&gt;stateFlags, QUrlPrivate::Parsed)) d-&gt;parse();</div><div class='add'>+    // the call to isLocalFile() also ensures that we're parsed</div><div class='add'>+    if (!isLocalFile())</div><div class='add'>+        return QString();</div><div class='ctx'> </div><div class='ctx'>     QString tmp;</div><div class='ctx'>     QString ourPath = path();</div><div class='del'>-    if (d-&gt;scheme.isEmpty() || QString::compare(d-&gt;scheme, QLatin1String("file"), Qt::CaseInsensitive) == 0) {</div><div class='ctx'> </div><div class='del'>-        // magic for shared drive on windows</div><div class='del'>-        if (!d-&gt;host.isEmpty()) {</div><div class='del'>-            tmp = QLatin1String("//") + d-&gt;host + (ourPath.length() &gt; 0 &amp;&amp; ourPath.at(0) != QLatin1Char('/')</div><div class='del'>-                                                  ? QLatin1Char('/') + ourPath :  ourPath);</div><div class='del'>-        } else {</div><div class='del'>-            tmp = ourPath;</div><div class='del'>-            // magic for drives on windows</div><div class='del'>-            if (ourPath.length() &gt; 2 &amp;&amp; ourPath.at(0) == QLatin1Char('/') &amp;&amp; ourPath.at(2) == QLatin1Char(':'))</div><div class='del'>-                tmp.remove(0, 1);</div><div class='del'>-        }</div><div class='add'>+    // magic for shared drive on windows</div><div class='add'>+    if (!d-&gt;host.isEmpty()) {</div><div class='add'>+        tmp = QLatin1String("//") + d-&gt;host + (ourPath.length() &gt; 0 &amp;&amp; ourPath.at(0) != QLatin1Char('/')</div><div class='add'>+                                               ? QLatin1Char('/') + ourPath :  ourPath);</div><div class='add'>+    } else {</div><div class='add'>+        tmp = ourPath;</div><div class='add'>+        // magic for drives on windows</div><div class='add'>+        if (ourPath.length() &gt; 2 &amp;&amp; ourPath.at(0) == QLatin1Char('/') &amp;&amp; ourPath.at(2) == QLatin1Char(':'))</div><div class='add'>+            tmp.remove(0, 1);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     return tmp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \since 4.7</div><div class='add'>+    Returns true if this URL is pointing to a local file path. A URL is a</div><div class='add'>+    local file path if the scheme is "file".</div><div class='add'>+</div><div class='add'>+    Note that this function considers URLs with hostnames to be local file</div><div class='add'>+    paths, even if the eventual file path cannot be opened with</div><div class='add'>+    QFile::open().</div><div class='add'>+</div><div class='add'>+    \sa fromLocalFile(), toLocalFile()</div><div class='add'>+*/</div><div class='add'>+bool QUrl::isLocalFile() const</div><div class='add'>+{</div><div class='add'>+    if (!d) return false;</div><div class='add'>+    if (!QURL_HASFLAG(d-&gt;stateFlags, QUrlPrivate::Parsed)) d-&gt;parse();</div><div class='add'>+</div><div class='add'>+    if (d-&gt;scheme.compare(QLatin1String("file"), Qt::CaseInsensitive) != 0)</div><div class='add'>+        return false;   // not file</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='ctx'>     Returns true if this URL is a parent of \a childUrl. \a childUrl is a child</div><div class='ctx'>     of this URL if the two URLs share the same scheme and authority,</div><div class='ctx'>     and this URL's path is a parent of the path of \a childUrl.</div><div class='head'>diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h<br/>index 510da09..d57a0c7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/io/qurl.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/io/qurl.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qurl.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qurl.h</a></div><div class='hunk'>@@ -94,8 +94,14 @@ public:</div><div class='ctx'> #ifndef QT_NO_URL_CAST_FROM_STRING</div><div class='ctx'>     QUrl &amp;operator =(const QString &amp;url);</div><div class='ctx'> #endif</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    inline QUrl &amp;operator=(QUrl &amp;&amp;other)</div><div class='add'>+    { qSwap(d, other.d); return *this; }</div><div class='add'>+#endif</div><div class='ctx'>     ~QUrl();</div><div class='ctx'> </div><div class='add'>+    inline void swap(QUrl &amp;other) { qSwap(d, other.d); }</div><div class='add'>+</div><div class='ctx'>     void setUrl(const QString &amp;url);</div><div class='ctx'>     void setUrl(const QString &amp;url, ParsingMode mode);</div><div class='ctx'>     // ### Qt 5: merge the two setUrl() functions, with mode = TolerantMode</div><div class='hunk'>@@ -175,6 +181,9 @@ public:</div><div class='ctx'>     void setEncodedFragment(const QByteArray &amp;fragment);</div><div class='ctx'>     QByteArray encodedFragment() const;</div><div class='ctx'>     bool hasFragment() const;</div><div class='add'>+#ifndef QT_BOOTSTRAPPED</div><div class='add'>+    QString topLevelDomain() const;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'>     QUrl resolved(const QUrl &amp;relative) const;</div><div class='ctx'> </div><div class='hunk'>@@ -183,6 +192,7 @@ public:</div><div class='ctx'> </div><div class='ctx'>     static QUrl fromLocalFile(const QString &amp;localfile);</div><div class='ctx'>     QString toLocalFile() const;</div><div class='add'>+    bool isLocalFile() const;</div><div class='ctx'> </div><div class='ctx'>     QString toString(FormattingOptions options = None) const;</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/io/qurltlds_p.h b/src/corelib/io/qurltlds_p.h<br/>new file mode 100644<br/>index 0000000..f4f525c<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qurltlds_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qurltlds_p.h</a></div><div class='hunk'>@@ -0,0 +1,6481 @@</div><div class='add'>+// Version: MPL 1.1/GPL 2.0/LGPL 2.1</div><div class='add'>+//</div><div class='add'>+// The contents of this file are subject to the Mozilla Public License Version</div><div class='add'>+// 1.1 (the "License"); you may not use this file except in compliance with</div><div class='add'>+// the License. You may obtain a copy of the License at</div><div class='add'>+// http://www.mozilla.org/MPL/</div><div class='add'>+//</div><div class='add'>+// Software distributed under the License is distributed on an "AS IS" basis,</div><div class='add'>+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License</div><div class='add'>+// for the specific language governing rights and limitations under the</div><div class='add'>+// License.</div><div class='add'>+//</div><div class='add'>+// The Original Code is the Public Suffix List.</div><div class='add'>+//</div><div class='add'>+// The Initial Developer of the Original Code is</div><div class='add'>+// Jo Hermans &lt;jo.hermans@gmail.com&gt;.</div><div class='add'>+// Portions created by the Initial Developer are Copyright (C) 2007</div><div class='add'>+// the Initial Developer. All Rights Reserved.</div><div class='add'>+//</div><div class='add'>+// Contributor(s):</div><div class='add'>+//   Ruben Arakelyan &lt;ruben@wackomenace.co.uk&gt;</div><div class='add'>+//   Gervase Markham &lt;gerv@gerv.net&gt;</div><div class='add'>+//   Pamela Greene &lt;pamg.bugs@gmail.com&gt;</div><div class='add'>+//   David Triendl &lt;david@triendl.name&gt;</div><div class='add'>+//   Jothan Frakes &lt;jothan@gmail.com&gt;</div><div class='add'>+//   The kind representatives of many TLD registries</div><div class='add'>+//</div><div class='add'>+// Alternatively, the contents of this file may be used under the terms of</div><div class='add'>+// either the GNU General Public License Version 2 or later (the "GPL"), or</div><div class='add'>+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),</div><div class='add'>+// in which case the provisions of the GPL or the LGPL are applicable instead</div><div class='add'>+// of those above. If you wish to allow use of your version of this file only</div><div class='add'>+// under the terms of either the GPL or the LGPL, and not to allow others to</div><div class='add'>+// use your version of this file under the terms of the MPL, indicate your</div><div class='add'>+// decision by deleting the provisions above and replace them with the notice</div><div class='add'>+// and other provisions required by the GPL or the LGPL. If you do not delete</div><div class='add'>+// the provisions above, a recipient may use your version of this file under</div><div class='add'>+// the terms of any one of the MPL, the GPL or the LGPL.</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#ifndef QURLTLD_P_H</div><div class='add'>+#define QURLTLD_P_H</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+//  W A R N I N G</div><div class='add'>+//  -------------</div><div class='add'>+//</div><div class='add'>+// This file is not part of the Qt API.  It exists for the convenience</div><div class='add'>+// of the Network Access and Core framework.  This header file may change from</div><div class='add'>+// version to version without notice, or even be removed.</div><div class='add'>+//</div><div class='add'>+// We mean it.</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+// note to maintainer:</div><div class='add'>+// this file should be updated before each release -&gt;</div><div class='add'>+// for instructions see the program at</div><div class='add'>+// util/corelib/qurl-generateTLDs</div><div class='add'>+</div><div class='add'>+static const quint16 tldCount = 3949;</div><div class='add'>+static const quint16 tldIndices[] = {</div><div class='add'>+0,</div><div class='add'>+7,</div><div class='add'>+14,</div><div class='add'>+14,</div><div class='add'>+20,</div><div class='add'>+51,</div><div class='add'>+61,</div><div class='add'>+93,</div><div class='add'>+100,</div><div class='add'>+100,</div><div class='add'>+116,</div><div class='add'>+159,</div><div class='add'>+167,</div><div class='add'>+180,</div><div class='add'>+180,</div><div class='add'>+193,</div><div class='add'>+234,</div><div class='add'>+234,</div><div class='add'>+234,</div><div class='add'>+255,</div><div class='add'>+255,</div><div class='add'>+255,</div><div class='add'>+280,</div><div class='add'>+280,</div><div class='add'>+287,</div><div class='add'>+287,</div><div class='add'>+295,</div><div class='add'>+303,</div><div class='add'>+313,</div><div class='add'>+326,</div><div class='add'>+326,</div><div class='add'>+380,</div><div class='add'>+393,</div><div class='add'>+413,</div><div class='add'>+419,</div><div class='add'>+419,</div><div class='add'>+419,</div><div class='add'>+424,</div><div class='add'>+438,</div><div class='add'>+438,</div><div class='add'>+469,</div><div class='add'>+515,</div><div class='add'>+515,</div><div class='add'>+515,</div><div class='add'>+534,</div><div class='add'>+534,</div><div class='add'>+557,</div><div class='add'>+557,</div><div class='add'>+557,</div><div class='add'>+557,</div><div class='add'>+572,</div><div class='add'>+572,</div><div class='add'>+572,</div><div class='add'>+579,</div><div class='add'>+587,</div><div class='add'>+597,</div><div class='add'>+612,</div><div class='add'>+612,</div><div class='add'>+624,</div><div class='add'>+636,</div><div class='add'>+648,</div><div class='add'>+662,</div><div class='add'>+687,</div><div class='add'>+709,</div><div class='add'>+714,</div><div class='add'>+740,</div><div class='add'>+766,</div><div class='add'>+789,</div><div class='add'>+789,</div><div class='add'>+805,</div><div class='add'>+805,</div><div class='add'>+810,</div><div class='add'>+815,</div><div class='add'>+815,</div><div class='add'>+824,</div><div class='add'>+824,</div><div class='add'>+831,</div><div class='add'>+857,</div><div class='add'>+869,</div><div class='add'>+891,</div><div class='add'>+891,</div><div class='add'>+916,</div><div class='add'>+916,</div><div class='add'>+916,</div><div class='add'>+927,</div><div class='add'>+934,</div><div class='add'>+964,</div><div class='add'>+971,</div><div class='add'>+987,</div><div class='add'>+987,</div><div class='add'>+987,</div><div class='add'>+1008,</div><div class='add'>+1008,</div><div class='add'>+1016,</div><div class='add'>+1016,</div><div class='add'>+1030,</div><div class='add'>+1030,</div><div class='add'>+1052,</div><div class='add'>+1075,</div><div class='add'>+1075,</div><div class='add'>+1082,</div><div class='add'>+1087,</div><div class='add'>+1115,</div><div class='add'>+1135,</div><div class='add'>+1135,</div><div class='add'>+1135,</div><div class='add'>+1172,</div><div class='add'>+1178,</div><div class='add'>+1178,</div><div class='add'>+1178,</div><div class='add'>+1202,</div><div class='add'>+1207,</div><div class='add'>+1220,</div><div class='add'>+1220,</div><div class='add'>+1266,</div><div class='add'>+1266,</div><div class='add'>+1266,</div><div class='add'>+1266,</div><div class='add'>+1272,</div><div class='add'>+1290,</div><div class='add'>+1316,</div><div class='add'>+1316,</div><div class='add'>+1332,</div><div class='add'>+1332,</div><div class='add'>+1339,</div><div class='add'>+1339,</div><div class='add'>+1352,</div><div class='add'>+1352,</div><div class='add'>+1389,</div><div class='add'>+1389,</div><div class='add'>+1408,</div><div class='add'>+1415,</div><div class='add'>+1437,</div><div class='add'>+1444,</div><div class='add'>+1489,</div><div class='add'>+1489,</div><div class='add'>+1502,</div><div class='add'>+1502,</div><div class='add'>+1512,</div><div class='add'>+1518,</div><div class='add'>+1539,</div><div class='add'>+1555,</div><div class='add'>+1562,</div><div class='add'>+1584,</div><div class='add'>+1598,</div><div class='add'>+1607,</div><div class='add'>+1607,</div><div class='add'>+1607,</div><div class='add'>+1632,</div><div class='add'>+1652,</div><div class='add'>+1652,</div><div class='add'>+1658,</div><div class='add'>+1658,</div><div class='add'>+1675,</div><div class='add'>+1682,</div><div class='add'>+1709,</div><div class='add'>+1733,</div><div class='add'>+1748,</div><div class='add'>+1776,</div><div class='add'>+1783,</div><div class='add'>+1783,</div><div class='add'>+1790,</div><div class='add'>+1797,</div><div class='add'>+1826,</div><div class='add'>+1850,</div><div class='add'>+1850,</div><div class='add'>+1856,</div><div class='add'>+1880,</div><div class='add'>+1887,</div><div class='add'>+1901,</div><div class='add'>+1921,</div><div class='add'>+1947,</div><div class='add'>+1961,</div><div class='add'>+1967,</div><div class='add'>+1967,</div><div class='add'>+1967,</div><div class='add'>+1972,</div><div class='add'>+1986,</div><div class='add'>+1986,</div><div class='add'>+1986,</div><div class='add'>+2009,</div><div class='add'>+2029,</div><div class='add'>+2029,</div><div class='add'>+2047,</div><div class='add'>+2061,</div><div class='add'>+2075,</div><div class='add'>+2075,</div><div class='add'>+2075,</div><div class='add'>+2075,</div><div class='add'>+2075,</div><div class='add'>+2075,</div><div class='add'>+2082,</div><div class='add'>+2082,</div><div class='add'>+2124,</div><div class='add'>+2124,</div><div class='add'>+2129,</div><div class='add'>+2162,</div><div class='add'>+2162,</div><div class='add'>+2162,</div><div class='add'>+2236,</div><div class='add'>+2256,</div><div class='add'>+2263,</div><div class='add'>+2276,</div><div class='add'>+2283,</div><div class='add'>+2313,</div><div class='add'>+2313,</div><div class='add'>+2347,</div><div class='add'>+2380,</div><div class='add'>+2387,</div><div class='add'>+2387,</div><div class='add'>+2387,</div><div class='add'>+2431,</div><div class='add'>+2438,</div><div class='add'>+2445,</div><div class='add'>+2452,</div><div class='add'>+2459,</div><div class='add'>+2459,</div><div class='add'>+2469,</div><div class='add'>+2490,</div><div class='add'>+2516,</div><div class='add'>+2527,</div><div class='add'>+2540,</div><div class='add'>+2540,</div><div class='add'>+2586,</div><div class='add'>+2610,</div><div class='add'>+2630,</div><div class='add'>+2630,</div><div class='add'>+2653,</div><div class='add'>+2660,</div><div class='add'>+2669,</div><div class='add'>+2693,</div><div class='add'>+2693,</div><div class='add'>+2710,</div><div class='add'>+2710,</div><div class='add'>+2719,</div><div class='add'>+2719,</div><div class='add'>+2734,</div><div class='add'>+2740,</div><div class='add'>+2740,</div><div class='add'>+2753,</div><div class='add'>+2753,</div><div class='add'>+2763,</div><div class='add'>+2770,</div><div class='add'>+2775,</div><div class='add'>+2782,</div><div class='add'>+2789,</div><div class='add'>+2802,</div><div class='add'>+2820,</div><div class='add'>+2827,</div><div class='add'>+2827,</div><div class='add'>+2841,</div><div class='add'>+2855,</div><div class='add'>+2855,</div><div class='add'>+2865,</div><div class='add'>+2872,</div><div class='add'>+2884,</div><div class='add'>+2884,</div><div class='add'>+2919,</div><div class='add'>+2937,</div><div class='add'>+2955,</div><div class='add'>+2962,</div><div class='add'>+3012,</div><div class='add'>+3042,</div><div class='add'>+3073,</div><div class='add'>+3083,</div><div class='add'>+3083,</div><div class='add'>+3100,</div><div class='add'>+3105,</div><div class='add'>+3112,</div><div class='add'>+3131,</div><div class='add'>+3131,</div><div class='add'>+3166,</div><div class='add'>+3180,</div><div class='add'>+3187,</div><div class='add'>+3194,</div><div class='add'>+3211,</div><div class='add'>+3218,</div><div class='add'>+3223,</div><div class='add'>+3233,</div><div class='add'>+3249,</div><div class='add'>+3259,</div><div class='add'>+3268,</div><div class='add'>+3314,</div><div class='add'>+3314,</div><div class='add'>+3324,</div><div class='add'>+3324,</div><div class='add'>+3336,</div><div class='add'>+3336,</div><div class='add'>+3336,</div><div class='add'>+3336,</div><div class='add'>+3350,</div><div class='add'>+3363,</div><div class='add'>+3376,</div><div class='add'>+3398,</div><div class='add'>+3416,</div><div class='add'>+3445,</div><div class='add'>+3464,</div><div class='add'>+3488,</div><div class='add'>+3488,</div><div class='add'>+3497,</div><div class='add'>+3545,</div><div class='add'>+3552,</div><div class='add'>+3552,</div><div class='add'>+3552,</div><div class='add'>+3566,</div><div class='add'>+3573,</div><div class='add'>+3573,</div><div class='add'>+3573,</div><div class='add'>+3581,</div><div class='add'>+3581,</div><div class='add'>+3603,</div><div class='add'>+3603,</div><div class='add'>+3615,</div><div class='add'>+3621,</div><div class='add'>+3621,</div><div class='add'>+3683,</div><div class='add'>+3683,</div><div class='add'>+3710,</div><div class='add'>+3710,</div><div class='add'>+3716,</div><div class='add'>+3716,</div><div class='add'>+3748,</div><div class='add'>+3770,</div><div class='add'>+3791,</div><div class='add'>+3803,</div><div class='add'>+3810,</div><div class='add'>+3817,</div><div class='add'>+3833,</div><div class='add'>+3846,</div><div class='add'>+3846,</div><div class='add'>+3852,</div><div class='add'>+3876,</div><div class='add'>+3876,</div><div class='add'>+3882,</div><div class='add'>+3903,</div><div class='add'>+3910,</div><div class='add'>+3939,</div><div class='add'>+3939,</div><div class='add'>+3939,</div><div class='add'>+3947,</div><div class='add'>+3962,</div><div class='add'>+3962,</div><div class='add'>+3981,</div><div class='add'>+3994,</div><div class='add'>+4021,</div><div class='add'>+4030,</div><div class='add'>+4042,</div><div class='add'>+4085,</div><div class='add'>+4085,</div><div class='add'>+4096,</div><div class='add'>+4096,</div><div class='add'>+4104,</div><div class='add'>+4123,</div><div class='add'>+4123,</div><div class='add'>+4123,</div><div class='add'>+4143,</div><div class='add'>+4154,</div><div class='add'>+4164,</div><div class='add'>+4194,</div><div class='add'>+4194,</div><div class='add'>+4194,</div><div class='add'>+4205,</div><div class='add'>+4205,</div><div class='add'>+4222,</div><div class='add'>+4238,</div><div class='add'>+4301,</div><div class='add'>+4309,</div><div class='add'>+4322,</div><div class='add'>+4331,</div><div class='add'>+4331,</div><div class='add'>+4331,</div><div class='add'>+4331,</div><div class='add'>+4331,</div><div class='add'>+4347,</div><div class='add'>+4365,</div><div class='add'>+4375,</div><div class='add'>+4375,</div><div class='add'>+4385,</div><div class='add'>+4398,</div><div class='add'>+4412,</div><div class='add'>+4430,</div><div class='add'>+4430,</div><div class='add'>+4437,</div><div class='add'>+4447,</div><div class='add'>+4463,</div><div class='add'>+4472,</div><div class='add'>+4472,</div><div class='add'>+4472,</div><div class='add'>+4484,</div><div class='add'>+4484,</div><div class='add'>+4484,</div><div class='add'>+4484,</div><div class='add'>+4484,</div><div class='add'>+4490,</div><div class='add'>+4490,</div><div class='add'>+4511,</div><div class='add'>+4511,</div><div class='add'>+4522,</div><div class='add'>+4522,</div><div class='add'>+4522,</div><div class='add'>+4522,</div><div class='add'>+4528,</div><div class='add'>+4528,</div><div class='add'>+4534,</div><div class='add'>+4551,</div><div class='add'>+4551,</div><div class='add'>+4551,</div><div class='add'>+4564,</div><div class='add'>+4583,</div><div class='add'>+4583,</div><div class='add'>+4611,</div><div class='add'>+4611,</div><div class='add'>+4611,</div><div class='add'>+4622,</div><div class='add'>+4622,</div><div class='add'>+4649,</div><div class='add'>+4668,</div><div class='add'>+4677,</div><div class='add'>+4692,</div><div class='add'>+4692,</div><div class='add'>+4692,</div><div class='add'>+4705,</div><div class='add'>+4723,</div><div class='add'>+4723,</div><div class='add'>+4723,</div><div class='add'>+4729,</div><div class='add'>+4729,</div><div class='add'>+4743,</div><div class='add'>+4743,</div><div class='add'>+4750,</div><div class='add'>+4750,</div><div class='add'>+4763,</div><div class='add'>+4770,</div><div class='add'>+4776,</div><div class='add'>+4776,</div><div class='add'>+4776,</div><div class='add'>+4793,</div><div class='add'>+4811,</div><div class='add'>+4811,</div><div class='add'>+4811,</div><div class='add'>+4821,</div><div class='add'>+4821,</div><div class='add'>+4841,</div><div class='add'>+4857,</div><div class='add'>+4891,</div><div class='add'>+4897,</div><div class='add'>+4903,</div><div class='add'>+4903,</div><div class='add'>+4903,</div><div class='add'>+4919,</div><div class='add'>+4935,</div><div class='add'>+4942,</div><div class='add'>+4958,</div><div class='add'>+4958,</div><div class='add'>+4975,</div><div class='add'>+4975,</div><div class='add'>+4975,</div><div class='add'>+4985,</div><div class='add'>+4985,</div><div class='add'>+5020,</div><div class='add'>+5032,</div><div class='add'>+5032,</div><div class='add'>+5040,</div><div class='add'>+5053,</div><div class='add'>+5068,</div><div class='add'>+5079,</div><div class='add'>+5079,</div><div class='add'>+5101,</div><div class='add'>+5115,</div><div class='add'>+5115,</div><div class='add'>+5135,</div><div class='add'>+5154,</div><div class='add'>+5161,</div><div class='add'>+5161,</div><div class='add'>+5168,</div><div class='add'>+5168,</div><div class='add'>+5184,</div><div class='add'>+5210,</div><div class='add'>+5210,</div><div class='add'>+5238,</div><div class='add'>+5255,</div><div class='add'>+5278,</div><div class='add'>+5285,</div><div class='add'>+5308,</div><div class='add'>+5318,</div><div class='add'>+5327,</div><div class='add'>+5327,</div><div class='add'>+5333,</div><div class='add'>+5333,</div><div class='add'>+5340,</div><div class='add'>+5348,</div><div class='add'>+5355,</div><div class='add'>+5366,</div><div class='add'>+5377,</div><div class='add'>+5384,</div><div class='add'>+5408,</div><div class='add'>+5415,</div><div class='add'>+5422,</div><div class='add'>+5435,</div><div class='add'>+5442,</div><div class='add'>+5482,</div><div class='add'>+5482,</div><div class='add'>+5482,</div><div class='add'>+5482,</div><div class='add'>+5498,</div><div class='add'>+5527,</div><div class='add'>+5534,</div><div class='add'>+5541,</div><div class='add'>+5572,</div><div class='add'>+5572,</div><div class='add'>+5572,</div><div class='add'>+5579,</div><div class='add'>+5591,</div><div class='add'>+5602,</div><div class='add'>+5602,</div><div class='add'>+5621,</div><div class='add'>+5621,</div><div class='add'>+5646,</div><div class='add'>+5664,</div><div class='add'>+5671,</div><div class='add'>+5671,</div><div class='add'>+5681,</div><div class='add'>+5696,</div><div class='add'>+5707,</div><div class='add'>+5716,</div><div class='add'>+5716,</div><div class='add'>+5723,</div><div class='add'>+5723,</div><div class='add'>+5732,</div><div class='add'>+5742,</div><div class='add'>+5742,</div><div class='add'>+5763,</div><div class='add'>+5770,</div><div class='add'>+5776,</div><div class='add'>+5790,</div><div class='add'>+5790,</div><div class='add'>+5797,</div><div class='add'>+5806,</div><div class='add'>+5816,</div><div class='add'>+5832,</div><div class='add'>+5882,</div><div class='add'>+5882,</div><div class='add'>+5882,</div><div class='add'>+5882,</div><div class='add'>+5893,</div><div class='add'>+5934,</div><div class='add'>+5934,</div><div class='add'>+5965,</div><div class='add'>+5965,</div><div class='add'>+5980,</div><div class='add'>+5980,</div><div class='add'>+5980,</div><div class='add'>+5980,</div><div class='add'>+6007,</div><div class='add'>+6017,</div><div class='add'>+6034,</div><div class='add'>+6051,</div><div class='add'>+6065,</div><div class='add'>+6075,</div><div class='add'>+6075,</div><div class='add'>+6091,</div><div class='add'>+6097,</div><div class='add'>+6097,</div><div class='add'>+6109,</div><div class='add'>+6109,</div><div class='add'>+6109,</div><div class='add'>+6122,</div><div class='add'>+6147,</div><div class='add'>+6168,</div><div class='add'>+6168,</div><div class='add'>+6191,</div><div class='add'>+6191,</div><div class='add'>+6191,</div><div class='add'>+6191,</div><div class='add'>+6191,</div><div class='add'>+6198,</div><div class='add'>+6217,</div><div class='add'>+6224,</div><div class='add'>+6224,</div><div class='add'>+6231,</div><div class='add'>+6245,</div><div class='add'>+6252,</div><div class='add'>+6252,</div><div class='add'>+6270,</div><div class='add'>+6270,</div><div class='add'>+6284,</div><div class='add'>+6305,</div><div class='add'>+6315,</div><div class='add'>+6322,</div><div class='add'>+6322,</div><div class='add'>+6322,</div><div class='add'>+6329,</div><div class='add'>+6329,</div><div class='add'>+6329,</div><div class='add'>+6353,</div><div class='add'>+6361,</div><div class='add'>+6361,</div><div class='add'>+6375,</div><div class='add'>+6391,</div><div class='add'>+6405,</div><div class='add'>+6405,</div><div class='add'>+6415,</div><div class='add'>+6431,</div><div class='add'>+6431,</div><div class='add'>+6431,</div><div class='add'>+6431,</div><div class='add'>+6458,</div><div class='add'>+6475,</div><div class='add'>+6475,</div><div class='add'>+6475,</div><div class='add'>+6482,</div><div class='add'>+6489,</div><div class='add'>+6496,</div><div class='add'>+6496,</div><div class='add'>+6503,</div><div class='add'>+6520,</div><div class='add'>+6520,</div><div class='add'>+6520,</div><div class='add'>+6527,</div><div class='add'>+6527,</div><div class='add'>+6544,</div><div class='add'>+6561,</div><div class='add'>+6573,</div><div class='add'>+6573,</div><div class='add'>+6580,</div><div class='add'>+6580,</div><div class='add'>+6587,</div><div class='add'>+6587,</div><div class='add'>+6592,</div><div class='add'>+6592,</div><div class='add'>+6592,</div><div class='add'>+6592,</div><div class='add'>+6599,</div><div class='add'>+6599,</div><div class='add'>+6612,</div><div class='add'>+6633,</div><div class='add'>+6649,</div><div class='add'>+6649,</div><div class='add'>+6669,</div><div class='add'>+6676,</div><div class='add'>+6683,</div><div class='add'>+6683,</div><div class='add'>+6713,</div><div class='add'>+6720,</div><div class='add'>+6727,</div><div class='add'>+6736,</div><div class='add'>+6736,</div><div class='add'>+6746,</div><div class='add'>+6770,</div><div class='add'>+6807,</div><div class='add'>+6814,</div><div class='add'>+6827,</div><div class='add'>+6846,</div><div class='add'>+6846,</div><div class='add'>+6864,</div><div class='add'>+6864,</div><div class='add'>+6864,</div><div class='add'>+6864,</div><div class='add'>+6881,</div><div class='add'>+6888,</div><div class='add'>+6888,</div><div class='add'>+6888,</div><div class='add'>+6914,</div><div class='add'>+6935,</div><div class='add'>+6935,</div><div class='add'>+6935,</div><div class='add'>+6953,</div><div class='add'>+6959,</div><div class='add'>+6966,</div><div class='add'>+6983,</div><div class='add'>+6983,</div><div class='add'>+6983,</div><div class='add'>+7013,</div><div class='add'>+7023,</div><div class='add'>+7023,</div><div class='add'>+7023,</div><div class='add'>+7023,</div><div class='add'>+7037,</div><div class='add'>+7044,</div><div class='add'>+7058,</div><div class='add'>+7079,</div><div class='add'>+7086,</div><div class='add'>+7123,</div><div class='add'>+7134,</div><div class='add'>+7155,</div><div class='add'>+7168,</div><div class='add'>+7178,</div><div class='add'>+7203,</div><div class='add'>+7227,</div><div class='add'>+7236,</div><div class='add'>+7258,</div><div class='add'>+7265,</div><div class='add'>+7274,</div><div class='add'>+7274,</div><div class='add'>+7303,</div><div class='add'>+7303,</div><div class='add'>+7314,</div><div class='add'>+7314,</div><div class='add'>+7345,</div><div class='add'>+7352,</div><div class='add'>+7367,</div><div class='add'>+7377,</div><div class='add'>+7388,</div><div class='add'>+7388,</div><div class='add'>+7402,</div><div class='add'>+7402,</div><div class='add'>+7409,</div><div class='add'>+7421,</div><div class='add'>+7421,</div><div class='add'>+7467,</div><div class='add'>+7484,</div><div class='add'>+7484,</div><div class='add'>+7484,</div><div class='add'>+7491,</div><div class='add'>+7532,</div><div class='add'>+7532,</div><div class='add'>+7539,</div><div class='add'>+7546,</div><div class='add'>+7546,</div><div class='add'>+7553,</div><div class='add'>+7573,</div><div class='add'>+7573,</div><div class='add'>+7573,</div><div class='add'>+7580,</div><div class='add'>+7587,</div><div class='add'>+7594,</div><div class='add'>+7594,</div><div class='add'>+7594,</div><div class='add'>+7606,</div><div class='add'>+7606,</div><div class='add'>+7637,</div><div class='add'>+7637,</div><div class='add'>+7637,</div><div class='add'>+7664,</div><div class='add'>+7664,</div><div class='add'>+7664,</div><div class='add'>+7677,</div><div class='add'>+7684,</div><div class='add'>+7701,</div><div class='add'>+7723,</div><div class='add'>+7723,</div><div class='add'>+7723,</div><div class='add'>+7723,</div><div class='add'>+7734,</div><div class='add'>+7734,</div><div class='add'>+7734,</div><div class='add'>+7748,</div><div class='add'>+7748,</div><div class='add'>+7748,</div><div class='add'>+7748,</div><div class='add'>+7759,</div><div class='add'>+7759,</div><div class='add'>+7775,</div><div class='add'>+7775,</div><div class='add'>+7782,</div><div class='add'>+7789,</div><div class='add'>+7817,</div><div class='add'>+7824,</div><div class='add'>+7831,</div><div class='add'>+7836,</div><div class='add'>+7865,</div><div class='add'>+7865,</div><div class='add'>+7876,</div><div class='add'>+7901,</div><div class='add'>+7901,</div><div class='add'>+7908,</div><div class='add'>+7918,</div><div class='add'>+7938,</div><div class='add'>+7945,</div><div class='add'>+7945,</div><div class='add'>+7957,</div><div class='add'>+7964,</div><div class='add'>+7979,</div><div class='add'>+7986,</div><div class='add'>+7994,</div><div class='add'>+8007,</div><div class='add'>+8007,</div><div class='add'>+8014,</div><div class='add'>+8021,</div><div class='add'>+8061,</div><div class='add'>+8061,</div><div class='add'>+8071,</div><div class='add'>+8088,</div><div class='add'>+8131,</div><div class='add'>+8138,</div><div class='add'>+8153,</div><div class='add'>+8160,</div><div class='add'>+8160,</div><div class='add'>+8160,</div><div class='add'>+8175,</div><div class='add'>+8183,</div><div class='add'>+8197,</div><div class='add'>+8211,</div><div class='add'>+8211,</div><div class='add'>+8211,</div><div class='add'>+8243,</div><div class='add'>+8243,</div><div class='add'>+8243,</div><div class='add'>+8243,</div><div class='add'>+8259,</div><div class='add'>+8259,</div><div class='add'>+8259,</div><div class='add'>+8259,</div><div class='add'>+8259,</div><div class='add'>+8266,</div><div class='add'>+8275,</div><div class='add'>+8281,</div><div class='add'>+8281,</div><div class='add'>+8281,</div><div class='add'>+8281,</div><div class='add'>+8288,</div><div class='add'>+8288,</div><div class='add'>+8309,</div><div class='add'>+8309,</div><div class='add'>+8309,</div><div class='add'>+8330,</div><div class='add'>+8330,</div><div class='add'>+8330,</div><div class='add'>+8330,</div><div class='add'>+8337,</div><div class='add'>+8343,</div><div class='add'>+8343,</div><div class='add'>+8360,</div><div class='add'>+8370,</div><div class='add'>+8370,</div><div class='add'>+8380,</div><div class='add'>+8380,</div><div class='add'>+8386,</div><div class='add'>+8386,</div><div class='add'>+8397,</div><div class='add'>+8415,</div><div class='add'>+8415,</div><div class='add'>+8428,</div><div class='add'>+8454,</div><div class='add'>+8460,</div><div class='add'>+8475,</div><div class='add'>+8492,</div><div class='add'>+8526,</div><div class='add'>+8554,</div><div class='add'>+8554,</div><div class='add'>+8583,</div><div class='add'>+8583,</div><div class='add'>+8583,</div><div class='add'>+8598,</div><div class='add'>+8607,</div><div class='add'>+8617,</div><div class='add'>+8617,</div><div class='add'>+8642,</div><div class='add'>+8652,</div><div class='add'>+8652,</div><div class='add'>+8652,</div><div class='add'>+8662,</div><div class='add'>+8688,</div><div class='add'>+8688,</div><div class='add'>+8704,</div><div class='add'>+8704,</div><div class='add'>+8747,</div><div class='add'>+8765,</div><div class='add'>+8775,</div><div class='add'>+8783,</div><div class='add'>+8811,</div><div class='add'>+8835,</div><div class='add'>+8835,</div><div class='add'>+8835,</div><div class='add'>+8850,</div><div class='add'>+8859,</div><div class='add'>+8884,</div><div class='add'>+8910,</div><div class='add'>+8919,</div><div class='add'>+8952,</div><div class='add'>+8978,</div><div class='add'>+8978,</div><div class='add'>+8991,</div><div class='add'>+8991,</div><div class='add'>+8991,</div><div class='add'>+8999,</div><div class='add'>+8999,</div><div class='add'>+8999,</div><div class='add'>+9030,</div><div class='add'>+9030,</div><div class='add'>+9030,</div><div class='add'>+9030,</div><div class='add'>+9030,</div><div class='add'>+9041,</div><div class='add'>+9048,</div><div class='add'>+9048,</div><div class='add'>+9054,</div><div class='add'>+9054,</div><div class='add'>+9054,</div><div class='add'>+9086,</div><div class='add'>+9108,</div><div class='add'>+9108,</div><div class='add'>+9119,</div><div class='add'>+9119,</div><div class='add'>+9130,</div><div class='add'>+9144,</div><div class='add'>+9152,</div><div class='add'>+9161,</div><div class='add'>+9174,</div><div class='add'>+9194,</div><div class='add'>+9207,</div><div class='add'>+9207,</div><div class='add'>+9207,</div><div class='add'>+9232,</div><div class='add'>+9242,</div><div class='add'>+9242,</div><div class='add'>+9271,</div><div class='add'>+9290,</div><div class='add'>+9308,</div><div class='add'>+9308,</div><div class='add'>+9308,</div><div class='add'>+9308,</div><div class='add'>+9320,</div><div class='add'>+9333,</div><div class='add'>+9343,</div><div class='add'>+9356,</div><div class='add'>+9379,</div><div class='add'>+9379,</div><div class='add'>+9379,</div><div class='add'>+9395,</div><div class='add'>+9395,</div><div class='add'>+9406,</div><div class='add'>+9419,</div><div class='add'>+9419,</div><div class='add'>+9419,</div><div class='add'>+9419,</div><div class='add'>+9450,</div><div class='add'>+9485,</div><div class='add'>+9485,</div><div class='add'>+9497,</div><div class='add'>+9497,</div><div class='add'>+9505,</div><div class='add'>+9517,</div><div class='add'>+9528,</div><div class='add'>+9528,</div><div class='add'>+9551,</div><div class='add'>+9564,</div><div class='add'>+9586,</div><div class='add'>+9586,</div><div class='add'>+9608,</div><div class='add'>+9608,</div><div class='add'>+9626,</div><div class='add'>+9626,</div><div class='add'>+9626,</div><div class='add'>+9653,</div><div class='add'>+9653,</div><div class='add'>+9681,</div><div class='add'>+9681,</div><div class='add'>+9681,</div><div class='add'>+9698,</div><div class='add'>+9698,</div><div class='add'>+9698,</div><div class='add'>+9714,</div><div class='add'>+9729,</div><div class='add'>+9737,</div><div class='add'>+9737,</div><div class='add'>+9765,</div><div class='add'>+9765,</div><div class='add'>+9765,</div><div class='add'>+9765,</div><div class='add'>+9765,</div><div class='add'>+9825,</div><div class='add'>+9844,</div><div class='add'>+9866,</div><div class='add'>+9880,</div><div class='add'>+9880,</div><div class='add'>+9880,</div><div class='add'>+9880,</div><div class='add'>+9886,</div><div class='add'>+9895,</div><div class='add'>+9895,</div><div class='add'>+9895,</div><div class='add'>+9895,</div><div class='add'>+9895,</div><div class='add'>+9913,</div><div class='add'>+9913,</div><div class='add'>+9924,</div><div class='add'>+9958,</div><div class='add'>+9958,</div><div class='add'>+9967,</div><div class='add'>+9975,</div><div class='add'>+9975,</div><div class='add'>+9975,</div><div class='add'>+9981,</div><div class='add'>+9998,</div><div class='add'>+9998,</div><div class='add'>+9998,</div><div class='add'>+10012,</div><div class='add'>+10036,</div><div class='add'>+10036,</div><div class='add'>+10066,</div><div class='add'>+10079,</div><div class='add'>+10097,</div><div class='add'>+10121,</div><div class='add'>+10133,</div><div class='add'>+10142,</div><div class='add'>+10142,</div><div class='add'>+10142,</div><div class='add'>+10156,</div><div class='add'>+10173,</div><div class='add'>+10173,</div><div class='add'>+10173,</div><div class='add'>+10196,</div><div class='add'>+10205,</div><div class='add'>+10205,</div><div class='add'>+10205,</div><div class='add'>+10205,</div><div class='add'>+10218,</div><div class='add'>+10234,</div><div class='add'>+10240,</div><div class='add'>+10240,</div><div class='add'>+10240,</div><div class='add'>+10264,</div><div class='add'>+10273,</div><div class='add'>+10286,</div><div class='add'>+10286,</div><div class='add'>+10286,</div><div class='add'>+10286,</div><div class='add'>+10299,</div><div class='add'>+10299,</div><div class='add'>+10309,</div><div class='add'>+10309,</div><div class='add'>+10339,</div><div class='add'>+10358,</div><div class='add'>+10358,</div><div class='add'>+10374,</div><div class='add'>+10374,</div><div class='add'>+10390,</div><div class='add'>+10390,</div><div class='add'>+10413,</div><div class='add'>+10413,</div><div class='add'>+10439,</div><div class='add'>+10461,</div><div class='add'>+10467,</div><div class='add'>+10467,</div><div class='add'>+10467,</div><div class='add'>+10492,</div><div class='add'>+10492,</div><div class='add'>+10501,</div><div class='add'>+10528,</div><div class='add'>+10528,</div><div class='add'>+10528,</div><div class='add'>+10539,</div><div class='add'>+10583,</div><div class='add'>+10583,</div><div class='add'>+10583,</div><div class='add'>+10613,</div><div class='add'>+10613,</div><div class='add'>+10619,</div><div class='add'>+10628,</div><div class='add'>+10645,</div><div class='add'>+10645,</div><div class='add'>+10645,</div><div class='add'>+10650,</div><div class='add'>+10671,</div><div class='add'>+10687,</div><div class='add'>+10709,</div><div class='add'>+10709,</div><div class='add'>+10709,</div><div class='add'>+10709,</div><div class='add'>+10709,</div><div class='add'>+10727,</div><div class='add'>+10727,</div><div class='add'>+10727,</div><div class='add'>+10727,</div><div class='add'>+10733,</div><div class='add'>+10733,</div><div class='add'>+10768,</div><div class='add'>+10768,</div><div class='add'>+10773,</div><div class='add'>+10780,</div><div class='add'>+10788,</div><div class='add'>+10788,</div><div class='add'>+10797,</div><div class='add'>+10797,</div><div class='add'>+10835,</div><div class='add'>+10835,</div><div class='add'>+10845,</div><div class='add'>+10852,</div><div class='add'>+10861,</div><div class='add'>+10861,</div><div class='add'>+10861,</div><div class='add'>+10861,</div><div class='add'>+10861,</div><div class='add'>+10861,</div><div class='add'>+10861,</div><div class='add'>+10875,</div><div class='add'>+10888,</div><div class='add'>+10907,</div><div class='add'>+10907,</div><div class='add'>+10907,</div><div class='add'>+10920,</div><div class='add'>+10920,</div><div class='add'>+10932,</div><div class='add'>+10946,</div><div class='add'>+10977,</div><div class='add'>+10977,</div><div class='add'>+10997,</div><div class='add'>+11008,</div><div class='add'>+11037,</div><div class='add'>+11059,</div><div class='add'>+11059,</div><div class='add'>+11059,</div><div class='add'>+11067,</div><div class='add'>+11067,</div><div class='add'>+11067,</div><div class='add'>+11067,</div><div class='add'>+11067,</div><div class='add'>+11077,</div><div class='add'>+11091,</div><div class='add'>+11102,</div><div class='add'>+11102,</div><div class='add'>+11112,</div><div class='add'>+11125,</div><div class='add'>+11129,</div><div class='add'>+11129,</div><div class='add'>+11154,</div><div class='add'>+11154,</div><div class='add'>+11154,</div><div class='add'>+11164,</div><div class='add'>+11164,</div><div class='add'>+11189,</div><div class='add'>+11189,</div><div class='add'>+11189,</div><div class='add'>+11189,</div><div class='add'>+11189,</div><div class='add'>+11196,</div><div class='add'>+11196,</div><div class='add'>+11227,</div><div class='add'>+11238,</div><div class='add'>+11247,</div><div class='add'>+11256,</div><div class='add'>+11265,</div><div class='add'>+11265,</div><div class='add'>+11286,</div><div class='add'>+11307,</div><div class='add'>+11330,</div><div class='add'>+11337,</div><div class='add'>+11378,</div><div class='add'>+11378,</div><div class='add'>+11389,</div><div class='add'>+11413,</div><div class='add'>+11454,</div><div class='add'>+11469,</div><div class='add'>+11475,</div><div class='add'>+11475,</div><div class='add'>+11475,</div><div class='add'>+11475,</div><div class='add'>+11503,</div><div class='add'>+11503,</div><div class='add'>+11503,</div><div class='add'>+11503,</div><div class='add'>+11534,</div><div class='add'>+11534,</div><div class='add'>+11550,</div><div class='add'>+11550,</div><div class='add'>+11557,</div><div class='add'>+11557,</div><div class='add'>+11557,</div><div class='add'>+11557,</div><div class='add'>+11574,</div><div class='add'>+11585,</div><div class='add'>+11585,</div><div class='add'>+11603,</div><div class='add'>+11626,</div><div class='add'>+11643,</div><div class='add'>+11643,</div><div class='add'>+11643,</div><div class='add'>+11643,</div><div class='add'>+11663,</div><div class='add'>+11663,</div><div class='add'>+11682,</div><div class='add'>+11696,</div><div class='add'>+11696,</div><div class='add'>+11696,</div><div class='add'>+11696,</div><div class='add'>+11706,</div><div class='add'>+11706,</div><div class='add'>+11706,</div><div class='add'>+11706,</div><div class='add'>+11723,</div><div class='add'>+11723,</div><div class='add'>+11757,</div><div class='add'>+11757,</div><div class='add'>+11773,</div><div class='add'>+11795,</div><div class='add'>+11813,</div><div class='add'>+11836,</div><div class='add'>+11836,</div><div class='add'>+11883,</div><div class='add'>+11903,</div><div class='add'>+11952,</div><div class='add'>+11965,</div><div class='add'>+11965,</div><div class='add'>+11984,</div><div class='add'>+11997,</div><div class='add'>+12008,</div><div class='add'>+12008,</div><div class='add'>+12008,</div><div class='add'>+12024,</div><div class='add'>+12043,</div><div class='add'>+12065,</div><div class='add'>+12071,</div><div class='add'>+12099,</div><div class='add'>+12129,</div><div class='add'>+12140,</div><div class='add'>+12140,</div><div class='add'>+12146,</div><div class='add'>+12161,</div><div class='add'>+12161,</div><div class='add'>+12161,</div><div class='add'>+12161,</div><div class='add'>+12167,</div><div class='add'>+12167,</div><div class='add'>+12180,</div><div class='add'>+12186,</div><div class='add'>+12208,</div><div class='add'>+12226,</div><div class='add'>+12243,</div><div class='add'>+12243,</div><div class='add'>+12252,</div><div class='add'>+12252,</div><div class='add'>+12274,</div><div class='add'>+12289,</div><div class='add'>+12302,</div><div class='add'>+12302,</div><div class='add'>+12313,</div><div class='add'>+12313,</div><div class='add'>+12313,</div><div class='add'>+12313,</div><div class='add'>+12358,</div><div class='add'>+12358,</div><div class='add'>+12358,</div><div class='add'>+12369,</div><div class='add'>+12375,</div><div class='add'>+12391,</div><div class='add'>+12391,</div><div class='add'>+12391,</div><div class='add'>+12391,</div><div class='add'>+12405,</div><div class='add'>+12410,</div><div class='add'>+12416,</div><div class='add'>+12416,</div><div class='add'>+12436,</div><div class='add'>+12436,</div><div class='add'>+12436,</div><div class='add'>+12443,</div><div class='add'>+12443,</div><div class='add'>+12462,</div><div class='add'>+12477,</div><div class='add'>+12492,</div><div class='add'>+12492,</div><div class='add'>+12503,</div><div class='add'>+12519,</div><div class='add'>+12525,</div><div class='add'>+12531,</div><div class='add'>+12571,</div><div class='add'>+12571,</div><div class='add'>+12591,</div><div class='add'>+12591,</div><div class='add'>+12601,</div><div class='add'>+12641,</div><div class='add'>+12641,</div><div class='add'>+12641,</div><div class='add'>+12657,</div><div class='add'>+12657,</div><div class='add'>+12657,</div><div class='add'>+12699,</div><div class='add'>+12699,</div><div class='add'>+12699,</div><div class='add'>+12712,</div><div class='add'>+12728,</div><div class='add'>+12744,</div><div class='add'>+12761,</div><div class='add'>+12769,</div><div class='add'>+12782,</div><div class='add'>+12793,</div><div class='add'>+12823,</div><div class='add'>+12836,</div><div class='add'>+12851,</div><div class='add'>+12863,</div><div class='add'>+12890,</div><div class='add'>+12900,</div><div class='add'>+12900,</div><div class='add'>+12900,</div><div class='add'>+12910,</div><div class='add'>+12910,</div><div class='add'>+12924,</div><div class='add'>+12924,</div><div class='add'>+12924,</div><div class='add'>+12924,</div><div class='add'>+12924,</div><div class='add'>+12952,</div><div class='add'>+12984,</div><div class='add'>+13003,</div><div class='add'>+13038,</div><div class='add'>+13038,</div><div class='add'>+13056,</div><div class='add'>+13056,</div><div class='add'>+13056,</div><div class='add'>+13056,</div><div class='add'>+13074,</div><div class='add'>+13081,</div><div class='add'>+13093,</div><div class='add'>+13103,</div><div class='add'>+13103,</div><div class='add'>+13112,</div><div class='add'>+13119,</div><div class='add'>+13132,</div><div class='add'>+13132,</div><div class='add'>+13132,</div><div class='add'>+13141,</div><div class='add'>+13151,</div><div class='add'>+13183,</div><div class='add'>+13193,</div><div class='add'>+13206,</div><div class='add'>+13206,</div><div class='add'>+13206,</div><div class='add'>+13236,</div><div class='add'>+13252,</div><div class='add'>+13267,</div><div class='add'>+13267,</div><div class='add'>+13294,</div><div class='add'>+13307,</div><div class='add'>+13307,</div><div class='add'>+13307,</div><div class='add'>+13343,</div><div class='add'>+13349,</div><div class='add'>+13349,</div><div class='add'>+13349,</div><div class='add'>+13375,</div><div class='add'>+13375,</div><div class='add'>+13375,</div><div class='add'>+13384,</div><div class='add'>+13384,</div><div class='add'>+13384,</div><div class='add'>+13393,</div><div class='add'>+13393,</div><div class='add'>+13393,</div><div class='add'>+13402,</div><div class='add'>+13414,</div><div class='add'>+13425,</div><div class='add'>+13445,</div><div class='add'>+13467,</div><div class='add'>+13485,</div><div class='add'>+13499,</div><div class='add'>+13509,</div><div class='add'>+13528,</div><div class='add'>+13528,</div><div class='add'>+13549,</div><div class='add'>+13549,</div><div class='add'>+13559,</div><div class='add'>+13570,</div><div class='add'>+13570,</div><div class='add'>+13570,</div><div class='add'>+13570,</div><div class='add'>+13598,</div><div class='add'>+13637,</div><div class='add'>+13647,</div><div class='add'>+13647,</div><div class='add'>+13661,</div><div class='add'>+13673,</div><div class='add'>+13682,</div><div class='add'>+13687,</div><div class='add'>+13694,</div><div class='add'>+13694,</div><div class='add'>+13720,</div><div class='add'>+13733,</div><div class='add'>+13742,</div><div class='add'>+13748,</div><div class='add'>+13771,</div><div class='add'>+13795,</div><div class='add'>+13795,</div><div class='add'>+13814,</div><div class='add'>+13821,</div><div class='add'>+13821,</div><div class='add'>+13855,</div><div class='add'>+13862,</div><div class='add'>+13862,</div><div class='add'>+13862,</div><div class='add'>+13874,</div><div class='add'>+13874,</div><div class='add'>+13897,</div><div class='add'>+13909,</div><div class='add'>+13909,</div><div class='add'>+13947,</div><div class='add'>+13947,</div><div class='add'>+13952,</div><div class='add'>+13952,</div><div class='add'>+13970,</div><div class='add'>+13979,</div><div class='add'>+13979,</div><div class='add'>+13979,</div><div class='add'>+14008,</div><div class='add'>+14049,</div><div class='add'>+14049,</div><div class='add'>+14049,</div><div class='add'>+14049,</div><div class='add'>+14049,</div><div class='add'>+14049,</div><div class='add'>+14060,</div><div class='add'>+14083,</div><div class='add'>+14083,</div><div class='add'>+14091,</div><div class='add'>+14101,</div><div class='add'>+14101,</div><div class='add'>+14101,</div><div class='add'>+14101,</div><div class='add'>+14118,</div><div class='add'>+14136,</div><div class='add'>+14195,</div><div class='add'>+14195,</div><div class='add'>+14195,</div><div class='add'>+14213,</div><div class='add'>+14213,</div><div class='add'>+14232,</div><div class='add'>+14232,</div><div class='add'>+14253,</div><div class='add'>+14253,</div><div class='add'>+14258,</div><div class='add'>+14275,</div><div class='add'>+14275,</div><div class='add'>+14304,</div><div class='add'>+14311,</div><div class='add'>+14311,</div><div class='add'>+14318,</div><div class='add'>+14318,</div><div class='add'>+14318,</div><div class='add'>+14318,</div><div class='add'>+14318,</div><div class='add'>+14318,</div><div class='add'>+14325,</div><div class='add'>+14325,</div><div class='add'>+14345,</div><div class='add'>+14345,</div><div class='add'>+14379,</div><div class='add'>+14389,</div><div class='add'>+14422,</div><div class='add'>+14422,</div><div class='add'>+14422,</div><div class='add'>+14422,</div><div class='add'>+14435,</div><div class='add'>+14441,</div><div class='add'>+14441,</div><div class='add'>+14460,</div><div class='add'>+14460,</div><div class='add'>+14471,</div><div class='add'>+14471,</div><div class='add'>+14481,</div><div class='add'>+14495,</div><div class='add'>+14495,</div><div class='add'>+14495,</div><div class='add'>+14502,</div><div class='add'>+14502,</div><div class='add'>+14502,</div><div class='add'>+14502,</div><div class='add'>+14524,</div><div class='add'>+14533,</div><div class='add'>+14541,</div><div class='add'>+14552,</div><div class='add'>+14552,</div><div class='add'>+14552,</div><div class='add'>+14552,</div><div class='add'>+14563,</div><div class='add'>+14563,</div><div class='add'>+14568,</div><div class='add'>+14568,</div><div class='add'>+14585,</div><div class='add'>+14595,</div><div class='add'>+14602,</div><div class='add'>+14628,</div><div class='add'>+14628,</div><div class='add'>+14645,</div><div class='add'>+14672,</div><div class='add'>+14678,</div><div class='add'>+14697,</div><div class='add'>+14697,</div><div class='add'>+14734,</div><div class='add'>+14757,</div><div class='add'>+14764,</div><div class='add'>+14771,</div><div class='add'>+14771,</div><div class='add'>+14771,</div><div class='add'>+14796,</div><div class='add'>+14815,</div><div class='add'>+14822,</div><div class='add'>+14845,</div><div class='add'>+14861,</div><div class='add'>+14861,</div><div class='add'>+14861,</div><div class='add'>+14873,</div><div class='add'>+14873,</div><div class='add'>+14873,</div><div class='add'>+14902,</div><div class='add'>+14920,</div><div class='add'>+14920,</div><div class='add'>+14926,</div><div class='add'>+14926,</div><div class='add'>+14926,</div><div class='add'>+14941,</div><div class='add'>+14949,</div><div class='add'>+14949,</div><div class='add'>+14949,</div><div class='add'>+14949,</div><div class='add'>+14949,</div><div class='add'>+14960,</div><div class='add'>+14960,</div><div class='add'>+14971,</div><div class='add'>+14971,</div><div class='add'>+14998,</div><div class='add'>+15003,</div><div class='add'>+15003,</div><div class='add'>+15003,</div><div class='add'>+15013,</div><div class='add'>+15013,</div><div class='add'>+15027,</div><div class='add'>+15027,</div><div class='add'>+15027,</div><div class='add'>+15043,</div><div class='add'>+15053,</div><div class='add'>+15063,</div><div class='add'>+15074,</div><div class='add'>+15083,</div><div class='add'>+15093,</div><div class='add'>+15093,</div><div class='add'>+15121,</div><div class='add'>+15121,</div><div class='add'>+15128,</div><div class='add'>+15128,</div><div class='add'>+15144,</div><div class='add'>+15144,</div><div class='add'>+15144,</div><div class='add'>+15144,</div><div class='add'>+15165,</div><div class='add'>+15170,</div><div class='add'>+15170,</div><div class='add'>+15170,</div><div class='add'>+15170,</div><div class='add'>+15170,</div><div class='add'>+15170,</div><div class='add'>+15170,</div><div class='add'>+15186,</div><div class='add'>+15206,</div><div class='add'>+15206,</div><div class='add'>+15206,</div><div class='add'>+15224,</div><div class='add'>+15236,</div><div class='add'>+15236,</div><div class='add'>+15252,</div><div class='add'>+15258,</div><div class='add'>+15258,</div><div class='add'>+15258,</div><div class='add'>+15258,</div><div class='add'>+15264,</div><div class='add'>+15277,</div><div class='add'>+15288,</div><div class='add'>+15307,</div><div class='add'>+15307,</div><div class='add'>+15318,</div><div class='add'>+15328,</div><div class='add'>+15328,</div><div class='add'>+15334,</div><div class='add'>+15334,</div><div class='add'>+15363,</div><div class='add'>+15399,</div><div class='add'>+15399,</div><div class='add'>+15422,</div><div class='add'>+15438,</div><div class='add'>+15447,</div><div class='add'>+15447,</div><div class='add'>+15456,</div><div class='add'>+15456,</div><div class='add'>+15456,</div><div class='add'>+15495,</div><div class='add'>+15495,</div><div class='add'>+15495,</div><div class='add'>+15495,</div><div class='add'>+15511,</div><div class='add'>+15511,</div><div class='add'>+15530,</div><div class='add'>+15557,</div><div class='add'>+15566,</div><div class='add'>+15582,</div><div class='add'>+15590,</div><div class='add'>+15590,</div><div class='add'>+15604,</div><div class='add'>+15604,</div><div class='add'>+15625,</div><div class='add'>+15635,</div><div class='add'>+15655,</div><div class='add'>+15655,</div><div class='add'>+15655,</div><div class='add'>+15655,</div><div class='add'>+15655,</div><div class='add'>+15665,</div><div class='add'>+15675,</div><div class='add'>+15675,</div><div class='add'>+15675,</div><div class='add'>+15675,</div><div class='add'>+15675,</div><div class='add'>+15682,</div><div class='add'>+15682,</div><div class='add'>+15682,</div><div class='add'>+15694,</div><div class='add'>+15719,</div><div class='add'>+15749,</div><div class='add'>+15749,</div><div class='add'>+15794,</div><div class='add'>+15794,</div><div class='add'>+15837,</div><div class='add'>+15854,</div><div class='add'>+15854,</div><div class='add'>+15861,</div><div class='add'>+15861,</div><div class='add'>+15861,</div><div class='add'>+15861,</div><div class='add'>+15884,</div><div class='add'>+15900,</div><div class='add'>+15911,</div><div class='add'>+15931,</div><div class='add'>+15931,</div><div class='add'>+15931,</div><div class='add'>+15931,</div><div class='add'>+15931,</div><div class='add'>+15963,</div><div class='add'>+15963,</div><div class='add'>+15996,</div><div class='add'>+16006,</div><div class='add'>+16013,</div><div class='add'>+16024,</div><div class='add'>+16034,</div><div class='add'>+16049,</div><div class='add'>+16049,</div><div class='add'>+16049,</div><div class='add'>+16059,</div><div class='add'>+16059,</div><div class='add'>+16059,</div><div class='add'>+16059,</div><div class='add'>+16059,</div><div class='add'>+16059,</div><div class='add'>+16059,</div><div class='add'>+16064,</div><div class='add'>+16075,</div><div class='add'>+16104,</div><div class='add'>+16104,</div><div class='add'>+16117,</div><div class='add'>+16124,</div><div class='add'>+16124,</div><div class='add'>+16124,</div><div class='add'>+16124,</div><div class='add'>+16130,</div><div class='add'>+16145,</div><div class='add'>+16159,</div><div class='add'>+16190,</div><div class='add'>+16193,</div><div class='add'>+16196,</div><div class='add'>+16210,</div><div class='add'>+16224,</div><div class='add'>+16243,</div><div class='add'>+16255,</div><div class='add'>+16261,</div><div class='add'>+16280,</div><div class='add'>+16283,</div><div class='add'>+16292,</div><div class='add'>+16295,</div><div class='add'>+16295,</div><div class='add'>+16301,</div><div class='add'>+16304,</div><div class='add'>+16322,</div><div class='add'>+16325,</div><div class='add'>+16328,</div><div class='add'>+16349,</div><div class='add'>+16355,</div><div class='add'>+16382,</div><div class='add'>+16408,</div><div class='add'>+16414,</div><div class='add'>+16414,</div><div class='add'>+16414,</div><div class='add'>+16458,</div><div class='add'>+16477,</div><div class='add'>+16480,</div><div class='add'>+16485,</div><div class='add'>+16488,</div><div class='add'>+16514,</div><div class='add'>+16520,</div><div class='add'>+16530,</div><div class='add'>+16530,</div><div class='add'>+16546,</div><div class='add'>+16562,</div><div class='add'>+16597,</div><div class='add'>+16603,</div><div class='add'>+16622,</div><div class='add'>+16622,</div><div class='add'>+16646,</div><div class='add'>+16669,</div><div class='add'>+16672,</div><div class='add'>+16715,</div><div class='add'>+16715,</div><div class='add'>+16715,</div><div class='add'>+16718,</div><div class='add'>+16718,</div><div class='add'>+16727,</div><div class='add'>+16733,</div><div class='add'>+16752,</div><div class='add'>+16770,</div><div class='add'>+16787,</div><div class='add'>+16794,</div><div class='add'>+16810,</div><div class='add'>+16827,</div><div class='add'>+16840,</div><div class='add'>+16850,</div><div class='add'>+16876,</div><div class='add'>+16901,</div><div class='add'>+16901,</div><div class='add'>+16901,</div><div class='add'>+16916,</div><div class='add'>+16919,</div><div class='add'>+16926,</div><div class='add'>+16943,</div><div class='add'>+16972,</div><div class='add'>+16978,</div><div class='add'>+16978,</div><div class='add'>+16978,</div><div class='add'>+16981,</div><div class='add'>+17008,</div><div class='add'>+17008,</div><div class='add'>+17016,</div><div class='add'>+17053,</div><div class='add'>+17053,</div><div class='add'>+17053,</div><div class='add'>+17053,</div><div class='add'>+17072,</div><div class='add'>+17086,</div><div class='add'>+17105,</div><div class='add'>+17139,</div><div class='add'>+17153,</div><div class='add'>+17162,</div><div class='add'>+17162,</div><div class='add'>+17177,</div><div class='add'>+17177,</div><div class='add'>+17177,</div><div class='add'>+17177,</div><div class='add'>+17195,</div><div class='add'>+17218,</div><div class='add'>+17221,</div><div class='add'>+17221,</div><div class='add'>+17237,</div><div class='add'>+17276,</div><div class='add'>+17276,</div><div class='add'>+17300,</div><div class='add'>+17319,</div><div class='add'>+17339,</div><div class='add'>+17357,</div><div class='add'>+17370,</div><div class='add'>+17383,</div><div class='add'>+17400,</div><div class='add'>+17407,</div><div class='add'>+17419,</div><div class='add'>+17439,</div><div class='add'>+17439,</div><div class='add'>+17449,</div><div class='add'>+17465,</div><div class='add'>+17475,</div><div class='add'>+17504,</div><div class='add'>+17527,</div><div class='add'>+17527,</div><div class='add'>+17534,</div><div class='add'>+17548,</div><div class='add'>+17564,</div><div class='add'>+17564,</div><div class='add'>+17598,</div><div class='add'>+17598,</div><div class='add'>+17601,</div><div class='add'>+17630,</div><div class='add'>+17649,</div><div class='add'>+17669,</div><div class='add'>+17669,</div><div class='add'>+17679,</div><div class='add'>+17686,</div><div class='add'>+17757,</div><div class='add'>+17776,</div><div class='add'>+17796,</div><div class='add'>+17810,</div><div class='add'>+17840,</div><div class='add'>+17840,</div><div class='add'>+17877,</div><div class='add'>+17884,</div><div class='add'>+17884,</div><div class='add'>+17911,</div><div class='add'>+17936,</div><div class='add'>+17970,</div><div class='add'>+17980,</div><div class='add'>+17995,</div><div class='add'>+17995,</div><div class='add'>+18008,</div><div class='add'>+18011,</div><div class='add'>+18036,</div><div class='add'>+18075,</div><div class='add'>+18097,</div><div class='add'>+18097,</div><div class='add'>+18104,</div><div class='add'>+18115,</div><div class='add'>+18115,</div><div class='add'>+18129,</div><div class='add'>+18134,</div><div class='add'>+18141,</div><div class='add'>+18141,</div><div class='add'>+18157,</div><div class='add'>+18180,</div><div class='add'>+18190,</div><div class='add'>+18217,</div><div class='add'>+18224,</div><div class='add'>+18252,</div><div class='add'>+18284,</div><div class='add'>+18284,</div><div class='add'>+18296,</div><div class='add'>+18299,</div><div class='add'>+18312,</div><div class='add'>+18322,</div><div class='add'>+18338,</div><div class='add'>+18348,</div><div class='add'>+18348,</div><div class='add'>+18363,</div><div class='add'>+18372,</div><div class='add'>+18387,</div><div class='add'>+18387,</div><div class='add'>+18390,</div><div class='add'>+18402,</div><div class='add'>+18445,</div><div class='add'>+18445,</div><div class='add'>+18445,</div><div class='add'>+18466,</div><div class='add'>+18479,</div><div class='add'>+18479,</div><div class='add'>+18498,</div><div class='add'>+18508,</div><div class='add'>+18511,</div><div class='add'>+18511,</div><div class='add'>+18511,</div><div class='add'>+18511,</div><div class='add'>+18511,</div><div class='add'>+18526,</div><div class='add'>+18558,</div><div class='add'>+18586,</div><div class='add'>+18622,</div><div class='add'>+18643,</div><div class='add'>+18670,</div><div class='add'>+18686,</div><div class='add'>+18710,</div><div class='add'>+18720,</div><div class='add'>+18739,</div><div class='add'>+18739,</div><div class='add'>+18742,</div><div class='add'>+18745,</div><div class='add'>+18771,</div><div class='add'>+18774,</div><div class='add'>+18777,</div><div class='add'>+18791,</div><div class='add'>+18813,</div><div class='add'>+18816,</div><div class='add'>+18822,</div><div class='add'>+18839,</div><div class='add'>+18845,</div><div class='add'>+18851,</div><div class='add'>+18854,</div><div class='add'>+18878,</div><div class='add'>+18881,</div><div class='add'>+18896,</div><div class='add'>+18896,</div><div class='add'>+18899,</div><div class='add'>+18926,</div><div class='add'>+18937,</div><div class='add'>+18940,</div><div class='add'>+18953,</div><div class='add'>+18963,</div><div class='add'>+19010,</div><div class='add'>+19010,</div><div class='add'>+19017,</div><div class='add'>+19046,</div><div class='add'>+19060,</div><div class='add'>+19060,</div><div class='add'>+19087,</div><div class='add'>+19095,</div><div class='add'>+19101,</div><div class='add'>+19101,</div><div class='add'>+19128,</div><div class='add'>+19146,</div><div class='add'>+19157,</div><div class='add'>+19157,</div><div class='add'>+19188,</div><div class='add'>+19198,</div><div class='add'>+19205,</div><div class='add'>+19223,</div><div class='add'>+19230,</div><div class='add'>+19255,</div><div class='add'>+19280,</div><div class='add'>+19280,</div><div class='add'>+19283,</div><div class='add'>+19292,</div><div class='add'>+19301,</div><div class='add'>+19320,</div><div class='add'>+19323,</div><div class='add'>+19323,</div><div class='add'>+19341,</div><div class='add'>+19341,</div><div class='add'>+19365,</div><div class='add'>+19378,</div><div class='add'>+19381,</div><div class='add'>+19394,</div><div class='add'>+19423,</div><div class='add'>+19433,</div><div class='add'>+19440,</div><div class='add'>+19466,</div><div class='add'>+19490,</div><div class='add'>+19490,</div><div class='add'>+19490,</div><div class='add'>+19497,</div><div class='add'>+19504,</div><div class='add'>+19511,</div><div class='add'>+19511,</div><div class='add'>+19518,</div><div class='add'>+19545,</div><div class='add'>+19568,</div><div class='add'>+19575,</div><div class='add'>+19575,</div><div class='add'>+19583,</div><div class='add'>+19586,</div><div class='add'>+19592,</div><div class='add'>+19592,</div><div class='add'>+19609,</div><div class='add'>+19622,</div><div class='add'>+19629,</div><div class='add'>+19641,</div><div class='add'>+19641,</div><div class='add'>+19656,</div><div class='add'>+19673,</div><div class='add'>+19700,</div><div class='add'>+19723,</div><div class='add'>+19733,</div><div class='add'>+19746,</div><div class='add'>+19759,</div><div class='add'>+19769,</div><div class='add'>+19782,</div><div class='add'>+19789,</div><div class='add'>+19795,</div><div class='add'>+19831,</div><div class='add'>+19834,</div><div class='add'>+19841,</div><div class='add'>+19851,</div><div class='add'>+19854,</div><div class='add'>+19880,</div><div class='add'>+19895,</div><div class='add'>+19898,</div><div class='add'>+19898,</div><div class='add'>+19911,</div><div class='add'>+19922,</div><div class='add'>+19950,</div><div class='add'>+20020,</div><div class='add'>+20030,</div><div class='add'>+20059,</div><div class='add'>+20062,</div><div class='add'>+20089,</div><div class='add'>+20107,</div><div class='add'>+20151,</div><div class='add'>+20154,</div><div class='add'>+20175,</div><div class='add'>+20205,</div><div class='add'>+20208,</div><div class='add'>+20229,</div><div class='add'>+20229,</div><div class='add'>+20255,</div><div class='add'>+20261,</div><div class='add'>+20261,</div><div class='add'>+20283,</div><div class='add'>+20335,</div><div class='add'>+20362,</div><div class='add'>+20385,</div><div class='add'>+20392,</div><div class='add'>+20392,</div><div class='add'>+20392,</div><div class='add'>+20392,</div><div class='add'>+20418,</div><div class='add'>+20418,</div><div class='add'>+20418,</div><div class='add'>+20418,</div><div class='add'>+20443,</div><div class='add'>+20446,</div><div class='add'>+20446,</div><div class='add'>+20452,</div><div class='add'>+20452,</div><div class='add'>+20467,</div><div class='add'>+20467,</div><div class='add'>+20489,</div><div class='add'>+20489,</div><div class='add'>+20498,</div><div class='add'>+20525,</div><div class='add'>+20554,</div><div class='add'>+20560,</div><div class='add'>+20575,</div><div class='add'>+20589,</div><div class='add'>+20589,</div><div class='add'>+20589,</div><div class='add'>+20614,</div><div class='add'>+20652,</div><div class='add'>+20659,</div><div class='add'>+20659,</div><div class='add'>+20668,</div><div class='add'>+20679,</div><div class='add'>+20679,</div><div class='add'>+20679,</div><div class='add'>+20685,</div><div class='add'>+20685,</div><div class='add'>+20685,</div><div class='add'>+20685,</div><div class='add'>+20685,</div><div class='add'>+20685,</div><div class='add'>+20696,</div><div class='add'>+20733,</div><div class='add'>+20760,</div><div class='add'>+20766,</div><div class='add'>+20769,</div><div class='add'>+20792,</div><div class='add'>+20792,</div><div class='add'>+20792,</div><div class='add'>+20792,</div><div class='add'>+20813,</div><div class='add'>+20813,</div><div class='add'>+20813,</div><div class='add'>+20813,</div><div class='add'>+20826,</div><div class='add'>+20826,</div><div class='add'>+20846,</div><div class='add'>+20862,</div><div class='add'>+20880,</div><div class='add'>+20887,</div><div class='add'>+20901,</div><div class='add'>+20908,</div><div class='add'>+20933,</div><div class='add'>+20938,</div><div class='add'>+20958,</div><div class='add'>+20969,</div><div class='add'>+20978,</div><div class='add'>+20978,</div><div class='add'>+20978,</div><div class='add'>+20985,</div><div class='add'>+20985,</div><div class='add'>+20985,</div><div class='add'>+21000,</div><div class='add'>+21010,</div><div class='add'>+21010,</div><div class='add'>+21014,</div><div class='add'>+21026,</div><div class='add'>+21033,</div><div class='add'>+21041,</div><div class='add'>+21041,</div><div class='add'>+21051,</div><div class='add'>+21051,</div><div class='add'>+21064,</div><div class='add'>+21071,</div><div class='add'>+21113,</div><div class='add'>+21120,</div><div class='add'>+21120,</div><div class='add'>+21127,</div><div class='add'>+21134,</div><div class='add'>+21142,</div><div class='add'>+21164,</div><div class='add'>+21164,</div><div class='add'>+21164,</div><div class='add'>+21188,</div><div class='add'>+21195,</div><div class='add'>+21208,</div><div class='add'>+21215,</div><div class='add'>+21226,</div><div class='add'>+21226,</div><div class='add'>+21226,</div><div class='add'>+21238,</div><div class='add'>+21249,</div><div class='add'>+21255,</div><div class='add'>+21255,</div><div class='add'>+21265,</div><div class='add'>+21279,</div><div class='add'>+21296,</div><div class='add'>+21301,</div><div class='add'>+21315,</div><div class='add'>+21321,</div><div class='add'>+21331,</div><div class='add'>+21331,</div><div class='add'>+21331,</div><div class='add'>+21337,</div><div class='add'>+21343,</div><div class='add'>+21343,</div><div class='add'>+21351,</div><div class='add'>+21351,</div><div class='add'>+21361,</div><div class='add'>+21368,</div><div class='add'>+21383,</div><div class='add'>+21383,</div><div class='add'>+21389,</div><div class='add'>+21413,</div><div class='add'>+21437,</div><div class='add'>+21449,</div><div class='add'>+21462,</div><div class='add'>+21478,</div><div class='add'>+21506,</div><div class='add'>+21534,</div><div class='add'>+21546,</div><div class='add'>+21546,</div><div class='add'>+21557,</div><div class='add'>+21580,</div><div class='add'>+21595,</div><div class='add'>+21595,</div><div class='add'>+21595,</div><div class='add'>+21595,</div><div class='add'>+21626,</div><div class='add'>+21626,</div><div class='add'>+21646,</div><div class='add'>+21670,</div><div class='add'>+21676,</div><div class='add'>+21688,</div><div class='add'>+21688,</div><div class='add'>+21716,</div><div class='add'>+21731,</div><div class='add'>+21762,</div><div class='add'>+21762,</div><div class='add'>+21762,</div><div class='add'>+21762,</div><div class='add'>+21762,</div><div class='add'>+21783,</div><div class='add'>+21789,</div><div class='add'>+21799,</div><div class='add'>+21828,</div><div class='add'>+21828,</div><div class='add'>+21837,</div><div class='add'>+21845,</div><div class='add'>+21868,</div><div class='add'>+21874,</div><div class='add'>+21874,</div><div class='add'>+21880,</div><div class='add'>+21880,</div><div class='add'>+21889,</div><div class='add'>+21901,</div><div class='add'>+21910,</div><div class='add'>+21941,</div><div class='add'>+21941,</div><div class='add'>+21959,</div><div class='add'>+21959,</div><div class='add'>+21959,</div><div class='add'>+21966,</div><div class='add'>+21966,</div><div class='add'>+21972,</div><div class='add'>+21972,</div><div class='add'>+21995,</div><div class='add'>+22011,</div><div class='add'>+22043,</div><div class='add'>+22043,</div><div class='add'>+22051,</div><div class='add'>+22051,</div><div class='add'>+22060,</div><div class='add'>+22060,</div><div class='add'>+22060,</div><div class='add'>+22074,</div><div class='add'>+22086,</div><div class='add'>+22086,</div><div class='add'>+22099,</div><div class='add'>+22099,</div><div class='add'>+22120,</div><div class='add'>+22120,</div><div class='add'>+22134,</div><div class='add'>+22144,</div><div class='add'>+22150,</div><div class='add'>+22158,</div><div class='add'>+22164,</div><div class='add'>+22164,</div><div class='add'>+22171,</div><div class='add'>+22199,</div><div class='add'>+22210,</div><div class='add'>+22210,</div><div class='add'>+22210,</div><div class='add'>+22220,</div><div class='add'>+22228,</div><div class='add'>+22228,</div><div class='add'>+22239,</div><div class='add'>+22261,</div><div class='add'>+22304,</div><div class='add'>+22304,</div><div class='add'>+22312,</div><div class='add'>+22349,</div><div class='add'>+22349,</div><div class='add'>+22349,</div><div class='add'>+22357,</div><div class='add'>+22381,</div><div class='add'>+22381,</div><div class='add'>+22390,</div><div class='add'>+22390,</div><div class='add'>+22390,</div><div class='add'>+22390,</div><div class='add'>+22402,</div><div class='add'>+22413,</div><div class='add'>+22413,</div><div class='add'>+22422,</div><div class='add'>+22422,</div><div class='add'>+22445,</div><div class='add'>+22445,</div><div class='add'>+22445,</div><div class='add'>+22456,</div><div class='add'>+22456,</div><div class='add'>+22469,</div><div class='add'>+22479,</div><div class='add'>+22501,</div><div class='add'>+22512,</div><div class='add'>+22528,</div><div class='add'>+22528,</div><div class='add'>+22528,</div><div class='add'>+22528,</div><div class='add'>+22528,</div><div class='add'>+22528,</div><div class='add'>+22528,</div><div class='add'>+22540,</div><div class='add'>+22540,</div><div class='add'>+22546,</div><div class='add'>+22546,</div><div class='add'>+22546,</div><div class='add'>+22546,</div><div class='add'>+22569,</div><div class='add'>+22591,</div><div class='add'>+22591,</div><div class='add'>+22591,</div><div class='add'>+22591,</div><div class='add'>+22610,</div><div class='add'>+22655,</div><div class='add'>+22655,</div><div class='add'>+22667,</div><div class='add'>+22667,</div><div class='add'>+22677,</div><div class='add'>+22677,</div><div class='add'>+22692,</div><div class='add'>+22692,</div><div class='add'>+22702,</div><div class='add'>+22702,</div><div class='add'>+22702,</div><div class='add'>+22717,</div><div class='add'>+22736,</div><div class='add'>+22750,</div><div class='add'>+22755,</div><div class='add'>+22780,</div><div class='add'>+22785,</div><div class='add'>+22822,</div><div class='add'>+22844,</div><div class='add'>+22859,</div><div class='add'>+22871,</div><div class='add'>+22909,</div><div class='add'>+22949,</div><div class='add'>+22962,</div><div class='add'>+22973,</div><div class='add'>+22979,</div><div class='add'>+22988,</div><div class='add'>+23007,</div><div class='add'>+23027,</div><div class='add'>+23035,</div><div class='add'>+23072,</div><div class='add'>+23082,</div><div class='add'>+23082,</div><div class='add'>+23109,</div><div class='add'>+23116,</div><div class='add'>+23130,</div><div class='add'>+23158,</div><div class='add'>+23166,</div><div class='add'>+23166,</div><div class='add'>+23172,</div><div class='add'>+23177,</div><div class='add'>+23189,</div><div class='add'>+23219,</div><div class='add'>+23219,</div><div class='add'>+23250,</div><div class='add'>+23273,</div><div class='add'>+23281,</div><div class='add'>+23281,</div><div class='add'>+23281,</div><div class='add'>+23281,</div><div class='add'>+23281,</div><div class='add'>+23287,</div><div class='add'>+23287,</div><div class='add'>+23299,</div><div class='add'>+23305,</div><div class='add'>+23315,</div><div class='add'>+23315,</div><div class='add'>+23321,</div><div class='add'>+23328,</div><div class='add'>+23334,</div><div class='add'>+23355,</div><div class='add'>+23355,</div><div class='add'>+23355,</div><div class='add'>+23355,</div><div class='add'>+23355,</div><div class='add'>+23366,</div><div class='add'>+23390,</div><div class='add'>+23396,</div><div class='add'>+23396,</div><div class='add'>+23396,</div><div class='add'>+23396,</div><div class='add'>+23402,</div><div class='add'>+23418,</div><div class='add'>+23424,</div><div class='add'>+23424,</div><div class='add'>+23438,</div><div class='add'>+23446,</div><div class='add'>+23446,</div><div class='add'>+23446,</div><div class='add'>+23500,</div><div class='add'>+23525,</div><div class='add'>+23569,</div><div class='add'>+23592,</div><div class='add'>+23592,</div><div class='add'>+23592,</div><div class='add'>+23605,</div><div class='add'>+23614,</div><div class='add'>+23614,</div><div class='add'>+23614,</div><div class='add'>+23627,</div><div class='add'>+23633,</div><div class='add'>+23657,</div><div class='add'>+23673,</div><div class='add'>+23673,</div><div class='add'>+23673,</div><div class='add'>+23689,</div><div class='add'>+23689,</div><div class='add'>+23701,</div><div class='add'>+23701,</div><div class='add'>+23701,</div><div class='add'>+23713,</div><div class='add'>+23713,</div><div class='add'>+23713,</div><div class='add'>+23738,</div><div class='add'>+23758,</div><div class='add'>+23775,</div><div class='add'>+23775,</div><div class='add'>+23794,</div><div class='add'>+23794,</div><div class='add'>+23803,</div><div class='add'>+23803,</div><div class='add'>+23803,</div><div class='add'>+23803,</div><div class='add'>+23813,</div><div class='add'>+23826,</div><div class='add'>+23845,</div><div class='add'>+23845,</div><div class='add'>+23845,</div><div class='add'>+23845,</div><div class='add'>+23872,</div><div class='add'>+23872,</div><div class='add'>+23872,</div><div class='add'>+23888,</div><div class='add'>+23888,</div><div class='add'>+23900,</div><div class='add'>+23900,</div><div class='add'>+23906,</div><div class='add'>+23906,</div><div class='add'>+23906,</div><div class='add'>+23906,</div><div class='add'>+23906,</div><div class='add'>+23924,</div><div class='add'>+23924,</div><div class='add'>+23924,</div><div class='add'>+23930,</div><div class='add'>+23930,</div><div class='add'>+23939,</div><div class='add'>+23949,</div><div class='add'>+23971,</div><div class='add'>+23971,</div><div class='add'>+23971,</div><div class='add'>+24000,</div><div class='add'>+24012,</div><div class='add'>+24042,</div><div class='add'>+24042,</div><div class='add'>+24042,</div><div class='add'>+24042,</div><div class='add'>+24042,</div><div class='add'>+24070,</div><div class='add'>+24076,</div><div class='add'>+24094,</div><div class='add'>+24094,</div><div class='add'>+24094,</div><div class='add'>+24123,</div><div class='add'>+24123,</div><div class='add'>+24123,</div><div class='add'>+24134,</div><div class='add'>+24150,</div><div class='add'>+24150,</div><div class='add'>+24150,</div><div class='add'>+24150,</div><div class='add'>+24150,</div><div class='add'>+24150,</div><div class='add'>+24155,</div><div class='add'>+24179,</div><div class='add'>+24179,</div><div class='add'>+24189,</div><div class='add'>+24189,</div><div class='add'>+24189,</div><div class='add'>+24198,</div><div class='add'>+24198,</div><div class='add'>+24218,</div><div class='add'>+24218,</div><div class='add'>+24218,</div><div class='add'>+24234,</div><div class='add'>+24251,</div><div class='add'>+24257,</div><div class='add'>+24276,</div><div class='add'>+24305,</div><div class='add'>+24321,</div><div class='add'>+24321,</div><div class='add'>+24321,</div><div class='add'>+24334,</div><div class='add'>+24334,</div><div class='add'>+24334,</div><div class='add'>+24349,</div><div class='add'>+24356,</div><div class='add'>+24361,</div><div class='add'>+24372,</div><div class='add'>+24372,</div><div class='add'>+24372,</div><div class='add'>+24388,</div><div class='add'>+24396,</div><div class='add'>+24396,</div><div class='add'>+24402,</div><div class='add'>+24410,</div><div class='add'>+24410,</div><div class='add'>+24428,</div><div class='add'>+24428,</div><div class='add'>+24450,</div><div class='add'>+24450,</div><div class='add'>+24467,</div><div class='add'>+24485,</div><div class='add'>+24495,</div><div class='add'>+24495,</div><div class='add'>+24495,</div><div class='add'>+24507,</div><div class='add'>+24507,</div><div class='add'>+24514,</div><div class='add'>+24531,</div><div class='add'>+24531,</div><div class='add'>+24531,</div><div class='add'>+24531,</div><div class='add'>+24531,</div><div class='add'>+24537,</div><div class='add'>+24537,</div><div class='add'>+24558,</div><div class='add'>+24572,</div><div class='add'>+24584,</div><div class='add'>+24584,</div><div class='add'>+24601,</div><div class='add'>+24601,</div><div class='add'>+24607,</div><div class='add'>+24615,</div><div class='add'>+24615,</div><div class='add'>+24632,</div><div class='add'>+24632,</div><div class='add'>+24632,</div><div class='add'>+24632,</div><div class='add'>+24661,</div><div class='add'>+24676,</div><div class='add'>+24676,</div><div class='add'>+24724,</div><div class='add'>+24751,</div><div class='add'>+24751,</div><div class='add'>+24774,</div><div class='add'>+24774,</div><div class='add'>+24783,</div><div class='add'>+24793,</div><div class='add'>+24793,</div><div class='add'>+24793,</div><div class='add'>+24813,</div><div class='add'>+24819,</div><div class='add'>+24819,</div><div class='add'>+24826,</div><div class='add'>+24826,</div><div class='add'>+24842,</div><div class='add'>+24858,</div><div class='add'>+24872,</div><div class='add'>+24872,</div><div class='add'>+24890,</div><div class='add'>+24890,</div><div class='add'>+24890,</div><div class='add'>+24890,</div><div class='add'>+24890,</div><div class='add'>+24890,</div><div class='add'>+24890,</div><div class='add'>+24890,</div><div class='add'>+24890,</div><div class='add'>+24906,</div><div class='add'>+24906,</div><div class='add'>+24917,</div><div class='add'>+24928,</div><div class='add'>+24947,</div><div class='add'>+24947,</div><div class='add'>+24947,</div><div class='add'>+24947,</div><div class='add'>+24947,</div><div class='add'>+24947,</div><div class='add'>+24947,</div><div class='add'>+24947,</div><div class='add'>+24947,</div><div class='add'>+24963,</div><div class='add'>+24983,</div><div class='add'>+24991,</div><div class='add'>+24991,</div><div class='add'>+24991,</div><div class='add'>+24991,</div><div class='add'>+24991,</div><div class='add'>+24991,</div><div class='add'>+24991,</div><div class='add'>+24991,</div><div class='add'>+25007,</div><div class='add'>+25007,</div><div class='add'>+25007,</div><div class='add'>+25007,</div><div class='add'>+25007,</div><div class='add'>+25007,</div><div class='add'>+25007,</div><div class='add'>+25030,</div><div class='add'>+25040,</div><div class='add'>+25040,</div><div class='add'>+25040,</div><div class='add'>+25040,</div><div class='add'>+25040,</div><div class='add'>+25059,</div><div class='add'>+25097,</div><div class='add'>+25132,</div><div class='add'>+25149,</div><div class='add'>+25159,</div><div class='add'>+25169,</div><div class='add'>+25169,</div><div class='add'>+25169,</div><div class='add'>+25192,</div><div class='add'>+25192,</div><div class='add'>+25192,</div><div class='add'>+25192,</div><div class='add'>+25205,</div><div class='add'>+25205,</div><div class='add'>+25216,</div><div class='add'>+25221,</div><div class='add'>+25221,</div><div class='add'>+25233,</div><div class='add'>+25233,</div><div class='add'>+25240,</div><div class='add'>+25250,</div><div class='add'>+25256,</div><div class='add'>+25273,</div><div class='add'>+25273,</div><div class='add'>+25303,</div><div class='add'>+25321,</div><div class='add'>+25321,</div><div class='add'>+25321,</div><div class='add'>+25333,</div><div class='add'>+25333,</div><div class='add'>+25333,</div><div class='add'>+25333,</div><div class='add'>+25370,</div><div class='add'>+25370,</div><div class='add'>+25402,</div><div class='add'>+25418,</div><div class='add'>+25418,</div><div class='add'>+25439,</div><div class='add'>+25439,</div><div class='add'>+25454,</div><div class='add'>+25454,</div><div class='add'>+25454,</div><div class='add'>+25463,</div><div class='add'>+25477,</div><div class='add'>+25526,</div><div class='add'>+25526,</div><div class='add'>+25526,</div><div class='add'>+25526,</div><div class='add'>+25545,</div><div class='add'>+25562,</div><div class='add'>+25572,</div><div class='add'>+25572,</div><div class='add'>+25582,</div><div class='add'>+25582,</div><div class='add'>+25582,</div><div class='add'>+25597,</div><div class='add'>+25610,</div><div class='add'>+25634,</div><div class='add'>+25641,</div><div class='add'>+25641,</div><div class='add'>+25641,</div><div class='add'>+25668,</div><div class='add'>+25668,</div><div class='add'>+25675,</div><div class='add'>+25707,</div><div class='add'>+25727,</div><div class='add'>+25727,</div><div class='add'>+25741,</div><div class='add'>+25756,</div><div class='add'>+25756,</div><div class='add'>+25779,</div><div class='add'>+25811,</div><div class='add'>+25811,</div><div class='add'>+25811,</div><div class='add'>+25817,</div><div class='add'>+25817,</div><div class='add'>+25817,</div><div class='add'>+25827,</div><div class='add'>+25827,</div><div class='add'>+25827,</div><div class='add'>+25827,</div><div class='add'>+25827,</div><div class='add'>+25836,</div><div class='add'>+25836,</div><div class='add'>+25836,</div><div class='add'>+25836,</div><div class='add'>+25850,</div><div class='add'>+25850,</div><div class='add'>+25860,</div><div class='add'>+25884,</div><div class='add'>+25901,</div><div class='add'>+25922,</div><div class='add'>+25936,</div><div class='add'>+25946,</div><div class='add'>+25969,</div><div class='add'>+25969,</div><div class='add'>+25969,</div><div class='add'>+25969,</div><div class='add'>+25975,</div><div class='add'>+25975,</div><div class='add'>+25987,</div><div class='add'>+25987,</div><div class='add'>+26065,</div><div class='add'>+26065,</div><div class='add'>+26065,</div><div class='add'>+26084,</div><div class='add'>+26084,</div><div class='add'>+26103,</div><div class='add'>+26128,</div><div class='add'>+26141,</div><div class='add'>+26151,</div><div class='add'>+26169,</div><div class='add'>+26169,</div><div class='add'>+26169,</div><div class='add'>+26180,</div><div class='add'>+26191,</div><div class='add'>+26191,</div><div class='add'>+26191,</div><div class='add'>+26197,</div><div class='add'>+26197,</div><div class='add'>+26205,</div><div class='add'>+26211,</div><div class='add'>+26235,</div><div class='add'>+26235,</div><div class='add'>+26235,</div><div class='add'>+26235,</div><div class='add'>+26235,</div><div class='add'>+26235,</div><div class='add'>+26245,</div><div class='add'>+26245,</div><div class='add'>+26259,</div><div class='add'>+26259,</div><div class='add'>+26259,</div><div class='add'>+26259,</div><div class='add'>+26284,</div><div class='add'>+26284,</div><div class='add'>+26325,</div><div class='add'>+26325,</div><div class='add'>+26355,</div><div class='add'>+26364,</div><div class='add'>+26364,</div><div class='add'>+26402,</div><div class='add'>+26418,</div><div class='add'>+26418,</div><div class='add'>+26425,</div><div class='add'>+26432,</div><div class='add'>+26432,</div><div class='add'>+26454,</div><div class='add'>+26504,</div><div class='add'>+26513,</div><div class='add'>+26525,</div><div class='add'>+26525,</div><div class='add'>+26525,</div><div class='add'>+26525,</div><div class='add'>+26525,</div><div class='add'>+26545,</div><div class='add'>+26545,</div><div class='add'>+26571,</div><div class='add'>+26590,</div><div class='add'>+26597,</div><div class='add'>+26597,</div><div class='add'>+26597,</div><div class='add'>+26597,</div><div class='add'>+26597,</div><div class='add'>+26639,</div><div class='add'>+26648,</div><div class='add'>+26659,</div><div class='add'>+26666,</div><div class='add'>+26672,</div><div class='add'>+26672,</div><div class='add'>+26672,</div><div class='add'>+26672,</div><div class='add'>+26672,</div><div class='add'>+26694,</div><div class='add'>+26701,</div><div class='add'>+26701,</div><div class='add'>+26701,</div><div class='add'>+26724,</div><div class='add'>+26724,</div><div class='add'>+26746,</div><div class='add'>+26753,</div><div class='add'>+26774,</div><div class='add'>+26774,</div><div class='add'>+26774,</div><div class='add'>+26774,</div><div class='add'>+26806,</div><div class='add'>+26824,</div><div class='add'>+26824,</div><div class='add'>+26830,</div><div class='add'>+26852,</div><div class='add'>+26882,</div><div class='add'>+26882,</div><div class='add'>+26889,</div><div class='add'>+26889,</div><div class='add'>+26889,</div><div class='add'>+26889,</div><div class='add'>+26889,</div><div class='add'>+26889,</div><div class='add'>+26903,</div><div class='add'>+26911,</div><div class='add'>+26918,</div><div class='add'>+26918,</div><div class='add'>+26928,</div><div class='add'>+26948,</div><div class='add'>+26948,</div><div class='add'>+26970,</div><div class='add'>+26970,</div><div class='add'>+26985,</div><div class='add'>+26996,</div><div class='add'>+27045,</div><div class='add'>+27045,</div><div class='add'>+27058,</div><div class='add'>+27058,</div><div class='add'>+27068,</div><div class='add'>+27068,</div><div class='add'>+27104,</div><div class='add'>+27155,</div><div class='add'>+27155,</div><div class='add'>+27155,</div><div class='add'>+27155,</div><div class='add'>+27155,</div><div class='add'>+27172,</div><div class='add'>+27172,</div><div class='add'>+27172,</div><div class='add'>+27172,</div><div class='add'>+27189,</div><div class='add'>+27195,</div><div class='add'>+27195,</div><div class='add'>+27223,</div><div class='add'>+27223,</div><div class='add'>+27223,</div><div class='add'>+27223,</div><div class='add'>+27244,</div><div class='add'>+27290,</div><div class='add'>+27322,</div><div class='add'>+27332,</div><div class='add'>+27364,</div><div class='add'>+27371,</div><div class='add'>+27371,</div><div class='add'>+27371,</div><div class='add'>+27401,</div><div class='add'>+27401,</div><div class='add'>+27417,</div><div class='add'>+27417,</div><div class='add'>+27431,</div><div class='add'>+27470,</div><div class='add'>+27470,</div><div class='add'>+27470,</div><div class='add'>+27470,</div><div class='add'>+27484,</div><div class='add'>+27484,</div><div class='add'>+27484,</div><div class='add'>+27484,</div><div class='add'>+27484,</div><div class='add'>+27496,</div><div class='add'>+27496,</div><div class='add'>+27515,</div><div class='add'>+27515,</div><div class='add'>+27543,</div><div class='add'>+27560,</div><div class='add'>+27576,</div><div class='add'>+27604,</div><div class='add'>+27622,</div><div class='add'>+27631,</div><div class='add'>+27631,</div><div class='add'>+27638,</div><div class='add'>+27649,</div><div class='add'>+27672,</div><div class='add'>+27682,</div><div class='add'>+27682,</div><div class='add'>+27682,</div><div class='add'>+27707,</div><div class='add'>+27717,</div><div class='add'>+27724,</div><div class='add'>+27732,</div><div class='add'>+27755,</div><div class='add'>+27755,</div><div class='add'>+27755,</div><div class='add'>+27768,</div><div class='add'>+27768,</div><div class='add'>+27783,</div><div class='add'>+27789,</div><div class='add'>+27799,</div><div class='add'>+27799,</div><div class='add'>+27799,</div><div class='add'>+27818,</div><div class='add'>+27826,</div><div class='add'>+27838,</div><div class='add'>+27848,</div><div class='add'>+27848,</div><div class='add'>+27848,</div><div class='add'>+27855,</div><div class='add'>+27862,</div><div class='add'>+27862,</div><div class='add'>+27896,</div><div class='add'>+27921,</div><div class='add'>+27921,</div><div class='add'>+27943,</div><div class='add'>+27954,</div><div class='add'>+27954,</div><div class='add'>+27976,</div><div class='add'>+27976,</div><div class='add'>+27976,</div><div class='add'>+27985,</div><div class='add'>+28002,</div><div class='add'>+28012,</div><div class='add'>+28019,</div><div class='add'>+28034,</div><div class='add'>+28034,</div><div class='add'>+28046,</div><div class='add'>+28068,</div><div class='add'>+28097,</div><div class='add'>+28122,</div><div class='add'>+28122,</div><div class='add'>+28131,</div><div class='add'>+28137,</div><div class='add'>+28151,</div><div class='add'>+28151,</div><div class='add'>+28172,</div><div class='add'>+28190,</div><div class='add'>+28196,</div><div class='add'>+28211,</div><div class='add'>+28211,</div><div class='add'>+28264,</div><div class='add'>+28273,</div><div class='add'>+28286,</div><div class='add'>+28324,</div><div class='add'>+28324,</div><div class='add'>+28324,</div><div class='add'>+28354,</div><div class='add'>+28354,</div><div class='add'>+28361,</div><div class='add'>+28397,</div><div class='add'>+28417,</div><div class='add'>+28417,</div><div class='add'>+28424,</div><div class='add'>+28435,</div><div class='add'>+28461,</div><div class='add'>+28461,</div><div class='add'>+28470,</div><div class='add'>+28483,</div><div class='add'>+28483,</div><div class='add'>+28483,</div><div class='add'>+28483,</div><div class='add'>+28483,</div><div class='add'>+28483,</div><div class='add'>+28483,</div><div class='add'>+28515,</div><div class='add'>+28531,</div><div class='add'>+28531,</div><div class='add'>+28549,</div><div class='add'>+28575,</div><div class='add'>+28575,</div><div class='add'>+28575,</div><div class='add'>+28582,</div><div class='add'>+28599,</div><div class='add'>+28615,</div><div class='add'>+28630,</div><div class='add'>+28630,</div><div class='add'>+28672,</div><div class='add'>+28711,</div><div class='add'>+28723,</div><div class='add'>+28723,</div><div class='add'>+28731,</div><div class='add'>+28752,</div><div class='add'>+28752,</div><div class='add'>+28752,</div><div class='add'>+28763,</div><div class='add'>+28763,</div><div class='add'>+28775,</div><div class='add'>+28775,</div><div class='add'>+28775,</div><div class='add'>+28775,</div><div class='add'>+28775,</div><div class='add'>+28775,</div><div class='add'>+28805,</div><div class='add'>+28814,</div><div class='add'>+28830,</div><div class='add'>+28861,</div><div class='add'>+28882,</div><div class='add'>+28882,</div><div class='add'>+28902,</div><div class='add'>+28918,</div><div class='add'>+28937,</div><div class='add'>+28952,</div><div class='add'>+28959,</div><div class='add'>+28998,</div><div class='add'>+29009,</div><div class='add'>+29009,</div><div class='add'>+29009,</div><div class='add'>+29009,</div><div class='add'>+29019,</div><div class='add'>+29019,</div><div class='add'>+29019,</div><div class='add'>+29019,</div><div class='add'>+29019,</div><div class='add'>+29057,</div><div class='add'>+29069,</div><div class='add'>+29076,</div><div class='add'>+29076,</div><div class='add'>+29076,</div><div class='add'>+29076,</div><div class='add'>+29076,</div><div class='add'>+29082,</div><div class='add'>+29082,</div><div class='add'>+29082,</div><div class='add'>+29117,</div><div class='add'>+29117,</div><div class='add'>+29117,</div><div class='add'>+29117,</div><div class='add'>+29134,</div><div class='add'>+29134,</div><div class='add'>+29159,</div><div class='add'>+29159,</div><div class='add'>+29185,</div><div class='add'>+29185,</div><div class='add'>+29196,</div><div class='add'>+29196,</div><div class='add'>+29242,</div><div class='add'>+29248,</div><div class='add'>+29256,</div><div class='add'>+29280,</div><div class='add'>+29301,</div><div class='add'>+29307,</div><div class='add'>+29307,</div><div class='add'>+29307,</div><div class='add'>+29314,</div><div class='add'>+29314,</div><div class='add'>+29338,</div><div class='add'>+29356,</div><div class='add'>+29367,</div><div class='add'>+29367,</div><div class='add'>+29381,</div><div class='add'>+29391,</div><div class='add'>+29399,</div><div class='add'>+29399,</div><div class='add'>+29414,</div><div class='add'>+29434,</div><div class='add'>+29434,</div><div class='add'>+29441,</div><div class='add'>+29473,</div><div class='add'>+29484,</div><div class='add'>+29503,</div><div class='add'>+29520,</div><div class='add'>+29520,</div><div class='add'>+29548,</div><div class='add'>+29565,</div><div class='add'>+29572,</div><div class='add'>+29572,</div><div class='add'>+29572,</div><div class='add'>+29572,</div><div class='add'>+29572,</div><div class='add'>+29597,</div><div class='add'>+29597,</div><div class='add'>+29620,</div><div class='add'>+29655,</div><div class='add'>+29660,</div><div class='add'>+29660,</div><div class='add'>+29660,</div><div class='add'>+29667,</div><div class='add'>+29674,</div><div class='add'>+29688,</div><div class='add'>+29698,</div><div class='add'>+29705,</div><div class='add'>+29728,</div><div class='add'>+29740,</div><div class='add'>+29740,</div><div class='add'>+29761,</div><div class='add'>+29761,</div><div class='add'>+29767,</div><div class='add'>+29780,</div><div class='add'>+29787,</div><div class='add'>+29794,</div><div class='add'>+29794,</div><div class='add'>+29807,</div><div class='add'>+29820,</div><div class='add'>+29820,</div><div class='add'>+29820,</div><div class='add'>+29820,</div><div class='add'>+29832,</div><div class='add'>+29844,</div><div class='add'>+29855,</div><div class='add'>+29855,</div><div class='add'>+29855,</div><div class='add'>+29867,</div><div class='add'>+29867,</div><div class='add'>+29867,</div><div class='add'>+29867,</div><div class='add'>+29881,</div><div class='add'>+29881,</div><div class='add'>+29905,</div><div class='add'>+29905,</div><div class='add'>+29905,</div><div class='add'>+29923,</div><div class='add'>+29923,</div><div class='add'>+29948,</div><div class='add'>+29948,</div><div class='add'>+29948,</div><div class='add'>+29976,</div><div class='add'>+29986,</div><div class='add'>+29996,</div><div class='add'>+29996,</div><div class='add'>+30030,</div><div class='add'>+30030,</div><div class='add'>+30054,</div><div class='add'>+30054,</div><div class='add'>+30070,</div><div class='add'>+30070,</div><div class='add'>+30070,</div><div class='add'>+30077,</div><div class='add'>+30077,</div><div class='add'>+30087,</div><div class='add'>+30107,</div><div class='add'>+30107,</div><div class='add'>+30115,</div><div class='add'>+30141,</div><div class='add'>+30178,</div><div class='add'>+30178,</div><div class='add'>+30201,</div><div class='add'>+30201,</div><div class='add'>+30201,</div><div class='add'>+30207,</div><div class='add'>+30229,</div><div class='add'>+30239,</div><div class='add'>+30254,</div><div class='add'>+30268,</div><div class='add'>+30277,</div><div class='add'>+30311,</div><div class='add'>+30323,</div><div class='add'>+30323,</div><div class='add'>+30331,</div><div class='add'>+30331,</div><div class='add'>+30331,</div><div class='add'>+30331,</div><div class='add'>+30331,</div><div class='add'>+30353,</div><div class='add'>+30365,</div><div class='add'>+30374,</div><div class='add'>+30374,</div><div class='add'>+30374,</div><div class='add'>+30380,</div><div class='add'>+30380,</div><div class='add'>+30380,</div><div class='add'>+30380,</div><div class='add'>+30410,</div><div class='add'>+30410,</div><div class='add'>+30410,</div><div class='add'>+30443,</div><div class='add'>+30443,</div><div class='add'>+30453,</div><div class='add'>+30462,</div><div class='add'>+30472,</div><div class='add'>+30472,</div><div class='add'>+30472,</div><div class='add'>+30472,</div><div class='add'>+30472,</div><div class='add'>+30472,</div><div class='add'>+30489,</div><div class='add'>+30500,</div><div class='add'>+30500,</div><div class='add'>+30500,</div><div class='add'>+30532,</div><div class='add'>+30532,</div><div class='add'>+30553,</div><div class='add'>+30577,</div><div class='add'>+30599,</div><div class='add'>+30599,</div><div class='add'>+30609,</div><div class='add'>+30640,</div><div class='add'>+30640,</div><div class='add'>+30640,</div><div class='add'>+30664,</div><div class='add'>+30676,</div><div class='add'>+30676,</div><div class='add'>+30676,</div><div class='add'>+30692,</div><div class='add'>+30719,</div><div class='add'>+30728,</div><div class='add'>+30728,</div><div class='add'>+30742,</div><div class='add'>+30742,</div><div class='add'>+30749,</div><div class='add'>+30749,</div><div class='add'>+30760,</div><div class='add'>+30770,</div><div class='add'>+30770,</div><div class='add'>+30783,</div><div class='add'>+30783,</div><div class='add'>+30783,</div><div class='add'>+30804,</div><div class='add'>+30847,</div><div class='add'>+30847,</div><div class='add'>+30847,</div><div class='add'>+30847,</div><div class='add'>+30857,</div><div class='add'>+30857,</div><div class='add'>+30857,</div><div class='add'>+30857,</div><div class='add'>+30875,</div><div class='add'>+30875,</div><div class='add'>+30895,</div><div class='add'>+30895,</div><div class='add'>+30921,</div><div class='add'>+30926,</div><div class='add'>+30926,</div><div class='add'>+30926,</div><div class='add'>+30945,</div><div class='add'>+30945,</div><div class='add'>+30945,</div><div class='add'>+30945,</div><div class='add'>+30959,</div><div class='add'>+30959,</div><div class='add'>+30959,</div><div class='add'>+30959,</div><div class='add'>+30972,</div><div class='add'>+30972,</div><div class='add'>+30984,</div><div class='add'>+31011,</div><div class='add'>+31011,</div><div class='add'>+31048,</div><div class='add'>+31056,</div><div class='add'>+31056,</div><div class='add'>+31070,</div><div class='add'>+31077,</div><div class='add'>+31077,</div><div class='add'>+31110,</div><div class='add'>+31110,</div><div class='add'>+31115,</div><div class='add'>+31122,</div><div class='add'>+31139,</div><div class='add'>+31159,</div><div class='add'>+31159,</div><div class='add'>+31165,</div><div class='add'>+31171,</div><div class='add'>+31171,</div><div class='add'>+31197,</div><div class='add'>+31204,</div><div class='add'>+31211,</div><div class='add'>+31211,</div><div class='add'>+31221,</div><div class='add'>+31228,</div><div class='add'>+31228,</div><div class='add'>+31245,</div><div class='add'>+31245,</div><div class='add'>+31245,</div><div class='add'>+31252,</div><div class='add'>+31265,</div><div class='add'>+31265,</div><div class='add'>+31265,</div><div class='add'>+31265,</div><div class='add'>+31294,</div><div class='add'>+31305,</div><div class='add'>+31320,</div><div class='add'>+31333,</div><div class='add'>+31333,</div><div class='add'>+31333,</div><div class='add'>+31343,</div><div class='add'>+31350,</div><div class='add'>+31357,</div><div class='add'>+31369,</div><div class='add'>+31369,</div><div class='add'>+31379,</div><div class='add'>+31385,</div><div class='add'>+31391,</div><div class='add'>+31407,</div><div class='add'>+31407,</div><div class='add'>+31407,</div><div class='add'>+31423,</div><div class='add'>+31423,</div><div class='add'>+31423,</div><div class='add'>+31434,</div><div class='add'>+31454,</div><div class='add'>+31470,</div><div class='add'>+31511,</div><div class='add'>+31521,</div><div class='add'>+31521,</div><div class='add'>+31521,</div><div class='add'>+31542,</div><div class='add'>+31582,</div><div class='add'>+31582,</div><div class='add'>+31597,</div><div class='add'>+31597,</div><div class='add'>+31597,</div><div class='add'>+31614,</div><div class='add'>+31623,</div><div class='add'>+31645,</div><div class='add'>+31645,</div><div class='add'>+31661,</div><div class='add'>+31661,</div><div class='add'>+31669,</div><div class='add'>+31669,</div><div class='add'>+31676,</div><div class='add'>+31676,</div><div class='add'>+31706,</div><div class='add'>+31720,</div><div class='add'>+31726,</div><div class='add'>+31743,</div><div class='add'>+31785,</div><div class='add'>+31804,</div><div class='add'>+31817,</div><div class='add'>+31817,</div><div class='add'>+31835,</div><div class='add'>+31846,</div><div class='add'>+31863,</div><div class='add'>+31885,</div><div class='add'>+31885,</div><div class='add'>+31896,</div><div class='add'>+31907,</div><div class='add'>+31907,</div><div class='add'>+31907,</div><div class='add'>+31922,</div><div class='add'>+31922,</div><div class='add'>+31929,</div><div class='add'>+31929,</div><div class='add'>+31929,</div><div class='add'>+31936,</div><div class='add'>+31943,</div><div class='add'>+31949,</div><div class='add'>+31949,</div><div class='add'>+31949,</div><div class='add'>+31959,</div><div class='add'>+32006,</div><div class='add'>+32024,</div><div class='add'>+32031,</div><div class='add'>+32031,</div><div class='add'>+32038,</div><div class='add'>+32063,</div><div class='add'>+32095,</div><div class='add'>+32095,</div><div class='add'>+32105,</div><div class='add'>+32105,</div><div class='add'>+32105,</div><div class='add'>+32105,</div><div class='add'>+32105,</div><div class='add'>+32125,</div><div class='add'>+32134,</div><div class='add'>+32140,</div><div class='add'>+32176,</div><div class='add'>+32185,</div><div class='add'>+32195,</div><div class='add'>+32195,</div><div class='add'>+32195,</div><div class='add'>+32195,</div><div class='add'>+32202,</div><div class='add'>+32202,</div><div class='add'>+32218,</div><div class='add'>+32236,</div><div class='add'>+32259,</div><div class='add'>+32294,</div><div class='add'>+32300,</div><div class='add'>+32305,</div><div class='add'>+32305,</div><div class='add'>+32305,</div><div class='add'>+32323,</div><div class='add'>+32337,</div><div class='add'>+32352,</div><div class='add'>+32359,</div><div class='add'>+32374,</div><div class='add'>+32381,</div><div class='add'>+32388,</div><div class='add'>+32388,</div><div class='add'>+32388,</div><div class='add'>+32402,</div><div class='add'>+32402,</div><div class='add'>+32402,</div><div class='add'>+32402,</div><div class='add'>+32418,</div><div class='add'>+32428,</div><div class='add'>+32428,</div><div class='add'>+32428,</div><div class='add'>+32450,</div><div class='add'>+32450,</div><div class='add'>+32450,</div><div class='add'>+32462,</div><div class='add'>+32467,</div><div class='add'>+32480,</div><div class='add'>+32480,</div><div class='add'>+32480,</div><div class='add'>+32487,</div><div class='add'>+32502,</div><div class='add'>+32509,</div><div class='add'>+32525,</div><div class='add'>+32560,</div><div class='add'>+32570,</div><div class='add'>+32583,</div><div class='add'>+32597,</div><div class='add'>+32623,</div><div class='add'>+32637,</div><div class='add'>+32644,</div><div class='add'>+32667,</div><div class='add'>+32707,</div><div class='add'>+32725,</div><div class='add'>+32725,</div><div class='add'>+32747,</div><div class='add'>+32747,</div><div class='add'>+32751,</div><div class='add'>+32758,</div><div class='add'>+32789,</div><div class='add'>+32807,</div><div class='add'>+32824,</div><div class='add'>+32824,</div><div class='add'>+32824,</div><div class='add'>+32824,</div><div class='add'>+32843,</div><div class='add'>+32843,</div><div class='add'>+32850,</div><div class='add'>+32876,</div><div class='add'>+32908,</div><div class='add'>+32915,</div><div class='add'>+32946,</div><div class='add'>+32965,</div><div class='add'>+32965,</div><div class='add'>+32982,</div><div class='add'>+33002,</div><div class='add'>+33009,</div><div class='add'>+33029,</div><div class='add'>+33064,</div><div class='add'>+33084,</div><div class='add'>+33098,</div><div class='add'>+33098,</div><div class='add'>+33098,</div><div class='add'>+33098,</div><div class='add'>+33110,</div><div class='add'>+33110,</div><div class='add'>+33151,</div><div class='add'>+33158,</div><div class='add'>+33180,</div><div class='add'>+33198,</div><div class='add'>+33205,</div><div class='add'>+33227,</div><div class='add'>+33227,</div><div class='add'>+33237,</div><div class='add'>+33237,</div><div class='add'>+33253,</div><div class='add'>+33258,</div><div class='add'>+33277,</div><div class='add'>+33292,</div><div class='add'>+33315,</div><div class='add'>+33315,</div><div class='add'>+33333,</div><div class='add'>+33348,</div><div class='add'>+33348,</div><div class='add'>+33348,</div><div class='add'>+33348,</div><div class='add'>+33348,</div><div class='add'>+33348,</div><div class='add'>+33348,</div><div class='add'>+33355,</div><div class='add'>+33355,</div><div class='add'>+33355,</div><div class='add'>+33390,</div><div class='add'>+33408,</div><div class='add'>+33423,</div><div class='add'>+33437,</div><div class='add'>+33452,</div><div class='add'>+33458,</div><div class='add'>+33465,</div><div class='add'>+33480,</div><div class='add'>+33480,</div><div class='add'>+33487,</div><div class='add'>+33494,</div><div class='add'>+33504,</div><div class='add'>+33511,</div><div class='add'>+33551,</div><div class='add'>+33551,</div><div class='add'>+33558,</div><div class='add'>+33589,</div><div class='add'>+33595,</div><div class='add'>+33595,</div><div class='add'>+33602,</div><div class='add'>+33627,</div><div class='add'>+33644,</div><div class='add'>+33668,</div><div class='add'>+33668,</div><div class='add'>+33668,</div><div class='add'>+33676,</div><div class='add'>+33676,</div><div class='add'>+33716,</div><div class='add'>+33728,</div><div class='add'>+33747,</div><div class='add'>+33747,</div><div class='add'>+33769,</div><div class='add'>+33775,</div><div class='add'>+33789,</div><div class='add'>+33803,</div><div class='add'>+33803,</div><div class='add'>+33810,</div><div class='add'>+33810,</div><div class='add'>+33810,</div><div class='add'>+33820,</div><div class='add'>+33820,</div><div class='add'>+33820,</div><div class='add'>+33820,</div><div class='add'>+33843,</div><div class='add'>+33843,</div><div class='add'>+33843,</div><div class='add'>+33879,</div><div class='add'>+33889,</div><div class='add'>+33889,</div><div class='add'>+33889,</div><div class='add'>+33903,</div><div class='add'>+33917,</div><div class='add'>+33931,</div><div class='add'>+33959,</div><div class='add'>+33993,</div><div class='add'>+34000,</div><div class='add'>+34014,</div><div class='add'>+34037,</div><div class='add'>+34043,</div><div class='add'>+34055,</div><div class='add'>+34055,</div><div class='add'>+34077,</div><div class='add'>+34083,</div><div class='add'>+34090,</div><div class='add'>+34099,</div><div class='add'>+34099,</div><div class='add'>+34115,</div><div class='add'>+34115,</div><div class='add'>+34133,</div><div class='add'>+34140,</div><div class='add'>+34167,</div><div class='add'>+34172,</div><div class='add'>+34184,</div><div class='add'>+34221,</div><div class='add'>+34245,</div><div class='add'>+34252,</div><div class='add'>+34252,</div><div class='add'>+34259,</div><div class='add'>+34318,</div><div class='add'>+34318,</div><div class='add'>+34325,</div><div class='add'>+34325,</div><div class='add'>+34352,</div><div class='add'>+34400,</div><div class='add'>+34415,</div><div class='add'>+34422,</div><div class='add'>+34422,</div><div class='add'>+34431,</div><div class='add'>+34438,</div><div class='add'>+34445,</div><div class='add'>+34445,</div><div class='add'>+34473,</div><div class='add'>+34473,</div><div class='add'>+34489,</div><div class='add'>+34489,</div><div class='add'>+34489,</div><div class='add'>+34489,</div><div class='add'>+34499,</div><div class='add'>+34499,</div><div class='add'>+34499,</div><div class='add'>+34516,</div><div class='add'>+34536,</div><div class='add'>+34551,</div><div class='add'>+34564,</div><div class='add'>+34580,</div><div class='add'>+34580,</div><div class='add'>+34580,</div><div class='add'>+34589,</div><div class='add'>+34589,</div><div class='add'>+34589,</div><div class='add'>+34613,</div><div class='add'>+34648,</div><div class='add'>+34648,</div><div class='add'>+34648,</div><div class='add'>+34655,</div><div class='add'>+34664,</div><div class='add'>+34681,</div><div class='add'>+34681,</div><div class='add'>+34698,</div><div class='add'>+34698,</div><div class='add'>+34720,</div><div class='add'>+34736,</div><div class='add'>+34749,</div><div class='add'>+34749,</div><div class='add'>+34765,</div><div class='add'>+34778,</div><div class='add'>+34785,</div><div class='add'>+34795,</div><div class='add'>+34819,</div><div class='add'>+34819,</div><div class='add'>+34829,</div><div class='add'>+34841,</div><div class='add'>+34848,</div><div class='add'>+34854,</div><div class='add'>+34854,</div><div class='add'>+34854,</div><div class='add'>+34878,</div><div class='add'>+34894,</div><div class='add'>+34894,</div><div class='add'>+34900,</div><div class='add'>+34917,</div><div class='add'>+34934,</div><div class='add'>+34940,</div><div class='add'>+34970,</div><div class='add'>+34998,</div><div class='add'>+34998,</div><div class='add'>+35004,</div><div class='add'>+35004,</div><div class='add'>+35012,</div><div class='add'>+35012,</div><div class='add'>+35012,</div><div class='add'>+35020,</div><div class='add'>+35020,</div><div class='add'>+35032,</div><div class='add'>+35038,</div><div class='add'>+35062,</div><div class='add'>+35062,</div><div class='add'>+35062,</div><div class='add'>+35068,</div><div class='add'>+35068,</div><div class='add'>+35082,</div><div class='add'>+35092,</div><div class='add'>+35096,</div><div class='add'>+35107,</div><div class='add'>+35118,</div><div class='add'>+35134,</div><div class='add'>+35155,</div><div class='add'>+35155,</div><div class='add'>+35166,</div><div class='add'>+35178,</div><div class='add'>+35178,</div><div class='add'>+35195,</div><div class='add'>+35201,</div><div class='add'>+35201,</div><div class='add'>+35201,</div><div class='add'>+35226,</div><div class='add'>+35226,</div><div class='add'>+35226,</div><div class='add'>+35226,</div><div class='add'>+35256,</div><div class='add'>+35262,</div><div class='add'>+35272,</div><div class='add'>+35280,</div><div class='add'>+35299,</div><div class='add'>+35332,</div><div class='add'>+35354,</div><div class='add'>+35354,</div><div class='add'>+35354,</div><div class='add'>+35370,</div><div class='add'>+35386,</div><div class='add'>+35417,</div><div class='add'>+35417,</div><div class='add'>+35460,</div><div class='add'>+35473,</div><div class='add'>+35478,</div><div class='add'>+35495,</div><div class='add'>+35504,</div><div class='add'>+35504,</div><div class='add'>+35518,</div><div class='add'>+35552,</div><div class='add'>+35589,</div><div class='add'>+35624,</div><div class='add'>+35624,</div><div class='add'>+35637,</div><div class='add'>+35637,</div><div class='add'>+35643,</div><div class='add'>+35643,</div><div class='add'>+35669,</div><div class='add'>+35682,</div><div class='add'>+35695,</div><div class='add'>+35702,</div><div class='add'>+35709,</div><div class='add'>+35709,</div><div class='add'>+35726,</div><div class='add'>+35739,</div><div class='add'>+35749,</div><div class='add'>+35756,</div><div class='add'>+35756,</div><div class='add'>+35778,</div><div class='add'>+35803,</div><div class='add'>+35810,</div><div class='add'>+35829,</div><div class='add'>+35883,</div><div class='add'>+35899,</div><div class='add'>+35905,</div><div class='add'>+35911,</div><div class='add'>+35911,</div><div class='add'>+35923,</div><div class='add'>+35947,</div><div class='add'>+35954,</div><div class='add'>+35980,</div><div class='add'>+35987,</div><div class='add'>+36034,</div><div class='add'>+36052,</div><div class='add'>+36063,</div><div class='add'>+36095,</div><div class='add'>+36106,</div><div class='add'>+36106,</div><div class='add'>+36113,</div><div class='add'>+36120,</div><div class='add'>+36140,</div><div class='add'>+36140,</div><div class='add'>+36153,</div><div class='add'>+36160,</div><div class='add'>+36160,</div><div class='add'>+36167,</div><div class='add'>+36203,</div><div class='add'>+36203,</div><div class='add'>+36218,</div><div class='add'>+36218,</div><div class='add'>+36225,</div><div class='add'>+36253,</div><div class='add'>+36259,</div><div class='add'>+36284,</div><div class='add'>+36296,</div><div class='add'>+36310,</div><div class='add'>+36324,</div><div class='add'>+36331,</div><div class='add'>+36344,</div><div class='add'>+36367,</div><div class='add'>+36367,</div><div class='add'>+36367,</div><div class='add'>+36412,</div><div class='add'>+36412,</div><div class='add'>+36422,</div><div class='add'>+36463,</div><div class='add'>+36463,</div><div class='add'>+36463,</div><div class='add'>+36479,</div><div class='add'>+36490,</div><div class='add'>+36513,</div><div class='add'>+36520,</div><div class='add'>+36520,</div><div class='add'>+36527,</div><div class='add'>+36527,</div><div class='add'>+36527,</div><div class='add'>+36540,</div><div class='add'>+36574,</div><div class='add'>+36594,</div><div class='add'>+36594,</div><div class='add'>+36605,</div><div class='add'>+36621,</div><div class='add'>+36621,</div><div class='add'>+36641,</div><div class='add'>+36641,</div><div class='add'>+36641,</div><div class='add'>+36659,</div><div class='add'>+36682,</div><div class='add'>+36682,</div><div class='add'>+36682,</div><div class='add'>+36682,</div><div class='add'>+36705,</div><div class='add'>+36705,</div><div class='add'>+36705,</div><div class='add'>+36720,</div><div class='add'>+36720,</div><div class='add'>+36755,</div><div class='add'>+36755,</div><div class='add'>+36771,</div><div class='add'>+36771,</div><div class='add'>+36771,</div><div class='add'>+36788,</div><div class='add'>+36806,</div><div class='add'>+36835,</div><div class='add'>+36845,</div><div class='add'>+36875,</div><div class='add'>+36875,</div><div class='add'>+36903,</div><div class='add'>+36921,</div><div class='add'>+36928,</div><div class='add'>+36928,</div><div class='add'>+36940,</div><div class='add'>+36940,</div><div class='add'>+36940,</div><div class='add'>+36966,</div><div class='add'>+36966,</div><div class='add'>+36973,</div><div class='add'>+36983,</div><div class='add'>+36998,</div><div class='add'>+37004,</div><div class='add'>+37014,</div><div class='add'>+37024,</div><div class='add'>+37024,</div><div class='add'>+37032,</div><div class='add'>+37038,</div><div class='add'>+37038,</div><div class='add'>+37061,</div><div class='add'>+37074,</div><div class='add'>+37074,</div><div class='add'>+37091,</div><div class='add'>+37098,</div><div class='add'>+37105,</div><div class='add'>+37105,</div><div class='add'>+37133,</div><div class='add'>+37141,</div><div class='add'>+37141,</div><div class='add'>+37148,</div><div class='add'>+37191,</div><div class='add'>+37191,</div><div class='add'>+37197,</div><div class='add'>+37197,</div><div class='add'>+37210,</div><div class='add'>+37224,</div><div class='add'>+37224,</div><div class='add'>+37231,</div><div class='add'>+37250,</div><div class='add'>+37257,</div><div class='add'>+37273,</div><div class='add'>+37273,</div><div class='add'>+37280,</div><div class='add'>+37287,</div><div class='add'>+37294,</div><div class='add'>+37300,</div><div class='add'>+37307,</div><div class='add'>+37330,</div><div class='add'>+37348,</div><div class='add'>+37348,</div><div class='add'>+37359,</div><div class='add'>+37359,</div><div class='add'>+37359,</div><div class='add'>+37377,</div><div class='add'>+37392,</div><div class='add'>+37398,</div><div class='add'>+37412,</div><div class='add'>+37431,</div><div class='add'>+37469,</div><div class='add'>+37486,</div><div class='add'>+37508,</div><div class='add'>+37517,</div><div class='add'>+37535,</div><div class='add'>+37535,</div><div class='add'>+37542,</div><div class='add'>+37542,</div><div class='add'>+37549,</div><div class='add'>+37549,</div><div class='add'>+37549,</div><div class='add'>+37549,</div><div class='add'>+37556,</div><div class='add'>+37576,</div><div class='add'>+37576,</div><div class='add'>+37583,</div><div class='add'>+37590,</div><div class='add'>+37597,</div><div class='add'>+37604,</div><div class='add'>+37604,</div><div class='add'>+37621,</div><div class='add'>+37635,</div><div class='add'>+37676,</div><div class='add'>+37676,</div><div class='add'>+37704,</div><div class='add'>+37711,</div><div class='add'>+37728,</div><div class='add'>+37728,</div><div class='add'>+37737,</div><div class='add'>+37737,</div><div class='add'>+37737,</div><div class='add'>+37750,</div><div class='add'>+37757,</div><div class='add'>+37778,</div><div class='add'>+37785,</div><div class='add'>+37785,</div><div class='add'>+37819,</div><div class='add'>+37826,</div><div class='add'>+37833,</div><div class='add'>+37843,</div><div class='add'>+37850,</div><div class='add'>+37869,</div><div class='add'>+37914,</div><div class='add'>+37921,</div><div class='add'>+37935,</div><div class='add'>+37942,</div><div class='add'>+37949,</div><div class='add'>+37982,</div><div class='add'>+38013,</div><div class='add'>+38013,</div><div class='add'>+38013,</div><div class='add'>+38023,</div><div class='add'>+38057,</div><div class='add'>+38077,</div><div class='add'>+38097,</div><div class='add'>+38110,</div><div class='add'>+38117,</div><div class='add'>+38123,</div><div class='add'>+38133,</div><div class='add'>+38133,</div><div class='add'>+38133,</div><div class='add'>+38140,</div><div class='add'>+38140,</div><div class='add'>+38148,</div><div class='add'>+38159,</div><div class='add'>+38179,</div><div class='add'>+38192,</div><div class='add'>+38205,</div><div class='add'>+38218,</div><div class='add'>+38218,</div><div class='add'>+38218,</div><div class='add'>+38218,</div><div class='add'>+38218,</div><div class='add'>+38218,</div><div class='add'>+38218,</div><div class='add'>+38218,</div><div class='add'>+38218,</div><div class='add'>+38218,</div><div class='add'>+38218,</div><div class='add'>+38218,</div><div class='add'>+38225,</div><div class='add'>+38225,</div><div class='add'>+38230,</div><div class='add'>+38246,</div><div class='add'>+38258,</div><div class='add'>+38280,</div><div class='add'>+38287,</div><div class='add'>+38294,</div><div class='add'>+38294,</div><div class='add'>+38294,</div><div class='add'>+38301,</div><div class='add'>+38318,</div><div class='add'>+38318,</div><div class='add'>+38340,</div><div class='add'>+38371,</div><div class='add'>+38371,</div><div class='add'>+38384,</div><div class='add'>+38420,</div><div class='add'>+38440,</div><div class='add'>+38453,</div><div class='add'>+38481,</div><div class='add'>+38506,</div><div class='add'>+38522,</div><div class='add'>+38534,</div><div class='add'>+38559,</div><div class='add'>+38559,</div><div class='add'>+38559,</div><div class='add'>+38564,</div><div class='add'>+38564,</div><div class='add'>+38581,</div><div class='add'>+38604,</div><div class='add'>+38604,</div><div class='add'>+38611,</div><div class='add'>+38620,</div><div class='add'>+38626,</div><div class='add'>+38635,</div><div class='add'>+38635,</div><div class='add'>+38635,</div><div class='add'>+38666,</div><div class='add'>+38674,</div><div class='add'>+38688,</div><div class='add'>+38693,</div><div class='add'>+38710,</div><div class='add'>+38722,</div><div class='add'>+38722,</div><div class='add'>+38722,</div><div class='add'>+38729,</div><div class='add'>+38734,</div><div class='add'>+38752,</div><div class='add'>+38792,</div><div class='add'>+38818,</div><div class='add'>+38825,</div><div class='add'>+38861,</div><div class='add'>+38902,</div><div class='add'>+38934,</div><div class='add'>+38949,</div><div class='add'>+38949,</div><div class='add'>+38960,</div><div class='add'>+38969,</div><div class='add'>+38985,</div><div class='add'>+38985,</div><div class='add'>+38996,</div><div class='add'>+39013,</div><div class='add'>+39024,</div><div class='add'>+39024,</div><div class='add'>+39032,</div><div class='add'>+39061,</div><div class='add'>+39074,</div><div class='add'>+39089,</div><div class='add'>+39123,</div><div class='add'>+39123,</div><div class='add'>+39123,</div><div class='add'>+39140,</div><div class='add'>+39161,</div><div class='add'>+39180,</div><div class='add'>+39206,</div><div class='add'>+39215,</div><div class='add'>+39254,</div><div class='add'>+39261,</div><div class='add'>+39277,</div><div class='add'>+39284,</div><div class='add'>+39314,</div><div class='add'>+39314,</div><div class='add'>+39330,</div><div class='add'>+39340,</div><div class='add'>+39340,</div><div class='add'>+39371,</div><div class='add'>+39371,</div><div class='add'>+39392,</div><div class='add'>+39430,</div><div class='add'>+39430,</div><div class='add'>+39437,</div><div class='add'>+39444,</div><div class='add'>+39461,</div><div class='add'>+39468,</div><div class='add'>+39468,</div><div class='add'>+39485,</div><div class='add'>+39517,</div><div class='add'>+39524,</div><div class='add'>+39538,</div><div class='add'>+39543,</div><div class='add'>+39548,</div><div class='add'>+39555,</div><div class='add'>+39581,</div><div class='add'>+39588,</div><div class='add'>+39588,</div><div class='add'>+39609,</div><div class='add'>+39609,</div><div class='add'>+39616,</div><div class='add'>+39652,</div><div class='add'>+39670,</div><div class='add'>+39677,</div><div class='add'>+39677,</div><div class='add'>+39684,</div><div class='add'>+39691,</div><div class='add'>+39702,</div><div class='add'>+39717,</div><div class='add'>+39717,</div><div class='add'>+39717,</div><div class='add'>+39724,</div><div class='add'>+39749,</div><div class='add'>+39760,</div><div class='add'>+39766,</div><div class='add'>+39775,</div><div class='add'>+39791,</div><div class='add'>+39791,</div><div class='add'>+39814,</div><div class='add'>+39827,</div><div class='add'>+39827,</div><div class='add'>+39837,</div><div class='add'>+39859};</div><div class='add'>+</div><div class='add'>+static const char tldData[] = {</div><div class='add'>+"com.cn\0"</div><div class='add'>+"com.co\0"</div><div class='add'>+"hb.cn\0"</div><div class='add'>+"med.br\0conf.lv\0wallonie.museum\0"</div><div class='add'>+"namsos.no\0"</div><div class='add'>+"\xe7\xb6\xb2\xe7\xbb\x9c.hk\0farmers.museum\0rel.pl\0"</div><div class='add'>+"com.cu\0"</div><div class='add'>+"military.museum\0"</div><div class='add'>+"*.jm\0convent.museum\0cymru.museum\0malvik.no\0"</div><div class='add'>+"univ.sn\0"</div><div class='add'>+"gliding.aero\0"</div><div class='add'>+"wodzislaw.pl\0"</div><div class='add'>+"com.dm\0!pref.iwate.jp\0tran\xc3\xb8y.no\0pila.pl\0"</div><div class='add'>+"mb.it\0*.ke\0lib.ri.us\0"</div><div class='add'>+"com.ec\0*.kh\0tr\xc3\xb8gstad.no\0"</div><div class='add'>+"com.ee\0"</div><div class='add'>+"mobi.gp\0"</div><div class='add'>+"gran.no\0"</div><div class='add'>+"wa.gov.au\0"</div><div class='add'>+"com.dz\0kg.kr\0"</div><div class='add'>+"zoological.museum\0gjerstad.no\0haugesund.no\0kharkov.ua\0"</div><div class='add'>+"walbrzych.pl\0"</div><div class='add'>+"civilization.museum\0"</div><div class='add'>+"ha.no\0"</div><div class='add'>+"*.kw\0"</div><div class='add'>+"med.ec\0com.es\0"</div><div class='add'>+"med.ee\0otago.museum\0svelvik.no\0"</div><div class='add'>+"art.ht\0amber.museum\0elvendrell.museum\0rost.no\0"</div><div class='add'>+"jx.cn\0gratangen.no\0"</div><div class='add'>+"association.aero\0ca.it\0"</div><div class='add'>+"zaporizhzhe.ua\0"</div><div class='add'>+"com.fr\0"</div><div class='add'>+"szex.hu\0"</div><div class='add'>+"e-burg.ru\0"</div><div class='add'>+"com.ge\0bokn.no\0"</div><div class='add'>+"mordovia.ru\0"</div><div class='add'>+"com.gh\0*.mm\0"</div><div class='add'>+"com.gi\0z.se\0"</div><div class='add'>+"cahcesuolo.no\0"</div><div class='add'>+"hurdal.no\0joshkar-ola.ru\0"</div><div class='add'>+"cadaques.museum\0ma.us\0"</div><div class='add'>+"a.bg\0"</div><div class='add'>+"com.gn\0bozen.it\0tambov.ru\0"</div><div class='add'>+"*.gifu.jp\0*.tokyo.jp\0*.mt\0"</div><div class='add'>+"com.gp\0travel\0cc.tx.us\0"</div><div class='add'>+"com.gr\0hemne.no\0"</div><div class='add'>+"*.ni\0"</div><div class='add'>+"*.mz\0"</div><div class='add'>+"cc.il.us\0"</div><div class='add'>+"com.gy\0"</div><div class='add'>+"zj.cn\0oksnes.no\0museum.tt\0"</div><div class='add'>+"com.hk\0*.np\0"</div><div class='add'>+"rc.it\0baseball.museum\0"</div><div class='add'>+"com.hn\0exhibition.museum\0"</div><div class='add'>+"h\xc3\xa1""bmer.no\0"</div><div class='add'>+"com.hr\0"</div><div class='add'>+"fg.it\0stathelle.no\0defense.tn\0"</div><div class='add'>+"com.ht\0"</div><div class='add'>+"qld.gov.au\0*.nz\0"</div><div class='add'>+"davvenj\xc3\xa1rga.no\0*.om\0"</div><div class='add'>+"vang.no\0"</div><div class='add'>+"*.kumamoto.jp\0"</div><div class='add'>+"vercelli.it\0usenet.pl\0"</div><div class='add'>+"com.io\0stalbans.museum\0"</div><div class='add'>+"com.iq\0"</div><div class='add'>+"*.pg\0"</div><div class='add'>+"com.is\0klabu.no\0skiptvet.no\0"</div><div class='add'>+"med.ht\0field.museum\0"</div><div class='add'>+"gr.it\0gj\xc3\xb8vik.no\0tromsa.no\0lib.mi.us\0"</div><div class='add'>+"ca.na\0"</div><div class='add'>+"hagebostad.no\0k12.ma.us\0"</div><div class='add'>+"*.qa\0"</div><div class='add'>+"*.niigata.jp\0"</div><div class='add'>+"monzaebrianza.it\0com.jo\0comunica\xc3\xa7\xc3\xb5""es.museum\0"</div><div class='add'>+"gr.jp\0"</div><div class='add'>+"ballangen.no\0*.py\0"</div><div class='add'>+"scienceandindustry.museum\0"</div><div class='add'>+"nuoro.it\0com.kg\0"</div><div class='add'>+"com.ki\0"</div><div class='add'>+"im.it\0idv.tw\0"</div><div class='add'>+"*.akita.jp\0com.km\0r\xc3\xb8ros.no\0sopot.pl\0"</div><div class='add'>+"!pref.yamanashi.jp\0"</div><div class='add'>+"com.kp\0"</div><div class='add'>+"!pref.kochi.jp\0com.la\0"</div><div class='add'>+"com.lb\0"</div><div class='add'>+"com.lc\0stjordalshalsen.no\0sigdal.no\0cc.nm.us\0"</div><div class='add'>+"samnanger.no\0"</div><div class='add'>+"drobak.no\0"</div><div class='add'>+"vt.it\0"</div><div class='add'>+"catering.aero\0com.ky\0"</div><div class='add'>+"com.kz\0cc.ca.us\0"</div><div class='add'>+"com.lk\0"</div><div class='add'>+"grosseto.it\0mosvik.no\0"</div><div class='add'>+"namsskogan.no\0"</div><div class='add'>+"loten.no\0"</div><div class='add'>+"chirurgiens-dentistes.fr\0"</div><div class='add'>+"com.lr\0bremanger.no\0"</div><div class='add'>+"gs.cn\0"</div><div class='add'>+"com.lv\0lib.co.us\0"</div><div class='add'>+"com.mg\0"</div><div class='add'>+"passenger-association.aero\0"</div><div class='add'>+"com.ly\0yekaterinburg.ru\0"</div><div class='add'>+"vladivostok.ru\0"</div><div class='add'>+"com.mk\0beeldengeluid.museum\0"</div><div class='add'>+"com.ml\0"</div><div class='add'>+"art.pl\0"</div><div class='add'>+"com.mo\0"</div><div class='add'>+"britishcolumbia.museum\0tx.us\0"</div><div class='add'>+"com.na\0sakhalin.ru\0*.sv\0"</div><div class='add'>+"mc.it\0"</div><div class='add'>+"amsterdam.museum\0udm.ru\0"</div><div class='add'>+"com.mu\0"</div><div class='add'>+"com.mv\0com.nf\0"</div><div class='add'>+"com.mw\0com.ng\0il.us\0"</div><div class='add'>+"geometre-expert.fr\0com.mx\0"</div><div class='add'>+"med.ly\0com.my\0"</div><div class='add'>+"ag.it\0"</div><div class='add'>+"*.tr\0"</div><div class='add'>+"!pref.oita.jp\0"</div><div class='add'>+"hoyanger.no\0skedsmo.no\0"</div><div class='add'>+"com.nr\0turystyka.pl\0"</div><div class='add'>+"koebenhavn.museum\0"</div><div class='add'>+"quebec.museum\0"</div><div class='add'>+"stord.no\0*.uk\0"</div><div class='add'>+"act.au\0"</div><div class='add'>+"br.it\0cb.it\0gyeonggi.kr\0jobs.tt\0lib.hi.us\0"</div><div class='add'>+"*.ve\0"</div><div class='add'>+"*.saga.jp\0wildlife.museum\0com.pa\0"</div><div class='add'>+"monzabrianza.it\0sciencehistory.museum\0stange.no\0oskol.ru\0principe.st\0*.uy\0"</div><div class='add'>+"plaza.museum\0com.pe\0"</div><div class='add'>+"com.pf\0"</div><div class='add'>+"eigersund.no\0"</div><div class='add'>+"com.ph\0"</div><div class='add'>+"manx.museum\0marylhurst.museum\0"</div><div class='add'>+"md.ci\0pi.it\0schweiz.museum\0com.pk\0"</div><div class='add'>+"grp.lk\0fr\xc3\xb8ya.no\0com.pl\0press.se\0"</div><div class='add'>+"us.com\0"</div><div class='add'>+"b.bg\0cremona.it\0communication.museum\0art.sn\0"</div><div class='add'>+"med.pa\0"</div><div class='add'>+"com.pr\0"</div><div class='add'>+"com.ps\0"</div><div class='add'>+"com.pt\0"</div><div class='add'>+"k12.in.us\0"</div><div class='add'>+"ah.cn\0bahcavuotna.no\0"</div><div class='add'>+"sondrio.it\0arkhangelsk.ru\0"</div><div class='add'>+"cargo.aero\0"</div><div class='add'>+"council.aero\0"</div><div class='add'>+"museum.mv\0hattfjelldal.no\0spydeberg.no\0med.pl\0"</div><div class='add'>+"niepce.museum\0museum.mw\0"</div><div class='add'>+"anthropology.museum\0"</div><div class='add'>+"pharmacien.fr\0smola.no\0"</div><div class='add'>+"fin.ec\0"</div><div class='add'>+"selbu.no\0"</div><div class='add'>+"workinggroup.aero\0nm.us\0"</div><div class='add'>+"museum.no\0com.re\0"</div><div class='add'>+"cc.vt.us\0"</div><div class='add'>+"village.museum\0"</div><div class='add'>+"ca.us\0"</div><div class='add'>+"*.sapporo.jp\0"</div><div class='add'>+"teramo.it\0"</div><div class='add'>+"com.ro\0"</div><div class='add'>+"*.ye\0"</div><div class='add'>+"com.sa\0"</div><div class='add'>+"com.sb\0"</div><div class='add'>+"so.it\0com.sc\0"</div><div class='add'>+"jolster.no\0com.sd\0"</div><div class='add'>+"com.ru\0"</div><div class='add'>+"com.rw\0com.sg\0"</div><div class='add'>+"sydney.museum\0"</div><div class='add'>+"sa.edu.au\0"</div><div class='add'>+"tom.ru\0"</div><div class='add'>+"com.sl\0*.za\0"</div><div class='add'>+"\xe7\xbd\x91\xe7\xb5\xa1.hk\0naturbruksgymn.se\0com.sn\0"</div><div class='add'>+"assedic.fr\0com.so\0"</div><div class='add'>+"!pref.mie.jp\0*.yu\0"</div><div class='add'>+"med.sa\0"</div><div class='add'>+"newspaper.museum\0holmestrand.no\0dnepropetrovsk.ua\0"</div><div class='add'>+"christiansburg.museum\0roan.no\0"</div><div class='add'>+"pesaro-urbino.it\0med.sd\0com.st\0"</div><div class='add'>+"s\xc3\xb8gne.no\0"</div><div class='add'>+"nuernberg.museum\0"</div><div class='add'>+"*.zm\0"</div><div class='add'>+"com.sy\0"</div><div class='add'>+"*.nagano.jp\0com.tj\0"</div><div class='add'>+"nt.gov.au\0news.hu\0paderborn.museum\0"</div><div class='add'>+"boston.museum\0"</div><div class='add'>+"com.tn\0"</div><div class='add'>+"com.to\0"</div><div class='add'>+"broadcast.museum\0"</div><div class='add'>+"com.ua\0"</div><div class='add'>+"*.zw\0"</div><div class='add'>+"baikal.ru\0"</div><div class='add'>+"bykle.no\0com.tt\0"</div><div class='add'>+"verdal.no\0"</div><div class='add'>+"roros.no\0"</div><div class='add'>+"fi.cr\0carboniaiglesias.it\0chuvashia.ru\0com.tw\0"</div><div class='add'>+"k12.ca.us\0"</div><div class='add'>+"eidsvoll.no\0"</div><div class='add'>+"*.ishikawa.jp\0"</div><div class='add'>+"dolls.museum\0"</div><div class='add'>+"naval.museum\0"</div><div class='add'>+"karasjok.no\0tysvar.no\0"</div><div class='add'>+"bielawa.pl\0com.vc\0"</div><div class='add'>+"svalbard.no\0deatnu.no\0rnd.ru\0"</div><div class='add'>+"grandrapids.museum\0"</div><div class='add'>+"bauern.museum\0k12.pr.us\0"</div><div class='add'>+"press.ma\0"</div><div class='add'>+"*.kagawa.jp\0fribourg.museum\0przeworsk.pl\0com.vi\0"</div><div class='add'>+"com.uz\0"</div><div class='add'>+"babia-gora.pl\0"</div><div class='add'>+"com.vn\0"</div><div class='add'>+"med.pro\0"</div><div class='add'>+"suedtirol.it\0kursk.ru\0"</div><div class='add'>+"bonn.museum\0"</div><div class='add'>+"lt.it\0"</div><div class='add'>+"design.aero\0microlight.aero\0americanantiques.museum\0meland.no\0"</div><div class='add'>+"insurance.aero\0aarborte.no\0"</div><div class='add'>+"kh.ua\0"</div><div class='add'>+"macerata.it\0architecture.museum\0"</div><div class='add'>+"rovigo.it\0rawa-maz.pl\0"</div><div class='add'>+"store.nf\0levanger.no\0"</div><div class='add'>+"b\xc3\xa1jddar.no\0"</div><div class='add'>+"not.br\0"</div><div class='add'>+"com.ws\0"</div><div class='add'>+"!pref.kagawa.jp\0"</div><div class='add'>+"!omanpost.om\0"</div><div class='add'>+"vt.us\0"</div><div class='add'>+"gs.ah.no\0vladikavkaz.ru\0"</div><div class='add'>+"no.it\0"</div><div class='add'>+"in.na\0szkola.pl\0a.se\0"</div><div class='add'>+"aid.pl\0"</div><div class='add'>+"workshop.museum\0vegarshei.no\0"</div><div class='add'>+"sund.no\0"</div><div class='add'>+"bs.it\0flora.no\0"</div><div class='add'>+"agriculture.museum\0"</div><div class='add'>+"koeln.museum\0"</div><div class='add'>+"minnesota.museum\0k12.il.us\0"</div><div class='add'>+"froya.no\0"</div><div class='add'>+"aeroport.fr\0"</div><div class='add'>+"davvenjarga.no\0zgora.pl\0ivano-frankivsk.ua\0"</div><div class='add'>+"*.gunma.jp\0"</div><div class='add'>+"amot.no\0"</div><div class='add'>+"mus.br\0chungbuk.kr\0"</div><div class='add'>+"ggf.br\0lorenskog.no\0"</div><div class='add'>+"jeonbuk.kr\0"</div><div class='add'>+"k12.vi.us\0"</div><div class='add'>+"c.bg\0sande.more-og-romsdal.no\0"</div><div class='add'>+"perugia.it\0"</div><div class='add'>+"massa-carrara.it\0"</div><div class='add'>+"michigan.museum\0"</div><div class='add'>+"archaeology.museum\0mosj\xc3\xb8""en.no\0czest.pl\0koenig.ru\0\xe0\xb6\xbd\xe0\xb6\x82\xe0\xb6\x9a\xe0\xb7\x8f\0"</div><div class='add'>+"mobi.tt\0"</div><div class='add'>+"kraanghke.no\0"</div><div class='add'>+"cc.in.us\0"</div><div class='add'>+"re.it\0lib.vt.us\0"</div><div class='add'>+"dell-ogliastra.it\0"</div><div class='add'>+"s\xc3\xb8mna.no\0"</div><div class='add'>+"k12.wv.us\0"</div><div class='add'>+"gok.pk\0fh.se\0"</div><div class='add'>+"luzern.museum\0"</div><div class='add'>+"fi.it\0swidnica.pl\0"</div><div class='add'>+"cbg.ru\0"</div><div class='add'>+"latina.it\0"</div><div class='add'>+"vibovalentia.it\0"</div><div class='add'>+"modum.no\0"</div><div class='add'>+"safety.aero\0"</div><div class='add'>+"sp.it\0"</div><div class='add'>+"science.museum\0ah.no\0"</div><div class='add'>+"norddal.no\0"</div><div class='add'>+"cc.na\0"</div><div class='add'>+"re.kr\0"</div><div class='add'>+"dielddanuorri.no\0"</div><div class='add'>+"force.museum\0"</div><div class='add'>+"torino.it\0cc.md.us\0"</div><div class='add'>+"artanddesign.museum\0pisz.pl\0"</div><div class='add'>+"olsztyn.pl\0"</div><div class='add'>+"unsa.ba\0rade.no\0vinnica.ua\0"</div><div class='add'>+"in.rs\0astrakhan.ru\0"</div><div class='add'>+"sogne.no\0"</div><div class='add'>+"homebuilt.aero\0"</div><div class='add'>+"polkowice.pl\0"</div><div class='add'>+"hole.no\0health.vn\0"</div><div class='add'>+"fj.cn\0"</div><div class='add'>+"davvesiida.no\0"</div><div class='add'>+"vic.au\0"</div><div class='add'>+"kongsberg.no\0"</div><div class='add'>+"pub.sa\0"</div><div class='add'>+"vv.it\0"</div><div class='add'>+"!pref.tottori.jp\0"</div><div class='add'>+"*.sendai.jp\0in.th\0"</div><div class='add'>+"lib.pa.us\0"</div><div class='add'>+"chiropractic.museum\0"</div><div class='add'>+"mobi.na\0aca.pro\0"</div><div class='add'>+"konyvelo.hu\0sciencecenters.museum\0"</div><div class='add'>+"he.cn\0"</div><div class='add'>+"in.ua\0"</div><div class='add'>+"!city.nagoya.jp\0"</div><div class='add'>+"muenchen.museum\0"</div><div class='add'>+"psi.br\0"</div><div class='add'>+"maryland.museum\0"</div><div class='add'>+"!statecouncil.om\0"</div><div class='add'>+"tr\xc3\xa6na.no\0"</div><div class='add'>+"!pref.yamagata.jp\0jewishart.museum\0"</div><div class='add'>+"lu.it\0me.it\0"</div><div class='add'>+"chel.ru\0"</div><div class='add'>+"tatarstan.ru\0"</div><div class='add'>+"adult.ht\0in.us\0"</div><div class='add'>+"kafjord.no\0"</div><div class='add'>+"\xd7\x99\xd7\xa8\xd7\x95\xd7\xa9\xd7\x9c\xd7\x99\xd7\x9d.museum\0"</div><div class='add'>+"net.ac\0k12.ec\0"</div><div class='add'>+"net.ae\0bashkiria.ru\0"</div><div class='add'>+"net.af\0!omantel.om\0"</div><div class='add'>+"net.ag\0"</div><div class='add'>+"net.ai\0"</div><div class='add'>+"!pref.toyama.jp\0"</div><div class='add'>+"net.al\0timekeeping.museum\0"</div><div class='add'>+"net.an\0design.museum\0fin.tn\0"</div><div class='add'>+"ethnology.museum\0"</div><div class='add'>+"perso.ht\0asker.no\0b.se\0"</div><div class='add'>+"net.ba\0"</div><div class='add'>+"net.bb\0flanders.museum\0"</div><div class='add'>+"mincom.tn\0"</div><div class='add'>+"frana.no\0"</div><div class='add'>+"bt.it\0"</div><div class='add'>+"net.bh\0"</div><div class='add'>+"auto.pl\0"</div><div class='add'>+"net.az\0"</div><div class='add'>+"treviso.it\0"</div><div class='add'>+"war.museum\0"</div><div class='add'>+"net.bm\0"</div><div class='add'>+"langevag.no\0m\xc3\xa5lselv.no\0"</div><div class='add'>+"net.bo\0"</div><div class='add'>+"gol.no\0"</div><div class='add'>+"folkebibl.no\0"</div><div class='add'>+"net.br\0"</div><div class='add'>+"net.bs\0troandin.no\0saotome.st\0lib.tn.us\0"</div><div class='add'>+"md.us\0k12.ut.us\0"</div><div class='add'>+"d.bg\0cambridge.museum\0\xc3\xa5s.no\0"</div><div class='add'>+"net.ci\0"</div><div class='add'>+"net.bz\0"</div><div class='add'>+"sch.ae\0undersea.museum\0odda.no\0"</div><div class='add'>+"net.cn\0"</div><div class='add'>+"net.co\0c.la\0"</div><div class='add'>+"gliwice.pl\0"</div><div class='add'>+"aurskog-h\xc3\xb8land.no\0"</div><div class='add'>+"andria-trani-barletta.it\0"</div><div class='add'>+"net.cu\0loab\xc3\xa1t.no\0"</div><div class='add'>+"rep.kp\0"</div><div class='add'>+"\xe7\xbb\x84\xe7\xb9\x94.hk\0"</div><div class='add'>+"gallery.museum\0"</div><div class='add'>+"\xc3\xb8rland.no\0"</div><div class='add'>+"store.ro\0"</div><div class='add'>+"net.dm\0"</div><div class='add'>+"somna.no\0"</div><div class='add'>+"hemnes.no\0"</div><div class='add'>+"ringebu.no\0k12.ky.us\0"</div><div class='add'>+"net.ec\0"</div><div class='add'>+"dn.ua\0"</div><div class='add'>+"tarnobrzeg.pl\0"</div><div class='add'>+"soc.lk\0"</div><div class='add'>+"romsa.no\0"</div><div class='add'>+"bamble.no\0"</div><div class='add'>+"net.dz\0lutsk.ua\0"</div><div class='add'>+"barlettatraniandria.it\0ta.it\0countryestate.museum\0"</div><div class='add'>+"kaszuby.pl\0"</div><div class='add'>+"*.yamaguchi.jp\0cranbrook.museum\0store.st\0"</div><div class='add'>+"southcarolina.museum\0lib.md.us\0"</div><div class='add'>+"textile.museum\0"</div><div class='add'>+"cheltenham.museum\0hurum.no\0"</div><div class='add'>+"*.oita.jp\0"</div><div class='add'>+"shop.ht\0cc.me.us\0"</div><div class='add'>+"shop.hu\0turin.it\0"</div><div class='add'>+"louvre.museum\0"</div><div class='add'>+"k12.ar.us\0"</div><div class='add'>+"consulting.aero\0"</div><div class='add'>+"gv.ao\0"</div><div class='add'>+"sauherad.no\0"</div><div class='add'>+"gv.at\0net.ge\0"</div><div class='add'>+"ostre-toten.no\0lib.ok.us\0"</div><div class='add'>+"net.gg\0pilots.museum\0"</div><div class='add'>+"2000.hu\0geology.museum\0"</div><div class='add'>+"net.gn\0"</div><div class='add'>+"mazowsze.pl\0bir.ru\0"</div><div class='add'>+"net.gp\0"</div><div class='add'>+"net.gr\0"</div><div class='add'>+"oxford.museum\0"</div><div class='add'>+"per.la\0"</div><div class='add'>+"eastafrica.museum\0"</div><div class='add'>+"meeres.museum\0"</div><div class='add'>+"net.gy\0*.shizuoka.jp\0"</div><div class='add'>+"\xe5\x95\x86\xe6\xa5\xad.tw\0"</div><div class='add'>+"net.hk\0"</div><div class='add'>+"net.hn\0"</div><div class='add'>+"philadelphiaarea.museum\0"</div><div class='add'>+"osen.no\0"</div><div class='add'>+"net.ht\0net.id\0"</div><div class='add'>+"fundacio.museum\0"</div><div class='add'>+"j\xc3\xb8rpeland.no\0"</div><div class='add'>+"\xe6\x95\x99\xe8\x82\xb2.hk\0"</div><div class='add'>+"divtasvuodna.no\0"</div><div class='add'>+"student.aero\0sch.gg\0net.im\0"</div><div class='add'>+"\xe7\xbd\x91\xe7\xbb\x9c.cn\0net.in\0"</div><div class='add'>+"net.iq\0"</div><div class='add'>+"net.ir\0"</div><div class='add'>+"net.is\0"</div><div class='add'>+"net.je\0"</div><div class='add'>+"kepno.pl\0lapy.pl\0"</div><div class='add'>+"per.nf\0"</div><div class='add'>+"gov\0*.shimane.jp\0"</div><div class='add'>+"artcenter.museum\0"</div><div class='add'>+"k\xc3\xa5""fjord.no\0"</div><div class='add'>+"net.jo\0"</div><div class='add'>+"eu.int\0"</div><div class='add'>+"c.se\0"</div><div class='add'>+"net.kg\0"</div><div class='add'>+"ce.it\0net.ki\0"</div><div class='add'>+"sch.id\0os.hedmark.no\0"</div><div class='add'>+"columbus.museum\0"</div><div class='add'>+"arteducation.museum\0"</div><div class='add'>+"net.kn\0"</div><div class='add'>+"kr.com\0"</div><div class='add'>+"net.la\0bushey.museum\0cc.gu.us\0"</div><div class='add'>+"net.lb\0"</div><div class='add'>+"net.lc\0"</div><div class='add'>+"gs.bu.no\0"</div><div class='add'>+"e164.arpa\0"</div><div class='add'>+"chieti.it\0labour.museum\0"</div><div class='add'>+"sch.ir\0creation.museum\0krodsherad.no\0"</div><div class='add'>+"net.ky\0"</div><div class='add'>+"net.kz\0me.us\0"</div><div class='add'>+"e.bg\0sch.je\0net.lk\0"</div><div class='add'>+"zlg.br\0suwalki.pl\0"</div><div class='add'>+"\xe5\x80\x8b\xe4\xba\xba.hk\0net.ma\0"</div><div class='add'>+"net.lr\0"</div><div class='add'>+"sch.jo\0notaires.km\0net.me\0"</div><div class='add'>+"net.lv\0karate.museum\0"</div><div class='add'>+"net.ly\0karm\xc3\xb8y.no\0"</div><div class='add'>+"rg.it\0"</div><div class='add'>+"net.mk\0"</div><div class='add'>+"net.ml\0evenes.no\0"</div><div class='add'>+"ngo.lk\0net.mo\0egyptian.museum\0"</div><div class='add'>+"marine.ru\0"</div><div class='add'>+"realestate.pl\0"</div><div class='add'>+"net.mu\0"</div><div class='add'>+"net.mv\0net.nf\0"</div><div class='add'>+"net.mw\0net.ng\0gda.pl\0"</div><div class='add'>+"net.mx\0"</div><div class='add'>+"freemasonry.museum\0net.my\0enebakk.no\0"</div><div class='add'>+"karlsoy.no\0"</div><div class='add'>+"\xe7\xbd\x91\xe7\xbb\x9c.hk\0\xc3\xb8rskog.no\0"</div><div class='add'>+"randaberg.no\0"</div><div class='add'>+"club.aero\0"</div><div class='add'>+"certification.aero\0sr.it\0"</div><div class='add'>+"center.museum\0so.gov.pl\0"</div><div class='add'>+"caa.aero\0"</div><div class='add'>+"sch.lk\0tvedestrand.no\0"</div><div class='add'>+"net.nr\0"</div><div class='add'>+"luroy.no\0"</div><div class='add'>+"aukra.no\0s\xc3\xa1lat.no\0lib.me.us\0"</div><div class='add'>+"ddr.museum\0"</div><div class='add'>+"york.museum\0stryn.no\0k12.nm.us\0"</div><div class='add'>+"per.sg\0"</div><div class='add'>+"judaica.museum\0"</div><div class='add'>+"verona.it\0"</div><div class='add'>+"agdenes.no\0"</div><div class='add'>+"cng.br\0sch.ly\0"</div><div class='add'>+"net.pa\0"</div><div class='add'>+"author.aero\0"</div><div class='add'>+"naturalhistory.museum\0steiermark.museum\0bu.no\0"</div><div class='add'>+"sn\xc3\xa5sa.no\0net.pe\0"</div><div class='add'>+"net.ph\0"</div><div class='add'>+"savannahga.museum\0batsfjord.no\0lib.oh.us\0"</div><div class='add'>+"net.pk\0"</div><div class='add'>+"net.pl\0"</div><div class='add'>+"net.pn\0"</div><div class='add'>+"washingtondc.museum\0"</div><div class='add'>+"net.pr\0"</div><div class='add'>+"net.ps\0"</div><div class='add'>+"net.pt\0"</div><div class='add'>+"nordkapp.no\0"</div><div class='add'>+"emergency.aero\0krokstadelva.no\0"</div><div class='add'>+"satx.museum\0ngo.ph\0omsk.ru\0"</div><div class='add'>+"texas.museum\0"</div><div class='add'>+"ngo.pl\0"</div><div class='add'>+"mantova.it\0gu.us\0"</div><div class='add'>+"!pref.shiga.jp\0isa.us\0"</div><div class='add'>+"usa.museum\0"</div><div class='add'>+"gb.net\0k12.vi\0"</div><div class='add'>+"iveland.no\0"</div><div class='add'>+"tempio-olbia.it\0"</div><div class='add'>+"net.sa\0"</div><div class='add'>+"net.sb\0"</div><div class='add'>+"works.aero\0net.sc\0komvux.se\0"</div><div class='add'>+"net.sd\0"</div><div class='add'>+"net.ru\0"</div><div class='add'>+"0.bg\0"</div><div class='add'>+"forlicesena.it\0net.rw\0net.sg\0"</div><div class='add'>+"klodzko.pl\0"</div><div class='add'>+"detroit.museum\0wegrow.pl\0"</div><div class='add'>+"net.sl\0"</div><div class='add'>+"glogow.pl\0"</div><div class='add'>+"store.bb\0air.museum\0"</div><div class='add'>+"net.so\0"</div><div class='add'>+"katowice.pl\0"</div><div class='add'>+"nsk.ru\0"</div><div class='add'>+"pisa.it\0eid.no\0"</div><div class='add'>+"net.st\0"</div><div class='add'>+"film.hu\0"</div><div class='add'>+"tuva.ru\0d.se\0"</div><div class='add'>+"net.th\0"</div><div class='add'>+"net.sy\0"</div><div class='add'>+"viterbo.it\0tsaritsyn.ru\0perso.sn\0net.tj\0"</div><div class='add'>+"lib.gu.us\0"</div><div class='add'>+"plc.co.im\0sec.ps\0"</div><div class='add'>+"r\xc3\xa1hkker\xc3\xa1vju.no\0kazimierz-dolny.pl\0net.tn\0"</div><div class='add'>+"net.to\0"</div><div class='add'>+"veterinaire.km\0"</div><div class='add'>+"net.ua\0"</div><div class='add'>+"info.ht\0net.tt\0"</div><div class='add'>+"info.hu\0"</div><div class='add'>+"exchange.aero\0"</div><div class='add'>+"sch.sa\0net.tw\0"</div><div class='add'>+"andriatranibarletta.it\0perso.tn\0"</div><div class='add'>+"f.bg\0malselv.no\0"</div><div class='add'>+"net.vc\0"</div><div class='add'>+"trana.no\0"</div><div class='add'>+"ns.ca\0"</div><div class='add'>+"net.vi\0"</div><div class='add'>+"lucca.it\0oristano.it\0"</div><div class='add'>+"usarts.museum\0net.vn\0"</div><div class='add'>+"gon.pk\0"</div><div class='add'>+"pl.ua\0"</div><div class='add'>+"eastcoast.museum\0"</div><div class='add'>+"novara.it\0"</div><div class='add'>+"k12.ks.us\0"</div><div class='add'>+"dp.ua\0"</div><div class='add'>+"nesseby.no\0"</div><div class='add'>+"!pref.wakayama.jp\0"</div><div class='add'>+"repbody.aero\0"</div><div class='add'>+"jamison.museum\0lugansk.ua\0"</div><div class='add'>+"ss.it\0"</div><div class='add'>+"alessandria.it\0"</div><div class='add'>+"hadsel.no\0net.ws\0"</div><div class='add'>+"\xe0\xae\x9a\xe0\xae\xbf\xe0\xae\x99\xe0\xaf\x8d\xe0\xae\x95\xe0\xae\xaa\xe0\xaf\x8d\xe0\xae\xaa\xe0\xaf\x82\xe0\xae\xb0\xe0\xaf\x8d\0"</div><div class='add'>+"veterinaire.fr\0leirfjord.no\0"</div><div class='add'>+"massacarrara.it\0north.museum\0"</div><div class='add'>+"project.museum\0"</div><div class='add'>+"other.nf\0"</div><div class='add'>+"k12.nh.us\0"</div><div class='add'>+"mat.br\0artgallery.museum\0"</div><div class='add'>+"sr.gov.pl\0"</div><div class='add'>+"gamvik.no\0"</div><div class='add'>+"info.ec\0lancashire.museum\0"</div><div class='add'>+"fm.br\0ltd.co.im\0"</div><div class='add'>+"americana.museum\0southwest.museum\0cc.ak.us\0"</div><div class='add'>+"enna.it\0lunner.no\0"</div><div class='add'>+"v\xc3\xa5gan.no\0"</div><div class='add'>+"mari.ru\0"</div><div class='add'>+"accident-investigation.aero\0"</div><div class='add'>+"sor-aurdal.no\0lib.ny.us\0"</div><div class='add'>+"novosibirsk.ru\0"</div><div class='add'>+"bjugn.no\0"</div><div class='add'>+"n\xc3\xa6r\xc3\xb8y.no\0ostrowwlkp.pl\0"</div><div class='add'>+"info.bb\0foundation.museum\0"</div><div class='add'>+"brand.se\0"</div><div class='add'>+"info.at\0!pref.akita.jp\0l\xc3\xb8ten.no\0"</div><div class='add'>+"coal.museum\0miners.museum\0"</div><div class='add'>+"glass.museum\0"</div><div class='add'>+"info.az\0"</div><div class='add'>+"frog.museum\0szczytno.pl\0nov.ru\0"</div><div class='add'>+"sunndal.no\0"</div><div class='add'>+"gen.in\0"</div><div class='add'>+"gx.cn\0"</div><div class='add'>+"web.co\0*.mie.jp\0hobol.no\0\xe5\x8f\xb0\xe6\xb9\xbe\0"</div><div class='add'>+"logistics.aero\0plo.ps\0"</div><div class='add'>+"erotika.hu\0"</div><div class='add'>+"torsken.no\0"</div><div class='add'>+"exeter.museum\0"</div><div class='add'>+"info.co\0"</div><div class='add'>+"selje.no\0"</div><div class='add'>+"storfjord.no\0"</div><div class='add'>+"barum.no\0lind\xc3\xa5s.no\0"</div><div class='add'>+"leasing.aero\0"</div><div class='add'>+"championship.aero\0fst.br\0"</div><div class='add'>+"lierne.no\0"</div><div class='add'>+"!gobiernoelectronico.ar\0""1.bg\0"</div><div class='add'>+"corporation.museum\0"</div><div class='add'>+"al.it\0*.miyagi.jp\0"</div><div class='add'>+"*.aomori.jp\0"</div><div class='add'>+"\xd8\xa7\xd9\x84\xd8\xa7\xd8\xb1\xd8\xaf\xd9\x86\0"</div><div class='add'>+"amursk.ru\0"</div><div class='add'>+"vestvagoy.no\0"</div><div class='add'>+"\xd8\xa7\xdb\x8c\xd8\xb1\xd8\xa7\xd9\x86.ir\0cc.fl.us\0"</div><div class='add'>+"os.hordaland.no\0"</div><div class='add'>+"pistoia.it\0"</div><div class='add'>+"tver.ru\0e.se\0"</div><div class='add'>+"res.in\0*.yamagata.jp\0syzran.ru\0"</div><div class='add'>+"capebreton.museum\0sandnessj\xc3\xb8""en.no\0"</div><div class='add'>+"ternopil.ua\0"</div><div class='add'>+"shop.pl\0"</div><div class='add'>+"tank.museum\0"</div><div class='add'>+"m\xc3\xa5s\xc3\xb8y.no\0"</div><div class='add'>+"potenza.it\0time.museum\0"</div><div class='add'>+"mjondalen.no\0"</div><div class='add'>+"eng.br\0nedre-eiker.no\0"</div><div class='add'>+"air-surveillance.aero\0"</div><div class='add'>+"nt.au\0am.br\0pn.it\0"</div><div class='add'>+"oystre-slidre.no\0ug.gov.pl\0"</div><div class='add'>+"g.bg\0nesodden.no\0vologda.ru\0"</div><div class='add'>+"parma.it\0tula.ru\0"</div><div class='add'>+"*.nara.jp\0ak.us\0"</div><div class='add'>+"nt.ca\0konin.pl\0"</div><div class='add'>+"kiev.ua\0"</div><div class='add'>+"skierv\xc3\xa1.no\0vestre-toten.no\0"</div><div class='add'>+"ri.it\0botanical.museum\0farsund.no\0veg\xc3\xa5rshei.no\0dagestan.ru\0"</div><div class='add'>+"ind.br\0k-uralsk.ru\0"</div><div class='add'>+"rahkkeravju.no\0cmw.ru\0"</div><div class='add'>+"canada.museum\0"</div><div class='add'>+"fm.it\0"</div><div class='add'>+"cc.wi.us\0"</div><div class='add'>+"web.id\0aver\xc3\xb8y.no\0"</div><div class='add'>+"dudinka.ru\0"</div><div class='add'>+"baghdad.museum\0fitjar.no\0grane.no\0"</div><div class='add'>+"gs.fm.no\0"</div><div class='add'>+"sumy.ua\0"</div><div class='add'>+"al.no\0"</div><div class='add'>+"westfalen.museum\0"</div><div class='add'>+"oregon.museum\0"</div><div class='add'>+"bruxelles.museum\0elk.pl\0"</div><div class='add'>+"planetarium.museum\0sn\xc3\xa5""ase.no\0"</div><div class='add'>+"s\xc3\xb8rreisa.no\0"</div><div class='add'>+"gs.st.no\0skien.no\0"</div><div class='add'>+"bible.museum\0ivanovo.ru\0"</div><div class='add'>+"avellino.it\0"</div><div class='add'>+"tgory.pl\0"</div><div class='add'>+"family.museum\0"</div><div class='add'>+"ppg.br\0k12.as.us\0"</div><div class='add'>+"trader.aero\0gorlice.pl\0"</div><div class='add'>+"cc.al.us\0"</div><div class='add'>+"ogliastra.it\0"</div><div class='add'>+"is.it\0lib.nv.us\0"</div><div class='add'>+"dr.na\0"</div><div class='add'>+"media.hu\0nesna.no\0fl.us\0"</div><div class='add'>+"uri.arpa\0"</div><div class='add'>+"bjerkreim.no\0"</div><div class='add'>+"charter.aero\0"</div><div class='add'>+"genova.it\0"</div><div class='add'>+"it.ao\0botany.museum\0hapmir.no\0"</div><div class='add'>+"educational.museum\0"</div><div class='add'>+"helsinki.museum\0"</div><div class='add'>+"memorial.museum\0"</div><div class='add'>+"web.lk\0pharmacy.museum\0"</div><div class='add'>+"aircraft.aero\0appspot.com\0"</div><div class='add'>+"ferrara.it\0beskidy.pl\0"</div><div class='add'>+"hi.cn\0"</div><div class='add'>+"taxi.aero\0flekkefjord.no\0"</div><div class='add'>+"varoy.no\0"</div><div class='add'>+"ragusa.it\0ambulance.museum\0"</div><div class='add'>+"can.museum\0"</div><div class='add'>+"*.osaka.jp\0isleofman.museum\0fm.no\0warmia.pl\0"</div><div class='add'>+"educator.aero\0asmatart.museum\0"</div><div class='add'>+"mi.it\0"</div><div class='add'>+"kutno.pl\0"</div><div class='add'>+"skedsmokorset.no\0"</div><div class='add'>+"2.bg\0"</div><div class='add'>+"*.kagoshima.jp\0km.ua\0"</div><div class='add'>+"!city.sendai.jp\0"</div><div class='add'>+"web.nf\0st.no\0cc.ri.us\0"</div><div class='add'>+"reggiocalabria.it\0"</div><div class='add'>+"wi.us\0"</div><div class='add'>+"ancona.it\0newjersey.museum\0nnov.ru\0"</div><div class='add'>+"f.se\0"</div><div class='add'>+"ind.in\0"</div><div class='add'>+"info.vn\0"</div><div class='add'>+"andoy.no\0"</div><div class='add'>+"ch.it\0fredrikstad.no\0guovdageaidnu.no\0"</div><div class='add'>+"fjaler.no\0"</div><div class='add'>+"sa.com\0"</div><div class='add'>+"gs.nt.no\0"</div><div class='add'>+"masfjorden.no\0"</div><div class='add'>+"pordenone.it\0"</div><div class='add'>+"po.it\0basel.museum\0"</div><div class='add'>+"chambagri.fr\0"</div><div class='add'>+"h.bg\0web.pk\0"</div><div class='add'>+"london.museum\0"</div><div class='add'>+"sciencecenter.museum\0\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0"</div><div class='add'>+"unbi.ba\0augustow.pl\0"</div><div class='add'>+"wolomin.pl\0"</div><div class='add'>+"notaires.fr\0tcm.museum\0al.us\0"</div><div class='add'>+"nu.ca\0!pref.nagano.jp\0"</div><div class='add'>+"info.tn\0"</div><div class='add'>+"lib.wa.us\0"</div><div class='add'>+"ed.ao\0info.tt\0"</div><div class='add'>+"barreau.bj\0"</div><div class='add'>+"k12.wy.us\0"</div><div class='add'>+"pp.az\0gop.pk\0"</div><div class='add'>+"int\0"</div><div class='add'>+"l\xc3\xb8renskog.no\0podhale.pl\0"</div><div class='add'>+"voagat.no\0"</div><div class='add'>+"telekommunikation.museum\0"</div><div class='add'>+"qld.au\0"</div><div class='add'>+"te.it\0freiburg.museum\0snasa.no\0"</div><div class='add'>+"gjemnes.no\0"</div><div class='add'>+"sejny.pl\0"</div><div class='add'>+"media.pl\0"</div><div class='add'>+"skjak.no\0"</div><div class='add'>+"watchandclock.museum\0"</div><div class='add'>+"ed.ci\0pacific.museum\0"</div><div class='add'>+"theater.museum\0info.ro\0"</div><div class='add'>+"uk.com\0"</div><div class='add'>+"campobasso.it\0aquarium.museum\0tysv\xc3\xa6r.no\0"</div><div class='add'>+"kragero.no\0"</div><div class='add'>+"windmill.museum\0info.sd\0"</div><div class='add'>+"sologne.museum\0sande.m\xc3\xb8re-og-romsdal.no\0"</div><div class='add'>+"nt.no\0cc.mi.us\0"</div><div class='add'>+"ed.cr\0"</div><div class='add'>+"academy.museum\0zachpomor.pl\0"</div><div class='add'>+"tananger.no\0v\xc3\xa1rgg\xc3\xa1t.no\0ri.us\0"</div><div class='add'>+"federation.aero\0"</div><div class='add'>+"web.tj\0"</div><div class='add'>+"matta-varjjat.no\0"</div><div class='add'>+"steigen.no\0"</div><div class='add'>+"local\0akrehamn.no\0"</div><div class='add'>+"!pref.chiba.jp\0info.pk\0"</div><div class='add'>+"info.pl\0""6bone.pl\0"</div><div class='add'>+"klepp.no\0kherson.ua\0"</div><div class='add'>+"ketrzyn.pl\0info.pr\0"</div><div class='add'>+"sweden.museum\0"</div><div class='add'>+"lardal.no\0"</div><div class='add'>+"!retina.ar\0gz.cn\0"</div><div class='add'>+"barletta-trani-andria.it\0vikna.no\0"</div><div class='add'>+"bearalv\xc3\xa1hki.no\0"</div><div class='add'>+"broker.aero\0gov.nc.tr\0"</div><div class='add'>+"info.na\0k12.fl.us\0"</div><div class='add'>+"hembygdsforbund.museum\0"</div><div class='add'>+"entertainment.aero\0jerusalem.museum\0l\xc3\xa6rdal.no\0"</div><div class='add'>+"hitra.no\0sogndal.no\0"</div><div class='add'>+"farmequipment.museum\0info.mv\0info.nf\0\xc3\xa5lg\xc3\xa5rd.no\0"</div><div class='add'>+"la-spezia.it\0"</div><div class='add'>+"skanland.no\0fam.pk\0"</div><div class='add'>+"skole.museum\0"</div><div class='add'>+"art.museum\0"</div><div class='add'>+"presidio.museum\0"</div><div class='add'>+"3.bg\0public.museum\0"</div><div class='add'>+"h\xc3\xb8yanger.no\0zagan.pl\0"</div><div class='add'>+"an.it\0"</div><div class='add'>+"philadelphia.museum\0info.nr\0"</div><div class='add'>+"pesarourbino.it\0g\xc3\xa1ivuotna.no\0"</div><div class='add'>+"poltava.ua\0"</div><div class='add'>+"nt.ro\0"</div><div class='add'>+"station.museum\0"</div><div class='add'>+"mi.th\0"</div><div class='add'>+"altoadige.it\0"</div><div class='add'>+"nu.it\0"</div><div class='add'>+"usculture.museum\0g.se\0"</div><div class='add'>+"h\xc3\xa1mm\xc3\xa1rfeasta.no\0"</div><div class='add'>+"daegu.kr\0info.la\0"</div><div class='add'>+"dovre.no\0"</div><div class='add'>+"ci.it\0horology.museum\0"</div><div class='add'>+"bergbau.museum\0"</div><div class='add'>+"press.museum\0"</div><div class='add'>+"gangwon.kr\0"</div><div class='add'>+"!city.kitakyushu.jp\0sor-varanger.no\0cc.hi.us\0"</div><div class='add'>+"fuossko.no\0"</div><div class='add'>+"zp.ua\0"</div><div class='add'>+"american.museum\0"</div><div class='add'>+"fl\xc3\xa5.no\0mi.us\0"</div><div class='add'>+"i.bg\0"</div><div class='add'>+"od.ua\0"</div><div class='add'>+"encyclopedic.museum\0"</div><div class='add'>+"ind.tn\0"</div><div class='add'>+"midatlantic.museum\0"</div><div class='add'>+"newyork.museum\0"</div><div class='add'>+"castres.museum\0"</div><div class='add'>+"act.edu.au\0"</div><div class='add'>+"topology.museum\0"</div><div class='add'>+"ed.jp\0"</div><div class='add'>+"of.by\0"</div><div class='add'>+"iris.arpa\0inf.br\0askim.no\0pyatigorsk.ru\0"</div><div class='add'>+"nord-fron.no\0nsn.us\0"</div><div class='add'>+"beardu.no\0"</div><div class='add'>+"agrar.hu\0corvette.museum\0chtr.k12.ma.us\0"</div><div class='add'>+"figueres.museum\0"</div><div class='add'>+"!pref.gunma.jp\0medizinhistorisches.museum\0"</div><div class='add'>+"tjeldsund.no\0"</div><div class='add'>+"nebraska.museum\0"</div><div class='add'>+"bellevue.museum\0"</div><div class='add'>+"abo.pa\0k12.al.us\0"</div><div class='add'>+"info.ki\0"</div><div class='add'>+"inf.cu\0sv.it\0"</div><div class='add'>+"jfk.museum\0"</div><div class='add'>+"!city.osaka.jp\0swinoujscie.pl\0"</div><div class='add'>+"bydgoszcz.pl\0"</div><div class='add'>+"!city.kyoto.jp\0"</div><div class='add'>+"uvic.museum\0"</div><div class='add'>+"madrid.museum\0steinkjer.no\0"</div><div class='add'>+"lib.ma.us\0"</div><div class='add'>+"sirdal.no\0"</div><div class='add'>+"n\xc3\xb8tter\xc3\xb8y.no\0"</div><div class='add'>+"taranto.it\0starnberg.museum\0"</div><div class='add'>+"vic.gov.au\0pvt.ge\0pors\xc3\xa1\xc5\x8bgu.no\0"</div><div class='add'>+"naroy.no\0ris\xc3\xb8r.no\0"</div><div class='add'>+"va.it\0salem.museum\0starachowice.pl\0"</div><div class='add'>+"!nawrastelecom.om\0"</div><div class='add'>+"town.museum\0te.ua\0"</div><div class='add'>+"se.net\0"</div><div class='add'>+"kemerovo.ru\0"</div><div class='add'>+"lerdal.no\0"</div><div class='add'>+"gs.va.no\0"</div><div class='add'>+"kms.ru\0"</div><div class='add'>+"consulado.st\0"</div><div class='add'>+"haram.no\0"</div><div class='add'>+"tysnes.no\0"</div><div class='add'>+"!pref.ibaraki.jp\0hamburg.museum\0"</div><div class='add'>+"\xc3\xa5rdal.no\0"</div><div class='add'>+"airline.aero\0"</div><div class='add'>+"crew.aero\0newhampshire.museum\0"</div><div class='add'>+"muenster.museum\0"</div><div class='add'>+"aerodrome.aero\0"</div><div class='add'>+"heroy.nordland.no\0belau.pw\0"</div><div class='add'>+"kamchatka.ru\0"</div><div class='add'>+"b\xc3\xa5""d\xc3\xa5""ddj\xc3\xa5.no\0lillehammer.no\0hi.us\0"</div><div class='add'>+"hk.cn\0"</div><div class='add'>+"!city.kobe.jp\0berlevag.no\0"</div><div class='add'>+"ardal.no\0"</div><div class='add'>+"askoy.no\0"</div><div class='add'>+"vardo.no\0"</div><div class='add'>+"fyresdal.no\0"</div><div class='add'>+"sassari.it\0"</div><div class='add'>+"video.hu\0drammen.no\0"</div><div class='add'>+"lyngen.no\0nakhodka.ru\0"</div><div class='add'>+"ip6.arpa\0games.hu\0"</div><div class='add'>+"online.museum\0"</div><div class='add'>+"k12.sd.us\0"</div><div class='add'>+"4.bg\0sebastopol.ua\0"</div><div class='add'>+"ao.it\0atlanta.museum\0"</div><div class='add'>+"lebork.pl\0"</div><div class='add'>+"ravenna.it\0"</div><div class='add'>+"railway.museum\0songdalen.no\0"</div><div class='add'>+"!pref.shimane.jp\0delaware.museum\0ed.pw\0"</div><div class='add'>+"f\xc3\xb8rde.no\0"</div><div class='add'>+"living.museum\0"</div><div class='add'>+"juif.museum\0"</div><div class='add'>+"lomza.pl\0"</div><div class='add'>+"h.se\0"</div><div class='add'>+"!bl.uk\0"</div><div class='add'>+"portland.museum\0\xe7\xb5\x84\xe7\xb9\x94.tw\0"</div><div class='add'>+"stj\xc3\xb8rdal.no\0"</div><div class='add'>+"lecce.it\0"</div><div class='add'>+"bz.it\0"</div><div class='add'>+"farmstead.museum\0va.no\0"</div><div class='add'>+"express.aero\0!nacion.ar\0"</div><div class='add'>+"presse.km\0gs.of.no\0"</div><div class='add'>+"\xe5\x8f\xb0\xe7\x81\xa3\0"</div><div class='add'>+"og.ao\0gyeongbuk.kr\0vestv\xc3\xa5g\xc3\xb8y.no\0"</div><div class='add'>+"prd.fr\0"</div><div class='add'>+"pp.ru\0pp.se\0"</div><div class='add'>+"forum.hu\0!pref.saga.jp\0"</div><div class='add'>+"kvalsund.no\0"</div><div class='add'>+"!city.kawasaki.jp\0n\xc3\xa5\xc3\xa5mesjevuemie.no\0"</div><div class='add'>+"j.bg\0"</div><div class='add'>+"vlaanderen.museum\0"</div><div class='add'>+"cc.va.us\0"</div><div class='add'>+"\xd8\xa7\xd9\x8a\xd8\xb1\xd8\xa7\xd9\x86.ir\0alabama.museum\0"</div><div class='add'>+"school.museum\0her\xc3\xb8y.m\xc3\xb8re-og-romsdal.no\0"</div><div class='add'>+"\xc3\xa5seral.no\0"</div><div class='add'>+"traniandriabarletta.it\0"</div><div class='add'>+"flog.br\0"</div><div class='add'>+"presse.ml\0"</div><div class='add'>+"k\xc3\xa1r\xc3\xa1\xc5\xa1johka.no\0"</div><div class='add'>+"historisch.museum\0"</div><div class='add'>+"farm.museum\0palmsprings.museum\0oslo.no\0dyroy.no\0stranda.no\0"</div><div class='add'>+"gs.rl.no\0r\xc3\xa5""de.no\0"</div><div class='add'>+"bomlo.no\0s\xc3\xb8rum.no\0"</div><div class='add'>+"jan-mayen.no\0ivgu.no\0"</div><div class='add'>+"coop\0"</div><div class='add'>+"agr.br\0k12.ak.us\0"</div><div class='add'>+"!nic.ar\0catanzaro.it\0fusa.no\0"</div><div class='add'>+"hu.com\0"</div><div class='add'>+"inf.mk\0"</div><div class='add'>+"vet.br\0"</div><div class='add'>+"k12.mt.us\0k12.nd.us\0"</div><div class='add'>+"vlog.br\0\xe5\x85\xac\xe5\x8f\xb8.cn\0sandnessjoen.no\0"</div><div class='add'>+"lib.az.us\0"</div><div class='add'>+"nsw.edu.au\0of.no\0\xc3\xb8stre-toten.no\0"</div><div class='add'>+"*.okinawa.jp\0"</div><div class='add'>+"vb.it\0"</div><div class='add'>+"asso.fr\0firenze.it\0"</div><div class='add'>+"trieste.it\0"</div><div class='add'>+"\xe5\x85\xac\xe5\x8f\xb8.hk\0"</div><div class='add'>+"museet.museum\0"</div><div class='add'>+"prd.km\0"</div><div class='add'>+"navuotna.no\0lib.ca.us\0"</div><div class='add'>+"cc.nv.us\0"</div><div class='add'>+"asso.gp\0"</div><div class='add'>+"meraker.no\0"</div><div class='add'>+"h\xc3\xa1pmir.no\0"</div><div class='add'>+"i.ph\0"</div><div class='add'>+"sx.cn\0jeonnam.kr\0"</div><div class='add'>+"halden.no\0"</div><div class='add'>+"fed.us\0"</div><div class='add'>+"medio-campidano.it\0tsk.ru\0"</div><div class='add'>+"barcelona.museum\0"</div><div class='add'>+"giessen.museum\0roma.museum\0"</div><div class='add'>+"hl.cn\0"</div><div class='add'>+"\xe0\xae\x87\xe0\xae\xb2\xe0\xae\x99\xe0\xaf\x8d\xe0\xae\x95\xe0\xaf\x88\0"</div><div class='add'>+"biz.bb\0benevento.it\0rl.no\0bygland.no\0"</div><div class='add'>+"port.fr\0asso.ht\0prd.mg\0"</div><div class='add'>+"biz.at\0"</div><div class='add'>+"tra.kp\0"</div><div class='add'>+"*.aichi.jp\0khabarovsk.ru\0"</div><div class='add'>+"campidano-medio.it\0"</div><div class='add'>+"biz.az\0"</div><div class='add'>+"newmexico.museum\0va.us\0"</div><div class='add'>+"finearts.museum\0"</div><div class='add'>+"murmansk.ru\0"</div><div class='add'>+"\xc3\xb8rsta.no\0radom.pl\0k12.sc.us\0"</div><div class='add'>+"5.bg\0kvinesdal.no\0"</div><div class='add'>+"ap.it\0"</div><div class='add'>+"*.fukushima.jp\0"</div><div class='add'>+"asso.bj\0"</div><div class='add'>+"mad.museum\0"</div><div class='add'>+"lebesby.no\0"</div><div class='add'>+"og.it\0glas.museum\0sauda.no\0"</div><div class='add'>+"i.se\0"</div><div class='add'>+"k12.tx.us\0"</div><div class='add'>+"asso.ci\0mk.ua\0"</div><div class='add'>+"cesena-forli.it\0"</div><div class='add'>+"lowicz.pl\0"</div><div class='add'>+"k12.id.us\0"</div><div class='add'>+"tas.gov.au\0"</div><div class='add'>+"lukow.pl\0"</div><div class='add'>+"utazas.hu\0"</div><div class='add'>+"maritimo.museum\0bjark\xc3\xb8y.no\0"</div><div class='add'>+"adm.br\0"</div><div class='add'>+"pr.it\0lib.vi.us\0"</div><div class='add'>+"bergamo.it\0k12.va.us\0"</div><div class='add'>+"k.bg\0"</div><div class='add'>+"railroad.museum\0"</div><div class='add'>+"!british-library.uk\0"</div><div class='add'>+"cincinnati.museum\0"</div><div class='add'>+"sorreisa.no\0"</div><div class='add'>+"asso.dz\0!nel.uk\0"</div><div class='add'>+"rm.it\0"</div><div class='add'>+"nv.us\0"</div><div class='add'>+"nx.cn\0gos.pk\0"</div><div class='add'>+"vic.edu.au\0"</div><div class='add'>+"biella.it\0tjome.no\0"</div><div class='add'>+"r\xc3\xb8yken.no\0"</div><div class='add'>+"beiarn.no\0"</div><div class='add'>+"qc.ca\0"</div><div class='add'>+"georgia.museum\0square.museum\0"</div><div class='add'>+"labor.museum\0omasvuotna.no\0cc.la.us\0"</div><div class='add'>+"br.com\0reggioemilia.it\0"</div><div class='add'>+"kristiansund.no\0"</div><div class='add'>+"sorum.no\0"</div><div class='add'>+"orsta.no\0"</div><div class='add'>+"furniture.museum\0surrey.museum\0eng.pro\0"</div><div class='add'>+"asn.lv\0balat.no\0"</div><div class='add'>+"lavangen.no\0sld.pa\0"</div><div class='add'>+"fla.no\0k12.ms.us\0k12.nc.us\0"</div><div class='add'>+"bardu.no\0"</div><div class='add'>+"donostia.museum\0"</div><div class='add'>+"club.tw\0"</div><div class='add'>+"elburg.museum\0"</div><div class='add'>+"gs.hl.no\0lodingen.no\0"</div><div class='add'>+"samara.ru\0"</div><div class='add'>+"vc.it\0*.nagasaki.jp\0"</div><div class='add'>+"fosnes.no\0"</div><div class='add'>+"fuel.aero\0"</div><div class='add'>+"qc.com\0"</div><div class='add'>+"skjervoy.no\0"</div><div class='add'>+"bill.museum\0kv\xc3\xa6""fjord.no\0"</div><div class='add'>+"skydiving.aero\0*.tokushima.jp\0"</div><div class='add'>+"!congresodelalengua3.ar\0laquila.it\0k12.ct.us\0"</div><div class='add'>+"gorge.museum\0linz.museum\0sherbrooke.museum\0"</div><div class='add'>+"tranoy.no\0ing.pa\0"</div><div class='add'>+"ptz.ru\0"</div><div class='add'>+"kr.it\0prato.it\0stat.no\0"</div><div class='add'>+"\xd0\xb8\xd0\xba\xd0\xbe\xd0\xbc.museum\0"</div><div class='add'>+"cosenza.it\0"</div><div class='add'>+"stj\xc3\xb8rdalshalsen.no\0"</div><div class='add'>+"finland.museum\0leka.no\0cc.pr.us\0"</div><div class='add'>+"historichouses.museum\0s\xc3\xa1l\xc3\xa1t.no\0"</div><div class='add'>+"venice.it\0"</div><div class='add'>+"biz.ki\0"</div><div class='add'>+"g\xc3\xa1ls\xc3\xa1.no\0"</div><div class='add'>+"\xe7\xbb\x84\xe7\xbb\x87.hk\0"</div><div class='add'>+"*.yamanashi.jp\0"</div><div class='add'>+"rad\xc3\xb8y.no\0"</div><div class='add'>+"6.bg\0"</div><div class='add'>+"fareast.ru\0"</div><div class='add'>+"paragliding.aero\0ba.it\0aq.it\0"</div><div class='add'>+"sk\xc3\xa5nland.no\0"</div><div class='add'>+"its.me\0"</div><div class='add'>+"us.na\0"</div><div class='add'>+"hl.no\0cc.ga.us\0"</div><div class='add'>+"ac\0granvin.no\0"</div><div class='add'>+"ad\0qld.edu.au\0!city.sapporo.jp\0"</div><div class='add'>+"ae\0"</div><div class='add'>+"af\0"</div><div class='add'>+"ag\0crotone.it\0"</div><div class='add'>+"dallas.museum\0"</div><div class='add'>+"ai\0brussels.museum\0"</div><div class='add'>+"dali.museum\0"</div><div class='add'>+"la.us\0"</div><div class='add'>+"al\0salzburg.museum\0"</div><div class='add'>+"am\0"</div><div class='add'>+"an\0cl.it\0"</div><div class='add'>+"ao\0"</div><div class='add'>+"aq\0ba\0"</div><div class='add'>+"bb\0"</div><div class='add'>+"as\0lajolla.museum\0"</div><div class='add'>+"at\0"</div><div class='add'>+"be\0"</div><div class='add'>+"bf\0inderoy.no\0snz.ru\0"</div><div class='add'>+"aw\0bg\0"</div><div class='add'>+"ax\0bh\0cim.br\0ltd.gi\0biz.mv\0"</div><div class='add'>+"bi\0xz.cn\0\xe7\xb5\x84\xe7\xb9\x94.hk\0biz.mw\0"</div><div class='add'>+"az\0bj\0"</div><div class='add'>+"bm\0tranibarlettaandria.it\0naamesjevuemie.no\0"</div><div class='add'>+"chattanooga.museum\0"</div><div class='add'>+"bo\0"</div><div class='add'>+"l.bg\0"</div><div class='add'>+"ca\0"</div><div class='add'>+"br\0stateofdelaware.museum\0"</div><div class='add'>+"bs\0cc\0"</div><div class='add'>+"cd\0biz.nr\0"</div><div class='add'>+"cf\0berlev\xc3\xa5g.no\0"</div><div class='add'>+"bw\0cg\0snaase.no\0"</div><div class='add'>+"ch\0harvestcelebration.museum\0ck.ua\0"</div><div class='add'>+"by\0ci\0"</div><div class='add'>+"bz\0bahccavuotna.no\0"</div><div class='add'>+"cl\0yuzhno-sakhalinsk.ru\0"</div><div class='add'>+"cm\0halsa.no\0lyngdal.no\0"</div><div class='add'>+"cn\0"</div><div class='add'>+"co\0rn.it\0childrens.museum\0frankfurt.museum\0"</div><div class='add'>+"cr\0"</div><div class='add'>+"pskov.ru\0"</div><div class='add'>+"cu\0de\0"</div><div class='add'>+"cv\0fr.it\0lib.ky.us\0"</div><div class='add'>+"aseral.no\0kvam.no\0"</div><div class='add'>+"cx\0hellas.museum\0"</div><div class='add'>+"hof.no\0"</div><div class='add'>+"cz\0dj\0k12.la.us\0"</div><div class='add'>+"dk\0moscow.museum\0"</div><div class='add'>+"sosnowiec.pl\0"</div><div class='add'>+"dm\0biz.pk\0"</div><div class='add'>+"schokoladen.museum\0biz.pl\0"</div><div class='add'>+"far.br\0arna.no\0tynset.no\0"</div><div class='add'>+"even\xc3\xa1\xc5\xa1\xc5\xa1i.no\0"</div><div class='add'>+"ec\0"</div><div class='add'>+"biz.pr\0"</div><div class='add'>+"ee\0celtic.museum\0"</div><div class='add'>+"scientist.aero\0modern.museum\0"</div><div class='add'>+"pr.us\0"</div><div class='add'>+"dz\0"</div><div class='add'>+"mj\xc3\xb8ndalen.no\0s\xc3\xb8r-odal.no\0"</div><div class='add'>+"!nic.tr\0"</div><div class='add'>+"conference.aero\0vestnes.no\0k12.mn.us\0"</div><div class='add'>+"!pref.hiroshima.jp\0"</div><div class='add'>+"es\0trapani.it\0"</div><div class='add'>+"fermo.it\0vard\xc3\xb8.no\0"</div><div class='add'>+"eu\0gs.hm.no\0r\xc3\xb8""d\xc3\xb8y.no\0stordal.no\0"</div><div class='add'>+"gc.ca\0!nhs.uk\0"</div><div class='add'>+"jgora.pl\0"</div><div class='add'>+"fi\0stjordal.no\0"</div><div class='add'>+"fm\0!mediaphone.om\0"</div><div class='add'>+"kirov.ru\0pvt.k12.ma.us\0"</div><div class='add'>+"fo\0"</div><div class='add'>+"ga\0hyllestad.no\0"</div><div class='add'>+"gov.ac\0fr\0andriabarlettatrani.it\0ga.us\0"</div><div class='add'>+"gov.ae\0gd\0estate.museum\0"</div><div class='add'>+"gov.af\0ge\0tolga.no\0"</div><div class='add'>+"gf\0asso.re\0cc.oh.us\0"</div><div class='add'>+"gg\0florida.museum\0"</div><div class='add'>+"presse.ci\0gh\0"</div><div class='add'>+"gi\0k12.dc.us\0"</div><div class='add'>+"ltd.lk\0orland.no\0"</div><div class='add'>+"gov.al\0"</div><div class='add'>+"gl\0tokke.no\0"</div><div class='add'>+"hanggliding.aero\0gm\0"</div><div class='add'>+"hareid.no\0"</div><div class='add'>+"gov.ba\0tj.cn\0gp\0"</div><div class='add'>+"gov.bb\0gq\0"</div><div class='add'>+"gov.as\0gr\0agrigento.it\0lc.it\0"</div><div class='add'>+"gs\0kalmykia.ru\0aero.tt\0"</div><div class='add'>+"gov.bf\0"</div><div class='add'>+"county.museum\0"</div><div class='add'>+"gov.bh\0hn.cn\0gw\0"</div><div class='add'>+"gov.az\0gy\0assn.lk\0guernsey.museum\0"</div><div class='add'>+"hk\0"</div><div class='add'>+"gov.bm\0h\xc3\xa6gebostad.no\0biz.tj\0"</div><div class='add'>+"hm\0computer.museum\0"</div><div class='add'>+"gov.bo\0hn\0kl\xc3\xa6""bu.no\0"</div><div class='add'>+"pulawy.pl\0"</div><div class='add'>+"gov.br\0"</div><div class='add'>+"trd.br\0gov.bs\0hr\0reggio-calabria.it\0historyofscience.museum\0lipetsk.ru\0"</div><div class='add'>+"gov.cd\0*.nagoya.jp\0"</div><div class='add'>+"ht\0id\0spjelkavik.no\0"</div><div class='add'>+"hu\0ie\0aero.mv\0"</div><div class='add'>+"marketplace.aero\0mn.it\0biz.tt\0"</div><div class='add'>+"gov.by\0saintlouis.museum\0mer\xc3\xa5ker.no\0"</div><div class='add'>+"gov.bz\0"</div><div class='add'>+"7.bg\0gov.cl\0virtual.museum\0"</div><div class='add'>+"gov.cm\0vennesla.no\0kr.ua\0"</div><div class='add'>+"gov.cn\0im\0ar.it\0galsa.no\0rovno.ua\0"</div><div class='add'>+"gov.co\0in\0"</div><div class='add'>+"io\0limanowa.pl\0"</div><div class='add'>+"iq\0k12.ga.us\0"</div><div class='add'>+"ir\0"</div><div class='add'>+"riik.ee\0is\0\xc3\xa1laheadju.no\0"</div><div class='add'>+"gov.cu\0it\0hawaii.museum\0seaport.museum\0"</div><div class='add'>+"je\0pubol.museum\0hm.no\0"</div><div class='add'>+"gov.cx\0"</div><div class='add'>+"*.chiba.jp\0"</div><div class='add'>+"*.kawasaki.jp\0"</div><div class='add'>+"k.se\0"</div><div class='add'>+"gov.dm\0"</div><div class='add'>+"aland.fi\0vik.no\0"</div><div class='add'>+"yk.ca\0jo\0kobierzyce.pl\0"</div><div class='add'>+"jp\0biz.vn\0"</div><div class='add'>+"presse.fr\0lib.il.us\0\xe9\xa6\x99\xe6\xb8\xaf\0"</div><div class='add'>+"gov.ec\0"</div><div class='add'>+"transport.museum\0bronnoy.no\0"</div><div class='add'>+"slg.br\0gov.ee\0asso.nc\0bievat.no\0"</div><div class='add'>+"nyny.museum\0"</div><div class='add'>+"kg\0"</div><div class='add'>+"mo-i-rana.no\0"</div><div class='add'>+"gov.dz\0ki\0"</div><div class='add'>+"monmouth.museum\0"</div><div class='add'>+"suldal.no\0"</div><div class='add'>+"bc.ca\0km\0zt.ua\0"</div><div class='add'>+"pt.it\0kn\0"</div><div class='add'>+"fineart.museum\0"</div><div class='add'>+"la\0"</div><div class='add'>+"kr\0gulen.no\0"</div><div class='add'>+"m.bg\0mo.cn\0lc\0alaheadju.no\0g\xc3\xa1\xc5\x8bgaviika.no\0"</div><div class='add'>+"nowaruda.pl\0cc.ut.us\0"</div><div class='add'>+"br\xc3\xb8nn\xc3\xb8y.no\0"</div><div class='add'>+"ky\0li\0overhalla.no\0"</div><div class='add'>+"kz\0khv.ru\0"</div><div class='add'>+"lk\0"</div><div class='add'>+"artdeco.museum\0"</div><div class='add'>+"ma\0fortworth.museum\0kostroma.ru\0"</div><div class='add'>+"ro.it\0kirkenes.no\0vestby.no\0"</div><div class='add'>+"urbino-pesaro.it\0ls\0mc\0alstahaug.no\0"</div><div class='add'>+"blog.br\0gov.ge\0lt\0md\0"</div><div class='add'>+"lu\0me\0botanicgarden.museum\0"</div><div class='add'>+"gov.gg\0lv\0oh.us\0"</div><div class='add'>+"gov.gh\0mg\0valley.museum\0"</div><div class='add'>+"gov.gi\0mh\0"</div><div class='add'>+"ly\0sandiego.museum\0"</div><div class='add'>+"mk\0"</div><div class='add'>+"ml\0"</div><div class='add'>+"gov.gn\0rollag.no\0naklo.pl\0"</div><div class='add'>+"mn\0"</div><div class='add'>+"mo\0"</div><div class='add'>+"mp\0leirvik.no\0"</div><div class='add'>+"gov.gr\0mq\0na\0cc.ks.us\0"</div><div class='add'>+"mr\0"</div><div class='add'>+"ms\0nc\0"</div><div class='add'>+"valer.hedmark.no\0"</div><div class='add'>+"mu\0ne\0"</div><div class='add'>+"mv\0nf\0"</div><div class='add'>+"mw\0"</div><div class='add'>+"mx\0nord-odal.no\0jur.pro\0"</div><div class='add'>+"my\0"</div><div class='add'>+"gov.hk\0name.hr\0"</div><div class='add'>+"nl\0"</div><div class='add'>+"astronomy.museum\0lib.nm.us\0"</div><div class='add'>+"catania.it\0"</div><div class='add'>+"no\0"</div><div class='add'>+"skjerv\xc3\xb8y.no\0"</div><div class='add'>+"k12.ne.us\0"</div><div class='add'>+"monza-e-della-brianza.it\0!pref.fukushima.jp\0nr\0"</div><div class='add'>+"gov.ie\0"</div><div class='add'>+"stuttgart.museum\0nu\0cc.mn.us\0"</div><div class='add'>+"karasjohka.no\0"</div><div class='add'>+"engine.aero\0bearalvahki.no\0"</div><div class='add'>+"oyer.no\0"</div><div class='add'>+"ve.it\0"</div><div class='add'>+"gov.im\0froland.no\0cc.ar.us\0"</div><div class='add'>+"gov.in\0magadan.ru\0"</div><div class='add'>+"pescara.it\0"</div><div class='add'>+"gov.iq\0usdecorativearts.museum\0"</div><div class='add'>+"gov.ir\0pa\0"</div><div class='add'>+"gov.is\0"</div><div class='add'>+"gov.it\0lavagis.no\0"</div><div class='add'>+"gov.je\0"</div><div class='add'>+"naustdal.no\0pe\0k12.or.us\0"</div><div class='add'>+"gd.cn\0carraramassa.it\0pf\0"</div><div class='add'>+"ph\0"</div><div class='add'>+"cc.ny.us\0"</div><div class='add'>+"rissa.no\0"</div><div class='add'>+"info\0pk\0pomorze.pl\0"</div><div class='add'>+"pl\0"</div><div class='add'>+"gov.jo\0asso.km\0pn\0"</div><div class='add'>+"*.okayama.jp\0cieszyn.pl\0"</div><div class='add'>+"freight.aero\0"</div><div class='add'>+"pr\0"</div><div class='add'>+"narvik.no\0ps\0"</div><div class='add'>+"!pref.aichi.jp\0elverum.no\0pt\0"</div><div class='add'>+"edunet.tn\0"</div><div class='add'>+"gov.kg\0"</div><div class='add'>+"flatanger.no\0marker.no\0pw\0"</div><div class='add'>+"gov.ki\0nuremberg.museum\0"</div><div class='add'>+"aip.ee\0"</div><div class='add'>+"gov.km\0"</div><div class='add'>+"gov.kn\0"</div><div class='add'>+"gov.kp\0"</div><div class='add'>+"rieti.it\0gov.la\0bajddar.no\0"</div><div class='add'>+"gov.lb\0aviation.museum\0"</div><div class='add'>+"gov.lc\0"</div><div class='add'>+"asso.mc\0"</div><div class='add'>+"re\0"</div><div class='add'>+"ut.us\0"</div><div class='add'>+"sa.gov.au\0gov.ky\0"</div><div class='add'>+"mo.it\0gov.kz\0"</div><div class='add'>+"gov.lk\0"</div><div class='add'>+"iraq.museum\0"</div><div class='add'>+"badajoz.museum\0"</div><div class='add'>+"8.bg\0inder\xc3\xb8y.no\0"</div><div class='add'>+"monticello.museum\0ro\0ks.ua\0"</div><div class='add'>+"gov.ma\0svizzera.museum\0"</div><div class='add'>+"gov.lr\0sa\0"</div><div class='add'>+"matera.it\0sb\0"</div><div class='add'>+"gov.lt\0rs\0sc\0"</div><div class='add'>+"gov.me\0sd\0"</div><div class='add'>+"gov.lv\0ru\0se\0"</div><div class='add'>+"gov.mg\0"</div><div class='add'>+"rw\0sg\0"</div><div class='add'>+"gov.ly\0assisi.museum\0kids.museum\0sh\0"</div><div class='add'>+"si\0"</div><div class='add'>+"gov.mk\0"</div><div class='add'>+"gov.ml\0sk\0"</div><div class='add'>+"sl\0"</div><div class='add'>+"gov.mn\0airguard.museum\0sm\0"</div><div class='add'>+"gov.mo\0l.se\0sn\0"</div><div class='add'>+"so\0"</div><div class='add'>+"gov.mr\0ks.us\0"</div><div class='add'>+"name.az\0sr\0"</div><div class='add'>+"naturhistorisches.museum\0tc\0"</div><div class='add'>+"trainer.aero\0cn.it\0urbinopesaro.it\0gov.mu\0nativeamerican.museum\0st\0td\0"</div><div class='add'>+"gov.mv\0su\0"</div><div class='add'>+"trentino.it\0gov.mw\0gov.ng\0tf\0"</div><div class='add'>+"tg\0"</div><div class='add'>+"co.ae\0venezia.it\0gov.my\0th\0"</div><div class='add'>+"!pref.ehime.jp\0sy\0"</div><div class='add'>+"co.ag\0lewismiller.museum\0ostrowiec.pl\0sz\0tj\0"</div><div class='add'>+"tk\0"</div><div class='add'>+"motorcycle.museum\0tl\0"</div><div class='add'>+"birdart.museum\0trogstad.no\0tm\0"</div><div class='add'>+"tn\0"</div><div class='add'>+"humanities.museum\0to\0"</div><div class='add'>+"pu.it\0gov.nr\0ua\0lib.ut.us\0"</div><div class='add'>+"co.ao\0"</div><div class='add'>+"co.ba\0trondheim.no\0tt\0"</div><div class='add'>+"in-addr.arpa\0tempioolbia.it\0!city.yokohama.jp\0mn.us\0"</div><div class='add'>+"n.bg\0schoenbrunn.museum\0tv\0"</div><div class='add'>+"co.at\0aremark.no\0tw\0ug\0"</div><div class='add'>+"jus.br\0"</div><div class='add'>+"co.bi\0bialowieza.pl\0ar.us\0"</div><div class='add'>+"audnedaln.no\0kustanai.ru\0"</div><div class='add'>+"va\0"</div><div class='add'>+"us\0vc\0"</div><div class='add'>+"newport.museum\0"</div><div class='add'>+"kopervik.no\0gov.ph\0vg\0"</div><div class='add'>+"ny.us\0vi\0"</div><div class='add'>+"co.bw\0finn\xc3\xb8y.no\0gov.pk\0uz\0"</div><div class='add'>+"honefoss.no\0gov.pl\0lanbib.se\0"</div><div class='add'>+"co.ci\0"</div><div class='add'>+"gov.pn\0intl.tn\0"</div><div class='add'>+"act.gov.au\0vn\0"</div><div class='add'>+"television.museum\0gov.pr\0"</div><div class='add'>+"sykkylven.no\0v\xc3\xa5ler.hedmark.no\0gov.ps\0"</div><div class='add'>+"gov.pt\0"</div><div class='add'>+"co.cr\0vu\0"</div><div class='add'>+"legnica.pl\0"</div><div class='add'>+"sa.au\0"</div><div class='add'>+"bjarkoy.no\0"</div><div class='add'>+"openair.museum\0birkenes.no\0lib.nj.us\0"</div><div class='add'>+"fylkesbibl.no\0holt\xc3\xa5len.no\0"</div><div class='add'>+"iz.hr\0"</div><div class='add'>+"ws\0"</div><div class='add'>+"oceanographique.museum\0"</div><div class='add'>+"b\xc3\xa1id\xc3\xa1r.no\0cc.mo.us\0"</div><div class='add'>+"\xc3\xb8ygarden.no\0"</div><div class='add'>+"contemporary.museum\0"</div><div class='add'>+"gb.com\0cc.as.us\0"</div><div class='add'>+"belluno.it\0gov.sa\0"</div><div class='add'>+"gov.sb\0"</div><div class='add'>+"gov.rs\0gov.sc\0"</div><div class='add'>+"gov.sd\0"</div><div class='add'>+"!pref.nagasaki.jp\0gov.ru\0"</div><div class='add'>+"asia\0"</div><div class='add'>+"sa.cr\0gov.rw\0gov.sg\0"</div><div class='add'>+"kuzbass.ru\0"</div><div class='add'>+"gs.vf.no\0"</div><div class='add'>+"gov.sl\0"</div><div class='add'>+"norfolk.museum\0"</div><div class='add'>+"k12.de.us\0"</div><div class='add'>+"mil\0"</div><div class='add'>+"rendalen.no\0"</div><div class='add'>+"gov.st\0"</div><div class='add'>+"agro.pl\0"</div><div class='add'>+"orkdal.no\0"</div><div class='add'>+"le.it\0gov.sy\0"</div><div class='add'>+"gov.tj\0"</div><div class='add'>+"co.gg\0nore-og-uvdal.no\0v\xc3\xa5ler.\xc3\xb8stfold.no\0"</div><div class='add'>+"gov.tl\0"</div><div class='add'>+"gov.tn\0"</div><div class='add'>+"gov.to\0"</div><div class='add'>+"kids.us\0"</div><div class='add'>+"equipment.aero\0gov.ua\0"</div><div class='add'>+"!city.niigata.jp\0gov.tt\0"</div><div class='add'>+"sel.no\0"</div><div class='add'>+"l\xc3\xa4ns.museum\0"</div><div class='add'>+"gov.tw\0"</div><div class='add'>+"rennebu.no\0"</div><div class='add'>+"egersund.no\0"</div><div class='add'>+"medecin.km\0"</div><div class='add'>+"co.gy\0"</div><div class='add'>+"!mecon.ar\0"</div><div class='add'>+"berlin.museum\0"</div><div class='add'>+"carrara-massa.it\0"</div><div class='add'>+"9.bg\0"</div><div class='add'>+"pri.ee\0gov.vc\0"</div><div class='add'>+"at.it\0"</div><div class='add'>+"muosat.no\0"</div><div class='add'>+"co.id\0"</div><div class='add'>+"co.hu\0"</div><div class='add'>+"etne.no\0"</div><div class='add'>+"\xc3\xa1lt\xc3\xa1.no\0"</div><div class='add'>+"gov.vn\0"</div><div class='add'>+"modelling.aero\0"</div><div class='add'>+"co.im\0"</div><div class='add'>+"co.in\0\xc3\xa5krehamn.no\0m.se\0"</div><div class='add'>+"gouv.fr\0*.kitakyushu.jp\0"</div><div class='add'>+"narviika.no\0"</div><div class='add'>+"rennes\xc3\xb8y.no\0"</div><div class='add'>+"co.ir\0afjord.no\0"</div><div class='add'>+"lea\xc5\x8bgaviika.no\0buryatia.ru\0"</div><div class='add'>+"co.it\0coastaldefence.museum\0"</div><div class='add'>+"co.je\0vf.no\0"</div><div class='add'>+"osteroy.no\0"</div><div class='add'>+"uslivinghistory.museum\0"</div><div class='add'>+"aerobatic.aero\0"</div><div class='add'>+"mesaverde.museum\0mining.museum\0"</div><div class='add'>+"a\xc3\xa9roport.ci\0gov.ws\0"</div><div class='add'>+"co.jp\0copenhagen.museum\0"</div><div class='add'>+"pv.it\0"</div><div class='add'>+"r\xc3\xb8mskog.no\0"</div><div class='add'>+"vossevangen.no\0porsanger.no\0"</div><div class='add'>+"salat.no\0mo.us\0"</div><div class='add'>+"o.bg\0imperia.it\0carrier.museum\0"</div><div class='add'>+"carbonia-iglesias.it\0"</div><div class='add'>+"as.us\0"</div><div class='add'>+"alvdal.no\0"</div><div class='add'>+"state.museum\0mandal.no\0cn.ua\0"</div><div class='add'>+"cuneo.it\0"</div><div class='add'>+"gouv.ht\0"</div><div class='add'>+"!city.okayama.jp\0co.kr\0"</div><div class='add'>+"co.lc\0"</div><div class='add'>+"sa.it\0"</div><div class='add'>+"donna.no\0"</div><div class='add'>+"sortland.no\0"</div><div class='add'>+"tomsk.ru\0"</div><div class='add'>+"birthplace.museum\0l\xc3\xb8""dingen.no\0"</div><div class='add'>+"ge.it\0orenburg.ru\0"</div><div class='add'>+"cn.com\0"</div><div class='add'>+"co.ma\0"</div><div class='add'>+"co.ls\0skaun.no\0name.vn\0"</div><div class='add'>+"navigation.aero\0"</div><div class='add'>+"cagliari.it\0co.me\0portal.museum\0"</div><div class='add'>+"gouv.bj\0"</div><div class='add'>+"udine.it\0"</div><div class='add'>+"engineer.aero\0"</div><div class='add'>+"szczecin.pl\0"</div><div class='add'>+"wales.museum\0"</div><div class='add'>+"co.na\0bo.telemark.no\0"</div><div class='add'>+"austin.museum\0"</div><div class='add'>+"k12.mo.us\0"</div><div class='add'>+"co.mu\0"</div><div class='add'>+"gouv.ci\0"</div><div class='add'>+"co.mw\0"</div><div class='add'>+"esp.br\0"</div><div class='add'>+"naturalhistorymuseum.museum\0"</div><div class='add'>+"mosjoen.no\0"</div><div class='add'>+"solund.no\0"</div><div class='add'>+"name.tj\0"</div><div class='add'>+"sand\xc3\xb8y.no\0"</div><div class='add'>+"kunstunddesign.museum\0"</div><div class='add'>+"cartoonart.museum\0collection.museum\0gsm.pl\0"</div><div class='add'>+"aure.no\0"</div><div class='add'>+"!pref.yamaguchi.jp\0historical.museum\0"</div><div class='add'>+"name.tt\0"</div><div class='add'>+"england.museum\0valle.no\0"</div><div class='add'>+"cc.ok.us\0"</div><div class='add'>+"salangen.no\0"</div><div class='add'>+"gloppen.no\0"</div><div class='add'>+"cc.co.us\0"</div><div class='add'>+"contemporaryart.museum\0"</div><div class='add'>+"tas.edu.au\0"</div><div class='add'>+"trading.aero\0"</div><div class='add'>+"mazury.pl\0"</div><div class='add'>+"!pref.aomori.jp\0co.pl\0"</div><div class='add'>+"opoczno.pl\0"</div><div class='add'>+"*.kobe.jp\0co.pn\0"</div><div class='add'>+"oppegard.no\0"</div><div class='add'>+"co.pw\0"</div><div class='add'>+"saltdal.no\0smolensk.ru\0"</div><div class='add'>+"na.it\0\xc4\x8d\xc3\xa1hcesuolo.no\0"</div><div class='add'>+"vgs.no\0evenassi.no\0"</div><div class='add'>+"parachuting.aero\0jl.cn\0maritime.museum\0bd.se\0"</div><div class='add'>+"badaddja.no\0"</div><div class='add'>+"bergen.no\0"</div><div class='add'>+"brussel.museum\0"</div><div class='add'>+"avoues.fr\0"</div><div class='add'>+"cesenaforli.it\0"</div><div class='add'>+"oregontrail.museum\0"</div><div class='add'>+"ullensaker.no\0"</div><div class='add'>+"jobs\0"</div><div class='add'>+"accident-prevention.aero\0"</div><div class='add'>+"n.se\0"</div><div class='add'>+"association.museum\0california.museum\0"</div><div class='add'>+"cultural.museum\0co.rs\0"</div><div class='add'>+"zoology.museum\0"</div><div class='add'>+"pruszkow.pl\0"</div><div class='add'>+"control.aero\0nt.edu.au\0net\0komforb.se\0"</div><div class='add'>+"lincoln.museum\0aurland.no\0name.pr\0co.rw\0"</div><div class='add'>+"ostroleka.pl\0"</div><div class='add'>+"isernia.it\0"</div><div class='add'>+"tm.fr\0"</div><div class='add'>+"gs.ol.no\0"</div><div class='add'>+"nb.ca\0marnardal.no\0"</div><div class='add'>+"williamsburg.museum\0"</div><div class='add'>+"!jet.uk\0"</div><div class='add'>+"suisse.museum\0\xc3\xa5""fjord.no\0flakstad.no\0"</div><div class='add'>+"karmoy.no\0"</div><div class='add'>+"yn.cn\0chesapeakebay.museum\0"</div><div class='add'>+"nsw.au\0"</div><div class='add'>+"amur.ru\0co.st\0"</div><div class='add'>+"imb.br\0siellak.no\0\xe7\xb6\xb2\xe8\xb7\xaf.tw\0"</div><div class='add'>+"name.na\0"</div><div class='add'>+"co.th\0"</div><div class='add'>+"p.bg\0"</div><div class='add'>+"co.sz\0co.tj\0"</div><div class='add'>+"name.mv\0\xc3\xa5lesund.no\0lib.in.us\0"</div><div class='add'>+"lucerne.museum\0naumburg.museum\0"</div><div class='add'>+"society.museum\0name.my\0"</div><div class='add'>+"tinn.no\0"</div><div class='add'>+"co.tt\0"</div><div class='add'>+"unj\xc3\xa1rga.no\0"</div><div class='add'>+"co.ug\0"</div><div class='add'>+"lib.wy.us\0"</div><div class='add'>+"co.tz\0"</div><div class='add'>+"ass.km\0"</div><div class='add'>+"ok.us\0"</div><div class='add'>+"tm.hu\0kongsvinger.no\0"</div><div class='add'>+"ibestad.no\0"</div><div class='add'>+"juedisches.museum\0co.us\0"</div><div class='add'>+"cq.cn\0"</div><div class='add'>+"rs.ba\0"</div><div class='add'>+"wa.edu.au\0co.vi\0"</div><div class='add'>+"co.uz\0"</div><div class='add'>+"health.museum\0"</div><div class='add'>+"grue.no\0"</div><div class='add'>+"automotive.museum\0journalism.museum\0settlement.museum\0"</div><div class='add'>+"qh.cn\0interactive.museum\0"</div><div class='add'>+"snillfjord.no\0!national-library-scotland.uk\0"</div><div class='add'>+"balsfjord.no\0lib.nh.us\0"</div><div class='add'>+"kolobrzeg.pl\0"</div><div class='add'>+"gs.tm.no\0"</div><div class='add'>+"h\xc3\xb8nefoss.no\0"</div><div class='add'>+"ol.no\0"</div><div class='add'>+"music.museum\0moareke.no\0"</div><div class='add'>+"b\xc3\xb8.nordland.no\0"</div><div class='add'>+"name.mk\0lier.no\0"</div><div class='add'>+"eidfjord.no\0"</div><div class='add'>+"sc.cn\0tm.km\0"</div><div class='add'>+"jelenia-gora.pl\0sanok.pl\0"</div><div class='add'>+"intelligence.museum\0"</div><div class='add'>+"srv.br\0elblag.pl\0"</div><div class='add'>+"judygarland.museum\0"</div><div class='add'>+"padua.it\0"</div><div class='add'>+"k12.co.us\0"</div><div class='add'>+"lindesnes.no\0"</div><div class='add'>+"name.jo\0izhevsk.ru\0"</div><div class='add'>+"yorkshire.museum\0mel\xc3\xb8y.no\0"</div><div class='add'>+"tm.mc\0lib.pr.us\0"</div><div class='add'>+"hjartdal.no\0"</div><div class='add'>+"tm.mg\0"</div><div class='add'>+"bari.it\0milano.it\0"</div><div class='add'>+"lg.jp\0"</div><div class='add'>+"zgrad.ru\0"</div><div class='add'>+"sm\xc3\xb8la.no\0"</div><div class='add'>+"communications.museum\0"</div><div class='add'>+"arts.co\0seoul.kr\0engerdal.no\0"</div><div class='add'>+"oster\xc3\xb8y.no\0"</div><div class='add'>+"\xe6\x95\x8e\xe8\x82\xb2.hk\0foggia.it\0verran.no\0"</div><div class='add'>+"orskog.no\0voronezh.ru\0kv.ua\0"</div><div class='add'>+"av.it\0"</div><div class='add'>+"tm.no\0nissedal.no\0"</div><div class='add'>+"historisches.museum\0gs.mr.no\0"</div><div class='add'>+"medecin.fr\0"</div><div class='add'>+"montreal.museum\0"</div><div class='add'>+"o.se\0"</div><div class='add'>+"!metro.tokyo.jp\0sola.no\0"</div><div class='add'>+"k12.tn.us\0"</div><div class='add'>+"floro.no\0"</div><div class='add'>+"milan.it\0*.shiga.jp\0"</div><div class='add'>+"berkeley.museum\0"</div><div class='add'>+"maintenance.aero\0"</div><div class='add'>+"ws.na\0"</div><div class='add'>+"lindas.no\0cc.ia.us\0"</div><div class='add'>+"brescia.it\0embroidery.museum\0"</div><div class='add'>+"arezzo.it\0tm.pl\0"</div><div class='add'>+"r\xc3\xa6lingen.no\0"</div><div class='add'>+"burghof.museum\0"</div><div class='add'>+"rec.br\0"</div><div class='add'>+"q.bg\0"</div><div class='add'>+"!nawras.om\0"</div><div class='add'>+"hammarfeasta.no\0"</div><div class='add'>+"moss.no\0"</div><div class='add'>+"on.ca\0"</div><div class='add'>+"gouv.rw\0"</div><div class='add'>+"luxembourg.museum\0"</div><div class='add'>+"rec.co\0british.museum\0"</div><div class='add'>+"reggio-emilia.it\0"</div><div class='add'>+"gouv.sn\0lib.wv.us\0"</div><div class='add'>+"avocat.fr\0"</div><div class='add'>+"simbirsk.ru\0"</div><div class='add'>+"jar.ru\0"</div><div class='add'>+"monza-brianza.it\0"</div><div class='add'>+"tm.ro\0"</div><div class='add'>+"imageandsound.museum\0"</div><div class='add'>+"jpn.com\0mr.no\0"</div><div class='add'>+"siracusa.it\0"</div><div class='add'>+"norilsk.ru\0tm.se\0"</div><div class='add'>+"tn.it\0"</div><div class='add'>+"jeju.kr\0"</div><div class='add'>+"!pref.fukuoka.jp\0"</div><div class='add'>+"*.hyogo.jp\0portlligat.museum\0"</div><div class='add'>+"!pref.osaka.jp\0"</div><div class='add'>+"siena.it\0sc.kr\0omaha.museum\0saskatchewan.museum\0"</div><div class='add'>+"phoenix.museum\0vanylven.no\0"</div><div class='add'>+"botanicalgarden.museum\0"</div><div class='add'>+"turek.pl\0"</div><div class='add'>+"vagsoy.no\0"</div><div class='add'>+"riodejaneiro.museum\0"</div><div class='add'>+"vi.it\0"</div><div class='add'>+"uy.com\0"</div><div class='add'>+"kristiansand.no\0"</div><div class='add'>+"sd.cn\0trento.it\0"</div><div class='add'>+"muncie.museum\0"</div><div class='add'>+"berg.no\0meldal.no\0"</div><div class='add'>+"nes.buskerud.no\0"</div><div class='add'>+"saratov.ru\0"</div><div class='add'>+"gs.oslo.no\0"</div><div class='add'>+"harstad.no\0vaga.no\0"</div><div class='add'>+"research.museum\0"</div><div class='add'>+"brunel.museum\0ia.us\0"</div><div class='add'>+"test.tj\0"</div><div class='add'>+"columbia.museum\0"</div><div class='add'>+"ms.it\0stockholm.museum\0"</div><div class='add'>+"reklam.hu\0"</div><div class='add'>+"pomorskie.pl\0lg.ua\0"</div><div class='add'>+"bg.it\0historicalsociety.museum\0rns.tn\0"</div><div class='add'>+"mallorca.museum\0surgut.ru\0cc.sc.us\0"</div><div class='add'>+"ushistory.museum\0"</div><div class='add'>+"palana.ru\0"</div><div class='add'>+"snoasa.no\0"</div><div class='add'>+"naturalsciences.museum\0"</div><div class='add'>+"yaroslavl.ru\0"</div><div class='add'>+"unjarga.no\0"</div><div class='add'>+"p.se\0"</div><div class='add'>+"ingatlan.hu\0"</div><div class='add'>+"irc.pl\0"</div><div class='add'>+"savona.it\0"</div><div class='add'>+"cr.it\0"</div><div class='add'>+"test.ru\0cc.tn.us\0"</div><div class='add'>+"ms.kr\0museumvereniging.museum\0"</div><div class='add'>+"time.no\0k12.ia.us\0"</div><div class='add'>+"vladimir.ru\0"</div><div class='add'>+"correios-e-telecomunica\xc3\xa7\xc3\xb5""es.museum\0"</div><div class='add'>+"gouv.km\0nationalfirearms.museum\0"</div><div class='add'>+"m\xc3\xa1latvuopmi.no\0"</div><div class='add'>+"aero\0yosemite.museum\0"</div><div class='add'>+"r.bg\0school.na\0"</div><div class='add'>+"cc.vi.us\0"</div><div class='add'>+"*.wakayama.jp\0"</div><div class='add'>+"beauxarts.museum\0averoy.no\0ullensvang.no\0bar.pro\0"</div><div class='add'>+"!city.hiroshima.jp\0"</div><div class='add'>+"b\xc3\xa1hccavuotna.no\0"</div><div class='add'>+"frosta.no\0"</div><div class='add'>+"gdynia.pl\0"</div><div class='add'>+"medical.museum\0"</div><div class='add'>+"embaixada.st\0"</div><div class='add'>+"balsan.it\0vantaa.museum\0"</div><div class='add'>+"za.net\0"</div><div class='add'>+"!city.saitama.jp\0lib.ks.us\0"</div><div class='add'>+"fnd.br\0"</div><div class='add'>+"ru.com\0se.com\0hol.no\0modalen.no\0"</div><div class='add'>+"gouv.ml\0chukotka.ru\0"</div><div class='add'>+"malopolska.pl\0"</div><div class='add'>+"mansion.museum\0"</div><div class='add'>+"iki.fi\0children.museum\0"</div><div class='add'>+"cyber.museum\0rec.nf\0mo\xc3\xa5reke.no\0"</div><div class='add'>+"to.it\0"</div><div class='add'>+"hasvik.no\0"</div><div class='add'>+"\xc3\xb8yer.no\0"</div><div class='add'>+"arts.ro\0sc.ug\0"</div><div class='add'>+"lib.ar.us\0"</div><div class='add'>+"sc.tz\0cc.ms.us\0cc.nc.us\0"</div><div class='add'>+"etc.br\0poznan.pl\0"</div><div class='add'>+"cnt.br\0viking.museum\0"</div><div class='add'>+"*.miyazaki.jp\0"</div><div class='add'>+"melhus.no\0"</div><div class='add'>+"skodje.no\0vevelstad.no\0"</div><div class='add'>+"sc.us\0"</div><div class='add'>+"upow.gov.pl\0"</div><div class='add'>+"!city.fukuoka.jp\0brandywinevalley.museum\0natuurwetenschappen.museum\0tranby.no\0"</div><div class='add'>+"bahn.museum\0msk.ru\0"</div><div class='add'>+"delmenhorst.museum\0"</div><div class='add'>+"russia.museum\0fuoisku.no\0"</div><div class='add'>+"shell.museum\0"</div><div class='add'>+"r\xc3\xa1isa.no\0"</div><div class='add'>+"hs.kr\0udmurtia.ru\0"</div><div class='add'>+"palermo.it\0"</div><div class='add'>+"pilot.aero\0"</div><div class='add'>+"tn.us\0"</div><div class='add'>+"priv.hu\0"</div><div class='add'>+"li.it\0"</div><div class='add'>+"kr\xc3\xa5""anghke.no\0mosreg.ru\0"</div><div class='add'>+"lib.fl.us\0"</div><div class='add'>+"plants.museum\0"</div><div class='add'>+"ulsan.kr\0national.museum\0"</div><div class='add'>+"mil.ac\0!pref.nara.jp\0surgeonshall.museum\0"</div><div class='add'>+"mil.ae\0santacruz.museum\0vi.us\0"</div><div class='add'>+"wlocl.pl\0"</div><div class='add'>+"mt.it\0napoli.it\0alaska.museum\0arts.nf\0"</div><div class='add'>+"missoula.museum\0"</div><div class='add'>+"rec.ro\0"</div><div class='add'>+"mil.al\0"</div><div class='add'>+"marburg.museum\0waw.pl\0"</div><div class='add'>+"pharmaciens.km\0indianapolis.museum\0larsson.museum\0"</div><div class='add'>+"cc.sd.us\0"</div><div class='add'>+"mil.ba\0mobi\0"</div><div class='add'>+"indianmarket.museum\0"</div><div class='add'>+"recreation.aero\0padova.it\0"</div><div class='add'>+"varese.it\0parti.se\0"</div><div class='add'>+"mil.az\0"</div><div class='add'>+"mil.bo\0!pref.kagoshima.jp\0khmelnitskiy.ua\0"</div><div class='add'>+"rygge.no\0"</div><div class='add'>+"os\xc3\xb8yro.no\0"</div><div class='add'>+"mil.br\0"</div><div class='add'>+"cs.it\0"</div><div class='add'>+"austevoll.no\0fjell.no\0"</div><div class='add'>+"mil.by\0"</div><div class='add'>+"!pref.tokushima.jp\0org\0"</div><div class='add'>+"mil.cn\0gs.svalbard.no\0"</div><div class='add'>+"mil.co\0"</div><div class='add'>+"pz.it\0lib.va.us\0\xd1\x80\xd1\x84\0"</div><div class='add'>+"\xe4\xb8\xaa\xe4\xba\xba.hk\0ms.us\0nc.us\0k12.wi.us\0"</div><div class='add'>+"s.bg\0drangedal.no\0"</div><div class='add'>+"en.it\0"</div><div class='add'>+"culturalcenter.museum\0"</div><div class='add'>+"house.museum\0divttasvuotna.no\0"</div><div class='add'>+"fhs.no\0"</div><div class='add'>+"circus.museum\0"</div><div class='add'>+"priv.at\0"</div><div class='add'>+"mil.ec\0"</div><div class='add'>+"ruovat.no\0"</div><div class='add'>+"midsund.no\0vagan.no\0"</div><div class='add'>+"casadelamoneda.museum\0"</div><div class='add'>+"bristol.museum\0"</div><div class='add'>+"and.museum\0"</div><div class='add'>+"ascolipiceno.it\0computerhistory.museum\0vyatka.ru\0"</div><div class='add'>+"uhren.museum\0"</div><div class='add'>+"lahppi.no\0"</div><div class='add'>+"*.yokohama.jp\0cody.museum\0lib.al.us\0"</div><div class='add'>+"colonialwilliamsburg.museum\0indian.museum\0cc.ky.us\0"</div><div class='add'>+"tp.it\0biev\xc3\xa1t.no\0"</div><div class='add'>+"can.br\0royken.no\0"</div><div class='add'>+"id.ir\0"</div><div class='add'>+"mediocampidano.it\0tromso.no\0"</div><div class='add'>+"kartuzy.pl\0k12.ok.us\0"</div><div class='add'>+"*.saitama.jp\0stjohn.museum\0m\xc3\xa1tta-v\xc3\xa1rjjat.no\0"</div><div class='add'>+"mil.ge\0trani-barletta-andria.it\0"</div><div class='add'>+"lib.as.us\0"</div><div class='add'>+"swiebodzin.pl\0cc.mt.us\0cc.nd.us\0"</div><div class='add'>+"mil.gh\0"</div><div class='add'>+"science-fiction.museum\0\xd9\x82\xd8\xb7\xd8\xb1\0"</div><div class='add'>+"airtraffic.aero\0"</div><div class='add'>+"konskowola.pl\0"</div><div class='add'>+"scienceandhistory.museum\0nysa.pl\0sd.us\0"</div><div class='add'>+"balestrand.no\0"</div><div class='add'>+"oygarden.no\0"</div><div class='add'>+"her\xc3\xb8y.nordland.no\0"</div><div class='add'>+"!pref.ishikawa.jp\0strand.no\0"</div><div class='add'>+"\xe7\xb5\x84\xe7\xbb\x87.hk\0mil.hn\0"</div><div class='add'>+"gob.bo\0volda.no\0"</div><div class='add'>+"losangeles.museum\0larvik.no\0"</div><div class='add'>+"university.museum\0"</div><div class='add'>+"cc.dc.us\0"</div><div class='add'>+"mil.id\0"</div><div class='add'>+"sorfold.no\0"</div><div class='add'>+"watch-and-clock.museum\0"</div><div class='add'>+"flor\xc3\xb8.no\0"</div><div class='add'>+"nittedal.no\0oppeg\xc3\xa5rd.no\0"</div><div class='add'>+"k12.ri.us\0"</div><div class='add'>+"gob.cl\0"</div><div class='add'>+"komi.ru\0"</div><div class='add'>+"government.aero\0mil.in\0"</div><div class='add'>+"mil.iq\0id.lv\0"</div><div class='add'>+"culture.museum\0"</div><div class='add'>+"id.ly\0"</div><div class='add'>+"raholt.no\0"</div><div class='add'>+"lubin.pl\0grozny.ru\0"</div><div class='add'>+"kchr.ru\0"</div><div class='add'>+"nikolaev.ua\0"</div><div class='add'>+"lib.sd.us\0"</div><div class='add'>+"de.com\0"</div><div class='add'>+"mil.jo\0"</div><div class='add'>+"*.kanagawa.jp\0gaular.no\0miasta.pl\0"</div><div class='add'>+"bi.it\0rnu.tn\0uzhgorod.ua\0"</div><div class='add'>+"idrett.no\0v\xc3\xa5gs\xc3\xb8y.no\0"</div><div class='add'>+"wroclaw.pl\0"</div><div class='add'>+"res.aero\0ne.jp\0mil.kg\0"</div><div class='add'>+"\xc3\xa5mli.no\0"</div><div class='add'>+"education.museum\0"</div><div class='add'>+"dgca.aero\0"</div><div class='add'>+"mil.km\0"</div><div class='add'>+"trolley.museum\0"</div><div class='add'>+"cci.fr\0r.se\0"</div><div class='add'>+"archaeological.museum\0"</div><div class='add'>+"monzaedellabrianza.it\0mil.kr\0"</div><div class='add'>+"gob.es\0kvafjord.no\0ky.us\0"</div><div class='add'>+"lecco.it\0"</div><div class='add'>+"ct.it\0"</div><div class='add'>+"magazine.aero\0"</div><div class='add'>+"operaunite.com\0ne.kr\0"</div><div class='add'>+"mil.kz\0skoczow.pl\0"</div><div class='add'>+"nf.ca\0"</div><div class='add'>+"western.museum\0"</div><div class='add'>+"kunst.museum\0gaivuotna.no\0karpacz.pl\0spb.ru\0cc.id.us\0"</div><div class='add'>+"slask.pl\0"</div><div class='add'>+"youth.museum\0"</div><div class='add'>+"adv.br\0campidanomedio.it\0!songfest.om\0"</div><div class='add'>+"geelvinck.museum\0\xd8\xa7\xd9\x85\xd8\xa7\xd8\xb1\xd8\xa7\xd8\xaa\0"</div><div class='add'>+"mil.lv\0"</div><div class='add'>+"fie.ee\0mil.mg\0mt.us\0nd.us\0k12.vt.us\0"</div><div class='add'>+"t.bg\0ushuaia.museum\0"</div><div class='add'>+"off.ai\0"</div><div class='add'>+"irkutsk.ru\0"</div><div class='add'>+"stor-elvdal.no\0tourism.tn\0"</div><div class='add'>+"penza.ru\0"</div><div class='add'>+"bj.cn\0\xe4\xb8\xad\xe5\x9b\xbd\0"</div><div class='add'>+"civilwar.museum\0mil.mv\0opole.pl\0"</div><div class='add'>+"nes.akershus.no\0"</div><div class='add'>+"mil.my\0karelia.ru\0"</div><div class='add'>+"como.it\0sande.vestfold.no\0"</div><div class='add'>+"\xe4\xb8\xad\xe5\x9c\x8b\0"</div><div class='add'>+"gob.hn\0lib.la.us\0"</div><div class='add'>+"mil.no\0cc.wv.us\0"</div><div class='add'>+"boleslawiec.pl\0"</div><div class='add'>+"!pref.niigata.jp\0gs.sf.no\0dc.us\0k12.mi.us\0"</div><div class='add'>+"museum\0dep.no\0kv\xc3\xa6nangen.no\0l\xc3\xa1hppi.no\0"</div><div class='add'>+"film.museum\0"</div><div class='add'>+"frei.no\0"</div><div class='add'>+"notodden.no\0risor.no\0"</div><div class='add'>+"messina.it\0"</div><div class='add'>+"eidsberg.no\0"</div><div class='add'>+"krakow.pl\0lib.mt.us\0lib.nd.us\0"</div><div class='add'>+"rauma.no\0"</div><div class='add'>+"mulhouse.museum\0"</div><div class='add'>+"sibenik.museum\0grong.no\0mil.pe\0"</div><div class='add'>+"budejju.no\0k12.nv.us\0"</div><div class='add'>+"stavanger.no\0mil.ph\0"</div><div class='add'>+"forli-cesena.it\0"</div><div class='add'>+"naples.it\0cc.ne.us\0"</div><div class='add'>+"s\xc3\xb8r-aurdal.no\0"</div><div class='add'>+"mil.pl\0"</div><div class='add'>+"vibo-valentia.it\0ski.museum\0siedlce.pl\0"</div><div class='add'>+"bus.museum\0"</div><div class='add'>+"tozsde.hu\0"</div><div class='add'>+"!pref.shizuoka.jp\0santabarbara.museum\0"</div><div class='add'>+"zhitomir.ua\0"</div><div class='add'>+"pro.az\0"</div><div class='add'>+"ne.pw\0"</div><div class='add'>+"pro.br\0orkanger.no\0b\xc3\xb8.telemark.no\0"</div><div class='add'>+"roma.it\0cc.ct.us\0"</div><div class='add'>+"heritage.museum\0giske.no\0"</div><div class='add'>+"!pref.kumamoto.jp\0prof.pr\0"</div><div class='add'>+"*.kochi.jp\0"</div><div class='add'>+"andria-barletta-trani.it\0*.toyama.jp\0sveio.no\0"</div><div class='add'>+"id.us\0"</div><div class='add'>+"bolt.hu\0"</div><div class='add'>+"fetsund.no\0porsgrunn.no\0"</div><div class='add'>+"iglesias-carbonia.it\0"</div><div class='add'>+"sf.no\0"</div><div class='add'>+"mil.ru\0"</div><div class='add'>+"from.hr\0asnes.no\0mil.rw\0"</div><div class='add'>+"alesund.no\0sos.pl\0"</div><div class='add'>+"livorno.it\0"</div><div class='add'>+"crafts.museum\0"</div><div class='add'>+"aquila.it\0"</div><div class='add'>+"vega.no\0"</div><div class='add'>+"jewelry.museum\0"</div><div class='add'>+"sk\xc3\xa1nit.no\0chita.ru\0"</div><div class='add'>+"pro.ec\0"</div><div class='add'>+"fortmissoula.museum\0j\xc3\xb8lster.no\0"</div><div class='add'>+"pro\0mil.st\0"</div><div class='add'>+"busan.kr\0lib.ga.us\0"</div><div class='add'>+"dellogliastra.it\0"</div><div class='add'>+"aosta.it\0chungnam.kr\0gob.mx\0"</div><div class='add'>+"mil.sy\0k12.hi.us\0"</div><div class='add'>+"mil.tj\0"</div><div class='add'>+"ulan-ude.ru\0mil.to\0wv.us\0"</div><div class='add'>+"luster.no\0volgograd.ru\0"</div><div class='add'>+"pa.it\0kommunalforbund.se\0lib.tx.us\0"</div><div class='add'>+"s.se\0"</div><div class='add'>+"qsl.br\0"</div><div class='add'>+"mil.tw\0"</div><div class='add'>+"est.pr\0ens.tn\0"</div><div class='add'>+"lib.id.us\0"</div><div class='add'>+"mil.tz\0"</div><div class='add'>+"uscountryestate.museum\0"</div><div class='add'>+"agents.aero\0"</div><div class='add'>+"\xc3\xb8vre-eiker.no\0ne.ug\0"</div><div class='add'>+"pb.ao\0"</div><div class='add'>+"gob.pa\0ne.tz\0"</div><div class='add'>+"tur.br\0"</div><div class='add'>+"mil.vc\0"</div><div class='add'>+"or.at\0gob.pe\0"</div><div class='add'>+"s\xc3\xb8r-fron.no\0"</div><div class='add'>+"or.bi\0ne.us\0"</div><div class='add'>+"u.bg\0gob.pk\0"</div><div class='add'>+"stavern.no\0"</div><div class='add'>+"brindisi.it\0"</div><div class='add'>+"aknoluokta.no\0"</div><div class='add'>+"!pref.kyoto.jp\0tydal.no\0"</div><div class='add'>+"plc.ly\0muos\xc3\xa1t.no\0"</div><div class='add'>+"or.ci\0hamaroy.no\0priv.pl\0"</div><div class='add'>+"vestre-slidre.no\0gniezno.pl\0"</div><div class='add'>+"\xe7\xae\x87\xe4\xba\xba.hk\0"</div><div class='add'>+"andebu.no\0"</div><div class='add'>+"nieruchomosci.pl\0\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xd9\x8a\xd8\xa9\0"</div><div class='add'>+"or.cr\0pro.ht\0bolzano.it\0"</div><div class='add'>+"ct.us\0k12.md.us\0"</div><div class='add'>+"za.org\0"</div><div class='add'>+"!icnet.uk\0"</div><div class='add'>+"localhistory.museum\0"</div><div class='add'>+"firm.ht\0"</div><div class='add'>+"lel.br\0tr.it\0kvanangen.no\0"</div><div class='add'>+"sondre-land.no\0t\xc3\xb8nsberg.no\0vefsn.no\0"</div><div class='add'>+"nature.museum\0yamal.ru\0"</div><div class='add'>+"rv.ua\0"</div><div class='add'>+"lans.museum\0lib.ne.us\0"</div><div class='add'>+"lur\xc3\xb8y.no\0"</div><div class='add'>+"eu.com\0firm.in\0"</div><div class='add'>+"hjelmeland.no\0"</div><div class='add'>+"gs.tr.no\0"</div><div class='add'>+"casino.hu\0essex.museum\0tourism.pl\0"</div><div class='add'>+"rennesoy.no\0"</div><div class='add'>+"priv.no\0"</div><div class='add'>+"baths.museum\0mytis.ru\0"</div><div class='add'>+"tingvoll.no\0"</div><div class='add'>+"cc.az.us\0"</div><div class='add'>+"sh.cn\0"</div><div class='add'>+"!pref.miyazaki.jp\0s\xc3\xb8rfold.no\0"</div><div class='add'>+"aurskog-holand.no\0malatvuopmi.no\0"</div><div class='add'>+"lib.ct.us\0"</div><div class='add'>+"cc.pa.us\0"</div><div class='add'>+"pa.gov.pl\0"</div><div class='add'>+"firm.co\0cc.de.us\0"</div><div class='add'>+"nrw.museum\0"</div><div class='add'>+"daejeon.kr\0livinghistory.museum\0"</div><div class='add'>+"gildeskal.no\0lund.no\0"</div><div class='add'>+"\xc3\xb8ksnes.no\0stavropol.ru\0"</div><div class='add'>+"b\xc3\xa6rum.no\0r\xc3\xb8yrvik.no\0"</div><div class='add'>+"osoyro.no\0"</div><div class='add'>+"priv.me\0sula.no\0!parliament.uk\0"</div><div class='add'>+"nationalheritage.museum\0"</div><div class='add'>+"jaworzno.pl\0"</div><div class='add'>+"dinosaur.museum\0"</div><div class='add'>+"garden.museum\0trust.museum\0"</div><div class='add'>+"turen.tn\0"</div><div class='add'>+"kautokeino.no\0"</div><div class='add'>+"pro.na\0"</div><div class='add'>+"gorizia.it\0"</div><div class='add'>+"siljan.no\0"</div><div class='add'>+"or.id\0pro.mv\0"</div><div class='add'>+"bieszczady.pl\0www.ro\0"</div><div class='add'>+"lib.ee\0antiques.museum\0brasil.museum\0tr.no\0"</div><div class='add'>+"aejrie.no\0"</div><div class='add'>+"!pref.hokkaido.jp\0"</div><div class='add'>+"schlesisches.museum\0"</div><div class='add'>+"huissier-justice.fr\0or.it\0"</div><div class='add'>+"t.se\0"</div><div class='add'>+"environment.museum\0"</div><div class='add'>+"vindafjord.no\0"</div><div class='add'>+"edu.ac\0or.jp\0"</div><div class='add'>+"tree.museum\0"</div><div class='add'>+"groundhandling.aero\0edu.af\0"</div><div class='add'>+"rochester.museum\0sanfrancisco.museum\0"</div><div class='add'>+"ebiz.tw\0"</div><div class='add'>+"kirovograd.ua\0"</div><div class='add'>+"edu.al\0"</div><div class='add'>+"edu.an\0\xc3\xa1k\xc5\x8boluokta.no\0v\xc3\xa5g\xc3\xa5.no\0"</div><div class='add'>+"v.bg\0"</div><div class='add'>+"edu.ba\0"</div><div class='add'>+"edu.bb\0nesset.no\0"</div><div class='add'>+"hornindal.no\0pro.pr\0"</div><div class='add'>+"or.kr\0"</div><div class='add'>+"az.us\0"</div><div class='add'>+"edu.bh\0volkenkunde.museum\0"</div><div class='add'>+"edu.bi\0"</div><div class='add'>+"edu.az\0"</div><div class='add'>+"b\xc3\xb8mlo.no\0"</div><div class='add'>+"edu.bm\0"</div><div class='add'>+"edu.bo\0tyumen.ru\0"</div><div class='add'>+"edu.br\0"</div><div class='add'>+"edu.bs\0pa.us\0"</div><div class='add'>+"alto-adige.it\0whaling.museum\0"</div><div class='add'>+"*.iwate.jp\0"</div><div class='add'>+"edu.ci\0law.pro\0"</div><div class='add'>+"edu.bz\0de.us\0"</div><div class='add'>+"lib.ak.us\0"</div><div class='add'>+"edu.cn\0"</div><div class='add'>+"edu.co\0"</div><div class='add'>+"laspezia.it\0"</div><div class='add'>+"baidar.no\0"</div><div class='add'>+"ts.it\0"</div><div class='add'>+"or.na\0"</div><div class='add'>+"edu.cu\0hotel.lk\0"</div><div class='add'>+"show.aero\0or.mu\0"</div><div class='add'>+"sandnes.no\0"</div><div class='add'>+"museumcenter.museum\0"</div><div class='add'>+"edu.dm\0kazan.ru\0"</div><div class='add'>+"biz\0caltanissetta.it\0odessa.ua\0k12.oh.us\0"</div><div class='add'>+"crimea.ua\0"</div><div class='add'>+"research.aero\0lom.no\0"</div><div class='add'>+"edu.ec\0florence.it\0clock.museum\0sshn.se\0"</div><div class='add'>+"edu.ee\0game.tw\0"</div><div class='add'>+"!pref.okinawa.jp\0"</div><div class='add'>+"ilawa.pl\0"</div><div class='add'>+"edu.dz\0indiana.museum\0"</div><div class='add'>+"gs.jan-mayen.no\0"</div><div class='add'>+"publ.pt\0"</div><div class='add'>+"nom.ad\0"</div><div class='add'>+"skanit.no\0gdansk.pl\0k12.pa.us\0"</div><div class='add'>+"nom.ag\0edu.es\0"</div><div class='add'>+"if.ua\0"</div><div class='add'>+"pro.tt\0lib.de.us\0"</div><div class='add'>+"environmentalconservation.museum\0cc.or.us\0"</div><div class='add'>+"bern.museum\0nat.tn\0"</div><div class='add'>+"rubtsovsk.ru\0"</div><div class='add'>+"!educ.ar\0masoy.no\0"</div><div class='add'>+"bologna.it\0"</div><div class='add'>+"\xc3\xa5snes.no\0fhv.se\0"</div><div class='add'>+"*.tottori.jp\0radoy.no\0"</div><div class='add'>+"romskog.no\0"</div><div class='add'>+"malbork.pl\0"</div><div class='add'>+"olbiatempio.it\0"</div><div class='add'>+"edu.ge\0"</div><div class='add'>+"edu.gh\0"</div><div class='add'>+"edu.gi\0"</div><div class='add'>+"or.pw\0"</div><div class='add'>+"hob\xc3\xb8l.no\0"</div><div class='add'>+"nom.br\0edu.gn\0virginia.museum\0mbone.pl\0!nls.uk\0"</div><div class='add'>+"seljord.no\0pro.vn\0"</div><div class='add'>+"edu.gp\0"</div><div class='add'>+"edu.gr\0"</div><div class='add'>+"!uba.ar\0!pref.saitama.jp\0"</div><div class='add'>+"greta.fr\0gs.aa.no\0kvinnherad.no\0"</div><div class='add'>+"lib.sc.us\0"</div><div class='add'>+"js.cn\0nom.co\0edu.hk\0"</div><div class='add'>+"lesja.no\0"</div><div class='add'>+"bl.it\0"</div><div class='add'>+"edu.hn\0\xc3\xb8ystre-slidre.no\0mari-el.ru\0"</div><div class='add'>+"hotel.hu\0"</div><div class='add'>+"rindal.no\0"</div><div class='add'>+"edu.ht\0"</div><div class='add'>+"!pref.miyagi.jp\0"</div><div class='add'>+"midtre-gauldal.no\0"</div><div class='add'>+"xj.cn\0australia.museum\0"</div><div class='add'>+"ab.ca\0salvadordali.museum\0olawa.pl\0"</div><div class='add'>+"pc.it\0"</div><div class='add'>+"u.se\0"</div><div class='add'>+"edu.in\0b\xc3\xa1l\xc3\xa1t.no\0"</div><div class='add'>+"ln.cn\0alta.no\0"</div><div class='add'>+"chelyabinsk.ru\0"</div><div class='add'>+"edu.iq\0"</div><div class='add'>+"ontario.museum\0"</div><div class='add'>+"edu.is\0"</div><div class='add'>+"edu.it\0"</div><div class='add'>+"b\xc3\xa5tsfjord.no\0"</div><div class='add'>+"trysil.no\0or.th\0"</div><div class='add'>+"utsira.no\0"</div><div class='add'>+"nom.es\0edu.jo\0fhsk.se\0"</div><div class='add'>+"bale.museum\0"</div><div class='add'>+"w.bg\0"</div><div class='add'>+"lillesand.no\0"</div><div class='add'>+"edu.kg\0"</div><div class='add'>+"amusement.aero\0"</div><div class='add'>+"edu.ki\0"</div><div class='add'>+"fauske.no\0or.ug\0"</div><div class='add'>+"int.az\0askvoll.no\0eidskog.no\0cv.ua\0"</div><div class='add'>+"algard.no\0"</div><div class='add'>+"edu.km\0or.tz\0"</div><div class='add'>+"nom.fr\0edu.kn\0"</div><div class='add'>+"*.ibaraki.jp\0hoylandet.no\0"</div><div class='add'>+"int.bo\0edu.kp\0"</div><div class='add'>+"edu.la\0"</div><div class='add'>+"si.it\0edu.lb\0travel.pl\0"</div><div class='add'>+"edu.lc\0mx.na\0n\xc3\xa1vuotna.no\0ovre-eiker.no\0"</div><div class='add'>+"aa.no\0!siemens.om\0"</div><div class='add'>+"sciences.museum\0or.us\0"</div><div class='add'>+"cat\0"</div><div class='add'>+"edu.ky\0"</div><div class='add'>+"int.ci\0edu.kz\0firm.ro\0cc.wy.us\0"</div><div class='add'>+"edu.lk\0vaapste.no\0"</div><div class='add'>+"!pref.tochigi.jp\0"</div><div class='add'>+"int.co\0podlasie.pl\0"</div><div class='add'>+"edu.lr\0"</div><div class='add'>+"karikatur.museum\0jamal.ru\0"</div><div class='add'>+"gjovik.no\0krager\xc3\xb8.no\0k12.az.us\0"</div><div class='add'>+"edu.me\0"</div><div class='add'>+"ud.it\0edu.lv\0entomology.museum\0"</div><div class='add'>+"edu.mg\0moskenes.no\0"</div><div class='add'>+"\xe6\x94\xbf\xe5\xba\x9c.hk\0edu.ly\0"</div><div class='add'>+"stpetersburg.museum\0"</div><div class='add'>+"edu.mk\0"</div><div class='add'>+"edu.ml\0nordreisa.no\0"</div><div class='add'>+"!pref.fukui.jp\0lib.ms.us\0lib.nc.us\0"</div><div class='add'>+"edu.mn\0\xd9\x81\xd9\x84\xd8\xb3\xd8\xb7\xd9\x8a\xd9\x86\0"</div><div class='add'>+"fot.br\0edu.mo\0"</div><div class='add'>+"iron.museum\0"</div><div class='add'>+"asti.it\0annefrank.museum\0stv.ru\0cc.nh.us\0"</div><div class='add'>+"edu.mv\0"</div><div class='add'>+"lodi.it\0edu.mw\0edu.ng\0"</div><div class='add'>+"gwangju.kr\0edu.mx\0"</div><div class='add'>+"edu.my\0"</div><div class='add'>+"soundandvision.museum\0"</div><div class='add'>+"lenvik.no\0"</div><div class='add'>+"ballooning.aero\0"</div><div class='add'>+"name\0"</div><div class='add'>+"jogasz.hu\0frogn.no\0"</div><div class='add'>+"history.museum\0"</div><div class='add'>+"consultant.aero\0edu.nr\0"</div><div class='add'>+"manchester.museum\0"</div><div class='add'>+"*.hiroshima.jp\0"</div><div class='add'>+"pol.dz\0"</div><div class='add'>+"*.tochigi.jp\0heimatunduhren.museum\0"</div><div class='add'>+"!pref.kanagawa.jp\0"</div><div class='add'>+"firm.nf\0edu.pa\0"</div><div class='add'>+"coop.ht\0pc.pl\0"</div><div class='add'>+"chicago.museum\0"</div><div class='add'>+"vn.ua\0"</div><div class='add'>+"edu.pe\0"</div><div class='add'>+"tana.no\0edu.pf\0"</div><div class='add'>+"edu.ph\0"</div><div class='add'>+"nom.km\0"</div><div class='add'>+"travel.tt\0"</div><div class='add'>+"edu.pk\0"</div><div class='add'>+"experts-comptables.fr\0edu.pl\0bryansk.ru\0"</div><div class='add'>+"edu.pn\0"</div><div class='add'>+"evje-og-hornnes.no\0warszawa.pl\0"</div><div class='add'>+"ac.ae\0"</div><div class='add'>+"edu.pr\0"</div><div class='add'>+"vaksdal.no\0edu.ps\0dni.us\0"</div><div class='add'>+"po.gov.pl\0edu.pt\0"</div><div class='add'>+"nordre-land.no\0vadso.no\0"</div><div class='add'>+"rnrt.tn\0"</div><div class='add'>+"sport.hu\0!pref.gifu.jp\0voss.no\0targi.pl\0"</div><div class='add'>+"flesberg.no\0"</div><div class='add'>+"photography.museum\0"</div><div class='add'>+"modena.it\0tonsberg.no\0"</div><div class='add'>+"ac.at\0"</div><div class='add'>+"ac.be\0coop.br\0"</div><div class='add'>+"services.aero\0"</div><div class='add'>+"nom.mg\0"</div><div class='add'>+"wielun.pl\0"</div><div class='add'>+"jefferson.museum\0wy.us\0"</div><div class='add'>+"pd.it\0ot.it\0neues.museum\0slattum.no\0"</div><div class='add'>+"vdonsk.ru\0"</div><div class='add'>+"ar.com\0edu.sa\0"</div><div class='add'>+"\xc3\xa5l.no\0edu.sb\0"</div><div class='add'>+"edu.rs\0edu.sc\0"</div><div class='add'>+"ac.ci\0int.is\0edu.sd\0!tsk.tr\0"</div><div class='add'>+"br\xc3\xb8nn\xc3\xb8ysund.no\0and\xc3\xb8y.no\0edu.ru\0"</div><div class='add'>+"pol.ht\0"</div><div class='add'>+"edu.rw\0edu.sg\0"</div><div class='add'>+"gyeongnam.kr\0olecko.pl\0"</div><div class='add'>+"ac.cn\0"</div><div class='add'>+"graz.museum\0"</div><div class='add'>+"coldwar.museum\0edu.sl\0"</div><div class='add'>+"ac.cr\0"</div><div class='add'>+"edu.sn\0"</div><div class='add'>+"hamar.no\0"</div><div class='add'>+"histoire.museum\0"</div><div class='add'>+"!city.shizuoka.jp\0"</div><div class='add'>+"edu.st\0"</div><div class='add'>+"oceanographic.museum\0nh.us\0"</div><div class='add'>+"x.bg\0"</div><div class='add'>+"surnadal.no\0"</div><div class='add'>+"fc.it\0costume.museum\0stalowa-wola.pl\0"</div><div class='add'>+"valer.ostfold.no\0edu.sy\0"</div><div class='add'>+"edu.tj\0"</div><div class='add'>+"arq.br\0"</div><div class='add'>+"aeroclub.aero\0odo.br\0pe.ca\0\xe7\xb6\xb2\xe7\xb5\xa1.cn\0bronnoysund.no\0nom.pa\0"</div><div class='add'>+"edu.to\0"</div><div class='add'>+"paleo.museum\0nom.pe\0edu.ua\0"</div><div class='add'>+"int.la\0trustee.museum\0forsand.no\0krasnoyarsk.ru\0"</div><div class='add'>+"!pref.hyogo.jp\0"</div><div class='add'>+"edu.tt\0"</div><div class='add'>+"zarow.pl\0"</div><div class='add'>+"edu.tw\0"</div><div class='add'>+"nom.pl\0"</div><div class='add'>+"community.museum\0kvitsoy.no\0"</div><div class='add'>+"int.lk\0tychy.pl\0"</div><div class='add'>+"k12.me.us\0"</div><div class='add'>+"jondal.no\0edu.vc\0"</div><div class='add'>+"illustration.museum\0"</div><div class='add'>+"clinton.museum\0"</div><div class='add'>+"tas.au\0es.kr\0"</div><div class='add'>+"production.aero\0"</div><div class='add'>+"rodoy.no\0"</div><div class='add'>+"database.museum\0bodo.no\0"</div><div class='add'>+"anthro.museum\0landes.museum\0edu.vn\0"</div><div class='add'>+"nom.re\0"</div><div class='add'>+"altai.ru\0"</div><div class='add'>+"filatelia.museum\0"</div><div class='add'>+"sk.ca\0lezajsk.pl\0"</div><div class='add'>+"rockart.museum\0int.mv\0"</div><div class='add'>+"int.mw\0herad.no\0"</div><div class='add'>+"eti.br\0ac.gn\0"</div><div class='add'>+"fedje.no\0nom.ro\0"</div><div class='add'>+"money.museum\0"</div><div class='add'>+"\xd9\x85\xd8\xb5\xd8\xb1\0"</div><div class='add'>+"horten.no\0"</div><div class='add'>+"gangaviika.no\0mielec.pl\0"</div><div class='add'>+"uw.gov.pl\0"</div><div class='add'>+"moma.museum\0"</div><div class='add'>+"edu.ws\0"</div><div class='add'>+"go.ci\0"</div><div class='add'>+"tv.bo\0technology.museum\0"</div><div class='add'>+"s\xc3\xb8ndre-land.no\0"</div><div class='add'>+"tv.br\0"</div><div class='add'>+"jor.br\0lib.dc.us\0"</div><div class='add'>+"arboretum.museum\0"</div><div class='add'>+"go.cr\0"</div><div class='add'>+"artsandcrafts.museum\0\xd8\xaa\xd9\x88\xd9\x86\xd8\xb3\0"</div><div class='add'>+"psc.br\0ac.id\0!city.chiba.jp\0"</div><div class='add'>+"wa.au\0"</div><div class='add'>+"rome.it\0"</div><div class='add'>+"amli.no\0"</div><div class='add'>+"ac.im\0lo.it\0"</div><div class='add'>+"ac.in\0"</div><div class='add'>+"\xe7\xb6\xb2\xe7\xb5\xa1.hk\0durham.museum\0"</div><div class='add'>+"ac.ir\0"</div><div class='add'>+"torino.museum\0"</div><div class='add'>+"loabat.no\0"</div><div class='add'>+"com\0"</div><div class='add'>+"nalchik.ru\0"</div><div class='add'>+"yakutia.ru\0"</div><div class='add'>+"settlers.museum\0"</div><div class='add'>+"!promocion.ar\0int.pt\0"</div><div class='add'>+"union.aero\0"</div><div class='add'>+"utah.museum\0"</div><div class='add'>+"giehtavuoatna.no\0"</div><div class='add'>+"ac.jp\0"</div><div class='add'>+"air-traffic-control.aero\0"</div><div class='add'>+"silk.museum\0usantiques.museum\0"</div><div class='add'>+"bn.it\0"</div><div class='add'>+"kalisz.pl\0"</div><div class='add'>+"perm.ru\0"</div><div class='add'>+"aoste.it\0bindal.no\0"</div><div class='add'>+"coloradoplateau.museum\0k12.gu.us\0"</div><div class='add'>+"frosinone.it\0forde.no\0"</div><div class='add'>+"epilepsy.museum\0"</div><div class='add'>+"olbia-tempio.it\0"</div><div class='add'>+"journalist.aero\0ac.kr\0*.sch.uk\0"</div><div class='add'>+"nic.im\0sciencesnaturelles.museum\0bedzin.pl\0"</div><div class='add'>+"nic.in\0pe.it\0"</div><div class='add'>+"w.se\0"</div><div class='add'>+"!pref.okayama.jp\0"</div><div class='add'>+"urn.arpa\0"</div><div class='add'>+"cinema.museum\0"</div><div class='add'>+"monza.it\0versailles.museum\0int.ru\0"</div><div class='add'>+"andasuolo.no\0skj\xc3\xa5k.no\0chernovtsy.ua\0"</div><div class='add'>+"nyc.museum\0int.rw\0paroch.k12.ma.us\0"</div><div class='add'>+"ringerike.no\0"</div><div class='add'>+"ac.ma\0"</div><div class='add'>+"org.ac\0civilaviation.aero\0"</div><div class='add'>+"rakkestad.no\0"</div><div class='add'>+"org.ae\0ac.me\0"</div><div class='add'>+"org.af\0"</div><div class='add'>+"org.ag\0"</div><div class='add'>+"org.ai\0stokke.no\0"</div><div class='add'>+"airport.aero\0"</div><div class='add'>+"finnoy.no\0"</div><div class='add'>+"org.al\0"</div><div class='add'>+"org.an\0y.bg\0habmer.no\0"</div><div class='add'>+"stadt.museum\0holtalen.no\0"</div><div class='add'>+"int.tj\0"</div><div class='add'>+"org.ba\0gjerdrum.no\0"</div><div class='add'>+"org.bb\0ascoli-piceno.it\0molde.no\0r\xc3\xb8st.no\0tysfjord.no\0"</div><div class='add'>+"pe.kr\0rybnik.pl\0"</div><div class='add'>+"go.id\0"</div><div class='add'>+"ac.mu\0"</div><div class='add'>+"ac.mw\0ac.ng\0"</div><div class='add'>+"org.bh\0\xc3\xa5mot.no\0rana.no\0"</div><div class='add'>+"org.bi\0"</div><div class='add'>+"org.az\0belgorod.ru\0int.tt\0"</div><div class='add'>+"ae.org\0"</div><div class='add'>+"group.aero\0posts-and-telecommunications.museum\0"</div><div class='add'>+"org.bm\0salerno.it\0"</div><div class='add'>+"etnedal.no\0"</div><div class='add'>+"org.bo\0*.hokkaido.jp\0donetsk.ua\0"</div><div class='add'>+"ostroda.pl\0"</div><div class='add'>+"org.br\0"</div><div class='add'>+"org.bs\0"</div><div class='add'>+"go.it\0h\xc3\xb8ylandet.no\0"</div><div class='add'>+"zgorzelec.pl\0"</div><div class='add'>+"org.bw\0"</div><div class='add'>+"org.ci\0"</div><div class='add'>+"org.bz\0vicenza.it\0resistance.museum\0"</div><div class='add'>+"missile.museum\0"</div><div class='add'>+"org.cn\0"</div><div class='add'>+"org.co\0assassination.museum\0"</div><div class='add'>+"go.jp\0"</div><div class='add'>+"tv.it\0austrheim.no\0ac.pa\0"</div><div class='add'>+"verbania.it\0"</div><div class='add'>+"palace.museum\0"</div><div class='add'>+"tmp.br\0int.vn\0"</div><div class='add'>+"org.cu\0"</div><div class='add'>+"paris.museum\0"</div><div class='add'>+"media.aero\0hokksund.no\0"</div><div class='add'>+"arts.museum\0gemological.museum\0hammerfest.no\0"</div><div class='add'>+"k12.ny.us\0"</div><div class='add'>+"org.dm\0hemsedal.no\0ringsaker.no\0sklep.pl\0"</div><div class='add'>+"h\xc3\xa5.no\0cc.nj.us\0"</div><div class='add'>+"rzeszow.pl\0"</div><div class='add'>+"go.kr\0gjesdal.no\0ac.pr\0"</div><div class='add'>+"org.ec\0"</div><div class='add'>+"org.ee\0"</div><div class='add'>+"media.museum\0"</div><div class='add'>+"terni.it\0touch.museum\0zakopane.pl\0"</div><div class='add'>+"journal.aero\0org.dz\0"</div><div class='add'>+"incheon.kr\0"</div><div class='add'>+"b\xc3\xa1hcavuotna.no\0"</div><div class='add'>+"leksvik.no\0ulvik.no\0"</div><div class='add'>+"plantation.museum\0"</div><div class='add'>+"org.es\0loyalist.museum\0"</div><div class='add'>+"gildesk\xc3\xa5l.no\0bytom.pl\0"</div><div class='add'>+"bo.nordland.no\0"</div><div class='add'>+"ambulance.aero\0iglesiascarbonia.it\0"</div><div class='add'>+"tw.cn\0\xe6\x96\xb0\xe5\x8a\xa0\xe5\x9d\xa1\0"</div><div class='add'>+"chocolate.museum\0"</div><div class='add'>+"pittsburgh.museum\0"</div><div class='add'>+"royrvik.no\0sor-odal.no\0ac.rs\0"</div><div class='add'>+"kaluga.ru\0"</div><div class='add'>+"org.ge\0erotica.hu\0ac.ru\0ac.se\0"</div><div class='add'>+"org.gg\0leangaviika.no\0ac.rw\0"</div><div class='add'>+"org.gh\0v\xc3\xa6r\xc3\xb8y.no\0"</div><div class='add'>+"org.gi\0"</div><div class='add'>+"jevnaker.no\0"</div><div class='add'>+"org.gn\0tv.na\0leikanger.no\0"</div><div class='add'>+"org.gp\0"</div><div class='add'>+"ask\xc3\xb8y.no\0"</div><div class='add'>+"org.gr\0wroc.pl\0"</div><div class='add'>+"ad.jp\0"</div><div class='add'>+"powiat.pl\0"</div><div class='add'>+"tj\xc3\xb8me.no\0"</div><div class='add'>+"coop.tt\0"</div><div class='add'>+"ac.th\0"</div><div class='add'>+"mragowo.pl\0ac.sz\0ac.tj\0"</div><div class='add'>+"org.hk\0bo.it\0"</div><div class='add'>+"philately.museum\0"</div><div class='add'>+"org.hn\0"</div><div class='add'>+"fet.no\0"</div><div class='add'>+"axis.museum\0mansions.museum\0"</div><div class='add'>+"wiki.br\0"</div><div class='add'>+"org.ht\0"</div><div class='add'>+"org.hu\0piacenza.it\0scotland.museum\0cpa.pro\0"</div><div class='add'>+"ac.ug\0"</div><div class='add'>+"coop.mv\0x.se\0"</div><div class='add'>+"coop.mw\0ac.tz\0"</div><div class='add'>+"bmd.br\0"</div><div class='add'>+"org.im\0ralingen.no\0"</div><div class='add'>+"org.in\0"</div><div class='add'>+"cz.it\0lib.ia.us\0"</div><div class='add'>+"org.iq\0"</div><div class='add'>+"org.ir\0"</div><div class='add'>+"org.is\0"</div><div class='add'>+"nl.ca\0"</div><div class='add'>+"org.je\0"</div><div class='add'>+"childrensgarden.museum\0"</div><div class='add'>+"kvits\xc3\xb8y.no\0go.pw\0"</div><div class='add'>+"sokndal.no\0"</div><div class='add'>+"ra.it\0grimstad.no\0"</div><div class='add'>+"denmark.museum\0"</div><div class='add'>+"ac.vn\0"</div><div class='add'>+"ecn.br\0org.jo\0"</div><div class='add'>+"bialystok.pl\0nj.us\0"</div><div class='add'>+"z.bg\0bilbao.museum\0stargard.pl\0nic.tj\0"</div><div class='add'>+"eisenbahn.museum\0"</div><div class='add'>+"fe.it\0bryne.no\0vrn.ru\0"</div><div class='add'>+"cc.wa.us\0"</div><div class='add'>+"sex.hu\0skierva.no\0"</div><div class='add'>+"org.kg\0"</div><div class='add'>+"org.ki\0"</div><div class='add'>+"org.km\0"</div><div class='add'>+"org.kn\0khakassia.ru\0"</div><div class='add'>+"org.kp\0"</div><div class='add'>+"org.la\0"</div><div class='add'>+"org.lb\0"</div><div class='add'>+"org.lc\0"</div><div class='add'>+"francaise.museum\0"</div><div class='add'>+"panama.museum\0"</div><div class='add'>+"rotorcraft.aero\0gateway.museum\0olkusz.pl\0"</div><div class='add'>+"org.ky\0czeladz.pl\0ryazan.ru\0"</div><div class='add'>+"org.kz\0"</div><div class='add'>+"org.lk\0dyr\xc3\xb8y.no\0"</div><div class='add'>+"raisa.no\0"</div><div class='add'>+"dlugoleka.pl\0"</div><div class='add'>+"org.ma\0"</div><div class='add'>+"org.lr\0prochowice.pl\0"</div><div class='add'>+"org.ls\0"</div><div class='add'>+"org.me\0sandoy.no\0s\xc3\xb8r-varanger.no\0"</div><div class='add'>+"org.lv\0"</div><div class='add'>+"org.mg\0"</div><div class='add'>+"tel\0go.th\0"</div><div class='add'>+"org.ly\0"</div><div class='add'>+"steam.museum\0go.tj\0"</div><div class='add'>+"org.mk\0pasadena.museum\0jessheim.no\0lib.mn.us\0"</div><div class='add'>+"org.ml\0"</div><div class='add'>+"software.aero\0"</div><div class='add'>+"org.mn\0"</div><div class='add'>+"org.mo\0"</div><div class='add'>+"*.fukui.jp\0decorativearts.museum\0"</div><div class='add'>+"spy.museum\0org.na\0jorpeland.no\0"</div><div class='add'>+"vads\xc3\xb8.no\0"</div><div class='add'>+"org.mu\0building.museum\0gausdal.no\0"</div><div class='add'>+"org.mv\0nannestad.no\0"</div><div class='add'>+"org.mw\0org.ng\0go.ug\0"</div><div class='add'>+"vr.it\0org.mx\0"</div><div class='add'>+"org.my\0"</div><div class='add'>+"go.tz\0"</div><div class='add'>+"oppdal.no\0"</div><div class='add'>+"uk.net\0"</div><div class='add'>+"coop.km\0"</div><div class='add'>+"*.kyoto.jp\0"</div><div class='add'>+"sarpsborg.no\0org.nr\0"</div><div class='add'>+"chernigov.ua\0"</div><div class='add'>+"ha.cn\0no.com\0"</div><div class='add'>+"space.museum\0"</div><div class='add'>+"org.pa\0"</div><div class='add'>+"*.ar\0"</div><div class='add'>+"usgarden.museum\0"</div><div class='add'>+"*.bd\0org.pe\0"</div><div class='add'>+"*.au\0org.pf\0um.gov.pl\0"</div><div class='add'>+"bio.br\0"</div><div class='add'>+"org.ph\0"</div><div class='add'>+"org.pk\0"</div><div class='add'>+"fr\xc3\xa6na.no\0org.pl\0"</div><div class='add'>+"nord-aurdal.no\0org.pn\0"</div><div class='add'>+"*.bn\0handson.museum\0agrinet.tn\0"</div><div class='add'>+"kviteseid.no\0"</div><div class='add'>+"rel.ht\0virtuel.museum\0atm.pl\0org.pr\0"</div><div class='add'>+"org.ps\0cherkassy.ua\0"</div><div class='add'>+"org.pt\0wa.us\0"</div><div class='add'>+"*.bt\0arendal.no\0magnitka.ru\0"</div><div class='add'>+"depot.museum\0porsangu.no\0"</div><div class='add'>+"laakesvuemie.no\0"</div><div class='add'>+"sor-fron.no\0"</div><div class='add'>+"heroy.more-og-romsdal.no\0"</div><div class='add'>+"*.ck\0"</div><div class='add'>+"!rakpetroleum.om\0"</div><div class='add'>+"kr\xc3\xb8""dsherad.no\0mail.pl\0"</div><div class='add'>+"mod.gi\0"</div><div class='add'>+"gs.nl.no\0"</div><div class='add'>+"mb.ca\0"</div><div class='add'>+"pavia.it\0"</div><div class='add'>+"civilisation.museum\0folldal.no\0"</div><div class='add'>+"suli.hu\0"</div><div class='add'>+"brumunddal.no\0"</div><div class='add'>+"*.cy\0"</div><div class='add'>+"pg.it\0troms\xc3\xb8.no\0"</div><div class='add'>+"sex.pl\0y.se\0"</div><div class='add'>+"org.ro\0"</div><div class='add'>+"*.do\0"</div><div class='add'>+"caserta.it\0org.sa\0"</div><div class='add'>+"za.com\0halloffame.museum\0org.sb\0lviv.ua\0"</div><div class='add'>+"mill.museum\0org.rs\0org.sc\0"</div><div class='add'>+"org.sd\0"</div><div class='add'>+"idv.hk\0!omanmobile.om\0org.ru\0org.se\0"</div><div class='add'>+"langev\xc3\xa5g.no\0r\xc3\xa5holt.no\0starostwo.gov.pl\0"</div><div class='add'>+"trani-andria-barletta.it\0org.sg\0"</div><div class='add'>+"*.eg\0hvaler.no\0"</div><div class='add'>+"*.ehime.jp\0"</div><div class='add'>+"gmina.pl\0"</div><div class='add'>+"bod\xc3\xb8.no\0org.sl\0"</div><div class='add'>+"edu\0org.sn\0"</div><div class='add'>+"org.so\0lib.wi.us\0"</div><div class='add'>+"kommune.no\0"</div><div class='add'>+"nome.pt\0"</div><div class='add'>+"*.er\0namdalseid.no\0k12.wa.us\0"</div><div class='add'>+"nm.cn\0org.st\0"</div><div class='add'>+"*.et\0d\xc3\xb8nna.no\0"</div><div class='add'>+"jewish.museum\0preservation.museum\0"</div><div class='add'>+"slupsk.pl\0org.sy\0"</div><div class='add'>+"art.br\0org.sz\0org.tj\0"</div><div class='add'>+"ntr.br\0*.fj\0ski.no\0"</div><div class='add'>+"*.fk\0rimini.it\0grajewo.pl\0"</div><div class='add'>+"loppa.no\0"</div><div class='add'>+"franziskaner.museum\0notteroy.no\0org.tn\0"</div><div class='add'>+"org.to\0"</div><div class='add'>+"nesoddtangen.no\0"</div><div class='add'>+"org.ua\0"</div><div class='add'>+"discovery.museum\0wloclawek.pl\0"</div><div class='add'>+"lakas.hu\0org.tt\0"</div><div class='add'>+"kurgan.ru\0"</div><div class='add'>+"baltimore.museum\0nkz.ru\0org.tw\0"</div><div class='add'>+"com.ac\0castle.museum\0"</div><div class='add'>+"*.fukuoka.jp\0sandefjord.no\0varggat.no\0"</div><div class='add'>+"com.af\0"</div><div class='add'>+"com.ag\0"</div><div class='add'>+"ato.br\0k12.nj.us\0"</div><div class='add'>+"com.ai\0"</div><div class='add'>+"city.hu\0oryol.ru\0"</div><div class='add'>+"com.al\0nl.no\0mielno.pl\0cc.ma.us\0"</div><div class='add'>+"org.vc\0"</div><div class='add'>+"com.an\0g12.br\0"</div><div class='add'>+"*.gt\0"</div><div class='add'>+"*.gu\0"</div><div class='add'>+"com.ba\0"</div><div class='add'>+"com.bb\0americanart.museum\0"</div><div class='add'>+"org.vi\0"</div><div class='add'>+"kunstsammlung.museum\0"</div><div class='add'>+"com.aw\0"</div><div class='add'>+"flight.aero\0com.bh\0lib.mo.us\0org.vn\0"</div><div class='add'>+"com.bi\0adygeya.ru\0"</div><div class='add'>+"com.az\0"</div><div class='add'>+"art.dz\0"</div><div class='add'>+"com.bm\0"</div><div class='add'>+"dr\xc3\xb8""bak.no\0"</div><div class='add'>+"com.bo\0isla.pr\0"</div><div class='add'>+"com.br\0"</div><div class='add'>+"com.bs\0ustka.pl\0kuban.ru\0"</div><div class='add'>+"press.aero\0"</div><div class='add'>+"vs.it\0"</div><div class='add'>+"meloy.no\0"</div><div class='add'>+"*.il\0ulm.museum\0"</div><div class='add'>+"com.by\0com.ci\0genoa.it\0"</div><div class='add'>+"com.bz\0sn.cn\0"</div><div class='add'>+"lib.or.us\0"</div><div class='add'>+"santafe.museum\0org.ws\0"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+#endif // QURLTLD_P_H</div><div class='head'>diff --git a/src/corelib/io/qurltlds_p.h.INFO b/src/corelib/io/qurltlds_p.h.INFO<br/>new file mode 100644<br/>index 0000000..5781c2c<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/io/qurltlds_p.h.INFO?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/io/qurltlds_p.h.INFO</a></div><div class='hunk'>@@ -0,0 +1,17 @@</div><div class='add'>+The file qurltlds_p.h is generated from the Public Suffix</div><div class='add'>+List (see [1] and [2]), by the program residing at</div><div class='add'>+util/corelib/qurl-generateTLDs in the Qt source tree.</div><div class='add'>+</div><div class='add'>+That program generates a character array and an index array from the</div><div class='add'>+list to provide fast lookups of elements within C++.</div><div class='add'>+</div><div class='add'>+Those arrays in qurltlds_p.h are derived from the Public</div><div class='add'>+Suffix List ([2]), which was originally provided by</div><div class='add'>+Jo Hermans &lt;jo.hermans@gmail.com&gt;.</div><div class='add'>+</div><div class='add'>+The file qurltlds_p.h was last generated Friday,</div><div class='add'>+November 19th 15:24 2010.</div><div class='add'>+</div><div class='add'>+----</div><div class='add'>+[1] list: http://mxr.mozilla.org/mozilla-central/source/netwerk/dns/effective_tld_names.dat?raw=1</div><div class='add'>+[2] homepage: http://publicsuffix.org/</div><div class='head'>diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri<br/>index 1851e04..a3628b1 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/kernel.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/kernel.pri</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/kernel.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/kernel.pri</a></div><div class='hunk'>@@ -1,102 +1,111 @@</div><div class='ctx'> # Qt core object module</div><div class='ctx'> </div><div class='ctx'> HEADERS += \</div><div class='del'>-	kernel/qabstracteventdispatcher.h \</div><div class='add'>+        kernel/qabstracteventdispatcher.h \</div><div class='ctx'>         kernel/qabstractitemmodel.h \</div><div class='ctx'>         kernel/qabstractitemmodel_p.h \</div><div class='del'>-	kernel/qbasictimer.h \</div><div class='del'>-	kernel/qeventloop.h\</div><div class='del'>-	kernel/qpointer.h \</div><div class='add'>+        kernel/qbasictimer.h \</div><div class='add'>+        kernel/qeventloop.h\</div><div class='add'>+        kernel/qpointer.h \</div><div class='ctx'>         kernel/qcorecmdlineargs_p.h \</div><div class='del'>-	kernel/qcoreapplication.h \</div><div class='del'>-	kernel/qcoreevent.h \</div><div class='del'>-	kernel/qmetaobject.h \</div><div class='del'>-	kernel/qmetatype.h \</div><div class='del'>-	kernel/qmimedata.h \</div><div class='del'>-	kernel/qobject.h \</div><div class='del'>-	kernel/qobjectdefs.h \</div><div class='del'>-	kernel/qsignalmapper.h \</div><div class='del'>-	kernel/qsocketnotifier.h \</div><div class='del'>-	kernel/qtimer.h \</div><div class='del'>-	kernel/qtranslator.h \</div><div class='add'>+        kernel/qcoreapplication.h \</div><div class='add'>+        kernel/qcoreevent.h \</div><div class='add'>+        kernel/qmetaobject.h \</div><div class='add'>+        kernel/qmetatype.h \</div><div class='add'>+        kernel/qmimedata.h \</div><div class='add'>+        kernel/qobject.h \</div><div class='add'>+        kernel/qobjectdefs.h \</div><div class='add'>+        kernel/qsignalmapper.h \</div><div class='add'>+        kernel/qsocketnotifier.h \</div><div class='add'>+        kernel/qtimer.h \</div><div class='add'>+        kernel/qtranslator.h \</div><div class='ctx'>         kernel/qtranslator_p.h \</div><div class='ctx'>         kernel/qvariant.h \</div><div class='del'>-	kernel/qabstracteventdispatcher_p.h \</div><div class='del'>-	kernel/qcoreapplication_p.h \</div><div class='del'>-	kernel/qobjectcleanuphandler.h \</div><div class='add'>+        kernel/qabstracteventdispatcher_p.h \</div><div class='add'>+        kernel/qcoreapplication_p.h \</div><div class='add'>+        kernel/qobjectcleanuphandler.h \</div><div class='ctx'>         kernel/qvariant_p.h \</div><div class='ctx'>         kernel/qmetaobject_p.h \</div><div class='ctx'>         kernel/qobject_p.h \</div><div class='del'>-	kernel/qcoreglobaldata_p.h \</div><div class='del'>-	kernel/qsharedmemory.h \</div><div class='add'>+        kernel/qcoreglobaldata_p.h \</div><div class='add'>+        kernel/qsharedmemory.h \</div><div class='ctx'>         kernel/qsharedmemory_p.h \</div><div class='ctx'>         kernel/qsystemsemaphore.h \</div><div class='ctx'>         kernel/qsystemsemaphore_p.h \</div><div class='ctx'>         kernel/qfunctions_p.h \</div><div class='del'>-        kernel/qmath.h</div><div class='add'>+        kernel/qmath.h \</div><div class='add'>+        kernel/qsystemerror_p.h</div><div class='ctx'> </div><div class='ctx'> SOURCES += \</div><div class='del'>-	kernel/qabstracteventdispatcher.cpp \</div><div class='add'>+        kernel/qabstracteventdispatcher.cpp \</div><div class='ctx'>         kernel/qabstractitemmodel.cpp \</div><div class='del'>-	kernel/qbasictimer.cpp \</div><div class='del'>-	kernel/qeventloop.cpp \</div><div class='del'>-	kernel/qcoreapplication.cpp \</div><div class='del'>-	kernel/qcoreevent.cpp \</div><div class='del'>-	kernel/qmetaobject.cpp \</div><div class='del'>-	kernel/qmetatype.cpp \</div><div class='del'>-	kernel/qmimedata.cpp \</div><div class='del'>-	kernel/qobject.cpp \</div><div class='del'>-	kernel/qobjectcleanuphandler.cpp \</div><div class='del'>-	kernel/qsignalmapper.cpp \</div><div class='del'>-	kernel/qsocketnotifier.cpp \</div><div class='del'>-	kernel/qtimer.cpp \</div><div class='del'>-	kernel/qtranslator.cpp \</div><div class='del'>-	kernel/qvariant.cpp \</div><div class='add'>+        kernel/qbasictimer.cpp \</div><div class='add'>+        kernel/qeventloop.cpp \</div><div class='add'>+        kernel/qcoreapplication.cpp \</div><div class='add'>+        kernel/qcoreevent.cpp \</div><div class='add'>+        kernel/qmetaobject.cpp \</div><div class='add'>+        kernel/qmetatype.cpp \</div><div class='add'>+        kernel/qmimedata.cpp \</div><div class='add'>+        kernel/qobject.cpp \</div><div class='add'>+        kernel/qobjectcleanuphandler.cpp \</div><div class='add'>+        kernel/qsignalmapper.cpp \</div><div class='add'>+        kernel/qsocketnotifier.cpp \</div><div class='add'>+        kernel/qtimer.cpp \</div><div class='add'>+        kernel/qtranslator.cpp \</div><div class='add'>+        kernel/qvariant.cpp \</div><div class='ctx'>         kernel/qcoreglobaldata.cpp \</div><div class='ctx'>         kernel/qsharedmemory.cpp \</div><div class='ctx'>         kernel/qsystemsemaphore.cpp \</div><div class='ctx'>         kernel/qpointer.cpp \</div><div class='del'>-        kernel/qmath.cpp</div><div class='add'>+        kernel/qmath.cpp \</div><div class='add'>+        kernel/qsystemerror.cpp</div><div class='ctx'> </div><div class='ctx'> win32 {</div><div class='del'>-	SOURCES += \</div><div class='del'>-		kernel/qeventdispatcher_win.cpp \</div><div class='del'>-		kernel/qcoreapplication_win.cpp \</div><div class='del'>-		kernel/qwineventnotifier_p.cpp \</div><div class='add'>+        SOURCES += \</div><div class='add'>+                kernel/qeventdispatcher_win.cpp \</div><div class='add'>+                kernel/qcoreapplication_win.cpp \</div><div class='add'>+                kernel/qwineventnotifier_p.cpp \</div><div class='ctx'>                 kernel/qsharedmemory_win.cpp \</div><div class='ctx'>                 kernel/qsystemsemaphore_win.cpp</div><div class='del'>-	HEADERS += \</div><div class='del'>-		kernel/qeventdispatcher_win_p.h \</div><div class='del'>-		kernel/qwineventnotifier_p.h</div><div class='add'>+        HEADERS += \</div><div class='add'>+                kernel/qeventdispatcher_win_p.h \</div><div class='add'>+                kernel/qwineventnotifier_p.h</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> wince*: {</div><div class='del'>-	SOURCES += \</div><div class='del'>-		kernel/qfunctions_wince.cpp</div><div class='del'>-	HEADERS += \</div><div class='del'>-		kernel/qfunctions_wince.h</div><div class='add'>+        SOURCES += \</div><div class='add'>+                kernel/qfunctions_wince.cpp</div><div class='add'>+        HEADERS += \</div><div class='add'>+                kernel/qfunctions_wince.h</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-mac:!embedded {</div><div class='add'>+mac:!embedded:!qpa{</div><div class='ctx'>     SOURCES += \</div><div class='ctx'>         kernel/qcoreapplication_mac.cpp</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-mac {</div><div class='add'>+mac:!nacl {</div><div class='ctx'>        SOURCES += \</div><div class='del'>-		kernel/qcore_mac.cpp</div><div class='add'>+                kernel/qcore_mac.cpp</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+nacl {</div><div class='add'>+    SOURCES += \</div><div class='add'>+        kernel/qfunctions_nacl.cpp</div><div class='add'>+    HEADERS += \</div><div class='add'>+        kernel/qfunctions_nacl.h</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unix:!symbian {</div><div class='del'>-	SOURCES += \</div><div class='add'>+        SOURCES += \</div><div class='ctx'>                 kernel/qcore_unix.cpp \</div><div class='ctx'>                 kernel/qcrashhandler.cpp \</div><div class='ctx'>                 kernel/qsharedmemory_unix.cpp \</div><div class='ctx'>                 kernel/qsystemsemaphore_unix.cpp</div><div class='del'>-	HEADERS += \</div><div class='add'>+        HEADERS += \</div><div class='ctx'>                 kernel/qcore_unix_p.h \</div><div class='del'>-		kernel/qcrashhandler_p.h</div><div class='add'>+                kernel/qcrashhandler_p.h</div><div class='ctx'> </div><div class='ctx'>         contains(QT_CONFIG, glib) {</div><div class='ctx'>             SOURCES += \</div><div class='hunk'>@@ -115,7 +124,7 @@ unix:!symbian {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> symbian {</div><div class='del'>-	SOURCES += \</div><div class='add'>+        SOURCES += \</div><div class='ctx'>                 kernel/qcore_unix.cpp \</div><div class='ctx'>                 kernel/qcrashhandler.cpp \</div><div class='ctx'>                 kernel/qeventdispatcher_symbian.cpp \</div><div class='hunk'>@@ -123,7 +132,7 @@ symbian {</div><div class='ctx'>                 kernel/qsharedmemory_symbian.cpp \</div><div class='ctx'>                 kernel/qsystemsemaphore_symbian.cpp</div><div class='ctx'> </div><div class='del'>-	HEADERS += \</div><div class='add'>+        HEADERS += \</div><div class='ctx'>                 kernel/qcore_unix_p.h \</div><div class='ctx'>                 kernel/qcrashhandler_p.h \</div><div class='ctx'>                 kernel/qeventdispatcher_symbian_p.h \</div><div class='hunk'>@@ -131,9 +140,25 @@ symbian {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> vxworks {</div><div class='del'>-	SOURCES += \</div><div class='del'>-		kernel/qfunctions_vxworks.cpp</div><div class='del'>-	HEADERS += \</div><div class='del'>-		kernel/qfunctions_vxworks.h</div><div class='add'>+        SOURCES += \</div><div class='add'>+                kernel/qfunctions_vxworks.cpp</div><div class='add'>+        HEADERS += \</div><div class='add'>+                kernel/qfunctions_vxworks.h</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+integrity {</div><div class='add'>+       SOURCES += \</div><div class='add'>+                 kernel/qcore_unix.cpp \</div><div class='add'>+                 kernel/qcrashhandler.cpp \</div><div class='add'>+                 kernel/qsharedmemory_unix.cpp \</div><div class='add'>+                 kernel/qsystemsemaphore_unix.cpp \</div><div class='add'>+                 kernel/qeventdispatcher_unix.cpp</div><div class='add'>+       HEADERS += \</div><div class='add'>+                 kernel/qcore_unix_p.h \</div><div class='add'>+                 kernel/qcrashhandler_p.h \</div><div class='add'>+                 kernel/qeventdispatcher_unix_p.h</div><div class='add'>+</div><div class='add'>+   contains(QT_CONFIG, clock-gettime):include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp<br/>index e0ee10e..1b07076 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qabstracteventdispatcher.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qabstracteventdispatcher.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qabstracteventdispatcher.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qabstracteventdispatcher.cpp</a></div><div class='hunk'>@@ -49,22 +49,51 @@</div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> // we allow for 2^24 = 8^8 = 16777216 simultaneously running timers</div><div class='del'>-enum { NumberOfBuckets = 8, FirstBucketSize = 8 };</div><div class='del'>-</div><div class='del'>-static const int BucketSize[NumberOfBuckets] =</div><div class='del'>-    { 8, 64, 512, 4096, 32768, 262144, 2097152, 16777216 - 2396744 };</div><div class='del'>-static const int BucketOffset[NumberOfBuckets] =</div><div class='del'>-    { 0,  8,  72,  584,  4680,  37448,  299592,  2396744 };</div><div class='del'>-</div><div class='del'>-static int FirstBucket[FirstBucketSize] = { 1, 2, 3, 4, 5, 6, 7, 8 };</div><div class='del'>-static QBasicAtomicPointer&lt;int&gt; timerIds[NumberOfBuckets] =</div><div class='add'>+static const int TimerIdMask = 0x00ffffff;</div><div class='add'>+static const int TimerSerialMask = ~TimerIdMask &amp; ~0x80000000;</div><div class='add'>+static const int TimerSerialCounter = TimerIdMask + 1;</div><div class='add'>+static const int MaxTimerId = TimerIdMask;</div><div class='add'>+</div><div class='add'>+static int FirstBucket[] = {</div><div class='add'>+     1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,</div><div class='add'>+    17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+    FirstBucketOffset  = 0,</div><div class='add'>+    SecondBucketOffset = sizeof(FirstBucket) / sizeof(FirstBucket[0]),</div><div class='add'>+    ThirdBucketOffset  = 0x100,</div><div class='add'>+    FourthBucketOffset = 0x1000,</div><div class='add'>+    FifthBucketOffset  = 0x10000,</div><div class='add'>+    SixthBucketOffset  = 0x100000</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+    FirstBucketSize  = SecondBucketOffset,</div><div class='add'>+    SecondBucketSize = ThirdBucketOffset - SecondBucketOffset,</div><div class='add'>+    ThirdBucketSize  = FourthBucketOffset - ThirdBucketOffset,</div><div class='add'>+    FourthBucketSize = FifthBucketOffset - FourthBucketOffset,</div><div class='add'>+    FifthBucketSize  = SixthBucketOffset - FifthBucketOffset,</div><div class='add'>+    SixthBucketSize  = MaxTimerId - SixthBucketOffset</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const int BucketSize[] = {</div><div class='add'>+    FirstBucketSize, SecondBucketSize, ThirdBucketSize,</div><div class='add'>+    FourthBucketSize, FifthBucketSize, SixthBucketSize</div><div class='add'>+};</div><div class='add'>+enum { NumberOfBuckets = sizeof(BucketSize) / sizeof(BucketSize[0]) };</div><div class='add'>+</div><div class='add'>+static const int BucketOffset[] = {</div><div class='add'>+    FirstBucketOffset, SecondBucketOffset, ThirdBucketOffset,</div><div class='add'>+    FourthBucketOffset, FifthBucketOffset, SixthBucketOffset</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static QBasicAtomicPointer&lt;int&gt; timerIds[] =</div><div class='ctx'>     { Q_BASIC_ATOMIC_INITIALIZER(FirstBucket),</div><div class='ctx'>       Q_BASIC_ATOMIC_INITIALIZER(0),</div><div class='ctx'>       Q_BASIC_ATOMIC_INITIALIZER(0),</div><div class='ctx'>       Q_BASIC_ATOMIC_INITIALIZER(0),</div><div class='ctx'>       Q_BASIC_ATOMIC_INITIALIZER(0),</div><div class='del'>-      Q_BASIC_ATOMIC_INITIALIZER(0),</div><div class='del'>-      Q_BASIC_ATOMIC_INITIALIZER(0),</div><div class='ctx'>       Q_BASIC_ATOMIC_INITIALIZER(0) };</div><div class='ctx'> </div><div class='ctx'> static void timerIdsDestructorFunction()</div><div class='hunk'>@@ -77,18 +106,23 @@ Q_DESTRUCTOR_FUNCTION(timerIdsDestructorFunction)</div><div class='ctx'> </div><div class='ctx'> static QBasicAtomicInt nextFreeTimerId = Q_BASIC_ATOMIC_INITIALIZER(1);</div><div class='ctx'> </div><div class='del'>-static const int TimerIdMask = 0x00ffffff;</div><div class='del'>-static const int TimerSerialMask = ~TimerIdMask &amp; ~0x80000000;</div><div class='del'>-static const int TimerSerialCounter = TimerIdMask + 1;</div><div class='del'>-</div><div class='ctx'> // avoid the ABA-problem by using 7 of the top 8 bits of the timerId as a serial number</div><div class='ctx'> static inline int prepareNewValueWithSerialNumber(int oldId, int newId)</div><div class='ctx'> {</div><div class='ctx'>     return (newId &amp; TimerIdMask) | ((oldId + TimerSerialCounter) &amp; TimerSerialMask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+namespace {</div><div class='add'>+    template&lt;bool&gt; struct QStaticAssertType;</div><div class='add'>+    template&lt;&gt; struct QStaticAssertType&lt;true&gt; { enum { Value = 1 }; };</div><div class='add'>+}</div><div class='add'>+#define q_static_assert(expr)     (void)QStaticAssertType&lt;expr&gt;::Value</div><div class='add'>+</div><div class='ctx'> static inline int bucketOffset(int timerId)</div><div class='ctx'> {</div><div class='add'>+    q_static_assert(sizeof BucketSize == sizeof BucketOffset);</div><div class='add'>+    q_static_assert(sizeof(timerIds) / sizeof(timerIds[0]) == NumberOfBuckets);</div><div class='add'>+</div><div class='ctx'>     for (int i = 0; i &lt; NumberOfBuckets; ++i) {</div><div class='ctx'>         if (timerId &lt; BucketSize[i])</div><div class='ctx'>             return i;</div><div class='hunk'>@@ -187,7 +221,8 @@ void QAbstractEventDispatcherPrivate::releaseTimerId(int timerId)</div><div class='ctx'>     int at = bucketIndex(bucket, which);</div><div class='ctx'>     int *b = timerIds[bucket];</div><div class='ctx'> </div><div class='del'>-    Q_ASSERT(b[at] == -timerId);</div><div class='add'>+    Q_ASSERT_X(timerId == -b[at], "QAbstractEventDispatcher::releaseTimerId",</div><div class='add'>+               "Internal error: timer ID not found");</div><div class='ctx'> </div><div class='ctx'>     int freeId, newTimerId;</div><div class='ctx'>     do {</div><div class='head'>diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/kernel/qabstractitemmodel.cpp<br/>index f613f5a..b7ac6aa 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qabstractitemmodel.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qabstractitemmodel.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qabstractitemmodel.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qabstractitemmodel.cpp</a></div><div class='hunk'>@@ -532,7 +532,7 @@ bool QAbstractItemModelPrivate::variantLessThan(const QVariant &amp;v1, const QVaria</div><div class='ctx'>     case 1: //floating point</div><div class='ctx'>         return v1.toReal() &lt; v2.toReal();</div><div class='ctx'>     default:</div><div class='del'>-        return v1.toString() &lt; v2.toString();</div><div class='add'>+        return v1.toString().localeAwareCompare(v2.toString()) &lt; 0;</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/kernel/qabstractitemmodel.h b/src/corelib/kernel/qabstractitemmodel.h<br/>index 3f75e25..c7af7a2 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qabstractitemmodel.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qabstractitemmodel.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qabstractitemmodel.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qabstractitemmodel.h</a></div><div class='hunk'>@@ -162,6 +162,7 @@ class Q_CORE_EXPORT QAbstractItemModel : public QObject</div><div class='ctx'> </div><div class='ctx'>     friend class QPersistentModelIndexData;</div><div class='ctx'>     friend class QAbstractItemViewPrivate;</div><div class='add'>+    friend class QIdentityProxyModel;</div><div class='ctx'> public:</div><div class='ctx'> </div><div class='ctx'>     explicit QAbstractItemModel(QObject *parent = 0);</div><div class='head'>diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h<br/>index b693de3..adbad83 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcore_mac_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcore_mac_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcore_mac_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qcore_mac_p.h</a></div><div class='hunk'>@@ -68,7 +68,15 @@</div><div class='ctx'> #  undef qDebug</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(QT_BUILD_QMAKE) || defined(QT_BOOTSTRAPPED)</div><div class='ctx'> #include &lt;ApplicationServices/ApplicationServices.h&gt;</div><div class='add'>+#else</div><div class='add'>+#include &lt;CoreFoundation/CoreFoundation.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_CORESERVICES</div><div class='add'>+#include &lt;CoreServices/CoreServices.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #undef DEBUG</div><div class='ctx'> #ifdef OLD_DEBUG</div><div class='head'>diff --git a/src/corelib/kernel/qcore_symbian_p.cpp b/src/corelib/kernel/qcore_symbian_p.cpp<br/>index 6cbf740..5b52ec2 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcore_symbian_p.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcore_symbian_p.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcore_symbian_p.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qcore_symbian_p.cpp</a></div><div class='hunk'>@@ -44,6 +44,7 @@</div><div class='ctx'> #include &lt;e32uid.h&gt;</div><div class='ctx'> #include "qcore_symbian_p.h"</div><div class='ctx'> #include &lt;string&gt;</div><div class='add'>+#include &lt;in_sock.h&gt;</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='hunk'>@@ -61,7 +62,8 @@ Q_CORE_EXPORT HBufC* qt_QString2HBufC(const QString&amp; aString)</div><div class='ctx'> #else</div><div class='ctx'>     TPtrC16 ptr(qt_QString2TPtrC(aString));</div><div class='ctx'> #endif</div><div class='del'>-    buffer = q_check_ptr(HBufC::New(ptr.Length()));</div><div class='add'>+    buffer = HBufC::New(ptr.Length());</div><div class='add'>+    Q_CHECK_PTR(buffer);</div><div class='ctx'>     buffer-&gt;Des().Copy(ptr);</div><div class='ctx'>     return buffer;</div><div class='ctx'> }</div><div class='hunk'>@@ -81,8 +83,9 @@ QHBufC::QHBufC()</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QHBufC::QHBufC(const QHBufC &amp;src)</div><div class='del'>-	: m_hBufC(q_check_ptr(src.m_hBufC-&gt;Alloc()))</div><div class='add'>+	: m_hBufC(src.m_hBufC-&gt;Alloc())</div><div class='ctx'> {</div><div class='add'>+    Q_CHECK_PTR(m_hBufC);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -201,6 +204,11 @@ private:</div><div class='ctx'>     RFs iFs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+uint qHash(const RSubSessionBase&amp; key)</div><div class='add'>+{</div><div class='add'>+    return qHash(key.SubSessionHandle());</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> Q_GLOBAL_STATIC(QS60RFsSession, qt_s60_RFsSession);</div><div class='ctx'> </div><div class='ctx'> Q_CORE_EXPORT RFs&amp; qt_s60GetRFs()</div><div class='hunk'>@@ -208,4 +216,102 @@ Q_CORE_EXPORT RFs&amp; qt_s60GetRFs()</div><div class='ctx'>     return qt_s60_RFsSession()-&gt;GetRFs();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+QSymbianSocketManager::QSymbianSocketManager() :</div><div class='add'>+    iNextSocket(0), iDefaultConnection(0)</div><div class='add'>+{</div><div class='add'>+    TSessionPref preferences;</div><div class='add'>+    // ### In future this could be changed to KAfInet6 when that is more common than IPv4</div><div class='add'>+    preferences.iAddrFamily = KAfInet;</div><div class='add'>+    preferences.iProtocol = KProtocolInetIp;</div><div class='add'>+    //use global message pool, as we do not know how many sockets app will use</div><div class='add'>+    //TODO: is this the right choice?</div><div class='add'>+    qt_symbian_throwIfError(iSocketServ.Connect(preferences, -1));</div><div class='add'>+    qt_symbian_throwIfError(iSocketServ.ShareAuto());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QSymbianSocketManager::~QSymbianSocketManager()</div><div class='add'>+{</div><div class='add'>+    iSocketServ.Close();</div><div class='add'>+    if(!socketMap.isEmpty()) {</div><div class='add'>+        qWarning("leaked %d sockets on exit", socketMap.count());</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+RSocketServ&amp; QSymbianSocketManager::getSocketServer() {</div><div class='add'>+    return iSocketServ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int QSymbianSocketManager::addSocket(const RSocket&amp; socket) {</div><div class='add'>+    QHashableSocket sock(static_cast&lt;const QHashableSocket &amp;&gt;(socket));</div><div class='add'>+    QMutexLocker l(&amp;iMutex);</div><div class='add'>+    Q_ASSERT(!socketMap.contains(sock));</div><div class='add'>+    if(socketMap.contains(sock))</div><div class='add'>+        return socketMap.value(sock);</div><div class='add'>+    // allocate socket number</div><div class='add'>+    int guard = 0;</div><div class='add'>+    while(reverseSocketMap.contains(iNextSocket)) {</div><div class='add'>+        iNextSocket++;</div><div class='add'>+        iNextSocket %= max_sockets;</div><div class='add'>+        guard++;</div><div class='add'>+        if(guard &gt; max_sockets)</div><div class='add'>+            return -1;</div><div class='add'>+    }</div><div class='add'>+    int id = iNextSocket;</div><div class='add'>+</div><div class='add'>+    socketMap[sock] = id;</div><div class='add'>+    reverseSocketMap[id] = sock;</div><div class='add'>+    return id + socket_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QSymbianSocketManager::removeSocket(const RSocket &amp;socket) {</div><div class='add'>+    QHashableSocket sock(static_cast&lt;const QHashableSocket &amp;&gt;(socket));</div><div class='add'>+    QMutexLocker l(&amp;iMutex);</div><div class='add'>+    if(!socketMap.contains(sock))</div><div class='add'>+        return false;</div><div class='add'>+    int id = socketMap.value(sock);</div><div class='add'>+    socketMap.remove(sock);</div><div class='add'>+    reverseSocketMap.remove(id);</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int QSymbianSocketManager::lookupSocket(const RSocket&amp; socket) const {</div><div class='add'>+    QHashableSocket sock(static_cast&lt;const QHashableSocket &amp;&gt;(socket));</div><div class='add'>+    QMutexLocker l(&amp;iMutex);</div><div class='add'>+    if(!socketMap.contains(sock))</div><div class='add'>+        return -1;</div><div class='add'>+    int id = socketMap.value(sock);</div><div class='add'>+    return id + socket_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QSymbianSocketManager::lookupSocket(int fd, RSocket&amp; socket) const {</div><div class='add'>+    QMutexLocker l(&amp;iMutex);</div><div class='add'>+    int id = fd - socket_offset;</div><div class='add'>+    if(!reverseSocketMap.contains(id))</div><div class='add'>+        return false;</div><div class='add'>+    socket = reverseSocketMap.value(id);</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QSymbianSocketManager::setDefaultConnection(RConnection* con)</div><div class='add'>+{</div><div class='add'>+    iDefaultConnection = con;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+RConnection* QSymbianSocketManager::defaultConnection() const</div><div class='add'>+{</div><div class='add'>+    return iDefaultConnection;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+Q_GLOBAL_STATIC(QSymbianSocketManager, qt_symbianSocketManager);</div><div class='add'>+</div><div class='add'>+QSymbianSocketManager&amp; QSymbianSocketManager::instance()</div><div class='add'>+{</div><div class='add'>+    return *(qt_symbianSocketManager());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+Q_CORE_EXPORT RSocketServ&amp; qt_symbianGetSocketServer()</div><div class='add'>+{</div><div class='add'>+    return QSymbianSocketManager::instance().getSocketServer();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/kernel/qcore_symbian_p.h b/src/corelib/kernel/qcore_symbian_p.h<br/>index 719361c..84c6fed 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcore_symbian_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcore_symbian_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcore_symbian_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qcore_symbian_p.h</a></div><div class='hunk'>@@ -55,10 +55,12 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;e32std.h&gt;</div><div class='ctx'> #include &lt;QtCore/qglobal.h&gt;</div><div class='add'>+#include &lt;QtCore/qmutex.h&gt;</div><div class='ctx'> #include &lt;qstring.h&gt;</div><div class='ctx'> #include &lt;qrect.h&gt;</div><div class='ctx'> #include &lt;qhash.h&gt;</div><div class='ctx'> #include &lt;f32file.h&gt;</div><div class='add'>+#include &lt;es_sock.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define QT_LSTRING2(x) L##x</div><div class='ctx'> #define QT_LSTRING(x) QT_LSTRING2(x)</div><div class='hunk'>@@ -154,10 +156,125 @@ enum S60PluginFuncOrdinals</div><div class='ctx'> Q_CORE_EXPORT TLibraryFunction qt_resolveS60PluginFunc(int ordinal);</div><div class='ctx'> </div><div class='ctx'> Q_CORE_EXPORT RFs&amp; qt_s60GetRFs();</div><div class='add'>+Q_CORE_EXPORT RSocketServ&amp; qt_symbianGetSocketServer();</div><div class='ctx'> </div><div class='ctx'> // Defined in qlocale_symbian.cpp.</div><div class='ctx'> Q_CORE_EXPORT QByteArray qt_symbianLocaleName(int code);</div><div class='ctx'> </div><div class='add'>+template &lt;typename R&gt;</div><div class='add'>+struct QScopedPointerRCloser</div><div class='add'>+{</div><div class='add'>+    static inline void cleanup(R *rPointer)</div><div class='add'>+    {</div><div class='add'>+        // Enforce a complete type.</div><div class='add'>+        // If you get a compile error here, read the section on forward declared</div><div class='add'>+        // classes in the QScopedPointer documentation.</div><div class='add'>+        typedef char IsIncompleteType[ sizeof(R) ? 1 : -1 ];</div><div class='add'>+        (void) sizeof(IsIncompleteType);</div><div class='add'>+</div><div class='add'>+        if (rPointer)</div><div class='add'>+            rPointer-&gt;Close();</div><div class='add'>+    }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+//Wrapper for RSocket so it can be used as a key in QHash or QMap</div><div class='add'>+class QHashableSocket : public RSocket</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    bool operator==(const QHashableSocket &amp;other) const</div><div class='add'>+    {</div><div class='add'>+        return SubSessionHandle() == other.SubSessionHandle()</div><div class='add'>+            &amp;&amp; Session().Handle() == other.Session().Handle();</div><div class='add'>+    }</div><div class='add'>+    bool operator&lt;(const QHashableSocket &amp;other) const</div><div class='add'>+    {</div><div class='add'>+        if (Session().Handle() == other.Session().Handle())</div><div class='add'>+            return SubSessionHandle() &lt; other.SubSessionHandle();</div><div class='add'>+        return Session().Handle() &lt; other.Session().Handle();</div><div class='add'>+    }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+uint qHash(const RSubSessionBase&amp; key);</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+  \internal</div><div class='add'>+  This class exists in QtCore for the benefit of QSocketNotifier, which uses integer</div><div class='add'>+  file descriptors in its public API.</div><div class='add'>+  So we need a way to map between int and RSocket.</div><div class='add'>+  Additionally, it is used to host the global RSocketServ session</div><div class='add'>+*/</div><div class='add'>+class Q_CORE_EXPORT QSymbianSocketManager</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    QSymbianSocketManager();</div><div class='add'>+    ~QSymbianSocketManager();</div><div class='add'>+</div><div class='add'>+    /*!</div><div class='add'>+      \internal</div><div class='add'>+      \return handle to the socket server</div><div class='add'>+    */</div><div class='add'>+    RSocketServ&amp; getSocketServer();</div><div class='add'>+    /*!</div><div class='add'>+      \internal</div><div class='add'>+      Adds a symbian socket to the global map</div><div class='add'>+      \param an open socket</div><div class='add'>+      \return pseudo file descriptor, -1 if out of resources</div><div class='add'>+    */</div><div class='add'>+    int addSocket(const RSocket &amp;sock);</div><div class='add'>+    /*!</div><div class='add'>+      \internal</div><div class='add'>+      Removes a symbian socket from the global map</div><div class='add'>+      \param an open socket</div><div class='add'>+      \return true if the socket was in the map</div><div class='add'>+    */</div><div class='add'>+    bool removeSocket(const RSocket &amp;sock);</div><div class='add'>+    /*!</div><div class='add'>+      \internal</div><div class='add'>+      Get pseudo file descriptor for a socket</div><div class='add'>+      \param an open socket</div><div class='add'>+      \return integer handle, or -1 if not in map</div><div class='add'>+    */</div><div class='add'>+    int lookupSocket(const RSocket &amp;sock) const;</div><div class='add'>+    /*!</div><div class='add'>+      \internal</div><div class='add'>+      Get socket for a pseudo file descriptor</div><div class='add'>+      \param an open socket fd</div><div class='add'>+      \param sock (out) socket handle</div><div class='add'>+      \return true on success or false if not in map</div><div class='add'>+    */</div><div class='add'>+    bool lookupSocket(int fd, RSocket&amp; sock) const;</div><div class='add'>+</div><div class='add'>+    /*!</div><div class='add'>+      \internal</div><div class='add'>+      Set the default connection to use for new sockets</div><div class='add'>+      \param an open connection</div><div class='add'>+    */</div><div class='add'>+    void setDefaultConnection(RConnection* con);</div><div class='add'>+    /*!</div><div class='add'>+      \internal</div><div class='add'>+      Get the default connection to use for new sockets</div><div class='add'>+      \return the connection, or null pointer if there is none set</div><div class='add'>+    */</div><div class='add'>+    RConnection *defaultConnection() const;</div><div class='add'>+</div><div class='add'>+    /*!</div><div class='add'>+      \internal</div><div class='add'>+      Gets a reference to the singleton socket manager</div><div class='add'>+    */</div><div class='add'>+    static QSymbianSocketManager&amp; instance();</div><div class='add'>+private:</div><div class='add'>+    int allocateSocket();</div><div class='add'>+</div><div class='add'>+    const static int max_sockets = 0x20000; //covers all TCP and UDP ports, probably run out of memory first</div><div class='add'>+    const static int socket_offset = 0x40000000; //hacky way of separating sockets from file descriptors</div><div class='add'>+    int iNextSocket;</div><div class='add'>+    QHash&lt;QHashableSocket, int&gt; socketMap;</div><div class='add'>+    QHash&lt;int, RSocket&gt; reverseSocketMap;</div><div class='add'>+    mutable QMutex iMutex;</div><div class='add'>+    RSocketServ iSocketServ;</div><div class='add'>+    RConnection *iDefaultConnection;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> QT_END_HEADER</div><div class='head'>diff --git a/src/corelib/kernel/qcore_unix.cpp b/src/corelib/kernel/qcore_unix.cpp<br/>index f1beeb9..f30fcee 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcore_unix.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcore_unix.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcore_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qcore_unix.cpp</a></div><div class='hunk'>@@ -42,7 +42,8 @@</div><div class='ctx'> #include "qcore_unix_p.h"</div><div class='ctx'> #include "qelapsedtimer.h"</div><div class='ctx'> </div><div class='del'>-#ifndef Q_OS_VXWORKS</div><div class='add'>+#ifdef Q_OS_NACL</div><div class='add'>+#elif !defined (Q_OS_VXWORKS)</div><div class='ctx'> # if !defined(Q_OS_HPUX) || defined(__ia64)</div><div class='ctx'> #  include &lt;sys/select.h&gt;</div><div class='ctx'> # endif</div><div class='head'>diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h<br/>index e762ebc..00ec4af 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcore_unix_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcore_unix_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcore_unix_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qcore_unix_p.h</a></div><div class='hunk'>@@ -319,6 +319,15 @@ timeval qt_gettime(); // in qelapsedtimer_mac.cpp or qtimestamp_unix.cpp</div><div class='ctx'> Q_CORE_EXPORT int qt_safe_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept,</div><div class='ctx'>                                  const struct timeval *tv);</div><div class='ctx'> </div><div class='add'>+// according to X/OPEN we have to define semun ourselves</div><div class='add'>+// we use prefix as on some systems sem.h will have it</div><div class='add'>+struct semid_ds;</div><div class='add'>+union qt_semun {</div><div class='add'>+    int val;                    /* value for SETVAL */</div><div class='add'>+    struct semid_ds *buf;       /* buffer for IPC_STAT, IPC_SET */</div><div class='add'>+    unsigned short *array;      /* array for GETALL, SETALL */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp<br/>index 850e8af..750204f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcoreapplication.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcoreapplication.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcoreapplication.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qcoreapplication.cpp</a></div><div class='hunk'>@@ -71,6 +71,7 @@</div><div class='ctx'> #  include &lt;e32ldr.h&gt;</div><div class='ctx'> #  include "qeventdispatcher_symbian_p.h"</div><div class='ctx'> #  include "private/qcore_symbian_p.h"</div><div class='add'>+#  include "private/qfilesystemengine_p.h"</div><div class='ctx'> #  include &lt;apacmdln.h&gt;</div><div class='ctx'> #elif defined(Q_OS_UNIX)</div><div class='ctx'> #  if !defined(QT_NO_GLIB)</div><div class='hunk'>@@ -174,6 +175,11 @@ CApaCommandLine* QCoreApplicationPrivate::symbianCommandLine()</div><div class='ctx'> extern QString qAppFileName();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+int QCoreApplicationPrivate::app_compile_version = 0x040000; //we don't know exactly, but it's at least 4.0.0</div><div class='add'>+#if defined(QT3_SUPPORT)</div><div class='add'>+bool QCoreApplicationPrivate::useQt3Support = true;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #if !defined(Q_OS_WIN)</div><div class='ctx'> #ifdef Q_OS_MAC</div><div class='ctx'> QString QCoreApplicationPrivate::macMenuBarName()</div><div class='hunk'>@@ -264,6 +270,17 @@ bool QCoreApplicationPrivate::is_app_closing = false;</div><div class='ctx'> Q_CORE_EXPORT bool qt_locale_initialized = false;</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+  Create an instance of Trolltech.conf. This ensures that the settings will not</div><div class='add'>+  be thrown out of QSetting's cache for unused settings.</div><div class='add'>+  */</div><div class='add'>+Q_GLOBAL_STATIC_WITH_ARGS(QSettings, staticTrolltechConf, (QSettings::UserScope, QLatin1String("Trolltech")))</div><div class='add'>+</div><div class='add'>+QSettings *QCoreApplicationPrivate::trolltechConf()</div><div class='add'>+{</div><div class='add'>+    return staticTrolltechConf();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> Q_CORE_EXPORT uint qGlobalPostedEventsCount()</div><div class='ctx'> {</div><div class='ctx'>     QThreadData *currentThreadData = QThreadData::current();</div><div class='hunk'>@@ -315,10 +332,14 @@ struct QCoreApplicationData {</div><div class='ctx'> </div><div class='ctx'> Q_GLOBAL_STATIC(QCoreApplicationData, coreappdata)</div><div class='ctx'> </div><div class='del'>-QCoreApplicationPrivate::QCoreApplicationPrivate(int &amp;aargc, char **aargv)</div><div class='add'>+QCoreApplicationPrivate::QCoreApplicationPrivate(int &amp;aargc, char **aargv, uint flags)</div><div class='ctx'>     : QObjectPrivate(), argc(aargc), argv(aargv), application_type(0), eventFilter(0),</div><div class='ctx'>       in_exec(false), aboutToQuitEmitted(false)</div><div class='ctx'> {</div><div class='add'>+    app_compile_version = flags &amp; 0xffffff;</div><div class='add'>+#if defined(QT3_SUPPORT)</div><div class='add'>+    useQt3Support = !(flags &amp; 0x01000000);</div><div class='add'>+#endif</div><div class='ctx'>     static const char *const empty = "";</div><div class='ctx'>     if (argc == 0 || argv == 0) {</div><div class='ctx'>         argc = 0;</div><div class='hunk'>@@ -566,7 +587,7 @@ void QCoreApplication::flush()</div><div class='ctx'>     one valid character string.</div><div class='ctx'> */</div><div class='ctx'> QCoreApplication::QCoreApplication(int &amp;argc, char **argv)</div><div class='del'>-    : QObject(*new QCoreApplicationPrivate(argc, argv))</div><div class='add'>+    : QObject(*new QCoreApplicationPrivate(argc, argv, 0x040000))</div><div class='ctx'> {</div><div class='ctx'>     init();</div><div class='ctx'>     QCoreApplicationPrivate::eventDispatcher-&gt;startingUp();</div><div class='hunk'>@@ -582,6 +603,25 @@ QCoreApplication::QCoreApplication(int &amp;argc, char **argv)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+QCoreApplication::QCoreApplication(int &amp;argc, char **argv, int _internal)</div><div class='add'>+: QObject(*new QCoreApplicationPrivate(argc, argv, _internal))</div><div class='add'>+{</div><div class='add'>+    init();</div><div class='add'>+    QCoreApplicationPrivate::eventDispatcher-&gt;startingUp();</div><div class='add'>+#if defined(Q_OS_SYMBIAN)</div><div class='add'>+#ifndef QT_NO_LIBRARY</div><div class='add'>+    // Refresh factoryloader, as text codecs are requested during lib path</div><div class='add'>+    // resolving process and won't be therefore properly loaded.</div><div class='add'>+    // Unknown if this is symbian specific issue.</div><div class='add'>+    QFactoryLoader::refreshAll();</div><div class='add'>+#endif</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+    d_func()-&gt;symbianInit();</div><div class='add'>+#endif</div><div class='add'>+#endif //Q_OS_SYMBIAN</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> // ### move to QCoreApplicationPrivate constructor?</div><div class='ctx'> void QCoreApplication::init()</div><div class='ctx'> {</div><div class='hunk'>@@ -595,6 +635,12 @@ void QCoreApplication::init()</div><div class='ctx'>     Q_ASSERT_X(!self, "QCoreApplication", "there should be only one application object");</div><div class='ctx'>     QCoreApplication::self = this;</div><div class='ctx'> </div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+    //ensure temp and working directories exist</div><div class='add'>+    QFileSystemEngine::createDirectory(QFileSystemEntry(QFileSystemEngine::tempPath()), true);</div><div class='add'>+    QFileSystemEngine::createDirectory(QFileSystemEntry(QFileSystemEngine::currentPath()), true);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef QT_NO_THREAD</div><div class='ctx'>     QThread::initialize();</div><div class='ctx'> #endif</div><div class='hunk'>@@ -860,11 +906,6 @@ bool QCoreApplication::notify(QObject *receiver, QEvent *event)</div><div class='ctx'>     d-&gt;checkReceiverThread(receiver);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef QT3_SUPPORT</div><div class='del'>-    if (event-&gt;type() == QEvent::ChildRemoved &amp;&amp; !receiver-&gt;d_func()-&gt;pendingChildInsertedEvents.isEmpty())</div><div class='del'>-        receiver-&gt;d_func()-&gt;removePendingChildInsertedEvents(static_cast&lt;QChildEvent *&gt;(event)-&gt;child());</div><div class='del'>-#endif // QT3_SUPPORT</div><div class='del'>-</div><div class='ctx'>     return receiver-&gt;isWidgetType() ? false : d-&gt;notify_helper(receiver, event);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1074,6 +1115,7 @@ int QCoreApplication::exec()</div><div class='ctx'>     return returnCode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /*!</div><div class='ctx'>   Tells the application to exit with a return code.</div><div class='ctx'> </div><div class='hunk'>@@ -1530,7 +1572,7 @@ void QCoreApplication::removePostedEvents(QObject *receiver, int eventType)</div><div class='ctx'>             --pe.receiver-&gt;d_func()-&gt;postedEvents;</div><div class='ctx'> #ifdef QT3_SUPPORT</div><div class='ctx'>             if (pe.event-&gt;type() == QEvent::ChildInsertedRequest)</div><div class='del'>-                pe.receiver-&gt;d_func()-&gt;removePendingChildInsertedEvents(0);</div><div class='add'>+                pe.receiver-&gt;d_func()-&gt;pendingChildInsertedEvents.clear();</div><div class='ctx'> #endif</div><div class='ctx'>             pe.event-&gt;posted = false;</div><div class='ctx'>             events.append(pe.event);</div><div class='head'>diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h<br/>index 359499b..777fd74 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcoreapplication.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcoreapplication.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcoreapplication.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qcoreapplication.h</a></div><div class='hunk'>@@ -78,7 +78,23 @@ class Q_CORE_EXPORT QCoreApplication : public QObject</div><div class='ctx'> </div><div class='ctx'>     Q_DECLARE_PRIVATE(QCoreApplication)</div><div class='ctx'> public:</div><div class='del'>-    QCoreApplication(int &amp;argc, char **argv);</div><div class='add'>+    enum { ApplicationFlags = QT_VERSION</div><div class='add'>+#if !defined(QT3_SUPPORT)</div><div class='add'>+        | 0x01000000</div><div class='add'>+#endif</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+#if defined(QT_BUILD_CORE_LIB) || defined(qdoc)</div><div class='add'>+    QCoreApplication(int &amp;argc, char **argv); // ### Qt5 remove</div><div class='add'>+#endif</div><div class='add'>+#if !defined(qdoc)</div><div class='add'>+    QCoreApplication(int &amp;argc, char **argv, int</div><div class='add'>+#if !defined(QT_BUILD_CORE_LIB)</div><div class='add'>+        = ApplicationFlags</div><div class='add'>+#endif</div><div class='add'>+        );</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'>     ~QCoreApplication();</div><div class='ctx'> </div><div class='ctx'> #ifdef QT_DEPRECATED</div><div class='head'>diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h<br/>index 2b2e411..c6c6489 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcoreapplication_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcoreapplication_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcoreapplication_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qcoreapplication_p.h</a></div><div class='hunk'>@@ -55,6 +55,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "QtCore/qcoreapplication.h"</div><div class='ctx'> #include "QtCore/qtranslator.h"</div><div class='add'>+#include "QtCore/qsettings.h"</div><div class='ctx'> #include "private/qobject_p.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef Q_OS_SYMBIAN</div><div class='hunk'>@@ -78,7 +79,7 @@ class Q_CORE_EXPORT QCoreApplicationPrivate : public QObjectPrivate</div><div class='ctx'>     Q_DECLARE_PUBLIC(QCoreApplication)</div><div class='ctx'> </div><div class='ctx'> public:</div><div class='del'>-    QCoreApplicationPrivate(int &amp;aargc,  char **aargv);</div><div class='add'>+    QCoreApplicationPrivate(int &amp;aargc,  char **aargv, uint flags);</div><div class='ctx'>     ~QCoreApplicationPrivate();</div><div class='ctx'> </div><div class='ctx'>     bool sendThroughApplicationEventFilters(QObject *, QEvent *);</div><div class='hunk'>@@ -135,6 +136,11 @@ public:</div><div class='ctx'> </div><div class='ctx'>     static uint attribs;</div><div class='ctx'>     static inline bool testAttribute(uint flag) { return attribs &amp; (1 &lt;&lt; flag); }</div><div class='add'>+    static int app_compile_version;</div><div class='add'>+#if defined(QT3_SUPPORT)</div><div class='add'>+    static bool useQt3Support;</div><div class='add'>+#endif</div><div class='add'>+    static QSettings *trolltechConf();</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h<br/>index 90f8f8e..281367b 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcoreevent.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcoreevent.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcoreevent.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qcoreevent.h</a></div><div class='hunk'>@@ -328,6 +328,7 @@ private:</div><div class='ctx'>     friend class QETWidget;</div><div class='ctx'>     friend class QGraphicsView;</div><div class='ctx'>     friend class QGraphicsViewPrivate;</div><div class='add'>+    friend class QGraphicsScene;</div><div class='ctx'>     friend class QGraphicsScenePrivate;</div><div class='ctx'> #ifndef QT_NO_GESTURES</div><div class='ctx'>     friend class QGestureManager;</div><div class='head'>diff --git a/src/corelib/kernel/qcrashhandler.cpp b/src/corelib/kernel/qcrashhandler.cpp<br/>index 6c73516..979e215 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcrashhandler.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qcrashhandler.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qcrashhandler.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qcrashhandler.cpp</a></div><div class='hunk'>@@ -339,6 +339,9 @@ static void print_backtrace(FILE *outb)</div><div class='ctx'>                          "EOF\n",</div><div class='ctx'>                          globalProgName, (int)getpid()))</div><div class='ctx'>         return;</div><div class='add'>+#elif defined(Q_OS_INTEGRITY)</div><div class='add'>+    /* abort */</div><div class='add'>+    CheckSuccess(Failure);</div><div class='ctx'> #else /* All other platforms */</div><div class='ctx'>     /*</div><div class='ctx'>      * TODO: SCO/UnixWare 7 must be something like (not tested)</div><div class='head'>diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp<br/>index 00c3eab..176048d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qeventdispatcher_glib.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qeventdispatcher_glib.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qeventdispatcher_glib.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qeventdispatcher_glib.cpp</a></div><div class='hunk'>@@ -180,6 +180,8 @@ static gboolean timerSourceCheck(GSource *source)</div><div class='ctx'> static gboolean timerSourceDispatch(GSource *source, GSourceFunc, gpointer)</div><div class='ctx'> {</div><div class='ctx'>     GTimerSource *timerSource = reinterpret_cast&lt;GTimerSource *&gt;(source);</div><div class='add'>+    if (timerSource-&gt;processEventsFlags &amp; QEventLoop::X11ExcludeTimers)</div><div class='add'>+        return true;</div><div class='ctx'>     timerSource-&gt;runWithIdlePriority = true;</div><div class='ctx'>     (void) timerSource-&gt;timerList.activateTimers();</div><div class='ctx'>     return true; // ??? don't remove, right again?</div><div class='head'>diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp<br/>index 5e2bc4f..1d7ecce 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qeventdispatcher_symbian.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qeventdispatcher_symbian.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qeventdispatcher_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qeventdispatcher_symbian.cpp</a></div><div class='hunk'>@@ -43,6 +43,7 @@</div><div class='ctx'> #include &lt;private/qthread_p.h&gt;</div><div class='ctx'> #include &lt;qcoreapplication.h&gt;</div><div class='ctx'> #include &lt;private/qcoreapplication_p.h&gt;</div><div class='add'>+#include &lt;qsemaphore.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='hunk'>@@ -134,7 +135,7 @@ private:</div><div class='ctx'>  * The QCompleteDeferredAOs class is a special object that runs after all others, which will</div><div class='ctx'>  * reactivate the objects that were previously not run.</div><div class='ctx'>  */</div><div class='del'>-inline QActiveObject::QActiveObject(TInt priority, QEventDispatcherSymbian *dispatcher)</div><div class='add'>+QActiveObject::QActiveObject(TInt priority, QEventDispatcherSymbian *dispatcher)</div><div class='ctx'>     : CActive(priority),</div><div class='ctx'>       m_dispatcher(dispatcher),</div><div class='ctx'>       m_hasAlreadyRun(false),</div><div class='hunk'>@@ -166,12 +167,25 @@ bool QActiveObject::maybeQueueForLater()</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool QActiveObject::maybeDeferSocketEvent()</div><div class='add'>+{</div><div class='add'>+    Q_ASSERT(!m_hasRunAgain);</div><div class='add'>+    Q_ASSERT(m_dispatcher);</div><div class='add'>+    if (!m_dispatcher-&gt;areSocketEventsBlocked()) {</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+    m_hasRunAgain = true;</div><div class='add'>+    m_dispatcher-&gt;addDeferredSocketActiveObject(this);</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void QActiveObject::reactivateAndComplete()</div><div class='ctx'> {</div><div class='add'>+    TInt error = iStatus.Int();</div><div class='ctx'>     iStatus = KRequestPending;</div><div class='ctx'>     SetActive();</div><div class='ctx'>     TRequestStatus *status = &amp;iStatus;</div><div class='del'>-    QEventDispatcherSymbian::RequestComplete(status, KErrNone);</div><div class='add'>+    QEventDispatcherSymbian::RequestComplete(status, error);</div><div class='ctx'> </div><div class='ctx'>     m_hasRunAgain = false;</div><div class='ctx'>     m_hasAlreadyRun = false;</div><div class='hunk'>@@ -180,6 +194,7 @@ void QActiveObject::reactivateAndComplete()</div><div class='ctx'> QWakeUpActiveObject::QWakeUpActiveObject(QEventDispatcherSymbian *dispatcher)</div><div class='ctx'>     : QActiveObject(WAKE_UP_PRIORITY, dispatcher)</div><div class='ctx'> {</div><div class='add'>+    m_hostThreadId = RThread().Id();</div><div class='ctx'>     CActiveScheduler::Add(this);</div><div class='ctx'>     iStatus = KRequestPending;</div><div class='ctx'>     SetActive();</div><div class='hunk'>@@ -195,6 +210,15 @@ void QWakeUpActiveObject::DoCancel()</div><div class='ctx'>     if (iStatus.Int() == KRequestPending) {</div><div class='ctx'>         TRequestStatus *status = &amp;iStatus;</div><div class='ctx'>         QEventDispatcherSymbian::RequestComplete(status, KErrNone);</div><div class='add'>+    } else if (IsActive() &amp;&amp; m_hostThreadId != RThread().Id()) {</div><div class='add'>+        // This is being cancelled in the adopted monitor thread, which can happen if an adopted thread with</div><div class='add'>+        // an event loop has exited. The event loop creates an event dispatcher with this active object, which may be complete but not run on exit.</div><div class='add'>+        // We force a cancellation in this thread, because a) the object cannot be deleted while active and b) without a cancellation</div><div class='add'>+        // the thread semaphore will be one count down.</div><div class='add'>+        // It is possible for this problem to affect other active objects. They symptom would be that finished signals</div><div class='add'>+        // from adopted threads are not sent, or they arrive much later than they should.</div><div class='add'>+        TRequestStatus *status = &amp;iStatus;</div><div class='add'>+        User::RequestComplete(status, KErrNone);</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -651,10 +675,28 @@ void QSocketActiveObject::DoCancel()</div><div class='ctx'> </div><div class='ctx'> void QSocketActiveObject::RunL()</div><div class='ctx'> {</div><div class='add'>+    if (maybeDeferSocketEvent())</div><div class='add'>+        return;</div><div class='ctx'>     if (maybeQueueForLater())</div><div class='ctx'>         return;</div><div class='ctx'> </div><div class='del'>-    QT_TRYCATCH_LEAVING(m_dispatcher-&gt;socketFired(this));</div><div class='add'>+    QT_TRYCATCH_LEAVING(run());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QSocketActiveObject::run()</div><div class='add'>+{</div><div class='add'>+    QEvent e(QEvent::SockAct);</div><div class='add'>+    m_inSocketEvent = true;</div><div class='add'>+    QCoreApplication::sendEvent(m_notifier, &amp;e);</div><div class='add'>+    m_inSocketEvent = false;</div><div class='add'>+</div><div class='add'>+    if (m_deleteLater) {</div><div class='add'>+        delete this;</div><div class='add'>+    } else {</div><div class='add'>+        iStatus = KRequestPending;</div><div class='add'>+        SetActive();</div><div class='add'>+        m_dispatcher-&gt;reactivateSocketNotifier(m_notifier);</div><div class='add'>+    }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void QSocketActiveObject::deleteLater()</div><div class='hunk'>@@ -671,34 +713,54 @@ class QIdleDetectorThread</div><div class='ctx'> {</div><div class='ctx'> public:</div><div class='ctx'>     QIdleDetectorThread()</div><div class='del'>-    : m_state(STATE_RUN), m_stop(false)</div><div class='add'>+    : m_state(STATE_RUN), m_stop(false), m_running(false)</div><div class='add'>+    {</div><div class='add'>+        start();</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    ~QIdleDetectorThread()</div><div class='add'>+    {</div><div class='add'>+        stop();</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    void start()</div><div class='ctx'>     {</div><div class='del'>-        qt_symbian_throwIfError(m_lock.CreateLocal(0));</div><div class='del'>-        TInt err = m_idleDetectorThread.Create(KNullDesC(), &amp;idleDetectorThreadFunc, 1024, NULL, this);</div><div class='add'>+        QMutexLocker lock(&amp;m_mutex);</div><div class='add'>+        if (m_running)</div><div class='add'>+            return;</div><div class='add'>+        m_stop = false;</div><div class='add'>+        m_state = STATE_RUN;</div><div class='add'>+        TInt err = m_idleDetectorThread.Create(KNullDesC(), &amp;idleDetectorThreadFunc, 1024, &amp;User::Allocator(), this);</div><div class='ctx'>         if (err != KErrNone)</div><div class='del'>-            m_lock.Close();</div><div class='del'>-        qt_symbian_throwIfError(err);</div><div class='add'>+            return;     // Fail silently on error. Next kick will try again. Exception might stop the event being processed</div><div class='ctx'>         m_idleDetectorThread.SetPriority(EPriorityAbsoluteBackgroundNormal);</div><div class='ctx'>         m_idleDetectorThread.Resume();</div><div class='add'>+        m_running = true;</div><div class='add'>+        // get a callback from QCoreApplication destruction to stop this thread</div><div class='add'>+        qAddPostRoutine(StopIdleDetectorThread);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    ~QIdleDetectorThread()</div><div class='add'>+    void stop()</div><div class='ctx'>     {</div><div class='add'>+        QMutexLocker lock(&amp;m_mutex);</div><div class='add'>+        if (!m_running)</div><div class='add'>+            return;</div><div class='ctx'>         // close down the idle thread because if corelib is loaded temporarily, this would leak threads into the host process</div><div class='ctx'>         m_stop = true;</div><div class='del'>-        m_lock.Signal();</div><div class='add'>+        m_kick.release();</div><div class='ctx'>         m_idleDetectorThread.SetPriority(EPriorityNormal);</div><div class='ctx'>         TRequestStatus s;</div><div class='ctx'>         m_idleDetectorThread.Logon(s);</div><div class='ctx'>         User::WaitForRequest(s);</div><div class='ctx'>         m_idleDetectorThread.Close();</div><div class='del'>-        m_lock.Close();</div><div class='add'>+        m_running = false;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     void kick()</div><div class='ctx'>     {</div><div class='add'>+        start();</div><div class='ctx'>         m_state = STATE_KICKED;</div><div class='del'>-        m_lock.Signal();</div><div class='add'>+        m_kick.release();</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     bool hasRun()</div><div class='hunk'>@@ -709,6 +771,7 @@ public:</div><div class='ctx'> private:</div><div class='ctx'>     static TInt idleDetectorThreadFunc(TAny* self)</div><div class='ctx'>     {</div><div class='add'>+        User::RenameThread(_L("IdleDetectorThread"));</div><div class='ctx'>         static_cast&lt;QIdleDetectorThread*&gt;(self)-&gt;IdleLoop();</div><div class='ctx'>         return KErrNone;</div><div class='ctx'>     }</div><div class='hunk'>@@ -716,20 +779,29 @@ private:</div><div class='ctx'>     void IdleLoop()</div><div class='ctx'>     {</div><div class='ctx'>         while (!m_stop) {</div><div class='del'>-            m_lock.Wait();</div><div class='add'>+            m_kick.acquire();</div><div class='ctx'>             m_state = STATE_RUN;</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='add'>+    static void StopIdleDetectorThread();</div><div class='add'>+</div><div class='ctx'> private:</div><div class='ctx'>     enum IdleStates {STATE_KICKED, STATE_RUN} m_state;</div><div class='ctx'>     bool m_stop;</div><div class='add'>+    bool m_running;</div><div class='ctx'>     RThread m_idleDetectorThread;</div><div class='del'>-    RSemaphore m_lock;</div><div class='add'>+    QSemaphore m_kick;</div><div class='add'>+    QMutex m_mutex;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> Q_GLOBAL_STATIC(QIdleDetectorThread, idleDetectorThread);</div><div class='ctx'> </div><div class='add'>+void QIdleDetectorThread::StopIdleDetectorThread()</div><div class='add'>+{</div><div class='add'>+    idleDetectorThread()-&gt;stop();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const int maxBusyTime = 2000; // maximum time we allow idle detector to be blocked before worrying, in milliseconds</div><div class='ctx'> const int baseDelay = 1000; // minimum delay time used when backing off to allow idling, in microseconds</div><div class='ctx'> #endif</div><div class='hunk'>@@ -826,7 +898,7 @@ bool QEventDispatcherSymbian::processEvents ( QEventLoop::ProcessEventsFlags fla</div><div class='ctx'>         m_interrupt = false;</div><div class='ctx'> </div><div class='ctx'> #ifdef QT_SYMBIAN_PRIORITY_DROP</div><div class='del'>-        QTime eventTimer;</div><div class='add'>+        QElapsedTimer eventTimer;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>         while (1) {</div><div class='hunk'>@@ -835,6 +907,14 @@ bool QEventDispatcherSymbian::processEvents ( QEventLoop::ProcessEventsFlags fla</div><div class='ctx'>                 CActiveScheduler::Current()-&gt;WaitForAnyRequest();</div><div class='ctx'>             } else {</div><div class='ctx'>                 if (thread.RequestCount() == 0) {</div><div class='add'>+#ifdef QT_SYMBIAN_PRIORITY_DROP</div><div class='add'>+                    if (idleDetectorThread()-&gt;hasRun()) {</div><div class='add'>+                        m_lastIdleRequestTimer.start();</div><div class='add'>+                        idleDetectorThread()-&gt;kick();</div><div class='add'>+                    } else if (m_lastIdleRequestTimer.elapsed() &gt; maxBusyTime) {</div><div class='add'>+                        User::AfterHighRes(m_delay);</div><div class='add'>+                    }</div><div class='add'>+#endif</div><div class='ctx'>                     break;</div><div class='ctx'>                 }</div><div class='ctx'>                 // This one should return without delay.</div><div class='hunk'>@@ -920,27 +1000,6 @@ void QEventDispatcherSymbian::timerFired(int timerId)</div><div class='ctx'>     return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void QEventDispatcherSymbian::socketFired(QSocketActiveObject *socketAO)</div><div class='del'>-{</div><div class='del'>-    if (m_noSocketEvents) {</div><div class='del'>-        m_deferredSocketEvents.append(socketAO);</div><div class='del'>-        return;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    QEvent e(QEvent::SockAct);</div><div class='del'>-    socketAO-&gt;m_inSocketEvent = true;</div><div class='del'>-    QCoreApplication::sendEvent(socketAO-&gt;m_notifier, &amp;e);</div><div class='del'>-    socketAO-&gt;m_inSocketEvent = false;</div><div class='del'>-</div><div class='del'>-    if (socketAO-&gt;m_deleteLater) {</div><div class='del'>-        delete socketAO;</div><div class='del'>-    } else {</div><div class='del'>-        socketAO-&gt;iStatus = KRequestPending;</div><div class='del'>-        socketAO-&gt;SetActive();</div><div class='del'>-        reactivateSocketNotifier(socketAO-&gt;m_notifier);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> void QEventDispatcherSymbian::wakeUpWasCalled()</div><div class='ctx'> {</div><div class='ctx'>     // The reactivation should happen in RunL, right before the call to this function.</div><div class='hunk'>@@ -1001,6 +1060,12 @@ inline void QEventDispatcherSymbian::addDeferredActiveObject(QActiveObject *obje</div><div class='ctx'> inline void QEventDispatcherSymbian::removeDeferredActiveObject(QActiveObject *object)</div><div class='ctx'> {</div><div class='ctx'>     m_deferredActiveObjects.removeAll(object);</div><div class='add'>+    m_deferredSocketEvents.removeAll(object);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline void QEventDispatcherSymbian::addDeferredSocketActiveObject(QActiveObject *object)</div><div class='add'>+{</div><div class='add'>+    m_deferredSocketEvents.append(object);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void QEventDispatcherSymbian::queueDeferredActiveObjectsCompletion()</div><div class='hunk'>@@ -1026,7 +1091,8 @@ bool QEventDispatcherSymbian::sendDeferredSocketEvents()</div><div class='ctx'>     bool sentAnyEvents = false;</div><div class='ctx'>     while (!m_deferredSocketEvents.isEmpty()) {</div><div class='ctx'>         sentAnyEvents = true;</div><div class='del'>-        socketFired(m_deferredSocketEvents.takeFirst());</div><div class='add'>+        QActiveObject *object = m_deferredSocketEvents.takeFirst();</div><div class='add'>+        object-&gt;reactivateAndComplete();</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     return sentAnyEvents;</div><div class='hunk'>@@ -1045,13 +1111,24 @@ bool QEventDispatcherSymbian::hasPendingEvents()</div><div class='ctx'> </div><div class='ctx'> void QEventDispatcherSymbian::registerSocketNotifier ( QSocketNotifier * notifier )</div><div class='ctx'> {</div><div class='del'>-    QSocketActiveObject *socketAO = q_check_ptr(new QSocketActiveObject(this, notifier));</div><div class='add'>+    //check socket descriptor is usable</div><div class='add'>+    if (notifier-&gt;socket() &gt;= FD_SETSIZE || notifier-&gt;socket() &lt; 0) {</div><div class='add'>+        //same warning message as the unix event dispatcher for easy testing</div><div class='add'>+        qWarning("QSocketNotifier: Internal error");</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+    //note - this is only for "open C" file descriptors</div><div class='add'>+    //for native sockets, an active object in the symbian socket engine handles this</div><div class='add'>+    QSocketActiveObject *socketAO = new QSocketActiveObject(this, notifier);</div><div class='add'>+    Q_CHECK_PTR(socketAO);</div><div class='ctx'>     m_notifiers.insert(notifier, socketAO);</div><div class='ctx'>     selectThread().requestSocketEvents(notifier, &amp;socketAO-&gt;iStatus);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void QEventDispatcherSymbian::unregisterSocketNotifier ( QSocketNotifier * notifier )</div><div class='ctx'> {</div><div class='add'>+    //note - this is only for "open C" file descriptors</div><div class='add'>+    //for native sockets, an active object in the symbian socket engine handles this</div><div class='ctx'>     if (m_selectThread)</div><div class='ctx'>         m_selectThread-&gt;cancelSocketEvents(notifier);</div><div class='ctx'>     if (m_notifiers.contains(notifier)) {</div><div class='hunk'>@@ -1154,6 +1231,86 @@ void CQtActiveScheduler::Error(TInt aError) const</div><div class='ctx'>     QT_CATCH (const std::bad_alloc&amp;) {}    // ignore alloc fails, nothing more can be done</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool QActiveObject::wait(CActive* ao, int ms)</div><div class='add'>+{</div><div class='add'>+    if (!ao-&gt;IsActive())</div><div class='add'>+        return true; //request already complete</div><div class='add'>+    bool timedout = false;</div><div class='add'>+    if (ms &gt; 0) {</div><div class='add'>+        TRequestStatus tstat;</div><div class='add'>+        RTimer t;</div><div class='add'>+        if (KErrNone != t.CreateLocal())</div><div class='add'>+            return false;</div><div class='add'>+        t.HighRes(tstat, ms*1000);</div><div class='add'>+        User::WaitForRequest(tstat, ao-&gt;iStatus);</div><div class='add'>+        if (tstat != KRequestPending) {</div><div class='add'>+            timedout = true;</div><div class='add'>+        } else {</div><div class='add'>+            t.Cancel();</div><div class='add'>+            //balance thread semaphore</div><div class='add'>+            User::WaitForRequest(tstat);</div><div class='add'>+        }</div><div class='add'>+        t.Close();</div><div class='add'>+    } else {</div><div class='add'>+        User::WaitForRequest(ao-&gt;iStatus);</div><div class='add'>+    }</div><div class='add'>+    if (timedout)</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+    //evil cast to allow calling of protected virtual</div><div class='add'>+    ((QActiveObject*)ao)-&gt;RunL();</div><div class='add'>+</div><div class='add'>+    //clear active &amp; pending flags</div><div class='add'>+    ao-&gt;iStatus = TRequestStatus();</div><div class='add'>+</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QActiveObject::wait(QList&lt;CActive*&gt; aos, int ms)</div><div class='add'>+{</div><div class='add'>+    QVector&lt;TRequestStatus*&gt; stati;</div><div class='add'>+    stati.reserve(aos.count() + 1);</div><div class='add'>+    foreach (CActive* ao, aos) {</div><div class='add'>+        if (!ao-&gt;IsActive())</div><div class='add'>+            return true; //request already complete</div><div class='add'>+        stati.append(&amp;(ao-&gt;iStatus));</div><div class='add'>+    }</div><div class='add'>+    bool timedout = false;</div><div class='add'>+    TRequestStatus tstat;</div><div class='add'>+    RTimer t;</div><div class='add'>+    if (ms &gt; 0) {</div><div class='add'>+        if (KErrNone != t.CreateLocal())</div><div class='add'>+            return false;</div><div class='add'>+        t.HighRes(tstat, ms*1000);</div><div class='add'>+        stati.append(&amp;tstat);</div><div class='add'>+    }</div><div class='add'>+    User::WaitForNRequest(stati.data(), stati.count());</div><div class='add'>+    if (ms &gt; 0) {</div><div class='add'>+        if (tstat != KRequestPending) {</div><div class='add'>+            timedout = true;</div><div class='add'>+        } else {</div><div class='add'>+            t.Cancel();</div><div class='add'>+            //balance thread semaphore</div><div class='add'>+            User::WaitForRequest(tstat);</div><div class='add'>+        }</div><div class='add'>+        t.Close();</div><div class='add'>+    }</div><div class='add'>+    if (timedout)</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+    foreach (CActive* ao, aos) {</div><div class='add'>+        if (ao-&gt;iStatus != KRequestPending) {</div><div class='add'>+            //evil cast to allow calling of protected virtual</div><div class='add'>+            ((QActiveObject*)ao)-&gt;RunL();</div><div class='add'>+</div><div class='add'>+            //clear active &amp; pending flags</div><div class='add'>+            ao-&gt;iStatus = TRequestStatus();</div><div class='add'>+            break; //only call one</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> #include "moc_qeventdispatcher_symbian_p.cpp"</div><div class='head'>diff --git a/src/corelib/kernel/qeventdispatcher_symbian_p.h b/src/corelib/kernel/qeventdispatcher_symbian_p.h<br/>index f49ffbf..e327a9c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qeventdispatcher_symbian_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qeventdispatcher_symbian_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qeventdispatcher_symbian_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qeventdispatcher_symbian_p.h</a></div><div class='hunk'>@@ -77,16 +77,19 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'> class QEventDispatcherSymbian;</div><div class='ctx'> class QTimerActiveObject;</div><div class='ctx'> </div><div class='del'>-class QActiveObject : public CActive</div><div class='add'>+class Q_CORE_EXPORT QActiveObject : public CActive</div><div class='ctx'> {</div><div class='ctx'> public:</div><div class='ctx'>     QActiveObject(TInt priority, QEventDispatcherSymbian *dispatcher);</div><div class='ctx'>     ~QActiveObject();</div><div class='ctx'> </div><div class='ctx'>     bool maybeQueueForLater();</div><div class='add'>+    bool maybeDeferSocketEvent();</div><div class='ctx'> </div><div class='ctx'>     void reactivateAndComplete();</div><div class='ctx'> </div><div class='add'>+    static bool wait(CActive* ao, int ms);</div><div class='add'>+    static bool wait(QList&lt;CActive*&gt; aos, int ms);</div><div class='ctx'> protected:</div><div class='ctx'>     QEventDispatcherSymbian *m_dispatcher;</div><div class='ctx'> </div><div class='hunk'>@@ -107,6 +110,9 @@ public:</div><div class='ctx'> protected:</div><div class='ctx'>     void DoCancel();</div><div class='ctx'>     void RunL();</div><div class='add'>+</div><div class='add'>+private:</div><div class='add'>+    TThreadId m_hostThreadId;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct SymbianTimerInfo : public QSharedData</div><div class='hunk'>@@ -176,6 +182,7 @@ public:</div><div class='ctx'> protected:</div><div class='ctx'>     void DoCancel();</div><div class='ctx'>     void RunL();</div><div class='add'>+    void run();</div><div class='ctx'> </div><div class='ctx'> private:</div><div class='ctx'>     QSocketNotifier *m_notifier;</div><div class='hunk'>@@ -244,7 +251,6 @@ public:</div><div class='ctx'>     void closingDown();</div><div class='ctx'> </div><div class='ctx'>     void timerFired(int timerId);</div><div class='del'>-    void socketFired(QSocketActiveObject *socketAO);</div><div class='ctx'>     void wakeUpWasCalled();</div><div class='ctx'>     void reactivateSocketNotifier(QSocketNotifier *notifier);</div><div class='ctx'> </div><div class='hunk'>@@ -256,6 +262,9 @@ public:</div><div class='ctx'> </div><div class='ctx'>     inline int iterationCount() const { return m_iterationCount; }</div><div class='ctx'> </div><div class='add'>+    void addDeferredSocketActiveObject(QActiveObject *object);</div><div class='add'>+    inline bool areSocketEventsBlocked() const { return m_noSocketEvents; }</div><div class='add'>+</div><div class='ctx'>     static void RequestComplete(TRequestStatus *&amp;status, TInt reason);</div><div class='ctx'>     static void RequestComplete(RThread &amp;threadHandle, TRequestStatus *&amp;status, TInt reason);</div><div class='ctx'> </div><div class='hunk'>@@ -281,13 +290,14 @@ private:</div><div class='ctx'>     unsigned char m_iterationCount;</div><div class='ctx'>     bool m_insideTimerEvent;</div><div class='ctx'>     bool m_noSocketEvents;</div><div class='del'>-    QList&lt;QSocketActiveObject *&gt; m_deferredSocketEvents;</div><div class='del'>-</div><div class='add'>+    //deferred until socket events are enabled</div><div class='add'>+    QList&lt;QActiveObject *&gt; m_deferredSocketEvents;</div><div class='add'>+    //deferred until idle</div><div class='ctx'>     QList&lt;QActiveObject *&gt; m_deferredActiveObjects;</div><div class='ctx'> </div><div class='ctx'>     int m_delay;</div><div class='ctx'>     int m_avgEventTime;</div><div class='del'>-    QTime m_lastIdleRequestTimer;</div><div class='add'>+    QElapsedTimer m_lastIdleRequestTimer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef QT_DEBUG</div><div class='head'>diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp<br/>index ed1808d..f2f9dd6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qeventdispatcher_unix.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qeventdispatcher_unix.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qeventdispatcher_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qeventdispatcher_unix.cpp</a></div><div class='hunk'>@@ -112,9 +112,11 @@ QEventDispatcherUNIXPrivate::QEventDispatcherUNIXPrivate()</div><div class='ctx'>     bool pipefail = false;</div><div class='ctx'> </div><div class='ctx'>     // initialize the common parts of the event loop</div><div class='del'>-#if defined(Q_OS_INTEGRITY)</div><div class='add'>+#if defined(Q_OS_NACL)</div><div class='add'>+   // do nothing.</div><div class='add'>+#elif defined(Q_OS_INTEGRITY)</div><div class='ctx'>     // INTEGRITY doesn't like a "select" on pipes, so use socketpair instead</div><div class='del'>-    if (socketpair(AF_INET, SOCK_STREAM, PF_INET, thread_pipe) == -1) {</div><div class='add'>+    if (socketpair(AF_INET, SOCK_STREAM, 0, thread_pipe) == -1) {</div><div class='ctx'>         perror("QEventDispatcherUNIXPrivate(): Unable to create socket pair");</div><div class='ctx'>         pipefail = true;</div><div class='ctx'>     } else {</div><div class='hunk'>@@ -157,7 +159,9 @@ QEventDispatcherUNIXPrivate::QEventDispatcherUNIXPrivate()</div><div class='ctx'> </div><div class='ctx'> QEventDispatcherUNIXPrivate::~QEventDispatcherUNIXPrivate()</div><div class='ctx'> {</div><div class='del'>-#if defined(Q_OS_VXWORKS)</div><div class='add'>+#if defined(Q_OS_NACL)</div><div class='add'>+   // do nothing.</div><div class='add'>+#elif defined(Q_OS_VXWORKS)</div><div class='ctx'>     close(thread_pipe[0]);</div><div class='ctx'> </div><div class='ctx'>     char name[20];</div><div class='hunk'>@@ -312,7 +316,7 @@ int QEventDispatcherUNIXPrivate::doSelect(QEventLoop::ProcessEventsFlags flags,</div><div class='ctx'> </div><div class='ctx'> QTimerInfoList::QTimerInfoList()</div><div class='ctx'> {</div><div class='del'>-#if (_POSIX_MONOTONIC_CLOCK-0 &lt;= 0) &amp;&amp; !defined(Q_OS_MAC)</div><div class='add'>+#if (_POSIX_MONOTONIC_CLOCK-0 &lt;= 0) &amp;&amp; !defined(Q_OS_MAC) &amp;&amp; !defined(Q_OS_NACL)</div><div class='ctx'>     if (!QElapsedTimer::isMonotonic()) {</div><div class='ctx'>         // not using monotonic timers, initialize the timeChanged() machinery</div><div class='ctx'>         previousTime = qt_gettime();</div><div class='hunk'>@@ -339,7 +343,7 @@ timeval QTimerInfoList::updateCurrentTime()</div><div class='ctx'>     return (currentTime = qt_gettime());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if ((_POSIX_MONOTONIC_CLOCK-0 &lt;= 0) &amp;&amp; !defined(Q_OS_MAC)) || defined(QT_BOOTSTRAPPED)</div><div class='add'>+#if ((_POSIX_MONOTONIC_CLOCK-0 &lt;= 0) &amp;&amp; !defined(Q_OS_MAC) &amp;&amp; !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED)</div><div class='ctx'> </div><div class='ctx'> template &lt;&gt;</div><div class='ctx'> timeval qAbs(const timeval &amp;t)</div><div class='hunk'>@@ -364,6 +368,10 @@ timeval qAbs(const timeval &amp;t)</div><div class='ctx'> */</div><div class='ctx'> bool QTimerInfoList::timeChanged(timeval *delta)</div><div class='ctx'> {</div><div class='add'>+#ifdef Q_OS_NACL</div><div class='add'>+    Q_UNUSED(delta)</div><div class='add'>+    return false; // Calling "times" crashes.</div><div class='add'>+#endif</div><div class='ctx'>     struct tms unused;</div><div class='ctx'>     clock_t currentTicks = times(&amp;unused);</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h<br/>index 0a8236f..122f17f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qeventdispatcher_unix_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qeventdispatcher_unix_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qeventdispatcher_unix_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qeventdispatcher_unix_p.h</a></div><div class='hunk'>@@ -64,7 +64,7 @@</div><div class='ctx'> #  include &lt;sys/times.h&gt;</div><div class='ctx'> #else</div><div class='ctx'> #  include &lt;sys/time.h&gt;</div><div class='del'>-#  if !defined(Q_OS_HPUX) || defined(__ia64)</div><div class='add'>+#  if (!defined(Q_OS_HPUX) || defined(__ia64)) &amp;&amp; !defined(Q_OS_NACL)</div><div class='ctx'> #    include &lt;sys/select.h&gt;</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='head'>diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp<br/>index f963e84..84663fa 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qeventdispatcher_win.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qeventdispatcher_win.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qeventdispatcher_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qeventdispatcher_win.cpp</a></div><div class='hunk'>@@ -78,6 +78,8 @@ extern uint qGlobalPostedEventsCount();</div><div class='ctx'> #ifndef QT_NO_GESTURES</div><div class='ctx'> #ifndef WM_GESTURE</div><div class='ctx'> #  define WM_GESTURE 0x0119</div><div class='add'>+#endif</div><div class='add'>+#ifndef WM_GESTURENOTIFY</div><div class='ctx'> #  define WM_GESTURENOTIFY 0x011A</div><div class='ctx'> #endif</div><div class='ctx'> #endif // QT_NO_GESTURES</div><div class='hunk'>@@ -490,7 +492,7 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA</div><div class='ctx'>                // we also use a Windows timer to send posted events when the message queue is full</div><div class='ctx'>                || (message == WM_TIMER</div><div class='ctx'>                    &amp;&amp; d-&gt;sendPostedEventsWindowsTimerId != 0</div><div class='del'>-                   &amp;&amp; wp == d-&gt;sendPostedEventsWindowsTimerId)) {</div><div class='add'>+                   &amp;&amp; wp == (uint)d-&gt;sendPostedEventsWindowsTimerId)) {</div><div class='ctx'>         int localSerialNumber = d-&gt;serialNumber;</div><div class='ctx'>         if (localSerialNumber != d-&gt;lastSerialNumber) {</div><div class='ctx'>             d-&gt;lastSerialNumber = localSerialNumber;</div><div class='head'>diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp<br/>index 9bf9f82..5a4ce97 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qeventloop.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qeventloop.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qeventloop.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qeventloop.cpp</a></div><div class='hunk'>@@ -175,6 +175,8 @@ bool QEventLoop::processEvents(ProcessEventsFlags flags)</div><div class='ctx'> int QEventLoop::exec(ProcessEventsFlags flags)</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QEventLoop);</div><div class='add'>+    //we need to protect from race condition with QThread::exit</div><div class='add'>+    QMutexLocker locker(&amp;static_cast&lt;QThreadPrivate *&gt;(QObjectPrivate::get(d-&gt;threadData-&gt;thread))-&gt;mutex);</div><div class='ctx'>     if (d-&gt;threadData-&gt;quitNow)</div><div class='ctx'>         return -1;</div><div class='ctx'> </div><div class='hunk'>@@ -186,6 +188,7 @@ int QEventLoop::exec(ProcessEventsFlags flags)</div><div class='ctx'>     d-&gt;exit = false;</div><div class='ctx'>     ++d-&gt;threadData-&gt;loopLevel;</div><div class='ctx'>     d-&gt;threadData-&gt;eventLoops.push(this);</div><div class='add'>+    locker.unlock();</div><div class='ctx'> </div><div class='ctx'>     // remove posted quit events when entering a new event loop</div><div class='ctx'>     QCoreApplication *app = QCoreApplication::instance();</div><div class='hunk'>@@ -205,6 +208,7 @@ int QEventLoop::exec(ProcessEventsFlags flags)</div><div class='ctx'>                  "reimplement QApplication::notify() and catch all exceptions there.\n");</div><div class='ctx'> </div><div class='ctx'>         // copied from below</div><div class='add'>+        locker.relock();</div><div class='ctx'>         QEventLoop *eventLoop = d-&gt;threadData-&gt;eventLoops.pop();</div><div class='ctx'>         Q_ASSERT_X(eventLoop == this, "QEventLoop::exec()", "internal error");</div><div class='ctx'>         Q_UNUSED(eventLoop); // --release warning</div><div class='hunk'>@@ -216,6 +220,7 @@ int QEventLoop::exec(ProcessEventsFlags flags)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>     // copied above</div><div class='add'>+    locker.relock();</div><div class='ctx'>     QEventLoop *eventLoop = d-&gt;threadData-&gt;eventLoops.pop();</div><div class='ctx'>     Q_ASSERT_X(eventLoop == this, "QEventLoop::exec()", "internal error");</div><div class='ctx'>     Q_UNUSED(eventLoop); // --release warning</div><div class='head'>diff --git a/src/corelib/kernel/qfunctions_nacl.cpp b/src/corelib/kernel/qfunctions_nacl.cpp<br/>new file mode 100644<br/>index 0000000..410df0f<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qfunctions_nacl.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qfunctions_nacl.cpp</a></div><div class='hunk'>@@ -0,0 +1,156 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qfunctions_nacl.h"</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#include &lt;qglobal.h&gt;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+    The purpose of this file is to stub out certain functions</div><div class='add'>+    that are not provided by the Native Client SDK. This is</div><div class='add'>+    done as an alterative to sprinkling the Qt sources with</div><div class='add'>+    NACL ifdefs.</div><div class='add'>+</div><div class='add'>+    There are two main classes of functions:</div><div class='add'>+</div><div class='add'>+    - Functions that are called but can have no effect:</div><div class='add'>+    For these we simply give an empty implementation</div><div class='add'>+</div><div class='add'>+    - Functions that are referenced in the source code, but</div><div class='add'>+    is not/must not be called at run-time:</div><div class='add'>+    These we either leave undefined or implement with a</div><div class='add'>+    qFatal.</div><div class='add'>+</div><div class='add'>+    This is a work in progress.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+extern "C" {</div><div class='add'>+</div><div class='add'>+void pthread_cleanup_push(void (*)(void *), void *)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pthread_cleanup_pop(int)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pthread_setcancelstate(int, int *)</div><div class='add'>+{</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pthread_setcanceltype(int, int *)</div><div class='add'>+{</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pthread_testcancel(void)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pthread_cancel(pthread_t)</div><div class='add'>+{</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pthread_attr_setinheritsched(pthread_attr_t *,int)</div><div class='add'>+{</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+int pthread_attr_getinheritsched(const pthread_attr_t *, int *)</div><div class='add'>+{</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// event dispatcher, select</div><div class='add'>+//struct fd_set;</div><div class='add'>+//struct timeval;</div><div class='add'>+</div><div class='add'>+int fcntl(int, int, ...)</div><div class='add'>+{</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sigaction(int, const struct sigaction *, struct sigaction *)</div><div class='add'>+{</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int open(const char *, int, ...)</div><div class='add'>+{</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int open64(const char *, int, ...)</div><div class='add'>+{</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int access(const char *, int)</div><div class='add'>+{</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+typedef long off64_t;</div><div class='add'>+off64_t ftello64(void *)</div><div class='add'>+{</div><div class='add'>+    qFatal("ftello64 called");</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+off64_t lseek64(int, off_t, int)</div><div class='add'>+{</div><div class='add'>+    qFatal("lseek64 called");</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+} // Extern C</div><div class='add'>+</div><div class='add'>+int select(int, fd_set *, fd_set *, fd_set *, struct timeval *)</div><div class='add'>+{</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/src/corelib/kernel/qfunctions_nacl.h b/src/corelib/kernel/qfunctions_nacl.h<br/>new file mode 100644<br/>index 0000000..c4c1fd0<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qfunctions_nacl.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qfunctions_nacl.h</a></div><div class='hunk'>@@ -0,0 +1,97 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QNACLUNIMPLEMENTED_H</div><div class='add'>+#define QNACLUNIMPLEMENTED_H</div><div class='add'>+</div><div class='add'>+#ifdef Q_OS_NACL</div><div class='add'>+</div><div class='add'>+#include &lt;sys/types.h&gt;</div><div class='add'>+</div><div class='add'>+// pthread</div><div class='add'>+#include &lt;pthread.h&gt;</div><div class='add'>+#define PTHREAD_CANCEL_DISABLE 1</div><div class='add'>+#define PTHREAD_CANCEL_ENABLE 2</div><div class='add'>+#define PTHREAD_INHERIT_SCHED 3</div><div class='add'>+</div><div class='add'>+QT_BEGIN_HEADER</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+QT_MODULE(Core)</div><div class='add'>+</div><div class='add'>+extern "C" {</div><div class='add'>+</div><div class='add'>+void pthread_cleanup_push(void (*handler)(void *), void *arg);</div><div class='add'>+void pthread_cleanup_pop(int execute);</div><div class='add'>+</div><div class='add'>+int pthread_setcancelstate(int state, int *oldstate);</div><div class='add'>+int pthread_setcanceltype(int type, int *oldtype);</div><div class='add'>+void pthread_testcancel(void);</div><div class='add'>+int pthread_cancel(pthread_t thread);</div><div class='add'>+</div><div class='add'>+int pthread_attr_setinheritsched(pthread_attr_t *attr,</div><div class='add'>+    int inheritsched);</div><div class='add'>+int pthread_attr_getinheritsched(const pthread_attr_t *attr, </div><div class='add'>+    int *inheritsched);</div><div class='add'>+</div><div class='add'>+// event dispatcher, select</div><div class='add'>+//struct fd_set;</div><div class='add'>+//struct timeval;</div><div class='add'>+int fcntl(int fildes, int cmd, ...);</div><div class='add'>+int sigaction(int sig, const struct sigaction * act, struct sigaction * oact);</div><div class='add'>+</div><div class='add'>+typedef long off64_t;</div><div class='add'>+off64_t ftello64(void *stream);</div><div class='add'>+off64_t lseek64(int fildes, off_t offset, int whence);</div><div class='add'>+int open64(const char *path, int oflag, ...);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int select(int nfds, fd_set * readfds, fd_set * writefds, fd_set * errorfds, struct timeval * timeout);</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+QT_END_HEADER</div><div class='add'>+</div><div class='add'>+#endif //Q_OS_NACL</div><div class='add'>+</div><div class='add'>+#endif //QNACLUNIMPLEMENTED_H </div><div class='head'>diff --git a/src/corelib/kernel/qfunctions_p.h b/src/corelib/kernel/qfunctions_p.h<br/>index a7913ae..1e75fec 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qfunctions_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qfunctions_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qfunctions_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qfunctions_p.h</a></div><div class='hunk'>@@ -59,6 +59,8 @@</div><div class='ctx'> #  include "QtCore/qfunctions_wince.h"</div><div class='ctx'> #elif defined(Q_OS_VXWORKS)</div><div class='ctx'> #  include "QtCore/qfunctions_vxworks.h"</div><div class='add'>+#elif defined(Q_OS_NACL)</div><div class='add'>+#  include "QtCore/qfunctions_nacl.h"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef Q_CC_RVCT</div><div class='head'>diff --git a/src/corelib/kernel/qfunctions_wince.h b/src/corelib/kernel/qfunctions_wince.h<br/>index 02e1f7a..5569b7c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qfunctions_wince.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qfunctions_wince.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qfunctions_wince.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qfunctions_wince.h</a></div><div class='hunk'>@@ -84,10 +84,6 @@ errno_t qt_wince__putenv_s(const char*, const char*);</div><div class='ctx'> extern "C" {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define SetWindowLongA      SetWindowLong</div><div class='del'>-#define GetWindowLongA      GetWindowLong</div><div class='del'>-#define SendMessageA        SendMessage</div><div class='del'>-</div><div class='ctx'> #if !defined(NO_ERRNO_H)</div><div class='ctx'> #define NO_ERRNO_H</div><div class='ctx'> #endif</div><div class='head'>diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp<br/>index 71f375f..b4c37f4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qmetaobject.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qmetaobject.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qmetaobject.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qmetaobject.cpp</a></div><div class='hunk'>@@ -218,12 +218,20 @@ QObject *QMetaObject::newInstance(QGenericArgument val0,</div><div class='ctx'> */</div><div class='ctx'> int QMetaObject::static_metacall(Call cl, int idx, void **argv) const</div><div class='ctx'> {</div><div class='del'>-    if (priv(d.data)-&gt;revision &lt; 2)</div><div class='del'>-        return 0;</div><div class='del'>-    const QMetaObjectExtraData *extra = (const QMetaObjectExtraData*)(d.extradata);</div><div class='del'>-    if (!extra || !extra-&gt;static_metacall)</div><div class='del'>-        return 0;</div><div class='del'>-    return extra-&gt;static_metacall(cl, idx, argv);</div><div class='add'>+    const QMetaObjectExtraData *extra = reinterpret_cast&lt;const QMetaObjectExtraData *&gt;(d.extradata);</div><div class='add'>+    if (priv(d.data)-&gt;revision &gt;= 6) {</div><div class='add'>+        if (!extra || !extra-&gt;static_metacall)</div><div class='add'>+            return 0;</div><div class='add'>+        extra-&gt;static_metacall(0, cl, idx, argv);</div><div class='add'>+        return -1;</div><div class='add'>+    } else if (priv(d.data)-&gt;revision &gt;= 2) {</div><div class='add'>+        if (!extra || !extra-&gt;static_metacall)</div><div class='add'>+            return 0;</div><div class='add'>+        typedef int (*OldMetacall)(QMetaObject::Call, int, void **);</div><div class='add'>+        OldMetacall o = reinterpret_cast&lt;OldMetacall&gt;(extra-&gt;static_metacall);</div><div class='add'>+        return o(cl, idx, argv);</div><div class='add'>+    }</div><div class='add'>+    return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -266,7 +274,25 @@ QObject *QMetaObject::cast(QObject *obj) const</div><div class='ctx'>         const QMetaObject *m = obj-&gt;metaObject();</div><div class='ctx'>         do {</div><div class='ctx'>             if (m == this)</div><div class='del'>-                return const_cast&lt;QObject*&gt;(obj);</div><div class='add'>+                return obj;</div><div class='add'>+        } while ((m = m-&gt;d.superdata));</div><div class='add'>+    }</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \internal</div><div class='add'>+</div><div class='add'>+    Returns \a obj if object \a obj inherits from this</div><div class='add'>+    meta-object; otherwise returns 0.</div><div class='add'>+*/</div><div class='add'>+const QObject *QMetaObject::cast(const QObject *obj) const</div><div class='add'>+{</div><div class='add'>+    if (obj) {</div><div class='add'>+        const QMetaObject *m = obj-&gt;metaObject();</div><div class='add'>+        do {</div><div class='add'>+            if (m == this)</div><div class='add'>+                return obj;</div><div class='ctx'>         } while ((m = m-&gt;d.superdata));</div><div class='ctx'>     }</div><div class='ctx'>     return 0;</div><div class='hunk'>@@ -621,20 +647,21 @@ int QMetaObjectPrivate::indexOfSignalRelative(const QMetaObject **baseObject,</div><div class='ctx'> */</div><div class='ctx'> int QMetaObject::indexOfSlot(const char *slot) const</div><div class='ctx'> {</div><div class='del'>-    int i = QMetaObjectPrivate::indexOfSlot(this, slot, false);</div><div class='add'>+    const QMetaObject *m = this;</div><div class='add'>+    int i = QMetaObjectPrivate::indexOfSlotRelative(&amp;m, slot, false);</div><div class='ctx'>     if (i &lt; 0)</div><div class='del'>-        i = QMetaObjectPrivate::indexOfSlot(this, slot, true);</div><div class='add'>+        i = QMetaObjectPrivate::indexOfSlotRelative(&amp;m, slot, true);</div><div class='add'>+    if (i &gt;= 0)</div><div class='add'>+        i += m-&gt;methodOffset();</div><div class='ctx'>     return i;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int QMetaObjectPrivate::indexOfSlot(const QMetaObject *m,</div><div class='add'>+// same as indexOfSignalRelative but for slots.</div><div class='add'>+int QMetaObjectPrivate::indexOfSlotRelative(const QMetaObject **m,</div><div class='ctx'>                                     const char *slot,</div><div class='ctx'>                                     bool normalizeStringData)</div><div class='ctx'> {</div><div class='del'>-    int i = indexOfMethodRelative&lt;MethodSlot&gt;(&amp;m, slot, normalizeStringData);</div><div class='del'>-    if (i &gt;= 0)</div><div class='del'>-        i += m-&gt;methodOffset();</div><div class='del'>-    return i;</div><div class='add'>+    return indexOfMethodRelative&lt;MethodSlot&gt;(m, slot, normalizeStringData);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const QMetaObject *QMetaObject_findMetaObject(const QMetaObject *self, const char *name)</div><div class='hunk'>@@ -1577,6 +1604,12 @@ bool QMetaMethod::invoke(QObject *object,</div><div class='ctx'>                          : Qt::QueuedConnection;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='add'>+#ifdef QT_NO_THREAD</div><div class='add'>+    if (connectionType == Qt::BlockingQueuedConnection) {</div><div class='add'>+        connectionType = Qt::DirectConnection;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'>     // invoke!</div><div class='ctx'>     void *param[] = {</div><div class='ctx'>         returnValue.data(),</div><div class='hunk'>@@ -1592,10 +1625,20 @@ bool QMetaMethod::invoke(QObject *object,</div><div class='ctx'>         val9.data()</div><div class='ctx'>     };</div><div class='ctx'>     // recompute the methodIndex by reversing the arithmetic in QMetaObject::property()</div><div class='del'>-    int methodIndex = ((handle - priv(mobj-&gt;d.data)-&gt;methodData) / 5) + mobj-&gt;methodOffset();</div><div class='add'>+    int idx_relative = ((handle - priv(mobj-&gt;d.data)-&gt;methodData) / 5);</div><div class='add'>+    int idx_offset =  mobj-&gt;methodOffset();</div><div class='add'>+    QObjectPrivate::StaticMetaCallFunction callFunction =</div><div class='add'>+        (QMetaObjectPrivate::get(mobj)-&gt;revision &gt;= 6 &amp;&amp; mobj-&gt;d.extradata)</div><div class='add'>+        ? reinterpret_cast&lt;const QMetaObjectExtraData *&gt;(mobj-&gt;d.extradata)-&gt;static_metacall : 0;</div><div class='add'>+</div><div class='ctx'>     if (connectionType == Qt::DirectConnection) {</div><div class='del'>-        return QMetaObject::metacall(object, QMetaObject::InvokeMetaMethod, methodIndex, param) &lt; 0;</div><div class='del'>-    } else {</div><div class='add'>+        if (callFunction) {</div><div class='add'>+            callFunction(object, QMetaObject::InvokeMetaMethod, idx_relative, param);</div><div class='add'>+            return true;</div><div class='add'>+        } else {</div><div class='add'>+            return QMetaObject::metacall(object, QMetaObject::InvokeMetaMethod, idx_relative + idx_offset, param) &lt; 0;</div><div class='add'>+        }</div><div class='add'>+    } else if (connectionType == Qt::QueuedConnection) {</div><div class='ctx'>         if (returnValue.data()) {</div><div class='ctx'>             qWarning("QMetaMethod::invoke: Unable to invoke methods with return values in "</div><div class='ctx'>                      "queued connections");</div><div class='hunk'>@@ -1628,40 +1671,21 @@ bool QMetaMethod::invoke(QObject *object,</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-        if (connectionType == Qt::QueuedConnection) {</div><div class='del'>-            QCoreApplication::postEvent(object, new QMetaCallEvent(methodIndex,</div><div class='del'>-                                                                   0,</div><div class='del'>-                                                                   -1,</div><div class='del'>-                                                                   nargs,</div><div class='del'>-                                                                   types,</div><div class='del'>-                                                                   args));</div><div class='del'>-        } else {</div><div class='del'>-            if (currentThread == objectThread) {</div><div class='del'>-                qWarning("QMetaMethod::invoke: Dead lock detected in "</div><div class='del'>-                         "BlockingQueuedConnection: Receiver is %s(%p)",</div><div class='del'>-                         mobj-&gt;className(), object);</div><div class='del'>-            }</div><div class='add'>+        QCoreApplication::postEvent(object, new QMetaCallEvent(idx_offset, idx_relative, callFunction,</div><div class='add'>+                                                        0, -1, nargs, types, args));</div><div class='add'>+    } else { // blocking queued connection</div><div class='add'>+#ifndef QT_NO_THREAD</div><div class='add'>+        if (currentThread == objectThread) {</div><div class='add'>+            qWarning("QMetaMethod::invoke: Dead lock detected in "</div><div class='add'>+                        "BlockingQueuedConnection: Receiver is %s(%p)",</div><div class='add'>+                        mobj-&gt;className(), object);</div><div class='add'>+        }</div><div class='ctx'> </div><div class='del'>-            // blocking queued connection</div><div class='del'>-#ifdef QT_NO_THREAD</div><div class='del'>-            QCoreApplication::postEvent(object, new QMetaCallEvent(methodIndex,</div><div class='del'>-                                                                   0,</div><div class='del'>-                                                                   -1,</div><div class='del'>-                                                                   nargs,</div><div class='del'>-                                                                   types,</div><div class='del'>-                                                                   args));</div><div class='del'>-#else</div><div class='del'>-            QSemaphore semaphore;</div><div class='del'>-            QCoreApplication::postEvent(object, new QMetaCallEvent(methodIndex,</div><div class='del'>-                                                                   0,</div><div class='del'>-                                                                   -1,</div><div class='del'>-                                                                   nargs,</div><div class='del'>-                                                                   types,</div><div class='del'>-                                                                   args,</div><div class='del'>-                                                                   &amp;semaphore));</div><div class='del'>-            semaphore.acquire();</div><div class='add'>+        QSemaphore semaphore;</div><div class='add'>+        QCoreApplication::postEvent(object, new QMetaCallEvent(idx_offset, idx_relative, callFunction,</div><div class='add'>+                                                        0, -1, 0, 0, param, &amp;semaphore));</div><div class='add'>+        semaphore.acquire();</div><div class='ctx'> #endif // QT_NO_THREAD</div><div class='del'>-        }</div><div class='ctx'>     }</div><div class='ctx'>     return true;</div><div class='ctx'> }</div><div class='head'>diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h<br/>index 6038782..df6afa8 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qmetaobject.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qmetaobject.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qmetaobject.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qmetaobject.h</a></div><div class='hunk'>@@ -139,6 +139,8 @@ private:</div><div class='ctx'>     const QMetaObject *mobj;</div><div class='ctx'>     uint handle;</div><div class='ctx'>     friend struct QMetaObject;</div><div class='add'>+    friend struct QMetaObjectPrivate;</div><div class='add'>+    friend class QObject;</div><div class='ctx'> };</div><div class='ctx'> Q_DECLARE_TYPEINFO(QMetaMethod, Q_MOVABLE_TYPE);</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h<br/>index ce908f0..63605ec 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qmetaobject_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qmetaobject_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qmetaobject_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qmetaobject_p.h</a></div><div class='hunk'>@@ -118,6 +118,7 @@ struct QMetaObjectPrivate</div><div class='ctx'>     int flags; //since revision 3</div><div class='ctx'>     int signalCount; //since revision 4</div><div class='ctx'>     // revision 5 introduces changes in normalized signatures, no new members</div><div class='add'>+    // revision 6 added qt_static_metacall as a member of each Q_OBJECT and inside QMetaObject itself</div><div class='ctx'> </div><div class='ctx'>     static inline const QMetaObjectPrivate *get(const QMetaObject *metaobject)</div><div class='ctx'>     { return reinterpret_cast&lt;const QMetaObjectPrivate*&gt;(metaobject-&gt;d.data); }</div><div class='hunk'>@@ -125,7 +126,7 @@ struct QMetaObjectPrivate</div><div class='ctx'>     static int indexOfSignalRelative(const QMetaObject **baseObject,</div><div class='ctx'>                                      const char* name,</div><div class='ctx'>                                      bool normalizeStringData);</div><div class='del'>-    static int indexOfSlot(const QMetaObject *m,</div><div class='add'>+    static int indexOfSlotRelative(const QMetaObject **m,</div><div class='ctx'>                            const char *slot,</div><div class='ctx'>                            bool normalizeStringData);</div><div class='ctx'>     static int originalClone(const QMetaObject *obj, int local_method_index);</div><div class='hunk'>@@ -133,8 +134,11 @@ struct QMetaObjectPrivate</div><div class='ctx'> #ifndef QT_NO_QOBJECT</div><div class='ctx'>     //defined in qobject.cpp</div><div class='ctx'>     enum DisconnectType { DisconnectAll, DisconnectOne };</div><div class='add'>+    static void memberIndexes(const QObject *obj, const QMetaMethod &amp;member,</div><div class='add'>+                              int *signalIndex, int *methodIndex);</div><div class='ctx'>     static bool connect(const QObject *sender, int signal_index,</div><div class='del'>-                        const QObject *receiver, int method_index,</div><div class='add'>+                        const QObject *receiver, int method_index_relative,</div><div class='add'>+                        const QMetaObject *rmeta = 0,</div><div class='ctx'>                         int type = 0, int *types = 0);</div><div class='ctx'>     static bool disconnect(const QObject *sender, int signal_index,</div><div class='ctx'>                            const QObject *receiver, int method_index,</div><div class='head'>diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp<br/>index 5820ded..fcc8a65 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qmetatype.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qmetatype.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qmetatype.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qmetatype.cpp</a></div><div class='hunk'>@@ -311,6 +311,7 @@ static const struct { const char * typeName; int typeNameLength; int type; } typ</div><div class='ctx'>     QT_ADD_STATIC_METATYPE("long long", QMetaType::LongLong),</div><div class='ctx'>     QT_ADD_STATIC_METATYPE("unsigned long long", QMetaType::ULongLong),</div><div class='ctx'>     QT_ADD_STATIC_METATYPE("qint8", QMetaType::Char),</div><div class='add'>+    QT_ADD_STATIC_METATYPE("signed char", QMetaType::Char),</div><div class='ctx'>     QT_ADD_STATIC_METATYPE("quint8", QMetaType::UChar),</div><div class='ctx'>     QT_ADD_STATIC_METATYPE("qint16", QMetaType::Short),</div><div class='ctx'>     QT_ADD_STATIC_METATYPE("quint16", QMetaType::UShort),</div><div class='head'>diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h<br/>index a029dee..36131d1 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qmetatype.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qmetatype.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qmetatype.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qmetatype.h</a></div><div class='hunk'>@@ -353,6 +353,7 @@ Q_DECLARE_BUILTIN_METATYPE(QChar, QChar)</div><div class='ctx'> Q_DECLARE_BUILTIN_METATYPE(long, Long)</div><div class='ctx'> Q_DECLARE_BUILTIN_METATYPE(short, Short)</div><div class='ctx'> Q_DECLARE_BUILTIN_METATYPE(char, Char)</div><div class='add'>+Q_DECLARE_BUILTIN_METATYPE(signed char, Char)</div><div class='ctx'> Q_DECLARE_BUILTIN_METATYPE(ulong, ULong)</div><div class='ctx'> Q_DECLARE_BUILTIN_METATYPE(ushort, UShort)</div><div class='ctx'> Q_DECLARE_BUILTIN_METATYPE(uchar, UChar)</div><div class='head'>diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp<br/>index bb3bfab..a4948c1 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qobject.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qobject.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qobject.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qobject.cpp</a></div><div class='hunk'>@@ -150,18 +150,33 @@ QObjectPrivate::QObjectPrivate(int version)</div><div class='ctx'>     postedEvents = 0;</div><div class='ctx'>     extraData = 0;</div><div class='ctx'>     connectedSignals[0] = connectedSignals[1] = 0;</div><div class='del'>-    inEventHandler = false;</div><div class='ctx'>     inThreadChangeEvent = false;</div><div class='add'>+#ifdef QT_JAMBI_BUILD</div><div class='add'>+    inEventHandler = false;</div><div class='ctx'>     deleteWatch = 0;</div><div class='add'>+#endif</div><div class='ctx'>     metaObject = 0;</div><div class='ctx'>     hasGuards = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QObjectPrivate::~QObjectPrivate()</div><div class='ctx'> {</div><div class='add'>+    if (pendTimer) {</div><div class='add'>+        // unregister pending timers</div><div class='add'>+        if (threadData-&gt;eventDispatcher)</div><div class='add'>+            threadData-&gt;eventDispatcher-&gt;unregisterTimers(q_ptr);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (postedEvents)</div><div class='add'>+        QCoreApplication::removePostedEvents(q_ptr, 0);</div><div class='add'>+</div><div class='add'>+    threadData-&gt;deref();</div><div class='add'>+</div><div class='ctx'>     delete static_cast&lt;QAbstractDynamicMetaObject*&gt;(metaObject);</div><div class='add'>+#ifdef QT_JAMBI_BUILD</div><div class='ctx'>     if (deleteWatch)</div><div class='ctx'>         *deleteWatch = 1;</div><div class='add'>+#endif</div><div class='ctx'> #ifndef QT_NO_USERDATA</div><div class='ctx'>     if (extraData)</div><div class='ctx'>         qDeleteAll(extraData-&gt;userData);</div><div class='hunk'>@@ -170,6 +185,7 @@ QObjectPrivate::~QObjectPrivate()</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+#ifdef QT_JAMBI_BUILD</div><div class='ctx'> int *QObjectPrivate::setDeleteWatch(QObjectPrivate *d, int *w) {</div><div class='ctx'>     int *old = d-&gt;deleteWatch;</div><div class='ctx'>     d-&gt;deleteWatch = w;</div><div class='hunk'>@@ -184,18 +200,15 @@ void QObjectPrivate::resetDeleteWatch(QObjectPrivate *d, int *oldWatch, int dele</div><div class='ctx'>     if (oldWatch)</div><div class='ctx'>         *oldWatch = deleteWatch;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #ifdef QT3_SUPPORT</div><div class='ctx'> void QObjectPrivate::sendPendingChildInsertedEvents()</div><div class='ctx'> {</div><div class='ctx'>     Q_Q(QObject);</div><div class='ctx'>     for (int i = 0; i &lt; pendingChildInsertedEvents.size(); ++i) {</div><div class='del'>-        QObject *c = pendingChildInsertedEvents.at(i);</div><div class='del'>-        if (!c)</div><div class='add'>+        QObject *c = pendingChildInsertedEvents.at(i).data();</div><div class='add'>+        if (!c || c-&gt;parent() != q)</div><div class='ctx'>             continue;</div><div class='ctx'>         QChildEvent childEvent(QEvent::ChildInserted, c);</div><div class='ctx'>         QCoreApplication::sendEvent(q, &amp;childEvent);</div><div class='hunk'>@@ -203,26 +216,6 @@ void QObjectPrivate::sendPendingChildInsertedEvents()</div><div class='ctx'>     pendingChildInsertedEvents.clear();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void QObjectPrivate::removePendingChildInsertedEvents(QObject *child)</div><div class='del'>-{</div><div class='del'>-    if (!child) {</div><div class='del'>-        pendingChildInsertedEvents.clear();</div><div class='del'>-        return;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    // the QObject destructor calls QObject::removeChild, which calls</div><div class='del'>-    // QCoreApplication::sendEvent() directly.  this can happen while the event</div><div class='del'>-    // loop is in the middle of posting events, and when we get here, we may</div><div class='del'>-    // not have any more posted events for this object.</div><div class='del'>-</div><div class='del'>-    // if this is a child remove event and the child insert hasn't</div><div class='del'>-    // been dispatched yet, kill that insert</div><div class='del'>-    for (int i = 0; i &lt; pendingChildInsertedEvents.size(); ++i) {</div><div class='del'>-        QObject *&amp;c = pendingChildInsertedEvents[i];</div><div class='del'>-        if (c == child)</div><div class='del'>-            c = 0;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -270,12 +263,6 @@ public:</div><div class='ctx'>         : QVector&lt;QObjectPrivate::ConnectionList&gt;(), orphaned(false), dirty(false), inUse(0)</div><div class='ctx'>     { }</div><div class='ctx'> </div><div class='del'>-    const QObjectPrivate::ConnectionList &amp;at(int at) const</div><div class='del'>-    {</div><div class='del'>-        if (at &lt; 0)</div><div class='del'>-            return allsignals;</div><div class='del'>-        return QVector&lt;QObjectPrivate::ConnectionList&gt;::at(at);</div><div class='del'>-    }</div><div class='ctx'>     QObjectPrivate::ConnectionList &amp;operator[](int at)</div><div class='ctx'>     {</div><div class='ctx'>         if (at &lt; 0)</div><div class='hunk'>@@ -426,6 +413,8 @@ void QMetaObject::removeGuard(QObject **ptr)</div><div class='ctx'>     if (!hash || hash-&gt;isEmpty())</div><div class='ctx'>         return;</div><div class='ctx'>     QMutexLocker locker(guardHashLock());</div><div class='add'>+    if (!*ptr) //check again, under the lock</div><div class='add'>+        return;</div><div class='ctx'>     GuardHash::iterator it = hash-&gt;find(*ptr);</div><div class='ctx'>     const GuardHash::iterator end = hash-&gt;end();</div><div class='ctx'>     bool more = false; //if the QObject has more pointer attached to it.</div><div class='hunk'>@@ -477,11 +466,6 @@ void QMetaObject::changeGuard(QObject **ptr, QObject *o)</div><div class='ctx'>  */</div><div class='ctx'> void QObjectPrivate::clearGuards(QObject *object)</div><div class='ctx'> {</div><div class='del'>-    QObjectPrivate *priv = QObjectPrivate::get(object);</div><div class='del'>-</div><div class='del'>-    if (!priv-&gt;hasGuards)</div><div class='del'>-        return;</div><div class='del'>-</div><div class='ctx'>     GuardHash *hash = 0;</div><div class='ctx'>     QMutex *mutex = 0;</div><div class='ctx'>     QT_TRY {</div><div class='hunk'>@@ -506,22 +490,26 @@ void QObjectPrivate::clearGuards(QObject *object)</div><div class='ctx'> </div><div class='ctx'> /*! \internal</div><div class='ctx'>  */</div><div class='del'>-QMetaCallEvent::QMetaCallEvent(int id, const QObject *sender, int signalId,</div><div class='add'>+QMetaCallEvent::QMetaCallEvent(ushort method_offset, ushort method_relative, QObjectPrivate::StaticMetaCallFunction callFunction,</div><div class='add'>+                               const QObject *sender, int signalId,</div><div class='ctx'>                                int nargs, int *types, void **args, QSemaphore *semaphore)</div><div class='del'>-    : QEvent(MetaCall), id_(id), sender_(sender), signalId_(signalId),</div><div class='del'>-      nargs_(nargs), types_(types), args_(args), semaphore_(semaphore)</div><div class='add'>+    : QEvent(MetaCall), sender_(sender), signalId_(signalId),</div><div class='add'>+      nargs_(nargs), types_(types), args_(args), semaphore_(semaphore),</div><div class='add'>+      callFunction_(callFunction), method_offset_(method_offset), method_relative_(method_relative)</div><div class='ctx'> { }</div><div class='ctx'> </div><div class='ctx'> /*! \internal</div><div class='ctx'>  */</div><div class='ctx'> QMetaCallEvent::~QMetaCallEvent()</div><div class='ctx'> {</div><div class='del'>-    for (int i = 0; i &lt; nargs_; ++i) {</div><div class='del'>-        if (types_[i] &amp;&amp; args_[i])</div><div class='del'>-            QMetaType::destroy(types_[i], args_[i]);</div><div class='add'>+    if (types_) {</div><div class='add'>+        for (int i = 0; i &lt; nargs_; ++i) {</div><div class='add'>+            if (types_[i] &amp;&amp; args_[i])</div><div class='add'>+                QMetaType::destroy(types_[i], args_[i]);</div><div class='add'>+        }</div><div class='add'>+        qFree(types_);</div><div class='add'>+        qFree(args_);</div><div class='ctx'>     }</div><div class='del'>-    if (types_) qFree(types_);</div><div class='del'>-    if (args_) qFree(args_);</div><div class='ctx'> #ifndef QT_NO_THREAD</div><div class='ctx'>     if (semaphore_)</div><div class='ctx'>         semaphore_-&gt;release();</div><div class='hunk'>@@ -530,9 +518,13 @@ QMetaCallEvent::~QMetaCallEvent()</div><div class='ctx'> </div><div class='ctx'> /*! \internal</div><div class='ctx'>  */</div><div class='del'>-int QMetaCallEvent::placeMetaCall(QObject *object)</div><div class='add'>+void QMetaCallEvent::placeMetaCall(QObject *object)</div><div class='ctx'> {</div><div class='del'>-    return QMetaObject::metacall(object, QMetaObject::InvokeMetaMethod, id_, args_);</div><div class='add'>+    if (callFunction_) {</div><div class='add'>+        callFunction_(object, QMetaObject::InvokeMetaMethod, method_relative_, args_);</div><div class='add'>+    } else {</div><div class='add'>+        QMetaObject::metacall(object, QMetaObject::InvokeMetaMethod, method_offset_ + method_relative_, args_);</div><div class='add'>+    }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -731,13 +723,15 @@ QObject::QObject(QObject *parent)</div><div class='ctx'>     d_ptr-&gt;q_ptr = this;</div><div class='ctx'>     d-&gt;threadData = (parent &amp;&amp; !parent-&gt;thread()) ? parent-&gt;d_func()-&gt;threadData : QThreadData::current();</div><div class='ctx'>     d-&gt;threadData-&gt;ref();</div><div class='del'>-    QT_TRY {</div><div class='del'>-        if (!check_parent_thread(parent, parent ? parent-&gt;d_func()-&gt;threadData : 0, d-&gt;threadData))</div><div class='del'>-            parent = 0;</div><div class='del'>-        setParent(parent);</div><div class='del'>-    } QT_CATCH(...) {</div><div class='del'>-        d-&gt;threadData-&gt;deref();</div><div class='del'>-        QT_RETHROW;</div><div class='add'>+    if (parent) {</div><div class='add'>+        QT_TRY {</div><div class='add'>+            if (!check_parent_thread(parent, parent ? parent-&gt;d_func()-&gt;threadData : 0, d-&gt;threadData))</div><div class='add'>+                parent = 0;</div><div class='add'>+            setParent(parent);</div><div class='add'>+        } QT_CATCH(...) {</div><div class='add'>+            d-&gt;threadData-&gt;deref();</div><div class='add'>+            QT_RETHROW;</div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='ctx'>     qt_addObject(this);</div><div class='ctx'> }</div><div class='hunk'>@@ -756,9 +750,11 @@ QObject::QObject(QObject *parent, const char *name)</div><div class='ctx'>     qt_addObject(d_ptr-&gt;q_ptr = this);</div><div class='ctx'>     d-&gt;threadData = (parent &amp;&amp; !parent-&gt;thread()) ? parent-&gt;d_func()-&gt;threadData : QThreadData::current();</div><div class='ctx'>     d-&gt;threadData-&gt;ref();</div><div class='del'>-    if (!check_parent_thread(parent, parent ? parent-&gt;d_func()-&gt;threadData : 0, d-&gt;threadData))</div><div class='del'>-        parent = 0;</div><div class='del'>-    setParent(parent);</div><div class='add'>+    if (parent) {</div><div class='add'>+        if (!check_parent_thread(parent, parent ? parent-&gt;d_func()-&gt;threadData : 0, d-&gt;threadData))</div><div class='add'>+            parent = 0;</div><div class='add'>+        setParent(parent);</div><div class='add'>+    }</div><div class='ctx'>     setObjectName(QString::fromAscii(name));</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -772,21 +768,23 @@ QObject::QObject(QObjectPrivate &amp;dd, QObject *parent)</div><div class='ctx'>     d_ptr-&gt;q_ptr = this;</div><div class='ctx'>     d-&gt;threadData = (parent &amp;&amp; !parent-&gt;thread()) ? parent-&gt;d_func()-&gt;threadData : QThreadData::current();</div><div class='ctx'>     d-&gt;threadData-&gt;ref();</div><div class='del'>-    QT_TRY {</div><div class='del'>-        if (!check_parent_thread(parent, parent ? parent-&gt;d_func()-&gt;threadData : 0, d-&gt;threadData))</div><div class='del'>-            parent = 0;</div><div class='del'>-        if (d-&gt;isWidget) {</div><div class='del'>-            if (parent) {</div><div class='del'>-                d-&gt;parent = parent;</div><div class='del'>-                d-&gt;parent-&gt;d_func()-&gt;children.append(this);</div><div class='add'>+    if (parent) {</div><div class='add'>+        QT_TRY {</div><div class='add'>+            if (!check_parent_thread(parent, parent ? parent-&gt;d_func()-&gt;threadData : 0, d-&gt;threadData))</div><div class='add'>+                parent = 0;</div><div class='add'>+            if (d-&gt;isWidget) {</div><div class='add'>+                if (parent) {</div><div class='add'>+                    d-&gt;parent = parent;</div><div class='add'>+                    d-&gt;parent-&gt;d_func()-&gt;children.append(this);</div><div class='add'>+                }</div><div class='add'>+                // no events sent here, this is done at the end of the QWidget constructor</div><div class='add'>+            } else {</div><div class='add'>+                setParent(parent);</div><div class='ctx'>             }</div><div class='del'>-            // no events sent here, this is done at the end of the QWidget constructor</div><div class='del'>-        } else {</div><div class='del'>-            setParent(parent);</div><div class='add'>+        } QT_CATCH(...) {</div><div class='add'>+            d-&gt;threadData-&gt;deref();</div><div class='add'>+            QT_RETHROW;</div><div class='ctx'>         }</div><div class='del'>-    } QT_CATCH(...) {</div><div class='del'>-        d-&gt;threadData-&gt;deref();</div><div class='del'>-        QT_RETHROW;</div><div class='ctx'>     }</div><div class='ctx'>     qt_addObject(this);</div><div class='ctx'> }</div><div class='hunk'>@@ -821,7 +819,7 @@ QObject::~QObject()</div><div class='ctx'>     d-&gt;wasDeleted = true;</div><div class='ctx'>     d-&gt;blockSig = 0; // unblock signals so we always emit destroyed()</div><div class='ctx'> </div><div class='del'>-    if (!d-&gt;isWidget) {</div><div class='add'>+    if (d-&gt;hasGuards &amp;&amp; !d-&gt;isWidget) {</div><div class='ctx'>         // set all QPointers for this object to zero - note that</div><div class='ctx'>         // ~QWidget() does this for us, so we don't have to do it twice</div><div class='ctx'>         QObjectPrivate::clearGuards(this);</div><div class='hunk'>@@ -839,22 +837,16 @@ QObject::~QObject()</div><div class='ctx'>             delete d-&gt;sharedRefcount;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    QT_TRY {</div><div class='del'>-        emit destroyed(this);</div><div class='del'>-    } QT_CATCH(...) {</div><div class='del'>-        // all the signal/slots connections are still in place - if we don't</div><div class='del'>-        // quit now, we will crash pretty soon.</div><div class='del'>-        qWarning("Detected an unexpected exception in ~QObject while emitting destroyed().");</div><div class='del'>-#if defined(Q_BUILD_INTERNAL) &amp;&amp; !defined(QT_NO_EXCEPTIONS)</div><div class='del'>-        struct AutotestException : public std::exception</div><div class='del'>-        {</div><div class='del'>-            const char *what() const throw() { return "autotest swallow"; }</div><div class='del'>-        } autotestException;</div><div class='del'>-        // throw autotestException;</div><div class='ctx'> </div><div class='del'>-#else</div><div class='del'>-        QT_RETHROW;</div><div class='del'>-#endif</div><div class='add'>+    if (d-&gt;isSignalConnected(0)) {</div><div class='add'>+        QT_TRY {</div><div class='add'>+            emit destroyed(this);</div><div class='add'>+        } QT_CATCH(...) {</div><div class='add'>+            // all the signal/slots connections are still in place - if we don't</div><div class='add'>+            // quit now, we will crash pretty soon.</div><div class='add'>+            qWarning("Detected an unexpected exception in ~QObject while emitting destroyed().");</div><div class='add'>+            QT_RETHROW;</div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if (d-&gt;declarativeData)</div><div class='hunk'>@@ -892,7 +884,7 @@ QObject::~QObject()</div><div class='ctx'>                         if (c-&gt;next) c-&gt;next-&gt;prev = c-&gt;prev;</div><div class='ctx'>                     }</div><div class='ctx'>                     if (needToUnlock)</div><div class='del'>-                        m-&gt;unlock();</div><div class='add'>+                        m-&gt;unlockInline();</div><div class='ctx'> </div><div class='ctx'>                     connectionList.first = c-&gt;nextConnectionList;</div><div class='ctx'>                     delete c;</div><div class='hunk'>@@ -916,7 +908,7 @@ QObject::~QObject()</div><div class='ctx'>             bool needToUnlock = QOrderedMutexLocker::relock(signalSlotMutex, m);</div><div class='ctx'>             //the node has maybe been removed while the mutex was unlocked in relock?</div><div class='ctx'>             if (!node || node-&gt;sender != sender) {</div><div class='del'>-                m-&gt;unlock();</div><div class='add'>+                m-&gt;unlockInline();</div><div class='ctx'>                 continue;</div><div class='ctx'>             }</div><div class='ctx'>             node-&gt;receiver = 0;</div><div class='hunk'>@@ -926,35 +918,18 @@ QObject::~QObject()</div><div class='ctx'> </div><div class='ctx'>             node = node-&gt;next;</div><div class='ctx'>             if (needToUnlock)</div><div class='del'>-                m-&gt;unlock();</div><div class='add'>+                m-&gt;unlockInline();</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    if (d-&gt;pendTimer) {</div><div class='del'>-        // unregister pending timers</div><div class='del'>-        if (d-&gt;threadData-&gt;eventDispatcher)</div><div class='del'>-            d-&gt;threadData-&gt;eventDispatcher-&gt;unregisterTimers(this);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-#ifdef QT3_SUPPORT</div><div class='del'>-    d-&gt;pendingChildInsertedEvents.clear();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-    d-&gt;eventFilters.clear();</div><div class='del'>-</div><div class='ctx'>     if (!d-&gt;children.isEmpty())</div><div class='ctx'>         d-&gt;deleteChildren();</div><div class='ctx'> </div><div class='ctx'>     qt_removeObject(this);</div><div class='ctx'> </div><div class='del'>-    if (d-&gt;postedEvents)</div><div class='del'>-        QCoreApplication::removePostedEvents(this, 0);</div><div class='del'>-</div><div class='ctx'>     if (d-&gt;parent)        // remove it from parent object</div><div class='ctx'>         d-&gt;setParent_helper(0);</div><div class='ctx'> </div><div class='del'>-    d-&gt;threadData-&gt;deref();</div><div class='del'>-</div><div class='ctx'> #ifdef QT_JAMBI_BUILD</div><div class='ctx'>     if (d-&gt;inEventHandler) {</div><div class='ctx'>         qWarning("QObject: Do not delete object, '%s', during its event handler!",</div><div class='hunk'>@@ -1202,7 +1177,9 @@ bool QObject::event(QEvent *e)</div><div class='ctx'> </div><div class='ctx'>     case QEvent::MetaCall:</div><div class='ctx'>         {</div><div class='add'>+#ifdef QT_JAMBI_BUILD</div><div class='ctx'>             d_func()-&gt;inEventHandler = false;</div><div class='add'>+#endif</div><div class='ctx'>             QMetaCallEvent *mce = static_cast&lt;QMetaCallEvent*&gt;(e);</div><div class='ctx'>             QObjectPrivate::Sender currentSender;</div><div class='ctx'>             currentSender.sender = const_cast&lt;QObject*&gt;(mce-&gt;sender());</div><div class='hunk'>@@ -1520,11 +1497,14 @@ void QObjectPrivate::setThreadData_helper(QThreadData *currentData, QThreadData</div><div class='ctx'>         currentSender-&gt;ref = 0;</div><div class='ctx'>     currentSender = 0;</div><div class='ctx'> </div><div class='add'>+#ifdef QT_JAMBI_BUILD</div><div class='ctx'>     // the current event thread also shouldn't restore the delete watch</div><div class='ctx'>     inEventHandler = false;</div><div class='add'>+</div><div class='ctx'>     if (deleteWatch)</div><div class='ctx'>         *deleteWatch = 1;</div><div class='ctx'>     deleteWatch = 0;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'>     // set new thread data</div><div class='ctx'>     targetData-&gt;ref();</div><div class='hunk'>@@ -1774,11 +1754,7 @@ QObjectList QObject::queryList(const char *inheritsClass,</div><div class='ctx'> </div><div class='ctx'>     \snippet doc/src/snippets/code/src_corelib_kernel_qobject.cpp 11</div><div class='ctx'> </div><div class='del'>-    \warning This function is not available with MSVC 6. Use</div><div class='del'>-    qFindChild() instead if you need to support that version of the</div><div class='del'>-    compiler.</div><div class='del'>-</div><div class='del'>-    \sa findChildren(), qFindChild()</div><div class='add'>+    \sa findChildren()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -1798,11 +1774,7 @@ QObjectList QObject::queryList(const char *inheritsClass,</div><div class='ctx'> </div><div class='ctx'>     \snippet doc/src/snippets/code/src_corelib_kernel_qobject.cpp 13</div><div class='ctx'> </div><div class='del'>-    \warning This function is not available with MSVC 6. Use</div><div class='del'>-    qFindChildren() instead if you need to support that version of the</div><div class='del'>-    compiler.</div><div class='del'>-</div><div class='del'>-    \sa findChild(), qFindChildren()</div><div class='add'>+    \sa findChild()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -1813,20 +1785,19 @@ QObjectList QObject::queryList(const char *inheritsClass,</div><div class='ctx'>     and that have names matching the regular expression \a regExp,</div><div class='ctx'>     or an empty list if there are no such objects.</div><div class='ctx'>     The search is performed recursively.</div><div class='del'>-</div><div class='del'>-    \warning This function is not available with MSVC 6. Use</div><div class='del'>-    qFindChildren() instead if you need to support that version of the</div><div class='del'>-    compiler.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     \fn T qFindChild(const QObject *obj, const QString &amp;name)</div><div class='ctx'>     \relates QObject</div><div class='add'>+    \obsolete</div><div class='ctx'> </div><div class='ctx'>     This function is equivalent to</div><div class='del'>-    \a{obj}-&gt;\l{QObject::findChild()}{findChild}&lt;T&gt;(\a name). It is</div><div class='del'>-    provided as a work-around for MSVC 6, which doesn't support</div><div class='del'>-    member template functions.</div><div class='add'>+    \a{obj}-&gt;\l{QObject::findChild()}{findChild}&lt;T&gt;(\a name).</div><div class='add'>+</div><div class='add'>+    \note This function was provided as a workaround for MSVC 6</div><div class='add'>+    which did not support member template functions. It is advised</div><div class='add'>+    to use the other form in new code.</div><div class='ctx'> </div><div class='ctx'>     \sa QObject::findChild()</div><div class='ctx'> */</div><div class='hunk'>@@ -1834,11 +1805,14 @@ QObjectList QObject::queryList(const char *inheritsClass,</div><div class='ctx'> /*!</div><div class='ctx'>     \fn QList&lt;T&gt; qFindChildren(const QObject *obj, const QString &amp;name)</div><div class='ctx'>     \relates QObject</div><div class='add'>+    \obsolete</div><div class='ctx'> </div><div class='ctx'>     This function is equivalent to</div><div class='del'>-    \a{obj}-&gt;\l{QObject::findChildren()}{findChildren}&lt;T&gt;(\a name). It is</div><div class='del'>-    provided as a work-around for MSVC 6, which doesn't support</div><div class='del'>-    member template functions.</div><div class='add'>+    \a{obj}-&gt;\l{QObject::findChildren()}{findChildren}&lt;T&gt;(\a name).</div><div class='add'>+</div><div class='add'>+    \note This function was provided as a workaround for MSVC 6</div><div class='add'>+    which did not support member template functions. It is advised</div><div class='add'>+    to use the other form in new code.</div><div class='ctx'> </div><div class='ctx'>     \sa QObject::findChildren()</div><div class='ctx'> */</div><div class='hunk'>@@ -1849,9 +1823,13 @@ QObjectList QObject::queryList(const char *inheritsClass,</div><div class='ctx'>     \overload qFindChildren()</div><div class='ctx'> </div><div class='ctx'>     This function is equivalent to</div><div class='del'>-    \a{obj}-&gt;\l{QObject::findChildren()}{findChildren}&lt;T&gt;(\a regExp). It is</div><div class='del'>-    provided as a work-around for MSVC 6, which doesn't support</div><div class='del'>-    member template functions.</div><div class='add'>+    \a{obj}-&gt;\l{QObject::findChildren()}{findChildren}&lt;T&gt;(\a regExp).</div><div class='add'>+</div><div class='add'>+    \note This function was provided as a workaround for MSVC 6</div><div class='add'>+    which did not support member template functions. It is advised</div><div class='add'>+    to use the other form in new code.</div><div class='add'>+</div><div class='add'>+    \sa QObject::findChildren()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -1861,9 +1839,11 @@ QObjectList QObject::queryList(const char *inheritsClass,</div><div class='ctx'>     \overload qFindChildren()</div><div class='ctx'> </div><div class='ctx'>     This function is equivalent to</div><div class='del'>-    \a{obj}-&gt;\l{QObject::findChild()}{findChild}&lt;T&gt;(\a name). It is</div><div class='del'>-    provided as a work-around for MSVC 6, which doesn't support</div><div class='del'>-    member template functions.</div><div class='add'>+    \a{obj}-&gt;\l{QObject::findChild()}{findChild}&lt;T&gt;(\a name).</div><div class='add'>+</div><div class='add'>+    \note This function was provided as a workaround for MSVC 6</div><div class='add'>+    which did not support member template functions. It is advised</div><div class='add'>+    to use the other form in new code.</div><div class='ctx'> </div><div class='ctx'>     \sa QObject::findChild()</div><div class='ctx'> */</div><div class='hunk'>@@ -1875,9 +1855,11 @@ QObjectList QObject::queryList(const char *inheritsClass,</div><div class='ctx'>     \overload qFindChildren()</div><div class='ctx'> </div><div class='ctx'>     This function is equivalent to</div><div class='del'>-    \a{obj}-&gt;\l{QObject::findChildren()}{findChildren}&lt;T&gt;(\a name). It is</div><div class='del'>-    provided as a work-around for MSVC 6, which doesn't support</div><div class='del'>-    member template functions.</div><div class='add'>+    \a{obj}-&gt;\l{QObject::findChildren()}{findChildren}&lt;T&gt;(\a name).</div><div class='add'>+</div><div class='add'>+    \note This function was provided as a workaround for MSVC 6</div><div class='add'>+    which did not support member template functions. It is advised</div><div class='add'>+    to use the other form in new code.</div><div class='ctx'> </div><div class='ctx'>     \sa QObject::findChildren()</div><div class='ctx'> */</div><div class='hunk'>@@ -1997,12 +1979,14 @@ void QObjectPrivate::setParent_helper(QObject *o)</div><div class='ctx'>                 QChildEvent e(QEvent::ChildAdded, q);</div><div class='ctx'>                 QCoreApplication::sendEvent(parent, &amp;e);</div><div class='ctx'> #ifdef QT3_SUPPORT</div><div class='del'>-                if (parent-&gt;d_func()-&gt;pendingChildInsertedEvents.isEmpty()) {</div><div class='del'>-                    QCoreApplication::postEvent(parent,</div><div class='del'>-                                                new QEvent(QEvent::ChildInsertedRequest),</div><div class='del'>-                                                Qt::HighEventPriority);</div><div class='add'>+                if (QCoreApplicationPrivate::useQt3Support) {</div><div class='add'>+                    if (parent-&gt;d_func()-&gt;pendingChildInsertedEvents.isEmpty()) {</div><div class='add'>+                        QCoreApplication::postEvent(parent,</div><div class='add'>+                                                    new QEvent(QEvent::ChildInsertedRequest),</div><div class='add'>+                                                    Qt::HighEventPriority);</div><div class='add'>+                    }</div><div class='add'>+                    parent-&gt;d_func()-&gt;pendingChildInsertedEvents.append(q);</div><div class='ctx'>                 }</div><div class='del'>-                parent-&gt;d_func()-&gt;pendingChildInsertedEvents.append(q);</div><div class='ctx'> #endif</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='hunk'>@@ -2311,7 +2295,7 @@ static void err_info_about_objects(const char * func,</div><div class='ctx'>     a thread different from this object's thread. Do not use this</div><div class='ctx'>     function in this type of scenario.</div><div class='ctx'> </div><div class='del'>-    \sa QSignalMapper</div><div class='add'>+    \sa senderSignalIndex(), QSignalMapper</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> QObject *QObject::sender() const</div><div class='hunk'>@@ -2322,13 +2306,53 @@ QObject *QObject::sender() const</div><div class='ctx'>     if (!d-&gt;currentSender)</div><div class='ctx'>         return 0;</div><div class='ctx'> </div><div class='del'>-    // Return 0 if d-&gt;currentSender isn't in d-&gt;senders</div><div class='del'>-    bool found = false;</div><div class='del'>-    for (QObjectPrivate::Connection *c = d-&gt;senders; c &amp;&amp; !found; c = c-&gt;next)</div><div class='del'>-        found = (c-&gt;sender == d-&gt;currentSender-&gt;sender);</div><div class='del'>-    if (!found)</div><div class='del'>-        return 0;</div><div class='del'>-    return d-&gt;currentSender-&gt;sender;</div><div class='add'>+    for (QObjectPrivate::Connection *c = d-&gt;senders; c; c = c-&gt;next) {</div><div class='add'>+        if (c-&gt;sender == d-&gt;currentSender-&gt;sender)</div><div class='add'>+            return d-&gt;currentSender-&gt;sender;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns the meta-method index of the signal that called the currently</div><div class='add'>+    executing slot, which is a member of the class returned by sender().</div><div class='add'>+    If called outside of a slot activated by a signal, -1 is returned.</div><div class='add'>+</div><div class='add'>+    For signals with default parameters, this function will always return</div><div class='add'>+    the index with all parameters, regardless of which was used with</div><div class='add'>+    connect(). For example, the signal \c {destroyed(QObject *obj = 0)}</div><div class='add'>+    will have two different indexes (with and without the parameter), but</div><div class='add'>+    this function will always return the index with a parameter. This does</div><div class='add'>+    not apply when overloading signals with different parameters.</div><div class='add'>+</div><div class='add'>+    \warning This function violates the object-oriented principle of</div><div class='add'>+    modularity. However, getting access to the signal index might be useful</div><div class='add'>+    when many signals are connected to a single slot.</div><div class='add'>+</div><div class='add'>+    \warning The return value of this function is not valid when the slot</div><div class='add'>+    is called via a Qt::DirectConnection from a thread different from this</div><div class='add'>+    object's thread. Do not use this function in this type of scenario.</div><div class='add'>+</div><div class='add'>+    \sa sender(), QMetaObject::indexOfSignal(), QMetaObject::method()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+int QObject::senderSignalIndex() const</div><div class='add'>+{</div><div class='add'>+    Q_D(const QObject);</div><div class='add'>+</div><div class='add'>+    QMutexLocker locker(signalSlotLock(this));</div><div class='add'>+    if (!d-&gt;currentSender)</div><div class='add'>+        return -1;</div><div class='add'>+</div><div class='add'>+    for (QObjectPrivate::Connection *c = d-&gt;senders; c; c = c-&gt;next) {</div><div class='add'>+        if (c-&gt;sender == d-&gt;currentSender-&gt;sender)</div><div class='add'>+            return d-&gt;currentSender-&gt;signal;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -2390,6 +2414,71 @@ int QObject::receivers(const char *signal) const</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \internal</div><div class='add'>+</div><div class='add'>+    This helper function calculates signal and method index for the given</div><div class='add'>+    member in the specified class.</div><div class='add'>+</div><div class='add'>+    \li If member.mobj is 0 then both signalIndex and methodIndex are set to -1.</div><div class='add'>+</div><div class='add'>+    \li If specified member is not a member of obj instance class (or one of</div><div class='add'>+    its parent classes) then both signalIndex and methodIndex are set to -1.</div><div class='add'>+</div><div class='add'>+    This function is used by QObject::connect and QObject::disconnect which</div><div class='add'>+    are working with QMetaMethod.</div><div class='add'>+</div><div class='add'>+    \param[out] signalIndex is set to the signal index of member. If the member</div><div class='add'>+    specified is not signal this variable is set to -1.</div><div class='add'>+</div><div class='add'>+    \param[out] methodIndex is set to the method index of the member. If the</div><div class='add'>+    member is not a method of the object specified by obj param this variable</div><div class='add'>+    is set to -1.</div><div class='add'>+*/</div><div class='add'>+void QMetaObjectPrivate::memberIndexes(const QObject *obj,</div><div class='add'>+                                       const QMetaMethod &amp;member,</div><div class='add'>+                                       int *signalIndex, int *methodIndex)</div><div class='add'>+{</div><div class='add'>+    *signalIndex = -1;</div><div class='add'>+    *methodIndex = -1;</div><div class='add'>+    if (!obj || !member.mobj)</div><div class='add'>+        return;</div><div class='add'>+    const QMetaObject *m = obj-&gt;metaObject();</div><div class='add'>+    // Check that member is member of obj class</div><div class='add'>+    while (m != 0 &amp;&amp; m != member.mobj)</div><div class='add'>+        m = m-&gt;d.superdata;</div><div class='add'>+    if (!m)</div><div class='add'>+        return;</div><div class='add'>+    *signalIndex = *methodIndex = (member.handle - get(member.mobj)-&gt;methodData)/5;</div><div class='add'>+</div><div class='add'>+    int signalOffset;</div><div class='add'>+    int methodOffset;</div><div class='add'>+    computeOffsets(m, &amp;signalOffset, &amp;methodOffset);</div><div class='add'>+</div><div class='add'>+    *methodIndex += methodOffset;</div><div class='add'>+    if (member.methodType() == QMetaMethod::Signal) {</div><div class='add'>+        *signalIndex = originalClone(m, *signalIndex);</div><div class='add'>+        *signalIndex += signalOffset;</div><div class='add'>+    } else {</div><div class='add'>+        *signalIndex = -1;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void check_and_warn_compat(const QMetaObject *sender, const QMetaMethod &amp;signal,</div><div class='add'>+                                         const QMetaObject *receiver, const QMetaMethod &amp;method)</div><div class='add'>+{</div><div class='add'>+    if (signal.attributes() &amp; QMetaMethod::Compatibility) {</div><div class='add'>+        if (!(method.attributes() &amp; QMetaMethod::Compatibility))</div><div class='add'>+            qWarning("QObject::connect: Connecting from COMPAT signal (%s::%s)",</div><div class='add'>+                     sender-&gt;className(), signal.signature());</div><div class='add'>+    } else if ((method.attributes() &amp; QMetaMethod::Compatibility) &amp;&amp;</div><div class='add'>+               method.methodType() == QMetaMethod::Signal) {</div><div class='add'>+        qWarning("QObject::connect: Connecting from %s::%s to COMPAT slot (%s::%s)",</div><div class='add'>+                 sender-&gt;className(), signal.signature(),</div><div class='add'>+                 receiver-&gt;className(), method.signature());</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='ctx'>     \threadsafe</div><div class='ctx'> </div><div class='ctx'>     Creates a connection of the given \a type from the \a signal in</div><div class='hunk'>@@ -2524,18 +2613,17 @@ bool QObject::connect(const QObject *sender, const char *signal,</div><div class='ctx'>     ++method; // skip code</div><div class='ctx'> </div><div class='ctx'>     const QMetaObject *rmeta = receiver-&gt;metaObject();</div><div class='del'>-    int method_index = -1;</div><div class='add'>+    int method_index_relative = -1;</div><div class='ctx'>     switch (membcode) {</div><div class='ctx'>     case QSLOT_CODE:</div><div class='del'>-        method_index = QMetaObjectPrivate::indexOfSlot(rmeta, method, false);</div><div class='add'>+        method_index_relative = QMetaObjectPrivate::indexOfSlotRelative(&amp;rmeta, method, false);</div><div class='ctx'>         break;</div><div class='ctx'>     case QSIGNAL_CODE:</div><div class='del'>-        method_index = QMetaObjectPrivate::indexOfSignalRelative(&amp;rmeta, method, false);</div><div class='del'>-        if (method_index &gt;= 0)</div><div class='del'>-            method_index += rmeta-&gt;methodOffset();</div><div class='add'>+        method_index_relative = QMetaObjectPrivate::indexOfSignalRelative(&amp;rmeta, method, false);</div><div class='ctx'>         break;</div><div class='ctx'>     }</div><div class='del'>-    if (method_index &lt; 0) {</div><div class='add'>+</div><div class='add'>+    if (method_index_relative &lt; 0) {</div><div class='ctx'>         // check for normalized methods</div><div class='ctx'>         tmp_method_name = QMetaObject::normalizedSignature(method);</div><div class='ctx'>         method = tmp_method_name.constData();</div><div class='hunk'>@@ -2544,19 +2632,24 @@ bool QObject::connect(const QObject *sender, const char *signal,</div><div class='ctx'>         rmeta = receiver-&gt;metaObject();</div><div class='ctx'>         switch (membcode) {</div><div class='ctx'>         case QSLOT_CODE:</div><div class='del'>-            method_index = rmeta-&gt;indexOfSlot(method);</div><div class='add'>+            method_index_relative = QMetaObjectPrivate::indexOfSlotRelative(&amp;rmeta, method, false);</div><div class='add'>+            if (method_index_relative &lt; 0)</div><div class='add'>+                method_index_relative = QMetaObjectPrivate::indexOfSlotRelative(&amp;rmeta, method, true);</div><div class='ctx'>             break;</div><div class='ctx'>         case QSIGNAL_CODE:</div><div class='del'>-            method_index = rmeta-&gt;indexOfSignal(method);</div><div class='add'>+            method_index_relative = QMetaObjectPrivate::indexOfSignalRelative(&amp;rmeta, method, false);</div><div class='add'>+            if (method_index_relative &lt; 0)</div><div class='add'>+                method_index_relative = QMetaObjectPrivate::indexOfSignalRelative(&amp;rmeta, method, true);</div><div class='ctx'>             break;</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    if (method_index &lt; 0) {</div><div class='add'>+    if (method_index_relative &lt; 0) {</div><div class='ctx'>         err_method_notfound(receiver, method_arg, "connect");</div><div class='ctx'>         err_info_about_objects("connect", sender, receiver);</div><div class='ctx'>         return false;</div><div class='ctx'>     }</div><div class='add'>+</div><div class='ctx'>     if (!QMetaObject::checkConnectArgs(signal, method)) {</div><div class='ctx'>         qWarning("QObject::connect: Incompatible sender/receiver arguments"</div><div class='ctx'>                  "\n        %s::%s --&gt; %s::%s",</div><div class='hunk'>@@ -2566,31 +2659,128 @@ bool QObject::connect(const QObject *sender, const char *signal,</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     int *types = 0;</div><div class='del'>-    if ((type == Qt::QueuedConnection || type == Qt::BlockingQueuedConnection)</div><div class='add'>+    if ((type == Qt::QueuedConnection)</div><div class='ctx'>             &amp;&amp; !(types = queuedConnectionTypes(smeta-&gt;method(signal_absolute_index).parameterTypes())))</div><div class='ctx'>         return false;</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_DEBUG</div><div class='del'>-    {</div><div class='add'>+    if (warnCompat) {</div><div class='ctx'>         QMetaMethod smethod = smeta-&gt;method(signal_absolute_index);</div><div class='del'>-        QMetaMethod rmethod = rmeta-&gt;method(method_index);</div><div class='del'>-        if (warnCompat) {</div><div class='del'>-            if(smethod.attributes() &amp; QMetaMethod::Compatibility) {</div><div class='del'>-                if (!(rmethod.attributes() &amp; QMetaMethod::Compatibility))</div><div class='del'>-                    qWarning("QObject::connect: Connecting from COMPAT signal (%s::%s)", smeta-&gt;className(), signal);</div><div class='del'>-            } else if(rmethod.attributes() &amp; QMetaMethod::Compatibility &amp;&amp; membcode != QSIGNAL_CODE) {</div><div class='del'>-                qWarning("QObject::connect: Connecting from %s::%s to COMPAT slot (%s::%s)",</div><div class='del'>-                         smeta-&gt;className(), signal, rmeta-&gt;className(), method);</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='add'>+        QMetaMethod rmethod = rmeta-&gt;method(method_index_relative + rmeta-&gt;methodOffset());</div><div class='add'>+        check_and_warn_compat(smeta, smethod, rmeta, rmethod);</div><div class='ctx'>     }</div><div class='ctx'> #endif</div><div class='del'>-    if (!QMetaObjectPrivate::connect(sender, signal_index, receiver, method_index, type, types))</div><div class='add'>+    if (!QMetaObjectPrivate::connect(sender, signal_index, receiver, method_index_relative, rmeta ,type, types))</div><div class='ctx'>         return false;</div><div class='ctx'>     const_cast&lt;QObject*&gt;(sender)-&gt;connectNotify(signal - 1);</div><div class='ctx'>     return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Creates a connection of the given \a type from the \a signal in</div><div class='add'>+    the \a sender object to the \a method in the \a receiver object.</div><div class='add'>+    Returns true if the connection succeeds; otherwise returns false.</div><div class='add'>+</div><div class='add'>+    This function works in the same way as</div><div class='add'>+    connect(const QObject *sender, const char *signal,</div><div class='add'>+            const QObject *receiver, const char *method,</div><div class='add'>+            Qt::ConnectionType type)</div><div class='add'>+    but it uses QMetaMethod to specify signal and method.</div><div class='add'>+</div><div class='add'>+    \see connect(const QObject *sender, const char *signal,</div><div class='add'>+                 const QObject *receiver, const char *method,</div><div class='add'>+                 Qt::ConnectionType type)</div><div class='add'>+ */</div><div class='add'>+bool QObject::connect(const QObject *sender, const QMetaMethod &amp;signal,</div><div class='add'>+                      const QObject *receiver, const QMetaMethod &amp;method,</div><div class='add'>+                      Qt::ConnectionType type)</div><div class='add'>+{</div><div class='add'>+#ifndef QT_NO_DEBUG</div><div class='add'>+    bool warnCompat = true;</div><div class='add'>+#endif</div><div class='add'>+    if (type == Qt::AutoCompatConnection) {</div><div class='add'>+        type = Qt::AutoConnection;</div><div class='add'>+#ifndef QT_NO_DEBUG</div><div class='add'>+        warnCompat = false;</div><div class='add'>+#endif</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (sender == 0</div><div class='add'>+            || receiver == 0</div><div class='add'>+            || signal.methodType() != QMetaMethod::Signal</div><div class='add'>+            || method.methodType() == QMetaMethod::Constructor) {</div><div class='add'>+        qWarning("QObject::connect: Cannot connect %s::%s to %s::%s",</div><div class='add'>+                 sender ? sender-&gt;metaObject()-&gt;className() : "(null)",</div><div class='add'>+                 signal.signature(),</div><div class='add'>+                 receiver ? receiver-&gt;metaObject()-&gt;className() : "(null)",</div><div class='add'>+                 method.signature() );</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    // Reconstructing SIGNAL() macro result for signal.signature() string</div><div class='add'>+    QByteArray signalSignature;</div><div class='add'>+    signalSignature.reserve(qstrlen(signal.signature())+1);</div><div class='add'>+    signalSignature.append((char)(QSIGNAL_CODE + '0'));</div><div class='add'>+    signalSignature.append(signal.signature());</div><div class='add'>+</div><div class='add'>+    {</div><div class='add'>+        QByteArray methodSignature;</div><div class='add'>+        methodSignature.reserve(qstrlen(method.signature())+1);</div><div class='add'>+        methodSignature.append((char)(method.methodType() == QMetaMethod::Slot ? QSLOT_CODE</div><div class='add'>+                                    : method.methodType() == QMetaMethod::Signal ? QSIGNAL_CODE : 0  + '0'));</div><div class='add'>+        methodSignature.append(method.signature());</div><div class='add'>+        const void *cbdata[] = { sender, signalSignature.constData(), receiver, methodSignature.constData(), &amp;type };</div><div class='add'>+        if (QInternal::activateCallbacks(QInternal::ConnectCallback, (void **) cbdata))</div><div class='add'>+            return true;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    int signal_index;</div><div class='add'>+    int method_index;</div><div class='add'>+    {</div><div class='add'>+        int dummy;</div><div class='add'>+        QMetaObjectPrivate::memberIndexes(sender, signal, &amp;signal_index, &amp;dummy);</div><div class='add'>+        QMetaObjectPrivate::memberIndexes(receiver, method, &amp;dummy, &amp;method_index);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    const QMetaObject *smeta = sender-&gt;metaObject();</div><div class='add'>+    const QMetaObject *rmeta = receiver-&gt;metaObject();</div><div class='add'>+    if (signal_index == -1) {</div><div class='add'>+        qWarning("QObject::connect: Can't find signal %s on instance of class %s",</div><div class='add'>+                 signal.signature(), smeta-&gt;className());</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+    if (method_index == -1) {</div><div class='add'>+        qWarning("QObject::connect: Can't find method %s on instance of class %s",</div><div class='add'>+                 method.signature(), rmeta-&gt;className());</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+    </div><div class='add'>+    if (!QMetaObject::checkConnectArgs(signal.signature(), method.signature())) {</div><div class='add'>+        qWarning("QObject::connect: Incompatible sender/receiver arguments"</div><div class='add'>+                 "\n        %s::%s --&gt; %s::%s",</div><div class='add'>+                 smeta-&gt;className(), signal.signature(),</div><div class='add'>+                 rmeta-&gt;className(), method.signature());</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    int *types = 0;</div><div class='add'>+    if ((type == Qt::QueuedConnection)</div><div class='add'>+            &amp;&amp; !(types = queuedConnectionTypes(signal.parameterTypes())))</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_DEBUG</div><div class='add'>+    if (warnCompat)</div><div class='add'>+        check_and_warn_compat(smeta, signal, rmeta, method);</div><div class='add'>+#endif</div><div class='add'>+    if (!QMetaObjectPrivate::connect(sender, signal_index, receiver, method_index, 0, type, types))</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+    const_cast&lt;QObject*&gt;(sender)-&gt;connectNotify(signalSignature.constData());</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     \fn bool QObject::connect(const QObject *sender, const char *signal, const char *method, Qt::ConnectionType type) const</div><div class='hunk'>@@ -2770,6 +2960,107 @@ bool QObject::disconnect(const QObject *sender, const char *signal,</div><div class='ctx'>     return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Disconnects \a signal in object \a sender from \a method in object</div><div class='add'>+    \a receiver. Returns true if the connection is successfully broken;</div><div class='add'>+    otherwise returns false.</div><div class='add'>+</div><div class='add'>+    This function provides the same posibilities like</div><div class='add'>+    disconnect(const QObject *sender, const char *signal, const QObject *receiver, const char *method)</div><div class='add'>+    but uses QMetaMethod to represent the signal and the method to be disconnected.</div><div class='add'>+</div><div class='add'>+    Additionally this function returnsfalse and no signals and slots disconnected</div><div class='add'>+    if:</div><div class='add'>+    \list 1</div><div class='add'>+</div><div class='add'>+        \i \a signal is not a member of sender class or one of its parent classes.</div><div class='add'>+</div><div class='add'>+        \i \a method is not a member of receiver class or one of its parent classes.</div><div class='add'>+</div><div class='add'>+        \i \a signal instance represents not a signal.</div><div class='add'>+</div><div class='add'>+    \endlist</div><div class='add'>+</div><div class='add'>+    QMetaMethod() may be used as wildcard in the meaning "any signal" or "any slot in receiving object".</div><div class='add'>+    In the same way 0 can be used for \a receiver in the meaning "any receiving object". In this case</div><div class='add'>+    method shoud also be QMetaMethod(). \a sender parameter should be never 0.</div><div class='add'>+</div><div class='add'>+    \see disconnect(const QObject *sender, const char *signal, const QObject *receiver, const char *method)</div><div class='add'>+ */</div><div class='add'>+bool QObject::disconnect(const QObject *sender, const QMetaMethod &amp;signal,</div><div class='add'>+                         const QObject *receiver, const QMetaMethod &amp;method)</div><div class='add'>+{</div><div class='add'>+    if (sender == 0 || (receiver == 0 &amp;&amp; method.mobj != 0)) {</div><div class='add'>+        qWarning("Object::disconnect: Unexpected null parameter");</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+    if (signal.mobj) {</div><div class='add'>+        if(signal.methodType() != QMetaMethod::Signal) {</div><div class='add'>+            qWarning("Object::%s: Attempt to %s non-signal %s::%s",</div><div class='add'>+                     "disconnect","unbind",</div><div class='add'>+                     sender-&gt;metaObject()-&gt;className(), signal.signature());</div><div class='add'>+            return false;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    if (method.mobj) {</div><div class='add'>+        if(method.methodType() == QMetaMethod::Constructor) {</div><div class='add'>+            qWarning("QObject::disconect: cannot use constructor as argument %s::%s",</div><div class='add'>+                     receiver-&gt;metaObject()-&gt;className(), method.signature());</div><div class='add'>+            return false;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    // Reconstructing SIGNAL() macro result for signal.signature() string</div><div class='add'>+    QByteArray signalSignature;</div><div class='add'>+    if (signal.mobj) {</div><div class='add'>+        signalSignature.reserve(qstrlen(signal.signature())+1);</div><div class='add'>+        signalSignature.append((char)(QSIGNAL_CODE + '0'));</div><div class='add'>+        signalSignature.append(signal.signature());</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    {</div><div class='add'>+        QByteArray methodSignature;</div><div class='add'>+        if (method.mobj) {</div><div class='add'>+            methodSignature.reserve(qstrlen(method.signature())+1);</div><div class='add'>+            methodSignature.append((char)(method.methodType() == QMetaMethod::Slot ? QSLOT_CODE</div><div class='add'>+                                        : method.methodType() == QMetaMethod::Signal ? QSIGNAL_CODE : 0  + '0'));</div><div class='add'>+            methodSignature.append(method.signature());</div><div class='add'>+        }</div><div class='add'>+        const void *cbdata[] = { sender, signal.mobj ? signalSignature.constData() : 0,</div><div class='add'>+                                 receiver, method.mobj ? methodSignature.constData() : 0 };</div><div class='add'>+        if (QInternal::activateCallbacks(QInternal::ConnectCallback, (void **) cbdata))</div><div class='add'>+            return true;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    int signal_index;</div><div class='add'>+    int method_index;</div><div class='add'>+    {</div><div class='add'>+        int dummy;</div><div class='add'>+        QMetaObjectPrivate::memberIndexes(sender, signal, &amp;signal_index, &amp;dummy);</div><div class='add'>+        QMetaObjectPrivate::memberIndexes(receiver, method, &amp;dummy, &amp;method_index);</div><div class='add'>+    }</div><div class='add'>+    // If we are here sender is not null. If signal is not null while signal_index</div><div class='add'>+    // is -1 then this signal is not a member of sender.</div><div class='add'>+    if (signal.mobj &amp;&amp; signal_index == -1) {</div><div class='add'>+        qWarning("QObject::disconect: signal %s not found on class %s",</div><div class='add'>+                 signal.signature(), sender-&gt;metaObject()-&gt;className());</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+    // If this condition is true then method is not a member of receeiver.</div><div class='add'>+    if (receiver &amp;&amp; method.mobj &amp;&amp; method_index == -1) {</div><div class='add'>+        qWarning("QObject::disconect: method %s not found on class %s",</div><div class='add'>+                 method.signature(), receiver-&gt;metaObject()-&gt;className());</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (!QMetaObjectPrivate::disconnect(sender, signal_index, receiver, method_index))</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+    const_cast&lt;QObject*&gt;(sender)-&gt;disconnectNotify(method.mobj ? signalSignature.constData() : 0);</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     \threadsafe</div><div class='hunk'>@@ -2875,18 +3166,28 @@ bool QMetaObject::connect(const QObject *sender, int signal_index,</div><div class='ctx'> {</div><div class='ctx'>     signal_index = methodIndexToSignalIndex(sender-&gt;metaObject(), signal_index);</div><div class='ctx'>     return QMetaObjectPrivate::connect(sender, signal_index,</div><div class='del'>-                                       receiver, method_index, type, types);</div><div class='add'>+                                       receiver, method_index,</div><div class='add'>+                                       0, //FIXME, we could speed this connection up by computing the relative index</div><div class='add'>+                                       type, types);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*! \internal</div><div class='ctx'>    Same as the QMetaObject::connect, but \a signal_index must be the result of QObjectPrivate::signalIndex</div><div class='add'>+</div><div class='add'>+    method_index is relative to the rmeta metaobject, if rmeta is null, then it is absolute index</div><div class='ctx'>  */</div><div class='ctx'> bool QMetaObjectPrivate::connect(const QObject *sender, int signal_index,</div><div class='del'>-                                 const QObject *receiver, int method_index, int type, int *types)</div><div class='add'>+                                 const QObject *receiver, int method_index,</div><div class='add'>+                                 const QMetaObject *rmeta, int type, int *types)</div><div class='ctx'> {</div><div class='ctx'>     QObject *s = const_cast&lt;QObject *&gt;(sender);</div><div class='ctx'>     QObject *r = const_cast&lt;QObject *&gt;(receiver);</div><div class='ctx'> </div><div class='add'>+    int method_offset = rmeta ? rmeta-&gt;methodOffset() : 0;</div><div class='add'>+    QObjectPrivate::StaticMetaCallFunction callFunction =</div><div class='add'>+        (rmeta &amp;&amp; QMetaObjectPrivate::get(rmeta)-&gt;revision &gt;= 6 &amp;&amp; rmeta-&gt;d.extradata)</div><div class='add'>+        ? reinterpret_cast&lt;const QMetaObjectExtraData *&gt;(rmeta-&gt;d.extradata)-&gt;static_metacall : 0;</div><div class='add'>+</div><div class='ctx'>     QOrderedMutexLocker locker(signalSlotLock(sender),</div><div class='ctx'>                                signalSlotLock(receiver));</div><div class='ctx'> </div><div class='hunk'>@@ -2896,8 +3197,10 @@ bool QMetaObjectPrivate::connect(const QObject *sender, int signal_index,</div><div class='ctx'>             const QObjectPrivate::Connection *c2 =</div><div class='ctx'>                 (*connectionLists)[signal_index].first;</div><div class='ctx'> </div><div class='add'>+            int method_index_absolute = method_index + method_offset;</div><div class='add'>+</div><div class='ctx'>             while (c2) {</div><div class='del'>-                if (c2-&gt;receiver == receiver &amp;&amp; c2-&gt;method == method_index)</div><div class='add'>+                if (c2-&gt;receiver == receiver &amp;&amp; c2-&gt;method() == method_index_absolute)</div><div class='ctx'>                     return false;</div><div class='ctx'>                 c2 = c2-&gt;nextConnectionList;</div><div class='ctx'>             }</div><div class='hunk'>@@ -2908,10 +3211,12 @@ bool QMetaObjectPrivate::connect(const QObject *sender, int signal_index,</div><div class='ctx'>     QObjectPrivate::Connection *c = new QObjectPrivate::Connection;</div><div class='ctx'>     c-&gt;sender = s;</div><div class='ctx'>     c-&gt;receiver = r;</div><div class='del'>-    c-&gt;method = method_index;</div><div class='add'>+    c-&gt;method_relative = method_index;</div><div class='add'>+    c-&gt;method_offset = method_offset;</div><div class='ctx'>     c-&gt;connectionType = type;</div><div class='ctx'>     c-&gt;argumentTypes = types;</div><div class='ctx'>     c-&gt;nextConnectionList = 0;</div><div class='add'>+    c-&gt;callFunction = callFunction;</div><div class='ctx'> </div><div class='ctx'>     QT_TRY {</div><div class='ctx'>         QObjectPrivate::get(s)-&gt;addConnection(signal_index, c);</div><div class='hunk'>@@ -2972,7 +3277,7 @@ bool QMetaObjectPrivate::disconnectHelper(QObjectPrivate::Connection *c,</div><div class='ctx'>     while (c) {</div><div class='ctx'>         if (c-&gt;receiver</div><div class='ctx'>             &amp;&amp; (receiver == 0 || (c-&gt;receiver == receiver</div><div class='del'>-                           &amp;&amp; (method_index &lt; 0 || c-&gt;method == method_index)))) {</div><div class='add'>+                           &amp;&amp; (method_index &lt; 0 || c-&gt;method() == method_index)))) {</div><div class='ctx'>             bool needToUnlock = false;</div><div class='ctx'>             QMutex *receiverMutex = 0;</div><div class='ctx'>             if (!receiver) {</div><div class='hunk'>@@ -2987,7 +3292,7 @@ bool QMetaObjectPrivate::disconnectHelper(QObjectPrivate::Connection *c,</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'>             if (needToUnlock)</div><div class='del'>-                receiverMutex-&gt;unlock();</div><div class='add'>+                receiverMutex-&gt;unlockInline();</div><div class='ctx'> </div><div class='ctx'>             c-&gt;receiver = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3074,7 +3379,7 @@ void QMetaObject::connectSlotsByName(QObject *o)</div><div class='ctx'>         return;</div><div class='ctx'>     const QMetaObject *mo = o-&gt;metaObject();</div><div class='ctx'>     Q_ASSERT(mo);</div><div class='del'>-    const QObjectList list = qFindChildren&lt;QObject *&gt;(o, QString());</div><div class='add'>+    const QObjectList list = o-&gt;findChildren&lt;QObject *&gt;(QString());</div><div class='ctx'>     for (int i = 0; i &lt; mo-&gt;methodCount(); ++i) {</div><div class='ctx'>         const char *slot = mo-&gt;method(i).signature();</div><div class='ctx'>         Q_ASSERT(slot);</div><div class='hunk'>@@ -3121,8 +3426,7 @@ void QMetaObject::connectSlotsByName(QObject *o)</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connection *c,</div><div class='del'>-                            void **argv, QSemaphore *semaphore = 0)</div><div class='add'>+static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connection *c, void **argv)</div><div class='ctx'> {</div><div class='ctx'>     if (!c-&gt;argumentTypes &amp;&amp; c-&gt;argumentTypes != &amp;DIRECT_CONNECTION_ONLY) {</div><div class='ctx'>         QMetaMethod m = sender-&gt;metaObject()-&gt;method(signal);</div><div class='hunk'>@@ -3147,35 +3451,13 @@ static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connect</div><div class='ctx'>     args[0] = 0; // return value</div><div class='ctx'>     for (int n = 1; n &lt; nargs; ++n)</div><div class='ctx'>         args[n] = QMetaType::construct((types[n] = c-&gt;argumentTypes[n-1]), argv[n]);</div><div class='del'>-    QCoreApplication::postEvent(c-&gt;receiver, new QMetaCallEvent(c-&gt;method,</div><div class='del'>-                                                               sender,</div><div class='del'>-                                                               signal,</div><div class='del'>-                                                               nargs,</div><div class='del'>-                                                               types,</div><div class='del'>-                                                               args,</div><div class='del'>-                                                               semaphore));</div><div class='add'>+    QCoreApplication::postEvent(c-&gt;receiver, new QMetaCallEvent(c-&gt;method_offset,</div><div class='add'>+                                                                c-&gt;method_relative,</div><div class='add'>+                                                                c-&gt;callFunction,</div><div class='add'>+                                                                sender, signal, nargs,</div><div class='add'>+                                                                types, args));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void blocking_activate(QObject *sender, int signal, QObjectPrivate::Connection *c, void **argv)</div><div class='del'>-{</div><div class='del'>-    if (QThread::currentThread() == c-&gt;receiver-&gt;thread()) {</div><div class='del'>-        qWarning("Qt: Dead lock detected while activating a BlockingQueuedConnection: "</div><div class='del'>-                 "Sender is %s(%p), receiver is %s(%p)",</div><div class='del'>-                 sender-&gt;metaObject()-&gt;className(), sender,</div><div class='del'>-                 c-&gt;receiver-&gt;metaObject()-&gt;className(), c-&gt;receiver);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-#ifdef QT_NO_THREAD</div><div class='del'>-    queued_activate(sender, signal, c, argv);</div><div class='del'>-#else</div><div class='del'>-    QSemaphore semaphore;</div><div class='del'>-    queued_activate(sender, signal, c, argv, &amp;semaphore);</div><div class='del'>-    QMutex *mutex = signalSlotLock(sender);</div><div class='del'>-    mutex-&gt;unlock();</div><div class='del'>-    semaphore.acquire();</div><div class='del'>-    mutex-&gt;lock();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='ctx'> </div><div class='ctx'> /*!\internal</div><div class='ctx'>    \obsolete.</div><div class='hunk'>@@ -3212,7 +3494,7 @@ void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_sign</div><div class='ctx'>                                                          argv ? argv : empty_argv);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    QThreadData *currentThreadData = QThreadData::current();</div><div class='add'>+    Qt::HANDLE currentThreadId = QThread::currentThreadId();</div><div class='ctx'> </div><div class='ctx'>     QMutexLocker locker(signalSlotLock(sender));</div><div class='ctx'>     QObjectConnectionListVector *connectionLists = sender-&gt;d_func()-&gt;connectionLists;</div><div class='hunk'>@@ -3223,39 +3505,57 @@ void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_sign</div><div class='ctx'>         return;</div><div class='ctx'>     }</div><div class='ctx'>     ++connectionLists-&gt;inUse;</div><div class='del'>-    if (signal_index &gt;= connectionLists-&gt;count()) {</div><div class='del'>-        signal_index = -2; //for "all signals";</div><div class='del'>-    }</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    const QObjectPrivate::ConnectionList *list;</div><div class='add'>+    if (signal_index &lt; connectionLists-&gt;count())</div><div class='add'>+        list = &amp;connectionLists-&gt;at(signal_index);</div><div class='add'>+    else</div><div class='add'>+        list = &amp;connectionLists-&gt;allsignals;</div><div class='ctx'> </div><div class='ctx'>     do {</div><div class='del'>-        QObjectPrivate::Connection *c = connectionLists-&gt;at(signal_index).first;</div><div class='add'>+        QObjectPrivate::Connection *c = list-&gt;first;</div><div class='ctx'>         if (!c) continue;</div><div class='ctx'>         // We need to check against last here to ensure that signals added</div><div class='ctx'>         // during the signal emission are not emitted in this emission.</div><div class='del'>-        QObjectPrivate::Connection *last = connectionLists-&gt;at(signal_index).last;</div><div class='add'>+        QObjectPrivate::Connection *last = list-&gt;last;</div><div class='ctx'> </div><div class='ctx'>         do {</div><div class='ctx'>             if (!c-&gt;receiver)</div><div class='ctx'>                 continue;</div><div class='ctx'> </div><div class='ctx'>             QObject * const receiver = c-&gt;receiver;</div><div class='add'>+            const bool receiverInSameThread = currentThreadId == receiver-&gt;d_func()-&gt;threadData-&gt;threadId;</div><div class='ctx'> </div><div class='ctx'>             // determine if this connection should be sent immediately or</div><div class='ctx'>             // put into the event queue</div><div class='del'>-            if ((c-&gt;connectionType == Qt::AutoConnection</div><div class='del'>-                 &amp;&amp; (currentThreadData != sender-&gt;d_func()-&gt;threadData</div><div class='del'>-                     || receiver-&gt;d_func()-&gt;threadData != sender-&gt;d_func()-&gt;threadData))</div><div class='add'>+            if ((c-&gt;connectionType == Qt::AutoConnection &amp;&amp; !receiverInSameThread)</div><div class='ctx'>                 || (c-&gt;connectionType == Qt::QueuedConnection)) {</div><div class='ctx'>                 queued_activate(sender, signal_absolute_index, c, argv ? argv : empty_argv);</div><div class='ctx'>                 continue;</div><div class='add'>+#ifndef QT_NO_THREAD</div><div class='ctx'>             } else if (c-&gt;connectionType == Qt::BlockingQueuedConnection) {</div><div class='del'>-                blocking_activate(sender, signal_absolute_index, c, argv ? argv : empty_argv);</div><div class='add'>+                locker.unlock();</div><div class='add'>+                if (receiverInSameThread) {</div><div class='add'>+                    qWarning("Qt: Dead lock detected while activating a BlockingQueuedConnection: "</div><div class='add'>+                    "Sender is %s(%p), receiver is %s(%p)",</div><div class='add'>+                    sender-&gt;metaObject()-&gt;className(), sender,</div><div class='add'>+                    receiver-&gt;metaObject()-&gt;className(), receiver);</div><div class='add'>+                }</div><div class='add'>+                QSemaphore semaphore;</div><div class='add'>+                QCoreApplication::postEvent(receiver, new QMetaCallEvent(c-&gt;method_offset, c-&gt;method_relative,</div><div class='add'>+                                                                         c-&gt;callFunction,</div><div class='add'>+                                                                         sender, signal_absolute_index,</div><div class='add'>+                                                                         0, 0,</div><div class='add'>+                                                                         argv ? argv : empty_argv,</div><div class='add'>+                                                                         &amp;semaphore));</div><div class='add'>+                semaphore.acquire();</div><div class='add'>+                locker.relock();</div><div class='ctx'>                 continue;</div><div class='add'>+#endif</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='del'>-            const int method = c-&gt;method;</div><div class='ctx'>             QObjectPrivate::Sender currentSender;</div><div class='del'>-            const bool receiverInSameThread = currentThreadData == receiver-&gt;d_func()-&gt;threadData;</div><div class='ctx'>             QObjectPrivate::Sender *previousSender = 0;</div><div class='ctx'>             if (receiverInSameThread) {</div><div class='ctx'>                 currentSender.sender = sender;</div><div class='hunk'>@@ -3263,36 +3563,52 @@ void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_sign</div><div class='ctx'>                 currentSender.ref = 1;</div><div class='ctx'>                 previousSender = QObjectPrivate::setCurrentSender(receiver, &amp;currentSender);</div><div class='ctx'>             }</div><div class='del'>-            locker.unlock();</div><div class='add'>+            const QObjectPrivate::StaticMetaCallFunction callFunction = c-&gt;callFunction;</div><div class='add'>+            const int method_relative = c-&gt;method_relative;</div><div class='add'>+            if (callFunction &amp;&amp; c-&gt;method_offset &lt;= receiver-&gt;metaObject()-&gt;methodOffset()) {</div><div class='add'>+                //we compare the vtable to make sure we are not in the destructor of the object.</div><div class='add'>+                locker.unlock();</div><div class='add'>+                if (qt_signal_spy_callback_set.slot_begin_callback != 0)</div><div class='add'>+                    qt_signal_spy_callback_set.slot_begin_callback(receiver, c-&gt;method(), argv ? argv : empty_argv);</div><div class='add'>+</div><div class='add'>+                callFunction(receiver, QMetaObject::InvokeMetaMethod, method_relative, argv ? argv : empty_argv);</div><div class='add'>+</div><div class='add'>+                if (qt_signal_spy_callback_set.slot_end_callback != 0)</div><div class='add'>+                    qt_signal_spy_callback_set.slot_end_callback(receiver, c-&gt;method());</div><div class='add'>+                locker.relock();</div><div class='add'>+            } else {</div><div class='add'>+                const int method = method_relative + c-&gt;method_offset;</div><div class='add'>+                locker.unlock();</div><div class='ctx'> </div><div class='del'>-            if (qt_signal_spy_callback_set.slot_begin_callback != 0) {</div><div class='del'>-                qt_signal_spy_callback_set.slot_begin_callback(receiver,</div><div class='del'>-                                                               method,</div><div class='del'>-                                                               argv ? argv : empty_argv);</div><div class='del'>-            }</div><div class='add'>+                if (qt_signal_spy_callback_set.slot_begin_callback != 0) {</div><div class='add'>+                    qt_signal_spy_callback_set.slot_begin_callback(receiver,</div><div class='add'>+                                                                method,</div><div class='add'>+                                                                argv ? argv : empty_argv);</div><div class='add'>+                }</div><div class='ctx'> </div><div class='ctx'> #if defined(QT_NO_EXCEPTIONS)</div><div class='del'>-            metacall(receiver, QMetaObject::InvokeMetaMethod, method, argv ? argv : empty_argv);</div><div class='del'>-#else</div><div class='del'>-            QT_TRY {</div><div class='ctx'>                 metacall(receiver, QMetaObject::InvokeMetaMethod, method, argv ? argv : empty_argv);</div><div class='del'>-            } QT_CATCH(...) {</div><div class='del'>-                locker.relock();</div><div class='del'>-                if (receiverInSameThread)</div><div class='del'>-                    QObjectPrivate::resetCurrentSender(receiver, &amp;currentSender, previousSender);</div><div class='del'>-</div><div class='del'>-                --connectionLists-&gt;inUse;</div><div class='del'>-                Q_ASSERT(connectionLists-&gt;inUse &gt;= 0);</div><div class='del'>-                if (connectionLists-&gt;orphaned &amp;&amp; !connectionLists-&gt;inUse)</div><div class='del'>-                    delete connectionLists;</div><div class='del'>-                QT_RETHROW;</div><div class='del'>-            }</div><div class='add'>+#else</div><div class='add'>+                QT_TRY {</div><div class='add'>+                    metacall(receiver, QMetaObject::InvokeMetaMethod, method, argv ? argv : empty_argv);</div><div class='add'>+                } QT_CATCH(...) {</div><div class='add'>+                    locker.relock();</div><div class='add'>+                    if (receiverInSameThread)</div><div class='add'>+                        QObjectPrivate::resetCurrentSender(receiver, &amp;currentSender, previousSender);</div><div class='add'>+</div><div class='add'>+                    --connectionLists-&gt;inUse;</div><div class='add'>+                    Q_ASSERT(connectionLists-&gt;inUse &gt;= 0);</div><div class='add'>+                    if (connectionLists-&gt;orphaned &amp;&amp; !connectionLists-&gt;inUse)</div><div class='add'>+                        delete connectionLists;</div><div class='add'>+                    QT_RETHROW;</div><div class='add'>+                }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-            if (qt_signal_spy_callback_set.slot_end_callback != 0)</div><div class='del'>-                qt_signal_spy_callback_set.slot_end_callback(receiver, method);</div><div class='add'>+                if (qt_signal_spy_callback_set.slot_end_callback != 0)</div><div class='add'>+                    qt_signal_spy_callback_set.slot_end_callback(receiver, method);</div><div class='ctx'> </div><div class='del'>-            locker.relock();</div><div class='add'>+                locker.relock();</div><div class='add'>+            }</div><div class='ctx'> </div><div class='ctx'>             if (receiverInSameThread)</div><div class='ctx'>                 QObjectPrivate::resetCurrentSender(receiver, &amp;currentSender, previousSender);</div><div class='hunk'>@@ -3303,7 +3619,9 @@ void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_sign</div><div class='ctx'> </div><div class='ctx'>         if (connectionLists-&gt;orphaned)</div><div class='ctx'>             break;</div><div class='del'>-    } while (signal_index &gt;= 0 &amp;&amp; (signal_index = -1)); //start over for -1 (all signal)</div><div class='add'>+    } while (list != &amp;connectionLists-&gt;allsignals &amp;&amp;</div><div class='add'>+        //start over for all signals;</div><div class='add'>+        ((list = &amp;connectionLists-&gt;allsignals), true));</div><div class='ctx'> </div><div class='ctx'>     --connectionLists-&gt;inUse;</div><div class='ctx'>     Q_ASSERT(connectionLists-&gt;inUse &gt;= 0);</div><div class='hunk'>@@ -3591,7 +3909,7 @@ void QObject::dumpObjectInfo()</div><div class='ctx'>                     continue;</div><div class='ctx'>                 }</div><div class='ctx'>                 const QMetaObject *receiverMetaObject = c-&gt;receiver-&gt;metaObject();</div><div class='del'>-                const QMetaMethod method = receiverMetaObject-&gt;method(c-&gt;method);</div><div class='add'>+                const QMetaMethod method = receiverMetaObject-&gt;method(c-&gt;method());</div><div class='ctx'>                 qDebug("          --&gt; %s::%s %s",</div><div class='ctx'>                        receiverMetaObject-&gt;className(),</div><div class='ctx'>                        c-&gt;receiver-&gt;objectName().isEmpty() ? "unnamed" : qPrintable(c-&gt;receiver-&gt;objectName()),</div><div class='hunk'>@@ -3608,7 +3926,7 @@ void QObject::dumpObjectInfo()</div><div class='ctx'> </div><div class='ctx'>     if (d-&gt;senders) {</div><div class='ctx'>         for (QObjectPrivate::Connection *s = d-&gt;senders; s; s = s-&gt;next) {</div><div class='del'>-            const QMetaMethod slot = metaObject()-&gt;method(s-&gt;method);</div><div class='add'>+            const QMetaMethod slot = metaObject()-&gt;method(s-&gt;method());</div><div class='ctx'>             qDebug("          &lt;-- %s::%s  %s",</div><div class='ctx'>                    s-&gt;sender-&gt;metaObject()-&gt;className(),</div><div class='ctx'>                    s-&gt;sender-&gt;objectName().isEmpty() ? "unnamed" : qPrintable(s-&gt;sender-&gt;objectName()),</div><div class='head'>diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h<br/>index 089ea0e..d274fa3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qobject.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qobject.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qobject.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qobject.h</a></div><div class='hunk'>@@ -77,19 +77,9 @@ class QObjectUserData;</div><div class='ctx'> </div><div class='ctx'> typedef QList&lt;QObject*&gt; QObjectList;</div><div class='ctx'> </div><div class='del'>-#if defined Q_CC_MSVC &amp;&amp; _MSC_VER &lt; 1300</div><div class='del'>-template&lt;typename T&gt; inline T qFindChild(const QObject *o, const QString &amp;name = QString(), T = 0);</div><div class='del'>-template&lt;typename T&gt; inline QList&lt;T&gt; qFindChildren(const QObject *o, const QString &amp;name = QString(), T = 0);</div><div class='del'>-# ifndef QT_NO_REGEXP</div><div class='del'>-template&lt;typename T&gt; inline QList&lt;T&gt; qFindChildren(const QObject *o, const QRegExp &amp;re, T = 0);</div><div class='del'>-# endif</div><div class='del'>-#else</div><div class='del'>-template&lt;typename T&gt; inline T qFindChild(const QObject *, const QString &amp; = QString());</div><div class='del'>-template&lt;typename T&gt; inline QList&lt;T&gt; qFindChildren(const QObject *, const QString &amp; = QString());</div><div class='del'>-# ifndef QT_NO_REGEXP</div><div class='del'>-template&lt;typename T&gt; inline QList&lt;T&gt; qFindChildren(const QObject *, const QRegExp &amp;);</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='add'>+Q_CORE_EXPORT void qt_qFindChildren_helper(const QObject *parent, const QString &amp;name, const QRegExp *re,</div><div class='add'>+                                           const QMetaObject &amp;mo, QList&lt;void *&gt; *list);</div><div class='add'>+Q_CORE_EXPORT QObject *qt_qFindChild_helper(const QObject *parent, const QString &amp;name, const QMetaObject &amp;mo);</div><div class='ctx'> </div><div class='ctx'> class</div><div class='ctx'> #if defined(__INTEL_COMPILER) &amp;&amp; defined(Q_OS_WIN)</div><div class='hunk'>@@ -109,7 +99,7 @@ public:</div><div class='ctx'>     uint ownObjectName : 1;</div><div class='ctx'>     uint sendChildEvents : 1;</div><div class='ctx'>     uint receiveChildEvents : 1;</div><div class='del'>-    uint inEventHandler : 1;</div><div class='add'>+    uint inEventHandler : 1; //only used if QT_JAMBI_BUILD</div><div class='ctx'>     uint inThreadChangeEvent : 1;</div><div class='ctx'>     uint hasGuards : 1; //true iff there is one or more QPointer attached to this object</div><div class='ctx'>     uint unused : 22;</div><div class='hunk'>@@ -164,20 +154,36 @@ public:</div><div class='ctx'>     int startTimer(int interval);</div><div class='ctx'>     void killTimer(int id);</div><div class='ctx'> </div><div class='del'>-#ifndef QT_NO_MEMBER_TEMPLATES</div><div class='ctx'>     template&lt;typename T&gt;</div><div class='ctx'>     inline T findChild(const QString &amp;aName = QString()) const</div><div class='del'>-    { return qFindChild&lt;T&gt;(this, aName); }</div><div class='add'>+    { return static_cast&lt;T&gt;(qt_qFindChild_helper(this, aName, reinterpret_cast&lt;T&gt;(0)-&gt;staticMetaObject)); }</div><div class='ctx'> </div><div class='ctx'>     template&lt;typename T&gt;</div><div class='ctx'>     inline QList&lt;T&gt; findChildren(const QString &amp;aName = QString()) const</div><div class='del'>-    { return qFindChildren&lt;T&gt;(this, aName); }</div><div class='add'>+    {</div><div class='add'>+        QList&lt;T&gt; list;</div><div class='add'>+        union {</div><div class='add'>+            QList&lt;T&gt; *typedList;</div><div class='add'>+            QList&lt;void *&gt; *voidList;</div><div class='add'>+        } u;</div><div class='add'>+        u.typedList = &amp;list;</div><div class='add'>+        qt_qFindChildren_helper(this, aName, 0, reinterpret_cast&lt;T&gt;(0)-&gt;staticMetaObject, u.voidList);</div><div class='add'>+        return list;</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_REGEXP</div><div class='ctx'>     template&lt;typename T&gt;</div><div class='ctx'>     inline QList&lt;T&gt; findChildren(const QRegExp &amp;re) const</div><div class='del'>-    { return qFindChildren&lt;T&gt;(this, re); }</div><div class='del'>-#endif</div><div class='add'>+    {</div><div class='add'>+        QList&lt;T&gt; list;</div><div class='add'>+        union {</div><div class='add'>+            QList&lt;T&gt; *typedList;</div><div class='add'>+            QList&lt;void *&gt; *voidList;</div><div class='add'>+        } u;</div><div class='add'>+        u.typedList = &amp;list;</div><div class='add'>+        qt_qFindChildren_helper(this, QString(), &amp;re, reinterpret_cast&lt;T&gt;(0)-&gt;staticMetaObject, u.voidList);</div><div class='add'>+        return list;</div><div class='add'>+    }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifdef QT3_SUPPORT</div><div class='hunk'>@@ -207,6 +213,21 @@ public:</div><div class='ctx'> #endif</div><div class='ctx'> #endif</div><div class='ctx'>         );</div><div class='add'>+        </div><div class='add'>+    static bool connect(const QObject *sender, const QMetaMethod &amp;signal,</div><div class='add'>+                        const QObject *receiver, const QMetaMethod &amp;method,</div><div class='add'>+                        Qt::ConnectionType type = </div><div class='add'>+#ifdef qdoc</div><div class='add'>+                        Qt::AutoConnection</div><div class='add'>+#else</div><div class='add'>+#ifdef QT3_SUPPORT</div><div class='add'>+                        Qt::AutoCompatConnection</div><div class='add'>+#else</div><div class='add'>+                        Qt::AutoConnection</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+        );</div><div class='add'>+</div><div class='ctx'>     inline bool connect(const QObject *sender, const char *signal,</div><div class='ctx'>                         const char *member, Qt::ConnectionType type =</div><div class='ctx'> #ifdef qdoc</div><div class='hunk'>@@ -222,6 +243,8 @@ public:</div><div class='ctx'> </div><div class='ctx'>     static bool disconnect(const QObject *sender, const char *signal,</div><div class='ctx'>                            const QObject *receiver, const char *member);</div><div class='add'>+    static bool disconnect(const QObject *sender, const QMetaMethod &amp;signal,</div><div class='add'>+                           const QObject *receiver, const QMetaMethod &amp;member);</div><div class='ctx'>     inline bool disconnect(const char *signal = 0,</div><div class='ctx'>                            const QObject *receiver = 0, const char *member = 0)</div><div class='ctx'>         { return disconnect(this, signal, receiver, member); }</div><div class='hunk'>@@ -257,6 +280,7 @@ public Q_SLOTS:</div><div class='ctx'> </div><div class='ctx'> protected:</div><div class='ctx'>     QObject *sender() const;</div><div class='add'>+    int senderSignalIndex() const;</div><div class='ctx'>     int receivers(const char* signal) const;</div><div class='ctx'> </div><div class='ctx'>     virtual void timerEvent(QTimerEvent *);</div><div class='hunk'>@@ -321,62 +345,43 @@ public:</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-Q_CORE_EXPORT void qt_qFindChildren_helper(const QObject *parent, const QString &amp;name, const QRegExp *re,</div><div class='del'>-                                           const QMetaObject &amp;mo, QList&lt;void *&gt; *list);</div><div class='del'>-Q_CORE_EXPORT QObject *qt_qFindChild_helper(const QObject *parent, const QString &amp;name, const QMetaObject &amp;mo);</div><div class='del'>-</div><div class='add'>+#ifdef QT_DEPRECATED</div><div class='ctx'> template&lt;typename T&gt;</div><div class='del'>-inline T qFindChild(const QObject *o, const QString &amp;name)</div><div class='del'>-{ return static_cast&lt;T&gt;(qt_qFindChild_helper(o, name, reinterpret_cast&lt;T&gt;(0)-&gt;staticMetaObject)); }</div><div class='add'>+inline QT_DEPRECATED T qFindChild(const QObject *o, const QString &amp;name = QString())</div><div class='add'>+{ return o-&gt;findChild&lt;T&gt;(name); }</div><div class='ctx'> </div><div class='ctx'> template&lt;typename T&gt;</div><div class='del'>-inline QList&lt;T&gt; qFindChildren(const QObject *o, const QString &amp;name)</div><div class='add'>+inline QT_DEPRECATED QList&lt;T&gt; qFindChildren(const QObject *o, const QString &amp;name = QString())</div><div class='ctx'> {</div><div class='del'>-    QList&lt;T&gt; list;</div><div class='del'>-    union {</div><div class='del'>-        QList&lt;T&gt; *typedList;</div><div class='del'>-        QList&lt;void *&gt; *voidList;</div><div class='del'>-    } u;</div><div class='del'>-    u.typedList = &amp;list;</div><div class='del'>-    qt_qFindChildren_helper(o, name, 0, reinterpret_cast&lt;T&gt;(0)-&gt;staticMetaObject, u.voidList);</div><div class='del'>-    return list;</div><div class='add'>+    return o-&gt;findChildren&lt;T&gt;(name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_REGEXP</div><div class='ctx'> template&lt;typename T&gt;</div><div class='del'>-inline QList&lt;T&gt; qFindChildren(const QObject *o, const QRegExp &amp;re)</div><div class='add'>+inline QT_DEPRECATED QList&lt;T&gt; qFindChildren(const QObject *o, const QRegExp &amp;re)</div><div class='ctx'> {</div><div class='del'>-    QList&lt;T&gt; list;</div><div class='del'>-    union {</div><div class='del'>-        QList&lt;T&gt; *typedList;</div><div class='del'>-        QList&lt;void *&gt; *voidList;</div><div class='del'>-    } u;</div><div class='del'>-    u.typedList = &amp;list;</div><div class='del'>-    qt_qFindChildren_helper(o, QString(), &amp;re, reinterpret_cast&lt;T&gt;(0)-&gt;staticMetaObject, u.voidList);</div><div class='del'>-    return list;</div><div class='add'>+    return o-&gt;findChildren&lt;T&gt;(re);</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#endif //QT_DEPRECATED</div><div class='add'>+</div><div class='ctx'> template &lt;class T&gt;</div><div class='ctx'> inline T qobject_cast(QObject *object)</div><div class='ctx'> {</div><div class='del'>-#if !defined(QT_NO_MEMBER_TEMPLATES) &amp;&amp; !defined(QT_NO_QOBJECT_CHECK)</div><div class='del'>-    reinterpret_cast&lt;T&gt;(0)-&gt;qt_check_for_QOBJECT_macro(*reinterpret_cast&lt;T&gt;(object));</div><div class='add'>+#if !defined(QT_NO_QOBJECT_CHECK)</div><div class='add'>+    reinterpret_cast&lt;T&gt;(object)-&gt;qt_check_for_QOBJECT_macro(*reinterpret_cast&lt;T&gt;(object));</div><div class='ctx'> #endif</div><div class='del'>-    return static_cast&lt;T&gt;(reinterpret_cast&lt;T&gt;(0)-&gt;staticMetaObject.cast(object));</div><div class='add'>+    return static_cast&lt;T&gt;(reinterpret_cast&lt;T&gt;(object)-&gt;staticMetaObject.cast(object));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> template &lt;class T&gt;</div><div class='ctx'> inline T qobject_cast(const QObject *object)</div><div class='ctx'> {</div><div class='del'>-    // this will cause a compilation error if T is not const</div><div class='del'>-    register T ptr = static_cast&lt;T&gt;(object);</div><div class='del'>-    Q_UNUSED(ptr);</div><div class='del'>-</div><div class='del'>-#if !defined(QT_NO_MEMBER_TEMPLATES) &amp;&amp; !defined(QT_NO_QOBJECT_CHECK)</div><div class='del'>-    reinterpret_cast&lt;T&gt;(0)-&gt;qt_check_for_QOBJECT_macro(*reinterpret_cast&lt;T&gt;(const_cast&lt;QObject *&gt;(object)));</div><div class='add'>+#if !defined(QT_NO_QOBJECT_CHECK)</div><div class='add'>+    reinterpret_cast&lt;T&gt;(object)-&gt;qt_check_for_QOBJECT_macro(*reinterpret_cast&lt;T&gt;(const_cast&lt;QObject *&gt;(object)));</div><div class='ctx'> #endif</div><div class='del'>-    return static_cast&lt;T&gt;(const_cast&lt;QObject *&gt;(reinterpret_cast&lt;T&gt;(0)-&gt;staticMetaObject.cast(const_cast&lt;QObject *&gt;(object))));</div><div class='add'>+    return static_cast&lt;T&gt;(reinterpret_cast&lt;T&gt;(object)-&gt;staticMetaObject.cast(object));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h<br/>index a3c76e6..3968a31 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qobject_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qobject_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qobject_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qobject_p.h</a></div><div class='hunk'>@@ -55,6 +55,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "QtCore/qobject.h"</div><div class='ctx'> #include "QtCore/qpointer.h"</div><div class='add'>+#include "QtCore/qsharedpointer.h"</div><div class='ctx'> #include "QtCore/qcoreevent.h"</div><div class='ctx'> #include "QtCore/qlist.h"</div><div class='ctx'> #include "QtCore/qvector.h"</div><div class='hunk'>@@ -107,19 +108,23 @@ public:</div><div class='ctx'>         QList&lt;QVariant&gt; propertyValues;</div><div class='ctx'>     };</div><div class='ctx'> </div><div class='add'>+    typedef void (*StaticMetaCallFunction)(QObject *, QMetaObject::Call, int, void **);</div><div class='ctx'>     struct Connection</div><div class='ctx'>     {</div><div class='ctx'>         QObject *sender;</div><div class='ctx'>         QObject *receiver;</div><div class='del'>-        int method;</div><div class='del'>-        uint connectionType : 3; // 0 == auto, 1 == direct, 2 == queued, 4 == blocking</div><div class='del'>-        QBasicAtomicPointer&lt;int&gt; argumentTypes;</div><div class='add'>+        StaticMetaCallFunction callFunction;</div><div class='ctx'>         // The next pointer for the singly-linked ConnectionList</div><div class='ctx'>         Connection *nextConnectionList;</div><div class='ctx'>         //senders linked list</div><div class='ctx'>         Connection *next;</div><div class='ctx'>         Connection **prev;</div><div class='add'>+        QBasicAtomicPointer&lt;int&gt; argumentTypes;</div><div class='add'>+        ushort method_offset;</div><div class='add'>+        ushort method_relative;</div><div class='add'>+        ushort connectionType : 3; // 0 == auto, 1 == direct, 2 == queued, 4 == blocking</div><div class='ctx'>         ~Connection();</div><div class='add'>+        int method() const { return method_offset + method_relative; }</div><div class='ctx'>     };</div><div class='ctx'>     // ConnectionList is a singly-linked list</div><div class='ctx'>     struct ConnectionList {</div><div class='hunk'>@@ -154,7 +159,6 @@ public:</div><div class='ctx'> </div><div class='ctx'> #ifdef QT3_SUPPORT</div><div class='ctx'>     void sendPendingChildInsertedEvents();</div><div class='del'>-    void removePendingChildInsertedEvents(QObject *child);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>     static inline Sender *setCurrentSender(QObject *receiver,</div><div class='hunk'>@@ -162,8 +166,10 @@ public:</div><div class='ctx'>     static inline void resetCurrentSender(QObject *receiver,</div><div class='ctx'>                                    Sender *currentSender,</div><div class='ctx'>                                    Sender *previousSender);</div><div class='add'>+#ifdef QT_JAMBI_BUILD</div><div class='ctx'>     static int *setDeleteWatch(QObjectPrivate *d, int *newWatch);</div><div class='ctx'>     static void resetDeleteWatch(QObjectPrivate *d, int *oldWatch, int deleteWatch);</div><div class='add'>+#endif</div><div class='ctx'>     static void clearGuards(QObject *);</div><div class='ctx'> </div><div class='ctx'>     static QObjectPrivate *get(QObject *o) {</div><div class='hunk'>@@ -185,7 +191,7 @@ public:</div><div class='ctx'>     mutable quint32 connectedSignals[2];</div><div class='ctx'> </div><div class='ctx'> #ifdef QT3_SUPPORT</div><div class='del'>-    QList&lt;QObject *&gt; pendingChildInsertedEvents;</div><div class='add'>+    QVector&lt; QWeakPointer&lt;QObject&gt; &gt; pendingChildInsertedEvents;</div><div class='ctx'> #else</div><div class='ctx'>     // preserve binary compatibility with code compiled without Qt 3 support</div><div class='ctx'>     // keeping the binary layout stable helps the Qt Creator debugger</div><div class='hunk'>@@ -201,7 +207,9 @@ public:</div><div class='ctx'>     // these objects are all used to indicate that a QObject was deleted</div><div class='ctx'>     // plus QPointer, which keeps a separate list</div><div class='ctx'>     QAtomicPointer&lt;QtSharedPointer::ExternalRefCountData&gt; sharedRefcount;</div><div class='add'>+#ifdef QT_JAMBI_BUILD</div><div class='ctx'>     int *deleteWatch;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -249,25 +257,27 @@ class QSemaphore;</div><div class='ctx'> class Q_CORE_EXPORT QMetaCallEvent : public QEvent</div><div class='ctx'> {</div><div class='ctx'> public:</div><div class='del'>-    QMetaCallEvent(int id, const QObject *sender, int signalId,</div><div class='add'>+    QMetaCallEvent(ushort method_offset, ushort method_relative, QObjectPrivate::StaticMetaCallFunction callFunction , const QObject *sender, int signalId,</div><div class='ctx'>                    int nargs = 0, int *types = 0, void **args = 0, QSemaphore *semaphore = 0);</div><div class='ctx'>     ~QMetaCallEvent();</div><div class='ctx'> </div><div class='del'>-    inline int id() const { return id_; }</div><div class='add'>+    inline int id() const { return method_offset_ + method_relative_; }</div><div class='ctx'>     inline const QObject *sender() const { return sender_; }</div><div class='ctx'>     inline int signalId() const { return signalId_; }</div><div class='ctx'>     inline void **args() const { return args_; }</div><div class='ctx'> </div><div class='del'>-    virtual int placeMetaCall(QObject *object);</div><div class='add'>+    virtual void placeMetaCall(QObject *object);</div><div class='ctx'> </div><div class='ctx'> private:</div><div class='del'>-    int id_;</div><div class='ctx'>     const QObject *sender_;</div><div class='ctx'>     int signalId_;</div><div class='ctx'>     int nargs_;</div><div class='ctx'>     int *types_;</div><div class='ctx'>     void **args_;</div><div class='ctx'>     QSemaphore *semaphore_;</div><div class='add'>+    QObjectPrivate::StaticMetaCallFunction callFunction_;</div><div class='add'>+    ushort method_offset_;</div><div class='add'>+    ushort method_relative_;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> class QBoolBlocker</div><div class='head'>diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h<br/>index 62bc282..efce4d5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qobjectdefs.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qobjectdefs.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qobjectdefs.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qobjectdefs.h</a></div><div class='hunk'>@@ -55,7 +55,7 @@ class QByteArray;</div><div class='ctx'> class QString;</div><div class='ctx'> </div><div class='ctx'> #ifndef Q_MOC_OUTPUT_REVISION</div><div class='del'>-#define Q_MOC_OUTPUT_REVISION 62</div><div class='add'>+#define Q_MOC_OUTPUT_REVISION 63</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> // The following macros are our "extensions" to C++</div><div class='hunk'>@@ -118,7 +118,7 @@ class QString;</div><div class='ctx'> # define QT_TR_FUNCTIONS</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(QT_NO_MEMBER_TEMPLATES) || defined(QT_NO_QOBJECT_CHECK)</div><div class='add'>+#if defined(QT_NO_QOBJECT_CHECK)</div><div class='ctx'> /* tmake ignore Q_OBJECT */</div><div class='ctx'> #define Q_OBJECT_CHECK</div><div class='ctx'> #else</div><div class='hunk'>@@ -145,7 +145,7 @@ inline int qYouForgotTheQ_OBJECT_Macro(T, T) { return 0; }</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T1, typename T2&gt;</div><div class='ctx'> inline void qYouForgotTheQ_OBJECT_Macro(T1, T2) {}</div><div class='del'>-#endif // QT_NO_MEMBER_TEMPLATES</div><div class='add'>+#endif // QT_NO_QOBJECT_CHECK</div><div class='ctx'> </div><div class='ctx'> #ifdef Q_NO_DATA_RELOCATION</div><div class='ctx'> #define Q_OBJECT_GETSTATICMETAOBJECT static const QMetaObject &amp;getStaticMetaObject();</div><div class='hunk'>@@ -163,7 +163,10 @@ public: \</div><div class='ctx'>     virtual void *qt_metacast(const char *); \</div><div class='ctx'>     QT_TR_FUNCTIONS \</div><div class='ctx'>     virtual int qt_metacall(QMetaObject::Call, int, void **); \</div><div class='del'>-private:</div><div class='add'>+private: \</div><div class='add'>+    Q_DECL_HIDDEN static const QMetaObjectExtraData staticMetaObjectExtraData; \</div><div class='add'>+    Q_DECL_HIDDEN static void qt_static_metacall(QObject *, QMetaObject::Call, int, void **);</div><div class='add'>+</div><div class='ctx'> /* tmake ignore Q_OBJECT */</div><div class='ctx'> #define Q_OBJECT_FAKE Q_OBJECT</div><div class='ctx'> /* tmake ignore Q_GADGET */</div><div class='hunk'>@@ -217,11 +220,15 @@ Q_CORE_EXPORT const char *qFlagLocation(const char *method);</div><div class='ctx'> #define QTOSTRING(s) QTOSTRING_HELPER(s)</div><div class='ctx'> #ifndef QT_NO_DEBUG</div><div class='ctx'> # define QLOCATION "\0"__FILE__":"QTOSTRING(__LINE__)</div><div class='del'>-# define METHOD(a)   qFlagLocation("0"#a QLOCATION)</div><div class='add'>+# ifndef QT_NO_KEYWORDS</div><div class='add'>+#  define METHOD(a)   qFlagLocation("0"#a QLOCATION)</div><div class='add'>+# endif</div><div class='ctx'> # define SLOT(a)     qFlagLocation("1"#a QLOCATION)</div><div class='ctx'> # define SIGNAL(a)   qFlagLocation("2"#a QLOCATION)</div><div class='ctx'> #else</div><div class='del'>-# define METHOD(a)   "0"#a</div><div class='add'>+# ifndef QT_NO_KEYWORDS</div><div class='add'>+#  define METHOD(a)   "0"#a</div><div class='add'>+# endif</div><div class='ctx'> # define SLOT(a)     "1"#a</div><div class='ctx'> # define SIGNAL(a)   "2"#a</div><div class='ctx'> #endif</div><div class='hunk'>@@ -300,6 +307,7 @@ struct Q_CORE_EXPORT QMetaObject</div><div class='ctx'>     const QMetaObject *superClass() const;</div><div class='ctx'> </div><div class='ctx'>     QObject *cast(QObject *obj) const;</div><div class='add'>+    const QObject *cast(const QObject *obj) const;</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_TRANSLATION</div><div class='ctx'>     // ### Qt 4: Merge overloads</div><div class='hunk'>@@ -463,7 +471,6 @@ struct Q_CORE_EXPORT QMetaObject</div><div class='ctx'>         const uint *data;</div><div class='ctx'>         const void *extradata;</div><div class='ctx'>     } d;</div><div class='del'>-</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef const QMetaObject&amp; (*QMetaObjectAccessor)();</div><div class='hunk'>@@ -475,7 +482,10 @@ struct QMetaObjectExtraData</div><div class='ctx'> #else</div><div class='ctx'>     const QMetaObject **objects;</div><div class='ctx'> #endif</div><div class='del'>-    int (*static_metacall)(QMetaObject::Call, int, void **);</div><div class='add'>+</div><div class='add'>+    typedef void (*StaticMetacallFunction)(QObject *, QMetaObject::Call, int, void **); //from revision 6</div><div class='add'>+    //typedef int (*StaticMetaCall)(QMetaObject::Call, int, void **); //used from revison 2 until revison 5</div><div class='add'>+    StaticMetacallFunction static_metacall;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> inline const char *QMetaObject::className() const</div><div class='head'>diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp<br/>index 1859e65..c7fcf4f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qpointer.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qpointer.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qpointer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qpointer.cpp</a></div><div class='hunk'>@@ -183,6 +183,7 @@</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     \fn bool operator==(const T *o, const QPointer&lt;T&gt; &amp;p)</div><div class='add'>+    \relates QPointer</div><div class='ctx'> </div><div class='ctx'>     Equality operator. Returns true if \a o and the guarded</div><div class='ctx'>     pointer \a p are pointing to the same object, otherwise</div><div class='hunk'>@@ -191,6 +192,7 @@</div><div class='ctx'> */</div><div class='ctx'> /*!</div><div class='ctx'>     \fn bool operator==(const QPointer&lt;T&gt; &amp;p, const T *o)</div><div class='add'>+    \relates QPointer</div><div class='ctx'> </div><div class='ctx'>     Equality operator. Returns true if \a o and the guarded</div><div class='ctx'>     pointer \a p are pointing to the same object, otherwise</div><div class='hunk'>@@ -199,6 +201,7 @@</div><div class='ctx'> */</div><div class='ctx'> /*!</div><div class='ctx'>     \fn bool operator==(T *o, const QPointer&lt;T&gt; &amp;p)</div><div class='add'>+    \relates QPointer</div><div class='ctx'> </div><div class='ctx'>     Equality operator. Returns true if \a o and the guarded</div><div class='ctx'>     pointer \a p are pointing to the same object, otherwise</div><div class='hunk'>@@ -207,6 +210,7 @@</div><div class='ctx'> */</div><div class='ctx'> /*!</div><div class='ctx'>     \fn bool operator==(const QPointer&lt;T&gt; &amp;p, T *o)</div><div class='add'>+    \relates QPointer</div><div class='ctx'> </div><div class='ctx'>     Equality operator. Returns true if \a o and the guarded</div><div class='ctx'>     pointer \a p are pointing to the same object, otherwise</div><div class='hunk'>@@ -215,6 +219,7 @@</div><div class='ctx'> */</div><div class='ctx'> /*!</div><div class='ctx'>     \fn bool operator==(const QPointer&lt;T&gt; &amp;p1, const QPointer&lt;T&gt; &amp;p2)</div><div class='add'>+    \relates QPointer</div><div class='ctx'> </div><div class='ctx'>     Equality operator. Returns true if the guarded pointers \a p1 and \a p2</div><div class='ctx'>     are pointing to the same object, otherwise</div><div class='hunk'>@@ -225,6 +230,7 @@</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     \fn bool operator!=(const T *o, const QPointer&lt;T&gt; &amp;p)</div><div class='add'>+    \relates QPointer</div><div class='ctx'> </div><div class='ctx'>     Inequality operator. Returns true if \a o and the guarded</div><div class='ctx'>     pointer \a p are not pointing to the same object, otherwise</div><div class='hunk'>@@ -232,6 +238,7 @@</div><div class='ctx'> */</div><div class='ctx'> /*!</div><div class='ctx'>     \fn bool operator!=(const QPointer&lt;T&gt; &amp;p, const T *o)</div><div class='add'>+    \relates QPointer</div><div class='ctx'> </div><div class='ctx'>     Inequality operator. Returns true if \a o and the guarded</div><div class='ctx'>     pointer \a p are not pointing to the same object, otherwise</div><div class='hunk'>@@ -239,6 +246,7 @@</div><div class='ctx'> */</div><div class='ctx'> /*!</div><div class='ctx'>     \fn bool operator!=(T *o, const QPointer&lt;T&gt; &amp;p)</div><div class='add'>+    \relates QPointer</div><div class='ctx'> </div><div class='ctx'>     Inequality operator. Returns true if \a o and the guarded</div><div class='ctx'>     pointer \a p are not pointing to the same object, otherwise</div><div class='hunk'>@@ -246,6 +254,7 @@</div><div class='ctx'> */</div><div class='ctx'> /*!</div><div class='ctx'>     \fn bool operator!=(const QPointer&lt;T&gt; &amp;p, T *o)</div><div class='add'>+    \relates QPointer</div><div class='ctx'> </div><div class='ctx'>     Inequality operator. Returns true if \a o and the guarded</div><div class='ctx'>     pointer \a p are not pointing to the same object, otherwise</div><div class='hunk'>@@ -253,6 +262,7 @@</div><div class='ctx'> */</div><div class='ctx'> /*!</div><div class='ctx'>     \fn bool operator!=(const QPointer&lt;T&gt; &amp;p1, const QPointer&lt;T&gt; &amp;p2)</div><div class='add'>+    \relates QPointer</div><div class='ctx'> </div><div class='ctx'>     Inequality operator. Returns true if  the guarded pointers \a p1 and</div><div class='ctx'>     \a p2 are not pointing to the same object, otherwise</div><div class='head'>diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp<br/>index bfbb022..acb6044 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qsharedmemory.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qsharedmemory.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qsharedmemory.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qsharedmemory.cpp</a></div><div class='hunk'>@@ -73,14 +73,13 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &amp;key,</div><div class='ctx'>     QString part1 = key;</div><div class='ctx'>     part1.replace(QRegExp(QLatin1String("[^A-Za-z]")), QString());</div><div class='ctx'>     result.append(part1);</div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-    return result.left(KMaxKernelName);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'>     QByteArray hex = QCryptographicHash::hash(key.toUtf8(), QCryptographicHash::Sha1).toHex();</div><div class='ctx'>     result.append(QLatin1String(hex));</div><div class='ctx'> #ifdef Q_OS_WIN</div><div class='ctx'>     return result;</div><div class='add'>+#elif defined(Q_OS_SYMBIAN)</div><div class='add'>+    return result.left(KMaxKernelName);</div><div class='ctx'> #else</div><div class='ctx'>     return QDir::tempPath() + QLatin1Char('/') + result;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -142,9 +141,12 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &amp;key,</div><div class='ctx'>   remain. Do not mix using QtSharedMemory and QSharedMemory. Port</div><div class='ctx'>   everything to QSharedMemory.</div><div class='ctx'> </div><div class='del'>-  \warning QSharedMemory changes the key in a Qt-specific way.</div><div class='del'>-  It is therefore currently not possible to use the shared memory of</div><div class='del'>-  non-Qt applications with QSharedMemory.</div><div class='add'>+  \warning QSharedMemory changes the key in a Qt-specific way, unless otherwise</div><div class='add'>+  specified. Interoperation with non-Qt applications is achieved by first creating</div><div class='add'>+  a default shared memory with QSharedMemory() and then setting a native key with</div><div class='add'>+  setNativeKey(). When using native keys, shared memory is not protected against</div><div class='add'>+  multiple accesses on it (e.g. unable to lock()) and a user-defined mechanism</div><div class='add'>+  should be used to achieve a such protection.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -153,8 +155,8 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &amp;key,</div><div class='ctx'>   Constructs a shared memory object with the given \a parent.  The</div><div class='ctx'>   shared memory object's key is not set by the constructor, so the</div><div class='ctx'>   shared memory object does not have an underlying shared memory</div><div class='del'>-  segment attached. The key must be set with setKey() before create()</div><div class='del'>-  or attach() can be used.</div><div class='add'>+  segment attached. The key must be set with setKey() or setNativeKey()</div><div class='add'>+  before create() or attach() can be used.</div><div class='ctx'> </div><div class='ctx'>   \sa setKey()</div><div class='ctx'>  */</div><div class='hunk'>@@ -191,24 +193,62 @@ QSharedMemory::~QSharedMemory()</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='del'>-  Sets a new \a key for this shared memory object.  If \a key and the</div><div class='del'>-  current key are the same, the function returns without doing</div><div class='del'>-  anything. If the shared memory object is attached to an underlying</div><div class='del'>-  shared memory segment, it will \l {detach()} {detach} from it before</div><div class='del'>-  setting the new key. This function does not do an attach().</div><div class='add'>+  Sets the platform independent \a key for this shared memory object. If \a key</div><div class='add'>+  is the same as the current key, the function returns without doing anything.</div><div class='ctx'> </div><div class='del'>-  \sa key() isAttached()</div><div class='del'>- */</div><div class='add'>+  You can call key() to retrieve the platform independent key. Internally,</div><div class='add'>+  QSharedMemory converts this key into a platform specific key. If you instead</div><div class='add'>+  call nativeKey(), you will get the platform specific, converted key.</div><div class='add'>+</div><div class='add'>+  If the shared memory object is attached to an underlying shared memory</div><div class='add'>+  segment, it will \l {detach()} {detach} from it before setting the new key.</div><div class='add'>+  This function does not do an attach().</div><div class='add'>+</div><div class='add'>+  \sa key() nativeKey() isAttached()</div><div class='add'>+*/</div><div class='ctx'> void QSharedMemory::setKey(const QString &amp;key)</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QSharedMemory);</div><div class='del'>-    if (key == d-&gt;key)</div><div class='add'>+    if (key == d-&gt;key &amp;&amp; d-&gt;makePlatformSafeKey(key) == d-&gt;nativeKey)</div><div class='ctx'>         return;</div><div class='ctx'> </div><div class='ctx'>     if (isAttached())</div><div class='ctx'>         detach();</div><div class='ctx'>     d-&gt;cleanHandle();</div><div class='ctx'>     d-&gt;key = key;</div><div class='add'>+    d-&gt;nativeKey = d-&gt;makePlatformSafeKey(key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+  \since 4.8</div><div class='add'>+</div><div class='add'>+  Sets the native, platform specific, \a key for this shared memory object. If</div><div class='add'>+  \a key is the same as the current native key, the function returns without</div><div class='add'>+  doing anything. If all you want is to assign a key to a segment, you should</div><div class='add'>+  call setKey() instead.</div><div class='add'>+</div><div class='add'>+  You can call nativeKey() to retrieve the native key. If a native key has been</div><div class='add'>+  assigned, calling key() will return a null string.</div><div class='add'>+</div><div class='add'>+  If the shared memory object is attached to an underlying shared memory</div><div class='add'>+  segment, it will \l {detach()} {detach} from it before setting the new key.</div><div class='add'>+  This function does not do an attach().</div><div class='add'>+</div><div class='add'>+  The application will not be portable if you set a native key.</div><div class='add'>+</div><div class='add'>+  \sa nativeKey() key() isAttached()</div><div class='add'>+*/</div><div class='add'>+void QSharedMemory::setNativeKey(const QString &amp;key)</div><div class='add'>+{</div><div class='add'>+    Q_D(QSharedMemory);</div><div class='add'>+    if (key == d-&gt;nativeKey &amp;&amp; d-&gt;key.isNull())</div><div class='add'>+        return;</div><div class='add'>+</div><div class='add'>+    if (isAttached())</div><div class='add'>+        detach();</div><div class='add'>+    d-&gt;cleanHandle();</div><div class='add'>+    d-&gt;key = QString();</div><div class='add'>+    d-&gt;nativeKey = key;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QSharedMemoryPrivate::initKey()</div><div class='hunk'>@@ -251,13 +291,15 @@ bool QSharedMemoryPrivate::initKey()</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='del'>-  Returns the key assigned to this shared memory. The key is the</div><div class='del'>-  identifier used by the operating system to identify the shared</div><div class='del'>-  memory segment. When QSharedMemory is used for interprocess</div><div class='del'>-  communication, the key is how each process attaches to the shared</div><div class='del'>-  memory segment through which the IPC occurs.</div><div class='add'>+  Returns the key assigned with setKey() to this shared memory, or a null key</div><div class='add'>+  if no key has been assigned, or if the segment is using a nativeKey(). The</div><div class='add'>+  key is the identifier used by Qt applications to identify the shared memory</div><div class='add'>+  segment.</div><div class='ctx'> </div><div class='del'>-    \sa setKey()</div><div class='add'>+  You can find the native, platform specific, key used by the operating system</div><div class='add'>+  by calling nativeKey().</div><div class='add'>+</div><div class='add'>+  \sa setKey() setNativeKey()</div><div class='ctx'>  */</div><div class='ctx'> QString QSharedMemory::key() const</div><div class='ctx'> {</div><div class='hunk'>@@ -266,13 +308,30 @@ QString QSharedMemory::key() const</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='del'>-  Creates a shared memory segment of \a size bytes with the key passed</div><div class='del'>-  to the constructor or set with setKey(), attaches to the new shared</div><div class='del'>-  memory segment with the given access \a mode, and returns \tt true.</div><div class='del'>-  If a shared memory segment identified by the key already exists, the</div><div class='del'>-  attach operation is not performed, and \tt false is returned. When</div><div class='del'>-  the return value is \tt false, call error() to determine which error</div><div class='del'>-  occurred.</div><div class='add'>+  \since 4.8</div><div class='add'>+</div><div class='add'>+  Returns the native, platform specific, key for this shared memory object. The</div><div class='add'>+  native key is the identifier used by the operating system to identify the</div><div class='add'>+  shared memory segment.</div><div class='add'>+</div><div class='add'>+  You can use the native key to access shared memory segments that have not</div><div class='add'>+  been created by Qt, or to grant shared memory access to non-Qt applications.</div><div class='add'>+</div><div class='add'>+  \sa setKey() setNativeKey()</div><div class='add'>+*/</div><div class='add'>+QString QSharedMemory::nativeKey() const</div><div class='add'>+{</div><div class='add'>+    Q_D(const QSharedMemory);</div><div class='add'>+    return d-&gt;nativeKey;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+  Creates a shared memory segment of \a size bytes with the key passed to the</div><div class='add'>+  constructor, set with setKey() or set with setNativeKey(), then attaches to</div><div class='add'>+  the new shared memory segment with the given access \a mode and returns</div><div class='add'>+  \tt true. If a shared memory segment identified by the key already exists,</div><div class='add'>+  the attach operation is not performed and \tt false is returned. When the</div><div class='add'>+  return value is \tt false, call error() to determine which error occurred.</div><div class='ctx'> </div><div class='ctx'>   \sa error()</div><div class='ctx'>  */</div><div class='hunk'>@@ -294,7 +353,7 @@ bool QSharedMemory::create(int size, AccessMode mode)</div><div class='ctx'>     QString function = QLatin1String("QSharedMemory::create");</div><div class='ctx'> #ifndef QT_NO_SYSTEMSEMAPHORE</div><div class='ctx'>     QSharedMemoryLocker lock(this);</div><div class='del'>-    if (!d-&gt;tryLocker(&amp;lock, function))</div><div class='add'>+    if (!d-&gt;key.isNull() &amp;&amp; !d-&gt;tryLocker(&amp;lock, function))</div><div class='ctx'>         return false;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -338,7 +397,7 @@ int QSharedMemory::size() const</div><div class='ctx'> /*!</div><div class='ctx'>   Attempts to attach the process to the shared memory segment</div><div class='ctx'>   identified by the key that was passed to the constructor or to a</div><div class='del'>-  call to setKey(). The access \a mode is \l {QSharedMemory::}</div><div class='add'>+  call to setKey() or setNativeKey(). The access \a mode is \l {QSharedMemory::}</div><div class='ctx'>   {ReadWrite} by default. It can also be \l {QSharedMemory::}</div><div class='ctx'>   {ReadOnly}. Returns true if the attach operation is successful. If</div><div class='ctx'>   false is returned, call error() to determine which error occurred.</div><div class='hunk'>@@ -355,7 +414,7 @@ bool QSharedMemory::attach(AccessMode mode)</div><div class='ctx'>         return false;</div><div class='ctx'> #ifndef QT_NO_SYSTEMSEMAPHORE</div><div class='ctx'>     QSharedMemoryLocker lock(this);</div><div class='del'>-    if (!d-&gt;tryLocker(&amp;lock, QLatin1String("QSharedMemory::attach")))</div><div class='add'>+    if (!d-&gt;key.isNull() &amp;&amp; !d-&gt;tryLocker(&amp;lock, QLatin1String("QSharedMemory::attach")))</div><div class='ctx'>         return false;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -395,7 +454,7 @@ bool QSharedMemory::detach()</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_SYSTEMSEMAPHORE</div><div class='ctx'>     QSharedMemoryLocker lock(this);</div><div class='del'>-    if (!d-&gt;tryLocker(&amp;lock, QLatin1String("QSharedMemory::detach")))</div><div class='add'>+    if (!d-&gt;key.isNull() &amp;&amp; !d-&gt;tryLocker(&amp;lock, QLatin1String("QSharedMemory::detach")))</div><div class='ctx'>         return false;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -447,9 +506,9 @@ const void *QSharedMemory::data() const</div><div class='ctx'>   by this process and returns true. If another process has locked the</div><div class='ctx'>   segment, this function blocks until the lock is released. Then it</div><div class='ctx'>   acquires the lock and returns true. If this function returns false,</div><div class='del'>-  it means either that you have ignored a false return from create()</div><div class='del'>-  or attach(), or that QSystemSemaphore::acquire() failed due to an</div><div class='del'>-  unknown system error.</div><div class='add'>+  it means that you have ignored a false return from create() or attach(),</div><div class='add'>+  that you have set the key with setNativeKey() or that</div><div class='add'>+  QSystemSemaphore::acquire() failed due to an unknown system error.</div><div class='ctx'> </div><div class='ctx'>   \sa unlock(), data(), QSystemSemaphore::acquire()</div><div class='ctx'>  */</div><div class='head'>diff --git a/src/corelib/kernel/qsharedmemory.h b/src/corelib/kernel/qsharedmemory.h<br/>index 5647fdc..b2ce7e2 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qsharedmemory.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qsharedmemory.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qsharedmemory.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qsharedmemory.h</a></div><div class='hunk'>@@ -85,6 +85,8 @@ public:</div><div class='ctx'> </div><div class='ctx'>     void setKey(const QString &amp;key);</div><div class='ctx'>     QString key() const;</div><div class='add'>+    void setNativeKey(const QString &amp;key);</div><div class='add'>+    QString nativeKey() const;</div><div class='ctx'> </div><div class='ctx'>     bool create(int size, AccessMode mode = ReadWrite);</div><div class='ctx'>     int size() const;</div><div class='head'>diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h<br/>index dd3ae9c..d5fafef 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qsharedmemory_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qsharedmemory_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qsharedmemory_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qsharedmemory_p.h</a></div><div class='hunk'>@@ -122,6 +122,7 @@ public:</div><div class='ctx'>     void *memory;</div><div class='ctx'>     int size;</div><div class='ctx'>     QString key;</div><div class='add'>+    QString nativeKey;</div><div class='ctx'>     QSharedMemory::SharedMemoryError error;</div><div class='ctx'>     QString errorString;</div><div class='ctx'> #ifndef QT_NO_SYSTEMSEMAPHORE</div><div class='head'>diff --git a/src/corelib/kernel/qsharedmemory_symbian.cpp b/src/corelib/kernel/qsharedmemory_symbian.cpp<br/>index e2c0528..fdd513a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qsharedmemory_symbian.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qsharedmemory_symbian.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qsharedmemory_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qsharedmemory_symbian.cpp</a></div><div class='hunk'>@@ -107,16 +107,14 @@ bool QSharedMemoryPrivate::cleanHandle()</div><div class='ctx'> </div><div class='ctx'> bool QSharedMemoryPrivate::create(int size)</div><div class='ctx'> {</div><div class='del'>-    // Get a windows acceptable key</div><div class='del'>-    QString safeKey = makePlatformSafeKey(key);</div><div class='ctx'>     QString function = QLatin1String("QSharedMemory::create");</div><div class='del'>-    if (safeKey.isEmpty()) {</div><div class='add'>+    if (nativeKey.isEmpty()) {</div><div class='ctx'>         error = QSharedMemory::KeyError;</div><div class='ctx'>         errorString = QSharedMemory::tr("%1: key error").arg(function);</div><div class='ctx'>         return false;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    TPtrC ptr(qt_QString2TPtrC(safeKey));</div><div class='add'>+    TPtrC ptr(qt_QString2TPtrC(nativeKey));</div><div class='ctx'> </div><div class='ctx'>     TInt err = chunk.CreateGlobal(ptr, size, size);</div><div class='ctx'> </div><div class='hunk'>@@ -136,14 +134,13 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode /* mode */)</div><div class='ctx'>     // Grab a pointer to the memory block</div><div class='ctx'>     if (!chunk.Handle()) {</div><div class='ctx'>         QString function = QLatin1String("QSharedMemory::handle");</div><div class='del'>-        QString safeKey = makePlatformSafeKey(key);</div><div class='del'>-        if (safeKey.isEmpty()) {</div><div class='add'>+        if (nativeKey.isEmpty()) {</div><div class='ctx'>             error = QSharedMemory::KeyError;</div><div class='ctx'>             errorString = QSharedMemory::tr("%1: unable to make key").arg(function);</div><div class='ctx'>             return false;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-        TPtrC ptr(qt_QString2TPtrC(safeKey));</div><div class='add'>+        TPtrC ptr(qt_QString2TPtrC(nativeKey));</div><div class='ctx'> </div><div class='ctx'>         TInt err = KErrNoMemory;</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp<br/>index d0698c6..2bbda49 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qsharedmemory_unix.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qsharedmemory_unix.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qsharedmemory_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qsharedmemory_unix.cpp</a></div><div class='hunk'>@@ -116,21 +116,20 @@ key_t QSharedMemoryPrivate::handle()</div><div class='ctx'>         return unix_key;</div><div class='ctx'> </div><div class='ctx'>     // don't allow making handles on empty keys</div><div class='del'>-    if (key.isEmpty()) {</div><div class='add'>+    if (nativeKey.isEmpty()) {</div><div class='ctx'>         errorString = QSharedMemory::tr("%1: key is empty").arg(QLatin1String("QSharedMemory::handle:"));</div><div class='ctx'>         error = QSharedMemory::KeyError;</div><div class='ctx'>         return 0;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     // ftok requires that an actual file exists somewhere</div><div class='del'>-    QString fileName = makePlatformSafeKey(key);</div><div class='del'>-    if (!QFile::exists(fileName)) {</div><div class='add'>+    if (!QFile::exists(nativeKey)) {</div><div class='ctx'>         errorString = QSharedMemory::tr("%1: UNIX key file doesn't exist").arg(QLatin1String("QSharedMemory::handle:"));</div><div class='ctx'>         error = QSharedMemory::NotFound;</div><div class='ctx'>         return 0;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    unix_key = ftok(QFile::encodeName(fileName).constData(), 'Q');</div><div class='add'>+    unix_key = ftok(QFile::encodeName(nativeKey).constData(), 'Q');</div><div class='ctx'>     if (-1 == unix_key) {</div><div class='ctx'>         errorString = QSharedMemory::tr("%1: ftok failed").arg(QLatin1String("QSharedMemory::handle:"));</div><div class='ctx'>         error = QSharedMemory::KeyError;</div><div class='hunk'>@@ -181,7 +180,7 @@ bool QSharedMemoryPrivate::create(int size)</div><div class='ctx'> {</div><div class='ctx'>     // build file if needed</div><div class='ctx'>     bool createdFile = false;</div><div class='del'>-    int built = createUnixKeyFile(makePlatformSafeKey(key));</div><div class='add'>+    int built = createUnixKeyFile(nativeKey);</div><div class='ctx'>     if (built == -1) {</div><div class='ctx'>         errorString = QSharedMemory::tr("%1: unable to make key").arg(QLatin1String("QSharedMemory::handle:"));</div><div class='ctx'>         error = QSharedMemory::KeyError;</div><div class='hunk'>@@ -194,7 +193,7 @@ bool QSharedMemoryPrivate::create(int size)</div><div class='ctx'>     // get handle</div><div class='ctx'>     if (!handle()) {</div><div class='ctx'>         if (createdFile)</div><div class='del'>-            QFile::remove(makePlatformSafeKey(key));</div><div class='add'>+            QFile::remove(nativeKey);</div><div class='ctx'>         return false;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='hunk'>@@ -210,7 +209,7 @@ bool QSharedMemoryPrivate::create(int size)</div><div class='ctx'>             setErrorString(function);</div><div class='ctx'>         }</div><div class='ctx'>         if (createdFile &amp;&amp; error != QSharedMemory::AlreadyExists)</div><div class='del'>-            QFile::remove(makePlatformSafeKey(key));</div><div class='add'>+            QFile::remove(nativeKey);</div><div class='ctx'>         return false;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='hunk'>@@ -291,7 +290,7 @@ bool QSharedMemoryPrivate::detach()</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         // remove file</div><div class='del'>-        if (!QFile::remove(makePlatformSafeKey(key)))</div><div class='add'>+        if (!QFile::remove(nativeKey))</div><div class='ctx'>             return false;</div><div class='ctx'>     }</div><div class='ctx'>     return true;</div><div class='head'>diff --git a/src/corelib/kernel/qsharedmemory_win.cpp b/src/corelib/kernel/qsharedmemory_win.cpp<br/>index f4e5b42..3cc14fe 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qsharedmemory_win.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qsharedmemory_win.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qsharedmemory_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qsharedmemory_win.cpp</a></div><div class='hunk'>@@ -99,18 +99,17 @@ HANDLE QSharedMemoryPrivate::handle()</div><div class='ctx'> {</div><div class='ctx'>     if (!hand) {</div><div class='ctx'>         QString function = QLatin1String("QSharedMemory::handle");</div><div class='del'>-        QString safeKey = makePlatformSafeKey(key);</div><div class='del'>-        if (safeKey.isEmpty()) {</div><div class='add'>+        if (nativeKey.isEmpty()) {</div><div class='ctx'>             error = QSharedMemory::KeyError;</div><div class='ctx'>             errorString = QSharedMemory::tr("%1: unable to make key").arg(function);</div><div class='ctx'>             return false;</div><div class='ctx'>         }</div><div class='ctx'> #ifndef Q_OS_WINCE</div><div class='del'>-        hand = OpenFileMapping(FILE_MAP_ALL_ACCESS, false, (wchar_t*)safeKey.utf16());</div><div class='add'>+        hand = OpenFileMapping(FILE_MAP_ALL_ACCESS, false, (wchar_t*)nativeKey.utf16());</div><div class='ctx'> #else</div><div class='ctx'>         // This works for opening a mapping too, but always opens it with read/write access in</div><div class='ctx'>         // attach as it seems.</div><div class='del'>-        hand = CreateFileMapping(INVALID_HANDLE_VALUE, 0, PAGE_READWRITE, 0, 0, (wchar_t*)safeKey.utf16());</div><div class='add'>+        hand = CreateFileMapping(INVALID_HANDLE_VALUE, 0, PAGE_READWRITE, 0, 0, (wchar_t*)nativeKey.utf16());</div><div class='ctx'> #endif</div><div class='ctx'>         if (!hand) {</div><div class='ctx'>             setErrorString(function);</div><div class='hunk'>@@ -133,17 +132,15 @@ bool QSharedMemoryPrivate::cleanHandle()</div><div class='ctx'> </div><div class='ctx'> bool QSharedMemoryPrivate::create(int size)</div><div class='ctx'> {</div><div class='del'>-    // Get a windows acceptable key</div><div class='del'>-    QString safeKey = makePlatformSafeKey(key);</div><div class='ctx'>     QString function = QLatin1String("QSharedMemory::create");</div><div class='del'>-    if (safeKey.isEmpty()) {</div><div class='add'>+    if (nativeKey.isEmpty()) {</div><div class='ctx'>         error = QSharedMemory::KeyError;</div><div class='ctx'>         errorString = QSharedMemory::tr("%1: key error").arg(function);</div><div class='ctx'>         return false;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     // Create the file mapping.</div><div class='del'>-    hand = CreateFileMapping(INVALID_HANDLE_VALUE, 0, PAGE_READWRITE, 0, size, (wchar_t*)safeKey.utf16());</div><div class='add'>+    hand = CreateFileMapping(INVALID_HANDLE_VALUE, 0, PAGE_READWRITE, 0, size, (wchar_t*)nativeKey.utf16());</div><div class='ctx'>     setErrorString(function);</div><div class='ctx'> </div><div class='ctx'>     // hand is valid when it already exists unlike unix so explicitly check</div><div class='head'>diff --git a/src/corelib/kernel/qsystemerror.cpp b/src/corelib/kernel/qsystemerror.cpp<br/>new file mode 100644<br/>index 0000000..71c2807<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qsystemerror.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qsystemerror.cpp</a></div><div class='hunk'>@@ -0,0 +1,220 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;qglobal.h&gt;</div><div class='add'>+#include "qsystemerror_p.h"</div><div class='add'>+#if !defined(Q_OS_WINCE)</div><div class='add'>+#  include &lt;errno.h&gt;</div><div class='add'>+#  if defined(Q_CC_MSVC)</div><div class='add'>+#    include &lt;crtdbg.h&gt;</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+#ifdef Q_OS_WIN</div><div class='add'>+#include &lt;windows.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+#if !defined(Q_OS_WIN) &amp;&amp; !defined(QT_NO_THREAD) &amp;&amp; !defined(Q_OS_INTEGRITY) &amp;&amp; !defined(Q_OS_QNX) &amp;&amp; \</div><div class='add'>+    defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; _POSIX_VERSION &gt;= 200112L</div><div class='add'>+namespace {</div><div class='add'>+    // There are two incompatible versions of strerror_r:</div><div class='add'>+    // a) the XSI/POSIX.1 version, which returns an int,</div><div class='add'>+    //    indicating success or not</div><div class='add'>+    // b) the GNU version, which returns a char*, which may or may not</div><div class='add'>+    //    be the beginning of the buffer we used</div><div class='add'>+    // The GNU libc manpage for strerror_r says you should use the the XSI</div><div class='add'>+    // version in portable code. However, it's impossible to do that if</div><div class='add'>+    // _GNU_SOURCE is defined so we use C++ overloading to decide what to do</div><div class='add'>+    // depending on the return type</div><div class='add'>+    static inline QString fromstrerror_helper(int, const QByteArray &amp;buf)</div><div class='add'>+    {</div><div class='add'>+        return QString::fromLocal8Bit(buf);</div><div class='add'>+    }</div><div class='add'>+    static inline QString fromstrerror_helper(const char *str, const QByteArray &amp;)</div><div class='add'>+    {</div><div class='add'>+        return QString::fromLocal8Bit(str);</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static QString standardLibraryErrorString(int errorCode)</div><div class='add'>+{</div><div class='add'>+    const char *s = 0;</div><div class='add'>+    QString ret;</div><div class='add'>+    switch (errorCode) {</div><div class='add'>+    case 0:</div><div class='add'>+        break;</div><div class='add'>+    case EACCES:</div><div class='add'>+        s = QT_TRANSLATE_NOOP("QIODevice", "Permission denied");</div><div class='add'>+        break;</div><div class='add'>+    case EMFILE:</div><div class='add'>+        s = QT_TRANSLATE_NOOP("QIODevice", "Too many open files");</div><div class='add'>+        break;</div><div class='add'>+    case ENOENT:</div><div class='add'>+        s = QT_TRANSLATE_NOOP("QIODevice", "No such file or directory");</div><div class='add'>+        break;</div><div class='add'>+    case ENOSPC:</div><div class='add'>+        s = QT_TRANSLATE_NOOP("QIODevice", "No space left on device");</div><div class='add'>+        break;</div><div class='add'>+    default: {</div><div class='add'>+    #if !defined(QT_NO_THREAD) &amp;&amp; defined(_POSIX_THREAD_SAFE_FUNCTIONS) &amp;&amp; _POSIX_VERSION &gt;= 200112L &amp;&amp; !defined(Q_OS_INTEGRITY) &amp;&amp; !defined(Q_OS_QNX)</div><div class='add'>+        QByteArray buf(1024, '\0');</div><div class='add'>+        ret = fromstrerror_helper(strerror_r(errorCode, buf.data(), buf.size()), buf);</div><div class='add'>+    #else</div><div class='add'>+        ret = QString::fromLocal8Bit(strerror(errorCode));</div><div class='add'>+    #endif</div><div class='add'>+    break; }</div><div class='add'>+    }</div><div class='add'>+    if (s) {</div><div class='add'>+        // ######## this breaks moc build currently</div><div class='add'>+        // ret = QCoreApplication::translate("QIODevice", s);</div><div class='add'>+        ret = QString::fromLatin1(s);</div><div class='add'>+    }</div><div class='add'>+    return ret.trimmed();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef Q_OS_WIN</div><div class='add'>+static QString windowsErrorString(int errorCode)</div><div class='add'>+{</div><div class='add'>+    QString ret;</div><div class='add'>+    wchar_t *string = 0;</div><div class='add'>+    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,</div><div class='add'>+                  NULL,</div><div class='add'>+                  errorCode,</div><div class='add'>+                  MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),</div><div class='add'>+                  (LPWSTR)&amp;string,</div><div class='add'>+                  0,</div><div class='add'>+                  NULL);</div><div class='add'>+    ret = QString::fromWCharArray(string);</div><div class='add'>+    LocalFree((HLOCAL)string);</div><div class='add'>+</div><div class='add'>+    if (ret.isEmpty() &amp;&amp; errorCode == ERROR_MOD_NOT_FOUND)</div><div class='add'>+        ret = QString::fromLatin1("The specified module could not be found.");</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+static QString symbianErrorString(int errorCode)</div><div class='add'>+{</div><div class='add'>+    switch (errorCode) {</div><div class='add'>+    case KErrNotFound:</div><div class='add'>+        return QLatin1String("not found");</div><div class='add'>+    case KErrCancel:</div><div class='add'>+        return QLatin1String("cancelled");</div><div class='add'>+    case KErrNoMemory:</div><div class='add'>+        return QLatin1String("out of memory");</div><div class='add'>+    case KErrNotSupported:</div><div class='add'>+        return QLatin1String("not supported");</div><div class='add'>+    case KErrBadHandle:</div><div class='add'>+        return QLatin1String("bad handle"); //KERN-EXEC 0 panic is more likely</div><div class='add'>+    case KErrAlreadyExists:</div><div class='add'>+        return QLatin1String("already exists");</div><div class='add'>+    case KErrPathNotFound:</div><div class='add'>+        return QLatin1String("path not found");</div><div class='add'>+    case KErrInUse:</div><div class='add'>+        return QLatin1String("in use");</div><div class='add'>+    case KErrNotReady:</div><div class='add'>+        return QLatin1String("not ready (e.g. FS dismounted, network down)");</div><div class='add'>+    case KErrCorrupt:</div><div class='add'>+        return QLatin1String("corrupt");</div><div class='add'>+    case KErrAccessDenied:</div><div class='add'>+        return QLatin1String("access denied");</div><div class='add'>+    case KErrLocked:</div><div class='add'>+        return QLatin1String("locked");</div><div class='add'>+    case KErrWrite:</div><div class='add'>+        return QLatin1String("incomplete write error");</div><div class='add'>+    case KErrDisMounted:</div><div class='add'>+        return QLatin1String("file system dismounted during operation"); //i.e. a forcible dismount was done while we had files open</div><div class='add'>+    case KErrEof:</div><div class='add'>+        return QLatin1String("end of file");</div><div class='add'>+    case KErrDiskFull:</div><div class='add'>+        return QLatin1String("no space in file system");</div><div class='add'>+    case KErrBadName:</div><div class='add'>+        return QLatin1String("invalid filename");</div><div class='add'>+    case KErrTimedOut:</div><div class='add'>+        return QLatin1String("timed out");</div><div class='add'>+    case KErrBadDescriptor:</div><div class='add'>+        return QLatin1String("bad descriptor (passed address on stack to async call?)");</div><div class='add'>+    case KErrAbort:</div><div class='add'>+        return QLatin1String("aborted");</div><div class='add'>+    case KErrTooBig:</div><div class='add'>+        return QLatin1String("too big"); //e.g. trying to open a &gt;2GB file with 32 bit API</div><div class='add'>+    case KErrBadPower:</div><div class='add'>+        return QLatin1String("insufficient power");</div><div class='add'>+    case KErrDirFull:</div><div class='add'>+        return QLatin1String("no space in directory table");</div><div class='add'>+    case KErrHardwareNotAvailable:</div><div class='add'>+        return QLatin1String("hardware not available");</div><div class='add'>+    case KErrSessionClosed:</div><div class='add'>+        return QLatin1String("session closed");</div><div class='add'>+    case KErrPermissionDenied:</div><div class='add'>+        return QLatin1String("permission denied");</div><div class='add'>+    default:</div><div class='add'>+        return QString(QLatin1String("symbian error %1")).arg(errorCode);</div><div class='add'>+    }    </div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+QString QSystemError::toString()</div><div class='add'>+{</div><div class='add'>+    switch(errorScope) {</div><div class='add'>+    case NativeError:</div><div class='add'>+#if defined (Q_OS_WIN)</div><div class='add'>+        return windowsErrorString(errorCode);</div><div class='add'>+#elif defined (Q_OS_SYMBIAN)</div><div class='add'>+        return symbianErrorString(errorCode);</div><div class='add'>+#else</div><div class='add'>+        //unix: fall through as native and standard library are the same</div><div class='add'>+#endif</div><div class='add'>+    case StandardLibraryError:</div><div class='add'>+        return standardLibraryErrorString(errorCode);</div><div class='add'>+    default:</div><div class='add'>+        qWarning("invalid error scope");</div><div class='add'>+        //fall through</div><div class='add'>+    case NoError:</div><div class='add'>+        return QLatin1String("No error");</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='head'>diff --git a/src/corelib/kernel/qsystemerror_p.h b/src/corelib/kernel/qsystemerror_p.h<br/>new file mode 100644<br/>index 0000000..0bcada7<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qsystemerror_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qsystemerror_p.h</a></div><div class='hunk'>@@ -0,0 +1,107 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QSYSTEMERROR_P_H</div><div class='add'>+#define QSYSTEMERROR_P_H</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+//  W A R N I N G</div><div class='add'>+//  -------------</div><div class='add'>+//</div><div class='add'>+// This file is not part of the Qt API.  It exists purely as an</div><div class='add'>+// implementation detail.  This header file may change from version to</div><div class='add'>+// version without notice, or even be removed.</div><div class='add'>+//</div><div class='add'>+// We mean it.</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;qstring.h&gt;</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+class Q_CORE_EXPORT QSystemError</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    enum ErrorScope</div><div class='add'>+    {</div><div class='add'>+        NoError,</div><div class='add'>+        StandardLibraryError,</div><div class='add'>+        NativeError</div><div class='add'>+    };</div><div class='add'>+    </div><div class='add'>+    inline QSystemError(int error, ErrorScope scope);</div><div class='add'>+    inline QSystemError();</div><div class='add'>+    </div><div class='add'>+    QString toString();</div><div class='add'>+    inline ErrorScope scope();</div><div class='add'>+    inline int error();</div><div class='add'>+    </div><div class='add'>+    //data members</div><div class='add'>+    int errorCode;</div><div class='add'>+    ErrorScope errorScope;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+QSystemError::QSystemError(int error, QSystemError::ErrorScope scope)</div><div class='add'>+: errorCode(error), errorScope(scope)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QSystemError::QSystemError()</div><div class='add'>+: errorCode(0), errorScope(NoError)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QSystemError::ErrorScope QSystemError::scope()</div><div class='add'>+{</div><div class='add'>+    return errorScope;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int QSystemError::error()</div><div class='add'>+{</div><div class='add'>+    return errorCode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+#endif // QSYSTEMERROR_P_H</div><div class='head'>diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp<br/>index e76331e..5e533e7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qsystemsemaphore_unix.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qsystemsemaphore_unix.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qsystemsemaphore_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qsystemsemaphore_unix.cpp</a></div><div class='hunk'>@@ -50,11 +50,11 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='ctx'> #include &lt;sys/ipc.h&gt;</div><div class='add'>+#include &lt;sys/sem.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='del'>-#include &lt;sys/shm.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;sys/sem.h&gt;</div><div class='add'>+#include "private/qcore_unix_p.h"</div><div class='ctx'> </div><div class='ctx'> // OpenBSD 4.2 doesn't define EIDRM, see BUGS section:</div><div class='ctx'> // http://www.openbsd.org/cgi-bin/man.cgi?query=semop&amp;manpath=OpenBSD+4.2</div><div class='hunk'>@@ -64,13 +64,6 @@</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='del'>-// We have to define this as on some sem.h will have it</div><div class='del'>-union qt_semun {</div><div class='del'>-    int val;                    /* value for SETVAL */</div><div class='del'>-    struct semid_ds *buf;       /* buffer for IPC_STAT, IPC_SET */</div><div class='del'>-    unsigned short *array;      /* array for GETALL, SETALL */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> QSystemSemaphorePrivate::QSystemSemaphorePrivate() :</div><div class='ctx'>         semaphore(-1), createdFile(false),</div><div class='ctx'>         createdSemaphore(false), unix_key(-1), error(QSystemSemaphore::NoError)</div><div class='hunk'>@@ -218,7 +211,10 @@ bool QSystemSemaphorePrivate::modifySemaphore(int count)</div><div class='ctx'>     operation.sem_num = 0;</div><div class='ctx'>     operation.sem_op = count;</div><div class='ctx'>     operation.sem_flg = SEM_UNDO;</div><div class='del'>-    if (-1 == semop(semaphore, &amp;operation, 1)) {</div><div class='add'>+</div><div class='add'>+    register int res;</div><div class='add'>+    EINTR_LOOP(res, semop(semaphore, &amp;operation, 1));</div><div class='add'>+    if (-1 == res) {</div><div class='ctx'>         // If the semaphore was removed be nice and create it and then modifySemaphore again</div><div class='ctx'>         if (errno == EINVAL || errno == EIDRM) {</div><div class='ctx'>             semaphore = -1;</div><div class='head'>diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp<br/>index 3672846..4504eab 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qtranslator.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qtranslator.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qtranslator.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qtranslator.cpp</a></div><div class='hunk'>@@ -47,6 +47,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "qfileinfo.h"</div><div class='ctx'> #include "qstring.h"</div><div class='add'>+#include "qstringlist.h"</div><div class='ctx'> #include "qcoreapplication.h"</div><div class='ctx'> #include "qcoreapplication_p.h"</div><div class='ctx'> #include "qdatastream.h"</div><div class='hunk'>@@ -55,8 +56,9 @@</div><div class='ctx'> #include "qalgorithms.h"</div><div class='ctx'> #include "qhash.h"</div><div class='ctx'> #include "qtranslator_p.h"</div><div class='add'>+#include "qlocale.h"</div><div class='ctx'> </div><div class='del'>-#if defined(Q_OS_UNIX) &amp;&amp; !defined(Q_OS_SYMBIAN)</div><div class='add'>+#if defined(Q_OS_UNIX) &amp;&amp; !defined(Q_OS_SYMBIAN) &amp;&amp; !defined(Q_OS_INTEGRITY)</div><div class='ctx'> #define QT_USE_MMAP</div><div class='ctx'> #include "private/qcore_unix_p.h"</div><div class='ctx'> #endif</div><div class='hunk'>@@ -236,6 +238,7 @@ public:</div><div class='ctx'>     uint contextLength;</div><div class='ctx'>     uint numerusRulesLength;</div><div class='ctx'> </div><div class='add'>+    bool do_load(const QString &amp;filename);</div><div class='ctx'>     bool do_load(const uchar *data, int len);</div><div class='ctx'>     QString do_translate(const char *context, const char *sourceText, const char *comment,</div><div class='ctx'>                          int n) const;</div><div class='hunk'>@@ -440,7 +443,12 @@ bool QTranslator::load(const QString &amp; filename, const QString &amp; directory,</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     // realname is now the fully qualified name of a readable file.</div><div class='add'>+    return d-&gt;do_load(realname);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+bool QTranslatorPrivate::do_load(const QString &amp;realname)</div><div class='add'>+{</div><div class='add'>+    QTranslatorPrivate *d = this;</div><div class='ctx'>     bool ok = false;</div><div class='ctx'> </div><div class='ctx'> #ifdef QT_USE_MMAP</div><div class='hunk'>@@ -502,6 +510,148 @@ bool QTranslator::load(const QString &amp; filename, const QString &amp; directory,</div><div class='ctx'>     return d-&gt;do_load(reinterpret_cast&lt;const uchar *&gt;(d-&gt;unmapPointer), d-&gt;unmapLength);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static QString find_translation(const QLocale &amp; locale,</div><div class='add'>+                                const QString &amp; filename,</div><div class='add'>+                                const QString &amp; prefix,</div><div class='add'>+                                const QString &amp; directory,</div><div class='add'>+                                const QString &amp; suffix)</div><div class='add'>+{</div><div class='add'>+    QString path;</div><div class='add'>+    if (QFileInfo(filename).isRelative()) {</div><div class='add'>+        path = directory;</div><div class='add'>+        if (!path.isEmpty() &amp;&amp; !path.endsWith(QLatin1Char('/')))</div><div class='add'>+            path += QLatin1Char('/');</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    QFileInfo fi;</div><div class='add'>+    QString realname;</div><div class='add'>+    QStringList fuzzyLocales;</div><div class='add'>+</div><div class='add'>+    // see http://www.unicode.org/reports/tr35/#LanguageMatching for inspiration</div><div class='add'>+</div><div class='add'>+    QStringList languages = locale.uiLanguages();</div><div class='add'>+#if defined(Q_OS_UNIX) &amp;&amp; !defined(Q_OS_SYMBIAN)</div><div class='add'>+    for (int i = languages.size()-1; i &gt;= 0; --i) {</div><div class='add'>+        QString lang = languages.at(i);</div><div class='add'>+        QString lowerLang = lang.toLower();</div><div class='add'>+        if (lang != lowerLang)</div><div class='add'>+            languages.insert(i+1, lowerLang);</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    // try explicit locales names first</div><div class='add'>+    foreach (QString localeName, languages) {</div><div class='add'>+        localeName.replace(QLatin1Char('-'), QLatin1Char('_'));</div><div class='add'>+</div><div class='add'>+        realname = path + filename + prefix + localeName + (suffix.isNull() ? QLatin1String(".qm") : suffix);</div><div class='add'>+        fi.setFile(realname);</div><div class='add'>+        if (fi.isReadable() &amp;&amp; fi.isFile())</div><div class='add'>+            return realname;</div><div class='add'>+</div><div class='add'>+        realname = path + filename + prefix + localeName;</div><div class='add'>+        fi.setFile(realname);</div><div class='add'>+        if (fi.isReadable() &amp;&amp; fi.isFile())</div><div class='add'>+            return realname;</div><div class='add'>+</div><div class='add'>+        fuzzyLocales.append(localeName);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    // start guessing</div><div class='add'>+    foreach (QString localeName, fuzzyLocales) {</div><div class='add'>+        for (;;) {</div><div class='add'>+            int rightmost = localeName.lastIndexOf(QLatin1Char('_'));</div><div class='add'>+            // no truncations? fail</div><div class='add'>+            if (rightmost &lt;= 0)</div><div class='add'>+                break;</div><div class='add'>+            localeName.truncate(rightmost);</div><div class='add'>+</div><div class='add'>+            realname = path + filename + prefix + localeName + (suffix.isNull() ? QLatin1String(".qm") : suffix);</div><div class='add'>+            fi.setFile(realname);</div><div class='add'>+            if (fi.isReadable() &amp;&amp; fi.isFile())</div><div class='add'>+                return realname;</div><div class='add'>+</div><div class='add'>+            realname = path + filename + prefix + localeName;</div><div class='add'>+            fi.setFile(realname);</div><div class='add'>+            if (fi.isReadable() &amp;&amp; fi.isFile())</div><div class='add'>+                return realname;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (!suffix.isNull()) {</div><div class='add'>+        realname = path + filename + suffix;</div><div class='add'>+        fi.setFile(realname);</div><div class='add'>+        if (fi.isReadable() &amp;&amp; fi.isFile())</div><div class='add'>+            return realname;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    realname = path + filename + prefix;</div><div class='add'>+    fi.setFile(realname);</div><div class='add'>+    if (fi.isReadable() &amp;&amp; fi.isFile())</div><div class='add'>+        return realname;</div><div class='add'>+</div><div class='add'>+    realname = path + filename;</div><div class='add'>+    fi.setFile(realname);</div><div class='add'>+    if (fi.isReadable() &amp;&amp; fi.isFile())</div><div class='add'>+        return realname;</div><div class='add'>+</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Loads \a filename + \a prefix + \a \l{QLocale::uiLanguages()}{ui language</div><div class='add'>+    name} + \a suffix (".qm" if the \a suffix is not specified), which may be</div><div class='add'>+    an absolute file name or relative to \a directory. Returns true if the</div><div class='add'>+    translation is successfully loaded; otherwise returns false.</div><div class='add'>+</div><div class='add'>+    The previous contents of this translator object are discarded.</div><div class='add'>+</div><div class='add'>+    If the file name does not exist, other file names are tried</div><div class='add'>+    in the following order:</div><div class='add'>+</div><div class='add'>+    \list 1</div><div class='add'>+    \o File name without \a suffix appended.</div><div class='add'>+    \o File name with ui language part after a "_" character stripped and \a suffix.</div><div class='add'>+    \o File name with ui language part stripped without \a suffix appended.</div><div class='add'>+    \o File name with ui language part stripped further, etc.</div><div class='add'>+    \endlist</div><div class='add'>+</div><div class='add'>+    For example, an application running in the locale with the following</div><div class='add'>+    l{QLocale::uiLanguages()}{ui languages} - "es", "fr-CA", "de" might call</div><div class='add'>+    load(QLocale::system(), "foo", ".", "/opt/foolib", ".qm"). load() would</div><div class='add'>+    replace '-' (dash) with '_' (underscore) in the ui language and then try to</div><div class='add'>+    open the first existing readable file from this list:</div><div class='add'>+</div><div class='add'>+    \list 1</div><div class='add'>+    \o \c /opt/foolib/foo.es.qm</div><div class='add'>+    \o \c /opt/foolib/foo.es</div><div class='add'>+    \o \c /opt/foolib/foo.fr_CA.qm</div><div class='add'>+    \o \c /opt/foolib/foo.fr_CA</div><div class='add'>+    \o \c /opt/foolib/foo.de.qm</div><div class='add'>+    \o \c /opt/foolib/foo.de</div><div class='add'>+    \o \c /opt/foolib/foo.fr.qm</div><div class='add'>+    \o \c /opt/foolib/foo.fr</div><div class='add'>+    \o \c /opt/foolib/foo.qm</div><div class='add'>+    \o \c /opt/foolib/foo.</div><div class='add'>+    \o \c /opt/foolib/foo</div><div class='add'>+    \endlist</div><div class='add'>+</div><div class='add'>+    For OSs where file system is case sensitive, QTranslator also tries to load</div><div class='add'>+    a lower-cased version of the locale name.</div><div class='add'>+*/</div><div class='add'>+bool QTranslator::load(const QLocale &amp; locale,</div><div class='add'>+                       const QString &amp; filename,</div><div class='add'>+                       const QString &amp; prefix,</div><div class='add'>+                       const QString &amp; directory,</div><div class='add'>+                       const QString &amp; suffix)</div><div class='add'>+{</div><div class='add'>+    Q_D(QTranslator);</div><div class='add'>+    d-&gt;clear();</div><div class='add'>+    QString fname = find_translation(locale, filename, prefix, directory, suffix);</div><div class='add'>+    return !fname.isEmpty() &amp;&amp; d-&gt;do_load(fname);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*!</div><div class='ctx'>   \overload load()</div><div class='ctx'>   \fn bool QTranslator::load(const uchar *data, int len)</div><div class='hunk'>@@ -692,7 +842,7 @@ QString QTranslatorPrivate::do_translate(const char *context, const char *source</div><div class='ctx'>         numerus = numerusHelper(n, numerusRulesArray, numerusRulesLength);</div><div class='ctx'> </div><div class='ctx'>     for (;;) {</div><div class='del'>-        quint32 h = elfHash(QByteArray(sourceText) + comment);</div><div class='add'>+        quint32 h = elfHash(QByteArray(QByteArray(sourceText) + comment).constData());</div><div class='ctx'> </div><div class='ctx'>         const uchar *start = offsetArray;</div><div class='ctx'>         const uchar *end = start + ((numItems-1) &lt;&lt; 3);</div><div class='head'>diff --git a/src/corelib/kernel/qtranslator.h b/src/corelib/kernel/qtranslator.h<br/>index dad7ca7..495137c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qtranslator.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qtranslator.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qtranslator.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qtranslator.h</a></div><div class='hunk'>@@ -53,6 +53,7 @@ QT_MODULE(Core)</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_TRANSLATION</div><div class='ctx'> </div><div class='add'>+class QLocale;</div><div class='ctx'> class QTranslatorPrivate;</div><div class='ctx'> </div><div class='ctx'> class Q_CORE_EXPORT QTranslator : public QObject</div><div class='hunk'>@@ -77,6 +78,11 @@ public:</div><div class='ctx'>               const QString &amp; directory = QString(),</div><div class='ctx'>               const QString &amp; search_delimiters = QString(),</div><div class='ctx'>               const QString &amp; suffix = QString());</div><div class='add'>+    bool load(const QLocale &amp; locale,</div><div class='add'>+              const QString &amp; filename,</div><div class='add'>+              const QString &amp; prefix = QString(),</div><div class='add'>+              const QString &amp; directory = QString(),</div><div class='add'>+              const QString &amp; suffix = QString());</div><div class='ctx'>     bool load(const uchar *data, int len);</div><div class='ctx'> </div><div class='ctx'> #ifdef QT3_SUPPORT</div><div class='head'>diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp<br/>index 2fc62e2..7f750b3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qvariant.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qvariant.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qvariant.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qvariant.cpp</a></div><div class='hunk'>@@ -947,11 +947,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result,</div><div class='ctx'>         case QMetaType::UChar:</div><div class='ctx'>         case QMetaType::UShort:</div><div class='ctx'>         case QMetaType::ULong:</div><div class='del'>-#if defined(Q_CC_MSVC) &amp;&amp; !defined(Q_CC_MSVC_NET)</div><div class='del'>-            *f = (double)(qlonglong)qMetaTypeUNumber(d);</div><div class='del'>-#else</div><div class='ctx'>             *f = double(qMetaTypeUNumber(d));</div><div class='del'>-#endif</div><div class='ctx'>             break;</div><div class='ctx'>         default:</div><div class='ctx'>             *f = 0.0;</div><div class='hunk'>@@ -986,11 +982,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result,</div><div class='ctx'>         case QMetaType::UChar:</div><div class='ctx'>         case QMetaType::UShort:</div><div class='ctx'>         case QMetaType::ULong:</div><div class='del'>-#if defined(Q_CC_MSVC) &amp;&amp; !defined(Q_CC_MSVC_NET)</div><div class='del'>-            *f = (float)(qlonglong)qMetaTypeUNumber(d);</div><div class='del'>-#else</div><div class='ctx'>             *f = float(qMetaTypeUNumber(d));</div><div class='del'>-#endif</div><div class='ctx'>             break;</div><div class='ctx'>         default:</div><div class='ctx'>             *f = 0.0f;</div><div class='hunk'>@@ -1084,7 +1076,7 @@ static void streamDebug(QDebug dbg, const QVariant &amp;v)</div><div class='ctx'>         dbg.nospace() &lt;&lt; v.toFloat();</div><div class='ctx'>         break;</div><div class='ctx'>     case QMetaType::QObjectStar:</div><div class='del'>-        dbg.nospace() &lt;&lt; qVariantValue&lt;QObject *&gt;(v);</div><div class='add'>+        dbg.nospace() &lt;&lt; qvariant_cast&lt;QObject *&gt;(v);</div><div class='ctx'>         break;</div><div class='ctx'>     case QVariant::Double:</div><div class='ctx'>         dbg.nospace() &lt;&lt; v.toDouble();</div><div class='hunk'>@@ -1245,7 +1237,7 @@ const QVariant::Handler *QVariant::handler = &amp;qt_kernel_variant_handler;</div><div class='ctx'>     conversion functions to data types defined in QtGui, such as</div><div class='ctx'>     QColor, QImage, and QPixmap. In other words, there is no \c</div><div class='ctx'>     toColor() function. Instead, you can use the QVariant::value() or</div><div class='del'>-    the qVariantValue() template function. For example:</div><div class='add'>+    the qvariant_cast() template function. For example:</div><div class='ctx'> </div><div class='ctx'>     \snippet doc/src/snippets/code/src_corelib_kernel_qvariant.cpp 2</div><div class='ctx'> </div><div class='hunk'>@@ -1360,12 +1352,12 @@ const QVariant::Handler *QVariant::handler = &amp;qt_kernel_variant_handler;</div><div class='ctx'> </div><div class='ctx'>     Note that you have to pass the address of the variable you want stored.</div><div class='ctx'> </div><div class='del'>-    Usually, you never have to use this constructor, use qVariantFromValue()</div><div class='add'>+    Usually, you never have to use this constructor, use QVariant::fromValue()</div><div class='ctx'>     instead to construct variants from the pointer types represented by</div><div class='ctx'>     \c QMetaType::VoidStar, \c QMetaType::QObjectStar and</div><div class='ctx'>     \c QMetaType::QWidgetStar.</div><div class='ctx'> </div><div class='del'>-    \sa qVariantFromValue(), Type</div><div class='add'>+    \sa QVariant::fromValue(), Type</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -1816,6 +1808,14 @@ QVariant&amp; QVariant::operator=(const QVariant &amp;variant)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \fn void QVariant::swap(QVariant &amp;other)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Swaps variant \a other with this variant. This operation is very</div><div class='add'>+    fast and never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='ctx'>     \fn void QVariant::detach()</div><div class='ctx'> </div><div class='ctx'>     \internal</div><div class='hunk'>@@ -3074,10 +3074,6 @@ QDebug operator&lt;&lt;(QDebug dbg, const QVariant::Type p)</div><div class='ctx'> </div><div class='ctx'>     \snippet doc/src/snippets/code/src_corelib_kernel_qvariant.cpp 4</div><div class='ctx'> </div><div class='del'>-    \warning This function is not available with MSVC 6. Use</div><div class='del'>-    qVariantSetValue() instead if you need to support that version of</div><div class='del'>-    the compiler.</div><div class='del'>-</div><div class='ctx'>     \sa value(), fromValue(), canConvert()</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -3095,10 +3091,6 @@ QDebug operator&lt;&lt;(QDebug dbg, const QVariant::Type p)</div><div class='ctx'> </div><div class='ctx'>     \snippet doc/src/snippets/code/src_corelib_kernel_qvariant.cpp 5</div><div class='ctx'> </div><div class='del'>-    \warning This function is not available with MSVC 6. Use</div><div class='del'>-    qVariantValue() or qvariant_cast() instead if you need to support</div><div class='del'>-    that version of the compiler.</div><div class='del'>-</div><div class='ctx'>     \sa setValue(), fromValue(), canConvert()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='hunk'>@@ -3111,10 +3103,6 @@ QDebug operator&lt;&lt;(QDebug dbg, const QVariant::Type p)</div><div class='ctx'> </div><div class='ctx'>     \snippet doc/src/snippets/code/src_corelib_kernel_qvariant.cpp 6</div><div class='ctx'> </div><div class='del'>-    \warning This function is not available with MSVC 6. Use</div><div class='del'>-    qVariantCanConvert() instead if you need to support that version</div><div class='del'>-    of the compiler.</div><div class='del'>-</div><div class='ctx'>     \sa convert()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='hunk'>@@ -3130,23 +3118,22 @@ QDebug operator&lt;&lt;(QDebug dbg, const QVariant::Type p)</div><div class='ctx'>     \note If you are working with custom types, you should use</div><div class='ctx'>     the Q_DECLARE_METATYPE() macro to register your custom type.</div><div class='ctx'> </div><div class='del'>-    \warning This function is not available with MSVC 6. Use</div><div class='del'>-    qVariantFromValue() instead if you need to support that version</div><div class='del'>-    of the compiler.</div><div class='del'>-</div><div class='ctx'>     \sa setValue(), value()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     \fn QVariant qVariantFromValue(const T &amp;value)</div><div class='ctx'>     \relates QVariant</div><div class='add'>+    \obsolete</div><div class='ctx'> </div><div class='ctx'>     Returns a variant containing a copy of the given \a value</div><div class='ctx'>     with template type \c{T}.</div><div class='ctx'> </div><div class='del'>-    This function is equivalent to QVariant::fromValue(\a value). It</div><div class='del'>-    is provided as a work-around for MSVC 6, which doesn't support</div><div class='del'>-    member template functions.</div><div class='add'>+    This function is equivalent to QVariant::fromValue(\a value).</div><div class='add'>+</div><div class='add'>+    \note This function was provided as a workaround for MSVC 6</div><div class='add'>+    which did not support member template functions. It is advised</div><div class='add'>+    to use the other form in new code.</div><div class='ctx'> </div><div class='ctx'>     For example, a QObject pointer can be stored in a variant with the</div><div class='ctx'>     following code:</div><div class='hunk'>@@ -3158,13 +3145,16 @@ QDebug operator&lt;&lt;(QDebug dbg, const QVariant::Type p)</div><div class='ctx'> </div><div class='ctx'> /*! \fn void qVariantSetValue(QVariant &amp;variant, const T &amp;value)</div><div class='ctx'>     \relates QVariant</div><div class='add'>+    \obsolete</div><div class='ctx'> </div><div class='ctx'>     Sets the contents of the given \a variant to a copy of the</div><div class='ctx'>     \a value with the specified template type \c{T}.</div><div class='ctx'> </div><div class='del'>-    This function is equivalent to QVariant::setValue(\a value). It</div><div class='del'>-    is provided as a work-around for MSVC 6, which doesn't support</div><div class='del'>-    member template functions.</div><div class='add'>+    This function is equivalent to QVariant::setValue(\a value).</div><div class='add'>+</div><div class='add'>+    \note This function was provided as a workaround for MSVC 6</div><div class='add'>+    which did not support member template functions. It is advised</div><div class='add'>+    to use the other form in new code.</div><div class='ctx'> </div><div class='ctx'>     \sa QVariant::setValue()</div><div class='ctx'> */</div><div class='hunk'>@@ -3175,33 +3165,39 @@ QDebug operator&lt;&lt;(QDebug dbg, const QVariant::Type p)</div><div class='ctx'> </div><div class='ctx'>     Returns the given \a value converted to the template type \c{T}.</div><div class='ctx'> </div><div class='del'>-    This function is equivalent to qVariantValue().</div><div class='add'>+    This function is equivalent to QVariant::value().</div><div class='ctx'> </div><div class='del'>-    \sa qVariantValue(), QVariant::value()</div><div class='add'>+    \sa QVariant::value()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*! \fn T qVariantValue(const QVariant &amp;value)</div><div class='ctx'>     \relates QVariant</div><div class='add'>+    \obsolete</div><div class='ctx'> </div><div class='ctx'>     Returns the given \a value converted to the template type \c{T}.</div><div class='ctx'> </div><div class='ctx'>     This function is equivalent to</div><div class='del'>-    \l{QVariant::value()}{QVariant::value}&lt;T&gt;(\a value). It is</div><div class='del'>-    provided as a work-around for MSVC 6, which doesn't support</div><div class='del'>-    member template functions.</div><div class='add'>+    \l{QVariant::value()}{QVariant::value}&lt;T&gt;(\a value).</div><div class='add'>+</div><div class='add'>+    \note This function was provided as a workaround for MSVC 6</div><div class='add'>+    which did not support member template functions. It is advised</div><div class='add'>+    to use the other form in new code.</div><div class='ctx'> </div><div class='ctx'>     \sa QVariant::value(), qvariant_cast()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*! \fn bool qVariantCanConvert(const QVariant &amp;value)</div><div class='ctx'>     \relates QVariant</div><div class='add'>+    \obsolete</div><div class='ctx'> </div><div class='ctx'>     Returns true if the given \a value can be converted to the</div><div class='ctx'>     template type specified; otherwise returns false.</div><div class='ctx'> </div><div class='del'>-    This function is equivalent to QVariant::canConvert(\a value). It</div><div class='del'>-    is provided as a work-around for MSVC 6, which doesn't support</div><div class='del'>-    member template functions.</div><div class='add'>+    This function is equivalent to QVariant::canConvert(\a value).</div><div class='add'>+</div><div class='add'>+    \note This function was provided as a workaround for MSVC 6</div><div class='add'>+    which did not support member template functions. It is advised</div><div class='add'>+    to use the other form in new code.</div><div class='ctx'> </div><div class='ctx'>     \sa QVariant::canConvert()</div><div class='ctx'> */</div><div class='head'>diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h<br/>index 87584ac..268d381 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qvariant.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/kernel/qvariant.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/kernel/qvariant.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/kernel/qvariant.h</a></div><div class='hunk'>@@ -83,19 +83,11 @@ class QUrl;</div><div class='ctx'> class QVariant;</div><div class='ctx'> class QVariantComparisonHelper;</div><div class='ctx'> </div><div class='del'>-#ifndef QT_NO_MEMBER_TEMPLATES</div><div class='ctx'> template &lt;typename T&gt;</div><div class='ctx'> inline QVariant qVariantFromValue(const T &amp;);</div><div class='ctx'> </div><div class='del'>-template &lt;typename T&gt;</div><div class='del'>-inline void qVariantSetValue(QVariant &amp;, const T &amp;);</div><div class='del'>-</div><div class='ctx'> template&lt;typename T&gt;</div><div class='del'>-inline T qVariantValue(const QVariant &amp;);</div><div class='del'>-</div><div class='del'>-template&lt;typename T&gt;</div><div class='del'>-inline bool qVariantCanConvert(const QVariant &amp;);</div><div class='del'>-#endif</div><div class='add'>+inline T qvariant_cast(const QVariant &amp;);</div><div class='ctx'> </div><div class='ctx'> class Q_CORE_EXPORT QVariant</div><div class='ctx'> {</div><div class='hunk'>@@ -227,6 +219,12 @@ class Q_CORE_EXPORT QVariant</div><div class='ctx'>     QVariant(Qt::GlobalColor color);</div><div class='ctx'> </div><div class='ctx'>     QVariant&amp; operator=(const QVariant &amp;other);</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    inline QVariant &amp;operator=(QVariant &amp;&amp;other)</div><div class='add'>+    { qSwap(d, other.d); return *this; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    inline void swap(QVariant &amp;other) { qSwap(d, other.d); }</div><div class='ctx'> </div><div class='ctx'>     Type type() const;</div><div class='ctx'>     int userType() const;</div><div class='hunk'>@@ -327,13 +325,12 @@ class Q_CORE_EXPORT QVariant</div><div class='ctx'>     const void *constData() const;</div><div class='ctx'>     inline const void *data() const { return constData(); }</div><div class='ctx'> </div><div class='del'>-#ifndef QT_NO_MEMBER_TEMPLATES</div><div class='ctx'>     template&lt;typename T&gt;</div><div class='ctx'>     inline void setValue(const T &amp;value);</div><div class='ctx'> </div><div class='ctx'>     template&lt;typename T&gt;</div><div class='ctx'>     inline T value() const</div><div class='del'>-    { return qVariantValue&lt;T&gt;(*this); }</div><div class='add'>+    { return qvariant_cast&lt;T&gt;(*this); }</div><div class='ctx'> </div><div class='ctx'>     template&lt;typename T&gt;</div><div class='ctx'>     static inline QVariant fromValue(const T &amp;value)</div><div class='hunk'>@@ -341,8 +338,7 @@ class Q_CORE_EXPORT QVariant</div><div class='ctx'> </div><div class='ctx'>     template&lt;typename T&gt;</div><div class='ctx'>     bool canConvert() const</div><div class='del'>-    { return qVariantCanConvert&lt;T&gt;(*this); }</div><div class='del'>-#endif</div><div class='add'>+    { return canConvert(Type(qMetaTypeId&lt;T&gt;())); }</div><div class='ctx'> </div><div class='ctx'>  public:</div><div class='ctx'> #ifndef qdoc</div><div class='hunk'>@@ -527,11 +523,9 @@ inline QSize &amp;QVariant::asSize()</div><div class='ctx'> { return *reinterpret_cast&lt;QSize *&gt;(castOrDetach(Size)); }</div><div class='ctx'> #endif //QT3_SUPPORT</div><div class='ctx'> </div><div class='del'>-#ifndef QT_NO_MEMBER_TEMPLATES</div><div class='ctx'> template&lt;typename T&gt;</div><div class='ctx'> inline void QVariant::setValue(const T &amp;avalue)</div><div class='ctx'> { qVariantSetValue(*this, avalue); }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_DATASTREAM</div><div class='ctx'> Q_CORE_EXPORT QDataStream&amp; operator&gt;&gt; (QDataStream&amp; s, QVariant&amp; p);</div><div class='hunk'>@@ -594,16 +588,16 @@ template&lt;&gt; inline QVariant qvariant_cast&lt;QVariant&gt;(const QVariant &amp;v)</div><div class='ctx'>     return v;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef QT_DEPRECATED</div><div class='ctx'> template&lt;typename T&gt;</div><div class='del'>-inline T qVariantValue(const QVariant &amp;variant)</div><div class='add'>+inline QT_DEPRECATED T qVariantValue(const QVariant &amp;variant)</div><div class='ctx'> { return qvariant_cast&lt;T&gt;(variant); }</div><div class='ctx'> </div><div class='ctx'> template&lt;typename T&gt;</div><div class='del'>-inline bool qVariantCanConvert(const QVariant &amp;variant)</div><div class='del'>-{</div><div class='del'>-    return variant.canConvert(static_cast&lt;QVariant::Type&gt;(</div><div class='del'>-                qMetaTypeId&lt;T&gt;(static_cast&lt;T *&gt;(0))));</div><div class='del'>-}</div><div class='add'>+inline QT_DEPRECATED bool qVariantCanConvert(const QVariant &amp;variant)</div><div class='add'>+{ return variant.template canConvert&lt;T&gt;(); }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> Q_DECLARE_SHARED(QVariant)</div><div class='ctx'> Q_DECLARE_TYPEINFO(QVariant, Q_MOVABLE_TYPE);</div><div class='head'>diff --git a/src/corelib/plugin/plugin.pri b/src/corelib/plugin/plugin.pri<br/>index ba86353..eb7a7f7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/plugin.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/plugin.pri</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/plugin.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/plugin/plugin.pri</a></div><div class='hunk'>@@ -8,13 +8,15 @@ HEADERS += \</div><div class='ctx'> 	plugin/qplugin.h \</div><div class='ctx'> 	plugin/quuid.h \</div><div class='ctx'> 	plugin/qfactoryloader_p.h \</div><div class='del'>-	plugin/qsystemlibrary_p.h</div><div class='add'>+	plugin/qsystemlibrary_p.h \</div><div class='add'>+	plugin/qelfparser_p.h</div><div class='ctx'> </div><div class='ctx'> SOURCES += \</div><div class='ctx'> 	plugin/qpluginloader.cpp \</div><div class='ctx'> 	plugin/qfactoryloader.cpp \</div><div class='ctx'> 	plugin/quuid.cpp \</div><div class='del'>-	plugin/qlibrary.cpp</div><div class='add'>+	plugin/qlibrary.cpp \</div><div class='add'>+	plugin/qelfparser_p.cpp</div><div class='ctx'> </div><div class='ctx'> win32 {</div><div class='ctx'> 	SOURCES += \</div><div class='hunk'>@@ -26,4 +28,8 @@ unix {</div><div class='ctx'> 	SOURCES += plugin/qlibrary_unix.cpp</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+integrity {</div><div class='add'>+	SOURCES += plugin/qlibrary_unix.cpp</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> LIBS_PRIVATE += $$QMAKE_LIBS_DYNLOAD</div><div class='head'>diff --git a/src/corelib/plugin/qelfparser_p.cpp b/src/corelib/plugin/qelfparser_p.cpp<br/>new file mode 100644<br/>index 0000000..e3c6b30<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/qelfparser_p.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/plugin/qelfparser_p.cpp</a></div><div class='hunk'>@@ -0,0 +1,240 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qelfparser_p.h"</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_LIBRARY</div><div class='add'>+#if defined (Q_OF_ELF) &amp;&amp; defined(Q_CC_GNU)</div><div class='add'>+</div><div class='add'>+#include "qlibrary_p.h"</div><div class='add'>+#include &lt;qdebug.h&gt;</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+// #define QELFPARSER_DEBUG 1</div><div class='add'>+</div><div class='add'>+const char *QElfParser::parseSectionHeader(const char *data, ElfSectionHeader *sh)</div><div class='add'>+{</div><div class='add'>+    sh-&gt;name = read&lt;qelfword_t&gt;(data);</div><div class='add'>+    data += sizeof(qelfword_t); // sh_name</div><div class='add'>+    sh-&gt;type = read&lt;qelfword_t&gt;(data);</div><div class='add'>+    data += sizeof(qelfword_t)  // sh_type</div><div class='add'>+         + sizeof(qelfaddr_t)   // sh_flags</div><div class='add'>+         + sizeof(qelfaddr_t);  // sh_addr</div><div class='add'>+    sh-&gt;offset = read&lt;qelfoff_t&gt;(data);</div><div class='add'>+    data += sizeof(qelfoff_t);  // sh_offset</div><div class='add'>+    sh-&gt;size = read&lt;qelfword_t&gt;(data);</div><div class='add'>+    data += sizeof(qelfword_t); // sh_size</div><div class='add'>+    return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int QElfParser::parse(const char *dataStart, ulong fdlen, const QString &amp;library, QLibraryPrivate *lib, long *pos, ulong *sectionlen)</div><div class='add'>+{</div><div class='add'>+#if defined(QELFPARSER_DEBUG)</div><div class='add'>+    qDebug() &lt;&lt; "QElfParser::parse " &lt;&lt; library;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    if (fdlen &lt; 64){</div><div class='add'>+        if (lib)</div><div class='add'>+            lib-&gt;errorString = QLibrary::tr("'%1' is not an ELF object (%2)").arg(library).arg(QLatin1String("file too small"));</div><div class='add'>+        return NotElf;</div><div class='add'>+    }</div><div class='add'>+    const char *data = dataStart;</div><div class='add'>+    if (qstrncmp(data, "\177ELF", 4) != 0) {</div><div class='add'>+        if (lib)</div><div class='add'>+            lib-&gt;errorString = QLibrary::tr("'%1' is not an ELF object").arg(library);</div><div class='add'>+        return NotElf;</div><div class='add'>+    }</div><div class='add'>+    // 32 or 64 bit</div><div class='add'>+    if (data[4] != 1 &amp;&amp; data[4] != 2) {</div><div class='add'>+        if (lib)</div><div class='add'>+            lib-&gt;errorString = QLibrary::tr("'%1' is an invalid ELF object (%2)").arg(library).arg(QLatin1String("odd cpu architecture"));</div><div class='add'>+        return Corrupt;</div><div class='add'>+    }</div><div class='add'>+    m_bits = (data[4] &lt;&lt; 5);</div><div class='add'>+</div><div class='add'>+    /*  If you remove this check, to read ELF objects of a different arch, please make sure you modify the typedefs</div><div class='add'>+        to match the _plugin_ architecture.</div><div class='add'>+    */</div><div class='add'>+    if ((sizeof(void*) == 4 &amp;&amp; m_bits != 32) || (sizeof(void*) == 8 &amp;&amp; m_bits != 64)) {</div><div class='add'>+        if (lib)</div><div class='add'>+            lib-&gt;errorString = QLibrary::tr("'%1' is an invalid ELF object (%2)").arg(library).arg(QLatin1String("wrong cpu architecture"));</div><div class='add'>+        return Corrupt;</div><div class='add'>+    }</div><div class='add'>+    // endian</div><div class='add'>+    if (data[5] == 0) {</div><div class='add'>+        if (lib)</div><div class='add'>+            lib-&gt;errorString = QLibrary::tr("'%1' is an invalid ELF object (%2)").arg(library).arg(QLatin1String("odd endianess"));</div><div class='add'>+        return Corrupt;</div><div class='add'>+    }</div><div class='add'>+    m_endian = (data[5] == 1 ? ElfLittleEndian : ElfBigEndian);</div><div class='add'>+</div><div class='add'>+    data += 16                  // e_ident</div><div class='add'>+         +  sizeof(qelfhalf_t)  // e_type</div><div class='add'>+         +  sizeof(qelfhalf_t)  // e_machine</div><div class='add'>+         +  sizeof(qelfword_t)  // e_version</div><div class='add'>+         +  sizeof(qelfaddr_t)  // e_entry</div><div class='add'>+         +  sizeof(qelfoff_t);  // e_phoff</div><div class='add'>+</div><div class='add'>+    qelfoff_t e_shoff = read&lt;qelfoff_t&gt; (data);</div><div class='add'>+    data += sizeof(qelfoff_t)    // e_shoff</div><div class='add'>+         +  sizeof(qelfword_t);  // e_flags</div><div class='add'>+</div><div class='add'>+    qelfhalf_t e_shsize = read&lt;qelfhalf_t&gt; (data);</div><div class='add'>+</div><div class='add'>+    if (e_shsize &gt; fdlen) {</div><div class='add'>+        if (lib)</div><div class='add'>+            lib-&gt;errorString = QLibrary::tr("'%1' is an invalid ELF object (%2)").arg(library).arg(QLatin1String("unexpected e_shsize"));</div><div class='add'>+        return Corrupt;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    data += sizeof(qelfhalf_t)  // e_ehsize</div><div class='add'>+         +  sizeof(qelfhalf_t)  // e_phentsize</div><div class='add'>+         +  sizeof(qelfhalf_t); // e_phnum</div><div class='add'>+</div><div class='add'>+    qelfhalf_t e_shentsize = read&lt;qelfhalf_t&gt; (data);</div><div class='add'>+</div><div class='add'>+    if (e_shentsize % 4){</div><div class='add'>+        if (lib)</div><div class='add'>+            lib-&gt;errorString = QLibrary::tr("'%1' is an invalid ELF object (%2)").arg(library).arg(QLatin1String("unexpected e_shentsize"));</div><div class='add'>+        return Corrupt;</div><div class='add'>+    }</div><div class='add'>+    data += sizeof(qelfhalf_t); // e_shentsize</div><div class='add'>+    qelfhalf_t e_shnum     = read&lt;qelfhalf_t&gt; (data);</div><div class='add'>+    data += sizeof(qelfhalf_t); // e_shnum</div><div class='add'>+    qelfhalf_t e_shtrndx   = read&lt;qelfhalf_t&gt; (data);</div><div class='add'>+    data += sizeof(qelfhalf_t); // e_shtrndx</div><div class='add'>+</div><div class='add'>+    if ((quint32)(e_shnum * e_shentsize) &gt; fdlen) {</div><div class='add'>+        if (lib)</div><div class='add'>+            lib-&gt;errorString = QLibrary::tr("'%1' is an invalid ELF object (%2)").arg(library)</div><div class='add'>+                               .arg(QLatin1String("announced %2 sections, each %3 bytes, exceed file size"))</div><div class='add'>+                               .arg(e_shnum).arg(e_shentsize);</div><div class='add'>+        return Corrupt;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+#if defined(QELFPARSER_DEBUG)</div><div class='add'>+    qDebug() &lt;&lt; e_shnum &lt;&lt; "sections starting at " &lt;&lt; ("0x" + QByteArray::number(e_shoff, 16)).data() &lt;&lt; "each" &lt;&lt; e_shentsize &lt;&lt; "bytes";</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    ElfSectionHeader strtab;</div><div class='add'>+    qulonglong soff = e_shoff + e_shentsize * (e_shtrndx);</div><div class='add'>+</div><div class='add'>+    if ((soff + e_shentsize) &gt; fdlen || soff % 4 || soff == 0) {</div><div class='add'>+        if (lib)</div><div class='add'>+            lib-&gt;errorString = QLibrary::tr("'%1' is an invalid ELF object (%2)").arg(library)</div><div class='add'>+                               .arg(QLatin1String("shstrtab section header seems to be at %1"))</div><div class='add'>+                               .arg(QString::number(soff, 16));</div><div class='add'>+        return Corrupt;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    parseSectionHeader(dataStart + soff, &amp;strtab);</div><div class='add'>+    m_stringTableFileOffset = strtab.offset;</div><div class='add'>+</div><div class='add'>+    if ((quint32)(m_stringTableFileOffset + e_shentsize) &gt;= fdlen || m_stringTableFileOffset == 0) {</div><div class='add'>+        if (lib)</div><div class='add'>+            lib-&gt;errorString = QLibrary::tr("'%1' is an invalid ELF object (%2)").arg(library)</div><div class='add'>+                               .arg(QLatin1String("string table seems to be at %1"))</div><div class='add'>+                               .arg(QString::number(soff, 16));</div><div class='add'>+        return Corrupt;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+#if defined(QELFPARSER_DEBUG)</div><div class='add'>+    qDebug(".shstrtab at 0x%s", QByteArray::number(m_stringTableFileOffset, 16).data());</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    const char *s = dataStart + e_shoff;</div><div class='add'>+    for (int i = 0; i &lt; e_shnum; ++i) {</div><div class='add'>+        ElfSectionHeader sh;</div><div class='add'>+        parseSectionHeader(s, &amp;sh);</div><div class='add'>+        if (sh.name == 0) {</div><div class='add'>+            s += e_shentsize;</div><div class='add'>+            continue;</div><div class='add'>+        }</div><div class='add'>+        const char *shnam = dataStart + m_stringTableFileOffset + sh.name;</div><div class='add'>+</div><div class='add'>+        if (m_stringTableFileOffset + sh.name &gt; fdlen) {</div><div class='add'>+            if (lib)</div><div class='add'>+                lib-&gt;errorString = QLibrary::tr("'%1' is an invalid ELF object (%2)").arg(library)</div><div class='add'>+                                  .arg(QLatin1String("section name %2 of %3 behind end of file"))</div><div class='add'>+                                  .arg(i).arg(e_shnum);</div><div class='add'>+            return Corrupt;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+#if defined(QELFPARSER_DEBUG)</div><div class='add'>+        qDebug() &lt;&lt; "++++" &lt;&lt; i &lt;&lt; shnam;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+        if (qstrcmp(shnam, ".qtplugin") == 0 || qstrcmp(shnam, ".rodata") == 0) {</div><div class='add'>+            if (!(sh.type &amp; 0x1)) {</div><div class='add'>+                if (shnam[1] == 'r') {</div><div class='add'>+                    if (lib)</div><div class='add'>+                        lib-&gt;errorString = QLibrary::tr("'%1' is an invalid ELF object (%2)").arg(library)</div><div class='add'>+                            .arg(QLatin1String("empty .rodata. not a library."));</div><div class='add'>+                    return Corrupt;</div><div class='add'>+                }</div><div class='add'>+#if defined(QELFPARSER_DEBUG)</div><div class='add'>+                qDebug()&lt;&lt;"section is not program data. skipped.";</div><div class='add'>+#endif</div><div class='add'>+                s += e_shentsize;</div><div class='add'>+                continue;</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            if (sh.offset == 0 || (sh.offset + sh.size) &gt; fdlen) {</div><div class='add'>+                if (lib)</div><div class='add'>+                    lib-&gt;errorString = QLibrary::tr("'%1' is an invalid ELF object (%2)").arg(library)</div><div class='add'>+                                      .arg(QLatin1String("missing section data. This is not a library."));</div><div class='add'>+                return Corrupt;</div><div class='add'>+            }</div><div class='add'>+            *pos = sh.offset;</div><div class='add'>+            *sectionlen = sh.size - 1;</div><div class='add'>+            if (shnam[1] == 'q')</div><div class='add'>+                return Ok;</div><div class='add'>+        }</div><div class='add'>+        s += e_shentsize;</div><div class='add'>+    }</div><div class='add'>+    return NoQtSection;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+#endif // defined(Q_OF_ELF) &amp;&amp; defined(Q_CC_GNU)</div><div class='add'>+#endif // QT_NO_LIBRARY</div><div class='head'>diff --git a/src/corelib/plugin/qelfparser_p.h b/src/corelib/plugin/qelfparser_p.h<br/>new file mode 100644<br/>index 0000000..510ffed<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/qelfparser_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/plugin/qelfparser_p.h</a></div><div class='hunk'>@@ -0,0 +1,108 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QELFPARSER_P_H</div><div class='add'>+#define QELFPARSER_P_H</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+//  W A R N I N G</div><div class='add'>+//  -------------</div><div class='add'>+//</div><div class='add'>+// This file is not part of the Qt API.  It exists purely as an</div><div class='add'>+// implementation detail.  This header file may change from version to</div><div class='add'>+// version without notice, or even be removed.</div><div class='add'>+//</div><div class='add'>+// We mean it.</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;qendian.h&gt;</div><div class='add'>+#include &lt;qglobal.h&gt;</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_LIBRARY</div><div class='add'>+#if defined (Q_OF_ELF) &amp;&amp; defined(Q_CC_GNU)</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+class QString;</div><div class='add'>+class QLibraryPrivate;</div><div class='add'>+</div><div class='add'>+typedef quint16  qelfhalf_t;</div><div class='add'>+typedef quint32  qelfword_t;</div><div class='add'>+typedef quintptr qelfoff_t;</div><div class='add'>+typedef quintptr qelfaddr_t;</div><div class='add'>+</div><div class='add'>+class QElfParser</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    enum {Ok = 0, NotElf = 1, NoQtSection = 2, Corrupt = 3};</div><div class='add'>+    enum {ElfLittleEndian = 0, ElfBigEndian = 1};</div><div class='add'>+</div><div class='add'>+    struct ElfSectionHeader</div><div class='add'>+    {</div><div class='add'>+        qelfword_t name;</div><div class='add'>+        qelfword_t type;</div><div class='add'>+        qelfoff_t  offset;</div><div class='add'>+        qelfword_t size;</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+    int m_endian;</div><div class='add'>+    int m_bits;</div><div class='add'>+    int m_stringTableFileOffset;</div><div class='add'>+</div><div class='add'>+    template &lt;typename T&gt;</div><div class='add'>+    T read(const char *s)</div><div class='add'>+    {</div><div class='add'>+        if (m_endian == ElfBigEndian)</div><div class='add'>+            return qFromBigEndian&lt;T&gt;(reinterpret_cast&lt;const uchar *&gt;(s));</div><div class='add'>+        else</div><div class='add'>+            return qFromLittleEndian&lt;T&gt;(reinterpret_cast&lt;const uchar *&gt;(s));</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    const char *parseSectionHeader(const char* s, ElfSectionHeader *sh);</div><div class='add'>+    int parse(const char *m_s, ulong fdlen, const QString &amp;library, QLibraryPrivate *lib, long *pos, ulong *sectionlen);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+#endif // defined(Q_OF_ELF) &amp;&amp; defined(Q_CC_GNU)</div><div class='add'>+#endif // QT_NO_LIBRARY</div><div class='add'>+</div><div class='add'>+#endif // QELFPARSER_P_H</div><div class='head'>diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp<br/>index 6771fc6..c8831e5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/qfactoryloader.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/qfactoryloader.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/qfactoryloader.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/plugin/qfactoryloader.cpp</a></div><div class='hunk'>@@ -155,9 +155,11 @@ void QFactoryLoader::update()</div><div class='ctx'>                     continue;</div><div class='ctx'>                 }</div><div class='ctx'>                 QObject *instance = library-&gt;instance();</div><div class='del'>-                if (!instance)</div><div class='add'>+                if (!instance) {</div><div class='add'>+                    library-&gt;release();</div><div class='ctx'>                     // ignore plugins that have a valid signature but cannot be loaded.</div><div class='ctx'>                     continue;</div><div class='add'>+                }</div><div class='ctx'>                 QFactoryInterface *factory = qobject_cast&lt;QFactoryInterface*&gt;(instance);</div><div class='ctx'>                 if (instance &amp;&amp; factory &amp;&amp; instance-&gt;qt_metacast(d-&gt;iid))</div><div class='ctx'>                     keys = factory-&gt;keys();</div><div class='head'>diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp<br/>index 266c29e..314ccd7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/qlibrary.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/qlibrary.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/qlibrary.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/plugin/qlibrary.cpp</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+</div><div class='ctx'> /****************************************************************************</div><div class='ctx'> **</div><div class='ctx'> ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='hunk'>@@ -38,7 +39,6 @@</div><div class='ctx'> ** $QT_END_LICENSE$</div><div class='ctx'> **</div><div class='ctx'> ****************************************************************************/</div><div class='del'>-</div><div class='ctx'> #include "qplatformdefs.h"</div><div class='ctx'> #include "qlibrary.h"</div><div class='ctx'> </div><div class='hunk'>@@ -52,6 +52,7 @@</div><div class='ctx'> #include &lt;qmap.h&gt;</div><div class='ctx'> #include &lt;qsettings.h&gt;</div><div class='ctx'> #include &lt;qdatetime.h&gt;</div><div class='add'>+#include &lt;private/qcoreapplication_p.h&gt;</div><div class='ctx'> #ifdef Q_OS_MAC</div><div class='ctx'> #  include &lt;private/qcore_mac_p.h&gt;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -61,11 +62,10 @@</div><div class='ctx'> #include &lt;qdebug.h&gt;</div><div class='ctx'> #include &lt;qvector.h&gt;</div><div class='ctx'> #include &lt;qdir.h&gt;</div><div class='add'>+#include "qelfparser_p.h"</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='del'>-//#define QT_DEBUG_COMPONENT</div><div class='del'>-</div><div class='ctx'> #ifdef QT_NO_DEBUG</div><div class='ctx'> #  define QLIBRARY_AS_DEBUG false</div><div class='ctx'> #else</div><div class='hunk'>@@ -365,11 +365,35 @@ static bool qt_unix_query(const QString &amp;library, uint *version, bool *debug, QB</div><div class='ctx'>         fdlen = data.size();</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    // verify that the pattern is present in the plugin</div><div class='add'>+    /*</div><div class='add'>+       ELF binaries on GNU, have .qplugin sections.</div><div class='add'>+    */</div><div class='add'>+    long pos = 0;</div><div class='ctx'>     const char pattern[] = "pattern=QT_PLUGIN_VERIFICATION_DATA";</div><div class='ctx'>     const ulong plen = qstrlen(pattern);</div><div class='del'>-    long pos = qt_find_pattern(filedata, fdlen, pattern, plen);</div><div class='del'>-</div><div class='add'>+#if defined (Q_OF_ELF) &amp;&amp; defined(Q_CC_GNU)</div><div class='add'>+    int r = QElfParser().parse(filedata, fdlen, library, lib, &amp;pos, &amp;fdlen);</div><div class='add'>+    if (r == QElfParser::NoQtSection) {</div><div class='add'>+        if (pos &gt; 0) {</div><div class='add'>+            // find inside .rodata</div><div class='add'>+            long rel = qt_find_pattern(filedata + pos, fdlen, pattern, plen);</div><div class='add'>+            if (rel &lt; 0) {</div><div class='add'>+                pos = -1;</div><div class='add'>+            } else {</div><div class='add'>+                pos += rel;</div><div class='add'>+            }</div><div class='add'>+        } else {</div><div class='add'>+            pos = qt_find_pattern(filedata, fdlen, pattern, plen);</div><div class='add'>+        }</div><div class='add'>+    } else if (r != QElfParser::Ok) {</div><div class='add'>+        if (lib &amp;&amp; qt_debug_component()) {</div><div class='add'>+            qWarning("QElfParser: %s",qPrintable(lib-&gt;errorString));</div><div class='add'>+        }</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+#else</div><div class='add'>+    pos = qt_find_pattern(filedata, fdlen, pattern, plen);</div><div class='add'>+#endif // defined(Q_OF_ELF) &amp;&amp; defined(Q_CC_GNU)</div><div class='ctx'>     bool ret = false;</div><div class='ctx'>     if (pos &gt;= 0)</div><div class='ctx'>         ret = qt_parse_pattern(filedata + pos, version, debug, key);</div><div class='hunk'>@@ -385,13 +409,8 @@ static bool qt_unix_query(const QString &amp;library, uint *version, bool *debug, QB</div><div class='ctx'> typedef QMap&lt;QString, QLibraryPrivate*&gt; LibraryMap;</div><div class='ctx'> </div><div class='ctx'> struct LibraryData {</div><div class='del'>-    LibraryData() : settings(0) { }</div><div class='del'>-    ~LibraryData() {</div><div class='del'>-        delete settings;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    QSettings *settings;</div><div class='ctx'>     LibraryMap libraryMap;</div><div class='add'>+    QSet&lt;QLibraryPrivate*&gt; loadedLibs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> Q_GLOBAL_STATIC(LibraryData, libraryData)</div><div class='hunk'>@@ -443,7 +462,18 @@ bool QLibraryPrivate::load()</div><div class='ctx'>         return true;</div><div class='ctx'>     if (fileName.isEmpty())</div><div class='ctx'>         return false;</div><div class='del'>-    return load_sys();</div><div class='add'>+</div><div class='add'>+    bool ret = load_sys();</div><div class='add'>+    if (ret) {</div><div class='add'>+        //when loading a library we add a reference to it so that the QLibraryPrivate won't get deleted</div><div class='add'>+        //this allows to unload the library at a later time</div><div class='add'>+        if (LibraryData *lib = libraryData()) {</div><div class='add'>+            lib-&gt;loadedLibs += this;</div><div class='add'>+            libraryRefCount.ref();</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QLibraryPrivate::unload()</div><div class='hunk'>@@ -451,10 +481,16 @@ bool QLibraryPrivate::unload()</div><div class='ctx'>     if (!pHnd)</div><div class='ctx'>         return false;</div><div class='ctx'>     if (!libraryUnloadCount.deref()) { // only unload if ALL QLibrary instance wanted to</div><div class='del'>-        if (instance)</div><div class='del'>-            delete instance();</div><div class='add'>+        delete inst.data();</div><div class='ctx'>         if  (unload_sys()) {</div><div class='del'>-            instance = 0;</div><div class='add'>+            if (qt_debug_component())</div><div class='add'>+                qWarning() &lt;&lt; "QLibraryPrivate::unload succeeded on" &lt;&lt; fileName;</div><div class='add'>+            //when the library is unloaded, we release the reference on it so that 'this'</div><div class='add'>+            //can get deleted</div><div class='add'>+            if (LibraryData *lib = libraryData()) {</div><div class='add'>+                if (lib-&gt;loadedLibs.remove(this))</div><div class='add'>+                    libraryRefCount.deref();</div><div class='add'>+            }</div><div class='ctx'>             pHnd = 0;</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='hunk'>@@ -475,6 +511,8 @@ bool QLibraryPrivate::loadPlugin()</div><div class='ctx'>         libraryUnloadCount.ref();</div><div class='ctx'>         return true;</div><div class='ctx'>     }</div><div class='add'>+    if (pluginState == IsNotAPlugin)</div><div class='add'>+        return false;</div><div class='ctx'>     if (load()) {</div><div class='ctx'>         instance = (QtPluginInstanceFunction)resolve("qt_plugin_instance");</div><div class='ctx'> #if defined(Q_OS_SYMBIAN)</div><div class='hunk'>@@ -487,6 +525,9 @@ bool QLibraryPrivate::loadPlugin()</div><div class='ctx'> #endif</div><div class='ctx'>         return instance;</div><div class='ctx'>     }</div><div class='add'>+    if (qt_debug_component())</div><div class='add'>+        qWarning() &lt;&lt; "QLibraryPrivate::loadPlugin failed on" &lt;&lt; fileName &lt;&lt; ":" &lt;&lt; errorString;</div><div class='add'>+    pluginState = IsNotAPlugin;</div><div class='ctx'>     return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -496,7 +537,7 @@ bool QLibraryPrivate::loadPlugin()</div><div class='ctx'> </div><div class='ctx'>     \table</div><div class='ctx'>     \header \i Platform \i Valid suffixes</div><div class='del'>-    \row \i Windows     \i \c .dll</div><div class='add'>+    \row \i Windows     \i \c .dll, \c .DLL</div><div class='ctx'>     \row \i Unix/Linux  \i \c .so</div><div class='ctx'>     \row \i AIX  \i \c .a</div><div class='ctx'>     \row \i HP-UX       \i \c .sl, \c .so (HP-UXi)</div><div class='hunk'>@@ -509,7 +550,7 @@ bool QLibraryPrivate::loadPlugin()</div><div class='ctx'> bool QLibrary::isLibrary(const QString &amp;fileName)</div><div class='ctx'> {</div><div class='ctx'> #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)</div><div class='del'>-    return fileName.endsWith(QLatin1String(".dll"));</div><div class='add'>+    return fileName.endsWith(QLatin1String(".dll"), Qt::CaseInsensitive);</div><div class='ctx'> #elif defined(Q_OS_SYMBIAN)</div><div class='ctx'>     // Plugin stubs are also considered libraries in Symbian.</div><div class='ctx'>     return (fileName.endsWith(QLatin1String(".dll")) ||</div><div class='hunk'>@@ -571,6 +612,46 @@ bool QLibrary::isLibrary(const QString &amp;fileName)</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if defined (Q_OS_WIN) &amp;&amp; defined(_MSC_VER) &amp;&amp; _MSC_VER &gt;= 1400  &amp;&amp; !defined(Q_CC_INTEL)</div><div class='add'>+#define QT_USE_MS_STD_EXCEPTION 1</div><div class='add'>+const char* qt_try_versioninfo(void *pfn, bool *exceptionThrown)</div><div class='add'>+{</div><div class='add'>+    *exceptionThrown = false;</div><div class='add'>+    const char *szData = 0;</div><div class='add'>+    typedef const char * (*VerificationFunction)();</div><div class='add'>+    VerificationFunction func = reinterpret_cast&lt;VerificationFunction&gt;(pfn);</div><div class='add'>+    __try {</div><div class='add'>+        if(func)</div><div class='add'>+            szData =  func();</div><div class='add'>+    } __except(EXCEPTION_EXECUTE_HANDLER) {</div><div class='add'>+        *exceptionThrown = true;</div><div class='add'>+    }</div><div class='add'>+    return szData;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef Q_CC_BOR</div><div class='add'>+typedef const char * __stdcall (*QtPluginQueryVerificationDataFunction)();</div><div class='add'>+#else</div><div class='add'>+typedef const char * (*QtPluginQueryVerificationDataFunction)();</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+bool qt_get_verificationdata(QtPluginQueryVerificationDataFunction pfn, uint *qt_version, bool *debug, QByteArray *key, bool *exceptionThrown)</div><div class='add'>+{</div><div class='add'>+    *exceptionThrown = false;</div><div class='add'>+    const char *szData = 0;</div><div class='add'>+    if (!pfn)</div><div class='add'>+        return false;</div><div class='add'>+#ifdef QT_USE_MS_STD_EXCEPTION</div><div class='add'>+    szData = qt_try_versioninfo((void *)pfn, exceptionThrown);</div><div class='add'>+    if (*exceptionThrown)</div><div class='add'>+        return false;</div><div class='add'>+#else</div><div class='add'>+    szData = pfn();</div><div class='add'>+#endif</div><div class='add'>+    return qt_parse_pattern(szData, qt_version, debug, key);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> bool QLibraryPrivate::isPlugin(QSettings *settings)</div><div class='ctx'> {</div><div class='ctx'>     errorString.clear();</div><div class='hunk'>@@ -606,7 +687,7 @@ bool QLibraryPrivate::isPlugin(QSettings *settings)</div><div class='ctx'>                      .arg((QT_VERSION &amp; 0xff00) &gt;&gt; 8)</div><div class='ctx'>                      .arg(QLIBRARY_AS_DEBUG ? QLatin1String("debug") : QLatin1String("false"))</div><div class='ctx'>                      .arg(fileName);</div><div class='del'>-#ifdef Q_WS_MAC    </div><div class='add'>+#ifdef Q_WS_MAC</div><div class='ctx'>     // On Mac, add the application arch to the reg key in order to</div><div class='ctx'>     // cache plugin information separately for each arch. This prevents</div><div class='ctx'>     // Qt from wrongly caching plugin load failures when the archs</div><div class='hunk'>@@ -621,15 +702,11 @@ bool QLibraryPrivate::isPlugin(QSettings *settings)</div><div class='ctx'>     regkey += QLatin1String("-ppc");</div><div class='ctx'> #endif</div><div class='ctx'> #endif // Q_WS_MAC</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     QStringList reg;</div><div class='ctx'> #ifndef QT_NO_SETTINGS</div><div class='ctx'>     if (!settings) {</div><div class='del'>-        settings = libraryData()-&gt;settings;</div><div class='del'>-        if (!settings) {</div><div class='del'>-            settings = new QSettings(QSettings::UserScope, QLatin1String("Trolltech"));</div><div class='del'>-            libraryData()-&gt;settings = settings;</div><div class='del'>-        }</div><div class='add'>+        settings = QCoreApplicationPrivate::trolltechConf();</div><div class='ctx'>     }</div><div class='ctx'>     reg = settings-&gt;value(regkey).toStringList();</div><div class='ctx'> #endif</div><div class='hunk'>@@ -646,70 +723,82 @@ bool QLibraryPrivate::isPlugin(QSettings *settings)</div><div class='ctx'>         } else</div><div class='ctx'> #endif</div><div class='ctx'>         {</div><div class='del'>-            bool temporary_load = false;</div><div class='add'>+            bool retryLoadLibrary = false;    // Only used on Windows with MS compiler.(false in other cases)</div><div class='add'>+            do {</div><div class='add'>+                bool temporary_load = false;</div><div class='ctx'> #ifdef Q_OS_WIN</div><div class='del'>-            HMODULE hTempModule = 0;</div><div class='add'>+                HMODULE hTempModule = 0;</div><div class='ctx'> #endif</div><div class='del'>-            if (!pHnd) {</div><div class='add'>+                if (!pHnd) {</div><div class='ctx'> #ifdef Q_OS_WIN</div><div class='del'>-                //avoid 'Bad Image' message box</div><div class='del'>-                UINT oldmode = SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX);</div><div class='del'>-                hTempModule = ::LoadLibraryEx((wchar_t*)QDir::toNativeSeparators(fileName).utf16(), 0, DONT_RESOLVE_DLL_REFERENCES);</div><div class='del'>-                SetErrorMode(oldmode);</div><div class='add'>+                    DWORD dwFlags = (retryLoadLibrary) ? 0: DONT_RESOLVE_DLL_REFERENCES;</div><div class='add'>+                    //avoid 'Bad Image' message box</div><div class='add'>+                    UINT oldmode = SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX);</div><div class='add'>+                    hTempModule = ::LoadLibraryEx((wchar_t*)QDir::toNativeSeparators(fileName).utf16(), 0, dwFlags);</div><div class='add'>+                    SetErrorMode(oldmode);</div><div class='ctx'> #else</div><div class='ctx'> #  if defined(Q_OS_SYMBIAN)</div><div class='del'>-                //Guard against accidentally trying to load non-plugin libraries by making sure the stub exists</div><div class='del'>-                if (fileinfo.exists())</div><div class='add'>+                    //Guard against accidentally trying to load non-plugin libraries by making sure the stub exists</div><div class='add'>+                    if (fileinfo.exists())</div><div class='ctx'> #  endif</div><div class='del'>-                temporary_load =  load_sys();</div><div class='add'>+                        temporary_load =  load_sys();</div><div class='ctx'> #endif</div><div class='del'>-            }</div><div class='del'>-#  ifdef Q_CC_BOR</div><div class='del'>-            typedef const char * __stdcall (*QtPluginQueryVerificationDataFunction)();</div><div class='del'>-#  else</div><div class='del'>-            typedef const char * (*QtPluginQueryVerificationDataFunction)();</div><div class='del'>-#  endif</div><div class='add'>+                }</div><div class='ctx'> #ifdef Q_OS_WIN</div><div class='del'>-            QtPluginQueryVerificationDataFunction qtPluginQueryVerificationDataFunction = hTempModule</div><div class='del'>-                ? (QtPluginQueryVerificationDataFunction)</div><div class='add'>+                QtPluginQueryVerificationDataFunction qtPluginQueryVerificationDataFunction = hTempModule ? (QtPluginQueryVerificationDataFunction)</div><div class='ctx'> #ifdef Q_OS_WINCE</div><div class='del'>-                    ::GetProcAddress(hTempModule, L"qt_plugin_query_verification_data")</div><div class='add'>+                        ::GetProcAddress(hTempModule, L"qt_plugin_query_verification_data")</div><div class='ctx'> #else</div><div class='del'>-                    ::GetProcAddress(hTempModule, "qt_plugin_query_verification_data")</div><div class='add'>+                        ::GetProcAddress(hTempModule, "qt_plugin_query_verification_data")</div><div class='ctx'> #endif</div><div class='ctx'>                 : (QtPluginQueryVerificationDataFunction) resolve("qt_plugin_query_verification_data");</div><div class='ctx'> #else</div><div class='del'>-            QtPluginQueryVerificationDataFunction qtPluginQueryVerificationDataFunction = NULL;</div><div class='add'>+                QtPluginQueryVerificationDataFunction qtPluginQueryVerificationDataFunction = NULL;</div><div class='ctx'> #  if defined(Q_OS_SYMBIAN)</div><div class='del'>-            if (temporary_load) {</div><div class='del'>-                qtPluginQueryVerificationDataFunction = (QtPluginQueryVerificationDataFunction) resolve("qt_plugin_query_verification_data");</div><div class='del'>-                // If resolving with function name failed (i.e. not STDDLL), try resolving using known ordinal</div><div class='del'>-                if (!qtPluginQueryVerificationDataFunction)</div><div class='del'>-                    qtPluginQueryVerificationDataFunction = (QtPluginQueryVerificationDataFunction) resolve("1");</div><div class='del'>-            }</div><div class='add'>+                if (temporary_load) {</div><div class='add'>+                    qtPluginQueryVerificationDataFunction = (QtPluginQueryVerificationDataFunction) resolve("qt_plugin_query_verification_data");</div><div class='add'>+                    // If resolving with function name failed (i.e. not STDDLL), try resolving using known ordinal</div><div class='add'>+                    if (!qtPluginQueryVerificationDataFunction)</div><div class='add'>+                        qtPluginQueryVerificationDataFunction = (QtPluginQueryVerificationDataFunction) resolve("1");</div><div class='add'>+                }</div><div class='ctx'> #  else</div><div class='del'>-            qtPluginQueryVerificationDataFunction = (QtPluginQueryVerificationDataFunction) resolve("qt_plugin_query_verification_data");</div><div class='add'>+                qtPluginQueryVerificationDataFunction = (QtPluginQueryVerificationDataFunction) resolve("qt_plugin_query_verification_data");</div><div class='ctx'> #  endif</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-            if (!qtPluginQueryVerificationDataFunction</div><div class='del'>-                || !qt_parse_pattern(qtPluginQueryVerificationDataFunction(), &amp;qt_version, &amp;debug, &amp;key)) {</div><div class='del'>-                qt_version = 0;</div><div class='del'>-                key = "unknown";</div><div class='del'>-                if (temporary_load)</div><div class='del'>-                    unload_sys();</div><div class='del'>-            } else {</div><div class='del'>-                success = true;</div><div class='del'>-            }</div><div class='del'>-#ifdef Q_OS_WIN</div><div class='del'>-            if (hTempModule) {</div><div class='del'>-                BOOL ok = ::FreeLibrary(hTempModule);</div><div class='del'>-                if (ok) {</div><div class='del'>-                    hTempModule = 0;</div><div class='add'>+                bool exceptionThrown = false;</div><div class='add'>+                bool ret = qt_get_verificationdata(qtPluginQueryVerificationDataFunction,</div><div class='add'>+                                                   &amp;qt_version, &amp;debug, &amp;key, &amp;exceptionThrown);</div><div class='add'>+                if (!exceptionThrown) {</div><div class='add'>+                    if (!ret) {</div><div class='add'>+                        qt_version = 0;</div><div class='add'>+                        key = "unknown";</div><div class='add'>+                        if (temporary_load)</div><div class='add'>+                            unload_sys();</div><div class='add'>+                    } else {</div><div class='add'>+                        success = true;</div><div class='add'>+                    }</div><div class='add'>+                    retryLoadLibrary = false;</div><div class='add'>+                }</div><div class='add'>+#ifdef QT_USE_MS_STD_EXCEPTION</div><div class='add'>+                else {</div><div class='add'>+                    // An exception was thrown when calling qt_plugin_query_verification_data().</div><div class='add'>+                    // This usually happens when plugin is compiled with the /clr compiler flag,</div><div class='add'>+                    // &amp; will only work if the dependencies are loaded &amp; DLLMain() is called.</div><div class='add'>+                    // LoadLibrary() will do this, try once with this &amp; if it fails dont load.</div><div class='add'>+                    retryLoadLibrary = !retryLoadLibrary;</div><div class='ctx'>                 }</div><div class='add'>+#endif</div><div class='add'>+#ifdef Q_OS_WIN</div><div class='add'>+                if (hTempModule) {</div><div class='add'>+                    BOOL ok = ::FreeLibrary(hTempModule);</div><div class='add'>+                    if (ok) {</div><div class='add'>+                        hTempModule = 0;</div><div class='add'>+                    }</div><div class='ctx'> </div><div class='del'>-            }</div><div class='add'>+                }</div><div class='ctx'> #endif</div><div class='add'>+            } while(retryLoadLibrary);  // Will be 'false' in all cases other than when an</div><div class='add'>+                                        // exception is thrown(will happen only when using a MS compiler)</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         // Qt 4.5 compatibility: stl doesn't affect binary compatibility</div><div class='hunk'>@@ -759,6 +848,9 @@ bool QLibraryPrivate::isPlugin(QSettings *settings)</div><div class='ctx'> #ifdef QT_BUILD_KEY_COMPAT2</div><div class='ctx'>                &amp;&amp; key != QT_BUILD_KEY_COMPAT2</div><div class='ctx'> #endif</div><div class='add'>+#ifdef QT_BUILD_KEY_COMPAT3</div><div class='add'>+               &amp;&amp; key != QT_BUILD_KEY_COMPAT3</div><div class='add'>+#endif</div><div class='ctx'>                ) {</div><div class='ctx'>         if (qt_debug_component()) {</div><div class='ctx'>             qWarning("In %s:\n"</div><div class='hunk'>@@ -1039,7 +1131,7 @@ void QLibrary::setFileNameAndVersion(const QString &amp;fileName, const QString &amp;ver</div><div class='ctx'> */</div><div class='ctx'> void *QLibrary::resolve(const char *symbol)</div><div class='ctx'> {</div><div class='del'>-    if (!load())</div><div class='add'>+    if (!isLoaded() &amp;&amp; !load())</div><div class='ctx'>         return 0;</div><div class='ctx'>     return d-&gt;resolve(symbol);</div><div class='ctx'> }</div><div class='hunk'>@@ -1182,15 +1274,11 @@ QLibrary::LoadHints QLibrary::loadHints() const</div><div class='ctx'> /* Internal, for debugging */</div><div class='ctx'> bool qt_debug_component()</div><div class='ctx'> {</div><div class='del'>-#if defined(QT_DEBUG_COMPONENT)</div><div class='del'>-    return true;    //compatibility?</div><div class='del'>-#else</div><div class='ctx'>     static int debug_env = -1;</div><div class='ctx'>     if (debug_env == -1)</div><div class='ctx'>        debug_env = QT_PREPEND_NAMESPACE(qgetenv)("QT_DEBUG_PLUGINS").toInt();</div><div class='ctx'> </div><div class='ctx'>     return debug_env != 0;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/plugin/qlibrary_p.h b/src/corelib/plugin/qlibrary_p.h<br/>index 626ec9a..44860f4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/qlibrary_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/qlibrary_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/qlibrary_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/plugin/qlibrary_p.h</a></div><div class='hunk'>@@ -60,6 +60,7 @@</div><div class='ctx'> #include "QtCore/qpointer.h"</div><div class='ctx'> #include "QtCore/qstringlist.h"</div><div class='ctx'> #include "QtCore/qplugin.h"</div><div class='add'>+#include "QtCore/qsharedpointer.h"</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_LIBRARY</div><div class='ctx'> </div><div class='hunk'>@@ -90,6 +91,7 @@ public:</div><div class='ctx'> </div><div class='ctx'>     static QLibraryPrivate *findOrCreate(const QString &amp;fileName, const QString &amp;version = QString());</div><div class='ctx'> </div><div class='add'>+    QWeakPointer&lt;QObject&gt; inst;</div><div class='ctx'>     QtPluginInstanceFunction instance;</div><div class='ctx'>     uint qt_version;</div><div class='ctx'>     QString lastModified;</div><div class='head'>diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp<br/>index e9b3628..a5aadac 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/qlibrary_unix.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/qlibrary_unix.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/qlibrary_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/plugin/qlibrary_unix.cpp</a></div><div class='hunk'>@@ -56,9 +56,13 @@</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(Q_OS_VXWORKS) || defined (Q_OS_NACL)</div><div class='add'>+#define QT_NO_DYNAMIC_LIBRARY</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='del'>-#if !defined(QT_HPUX_LD) &amp;&amp; !defined(Q_OS_VXWORKS)</div><div class='add'>+#if !defined(QT_HPUX_LD) &amp;&amp; !defined(QT_NO_DYNAMIC_LIBRARY)</div><div class='ctx'> QT_BEGIN_INCLUDE_NAMESPACE</div><div class='ctx'> #include &lt;dlfcn.h&gt;</div><div class='ctx'> QT_END_INCLUDE_NAMESPACE</div><div class='hunk'>@@ -66,8 +70,8 @@ QT_END_INCLUDE_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> static QString qdlerror()</div><div class='ctx'> {</div><div class='del'>-#if defined(Q_OS_VXWORKS)</div><div class='del'>-    const char *err = "VxWorks does not support dynamic libraries.";</div><div class='add'>+#if defined(QT_NO_DYNAMIC_LIBRARY)</div><div class='add'>+    const char *err = "This platform does not support dynamic libraries.";</div><div class='ctx'> #elif !defined(QT_HPUX_LD)</div><div class='ctx'>     const char *err = dlerror();</div><div class='ctx'> #else</div><div class='hunk'>@@ -79,7 +83,7 @@ static QString qdlerror()</div><div class='ctx'> bool QLibraryPrivate::load_sys()</div><div class='ctx'> {</div><div class='ctx'>     QString attempt;</div><div class='del'>-#if !defined(Q_OS_VXWORKS)</div><div class='add'>+#if !defined(QT_NO_DYNAMIC_LIBRARY)</div><div class='ctx'>     QFileInfo fi(fileName);</div><div class='ctx'> </div><div class='ctx'> #if defined(Q_OS_SYMBIAN)</div><div class='hunk'>@@ -131,12 +135,12 @@ bool QLibraryPrivate::load_sys()</div><div class='ctx'>         } else {</div><div class='ctx'>             suffixes &lt;&lt; QLatin1String(".sl");</div><div class='ctx'>         }</div><div class='del'>-#elif defined(Q_OS_AIX)</div><div class='del'>-        suffixes &lt;&lt; ".a";</div><div class='del'>-</div><div class='ctx'> #elif defined(Q_OS_SYMBIAN)</div><div class='ctx'>         suffixes &lt;&lt; QLatin1String(".dll");</div><div class='ctx'> #else</div><div class='add'>+#ifdef Q_OS_AIX</div><div class='add'>+        suffixes &lt;&lt; ".a";</div><div class='add'>+#endif // Q_OS_AIX</div><div class='ctx'>         if (!fullVersion.isEmpty()) {</div><div class='ctx'>             suffixes &lt;&lt; QString::fromLatin1(".so.%1").arg(fullVersion);</div><div class='ctx'>         } else {</div><div class='hunk'>@@ -223,15 +227,19 @@ bool QLibraryPrivate::load_sys()</div><div class='ctx'> </div><div class='ctx'> #ifdef Q_OS_MAC</div><div class='ctx'>     if (!pHnd) {</div><div class='del'>-        if (CFBundleRef bundle = CFBundleGetBundleWithIdentifier(QCFString(fileName))) {</div><div class='add'>+        QByteArray utf8Bundle = fileName.toUtf8();</div><div class='add'>+        QCFType&lt;CFURLRef&gt; bundleUrl = CFURLCreateFromFileSystemRepresentation(NULL, reinterpret_cast&lt;const UInt8*&gt;(utf8Bundle.data()), utf8Bundle.length(), true);</div><div class='add'>+        QCFType&lt;CFBundleRef&gt; bundle = CFBundleCreate(NULL, bundleUrl);</div><div class='add'>+        if(bundle) {</div><div class='ctx'>             QCFType&lt;CFURLRef&gt; url = CFBundleCopyExecutableURL(bundle);</div><div class='del'>-            QCFString str = CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle);</div><div class='del'>-            pHnd = dlopen(QFile::encodeName(str), dlFlags);</div><div class='del'>-            attempt = str;</div><div class='add'>+            char executableFile[FILENAME_MAX];</div><div class='add'>+            CFURLGetFileSystemRepresentation(url, true, reinterpret_cast&lt;UInt8*&gt;(executableFile), FILENAME_MAX);</div><div class='add'>+            attempt = QString::fromUtf8(executableFile);</div><div class='add'>+            pHnd = dlopen(QFile::encodeName(attempt), dlFlags);</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> #endif</div><div class='del'>-#endif // Q_OS_VXWORKS</div><div class='add'>+#endif // QT_NO_DYNAMIC_LIBRARY</div><div class='ctx'>     if (!pHnd) {</div><div class='ctx'>         errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName).arg(qdlerror());</div><div class='ctx'>     }</div><div class='hunk'>@@ -244,7 +252,7 @@ bool QLibraryPrivate::load_sys()</div><div class='ctx'> </div><div class='ctx'> bool QLibraryPrivate::unload_sys()</div><div class='ctx'> {</div><div class='del'>-#if !defined(Q_OS_VXWORKS)</div><div class='add'>+#if !defined(QT_NO_DYNAMIC_LIBRARY)</div><div class='ctx'> #  if defined(QT_HPUX_LD)</div><div class='ctx'>     if (shl_unload((shl_t)pHnd)) {</div><div class='ctx'> #  else</div><div class='hunk'>@@ -278,7 +286,7 @@ void* QLibraryPrivate::resolve_sys(const char* symbol)</div><div class='ctx'>     void* address = 0;</div><div class='ctx'>     if (shl_findsym((shl_t*)&amp;pHnd, symbol, TYPE_UNDEFINED, &amp;address) &lt; 0)</div><div class='ctx'>         address = 0;</div><div class='del'>-#elif defined(Q_OS_VXWORKS)</div><div class='add'>+#elif defined (QT_NO_DYNAMIC_LIBRARY)</div><div class='ctx'>     void *address = 0;</div><div class='ctx'> #else</div><div class='ctx'>     void* address = dlsym(pHnd, symbol);</div><div class='head'>diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h<br/>index 6faa984..40e6e66 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/qplugin.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/qplugin.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/qplugin.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/plugin/qplugin.h</a></div><div class='hunk'>@@ -101,13 +101,17 @@ void Q_CORE_EXPORT qRegisterStaticPluginInstanceFunction(QtPluginInstanceFunctio</div><div class='ctx'> // NOTE: if you change pattern, you MUST change the pattern in</div><div class='ctx'> // qlibrary.cpp as well.  changing the pattern will break all</div><div class='ctx'> // backwards compatibility as well (no old plugins will be loaded).</div><div class='add'>+// QT5: should probably remove the entire pattern thing and do the section</div><div class='add'>+//      trick for all platforms. for now, keep it and fallback to scan for it.</div><div class='ctx'> #  ifdef QPLUGIN_DEBUG_STR</div><div class='ctx'> #    undef QPLUGIN_DEBUG_STR</div><div class='ctx'> #  endif</div><div class='ctx'> #  ifdef QT_NO_DEBUG</div><div class='ctx'> #    define QPLUGIN_DEBUG_STR "false"</div><div class='add'>+#    define QPLUGIN_SECTION_DEBUG_STR ""</div><div class='ctx'> #  else</div><div class='ctx'> #    define QPLUGIN_DEBUG_STR "true"</div><div class='add'>+#    define QPLUGIN_SECTION_DEBUG_STR ".debug"</div><div class='ctx'> #  endif</div><div class='ctx'> #  define Q_PLUGIN_VERIFICATION_DATA \</div><div class='ctx'>     static const char qt_plugin_verification_data[] = \</div><div class='hunk'>@@ -116,6 +120,13 @@ void Q_CORE_EXPORT qRegisterStaticPluginInstanceFunction(QtPluginInstanceFunctio</div><div class='ctx'>       "debug="QPLUGIN_DEBUG_STR"\n" \</div><div class='ctx'>       "buildkey="QT_BUILD_KEY;</div><div class='ctx'> </div><div class='add'>+#  if defined (Q_OF_ELF) &amp;&amp; defined (Q_CC_GNU)</div><div class='add'>+#  define Q_PLUGIN_VERIFICATION_SECTION \</div><div class='add'>+    __attribute__ ((section (".qtplugin"))) __attribute__((used))</div><div class='add'>+#  else</div><div class='add'>+#  define Q_PLUGIN_VERIFICATION_SECTION</div><div class='add'>+#  endif</div><div class='add'>+</div><div class='ctx'> #  if defined (Q_OS_WIN32) &amp;&amp; defined(Q_CC_BOR)</div><div class='ctx'> #     define Q_STANDARD_CALL __stdcall</div><div class='ctx'> #  else</div><div class='hunk'>@@ -123,7 +134,7 @@ void Q_CORE_EXPORT qRegisterStaticPluginInstanceFunction(QtPluginInstanceFunctio</div><div class='ctx'> #  endif</div><div class='ctx'> </div><div class='ctx'> #  define Q_EXPORT_PLUGIN2(PLUGIN, PLUGINCLASS)      \</div><div class='del'>-            Q_PLUGIN_VERIFICATION_DATA \</div><div class='add'>+            Q_PLUGIN_VERIFICATION_SECTION Q_PLUGIN_VERIFICATION_DATA \</div><div class='ctx'>             Q_EXTERN_C Q_DECL_EXPORT \</div><div class='ctx'>             const char * Q_STANDARD_CALL qt_plugin_query_verification_data() \</div><div class='ctx'>             { return qt_plugin_verification_data; } \</div><div class='head'>diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp<br/>index 1310a95..bbb64e4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/qpluginloader.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/qpluginloader.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/qpluginloader.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/plugin/qpluginloader.cpp</a></div><div class='hunk'>@@ -198,11 +198,11 @@ QPluginLoader::~QPluginLoader()</div><div class='ctx'> */</div><div class='ctx'> QObject *QPluginLoader::instance()</div><div class='ctx'> {</div><div class='del'>-    if (!load())</div><div class='add'>+    if (!isLoaded() &amp;&amp; !load())</div><div class='ctx'>         return 0;</div><div class='del'>-    if (d-&gt;instance)</div><div class='del'>-        return d-&gt;instance();</div><div class='del'>-    return 0;</div><div class='add'>+    if (!d-&gt;inst &amp;&amp; d-&gt;instance)</div><div class='add'>+        d-&gt;inst = d-&gt;instance();</div><div class='add'>+    return d-&gt;inst.data();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='head'>diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp<br/>index 9cd353a..eb29e6e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/quuid.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/quuid.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/quuid.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/plugin/quuid.cpp</a></div><div class='hunk'>@@ -42,9 +42,96 @@</div><div class='ctx'> #include "quuid.h"</div><div class='ctx'> </div><div class='ctx'> #include "qdatastream.h"</div><div class='add'>+#include "qendian.h"</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='add'>+#ifndef QT_NO_QUUID_STRING</div><div class='add'>+template &lt;class Char, class Integral&gt;</div><div class='add'>+void _q_toHex(Char *&amp;dst, Integral value)</div><div class='add'>+{</div><div class='add'>+    static const char digits[] = "0123456789abcdef";</div><div class='add'>+</div><div class='add'>+    value = qToBigEndian(value);</div><div class='add'>+</div><div class='add'>+    const char* p = reinterpret_cast&lt;const char*&gt;(&amp;value);</div><div class='add'>+</div><div class='add'>+    for (uint i = 0; i &lt; sizeof(Integral); ++i, dst += 2) {</div><div class='add'>+        uint j = (p[i] &gt;&gt; 4) &amp; 0xf;</div><div class='add'>+        dst[0] = Char(digits[j]);</div><div class='add'>+        j = p[i] &amp; 0xf;</div><div class='add'>+        dst[1] = Char(digits[j]);</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;class Char, class Integral&gt;</div><div class='add'>+bool _q_fromHex(const Char *&amp;src, Integral &amp;value)</div><div class='add'>+{</div><div class='add'>+    value = 0;</div><div class='add'>+</div><div class='add'>+    for (uint i = 0; i &lt; sizeof(Integral) * 2; ++i) {</div><div class='add'>+        int ch = *src++;</div><div class='add'>+        int tmp;</div><div class='add'>+        if (ch &gt;= '0' &amp;&amp; ch &lt;= '9')</div><div class='add'>+            tmp = ch - '0';</div><div class='add'>+        else if (ch &gt;= 'a' &amp;&amp; ch &lt;= 'f')</div><div class='add'>+            tmp = ch - 'a' + 10;</div><div class='add'>+        else if (ch &gt;= 'A' &amp;&amp; ch &lt;= 'F')</div><div class='add'>+            tmp = ch - 'A' + 10;</div><div class='add'>+        else</div><div class='add'>+            return false;</div><div class='add'>+</div><div class='add'>+        value = value * 16 + tmp;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;class Char&gt;</div><div class='add'>+void _q_uuidToHex(Char *&amp;dst, const uint &amp;d1, const ushort &amp;d2, const ushort &amp;d3, const uchar (&amp;d4)[8])</div><div class='add'>+{</div><div class='add'>+    *dst++ = Char('{');</div><div class='add'>+    _q_toHex(dst, d1);</div><div class='add'>+    *dst++ = Char('-');</div><div class='add'>+    _q_toHex(dst, d2);</div><div class='add'>+    *dst++ = Char('-');</div><div class='add'>+    _q_toHex(dst, d3);</div><div class='add'>+    *dst++ = Char('-');</div><div class='add'>+    for (int i = 0; i &lt; 2; i++)</div><div class='add'>+        _q_toHex(dst, d4[i]);</div><div class='add'>+    *dst++ = Char('-');</div><div class='add'>+    for (int i = 2; i &lt; 8; i++)</div><div class='add'>+        _q_toHex(dst, d4[i]);</div><div class='add'>+    *dst = Char('}');</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;class Char&gt;</div><div class='add'>+bool _q_uuidFromHex(const Char *&amp;src, uint &amp;d1, ushort &amp;d2, ushort &amp;d3, uchar (&amp;d4)[8])</div><div class='add'>+{</div><div class='add'>+    if (*src == Char('{'))</div><div class='add'>+        src++;</div><div class='add'>+    if (!_q_fromHex(src, d1)</div><div class='add'>+            || *src++ != Char('-')</div><div class='add'>+            || !_q_fromHex(src, d2)</div><div class='add'>+            || *src++ != Char('-')</div><div class='add'>+            || !_q_fromHex(src, d3)</div><div class='add'>+            || *src++ != Char('-')</div><div class='add'>+            || !_q_fromHex(src, d4[0])</div><div class='add'>+            || !_q_fromHex(src, d4[1])</div><div class='add'>+            || *src++ != Char('-')</div><div class='add'>+            || !_q_fromHex(src, d4[2])</div><div class='add'>+            || !_q_fromHex(src, d4[3])</div><div class='add'>+            || !_q_fromHex(src, d4[4])</div><div class='add'>+            || !_q_fromHex(src, d4[5])</div><div class='add'>+            || !_q_fromHex(src, d4[6])</div><div class='add'>+            || !_q_fromHex(src, d4[7])) {</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /*!</div><div class='ctx'>     \class QUuid</div><div class='ctx'>     \brief The QUuid class stores a Universally Unique Identifier (UUID).</div><div class='hunk'>@@ -231,60 +318,112 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'> */</div><div class='ctx'> QUuid::QUuid(const QString &amp;text)</div><div class='ctx'> {</div><div class='del'>-    bool ok;</div><div class='del'>-    if (text.isEmpty()) {</div><div class='add'>+    if (text.length() &lt; 36) {</div><div class='ctx'>         *this = QUuid();</div><div class='ctx'>         return;</div><div class='ctx'>     }</div><div class='del'>-    QString temp = text.toUpper();</div><div class='del'>-    if (temp[0] != QLatin1Char('{'))</div><div class='del'>-        temp = QLatin1Char('{') + text;</div><div class='del'>-    if (text[(int)text.length()-1] != QLatin1Char('}'))</div><div class='del'>-        temp += QLatin1Char('}');</div><div class='del'>-</div><div class='del'>-    data1 = temp.mid(1, 8).toULongLong(&amp;ok, 16);</div><div class='del'>-    if (!ok) {</div><div class='add'>+</div><div class='add'>+    const ushort *data = reinterpret_cast&lt;const ushort *&gt;(text.unicode());</div><div class='add'>+</div><div class='add'>+    if (*data == '{' &amp;&amp; text.length() &lt; 37) {</div><div class='ctx'>         *this = QUuid();</div><div class='ctx'>         return;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    data2 = temp.mid(10, 4).toUInt(&amp;ok, 16);</div><div class='del'>-    if (!ok) {</div><div class='add'>+    if (!_q_uuidFromHex(data, data1, data2, data3, data4)) {</div><div class='ctx'>         *this = QUuid();</div><div class='ctx'>         return;</div><div class='ctx'>     }</div><div class='del'>-    data3 = temp.mid(15, 4).toUInt(&amp;ok, 16);</div><div class='del'>-    if (!ok) {</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \internal</div><div class='add'>+*/</div><div class='add'>+QUuid::QUuid(const char *text)</div><div class='add'>+{</div><div class='add'>+    if (!text) {</div><div class='ctx'>         *this = QUuid();</div><div class='ctx'>         return;</div><div class='ctx'>     }</div><div class='del'>-    data4[0] = temp.mid(20, 2).toUInt(&amp;ok, 16);</div><div class='del'>-    if (!ok) {</div><div class='add'>+</div><div class='add'>+    if (!_q_uuidFromHex(text, data1, data2, data3, data4)) {</div><div class='ctx'>         *this = QUuid();</div><div class='ctx'>         return;</div><div class='ctx'>     }</div><div class='del'>-    data4[1] = temp.mid(22, 2).toUInt(&amp;ok, 16);</div><div class='del'>-    if (!ok) {</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+  Creates a QUuid object from the QByteArray \a text, which must be</div><div class='add'>+  formatted as five hex fields separated by '-', e.g.,</div><div class='add'>+  "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}" where 'x' is a hex</div><div class='add'>+  digit. The curly braces shown here are optional, but it is normal to</div><div class='add'>+  include them. If the conversion fails, a null UUID is created.  See</div><div class='add'>+  toByteArray() for an explanation of how the five hex fields map to the</div><div class='add'>+  public data members in QUuid.</div><div class='add'>+</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    \sa toByteArray(), QUuid()</div><div class='add'>+*/</div><div class='add'>+QUuid::QUuid(const QByteArray &amp;text)</div><div class='add'>+{</div><div class='add'>+    if (text.length() &lt; 36) {</div><div class='ctx'>         *this = QUuid();</div><div class='ctx'>         return;</div><div class='ctx'>     }</div><div class='del'>-    for (int i = 2; i&lt;8; i++) {</div><div class='del'>-        data4[i] = temp.mid(25 + (i-2)*2, 2).toUShort(&amp;ok, 16);</div><div class='del'>-        if (!ok) {</div><div class='del'>-            *this = QUuid();</div><div class='del'>-            return;</div><div class='del'>-        }</div><div class='add'>+</div><div class='add'>+    const char *data = text.constData();</div><div class='add'>+</div><div class='add'>+    if (*data == '{' &amp;&amp; text.length() &lt; 37) {</div><div class='add'>+        *this = QUuid();</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (!_q_uuidFromHex(data, data1, data2, data3, data4)) {</div><div class='add'>+        *this = QUuid();</div><div class='add'>+        return;</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='del'>-    \internal</div><div class='add'>+  Creates a QUuid object from the binary representation of the UUID, as</div><div class='add'>+  specified by RFC 4122 section 4.1.2. See toRfc4122() for a further</div><div class='add'>+  explanation of the order of bytes required.</div><div class='add'>+</div><div class='add'>+  The byte array accepted is NOT a human readable format.</div><div class='add'>+</div><div class='add'>+  If the conversion fails, a null UUID is created.</div><div class='add'>+</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    \sa toRfc4122(), QUuid()</div><div class='ctx'> */</div><div class='del'>-QUuid::QUuid(const char *text)</div><div class='add'>+QUuid QUuid::fromRfc4122(const QByteArray &amp;bytes)</div><div class='ctx'> {</div><div class='del'>-    *this = QUuid(QString::fromLatin1(text));</div><div class='add'>+    if (bytes.isEmpty() || bytes.length() != 16)</div><div class='add'>+        return QUuid();</div><div class='add'>+</div><div class='add'>+    uint d1;</div><div class='add'>+    ushort d2, d3;</div><div class='add'>+    uchar d4[8];</div><div class='add'>+</div><div class='add'>+    const uchar *data = reinterpret_cast&lt;const uchar *&gt;(bytes.constData());</div><div class='add'>+</div><div class='add'>+    d1 = qFromBigEndian&lt;quint32&gt;(data);</div><div class='add'>+    data += sizeof(quint32);</div><div class='add'>+    d2 = qFromBigEndian&lt;quint16&gt;(data);</div><div class='add'>+    data += sizeof(quint16);</div><div class='add'>+    d3 = qFromBigEndian&lt;quint16&gt;(data);</div><div class='add'>+    data += sizeof(quint16);</div><div class='add'>+</div><div class='add'>+    for (int i = 0; i &lt; 8; ++i) {</div><div class='add'>+        d4[i] = *(data);</div><div class='add'>+        data++;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return QUuid(d1, d2, d3, d4[0], d4[1], d4[2], d4[3], d4[4], d4[5], d4[6], d4[7]);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     \fn bool QUuid::operator==(const QUuid &amp;other) const</div><div class='hunk'>@@ -308,11 +447,6 @@ QUuid::QUuid(const char *text)</div><div class='ctx'>     \sa toString()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-static QString uuidhex(uint data, int digits)</div><div class='del'>-{</div><div class='del'>-    return QString::number(data, 16).rightJustified(digits, QLatin1Char('0'));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*!</div><div class='ctx'>     Returns the string representation of this QUuid. The string is</div><div class='ctx'>     formatted as five hex fields separated by '-' and enclosed in</div><div class='hunk'>@@ -349,25 +483,114 @@ static QString uuidhex(uint data, int digits)</div><div class='ctx'> */</div><div class='ctx'> QString QUuid::toString() const</div><div class='ctx'> {</div><div class='del'>-    QString result;</div><div class='del'>-</div><div class='del'>-    QChar dash = QLatin1Char('-');</div><div class='del'>-    result = QLatin1Char('{') + uuidhex(data1,8);</div><div class='del'>-    result += dash;</div><div class='del'>-    result += uuidhex(data2,4);</div><div class='del'>-    result += dash;</div><div class='del'>-    result += uuidhex(data3,4);</div><div class='del'>-    result += dash;</div><div class='del'>-    result += uuidhex(data4[0],2);</div><div class='del'>-    result += uuidhex(data4[1],2);</div><div class='del'>-    result += dash;</div><div class='del'>-    for (int i = 2; i &lt; 8; i++)</div><div class='del'>-        result += uuidhex(data4[i],2);</div><div class='add'>+    QString result(38, Qt::Uninitialized);</div><div class='add'>+    ushort *data = (ushort *)result.unicode();</div><div class='add'>+</div><div class='add'>+    _q_uuidToHex(data, data1, data2, data3, data4);</div><div class='ctx'> </div><div class='del'>-    return result + QLatin1Char('}');</div><div class='add'>+    return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    Returns the binary representation of this QUuid. The byte array is</div><div class='add'>+    formatted as five hex fields separated by '-' and enclosed in</div><div class='add'>+    curly braces, i.e., "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}" where</div><div class='add'>+    'x' is a hex digit.  From left to right, the five hex fields are</div><div class='add'>+    obtained from the four public data members in QUuid as follows:</div><div class='add'>+</div><div class='add'>+    \table</div><div class='add'>+    \header</div><div class='add'>+    \o Field #</div><div class='add'>+    \o Source</div><div class='add'>+</div><div class='add'>+    \row</div><div class='add'>+    \o 1</div><div class='add'>+    \o data1</div><div class='add'>+</div><div class='add'>+    \row</div><div class='add'>+    \o 2</div><div class='add'>+    \o data2</div><div class='add'>+</div><div class='add'>+    \row</div><div class='add'>+    \o 3</div><div class='add'>+    \o data3</div><div class='add'>+</div><div class='add'>+    \row</div><div class='add'>+    \o 4</div><div class='add'>+    \o data4[0] .. data4[1]</div><div class='add'>+</div><div class='add'>+    \row</div><div class='add'>+    \o 5</div><div class='add'>+    \o data4[2] .. data4[7]</div><div class='add'>+</div><div class='add'>+    \endtable</div><div class='add'>+</div><div class='add'>+    \since 4.8</div><div class='add'>+*/</div><div class='add'>+QByteArray QUuid::toByteArray() const</div><div class='add'>+{</div><div class='add'>+    QByteArray result(38, Qt::Uninitialized);</div><div class='add'>+    char *data = result.data();</div><div class='add'>+</div><div class='add'>+    _q_uuidToHex(data, data1, data2, data3, data4);</div><div class='add'>+</div><div class='add'>+    return result;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+/*!</div><div class='add'>+    Returns the binary representation of this QUuid. The byte array is in big</div><div class='add'>+    endian format, and formatted according to RFC 4122, section 4.1.2 -</div><div class='add'>+    "Layout and byte order".</div><div class='add'>+</div><div class='add'>+    The order is as follows:</div><div class='add'>+</div><div class='add'>+    \table</div><div class='add'>+    \header</div><div class='add'>+    \o Field #</div><div class='add'>+    \o Source</div><div class='add'>+</div><div class='add'>+    \row</div><div class='add'>+    \o 1</div><div class='add'>+    \o data1</div><div class='add'>+</div><div class='add'>+    \row</div><div class='add'>+    \o 2</div><div class='add'>+    \o data2</div><div class='add'>+</div><div class='add'>+    \row</div><div class='add'>+    \o 3</div><div class='add'>+    \o data3</div><div class='add'>+</div><div class='add'>+    \row</div><div class='add'>+    \o 4</div><div class='add'>+    \o data4[0] .. data4[7]</div><div class='add'>+</div><div class='add'>+    \endtable</div><div class='add'>+</div><div class='add'>+    \since 4.8</div><div class='add'>+*/</div><div class='add'>+QByteArray QUuid::toRfc4122() const</div><div class='add'>+{</div><div class='add'>+    // we know how many bytes a UUID has, I hope :)</div><div class='add'>+    QByteArray bytes(16, Qt::Uninitialized);</div><div class='add'>+    uchar *data = reinterpret_cast&lt;uchar*&gt;(bytes.data());</div><div class='add'>+</div><div class='add'>+    qToBigEndian(data1, data);</div><div class='add'>+    data += sizeof(quint32);</div><div class='add'>+    qToBigEndian(data2, data);</div><div class='add'>+    data += sizeof(quint16);</div><div class='add'>+    qToBigEndian(data3, data);</div><div class='add'>+    data += sizeof(quint16);</div><div class='add'>+</div><div class='add'>+    for (int i = 0; i &lt; 8; ++i) {</div><div class='add'>+        *(data) = data4[i];</div><div class='add'>+        data++;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return bytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifndef QT_NO_DATASTREAM</div><div class='ctx'> /*!</div><div class='ctx'>     \relates QUuid</div><div class='hunk'>@@ -375,11 +598,30 @@ QString QUuid::toString() const</div><div class='ctx'> */</div><div class='ctx'> QDataStream &amp;operator&lt;&lt;(QDataStream &amp;s, const QUuid &amp;id)</div><div class='ctx'> {</div><div class='del'>-    s &lt;&lt; (quint32)id.data1;</div><div class='del'>-    s &lt;&lt; (quint16)id.data2;</div><div class='del'>-    s &lt;&lt; (quint16)id.data3;</div><div class='del'>-    for (int i = 0; i &lt; 8; i++)</div><div class='del'>-        s &lt;&lt; (quint8)id.data4[i];</div><div class='add'>+    QByteArray bytes;</div><div class='add'>+    if (s.byteOrder() == QDataStream::BigEndian) {</div><div class='add'>+        bytes = id.toRfc4122();</div><div class='add'>+    } else {</div><div class='add'>+        // we know how many bytes a UUID has, I hope :)</div><div class='add'>+        bytes = QByteArray(16, Qt::Uninitialized);</div><div class='add'>+        uchar *data = reinterpret_cast&lt;uchar*&gt;(bytes.data());</div><div class='add'>+</div><div class='add'>+        qToLittleEndian(id.data1, data);</div><div class='add'>+        data += sizeof(quint32);</div><div class='add'>+        qToLittleEndian(id.data2, data);</div><div class='add'>+        data += sizeof(quint16);</div><div class='add'>+        qToLittleEndian(id.data3, data);</div><div class='add'>+        data += sizeof(quint16);</div><div class='add'>+</div><div class='add'>+        for (int i = 0; i &lt; 8; ++i) {</div><div class='add'>+            *(data) = id.data4[i];</div><div class='add'>+            data++;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (s.writeRawData(bytes.data(), 16) != 16) {</div><div class='add'>+        s.setStatus(QDataStream::WriteFailed);</div><div class='add'>+    }</div><div class='ctx'>     return s;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -389,19 +631,30 @@ QDataStream &amp;operator&lt;&lt;(QDataStream &amp;s, const QUuid &amp;id)</div><div class='ctx'> */</div><div class='ctx'> QDataStream &amp;operator&gt;&gt;(QDataStream &amp;s, QUuid &amp;id)</div><div class='ctx'> {</div><div class='del'>-    quint32 u32;</div><div class='del'>-    quint16 u16;</div><div class='del'>-    quint8 u8;</div><div class='del'>-    s &gt;&gt; u32;</div><div class='del'>-    id.data1 = u32;</div><div class='del'>-    s &gt;&gt; u16;</div><div class='del'>-    id.data2 = u16;</div><div class='del'>-    s &gt;&gt; u16;</div><div class='del'>-    id.data3 = u16;</div><div class='del'>-    for (int i = 0; i &lt; 8; i++) {</div><div class='del'>-        s &gt;&gt; u8;</div><div class='del'>-        id.data4[i] = u8;</div><div class='add'>+    QByteArray bytes(16, Qt::Uninitialized);</div><div class='add'>+    if (s.readRawData(bytes.data(), 16) != 16) {</div><div class='add'>+        s.setStatus(QDataStream::ReadPastEnd);</div><div class='add'>+        return s;</div><div class='ctx'>     }</div><div class='add'>+</div><div class='add'>+    if (s.byteOrder() == QDataStream::BigEndian) {</div><div class='add'>+        id = QUuid::fromRfc4122(bytes);</div><div class='add'>+    } else {</div><div class='add'>+        const uchar *data = reinterpret_cast&lt;const uchar *&gt;(bytes.constData());</div><div class='add'>+</div><div class='add'>+        id.data1 = qFromLittleEndian&lt;quint32&gt;(data);</div><div class='add'>+        data += sizeof(quint32);</div><div class='add'>+        id.data2 = qFromLittleEndian&lt;quint16&gt;(data);</div><div class='add'>+        data += sizeof(quint16);</div><div class='add'>+        id.data3 = qFromLittleEndian&lt;quint16&gt;(data);</div><div class='add'>+        data += sizeof(quint16);</div><div class='add'>+</div><div class='add'>+        for (int i = 0; i &lt; 8; ++i) {</div><div class='add'>+            id.data4[i] = *(data);</div><div class='add'>+            data++;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     return s;</div><div class='ctx'> }</div><div class='ctx'> #endif // QT_NO_DATASTREAM</div><div class='head'>diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h<br/>index f42ca91..832d5bc 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/quuid.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/plugin/quuid.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/plugin/quuid.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/plugin/quuid.h</a></div><div class='hunk'>@@ -108,8 +108,12 @@ struct Q_CORE_EXPORT QUuid</div><div class='ctx'>     QUuid(const QString &amp;);</div><div class='ctx'>     QUuid(const char *);</div><div class='ctx'>     QString toString() const;</div><div class='del'>-    operator QString() const { return toString(); }</div><div class='add'>+    operator QString() const { return toString(); } // ### Qt5 remove</div><div class='add'>+    QUuid(const QByteArray &amp;);</div><div class='add'>+    QByteArray toByteArray() const;</div><div class='ctx'> #endif</div><div class='add'>+    QByteArray toRfc4122() const;</div><div class='add'>+    static QUuid fromRfc4122(const QByteArray &amp;);</div><div class='ctx'>     bool isNull() const;</div><div class='ctx'> </div><div class='ctx'>     bool operator==(const QUuid &amp;orig) const</div><div class='head'>diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp<br/>index d2fef8e..fcaebff 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/statemachine/qstatemachine.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/statemachine/qstatemachine.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/statemachine/qstatemachine.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/statemachine/qstatemachine.cpp</a></div><div class='hunk'>@@ -793,7 +793,7 @@ void QStateMachinePrivate::applyProperties(const QList&lt;QAbstractTransition*&gt; &amp;tr</div><div class='ctx'>         }</div><div class='ctx'>         // We require that at least one animation is valid.</div><div class='ctx'>         // ### generalize</div><div class='del'>-        QList&lt;QVariantAnimation*&gt; variantAnims = qFindChildren&lt;QVariantAnimation*&gt;(anim);</div><div class='add'>+        QList&lt;QVariantAnimation*&gt; variantAnims = anim-&gt;findChildren&lt;QVariantAnimation*&gt;();</div><div class='ctx'>         if (QVariantAnimation *va = qobject_cast&lt;QVariantAnimation*&gt;(anim))</div><div class='ctx'>             variantAnims.append(va);</div><div class='ctx'>         </div><div class='hunk'>@@ -1178,7 +1178,7 @@ void QStateMachinePrivate::removeStartState()</div><div class='ctx'> void QStateMachinePrivate::clearHistory()</div><div class='ctx'> {</div><div class='ctx'>     Q_Q(QStateMachine);</div><div class='del'>-    QList&lt;QHistoryState*&gt; historyStates = qFindChildren&lt;QHistoryState*&gt;(q);</div><div class='add'>+    QList&lt;QHistoryState*&gt; historyStates = q-&gt;findChildren&lt;QHistoryState*&gt;();</div><div class='ctx'>     for (int i = 0; i &lt; historyStates.size(); ++i) {</div><div class='ctx'>         QHistoryState *h = historyStates.at(i);</div><div class='ctx'>         QHistoryStatePrivate::get(h)-&gt;configuration.clear();</div><div class='hunk'>@@ -1245,9 +1245,7 @@ void QStateMachinePrivate::_q_process()</div><div class='ctx'> #endif</div><div class='ctx'>     while (processing) {</div><div class='ctx'>         if (stop) {</div><div class='del'>-            stop = false;</div><div class='ctx'>             processing = false;</div><div class='del'>-            stopProcessingReason = Stopped;</div><div class='ctx'>             break;</div><div class='ctx'>         }</div><div class='ctx'>         QSet&lt;QAbstractTransition*&gt; enabledTransitions;</div><div class='hunk'>@@ -1299,6 +1297,11 @@ void QStateMachinePrivate::_q_process()</div><div class='ctx'> #ifdef QSTATEMACHINE_DEBUG</div><div class='ctx'>     qDebug() &lt;&lt; q &lt;&lt; ": finished the event processing loop";</div><div class='ctx'> #endif</div><div class='add'>+    if (stop) {</div><div class='add'>+        stop = false;</div><div class='add'>+        stopProcessingReason = Stopped;</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     switch (stopProcessingReason) {</div><div class='ctx'>     case EventQueueEmpty:</div><div class='ctx'>         break;</div><div class='hunk'>@@ -1389,7 +1392,7 @@ void QStateMachinePrivate::cancelAllDelayedEvents()</div><div class='ctx'>     delayedEvents.clear();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-namespace {</div><div class='add'>+namespace _QStateMachine_Internal{</div><div class='ctx'> </div><div class='ctx'> class GoToStateTransition : public QAbstractTransition</div><div class='ctx'> {</div><div class='hunk'>@@ -1403,7 +1406,9 @@ protected:</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> } // namespace</div><div class='del'>-</div><div class='add'>+// mingw compiler tries to export QObject::findChild&lt;GoToStateTransition&gt;(),</div><div class='add'>+// which doesn't work if its in an anonymous namespace.</div><div class='add'>+using namespace _QStateMachine_Internal;</div><div class='ctx'> /*!</div><div class='ctx'>   \internal</div><div class='ctx'> </div><div class='hunk'>@@ -1440,7 +1445,7 @@ void QStateMachinePrivate::goToState(QAbstractState *targetState)</div><div class='ctx'>     Q_ASSERT(sourceState != 0);</div><div class='ctx'>     // Reuse previous GoToStateTransition in case of several calls to</div><div class='ctx'>     // goToState() in a row.</div><div class='del'>-    GoToStateTransition *trans = qFindChild&lt;GoToStateTransition*&gt;(sourceState);</div><div class='add'>+    GoToStateTransition *trans = sourceState-&gt;findChild&lt;GoToStateTransition*&gt;();</div><div class='ctx'>     if (!trans) {</div><div class='ctx'>         trans = new GoToStateTransition(targetState);</div><div class='ctx'>         sourceState-&gt;addTransition(trans);</div><div class='hunk'>@@ -1562,7 +1567,7 @@ void QStateMachinePrivate::unregisterAllTransitions()</div><div class='ctx'> {</div><div class='ctx'>     Q_Q(QStateMachine);</div><div class='ctx'>     {</div><div class='del'>-        QList&lt;QSignalTransition*&gt; transitions = qFindChildren&lt;QSignalTransition*&gt;(rootState());</div><div class='add'>+        QList&lt;QSignalTransition*&gt; transitions = rootState()-&gt;findChildren&lt;QSignalTransition*&gt;();</div><div class='ctx'>         for (int i = 0; i &lt; transitions.size(); ++i) {</div><div class='ctx'>             QSignalTransition *t = transitions.at(i);</div><div class='ctx'>             if (t-&gt;machine() == q)</div><div class='hunk'>@@ -1570,7 +1575,7 @@ void QStateMachinePrivate::unregisterAllTransitions()</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'>     {</div><div class='del'>-        QList&lt;QEventTransition*&gt; transitions = qFindChildren&lt;QEventTransition*&gt;(rootState());</div><div class='add'>+        QList&lt;QEventTransition*&gt; transitions = rootState()-&gt;findChildren&lt;QEventTransition*&gt;();</div><div class='ctx'>         for (int i = 0; i &lt; transitions.size(); ++i) {</div><div class='ctx'>             QEventTransition *t = transitions.at(i);</div><div class='ctx'>             if (t-&gt;machine() == q)</div><div class='head'>diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp<br/>index fcc3ef6..3e3bf8f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qmutex.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qmutex.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qmutex.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qmutex.cpp</a></div><div class='hunk'>@@ -45,6 +45,7 @@</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_THREAD</div><div class='ctx'> #include "qatomic.h"</div><div class='add'>+#include "qelapsedtimer.h"</div><div class='ctx'> #include "qthread.h"</div><div class='ctx'> #include "qmutex_p.h"</div><div class='ctx'> </div><div class='hunk'>@@ -130,7 +131,7 @@ QMutex::QMutex(RecursionMode mode)</div><div class='ctx'>     \warning Destroying a locked mutex may result in undefined behavior.</div><div class='ctx'> */</div><div class='ctx'> QMutex::~QMutex()</div><div class='del'>-{ delete d; }</div><div class='add'>+{ delete static_cast&lt;QMutexPrivate *&gt;(d); }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     Locks the mutex. If another thread has locked the mutex then this</div><div class='hunk'>@@ -146,6 +147,7 @@ QMutex::~QMutex()</div><div class='ctx'> */</div><div class='ctx'> void QMutex::lock()</div><div class='ctx'> {</div><div class='add'>+    QMutexPrivate *d = static_cast&lt;QMutexPrivate *&gt;(this-&gt;d);</div><div class='ctx'>     Qt::HANDLE self;</div><div class='ctx'> </div><div class='ctx'>     if (d-&gt;recursive) {</div><div class='hunk'>@@ -156,20 +158,12 @@ void QMutex::lock()</div><div class='ctx'>             return;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-        bool isLocked = d-&gt;contenders.fetchAndAddAcquire(1) == 0;</div><div class='add'>+        bool isLocked = d-&gt;contenders.testAndSetAcquire(0, 1);</div><div class='ctx'>         if (!isLocked) {</div><div class='del'>-#ifndef QT_NO_DEBUG</div><div class='del'>-            if (d-&gt;owner == self)</div><div class='del'>-                qWarning() &lt;&lt; "QMutex::lock: Deadlock detected in thread" &lt;&lt; d-&gt;owner;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'>             // didn't get the lock, wait for it</div><div class='ctx'>             isLocked = d-&gt;wait();</div><div class='ctx'>             Q_ASSERT_X(isLocked, "QMutex::lock",</div><div class='ctx'>                        "Internal error, infinite wait has timed out.");</div><div class='del'>-</div><div class='del'>-            // don't need to wait for the lock anymore</div><div class='del'>-            d-&gt;contenders.deref();</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         d-&gt;owner = self;</div><div class='hunk'>@@ -178,54 +172,10 @@ void QMutex::lock()</div><div class='ctx'>         return;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-#ifndef QT_NO_DEBUG</div><div class='del'>-    self = QThread::currentThreadId();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-    bool isLocked = d-&gt;contenders == 0 &amp;&amp; d-&gt;contenders.testAndSetAcquire(0, 1);</div><div class='add'>+    bool isLocked = d-&gt;contenders.testAndSetAcquire(0, 1);</div><div class='ctx'>     if (!isLocked) {</div><div class='del'>-        int spinCount = 0;</div><div class='del'>-        int lastSpinCount = d-&gt;lastSpinCount;</div><div class='del'>-</div><div class='del'>-        enum { AdditionalSpins = 20, SpinCountPenalizationDivisor = 4 };</div><div class='del'>-        const int maximumSpinCount = lastSpinCount + AdditionalSpins;</div><div class='del'>-</div><div class='del'>-        do {</div><div class='del'>-            if (spinCount++ &gt; maximumSpinCount) {</div><div class='del'>-                // puts("spinning useless, sleeping");</div><div class='del'>-                isLocked = d-&gt;contenders.fetchAndAddAcquire(1) == 0;</div><div class='del'>-                if (!isLocked) {</div><div class='del'>-#ifndef QT_NO_DEBUG</div><div class='del'>-                    if (d-&gt;owner == self)</div><div class='del'>-                        qWarning() &lt;&lt; "QMutex::lock: Deadlock detected in thread" &lt;&lt; d-&gt;owner;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-                    // didn't get the lock, wait for it</div><div class='del'>-                    isLocked = d-&gt;wait();</div><div class='del'>-                    Q_ASSERT_X(isLocked, "QMutex::lock",</div><div class='del'>-                               "Internal error, infinite wait has timed out.");</div><div class='del'>-</div><div class='del'>-                    // don't need to wait for the lock anymore</div><div class='del'>-                    d-&gt;contenders.deref();</div><div class='del'>-                }</div><div class='del'>-                // decrease the lastSpinCount since we didn't actually get the lock by spinning</div><div class='del'>-                spinCount = -d-&gt;lastSpinCount / SpinCountPenalizationDivisor;</div><div class='del'>-                break;</div><div class='del'>-            }</div><div class='del'>-</div><div class='del'>-            isLocked = d-&gt;contenders == 0 &amp;&amp; d-&gt;contenders.testAndSetAcquire(0, 1);</div><div class='del'>-        } while (!isLocked);</div><div class='del'>-</div><div class='del'>-        // adjust the last spin lock count</div><div class='del'>-        lastSpinCount = d-&gt;lastSpinCount;</div><div class='del'>-        d-&gt;lastSpinCount = spinCount &gt;= 0</div><div class='del'>-                           ? qMax(lastSpinCount, spinCount)</div><div class='del'>-                           : lastSpinCount + spinCount;</div><div class='add'>+        lockInternal();</div><div class='ctx'>     }</div><div class='del'>-</div><div class='del'>-#ifndef QT_NO_DEBUG</div><div class='del'>-    d-&gt;owner = self;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -247,6 +197,7 @@ void QMutex::lock()</div><div class='ctx'> */</div><div class='ctx'> bool QMutex::tryLock()</div><div class='ctx'> {</div><div class='add'>+    QMutexPrivate *d = static_cast&lt;QMutexPrivate *&gt;(this-&gt;d);</div><div class='ctx'>     Qt::HANDLE self;</div><div class='ctx'> </div><div class='ctx'>     if (d-&gt;recursive) {</div><div class='hunk'>@@ -257,7 +208,7 @@ bool QMutex::tryLock()</div><div class='ctx'>             return true;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-        bool isLocked = d-&gt;contenders == 0 &amp;&amp; d-&gt;contenders.testAndSetAcquire(0, 1);</div><div class='add'>+        bool isLocked = d-&gt;contenders.testAndSetAcquire(0, 1);</div><div class='ctx'>         if (!isLocked) {</div><div class='ctx'>             // some other thread has the mutex locked, or we tried to</div><div class='ctx'>             // recursively lock an non-recursive mutex</div><div class='hunk'>@@ -270,19 +221,7 @@ bool QMutex::tryLock()</div><div class='ctx'>         return isLocked;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-#ifndef QT_NO_DEBUG</div><div class='del'>-    self = QThread::currentThreadId();</div><div class='del'>-#endif</div><div class='del'>-    bool isLocked = d-&gt;contenders == 0 &amp;&amp; d-&gt;contenders.testAndSetAcquire(0, 1);</div><div class='del'>-    if (!isLocked) {</div><div class='del'>-        // some other thread has the mutex locked, or we tried to</div><div class='del'>-        // recursively lock an non-recursive mutex</div><div class='del'>-        return isLocked;</div><div class='del'>-    }</div><div class='del'>-#ifndef QT_NO_DEBUG</div><div class='del'>-    d-&gt;owner = self;</div><div class='del'>-#endif</div><div class='del'>-    return isLocked;</div><div class='add'>+    return d-&gt;contenders.testAndSetAcquire(0, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*! \overload</div><div class='hunk'>@@ -310,6 +249,7 @@ bool QMutex::tryLock()</div><div class='ctx'> */</div><div class='ctx'> bool QMutex::tryLock(int timeout)</div><div class='ctx'> {</div><div class='add'>+    QMutexPrivate *d = static_cast&lt;QMutexPrivate *&gt;(this-&gt;d);</div><div class='ctx'>     Qt::HANDLE self;</div><div class='ctx'> </div><div class='ctx'>     if (d-&gt;recursive) {</div><div class='hunk'>@@ -320,13 +260,10 @@ bool QMutex::tryLock(int timeout)</div><div class='ctx'>             return true;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='del'>-        bool isLocked = d-&gt;contenders.fetchAndAddAcquire(1) == 0;</div><div class='add'>+        bool isLocked = d-&gt;contenders.testAndSetAcquire(0, 1);</div><div class='ctx'>         if (!isLocked) {</div><div class='ctx'>             // didn't get the lock, wait for it</div><div class='ctx'>             isLocked = d-&gt;wait(timeout);</div><div class='del'>-</div><div class='del'>-            // don't need to wait for the lock anymore</div><div class='del'>-            d-&gt;contenders.deref();</div><div class='ctx'>             if (!isLocked)</div><div class='ctx'>                 return false;</div><div class='ctx'>         }</div><div class='hunk'>@@ -337,23 +274,9 @@ bool QMutex::tryLock(int timeout)</div><div class='ctx'>         return true;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-#ifndef QT_NO_DEBUG</div><div class='del'>-    self = QThread::currentThreadId();</div><div class='del'>-#endif</div><div class='del'>-    bool isLocked = d-&gt;contenders.fetchAndAddAcquire(1) == 0;</div><div class='del'>-    if (!isLocked) {</div><div class='del'>-        // didn't get the lock, wait for it</div><div class='del'>-        isLocked = d-&gt;wait(timeout);</div><div class='del'>-</div><div class='del'>-        // don't need to wait for the lock anymore</div><div class='del'>-        d-&gt;contenders.deref();</div><div class='del'>-        if (!isLocked)</div><div class='del'>-            return false;</div><div class='del'>-    }</div><div class='del'>-#ifndef QT_NO_DEBUG</div><div class='del'>-    d-&gt;owner = self;</div><div class='del'>-#endif</div><div class='del'>-    return true;</div><div class='add'>+    return (d-&gt;contenders.testAndSetAcquire(0, 1)</div><div class='add'>+            // didn't get the lock, wait for it</div><div class='add'>+            || d-&gt;wait(timeout));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -366,9 +289,7 @@ bool QMutex::tryLock(int timeout)</div><div class='ctx'> */</div><div class='ctx'> void QMutex::unlock()</div><div class='ctx'> {</div><div class='del'>-    Q_ASSERT_X(d-&gt;owner == QThread::currentThreadId(), "QMutex::unlock()",</div><div class='del'>-               "A mutex must be unlocked in the same thread that locked it.");</div><div class='del'>-</div><div class='add'>+    QMutexPrivate *d = static_cast&lt;QMutexPrivate *&gt;(this-&gt;d);</div><div class='ctx'>     if (d-&gt;recursive) {</div><div class='ctx'>         if (!--d-&gt;count) {</div><div class='ctx'>             d-&gt;owner = 0;</div><div class='hunk'>@@ -376,9 +297,6 @@ void QMutex::unlock()</div><div class='ctx'>                 d-&gt;wakeUp();</div><div class='ctx'>         }</div><div class='ctx'>     } else {</div><div class='del'>-#ifndef QT_NO_DEBUG</div><div class='del'>-        d-&gt;owner = 0;</div><div class='del'>-#endif</div><div class='ctx'>         if (!d-&gt;contenders.testAndSetRelease(1, 0))</div><div class='ctx'>             d-&gt;wakeUp();</div><div class='ctx'>     }</div><div class='hunk'>@@ -506,6 +424,92 @@ void QMutex::unlock()</div><div class='ctx'>     Use the constructor that takes a RecursionMode parameter instead.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+/*!</div><div class='add'>+    \internal helper for lockInline()</div><div class='add'>+ */</div><div class='add'>+void QMutex::lockInternal()</div><div class='add'>+{</div><div class='add'>+    QMutexPrivate *d = static_cast&lt;QMutexPrivate *&gt;(this-&gt;d);</div><div class='add'>+</div><div class='add'>+    if (QThread::idealThreadCount() == 1) {</div><div class='add'>+        // don't spin on single cpu machines</div><div class='add'>+        bool isLocked = d-&gt;wait();</div><div class='add'>+        Q_ASSERT_X(isLocked, "QMutex::lock",</div><div class='add'>+                   "Internal error, infinite wait has timed out.");</div><div class='add'>+        Q_UNUSED(isLocked);</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    QElapsedTimer elapsedTimer;</div><div class='add'>+    elapsedTimer.start();</div><div class='add'>+    do {</div><div class='add'>+        qint64 spinTime = elapsedTimer.nsecsElapsed();</div><div class='add'>+        if (spinTime &gt; d-&gt;maximumSpinTime) {</div><div class='add'>+            // didn't get the lock, wait for it, since we're not going to gain anything by spinning more</div><div class='add'>+            elapsedTimer.start();</div><div class='add'>+            bool isLocked = d-&gt;wait();</div><div class='add'>+            Q_ASSERT_X(isLocked, "QMutex::lock",</div><div class='add'>+                       "Internal error, infinite wait has timed out.");</div><div class='add'>+            Q_UNUSED(isLocked);</div><div class='add'>+</div><div class='add'>+            qint64 maximumSpinTime = d-&gt;maximumSpinTime;</div><div class='add'>+            qint64 averageWaitTime = d-&gt;averageWaitTime;</div><div class='add'>+            qint64 actualWaitTime = elapsedTimer.nsecsElapsed();</div><div class='add'>+            if (actualWaitTime &lt; (QMutexPrivate::MaximumSpinTimeThreshold * 3 / 2)) {</div><div class='add'>+                // measure the wait times</div><div class='add'>+                averageWaitTime = d-&gt;averageWaitTime = qMin((averageWaitTime + actualWaitTime) / 2, qint64(QMutexPrivate::MaximumSpinTimeThreshold));</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+            // adjust the spin count when spinning does not benefit contention performance</div><div class='add'>+            if ((spinTime + actualWaitTime) - qint64(QMutexPrivate::MaximumSpinTimeThreshold) &gt;= qint64(QMutexPrivate::MaximumSpinTimeThreshold)) {</div><div class='add'>+                // long waits, stop spinning</div><div class='add'>+                d-&gt;maximumSpinTime = 0;</div><div class='add'>+            } else {</div><div class='add'>+                // allow spinning if wait times decrease, but never spin more than the average wait time (otherwise we may perform worse)</div><div class='add'>+                d-&gt;maximumSpinTime = qBound(qint64(averageWaitTime * 3 / 2), maximumSpinTime / 2, qint64(QMutexPrivate::MaximumSpinTimeThreshold));</div><div class='add'>+            }</div><div class='add'>+            return;</div><div class='add'>+        }</div><div class='add'>+        // be a good citizen... yielding lets something else run if there is something to run, but may also relieve memory pressure if not</div><div class='add'>+        QThread::yieldCurrentThread();</div><div class='add'>+    } while (d-&gt;contenders != 0 || !d-&gt;contenders.testAndSetAcquire(0, 1));</div><div class='add'>+</div><div class='add'>+    // spinning is working, do not change the spin time (unless we are using much less time than allowed to spin)</div><div class='add'>+    qint64 maximumSpinTime = d-&gt;maximumSpinTime;</div><div class='add'>+    qint64 spinTime = elapsedTimer.nsecsElapsed();</div><div class='add'>+    if (spinTime &lt; maximumSpinTime / 2) {</div><div class='add'>+        // we are using much less time than we need, adjust the limit</div><div class='add'>+        d-&gt;maximumSpinTime = qBound(qint64(d-&gt;averageWaitTime * 3 / 2), maximumSpinTime / 2, qint64(QMutexPrivate::MaximumSpinTimeThreshold));</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \internal</div><div class='add'>+*/</div><div class='add'>+void QMutex::unlockInternal()</div><div class='add'>+{</div><div class='add'>+    static_cast&lt;QMutexPrivate *&gt;(d)-&gt;wakeUp();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+   \fn QMutex::lockInline()</div><div class='add'>+   \internal</div><div class='add'>+   inline version of QMutex::lock()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+   \fn QMutex::unlockInline()</div><div class='add'>+   \internal</div><div class='add'>+   inline version of QMutex::unlock()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+   \fn QMutex::tryLockInline()</div><div class='add'>+   \internal</div><div class='add'>+   inline version of QMutex::tryLock()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> #endif // QT_NO_THREAD</div><div class='head'>diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h<br/>index 9ab49ea..0f3a72d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qmutex.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qmutex.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qmutex.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qmutex.h</a></div><div class='hunk'>@@ -43,6 +43,7 @@</div><div class='ctx'> #define QMUTEX_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;QtCore/qglobal.h&gt;</div><div class='add'>+#include &lt;QtCore/qatomic.h&gt;</div><div class='ctx'> #include &lt;new&gt;</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_HEADER</div><div class='hunk'>@@ -53,7 +54,8 @@ QT_MODULE(Core)</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_THREAD</div><div class='ctx'> </div><div class='del'>-class QMutexPrivate;</div><div class='add'>+class QAtomicInt;</div><div class='add'>+class QMutexData;</div><div class='ctx'> </div><div class='ctx'> class Q_CORE_EXPORT QMutex</div><div class='ctx'> {</div><div class='hunk'>@@ -66,10 +68,13 @@ public:</div><div class='ctx'>     explicit QMutex(RecursionMode mode = NonRecursive);</div><div class='ctx'>     ~QMutex();</div><div class='ctx'> </div><div class='del'>-    void lock();</div><div class='del'>-    bool tryLock();</div><div class='add'>+    void lock();     //### Qt5: make inline;</div><div class='add'>+    inline void lockInline();</div><div class='add'>+    bool tryLock();  //### Qt5: make inline;</div><div class='ctx'>     bool tryLock(int timeout);</div><div class='del'>-    void unlock();</div><div class='add'>+    inline bool tryLockInline();</div><div class='add'>+    void unlock();     //### Qt5: make inline;</div><div class='add'>+    inline void unlockInline();</div><div class='ctx'> </div><div class='ctx'> #if defined(QT3_SUPPORT)</div><div class='ctx'>     inline QT3_SUPPORT bool locked()</div><div class='hunk'>@@ -86,9 +91,11 @@ public:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> private:</div><div class='add'>+    void lockInternal();</div><div class='add'>+    void unlockInternal();</div><div class='ctx'>     Q_DISABLE_COPY(QMutex)</div><div class='ctx'> </div><div class='del'>-    QMutexPrivate *d;</div><div class='add'>+    QMutexData *d;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> class Q_CORE_EXPORT QMutexLocker</div><div class='hunk'>@@ -99,7 +106,7 @@ public:</div><div class='ctx'>         Q_ASSERT_X((reinterpret_cast&lt;quintptr&gt;(m) &amp; quintptr(1u)) == quintptr(0),</div><div class='ctx'>                    "QMutexLocker", "QMutex pointer is misaligned");</div><div class='ctx'>         if (m) {</div><div class='del'>-            m-&gt;lock();</div><div class='add'>+            m-&gt;lockInline();</div><div class='ctx'>             val = reinterpret_cast&lt;quintptr&gt;(m) | quintptr(1u);</div><div class='ctx'>         } else {</div><div class='ctx'>             val = 0;</div><div class='hunk'>@@ -111,7 +118,7 @@ public:</div><div class='ctx'>     {</div><div class='ctx'>         if ((val &amp; quintptr(1u)) == quintptr(1u)) {</div><div class='ctx'>             val &amp;= ~quintptr(1u);</div><div class='del'>-            mutex()-&gt;unlock();</div><div class='add'>+            mutex()-&gt;unlockInline();</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='hunk'>@@ -119,7 +126,7 @@ public:</div><div class='ctx'>     {</div><div class='ctx'>         if (val) {</div><div class='ctx'>             if ((val &amp; quintptr(1u)) == quintptr(0u)) {</div><div class='del'>-                mutex()-&gt;lock();</div><div class='add'>+                mutex()-&gt;lockInline();</div><div class='ctx'>                 val |= quintptr(1u);</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='hunk'>@@ -145,6 +152,53 @@ private:</div><div class='ctx'>     quintptr val;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+class QMutexData</div><div class='add'>+{</div><div class='add'>+    public:</div><div class='add'>+        QAtomicInt contenders;</div><div class='add'>+        const uint recursive : 1;</div><div class='add'>+        uint reserved : 31;</div><div class='add'>+    protected:</div><div class='add'>+        QMutexData(QMutex::RecursionMode mode);</div><div class='add'>+        ~QMutexData();</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef QT_NO_DEBUG</div><div class='add'>+inline void QMutex::unlockInline()</div><div class='add'>+{</div><div class='add'>+    if (d-&gt;recursive) {</div><div class='add'>+        unlock();</div><div class='add'>+    } else if (!d-&gt;contenders.testAndSetRelease(1, 0)) {</div><div class='add'>+        unlockInternal();</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline bool QMutex::tryLockInline()</div><div class='add'>+{</div><div class='add'>+    if (d-&gt;recursive) {</div><div class='add'>+        return tryLock();</div><div class='add'>+    } else {</div><div class='add'>+        return d-&gt;contenders.testAndSetAcquire(0, 1);</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+inline void QMutex::lockInline()</div><div class='add'>+{</div><div class='add'>+    if (d-&gt;recursive) {</div><div class='add'>+        lock();</div><div class='add'>+    } else if(!tryLockInline()) {</div><div class='add'>+        lockInternal();</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+#else // QT_NO_DEBUG</div><div class='add'>+//in debug we do not use inline calls in order to allow debugging tools</div><div class='add'>+// to hook the mutex locking functions.</div><div class='add'>+inline void QMutex::unlockInline() { unlock(); }</div><div class='add'>+inline bool QMutex::tryLockInline() { return tryLock(); }</div><div class='add'>+inline void QMutex::lockInline() { lock(); }</div><div class='add'>+#endif // QT_NO_DEBUG</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #else // QT_NO_THREAD</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -157,9 +211,11 @@ public:</div><div class='ctx'>     inline ~QMutex() {}</div><div class='ctx'> </div><div class='ctx'>     static inline void lock() {}</div><div class='del'>-    static inline bool tryLock() { return true; }</div><div class='del'>-    static inline bool tryLock(int timeout) { Q_UNUSED(timeout); return true; }</div><div class='del'>-    static void unlock() {}</div><div class='add'>+    static inline void lockInline() {}</div><div class='add'>+    static inline bool tryLock(int timeout = 0) { Q_UNUSED(timeout); return true; }</div><div class='add'>+    static inline bool tryLockInline() { return true; }</div><div class='add'>+    static inline void unlock() {}</div><div class='add'>+    static inline void unlockInline() {}</div><div class='ctx'> </div><div class='ctx'> #if defined(QT3_SUPPORT)</div><div class='ctx'>     static inline QT3_SUPPORT bool locked() { return false; }</div><div class='head'>diff --git a/src/corelib/thread/qmutex_p.h b/src/corelib/thread/qmutex_p.h<br/>index a7613dd..a9923c4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qmutex_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qmutex_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qmutex_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qmutex_p.h</a></div><div class='hunk'>@@ -56,33 +56,52 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;QtCore/qglobal.h&gt;</div><div class='ctx'> #include &lt;QtCore/qnamespace.h&gt;</div><div class='add'>+#include &lt;QtCore/qmutex.h&gt;</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_MAC)</div><div class='add'>+# include &lt;mach/semaphore.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_SYMBIAN)</div><div class='add'>+# include &lt;e32std.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='del'>-class QMutexPrivate {</div><div class='add'>+class QMutexPrivate : public QMutexData {</div><div class='ctx'> public:</div><div class='ctx'>     QMutexPrivate(QMutex::RecursionMode mode);</div><div class='ctx'>     ~QMutexPrivate();</div><div class='ctx'> </div><div class='del'>-    ulong self();</div><div class='ctx'>     bool wait(int timeout = -1);</div><div class='ctx'>     void wakeUp();</div><div class='ctx'> </div><div class='del'>-    const bool recursive;</div><div class='del'>-    QAtomicInt contenders;</div><div class='del'>-    volatile int lastSpinCount;</div><div class='add'>+    // 1ms = 1000000ns</div><div class='add'>+    enum { MaximumSpinTimeThreshold = 1000000 };</div><div class='add'>+    volatile qint64 maximumSpinTime;</div><div class='add'>+    volatile qint64 averageWaitTime;</div><div class='ctx'>     Qt::HANDLE owner;</div><div class='ctx'>     uint count;</div><div class='ctx'> </div><div class='del'>-#if defined(Q_OS_UNIX)</div><div class='add'>+#if defined(Q_OS_MAC)</div><div class='add'>+    semaphore_t mach_semaphore;</div><div class='add'>+#elif defined(Q_OS_UNIX) &amp;&amp; !defined(Q_OS_LINUX) &amp;&amp; !defined(Q_OS_SYMBIAN)</div><div class='ctx'>     volatile bool wakeup;</div><div class='ctx'>     pthread_mutex_t mutex;</div><div class='ctx'>     pthread_cond_t cond;</div><div class='ctx'> #elif defined(Q_OS_WIN32) || defined(Q_OS_WINCE)</div><div class='ctx'>     HANDLE event;</div><div class='add'>+#elif defined(Q_OS_SYMBIAN)</div><div class='add'>+    RSemaphore lock;</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+inline QMutexData::QMutexData(QMutex::RecursionMode mode)</div><div class='add'>+    : recursive(mode == QMutex::Recursive)</div><div class='add'>+{}</div><div class='add'>+</div><div class='add'>+inline QMutexData::~QMutexData() {}</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> #endif // QMUTEX_P_H</div><div class='head'>diff --git a/src/corelib/thread/qmutex_symbian.cpp b/src/corelib/thread/qmutex_symbian.cpp<br/>new file mode 100644<br/>index 0000000..deac3f9<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qmutex_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qmutex_symbian.cpp</a></div><div class='hunk'>@@ -0,0 +1,101 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qplatformdefs.h"</div><div class='add'>+#include "qmutex.h"</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_THREAD</div><div class='add'>+#include "qatomic.h"</div><div class='add'>+#include "qelapsedtimer.h"</div><div class='add'>+#include "qthread.h"</div><div class='add'>+#include "qmutex_p.h"</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+QMutexPrivate::QMutexPrivate(QMutex::RecursionMode mode)</div><div class='add'>+    : QMutexData(mode), maximumSpinTime(MaximumSpinTimeThreshold), averageWaitTime(0), owner(0), count(0)</div><div class='add'>+{</div><div class='add'>+    int r = lock.CreateLocal(0);</div><div class='add'>+    if (r != KErrNone)</div><div class='add'>+        qWarning("QMutex: failed to create lock, error %d", r);</div><div class='add'>+    qt_symbian_throwIfError(r);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QMutexPrivate::~QMutexPrivate()</div><div class='add'>+{</div><div class='add'>+    lock.Close();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QMutexPrivate::wait(int timeout)</div><div class='add'>+{</div><div class='add'>+    if (contenders.fetchAndAddAcquire(1) == 0) {</div><div class='add'>+        // lock acquired without waiting</div><div class='add'>+        return true;</div><div class='add'>+    }</div><div class='add'>+    int r = KErrTimedOut;</div><div class='add'>+    if (timeout &lt; 0) {</div><div class='add'>+        lock.Wait();</div><div class='add'>+        r = KErrNone;</div><div class='add'>+    } else {</div><div class='add'>+        // Symbian lock waits are specified in microseconds.</div><div class='add'>+        // The wait is therefore chunked.</div><div class='add'>+        // KErrNone indicates success, KErrGeneral and KErrArgument are real fails, anything else is a timeout</div><div class='add'>+        do {</div><div class='add'>+            int waitTime = qMin(KMaxTInt / 1000, timeout);</div><div class='add'>+            timeout -= waitTime;</div><div class='add'>+            // Symbian undocumented feature - 0us means no timeout! Use a minimum of 1</div><div class='add'>+            r = lock.Wait(qMax(1, waitTime * 1000));</div><div class='add'>+        } while (r != KErrNone &amp;&amp; r != KErrGeneral &amp;&amp; r != KErrArgument &amp;&amp; timeout &gt; 0);</div><div class='add'>+    }</div><div class='add'>+    bool returnValue = (r == KErrNone);</div><div class='add'>+    contenders.deref();</div><div class='add'>+    return returnValue;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QMutexPrivate::wakeUp()</div><div class='add'>+{</div><div class='add'>+    lock.Signal();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+#endif // QT_NO_THREAD</div><div class='head'>diff --git a/src/corelib/thread/qmutex_unix.cpp b/src/corelib/thread/qmutex_unix.cpp<br/>index ebe7548..12bc795 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qmutex_unix.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qmutex_unix.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qmutex_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qmutex_unix.cpp</a></div><div class='hunk'>@@ -53,30 +53,119 @@</div><div class='ctx'> #undef wakeup</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(Q_OS_MAC)</div><div class='add'>+# include &lt;mach/mach.h&gt;</div><div class='add'>+# include &lt;mach/task.h&gt;</div><div class='add'>+#elif defined(Q_OS_LINUX)</div><div class='add'>+# include &lt;linux/futex.h&gt;</div><div class='add'>+# include &lt;sys/syscall.h&gt;</div><div class='add'>+# include &lt;unistd.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='add'>+#if !defined(Q_OS_MAC) &amp;&amp; !defined(Q_OS_LINUX)</div><div class='ctx'> static void report_error(int code, const char *where, const char *what)</div><div class='ctx'> {</div><div class='ctx'>     if (code != 0)</div><div class='ctx'>         qWarning("%s: %s failure: %s", where, what, qPrintable(qt_error_string(code)));</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> QMutexPrivate::QMutexPrivate(QMutex::RecursionMode mode)</div><div class='del'>-    : recursive(mode == QMutex::Recursive), contenders(0), lastSpinCount(0), owner(0), count(0), wakeup(false)</div><div class='add'>+    : QMutexData(mode), maximumSpinTime(MaximumSpinTimeThreshold), averageWaitTime(0), owner(0), count(0)</div><div class='ctx'> {</div><div class='add'>+#if defined(Q_OS_MAC)</div><div class='add'>+    kern_return_t r = semaphore_create(mach_task_self(), &amp;mach_semaphore, SYNC_POLICY_FIFO, 0);</div><div class='add'>+    if (r != KERN_SUCCESS)</div><div class='add'>+        qWarning("QMutex: failed to create semaphore, error %d", r);</div><div class='add'>+#elif !defined(Q_OS_LINUX)</div><div class='add'>+    wakeup = false;</div><div class='ctx'>     report_error(pthread_mutex_init(&amp;mutex, NULL), "QMutex", "mutex init");</div><div class='ctx'>     report_error(pthread_cond_init(&amp;cond, NULL), "QMutex", "cv init");</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QMutexPrivate::~QMutexPrivate()</div><div class='ctx'> {</div><div class='add'>+#if defined(Q_OS_MAC)</div><div class='add'>+    kern_return_t r = semaphore_destroy(mach_task_self(), mach_semaphore);</div><div class='add'>+    if (r != KERN_SUCCESS)</div><div class='add'>+        qWarning("QMutex: failed to destroy semaphore, error %d", r);</div><div class='add'>+#elif !defined(Q_OS_LINUX)</div><div class='ctx'>     report_error(pthread_cond_destroy(&amp;cond), "QMutex", "cv destroy");</div><div class='ctx'>     report_error(pthread_mutex_destroy(&amp;mutex), "QMutex", "mutex destroy");</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_MAC)</div><div class='add'>+</div><div class='add'>+bool QMutexPrivate::wait(int timeout)</div><div class='add'>+{</div><div class='add'>+    if (contenders.fetchAndAddAcquire(1) == 0) {</div><div class='add'>+        // lock acquired without waiting</div><div class='add'>+        return true;</div><div class='add'>+    }</div><div class='add'>+    kern_return_t r;</div><div class='add'>+    if (timeout &lt; 0) {</div><div class='add'>+        do {</div><div class='add'>+            r = semaphore_wait(mach_semaphore);</div><div class='add'>+        } while (r == KERN_ABORTED);</div><div class='add'>+	if (r != KERN_SUCCESS)</div><div class='add'>+            qWarning("QMutex: infinite wait failed, error %d", r);</div><div class='add'>+    } else {</div><div class='add'>+        mach_timespec_t ts;</div><div class='add'>+        ts.tv_nsec = ((timeout % 1000) * 1000) * 1000;</div><div class='add'>+        ts.tv_sec = (timeout / 1000);</div><div class='add'>+        r = semaphore_timedwait(mach_semaphore, ts);</div><div class='add'>+    }</div><div class='add'>+    contenders.deref();</div><div class='add'>+    return r == KERN_SUCCESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QMutexPrivate::wakeUp()</div><div class='add'>+{</div><div class='add'>+    semaphore_signal(mach_semaphore);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#elif defined(Q_OS_LINUX)</div><div class='add'>+</div><div class='add'>+static inline int _q_futex(volatile int *addr, int op, int val, const struct timespec *timeout, int *addr2, int val2)</div><div class='add'>+{</div><div class='add'>+    return syscall(SYS_futex, addr, op, val, timeout, addr2, val2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QMutexPrivate::wait(int timeout)</div><div class='ctx'> {</div><div class='add'>+    while (contenders.fetchAndStoreAcquire(2) &gt; 0) {</div><div class='add'>+        struct timespec ts, *pts = 0;</div><div class='add'>+        if (timeout &gt;= 0) {</div><div class='add'>+            ts.tv_nsec = ((timeout % 1000) * 1000) * 1000;</div><div class='add'>+            ts.tv_sec = (timeout / 1000);</div><div class='add'>+            pts = &amp;ts;</div><div class='add'>+        }</div><div class='add'>+        int r = _q_futex(&amp;contenders._q_value, FUTEX_WAIT, 2, pts, 0, 0);</div><div class='add'>+        if (r != 0 &amp;&amp; errno == ETIMEDOUT)</div><div class='add'>+            return false;</div><div class='add'>+    }</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QMutexPrivate::wakeUp()</div><div class='add'>+{</div><div class='add'>+    (void) contenders.fetchAndStoreRelease(0);</div><div class='add'>+    (void) _q_futex(&amp;contenders._q_value, FUTEX_WAKE, 1, 0, 0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#else // !Q_OS_MAC &amp;&amp; !Q_OS_LINUX</div><div class='add'>+</div><div class='add'>+bool QMutexPrivate::wait(int timeout)</div><div class='add'>+{</div><div class='add'>+    if (contenders.fetchAndAddAcquire(1) == 0) {</div><div class='add'>+        // lock acquired without waiting</div><div class='add'>+        return true;</div><div class='add'>+    }</div><div class='ctx'>     report_error(pthread_mutex_lock(&amp;mutex), "QMutex::lock", "mutex lock");</div><div class='ctx'>     int errorCode = 0;</div><div class='ctx'>     while (!wakeup) {</div><div class='hunk'>@@ -104,6 +193,7 @@ bool QMutexPrivate::wait(int timeout)</div><div class='ctx'>     }</div><div class='ctx'>     wakeup = false;</div><div class='ctx'>     report_error(pthread_mutex_unlock(&amp;mutex), "QMutex::lock", "mutex unlock");</div><div class='add'>+    contenders.deref();</div><div class='ctx'>     return errorCode == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -115,6 +205,8 @@ void QMutexPrivate::wakeUp()</div><div class='ctx'>     report_error(pthread_mutex_unlock(&amp;mutex), "QMutex::unlock", "mutex unlock");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#endif // !Q_OS_MAC &amp;&amp; !Q_OS_LINUX</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> #endif // QT_NO_THREAD</div><div class='head'>diff --git a/src/corelib/thread/qmutex_win.cpp b/src/corelib/thread/qmutex_win.cpp<br/>index 13b421a..53ad8cf 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qmutex_win.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qmutex_win.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qmutex_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qmutex_win.cpp</a></div><div class='hunk'>@@ -48,7 +48,7 @@</div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> QMutexPrivate::QMutexPrivate(QMutex::RecursionMode mode)</div><div class='del'>-    : recursive(mode == QMutex::Recursive), contenders(0), lastSpinCount(0), owner(0), count(0)</div><div class='add'>+    : QMutexData(mode), maximumSpinTime(MaximumSpinTimeThreshold), averageWaitTime(0), owner(0), count(0)</div><div class='ctx'> {</div><div class='ctx'>     event = CreateEvent(0, FALSE, FALSE, 0);</div><div class='ctx'>     if (!event)</div><div class='hunk'>@@ -60,7 +60,13 @@ QMutexPrivate::~QMutexPrivate()</div><div class='ctx'> </div><div class='ctx'> bool QMutexPrivate::wait(int timeout)</div><div class='ctx'> {</div><div class='del'>-    return WaitForSingleObject(event, timeout &lt; 0 ? INFINITE : timeout) ==  WAIT_OBJECT_0;</div><div class='add'>+    if (contenders.fetchAndAddAcquire(1) == 0) {</div><div class='add'>+        // lock acquired without waiting</div><div class='add'>+        return true;</div><div class='add'>+    }</div><div class='add'>+    bool returnValue = (WaitForSingleObject(event, timeout &lt; 0 ? INFINITE : timeout) ==  WAIT_OBJECT_0);</div><div class='add'>+    contenders.deref();</div><div class='add'>+    return returnValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void QMutexPrivate::wakeUp()</div><div class='head'>diff --git a/src/corelib/thread/qmutexpool.cpp b/src/corelib/thread/qmutexpool.cpp<br/>index 05b4b24..03ab047 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qmutexpool.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qmutexpool.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qmutexpool.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qmutexpool.cpp</a></div><div class='hunk'>@@ -123,22 +123,20 @@ QMutexPool *QMutexPool::instance()</div><div class='ctx'>     return globalMutexPool();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*!</div><div class='add'>+/*!  \fn QMutexPool::get(void *address)</div><div class='ctx'>     Returns a QMutex from the pool. QMutexPool uses the value \a address</div><div class='ctx'>     to determine which mutex is returned from the pool.</div><div class='ctx'> */</div><div class='del'>-QMutex *QMutexPool::get(const void *address)</div><div class='del'>-{</div><div class='del'>-    Q_ASSERT_X(address != 0, "QMutexPool::get()", "'address' argument cannot be zero");</div><div class='del'>-    int index = int((quintptr(address) &gt;&gt; (sizeof(address) &gt;&gt; 1)) % mutexes.count());</div><div class='del'>-</div><div class='del'>-    if (!mutexes[index]) {</div><div class='del'>-        // mutex not created, create one</div><div class='del'>-        QMutex *newMutex = new QMutex(recursionMode);</div><div class='del'>-        if (!mutexes[index].testAndSetOrdered(0, newMutex))</div><div class='del'>-            delete newMutex;</div><div class='del'>-    }</div><div class='ctx'> </div><div class='add'>+/*! \internal</div><div class='add'>+  create the mutex for the given index</div><div class='add'>+ */</div><div class='add'>+QMutex *QMutexPool::createMutex(int index)</div><div class='add'>+{</div><div class='add'>+    // mutex not created, create one</div><div class='add'>+    QMutex *newMutex = new QMutex(recursionMode);</div><div class='add'>+    if (!mutexes[index].testAndSetOrdered(0, newMutex))</div><div class='add'>+        delete newMutex;</div><div class='ctx'>     return mutexes[index];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/thread/qmutexpool_p.h b/src/corelib/thread/qmutexpool_p.h<br/>index acce4d7..fa9a734 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qmutexpool_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qmutexpool_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qmutexpool_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qmutexpool_p.h</a></div><div class='hunk'>@@ -67,11 +67,19 @@ public:</div><div class='ctx'>     explicit QMutexPool(QMutex::RecursionMode recursionMode = QMutex::NonRecursive, int size = 131);</div><div class='ctx'>     ~QMutexPool();</div><div class='ctx'> </div><div class='del'>-    QMutex *get(const void *address);</div><div class='add'>+    inline QMutex *get(const void *address) {</div><div class='add'>+        int index = uint(quintptr(address)) % mutexes.count();</div><div class='add'>+        QMutex *m = mutexes[index];</div><div class='add'>+        if (m)</div><div class='add'>+            return m;</div><div class='add'>+        else</div><div class='add'>+            return createMutex(index);</div><div class='add'>+    }</div><div class='ctx'>     static QMutexPool *instance();</div><div class='ctx'>     static QMutex *globalInstanceGet(const void *address);</div><div class='ctx'> </div><div class='ctx'> private:</div><div class='add'>+    QMutex *createMutex(int index);</div><div class='ctx'>     QVarLengthArray&lt;QAtomicPointer&lt;QMutex&gt;, 131&gt; mutexes;</div><div class='ctx'>     QMutex::RecursionMode recursionMode;</div><div class='ctx'> };</div><div class='head'>diff --git a/src/corelib/thread/qorderedmutexlocker_p.h b/src/corelib/thread/qorderedmutexlocker_p.h<br/>index 1f0fac5..8f01c1c 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qorderedmutexlocker_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qorderedmutexlocker_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qorderedmutexlocker_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qorderedmutexlocker_p.h</a></div><div class='hunk'>@@ -55,7 +55,7 @@</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='del'>-class QMutex;</div><div class='add'>+#include &lt;QtCore/qmutex.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>   Locks 2 mutexes in a defined order, avoiding a recursive lock if</div><div class='hunk'>@@ -79,8 +79,8 @@ public:</div><div class='ctx'>     void relock()</div><div class='ctx'>     {</div><div class='ctx'>         if (!locked) {</div><div class='del'>-            if (mtx1) mtx1-&gt;lock();</div><div class='del'>-            if (mtx2) mtx2-&gt;lock();</div><div class='add'>+            if (mtx1) mtx1-&gt;lockInline();</div><div class='add'>+            if (mtx2) mtx2-&gt;lockInline();</div><div class='ctx'>             locked = true;</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='hunk'>@@ -88,8 +88,8 @@ public:</div><div class='ctx'>     void unlock()</div><div class='ctx'>     {</div><div class='ctx'>         if (locked) {</div><div class='del'>-            if (mtx1) mtx1-&gt;unlock();</div><div class='del'>-            if (mtx2) mtx2-&gt;unlock();</div><div class='add'>+            if (mtx1) mtx1-&gt;unlockInline();</div><div class='add'>+            if (mtx2) mtx2-&gt;unlockInline();</div><div class='ctx'>             locked = false;</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='hunk'>@@ -100,10 +100,10 @@ public:</div><div class='ctx'>         if (mtx1 == mtx2)</div><div class='ctx'>             return false;</div><div class='ctx'>         if (mtx1 &lt; mtx2) {</div><div class='del'>-            mtx2-&gt;lock();</div><div class='add'>+            mtx2-&gt;lockInline();</div><div class='ctx'>             return true;</div><div class='ctx'>         }</div><div class='del'>-        if (!mtx2-&gt;tryLock()) {</div><div class='add'>+        if (!mtx2-&gt;tryLockInline()) {</div><div class='ctx'>             mtx1-&gt;unlock();</div><div class='ctx'>             mtx2-&gt;lock();</div><div class='ctx'>             mtx1-&gt;lock();</div><div class='head'>diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp<br/>index 3c04f28..acfd478 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qsemaphore.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qsemaphore.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qsemaphore.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qsemaphore.cpp</a></div><div class='hunk'>@@ -223,8 +223,9 @@ bool QSemaphore::tryAcquire(int n, int timeout)</div><div class='ctx'>         QElapsedTimer timer;</div><div class='ctx'>         timer.start();</div><div class='ctx'>         while (n &gt; d-&gt;avail) {</div><div class='del'>-            if (timer.hasExpired(timeout)</div><div class='del'>-                || !d-&gt;cond.wait(locker.mutex(), timeout - timer.elapsed()))</div><div class='add'>+            const qint64 elapsed = timer.elapsed();</div><div class='add'>+            if (timeout - elapsed &lt;= 0</div><div class='add'>+                || !d-&gt;cond.wait(locker.mutex(), timeout - elapsed))</div><div class='ctx'>                 return false;</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='head'>diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp<br/>index 2cdaca0..02a63bb 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qthread.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qthread.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qthread.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qthread.cpp</a></div><div class='hunk'>@@ -77,8 +77,8 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> QThreadData::QThreadData(int initialRefCount)</div><div class='del'>-    : _ref(initialRefCount), thread(0),</div><div class='del'>-      quitNow(false), loopLevel(0), eventDispatcher(0), canWait(true)</div><div class='add'>+    : _ref(initialRefCount), thread(0), threadId(0),</div><div class='add'>+      quitNow(false), loopLevel(0), eventDispatcher(0), canWait(true), isAdopted(false)</div><div class='ctx'> {</div><div class='ctx'>     // fprintf(stderr, "QThreadData %p created\n", this);</div><div class='ctx'> }</div><div class='hunk'>@@ -149,9 +149,6 @@ QAdoptedThread::QAdoptedThread(QThreadData *data)</div><div class='ctx'> </div><div class='ctx'> QAdoptedThread::~QAdoptedThread()</div><div class='ctx'> {</div><div class='del'>-#ifndef QT_NO_THREAD</div><div class='del'>-    QThreadPrivate::finish(this);</div><div class='del'>-#endif</div><div class='ctx'>     // fprintf(stderr, "~QAdoptedThread = %p\n", this);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -173,7 +170,8 @@ void QAdoptedThread::run()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> QThreadPrivate::QThreadPrivate(QThreadData *d)</div><div class='del'>-    : QObjectPrivate(), running(false), finished(false), terminated(false), exited(false), returnCode(-1),</div><div class='add'>+    : QObjectPrivate(), running(false), finished(false), terminated(false),</div><div class='add'>+      isInFinish(false), exited(false), returnCode(-1),</div><div class='ctx'>       stackSize(0), priority(QThread::InheritPriority), data(d)</div><div class='ctx'> {</div><div class='ctx'> #if defined (Q_OS_UNIX)</div><div class='hunk'>@@ -403,7 +401,12 @@ QThread::~QThread()</div><div class='ctx'>     Q_D(QThread);</div><div class='ctx'>     {</div><div class='ctx'>         QMutexLocker locker(&amp;d-&gt;mutex);</div><div class='del'>-        if (d-&gt;running &amp;&amp; !d-&gt;finished)</div><div class='add'>+        if (d-&gt;isInFinish) {</div><div class='add'>+            locker.unlock();</div><div class='add'>+            wait();</div><div class='add'>+            locker.relock();</div><div class='add'>+        }</div><div class='add'>+        if (d-&gt;running &amp;&amp; !d-&gt;finished &amp;&amp; !d-&gt;data-&gt;isAdopted)</div><div class='ctx'>             qWarning("QThread: Destroyed while thread is still running");</div><div class='ctx'> </div><div class='ctx'>         d-&gt;data-&gt;thread = 0;</div><div class='head'>diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h<br/>index 859aa53..13df3e6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qthread_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qthread_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qthread_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qthread_p.h</a></div><div class='hunk'>@@ -126,6 +126,7 @@ public:</div><div class='ctx'>     bool running;</div><div class='ctx'>     bool finished;</div><div class='ctx'>     bool terminated;</div><div class='add'>+    bool isInFinish; //when in QThreadPrivate::finish</div><div class='ctx'> </div><div class='ctx'>     bool exited;</div><div class='ctx'>     int returnCode;</div><div class='hunk'>@@ -145,6 +146,7 @@ public:</div><div class='ctx'> #else</div><div class='ctx'>     static void finish(void *);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> #endif // Q_OS_UNIX</div><div class='ctx'> </div><div class='ctx'> #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)</div><div class='hunk'>@@ -200,6 +202,7 @@ public:</div><div class='ctx'>     void deref();</div><div class='ctx'> </div><div class='ctx'>     QThread *thread;</div><div class='add'>+    Qt::HANDLE threadId;</div><div class='ctx'>     bool quitNow;</div><div class='ctx'>     int loopLevel;</div><div class='ctx'>     QAbstractEventDispatcher *eventDispatcher;</div><div class='hunk'>@@ -207,8 +210,7 @@ public:</div><div class='ctx'>     QPostEventList postEventList;</div><div class='ctx'>     bool canWait;</div><div class='ctx'>     QVector&lt;void *&gt; tls;</div><div class='del'>-</div><div class='del'>-    QMutex mutex;</div><div class='add'>+    bool isAdopted;</div><div class='ctx'> </div><div class='ctx'> # ifdef Q_OS_SYMBIAN</div><div class='ctx'>     RThread symbian_thread_handle;</div><div class='head'>diff --git a/src/corelib/thread/qthread_symbian.cpp b/src/corelib/thread/qthread_symbian.cpp<br/>new file mode 100644<br/>index 0000000..c515ae6<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qthread_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qthread_symbian.cpp</a></div><div class='hunk'>@@ -0,0 +1,613 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qthread.h"</div><div class='add'>+#include "qplatformdefs.h"</div><div class='add'>+#include &lt;private/qcoreapplication_p.h&gt;</div><div class='add'>+#include &lt;private/qeventdispatcher_symbian_p.h&gt;</div><div class='add'>+#include "qthreadstorage.h"</div><div class='add'>+#include "qthread_p.h"</div><div class='add'>+#include &lt;private/qsystemerror_p.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;sched.h&gt;</div><div class='add'>+#include &lt;hal.h&gt;</div><div class='add'>+#include &lt;hal_data.h&gt;</div><div class='add'>+</div><div class='add'>+// You only find these enumerations on Symbian^3 onwards, so we need to provide our own</div><div class='add'>+// to remain compatible with older releases. They won't be called by pre-Sym^3 SDKs.</div><div class='add'>+</div><div class='add'>+// HALData::ENumCpus</div><div class='add'>+#define QT_HALData_ENumCpus 119</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_THREAD</div><div class='add'>+</div><div class='add'>+enum { ThreadPriorityResetFlag = 0x80000000 };</div><div class='add'>+</div><div class='add'>+// Utility functions for getting, setting and clearing thread specific data.</div><div class='add'>+static QThreadData *get_thread_data()</div><div class='add'>+{</div><div class='add'>+    return reinterpret_cast&lt;QThreadData *&gt;(Dll::Tls());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_thread_data(QThreadData *data)</div><div class='add'>+{</div><div class='add'>+    qt_symbian_throwIfError(Dll::SetTls(data));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clear_thread_data()</div><div class='add'>+{</div><div class='add'>+    Dll::FreeTls();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void init_symbian_thread_handle(RThread &amp;thread)</div><div class='add'>+{</div><div class='add'>+    thread = RThread();</div><div class='add'>+    TThreadId threadId = thread.Id();</div><div class='add'>+    qt_symbian_throwIfError(thread.Open(threadId, EOwnerProcess));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QThreadData *QThreadData::current()</div><div class='add'>+{</div><div class='add'>+    QThreadData *data = get_thread_data();</div><div class='add'>+    if (!data) {</div><div class='add'>+        void *a;</div><div class='add'>+        if (QInternal::activateCallbacks(QInternal::AdoptCurrentThread, &amp;a)) {</div><div class='add'>+            QThread *adopted = static_cast&lt;QThread*&gt;(a);</div><div class='add'>+            Q_ASSERT(adopted);</div><div class='add'>+            data = QThreadData::get2(adopted);</div><div class='add'>+            set_thread_data(data);</div><div class='add'>+            adopted-&gt;d_func()-&gt;running = true;</div><div class='add'>+            adopted-&gt;d_func()-&gt;finished = false;</div><div class='add'>+            static_cast&lt;QAdoptedThread *&gt;(adopted)-&gt;init();</div><div class='add'>+        } else {</div><div class='add'>+            data = new QThreadData;</div><div class='add'>+            QT_TRY {</div><div class='add'>+                set_thread_data(data);</div><div class='add'>+                data-&gt;thread = new QAdoptedThread(data);</div><div class='add'>+            } QT_CATCH(...) {</div><div class='add'>+                clear_thread_data();</div><div class='add'>+                data-&gt;deref();</div><div class='add'>+                data = 0;</div><div class='add'>+                QT_RETHROW;</div><div class='add'>+            }</div><div class='add'>+            data-&gt;deref();</div><div class='add'>+        }</div><div class='add'>+        data-&gt;isAdopted = true;</div><div class='add'>+        data-&gt;threadId = QThread::currentThreadId();</div><div class='add'>+        if (!QCoreApplicationPrivate::theMainThread)</div><div class='add'>+            QCoreApplicationPrivate::theMainThread = data-&gt;thread;</div><div class='add'>+    }</div><div class='add'>+    return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+class QCAdoptedThreadMonitor : public CActive</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    QCAdoptedThreadMonitor(QThread *thread)</div><div class='add'>+    : CActive(EPriorityStandard), data(QThreadData::get2(thread))</div><div class='add'>+    {</div><div class='add'>+        CActiveScheduler::Add(this);</div><div class='add'>+        data-&gt;symbian_thread_handle.Logon(iStatus);</div><div class='add'>+        SetActive();</div><div class='add'>+    }</div><div class='add'>+    ~QCAdoptedThreadMonitor()</div><div class='add'>+    {</div><div class='add'>+        Cancel();</div><div class='add'>+    }</div><div class='add'>+    void DoCancel()</div><div class='add'>+    {</div><div class='add'>+        data-&gt;symbian_thread_handle.LogonCancel(iStatus);</div><div class='add'>+    }</div><div class='add'>+    void RunL();</div><div class='add'>+private:</div><div class='add'>+    QThreadData* data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+class QCAddAdoptedThread : public CActive</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    QCAddAdoptedThread()</div><div class='add'>+    : CActive(EPriorityStandard)</div><div class='add'>+    {</div><div class='add'>+        CActiveScheduler::Add(this);</div><div class='add'>+    }</div><div class='add'>+    void ConstructL()</div><div class='add'>+    {</div><div class='add'>+        User::LeaveIfError(monitorThread.Open(RThread().Id()));</div><div class='add'>+        start();</div><div class='add'>+    }</div><div class='add'>+    ~QCAddAdoptedThread()</div><div class='add'>+    {</div><div class='add'>+        Cancel();</div><div class='add'>+        monitorThread.Close();</div><div class='add'>+    }</div><div class='add'>+    void DoCancel()</div><div class='add'>+    {</div><div class='add'>+        User::RequestComplete(stat, KErrCancel);</div><div class='add'>+    }</div><div class='add'>+    void start()</div><div class='add'>+    {</div><div class='add'>+        iStatus = KRequestPending;</div><div class='add'>+        SetActive();</div><div class='add'>+        stat = &amp;iStatus;</div><div class='add'>+    }</div><div class='add'>+    void RunL()</div><div class='add'>+    {</div><div class='add'>+        if (iStatus.Int() != KErrNone)</div><div class='add'>+            return;</div><div class='add'>+</div><div class='add'>+        QMutexLocker adoptedThreadMonitorMutexlock(&amp;adoptedThreadMonitorMutex);</div><div class='add'>+        for (int i=threadsToAdd.size()-1; i&gt;=0; i--) {</div><div class='add'>+            // Create an active object to monitor the thread</div><div class='add'>+            new (ELeave) QCAdoptedThreadMonitor(threadsToAdd[i]);</div><div class='add'>+            count++;</div><div class='add'>+            threadsToAdd.pop_back();</div><div class='add'>+        }</div><div class='add'>+        start();</div><div class='add'>+    }</div><div class='add'>+    static void add(QThread *thread)</div><div class='add'>+    {</div><div class='add'>+        QMutexLocker adoptedThreadMonitorMutexlock(&amp;adoptedThreadMonitorMutex);</div><div class='add'>+        if (!adoptedThreadAdder) {</div><div class='add'>+            RThread monitorThread;</div><div class='add'>+            qt_symbian_throwIfError(monitorThread.Create(KNullDesC(), &amp;monitorThreadFunc, 1024, &amp;User::Allocator(), 0));</div><div class='add'>+            TRequestStatus started;</div><div class='add'>+            monitorThread.Rendezvous(started);</div><div class='add'>+            monitorThread.Resume();</div><div class='add'>+            User::WaitForRequest(started);</div><div class='add'>+            monitorThread.Close();</div><div class='add'>+        }</div><div class='add'>+        if (RThread().Id() == adoptedThreadAdder-&gt;monitorThread.Id())</div><div class='add'>+            return;</div><div class='add'>+        adoptedThreadAdder-&gt;threadsToAdd.push_back(thread);</div><div class='add'>+        if (adoptedThreadAdder-&gt;stat) {</div><div class='add'>+            adoptedThreadAdder-&gt;monitorThread.RequestComplete(adoptedThreadAdder-&gt;stat, KErrNone);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    static void monitorThreadFuncL()</div><div class='add'>+    {</div><div class='add'>+        CActiveScheduler* scheduler = new (ELeave) CActiveScheduler();</div><div class='add'>+        CleanupStack::PushL(scheduler);</div><div class='add'>+        CActiveScheduler::Install(scheduler);</div><div class='add'>+</div><div class='add'>+        adoptedThreadAdder = new(ELeave) QCAddAdoptedThread();</div><div class='add'>+        CleanupStack::PushL(adoptedThreadAdder);</div><div class='add'>+        adoptedThreadAdder-&gt;ConstructL();</div><div class='add'>+        QCAddAdoptedThread *adder = adoptedThreadAdder;</div><div class='add'>+</div><div class='add'>+        RThread::Rendezvous(KErrNone);</div><div class='add'>+        CActiveScheduler::Start();</div><div class='add'>+</div><div class='add'>+        CleanupStack::PopAndDestroy(adder);</div><div class='add'>+        CleanupStack::PopAndDestroy(scheduler);</div><div class='add'>+    }</div><div class='add'>+    static int monitorThreadFunc(void *)</div><div class='add'>+    {</div><div class='add'>+        _LIT(KMonitorThreadName, "adoptedMonitorThread");</div><div class='add'>+        RThread::RenameMe(KMonitorThreadName());</div><div class='add'>+        CTrapCleanup* cleanup = CTrapCleanup::New();</div><div class='add'>+        TRAPD(ret, monitorThreadFuncL());</div><div class='add'>+        delete cleanup;</div><div class='add'>+        return ret;</div><div class='add'>+    }</div><div class='add'>+    static void threadDied()</div><div class='add'>+    {</div><div class='add'>+        QMutexLocker adoptedThreadMonitorMutexlock(&amp;adoptedThreadMonitorMutex);</div><div class='add'>+        if (adoptedThreadAdder) {</div><div class='add'>+            adoptedThreadAdder-&gt;count--;</div><div class='add'>+            if (adoptedThreadAdder-&gt;count &lt;= 0 &amp;&amp; adoptedThreadAdder-&gt;threadsToAdd.size() == 0) {</div><div class='add'>+                CActiveScheduler::Stop();</div><div class='add'>+                adoptedThreadAdder = 0;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+private:</div><div class='add'>+    QVector&lt;QThread*&gt; threadsToAdd;</div><div class='add'>+    RThread monitorThread;</div><div class='add'>+    static QMutex adoptedThreadMonitorMutex;</div><div class='add'>+    static QCAddAdoptedThread *adoptedThreadAdder;</div><div class='add'>+    int count;</div><div class='add'>+    TRequestStatus *stat;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+QMutex QCAddAdoptedThread::adoptedThreadMonitorMutex;</div><div class='add'>+QCAddAdoptedThread* QCAddAdoptedThread::adoptedThreadAdder = 0;</div><div class='add'>+</div><div class='add'>+void QCAdoptedThreadMonitor::RunL()</div><div class='add'>+{</div><div class='add'>+    if (data-&gt;isAdopted) {</div><div class='add'>+        QThread *thread = data-&gt;thread;</div><div class='add'>+        Q_ASSERT(thread);</div><div class='add'>+        QThreadPrivate *thread_p = static_cast&lt;QThreadPrivate *&gt;(QObjectPrivate::get(thread));</div><div class='add'>+        Q_ASSERT(!thread_p-&gt;finished);</div><div class='add'>+        thread_p-&gt;finish(thread);</div><div class='add'>+    }</div><div class='add'>+    data-&gt;deref();</div><div class='add'>+    QCAddAdoptedThread::threadDied();</div><div class='add'>+    delete this;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QAdoptedThread::init()</div><div class='add'>+{</div><div class='add'>+    Q_D(QThread);</div><div class='add'>+    d-&gt;thread_id = RThread().Id();  // type operator to TUint</div><div class='add'>+    init_symbian_thread_handle(d-&gt;data-&gt;symbian_thread_handle);</div><div class='add'>+    QCAddAdoptedThread::add(this);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+   QThreadPrivate</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+#if defined(Q_C_CALLBACKS)</div><div class='add'>+extern "C" {</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+typedef void*(*QtThreadCallback)(void*);</div><div class='add'>+</div><div class='add'>+#if defined(Q_C_CALLBACKS)</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif // QT_NO_THREAD</div><div class='add'>+</div><div class='add'>+void QThreadPrivate::createEventDispatcher(QThreadData *data)</div><div class='add'>+{</div><div class='add'>+    data-&gt;eventDispatcher = new QEventDispatcherSymbian;</div><div class='add'>+    data-&gt;eventDispatcher-&gt;startingUp();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_THREAD</div><div class='add'>+</div><div class='add'>+void *QThreadPrivate::start(void *arg)</div><div class='add'>+{</div><div class='add'>+    QThread *thr = reinterpret_cast&lt;QThread *&gt;(arg);</div><div class='add'>+    QThreadData *data = QThreadData::get2(thr);</div><div class='add'>+</div><div class='add'>+    // do we need to reset the thread priority?</div><div class='add'>+    if (int(thr-&gt;d_func()-&gt;priority) &amp; ThreadPriorityResetFlag) {</div><div class='add'>+        thr-&gt;setPriority(QThread::Priority(thr-&gt;d_func()-&gt;priority &amp; ~ThreadPriorityResetFlag));</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    // On symbian, threads other than the main thread are non critical by default</div><div class='add'>+    // This means a worker thread can crash without crashing the application - to</div><div class='add'>+    // use this feature, we would need to use RThread::Logon in the main thread</div><div class='add'>+    // to catch abnormal thread exit and emit the finished signal.</div><div class='add'>+    // For the sake of cross platform consistency, we set the thread as process critical</div><div class='add'>+    // - advanced users who want the symbian behaviour can change the critical</div><div class='add'>+    // attribute of the thread again once the app gains control in run()</div><div class='add'>+    User::SetCritical(User::EProcessCritical);</div><div class='add'>+</div><div class='add'>+    data-&gt;threadId = QThread::currentThreadId();</div><div class='add'>+    set_thread_data(data);</div><div class='add'>+</div><div class='add'>+    {</div><div class='add'>+        QMutexLocker locker(&amp;thr-&gt;d_func()-&gt;mutex);</div><div class='add'>+        data-&gt;quitNow = thr-&gt;d_func()-&gt;exited;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    CTrapCleanup *cleanup = CTrapCleanup::New();</div><div class='add'>+</div><div class='add'>+    // ### TODO: allow the user to create a custom event dispatcher</div><div class='add'>+    createEventDispatcher(data);</div><div class='add'>+</div><div class='add'>+    emit thr-&gt;started();</div><div class='add'>+    thr-&gt;run();</div><div class='add'>+</div><div class='add'>+    QThreadPrivate::finish(arg);</div><div class='add'>+</div><div class='add'>+    delete cleanup;</div><div class='add'>+</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QThreadPrivate::finish(void *arg, bool lockAnyway, bool closeNativeHandle)</div><div class='add'>+{</div><div class='add'>+    QThread *thr = reinterpret_cast&lt;QThread *&gt;(arg);</div><div class='add'>+    QThreadPrivate *d = thr-&gt;d_func();</div><div class='add'>+</div><div class='add'>+    QMutexLocker locker(lockAnyway ? &amp;d-&gt;mutex : 0);</div><div class='add'>+</div><div class='add'>+    d-&gt;isInFinish = true;</div><div class='add'>+    d-&gt;priority = QThread::InheritPriority;</div><div class='add'>+    bool terminated = d-&gt;terminated;</div><div class='add'>+    void *data = &amp;d-&gt;data-&gt;tls;</div><div class='add'>+    locker.unlock();</div><div class='add'>+    if (terminated)</div><div class='add'>+        emit thr-&gt;terminated();</div><div class='add'>+    emit thr-&gt;finished();</div><div class='add'>+    QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);</div><div class='add'>+    QThreadStorageData::finish((void **)data);</div><div class='add'>+    locker.relock();</div><div class='add'>+    d-&gt;terminated = false;</div><div class='add'>+</div><div class='add'>+    QAbstractEventDispatcher *eventDispatcher = d-&gt;data-&gt;eventDispatcher;</div><div class='add'>+    if (eventDispatcher) {</div><div class='add'>+        d-&gt;data-&gt;eventDispatcher = 0;</div><div class='add'>+        locker.unlock();</div><div class='add'>+        eventDispatcher-&gt;closingDown();</div><div class='add'>+        delete eventDispatcher;</div><div class='add'>+        locker.relock();</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    d-&gt;thread_id = 0;</div><div class='add'>+    if (closeNativeHandle)</div><div class='add'>+        d-&gt;data-&gt;symbian_thread_handle.Close();</div><div class='add'>+    d-&gt;running = false;</div><div class='add'>+    d-&gt;finished = true;</div><div class='add'>+</div><div class='add'>+    d-&gt;isInFinish = false;</div><div class='add'>+    d-&gt;thread_done.wakeAll();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/**************************************************************************</div><div class='add'>+ ** QThread</div><div class='add'>+ *************************************************************************/</div><div class='add'>+</div><div class='add'>+Qt::HANDLE QThread::currentThreadId()</div><div class='add'>+{</div><div class='add'>+    return (Qt::HANDLE) (TUint) RThread().Id();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int QThread::idealThreadCount()</div><div class='add'>+{</div><div class='add'>+    int cores = 1;</div><div class='add'>+</div><div class='add'>+    if (QSysInfo::symbianVersion() &gt;= QSysInfo::SV_SF_3) {</div><div class='add'>+        TInt inumcpus;</div><div class='add'>+        TInt err;</div><div class='add'>+        err = HAL::Get((HALData::TAttribute)QT_HALData_ENumCpus, inumcpus);</div><div class='add'>+        if (err == KErrNone) {</div><div class='add'>+            cores = qMax(inumcpus, 1);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return cores;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QThread::yieldCurrentThread()</div><div class='add'>+{</div><div class='add'>+    sched_yield();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*  \internal</div><div class='add'>+    helper function to do thread sleeps</div><div class='add'>+*/</div><div class='add'>+static void thread_sleep(unsigned long remaining, unsigned long scale)</div><div class='add'>+{</div><div class='add'>+    // maximum Symbian wait is 2^31 microseconds</div><div class='add'>+    unsigned long maxWait = KMaxTInt / scale;</div><div class='add'>+    do {</div><div class='add'>+        unsigned long waitTime = qMin(maxWait, remaining);</div><div class='add'>+        remaining -= waitTime;</div><div class='add'>+        User::AfterHighRes(waitTime * scale);</div><div class='add'>+    } while (remaining);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QThread::sleep(unsigned long secs)</div><div class='add'>+{</div><div class='add'>+    thread_sleep(secs, 1000000ul);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QThread::msleep(unsigned long msecs)</div><div class='add'>+{</div><div class='add'>+    thread_sleep(msecs, 1000ul);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QThread::usleep(unsigned long usecs)</div><div class='add'>+{</div><div class='add'>+    thread_sleep(usecs, 1ul);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TThreadPriority calculateSymbianPriority(QThread::Priority priority)</div><div class='add'>+    {</div><div class='add'>+    // Both Qt &amp; Symbian use limited enums; this matches the mapping previously done through conversion to Posix granularity</div><div class='add'>+    TThreadPriority symPriority;</div><div class='add'>+    switch (priority)</div><div class='add'>+    {</div><div class='add'>+        case QThread::IdlePriority:</div><div class='add'>+            symPriority = EPriorityMuchLess;</div><div class='add'>+            break;</div><div class='add'>+        case QThread::LowestPriority:</div><div class='add'>+        case QThread::LowPriority:</div><div class='add'>+            symPriority = EPriorityLess;</div><div class='add'>+            break;</div><div class='add'>+        case QThread::NormalPriority:</div><div class='add'>+            symPriority = EPriorityNormal;</div><div class='add'>+            break;</div><div class='add'>+        case QThread::HighPriority:</div><div class='add'>+            symPriority = EPriorityMore;</div><div class='add'>+            break;</div><div class='add'>+        case QThread::HighestPriority:</div><div class='add'>+        case QThread::TimeCriticalPriority:</div><div class='add'>+            symPriority = EPriorityMuchMore;</div><div class='add'>+            break;</div><div class='add'>+        case QThread::InheritPriority:</div><div class='add'>+        default:</div><div class='add'>+            symPriority = RThread().Priority();</div><div class='add'>+            break;</div><div class='add'>+    }</div><div class='add'>+    return symPriority;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+void QThread::start(Priority priority)</div><div class='add'>+{</div><div class='add'>+    Q_D(QThread);</div><div class='add'>+    QMutexLocker locker(&amp;d-&gt;mutex);</div><div class='add'>+</div><div class='add'>+    if (d-&gt;isInFinish)</div><div class='add'>+        d-&gt;thread_done.wait(locker.mutex());</div><div class='add'>+</div><div class='add'>+    if (d-&gt;running)</div><div class='add'>+        return;</div><div class='add'>+</div><div class='add'>+    d-&gt;running = true;</div><div class='add'>+    d-&gt;finished = false;</div><div class='add'>+    d-&gt;terminated = false;</div><div class='add'>+    d-&gt;returnCode = 0;</div><div class='add'>+    d-&gt;exited = false;</div><div class='add'>+</div><div class='add'>+    d-&gt;priority = priority;</div><div class='add'>+</div><div class='add'>+    if (d-&gt;stackSize == 0)</div><div class='add'>+        // The default stack size on Symbian is very small, making even basic</div><div class='add'>+        // operations like file I/O fail, so we increase it by default.</div><div class='add'>+        d-&gt;stackSize = 0x14000; // Maximum stack size on Symbian.</div><div class='add'>+</div><div class='add'>+    int code = d-&gt;data-&gt;symbian_thread_handle.Create(KNullDesC, (TThreadFunction) QThreadPrivate::start, d-&gt;stackSize, NULL, this);</div><div class='add'>+    if (code == KErrNone) {</div><div class='add'>+        d-&gt;thread_id = d-&gt;data-&gt;symbian_thread_handle.Id();</div><div class='add'>+        TThreadPriority symPriority = calculateSymbianPriority(priority);</div><div class='add'>+        d-&gt;data-&gt;symbian_thread_handle.SetPriority(symPriority);</div><div class='add'>+        d-&gt;data-&gt;symbian_thread_handle.Resume();</div><div class='add'>+    } else {</div><div class='add'>+        qWarning("QThread::start: Thread creation error: %s", qPrintable(QSystemError(code, QSystemError::NativeError).toString()));</div><div class='add'>+</div><div class='add'>+        d-&gt;running = false;</div><div class='add'>+        d-&gt;finished = false;</div><div class='add'>+        d-&gt;thread_id = 0;</div><div class='add'>+        d-&gt;data-&gt;symbian_thread_handle.Close();</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QThread::terminate()</div><div class='add'>+{</div><div class='add'>+    Q_D(QThread);</div><div class='add'>+    QMutexLocker locker(&amp;d-&gt;mutex);</div><div class='add'>+</div><div class='add'>+    if (!d-&gt;thread_id)</div><div class='add'>+        return;</div><div class='add'>+</div><div class='add'>+    if (!d-&gt;running)</div><div class='add'>+        return;</div><div class='add'>+    if (!d-&gt;terminationEnabled) {</div><div class='add'>+        d-&gt;terminatePending = true;</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    d-&gt;terminated = true;</div><div class='add'>+    // "false, false" meaning:</div><div class='add'>+    // 1. lockAnyway = false. Don't lock the mutex because it's already locked</div><div class='add'>+    //    (see above).</div><div class='add'>+    // 2. closeNativeSymbianHandle = false. We don't want to close the thread handle,</div><div class='add'>+    //    because we need it here to terminate the thread.</div><div class='add'>+    QThreadPrivate::finish(this, false, false);</div><div class='add'>+    d-&gt;data-&gt;symbian_thread_handle.Terminate(KErrNone);</div><div class='add'>+    d-&gt;data-&gt;symbian_thread_handle.Close();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QThread::wait(unsigned long time)</div><div class='add'>+{</div><div class='add'>+    Q_D(QThread);</div><div class='add'>+    QMutexLocker locker(&amp;d-&gt;mutex);</div><div class='add'>+</div><div class='add'>+    if (d-&gt;thread_id == (TUint) RThread().Id()) {</div><div class='add'>+        qWarning("QThread::wait: Thread tried to wait on itself");</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (d-&gt;finished || !d-&gt;running)</div><div class='add'>+        return true;</div><div class='add'>+</div><div class='add'>+    while (d-&gt;running) {</div><div class='add'>+        // Check if thread still exists. Needed because kernel will kill it without notification</div><div class='add'>+        // before global statics are deleted at application exit.</div><div class='add'>+        if (d-&gt;data-&gt;symbian_thread_handle.Handle()</div><div class='add'>+            &amp;&amp; d-&gt;data-&gt;symbian_thread_handle.ExitType() != EExitPending) {</div><div class='add'>+            // Cannot call finish here as wait is typically called from another thread.</div><div class='add'>+            // It won't be necessary anyway, as we should never get here under normal operations;</div><div class='add'>+            // all QThreads are EProcessCritical and therefore cannot normally exit</div><div class='add'>+            // undetected (i.e. panic) as long as all thread control is via QThread.</div><div class='add'>+            return true;</div><div class='add'>+        }</div><div class='add'>+        if (!d-&gt;thread_done.wait(locker.mutex(), time))</div><div class='add'>+            return false;</div><div class='add'>+    }</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QThread::setTerminationEnabled(bool enabled)</div><div class='add'>+{</div><div class='add'>+    QThread *thr = currentThread();</div><div class='add'>+    Q_ASSERT_X(thr != 0, "QThread::setTerminationEnabled()",</div><div class='add'>+               "Current thread was not started with QThread.");</div><div class='add'>+    QThreadPrivate *d = thr-&gt;d_func();</div><div class='add'>+    QMutexLocker locker(&amp;d-&gt;mutex);</div><div class='add'>+    d-&gt;terminationEnabled = enabled;</div><div class='add'>+    if (enabled &amp;&amp; d-&gt;terminatePending) {</div><div class='add'>+        d-&gt;terminated = true;</div><div class='add'>+        // "false" meaning:</div><div class='add'>+        // -  lockAnyway = false. Don't lock the mutex because it's already locked</div><div class='add'>+        //    (see above).</div><div class='add'>+        QThreadPrivate::finish(thr, false);</div><div class='add'>+        locker.unlock(); // don't leave the mutex locked!</div><div class='add'>+        User::Exit(0);  // may be some other cleanup required? what if AS or cleanup stack?</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QThread::setPriority(Priority priority)</div><div class='add'>+{</div><div class='add'>+    Q_D(QThread);</div><div class='add'>+    QMutexLocker locker(&amp;d-&gt;mutex);</div><div class='add'>+    if (!d-&gt;running) {</div><div class='add'>+        qWarning("QThread::setPriority: Cannot set priority, thread is not running");</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    d-&gt;priority = priority;</div><div class='add'>+</div><div class='add'>+    // copied from start() with a few modifications:</div><div class='add'>+    TThreadPriority symPriority = calculateSymbianPriority(priority);</div><div class='add'>+    d-&gt;data-&gt;symbian_thread_handle.SetPriority(symPriority);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif // QT_NO_THREAD</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='head'>diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp<br/>index f7e80fd..839a396 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qthread_unix.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qthread_unix.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qthread_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qthread_unix.cpp</a></div><div class='hunk'>@@ -48,16 +48,7 @@</div><div class='ctx'> #  include "../kernel/qeventdispatcher_glib_p.h"</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-#include &lt;private/qeventdispatcher_symbian_p.h&gt;</div><div class='del'>-#else</div><div class='ctx'> #include &lt;private/qeventdispatcher_unix_p.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-#include &lt;hal.h&gt;</div><div class='del'>-#include &lt;hal_data.h&gt;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #include "qthreadstorage.h"</div><div class='ctx'> </div><div class='hunk'>@@ -68,12 +59,6 @@</div><div class='ctx'> #include &lt;sched.h&gt;</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> </div><div class='del'>-// You only find these enumerations on Symbian^3 onwards, so we need to provide our own</div><div class='del'>-// to remain compatible with older releases. They won't be called by pre-Sym^3 SDKs.</div><div class='del'>-</div><div class='del'>-// HALData::ENumCpus</div><div class='del'>-#define QT_HALData_ENumCpus 119</div><div class='del'>-</div><div class='ctx'> #ifdef Q_OS_BSD4</div><div class='ctx'> #include &lt;sys/sysctl.h&gt;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -94,7 +79,9 @@</div><div class='ctx'> #   define old_qDebug qDebug</div><div class='ctx'> #   undef qDebug</div><div class='ctx'> # endif</div><div class='add'>+#ifndef QT_NO_CORESERVICES</div><div class='ctx'> # include &lt;CoreServices/CoreServices.h&gt;</div><div class='add'>+#endif //QT_NO_CORESERVICES</div><div class='ctx'> </div><div class='ctx'> # ifdef old_qDebug</div><div class='ctx'> #   undef qDebug</div><div class='hunk'>@@ -119,6 +106,17 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> enum { ThreadPriorityResetFlag = 0x80000000 };</div><div class='ctx'> </div><div class='add'>+#if defined(Q_OS_LINUX) &amp;&amp; defined(__GLIBC__) &amp;&amp; (defined(Q_CC_GNU) || defined(Q_CC_INTEL))</div><div class='add'>+#define HAVE_TLS</div><div class='add'>+#endif</div><div class='add'>+#if defined(Q_CC_XLC) || defined (Q_CC_SUN)</div><div class='add'>+#define HAVE_TLS</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef HAVE_TLS</div><div class='add'>+static __thread QThreadData *currentThreadData = 0;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static pthread_once_t current_thread_data_once = PTHREAD_ONCE_INIT;</div><div class='ctx'> static pthread_key_t current_thread_data_key;</div><div class='ctx'> </div><div class='hunk'>@@ -135,7 +133,16 @@ static void destroy_current_thread_data(void *p)</div><div class='ctx'>     // this destructor function, so we need to set it back to the</div><div class='ctx'>     // right value...</div><div class='ctx'>     pthread_setspecific(current_thread_data_key, p);</div><div class='del'>-    reinterpret_cast&lt;QThreadData *&gt;(p)-&gt;deref();</div><div class='add'>+    QThreadData *data = static_cast&lt;QThreadData *&gt;(p);</div><div class='add'>+    if (data-&gt;isAdopted) {</div><div class='add'>+        QThread *thread = data-&gt;thread;</div><div class='add'>+        Q_ASSERT(thread);</div><div class='add'>+        QThreadPrivate *thread_p = static_cast&lt;QThreadPrivate *&gt;(QObjectPrivate::get(thread));</div><div class='add'>+        Q_ASSERT(!thread_p-&gt;finished);</div><div class='add'>+        thread_p-&gt;finish(thread);</div><div class='add'>+    }</div><div class='add'>+    data-&gt;deref();</div><div class='add'>+</div><div class='ctx'>     // ... but we must reset it to zero before returning so we aren't</div><div class='ctx'>     // called again (POSIX allows implementations to call destructor</div><div class='ctx'>     // functions repeatedly until all values are zero)</div><div class='hunk'>@@ -154,19 +161,17 @@ static void create_current_thread_data_key()</div><div class='ctx'> </div><div class='ctx'> static void destroy_current_thread_data_key()</div><div class='ctx'> {</div><div class='add'>+    pthread_once(&amp;current_thread_data_once, create_current_thread_data_key);</div><div class='ctx'>     pthread_key_delete(current_thread_data_key);</div><div class='ctx'> }</div><div class='ctx'> Q_DESTRUCTOR_FUNCTION(destroy_current_thread_data_key)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> // Utility functions for getting, setting and clearing thread specific data.</div><div class='del'>-// In Symbian, TLS access is significantly faster than pthread_getspecific.</div><div class='del'>-// However Symbian does not have the thread destruction cleanup functionality</div><div class='del'>-// that pthread has, so pthread_setspecific is also used.</div><div class='ctx'> static QThreadData *get_thread_data()</div><div class='ctx'> {</div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-    return reinterpret_cast&lt;QThreadData *&gt;(Dll::Tls());</div><div class='add'>+#ifdef HAVE_TLS</div><div class='add'>+    return currentThreadData;</div><div class='ctx'> #else</div><div class='ctx'>     pthread_once(&amp;current_thread_data_once, create_current_thread_data_key);</div><div class='ctx'>     return reinterpret_cast&lt;QThreadData *&gt;(pthread_getspecific(current_thread_data_key));</div><div class='hunk'>@@ -175,8 +180,8 @@ static QThreadData *get_thread_data()</div><div class='ctx'> </div><div class='ctx'> static void set_thread_data(QThreadData *data)</div><div class='ctx'> {</div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-    qt_symbian_throwIfError(Dll::SetTls(data));</div><div class='add'>+#ifdef HAVE_TLS</div><div class='add'>+    currentThreadData = data;</div><div class='ctx'> #endif</div><div class='ctx'>     pthread_once(&amp;current_thread_data_once, create_current_thread_data_key);</div><div class='ctx'>     pthread_setspecific(current_thread_data_key, data);</div><div class='hunk'>@@ -184,27 +189,12 @@ static void set_thread_data(QThreadData *data)</div><div class='ctx'> </div><div class='ctx'> static void clear_thread_data()</div><div class='ctx'> {</div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-    Dll::FreeTls();</div><div class='add'>+#ifdef HAVE_TLS</div><div class='add'>+    currentThreadData = 0;</div><div class='ctx'> #endif</div><div class='ctx'>     pthread_setspecific(current_thread_data_key, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-static void init_symbian_thread_handle(RThread &amp;thread)</div><div class='del'>-{</div><div class='del'>-    thread = RThread();</div><div class='del'>-    TThreadId threadId = thread.Id();</div><div class='del'>-    thread.Open(threadId);</div><div class='del'>-</div><div class='del'>-    // Make thread handle accessible process wide</div><div class='del'>-    RThread originalCloser = thread;</div><div class='del'>-    thread.Duplicate(thread, EOwnerProcess);</div><div class='del'>-    originalCloser.Close();</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> QThreadData *QThreadData::current()</div><div class='ctx'> {</div><div class='ctx'>     QThreadData *data = get_thread_data();</div><div class='hunk'>@@ -231,6 +221,8 @@ QThreadData *QThreadData::current()</div><div class='ctx'>             }</div><div class='ctx'>             data-&gt;deref();</div><div class='ctx'>         }</div><div class='add'>+        data-&gt;isAdopted = true;</div><div class='add'>+        data-&gt;threadId = (Qt::HANDLE)pthread_self();</div><div class='ctx'>         if (!QCoreApplicationPrivate::theMainThread)</div><div class='ctx'>             QCoreApplicationPrivate::theMainThread = data-&gt;thread;</div><div class='ctx'>     }</div><div class='hunk'>@@ -242,9 +234,6 @@ void QAdoptedThread::init()</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QThread);</div><div class='ctx'>     d-&gt;thread_id = pthread_self();</div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-    init_symbian_thread_handle(d-&gt;data-&gt;symbian_thread_handle);</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -272,11 +261,7 @@ void QThreadPrivate::createEventDispatcher(QThreadData *data)</div><div class='ctx'>         data-&gt;eventDispatcher = new QEventDispatcherGlib;</div><div class='ctx'>     else</div><div class='ctx'> #endif</div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-        data-&gt;eventDispatcher = new QEventDispatcherSymbian;</div><div class='del'>-#else</div><div class='del'>-        data-&gt;eventDispatcher = new QEventDispatcherUNIX;</div><div class='del'>-#endif</div><div class='add'>+    data-&gt;eventDispatcher = new QEventDispatcherUNIX;</div><div class='ctx'>     data-&gt;eventDispatcher-&gt;startingUp();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -284,11 +269,8 @@ void QThreadPrivate::createEventDispatcher(QThreadData *data)</div><div class='ctx'> </div><div class='ctx'> void *QThreadPrivate::start(void *arg)</div><div class='ctx'> {</div><div class='del'>-    // Symbian Open C supports neither thread cancellation nor cleanup_push.</div><div class='del'>-#ifndef Q_OS_SYMBIAN</div><div class='ctx'>     pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);</div><div class='ctx'>     pthread_cleanup_push(QThreadPrivate::finish, arg);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'>     QThread *thr = reinterpret_cast&lt;QThread *&gt;(arg);</div><div class='ctx'>     QThreadData *data = QThreadData::get2(thr);</div><div class='hunk'>@@ -298,88 +280,63 @@ void *QThreadPrivate::start(void *arg)</div><div class='ctx'>         thr-&gt;setPriority(QThread::Priority(thr-&gt;d_func()-&gt;priority &amp; ~ThreadPriorityResetFlag));</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-    // Because Symbian Open C does not provide a way to convert between</div><div class='del'>-    // RThread and pthread_t, we must delay initialization of the RThread</div><div class='del'>-    // handle when creating a thread, until we are running in the new thread.</div><div class='del'>-    // Here, we pick up the current thread and assign that to the handle.</div><div class='del'>-    init_symbian_thread_handle(data-&gt;symbian_thread_handle);</div><div class='del'>-</div><div class='del'>-    // On symbian, threads other than the main thread are non critical by default</div><div class='del'>-    // This means a worker thread can crash without crashing the application - to</div><div class='del'>-    // use this feature, we would need to use RThread::Logon in the main thread</div><div class='del'>-    // to catch abnormal thread exit and emit the finished signal.</div><div class='del'>-    // For the sake of cross platform consistency, we set the thread as process critical</div><div class='del'>-    // - advanced users who want the symbian behaviour can change the critical</div><div class='del'>-    // attribute of the thread again once the app gains control in run()</div><div class='del'>-    User::SetCritical(User::EProcessCritical);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='add'>+    data-&gt;threadId = (Qt::HANDLE)pthread_self();</div><div class='ctx'>     set_thread_data(data);</div><div class='ctx'> </div><div class='ctx'>     data-&gt;ref();</div><div class='del'>-    data-&gt;quitNow = false;</div><div class='add'>+    {</div><div class='add'>+        QMutexLocker locker(&amp;thr-&gt;d_func()-&gt;mutex);</div><div class='add'>+        data-&gt;quitNow = thr-&gt;d_func()-&gt;exited;</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     // ### TODO: allow the user to create a custom event dispatcher</div><div class='ctx'>     createEventDispatcher(data);</div><div class='ctx'> </div><div class='ctx'>     emit thr-&gt;started();</div><div class='del'>-#ifndef Q_OS_SYMBIAN</div><div class='ctx'>     pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);</div><div class='ctx'>     pthread_testcancel();</div><div class='del'>-#endif</div><div class='ctx'>     thr-&gt;run();</div><div class='ctx'> </div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-    QThreadPrivate::finish(arg);</div><div class='del'>-#else</div><div class='ctx'>     pthread_cleanup_pop(1);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-void QThreadPrivate::finish(void *arg, bool lockAnyway, bool closeNativeHandle)</div><div class='del'>-#else</div><div class='ctx'> void QThreadPrivate::finish(void *arg)</div><div class='del'>-#endif</div><div class='ctx'> {</div><div class='ctx'>     QThread *thr = reinterpret_cast&lt;QThread *&gt;(arg);</div><div class='ctx'>     QThreadPrivate *d = thr-&gt;d_func();</div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-    if (lockAnyway)</div><div class='del'>-#endif</div><div class='del'>-        d-&gt;mutex.lock();</div><div class='ctx'> </div><div class='add'>+    QMutexLocker locker(&amp;d-&gt;mutex);</div><div class='add'>+</div><div class='add'>+    d-&gt;isInFinish = true;</div><div class='ctx'>     d-&gt;priority = QThread::InheritPriority;</div><div class='del'>-    d-&gt;running = false;</div><div class='del'>-    d-&gt;finished = true;</div><div class='del'>-    if (d-&gt;terminated)</div><div class='add'>+    bool terminated = d-&gt;terminated;</div><div class='add'>+    void *data = &amp;d-&gt;data-&gt;tls;</div><div class='add'>+    locker.unlock();</div><div class='add'>+    if (terminated)</div><div class='ctx'>         emit thr-&gt;terminated();</div><div class='del'>-    d-&gt;terminated = false;</div><div class='ctx'>     emit thr-&gt;finished();</div><div class='add'>+    QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);</div><div class='add'>+    QThreadStorageData::finish((void **)data);</div><div class='add'>+    locker.relock();</div><div class='add'>+    d-&gt;terminated = false;</div><div class='ctx'> </div><div class='del'>-    if (d-&gt;data-&gt;eventDispatcher) {</div><div class='del'>-        d-&gt;data-&gt;eventDispatcher-&gt;closingDown();</div><div class='del'>-        QAbstractEventDispatcher *eventDispatcher = d-&gt;data-&gt;eventDispatcher;</div><div class='add'>+    QAbstractEventDispatcher *eventDispatcher = d-&gt;data-&gt;eventDispatcher;</div><div class='add'>+    if (eventDispatcher) {</div><div class='ctx'>         d-&gt;data-&gt;eventDispatcher = 0;</div><div class='add'>+        locker.unlock();</div><div class='add'>+        eventDispatcher-&gt;closingDown();</div><div class='ctx'>         delete eventDispatcher;</div><div class='add'>+        locker.relock();</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    void *data = &amp;d-&gt;data-&gt;tls;</div><div class='del'>-    QThreadStorageData::finish((void **)data);</div><div class='del'>-</div><div class='ctx'>     d-&gt;thread_id = 0;</div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-    if (closeNativeHandle)</div><div class='del'>-        d-&gt;data-&gt;symbian_thread_handle.Close();</div><div class='del'>-#endif</div><div class='add'>+    d-&gt;running = false;</div><div class='add'>+    d-&gt;finished = true;</div><div class='add'>+</div><div class='add'>+    d-&gt;isInFinish = false;</div><div class='ctx'>     d-&gt;thread_done.wakeAll();</div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-    if (lockAnyway)</div><div class='del'>-#endif</div><div class='del'>-        d-&gt;mutex.unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -404,7 +361,7 @@ int QThread::idealThreadCount()</div><div class='ctx'> {</div><div class='ctx'>     int cores = -1;</div><div class='ctx'> </div><div class='del'>-#if defined(Q_OS_MAC)</div><div class='add'>+#if defined(Q_OS_MAC) &amp;&amp; !defined(Q_WS_QPA)</div><div class='ctx'>     // Mac OS X</div><div class='ctx'>     cores = MPProcessorsScheduled();</div><div class='ctx'> #elif defined(Q_OS_HPUX)</div><div class='hunk'>@@ -432,21 +389,6 @@ int QThread::idealThreadCount()</div><div class='ctx'> #elif defined(Q_OS_INTEGRITY)</div><div class='ctx'>     // as of aug 2008 Integrity only supports one single core CPU</div><div class='ctx'>     cores = 1;</div><div class='del'>-#elif defined(Q_OS_SYMBIAN)</div><div class='del'>-    if (QSysInfo::symbianVersion() &gt;= QSysInfo::SV_SF_3) {</div><div class='del'>-        TInt inumcpus;</div><div class='del'>-        TInt err;</div><div class='del'>-        err = HAL::Get((HALData::TAttribute)QT_HALData_ENumCpus, inumcpus);</div><div class='del'>-        if (err != KErrNone) {</div><div class='del'>-            cores = 1;</div><div class='del'>-        } else if ( inumcpus &lt;= 0 ) {</div><div class='del'>-            cores = 1;</div><div class='del'>-        } else {</div><div class='del'>-            cores = inumcpus;</div><div class='del'>-        }</div><div class='del'>-    } else {</div><div class='del'>-        cores = 1;</div><div class='del'>-    }</div><div class='ctx'> #elif defined(Q_OS_VXWORKS)</div><div class='ctx'>     // VxWorks</div><div class='ctx'> #  if defined(QT_VXWORKS_HAS_CPUSET)</div><div class='hunk'>@@ -568,6 +510,10 @@ void QThread::start(Priority priority)</div><div class='ctx'> {</div><div class='ctx'>     Q_D(QThread);</div><div class='ctx'>     QMutexLocker locker(&amp;d-&gt;mutex);</div><div class='add'>+</div><div class='add'>+    if (d-&gt;isInFinish)</div><div class='add'>+        d-&gt;thread_done.wait(locker.mutex());</div><div class='add'>+</div><div class='ctx'>     if (d-&gt;running)</div><div class='ctx'>         return;</div><div class='ctx'> </div><div class='hunk'>@@ -583,8 +529,7 @@ void QThread::start(Priority priority)</div><div class='ctx'> </div><div class='ctx'>     d-&gt;priority = priority;</div><div class='ctx'> </div><div class='del'>-#if defined(QT_HAS_THREAD_PRIORITY_SCHEDULING) &amp;&amp; !defined(Q_OS_SYMBIAN)</div><div class='del'>-// ### Need to implement thread sheduling and priorities for symbian os. Implementation removed for now</div><div class='add'>+#if defined(QT_HAS_THREAD_PRIORITY_SCHEDULING)</div><div class='ctx'>     switch (priority) {</div><div class='ctx'>     case InheritPriority:</div><div class='ctx'>         {</div><div class='hunk'>@@ -626,12 +571,6 @@ void QThread::start(Priority priority)</div><div class='ctx'>     }</div><div class='ctx'> #endif // QT_HAS_THREAD_PRIORITY_SCHEDULING</div><div class='ctx'> </div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-    if (d-&gt;stackSize == 0)</div><div class='del'>-        // The default stack size on Symbian is very small, making even basic</div><div class='del'>-        // operations like file I/O fail, so we increase it by default.</div><div class='del'>-        d-&gt;stackSize = 0x14000; // Maximum stack size on Symbian.</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'>     if (d-&gt;stackSize &gt; 0) {</div><div class='ctx'> #if defined(_POSIX_THREAD_ATTR_STACKSIZE) &amp;&amp; (_POSIX_THREAD_ATTR_STACKSIZE-0 &gt; 0)</div><div class='hunk'>@@ -657,9 +596,7 @@ void QThread::start(Priority priority)</div><div class='ctx'>     if (code == EPERM) {</div><div class='ctx'>         // caller does not have permission to set the scheduling</div><div class='ctx'>         // parameters/policy</div><div class='del'>-#ifndef Q_OS_SYMBIAN</div><div class='ctx'>         pthread_attr_setinheritsched(&amp;attr, PTHREAD_INHERIT_SCHED);</div><div class='del'>-#endif</div><div class='ctx'>         code =</div><div class='ctx'>             pthread_create(&amp;d-&gt;thread_id, &amp;attr, QThreadPrivate::start, this);</div><div class='ctx'>     }</div><div class='hunk'>@@ -672,9 +609,6 @@ void QThread::start(Priority priority)</div><div class='ctx'>         d-&gt;running = false;</div><div class='ctx'>         d-&gt;finished = false;</div><div class='ctx'>         d-&gt;thread_id = 0;</div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-        d-&gt;data-&gt;symbian_thread_handle.Close();</div><div class='del'>-#endif</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -686,7 +620,6 @@ void QThread::terminate()</div><div class='ctx'>     if (!d-&gt;thread_id)</div><div class='ctx'>         return;</div><div class='ctx'> </div><div class='del'>-#ifndef Q_OS_SYMBIAN</div><div class='ctx'>     int code = pthread_cancel(d-&gt;thread_id);</div><div class='ctx'>     if (code) {</div><div class='ctx'>         qWarning("QThread::start: Thread termination error: %s",</div><div class='hunk'>@@ -694,26 +627,6 @@ void QThread::terminate()</div><div class='ctx'>     } else {</div><div class='ctx'>         d-&gt;terminated = true;</div><div class='ctx'>     }</div><div class='del'>-#else</div><div class='del'>-    if (!d-&gt;running)</div><div class='del'>-        return;</div><div class='del'>-    if (!d-&gt;terminationEnabled) {</div><div class='del'>-        d-&gt;terminatePending = true;</div><div class='del'>-        return;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    d-&gt;terminated = true;</div><div class='del'>-    // "false, false" meaning:</div><div class='del'>-    // 1. lockAnyway = false. Don't lock the mutex because it's already locked</div><div class='del'>-    //    (see above).</div><div class='del'>-    // 2. closeNativeSymbianHandle = false. We don't want to close the thread handle,</div><div class='del'>-    //    because we need it here to terminate the thread.</div><div class='del'>-    QThreadPrivate::finish(this, false, false);</div><div class='del'>-    d-&gt;data-&gt;symbian_thread_handle.Terminate(KErrNone);</div><div class='del'>-    d-&gt;data-&gt;symbian_thread_handle.Close();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QThread::wait(unsigned long time)</div><div class='hunk'>@@ -730,18 +643,6 @@ bool QThread::wait(unsigned long time)</div><div class='ctx'>         return true;</div><div class='ctx'> </div><div class='ctx'>     while (d-&gt;running) {</div><div class='del'>-#ifdef Q_OS_SYMBIAN</div><div class='del'>-        // Check if thread still exists. Needed because kernel will kill it without notification</div><div class='del'>-        // before global statics are deleted at application exit.</div><div class='del'>-        if (d-&gt;data-&gt;symbian_thread_handle.Handle()</div><div class='del'>-            &amp;&amp; d-&gt;data-&gt;symbian_thread_handle.ExitType() != EExitPending) {</div><div class='del'>-            // Cannot call finish here as wait is typically called from another thread.</div><div class='del'>-            // It won't be necessary anyway, as we should never get here under normal operations;</div><div class='del'>-            // all QThreads are EProcessCritical and therefore cannot normally exit</div><div class='del'>-            // undetected (i.e. panic) as long as all thread control is via QThread.</div><div class='del'>-            return true;</div><div class='del'>-        }</div><div class='del'>-#endif</div><div class='ctx'>         if (!d-&gt;thread_done.wait(locker.mutex(), time))</div><div class='ctx'>             return false;</div><div class='ctx'>     }</div><div class='hunk'>@@ -753,25 +654,11 @@ void QThread::setTerminationEnabled(bool enabled)</div><div class='ctx'>     QThread *thr = currentThread();</div><div class='ctx'>     Q_ASSERT_X(thr != 0, "QThread::setTerminationEnabled()",</div><div class='ctx'>                "Current thread was not started with QThread.");</div><div class='del'>-#ifndef Q_OS_SYMBIAN</div><div class='add'>+</div><div class='ctx'>     Q_UNUSED(thr)</div><div class='ctx'>     pthread_setcancelstate(enabled ? PTHREAD_CANCEL_ENABLE : PTHREAD_CANCEL_DISABLE, NULL);</div><div class='ctx'>     if (enabled)</div><div class='ctx'>         pthread_testcancel();</div><div class='del'>-#else</div><div class='del'>-    QThreadPrivate *d = thr-&gt;d_func();</div><div class='del'>-    QMutexLocker locker(&amp;d-&gt;mutex);</div><div class='del'>-    d-&gt;terminationEnabled = enabled;</div><div class='del'>-    if (enabled &amp;&amp; d-&gt;terminatePending) {</div><div class='del'>-        d-&gt;terminated = true;</div><div class='del'>-        // "false" meaning:</div><div class='del'>-        // -  lockAnyway = false. Don't lock the mutex because it's already locked</div><div class='del'>-        //    (see above).</div><div class='del'>-        QThreadPrivate::finish(thr, false);</div><div class='del'>-        locker.unlock(); // don't leave the mutex locked!</div><div class='del'>-        pthread_exit(NULL);</div><div class='del'>-    }</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void QThread::setPriority(Priority priority)</div><div class='head'>diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp<br/>index 304da09..80d7f3f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qthread_win.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qthread_win.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qthread_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qthread_win.cpp</a></div><div class='hunk'>@@ -124,6 +124,8 @@ QThreadData *QThreadData::current()</div><div class='ctx'>             }</div><div class='ctx'>             threadData-&gt;deref();</div><div class='ctx'>         }</div><div class='add'>+        threadData-&gt;isAdopted = true;</div><div class='add'>+        threadData-&gt;threadId = (Qt::HANDLE)GetCurrentThreadId();</div><div class='ctx'> </div><div class='ctx'>         if (!QCoreApplicationPrivate::theMainThread) {</div><div class='ctx'>             QCoreApplicationPrivate::theMainThread = threadData-&gt;thread;</div><div class='hunk'>@@ -231,7 +233,17 @@ void qt_adopted_thread_watcher_function(void *)</div><div class='ctx'>         } else {</div><div class='ctx'> //             printf("(qt) - qt_adopted_thread_watcher_function... called\n");</div><div class='ctx'>             const int qthreadIndex = handleIndex - 1;</div><div class='del'>-            QThreadData::get2(qt_adopted_qthreads.at(qthreadIndex))-&gt;deref();</div><div class='add'>+</div><div class='add'>+            QThreadData *data = QThreadData::get2(qt_adopted_qthreads.at(qthreadIndex));</div><div class='add'>+            if (data-&gt;isAdopted) {</div><div class='add'>+                QThread *thread = data-&gt;thread;</div><div class='add'>+                Q_ASSERT(thread);</div><div class='add'>+                QThreadPrivate *thread_p = static_cast&lt;QThreadPrivate *&gt;(QObjectPrivate::get(thread));</div><div class='add'>+                Q_ASSERT(!thread_p-&gt;finished);</div><div class='add'>+                thread_p-&gt;finish(thread);</div><div class='add'>+            }</div><div class='add'>+            data-&gt;deref();</div><div class='add'>+</div><div class='ctx'> #if !defined(Q_OS_WINCE) || (defined(_WIN32_WCE) &amp;&amp; (_WIN32_WCE&gt;=0x600))</div><div class='ctx'>             CloseHandle(qt_adopted_thread_handles.at(handleIndex));</div><div class='ctx'> #endif</div><div class='hunk'>@@ -288,17 +300,21 @@ void QThreadPrivate::createEventDispatcher(QThreadData *data)</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_THREAD</div><div class='ctx'> </div><div class='del'>-unsigned int __stdcall QThreadPrivate::start(void *arg)</div><div class='add'>+unsigned int __stdcall QT_ENSURE_STACK_ALIGNED_FOR_SSE QThreadPrivate::start(void *arg)</div><div class='ctx'> {</div><div class='ctx'>     QThread *thr = reinterpret_cast&lt;QThread *&gt;(arg);</div><div class='ctx'>     QThreadData *data = QThreadData::get2(thr);</div><div class='ctx'> </div><div class='ctx'>     qt_create_tls();</div><div class='ctx'>     TlsSetValue(qt_current_thread_data_tls_index, data);</div><div class='add'>+    data-&gt;threadId = (Qt::HANDLE)GetCurrentThreadId();</div><div class='ctx'> </div><div class='ctx'>     QThread::setTerminationEnabled(false);</div><div class='ctx'> </div><div class='del'>-    data-&gt;quitNow = false;</div><div class='add'>+    {</div><div class='add'>+        QMutexLocker locker(&amp;thr-&gt;d_func()-&gt;mutex);</div><div class='add'>+        data-&gt;quitNow = thr-&gt;d_func()-&gt;exited;</div><div class='add'>+    }</div><div class='ctx'>     // ### TODO: allow the user to create a custom event dispatcher</div><div class='ctx'>     createEventDispatcher(data);</div><div class='ctx'> </div><div class='hunk'>@@ -323,24 +339,33 @@ void QThreadPrivate::finish(void *arg, bool lockAnyway)</div><div class='ctx'>     QThread *thr = reinterpret_cast&lt;QThread *&gt;(arg);</div><div class='ctx'>     QThreadPrivate *d = thr-&gt;d_func();</div><div class='ctx'> </div><div class='del'>-    if (lockAnyway)</div><div class='del'>-        d-&gt;mutex.lock();</div><div class='add'>+    QMutexLocker locker(lockAnyway ? &amp;d-&gt;mutex : 0);</div><div class='add'>+    d-&gt;isInFinish = true;</div><div class='ctx'>     d-&gt;priority = QThread::InheritPriority;</div><div class='del'>-    d-&gt;running = false;</div><div class='del'>-    d-&gt;finished = true;</div><div class='del'>-    if (d-&gt;terminated)</div><div class='add'>+    bool terminated = d-&gt;terminated;</div><div class='add'>+    void **tls_data = reinterpret_cast&lt;void **&gt;(&amp;d-&gt;data-&gt;tls);</div><div class='add'>+    locker.unlock();</div><div class='add'>+    if (terminated)</div><div class='ctx'>         emit thr-&gt;terminated();</div><div class='del'>-    d-&gt;terminated = false;</div><div class='ctx'>     emit thr-&gt;finished();</div><div class='add'>+    QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);</div><div class='add'>+    QThreadStorageData::finish(tls_data);</div><div class='add'>+    locker.relock();</div><div class='add'>+</div><div class='add'>+    d-&gt;terminated = false;</div><div class='ctx'> </div><div class='del'>-    if (d-&gt;data-&gt;eventDispatcher) {</div><div class='del'>-        d-&gt;data-&gt;eventDispatcher-&gt;closingDown();</div><div class='del'>-        QAbstractEventDispatcher *eventDispatcher = d-&gt;data-&gt;eventDispatcher;</div><div class='add'>+    QAbstractEventDispatcher *eventDispatcher = d-&gt;data-&gt;eventDispatcher;</div><div class='add'>+    if (eventDispatcher) {</div><div class='ctx'>         d-&gt;data-&gt;eventDispatcher = 0;</div><div class='add'>+        locker.unlock();</div><div class='add'>+        eventDispatcher-&gt;closingDown();</div><div class='ctx'>         delete eventDispatcher;</div><div class='add'>+        locker.relock();</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    QThreadStorageData::finish(reinterpret_cast&lt;void **&gt;(&amp;d-&gt;data-&gt;tls));</div><div class='add'>+    d-&gt;running = false;</div><div class='add'>+    d-&gt;finished = true;</div><div class='add'>+    d-&gt;isInFinish = false;</div><div class='ctx'> </div><div class='ctx'>     if (!d-&gt;waiters) {</div><div class='ctx'>         CloseHandle(d-&gt;handle);</div><div class='hunk'>@@ -349,8 +374,6 @@ void QThreadPrivate::finish(void *arg, bool lockAnyway)</div><div class='ctx'> </div><div class='ctx'>     d-&gt;id = 0;</div><div class='ctx'> </div><div class='del'>-    if (lockAnyway)</div><div class='del'>-        d-&gt;mutex.unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**************************************************************************</div><div class='hunk'>@@ -399,6 +422,12 @@ void QThread::start(Priority priority)</div><div class='ctx'>     Q_D(QThread);</div><div class='ctx'>     QMutexLocker locker(&amp;d-&gt;mutex);</div><div class='ctx'> </div><div class='add'>+    if (d-&gt;isInFinish) {</div><div class='add'>+        locker.unlock();</div><div class='add'>+        wait();</div><div class='add'>+        locker.relock();</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     if (d-&gt;running)</div><div class='ctx'>         return;</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/thread/qthreadstorage.cpp b/src/corelib/thread/qthreadstorage.cpp<br/>index fdbd85f..0913292 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qthreadstorage.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qthreadstorage.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qthreadstorage.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qthreadstorage.cpp</a></div><div class='hunk'>@@ -178,11 +178,12 @@ void QThreadStorageData::finish(void **p)</div><div class='ctx'>         return; // nothing to do</div><div class='ctx'> </div><div class='ctx'>     DEBUG_MSG("QThreadStorageData: Destroying storage for thread %p", QThread::currentThread());</div><div class='del'>-</div><div class='del'>-    for(int i = tls-&gt;size() - 1; i &gt;= 0; i--) {</div><div class='del'>-        void *&amp;value = (*tls)[i];</div><div class='add'>+    while (!tls-&gt;isEmpty()) {</div><div class='add'>+        void *&amp;value = tls-&gt;last();</div><div class='ctx'>         void *q = value;</div><div class='ctx'>         value = 0;</div><div class='add'>+        int i = tls-&gt;size() - 1;</div><div class='add'>+        tls-&gt;resize(i);</div><div class='ctx'> </div><div class='ctx'>         if (!q) {</div><div class='ctx'>             // data already deleted</div><div class='hunk'>@@ -200,6 +201,11 @@ void QThreadStorageData::finish(void **p)</div><div class='ctx'>             continue;</div><div class='ctx'>         }</div><div class='ctx'>         destructor(q); //crash here might mean the thread exited after qthreadstorage was destroyed</div><div class='add'>+</div><div class='add'>+        if (tls-&gt;size() &gt; i) {</div><div class='add'>+            //re reset the tls in case it has been recreated by its own destructor.</div><div class='add'>+            (*tls)[i] = 0;</div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='ctx'>     tls-&gt;clear();</div><div class='ctx'> }</div><div class='hunk'>@@ -215,19 +221,18 @@ void QThreadStorageData::finish(void **p)</div><div class='ctx'>     QThreadStorage is a template class that provides per-thread data</div><div class='ctx'>     storage.</div><div class='ctx'> </div><div class='del'>-    \e{Note that due to compiler limitations, QThreadStorage can only</div><div class='del'>-    store pointers.}</div><div class='del'>-</div><div class='ctx'>     The setLocalData() function stores a single thread-specific value</div><div class='ctx'>     for the calling thread. The data can be accessed later using</div><div class='del'>-    localData(). QThreadStorage takes ownership of the data (which</div><div class='del'>-    must be created on the heap with \c new) and deletes it when the</div><div class='del'>-    thread exits, either normally or via termination.</div><div class='add'>+    localData().</div><div class='ctx'> </div><div class='ctx'>     The hasLocalData() function allows the programmer to determine if</div><div class='ctx'>     data has previously been set using the setLocalData() function.</div><div class='ctx'>     This is also useful for lazy initializiation.</div><div class='ctx'> </div><div class='add'>+    If T is a pointer type, QThreadStorage takes ownership of the data</div><div class='add'>+    (which must be created on the heap with \c new) and deletes it when</div><div class='add'>+    the thread exits, either normally or via termination.</div><div class='add'>+</div><div class='ctx'>     For example, the following code uses QThreadStorage to store a</div><div class='ctx'>     single cache for each thread that calls the cacheObject() and</div><div class='ctx'>     removeFromCache() functions. The cache is automatically</div><div class='hunk'>@@ -241,9 +246,6 @@ void QThreadStorageData::finish(void **p)</div><div class='ctx'> </div><div class='ctx'>     \list</div><div class='ctx'> </div><div class='del'>-    \o As noted above, QThreadStorage can only store pointers due to</div><div class='del'>-    compiler limitations.</div><div class='del'>-</div><div class='ctx'>     \o The QThreadStorage destructor does not delete per-thread data.</div><div class='ctx'>     QThreadStorage only deletes per-thread data when the thread exits</div><div class='ctx'>     or when setLocalData() is called multiple times.</div><div class='hunk'>@@ -279,8 +281,11 @@ void QThreadStorageData::finish(void **p)</div><div class='ctx'> /*!</div><div class='ctx'>     \fn bool QThreadStorage::hasLocalData() const</div><div class='ctx'> </div><div class='del'>-    Returns true if the calling thread has non-zero data available;</div><div class='del'>-    otherwise returns false.</div><div class='add'>+    If T is a pointer type, returns true if the calling thread has</div><div class='add'>+    non-zero data available.</div><div class='add'>+</div><div class='add'>+    If T is a value type, returns whether the data has already been</div><div class='add'>+    constructed by calling setLocalData or localData.</div><div class='ctx'> </div><div class='ctx'>     \sa localData()</div><div class='ctx'> */</div><div class='hunk'>@@ -291,10 +296,8 @@ void QThreadStorageData::finish(void **p)</div><div class='ctx'>     Returns a reference to the data that was set by the calling</div><div class='ctx'>     thread.</div><div class='ctx'> </div><div class='del'>-    Note: QThreadStorage can only store pointers. This function</div><div class='del'>-    returns a reference to the pointer that was set by the calling</div><div class='del'>-    thread. The value of this reference is 0 if no data was set by</div><div class='del'>-    the calling thread,</div><div class='add'>+    If no data has been set, this will create a default constructed</div><div class='add'>+    instance of type T.</div><div class='ctx'> </div><div class='ctx'>     \sa hasLocalData()</div><div class='ctx'> */</div><div class='hunk'>@@ -305,10 +308,6 @@ void QThreadStorageData::finish(void **p)</div><div class='ctx'> </div><div class='ctx'>     Returns a copy of the data that was set by the calling thread.</div><div class='ctx'> </div><div class='del'>-    Note: QThreadStorage can only store pointers. This function</div><div class='del'>-    returns a pointer to the data that was set by the calling thread.</div><div class='del'>-    If no data was set by the calling thread, this function returns 0.</div><div class='del'>-</div><div class='ctx'>     \sa hasLocalData()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='hunk'>@@ -318,19 +317,9 @@ void QThreadStorageData::finish(void **p)</div><div class='ctx'>     Sets the local data for the calling thread to \a data. It can be</div><div class='ctx'>     accessed later using the localData() functions.</div><div class='ctx'> </div><div class='del'>-    If \a data is 0, this function deletes the previous data (if</div><div class='del'>-    any) and returns immediately.</div><div class='del'>-</div><div class='del'>-    If \a data is non-zero, QThreadStorage takes ownership of the \a</div><div class='del'>-    data and deletes it automatically either when the thread exits</div><div class='del'>-    (either normally or via termination) or when setLocalData() is</div><div class='del'>-    called again.</div><div class='del'>-</div><div class='del'>-    Note: QThreadStorage can only store pointers. The \a data</div><div class='del'>-    argument must be either a pointer to an object created on the heap</div><div class='del'>-    (i.e. using \c new) or 0. You should not delete \a data</div><div class='del'>-    yourself; QThreadStorage takes ownership and will delete the \a</div><div class='del'>-    data itself.</div><div class='add'>+    If T is a pointer type, QThreadStorage takes ownership of the data</div><div class='add'>+    and deletes it automatically either when the thread exits (either</div><div class='add'>+    normally or via termination) or when setLocalData() is called again.</div><div class='ctx'> </div><div class='ctx'>     \sa localData(), hasLocalData()</div><div class='ctx'> */</div><div class='head'>diff --git a/src/corelib/thread/qthreadstorage.h b/src/corelib/thread/qthreadstorage.h<br/>index 061dbc7..172dff0 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qthreadstorage.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qthreadstorage.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qthreadstorage.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qthreadstorage.h</a></div><div class='hunk'>@@ -91,7 +91,10 @@ inline</div><div class='ctx'> void qThreadStorage_setLocalData(QThreadStorageData &amp;d, T **t)</div><div class='ctx'> { (void) d.set(*t); }</div><div class='ctx'> </div><div class='del'>-#ifndef QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+inline</div><div class='add'>+void qThreadStorage_deleteData(void *d, T **)</div><div class='add'>+{ delete static_cast&lt;T *&gt;(d); }</div><div class='ctx'> </div><div class='ctx'> // value-based specialization</div><div class='ctx'> template &lt;typename T&gt;</div><div class='hunk'>@@ -116,7 +119,11 @@ inline</div><div class='ctx'> void qThreadStorage_setLocalData(QThreadStorageData &amp;d, T *t)</div><div class='ctx'> { (void) d.set(new T(*t)); }</div><div class='ctx'> </div><div class='del'>-#endif // QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+inline</div><div class='add'>+void qThreadStorage_deleteData(void *d, T *)</div><div class='add'>+{ delete static_cast&lt;T *&gt;(d); }</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> // MOC_SKIP_END</div><div class='ctx'> #endif</div><div class='hunk'>@@ -130,7 +137,7 @@ private:</div><div class='ctx'>     Q_DISABLE_COPY(QThreadStorage)</div><div class='ctx'> </div><div class='ctx'>     static inline void deleteData(void *x)</div><div class='del'>-    { delete static_cast&lt;T&gt;(x); }</div><div class='add'>+    { qThreadStorage_deleteData(x, reinterpret_cast&lt;T*&gt;(0)); }</div><div class='ctx'> </div><div class='ctx'> public:</div><div class='ctx'>     inline QThreadStorage() : d(deleteData) { }</div><div class='head'>diff --git a/src/corelib/thread/qwaitcondition_symbian.cpp b/src/corelib/thread/qwaitcondition_symbian.cpp<br/>new file mode 100644<br/>index 0000000..c6414e8<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qwaitcondition_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qwaitcondition_symbian.cpp</a></div><div class='hunk'>@@ -0,0 +1,196 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qplatformdefs.h"</div><div class='add'>+#include "qwaitcondition.h"</div><div class='add'>+#include "qmutex.h"</div><div class='add'>+#include "qreadwritelock.h"</div><div class='add'>+#include "qatomic.h"</div><div class='add'>+#include "qstring.h"</div><div class='add'>+#include "qelapsedtimer.h"</div><div class='add'>+</div><div class='add'>+#include "qmutex_p.h"</div><div class='add'>+#include "qreadwritelock_p.h"</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_THREAD</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+static void report_error(int err, const char *where, const char *what)</div><div class='add'>+{</div><div class='add'>+    if (err != KErrNone)</div><div class='add'>+        qWarning("%s: %s failure: %d", where, what, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+class QWaitConditionPrivate {</div><div class='add'>+public:</div><div class='add'>+    RMutex mutex;</div><div class='add'>+    RCondVar cond;</div><div class='add'>+    int waiters;</div><div class='add'>+    int wakeups;</div><div class='add'>+</div><div class='add'>+    QWaitConditionPrivate()</div><div class='add'>+    : waiters(0), wakeups(0)</div><div class='add'>+    {</div><div class='add'>+        qt_symbian_throwIfError(mutex.CreateLocal());</div><div class='add'>+        int err = cond.CreateLocal();</div><div class='add'>+        if (err != KErrNone) {</div><div class='add'>+            mutex.Close();</div><div class='add'>+            qt_symbian_throwIfError(err);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    ~QWaitConditionPrivate()</div><div class='add'>+    {</div><div class='add'>+        cond.Close();</div><div class='add'>+        mutex.Close();</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    bool wait(unsigned long time)</div><div class='add'>+    {</div><div class='add'>+        TInt err = KErrNone;</div><div class='add'>+        if (time == ULONG_MAX) {</div><div class='add'>+            // untimed wait, loop because RCondVar::Wait may return before the condition is triggered</div><div class='add'>+            do {</div><div class='add'>+                err = cond.Wait(mutex);</div><div class='add'>+            } while (err == KErrNone &amp;&amp; wakeups == 0);</div><div class='add'>+        } else {</div><div class='add'>+            unsigned long maxWait = KMaxTInt / 1000;</div><div class='add'>+            QElapsedTimer waitTimer;</div><div class='add'>+            do {</div><div class='add'>+                waitTimer.start();</div><div class='add'>+                unsigned long waitTime = qMin(maxWait, time);</div><div class='add'>+                // wait at least 1ms, as 0 means no wait</div><div class='add'>+                err = cond.TimedWait(mutex, qMax(1ul, waitTime) * 1000);</div><div class='add'>+                // RCondVar::TimedWait may return before the condition is triggered, update the timeout with actual wait time</div><div class='add'>+                time -= qMin((unsigned long)waitTimer.elapsed(), waitTime);</div><div class='add'>+            } while ((err == KErrNone &amp;&amp; wakeups == 0) || (err == KErrTimedOut &amp;&amp; time &gt; 0));</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        Q_ASSERT_X(waiters &gt; 0, "QWaitCondition::wait", "internal error (waiters)");</div><div class='add'>+        --waiters;</div><div class='add'>+        if (err == KErrNone) {</div><div class='add'>+            Q_ASSERT_X(wakeups &gt; 0, "QWaitCondition::wait", "internal error (wakeups)");</div><div class='add'>+            --wakeups;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        mutex.Signal();</div><div class='add'>+</div><div class='add'>+        if (err &amp;&amp; err != KErrTimedOut)</div><div class='add'>+            report_error(err, "QWaitCondition::wait()", "cv wait");</div><div class='add'>+        return err == KErrNone;</div><div class='add'>+    }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+QWaitCondition::QWaitCondition()</div><div class='add'>+{</div><div class='add'>+    d = new QWaitConditionPrivate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QWaitCondition::~QWaitCondition()</div><div class='add'>+{</div><div class='add'>+    delete d;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QWaitCondition::wakeOne()</div><div class='add'>+{</div><div class='add'>+    d-&gt;mutex.Wait();</div><div class='add'>+    d-&gt;wakeups = qMin(d-&gt;wakeups + 1, d-&gt;waiters);</div><div class='add'>+    d-&gt;cond.Signal();</div><div class='add'>+    d-&gt;mutex.Signal();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void QWaitCondition::wakeAll()</div><div class='add'>+{</div><div class='add'>+    d-&gt;mutex.Wait();</div><div class='add'>+    d-&gt;wakeups = d-&gt;waiters;</div><div class='add'>+    d-&gt;cond.Broadcast();</div><div class='add'>+    d-&gt;mutex.Signal();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QWaitCondition::wait(QMutex *mutex, unsigned long time)</div><div class='add'>+{</div><div class='add'>+    if (! mutex)</div><div class='add'>+        return false;</div><div class='add'>+    if (mutex-&gt;d-&gt;recursive) {</div><div class='add'>+        qWarning("QWaitCondition: cannot wait on recursive mutexes");</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    d-&gt;mutex.Wait();</div><div class='add'>+    ++d-&gt;waiters;</div><div class='add'>+    mutex-&gt;unlock();</div><div class='add'>+</div><div class='add'>+    bool returnValue = d-&gt;wait(time);</div><div class='add'>+</div><div class='add'>+    mutex-&gt;lock();</div><div class='add'>+</div><div class='add'>+    return returnValue;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool QWaitCondition::wait(QReadWriteLock *readWriteLock, unsigned long time)</div><div class='add'>+{</div><div class='add'>+    if (!readWriteLock || readWriteLock-&gt;d-&gt;accessCount == 0)</div><div class='add'>+        return false;</div><div class='add'>+    if (readWriteLock-&gt;d-&gt;accessCount &lt; -1) {</div><div class='add'>+        qWarning("QWaitCondition: cannot wait on QReadWriteLocks with recursive lockForWrite()");</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    d-&gt;mutex.Wait();</div><div class='add'>+    ++d-&gt;waiters;</div><div class='add'>+</div><div class='add'>+    int previousAccessCount = readWriteLock-&gt;d-&gt;accessCount;</div><div class='add'>+    readWriteLock-&gt;unlock();</div><div class='add'>+</div><div class='add'>+    bool returnValue = d-&gt;wait(time);</div><div class='add'>+</div><div class='add'>+    if (previousAccessCount &lt; 0)</div><div class='add'>+        readWriteLock-&gt;lockForWrite();</div><div class='add'>+    else</div><div class='add'>+        readWriteLock-&gt;lockForRead();</div><div class='add'>+</div><div class='add'>+    return returnValue;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+#endif // QT_NO_THREAD</div><div class='head'>diff --git a/src/corelib/thread/qwaitcondition_unix.cpp b/src/corelib/thread/qwaitcondition_unix.cpp<br/>index 4047999..b946a9d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qwaitcondition_unix.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/qwaitcondition_unix.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/qwaitcondition_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/qwaitcondition_unix.cpp</a></div><div class='hunk'>@@ -61,8 +61,6 @@ static void report_error(int code, const char *where, const char *what)</div><div class='ctx'>         qWarning("%s: %s failure: %s", where, what, qPrintable(qt_error_string(code)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> class QWaitConditionPrivate {</div><div class='ctx'> public:</div><div class='ctx'>     pthread_mutex_t mutex;</div><div class='head'>diff --git a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri<br/>index 03f661d..592ab16 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/thread/thread.pri?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/thread/thread.pri</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/thread/thread.pri?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/thread/thread.pri</a></div><div class='hunk'>@@ -4,11 +4,11 @@</div><div class='ctx'> HEADERS += thread/qmutex.h \</div><div class='ctx'>            thread/qreadwritelock.h \</div><div class='ctx'>            thread/qsemaphore.h \</div><div class='del'>- 	   thread/qthread.h \</div><div class='del'>- 	   thread/qthreadstorage.h \</div><div class='del'>- 	   thread/qwaitcondition.h \</div><div class='del'>-	   thread/qatomic.h</div><div class='del'>-	</div><div class='add'>+           thread/qthread.h \</div><div class='add'>+           thread/qthreadstorage.h \</div><div class='add'>+           thread/qwaitcondition.h \</div><div class='add'>+           thread/qatomic.h</div><div class='add'>+</div><div class='ctx'> # private headers</div><div class='ctx'> HEADERS += thread/qmutex_p.h \</div><div class='ctx'>            thread/qmutexpool_p.h \</div><div class='hunk'>@@ -19,15 +19,23 @@ HEADERS += thread/qmutex_p.h \</div><div class='ctx'> SOURCES += thread/qatomic.cpp \</div><div class='ctx'>            thread/qmutex.cpp \</div><div class='ctx'>            thread/qreadwritelock.cpp \</div><div class='del'>-	   thread/qmutexpool.cpp \</div><div class='del'>-	   thread/qsemaphore.cpp \</div><div class='del'>- 	   thread/qthread.cpp \</div><div class='del'>-           thread/qthreadstorage.cpp </div><div class='add'>+           thread/qmutexpool.cpp \</div><div class='add'>+           thread/qsemaphore.cpp \</div><div class='add'>+           thread/qthread.cpp \</div><div class='add'>+           thread/qthreadstorage.cpp</div><div class='ctx'> </div><div class='del'>-unix:SOURCES += thread/qmutex_unix.cpp \</div><div class='del'>-                thread/qthread_unix.cpp \</div><div class='del'>-		thread/qwaitcondition_unix.cpp</div><div class='add'>+unix:!symbian:SOURCES += thread/qmutex_unix.cpp \</div><div class='add'>+                         thread/qthread_unix.cpp \</div><div class='add'>+                         thread/qwaitcondition_unix.cpp</div><div class='add'>+</div><div class='add'>+symbian:SOURCES += thread/qmutex_symbian.cpp \</div><div class='add'>+                   thread/qthread_symbian.cpp \</div><div class='add'>+                   thread/qwaitcondition_symbian.cpp</div><div class='ctx'> </div><div class='ctx'> win32:SOURCES += thread/qmutex_win.cpp \</div><div class='ctx'>                  thread/qthread_win.cpp \</div><div class='ctx'> 		 thread/qwaitcondition_win.cpp</div><div class='add'>+</div><div class='add'>+integrity:SOURCES += thread/qmutex_unix.cpp \</div><div class='add'>+                thread/qthread_unix.cpp \</div><div class='add'>+		thread/qwaitcondition_unix.cpp</div><div class='head'>diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp<br/>index e947d08..5538180 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qbitarray.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qbitarray.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qbitarray.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qbitarray.cpp</a></div><div class='hunk'>@@ -418,6 +418,13 @@ void QBitArray::fill(bool value, int begin, int end)</div><div class='ctx'>     this bit array.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+/*! \fn void QBitArray::swap(QBitArray &amp;other)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Swaps bit array \a other with this bit array. This operation is very</div><div class='add'>+    fast and never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='ctx'> /*! \fn bool QBitArray::operator==(const QBitArray &amp;other) const</div><div class='ctx'> </div><div class='ctx'>     Returns true if \a other is equal to this bit array; otherwise</div><div class='head'>diff --git a/src/corelib/tools/qbitarray.h b/src/corelib/tools/qbitarray.h<br/>index cd3a240..3b66b9f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qbitarray.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qbitarray.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qbitarray.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qbitarray.h</a></div><div class='hunk'>@@ -63,6 +63,12 @@ public:</div><div class='ctx'>     explicit QBitArray(int size, bool val = false);</div><div class='ctx'>     QBitArray(const QBitArray &amp;other) : d(other.d) {}</div><div class='ctx'>     inline QBitArray &amp;operator=(const QBitArray &amp;other) { d = other.d; return *this; }</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    inline QBitArray &amp;operator=(QBitArray &amp;&amp;other)</div><div class='add'>+    { qSwap(d, other.d); return *this; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    inline void swap(QBitArray &amp;other) { qSwap(d, other.d); }</div><div class='ctx'> </div><div class='ctx'>     inline int size() const { return (d.size() &lt;&lt; 3) - *d.constData(); }</div><div class='ctx'>     inline int count() const { return (d.size() &lt;&lt; 3) - *d.constData(); }</div><div class='head'>diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp<br/>index 29a4c77..767b713 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qbytearray.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qbytearray.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qbytearray.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qbytearray.cpp</a></div><div class='hunk'>@@ -541,12 +541,19 @@ QByteArray qUncompress(const uchar* data, int nbytes)</div><div class='ctx'> </div><div class='ctx'>     forever {</div><div class='ctx'>         ulong alloc = len;</div><div class='del'>-        d.reset(q_check_ptr(static_cast&lt;QByteArray::Data *&gt;(qRealloc(d.take(), sizeof(QByteArray::Data) + alloc))));</div><div class='del'>-        if (!d) {</div><div class='add'>+        if (len  &gt;= (1 &lt;&lt; 31) - sizeof(QByteArray::Data)) {</div><div class='add'>+            //QByteArray does not support that huge size anyway.</div><div class='add'>+            qWarning("qUncompress: Input data is corrupted");</div><div class='add'>+            return QByteArray();</div><div class='add'>+        }</div><div class='add'>+        QByteArray::Data *p = static_cast&lt;QByteArray::Data *&gt;(qRealloc(d.data(), sizeof(QByteArray::Data) + alloc));</div><div class='add'>+        if (!p) {</div><div class='ctx'>             // we are not allowed to crash here when compiling with QT_NO_EXCEPTIONS</div><div class='ctx'>             qWarning("qUncompress: could not allocate enough memory to uncompress data");</div><div class='ctx'>             return QByteArray();</div><div class='ctx'>         }</div><div class='add'>+        d.take(); // realloc was successful</div><div class='add'>+        d.reset(p);</div><div class='ctx'> </div><div class='ctx'>         int res = ::uncompress((uchar*)d-&gt;array, &amp;len,</div><div class='ctx'>                                (uchar*)data+4, nbytes-4);</div><div class='hunk'>@@ -554,12 +561,19 @@ QByteArray qUncompress(const uchar* data, int nbytes)</div><div class='ctx'>         switch (res) {</div><div class='ctx'>         case Z_OK:</div><div class='ctx'>             if (len != alloc) {</div><div class='del'>-                d.reset(q_check_ptr(static_cast&lt;QByteArray::Data *&gt;(qRealloc(d.take(), sizeof(QByteArray::Data) + len))));</div><div class='del'>-                if (!d) {</div><div class='add'>+                if (len  &gt;= (1 &lt;&lt; 31) - sizeof(QByteArray::Data)) {</div><div class='add'>+                    //QByteArray does not support that huge size anyway.</div><div class='add'>+                    qWarning("qUncompress: Input data is corrupted");</div><div class='add'>+                    return QByteArray();</div><div class='add'>+                }</div><div class='add'>+                QByteArray::Data *p = static_cast&lt;QByteArray::Data *&gt;(qRealloc(d.data(), sizeof(QByteArray::Data) + len));</div><div class='add'>+                if (!p) {</div><div class='ctx'>                     // we are not allowed to crash here when compiling with QT_NO_EXCEPTIONS</div><div class='ctx'>                     qWarning("qUncompress: could not allocate enough memory to uncompress data");</div><div class='ctx'>                     return QByteArray();</div><div class='ctx'>                 }</div><div class='add'>+                d.take(); // realloc was successful</div><div class='add'>+                d.reset(p);</div><div class='ctx'>             }</div><div class='ctx'>             d-&gt;ref = 1;</div><div class='ctx'>             d-&gt;alloc = d-&gt;size = len;</div><div class='hunk'>@@ -673,12 +687,12 @@ QByteArray::Data QByteArray::shared_empty = { Q_BASIC_ATOMIC_INITIALIZER(1),</div><div class='ctx'>     values. To set all the bytes to a particular value, call fill().</div><div class='ctx'> </div><div class='ctx'>     To obtain a pointer to the actual character data, call data() or</div><div class='del'>-    constData(). These functions return a pointer to the beginning of</div><div class='del'>-    the data. The pointer is guaranteed to remain valid until a</div><div class='del'>-    non-const function is called on the QByteArray. It is also</div><div class='del'>-    guaranteed that the data ends with a '\\0' byte. This '\\0' byte</div><div class='del'>-    is automatically provided by QByteArray and is not counted in</div><div class='del'>-    size().</div><div class='add'>+    constData(). These functions return a pointer to the beginning of the data.</div><div class='add'>+    The pointer is guaranteed to remain valid until a non-const function is</div><div class='add'>+    called on the QByteArray. It is also guaranteed that the data ends with a</div><div class='add'>+    '\\0' byte unless the QByteArray was created from a \l{fromRawData()}{raw</div><div class='add'>+    data}. This '\\0' byte is automatically provided by QByteArray and is not</div><div class='add'>+    counted in size().</div><div class='ctx'> </div><div class='ctx'>     QByteArray provides the following basic functions for modifying</div><div class='ctx'>     the byte data: append(), prepend(), insert(), replace(), and</div><div class='hunk'>@@ -900,15 +914,24 @@ QByteArray &amp;QByteArray::operator=(const char *str)</div><div class='ctx'>     return *this;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*! \fn void QByteArray::swap(QByteArray &amp;other)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Swaps byte array \a other with this byte array. This operation is very</div><div class='add'>+    fast and never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='ctx'> /*! \fn int QByteArray::size() const</div><div class='ctx'> </div><div class='ctx'>     Returns the number of bytes in this byte array.</div><div class='ctx'> </div><div class='del'>-    The last byte in the byte array is at position size() - 1. In</div><div class='del'>-    addition, QByteArray ensures that the byte at position size() is</div><div class='del'>-    always '\\0', so that you can use the return value of data() and</div><div class='del'>-    constData() as arguments to functions that expect '\\0'-terminated</div><div class='del'>-    strings.</div><div class='add'>+    The last byte in the byte array is at position size() - 1. In addition,</div><div class='add'>+    QByteArray ensures that the byte at position size() is always '\\0', so</div><div class='add'>+    that you can use the return value of data() and constData() as arguments to</div><div class='add'>+    functions that expect '\\0'-terminated strings. If the QByteArray object</div><div class='add'>+    was created from a \l{fromRawData()}{raw data} that didn't include the</div><div class='add'>+    trailing null-termination character then QByteArray doesn't add it</div><div class='add'>+    automaticall unless the \l{deep copy} is created.</div><div class='ctx'> </div><div class='ctx'>     Example:</div><div class='ctx'>     \snippet doc/src/snippets/code/src_corelib_tools_qbytearray.cpp 6</div><div class='hunk'>@@ -1039,10 +1062,11 @@ QByteArray &amp;QByteArray::operator=(const char *str)</div><div class='ctx'> </div><div class='ctx'> /*! \fn const char *QByteArray::constData() const</div><div class='ctx'> </div><div class='del'>-    Returns a pointer to the data stored in the byte array. The</div><div class='del'>-    pointer can be used to access the bytes that compose the array.</div><div class='del'>-    The data is '\\0'-terminated. The pointer remains valid as long</div><div class='del'>-    as the byte array isn't reallocated or destroyed.</div><div class='add'>+    Returns a pointer to the data stored in the byte array. The pointer can be</div><div class='add'>+    used to access the bytes that compose the array. The data is</div><div class='add'>+    '\\0'-terminated unless the QByteArray object was created from raw data.</div><div class='add'>+    The pointer remains valid as long as the byte array isn't reallocated or</div><div class='add'>+    destroyed.</div><div class='ctx'> </div><div class='ctx'>     This function is mostly useful to pass a byte array to a function</div><div class='ctx'>     that accepts a \c{const char *}.</div><div class='hunk'>@@ -1051,7 +1075,7 @@ QByteArray &amp;QByteArray::operator=(const char *str)</div><div class='ctx'>     but most functions that take \c{char *} arguments assume that the</div><div class='ctx'>     data ends at the first '\\0' they encounter.</div><div class='ctx'> </div><div class='del'>-    \sa data(), operator[]()</div><div class='add'>+    \sa data(), operator[](), fromRawData()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*! \fn void QByteArray::detach()</div><div class='head'>diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h<br/>index 1e06458..2cb79c3 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qbytearray.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qbytearray.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qbytearray.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qbytearray.h</a></div><div class='hunk'>@@ -52,6 +52,18 @@</div><div class='ctx'> #error qbytearray.h must be included before any header file that defines truncate</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(Q_CC_GNU) &amp;&amp; (__GNUC__ == 4 &amp;&amp; __GNUC_MINOR__ == 0)</div><div class='add'>+//There is a bug in GCC 4.0 that tries to instantiate template of annonymous enum</div><div class='add'>+#  ifdef QT_USE_FAST_OPERATOR_PLUS</div><div class='add'>+#    undef QT_USE_FAST_OPERATOR_PLUS</div><div class='add'>+#  endif</div><div class='add'>+#  ifdef QT_USE_QSTRINGBUILDER</div><div class='add'>+#    undef QT_USE_QSTRINGBUILDER</div><div class='add'>+#  endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> QT_BEGIN_HEADER</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='hunk'>@@ -144,6 +156,12 @@ public:</div><div class='ctx'> </div><div class='ctx'>     QByteArray &amp;operator=(const QByteArray &amp;);</div><div class='ctx'>     QByteArray &amp;operator=(const char *str);</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    inline QByteArray &amp;operator=(QByteArray &amp;&amp;other)</div><div class='add'>+    { qSwap(d, other.d); return *this; }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    inline void swap(QByteArray &amp;other) { qSwap(d, other.d); }</div><div class='ctx'> </div><div class='ctx'>     inline int size() const;</div><div class='ctx'>     bool isEmpty() const;</div><div class='hunk'>@@ -542,6 +560,7 @@ inline bool operator&gt;=(const QByteArray &amp;a1, const char *a2)</div><div class='ctx'> { return qstrcmp(a1, a2) &gt;= 0; }</div><div class='ctx'> inline bool operator&gt;=(const char *a1, const QByteArray &amp;a2)</div><div class='ctx'> { return qstrcmp(a1, a2) &gt;= 0; }</div><div class='add'>+#if !defined(QT_USE_QSTRINGBUILDER)</div><div class='ctx'> inline const QByteArray operator+(const QByteArray &amp;a1, const QByteArray &amp;a2)</div><div class='ctx'> { return QByteArray(a1) += a2; }</div><div class='ctx'> inline const QByteArray operator+(const QByteArray &amp;a1, const char *a2)</div><div class='hunk'>@@ -552,6 +571,7 @@ inline const QByteArray operator+(const char *a1, const QByteArray &amp;a2)</div><div class='ctx'> { return QByteArray(a1) += a2; }</div><div class='ctx'> inline const QByteArray operator+(char a1, const QByteArray &amp;a2)</div><div class='ctx'> { return QByteArray(&amp;a1, 1) += a2; }</div><div class='add'>+#endif // QT_USE_QSTRINGBUILDER</div><div class='ctx'> inline QBool QByteArray::contains(const char *c) const</div><div class='ctx'> { return QBool(indexOf(c) != -1); }</div><div class='ctx'> inline QByteArray &amp;QByteArray::replace(char before, const char *c)</div><div class='hunk'>@@ -594,4 +614,8 @@ QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> QT_END_HEADER</div><div class='ctx'> </div><div class='add'>+#ifdef QT_USE_QSTRINGBUILDER</div><div class='add'>+#include &lt;QtCore/qstring.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #endif // QBYTEARRAY_H</div><div class='head'>diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h<br/>index c588b63..16861c9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qcache.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qcache.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qcache.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qcache.h</a></div><div class='hunk'>@@ -61,7 +61,7 @@ class QCache</div><div class='ctx'>     };</div><div class='ctx'>     Node *f, *l;</div><div class='ctx'>     QHash&lt;Key, Node&gt; hash;</div><div class='del'>-    void *unused;</div><div class='add'>+    void *unused; // ### Qt5: remove</div><div class='ctx'>     int mx, total;</div><div class='ctx'> </div><div class='ctx'>     inline void unlink(Node &amp;n) {</div><div class='head'>diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp<br/>index b806d22..9db7d1a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qchar.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qchar.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qchar.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qchar.cpp</a></div><div class='hunk'>@@ -48,11 +48,11 @@</div><div class='ctx'> #  undef QT_NO_CAST_TO_ASCII</div><div class='ctx'> #endif</div><div class='ctx'> #include "qchar.h"</div><div class='add'>+</div><div class='ctx'> #include "qdatastream.h"</div><div class='ctx'> #include "qtextcodec.h"</div><div class='ctx'> </div><div class='ctx'> #include "qunicodetables_p.h"</div><div class='del'>-</div><div class='ctx'> #include "qunicodetables.cpp"</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='hunk'>@@ -677,7 +677,7 @@ bool QChar::isSymbol() const</div><div class='ctx'>     \since 4.7</div><div class='ctx'> </div><div class='ctx'>     Returns true if the UCS-4-encoded character specified by \a ucs4</div><div class='del'>-    is the high part of a utf16 surrogate</div><div class='add'>+    is the low part of a utf16 surrogate</div><div class='ctx'>     (ie. if its code point is between 0xdc00 and 0xdfff, inclusive).</div><div class='ctx'> */</div><div class='ctx'> </div><div class='hunk'>@@ -686,7 +686,7 @@ bool QChar::isSymbol() const</div><div class='ctx'>     \since 4.7</div><div class='ctx'> </div><div class='ctx'>     Returns true if the UCS-4-encoded character specified by \a ucs4</div><div class='del'>-    can be splited to the high and low parts of a utf16 surrogate</div><div class='add'>+    can be split into the high and low parts of a utf16 surrogate</div><div class='ctx'>     (ie. if its code point is greater than or equals to 0x10000).</div><div class='ctx'> */</div><div class='ctx'> </div><div class='hunk'>@@ -1069,6 +1069,15 @@ QChar::UnicodeVersion QChar::unicodeVersion(ushort ucs2)</div><div class='ctx'>     return (QChar::UnicodeVersion) qGetProp(ucs2)-&gt;unicodeVersion;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns the most recent supported Unicode version.</div><div class='add'>+*/</div><div class='add'>+QChar::UnicodeVersion QChar::currentUnicodeVersion()</div><div class='add'>+{</div><div class='add'>+    return UNICODE_DATA_VERSION;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     Returns the lowercase equivalent if the character is uppercase or titlecase;</div><div class='hunk'>@@ -1489,6 +1498,16 @@ static void decomposeHelper(QString *str, bool canonical, QChar::UnicodeVersion</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+struct UCS2Pair {</div><div class='add'>+    ushort u1;</div><div class='add'>+    ushort u2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+inline bool operator&lt;(ushort u1, const UCS2Pair &amp;ligature)</div><div class='add'>+{ return u1 &lt; ligature.u1; }</div><div class='add'>+inline bool operator&lt;(const UCS2Pair &amp;ligature, ushort u1)</div><div class='add'>+{ return ligature.u1 &lt; u1; }</div><div class='add'>+</div><div class='ctx'> static ushort ligatureHelper(ushort u1, ushort u2)</div><div class='ctx'> {</div><div class='ctx'>     // hangul L-V pair</div><div class='hunk'>@@ -1511,12 +1530,14 @@ static ushort ligatureHelper(ushort u1, ushort u2)</div><div class='ctx'>     if (index == 0xffff)</div><div class='ctx'>         return 0;</div><div class='ctx'>     const unsigned short *ligatures = uc_ligature_map+index;</div><div class='del'>-    ushort length = *ligatures;</div><div class='del'>-    ++ligatures;</div><div class='del'>-    // ### use bsearch</div><div class='del'>-    for (uint i = 0; i &lt; length; ++i)</div><div class='del'>-        if (ligatures[2*i] == u1)</div><div class='del'>-            return ligatures[2*i+1];</div><div class='add'>+    ushort length = *ligatures++;</div><div class='add'>+    {</div><div class='add'>+        const UCS2Pair *data = reinterpret_cast&lt;const UCS2Pair *&gt;(ligatures);</div><div class='add'>+        const UCS2Pair *r = qBinaryFind(data, data + length, u1);</div><div class='add'>+        if (r != data + length)</div><div class='add'>+            return r-&gt;u2;</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h<br/>index 69d0c52..3ec53bd 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qchar.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qchar.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qchar.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qchar.h</a></div><div class='hunk'>@@ -105,7 +105,7 @@ public:</div><div class='ctx'> </div><div class='ctx'>     enum Category</div><div class='ctx'>     {</div><div class='del'>-        NoCategory,</div><div class='add'>+        NoCategory,    // ### Qt 5: replace with Other_NotAssigned</div><div class='ctx'> </div><div class='ctx'>         Mark_NonSpacing,          //   Mn</div><div class='ctx'>         Mark_SpacingCombining,    //   Mc</div><div class='hunk'>@@ -144,7 +144,7 @@ public:</div><div class='ctx'>         Symbol_Modifier,          //   Sk</div><div class='ctx'>         Symbol_Other,             //   So</div><div class='ctx'> </div><div class='del'>-        Punctuation_Dask = Punctuation_Dash // oops</div><div class='add'>+        Punctuation_Dask = Punctuation_Dash // ### Qt 5: remove</div><div class='ctx'>     };</div><div class='ctx'> </div><div class='ctx'>     enum Direction</div><div class='hunk'>@@ -210,7 +210,7 @@ public:</div><div class='ctx'>     };</div><div class='ctx'> </div><div class='ctx'>     enum UnicodeVersion {</div><div class='del'>-        Unicode_Unassigned,</div><div class='add'>+        Unicode_Unassigned,    // ### Qt 5: assign with some constantly big value</div><div class='ctx'>         Unicode_1_1,</div><div class='ctx'>         Unicode_2_0,</div><div class='ctx'>         Unicode_2_1_2,</div><div class='hunk'>@@ -334,6 +334,8 @@ public:</div><div class='ctx'>     static UnicodeVersion QT_FASTCALL unicodeVersion(uint ucs4);</div><div class='ctx'>     static UnicodeVersion QT_FASTCALL unicodeVersion(ushort ucs2);</div><div class='ctx'> </div><div class='add'>+    static UnicodeVersion QT_FASTCALL currentUnicodeVersion();</div><div class='add'>+</div><div class='ctx'>     static QString QT_FASTCALL decomposition(uint ucs4);</div><div class='ctx'> </div><div class='ctx'> #ifdef QT3_SUPPORT</div><div class='head'>diff --git a/src/corelib/tools/qcontiguouscache.cpp b/src/corelib/tools/qcontiguouscache.cpp<br/>index afb5713..eef1f74 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qcontiguouscache.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qcontiguouscache.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qcontiguouscache.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qcontiguouscache.cpp</a></div><div class='hunk'>@@ -194,6 +194,13 @@ MyRecord record(int row) const</div><div class='ctx'>     Assigns \a other to this cache and returns a reference to this cache.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+/*! \fn void QContiguousCache::swap(QContiguousCache&lt;T&gt; &amp;other)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Swaps cache \a other with this cache. This operation is very</div><div class='add'>+    fast and never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='ctx'> /*! \fn bool QContiguousCache::operator==(const QContiguousCache&lt;T&gt; &amp;other) const</div><div class='ctx'> </div><div class='ctx'>     Returns true if \a other is equal to this cache; otherwise returns false.</div><div class='head'>diff --git a/src/corelib/tools/qcontiguouscache.h b/src/corelib/tools/qcontiguouscache.h<br/>index 157dce1..526d8fb 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qcontiguouscache.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qcontiguouscache.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qcontiguouscache.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qcontiguouscache.h</a></div><div class='hunk'>@@ -110,6 +110,11 @@ public:</div><div class='ctx'>     inline void setSharable(bool sharable) { if (!sharable) detach(); d-&gt;sharable = sharable; }</div><div class='ctx'> </div><div class='ctx'>     QContiguousCache&lt;T&gt; &amp;operator=(const QContiguousCache&lt;T&gt; &amp;other);</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    inline QContiguousCache&lt;T&gt; &amp;operator=(QContiguousCache&lt;T&gt; &amp;&amp;other)</div><div class='add'>+    { qSwap(d, other.d); return *this; }</div><div class='add'>+#endif</div><div class='add'>+    inline void swap(QContiguousCache&lt;T&gt; &amp;other) { qSwap(d, other.d); }</div><div class='ctx'>     bool operator==(const QContiguousCache&lt;T&gt; &amp;other) const;</div><div class='ctx'>     inline bool operator!=(const QContiguousCache&lt;T&gt; &amp;other) const { return !(*this == other); }</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp<br/>index 726b9aa..4303731 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qdatetime.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qdatetime.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qdatetime.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qdatetime.cpp</a></div><div class='hunk'>@@ -2460,7 +2460,11 @@ void QDateTime::setTime_t(uint secsSince1Jan1970UTC)</div><div class='ctx'> </div><div class='ctx'>     If the \a format is Qt::ISODate, the string format corresponds</div><div class='ctx'>     to the ISO 8601 extended specification for representations of</div><div class='del'>-    dates and times, taking the form YYYY-MM-DDTHH:MM:SS.</div><div class='add'>+    dates and times, taking the form YYYY-MM-DDTHH:MM:SS[Z|[+|-]HH:MM],</div><div class='add'>+    depending on the timeSpec() of the QDateTime. If the timeSpec()</div><div class='add'>+    is Qt::UTC, Z will be appended to the string; if the timeSpec() is</div><div class='add'>+    Qt::OffsetFromUTC the offset in hours and minutes from UTC will</div><div class='add'>+    be appended to the string.</div><div class='ctx'> </div><div class='ctx'>     If the \a format is Qt::SystemLocaleShortDate or</div><div class='ctx'>     Qt::SystemLocaleLongDate, the string format depends on the locale</div><div class='hunk'>@@ -2497,6 +2501,21 @@ QString QDateTime::toString(Qt::DateFormat f) const</div><div class='ctx'>             return QString();   // failed to convert</div><div class='ctx'>         buf += QLatin1Char('T');</div><div class='ctx'>         buf += d-&gt;time.toString(Qt::ISODate);</div><div class='add'>+        switch (d-&gt;spec) {</div><div class='add'>+        case QDateTimePrivate::UTC:</div><div class='add'>+            buf += QLatin1Char('Z');</div><div class='add'>+            break;</div><div class='add'>+        case QDateTimePrivate::OffsetFromUTC: {</div><div class='add'>+            int sign = d-&gt;utcOffset &gt;= 0 ? 1: -1;</div><div class='add'>+            buf += QString::fromLatin1("%1%2:%3").</div><div class='add'>+                arg(sign == 1 ? QLatin1Char('+') : QLatin1Char('-')).</div><div class='add'>+                arg(d-&gt;utcOffset * sign / SECS_PER_HOUR, 2, 10, QLatin1Char('0')).</div><div class='add'>+                arg((d-&gt;utcOffset / 60) % 60, 2, 10, QLatin1Char('0'));</div><div class='add'>+            break;</div><div class='add'>+        }</div><div class='add'>+        default:</div><div class='add'>+            break;</div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='ctx'> #ifndef QT_NO_TEXTDATE</div><div class='ctx'>     else if (f == Qt::TextDate) {</div><div class='hunk'>@@ -3426,8 +3445,9 @@ QDateTime QDateTime::fromString(const QString&amp; s, Qt::DateFormat f)</div><div class='ctx'>         QString tz = parts.at(5);</div><div class='ctx'>         if (!tz.startsWith(QLatin1String("GMT"), Qt::CaseInsensitive))</div><div class='ctx'>             return QDateTime();</div><div class='del'>-        int tzoffset = 0;</div><div class='add'>+        QDateTime dt(date, time, Qt::UTC);</div><div class='ctx'>         if (tz.length() &gt; 3) {</div><div class='add'>+            int tzoffset = 0;</div><div class='ctx'>             QChar sign = tz.at(3);</div><div class='ctx'>             if ((sign != QLatin1Char('+'))</div><div class='ctx'>                 &amp;&amp; (sign != QLatin1Char('-'))) {</div><div class='hunk'>@@ -3442,8 +3462,9 @@ QDateTime QDateTime::fromString(const QString&amp; s, Qt::DateFormat f)</div><div class='ctx'>             tzoffset = (tzhour*60 + tzminute) * 60;</div><div class='ctx'>             if (sign == QLatin1Char('-'))</div><div class='ctx'>                 tzoffset = -tzoffset;</div><div class='add'>+            dt.setUtcOffset(tzoffset);</div><div class='ctx'>         }</div><div class='del'>-        return QDateTime(date, time, Qt::UTC).addSecs(-tzoffset).toLocalTime();</div><div class='add'>+        return dt.toLocalTime();</div><div class='ctx'>     }</div><div class='ctx'> #endif //QT_NO_TEXTDATE</div><div class='ctx'>     }</div><div class='hunk'>@@ -5838,6 +5859,41 @@ bool operator==(const QDateTimeParser::SectionNode &amp;s1, const QDateTimeParser::S</div><div class='ctx'>     return (s1.type == s2.type) &amp;&amp; (s1.pos == s2.pos) &amp;&amp; (s1.count == s2.count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+const static TTime UnixEpochOffset(I64LIT(0xdcddb30f2f8000));</div><div class='add'>+const static TInt64 MinimumMillisecondTime(KMinTInt64 / 1000);</div><div class='add'>+const static TInt64 MaximumMillisecondTime(KMaxTInt64 / 1000);</div><div class='add'>+QDateTime qt_symbian_TTime_To_QDateTime(const TTime&amp; time)</div><div class='add'>+{</div><div class='add'>+    TTimeIntervalMicroSeconds absolute = time.MicroSecondsFrom(UnixEpochOffset);</div><div class='add'>+</div><div class='add'>+    return QDateTime::fromMSecsSinceEpoch(absolute.Int64() / 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TTime qt_symbian_QDateTime_To_TTime(const QDateTime&amp; datetime)</div><div class='add'>+{</div><div class='add'>+    qint64 absolute = datetime.toMSecsSinceEpoch();</div><div class='add'>+    if(absolute &gt; MaximumMillisecondTime)</div><div class='add'>+        return TTime(KMaxTInt64);</div><div class='add'>+    if(absolute &lt; MinimumMillisecondTime)</div><div class='add'>+        return TTime(KMinTInt64);</div><div class='add'>+    return TTime(absolute * 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+time_t qt_symbian_TTime_To_time_t(const TTime&amp; time)</div><div class='add'>+{</div><div class='add'>+    TTimeIntervalSeconds interval;</div><div class='add'>+    TInt err = time.SecondsFrom(UnixEpochOffset, interval);</div><div class='add'>+    if (err || interval.Int() &lt; 0)</div><div class='add'>+        return (time_t) 0;</div><div class='add'>+    return (time_t) interval.Int();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+TTime qt_symbian_time_t_To_TTime(time_t time)</div><div class='add'>+{</div><div class='add'>+    return UnixEpochOffset + TTimeIntervalSeconds(time);</div><div class='add'>+}</div><div class='add'>+#endif //Q_OS_SYMBIAN</div><div class='ctx'> </div><div class='ctx'> #endif // QT_BOOTSTRAPPED</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/tools/qdatetime_p.h b/src/corelib/tools/qdatetime_p.h<br/>index 282954f..8d931dc 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qdatetime_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qdatetime_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qdatetime_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qdatetime_p.h</a></div><div class='hunk'>@@ -275,6 +275,12 @@ Q_CORE_EXPORT bool operator==(const QDateTimeParser::SectionNode &amp;s1, const QDat</div><div class='ctx'> Q_DECLARE_OPERATORS_FOR_FLAGS(QDateTimeParser::Sections)</div><div class='ctx'> Q_DECLARE_OPERATORS_FOR_FLAGS(QDateTimeParser::FieldInfo)</div><div class='ctx'> </div><div class='add'>+#ifdef Q_OS_SYMBIAN</div><div class='add'>+QDateTime qt_symbian_TTime_To_QDateTime(const TTime&amp; time);</div><div class='add'>+TTime qt_symbian_QDateTime_To_TTime(const QDateTime&amp; datetime);</div><div class='add'>+time_t qt_symbian_TTime_To_time_t(const TTime&amp; time);</div><div class='add'>+TTime qt_symbian_time_t_To_TTime(time_t time);</div><div class='add'>+#endif //Q_OS_SYMBIAN</div><div class='ctx'> </div><div class='ctx'> #endif // QT_BOOTSTRAPPED</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/tools/qelapsedtimer.cpp b/src/corelib/tools/qelapsedtimer.cpp<br/>index 61ec2c2..039c769 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qelapsedtimer.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qelapsedtimer.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qelapsedtimer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qelapsedtimer.cpp</a></div><div class='hunk'>@@ -136,10 +136,11 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'>     implementations, to guarantee that the same reference clock is being</div><div class='ctx'>     used.</div><div class='ctx'> </div><div class='del'>-    \value SystemTime       The human-readable system time. This clock is not monotonic.</div><div class='del'>-    \value MonotonicClock   The system's monotonic clock, usually found in Unix systems. This clock is monotonic and does not overflow.</div><div class='del'>-    \value TickCounter      The system's tick counter, used on Windows and Symbian systems. This clock may overflow.</div><div class='del'>-    \value MachAbsoluteTime The Mach kernel's absolute time (Mac OS X). This clock is monotonic and does not overflow.</div><div class='add'>+    \value SystemTime         The human-readable system time. This clock is not monotonic.</div><div class='add'>+    \value MonotonicClock     The system's monotonic clock, usually found in Unix systems. This clock is monotonic and does not overflow.</div><div class='add'>+    \value TickCounter        The system's tick counter, used on Windows and Symbian systems. This clock may overflow.</div><div class='add'>+    \value MachAbsoluteTime   The Mach kernel's absolute time (Mac OS X). This clock is monotonic and does not overflow.</div><div class='add'>+    \value PerformanceCounter The high-resolution performance counter provided by Windows. This clock is monotonic and does not overflow.</div><div class='ctx'> </div><div class='ctx'>     \section2 SystemTime</div><div class='ctx'> </div><div class='hunk'>@@ -163,7 +164,9 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='ctx'>     The tick counter clock type is based on the system's or the processor's</div><div class='ctx'>     tick counter, multiplied by the duration of a tick. This clock type is</div><div class='del'>-    used on Windows and Symbian platforms.</div><div class='add'>+    used on Windows and Symbian platforms. If the high-precision performance</div><div class='add'>+    counter is available on Windows, the \tt{PerformanceCounter} clock type</div><div class='add'>+    is used instead.</div><div class='ctx'> </div><div class='ctx'>     The TickCounter clock type is the only clock type that may overflow.</div><div class='ctx'>     Windows Vista and Windows Server 2008 support the extended 64-bit tick</div><div class='hunk'>@@ -191,6 +194,16 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='ctx'>     This clock is monotonic and does not overflow.</div><div class='ctx'> </div><div class='add'>+    \section2 PerformanceCounter</div><div class='add'>+</div><div class='add'>+    This clock uses the Windows functions \tt{QueryPerformanceCounter} and</div><div class='add'>+    \tt{QueryPerformanceFrequency} to access the system's high-precision</div><div class='add'>+    performance counter. Since this counter may not be available on all</div><div class='add'>+    systems, QElapsedTimer will fall back to the \tt{TickCounter} clock</div><div class='add'>+    automatically, if this clock cannot be used.</div><div class='add'>+</div><div class='add'>+    This clock is monotonic and does not overflow.</div><div class='add'>+</div><div class='ctx'>     \sa clockType(), isMonotonic()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/tools/qelapsedtimer.h b/src/corelib/tools/qelapsedtimer.h<br/>index f1bad56..6e5be84 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qelapsedtimer.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qelapsedtimer.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qelapsedtimer.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qelapsedtimer.h</a></div><div class='hunk'>@@ -57,7 +57,8 @@ public:</div><div class='ctx'>         SystemTime,</div><div class='ctx'>         MonotonicClock,</div><div class='ctx'>         TickCounter,</div><div class='del'>-        MachAbsoluteTime</div><div class='add'>+        MachAbsoluteTime,</div><div class='add'>+        PerformanceCounter</div><div class='ctx'>     };</div><div class='ctx'>     static ClockType clockType();</div><div class='ctx'>     static bool isMonotonic();</div><div class='hunk'>@@ -67,6 +68,7 @@ public:</div><div class='ctx'>     void invalidate();</div><div class='ctx'>     bool isValid() const;</div><div class='ctx'> </div><div class='add'>+    qint64 nsecsElapsed() const;</div><div class='ctx'>     qint64 elapsed() const;</div><div class='ctx'>     bool hasExpired(qint64 timeout) const;</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/tools/qelapsedtimer_generic.cpp b/src/corelib/tools/qelapsedtimer_generic.cpp<br/>index a136bff..165efa9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qelapsedtimer_generic.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qelapsedtimer_generic.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qelapsedtimer_generic.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qelapsedtimer_generic.cpp</a></div><div class='hunk'>@@ -103,6 +103,22 @@ qint64 QElapsedTimer::restart()</div><div class='ctx'>     return t1 - old;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*! \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns the number of nanoseconds since this QElapsedTimer was last</div><div class='add'>+    started. Calling this function in a QElapsedTimer that was invalidated</div><div class='add'>+    will result in undefined results.</div><div class='add'>+</div><div class='add'>+    On platforms that do not provide nanosecond resolution, the value returned</div><div class='add'>+    will be the best estimate available.</div><div class='add'>+</div><div class='add'>+    \sa start(), restart(), hasExpired(), invalidate()</div><div class='add'>+*/</div><div class='add'>+qint64 QElapsedTimer::nsecsElapsed() const</div><div class='add'>+{</div><div class='add'>+    return elapsed() * 1000000;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*!</div><div class='ctx'>     Returns the number of milliseconds since this QElapsedTimer was last</div><div class='ctx'>     started. Calling this function in a QElapsedTimer that was invalidated</div><div class='head'>diff --git a/src/corelib/tools/qelapsedtimer_mac.cpp b/src/corelib/tools/qelapsedtimer_mac.cpp<br/>index 4167666..4b1275f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qelapsedtimer_mac.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qelapsedtimer_mac.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qelapsedtimer_mac.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qelapsedtimer_mac.cpp</a></div><div class='hunk'>@@ -97,6 +97,12 @@ qint64 QElapsedTimer::restart()</div><div class='ctx'>     return absoluteToMSecs(t1 - old);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+qint64 QElapsedTimer::nsecsElapsed() const</div><div class='add'>+{</div><div class='add'>+    uint64_t cpu_time = mach_absolute_time();</div><div class='add'>+    return absoluteToNSecs(cpu_time - t1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> qint64 QElapsedTimer::elapsed() const</div><div class='ctx'> {</div><div class='ctx'>     uint64_t cpu_time = mach_absolute_time();</div><div class='head'>diff --git a/src/corelib/tools/qelapsedtimer_symbian.cpp b/src/corelib/tools/qelapsedtimer_symbian.cpp<br/>index 40eccb95..dd5909f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qelapsedtimer_symbian.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qelapsedtimer_symbian.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qelapsedtimer_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qelapsedtimer_symbian.cpp</a></div><div class='hunk'>@@ -64,11 +64,6 @@ static quint64 getMicrosecondFromTick()</div><div class='ctx'>     return nanokernel_tick_period * (val | (quint64(highdword) &lt;&lt; 32));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static quint64 getMillisecondFromTick()</div><div class='del'>-{</div><div class='del'>-    return getMicrosecondFromTick() / 1000;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> timeval qt_gettime()</div><div class='ctx'> {</div><div class='ctx'>     timeval tv;</div><div class='hunk'>@@ -91,36 +86,41 @@ bool QElapsedTimer::isMonotonic()</div><div class='ctx'> </div><div class='ctx'> void QElapsedTimer::start()</div><div class='ctx'> {</div><div class='del'>-    t1 = getMillisecondFromTick();</div><div class='add'>+    t1 = getMicrosecondFromTick();</div><div class='ctx'>     t2 = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> qint64 QElapsedTimer::restart()</div><div class='ctx'> {</div><div class='ctx'>     qint64 oldt1 = t1;</div><div class='del'>-    t1 = getMillisecondFromTick();</div><div class='add'>+    t1 = getMicrosecondFromTick();</div><div class='ctx'>     t2 = 0;</div><div class='del'>-    return t1 - oldt1;</div><div class='add'>+    return (t1 - oldt1) / 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+qint64 QElapsedTimer::nsecsElapsed() const</div><div class='add'>+{</div><div class='add'>+    return (getMicrosecondFromTick() - t1) * 1000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> qint64 QElapsedTimer::elapsed() const</div><div class='ctx'> {</div><div class='del'>-    return getMillisecondFromTick() - t1;</div><div class='add'>+    return (getMicrosecondFromTick() - t1) / 1000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> qint64 QElapsedTimer::msecsSinceReference() const</div><div class='ctx'> {</div><div class='del'>-    return t1;</div><div class='add'>+    return t1 / 1000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> qint64 QElapsedTimer::msecsTo(const QElapsedTimer &amp;other) const</div><div class='ctx'> {</div><div class='del'>-    return other.t1 - t1;</div><div class='add'>+    return (other.t1 - t1) / 1000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> qint64 QElapsedTimer::secsTo(const QElapsedTimer &amp;other) const</div><div class='ctx'> {</div><div class='del'>-    return msecsTo(other) / 1000;</div><div class='add'>+    return msecsTo(other) / 1000000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool operator&lt;(const QElapsedTimer &amp;v1, const QElapsedTimer &amp;v2)</div><div class='head'>diff --git a/src/corelib/tools/qelapsedtimer_unix.cpp b/src/corelib/tools/qelapsedtimer_unix.cpp<br/>index fab9c2b..8a04606 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qelapsedtimer_unix.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qelapsedtimer_unix.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qelapsedtimer_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qelapsedtimer_unix.cpp</a></div><div class='hunk'>@@ -167,6 +167,17 @@ qint64 QElapsedTimer::restart()</div><div class='ctx'>     return elapsedAndRestart(t1, t2, &amp;t1, &amp;t2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+qint64 QElapsedTimer::nsecsElapsed() const</div><div class='add'>+{</div><div class='add'>+    qint64 sec, frac;</div><div class='add'>+    do_gettime(&amp;sec, &amp;frac);</div><div class='add'>+    sec = sec - t1;</div><div class='add'>+    frac = frac - t2;</div><div class='add'>+    if (!monotonicClockAvailable)</div><div class='add'>+        frac *= 1000;</div><div class='add'>+    return sec * Q_INT64_C(1000000000) + frac;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> qint64 QElapsedTimer::elapsed() const</div><div class='ctx'> {</div><div class='ctx'>     qint64 sec, frac;</div><div class='head'>diff --git a/src/corelib/tools/qelapsedtimer_win.cpp b/src/corelib/tools/qelapsedtimer_win.cpp<br/>index a7cce26..cd076a6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qelapsedtimer_win.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qelapsedtimer_win.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qelapsedtimer_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qelapsedtimer_win.cpp</a></div><div class='hunk'>@@ -42,6 +42,9 @@</div><div class='ctx'> #include "qelapsedtimer.h"</div><div class='ctx'> #include &lt;windows.h&gt;</div><div class='ctx'> </div><div class='add'>+// Result of QueryPerformanceFrequency, 0 indicates that the high resolution timer is unavailable</div><div class='add'>+static quint64 counterFrequency = 0;</div><div class='add'>+</div><div class='ctx'> typedef ULONGLONG (WINAPI *PtrGetTickCount64)(void);</div><div class='ctx'> static PtrGetTickCount64 ptrGetTickCount64 = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -65,12 +68,44 @@ static void resolveLibs()</div><div class='ctx'>     ptrGetTickCount64 = (PtrGetTickCount64)GetProcAddress(kernel32, "GetTickCount64");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+    // Retrieve the number of high-resolution performance counter ticks per second</div><div class='add'>+    LARGE_INTEGER frequency;</div><div class='add'>+    if (!QueryPerformanceFrequency(&amp;frequency)) {</div><div class='add'>+        counterFrequency = 0;</div><div class='add'>+    } else {</div><div class='add'>+        counterFrequency = frequency.QuadPart;</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     done = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline qint64 ticksToNanoseconds(qint64 ticks)</div><div class='add'>+{</div><div class='add'>+    if (counterFrequency &gt; 0) {</div><div class='add'>+        // QueryPerformanceCounter uses an arbitrary frequency</div><div class='add'>+        return ticks * 1000000000 / counterFrequency;</div><div class='add'>+    } else {</div><div class='add'>+        // GetTickCount(64) return milliseconds</div><div class='add'>+        return ticks * 1000000;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static quint64 getTickCount()</div><div class='ctx'> {</div><div class='ctx'>     resolveLibs();</div><div class='add'>+</div><div class='add'>+    // This avoids a division by zero and disables the high performance counter if it's not available</div><div class='add'>+    if (counterFrequency &gt; 0) {</div><div class='add'>+        LARGE_INTEGER counter;</div><div class='add'>+</div><div class='add'>+        if (QueryPerformanceCounter(&amp;counter)) {</div><div class='add'>+            return counter.QuadPart;</div><div class='add'>+        } else {</div><div class='add'>+            qWarning("QueryPerformanceCounter failed, although QueryPerformanceFrequency succeeded.");</div><div class='add'>+            return 0;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     if (ptrGetTickCount64)</div><div class='ctx'>         return ptrGetTickCount64();</div><div class='ctx'> </div><div class='hunk'>@@ -85,7 +120,12 @@ static quint64 getTickCount()</div><div class='ctx'> </div><div class='ctx'> QElapsedTimer::ClockType QElapsedTimer::clockType()</div><div class='ctx'> {</div><div class='del'>-    return TickCounter;</div><div class='add'>+    resolveLibs();</div><div class='add'>+</div><div class='add'>+    if (counterFrequency &gt; 0)</div><div class='add'>+        return PerformanceCounter;</div><div class='add'>+    else</div><div class='add'>+        return TickCounter;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool QElapsedTimer::isMonotonic()</div><div class='hunk'>@@ -104,22 +144,30 @@ qint64 QElapsedTimer::restart()</div><div class='ctx'>     qint64 oldt1 = t1;</div><div class='ctx'>     t1 = getTickCount();</div><div class='ctx'>     t2 = 0;</div><div class='del'>-    return t1 - oldt1;</div><div class='add'>+    return ticksToNanoseconds(t1 - oldt1) / 1000000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+qint64 QElapsedTimer::nsecsElapsed() const</div><div class='add'>+{</div><div class='add'>+    qint64 elapsed = getTickCount() - t1;</div><div class='add'>+    return ticksToNanoseconds(elapsed);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> qint64 QElapsedTimer::elapsed() const</div><div class='ctx'> {</div><div class='del'>-    return getTickCount() - t1;</div><div class='add'>+    qint64 elapsed = getTickCount() - t1;</div><div class='add'>+    return ticksToNanoseconds(elapsed) / 1000000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> qint64 QElapsedTimer::msecsSinceReference() const</div><div class='ctx'> {</div><div class='del'>-    return t1;</div><div class='add'>+    return ticksToNanoseconds(t1) / 1000000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> qint64 QElapsedTimer::msecsTo(const QElapsedTimer &amp;other) const</div><div class='ctx'> {</div><div class='del'>-    return other.t1 - t1;</div><div class='add'>+    qint64 difference = other.t1 - t1;</div><div class='add'>+    return ticksToNanoseconds(difference) / 1000000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> qint64 QElapsedTimer::secsTo(const QElapsedTimer &amp;other) const</div><div class='head'>diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp<br/>index 9955ab0..f43e888 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qhash.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qhash.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qhash.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qhash.cpp</a></div><div class='hunk'>@@ -54,6 +54,10 @@</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+// ### Qt 5: see tests/benchmarks/corelib/tools/qhash/qhash_string.cpp</div><div class='add'>+// Hashing of the whole string is a waste of cycles.</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>     These functions are based on Peter J. Weinberger's hash function</div><div class='ctx'>     (from the Dragon Book). The constant 24 in the original function</div><div class='hunk'>@@ -730,6 +734,20 @@ void QHashData::checkSanity()</div><div class='ctx'>     Assigns \a other to this hash and returns a reference to this hash.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+/*! \fn void QHash::swap(QHash&lt;Key, T&gt; &amp;other)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Swaps hash \a other with this hash. This operation is very</div><div class='add'>+    fast and never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn void QMultiHash::swap(QMultiHash&lt;Key, T&gt; &amp;other)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Swaps hash \a other with this hash. This operation is very</div><div class='add'>+    fast and never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='ctx'> /*! \fn bool QHash::operator==(const QHash&lt;Key, T&gt; &amp;other) const</div><div class='ctx'> </div><div class='ctx'>     Returns true if \a other is equal to this hash; otherwise returns</div><div class='head'>diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h<br/>index ba4289d..a2d9434 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qhash.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qhash.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qhash.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qhash.h</a></div><div class='hunk'>@@ -225,7 +225,7 @@ struct QHashNode</div><div class='ctx'>     inline bool same_key(uint h0, const Key &amp;key0) { return h0 == h &amp;&amp; key0 == key; }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifndef QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION</div><div class='add'>+</div><div class='ctx'> #define Q_HASH_DECLARE_INT_NODES(key_type) \</div><div class='ctx'>     template &lt;class T&gt; \</div><div class='ctx'>     struct QHashDummyNode&lt;key_type, T&gt; { \</div><div class='hunk'>@@ -253,7 +253,6 @@ Q_HASH_DECLARE_INT_NODES(ushort);</div><div class='ctx'> Q_HASH_DECLARE_INT_NODES(int);</div><div class='ctx'> Q_HASH_DECLARE_INT_NODES(uint);</div><div class='ctx'> #undef Q_HASH_DECLARE_INT_NODES</div><div class='del'>-#endif // QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION</div><div class='ctx'> </div><div class='ctx'> template &lt;class Key, class T&gt;</div><div class='ctx'> class QHash</div><div class='hunk'>@@ -284,6 +283,11 @@ public:</div><div class='ctx'>     inline ~QHash() { if (!d-&gt;ref.deref()) freeData(d); }</div><div class='ctx'> </div><div class='ctx'>     QHash&lt;Key, T&gt; &amp;operator=(const QHash&lt;Key, T&gt; &amp;other);</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    inline QHash&lt;Key, T&gt; &amp;operator=(QHash&lt;Key, T&gt; &amp;&amp;other)</div><div class='add'>+    { qSwap(d, other.d); return *this; }</div><div class='add'>+#endif</div><div class='add'>+    inline void swap(QHash&lt;Key, T&gt; &amp;other) { qSwap(d, other.d); }</div><div class='ctx'> </div><div class='ctx'>     bool operator==(const QHash&lt;Key, T&gt; &amp;other) const;</div><div class='ctx'>     inline bool operator!=(const QHash&lt;Key, T&gt; &amp;other) const { return !(*this == other); }</div><div class='hunk'>@@ -513,8 +517,6 @@ Q_INLINE_TEMPLATE void QHash&lt;Key, T&gt;::deleteNode2(QHashData::Node *node)</div><div class='ctx'> {</div><div class='ctx'> #ifdef Q_CC_BOR</div><div class='ctx'>     concrete(node)-&gt;~QHashNode&lt;Key, T&gt;();</div><div class='del'>-#elif defined(QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION)</div><div class='del'>-    concrete(node)-&gt;~QHashNode();</div><div class='ctx'> #else</div><div class='ctx'>     concrete(node)-&gt;~Node();</div><div class='ctx'> #endif</div><div class='hunk'>@@ -924,6 +926,7 @@ class QMultiHash : public QHash&lt;Key, T&gt;</div><div class='ctx'> public:</div><div class='ctx'>     QMultiHash() {}</div><div class='ctx'>     QMultiHash(const QHash&lt;Key, T&gt; &amp;other) : QHash&lt;Key, T&gt;(other) {}</div><div class='add'>+    inline void swap(QMultiHash&lt;Key, T&gt; &amp;other) { QHash&lt;Key, T&gt;::swap(other); } // prevent QMultiHash&lt;-&gt;QHash swaps</div><div class='ctx'> </div><div class='ctx'>     inline typename QHash&lt;Key, T&gt;::iterator replace(const Key &amp;key, const T &amp;value)</div><div class='ctx'>     { return QHash&lt;Key, T&gt;::insert(key, value); }</div><div class='head'>diff --git a/src/corelib/tools/qlinkedlist.cpp b/src/corelib/tools/qlinkedlist.cpp<br/>index ca71042..266fc7d 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlinkedlist.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlinkedlist.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlinkedlist.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qlinkedlist.cpp</a></div><div class='hunk'>@@ -147,6 +147,13 @@ QLinkedListData QLinkedListData::shared_null = {</div><div class='ctx'>     list.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+/*! \fn void QLinkedList::swap(QLinkedList&lt;T&gt; &amp;other)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Swaps list \a other with this list. This operation is very</div><div class='add'>+    fast and never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='ctx'> /*! \fn bool QLinkedList::operator==(const QLinkedList&lt;T&gt; &amp;other) const</div><div class='ctx'> </div><div class='ctx'>     Returns true if \a other is equal to this list; otherwise returns</div><div class='head'>diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h<br/>index 365893c..18afb29 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlinkedlist.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlinkedlist.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlinkedlist.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qlinkedlist.h</a></div><div class='hunk'>@@ -85,6 +85,11 @@ public:</div><div class='ctx'>     inline QLinkedList(const QLinkedList&lt;T&gt; &amp;l) : d(l.d) { d-&gt;ref.ref(); if (!d-&gt;sharable) detach(); }</div><div class='ctx'>     ~QLinkedList();</div><div class='ctx'>     QLinkedList&lt;T&gt; &amp;operator=(const QLinkedList&lt;T&gt; &amp;);</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    inline QLinkedList&lt;T&gt; &amp;operator=(QLinkedList&lt;T&gt; &amp;&amp;other)</div><div class='add'>+    { qSwap(d, other.d); return *this; }</div><div class='add'>+#endif</div><div class='add'>+    inline void swap(QLinkedList&lt;T&gt; &amp;other) { qSwap(d, other.d); }</div><div class='ctx'>     bool operator==(const QLinkedList&lt;T&gt; &amp;l) const;</div><div class='ctx'>     inline bool operator!=(const QLinkedList&lt;T&gt; &amp;l) const { return !(*this == l); }</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp<br/>index 764a1d6..1c1d684 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlist.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlist.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlist.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qlist.cpp</a></div><div class='hunk'>@@ -590,6 +590,14 @@ void **QListData::erase(void **xi)</div><div class='ctx'>     \sa operator=()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+/*! \fn QList::QList(std::initializer_list&lt;T&gt; args)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Construct a list from a std::initilizer_list.</div><div class='add'>+</div><div class='add'>+    This constructor is only enabled if the compiler supports C++0x</div><div class='add'>+*/</div><div class='add'>+</div><div class='ctx'> /*! \fn QList::~QList()</div><div class='ctx'> </div><div class='ctx'>     Destroys the list. References to the values in the list and all</div><div class='hunk'>@@ -602,6 +610,13 @@ void **QListData::erase(void **xi)</div><div class='ctx'>     list.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+/*! \fn void QList::swap(QList&lt;T&gt; &amp;other)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Swaps list \a other with this list. This operation is very</div><div class='add'>+    fast and never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='ctx'> /*! \fn bool QList::operator==(const QList&lt;T&gt; &amp;other) const</div><div class='ctx'> </div><div class='ctx'>     Returns true if \a other is equal to this list; otherwise returns</div><div class='head'>diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h<br/>index 97bf5fa..4eb05d6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlist.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlist.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlist.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qlist.h</a></div><div class='hunk'>@@ -50,6 +50,10 @@</div><div class='ctx'> #include &lt;iterator&gt;</div><div class='ctx'> #include &lt;list&gt;</div><div class='ctx'> #endif</div><div class='add'>+#ifdef Q_COMPILER_INITIALIZER_LISTS</div><div class='add'>+#include &lt;iterator&gt;</div><div class='add'>+#include &lt;initializer_list&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;new&gt;</div><div class='ctx'> #include &lt;limits.h&gt;</div><div class='hunk'>@@ -118,6 +122,15 @@ public:</div><div class='ctx'>     inline QList(const QList&lt;T&gt; &amp;l) : d(l.d) { d-&gt;ref.ref(); if (!d-&gt;sharable) detach_helper(); }</div><div class='ctx'>     ~QList();</div><div class='ctx'>     QList&lt;T&gt; &amp;operator=(const QList&lt;T&gt; &amp;l);</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    inline QList &amp;operator=(QList &amp;&amp;other)</div><div class='add'>+    { qSwap(d, other.d); return *this; }</div><div class='add'>+#endif</div><div class='add'>+    inline void swap(QList&lt;T&gt; &amp;other) { qSwap(d, other.d); }</div><div class='add'>+#ifdef Q_COMPILER_INITIALIZER_LISTS</div><div class='add'>+    inline QList(std::initializer_list&lt;T&gt; args) : d(&amp;QListData::shared_null)</div><div class='add'>+    { d-&gt;ref.ref(); qCopy(args.begin(), args.end(), std::back_inserter(*this)); }</div><div class='add'>+#endif</div><div class='ctx'>     bool operator==(const QList&lt;T&gt; &amp;l) const;</div><div class='ctx'>     inline bool operator!=(const QList&lt;T&gt; &amp;l) const { return !(*this == l); }</div><div class='ctx'> </div><div class='hunk'>@@ -715,7 +728,7 @@ Q_OUTOFLINE_TEMPLATE void QList&lt;T&gt;::detach_helper()</div><div class='ctx'> template &lt;typename T&gt;</div><div class='ctx'> Q_OUTOFLINE_TEMPLATE QList&lt;T&gt;::~QList()</div><div class='ctx'> {</div><div class='del'>-    if (d &amp;&amp; !d-&gt;ref.deref())</div><div class='add'>+    if (!d-&gt;ref.deref())</div><div class='ctx'>         free(d);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -743,8 +756,7 @@ Q_OUTOFLINE_TEMPLATE void QList&lt;T&gt;::free(QListData::Data *data)</div><div class='ctx'> {</div><div class='ctx'>     node_destruct(reinterpret_cast&lt;Node *&gt;(data-&gt;array + data-&gt;begin),</div><div class='ctx'>                   reinterpret_cast&lt;Node *&gt;(data-&gt;array + data-&gt;end));</div><div class='del'>-    if (data-&gt;ref == 0)</div><div class='del'>-        qFree(data);</div><div class='add'>+    qFree(data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp<br/>index 09c6d70..cde93d6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qlocale.cpp</a></div><div class='hunk'>@@ -54,11 +54,13 @@ QT_END_NAMESPACE</div><div class='ctx'> #include "qstring.h"</div><div class='ctx'> #include "qlocale.h"</div><div class='ctx'> #include "qlocale_p.h"</div><div class='add'>+#include "qlocale_tools_p.h"</div><div class='ctx'> #include "qdatetime_p.h"</div><div class='ctx'> #include "qnamespace.h"</div><div class='ctx'> #include "qdatetime.h"</div><div class='ctx'> #include "qstringlist.h"</div><div class='ctx'> #include "qvariant.h"</div><div class='add'>+#include "qstringbuilder.h"</div><div class='ctx'> #if defined(Q_WS_WIN)</div><div class='ctx'> #   include "qt_windows.h"</div><div class='ctx'> #   include &lt;time.h&gt;</div><div class='hunk'>@@ -68,72 +70,26 @@ QT_END_NAMESPACE</div><div class='ctx'> #   include &lt;CoreFoundation/CoreFoundation.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> #include "private/qnumeric_p.h"</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;float.h&gt;</div><div class='del'>-#include &lt;limits.h&gt;</div><div class='del'>-#include &lt;math.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;qdebug.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-</div><div class='del'>-#if defined(__GLIBC__) &amp;&amp; !defined(__UCLIBC__)</div><div class='del'>-#    include &lt;fenv.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if !defined(QT_QLOCALE_NEEDS_VOLATILE)</div><div class='del'>-#  if defined(Q_CC_GNU)</div><div class='del'>-#    if  __GNUC__ == 4</div><div class='del'>-#      define QT_QLOCALE_NEEDS_VOLATILE</div><div class='del'>-#    elif defined(Q_OS_WIN)</div><div class='del'>-#      define QT_QLOCALE_NEEDS_VOLATILE</div><div class='del'>-#    endif</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(QT_QLOCALE_NEEDS_VOLATILE)</div><div class='del'>-#   define NEEDS_VOLATILE volatile</div><div class='del'>-#else</div><div class='del'>-#   define NEEDS_VOLATILE</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-// Sizes as defined by the ISO C99 standard - fallback</div><div class='del'>-#ifndef LLONG_MAX</div><div class='del'>-#   define LLONG_MAX Q_INT64_C(0x7fffffffffffffff)</div><div class='del'>-#endif</div><div class='del'>-#ifndef LLONG_MIN</div><div class='del'>-#   define LLONG_MIN (-LLONG_MAX - Q_INT64_C(1))</div><div class='del'>-#endif</div><div class='del'>-#ifndef ULLONG_MAX</div><div class='del'>-#   define ULLONG_MAX Q_UINT64_C(0xffffffffffffffff)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define CONVERSION_BUFF_SIZE 255</div><div class='add'>+#include "private/qsystemlibrary_p.h"</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='del'>-#ifndef QT_QLOCALE_USES_FCVT</div><div class='del'>-static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt,</div><div class='del'>-                        int *sign, char **rve, char **digits_str);</div><div class='del'>-#endif</div><div class='del'>-Q_CORE_EXPORT char *qdtoa(double d, int mode, int ndigits, int *decpt,</div><div class='del'>-                        int *sign, char **rve, char **digits_str);</div><div class='del'>-Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);</div><div class='del'>-static qlonglong qstrtoll(const char *nptr, const char **endptr, register int base, bool *ok);</div><div class='del'>-static qulonglong qstrtoull(const char *nptr, const char **endptr, register int base, bool *ok);</div><div class='del'>-</div><div class='del'>-#if defined(Q_CC_MWERKS) &amp;&amp; defined(Q_OS_WIN32)</div><div class='del'>-inline bool isascii(int c)</div><div class='del'>-{</div><div class='del'>-        return (c &gt;= 0 &amp;&amp; c &lt;=127);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if defined(Q_OS_SYMBIAN)</div><div class='ctx'> void qt_symbianUpdateSystemPrivate();</div><div class='ctx'> void qt_symbianInitSystemLocale();</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+static QSystemLocale *_systemLocale = 0;</div><div class='add'>+Q_GLOBAL_STATIC_WITH_ARGS(QSystemLocale, QSystemLocale_globalSystemLocale, (true))</div><div class='add'>+static QLocalePrivate *system_lp = 0;</div><div class='add'>+Q_GLOBAL_STATIC(QLocalePrivate, globalLocalePrivate)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef QT_USE_ICU</div><div class='add'>+extern bool qt_initIcu(const QString &amp;localeName);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> /******************************************************************************</div><div class='ctx'> ** Helpers for accessing Qt locale database</div><div class='ctx'> */</div><div class='hunk'>@@ -142,25 +98,14 @@ QT_BEGIN_INCLUDE_NAMESPACE</div><div class='ctx'> #include "qlocale_data_p.h"</div><div class='ctx'> QT_END_INCLUDE_NAMESPACE</div><div class='ctx'> </div><div class='del'>-QLocale::MeasurementSystem QLocalePrivate::measurementSystem() const</div><div class='del'>-{</div><div class='del'>-    for (int i = 0; i &lt; ImperialMeasurementSystemsCount; ++i) {</div><div class='del'>-        if (ImperialMeasurementSystems[i].languageId == m_language_id</div><div class='del'>-            &amp;&amp; ImperialMeasurementSystems[i].countryId == m_country_id) {</div><div class='del'>-            return QLocale::ImperialSystem;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    return QLocale::MetricSystem;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-// Assumes that code is a</div><div class='del'>-// QChar code[3];</div><div class='del'>-// If the code is two-digit the third digit must be 0</div><div class='del'>-static QLocale::Language codeToLanguage(const QChar *code)</div><div class='add'>+QLocale::Language QLocalePrivate::codeToLanguage(const QString &amp;code)</div><div class='ctx'> {</div><div class='del'>-    ushort uc1 = code[0].unicode();</div><div class='del'>-    ushort uc2 = code[1].unicode();</div><div class='del'>-    ushort uc3 = code[2].unicode();</div><div class='add'>+    int len = code.length();</div><div class='add'>+    if (len != 2 &amp;&amp; len != 3)</div><div class='add'>+        return QLocale::C;</div><div class='add'>+    ushort uc1 = len-- &gt; 0 ? code[0].toLower().unicode() : 0;</div><div class='add'>+    ushort uc2 = len-- &gt; 0 ? code[1].toLower().unicode() : 0;</div><div class='add'>+    ushort uc3 = len-- &gt; 0 ? code[2].toLower().unicode() : 0;</div><div class='ctx'> </div><div class='ctx'>     if (uc1 == 'n' &amp;&amp; uc2 == 'o' &amp;&amp; uc3 == 0)</div><div class='ctx'>         uc2 = 'b';</div><div class='hunk'>@@ -174,13 +119,34 @@ static QLocale::Language codeToLanguage(const QChar *code)</div><div class='ctx'>     return QLocale::C;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// Assumes that code is a</div><div class='del'>-// QChar code[3];</div><div class='del'>-static QLocale::Country codeToCountry(const QChar *code)</div><div class='add'>+QLocale::Script QLocalePrivate::codeToScript(const QString &amp;code)</div><div class='add'>+{</div><div class='add'>+    int len = code.length();</div><div class='add'>+    if (len != 4)</div><div class='add'>+        return QLocale::AnyScript;</div><div class='add'>+</div><div class='add'>+    // script is titlecased in our data</div><div class='add'>+    unsigned char c0 = code.at(0).toUpper().toLatin1();</div><div class='add'>+    unsigned char c1 = code.at(1).toLower().toLatin1();</div><div class='add'>+    unsigned char c2 = code.at(2).toLower().toLatin1();</div><div class='add'>+    unsigned char c3 = code.at(3).toLower().toLatin1();</div><div class='add'>+</div><div class='add'>+    const unsigned char *c = script_code_list;</div><div class='add'>+    for (int i = 0; i &lt; QLocale::LastScript; ++i, c += 4) {</div><div class='add'>+        if (c0 == c[0] &amp;&amp; c1 == c[1] &amp;&amp; c2 == c[2] &amp;&amp; c3 == c[3])</div><div class='add'>+            return QLocale::Script(i);</div><div class='add'>+    }</div><div class='add'>+    return QLocale::AnyScript;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QLocale::Country QLocalePrivate::codeToCountry(const QString &amp;code)</div><div class='ctx'> {</div><div class='del'>-    ushort uc1 = code[0].unicode();</div><div class='del'>-    ushort uc2 = code[1].unicode();</div><div class='del'>-    ushort uc3 = code[2].unicode();</div><div class='add'>+    int len = code.length();</div><div class='add'>+    if (len != 2 &amp;&amp; len != 3)</div><div class='add'>+        return QLocale::AnyCountry;</div><div class='add'>+    ushort uc1 = len-- &gt; 0 ? code[0].toUpper().unicode() : 0;</div><div class='add'>+    ushort uc2 = len-- &gt; 0 ? code[1].toUpper().unicode() : 0;</div><div class='add'>+    ushort uc3 = len-- &gt; 0 ? code[2].toUpper().unicode() : 0;</div><div class='ctx'> </div><div class='ctx'>     const unsigned char *c = country_code_list;</div><div class='ctx'>     for (; *c != 0; c += 3) {</div><div class='hunk'>@@ -191,12 +157,14 @@ static QLocale::Country codeToCountry(const QChar *code)</div><div class='ctx'>     return QLocale::AnyCountry;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static QString languageToCode(QLocale::Language language)</div><div class='add'>+QString QLocalePrivate::languageCode() const</div><div class='ctx'> {</div><div class='del'>-    if (language == QLocale::C)</div><div class='add'>+    if (m_language_id == QLocale::AnyLanguage)</div><div class='add'>+        return QString();</div><div class='add'>+    if (m_language_id == QLocale::C)</div><div class='ctx'>         return QLatin1String("C");</div><div class='ctx'> </div><div class='del'>-    const unsigned char *c = language_code_list + 3*(uint(language));</div><div class='add'>+    const unsigned char *c = language_code_list + 3*(uint(m_language_id));</div><div class='ctx'> </div><div class='ctx'>     QString code(c[2] == 0 ? 2 : 3, Qt::Uninitialized);</div><div class='ctx'> </div><div class='hunk'>@@ -208,12 +176,20 @@ static QString languageToCode(QLocale::Language language)</div><div class='ctx'>     return code;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static QString countryToCode(QLocale::Country country)</div><div class='add'>+QString QLocalePrivate::scriptCode() const</div><div class='add'>+{</div><div class='add'>+    if (m_script_id == QLocale::AnyScript || m_script_id &gt; QLocale::LastScript)</div><div class='add'>+        return QString();</div><div class='add'>+    const unsigned char *c = script_code_list + 4*(uint(m_script_id));</div><div class='add'>+    return QString::fromLatin1((const char *)c, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QLocalePrivate::countryCode() const</div><div class='ctx'> {</div><div class='del'>-    if (country == QLocale::AnyCountry)</div><div class='add'>+    if (m_country_id == QLocale::AnyCountry)</div><div class='ctx'>         return QString();</div><div class='ctx'> </div><div class='del'>-    const unsigned char *c = country_code_list + 3*(uint(country));</div><div class='add'>+    const unsigned char *c = country_code_list + 3*(uint(m_country_id));</div><div class='ctx'> </div><div class='ctx'>     QString code(c[2] == 0 ? 2 : 3, Qt::Uninitialized);</div><div class='ctx'> </div><div class='hunk'>@@ -225,10 +201,46 @@ static QString countryToCode(QLocale::Country country)</div><div class='ctx'>     return code;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const QLocalePrivate *findLocale(QLocale::Language language, QLocale::Country country)</div><div class='add'>+QString QLocalePrivate::bcp47Name() const</div><div class='ctx'> {</div><div class='del'>-    unsigned language_id = language;</div><div class='del'>-    unsigned country_id = country;</div><div class='add'>+    if (m_language_id == QLocale::AnyLanguage)</div><div class='add'>+        return QString();</div><div class='add'>+    if (m_language_id == QLocale::C)</div><div class='add'>+        return QLatin1String("C");</div><div class='add'>+    const unsigned char *lang = language_code_list + 3*(uint(m_language_id));</div><div class='add'>+    const unsigned char *script =</div><div class='add'>+            (m_script_id != QLocale::AnyScript ? script_code_list + 4*(uint(m_script_id)) : 0);</div><div class='add'>+    const unsigned char *country =</div><div class='add'>+            (m_country_id != QLocale::AnyCountry  ? country_code_list + 3*(uint(m_country_id)) : 0);</div><div class='add'>+    char len = (lang[2] != 0 ? 3 : 2) + (script ? 4+1 : 0) + (country ? (country[2] != 0 ? 3 : 2)+1 : 0);</div><div class='add'>+    QString name(len, Qt::Uninitialized);</div><div class='add'>+    QChar *uc = name.data();</div><div class='add'>+    *uc++ = ushort(lang[0]);</div><div class='add'>+    *uc++ = ushort(lang[1]);</div><div class='add'>+    if (lang[2] != 0)</div><div class='add'>+        *uc++ = ushort(lang[2]);</div><div class='add'>+    if (script) {</div><div class='add'>+        *uc++ = QLatin1Char('-');</div><div class='add'>+        *uc++ = ushort(script[0]);</div><div class='add'>+        *uc++ = ushort(script[1]);</div><div class='add'>+        *uc++ = ushort(script[2]);</div><div class='add'>+        *uc++ = ushort(script[3]);</div><div class='add'>+    }</div><div class='add'>+    if (country) {</div><div class='add'>+        *uc++ = QLatin1Char('-');</div><div class='add'>+        *uc++ = ushort(country[0]);</div><div class='add'>+        *uc++ = ushort(country[1]);</div><div class='add'>+        if (country[2] != 0)</div><div class='add'>+            *uc++ = ushort(country[2]);</div><div class='add'>+    }</div><div class='add'>+    return name;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const QLocalePrivate *QLocalePrivate::findLocale(QLocale::Language language, QLocale::Script script, QLocale::Country country)</div><div class='add'>+{</div><div class='add'>+    const unsigned language_id = language;</div><div class='add'>+    const unsigned script_id = script;</div><div class='add'>+    const unsigned country_id = country;</div><div class='ctx'> </div><div class='ctx'>     uint idx = locale_index[language_id];</div><div class='ctx'> </div><div class='hunk'>@@ -237,102 +249,140 @@ static const QLocalePrivate *findLocale(QLocale::Language language, QLocale::Cou</div><div class='ctx'>     if (idx == 0) // default language has no associated country</div><div class='ctx'>         return d;</div><div class='ctx'> </div><div class='del'>-    if (country == QLocale::AnyCountry)</div><div class='add'>+    if (script == QLocale::AnyScript &amp;&amp; country == QLocale::AnyCountry)</div><div class='ctx'>         return d;</div><div class='ctx'> </div><div class='ctx'>     Q_ASSERT(d-&gt;languageId() == language_id);</div><div class='ctx'> </div><div class='del'>-    while (d-&gt;languageId() == language_id</div><div class='del'>-                &amp;&amp; d-&gt;countryId() != country_id)</div><div class='del'>-        ++d;</div><div class='del'>-</div><div class='del'>-    if (d-&gt;countryId() == country_id</div><div class='del'>-            &amp;&amp; d-&gt;languageId() == language_id)</div><div class='del'>-        return d;</div><div class='add'>+    if (country == QLocale::AnyCountry) {</div><div class='add'>+        while (d-&gt;m_language_id == language_id &amp;&amp; d-&gt;m_script_id != script_id)</div><div class='add'>+            ++d;</div><div class='add'>+        if (d-&gt;m_language_id == language_id &amp;&amp; d-&gt;m_script_id == script_id)</div><div class='add'>+            return d;</div><div class='add'>+    } else if (script == QLocale::AnyScript) {</div><div class='add'>+        while (d-&gt;m_language_id == language_id) {</div><div class='add'>+            if (d-&gt;m_script_id == script_id &amp;&amp; d-&gt;m_country_id == country_id)</div><div class='add'>+                return d;</div><div class='add'>+            ++d;</div><div class='add'>+        }</div><div class='add'>+    } else {</div><div class='add'>+        // both script and country are explicitly specified</div><div class='add'>+        while (d-&gt;m_language_id == language_id) {</div><div class='add'>+            if (d-&gt;m_script_id == script_id &amp;&amp; d-&gt;m_country_id == country_id)</div><div class='add'>+                return d;</div><div class='add'>+            ++d;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     return locale_data + idx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool splitLocaleName(const QString &amp;name, QChar *lang_begin, QChar *cntry_begin)</div><div class='add'>+static bool parse_locale_tag(const QString &amp;input, int &amp;i, QString *result, const QString &amp;separators)</div><div class='ctx'> {</div><div class='del'>-    for (int i = 0; i &lt; 3; ++i)</div><div class='del'>-        lang_begin[i] = 0;</div><div class='del'>-    for (int i = 0; i &lt; 3; ++i)</div><div class='del'>-        cntry_begin[i] = 0;</div><div class='add'>+    *result = QString(8, Qt::Uninitialized); // worst case according to BCP47</div><div class='add'>+    QChar *pch = result-&gt;data();</div><div class='add'>+    const QChar *uc = input.data() + i;</div><div class='add'>+    const int l = input.length();</div><div class='add'>+    int size = 0;</div><div class='add'>+    for (; i &lt; l &amp;&amp; size &lt; 8; ++i, ++size) {</div><div class='add'>+        if (separators.contains(*uc))</div><div class='add'>+            break;</div><div class='add'>+        if (! ((uc-&gt;unicode() &gt;= 'a' &amp;&amp; uc-&gt;unicode() &lt;= 'z') ||</div><div class='add'>+               (uc-&gt;unicode() &gt;= 'A' &amp;&amp; uc-&gt;unicode() &lt;= 'Z') ||</div><div class='add'>+               (uc-&gt;unicode() &gt;= '0' &amp;&amp; uc-&gt;unicode() &lt;= '9')) ) // latin only</div><div class='add'>+            return false;</div><div class='add'>+        *pch++ = *uc++;</div><div class='add'>+    }</div><div class='add'>+    result-&gt;truncate(size);</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-    int l = name.length();</div><div class='add'>+bool qt_splitLocaleName(const QString &amp;name, QString &amp;lang, QString &amp;script, QString &amp;cntry)</div><div class='add'>+{</div><div class='add'>+    const int length = name.length();</div><div class='ctx'> </div><div class='del'>-    QChar *lang = lang_begin;</div><div class='del'>-    QChar *cntry = cntry_begin;</div><div class='add'>+    lang = script = cntry = QString();</div><div class='ctx'> </div><div class='del'>-    int state = 0;</div><div class='del'>-    const QChar *uc = name.unicode();</div><div class='del'>-    for (int i = 0; i &lt; l; ++i) {</div><div class='del'>-        if (uc-&gt;unicode() == '.' || uc-&gt;unicode() == '@')</div><div class='add'>+    const QString separators = QLatin1String("_-.@");</div><div class='add'>+    enum ParserState { NoState, LangState, ScriptState, CountryState };</div><div class='add'>+    ParserState state = LangState;</div><div class='add'>+    for (int i = 0; i &lt; length &amp;&amp; state != NoState; ) {</div><div class='add'>+        QString value;</div><div class='add'>+        if (!parse_locale_tag(name, i, &amp;value, separators) ||value.isEmpty())</div><div class='ctx'>             break;</div><div class='del'>-</div><div class='add'>+        QChar sep = i &lt; length ? name.at(i) : QChar();</div><div class='ctx'>         switch (state) {</div><div class='del'>-            case 0:</div><div class='del'>-                // parsing language</div><div class='del'>-                if (uc-&gt;unicode() == '_') {</div><div class='del'>-                    state = 1;</div><div class='del'>-                    break;</div><div class='del'>-                }</div><div class='del'>-                if (lang - lang_begin == 3)</div><div class='del'>-                    return false;</div><div class='del'>-                if (uc-&gt;unicode() &lt; 'a' || uc-&gt;unicode() &gt; 'z')</div><div class='del'>-                    return false;</div><div class='del'>-</div><div class='del'>-                *lang = *uc;</div><div class='del'>-                ++lang;</div><div class='add'>+        case LangState:</div><div class='add'>+            if (!sep.isNull() &amp;&amp; !separators.contains(sep)) {</div><div class='add'>+                state = NoState;</div><div class='ctx'>                 break;</div><div class='del'>-            case 1:</div><div class='del'>-                // parsing country</div><div class='del'>-                if (cntry - cntry_begin == 3) {</div><div class='del'>-                    cntry_begin[0] = 0;</div><div class='del'>-                    break;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-                *cntry = *uc;</div><div class='del'>-                ++cntry;</div><div class='add'>+            }</div><div class='add'>+            lang = value;</div><div class='add'>+            if (i == length) {</div><div class='add'>+                // just language was specified</div><div class='add'>+                state = NoState;</div><div class='ctx'>                 break;</div><div class='add'>+            }</div><div class='add'>+            state = ScriptState;</div><div class='add'>+            break;</div><div class='add'>+        case ScriptState: {</div><div class='add'>+            QString scripts = QString::fromLatin1((const char *)script_code_list, sizeof(script_code_list));</div><div class='add'>+            if (value.length() == 4 &amp;&amp; scripts.indexOf(value) % 4 == 0) {</div><div class='add'>+                // script name is always 4 characters</div><div class='add'>+                script = value;</div><div class='add'>+                state = CountryState;</div><div class='add'>+            } else {</div><div class='add'>+                // it wasn't a script, maybe it is a country then?</div><div class='add'>+                cntry = value;</div><div class='add'>+                state = NoState;</div><div class='add'>+            }</div><div class='add'>+            break;</div><div class='ctx'>         }</div><div class='del'>-</div><div class='del'>-        ++uc;</div><div class='add'>+        case CountryState:</div><div class='add'>+            cntry = value;</div><div class='add'>+            state = NoState;</div><div class='add'>+            break;</div><div class='add'>+        case NoState:</div><div class='add'>+            // shouldn't happen</div><div class='add'>+            qWarning("QLocale: This should never happen");</div><div class='add'>+            break;</div><div class='add'>+        }</div><div class='add'>+        ++i;</div><div class='ctx'>     }</div><div class='del'>-</div><div class='del'>-    int lang_len = lang - lang_begin;</div><div class='del'>-</div><div class='del'>-    return lang_len == 2 || lang_len == 3;</div><div class='add'>+    return lang.length() == 2 || lang.length() == 3;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void getLangAndCountry(const QString &amp;name, QLocale::Language &amp;lang, QLocale::Country &amp;cntry)</div><div class='add'>+void QLocalePrivate::getLangAndCountry(const QString &amp;name, QLocale::Language &amp;lang,</div><div class='add'>+                                       QLocale::Script &amp;script, QLocale::Country &amp;cntry)</div><div class='ctx'> {</div><div class='ctx'>     lang = QLocale::C;</div><div class='add'>+    script = QLocale::AnyScript;</div><div class='ctx'>     cntry = QLocale::AnyCountry;</div><div class='ctx'> </div><div class='del'>-    QChar lang_code[3];</div><div class='del'>-    QChar cntry_code[3];</div><div class='del'>-    if (!splitLocaleName(name, lang_code, cntry_code))</div><div class='add'>+    QString lang_code;</div><div class='add'>+    QString script_code;</div><div class='add'>+    QString cntry_code;</div><div class='add'>+    if (!qt_splitLocaleName(name, lang_code, script_code, cntry_code))</div><div class='ctx'>         return;</div><div class='ctx'> </div><div class='del'>-    lang = codeToLanguage(lang_code);</div><div class='add'>+    lang = QLocalePrivate::codeToLanguage(lang_code);</div><div class='ctx'>     if (lang == QLocale::C)</div><div class='ctx'>         return;</div><div class='del'>-</div><div class='del'>-    if (cntry_code[0].unicode() != 0)</div><div class='del'>-        cntry = codeToCountry(cntry_code);</div><div class='add'>+    script = QLocalePrivate::codeToScript(script_code);</div><div class='add'>+    cntry = QLocalePrivate::codeToCountry(cntry_code);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const QLocalePrivate *findLocale(const QString &amp;name)</div><div class='ctx'> {</div><div class='ctx'>     QLocale::Language lang;</div><div class='add'>+    QLocale::Script script;</div><div class='ctx'>     QLocale::Country cntry;</div><div class='del'>-    getLangAndCountry(name, lang, cntry);</div><div class='add'>+    QLocalePrivate::getLangAndCountry(name, lang, script, cntry);</div><div class='ctx'> </div><div class='del'>-    return findLocale(lang, cntry);</div><div class='add'>+    return QLocalePrivate::findLocale(lang, script, cntry);</div><div class='ctx'> }</div><div class='del'>-static QString readEscapedFormatString(const QString &amp;format, int *idx)</div><div class='add'>+</div><div class='add'>+QString qt_readEscapedFormatString(const QString &amp;format, int *idx)</div><div class='ctx'> {</div><div class='ctx'>     int &amp;i = *idx;</div><div class='ctx'> </div><div class='hunk'>@@ -366,7 +416,7 @@ static QString readEscapedFormatString(const QString &amp;format, int *idx)</div><div class='ctx'>     return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int repeatCount(const QString &amp;s, int i)</div><div class='add'>+int qt_repeatCount(const QString &amp;s, int i)</div><div class='ctx'> {</div><div class='ctx'>     QChar c = s.at(i);</div><div class='ctx'>     int j = i + 1;</div><div class='hunk'>@@ -379,1012 +429,13 @@ static const QLocalePrivate *default_lp = 0;</div><div class='ctx'> static uint default_number_options = 0;</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_SYSTEMLOCALE</div><div class='del'>-static QByteArray envVarLocale()</div><div class='del'>-{</div><div class='del'>-    static QByteArray lang = 0;</div><div class='del'>-#ifdef Q_OS_UNIX</div><div class='del'>-    lang = qgetenv("LC_ALL");</div><div class='del'>-    if (lang.isNull())</div><div class='del'>-        lang = qgetenv("LC_NUMERIC");</div><div class='del'>-    if (lang.isNull())</div><div class='del'>-#endif</div><div class='del'>-        lang = qgetenv("LANG");</div><div class='del'>-    return lang;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if defined(Q_OS_WIN)</div><div class='del'>-/******************************************************************************</div><div class='del'>-** Wrappers for Windows locale system functions</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-static const char *winLangCodeToIsoName(int code);</div><div class='del'>-static QString winIso639LangName(LCID id = LOCALE_USER_DEFAULT);</div><div class='del'>-static QString winIso3116CtryName(LCID id = LOCALE_USER_DEFAULT);</div><div class='del'>-</div><div class='del'>-static QString getWinLocaleInfo(LCTYPE type)</div><div class='del'>-{</div><div class='del'>-    LCID id = GetUserDefaultLCID();</div><div class='del'>-    int cnt = GetLocaleInfo(id, type, 0, 0) * 2;</div><div class='del'>-</div><div class='del'>-    if (cnt == 0) {</div><div class='del'>-        qWarning("QLocale: empty windows locale info (%d)", (int)type);</div><div class='del'>-        return QString();</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    QByteArray buff(cnt, 0);</div><div class='del'>-</div><div class='del'>-    cnt = GetLocaleInfo(id, type, reinterpret_cast&lt;wchar_t*&gt;(buff.data()), buff.size() / 2);</div><div class='del'>-</div><div class='del'>-    if (cnt == 0) {</div><div class='del'>-        qWarning("QLocale: empty windows locale info (%d)", (int)type);</div><div class='del'>-        return QString();</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return QString::fromWCharArray(reinterpret_cast&lt;const wchar_t *&gt;(buff.data()));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-QByteArray getWinLocaleName(LCID id = LOCALE_USER_DEFAULT)</div><div class='del'>-{</div><div class='del'>-    QByteArray result;</div><div class='del'>-    if (id == LOCALE_USER_DEFAULT) {</div><div class='del'>-        result = envVarLocale();</div><div class='del'>-        QChar lang[3];</div><div class='del'>-        QChar cntry[3];</div><div class='del'>-        if ( result == "C" || (!result.isEmpty()</div><div class='del'>-                &amp;&amp; splitLocaleName(QString::fromLocal8Bit(result), lang, cntry)) ) {</div><div class='del'>-            long id = 0;</div><div class='del'>-            bool ok = false;</div><div class='del'>-            id = qstrtoll(result.data(), 0, 0, &amp;ok);</div><div class='del'>-            if ( !ok || id == 0 || id &lt; INT_MIN || id &gt; INT_MAX )</div><div class='del'>-                return result;</div><div class='del'>-            else</div><div class='del'>-                return winLangCodeToIsoName( (int)id );</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-#if defined(Q_OS_WINCE)</div><div class='del'>-    result = winLangCodeToIsoName(id != LOCALE_USER_DEFAULT ? id : GetUserDefaultLCID());</div><div class='del'>-#else</div><div class='del'>-    if (id == LOCALE_USER_DEFAULT)</div><div class='del'>-        id = GetUserDefaultLCID();</div><div class='del'>-    QString resultuage = winIso639LangName(id);</div><div class='del'>-    QString country = winIso3116CtryName(id);</div><div class='del'>-    result = resultuage.toLatin1();</div><div class='del'>-    if (!country.isEmpty()) {</div><div class='del'>-        result += '_';</div><div class='del'>-        result += country.toLatin1();</div><div class='del'>-    }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-    return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-Q_CORE_EXPORT QLocale qt_localeFromLCID(LCID id)</div><div class='del'>-{</div><div class='del'>-    return QLocale(QString::fromLatin1(getWinLocaleName(id)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString winToQtFormat(const QString &amp;sys_fmt)</div><div class='del'>-{</div><div class='del'>-    QString result;</div><div class='del'>-    int i = 0;</div><div class='del'>-</div><div class='del'>-    while (i &lt; sys_fmt.size()) {</div><div class='del'>-        if (sys_fmt.at(i).unicode() == QLatin1Char('\'')) {</div><div class='del'>-            QString text = readEscapedFormatString(sys_fmt, &amp;i);</div><div class='del'>-            if (text == QLatin1String("'"))</div><div class='del'>-                result += QLatin1String("''");</div><div class='del'>-            else</div><div class='del'>-                result += QString(QLatin1Char('\'') + text + QLatin1Char('\''));</div><div class='del'>-            continue;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        QChar c = sys_fmt.at(i);</div><div class='del'>-        int repeat = repeatCount(sys_fmt, i);</div><div class='del'>-</div><div class='del'>-        switch (c.unicode()) {</div><div class='del'>-            // Date</div><div class='del'>-            case 'y':</div><div class='del'>-                if (repeat &gt; 5)</div><div class='del'>-                    repeat = 5;</div><div class='del'>-                else if (repeat == 3)</div><div class='del'>-                    repeat = 2;</div><div class='del'>-                switch (repeat) {</div><div class='del'>-                    case 1:</div><div class='del'>-                        result += QLatin1String("yy"); // "y" unsupported by Qt, use "yy"</div><div class='del'>-                        break;</div><div class='del'>-                    case 5:</div><div class='del'>-                        result += QLatin1String("yyyy"); // "yyyyy" same as "yyyy" on Windows</div><div class='del'>-                        break;</div><div class='del'>-                    default:</div><div class='del'>-                        result += QString(repeat, QLatin1Char('y'));</div><div class='del'>-                        break;</div><div class='del'>-                }</div><div class='del'>-                break;</div><div class='del'>-            case 'g':</div><div class='del'>-                if (repeat &gt; 2)</div><div class='del'>-                    repeat = 2;</div><div class='del'>-                switch (repeat) {</div><div class='del'>-                    case 2:</div><div class='del'>-                        break; // no equivalent of "gg" in Qt</div><div class='del'>-                    default:</div><div class='del'>-                        result += QLatin1Char('g');</div><div class='del'>-                        break;</div><div class='del'>-                }</div><div class='del'>-                break;</div><div class='del'>-            case 't':</div><div class='del'>-                if (repeat &gt; 2)</div><div class='del'>-                    repeat = 2;</div><div class='del'>-                result += QLatin1String("AP"); // "t" unsupported, use "AP"</div><div class='del'>-                break;</div><div class='del'>-            default:</div><div class='del'>-                result += QString(repeat, c);</div><div class='del'>-                break;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        i += repeat;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static QString winDateToString(const QDate &amp;date, DWORD flags)</div><div class='del'>-{</div><div class='del'>-    SYSTEMTIME st;</div><div class='del'>-    memset(&amp;st, 0, sizeof(SYSTEMTIME));</div><div class='del'>-    st.wYear = date.year();</div><div class='del'>-    st.wMonth = date.month();</div><div class='del'>-    st.wDay = date.day();</div><div class='del'>-</div><div class='del'>-    LCID id = GetUserDefaultLCID();</div><div class='del'>-</div><div class='del'>-    wchar_t buf[255];</div><div class='del'>-    if (GetDateFormat(id, flags, &amp;st, 0, buf, 255))</div><div class='del'>-        return QString::fromWCharArray(buf);</div><div class='del'>-</div><div class='del'>-    return QString();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString winTimeToString(const QTime &amp;time)</div><div class='del'>-{</div><div class='del'>-    SYSTEMTIME st;</div><div class='del'>-    memset(&amp;st, 0, sizeof(SYSTEMTIME));</div><div class='del'>-    st.wHour = time.hour();</div><div class='del'>-    st.wMinute = time.minute();</div><div class='del'>-    st.wSecond = time.second();</div><div class='del'>-    st.wMilliseconds = 0;</div><div class='del'>-</div><div class='del'>-    DWORD flags = 0;</div><div class='del'>-    LCID id = GetUserDefaultLCID();</div><div class='del'>-</div><div class='del'>-    wchar_t buf[255];</div><div class='del'>-    if (GetTimeFormat(id, flags, &amp;st, 0, buf, 255))</div><div class='del'>-        return QString::fromWCharArray(buf);</div><div class='del'>-</div><div class='del'>-    return QString();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString winDayName(int day, bool short_format)</div><div class='del'>-{</div><div class='del'>-    static const LCTYPE short_day_map[]</div><div class='del'>-        = { LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2,</div><div class='del'>-            LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, LOCALE_SABBREVDAYNAME5,</div><div class='del'>-            LOCALE_SABBREVDAYNAME6, LOCALE_SABBREVDAYNAME7 };</div><div class='del'>-</div><div class='del'>-    static const LCTYPE long_day_map[]</div><div class='del'>-        = { LOCALE_SDAYNAME1, LOCALE_SDAYNAME2,</div><div class='del'>-            LOCALE_SDAYNAME3, LOCALE_SDAYNAME4, LOCALE_SDAYNAME5,</div><div class='del'>-            LOCALE_SDAYNAME6, LOCALE_SDAYNAME7 };</div><div class='del'>-</div><div class='del'>-    day -= 1;</div><div class='del'>-</div><div class='del'>-    LCTYPE type = short_format</div><div class='del'>-                    ? short_day_map[day] : long_day_map[day];</div><div class='del'>-    return getWinLocaleInfo(type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString winMonthName(int month, bool short_format)</div><div class='del'>-{</div><div class='del'>-    static const LCTYPE short_month_map[]</div><div class='del'>-        = { LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, LOCALE_SABBREVMONTHNAME3,</div><div class='del'>-            LOCALE_SABBREVMONTHNAME4, LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6,</div><div class='del'>-            LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, LOCALE_SABBREVMONTHNAME9,</div><div class='del'>-            LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 };</div><div class='del'>-</div><div class='del'>-    static const LCTYPE long_month_map[]</div><div class='del'>-        = { LOCALE_SMONTHNAME1, LOCALE_SMONTHNAME2, LOCALE_SMONTHNAME3,</div><div class='del'>-            LOCALE_SMONTHNAME4, LOCALE_SMONTHNAME5, LOCALE_SMONTHNAME6,</div><div class='del'>-            LOCALE_SMONTHNAME7, LOCALE_SMONTHNAME8, LOCALE_SMONTHNAME9,</div><div class='del'>-            LOCALE_SMONTHNAME10, LOCALE_SMONTHNAME11, LOCALE_SMONTHNAME12 };</div><div class='del'>-</div><div class='del'>-    month -= 1;</div><div class='del'>-    if (month &lt; 0 || month &gt; 11)</div><div class='del'>-    return QString();</div><div class='del'>-</div><div class='del'>-    LCTYPE type = short_format ? short_month_map[month] : long_month_map[month];</div><div class='del'>-    return getWinLocaleInfo(type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QLocale::MeasurementSystem winSystemMeasurementSystem()</div><div class='del'>-{</div><div class='del'>-    LCID id = GetUserDefaultLCID();</div><div class='del'>-    wchar_t output[2];</div><div class='del'>-</div><div class='del'>-    if (GetLocaleInfo(id, LOCALE_IMEASURE, output, 2)) {</div><div class='del'>-        QString iMeasure = QString::fromWCharArray(output);</div><div class='del'>-        if (iMeasure == QLatin1String("1")) {</div><div class='del'>-            return QLocale::ImperialSystem;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return QLocale::MetricSystem;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString winSystemAMText()</div><div class='del'>-{</div><div class='del'>-    LCID id = GetUserDefaultLCID();</div><div class='del'>-    wchar_t output[15]; // maximum length including  terminating zero character for Win2003+</div><div class='del'>-</div><div class='del'>-    if (GetLocaleInfo(id, LOCALE_S1159, output, 15)) {</div><div class='del'>-        return QString::fromWCharArray(output);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return QString();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString winSystemPMText()</div><div class='del'>-{</div><div class='del'>-    LCID id = GetUserDefaultLCID();</div><div class='del'>-    wchar_t output[15]; // maximum length including  terminating zero character for Win2003+</div><div class='del'>-</div><div class='del'>-    if (GetLocaleInfo(id, LOCALE_S2359, output, 15)) {</div><div class='del'>-        return QString::fromWCharArray(output);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return QString();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-    \since 4.6</div><div class='del'>-    Returns the fallback locale obtained from the system.</div><div class='del'>- */</div><div class='del'>-QLocale QSystemLocale::fallbackLocale() const</div><div class='del'>-{</div><div class='del'>-    return QLocale(QString::fromLatin1(getWinLocaleName()));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const</div><div class='del'>-{</div><div class='del'>-    LCTYPE locale_info = 0;</div><div class='del'>-    bool format_string = false;</div><div class='del'>-</div><div class='del'>-    switch(type) {</div><div class='del'>-//     case Name:</div><div class='del'>-//         return getWinLocaleName();</div><div class='del'>-    case DecimalPoint:</div><div class='del'>-        locale_info = LOCALE_SDECIMAL;</div><div class='del'>-        break;</div><div class='del'>-    case GroupSeparator:</div><div class='del'>-        locale_info = LOCALE_STHOUSAND;</div><div class='del'>-        break;</div><div class='del'>-    case NegativeSign:</div><div class='del'>-        locale_info = LOCALE_SNEGATIVESIGN;</div><div class='del'>-        break;</div><div class='del'>-    case PositiveSign:</div><div class='del'>-        locale_info = LOCALE_SPOSITIVESIGN;</div><div class='del'>-        break;</div><div class='del'>-    case DateFormatLong:</div><div class='del'>-        locale_info = LOCALE_SLONGDATE;</div><div class='del'>-        format_string = true;</div><div class='del'>-        break;</div><div class='del'>-    case DateFormatShort:</div><div class='del'>-        locale_info = LOCALE_SSHORTDATE;</div><div class='del'>-        format_string = true;</div><div class='del'>-        break;</div><div class='del'>-    case TimeFormatLong:</div><div class='del'>-    case TimeFormatShort:</div><div class='del'>-        locale_info = LOCALE_STIMEFORMAT;</div><div class='del'>-        format_string = true;</div><div class='del'>-        break;</div><div class='del'>-</div><div class='del'>-    case DateTimeFormatLong:</div><div class='del'>-    case DateTimeFormatShort:</div><div class='del'>-        return QString(query(type == DateTimeFormatLong ? DateFormatLong : DateFormatShort).toString()</div><div class='del'>-            + QLatin1Char(' ') + query(type == DateTimeFormatLong ? TimeFormatLong : TimeFormatShort).toString());</div><div class='del'>-    case DayNameLong:</div><div class='del'>-    case DayNameShort:</div><div class='del'>-        return winDayName(in.toInt(), (type == DayNameShort));</div><div class='del'>-    case MonthNameLong:</div><div class='del'>-    case MonthNameShort:</div><div class='del'>-        return winMonthName(in.toInt(), (type == MonthNameShort));</div><div class='del'>-    case DateToStringShort:</div><div class='del'>-    case DateToStringLong:</div><div class='del'>-        return winDateToString(in.toDate(), type == DateToStringShort ? DATE_SHORTDATE : DATE_LONGDATE);</div><div class='del'>-    case TimeToStringShort:</div><div class='del'>-    case TimeToStringLong:</div><div class='del'>-        return winTimeToString(in.toTime());</div><div class='del'>-    case DateTimeToStringShort:</div><div class='del'>-    case DateTimeToStringLong: {</div><div class='del'>-        const QDateTime dt = in.toDateTime();</div><div class='del'>-        return QString(winDateToString(dt.date(), type == DateTimeToStringShort ? DATE_SHORTDATE : DATE_LONGDATE)</div><div class='del'>-            + QLatin1Char(' ') + winTimeToString(dt.time())); }</div><div class='del'>-</div><div class='del'>-    case ZeroDigit:</div><div class='del'>-        locale_info = LOCALE_SNATIVEDIGITS;</div><div class='del'>-        break;</div><div class='del'>-</div><div class='del'>-    case LanguageId:</div><div class='del'>-    case CountryId: {</div><div class='del'>-        QString locale = QString::fromLatin1(getWinLocaleName());</div><div class='del'>-        QLocale::Language lang;</div><div class='del'>-        QLocale::Country cntry;</div><div class='del'>-        getLangAndCountry(locale, lang, cntry);</div><div class='del'>-        if (type == LanguageId)</div><div class='del'>-            return lang;</div><div class='del'>-        if (cntry == QLocale::AnyCountry)</div><div class='del'>-            return fallbackLocale().country();</div><div class='del'>-        return cntry;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    case MeasurementSystem:</div><div class='del'>-        return QVariant(static_cast&lt;int&gt;(winSystemMeasurementSystem()));</div><div class='del'>-</div><div class='del'>-    case AMText:</div><div class='del'>-        return QVariant(winSystemAMText());</div><div class='del'>-    case PMText:</div><div class='del'>-        return QVariant(winSystemPMText());</div><div class='del'>-    default:</div><div class='del'>-        break;</div><div class='del'>-    }</div><div class='del'>-    if (locale_info) {</div><div class='del'>-        QString result = getWinLocaleInfo(locale_info);</div><div class='del'>-        if (format_string)</div><div class='del'>-            result = winToQtFormat(result);</div><div class='del'>-        if (!result.isEmpty())</div><div class='del'>-            return result;</div><div class='del'>-    }</div><div class='del'>-    return QVariant();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct WindowsToISOListElt {</div><div class='del'>-    ushort windows_code;</div><div class='del'>-    char iso_name[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* NOTE: This array should be sorted by the first column! */</div><div class='del'>-static const WindowsToISOListElt windows_to_iso_list[] = {</div><div class='del'>-    { 0x0401, "ar_SA" },</div><div class='del'>-    { 0x0402, "bg\0  " },</div><div class='del'>-    { 0x0403, "ca\0  " },</div><div class='del'>-    { 0x0404, "zh_TW" },</div><div class='del'>-    { 0x0405, "cs\0  " },</div><div class='del'>-    { 0x0406, "da\0  " },</div><div class='del'>-    { 0x0407, "de\0  " },</div><div class='del'>-    { 0x0408, "el\0  " },</div><div class='del'>-    { 0x0409, "en_US" },</div><div class='del'>-    { 0x040a, "es\0  " },</div><div class='del'>-    { 0x040b, "fi\0  " },</div><div class='del'>-    { 0x040c, "fr\0  " },</div><div class='del'>-    { 0x040d, "he\0  " },</div><div class='del'>-    { 0x040e, "hu\0  " },</div><div class='del'>-    { 0x040f, "is\0  " },</div><div class='del'>-    { 0x0410, "it\0  " },</div><div class='del'>-    { 0x0411, "ja\0  " },</div><div class='del'>-    { 0x0412, "ko\0  " },</div><div class='del'>-    { 0x0413, "nl\0  " },</div><div class='del'>-    { 0x0414, "no\0  " },</div><div class='del'>-    { 0x0415, "pl\0  " },</div><div class='del'>-    { 0x0416, "pt_BR" },</div><div class='del'>-    { 0x0418, "ro\0  " },</div><div class='del'>-    { 0x0419, "ru\0  " },</div><div class='del'>-    { 0x041a, "hr\0  " },</div><div class='del'>-    { 0x041c, "sq\0  " },</div><div class='del'>-    { 0x041d, "sv\0  " },</div><div class='del'>-    { 0x041e, "th\0  " },</div><div class='del'>-    { 0x041f, "tr\0  " },</div><div class='del'>-    { 0x0420, "ur\0  " },</div><div class='del'>-    { 0x0421, "in\0  " },</div><div class='del'>-    { 0x0422, "uk\0  " },</div><div class='del'>-    { 0x0423, "be\0  " },</div><div class='del'>-    { 0x0425, "et\0  " },</div><div class='del'>-    { 0x0426, "lv\0  " },</div><div class='del'>-    { 0x0427, "lt\0  " },</div><div class='del'>-    { 0x0429, "fa\0  " },</div><div class='del'>-    { 0x042a, "vi\0  " },</div><div class='del'>-    { 0x042d, "eu\0  " },</div><div class='del'>-    { 0x042f, "mk\0  " },</div><div class='del'>-    { 0x0436, "af\0  " },</div><div class='del'>-    { 0x0438, "fo\0  " },</div><div class='del'>-    { 0x0439, "hi\0  " },</div><div class='del'>-    { 0x043e, "ms\0  " },</div><div class='del'>-    { 0x0458, "mt\0  " },</div><div class='del'>-    { 0x0801, "ar_IQ" },</div><div class='del'>-    { 0x0804, "zh_CN" },</div><div class='del'>-    { 0x0807, "de_CH" },</div><div class='del'>-    { 0x0809, "en_GB" },</div><div class='del'>-    { 0x080a, "es_MX" },</div><div class='del'>-    { 0x080c, "fr_BE" },</div><div class='del'>-    { 0x0810, "it_CH" },</div><div class='del'>-    { 0x0812, "ko\0  " },</div><div class='del'>-    { 0x0813, "nl_BE" },</div><div class='del'>-    { 0x0814, "no\0  " },</div><div class='del'>-    { 0x0816, "pt\0  " },</div><div class='del'>-    { 0x081a, "sr\0  " },</div><div class='del'>-    { 0x081d, "sv_FI" },</div><div class='del'>-    { 0x0c01, "ar_EG" },</div><div class='del'>-    { 0x0c04, "zh_HK" },</div><div class='del'>-    { 0x0c07, "de_AT" },</div><div class='del'>-    { 0x0c09, "en_AU" },</div><div class='del'>-    { 0x0c0a, "es\0  " },</div><div class='del'>-    { 0x0c0c, "fr_CA" },</div><div class='del'>-    { 0x0c1a, "sr\0  " },</div><div class='del'>-    { 0x1001, "ar_LY" },</div><div class='del'>-    { 0x1004, "zh_SG" },</div><div class='del'>-    { 0x1007, "de_LU" },</div><div class='del'>-    { 0x1009, "en_CA" },</div><div class='del'>-    { 0x100a, "es_GT" },</div><div class='del'>-    { 0x100c, "fr_CH" },</div><div class='del'>-    { 0x1401, "ar_DZ" },</div><div class='del'>-    { 0x1407, "de_LI" },</div><div class='del'>-    { 0x1409, "en_NZ" },</div><div class='del'>-    { 0x140a, "es_CR" },</div><div class='del'>-    { 0x140c, "fr_LU" },</div><div class='del'>-    { 0x1801, "ar_MA" },</div><div class='del'>-    { 0x1809, "en_IE" },</div><div class='del'>-    { 0x180a, "es_PA" },</div><div class='del'>-    { 0x1c01, "ar_TN" },</div><div class='del'>-    { 0x1c09, "en_ZA" },</div><div class='del'>-    { 0x1c0a, "es_DO" },</div><div class='del'>-    { 0x2001, "ar_OM" },</div><div class='del'>-    { 0x2009, "en_JM" },</div><div class='del'>-    { 0x200a, "es_VE" },</div><div class='del'>-    { 0x2401, "ar_YE" },</div><div class='del'>-    { 0x2409, "en\0  " },</div><div class='del'>-    { 0x240a, "es_CO" },</div><div class='del'>-    { 0x2801, "ar_SY" },</div><div class='del'>-    { 0x2809, "en_BZ" },</div><div class='del'>-    { 0x280a, "es_PE" },</div><div class='del'>-    { 0x2c01, "ar_JO" },</div><div class='del'>-    { 0x2c09, "en_TT" },</div><div class='del'>-    { 0x2c0a, "es_AR" },</div><div class='del'>-    { 0x3001, "ar_LB" },</div><div class='del'>-    { 0x300a, "es_EC" },</div><div class='del'>-    { 0x3401, "ar_KW" },</div><div class='del'>-    { 0x340a, "es_CL" },</div><div class='del'>-    { 0x3801, "ar_AE" },</div><div class='del'>-    { 0x380a, "es_UY" },</div><div class='del'>-    { 0x3c01, "ar_BH" },</div><div class='del'>-    { 0x3c0a, "es_PY" },</div><div class='del'>-    { 0x4001, "ar_QA" },</div><div class='del'>-    { 0x400a, "es_BO" },</div><div class='del'>-    { 0x440a, "es_SV" },</div><div class='del'>-    { 0x480a, "es_HN" },</div><div class='del'>-    { 0x4c0a, "es_NI" },</div><div class='del'>-    { 0x500a, "es_PR" }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int windows_to_iso_count</div><div class='del'>-    = sizeof(windows_to_iso_list)/sizeof(WindowsToISOListElt);</div><div class='del'>-</div><div class='del'>-static const char *winLangCodeToIsoName(int code)</div><div class='del'>-{</div><div class='del'>-    int cmp = code - windows_to_iso_list[0].windows_code;</div><div class='del'>-    if (cmp &lt; 0)</div><div class='del'>-        return 0;</div><div class='del'>-</div><div class='del'>-    if (cmp == 0)</div><div class='del'>-        return windows_to_iso_list[0].iso_name;</div><div class='del'>-</div><div class='del'>-    int begin = 0;</div><div class='del'>-    int end = windows_to_iso_count;</div><div class='del'>-</div><div class='del'>-    while (end - begin &gt; 1) {</div><div class='del'>-        uint mid = (begin + end)/2;</div><div class='del'>-</div><div class='del'>-        const WindowsToISOListElt *elt = windows_to_iso_list + mid;</div><div class='del'>-        int cmp = code - elt-&gt;windows_code;</div><div class='del'>-        if (cmp &lt; 0)</div><div class='del'>-            end = mid;</div><div class='del'>-        else if (cmp &gt; 0)</div><div class='del'>-            begin = mid;</div><div class='del'>-        else</div><div class='del'>-            return elt-&gt;iso_name;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return 0;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString winIso639LangName(LCID id)</div><div class='del'>-{</div><div class='del'>-    QString result;</div><div class='del'>-</div><div class='del'>-    // Windows returns the wrong ISO639 for some languages, we need to detect them here using</div><div class='del'>-    // the language code</div><div class='del'>-    QString lang_code;</div><div class='del'>-    wchar_t out[256];</div><div class='del'>-    if (GetLocaleInfo(id, LOCALE_ILANGUAGE, out, 255))</div><div class='del'>-        lang_code = QString::fromWCharArray(out);</div><div class='del'>-</div><div class='del'>-    if (!lang_code.isEmpty()) {</div><div class='del'>-        const char *endptr;</div><div class='del'>-        bool ok;</div><div class='del'>-        QByteArray latin1_lang_code = lang_code.toLatin1();</div><div class='del'>-        int i = qstrtoull(latin1_lang_code, &amp;endptr, 16, &amp;ok);</div><div class='del'>-        if (ok &amp;&amp; *endptr == '\0') {</div><div class='del'>-            switch (i) {</div><div class='del'>-                case 0x814:</div><div class='del'>-                    result = QLatin1String("nn"); // Nynorsk</div><div class='del'>-                    break;</div><div class='del'>-                default:</div><div class='del'>-                    break;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (!result.isEmpty())</div><div class='del'>-        return result;</div><div class='del'>-</div><div class='del'>-    // not one of the problematic languages - do the usual lookup</div><div class='del'>-    if (GetLocaleInfo(id, LOCALE_SISO639LANGNAME , out, 255))</div><div class='del'>-        result = QString::fromWCharArray(out);</div><div class='del'>-</div><div class='del'>-    return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString winIso3116CtryName(LCID id)</div><div class='del'>-{</div><div class='del'>-    QString result;</div><div class='del'>-</div><div class='del'>-    wchar_t out[256];</div><div class='del'>-    if (GetLocaleInfo(id, LOCALE_SISO3166CTRYNAME, out, 255))</div><div class='del'>-        result = QString::fromWCharArray(out);</div><div class='del'>-</div><div class='del'>-    return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#elif defined(Q_OS_MAC)</div><div class='del'>-/******************************************************************************</div><div class='del'>-** Wrappers for Mac locale system functions</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-static QByteArray getMacLocaleName()</div><div class='del'>-{</div><div class='del'>-    QByteArray result = envVarLocale();</div><div class='del'>-</div><div class='del'>-    QChar lang[3];</div><div class='del'>-    QChar cntry[3];</div><div class='del'>-    if (result.isEmpty() || result != "C"</div><div class='del'>-            &amp;&amp; !splitLocaleName(QString::fromLocal8Bit(result), lang, cntry)) {</div><div class='del'>-        QCFType&lt;CFLocaleRef&gt; l = CFLocaleCopyCurrent();</div><div class='del'>-        CFStringRef locale = CFLocaleGetIdentifier(l);</div><div class='del'>-        result = QCFString::toQString(locale).toUtf8();</div><div class='del'>-    }</div><div class='del'>-    return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString macMonthName(int month, bool short_format)</div><div class='del'>-{</div><div class='del'>-    month -= 1;</div><div class='del'>-    if (month &lt; 0 || month &gt; 11)</div><div class='del'>-        return QString();</div><div class='del'>-</div><div class='del'>-    QCFType&lt;CFDateFormatterRef&gt; formatter</div><div class='del'>-        = CFDateFormatterCreate(0, QCFType&lt;CFLocaleRef&gt;(CFLocaleCopyCurrent()),</div><div class='del'>-                                kCFDateFormatterNoStyle,  kCFDateFormatterNoStyle);</div><div class='del'>-    QCFType&lt;CFArrayRef&gt; values</div><div class='del'>-        = static_cast&lt;CFArrayRef&gt;(CFDateFormatterCopyProperty(formatter,</div><div class='del'>-                                  short_format ? kCFDateFormatterShortMonthSymbols</div><div class='del'>-                                               : kCFDateFormatterMonthSymbols));</div><div class='del'>-    if (values != 0) {</div><div class='del'>-        CFStringRef cfstring = static_cast&lt;CFStringRef&gt;(CFArrayGetValueAtIndex(values, month));</div><div class='del'>-        return QCFString::toQString(cfstring);</div><div class='del'>-    }</div><div class='del'>-    return QString();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static QString macDayName(int day, bool short_format)</div><div class='del'>-{</div><div class='del'>-    if (day &lt; 1 || day &gt; 7)</div><div class='del'>-        return QString();</div><div class='del'>-</div><div class='del'>-    QCFType&lt;CFDateFormatterRef&gt; formatter</div><div class='del'>-        = CFDateFormatterCreate(0, QCFType&lt;CFLocaleRef&gt;(CFLocaleCopyCurrent()),</div><div class='del'>-                                kCFDateFormatterNoStyle,  kCFDateFormatterNoStyle);</div><div class='del'>-    QCFType&lt;CFArrayRef&gt; values = static_cast&lt;CFArrayRef&gt;(CFDateFormatterCopyProperty(formatter,</div><div class='del'>-                                            short_format ? kCFDateFormatterShortWeekdaySymbols</div><div class='del'>-                                                         : kCFDateFormatterWeekdaySymbols));</div><div class='del'>-    if (values != 0) {</div><div class='del'>-        CFStringRef cfstring = static_cast&lt;CFStringRef&gt;(CFArrayGetValueAtIndex(values, day % 7));</div><div class='del'>-        return QCFString::toQString(cfstring);</div><div class='del'>-    }</div><div class='del'>-    return QString();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString macDateToString(const QDate &amp;date, bool short_format)</div><div class='del'>-{</div><div class='del'>-    CFGregorianDate macGDate;</div><div class='del'>-    macGDate.year = date.year();</div><div class='del'>-    macGDate.month = date.month();</div><div class='del'>-    macGDate.day = date.day();</div><div class='del'>-    macGDate.hour = 0;</div><div class='del'>-    macGDate.minute = 0;</div><div class='del'>-    macGDate.second = 0.0;</div><div class='del'>-    QCFType&lt;CFDateRef&gt; myDate</div><div class='del'>-        = CFDateCreate(0, CFGregorianDateGetAbsoluteTime(macGDate,</div><div class='del'>-                                                         QCFType&lt;CFTimeZoneRef&gt;(CFTimeZoneCopyDefault())));</div><div class='del'>-    QCFType&lt;CFLocaleRef&gt; mylocale = CFLocaleCopyCurrent();</div><div class='del'>-    CFDateFormatterStyle style = short_format ? kCFDateFormatterShortStyle : kCFDateFormatterLongStyle;</div><div class='del'>-    QCFType&lt;CFDateFormatterRef&gt; myFormatter</div><div class='del'>-        = CFDateFormatterCreate(kCFAllocatorDefault,</div><div class='del'>-                                mylocale, style,</div><div class='del'>-                                kCFDateFormatterNoStyle);</div><div class='del'>-    return QCFString(CFDateFormatterCreateStringWithDate(0, myFormatter, myDate));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString macTimeToString(const QTime &amp;time, bool short_format)</div><div class='del'>-{</div><div class='del'>-    CFGregorianDate macGDate;</div><div class='del'>-    // Assume this is local time and the current date</div><div class='del'>-    QDate dt = QDate::currentDate();</div><div class='del'>-    macGDate.year = dt.year();</div><div class='del'>-    macGDate.month = dt.month();</div><div class='del'>-    macGDate.day = dt.day();</div><div class='del'>-    macGDate.hour = time.hour();</div><div class='del'>-    macGDate.minute = time.minute();</div><div class='del'>-    macGDate.second = time.second();</div><div class='del'>-    QCFType&lt;CFDateRef&gt; myDate</div><div class='del'>-        = CFDateCreate(0, CFGregorianDateGetAbsoluteTime(macGDate,</div><div class='del'>-                                                         QCFType&lt;CFTimeZoneRef&gt;(CFTimeZoneCopyDefault())));</div><div class='del'>-</div><div class='del'>-    QCFType&lt;CFLocaleRef&gt; mylocale = CFLocaleCopyCurrent();</div><div class='del'>-    CFDateFormatterStyle style = short_format ? kCFDateFormatterShortStyle :  kCFDateFormatterLongStyle;</div><div class='del'>-    QCFType&lt;CFDateFormatterRef&gt; myFormatter = CFDateFormatterCreate(kCFAllocatorDefault,</div><div class='del'>-                                                                    mylocale,</div><div class='del'>-                                                                    kCFDateFormatterNoStyle,</div><div class='del'>-                                                                    style);</div><div class='del'>-    return QCFString(CFDateFormatterCreateStringWithDate(0, myFormatter, myDate));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString macToQtFormat(const QString &amp;sys_fmt)</div><div class='del'>-{</div><div class='del'>-    QString result;</div><div class='del'>-    int i = 0;</div><div class='del'>-</div><div class='del'>-    while (i &lt; sys_fmt.size()) {</div><div class='del'>-        if (sys_fmt.at(i).unicode() == '\'') {</div><div class='del'>-            QString text = readEscapedFormatString(sys_fmt, &amp;i);</div><div class='del'>-            if (text == QLatin1String("'"))</div><div class='del'>-                result += QLatin1String("''");</div><div class='del'>-            else</div><div class='del'>-                result += QLatin1Char('\'') + text + QLatin1Char('\'');</div><div class='del'>-            continue;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        QChar c = sys_fmt.at(i);</div><div class='del'>-        int repeat = repeatCount(sys_fmt, i);</div><div class='del'>-</div><div class='del'>-        switch (c.unicode()) {</div><div class='del'>-            case 'G': // Qt doesn't support these :(</div><div class='del'>-            case 'Y':</div><div class='del'>-            case 'D':</div><div class='del'>-            case 'F':</div><div class='del'>-            case 'w':</div><div class='del'>-            case 'W':</div><div class='del'>-            case 'g':</div><div class='del'>-                break;</div><div class='del'>-</div><div class='del'>-            case 'u': // extended year - use 'y'</div><div class='del'>-                if (repeat &lt; 4)</div><div class='del'>-                    result += QLatin1String("yy");</div><div class='del'>-                else</div><div class='del'>-                    result += QLatin1String("yyyy");</div><div class='del'>-                break;</div><div class='del'>-            case 'S': // fractional second</div><div class='del'>-                if (repeat &lt; 3)</div><div class='del'>-                    result += QLatin1Char('z');</div><div class='del'>-                else</div><div class='del'>-                    result += QLatin1String("zzz");</div><div class='del'>-                break;</div><div class='del'>-            case 'E':</div><div class='del'>-                if (repeat &lt;= 3)</div><div class='del'>-                    result += QLatin1String("ddd");</div><div class='del'>-                else</div><div class='del'>-                    result += QLatin1String("dddd");</div><div class='del'>-                break;</div><div class='del'>-            case 'e':</div><div class='del'>-                if (repeat &gt;= 2)</div><div class='del'>-                    result += QLatin1String("dd");</div><div class='del'>-                else</div><div class='del'>-                    result += QLatin1Char('d');</div><div class='del'>-                break;</div><div class='del'>-            case 'a':</div><div class='del'>-                result += QLatin1String("AP");</div><div class='del'>-                break;</div><div class='del'>-            case 'k':</div><div class='del'>-                result += QString(repeat, QLatin1Char('H'));</div><div class='del'>-                break;</div><div class='del'>-            case 'K':</div><div class='del'>-                result += QString(repeat, QLatin1Char('h'));</div><div class='del'>-                break;</div><div class='del'>-            case 'z':</div><div class='del'>-            case 'Z':</div><div class='del'>-            case 'v':</div><div class='del'>-                result += QLatin1Char('t');</div><div class='del'>-                break;</div><div class='del'>-            default:</div><div class='del'>-                result += QString(repeat, c);</div><div class='del'>-                break;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        i += repeat;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-QString getMacDateFormat(CFDateFormatterStyle style)</div><div class='del'>-{</div><div class='del'>-    QCFType&lt;CFLocaleRef&gt; l = CFLocaleCopyCurrent();</div><div class='del'>-    QCFType&lt;CFDateFormatterRef&gt; formatter = CFDateFormatterCreate(kCFAllocatorDefault,</div><div class='del'>-                                                                  l, style, kCFDateFormatterNoStyle);</div><div class='del'>-    return macToQtFormat(QCFString::toQString(CFDateFormatterGetFormat(formatter)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString getMacTimeFormat(CFDateFormatterStyle style)</div><div class='del'>-{</div><div class='del'>-    QCFType&lt;CFLocaleRef&gt; l = CFLocaleCopyCurrent();</div><div class='del'>-    QCFType&lt;CFDateFormatterRef&gt; formatter = CFDateFormatterCreate(kCFAllocatorDefault,</div><div class='del'>-                                                                  l, kCFDateFormatterNoStyle, style);</div><div class='del'>-    return macToQtFormat(QCFString::toQString(CFDateFormatterGetFormat(formatter)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString getCFLocaleValue(CFStringRef key)</div><div class='del'>-{</div><div class='del'>-    QCFType&lt;CFLocaleRef&gt; locale = CFLocaleCopyCurrent();</div><div class='del'>-    CFTypeRef value = CFLocaleGetValue(locale, key);</div><div class='del'>-    return QCFString::toQString(CFStringRef(static_cast&lt;CFTypeRef&gt;(value)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QLocale::MeasurementSystem macMeasurementSystem()</div><div class='del'>-{</div><div class='del'>-    QCFType&lt;CFLocaleRef&gt; locale = CFLocaleCopyCurrent();</div><div class='del'>-    CFStringRef system = static_cast&lt;CFStringRef&gt;(CFLocaleGetValue(locale, kCFLocaleMeasurementSystem));</div><div class='del'>-    if (QCFString::toQString(system) == QLatin1String("Metric")) {</div><div class='del'>-        return QLocale::MetricSystem;</div><div class='del'>-    } else {</div><div class='del'>-        return QLocale::ImperialSystem;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void getMacPreferredLanguageAndCountry(QString *language, QString *country)</div><div class='del'>-{</div><div class='del'>-    QCFType&lt;CFArrayRef&gt; languages = (CFArrayRef)CFPreferencesCopyValue(</div><div class='del'>-             CFSTR("AppleLanguages"),</div><div class='del'>-             kCFPreferencesAnyApplication,</div><div class='del'>-             kCFPreferencesCurrentUser,</div><div class='del'>-             kCFPreferencesAnyHost);</div><div class='del'>-    if (languages &amp;&amp; CFArrayGetCount(languages) &gt; 0) {</div><div class='del'>-        QCFType&lt;CFLocaleRef&gt; locale = CFLocaleCreate(kCFAllocatorDefault,</div><div class='del'>-                                                     CFStringRef(CFArrayGetValueAtIndex(languages, 0)));</div><div class='del'>-        if (language)</div><div class='del'>-            *language = QCFString::toQString(CFStringRef(CFLocaleGetValue(locale, kCFLocaleLanguageCode)));</div><div class='del'>-        if (country)</div><div class='del'>-            *country = QCFString::toQString(CFStringRef(CFLocaleGetValue(locale, kCFLocaleCountryCode)));</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-QLocale QSystemLocale::fallbackLocale() const</div><div class='del'>-{</div><div class='del'>-    return QLocale(QString::fromUtf8(getMacLocaleName().constData()));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const</div><div class='del'>-{</div><div class='del'>-    switch(type) {</div><div class='del'>-//     case Name:</div><div class='del'>-//         return getMacLocaleName();</div><div class='del'>-    case DecimalPoint: {</div><div class='del'>-        QString value = getCFLocaleValue(kCFLocaleDecimalSeparator);</div><div class='del'>-        return value.isEmpty() ? QVariant() : value;</div><div class='del'>-    }</div><div class='del'>-    case GroupSeparator: {</div><div class='del'>-        QString value = getCFLocaleValue(kCFLocaleGroupingSeparator);</div><div class='del'>-        return value.isEmpty() ? QVariant() : value;</div><div class='del'>-    }</div><div class='del'>-    case DateFormatLong:</div><div class='del'>-    case DateFormatShort:</div><div class='del'>-        return getMacDateFormat(type == DateFormatShort</div><div class='del'>-                                ? kCFDateFormatterShortStyle</div><div class='del'>-                                : kCFDateFormatterLongStyle);</div><div class='del'>-    case TimeFormatLong:</div><div class='del'>-    case TimeFormatShort:</div><div class='del'>-        return getMacTimeFormat(type == TimeFormatShort</div><div class='del'>-                                ? kCFDateFormatterShortStyle</div><div class='del'>-                                : kCFDateFormatterLongStyle);</div><div class='del'>-    case DayNameLong:</div><div class='del'>-    case DayNameShort:</div><div class='del'>-        return macDayName(in.toInt(), (type == DayNameShort));</div><div class='del'>-    case MonthNameLong:</div><div class='del'>-    case MonthNameShort:</div><div class='del'>-        return macMonthName(in.toInt(), (type == MonthNameShort));</div><div class='del'>-    case DateToStringShort:</div><div class='del'>-    case DateToStringLong:</div><div class='del'>-        return macDateToString(in.toDate(), (type == DateToStringShort));</div><div class='del'>-    case TimeToStringShort:</div><div class='del'>-    case TimeToStringLong:</div><div class='del'>-        return macTimeToString(in.toTime(), (type == TimeToStringShort));</div><div class='del'>-</div><div class='del'>-    case NegativeSign:</div><div class='del'>-    case PositiveSign:</div><div class='del'>-    case ZeroDigit:</div><div class='del'>-        break;</div><div class='del'>-    case LanguageId:</div><div class='del'>-    case CountryId: {</div><div class='del'>-        QString preferredLanguage;</div><div class='del'>-        QString preferredCountry(3, QChar()); // codeToCountry assumes QChar[3]</div><div class='del'>-        getMacPreferredLanguageAndCountry(&amp;preferredLanguage, &amp;preferredCountry);</div><div class='del'>-        QLocale::Language languageCode = (preferredLanguage.isEmpty() ? QLocale::C : codeToLanguage(preferredLanguage.data()));</div><div class='del'>-        QLocale::Country countryCode = (preferredCountry.isEmpty() ? QLocale::AnyCountry : codeToCountry(preferredCountry.data()));</div><div class='del'>-        const QLocalePrivate *d = findLocale(languageCode, countryCode);</div><div class='del'>-        if (type == LanguageId)</div><div class='del'>-            return (QLocale::Language)d-&gt;languageId();</div><div class='del'>-        return (QLocale::Country)d-&gt;countryId();</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    case MeasurementSystem:</div><div class='del'>-        return QVariant(static_cast&lt;int&gt;(macMeasurementSystem()));</div><div class='del'>-</div><div class='del'>-    case AMText:</div><div class='del'>-    case PMText:</div><div class='del'>-        break;</div><div class='del'>-    default:</div><div class='del'>-        break;</div><div class='del'>-    }</div><div class='del'>-    return QVariant();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#elif defined(Q_OS_UNIX) &amp;&amp; !defined(Q_OS_SYMBIAN)</div><div class='del'>-</div><div class='del'>-static uint unixGetSystemMeasurementSystem()</div><div class='del'>-{</div><div class='del'>-    QString meas_locale = QString::fromLocal8Bit(qgetenv("LC_ALL"));</div><div class='del'>-    if (meas_locale.isEmpty()) {</div><div class='del'>-        meas_locale = QString::fromLocal8Bit(qgetenv("LC_MEASUREMENT"));</div><div class='del'>-    }</div><div class='del'>-    if (meas_locale.isEmpty()) {</div><div class='del'>-        meas_locale = QString::fromLocal8Bit(qgetenv("LANG"));</div><div class='del'>-    }</div><div class='del'>-    if (meas_locale.isEmpty()) {</div><div class='del'>-        meas_locale = QString::fromLocal8Bit("C");</div><div class='del'>-    }</div><div class='ctx'> </div><div class='del'>-    if (meas_locale.compare(QString::fromLocal8Bit("Metric"), Qt::CaseInsensitive) == 0)</div><div class='del'>-        return 0;</div><div class='del'>-    if (meas_locale.compare(QString::fromLocal8Bit("Other"), Qt::CaseInsensitive) == 0)</div><div class='del'>-        return 0;</div><div class='del'>-</div><div class='del'>-    const QLocalePrivate* locale = findLocale(meas_locale);</div><div class='del'>-    return locale-&gt;measurementSystem();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-    \internal</div><div class='del'>-*/</div><div class='del'>-QLocale QSystemLocale::fallbackLocale() const</div><div class='del'>-{</div><div class='del'>-    return QLocale(QLatin1String(envVarLocale()));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-    \internal</div><div class='del'>-*/</div><div class='del'>-QVariant QSystemLocale::query(QueryType type, QVariant /* in */) const</div><div class='del'>-{</div><div class='del'>-    if (type == MeasurementSystem) {</div><div class='del'>-        return QVariant(unixGetSystemMeasurementSystem());</div><div class='del'>-    } else {</div><div class='del'>-        return QVariant();</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#elif !defined(Q_OS_SYMBIAN)</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-    \since 4.6</div><div class='del'>-</div><div class='del'>-    Returns a fallback locale, that will get used for everything that</div><div class='del'>-    is not explicitly overridden by the system locale.</div><div class='del'>-*/</div><div class='del'>-QLocale QSystemLocale::fallbackLocale() const</div><div class='del'>-{</div><div class='del'>-    return QLocale(QLatin1String(envVarLocale()));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-    Performs a query of the given \a type in the system locale for</div><div class='del'>-    customized values or conversion. If the method returns a null</div><div class='del'>-    QVariant, the conversion of the fallbackLocale() will be used.</div><div class='del'>-</div><div class='del'>-    \a in is unused for some of the query types.</div><div class='del'>-</div><div class='del'>-    \sa QSystemLocale::QueryType</div><div class='del'>-*/</div><div class='del'>-QVariant QSystemLocale::query(QueryType /* type */, QVariant /* in */) const</div><div class='del'>-{</div><div class='del'>-    return QVariant();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef QT_NO_SYSTEMLOCALE</div><div class='del'>-static QSystemLocale *_systemLocale = 0;</div><div class='del'>-Q_GLOBAL_STATIC_WITH_ARGS(QSystemLocale, QSystemLocale_globalSystemLocale, (true))</div><div class='del'>-static QLocalePrivate *system_lp = 0;</div><div class='del'>-Q_GLOBAL_STATIC(QLocalePrivate, globalLocalePrivate)</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='ctx'> ** Default system locale behavior</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='del'>-    \class QSystemLocale</div><div class='del'>-    \brief The QSystemLocale class can be used to finetune the system locale</div><div class='del'>-    of the user.</div><div class='del'>-    \since 4.2</div><div class='del'>-</div><div class='del'>-    \ingroup i18n</div><div class='del'>-</div><div class='del'>-    \warning This class is only useful in very rare cases. Usually QLocale offers</div><div class='del'>-    all the functionality required for application development.</div><div class='del'>-</div><div class='del'>-    QSystemLocale allows to override the values provided by the system</div><div class='del'>-    locale (QLocale::system()).</div><div class='del'>-</div><div class='del'>-    \sa QLocale</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-  \enum QSystemLocale::QueryType</div><div class='del'>-</div><div class='del'>-  Specifies the type of information queried by query(). For each value</div><div class='del'>-  the type of information to return from the query() method is listed.</div><div class='del'>-</div><div class='del'>-  \value LanguageId a uint specifying the language.</div><div class='del'>-  \value CountryId a uint specifying the country.</div><div class='del'>-  \value DecimalPoint a QString specifying the decimal point.</div><div class='del'>-  \value GroupSeparator a QString specifying the group separator.</div><div class='del'>-  \value ZeroDigit a QString specifying the zero digit.</div><div class='del'>-  \value NegativeSign a QString specifying the minus sign.</div><div class='del'>-  \value PositiveSign a QString specifying the plus sign.</div><div class='del'>-  \value DateFormatLong a QString specifying the long date format</div><div class='del'>-  \value DateFormatShort a QString specifying the short date format</div><div class='del'>-  \value TimeFormatLong a QString specifying the long time format</div><div class='del'>-  \value TimeFormatShort a QString specifying the short time format</div><div class='del'>-  \value DayNameLong a QString specifying the name of a weekday. the in variant contains an integer between 1 and 7 (Monday - Sunday)</div><div class='del'>-  \value DayNameShort a QString specifying the short name of a weekday. the in variant contains an integer between 1 and 7 (Monday - Sunday)</div><div class='del'>-  \value MonthNameLong a QString specifying the name of a month. the in variant contains an integer between 1 and 12</div><div class='del'>-  \value MonthNameShort a QString specifying the short name of a month. the in variant contains an integer between 1 and 12</div><div class='del'>-  \value DateToStringLong converts the QDate stored in the in variant to a QString using the long date format</div><div class='del'>-  \value DateToStringShort converts the QDate stored in the in variant to a QString using the short date format</div><div class='del'>-  \value TimeToStringLong converts the QTime stored in the in variant to a QString using the long time format</div><div class='del'>-  \value TimeToStringShort converts the QTime stored in the in variant to a QString using the short time format</div><div class='del'>-  \value DateTimeFormatLong a QString specifying the long date time format</div><div class='del'>-  \value DateTimeFormatShort a QString specifying the short date time format</div><div class='del'>-  \value DateTimeToStringLong converts the QDateTime in the in variant to a QString using the long datetime format</div><div class='del'>-  \value DateTimeToStringShort converts the QDateTime in the in variant to a QString using the short datetime format</div><div class='del'>-  \value MeasurementSystem a QLocale::MeasurementSystem enum specifying the measurement system</div><div class='del'>-  \value AMText a string that represents the system AM designator associated with a 12-hour clock.</div><div class='del'>-  \value PMText a string that represents the system PM designator associated with a 12-hour clock.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/*!</div><div class='ctx'>   Constructs a QSystemLocale object. The constructor will automatically</div><div class='ctx'>   install this object as the system locale and remove any earlier installed</div><div class='ctx'>   system locales.</div><div class='hunk'>@@ -1430,6 +481,10 @@ void QLocalePrivate::updateSystemPrivate()</div><div class='ctx'>     const QSystemLocale *sys_locale = systemLocale();</div><div class='ctx'>     if (!system_lp)</div><div class='ctx'>         system_lp = globalLocalePrivate();</div><div class='add'>+</div><div class='add'>+    // tell the object that the system locale has changed.</div><div class='add'>+    sys_locale-&gt;query(QSystemLocale::LocaleChanged, QVariant());</div><div class='add'>+</div><div class='ctx'>     *system_lp = *sys_locale-&gt;fallbackLocale().d();</div><div class='ctx'> </div><div class='ctx'> #if defined(Q_OS_SYMBIAN)</div><div class='hunk'>@@ -1437,11 +492,18 @@ void QLocalePrivate::updateSystemPrivate()</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'>     QVariant res = sys_locale-&gt;query(QSystemLocale::LanguageId, QVariant());</div><div class='del'>-    if (!res.isNull())</div><div class='add'>+    if (!res.isNull()) {</div><div class='ctx'>         system_lp-&gt;m_language_id = res.toInt();</div><div class='add'>+        system_lp-&gt;m_script_id = QLocale::AnyScript; // default for compatibility</div><div class='add'>+    }</div><div class='ctx'>     res = sys_locale-&gt;query(QSystemLocale::CountryId, QVariant());</div><div class='del'>-    if (!res.isNull())</div><div class='add'>+    if (!res.isNull()) {</div><div class='ctx'>         system_lp-&gt;m_country_id = res.toInt();</div><div class='add'>+        system_lp-&gt;m_script_id = QLocale::AnyScript; // default for compatibility</div><div class='add'>+    }</div><div class='add'>+    res = sys_locale-&gt;query(QSystemLocale::ScriptId, QVariant());</div><div class='add'>+    if (!res.isNull())</div><div class='add'>+        system_lp-&gt;m_script_id = res.toInt();</div><div class='ctx'> </div><div class='ctx'>     res = sys_locale-&gt;query(QSystemLocale::DecimalPoint, QVariant());</div><div class='ctx'>     if (!res.isNull())</div><div class='hunk'>@@ -1462,6 +524,12 @@ void QLocalePrivate::updateSystemPrivate()</div><div class='ctx'>     res = sys_locale-&gt;query(QSystemLocale::PositiveSign, QVariant());</div><div class='ctx'>     if (!res.isNull())</div><div class='ctx'>         system_lp-&gt;m_plus = res.toString().at(0).unicode();</div><div class='add'>+</div><div class='add'>+#ifdef QT_USE_ICU</div><div class='add'>+    if (!default_lp)</div><div class='add'>+        qt_initIcu(system_lp-&gt;bcp47Name());</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1498,12 +566,14 @@ static QString getLocaleListData(const ushort *data, int size, int index)</div><div class='ctx'>     const ushort *end = data;</div><div class='ctx'>     while (size &gt; 0 &amp;&amp; *end != separator)</div><div class='ctx'>         ++end, --size;</div><div class='add'>+    if (end-data == 0)</div><div class='add'>+        return QString();</div><div class='ctx'>     return QString::fromRawData(reinterpret_cast&lt;const QChar*&gt;(data), end-data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline QString getLocaleData(const ushort *data, int size)</div><div class='ctx'> {</div><div class='del'>-    return QString::fromRawData(reinterpret_cast&lt;const QChar*&gt;(data), size);</div><div class='add'>+    return size ? QString::fromRawData(reinterpret_cast&lt;const QChar*&gt;(data), size) : QString();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1524,649 +594,6 @@ QDataStream &amp;operator&gt;&gt;(QDataStream &amp;ds, QLocale &amp;l)</div><div class='ctx'> #endif // QT_NO_DATASTREAM</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*!</div><div class='del'>-    \class QLocale</div><div class='del'>-    \brief The QLocale class converts between numbers and their</div><div class='del'>-    string representations in various languages.</div><div class='del'>-</div><div class='del'>-    \reentrant</div><div class='del'>-    \ingroup i18n</div><div class='del'>-    \ingroup string-processing</div><div class='del'>-    \ingroup shared</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    QLocale is initialized with a language/country pair in its</div><div class='del'>-    constructor and offers number-to-string and string-to-number</div><div class='del'>-    conversion functions similar to those in QString.</div><div class='del'>-</div><div class='del'>-    Example:</div><div class='del'>-</div><div class='del'>-    \snippet doc/src/snippets/code/src_corelib_tools_qlocale.cpp 0</div><div class='del'>-</div><div class='del'>-    QLocale supports the concept of a default locale, which is</div><div class='del'>-    determined from the system's locale settings at application</div><div class='del'>-    startup. The default locale can be changed by calling the</div><div class='del'>-    static member setDefault(). Setting the default locale has the</div><div class='del'>-    following effects:</div><div class='del'>-</div><div class='del'>-    \list</div><div class='del'>-    \i If a QLocale object is constructed with the default constructor,</div><div class='del'>-       it will use the default locale's settings.</div><div class='del'>-    \i QString::toInt(), QString::toDouble(), etc., interpret the</div><div class='del'>-       string according to the default locale. If this fails, it</div><div class='del'>-       falls back on the "C" locale.</div><div class='del'>-    \i QString::arg() uses the default locale to format a number when</div><div class='del'>-       its position specifier in the format string contains an 'L',</div><div class='del'>-       e.g. "%L1".</div><div class='del'>-    \endlist</div><div class='del'>-</div><div class='del'>-    The following example illustrates how to use QLocale directly:</div><div class='del'>-</div><div class='del'>-    \snippet doc/src/snippets/code/src_corelib_tools_qlocale.cpp 1</div><div class='del'>-</div><div class='del'>-    When a language/country pair is specified in the constructor, one</div><div class='del'>-    of three things can happen:</div><div class='del'>-</div><div class='del'>-    \list</div><div class='del'>-    \i If the language/country pair is found in the database, it is used.</div><div class='del'>-    \i If the language is found but the country is not, or if the country</div><div class='del'>-       is \c AnyCountry, the language is used with the most</div><div class='del'>-       appropriate available country (for example, Germany for German),</div><div class='del'>-    \i If neither the language nor the country are found, QLocale</div><div class='del'>-       defaults to the default locale (see setDefault()).</div><div class='del'>-    \endlist</div><div class='del'>-</div><div class='del'>-    Use language() and country() to determine the actual language and</div><div class='del'>-    country values used.</div><div class='del'>-</div><div class='del'>-    An alternative method for constructing a QLocale object is by</div><div class='del'>-    specifying the locale name.</div><div class='del'>-</div><div class='del'>-    \snippet doc/src/snippets/code/src_corelib_tools_qlocale.cpp 2</div><div class='del'>-</div><div class='del'>-    This constructor converts the locale name to a language/country</div><div class='del'>-    pair; it does not use the system locale database.</div><div class='del'>-</div><div class='del'>-    QLocale's data is based on Common Locale Data Repository v1.8.1.</div><div class='del'>-</div><div class='del'>-    The double-to-string and string-to-double conversion functions are</div><div class='del'>-    covered by the following licenses:</div><div class='del'>-</div><div class='del'>-    \legalese</div><div class='del'>-    Copyright (c) 1991 by AT&amp;T.</div><div class='del'>-</div><div class='del'>-    Permission to use, copy, modify, and distribute this software for any</div><div class='del'>-    purpose without fee is hereby granted, provided that this entire notice</div><div class='del'>-    is included in all copies of any software which is or includes a copy</div><div class='del'>-    or modification of this software and in all copies of the supporting</div><div class='del'>-    documentation for such software.</div><div class='del'>-</div><div class='del'>-    THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED</div><div class='del'>-    WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR AT&amp;T MAKES ANY</div><div class='del'>-    REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY</div><div class='del'>-    OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.</div><div class='del'>-</div><div class='del'>-    This product includes software developed by the University of</div><div class='del'>-    California, Berkeley and its contributors.</div><div class='del'>-</div><div class='del'>-    \sa QString::arg(), QString::toInt(), QString::toDouble()</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-    \enum QLocale::Language</div><div class='del'>-</div><div class='del'>-    This enumerated type is used to specify a language.</div><div class='del'>-</div><div class='del'>-    \value C The "C" locale is identical in behavior to English/UnitedStates.</div><div class='del'>-    \value Abkhazian</div><div class='del'>-    \value Afan</div><div class='del'>-    \value Afar</div><div class='del'>-    \value Afrikaans</div><div class='del'>-    \value Albanian</div><div class='del'>-    \value Amharic</div><div class='del'>-    \value Arabic</div><div class='del'>-    \value Armenian</div><div class='del'>-    \value Assamese</div><div class='del'>-    \value Aymara</div><div class='del'>-    \value Azerbaijani</div><div class='del'>-    \value Bashkir</div><div class='del'>-    \value Basque</div><div class='del'>-    \value Bengali</div><div class='del'>-    \value Bhutani</div><div class='del'>-    \value Bihari</div><div class='del'>-    \value Bislama</div><div class='del'>-    \value Bosnian</div><div class='del'>-    \value Breton</div><div class='del'>-    \value Bulgarian</div><div class='del'>-    \value Burmese</div><div class='del'>-    \value Byelorussian</div><div class='del'>-    \value Cambodian</div><div class='del'>-    \value Catalan</div><div class='del'>-    \value Chinese</div><div class='del'>-    \value Cornish</div><div class='del'>-    \value Corsican</div><div class='del'>-    \value Croatian</div><div class='del'>-    \value Czech</div><div class='del'>-    \value Danish</div><div class='del'>-    \value Divehi</div><div class='del'>-    \value Dutch</div><div class='del'>-    \value English</div><div class='del'>-    \value Esperanto</div><div class='del'>-    \value Estonian</div><div class='del'>-    \value Faroese</div><div class='del'>-    \value FijiLanguage</div><div class='del'>-    \value Finnish</div><div class='del'>-    \value French</div><div class='del'>-    \value Frisian</div><div class='del'>-    \value Gaelic</div><div class='del'>-    \value Galician</div><div class='del'>-    \value Georgian</div><div class='del'>-    \value German</div><div class='del'>-    \value Greek</div><div class='del'>-    \value Greenlandic</div><div class='del'>-    \value Guarani</div><div class='del'>-    \value Gujarati</div><div class='del'>-    \value Hausa</div><div class='del'>-    \value Hebrew</div><div class='del'>-    \value Hindi</div><div class='del'>-    \value Hungarian</div><div class='del'>-    \value Icelandic</div><div class='del'>-    \value Indonesian</div><div class='del'>-    \value Interlingua</div><div class='del'>-    \value Interlingue</div><div class='del'>-    \value Inuktitut</div><div class='del'>-    \value Inupiak</div><div class='del'>-    \value Irish</div><div class='del'>-    \value Italian</div><div class='del'>-    \value Japanese</div><div class='del'>-    \value Javanese</div><div class='del'>-    \value Kannada</div><div class='del'>-    \value Kashmiri</div><div class='del'>-    \value Kazakh</div><div class='del'>-    \value Kinyarwanda</div><div class='del'>-    \value Kirghiz</div><div class='del'>-    \value Korean</div><div class='del'>-    \value Kurdish</div><div class='del'>-    \value Kurundi</div><div class='del'>-    \value Laothian</div><div class='del'>-    \value Latin</div><div class='del'>-    \value Latvian</div><div class='del'>-    \value Lingala</div><div class='del'>-    \value Lithuanian</div><div class='del'>-    \value Macedonian</div><div class='del'>-    \value Malagasy</div><div class='del'>-    \value Malay</div><div class='del'>-    \value Malayalam</div><div class='del'>-    \value Maltese</div><div class='del'>-    \value Manx</div><div class='del'>-    \value Maori</div><div class='del'>-    \value Marathi</div><div class='del'>-    \value Moldavian</div><div class='del'>-    \value Mongolian</div><div class='del'>-    \value NauruLanguage</div><div class='del'>-    \value Nepali</div><div class='del'>-    \value Norwegian</div><div class='del'>-    \value NorwegianBokmal</div><div class='del'>-    \value Nynorsk Obsolete, please use NorwegianNynorsk</div><div class='del'>-    \value NorwegianNynorsk</div><div class='del'>-    \value Occitan</div><div class='del'>-    \value Oriya</div><div class='del'>-    \value Pashto</div><div class='del'>-    \value Persian</div><div class='del'>-    \value Polish</div><div class='del'>-    \value Portuguese</div><div class='del'>-    \value Punjabi</div><div class='del'>-    \value Quechua</div><div class='del'>-    \value RhaetoRomance</div><div class='del'>-    \value Romanian</div><div class='del'>-    \value Russian</div><div class='del'>-    \value Samoan</div><div class='del'>-    \value Sangho</div><div class='del'>-    \value Sanskrit</div><div class='del'>-    \value Serbian</div><div class='del'>-    \value SerboCroatian</div><div class='del'>-    \value Sesotho</div><div class='del'>-    \value Setswana</div><div class='del'>-    \value Shona</div><div class='del'>-    \value Sindhi</div><div class='del'>-    \value Singhalese</div><div class='del'>-    \value Siswati</div><div class='del'>-    \value Slovak</div><div class='del'>-    \value Slovenian</div><div class='del'>-    \value Somali</div><div class='del'>-    \value Spanish</div><div class='del'>-    \value Sundanese</div><div class='del'>-    \value Swahili</div><div class='del'>-    \value Swedish</div><div class='del'>-    \value Tagalog</div><div class='del'>-    \value Tajik</div><div class='del'>-    \value Tamil</div><div class='del'>-    \value Tatar</div><div class='del'>-    \value Telugu</div><div class='del'>-    \value Thai</div><div class='del'>-    \value Tibetan</div><div class='del'>-    \value Tigrinya</div><div class='del'>-    \value TongaLanguage</div><div class='del'>-    \value Tsonga</div><div class='del'>-    \value Turkish</div><div class='del'>-    \value Turkmen</div><div class='del'>-    \value Twi</div><div class='del'>-    \value Uigur</div><div class='del'>-    \value Ukrainian</div><div class='del'>-    \value Urdu</div><div class='del'>-    \value Uzbek</div><div class='del'>-    \value Vietnamese</div><div class='del'>-    \value Volapuk</div><div class='del'>-    \value Welsh</div><div class='del'>-    \value Wolof</div><div class='del'>-    \value Xhosa</div><div class='del'>-    \value Yiddish</div><div class='del'>-    \value Yoruba</div><div class='del'>-    \value Zhuang</div><div class='del'>-    \value Zulu</div><div class='del'>-    \value Bosnian</div><div class='del'>-    \value Divehi</div><div class='del'>-    \value Manx</div><div class='del'>-    \value Cornish</div><div class='del'>-    \value Akan</div><div class='del'>-    \value Konkani</div><div class='del'>-    \value Ga</div><div class='del'>-    \value Igbo</div><div class='del'>-    \value Kamba</div><div class='del'>-    \value Syriac</div><div class='del'>-    \value Blin</div><div class='del'>-    \value Geez</div><div class='del'>-    \value Koro</div><div class='del'>-    \value Sidamo</div><div class='del'>-    \value Atsam</div><div class='del'>-    \value Tigre</div><div class='del'>-    \value Jju</div><div class='del'>-    \value Friulian</div><div class='del'>-    \value Venda</div><div class='del'>-    \value Ewe</div><div class='del'>-    \value Walamo</div><div class='del'>-    \value Hawaiian</div><div class='del'>-    \value Tyap</div><div class='del'>-    \value Chewa</div><div class='del'>-    \value Filipino</div><div class='del'>-    \value SwissGerman</div><div class='del'>-    \value SichuanYi</div><div class='del'>-    \value Kpelle</div><div class='del'>-    \value LowGerman</div><div class='del'>-    \value SouthNdebele</div><div class='del'>-    \value NorthernSotho</div><div class='del'>-    \value NorthernSami</div><div class='del'>-    \value Taroko</div><div class='del'>-    \value Gusii</div><div class='del'>-    \value Taita</div><div class='del'>-    \value Fulah</div><div class='del'>-    \value Kikuyu</div><div class='del'>-    \value Samburu</div><div class='del'>-    \value Sena</div><div class='del'>-    \value NorthNdebele</div><div class='del'>-    \value Rombo</div><div class='del'>-    \value Tachelhit</div><div class='del'>-    \value Kabyle</div><div class='del'>-    \value Nyankole</div><div class='del'>-    \value Bena</div><div class='del'>-    \value Vunjo</div><div class='del'>-    \value Bambara</div><div class='del'>-    \value Embu</div><div class='del'>-    \value Cherokee</div><div class='del'>-    \value Morisyen</div><div class='del'>-    \value Makonde</div><div class='del'>-    \value Langi</div><div class='del'>-    \value Ganda</div><div class='del'>-    \value Bemba</div><div class='del'>-    \value Kabuverdianu</div><div class='del'>-    \value Meru</div><div class='del'>-    \value Kalenjin</div><div class='del'>-    \value Nama</div><div class='del'>-    \value Machame</div><div class='del'>-    \value Colognian</div><div class='del'>-    \value Masai</div><div class='del'>-    \value Soga</div><div class='del'>-    \value Luyia</div><div class='del'>-    \value Asu</div><div class='del'>-    \value Teso</div><div class='del'>-    \value Saho</div><div class='del'>-    \value KoyraChiini</div><div class='del'>-    \value Rwa</div><div class='del'>-    \value Luo</div><div class='del'>-    \value Chiga</div><div class='del'>-    \value CentralMoroccoTamazight</div><div class='del'>-    \value KoyraboroSenni</div><div class='del'>-    \value Shambala</div><div class='del'>-    \omitvalue LastLanguage</div><div class='del'>-</div><div class='del'>-    \sa language()</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-    \enum QLocale::Country</div><div class='del'>-</div><div class='del'>-    This enumerated type is used to specify a country.</div><div class='del'>-</div><div class='del'>-    \value AnyCountry</div><div class='del'>-    \value Afghanistan</div><div class='del'>-    \value Albania</div><div class='del'>-    \value Algeria</div><div class='del'>-    \value AmericanSamoa</div><div class='del'>-    \value Andorra</div><div class='del'>-    \value Angola</div><div class='del'>-    \value Anguilla</div><div class='del'>-    \value Antarctica</div><div class='del'>-    \value AntiguaAndBarbuda</div><div class='del'>-    \value Argentina</div><div class='del'>-    \value Armenia</div><div class='del'>-    \value Aruba</div><div class='del'>-    \value Australia</div><div class='del'>-    \value Austria</div><div class='del'>-    \value Azerbaijan</div><div class='del'>-    \value Bahamas</div><div class='del'>-    \value Bahrain</div><div class='del'>-    \value Bangladesh</div><div class='del'>-    \value Barbados</div><div class='del'>-    \value Belarus</div><div class='del'>-    \value Belgium</div><div class='del'>-    \value Belize</div><div class='del'>-    \value Benin</div><div class='del'>-    \value Bermuda</div><div class='del'>-    \value Bhutan</div><div class='del'>-    \value Bolivia</div><div class='del'>-    \value BosniaAndHerzegowina</div><div class='del'>-    \value Botswana</div><div class='del'>-    \value BouvetIsland</div><div class='del'>-    \value Brazil</div><div class='del'>-    \value BritishIndianOceanTerritory</div><div class='del'>-    \value BruneiDarussalam</div><div class='del'>-    \value Bulgaria</div><div class='del'>-    \value BurkinaFaso</div><div class='del'>-    \value Burundi</div><div class='del'>-    \value Cambodia</div><div class='del'>-    \value Cameroon</div><div class='del'>-    \value Canada</div><div class='del'>-    \value CapeVerde</div><div class='del'>-    \value CaymanIslands</div><div class='del'>-    \value CentralAfricanRepublic</div><div class='del'>-    \value Chad</div><div class='del'>-    \value Chile</div><div class='del'>-    \value China</div><div class='del'>-    \value ChristmasIsland</div><div class='del'>-    \value CocosIslands</div><div class='del'>-    \value Colombia</div><div class='del'>-    \value Comoros</div><div class='del'>-    \value DemocraticRepublicOfCongo</div><div class='del'>-    \value PeoplesRepublicOfCongo</div><div class='del'>-    \value CookIslands</div><div class='del'>-    \value CostaRica</div><div class='del'>-    \value IvoryCoast</div><div class='del'>-    \value Croatia</div><div class='del'>-    \value Cuba</div><div class='del'>-    \value Cyprus</div><div class='del'>-    \value CzechRepublic</div><div class='del'>-    \value Denmark</div><div class='del'>-    \value Djibouti</div><div class='del'>-    \value Dominica</div><div class='del'>-    \value DominicanRepublic</div><div class='del'>-    \value EastTimor</div><div class='del'>-    \value Ecuador</div><div class='del'>-    \value Egypt</div><div class='del'>-    \value ElSalvador</div><div class='del'>-    \value EquatorialGuinea</div><div class='del'>-    \value Eritrea</div><div class='del'>-    \value Estonia</div><div class='del'>-    \value Ethiopia</div><div class='del'>-    \value FalklandIslands</div><div class='del'>-    \value FaroeIslands</div><div class='del'>-    \value FijiCountry</div><div class='del'>-    \value Finland</div><div class='del'>-    \value France</div><div class='del'>-    \value MetropolitanFrance</div><div class='del'>-    \value FrenchGuiana</div><div class='del'>-    \value FrenchPolynesia</div><div class='del'>-    \value FrenchSouthernTerritories</div><div class='del'>-    \value Gabon</div><div class='del'>-    \value Gambia</div><div class='del'>-    \value Georgia</div><div class='del'>-    \value Germany</div><div class='del'>-    \value Ghana</div><div class='del'>-    \value Gibraltar</div><div class='del'>-    \value Greece</div><div class='del'>-    \value Greenland</div><div class='del'>-    \value Grenada</div><div class='del'>-    \value Guadeloupe</div><div class='del'>-    \value Guam</div><div class='del'>-    \value Guatemala</div><div class='del'>-    \value Guinea</div><div class='del'>-    \value GuineaBissau</div><div class='del'>-    \value Guyana</div><div class='del'>-    \value Haiti</div><div class='del'>-    \value HeardAndMcDonaldIslands</div><div class='del'>-    \value Honduras</div><div class='del'>-    \value HongKong</div><div class='del'>-    \value Hungary</div><div class='del'>-    \value Iceland</div><div class='del'>-    \value India</div><div class='del'>-    \value Indonesia</div><div class='del'>-    \value Iran</div><div class='del'>-    \value Iraq</div><div class='del'>-    \value Ireland</div><div class='del'>-    \value Israel</div><div class='del'>-    \value Italy</div><div class='del'>-    \value Jamaica</div><div class='del'>-    \value Japan</div><div class='del'>-    \value Jordan</div><div class='del'>-    \value Kazakhstan</div><div class='del'>-    \value Kenya</div><div class='del'>-    \value Kiribati</div><div class='del'>-    \value DemocraticRepublicOfKorea</div><div class='del'>-    \value RepublicOfKorea</div><div class='del'>-    \value Kuwait</div><div class='del'>-    \value Kyrgyzstan</div><div class='del'>-    \value Lao</div><div class='del'>-    \value Latvia</div><div class='del'>-    \value Lebanon</div><div class='del'>-    \value Lesotho</div><div class='del'>-    \value Liberia</div><div class='del'>-    \value LibyanArabJamahiriya</div><div class='del'>-    \value Liechtenstein</div><div class='del'>-    \value Lithuania</div><div class='del'>-    \value Luxembourg</div><div class='del'>-    \value Macau</div><div class='del'>-    \value Macedonia</div><div class='del'>-    \value Madagascar</div><div class='del'>-    \value Malawi</div><div class='del'>-    \value Malaysia</div><div class='del'>-    \value Maldives</div><div class='del'>-    \value Mali</div><div class='del'>-    \value Malta</div><div class='del'>-    \value MarshallIslands</div><div class='del'>-    \value Martinique</div><div class='del'>-    \value Mauritania</div><div class='del'>-    \value Mauritius</div><div class='del'>-    \value Mayotte</div><div class='del'>-    \value Mexico</div><div class='del'>-    \value Micronesia</div><div class='del'>-    \value Moldova</div><div class='del'>-    \value Monaco</div><div class='del'>-    \value Mongolia</div><div class='del'>-    \value Montserrat</div><div class='del'>-    \value Morocco</div><div class='del'>-    \value Mozambique</div><div class='del'>-    \value Myanmar</div><div class='del'>-    \value Namibia</div><div class='del'>-    \value NauruCountry</div><div class='del'>-    \value Nepal</div><div class='del'>-    \value Netherlands</div><div class='del'>-    \value NetherlandsAntilles</div><div class='del'>-    \value NewCaledonia</div><div class='del'>-    \value NewZealand</div><div class='del'>-    \value Nicaragua</div><div class='del'>-    \value Niger</div><div class='del'>-    \value Nigeria</div><div class='del'>-    \value Niue</div><div class='del'>-    \value NorfolkIsland</div><div class='del'>-    \value NorthernMarianaIslands</div><div class='del'>-    \value Norway</div><div class='del'>-    \value Oman</div><div class='del'>-    \value Pakistan</div><div class='del'>-    \value Palau</div><div class='del'>-    \value PalestinianTerritory</div><div class='del'>-    \value Panama</div><div class='del'>-    \value PapuaNewGuinea</div><div class='del'>-    \value Paraguay</div><div class='del'>-    \value Peru</div><div class='del'>-    \value Philippines</div><div class='del'>-    \value Pitcairn</div><div class='del'>-    \value Poland</div><div class='del'>-    \value Portugal</div><div class='del'>-    \value PuertoRico</div><div class='del'>-    \value Qatar</div><div class='del'>-    \value Reunion</div><div class='del'>-    \value Romania</div><div class='del'>-    \value RussianFederation</div><div class='del'>-    \value Rwanda</div><div class='del'>-    \value SaintKittsAndNevis</div><div class='del'>-    \value StLucia</div><div class='del'>-    \value StVincentAndTheGrenadines</div><div class='del'>-    \value Samoa</div><div class='del'>-    \value SanMarino</div><div class='del'>-    \value SaoTomeAndPrincipe</div><div class='del'>-    \value SaudiArabia</div><div class='del'>-    \value Senegal</div><div class='del'>-    \value SerbiaAndMontenegro</div><div class='del'>-    \value Seychelles</div><div class='del'>-    \value SierraLeone</div><div class='del'>-    \value Singapore</div><div class='del'>-    \value Slovakia</div><div class='del'>-    \value Slovenia</div><div class='del'>-    \value SolomonIslands</div><div class='del'>-    \value Somalia</div><div class='del'>-    \value SouthAfrica</div><div class='del'>-    \value SouthGeorgiaAndTheSouthSandwichIslands</div><div class='del'>-    \value Spain</div><div class='del'>-    \value SriLanka</div><div class='del'>-    \value StHelena</div><div class='del'>-    \value StPierreAndMiquelon</div><div class='del'>-    \value Sudan</div><div class='del'>-    \value Suriname</div><div class='del'>-    \value SvalbardAndJanMayenIslands</div><div class='del'>-    \value Swaziland</div><div class='del'>-    \value Sweden</div><div class='del'>-    \value Switzerland</div><div class='del'>-    \value SyrianArabRepublic</div><div class='del'>-    \value Taiwan</div><div class='del'>-    \value Tajikistan</div><div class='del'>-    \value Tanzania</div><div class='del'>-    \value Thailand</div><div class='del'>-    \value Togo</div><div class='del'>-    \value Tokelau</div><div class='del'>-    \value TongaCountry</div><div class='del'>-    \value TrinidadAndTobago</div><div class='del'>-    \value Tunisia</div><div class='del'>-    \value Turkey</div><div class='del'>-    \value Turkmenistan</div><div class='del'>-    \value TurksAndCaicosIslands</div><div class='del'>-    \value Tuvalu</div><div class='del'>-    \value Uganda</div><div class='del'>-    \value Ukraine</div><div class='del'>-    \value UnitedArabEmirates</div><div class='del'>-    \value UnitedKingdom</div><div class='del'>-    \value UnitedStates</div><div class='del'>-    \value UnitedStatesMinorOutlyingIslands</div><div class='del'>-    \value Uruguay</div><div class='del'>-    \value Uzbekistan</div><div class='del'>-    \value Vanuatu</div><div class='del'>-    \value VaticanCityState</div><div class='del'>-    \value Venezuela</div><div class='del'>-    \value VietNam</div><div class='del'>-    \value BritishVirginIslands</div><div class='del'>-    \value USVirginIslands</div><div class='del'>-    \value WallisAndFutunaIslands</div><div class='del'>-    \value WesternSahara</div><div class='del'>-    \value Yemen</div><div class='del'>-    \value Yugoslavia</div><div class='del'>-    \value Zambia</div><div class='del'>-    \value Zimbabwe</div><div class='del'>-    \value SerbiaAndMontenegro</div><div class='del'>-    \value Montenegro</div><div class='del'>-    \value Serbia</div><div class='del'>-    \value SaintBarthelemy</div><div class='del'>-    \value SaintMartin</div><div class='del'>-    \value LatinAmericaAndTheCaribbean</div><div class='del'>-    \omitvalue LastCountry</div><div class='del'>-</div><div class='del'>-    \sa country()</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-    \enum QLocale::FormatType</div><div class='del'>-</div><div class='del'>-    This enum describes the types of format that can be used when</div><div class='del'>-    converting QDate and QTime objects to strings.</div><div class='del'>-</div><div class='del'>-    \value LongFormat The long version of day and month names; for</div><div class='del'>-    example, returning "January" as a month name.</div><div class='del'>-</div><div class='del'>-    \value ShortFormat The short version of day and month names; for</div><div class='del'>-    example, returning "Jan" as a month name.</div><div class='del'>-</div><div class='del'>-    \value NarrowFormat A special version of day and month names for</div><div class='del'>-    use when space is limited; for example, returning "J" as a month</div><div class='del'>-    name. Note that the narrow format might contain the same text for</div><div class='del'>-    different months and days or it can even be an empty string if the</div><div class='del'>-    locale doesn't support narrow names, so you should avoid using it</div><div class='del'>-    for date formatting. Also, for the system locale this format is</div><div class='del'>-    the same as ShortFormat.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-    \enum QLocale::NumberOption</div><div class='del'>-</div><div class='del'>-    This enum defines a set of options for number-to-string and string-to-number</div><div class='del'>-    conversions. They can be retrieved with numberOptions() and set with</div><div class='del'>-    setNumberOptions().</div><div class='del'>-</div><div class='del'>-    \value OmitGroupSeparator If this option is set, the number-to-string functions</div><div class='del'>-            will not insert group separators in their return values. The default</div><div class='del'>-            is to insert group separators.</div><div class='del'>-    \value RejectGroupSeparator If this option is set, the string-to-number functions</div><div class='del'>-            will fail if they encounter group separators in their input. The default</div><div class='del'>-            is to accept numbers containing correctly placed group separators.</div><div class='del'>-</div><div class='del'>-    \sa setNumberOptions() numberOptions()</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-    \enum QLocale::MeasurementSystem</div><div class='del'>-</div><div class='del'>-    This enum defines which units are used for measurement.</div><div class='del'>-</div><div class='del'>-    \value MetricSystem This value indicates metric units, such as meters,</div><div class='del'>-            centimeters and millimeters.</div><div class='del'>-    \value ImperialSystem This value indicates imperial units, such as inches and</div><div class='del'>-            miles. There are several distinct imperial systems in the world; this</div><div class='del'>-            value stands for the official United States imperial units.</div><div class='del'>-</div><div class='del'>-    \since 4.4</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-    \fn bool QLocale::operator==(const QLocale &amp;other) const</div><div class='del'>-</div><div class='del'>-    Returns true if the QLocale object is the same as the \a other</div><div class='del'>-    locale specified; otherwise returns false.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-    \fn bool QLocale::operator!=(const QLocale &amp;other) const</div><div class='del'>-</div><div class='del'>-    Returns true if the QLocale object is not the same as the \a other</div><div class='del'>-    locale specified; otherwise returns false.</div><div class='del'>-*/</div><div class='del'>-</div><div class='ctx'> static const int locale_data_size = sizeof(locale_data)/sizeof(QLocalePrivate) - 1;</div><div class='ctx'> </div><div class='ctx'> static const QLocalePrivate *dataPointerHelper(quint16 index)</div><div class='hunk'>@@ -2199,27 +626,30 @@ static quint16 localePrivateIndex(const QLocalePrivate *p)</div><div class='ctx'> /*!</div><div class='ctx'>     Constructs a QLocale object with the specified \a name,</div><div class='ctx'>     which has the format</div><div class='del'>-    "language[_territory][.codeset][@modifier]" or "C", where:</div><div class='add'>+    "language[_script][_country][.codeset][@modifier]" or "C", where:</div><div class='ctx'> </div><div class='ctx'>     \list</div><div class='ctx'>     \i language is a lowercase, two-letter, ISO 639 language code,</div><div class='del'>-    \i territory is an uppercase, two-letter, ISO 3166 country code,</div><div class='add'>+    \i script is a titlecase, four-letter, ISO 15924 script code,</div><div class='add'>+    \i country is an uppercase, two- or three-letter, ISO 3166 country code (also "419" as defined by United Nations),</div><div class='ctx'>     \i and codeset and modifier are ignored.</div><div class='ctx'>     \endlist</div><div class='ctx'> </div><div class='add'>+    The separator can be either underscore or a minus sign.</div><div class='add'>+</div><div class='ctx'>     If the string violates the locale format, or language is not</div><div class='ctx'>     a valid ISO 369 code, the "C" locale is used instead. If country</div><div class='ctx'>     is not present, or is not a valid ISO 3166 code, the most</div><div class='ctx'>     appropriate country is chosen for the specified language.</div><div class='ctx'> </div><div class='del'>-    The language and country codes are converted to their respective</div><div class='del'>-    \c Language and \c Country enums. After this conversion is</div><div class='del'>-    performed the constructor behaves exactly like QLocale(Country,</div><div class='add'>+    The language, script and country codes are converted to their respective</div><div class='add'>+    \c Language, \c Script and \c Country enums. After this conversion is</div><div class='add'>+    performed the constructor behaves exactly like QLocale(Country, Script,</div><div class='ctx'>     Language).</div><div class='ctx'> </div><div class='del'>-    This constructor is much slower than QLocale(Country, Language).</div><div class='add'>+    This constructor is much slower than QLocale(Country, Script, Language).</div><div class='ctx'> </div><div class='del'>-    \sa name()</div><div class='add'>+    \sa bcp47Name()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> QLocale::QLocale(const QString &amp;name)</div><div class='hunk'>@@ -2266,7 +696,46 @@ QLocale::QLocale()</div><div class='ctx'> QLocale::QLocale(Language language, Country country)</div><div class='ctx'>     : v(0)</div><div class='ctx'> {</div><div class='del'>-    const QLocalePrivate *d = findLocale(language, country);</div><div class='add'>+    const QLocalePrivate *d = QLocalePrivate::findLocale(language, QLocale::AnyScript, country);</div><div class='add'>+</div><div class='add'>+    // If not found, should default to system</div><div class='add'>+    if (d-&gt;languageId() == QLocale::C &amp;&amp; language != QLocale::C) {</div><div class='add'>+        p.numberOptions = default_number_options;</div><div class='add'>+        p.index = localePrivateIndex(defaultPrivate());</div><div class='add'>+    } else {</div><div class='add'>+        p.numberOptions = 0;</div><div class='add'>+        p.index = localePrivateIndex(d);</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+\</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Constructs a QLocale object with the specified \a language, \a script and</div><div class='add'>+    \a country.</div><div class='add'>+</div><div class='add'>+    \list</div><div class='add'>+    \i If the language/script/country is found in the database, it is used.</div><div class='add'>+    \i If both \a script is AnyScript and \a country is AnyCountry, the</div><div class='add'>+       language is used with the most appropriate available script and country</div><div class='add'>+       (for example, Germany for German),</div><div class='add'>+    \i If either \a script is AnyScript or \a country is AnyCountry, the</div><div class='add'>+       language is used with the first locale that matches the given \a script</div><div class='add'>+       and \a country.</div><div class='add'>+    \i If neither the language nor the country are found, QLocale</div><div class='add'>+       defaults to the default locale (see setDefault()).</div><div class='add'>+    \endlist</div><div class='add'>+</div><div class='add'>+    The language, script and country that are actually used can be queried</div><div class='add'>+    using language(), script() and country().</div><div class='add'>+</div><div class='add'>+    \sa setDefault() language() script() country()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+QLocale::QLocale(Language language, Script script, Country country)</div><div class='add'>+    : v(0)</div><div class='add'>+{</div><div class='add'>+    const QLocalePrivate *d = QLocalePrivate::findLocale(language, script, country);</div><div class='ctx'> </div><div class='ctx'>     // If not found, should default to system</div><div class='ctx'>     if (d-&gt;languageId() == QLocale::C &amp;&amp; language != QLocale::C) {</div><div class='hunk'>@@ -2328,6 +797,80 @@ QLocale::NumberOptions QLocale::numberOptions() const</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns \a str quoted according to the current locale using the given</div><div class='add'>+    quotation \a style.</div><div class='add'>+*/</div><div class='add'>+QString QLocale::quoteString(const QString &amp;str, QuotationStyle style) const</div><div class='add'>+{</div><div class='add'>+    return quoteString(&amp;str, style);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    \overload</div><div class='add'>+*/</div><div class='add'>+QString QLocale::quoteString(const QStringRef &amp;str, QuotationStyle style) const</div><div class='add'>+{</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+    if (d() == systemPrivate()) {</div><div class='add'>+        QVariant res;</div><div class='add'>+        if (style == QLocale::AlternateQuotation)</div><div class='add'>+            res = systemLocale()-&gt;query(QSystemLocale::StringToAlternateQuotation, QVariant::fromValue(str));</div><div class='add'>+        if (res.isNull() || style == QLocale::StandardQuotation)</div><div class='add'>+            res = systemLocale()-&gt;query(QSystemLocale::StringToStandardQuotation, QVariant::fromValue(str));</div><div class='add'>+        if (!res.isNull())</div><div class='add'>+            return res.toString();</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    if (style == QLocale::StandardQuotation)</div><div class='add'>+        return QChar(d()-&gt;m_quotation_start) % str % QChar(d()-&gt;m_quotation_end);</div><div class='add'>+    else</div><div class='add'>+        return QChar(d()-&gt;m_alternate_quotation_start) % str % QChar(d()-&gt;m_alternate_quotation_end);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns a string that represents a join of a given \a list of strings with</div><div class='add'>+    a separator defined by the locale.</div><div class='add'>+*/</div><div class='add'>+QString QLocale::createSeparatedList(const QStringList &amp;list) const</div><div class='add'>+{</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+    if (d() == systemPrivate()) {</div><div class='add'>+        QVariant res;</div><div class='add'>+        res = systemLocale()-&gt;query(QSystemLocale::ListToSeparatedString, QVariant::fromValue(list));</div><div class='add'>+</div><div class='add'>+        if (!res.isNull())</div><div class='add'>+            return res.toString();</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    const int size = list.size();</div><div class='add'>+    if (size == 1) {</div><div class='add'>+        return list.at(0);</div><div class='add'>+    } else if (size == 2) {</div><div class='add'>+        QString format = getLocaleData(list_pattern_part_data + d()-&gt;m_list_pattern_part_two_idx, d()-&gt;m_list_pattern_part_two_size);</div><div class='add'>+        return format.arg(list.at(0), list.at(1));</div><div class='add'>+    } else if (size &gt; 2) {</div><div class='add'>+        QString formatStart = getLocaleData(list_pattern_part_data + d()-&gt;m_list_pattern_part_start_idx, d()-&gt;m_list_pattern_part_start_size);</div><div class='add'>+        QString formatMid = getLocaleData(list_pattern_part_data + d()-&gt;m_list_pattern_part_mid_idx, d()-&gt;m_list_pattern_part_mid_size);</div><div class='add'>+        QString formatEnd = getLocaleData(list_pattern_part_data + d()-&gt;m_list_pattern_part_end_idx, d()-&gt;m_list_pattern_part_end_size);</div><div class='add'>+        QString result = formatStart.arg(list.at(0), list.at(1));</div><div class='add'>+        for (int i = 2; i &lt; size - 1; ++i)</div><div class='add'>+            result = formatMid.arg(result, list.at(i));</div><div class='add'>+        result = formatEnd.arg(result, list.at(size - 1));</div><div class='add'>+        return result;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='ctx'>     \nonreentrant</div><div class='ctx'> </div><div class='ctx'>     Sets the global default locale to \a locale. These</div><div class='hunk'>@@ -2346,12 +889,16 @@ void QLocale::setDefault(const QLocale &amp;locale)</div><div class='ctx'> {</div><div class='ctx'>     default_lp = locale.d();</div><div class='ctx'>     default_number_options = locale.numberOptions();</div><div class='add'>+</div><div class='add'>+#ifdef QT_USE_ICU</div><div class='add'>+    qt_initIcu(locale.bcp47Name());</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     Returns the language of this locale.</div><div class='ctx'> </div><div class='del'>-    \sa country(), languageToString(), name()</div><div class='add'>+    \sa script(), country(), languageToString(), bcp47Name()</div><div class='ctx'> */</div><div class='ctx'> QLocale::Language QLocale::language() const</div><div class='ctx'> {</div><div class='hunk'>@@ -2359,9 +906,21 @@ QLocale::Language QLocale::language() const</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns the script of this locale.</div><div class='add'>+</div><div class='add'>+    \sa language(), country(), languageToString(), scriptToString(), bcp47Name()</div><div class='add'>+*/</div><div class='add'>+QLocale::Script QLocale::script() const</div><div class='add'>+{</div><div class='add'>+    return Script(d()-&gt;m_script_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='ctx'>     Returns the country of this locale.</div><div class='ctx'> </div><div class='del'>-    \sa language(), countryToString(), name()</div><div class='add'>+    \sa language(), script(), countryToString(), bcp47Name()</div><div class='ctx'> */</div><div class='ctx'> QLocale::Country QLocale::country() const</div><div class='ctx'> {</div><div class='hunk'>@@ -2372,34 +931,70 @@ QLocale::Country QLocale::country() const</div><div class='ctx'>     Returns the language and country of this locale as a</div><div class='ctx'>     string of the form "language_country", where</div><div class='ctx'>     language is a lowercase, two-letter ISO 639 language code,</div><div class='del'>-    and country is an uppercase, two-letter ISO 3166 country code.</div><div class='add'>+    and country is an uppercase, two- or three-letter ISO 3166 country code.</div><div class='add'>+</div><div class='add'>+    Note that even if QLocale object was constructed with an explicit script,</div><div class='add'>+    name() will not contain it for compatibility reasons. Use bcp47Name() instead</div><div class='add'>+    if you need a full locale name.</div><div class='ctx'> </div><div class='del'>-    \sa language(), country()</div><div class='add'>+    \sa QLocale(const QString &amp;), language(), script(), country(), bcp47Name()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> QString QLocale::name() const</div><div class='ctx'> {</div><div class='del'>-    Language l = language();</div><div class='add'>+    const QLocalePrivate *dd = d();</div><div class='ctx'> </div><div class='del'>-    QString result = languageToCode(l);</div><div class='add'>+    if (dd-&gt;m_language_id == QLocale::AnyLanguage)</div><div class='add'>+        return QString();</div><div class='add'>+    if (dd-&gt;m_language_id == QLocale::C)</div><div class='add'>+        return QLatin1String("C");</div><div class='ctx'> </div><div class='del'>-    if (l == C)</div><div class='del'>-        return result;</div><div class='add'>+    const unsigned char *c = language_code_list + 3*(uint(dd-&gt;m_language_id));</div><div class='ctx'> </div><div class='del'>-    Country c = country();</div><div class='del'>-    if (c == AnyCountry)</div><div class='del'>-        return result;</div><div class='add'>+    QString result(7, Qt::Uninitialized);</div><div class='add'>+    ushort *data = (ushort *)result.unicode();</div><div class='add'>+    const ushort *begin = data;</div><div class='ctx'> </div><div class='del'>-    result.append(QLatin1Char('_'));</div><div class='del'>-    result.append(countryToCode(c));</div><div class='add'>+    *data++ = ushort(c[0]);</div><div class='add'>+    *data++ = ushort(c[1]);</div><div class='add'>+    if (c[2] != 0)</div><div class='add'>+        *data++ = ushort(c[2]);</div><div class='add'>+    if (dd-&gt;m_country_id != AnyCountry) {</div><div class='add'>+        *data++ = '_';</div><div class='add'>+        const unsigned char *c = country_code_list + 3*(uint(dd-&gt;m_country_id));</div><div class='add'>+        *data++ = ushort(c[0]);</div><div class='add'>+        *data++ = ushort(c[1]);</div><div class='add'>+        if (c[2] != 0)</div><div class='add'>+            *data++ = ushort(c[2]);</div><div class='add'>+    }</div><div class='add'>+    result.resize(data - begin);</div><div class='ctx'> </div><div class='ctx'>     return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns the dash-separated language, script and country (and possibly other BCP47 fields)</div><div class='add'>+    of this locale as a string.</div><div class='add'>+</div><div class='add'>+    Unlike the uiLanguages() the returned value of the bcp47Name() represents</div><div class='add'>+    the locale name of the QLocale data but not the language the user-interface</div><div class='add'>+    should be in.</div><div class='add'>+</div><div class='add'>+    This function tries to conform the locale name to BCP47.</div><div class='add'>+</div><div class='add'>+    \sa language(), country(), script(), uiLanguages()</div><div class='add'>+*/</div><div class='add'>+QString QLocale::bcp47Name() const</div><div class='add'>+{</div><div class='add'>+    return d()-&gt;bcp47Name();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='ctx'>     Returns a QString containing the name of \a language.</div><div class='ctx'> </div><div class='del'>-    \sa countryToString(), name()</div><div class='add'>+    \sa countryToString(), scriptToString(), bcp47Name()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> QString QLocale::languageToString(Language language)</div><div class='hunk'>@@ -2412,7 +1007,7 @@ QString QLocale::languageToString(Language language)</div><div class='ctx'> /*!</div><div class='ctx'>     Returns a QString containing the name of \a country.</div><div class='ctx'> </div><div class='del'>-    \sa country(), name()</div><div class='add'>+    \sa languageToString(), scriptToString(), country(), bcp47Name()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> QString QLocale::countryToString(Country country)</div><div class='hunk'>@@ -2423,6 +1018,20 @@ QString QLocale::countryToString(Country country)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns a QString containing the name of \a script.</div><div class='add'>+</div><div class='add'>+    \sa languageToString(), countryToString(), script(), bcp47Name()</div><div class='add'>+*/</div><div class='add'>+QString QLocale::scriptToString(QLocale::Script script)</div><div class='add'>+{</div><div class='add'>+    if (uint(script) &gt; uint(QLocale::LastScript))</div><div class='add'>+        return QLatin1String("Unknown");</div><div class='add'>+    return QLatin1String(script_name_list + script_name_index[script]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='ctx'>     Returns the short int represented by the localized string \a s,</div><div class='ctx'>     using base \a base. If \a base is 0 the base is determined</div><div class='ctx'>     automatically using the following rules: If the string begins with</div><div class='hunk'>@@ -2721,7 +1330,7 @@ static bool timeFormatContainsAP(const QString &amp;format)</div><div class='ctx'>     int i = 0;</div><div class='ctx'>     while (i &lt; format.size()) {</div><div class='ctx'>         if (format.at(i).unicode() == '\'') {</div><div class='del'>-            readEscapedFormatString(format, &amp;i);</div><div class='add'>+            qt_readEscapedFormatString(format, &amp;i);</div><div class='ctx'>             continue;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='hunk'>@@ -3229,12 +1838,49 @@ QLocale QLocale::system()</div><div class='ctx'>     return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns a list of valid locale objects that match the given \a language, \a</div><div class='add'>+    script and \a country.</div><div class='add'>+</div><div class='add'>+    Getting a list of all locales:</div><div class='add'>+    QList&lt;QLocale&gt; allLocales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript, QLocale::AnyCountry);</div><div class='add'>+*/</div><div class='add'>+QList&lt;QLocale&gt; QLocale::matchingLocales(QLocale::Language language,</div><div class='add'>+                                        QLocale::Script script,</div><div class='add'>+                                        QLocale::Country country)</div><div class='add'>+{</div><div class='add'>+    if (uint(language) &gt; QLocale::LastLanguage || uint(script) &gt; QLocale::LastScript ||</div><div class='add'>+            uint(country) &gt; QLocale::LastCountry)</div><div class='add'>+        return QList&lt;QLocale&gt;();</div><div class='add'>+</div><div class='add'>+    QList&lt;QLocale&gt; result;</div><div class='add'>+    const QLocalePrivate *d = locale_data;</div><div class='add'>+    if (language == QLocale::AnyLanguage &amp;&amp; script == QLocale::AnyScript &amp;&amp; country == QLocale::AnyCountry)</div><div class='add'>+        result.reserve(locale_data_size);</div><div class='add'>+    if (language != QLocale::C)</div><div class='add'>+        d += locale_index[language];</div><div class='add'>+    while ( (d != locale_data + locale_data_size)</div><div class='add'>+            &amp;&amp; (language == QLocale::AnyLanguage || d-&gt;m_language_id == uint(language))) {</div><div class='add'>+        QLocale locale(QLocale::C);</div><div class='add'>+        locale.p.index = localePrivateIndex(d);</div><div class='add'>+        result.append(locale);</div><div class='add'>+        ++d;</div><div class='add'>+    }</div><div class='add'>+    return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*!</div><div class='add'>+    \obsolete</div><div class='ctx'>     \since 4.3</div><div class='ctx'> </div><div class='ctx'>     Returns the list of countries that have entires for \a language in Qt's locale</div><div class='ctx'>     database. If the result is an empty list, then \a language is not represented in</div><div class='ctx'>     Qt's locale database.</div><div class='add'>+</div><div class='add'>+    \sa matchingLocales()</div><div class='ctx'> */</div><div class='ctx'> QList&lt;QLocale::Country&gt; QLocale::countriesForLanguage(Language language)</div><div class='ctx'> {</div><div class='hunk'>@@ -3449,31 +2095,74 @@ QString QLocale::standaloneDayName(int day, FormatType type) const</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns the first day of the week according to the current locale.</div><div class='add'>+*/</div><div class='add'>+Qt::DayOfWeek QLocale::firstDayOfWeek() const</div><div class='add'>+{</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+    if (d() == systemPrivate()) {</div><div class='add'>+        QVariant res = systemLocale()-&gt;query(QSystemLocale::FirstDayOfWeek, QVariant());</div><div class='add'>+        if (!res.isNull())</div><div class='add'>+            return static_cast&lt;Qt::DayOfWeek&gt;(res.toUInt());</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    return static_cast&lt;Qt::DayOfWeek&gt;(d()-&gt;m_first_day_of_week);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QLocale::MeasurementSystem QLocalePrivate::measurementSystem() const</div><div class='add'>+{</div><div class='add'>+    for (int i = 0; i &lt; ImperialMeasurementSystemsCount; ++i) {</div><div class='add'>+        if (ImperialMeasurementSystems[i].languageId == m_language_id</div><div class='add'>+            &amp;&amp; ImperialMeasurementSystems[i].countryId == m_country_id) {</div><div class='add'>+            return QLocale::ImperialSystem;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    return QLocale::MetricSystem;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns a list of days that are considered weekdays according to the current locale.</div><div class='add'>+*/</div><div class='add'>+QList&lt;Qt::DayOfWeek&gt; QLocale::weekdays() const</div><div class='add'>+{</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+    if (d() == systemPrivate()) {</div><div class='add'>+        QVariant res = systemLocale()-&gt;query(QSystemLocale::Weekdays, QVariant());</div><div class='add'>+        if (!res.isNull())</div><div class='add'>+            return static_cast&lt;QList&lt;Qt::DayOfWeek&gt; &gt;(res.value&lt;QList&lt;Qt::DayOfWeek&gt; &gt;());</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    QList&lt;Qt::DayOfWeek&gt; weekdays;</div><div class='add'>+    quint16 weekendStart = d()-&gt;m_weekend_start;</div><div class='add'>+    quint16 weekendEnd = d()-&gt;m_weekend_end;</div><div class='add'>+    for (int day = Qt::Monday; day &lt;= Qt::Sunday; day++) {</div><div class='add'>+        if ((weekendEnd &gt;= weekendStart &amp;&amp; (day &lt; weekendStart || day &gt; weekendEnd)) ||</div><div class='add'>+            (weekendEnd &lt; weekendStart &amp;&amp; (day &gt; weekendEnd &amp;&amp; day &lt; weekendStart)))</div><div class='add'>+                weekdays &lt;&lt; static_cast&lt;Qt::DayOfWeek&gt;(day);</div><div class='add'>+    }</div><div class='add'>+    return weekdays;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='ctx'>     \since 4.4</div><div class='ctx'> </div><div class='ctx'>     Returns the measurement system for the locale.</div><div class='ctx'> */</div><div class='ctx'> QLocale::MeasurementSystem QLocale::measurementSystem() const</div><div class='ctx'> {</div><div class='del'>-    MeasurementSystem meas = MetricSystem;</div><div class='del'>-    bool found = false;</div><div class='del'>-</div><div class='ctx'> #ifndef QT_NO_SYSTEMLOCALE</div><div class='ctx'>     if (d() == systemPrivate()) {</div><div class='ctx'>         QVariant res = systemLocale()-&gt;query(QSystemLocale::MeasurementSystem, QVariant());</div><div class='del'>-        if (!res.isNull()) {</div><div class='del'>-            meas = MeasurementSystem(res.toInt());</div><div class='del'>-            found = true;</div><div class='del'>-        }</div><div class='add'>+        if (!res.isNull())</div><div class='add'>+            return MeasurementSystem(res.toInt());</div><div class='ctx'>     }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-    if (!found) {</div><div class='del'>-        meas = d()-&gt;measurementSystem();</div><div class='del'>-        found = true;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return meas;</div><div class='add'>+    return d()-&gt;measurementSystem();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -3536,193 +2225,6 @@ QString QLocale::pmText() const</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/*!</div><div class='del'>-\fn QString QLocale::toString(short i) const</div><div class='del'>-</div><div class='del'>-\overload</div><div class='del'>-</div><div class='del'>-\sa toShort()</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-\fn QString QLocale::toString(ushort i) const</div><div class='del'>-</div><div class='del'>-\overload</div><div class='del'>-</div><div class='del'>-\sa toUShort()</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-\fn QString QLocale::toString(int i) const</div><div class='del'>-</div><div class='del'>-\overload</div><div class='del'>-</div><div class='del'>-\sa toInt()</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-\fn QString QLocale::toString(uint i) const</div><div class='del'>-</div><div class='del'>-\overload</div><div class='del'>-</div><div class='del'>-\sa toUInt()</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-\fn QString QLocale::toString(long i) const</div><div class='del'>-</div><div class='del'>-\overload</div><div class='del'>-</div><div class='del'>-\sa  toLong()</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-\fn QString QLocale::toString(ulong i) const</div><div class='del'>-</div><div class='del'>-\overload</div><div class='del'>-</div><div class='del'>-\sa toULong()</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/*!</div><div class='del'>-\fn QString QLocale::toString(float i, char f = 'g', int prec = 6) const</div><div class='del'>-</div><div class='del'>-\overload</div><div class='del'>-</div><div class='del'>-\a f and \a prec have the same meaning as in QString::number(double, char, int).</div><div class='del'>-</div><div class='del'>-\sa toDouble()</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static QString qulltoa(qulonglong l, int base, const QLocalePrivate &amp;locale)</div><div class='del'>-{</div><div class='del'>-    ushort buff[65]; // length of MAX_ULLONG in base 2</div><div class='del'>-    ushort *p = buff + 65;</div><div class='del'>-    const QChar _zero = locale.zero();</div><div class='del'>-</div><div class='del'>-    if (base != 10 || _zero.unicode() == '0') {</div><div class='del'>-        while (l != 0) {</div><div class='del'>-            int c = l % base;</div><div class='del'>-</div><div class='del'>-            --p;</div><div class='del'>-</div><div class='del'>-            if (c &lt; 10)</div><div class='del'>-                *p = '0' + c;</div><div class='del'>-            else</div><div class='del'>-                *p = c - 10 + 'a';</div><div class='del'>-</div><div class='del'>-            l /= base;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    else {</div><div class='del'>-        while (l != 0) {</div><div class='del'>-            int c = l % base;</div><div class='del'>-</div><div class='del'>-            *(--p) = _zero.unicode() + c;</div><div class='del'>-</div><div class='del'>-            l /= base;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return QString(reinterpret_cast&lt;QChar *&gt;(p), 65 - (p - buff));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString qlltoa(qlonglong l, int base, const QLocalePrivate &amp;locale)</div><div class='del'>-{</div><div class='del'>-    return qulltoa(l &lt; 0 ? -l : l, base, locale);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum PrecisionMode {</div><div class='del'>-    PMDecimalDigits =             0x01,</div><div class='del'>-    PMSignificantDigits =   0x02,</div><div class='del'>-    PMChopTrailingZeros =   0x03</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static QString &amp;decimalForm(QString &amp;digits, int decpt, uint precision,</div><div class='del'>-                            PrecisionMode pm,</div><div class='del'>-                            bool always_show_decpt,</div><div class='del'>-                            bool thousands_group,</div><div class='del'>-                            const QLocalePrivate &amp;locale)</div><div class='del'>-{</div><div class='del'>-    if (decpt &lt; 0) {</div><div class='del'>-        for (int i = 0; i &lt; -decpt; ++i)</div><div class='del'>-            digits.prepend(locale.zero());</div><div class='del'>-        decpt = 0;</div><div class='del'>-    }</div><div class='del'>-    else if (decpt &gt; digits.length()) {</div><div class='del'>-        for (int i = digits.length(); i &lt; decpt; ++i)</div><div class='del'>-            digits.append(locale.zero());</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (pm == PMDecimalDigits) {</div><div class='del'>-        uint decimal_digits = digits.length() - decpt;</div><div class='del'>-        for (uint i = decimal_digits; i &lt; precision; ++i)</div><div class='del'>-            digits.append(locale.zero());</div><div class='del'>-    }</div><div class='del'>-    else if (pm == PMSignificantDigits) {</div><div class='del'>-        for (uint i = digits.length(); i &lt; precision; ++i)</div><div class='del'>-            digits.append(locale.zero());</div><div class='del'>-    }</div><div class='del'>-    else { // pm == PMChopTrailingZeros</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (always_show_decpt || decpt &lt; digits.length())</div><div class='del'>-        digits.insert(decpt, locale.decimal());</div><div class='del'>-</div><div class='del'>-    if (thousands_group) {</div><div class='del'>-        for (int i = decpt - 3; i &gt; 0; i -= 3)</div><div class='del'>-            digits.insert(i, locale.group());</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (decpt == 0)</div><div class='del'>-        digits.prepend(locale.zero());</div><div class='del'>-</div><div class='del'>-    return digits;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static QString &amp;exponentForm(QString &amp;digits, int decpt, uint precision,</div><div class='del'>-                                PrecisionMode pm,</div><div class='del'>-                                bool always_show_decpt,</div><div class='del'>-                                const QLocalePrivate &amp;locale)</div><div class='del'>-{</div><div class='del'>-    int exp = decpt - 1;</div><div class='del'>-</div><div class='del'>-    if (pm == PMDecimalDigits) {</div><div class='del'>-        for (uint i = digits.length(); i &lt; precision + 1; ++i)</div><div class='del'>-            digits.append(locale.zero());</div><div class='del'>-    }</div><div class='del'>-    else if (pm == PMSignificantDigits) {</div><div class='del'>-        for (uint i = digits.length(); i &lt; precision; ++i)</div><div class='del'>-            digits.append(locale.zero());</div><div class='del'>-    }</div><div class='del'>-    else { // pm == PMChopTrailingZeros</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (always_show_decpt || digits.length() &gt; 1)</div><div class='del'>-        digits.insert(1, locale.decimal());</div><div class='del'>-</div><div class='del'>-    digits.append(locale.exponential());</div><div class='del'>-    digits.append(locale.longLongToString(exp, 2, 10,</div><div class='del'>-                    -1, QLocalePrivate::AlwaysShowSign));</div><div class='del'>-</div><div class='del'>-    return digits;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool isZero(double d)</div><div class='del'>-{</div><div class='del'>-    uchar *ch = (uchar *)&amp;d;</div><div class='del'>-#ifdef QT_ARMFPA</div><div class='del'>-        return !(ch[3] &amp; 0x7F || ch[2] || ch[1] || ch[0] || ch[7] || ch[6] || ch[5] || ch[4]);</div><div class='del'>-#else</div><div class='del'>-    if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {</div><div class='del'>-        return !(ch[0] &amp; 0x7F || ch[1] || ch[2] || ch[3] || ch[4] || ch[5] || ch[6] || ch[7]);</div><div class='del'>-    } else {</div><div class='del'>-        return !(ch[7] &amp; 0x7F || ch[6] || ch[5] || ch[4] || ch[3] || ch[2] || ch[1] || ch[0]);</div><div class='del'>-    }</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> QString QLocalePrivate::dateTimeToString(const QString &amp;format, const QDate *date, const QTime *time,</div><div class='ctx'>                                          const QLocale *q) const</div><div class='ctx'> {</div><div class='hunk'>@@ -3752,12 +2254,12 @@ QString QLocalePrivate::dateTimeToString(const QString &amp;format, const QDate *dat</div><div class='ctx'>     int i = 0;</div><div class='ctx'>     while (i &lt; format.size()) {</div><div class='ctx'>         if (format.at(i).unicode() == '\'') {</div><div class='del'>-            result.append(readEscapedFormatString(format, &amp;i));</div><div class='add'>+            result.append(qt_readEscapedFormatString(format, &amp;i));</div><div class='ctx'>             continue;</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         const QChar c = format.at(i);</div><div class='del'>-        int repeat = repeatCount(format, i);</div><div class='add'>+        int repeat = qt_repeatCount(format, i);</div><div class='ctx'>         bool used = false;</div><div class='ctx'>         if (date) {</div><div class='ctx'>             switch (c.unicode()) {</div><div class='hunk'>@@ -3888,7 +2390,7 @@ QString QLocalePrivate::dateTimeToString(const QString &amp;format, const QDate *dat</div><div class='ctx'>                 } else {</div><div class='ctx'>                     repeat = 1;</div><div class='ctx'>                 }</div><div class='del'>-                result.append(am_pm == AM ? QLatin1String("am") : QLatin1String("pm"));</div><div class='add'>+                result.append(am_pm == AM ? q-&gt;amText().toLower() : q-&gt;pmText().toLower());</div><div class='ctx'>                 break;</div><div class='ctx'> </div><div class='ctx'>             case 'A':</div><div class='hunk'>@@ -3898,7 +2400,7 @@ QString QLocalePrivate::dateTimeToString(const QString &amp;format, const QDate *dat</div><div class='ctx'>                 } else {</div><div class='ctx'>                     repeat = 1;</div><div class='ctx'>                 }</div><div class='del'>-                result.append(am_pm == AM ? QLatin1String("AM") : QLatin1String("PM"));</div><div class='add'>+                result.append(am_pm == AM ? q-&gt;amText().toUpper() : q-&gt;pmText().toUpper());</div><div class='ctx'>                 break;</div><div class='ctx'> </div><div class='ctx'>             case 'z':</div><div class='hunk'>@@ -3942,6 +2444,19 @@ QString QLocalePrivate::doubleToString(double d,</div><div class='ctx'>                                        int width,</div><div class='ctx'>                                        unsigned flags) const</div><div class='ctx'> {</div><div class='add'>+    return QLocalePrivate::doubleToString(zero(), plus(), minus(), exponential(),</div><div class='add'>+                                          group(), decimal(),</div><div class='add'>+                                          d, precision, form, width, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QLocalePrivate::doubleToString(const QChar _zero, const QChar plus, const QChar minus,</div><div class='add'>+                                       const QChar exponential, const QChar group, const QChar decimal,</div><div class='add'>+                                       double d,</div><div class='add'>+                                       int precision,</div><div class='add'>+                                       DoubleForm form,</div><div class='add'>+                                       int width,</div><div class='add'>+                                       unsigned flags)</div><div class='add'>+{</div><div class='ctx'>     if (precision == -1)</div><div class='ctx'>         precision = 6;</div><div class='ctx'>     if (width == -1)</div><div class='hunk'>@@ -4019,8 +2534,6 @@ QString QLocalePrivate::doubleToString(double d,</div><div class='ctx'>             free(buff);</div><div class='ctx'> #endif // QT_QLOCALE_USES_FCVT</div><div class='ctx'> </div><div class='del'>-        const QChar _zero = zero();</div><div class='del'>-</div><div class='ctx'>         if (_zero.unicode() != '0') {</div><div class='ctx'>             ushort z = _zero.unicode() - '0';</div><div class='ctx'>             for (int i = 0; i &lt; digits.length(); ++i)</div><div class='hunk'>@@ -4030,14 +2543,15 @@ QString QLocalePrivate::doubleToString(double d,</div><div class='ctx'>         bool always_show_decpt = (flags &amp; Alternate || flags &amp; ForcePoint);</div><div class='ctx'>         switch (form) {</div><div class='ctx'>             case DFExponent: {</div><div class='del'>-                num_str = exponentForm(digits, decpt, precision, PMDecimalDigits,</div><div class='del'>-                                                    always_show_decpt, *this);</div><div class='add'>+                num_str = exponentForm(_zero, decimal, exponential, group, plus, minus,</div><div class='add'>+                                       digits, decpt, precision, PMDecimalDigits,</div><div class='add'>+                                       always_show_decpt);</div><div class='ctx'>                 break;</div><div class='ctx'>             }</div><div class='ctx'>             case DFDecimal: {</div><div class='del'>-                num_str = decimalForm(digits, decpt, precision, PMDecimalDigits,</div><div class='del'>-                                        always_show_decpt, flags &amp; ThousandsGroup,</div><div class='del'>-                                        *this);</div><div class='add'>+                num_str = decimalForm(_zero, decimal, group,</div><div class='add'>+                                      digits, decpt, precision, PMDecimalDigits,</div><div class='add'>+                                      always_show_decpt, flags &amp; ThousandsGroup);</div><div class='ctx'>                 break;</div><div class='ctx'>             }</div><div class='ctx'>             case DFSignificantDigits: {</div><div class='hunk'>@@ -4045,12 +2559,13 @@ QString QLocalePrivate::doubleToString(double d,</div><div class='ctx'>                             PMSignificantDigits : PMChopTrailingZeros;</div><div class='ctx'> </div><div class='ctx'>                 if (decpt != digits.length() &amp;&amp; (decpt &lt;= -4 || decpt &gt; precision))</div><div class='del'>-                    num_str = exponentForm(digits, decpt, precision, mode,</div><div class='del'>-                                                    always_show_decpt, *this);</div><div class='add'>+                    num_str = exponentForm(_zero, decimal, exponential, group, plus, minus,</div><div class='add'>+                                           digits, decpt, precision, mode,</div><div class='add'>+                                           always_show_decpt);</div><div class='ctx'>                 else</div><div class='del'>-                    num_str = decimalForm(digits, decpt, precision, mode,</div><div class='del'>-                                            always_show_decpt, flags &amp; ThousandsGroup,</div><div class='del'>-                                            *this);</div><div class='add'>+                    num_str = decimalForm(_zero, decimal, group,</div><div class='add'>+                                          digits, decpt, precision, mode,</div><div class='add'>+                                          always_show_decpt, flags &amp; ThousandsGroup);</div><div class='ctx'>                 break;</div><div class='ctx'>             }</div><div class='ctx'>         }</div><div class='hunk'>@@ -4071,14 +2586,14 @@ QString QLocalePrivate::doubleToString(double d,</div><div class='ctx'>             --num_pad_chars;</div><div class='ctx'> </div><div class='ctx'>         for (int i = 0; i &lt; num_pad_chars; ++i)</div><div class='del'>-            num_str.prepend(zero());</div><div class='add'>+            num_str.prepend(_zero);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     // add sign</div><div class='ctx'>     if (negative)</div><div class='del'>-        num_str.prepend(minus());</div><div class='add'>+        num_str.prepend(minus);</div><div class='ctx'>     else if (flags &amp; QLocalePrivate::AlwaysShowSign)</div><div class='del'>-        num_str.prepend(plus());</div><div class='add'>+        num_str.prepend(plus);</div><div class='ctx'>     else if (flags &amp; QLocalePrivate::BlankBeforePositive)</div><div class='ctx'>         num_str.prepend(QLatin1Char(' '));</div><div class='ctx'> </div><div class='hunk'>@@ -4092,6 +2607,16 @@ QString QLocalePrivate::longLongToString(qlonglong l, int precision,</div><div class='ctx'>                                             int base, int width,</div><div class='ctx'>                                             unsigned flags) const</div><div class='ctx'> {</div><div class='add'>+    return QLocalePrivate::longLongToString(zero(), group(), plus(), minus(),</div><div class='add'>+                                            l, precision, base, width, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QLocalePrivate::longLongToString(const QChar zero, const QChar group,</div><div class='add'>+                                         const QChar plus, const QChar minus,</div><div class='add'>+                                         qlonglong l, int precision,</div><div class='add'>+                                         int base, int width,</div><div class='add'>+                                         unsigned flags)</div><div class='add'>+{</div><div class='ctx'>     bool precision_not_specified = false;</div><div class='ctx'>     if (precision == -1) {</div><div class='ctx'>         precision_not_specified = true;</div><div class='hunk'>@@ -4108,20 +2633,20 @@ QString QLocalePrivate::longLongToString(qlonglong l, int precision,</div><div class='ctx'> </div><div class='ctx'>     QString num_str;</div><div class='ctx'>     if (base == 10)</div><div class='del'>-        num_str = qlltoa(l, base, *this);</div><div class='add'>+        num_str = qlltoa(l, base, zero);</div><div class='ctx'>     else</div><div class='del'>-        num_str = qulltoa(l, base, *this);</div><div class='add'>+        num_str = qulltoa(l, base, zero);</div><div class='ctx'> </div><div class='ctx'>     uint cnt_thousand_sep = 0;</div><div class='ctx'>     if (flags &amp; ThousandsGroup &amp;&amp; base == 10) {</div><div class='ctx'>         for (int i = num_str.length() - 3; i &gt; 0; i -= 3) {</div><div class='del'>-            num_str.insert(i, group());</div><div class='add'>+            num_str.insert(i, group);</div><div class='ctx'>             ++cnt_thousand_sep;</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     for (int i = num_str.length()/* - cnt_thousand_sep*/; i &lt; precision; ++i)</div><div class='del'>-        num_str.prepend(base == 10 ? zero() : QChar::fromLatin1('0'));</div><div class='add'>+        num_str.prepend(base == 10 ? zero : QChar::fromLatin1('0'));</div><div class='ctx'> </div><div class='ctx'>     if ((flags &amp; Alternate || flags &amp; ShowBase)</div><div class='ctx'>             &amp;&amp; base == 8</div><div class='hunk'>@@ -4151,7 +2676,7 @@ QString QLocalePrivate::longLongToString(qlonglong l, int precision,</div><div class='ctx'>             num_pad_chars -= 2;</div><div class='ctx'> </div><div class='ctx'>         for (int i = 0; i &lt; num_pad_chars; ++i)</div><div class='del'>-            num_str.prepend(base == 10 ? zero() : QChar::fromLatin1('0'));</div><div class='add'>+            num_str.prepend(base == 10 ? zero : QChar::fromLatin1('0'));</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if (flags &amp; CapitalEorX)</div><div class='hunk'>@@ -4164,9 +2689,9 @@ QString QLocalePrivate::longLongToString(qlonglong l, int precision,</div><div class='ctx'> </div><div class='ctx'>     // add sign</div><div class='ctx'>     if (negative)</div><div class='del'>-        num_str.prepend(minus());</div><div class='add'>+        num_str.prepend(minus);</div><div class='ctx'>     else if (flags &amp; AlwaysShowSign)</div><div class='del'>-        num_str.prepend(plus());</div><div class='add'>+        num_str.prepend(plus);</div><div class='ctx'>     else if (flags &amp; BlankBeforePositive)</div><div class='ctx'>         num_str.prepend(QLatin1Char(' '));</div><div class='ctx'> </div><div class='hunk'>@@ -4177,24 +2702,34 @@ QString QLocalePrivate::unsLongLongToString(qulonglong l, int precision,</div><div class='ctx'>                                             int base, int width,</div><div class='ctx'>                                             unsigned flags) const</div><div class='ctx'> {</div><div class='add'>+    return QLocalePrivate::unsLongLongToString(zero(), group(), plus(),</div><div class='add'>+                                               l, precision, base, width, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QLocalePrivate::unsLongLongToString(const QChar zero, const QChar group,</div><div class='add'>+                                            const QChar plus,</div><div class='add'>+                                            qulonglong l, int precision,</div><div class='add'>+                                            int base, int width,</div><div class='add'>+                                            unsigned flags)</div><div class='add'>+{</div><div class='ctx'>     bool precision_not_specified = false;</div><div class='ctx'>     if (precision == -1) {</div><div class='ctx'>         precision_not_specified = true;</div><div class='ctx'>         precision = 1;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='del'>-    QString num_str = qulltoa(l, base, *this);</div><div class='add'>+    QString num_str = qulltoa(l, base, zero);</div><div class='ctx'> </div><div class='ctx'>     uint cnt_thousand_sep = 0;</div><div class='ctx'>     if (flags &amp; ThousandsGroup &amp;&amp; base == 10) {</div><div class='ctx'>         for (int i = num_str.length() - 3; i &gt; 0; i -=3) {</div><div class='del'>-            num_str.insert(i, group());</div><div class='add'>+            num_str.insert(i, group);</div><div class='ctx'>             ++cnt_thousand_sep;</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     for (int i = num_str.length()/* - cnt_thousand_sep*/; i &lt; precision; ++i)</div><div class='del'>-        num_str.prepend(base == 10 ? zero() : QChar::fromLatin1('0'));</div><div class='add'>+        num_str.prepend(base == 10 ? zero : QChar::fromLatin1('0'));</div><div class='ctx'> </div><div class='ctx'>     if ((flags &amp; Alternate || flags &amp; ShowBase)</div><div class='ctx'>             &amp;&amp; base == 8</div><div class='hunk'>@@ -4218,7 +2753,7 @@ QString QLocalePrivate::unsLongLongToString(qulonglong l, int precision,</div><div class='ctx'>             num_pad_chars -= 2;</div><div class='ctx'> </div><div class='ctx'>         for (int i = 0; i &lt; num_pad_chars; ++i)</div><div class='del'>-            num_str.prepend(base == 10 ? zero() : QChar::fromLatin1('0'));</div><div class='add'>+            num_str.prepend(base == 10 ? zero : QChar::fromLatin1('0'));</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     if (flags &amp; CapitalEorX)</div><div class='hunk'>@@ -4231,87 +2766,13 @@ QString QLocalePrivate::unsLongLongToString(qulonglong l, int precision,</div><div class='ctx'> </div><div class='ctx'>     // add sign</div><div class='ctx'>     if (flags &amp; AlwaysShowSign)</div><div class='del'>-        num_str.prepend(plus());</div><div class='add'>+        num_str.prepend(plus);</div><div class='ctx'>     else if (flags &amp; BlankBeforePositive)</div><div class='ctx'>         num_str.prepend(QLatin1Char(' '));</div><div class='ctx'> </div><div class='ctx'>     return num_str;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// Removes thousand-group separators in "C" locale.</div><div class='del'>-static bool removeGroupSeparators(QLocalePrivate::CharBuff *num)</div><div class='del'>-{</div><div class='del'>-    int group_cnt = 0; // counts number of group chars</div><div class='del'>-    int decpt_idx = -1;</div><div class='del'>-</div><div class='del'>-    char *data = num-&gt;data();</div><div class='del'>-    int l = qstrlen(data);</div><div class='del'>-</div><div class='del'>-    // Find the decimal point and check if there are any group chars</div><div class='del'>-    int i = 0;</div><div class='del'>-    for (; i &lt; l; ++i) {</div><div class='del'>-        char c = data[i];</div><div class='del'>-</div><div class='del'>-        if (c == ',') {</div><div class='del'>-            if (i == 0 || data[i - 1] &lt; '0' || data[i - 1] &gt; '9')</div><div class='del'>-                return false;</div><div class='del'>-            if (i == l - 1 || data[i + 1] &lt; '0' || data[i + 1] &gt; '9')</div><div class='del'>-                return false;</div><div class='del'>-            ++group_cnt;</div><div class='del'>-        }</div><div class='del'>-        else if (c == '.') {</div><div class='del'>-            // Fail if more than one decimal points</div><div class='del'>-            if (decpt_idx != -1)</div><div class='del'>-                return false;</div><div class='del'>-            decpt_idx = i;</div><div class='del'>-        } else if (c == 'e' || c == 'E') {</div><div class='del'>-            // an 'e' or 'E' - if we have not encountered a decimal</div><div class='del'>-            // point, this is where it "is".</div><div class='del'>-            if (decpt_idx == -1)</div><div class='del'>-                decpt_idx = i;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    // If no group chars, we're done</div><div class='del'>-    if (group_cnt == 0)</div><div class='del'>-        return true;</div><div class='del'>-</div><div class='del'>-    // No decimal point means that it "is" at the end of the string</div><div class='del'>-    if (decpt_idx == -1)</div><div class='del'>-        decpt_idx = l;</div><div class='del'>-</div><div class='del'>-    i = 0;</div><div class='del'>-    while (i &lt; l &amp;&amp; group_cnt &gt; 0) {</div><div class='del'>-        char c = data[i];</div><div class='del'>-</div><div class='del'>-        if (c == ',') {</div><div class='del'>-            // Don't allow group chars after the decimal point</div><div class='del'>-            if (i &gt; decpt_idx)</div><div class='del'>-                return false;</div><div class='del'>-</div><div class='del'>-            // Check that it is placed correctly relative to the decpt</div><div class='del'>-            if ((decpt_idx - i) % 4 != 0)</div><div class='del'>-                return false;</div><div class='del'>-</div><div class='del'>-            // Remove it</div><div class='del'>-            memmove(data + i, data + i + 1, l - i - 1);</div><div class='del'>-            data[--l] = '\0';</div><div class='del'>-</div><div class='del'>-            --group_cnt;</div><div class='del'>-            --decpt_idx;</div><div class='del'>-        } else {</div><div class='del'>-            // Check that we are not missing a separator</div><div class='del'>-            if (i &lt; decpt_idx</div><div class='del'>-                    &amp;&amp; (decpt_idx - i) % 4 == 0</div><div class='del'>-                    &amp;&amp; !(i == 0 &amp;&amp; c == '-')) // check for negative sign at start of string</div><div class='del'>-                return false;</div><div class='del'>-            ++i;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>     Converts a number in locale to its representation in the C locale.</div><div class='ctx'>     Only has to guarantee that a string that is a correct representation of</div><div class='hunk'>@@ -4334,8 +2795,6 @@ bool QLocalePrivate::numberToCLocale(const QString &amp;num,</div><div class='ctx'>     if (idx == l)</div><div class='ctx'>         return false;</div><div class='ctx'> </div><div class='del'>-    const QChar _group = group();</div><div class='del'>-</div><div class='ctx'>     while (idx &lt; l) {</div><div class='ctx'>         const QChar &amp;in = uc[idx];</div><div class='ctx'> </div><div class='hunk'>@@ -4622,2701 +3081,212 @@ qulonglong QLocalePrivate::bytearrayToUnsLongLong(const char *num, int base, boo</div><div class='ctx'>     return l;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*-</div><div class='del'>- * Copyright (c) 1992, 1993</div><div class='del'>- *        The Regents of the University of California.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions</div><div class='del'>- * are met:</div><div class='del'>- * 1. Redistributions of source code must retain the above copyright</div><div class='del'>- *    notice, this list of conditions and the following disclaimer.</div><div class='del'>- * 2. Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *    notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *    documentation and/or other materials provided with the distribution.</div><div class='del'>- * 3. All advertising materials mentioning features or use of this software</div><div class='del'>- *    must display the following acknowledgment:</div><div class='del'>- *        This product includes software developed by the University of</div><div class='del'>- *        California, Berkeley and its contributors.</div><div class='del'>- * 4. Neither the name of the University nor the names of its contributors</div><div class='del'>- *    may be used to endorse or promote products derived from this software</div><div class='del'>- *    without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND</div><div class='del'>- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE</div><div class='del'>- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL</div><div class='del'>- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS</div><div class='del'>- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)</div><div class='del'>- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT</div><div class='del'>- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY</div><div class='del'>- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='del'>- * SUCH DAMAGE.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-// static char sccsid[] = "@(#)strtouq.c        8.1 (Berkeley) 6/4/93";</div><div class='del'>-//  "$FreeBSD: src/lib/libc/stdlib/strtoull.c,v 1.5.2.1 2001/03/02 09:45:20 obrien Exp $";</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert a string to an unsigned long long integer.</div><div class='del'>- *</div><div class='del'>- * Ignores `locale' stuff.  Assumes that the upper and lower case</div><div class='del'>- * alphabets and digits are each contiguous.</div><div class='del'>- */</div><div class='del'>-static qulonglong qstrtoull(const char *nptr, const char **endptr, register int base, bool *ok)</div><div class='del'>-{</div><div class='del'>-    register const char *s = nptr;</div><div class='del'>-    register qulonglong acc;</div><div class='del'>-    register unsigned char c;</div><div class='del'>-    register qulonglong qbase, cutoff;</div><div class='del'>-    register int any, cutlim;</div><div class='del'>-</div><div class='del'>-    if (ok != 0)</div><div class='del'>-        *ok = true;</div><div class='del'>-</div><div class='del'>-    /*</div><div class='del'>-     * See strtoq for comments as to the logic used.</div><div class='del'>-     */</div><div class='del'>-    s = nptr;</div><div class='del'>-    do {</div><div class='del'>-        c = *s++;</div><div class='del'>-    } while (isspace(c));</div><div class='del'>-    if (c == '-') {</div><div class='del'>-        if (ok != 0)</div><div class='del'>-            *ok = false;</div><div class='del'>-        if (endptr != 0)</div><div class='del'>-            *endptr = s - 1;</div><div class='del'>-        return 0;</div><div class='del'>-    } else {</div><div class='del'>-        if (c == '+')</div><div class='del'>-            c = *s++;</div><div class='del'>-    }</div><div class='del'>-    if ((base == 0 || base == 16) &amp;&amp;</div><div class='del'>-        c == '0' &amp;&amp; (*s == 'x' || *s == 'X')) {</div><div class='del'>-        c = s[1];</div><div class='del'>-        s += 2;</div><div class='del'>-        base = 16;</div><div class='del'>-    }</div><div class='del'>-    if (base == 0)</div><div class='del'>-        base = c == '0' ? 8 : 10;</div><div class='del'>-    qbase = unsigned(base);</div><div class='del'>-    cutoff = qulonglong(ULLONG_MAX) / qbase;</div><div class='del'>-    cutlim = qulonglong(ULLONG_MAX) % qbase;</div><div class='del'>-    for (acc = 0, any = 0;; c = *s++) {</div><div class='del'>-        if (!isascii(c))</div><div class='del'>-            break;</div><div class='del'>-        if (isdigit(c))</div><div class='del'>-            c -= '0';</div><div class='del'>-        else if (isalpha(c))</div><div class='del'>-            c -= isupper(c) ? 'A' - 10 : 'a' - 10;</div><div class='del'>-        else</div><div class='del'>-            break;</div><div class='del'>-        if (c &gt;= base)</div><div class='del'>-            break;</div><div class='del'>-        if (any &lt; 0 || acc &gt; cutoff || (acc == cutoff &amp;&amp; c &gt; cutlim))</div><div class='del'>-            any = -1;</div><div class='del'>-        else {</div><div class='del'>-            any = 1;</div><div class='del'>-            acc *= qbase;</div><div class='del'>-            acc += c;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    if (any == 0) {</div><div class='del'>-        if (ok != 0)</div><div class='del'>-            *ok = false;</div><div class='del'>-    } else if (any &lt; 0) {</div><div class='del'>-        acc = ULLONG_MAX;</div><div class='del'>-        if (ok != 0)</div><div class='del'>-            *ok = false;</div><div class='del'>-    }</div><div class='del'>-    if (endptr != 0)</div><div class='del'>-        *endptr = (any ? s - 1 : nptr);</div><div class='del'>-    return acc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-//  "$FreeBSD: src/lib/libc/stdlib/strtoll.c,v 1.5.2.1 2001/03/02 09:45:20 obrien Exp $";</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Convert a string to a long long integer.</div><div class='del'>- *</div><div class='del'>- * Ignores `locale' stuff.  Assumes that the upper and lower case</div><div class='del'>- * alphabets and digits are each contiguous.</div><div class='del'>- */</div><div class='del'>-static qlonglong qstrtoll(const char *nptr, const char **endptr, register int base, bool *ok)</div><div class='del'>-{</div><div class='del'>-    register const char *s;</div><div class='del'>-    register qulonglong acc;</div><div class='del'>-    register unsigned char c;</div><div class='del'>-    register qulonglong qbase, cutoff;</div><div class='del'>-    register int neg, any, cutlim;</div><div class='del'>-</div><div class='del'>-    /*</div><div class='del'>-     * Skip white space and pick up leading +/- sign if any.</div><div class='del'>-     * If base is 0, allow 0x for hex and 0 for octal, else</div><div class='del'>-     * assume decimal; if base is already 16, allow 0x.</div><div class='del'>-     */</div><div class='del'>-    s = nptr;</div><div class='del'>-    do {</div><div class='del'>-        c = *s++;</div><div class='del'>-    } while (isspace(c));</div><div class='del'>-    if (c == '-') {</div><div class='del'>-        neg = 1;</div><div class='del'>-        c = *s++;</div><div class='del'>-    } else {</div><div class='del'>-        neg = 0;</div><div class='del'>-        if (c == '+')</div><div class='del'>-            c = *s++;</div><div class='del'>-    }</div><div class='del'>-    if ((base == 0 || base == 16) &amp;&amp;</div><div class='del'>-        c == '0' &amp;&amp; (*s == 'x' || *s == 'X')) {</div><div class='del'>-        c = s[1];</div><div class='del'>-        s += 2;</div><div class='del'>-        base = 16;</div><div class='del'>-    }</div><div class='del'>-    if (base == 0)</div><div class='del'>-        base = c == '0' ? 8 : 10;</div><div class='del'>-</div><div class='del'>-    /*</div><div class='del'>-     * Compute the cutoff value between legal numbers and illegal</div><div class='del'>-     * numbers.  That is the largest legal value, divided by the</div><div class='del'>-     * base.  An input number that is greater than this value, if</div><div class='del'>-     * followed by a legal input character, is too big.  One that</div><div class='del'>-     * is equal to this value may be valid or not; the limit</div><div class='del'>-     * between valid and invalid numbers is then based on the last</div><div class='del'>-     * digit.  For instance, if the range for quads is</div><div class='del'>-     * [-9223372036854775808..9223372036854775807] and the input base</div><div class='del'>-     * is 10, cutoff will be set to 922337203685477580 and cutlim to</div><div class='del'>-     * either 7 (neg==0) or 8 (neg==1), meaning that if we have</div><div class='del'>-     * accumulated a value &gt; 922337203685477580, or equal but the</div><div class='del'>-     * next digit is &gt; 7 (or 8), the number is too big, and we will</div><div class='del'>-     * return a range error.</div><div class='del'>-     *</div><div class='del'>-     * Set any if any `digits' consumed; make it negative to indicate</div><div class='del'>-     * overflow.</div><div class='del'>-     */</div><div class='del'>-    qbase = unsigned(base);</div><div class='del'>-    cutoff = neg ? qulonglong(0-(LLONG_MIN + LLONG_MAX)) + LLONG_MAX : LLONG_MAX;</div><div class='del'>-    cutlim = cutoff % qbase;</div><div class='del'>-    cutoff /= qbase;</div><div class='del'>-    for (acc = 0, any = 0;; c = *s++) {</div><div class='del'>-        if (!isascii(c))</div><div class='del'>-            break;</div><div class='del'>-        if (isdigit(c))</div><div class='del'>-            c -= '0';</div><div class='del'>-        else if (isalpha(c))</div><div class='del'>-            c -= isupper(c) ? 'A' - 10 : 'a' - 10;</div><div class='del'>-        else</div><div class='del'>-            break;</div><div class='del'>-        if (c &gt;= base)</div><div class='del'>-            break;</div><div class='del'>-        if (any &lt; 0 || acc &gt; cutoff || (acc == cutoff &amp;&amp; c &gt; cutlim))</div><div class='del'>-            any = -1;</div><div class='del'>-        else {</div><div class='del'>-            any = 1;</div><div class='del'>-            acc *= qbase;</div><div class='del'>-            acc += c;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    if (any &lt; 0) {</div><div class='del'>-        acc = neg ? LLONG_MIN : LLONG_MAX;</div><div class='del'>-        if (ok != 0)</div><div class='del'>-            *ok = false;</div><div class='del'>-    } else if (neg) {</div><div class='del'>-        acc = (~acc) + 1;</div><div class='del'>-    }</div><div class='del'>-    if (endptr != 0)</div><div class='del'>-        *endptr = (any &gt;= 0 ? s - 1 : nptr);</div><div class='del'>-</div><div class='del'>-    if (ok != 0)</div><div class='del'>-        *ok = any &gt; 0;</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='ctx'> </div><div class='del'>-    return acc;</div><div class='del'>-}</div><div class='add'>+    \enum QLocale::CurrencySymbolFormat</div><div class='ctx'> </div><div class='del'>-#ifndef QT_QLOCALE_USES_FCVT</div><div class='del'>-</div><div class='del'>-/*        From: NetBSD: strtod.c,v 1.26 1998/02/03 18:44:21 perry Exp */</div><div class='del'>-/* $FreeBSD: src/lib/libc/stdlib/netbsd_strtod.c,v 1.2.2.2 2001/03/02 17:14:15 tegge Exp $        */</div><div class='del'>-</div><div class='del'>-/* Please send bug reports to</div><div class='del'>-        David M. Gay</div><div class='del'>-        AT&amp;T Bell Laboratories, Room 2C-463</div><div class='del'>-        600 Mountain Avenue</div><div class='del'>-        Murray Hill, NJ 07974-2070</div><div class='del'>-        U.S.A.</div><div class='del'>-        dmg@research.att.com or research!dmg</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* strtod for IEEE-, VAX-, and IBM-arithmetic machines.</div><div class='del'>- *</div><div class='del'>- * This strtod returns a nearest machine number to the input decimal</div><div class='del'>- * string (or sets errno to ERANGE).  With IEEE arithmetic, ties are</div><div class='del'>- * broken by the IEEE round-even rule.  Otherwise ties are broken by</div><div class='del'>- * biased rounding (add half and chop).</div><div class='del'>- *</div><div class='del'>- * Inspired loosely by William D. Clinger's paper "How to Read Floating</div><div class='del'>- * Point Numbers Accurately" [Proc. ACM SIGPLAN '90, pp. 92-101].</div><div class='del'>- *</div><div class='del'>- * Modifications:</div><div class='del'>- *</div><div class='del'>- *        1. We only require IEEE, IBM, or VAX double-precision</div><div class='del'>- *                arithmetic (not IEEE double-extended).</div><div class='del'>- *        2. We get by with floating-point arithmetic in a case that</div><div class='del'>- *                Clinger missed -- when we're computing d * 10^n</div><div class='del'>- *                for a small integer d and the integer n is not too</div><div class='del'>- *                much larger than 22 (the maximum integer k for which</div><div class='del'>- *                we can represent 10^k exactly), we may be able to</div><div class='del'>- *                compute (d*10^k) * 10^(e-k) with just one roundoff.</div><div class='del'>- *        3. Rather than a bit-at-a-time adjustment of the binary</div><div class='del'>- *                result in the hard case, we use floating-point</div><div class='del'>- *                arithmetic to determine the adjustment to within</div><div class='del'>- *                one bit; only in really hard cases do we need to</div><div class='del'>- *                compute a second residual.</div><div class='del'>- *        4. Because of 3., we don't need a large table of powers of 10</div><div class='del'>- *                for ten-to-e (just some small tables, e.g. of 10^k</div><div class='del'>- *                for 0 &lt;= k &lt;= 22).</div><div class='del'>- */</div><div class='add'>+    Specifies the format of the currency symbol.</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * #define IEEE_LITTLE_ENDIAN for IEEE-arithmetic machines where the least</div><div class='del'>- *        significant byte has the lowest address.</div><div class='del'>- * #define IEEE_BIG_ENDIAN for IEEE-arithmetic machines where the most</div><div class='del'>- *        significant byte has the lowest address.</div><div class='del'>- * #define Long int on machines with 32-bit ints and 64-bit longs.</div><div class='del'>- * #define Sudden_Underflow for IEEE-format machines without gradual</div><div class='del'>- *        underflow (i.e., that flush to zero on underflow).</div><div class='del'>- * #define IBM for IBM mainframe-style floating-point arithmetic.</div><div class='del'>- * #define VAX for VAX-style floating-point arithmetic.</div><div class='del'>- * #define Unsigned_Shifts if &gt;&gt; does treats its left operand as unsigned.</div><div class='del'>- * #define No_leftright to omit left-right logic in fast floating-point</div><div class='del'>- *        computation of dtoa.</div><div class='del'>- * #define Check_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3.</div><div class='del'>- * #define RND_PRODQUOT to use rnd_prod and rnd_quot (assembly routines</div><div class='del'>- *        that use extended-precision instructions to compute rounded</div><div class='del'>- *        products and quotients) with IBM.</div><div class='del'>- * #define ROUND_BIASED for IEEE-format with biased rounding.</div><div class='del'>- * #define Inaccurate_Divide for IEEE-format with correctly rounded</div><div class='del'>- *        products but inaccurate quotients, e.g., for Intel i860.</div><div class='del'>- * #define Just_16 to store 16 bits per 32-bit Long when doing high-precision</div><div class='del'>- *        integer arithmetic.  Whether this speeds things up or slows things</div><div class='del'>- *        down depends on the machine and the number being converted.</div><div class='del'>- * #define KR_headers for old-style C function headers.</div><div class='del'>- * #define Bad_float_h if your system lacks a float.h or if it does not</div><div class='del'>- *        define some or all of DBL_DIG, DBL_MAX_10_EXP, DBL_MAX_EXP,</div><div class='del'>- *        FLT_RADIX, FLT_ROUNDS, and DBL_MAX.</div><div class='del'>- * #define MALLOC your_malloc, where your_malloc(n) acts like malloc(n)</div><div class='del'>- *        if memory is available and otherwise does something you deem</div><div class='del'>- *        appropriate.  If MALLOC is undefined, malloc will be invoked</div><div class='del'>- *        directly -- and assumed always to succeed.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#if defined(LIBC_SCCS) &amp;&amp; !defined(lint)</div><div class='del'>-__RCSID("$NetBSD: strtod.c,v 1.26 1998/02/03 18:44:21 perry Exp $");</div><div class='del'>-#endif /* LIBC_SCCS and not lint */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-#if defined(__m68k__)    || defined(__sparc__) || defined(__i386__) || \</div><div class='del'>-     defined(__mips__)    || defined(__ns32k__) || defined(__alpha__) || \</div><div class='del'>-     defined(__powerpc__) || defined(Q_OS_WIN) || defined(Q_OS_DARWIN) || defined(Q_OS_MAC) || \</div><div class='del'>-     defined(mips) || defined(Q_OS_AIX) || defined(Q_OS_SOLARIS)</div><div class='del'>-#           define IEEE_BIG_OR_LITTLE_ENDIAN 1</div><div class='del'>-#endif</div><div class='add'>+    \value CurrencyIsoCode a ISO-4217 code of the currency.</div><div class='add'>+    \value CurrencySymbol a currency symbol.</div><div class='add'>+    \value CurrencyDisplayName a user readable name of the currency.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-// *All* of our architectures have IEEE arithmetic, don't they?</div><div class='del'>-#define IEEE_BIG_OR_LITTLE_ENDIAN 1</div><div class='del'>-</div><div class='del'>-#ifdef __arm32__</div><div class='del'>-/*</div><div class='del'>- * Although the CPU is little endian the FP has different</div><div class='del'>- * byte and word endianness. The byte order is still little endian</div><div class='del'>- * but the word order is big endian.</div><div class='del'>- */</div><div class='del'>-#define IEEE_BIG_OR_LITTLE_ENDIAN</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef vax</div><div class='del'>-#define VAX</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define Long        qint32</div><div class='del'>-#define ULong        quint32</div><div class='del'>-</div><div class='del'>-#define MALLOC malloc</div><div class='del'>-</div><div class='del'>-#ifdef BSD_QDTOA_DEBUG</div><div class='del'>-QT_BEGIN_INCLUDE_NAMESPACE</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-QT_END_INCLUDE_NAMESPACE</div><div class='del'>-</div><div class='del'>-#define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef Unsigned_Shifts</div><div class='del'>-#define Sign_Extend(a,b) if (b &lt; 0) a |= 0xffff0000;</div><div class='del'>-#else</div><div class='del'>-#define Sign_Extend(a,b) /*no-op*/</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if (defined(IEEE_BIG_OR_LITTLE_ENDIAN) + defined(VAX) + defined(IBM)) != 1</div><div class='del'>-#error Exactly one of IEEE_BIG_OR_LITTLE_ENDIAN, VAX, or IBM should be defined.</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline ULong _getWord0(const NEEDS_VOLATILE double x)</div><div class='del'>-{</div><div class='del'>-    const NEEDS_VOLATILE uchar *ptr = reinterpret_cast&lt;const NEEDS_VOLATILE uchar *&gt;(&amp;x);</div><div class='del'>-    if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {</div><div class='del'>-        return (ptr[0]&lt;&lt;24) + (ptr[1]&lt;&lt;16) + (ptr[2]&lt;&lt;8) + ptr[3];</div><div class='del'>-    } else {</div><div class='del'>-        return (ptr[7]&lt;&lt;24) + (ptr[6]&lt;&lt;16) + (ptr[5]&lt;&lt;8) + ptr[4];</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void _setWord0(NEEDS_VOLATILE double *x, ULong l)</div><div class='del'>-{</div><div class='del'>-    NEEDS_VOLATILE uchar *ptr = reinterpret_cast&lt;NEEDS_VOLATILE uchar *&gt;(x);</div><div class='del'>-    if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {</div><div class='del'>-        ptr[0] = uchar(l&gt;&gt;24);</div><div class='del'>-        ptr[1] = uchar(l&gt;&gt;16);</div><div class='del'>-        ptr[2] = uchar(l&gt;&gt;8);</div><div class='del'>-        ptr[3] = uchar(l);</div><div class='del'>-    } else {</div><div class='del'>-        ptr[7] = uchar(l&gt;&gt;24);</div><div class='del'>-        ptr[6] = uchar(l&gt;&gt;16);</div><div class='del'>-        ptr[5] = uchar(l&gt;&gt;8);</div><div class='del'>-        ptr[4] = uchar(l);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline ULong _getWord1(const NEEDS_VOLATILE double x)</div><div class='del'>-{</div><div class='del'>-    const NEEDS_VOLATILE uchar *ptr = reinterpret_cast&lt;const NEEDS_VOLATILE uchar *&gt;(&amp;x);</div><div class='del'>-    if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {</div><div class='del'>-        return (ptr[4]&lt;&lt;24) + (ptr[5]&lt;&lt;16) + (ptr[6]&lt;&lt;8) + ptr[7];</div><div class='del'>-    } else {</div><div class='del'>-        return (ptr[3]&lt;&lt;24) + (ptr[2]&lt;&lt;16) + (ptr[1]&lt;&lt;8) + ptr[0];</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-static inline void _setWord1(NEEDS_VOLATILE double *x, ULong l)</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    Returns a currency symbol according to the \a format.</div><div class='add'>+*/</div><div class='add'>+QString QLocale::currencySymbol(QLocale::CurrencySymbolFormat format) const</div><div class='ctx'> {</div><div class='del'>-    NEEDS_VOLATILE uchar *ptr = reinterpret_cast&lt;uchar NEEDS_VOLATILE *&gt;(x);</div><div class='del'>-    if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {</div><div class='del'>-        ptr[4] = uchar(l&gt;&gt;24);</div><div class='del'>-        ptr[5] = uchar(l&gt;&gt;16);</div><div class='del'>-        ptr[6] = uchar(l&gt;&gt;8);</div><div class='del'>-        ptr[7] = uchar(l);</div><div class='del'>-    } else {</div><div class='del'>-        ptr[3] = uchar(l&gt;&gt;24);</div><div class='del'>-        ptr[2] = uchar(l&gt;&gt;16);</div><div class='del'>-        ptr[1] = uchar(l&gt;&gt;8);</div><div class='del'>-        ptr[0] = uchar(l);</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+    if (d() == systemPrivate()) {</div><div class='add'>+        QVariant res = systemLocale()-&gt;query(QSystemLocale::CurrencySymbol, format);</div><div class='add'>+        if (!res.isNull())</div><div class='add'>+            return res.toString();</div><div class='ctx'>     }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline ULong getWord0(const NEEDS_VOLATILE double x)</div><div class='del'>-{</div><div class='del'>-#ifdef QT_ARMFPA</div><div class='del'>-    return _getWord1(x);</div><div class='del'>-#else</div><div class='del'>-    return _getWord0(x);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void setWord0(NEEDS_VOLATILE double *x, ULong l)</div><div class='del'>-{</div><div class='del'>-#ifdef QT_ARMFPA</div><div class='del'>-    _setWord1(x, l);</div><div class='del'>-#else</div><div class='del'>-    _setWord0(x, l);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline ULong getWord1(const NEEDS_VOLATILE double x)</div><div class='del'>-{</div><div class='del'>-#ifdef QT_ARMFPA</div><div class='del'>-    return _getWord0(x);</div><div class='del'>-#else</div><div class='del'>-    return _getWord1(x);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void setWord1(NEEDS_VOLATILE double *x, ULong l)</div><div class='del'>-{</div><div class='del'>-#ifdef QT_ARMFPA</div><div class='del'>-    _setWord0(x, l);</div><div class='del'>-#else</div><div class='del'>-    _setWord1(x, l);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void Storeinc(ULong *&amp;a, const ULong &amp;b, const ULong &amp;c)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-    *a = (ushort(b) &lt;&lt; 16) | ushort(c);</div><div class='del'>-    ++a;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* #define P DBL_MANT_DIG */</div><div class='del'>-/* Ten_pmax = floor(P*log(2)/log(5)) */</div><div class='del'>-/* Bletch = (highest power of 2 &lt; DBL_MAX_10_EXP) / 16 */</div><div class='del'>-/* Quick_max = floor((P-1)*log(FLT_RADIX)/log(10) - 1) */</div><div class='del'>-/* Int_max = floor(P*log(FLT_RADIX)/log(10) - 1) */</div><div class='del'>-</div><div class='del'>-#if defined(IEEE_BIG_OR_LITTLE_ENDIAN)</div><div class='del'>-#define Exp_shift  20</div><div class='del'>-#define Exp_shift1 20</div><div class='del'>-#define Exp_msk1    0x100000</div><div class='del'>-#define Exp_msk11   0x100000</div><div class='del'>-#define Exp_mask  0x7ff00000</div><div class='del'>-#define P 53</div><div class='del'>-#define Bias 1023</div><div class='del'>-#define IEEE_Arith</div><div class='del'>-#define Emin (-1022)</div><div class='del'>-#define Exp_1  0x3ff00000</div><div class='del'>-#define Exp_11 0x3ff00000</div><div class='del'>-#define Ebits 11</div><div class='del'>-#define Frac_mask  0xfffff</div><div class='del'>-#define Frac_mask1 0xfffff</div><div class='del'>-#define Ten_pmax 22</div><div class='del'>-#define Bletch 0x10</div><div class='del'>-#define Bndry_mask  0xfffff</div><div class='del'>-#define Bndry_mask1 0xfffff</div><div class='del'>-#if defined(LSB) &amp;&amp; defined(Q_OS_VXWORKS)</div><div class='del'>-#undef LSB</div><div class='del'>-#endif</div><div class='del'>-#define LSB 1</div><div class='del'>-#define Sign_bit 0x80000000</div><div class='del'>-#define Log2P 1</div><div class='del'>-#define Tiny0 0</div><div class='del'>-#define Tiny1 1</div><div class='del'>-#define Quick_max 14</div><div class='del'>-#define Int_max 14</div><div class='del'>-#define Infinite(x) (getWord0(x) == 0x7ff00000) /* sufficient test for here */</div><div class='del'>-#else</div><div class='del'>-#undef  Sudden_Underflow</div><div class='del'>-#define Sudden_Underflow</div><div class='del'>-#ifdef IBM</div><div class='del'>-#define Exp_shift  24</div><div class='del'>-#define Exp_shift1 24</div><div class='del'>-#define Exp_msk1   0x1000000</div><div class='del'>-#define Exp_msk11  0x1000000</div><div class='del'>-#define Exp_mask  0x7f000000</div><div class='del'>-#define P 14</div><div class='del'>-#define Bias 65</div><div class='del'>-#define Exp_1  0x41000000</div><div class='del'>-#define Exp_11 0x41000000</div><div class='del'>-#define Ebits 8        /* exponent has 7 bits, but 8 is the right value in b2d */</div><div class='del'>-#define Frac_mask  0xffffff</div><div class='del'>-#define Frac_mask1 0xffffff</div><div class='del'>-#define Bletch 4</div><div class='del'>-#define Ten_pmax 22</div><div class='del'>-#define Bndry_mask  0xefffff</div><div class='del'>-#define Bndry_mask1 0xffffff</div><div class='del'>-#define LSB 1</div><div class='del'>-#define Sign_bit 0x80000000</div><div class='del'>-#define Log2P 4</div><div class='del'>-#define Tiny0 0x100000</div><div class='del'>-#define Tiny1 0</div><div class='del'>-#define Quick_max 14</div><div class='del'>-#define Int_max 15</div><div class='del'>-#else /* VAX */</div><div class='del'>-#define Exp_shift  23</div><div class='del'>-#define Exp_shift1 7</div><div class='del'>-#define Exp_msk1    0x80</div><div class='del'>-#define Exp_msk11   0x800000</div><div class='del'>-#define Exp_mask  0x7f80</div><div class='del'>-#define P 56</div><div class='del'>-#define Bias 129</div><div class='del'>-#define Exp_1  0x40800000</div><div class='del'>-#define Exp_11 0x4080</div><div class='del'>-#define Ebits 8</div><div class='del'>-#define Frac_mask  0x7fffff</div><div class='del'>-#define Frac_mask1 0xffff007f</div><div class='del'>-#define Ten_pmax 24</div><div class='del'>-#define Bletch 2</div><div class='del'>-#define Bndry_mask  0xffff007f</div><div class='del'>-#define Bndry_mask1 0xffff007f</div><div class='del'>-#define LSB 0x10000</div><div class='del'>-#define Sign_bit 0x8000</div><div class='del'>-#define Log2P 1</div><div class='del'>-#define Tiny0 0x80</div><div class='del'>-#define Tiny1 0</div><div class='del'>-#define Quick_max 15</div><div class='del'>-#define Int_max 15</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef IEEE_Arith</div><div class='del'>-#define ROUND_BIASED</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef RND_PRODQUOT</div><div class='del'>-#define rounded_product(a,b) a = rnd_prod(a, b)</div><div class='del'>-#define rounded_quotient(a,b) a = rnd_quot(a, b)</div><div class='del'>-extern double rnd_prod(double, double), rnd_quot(double, double);</div><div class='del'>-#else</div><div class='del'>-#define rounded_product(a,b) a *= b</div><div class='del'>-#define rounded_quotient(a,b) a /= b</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define Big0 (Frac_mask1 | Exp_msk1*(DBL_MAX_EXP+Bias-1))</div><div class='del'>-#define Big1 0xffffffff</div><div class='del'>-</div><div class='del'>-#ifndef Just_16</div><div class='del'>-/* When Pack_32 is not defined, we store 16 bits per 32-bit Long.</div><div class='del'>- * This makes some inner loops simpler and sometimes saves work</div><div class='del'>- * during multiplications, but it often seems to make things slightly</div><div class='del'>- * slower.  Hence the default is now to store 32 bits per Long.</div><div class='del'>- */</div><div class='del'>-#ifndef Pack_32</div><div class='del'>-#define Pack_32</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define Kmax 15</div><div class='del'>-</div><div class='del'>-struct</div><div class='del'>-Bigint {</div><div class='del'>-    struct Bigint *next;</div><div class='del'>-    int k, maxwds, sign, wds;</div><div class='del'>-    ULong x[1];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>- typedef struct Bigint Bigint;</div><div class='del'>-</div><div class='del'>-static Bigint *Balloc(int k)</div><div class='del'>-{</div><div class='del'>-    int x;</div><div class='del'>-    Bigint *rv;</div><div class='del'>-</div><div class='del'>-    x = 1 &lt;&lt; k;</div><div class='del'>-    rv = static_cast&lt;Bigint *&gt;(MALLOC(sizeof(Bigint) + (x-1)*sizeof(Long)));</div><div class='del'>-    Q_CHECK_PTR(rv);</div><div class='del'>-    rv-&gt;k = k;</div><div class='del'>-    rv-&gt;maxwds = x;</div><div class='del'>-    rv-&gt;sign = rv-&gt;wds = 0;</div><div class='del'>-    return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void Bfree(Bigint *v)</div><div class='del'>-{</div><div class='del'>-    free(v);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define Bcopy(x,y) memcpy(reinterpret_cast&lt;char *&gt;(&amp;x-&gt;sign), reinterpret_cast&lt;char *&gt;(&amp;y-&gt;sign), \</div><div class='del'>-y-&gt;wds*sizeof(Long) + 2*sizeof(int))</div><div class='del'>-</div><div class='del'>-/* multiply by m and add a */</div><div class='del'>-static Bigint *multadd(Bigint *b, int m, int a)</div><div class='del'>-{</div><div class='del'>-    int i, wds;</div><div class='del'>-    ULong *x, y;</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-    ULong xi, z;</div><div class='del'>-#endif</div><div class='del'>-    Bigint *b1;</div><div class='del'>-</div><div class='del'>-    wds = b-&gt;wds;</div><div class='del'>-    x = b-&gt;x;</div><div class='del'>-    i = 0;</div><div class='del'>-    do {</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-        xi = *x;</div><div class='del'>-        y = (xi &amp; 0xffff) * m + a;</div><div class='del'>-        z = (xi &gt;&gt; 16) * m + (y &gt;&gt; 16);</div><div class='del'>-        a = (z &gt;&gt; 16);</div><div class='del'>-        *x++ = (z &lt;&lt; 16) + (y &amp; 0xffff);</div><div class='del'>-#else</div><div class='del'>-        y = *x * m + a;</div><div class='del'>-        a = (y &gt;&gt; 16);</div><div class='del'>-        *x++ = y &amp; 0xffff;</div><div class='ctx'> #endif</div><div class='add'>+    quint32 idx, size;</div><div class='add'>+    switch (format) {</div><div class='add'>+    case CurrencySymbol:</div><div class='add'>+        idx = d()-&gt;m_currency_symbol_idx;</div><div class='add'>+        size = d()-&gt;m_currency_symbol_size;</div><div class='add'>+        return getLocaleData(currency_symbol_data + idx, size);</div><div class='add'>+    case CurrencyDisplayName:</div><div class='add'>+        idx = d()-&gt;m_currency_display_name_idx;</div><div class='add'>+        size = d()-&gt;m_currency_display_name_size;</div><div class='add'>+        return getLocaleListData(currency_display_name_data + idx, size, 0);</div><div class='add'>+    case CurrencyIsoCode: {</div><div class='add'>+        int len = 0;</div><div class='add'>+        const QLocalePrivate *d = this-&gt;d();</div><div class='add'>+        for (; len &lt; 3; ++len)</div><div class='add'>+            if (!d-&gt;m_currency_iso_code[len])</div><div class='add'>+                break;</div><div class='add'>+        return len ? QString::fromLatin1(d-&gt;m_currency_iso_code, len) : QString();</div><div class='ctx'>     }</div><div class='del'>-    while(++i &lt; wds);</div><div class='del'>-    if (a) {</div><div class='del'>-        if (wds &gt;= b-&gt;maxwds) {</div><div class='del'>-            b1 = Balloc(b-&gt;k+1);</div><div class='del'>-            Bcopy(b1, b);</div><div class='del'>-            Bfree(b);</div><div class='del'>-            b = b1;</div><div class='del'>-        }</div><div class='del'>-        b-&gt;x[wds++] = a;</div><div class='del'>-        b-&gt;wds = wds;</div><div class='ctx'>     }</div><div class='del'>-    return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Bigint *s2b(const char *s, int nd0, int nd, ULong y9)</div><div class='del'>-{</div><div class='del'>-    Bigint *b;</div><div class='del'>-    int i, k;</div><div class='del'>-    Long x, y;</div><div class='del'>-</div><div class='del'>-    x = (nd + 8) / 9;</div><div class='del'>-    for(k = 0, y = 1; x &gt; y; y &lt;&lt;= 1, k++) ;</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-    b = Balloc(k);</div><div class='del'>-    b-&gt;x[0] = y9;</div><div class='del'>-    b-&gt;wds = 1;</div><div class='del'>-#else</div><div class='del'>-    b = Balloc(k+1);</div><div class='del'>-    b-&gt;x[0] = y9 &amp; 0xffff;</div><div class='del'>-    b-&gt;wds = (b-&gt;x[1] = y9 &gt;&gt; 16) ? 2 : 1;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-    i = 9;</div><div class='del'>-    if (9 &lt; nd0) {</div><div class='del'>-        s += 9;</div><div class='del'>-        do b = multadd(b, 10, *s++ - '0');</div><div class='del'>-        while(++i &lt; nd0);</div><div class='del'>-        s++;</div><div class='del'>-    }</div><div class='del'>-    else</div><div class='del'>-        s += 10;</div><div class='del'>-    for(; i &lt; nd; i++)</div><div class='del'>-        b = multadd(b, 10, *s++ - '0');</div><div class='del'>-    return b;</div><div class='add'>+    return QString();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hi0bits(ULong x)</div><div class='del'>-{</div><div class='del'>-    int k = 0;</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='ctx'> </div><div class='del'>-    if (!(x &amp; 0xffff0000)) {</div><div class='del'>-        k = 16;</div><div class='del'>-        x &lt;&lt;= 16;</div><div class='del'>-    }</div><div class='del'>-    if (!(x &amp; 0xff000000)) {</div><div class='del'>-        k += 8;</div><div class='del'>-        x &lt;&lt;= 8;</div><div class='del'>-    }</div><div class='del'>-    if (!(x &amp; 0xf0000000)) {</div><div class='del'>-        k += 4;</div><div class='del'>-        x &lt;&lt;= 4;</div><div class='del'>-    }</div><div class='del'>-    if (!(x &amp; 0xc0000000)) {</div><div class='del'>-        k += 2;</div><div class='del'>-        x &lt;&lt;= 2;</div><div class='del'>-    }</div><div class='del'>-    if (!(x &amp; 0x80000000)) {</div><div class='del'>-        k++;</div><div class='del'>-        if (!(x &amp; 0x40000000))</div><div class='del'>-            return 32;</div><div class='del'>-    }</div><div class='del'>-    return k;</div><div class='del'>-}</div><div class='add'>+    Returns a localized string representation of \a value as a currency.</div><div class='add'>+    If the \a symbol is provided it is used instead of the default currency symbol.</div><div class='ctx'> </div><div class='del'>-static int lo0bits(ULong *y)</div><div class='add'>+    \sa currencySymbol()</div><div class='add'>+*/</div><div class='add'>+QString QLocale::toCurrencyString(qlonglong value, const QString &amp;symbol) const</div><div class='ctx'> {</div><div class='del'>-    int k;</div><div class='del'>-    ULong x = *y;</div><div class='del'>-</div><div class='del'>-    if (x &amp; 7) {</div><div class='del'>-        if (x &amp; 1)</div><div class='del'>-            return 0;</div><div class='del'>-        if (x &amp; 2) {</div><div class='del'>-            *y = x &gt;&gt; 1;</div><div class='del'>-            return 1;</div><div class='del'>-        }</div><div class='del'>-        *y = x &gt;&gt; 2;</div><div class='del'>-        return 2;</div><div class='del'>-    }</div><div class='del'>-    k = 0;</div><div class='del'>-    if (!(x &amp; 0xffff)) {</div><div class='del'>-        k = 16;</div><div class='del'>-        x &gt;&gt;= 16;</div><div class='del'>-    }</div><div class='del'>-    if (!(x &amp; 0xff)) {</div><div class='del'>-        k += 8;</div><div class='del'>-        x &gt;&gt;= 8;</div><div class='del'>-    }</div><div class='del'>-    if (!(x &amp; 0xf)) {</div><div class='del'>-        k += 4;</div><div class='del'>-        x &gt;&gt;= 4;</div><div class='del'>-    }</div><div class='del'>-    if (!(x &amp; 0x3)) {</div><div class='del'>-        k += 2;</div><div class='del'>-        x &gt;&gt;= 2;</div><div class='del'>-    }</div><div class='del'>-    if (!(x &amp; 1)) {</div><div class='del'>-        k++;</div><div class='del'>-        x &gt;&gt;= 1;</div><div class='del'>-        if (!x &amp; 1)</div><div class='del'>-            return 32;</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+    if (d() == systemPrivate()) {</div><div class='add'>+        QSystemLocale::CurrencyToStringArgument arg(value, symbol);</div><div class='add'>+        QVariant res = systemLocale()-&gt;query(QSystemLocale::CurrencyToString, QVariant::fromValue(arg));</div><div class='add'>+        if (!res.isNull())</div><div class='add'>+            return res.toString();</div><div class='ctx'>     }</div><div class='del'>-    *y = x;</div><div class='del'>-    return k;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Bigint *i2b(int i)</div><div class='del'>-{</div><div class='del'>-    Bigint *b;</div><div class='del'>-</div><div class='del'>-    b = Balloc(1);</div><div class='del'>-    b-&gt;x[0] = i;</div><div class='del'>-    b-&gt;wds = 1;</div><div class='del'>-    return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Bigint *mult(Bigint *a, Bigint *b)</div><div class='del'>-{</div><div class='del'>-    Bigint *c;</div><div class='del'>-    int k, wa, wb, wc;</div><div class='del'>-    ULong carry, y, z;</div><div class='del'>-    ULong *x, *xa, *xae, *xb, *xbe, *xc, *xc0;</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-    ULong z2;</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-    if (a-&gt;wds &lt; b-&gt;wds) {</div><div class='del'>-        c = a;</div><div class='del'>-        a = b;</div><div class='del'>-        b = c;</div><div class='add'>+    const QLocalePrivate *d = this-&gt;d();</div><div class='add'>+    quint8 idx = d-&gt;m_currency_format_idx;</div><div class='add'>+    quint8 size = d-&gt;m_currency_format_size;</div><div class='add'>+    if (d-&gt;m_currency_negative_format_size &amp;&amp; value &lt; 0) {</div><div class='add'>+        idx = d-&gt;m_currency_negative_format_idx;</div><div class='add'>+        size = d-&gt;m_currency_negative_format_size;</div><div class='add'>+        value = -value;</div><div class='ctx'>     }</div><div class='del'>-    k = a-&gt;k;</div><div class='del'>-    wa = a-&gt;wds;</div><div class='del'>-    wb = b-&gt;wds;</div><div class='del'>-    wc = wa + wb;</div><div class='del'>-    if (wc &gt; a-&gt;maxwds)</div><div class='del'>-        k++;</div><div class='del'>-    c = Balloc(k);</div><div class='del'>-    for(x = c-&gt;x, xa = x + wc; x &lt; xa; x++)</div><div class='del'>-        *x = 0;</div><div class='del'>-    xa = a-&gt;x;</div><div class='del'>-    xae = xa + wa;</div><div class='del'>-    xb = b-&gt;x;</div><div class='del'>-    xbe = xb + wb;</div><div class='del'>-    xc0 = c-&gt;x;</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-    for(; xb &lt; xbe; xb++, xc0++) {</div><div class='del'>-        if ((y = *xb &amp; 0xffff) != 0) {</div><div class='del'>-            x = xa;</div><div class='del'>-            xc = xc0;</div><div class='del'>-            carry = 0;</div><div class='del'>-            do {</div><div class='del'>-                z = (*x &amp; 0xffff) * y + (*xc &amp; 0xffff) + carry;</div><div class='del'>-                carry = z &gt;&gt; 16;</div><div class='del'>-                z2 = (*x++ &gt;&gt; 16) * y + (*xc &gt;&gt; 16) + carry;</div><div class='del'>-                carry = z2 &gt;&gt; 16;</div><div class='del'>-                Storeinc(xc, z2, z);</div><div class='del'>-            }</div><div class='del'>-            while(x &lt; xae);</div><div class='del'>-            *xc = carry;</div><div class='del'>-        }</div><div class='del'>-        if ((y = *xb &gt;&gt; 16) != 0) {</div><div class='del'>-            x = xa;</div><div class='del'>-            xc = xc0;</div><div class='del'>-            carry = 0;</div><div class='del'>-            z2 = *xc;</div><div class='del'>-            do {</div><div class='del'>-                z = (*x &amp; 0xffff) * y + (*xc &gt;&gt; 16) + carry;</div><div class='del'>-                carry = z &gt;&gt; 16;</div><div class='del'>-                Storeinc(xc, z, z2);</div><div class='del'>-                z2 = (*x++ &gt;&gt; 16) * y + (*xc &amp; 0xffff) + carry;</div><div class='del'>-                carry = z2 &gt;&gt; 16;</div><div class='del'>-            }</div><div class='del'>-            while(x &lt; xae);</div><div class='del'>-            *xc = z2;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-#else</div><div class='del'>-    for(; xb &lt; xbe; xc0++) {</div><div class='del'>-        if (y = *xb++) {</div><div class='del'>-            x = xa;</div><div class='del'>-            xc = xc0;</div><div class='del'>-            carry = 0;</div><div class='del'>-            do {</div><div class='del'>-                z = *x++ * y + *xc + carry;</div><div class='del'>-                carry = z &gt;&gt; 16;</div><div class='del'>-                *xc++ = z &amp; 0xffff;</div><div class='del'>-            }</div><div class='del'>-            while(x &lt; xae);</div><div class='del'>-            *xc = carry;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-#endif</div><div class='del'>-    for(xc0 = c-&gt;x, xc = xc0 + wc; wc &gt; 0 &amp;&amp; !*--xc; --wc) ;</div><div class='del'>-    c-&gt;wds = wc;</div><div class='del'>-    return c;</div><div class='add'>+    QString str = d-&gt;longLongToString(value);</div><div class='add'>+    QString sym = symbol.isNull() ? currencySymbol() : symbol;</div><div class='add'>+    if (sym.isEmpty())</div><div class='add'>+        sym = currencySymbol(QLocale::CurrencyIsoCode);</div><div class='add'>+    QString format = getLocaleData(currency_format_data + idx, size);</div><div class='add'>+    return format.arg(str, sym);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static Bigint *p5s;</div><div class='del'>-</div><div class='del'>-struct p5s_deleter</div><div class='del'>-{</div><div class='del'>-    ~p5s_deleter()</div><div class='del'>-    {</div><div class='del'>-        while (p5s) {</div><div class='del'>-            Bigint *next = p5s-&gt;next;</div><div class='del'>-            Bfree(p5s);</div><div class='del'>-            p5s = next;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static Bigint *pow5mult(Bigint *b, int k)</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload</div><div class='add'>+*/</div><div class='add'>+QString QLocale::toCurrencyString(qulonglong value, const QString &amp;symbol) const</div><div class='ctx'> {</div><div class='del'>-    Bigint *b1, *p5, *p51;</div><div class='del'>-    int i;</div><div class='del'>-    static const int p05[3] = { 5, 25, 125 };</div><div class='del'>-</div><div class='del'>-    if ((i = k &amp; 3) != 0)</div><div class='del'>-#if defined(Q_OS_IRIX) &amp;&amp; defined(Q_CC_GNU)</div><div class='del'>-    {</div><div class='del'>-        // work around a bug on 64 bit IRIX gcc</div><div class='del'>-        int *p = (int *) p05;</div><div class='del'>-        b = multadd(b, p[i-1], 0);</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+    if (d() == systemPrivate()) {</div><div class='add'>+        QSystemLocale::CurrencyToStringArgument arg(value, symbol);</div><div class='add'>+        QVariant res = systemLocale()-&gt;query(QSystemLocale::CurrencyToString, QVariant::fromValue(arg));</div><div class='add'>+        if (!res.isNull())</div><div class='add'>+            return res.toString();</div><div class='ctx'>     }</div><div class='del'>-#else</div><div class='del'>-    b = multadd(b, p05[i-1], 0);</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='del'>-    if (!(k &gt;&gt;= 2))</div><div class='del'>-        return b;</div><div class='del'>-    if (!(p5 = p5s)) {</div><div class='del'>-        /* first time */</div><div class='del'>-        static p5s_deleter deleter;</div><div class='del'>-        p5 = p5s = i2b(625);</div><div class='del'>-        p5-&gt;next = 0;</div><div class='del'>-    }</div><div class='del'>-    for(;;) {</div><div class='del'>-        if (k &amp; 1) {</div><div class='del'>-            b1 = mult(b, p5);</div><div class='del'>-            Bfree(b);</div><div class='del'>-            b = b1;</div><div class='del'>-        }</div><div class='del'>-        if (!(k &gt;&gt;= 1))</div><div class='del'>-            break;</div><div class='del'>-        if (!(p51 = p5-&gt;next)) {</div><div class='del'>-            p51 = p5-&gt;next = mult(p5,p5);</div><div class='del'>-            p51-&gt;next = 0;</div><div class='del'>-        }</div><div class='del'>-        p5 = p51;</div><div class='del'>-    }</div><div class='del'>-    return b;</div><div class='add'>+    const QLocalePrivate *d = this-&gt;d();</div><div class='add'>+    quint8 idx = d-&gt;m_currency_format_idx;</div><div class='add'>+    quint8 size = d-&gt;m_currency_format_size;</div><div class='add'>+    QString str = d-&gt;unsLongLongToString(value);</div><div class='add'>+    QString sym = symbol.isNull() ? currencySymbol() : symbol;</div><div class='add'>+    if (sym.isEmpty())</div><div class='add'>+        sym = currencySymbol(QLocale::CurrencyIsoCode);</div><div class='add'>+    QString format = getLocaleData(currency_format_data + idx, size);</div><div class='add'>+    return format.arg(str, sym);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static Bigint *lshift(Bigint *b, int k)</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload</div><div class='add'>+*/</div><div class='add'>+QString QLocale::toCurrencyString(double value, const QString &amp;symbol) const</div><div class='ctx'> {</div><div class='del'>-    int i, k1, n, n1;</div><div class='del'>-    Bigint *b1;</div><div class='del'>-    ULong *x, *x1, *xe, z;</div><div class='del'>-</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-    n = k &gt;&gt; 5;</div><div class='del'>-#else</div><div class='del'>-    n = k &gt;&gt; 4;</div><div class='del'>-#endif</div><div class='del'>-    k1 = b-&gt;k;</div><div class='del'>-    n1 = n + b-&gt;wds + 1;</div><div class='del'>-    for(i = b-&gt;maxwds; n1 &gt; i; i &lt;&lt;= 1)</div><div class='del'>-        k1++;</div><div class='del'>-    b1 = Balloc(k1);</div><div class='del'>-    x1 = b1-&gt;x;</div><div class='del'>-    for(i = 0; i &lt; n; i++)</div><div class='del'>-        *x1++ = 0;</div><div class='del'>-    x = b-&gt;x;</div><div class='del'>-    xe = x + b-&gt;wds;</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-    if (k &amp;= 0x1f) {</div><div class='del'>-        k1 = 32 - k;</div><div class='del'>-        z = 0;</div><div class='del'>-        do {</div><div class='del'>-            *x1++ = *x &lt;&lt; k | z;</div><div class='del'>-            z = *x++ &gt;&gt; k1;</div><div class='del'>-        }</div><div class='del'>-        while(x &lt; xe);</div><div class='del'>-        if ((*x1 = z) != 0)</div><div class='del'>-            ++n1;</div><div class='del'>-    }</div><div class='del'>-#else</div><div class='del'>-    if (k &amp;= 0xf) {</div><div class='del'>-        k1 = 16 - k;</div><div class='del'>-        z = 0;</div><div class='del'>-        do {</div><div class='del'>-            *x1++ = *x &lt;&lt; k  &amp; 0xffff | z;</div><div class='del'>-            z = *x++ &gt;&gt; k1;</div><div class='del'>-        }</div><div class='del'>-        while(x &lt; xe);</div><div class='del'>-        if (*x1 = z)</div><div class='del'>-            ++n1;</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+    if (d() == systemPrivate()) {</div><div class='add'>+        QSystemLocale::CurrencyToStringArgument arg(value, symbol);</div><div class='add'>+        QVariant res = systemLocale()-&gt;query(QSystemLocale::CurrencyToString, QVariant::fromValue(arg));</div><div class='add'>+        if (!res.isNull())</div><div class='add'>+            return res.toString();</div><div class='ctx'>     }</div><div class='ctx'> #endif</div><div class='del'>-    else do</div><div class='del'>-        *x1++ = *x++;</div><div class='del'>-    while(x &lt; xe);</div><div class='del'>-    b1-&gt;wds = n1 - 1;</div><div class='del'>-    Bfree(b);</div><div class='del'>-    return b1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cmp(Bigint *a, Bigint *b)</div><div class='del'>-{</div><div class='del'>-    ULong *xa, *xa0, *xb, *xb0;</div><div class='del'>-    int i, j;</div><div class='del'>-</div><div class='del'>-    i = a-&gt;wds;</div><div class='del'>-    j = b-&gt;wds;</div><div class='del'>-#ifdef BSD_QDTOA_DEBUG</div><div class='del'>-    if (i &gt; 1 &amp;&amp; !a-&gt;x[i-1])</div><div class='del'>-        Bug("cmp called with a-&gt;x[a-&gt;wds-1] == 0");</div><div class='del'>-    if (j &gt; 1 &amp;&amp; !b-&gt;x[j-1])</div><div class='del'>-        Bug("cmp called with b-&gt;x[b-&gt;wds-1] == 0");</div><div class='del'>-#endif</div><div class='del'>-    if (i -= j)</div><div class='del'>-        return i;</div><div class='del'>-    xa0 = a-&gt;x;</div><div class='del'>-    xa = xa0 + j;</div><div class='del'>-    xb0 = b-&gt;x;</div><div class='del'>-    xb = xb0 + j;</div><div class='del'>-    for(;;) {</div><div class='del'>-        if (*--xa != *--xb)</div><div class='del'>-            return *xa &lt; *xb ? -1 : 1;</div><div class='del'>-        if (xa &lt;= xa0)</div><div class='del'>-            break;</div><div class='add'>+    const QLocalePrivate *d = this-&gt;d();</div><div class='add'>+    quint8 idx = d-&gt;m_currency_format_idx;</div><div class='add'>+    quint8 size = d-&gt;m_currency_format_size;</div><div class='add'>+    if (d-&gt;m_currency_negative_format_size &amp;&amp; value &lt; 0) {</div><div class='add'>+        idx = d-&gt;m_currency_negative_format_idx;</div><div class='add'>+        size = d-&gt;m_currency_negative_format_size;</div><div class='add'>+        value = -value;</div><div class='ctx'>     }</div><div class='del'>-    return 0;</div><div class='add'>+    QString str = d-&gt;doubleToString(value, d-&gt;m_currency_digits,</div><div class='add'>+                                    QLocalePrivate::DFDecimal);</div><div class='add'>+    QString sym = symbol.isNull() ? currencySymbol() : symbol;</div><div class='add'>+    if (sym.isEmpty())</div><div class='add'>+        sym = currencySymbol(QLocale::CurrencyIsoCode);</div><div class='add'>+    QString format = getLocaleData(currency_format_data + idx, size);</div><div class='add'>+    return format.arg(str, sym);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static Bigint *diff(Bigint *a, Bigint *b)</div><div class='del'>-{</div><div class='del'>-    Bigint *c;</div><div class='del'>-    int i, wa, wb;</div><div class='del'>-    Long borrow, y;        /* We need signed shifts here. */</div><div class='del'>-    ULong *xa, *xae, *xb, *xbe, *xc;</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-    Long z;</div><div class='del'>-#endif</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='ctx'> </div><div class='del'>-    i = cmp(a,b);</div><div class='del'>-    if (!i) {</div><div class='del'>-        c = Balloc(0);</div><div class='del'>-        c-&gt;wds = 1;</div><div class='del'>-        c-&gt;x[0] = 0;</div><div class='del'>-        return c;</div><div class='del'>-    }</div><div class='del'>-    if (i &lt; 0) {</div><div class='del'>-        c = a;</div><div class='del'>-        a = b;</div><div class='del'>-        b = c;</div><div class='del'>-        i = 1;</div><div class='del'>-    }</div><div class='del'>-    else</div><div class='del'>-        i = 0;</div><div class='del'>-    c = Balloc(a-&gt;k);</div><div class='del'>-    c-&gt;sign = i;</div><div class='del'>-    wa = a-&gt;wds;</div><div class='del'>-    xa = a-&gt;x;</div><div class='del'>-    xae = xa + wa;</div><div class='del'>-    wb = b-&gt;wds;</div><div class='del'>-    xb = b-&gt;x;</div><div class='del'>-    xbe = xb + wb;</div><div class='del'>-    xc = c-&gt;x;</div><div class='del'>-    borrow = 0;</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-    do {</div><div class='del'>-        y = (*xa &amp; 0xffff) - (*xb &amp; 0xffff) + borrow;</div><div class='del'>-        borrow = y &gt;&gt; 16;</div><div class='del'>-        Sign_Extend(borrow, y);</div><div class='del'>-        z = (*xa++ &gt;&gt; 16) - (*xb++ &gt;&gt; 16) + borrow;</div><div class='del'>-        borrow = z &gt;&gt; 16;</div><div class='del'>-        Sign_Extend(borrow, z);</div><div class='del'>-        Storeinc(xc, z, y);</div><div class='del'>-    }</div><div class='del'>-    while(xb &lt; xbe);</div><div class='del'>-    while(xa &lt; xae) {</div><div class='del'>-        y = (*xa &amp; 0xffff) + borrow;</div><div class='del'>-        borrow = y &gt;&gt; 16;</div><div class='del'>-        Sign_Extend(borrow, y);</div><div class='del'>-        z = (*xa++ &gt;&gt; 16) + borrow;</div><div class='del'>-        borrow = z &gt;&gt; 16;</div><div class='del'>-        Sign_Extend(borrow, z);</div><div class='del'>-        Storeinc(xc, z, y);</div><div class='del'>-    }</div><div class='del'>-#else</div><div class='del'>-    do {</div><div class='del'>-        y = *xa++ - *xb++ + borrow;</div><div class='del'>-        borrow = y &gt;&gt; 16;</div><div class='del'>-        Sign_Extend(borrow, y);</div><div class='del'>-        *xc++ = y &amp; 0xffff;</div><div class='del'>-    }</div><div class='del'>-    while(xb &lt; xbe);</div><div class='del'>-    while(xa &lt; xae) {</div><div class='del'>-        y = *xa++ + borrow;</div><div class='del'>-        borrow = y &gt;&gt; 16;</div><div class='del'>-        Sign_Extend(borrow, y);</div><div class='del'>-        *xc++ = y &amp; 0xffff;</div><div class='del'>-    }</div><div class='del'>-#endif</div><div class='del'>-    while(!*--xc)</div><div class='del'>-        wa--;</div><div class='del'>-    c-&gt;wds = wa;</div><div class='del'>-    return c;</div><div class='del'>-}</div><div class='add'>+    Returns an ordered list of locale names for translation purposes in</div><div class='add'>+    preference order.</div><div class='ctx'> </div><div class='del'>-static double ulp(double x)</div><div class='del'>-{</div><div class='del'>-    Long L;</div><div class='del'>-    double a;</div><div class='add'>+    The return value represents locale names that the user expects to see the</div><div class='add'>+    UI translation in.</div><div class='ctx'> </div><div class='del'>-    L = (getWord0(x) &amp; Exp_mask) - (P-1)*Exp_msk1;</div><div class='del'>-#ifndef Sudden_Underflow</div><div class='del'>-    if (L &gt; 0) {</div><div class='del'>-#endif</div><div class='del'>-#ifdef IBM</div><div class='del'>-        L |= Exp_msk1 &gt;&gt; 4;</div><div class='del'>-#endif</div><div class='del'>-        setWord0(&amp;a, L);</div><div class='del'>-        setWord1(&amp;a, 0);</div><div class='del'>-#ifndef Sudden_Underflow</div><div class='del'>-    }</div><div class='del'>-    else {</div><div class='del'>-        L = -L &gt;&gt; Exp_shift;</div><div class='del'>-        if (L &lt; Exp_shift) {</div><div class='del'>-            setWord0(&amp;a, 0x80000 &gt;&gt; L);</div><div class='del'>-            setWord1(&amp;a, 0);</div><div class='del'>-        }</div><div class='del'>-        else {</div><div class='del'>-            setWord0(&amp;a, 0);</div><div class='del'>-            L -= Exp_shift;</div><div class='del'>-            setWord1(&amp;a, L &gt;= 31 ? 1U : 1U &lt;&lt; (31 - L));</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-#endif</div><div class='del'>-    return a;</div><div class='del'>-}</div><div class='add'>+    Most like you do not need to use this function directly, but just pass the</div><div class='add'>+    QLocale object to the QTranslator::load() function.</div><div class='ctx'> </div><div class='del'>-static double b2d(Bigint *a, int *e)</div><div class='del'>-{</div><div class='del'>-    ULong *xa, *xa0, w, y, z;</div><div class='del'>-    int k;</div><div class='del'>-    double d;</div><div class='del'>-</div><div class='del'>-    xa0 = a-&gt;x;</div><div class='del'>-    xa = xa0 + a-&gt;wds;</div><div class='del'>-    y = *--xa;</div><div class='del'>-#ifdef BSD_QDTOA_DEBUG</div><div class='del'>-    if (!y) Bug("zero y in b2d");</div><div class='del'>-#endif</div><div class='del'>-    k = hi0bits(y);</div><div class='del'>-    *e = 32 - k;</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-    if (k &lt; Ebits) {</div><div class='del'>-        setWord0(&amp;d, Exp_1 | y &gt;&gt; (Ebits - k));</div><div class='del'>-        w = xa &gt; xa0 ? *--xa : 0;</div><div class='del'>-        setWord1(&amp;d, y &lt;&lt; ((32-Ebits) + k) | w &gt;&gt; (Ebits - k));</div><div class='del'>-        goto ret_d;</div><div class='del'>-    }</div><div class='del'>-    z = xa &gt; xa0 ? *--xa : 0;</div><div class='del'>-    if (k -= Ebits) {</div><div class='del'>-        setWord0(&amp;d, Exp_1 | y &lt;&lt; k | z &gt;&gt; (32 - k));</div><div class='del'>-        y = xa &gt; xa0 ? *--xa : 0;</div><div class='del'>-        setWord1(&amp;d, z &lt;&lt; k | y &gt;&gt; (32 - k));</div><div class='del'>-    }</div><div class='del'>-    else {</div><div class='del'>-        setWord0(&amp;d, Exp_1 | y);</div><div class='del'>-        setWord1(&amp;d, z);</div><div class='del'>-    }</div><div class='del'>-#else</div><div class='del'>-    if (k &lt; Ebits + 16) {</div><div class='del'>-        z = xa &gt; xa0 ? *--xa : 0;</div><div class='del'>-        setWord0(&amp;d, Exp_1 | y &lt;&lt; k - Ebits | z &gt;&gt; Ebits + 16 - k);</div><div class='del'>-        w = xa &gt; xa0 ? *--xa : 0;</div><div class='del'>-        y = xa &gt; xa0 ? *--xa : 0;</div><div class='del'>-        setWord1(&amp;d, z &lt;&lt; k + 16 - Ebits | w &lt;&lt; k - Ebits | y &gt;&gt; 16 + Ebits - k);</div><div class='del'>-        goto ret_d;</div><div class='del'>-    }</div><div class='del'>-    z = xa &gt; xa0 ? *--xa : 0;</div><div class='del'>-    w = xa &gt; xa0 ? *--xa : 0;</div><div class='del'>-    k -= Ebits + 16;</div><div class='del'>-    setWord0(&amp;d, Exp_1 | y &lt;&lt; k + 16 | z &lt;&lt; k | w &gt;&gt; 16 - k);</div><div class='del'>-    y = xa &gt; xa0 ? *--xa : 0;</div><div class='del'>-    setWord1(&amp;d, w &lt;&lt; k + 16 | y &lt;&lt; k);</div><div class='del'>-#endif</div><div class='del'>- ret_d:</div><div class='del'>-    return d;</div><div class='del'>-}</div><div class='add'>+    The first item in the list is the most preferred one.</div><div class='ctx'> </div><div class='del'>-static Bigint *d2b(double d, int *e, int *bits)</div><div class='add'>+    \sa QTranslator, bcp47Name()</div><div class='add'>+*/</div><div class='add'>+QStringList QLocale::uiLanguages() const</div><div class='ctx'> {</div><div class='del'>-    Bigint *b;</div><div class='del'>-    int de, i, k;</div><div class='del'>-    ULong *x, y, z;</div><div class='del'>-</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-    b = Balloc(1);</div><div class='del'>-#else</div><div class='del'>-    b = Balloc(2);</div><div class='del'>-#endif</div><div class='del'>-    x = b-&gt;x;</div><div class='del'>-</div><div class='del'>-    z = getWord0(d) &amp; Frac_mask;</div><div class='del'>-    setWord0(&amp;d, getWord0(d) &amp; 0x7fffffff);        /* clear sign bit, which we ignore */</div><div class='del'>-#ifdef Sudden_Underflow</div><div class='del'>-    de = (int)(getWord0(d) &gt;&gt; Exp_shift);</div><div class='del'>-#ifndef IBM</div><div class='del'>-    z |= Exp_msk11;</div><div class='del'>-#endif</div><div class='del'>-#else</div><div class='del'>-    if ((de = int(getWord0(d) &gt;&gt; Exp_shift)) != 0)</div><div class='del'>-        z |= Exp_msk1;</div><div class='del'>-#endif</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-    if ((y = getWord1(d)) != 0) {</div><div class='del'>-        if ((k = lo0bits(&amp;y)) != 0) {</div><div class='del'>-            x[0] = y | z &lt;&lt; (32 - k);</div><div class='del'>-            z &gt;&gt;= k;</div><div class='del'>-        }</div><div class='del'>-        else</div><div class='del'>-            x[0] = y;</div><div class='del'>-        i = b-&gt;wds = (x[1] = z) ? 2 : 1;</div><div class='del'>-    }</div><div class='del'>-    else {</div><div class='del'>-#ifdef BSD_QDTOA_DEBUG</div><div class='del'>-        if (!z)</div><div class='del'>-            Bug("Zero passed to d2b");</div><div class='del'>-#endif</div><div class='del'>-        k = lo0bits(&amp;z);</div><div class='del'>-        x[0] = z;</div><div class='del'>-        i = b-&gt;wds = 1;</div><div class='del'>-        k += 32;</div><div class='del'>-    }</div><div class='del'>-#else</div><div class='del'>-    if (y = getWord1(d)) {</div><div class='del'>-        if (k = lo0bits(&amp;y))</div><div class='del'>-            if (k &gt;= 16) {</div><div class='del'>-                x[0] = y | z &lt;&lt; 32 - k &amp; 0xffff;</div><div class='del'>-                x[1] = z &gt;&gt; k - 16 &amp; 0xffff;</div><div class='del'>-                x[2] = z &gt;&gt; k;</div><div class='del'>-                i = 2;</div><div class='del'>-            }</div><div class='del'>-            else {</div><div class='del'>-                x[0] = y &amp; 0xffff;</div><div class='del'>-                x[1] = y &gt;&gt; 16 | z &lt;&lt; 16 - k &amp; 0xffff;</div><div class='del'>-                x[2] = z &gt;&gt; k &amp; 0xffff;</div><div class='del'>-                x[3] = z &gt;&gt; k+16;</div><div class='del'>-                i = 3;</div><div class='del'>-            }</div><div class='del'>-        else {</div><div class='del'>-            x[0] = y &amp; 0xffff;</div><div class='del'>-            x[1] = y &gt;&gt; 16;</div><div class='del'>-            x[2] = z &amp; 0xffff;</div><div class='del'>-            x[3] = z &gt;&gt; 16;</div><div class='del'>-            i = 3;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    else {</div><div class='del'>-#ifdef BSD_QDTOA_DEBUG</div><div class='del'>-        if (!z)</div><div class='del'>-            Bug("Zero passed to d2b");</div><div class='del'>-#endif</div><div class='del'>-        k = lo0bits(&amp;z);</div><div class='del'>-        if (k &gt;= 16) {</div><div class='del'>-            x[0] = z;</div><div class='del'>-            i = 0;</div><div class='del'>-        }</div><div class='del'>-        else {</div><div class='del'>-            x[0] = z &amp; 0xffff;</div><div class='del'>-            x[1] = z &gt;&gt; 16;</div><div class='del'>-            i = 1;</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+    if (d() == systemPrivate()) {</div><div class='add'>+        QVariant res = systemLocale()-&gt;query(QSystemLocale::UILanguages, QVariant());</div><div class='add'>+        if (!res.isNull()) {</div><div class='add'>+            QStringList result = res.toStringList();</div><div class='add'>+            if (!result.isEmpty())</div><div class='add'>+                return result;</div><div class='ctx'>         }</div><div class='del'>-        k += 32;</div><div class='del'>-    }</div><div class='del'>-    while(!x[i])</div><div class='del'>-        --i;</div><div class='del'>-    b-&gt;wds = i + 1;</div><div class='del'>-#endif</div><div class='del'>-#ifndef Sudden_Underflow</div><div class='del'>-    if (de) {</div><div class='del'>-#endif</div><div class='del'>-#ifdef IBM</div><div class='del'>-        *e = (de - Bias - (P-1) &lt;&lt; 2) + k;</div><div class='del'>-        *bits = 4*P + 8 - k - hi0bits(getWord0(d) &amp; Frac_mask);</div><div class='del'>-#else</div><div class='del'>-        *e = de - Bias - (P-1) + k;</div><div class='del'>-        *bits = P - k;</div><div class='del'>-#endif</div><div class='del'>-#ifndef Sudden_Underflow</div><div class='del'>-    }</div><div class='del'>-    else {</div><div class='del'>-        *e = de - Bias - (P-1) + 1 + k;</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-        *bits = 32*i - hi0bits(x[i-1]);</div><div class='del'>-#else</div><div class='del'>-        *bits = (i+2)*16 - hi0bits(x[i]);</div><div class='del'>-#endif</div><div class='del'>-    }</div><div class='del'>-#endif</div><div class='del'>-    return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static double ratio(Bigint *a, Bigint *b)</div><div class='del'>-{</div><div class='del'>-    double da, db;</div><div class='del'>-    int k, ka, kb;</div><div class='del'>-</div><div class='del'>-    da = b2d(a, &amp;ka);</div><div class='del'>-    db = b2d(b, &amp;kb);</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-    k = ka - kb + 32*(a-&gt;wds - b-&gt;wds);</div><div class='del'>-#else</div><div class='del'>-    k = ka - kb + 16*(a-&gt;wds - b-&gt;wds);</div><div class='del'>-#endif</div><div class='del'>-#ifdef IBM</div><div class='del'>-    if (k &gt; 0) {</div><div class='del'>-        setWord0(&amp;da, getWord0(da) + (k &gt;&gt; 2)*Exp_msk1);</div><div class='del'>-        if (k &amp;= 3)</div><div class='del'>-            da *= 1 &lt;&lt; k;</div><div class='del'>-    }</div><div class='del'>-    else {</div><div class='del'>-        k = -k;</div><div class='del'>-        setWord0(&amp;db, getWord0(db) + (k &gt;&gt; 2)*Exp_msk1);</div><div class='del'>-        if (k &amp;= 3)</div><div class='del'>-            db *= 1 &lt;&lt; k;</div><div class='del'>-    }</div><div class='del'>-#else</div><div class='del'>-    if (k &gt; 0)</div><div class='del'>-        setWord0(&amp;da, getWord0(da) + k*Exp_msk1);</div><div class='del'>-    else {</div><div class='del'>-        k = -k;</div><div class='del'>-        setWord0(&amp;db, getWord0(db) + k*Exp_msk1);</div><div class='ctx'>     }</div><div class='ctx'> #endif</div><div class='del'>-    return da / db;</div><div class='add'>+    return QStringList(bcp47Name());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const double tens[] = {</div><div class='del'>-    1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9,</div><div class='del'>-    1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19,</div><div class='del'>-    1e20, 1e21, 1e22</div><div class='del'>-#ifdef VAX</div><div class='del'>-    , 1e23, 1e24</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef IEEE_Arith</div><div class='del'>-static const double bigtens[] = { 1e16, 1e32, 1e64, 1e128, 1e256 };</div><div class='del'>-static const double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128, 1e-256 };</div><div class='del'>-#define n_bigtens 5</div><div class='del'>-#else</div><div class='del'>-#ifdef IBM</div><div class='del'>-static const double bigtens[] = { 1e16, 1e32, 1e64 };</div><div class='del'>-static const double tinytens[] = { 1e-16, 1e-32, 1e-64 };</div><div class='del'>-#define n_bigtens 3</div><div class='del'>-#else</div><div class='del'>-static const double bigtens[] = { 1e16, 1e32 };</div><div class='del'>-static const double tinytens[] = { 1e-16, 1e-32 };</div><div class='del'>-#define n_bigtens 2</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>-  The pre-release gcc3.3 shipped with SuSE 8.2 has a bug which causes</div><div class='del'>-  the comparison 1e-100 == 0.0 to return true. As a workaround, we</div><div class='del'>-  compare it to a global variable containing 0.0, which produces</div><div class='del'>-  correct assembler output.</div><div class='add'>+    Returns a native name of the language for the locale. For example</div><div class='add'>+    "Schwiizertüütsch" for Swiss-German locale.</div><div class='ctx'> </div><div class='del'>-  ### consider detecting the broken compilers and using the static</div><div class='del'>-  ### double for these, and use a #define for all working compilers</div><div class='add'>+    \sa nativeCountryName(), languageToString()</div><div class='ctx'> */</div><div class='del'>-static double g_double_zero = 0.0;</div><div class='del'>-</div><div class='del'>-Q_CORE_EXPORT double qstrtod(const char *s00, const char **se, bool *ok)</div><div class='del'>-{</div><div class='del'>-    int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,</div><div class='del'>-        e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;</div><div class='del'>-    const char *s, *s0, *s1;</div><div class='del'>-    double aadj, aadj1, adj, rv, rv0;</div><div class='del'>-    Long L;</div><div class='del'>-    ULong y, z;</div><div class='del'>-    Bigint *bb1, *bd0;</div><div class='del'>-    Bigint *bb = NULL, *bd = NULL, *bs = NULL, *delta = NULL;/* pacify gcc */</div><div class='del'>-</div><div class='del'>-    /*</div><div class='del'>-      #ifndef KR_headers</div><div class='del'>-      const char decimal_point = localeconv()-&gt;decimal_point[0];</div><div class='del'>-      #else</div><div class='del'>-      const char decimal_point = '.';</div><div class='del'>-      #endif */</div><div class='del'>-    if (ok != 0)</div><div class='del'>-        *ok = true;</div><div class='del'>-</div><div class='del'>-    const char decimal_point = '.';</div><div class='del'>-</div><div class='del'>-    sign = nz0 = nz = 0;</div><div class='del'>-    rv = 0.;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    for(s = s00; isspace(uchar(*s)); s++)</div><div class='del'>-        ;</div><div class='del'>-</div><div class='del'>-    if (*s == '-') {</div><div class='del'>-        sign = 1;</div><div class='del'>-        s++;</div><div class='del'>-    } else if (*s == '+') {</div><div class='del'>-        s++;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (*s == '\0') {</div><div class='del'>-        s = s00;</div><div class='del'>-        goto ret;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (*s == '0') {</div><div class='del'>-        nz0 = 1;</div><div class='del'>-        while(*++s == '0') ;</div><div class='del'>-        if (!*s)</div><div class='del'>-            goto ret;</div><div class='del'>-    }</div><div class='del'>-    s0 = s;</div><div class='del'>-    y = z = 0;</div><div class='del'>-    for(nd = nf = 0; (c = *s) &gt;= '0' &amp;&amp; c &lt;= '9'; nd++, s++)</div><div class='del'>-        if (nd &lt; 9)</div><div class='del'>-            y = 10*y + c - '0';</div><div class='del'>-        else if (nd &lt; 16)</div><div class='del'>-            z = 10*z + c - '0';</div><div class='del'>-    nd0 = nd;</div><div class='del'>-    if (c == decimal_point) {</div><div class='del'>-        c = *++s;</div><div class='del'>-        if (!nd) {</div><div class='del'>-            for(; c == '0'; c = *++s)</div><div class='del'>-                nz++;</div><div class='del'>-            if (c &gt; '0' &amp;&amp; c &lt;= '9') {</div><div class='del'>-                s0 = s;</div><div class='del'>-                nf += nz;</div><div class='del'>-                nz = 0;</div><div class='del'>-                goto have_dig;</div><div class='del'>-            }</div><div class='del'>-            goto dig_done;</div><div class='del'>-        }</div><div class='del'>-        for(; c &gt;= '0' &amp;&amp; c &lt;= '9'; c = *++s) {</div><div class='del'>-        have_dig:</div><div class='del'>-            nz++;</div><div class='del'>-            if (c -= '0') {</div><div class='del'>-                nf += nz;</div><div class='del'>-                for(i = 1; i &lt; nz; i++)</div><div class='del'>-                    if (nd++ &lt; 9)</div><div class='del'>-                        y *= 10;</div><div class='del'>-                    else if (nd &lt;= DBL_DIG + 1)</div><div class='del'>-                        z *= 10;</div><div class='del'>-                if (nd++ &lt; 9)</div><div class='del'>-                    y = 10*y + c;</div><div class='del'>-                else if (nd &lt;= DBL_DIG + 1)</div><div class='del'>-                    z = 10*z + c;</div><div class='del'>-                nz = 0;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>- dig_done:</div><div class='del'>-    e = 0;</div><div class='del'>-    if (c == 'e' || c == 'E') {</div><div class='del'>-        if (!nd &amp;&amp; !nz &amp;&amp; !nz0) {</div><div class='del'>-            s = s00;</div><div class='del'>-            goto ret;</div><div class='del'>-        }</div><div class='del'>-        s00 = s;</div><div class='del'>-        esign = 0;</div><div class='del'>-        switch(c = *++s) {</div><div class='del'>-        case '-':</div><div class='del'>-            esign = 1;</div><div class='del'>-        case '+':</div><div class='del'>-            c = *++s;</div><div class='del'>-        }</div><div class='del'>-        if (c &gt;= '0' &amp;&amp; c &lt;= '9') {</div><div class='del'>-            while(c == '0')</div><div class='del'>-                c = *++s;</div><div class='del'>-            if (c &gt; '0' &amp;&amp; c &lt;= '9') {</div><div class='del'>-                L = c - '0';</div><div class='del'>-                s1 = s;</div><div class='del'>-                while((c = *++s) &gt;= '0' &amp;&amp; c &lt;= '9')</div><div class='del'>-                    L = 10*L + c - '0';</div><div class='del'>-                if (s - s1 &gt; 8 || L &gt; 19999)</div><div class='del'>-                    /* Avoid confusion from exponents</div><div class='del'>-                     * so large that e might overflow.</div><div class='del'>-                     */</div><div class='del'>-                    e = 19999; /* safe for 16 bit ints */</div><div class='del'>-                else</div><div class='del'>-                    e = int(L);</div><div class='del'>-                if (esign)</div><div class='del'>-                    e = -e;</div><div class='del'>-            }</div><div class='del'>-            else</div><div class='del'>-                e = 0;</div><div class='del'>-        }</div><div class='del'>-        else</div><div class='del'>-            s = s00;</div><div class='del'>-    }</div><div class='del'>-    if (!nd) {</div><div class='del'>-        if (!nz &amp;&amp; !nz0)</div><div class='del'>-            s = s00;</div><div class='del'>-        goto ret;</div><div class='del'>-    }</div><div class='del'>-    e1 = e -= nf;</div><div class='del'>-</div><div class='del'>-    /* Now we have nd0 digits, starting at s0, followed by a</div><div class='del'>-     * decimal point, followed by nd-nd0 digits.  The number we're</div><div class='del'>-     * after is the integer represented by those digits times</div><div class='del'>-     * 10**e */</div><div class='del'>-</div><div class='del'>-    if (!nd0)</div><div class='del'>-        nd0 = nd;</div><div class='del'>-    k = nd &lt; DBL_DIG + 1 ? nd : DBL_DIG + 1;</div><div class='del'>-    rv = y;</div><div class='del'>-    if (k &gt; 9)</div><div class='del'>-#if defined(Q_OS_IRIX) &amp;&amp; defined(Q_CC_GNU)</div><div class='del'>-    {</div><div class='del'>-        // work around a bug on 64 bit IRIX gcc</div><div class='del'>-        double *t = (double *) tens;</div><div class='del'>-        rv = t[k - 9] * rv + z;</div><div class='del'>-    }</div><div class='del'>-#else</div><div class='del'>-    rv = tens[k - 9] * rv + z;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-    bd0 = 0;</div><div class='del'>-    if (nd &lt;= DBL_DIG</div><div class='del'>-#ifndef RND_PRODQUOT</div><div class='del'>-        &amp;&amp; FLT_ROUNDS == 1</div><div class='del'>-#endif</div><div class='del'>-        ) {</div><div class='del'>-        if (!e)</div><div class='del'>-            goto ret;</div><div class='del'>-        if (e &gt; 0) {</div><div class='del'>-            if (e &lt;= Ten_pmax) {</div><div class='del'>-#ifdef VAX</div><div class='del'>-                goto vax_ovfl_check;</div><div class='del'>-#else</div><div class='del'>-                /* rv = */ rounded_product(rv, tens[e]);</div><div class='del'>-                goto ret;</div><div class='del'>-#endif</div><div class='del'>-            }</div><div class='del'>-            i = DBL_DIG - nd;</div><div class='del'>-            if (e &lt;= Ten_pmax + i) {</div><div class='del'>-                /* A fancier test would sometimes let us do</div><div class='del'>-                 * this for larger i values.</div><div class='del'>-                 */</div><div class='del'>-                e -= i;</div><div class='del'>-                rv *= tens[i];</div><div class='del'>-#ifdef VAX</div><div class='del'>-                /* VAX exponent range is so narrow we must</div><div class='del'>-                 * worry about overflow here...</div><div class='del'>-                 */</div><div class='del'>-            vax_ovfl_check:</div><div class='del'>-                setWord0(&amp;rv, getWord0(rv) - P*Exp_msk1);</div><div class='del'>-                /* rv = */ rounded_product(rv, tens[e]);</div><div class='del'>-                if ((getWord0(rv) &amp; Exp_mask)</div><div class='del'>-                    &gt; Exp_msk1*(DBL_MAX_EXP+Bias-1-P))</div><div class='del'>-                    goto ovfl;</div><div class='del'>-                setWord0(&amp;rv, getWord0(rv) + P*Exp_msk1);</div><div class='del'>-#else</div><div class='del'>-                /* rv = */ rounded_product(rv, tens[e]);</div><div class='del'>-#endif</div><div class='del'>-                goto ret;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-#ifndef Inaccurate_Divide</div><div class='del'>-        else if (e &gt;= -Ten_pmax) {</div><div class='del'>-            /* rv = */ rounded_quotient(rv, tens[-e]);</div><div class='del'>-            goto ret;</div><div class='del'>-        }</div><div class='del'>-#endif</div><div class='del'>-    }</div><div class='del'>-    e1 += nd - k;</div><div class='del'>-</div><div class='del'>-    /* Get starting approximation = rv * 10**e1 */</div><div class='del'>-</div><div class='del'>-    if (e1 &gt; 0) {</div><div class='del'>-        if ((i = e1 &amp; 15) != 0)</div><div class='del'>-            rv *= tens[i];</div><div class='del'>-        if (e1 &amp;= ~15) {</div><div class='del'>-            if (e1 &gt; DBL_MAX_10_EXP) {</div><div class='del'>-            ovfl:</div><div class='del'>-                //                                errno = ERANGE;</div><div class='del'>-                if (ok != 0)</div><div class='del'>-                    *ok = false;</div><div class='del'>-#ifdef __STDC__</div><div class='del'>-                rv = HUGE_VAL;</div><div class='del'>-#else</div><div class='del'>-                /* Can't trust HUGE_VAL */</div><div class='del'>-#ifdef IEEE_Arith</div><div class='del'>-                setWord0(&amp;rv, Exp_mask);</div><div class='del'>-                setWord1(&amp;rv, 0);</div><div class='del'>-#else</div><div class='del'>-                setWord0(&amp;rv, Big0);</div><div class='del'>-                setWord1(&amp;rv, Big1);</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-                if (bd0)</div><div class='del'>-                    goto retfree;</div><div class='del'>-                goto ret;</div><div class='del'>-            }</div><div class='del'>-            if (e1 &gt;&gt;= 4) {</div><div class='del'>-                for(j = 0; e1 &gt; 1; j++, e1 &gt;&gt;= 1)</div><div class='del'>-                    if (e1 &amp; 1)</div><div class='del'>-                        rv *= bigtens[j];</div><div class='del'>-                /* The last multiplication could overflow. */</div><div class='del'>-                setWord0(&amp;rv, getWord0(rv) - P*Exp_msk1);</div><div class='del'>-                rv *= bigtens[j];</div><div class='del'>-                if ((z = getWord0(rv) &amp; Exp_mask)</div><div class='del'>-                    &gt; Exp_msk1*(DBL_MAX_EXP+Bias-P))</div><div class='del'>-                    goto ovfl;</div><div class='del'>-                if (z &gt; Exp_msk1*(DBL_MAX_EXP+Bias-1-P)) {</div><div class='del'>-                    /* set to largest number */</div><div class='del'>-                    /* (Can't trust DBL_MAX) */</div><div class='del'>-                    setWord0(&amp;rv, Big0);</div><div class='del'>-                    setWord1(&amp;rv, Big1);</div><div class='del'>-                }</div><div class='del'>-                else</div><div class='del'>-                    setWord0(&amp;rv, getWord0(rv) + P*Exp_msk1);</div><div class='del'>-            }</div><div class='del'>-</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    else if (e1 &lt; 0) {</div><div class='del'>-        e1 = -e1;</div><div class='del'>-        if ((i = e1 &amp; 15) != 0)</div><div class='del'>-            rv /= tens[i];</div><div class='del'>-        if (e1 &amp;= ~15) {</div><div class='del'>-            e1 &gt;&gt;= 4;</div><div class='del'>-            if (e1 &gt;= 1 &lt;&lt; n_bigtens)</div><div class='del'>-                goto undfl;</div><div class='del'>-            for(j = 0; e1 &gt; 1; j++, e1 &gt;&gt;= 1)</div><div class='del'>-                if (e1 &amp; 1)</div><div class='del'>-                    rv *= tinytens[j];</div><div class='del'>-            /* The last multiplication could underflow. */</div><div class='del'>-            rv0 = rv;</div><div class='del'>-            rv *= tinytens[j];</div><div class='del'>-            if (rv == g_double_zero)</div><div class='del'>-                {</div><div class='del'>-                    rv = 2.*rv0;</div><div class='del'>-                    rv *= tinytens[j];</div><div class='del'>-                    if (rv == g_double_zero)</div><div class='del'>-                        {</div><div class='del'>-                        undfl:</div><div class='del'>-                            rv = 0.;</div><div class='del'>-                            //                                        errno = ERANGE;</div><div class='del'>-                            if (ok != 0)</div><div class='del'>-                                *ok = false;</div><div class='del'>-                            if (bd0)</div><div class='del'>-                                goto retfree;</div><div class='del'>-                            goto ret;</div><div class='del'>-                        }</div><div class='del'>-                    setWord0(&amp;rv, Tiny0);</div><div class='del'>-                    setWord1(&amp;rv, Tiny1);</div><div class='del'>-                    /* The refinement below will clean</div><div class='del'>-                     * this approximation up.</div><div class='del'>-                     */</div><div class='del'>-                }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* Now the hard part -- adjusting rv to the correct value.*/</div><div class='del'>-</div><div class='del'>-    /* Put digits into bd: true value = bd * 10^e */</div><div class='del'>-</div><div class='del'>-    bd0 = s2b(s0, nd0, nd, y);</div><div class='del'>-</div><div class='del'>-    for(;;) {</div><div class='del'>-        bd = Balloc(bd0-&gt;k);</div><div class='del'>-        Bcopy(bd, bd0);</div><div class='del'>-        bb = d2b(rv, &amp;bbe, &amp;bbbits);        /* rv = bb * 2^bbe */</div><div class='del'>-        bs = i2b(1);</div><div class='del'>-</div><div class='del'>-        if (e &gt;= 0) {</div><div class='del'>-            bb2 = bb5 = 0;</div><div class='del'>-            bd2 = bd5 = e;</div><div class='del'>-        }</div><div class='del'>-        else {</div><div class='del'>-            bb2 = bb5 = -e;</div><div class='del'>-            bd2 = bd5 = 0;</div><div class='del'>-        }</div><div class='del'>-        if (bbe &gt;= 0)</div><div class='del'>-            bb2 += bbe;</div><div class='del'>-        else</div><div class='del'>-            bd2 -= bbe;</div><div class='del'>-        bs2 = bb2;</div><div class='del'>-#ifdef Sudden_Underflow</div><div class='del'>-#ifdef IBM</div><div class='del'>-        j = 1 + 4*P - 3 - bbbits + ((bbe + bbbits - 1) &amp; 3);</div><div class='del'>-#else</div><div class='del'>-        j = P + 1 - bbbits;</div><div class='del'>-#endif</div><div class='del'>-#else</div><div class='del'>-        i = bbe + bbbits - 1;        /* logb(rv) */</div><div class='del'>-        if (i &lt; Emin)        /* denormal */</div><div class='del'>-            j = bbe + (P-Emin);</div><div class='del'>-        else</div><div class='del'>-            j = P + 1 - bbbits;</div><div class='del'>-#endif</div><div class='del'>-        bb2 += j;</div><div class='del'>-        bd2 += j;</div><div class='del'>-        i = bb2 &lt; bd2 ? bb2 : bd2;</div><div class='del'>-        if (i &gt; bs2)</div><div class='del'>-            i = bs2;</div><div class='del'>-        if (i &gt; 0) {</div><div class='del'>-            bb2 -= i;</div><div class='del'>-            bd2 -= i;</div><div class='del'>-            bs2 -= i;</div><div class='del'>-        }</div><div class='del'>-        if (bb5 &gt; 0) {</div><div class='del'>-            bs = pow5mult(bs, bb5);</div><div class='del'>-            bb1 = mult(bs, bb);</div><div class='del'>-            Bfree(bb);</div><div class='del'>-            bb = bb1;</div><div class='del'>-        }</div><div class='del'>-        if (bb2 &gt; 0)</div><div class='del'>-            bb = lshift(bb, bb2);</div><div class='del'>-        if (bd5 &gt; 0)</div><div class='del'>-            bd = pow5mult(bd, bd5);</div><div class='del'>-        if (bd2 &gt; 0)</div><div class='del'>-            bd = lshift(bd, bd2);</div><div class='del'>-        if (bs2 &gt; 0)</div><div class='del'>-            bs = lshift(bs, bs2);</div><div class='del'>-        delta = diff(bb, bd);</div><div class='del'>-        dsign = delta-&gt;sign;</div><div class='del'>-        delta-&gt;sign = 0;</div><div class='del'>-        i = cmp(delta, bs);</div><div class='del'>-        if (i &lt; 0) {</div><div class='del'>-            /* Error is less than half an ulp -- check for</div><div class='del'>-             * special case of mantissa a power of two.</div><div class='del'>-             */</div><div class='del'>-            if (dsign || getWord1(rv) || getWord0(rv) &amp; Bndry_mask)</div><div class='del'>-                break;</div><div class='del'>-            delta = lshift(delta,Log2P);</div><div class='del'>-            if (cmp(delta, bs) &gt; 0)</div><div class='del'>-                goto drop_down;</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        if (i == 0) {</div><div class='del'>-            /* exactly half-way between */</div><div class='del'>-            if (dsign) {</div><div class='del'>-                if ((getWord0(rv) &amp; Bndry_mask1) == Bndry_mask1</div><div class='del'>-                    &amp;&amp;  getWord1(rv) == 0xffffffff) {</div><div class='del'>-                    /*boundary case -- increment exponent*/</div><div class='del'>-                    setWord0(&amp;rv, (getWord0(rv) &amp; Exp_mask)</div><div class='del'>-                                + Exp_msk1</div><div class='del'>-#ifdef IBM</div><div class='del'>-                                | Exp_msk1 &gt;&gt; 4</div><div class='del'>-#endif</div><div class='del'>-                                );</div><div class='del'>-                    setWord1(&amp;rv, 0);</div><div class='del'>-                    break;</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-            else if (!(getWord0(rv) &amp; Bndry_mask) &amp;&amp; !getWord1(rv)) {</div><div class='del'>-            drop_down:</div><div class='del'>-                /* boundary case -- decrement exponent */</div><div class='del'>-#ifdef Sudden_Underflow</div><div class='del'>-                L = getWord0(rv) &amp; Exp_mask;</div><div class='del'>-#ifdef IBM</div><div class='del'>-                if (L &lt;  Exp_msk1)</div><div class='del'>-#else</div><div class='del'>-                    if (L &lt;= Exp_msk1)</div><div class='del'>-#endif</div><div class='del'>-                        goto undfl;</div><div class='del'>-                L -= Exp_msk1;</div><div class='del'>-#else</div><div class='del'>-                L = (getWord0(rv) &amp; Exp_mask) - Exp_msk1;</div><div class='del'>-#endif</div><div class='del'>-                setWord0(&amp;rv, L | Bndry_mask1);</div><div class='del'>-                setWord1(&amp;rv, 0xffffffff);</div><div class='del'>-#ifdef IBM</div><div class='del'>-                goto cont;</div><div class='del'>-#else</div><div class='del'>-                break;</div><div class='del'>-#endif</div><div class='del'>-            }</div><div class='del'>-#ifndef ROUND_BIASED</div><div class='del'>-            if (!(getWord1(rv) &amp; LSB))</div><div class='del'>-                break;</div><div class='del'>-#endif</div><div class='del'>-            if (dsign)</div><div class='del'>-                rv += ulp(rv);</div><div class='del'>-#ifndef ROUND_BIASED</div><div class='del'>-            else {</div><div class='del'>-                rv -= ulp(rv);</div><div class='del'>-#ifndef Sudden_Underflow</div><div class='del'>-                if (rv == g_double_zero)</div><div class='del'>-                    goto undfl;</div><div class='del'>-#endif</div><div class='del'>-            }</div><div class='del'>-#endif</div><div class='del'>-            break;</div><div class='del'>-        }</div><div class='del'>-        if ((aadj = ratio(delta, bs)) &lt;= 2.) {</div><div class='del'>-            if (dsign)</div><div class='del'>-                aadj = aadj1 = 1.;</div><div class='del'>-            else if (getWord1(rv) || getWord0(rv) &amp; Bndry_mask) {</div><div class='del'>-#ifndef Sudden_Underflow</div><div class='del'>-                if (getWord1(rv) == Tiny1 &amp;&amp; !getWord0(rv))</div><div class='del'>-                    goto undfl;</div><div class='del'>-#endif</div><div class='del'>-                aadj = 1.;</div><div class='del'>-                aadj1 = -1.;</div><div class='del'>-            }</div><div class='del'>-            else {</div><div class='del'>-                /* special case -- power of FLT_RADIX to be */</div><div class='del'>-                /* rounded down... */</div><div class='del'>-</div><div class='del'>-                if (aadj &lt; 2./FLT_RADIX)</div><div class='del'>-                    aadj = 1./FLT_RADIX;</div><div class='del'>-                else</div><div class='del'>-                    aadj *= 0.5;</div><div class='del'>-                aadj1 = -aadj;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        else {</div><div class='del'>-            aadj *= 0.5;</div><div class='del'>-            aadj1 = dsign ? aadj : -aadj;</div><div class='del'>-#ifdef Check_FLT_ROUNDS</div><div class='del'>-            switch(FLT_ROUNDS) {</div><div class='del'>-            case 2: /* towards +infinity */</div><div class='del'>-                aadj1 -= 0.5;</div><div class='del'>-                break;</div><div class='del'>-            case 0: /* towards 0 */</div><div class='del'>-            case 3: /* towards -infinity */</div><div class='del'>-                aadj1 += 0.5;</div><div class='del'>-            }</div><div class='del'>-#else</div><div class='del'>-            if (FLT_ROUNDS == 0)</div><div class='del'>-                aadj1 += 0.5;</div><div class='del'>-#endif</div><div class='del'>-        }</div><div class='del'>-        y = getWord0(rv) &amp; Exp_mask;</div><div class='del'>-</div><div class='del'>-        /* Check for overflow */</div><div class='del'>-</div><div class='del'>-        if (y == Exp_msk1*(DBL_MAX_EXP+Bias-1)) {</div><div class='del'>-            rv0 = rv;</div><div class='del'>-            setWord0(&amp;rv, getWord0(rv) - P*Exp_msk1);</div><div class='del'>-            adj = aadj1 * ulp(rv);</div><div class='del'>-            rv += adj;</div><div class='del'>-            if ((getWord0(rv) &amp; Exp_mask) &gt;=</div><div class='del'>-                Exp_msk1*(DBL_MAX_EXP+Bias-P)) {</div><div class='del'>-                if (getWord0(rv0) == Big0 &amp;&amp; getWord1(rv0) == Big1)</div><div class='del'>-                    goto ovfl;</div><div class='del'>-                setWord0(&amp;rv, Big0);</div><div class='del'>-                setWord1(&amp;rv, Big1);</div><div class='del'>-                goto cont;</div><div class='del'>-            }</div><div class='del'>-            else</div><div class='del'>-                setWord0(&amp;rv, getWord0(rv) + P*Exp_msk1);</div><div class='del'>-        }</div><div class='del'>-        else {</div><div class='del'>-#ifdef Sudden_Underflow</div><div class='del'>-            if ((getWord0(rv) &amp; Exp_mask) &lt;= P*Exp_msk1) {</div><div class='del'>-                rv0 = rv;</div><div class='del'>-                setWord0(&amp;rv, getWord0(rv) + P*Exp_msk1);</div><div class='del'>-                adj = aadj1 * ulp(rv);</div><div class='del'>-                rv += adj;</div><div class='del'>-#ifdef IBM</div><div class='del'>-                if ((getWord0(rv) &amp; Exp_mask) &lt;  P*Exp_msk1)</div><div class='del'>-#else</div><div class='del'>-                    if ((getWord0(rv) &amp; Exp_mask) &lt;= P*Exp_msk1)</div><div class='del'>-#endif</div><div class='del'>-                        {</div><div class='del'>-                            if (getWord0(rv0) == Tiny0</div><div class='del'>-                                &amp;&amp; getWord1(rv0) == Tiny1)</div><div class='del'>-                                goto undfl;</div><div class='del'>-                            setWord0(&amp;rv, Tiny0);</div><div class='del'>-                            setWord1(&amp;rv, Tiny1);</div><div class='del'>-                            goto cont;</div><div class='del'>-                        }</div><div class='del'>-                    else</div><div class='del'>-                        setWord0(&amp;rv, getWord0(rv) - P*Exp_msk1);</div><div class='del'>-            }</div><div class='del'>-            else {</div><div class='del'>-                adj = aadj1 * ulp(rv);</div><div class='del'>-                rv += adj;</div><div class='del'>-            }</div><div class='del'>-#else</div><div class='del'>-            /* Compute adj so that the IEEE rounding rules will</div><div class='del'>-             * correctly round rv + adj in some half-way cases.</div><div class='del'>-             * If rv * ulp(rv) is denormalized (i.e.,</div><div class='del'>-             * y &lt;= (P-1)*Exp_msk1), we must adjust aadj to avoid</div><div class='del'>-             * trouble from bits lost to denormalization;</div><div class='del'>-             * example: 1.2e-307 .</div><div class='del'>-             */</div><div class='del'>-            if (y &lt;= (P-1)*Exp_msk1 &amp;&amp; aadj &gt;= 1.) {</div><div class='del'>-                aadj1 = int(aadj + 0.5);</div><div class='del'>-                if (!dsign)</div><div class='del'>-                    aadj1 = -aadj1;</div><div class='del'>-            }</div><div class='del'>-            adj = aadj1 * ulp(rv);</div><div class='del'>-            rv += adj;</div><div class='del'>-#endif</div><div class='del'>-        }</div><div class='del'>-        z = getWord0(rv) &amp; Exp_mask;</div><div class='del'>-        if (y == z) {</div><div class='del'>-            /* Can we stop now? */</div><div class='del'>-            L = Long(aadj);</div><div class='del'>-            aadj -= L;</div><div class='del'>-            /* The tolerances below are conservative. */</div><div class='del'>-            if (dsign || getWord1(rv) || getWord0(rv) &amp; Bndry_mask) {</div><div class='del'>-                if (aadj &lt; .4999999 || aadj &gt; .5000001)</div><div class='del'>-                    break;</div><div class='del'>-            }</div><div class='del'>-            else if (aadj &lt; .4999999/FLT_RADIX)</div><div class='del'>-                break;</div><div class='del'>-        }</div><div class='del'>-    cont:</div><div class='del'>-        Bfree(bb);</div><div class='del'>-        Bfree(bd);</div><div class='del'>-        Bfree(bs);</div><div class='del'>-        Bfree(delta);</div><div class='del'>-    }</div><div class='del'>- retfree:</div><div class='del'>-    Bfree(bb);</div><div class='del'>-    Bfree(bd);</div><div class='del'>-    Bfree(bs);</div><div class='del'>-    Bfree(bd0);</div><div class='del'>-    Bfree(delta);</div><div class='del'>- ret:</div><div class='del'>-    if (se)</div><div class='del'>-        *se = s;</div><div class='del'>-    return sign ? -rv : rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int quorem(Bigint *b, Bigint *S)</div><div class='add'>+QString QLocale::nativeLanguageName() const</div><div class='ctx'> {</div><div class='del'>-    int n;</div><div class='del'>-    Long borrow, y;</div><div class='del'>-    ULong carry, q, ys;</div><div class='del'>-    ULong *bx, *bxe, *sx, *sxe;</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-    Long z;</div><div class='del'>-    ULong si, zs;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-    n = S-&gt;wds;</div><div class='del'>-#ifdef BSD_QDTOA_DEBUG</div><div class='del'>-    /*debug*/ if (b-&gt;wds &gt; n)</div><div class='del'>-        /*debug*/        Bug("oversize b in quorem");</div><div class='del'>-#endif</div><div class='del'>-    if (b-&gt;wds &lt; n)</div><div class='del'>-        return 0;</div><div class='del'>-    sx = S-&gt;x;</div><div class='del'>-    sxe = sx + --n;</div><div class='del'>-    bx = b-&gt;x;</div><div class='del'>-    bxe = bx + n;</div><div class='del'>-    q = *bxe / (*sxe + 1);        /* ensure q &lt;= true quotient */</div><div class='del'>-#ifdef BSD_QDTOA_DEBUG</div><div class='del'>-    /*debug*/ if (q &gt; 9)</div><div class='del'>-        /*debug*/        Bug("oversized quotient in quorem");</div><div class='del'>-#endif</div><div class='del'>-    if (q) {</div><div class='del'>-        borrow = 0;</div><div class='del'>-        carry = 0;</div><div class='del'>-        do {</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-            si = *sx++;</div><div class='del'>-            ys = (si &amp; 0xffff) * q + carry;</div><div class='del'>-            zs = (si &gt;&gt; 16) * q + (ys &gt;&gt; 16);</div><div class='del'>-            carry = zs &gt;&gt; 16;</div><div class='del'>-            y = (*bx &amp; 0xffff) - (ys &amp; 0xffff) + borrow;</div><div class='del'>-            borrow = y &gt;&gt; 16;</div><div class='del'>-            Sign_Extend(borrow, y);</div><div class='del'>-            z = (*bx &gt;&gt; 16) - (zs &amp; 0xffff) + borrow;</div><div class='del'>-            borrow = z &gt;&gt; 16;</div><div class='del'>-            Sign_Extend(borrow, z);</div><div class='del'>-            Storeinc(bx, z, y);</div><div class='del'>-#else</div><div class='del'>-            ys = *sx++ * q + carry;</div><div class='del'>-            carry = ys &gt;&gt; 16;</div><div class='del'>-            y = *bx - (ys &amp; 0xffff) + borrow;</div><div class='del'>-            borrow = y &gt;&gt; 16;</div><div class='del'>-            Sign_Extend(borrow, y);</div><div class='del'>-            *bx++ = y &amp; 0xffff;</div><div class='del'>-#endif</div><div class='del'>-        }</div><div class='del'>-        while(sx &lt;= sxe);</div><div class='del'>-        if (!*bxe) {</div><div class='del'>-            bx = b-&gt;x;</div><div class='del'>-            while(--bxe &gt; bx &amp;&amp; !*bxe)</div><div class='del'>-                --n;</div><div class='del'>-            b-&gt;wds = n;</div><div class='del'>-        }</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+    if (d() == systemPrivate()) {</div><div class='add'>+        QVariant res = systemLocale()-&gt;query(QSystemLocale::NativeLanguageName, QVariant());</div><div class='add'>+        if (!res.isNull())</div><div class='add'>+            return res.toString();</div><div class='ctx'>     }</div><div class='del'>-    if (cmp(b, S) &gt;= 0) {</div><div class='del'>-        q++;</div><div class='del'>-        borrow = 0;</div><div class='del'>-        carry = 0;</div><div class='del'>-        bx = b-&gt;x;</div><div class='del'>-        sx = S-&gt;x;</div><div class='del'>-        do {</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-            si = *sx++;</div><div class='del'>-            ys = (si &amp; 0xffff) + carry;</div><div class='del'>-            zs = (si &gt;&gt; 16) + (ys &gt;&gt; 16);</div><div class='del'>-            carry = zs &gt;&gt; 16;</div><div class='del'>-            y = (*bx &amp; 0xffff) - (ys &amp; 0xffff) + borrow;</div><div class='del'>-            borrow = y &gt;&gt; 16;</div><div class='del'>-            Sign_Extend(borrow, y);</div><div class='del'>-            z = (*bx &gt;&gt; 16) - (zs &amp; 0xffff) + borrow;</div><div class='del'>-            borrow = z &gt;&gt; 16;</div><div class='del'>-            Sign_Extend(borrow, z);</div><div class='del'>-            Storeinc(bx, z, y);</div><div class='del'>-#else</div><div class='del'>-            ys = *sx++ + carry;</div><div class='del'>-            carry = ys &gt;&gt; 16;</div><div class='del'>-            y = *bx - (ys &amp; 0xffff) + borrow;</div><div class='del'>-            borrow = y &gt;&gt; 16;</div><div class='del'>-            Sign_Extend(borrow, y);</div><div class='del'>-            *bx++ = y &amp; 0xffff;</div><div class='ctx'> #endif</div><div class='del'>-        }</div><div class='del'>-        while(sx &lt;= sxe);</div><div class='del'>-        bx = b-&gt;x;</div><div class='del'>-        bxe = bx + n;</div><div class='del'>-        if (!*bxe) {</div><div class='del'>-            while(--bxe &gt; bx &amp;&amp; !*bxe)</div><div class='del'>-                --n;</div><div class='del'>-            b-&gt;wds = n;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    return q;</div><div class='add'>+    return getLocaleData(endonyms_data + d()-&gt;m_language_endonym_idx, d()-&gt;m_language_endonym_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* dtoa for IEEE arithmetic (dmg): convert double to ASCII string.</div><div class='del'>- *</div><div class='del'>- * Inspired by "How to Print Floating-Point Numbers Accurately" by</div><div class='del'>- * Guy L. Steele, Jr. and Jon L. White [Proc. ACM SIGPLAN '90, pp. 92-101].</div><div class='del'>- *</div><div class='del'>- * Modifications:</div><div class='del'>- *        1. Rather than iterating, we use a simple numeric overestimate</div><div class='del'>- *           to determine k = floor(log10(d)).  We scale relevant</div><div class='del'>- *           quantities using O(log2(k)) rather than O(k) multiplications.</div><div class='del'>- *        2. For some modes &gt; 2 (corresponding to ecvt and fcvt), we don't</div><div class='del'>- *           try to generate digits strictly left to right.  Instead, we</div><div class='del'>- *           compute with fewer bits and propagate the carry if necessary</div><div class='del'>- *           when rounding the final digit up.  This is often faster.</div><div class='del'>- *        3. Under the assumption that input will be rounded nearest,</div><div class='del'>- *           mode 0 renders 1e23 as 1e23 rather than 9.999999999999999e22.</div><div class='del'>- *           That is, we allow equality in stopping tests when the</div><div class='del'>- *           round-nearest rule will give the same floating-point value</div><div class='del'>- *           as would satisfaction of the stopping test with strict</div><div class='del'>- *           inequality.</div><div class='del'>- *        4. We remove common factors of powers of 2 from relevant</div><div class='del'>- *           quantities.</div><div class='del'>- *        5. When converting floating-point integers less than 1e16,</div><div class='del'>- *           we use floating-point arithmetic rather than resorting</div><div class='del'>- *           to multiple-precision integers.</div><div class='del'>- *        6. When asked to produce fewer than 15 digits, we first try</div><div class='del'>- *           to get by with floating-point arithmetic; we resort to</div><div class='del'>- *           multiple-precision integer arithmetic only if we cannot</div><div class='del'>- *           guarantee that the floating-point calculation has given</div><div class='del'>- *           the correctly rounded result.  For k requested digits and</div><div class='del'>- *           "uniformly" distributed input, the probability is</div><div class='del'>- *           something like 10^(k-15) that we must resort to the Long</div><div class='del'>- *           calculation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This actually sometimes returns a pointer to a string literal</div><div class='del'>-   cast to a char*. Do NOT try to modify the return value. */</div><div class='del'>-</div><div class='del'>-Q_CORE_EXPORT char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp)</div><div class='del'>-{</div><div class='del'>-    // Some values of the floating-point control word can cause _qdtoa to crash with an underflow.</div><div class='del'>-    // We set a safe value here.</div><div class='del'>-#ifdef Q_OS_WIN</div><div class='del'>-    _clear87();</div><div class='del'>-    unsigned int oldbits = _control87(0, 0);</div><div class='del'>-#ifndef MCW_EM</div><div class='del'>-#    ifdef _MCW_EM</div><div class='del'>-#        define MCW_EM _MCW_EM</div><div class='del'>-#    else</div><div class='del'>-#        define MCW_EM 0x0008001F</div><div class='del'>-#    endif</div><div class='del'>-#endif</div><div class='del'>-    _control87(MCW_EM, MCW_EM);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(__GLIBC__) &amp;&amp; !defined(__UCLIBC__)</div><div class='del'>-    fenv_t envp;</div><div class='del'>-    feholdexcept(&amp;envp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-    char *s = _qdtoa(d, mode, ndigits, decpt, sign, rve, resultp);</div><div class='del'>-</div><div class='del'>-#ifdef Q_OS_WIN</div><div class='del'>-    _clear87();</div><div class='del'>-#ifndef _M_X64</div><div class='del'>-    _control87(oldbits, 0xFFFFF);</div><div class='del'>-#else</div><div class='del'>-    _control87(oldbits, _MCW_EM|_MCW_DN|_MCW_RC);</div><div class='del'>-#endif //_M_X64</div><div class='del'>-#endif //Q_OS_WIN</div><div class='del'>-</div><div class='del'>-#if defined(__GLIBC__) &amp;&amp; !defined(__UCLIBC__)</div><div class='del'>-    fesetenv(&amp;envp);</div><div class='del'>-#endif</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='ctx'> </div><div class='del'>-    return s;</div><div class='del'>-}</div><div class='add'>+    Returns a native name of the country for the locale. For example</div><div class='add'>+    "España" for Spanish/Spain locale.</div><div class='ctx'> </div><div class='del'>-static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp)</div><div class='add'>+    \sa nativeLanguageName(), countryToString()</div><div class='add'>+*/</div><div class='add'>+QString QLocale::nativeCountryName() const</div><div class='ctx'> {</div><div class='del'>-    /*</div><div class='del'>-      Arguments ndigits, decpt, sign are similar to those</div><div class='del'>-      of ecvt and fcvt; trailing zeros are suppressed from</div><div class='del'>-      the returned string.  If not null, *rve is set to point</div><div class='del'>-      to the end of the return value.  If d is +-Infinity or NaN,</div><div class='del'>-      then *decpt is set to 9999.</div><div class='del'>-</div><div class='del'>-      mode:</div><div class='del'>-      0 ==&gt; shortest string that yields d when read in</div><div class='del'>-      and rounded to nearest.</div><div class='del'>-      1 ==&gt; like 0, but with Steele &amp; White stopping rule;</div><div class='del'>-      e.g. with IEEE P754 arithmetic , mode 0 gives</div><div class='del'>-      1e23 whereas mode 1 gives 9.999999999999999e22.</div><div class='del'>-      2 ==&gt; max(1,ndigits) significant digits.  This gives a</div><div class='del'>-      return value similar to that of ecvt, except</div><div class='del'>-      that trailing zeros are suppressed.</div><div class='del'>-      3 ==&gt; through ndigits past the decimal point.  This</div><div class='del'>-      gives a return value similar to that from fcvt,</div><div class='del'>-      except that trailing zeros are suppressed, and</div><div class='del'>-      ndigits can be negative.</div><div class='del'>-      4-9 should give the same return values as 2-3, i.e.,</div><div class='del'>-      4 &lt;= mode &lt;= 9 ==&gt; same return as mode</div><div class='del'>-      2 + (mode &amp; 1).  These modes are mainly for</div><div class='del'>-      debugging; often they run slower but sometimes</div><div class='del'>-      faster than modes 2-3.</div><div class='del'>-      4,5,8,9 ==&gt; left-to-right digit generation.</div><div class='del'>-      6-9 ==&gt; don't try fast floating-point estimate</div><div class='del'>-      (if applicable).</div><div class='del'>-</div><div class='del'>-      Values of mode other than 0-9 are treated as mode 0.</div><div class='del'>-</div><div class='del'>-      Sufficient space is allocated to the return value</div><div class='del'>-      to hold the suppressed trailing zeros.</div><div class='del'>-    */</div><div class='del'>-</div><div class='del'>-    int bbits, b2, b5, be, dig, i, ieps, ilim0,</div><div class='del'>-        j, j1, k, k0, k_check, leftright, m2, m5, s2, s5,</div><div class='del'>-        try_quick;</div><div class='del'>-    int ilim = 0, ilim1 = 0, spec_case = 0;        /* pacify gcc */</div><div class='del'>-    Long L;</div><div class='del'>-#ifndef Sudden_Underflow</div><div class='del'>-    int denorm;</div><div class='del'>-    ULong x;</div><div class='del'>-#endif</div><div class='del'>-    Bigint *b, *b1, *delta, *mhi, *S;</div><div class='del'>-    Bigint *mlo = NULL; /* pacify gcc */</div><div class='del'>-    double d2;</div><div class='del'>-    double ds, eps;</div><div class='del'>-    char *s, *s0;</div><div class='del'>-</div><div class='del'>-    if (getWord0(d) &amp; Sign_bit) {</div><div class='del'>-        /* set sign for everything, including 0's and NaNs */</div><div class='del'>-        *sign = 1;</div><div class='del'>-        setWord0(&amp;d, getWord0(d) &amp; ~Sign_bit);        /* clear sign bit */</div><div class='del'>-    }</div><div class='del'>-    else</div><div class='del'>-        *sign = 0;</div><div class='del'>-</div><div class='del'>-#if defined(IEEE_Arith) + defined(VAX)</div><div class='del'>-#ifdef IEEE_Arith</div><div class='del'>-    if ((getWord0(d) &amp; Exp_mask) == Exp_mask)</div><div class='del'>-#else</div><div class='del'>-        if (getWord0(d)  == 0x8000)</div><div class='del'>-#endif</div><div class='del'>-            {</div><div class='del'>-                /* Infinity or NaN */</div><div class='del'>-                *decpt = 9999;</div><div class='del'>-                s =</div><div class='del'>-#ifdef IEEE_Arith</div><div class='del'>-                    !getWord1(d) &amp;&amp; !(getWord0(d) &amp; 0xfffff) ? const_cast&lt;char*&gt;("Infinity") :</div><div class='del'>-#endif</div><div class='del'>-                    const_cast&lt;char*&gt;("NaN");</div><div class='del'>-                if (rve)</div><div class='del'>-                    *rve =</div><div class='del'>-#ifdef IEEE_Arith</div><div class='del'>-                        s[3] ? s + 8 :</div><div class='del'>-#endif</div><div class='del'>-                        s + 3;</div><div class='del'>-                return s;</div><div class='del'>-            }</div><div class='del'>-#endif</div><div class='del'>-#ifdef IBM</div><div class='del'>-    d += 0; /* normalize */</div><div class='del'>-#endif</div><div class='del'>-    if (d == g_double_zero)</div><div class='del'>-        {</div><div class='del'>-            *decpt = 1;</div><div class='del'>-            s = const_cast&lt;char*&gt;("0");</div><div class='del'>-            if (rve)</div><div class='del'>-                *rve = s + 1;</div><div class='del'>-            return s;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-    b = d2b(d, &amp;be, &amp;bbits);</div><div class='del'>-#ifdef Sudden_Underflow</div><div class='del'>-    i = (int)(getWord0(d) &gt;&gt; Exp_shift1 &amp; (Exp_mask&gt;&gt;Exp_shift1));</div><div class='del'>-#else</div><div class='del'>-    if ((i = int(getWord0(d) &gt;&gt; Exp_shift1 &amp; (Exp_mask&gt;&gt;Exp_shift1))) != 0) {</div><div class='del'>-#endif</div><div class='del'>-        d2 = d;</div><div class='del'>-        setWord0(&amp;d2, getWord0(d2) &amp; Frac_mask1);</div><div class='del'>-        setWord0(&amp;d2, getWord0(d2) | Exp_11);</div><div class='del'>-#ifdef IBM</div><div class='del'>-        if (j = 11 - hi0bits(getWord0(d2) &amp; Frac_mask))</div><div class='del'>-            d2 /= 1 &lt;&lt; j;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-        /* log(x)        ~=~ log(1.5) + (x-1.5)/1.5</div><div class='del'>-         * log10(x)         =  log(x) / log(10)</div><div class='del'>-         *                ~=~ log(1.5)/log(10) + (x-1.5)/(1.5*log(10))</div><div class='del'>-         * log10(d) = (i-Bias)*log(2)/log(10) + log10(d2)</div><div class='del'>-         *</div><div class='del'>-         * This suggests computing an approximation k to log10(d) by</div><div class='del'>-         *</div><div class='del'>-         * k = (i - Bias)*0.301029995663981</div><div class='del'>-         *        + ( (d2-1.5)*0.289529654602168 + 0.176091259055681 );</div><div class='del'>-         *</div><div class='del'>-         * We want k to be too large rather than too small.</div><div class='del'>-         * The error in the first-order Taylor series approximation</div><div class='del'>-         * is in our favor, so we just round up the constant enough</div><div class='del'>-         * to compensate for any error in the multiplication of</div><div class='del'>-         * (i - Bias) by 0.301029995663981; since |i - Bias| &lt;= 1077,</div><div class='del'>-         * and 1077 * 0.30103 * 2^-52 ~=~ 7.2e-14,</div><div class='del'>-         * adding 1e-13 to the constant term more than suffices.</div><div class='del'>-         * Hence we adjust the constant term to 0.1760912590558.</div><div class='del'>-         * (We could get a more accurate k by invoking log10,</div><div class='del'>-         *  but this is probably not worthwhile.)</div><div class='del'>-         */</div><div class='del'>-</div><div class='del'>-        i -= Bias;</div><div class='del'>-#ifdef IBM</div><div class='del'>-        i &lt;&lt;= 2;</div><div class='del'>-        i += j;</div><div class='del'>-#endif</div><div class='del'>-#ifndef Sudden_Underflow</div><div class='del'>-        denorm = 0;</div><div class='del'>-    }</div><div class='del'>-    else {</div><div class='del'>-        /* d is denormalized */</div><div class='del'>-</div><div class='del'>-        i = bbits + be + (Bias + (P-1) - 1);</div><div class='del'>-        x = i &gt; 32  ? getWord0(d) &lt;&lt; (64 - i) | getWord1(d) &gt;&gt; (i - 32)</div><div class='del'>-            : getWord1(d) &lt;&lt; (32 - i);</div><div class='del'>-        d2 = x;</div><div class='del'>-        setWord0(&amp;d2, getWord0(d2) - 31*Exp_msk1); /* adjust exponent */</div><div class='del'>-        i -= (Bias + (P-1) - 1) + 1;</div><div class='del'>-        denorm = 1;</div><div class='del'>-    }</div><div class='del'>-#endif</div><div class='del'>-    ds = (d2-1.5)*0.289529654602168 + 0.1760912590558 + i*0.301029995663981;</div><div class='del'>-    k = int(ds);</div><div class='del'>-    if (ds &lt; 0. &amp;&amp; ds != k)</div><div class='del'>-        k--;        /* want k = floor(ds) */</div><div class='del'>-    k_check = 1;</div><div class='del'>-    if (k &gt;= 0 &amp;&amp; k &lt;= Ten_pmax) {</div><div class='del'>-        if (d &lt; tens[k])</div><div class='del'>-            k--;</div><div class='del'>-        k_check = 0;</div><div class='del'>-    }</div><div class='del'>-    j = bbits - i - 1;</div><div class='del'>-    if (j &gt;= 0) {</div><div class='del'>-        b2 = 0;</div><div class='del'>-        s2 = j;</div><div class='del'>-    }</div><div class='del'>-    else {</div><div class='del'>-        b2 = -j;</div><div class='del'>-        s2 = 0;</div><div class='del'>-    }</div><div class='del'>-    if (k &gt;= 0) {</div><div class='del'>-        b5 = 0;</div><div class='del'>-        s5 = k;</div><div class='del'>-        s2 += k;</div><div class='del'>-    }</div><div class='del'>-    else {</div><div class='del'>-        b2 -= k;</div><div class='del'>-        b5 = -k;</div><div class='del'>-        s5 = 0;</div><div class='del'>-    }</div><div class='del'>-    if (mode &lt; 0 || mode &gt; 9)</div><div class='del'>-        mode = 0;</div><div class='del'>-    try_quick = 1;</div><div class='del'>-    if (mode &gt; 5) {</div><div class='del'>-        mode -= 4;</div><div class='del'>-        try_quick = 0;</div><div class='del'>-    }</div><div class='del'>-    leftright = 1;</div><div class='del'>-    switch(mode) {</div><div class='del'>-    case 0:</div><div class='del'>-    case 1:</div><div class='del'>-        ilim = ilim1 = -1;</div><div class='del'>-        i = 18;</div><div class='del'>-        ndigits = 0;</div><div class='del'>-        break;</div><div class='del'>-    case 2:</div><div class='del'>-        leftright = 0;</div><div class='del'>-        /* no break */</div><div class='del'>-    case 4:</div><div class='del'>-        if (ndigits &lt;= 0)</div><div class='del'>-            ndigits = 1;</div><div class='del'>-        ilim = ilim1 = i = ndigits;</div><div class='del'>-        break;</div><div class='del'>-    case 3:</div><div class='del'>-        leftright = 0;</div><div class='del'>-        /* no break */</div><div class='del'>-    case 5:</div><div class='del'>-        i = ndigits + k + 1;</div><div class='del'>-        ilim = i;</div><div class='del'>-        ilim1 = i - 1;</div><div class='del'>-        if (i &lt;= 0)</div><div class='del'>-            i = 1;</div><div class='del'>-    }</div><div class='del'>-    QT_TRY {</div><div class='del'>-        *resultp = static_cast&lt;char *&gt;(malloc(i + 1));</div><div class='del'>-        Q_CHECK_PTR(*resultp);</div><div class='del'>-    } QT_CATCH(...) {</div><div class='del'>-        Bfree(b);</div><div class='del'>-        QT_RETHROW;</div><div class='del'>-    }</div><div class='del'>-    s = s0 = *resultp;</div><div class='del'>-</div><div class='del'>-    if (ilim &gt;= 0 &amp;&amp; ilim &lt;= Quick_max &amp;&amp; try_quick) {</div><div class='del'>-</div><div class='del'>-        /* Try to get by with floating-point arithmetic. */</div><div class='del'>-</div><div class='del'>-        i = 0;</div><div class='del'>-        d2 = d;</div><div class='del'>-        k0 = k;</div><div class='del'>-        ilim0 = ilim;</div><div class='del'>-        ieps = 2; /* conservative */</div><div class='del'>-        if (k &gt; 0) {</div><div class='del'>-            ds = tens[k&amp;0xf];</div><div class='del'>-            j = k &gt;&gt; 4;</div><div class='del'>-            if (j &amp; Bletch) {</div><div class='del'>-                /* prevent overflows */</div><div class='del'>-                j &amp;= Bletch - 1;</div><div class='del'>-                d /= bigtens[n_bigtens-1];</div><div class='del'>-                ieps++;</div><div class='del'>-            }</div><div class='del'>-            for(; j; j &gt;&gt;= 1, i++)</div><div class='del'>-                if (j &amp; 1) {</div><div class='del'>-                    ieps++;</div><div class='del'>-                    ds *= bigtens[i];</div><div class='del'>-                }</div><div class='del'>-            d /= ds;</div><div class='del'>-        }</div><div class='del'>-        else if ((j1 = -k) != 0) {</div><div class='del'>-            d *= tens[j1 &amp; 0xf];</div><div class='del'>-            for(j = j1 &gt;&gt; 4; j; j &gt;&gt;= 1, i++)</div><div class='del'>-                if (j &amp; 1) {</div><div class='del'>-                    ieps++;</div><div class='del'>-                    d *= bigtens[i];</div><div class='del'>-                }</div><div class='del'>-        }</div><div class='del'>-        if (k_check &amp;&amp; d &lt; 1. &amp;&amp; ilim &gt; 0) {</div><div class='del'>-            if (ilim1 &lt;= 0)</div><div class='del'>-                goto fast_failed;</div><div class='del'>-            ilim = ilim1;</div><div class='del'>-            k--;</div><div class='del'>-            d *= 10.;</div><div class='del'>-            ieps++;</div><div class='del'>-        }</div><div class='del'>-        eps = ieps*d + 7.;</div><div class='del'>-        setWord0(&amp;eps, getWord0(eps) - (P-1)*Exp_msk1);</div><div class='del'>-        if (ilim == 0) {</div><div class='del'>-            S = mhi = 0;</div><div class='del'>-            d -= 5.;</div><div class='del'>-            if (d &gt; eps)</div><div class='del'>-                goto one_digit;</div><div class='del'>-            if (d &lt; -eps)</div><div class='del'>-                goto no_digits;</div><div class='del'>-            goto fast_failed;</div><div class='del'>-        }</div><div class='del'>-#ifndef No_leftright</div><div class='del'>-        if (leftright) {</div><div class='del'>-            /* Use Steele &amp; White method of only</div><div class='del'>-             * generating digits needed.</div><div class='del'>-             */</div><div class='del'>-            eps = 0.5/tens[ilim-1] - eps;</div><div class='del'>-            for(i = 0;;) {</div><div class='del'>-                L = Long(d);</div><div class='del'>-                d -= L;</div><div class='del'>-                *s++ = '0' + int(L);</div><div class='del'>-                if (d &lt; eps)</div><div class='del'>-                    goto ret1;</div><div class='del'>-                if (1. - d &lt; eps)</div><div class='del'>-                    goto bump_up;</div><div class='del'>-                if (++i &gt;= ilim)</div><div class='del'>-                    break;</div><div class='del'>-                eps *= 10.;</div><div class='del'>-                d *= 10.;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        else {</div><div class='del'>-#endif</div><div class='del'>-            /* Generate ilim digits, then fix them up. */</div><div class='del'>-#if defined(Q_OS_IRIX) &amp;&amp; defined(Q_CC_GNU)</div><div class='del'>-            // work around a bug on 64 bit IRIX gcc</div><div class='del'>-            double *t = (double *) tens;</div><div class='del'>-            eps *= t[ilim-1];</div><div class='del'>-#else</div><div class='del'>-            eps *= tens[ilim-1];</div><div class='del'>-#endif</div><div class='del'>-            for(i = 1;; i++, d *= 10.) {</div><div class='del'>-                L = Long(d);</div><div class='del'>-                d -= L;</div><div class='del'>-                *s++ = '0' + int(L);</div><div class='del'>-                if (i == ilim) {</div><div class='del'>-                    if (d &gt; 0.5 + eps)</div><div class='del'>-                        goto bump_up;</div><div class='del'>-                    else if (d &lt; 0.5 - eps) {</div><div class='del'>-                        while(*--s == '0') {}</div><div class='del'>-                        s++;</div><div class='del'>-                        goto ret1;</div><div class='del'>-                    }</div><div class='del'>-                    break;</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-#ifndef No_leftright</div><div class='del'>-        }</div><div class='del'>-#endif</div><div class='del'>-    fast_failed:</div><div class='del'>-        s = s0;</div><div class='del'>-        d = d2;</div><div class='del'>-        k = k0;</div><div class='del'>-        ilim = ilim0;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* Do we have a "small" integer? */</div><div class='del'>-</div><div class='del'>-    if (be &gt;= 0 &amp;&amp; k &lt;= Int_max) {</div><div class='del'>-        /* Yes. */</div><div class='del'>-        ds = tens[k];</div><div class='del'>-        if (ndigits &lt; 0 &amp;&amp; ilim &lt;= 0) {</div><div class='del'>-            S = mhi = 0;</div><div class='del'>-            if (ilim &lt; 0 || d &lt;= 5*ds)</div><div class='del'>-                goto no_digits;</div><div class='del'>-            goto one_digit;</div><div class='del'>-        }</div><div class='del'>-        for(i = 1;; i++) {</div><div class='del'>-            L = Long(d / ds);</div><div class='del'>-            d -= L*ds;</div><div class='del'>-#ifdef Check_FLT_ROUNDS</div><div class='del'>-            /* If FLT_ROUNDS == 2, L will usually be high by 1 */</div><div class='del'>-            if (d &lt; 0) {</div><div class='del'>-                L--;</div><div class='del'>-                d += ds;</div><div class='del'>-            }</div><div class='del'>-#endif</div><div class='del'>-            *s++ = '0' + int(L);</div><div class='del'>-            if (i == ilim) {</div><div class='del'>-                d += d;</div><div class='del'>-                if (d &gt; ds || (d == ds &amp;&amp; L &amp; 1)) {</div><div class='del'>-                bump_up:</div><div class='del'>-                    while(*--s == '9')</div><div class='del'>-                        if (s == s0) {</div><div class='del'>-                            k++;</div><div class='del'>-                            *s = '0';</div><div class='del'>-                            break;</div><div class='del'>-                        }</div><div class='del'>-                    ++*s++;</div><div class='del'>-                }</div><div class='del'>-                break;</div><div class='del'>-            }</div><div class='del'>-            if ((d *= 10.) == g_double_zero)</div><div class='del'>-                break;</div><div class='del'>-        }</div><div class='del'>-        goto ret1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    m2 = b2;</div><div class='del'>-    m5 = b5;</div><div class='del'>-    mhi = mlo = 0;</div><div class='del'>-    if (leftright) {</div><div class='del'>-        if (mode &lt; 2) {</div><div class='del'>-            i =</div><div class='del'>-#ifndef Sudden_Underflow</div><div class='del'>-                denorm ? be + (Bias + (P-1) - 1 + 1) :</div><div class='del'>-#endif</div><div class='del'>-#ifdef IBM</div><div class='del'>-                1 + 4*P - 3 - bbits + ((bbits + be - 1) &amp; 3);</div><div class='del'>-#else</div><div class='del'>-            1 + P - bbits;</div><div class='del'>-#endif</div><div class='del'>-        }</div><div class='del'>-        else {</div><div class='del'>-            j = ilim - 1;</div><div class='del'>-            if (m5 &gt;= j)</div><div class='del'>-                m5 -= j;</div><div class='del'>-            else {</div><div class='del'>-                s5 += j -= m5;</div><div class='del'>-                b5 += j;</div><div class='del'>-                m5 = 0;</div><div class='del'>-            }</div><div class='del'>-            if ((i = ilim) &lt; 0) {</div><div class='del'>-                m2 -= i;</div><div class='del'>-                i = 0;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        b2 += i;</div><div class='del'>-        s2 += i;</div><div class='del'>-        mhi = i2b(1);</div><div class='del'>-    }</div><div class='del'>-    if (m2 &gt; 0 &amp;&amp; s2 &gt; 0) {</div><div class='del'>-        i = m2 &lt; s2 ? m2 : s2;</div><div class='del'>-        b2 -= i;</div><div class='del'>-        m2 -= i;</div><div class='del'>-        s2 -= i;</div><div class='del'>-    }</div><div class='del'>-    if (b5 &gt; 0) {</div><div class='del'>-        if (leftright) {</div><div class='del'>-            if (m5 &gt; 0) {</div><div class='del'>-                mhi = pow5mult(mhi, m5);</div><div class='del'>-                b1 = mult(mhi, b);</div><div class='del'>-                Bfree(b);</div><div class='del'>-                b = b1;</div><div class='del'>-            }</div><div class='del'>-            if ((j = b5 - m5) != 0)</div><div class='del'>-                b = pow5mult(b, j);</div><div class='del'>-        }</div><div class='del'>-        else</div><div class='del'>-            b = pow5mult(b, b5);</div><div class='del'>-    }</div><div class='del'>-    S = i2b(1);</div><div class='del'>-    if (s5 &gt; 0)</div><div class='del'>-        S = pow5mult(S, s5);</div><div class='del'>-</div><div class='del'>-    /* Check for special case that d is a normalized power of 2. */</div><div class='del'>-</div><div class='del'>-    if (mode &lt; 2) {</div><div class='del'>-        if (!getWord1(d) &amp;&amp; !(getWord0(d) &amp; Bndry_mask)</div><div class='del'>-#ifndef Sudden_Underflow</div><div class='del'>-            &amp;&amp; getWord0(d) &amp; Exp_mask</div><div class='del'>-#endif</div><div class='del'>-            ) {</div><div class='del'>-            /* The special case */</div><div class='del'>-            b2 += Log2P;</div><div class='del'>-            s2 += Log2P;</div><div class='del'>-            spec_case = 1;</div><div class='del'>-        }</div><div class='del'>-        else</div><div class='del'>-            spec_case = 0;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* Arrange for convenient computation of quotients:</div><div class='del'>-     * shift left if necessary so divisor has 4 leading 0 bits.</div><div class='del'>-     *</div><div class='del'>-     * Perhaps we should just compute leading 28 bits of S once</div><div class='del'>-     * and for all and pass them and a shift to quorem, so it</div><div class='del'>-     * can do shifts and ors to compute the numerator for q.</div><div class='del'>-     */</div><div class='del'>-#ifdef Pack_32</div><div class='del'>-    if ((i = ((s5 ? 32 - hi0bits(S-&gt;x[S-&gt;wds-1]) : 1) + s2) &amp; 0x1f) != 0)</div><div class='del'>-        i = 32 - i;</div><div class='del'>-#else</div><div class='del'>-    if (i = ((s5 ? 32 - hi0bits(S-&gt;x[S-&gt;wds-1]) : 1) + s2) &amp; 0xf)</div><div class='del'>-        i = 16 - i;</div><div class='del'>-#endif</div><div class='del'>-    if (i &gt; 4) {</div><div class='del'>-        i -= 4;</div><div class='del'>-        b2 += i;</div><div class='del'>-        m2 += i;</div><div class='del'>-        s2 += i;</div><div class='del'>-    }</div><div class='del'>-    else if (i &lt; 4) {</div><div class='del'>-        i += 28;</div><div class='del'>-        b2 += i;</div><div class='del'>-        m2 += i;</div><div class='del'>-        s2 += i;</div><div class='del'>-    }</div><div class='del'>-    if (b2 &gt; 0)</div><div class='del'>-        b = lshift(b, b2);</div><div class='del'>-    if (s2 &gt; 0)</div><div class='del'>-        S = lshift(S, s2);</div><div class='del'>-    if (k_check) {</div><div class='del'>-        if (cmp(b,S) &lt; 0) {</div><div class='del'>-            k--;</div><div class='del'>-            b = multadd(b, 10, 0);        /* we botched the k estimate */</div><div class='del'>-            if (leftright)</div><div class='del'>-                mhi = multadd(mhi, 10, 0);</div><div class='del'>-            ilim = ilim1;</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    if (ilim &lt;= 0 &amp;&amp; mode &gt; 2) {</div><div class='del'>-        if (ilim &lt; 0 || cmp(b,S = multadd(S,5,0)) &lt;= 0) {</div><div class='del'>-            /* no digits, fcvt style */</div><div class='del'>-        no_digits:</div><div class='del'>-            k = -1 - ndigits;</div><div class='del'>-            goto ret;</div><div class='del'>-        }</div><div class='del'>-    one_digit:</div><div class='del'>-        *s++ = '1';</div><div class='del'>-        k++;</div><div class='del'>-        goto ret;</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+    if (d() == systemPrivate()) {</div><div class='add'>+        QVariant res = systemLocale()-&gt;query(QSystemLocale::NativeCountryName, QVariant());</div><div class='add'>+        if (!res.isNull())</div><div class='add'>+            return res.toString();</div><div class='ctx'>     }</div><div class='del'>-    if (leftright) {</div><div class='del'>-        if (m2 &gt; 0)</div><div class='del'>-            mhi = lshift(mhi, m2);</div><div class='del'>-</div><div class='del'>-        /* Compute mlo -- check for special case</div><div class='del'>-         * that d is a normalized power of 2.</div><div class='del'>-         */</div><div class='del'>-</div><div class='del'>-        mlo = mhi;</div><div class='del'>-        if (spec_case) {</div><div class='del'>-            mhi = Balloc(mhi-&gt;k);</div><div class='del'>-            Bcopy(mhi, mlo);</div><div class='del'>-            mhi = lshift(mhi, Log2P);</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        for(i = 1;;i++) {</div><div class='del'>-            dig = quorem(b,S) + '0';</div><div class='del'>-            /* Do we yet have the shortest decimal string</div><div class='del'>-             * that will round to d?</div><div class='del'>-             */</div><div class='del'>-            j = cmp(b, mlo);</div><div class='del'>-            delta = diff(S, mhi);</div><div class='del'>-            j1 = delta-&gt;sign ? 1 : cmp(b, delta);</div><div class='del'>-            Bfree(delta);</div><div class='del'>-#ifndef ROUND_BIASED</div><div class='del'>-            if (j1 == 0 &amp;&amp; !mode &amp;&amp; !(getWord1(d) &amp; 1)) {</div><div class='del'>-                if (dig == '9')</div><div class='del'>-                    goto round_9_up;</div><div class='del'>-                if (j &gt; 0)</div><div class='del'>-                    dig++;</div><div class='del'>-                *s++ = dig;</div><div class='del'>-                goto ret;</div><div class='del'>-            }</div><div class='ctx'> #endif</div><div class='del'>-            if (j &lt; 0 || (j == 0 &amp;&amp; !mode</div><div class='del'>-#ifndef ROUND_BIASED</div><div class='del'>-                          &amp;&amp; !(getWord1(d) &amp; 1)</div><div class='del'>-#endif</div><div class='del'>-                          )) {</div><div class='del'>-                if (j1 &gt; 0) {</div><div class='del'>-                    b = lshift(b, 1);</div><div class='del'>-                    j1 = cmp(b, S);</div><div class='del'>-                    if ((j1 &gt; 0 || (j1 == 0 &amp;&amp; dig &amp; 1))</div><div class='del'>-                        &amp;&amp; dig++ == '9')</div><div class='del'>-                        goto round_9_up;</div><div class='del'>-                }</div><div class='del'>-                *s++ = dig;</div><div class='del'>-                goto ret;</div><div class='del'>-            }</div><div class='del'>-            if (j1 &gt; 0) {</div><div class='del'>-                if (dig == '9') { /* possible if i == 1 */</div><div class='del'>-                round_9_up:</div><div class='del'>-                    *s++ = '9';</div><div class='del'>-                    goto roundoff;</div><div class='del'>-                }</div><div class='del'>-                *s++ = dig + 1;</div><div class='del'>-                goto ret;</div><div class='del'>-            }</div><div class='del'>-            *s++ = dig;</div><div class='del'>-            if (i == ilim)</div><div class='del'>-                break;</div><div class='del'>-            b = multadd(b, 10, 0);</div><div class='del'>-            if (mlo == mhi)</div><div class='del'>-                mlo = mhi = multadd(mhi, 10, 0);</div><div class='del'>-            else {</div><div class='del'>-                mlo = multadd(mlo, 10, 0);</div><div class='del'>-                mhi = multadd(mhi, 10, 0);</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-    }</div><div class='del'>-    else</div><div class='del'>-        for(i = 1;; i++) {</div><div class='del'>-            *s++ = dig = quorem(b,S) + '0';</div><div class='del'>-            if (i &gt;= ilim)</div><div class='del'>-                break;</div><div class='del'>-            b = multadd(b, 10, 0);</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-    /* Round off last digit */</div><div class='del'>-</div><div class='del'>-    b = lshift(b, 1);</div><div class='del'>-    j = cmp(b, S);</div><div class='del'>-    if (j &gt; 0 || (j == 0 &amp;&amp; dig &amp; 1)) {</div><div class='del'>-    roundoff:</div><div class='del'>-        while(*--s == '9')</div><div class='del'>-            if (s == s0) {</div><div class='del'>-                k++;</div><div class='del'>-                *s++ = '1';</div><div class='del'>-                goto ret;</div><div class='del'>-            }</div><div class='del'>-        ++*s++;</div><div class='del'>-    }</div><div class='del'>-    else {</div><div class='del'>-        while(*--s == '0') {}</div><div class='del'>-        s++;</div><div class='del'>-    }</div><div class='del'>- ret:</div><div class='del'>-    Bfree(S);</div><div class='del'>-    if (mhi) {</div><div class='del'>-        if (mlo &amp;&amp; mlo != mhi)</div><div class='del'>-            Bfree(mlo);</div><div class='del'>-        Bfree(mhi);</div><div class='del'>-    }</div><div class='del'>- ret1:</div><div class='del'>-    Bfree(b);</div><div class='del'>-    if (s == s0) {                                /* don't return empty string */</div><div class='del'>-        *s++ = '0';</div><div class='del'>-        k = 0;</div><div class='del'>-    }</div><div class='del'>-    *s = 0;</div><div class='del'>-    *decpt = k + 1;</div><div class='del'>-    if (rve)</div><div class='del'>-        *rve = s;</div><div class='del'>-    return s0;</div><div class='add'>+    return getLocaleData(endonyms_data + d()-&gt;m_country_endonym_idx, d()-&gt;m_country_endonym_size);</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-// NOT thread safe!</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-Q_CORE_EXPORT char *qdtoa( double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp)</div><div class='del'>-{</div><div class='del'>-    if(rve)</div><div class='del'>-      *rve = 0;</div><div class='del'>-</div><div class='del'>-    char *res;</div><div class='del'>-    if (mode == 0)</div><div class='del'>-        ndigits = 80;</div><div class='del'>-</div><div class='del'>-    if (mode == 3)</div><div class='del'>-        res = fcvt(d, ndigits, decpt, sign);</div><div class='del'>-    else</div><div class='del'>-        res = ecvt(d, ndigits, decpt, sign);</div><div class='del'>-</div><div class='del'>-    int n = qstrlen(res);</div><div class='del'>-    if (mode == 0) { // remove trailing 0's</div><div class='del'>-        const int stop = qMax(1, *decpt);</div><div class='del'>-        int i;</div><div class='del'>-        for (i = n-1; i &gt;= stop; --i) {</div><div class='del'>-            if (res[i] != '0')</div><div class='del'>-                break;</div><div class='del'>-        }</div><div class='del'>-        n = i + 1;</div><div class='del'>-    }</div><div class='del'>-    *resultp = static_cast&lt;char*&gt;(malloc(n + 1));</div><div class='del'>-    Q_CHECK_PTR(resultp);</div><div class='del'>-    qstrncpy(*resultp, res, n + 1);</div><div class='del'>-    return *resultp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-Q_CORE_EXPORT double qstrtod(const char *s00, const char **se, bool *ok)</div><div class='del'>-{</div><div class='del'>-    errno = 0;</div><div class='del'>-    double ret = strtod((char*)s00, (char**)se);</div><div class='del'>-    if (ok) {</div><div class='del'>-      if((ret == 0.0l &amp;&amp; errno == ERANGE)</div><div class='del'>-         || ret == HUGE_VAL || ret == -HUGE_VAL)</div><div class='del'>-        *ok = false;</div><div class='del'>-      else</div><div class='del'>-        *ok = true; // the result will be that we don't report underflow in this case</div><div class='del'>-    }</div><div class='del'>-    return ret;</div><div class='del'>-}</div><div class='del'>-#endif // QT_QLOCALE_USES_FCVT</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h<br/>index 2144fd5..8a5d526 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qlocale.h</a></div><div class='hunk'>@@ -42,6 +42,7 @@</div><div class='ctx'> #ifndef QLOCALE_H</div><div class='ctx'> #define QLOCALE_H</div><div class='ctx'> </div><div class='add'>+#include &lt;QtCore/qvariant.h&gt;</div><div class='ctx'> #include &lt;QtCore/qstring.h&gt;</div><div class='ctx'> #include &lt;QtCore/qobjectdefs.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -68,6 +69,15 @@ public:</div><div class='ctx'>     QSystemLocale();</div><div class='ctx'>     virtual ~QSystemLocale();</div><div class='ctx'> </div><div class='add'>+    struct CurrencyToStringArgument</div><div class='add'>+    {</div><div class='add'>+        CurrencyToStringArgument() { }</div><div class='add'>+        CurrencyToStringArgument(const QVariant &amp;v, const QString &amp;s)</div><div class='add'>+            : value(v), symbol(s) { }</div><div class='add'>+        QVariant value;</div><div class='add'>+        QString symbol;</div><div class='add'>+    };</div><div class='add'>+</div><div class='ctx'>     enum QueryType {</div><div class='ctx'>         LanguageId, // uint</div><div class='ctx'>         CountryId, // uint</div><div class='hunk'>@@ -94,7 +104,19 @@ public:</div><div class='ctx'>         MeasurementSystem, // uint</div><div class='ctx'>         PositiveSign, // QString</div><div class='ctx'>         AMText, // QString</div><div class='del'>-        PMText // QString</div><div class='add'>+        PMText, // QString</div><div class='add'>+        FirstDayOfWeek, // Qt::DayOfWeek</div><div class='add'>+        Weekdays, // QList&lt;Qt::DayOfWeek&gt;</div><div class='add'>+        CurrencySymbol, // QString in: CurrencyToStringArgument</div><div class='add'>+        CurrencyToString, // QString in: qlonglong, qulonglong or double</div><div class='add'>+        UILanguages, // QStringList</div><div class='add'>+        StringToStandardQuotation, // QString in: QStringRef to quote</div><div class='add'>+        StringToAlternateQuotation, // QString in: QStringRef to quote</div><div class='add'>+        ScriptId, // uint</div><div class='add'>+        ListToSeparatedString, // QString</div><div class='add'>+        LocaleChanged, // system locale changed</div><div class='add'>+        NativeLanguageName, // QString</div><div class='add'>+        NativeCountryName // QString</div><div class='ctx'>     };</div><div class='ctx'>     virtual QVariant query(QueryType type, QVariant in) const;</div><div class='ctx'>     virtual QLocale fallbackLocale() const;</div><div class='hunk'>@@ -119,7 +141,10 @@ class Q_CORE_EXPORT QLocale</div><div class='ctx'>     friend class QTextStreamPrivate;</div><div class='ctx'> </div><div class='ctx'> public:</div><div class='add'>+// GENERATED PART STARTS HERE</div><div class='add'>+// see qlocale_data_p.h for more info on generated data</div><div class='ctx'>     enum Language {</div><div class='add'>+        AnyLanguage = 0,</div><div class='ctx'>         C = 1,</div><div class='ctx'>         Abkhazian = 2,</div><div class='ctx'>         Afan = 3,</div><div class='hunk'>@@ -205,7 +230,6 @@ public:</div><div class='ctx'>         NauruLanguage = 83,</div><div class='ctx'>         Nepali = 84,</div><div class='ctx'>         Norwegian = 85,</div><div class='del'>-        NorwegianBokmal = Norwegian,</div><div class='ctx'>         Occitan = 86,</div><div class='ctx'>         Oriya = 87,</div><div class='ctx'>         Pashto = 88,</div><div class='hunk'>@@ -261,8 +285,7 @@ public:</div><div class='ctx'>         Yoruba = 138,</div><div class='ctx'>         Zhuang = 139,</div><div class='ctx'>         Zulu = 140,</div><div class='del'>-        NorwegianNynorsk = 141,</div><div class='del'>-        Nynorsk = NorwegianNynorsk, // ### obsolete</div><div class='add'>+        Nynorsk = 141,</div><div class='ctx'>         Bosnian = 142,</div><div class='ctx'>         Divehi = 143,</div><div class='ctx'>         Manx = 144,</div><div class='hunk'>@@ -336,9 +359,26 @@ public:</div><div class='ctx'>         CentralMoroccoTamazight = 212,</div><div class='ctx'>         KoyraboroSenni = 213,</div><div class='ctx'>         Shambala = 214,</div><div class='add'>+        NorwegianBokmal = Norwegian,</div><div class='add'>+        NorwegianNynorsk = Nynorsk,</div><div class='ctx'>         LastLanguage = Shambala</div><div class='ctx'>     };</div><div class='ctx'> </div><div class='add'>+    enum Script {</div><div class='add'>+        AnyScript = 0,</div><div class='add'>+        ArabicScript = 1,</div><div class='add'>+        CyrillicScript = 2,</div><div class='add'>+        DeseretScript = 3,</div><div class='add'>+        GurmukhiScript = 4,</div><div class='add'>+        SimplifiedHanScript = 5,</div><div class='add'>+        TraditionalHanScript = 6,</div><div class='add'>+        LatinScript = 7,</div><div class='add'>+        MongolianScript = 8,</div><div class='add'>+        TifinaghScript = 9,</div><div class='add'>+        SimplifiedChineseScript = SimplifiedHanScript,</div><div class='add'>+        TraditionalChineseScript = TraditionalHanScript,</div><div class='add'>+        LastScript = TifinaghScript</div><div class='add'>+    };</div><div class='ctx'>     enum Country {</div><div class='ctx'>         AnyCountry = 0,</div><div class='ctx'>         Afghanistan = 1,</div><div class='hunk'>@@ -589,6 +629,7 @@ public:</div><div class='ctx'>         LatinAmericaAndTheCaribbean = 246,</div><div class='ctx'>         LastCountry = LatinAmericaAndTheCaribbean</div><div class='ctx'>     };</div><div class='add'>+// GENERATED PART ENDS HERE</div><div class='ctx'> </div><div class='ctx'>     enum MeasurementSystem { MetricSystem, ImperialSystem };</div><div class='ctx'> </div><div class='hunk'>@@ -599,17 +640,29 @@ public:</div><div class='ctx'>     };</div><div class='ctx'>     Q_DECLARE_FLAGS(NumberOptions, NumberOption)</div><div class='ctx'> </div><div class='add'>+    enum CurrencySymbolFormat {</div><div class='add'>+        CurrencyIsoCode,</div><div class='add'>+        CurrencySymbol,</div><div class='add'>+        CurrencyDisplayName</div><div class='add'>+    };</div><div class='add'>+</div><div class='ctx'>     QLocale();</div><div class='ctx'>     QLocale(const QString &amp;name);</div><div class='ctx'>     QLocale(Language language, Country country = AnyCountry);</div><div class='add'>+    QLocale(Language language, Script script, Country country);</div><div class='ctx'>     QLocale(const QLocale &amp;other);</div><div class='ctx'> </div><div class='ctx'>     QLocale &amp;operator=(const QLocale &amp;other);</div><div class='ctx'> </div><div class='ctx'>     Language language() const;</div><div class='add'>+    Script script() const;</div><div class='ctx'>     Country country() const;</div><div class='ctx'>     QString name() const;</div><div class='ctx'> </div><div class='add'>+    QString bcp47Name() const;</div><div class='add'>+    QString nativeLanguageName() const;</div><div class='add'>+    QString nativeCountryName() const;</div><div class='add'>+</div><div class='ctx'>     short toShort(const QString &amp;s, bool *ok = 0, int base = 0) const;</div><div class='ctx'>     ushort toUShort(const QString &amp;s, bool *ok = 0, int base = 0) const;</div><div class='ctx'>     int toInt(const QString &amp;s, bool *ok = 0, int base = 0) const;</div><div class='hunk'>@@ -661,6 +714,9 @@ public:</div><div class='ctx'>     QString dayName(int, FormatType format = LongFormat) const;</div><div class='ctx'>     QString standaloneDayName(int, FormatType format = LongFormat) const;</div><div class='ctx'> </div><div class='add'>+    Qt::DayOfWeek firstDayOfWeek() const;</div><div class='add'>+    QList&lt;Qt::DayOfWeek&gt; weekdays() const;</div><div class='add'>+</div><div class='ctx'>     QString amText() const;</div><div class='ctx'>     QString pmText() const;</div><div class='ctx'> </div><div class='hunk'>@@ -668,21 +724,40 @@ public:</div><div class='ctx'> </div><div class='ctx'>     Qt::LayoutDirection textDirection() const;</div><div class='ctx'> </div><div class='add'>+    QString currencySymbol(CurrencySymbolFormat = CurrencySymbol) const;</div><div class='add'>+    QString toCurrencyString(qlonglong, const QString &amp;symbol = QString()) const;</div><div class='add'>+    QString toCurrencyString(qulonglong, const QString &amp;symbol = QString()) const;</div><div class='add'>+    inline QString toCurrencyString(short, const QString &amp;symbol = QString()) const;</div><div class='add'>+    inline QString toCurrencyString(ushort, const QString &amp;symbol = QString()) const;</div><div class='add'>+    inline QString toCurrencyString(int, const QString &amp;symbol = QString()) const;</div><div class='add'>+    inline QString toCurrencyString(uint, const QString &amp;symbol = QString()) const;</div><div class='add'>+    QString toCurrencyString(double, const QString &amp;symbol = QString()) const;</div><div class='add'>+    inline QString toCurrencyString(float, const QString &amp;symbol = QString()) const;</div><div class='add'>+</div><div class='add'>+    QStringList uiLanguages() const;</div><div class='add'>+</div><div class='ctx'>     inline bool operator==(const QLocale &amp;other) const;</div><div class='ctx'>     inline bool operator!=(const QLocale &amp;other) const;</div><div class='ctx'> </div><div class='ctx'>     static QString languageToString(Language language);</div><div class='ctx'>     static QString countryToString(Country country);</div><div class='add'>+    static QString scriptToString(Script script);</div><div class='ctx'>     static void setDefault(const QLocale &amp;locale);</div><div class='ctx'> </div><div class='ctx'>     static QLocale c() { return QLocale(C); }</div><div class='ctx'>     static QLocale system();</div><div class='ctx'> </div><div class='add'>+    static QList&lt;QLocale&gt; matchingLocales(QLocale::Language language, QLocale::Script script, QLocale::Country country);</div><div class='ctx'>     static QList&lt;Country&gt; countriesForLanguage(Language lang);</div><div class='ctx'> </div><div class='ctx'>     void setNumberOptions(NumberOptions options);</div><div class='ctx'>     NumberOptions numberOptions() const;</div><div class='ctx'> </div><div class='add'>+    enum QuotationStyle { StandardQuotation, AlternateQuotation };</div><div class='add'>+    QString quoteString(const QString &amp;str, QuotationStyle style = StandardQuotation) const;</div><div class='add'>+    QString quoteString(const QStringRef &amp;str, QuotationStyle style = StandardQuotation) const;</div><div class='add'>+</div><div class='add'>+    QString createSeparatedList(const QStringList &amp;strl) const;</div><div class='ctx'> //private:                        // this should be private, but can't be</div><div class='ctx'>     struct Data {</div><div class='ctx'>         quint16 index;</div><div class='hunk'>@@ -716,6 +791,17 @@ inline bool QLocale::operator==(const QLocale &amp;other) const</div><div class='ctx'> inline bool QLocale::operator!=(const QLocale &amp;other) const</div><div class='ctx'>     { return d() != other.d() || numberOptions() != other.numberOptions(); }</div><div class='ctx'> </div><div class='add'>+inline QString QLocale::toCurrencyString(short i, const QString &amp;symbol) const</div><div class='add'>+    { return toCurrencyString(qlonglong(i), symbol); }</div><div class='add'>+inline QString QLocale::toCurrencyString(ushort i, const QString &amp;symbol) const</div><div class='add'>+    { return toCurrencyString(qulonglong(i), symbol); }</div><div class='add'>+inline QString QLocale::toCurrencyString(int i, const QString &amp;symbol) const</div><div class='add'>+{ return toCurrencyString(qlonglong(i), symbol); }</div><div class='add'>+inline QString QLocale::toCurrencyString(uint i, const QString &amp;symbol) const</div><div class='add'>+{ return toCurrencyString(qulonglong(i), symbol); }</div><div class='add'>+inline QString QLocale::toCurrencyString(float i, const QString &amp;symbol) const</div><div class='add'>+{ return toCurrencyString(double(i), symbol); }</div><div class='add'>+</div><div class='ctx'> #ifndef QT_NO_DATASTREAM</div><div class='ctx'> Q_CORE_EXPORT QDataStream &amp;operator&lt;&lt;(QDataStream &amp;, const QLocale &amp;);</div><div class='ctx'> Q_CORE_EXPORT QDataStream &amp;operator&gt;&gt;(QDataStream &amp;, QLocale &amp;);</div><div class='hunk'>@@ -723,6 +809,10 @@ Q_CORE_EXPORT QDataStream &amp;operator&gt;&gt;(QDataStream &amp;, QLocale &amp;);</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+Q_DECLARE_METATYPE(QSystemLocale::CurrencyToStringArgument)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> QT_END_HEADER</div><div class='ctx'> </div><div class='ctx'> #endif // QLOCALE_H</div><div class='head'>diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc<br/>new file mode 100644<br/>index 0000000..34e4fb3<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qlocale.qdoc</a></div><div class='hunk'>@@ -0,0 +1,905 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the documentation of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:FDL$</div><div class='add'>+** GNU Free Documentation License</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU Free</div><div class='add'>+** Documentation License version 1.3 as published by the Free Software</div><div class='add'>+** Foundation and appearing in the file included in the packaging of</div><div class='add'>+** this file.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms</div><div class='add'>+** and conditions contained in a signed written agreement between you</div><div class='add'>+** and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \class QLocale</div><div class='add'>+    \brief The QLocale class converts between numbers and their</div><div class='add'>+    string representations in various languages.</div><div class='add'>+</div><div class='add'>+    \reentrant</div><div class='add'>+    \ingroup i18n</div><div class='add'>+    \ingroup string-processing</div><div class='add'>+    \ingroup shared</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    QLocale is initialized with a language/country pair in its</div><div class='add'>+    constructor and offers number-to-string and string-to-number</div><div class='add'>+    conversion functions similar to those in QString.</div><div class='add'>+</div><div class='add'>+    Example:</div><div class='add'>+</div><div class='add'>+    \snippet doc/src/snippets/code/src_corelib_tools_qlocale.cpp 0</div><div class='add'>+</div><div class='add'>+    QLocale supports the concept of a default locale, which is</div><div class='add'>+    determined from the system's locale settings at application</div><div class='add'>+    startup. The default locale can be changed by calling the</div><div class='add'>+    static member setDefault(). Setting the default locale has the</div><div class='add'>+    following effects:</div><div class='add'>+</div><div class='add'>+    \list</div><div class='add'>+    \i If a QLocale object is constructed with the default constructor,</div><div class='add'>+       it will use the default locale's settings.</div><div class='add'>+    \i QString::toInt(), QString::toDouble(), etc., interpret the</div><div class='add'>+       string according to the default locale. If this fails, it</div><div class='add'>+       falls back on the "C" locale.</div><div class='add'>+    \i QString::arg() uses the default locale to format a number when</div><div class='add'>+       its position specifier in the format string contains an 'L',</div><div class='add'>+       e.g. "%L1".</div><div class='add'>+    \endlist</div><div class='add'>+</div><div class='add'>+    The following example illustrates how to use QLocale directly:</div><div class='add'>+</div><div class='add'>+    \snippet doc/src/snippets/code/src_corelib_tools_qlocale.cpp 1</div><div class='add'>+</div><div class='add'>+    When a language/country pair is specified in the constructor, one</div><div class='add'>+    of three things can happen:</div><div class='add'>+</div><div class='add'>+    \list</div><div class='add'>+    \i If the language/country pair is found in the database, it is used.</div><div class='add'>+    \i If the language is found but the country is not, or if the country</div><div class='add'>+       is \c AnyCountry, the language is used with the most</div><div class='add'>+       appropriate available country (for example, Germany for German),</div><div class='add'>+    \i If neither the language nor the country are found, QLocale</div><div class='add'>+       defaults to the default locale (see setDefault()).</div><div class='add'>+    \endlist</div><div class='add'>+</div><div class='add'>+    Use language() and country() to determine the actual language and</div><div class='add'>+    country values used.</div><div class='add'>+</div><div class='add'>+    An alternative method for constructing a QLocale object is by</div><div class='add'>+    specifying the locale name.</div><div class='add'>+</div><div class='add'>+    \snippet doc/src/snippets/code/src_corelib_tools_qlocale.cpp 2</div><div class='add'>+</div><div class='add'>+    This constructor converts the locale name to a language/country</div><div class='add'>+    pair; it does not use the system locale database.</div><div class='add'>+</div><div class='add'>+    \note For the current keyboard input locale take a look at</div><div class='add'>+    QApplication::keyboardInputLocale().</div><div class='add'>+</div><div class='add'>+    QLocale's data is based on Common Locale Data Repository v1.8.1.</div><div class='add'>+</div><div class='add'>+    The double-to-string and string-to-double conversion functions are</div><div class='add'>+    covered by the following licenses:</div><div class='add'>+</div><div class='add'>+    \legalese</div><div class='add'>+    Copyright (c) 1991 by AT&amp;T.</div><div class='add'>+</div><div class='add'>+    Permission to use, copy, modify, and distribute this software for any</div><div class='add'>+    purpose without fee is hereby granted, provided that this entire notice</div><div class='add'>+    is included in all copies of any software which is or includes a copy</div><div class='add'>+    or modification of this software and in all copies of the supporting</div><div class='add'>+    documentation for such software.</div><div class='add'>+</div><div class='add'>+    THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED</div><div class='add'>+    WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR AT&amp;T MAKES ANY</div><div class='add'>+    REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY</div><div class='add'>+    OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.</div><div class='add'>+</div><div class='add'>+    This product includes software developed by the University of</div><div class='add'>+    California, Berkeley and its contributors.</div><div class='add'>+</div><div class='add'>+    \sa QString::arg(), QString::toInt(), QString::toDouble(),</div><div class='add'>+    QApplication::keyboardInputLocale()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \enum QLocale::Language</div><div class='add'>+</div><div class='add'>+    This enumerated type is used to specify a language.</div><div class='add'>+</div><div class='add'>+    \value AnyLanguage</div><div class='add'>+    \value C The "C" locale is identical in behavior to English/UnitedStates.</div><div class='add'>+    \value Abkhazian</div><div class='add'>+    \value Afan</div><div class='add'>+    \value Afar</div><div class='add'>+    \value Afrikaans</div><div class='add'>+    \value Albanian</div><div class='add'>+    \value Amharic</div><div class='add'>+    \value Arabic</div><div class='add'>+    \value Armenian</div><div class='add'>+    \value Assamese</div><div class='add'>+    \value Aymara</div><div class='add'>+    \value Azerbaijani</div><div class='add'>+    \value Bashkir</div><div class='add'>+    \value Basque</div><div class='add'>+    \value Bengali</div><div class='add'>+    \value Bhutani</div><div class='add'>+    \value Bihari</div><div class='add'>+    \value Bislama</div><div class='add'>+    \value Bosnian</div><div class='add'>+    \value Breton</div><div class='add'>+    \value Bulgarian</div><div class='add'>+    \value Burmese</div><div class='add'>+    \value Byelorussian</div><div class='add'>+    \value Cambodian</div><div class='add'>+    \value Catalan</div><div class='add'>+    \value Chinese</div><div class='add'>+    \value Cornish</div><div class='add'>+    \value Corsican</div><div class='add'>+    \value Croatian</div><div class='add'>+    \value Czech</div><div class='add'>+    \value Danish</div><div class='add'>+    \value Divehi</div><div class='add'>+    \value Dutch</div><div class='add'>+    \value English</div><div class='add'>+    \value Esperanto</div><div class='add'>+    \value Estonian</div><div class='add'>+    \value Faroese</div><div class='add'>+    \value FijiLanguage</div><div class='add'>+    \value Finnish</div><div class='add'>+    \value French</div><div class='add'>+    \value Frisian</div><div class='add'>+    \value Gaelic</div><div class='add'>+    \value Galician</div><div class='add'>+    \value Georgian</div><div class='add'>+    \value German</div><div class='add'>+    \value Greek</div><div class='add'>+    \value Greenlandic</div><div class='add'>+    \value Guarani</div><div class='add'>+    \value Gujarati</div><div class='add'>+    \value Hausa</div><div class='add'>+    \value Hebrew</div><div class='add'>+    \value Hindi</div><div class='add'>+    \value Hungarian</div><div class='add'>+    \value Icelandic</div><div class='add'>+    \value Indonesian</div><div class='add'>+    \value Interlingua</div><div class='add'>+    \value Interlingue</div><div class='add'>+    \value Inuktitut</div><div class='add'>+    \value Inupiak</div><div class='add'>+    \value Irish</div><div class='add'>+    \value Italian</div><div class='add'>+    \value Japanese</div><div class='add'>+    \value Javanese</div><div class='add'>+    \value Kannada</div><div class='add'>+    \value Kashmiri</div><div class='add'>+    \value Kazakh</div><div class='add'>+    \value Kinyarwanda</div><div class='add'>+    \value Kirghiz</div><div class='add'>+    \value Korean</div><div class='add'>+    \value Kurdish</div><div class='add'>+    \value Kurundi</div><div class='add'>+    \value Laothian</div><div class='add'>+    \value Latin</div><div class='add'>+    \value Latvian</div><div class='add'>+    \value Lingala</div><div class='add'>+    \value Lithuanian</div><div class='add'>+    \value Macedonian</div><div class='add'>+    \value Malagasy</div><div class='add'>+    \value Malay</div><div class='add'>+    \value Malayalam</div><div class='add'>+    \value Maltese</div><div class='add'>+    \value Manx</div><div class='add'>+    \value Maori</div><div class='add'>+    \value Marathi</div><div class='add'>+    \value Moldavian</div><div class='add'>+    \value Mongolian</div><div class='add'>+    \value NauruLanguage</div><div class='add'>+    \value Nepali</div><div class='add'>+    \value Norwegian</div><div class='add'>+    \value NorwegianBokmal</div><div class='add'>+    \value Nynorsk Obsolete, please use NorwegianNynorsk</div><div class='add'>+    \value NorwegianNynorsk</div><div class='add'>+    \value Occitan</div><div class='add'>+    \value Oriya</div><div class='add'>+    \value Pashto</div><div class='add'>+    \value Persian</div><div class='add'>+    \value Polish</div><div class='add'>+    \value Portuguese</div><div class='add'>+    \value Punjabi</div><div class='add'>+    \value Quechua</div><div class='add'>+    \value RhaetoRomance</div><div class='add'>+    \value Romanian</div><div class='add'>+    \value Russian</div><div class='add'>+    \value Samoan</div><div class='add'>+    \value Sangho</div><div class='add'>+    \value Sanskrit</div><div class='add'>+    \value Serbian</div><div class='add'>+    \value SerboCroatian</div><div class='add'>+    \value Sesotho</div><div class='add'>+    \value Setswana</div><div class='add'>+    \value Shona</div><div class='add'>+    \value Sindhi</div><div class='add'>+    \value Singhalese</div><div class='add'>+    \value Siswati</div><div class='add'>+    \value Slovak</div><div class='add'>+    \value Slovenian</div><div class='add'>+    \value Somali</div><div class='add'>+    \value Spanish</div><div class='add'>+    \value Sundanese</div><div class='add'>+    \value Swahili</div><div class='add'>+    \value Swedish</div><div class='add'>+    \value Tagalog</div><div class='add'>+    \value Tajik</div><div class='add'>+    \value Tamil</div><div class='add'>+    \value Tatar</div><div class='add'>+    \value Telugu</div><div class='add'>+    \value Thai</div><div class='add'>+    \value Tibetan</div><div class='add'>+    \value Tigrinya</div><div class='add'>+    \value TongaLanguage</div><div class='add'>+    \value Tsonga</div><div class='add'>+    \value Turkish</div><div class='add'>+    \value Turkmen</div><div class='add'>+    \value Twi</div><div class='add'>+    \value Uigur</div><div class='add'>+    \value Ukrainian</div><div class='add'>+    \value Urdu</div><div class='add'>+    \value Uzbek</div><div class='add'>+    \value Vietnamese</div><div class='add'>+    \value Volapuk</div><div class='add'>+    \value Welsh</div><div class='add'>+    \value Wolof</div><div class='add'>+    \value Xhosa</div><div class='add'>+    \value Yiddish</div><div class='add'>+    \value Yoruba</div><div class='add'>+    \value Zhuang</div><div class='add'>+    \value Zulu</div><div class='add'>+    \value Bosnian</div><div class='add'>+    \value Divehi</div><div class='add'>+    \value Manx</div><div class='add'>+    \value Cornish</div><div class='add'>+    \value Akan</div><div class='add'>+    \value Konkani</div><div class='add'>+    \value Ga</div><div class='add'>+    \value Igbo</div><div class='add'>+    \value Kamba</div><div class='add'>+    \value Syriac</div><div class='add'>+    \value Blin</div><div class='add'>+    \value Geez</div><div class='add'>+    \value Koro</div><div class='add'>+    \value Sidamo</div><div class='add'>+    \value Atsam</div><div class='add'>+    \value Tigre</div><div class='add'>+    \value Jju</div><div class='add'>+    \value Friulian</div><div class='add'>+    \value Venda</div><div class='add'>+    \value Ewe</div><div class='add'>+    \value Walamo</div><div class='add'>+    \value Hawaiian</div><div class='add'>+    \value Tyap</div><div class='add'>+    \value Chewa</div><div class='add'>+    \value Filipino</div><div class='add'>+    \value SwissGerman</div><div class='add'>+    \value SichuanYi</div><div class='add'>+    \value Kpelle</div><div class='add'>+    \value LowGerman</div><div class='add'>+    \value SouthNdebele</div><div class='add'>+    \value NorthernSotho</div><div class='add'>+    \value NorthernSami</div><div class='add'>+    \value Taroko</div><div class='add'>+    \value Gusii</div><div class='add'>+    \value Taita</div><div class='add'>+    \value Fulah</div><div class='add'>+    \value Kikuyu</div><div class='add'>+    \value Samburu</div><div class='add'>+    \value Sena</div><div class='add'>+    \value NorthNdebele</div><div class='add'>+    \value Rombo</div><div class='add'>+    \value Tachelhit</div><div class='add'>+    \value Kabyle</div><div class='add'>+    \value Nyankole</div><div class='add'>+    \value Bena</div><div class='add'>+    \value Vunjo</div><div class='add'>+    \value Bambara</div><div class='add'>+    \value Embu</div><div class='add'>+    \value Cherokee</div><div class='add'>+    \value Morisyen</div><div class='add'>+    \value Makonde</div><div class='add'>+    \value Langi</div><div class='add'>+    \value Ganda</div><div class='add'>+    \value Bemba</div><div class='add'>+    \value Kabuverdianu</div><div class='add'>+    \value Meru</div><div class='add'>+    \value Kalenjin</div><div class='add'>+    \value Nama</div><div class='add'>+    \value Machame</div><div class='add'>+    \value Colognian</div><div class='add'>+    \value Masai</div><div class='add'>+    \value Soga</div><div class='add'>+    \value Luyia</div><div class='add'>+    \value Asu</div><div class='add'>+    \value Teso</div><div class='add'>+    \value Saho</div><div class='add'>+    \value KoyraChiini</div><div class='add'>+    \value Rwa</div><div class='add'>+    \value Luo</div><div class='add'>+    \value Chiga</div><div class='add'>+    \value CentralMoroccoTamazight</div><div class='add'>+    \value KoyraboroSenni</div><div class='add'>+    \value Shambala</div><div class='add'>+    \omitvalue LastLanguage</div><div class='add'>+</div><div class='add'>+    \sa language(), languageToString()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \enum QLocale::Country</div><div class='add'>+</div><div class='add'>+    This enumerated type is used to specify a country.</div><div class='add'>+</div><div class='add'>+    \value AnyCountry</div><div class='add'>+    \value Afghanistan</div><div class='add'>+    \value Albania</div><div class='add'>+    \value Algeria</div><div class='add'>+    \value AmericanSamoa</div><div class='add'>+    \value Andorra</div><div class='add'>+    \value Angola</div><div class='add'>+    \value Anguilla</div><div class='add'>+    \value Antarctica</div><div class='add'>+    \value AntiguaAndBarbuda</div><div class='add'>+    \value Argentina</div><div class='add'>+    \value Armenia</div><div class='add'>+    \value Aruba</div><div class='add'>+    \value Australia</div><div class='add'>+    \value Austria</div><div class='add'>+    \value Azerbaijan</div><div class='add'>+    \value Bahamas</div><div class='add'>+    \value Bahrain</div><div class='add'>+    \value Bangladesh</div><div class='add'>+    \value Barbados</div><div class='add'>+    \value Belarus</div><div class='add'>+    \value Belgium</div><div class='add'>+    \value Belize</div><div class='add'>+    \value Benin</div><div class='add'>+    \value Bermuda</div><div class='add'>+    \value Bhutan</div><div class='add'>+    \value Bolivia</div><div class='add'>+    \value BosniaAndHerzegowina</div><div class='add'>+    \value Botswana</div><div class='add'>+    \value BouvetIsland</div><div class='add'>+    \value Brazil</div><div class='add'>+    \value BritishIndianOceanTerritory</div><div class='add'>+    \value BruneiDarussalam</div><div class='add'>+    \value Bulgaria</div><div class='add'>+    \value BurkinaFaso</div><div class='add'>+    \value Burundi</div><div class='add'>+    \value Cambodia</div><div class='add'>+    \value Cameroon</div><div class='add'>+    \value Canada</div><div class='add'>+    \value CapeVerde</div><div class='add'>+    \value CaymanIslands</div><div class='add'>+    \value CentralAfricanRepublic</div><div class='add'>+    \value Chad</div><div class='add'>+    \value Chile</div><div class='add'>+    \value China</div><div class='add'>+    \value ChristmasIsland</div><div class='add'>+    \value CocosIslands</div><div class='add'>+    \value Colombia</div><div class='add'>+    \value Comoros</div><div class='add'>+    \value DemocraticRepublicOfCongo</div><div class='add'>+    \value PeoplesRepublicOfCongo</div><div class='add'>+    \value CookIslands</div><div class='add'>+    \value CostaRica</div><div class='add'>+    \value IvoryCoast</div><div class='add'>+    \value Croatia</div><div class='add'>+    \value Cuba</div><div class='add'>+    \value Cyprus</div><div class='add'>+    \value CzechRepublic</div><div class='add'>+    \value Denmark</div><div class='add'>+    \value Djibouti</div><div class='add'>+    \value Dominica</div><div class='add'>+    \value DominicanRepublic</div><div class='add'>+    \value EastTimor</div><div class='add'>+    \value Ecuador</div><div class='add'>+    \value Egypt</div><div class='add'>+    \value ElSalvador</div><div class='add'>+    \value EquatorialGuinea</div><div class='add'>+    \value Eritrea</div><div class='add'>+    \value Estonia</div><div class='add'>+    \value Ethiopia</div><div class='add'>+    \value FalklandIslands</div><div class='add'>+    \value FaroeIslands</div><div class='add'>+    \value FijiCountry</div><div class='add'>+    \value Finland</div><div class='add'>+    \value France</div><div class='add'>+    \value MetropolitanFrance</div><div class='add'>+    \value FrenchGuiana</div><div class='add'>+    \value FrenchPolynesia</div><div class='add'>+    \value FrenchSouthernTerritories</div><div class='add'>+    \value Gabon</div><div class='add'>+    \value Gambia</div><div class='add'>+    \value Georgia</div><div class='add'>+    \value Germany</div><div class='add'>+    \value Ghana</div><div class='add'>+    \value Gibraltar</div><div class='add'>+    \value Greece</div><div class='add'>+    \value Greenland</div><div class='add'>+    \value Grenada</div><div class='add'>+    \value Guadeloupe</div><div class='add'>+    \value Guam</div><div class='add'>+    \value Guatemala</div><div class='add'>+    \value Guinea</div><div class='add'>+    \value GuineaBissau</div><div class='add'>+    \value Guyana</div><div class='add'>+    \value Haiti</div><div class='add'>+    \value HeardAndMcDonaldIslands</div><div class='add'>+    \value Honduras</div><div class='add'>+    \value HongKong</div><div class='add'>+    \value Hungary</div><div class='add'>+    \value Iceland</div><div class='add'>+    \value India</div><div class='add'>+    \value Indonesia</div><div class='add'>+    \value Iran</div><div class='add'>+    \value Iraq</div><div class='add'>+    \value Ireland</div><div class='add'>+    \value Israel</div><div class='add'>+    \value Italy</div><div class='add'>+    \value Jamaica</div><div class='add'>+    \value Japan</div><div class='add'>+    \value Jordan</div><div class='add'>+    \value Kazakhstan</div><div class='add'>+    \value Kenya</div><div class='add'>+    \value Kiribati</div><div class='add'>+    \value DemocraticRepublicOfKorea</div><div class='add'>+    \value RepublicOfKorea</div><div class='add'>+    \value Kuwait</div><div class='add'>+    \value Kyrgyzstan</div><div class='add'>+    \value Lao</div><div class='add'>+    \value Latvia</div><div class='add'>+    \value Lebanon</div><div class='add'>+    \value Lesotho</div><div class='add'>+    \value Liberia</div><div class='add'>+    \value LibyanArabJamahiriya</div><div class='add'>+    \value Liechtenstein</div><div class='add'>+    \value Lithuania</div><div class='add'>+    \value Luxembourg</div><div class='add'>+    \value Macau</div><div class='add'>+    \value Macedonia</div><div class='add'>+    \value Madagascar</div><div class='add'>+    \value Malawi</div><div class='add'>+    \value Malaysia</div><div class='add'>+    \value Maldives</div><div class='add'>+    \value Mali</div><div class='add'>+    \value Malta</div><div class='add'>+    \value MarshallIslands</div><div class='add'>+    \value Martinique</div><div class='add'>+    \value Mauritania</div><div class='add'>+    \value Mauritius</div><div class='add'>+    \value Mayotte</div><div class='add'>+    \value Mexico</div><div class='add'>+    \value Micronesia</div><div class='add'>+    \value Moldova</div><div class='add'>+    \value Monaco</div><div class='add'>+    \value Mongolia</div><div class='add'>+    \value Montserrat</div><div class='add'>+    \value Morocco</div><div class='add'>+    \value Mozambique</div><div class='add'>+    \value Myanmar</div><div class='add'>+    \value Namibia</div><div class='add'>+    \value NauruCountry</div><div class='add'>+    \value Nepal</div><div class='add'>+    \value Netherlands</div><div class='add'>+    \value NetherlandsAntilles</div><div class='add'>+    \value NewCaledonia</div><div class='add'>+    \value NewZealand</div><div class='add'>+    \value Nicaragua</div><div class='add'>+    \value Niger</div><div class='add'>+    \value Nigeria</div><div class='add'>+    \value Niue</div><div class='add'>+    \value NorfolkIsland</div><div class='add'>+    \value NorthernMarianaIslands</div><div class='add'>+    \value Norway</div><div class='add'>+    \value Oman</div><div class='add'>+    \value Pakistan</div><div class='add'>+    \value Palau</div><div class='add'>+    \value PalestinianTerritory</div><div class='add'>+    \value Panama</div><div class='add'>+    \value PapuaNewGuinea</div><div class='add'>+    \value Paraguay</div><div class='add'>+    \value Peru</div><div class='add'>+    \value Philippines</div><div class='add'>+    \value Pitcairn</div><div class='add'>+    \value Poland</div><div class='add'>+    \value Portugal</div><div class='add'>+    \value PuertoRico</div><div class='add'>+    \value Qatar</div><div class='add'>+    \value Reunion</div><div class='add'>+    \value Romania</div><div class='add'>+    \value RussianFederation</div><div class='add'>+    \value Rwanda</div><div class='add'>+    \value SaintKittsAndNevis</div><div class='add'>+    \value StLucia</div><div class='add'>+    \value StVincentAndTheGrenadines</div><div class='add'>+    \value Samoa</div><div class='add'>+    \value SanMarino</div><div class='add'>+    \value SaoTomeAndPrincipe</div><div class='add'>+    \value SaudiArabia</div><div class='add'>+    \value Senegal</div><div class='add'>+    \value SerbiaAndMontenegro</div><div class='add'>+    \value Seychelles</div><div class='add'>+    \value SierraLeone</div><div class='add'>+    \value Singapore</div><div class='add'>+    \value Slovakia</div><div class='add'>+    \value Slovenia</div><div class='add'>+    \value SolomonIslands</div><div class='add'>+    \value Somalia</div><div class='add'>+    \value SouthAfrica</div><div class='add'>+    \value SouthGeorgiaAndTheSouthSandwichIslands</div><div class='add'>+    \value Spain</div><div class='add'>+    \value SriLanka</div><div class='add'>+    \value StHelena</div><div class='add'>+    \value StPierreAndMiquelon</div><div class='add'>+    \value Sudan</div><div class='add'>+    \value Suriname</div><div class='add'>+    \value SvalbardAndJanMayenIslands</div><div class='add'>+    \value Swaziland</div><div class='add'>+    \value Sweden</div><div class='add'>+    \value Switzerland</div><div class='add'>+    \value SyrianArabRepublic</div><div class='add'>+    \value Taiwan</div><div class='add'>+    \value Tajikistan</div><div class='add'>+    \value Tanzania</div><div class='add'>+    \value Thailand</div><div class='add'>+    \value Togo</div><div class='add'>+    \value Tokelau</div><div class='add'>+    \value TongaCountry</div><div class='add'>+    \value TrinidadAndTobago</div><div class='add'>+    \value Tunisia</div><div class='add'>+    \value Turkey</div><div class='add'>+    \value Turkmenistan</div><div class='add'>+    \value TurksAndCaicosIslands</div><div class='add'>+    \value Tuvalu</div><div class='add'>+    \value Uganda</div><div class='add'>+    \value Ukraine</div><div class='add'>+    \value UnitedArabEmirates</div><div class='add'>+    \value UnitedKingdom</div><div class='add'>+    \value UnitedStates</div><div class='add'>+    \value UnitedStatesMinorOutlyingIslands</div><div class='add'>+    \value Uruguay</div><div class='add'>+    \value Uzbekistan</div><div class='add'>+    \value Vanuatu</div><div class='add'>+    \value VaticanCityState</div><div class='add'>+    \value Venezuela</div><div class='add'>+    \value VietNam</div><div class='add'>+    \value BritishVirginIslands</div><div class='add'>+    \value USVirginIslands</div><div class='add'>+    \value WallisAndFutunaIslands</div><div class='add'>+    \value WesternSahara</div><div class='add'>+    \value Yemen</div><div class='add'>+    \value Yugoslavia</div><div class='add'>+    \value Zambia</div><div class='add'>+    \value Zimbabwe</div><div class='add'>+    \value SerbiaAndMontenegro</div><div class='add'>+    \value Montenegro</div><div class='add'>+    \value Serbia</div><div class='add'>+    \value SaintBarthelemy</div><div class='add'>+    \value SaintMartin</div><div class='add'>+    \value LatinAmericaAndTheCaribbean</div><div class='add'>+    \omitvalue LastCountry</div><div class='add'>+</div><div class='add'>+    \sa country(), countryToString()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \enum QLocale::Script</div><div class='add'>+</div><div class='add'>+    This enumerated type is used to specify a script.</div><div class='add'>+</div><div class='add'>+    \value AnyScript</div><div class='add'>+    \value ArabicScript</div><div class='add'>+    \value CyrillicScript</div><div class='add'>+    \value DeseretScript</div><div class='add'>+    \value GurmukhiScript</div><div class='add'>+    \value SimplifiedHanScript same as SimplifiedChineseScript</div><div class='add'>+    \value SimplifiedChineseScript same as SimplifiedHanScript</div><div class='add'>+    \value TraditionalHanScript same as TraditionalChineseScript</div><div class='add'>+    \value TraditionalChineseScript same as TraditionalHanScript</div><div class='add'>+    \value LatinScript</div><div class='add'>+    \value MongolianScript</div><div class='add'>+    \value TifinaghScript</div><div class='add'>+    \omitvalue LastScript</div><div class='add'>+</div><div class='add'>+    \sa script(), scriptToString(), languageToString()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \enum QLocale::FormatType</div><div class='add'>+</div><div class='add'>+    This enum describes the types of format that can be used when</div><div class='add'>+    converting QDate and QTime objects to strings.</div><div class='add'>+</div><div class='add'>+    \value LongFormat The long version of day and month names; for</div><div class='add'>+    example, returning "January" as a month name.</div><div class='add'>+</div><div class='add'>+    \value ShortFormat The short version of day and month names; for</div><div class='add'>+    example, returning "Jan" as a month name.</div><div class='add'>+</div><div class='add'>+    \value NarrowFormat A special version of day and month names for</div><div class='add'>+    use when space is limited; for example, returning "J" as a month</div><div class='add'>+    name. Note that the narrow format might contain the same text for</div><div class='add'>+    different months and days or it can even be an empty string if the</div><div class='add'>+    locale doesn't support narrow names, so you should avoid using it</div><div class='add'>+    for date formatting. Also, for the system locale this format is</div><div class='add'>+    the same as ShortFormat.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \enum QLocale::NumberOption</div><div class='add'>+</div><div class='add'>+    This enum defines a set of options for number-to-string and string-to-number</div><div class='add'>+    conversions. They can be retrieved with numberOptions() and set with</div><div class='add'>+    setNumberOptions().</div><div class='add'>+</div><div class='add'>+    \value OmitGroupSeparator If this option is set, the number-to-string functions</div><div class='add'>+            will not insert group separators in their return values. The default</div><div class='add'>+            is to insert group separators.</div><div class='add'>+    \value RejectGroupSeparator If this option is set, the string-to-number functions</div><div class='add'>+            will fail if they encounter group separators in their input. The default</div><div class='add'>+            is to accept numbers containing correctly placed group separators.</div><div class='add'>+</div><div class='add'>+    \sa setNumberOptions() numberOptions()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \enum QLocale::MeasurementSystem</div><div class='add'>+</div><div class='add'>+    This enum defines which units are used for measurement.</div><div class='add'>+</div><div class='add'>+    \value MetricSystem This value indicates metric units, such as meters,</div><div class='add'>+            centimeters and millimeters.</div><div class='add'>+    \value ImperialSystem This value indicates imperial units, such as inches and</div><div class='add'>+            miles. There are several distinct imperial systems in the world; this</div><div class='add'>+            value stands for the official United States imperial units.</div><div class='add'>+</div><div class='add'>+    \since 4.4</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn bool QLocale::operator==(const QLocale &amp;other) const</div><div class='add'>+</div><div class='add'>+    Returns true if the QLocale object is the same as the \a other</div><div class='add'>+    locale specified; otherwise returns false.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn bool QLocale::operator!=(const QLocale &amp;other) const</div><div class='add'>+</div><div class='add'>+    Returns true if the QLocale object is not the same as the \a other</div><div class='add'>+    locale specified; otherwise returns false.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \enum QLocale::QuotationStyle</div><div class='add'>+</div><div class='add'>+    This enum defines a set of possible styles for locale specific quotation.</div><div class='add'>+</div><div class='add'>+    \value StandardQuotation If this option is set, the standard quotation marks</div><div class='add'>+            will be used to quote strings.</div><div class='add'>+    \value AlternateQuotation If this option is set, the alternate quotation marks</div><div class='add'>+            will be used to quote strings.</div><div class='add'>+</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    \sa quoteString()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \class QSystemLocale</div><div class='add'>+    \brief The QSystemLocale class can be used to finetune the system locale</div><div class='add'>+    of the user.</div><div class='add'>+    \since 4.2</div><div class='add'>+</div><div class='add'>+    \ingroup i18n</div><div class='add'>+</div><div class='add'>+    \warning This class is only useful in very rare cases. Usually QLocale offers</div><div class='add'>+    all the functionality required for application development.</div><div class='add'>+</div><div class='add'>+    QSystemLocale allows to override the values provided by the system</div><div class='add'>+    locale (QLocale::system()).</div><div class='add'>+</div><div class='add'>+    \sa QLocale</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+  \enum QSystemLocale::QueryType</div><div class='add'>+</div><div class='add'>+  Specifies the type of information queried by query(). For each value</div><div class='add'>+  the type of information to return from the query() method is listed.</div><div class='add'>+</div><div class='add'>+  \value LanguageId a uint specifying the language.</div><div class='add'>+  \value ScriptId a uint specifying the script.</div><div class='add'>+  \value CountryId a uint specifying the country.</div><div class='add'>+  \value DecimalPoint a QString specifying the decimal point.</div><div class='add'>+  \value GroupSeparator a QString specifying the group separator.</div><div class='add'>+  \value ZeroDigit a QString specifying the zero digit.</div><div class='add'>+  \value NegativeSign a QString specifying the minus sign.</div><div class='add'>+  \value PositiveSign a QString specifying the plus sign.</div><div class='add'>+  \value DateFormatLong a QString specifying the long date format</div><div class='add'>+  \value DateFormatShort a QString specifying the short date format</div><div class='add'>+  \value TimeFormatLong a QString specifying the long time format</div><div class='add'>+  \value TimeFormatShort a QString specifying the short time format</div><div class='add'>+  \value DayNameLong a QString specifying the name of a weekday. the in variant contains an integer between 1 and 7 (Monday - Sunday)</div><div class='add'>+  \value DayNameShort a QString specifying the short name of a weekday. the in variant contains an integer between 1 and 7 (Monday - Sunday)</div><div class='add'>+  \value MonthNameLong a QString specifying the name of a month. the in variant contains an integer between 1 and 12</div><div class='add'>+  \value MonthNameShort a QString specifying the short name of a month. the in variant contains an integer between 1 and 12</div><div class='add'>+  \value DateToStringLong converts the QDate stored in the in variant to a QString using the long date format</div><div class='add'>+  \value DateToStringShort converts the QDate stored in the in variant to a QString using the short date format</div><div class='add'>+  \value TimeToStringLong converts the QTime stored in the in variant to a QString using the long time format</div><div class='add'>+  \value TimeToStringShort converts the QTime stored in the in variant to a QString using the short time format</div><div class='add'>+  \value DateTimeFormatLong a QString specifying the long date time format</div><div class='add'>+  \value DateTimeFormatShort a QString specifying the short date time format</div><div class='add'>+  \value DateTimeToStringLong converts the QDateTime in the in variant to a QString using the long datetime format</div><div class='add'>+  \value DateTimeToStringShort converts the QDateTime in the in variant to a QString using the short datetime format</div><div class='add'>+  \value MeasurementSystem a QLocale::MeasurementSystem enum specifying the measurement system</div><div class='add'>+  \value AMText a string that represents the system AM designator associated with a 12-hour clock.</div><div class='add'>+  \value PMText a string that represents the system PM designator associated with a 12-hour clock.</div><div class='add'>+  \value FirstDayOfWeek a Qt::DayOfWeek enum specifiying the first day of the week</div><div class='add'>+  \value CurrencySymbol a string that represents a currency in a format QLocale::CurrencyFormat.</div><div class='add'>+  \value CurrencyToString a localized string representation of a number with a currency symbol. Converts a QSystemLocale::CurrencyToStringArgument stored in the in variant to a QString.</div><div class='add'>+  \value UILanguages a list of strings representing locale names that could be used for UI translation.</div><div class='add'>+  \value StringToStandardQuotation a QString containing a quoted version of the string ref stored in the in variant using standard quotes.</div><div class='add'>+  \value StringToAlternateQuotation a QString containing a quoted version of the string ref stored in the in variant using alternate quotes.</div><div class='add'>+  \value Weekdays a QList&lt;Qt::DayOfWeek&gt; specifying the regular weekdays</div><div class='add'>+  \value LocaleChanged this type is queried whenever the system locale is changed.</div><div class='add'>+  \value ListToSeparatedString a string that represents a join of a given QStringList with a locale-defined separator.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn QLocale QSystemLocale::fallbackLocale() const</div><div class='add'>+</div><div class='add'>+    \since 4.6</div><div class='add'>+    Returns the fallback locale obtained from the system.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const</div><div class='add'>+</div><div class='add'>+    Generic query method for locale data. Provides indirection.</div><div class='add'>+    Denotes the \a type of the query</div><div class='add'>+    with \a in as input data depending on the query.</div><div class='add'>+</div><div class='add'>+    \sa QSystemLocale::QueryType</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \class QSystemLocale::CurrencyToStringArgument</div><div class='add'>+</div><div class='add'>+    A helper class that provides arguments for the QSystemLocale::query()</div><div class='add'>+    function with query type QSystemLocale::CurrencyToString.</div><div class='add'>+</div><div class='add'>+    \sa QSystemLocale::QueryType</div><div class='add'>+    \since 4.8</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn QSystemLocale::CurrencyToStringArgument::CurrencyToStringArgument()</div><div class='add'>+    \internal</div><div class='add'>+*/</div><div class='add'>+/*!</div><div class='add'>+    \variable QSystemLocale::CurrencyToStringArgument::value</div><div class='add'>+</div><div class='add'>+    An input value that should be converted to its string representation.</div><div class='add'>+    Contains one of QVariant::LongLong, QVariant::ULongLong or QVariant::Double</div><div class='add'>+    types.</div><div class='add'>+*/</div><div class='add'>+/*!</div><div class='add'>+    \variable QSystemLocale::CurrencyToStringArgument::symbol</div><div class='add'>+</div><div class='add'>+    An optional argument containing a currency symbol to be used in the</div><div class='add'>+    currency string.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+\fn QString QLocale::toString(short i) const</div><div class='add'>+</div><div class='add'>+\overload</div><div class='add'>+</div><div class='add'>+\sa toShort()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+\fn QString QLocale::toString(ushort i) const</div><div class='add'>+</div><div class='add'>+\overload</div><div class='add'>+</div><div class='add'>+\sa toUShort()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+\fn QString QLocale::toString(int i) const</div><div class='add'>+</div><div class='add'>+\overload</div><div class='add'>+</div><div class='add'>+\sa toInt()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+\fn QString QLocale::toString(uint i) const</div><div class='add'>+</div><div class='add'>+\overload</div><div class='add'>+</div><div class='add'>+\sa toUInt()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+\fn QString QLocale::toString(long i) const</div><div class='add'>+</div><div class='add'>+\overload</div><div class='add'>+</div><div class='add'>+\sa  toLong()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+\fn QString QLocale::toString(ulong i) const</div><div class='add'>+</div><div class='add'>+\overload</div><div class='add'>+</div><div class='add'>+\sa toULong()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+\fn QString QLocale::toString(float i, char f = 'g', int prec = 6) const</div><div class='add'>+</div><div class='add'>+\overload</div><div class='add'>+</div><div class='add'>+\a f and \a prec have the same meaning as in QString::number(double, char, int).</div><div class='add'>+</div><div class='add'>+\sa toDouble()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn QString QLocale::toCurrencyString(short value, const QString &amp;symbol) const</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn QString QLocale::toCurrencyString(ushort value, const QString &amp;symbol) const</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn QString QLocale::toCurrencyString(int value, const QString &amp;symbol) const</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn QString QLocale::toCurrencyString(uint value, const QString &amp;symbol) const</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload</div><div class='add'>+*/</div><div class='add'>+/*!</div><div class='add'>+    \fn QString QLocale::toCurrencyString(float value, const QString &amp;symbol) const</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload</div><div class='add'>+*/</div><div class='head'>diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/tools/qlocale_data_p.h<br/>index 6219fc2..95b23a2 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale_data_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale_data_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale_data_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qlocale_data_p.h</a></div><div class='hunk'>@@ -72,8 +72,10 @@ static const CountryLanguage ImperialMeasurementSystems[] = {</div><div class='ctx'> static const int ImperialMeasurementSystemsCount =</div><div class='ctx'>     sizeof(ImperialMeasurementSystems)/sizeof(ImperialMeasurementSystems[0]);</div><div class='ctx'> </div><div class='add'>+// GENERATED PART STARTS HERE</div><div class='add'>+</div><div class='ctx'> /*</div><div class='del'>-    This part of the file was generated on 2010-05-19 from the</div><div class='add'>+    This part of the file was generated on 2011-03-28 from the</div><div class='ctx'>     Common Locale Data Repository v1.8.1</div><div class='ctx'> </div><div class='ctx'>     http://www.unicode.org/cldr/</div><div class='hunk'>@@ -84,7 +86,7 @@ static const int ImperialMeasurementSystemsCount =</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static const quint16 locale_index[] = {</div><div class='del'>-     0, // unused</div><div class='add'>+     0, // AnyLanguage</div><div class='ctx'>      0, // C</div><div class='ctx'>      0, // Abkhazian</div><div class='ctx'>      1, // Afan</div><div class='hunk'>@@ -98,537 +100,604 @@ static const quint16 locale_index[] = {</div><div class='ctx'>      0, // Aymara</div><div class='ctx'>     29, // Azerbaijani</div><div class='ctx'>      0, // Bashkir</div><div class='del'>-    31, // Basque</div><div class='del'>-    32, // Bengali</div><div class='del'>-    34, // Bhutani</div><div class='add'>+    34, // Basque</div><div class='add'>+    35, // Bengali</div><div class='add'>+    37, // Bhutani</div><div class='ctx'>      0, // Bihari</div><div class='ctx'>      0, // Bislama</div><div class='del'>-    35, // Breton</div><div class='del'>-    36, // Bulgarian</div><div class='del'>-    37, // Burmese</div><div class='del'>-    38, // Byelorussian</div><div class='del'>-    39, // Cambodian</div><div class='del'>-    40, // Catalan</div><div class='del'>-    41, // Chinese</div><div class='add'>+    38, // Breton</div><div class='add'>+    39, // Bulgarian</div><div class='add'>+    40, // Burmese</div><div class='add'>+    41, // Byelorussian</div><div class='add'>+    42, // Cambodian</div><div class='add'>+    43, // Catalan</div><div class='add'>+    44, // Chinese</div><div class='ctx'>      0, // Corsican</div><div class='del'>-    46, // Croatian</div><div class='del'>-    47, // Czech</div><div class='del'>-    48, // Danish</div><div class='del'>-    49, // Dutch</div><div class='del'>-    51, // English</div><div class='add'>+    56, // Croatian</div><div class='add'>+    57, // Czech</div><div class='add'>+    58, // Danish</div><div class='add'>+    59, // Dutch</div><div class='add'>+    61, // English</div><div class='ctx'>      0, // Esperanto</div><div class='del'>-    78, // Estonian</div><div class='del'>-    79, // Faroese</div><div class='add'>+    89, // Estonian</div><div class='add'>+    90, // Faroese</div><div class='ctx'>      0, // Fiji</div><div class='del'>-    80, // Finnish</div><div class='del'>-    81, // French</div><div class='add'>+    91, // Finnish</div><div class='add'>+    92, // French</div><div class='ctx'>      0, // Frisian</div><div class='ctx'>      0, // Gaelic</div><div class='del'>-   100, // Galician</div><div class='del'>-   101, // Georgian</div><div class='del'>-   102, // German</div><div class='del'>-   108, // Greek</div><div class='del'>-   110, // Greenlandic</div><div class='add'>+   111, // Galician</div><div class='add'>+   112, // Georgian</div><div class='add'>+   113, // German</div><div class='add'>+   119, // Greek</div><div class='add'>+   121, // Greenlandic</div><div class='ctx'>      0, // Guarani</div><div class='del'>-   111, // Gujarati</div><div class='del'>-   112, // Hausa</div><div class='del'>-   116, // Hebrew</div><div class='del'>-   117, // Hindi</div><div class='del'>-   118, // Hungarian</div><div class='del'>-   119, // Icelandic</div><div class='del'>-   120, // Indonesian</div><div class='add'>+   122, // Gujarati</div><div class='add'>+   123, // Hausa</div><div class='add'>+   132, // Hebrew</div><div class='add'>+   133, // Hindi</div><div class='add'>+   134, // Hungarian</div><div class='add'>+   135, // Icelandic</div><div class='add'>+   136, // Indonesian</div><div class='ctx'>      0, // Interlingua</div><div class='ctx'>      0, // Interlingue</div><div class='ctx'>      0, // Inuktitut</div><div class='ctx'>      0, // Inupiak</div><div class='del'>-   121, // Irish</div><div class='del'>-   122, // Italian</div><div class='del'>-   124, // Japanese</div><div class='add'>+   137, // Irish</div><div class='add'>+   138, // Italian</div><div class='add'>+   140, // Japanese</div><div class='ctx'>      0, // Javanese</div><div class='del'>-   125, // Kannada</div><div class='add'>+   141, // Kannada</div><div class='ctx'>      0, // Kashmiri</div><div class='del'>-   126, // Kazakh</div><div class='del'>-   127, // Kinyarwanda</div><div class='del'>-   128, // Kirghiz</div><div class='del'>-   129, // Korean</div><div class='del'>-   130, // Kurdish</div><div class='add'>+   142, // Kazakh</div><div class='add'>+   144, // Kinyarwanda</div><div class='add'>+   145, // Kirghiz</div><div class='add'>+   146, // Korean</div><div class='add'>+   147, // Kurdish</div><div class='ctx'>      0, // Kurundi</div><div class='del'>-   134, // Laothian</div><div class='add'>+   155, // Laothian</div><div class='ctx'>      0, // Latin</div><div class='del'>-   135, // Latvian</div><div class='del'>-   136, // Lingala</div><div class='del'>-   138, // Lithuanian</div><div class='del'>-   139, // Macedonian</div><div class='del'>-   140, // Malagasy</div><div class='del'>-   141, // Malay</div><div class='del'>-   143, // Malayalam</div><div class='del'>-   144, // Maltese</div><div class='del'>-   145, // Maori</div><div class='del'>-   146, // Marathi</div><div class='add'>+   156, // Latvian</div><div class='add'>+   157, // Lingala</div><div class='add'>+   159, // Lithuanian</div><div class='add'>+   160, // Macedonian</div><div class='add'>+   161, // Malagasy</div><div class='add'>+   162, // Malay</div><div class='add'>+   164, // Malayalam</div><div class='add'>+   165, // Maltese</div><div class='add'>+   166, // Maori</div><div class='add'>+   167, // Marathi</div><div class='ctx'>      0, // Moldavian</div><div class='del'>-   147, // Mongolian</div><div class='add'>+   168, // Mongolian</div><div class='ctx'>      0, // Nauru</div><div class='del'>-   149, // Nepali</div><div class='del'>-   151, // Norwegian</div><div class='del'>-   152, // Occitan</div><div class='del'>-   153, // Oriya</div><div class='del'>-   154, // Pashto</div><div class='del'>-   155, // Persian</div><div class='del'>-   157, // Polish</div><div class='del'>-   158, // Portuguese</div><div class='del'>-   162, // Punjabi</div><div class='add'>+   172, // Nepali</div><div class='add'>+   174, // Norwegian</div><div class='add'>+   175, // Occitan</div><div class='add'>+   176, // Oriya</div><div class='add'>+   177, // Pashto</div><div class='add'>+   178, // Persian</div><div class='add'>+   180, // Polish</div><div class='add'>+   181, // Portuguese</div><div class='add'>+   185, // Punjabi</div><div class='ctx'>      0, // Quechua</div><div class='del'>-   164, // RhaetoRomance</div><div class='del'>-   165, // Romanian</div><div class='del'>-   167, // Russian</div><div class='add'>+   189, // RhaetoRomance</div><div class='add'>+   190, // Romanian</div><div class='add'>+   192, // Russian</div><div class='ctx'>      0, // Samoan</div><div class='del'>-   170, // Sangho</div><div class='del'>-   171, // Sanskrit</div><div class='del'>-   172, // Serbian</div><div class='del'>-   177, // SerboCroatian</div><div class='del'>-   180, // Sesotho</div><div class='del'>-   182, // Setswana</div><div class='del'>-   183, // Shona</div><div class='add'>+   195, // Sangho</div><div class='add'>+   196, // Sanskrit</div><div class='add'>+   197, // Serbian</div><div class='add'>+   212, // SerboCroatian</div><div class='add'>+   215, // Sesotho</div><div class='add'>+   217, // Setswana</div><div class='add'>+   218, // Shona</div><div class='ctx'>      0, // Sindhi</div><div class='del'>-   184, // Singhalese</div><div class='del'>-   185, // Siswati</div><div class='del'>-   187, // Slovak</div><div class='del'>-   188, // Slovenian</div><div class='del'>-   189, // Somali</div><div class='del'>-   193, // Spanish</div><div class='add'>+   219, // Singhalese</div><div class='add'>+   220, // Siswati</div><div class='add'>+   222, // Slovak</div><div class='add'>+   223, // Slovenian</div><div class='add'>+   224, // Somali</div><div class='add'>+   228, // Spanish</div><div class='ctx'>      0, // Sundanese</div><div class='del'>-   215, // Swahili</div><div class='del'>-   217, // Swedish</div><div class='add'>+   250, // Swahili</div><div class='add'>+   252, // Swedish</div><div class='ctx'>      0, // Tagalog</div><div class='del'>-   219, // Tajik</div><div class='del'>-   220, // Tamil</div><div class='del'>-   222, // Tatar</div><div class='del'>-   223, // Telugu</div><div class='del'>-   224, // Thai</div><div class='del'>-   225, // Tibetan</div><div class='del'>-   227, // Tigrinya</div><div class='del'>-   229, // Tonga</div><div class='del'>-   230, // Tsonga</div><div class='del'>-   231, // Turkish</div><div class='add'>+   254, // Tajik</div><div class='add'>+   256, // Tamil</div><div class='add'>+   258, // Tatar</div><div class='add'>+   259, // Telugu</div><div class='add'>+   260, // Thai</div><div class='add'>+   261, // Tibetan</div><div class='add'>+   263, // Tigrinya</div><div class='add'>+   265, // Tonga</div><div class='add'>+   266, // Tsonga</div><div class='add'>+   267, // Turkish</div><div class='ctx'>      0, // Turkmen</div><div class='ctx'>      0, // Twi</div><div class='del'>-   232, // Uigur</div><div class='del'>-   233, // Ukrainian</div><div class='del'>-   234, // Urdu</div><div class='del'>-   236, // Uzbek</div><div class='del'>-   238, // Vietnamese</div><div class='add'>+   268, // Uigur</div><div class='add'>+   270, // Ukrainian</div><div class='add'>+   271, // Urdu</div><div class='add'>+   273, // Uzbek</div><div class='add'>+   278, // Vietnamese</div><div class='ctx'>      0, // Volapuk</div><div class='del'>-   239, // Welsh</div><div class='del'>-   240, // Wolof</div><div class='del'>-   241, // Xhosa</div><div class='add'>+   279, // Welsh</div><div class='add'>+   280, // Wolof</div><div class='add'>+   282, // Xhosa</div><div class='ctx'>      0, // Yiddish</div><div class='del'>-   242, // Yoruba</div><div class='add'>+   283, // Yoruba</div><div class='ctx'>      0, // Zhuang</div><div class='del'>-   243, // Zulu</div><div class='del'>-   244, // Nynorsk</div><div class='del'>-   245, // Bosnian</div><div class='del'>-   246, // Divehi</div><div class='del'>-   247, // Manx</div><div class='del'>-   248, // Cornish</div><div class='del'>-   249, // Akan</div><div class='del'>-   250, // Konkani</div><div class='del'>-   251, // Ga</div><div class='del'>-   252, // Igbo</div><div class='del'>-   253, // Kamba</div><div class='del'>-   254, // Syriac</div><div class='del'>-   255, // Blin</div><div class='del'>-   256, // Geez</div><div class='del'>-   258, // Koro</div><div class='del'>-   259, // Sidamo</div><div class='del'>-   260, // Atsam</div><div class='del'>-   261, // Tigre</div><div class='del'>-   262, // Jju</div><div class='del'>-   263, // Friulian</div><div class='del'>-   264, // Venda</div><div class='del'>-   265, // Ewe</div><div class='del'>-   267, // Walamo</div><div class='del'>-   268, // Hawaiian</div><div class='del'>-   269, // Tyap</div><div class='del'>-   270, // Chewa</div><div class='del'>-   271, // Filipino</div><div class='del'>-   272, // Swiss German</div><div class='del'>-   273, // Sichuan Yi</div><div class='del'>-   274, // Kpelle</div><div class='del'>-   276, // Low German</div><div class='del'>-   277, // South Ndebele</div><div class='del'>-   278, // Northern Sotho</div><div class='del'>-   279, // Northern Sami</div><div class='del'>-   281, // Taroko</div><div class='del'>-   282, // Gusii</div><div class='del'>-   283, // Taita</div><div class='del'>-   284, // Fulah</div><div class='del'>-   285, // Kikuyu</div><div class='del'>-   286, // Samburu</div><div class='del'>-   287, // Sena</div><div class='del'>-   288, // North Ndebele</div><div class='del'>-   289, // Rombo</div><div class='del'>-   290, // Tachelhit</div><div class='del'>-   291, // Kabyle</div><div class='del'>-   292, // Nyankole</div><div class='del'>-   293, // Bena</div><div class='del'>-   294, // Vunjo</div><div class='del'>-   295, // Bambara</div><div class='del'>-   296, // Embu</div><div class='del'>-   297, // Cherokee</div><div class='del'>-   298, // Morisyen</div><div class='del'>-   299, // Makonde</div><div class='del'>-   300, // Langi</div><div class='del'>-   301, // Ganda</div><div class='del'>-   302, // Bemba</div><div class='del'>-   303, // Kabuverdianu</div><div class='del'>-   304, // Meru</div><div class='del'>-   305, // Kalenjin</div><div class='del'>-   306, // Nama</div><div class='del'>-   307, // Machame</div><div class='del'>-   308, // Colognian</div><div class='del'>-   309, // Masai</div><div class='del'>-   311, // Soga</div><div class='del'>-   312, // Luyia</div><div class='del'>-   313, // Asu</div><div class='del'>-   314, // Teso</div><div class='del'>-   316, // Saho</div><div class='del'>-   317, // Koyra Chiini</div><div class='del'>-   318, // Rwa</div><div class='del'>-   319, // Luo</div><div class='del'>-   320, // Chiga</div><div class='del'>-   321, // Central Morocco Tamazight</div><div class='del'>-   322, // Koyraboro Senni</div><div class='del'>-   323, // Shambala</div><div class='add'>+   284, // Zulu</div><div class='add'>+   285, // Nynorsk</div><div class='add'>+   286, // Bosnian</div><div class='add'>+   287, // Divehi</div><div class='add'>+   288, // Manx</div><div class='add'>+   289, // Cornish</div><div class='add'>+   290, // Akan</div><div class='add'>+   291, // Konkani</div><div class='add'>+   292, // Ga</div><div class='add'>+   293, // Igbo</div><div class='add'>+   294, // Kamba</div><div class='add'>+   295, // Syriac</div><div class='add'>+   296, // Blin</div><div class='add'>+   297, // Geez</div><div class='add'>+   299, // Koro</div><div class='add'>+   300, // Sidamo</div><div class='add'>+   301, // Atsam</div><div class='add'>+   302, // Tigre</div><div class='add'>+   303, // Jju</div><div class='add'>+   304, // Friulian</div><div class='add'>+   305, // Venda</div><div class='add'>+   306, // Ewe</div><div class='add'>+   308, // Walamo</div><div class='add'>+   309, // Hawaiian</div><div class='add'>+   310, // Tyap</div><div class='add'>+   311, // Chewa</div><div class='add'>+   312, // Filipino</div><div class='add'>+   313, // Swiss German</div><div class='add'>+   314, // Sichuan Yi</div><div class='add'>+   315, // Kpelle</div><div class='add'>+   317, // Low German</div><div class='add'>+   318, // South Ndebele</div><div class='add'>+   319, // Northern Sotho</div><div class='add'>+   320, // Northern Sami</div><div class='add'>+   322, // Taroko</div><div class='add'>+   323, // Gusii</div><div class='add'>+   324, // Taita</div><div class='add'>+   325, // Fulah</div><div class='add'>+   326, // Kikuyu</div><div class='add'>+   327, // Samburu</div><div class='add'>+   328, // Sena</div><div class='add'>+   329, // North Ndebele</div><div class='add'>+   330, // Rombo</div><div class='add'>+   331, // Tachelhit</div><div class='add'>+   334, // Kabyle</div><div class='add'>+   335, // Nyankole</div><div class='add'>+   336, // Bena</div><div class='add'>+   337, // Vunjo</div><div class='add'>+   338, // Bambara</div><div class='add'>+   339, // Embu</div><div class='add'>+   340, // Cherokee</div><div class='add'>+   341, // Morisyen</div><div class='add'>+   342, // Makonde</div><div class='add'>+   343, // Langi</div><div class='add'>+   344, // Ganda</div><div class='add'>+   345, // Bemba</div><div class='add'>+   346, // Kabuverdianu</div><div class='add'>+   347, // Meru</div><div class='add'>+   348, // Kalenjin</div><div class='add'>+   349, // Nama</div><div class='add'>+   350, // Machame</div><div class='add'>+   351, // Colognian</div><div class='add'>+   352, // Masai</div><div class='add'>+   354, // Soga</div><div class='add'>+   355, // Luyia</div><div class='add'>+   356, // Asu</div><div class='add'>+   357, // Teso</div><div class='add'>+   359, // Saho</div><div class='add'>+   360, // Koyra Chiini</div><div class='add'>+   361, // Rwa</div><div class='add'>+   362, // Luo</div><div class='add'>+   363, // Chiga</div><div class='add'>+   364, // Central Morocco Tamazight</div><div class='add'>+   366, // Koyraboro Senni</div><div class='add'>+   367, // Shambala</div><div class='ctx'>      0 // trailing 0</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const QLocalePrivate locale_data[] = {</div><div class='del'>-//      lang   terr    dec  group   list  prcnt   zero  minus  plus    exp sDtFmt lDtFmt sTmFmt lTmFmt ssMonth slMonth  sMonth lMonth  sDays  lDays  am,len      pm,len</div><div class='del'>-    {      1,     0,    46,    44,    59,    37,    48,    45,    43,   101, 0,10 , 10,17 , 0,8 , 8,10 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 134,27 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 99,14 , 0,2 , 0,2  }, // C/AnyCountry</div><div class='del'>-    {      3,    69,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 35,18 , 18,7 , 25,12 , 158,48 , 206,111 , 134,24 , 161,48 , 209,111 , 320,24 , 113,28 , 141,55 , 85,14 , 113,28 , 141,55 , 85,14 , 2,2 , 2,2  }, // Afan/Ethiopia</div><div class='del'>-    {      3,   111,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 35,18 , 18,7 , 25,12 , 158,48 , 206,111 , 134,24 , 161,48 , 209,111 , 320,24 , 113,28 , 141,55 , 85,14 , 113,28 , 141,55 , 85,14 , 2,2 , 2,2  }, // Afan/Kenya</div><div class='del'>-    {      4,    59,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 53,19 , 18,7 , 25,12 , 317,48 , 365,129 , 494,24 , 344,48 , 392,129 , 521,24 , 196,28 , 224,52 , 276,14 , 196,28 , 224,52 , 276,14 , 0,2 , 0,2  }, // Afar/Djibouti</div><div class='del'>-    {      4,    67,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 53,19 , 18,7 , 25,12 , 317,48 , 518,118 , 494,24 , 344,48 , 545,118 , 521,24 , 196,28 , 224,52 , 276,14 , 196,28 , 224,52 , 276,14 , 0,2 , 0,2  }, // Afar/Eritrea</div><div class='del'>-    {      4,    69,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 53,19 , 18,7 , 25,12 , 317,48 , 518,118 , 494,24 , 344,48 , 545,118 , 521,24 , 196,28 , 224,52 , 276,14 , 196,28 , 224,52 , 276,14 , 0,2 , 0,2  }, // Afar/Ethiopia</div><div class='del'>-    {      5,   195,    44,   160,    59,    37,    48,    45,    43,   101, 72,10 , 82,17 , 18,7 , 25,12 , 636,48 , 684,92 , 134,24 , 663,48 , 711,92 , 320,24 , 290,21 , 311,58 , 369,14 , 290,21 , 311,58 , 369,14 , 4,3 , 4,3  }, // Afrikaans/SouthAfrica</div><div class='del'>-    {      5,   148,    44,   160,    59,    37,    48,    45,    43,   101, 72,10 , 99,16 , 37,5 , 8,10 , 636,48 , 684,92 , 134,24 , 663,48 , 711,92 , 320,24 , 290,21 , 311,58 , 369,14 , 290,21 , 311,58 , 369,14 , 4,3 , 4,3  }, // Afrikaans/Namibia</div><div class='del'>-    {      6,     2,    44,    46,    59,    37,    48,    45,    43,   101, 115,8 , 123,18 , 42,7 , 49,12 , 776,48 , 824,78 , 902,24 , 803,48 , 851,78 , 929,24 , 383,28 , 411,58 , 469,14 , 383,28 , 411,58 , 469,14 , 7,2 , 7,2  }, // Albanian/Albania</div><div class='del'>-    {      7,    69,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 926,46 , 972,62 , 1034,24 , 953,46 , 999,62 , 1061,24 , 483,27 , 510,28 , 538,14 , 483,27 , 510,28 , 538,14 , 9,3 , 9,4  }, // Amharic/Ethiopia</div><div class='del'>-    {      8,   186,  1643,  1644,  1563,  1642,  1632,    45,    43,   101, 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 552,52 , 604,52 , 656,14 , 552,52 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/SaudiArabia</div><div class='del'>-    {      8,     3,    44,    46,    59,    37,    48,    45,    43,   101, 179,8 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/Algeria</div><div class='del'>-    {      8,    17,  1643,  1644,  1563,  1642,  1632,    45,    43,   101, 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/Bahrain</div><div class='del'>-    {      8,    64,  1643,  1644,  1563,  1642,  1632,    45,    43,   101, 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/Egypt</div><div class='del'>-    {      8,   103,  1643,  1644,  1563,  1642,  1632,    45,    43,   101, 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/Iraq</div><div class='del'>-    {      8,   109,  1643,  1644,  1563,  1642,  1632,    45,    43,   101, 151,10 , 161,18 , 18,7 , 61,12 , 1157,92 , 1157,92 , 1133,24 , 1184,92 , 1184,92 , 1160,24 , 552,52 , 604,52 , 656,14 , 552,52 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/Jordan</div><div class='del'>-    {      8,   115,  1643,  1644,  1563,  1642,  1632,    45,    43,   101, 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/Kuwait</div><div class='del'>-    {      8,   119,  1643,  1644,  1563,  1642,  1632,    45,    43,   101, 151,10 , 161,18 , 18,7 , 61,12 , 1249,92 , 1249,92 , 1133,24 , 1276,92 , 1276,92 , 1160,24 , 552,52 , 604,52 , 656,14 , 552,52 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/Lebanon</div><div class='del'>-    {      8,   122,  1643,  1644,  1563,  1642,  1632,    45,    43,   101, 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/LibyanArabJamahiriya</div><div class='del'>-    {      8,   145,    44,    46,    59,    37,    48,    45,    43,   101, 179,8 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/Morocco</div><div class='del'>-    {      8,   162,  1643,  1644,  1563,  1642,  1632,    45,    43,   101, 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/Oman</div><div class='del'>-    {      8,   175,  1643,  1644,  1563,  1642,  1632,    45,    43,   101, 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 552,52 , 604,52 , 656,14 , 552,52 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/Qatar</div><div class='del'>-    {      8,   201,  1643,  1644,  1563,  1642,  1632,    45,    43,   101, 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/Sudan</div><div class='del'>-    {      8,   207,  1643,  1644,  1563,  1642,  1632,    45,    43,   101, 151,10 , 161,18 , 18,7 , 61,12 , 1249,92 , 1249,92 , 1133,24 , 1276,92 , 1276,92 , 1160,24 , 552,52 , 604,52 , 656,14 , 552,52 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/SyrianArabRepublic</div><div class='del'>-    {      8,   216,    44,    46,    59,    37,    48,    45,    43,   101, 179,8 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 552,52 , 604,52 , 656,14 , 552,52 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/Tunisia</div><div class='del'>-    {      8,   223,  1643,  1644,  1563,  1642,  1632,    45,    43,   101, 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/UnitedArabEmirates</div><div class='del'>-    {      8,   237,  1643,  1644,  1563,  1642,  1632,    45,    43,   101, 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 552,52 , 604,52 , 656,14 , 552,52 , 604,52 , 656,14 , 12,1 , 13,1  }, // Arabic/Yemen</div><div class='del'>-    {      9,    11,    44,    46,    59,    37,    48,    45,    43,   101, 187,8 , 35,18 , 37,5 , 8,10 , 1341,48 , 1389,94 , 1483,27 , 1368,48 , 1416,94 , 134,27 , 708,28 , 736,62 , 798,14 , 708,28 , 736,62 , 798,14 , 13,3 , 14,3  }, // Armenian/Armenia</div><div class='del'>-    {     10,   100,    46,    44,    59,    37,    48,    45,    43,   101, 195,8 , 203,18 , 73,8 , 81,12 , 1510,62 , 1572,88 , 1483,27 , 1510,62 , 1572,88 , 134,27 , 812,37 , 849,58 , 798,14 , 812,37 , 849,58 , 798,14 , 16,9 , 17,7  }, // Assamese/India</div><div class='del'>-    {     12,    15,    44,    46,    59,    37,    48,    45,    43,   101, 221,8 , 229,19 , 37,5 , 8,10 , 1660,48 , 1708,77 , 1483,27 , 1660,48 , 1708,77 , 134,27 , 907,26 , 933,67 , 99,14 , 907,26 , 933,67 , 99,14 , 0,2 , 0,2  }, // Azerbaijani/Azerbaijan</div><div class='del'>-    {     12,   102,    44,    46,    59,    37,    48,    45,    43,   101, 221,8 , 229,19 , 37,5 , 8,10 , 1660,48 , 1708,77 , 1483,27 , 1660,48 , 1708,77 , 134,27 , 907,26 , 933,67 , 99,14 , 907,26 , 933,67 , 99,14 , 0,2 , 0,2  }, // Azerbaijani/Iran</div><div class='del'>-    {     14,   197,    44,    46,    59,    37,    48,    45,    43,   101, 72,10 , 248,31 , 37,5 , 8,10 , 1785,48 , 1833,93 , 1926,24 , 1785,48 , 1833,93 , 1926,24 , 1000,21 , 1021,68 , 798,14 , 1000,21 , 1021,68 , 798,14 , 0,2 , 0,2  }, // Basque/Spain</div><div class='del'>-    {     15,    18,    46,    44,    59,    37,  2534,    45,    43,   101, 279,6 , 203,18 , 18,7 , 25,12 , 1950,90 , 1950,90 , 2040,33 , 1950,90 , 1950,90 , 2040,33 , 1089,37 , 1126,58 , 1184,18 , 1089,37 , 1126,58 , 1184,18 , 25,9 , 24,7  }, // Bengali/Bangladesh</div><div class='del'>-    {     15,   100,    46,    44,    59,    37,  2534,    45,    43,   101, 279,6 , 203,18 , 18,7 , 25,12 , 1950,90 , 1950,90 , 2040,33 , 1950,90 , 1950,90 , 2040,33 , 1089,37 , 1126,58 , 1184,18 , 1089,37 , 1126,58 , 1184,18 , 25,9 , 24,7  }, // Bengali/India</div><div class='del'>-    {     16,    25,    46,    44,    59,    37,    48,    45,    43,   101, 72,10 , 285,29 , 93,22 , 115,35 , 2073,75 , 2148,205 , 1483,27 , 2073,75 , 2148,205 , 134,27 , 1202,34 , 1236,79 , 798,14 , 1202,34 , 1236,79 , 798,14 , 0,2 , 0,2  }, // Bhutani/Bhutan</div><div class='del'>-    {     19,    74,    46,    44,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2  }, // Breton/France</div><div class='del'>-    {     20,    33,    44,   160,    59,    37,    48,    45,    43,   101, 332,8 , 340,18 , 37,5 , 8,10 , 2353,59 , 2412,82 , 2494,24 , 2353,59 , 2412,82 , 2494,24 , 1315,21 , 1336,55 , 1391,14 , 1315,21 , 1336,55 , 1391,14 , 34,7 , 31,7  }, // Bulgarian/Bulgaria</div><div class='del'>-    {     21,   147,    46,    44,  4170,    37,  4160,    45,    43,   101, 221,8 , 314,18 , 37,5 , 8,10 , 2518,43 , 2561,88 , 2649,24 , 2518,43 , 2561,88 , 2649,24 , 1405,25 , 1430,54 , 1484,14 , 1405,25 , 1430,54 , 1484,14 , 0,2 , 0,2  }, // Burmese/Myanmar</div><div class='del'>-    {     22,    20,    44,   160,    59,    37,    48,    45,    43,   101, 358,6 , 10,17 , 150,5 , 155,10 , 2673,48 , 2721,99 , 2820,24 , 2673,48 , 2721,95 , 2816,24 , 1498,21 , 1519,56 , 1575,14 , 1498,21 , 1519,56 , 1575,14 , 41,10 , 38,13  }, // Byelorussian/Belarus</div><div class='del'>-    {     23,    36,    44,    46,    59,    37,    48,    45,    43,   101, 364,8 , 372,30 , 165,4 , 169,26 , 2844,27 , 2871,71 , 1483,27 , 2840,27 , 2867,71 , 134,27 , 1589,19 , 1608,76 , 798,14 , 1589,19 , 1608,76 , 798,14 , 51,5 , 51,5  }, // Cambodian/Cambodia</div><div class='del'>-    {     24,   197,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 402,21 , 165,4 , 195,9 , 2942,60 , 3002,82 , 3084,24 , 2938,93 , 3031,115 , 3146,24 , 1684,21 , 1705,60 , 1765,14 , 1779,28 , 1807,60 , 1867,14 , 56,4 , 56,4  }, // Catalan/Spain</div><div class='del'>-    {     25,    44,    46,    44,    59,    37,    48,    45,    43,   101, 423,6 , 429,13 , 204,6 , 210,11 , 3108,38 , 3108,38 , 3146,39 , 3170,39 , 3170,39 , 3170,39 , 1881,21 , 1902,28 , 1930,14 , 1881,21 , 1902,28 , 1930,14 , 60,2 , 60,2  }, // Chinese/China</div><div class='del'>-    {     25,    97,    46,    44,    59,    37,    48,    45,    43,   101, 442,7 , 429,13 , 204,6 , 221,11 , 3108,38 , 3108,38 , 1483,27 , 3170,39 , 3170,39 , 134,27 , 1944,21 , 1902,28 , 1930,14 , 1944,21 , 1902,28 , 1930,14 , 60,2 , 60,2  }, // Chinese/HongKong</div><div class='del'>-    {     25,   126,    46,    44,    59,    37,    48,    45,    43,   101, 442,7 , 449,15 , 204,6 , 221,11 , 3108,38 , 3108,38 , 1483,27 , 3170,39 , 3170,39 , 134,27 , 1944,21 , 1902,28 , 1930,14 , 1944,21 , 1902,28 , 1930,14 , 60,2 , 60,2  }, // Chinese/Macau</div><div class='del'>-    {     25,   190,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 429,13 , 232,7 , 210,11 , 3108,38 , 3108,38 , 3146,39 , 3170,39 , 3170,39 , 3170,39 , 1881,21 , 1902,28 , 1930,14 , 1881,21 , 1902,28 , 1930,14 , 60,2 , 60,2  }, // Chinese/Singapore</div><div class='del'>-    {     25,   208,    46,    44,    59,    37,    48,    45,    43,   101, 464,6 , 429,13 , 204,6 , 221,11 , 3108,38 , 3108,38 , 1483,27 , 3170,39 , 3170,39 , 134,27 , 1944,21 , 1902,28 , 1930,14 , 1944,21 , 1902,28 , 1930,14 , 60,2 , 60,2  }, // Chinese/Taiwan</div><div class='del'>-    {     27,    54,    44,    46,    59,    37,    48,    45,    43,   101, 470,13 , 483,19 , 37,5 , 8,10 , 3185,49 , 3234,94 , 3328,39 , 3209,49 , 3258,98 , 3356,39 , 1965,28 , 1993,58 , 2051,14 , 1965,28 , 1993,58 , 2051,14 , 0,2 , 0,2  }, // Croatian/Croatia</div><div class='del'>-    {     28,    57,    44,   160,    59,    37,    48,    45,    43,   101, 358,6 , 502,18 , 165,4 , 195,9 , 3328,39 , 3367,82 , 3449,24 , 134,27 , 3395,84 , 3479,24 , 2065,21 , 2086,49 , 2135,14 , 2065,21 , 2086,49 , 2135,14 , 62,4 , 62,4  }, // Czech/CzechRepublic</div><div class='del'>-    {     29,    58,    44,    46,    44,    37,    48,    45,    43,   101, 27,8 , 520,23 , 150,5 , 155,10 , 3473,48 , 3521,84 , 134,24 , 3503,59 , 3562,84 , 320,24 , 2149,28 , 2177,51 , 2228,14 , 2149,28 , 2177,51 , 2228,14 , 66,4 , 66,4  }, // Danish/Denmark</div><div class='del'>-    {     30,   151,    44,    46,    59,    37,    48,    45,    43,   101, 543,8 , 99,16 , 37,5 , 8,10 , 3605,48 , 3653,88 , 134,24 , 3646,59 , 3705,88 , 320,24 , 2242,21 , 2263,59 , 2322,14 , 2242,21 , 2263,59 , 2322,14 , 0,2 , 0,2  }, // Dutch/Netherlands</div><div class='del'>-    {     30,    21,    44,    46,    59,    37,    48,    45,    43,   101, 551,7 , 99,16 , 37,5 , 8,10 , 3605,48 , 3653,88 , 134,24 , 3646,59 , 3705,88 , 320,24 , 2242,21 , 2263,59 , 2322,14 , 2242,21 , 2263,59 , 2322,14 , 0,2 , 0,2  }, // Dutch/Belgium</div><div class='del'>-    {     31,   225,    46,    44,    59,    37,    48,    45,    43,   101, 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/UnitedStates</div><div class='del'>-    {     31,     4,    46,    44,    59,    37,    48,    45,    43,   101, 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/AmericanSamoa</div><div class='del'>-    {     31,    13,    46,    44,    59,    37,    48,    45,    43,   101, 551,7 , 10,17 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/Australia</div><div class='del'>-    {     31,    21,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 239,24 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/Belgium</div><div class='del'>-    {     31,    22,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 564,12 , 37,5 , 8,10 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/Belize</div><div class='del'>-    {     31,    28,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 82,17 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/Botswana</div><div class='del'>-    {     31,    38,    46,    44,    59,    37,    48,    45,    43,   101, 115,8 , 203,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/Canada</div><div class='del'>-    {     31,    89,    46,    44,    59,    37,    48,    45,    43,   101, 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/Guam</div><div class='del'>-    {     31,    97,    46,    44,    59,    37,    48,    45,    43,   101, 279,6 , 203,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/HongKong</div><div class='del'>-    {     31,   100,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/India</div><div class='del'>-    {     31,   104,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 99,16 , 37,5 , 8,10 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 56,4 , 56,4  }, // English/Ireland</div><div class='del'>-    {     31,   107,    46,    44,    59,    37,    48,    45,    43,   101, 279,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/Jamaica</div><div class='del'>-    {     31,   133,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 37,5 , 8,10 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/Malta</div><div class='del'>-    {     31,   134,    46,    44,    59,    37,    48,    45,    43,   101, 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/MarshallIslands</div><div class='del'>-    {     31,   137,    46,    44,    59,    37,    48,    45,    43,   101, 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/Mauritius</div><div class='del'>-    {     31,   148,    46,    44,    59,    37,    48,    45,    43,   101, 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/Namibia</div><div class='del'>-    {     31,   154,    46,    44,    59,    37,    48,    45,    43,   101, 551,7 , 10,17 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/NewZealand</div><div class='del'>-    {     31,   160,    46,    44,    59,    37,    48,    45,    43,   101, 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/NorthernMarianaIslands</div><div class='del'>-    {     31,   163,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/Pakistan</div><div class='del'>-    {     31,   170,    46,    44,    59,    37,    48,    45,    43,   101, 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/Philippines</div><div class='del'>-    {     31,   190,    46,    44,    59,    37,    48,    45,    43,   101, 279,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/Singapore</div><div class='del'>-    {     31,   195,    44,   160,    59,    37,    48,    45,    43,   101, 576,10 , 82,17 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/SouthAfrica</div><div class='del'>-    {     31,   215,    46,    44,    59,    37,    48,    45,    43,   101, 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/TrinidadAndTobago</div><div class='del'>-    {     31,   224,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 37,5 , 8,10 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/UnitedKingdom</div><div class='del'>-    {     31,   226,    46,    44,    59,    37,    48,    45,    43,   101, 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/UnitedStatesMinorOutlyingIslands</div><div class='del'>-    {     31,   234,    46,    44,    59,    37,    48,    45,    43,   101, 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/USVirginIslands</div><div class='del'>-    {     31,   240,    46,    44,    59,    37,    48,    45,    43,   101, 364,8 , 82,17 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2  }, // English/Zimbabwe</div><div class='del'>-    {     33,    68,    44,   160,    59,    37,    48,    45,    43,   101, 332,8 , 502,18 , 165,4 , 263,9 , 3741,59 , 3800,91 , 3891,24 , 3793,59 , 3852,91 , 3943,24 , 2336,14 , 2350,63 , 2336,14 , 2336,14 , 2350,63 , 2336,14 , 70,14 , 70,16  }, // Estonian/Estonia</div><div class='del'>-    {     34,    71,    44,    46,    59,    37,    48,  8722,    43,   101, 543,8 , 82,17 , 37,5 , 8,10 , 3915,48 , 3963,83 , 134,24 , 3967,48 , 4015,83 , 320,24 , 2413,28 , 2441,74 , 2515,14 , 2413,28 , 2441,74 , 2515,14 , 0,2 , 0,2  }, // Faroese/FaroeIslands</div><div class='del'>-    {     36,    73,    44,   160,    59,    37,    48,    45,    43,   101, 586,8 , 594,17 , 272,4 , 276,9 , 4046,69 , 4115,105 , 4220,24 , 4098,129 , 4098,129 , 4227,24 , 2529,21 , 2550,67 , 2617,14 , 2529,21 , 2631,81 , 2617,14 , 84,3 , 86,3  }, // Finnish/Finland</div><div class='del'>-    {     37,    74,    44,   160,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/France</div><div class='del'>-    {     37,    21,    44,    46,    59,    37,    48,    45,    43,   101, 551,7 , 99,16 , 37,5 , 285,23 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/Belgium</div><div class='del'>-    {     37,    37,    44,   160,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/Cameroon</div><div class='del'>-    {     37,    38,    44,   160,    59,    37,    48,    45,    43,   101, 115,8 , 99,16 , 37,5 , 239,24 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/Canada</div><div class='del'>-    {     37,    41,    44,   160,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/CentralAfricanRepublic</div><div class='del'>-    {     37,    53,    44,   160,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/IvoryCoast</div><div class='del'>-    {     37,    88,    44,   160,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/Guadeloupe</div><div class='del'>-    {     37,    91,    44,   160,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/Guinea</div><div class='del'>-    {     37,   125,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/Luxembourg</div><div class='del'>-    {     37,   128,    44,   160,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/Madagascar</div><div class='del'>-    {     37,   132,    44,   160,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/Mali</div><div class='del'>-    {     37,   135,    44,   160,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/Martinique</div><div class='del'>-    {     37,   142,    44,   160,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/Monaco</div><div class='del'>-    {     37,   156,    44,   160,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/Niger</div><div class='del'>-    {     37,   176,    44,   160,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/Reunion</div><div class='del'>-    {     37,   187,    44,   160,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/Senegal</div><div class='del'>-    {     37,   206,    46,    39,    59,    37,    48,    45,    43,   101, 332,8 , 10,17 , 37,5 , 308,14 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/Switzerland</div><div class='del'>-    {     37,   244,    44,   160,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/Saint Barthelemy</div><div class='del'>-    {     37,   245,    44,   160,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 4244,63 , 4307,85 , 134,24 , 4251,63 , 4314,85 , 320,24 , 2712,35 , 2747,52 , 2799,14 , 2712,35 , 2747,52 , 2799,14 , 0,2 , 0,2  }, // French/Saint Martin</div><div class='del'>-    {     40,   197,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 82,17 , 37,5 , 8,10 , 4392,48 , 4440,87 , 4527,24 , 4399,48 , 4447,87 , 4534,24 , 2813,28 , 2841,49 , 2890,14 , 2813,28 , 2841,49 , 2890,14 , 0,2 , 0,2  }, // Galician/Spain</div><div class='del'>-    {     41,    81,    44,    46,    59,    37,    48,    45,    43,   101, 221,8 , 314,18 , 37,5 , 8,10 , 4551,48 , 4599,99 , 4698,24 , 4558,48 , 4606,99 , 4705,24 , 2904,28 , 2932,62 , 2994,14 , 2904,28 , 2932,62 , 2994,14 , 0,2 , 0,2  }, // Georgian/Georgia</div><div class='del'>-    {     42,    82,    44,    46,    59,    37,    48,    45,    43,   101, 332,8 , 502,18 , 37,5 , 8,10 , 4722,52 , 4774,83 , 134,24 , 4729,48 , 4777,83 , 320,24 , 3008,21 , 3029,60 , 3089,14 , 3103,28 , 3029,60 , 3089,14 , 87,5 , 89,6  }, // German/Germany</div><div class='del'>-    {     42,    14,    44,    46,    59,    37,    48,    45,    43,   101, 332,8 , 611,19 , 37,5 , 8,10 , 4722,52 , 4857,83 , 134,24 , 4860,48 , 4908,83 , 320,24 , 3008,21 , 3029,60 , 3089,14 , 3103,28 , 3029,60 , 3089,14 , 87,5 , 89,6  }, // German/Austria</div><div class='del'>-    {     42,    21,    44,    46,    59,    37,    48,    45,    43,   101, 551,7 , 99,16 , 37,5 , 239,24 , 4722,52 , 4774,83 , 134,24 , 4729,48 , 4777,83 , 320,24 , 3008,21 , 3029,60 , 3089,14 , 3131,28 , 3029,60 , 3089,14 , 87,5 , 89,6  }, // German/Belgium</div><div class='del'>-    {     42,   123,    46,    39,    59,    37,    48,    45,    43,   101, 332,8 , 502,18 , 37,5 , 8,10 , 4722,52 , 4774,83 , 134,24 , 4729,48 , 4777,83 , 320,24 , 3008,21 , 3029,60 , 3089,14 , 3103,28 , 3029,60 , 3089,14 , 87,5 , 89,6  }, // German/Liechtenstein</div><div class='del'>-    {     42,   125,    44,    46,    59,    37,    48,    45,    43,   101, 332,8 , 502,18 , 37,5 , 8,10 , 4722,52 , 4774,83 , 134,24 , 4729,48 , 4777,83 , 320,24 , 3008,21 , 3029,60 , 3089,14 , 3103,28 , 3029,60 , 3089,14 , 87,5 , 89,6  }, // German/Luxembourg</div><div class='del'>-    {     42,   206,    46,    39,    59,    37,    48,    45,    43,   101, 332,8 , 502,18 , 37,5 , 8,10 , 4722,52 , 4774,83 , 134,24 , 4729,48 , 4777,83 , 320,24 , 3008,21 , 3029,60 , 3089,14 , 3103,28 , 3029,60 , 3089,14 , 87,5 , 89,6  }, // German/Switzerland</div><div class='del'>-    {     43,    85,    44,    46,    44,    37,    48,    45,    43,   101, 279,6 , 10,17 , 18,7 , 25,12 , 4940,50 , 4990,115 , 5105,24 , 4991,50 , 5041,115 , 5156,24 , 3159,28 , 3187,55 , 3242,14 , 3159,28 , 3187,55 , 3242,14 , 92,4 , 95,4  }, // Greek/Greece</div><div class='del'>-    {     43,    56,    44,    46,    44,    37,    48,    45,    43,   101, 279,6 , 10,17 , 18,7 , 25,12 , 4940,50 , 4990,115 , 5105,24 , 4991,50 , 5041,115 , 5156,24 , 3159,28 , 3187,55 , 3242,14 , 3159,28 , 3187,55 , 3242,14 , 92,4 , 95,4  }, // Greek/Cyprus</div><div class='del'>-    {     44,    86,    44,    46,    59,    37,    48,  8722,    43,   101, 72,10 , 82,17 , 18,7 , 25,12 , 3473,48 , 5129,96 , 134,24 , 5180,48 , 5228,96 , 320,24 , 3256,28 , 3284,98 , 3382,14 , 3256,28 , 3284,98 , 3382,14 , 0,2 , 0,2  }, // Greenlandic/Greenland</div><div class='del'>-    {     46,   100,    46,    44,    59,    37,    48,    45,    43,   101, 630,7 , 203,18 , 322,8 , 330,13 , 5225,67 , 5292,87 , 5379,31 , 5324,67 , 5391,87 , 5478,31 , 3396,32 , 3428,53 , 3481,19 , 3396,32 , 3428,53 , 3481,19 , 96,14 , 99,14  }, // Gujarati/India</div><div class='del'>-    {     47,    83,    46,    44,    59,    37,    48,    45,    43,   101, 279,6 , 203,18 , 37,5 , 8,10 , 5410,48 , 5458,85 , 5543,24 , 5509,48 , 5557,85 , 5642,24 , 3500,21 , 3521,52 , 3573,14 , 3500,21 , 3521,52 , 3573,14 , 0,2 , 0,2  }, // Hausa/Ghana</div><div class='del'>-    {     47,   156,    46,    44,    59,    37,    48,    45,    43,   101, 279,6 , 203,18 , 37,5 , 8,10 , 5410,48 , 5458,85 , 5543,24 , 5509,48 , 5557,85 , 5642,24 , 3500,21 , 3521,52 , 3573,14 , 3500,21 , 3521,52 , 3573,14 , 0,2 , 0,2  }, // Hausa/Niger</div><div class='del'>-    {     47,   157,    46,    44,    59,    37,    48,    45,    43,   101, 279,6 , 203,18 , 37,5 , 8,10 , 5410,48 , 5458,85 , 5543,24 , 5509,48 , 5557,85 , 5642,24 , 3500,21 , 3521,52 , 3573,14 , 3500,21 , 3521,52 , 3573,14 , 0,2 , 0,2  }, // Hausa/Nigeria</div><div class='del'>-    {     47,   201,    46,    44,    59,    37,    48,    45,    43,   101, 279,6 , 203,18 , 37,5 , 8,10 , 5567,55 , 5622,99 , 5543,24 , 5666,55 , 5721,99 , 5642,24 , 3587,31 , 3618,57 , 3573,14 , 3587,31 , 3618,57 , 3573,14 , 0,2 , 0,2  }, // Hausa/Sudan</div><div class='del'>-    {     48,   105,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 637,18 , 37,5 , 8,10 , 5721,58 , 5779,72 , 1483,27 , 5820,48 , 5868,72 , 134,27 , 3675,46 , 3721,65 , 3786,14 , 3675,46 , 3721,65 , 3786,14 , 110,6 , 113,5  }, // Hebrew/Israel</div><div class='del'>-    {     49,   100,    46,    44,    59,    37,  2406,    45,    43,   101, 655,6 , 10,17 , 18,7 , 25,12 , 5851,75 , 5851,75 , 5926,30 , 5940,75 , 5940,75 , 6015,30 , 3800,38 , 3838,57 , 3895,19 , 3800,38 , 3838,57 , 3895,19 , 116,9 , 118,7  }, // Hindi/India</div><div class='del'>-    {     50,    98,    44,   160,    59,    37,    48,    45,    43,   101, 661,11 , 672,19 , 165,4 , 195,9 , 5956,64 , 6020,98 , 6118,25 , 6045,64 , 6109,98 , 6207,25 , 3914,19 , 3933,52 , 3985,17 , 3914,19 , 3933,52 , 3985,17 , 125,3 , 125,3  }, // Hungarian/Hungary</div><div class='del'>-    {     51,    99,    44,    46,    59,    37,    48,  8722,    43,   101, 586,8 , 502,18 , 37,5 , 8,10 , 6143,48 , 6191,82 , 6273,24 , 6232,48 , 6280,82 , 6362,24 , 4002,28 , 4030,81 , 4111,14 , 4002,28 , 4030,81 , 4125,14 , 128,4 , 128,4  }, // Icelandic/Iceland</div><div class='del'>-    {     52,   101,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 123,18 , 150,5 , 276,9 , 6297,48 , 6345,87 , 134,24 , 6386,48 , 6434,87 , 320,24 , 4139,28 , 4167,43 , 4210,14 , 4139,28 , 4167,43 , 4210,14 , 0,2 , 0,2  }, // Indonesian/Indonesia</div><div class='del'>-    {     57,   104,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 99,16 , 37,5 , 8,10 , 6432,62 , 6494,107 , 6601,24 , 6521,62 , 6583,107 , 6690,24 , 4224,37 , 4261,75 , 4336,14 , 4224,37 , 4261,75 , 4336,14 , 56,4 , 56,4  }, // Irish/Ireland</div><div class='del'>-    {     58,   106,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 99,16 , 37,5 , 8,10 , 6625,48 , 6673,94 , 6767,24 , 6714,48 , 6762,94 , 6856,24 , 4350,28 , 4378,57 , 4435,14 , 4350,28 , 4449,57 , 4435,14 , 132,2 , 132,2  }, // Italian/Italy</div><div class='del'>-    {     58,   206,    46,    39,    59,    37,    48,    45,    43,   101, 332,8 , 10,17 , 37,5 , 308,14 , 6625,48 , 6673,94 , 6767,24 , 6714,48 , 6762,94 , 6856,24 , 4350,28 , 4378,57 , 4435,14 , 4350,28 , 4449,57 , 4435,14 , 132,2 , 132,2  }, // Italian/Switzerland</div><div class='del'>-    {     59,   108,    46,    44,    59,    37,    48,    45,    43,   101, 221,8 , 429,13 , 165,4 , 343,10 , 3146,39 , 3146,39 , 1483,27 , 3170,39 , 3170,39 , 134,27 , 4506,14 , 4520,28 , 4506,14 , 4506,14 , 4520,28 , 4506,14 , 134,2 , 134,2  }, // Japanese/Japan</div><div class='del'>-    {     61,   100,    46,    44,    59,    37,  3302,    45,    43,   101, 655,6 , 99,16 , 322,8 , 330,13 , 6791,86 , 6791,86 , 6877,31 , 6880,86 , 6880,86 , 6966,31 , 4548,28 , 4576,53 , 4629,19 , 4548,28 , 4576,53 , 4629,19 , 136,2 , 136,2  }, // Kannada/India</div><div class='del'>-    {     63,   110,    44,   160,    59,    37,    48,    45,    43,   101, 332,8 , 691,22 , 37,5 , 8,10 , 6908,61 , 6969,83 , 1483,27 , 6997,61 , 7058,83 , 134,27 , 4648,28 , 4676,54 , 798,14 , 4648,28 , 4676,54 , 798,14 , 0,2 , 0,2  }, // Kazakh/Kazakhstan</div><div class='del'>-    {     64,   179,    44,    46,    59,    37,    48,    45,    43,   101, 221,8 , 314,18 , 37,5 , 8,10 , 7052,60 , 7112,101 , 1483,27 , 7141,60 , 7201,101 , 134,27 , 4730,35 , 4765,84 , 798,14 , 4730,35 , 4765,84 , 798,14 , 0,2 , 0,2  }, // Kinyarwanda/Rwanda</div><div class='del'>-    {     65,   116,    44,   160,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2  }, // Kirghiz/Kyrgyzstan</div><div class='del'>-    {     66,   114,    46,    44,    59,    37,    48,    45,    43,   101, 713,9 , 722,16 , 353,7 , 360,13 , 7213,39 , 7213,39 , 7213,39 , 7302,39 , 7302,39 , 7302,39 , 4849,14 , 4863,28 , 4849,14 , 4849,14 , 4863,28 , 4849,14 , 138,2 , 138,2  }, // Korean/RepublicOfKorea</div><div class='del'>-    {     67,   102,    46,    44,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 4891,42 , 4891,42 , 4933,14 , 4891,42 , 4891,42 , 4933,14 , 0,2 , 0,2  }, // Kurdish/Iran</div><div class='del'>-    {     67,   103,    46,    44,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 4891,42 , 4891,42 , 4933,14 , 4891,42 , 4891,42 , 4933,14 , 0,2 , 0,2  }, // Kurdish/Iraq</div><div class='del'>-    {     67,   207,    46,    44,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 7252,41 , 7293,51 , 7344,27 , 7341,41 , 7382,51 , 7433,27 , 4947,20 , 4967,39 , 5006,14 , 4947,20 , 4967,39 , 5006,14 , 0,2 , 0,2  }, // Kurdish/SyrianArabRepublic</div><div class='del'>-    {     67,   217,    46,    44,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 7252,41 , 7293,51 , 7344,27 , 7341,41 , 7382,51 , 7433,27 , 4947,20 , 4967,39 , 5006,14 , 4947,20 , 4967,39 , 5006,14 , 0,2 , 0,2  }, // Kurdish/Turkey</div><div class='del'>-    {     69,   117,    46,    44,    59,    37,    48,    45,    43,   101, 364,8 , 738,18 , 165,4 , 373,21 , 7371,63 , 7434,75 , 1483,27 , 7460,63 , 7523,75 , 134,27 , 5020,24 , 5044,57 , 798,14 , 5020,24 , 5044,57 , 798,14 , 0,2 , 0,2  }, // Laothian/Lao</div><div class='del'>-    {     71,   118,    44,   160,    59,    37,    48,  8722,    43,   101, 332,8 , 756,26 , 37,5 , 8,10 , 7509,65 , 7574,101 , 134,24 , 7598,65 , 7663,101 , 320,24 , 5101,21 , 5122,72 , 5194,14 , 5101,21 , 5122,72 , 5194,14 , 140,14 , 140,11  }, // Latvian/Latvia</div><div class='del'>-    {     72,    49,    46,    44,    59,    37,    48,    45,    43,   101, 221,8 , 314,18 , 37,5 , 8,10 , 7675,39 , 7714,203 , 1483,27 , 7764,39 , 7803,203 , 134,27 , 5208,23 , 5231,98 , 798,14 , 5208,23 , 5231,98 , 798,14 , 0,2 , 0,2  }, // Lingala/DemocraticRepublicOfCongo</div><div class='del'>-    {     72,    50,    46,    44,    59,    37,    48,    45,    43,   101, 221,8 , 314,18 , 37,5 , 8,10 , 7675,39 , 7714,203 , 1483,27 , 7764,39 , 7803,203 , 134,27 , 5208,23 , 5231,98 , 798,14 , 5208,23 , 5231,98 , 798,14 , 0,2 , 0,2  }, // Lingala/PeoplesRepublicOfCongo</div><div class='del'>-    {     73,   124,    44,    46,    59,    37,    48,  8722,    43,   101, 72,10 , 782,26 , 37,5 , 8,10 , 7917,69 , 7986,96 , 8082,24 , 8006,48 , 8054,96 , 8150,24 , 5329,17 , 5346,89 , 5435,14 , 5449,21 , 5346,89 , 5435,14 , 154,9 , 151,6  }, // Lithuanian/Lithuania</div><div class='del'>-    {     74,   127,    44,    46,    59,    37,    48,    45,    43,   101, 808,7 , 123,18 , 37,5 , 8,10 , 8106,63 , 8169,85 , 8254,24 , 8174,63 , 8237,85 , 8322,24 , 5470,34 , 5504,54 , 1391,14 , 5470,34 , 5504,54 , 1391,14 , 163,10 , 157,8  }, // Macedonian/Macedonia</div><div class='del'>-    {     75,   128,    46,    44,    59,    37,    48,    45,    43,   101, 364,8 , 99,16 , 37,5 , 8,10 , 8278,48 , 8326,92 , 134,24 , 8346,48 , 8394,92 , 320,24 , 5558,34 , 5592,60 , 5652,14 , 5558,34 , 5592,60 , 5652,14 , 0,2 , 0,2  }, // Malagasy/Madagascar</div><div class='del'>-    {     76,   130,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 815,16 , 394,4 , 25,12 , 8418,49 , 8467,82 , 1483,27 , 8486,49 , 8535,82 , 134,27 , 5666,28 , 5694,43 , 798,14 , 5666,28 , 5694,43 , 798,14 , 0,2 , 0,2  }, // Malay/Malaysia</div><div class='del'>-    {     76,    32,    44,    46,    59,    37,    48,    45,    43,   101, 141,10 , 564,12 , 165,4 , 398,14 , 8418,49 , 8467,82 , 1483,27 , 8486,49 , 8535,82 , 134,27 , 5666,28 , 5694,43 , 798,14 , 5666,28 , 5694,43 , 798,14 , 0,2 , 0,2  }, // Malay/BruneiDarussalam</div><div class='del'>-    {     77,   100,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 831,18 , 18,7 , 25,12 , 8549,66 , 8615,101 , 8716,31 , 8617,66 , 8683,101 , 8784,31 , 5737,47 , 5784,70 , 5854,22 , 5737,47 , 5784,70 , 5854,22 , 173,6 , 165,10  }, // Malayalam/India</div><div class='del'>-    {     78,   133,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 849,23 , 37,5 , 8,10 , 8747,48 , 8795,86 , 8881,24 , 8815,48 , 8863,86 , 8949,24 , 5876,28 , 5904,63 , 5967,14 , 5876,28 , 5904,63 , 5967,14 , 179,2 , 175,2  }, // Maltese/Malta</div><div class='del'>-    {     79,   154,    46,    44,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 8905,83 , 8905,83 , 1483,27 , 8973,83 , 8973,83 , 134,27 , 5981,48 , 5981,48 , 798,14 , 5981,48 , 5981,48 , 798,14 , 0,2 , 0,2  }, // Maori/NewZealand</div><div class='del'>-    {     80,   100,    46,    44,    59,    37,  2406,    45,    43,   101, 655,6 , 99,16 , 412,7 , 419,12 , 8988,86 , 8988,86 , 9074,32 , 9056,86 , 9056,86 , 9142,32 , 6029,32 , 6061,53 , 3895,19 , 6029,32 , 6061,53 , 3895,19 , 136,2 , 136,2  }, // Marathi/India</div><div class='del'>-    {     82,   143,    44,   160,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 9106,48 , 9154,66 , 1483,27 , 9174,48 , 9222,66 , 134,27 , 6114,21 , 6135,43 , 798,14 , 6114,21 , 6135,43 , 798,14 , 0,2 , 0,2  }, // Mongolian/Mongolia</div><div class='del'>-    {     82,    44,    44,   160,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 9106,48 , 9154,66 , 1483,27 , 9174,48 , 9222,66 , 134,27 , 6114,21 , 6135,43 , 798,14 , 6114,21 , 6135,43 , 798,14 , 0,2 , 0,2  }, // Mongolian/China</div><div class='del'>-    {     84,   150,    46,    44,    59,    37,  2406,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 9220,56 , 9276,85 , 9361,27 , 9288,56 , 9344,85 , 9429,27 , 6178,33 , 6211,54 , 6265,14 , 6178,33 , 6211,54 , 6265,14 , 181,14 , 177,14  }, // Nepali/Nepal</div><div class='del'>-    {     84,   100,    46,    44,    59,    37,  2406,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 9220,56 , 9388,80 , 9361,27 , 9288,56 , 9456,80 , 9429,27 , 6178,33 , 6279,54 , 6265,14 , 6178,33 , 6279,54 , 6265,14 , 116,9 , 118,7  }, // Nepali/India</div><div class='del'>-    {     85,   161,    44,   160,    59,    37,    48,    45,    43,   101, 332,8 , 594,17 , 37,5 , 431,16 , 9468,59 , 9527,83 , 134,24 , 9536,59 , 9595,83 , 320,24 , 6333,28 , 2177,51 , 2228,14 , 6361,35 , 2177,51 , 2228,14 , 0,2 , 0,2  }, // Norwegian/Norway</div><div class='del'>-    {     86,    74,    46,    44,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 9610,83 , 9610,83 , 1483,27 , 9678,83 , 9678,83 , 134,27 , 6396,57 , 6396,57 , 798,14 , 6396,57 , 6396,57 , 798,14 , 0,2 , 0,2  }, // Occitan/France</div><div class='del'>-    {     87,   100,    46,    44,    59,    37,  2918,    45,    43,   101, 655,6 , 10,17 , 18,7 , 25,12 , 9693,89 , 9693,89 , 9782,32 , 9761,89 , 9761,89 , 9850,32 , 6453,33 , 6486,54 , 6540,18 , 6453,33 , 6486,54 , 6540,18 , 136,2 , 136,2  }, // Oriya/India</div><div class='del'>-    {     88,     1,  1643,  1644,    59,  1642,  1776,  8722,    43,   101, 179,8 , 872,20 , 165,4 , 447,11 , 9814,68 , 9814,68 , 1483,27 , 9882,68 , 9882,68 , 134,27 , 6558,49 , 6558,49 , 798,14 , 6558,49 , 6558,49 , 798,14 , 195,4 , 191,4  }, // Pashto/Afghanistan</div><div class='del'>-    {     89,   102,  1643,  1644,  1563,  1642,  1776,  8722,    43,   101, 558,6 , 35,18 , 165,4 , 447,11 , 9882,71 , 9953,70 , 10023,25 , 9950,71 , 10021,73 , 10094,25 , 6558,49 , 6558,49 , 6607,14 , 6558,49 , 6558,49 , 6607,14 , 199,10 , 195,10  }, // Persian/Iran</div><div class='del'>-    {     89,     1,  1643,  1644,  1563,  1642,  1776,  8722,    43,   101, 558,6 , 35,18 , 165,4 , 447,11 , 10048,63 , 9953,70 , 10111,24 , 10119,63 , 10182,68 , 10250,24 , 6558,49 , 6558,49 , 6607,14 , 6558,49 , 6558,49 , 6607,14 , 199,10 , 195,10  }, // Persian/Afghanistan</div><div class='del'>-    {     90,   172,    44,   160,    59,    37,    48,    45,    43,   101, 892,10 , 10,17 , 37,5 , 8,10 , 10135,48 , 10183,97 , 10280,24 , 10274,48 , 10322,99 , 10421,24 , 6621,34 , 6655,59 , 6714,14 , 6621,34 , 6655,59 , 6714,14 , 0,2 , 0,2  }, // Polish/Poland</div><div class='del'>-    {     91,   173,    44,   160,    59,    37,    48,    45,    43,   101, 27,8 , 902,27 , 37,5 , 458,19 , 10304,48 , 10352,89 , 134,24 , 10445,48 , 10493,89 , 320,24 , 6728,28 , 6756,79 , 6835,14 , 6728,28 , 6756,79 , 6835,14 , 209,17 , 205,18  }, // Portuguese/Portugal</div><div class='del'>-    {     91,    30,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 902,27 , 37,5 , 458,19 , 10441,48 , 10489,89 , 134,24 , 10582,48 , 10630,89 , 320,24 , 6728,28 , 6849,79 , 6835,14 , 6728,28 , 6849,79 , 6835,14 , 0,2 , 0,2  }, // Portuguese/Brazil</div><div class='del'>-    {     91,    92,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 902,27 , 37,5 , 458,19 , 10441,48 , 10489,89 , 134,24 , 10582,48 , 10630,89 , 320,24 , 6728,28 , 6849,79 , 6835,14 , 6728,28 , 6849,79 , 6835,14 , 0,2 , 0,2  }, // Portuguese/GuineaBissau</div><div class='del'>-    {     91,   146,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 902,27 , 37,5 , 458,19 , 10441,48 , 10489,89 , 134,24 , 10582,48 , 10630,89 , 320,24 , 6728,28 , 6849,79 , 6835,14 , 6728,28 , 6849,79 , 6835,14 , 0,2 , 0,2  }, // Portuguese/Mozambique</div><div class='del'>-    {     92,   100,    46,    44,    59,    37,  2662,    45,    43,   101, 141,10 , 123,18 , 18,7 , 25,12 , 10578,68 , 10578,68 , 10646,27 , 10719,68 , 10719,68 , 10787,27 , 6928,38 , 6966,55 , 7021,23 , 6928,38 , 6966,55 , 7021,23 , 226,5 , 223,4  }, // Punjabi/India</div><div class='del'>-    {     92,   163,    46,    44,    59,    37,  1632,    45,    43,   101, 141,10 , 123,18 , 18,7 , 25,12 , 10673,67 , 10673,67 , 10646,27 , 10814,67 , 10814,67 , 10787,27 , 6928,38 , 7044,37 , 7021,23 , 6928,38 , 7044,37 , 7021,23 , 226,5 , 223,4  }, // Punjabi/Pakistan</div><div class='del'>-    {     94,   206,    46,  8217,    59,    37,    48,  8722,    43,   101, 332,8 , 502,18 , 37,5 , 8,10 , 10740,67 , 10807,92 , 10899,24 , 10881,67 , 10948,92 , 11040,24 , 7081,23 , 7104,56 , 7160,14 , 7081,23 , 7104,56 , 7160,14 , 136,2 , 227,2  }, // RhaetoRomance/Switzerland</div><div class='del'>-    {     95,   141,    44,    46,    59,    37,    48,    45,    43,   101, 929,10 , 10,17 , 37,5 , 8,10 , 10923,60 , 10983,98 , 11081,24 , 11064,60 , 11124,98 , 11222,24 , 7174,21 , 7195,48 , 2799,14 , 7174,21 , 7195,48 , 2799,14 , 0,2 , 0,2  }, // Romanian/Moldova</div><div class='del'>-    {     95,   177,    44,    46,    59,    37,    48,    45,    43,   101, 929,10 , 10,17 , 37,5 , 8,10 , 10923,60 , 10983,98 , 11081,24 , 11064,60 , 11124,98 , 11222,24 , 7174,21 , 7195,48 , 2799,14 , 7174,21 , 7195,48 , 2799,14 , 0,2 , 0,2  }, // Romanian/Romania</div><div class='del'>-    {     96,   178,    44,   160,    59,    37,    48,    45,    43,   101, 332,8 , 939,22 , 165,4 , 195,9 , 11105,62 , 11167,80 , 11247,24 , 11246,63 , 11309,82 , 11391,24 , 7243,21 , 7264,62 , 7326,14 , 7243,21 , 7340,62 , 7326,14 , 0,2 , 0,2  }, // Russian/RussianFederation</div><div class='del'>-    {     96,   141,    44,   160,    59,    37,    48,    45,    43,   101, 332,8 , 939,22 , 165,4 , 195,9 , 11105,62 , 11167,80 , 11247,24 , 11246,63 , 11309,82 , 11391,24 , 7243,21 , 7264,62 , 7326,14 , 7243,21 , 7340,62 , 7326,14 , 0,2 , 0,2  }, // Russian/Moldova</div><div class='del'>-    {     96,   222,    44,   160,    59,    37,    48,    45,    43,   101, 332,8 , 939,22 , 37,5 , 8,10 , 11105,62 , 11167,80 , 11247,24 , 11246,63 , 11309,82 , 11391,24 , 7243,21 , 7264,62 , 7326,14 , 7243,21 , 7340,62 , 7326,14 , 0,2 , 0,2  }, // Russian/Ukraine</div><div class='del'>-    {     98,    41,    44,    46,    59,    37,    48,    45,    43,   101, 364,8 , 99,16 , 37,5 , 8,10 , 11271,48 , 11319,91 , 11410,24 , 11415,48 , 11463,91 , 11554,24 , 7402,28 , 7430,66 , 7496,14 , 7402,28 , 7430,66 , 7496,14 , 231,2 , 229,2  }, // Sangho/CentralAfricanRepublic</div><div class='del'>-    {     99,   100,    46,    44,    59,    37,  2406,    45,    43,   101, 630,7 , 99,16 , 322,8 , 330,13 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2  }, // Sanskrit/India</div><div class='del'>-    {    100,   241,    46,    44,    59,    37,    48,    45,    43,   101, 961,7 , 968,20 , 150,5 , 155,10 , 11434,48 , 11482,81 , 8254,24 , 11578,48 , 11626,81 , 8322,24 , 7510,28 , 7538,52 , 7590,14 , 7510,28 , 7538,52 , 7590,14 , 233,9 , 231,7  }, // Serbian/SerbiaAndMontenegro</div><div class='del'>-    {    100,    27,    46,    44,    59,    37,    48,    45,    43,   101, 115,8 , 968,20 , 37,5 , 477,40 , 11434,48 , 11563,83 , 8254,24 , 11578,48 , 11707,83 , 8322,24 , 7604,28 , 7632,54 , 7590,14 , 7604,28 , 7632,54 , 7590,14 , 233,9 , 231,7  }, // Serbian/BosniaAndHerzegowina</div><div class='del'>-    {    100,   238,    46,    44,    59,    37,    48,    45,    43,   101, 961,7 , 968,20 , 150,5 , 155,10 , 11434,48 , 11482,81 , 8254,24 , 11578,48 , 11626,81 , 8322,24 , 7510,28 , 7538,52 , 7590,14 , 7510,28 , 7538,52 , 7590,14 , 233,9 , 231,7  }, // Serbian/Yugoslavia</div><div class='del'>-    {    100,   242,    46,    44,    59,    37,    48,    45,    43,   101, 961,7 , 968,20 , 150,5 , 155,10 , 11646,48 , 11694,81 , 11775,24 , 11790,48 , 11838,81 , 11919,24 , 7686,28 , 7714,54 , 2051,14 , 7686,28 , 7714,54 , 2051,14 , 242,9 , 238,7  }, // Serbian/Montenegro</div><div class='del'>-    {    100,   243,    46,    44,    59,    37,    48,    45,    43,   101, 961,7 , 968,20 , 150,5 , 155,10 , 11434,48 , 11482,81 , 8254,24 , 11578,48 , 11626,81 , 8322,24 , 7510,28 , 7538,52 , 7590,14 , 7510,28 , 7538,52 , 7590,14 , 233,9 , 231,7  }, // Serbian/Serbia</div><div class='del'>-    {    101,   241,    46,    44,    59,    37,    48,    45,    43,   101, 961,7 , 968,20 , 150,5 , 155,10 , 11646,48 , 11694,81 , 11775,24 , 11790,48 , 11838,81 , 11919,24 , 7686,28 , 7714,54 , 2051,14 , 7686,28 , 7714,54 , 2051,14 , 242,9 , 238,7  }, // SerboCroatian/SerbiaAndMontenegro</div><div class='del'>-    {    101,    27,    46,    44,    59,    37,    48,    45,    43,   101, 961,7 , 968,20 , 150,5 , 155,10 , 11646,48 , 11694,81 , 11775,24 , 11790,48 , 11838,81 , 11919,24 , 7686,28 , 7714,54 , 2051,14 , 7686,28 , 7714,54 , 2051,14 , 242,9 , 238,7  }, // SerboCroatian/BosniaAndHerzegowina</div><div class='del'>-    {    101,   238,    46,    44,    59,    37,    48,    45,    43,   101, 961,7 , 968,20 , 150,5 , 155,10 , 11646,48 , 11694,81 , 11775,24 , 11790,48 , 11838,81 , 11919,24 , 7686,28 , 7714,54 , 2051,14 , 7686,28 , 7714,54 , 2051,14 , 242,9 , 238,7  }, // SerboCroatian/Yugoslavia</div><div class='del'>-    {    102,   120,    44,   160,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 11799,48 , 11847,105 , 1483,27 , 11943,48 , 11991,105 , 134,27 , 7768,27 , 7795,61 , 798,14 , 7768,27 , 7795,61 , 798,14 , 0,2 , 0,2  }, // Sesotho/Lesotho</div><div class='del'>-    {    102,   195,    44,   160,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 11799,48 , 11847,105 , 1483,27 , 11943,48 , 11991,105 , 134,27 , 7768,27 , 7795,61 , 798,14 , 7768,27 , 7795,61 , 798,14 , 0,2 , 0,2  }, // Sesotho/SouthAfrica</div><div class='del'>-    {    103,   195,    44,   160,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 11952,48 , 12000,117 , 1483,27 , 12096,48 , 12144,117 , 134,27 , 7856,27 , 7883,64 , 798,14 , 7856,27 , 7883,64 , 798,14 , 0,2 , 0,2  }, // Setswana/SouthAfrica</div><div class='del'>-    {    104,   240,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 12117,47 , 12164,100 , 12264,24 , 12261,47 , 12308,100 , 12408,24 , 7947,32 , 7979,55 , 8034,14 , 7947,32 , 7979,55 , 8034,14 , 0,2 , 0,2  }, // Shona/Zimbabwe</div><div class='del'>-    {    106,   198,    46,    44,    59,    37,    48,    45,    43,   101, 576,10 , 988,17 , 18,7 , 25,12 , 12288,54 , 12342,92 , 12434,32 , 12432,54 , 12486,92 , 12578,32 , 8048,30 , 8078,62 , 8140,19 , 8048,30 , 8078,62 , 8140,19 , 251,5 , 245,4  }, // Singhalese/SriLanka</div><div class='del'>-    {    107,   195,    44,   160,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 12466,48 , 12514,114 , 1483,27 , 12610,48 , 12658,114 , 134,27 , 8159,27 , 8186,68 , 798,14 , 8159,27 , 8186,68 , 798,14 , 0,2 , 0,2  }, // Siswati/SouthAfrica</div><div class='del'>-    {    107,   204,    44,   160,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 12466,48 , 12514,114 , 1483,27 , 12610,48 , 12658,114 , 134,27 , 8159,27 , 8186,68 , 798,14 , 8159,27 , 8186,68 , 798,14 , 0,2 , 0,2  }, // Siswati/Swaziland</div><div class='del'>-    {    108,   191,    44,   160,    59,    37,    48,    45,    43,   101, 586,8 , 502,18 , 165,4 , 195,9 , 12628,48 , 12676,82 , 11775,24 , 12772,48 , 12820,89 , 11919,24 , 8254,21 , 8275,52 , 8327,14 , 8254,21 , 8275,52 , 8327,14 , 256,10 , 249,9  }, // Slovak/Slovakia</div><div class='del'>-    {    109,   192,    44,    46,    59,    37,    48,    45,    43,   101, 1005,9 , 611,19 , 37,5 , 8,10 , 11646,48 , 12758,86 , 11775,24 , 11790,48 , 12909,86 , 11919,24 , 8341,28 , 8369,52 , 8421,14 , 8341,28 , 8369,52 , 8421,14 , 62,4 , 258,4  }, // Slovenian/Slovenia</div><div class='del'>-    {    110,   194,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 53,19 , 18,7 , 25,12 , 12844,48 , 12892,189 , 13081,24 , 12995,48 , 13043,189 , 13232,24 , 8435,28 , 8463,47 , 8510,14 , 8435,28 , 8463,47 , 8510,14 , 266,3 , 262,3  }, // Somali/Somalia</div><div class='del'>-    {    110,    59,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 53,19 , 18,7 , 25,12 , 12844,48 , 12892,189 , 13081,24 , 12995,48 , 13043,189 , 13232,24 , 8435,28 , 8463,47 , 8510,14 , 8435,28 , 8463,47 , 8510,14 , 266,3 , 262,3  }, // Somali/Djibouti</div><div class='del'>-    {    110,    69,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 53,19 , 18,7 , 25,12 , 12844,48 , 12892,189 , 13081,24 , 12995,48 , 13043,189 , 13232,24 , 8435,28 , 8463,47 , 8510,14 , 8435,28 , 8463,47 , 8510,14 , 266,3 , 262,3  }, // Somali/Ethiopia</div><div class='del'>-    {    110,   111,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 53,19 , 18,7 , 25,12 , 12844,48 , 12892,189 , 13081,24 , 12995,48 , 13043,189 , 13232,24 , 8435,28 , 8463,47 , 8510,14 , 8435,28 , 8463,47 , 8510,14 , 266,3 , 262,3  }, // Somali/Kenya</div><div class='del'>-    {    111,   197,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 1014,26 , 37,5 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/Spain</div><div class='del'>-    {    111,    10,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 1014,26 , 37,5 , 517,14 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/Argentina</div><div class='del'>-    {    111,    26,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 1014,26 , 37,5 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/Bolivia</div><div class='del'>-    {    111,    43,    44,    46,    59,    37,    48,    45,    43,   101, 543,8 , 1014,26 , 165,4 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/Chile</div><div class='del'>-    {    111,    47,    44,    46,    59,    37,    48,    45,    43,   101, 551,7 , 1014,26 , 165,4 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/Colombia</div><div class='del'>-    {    111,    52,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 1014,26 , 37,5 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/CostaRica</div><div class='del'>-    {    111,    61,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 1014,26 , 37,5 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/DominicanRepublic</div><div class='del'>-    {    111,    63,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 1014,26 , 165,4 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/Ecuador</div><div class='del'>-    {    111,    65,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 1014,26 , 37,5 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/ElSalvador</div><div class='del'>-    {    111,    66,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 1014,26 , 37,5 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/EquatorialGuinea</div><div class='del'>-    {    111,    90,    46,    44,    59,    37,    48,    45,    43,   101, 551,7 , 1014,26 , 37,5 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/Guatemala</div><div class='del'>-    {    111,    96,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 1040,27 , 37,5 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/Honduras</div><div class='del'>-    {    111,   139,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 1014,26 , 37,5 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/Mexico</div><div class='del'>-    {    111,   155,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 1014,26 , 37,5 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/Nicaragua</div><div class='del'>-    {    111,   166,    46,    44,    59,    37,    48,    45,    43,   101, 187,8 , 1014,26 , 37,5 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/Panama</div><div class='del'>-    {    111,   168,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 1014,26 , 37,5 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/Paraguay</div><div class='del'>-    {    111,   169,    46,    44,    59,    37,    48,    45,    43,   101, 551,7 , 1014,26 , 37,5 , 531,15 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/Peru</div><div class='del'>-    {    111,   174,    46,    44,    59,    37,    48,    45,    43,   101, 187,8 , 1014,26 , 37,5 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/PuertoRico</div><div class='del'>-    {    111,   225,    46,    44,    59,    37,    48,    45,    43,   101, 558,6 , 1014,26 , 18,7 , 25,12 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/UnitedStates</div><div class='del'>-    {    111,   227,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 1014,26 , 37,5 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/Uruguay</div><div class='del'>-    {    111,   231,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 1014,26 , 37,5 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/Venezuela</div><div class='del'>-    {    111,   246,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 1014,26 , 37,5 , 8,10 , 13105,48 , 13153,89 , 13242,24 , 13256,48 , 13304,89 , 13393,24 , 8524,28 , 8552,53 , 2799,14 , 8524,28 , 8552,53 , 2799,14 , 56,4 , 56,4  }, // Spanish/LatinAmericaAndTheCaribbean</div><div class='del'>-    {    113,   111,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 13266,48 , 13314,84 , 134,24 , 13417,48 , 13465,84 , 320,24 , 8605,22 , 8627,60 , 8687,14 , 8605,22 , 8627,60 , 8687,14 , 269,7 , 265,7  }, // Swahili/Kenya</div><div class='del'>-    {    113,   210,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 13266,48 , 13314,84 , 134,24 , 13417,48 , 13465,84 , 320,24 , 8605,22 , 8627,60 , 8687,14 , 8605,22 , 8627,60 , 8687,14 , 269,7 , 265,7  }, // Swahili/Tanzania</div><div class='del'>-    {    114,   205,    44,   160,    59,    37,    48,  8722,    43,   101, 72,10 , 1067,30 , 37,5 , 431,16 , 3473,48 , 13398,86 , 134,24 , 5180,48 , 13549,86 , 320,24 , 8701,29 , 8730,50 , 2228,14 , 8701,29 , 8730,50 , 2228,14 , 276,2 , 272,2  }, // Swedish/Sweden</div><div class='del'>-    {    114,    73,    44,   160,    59,    37,    48,  8722,    43,   101, 72,10 , 1067,30 , 37,5 , 431,16 , 3473,48 , 13398,86 , 134,24 , 5180,48 , 13549,86 , 320,24 , 8701,29 , 8730,50 , 2228,14 , 8701,29 , 8730,50 , 2228,14 , 276,2 , 272,2  }, // Swedish/Finland</div><div class='del'>-    {    116,   209,    46,    44,    59,    37,    48,    45,    43,   101, 221,8 , 314,18 , 37,5 , 8,10 , 13484,48 , 13532,71 , 1483,27 , 13635,48 , 13683,71 , 134,27 , 8780,28 , 8808,55 , 798,14 , 8780,28 , 8808,55 , 798,14 , 0,2 , 0,2  }, // Tajik/Tajikistan</div><div class='del'>-    {    117,   100,    46,    44,    59,    37,    48,    45,    43,   101, 655,6 , 203,18 , 18,7 , 25,12 , 13603,58 , 13661,88 , 13749,31 , 13754,58 , 13812,88 , 13900,31 , 8863,20 , 8883,49 , 8863,20 , 8863,20 , 8883,49 , 8863,20 , 136,2 , 136,2  }, // Tamil/India</div><div class='del'>-    {    117,   198,    46,    44,    59,    37,    48,    45,    43,   101, 655,6 , 203,18 , 18,7 , 25,12 , 13603,58 , 13661,88 , 13749,31 , 13754,58 , 13812,88 , 13900,31 , 8863,20 , 8883,49 , 8863,20 , 8863,20 , 8883,49 , 8863,20 , 136,2 , 136,2  }, // Tamil/SriLanka</div><div class='del'>-    {    118,   178,    44,   160,    59,    37,    48,    45,    43,   101, 929,10 , 1097,11 , 165,4 , 25,12 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2  }, // Tatar/RussianFederation</div><div class='del'>-    {    119,   100,    46,    44,    59,    37,    48,    45,    43,   101, 543,8 , 99,16 , 18,7 , 25,12 , 13780,86 , 13780,86 , 13866,30 , 13931,86 , 13931,86 , 14017,30 , 8932,32 , 8964,60 , 9024,18 , 8932,32 , 8964,60 , 9024,18 , 278,1 , 274,2  }, // Telugu/India</div><div class='del'>-    {    120,   211,    46,    44,    59,    37,    48,    45,    43,   101, 364,8 , 1108,19 , 165,4 , 546,27 , 13896,63 , 13959,98 , 13896,63 , 14047,63 , 14110,98 , 14208,24 , 9042,23 , 9065,68 , 9133,14 , 9042,23 , 9065,68 , 9133,14 , 279,10 , 276,10  }, // Thai/Thailand</div><div class='del'>-    {    121,    44,    46,    44,    59,    37,  3872,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 14057,63 , 14120,158 , 1483,27 , 14232,63 , 14295,158 , 134,27 , 9147,49 , 9196,77 , 9273,21 , 9147,49 , 9196,77 , 9273,21 , 289,7 , 286,8  }, // Tibetan/China</div><div class='del'>-    {    121,   100,    46,    44,    59,    37,  3872,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 14057,63 , 14120,158 , 1483,27 , 14232,63 , 14295,158 , 134,27 , 9147,49 , 9196,77 , 9273,21 , 9147,49 , 9196,77 , 9273,21 , 289,7 , 286,8  }, // Tibetan/India</div><div class='del'>-    {    122,    67,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 1127,23 , 18,7 , 25,12 , 14278,46 , 14324,54 , 1034,24 , 14453,46 , 14499,54 , 1061,24 , 9294,29 , 9294,29 , 9323,14 , 9294,29 , 9294,29 , 9323,14 , 296,7 , 294,7  }, // Tigrinya/Eritrea</div><div class='del'>-    {    122,    69,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 1150,23 , 18,7 , 25,12 , 926,46 , 972,62 , 1034,24 , 953,46 , 999,62 , 1061,24 , 9337,29 , 9337,29 , 9323,14 , 9337,29 , 9337,29 , 9323,14 , 296,7 , 294,7  }, // Tigrinya/Ethiopia</div><div class='del'>-    {    123,   214,    46,    44,    59,    37,    48,    45,    43,   101, 279,6 , 99,16 , 37,5 , 8,10 , 14378,51 , 14429,87 , 14516,24 , 14553,51 , 14604,87 , 14691,24 , 9366,29 , 9395,60 , 9455,14 , 9366,29 , 9395,60 , 9455,14 , 0,2 , 0,2  }, // Tonga/Tonga</div><div class='del'>-    {    124,   195,    44,   160,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 14540,48 , 14588,122 , 1483,27 , 14715,48 , 14763,122 , 134,27 , 9469,27 , 9496,72 , 798,14 , 9469,27 , 9496,72 , 798,14 , 0,2 , 0,2  }, // Tsonga/SouthAfrica</div><div class='del'>-    {    125,   217,    44,    46,    59,    37,    48,    45,    43,   101, 929,10 , 1173,17 , 37,5 , 8,10 , 14710,48 , 14758,75 , 14833,24 , 14885,48 , 14933,75 , 15008,24 , 9568,28 , 9596,54 , 9650,14 , 9568,28 , 9596,54 , 9650,14 , 0,2 , 0,2  }, // Turkish/Turkey</div><div class='del'>-    {    128,    44,    46,    44,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2  }, // Uigur/China</div><div class='del'>-    {    129,   222,    44,   160,    59,    37,    48,    45,    43,   101, 332,8 , 1190,22 , 37,5 , 8,10 , 14857,48 , 14905,95 , 15000,24 , 15032,67 , 15099,87 , 15186,24 , 9664,21 , 9685,56 , 9741,14 , 9664,21 , 9685,56 , 9741,14 , 303,2 , 301,2  }, // Ukrainian/Ukraine</div><div class='del'>-    {    130,   100,    46,    44,    59,    37,    48,    45,    43,   101, 279,6 , 1212,18 , 18,7 , 25,12 , 15024,67 , 15024,67 , 10111,24 , 15210,67 , 15210,67 , 10250,24 , 9755,36 , 9755,36 , 9791,14 , 9755,36 , 9755,36 , 9791,14 , 0,2 , 0,2  }, // Urdu/India</div><div class='del'>-    {    130,   163,    46,    44,    59,    37,    48,    45,    43,   101, 279,6 , 1212,18 , 18,7 , 25,12 , 15024,67 , 15024,67 , 10111,24 , 15210,67 , 15210,67 , 10250,24 , 9755,36 , 9755,36 , 9791,14 , 9755,36 , 9755,36 , 9791,14 , 0,2 , 0,2  }, // Urdu/Pakistan</div><div class='del'>-    {    131,   228,    44,   160,    59,    37,    48,    45,    43,   101, 221,8 , 314,18 , 37,5 , 8,10 , 13484,48 , 15091,115 , 11247,24 , 13635,48 , 15277,115 , 11391,24 , 9805,28 , 9833,53 , 9886,14 , 9805,28 , 9833,53 , 9886,14 , 0,2 , 0,2  }, // Uzbek/Uzbekistan</div><div class='del'>-    {    131,     1,  1643,  1644,    59,  1642,  1776,  8722,    43,   101, 179,8 , 1230,33 , 165,4 , 447,11 , 15206,48 , 15254,68 , 11247,24 , 15392,48 , 10182,68 , 11391,24 , 9900,21 , 6558,49 , 9886,14 , 9900,21 , 6558,49 , 9886,14 , 0,2 , 0,2  }, // Uzbek/Afghanistan</div><div class='del'>-    {    132,   232,    44,    46,    59,    37,    48,    45,    43,   101, 141,10 , 1263,31 , 37,5 , 8,10 , 15322,75 , 15397,130 , 1483,27 , 15440,75 , 15515,130 , 134,27 , 9921,33 , 9954,55 , 10009,21 , 9921,33 , 9954,55 , 10009,21 , 305,2 , 303,2  }, // Vietnamese/VietNam</div><div class='del'>-    {    134,   224,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 123,18 , 18,7 , 25,12 , 15527,53 , 15580,87 , 15667,24 , 15645,62 , 15707,86 , 15793,24 , 10030,29 , 10059,77 , 10136,14 , 10150,30 , 10059,77 , 10136,14 , 0,2 , 0,2  }, // Welsh/UnitedKingdom</div><div class='del'>-    {    135,   187,    46,    44,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2  }, // Wolof/Senegal</div><div class='del'>-    {    136,   195,    44,   160,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 15691,48 , 15739,91 , 1483,27 , 15817,48 , 15865,91 , 134,27 , 10180,28 , 10208,61 , 798,14 , 10180,28 , 10208,61 , 798,14 , 0,2 , 0,2  }, // Xhosa/SouthAfrica</div><div class='del'>-    {    138,   157,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 15830,73 , 15903,121 , 1483,27 , 15956,73 , 16029,121 , 134,27 , 10269,44 , 10313,69 , 798,14 , 10269,44 , 10313,69 , 798,14 , 307,5 , 305,5  }, // Yoruba/Nigeria</div><div class='del'>-    {    140,   195,    44,   160,    59,    37,    48,    45,    43,   101, 72,10 , 82,17 , 18,7 , 25,12 , 16024,48 , 16072,104 , 134,24 , 16150,48 , 16198,90 , 320,24 , 10382,28 , 10410,68 , 10478,14 , 10382,28 , 10410,68 , 10478,14 , 0,2 , 0,2  }, // Zulu/SouthAfrica</div><div class='del'>-    {    141,   161,    44,   160,    59,    37,    48,  8722,    43,   101, 332,8 , 594,17 , 37,5 , 431,16 , 3915,48 , 9527,83 , 134,24 , 3967,48 , 9595,83 , 320,24 , 10492,28 , 10520,51 , 2228,14 , 10492,28 , 10520,51 , 2228,14 , 312,9 , 310,11  }, // Nynorsk/Norway</div><div class='del'>-    {    142,    27,    44,    46,    59,    37,    48,    45,    43,   101, 221,8 , 314,18 , 37,5 , 8,10 , 16176,48 , 16224,83 , 1483,27 , 16288,48 , 16336,83 , 134,27 , 10571,28 , 10599,58 , 798,14 , 10571,28 , 10599,58 , 798,14 , 0,2 , 0,2  }, // Bosnian/BosniaAndHerzegowina</div><div class='del'>-    {    143,   131,    46,    44,    44,    37,    48,    45,    43,   101, 655,6 , 99,16 , 322,8 , 330,13 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2  }, // Divehi/Maldives</div><div class='del'>-    {    144,   224,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 82,17 , 37,5 , 8,10 , 16307,102 , 16409,140 , 1483,27 , 16419,102 , 16521,140 , 134,27 , 10657,30 , 10687,57 , 798,14 , 10657,30 , 10687,57 , 798,14 , 56,4 , 56,4  }, // Manx/UnitedKingdom</div><div class='del'>-    {    145,   224,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 99,16 , 37,5 , 8,10 , 16549,46 , 16595,124 , 1483,27 , 16661,46 , 16707,124 , 134,27 , 10744,28 , 10772,60 , 798,14 , 10744,28 , 10772,60 , 798,14 , 56,4 , 56,4  }, // Cornish/UnitedKingdom</div><div class='del'>-    {    146,    83,    46,   160,    59,    37,    48,    45,    43,   101, 221,8 , 314,18 , 37,5 , 8,10 , 16719,48 , 16767,192 , 1483,27 , 16831,48 , 16879,192 , 134,27 , 10832,28 , 10860,49 , 10909,14 , 10832,28 , 10860,49 , 10909,14 , 321,2 , 321,2  }, // Akan/Ghana</div><div class='del'>-    {    147,   100,    46,    44,    59,    37,    48,    45,    43,   101, 655,6 , 99,16 , 18,7 , 25,12 , 16959,87 , 16959,87 , 1483,27 , 17071,87 , 17071,87 , 134,27 , 6029,32 , 10923,55 , 798,14 , 6029,32 , 10923,55 , 798,14 , 323,5 , 323,5  }, // Konkani/India</div><div class='del'>-    {    148,    83,    46,    44,    59,    37,    48,    45,    43,   101, 221,8 , 314,18 , 37,5 , 8,10 , 17046,48 , 17094,94 , 1483,27 , 17158,48 , 17206,94 , 134,27 , 10978,26 , 11004,34 , 798,14 , 10978,26 , 11004,34 , 798,14 , 0,2 , 0,2  }, // Ga/Ghana</div><div class='del'>-    {    149,   157,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 17188,48 , 17236,86 , 1483,27 , 17300,48 , 17348,86 , 134,27 , 11038,29 , 11067,57 , 798,14 , 11038,29 , 11067,57 , 798,14 , 328,4 , 328,4  }, // Igbo/Nigeria</div><div class='del'>-    {    150,   111,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 17322,48 , 17370,189 , 17559,24 , 17434,48 , 17482,189 , 17671,24 , 11124,28 , 11152,74 , 11226,14 , 11124,28 , 11152,74 , 11226,14 , 332,9 , 332,7  }, // Kamba/Kenya</div><div class='del'>-    {    151,   207,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 1294,13 , 394,4 , 25,12 , 17583,65 , 17583,65 , 1483,27 , 17695,65 , 17695,65 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2  }, // Syriac/SyrianArabRepublic</div><div class='del'>-    {    152,    67,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 1307,22 , 18,7 , 25,12 , 17648,47 , 17695,77 , 17772,24 , 17760,47 , 17807,77 , 17884,24 , 11240,26 , 11266,43 , 11309,14 , 11240,26 , 11266,43 , 11309,14 , 0,2 , 0,2  }, // Blin/Eritrea</div><div class='del'>-    {    153,    67,    46,  4808,    59,    37,    48,    45,    43,   101, 27,8 , 1329,23 , 18,7 , 25,12 , 17796,49 , 17796,49 , 17845,24 , 17908,49 , 17908,49 , 17957,24 , 11323,29 , 11323,29 , 11352,14 , 11323,29 , 11323,29 , 11352,14 , 0,2 , 0,2  }, // Geez/Eritrea</div><div class='del'>-    {    153,    69,    46,  4808,    59,    37,    48,    45,    43,   101, 27,8 , 1329,23 , 18,7 , 25,12 , 17796,49 , 17796,49 , 17845,24 , 17908,49 , 17908,49 , 17957,24 , 11323,29 , 11323,29 , 11352,14 , 11323,29 , 11323,29 , 11352,14 , 0,2 , 0,2  }, // Geez/Ethiopia</div><div class='del'>-    {    154,    53,    46,    44,    59,    37,    48,    45,    43,   101, 221,8 , 314,18 , 37,5 , 8,10 , 17869,48 , 17917,124 , 1483,27 , 17981,48 , 18029,124 , 134,27 , 11366,28 , 11394,54 , 798,14 , 11366,28 , 11394,54 , 798,14 , 0,2 , 0,2  }, // Koro/IvoryCoast</div><div class='del'>-    {    155,    69,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 53,19 , 18,7 , 25,12 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 11448,28 , 11476,51 , 11527,14 , 11448,28 , 11476,51 , 11527,14 , 0,2 , 0,2  }, // Sidamo/Ethiopia</div><div class='del'>-    {    156,   157,    46,    44,    59,    37,    48,    45,    43,   101, 221,8 , 314,18 , 37,5 , 8,10 , 18041,59 , 18100,129 , 1483,27 , 18153,59 , 18212,129 , 134,27 , 11541,35 , 11576,87 , 798,14 , 11541,35 , 11576,87 , 798,14 , 0,2 , 0,2  }, // Atsam/Nigeria</div><div class='del'>-    {    157,    67,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 1352,21 , 18,7 , 25,12 , 926,46 , 972,62 , 1034,24 , 953,46 , 999,62 , 1061,24 , 11663,27 , 11690,41 , 11731,14 , 11663,27 , 11690,41 , 11731,14 , 0,2 , 0,2  }, // Tigre/Eritrea</div><div class='del'>-    {    158,   157,    46,    44,    59,    37,    48,    45,    43,   101, 221,8 , 314,18 , 37,5 , 8,10 , 18229,57 , 18286,178 , 1483,27 , 18341,57 , 18398,178 , 134,27 , 11745,28 , 11773,44 , 798,14 , 11745,28 , 11773,44 , 798,14 , 0,2 , 0,2  }, // Jju/Nigeria</div><div class='del'>-    {    159,   106,    44,    46,    59,    37,    48,    45,    43,   101, 27,8 , 1373,27 , 37,5 , 8,10 , 18464,48 , 18512,77 , 18589,24 , 18576,48 , 18624,77 , 18701,24 , 11817,28 , 11845,50 , 2799,14 , 11817,28 , 11845,50 , 2799,14 , 0,2 , 0,2  }, // Friulian/Italy</div><div class='del'>-    {    160,   195,    44,   160,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 18613,48 , 18661,111 , 1483,27 , 18725,48 , 18773,111 , 134,27 , 11895,27 , 11922,70 , 798,14 , 11895,27 , 11922,70 , 798,14 , 0,2 , 0,2  }, // Venda/SouthAfrica</div><div class='del'>-    {    161,    83,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 18772,48 , 18820,87 , 18907,24 , 18884,48 , 18932,87 , 19019,24 , 11992,32 , 12024,44 , 12068,14 , 11992,32 , 12024,44 , 12068,14 , 321,2 , 321,2  }, // Ewe/Ghana</div><div class='del'>-    {    161,   212,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 18772,48 , 18820,87 , 18907,24 , 18884,48 , 18932,87 , 19019,24 , 11992,32 , 12024,44 , 12068,14 , 11992,32 , 12024,44 , 12068,14 , 321,2 , 321,2  }, // Ewe/Togo</div><div class='del'>-    {    162,    69,    46,  8217,    59,    37,    48,    45,    43,   101, 27,8 , 1400,22 , 18,7 , 25,12 , 926,46 , 972,62 , 1034,24 , 953,46 , 999,62 , 1061,24 , 12082,27 , 12082,27 , 12109,14 , 12082,27 , 12082,27 , 12109,14 , 0,2 , 0,2  }, // Walamo/Ethiopia</div><div class='del'>-    {    163,   225,    46,    44,    59,    37,    48,    45,    43,   101, 279,6 , 10,17 , 18,7 , 25,12 , 18931,59 , 18990,95 , 1483,27 , 19043,59 , 19102,95 , 134,27 , 12123,21 , 12144,57 , 798,14 , 12123,21 , 12144,57 , 798,14 , 0,2 , 0,2  }, // Hawaiian/UnitedStates</div><div class='del'>-    {    164,   157,    46,    44,    59,    37,    48,    45,    43,   101, 221,8 , 314,18 , 37,5 , 8,10 , 19085,48 , 19133,153 , 1483,27 , 19197,48 , 19245,153 , 134,27 , 12201,28 , 12229,42 , 798,14 , 12201,28 , 12229,42 , 798,14 , 0,2 , 0,2  }, // Tyap/Nigeria</div><div class='del'>-    {    165,   129,    46,    44,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 19286,48 , 19334,91 , 1483,27 , 19398,48 , 19446,91 , 134,27 , 12271,28 , 12299,67 , 798,14 , 12271,28 , 12299,67 , 798,14 , 0,2 , 0,2  }, // Chewa/Malawi</div><div class='del'>-    {    166,   170,    46,    44,    59,    37,    48,    45,    43,   101, 558,6 , 1422,18 , 37,5 , 8,10 , 19425,48 , 19473,88 , 19561,24 , 19537,48 , 19585,88 , 19673,24 , 12366,28 , 12394,55 , 12449,14 , 12463,28 , 12394,55 , 12449,14 , 0,2 , 0,2  }, // Filipino/Philippines</div><div class='del'>-    {    167,   206,    46,  8217,    59,    37,    48,  8722,    43,   101, 332,8 , 502,18 , 37,5 , 8,10 , 19585,48 , 19633,86 , 134,24 , 4729,48 , 19697,86 , 320,24 , 12491,28 , 12519,63 , 3089,14 , 12491,28 , 12519,63 , 3089,14 , 87,5 , 339,4  }, // Swiss German/Switzerland</div><div class='del'>-    {    168,    44,    46,    44,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 19719,38 , 1483,27 , 134,27 , 19783,38 , 134,27 , 12582,21 , 12603,28 , 12631,14 , 12582,21 , 12603,28 , 12631,14 , 341,2 , 343,2  }, // Sichuan Yi/China</div><div class='del'>-    {    169,    91,    46,    44,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2  }, // Kpelle/Guinea</div><div class='del'>-    {    169,   121,    46,    44,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2  }, // Kpelle/Liberia</div><div class='del'>-    {    170,    82,    44,    46,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2  }, // Low German/Germany</div><div class='del'>-    {    171,   195,    44,   160,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 19757,48 , 19805,100 , 1483,27 , 19821,48 , 19869,100 , 134,27 , 12645,27 , 12672,66 , 798,14 , 12645,27 , 12672,66 , 798,14 , 0,2 , 0,2  }, // South Ndebele/SouthAfrica</div><div class='del'>-    {    172,   195,    44,   160,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 19905,48 , 19953,94 , 1483,27 , 19969,48 , 20017,94 , 134,27 , 12738,27 , 12765,63 , 798,14 , 12738,27 , 12765,63 , 798,14 , 0,2 , 0,2  }, // Northern Sotho/SouthAfrica</div><div class='del'>-    {    173,    73,    44,   160,    59,    37,    48,  8722,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 20047,85 , 20132,145 , 20277,24 , 20111,85 , 20196,145 , 20341,24 , 12828,33 , 12861,65 , 12926,14 , 12828,33 , 12861,65 , 12926,14 , 0,2 , 0,2  }, // Northern Sami/Finland</div><div class='del'>-    {    173,   161,    44,   160,    59,    37,    48,  8722,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 20301,59 , 20132,145 , 20277,24 , 20365,59 , 20196,145 , 20341,24 , 12828,33 , 12940,75 , 13015,14 , 12828,33 , 12940,75 , 13015,14 , 0,2 , 0,2  }, // Northern Sami/Norway</div><div class='del'>-    {    174,   208,    46,    44,    59,    37,    48,    45,    43,   101, 72,10 , 314,18 , 37,5 , 8,10 , 20360,48 , 20408,142 , 20550,24 , 20424,48 , 20472,142 , 20614,24 , 13029,28 , 13057,172 , 13229,14 , 13029,28 , 13057,172 , 13229,14 , 0,2 , 0,2  }, // Taroko/Taiwan</div><div class='del'>-    {    175,   111,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 20574,48 , 20622,88 , 20710,24 , 20638,48 , 20686,88 , 20774,24 , 13243,28 , 13271,62 , 13333,14 , 13243,28 , 13271,62 , 13333,14 , 343,5 , 345,10  }, // Gusii/Kenya</div><div class='del'>-    {    176,   111,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 20734,48 , 20782,221 , 21003,24 , 20798,48 , 20846,221 , 21067,24 , 13347,28 , 13375,106 , 13481,14 , 13347,28 , 13375,106 , 13481,14 , 348,10 , 355,10  }, // Taita/Kenya</div><div class='del'>-    {    177,   187,    44,   160,    59,    37,    48,    45,    43,   101, 364,8 , 99,16 , 37,5 , 8,10 , 21027,48 , 21075,77 , 21152,24 , 21091,48 , 21139,77 , 21216,24 , 13495,28 , 13523,59 , 13582,14 , 13495,28 , 13523,59 , 13582,14 , 358,6 , 365,7  }, // Fulah/Senegal</div><div class='del'>-    {    178,   111,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 21176,48 , 21224,185 , 21409,24 , 21240,48 , 21288,185 , 21473,24 , 13596,28 , 13624,63 , 13687,14 , 13596,28 , 13624,63 , 13687,14 , 364,6 , 372,8  }, // Kikuyu/Kenya</div><div class='del'>-    {    179,   111,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 21433,48 , 21481,173 , 21654,24 , 21497,48 , 21545,173 , 21718,24 , 13701,28 , 13729,105 , 13834,14 , 13701,28 , 13729,105 , 13834,14 , 370,7 , 380,5  }, // Samburu/Kenya</div><div class='del'>-    {    180,   146,    44,    46,    59,    37,    48,    45,    43,   101, 364,8 , 902,27 , 37,5 , 8,10 , 21678,48 , 21726,88 , 134,24 , 21742,48 , 21790,88 , 320,24 , 13848,28 , 13876,55 , 13931,14 , 13848,28 , 13876,55 , 13931,14 , 0,2 , 0,2  }, // Sena/Mozambique</div><div class='del'>-    {    181,   240,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 21814,48 , 21862,112 , 21974,24 , 21878,48 , 21926,112 , 22038,24 , 13945,28 , 13973,50 , 14023,14 , 13945,28 , 13973,50 , 14023,14 , 0,2 , 0,2  }, // North Ndebele/Zimbabwe</div><div class='del'>-    {    182,   210,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 21998,39 , 22037,194 , 22231,24 , 22062,39 , 22101,194 , 22295,24 , 14037,28 , 14065,65 , 14130,14 , 14037,28 , 14065,65 , 14130,14 , 377,8 , 385,7  }, // Rombo/Tanzania</div><div class='del'>-    {    183,   145,    44,   160,    59,    37,    48,    45,    43,   101, 364,8 , 99,16 , 37,5 , 8,10 , 22255,48 , 22303,81 , 22384,24 , 22319,48 , 22367,81 , 22448,24 , 14144,30 , 14174,48 , 798,14 , 14144,30 , 14174,48 , 798,14 , 385,6 , 392,8  }, // Tachelhit/Morocco</div><div class='del'>-    {    184,     3,    44,   160,    59,    37,    48,    45,    43,   101, 364,8 , 99,16 , 37,5 , 8,10 , 22408,48 , 22456,84 , 22540,24 , 22472,48 , 22520,84 , 22604,24 , 14222,30 , 14252,51 , 14303,14 , 14222,30 , 14252,51 , 14303,14 , 391,7 , 400,9  }, // Kabyle/Algeria</div><div class='del'>-    {    185,   221,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 22564,48 , 22612,152 , 134,24 , 22628,48 , 22676,152 , 320,24 , 14317,28 , 14345,74 , 14419,14 , 14317,28 , 14345,74 , 14419,14 , 0,2 , 0,2  }, // Nyankole/Uganda</div><div class='del'>-    {    186,   210,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 22764,48 , 22812,254 , 23066,24 , 22828,48 , 22876,254 , 23130,24 , 14433,28 , 14461,82 , 14543,14 , 14433,28 , 14461,82 , 14543,14 , 398,7 , 409,7  }, // Bena/Tanzania</div><div class='del'>-    {    187,   210,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 13266,48 , 23090,87 , 134,24 , 13417,48 , 23154,87 , 320,24 , 14557,28 , 14585,62 , 14647,14 , 14557,28 , 14585,62 , 14647,14 , 405,5 , 416,9  }, // Vunjo/Tanzania</div><div class='del'>-    {    188,   132,    46,    44,    59,    37,    48,    45,    43,   101, 364,8 , 99,16 , 37,5 , 8,10 , 23177,47 , 23224,92 , 23316,24 , 23241,47 , 23288,92 , 23380,24 , 14661,28 , 14689,44 , 14733,14 , 14661,28 , 14689,44 , 14733,14 , 0,2 , 0,2  }, // Bambara/Mali</div><div class='del'>-    {    189,   111,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 23340,48 , 23388,207 , 23595,24 , 23404,48 , 23452,207 , 23659,24 , 14747,28 , 14775,64 , 14839,14 , 14747,28 , 14775,64 , 14839,14 , 410,2 , 425,2  }, // Embu/Kenya</div><div class='del'>-    {    190,   225,    46,    44,    59,    37,    48,    45,    43,   101, 558,6 , 35,18 , 18,7 , 25,12 , 23619,36 , 23655,58 , 23713,24 , 23683,36 , 23719,58 , 23777,24 , 14853,28 , 14881,49 , 14930,14 , 14853,28 , 14881,49 , 14930,14 , 412,3 , 427,6  }, // Cherokee/UnitedStates</div><div class='del'>-    {    191,   137,    46,   160,    59,    37,    48,    45,    43,   101, 364,8 , 99,16 , 37,5 , 8,10 , 23737,47 , 23784,68 , 23852,24 , 23801,47 , 23848,68 , 23916,24 , 14944,27 , 14971,48 , 15019,14 , 14944,27 , 14971,48 , 15019,14 , 0,2 , 0,2  }, // Morisyen/Mauritius</div><div class='del'>-    {    192,   210,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 13266,48 , 23876,264 , 134,24 , 13417,48 , 23940,264 , 320,24 , 15033,28 , 15061,133 , 14130,14 , 15033,28 , 15061,133 , 14130,14 , 415,4 , 433,5  }, // Makonde/Tanzania</div><div class='del'>-    {    193,   210,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 24140,83 , 24223,111 , 24334,24 , 24204,83 , 24287,111 , 24398,24 , 15194,36 , 15230,63 , 15293,14 , 15194,36 , 15230,63 , 15293,14 , 419,3 , 438,3  }, // Langi/Tanzania</div><div class='del'>-    {    194,   221,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 24358,48 , 24406,97 , 134,24 , 24422,48 , 24470,97 , 320,24 , 15307,28 , 15335,66 , 15401,14 , 15307,28 , 15335,66 , 15401,14 , 0,2 , 0,2  }, // Ganda/Uganda</div><div class='del'>-    {    195,   239,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 24503,48 , 24551,83 , 24634,24 , 24567,48 , 24615,83 , 24698,24 , 15415,80 , 15415,80 , 798,14 , 15415,80 , 15415,80 , 798,14 , 422,8 , 441,7  }, // Bemba/Zambia</div><div class='del'>-    {    196,    39,    44,    46,    59,    37,    48,    45,    43,   101, 364,8 , 902,27 , 37,5 , 8,10 , 24658,48 , 24706,86 , 134,24 , 24722,48 , 24770,86 , 320,24 , 15495,28 , 15523,73 , 15596,14 , 15495,28 , 15523,73 , 15596,14 , 136,2 , 136,2  }, // Kabuverdianu/CapeVerde</div><div class='del'>-    {    197,   111,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 24792,48 , 24840,86 , 24926,24 , 24856,48 , 24904,86 , 24990,24 , 15610,28 , 15638,51 , 15689,14 , 15610,28 , 15638,51 , 15689,14 , 430,2 , 448,2  }, // Meru/Kenya</div><div class='del'>-    {    198,   111,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 24950,48 , 24998,111 , 25109,24 , 25014,48 , 25062,111 , 25173,24 , 15703,28 , 15731,93 , 15824,14 , 15703,28 , 15731,93 , 15824,14 , 432,4 , 450,4  }, // Kalenjin/Kenya</div><div class='del'>-    {    199,   148,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 0,48 , 25133,136 , 134,24 , 0,48 , 25197,136 , 320,24 , 15838,23 , 15861,92 , 15953,14 , 15838,23 , 15861,92 , 15953,14 , 436,7 , 454,5  }, // Nama/Namibia</div><div class='del'>-    {    200,   210,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 13266,48 , 23090,87 , 134,24 , 13417,48 , 23154,87 , 320,24 , 14557,28 , 14585,62 , 14647,14 , 14557,28 , 14585,62 , 14647,14 , 405,5 , 416,9  }, // Machame/Tanzania</div><div class='del'>-    {    201,    82,    44,   160,    59,    37,    48,  8722,    43,   101, 1440,10 , 1450,23 , 37,5 , 8,10 , 25269,59 , 25328,87 , 134,24 , 25333,59 , 25392,87 , 320,24 , 15967,28 , 15995,72 , 3089,14 , 15967,28 , 15995,72 , 3089,14 , 0,2 , 0,2  }, // Colognian/Germany</div><div class='del'>-    {    202,   111,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 25415,51 , 25466,132 , 1483,27 , 25479,51 , 25530,132 , 134,27 , 14557,28 , 16067,58 , 14130,14 , 14557,28 , 16067,58 , 14130,14 , 443,9 , 459,6  }, // Masai/Kenya</div><div class='del'>-    {    202,   210,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 25415,51 , 25466,132 , 1483,27 , 25479,51 , 25530,132 , 134,27 , 14557,28 , 16067,58 , 14130,14 , 14557,28 , 16067,58 , 14130,14 , 443,9 , 459,6  }, // Masai/Tanzania</div><div class='del'>-    {    203,   221,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 24358,48 , 24406,97 , 134,24 , 24422,48 , 24470,97 , 320,24 , 16125,35 , 16160,65 , 16225,14 , 16125,35 , 16160,65 , 16225,14 , 452,6 , 465,6  }, // Soga/Uganda</div><div class='del'>-    {    204,   111,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 25598,48 , 13314,84 , 134,24 , 25662,48 , 13465,84 , 320,24 , 16239,21 , 16260,75 , 85,14 , 16239,21 , 16260,75 , 85,14 , 56,4 , 56,4  }, // Luyia/Kenya</div><div class='del'>-    {    205,   210,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 25646,48 , 13314,84 , 134,24 , 25710,48 , 13465,84 , 320,24 , 16335,28 , 8627,60 , 14647,14 , 16335,28 , 8627,60 , 14647,14 , 458,9 , 471,8  }, // Asu/Tanzania</div><div class='del'>-    {    206,   111,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 25694,48 , 25742,94 , 25836,24 , 25758,48 , 25806,94 , 25900,24 , 16363,28 , 16391,69 , 16460,14 , 16363,28 , 16391,69 , 16460,14 , 467,9 , 479,6  }, // Teso/Kenya</div><div class='del'>-    {    206,   221,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 25694,48 , 25742,94 , 25836,24 , 25758,48 , 25806,94 , 25900,24 , 16363,28 , 16391,69 , 16460,14 , 16363,28 , 16391,69 , 16460,14 , 467,9 , 479,6  }, // Teso/Uganda</div><div class='del'>-    {    207,    67,    46,    44,    59,    37,    48,    45,    43,   101, 27,8 , 53,19 , 18,7 , 25,12 , 317,48 , 518,118 , 494,24 , 344,48 , 545,118 , 521,24 , 16474,28 , 16502,56 , 16558,14 , 16474,28 , 16502,56 , 16558,14 , 0,2 , 0,2  }, // Saho/Eritrea</div><div class='del'>-    {    208,   132,    46,   160,    59,    37,    48,    45,    43,   101, 364,8 , 99,16 , 37,5 , 8,10 , 25860,46 , 25906,88 , 25994,24 , 25924,46 , 25970,88 , 26058,24 , 16572,28 , 16600,53 , 16653,14 , 16572,28 , 16600,53 , 16653,14 , 476,6 , 485,6  }, // Koyra Chiini/Mali</div><div class='del'>-    {    209,   210,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 13266,48 , 23090,87 , 134,24 , 13417,48 , 23154,87 , 320,24 , 14557,28 , 14585,62 , 14647,14 , 14557,28 , 14585,62 , 14647,14 , 405,5 , 416,9  }, // Rwa/Tanzania</div><div class='del'>-    {    210,   111,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 26018,48 , 26066,186 , 26252,24 , 26082,48 , 26130,186 , 26316,24 , 16667,28 , 16695,69 , 16764,14 , 16667,28 , 16695,69 , 16764,14 , 482,2 , 491,2  }, // Luo/Kenya</div><div class='del'>-    {    211,   221,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 22564,48 , 22612,152 , 134,24 , 22628,48 , 22676,152 , 320,24 , 14317,28 , 14345,74 , 14419,14 , 14317,28 , 14345,74 , 14419,14 , 0,2 , 0,2  }, // Chiga/Uganda</div><div class='del'>-    {    212,   145,    44,   160,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 26276,48 , 26324,86 , 26410,24 , 26340,48 , 26388,86 , 26474,24 , 16778,28 , 16806,48 , 16854,14 , 16778,28 , 16806,48 , 16854,14 , 484,9 , 493,10  }, // Central Morocco Tamazight/Morocco</div><div class='del'>-    {    213,   132,    46,   160,    59,    37,    48,    45,    43,   101, 364,8 , 99,16 , 37,5 , 8,10 , 25860,46 , 25906,88 , 25994,24 , 25924,46 , 25970,88 , 26058,24 , 16868,28 , 16896,54 , 16653,14 , 16868,28 , 16896,54 , 16653,14 , 476,6 , 485,6  }, // Koyraboro Senni/Mali</div><div class='del'>-    {    214,   210,    46,    44,    59,    37,    48,    45,    43,   101, 141,10 , 10,17 , 18,7 , 25,12 , 13266,48 , 26434,84 , 134,24 , 13417,48 , 26498,84 , 320,24 , 16950,28 , 16978,63 , 8687,14 , 16950,28 , 16978,63 , 8687,14 , 493,5 , 503,8  }, // Shambala/Tanzania</div><div class='del'>-    {      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,0,     0,0,     0,0,     0,0,     0,0,     0,0,     0,0,    0,0,    0,0,    0,0,   0,0,   0,0,   0,0,   0,0,   0,0,   0,0,   0,0,   0,0 }  // trailing 0s</div><div class='add'>+//      lang   script terr    dec  group   list  prcnt   zero  minus  plus    exp quotStart quotEnd altQuotStart altQuotEnd lpStart lpMid lpEnd lpTwo sDtFmt lDtFmt sTmFmt lTmFmt ssMonth slMonth  sMonth lMonth  sDays  lDays  am,len      pm,len</div><div class='add'>+    {      1,     0,     0,    46,    44,    59,    37,    48,    45,    43,   101,    34,    34,    39,    39, 0,6 , 0,6 , 0,6 , 0,6 , 0,10 , 10,17 , 0,8 , 8,10 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 134,27 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 99,14 , 0,2 , 0,2 , {0,0,0},  0,0 , 0,7 , 0,4 , 4,0 , 0,0 , 0,0 ,     2,     1,     1,     6,     7 }, // C/AnyScript/AnyCountry</div><div class='add'>+    {      3,     0,    69,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 35,18 , 18,7 , 25,12 , 158,48 , 206,111 , 134,24 , 161,48 , 209,111 , 320,24 , 113,28 , 141,55 , 85,14 , 113,28 , 141,55 , 85,14 , 2,2 , 2,2 , {69,84,66},  0,2 , 7,24 , 4,4 , 4,0 , 0,6 , 6,10 ,     2,     1,     6,     6,     7 }, // Afan/AnyScript/Ethiopia</div><div class='add'>+    {      3,     0,   111,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 35,18 , 18,7 , 25,12 , 158,48 , 206,111 , 134,24 , 161,48 , 209,111 , 320,24 , 113,28 , 141,55 , 85,14 , 113,28 , 141,55 , 85,14 , 2,2 , 2,2 , {75,69,83},  2,3 , 0,7 , 4,4 , 4,0 , 0,6 , 16,8 ,     2,     1,     6,     6,     7 }, // Afan/AnyScript/Kenya</div><div class='add'>+    {      4,     0,    59,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 53,19 , 18,7 , 25,12 , 317,48 , 365,129 , 494,24 , 344,48 , 392,129 , 521,24 , 196,28 , 224,52 , 276,14 , 196,28 , 224,52 , 276,14 , 0,2 , 0,2 , {68,74,70},  5,3 , 0,7 , 4,4 , 4,0 , 24,5 , 29,7 ,     0,     0,     6,     6,     7 }, // Afar/AnyScript/Djibouti</div><div class='add'>+    {      4,     0,    67,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 53,19 , 18,7 , 25,12 , 317,48 , 518,118 , 494,24 , 344,48 , 545,118 , 521,24 , 196,28 , 224,52 , 276,14 , 196,28 , 224,52 , 276,14 , 0,2 , 0,2 , {69,82,78},  8,3 , 0,7 , 4,4 , 4,0 , 24,5 , 36,7 ,     2,     1,     6,     6,     7 }, // Afar/AnyScript/Eritrea</div><div class='add'>+    {      4,     0,    69,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 53,19 , 18,7 , 25,12 , 317,48 , 518,118 , 494,24 , 344,48 , 545,118 , 521,24 , 196,28 , 224,52 , 276,14 , 196,28 , 224,52 , 276,14 , 0,2 , 0,2 , {69,84,66},  0,2 , 0,7 , 4,4 , 4,0 , 24,5 , 43,7 ,     2,     1,     6,     6,     7 }, // Afar/AnyScript/Ethiopia</div><div class='add'>+    {      5,     0,   195,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 6,8 , 6,8 , 72,10 , 82,17 , 18,7 , 25,12 , 636,48 , 684,92 , 134,24 , 663,48 , 711,92 , 320,24 , 290,21 , 311,58 , 369,14 , 290,21 , 311,58 , 369,14 , 4,3 , 4,3 , {90,65,82},  11,1 , 31,27 , 4,4 , 4,0 , 50,9 , 59,11 ,     2,     1,     1,     6,     7 }, // Afrikaans/AnyScript/SouthAfrica</div><div class='add'>+    {      5,     0,   148,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 6,8 , 6,8 , 72,10 , 99,16 , 37,5 , 8,10 , 636,48 , 684,92 , 134,24 , 663,48 , 711,92 , 320,24 , 290,21 , 311,58 , 369,14 , 290,21 , 311,58 , 369,14 , 4,3 , 4,3 , {78,65,68},  12,2 , 58,23 , 8,5 , 4,0 , 50,9 , 70,7 ,     2,     1,     1,     6,     7 }, // Afrikaans/AnyScript/Namibia</div><div class='add'>+    {      6,     0,     2,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 115,8 , 123,18 , 42,7 , 49,12 , 776,48 , 824,78 , 902,24 , 803,48 , 851,78 , 929,24 , 383,28 , 411,58 , 469,14 , 383,28 , 411,58 , 469,14 , 7,2 , 7,2 , {65,76,76},  14,3 , 0,7 , 4,4 , 4,0 , 77,6 , 83,9 ,     0,     0,     1,     6,     7 }, // Albanian/AnyScript/Albania</div><div class='add'>+    {      7,     0,    69,    46,    44,    59,    37,    48,    45,    43,   101,   171,   187,  8249,  8250, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 926,46 , 972,62 , 1034,24 , 953,46 , 999,62 , 1061,24 , 483,27 , 510,28 , 538,14 , 483,27 , 510,28 , 538,14 , 9,3 , 9,4 , {69,84,66},  17,2 , 81,16 , 4,4 , 13,6 , 92,4 , 96,5 ,     2,     1,     6,     6,     7 }, // Amharic/AnyScript/Ethiopia</div><div class='add'>+    {      8,     0,   186,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 552,52 , 604,52 , 656,14 , 552,52 , 604,52 , 656,14 , 12,1 , 13,1 , {83,65,82},  19,5 , 97,77 , 4,4 , 4,0 , 101,7 , 108,24 ,     2,     1,     6,     4,     5 }, // Arabic/AnyScript/SaudiArabia</div><div class='add'>+    {      8,     0,     3,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 179,8 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1 , {68,90,68},  24,5 , 174,91 , 8,5 , 19,6 , 101,7 , 132,7 ,     2,     1,     6,     4,     5 }, // Arabic/AnyScript/Algeria</div><div class='add'>+    {      8,     0,    17,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1 , {66,72,68},  29,5 , 265,91 , 8,5 , 19,6 , 101,7 , 139,7 ,     3,     0,     6,     5,     6 }, // Arabic/AnyScript/Bahrain</div><div class='add'>+    {      8,     0,    64,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1 , {69,71,80},  34,5 , 356,70 , 8,5 , 19,6 , 101,7 , 146,3 ,     2,     1,     6,     5,     6 }, // Arabic/AnyScript/Egypt</div><div class='add'>+    {      8,     0,   103,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1 , {73,81,68},  39,5 , 426,84 , 8,5 , 19,6 , 101,7 , 149,6 ,     0,     0,     6,     5,     6 }, // Arabic/AnyScript/Iraq</div><div class='add'>+    {      8,     0,   109,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 151,10 , 161,18 , 18,7 , 61,12 , 1157,92 , 1157,92 , 1133,24 , 1184,92 , 1184,92 , 1160,24 , 552,52 , 604,52 , 656,14 , 552,52 , 604,52 , 656,14 , 12,1 , 13,1 , {74,79,68},  44,5 , 510,84 , 8,5 , 19,6 , 101,7 , 155,6 ,     3,     0,     6,     5,     6 }, // Arabic/AnyScript/Jordan</div><div class='add'>+    {      8,     0,   115,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1 , {75,87,68},  49,5 , 594,84 , 8,5 , 19,6 , 101,7 , 161,6 ,     3,     0,     6,     5,     6 }, // Arabic/AnyScript/Kuwait</div><div class='add'>+    {      8,     0,   119,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 151,10 , 161,18 , 18,7 , 61,12 , 1249,92 , 1249,92 , 1133,24 , 1276,92 , 1276,92 , 1160,24 , 552,52 , 604,52 , 656,14 , 552,52 , 604,52 , 656,14 , 12,1 , 13,1 , {76,66,80},  54,5 , 678,84 , 8,5 , 19,6 , 101,7 , 167,5 ,     0,     0,     1,     6,     7 }, // Arabic/AnyScript/Lebanon</div><div class='add'>+    {      8,     0,   122,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1 , {76,89,68},  59,5 , 762,77 , 8,5 , 19,6 , 101,7 , 172,5 ,     3,     0,     6,     5,     6 }, // Arabic/AnyScript/LibyanArabJamahiriya</div><div class='add'>+    {      8,     0,   145,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 179,8 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1 , {77,65,68},  64,5 , 839,77 , 8,5 , 19,6 , 101,7 , 177,6 ,     2,     1,     6,     5,     6 }, // Arabic/AnyScript/Morocco</div><div class='add'>+    {      8,     0,   162,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1 , {79,77,82},  69,5 , 916,77 , 8,5 , 19,6 , 101,7 , 183,5 ,     3,     0,     6,     4,     5 }, // Arabic/AnyScript/Oman</div><div class='add'>+    {      8,     0,   175,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 552,52 , 604,52 , 656,14 , 552,52 , 604,52 , 656,14 , 12,1 , 13,1 , {81,65,82},  74,5 , 993,70 , 4,4 , 4,0 , 101,7 , 188,3 ,     2,     1,     6,     5,     6 }, // Arabic/AnyScript/Qatar</div><div class='add'>+    {      8,     0,   201,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1 , {83,68,71},  0,0 , 1063,18 , 8,5 , 19,6 , 101,7 , 191,7 ,     2,     1,     6,     5,     6 }, // Arabic/AnyScript/Sudan</div><div class='add'>+    {      8,     0,   207,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 151,10 , 161,18 , 18,7 , 61,12 , 1249,92 , 1249,92 , 1133,24 , 1276,92 , 1276,92 , 1160,24 , 552,52 , 604,52 , 656,14 , 552,52 , 604,52 , 656,14 , 12,1 , 13,1 , {83,89,80},  79,5 , 1081,70 , 4,4 , 4,0 , 101,7 , 198,5 ,     0,     0,     7,     5,     6 }, // Arabic/AnyScript/SyrianArabRepublic</div><div class='add'>+    {      8,     0,   216,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 179,8 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 552,52 , 604,52 , 656,14 , 552,52 , 604,52 , 656,14 , 12,1 , 13,1 , {84,78,68},  84,5 , 1151,77 , 4,4 , 4,0 , 101,7 , 203,4 ,     3,     0,     6,     5,     6 }, // Arabic/AnyScript/Tunisia</div><div class='add'>+    {      8,     0,   223,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 670,38 , 604,52 , 656,14 , 670,38 , 604,52 , 656,14 , 12,1 , 13,1 , {65,69,68},  89,5 , 1228,91 , 8,5 , 19,6 , 101,7 , 207,24 ,     2,     1,     1,     5,     6 }, // Arabic/AnyScript/UnitedArabEmirates</div><div class='add'>+    {      8,     0,   237,  1643,  1644,  1563,  1642,  1632,    45,    43,   101,  8220,  8221,  8216,  8217, 14,6 , 14,6 , 20,8 , 28,7 , 151,10 , 161,18 , 18,7 , 61,12 , 1058,75 , 1058,75 , 1133,24 , 1085,75 , 1085,75 , 1160,24 , 552,52 , 604,52 , 656,14 , 552,52 , 604,52 , 656,14 , 12,1 , 13,1 , {89,69,82},  94,5 , 1319,70 , 4,4 , 4,0 , 101,7 , 231,5 ,     0,     0,     6,     4,     5 }, // Arabic/AnyScript/Yemen</div><div class='add'>+    {      9,     0,    11,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 187,8 , 35,18 , 37,5 , 8,10 , 1341,48 , 1389,94 , 1483,27 , 1368,48 , 1416,94 , 134,27 , 708,28 , 736,62 , 798,14 , 708,28 , 736,62 , 798,14 , 13,3 , 14,3 , {65,77,68},  99,3 , 0,7 , 25,5 , 4,0 , 236,7 , 243,24 ,     0,     0,     1,     6,     7 }, // Armenian/AnyScript/Armenia</div><div class='add'>+    {     10,     0,   100,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 195,8 , 203,18 , 73,8 , 81,12 , 1510,62 , 1572,88 , 1483,27 , 1510,62 , 1572,88 , 134,27 , 812,37 , 849,58 , 798,14 , 812,37 , 849,58 , 798,14 , 16,9 , 17,7 , {73,78,82},  102,3 , 0,7 , 8,5 , 4,0 , 267,6 , 273,4 ,     2,     1,     7,     7,     7 }, // Assamese/AnyScript/India</div><div class='add'>+    {     12,     0,    15,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 229,19 , 37,5 , 8,10 , 1660,48 , 1708,77 , 1483,27 , 1660,48 , 1708,77 , 134,27 , 907,26 , 933,67 , 99,14 , 907,26 , 933,67 , 99,14 , 0,2 , 0,2 , {65,90,78},  105,4 , 1389,41 , 8,5 , 4,0 , 277,12 , 289,10 ,     2,     1,     7,     6,     7 }, // Azerbaijani/AnyScript/Azerbaijan</div><div class='add'>+    {     12,     0,   102,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 229,19 , 37,5 , 8,10 , 1660,48 , 1708,77 , 1483,27 , 1660,48 , 1708,77 , 134,27 , 907,26 , 933,67 , 99,14 , 907,26 , 933,67 , 99,14 , 0,2 , 0,2 , {73,82,82},  0,0 , 1430,27 , 8,5 , 4,0 , 277,12 , 299,4 ,     0,     0,     6,     4,     5 }, // Azerbaijani/AnyScript/Iran</div><div class='add'>+    {     12,     1,   102,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 229,19 , 37,5 , 8,10 , 1660,48 , 1708,77 , 1483,27 , 1660,48 , 1708,77 , 134,27 , 907,26 , 933,67 , 99,14 , 907,26 , 933,67 , 99,14 , 0,2 , 0,2 , {73,82,82},  0,0 , 1430,27 , 8,5 , 4,0 , 277,12 , 299,4 ,     0,     0,     6,     4,     5 }, // Azerbaijani/Arabic/Iran</div><div class='add'>+    {     12,     2,    15,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 229,19 , 37,5 , 8,10 , 1660,48 , 1785,77 , 1483,27 , 1660,48 , 1785,77 , 134,27 , 907,26 , 1000,67 , 99,14 , 907,26 , 1000,67 , 99,14 , 0,2 , 0,2 , {65,90,78},  109,4 , 1457,29 , 8,5 , 4,0 , 303,10 , 303,10 ,     2,     1,     7,     6,     7 }, // Azerbaijani/Cyrillic/Azerbaijan</div><div class='add'>+    {     12,     7,    15,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 229,19 , 37,5 , 8,10 , 1660,48 , 1708,77 , 1483,27 , 1660,48 , 1708,77 , 134,27 , 907,26 , 933,67 , 99,14 , 907,26 , 933,67 , 99,14 , 0,2 , 0,2 , {65,90,78},  105,4 , 1389,41 , 8,5 , 4,0 , 277,12 , 289,10 ,     2,     1,     7,     6,     7 }, // Azerbaijani/Latin/Azerbaijan</div><div class='add'>+    {     14,     0,   197,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 248,31 , 37,5 , 8,10 , 1862,48 , 1910,93 , 2003,24 , 1862,48 , 1910,93 , 2003,24 , 1067,21 , 1088,68 , 798,14 , 1067,21 , 1088,68 , 798,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 0,7 , 25,5 , 4,0 , 313,7 , 320,8 ,     2,     1,     1,     6,     7 }, // Basque/AnyScript/Spain</div><div class='add'>+    {     15,     0,    18,    46,    44,    59,    37,  2534,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 35,10 , 45,9 , 279,6 , 203,18 , 18,7 , 25,12 , 2027,90 , 2027,90 , 2117,33 , 2027,90 , 2027,90 , 2117,33 , 1156,37 , 1193,58 , 1251,18 , 1156,37 , 1193,58 , 1251,18 , 25,9 , 24,7 , {66,68,84},  114,1 , 1486,21 , 0,4 , 30,6 , 328,5 , 333,8 ,     2,     1,     1,     6,     7 }, // Bengali/AnyScript/Bangladesh</div><div class='add'>+    {     15,     0,   100,    46,    44,    59,    37,  2534,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 35,10 , 45,9 , 279,6 , 203,18 , 18,7 , 25,12 , 2027,90 , 2027,90 , 2117,33 , 2027,90 , 2027,90 , 2117,33 , 1156,37 , 1193,58 , 1251,18 , 1156,37 , 1193,58 , 1251,18 , 25,9 , 24,7 , {73,78,82},  115,4 , 1507,19 , 0,4 , 30,6 , 328,5 , 341,4 ,     2,     1,     7,     7,     7 }, // Bengali/AnyScript/India</div><div class='add'>+    {     16,     0,    25,    46,    44,    59,    37,    48,    45,    43,   101,    34,    34,    39,    39, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 285,29 , 93,22 , 115,35 , 2150,75 , 2225,205 , 1483,27 , 2150,75 , 2225,205 , 134,27 , 1269,34 , 1303,79 , 798,14 , 1269,34 , 1303,79 , 798,14 , 0,2 , 0,2 , {66,84,78},  119,3 , 1526,16 , 4,4 , 4,0 , 345,6 , 351,5 ,     2,     1,     1,     6,     7 }, // Bhutani/AnyScript/Bhutan</div><div class='add'>+    {     19,     0,    74,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 1542,11 , 8,5 , 4,0 , 0,0 , 356,5 ,     2,     1,     1,     6,     7 }, // Breton/AnyScript/France</div><div class='add'>+    {     20,     0,    33,    44,   160,    59,    37,    48,    45,    43,   101,  8222,  8220,  8216,  8217, 0,6 , 0,6 , 54,7 , 54,7 , 332,8 , 340,18 , 37,5 , 8,10 , 2430,59 , 2489,82 , 2571,24 , 2430,59 , 2489,82 , 2571,24 , 1382,21 , 1403,55 , 1458,14 , 1382,21 , 1403,55 , 1458,14 , 34,7 , 31,7 , {66,71,78},  122,3 , 1553,47 , 25,5 , 4,0 , 361,9 , 370,8 ,     2,     1,     1,     6,     7 }, // Bulgarian/AnyScript/Bulgaria</div><div class='add'>+    {     21,     0,   147,    46,    44,  4170,    37,  4160,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 2595,43 , 2638,88 , 2726,24 , 2595,43 , 2638,88 , 2726,24 , 1472,25 , 1497,54 , 1551,14 , 1472,25 , 1497,54 , 1551,14 , 0,2 , 0,2 , {77,77,75},  125,1 , 1600,18 , 8,5 , 4,0 , 378,3 , 381,6 ,     0,     0,     1,     6,     7 }, // Burmese/AnyScript/Myanmar</div><div class='add'>+    {     22,     0,    20,    44,   160,    59,    37,    48,    45,    43,   101,  8222,  8221,   171,   187, 0,6 , 0,6 , 0,6 , 0,6 , 358,6 , 10,17 , 150,5 , 155,10 , 2750,48 , 2798,99 , 2897,24 , 2750,48 , 2798,95 , 2893,24 , 1565,21 , 1586,56 , 1642,14 , 1565,21 , 1586,56 , 1642,14 , 41,10 , 38,13 , {66,89,82},  0,0 , 1618,23 , 4,4 , 4,0 , 387,10 , 397,8 ,     0,     0,     1,     6,     7 }, // Byelorussian/AnyScript/Belarus</div><div class='add'>+    {     23,     0,    36,    44,    46,    59,    37,    48,    45,    43,   101,    39,    39,    34,    34, 0,6 , 0,6 , 0,6 , 0,6 , 364,8 , 372,30 , 165,4 , 169,26 , 2921,27 , 2948,71 , 1483,27 , 2917,27 , 2944,71 , 134,27 , 1656,19 , 1675,76 , 798,14 , 1656,19 , 1675,76 , 798,14 , 51,5 , 51,5 , {75,72,82},  126,1 , 1641,11 , 0,4 , 4,0 , 405,9 , 414,7 ,     2,     1,     1,     6,     7 }, // Cambodian/AnyScript/Cambodia</div><div class='add'>+    {     24,     0,   197,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 61,7 , 61,7 , 27,8 , 402,21 , 165,4 , 195,9 , 3019,60 , 3079,82 , 3161,24 , 3015,93 , 3108,115 , 3223,24 , 1751,21 , 1772,60 , 1832,14 , 1846,28 , 1874,60 , 1934,14 , 56,4 , 56,4 , {69,85,82},  113,1 , 1652,20 , 25,5 , 4,0 , 421,6 , 427,7 ,     2,     1,     1,     6,     7 }, // Catalan/AnyScript/Spain</div><div class='add'>+    {     25,     0,    44,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 68,5 , 68,5 , 73,5 , 73,5 , 423,6 , 429,13 , 204,6 , 210,11 , 3185,38 , 3185,38 , 3223,39 , 3247,39 , 3247,39 , 3247,39 , 1948,21 , 1969,28 , 1997,14 , 1948,21 , 1969,28 , 1997,14 , 60,2 , 60,2 , {67,78,89},  127,1 , 1672,10 , 4,4 , 4,0 , 434,2 , 436,2 ,     2,     1,     7,     6,     7 }, // Chinese/AnyScript/China</div><div class='add'>+    {     25,     0,    97,    46,    44,    59,    37,    48,    45,    43,   101, 12300, 12301, 12302, 12303, 68,5 , 68,5 , 73,5 , 73,5 , 442,7 , 429,13 , 204,6 , 221,11 , 3185,38 , 3185,38 , 1483,27 , 3247,39 , 3247,39 , 134,27 , 2011,21 , 1969,28 , 1997,14 , 2011,21 , 1969,28 , 1997,14 , 60,2 , 60,2 , {72,75,68},  128,1 , 1682,9 , 4,4 , 13,6 , 434,2 , 438,14 ,     2,     1,     7,     6,     7 }, // Chinese/AnyScript/HongKong</div><div class='add'>+    {     25,     0,   126,    46,    44,    59,    37,    48,    45,    43,   101, 12300, 12301, 12302, 12303, 68,5 , 68,5 , 73,5 , 73,5 , 442,7 , 449,15 , 204,6 , 221,11 , 3185,38 , 3185,38 , 1483,27 , 3247,39 , 3247,39 , 134,27 , 2011,21 , 1969,28 , 1997,14 , 2011,21 , 1969,28 , 1997,14 , 60,2 , 60,2 , {77,79,80},  129,4 , 1691,10 , 4,4 , 4,0 , 434,2 , 452,14 ,     2,     1,     7,     6,     7 }, // Chinese/AnyScript/Macau</div><div class='add'>+    {     25,     0,   190,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 68,5 , 68,5 , 73,5 , 73,5 , 27,8 , 429,13 , 232,7 , 210,11 , 3185,38 , 3185,38 , 3223,39 , 3247,39 , 3247,39 , 3247,39 , 1948,21 , 1969,28 , 1997,14 , 1948,21 , 1969,28 , 1997,14 , 60,2 , 60,2 , {83,71,68},  133,2 , 1701,11 , 4,4 , 4,0 , 434,2 , 466,3 ,     2,     1,     7,     6,     7 }, // Chinese/AnyScript/Singapore</div><div class='add'>+    {     25,     0,   208,    46,    44,    59,    37,    48,    45,    43,   101, 12300, 12301, 12302, 12303, 68,5 , 68,5 , 73,5 , 73,5 , 464,6 , 429,13 , 204,6 , 221,11 , 3185,38 , 3185,38 , 1483,27 , 3247,39 , 3247,39 , 134,27 , 2011,21 , 1969,28 , 1997,14 , 2011,21 , 1969,28 , 1997,14 , 60,2 , 60,2 , {84,87,68},  135,3 , 1712,10 , 4,4 , 4,0 , 434,2 , 469,2 ,     2,     1,     7,     6,     7 }, // Chinese/AnyScript/Taiwan</div><div class='add'>+    {     25,     5,    44,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 68,5 , 68,5 , 73,5 , 73,5 , 423,6 , 429,13 , 204,6 , 210,11 , 3185,38 , 3185,38 , 3223,39 , 3247,39 , 3247,39 , 3247,39 , 1948,21 , 1969,28 , 1997,14 , 1948,21 , 1969,28 , 1997,14 , 60,2 , 60,2 , {67,78,89},  127,1 , 1672,10 , 4,4 , 4,0 , 471,6 , 436,2 ,     2,     1,     7,     6,     7 }, // Chinese/Simplified Han/China</div><div class='add'>+    {     25,     5,    97,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 68,5 , 68,5 , 73,5 , 73,5 , 423,6 , 429,13 , 204,6 , 210,11 , 3185,38 , 3185,38 , 3223,39 , 3247,39 , 3247,39 , 3247,39 , 1948,21 , 1969,28 , 1997,14 , 1948,21 , 1969,28 , 1997,14 , 60,2 , 60,2 , {72,75,68},  128,1 , 1682,9 , 4,4 , 4,0 , 471,6 , 477,9 ,     2,     1,     7,     6,     7 }, // Chinese/Simplified Han/HongKong</div><div class='add'>+    {     25,     5,   126,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 68,5 , 68,5 , 73,5 , 73,5 , 423,6 , 429,13 , 204,6 , 210,11 , 3185,38 , 3185,38 , 3223,39 , 3247,39 , 3247,39 , 3247,39 , 1948,21 , 1969,28 , 1997,14 , 1948,21 , 1969,28 , 1997,14 , 60,2 , 60,2 , {77,79,80},  129,4 , 1722,10 , 4,4 , 4,0 , 471,6 , 486,9 ,     2,     1,     7,     6,     7 }, // Chinese/Simplified Han/Macau</div><div class='add'>+    {     25,     5,   190,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 68,5 , 68,5 , 73,5 , 73,5 , 27,8 , 429,13 , 232,7 , 210,11 , 3185,38 , 3185,38 , 3223,39 , 3247,39 , 3247,39 , 3247,39 , 1948,21 , 1969,28 , 1997,14 , 1948,21 , 1969,28 , 1997,14 , 60,2 , 60,2 , {83,71,68},  133,2 , 1701,11 , 4,4 , 4,0 , 471,6 , 466,3 ,     2,     1,     7,     6,     7 }, // Chinese/Simplified Han/Singapore</div><div class='add'>+    {     25,     6,    97,    46,    44,    59,    37,    48,    45,    43,   101, 12300, 12301, 12302, 12303, 68,5 , 68,5 , 73,5 , 73,5 , 442,7 , 429,13 , 204,6 , 221,11 , 3185,38 , 3185,38 , 1483,27 , 3247,39 , 3247,39 , 134,27 , 2011,21 , 1969,28 , 1997,14 , 2011,21 , 1969,28 , 1997,14 , 60,2 , 60,2 , {72,75,68},  128,1 , 1682,9 , 4,4 , 13,6 , 495,4 , 438,14 ,     2,     1,     7,     6,     7 }, // Chinese/Traditional Han/HongKong</div><div class='add'>+    {     25,     6,   126,    46,    44,    59,    37,    48,    45,    43,   101, 12300, 12301, 12302, 12303, 68,5 , 68,5 , 73,5 , 73,5 , 442,7 , 449,15 , 204,6 , 221,11 , 3185,38 , 3185,38 , 1483,27 , 3247,39 , 3247,39 , 134,27 , 2011,21 , 1969,28 , 1997,14 , 2011,21 , 1969,28 , 1997,14 , 60,2 , 60,2 , {77,79,80},  129,4 , 1691,10 , 4,4 , 4,0 , 495,4 , 452,14 ,     2,     1,     7,     6,     7 }, // Chinese/Traditional Han/Macau</div><div class='add'>+    {     25,     6,   208,    46,    44,    59,    37,    48,    45,    43,   101, 12300, 12301, 12302, 12303, 68,5 , 68,5 , 73,5 , 73,5 , 464,6 , 429,13 , 204,6 , 221,11 , 3185,38 , 3185,38 , 1483,27 , 3247,39 , 3247,39 , 134,27 , 2011,21 , 1969,28 , 1997,14 , 2011,21 , 1969,28 , 1997,14 , 60,2 , 60,2 , {84,87,68},  135,3 , 1712,10 , 4,4 , 4,0 , 495,4 , 469,2 ,     2,     1,     7,     6,     7 }, // Chinese/Traditional Han/Taiwan</div><div class='add'>+    {     27,     0,    54,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 61,7 , 61,7 , 470,13 , 483,19 , 37,5 , 8,10 , 3262,49 , 3311,94 , 3405,39 , 3286,49 , 3335,98 , 3433,39 , 2032,28 , 2060,58 , 2118,14 , 2032,28 , 2060,58 , 2118,14 , 0,2 , 0,2 , {72,82,75},  138,2 , 1732,27 , 25,5 , 4,0 , 499,8 , 507,8 ,     2,     1,     1,     6,     7 }, // Croatian/AnyScript/Croatia</div><div class='add'>+    {     28,     0,    57,    44,   160,    59,    37,    48,    45,    43,   101,  8222,  8220,  8218,  8216, 0,6 , 0,6 , 78,7 , 78,7 , 358,6 , 502,18 , 165,4 , 195,9 , 3405,39 , 3444,82 , 3526,24 , 134,27 , 3472,84 , 3556,24 , 2132,21 , 2153,49 , 2202,14 , 2132,21 , 2153,49 , 2202,14 , 62,4 , 62,4 , {67,90,75},  140,2 , 1759,19 , 25,5 , 4,0 , 515,7 , 522,15 ,     2,     1,     1,     6,     7 }, // Czech/AnyScript/CzechRepublic</div><div class='add'>+    {     29,     0,    58,    44,    46,    44,    37,    48,    45,    43,   101,  8221,  8221,  8221,  8221, 0,6 , 0,6 , 85,8 , 85,8 , 27,8 , 520,23 , 150,5 , 155,10 , 3550,48 , 3598,84 , 134,24 , 3580,59 , 3639,84 , 320,24 , 2216,28 , 2244,51 , 2295,14 , 2216,28 , 2244,51 , 2295,14 , 66,4 , 66,4 , {68,75,75},  142,2 , 1778,42 , 25,5 , 4,0 , 537,5 , 542,7 ,     2,     1,     1,     6,     7 }, // Danish/AnyScript/Denmark</div><div class='add'>+    {     30,     0,   151,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 6,8 , 6,8 , 543,8 , 99,16 , 37,5 , 8,10 , 3682,48 , 3730,88 , 134,24 , 3723,59 , 3782,88 , 320,24 , 2309,21 , 2330,59 , 2389,14 , 2309,21 , 2330,59 , 2389,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 1820,19 , 8,5 , 19,6 , 549,10 , 559,9 ,     2,     1,     1,     6,     7 }, // Dutch/AnyScript/Netherlands</div><div class='add'>+    {     30,     0,    21,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 6,8 , 6,8 , 551,7 , 99,16 , 37,5 , 8,10 , 3682,48 , 3730,88 , 134,24 , 3723,59 , 3782,88 , 320,24 , 2309,21 , 2330,59 , 2389,14 , 2309,21 , 2330,59 , 2389,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 1820,19 , 25,5 , 4,0 , 568,6 , 574,6 ,     2,     1,     1,     6,     7 }, // Dutch/AnyScript/Belgium</div><div class='add'>+    {     31,     0,   225,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {85,83,68},  128,1 , 1839,35 , 4,4 , 13,6 , 580,12 , 592,13 ,     2,     1,     7,     6,     7 }, // English/AnyScript/UnitedStates</div><div class='add'>+    {     31,     0,     4,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {85,83,68},  128,1 , 1839,35 , 4,4 , 13,6 , 605,7 , 612,14 ,     2,     1,     7,     6,     7 }, // English/AnyScript/AmericanSamoa</div><div class='add'>+    {     31,     0,    13,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 551,7 , 10,17 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {65,85,68},  128,1 , 1874,59 , 4,4 , 4,0 , 626,18 , 644,9 ,     2,     1,     1,     6,     7 }, // English/AnyScript/Australia</div><div class='add'>+    {     31,     0,    21,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 27,8 , 99,16 , 37,5 , 239,24 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 1933,20 , 25,5 , 4,0 , 605,7 , 653,7 ,     2,     1,     1,     6,     7 }, // English/AnyScript/Belgium</div><div class='add'>+    {     31,     0,    22,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 27,8 , 564,12 , 37,5 , 8,10 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {66,90,68},  128,1 , 1953,47 , 4,4 , 4,0 , 605,7 , 660,6 ,     2,     1,     1,     6,     7 }, // English/AnyScript/Belize</div><div class='add'>+    {     31,     0,    28,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 27,8 , 82,17 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {66,87,80},  144,1 , 2000,50 , 4,4 , 4,0 , 605,7 , 666,8 ,     2,     1,     7,     6,     7 }, // English/AnyScript/Botswana</div><div class='add'>+    {     31,     0,    38,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 115,8 , 203,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {67,65,68},  128,1 , 2050,53 , 4,4 , 13,6 , 674,16 , 690,6 ,     2,     1,     7,     6,     7 }, // English/AnyScript/Canada</div><div class='add'>+    {     31,     0,    89,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {85,83,68},  128,1 , 1839,35 , 4,4 , 13,6 , 605,7 , 696,4 ,     2,     1,     7,     6,     7 }, // English/AnyScript/Guam</div><div class='add'>+    {     31,     0,    97,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 279,6 , 203,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {72,75,68},  128,1 , 2103,56 , 4,4 , 13,6 , 605,7 , 700,19 ,     2,     1,     7,     6,     7 }, // English/AnyScript/HongKong</div><div class='add'>+    {     31,     0,   100,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 27,8 , 99,16 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {73,78,82},  145,2 , 2159,44 , 8,5 , 4,0 , 605,7 , 719,5 ,     2,     1,     7,     7,     7 }, // English/AnyScript/India</div><div class='add'>+    {     31,     0,   104,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 141,10 , 99,16 , 37,5 , 8,10 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 56,4 , 56,4 , {69,85,82},  113,1 , 1933,20 , 4,4 , 4,0 , 605,7 , 724,7 ,     2,     1,     7,     6,     7 }, // English/AnyScript/Ireland</div><div class='add'>+    {     31,     0,   107,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 279,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {74,77,68},  128,1 , 2203,53 , 4,4 , 4,0 , 605,7 , 731,7 ,     2,     1,     7,     6,     7 }, // English/AnyScript/Jamaica</div><div class='add'>+    {     31,     0,   133,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 141,10 , 10,17 , 37,5 , 8,10 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 1933,20 , 4,4 , 4,0 , 605,7 , 738,5 ,     2,     1,     7,     6,     7 }, // English/AnyScript/Malta</div><div class='add'>+    {     31,     0,   134,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {85,83,68},  128,1 , 1839,35 , 4,4 , 13,6 , 605,7 , 743,16 ,     2,     1,     7,     6,     7 }, // English/AnyScript/MarshallIslands</div><div class='add'>+    {     31,     0,   137,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {77,85,82},  147,4 , 2256,53 , 4,4 , 13,6 , 605,7 , 759,9 ,     0,     0,     1,     6,     7 }, // English/AnyScript/Mauritius</div><div class='add'>+    {     31,     0,   148,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {78,65,68},  128,1 , 2309,53 , 4,4 , 4,0 , 605,7 , 768,7 ,     2,     1,     1,     6,     7 }, // English/AnyScript/Namibia</div><div class='add'>+    {     31,     0,   154,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 551,7 , 10,17 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {78,90,68},  128,1 , 2362,62 , 4,4 , 4,0 , 605,7 , 775,11 ,     2,     1,     7,     6,     7 }, // English/AnyScript/NewZealand</div><div class='add'>+    {     31,     0,   160,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {85,83,68},  128,1 , 1839,35 , 4,4 , 13,6 , 605,7 , 786,24 ,     2,     1,     7,     6,     7 }, // English/AnyScript/NorthernMarianaIslands</div><div class='add'>+    {     31,     0,   163,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 27,8 , 99,16 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {80,75,82},  151,1 , 2424,53 , 8,5 , 4,0 , 605,7 , 810,8 ,     0,     0,     7,     6,     7 }, // English/AnyScript/Pakistan</div><div class='add'>+    {     31,     0,   170,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {80,72,80},  152,1 , 2477,42 , 4,4 , 13,6 , 605,7 , 818,11 ,     2,     1,     7,     6,     7 }, // English/AnyScript/Philippines</div><div class='add'>+    {     31,     0,   190,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 279,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {83,71,68},  128,1 , 2519,56 , 4,4 , 13,6 , 605,7 , 829,9 ,     2,     1,     7,     6,     7 }, // English/AnyScript/Singapore</div><div class='add'>+    {     31,     0,   195,    44,   160,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 576,10 , 82,17 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {90,65,82},  11,1 , 2575,61 , 4,4 , 4,0 , 605,7 , 838,12 ,     2,     1,     1,     6,     7 }, // English/AnyScript/SouthAfrica</div><div class='add'>+    {     31,     0,   215,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {84,84,68},  128,1 , 2636,86 , 4,4 , 4,0 , 605,7 , 850,19 ,     2,     1,     7,     6,     7 }, // English/AnyScript/TrinidadAndTobago</div><div class='add'>+    {     31,     0,   224,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 93,10 , 103,9 , 141,10 , 10,17 , 37,5 , 8,10 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {71,66,80},  153,1 , 2722,74 , 4,4 , 4,0 , 869,15 , 884,14 ,     2,     1,     1,     6,     7 }, // English/AnyScript/UnitedKingdom</div><div class='add'>+    {     31,     0,   226,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {85,83,68},  128,1 , 1839,35 , 4,4 , 13,6 , 605,7 , 898,27 ,     2,     1,     7,     6,     7 }, // English/AnyScript/UnitedStatesMinorOutlyingIslands</div><div class='add'>+    {     31,     0,   234,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 558,6 , 35,18 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {85,83,68},  128,1 , 1839,35 , 4,4 , 13,6 , 605,7 , 925,19 ,     2,     1,     7,     6,     7 }, // English/AnyScript/USVirginIslands</div><div class='add'>+    {     31,     0,   240,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 364,8 , 82,17 , 18,7 , 25,12 , 0,48 , 48,86 , 134,24 , 0,48 , 48,86 , 320,24 , 0,28 , 28,57 , 85,14 , 0,28 , 28,57 , 85,14 , 0,2 , 0,2 , {85,83,68},  128,1 , 1839,35 , 4,4 , 4,0 , 605,7 , 944,8 ,     2,     1,     7,     6,     7 }, // English/AnyScript/Zimbabwe</div><div class='add'>+    {     31,     3,   225,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 93,10 , 103,9 , 558,6 , 35,18 , 18,7 , 25,12 , 3818,80 , 3898,154 , 4052,36 , 3870,80 , 3950,154 , 4104,36 , 2403,49 , 2452,85 , 2537,21 , 2403,49 , 2452,85 , 2537,21 , 70,4 , 70,4 , {85,83,68},  128,1 , 1839,35 , 4,4 , 13,6 , 580,12 , 952,25 ,     2,     1,     7,     6,     7 }, // English/Deseret/UnitedStates</div><div class='add'>+    {     33,     0,    68,    44,   160,    59,    37,    48,    45,    43,   101,  8222,  8220,  8222,  8220, 0,6 , 0,6 , 112,8 , 112,8 , 332,8 , 502,18 , 165,4 , 263,9 , 4088,59 , 4147,91 , 4238,24 , 4140,59 , 4199,91 , 4290,24 , 2558,14 , 2572,63 , 2558,14 , 2558,14 , 2572,63 , 2558,14 , 74,14 , 74,16 , {69,69,75},  142,2 , 2796,41 , 25,5 , 4,0 , 977,5 , 982,5 ,     2,     1,     1,     6,     7 }, // Estonian/AnyScript/Estonia</div><div class='add'>+    {     34,     0,    71,    44,    46,    59,    37,    48,  8722,    43,   101,  8221,  8221,  8217,  8217, 0,6 , 0,6 , 85,8 , 85,8 , 543,8 , 82,17 , 37,5 , 8,10 , 4262,48 , 4310,83 , 134,24 , 4314,48 , 4362,83 , 320,24 , 2635,28 , 2663,74 , 2737,14 , 2635,28 , 2663,74 , 2737,14 , 0,2 , 0,2 , {68,75,75},  142,2 , 2837,42 , 4,4 , 36,5 , 987,8 , 995,7 ,     2,     1,     7,     6,     7 }, // Faroese/AnyScript/FaroeIslands</div><div class='add'>+    {     36,     0,    73,    44,   160,    59,    37,    48,    45,    43,   101,  8221,  8221,  8217,  8217, 0,6 , 0,6 , 112,8 , 112,8 , 586,8 , 594,17 , 272,4 , 276,9 , 4393,69 , 4462,105 , 4567,24 , 4445,129 , 4445,129 , 4574,24 , 2751,21 , 2772,67 , 2839,14 , 2751,21 , 2853,81 , 2839,14 , 88,3 , 90,3 , {69,85,82},  113,1 , 2879,20 , 25,5 , 4,0 , 1002,5 , 1007,5 ,     2,     1,     1,     6,     7 }, // Finnish/AnyScript/Finland</div><div class='add'>+    {     37,     0,    74,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 27,8 , 99,16 , 37,5 , 8,10 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 1652,20 , 25,5 , 4,0 , 1012,8 , 1020,6 ,     2,     1,     1,     6,     7 }, // French/AnyScript/France</div><div class='add'>+    {     37,     0,    21,    44,    46,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 551,7 , 99,16 , 37,5 , 285,23 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 1652,20 , 25,5 , 4,0 , 1012,8 , 1026,8 ,     2,     1,     1,     6,     7 }, // French/AnyScript/Belgium</div><div class='add'>+    {     37,     0,    37,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 27,8 , 99,16 , 37,5 , 8,10 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {88,65,70},  154,3 , 2899,56 , 25,5 , 4,0 , 1012,8 , 1034,8 ,     0,     0,     1,     6,     7 }, // French/AnyScript/Cameroon</div><div class='add'>+    {     37,     0,    38,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 115,8 , 99,16 , 37,5 , 239,24 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {67,65,68},  128,1 , 2955,54 , 25,5 , 41,7 , 1042,17 , 690,6 ,     2,     1,     7,     6,     7 }, // French/AnyScript/Canada</div><div class='add'>+    {     37,     0,    41,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 27,8 , 99,16 , 37,5 , 8,10 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {88,65,70},  154,3 , 2899,56 , 25,5 , 4,0 , 1012,8 , 1059,25 ,     0,     0,     1,     6,     7 }, // French/AnyScript/CentralAfricanRepublic</div><div class='add'>+    {     37,     0,    53,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 27,8 , 99,16 , 37,5 , 8,10 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {88,79,70},  157,3 , 3009,59 , 25,5 , 4,0 , 1012,8 , 1084,13 ,     0,     0,     1,     6,     7 }, // French/AnyScript/IvoryCoast</div><div class='add'>+    {     37,     0,    88,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 27,8 , 99,16 , 37,5 , 8,10 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 1652,20 , 25,5 , 4,0 , 1012,8 , 1097,10 ,     2,     1,     1,     6,     7 }, // French/AnyScript/Guadeloupe</div><div class='add'>+    {     37,     0,    91,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 27,8 , 99,16 , 37,5 , 8,10 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {71,78,70},  160,3 , 3068,48 , 25,5 , 4,0 , 1012,8 , 1107,6 ,     0,     0,     1,     6,     7 }, // French/AnyScript/Guinea</div><div class='add'>+    {     37,     0,   125,    44,    46,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 27,8 , 99,16 , 37,5 , 8,10 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 1652,20 , 25,5 , 4,0 , 1012,8 , 1113,10 ,     2,     1,     1,     6,     7 }, // French/AnyScript/Luxembourg</div><div class='add'>+    {     37,     0,   128,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 27,8 , 99,16 , 37,5 , 8,10 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {77,71,65},  0,0 , 3116,54 , 25,5 , 4,0 , 1012,8 , 1123,10 ,     0,     0,     1,     6,     7 }, // French/AnyScript/Madagascar</div><div class='add'>+    {     37,     0,   132,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 27,8 , 99,16 , 37,5 , 8,10 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {88,79,70},  157,3 , 3009,59 , 25,5 , 4,0 , 1012,8 , 1133,4 ,     0,     0,     1,     6,     7 }, // French/AnyScript/Mali</div><div class='add'>+    {     37,     0,   135,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 27,8 , 99,16 , 37,5 , 8,10 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 1652,20 , 25,5 , 4,0 , 1012,8 , 1137,10 ,     2,     1,     1,     6,     7 }, // French/AnyScript/Martinique</div><div class='add'>+    {     37,     0,   142,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 27,8 , 99,16 , 37,5 , 8,10 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 1652,20 , 25,5 , 4,0 , 1012,8 , 1147,6 ,     2,     1,     1,     6,     7 }, // French/AnyScript/Monaco</div><div class='add'>+    {     37,     0,   156,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 27,8 , 99,16 , 37,5 , 8,10 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {88,79,70},  157,3 , 3009,59 , 25,5 , 4,0 , 1012,8 , 1153,5 ,     0,     0,     1,     6,     7 }, // French/AnyScript/Niger</div><div class='add'>+    {     37,     0,   176,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 27,8 , 99,16 , 37,5 , 8,10 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 1652,20 , 25,5 , 4,0 , 1012,8 , 1158,7 ,     2,     1,     1,     6,     7 }, // French/AnyScript/Reunion</div><div class='add'>+    {     37,     0,   187,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 27,8 , 99,16 , 37,5 , 8,10 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {88,79,70},  157,3 , 3009,59 , 25,5 , 4,0 , 1012,8 , 1165,7 ,     0,     0,     1,     6,     7 }, // French/AnyScript/Senegal</div><div class='add'>+    {     37,     0,   206,    46,    39,    59,    37,    48,    45,    43,   101,   171,   187,  8249,  8250, 0,6 , 0,6 , 120,8 , 120,8 , 332,8 , 10,17 , 37,5 , 308,14 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {67,72,70},  163,3 , 3170,45 , 8,5 , 48,5 , 1172,15 , 1187,6 ,     2,     5,     1,     6,     7 }, // French/AnyScript/Switzerland</div><div class='add'>+    {     37,     0,   244,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 27,8 , 99,16 , 37,5 , 8,10 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 1652,20 , 25,5 , 4,0 , 1012,8 , 1193,16 ,     2,     1,     1,     6,     7 }, // French/AnyScript/Saint Barthelemy</div><div class='add'>+    {     37,     0,   245,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 120,8 , 120,8 , 27,8 , 99,16 , 37,5 , 8,10 , 4591,63 , 4654,85 , 134,24 , 4598,63 , 4661,85 , 320,24 , 2934,35 , 2969,52 , 3021,14 , 2934,35 , 2969,52 , 3021,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 1652,20 , 25,5 , 4,0 , 1012,8 , 1209,12 ,     2,     1,     1,     6,     7 }, // French/AnyScript/Saint Martin</div><div class='add'>+    {     40,     0,   197,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 82,17 , 37,5 , 8,10 , 4739,48 , 4787,87 , 4874,24 , 4746,48 , 4794,87 , 4881,24 , 3035,28 , 3063,49 , 3112,14 , 3035,28 , 3063,49 , 3112,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 1933,20 , 25,5 , 4,0 , 1221,6 , 1227,6 ,     2,     1,     1,     6,     7 }, // Galician/AnyScript/Spain</div><div class='add'>+    {     41,     0,    81,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 4898,48 , 4946,99 , 5045,24 , 4905,48 , 4953,99 , 5052,24 , 3126,28 , 3154,62 , 3216,14 , 3126,28 , 3154,62 , 3216,14 , 0,2 , 0,2 , {71,69,76},  0,0 , 3215,19 , 8,5 , 4,0 , 1233,7 , 1240,10 ,     2,     1,     7,     6,     7 }, // Georgian/AnyScript/Georgia</div><div class='add'>+    {     42,     0,    82,    44,    46,    59,    37,    48,    45,    43,   101,  8222,  8220,  8218,  8216, 0,6 , 0,6 , 128,9 , 128,9 , 332,8 , 502,18 , 37,5 , 8,10 , 5069,52 , 5121,83 , 134,24 , 5076,48 , 5124,83 , 320,24 , 3230,21 , 3251,60 , 3311,14 , 3325,28 , 3251,60 , 3311,14 , 91,5 , 93,6 , {69,85,82},  113,1 , 3234,19 , 25,5 , 4,0 , 1250,7 , 1257,11 ,     2,     1,     1,     6,     7 }, // German/AnyScript/Germany</div><div class='add'>+    {     42,     0,    14,    44,    46,    59,    37,    48,    45,    43,   101,  8222,  8220,  8218,  8216, 0,6 , 0,6 , 128,9 , 128,9 , 332,8 , 611,19 , 37,5 , 8,10 , 5069,52 , 5204,83 , 134,24 , 5207,48 , 5255,83 , 320,24 , 3230,21 , 3251,60 , 3311,14 , 3325,28 , 3251,60 , 3311,14 , 91,5 , 93,6 , {69,85,82},  113,1 , 3234,19 , 8,5 , 4,0 , 1268,24 , 1292,10 ,     2,     1,     1,     6,     7 }, // German/AnyScript/Austria</div><div class='add'>+    {     42,     0,    21,    44,    46,    59,    37,    48,    45,    43,   101,  8222,  8220,  8218,  8216, 0,6 , 0,6 , 128,9 , 128,9 , 551,7 , 99,16 , 37,5 , 239,24 , 5069,52 , 5121,83 , 134,24 , 5076,48 , 5124,83 , 320,24 , 3230,21 , 3251,60 , 3311,14 , 3353,28 , 3251,60 , 3311,14 , 91,5 , 93,6 , {69,85,82},  113,1 , 3234,19 , 25,5 , 4,0 , 1250,7 , 1302,7 ,     2,     1,     1,     6,     7 }, // German/AnyScript/Belgium</div><div class='add'>+    {     42,     0,   123,    46,    39,    59,    37,    48,    45,    43,   101,  8222,  8220,  8218,  8216, 0,6 , 0,6 , 128,9 , 128,9 , 332,8 , 502,18 , 37,5 , 8,10 , 5069,52 , 5121,83 , 134,24 , 5076,48 , 5124,83 , 320,24 , 3230,21 , 3251,60 , 3311,14 , 3325,28 , 3251,60 , 3311,14 , 91,5 , 93,6 , {67,72,70},  0,0 , 3253,41 , 8,5 , 4,0 , 1250,7 , 1309,13 ,     2,     5,     1,     6,     7 }, // German/AnyScript/Liechtenstein</div><div class='add'>+    {     42,     0,   125,    44,    46,    59,    37,    48,    45,    43,   101,  8222,  8220,  8218,  8216, 0,6 , 0,6 , 128,9 , 128,9 , 332,8 , 502,18 , 37,5 , 8,10 , 5069,52 , 5121,83 , 134,24 , 5076,48 , 5124,83 , 320,24 , 3230,21 , 3251,60 , 3311,14 , 3325,28 , 3251,60 , 3311,14 , 91,5 , 93,6 , {69,85,82},  113,1 , 3234,19 , 25,5 , 4,0 , 1250,7 , 1322,9 ,     2,     1,     1,     6,     7 }, // German/AnyScript/Luxembourg</div><div class='add'>+    {     42,     0,   206,    46,    39,    59,    37,    48,    45,    43,   101,   171,   187,  8249,  8250, 0,6 , 0,6 , 128,9 , 128,9 , 332,8 , 502,18 , 37,5 , 8,10 , 5069,52 , 5121,83 , 134,24 , 5076,48 , 5124,83 , 320,24 , 3230,21 , 3251,60 , 3311,14 , 3325,28 , 3251,60 , 3311,14 , 91,5 , 93,6 , {67,72,70},  0,0 , 3253,41 , 8,5 , 48,5 , 1331,21 , 1352,7 ,     2,     5,     1,     6,     7 }, // German/AnyScript/Switzerland</div><div class='add'>+    {     43,     0,    85,    44,    46,    44,    37,    48,    45,    43,   101,   171,   187,  8216,  8217, 0,6 , 0,6 , 137,9 , 137,9 , 279,6 , 10,17 , 18,7 , 25,12 , 5287,50 , 5337,115 , 5452,24 , 5338,50 , 5388,115 , 5503,24 , 3381,28 , 3409,55 , 3464,14 , 3381,28 , 3409,55 , 3464,14 , 96,4 , 99,4 , {69,85,82},  113,1 , 3294,19 , 25,5 , 4,0 , 1359,8 , 1367,6 ,     2,     1,     1,     6,     7 }, // Greek/AnyScript/Greece</div><div class='add'>+    {     43,     0,    56,    44,    46,    44,    37,    48,    45,    43,   101,   171,   187,  8216,  8217, 0,6 , 0,6 , 137,9 , 137,9 , 279,6 , 10,17 , 18,7 , 25,12 , 5287,50 , 5337,115 , 5452,24 , 5338,50 , 5388,115 , 5503,24 , 3381,28 , 3409,55 , 3464,14 , 3381,28 , 3409,55 , 3464,14 , 96,4 , 99,4 , {69,85,82},  113,1 , 3294,19 , 4,4 , 4,0 , 1359,8 , 1373,6 ,     2,     1,     1,     6,     7 }, // Greek/AnyScript/Cyprus</div><div class='add'>+    {     44,     0,    86,    44,    46,    59,    37,    48,  8722,    43,   101,   187,   171,  8250,  8249, 146,11 , 0,6 , 0,6 , 146,11 , 72,10 , 82,17 , 18,7 , 25,12 , 3550,48 , 5476,96 , 134,24 , 5527,48 , 5575,96 , 320,24 , 3478,28 , 3506,98 , 3604,14 , 3478,28 , 3506,98 , 3604,14 , 0,2 , 0,2 , {68,75,75},  142,2 , 3313,24 , 4,4 , 36,5 , 1379,11 , 1390,16 ,     2,     1,     7,     6,     7 }, // Greenlandic/AnyScript/Greenland</div><div class='add'>+    {     46,     0,   100,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,    34,    34, 0,6 , 0,6 , 157,9 , 157,9 , 630,7 , 203,18 , 322,8 , 330,13 , 5572,67 , 5639,87 , 5726,31 , 5671,67 , 5738,87 , 5825,31 , 3618,32 , 3650,53 , 3703,19 , 3618,32 , 3650,53 , 3703,19 , 100,14 , 103,14 , {73,78,82},  166,2 , 0,7 , 8,5 , 4,0 , 1406,7 , 1413,4 ,     2,     1,     7,     7,     7 }, // Gujarati/AnyScript/India</div><div class='add'>+    {     47,     0,    83,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 203,18 , 37,5 , 8,10 , 5757,48 , 5805,85 , 5890,24 , 5856,48 , 5904,85 , 5989,24 , 3722,21 , 3743,52 , 3795,14 , 3722,21 , 3743,52 , 3795,14 , 0,2 , 0,2 , {71,72,83},  168,3 , 0,7 , 8,5 , 4,0 , 1417,5 , 1422,4 ,     2,     1,     1,     6,     7 }, // Hausa/AnyScript/Ghana</div><div class='add'>+    {     47,     0,   156,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 203,18 , 37,5 , 8,10 , 5757,48 , 5805,85 , 5890,24 , 5856,48 , 5904,85 , 5989,24 , 3722,21 , 3743,52 , 3795,14 , 3722,21 , 3743,52 , 3795,14 , 0,2 , 0,2 , {88,79,70},  157,3 , 3337,36 , 8,5 , 4,0 , 1417,5 , 1426,5 ,     0,     0,     1,     6,     7 }, // Hausa/AnyScript/Niger</div><div class='add'>+    {     47,     0,   157,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 203,18 , 37,5 , 8,10 , 5757,48 , 5805,85 , 5890,24 , 5856,48 , 5904,85 , 5989,24 , 3722,21 , 3743,52 , 3795,14 , 3722,21 , 3743,52 , 3795,14 , 0,2 , 0,2 , {78,71,78},  171,1 , 3373,12 , 8,5 , 4,0 , 1417,5 , 1431,8 ,     2,     1,     1,     6,     7 }, // Hausa/AnyScript/Nigeria</div><div class='add'>+    {     47,     0,   201,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 203,18 , 37,5 , 8,10 , 5914,55 , 5969,99 , 5890,24 , 6013,55 , 6068,99 , 5989,24 , 3809,31 , 3840,57 , 3795,14 , 3809,31 , 3840,57 , 3795,14 , 0,2 , 0,2 , {83,68,71},  0,0 , 3385,20 , 8,5 , 4,0 , 1417,5 , 1439,5 ,     2,     1,     6,     5,     6 }, // Hausa/AnyScript/Sudan</div><div class='add'>+    {     47,     1,   157,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 203,18 , 37,5 , 8,10 , 5914,55 , 5969,99 , 5890,24 , 6013,55 , 6068,99 , 5989,24 , 3809,31 , 3840,57 , 3795,14 , 3809,31 , 3840,57 , 3795,14 , 0,2 , 0,2 , {78,71,78},  171,1 , 3405,13 , 8,5 , 4,0 , 1417,5 , 1431,8 ,     2,     1,     1,     6,     7 }, // Hausa/Arabic/Nigeria</div><div class='add'>+    {     47,     1,   201,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 203,18 , 37,5 , 8,10 , 5914,55 , 5969,99 , 5890,24 , 6013,55 , 6068,99 , 5989,24 , 3809,31 , 3840,57 , 3795,14 , 3809,31 , 3840,57 , 3795,14 , 0,2 , 0,2 , {83,68,71},  0,0 , 3385,20 , 8,5 , 4,0 , 1417,5 , 1439,5 ,     2,     1,     6,     5,     6 }, // Hausa/Arabic/Sudan</div><div class='add'>+    {     47,     7,    83,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 203,18 , 37,5 , 8,10 , 5757,48 , 5805,85 , 5890,24 , 5856,48 , 5904,85 , 5989,24 , 3722,21 , 3743,52 , 3795,14 , 3722,21 , 3743,52 , 3795,14 , 0,2 , 0,2 , {71,72,83},  168,3 , 0,7 , 8,5 , 4,0 , 1417,5 , 1422,4 ,     2,     1,     1,     6,     7 }, // Hausa/Latin/Ghana</div><div class='add'>+    {     47,     7,   156,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 203,18 , 37,5 , 8,10 , 5757,48 , 5805,85 , 5890,24 , 5856,48 , 5904,85 , 5989,24 , 3722,21 , 3743,52 , 3795,14 , 3722,21 , 3743,52 , 3795,14 , 0,2 , 0,2 , {88,79,70},  157,3 , 3337,36 , 8,5 , 4,0 , 1417,5 , 1426,5 ,     0,     0,     1,     6,     7 }, // Hausa/Latin/Niger</div><div class='add'>+    {     47,     7,   157,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 203,18 , 37,5 , 8,10 , 5757,48 , 5805,85 , 5890,24 , 5856,48 , 5904,85 , 5989,24 , 3722,21 , 3743,52 , 3795,14 , 3722,21 , 3743,52 , 3795,14 , 0,2 , 0,2 , {78,71,78},  171,1 , 3373,12 , 8,5 , 4,0 , 1417,5 , 1431,8 ,     2,     1,     1,     6,     7 }, // Hausa/Latin/Nigeria</div><div class='add'>+    {     48,     0,   105,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,    34,    34, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 637,18 , 37,5 , 8,10 , 6068,58 , 6126,72 , 1483,27 , 6167,48 , 6215,72 , 134,27 , 3897,46 , 3943,65 , 4008,14 , 3897,46 , 3943,65 , 4008,14 , 114,6 , 117,5 , {73,76,83},  172,1 , 3418,21 , 25,5 , 4,0 , 1444,5 , 1449,5 ,     2,     1,     7,     5,     6 }, // Hebrew/AnyScript/Israel</div><div class='add'>+    {     49,     0,   100,    46,    44,    59,    37,  2406,    45,    43,   101,    39,    39,    34,    34, 0,6 , 0,6 , 166,8 , 166,8 , 655,6 , 10,17 , 18,7 , 25,12 , 6198,75 , 6198,75 , 6273,30 , 6287,75 , 6287,75 , 6362,30 , 4022,38 , 4060,57 , 4117,19 , 4022,38 , 4060,57 , 4117,19 , 120,9 , 122,7 , {73,78,82},  173,3 , 3439,19 , 8,5 , 4,0 , 1454,6 , 1460,4 ,     2,     1,     7,     7,     7 }, // Hindi/AnyScript/India</div><div class='add'>+    {     50,     0,    98,    44,   160,    59,    37,    48,    45,    43,   101,  8222,  8221,  8222,  8221, 0,6 , 0,6 , 174,8 , 174,8 , 661,11 , 672,19 , 165,4 , 195,9 , 6303,64 , 6367,98 , 6465,25 , 6392,64 , 6456,98 , 6554,25 , 4136,19 , 4155,52 , 4207,17 , 4136,19 , 4155,52 , 4207,17 , 129,3 , 129,3 , {72,85,70},  176,2 , 3458,20 , 25,5 , 4,0 , 1464,6 , 1470,12 ,     0,     0,     1,     6,     7 }, // Hungarian/AnyScript/Hungary</div><div class='add'>+    {     51,     0,    99,    44,    46,    59,    37,    48,  8722,    43,   101,  8222,  8220,  8218,  8216, 0,6 , 0,6 , 85,8 , 85,8 , 586,8 , 502,18 , 37,5 , 8,10 , 6490,48 , 6538,82 , 6620,24 , 6579,48 , 6627,82 , 6709,24 , 4224,28 , 4252,81 , 4333,14 , 4224,28 , 4252,81 , 4347,14 , 132,4 , 132,4 , {73,83,75},  142,2 , 3478,48 , 25,5 , 4,0 , 1482,8 , 1490,6 ,     0,     0,     7,     6,     7 }, // Icelandic/AnyScript/Iceland</div><div class='add'>+    {     52,     0,   101,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 182,11 , 193,9 , 27,8 , 123,18 , 150,5 , 276,9 , 6644,48 , 6692,87 , 134,24 , 6733,48 , 6781,87 , 320,24 , 4361,28 , 4389,43 , 4432,14 , 4361,28 , 4389,43 , 4432,14 , 0,2 , 0,2 , {73,68,82},  178,2 , 3526,23 , 4,4 , 4,0 , 1496,16 , 1512,9 ,     0,     0,     1,     6,     7 }, // Indonesian/AnyScript/Indonesia</div><div class='add'>+    {     57,     0,   104,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 99,16 , 37,5 , 8,10 , 6779,62 , 6841,107 , 6948,24 , 6868,62 , 6930,107 , 7037,24 , 4446,37 , 4483,75 , 4558,14 , 4446,37 , 4483,75 , 4558,14 , 56,4 , 56,4 , {69,85,82},  113,1 , 3549,11 , 4,4 , 4,0 , 1521,7 , 1528,4 ,     2,     1,     7,     6,     7 }, // Irish/AnyScript/Ireland</div><div class='add'>+    {     58,     0,   106,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 202,8 , 210,7 , 27,8 , 99,16 , 37,5 , 8,10 , 6972,48 , 7020,94 , 7114,24 , 7061,48 , 7109,94 , 7203,24 , 4572,28 , 4600,57 , 4657,14 , 4572,28 , 4671,57 , 4657,14 , 136,2 , 136,2 , {69,85,82},  113,1 , 3549,11 , 8,5 , 4,0 , 1532,8 , 1540,6 ,     2,     1,     1,     6,     7 }, // Italian/AnyScript/Italy</div><div class='add'>+    {     58,     0,   206,    46,    39,    59,    37,    48,    45,    43,   101,   171,   187,  8249,  8250, 0,6 , 0,6 , 202,8 , 210,7 , 332,8 , 10,17 , 37,5 , 308,14 , 6972,48 , 7020,94 , 7114,24 , 7061,48 , 7109,94 , 7203,24 , 4572,28 , 4600,57 , 4657,14 , 4572,28 , 4671,57 , 4657,14 , 136,2 , 136,2 , {67,72,70},  0,0 , 3560,22 , 8,5 , 48,5 , 1532,8 , 1546,8 ,     2,     5,     1,     6,     7 }, // Italian/AnyScript/Switzerland</div><div class='add'>+    {     59,     0,   108,    46,    44,    59,    37,    48,    45,    43,   101, 12300, 12301, 12302, 12303, 68,5 , 68,5 , 68,5 , 68,5 , 221,8 , 429,13 , 165,4 , 343,10 , 3223,39 , 3223,39 , 1483,27 , 3247,39 , 3247,39 , 134,27 , 4728,14 , 4742,28 , 4728,14 , 4728,14 , 4742,28 , 4728,14 , 138,2 , 138,2 , {74,80,89},  127,1 , 3582,10 , 4,4 , 4,0 , 1554,3 , 1557,2 ,     0,     0,     7,     6,     7 }, // Japanese/AnyScript/Japan</div><div class='add'>+    {     61,     0,   100,    46,    44,    59,    37,  3302,    45,    43,   101,    39,    39,    34,    34, 0,6 , 0,6 , 217,11 , 217,11 , 655,6 , 99,16 , 322,8 , 330,13 , 7138,86 , 7138,86 , 7224,31 , 7227,86 , 7227,86 , 7313,31 , 4770,28 , 4798,53 , 4851,19 , 4770,28 , 4798,53 , 4851,19 , 140,2 , 140,2 , {73,78,82},  180,2 , 0,7 , 8,5 , 4,0 , 1559,5 , 1564,4 ,     2,     1,     7,     7,     7 }, // Kannada/AnyScript/India</div><div class='add'>+    {     63,     0,   110,    44,   160,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 332,8 , 691,22 , 37,5 , 8,10 , 7255,61 , 7316,83 , 1483,27 , 7344,61 , 7405,83 , 134,27 , 4870,28 , 4898,54 , 798,14 , 4870,28 , 4898,54 , 798,14 , 0,2 , 0,2 , {75,90,84},  182,4 , 0,7 , 25,5 , 4,0 , 1568,5 , 1573,9 ,     2,     1,     1,     6,     7 }, // Kazakh/AnyScript/Kazakhstan</div><div class='add'>+    {     63,     2,   110,    44,   160,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 332,8 , 691,22 , 37,5 , 8,10 , 7255,61 , 7316,83 , 1483,27 , 7344,61 , 7405,83 , 134,27 , 4870,28 , 4898,54 , 798,14 , 4870,28 , 4898,54 , 798,14 , 0,2 , 0,2 , {75,90,84},  182,4 , 0,7 , 25,5 , 4,0 , 1568,5 , 1573,9 ,     2,     1,     1,     6,     7 }, // Kazakh/Cyrillic/Kazakhstan</div><div class='add'>+    {     64,     0,   179,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,   171,   187, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 7399,60 , 7459,101 , 1483,27 , 7488,60 , 7548,101 , 134,27 , 4952,35 , 4987,84 , 798,14 , 4952,35 , 4987,84 , 798,14 , 0,2 , 0,2 , {82,87,70},  186,2 , 0,7 , 8,5 , 4,0 , 1582,11 , 1593,6 ,     0,     0,     1,     6,     7 }, // Kinyarwanda/AnyScript/Rwanda</div><div class='add'>+    {     65,     0,   116,    44,   160,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2 , {75,71,83},  188,3 , 0,7 , 8,5 , 4,0 , 1599,6 , 1605,10 ,     2,     1,     7,     6,     7 }, // Kirghiz/AnyScript/Kyrgyzstan</div><div class='add'>+    {     66,     0,   114,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 713,9 , 722,16 , 353,7 , 360,13 , 7560,39 , 7560,39 , 7560,39 , 7649,39 , 7649,39 , 7649,39 , 5071,14 , 5085,28 , 5071,14 , 5071,14 , 5085,28 , 5071,14 , 142,2 , 142,2 , {75,82,87},  191,1 , 3592,13 , 4,4 , 4,0 , 1615,3 , 1618,4 ,     0,     0,     7,     6,     7 }, // Korean/AnyScript/RepublicOfKorea</div><div class='add'>+    {     67,     0,   102,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 5113,42 , 5113,42 , 5155,14 , 5113,42 , 5113,42 , 5155,14 , 0,2 , 0,2 , {73,82,82},  0,0 , 0,7 , 8,5 , 4,0 , 1622,5 , 0,0 ,     0,     0,     6,     4,     5 }, // Kurdish/AnyScript/Iran</div><div class='add'>+    {     67,     0,   103,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 5113,42 , 5113,42 , 5155,14 , 5113,42 , 5113,42 , 5155,14 , 0,2 , 0,2 , {73,81,68},  0,0 , 0,7 , 8,5 , 4,0 , 1622,5 , 1627,5 ,     0,     0,     6,     5,     6 }, // Kurdish/AnyScript/Iraq</div><div class='add'>+    {     67,     0,   207,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 7599,41 , 7640,51 , 7691,27 , 7688,41 , 7729,51 , 7780,27 , 5169,20 , 5189,39 , 5228,14 , 5169,20 , 5189,39 , 5228,14 , 0,2 , 0,2 , {83,89,80},  192,3 , 0,7 , 8,5 , 4,0 , 1632,5 , 0,0 ,     0,     0,     7,     5,     6 }, // Kurdish/AnyScript/SyrianArabRepublic</div><div class='add'>+    {     67,     0,   217,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 7599,41 , 7640,51 , 7691,27 , 7688,41 , 7729,51 , 7780,27 , 5169,20 , 5189,39 , 5228,14 , 5169,20 , 5189,39 , 5228,14 , 0,2 , 0,2 , {84,82,89},  195,2 , 0,7 , 8,5 , 4,0 , 1632,5 , 1637,7 ,     2,     1,     1,     6,     7 }, // Kurdish/AnyScript/Turkey</div><div class='add'>+    {     67,     1,   102,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 5113,42 , 5113,42 , 5155,14 , 5113,42 , 5113,42 , 5155,14 , 0,2 , 0,2 , {73,82,82},  0,0 , 0,7 , 8,5 , 4,0 , 1622,5 , 0,0 ,     0,     0,     6,     4,     5 }, // Kurdish/Arabic/Iran</div><div class='add'>+    {     67,     1,   103,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 5113,42 , 5113,42 , 5155,14 , 5113,42 , 5113,42 , 5155,14 , 0,2 , 0,2 , {73,81,68},  0,0 , 0,7 , 8,5 , 4,0 , 1622,5 , 1627,5 ,     0,     0,     6,     5,     6 }, // Kurdish/Arabic/Iraq</div><div class='add'>+    {     67,     7,   207,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 7599,41 , 7640,51 , 7691,27 , 7688,41 , 7729,51 , 7780,27 , 5169,20 , 5189,39 , 5228,14 , 5169,20 , 5189,39 , 5228,14 , 0,2 , 0,2 , {83,89,80},  192,3 , 0,7 , 8,5 , 4,0 , 1632,5 , 0,0 ,     0,     0,     7,     5,     6 }, // Kurdish/Latin/SyrianArabRepublic</div><div class='add'>+    {     67,     7,   217,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 7599,41 , 7640,51 , 7691,27 , 7688,41 , 7729,51 , 7780,27 , 5169,20 , 5189,39 , 5228,14 , 5169,20 , 5189,39 , 5228,14 , 0,2 , 0,2 , {84,82,89},  195,2 , 0,7 , 8,5 , 4,0 , 1632,5 , 1637,7 ,     2,     1,     1,     6,     7 }, // Kurdish/Latin/Turkey</div><div class='add'>+    {     69,     0,   117,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,    34,    34, 0,6 , 0,6 , 0,6 , 0,6 , 364,8 , 738,18 , 165,4 , 373,21 , 7718,63 , 7781,75 , 1483,27 , 7807,63 , 7870,75 , 134,27 , 5242,24 , 5266,57 , 798,14 , 5242,24 , 5266,57 , 798,14 , 0,2 , 0,2 , {76,65,75},  197,1 , 3605,10 , 4,4 , 48,5 , 1644,3 , 1644,3 ,     0,     0,     7,     6,     7 }, // Laothian/AnyScript/Lao</div><div class='add'>+    {     71,     0,   118,    44,   160,    59,    37,    48,  8722,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 228,8 , 228,8 , 332,8 , 756,26 , 37,5 , 8,10 , 7856,65 , 7921,101 , 134,24 , 7945,65 , 8010,101 , 320,24 , 5323,21 , 5344,72 , 5416,14 , 5323,21 , 5344,72 , 5416,14 , 144,14 , 144,11 , {76,86,76},  198,2 , 3615,20 , 25,5 , 4,0 , 1647,8 , 1655,7 ,     2,     1,     1,     6,     7 }, // Latvian/AnyScript/Latvia</div><div class='add'>+    {     72,     0,    49,    46,    44,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 8022,39 , 8061,203 , 1483,27 , 8111,39 , 8150,203 , 134,27 , 5430,23 , 5453,98 , 798,14 , 5430,23 , 5453,98 , 798,14 , 0,2 , 0,2 , {67,68,70},  200,1 , 3635,22 , 8,5 , 4,0 , 1662,7 , 1669,13 ,     2,     1,     1,     6,     7 }, // Lingala/AnyScript/DemocraticRepublicOfCongo</div><div class='add'>+    {     72,     0,    50,    46,    44,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 8022,39 , 8061,203 , 1483,27 , 8111,39 , 8150,203 , 134,27 , 5430,23 , 5453,98 , 798,14 , 5430,23 , 5453,98 , 798,14 , 0,2 , 0,2 , {88,65,70},  201,4 , 0,7 , 8,5 , 4,0 , 1662,7 , 1682,17 ,     0,     0,     1,     6,     7 }, // Lingala/AnyScript/PeoplesRepublicOfCongo</div><div class='add'>+    {     73,     0,   124,    44,    46,    59,    37,    48,  8722,    43,   101,  8222,  8220,  8222,  8220, 0,6 , 0,6 , 236,8 , 236,8 , 72,10 , 782,26 , 37,5 , 8,10 , 8264,69 , 8333,96 , 8429,24 , 8353,48 , 8401,96 , 8497,24 , 5551,17 , 5568,89 , 5657,14 , 5671,21 , 5568,89 , 5657,14 , 158,9 , 155,6 , {76,84,76},  205,2 , 3657,54 , 25,5 , 4,0 , 1699,8 , 1707,7 ,     2,     1,     1,     6,     7 }, // Lithuanian/AnyScript/Lithuania</div><div class='add'>+    {     74,     0,   127,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 808,7 , 123,18 , 37,5 , 8,10 , 8453,63 , 8516,85 , 8601,24 , 8521,63 , 8584,85 , 8669,24 , 5692,34 , 5726,54 , 1458,14 , 5692,34 , 5726,54 , 1458,14 , 167,10 , 161,8 , {77,75,68},  0,0 , 3711,23 , 8,5 , 4,0 , 1714,10 , 1724,10 ,     2,     1,     1,     6,     7 }, // Macedonian/AnyScript/Macedonia</div><div class='add'>+    {     75,     0,   128,    46,    44,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 364,8 , 99,16 , 37,5 , 8,10 , 8625,48 , 8673,92 , 134,24 , 8693,48 , 8741,92 , 320,24 , 5780,34 , 5814,60 , 5874,14 , 5780,34 , 5814,60 , 5874,14 , 0,2 , 0,2 , {77,71,65},  0,0 , 3734,13 , 4,4 , 4,0 , 1734,8 , 1742,12 ,     0,     0,     1,     6,     7 }, // Malagasy/AnyScript/Madagascar</div><div class='add'>+    {     76,     0,   130,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 815,16 , 394,4 , 25,12 , 8765,49 , 8814,82 , 1483,27 , 8833,49 , 8882,82 , 134,27 , 5888,28 , 5916,43 , 798,14 , 5888,28 , 5916,43 , 798,14 , 0,2 , 0,2 , {77,89,82},  207,2 , 3747,23 , 4,4 , 13,6 , 1754,13 , 1767,8 ,     2,     1,     1,     6,     7 }, // Malay/AnyScript/Malaysia</div><div class='add'>+    {     76,     0,    32,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 564,12 , 165,4 , 398,14 , 8765,49 , 8814,82 , 1483,27 , 8833,49 , 8882,82 , 134,27 , 5888,28 , 5916,43 , 798,14 , 5888,28 , 5916,43 , 798,14 , 0,2 , 0,2 , {66,78,68},  128,1 , 0,7 , 8,5 , 4,0 , 1754,13 , 1775,6 ,     2,     1,     1,     6,     7 }, // Malay/AnyScript/BruneiDarussalam</div><div class='add'>+    {     77,     0,   100,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 244,12 , 244,12 , 27,8 , 831,18 , 18,7 , 25,12 , 8896,66 , 8962,101 , 9063,31 , 8964,66 , 9030,101 , 9131,31 , 5959,47 , 6006,70 , 6076,22 , 5959,47 , 6006,70 , 6076,22 , 177,6 , 169,10 , {73,78,82},  209,2 , 3770,46 , 0,4 , 4,0 , 1781,6 , 1787,6 ,     2,     1,     7,     7,     7 }, // Malayalam/AnyScript/India</div><div class='add'>+    {     78,     0,   133,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 849,23 , 37,5 , 8,10 , 9094,48 , 9142,86 , 9228,24 , 9162,48 , 9210,86 , 9296,24 , 6098,28 , 6126,63 , 6189,14 , 6098,28 , 6126,63 , 6189,14 , 183,2 , 179,2 , {69,85,82},  113,1 , 3816,11 , 4,4 , 4,0 , 1793,5 , 738,5 ,     2,     1,     7,     6,     7 }, // Maltese/AnyScript/Malta</div><div class='add'>+    {     79,     0,   154,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 9252,83 , 9252,83 , 1483,27 , 9320,83 , 9320,83 , 134,27 , 6203,48 , 6203,48 , 798,14 , 6203,48 , 6203,48 , 798,14 , 0,2 , 0,2 , {78,90,68},  211,3 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 ,     2,     1,     7,     6,     7 }, // Maori/AnyScript/NewZealand</div><div class='add'>+    {     80,     0,   100,    46,    44,    59,    37,  2406,    45,    43,   101,    39,    39,    34,    34, 0,6 , 0,6 , 256,11 , 267,9 , 655,6 , 99,16 , 412,7 , 419,12 , 9335,86 , 9335,86 , 9421,32 , 9403,86 , 9403,86 , 9489,32 , 6251,32 , 6283,53 , 4117,19 , 6251,32 , 6283,53 , 4117,19 , 140,2 , 140,2 , {73,78,82},  180,2 , 0,7 , 8,5 , 4,0 , 1798,5 , 1460,4 ,     2,     1,     7,     7,     7 }, // Marathi/AnyScript/India</div><div class='add'>+    {     82,     0,   143,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 9453,48 , 9501,66 , 1483,27 , 9521,48 , 9569,66 , 134,27 , 6336,21 , 6357,43 , 798,14 , 6336,21 , 6357,43 , 798,14 , 0,2 , 0,2 , {77,78,84},  214,1 , 0,7 , 8,5 , 4,0 , 1803,6 , 1809,10 ,     0,     0,     7,     6,     7 }, // Mongolian/AnyScript/Mongolia</div><div class='add'>+    {     82,     0,    44,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 9453,48 , 9501,66 , 1483,27 , 9521,48 , 9569,66 , 134,27 , 6336,21 , 6357,43 , 798,14 , 6336,21 , 6357,43 , 798,14 , 0,2 , 0,2 , {67,78,89},  215,3 , 0,7 , 8,5 , 4,0 , 1803,6 , 0,0 ,     2,     1,     7,     6,     7 }, // Mongolian/AnyScript/China</div><div class='add'>+    {     82,     2,   143,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 9453,48 , 9501,66 , 1483,27 , 9521,48 , 9569,66 , 134,27 , 6336,21 , 6357,43 , 798,14 , 6336,21 , 6357,43 , 798,14 , 0,2 , 0,2 , {77,78,84},  214,1 , 0,7 , 8,5 , 4,0 , 1803,6 , 1809,10 ,     0,     0,     7,     6,     7 }, // Mongolian/Cyrillic/Mongolia</div><div class='add'>+    {     82,     8,    44,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 9453,48 , 9501,66 , 1483,27 , 9521,48 , 9569,66 , 134,27 , 6336,21 , 6357,43 , 798,14 , 6336,21 , 6357,43 , 798,14 , 0,2 , 0,2 , {67,78,89},  215,3 , 0,7 , 8,5 , 4,0 , 1803,6 , 0,0 ,     2,     1,     7,     6,     7 }, // Mongolian/Mongolian/China</div><div class='add'>+    {     84,     0,   150,    46,    44,    59,    37,  2406,    45,    43,   101,    39,    39,    34,    34, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 9567,56 , 9623,85 , 9708,27 , 9635,56 , 9691,85 , 9776,27 , 6400,33 , 6433,54 , 6487,14 , 6400,33 , 6433,54 , 6487,14 , 185,14 , 181,14 , {78,80,82},  218,4 , 0,7 , 8,5 , 4,0 , 1819,6 , 1825,5 ,     2,     1,     1,     6,     7 }, // Nepali/AnyScript/Nepal</div><div class='add'>+    {     84,     0,   100,    46,    44,    59,    37,  2406,    45,    43,   101,    39,    39,    34,    34, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 9567,56 , 9735,80 , 9708,27 , 9635,56 , 9803,80 , 9776,27 , 6400,33 , 6501,54 , 6487,14 , 6400,33 , 6501,54 , 6487,14 , 120,9 , 122,7 , {73,78,82},  145,2 , 3827,49 , 8,5 , 4,0 , 1819,6 , 1460,4 ,     2,     1,     7,     7,     7 }, // Nepali/AnyScript/India</div><div class='add'>+    {     85,     0,   161,    44,   160,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 85,8 , 85,8 , 332,8 , 594,17 , 37,5 , 431,16 , 9815,59 , 9874,83 , 134,24 , 9883,59 , 9942,83 , 320,24 , 6555,28 , 2244,51 , 2295,14 , 6583,35 , 2244,51 , 2295,14 , 0,2 , 0,2 , {78,79,75},  142,2 , 3876,44 , 8,5 , 4,0 , 1830,12 , 1842,5 ,     2,     1,     1,     6,     7 }, // Norwegian/AnyScript/Norway</div><div class='add'>+    {     86,     0,    74,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 9957,83 , 9957,83 , 1483,27 , 10025,83 , 10025,83 , 134,27 , 6618,57 , 6618,57 , 798,14 , 6618,57 , 6618,57 , 798,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 1542,11 , 8,5 , 4,0 , 1847,7 , 1854,6 ,     2,     1,     1,     6,     7 }, // Occitan/AnyScript/France</div><div class='add'>+    {     87,     0,   100,    46,    44,    59,    37,  2918,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 655,6 , 10,17 , 18,7 , 25,12 , 10040,89 , 10040,89 , 10129,32 , 10108,89 , 10108,89 , 10197,32 , 6675,33 , 6708,54 , 6762,18 , 6675,33 , 6708,54 , 6762,18 , 140,2 , 140,2 , {73,78,82},  145,2 , 3920,11 , 8,5 , 4,0 , 1860,5 , 1865,4 ,     2,     1,     7,     7,     7 }, // Oriya/AnyScript/India</div><div class='add'>+    {     88,     0,     1,  1643,  1644,    59,  1642,  1776,  8722,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 179,8 , 872,20 , 165,4 , 447,11 , 10161,68 , 10161,68 , 1483,27 , 10229,68 , 10229,68 , 134,27 , 6780,49 , 6780,49 , 798,14 , 6780,49 , 6780,49 , 798,14 , 199,4 , 195,4 , {65,70,78},  222,1 , 3931,13 , 25,5 , 4,0 , 1869,4 , 1873,9 ,     0,     0,     6,     4,     5 }, // Pashto/AnyScript/Afghanistan</div><div class='add'>+    {     89,     0,   102,  1643,  1644,  1563,  1642,  1776,  8722,    43,   101,   171,   187,  8249,  8250, 0,6 , 0,6 , 0,6 , 0,6 , 558,6 , 35,18 , 165,4 , 447,11 , 10229,71 , 10300,70 , 10370,25 , 10297,71 , 10368,73 , 10441,25 , 6780,49 , 6780,49 , 6829,14 , 6780,49 , 6780,49 , 6829,14 , 203,10 , 199,10 , {73,82,82},  223,1 , 3944,17 , 25,5 , 53,8 , 1882,5 , 1887,5 ,     0,     0,     6,     4,     5 }, // Persian/AnyScript/Iran</div><div class='add'>+    {     89,     0,     1,  1643,  1644,  1563,  1642,  1776,  8722,    43,   101,   171,   187,  8249,  8250, 0,6 , 0,6 , 0,6 , 0,6 , 558,6 , 35,18 , 165,4 , 447,11 , 10395,63 , 10300,70 , 10458,24 , 10466,63 , 10529,68 , 10597,24 , 6780,49 , 6780,49 , 6829,14 , 6780,49 , 6780,49 , 6829,14 , 203,10 , 199,10 , {65,70,78},  222,1 , 3961,23 , 25,5 , 53,8 , 1892,3 , 1873,9 ,     0,     0,     6,     4,     5 }, // Persian/AnyScript/Afghanistan</div><div class='add'>+    {     90,     0,   172,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8222,  8221, 0,6 , 0,6 , 61,7 , 61,7 , 892,10 , 10,17 , 37,5 , 8,10 , 10482,48 , 10530,97 , 10627,24 , 10621,48 , 10669,99 , 10768,24 , 6843,34 , 6877,59 , 6936,14 , 6843,34 , 6877,59 , 6936,14 , 0,2 , 0,2 , {80,76,78},  224,2 , 3984,60 , 25,5 , 4,0 , 1895,6 , 1901,6 ,     2,     1,     1,     6,     7 }, // Polish/AnyScript/Poland</div><div class='add'>+    {     91,     0,   173,    44,   160,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 202,8 , 210,7 , 27,8 , 902,27 , 37,5 , 458,19 , 10651,48 , 10699,89 , 134,24 , 10792,48 , 10840,89 , 320,24 , 6950,28 , 6978,79 , 7057,14 , 6950,28 , 6978,79 , 7057,14 , 213,17 , 209,18 , {69,85,82},  113,1 , 1933,20 , 25,5 , 4,0 , 1907,17 , 1924,8 ,     2,     1,     1,     6,     7 }, // Portuguese/AnyScript/Portugal</div><div class='add'>+    {     91,     0,    30,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 210,7 , 210,7 , 27,8 , 902,27 , 37,5 , 458,19 , 10788,48 , 10836,89 , 134,24 , 10929,48 , 10977,89 , 320,24 , 6950,28 , 7071,79 , 7057,14 , 6950,28 , 7071,79 , 7057,14 , 0,2 , 0,2 , {66,82,76},  226,2 , 4044,54 , 4,4 , 13,6 , 1932,19 , 1951,6 ,     2,     1,     1,     6,     7 }, // Portuguese/AnyScript/Brazil</div><div class='add'>+    {     91,     0,    92,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 210,7 , 210,7 , 27,8 , 902,27 , 37,5 , 458,19 , 10788,48 , 10836,89 , 134,24 , 10929,48 , 10977,89 , 320,24 , 6950,28 , 7071,79 , 7057,14 , 6950,28 , 7071,79 , 7057,14 , 0,2 , 0,2 , {88,79,70},  157,3 , 4098,62 , 4,4 , 13,6 , 1957,9 , 1966,12 ,     0,     0,     1,     6,     7 }, // Portuguese/AnyScript/GuineaBissau</div><div class='add'>+    {     91,     0,   146,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 210,7 , 210,7 , 27,8 , 902,27 , 37,5 , 458,19 , 10788,48 , 10836,89 , 134,24 , 10929,48 , 10977,89 , 320,24 , 6950,28 , 7071,79 , 7057,14 , 6950,28 , 7071,79 , 7057,14 , 0,2 , 0,2 , {77,90,78},  228,3 , 4160,72 , 4,4 , 13,6 , 1957,9 , 1978,10 ,     2,     1,     1,     6,     7 }, // Portuguese/AnyScript/Mozambique</div><div class='add'>+    {     92,     0,   100,    46,    44,    59,    37,  2662,    45,    43,   101,    39,    39,    34,    34, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 123,18 , 18,7 , 25,12 , 10925,68 , 10925,68 , 10993,27 , 11066,68 , 11066,68 , 11134,27 , 7150,38 , 7188,55 , 7243,23 , 7150,38 , 7188,55 , 7243,23 , 230,5 , 227,4 , {73,78,82},  231,3 , 4232,12 , 8,5 , 4,0 , 1988,6 , 1994,4 ,     2,     1,     7,     7,     7 }, // Punjabi/AnyScript/India</div><div class='add'>+    {     92,     0,   163,    46,    44,    59,    37,  1632,    45,    43,   101,    39,    39,    34,    34, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 123,18 , 18,7 , 25,12 , 11020,67 , 11020,67 , 10993,27 , 11161,67 , 11161,67 , 11134,27 , 7150,38 , 7266,37 , 7243,23 , 7150,38 , 7266,37 , 7243,23 , 230,5 , 227,4 , {80,75,82},  234,1 , 4244,13 , 8,5 , 4,0 , 1998,5 , 2003,6 ,     0,     0,     7,     6,     7 }, // Punjabi/AnyScript/Pakistan</div><div class='add'>+    {     92,     1,   163,    46,    44,    59,    37,  1632,    45,    43,   101,    39,    39,    34,    34, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 123,18 , 18,7 , 25,12 , 11020,67 , 11020,67 , 10993,27 , 11161,67 , 11161,67 , 11134,27 , 7150,38 , 7266,37 , 7243,23 , 7150,38 , 7266,37 , 7243,23 , 230,5 , 227,4 , {80,75,82},  234,1 , 4244,13 , 8,5 , 4,0 , 1998,5 , 2003,6 ,     0,     0,     7,     6,     7 }, // Punjabi/Arabic/Pakistan</div><div class='add'>+    {     92,     4,   100,    46,    44,    59,    37,  2662,    45,    43,   101,    39,    39,    34,    34, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 123,18 , 18,7 , 25,12 , 10925,68 , 10925,68 , 10993,27 , 11066,68 , 11066,68 , 11134,27 , 7150,38 , 7188,55 , 7243,23 , 7150,38 , 7188,55 , 7243,23 , 230,5 , 227,4 , {73,78,82},  231,3 , 4232,12 , 8,5 , 4,0 , 1988,6 , 1994,4 ,     2,     1,     7,     7,     7 }, // Punjabi/Gurmukhi/India</div><div class='add'>+    {     94,     0,   206,    46,  8217,    59,    37,    48,  8722,    43,   101,   171,   187,  8249,  8250, 0,6 , 0,6 , 0,6 , 0,6 , 332,8 , 502,18 , 37,5 , 8,10 , 11087,67 , 11154,92 , 11246,24 , 11228,67 , 11295,92 , 11387,24 , 7303,23 , 7326,56 , 7382,14 , 7303,23 , 7326,56 , 7382,14 , 140,2 , 231,2 , {67,72,70},  0,0 , 4257,20 , 25,5 , 4,0 , 2009,9 , 2018,6 ,     2,     5,     1,     6,     7 }, // RhaetoRomance/AnyScript/Switzerland</div><div class='add'>+    {     95,     0,   141,    44,    46,    59,    37,    48,    45,    43,   101,  8222,  8221,   171,   187, 0,6 , 0,6 , 0,6 , 0,6 , 929,10 , 10,17 , 37,5 , 8,10 , 11270,60 , 11330,98 , 11428,24 , 11411,60 , 11471,98 , 11569,24 , 7396,21 , 7417,48 , 3021,14 , 7396,21 , 7417,48 , 3021,14 , 0,2 , 0,2 , {77,68,76},  0,0 , 4277,54 , 25,5 , 4,0 , 2024,6 , 2030,17 ,     2,     1,     1,     6,     7 }, // Romanian/AnyScript/Moldova</div><div class='add'>+    {     95,     0,   177,    44,    46,    59,    37,    48,    45,    43,   101,  8222,  8221,   171,   187, 0,6 , 0,6 , 0,6 , 0,6 , 929,10 , 10,17 , 37,5 , 8,10 , 11270,60 , 11330,98 , 11428,24 , 11411,60 , 11471,98 , 11569,24 , 7396,21 , 7417,48 , 3021,14 , 7396,21 , 7417,48 , 3021,14 , 0,2 , 0,2 , {82,79,78},  235,3 , 4331,16 , 25,5 , 4,0 , 2024,6 , 2047,7 ,     2,     1,     1,     6,     7 }, // Romanian/AnyScript/Romania</div><div class='add'>+    {     96,     0,   178,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8222,  8220, 0,6 , 0,6 , 54,7 , 54,7 , 332,8 , 939,22 , 165,4 , 195,9 , 11452,62 , 11514,80 , 11594,24 , 11593,63 , 11656,82 , 11738,24 , 7465,21 , 7486,62 , 7548,14 , 7465,21 , 7562,62 , 7548,14 , 0,2 , 0,2 , {82,85,66},  238,4 , 4347,89 , 25,5 , 4,0 , 2054,7 , 2061,6 ,     2,     1,     1,     6,     7 }, // Russian/AnyScript/RussianFederation</div><div class='add'>+    {     96,     0,   141,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8222,  8220, 0,6 , 0,6 , 54,7 , 54,7 , 332,8 , 939,22 , 165,4 , 195,9 , 11452,62 , 11514,80 , 11594,24 , 11593,63 , 11656,82 , 11738,24 , 7465,21 , 7486,62 , 7548,14 , 7465,21 , 7562,62 , 7548,14 , 0,2 , 0,2 , {77,68,76},  0,0 , 4436,21 , 25,5 , 4,0 , 2054,7 , 2067,7 ,     2,     1,     1,     6,     7 }, // Russian/AnyScript/Moldova</div><div class='add'>+    {     96,     0,   222,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8222,  8220, 0,6 , 0,6 , 54,7 , 54,7 , 332,8 , 939,22 , 37,5 , 8,10 , 11452,62 , 11514,80 , 11594,24 , 11593,63 , 11656,82 , 11738,24 , 7465,21 , 7486,62 , 7548,14 , 7465,21 , 7562,62 , 7548,14 , 0,2 , 0,2 , {85,65,72},  242,1 , 4457,24 , 25,5 , 4,0 , 2054,7 , 2074,7 ,     2,     1,     1,     6,     7 }, // Russian/AnyScript/Ukraine</div><div class='add'>+    {     98,     0,    41,    44,    46,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 364,8 , 99,16 , 37,5 , 8,10 , 11618,48 , 11666,91 , 11757,24 , 11762,48 , 11810,91 , 11901,24 , 7624,28 , 7652,66 , 7718,14 , 7624,28 , 7652,66 , 7718,14 , 235,2 , 233,2 , {88,65,70},  201,4 , 4481,25 , 4,4 , 48,5 , 2081,5 , 2086,22 ,     0,     0,     1,     6,     7 }, // Sangho/AnyScript/CentralAfricanRepublic</div><div class='add'>+    {     99,     0,   100,    46,    44,    59,    37,  2406,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 630,7 , 99,16 , 322,8 , 330,13 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2 , {73,78,82},  180,2 , 0,7 , 4,4 , 4,0 , 2108,12 , 2120,6 ,     2,     1,     7,     7,     7 }, // Sanskrit/AnyScript/India</div><div class='add'>+    {    100,     0,   241,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 54,7 , 54,7 , 961,7 , 968,20 , 150,5 , 155,10 , 11781,48 , 11829,81 , 8601,24 , 11925,48 , 11973,81 , 8669,24 , 7732,28 , 7760,52 , 7812,14 , 7732,28 , 7760,52 , 7812,14 , 237,9 , 235,7 , {0,0,0},  0,0 , 4506,0 , 25,5 , 4,0 , 2126,6 , 2132,18 ,     2,     1,     1,     6,     7 }, // Serbian/AnyScript/SerbiaAndMontenegro</div><div class='add'>+    {    100,     0,    27,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 54,7 , 54,7 , 115,8 , 968,20 , 37,5 , 477,40 , 11781,48 , 11910,83 , 8601,24 , 11925,48 , 12054,83 , 8669,24 , 7826,28 , 7854,54 , 7812,14 , 7826,28 , 7854,54 , 7812,14 , 237,9 , 235,7 , {66,65,77},  243,3 , 4506,195 , 25,5 , 4,0 , 2150,6 , 2156,19 ,     2,     1,     1,     6,     7 }, // Serbian/AnyScript/BosniaAndHerzegowina</div><div class='add'>+    {    100,     0,   238,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 54,7 , 54,7 , 961,7 , 968,20 , 150,5 , 155,10 , 11781,48 , 11829,81 , 8601,24 , 11925,48 , 11973,81 , 8669,24 , 7732,28 , 7760,52 , 7812,14 , 7732,28 , 7760,52 , 7812,14 , 237,9 , 235,7 , {0,0,0},  0,0 , 4506,0 , 25,5 , 4,0 , 2126,6 , 0,0 ,     2,     1,     1,     6,     7 }, // Serbian/AnyScript/Yugoslavia</div><div class='add'>+    {    100,     0,   242,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 61,7 , 61,7 , 961,7 , 968,20 , 150,5 , 155,10 , 11993,48 , 12041,81 , 12122,24 , 12137,48 , 12185,81 , 12266,24 , 7908,28 , 7936,54 , 2118,14 , 7908,28 , 7936,54 , 2118,14 , 246,9 , 242,7 , {69,85,82},  113,1 , 4701,27 , 8,5 , 4,0 , 2175,6 , 2181,9 ,     2,     1,     1,     6,     7 }, // Serbian/AnyScript/Montenegro</div><div class='add'>+    {    100,     0,   243,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 54,7 , 54,7 , 961,7 , 968,20 , 150,5 , 155,10 , 11781,48 , 11829,81 , 8601,24 , 11925,48 , 11973,81 , 8669,24 , 7732,28 , 7760,52 , 7812,14 , 7732,28 , 7760,52 , 7812,14 , 237,9 , 235,7 , {82,83,68},  246,4 , 4728,71 , 25,5 , 4,0 , 2126,6 , 2190,6 ,     0,     0,     1,     6,     7 }, // Serbian/AnyScript/Serbia</div><div class='add'>+    {    100,     2,    27,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 54,7 , 54,7 , 115,8 , 968,20 , 37,5 , 477,40 , 11781,48 , 11910,83 , 8601,24 , 11925,48 , 12054,83 , 8669,24 , 7826,28 , 7854,54 , 7812,14 , 7826,28 , 7854,54 , 7812,14 , 237,9 , 235,7 , {66,65,77},  243,3 , 4506,195 , 25,5 , 4,0 , 2150,6 , 2156,19 ,     2,     1,     1,     6,     7 }, // Serbian/Cyrillic/BosniaAndHerzegowina</div><div class='add'>+    {    100,     2,   238,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 54,7 , 54,7 , 961,7 , 968,20 , 150,5 , 155,10 , 11781,48 , 11829,81 , 8601,24 , 11925,48 , 11973,81 , 8669,24 , 7732,28 , 7760,52 , 7812,14 , 7732,28 , 7760,52 , 7812,14 , 237,9 , 235,7 , {0,0,0},  0,0 , 4506,0 , 25,5 , 4,0 , 2126,6 , 0,0 ,     2,     1,     1,     6,     7 }, // Serbian/Cyrillic/Yugoslavia</div><div class='add'>+    {    100,     2,   241,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 54,7 , 54,7 , 961,7 , 968,20 , 150,5 , 155,10 , 11781,48 , 11829,81 , 8601,24 , 11925,48 , 11973,81 , 8669,24 , 7732,28 , 7760,52 , 7812,14 , 7732,28 , 7760,52 , 7812,14 , 237,9 , 235,7 , {0,0,0},  0,0 , 4506,0 , 25,5 , 4,0 , 2126,6 , 2132,18 ,     2,     1,     1,     6,     7 }, // Serbian/Cyrillic/SerbiaAndMontenegro</div><div class='add'>+    {    100,     2,   242,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 54,7 , 54,7 , 961,7 , 968,20 , 150,5 , 155,10 , 11781,48 , 11829,81 , 8601,24 , 11925,48 , 11973,81 , 8669,24 , 7732,28 , 7760,52 , 7812,14 , 7732,28 , 7760,52 , 7812,14 , 237,9 , 235,7 , {69,85,82},  113,1 , 4799,27 , 25,5 , 4,0 , 2126,6 , 2196,9 ,     2,     1,     1,     6,     7 }, // Serbian/Cyrillic/Montenegro</div><div class='add'>+    {    100,     2,   243,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 54,7 , 54,7 , 961,7 , 968,20 , 150,5 , 155,10 , 11781,48 , 11829,81 , 8601,24 , 11925,48 , 11973,81 , 8669,24 , 7732,28 , 7760,52 , 7812,14 , 7732,28 , 7760,52 , 7812,14 , 237,9 , 235,7 , {82,83,68},  246,4 , 4728,71 , 25,5 , 4,0 , 2126,6 , 2190,6 ,     0,     0,     1,     6,     7 }, // Serbian/Cyrillic/Serbia</div><div class='add'>+    {    100,     7,    27,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 61,7 , 61,7 , 961,7 , 968,20 , 150,5 , 155,10 , 11993,48 , 12041,81 , 12122,24 , 12137,48 , 12185,81 , 12266,24 , 7908,28 , 7936,54 , 2118,14 , 7908,28 , 7936,54 , 2118,14 , 246,9 , 242,7 , {66,65,77},  250,2 , 4826,218 , 25,5 , 4,0 , 2175,6 , 2205,19 ,     2,     1,     1,     6,     7 }, // Serbian/Latin/BosniaAndHerzegowina</div><div class='add'>+    {    100,     7,   238,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 61,7 , 61,7 , 961,7 , 968,20 , 150,5 , 155,10 , 11993,48 , 12041,81 , 12122,24 , 12137,48 , 12185,81 , 12266,24 , 7908,28 , 7936,54 , 2118,14 , 7908,28 , 7936,54 , 2118,14 , 246,9 , 242,7 , {0,0,0},  0,0 , 4506,0 , 25,5 , 4,0 , 2175,6 , 0,0 ,     2,     1,     1,     6,     7 }, // Serbian/Latin/Yugoslavia</div><div class='add'>+    {    100,     7,   241,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 61,7 , 61,7 , 961,7 , 968,20 , 150,5 , 155,10 , 11993,48 , 12041,81 , 12122,24 , 12137,48 , 12185,81 , 12266,24 , 7908,28 , 7936,54 , 2118,14 , 7908,28 , 7936,54 , 2118,14 , 246,9 , 242,7 , {0,0,0},  0,0 , 4506,0 , 25,5 , 4,0 , 2175,6 , 2224,18 ,     2,     1,     1,     6,     7 }, // Serbian/Latin/SerbiaAndMontenegro</div><div class='add'>+    {    100,     7,   242,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 61,7 , 61,7 , 961,7 , 968,20 , 150,5 , 155,10 , 11993,48 , 12041,81 , 12122,24 , 12137,48 , 12185,81 , 12266,24 , 7908,28 , 7936,54 , 2118,14 , 7908,28 , 7936,54 , 2118,14 , 246,9 , 242,7 , {69,85,82},  113,1 , 4701,27 , 8,5 , 4,0 , 2175,6 , 2181,9 ,     2,     1,     1,     6,     7 }, // Serbian/Latin/Montenegro</div><div class='add'>+    {    100,     7,   243,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 61,7 , 61,7 , 961,7 , 968,20 , 150,5 , 155,10 , 11993,48 , 12041,81 , 12122,24 , 12137,48 , 12185,81 , 12266,24 , 7908,28 , 7936,54 , 2118,14 , 7908,28 , 7936,54 , 2118,14 , 246,9 , 242,7 , {82,83,68},  252,4 , 5044,71 , 25,5 , 4,0 , 2175,6 , 2242,6 ,     0,     0,     1,     6,     7 }, // Serbian/Latin/Serbia</div><div class='add'>+    {    101,     0,   241,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 61,7 , 61,7 , 961,7 , 968,20 , 150,5 , 155,10 , 11993,48 , 12041,81 , 12122,24 , 12137,48 , 12185,81 , 12266,24 , 7908,28 , 7936,54 , 2118,14 , 7908,28 , 7936,54 , 2118,14 , 246,9 , 242,7 , {0,0,0},  0,0 , 4506,0 , 25,5 , 4,0 , 2248,14 , 2224,18 ,     2,     1,     1,     6,     7 }, // SerboCroatian/AnyScript/SerbiaAndMontenegro</div><div class='add'>+    {    101,     0,    27,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 61,7 , 61,7 , 961,7 , 968,20 , 150,5 , 155,10 , 11993,48 , 12041,81 , 12122,24 , 12137,48 , 12185,81 , 12266,24 , 7908,28 , 7936,54 , 2118,14 , 7908,28 , 7936,54 , 2118,14 , 246,9 , 242,7 , {66,65,77},  250,2 , 4826,218 , 25,5 , 4,0 , 2248,14 , 2205,19 ,     2,     1,     1,     6,     7 }, // SerboCroatian/AnyScript/BosniaAndHerzegowina</div><div class='add'>+    {    101,     0,   238,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 61,7 , 61,7 , 961,7 , 968,20 , 150,5 , 155,10 , 11993,48 , 12041,81 , 12122,24 , 12137,48 , 12185,81 , 12266,24 , 7908,28 , 7936,54 , 2118,14 , 7908,28 , 7936,54 , 2118,14 , 246,9 , 242,7 , {0,0,0},  0,0 , 4506,0 , 25,5 , 4,0 , 2248,14 , 0,0 ,     2,     1,     1,     6,     7 }, // SerboCroatian/AnyScript/Yugoslavia</div><div class='add'>+    {    102,     0,   120,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 12146,48 , 12194,105 , 1483,27 , 12290,48 , 12338,105 , 134,27 , 7990,27 , 8017,61 , 798,14 , 7990,27 , 8017,61 , 798,14 , 0,2 , 0,2 , {90,65,82},  11,1 , 0,7 , 4,4 , 4,0 , 2262,7 , 0,0 ,     2,     1,     1,     6,     7 }, // Sesotho/AnyScript/Lesotho</div><div class='add'>+    {    102,     0,   195,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 12146,48 , 12194,105 , 1483,27 , 12290,48 , 12338,105 , 134,27 , 7990,27 , 8017,61 , 798,14 , 7990,27 , 8017,61 , 798,14 , 0,2 , 0,2 , {90,65,82},  11,1 , 0,7 , 4,4 , 4,0 , 2262,7 , 0,0 ,     2,     1,     1,     6,     7 }, // Sesotho/AnyScript/SouthAfrica</div><div class='add'>+    {    103,     0,   195,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 12299,48 , 12347,117 , 1483,27 , 12443,48 , 12491,117 , 134,27 , 8078,27 , 8105,64 , 798,14 , 8078,27 , 8105,64 , 798,14 , 0,2 , 0,2 , {90,65,82},  11,1 , 0,7 , 4,4 , 4,0 , 2269,8 , 0,0 ,     2,     1,     1,     6,     7 }, // Setswana/AnyScript/SouthAfrica</div><div class='add'>+    {    104,     0,   240,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8221,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 12464,47 , 12511,100 , 12611,24 , 12608,47 , 12655,100 , 12755,24 , 8169,32 , 8201,55 , 8256,14 , 8169,32 , 8201,55 , 8256,14 , 0,2 , 0,2 , {85,83,68},  256,3 , 5115,22 , 4,4 , 13,6 , 2277,8 , 944,8 ,     2,     1,     7,     6,     7 }, // Shona/AnyScript/Zimbabwe</div><div class='add'>+    {    106,     0,   198,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 576,10 , 988,17 , 18,7 , 25,12 , 12635,54 , 12689,92 , 12781,32 , 12779,54 , 12833,92 , 12925,32 , 8270,30 , 8300,62 , 8362,19 , 8270,30 , 8300,62 , 8362,19 , 255,5 , 249,4 , {76,75,82},  259,5 , 5137,19 , 4,4 , 13,6 , 2285,5 , 2290,11 ,     2,     1,     1,     6,     7 }, // Singhalese/AnyScript/SriLanka</div><div class='add'>+    {    107,     0,   195,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 12813,48 , 12861,114 , 1483,27 , 12957,48 , 13005,114 , 134,27 , 8381,27 , 8408,68 , 798,14 , 8381,27 , 8408,68 , 798,14 , 0,2 , 0,2 , {90,65,82},  11,1 , 0,7 , 4,4 , 4,0 , 2301,7 , 0,0 ,     2,     1,     1,     6,     7 }, // Siswati/AnyScript/SouthAfrica</div><div class='add'>+    {    107,     0,   204,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 12813,48 , 12861,114 , 1483,27 , 12957,48 , 13005,114 , 134,27 , 8381,27 , 8408,68 , 798,14 , 8381,27 , 8408,68 , 798,14 , 0,2 , 0,2 , {83,90,76},  264,1 , 0,7 , 4,4 , 4,0 , 2301,7 , 0,0 ,     2,     1,     1,     6,     7 }, // Siswati/AnyScript/Swaziland</div><div class='add'>+    {    108,     0,   191,    44,   160,    59,    37,    48,    45,    43,   101,  8218,  8216,  8222,  8220, 0,6 , 0,6 , 78,7 , 78,7 , 586,8 , 502,18 , 165,4 , 195,9 , 12975,48 , 13023,82 , 12122,24 , 13119,48 , 13167,89 , 12266,24 , 8476,21 , 8497,52 , 8549,14 , 8476,21 , 8497,52 , 8549,14 , 260,10 , 253,9 , {69,85,82},  113,1 , 3549,11 , 25,5 , 4,0 , 2308,10 , 2318,19 ,     2,     1,     1,     6,     7 }, // Slovak/AnyScript/Slovakia</div><div class='add'>+    {    109,     0,   192,    44,    46,    59,    37,    48,    45,    43,   101,   187,   171,  8222,  8220, 0,6 , 0,6 , 276,8 , 276,8 , 1005,9 , 611,19 , 37,5 , 8,10 , 11993,48 , 13105,86 , 12122,24 , 12137,48 , 13256,86 , 12266,24 , 8563,28 , 8591,52 , 8643,14 , 8563,28 , 8591,52 , 8643,14 , 62,4 , 262,4 , {69,85,82},  113,1 , 5156,28 , 25,5 , 4,0 , 2337,11 , 2348,9 ,     2,     1,     1,     6,     7 }, // Slovenian/AnyScript/Slovenia</div><div class='add'>+    {    110,     0,   194,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 53,19 , 18,7 , 25,12 , 13191,48 , 13239,189 , 13428,24 , 13342,48 , 13390,189 , 13579,24 , 8657,28 , 8685,47 , 8732,14 , 8657,28 , 8685,47 , 8732,14 , 270,3 , 266,3 , {83,79,83},  265,3 , 5184,22 , 4,4 , 4,0 , 2357,8 , 2365,10 ,     0,     0,     6,     6,     7 }, // Somali/AnyScript/Somalia</div><div class='add'>+    {    110,     0,    59,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 53,19 , 18,7 , 25,12 , 13191,48 , 13239,189 , 13428,24 , 13342,48 , 13390,189 , 13579,24 , 8657,28 , 8685,47 , 8732,14 , 8657,28 , 8685,47 , 8732,14 , 270,3 , 266,3 , {68,74,70},  5,3 , 5206,21 , 4,4 , 4,0 , 2357,8 , 2375,7 ,     0,     0,     6,     6,     7 }, // Somali/AnyScript/Djibouti</div><div class='add'>+    {    110,     0,    69,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 53,19 , 18,7 , 25,12 , 13191,48 , 13239,189 , 13428,24 , 13342,48 , 13390,189 , 13579,24 , 8657,28 , 8685,47 , 8732,14 , 8657,28 , 8685,47 , 8732,14 , 270,3 , 266,3 , {69,84,66},  0,2 , 5227,22 , 4,4 , 4,0 , 2357,8 , 2382,8 ,     2,     1,     6,     6,     7 }, // Somali/AnyScript/Ethiopia</div><div class='add'>+    {    110,     0,   111,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 53,19 , 18,7 , 25,12 , 13191,48 , 13239,189 , 13428,24 , 13342,48 , 13390,189 , 13579,24 , 8657,28 , 8685,47 , 8732,14 , 8657,28 , 8685,47 , 8732,14 , 270,3 , 266,3 , {75,69,83},  2,3 , 0,7 , 4,4 , 4,0 , 2357,8 , 2390,7 ,     2,     1,     6,     6,     7 }, // Somali/AnyScript/Kenya</div><div class='add'>+    {    111,     0,   197,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 27,8 , 1014,26 , 37,5 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {69,85,82},  113,1 , 1652,20 , 8,5 , 4,0 , 2397,17 , 1227,6 ,     2,     1,     1,     6,     7 }, // Spanish/AnyScript/Spain</div><div class='add'>+    {    111,     0,    10,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 27,8 , 1014,26 , 37,5 , 517,14 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {65,82,83},  128,1 , 5249,51 , 8,5 , 4,0 , 2414,7 , 2421,9 ,     2,     1,     7,     6,     7 }, // Spanish/AnyScript/Argentina</div><div class='add'>+    {    111,     0,    26,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 27,8 , 1014,26 , 37,5 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {66,79,66},  268,2 , 5300,35 , 8,5 , 4,0 , 2414,7 , 2430,7 ,     2,     1,     1,     6,     7 }, // Spanish/AnyScript/Bolivia</div><div class='add'>+    {    111,     0,    43,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 543,8 , 1014,26 , 165,4 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {67,76,80},  128,1 , 5335,45 , 4,4 , 48,5 , 2414,7 , 2437,5 ,     0,     0,     1,     6,     7 }, // Spanish/AnyScript/Chile</div><div class='add'>+    {    111,     0,    47,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 551,7 , 1014,26 , 165,4 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {67,79,80},  128,1 , 5380,54 , 8,5 , 4,0 , 2414,7 , 2442,8 ,     0,     0,     1,     6,     7 }, // Spanish/AnyScript/Colombia</div><div class='add'>+    {    111,     0,    52,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 27,8 , 1014,26 , 37,5 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {67,82,67},  270,1 , 5434,67 , 8,5 , 4,0 , 2414,7 , 2450,10 ,     0,     0,     1,     6,     7 }, // Spanish/AnyScript/CostaRica</div><div class='add'>+    {    111,     0,    61,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 27,8 , 1014,26 , 37,5 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {68,79,80},  271,3 , 5501,54 , 8,5 , 4,0 , 2414,7 , 2460,20 ,     2,     1,     1,     6,     7 }, // Spanish/AnyScript/DominicanRepublic</div><div class='add'>+    {    111,     0,    63,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 27,8 , 1014,26 , 165,4 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {85,83,68},  128,1 , 5555,70 , 4,4 , 48,5 , 2414,7 , 2480,7 ,     2,     1,     1,     6,     7 }, // Spanish/AnyScript/Ecuador</div><div class='add'>+    {    111,     0,    65,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 27,8 , 1014,26 , 37,5 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {85,83,68},  256,3 , 5555,70 , 8,5 , 4,0 , 2414,7 , 2487,11 ,     2,     1,     1,     6,     7 }, // Spanish/AnyScript/ElSalvador</div><div class='add'>+    {    111,     0,    66,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 27,8 , 1014,26 , 37,5 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {88,65,70},  201,4 , 5625,22 , 8,5 , 4,0 , 2414,7 , 2498,17 ,     0,     0,     1,     6,     7 }, // Spanish/AnyScript/EquatorialGuinea</div><div class='add'>+    {    111,     0,    90,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 551,7 , 1014,26 , 37,5 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {71,84,81},  274,1 , 5647,70 , 8,5 , 4,0 , 2414,7 , 2515,9 ,     2,     1,     1,     6,     7 }, // Spanish/AnyScript/Guatemala</div><div class='add'>+    {    111,     0,    96,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 27,8 , 1040,27 , 37,5 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {72,78,76},  275,1 , 5717,60 , 8,5 , 4,0 , 2414,7 , 2524,8 ,     2,     1,     1,     6,     7 }, // Spanish/AnyScript/Honduras</div><div class='add'>+    {    111,     0,   139,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 27,8 , 1014,26 , 37,5 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {77,88,78},  128,1 , 5777,48 , 8,5 , 4,0 , 2414,7 , 2532,6 ,     2,     1,     1,     6,     7 }, // Spanish/AnyScript/Mexico</div><div class='add'>+    {    111,     0,   155,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 27,8 , 1014,26 , 37,5 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {78,73,79},  276,2 , 5825,81 , 8,5 , 4,0 , 2414,7 , 2538,9 ,     2,     1,     1,     6,     7 }, // Spanish/AnyScript/Nicaragua</div><div class='add'>+    {    111,     0,   166,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 187,8 , 1014,26 , 37,5 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {80,65,66},  278,3 , 5906,54 , 8,5 , 4,0 , 2414,7 , 2547,6 ,     2,     1,     1,     6,     7 }, // Spanish/AnyScript/Panama</div><div class='add'>+    {    111,     0,   168,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 27,8 , 1014,26 , 37,5 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {80,89,71},  281,1 , 5960,61 , 8,5 , 61,6 , 2414,7 , 2553,8 ,     0,     0,     1,     6,     7 }, // Spanish/AnyScript/Paraguay</div><div class='add'>+    {    111,     0,   169,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 551,7 , 1014,26 , 37,5 , 531,15 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {80,69,78},  282,3 , 6021,62 , 8,5 , 4,0 , 2414,7 , 2561,4 ,     2,     1,     1,     6,     7 }, // Spanish/AnyScript/Peru</div><div class='add'>+    {    111,     0,   174,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 187,8 , 1014,26 , 37,5 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {85,83,68},  128,1 , 5555,70 , 8,5 , 4,0 , 2414,7 , 2565,11 ,     2,     1,     1,     6,     7 }, // Spanish/AnyScript/PuertoRico</div><div class='add'>+    {    111,     0,   225,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 558,6 , 1014,26 , 18,7 , 25,12 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {85,83,68},  128,1 , 5555,70 , 8,5 , 4,0 , 2414,7 , 2576,14 ,     2,     1,     7,     6,     7 }, // Spanish/AnyScript/UnitedStates</div><div class='add'>+    {    111,     0,   227,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 27,8 , 1014,26 , 37,5 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {85,89,85},  128,1 , 6083,48 , 8,5 , 67,7 , 2414,7 , 2590,7 ,     2,     1,     1,     6,     7 }, // Spanish/AnyScript/Uruguay</div><div class='add'>+    {    111,     0,   231,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 27,8 , 1014,26 , 37,5 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {86,69,70},  285,5 , 6131,86 , 4,4 , 48,5 , 2414,7 , 2597,9 ,     2,     1,     1,     6,     7 }, // Spanish/AnyScript/Venezuela</div><div class='add'>+    {    111,     0,   246,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 284,7 , 284,7 , 27,8 , 1014,26 , 37,5 , 8,10 , 13452,48 , 13500,89 , 13589,24 , 13603,48 , 13651,89 , 13740,24 , 8746,28 , 8774,53 , 3021,14 , 8746,28 , 8774,53 , 3021,14 , 56,4 , 56,4 , {0,0,0},  0,0 , 4506,0 , 8,5 , 4,0 , 2606,23 , 2629,25 ,     2,     1,     1,     6,     7 }, // Spanish/AnyScript/LatinAmericaAndTheCaribbean</div><div class='add'>+    {    113,     0,   111,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,    39,    39, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 13613,48 , 13661,84 , 134,24 , 13764,48 , 13812,84 , 320,24 , 8827,22 , 8849,60 , 8909,14 , 8827,22 , 8849,60 , 8909,14 , 273,7 , 269,7 , {75,69,83},  2,3 , 6217,24 , 4,4 , 4,0 , 2654,9 , 2663,5 ,     2,     1,     6,     6,     7 }, // Swahili/AnyScript/Kenya</div><div class='add'>+    {    113,     0,   210,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,    39,    39, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 13613,48 , 13661,84 , 134,24 , 13764,48 , 13812,84 , 320,24 , 8827,22 , 8849,60 , 8909,14 , 8827,22 , 8849,60 , 8909,14 , 273,7 , 269,7 , {84,90,83},  290,3 , 6241,27 , 25,5 , 4,0 , 2654,9 , 2668,8 ,     0,     0,     1,     6,     7 }, // Swahili/AnyScript/Tanzania</div><div class='add'>+    {    114,     0,   205,    44,   160,    59,    37,    48,  8722,    43,   101,  8221,  8221,  8217,  8217, 0,6 , 0,6 , 291,9 , 291,9 , 72,10 , 1067,30 , 37,5 , 431,16 , 3550,48 , 13745,86 , 134,24 , 5527,48 , 13896,86 , 320,24 , 8923,29 , 8952,50 , 2295,14 , 8923,29 , 8952,50 , 2295,14 , 280,2 , 276,2 , {83,69,75},  142,2 , 6268,45 , 25,5 , 4,0 , 2676,7 , 2683,7 ,     2,     1,     1,     6,     7 }, // Swedish/AnyScript/Sweden</div><div class='add'>+    {    114,     0,    73,    44,   160,    59,    37,    48,  8722,    43,   101,  8221,  8221,  8217,  8217, 0,6 , 0,6 , 291,9 , 291,9 , 72,10 , 1067,30 , 37,5 , 431,16 , 3550,48 , 13745,86 , 134,24 , 5527,48 , 13896,86 , 320,24 , 8923,29 , 8952,50 , 2295,14 , 8923,29 , 8952,50 , 2295,14 , 280,2 , 276,2 , {69,85,82},  113,1 , 6313,19 , 25,5 , 4,0 , 2676,7 , 2690,7 ,     2,     1,     1,     6,     7 }, // Swedish/AnyScript/Finland</div><div class='add'>+    {    116,     0,   209,    46,    44,    59,    37,    48,    45,    43,   101,   171,   187,   171,  8222, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 13831,48 , 13879,71 , 1483,27 , 13982,48 , 14030,71 , 134,27 , 9002,28 , 9030,55 , 798,14 , 9002,28 , 9030,55 , 798,14 , 0,2 , 0,2 , {84,74,83},  188,3 , 6332,13 , 8,5 , 4,0 , 0,0 , 0,0 ,     2,     1,     1,     6,     7 }, // Tajik/AnyScript/Tajikistan</div><div class='add'>+    {    116,     2,   209,    46,    44,    59,    37,    48,    45,    43,   101,   171,   187,   171,  8222, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 13831,48 , 13879,71 , 1483,27 , 13982,48 , 14030,71 , 134,27 , 9002,28 , 9030,55 , 798,14 , 9002,28 , 9030,55 , 798,14 , 0,2 , 0,2 , {84,74,83},  188,3 , 6332,13 , 8,5 , 4,0 , 0,0 , 0,0 ,     2,     1,     1,     6,     7 }, // Tajik/Cyrillic/Tajikistan</div><div class='add'>+    {    117,     0,   100,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 300,13 , 300,13 , 655,6 , 203,18 , 18,7 , 25,12 , 13950,58 , 14008,88 , 14096,31 , 14101,58 , 14159,88 , 14247,31 , 9085,20 , 9105,49 , 9085,20 , 9085,20 , 9105,49 , 9085,20 , 140,2 , 140,2 , {73,78,82},  293,2 , 6345,13 , 8,5 , 4,0 , 2697,5 , 2702,7 ,     2,     1,     7,     7,     7 }, // Tamil/AnyScript/India</div><div class='add'>+    {    117,     0,   198,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 300,13 , 300,13 , 655,6 , 203,18 , 18,7 , 25,12 , 13950,58 , 14008,88 , 14096,31 , 14101,58 , 14159,88 , 14247,31 , 9085,20 , 9105,49 , 9085,20 , 9085,20 , 9105,49 , 9085,20 , 140,2 , 140,2 , {76,75,82},  295,4 , 0,7 , 8,5 , 4,0 , 2697,5 , 2709,6 ,     2,     1,     1,     6,     7 }, // Tamil/AnyScript/SriLanka</div><div class='add'>+    {    118,     0,   178,    44,   160,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 929,10 , 1097,11 , 165,4 , 25,12 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2 , {82,85,66},  0,0 , 0,7 , 0,4 , 4,0 , 2715,5 , 2061,6 ,     2,     1,     1,     6,     7 }, // Tatar/AnyScript/RussianFederation</div><div class='add'>+    {    119,     0,   100,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,    34,    34, 0,6 , 0,6 , 313,12 , 325,11 , 543,8 , 99,16 , 18,7 , 25,12 , 14127,86 , 14127,86 , 14213,30 , 14278,86 , 14278,86 , 14364,30 , 9154,32 , 9186,60 , 9246,18 , 9154,32 , 9186,60 , 9246,18 , 282,1 , 278,2 , {73,78,82},  299,3 , 6358,13 , 8,5 , 4,0 , 2720,6 , 2726,9 ,     2,     1,     7,     7,     7 }, // Telugu/AnyScript/India</div><div class='add'>+    {    120,     0,   211,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 336,5 , 336,5 , 341,8 , 349,7 , 364,8 , 1108,19 , 165,4 , 546,27 , 14243,63 , 14306,98 , 14243,63 , 14394,63 , 14457,98 , 14555,24 , 9264,23 , 9287,68 , 9355,14 , 9264,23 , 9287,68 , 9355,14 , 283,10 , 280,10 , {84,72,66},  302,1 , 6371,13 , 4,4 , 48,5 , 2735,3 , 2735,3 ,     2,     1,     7,     6,     7 }, // Thai/AnyScript/Thailand</div><div class='add'>+    {    121,     0,    44,    46,    44,    59,    37,  3872,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 14404,63 , 14467,158 , 1483,27 , 14579,63 , 14642,158 , 134,27 , 9369,49 , 9418,77 , 9495,21 , 9369,49 , 9418,77 , 9495,21 , 293,7 , 290,8 , {67,78,89},  215,3 , 6384,13 , 8,5 , 4,0 , 2738,8 , 2746,6 ,     2,     1,     7,     6,     7 }, // Tibetan/AnyScript/China</div><div class='add'>+    {    121,     0,   100,    46,    44,    59,    37,  3872,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 14404,63 , 14467,158 , 1483,27 , 14579,63 , 14642,158 , 134,27 , 9369,49 , 9418,77 , 9495,21 , 9369,49 , 9418,77 , 9495,21 , 293,7 , 290,8 , {73,78,82},  145,2 , 6397,22 , 8,5 , 4,0 , 2738,8 , 2752,7 ,     2,     1,     7,     7,     7 }, // Tibetan/AnyScript/India</div><div class='add'>+    {    122,     0,    67,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 1127,23 , 18,7 , 25,12 , 14625,46 , 14671,54 , 1034,24 , 14800,46 , 14846,54 , 1061,24 , 9516,29 , 9516,29 , 9545,14 , 9516,29 , 9516,29 , 9545,14 , 300,7 , 298,7 , {69,82,78},  8,3 , 0,7 , 4,4 , 4,0 , 2759,4 , 0,0 ,     2,     1,     6,     6,     7 }, // Tigrinya/AnyScript/Eritrea</div><div class='add'>+    {    122,     0,    69,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 1150,23 , 18,7 , 25,12 , 926,46 , 972,62 , 1034,24 , 953,46 , 999,62 , 1061,24 , 9559,29 , 9559,29 , 9545,14 , 9559,29 , 9559,29 , 9545,14 , 300,7 , 298,7 , {69,84,66},  0,2 , 81,16 , 4,4 , 4,0 , 2759,4 , 0,0 ,     2,     1,     6,     6,     7 }, // Tigrinya/AnyScript/Ethiopia</div><div class='add'>+    {    123,     0,   214,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,   171,   187, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 99,16 , 37,5 , 8,10 , 14725,51 , 14776,87 , 14863,24 , 14900,51 , 14951,87 , 15038,24 , 9588,29 , 9617,60 , 9677,14 , 9588,29 , 9617,60 , 9677,14 , 0,2 , 0,2 , {84,79,80},  303,2 , 0,7 , 8,5 , 4,0 , 2763,13 , 2776,5 ,     2,     1,     1,     6,     7 }, // Tonga/AnyScript/Tonga</div><div class='add'>+    {    124,     0,   195,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 14887,48 , 14935,122 , 1483,27 , 15062,48 , 15110,122 , 134,27 , 9691,27 , 9718,72 , 798,14 , 9691,27 , 9718,72 , 798,14 , 0,2 , 0,2 , {90,65,82},  11,1 , 0,7 , 4,4 , 4,0 , 2781,8 , 0,0 ,     2,     1,     1,     6,     7 }, // Tsonga/AnyScript/SouthAfrica</div><div class='add'>+    {    125,     0,   217,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 356,8 , 356,8 , 929,10 , 1173,17 , 37,5 , 8,10 , 15057,48 , 15105,75 , 15180,24 , 15232,48 , 15280,75 , 15355,24 , 9790,28 , 9818,54 , 9872,14 , 9790,28 , 9818,54 , 9872,14 , 0,2 , 0,2 , {84,82,89},  195,2 , 6419,18 , 25,5 , 4,0 , 2789,6 , 2795,7 ,     2,     1,     1,     6,     7 }, // Turkish/AnyScript/Turkey</div><div class='add'>+    {    128,     0,    44,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2 , {67,78,89},  215,3 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 ,     2,     1,     7,     6,     7 }, // Uigur/AnyScript/China</div><div class='add'>+    {    128,     1,    44,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2 , {67,78,89},  215,3 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 ,     2,     1,     7,     6,     7 }, // Uigur/Arabic/China</div><div class='add'>+    {    129,     0,   222,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8222,  8220, 0,6 , 0,6 , 364,8 , 364,8 , 332,8 , 1190,22 , 37,5 , 8,10 , 15204,48 , 15252,95 , 15347,24 , 15379,67 , 15446,87 , 15533,24 , 9886,21 , 9907,56 , 9963,14 , 9886,21 , 9907,56 , 9963,14 , 307,2 , 305,2 , {85,65,72},  242,1 , 6437,49 , 25,5 , 4,0 , 2802,10 , 2812,7 ,     2,     1,     1,     6,     7 }, // Ukrainian/AnyScript/Ukraine</div><div class='add'>+    {    130,     0,   100,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 1212,18 , 18,7 , 25,12 , 15371,67 , 15371,67 , 10458,24 , 15557,67 , 15557,67 , 10597,24 , 9977,36 , 9977,36 , 10013,14 , 9977,36 , 9977,36 , 10013,14 , 0,2 , 0,2 , {73,78,82},  145,2 , 6486,18 , 8,5 , 4,0 , 2819,4 , 2823,5 ,     2,     1,     7,     7,     7 }, // Urdu/AnyScript/India</div><div class='add'>+    {    130,     0,   163,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 1212,18 , 18,7 , 25,12 , 15371,67 , 15371,67 , 10458,24 , 15557,67 , 15557,67 , 10597,24 , 9977,36 , 9977,36 , 10013,14 , 9977,36 , 9977,36 , 10013,14 , 0,2 , 0,2 , {80,75,82},  305,4 , 6504,21 , 4,4 , 4,0 , 2819,4 , 2828,7 ,     0,     0,     7,     6,     7 }, // Urdu/AnyScript/Pakistan</div><div class='add'>+    {    131,     0,   228,    44,   160,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 13831,48 , 15438,115 , 11594,24 , 13982,48 , 15624,115 , 11738,24 , 10027,28 , 10055,53 , 10108,14 , 10027,28 , 10055,53 , 10108,14 , 0,2 , 0,2 , {85,90,83},  309,3 , 6525,21 , 8,5 , 4,0 , 2835,5 , 2840,10 ,     0,     0,     7,     6,     7 }, // Uzbek/AnyScript/Uzbekistan</div><div class='add'>+    {    131,     0,     1,  1643,  1644,    59,  1642,  1776,  8722,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 179,8 , 1230,33 , 165,4 , 447,11 , 15553,48 , 15601,68 , 11594,24 , 15739,48 , 10529,68 , 11738,24 , 10122,21 , 6780,49 , 10108,14 , 10122,21 , 6780,49 , 10108,14 , 0,2 , 0,2 , {65,70,78},  312,2 , 6546,13 , 25,5 , 4,0 , 2850,6 , 1873,9 ,     0,     0,     6,     4,     5 }, // Uzbek/AnyScript/Afghanistan</div><div class='add'>+    {    131,     1,     1,  1643,  1644,    59,  1642,  1776,  8722,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 179,8 , 1230,33 , 165,4 , 447,11 , 15553,48 , 15601,68 , 11594,24 , 15739,48 , 10529,68 , 11738,24 , 10122,21 , 6780,49 , 10108,14 , 10122,21 , 6780,49 , 10108,14 , 0,2 , 0,2 , {65,70,78},  312,2 , 6546,13 , 25,5 , 4,0 , 2850,6 , 1873,9 ,     0,     0,     6,     4,     5 }, // Uzbek/Arabic/Afghanistan</div><div class='add'>+    {    131,     2,   228,    44,   160,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 13831,48 , 15438,115 , 11594,24 , 13982,48 , 15624,115 , 11738,24 , 10027,28 , 10055,53 , 10108,14 , 10027,28 , 10055,53 , 10108,14 , 0,2 , 0,2 , {85,90,83},  309,3 , 6525,21 , 8,5 , 4,0 , 2835,5 , 2840,10 ,     0,     0,     7,     6,     7 }, // Uzbek/Cyrillic/Uzbekistan</div><div class='add'>+    {    131,     7,   228,    44,   160,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 15669,52 , 15438,115 , 15721,24 , 15787,52 , 15624,115 , 15839,24 , 10143,34 , 10177,61 , 10238,14 , 10143,34 , 10177,61 , 10238,14 , 0,2 , 0,2 , {85,90,83},  314,4 , 6559,23 , 8,5 , 4,0 , 2856,9 , 2865,11 ,     0,     0,     7,     6,     7 }, // Uzbek/Latin/Uzbekistan</div><div class='add'>+    {    132,     0,   232,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 372,8 , 372,8 , 141,10 , 1263,31 , 37,5 , 8,10 , 15745,75 , 15820,130 , 1483,27 , 15863,75 , 15938,130 , 134,27 , 10252,33 , 10285,55 , 10340,21 , 10252,33 , 10285,55 , 10340,21 , 309,2 , 307,2 , {86,78,68},  318,1 , 6582,11 , 25,5 , 4,0 , 2876,10 , 2886,8 ,     0,     0,     1,     6,     7 }, // Vietnamese/AnyScript/VietNam</div><div class='add'>+    {    134,     0,   224,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 123,18 , 18,7 , 25,12 , 15950,53 , 16003,87 , 16090,24 , 16068,62 , 16130,86 , 16216,24 , 10361,29 , 10390,77 , 10467,14 , 10481,30 , 10390,77 , 10467,14 , 0,2 , 0,2 , {71,66,80},  153,1 , 6593,28 , 4,4 , 4,0 , 2894,7 , 2901,12 ,     2,     1,     1,     6,     7 }, // Welsh/AnyScript/UnitedKingdom</div><div class='add'>+    {    135,     0,   187,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2 , {88,79,70},  157,3 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 ,     0,     0,     1,     6,     7 }, // Wolof/AnyScript/Senegal</div><div class='add'>+    {    135,     7,   187,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2 , {88,79,70},  157,3 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 ,     0,     0,     1,     6,     7 }, // Wolof/Latin/Senegal</div><div class='add'>+    {    136,     0,   195,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 16114,48 , 16162,91 , 1483,27 , 16240,48 , 16288,91 , 134,27 , 10511,28 , 10539,61 , 798,14 , 10511,28 , 10539,61 , 798,14 , 0,2 , 0,2 , {90,65,82},  11,1 , 0,7 , 4,4 , 4,0 , 2913,8 , 0,0 ,     2,     1,     1,     6,     7 }, // Xhosa/AnyScript/SouthAfrica</div><div class='add'>+    {    138,     0,   157,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,    39,    39, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 16253,73 , 16326,121 , 1483,27 , 16379,73 , 16452,121 , 134,27 , 10600,44 , 10644,69 , 798,14 , 10600,44 , 10644,69 , 798,14 , 311,5 , 309,5 , {78,71,78},  171,1 , 6621,34 , 4,4 , 13,6 , 2921,10 , 2931,18 ,     2,     1,     1,     6,     7 }, // Yoruba/AnyScript/Nigeria</div><div class='add'>+    {    140,     0,   195,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 82,17 , 18,7 , 25,12 , 16447,48 , 16495,104 , 134,24 , 16573,48 , 16621,90 , 320,24 , 10713,28 , 10741,68 , 10809,14 , 10713,28 , 10741,68 , 10809,14 , 0,2 , 0,2 , {90,65,82},  11,1 , 0,7 , 4,4 , 4,0 , 2949,7 , 2956,17 ,     2,     1,     1,     6,     7 }, // Zulu/AnyScript/SouthAfrica</div><div class='add'>+    {    141,     0,   161,    44,   160,    59,    37,    48,  8722,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 85,8 , 85,8 , 332,8 , 594,17 , 37,5 , 431,16 , 4262,48 , 9874,83 , 134,24 , 4314,48 , 9942,83 , 320,24 , 10823,28 , 10851,51 , 2295,14 , 10823,28 , 10851,51 , 2295,14 , 316,9 , 314,11 , {78,79,75},  142,2 , 6655,42 , 25,5 , 4,0 , 2973,7 , 2980,5 ,     2,     1,     1,     6,     7 }, // Nynorsk/AnyScript/Norway</div><div class='add'>+    {    142,     0,    27,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 16599,48 , 16647,83 , 1483,27 , 16711,48 , 16759,83 , 134,27 , 10902,28 , 10930,58 , 798,14 , 10902,28 , 10930,58 , 798,14 , 0,2 , 0,2 , {66,65,77},  250,2 , 6697,26 , 8,5 , 4,0 , 2985,8 , 2205,19 ,     2,     1,     1,     6,     7 }, // Bosnian/AnyScript/BosniaAndHerzegowina</div><div class='add'>+    {    143,     0,   131,    46,    44,    44,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 655,6 , 99,16 , 322,8 , 330,13 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2 , {77,86,82},  319,2 , 0,7 , 8,5 , 4,0 , 2993,10 , 3003,13 ,     2,     1,     5,     6,     7 }, // Divehi/AnyScript/Maldives</div><div class='add'>+    {    144,     0,   224,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 82,17 , 37,5 , 8,10 , 16730,102 , 16832,140 , 1483,27 , 16842,102 , 16944,140 , 134,27 , 10988,30 , 11018,57 , 798,14 , 10988,30 , 11018,57 , 798,14 , 56,4 , 56,4 , {71,66,80},  153,1 , 0,7 , 4,4 , 4,0 , 3016,5 , 3021,14 ,     2,     1,     1,     6,     7 }, // Manx/AnyScript/UnitedKingdom</div><div class='add'>+    {    145,     0,   224,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 99,16 , 37,5 , 8,10 , 16972,46 , 17018,124 , 1483,27 , 17084,46 , 17130,124 , 134,27 , 11075,28 , 11103,60 , 798,14 , 11075,28 , 11103,60 , 798,14 , 56,4 , 56,4 , {71,66,80},  153,1 , 0,7 , 4,4 , 4,0 , 3035,8 , 3021,14 ,     2,     1,     1,     6,     7 }, // Cornish/AnyScript/UnitedKingdom</div><div class='add'>+    {    146,     0,    83,    46,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 17142,48 , 17190,192 , 1483,27 , 17254,48 , 17302,192 , 134,27 , 11163,28 , 11191,49 , 11240,14 , 11163,28 , 11191,49 , 11240,14 , 325,2 , 325,2 , {71,72,83},  168,3 , 0,7 , 4,4 , 4,0 , 3043,4 , 3047,5 ,     2,     1,     1,     6,     7 }, // Akan/AnyScript/Ghana</div><div class='add'>+    {    147,     0,   100,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 655,6 , 99,16 , 18,7 , 25,12 , 17382,87 , 17382,87 , 1483,27 , 17494,87 , 17494,87 , 134,27 , 6251,32 , 11254,55 , 798,14 , 6251,32 , 11254,55 , 798,14 , 327,5 , 327,5 , {73,78,82},  180,2 , 0,7 , 8,5 , 4,0 , 3052,6 , 1460,4 ,     2,     1,     7,     7,     7 }, // Konkani/AnyScript/India</div><div class='add'>+    {    148,     0,    83,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,    34,    34, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 17469,48 , 17517,94 , 1483,27 , 17581,48 , 17629,94 , 134,27 , 11309,26 , 11335,34 , 798,14 , 11309,26 , 11335,34 , 798,14 , 0,2 , 0,2 , {71,72,83},  168,3 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 ,     2,     1,     1,     6,     7 }, // Ga/AnyScript/Ghana</div><div class='add'>+    {    149,     0,   157,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 17611,48 , 17659,86 , 1483,27 , 17723,48 , 17771,86 , 134,27 , 11369,29 , 11398,57 , 798,14 , 11369,29 , 11398,57 , 798,14 , 332,4 , 332,4 , {78,71,78},  171,1 , 6723,12 , 4,4 , 13,6 , 3058,4 , 3062,7 ,     2,     1,     1,     6,     7 }, // Igbo/AnyScript/Nigeria</div><div class='add'>+    {    150,     0,   111,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 17745,48 , 17793,189 , 17982,24 , 17857,48 , 17905,189 , 18094,24 , 11455,28 , 11483,74 , 11557,14 , 11455,28 , 11483,74 , 11557,14 , 336,9 , 336,7 , {75,69,83},  2,3 , 6735,23 , 4,4 , 13,6 , 3069,7 , 2663,5 ,     2,     1,     6,     6,     7 }, // Kamba/AnyScript/Kenya</div><div class='add'>+    {    151,     0,   207,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 1294,13 , 394,4 , 25,12 , 18006,65 , 18006,65 , 1483,27 , 18118,65 , 18118,65 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2 , {83,89,80},  79,5 , 0,7 , 8,5 , 19,6 , 3076,6 , 3076,6 ,     0,     0,     7,     5,     6 }, // Syriac/AnyScript/SyrianArabRepublic</div><div class='add'>+    {    152,     0,    67,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 1307,22 , 18,7 , 25,12 , 18071,47 , 18118,77 , 18195,24 , 18183,47 , 18230,77 , 18307,24 , 11571,26 , 11597,43 , 11640,14 , 11571,26 , 11597,43 , 11640,14 , 0,2 , 0,2 , {69,82,78},  8,3 , 0,7 , 4,4 , 4,0 , 3082,3 , 3085,4 ,     2,     1,     6,     6,     7 }, // Blin/AnyScript/Eritrea</div><div class='add'>+    {    153,     0,    67,    46,  4808,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 1329,23 , 18,7 , 25,12 , 18219,49 , 18219,49 , 18268,24 , 18331,49 , 18331,49 , 18380,24 , 11654,29 , 11654,29 , 11683,14 , 11654,29 , 11654,29 , 11683,14 , 0,2 , 0,2 , {69,82,78},  8,3 , 0,7 , 4,4 , 4,0 , 3089,4 , 3085,4 ,     2,     1,     6,     6,     7 }, // Geez/AnyScript/Eritrea</div><div class='add'>+    {    153,     0,    69,    46,  4808,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 1329,23 , 18,7 , 25,12 , 18219,49 , 18219,49 , 18268,24 , 18331,49 , 18331,49 , 18380,24 , 11654,29 , 11654,29 , 11683,14 , 11654,29 , 11654,29 , 11683,14 , 0,2 , 0,2 , {69,84,66},  0,2 , 81,16 , 4,4 , 4,0 , 3089,4 , 96,5 ,     2,     1,     6,     6,     7 }, // Geez/AnyScript/Ethiopia</div><div class='add'>+    {    154,     0,    53,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 18292,48 , 18340,124 , 1483,27 , 18404,48 , 18452,124 , 134,27 , 11697,28 , 11725,54 , 798,14 , 11697,28 , 11725,54 , 798,14 , 0,2 , 0,2 , {88,79,70},  157,3 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 ,     0,     0,     1,     6,     7 }, // Koro/AnyScript/IvoryCoast</div><div class='add'>+    {    155,     0,    69,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 53,19 , 18,7 , 25,12 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 11779,28 , 11807,51 , 11858,14 , 11779,28 , 11807,51 , 11858,14 , 0,2 , 0,2 , {69,84,66},  0,2 , 0,7 , 4,4 , 4,0 , 3093,11 , 3104,11 ,     2,     1,     6,     6,     7 }, // Sidamo/AnyScript/Ethiopia</div><div class='add'>+    {    156,     0,   157,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 18464,59 , 18523,129 , 1483,27 , 18576,59 , 18635,129 , 134,27 , 11872,35 , 11907,87 , 798,14 , 11872,35 , 11907,87 , 798,14 , 0,2 , 0,2 , {78,71,78},  171,1 , 6758,11 , 8,5 , 4,0 , 0,0 , 0,0 ,     2,     1,     1,     6,     7 }, // Atsam/AnyScript/Nigeria</div><div class='add'>+    {    157,     0,    67,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 1352,21 , 18,7 , 25,12 , 926,46 , 972,62 , 1034,24 , 953,46 , 999,62 , 1061,24 , 11994,27 , 12021,41 , 12062,14 , 11994,27 , 12021,41 , 12062,14 , 0,2 , 0,2 , {69,82,78},  8,3 , 0,7 , 4,4 , 4,0 , 3115,3 , 3085,4 ,     2,     1,     6,     6,     7 }, // Tigre/AnyScript/Eritrea</div><div class='add'>+    {    158,     0,   157,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 18652,57 , 18709,178 , 1483,27 , 18764,57 , 18821,178 , 134,27 , 12076,28 , 12104,44 , 798,14 , 12076,28 , 12104,44 , 798,14 , 0,2 , 0,2 , {78,71,78},  171,1 , 6769,14 , 8,5 , 4,0 , 0,0 , 0,0 ,     2,     1,     1,     6,     7 }, // Jju/AnyScript/Nigeria</div><div class='add'>+    {    159,     0,   106,    44,    46,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 1373,27 , 37,5 , 8,10 , 18887,48 , 18935,77 , 19012,24 , 18999,48 , 19047,77 , 19124,24 , 12148,28 , 12176,50 , 3021,14 , 12148,28 , 12176,50 , 3021,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 3549,11 , 8,5 , 4,0 , 3118,6 , 3124,6 ,     2,     1,     1,     6,     7 }, // Friulian/AnyScript/Italy</div><div class='add'>+    {    160,     0,   195,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 19036,48 , 19084,111 , 1483,27 , 19148,48 , 19196,111 , 134,27 , 12226,27 , 12253,70 , 798,14 , 12226,27 , 12253,70 , 798,14 , 0,2 , 0,2 , {90,65,82},  11,1 , 0,7 , 4,4 , 4,0 , 3130,9 , 0,0 ,     2,     1,     1,     6,     7 }, // Venda/AnyScript/SouthAfrica</div><div class='add'>+    {    161,     0,    83,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 19195,48 , 19243,87 , 19330,24 , 19307,48 , 19355,87 , 19442,24 , 12323,32 , 12355,44 , 12399,14 , 12323,32 , 12355,44 , 12399,14 , 325,2 , 325,2 , {71,72,83},  168,3 , 0,7 , 4,4 , 13,6 , 3139,6 , 3145,7 ,     2,     1,     1,     6,     7 }, // Ewe/AnyScript/Ghana</div><div class='add'>+    {    161,     0,   212,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 19195,48 , 19243,87 , 19330,24 , 19307,48 , 19355,87 , 19442,24 , 12323,32 , 12355,44 , 12399,14 , 12323,32 , 12355,44 , 12399,14 , 325,2 , 325,2 , {88,79,70},  157,3 , 6783,11 , 4,4 , 13,6 , 3139,6 , 3152,6 ,     0,     0,     1,     6,     7 }, // Ewe/AnyScript/Togo</div><div class='add'>+    {    162,     0,    69,    46,  8217,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 1400,22 , 18,7 , 25,12 , 926,46 , 972,62 , 1034,24 , 953,46 , 999,62 , 1061,24 , 12413,27 , 12413,27 , 12440,14 , 12413,27 , 12413,27 , 12440,14 , 0,2 , 0,2 , {69,84,66},  0,2 , 81,16 , 4,4 , 4,0 , 3158,5 , 96,5 ,     2,     1,     6,     6,     7 }, // Walamo/AnyScript/Ethiopia</div><div class='add'>+    {    163,     0,   225,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 279,6 , 10,17 , 18,7 , 25,12 , 19354,59 , 19413,95 , 1483,27 , 19466,59 , 19525,95 , 134,27 , 12454,21 , 12475,57 , 798,14 , 12454,21 , 12475,57 , 798,14 , 0,2 , 0,2 , {85,83,68},  256,3 , 0,7 , 4,4 , 13,6 , 3163,14 , 3177,19 ,     2,     1,     7,     6,     7 }, // Hawaiian/AnyScript/UnitedStates</div><div class='add'>+    {    164,     0,   157,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 221,8 , 314,18 , 37,5 , 8,10 , 19508,48 , 19556,153 , 1483,27 , 19620,48 , 19668,153 , 134,27 , 12532,28 , 12560,42 , 798,14 , 12532,28 , 12560,42 , 798,14 , 0,2 , 0,2 , {78,71,78},  171,1 , 6794,11 , 8,5 , 4,0 , 0,0 , 0,0 ,     2,     1,     1,     6,     7 }, // Tyap/AnyScript/Nigeria</div><div class='add'>+    {    165,     0,   129,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 19709,48 , 19757,91 , 1483,27 , 19821,48 , 19869,91 , 134,27 , 12602,28 , 12630,67 , 798,14 , 12602,28 , 12630,67 , 798,14 , 0,2 , 0,2 , {77,87,75},  0,0 , 6805,22 , 8,5 , 4,0 , 0,0 , 0,0 ,     2,     1,     1,     6,     7 }, // Chewa/AnyScript/Malawi</div><div class='add'>+    {    166,     0,   170,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 380,8 , 380,8 , 558,6 , 1422,18 , 37,5 , 8,10 , 19848,48 , 19896,88 , 19984,24 , 19960,48 , 20008,88 , 20096,24 , 12697,28 , 12725,55 , 12780,14 , 12794,28 , 12725,55 , 12780,14 , 0,2 , 0,2 , {80,72,80},  152,1 , 6827,22 , 8,5 , 4,0 , 3196,8 , 3204,9 ,     2,     1,     7,     6,     7 }, // Filipino/AnyScript/Philippines</div><div class='add'>+    {    167,     0,   206,    46,  8217,    59,    37,    48,  8722,    43,   101,   171,   187,  8249,  8250, 0,6 , 0,6 , 128,9 , 128,9 , 332,8 , 502,18 , 37,5 , 8,10 , 20008,48 , 20056,86 , 134,24 , 5076,48 , 20120,86 , 320,24 , 12822,28 , 12850,63 , 3311,14 , 12822,28 , 12850,63 , 3311,14 , 91,5 , 343,4 , {67,72,70},  0,0 , 6849,39 , 25,5 , 4,0 , 3213,16 , 3229,7 ,     2,     5,     1,     6,     7 }, // Swiss German/AnyScript/Switzerland</div><div class='add'>+    {    168,     0,    44,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 20142,38 , 1483,27 , 134,27 , 20206,38 , 134,27 , 12913,21 , 12934,28 , 12962,14 , 12913,21 , 12934,28 , 12962,14 , 345,2 , 347,2 , {67,78,89},  215,3 , 0,7 , 8,5 , 4,0 , 3236,3 , 3239,2 ,     2,     1,     7,     6,     7 }, // Sichuan Yi/AnyScript/China</div><div class='add'>+    {    169,     0,    91,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2 , {71,78,70},  321,2 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 ,     0,     0,     1,     6,     7 }, // Kpelle/AnyScript/Guinea</div><div class='add'>+    {    169,     0,   121,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2 , {76,82,68},  128,1 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 ,     2,     1,     1,     6,     7 }, // Kpelle/AnyScript/Liberia</div><div class='add'>+    {    170,     0,    82,    44,    46,    59,    37,    48,    45,    43,   101,  8222,  8220,  8218,  8216, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 1483,27 , 1483,27 , 1483,27 , 134,27 , 134,27 , 134,27 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 798,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 0,7 , 25,5 , 4,0 , 3241,12 , 3253,11 ,     2,     1,     1,     6,     7 }, // Low German/AnyScript/Germany</div><div class='add'>+    {    171,     0,   195,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 20180,48 , 20228,100 , 1483,27 , 20244,48 , 20292,100 , 134,27 , 12976,27 , 13003,66 , 798,14 , 12976,27 , 13003,66 , 798,14 , 0,2 , 0,2 , {90,65,82},  11,1 , 0,7 , 4,4 , 4,0 , 3264,10 , 0,0 ,     2,     1,     1,     6,     7 }, // South Ndebele/AnyScript/SouthAfrica</div><div class='add'>+    {    172,     0,   195,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 20328,48 , 20376,94 , 1483,27 , 20392,48 , 20440,94 , 134,27 , 13069,27 , 13096,63 , 798,14 , 13069,27 , 13096,63 , 798,14 , 0,2 , 0,2 , {90,65,82},  11,1 , 0,7 , 4,4 , 4,0 , 3274,16 , 0,0 ,     2,     1,     1,     6,     7 }, // Northern Sotho/AnyScript/SouthAfrica</div><div class='add'>+    {    173,     0,    73,    44,   160,    59,    37,    48,  8722,    43,   101,  8221,  8221,  8217,  8217, 0,6 , 0,6 , 112,8 , 112,8 , 72,10 , 314,18 , 37,5 , 8,10 , 20470,85 , 20555,145 , 20700,24 , 20534,85 , 20619,145 , 20764,24 , 13159,33 , 13192,65 , 13257,14 , 13159,33 , 13192,65 , 13257,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 6888,23 , 25,5 , 4,0 , 3290,15 , 3305,6 ,     2,     1,     1,     6,     7 }, // Northern Sami/AnyScript/Finland</div><div class='add'>+    {    173,     0,   161,    44,   160,    59,    37,    48,  8722,    43,   101,  8221,  8221,  8217,  8217, 0,6 , 0,6 , 112,8 , 112,8 , 72,10 , 314,18 , 37,5 , 8,10 , 20724,59 , 20555,145 , 20700,24 , 20788,59 , 20619,145 , 20764,24 , 13159,33 , 13271,75 , 13346,14 , 13159,33 , 13271,75 , 13346,14 , 0,2 , 0,2 , {78,79,75},  323,3 , 6911,21 , 25,5 , 4,0 , 3290,15 , 3311,5 ,     2,     1,     1,     6,     7 }, // Northern Sami/AnyScript/Norway</div><div class='add'>+    {    174,     0,   208,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 72,10 , 314,18 , 37,5 , 8,10 , 20783,48 , 20831,142 , 20973,24 , 20847,48 , 20895,142 , 21037,24 , 13360,28 , 13388,172 , 13560,14 , 13360,28 , 13388,172 , 13560,14 , 0,2 , 0,2 , {84,87,68},  135,3 , 6932,18 , 8,5 , 4,0 , 0,0 , 0,0 ,     2,     1,     7,     6,     7 }, // Taroko/AnyScript/Taiwan</div><div class='add'>+    {    175,     0,   111,    46,    44,    59,    37,    48,    45,    43,   101,    39,  8216,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 20997,48 , 21045,88 , 21133,24 , 21061,48 , 21109,88 , 21197,24 , 13574,28 , 13602,62 , 13664,14 , 13574,28 , 13602,62 , 13664,14 , 347,5 , 349,10 , {75,69,83},  2,3 , 6950,24 , 4,4 , 13,6 , 3316,8 , 2663,5 ,     2,     1,     6,     6,     7 }, // Gusii/AnyScript/Kenya</div><div class='add'>+    {    176,     0,   111,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 21157,48 , 21205,221 , 21426,24 , 21221,48 , 21269,221 , 21490,24 , 13678,28 , 13706,106 , 13812,14 , 13678,28 , 13706,106 , 13812,14 , 352,10 , 359,10 , {75,69,83},  2,3 , 6950,24 , 4,4 , 13,6 , 3324,7 , 2663,5 ,     2,     1,     6,     6,     7 }, // Taita/AnyScript/Kenya</div><div class='add'>+    {    177,     0,   187,    44,   160,    59,    37,    48,    45,    43,   101,  8222,  8221,    39,    39, 0,6 , 0,6 , 0,6 , 0,6 , 364,8 , 99,16 , 37,5 , 8,10 , 21450,48 , 21498,77 , 21575,24 , 21514,48 , 21562,77 , 21639,24 , 13826,28 , 13854,59 , 13913,14 , 13826,28 , 13854,59 , 13913,14 , 362,6 , 369,7 , {88,79,70},  157,3 , 6974,26 , 25,5 , 4,0 , 3331,6 , 3337,8 ,     0,     0,     1,     6,     7 }, // Fulah/AnyScript/Senegal</div><div class='add'>+    {    178,     0,   111,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 21599,48 , 21647,185 , 21832,24 , 21663,48 , 21711,185 , 21896,24 , 13927,28 , 13955,63 , 14018,14 , 13927,28 , 13955,63 , 14018,14 , 368,6 , 376,8 , {75,69,83},  2,3 , 7000,23 , 4,4 , 13,6 , 3345,6 , 2663,5 ,     2,     1,     6,     6,     7 }, // Kikuyu/AnyScript/Kenya</div><div class='add'>+    {    179,     0,   111,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 21856,48 , 21904,173 , 22077,24 , 21920,48 , 21968,173 , 22141,24 , 14032,28 , 14060,105 , 14165,14 , 14032,28 , 14060,105 , 14165,14 , 374,7 , 384,5 , {75,69,83},  2,3 , 7023,25 , 4,4 , 13,6 , 3351,8 , 2663,5 ,     2,     1,     6,     6,     7 }, // Samburu/AnyScript/Kenya</div><div class='add'>+    {    180,     0,   146,    44,    46,    59,    37,    48,    45,    43,   101,    39,    39,    39,    39, 0,6 , 0,6 , 0,6 , 0,6 , 364,8 , 902,27 , 37,5 , 8,10 , 22101,48 , 22149,88 , 134,24 , 22165,48 , 22213,88 , 320,24 , 14179,28 , 14207,55 , 14262,14 , 14179,28 , 14207,55 , 14262,14 , 0,2 , 0,2 , {77,90,78},  228,3 , 0,7 , 0,4 , 4,0 , 3359,4 , 1978,10 ,     2,     1,     1,     6,     7 }, // Sena/AnyScript/Mozambique</div><div class='add'>+    {    181,     0,   240,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 22237,48 , 22285,112 , 22397,24 , 22301,48 , 22349,112 , 22461,24 , 14276,28 , 14304,50 , 14354,14 , 14276,28 , 14304,50 , 14354,14 , 0,2 , 0,2 , {85,83,68},  256,3 , 7048,24 , 4,4 , 13,6 , 3264,10 , 944,8 ,     2,     1,     7,     6,     7 }, // North Ndebele/AnyScript/Zimbabwe</div><div class='add'>+    {    182,     0,   210,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 22421,39 , 22460,194 , 22654,24 , 22485,39 , 22524,194 , 22718,24 , 14368,28 , 14396,65 , 14461,14 , 14368,28 , 14396,65 , 14461,14 , 381,8 , 389,7 , {84,90,83},  290,3 , 7072,25 , 4,4 , 4,0 , 3363,9 , 2668,8 ,     0,     0,     1,     6,     7 }, // Rombo/AnyScript/Tanzania</div><div class='add'>+    {    183,     0,   145,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8222,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 364,8 , 99,16 , 37,5 , 8,10 , 22678,48 , 22726,81 , 22807,24 , 22742,48 , 22790,81 , 22871,24 , 14475,30 , 14505,48 , 798,14 , 14475,30 , 14505,48 , 798,14 , 389,6 , 396,8 , {77,65,68},  0,0 , 7097,21 , 0,4 , 4,0 , 3372,9 , 3381,6 ,     2,     1,     6,     5,     6 }, // Tachelhit/AnyScript/Morocco</div><div class='add'>+    {    183,     7,   145,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8222,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 364,8 , 99,16 , 37,5 , 8,10 , 22678,48 , 22726,81 , 22807,24 , 22742,48 , 22790,81 , 22871,24 , 14475,30 , 14505,48 , 798,14 , 14475,30 , 14505,48 , 798,14 , 389,6 , 396,8 , {77,65,68},  0,0 , 7097,21 , 0,4 , 4,0 , 3372,9 , 3381,6 ,     2,     1,     6,     5,     6 }, // Tachelhit/Latin/Morocco</div><div class='add'>+    {    183,     9,   145,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8222,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 364,8 , 99,16 , 37,5 , 8,10 , 22831,48 , 22879,81 , 22960,24 , 22895,48 , 22943,81 , 23024,24 , 14553,30 , 14583,47 , 798,14 , 14553,30 , 14583,47 , 798,14 , 395,6 , 404,8 , {77,65,68},  0,0 , 7118,21 , 0,4 , 4,0 , 3387,8 , 3395,6 ,     2,     1,     6,     5,     6 }, // Tachelhit/Tifinagh/Morocco</div><div class='add'>+    {    184,     0,     3,    44,   160,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 364,8 , 99,16 , 37,5 , 8,10 , 22984,48 , 23032,84 , 23116,24 , 23048,48 , 23096,84 , 23180,24 , 14630,30 , 14660,51 , 14711,14 , 14630,30 , 14660,51 , 14711,14 , 401,7 , 412,9 , {68,90,68},  326,2 , 7139,21 , 0,4 , 4,0 , 3401,9 , 3410,8 ,     2,     1,     6,     4,     5 }, // Kabyle/AnyScript/Algeria</div><div class='add'>+    {    185,     0,   221,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8222, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 23140,48 , 23188,152 , 134,24 , 23204,48 , 23252,152 , 320,24 , 14725,28 , 14753,74 , 14827,14 , 14725,28 , 14753,74 , 14827,14 , 0,2 , 0,2 , {85,71,88},  328,3 , 7160,26 , 4,4 , 74,5 , 3418,10 , 3428,6 ,     0,     0,     1,     6,     7 }, // Nyankole/AnyScript/Uganda</div><div class='add'>+    {    186,     0,   210,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 23340,48 , 23388,254 , 23642,24 , 23404,48 , 23452,254 , 23706,24 , 14841,28 , 14869,82 , 14951,14 , 14841,28 , 14869,82 , 14951,14 , 408,7 , 421,7 , {84,90,83},  290,3 , 7186,29 , 0,4 , 4,0 , 3434,6 , 3440,10 ,     0,     0,     1,     6,     7 }, // Bena/AnyScript/Tanzania</div><div class='add'>+    {    187,     0,   210,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 13613,48 , 23666,87 , 134,24 , 13764,48 , 23730,87 , 320,24 , 14965,28 , 14993,62 , 15055,14 , 14965,28 , 14993,62 , 15055,14 , 415,5 , 428,9 , {84,90,83},  290,3 , 7215,27 , 4,4 , 4,0 , 3450,8 , 2668,8 ,     0,     0,     1,     6,     7 }, // Vunjo/AnyScript/Tanzania</div><div class='add'>+    {    188,     0,   132,    46,    44,    59,    37,    48,    45,    43,   101,   171,   187,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 364,8 , 99,16 , 37,5 , 8,10 , 23753,47 , 23800,92 , 23892,24 , 23817,47 , 23864,92 , 23956,24 , 15069,28 , 15097,44 , 15141,14 , 15069,28 , 15097,44 , 15141,14 , 0,2 , 0,2 , {88,79,70},  157,3 , 7242,24 , 4,4 , 13,6 , 3458,9 , 1133,4 ,     0,     0,     1,     6,     7 }, // Bambara/AnyScript/Mali</div><div class='add'>+    {    189,     0,   111,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 23916,48 , 23964,207 , 24171,24 , 23980,48 , 24028,207 , 24235,24 , 15155,28 , 15183,64 , 15247,14 , 15155,28 , 15183,64 , 15247,14 , 420,2 , 437,2 , {75,69,83},  2,3 , 6950,24 , 4,4 , 13,6 , 3467,6 , 2663,5 ,     2,     1,     6,     6,     7 }, // Embu/AnyScript/Kenya</div><div class='add'>+    {    190,     0,   225,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 558,6 , 35,18 , 18,7 , 25,12 , 24195,36 , 24231,58 , 24289,24 , 24259,36 , 24295,58 , 24353,24 , 15261,28 , 15289,49 , 15338,14 , 15261,28 , 15289,49 , 15338,14 , 422,3 , 439,6 , {85,83,68},  128,1 , 7266,19 , 4,4 , 13,6 , 3473,3 , 3476,4 ,     2,     1,     7,     6,     7 }, // Cherokee/AnyScript/UnitedStates</div><div class='add'>+    {    191,     0,   137,    46,   160,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 364,8 , 99,16 , 37,5 , 8,10 , 24313,47 , 24360,68 , 24428,24 , 24377,47 , 24424,68 , 24492,24 , 15352,27 , 15379,48 , 15427,14 , 15352,27 , 15379,48 , 15427,14 , 0,2 , 0,2 , {77,85,82},  147,4 , 7285,21 , 8,5 , 4,0 , 3480,14 , 3494,5 ,     0,     0,     1,     6,     7 }, // Morisyen/AnyScript/Mauritius</div><div class='add'>+    {    192,     0,   210,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 13613,48 , 24452,264 , 134,24 , 13764,48 , 24516,264 , 320,24 , 15441,28 , 15469,133 , 14461,14 , 15441,28 , 15469,133 , 14461,14 , 425,4 , 445,5 , {84,90,83},  290,3 , 7215,27 , 4,4 , 13,6 , 3499,10 , 2668,8 ,     0,     0,     1,     6,     7 }, // Makonde/AnyScript/Tanzania</div><div class='add'>+    {    193,     0,   210,    46,    44,    59,    37,    48,    45,    43,   101,  8221,  8221,    39,    39, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 24716,83 , 24799,111 , 24910,24 , 24780,83 , 24863,111 , 24974,24 , 15602,36 , 15638,63 , 15701,14 , 15602,36 , 15638,63 , 15701,14 , 429,3 , 450,3 , {84,90,83},  290,3 , 7306,29 , 8,5 , 4,0 , 3509,8 , 3517,9 ,     0,     0,     1,     6,     7 }, // Langi/AnyScript/Tanzania</div><div class='add'>+    {    194,     0,   221,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 24934,48 , 24982,97 , 134,24 , 24998,48 , 25046,97 , 320,24 , 15715,28 , 15743,66 , 15809,14 , 15715,28 , 15743,66 , 15809,14 , 0,2 , 0,2 , {85,71,88},  328,3 , 7335,26 , 0,4 , 4,0 , 3526,7 , 3533,7 ,     0,     0,     1,     6,     7 }, // Ganda/AnyScript/Uganda</div><div class='add'>+    {    195,     0,   239,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 25079,48 , 25127,83 , 25210,24 , 25143,48 , 25191,83 , 25274,24 , 15823,80 , 15823,80 , 798,14 , 15823,80 , 15823,80 , 798,14 , 432,8 , 453,7 , {90,77,75},  331,2 , 0,7 , 4,4 , 13,6 , 3540,9 , 3549,6 ,     0,     0,     1,     6,     7 }, // Bemba/AnyScript/Zambia</div><div class='add'>+    {    196,     0,    39,    44,    46,    59,    37,    48,    45,    43,   101,  8220,  8221,   171,   187, 0,6 , 0,6 , 0,6 , 0,6 , 364,8 , 902,27 , 37,5 , 8,10 , 25234,48 , 25282,86 , 134,24 , 25298,48 , 25346,86 , 320,24 , 15903,28 , 15931,73 , 16004,14 , 15903,28 , 15931,73 , 16004,14 , 140,2 , 140,2 , {67,86,69},  333,3 , 7361,25 , 0,4 , 4,0 , 3555,12 , 3567,10 ,     2,     1,     1,     6,     7 }, // Kabuverdianu/AnyScript/CapeVerde</div><div class='add'>+    {    197,     0,   111,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 25368,48 , 25416,86 , 25502,24 , 25432,48 , 25480,86 , 25566,24 , 16018,28 , 16046,51 , 16097,14 , 16018,28 , 16046,51 , 16097,14 , 440,2 , 460,2 , {75,69,83},  2,3 , 6950,24 , 4,4 , 13,6 , 3577,6 , 2663,5 ,     2,     1,     6,     6,     7 }, // Meru/AnyScript/Kenya</div><div class='add'>+    {    198,     0,   111,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 25526,48 , 25574,111 , 25685,24 , 25590,48 , 25638,111 , 25749,24 , 16111,28 , 16139,93 , 16232,14 , 16111,28 , 16139,93 , 16232,14 , 442,4 , 462,4 , {75,69,83},  2,3 , 7386,26 , 4,4 , 13,6 , 3583,8 , 3591,12 ,     2,     1,     6,     6,     7 }, // Kalenjin/AnyScript/Kenya</div><div class='add'>+    {    199,     0,   148,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 0,48 , 25709,136 , 134,24 , 0,48 , 25773,136 , 320,24 , 16246,23 , 16269,92 , 16361,14 , 16246,23 , 16269,92 , 16361,14 , 446,7 , 466,5 , {78,65,68},  12,2 , 7412,22 , 4,4 , 4,0 , 3603,13 , 3616,8 ,     2,     1,     1,     6,     7 }, // Nama/AnyScript/Namibia</div><div class='add'>+    {    200,     0,   210,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 13613,48 , 23666,87 , 134,24 , 13764,48 , 23730,87 , 320,24 , 14965,28 , 14993,62 , 15055,14 , 14965,28 , 14993,62 , 15055,14 , 415,5 , 428,9 , {84,90,83},  290,3 , 7215,27 , 4,4 , 4,0 , 3624,9 , 2668,8 ,     0,     0,     1,     6,     7 }, // Machame/AnyScript/Tanzania</div><div class='add'>+    {    201,     0,    82,    44,   160,    59,    37,    48,  8722,    43,   101,  8222,  8220,  8218,  8216, 0,6 , 0,6 , 228,8 , 228,8 , 1440,10 , 1450,23 , 37,5 , 8,10 , 25845,59 , 25904,87 , 134,24 , 25909,59 , 25968,87 , 320,24 , 16375,28 , 16403,72 , 3311,14 , 16375,28 , 16403,72 , 3311,14 , 0,2 , 0,2 , {69,85,82},  113,1 , 3549,11 , 25,5 , 4,0 , 0,0 , 3633,11 ,     2,     1,     1,     6,     7 }, // Colognian/AnyScript/Germany</div><div class='add'>+    {    202,     0,   111,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8221,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 25991,51 , 26042,132 , 1483,27 , 26055,51 , 26106,132 , 134,27 , 14965,28 , 16475,58 , 14461,14 , 14965,28 , 16475,58 , 14461,14 , 453,9 , 471,6 , {75,69,83},  2,3 , 7434,25 , 4,4 , 13,6 , 3644,3 , 2663,5 ,     2,     1,     6,     6,     7 }, // Masai/AnyScript/Kenya</div><div class='add'>+    {    202,     0,   210,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8221,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 25991,51 , 26042,132 , 1483,27 , 26055,51 , 26106,132 , 134,27 , 14965,28 , 16475,58 , 14461,14 , 14965,28 , 16475,58 , 14461,14 , 453,9 , 471,6 , {84,90,83},  290,3 , 7459,28 , 4,4 , 13,6 , 3644,3 , 3647,8 ,     0,     0,     1,     6,     7 }, // Masai/AnyScript/Tanzania</div><div class='add'>+    {    203,     0,   221,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8222, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 24934,48 , 24982,97 , 134,24 , 24998,48 , 25046,97 , 320,24 , 16533,35 , 16568,65 , 16633,14 , 16533,35 , 16568,65 , 16633,14 , 462,6 , 477,6 , {85,71,88},  328,3 , 7335,26 , 25,5 , 4,0 , 3655,7 , 3533,7 ,     0,     0,     1,     6,     7 }, // Soga/AnyScript/Uganda</div><div class='add'>+    {    204,     0,   111,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8222,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 26174,48 , 13661,84 , 134,24 , 26238,48 , 13812,84 , 320,24 , 16647,21 , 16668,75 , 85,14 , 16647,21 , 16668,75 , 85,14 , 56,4 , 56,4 , {75,69,83},  2,3 , 7487,23 , 4,4 , 79,6 , 3662,7 , 2663,5 ,     2,     1,     6,     6,     7 }, // Luyia/AnyScript/Kenya</div><div class='add'>+    {    205,     0,   210,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 26222,48 , 13661,84 , 134,24 , 26286,48 , 13812,84 , 320,24 , 16743,28 , 8849,60 , 15055,14 , 16743,28 , 8849,60 , 15055,14 , 468,9 , 483,8 , {84,90,83},  290,3 , 7510,28 , 25,5 , 4,0 , 3669,6 , 3675,8 ,     0,     0,     1,     6,     7 }, // Asu/AnyScript/Tanzania</div><div class='add'>+    {    206,     0,   111,    46,    44,    59,    37,    48,    45,    43,   101,    39,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 26270,48 , 26318,94 , 26412,24 , 26334,48 , 26382,94 , 26476,24 , 16771,28 , 16799,69 , 16868,14 , 16771,28 , 16799,69 , 16868,14 , 477,9 , 491,6 , {75,69,83},  2,3 , 7538,27 , 4,4 , 13,6 , 3683,6 , 3689,5 ,     2,     1,     6,     6,     7 }, // Teso/AnyScript/Kenya</div><div class='add'>+    {    206,     0,   221,    46,    44,    59,    37,    48,    45,    43,   101,    39,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 26270,48 , 26318,94 , 26412,24 , 26334,48 , 26382,94 , 26476,24 , 16771,28 , 16799,69 , 16868,14 , 16771,28 , 16799,69 , 16868,14 , 477,9 , 491,6 , {85,71,88},  328,3 , 7565,28 , 4,4 , 13,6 , 3683,6 , 3428,6 ,     0,     0,     1,     6,     7 }, // Teso/AnyScript/Uganda</div><div class='add'>+    {    207,     0,    67,    46,    44,    59,    37,    48,    45,    43,   101,  8220,  8221,  8216,  8217, 0,6 , 0,6 , 0,6 , 0,6 , 27,8 , 53,19 , 18,7 , 25,12 , 317,48 , 518,118 , 494,24 , 344,48 , 545,118 , 521,24 , 16882,28 , 16910,56 , 16966,14 , 16882,28 , 16910,56 , 16966,14 , 0,2 , 0,2 , {69,82,78},  8,3 , 0,7 , 4,4 , 4,0 , 0,0 , 36,7 ,     2,     1,     6,     6,     7 }, // Saho/AnyScript/Eritrea</div><div class='add'>+    {    208,     0,   132,    46,   160,    59,    37,    48,    45,    43,   101,  8220,  8221,   171,   187, 0,6 , 0,6 , 0,6 , 0,6 , 364,8 , 99,16 , 37,5 , 8,10 , 26436,46 , 26482,88 , 26570,24 , 26500,46 , 26546,88 , 26634,24 , 16980,28 , 17008,53 , 17061,14 , 16980,28 , 17008,53 , 17061,14 , 486,6 , 497,6 , {88,79,70},  157,3 , 7593,23 , 0,4 , 4,0 , 3694,11 , 3705,5 ,     0,     0,     1,     6,     7 }, // Koyra Chiini/AnyScript/Mali</div><div class='add'>+    {    209,     0,   210,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8220, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 13613,48 , 23666,87 , 134,24 , 13764,48 , 23730,87 , 320,24 , 14965,28 , 14993,62 , 15055,14 , 14965,28 , 14993,62 , 15055,14 , 415,5 , 428,9 , {84,90,83},  290,3 , 7215,27 , 0,4 , 4,0 , 3710,6 , 2668,8 ,     0,     0,     1,     6,     7 }, // Rwa/AnyScript/Tanzania</div><div class='add'>+    {    210,     0,   111,    46,    44,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 26594,48 , 26642,186 , 26828,24 , 26658,48 , 26706,186 , 26892,24 , 17075,28 , 17103,69 , 17172,14 , 17075,28 , 17103,69 , 17172,14 , 492,2 , 503,2 , {75,69,83},  2,3 , 7616,23 , 0,4 , 4,0 , 3716,6 , 2663,5 ,     2,     1,     6,     6,     7 }, // Luo/AnyScript/Kenya</div><div class='add'>+    {    211,     0,   221,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8222, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 23140,48 , 23188,152 , 134,24 , 23204,48 , 23252,152 , 320,24 , 14725,28 , 14753,74 , 14827,14 , 14725,28 , 14753,74 , 14827,14 , 0,2 , 0,2 , {85,71,88},  328,3 , 7160,26 , 4,4 , 74,5 , 3722,6 , 3428,6 ,     0,     0,     1,     6,     7 }, // Chiga/AnyScript/Uganda</div><div class='add'>+    {    212,     0,   145,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 26852,48 , 26900,86 , 26986,24 , 26916,48 , 26964,86 , 27050,24 , 17186,28 , 17214,48 , 17262,14 , 17186,28 , 17214,48 , 17262,14 , 494,9 , 505,10 , {77,65,68},  0,0 , 7639,22 , 25,5 , 4,0 , 3728,8 , 3736,6 ,     2,     1,     6,     5,     6 }, // Central Morocco Tamazight/AnyScript/Morocco</div><div class='add'>+    {    212,     7,   145,    44,   160,    59,    37,    48,    45,    43,   101,  8216,  8217,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 26852,48 , 26900,86 , 26986,24 , 26916,48 , 26964,86 , 27050,24 , 17186,28 , 17214,48 , 17262,14 , 17186,28 , 17214,48 , 17262,14 , 494,9 , 505,10 , {77,65,68},  0,0 , 7639,22 , 25,5 , 4,0 , 3728,8 , 3736,6 ,     2,     1,     6,     5,     6 }, // Central Morocco Tamazight/Latin/Morocco</div><div class='add'>+    {    213,     0,   132,    46,   160,    59,    37,    48,    45,    43,   101,  8220,  8221,   171,   187, 0,6 , 0,6 , 0,6 , 0,6 , 364,8 , 99,16 , 37,5 , 8,10 , 26436,46 , 26482,88 , 26570,24 , 26500,46 , 26546,88 , 26634,24 , 17276,28 , 17304,54 , 17061,14 , 17276,28 , 17304,54 , 17061,14 , 486,6 , 497,6 , {88,79,70},  157,3 , 7593,23 , 0,4 , 4,0 , 3742,15 , 3705,5 ,     0,     0,     1,     6,     7 }, // Koyraboro Senni/AnyScript/Mali</div><div class='add'>+    {    214,     0,   210,    46,    44,    59,    37,    48,    45,    43,   101,    39,    39,  8220,  8221, 0,6 , 0,6 , 0,6 , 0,6 , 141,10 , 10,17 , 18,7 , 25,12 , 13613,48 , 27010,84 , 134,24 , 13764,48 , 27074,84 , 320,24 , 17358,28 , 17386,63 , 8909,14 , 17358,28 , 17386,63 , 8909,14 , 503,5 , 515,8 , {84,90,83},  290,3 , 6241,27 , 0,4 , 4,0 , 3757,9 , 2668,8 ,     0,     0,     1,     6,     7 }, // Shambala/AnyScript/Tanzania</div><div class='add'>+    {      0,      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,    0,0,    0,0,    0,0,   0,0,     0,0,     0,0,     0,0,     0,0,     0,0,     0,0,     0,0,    0,0,    0,0,    0,0,   0,0,   0,0,   0,0,   0,0,   0,0,   0,0,   0,0,   0,0, {0,0,0}, 0,0, 0,0, 0,0, 0,0, 0, 0, 0, 0, 0, 0,0, 0,0 }  // trailing 0s</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const ushort list_pattern_part_data[] = {</div><div class='add'>+0x25, 0x31, 0x2c, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x65, 0x6e, 0x20, 0x25, 0x32, 0x25, 0x31, 0x60c, 0x20, 0x25, 0x32,</div><div class='add'>+0x25, 0x31, 0x60c, 0x20, 0x648, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x648, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x98f,</div><div class='add'>+0x9ac, 0x982, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x98f, 0x9ac, 0x982, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x438, 0x20, 0x25,</div><div class='add'>+0x32, 0x25, 0x31, 0x20, 0x69, 0x20, 0x25, 0x32, 0x25, 0x31, 0x3001, 0x25, 0x32, 0x25, 0x31, 0x548c, 0x25, 0x32, 0x25, 0x31,</div><div class='add'>+0x20, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6f, 0x67, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x61, 0x6e, 0x64,</div><div class='add'>+0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6a, 0x61, 0x20, 0x25, 0x32,</div><div class='add'>+0x25, 0x31, 0x20, 0x65, 0x74, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x75, 0x6e, 0x64, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20,</div><div class='add'>+0x3ba, 0x3b1, 0x3b9, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x61, 0x61, 0x6d, 0x6d, 0x61, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20,</div><div class='add'>+0xa85, 0xaa8, 0xac7, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x914, 0x930, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xe9, 0x73, 0x20,</div><div class='add'>+0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x64, 0x61, 0x6e, 0x20, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x64, 0x61, 0x6e, 0x20,</div><div class='add'>+0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0x65, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x65, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20,</div><div class='add'>+0xcae, 0xca4, 0xccd, 0xca4, 0xcc1, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x75, 0x6e, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x69,</div><div class='add'>+0x72, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xd15, 0xd42, 0xd1f, 0xd3e, 0xd24, 0xd46, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x20,</div><div class='add'>+0x906, 0x923, 0x93f, 0x20, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x906, 0x923, 0x93f, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x69,</div><div class='add'>+0x6e, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x79, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x6f, 0x63, 0x68, 0x20, 0x25, 0x32,</div><div class='add'>+0x25, 0x31, 0x20, 0xbae, 0xbb1, 0xbcd, 0xbb1, 0xbc1, 0xbae, 0xbcd, 0x20, 0x25, 0x32, 0x25, 0x31, 0x2c, 0x20, 0xc2e, 0xc30, 0xc3f,</div><div class='add'>+0xc2f, 0xc41, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0xc2e, 0xc30, 0xc3f, 0xc2f, 0xc41, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x25,</div><div class='add'>+0x32, 0x25, 0x31, 0x20, 0xe41, 0xe25, 0xe30, 0x25, 0x32, 0x25, 0x31, 0xe41, 0xe25, 0xe30, 0x25, 0x32, 0x25, 0x31, 0x20, 0x76,</div><div class='add'>+0x65, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x442, 0x430, 0x20, 0x25, 0x32, 0x25, 0x31, 0x20, 0x76, 0xe0, 0x20, 0x25, 0x32,</div><div class='add'>+0x25, 0x31, 0x20, 0x61, 0x74, 0x20, 0x25, 0x32</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const ushort date_format_data[] = {</div><div class='hunk'>@@ -830,2371 +899,1070 @@ static const ushort months_data[] = {</div><div class='ctx'> 0x6c, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x130, 0x79, 0x75,</div><div class='ctx'> 0x6e, 0x3b, 0x130, 0x79, 0x75, 0x6c, 0x3b, 0x41, 0x76, 0x71, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x6e, 0x74, 0x79, 0x61,</div><div class='ctx'> 0x62, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x4e, 0x6f, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x44, 0x65,</div><div class='del'>-0x6b, 0x61, 0x62, 0x72, 0x3b, 0x75, 0x72, 0x74, 0x3b, 0x6f, 0x74, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x69,</div><div class='del'>-0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x65, 0x6b, 0x61, 0x3b, 0x75, 0x7a, 0x74, 0x3b, 0x61, 0x62, 0x75, 0x3b, 0x69, 0x72, 0x61,</div><div class='del'>-0x3b, 0x75, 0x72, 0x72, 0x3b, 0x61, 0x7a, 0x61, 0x3b, 0x61, 0x62, 0x65, 0x3b, 0x75, 0x72, 0x74, 0x61, 0x72, 0x72, 0x69,</div><div class='del'>-0x6c, 0x61, 0x3b, 0x6f, 0x74, 0x73, 0x61, 0x69, 0x6c, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x78, 0x6f, 0x61, 0x3b, 0x61,</div><div class='del'>-0x70, 0x69, 0x72, 0x69, 0x6c, 0x61, 0x3b, 0x6d, 0x61, 0x69, 0x61, 0x74, 0x7a, 0x61, 0x3b, 0x65, 0x6b, 0x61, 0x69, 0x6e,</div><div class='del'>-0x61, 0x3b, 0x75, 0x7a, 0x74, 0x61, 0x69, 0x6c, 0x61, 0x3b, 0x61, 0x62, 0x75, 0x7a, 0x74, 0x75, 0x61, 0x3b, 0x69, 0x72,</div><div class='del'>-0x61, 0x69, 0x6c, 0x61, 0x3b, 0x75, 0x72, 0x72, 0x69, 0x61, 0x3b, 0x61, 0x7a, 0x61, 0x72, 0x6f, 0x61, 0x3b, 0x61, 0x62,</div><div class='del'>-0x65, 0x6e, 0x64, 0x75, 0x61, 0x3b, 0x55, 0x3b, 0x4f, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x55, 0x3b,</div><div class='del'>-0x41, 0x3b, 0x49, 0x3b, 0x55, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x9af, 0x9bc, 0x9be, 0x9b0, 0x9c0, 0x3b,</div><div class='del'>-0x9ab, 0x9c7, 0x9ac, 0x9cd, 0x9b0, 0x9c1, 0x9af, 0x9bc, 0x9be, 0x9b0, 0x9c0, 0x3b, 0x9ae, 0x9be, 0x9b0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa,</div><div class='del'>-0x9cd, 0x9b0, 0x9bf, 0x9b2, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997,</div><div class='del'>-0x9b8, 0x9cd, 0x99f, 0x3b, 0x9b8, 0x9c7, 0x9aa, 0x9cd, 0x99f, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb,</div><div class='del'>-0x9ac, 0x9b0, 0x3b, 0x9a8, 0x9ad, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x9a1, 0x9bf, 0x9b8, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b,</div><div class='del'>-0x99c, 0x9be, 0x3b, 0x9ab, 0x9c7, 0x3b, 0x9ae, 0x9be, 0x3b, 0x98f, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1,</div><div class='del'>-0x3b, 0x986, 0x3b, 0x9b8, 0x9c7, 0x3b, 0x985, 0x3b, 0x9a8, 0x3b, 0x9a1, 0x9bf, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf21, 0x3b, 0xf5f,</div><div class='del'>-0xfb3, 0xf0b, 0x20, 0xf22, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf23, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf24, 0x3b, 0xf5f, 0xfb3, 0xf0b,</div><div class='del'>-0x20, 0xf25, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf26, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf27, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf28,</div><div class='del'>-0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf29, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf21, 0xf20, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf21, 0xf21,</div><div class='del'>-0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf21, 0xf22, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf51, 0xf44, 0xf54,</div><div class='del'>-0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66,</div><div class='del'>-0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72,</div><div class='del'>-0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d,</div><div class='del'>-0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42,</div><div class='del'>-0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0xf0b,</div><div class='del'>-0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66,</div><div class='del'>-0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b,</div><div class='del'>-0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b,</div><div class='del'>-0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d,</div><div class='del'>-0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0x44f, 0x43d, 0x2e, 0x3b, 0x444, 0x435, 0x432,</div><div class='del'>-0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x44e, 0x43d, 0x438,</div><div class='del'>-0x3b, 0x44e, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e,</div><div class='del'>-0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x44f, 0x43d, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x444,</div><div class='del'>-0x435, 0x432, 0x440, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c,</div><div class='del'>-0x430, 0x439, 0x3b, 0x44e, 0x43d, 0x438, 0x3b, 0x44e, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435,</div><div class='del'>-0x43f, 0x442, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43d, 0x43e, 0x435,</div><div class='del'>-0x43c, 0x432, 0x440, 0x438, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x44f, 0x3b, 0x444, 0x3b, 0x43c, 0x3b,</div><div class='del'>-0x430, 0x3b, 0x43c, 0x3b, 0x44e, 0x3b, 0x44e, 0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x43e, 0x3b, 0x43d, 0x3b, 0x434, 0x3b, 0x1007, 0x1014,</div><div class='del'>-0x103a, 0x3b, 0x1016, 0x1031, 0x3b, 0x1019, 0x1010, 0x103a, 0x3b, 0x1027, 0x3b, 0x1019, 0x1031, 0x3b, 0x1007, 0x103d, 0x1014, 0x103a, 0x3b, 0x1007,</div><div class='del'>-0x1030, 0x3b, 0x1029, 0x3b, 0x1005, 0x1000, 0x103a, 0x3b, 0x1021, 0x1031, 0x102c, 0x1000, 0x103a, 0x3b, 0x1014, 0x102d, 0x102f, 0x3b, 0x1012, 0x102e,</div><div class='del'>-0x3b, 0x1007, 0x1014, 0x103a, 0x1014, 0x101d, 0x102b, 0x101b, 0x102e, 0x3b, 0x1016, 0x1031, 0x1016, 0x1031, 0x102c, 0x103a, 0x101d, 0x102b, 0x101b, 0x102e,</div><div class='del'>-0x3b, 0x1019, 0x1010, 0x103a, 0x3b, 0x1027, 0x1015, 0x103c, 0x102e, 0x3b, 0x1019, 0x1031, 0x3b, 0x1007, 0x103d, 0x1014, 0x103a, 0x3b, 0x1007, 0x1030,</div><div class='del'>-0x101c, 0x102d, 0x102f, 0x1004, 0x103a, 0x3b, 0x1029, 0x1002, 0x102f, 0x1010, 0x103a, 0x3b, 0x1005, 0x1000, 0x103a, 0x1010, 0x1004, 0x103a, 0x1018, 0x102c,</div><div class='del'>-0x3b, 0x1021, 0x1031, 0x102c, 0x1000, 0x103a, 0x1010, 0x102d, 0x102f, 0x1018, 0x102c, 0x3b, 0x1014, 0x102d, 0x102f, 0x101d, 0x1004, 0x103a, 0x1018, 0x102c,</div><div class='del'>-0x3b, 0x1012, 0x102e, 0x1007, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1007, 0x3b, 0x1016, 0x3b, 0x1019, 0x3b, 0x1027, 0x3b, 0x1019, 0x3b, 0x1007,</div><div class='del'>-0x3b, 0x1007, 0x3b, 0x1029, 0x3b, 0x1005, 0x3b, 0x1021, 0x3b, 0x1014, 0x3b, 0x1012, 0x3b, 0x441, 0x442, 0x443, 0x3b, 0x43b, 0x44e, 0x442,</div><div class='del'>-0x3b, 0x441, 0x430, 0x43a, 0x3b, 0x43a, 0x440, 0x430, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x447, 0x44d, 0x440, 0x3b, 0x43b, 0x456, 0x43f,</div><div class='del'>-0x3b, 0x436, 0x43d, 0x456, 0x3b, 0x432, 0x435, 0x440, 0x3b, 0x43a, 0x430, 0x441, 0x3b, 0x43b, 0x456, 0x441, 0x3b, 0x441, 0x43d, 0x435,</div><div class='del'>-0x3b, 0x441, 0x442, 0x443, 0x434, 0x437, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x44e, 0x442, 0x44b, 0x3b, 0x441, 0x430, 0x43a, 0x430, 0x432,</div><div class='del'>-0x456, 0x43a, 0x3b, 0x43a, 0x440, 0x430, 0x441, 0x430, 0x432, 0x456, 0x43a, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x447, 0x44d, 0x440, 0x432,</div><div class='del'>-0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x456, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x436, 0x43d, 0x456, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x432,</div><div class='del'>-0x435, 0x440, 0x430, 0x441, 0x435, 0x43d, 0x44c, 0x3b, 0x43a, 0x430, 0x441, 0x442, 0x440, 0x44b, 0x447, 0x43d, 0x456, 0x43a, 0x3b, 0x43b,</div><div class='del'>-0x456, 0x441, 0x442, 0x430, 0x43f, 0x430, 0x434, 0x3b, 0x441, 0x43d, 0x435, 0x436, 0x430, 0x43d, 0x44c, 0x3b, 0x441, 0x3b, 0x43b, 0x3b,</div><div class='del'>-0x441, 0x3b, 0x43a, 0x3b, 0x442, 0x3b, 0x447, 0x3b, 0x43b, 0x3b, 0x436, 0x3b, 0x432, 0x3b, 0x43a, 0x3b, 0x43b, 0x3b, 0x441, 0x3b,</div><div class='del'>-0x17e1, 0x3b, 0x17e2, 0x3b, 0x17e3, 0x3b, 0x17e4, 0x3b, 0x17e5, 0x3b, 0x17e6, 0x3b, 0x17e7, 0x3b, 0x17e8, 0x3b, 0x17e9, 0x3b, 0x17e1, 0x17e0,</div><div class='del'>-0x3b, 0x17e1, 0x17e1, 0x3b, 0x17e1, 0x17e2, 0x3b, 0x1798, 0x1780, 0x179a, 0x17b6, 0x3b, 0x1780, 0x17bb, 0x1798, 0x17d2, 0x1797, 0x17c8, 0x3b, 0x1798,</div><div class='del'>-0x17b7, 0x1793, 0x17b6, 0x3b, 0x1798, 0x17c1, 0x179f, 0x17b6, 0x3b, 0x17a7, 0x179f, 0x1797, 0x17b6, 0x3b, 0x1798, 0x17b7, 0x1790, 0x17bb, 0x1793, 0x17b6,</div><div class='del'>-0x3b, 0x1780, 0x1780, 0x17d2, 0x1780, 0x178a, 0x17b6, 0x3b, 0x179f, 0x17b8, 0x17a0, 0x17b6, 0x3b, 0x1780, 0x1789, 0x17d2, 0x1789, 0x17b6, 0x3b, 0x178f,</div><div class='del'>-0x17bb, 0x179b, 0x17b6, 0x3b, 0x179c, 0x17b7, 0x1785, 0x17d2, 0x1786, 0x17b7, 0x1780, 0x17b6, 0x3b, 0x1792, 0x17d2, 0x1793, 0x17bc, 0x3b, 0x64, 0x65,</div><div class='del'>-0x20, 0x67, 0x65, 0x6e, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61,</div><div class='del'>-0x72, 0xe7, 0x3b, 0x64, 0x2019, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x64, 0x65,</div><div class='del'>-0x20, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x64, 0x2019, 0x61, 0x67, 0x2e, 0x3b,</div><div class='del'>-0x64, 0x65, 0x20, 0x73, 0x65, 0x74, 0x2e, 0x3b, 0x64, 0x2019, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x6e, 0x6f,</div><div class='del'>-0x76, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x3b,</div><div class='del'>-0x64, 0x65, 0x20, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x64, 0x2019,</div><div class='del'>-0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6e,</div><div class='del'>-0x79, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x6c, 0x3b, 0x64, 0x2019, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x3b,</div><div class='del'>-0x64, 0x65, 0x20, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x2019, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72,</div><div class='del'>-0x65, 0x3b, 0x64, 0x65, 0x20, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x20, 0x64, 0x65, 0x73,</div><div class='del'>-0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x47, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b,</div><div class='del'>-0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x31, 0x6708, 0x3b, 0x32, 0x6708, 0x3b, 0x33, 0x6708, 0x3b, 0x34,</div><div class='del'>-0x6708, 0x3b, 0x35, 0x6708, 0x3b, 0x36, 0x6708, 0x3b, 0x37, 0x6708, 0x3b, 0x38, 0x6708, 0x3b, 0x39, 0x6708, 0x3b, 0x31, 0x30, 0x6708,</div><div class='del'>-0x3b, 0x31, 0x31, 0x6708, 0x3b, 0x31, 0x32, 0x6708, 0x3b, 0x73, 0x69, 0x6a, 0x3b, 0x76, 0x65, 0x6c, 0x6a, 0x3b, 0x6f, 0x17e,</div><div class='del'>-0x75, 0x3b, 0x74, 0x72, 0x61, 0x3b, 0x73, 0x76, 0x69, 0x3b, 0x6c, 0x69, 0x70, 0x3b, 0x73, 0x72, 0x70, 0x3b, 0x6b, 0x6f,</div><div class='del'>-0x6c, 0x3b, 0x72, 0x75, 0x6a, 0x3b, 0x6c, 0x69, 0x73, 0x3b, 0x73, 0x74, 0x75, 0x3b, 0x70, 0x72, 0x6f, 0x3b, 0x73, 0x69,</div><div class='del'>-0x6a, 0x65, 0x10d, 0x6e, 0x6a, 0x61, 0x3b, 0x76, 0x65, 0x6c, 0x6a, 0x61, 0x10d, 0x65, 0x3b, 0x6f, 0x17e, 0x75, 0x6a, 0x6b,</div><div class='del'>-0x61, 0x3b, 0x74, 0x72, 0x61, 0x76, 0x6e, 0x6a, 0x61, 0x3b, 0x73, 0x76, 0x69, 0x62, 0x6e, 0x6a, 0x61, 0x3b, 0x6c, 0x69,</div><div class='del'>-0x70, 0x6e, 0x6a, 0x61, 0x3b, 0x73, 0x72, 0x70, 0x6e, 0x6a, 0x61, 0x3b, 0x6b, 0x6f, 0x6c, 0x6f, 0x76, 0x6f, 0x7a, 0x61,</div><div class='del'>-0x3b, 0x72, 0x75, 0x6a, 0x6e, 0x61, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x61, 0x3b, 0x73, 0x74, 0x75,</div><div class='del'>-0x64, 0x65, 0x6e, 0x6f, 0x67, 0x61, 0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e, 0x63, 0x61, 0x3b, 0x31, 0x2e, 0x3b, 0x32,</div><div class='del'>-0x2e, 0x3b, 0x33, 0x2e, 0x3b, 0x34, 0x2e, 0x3b, 0x35, 0x2e, 0x3b, 0x36, 0x2e, 0x3b, 0x37, 0x2e, 0x3b, 0x38, 0x2e, 0x3b,</div><div class='del'>-0x39, 0x2e, 0x3b, 0x31, 0x30, 0x2e, 0x3b, 0x31, 0x31, 0x2e, 0x3b, 0x31, 0x32, 0x2e, 0x3b, 0x6c, 0x65, 0x64, 0x6e, 0x61,</div><div class='del'>-0x3b, 0xfa, 0x6e, 0x6f, 0x72, 0x61, 0x3b, 0x62, 0x159, 0x65, 0x7a, 0x6e, 0x61, 0x3b, 0x64, 0x75, 0x62, 0x6e, 0x61, 0x3b,</div><div class='del'>-0x6b, 0x76, 0x11b, 0x74, 0x6e, 0x61, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x6e, 0x61, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x65, 0x6e,</div><div class='del'>-0x63, 0x65, 0x3b, 0x73, 0x72, 0x70, 0x6e, 0x61, 0x3b, 0x7a, 0xe1, 0x159, 0xed, 0x3b, 0x159, 0xed, 0x6a, 0x6e, 0x61, 0x3b,</div><div class='del'>-0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x75, 0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x3b, 0x6c,</div><div class='del'>-0x3b, 0xfa, 0x3b, 0x62, 0x3b, 0x64, 0x3b, 0x6b, 0x3b, 0x10d, 0x3b, 0x10d, 0x3b, 0x73, 0x3b, 0x7a, 0x3b, 0x159, 0x3b, 0x6c,</div><div class='del'>-0x3b, 0x70, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70,</div><div class='del'>-0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67,</div><div class='add'>+0x6b, 0x61, 0x62, 0x72, 0x3b, 0x458, 0x430, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b, 0x43c,</div><div class='add'>+0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x458, 0x443, 0x43d, 0x3b, 0x438,</div><div class='add'>+0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x458, 0x430, 0x431, 0x440, 0x3b,</div><div class='add'>+0x43e, 0x43a, 0x442, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x43d, 0x43e, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431,</div><div class='add'>+0x440, 0x3b, 0x75, 0x72, 0x74, 0x3b, 0x6f, 0x74, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x69, 0x3b, 0x6d, 0x61,</div><div class='add'>+0x69, 0x3b, 0x65, 0x6b, 0x61, 0x3b, 0x75, 0x7a, 0x74, 0x3b, 0x61, 0x62, 0x75, 0x3b, 0x69, 0x72, 0x61, 0x3b, 0x75, 0x72,</div><div class='add'>+0x72, 0x3b, 0x61, 0x7a, 0x61, 0x3b, 0x61, 0x62, 0x65, 0x3b, 0x75, 0x72, 0x74, 0x61, 0x72, 0x72, 0x69, 0x6c, 0x61, 0x3b,</div><div class='add'>+0x6f, 0x74, 0x73, 0x61, 0x69, 0x6c, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x78, 0x6f, 0x61, 0x3b, 0x61, 0x70, 0x69, 0x72,</div><div class='add'>+0x69, 0x6c, 0x61, 0x3b, 0x6d, 0x61, 0x69, 0x61, 0x74, 0x7a, 0x61, 0x3b, 0x65, 0x6b, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x75,</div><div class='add'>+0x7a, 0x74, 0x61, 0x69, 0x6c, 0x61, 0x3b, 0x61, 0x62, 0x75, 0x7a, 0x74, 0x75, 0x61, 0x3b, 0x69, 0x72, 0x61, 0x69, 0x6c,</div><div class='add'>+0x61, 0x3b, 0x75, 0x72, 0x72, 0x69, 0x61, 0x3b, 0x61, 0x7a, 0x61, 0x72, 0x6f, 0x61, 0x3b, 0x61, 0x62, 0x65, 0x6e, 0x64,</div><div class='add'>+0x75, 0x61, 0x3b, 0x55, 0x3b, 0x4f, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x55, 0x3b, 0x41, 0x3b, 0x49,</div><div class='add'>+0x3b, 0x55, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x9af, 0x9bc, 0x9be, 0x9b0, 0x9c0, 0x3b, 0x9ab, 0x9c7, 0x9ac,</div><div class='add'>+0x9cd, 0x9b0, 0x9c1, 0x9af, 0x9bc, 0x9be, 0x9b0, 0x9c0, 0x3b, 0x9ae, 0x9be, 0x9b0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9b0, 0x9bf,</div><div class='add'>+0x9b2, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997, 0x9b8, 0x9cd, 0x99f,</div><div class='add'>+0x3b, 0x9b8, 0x9c7, 0x9aa, 0x9cd, 0x99f, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb, 0x9ac, 0x9b0, 0x3b,</div><div class='add'>+0x9a8, 0x9ad, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x9a1, 0x9bf, 0x9b8, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x99c, 0x9be, 0x3b,</div><div class='add'>+0x9ab, 0x9c7, 0x3b, 0x9ae, 0x9be, 0x3b, 0x98f, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x3b, 0x986, 0x3b,</div><div class='add'>+0x9b8, 0x9c7, 0x3b, 0x985, 0x3b, 0x9a8, 0x3b, 0x9a1, 0x9bf, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf21, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20,</div><div class='add'>+0xf22, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf23, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf24, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf25, 0x3b,</div><div class='add'>+0xf5f, 0xfb3, 0xf0b, 0x20, 0xf26, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf27, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf28, 0x3b, 0xf5f, 0xfb3,</div><div class='add'>+0xf0b, 0x20, 0xf29, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf21, 0xf20, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf21, 0xf21, 0x3b, 0xf5f, 0xfb3,</div><div class='add'>+0xf0b, 0x20, 0xf21, 0xf22, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf51, 0xf44, 0xf54, 0xf0b, 0x3b, 0xf66,</div><div class='add'>+0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72,</div><div class='add'>+0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3,</div><div class='add'>+0xf5d, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf63, 0xf94,</div><div class='add'>+0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0xf0b,</div><div class='add'>+0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4,</div><div class='add'>+0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72,</div><div class='add'>+0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d,</div><div class='add'>+0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf56, 0xf45, 0xf74,</div><div class='add'>+0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf56, 0xf45,</div><div class='add'>+0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0x44f, 0x43d, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x2e, 0x3b,</div><div class='add'>+0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x44e, 0x43d, 0x438, 0x3b, 0x44e, 0x43b,</div><div class='add'>+0x438, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e,</div><div class='add'>+0x435, 0x43c, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x44f, 0x43d, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x444, 0x435, 0x432, 0x440,</div><div class='add'>+0x443, 0x430, 0x440, 0x438, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x439, 0x3b,</div><div class='add'>+0x44e, 0x43d, 0x438, 0x3b, 0x44e, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435,</div><div class='add'>+0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x432, 0x440,</div><div class='add'>+0x438, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x44f, 0x3b, 0x444, 0x3b, 0x43c, 0x3b, 0x430, 0x3b, 0x43c,</div><div class='add'>+0x3b, 0x44e, 0x3b, 0x44e, 0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x43e, 0x3b, 0x43d, 0x3b, 0x434, 0x3b, 0x1007, 0x1014, 0x103a, 0x3b, 0x1016,</div><div class='add'>+0x1031, 0x3b, 0x1019, 0x1010, 0x103a, 0x3b, 0x1027, 0x3b, 0x1019, 0x1031, 0x3b, 0x1007, 0x103d, 0x1014, 0x103a, 0x3b, 0x1007, 0x1030, 0x3b, 0x1029,</div><div class='add'>+0x3b, 0x1005, 0x1000, 0x103a, 0x3b, 0x1021, 0x1031, 0x102c, 0x1000, 0x103a, 0x3b, 0x1014, 0x102d, 0x102f, 0x3b, 0x1012, 0x102e, 0x3b, 0x1007, 0x1014,</div><div class='add'>+0x103a, 0x1014, 0x101d, 0x102b, 0x101b, 0x102e, 0x3b, 0x1016, 0x1031, 0x1016, 0x1031, 0x102c, 0x103a, 0x101d, 0x102b, 0x101b, 0x102e, 0x3b, 0x1019, 0x1010,</div><div class='add'>+0x103a, 0x3b, 0x1027, 0x1015, 0x103c, 0x102e, 0x3b, 0x1019, 0x1031, 0x3b, 0x1007, 0x103d, 0x1014, 0x103a, 0x3b, 0x1007, 0x1030, 0x101c, 0x102d, 0x102f,</div><div class='add'>+0x1004, 0x103a, 0x3b, 0x1029, 0x1002, 0x102f, 0x1010, 0x103a, 0x3b, 0x1005, 0x1000, 0x103a, 0x1010, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1021, 0x1031,</div><div class='add'>+0x102c, 0x1000, 0x103a, 0x1010, 0x102d, 0x102f, 0x1018, 0x102c, 0x3b, 0x1014, 0x102d, 0x102f, 0x101d, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1012, 0x102e,</div><div class='add'>+0x1007, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1007, 0x3b, 0x1016, 0x3b, 0x1019, 0x3b, 0x1027, 0x3b, 0x1019, 0x3b, 0x1007, 0x3b, 0x1007, 0x3b,</div><div class='add'>+0x1029, 0x3b, 0x1005, 0x3b, 0x1021, 0x3b, 0x1014, 0x3b, 0x1012, 0x3b, 0x441, 0x442, 0x443, 0x3b, 0x43b, 0x44e, 0x442, 0x3b, 0x441, 0x430,</div><div class='add'>+0x43a, 0x3b, 0x43a, 0x440, 0x430, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x447, 0x44d, 0x440, 0x3b, 0x43b, 0x456, 0x43f, 0x3b, 0x436, 0x43d,</div><div class='add'>+0x456, 0x3b, 0x432, 0x435, 0x440, 0x3b, 0x43a, 0x430, 0x441, 0x3b, 0x43b, 0x456, 0x441, 0x3b, 0x441, 0x43d, 0x435, 0x3b, 0x441, 0x442,</div><div class='add'>+0x443, 0x434, 0x437, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x44e, 0x442, 0x44b, 0x3b, 0x441, 0x430, 0x43a, 0x430, 0x432, 0x456, 0x43a, 0x3b,</div><div class='add'>+0x43a, 0x440, 0x430, 0x441, 0x430, 0x432, 0x456, 0x43a, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x447, 0x44d, 0x440, 0x432, 0x435, 0x43d, 0x44c,</div><div class='add'>+0x3b, 0x43b, 0x456, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x436, 0x43d, 0x456, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x432, 0x435, 0x440, 0x430,</div><div class='add'>+0x441, 0x435, 0x43d, 0x44c, 0x3b, 0x43a, 0x430, 0x441, 0x442, 0x440, 0x44b, 0x447, 0x43d, 0x456, 0x43a, 0x3b, 0x43b, 0x456, 0x441, 0x442,</div><div class='add'>+0x430, 0x43f, 0x430, 0x434, 0x3b, 0x441, 0x43d, 0x435, 0x436, 0x430, 0x43d, 0x44c, 0x3b, 0x441, 0x3b, 0x43b, 0x3b, 0x441, 0x3b, 0x43a,</div><div class='add'>+0x3b, 0x442, 0x3b, 0x447, 0x3b, 0x43b, 0x3b, 0x436, 0x3b, 0x432, 0x3b, 0x43a, 0x3b, 0x43b, 0x3b, 0x441, 0x3b, 0x17e1, 0x3b, 0x17e2,</div><div class='add'>+0x3b, 0x17e3, 0x3b, 0x17e4, 0x3b, 0x17e5, 0x3b, 0x17e6, 0x3b, 0x17e7, 0x3b, 0x17e8, 0x3b, 0x17e9, 0x3b, 0x17e1, 0x17e0, 0x3b, 0x17e1, 0x17e1,</div><div class='add'>+0x3b, 0x17e1, 0x17e2, 0x3b, 0x1798, 0x1780, 0x179a, 0x17b6, 0x3b, 0x1780, 0x17bb, 0x1798, 0x17d2, 0x1797, 0x17c8, 0x3b, 0x1798, 0x17b7, 0x1793, 0x17b6,</div><div class='add'>+0x3b, 0x1798, 0x17c1, 0x179f, 0x17b6, 0x3b, 0x17a7, 0x179f, 0x1797, 0x17b6, 0x3b, 0x1798, 0x17b7, 0x1790, 0x17bb, 0x1793, 0x17b6, 0x3b, 0x1780, 0x1780,</div><div class='add'>+0x17d2, 0x1780, 0x178a, 0x17b6, 0x3b, 0x179f, 0x17b8, 0x17a0, 0x17b6, 0x3b, 0x1780, 0x1789, 0x17d2, 0x1789, 0x17b6, 0x3b, 0x178f, 0x17bb, 0x179b, 0x17b6,</div><div class='add'>+0x3b, 0x179c, 0x17b7, 0x1785, 0x17d2, 0x1786, 0x17b7, 0x1780, 0x17b6, 0x3b, 0x1792, 0x17d2, 0x1793, 0x17bc, 0x3b, 0x64, 0x65, 0x20, 0x67, 0x65,</div><div class='add'>+0x6e, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x72, 0xe7, 0x3b,</div><div class='add'>+0x64, 0x2019, 0x61, 0x62, 0x72, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75,</div><div class='add'>+0x6e, 0x79, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x64, 0x2019, 0x61, 0x67, 0x2e, 0x3b, 0x64, 0x65, 0x20,</div><div class='add'>+0x73, 0x65, 0x74, 0x2e, 0x3b, 0x64, 0x2019, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x6e, 0x6f, 0x76, 0x2e, 0x3b,</div><div class='add'>+0x64, 0x65, 0x20, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x64, 0x65, 0x20, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x20,</div><div class='add'>+0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x64, 0x2019, 0x61, 0x62, 0x72,</div><div class='add'>+0x69, 0x6c, 0x3b, 0x64, 0x65, 0x20, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x64, 0x65, 0x20, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x64,</div><div class='add'>+0x65, 0x20, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x6c, 0x3b, 0x64, 0x2019, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x64, 0x65, 0x20,</div><div class='add'>+0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x2019, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x64,</div><div class='add'>+0x65, 0x20, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x20, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62,</div><div class='add'>+0x72, 0x65, 0x3b, 0x47, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53,</div><div class='add'>+0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x31, 0x6708, 0x3b, 0x32, 0x6708, 0x3b, 0x33, 0x6708, 0x3b, 0x34, 0x6708, 0x3b, 0x35,</div><div class='add'>+0x6708, 0x3b, 0x36, 0x6708, 0x3b, 0x37, 0x6708, 0x3b, 0x38, 0x6708, 0x3b, 0x39, 0x6708, 0x3b, 0x31, 0x30, 0x6708, 0x3b, 0x31, 0x31,</div><div class='add'>+0x6708, 0x3b, 0x31, 0x32, 0x6708, 0x3b, 0x73, 0x69, 0x6a, 0x3b, 0x76, 0x65, 0x6c, 0x6a, 0x3b, 0x6f, 0x17e, 0x75, 0x3b, 0x74,</div><div class='add'>+0x72, 0x61, 0x3b, 0x73, 0x76, 0x69, 0x3b, 0x6c, 0x69, 0x70, 0x3b, 0x73, 0x72, 0x70, 0x3b, 0x6b, 0x6f, 0x6c, 0x3b, 0x72,</div><div class='add'>+0x75, 0x6a, 0x3b, 0x6c, 0x69, 0x73, 0x3b, 0x73, 0x74, 0x75, 0x3b, 0x70, 0x72, 0x6f, 0x3b, 0x73, 0x69, 0x6a, 0x65, 0x10d,</div><div class='add'>+0x6e, 0x6a, 0x61, 0x3b, 0x76, 0x65, 0x6c, 0x6a, 0x61, 0x10d, 0x65, 0x3b, 0x6f, 0x17e, 0x75, 0x6a, 0x6b, 0x61, 0x3b, 0x74,</div><div class='add'>+0x72, 0x61, 0x76, 0x6e, 0x6a, 0x61, 0x3b, 0x73, 0x76, 0x69, 0x62, 0x6e, 0x6a, 0x61, 0x3b, 0x6c, 0x69, 0x70, 0x6e, 0x6a,</div><div class='add'>+0x61, 0x3b, 0x73, 0x72, 0x70, 0x6e, 0x6a, 0x61, 0x3b, 0x6b, 0x6f, 0x6c, 0x6f, 0x76, 0x6f, 0x7a, 0x61, 0x3b, 0x72, 0x75,</div><div class='add'>+0x6a, 0x6e, 0x61, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x61, 0x3b, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e,</div><div class='add'>+0x6f, 0x67, 0x61, 0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e, 0x63, 0x61, 0x3b, 0x31, 0x2e, 0x3b, 0x32, 0x2e, 0x3b, 0x33,</div><div class='add'>+0x2e, 0x3b, 0x34, 0x2e, 0x3b, 0x35, 0x2e, 0x3b, 0x36, 0x2e, 0x3b, 0x37, 0x2e, 0x3b, 0x38, 0x2e, 0x3b, 0x39, 0x2e, 0x3b,</div><div class='add'>+0x31, 0x30, 0x2e, 0x3b, 0x31, 0x31, 0x2e, 0x3b, 0x31, 0x32, 0x2e, 0x3b, 0x6c, 0x65, 0x64, 0x6e, 0x61, 0x3b, 0xfa, 0x6e,</div><div class='add'>+0x6f, 0x72, 0x61, 0x3b, 0x62, 0x159, 0x65, 0x7a, 0x6e, 0x61, 0x3b, 0x64, 0x75, 0x62, 0x6e, 0x61, 0x3b, 0x6b, 0x76, 0x11b,</div><div class='add'>+0x74, 0x6e, 0x61, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x6e, 0x61, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x65, 0x6e, 0x63, 0x65, 0x3b,</div><div class='add'>+0x73, 0x72, 0x70, 0x6e, 0x61, 0x3b, 0x7a, 0xe1, 0x159, 0xed, 0x3b, 0x159, 0xed, 0x6a, 0x6e, 0x61, 0x3b, 0x6c, 0x69, 0x73,</div><div class='add'>+0x74, 0x6f, 0x70, 0x61, 0x64, 0x75, 0x3b, 0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x3b, 0x6c, 0x3b, 0xfa, 0x3b,</div><div class='add'>+0x62, 0x3b, 0x64, 0x3b, 0x6b, 0x3b, 0x10d, 0x3b, 0x10d, 0x3b, 0x73, 0x3b, 0x7a, 0x3b, 0x159, 0x3b, 0x6c, 0x3b, 0x70, 0x3b,</div><div class='add'>+0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73,</div><div class='add'>+0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a,</div><div class='add'>+0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b,</div><div class='add'>+0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b,</div><div class='add'>+0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74,</div><div class='add'>+0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62,</div><div class='add'>+0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x72, 0x74, 0x2e, 0x3b, 0x61, 0x70,</div><div class='add'>+0x72, 0x2e, 0x3b, 0x6d, 0x65, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67,</div><div class='ctx'> 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63,</div><div class='del'>-0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72,</div><div class='del'>-0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75,</div><div class='del'>-0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,</div><div class='del'>-0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63,</div><div class='del'>-0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x72, 0x74, 0x2e,</div><div class='del'>-0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x65, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x2e, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b,</div><div class='del'>-0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b,</div><div class='del'>-0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72,</div><div class='del'>-0x69, 0x3b, 0x6d, 0x61, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x65, 0x69, 0x3b, 0x6a, 0x75,</div><div class='del'>-0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b, 0x73, 0x65, 0x70,</div><div class='del'>-0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d,</div><div class='del'>-0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x61, 0x6e, 0x3b, 0x76, 0x65,</div><div class='del'>-0x65, 0x62, 0x72, 0x3b, 0x6d, 0xe4, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75,</div><div class='del'>-0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x3b, 0x6f,</div><div class='del'>-0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x74, 0x73, 0x3b, 0x6a, 0x61, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b,</div><div class='del'>-0x76, 0x65, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0xe4, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c,</div><div class='del'>-0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75,</div><div class='del'>-0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x6f,</div><div class='del'>-0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x74, 0x73, 0x65, 0x6d, 0x62,</div><div class='del'>-0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x56, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53,</div><div class='del'>-0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61,</div><div class='del'>-0x70, 0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73,</div><div class='del'>-0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x73, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61,</div><div class='del'>-0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c,</div><div class='del'>-0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73,</div><div class='del'>-0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b,</div><div class='del'>-0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x74, 0x61,</div><div class='del'>-0x6d, 0x6d, 0x69, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x68, 0x65, 0x6c, 0x6d, 0x69, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b,</div><div class='del'>-0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x68, 0x75, 0x68, 0x74, 0x69, 0x6b, 0x75, 0x75,</div><div class='del'>-0x74, 0x61, 0x3b, 0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x6b, 0x75,</div><div class='del'>-0x75, 0x74, 0x61, 0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x65, 0x6c, 0x6f, 0x6b, 0x75,</div><div class='del'>-0x75, 0x74, 0x61, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x6b, 0x75,</div><div class='del'>-0x75, 0x74, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6a, 0x6f, 0x75, 0x6c,</div><div class='del'>-0x75, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x54, 0x3b, 0x48, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x48,</div><div class='del'>-0x3b, 0x45, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x2e, 0x3b, 0x66, 0xe9, 0x76,</div><div class='del'>-0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x69,</div><div class='del'>-0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x2e, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f,</div><div class='del'>-0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0xe9, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x69, 0x65,</div><div class='del'>-0x72, 0x3b, 0x66, 0xe9, 0x76, 0x72, 0x69, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x6c,</div><div class='del'>-0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x69, 0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x6c, 0x65, 0x74, 0x3b, 0x61, 0x6f,</div><div class='del'>-0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x62, 0x72, 0x65,</div><div class='del'>-0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0xe9, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x58,</div><div class='del'>-0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x58,</div><div class='del'>-0x75, 0xf1, 0x3b, 0x58, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x75, 0x74, 0x3b, 0x4e,</div><div class='del'>-0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x58, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x65,</div><div class='del'>-0x69, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f,</div><div class='del'>-0x3b, 0x58, 0x75, 0xf1, 0x6f, 0x3b, 0x58, 0x75, 0x6c, 0x6c, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53,</div><div class='del'>-0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x4f, 0x75, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65,</div><div class='del'>-0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x58, 0x3b, 0x46, 0x3b, 0x4d, 0x3b,</div><div class='del'>-0x41, 0x3b, 0x4d, 0x3b, 0x58, 0x3b, 0x58, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x10d8, 0x10d0,</div><div class='del'>-0x10dc, 0x3b, 0x10d7, 0x10d4, 0x10d1, 0x3b, 0x10db, 0x10d0, 0x10e0, 0x3b, 0x10d0, 0x10de, 0x10e0, 0x3b, 0x10db, 0x10d0, 0x10d8, 0x3b, 0x10d8, 0x10d5,</div><div class='del'>-0x10dc, 0x3b, 0x10d8, 0x10d5, 0x10da, 0x3b, 0x10d0, 0x10d2, 0x10d5, 0x3b, 0x10e1, 0x10d4, 0x10e5, 0x3b, 0x10dd, 0x10e5, 0x10e2, 0x3b, 0x10dc, 0x10dd,</div><div class='del'>-0x10d4, 0x3b, 0x10d3, 0x10d4, 0x10d9, 0x3b, 0x10d8, 0x10d0, 0x10dc, 0x10d5, 0x10d0, 0x10e0, 0x10d8, 0x3b, 0x10d7, 0x10d4, 0x10d1, 0x10d4, 0x10e0, 0x10d5,</div><div class='del'>-0x10d0, 0x10da, 0x10d8, 0x3b, 0x10db, 0x10d0, 0x10e0, 0x10e2, 0x10d8, 0x3b, 0x10d0, 0x10de, 0x10e0, 0x10d8, 0x10da, 0x10d8, 0x3b, 0x10db, 0x10d0, 0x10d8,</div><div class='del'>-0x10e1, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10dc, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10da, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d0, 0x10d2, 0x10d5,</div><div class='del'>-0x10d8, 0x10e1, 0x10e2, 0x10dd, 0x3b, 0x10e1, 0x10d4, 0x10e5, 0x10e2, 0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10dd, 0x10e5, 0x10e2, 0x10dd,</div><div class='del'>-0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10dc, 0x10dd, 0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10d3, 0x10d4, 0x10d9, 0x10d4, 0x10db,</div><div class='del'>-0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10d8, 0x3b, 0x10d7, 0x3b, 0x10db, 0x3b, 0x10d0, 0x3b, 0x10db, 0x3b, 0x10d8, 0x3b, 0x10d8, 0x3b, 0x10d0,</div><div class='del'>-0x3b, 0x10e1, 0x3b, 0x10dd, 0x3b, 0x10dc, 0x3b, 0x10d3, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0xe4, 0x72,</div><div class='del'>-0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67,</div><div class='del'>-0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a, 0x61, 0x6e,</div><div class='del'>-0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72,</div><div class='del'>-0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67,</div><div class='del'>-0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65,</div><div class='del'>-0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,</div><div class='del'>-0x4a, 0xe4, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0xe4, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b,</div><div class='del'>-0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b,</div><div class='del'>-0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a, 0xe4, 0x6e, 0x6e, 0x65, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75,</div><div class='del'>-0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75,</div><div class='del'>-0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65,</div><div class='del'>-0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65,</div><div class='del'>-0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x399, 0x3b1, 0x3bd, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3b, 0x39c,</div><div class='del'>-0x3b1, 0x3c1, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3b, 0x39c, 0x3b1, 0x3ca, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bd, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bb,</div><div class='del'>-0x3b, 0x391, 0x3c5, 0x3b3, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3b, 0x39d, 0x3bf, 0x3b5, 0x3b, 0x394, 0x3b5, 0x3ba,</div><div class='del'>-0x3b, 0x399, 0x3b1, 0x3bd, 0x3bf, 0x3c5, 0x3b1, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3c1, 0x3bf, 0x3c5, 0x3b1, 0x3c1,</div><div class='del'>-0x3af, 0x3bf, 0x3c5, 0x3b, 0x39c, 0x3b1, 0x3c1, 0x3c4, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3b9, 0x3bb, 0x3af, 0x3bf, 0x3c5,</div><div class='del'>-0x3b, 0x39c, 0x3b1, 0x390, 0x3bf, 0x3c5, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bd, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bb, 0x3af,</div><div class='del'>-0x3bf, 0x3c5, 0x3b, 0x391, 0x3c5, 0x3b3, 0x3bf, 0x3cd, 0x3c3, 0x3c4, 0x3bf, 0x3c5, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3c4, 0x3b5, 0x3bc, 0x3b2,</div><div class='del'>-0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3c9, 0x3b2, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39d, 0x3bf, 0x3b5, 0x3bc, 0x3b2,</div><div class='del'>-0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x394, 0x3b5, 0x3ba, 0x3b5, 0x3bc, 0x3b2, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x399, 0x3b, 0x3a6, 0x3b,</div><div class='del'>-0x39c, 0x3b, 0x391, 0x3b, 0x39c, 0x3b, 0x399, 0x3b, 0x399, 0x3b, 0x391, 0x3b, 0x3a3, 0x3b, 0x39f, 0x3b, 0x39d, 0x3b, 0x394, 0x3b,</div><div class='del'>-0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b,</div><div class='del'>-0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b,</div><div class='del'>-0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62, 0x72,</div><div class='del'>-0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x69, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x3b, 0x6d,</div><div class='del'>-0x61, 0x6a, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74,</div><div class='del'>-0x75, 0x73, 0x69, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x69, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62,</div><div class='del'>-0x65, 0x72, 0x69, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x69, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62,</div><div class='del'>-0x65, 0x72, 0x69, 0x3b, 0xa9c, 0xabe, 0xaa8, 0xacd, 0xaaf, 0xac1, 0x3b, 0xaab, 0xac7, 0xaac, 0xacd, 0xab0, 0xac1, 0x3b, 0xaae, 0xabe,</div><div class='del'>-0xab0, 0xacd, 0xa9a, 0x3b, 0xa8f, 0xaaa, 0xacd, 0xab0, 0xabf, 0xab2, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0xaa8, 0x3b, 0xa9c, 0xac1,</div><div class='del'>-0xab2, 0xabe, 0xa88, 0x3b, 0xa91, 0xa97, 0xab8, 0xacd, 0xa9f, 0x3b, 0xab8, 0xaaa, 0xacd, 0xa9f, 0xac7, 0x3b, 0xa91, 0xa95, 0xacd, 0xa9f,</div><div class='del'>-0xacb, 0x3b, 0xaa8, 0xab5, 0xac7, 0x3b, 0xaa1, 0xabf, 0xab8, 0xac7, 0x3b, 0xa9c, 0xabe, 0xaa8, 0xacd, 0xaaf, 0xac1, 0xa86, 0xab0, 0xac0,</div><div class='del'>-0x3b, 0xaab, 0xac7, 0xaac, 0xacd, 0xab0, 0xac1, 0xa86, 0xab0, 0xac0, 0x3b, 0xaae, 0xabe, 0xab0, 0xacd, 0xa9a, 0x3b, 0xa8f, 0xaaa, 0xacd,</div><div class='del'>-0xab0, 0xabf, 0xab2, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0xaa8, 0x3b, 0xa9c, 0xac1, 0xab2, 0xabe, 0xa88, 0x3b, 0xa91, 0xa97, 0xab8,</div><div class='del'>-0xacd, 0xa9f, 0x3b, 0xab8, 0xaaa, 0xacd, 0xa9f, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xa91, 0xa95, 0xacd, 0xa9f, 0xacd, 0xaac, 0xab0,</div><div class='del'>-0x3b, 0xaa8, 0xab5, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xaa1, 0xabf, 0xab8, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xa9c, 0xabe,</div><div class='del'>-0x3b, 0xaab, 0xac7, 0x3b, 0xaae, 0xabe, 0x3b, 0xa8f, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0x3b, 0xa9c, 0xac1, 0x3b, 0xa91, 0x3b,</div><div class='del'>-0xab8, 0x3b, 0xa91, 0x3b, 0xaa8, 0x3b, 0xaa1, 0xabf, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x61, 0x62, 0x3b, 0x4d, 0x61, 0x72,</div><div class='del'>-0x3b, 0x41, 0x66, 0x69, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x75,</div><div class='del'>-0x3b, 0x53, 0x61, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x75, 0x77, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e,</div><div class='del'>-0x61, 0x69, 0x72, 0x75, 0x3b, 0x46, 0x61, 0x62, 0x75, 0x72, 0x61, 0x69, 0x72, 0x75, 0x3b, 0x4d, 0x61, 0x72, 0x69, 0x73,</div><div class='del'>-0x3b, 0x41, 0x66, 0x69, 0x72, 0x69, 0x6c, 0x75, 0x3b, 0x4d, 0x61, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6e, 0x69, 0x3b, 0x59,</div><div class='del'>-0x75, 0x6c, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x53, 0x61, 0x74, 0x75, 0x6d, 0x62, 0x61, 0x3b, 0x4f,</div><div class='del'>-0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x75, 0x77, 0x61, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x61, 0x6d, 0x62,</div><div class='del'>-0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x41, 0x3b, 0x53, 0x3b,</div><div class='del'>-0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x62c, 0x64e, 0x646, 0x3b, 0x6a2, 0x64e, 0x628, 0x3b, 0x645, 0x64e, 0x631, 0x3b, 0x623, 0x64e,</div><div class='del'>-0x6a2, 0x652, 0x631, 0x3b, 0x645, 0x64e, 0x64a, 0x3b, 0x64a, 0x64f, 0x648, 0x646, 0x3b, 0x64a, 0x64f, 0x648, 0x644, 0x3b, 0x623, 0x64e,</div><div class='del'>-0x63a, 0x64f, 0x3b, 0x633, 0x64e, 0x62a, 0x3b, 0x623, 0x64f, 0x643, 0x652, 0x62a, 0x3b, 0x646, 0x64f, 0x648, 0x3b, 0x62f, 0x650, 0x633,</div><div class='del'>-0x3b, 0x62c, 0x64e, 0x646, 0x64e, 0x64a, 0x652, 0x631, 0x64f, 0x3b, 0x6a2, 0x64e, 0x628, 0x652, 0x631, 0x64e, 0x64a, 0x652, 0x631, 0x64f,</div><div class='del'>-0x3b, 0x645, 0x64e, 0x631, 0x650, 0x633, 0x652, 0x3b, 0x623, 0x64e, 0x6a2, 0x652, 0x631, 0x650, 0x644, 0x64f, 0x3b, 0x645, 0x64e, 0x64a,</div><div class='del'>-0x64f, 0x3b, 0x64a, 0x64f, 0x648, 0x646, 0x650, 0x3b, 0x64a, 0x64f, 0x648, 0x644, 0x650, 0x3b, 0x623, 0x64e, 0x63a, 0x64f, 0x633, 0x652,</div><div class='del'>-0x62a, 0x64e, 0x3b, 0x633, 0x64e, 0x62a, 0x64f, 0x645, 0x652, 0x628, 0x64e, 0x3b, 0x623, 0x64f, 0x643, 0x652, 0x62a, 0x648, 0x64f, 0x628,</div><div class='del'>-0x64e, 0x3b, 0x646, 0x64f, 0x648, 0x64e, 0x645, 0x652, 0x628, 0x64e, 0x3b, 0x62f, 0x650, 0x633, 0x64e, 0x645, 0x652, 0x628, 0x64e, 0x3b,</div><div class='del'>-0x5d9, 0x5e0, 0x5d5, 0x3b, 0x5e4, 0x5d1, 0x5e8, 0x3b, 0x5de, 0x5e8, 0x5e1, 0x3b, 0x5d0, 0x5e4, 0x5e8, 0x3b, 0x5de, 0x5d0, 0x5d9, 0x3b,</div><div class='del'>-0x5d9, 0x5d5, 0x5e0, 0x3b, 0x5d9, 0x5d5, 0x5dc, 0x3b, 0x5d0, 0x5d5, 0x5d2, 0x3b, 0x5e1, 0x5e4, 0x5d8, 0x3b, 0x5d0, 0x5d5, 0x5e7, 0x3b,</div><div class='del'>-0x5e0, 0x5d5, 0x5d1, 0x3b, 0x5d3, 0x5e6, 0x5de, 0x3b, 0x5d9, 0x5e0, 0x5d5, 0x5d0, 0x5e8, 0x3b, 0x5e4, 0x5d1, 0x5e8, 0x5d5, 0x5d0, 0x5e8,</div><div class='del'>-0x3b, 0x5de, 0x5e8, 0x5e1, 0x3b, 0x5d0, 0x5e4, 0x5e8, 0x5d9, 0x5dc, 0x3b, 0x5de, 0x5d0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b,</div><div class='del'>-0x5d9, 0x5d5, 0x5dc, 0x5d9, 0x3b, 0x5d0, 0x5d5, 0x5d2, 0x5d5, 0x5e1, 0x5d8, 0x3b, 0x5e1, 0x5e4, 0x5d8, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x5d0,</div><div class='del'>-0x5d5, 0x5e7, 0x5d8, 0x5d5, 0x5d1, 0x5e8, 0x3b, 0x5e0, 0x5d5, 0x5d1, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x5d3, 0x5e6, 0x5de, 0x5d1, 0x5e8, 0x3b,</div><div class='del'>-0x91c, 0x928, 0x935, 0x930, 0x940, 0x3b, 0x92b, 0x930, 0x935, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a,</div><div class='del'>-0x94d, 0x930, 0x948, 0x932, 0x3b, 0x92e, 0x908, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917,</div><div class='del'>-0x938, 0x94d, 0x924, 0x3b, 0x938, 0x93f, 0x924, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x905, 0x915, 0x94d, 0x924, 0x942, 0x92c, 0x930, 0x3b,</div><div class='del'>-0x928, 0x935, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x926, 0x93f, 0x938, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x91c, 0x3b, 0x92b, 0x93c, 0x3b,</div><div class='del'>-0x92e, 0x93e, 0x3b, 0x905, 0x3b, 0x92e, 0x3b, 0x91c, 0x942, 0x3b, 0x91c, 0x941, 0x3b, 0x905, 0x3b, 0x938, 0x93f, 0x3b, 0x905, 0x3b,</div><div class='del'>-0x928, 0x3b, 0x926, 0x93f, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0xe1, 0x72, 0x63,</div><div class='del'>-0x2e, 0x3b, 0xe1, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0xe1, 0x6a, 0x2e, 0x3b, 0x6a, 0xfa, 0x6e, 0x2e, 0x3b, 0x6a, 0xfa, 0x6c,</div><div class='del'>-0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x7a, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e,</div><div class='del'>-0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0xe1, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72,</div><div class='del'>-0x75, 0xe1, 0x72, 0x3b, 0x6d, 0xe1, 0x72, 0x63, 0x69, 0x75, 0x73, 0x3b, 0xe1, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x73, 0x3b,</div><div class='del'>-0x6d, 0xe1, 0x6a, 0x75, 0x73, 0x3b, 0x6a, 0xfa, 0x6e, 0x69, 0x75, 0x73, 0x3b, 0x6a, 0xfa, 0x6c, 0x69, 0x75, 0x73, 0x3b,</div><div class='del'>-0x61, 0x75, 0x67, 0x75, 0x73, 0x7a, 0x74, 0x75, 0x73, 0x3b, 0x73, 0x7a, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72,</div><div class='del'>-0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65,</div><div class='del'>-0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0xc1, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a,</div><div class='del'>-0x3b, 0x41, 0x3b, 0x53, 0x7a, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b,</div><div class='del'>-0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0xed, 0x3b, 0x6a, 0xfa, 0x6e, 0x3b, 0x6a, 0xfa, 0x6c, 0x3b,</div><div class='del'>-0xe1, 0x67, 0xfa, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0xf3, 0x76, 0x3b, 0x64, 0x65, 0x73, 0x3b,</div><div class='del'>-0x6a, 0x61, 0x6e, 0xfa, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0xfa, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b,</div><div class='del'>-0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d, 0x61, 0xed, 0x3b, 0x6a, 0xfa, 0x6e, 0xed, 0x3b, 0x6a, 0xfa, 0x6c, 0xed, 0x3b,</div><div class='del'>-0xe1, 0x67, 0xfa, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xf3,</div><div class='del'>-0x62, 0x65, 0x72, 0x3b, 0x6e, 0xf3, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65,</div><div class='del'>-0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0xc1, 0x3b, 0x53, 0x3b,</div><div class='del'>-0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70,</div><div class='del'>-0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x75, 0x3b, 0x53, 0x65,</div><div class='del'>-0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72,</div><div class='del'>-0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x72, 0x65, 0x74, 0x3b, 0x41, 0x70, 0x72,</div><div class='del'>-0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x67, 0x75,</div><div class='del'>-0x73, 0x74, 0x75, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62,</div><div class='del'>-0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72,</div><div class='del'>-0x3b, 0x45, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x61, 0x62, 0x68, 0x3b, 0x4d, 0xe1, 0x72, 0x74, 0x61, 0x3b, 0x41, 0x69, 0x62,</div><div class='del'>-0x3b, 0x42, 0x65, 0x61, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x74, 0x68, 0x3b, 0x49, 0xfa, 0x69, 0x6c, 0x3b, 0x4c, 0xfa, 0x6e,</div><div class='del'>-0x3b, 0x4d, 0x46, 0xf3, 0x6d, 0x68, 0x3b, 0x44, 0x46, 0xf3, 0x6d, 0x68, 0x3b, 0x53, 0x61, 0x6d, 0x68, 0x3b, 0x4e, 0x6f,</div><div class='del'>-0x6c, 0x6c, 0x3b, 0x45, 0x61, 0x6e, 0xe1, 0x69, 0x72, 0x3b, 0x46, 0x65, 0x61, 0x62, 0x68, 0x72, 0x61, 0x3b, 0x4d, 0xe1,</div><div class='del'>-0x72, 0x74, 0x61, 0x3b, 0x41, 0x69, 0x62, 0x72, 0x65, 0xe1, 0x6e, 0x3b, 0x42, 0x65, 0x61, 0x6c, 0x74, 0x61, 0x69, 0x6e,</div><div class='del'>-0x65, 0x3b, 0x4d, 0x65, 0x69, 0x74, 0x68, 0x65, 0x61, 0x6d, 0x68, 0x3b, 0x49, 0xfa, 0x69, 0x6c, 0x3b, 0x4c, 0xfa, 0x6e,</div><div class='del'>-0x61, 0x73, 0x61, 0x3b, 0x4d, 0x65, 0xe1, 0x6e, 0x20, 0x46, 0xf3, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x44, 0x65, 0x69,</div><div class='del'>-0x72, 0x65, 0x61, 0x64, 0x68, 0x20, 0x46, 0xf3, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x53, 0x61, 0x6d, 0x68, 0x61, 0x69,</div><div class='del'>-0x6e, 0x3b, 0x4e, 0x6f, 0x6c, 0x6c, 0x61, 0x69, 0x67, 0x3b, 0x45, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x42, 0x3b,</div><div class='del'>-0x4d, 0x3b, 0x49, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x67, 0x65, 0x6e, 0x3b, 0x66, 0x65,</div><div class='del'>-0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x67, 0x3b, 0x67, 0x69, 0x75, 0x3b, 0x6c, 0x75,</div><div class='del'>-0x67, 0x3b, 0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x3b, 0x6f, 0x74, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x69,</div><div class='del'>-0x63, 0x3b, 0x67, 0x65, 0x6e, 0x6e, 0x61, 0x69, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x62, 0x72, 0x61, 0x69, 0x6f, 0x3b, 0x6d,</div><div class='del'>-0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x65, 0x3b, 0x6d, 0x61, 0x67, 0x67, 0x69, 0x6f, 0x3b, 0x67,</div><div class='del'>-0x69, 0x75, 0x67, 0x6e, 0x6f, 0x3b, 0x6c, 0x75, 0x67, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b,</div><div class='del'>-0x73, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x74, 0x74, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f,</div><div class='del'>-0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x47, 0x3b, 0x46, 0x3b,</div><div class='del'>-0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b,</div><div class='del'>-0xc9c, 0xca8, 0xcb5, 0xcb0, 0xcc0, 0x3b, 0xcab, 0xcc6, 0xcac, 0xccd, 0xcb0, 0xcb5, 0xcb0, 0xcc0, 0x3b, 0xcae, 0xcbe, 0xcb0, 0xccd, 0xc9a,</div><div class='del'>-0xccd, 0x3b, 0xc8e, 0xcaa, 0xccd, 0xcb0, 0xcbf, 0xcb2, 0xccd, 0x3b, 0xcae, 0xcc6, 0x3b, 0xc9c, 0xcc2, 0xca8, 0xccd, 0x3b, 0xc9c, 0xcc1,</div><div class='del'>-0xcb2, 0xcc8, 0x3b, 0xc86, 0xc97, 0xcb8, 0xccd, 0xc9f, 0xccd, 0x3b, 0xcb8, 0xcaa, 0xccd, 0xc9f, 0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b,</div><div class='del'>-0xc85, 0xc95, 0xccd, 0xc9f, 0xccb, 0xcac, 0xcb0, 0xccd, 0x3b, 0xca8, 0xcb5, 0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xca1, 0xcbf, 0xcb8,</div><div class='del'>-0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xc9c, 0x3b, 0xcab, 0xcc6, 0x3b, 0xcae, 0xcbe, 0x3b, 0xc8e, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c,</div><div class='del'>-0xcc2, 0x3b, 0xc9c, 0xcc1, 0x3b, 0xc86, 0x3b, 0xcb8, 0xcc6, 0x3b, 0xc85, 0x3b, 0xca8, 0x3b, 0xca1, 0xcbf, 0x3b, 0x49b, 0x430, 0x4a3,</div><div class='del'>-0x2e, 0x3b, 0x430, 0x49b, 0x43f, 0x2e, 0x3b, 0x43d, 0x430, 0x443, 0x2e, 0x3b, 0x441, 0x4d9, 0x443, 0x2e, 0x3b, 0x43c, 0x430, 0x43c,</div><div class='del'>-0x2e, 0x3b, 0x43c, 0x430, 0x443, 0x2e, 0x3b, 0x448, 0x456, 0x43b, 0x2e, 0x3b, 0x442, 0x430, 0x43c, 0x2e, 0x3b, 0x49b, 0x44b, 0x440,</div><div class='del'>-0x2e, 0x3b, 0x49b, 0x430, 0x437, 0x2e, 0x3b, 0x49b, 0x430, 0x440, 0x2e, 0x3b, 0x436, 0x435, 0x43b, 0x442, 0x2e, 0x3b, 0x49b, 0x430,</div><div class='del'>-0x4a3, 0x442, 0x430, 0x440, 0x3b, 0x430, 0x49b, 0x43f, 0x430, 0x43d, 0x3b, 0x43d, 0x430, 0x443, 0x440, 0x44b, 0x437, 0x3b, 0x441, 0x4d9,</div><div class='del'>-0x443, 0x456, 0x440, 0x3b, 0x43c, 0x430, 0x43c, 0x44b, 0x440, 0x3b, 0x43c, 0x430, 0x443, 0x441, 0x44b, 0x43c, 0x3b, 0x448, 0x456, 0x43b,</div><div class='del'>-0x434, 0x435, 0x3b, 0x442, 0x430, 0x43c, 0x44b, 0x437, 0x3b, 0x49b, 0x44b, 0x440, 0x43a, 0x4af, 0x439, 0x435, 0x43a, 0x3b, 0x49b, 0x430,</div><div class='del'>-0x437, 0x430, 0x43d, 0x3b, 0x49b, 0x430, 0x440, 0x430, 0x448, 0x430, 0x3b, 0x436, 0x435, 0x43b, 0x442, 0x43e, 0x49b, 0x441, 0x430, 0x43d,</div><div class='del'>-0x3b, 0x6d, 0x75, 0x74, 0x2e, 0x3b, 0x67, 0x61, 0x73, 0x2e, 0x3b, 0x77, 0x65, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x74, 0x2e,</div><div class='del'>-0x3b, 0x67, 0x69, 0x63, 0x2e, 0x3b, 0x6b, 0x61, 0x6d, 0x2e, 0x3b, 0x6e, 0x79, 0x61, 0x2e, 0x3b, 0x6b, 0x61, 0x6e, 0x2e,</div><div class='del'>-0x3b, 0x6e, 0x7a, 0x65, 0x2e, 0x3b, 0x75, 0x6b, 0x77, 0x2e, 0x3b, 0x75, 0x67, 0x75, 0x2e, 0x3b, 0x75, 0x6b, 0x75, 0x2e,</div><div class='del'>-0x3b, 0x4d, 0x75, 0x74, 0x61, 0x72, 0x61, 0x6d, 0x61, 0x3b, 0x47, 0x61, 0x73, 0x68, 0x79, 0x61, 0x6e, 0x74, 0x61, 0x72,</div><div class='del'>-0x65, 0x3b, 0x57, 0x65, 0x72, 0x75, 0x72, 0x77, 0x65, 0x3b, 0x4d, 0x61, 0x74, 0x61, 0x3b, 0x47, 0x69, 0x63, 0x75, 0x72,</div><div class='del'>-0x61, 0x6e, 0x73, 0x69, 0x3b, 0x4b, 0x61, 0x6d, 0x65, 0x6e, 0x61, 0x3b, 0x4e, 0x79, 0x61, 0x6b, 0x61, 0x6e, 0x67, 0x61,</div><div class='del'>-0x3b, 0x4b, 0x61, 0x6e, 0x61, 0x6d, 0x61, 0x3b, 0x4e, 0x7a, 0x65, 0x6c, 0x69, 0x3b, 0x55, 0x6b, 0x77, 0x61, 0x6b, 0x69,</div><div class='del'>-0x72, 0x61, 0x3b, 0x55, 0x67, 0x75, 0x73, 0x68, 0x79, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x55, 0x6b, 0x75, 0x62, 0x6f, 0x7a,</div><div class='del'>-0x61, 0x3b, 0x31, 0xc6d4, 0x3b, 0x32, 0xc6d4, 0x3b, 0x33, 0xc6d4, 0x3b, 0x34, 0xc6d4, 0x3b, 0x35, 0xc6d4, 0x3b, 0x36, 0xc6d4, 0x3b,</div><div class='del'>-0x37, 0xc6d4, 0x3b, 0x38, 0xc6d4, 0x3b, 0x39, 0xc6d4, 0x3b, 0x31, 0x30, 0xc6d4, 0x3b, 0x31, 0x31, 0xc6d4, 0x3b, 0x31, 0x32, 0xc6d4,</div><div class='del'>-0x3b, 0xe7, 0x69, 0x6c, 0x3b, 0x73, 0x69, 0x62, 0x3b, 0x61, 0x64, 0x72, 0x3b, 0x6e, 0xee, 0x73, 0x3b, 0x67, 0x75, 0x6c,</div><div class='del'>-0x3b, 0x68, 0x65, 0x7a, 0x3b, 0x74, 0xee, 0x72, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31,</div><div class='del'>-0x32, 0x3b, 0xe7, 0x69, 0x6c, 0x65, 0x3b, 0x73, 0x69, 0x62, 0x61, 0x74, 0x3b, 0x61, 0x64, 0x61, 0x72, 0x3b, 0x6e, 0xee,</div><div class='del'>-0x73, 0x61, 0x6e, 0x3b, 0x67, 0x75, 0x6c, 0x61, 0x6e, 0x3b, 0x68, 0x65, 0x7a, 0xee, 0x72, 0x61, 0x6e, 0x3b, 0x37, 0x3b,</div><div class='del'>-0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0xe7, 0x3b, 0x73, 0x3b, 0x61, 0x3b, 0x6e,</div><div class='del'>-0x3b, 0x67, 0x3b, 0x68, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b,</div><div class='del'>-0xea1, 0x2e, 0xe81, 0x2e, 0x3b, 0xe81, 0x2e, 0xe9e, 0x2e, 0x3b, 0xea1, 0xeb5, 0x2e, 0xe99, 0x2e, 0x3b, 0xea1, 0x2e, 0xeaa, 0x2e,</div><div class='del'>-0x2e, 0x3b, 0xe9e, 0x2e, 0xe9e, 0x2e, 0x3b, 0xea1, 0xeb4, 0x2e, 0xe96, 0x2e, 0x3b, 0xe81, 0x2e, 0xea5, 0x2e, 0x3b, 0xeaa, 0x2e,</div><div class='del'>-0xeab, 0x2e, 0x3b, 0xe81, 0x2e, 0xe8d, 0x2e, 0x3b, 0xe95, 0x2e, 0xea5, 0x2e, 0x3b, 0xe9e, 0x2e, 0xe88, 0x2e, 0x3b, 0xe97, 0x2e,</div><div class='del'>-0xea7, 0x2e, 0x3b, 0xea1, 0xeb1, 0xe87, 0xe81, 0xead, 0xe99, 0x3b, 0xe81, 0xeb8, 0xea1, 0xe9e, 0xeb2, 0x3b, 0xea1, 0xeb5, 0xe99, 0xeb2,</div><div class='del'>-0x3b, 0xec0, 0xea1, 0xeaa, 0xeb2, 0x3b, 0xe9e, 0xeb6, 0xe94, 0xeaa, 0xeb0, 0xe9e, 0xeb2, 0x3b, 0xea1, 0xeb4, 0xe96, 0xeb8, 0xe99, 0xeb2,</div><div class='del'>-0x3b, 0xe81, 0xecd, 0xea5, 0xeb0, 0xe81, 0xebb, 0xe94, 0x3b, 0xeaa, 0xeb4, 0xe87, 0xeab, 0xeb2, 0x3b, 0xe81, 0xeb1, 0xe99, 0xe8d, 0xeb2,</div><div class='del'>-0x3b, 0xe95, 0xeb8, 0xea5, 0xeb2, 0x3b, 0xe9e, 0xeb0, 0xe88, 0xeb4, 0xe81, 0x3b, 0xe97, 0xeb1, 0xe99, 0xea7, 0xeb2, 0x3b, 0x6a, 0x61,</div><div class='del'>-0x6e, 0x76, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x2e,</div><div class='del'>-0x3b, 0x6d, 0x61, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6e, 0x2e, 0x3b, 0x6a, 0x16b, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67,</div><div class='del'>-0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65,</div><div class='del'>-0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x101, 0x72, 0x69, 0x73, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x101, 0x72, 0x69,</div><div class='del'>-0x73, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x12b, 0x6c, 0x69, 0x73, 0x3b, 0x6d, 0x61, 0x69, 0x6a,</div><div class='del'>-0x73, 0x3b, 0x6a, 0x16b, 0x6e, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6c, 0x69, 0x6a, 0x73, 0x3b, 0x61, 0x75, 0x67, 0x75,</div><div class='del'>-0x73, 0x74, 0x73, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62,</div><div class='del'>-0x72, 0x69, 0x73, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62,</div><div class='del'>-0x72, 0x69, 0x73, 0x3b, 0x73, 0x31, 0x3b, 0x73, 0x32, 0x3b, 0x73, 0x33, 0x3b, 0x73, 0x34, 0x3b, 0x73, 0x35, 0x3b, 0x73,</div><div class='del'>-0x36, 0x3b, 0x73, 0x37, 0x3b, 0x73, 0x38, 0x3b, 0x73, 0x39, 0x3b, 0x73, 0x31, 0x30, 0x3b, 0x73, 0x31, 0x31, 0x3b, 0x73,</div><div class='del'>-0x31, 0x32, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x79, 0x61, 0x6d, 0x62, 0x6f, 0x3b, 0x73, 0xe1,</div><div class='del'>-0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x62, 0x61, 0x6c, 0xe9, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20,</div><div class='del'>-0x79, 0x61, 0x20, 0x6d, 0xed, 0x73, 0xe1, 0x74, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d,</div><div class='del'>-0xed, 0x6e, 0x65, 0x69, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x74, 0xe1, 0x6e, 0x6f,</div><div class='del'>-0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0x6f, 0x74, 0xf3, 0x62, 0xe1, 0x3b, 0x73, 0xe1, 0x6e,</div><div class='del'>-0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6e, 0x73, 0x61, 0x6d, 0x62, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79,</div><div class='del'>-0x61, 0x20, 0x6d, 0x77, 0x61, 0x6d, 0x62, 0x65, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6c, 0x69,</div><div class='del'>-0x62, 0x77, 0x61, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x3b, 0x73, 0xe1,</div><div class='del'>-0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x254, 0x30c, 0x6b, 0x254,</div><div class='del'>-0x301, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d,</div><div class='del'>-0xed, 0x62, 0x61, 0x6c, 0xe9, 0x3b, 0x53, 0x61, 0x75, 0x3b, 0x56, 0x61, 0x73, 0x3b, 0x4b, 0x6f, 0x76, 0x3b, 0x42, 0x61,</div><div class='del'>-0x6c, 0x3b, 0x47, 0x65, 0x67, 0x3b, 0x42, 0x69, 0x72, 0x3b, 0x4c, 0x69, 0x65, 0x3b, 0x52, 0x67, 0x70, 0x3b, 0x52, 0x67,</div><div class='del'>-0x73, 0x3b, 0x53, 0x70, 0x6c, 0x3b, 0x4c, 0x61, 0x70, 0x3b, 0x47, 0x72, 0x64, 0x3b, 0x73, 0x61, 0x75, 0x73, 0x69, 0x73,</div><div class='del'>-0x3b, 0x76, 0x61, 0x73, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x6b, 0x6f, 0x76, 0x61, 0x73, 0x3b, 0x62, 0x61, 0x6c, 0x61, 0x6e,</div><div class='del'>-0x64, 0x69, 0x73, 0x3b, 0x67, 0x65, 0x67, 0x75, 0x17e, 0x117, 0x3b, 0x62, 0x69, 0x72, 0x17e, 0x65, 0x6c, 0x69, 0x73, 0x3b,</div><div class='del'>-0x6c, 0x69, 0x65, 0x70, 0x61, 0x3b, 0x72, 0x75, 0x67, 0x70, 0x6a, 0x16b, 0x74, 0x69, 0x73, 0x3b, 0x72, 0x75, 0x67, 0x73,</div><div class='del'>-0x117, 0x6a, 0x69, 0x73, 0x3b, 0x73, 0x70, 0x61, 0x6c, 0x69, 0x73, 0x3b, 0x6c, 0x61, 0x70, 0x6b, 0x72, 0x69, 0x74, 0x69,</div><div class='del'>-0x73, 0x3b, 0x67, 0x72, 0x75, 0x6f, 0x64, 0x69, 0x73, 0x3b, 0x53, 0x3b, 0x56, 0x3b, 0x4b, 0x3b, 0x42, 0x3b, 0x47, 0x3b,</div><div class='del'>-0x42, 0x3b, 0x4c, 0x3b, 0x52, 0x3b, 0x52, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x47, 0x3b, 0x458, 0x430, 0x43d, 0x2e, 0x3b, 0x444,</div><div class='del'>-0x435, 0x432, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443,</div><div class='del'>-0x43d, 0x2e, 0x3b, 0x458, 0x443, 0x43b, 0x2e, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x2e, 0x3b, 0x43e,</div><div class='del'>-0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x43c, 0x2e, 0x3b, 0x458, 0x430, 0x43d,</div><div class='del'>-0x443, 0x430, 0x440, 0x438, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430,</div><div class='del'>-0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x438, 0x3b, 0x458, 0x443, 0x43b, 0x438, 0x3b, 0x430,</div><div class='del'>-0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43e, 0x43a, 0x442, 0x43e,</div><div class='del'>-0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x43c, 0x432, 0x440,</div><div class='del'>-0x438, 0x3b, 0x458, 0x3b, 0x444, 0x3b, 0x43c, 0x3b, 0x430, 0x3b, 0x43c, 0x3b, 0x458, 0x3b, 0x458, 0x3b, 0x430, 0x3b, 0x441, 0x3b,</div><div class='del'>-0x43e, 0x3b, 0x43d, 0x3b, 0x434, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70,</div><div class='del'>-0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x6f, 0x6e, 0x3b, 0x4a, 0x6f, 0x6c, 0x3b, 0x41, 0x6f, 0x67, 0x3b, 0x53, 0x65,</div><div class='del'>-0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x6f, 0x61, 0x72,</div><div class='del'>-0x79, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x6f, 0x61, 0x72, 0x79, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x73, 0x61, 0x3b, 0x41, 0x70,</div><div class='del'>-0x72, 0x69, 0x6c, 0x79, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x6f, 0x6e, 0x61, 0x3b, 0x4a, 0x6f, 0x6c, 0x61, 0x79, 0x3b,</div><div class='del'>-0x41, 0x6f, 0x67, 0x6f, 0x73, 0x69, 0x74, 0x72, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x61, 0x6d, 0x62, 0x72, 0x61, 0x3b,</div><div class='del'>-0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x61, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x44, 0x65, 0x73,</div><div class='del'>-0x61, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70,</div><div class='del'>-0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x6f, 0x73, 0x3b, 0x53,</div><div class='del'>-0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61,</div><div class='del'>-0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x69,</div><div class='del'>-0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x4f, 0x67, 0x6f, 0x73,</div><div class='del'>-0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e,</div><div class='del'>-0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0xd1c, 0xd28, 0xd41,</div><div class='del'>-0x3b, 0xd2b, 0xd46, 0xd2c, 0xd4d, 0xd30, 0xd41, 0x3b, 0xd2e, 0xd3e, 0xd30, 0xd4d, 0x200d, 0x3b, 0xd0f, 0xd2a, 0xd4d, 0xd30, 0xd3f, 0x3b,</div><div class='del'>-0xd2e, 0xd47, 0xd2f, 0xd4d, 0x3b, 0xd1c, 0xd42, 0xd23, 0xd4d, 0x200d, 0x3b, 0xd1c, 0xd42, 0xd32, 0xd48, 0x3b, 0xd13, 0xd17, 0x3b, 0xd38,</div><div class='del'>-0xd46, 0xd2a, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd02, 0x3b, 0xd12, 0xd15, 0xd4d, 0xd1f, 0xd4b, 0x3b, 0xd28, 0xd35, 0xd02, 0x3b, 0xd21, 0xd3f,</div><div class='del'>-0xd38, 0xd02, 0x3b, 0xd1c, 0xd28, 0xd41, 0xd35, 0xd30, 0xd3f, 0x3b, 0xd2b, 0xd46, 0xd2c, 0xd4d, 0xd30, 0xd41, 0xd35, 0xd30, 0xd3f, 0x3b,</div><div class='del'>-0xd2e, 0xd3e, 0xd30, 0xd4d, 0x200d, 0xd1a, 0xd4d, 0xd1a, 0xd4d, 0x3b, 0xd0f, 0xd2a, 0xd4d, 0xd30, 0xd3f, 0xd32, 0xd4d, 0x200d, 0x3b, 0xd2e,</div><div class='del'>-0xd47, 0xd2f, 0xd4d, 0x3b, 0xd1c, 0xd42, 0xd23, 0xd4d, 0x200d, 0x3b, 0xd1c, 0xd42, 0xd32, 0xd48, 0x3b, 0xd06, 0xd17, 0xd38, 0xd4d, 0xd31,</div><div class='del'>-0xd4d, 0xd31, 0xd4d, 0x3b, 0xd38, 0xd46, 0xd2a, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd02, 0xd2c, 0xd30, 0xd4d, 0x200d, 0x3b, 0xd12, 0xd15, 0xd4d,</div><div class='del'>-0xd1f, 0xd4b, 0xd2c, 0xd30, 0xd4d, 0x200d, 0x3b, 0xd28, 0xd35, 0xd02, 0xd2c, 0xd30, 0xd4d, 0x200d, 0x3b, 0xd21, 0xd3f, 0xd38, 0xd02, 0xd2c,</div><div class='del'>-0xd30, 0xd4d, 0x200d, 0x3b, 0xd1c, 0x3b, 0xd2b, 0xd46, 0x3b, 0xd2e, 0xd3e, 0x3b, 0xd0f, 0x3b, 0xd2e, 0xd47, 0x3b, 0xd1c, 0xd42, 0x3b,</div><div class='del'>-0xd1c, 0xd42, 0x3b, 0xd13, 0x3b, 0xd38, 0xd46, 0x3b, 0xd12, 0x3b, 0xd28, 0x3b, 0xd21, 0xd3f, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46,</div><div class='del'>-0x72, 0x61, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x6a, 0x3b, 0x120, 0x75, 0x6e, 0x3b, 0x4c,</div><div class='del'>-0x75, 0x6c, 0x3b, 0x41, 0x77, 0x77, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44,</div><div class='del'>-0x69, 0x10b, 0x3b, 0x4a, 0x61, 0x6e, 0x6e, 0x61, 0x72, 0x3b, 0x46, 0x72, 0x61, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x75,</div><div class='del'>-0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x6a, 0x6a, 0x75, 0x3b, 0x120, 0x75, 0x6e, 0x6a, 0x75, 0x3b, 0x4c,</div><div class='del'>-0x75, 0x6c, 0x6a, 0x75, 0x3b, 0x41, 0x77, 0x77, 0x69, 0x73, 0x73, 0x75, 0x3b, 0x53, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62,</div><div class='del'>-0x72, 0x75, 0x3b, 0x4f, 0x74, 0x74, 0x75, 0x62, 0x72, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b,</div><div class='del'>-0x44, 0x69, 0x10b, 0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x120,</div><div class='del'>-0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x48, 0x101, 0x6e, 0x75, 0x65, 0x72, 0x65,</div><div class='del'>-0x3b, 0x50, 0x113, 0x70, 0x75, 0x65, 0x72, 0x65, 0x3b, 0x4d, 0x101, 0x65, 0x68, 0x65, 0x3b, 0x100, 0x70, 0x65, 0x72, 0x69,</div><div class='del'>-0x72, 0x61, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x48, 0x75, 0x6e, 0x65, 0x3b, 0x48, 0x16b, 0x72, 0x61, 0x65, 0x3b, 0x100, 0x6b,</div><div class='del'>-0x75, 0x68, 0x61, 0x74, 0x61, 0x3b, 0x48, 0x65, 0x70, 0x65, 0x74, 0x65, 0x6d, 0x61, 0x3b, 0x4f, 0x6b, 0x65, 0x74, 0x6f,</div><div class='del'>-0x70, 0x61, 0x3b, 0x4e, 0x6f, 0x65, 0x6d, 0x61, 0x3b, 0x54, 0x12b, 0x68, 0x65, 0x6d, 0x61, 0x3b, 0x91c, 0x93e, 0x928, 0x947,</div><div class='del'>-0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d,</div><div class='del'>-0x91a, 0x3b, 0x90f, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x948,</div><div class='del'>-0x3b, 0x911, 0x917, 0x938, 0x94d, 0x91f, 0x3b, 0x938, 0x92a, 0x94d, 0x91f, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x911, 0x915, 0x94d, 0x91f,</div><div class='del'>-0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x935, 0x94d, 0x939, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x902, 0x92c,</div><div class='del'>-0x930, 0x3b, 0x91c, 0x93e, 0x3b, 0x92b, 0x947, 0x3b, 0x92e, 0x93e, 0x3b, 0x90f, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x3b, 0x91c,</div><div class='del'>-0x941, 0x3b, 0x911, 0x3b, 0x938, 0x3b, 0x911, 0x3b, 0x928, 0x94b, 0x3b, 0x921, 0x93f, 0x3b, 0x445, 0x443, 0x43b, 0x3b, 0x4af, 0x445,</div><div class='del'>-0x44d, 0x3b, 0x431, 0x430, 0x440, 0x3b, 0x442, 0x443, 0x443, 0x3b, 0x43b, 0x443, 0x443, 0x3b, 0x43c, 0x43e, 0x433, 0x3b, 0x43c, 0x43e,</div><div class='del'>-0x440, 0x3b, 0x445, 0x43e, 0x43d, 0x3b, 0x431, 0x438, 0x447, 0x3b, 0x442, 0x430, 0x445, 0x3b, 0x43d, 0x43e, 0x445, 0x3b, 0x433, 0x430,</div><div class='del'>-0x445, 0x3b, 0x425, 0x443, 0x43b, 0x433, 0x430, 0x43d, 0x430, 0x3b, 0x4ae, 0x445, 0x44d, 0x440, 0x3b, 0x411, 0x430, 0x440, 0x3b, 0x422,</div><div class='del'>-0x443, 0x443, 0x43b, 0x430, 0x439, 0x3b, 0x41b, 0x443, 0x443, 0x3b, 0x41c, 0x43e, 0x433, 0x43e, 0x439, 0x3b, 0x41c, 0x43e, 0x440, 0x44c,</div><div class='del'>-0x3b, 0x425, 0x43e, 0x43d, 0x44c, 0x3b, 0x411, 0x438, 0x447, 0x3b, 0x422, 0x430, 0x445, 0x438, 0x430, 0x3b, 0x41d, 0x43e, 0x445, 0x43e,</div><div class='del'>-0x439, 0x3b, 0x413, 0x430, 0x445, 0x430, 0x439, 0x3b, 0x91c, 0x928, 0x3b, 0x92b, 0x947, 0x92c, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a,</div><div class='del'>-0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x93f, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x3b, 0x905,</div><div class='del'>-0x917, 0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x3b, 0x921,</div><div class='del'>-0x93f, 0x938, 0x947, 0x3b, 0x91c, 0x928, 0x935, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x905, 0x930, 0x940, 0x3b,</div><div class='del'>-0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b,</div><div class='del'>-0x91c, 0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917, 0x938, 0x94d, 0x924, 0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x947, 0x92e, 0x94d,</div><div class='del'>-0x92c, 0x930, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b,</div><div class='del'>-0x921, 0x93f, 0x938, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x967, 0x3b, 0x968, 0x3b, 0x969, 0x3b, 0x96a, 0x3b, 0x96b, 0x3b, 0x96c,</div><div class='del'>-0x3b, 0x96d, 0x3b, 0x96e, 0x3b, 0x96f, 0x3b, 0x967, 0x966, 0x3b, 0x967, 0x967, 0x3b, 0x967, 0x968, 0x3b, 0x91c, 0x928, 0x935, 0x930,</div><div class='del'>-0x940, 0x3b, 0x92b, 0x930, 0x935, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x947, 0x932,</div><div class='del'>-0x3b, 0x92e, 0x908, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917, 0x938, 0x94d, 0x924, 0x3b,</div><div class='del'>-0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928,</div><div class='del'>-0x94b, 0x92d, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x926, 0x93f, 0x938, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x6a, 0x61, 0x6e, 0x2e,</div><div class='del'>-0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b,</div><div class='del'>-0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b,</div><div class='del'>-0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61,</div><div class='del'>-0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c,</div><div class='del'>-0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73,</div><div class='del'>-0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b,</div><div class='del'>-0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x67, 0x65,</div><div class='del'>-0x6e, 0x69, 0xe8, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x69, 0xe8, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x61, 0x62,</div><div class='del'>-0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x68, 0x3b, 0x6a, 0x75, 0x6c, 0x68, 0x65, 0x74, 0x3b,</div><div class='del'>-0x61, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0xf2, 0x62,</div><div class='del'>-0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x72, 0x65,</div><div class='del'>-0x3b, 0xb1c, 0xb3e, 0xb28, 0xb41, 0xb06, 0xb30, 0xb40, 0x3b, 0xb2b, 0xb47, 0xb2c, 0xb4d, 0xb30, 0xb41, 0xb5f, 0xb3e, 0xb30, 0xb40, 0x3b,</div><div class='del'>-0xb2e, 0xb3e, 0xb30, 0xb4d, 0xb1a, 0xb4d, 0xb1a, 0x3b, 0xb05, 0xb2a, 0xb4d, 0xb30, 0xb47, 0xb32, 0x3b, 0xb2e, 0xb47, 0x3b, 0xb1c, 0xb41,</div><div class='del'>-0xb28, 0x3b, 0xb1c, 0xb41, 0xb32, 0xb3e, 0xb07, 0x3b, 0xb05, 0xb17, 0xb37, 0xb4d, 0xb1f, 0x3b, 0xb38, 0xb47, 0xb2a, 0xb4d, 0xb1f, 0xb47,</div><div class='del'>-0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb05, 0xb15, 0xb4d, 0xb1f, 0xb4b, 0xb2c, 0xb30, 0x3b, 0xb28, 0xb2d, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30,</div><div class='del'>-0x3b, 0xb21, 0xb3f, 0xb38, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb1c, 0xb3e, 0x3b, 0xb2b, 0xb47, 0x3b, 0xb2e, 0xb3e, 0x3b, 0xb05,</div><div class='del'>-0x3b, 0xb2e, 0xb47, 0x3b, 0xb1c, 0xb41, 0x3b, 0xb1c, 0xb41, 0x3b, 0xb05, 0x3b, 0xb38, 0xb47, 0x3b, 0xb05, 0x3b, 0xb28, 0x3b, 0xb21,</div><div class='del'>-0xb3f, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b,</div><div class='del'>-0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627,</div><div class='del'>-0x6ab, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648,</div><div class='del'>-0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x698, 0x627, 0x646, 0x648, 0x6cc, 0x647, 0x654, 0x3b, 0x641, 0x648,</div><div class='del'>-0x631, 0x6cc, 0x647, 0x654, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x648, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c,</div><div class='del'>-0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x648, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x627, 0x645, 0x628, 0x631,</div><div class='del'>-0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x627, 0x645, 0x628, 0x631,</div><div class='del'>-0x3b, 0x698, 0x627, 0x646, 0x648, 0x6cc, 0x647, 0x654, 0x3b, 0x641, 0x648, 0x631, 0x6cc, 0x647, 0x654, 0x3b, 0x645, 0x627, 0x631, 0x633,</div><div class='del'>-0x3b, 0x622, 0x648, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b,</div><div class='del'>-0x622, 0x6af, 0x648, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b,</div><div class='del'>-0x646, 0x648, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x698, 0x3b, 0x641, 0x3b, 0x645, 0x3b,</div><div class='del'>-0x622, 0x3b, 0x645, 0x6cc, 0x3b, 0x698, 0x3b, 0x698, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x646, 0x3b, 0x62f, 0x3b, 0x62c,</div><div class='del'>-0x646, 0x648, 0x3b, 0x641, 0x648, 0x631, 0x6cc, 0x647, 0x654, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x648, 0x631, 0x6cc, 0x644,</div><div class='del'>-0x3b, 0x645, 0x640, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x3b, 0x627, 0x648, 0x62a, 0x3b, 0x633, 0x67e, 0x62a,</div><div class='del'>-0x627, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633,</div><div class='del'>-0x645, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b,</div><div class='del'>-0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627,</div><div class='del'>-0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648,</div><div class='del'>-0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x62c, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x627, 0x3b, 0x645, 0x3b,</div><div class='del'>-0x62c, 0x3b, 0x62c, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x646, 0x3b, 0x62f, 0x3b, 0x73, 0x74, 0x79, 0x3b, 0x6c, 0x75,</div><div class='del'>-0x74, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6b, 0x77, 0x69, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x63, 0x7a, 0x65, 0x3b, 0x6c, 0x69,</div><div class='del'>-0x70, 0x3b, 0x73, 0x69, 0x65, 0x3b, 0x77, 0x72, 0x7a, 0x3b, 0x70, 0x61, 0x17a, 0x3b, 0x6c, 0x69, 0x73, 0x3b, 0x67, 0x72,</div><div class='del'>-0x75, 0x3b, 0x73, 0x74, 0x79, 0x63, 0x7a, 0x6e, 0x69, 0x61, 0x3b, 0x6c, 0x75, 0x74, 0x65, 0x67, 0x6f, 0x3b, 0x6d, 0x61,</div><div class='del'>-0x72, 0x63, 0x61, 0x3b, 0x6b, 0x77, 0x69, 0x65, 0x74, 0x6e, 0x69, 0x61, 0x3b, 0x6d, 0x61, 0x6a, 0x61, 0x3b, 0x63, 0x7a,</div><div class='del'>-0x65, 0x72, 0x77, 0x63, 0x61, 0x3b, 0x6c, 0x69, 0x70, 0x63, 0x61, 0x3b, 0x73, 0x69, 0x65, 0x72, 0x70, 0x6e, 0x69, 0x61,</div><div class='del'>-0x3b, 0x77, 0x72, 0x7a, 0x65, 0x15b, 0x6e, 0x69, 0x61, 0x3b, 0x70, 0x61, 0x17a, 0x64, 0x7a, 0x69, 0x65, 0x72, 0x6e, 0x69,</div><div class='del'>-0x6b, 0x61, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x61, 0x3b, 0x67, 0x72, 0x75, 0x64, 0x6e, 0x69, 0x61,</div><div class='del'>-0x3b, 0x73, 0x3b, 0x6c, 0x3b, 0x6d, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x63, 0x3b, 0x6c, 0x3b, 0x73, 0x3b, 0x77, 0x3b, 0x70,</div><div class='del'>-0x3b, 0x6c, 0x3b, 0x67, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72,</div><div class='del'>-0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74,</div><div class='del'>-0x3b, 0x4f, 0x75, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f,</div><div class='del'>-0x3b, 0x46, 0x65, 0x76, 0x65, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0xe7, 0x6f, 0x3b, 0x41, 0x62, 0x72,</div><div class='del'>-0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x4a, 0x75, 0x6c, 0x68, 0x6f, 0x3b,</div><div class='del'>-0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x4f, 0x75, 0x74, 0x75,</div><div class='del'>-0x62, 0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x72,</div><div class='del'>-0x6f, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x62, 0x72, 0x3b, 0x6d, 0x61,</div><div class='del'>-0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x3b, 0x6f, 0x75,</div><div class='del'>-0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x7a, 0x3b, 0x6a, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x66, 0x65,</div><div class='del'>-0x76, 0x65, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x6f, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b,</div><div class='del'>-0x6d, 0x61, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x6a, 0x75, 0x6c, 0x68, 0x6f, 0x3b, 0x61, 0x67, 0x6f,</div><div class='del'>-0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x6f, 0x75, 0x74, 0x75, 0x62, 0x72, 0x6f,</div><div class='del'>-0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x64, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0xa1c,</div><div class='del'>-0xa28, 0xa35, 0xa30, 0xa40, 0x3b, 0xa2b, 0xa3c, 0xa30, 0xa35, 0xa30, 0xa40, 0x3b, 0xa2e, 0xa3e, 0xa30, 0xa1a, 0x3b, 0xa05, 0xa2a, 0xa4d,</div><div class='del'>-0xa30, 0xa48, 0xa32, 0x3b, 0xa2e, 0xa08, 0x3b, 0xa1c, 0xa42, 0xa28, 0x3b, 0xa1c, 0xa41, 0xa32, 0xa3e, 0xa08, 0x3b, 0xa05, 0xa17, 0xa38,</div><div class='del'>-0xa24, 0x3b, 0xa38, 0xa24, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa05, 0xa15, 0xa24, 0xa42, 0xa2c, 0xa30, 0x3b, 0xa28, 0xa35, 0xa70, 0xa2c, 0xa30,</div><div class='del'>-0x3b, 0xa26, 0xa38, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa1c, 0x3b, 0xa2b, 0x3b, 0xa2e, 0xa3e, 0x3b, 0xa05, 0x3b, 0xa2e, 0x3b, 0xa1c, 0xa42,</div><div class='del'>-0x3b, 0xa1c, 0xa41, 0x3b, 0xa05, 0x3b, 0xa38, 0x3b, 0xa05, 0x3b, 0xa28, 0x3b, 0xa26, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b,</div><div class='del'>-0x641, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x626, 0x3b,</div><div class='del'>-0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x626, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x62a, 0x645, 0x628,</div><div class='del'>-0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631,</div><div class='del'>-0x3b, 0x73, 0x63, 0x68, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61,</div><div class='del'>-0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x74, 0x67, 0x3b, 0x7a, 0x65, 0x72, 0x63, 0x6c, 0x2e, 0x3b, 0x66, 0x61, 0x6e, 0x2e,</div><div class='del'>-0x3b, 0x61, 0x76, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f,</div><div class='del'>-0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x73, 0x63, 0x68, 0x61, 0x6e, 0x65, 0x72, 0x3b, 0x66, 0x61, 0x76, 0x72,</div><div class='del'>-0x65, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x67, 0x6c, 0x3b, 0x6d, 0x61, 0x74, 0x67, 0x3b,</div><div class='del'>-0x7a, 0x65, 0x72, 0x63, 0x6c, 0x61, 0x64, 0x75, 0x72, 0x3b, 0x66, 0x61, 0x6e, 0x61, 0x64, 0x75, 0x72, 0x3b, 0x61, 0x76,</div><div class='del'>-0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x62, 0x65,</div><div class='del'>-0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,</div><div class='del'>-0x53, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0x46, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b,</div><div class='del'>-0x4e, 0x3b, 0x44, 0x3b, 0x69, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61,</div><div class='del'>-0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x69, 0x75, 0x6e, 0x2e, 0x3b, 0x69, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75,</div><div class='del'>-0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64,</div><div class='del'>-0x65, 0x63, 0x2e, 0x3b, 0x69, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72,</div><div class='del'>-0x69, 0x65, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x69, 0x65, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x65, 0x3b, 0x6d, 0x61,</div><div class='del'>-0x69, 0x3b, 0x69, 0x75, 0x6e, 0x69, 0x65, 0x3b, 0x69, 0x75, 0x6c, 0x69, 0x65, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74,</div><div class='del'>-0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x6d, 0x62, 0x72, 0x69,</div><div class='del'>-0x65, 0x3b, 0x6e, 0x6f, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x69,</div><div class='del'>-0x65, 0x3b, 0x49, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x41, 0x3b, 0x53, 0x3b,</div><div class='del'>-0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x44f, 0x43d, 0x432, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x440,</div><div class='del'>-0x442, 0x430, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x44f, 0x3b, 0x438, 0x44e, 0x43d, 0x44f, 0x3b, 0x438, 0x44e, 0x43b,</div><div class='del'>-0x44f, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e,</div><div class='del'>-0x44f, 0x431, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x44f, 0x43d, 0x432, 0x430, 0x440, 0x44f, 0x3b, 0x444, 0x435, 0x432, 0x440,</div><div class='del'>-0x430, 0x43b, 0x44f, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x430, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x44f, 0x3b, 0x43c, 0x430, 0x44f,</div><div class='del'>-0x3b, 0x438, 0x44e, 0x43d, 0x44f, 0x3b, 0x438, 0x44e, 0x43b, 0x44f, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x430, 0x3b, 0x441,</div><div class='del'>-0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44f, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44f, 0x3b, 0x43d, 0x43e, 0x44f, 0x431,</div><div class='del'>-0x440, 0x44f, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44f, 0x3b, 0x42f, 0x3b, 0x424, 0x3b, 0x41c, 0x3b, 0x410, 0x3b, 0x41c,</div><div class='del'>-0x3b, 0x418, 0x3b, 0x418, 0x3b, 0x410, 0x3b, 0x421, 0x3b, 0x41e, 0x3b, 0x41d, 0x3b, 0x414, 0x3b, 0x4e, 0x79, 0x65, 0x3b, 0x46,</div><div class='del'>-0x75, 0x6c, 0x3b, 0x4d, 0x62, 0xe4, 0x3b, 0x4e, 0x67, 0x75, 0x3b, 0x42, 0xea, 0x6c, 0x3b, 0x46, 0xf6, 0x6e, 0x3b, 0x4c,</div><div class='del'>-0x65, 0x6e, 0x3b, 0x4b, 0xfc, 0x6b, 0x3b, 0x4d, 0x76, 0x75, 0x3b, 0x4e, 0x67, 0x62, 0x3b, 0x4e, 0x61, 0x62, 0x3b, 0x4b,</div><div class='del'>-0x61, 0x6b, 0x3b, 0x4e, 0x79, 0x65, 0x6e, 0x79, 0x65, 0x3b, 0x46, 0x75, 0x6c, 0x75, 0x6e, 0x64, 0xef, 0x67, 0x69, 0x3b,</div><div class='del'>-0x4d, 0x62, 0xe4, 0x6e, 0x67, 0xfc, 0x3b, 0x4e, 0x67, 0x75, 0x62, 0xf9, 0x65, 0x3b, 0x42, 0xea, 0x6c, 0xe4, 0x77, 0xfc,</div><div class='del'>-0x3b, 0x46, 0xf6, 0x6e, 0x64, 0x6f, 0x3b, 0x4c, 0x65, 0x6e, 0x67, 0x75, 0x61, 0x3b, 0x4b, 0xfc, 0x6b, 0xfc, 0x72, 0xfc,</div><div class='del'>-0x3b, 0x4d, 0x76, 0x75, 0x6b, 0x61, 0x3b, 0x4e, 0x67, 0x62, 0x65, 0x72, 0x65, 0x72, 0x65, 0x3b, 0x4e, 0x61, 0x62, 0xe4,</div><div class='del'>-0x6e, 0x64, 0xfc, 0x72, 0x75, 0x3b, 0x4b, 0x61, 0x6b, 0x61, 0x75, 0x6b, 0x61, 0x3b, 0x4e, 0x3b, 0x46, 0x3b, 0x4d, 0x3b,</div><div class='del'>-0x4e, 0x3b, 0x42, 0x3b, 0x46, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x458, 0x430,</div><div class='del'>-0x43d, 0x3b, 0x444, 0x435, 0x431, 0x3b, 0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443,</div><div class='del'>-0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43f, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e,</div><div class='del'>-0x432, 0x3b, 0x434, 0x435, 0x446, 0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x431, 0x440, 0x443, 0x430, 0x440,</div><div class='del'>-0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b,</div><div class='del'>-0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x431, 0x430, 0x440,</div><div class='del'>-0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x431, 0x430, 0x440, 0x3b, 0x43d, 0x43e, 0x432, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x434, 0x435,</div><div class='del'>-0x446, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x431, 0x440, 0x443, 0x430,</div><div class='del'>-0x440, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d,</div><div class='del'>-0x438, 0x3b, 0x458, 0x443, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c,</div><div class='del'>-0x431, 0x430, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x431, 0x430, 0x440, 0x3b, 0x43d, 0x43e, 0x432, 0x435, 0x43c, 0x431, 0x430, 0x440,</div><div class='del'>-0x3b, 0x434, 0x435, 0x446, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61,</div><div class='del'>-0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76,</div><div class='del'>-0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61,</div><div class='del'>-0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70,</div><div class='del'>-0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x75,</div><div class='del'>-0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72,</div><div class='del'>-0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6a,</div><div class='del'>-0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x6a, 0x3b, 0x61, 0x3b, 0x73, 0x3b, 0x6f, 0x3b, 0x6e,</div><div class='del'>-0x3b, 0x64, 0x3b, 0x50, 0x68, 0x65, 0x3b, 0x4b, 0x6f, 0x6c, 0x3b, 0x55, 0x62, 0x65, 0x3b, 0x4d, 0x6d, 0x65, 0x3b, 0x4d,</div><div class='del'>-0x6f, 0x74, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x55, 0x70, 0x75, 0x3b, 0x50, 0x68, 0x61, 0x3b, 0x4c, 0x65, 0x6f, 0x3b, 0x4d,</div><div class='del'>-0x70, 0x68, 0x3b, 0x50, 0x75, 0x6e, 0x3b, 0x54, 0x73, 0x68, 0x3b, 0x50, 0x68, 0x65, 0x73, 0x65, 0x6b, 0x67, 0x6f, 0x6e,</div><div class='del'>-0x67, 0x3b, 0x48, 0x6c, 0x61, 0x6b, 0x6f, 0x6c, 0x61, 0x3b, 0x48, 0x6c, 0x61, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x3b,</div><div class='del'>-0x4d, 0x6d, 0x65, 0x73, 0x65, 0x3b, 0x4d, 0x6f, 0x74, 0x73, 0x68, 0x65, 0x61, 0x6e, 0x6f, 0x6e, 0x67, 0x3b, 0x50, 0x68,</div><div class='del'>-0x75, 0x70, 0x6a, 0x61, 0x6e, 0x65, 0x3b, 0x50, 0x68, 0x75, 0x70, 0x75, 0x3b, 0x50, 0x68, 0x61, 0x74, 0x61, 0x3b, 0x4c,</div><div class='del'>-0x65, 0x6f, 0x74, 0x73, 0x68, 0x65, 0x3b, 0x4d, 0x70, 0x68, 0x61, 0x6c, 0x61, 0x6e, 0x65, 0x3b, 0x50, 0x75, 0x6e, 0x64,</div><div class='del'>-0x75, 0x6e, 0x67, 0x77, 0x61, 0x6e, 0x65, 0x3b, 0x54, 0x73, 0x68, 0x69, 0x74, 0x77, 0x65, 0x3b, 0x46, 0x65, 0x72, 0x3b,</div><div class='del'>-0x54, 0x6c, 0x68, 0x3b, 0x4d, 0x6f, 0x70, 0x3b, 0x4d, 0x6f, 0x72, 0x3b, 0x4d, 0x6f, 0x74, 0x3b, 0x53, 0x65, 0x65, 0x3b,</div><div class='del'>-0x50, 0x68, 0x75, 0x3b, 0x50, 0x68, 0x61, 0x3b, 0x4c, 0x77, 0x65, 0x3b, 0x44, 0x69, 0x70, 0x3b, 0x4e, 0x67, 0x77, 0x3b,</div><div class='del'>-0x53, 0x65, 0x64, 0x3b, 0x46, 0x65, 0x72, 0x69, 0x6b, 0x67, 0x6f, 0x6e, 0x67, 0x3b, 0x54, 0x6c, 0x68, 0x61, 0x6b, 0x6f,</div><div class='del'>-0x6c, 0x65, 0x3b, 0x4d, 0x6f, 0x70, 0x69, 0x74, 0x6c, 0x6f, 0x3b, 0x4d, 0x6f, 0x72, 0x61, 0x6e, 0x61, 0x6e, 0x67, 0x3b,</div><div class='del'>-0x4d, 0x6f, 0x74, 0x73, 0x68, 0x65, 0x67, 0x61, 0x6e, 0x61, 0x6e, 0x67, 0x3b, 0x53, 0x65, 0x65, 0x74, 0x65, 0x62, 0x6f,</div><div class='del'>-0x73, 0x69, 0x67, 0x6f, 0x3b, 0x50, 0x68, 0x75, 0x6b, 0x77, 0x69, 0x3b, 0x50, 0x68, 0x61, 0x74, 0x77, 0x65, 0x3b, 0x4c,</div><div class='del'>-0x77, 0x65, 0x74, 0x73, 0x65, 0x3b, 0x44, 0x69, 0x70, 0x68, 0x61, 0x6c, 0x61, 0x6e, 0x65, 0x3b, 0x4e, 0x67, 0x77, 0x61,</div><div class='del'>-0x6e, 0x61, 0x74, 0x73, 0x65, 0x6c, 0x65, 0x3b, 0x53, 0x65, 0x64, 0x69, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x6f, 0x6c, 0x65,</div><div class='del'>-0x3b, 0x4e, 0x64, 0x69, 0x3b, 0x4b, 0x75, 0x6b, 0x3b, 0x4b, 0x75, 0x72, 0x3b, 0x4b, 0x75, 0x62, 0x3b, 0x43, 0x68, 0x69,</div><div class='del'>-0x3b, 0x43, 0x68, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x3b, 0x4e, 0x79, 0x61, 0x3b, 0x47, 0x75, 0x6e, 0x3b, 0x47, 0x75, 0x6d,</div><div class='del'>-0x3b, 0x4d, 0x62, 0x3b, 0x5a, 0x76, 0x69, 0x3b, 0x4e, 0x64, 0x69, 0x72, 0x61, 0x3b, 0x4b, 0x75, 0x6b, 0x61, 0x64, 0x7a,</div><div class='del'>-0x69, 0x3b, 0x4b, 0x75, 0x72, 0x75, 0x6d, 0x65, 0x3b, 0x4b, 0x75, 0x62, 0x76, 0x75, 0x6d, 0x62, 0x69, 0x3b, 0x43, 0x68,</div><div class='del'>-0x69, 0x76, 0x61, 0x62, 0x76, 0x75, 0x3b, 0x43, 0x68, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x6b, 0x75,</div><div class='del'>-0x6e, 0x67, 0x75, 0x72, 0x75, 0x3b, 0x4e, 0x79, 0x61, 0x6d, 0x61, 0x76, 0x68, 0x75, 0x76, 0x68, 0x75, 0x3b, 0x47, 0x75,</div><div class='del'>-0x6e, 0x79, 0x61, 0x6e, 0x61, 0x3b, 0x47, 0x75, 0x6d, 0x69, 0x67, 0x75, 0x72, 0x75, 0x3b, 0x4d, 0x62, 0x75, 0x64, 0x7a,</div><div class='del'>-0x69, 0x3b, 0x5a, 0x76, 0x69, 0x74, 0x61, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x43, 0x3b, 0x43, 0x3b,</div><div class='del'>-0x43, 0x3b, 0x4e, 0x3b, 0x47, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0xda2, 0xdb1, 0x3b, 0xdb4, 0xdd9, 0xdb6, 0x3b, 0xdb8,</div><div class='del'>-0xdcf, 0xdbb, 0xdca, 0xdad, 0x3b, 0xd85, 0xdb4, 0xdca, 0x200d, 0xdbb, 0xdda, 0xdbd, 0x3b, 0xdb8, 0xdd0, 0xdba, 0x3b, 0xda2, 0xdd6, 0xdb1,</div><div class='del'>-0x3b, 0xda2, 0xdd6, 0xdbd, 0x3b, 0xd85, 0xd9c, 0xddd, 0x3b, 0xdc3, 0xdd0, 0xdb4, 0x3b, 0xd94, 0xd9a, 0x3b, 0xdb1, 0xddc, 0xdc0, 0xdd0,</div><div class='del'>-0x3b, 0xdaf, 0xdd9, 0xdc3, 0xdd0, 0x3b, 0xda2, 0xdb1, 0xdc0, 0xdcf, 0xdbb, 0x3b, 0xdb4, 0xdd9, 0xdb6, 0xdbb, 0xdc0, 0xdcf, 0xdbb, 0x3b,</div><div class='del'>-0xdb8, 0xdcf, 0xdbb, 0xdca, 0xdad, 0x3b, 0xd85, 0xdb4, 0xdca, 0x200d, 0xdbb, 0xdda, 0xdbd, 0xdca, 0x3b, 0xdb8, 0xdd0, 0xdba, 0xdd2, 0x3b,</div><div class='del'>-0xda2, 0xdd6, 0xdb1, 0x3b, 0xda2, 0xdd6, 0xdbd, 0xdd2, 0x3b, 0xd85, 0xd9c, 0xddd, 0xdc3, 0xdca, 0xdad, 0xdd4, 0x3b, 0xdc3, 0xdd0, 0xdb4,</div><div class='del'>-0xdca, 0xdad, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xd94, 0xd9a, 0xdca, 0xdad, 0xddd, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xdb1, 0xddc,</div><div class='del'>-0xdc0, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xdaf, 0xdd9, 0xdc3, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xda2, 0x3b,</div><div class='del'>-0xdb4, 0xdd9, 0x3b, 0xdb8, 0xdcf, 0x3b, 0xd85, 0x3b, 0xdb8, 0xdd0, 0x3b, 0xda2, 0xdd6, 0x3b, 0xda2, 0xdd6, 0x3b, 0xd85, 0x3b, 0xdc3,</div><div class='del'>-0xdd0, 0x3b, 0xd94, 0x3b, 0xdb1, 0xddc, 0x3b, 0xdaf, 0xdd9, 0x3b, 0x42, 0x68, 0x69, 0x3b, 0x56, 0x61, 0x6e, 0x3b, 0x56, 0x6f,</div><div class='del'>-0x6c, 0x3b, 0x4d, 0x61, 0x62, 0x3b, 0x4e, 0x6b, 0x68, 0x3b, 0x4e, 0x68, 0x6c, 0x3b, 0x4b, 0x68, 0x6f, 0x3b, 0x4e, 0x67,</div><div class='del'>-0x63, 0x3b, 0x4e, 0x79, 0x6f, 0x3b, 0x4d, 0x70, 0x68, 0x3b, 0x4c, 0x77, 0x65, 0x3b, 0x4e, 0x67, 0x6f, 0x3b, 0x42, 0x68,</div><div class='del'>-0x69, 0x6d, 0x62, 0x69, 0x64, 0x76, 0x77, 0x61, 0x6e, 0x65, 0x3b, 0x69, 0x4e, 0x64, 0x6c, 0x6f, 0x76, 0x61, 0x6e, 0x61,</div><div class='del'>-0x3b, 0x69, 0x4e, 0x64, 0x6c, 0x6f, 0x76, 0x75, 0x2d, 0x6c, 0x65, 0x6e, 0x6b, 0x68, 0x75, 0x6c, 0x75, 0x3b, 0x4d, 0x61,</div><div class='del'>-0x62, 0x61, 0x73, 0x61, 0x3b, 0x69, 0x4e, 0x6b, 0x68, 0x77, 0x65, 0x6b, 0x68, 0x77, 0x65, 0x74, 0x69, 0x3b, 0x69, 0x4e,</div><div class='del'>-0x68, 0x6c, 0x61, 0x62, 0x61, 0x3b, 0x4b, 0x68, 0x6f, 0x6c, 0x77, 0x61, 0x6e, 0x65, 0x3b, 0x69, 0x4e, 0x67, 0x63, 0x69,</div><div class='del'>-0x3b, 0x69, 0x4e, 0x79, 0x6f, 0x6e, 0x69, 0x3b, 0x69, 0x4d, 0x70, 0x68, 0x61, 0x6c, 0x61, 0x3b, 0x4c, 0x77, 0x65, 0x74,</div><div class='del'>-0x69, 0x3b, 0x69, 0x4e, 0x67, 0x6f, 0x6e, 0x67, 0x6f, 0x6e, 0x69, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b,</div><div class='del'>-0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0xe1, 0x6a, 0x3b, 0x6a, 0xfa, 0x6e, 0x3b, 0x6a, 0xfa, 0x6c, 0x3b,</div><div class='del'>-0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b,</div><div class='del'>-0x6a, 0x61, 0x6e, 0x75, 0xe1, 0x72, 0x61, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1, 0x72, 0x61, 0x3b, 0x6d, 0x61, 0x72,</div><div class='del'>-0x63, 0x61, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x61, 0x3b, 0x6d, 0xe1, 0x6a, 0x61, 0x3b, 0x6a, 0xfa, 0x6e, 0x61, 0x3b,</div><div class='del'>-0x6a, 0xfa, 0x6c, 0x61, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62,</div><div class='del'>-0x72, 0x61, 0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x72, 0x61, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b,</div><div class='del'>-0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72,</div><div class='del'>-0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x65, 0x63, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b,</div><div class='del'>-0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x3b, 0x61, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73,</div><div class='del'>-0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76,</div><div class='del'>-0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4b, 0x6f, 0x62, 0x3b, 0x4c,</div><div class='del'>-0x61, 0x62, 0x3b, 0x53, 0x61, 0x64, 0x3b, 0x41, 0x66, 0x72, 0x3b, 0x53, 0x68, 0x61, 0x3b, 0x4c, 0x69, 0x78, 0x3b, 0x54,</div><div class='del'>-0x6f, 0x64, 0x3b, 0x53, 0x69, 0x64, 0x3b, 0x53, 0x61, 0x67, 0x3b, 0x54, 0x6f, 0x62, 0x3b, 0x4b, 0x49, 0x54, 0x3b, 0x4c,</div><div class='del'>-0x49, 0x54, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4b, 0x6f, 0x6f, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73,</div><div class='del'>-0x68, 0x61, 0x20, 0x4c, 0x61, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x61, 0x64, 0x64,</div><div class='del'>-0x65, 0x78, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x41, 0x66, 0x72, 0x61, 0x61, 0x64, 0x3b, 0x42,</div><div class='del'>-0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x68, 0x61, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c,</div><div class='del'>-0x69, 0x78, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x54, 0x6f, 0x64, 0x6f, 0x62, 0x61, 0x61, 0x64,</div><div class='del'>-0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x69, 0x64, 0x65, 0x65, 0x64, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73,</div><div class='del'>-0x68, 0x61, 0x20, 0x53, 0x61, 0x67, 0x61, 0x61, 0x6c, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x54,</div><div class='del'>-0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4b, 0x6f, 0x77, 0x20, 0x69, 0x79, 0x6f,</div><div class='del'>-0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c, 0x61, 0x62, 0x61, 0x20,</div><div class='del'>-0x69, 0x79, 0x6f, 0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x4b, 0x3b, 0x4c, 0x3b, 0x53, 0x3b, 0x41, 0x3b,</div><div class='del'>-0x53, 0x3b, 0x4c, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x4c, 0x3b, 0x65, 0x6e, 0x65, 0x3b,</div><div class='del'>-0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x62, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x6a, 0x75, 0x6e, 0x3b,</div><div class='del'>-0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x63, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b,</div><div class='del'>-0x64, 0x69, 0x63, 0x3b, 0x65, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x6d, 0x61,</div><div class='del'>-0x72, 0x7a, 0x6f, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f,</div><div class='del'>-0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x69, 0x65,</div><div class='del'>-0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x69, 0x65, 0x6d, 0x62,</div><div class='del'>-0x72, 0x65, 0x3b, 0x64, 0x69, 0x63, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x45, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41,</div><div class='del'>-0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e,</div><div class='del'>-0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e,</div><div class='del'>-0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76,</div><div class='del'>-0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72,</div><div class='del'>-0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a,</div><div class='del'>-0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70,</div><div class='del'>-0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61,</div><div class='del'>-0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62,</div><div class='del'>-0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a,</div><div class='del'>-0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x69, 0x3b, 0x73,</div><div class='del'>-0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76,</div><div class='del'>-0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x42f, 0x43d, 0x432, 0x3b, 0x424,</div><div class='del'>-0x435, 0x432, 0x3b, 0x41c, 0x430, 0x440, 0x3b, 0x410, 0x43f, 0x440, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x3b, 0x418,</div><div class='del'>-0x44e, 0x43b, 0x3b, 0x410, 0x432, 0x433, 0x3b, 0x421, 0x435, 0x43d, 0x3b, 0x41e, 0x43a, 0x442, 0x3b, 0x41d, 0x43e, 0x44f, 0x3b, 0x414,</div><div class='del'>-0x435, 0x43a, 0x3b, 0x42f, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b, 0x41c, 0x430, 0x440, 0x442,</div><div class='del'>-0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x3b, 0x418, 0x44e, 0x43b, 0x3b, 0x410,</div><div class='del'>-0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x3b, 0x41e, 0x43a, 0x442, 0x44f, 0x431, 0x440,</div><div class='del'>-0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x440, 0x3b, 0x414, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x3b, 0xb9c, 0xba9, 0x2e, 0x3b, 0xbaa, 0xbbf,</div><div class='del'>-0xbaa, 0xbcd, 0x2e, 0x3b, 0xbae, 0xbbe, 0xbb0, 0xbcd, 0x2e, 0x3b, 0xb8f, 0xbaa, 0xbcd, 0x2e, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2,</div><div class='del'>-0xba9, 0xbcd, 0x3b, 0xb9c, 0xbc2, 0xbb2, 0xbc8, 0x3b, 0xb86, 0xb95, 0x2e, 0x3b, 0xb9a, 0xbc6, 0xbaa, 0xbcd, 0x2e, 0x3b, 0xb85, 0xb95,</div><div class='del'>-0xbcd, 0x2e, 0x3b, 0xba8, 0xbb5, 0x2e, 0x3b, 0xb9f, 0xbbf, 0xb9a, 0x2e, 0x3b, 0xb9c, 0xba9, 0xbb5, 0xbb0, 0xbbf, 0x3b, 0xbaa, 0xbbf,</div><div class='del'>-0xbaa, 0xbcd, 0xbb0, 0xbb5, 0xbb0, 0xbbf, 0x3b, 0xbae, 0xbbe, 0xbb0, 0xbcd, 0xb9a, 0xbcd, 0x3b, 0xb8f, 0xbaa, 0xbcd, 0xbb0, 0xbb2, 0xbcd,</div><div class='del'>-0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0xba9, 0xbcd, 0x3b, 0xb9c, 0xbc2, 0xbb2, 0xbc8, 0x3b, 0xb86, 0xb95, 0xbb8, 0xbcd, 0xb9f, 0xbcd,</div><div class='del'>-0x3b, 0xb9a, 0xbc6, 0xbaa, 0xbcd, 0xb9f, 0xbc6, 0xbae, 0xbcd, 0xbaa, 0xbcd, 0xbb0, 0xbcd, 0x3b, 0xb85, 0xb95, 0xbcd, 0xb9f, 0xbcb, 0xbaa,</div><div class='del'>-0xbb0, 0xbcd, 0x3b, 0xba8, 0xbb5, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xb9f, 0xbbf, 0xb9a, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b,</div><div class='del'>-0xb9c, 0x3b, 0xbaa, 0xbbf, 0x3b, 0xbae, 0xbbe, 0x3b, 0xb8f, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0x3b, 0xb9c, 0xbc2, 0x3b, 0xb86,</div><div class='del'>-0x3b, 0xb9a, 0xbc6, 0x3b, 0xb85, 0x3b, 0xba8, 0x3b, 0xb9f, 0xbbf, 0x3b, 0xc1c, 0xc28, 0xc35, 0xc30, 0xc3f, 0x3b, 0xc2b, 0xc3f, 0xc2c,</div><div class='del'>-0xc4d, 0xc30, 0xc35, 0xc30, 0xc3f, 0x3b, 0xc2e, 0xc3e, 0xc30, 0xc4d, 0xc1a, 0xc3f, 0x3b, 0xc0f, 0xc2a, 0xc4d, 0xc30, 0xc3f, 0xc32, 0xc4d,</div><div class='del'>-0x3b, 0xc2e, 0xc47, 0x3b, 0xc1c, 0xc42, 0xc28, 0xc4d, 0x3b, 0xc1c, 0xc42, 0xc32, 0xc48, 0x3b, 0xc06, 0xc17, 0xc38, 0xc4d, 0xc1f, 0xc41,</div><div class='del'>-0x3b, 0xc38, 0xc46, 0xc2a, 0xc4d, 0xc1f, 0xc46, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc05, 0xc15, 0xc4d, 0xc1f, 0xc4b, 0xc2c, 0xc30, 0xc4d,</div><div class='del'>-0x3b, 0xc28, 0xc35, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc21, 0xc3f, 0xc38, 0xc46, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc1c, 0x3b, 0xc2b,</div><div class='del'>-0xc3f, 0x3b, 0xc2e, 0x3b, 0xc0e, 0x3b, 0xc2e, 0xc46, 0x3b, 0xc1c, 0xc41, 0x3b, 0xc1c, 0xc41, 0x3b, 0xc06, 0x3b, 0xc38, 0xc46, 0x3b,</div><div class='del'>-0xc05, 0x3b, 0xc28, 0x3b, 0xc21, 0xc3f, 0x3b, 0xe21, 0x2e, 0xe04, 0x2e, 0x3b, 0xe01, 0x2e, 0xe1e, 0x2e, 0x3b, 0xe21, 0xe35, 0x2e,</div><div class='del'>-0xe04, 0x2e, 0x3b, 0xe40, 0xe21, 0x2e, 0xe22, 0x2e, 0x3b, 0xe1e, 0x2e, 0xe04, 0x2e, 0x3b, 0xe21, 0xe34, 0x2e, 0xe22, 0x2e, 0x3b,</div><div class='del'>-0xe01, 0x2e, 0xe04, 0x2e, 0x3b, 0xe2a, 0x2e, 0xe04, 0x2e, 0x3b, 0xe01, 0x2e, 0xe22, 0x2e, 0x3b, 0xe15, 0x2e, 0xe04, 0x2e, 0x3b,</div><div class='del'>-0xe1e, 0x2e, 0xe22, 0x2e, 0x3b, 0xe18, 0x2e, 0xe04, 0x2e, 0x3b, 0xe21, 0xe01, 0xe23, 0xe32, 0xe04, 0xe21, 0x3b, 0xe01, 0xe38, 0xe21,</div><div class='del'>-0xe20, 0xe32, 0xe1e, 0xe31, 0xe19, 0xe18, 0xe4c, 0x3b, 0xe21, 0xe35, 0xe19, 0xe32, 0xe04, 0xe21, 0x3b, 0xe40, 0xe21, 0xe29, 0xe32, 0xe22,</div><div class='del'>-0xe19, 0x3b, 0xe1e, 0xe24, 0xe29, 0xe20, 0xe32, 0xe04, 0xe21, 0x3b, 0xe21, 0xe34, 0xe16, 0xe38, 0xe19, 0xe32, 0xe22, 0xe19, 0x3b, 0xe01,</div><div class='del'>-0xe23, 0xe01, 0xe0e, 0xe32, 0xe04, 0xe21, 0x3b, 0xe2a, 0xe34, 0xe07, 0xe2b, 0xe32, 0xe04, 0xe21, 0x3b, 0xe01, 0xe31, 0xe19, 0xe22, 0xe32,</div><div class='del'>-0xe22, 0xe19, 0x3b, 0xe15, 0xe38, 0xe25, 0xe32, 0xe04, 0xe21, 0x3b, 0xe1e, 0xe24, 0xe28, 0xe08, 0xe34, 0xe01, 0xe32, 0xe22, 0xe19, 0x3b,</div><div class='del'>-0xe18, 0xe31, 0xe19, 0xe27, 0xe32, 0xe04, 0xe21, 0x3b, 0xe21, 0x3b, 0xe01, 0x3b, 0xe21, 0x3b, 0xe21, 0x3b, 0xe1e, 0x3b, 0xe21, 0x3b,</div><div class='del'>-0xe01, 0x3b, 0xe2a, 0x3b, 0xe01, 0x3b, 0xe15, 0x3b, 0xe1e, 0x3b, 0xe18, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0x3b, 0xf5f, 0xfb3, 0xf0b,</div><div class='del'>-0xf22, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf23, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf24, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf25, 0x3b, 0xf5f, 0xfb3, 0xf0b,</div><div class='del'>-0xf26, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf27, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf28, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf29, 0x3b, 0xf5f, 0xfb3, 0xf0b,</div><div class='del'>-0xf21, 0xf20, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf21, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf22, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b,</div><div class='del'>-0xf51, 0xf44, 0xf0b, 0xf54, 0xf7c, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b,</div><div class='del'>-0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf5e, 0xf72,</div><div class='del'>-0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b,</div><div class='del'>-0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0xf0b,</div><div class='del'>-0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b,</div><div class='del'>-0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f,</div><div class='del'>-0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56,</div><div class='del'>-0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0x1325, 0x122a, 0x3b, 0x1208, 0x12ab, 0x1272, 0x3b,</div><div class='del'>-0x1218, 0x130b, 0x1262, 0x3b, 0x121a, 0x12eb, 0x12dd, 0x3b, 0x130d, 0x1295, 0x1266, 0x3b, 0x1230, 0x1290, 0x3b, 0x1213, 0x121d, 0x1208, 0x3b, 0x1290,</div><div class='del'>-0x1213, 0x1230, 0x3b, 0x1218, 0x1235, 0x12a8, 0x3b, 0x1325, 0x1245, 0x121d, 0x3b, 0x1215, 0x12f3, 0x122d, 0x3b, 0x1273, 0x1215, 0x1233, 0x3b, 0x1325,</div><div class='del'>-0x122a, 0x3b, 0x1208, 0x12ab, 0x1272, 0x1275, 0x3b, 0x1218, 0x130b, 0x1262, 0x1275, 0x3b, 0x121a, 0x12eb, 0x12dd, 0x12eb, 0x3b, 0x130d, 0x1295, 0x1266,</div><div class='del'>-0x1275, 0x3b, 0x1230, 0x1290, 0x3b, 0x1213, 0x121d, 0x1208, 0x3b, 0x1290, 0x1213, 0x1230, 0x3b, 0x1218, 0x1235, 0x12a8, 0x1228, 0x121d, 0x3b, 0x1325,</div><div class='del'>-0x1245, 0x121d, 0x1272, 0x3b, 0x1215, 0x12f3, 0x122d, 0x3b, 0x1273, 0x1215, 0x1233, 0x1235, 0x3b, 0x53, 0x101, 0x6e, 0x3b, 0x46, 0x113, 0x70,</div><div class='del'>-0x3b, 0x4d, 0x61, 0x2bb, 0x61, 0x3b, 0x2bb, 0x45, 0x70, 0x65, 0x3b, 0x4d, 0x113, 0x3b, 0x53, 0x75, 0x6e, 0x3b, 0x53, 0x69,</div><div class='del'>-0x75, 0x3b, 0x2bb, 0x41, 0x6f, 0x6b, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x3b, 0x4e, 0x14d, 0x76, 0x3b,</div><div class='del'>-0x54, 0x12b, 0x73, 0x3b, 0x53, 0x101, 0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x46, 0x113, 0x70, 0x75, 0x65, 0x6c, 0x69, 0x3b,</div><div class='del'>-0x4d, 0x61, 0x2bb, 0x61, 0x73, 0x69, 0x3b, 0x2bb, 0x45, 0x70, 0x65, 0x6c, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x113, 0x3b, 0x53,</div><div class='del'>-0x75, 0x6e, 0x65, 0x3b, 0x53, 0x69, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x2bb, 0x41, 0x6f, 0x6b, 0x6f, 0x73, 0x69, 0x3b, 0x53,</div><div class='del'>-0x65, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x74, 0x6f, 0x70, 0x61, 0x3b, 0x4e, 0x14d, 0x76,</div><div class='del'>-0x65, 0x6d, 0x61, 0x3b, 0x54, 0x12b, 0x73, 0x65, 0x6d, 0x61, 0x3b, 0x53, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d,</div><div class='del'>-0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x53, 0x75, 0x6e, 0x3b, 0x59,</div><div class='del'>-0x61, 0x6e, 0x3b, 0x4b, 0x75, 0x6c, 0x3b, 0x44, 0x7a, 0x69, 0x3b, 0x4d, 0x75, 0x64, 0x3b, 0x4b, 0x68, 0x6f, 0x3b, 0x4d,</div><div class='del'>-0x61, 0x77, 0x3b, 0x4d, 0x68, 0x61, 0x3b, 0x4e, 0x64, 0x7a, 0x3b, 0x4e, 0x68, 0x6c, 0x3b, 0x48, 0x75, 0x6b, 0x3b, 0x4e,</div><div class='del'>-0x27, 0x77, 0x3b, 0x53, 0x75, 0x6e, 0x67, 0x75, 0x74, 0x69, 0x3b, 0x4e, 0x79, 0x65, 0x6e, 0x79, 0x65, 0x6e, 0x79, 0x61,</div><div class='del'>-0x6e, 0x69, 0x3b, 0x4e, 0x79, 0x65, 0x6e, 0x79, 0x61, 0x6e, 0x6b, 0x75, 0x6c, 0x75, 0x3b, 0x44, 0x7a, 0x69, 0x76, 0x61,</div><div class='del'>-0x6d, 0x69, 0x73, 0x6f, 0x6b, 0x6f, 0x3b, 0x4d, 0x75, 0x64, 0x79, 0x61, 0x78, 0x69, 0x68, 0x69, 0x3b, 0x4b, 0x68, 0x6f,</div><div class='del'>-0x74, 0x61, 0x76, 0x75, 0x78, 0x69, 0x6b, 0x61, 0x3b, 0x4d, 0x61, 0x77, 0x75, 0x77, 0x61, 0x6e, 0x69, 0x3b, 0x4d, 0x68,</div><div class='del'>-0x61, 0x77, 0x75, 0x72, 0x69, 0x3b, 0x4e, 0x64, 0x7a, 0x68, 0x61, 0x74, 0x69, 0x3b, 0x4e, 0x68, 0x6c, 0x61, 0x6e, 0x67,</div><div class='del'>-0x75, 0x6c, 0x61, 0x3b, 0x48, 0x75, 0x6b, 0x75, 0x72, 0x69, 0x3b, 0x4e, 0x27, 0x77, 0x65, 0x6e, 0x64, 0x7a, 0x61, 0x6d,</div><div class='del'>-0x68, 0x61, 0x6c, 0x61, 0x3b, 0x4f, 0x63, 0x61, 0x3b, 0x15e, 0x75, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4e, 0x69, 0x73,</div><div class='del'>-0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48, 0x61, 0x7a, 0x3b, 0x54, 0x65, 0x6d, 0x3b, 0x41, 0x11f, 0x75, 0x3b, 0x45, 0x79, 0x6c,</div><div class='del'>-0x3b, 0x45, 0x6b, 0x69, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x41, 0x72, 0x61, 0x3b, 0x4f, 0x63, 0x61, 0x6b, 0x3b, 0x15e, 0x75,</div><div class='del'>-0x62, 0x61, 0x74, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x4e, 0x69, 0x73, 0x61, 0x6e, 0x3b, 0x4d, 0x61, 0x79, 0x131, 0x73,</div><div class='del'>-0x3b, 0x48, 0x61, 0x7a, 0x69, 0x72, 0x61, 0x6e, 0x3b, 0x54, 0x65, 0x6d, 0x6d, 0x75, 0x7a, 0x3b, 0x41, 0x11f, 0x75, 0x73,</div><div class='del'>-0x74, 0x6f, 0x73, 0x3b, 0x45, 0x79, 0x6c, 0xfc, 0x6c, 0x3b, 0x45, 0x6b, 0x69, 0x6d, 0x3b, 0x4b, 0x61, 0x73, 0x131, 0x6d,</div><div class='del'>-0x3b, 0x41, 0x72, 0x61, 0x6c, 0x131, 0x6b, 0x3b, 0x4f, 0x3b, 0x15e, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x48, 0x3b,</div><div class='del'>-0x54, 0x3b, 0x41, 0x3b, 0x45, 0x3b, 0x45, 0x3b, 0x4b, 0x3b, 0x41, 0x3b, 0x441, 0x456, 0x447, 0x2e, 0x3b, 0x43b, 0x44e, 0x442,</div><div class='del'>-0x2e, 0x3b, 0x431, 0x435, 0x440, 0x2e, 0x3b, 0x43a, 0x432, 0x456, 0x442, 0x2e, 0x3b, 0x442, 0x440, 0x430, 0x432, 0x2e, 0x3b, 0x447,</div><div class='del'>-0x435, 0x440, 0x432, 0x2e, 0x3b, 0x43b, 0x438, 0x43f, 0x2e, 0x3b, 0x441, 0x435, 0x440, 0x43f, 0x2e, 0x3b, 0x432, 0x435, 0x440, 0x2e,</div><div class='del'>-0x3b, 0x436, 0x43e, 0x432, 0x442, 0x2e, 0x3b, 0x43b, 0x438, 0x441, 0x442, 0x2e, 0x3b, 0x433, 0x440, 0x443, 0x434, 0x2e, 0x3b, 0x441,</div><div class='del'>-0x456, 0x447, 0x43d, 0x44f, 0x3b, 0x43b, 0x44e, 0x442, 0x43e, 0x433, 0x43e, 0x3b, 0x431, 0x435, 0x440, 0x435, 0x437, 0x43d, 0x44f, 0x3b,</div><div class='del'>-0x43a, 0x432, 0x456, 0x442, 0x43d, 0x44f, 0x3b, 0x442, 0x440, 0x430, 0x432, 0x43d, 0x44f, 0x3b, 0x447, 0x435, 0x440, 0x432, 0x43d, 0x44f,</div><div class='del'>-0x3b, 0x43b, 0x438, 0x43f, 0x43d, 0x44f, 0x3b, 0x441, 0x435, 0x440, 0x43f, 0x43d, 0x44f, 0x3b, 0x432, 0x435, 0x440, 0x435, 0x441, 0x43d,</div><div class='del'>-0x44f, 0x3b, 0x436, 0x43e, 0x432, 0x442, 0x43d, 0x44f, 0x3b, 0x43b, 0x438, 0x441, 0x442, 0x43e, 0x43f, 0x430, 0x434, 0x430, 0x3b, 0x433,</div><div class='del'>-0x440, 0x443, 0x434, 0x43d, 0x44f, 0x3b, 0x421, 0x3b, 0x41b, 0x3b, 0x411, 0x3b, 0x41a, 0x3b, 0x422, 0x3b, 0x427, 0x3b, 0x41b, 0x3b,</div><div class='del'>-0x421, 0x3b, 0x412, 0x3b, 0x416, 0x3b, 0x41b, 0x3b, 0x413, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x631, 0x648, 0x631,</div><div class='del'>-0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x20, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x626, 0x3b, 0x62c, 0x648, 0x646,</div><div class='del'>-0x3b, 0x62c, 0x648, 0x644, 0x627, 0x626, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9,</div><div class='del'>-0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x41c, 0x443, 0x4b3,</div><div class='del'>-0x430, 0x440, 0x440, 0x430, 0x43c, 0x3b, 0x421, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x420, 0x430, 0x431, 0x438, 0x443, 0x43b, 0x2d, 0x430,</div><div class='del'>-0x432, 0x432, 0x430, 0x43b, 0x3b, 0x420, 0x430, 0x431, 0x438, 0x443, 0x43b, 0x2d, 0x43e, 0x445, 0x438, 0x440, 0x3b, 0x416, 0x443, 0x43c,</div><div class='del'>-0x43e, 0x434, 0x438, 0x443, 0x43b, 0x2d, 0x443, 0x43b, 0x43e, 0x3b, 0x416, 0x443, 0x43c, 0x43e, 0x434, 0x438, 0x443, 0x43b, 0x2d, 0x443,</div><div class='del'>-0x445, 0x440, 0x43e, 0x3b, 0x420, 0x430, 0x436, 0x430, 0x431, 0x3b, 0x428, 0x430, 0x44a, 0x431, 0x43e, 0x43d, 0x3b, 0x420, 0x430, 0x43c,</div><div class='del'>-0x430, 0x437, 0x43e, 0x43d, 0x3b, 0x428, 0x430, 0x432, 0x432, 0x43e, 0x43b, 0x3b, 0x417, 0x438, 0x43b, 0x2d, 0x49b, 0x430, 0x44a, 0x434,</div><div class='del'>-0x430, 0x3b, 0x417, 0x438, 0x43b, 0x2d, 0x4b3, 0x438, 0x436, 0x436, 0x430, 0x3b, 0x62c, 0x646, 0x648, 0x3b, 0x641, 0x628, 0x631, 0x3b,</div><div class='del'>-0x645, 0x627, 0x631, 0x3b, 0x627, 0x67e, 0x631, 0x3b, 0x645, 0x640, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x3b,</div><div class='del'>-0x627, 0x6af, 0x633, 0x3b, 0x633, 0x67e, 0x62a, 0x3b, 0x627, 0x6a9, 0x62a, 0x3b, 0x646, 0x648, 0x645, 0x3b, 0x62f, 0x633, 0x645, 0x3b,</div><div class='del'>-0x74, 0x68, 0x67, 0x20, 0x31, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x32, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x33, 0x3b, 0x74, 0x68,</div><div class='del'>-0x67, 0x20, 0x34, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x35, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x36, 0x3b, 0x74, 0x68, 0x67, 0x20,</div><div class='del'>-0x37, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x38, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x39, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x30,</div><div class='del'>-0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x31, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x32, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67,</div><div class='del'>-0x20, 0x6d, 0x1ed9, 0x74, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x68, 0x61, 0x69, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67,</div><div class='del'>-0x20, 0x62, 0x61, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x74, 0x1b0, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x6e,</div><div class='del'>-0x103, 0x6d, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x73, 0xe1, 0x75, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x62,</div><div class='del'>-0x1ea3, 0x79, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x74, 0xe1, 0x6d, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x63,</div><div class='del'>-0x68, 0xed, 0x6e, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x6d, 0x1b0, 0x1edd, 0x69, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67,</div><div class='del'>-0x20, 0x6d, 0x1b0, 0x1edd, 0x69, 0x20, 0x6d, 0x1ed9, 0x74, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x6d, 0x1b0, 0x1edd, 0x69,</div><div class='del'>-0x20, 0x68, 0x61, 0x69, 0x3b, 0x49, 0x6f, 0x6e, 0x3b, 0x43, 0x68, 0x77, 0x65, 0x66, 0x3b, 0x4d, 0x61, 0x77, 0x72, 0x74,</div><div class='del'>-0x68, 0x3b, 0x45, 0x62, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x65, 0x68, 0x3b, 0x47, 0x6f, 0x72,</div><div class='del'>-0x66, 0x66, 0x3b, 0x41, 0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79, 0x64, 0x3b, 0x54, 0x61, 0x63,</div><div class='del'>-0x68, 0x3b, 0x52, 0x68, 0x61, 0x67, 0x3b, 0x49, 0x6f, 0x6e, 0x61, 0x77, 0x72, 0x3b, 0x43, 0x68, 0x77, 0x65, 0x66, 0x72,</div><div class='del'>-0x6f, 0x72, 0x3b, 0x4d, 0x61, 0x77, 0x72, 0x74, 0x68, 0x3b, 0x45, 0x62, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x4d, 0x61, 0x69,</div><div class='del'>-0x3b, 0x4d, 0x65, 0x68, 0x65, 0x66, 0x69, 0x6e, 0x3b, 0x47, 0x6f, 0x72, 0x66, 0x66, 0x65, 0x6e, 0x61, 0x66, 0x3b, 0x41,</div><div class='del'>-0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79, 0x64, 0x72, 0x65, 0x66, 0x3b, 0x54, 0x61, 0x63, 0x68,</div><div class='del'>-0x77, 0x65, 0x64, 0x64, 0x3b, 0x52, 0x68, 0x61, 0x67, 0x66, 0x79, 0x72, 0x3b, 0x49, 0x3b, 0x43, 0x3b, 0x4d, 0x3b, 0x45,</div><div class='del'>-0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x52, 0x3b, 0x4a, 0x61, 0x6e,</div><div class='del'>-0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x74, 0x3b, 0x45, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e,</div><div class='del'>-0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76,</div><div class='del'>-0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x79, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75,</div><div class='del'>-0x77, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x74, 0x73, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x72, 0x65, 0x6c, 0x69, 0x3b, 0x4d,</div><div class='del'>-0x65, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x79, 0x69, 0x3b, 0x41, 0x67, 0x61, 0x73,</div><div class='del'>-0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x68, 0x6f, 0x62, 0x61, 0x3b,</div><div class='del'>-0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x1e62, 0x1eb9, 0x301, 0x72,</div><div class='del'>-0x1eb9, 0x323, 0x3b, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x1eb8, 0x72, 0x1eb9, 0x300, 0x6e, 0xe0, 0x3b, 0xcc, 0x67, 0x62, 0xe9,</div><div class='del'>-0x3b, 0x1eb8, 0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x41, 0x67, 0x1eb9, 0x6d, 0x1ecd, 0x3b,</div><div class='del'>-0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x1ecc, 0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x42, 0xe9,</div><div class='del'>-0x6c, 0xfa, 0x3b, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x300, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x1e62, 0x1eb8, 0x301, 0x72, 0x1eb9, 0x301, 0x3b,</div><div class='del'>-0x4f, 0x1e62, 0xf9, 0x20, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x1eb8, 0x72, 0x1eb9, 0x300, 0x6e, 0xe0,</div><div class='del'>-0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0xcc, 0x67, 0x62, 0xe9, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x1eb8, 0x300, 0x62, 0x69, 0x62, 0x69,</div><div class='del'>-0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x41, 0x67, 0x1eb9, 0x6d, 0x1ecd,</div><div class='del'>-0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b,</div><div class='del'>-0x4f, 0x1e62, 0xf9, 0x20, 0x1ecc, 0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x42, 0xe9, 0x6c, 0xfa, 0x3b,</div><div class='del'>-0x4f, 0x1e62, 0xf9, 0x20, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x300, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61,</div><div class='del'>-0x73, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67,</div><div class='del'>-0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61,</div><div class='del'>-0x6e, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x73,</div><div class='del'>-0x68, 0x69, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b,</div><div class='del'>-0x4a, 0x75, 0x6c, 0x61, 0x79, 0x69, 0x3b, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x68, 0x65,</div><div class='del'>-0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x68, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b,</div><div class='del'>-0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b,</div><div class='del'>-0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x6a, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x76, 0x67, 0x3b,</div><div class='del'>-0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x4a, 0x61, 0x6e, 0x75,</div><div class='del'>-0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69,</div><div class='del'>-0x6c, 0x3b, 0x4d, 0x61, 0x6a, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x76, 0x67, 0x75,</div><div class='del'>-0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72,</div><div class='del'>-0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4a,</div><div class='del'>-0x2d, 0x67, 0x75, 0x65, 0x72, 0x3b, 0x54, 0x2d, 0x61, 0x72, 0x72, 0x65, 0x65, 0x3b, 0x4d, 0x61, 0x79, 0x72, 0x6e, 0x74,</div><div class='del'>-0x3b, 0x41, 0x76, 0x72, 0x72, 0x69, 0x6c, 0x3b, 0x42, 0x6f, 0x61, 0x6c, 0x64, 0x79, 0x6e, 0x3b, 0x4d, 0x2d, 0x73, 0x6f,</div><div class='del'>-0x75, 0x72, 0x65, 0x65, 0x3b, 0x4a, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4c, 0x75, 0x61, 0x6e, 0x69, 0x73,</div><div class='del'>-0x74, 0x79, 0x6e, 0x3b, 0x4d, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4a, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69,</div><div class='del'>-0x72, 0x3b, 0x4d, 0x2e, 0x48, 0x6f, 0x75, 0x6e, 0x65, 0x79, 0x3b, 0x4d, 0x2e, 0x4e, 0x6f, 0x6c, 0x6c, 0x69, 0x63, 0x6b,</div><div class='del'>-0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x67, 0x65, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x54, 0x6f, 0x73, 0x68, 0x69,</div><div class='del'>-0x61, 0x67, 0x68, 0x74, 0x2d, 0x61, 0x72, 0x72, 0x65, 0x65, 0x3b, 0x4d, 0x61, 0x79, 0x72, 0x6e, 0x74, 0x3b, 0x41, 0x76,</div><div class='del'>-0x65, 0x72, 0x69, 0x6c, 0x3b, 0x42, 0x6f, 0x61, 0x6c, 0x64, 0x79, 0x6e, 0x3b, 0x4d, 0x65, 0x61, 0x6e, 0x2d, 0x73, 0x6f,</div><div class='del'>-0x75, 0x72, 0x65, 0x65, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4c,</div><div class='del'>-0x75, 0x61, 0x6e, 0x69, 0x73, 0x74, 0x79, 0x6e, 0x3b, 0x4d, 0x65, 0x61, 0x6e, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72,</div><div class='del'>-0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x20, 0x48,</div><div class='del'>-0x6f, 0x75, 0x6e, 0x65, 0x79, 0x3b, 0x4d, 0x65, 0x65, 0x20, 0x6e, 0x79, 0x20, 0x4e, 0x6f, 0x6c, 0x6c, 0x69, 0x63, 0x6b,</div><div class='del'>-0x3b, 0x47, 0x65, 0x6e, 0x3b, 0x57, 0x68, 0x65, 0x3b, 0x4d, 0x65, 0x72, 0x3b, 0x45, 0x62, 0x72, 0x3b, 0x4d, 0x65, 0x3b,</div><div class='del'>-0x45, 0x66, 0x6e, 0x3b, 0x47, 0x6f, 0x72, 0x3b, 0x45, 0x73, 0x74, 0x3b, 0x47, 0x77, 0x6e, 0x3b, 0x48, 0x65, 0x64, 0x3b,</div><div class='del'>-0x44, 0x75, 0x3b, 0x4b, 0x65, 0x76, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x47, 0x65, 0x6e, 0x76, 0x65, 0x72, 0x3b, 0x4d, 0x79,</div><div class='del'>-0x73, 0x20, 0x57, 0x68, 0x65, 0x76, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x4d, 0x65, 0x72, 0x74, 0x68, 0x3b,</div><div class='del'>-0x4d, 0x79, 0x73, 0x20, 0x45, 0x62, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x4d, 0x65, 0x3b, 0x4d, 0x79, 0x73,</div><div class='del'>-0x20, 0x45, 0x66, 0x61, 0x6e, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x47, 0x6f, 0x72, 0x74, 0x68, 0x65, 0x72, 0x65, 0x6e, 0x3b,</div><div class='del'>-0x4d, 0x79, 0x65, 0x20, 0x45, 0x73, 0x74, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x47, 0x77, 0x79, 0x6e, 0x67, 0x61, 0x6c, 0x61,</div><div class='del'>-0x3b, 0x4d, 0x79, 0x73, 0x20, 0x48, 0x65, 0x64, 0x72, 0x61, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x44, 0x75, 0x3b, 0x4d, 0x79,</div><div class='del'>-0x73, 0x20, 0x4b, 0x65, 0x76, 0x61, 0x72, 0x64, 0x68, 0x75, 0x3b, 0x53, 0x2d, 0x186, 0x3b, 0x4b, 0x2d, 0x186, 0x3b, 0x45,</div><div class='del'>-0x2d, 0x186, 0x3b, 0x45, 0x2d, 0x4f, 0x3b, 0x45, 0x2d, 0x4b, 0x3b, 0x4f, 0x2d, 0x41, 0x3b, 0x41, 0x2d, 0x4b, 0x3b, 0x44,</div><div class='del'>-0x2d, 0x186, 0x3b, 0x46, 0x2d, 0x190, 0x3b, 0x186, 0x2d, 0x41, 0x3b, 0x186, 0x2d, 0x4f, 0x3b, 0x4d, 0x2d, 0x186, 0x3b, 0x53,</div><div class='del'>-0x61, 0x6e, 0x64, 0x61, 0x2d, 0x186, 0x70, 0x25b, 0x70, 0x254, 0x6e, 0x3b, 0x4b, 0x77, 0x61, 0x6b, 0x77, 0x61, 0x72, 0x2d,</div><div class='del'>-0x186, 0x67, 0x79, 0x65, 0x66, 0x75, 0x6f, 0x3b, 0x45, 0x62, 0x254, 0x77, 0x2d, 0x186, 0x62, 0x65, 0x6e, 0x65, 0x6d, 0x3b,</div><div class='del'>-0x45, 0x62, 0x254, 0x62, 0x69, 0x72, 0x61, 0x2d, 0x4f, 0x66, 0x6f, 0x72, 0x69, 0x73, 0x75, 0x6f, 0x3b, 0x45, 0x73, 0x75,</div><div class='del'>-0x73, 0x6f, 0x77, 0x20, 0x41, 0x6b, 0x65, 0x74, 0x73, 0x65, 0x61, 0x62, 0x61, 0x2d, 0x4b, 0x254, 0x74, 0x254, 0x6e, 0x69,</div><div class='del'>-0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x62, 0x69, 0x72, 0x61, 0x64, 0x65, 0x2d, 0x41, 0x79, 0x25b, 0x77, 0x6f, 0x68, 0x6f, 0x6d,</div><div class='del'>-0x75, 0x6d, 0x75, 0x3b, 0x41, 0x79, 0x25b, 0x77, 0x6f, 0x68, 0x6f, 0x2d, 0x4b, 0x69, 0x74, 0x61, 0x77, 0x6f, 0x6e, 0x73,</div><div class='del'>-0x61, 0x3b, 0x44, 0x69, 0x66, 0x75, 0x75, 0x2d, 0x186, 0x73, 0x61, 0x6e, 0x64, 0x61, 0x61, 0x3b, 0x46, 0x61, 0x6e, 0x6b,</div><div class='del'>-0x77, 0x61, 0x2d, 0x190, 0x62, 0x254, 0x3b, 0x186, 0x62, 0x25b, 0x73, 0x25b, 0x2d, 0x41, 0x68, 0x69, 0x6e, 0x69, 0x6d, 0x65,</div><div class='del'>-0x3b, 0x186, 0x62, 0x65, 0x72, 0x25b, 0x66, 0x25b, 0x77, 0x2d, 0x4f, 0x62, 0x75, 0x62, 0x75, 0x6f, 0x3b, 0x4d, 0x75, 0x6d,</div><div class='del'>-0x75, 0x2d, 0x186, 0x70, 0x25b, 0x6e, 0x69, 0x6d, 0x62, 0x61, 0x3b, 0x91c, 0x93e, 0x928, 0x947, 0x935, 0x93e, 0x930, 0x940, 0x3b,</div><div class='del'>-0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x90f, 0x92a, 0x94d,</div><div class='del'>-0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x948, 0x3b, 0x913, 0x917, 0x938, 0x94d,</div><div class='del'>-0x91f, 0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x913, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b,</div><div class='del'>-0x928, 0x94b, 0x935, 0x94d, 0x939, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x41, 0x68,</div><div class='del'>-0x61, 0x3b, 0x4f, 0x66, 0x6c, 0x3b, 0x4f, 0x63, 0x68, 0x3b, 0x41, 0x62, 0x65, 0x3b, 0x41, 0x67, 0x62, 0x3b, 0x4f, 0x74,</div><div class='del'>-0x75, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x4d, 0x61, 0x6e, 0x3b, 0x47, 0x62, 0x6f, 0x3b, 0x41, 0x6e, 0x74, 0x3b, 0x41, 0x6c,</div><div class='del'>-0x65, 0x3b, 0x41, 0x66, 0x75, 0x3b, 0x41, 0x68, 0x61, 0x72, 0x61, 0x62, 0x61, 0x74, 0x61, 0x3b, 0x4f, 0x66, 0x6c, 0x6f,</div><div class='del'>-0x3b, 0x4f, 0x63, 0x68, 0x6f, 0x6b, 0x72, 0x69, 0x6b, 0x72, 0x69, 0x3b, 0x41, 0x62, 0x65, 0x69, 0x62, 0x65, 0x65, 0x3b,</div><div class='del'>-0x41, 0x67, 0x62, 0x65, 0x69, 0x6e, 0x61, 0x61, 0x3b, 0x4f, 0x74, 0x75, 0x6b, 0x77, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x4d,</div><div class='del'>-0x61, 0x61, 0x77, 0x65, 0x3b, 0x4d, 0x61, 0x6e, 0x79, 0x61, 0x77, 0x61, 0x6c, 0x65, 0x3b, 0x47, 0x62, 0x6f, 0x3b, 0x41,</div><div class='del'>-0x6e, 0x74, 0x6f, 0x6e, 0x3b, 0x41, 0x6c, 0x65, 0x6d, 0x6c, 0x65, 0x3b, 0x41, 0x66, 0x75, 0x61, 0x62, 0x65, 0x65, 0x3b,</div><div class='del'>-0x4a, 0x65, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x45, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x3b,</div><div class='del'>-0x4a, 0x75, 0x75, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x1ecc, 0x67, 0x1ecd, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x1ecc, 0x6b, 0x74, 0x3b,</div><div class='del'>-0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x65, 0x6e, 0x1ee5, 0x77, 0x61, 0x72, 0x1ecb, 0x3b, 0x46, 0x65, 0x62,</div><div class='del'>-0x72, 0x1ee5, 0x77, 0x61, 0x72, 0x1ecb, 0x3b, 0x4d, 0x61, 0x61, 0x63, 0x68, 0x1ecb, 0x3b, 0x45, 0x70, 0x72, 0x65, 0x6c, 0x3b,</div><div class='del'>-0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x1ecb, 0x3b, 0x1ecc, 0x67, 0x1ecd, 0x1ecd, 0x73,</div><div class='del'>-0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x1ecc, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f,</div><div class='del'>-0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4d, 0x62, 0x65, 0x3b, 0x4b, 0x65,</div><div class='del'>-0x6c, 0x3b, 0x4b, 0x74, 0x169, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x4b, 0x74, 0x6e, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x4d, 0x6f,</div><div class='del'>-0x6f, 0x3b, 0x4e, 0x79, 0x61, 0x3b, 0x4b, 0x6e, 0x64, 0x3b, 0x128, 0x6b, 0x75, 0x3b, 0x128, 0x6b, 0x6d, 0x3b, 0x128, 0x6b,</div><div class='del'>-0x6c, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x62, 0x65, 0x65, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20,</div><div class='del'>-0x77, 0x61, 0x20, 0x6b, 0x65, 0x6c, 0x129, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61,</div><div class='del'>-0x74, 0x169, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69,</div><div class='del'>-0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x74,</div><div class='del'>-0x68, 0x61, 0x6e, 0x74, 0x68, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x75, 0x6f,</div><div class='del'>-0x6e, 0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6e, 0x79, 0x61, 0x61, 0x6e, 0x79, 0x61, 0x3b,</div><div class='del'>-0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77,</div><div class='del'>-0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d,</div><div class='del'>-0x69, 0x20, 0x6e, 0x61, 0x20, 0x129, 0x6d, 0x77, 0x65, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b,</div><div class='del'>-0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x6c, 0x129, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b,</div><div class='del'>-0x3b, 0x54, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x128, 0x3b, 0x128, 0x3b, 0x128, 0x3b, 0x70f, 0x71f, 0x722, 0x20, 0x70f,</div><div class='del'>-0x712, 0x3b, 0x72b, 0x712, 0x71b, 0x3b, 0x710, 0x715, 0x72a, 0x3b, 0x722, 0x71d, 0x723, 0x722, 0x3b, 0x710, 0x71d, 0x72a, 0x3b, 0x71a,</div><div class='del'>-0x719, 0x71d, 0x72a, 0x722, 0x3b, 0x72c, 0x721, 0x718, 0x719, 0x3b, 0x710, 0x712, 0x3b, 0x710, 0x71d, 0x720, 0x718, 0x720, 0x3b, 0x70f,</div><div class='del'>-0x72c, 0x72b, 0x20, 0x70f, 0x710, 0x3b, 0x70f, 0x72c, 0x72b, 0x20, 0x70f, 0x712, 0x3b, 0x70f, 0x71f, 0x722, 0x20, 0x70f, 0x710, 0x3b,</div><div class='del'>-0x120d, 0x12f0, 0x1275, 0x3b, 0x12ab, 0x1265, 0x12bd, 0x3b, 0x12ad, 0x1265, 0x120b, 0x3b, 0x134b, 0x1305, 0x12ba, 0x3b, 0x12ad, 0x1262, 0x1245, 0x3b,</div><div class='del'>-0x121d, 0x2f, 0x1275, 0x3b, 0x12b0, 0x122d, 0x3b, 0x121b, 0x122d, 0x12eb, 0x3b, 0x12eb, 0x12b8, 0x1292, 0x3b, 0x1218, 0x1270, 0x1209, 0x3b, 0x121d,</div><div class='del'>-0x2f, 0x121d, 0x3b, 0x1270, 0x1215, 0x1233, 0x3b, 0x120d, 0x12f0, 0x1275, 0x122a, 0x3b, 0x12ab, 0x1265, 0x12bd, 0x1265, 0x1272, 0x3b, 0x12ad, 0x1265,</div><div class='del'>-0x120b, 0x3b, 0x134b, 0x1305, 0x12ba, 0x122a, 0x3b, 0x12ad, 0x1262, 0x1245, 0x122a, 0x3b, 0x121d, 0x12aa, 0x12a4, 0x120d, 0x20, 0x1275, 0x131f, 0x1292,</div><div class='del'>-0x122a, 0x3b, 0x12b0, 0x122d, 0x12a9, 0x3b, 0x121b, 0x122d, 0x12eb, 0x121d, 0x20, 0x1275, 0x122a, 0x3b, 0x12eb, 0x12b8, 0x1292, 0x20, 0x1218, 0x1233,</div><div class='del'>-0x1245, 0x1208, 0x122a, 0x3b, 0x1218, 0x1270, 0x1209, 0x3b, 0x121d, 0x12aa, 0x12a4, 0x120d, 0x20, 0x1218, 0x123d, 0x12c8, 0x122a, 0x3b, 0x1270, 0x1215,</div><div class='del'>-0x1233, 0x1235, 0x122a, 0x3b, 0x120d, 0x3b, 0x12ab, 0x3b, 0x12ad, 0x3b, 0x134b, 0x3b, 0x12ad, 0x3b, 0x121d, 0x3b, 0x12b0, 0x3b, 0x121b, 0x3b,</div><div class='del'>-0x12eb, 0x3b, 0x1218, 0x3b, 0x121d, 0x3b, 0x1270, 0x3b, 0x1320, 0x1210, 0x1228, 0x3b, 0x12a8, 0x1270, 0x1270, 0x3b, 0x1218, 0x1308, 0x1260, 0x3b,</div><div class='del'>-0x12a0, 0x1280, 0x12d8, 0x3b, 0x130d, 0x1295, 0x1263, 0x1275, 0x3b, 0x1220, 0x1295, 0x12e8, 0x3b, 0x1210, 0x1218, 0x1208, 0x3b, 0x1290, 0x1210, 0x1230,</div><div class='del'>-0x3b, 0x12a8, 0x1228, 0x1218, 0x3b, 0x1320, 0x1240, 0x1218, 0x3b, 0x1280, 0x12f0, 0x1228, 0x3b, 0x1280, 0x1220, 0x1220, 0x3b, 0x1320, 0x3b, 0x12a8,</div><div class='del'>-0x3b, 0x1218, 0x3b, 0x12a0, 0x3b, 0x130d, 0x3b, 0x1220, 0x3b, 0x1210, 0x3b, 0x1290, 0x3b, 0x12a8, 0x3b, 0x1320, 0x3b, 0x1280, 0x3b, 0x1280,</div><div class='del'>-0x3b, 0x57, 0x65, 0x79, 0x3b, 0x46, 0x61, 0x6e, 0x3b, 0x54, 0x61, 0x74, 0x3b, 0x4e, 0x61, 0x6e, 0x3b, 0x54, 0x75, 0x79,</div><div class='del'>-0x3b, 0x54, 0x73, 0x6f, 0x3b, 0x54, 0x61, 0x66, 0x3b, 0x57, 0x61, 0x72, 0x3b, 0x4b, 0x75, 0x6e, 0x3b, 0x42, 0x61, 0x6e,</div><div class='del'>-0x3b, 0x4b, 0x6f, 0x6d, 0x3b, 0x53, 0x61, 0x75, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x57, 0x65, 0x79, 0x65, 0x6e, 0x65, 0x3b,</div><div class='del'>-0x46, 0x61, 0x69, 0x20, 0x46, 0x61, 0x6e, 0x69, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x54, 0x61, 0x74, 0x61, 0x6b, 0x61, 0x3b,</div><div class='del'>-0x46, 0x61, 0x69, 0x20, 0x4e, 0x61, 0x6e, 0x67, 0x72, 0x61, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x54, 0x75, 0x79, 0x6f, 0x3b,</div><div class='del'>-0x46, 0x61, 0x69, 0x20, 0x54, 0x73, 0x6f, 0x79, 0x69, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x54, 0x61, 0x66, 0x61, 0x6b, 0x61,</div><div class='del'>-0x3b, 0x46, 0x61, 0x69, 0x20, 0x57, 0x61, 0x72, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x4b, 0x75, 0x6e,</div><div class='del'>-0x6f, 0x62, 0x6f, 0x6b, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x42, 0x61, 0x6e, 0x73, 0x6f, 0x6b, 0x3b, 0x46, 0x61, 0x69, 0x20,</div><div class='del'>-0x4b, 0x6f, 0x6d, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x53, 0x61, 0x75, 0x6b, 0x3b, 0x44, 0x79, 0x6f, 0x6e, 0x3b, 0x42, 0x61,</div><div class='del'>-0x61, 0x3b, 0x41, 0x74, 0x61, 0x74, 0x3b, 0x41, 0x6e, 0x61, 0x73, 0x3b, 0x41, 0x74, 0x79, 0x6f, 0x3b, 0x41, 0x63, 0x68,</div><div class='del'>-0x69, 0x3b, 0x41, 0x74, 0x61, 0x72, 0x3b, 0x41, 0x77, 0x75, 0x72, 0x3b, 0x53, 0x68, 0x61, 0x64, 0x3b, 0x53, 0x68, 0x61,</div><div class='del'>-0x6b, 0x3b, 0x4e, 0x61, 0x62, 0x61, 0x3b, 0x4e, 0x61, 0x74, 0x61, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x44, 0x79, 0x6f, 0x6e,</div><div class='del'>-0x3b, 0x50, 0x65, 0x6e, 0x20, 0x42, 0x61, 0x27, 0x61, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x74, 0x61, 0x74, 0x3b, 0x50,</div><div class='del'>-0x65, 0x6e, 0x20, 0x41, 0x6e, 0x61, 0x73, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x74, 0x79, 0x6f, 0x6e, 0x3b, 0x50, 0x65,</div><div class='del'>-0x6e, 0x20, 0x41, 0x63, 0x68, 0x69, 0x72, 0x69, 0x6d, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x74, 0x61, 0x72, 0x69, 0x62,</div><div class='del'>-0x61, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x77, 0x75, 0x72, 0x72, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x53, 0x68, 0x61, 0x64,</div><div class='del'>-0x6f, 0x6e, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x53, 0x68, 0x61, 0x6b, 0x75, 0x72, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x4b, 0x75,</div><div class='del'>-0x72, 0x20, 0x4e, 0x61, 0x62, 0x61, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x4b, 0x75, 0x72, 0x20, 0x4e, 0x61, 0x74, 0x61, 0x74,</div><div class='del'>-0x3b, 0x41, 0x331, 0x79, 0x72, 0x3b, 0x41, 0x331, 0x68, 0x77, 0x3b, 0x41, 0x331, 0x74, 0x61, 0x3b, 0x41, 0x331, 0x6e, 0x61,</div><div class='del'>-0x3b, 0x41, 0x331, 0x70, 0x66, 0x3b, 0x41, 0x331, 0x6b, 0x69, 0x3b, 0x41, 0x331, 0x74, 0x79, 0x3b, 0x41, 0x331, 0x6e, 0x69,</div><div class='del'>-0x3b, 0x41, 0x331, 0x6b, 0x75, 0x3b, 0x53, 0x77, 0x61, 0x3b, 0x53, 0x62, 0x79, 0x3b, 0x53, 0x62, 0x68, 0x3b, 0x48, 0x79,</div><div class='del'>-0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x79, 0x72, 0x6e, 0x69, 0x67, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331,</div><div class='del'>-0x68, 0x77, 0x61, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x74, 0x61, 0x74, 0x3b, 0x48, 0x79, 0x77, 0x61,</div><div class='del'>-0x6e, 0x20, 0x41, 0x331, 0x6e, 0x61, 0x61, 0x69, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x70, 0x66, 0x77,</div><div class='del'>-0x6f, 0x6e, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x6b, 0x69, 0x74, 0x61, 0x74, 0x3b, 0x48, 0x79, 0x77,</div><div class='del'>-0x61, 0x6e, 0x20, 0x41, 0x331, 0x74, 0x79, 0x69, 0x72, 0x69, 0x6e, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331,</div><div class='del'>-0x6e, 0x69, 0x6e, 0x61, 0x69, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x6b, 0x75, 0x6d, 0x76, 0x69, 0x72,</div><div class='del'>-0x69, 0x79, 0x69, 0x6e, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x53, 0x77, 0x61, 0x6b, 0x3b, 0x48, 0x79, 0x77, 0x61,</div><div class='del'>-0x6e, 0x20, 0x53, 0x77, 0x61, 0x6b, 0x20, 0x42, 0x27, 0x61, 0x331, 0x79, 0x72, 0x6e, 0x69, 0x67, 0x3b, 0x48, 0x79, 0x77,</div><div class='del'>-0x61, 0x6e, 0x20, 0x53, 0x77, 0x61, 0x6b, 0x20, 0x42, 0x27, 0x61, 0x331, 0x68, 0x77, 0x61, 0x3b, 0x5a, 0x65, 0x6e, 0x3b,</div><div class='del'>-0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x76, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x67, 0x3b,</div><div class='del'>-0x4c, 0x75, 0x69, 0x3b, 0x41, 0x76, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x3b,</div><div class='del'>-0x44, 0x69, 0x63, 0x3b, 0x5a, 0x65, 0x6e, 0xe2, 0x72, 0x3b, 0x46, 0x65, 0x76, 0x72, 0xe2, 0x72, 0x3b, 0x4d, 0x61, 0x72,</div><div class='del'>-0xe7, 0x3b, 0x41, 0x76, 0x72, 0xee, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x67, 0x6e, 0x3b, 0x4c, 0x75, 0x69,</div><div class='del'>-0x3b, 0x41, 0x76, 0x6f, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x74, 0x75, 0x62,</div><div class='del'>-0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x44, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72,</div><div class='del'>-0x3b, 0x5a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f,</div><div class='del'>-0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x50, 0x68, 0x61, 0x3b, 0x4c, 0x75, 0x68, 0x3b, 0x1e70, 0x68, 0x61, 0x3b, 0x4c, 0x61, 0x6d,</div><div class='del'>-0x3b, 0x53, 0x68, 0x75, 0x3b, 0x4c, 0x77, 0x69, 0x3b, 0x4c, 0x77, 0x61, 0x3b, 0x1e70, 0x68, 0x61, 0x3b, 0x4b, 0x68, 0x75,</div><div class='del'>-0x3b, 0x54, 0x73, 0x68, 0x3b, 0x1e3c, 0x61, 0x72, 0x3b, 0x4e, 0x79, 0x65, 0x3b, 0x50, 0x68, 0x61, 0x6e, 0x64, 0x6f, 0x3b,</div><div class='del'>-0x4c, 0x75, 0x68, 0x75, 0x68, 0x69, 0x3b, 0x1e70, 0x68, 0x61, 0x66, 0x61, 0x6d, 0x75, 0x68, 0x77, 0x65, 0x3b, 0x4c, 0x61,</div><div class='del'>-0x6d, 0x62, 0x61, 0x6d, 0x61, 0x69, 0x3b, 0x53, 0x68, 0x75, 0x6e, 0x64, 0x75, 0x6e, 0x74, 0x68, 0x75, 0x6c, 0x65, 0x3b,</div><div class='del'>-0x46, 0x75, 0x6c, 0x77, 0x69, 0x3b, 0x46, 0x75, 0x6c, 0x77, 0x61, 0x6e, 0x61, 0x3b, 0x1e70, 0x68, 0x61, 0x6e, 0x67, 0x75,</div><div class='del'>-0x6c, 0x65, 0x3b, 0x4b, 0x68, 0x75, 0x62, 0x76, 0x75, 0x6d, 0x65, 0x64, 0x7a, 0x69, 0x3b, 0x54, 0x73, 0x68, 0x69, 0x6d,</div><div class='del'>-0x65, 0x64, 0x7a, 0x69, 0x3b, 0x1e3c, 0x61, 0x72, 0x61, 0x3b, 0x4e, 0x79, 0x65, 0x6e, 0x64, 0x61, 0x76, 0x68, 0x75, 0x73,</div><div class='del'>-0x69, 0x6b, 0x75, 0x3b, 0x44, 0x7a, 0x76, 0x3b, 0x44, 0x7a, 0x64, 0x3b, 0x54, 0x65, 0x64, 0x3b, 0x41, 0x66, 0x254, 0x3b,</div><div class='del'>-0x44, 0x61, 0x6d, 0x3b, 0x4d, 0x61, 0x73, 0x3b, 0x53, 0x69, 0x61, 0x3b, 0x44, 0x65, 0x61, 0x3b, 0x41, 0x6e, 0x79, 0x3b,</div><div class='del'>-0x4b, 0x65, 0x6c, 0x3b, 0x41, 0x64, 0x65, 0x3b, 0x44, 0x7a, 0x6d, 0x3b, 0x44, 0x7a, 0x6f, 0x76, 0x65, 0x3b, 0x44, 0x7a,</div><div class='del'>-0x6f, 0x64, 0x7a, 0x65, 0x3b, 0x54, 0x65, 0x64, 0x6f, 0x78, 0x65, 0x3b, 0x41, 0x66, 0x254, 0x66, 0x69, 0x25b, 0x3b, 0x44,</div><div class='del'>-0x61, 0x6d, 0x61, 0x3b, 0x4d, 0x61, 0x73, 0x61, 0x3b, 0x53, 0x69, 0x61, 0x6d, 0x6c, 0x254, 0x6d, 0x3b, 0x44, 0x65, 0x61,</div><div class='del'>-0x73, 0x69, 0x61, 0x6d, 0x69, 0x6d, 0x65, 0x3b, 0x41, 0x6e, 0x79, 0x254, 0x6e, 0x79, 0x254, 0x3b, 0x4b, 0x65, 0x6c, 0x65,</div><div class='del'>-0x3b, 0x41, 0x64, 0x65, 0x25b, 0x6d, 0x65, 0x6b, 0x70, 0x254, 0x78, 0x65, 0x3b, 0x44, 0x7a, 0x6f, 0x6d, 0x65, 0x3b, 0x44,</div><div class='del'>-0x3b, 0x44, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x44, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x44, 0x3b, 0x41, 0x3b, 0x4b, 0x3b, 0x41,</div><div class='del'>-0x3b, 0x44, 0x3b, 0x49, 0x61, 0x6e, 0x2e, 0x3b, 0x50, 0x65, 0x70, 0x2e, 0x3b, 0x4d, 0x61, 0x6c, 0x2e, 0x3b, 0x2bb, 0x41,</div><div class='del'>-0x70, 0x2e, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x49, 0x75, 0x6e, 0x2e, 0x3b, 0x49, 0x75, 0x6c, 0x2e, 0x3b, 0x2bb, 0x41, 0x75,</div><div class='del'>-0x2e, 0x3b, 0x4b, 0x65, 0x70, 0x2e, 0x3b, 0x2bb, 0x4f, 0x6b, 0x2e, 0x3b, 0x4e, 0x6f, 0x77, 0x2e, 0x3b, 0x4b, 0x65, 0x6b,</div><div class='del'>-0x2e, 0x3b, 0x49, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x50, 0x65, 0x70, 0x65, 0x6c, 0x75, 0x61, 0x6c, 0x69, 0x3b,</div><div class='del'>-0x4d, 0x61, 0x6c, 0x61, 0x6b, 0x69, 0x3b, 0x2bb, 0x41, 0x70, 0x65, 0x6c, 0x69, 0x6c, 0x61, 0x3b, 0x4d, 0x65, 0x69, 0x3b,</div><div class='del'>-0x49, 0x75, 0x6e, 0x65, 0x3b, 0x49, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x2bb, 0x41, 0x75, 0x6b, 0x61, 0x6b, 0x65, 0x3b, 0x4b,</div><div class='del'>-0x65, 0x70, 0x61, 0x6b, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x6b, 0x6f, 0x70, 0x61, 0x3b, 0x4e,</div><div class='del'>-0x6f, 0x77, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x4b, 0x65, 0x6b, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x4a, 0x75, 0x77,</div><div class='del'>-0x3b, 0x53, 0x77, 0x69, 0x3b, 0x54, 0x73, 0x61, 0x3b, 0x4e, 0x79, 0x61, 0x3b, 0x54, 0x73, 0x77, 0x3b, 0x41, 0x74, 0x61,</div><div class='del'>-0x3b, 0x41, 0x6e, 0x61, 0x3b, 0x41, 0x72, 0x69, 0x3b, 0x41, 0x6b, 0x75, 0x3b, 0x53, 0x77, 0x61, 0x3b, 0x4d, 0x61, 0x6e,</div><div class='del'>-0x3b, 0x4d, 0x61, 0x73, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x4a, 0x75, 0x77, 0x75, 0x6e, 0x67, 0x3b, 0x5a, 0x77, 0x61,</div><div class='del'>-0x74, 0x20, 0x53, 0x77, 0x69, 0x79, 0x61, 0x6e, 0x67, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x54, 0x73, 0x61, 0x74, 0x3b,</div><div class='del'>-0x5a, 0x77, 0x61, 0x74, 0x20, 0x4e, 0x79, 0x61, 0x69, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x54, 0x73, 0x77, 0x6f, 0x6e,</div><div class='del'>-0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x41, 0x74, 0x61, 0x61, 0x68, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x41, 0x6e, 0x61,</div><div class='del'>-0x74, 0x61, 0x74, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x41, 0x72, 0x69, 0x6e, 0x61, 0x69, 0x3b, 0x5a, 0x77, 0x61, 0x74,</div><div class='del'>-0x20, 0x41, 0x6b, 0x75, 0x62, 0x75, 0x6e, 0x79, 0x75, 0x6e, 0x67, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x53, 0x77, 0x61,</div><div class='del'>-0x67, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x4d, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x77, 0x61, 0x6e, 0x67, 0x3b, 0x5a, 0x77,</div><div class='del'>-0x61, 0x74, 0x20, 0x53, 0x77, 0x61, 0x67, 0x2d, 0x4d, 0x61, 0x2d, 0x53, 0x75, 0x79, 0x61, 0x6e, 0x67, 0x3b, 0x4a, 0x61,</div><div class='del'>-0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x6c, 0x3b, 0x45, 0x70, 0x75, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75,</div><div class='del'>-0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x75, 0x3b, 0x4e, 0x6f,</div><div class='del'>-0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x77, 0x61, 0x6c, 0x65, 0x3b, 0x46, 0x65, 0x62, 0x75, 0x6c,</div><div class='del'>-0x75, 0x77, 0x61, 0x6c, 0x65, 0x3b, 0x4d, 0x61, 0x6c, 0x69, 0x63, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x75, 0x6c, 0x6f, 0x3b,</div><div class='del'>-0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x4f, 0x67, 0x61, 0x73, 0x69,</div><div class='del'>-0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x75, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x75, 0x74, 0x6f, 0x62, 0x61,</div><div class='del'>-0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x45, 0x6e, 0x65,</div><div class='del'>-0x3b, 0x50, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48, 0x75, 0x6e,</div><div class='del'>-0x3b, 0x48, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62,</div><div class='del'>-0x3b, 0x44, 0x69, 0x73, 0x3b, 0x45, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x50, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x4d,</div><div class='del'>-0x61, 0x72, 0x73, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x6f, 0x3b, 0x48, 0x75, 0x6e, 0x79,</div><div class='del'>-0x6f, 0x3b, 0x48, 0x75, 0x6c, 0x79, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x79, 0x65,</div><div class='del'>-0x6d, 0x62, 0x72, 0x65, 0x3b, 0x4f, 0x6b, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x4e, 0x6f, 0x62, 0x79, 0x65, 0x6d, 0x62,</div><div class='del'>-0x72, 0x65, 0x3b, 0x44, 0x69, 0x73, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x45, 0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x41,</div><div class='del'>-0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x48, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e,</div><div class='del'>-0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72,</div><div class='del'>-0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67,</div><div class='del'>-0x75, 0x73, 0x63, 0x68, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f,</div><div class='del'>-0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0xe4, 0x6d, 0x62,</div><div class='del'>-0x65, 0x72, 0x3b, 0xa2cd, 0xa1aa, 0x3b, 0xa44d, 0xa1aa, 0x3b, 0xa315, 0xa1aa, 0x3b, 0xa1d6, 0xa1aa, 0x3b, 0xa26c, 0xa1aa, 0x3b, 0xa0d8, 0xa1aa,</div><div class='del'>-0x3b, 0xa3c3, 0xa1aa, 0x3b, 0xa246, 0xa1aa, 0x3b, 0xa22c, 0xa1aa, 0x3b, 0xa2b0, 0xa1aa, 0x3b, 0xa2b0, 0xa2aa, 0xa1aa, 0x3b, 0xa2b0, 0xa44b, 0xa1aa,</div><div class='del'>-0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79,</div><div class='del'>-0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x72, 0x68, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74,</div><div class='del'>-0x3b, 0x55, 0x73, 0x69, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x61, 0x62, 0x61, 0x72, 0x69, 0x3b, 0x75, 0x46,</div><div class='del'>-0x65, 0x62, 0x65, 0x72, 0x62, 0x61, 0x72, 0x69, 0x3b, 0x75, 0x4d, 0x61, 0x74, 0x6a, 0x68, 0x69, 0x3b, 0x75, 0x2d, 0x41,</div><div class='del'>-0x70, 0x72, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61,</div><div class='del'>-0x79, 0x69, 0x3b, 0x41, 0x72, 0x68, 0x6f, 0x73, 0x74, 0x6f, 0x73, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62,</div><div class='del'>-0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x55, 0x73, 0x69, 0x6e, 0x79, 0x69, 0x6b, 0x68, 0x61, 0x62, 0x61,</div><div class='del'>-0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x74,</div><div class='del'>-0x3b, 0x41, 0x70, 0x6f, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f,</div><div class='del'>-0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x66, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e,</div><div class='del'>-0x61, 0x77, 0x61, 0x72, 0x65, 0x3b, 0x46, 0x65, 0x62, 0x65, 0x72, 0x77, 0x61, 0x72, 0x65, 0x3b, 0x4d, 0x61, 0x74, 0x161,</div><div class='del'>-0x68, 0x65, 0x3b, 0x41, 0x70, 0x6f, 0x72, 0x65, 0x6c, 0x65, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x65, 0x3b,</div><div class='del'>-0x4a, 0x75, 0x6c, 0x61, 0x65, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x73, 0x65, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d,</div><div class='del'>-0x65, 0x72, 0x65, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x6f, 0x72, 0x65, 0x3b, 0x4e, 0x6f, 0x66, 0x65, 0x6d, 0x65, 0x72,</div><div class='del'>-0x65, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x65, 0x72, 0x65, 0x3b, 0x6f, 0x111, 0x111, 0x61, 0x6a, 0x61, 0x67, 0x65, 0x3b,</div><div class='del'>-0x67, 0x75, 0x6f, 0x76, 0x76, 0x61, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x10d, 0x61, 0x3b, 0x63, 0x75, 0x6f, 0x14b, 0x6f, 0x3b,</div><div class='del'>-0x6d, 0x69, 0x65, 0x73, 0x73, 0x65, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x73, 0x65, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x64, 0x6e,</div><div class='del'>-0x65, 0x3b, 0x62, 0x6f, 0x72, 0x67, 0x65, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x61, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x67, 0x6f,</div><div class='del'>-0x74, 0x3b, 0x73, 0x6b, 0xe1, 0x62, 0x6d, 0x61, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c, 0x61, 0x3b, 0x6f, 0x111, 0x111, 0x61,</div><div class='del'>-0x6a, 0x61, 0x67, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x76, 0x61, 0x6d, 0xe1, 0x6e, 0x6e,</div><div class='del'>-0x75, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x10d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x63, 0x75, 0x6f, 0x14b, 0x6f, 0x6d,</div><div class='del'>-0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6d, 0x69, 0x65, 0x73, 0x73, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x65, 0x61,</div><div class='del'>-0x73, 0x73, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x64, 0x6e, 0x65, 0x6d, 0xe1, 0x6e, 0x6e,</div><div class='del'>-0x75, 0x3b, 0x62, 0x6f, 0x72, 0x67, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x61, 0x6d, 0xe1,</div><div class='del'>-0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x67, 0x6f, 0x74, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x73, 0x6b, 0xe1,</div><div class='del'>-0x62, 0x6d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75,</div><div class='del'>-0x3b, 0x4f, 0x3b, 0x47, 0x3b, 0x4e, 0x3b, 0x43, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x42, 0x3b, 0x10c, 0x3b, 0x47,</div><div class='del'>-0x3b, 0x53, 0x3b, 0x4a, 0x3b, 0x6f, 0x111, 0x111, 0x6a, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x3b,</div><div class='del'>-0x63, 0x75, 0x6f, 0x3b, 0x6d, 0x69, 0x65, 0x73, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x3b, 0x62,</div><div class='del'>-0x6f, 0x72, 0x67, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x3b, 0x73, 0x6b, 0xe1, 0x62, 0x3b, 0x6a,</div><div class='del'>-0x75, 0x6f, 0x76, 0x3b, 0x4b, 0x69, 0x69, 0x3b, 0x44, 0x68, 0x69, 0x3b, 0x54, 0x72, 0x69, 0x3b, 0x53, 0x70, 0x69, 0x3b,</div><div class='del'>-0x52, 0x69, 0x69, 0x3b, 0x4d, 0x74, 0x69, 0x3b, 0x45, 0x6d, 0x69, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x6e, 0x69, 0x3b,</div><div class='del'>-0x4d, 0x78, 0x69, 0x3b, 0x4d, 0x78, 0x6b, 0x3b, 0x4d, 0x78, 0x64, 0x3b, 0x4b, 0x69, 0x6e, 0x67, 0x61, 0x6c, 0x20, 0x69,</div><div class='del'>-0x64, 0x61, 0x73, 0x3b, 0x44, 0x68, 0x61, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x54, 0x72, 0x75, 0x20, 0x69, 0x64, 0x61,</div><div class='del'>-0x73, 0x3b, 0x53, 0x70, 0x61, 0x74, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x52, 0x69, 0x6d, 0x61, 0x20, 0x69, 0x64, 0x61,</div><div class='del'>-0x73, 0x3b, 0x4d, 0x61, 0x74, 0x61, 0x72, 0x75, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x45, 0x6d, 0x70, 0x69, 0x74, 0x75,</div><div class='del'>-0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4d, 0x61, 0x73, 0x70, 0x61, 0x74, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4d, 0x6e,</div><div class='del'>-0x67, 0x61, 0x72, 0x69, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4d, 0x61, 0x78, 0x61, 0x6c, 0x20, 0x69, 0x64, 0x61, 0x73,</div><div class='del'>-0x3b, 0x4d, 0x61, 0x78, 0x61, 0x6c, 0x20, 0x6b, 0x69, 0x6e, 0x67, 0x61, 0x6c, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4d,</div><div class='del'>-0x61, 0x78, 0x61, 0x6c, 0x20, 0x64, 0x68, 0x61, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4b, 0x3b, 0x44, 0x3b, 0x54, 0x3b,</div><div class='del'>-0x53, 0x3b, 0x52, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x50, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x44, 0x3b, 0x43, 0x61,</div><div class='del'>-0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75,</div><div class='del'>-0x6e, 0x3b, 0x43, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f,</div><div class='del'>-0x62, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x43, 0x68, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x75, 0x72,</div><div class='del'>-0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x69, 0x72, 0x69, 0x72, 0x69, 0x3b, 0x4d, 0x65,</div><div class='del'>-0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x43, 0x68, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x69,</div><div class='del'>-0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x69, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f,</div><div class='del'>-0x62, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x43, 0x3b, 0x46, 0x3b, 0x4d, 0x3b,</div><div class='del'>-0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x43, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x49, 0x6d,</div><div class='del'>-0x62, 0x3b, 0x4b, 0x61, 0x77, 0x3b, 0x4b, 0x61, 0x64, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x4b, 0x61,</div><div class='del'>-0x72, 0x3b, 0x4d, 0x66, 0x75, 0x3b, 0x57, 0x75, 0x6e, 0x3b, 0x49, 0x6b, 0x65, 0x3b, 0x49, 0x6b, 0x75, 0x3b, 0x49, 0x6d,</div><div class='del'>-0x77, 0x3b, 0x49, 0x77, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6d, 0x62, 0x69,</div><div class='del'>-0x72, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x77, 0x69, 0x3b, 0x4d, 0x6f,</div><div class='del'>-0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x64, 0x61, 0x64, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20,</div><div class='del'>-0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20,</div><div class='del'>-0x6b, 0x61, 0x73, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x72,</div><div class='del'>-0x61, 0x6e, 0x64, 0x61, 0x64, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6d, 0x66, 0x75,</div><div class='del'>-0x6e, 0x67, 0x61, 0x64, 0x65, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x77, 0x75, 0x6e, 0x79,</div><div class='del'>-0x61, 0x6e, 0x79, 0x61, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x65, 0x6e, 0x64,</div><div class='del'>-0x61, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x6f,</div><div class='del'>-0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x6d, 0x77,</div><div class='del'>-0x65, 0x72, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20,</div><div class='del'>-0x6e, 0x61, 0x20, 0x69, 0x77, 0x69, 0x3b, 0x49, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4d,</div><div class='del'>-0x3b, 0x57, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x73, 0x69, 0x69, 0x3b, 0x63, 0x6f, 0x6c, 0x3b, 0x6d,</div><div class='del'>-0x62, 0x6f, 0x3b, 0x73, 0x65, 0x65, 0x3b, 0x64, 0x75, 0x75, 0x3b, 0x6b, 0x6f, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x3b, 0x6a,</div><div class='del'>-0x75, 0x6b, 0x3b, 0x73, 0x6c, 0x74, 0x3b, 0x79, 0x61, 0x72, 0x3b, 0x6a, 0x6f, 0x6c, 0x3b, 0x62, 0x6f, 0x77, 0x3b, 0x73,</div><div class='del'>-0x69, 0x69, 0x6c, 0x6f, 0x3b, 0x63, 0x6f, 0x6c, 0x74, 0x65, 0x3b, 0x6d, 0x62, 0x6f, 0x6f, 0x79, 0x3b, 0x73, 0x65, 0x65,</div><div class='del'>-0x257, 0x74, 0x6f, 0x3b, 0x64, 0x75, 0x75, 0x6a, 0x61, 0x6c, 0x3b, 0x6b, 0x6f, 0x72, 0x73, 0x65, 0x3b, 0x6d, 0x6f, 0x72,</div><div class='del'>-0x73, 0x6f, 0x3b, 0x6a, 0x75, 0x6b, 0x6f, 0x3b, 0x73, 0x69, 0x69, 0x6c, 0x74, 0x6f, 0x3b, 0x79, 0x61, 0x72, 0x6b, 0x6f,</div><div class='del'>-0x6d, 0x61, 0x61, 0x3b, 0x6a, 0x6f, 0x6c, 0x61, 0x6c, 0x3b, 0x62, 0x6f, 0x77, 0x74, 0x65, 0x3b, 0x73, 0x3b, 0x63, 0x3b,</div><div class='del'>-0x6d, 0x3b, 0x73, 0x3b, 0x64, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x73, 0x3b, 0x79, 0x3b, 0x6a, 0x3b, 0x62, 0x3b,</div><div class='del'>-0x4a, 0x45, 0x4e, 0x3b, 0x57, 0x4b, 0x52, 0x3b, 0x57, 0x47, 0x54, 0x3b, 0x57, 0x4b, 0x4e, 0x3b, 0x57, 0x54, 0x4e, 0x3b,</div><div class='del'>-0x57, 0x54, 0x44, 0x3b, 0x57, 0x4d, 0x4a, 0x3b, 0x57, 0x4e, 0x4e, 0x3b, 0x57, 0x4b, 0x44, 0x3b, 0x57, 0x49, 0x4b, 0x3b,</div><div class='del'>-0x57, 0x4d, 0x57, 0x3b, 0x44, 0x49, 0x54, 0x3b, 0x4e, 0x6a, 0x65, 0x6e, 0x75, 0x61, 0x72, 0x129, 0x3b, 0x4d, 0x77, 0x65,</div><div class='del'>-0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x72, 0x129, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20,</div><div class='del'>-0x67, 0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61,</div><div class='del'>-0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65,</div><div class='del'>-0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72,</div><div class='del'>-0x65, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x169, 0x67, 0x77, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20,</div><div class='del'>-0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b,</div><div class='del'>-0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x3b,</div><div class='del'>-0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x169, 0x6d,</div><div class='del'>-0x77, 0x65, 0x3b, 0x4e, 0x64, 0x69, 0x74, 0x68, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x4b,</div><div class='del'>-0x3b, 0x47, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x44, 0x3b, 0x4f, 0x62, 0x6f,</div><div class='del'>-0x3b, 0x57, 0x61, 0x61, 0x3b, 0x4f, 0x6b, 0x75, 0x3b, 0x4f, 0x6e, 0x67, 0x3b, 0x49, 0x6d, 0x65, 0x3b, 0x49, 0x6c, 0x65,</div><div class='del'>-0x3b, 0x53, 0x61, 0x70, 0x3b, 0x49, 0x73, 0x69, 0x3b, 0x53, 0x61, 0x61, 0x3b, 0x54, 0x6f, 0x6d, 0x3b, 0x54, 0x6f, 0x62,</div><div class='del'>-0x3b, 0x54, 0x6f, 0x77, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f, 0x62, 0x6f, 0x3b, 0x4c, 0x61, 0x70,</div><div class='del'>-0x61, 0x20, 0x6c, 0x65, 0x20, 0x77, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f,</div><div class='del'>-0x6b, 0x75, 0x6e, 0x69, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f, 0x6e, 0x67, 0x27, 0x77, 0x61, 0x6e,</div><div class='del'>-0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x6d, 0x65, 0x74, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c,</div><div class='del'>-0x65, 0x20, 0x69, 0x6c, 0x65, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x73, 0x61, 0x70, 0x61, 0x3b, 0x4c,</div><div class='del'>-0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x73, 0x69, 0x65, 0x74, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65,</div><div class='del'>-0x20, 0x73, 0x61, 0x61, 0x6c, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x3b,</div><div class='del'>-0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x6f, 0x62, 0x6f, 0x3b, 0x4c, 0x61,</div><div class='del'>-0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x77, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x4f, 0x3b,</div><div class='del'>-0x57, 0x3b, 0x4f, 0x3b, 0x4f, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x54, 0x3b,</div><div class='del'>-0x54, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61,</div><div class='del'>-0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74,</div><div class='del'>-0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x4a, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x46, 0x65,</div><div class='del'>-0x76, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x63, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d,</div><div class='del'>-0x61, 0x69, 0x6f, 0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x4a, 0x75, 0x6c, 0x68, 0x6f, 0x3b, 0x41, 0x75, 0x67, 0x75,</div><div class='del'>-0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x4f, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b,</div><div class='del'>-0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x5a, 0x69,</div><div class='del'>-0x62, 0x3b, 0x4e, 0x68, 0x6c, 0x3b, 0x4d, 0x62, 0x69, 0x3b, 0x4d, 0x61, 0x62, 0x3b, 0x4e, 0x6b, 0x77, 0x3b, 0x4e, 0x68,</div><div class='del'>-0x6c, 0x3b, 0x4e, 0x74, 0x75, 0x3b, 0x4e, 0x63, 0x77, 0x3b, 0x4d, 0x70, 0x61, 0x3b, 0x4d, 0x66, 0x75, 0x3b, 0x4c, 0x77,</div><div class='del'>-0x65, 0x3b, 0x4d, 0x70, 0x61, 0x3b, 0x5a, 0x69, 0x62, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x6c, 0x61, 0x3b, 0x4e, 0x68, 0x6c,</div><div class='del'>-0x6f, 0x6c, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x62, 0x69, 0x6d, 0x62, 0x69, 0x74, 0x68, 0x6f, 0x3b, 0x4d, 0x61, 0x62,</div><div class='del'>-0x61, 0x73, 0x61, 0x3b, 0x4e, 0x6b, 0x77, 0x65, 0x6e, 0x6b, 0x77, 0x65, 0x7a, 0x69, 0x3b, 0x4e, 0x68, 0x6c, 0x61, 0x6e,</div><div class='del'>-0x67, 0x75, 0x6c, 0x61, 0x3b, 0x4e, 0x74, 0x75, 0x6c, 0x69, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x4e, 0x63, 0x77, 0x61, 0x62,</div><div class='del'>-0x61, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x4d, 0x70, 0x61, 0x6e, 0x64, 0x75, 0x6c, 0x61, 0x3b, 0x4d, 0x66, 0x75, 0x6d, 0x66,</div><div class='del'>-0x75, 0x3b, 0x4c, 0x77, 0x65, 0x7a, 0x69, 0x3b, 0x4d, 0x70, 0x61, 0x6c, 0x61, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x5a, 0x3b,</div><div class='del'>-0x4e, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4c, 0x3b,</div><div class='del'>-0x4d, 0x3b, 0x4d, 0x31, 0x3b, 0x4d, 0x32, 0x3b, 0x4d, 0x33, 0x3b, 0x4d, 0x34, 0x3b, 0x4d, 0x35, 0x3b, 0x4d, 0x36, 0x3b,</div><div class='del'>-0x4d, 0x37, 0x3b, 0x4d, 0x38, 0x3b, 0x4d, 0x39, 0x3b, 0x4d, 0x31, 0x30, 0x3b, 0x4d, 0x31, 0x31, 0x3b, 0x4d, 0x31, 0x32,</div><div class='del'>-0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x65,</div><div class='del'>-0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61,</div><div class='del'>-0x20, 0x6b, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x61,</div><div class='del'>-0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x74, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x77, 0x65,</div><div class='del'>-0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x73, 0x69, 0x74, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20,</div><div class='del'>-0x73, 0x61, 0x62, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6e, 0x61, 0x6e, 0x65, 0x3b, 0x4d,</div><div class='del'>-0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x74, 0x69, 0x73, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77,</div><div class='del'>-0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75,</div><div class='del'>-0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x6f, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20,</div><div class='del'>-0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b,</div><div class='del'>-0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x69,</div><div class='del'>-0x6e, 0x6e, 0x3b, 0x62, 0x1e5b, 0x61, 0x3b, 0x6d, 0x61, 0x1e5b, 0x3b, 0x69, 0x62, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x79,</div><div class='del'>-0x75, 0x6e, 0x3b, 0x79, 0x75, 0x6c, 0x3b, 0x263, 0x75, 0x63, 0x3b, 0x63, 0x75, 0x74, 0x3b, 0x6b, 0x74, 0x75, 0x3b, 0x6e,</div><div class='del'>-0x75, 0x77, 0x3b, 0x64, 0x75, 0x6a, 0x3b, 0x69, 0x6e, 0x6e, 0x61, 0x79, 0x72, 0x3b, 0x62, 0x1e5b, 0x61, 0x79, 0x1e5b, 0x3b,</div><div class='del'>-0x6d, 0x61, 0x1e5b, 0x1e63, 0x3b, 0x69, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x79, 0x75, 0x3b, 0x79, 0x75, 0x6e,</div><div class='del'>-0x79, 0x75, 0x3b, 0x79, 0x75, 0x6c, 0x79, 0x75, 0x7a, 0x3b, 0x263, 0x75, 0x63, 0x74, 0x3b, 0x63, 0x75, 0x74, 0x61, 0x6e,</div><div class='del'>-0x62, 0x69, 0x72, 0x3b, 0x6b, 0x74, 0x75, 0x62, 0x72, 0x3b, 0x6e, 0x75, 0x77, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x64,</div><div class='del'>-0x75, 0x6a, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x69, 0x3b, 0x62, 0x3b, 0x6d, 0x3b, 0x69, 0x3b, 0x6d, 0x3b, 0x79, 0x3b,</div><div class='del'>-0x79, 0x3b, 0x263, 0x3b, 0x63, 0x3b, 0x6b, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x59, 0x65, 0x6e, 0x3b, 0x46, 0x75, 0x72, 0x3b,</div><div class='del'>-0x4d, 0x65, 0x263, 0x3b, 0x59, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75, 0x6c, 0x3b,</div><div class='del'>-0x194, 0x75, 0x63, 0x3b, 0x43, 0x74, 0x65, 0x3b, 0x54, 0x75, 0x62, 0x3b, 0x4e, 0x75, 0x6e, 0x3b, 0x44, 0x75, 0x1e7, 0x3b,</div><div class='del'>-0x59, 0x65, 0x6e, 0x6e, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x46, 0x75, 0x1e5b, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x263, 0x72, 0x65,</div><div class='del'>-0x73, 0x3b, 0x59, 0x65, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6e, 0x79, 0x75,</div><div class='del'>-0x3b, 0x59, 0x75, 0x6c, 0x79, 0x75, 0x3b, 0x194, 0x75, 0x63, 0x74, 0x3b, 0x43, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b,</div><div class='del'>-0x54, 0x75, 0x62, 0x65, 0x1e5b, 0x3b, 0x4e, 0x75, 0x6e, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x44, 0x75, 0x1e7, 0x65, 0x6d,</div><div class='del'>-0x62, 0x65, 0x1e5b, 0x3b, 0x59, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x194, 0x3b,</div><div class='del'>-0x43, 0x3b, 0x54, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4b, 0x42, 0x5a, 0x3b, 0x4b, 0x42, 0x52, 0x3b, 0x4b, 0x53, 0x54, 0x3b,</div><div class='del'>-0x4b, 0x4b, 0x4e, 0x3b, 0x4b, 0x54, 0x4e, 0x3b, 0x4b, 0x4d, 0x4b, 0x3b, 0x4b, 0x4d, 0x53, 0x3b, 0x4b, 0x4d, 0x4e, 0x3b,</div><div class='del'>-0x4b, 0x4d, 0x4e, 0x3b, 0x4b, 0x4b, 0x4d, 0x3b, 0x4b, 0x4e, 0x4b, 0x3b, 0x4b, 0x4e, 0x42, 0x3b, 0x4f, 0x6b, 0x77, 0x6f,</div><div class='del'>-0x6b, 0x75, 0x62, 0x61, 0x6e, 0x7a, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4f,</div><div class='del'>-0x6b, 0x77, 0x61, 0x6b, 0x61, 0x73, 0x68, 0x61, 0x74, 0x75, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61, 0x6e, 0x61, 0x3b,</div><div class='del'>-0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61, 0x74, 0x61, 0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x75, 0x6b, 0x61,</div><div class='del'>-0x61, 0x67, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x75, 0x73, 0x68, 0x61, 0x6e, 0x6a, 0x75, 0x3b, 0x4f, 0x6b, 0x77,</div><div class='del'>-0x61, 0x6d, 0x75, 0x6e, 0x61, 0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x77, 0x65, 0x6e, 0x64, 0x61, 0x3b,</div><div class='del'>-0x4f, 0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20,</div><div class='del'>-0x6e, 0x61, 0x20, 0x6b, 0x75, 0x6d, 0x77, 0x65, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e,</div><div class='del'>-0x61, 0x20, 0x69, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x48, 0x75, 0x74, 0x3b, 0x56, 0x69, 0x6c, 0x3b, 0x44, 0x61, 0x74, 0x3b,</div><div class='del'>-0x54, 0x61, 0x69, 0x3b, 0x48, 0x61, 0x6e, 0x3b, 0x53, 0x69, 0x74, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4e, 0x61, 0x6e, 0x3b,</div><div class='del'>-0x54, 0x69, 0x73, 0x3b, 0x4b, 0x75, 0x6d, 0x3b, 0x4b, 0x6d, 0x6a, 0x3b, 0x4b, 0x6d, 0x62, 0x3b, 0x70, 0x61, 0x20, 0x6d,</div><div class='del'>-0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x68, 0x75, 0x74, 0x61, 0x6c, 0x61, 0x3b, 0x70, 0x61, 0x20,</div><div class='del'>-0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x76, 0x69, 0x6c, 0x69, 0x3b, 0x70, 0x61,</div><div class='del'>-0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x64, 0x61, 0x74, 0x75, 0x3b, 0x70,</div><div class='del'>-0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x74, 0x61, 0x69, 0x3b, 0x70,</div><div class='del'>-0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x68, 0x61, 0x6e, 0x75, 0x3b,</div><div class='del'>-0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x73, 0x69, 0x74, 0x61, 0x3b, 0x70,</div><div class='del'>-0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x73, 0x61, 0x62, 0x61, 0x3b, 0x70, 0x61,</div><div class='del'>-0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x6e, 0x61, 0x6e, 0x65, 0x3b, 0x70, 0x61, 0x20,</div><div class='del'>-0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x74, 0x69, 0x73, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d,</div><div class='del'>-0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77,</div><div class='del'>-0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x6f, 0x6a,</div><div class='del'>-0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x6b, 0x75, 0x6d, 0x69,</div><div class='del'>-0x20, 0x6e, 0x61, 0x20, 0x6d, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x48, 0x3b, 0x56, 0x3b, 0x44, 0x3b, 0x54, 0x3b, 0x48, 0x3b,</div><div class='del'>-0x53, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72,</div><div class='del'>-0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x72,</div><div class='del'>-0x69, 0x6c, 0x79, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x79, 0x61,</div><div class='del'>-0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b,</div><div class='del'>-0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61,</div><div class='del'>-0x3b, 0x7a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6e, 0x61, 0x72, 0x3b, 0x61, 0x77, 0x69, 0x3b, 0x6d, 0x25b, 0x3b,</div><div class='del'>-0x7a, 0x75, 0x77, 0x3b, 0x7a, 0x75, 0x6c, 0x3b, 0x75, 0x74, 0x69, 0x3b, 0x73, 0x25b, 0x74, 0x3b, 0x254, 0x6b, 0x75, 0x3b,</div><div class='del'>-0x6e, 0x6f, 0x77, 0x3b, 0x64, 0x65, 0x73, 0x3b, 0x7a, 0x61, 0x6e, 0x77, 0x75, 0x79, 0x65, 0x3b, 0x66, 0x65, 0x62, 0x75,</div><div class='del'>-0x72, 0x75, 0x79, 0x65, 0x3b, 0x6d, 0x61, 0x72, 0x69, 0x73, 0x69, 0x3b, 0x61, 0x77, 0x69, 0x72, 0x69, 0x6c, 0x69, 0x3b,</div><div class='del'>-0x6d, 0x25b, 0x3b, 0x7a, 0x75, 0x77, 0x25b, 0x6e, 0x3b, 0x7a, 0x75, 0x6c, 0x75, 0x79, 0x65, 0x3b, 0x75, 0x74, 0x69, 0x3b,</div><div class='del'>-0x73, 0x25b, 0x74, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x75, 0x3b, 0x254, 0x6b, 0x75, 0x74, 0x254, 0x62, 0x75, 0x72, 0x75, 0x3b,</div><div class='del'>-0x6e, 0x6f, 0x77, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x75, 0x3b, 0x64, 0x65, 0x73, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x75, 0x3b,</div><div class='del'>-0x5a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0x5a, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x186, 0x3b,</div><div class='del'>-0x4e, 0x3b, 0x44, 0x3b, 0x4d, 0x62, 0x65, 0x3b, 0x4b, 0x61, 0x69, 0x3b, 0x4b, 0x61, 0x74, 0x3b, 0x4b, 0x61, 0x6e, 0x3b,</div><div class='del'>-0x47, 0x61, 0x74, 0x3b, 0x47, 0x61, 0x6e, 0x3b, 0x4d, 0x75, 0x67, 0x3b, 0x4b, 0x6e, 0x6e, 0x3b, 0x4b, 0x65, 0x6e, 0x3b,</div><div class='del'>-0x49, 0x6b, 0x75, 0x3b, 0x49, 0x6d, 0x77, 0x3b, 0x49, 0x67, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61,</div><div class='del'>-0x20, 0x6d, 0x62, 0x65, 0x72, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x129, 0x72,</div><div class='del'>-0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x68, 0x61, 0x74, 0x169, 0x3b, 0x4d,</div><div class='del'>-0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77,</div><div class='del'>-0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61,</div><div class='del'>-0x74, 0x61, 0x6e, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x169, 0x67,</div><div class='del'>-0x77, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x6e,</div><div class='del'>-0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x65,</div><div class='del'>-0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61,</div><div class='del'>-0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x169, 0x6d, 0x77, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69,</div><div class='del'>-0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x4b, 0x61, 0x129, 0x72, 0x129, 0x3b, 0x4d,</div><div class='del'>-0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49,</div><div class='del'>-0x3b, 0x49, 0x3b, 0x13a4, 0x13c3, 0x3b, 0x13a7, 0x13a6, 0x3b, 0x13a0, 0x13c5, 0x3b, 0x13a7, 0x13ec, 0x3b, 0x13a0, 0x13c2, 0x3b, 0x13d5, 0x13ad,</div><div class='del'>-0x3b, 0x13ab, 0x13f0, 0x3b, 0x13a6, 0x13b6, 0x3b, 0x13da, 0x13b5, 0x3b, 0x13da, 0x13c2, 0x3b, 0x13c5, 0x13d3, 0x3b, 0x13a4, 0x13cd, 0x3b, 0x13a4,</div><div class='del'>-0x13c3, 0x13b8, 0x13d4, 0x13c5, 0x3b, 0x13a7, 0x13a6, 0x13b5, 0x3b, 0x13a0, 0x13c5, 0x13f1, 0x3b, 0x13a7, 0x13ec, 0x13c2, 0x3b, 0x13a0, 0x13c2, 0x13cd,</div><div class='del'>-0x13ac, 0x13d8, 0x3b, 0x13d5, 0x13ad, 0x13b7, 0x13f1, 0x3b, 0x13ab, 0x13f0, 0x13c9, 0x13c2, 0x3b, 0x13a6, 0x13b6, 0x13c2, 0x3b, 0x13da, 0x13b5, 0x13cd,</div><div class='del'>-0x13d7, 0x3b, 0x13da, 0x13c2, 0x13c5, 0x13d7, 0x3b, 0x13c5, 0x13d3, 0x13d5, 0x13c6, 0x3b, 0x13a4, 0x13cd, 0x13a9, 0x13f1, 0x3b, 0x13a4, 0x3b, 0x13a7,</div><div class='del'>-0x3b, 0x13a0, 0x3b, 0x13a7, 0x3b, 0x13a0, 0x3b, 0x13d5, 0x3b, 0x13ab, 0x3b, 0x13a6, 0x3b, 0x13da, 0x3b, 0x13da, 0x3b, 0x13c5, 0x3b, 0x13a4,</div><div class='del'>-0x3b, 0x7a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x76, 0x72, 0x3b, 0x6d, 0x65, 0x3b,</div><div class='del'>-0x7a, 0x69, 0x6e, 0x3b, 0x7a, 0x69, 0x6c, 0x3b, 0x6f, 0x75, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b,</div><div class='del'>-0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x73, 0x3b, 0x7a, 0x61, 0x6e, 0x76, 0x69, 0x65, 0x3b, 0x66, 0x65, 0x76, 0x72, 0x69,</div><div class='del'>-0x79, 0x65, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x65, 0x3b, 0x7a, 0x69, 0x6e,</div><div class='del'>-0x3b, 0x7a, 0x69, 0x6c, 0x79, 0x65, 0x3b, 0x6f, 0x75, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x61, 0x6d, 0x3b, 0x6f, 0x6b,</div><div class='del'>-0x74, 0x6f, 0x62, 0x3b, 0x6e, 0x6f, 0x76, 0x61, 0x6d, 0x3b, 0x64, 0x65, 0x73, 0x61, 0x6d, 0x3b, 0x7a, 0x3b, 0x66, 0x3b,</div><div class='del'>-0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x7a, 0x3b, 0x7a, 0x3b, 0x6f, 0x3b, 0x73, 0x3b, 0x6f, 0x3b, 0x6e, 0x3b, 0x64, 0x3b,</div><div class='del'>-0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x4e, 0x74, 0x61, 0x6e, 0x64, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77,</div><div class='del'>-0x61, 0x20, 0x50, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x54, 0x61, 0x74, 0x75,</div><div class='del'>-0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x63, 0x68, 0x65, 0x63, 0x68, 0x69, 0x3b, 0x4d, 0x77,</div><div class='del'>-0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20,</div><div class='del'>-0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x55, 0x6d, 0x6f, 0x3b, 0x4d, 0x77, 0x65,</div><div class='del'>-0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4d, 0x69, 0x76, 0x69,</div><div class='del'>-0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e,</div><div class='del'>-0x61, 0x20, 0x4d, 0x69, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e,</div><div class='del'>-0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x63, 0x68, 0x65, 0x63, 0x68, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64,</div><div class='del'>-0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e,</div><div class='del'>-0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61,</div><div class='del'>-0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x55, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77,</div><div class='del'>-0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e,</div><div class='del'>-0x61, 0x20, 0x4d, 0x3b, 0x46, 0xfa, 0x6e, 0x67, 0x61, 0x74, 0x268, 0x3b, 0x4e, 0x61, 0x61, 0x6e, 0x268, 0x3b, 0x4b, 0x65,</div><div class='del'>-0x65, 0x6e, 0x64, 0x61, 0x3b, 0x49, 0x6b, 0xfa, 0x6d, 0x69, 0x3b, 0x49, 0x6e, 0x79, 0x61, 0x6d, 0x62, 0x61, 0x6c, 0x61,</div><div class='del'>-0x3b, 0x49, 0x64, 0x77, 0x61, 0x61, 0x74, 0x61, 0x3b, 0x4d, 0x289, 0x289, 0x6e, 0x63, 0x68, 0x268, 0x3b, 0x56, 0x268, 0x268,</div><div class='del'>-0x72, 0x268, 0x3b, 0x53, 0x61, 0x61, 0x74, 0x289, 0x3b, 0x49, 0x6e, 0x79, 0x69, 0x3b, 0x53, 0x61, 0x61, 0x6e, 0x6f, 0x3b,</div><div class='del'>-0x53, 0x61, 0x73, 0x61, 0x74, 0x289, 0x3b, 0x4b, 0x289, 0x66, 0xfa, 0x6e, 0x67, 0x61, 0x74, 0x268, 0x3b, 0x4b, 0x289, 0x6e,</div><div class='del'>-0x61, 0x61, 0x6e, 0x268, 0x3b, 0x4b, 0x289, 0x6b, 0x65, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6b, 0x75,</div><div class='del'>-0x6d, 0x69, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6e, 0x79, 0x61, 0x6d, 0x62, 0xe1, 0x6c, 0x61, 0x3b, 0x4b, 0x77, 0x69, 0x69,</div><div class='del'>-0x64, 0x77, 0x61, 0x61, 0x74, 0x61, 0x3b, 0x4b, 0x289, 0x6d, 0x289, 0x289, 0x6e, 0x63, 0x68, 0x268, 0x3b, 0x4b, 0x289, 0x76,</div><div class='del'>-0x268, 0x268, 0x72, 0x268, 0x3b, 0x4b, 0x289, 0x73, 0x61, 0x61, 0x74, 0x289, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6e, 0x79, 0x69,</div><div class='del'>-0x3b, 0x4b, 0x289, 0x73, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x4b, 0x289, 0x73, 0x61, 0x73, 0x61, 0x74, 0x289, 0x3b, 0x46, 0x3b,</div><div class='del'>-0x4e, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x4d, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x49, 0x3b, 0x53, 0x3b,</div><div class='del'>-0x53, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x75, 0x3b, 0x4d, 0x61,</div><div class='del'>-0x61, 0x3b, 0x4a, 0x75, 0x75, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x75, 0x3b, 0x53, 0x65, 0x62, 0x3b, 0x4f, 0x6b,</div><div class='del'>-0x69, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x77, 0x61, 0x6c, 0x69, 0x79, 0x6f, 0x3b,</div><div class='del'>-0x46, 0x65, 0x62, 0x77, 0x61, 0x6c, 0x69, 0x79, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x69, 0x73, 0x69, 0x3b, 0x41, 0x70, 0x75,</div><div class='del'>-0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x61, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x61,</div><div class='del'>-0x79, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x69, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x62, 0x75, 0x74, 0x74, 0x65, 0x6d, 0x62,</div><div class='del'>-0x61, 0x3b, 0x4f, 0x6b, 0x69, 0x74, 0x6f, 0x62, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44,</div><div class='del'>-0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x45,</div><div class='del'>-0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x61, 0x3b, 0x53,</div><div class='del'>-0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61,</div><div class='del'>-0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x45, 0x70,</div><div class='del'>-0x72, 0x65, 0x6f, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x4f,</div><div class='del'>-0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62,</div><div class='del'>-0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b,</div><div class='del'>-0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4f, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b,</div><div class='del'>-0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61,</div><div class='del'>-0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74,</div><div class='del'>-0x75, 0x3b, 0x4e, 0x75, 0x76, 0x3b, 0x44, 0x69, 0x7a, 0x3b, 0x4a, 0x61, 0x6e, 0x65, 0x72, 0x75, 0x3b, 0x46, 0x65, 0x76,</div><div class='del'>-0x65, 0x72, 0x65, 0x72, 0x75, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x75, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61,</div><div class='del'>-0x69, 0x75, 0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x75, 0x3b, 0x4a, 0x75, 0x6c, 0x68, 0x75, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74,</div><div class='del'>-0x75, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6e, 0x62, 0x72, 0x75, 0x3b, 0x4f, 0x74, 0x75, 0x62, 0x72, 0x75, 0x3b, 0x4e, 0x75,</div><div class='del'>-0x76, 0x65, 0x6e, 0x62, 0x72, 0x75, 0x3b, 0x44, 0x69, 0x7a, 0x65, 0x6e, 0x62, 0x72, 0x75, 0x3b, 0x4a, 0x41, 0x4e, 0x3b,</div><div class='del'>-0x46, 0x45, 0x42, 0x3b, 0x4d, 0x41, 0x43, 0x3b, 0x128, 0x50, 0x55, 0x3b, 0x4d, 0x128, 0x128, 0x3b, 0x4e, 0x4a, 0x55, 0x3b,</div><div class='del'>-0x4e, 0x4a, 0x52, 0x3b, 0x41, 0x47, 0x41, 0x3b, 0x53, 0x50, 0x54, 0x3b, 0x4f, 0x4b, 0x54, 0x3b, 0x4e, 0x4f, 0x56, 0x3b,</div><div class='del'>-0x44, 0x45, 0x43, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x129, 0x3b, 0x46, 0x65, 0x62, 0x75, 0x72, 0x75, 0x61, 0x72,</div><div class='del'>-0x129, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x128, 0x70, 0x75, 0x72, 0x169, 0x3b, 0x4d, 0x129, 0x129, 0x3b, 0x4e, 0x6a,</div><div class='del'>-0x75, 0x6e, 0x69, 0x3b, 0x4e, 0x6a, 0x75, 0x72, 0x61, 0x129, 0x3b, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65,</div><div class='del'>-0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x169, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62,</div><div class='del'>-0x61, 0x3b, 0x44, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x128, 0x3b, 0x4d, 0x3b,</div><div class='del'>-0x4e, 0x3b, 0x4e, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4d, 0x75, 0x6c, 0x3b, 0x4e, 0x67,</div><div class='del'>-0x61, 0x3b, 0x4b, 0x69, 0x70, 0x3b, 0x49, 0x77, 0x61, 0x3b, 0x4e, 0x67, 0x65, 0x3b, 0x57, 0x61, 0x6b, 0x3b, 0x52, 0x6f,</div><div class='del'>-0x70, 0x3b, 0x4b, 0x6f, 0x67, 0x3b, 0x42, 0x75, 0x72, 0x3b, 0x45, 0x70, 0x65, 0x3b, 0x54, 0x61, 0x69, 0x3b, 0x41, 0x65,</div><div class='del'>-0x6e, 0x3b, 0x4d, 0x75, 0x6c, 0x67, 0x75, 0x6c, 0x3b, 0x4e, 0x67, 0x27, 0x61, 0x74, 0x79, 0x61, 0x74, 0x6f, 0x3b, 0x4b,</div><div class='del'>-0x69, 0x70, 0x74, 0x61, 0x6d, 0x6f, 0x3b, 0x49, 0x77, 0x61, 0x74, 0x20, 0x6b, 0x75, 0x74, 0x3b, 0x4e, 0x67, 0x27, 0x65,</div><div class='del'>-0x69, 0x79, 0x65, 0x74, 0x3b, 0x57, 0x61, 0x6b, 0x69, 0x3b, 0x52, 0x6f, 0x70, 0x74, 0x75, 0x69, 0x3b, 0x4b, 0x69, 0x70,</div><div class='del'>-0x6b, 0x6f, 0x67, 0x61, 0x67, 0x61, 0x3b, 0x42, 0x75, 0x72, 0x65, 0x74, 0x3b, 0x45, 0x70, 0x65, 0x73, 0x6f, 0x3b, 0x4b,</div><div class='del'>-0x69, 0x70, 0x73, 0x75, 0x6e, 0x64, 0x65, 0x20, 0x6e, 0x65, 0x74, 0x61, 0x69, 0x3b, 0x4b, 0x69, 0x70, 0x73, 0x75, 0x6e,</div><div class='del'>-0x64, 0x65, 0x20, 0x6e, 0x65, 0x62, 0x6f, 0x20, 0x61, 0x65, 0x6e, 0x67, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x49,</div><div class='del'>-0x3b, 0x4e, 0x3b, 0x57, 0x3b, 0x52, 0x3b, 0x4b, 0x3b, 0x42, 0x3b, 0x45, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x1c3, 0x4b, 0x68,</div><div class='del'>-0x61, 0x6e, 0x6e, 0x69, 0x3b, 0x1c3, 0x4b, 0x68, 0x61, 0x6e, 0x1c0, 0x67, 0xf4, 0x61, 0x62, 0x3b, 0x1c0, 0x4b, 0x68, 0x75,</div><div class='del'>-0x75, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x1c3, 0x48, 0xf4, 0x61, 0x1c2, 0x6b, 0x68, 0x61, 0x69, 0x62, 0x3b, 0x1c3, 0x4b,</div><div class='del'>-0x68, 0x61, 0x69, 0x74, 0x73, 0xe2, 0x62, 0x3b, 0x47, 0x61, 0x6d, 0x61, 0x1c0, 0x61, 0x65, 0x62, 0x3b, 0x1c2, 0x4b, 0x68,</div><div class='del'>-0x6f, 0x65, 0x73, 0x61, 0x6f, 0x62, 0x3b, 0x41, 0x6f, 0x1c1, 0x6b, 0x68, 0x75, 0x75, 0x6d, 0xfb, 0x1c1, 0x6b, 0x68, 0xe2,</div><div class='del'>-0x62, 0x3b, 0x54, 0x61, 0x72, 0x61, 0x1c0, 0x6b, 0x68, 0x75, 0x75, 0x6d, 0xfb, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x1c2,</div><div class='del'>-0x4e, 0xfb, 0x1c1, 0x6e, 0xe2, 0x69, 0x73, 0x65, 0x62, 0x3b, 0x1c0, 0x48, 0x6f, 0x6f, 0x1c2, 0x67, 0x61, 0x65, 0x62, 0x3b,</div><div class='del'>-0x48, 0xf4, 0x61, 0x73, 0x6f, 0x72, 0x65, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0xe4,</div><div class='del'>-0x62, 0x2e, 0x3b, 0x4d, 0x61, 0x72, 0x2e, 0x3b, 0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0xe4, 0x69, 0x3b, 0x4a, 0x75, 0x6e,</div><div class='del'>-0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x4f, 0x75, 0x67, 0x2e, 0x3b, 0x53, 0xe4, 0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74,</div><div class='del'>-0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44, 0x65, 0x7a, 0x2e, 0x3b, 0x4a, 0x61, 0x6e, 0x6e, 0x65, 0x77, 0x61, 0x3b,</div><div class='del'>-0x46, 0xe4, 0x62, 0x72, 0x6f, 0x77, 0x61, 0x3b, 0x4d, 0xe4, 0xe4, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x6c, 0x3b,</div><div class='del'>-0x4d, 0xe4, 0x69, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x4f, 0x75, 0x6a, 0x6f,</div><div class='del'>-0xdf, 0x3b, 0x53, 0x65, 0x70, 0x74, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x65, 0x72,</div><div class='del'>-0x3b, 0x4e, 0x6f, 0x76, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44,</div><div class='del'>-0x61, 0x6c, 0x3b, 0x41, 0x72, 0xe1, 0x3b, 0x186, 0x25b, 0x6e, 0x3b, 0x44, 0x6f, 0x79, 0x3b, 0x4c, 0xe9, 0x70, 0x3b, 0x52,</div><div class='del'>-0x6f, 0x6b, 0x3b, 0x53, 0xe1, 0x73, 0x3b, 0x42, 0x254, 0x301, 0x72, 0x3b, 0x4b, 0xfa, 0x73, 0x3b, 0x47, 0xed, 0x73, 0x3b,</div><div class='del'>-0x53, 0x68, 0x289, 0x301, 0x3b, 0x4e, 0x74, 0x289, 0x301, 0x3b, 0x4f, 0x6c, 0x61, 0x64, 0x61, 0x6c, 0x289, 0x301, 0x3b, 0x41,</div><div class='del'>-0x72, 0xe1, 0x74, 0x3b, 0x186, 0x25b, 0x6e, 0x268, 0x301, 0x254, 0x268, 0x14b, 0x254, 0x6b, 0x3b, 0x4f, 0x6c, 0x6f, 0x64, 0x6f,</div><div class='del'>-0x79, 0xed, 0xf3, 0x72, 0xed, 0xea, 0x20, 0x69, 0x6e, 0x6b, 0xf3, 0x6b, 0xfa, 0xe2, 0x3b, 0x4f, 0x6c, 0x6f, 0x69, 0x6c,</div><div class='del'>-0xe9, 0x70, 0x16b, 0x6e, 0x79, 0x12b, 0x113, 0x20, 0x69, 0x6e, 0x6b, 0xf3, 0x6b, 0xfa, 0xe2, 0x3b, 0x4b, 0xfa, 0x6a, 0xfa,</div><div class='del'>-0x254, 0x72, 0x254, 0x6b, 0x3b, 0x4d, 0xf3, 0x72, 0x75, 0x73, 0xe1, 0x73, 0x69, 0x6e, 0x3b, 0x186, 0x6c, 0x254, 0x301, 0x268,</div><div class='del'>-0x301, 0x62, 0x254, 0x301, 0x72, 0xe1, 0x72, 0x25b, 0x3b, 0x4b, 0xfa, 0x73, 0x68, 0xee, 0x6e, 0x3b, 0x4f, 0x6c, 0x67, 0xed,</div><div class='del'>-0x73, 0x61, 0x6e, 0x3b, 0x50, 0x289, 0x73, 0x68, 0x289, 0x301, 0x6b, 0x61, 0x3b, 0x4e, 0x74, 0x289, 0x301, 0x14b, 0x289, 0x301,</div><div class='del'>-0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65,</div><div class='del'>-0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b,</div><div class='del'>-0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61,</div><div class='del'>-0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67,</div><div class='del'>-0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x52, 0x61,</div><div class='del'>-0x72, 0x3b, 0x4d, 0x75, 0x6b, 0x3b, 0x4b, 0x77, 0x61, 0x3b, 0x44, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0x6f,</div><div class='del'>-0x64, 0x3b, 0x4a, 0x6f, 0x6c, 0x3b, 0x50, 0x65, 0x64, 0x3b, 0x53, 0x6f, 0x6b, 0x3b, 0x54, 0x69, 0x62, 0x3b, 0x4c, 0x61,</div><div class='del'>-0x62, 0x3b, 0x50, 0x6f, 0x6f, 0x3b, 0x4f, 0x72, 0x61, 0x72, 0x61, 0x3b, 0x4f, 0x6d, 0x75, 0x6b, 0x3b, 0x4f, 0x6b, 0x77,</div><div class='del'>-0x61, 0x6d, 0x67, 0x27, 0x3b, 0x4f, 0x64, 0x75, 0x6e, 0x67, 0x27, 0x65, 0x6c, 0x3b, 0x4f, 0x6d, 0x61, 0x72, 0x75, 0x6b,</div><div class='del'>-0x3b, 0x4f, 0x6d, 0x6f, 0x64, 0x6f, 0x6b, 0x27, 0x6b, 0x69, 0x6e, 0x67, 0x27, 0x6f, 0x6c, 0x3b, 0x4f, 0x6a, 0x6f, 0x6c,</div><div class='del'>-0x61, 0x3b, 0x4f, 0x70, 0x65, 0x64, 0x65, 0x6c, 0x3b, 0x4f, 0x73, 0x6f, 0x6b, 0x6f, 0x73, 0x6f, 0x6b, 0x6f, 0x6d, 0x61,</div><div class='del'>-0x3b, 0x4f, 0x74, 0x69, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x6c, 0x61, 0x62, 0x6f, 0x72, 0x3b, 0x4f, 0x70, 0x6f, 0x6f, 0x3b,</div><div class='del'>-0x52, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x44, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x54, 0x3b,</div><div class='del'>-0x4c, 0x3b, 0x50, 0x3b, 0x17d, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x65, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x77, 0x69, 0x3b,</div><div class='del'>-0x4d, 0x65, 0x3b, 0x17d, 0x75, 0x77, 0x3b, 0x17d, 0x75, 0x79, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x6b, 0x3b, 0x4f, 0x6b,</div><div class='del'>-0x74, 0x3b, 0x4e, 0x6f, 0x6f, 0x3b, 0x44, 0x65, 0x65, 0x3b, 0x17d, 0x61, 0x6e, 0x77, 0x69, 0x79, 0x65, 0x3b, 0x46, 0x65,</div><div class='del'>-0x65, 0x77, 0x69, 0x72, 0x69, 0x79, 0x65, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x69, 0x3b, 0x41, 0x77, 0x69, 0x72, 0x69, 0x6c,</div><div class='del'>-0x3b, 0x4d, 0x65, 0x3b, 0x17d, 0x75, 0x77, 0x65, 0x14b, 0x3b, 0x17d, 0x75, 0x79, 0x79, 0x65, 0x3b, 0x55, 0x74, 0x3b, 0x53,</div><div class='del'>-0x65, 0x6b, 0x74, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x75, 0x72, 0x3b, 0x4e, 0x6f,</div><div class='del'>-0x6f, 0x77, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x3b, 0x44, 0x65, 0x65, 0x73, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x3b, 0x17d, 0x3b,</div><div class='del'>-0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x17d, 0x3b, 0x17d, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b,</div><div class='del'>-0x44, 0x3b, 0x44, 0x41, 0x43, 0x3b, 0x44, 0x41, 0x52, 0x3b, 0x44, 0x41, 0x44, 0x3b, 0x44, 0x41, 0x4e, 0x3b, 0x44, 0x41,</div><div class='del'>-0x48, 0x3b, 0x44, 0x41, 0x55, 0x3b, 0x44, 0x41, 0x4f, 0x3b, 0x44, 0x41, 0x42, 0x3b, 0x44, 0x4f, 0x43, 0x3b, 0x44, 0x41,</div><div class='del'>-0x50, 0x3b, 0x44, 0x47, 0x49, 0x3b, 0x44, 0x41, 0x47, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x63,</div><div class='del'>-0x68, 0x69, 0x65, 0x6c, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x72, 0x69, 0x79, 0x6f, 0x3b, 0x44,</div><div class='del'>-0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x64, 0x65, 0x6b, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20,</div><div class='del'>-0x41, 0x6e, 0x67, 0x27, 0x77, 0x65, 0x6e, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x62, 0x69, 0x63,</div><div class='del'>-0x68, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x75, 0x63, 0x68, 0x69, 0x65, 0x6c, 0x3b, 0x44, 0x77,</div><div class='del'>-0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x62, 0x69, 0x72, 0x69, 0x79, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61,</div><div class='del'>-0x72, 0x20, 0x41, 0x62, 0x6f, 0x72, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x4f, 0x63, 0x68, 0x69,</div><div class='del'>-0x6b, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x70, 0x61, 0x72, 0x3b, 0x44, 0x77, 0x65, 0x20,</div><div class='del'>-0x6d, 0x61, 0x72, 0x20, 0x67, 0x69, 0x20, 0x61, 0x63, 0x68, 0x69, 0x65, 0x6c, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61,</div><div class='del'>-0x72, 0x20, 0x41, 0x70, 0x61, 0x72, 0x20, 0x67, 0x69, 0x20, 0x61, 0x72, 0x69, 0x79, 0x6f, 0x3b, 0x43, 0x3b, 0x52, 0x3b,</div><div class='del'>-0x44, 0x3b, 0x4e, 0x3b, 0x42, 0x3b, 0x55, 0x3b, 0x42, 0x3b, 0x42, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x43, 0x3b, 0x50, 0x3b,</div><div class='del'>-0x59, 0x65, 0x6e, 0x3b, 0x59, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x49, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b,</div><div class='del'>-0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x194, 0x75, 0x63, 0x3b, 0x43, 0x75, 0x74, 0x3b, 0x4b, 0x1e6d, 0x75, 0x3b,</div><div class='del'>-0x4e, 0x77, 0x61, 0x3b, 0x44, 0x75, 0x6a, 0x3b, 0x59, 0x65, 0x6e, 0x6e, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x59, 0x65, 0x62,</div><div class='del'>-0x72, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x3b, 0x49, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x4d, 0x61, 0x79,</div><div class='del'>-0x79, 0x75, 0x3b, 0x59, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6c, 0x79, 0x75, 0x7a, 0x3b, 0x194, 0x75, 0x63, 0x74,</div><div class='del'>-0x3b, 0x43, 0x75, 0x74, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x4b, 0x1e6d, 0x75, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x77, 0x61,</div><div class='del'>-0x6e, 0x62, 0x69, 0x72, 0x3b, 0x44, 0x75, 0x6a, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x4d, 0x3b,</div><div class='del'>-0x49, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x194, 0x3b, 0x43, 0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61,</div><div class='del'>-0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x6c, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69,</div><div class='del'>-0x3b, 0x41, 0x70, 0x6c, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c,</div><div class='del'>-0x61, 0x69, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f,</div><div class='del'>-0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62,</div><div class='del'>-0x61, 0x3b</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const ushort standalone_months_data[] = {</div><div class='del'>-0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b,</div><div class='del'>-0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x63, 0x74, 0x3b,</div><div class='del'>-0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x79, 0x3b, 0x46, 0x65, 0x62, 0x72,</div><div class='del'>-0x75, 0x61, 0x72, 0x79, 0x3b, 0x4d, 0x61, 0x72, 0x63, 0x68, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79,</div><div class='del'>-0x3b, 0x4a, 0x75, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6c, 0x79, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65,</div><div class='del'>-0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x63, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65,</div><div class='del'>-0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b,</div><div class='del'>-0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x41, 0x6d,</div><div class='del'>-0x61, 0x3b, 0x47, 0x75, 0x72, 0x3b, 0x42, 0x69, 0x74, 0x3b, 0x45, 0x6c, 0x62, 0x3b, 0x43, 0x61, 0x6d, 0x3b, 0x57, 0x61,</div><div class='del'>-0x78, 0x3b, 0x41, 0x64, 0x6f, 0x3b, 0x48, 0x61, 0x67, 0x3b, 0x46, 0x75, 0x6c, 0x3b, 0x4f, 0x6e, 0x6b, 0x3b, 0x53, 0x61,</div><div class='del'>-0x64, 0x3b, 0x4d, 0x75, 0x64, 0x3b, 0x41, 0x6d, 0x61, 0x6a, 0x6a, 0x69, 0x69, 0x3b, 0x47, 0x75, 0x72, 0x61, 0x61, 0x6e,</div><div class='del'>-0x64, 0x68, 0x61, 0x6c, 0x61, 0x3b, 0x42, 0x69, 0x74, 0x6f, 0x6f, 0x74, 0x65, 0x65, 0x73, 0x73, 0x61, 0x3b, 0x45, 0x6c,</div><div class='del'>-0x62, 0x61, 0x3b, 0x43, 0x61, 0x61, 0x6d, 0x73, 0x61, 0x3b, 0x57, 0x61, 0x78, 0x61, 0x62, 0x61, 0x6a, 0x6a, 0x69, 0x69,</div><div class='del'>-0x3b, 0x41, 0x64, 0x6f, 0x6f, 0x6c, 0x65, 0x65, 0x73, 0x73, 0x61, 0x3b, 0x48, 0x61, 0x67, 0x61, 0x79, 0x79, 0x61, 0x3b,</div><div class='del'>-0x46, 0x75, 0x75, 0x6c, 0x62, 0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6e, 0x6b, 0x6f, 0x6c, 0x6f, 0x6c, 0x65, 0x65, 0x73, 0x73,</div><div class='del'>-0x61, 0x3b, 0x53, 0x61, 0x64, 0x61, 0x61, 0x73, 0x61, 0x3b, 0x4d, 0x75, 0x64, 0x64, 0x65, 0x65, 0x3b, 0x51, 0x75, 0x6e,</div><div class='del'>-0x3b, 0x4e, 0x61, 0x68, 0x3b, 0x43, 0x69, 0x67, 0x3b, 0x41, 0x67, 0x64, 0x3b, 0x43, 0x61, 0x78, 0x3b, 0x51, 0x61, 0x73,</div><div class='del'>-0x3b, 0x51, 0x61, 0x64, 0x3b, 0x4c, 0x65, 0x71, 0x3b, 0x57, 0x61, 0x79, 0x3b, 0x44, 0x69, 0x74, 0x3b, 0x58, 0x69, 0x6d,</div><div class='del'>-0x3b, 0x4b, 0x61, 0x78, 0x3b, 0x51, 0x75, 0x6e, 0x78, 0x61, 0x20, 0x47, 0x61, 0x72, 0x61, 0x62, 0x6c, 0x75, 0x3b, 0x4e,</div><div class='del'>-0x61, 0x68, 0x61, 0x72, 0x73, 0x69, 0x20, 0x4b, 0x75, 0x64, 0x6f, 0x3b, 0x43, 0x69, 0x67, 0x67, 0x69, 0x6c, 0x74, 0x61,</div><div class='del'>-0x20, 0x4b, 0x75, 0x64, 0x6f, 0x3b, 0x41, 0x67, 0x64, 0x61, 0x20, 0x42, 0x61, 0x78, 0x69, 0x73, 0x73, 0x6f, 0x3b, 0x43,</div><div class='del'>-0x61, 0x78, 0x61, 0x68, 0x20, 0x41, 0x6c, 0x73, 0x61, 0x3b, 0x51, 0x61, 0x73, 0x61, 0x20, 0x44, 0x69, 0x72, 0x72, 0x69,</div><div class='del'>-0x3b, 0x51, 0x61, 0x64, 0x6f, 0x20, 0x44, 0x69, 0x72, 0x72, 0x69, 0x3b, 0x4c, 0x65, 0x71, 0x65, 0x65, 0x6e, 0x69, 0x3b,</div><div class='del'>-0x57, 0x61, 0x79, 0x73, 0x75, 0x3b, 0x44, 0x69, 0x74, 0x65, 0x6c, 0x69, 0x3b, 0x58, 0x69, 0x6d, 0x6f, 0x6c, 0x69, 0x3b,</div><div class='del'>-0x4b, 0x61, 0x78, 0x78, 0x61, 0x20, 0x47, 0x61, 0x72, 0x61, 0x62, 0x6c, 0x75, 0x3b, 0x51, 0x3b, 0x4e, 0x3b, 0x43, 0x3b,</div><div class='del'>-0x41, 0x3b, 0x43, 0x3b, 0x51, 0x3b, 0x51, 0x3b, 0x4c, 0x3b, 0x57, 0x3b, 0x44, 0x3b, 0x58, 0x3b, 0x4b, 0x3b, 0x51, 0x75,</div><div class='del'>-0x6e, 0x78, 0x61, 0x20, 0x47, 0x61, 0x72, 0x61, 0x62, 0x6c, 0x75, 0x3b, 0x4b, 0x75, 0x64, 0x6f, 0x3b, 0x43, 0x69, 0x67,</div><div class='del'>-0x67, 0x69, 0x6c, 0x74, 0x61, 0x20, 0x4b, 0x75, 0x64, 0x6f, 0x3b, 0x41, 0x67, 0x64, 0x61, 0x20, 0x42, 0x61, 0x78, 0x69,</div><div class='del'>-0x73, 0x3b, 0x43, 0x61, 0x78, 0x61, 0x68, 0x20, 0x41, 0x6c, 0x73, 0x61, 0x3b, 0x51, 0x61, 0x73, 0x61, 0x20, 0x44, 0x69,</div><div class='del'>-0x72, 0x72, 0x69, 0x3b, 0x51, 0x61, 0x64, 0x6f, 0x20, 0x44, 0x69, 0x72, 0x72, 0x69, 0x3b, 0x4c, 0x69, 0x69, 0x71, 0x65,</div><div class='del'>-0x6e, 0x3b, 0x57, 0x61, 0x79, 0x73, 0x75, 0x3b, 0x44, 0x69, 0x74, 0x65, 0x6c, 0x69, 0x3b, 0x58, 0x69, 0x6d, 0x6f, 0x6c,</div><div class='del'>-0x69, 0x3b, 0x4b, 0x61, 0x78, 0x78, 0x61, 0x20, 0x47, 0x61, 0x72, 0x61, 0x62, 0x6c, 0x75, 0x3b, 0x4a, 0x61, 0x6e, 0x3b,</div><div class='del'>-0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b,</div><div class='del'>-0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b,</div><div class='del'>-0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72,</div><div class='del'>-0x69, 0x65, 0x3b, 0x4d, 0x61, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a,</div><div class='del'>-0x75, 0x6e, 0x69, 0x65, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x65, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b,</div><div class='del'>-0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f,</div><div class='del'>-0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x3b,</div><div class='del'>-0x53, 0x68, 0x6b, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x50, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x6a, 0x3b, 0x51, 0x65, 0x72, 0x3b,</div><div class='del'>-0x4b, 0x6f, 0x72, 0x3b, 0x47, 0x73, 0x68, 0x3b, 0x53, 0x68, 0x74, 0x3b, 0x54, 0x65, 0x74, 0x3b, 0x4e, 0xeb, 0x6e, 0x3b,</div><div class='del'>-0x44, 0x68, 0x6a, 0x3b, 0x6a, 0x61, 0x6e, 0x61, 0x72, 0x3b, 0x73, 0x68, 0x6b, 0x75, 0x72, 0x74, 0x3b, 0x6d, 0x61, 0x72,</div><div class='del'>-0x73, 0x3b, 0x70, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x71, 0x65, 0x72, 0x73, 0x68, 0x6f, 0x72, 0x3b,</div><div class='del'>-0x6b, 0x6f, 0x72, 0x72, 0x69, 0x6b, 0x3b, 0x67, 0x75, 0x73, 0x68, 0x74, 0x3b, 0x73, 0x68, 0x74, 0x61, 0x74, 0x6f, 0x72,</div><div class='del'>-0x3b, 0x74, 0x65, 0x74, 0x6f, 0x72, 0x3b, 0x6e, 0xeb, 0x6e, 0x74, 0x6f, 0x72, 0x3b, 0x64, 0x68, 0x6a, 0x65, 0x74, 0x6f,</div><div class='del'>-0x72, 0x3b, 0x4a, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x51, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x53, 0x3b,</div><div class='del'>-0x54, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x1303, 0x1295, 0x12e9, 0x3b, 0x134c, 0x1265, 0x1229, 0x3b, 0x121b, 0x122d, 0x127d, 0x3b, 0x12a4, 0x1355,</div><div class='del'>-0x1228, 0x3b, 0x121c, 0x12ed, 0x3b, 0x1301, 0x1295, 0x3b, 0x1301, 0x120b, 0x12ed, 0x3b, 0x12a6, 0x1308, 0x1235, 0x3b, 0x1234, 0x1355, 0x1274, 0x3b,</div><div class='del'>-0x12a6, 0x12ad, 0x1270, 0x3b, 0x1296, 0x126c, 0x121d, 0x3b, 0x12f2, 0x1234, 0x121d, 0x3b, 0x1303, 0x1295, 0x12e9, 0x12c8, 0x122a, 0x3b, 0x134c, 0x1265,</div><div class='del'>-0x1229, 0x12c8, 0x122a, 0x3b, 0x121b, 0x122d, 0x127d, 0x3b, 0x12a4, 0x1355, 0x1228, 0x120d, 0x3b, 0x121c, 0x12ed, 0x3b, 0x1301, 0x1295, 0x3b, 0x1301,</div><div class='del'>-0x120b, 0x12ed, 0x3b, 0x12a6, 0x1308, 0x1235, 0x1275, 0x3b, 0x1234, 0x1355, 0x1274, 0x121d, 0x1260, 0x122d, 0x3b, 0x12a6, 0x12ad, 0x1270, 0x12cd, 0x1260,</div><div class='del'>-0x122d, 0x3b, 0x1296, 0x126c, 0x121d, 0x1260, 0x122d, 0x3b, 0x12f2, 0x1234, 0x121d, 0x1260, 0x122d, 0x3b, 0x1303, 0x3b, 0x134c, 0x3b, 0x121b, 0x3b,</div><div class='del'>-0x12a4, 0x3b, 0x121c, 0x3b, 0x1301, 0x3b, 0x1301, 0x3b, 0x12a6, 0x3b, 0x1234, 0x3b, 0x12a6, 0x3b, 0x1296, 0x3b, 0x12f2, 0x3b, 0x64a, 0x646,</div><div class='del'>-0x627, 0x64a, 0x631, 0x3b, 0x641, 0x628, 0x631, 0x627, 0x64a, 0x631, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x623, 0x628, 0x631, 0x64a,</div><div class='del'>-0x644, 0x3b, 0x645, 0x627, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x646, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x644, 0x64a, 0x648, 0x3b, 0x623,</div><div class='del'>-0x63a, 0x633, 0x637, 0x633, 0x3b, 0x633, 0x628, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646,</div><div class='del'>-0x648, 0x641, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x64a, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x64a, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x623,</div><div class='del'>-0x3b, 0x648, 0x3b, 0x646, 0x3b, 0x644, 0x3b, 0x63a, 0x3b, 0x633, 0x3b, 0x643, 0x3b, 0x628, 0x3b, 0x62f, 0x3b, 0x643, 0x627, 0x646,</div><div class='del'>-0x648, 0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x634, 0x628, 0x627, 0x637, 0x3b, 0x622, 0x630, 0x627, 0x631, 0x3b,</div><div class='del'>-0x646, 0x64a, 0x633, 0x627, 0x646, 0x3b, 0x623, 0x64a, 0x627, 0x631, 0x3b, 0x62d, 0x632, 0x64a, 0x631, 0x627, 0x646, 0x3b, 0x62a, 0x645,</div><div class='del'>-0x648, 0x632, 0x3b, 0x622, 0x628, 0x3b, 0x623, 0x64a, 0x644, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0x20, 0x627, 0x644,</div><div class='del'>-0x623, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x643, 0x627, 0x646,</div><div class='del'>-0x648, 0x646, 0x20, 0x627, 0x644, 0x623, 0x648, 0x644, 0x3b, 0x643, 0x627, 0x646, 0x648, 0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646,</div><div class='del'>-0x64a, 0x3b, 0x634, 0x628, 0x627, 0x637, 0x3b, 0x622, 0x630, 0x627, 0x631, 0x3b, 0x646, 0x64a, 0x633, 0x627, 0x646, 0x3b, 0x646, 0x648,</div><div class='del'>-0x627, 0x631, 0x3b, 0x62d, 0x632, 0x64a, 0x631, 0x627, 0x646, 0x3b, 0x62a, 0x645, 0x648, 0x632, 0x3b, 0x622, 0x628, 0x3b, 0x623, 0x64a,</div><div class='del'>-0x644, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0x20, 0x627, 0x644, 0x623, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a,</div><div class='del'>-0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x643, 0x627, 0x646, 0x648, 0x646, 0x20, 0x627, 0x644, 0x623, 0x648, 0x644,</div><div class='del'>-0x3b, 0x540, 0x576, 0x57e, 0x3b, 0x553, 0x57f, 0x57e, 0x3b, 0x544, 0x580, 0x57f, 0x3b, 0x531, 0x57a, 0x580, 0x3b, 0x544, 0x575, 0x57d,</div><div class='del'>-0x3b, 0x540, 0x576, 0x57d, 0x3b, 0x540, 0x56c, 0x57d, 0x3b, 0x555, 0x563, 0x57d, 0x3b, 0x54d, 0x565, 0x57a, 0x3b, 0x540, 0x578, 0x56f,</div><div class='del'>-0x3b, 0x546, 0x578, 0x575, 0x3b, 0x534, 0x565, 0x56f, 0x3b, 0x540, 0x578, 0x582, 0x576, 0x57e, 0x561, 0x580, 0x3b, 0x553, 0x565, 0x57f,</div><div class='del'>-0x580, 0x57e, 0x561, 0x580, 0x3b, 0x544, 0x561, 0x580, 0x57f, 0x3b, 0x531, 0x57a, 0x580, 0x56b, 0x56c, 0x3b, 0x544, 0x561, 0x575, 0x56b,</div><div class='del'>-0x57d, 0x3b, 0x540, 0x578, 0x582, 0x576, 0x56b, 0x57d, 0x3b, 0x540, 0x578, 0x582, 0x56c, 0x56b, 0x57d, 0x3b, 0x555, 0x563, 0x578, 0x57d,</div><div class='del'>-0x57f, 0x578, 0x57d, 0x3b, 0x54d, 0x565, 0x57a, 0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x540, 0x578, 0x56f, 0x57f, 0x565, 0x574,</div><div class='del'>-0x562, 0x565, 0x580, 0x3b, 0x546, 0x578, 0x575, 0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x534, 0x565, 0x56f, 0x57f, 0x565, 0x574, 0x562,</div><div class='del'>-0x565, 0x580, 0x3b, 0x31, 0x3b, 0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39,</div><div class='del'>-0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x3b, 0x9ab, 0x9c7, 0x9ac, 0x9cd, 0x9f0,</div><div class='del'>-0x9c1, 0x3b, 0x9ae, 0x9be, 0x9f0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9f0, 0x9bf, 0x9b2, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1,</div><div class='del'>-0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997, 0x3b, 0x9b8, 0x9c7, 0x9aa, 0x9cd, 0x99f, 0x3b, 0x985, 0x995, 0x9cd,</div><div class='del'>-0x99f, 0x9cb, 0x3b, 0x9a8, 0x9ad, 0x9c7, 0x3b, 0x9a1, 0x9bf, 0x9b8, 0x9c7, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x9f1, 0x9be, 0x9f0, 0x9c0,</div><div class='del'>-0x3b, 0x9ab, 0x9c7, 0x9ac, 0x9cd, 0x9f0, 0x9c1, 0x9f1, 0x9be, 0x9f0, 0x9c0, 0x3b, 0x9ae, 0x9be, 0x9f0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa,</div><div class='del'>-0x9cd, 0x9f0, 0x9bf, 0x9b2, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997,</div><div class='del'>-0x9b7, 0x9cd, 0x99f, 0x3b, 0x99b, 0x9c7, 0x9aa, 0x9cd, 0x9a4, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb,</div><div class='del'>-0x9ac, 0x9f0, 0x3b, 0x9a8, 0x9f1, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x3b, 0x9a1, 0x9bf, 0x99a, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x3b,</div><div class='del'>-0x79, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b,</div><div class='del'>-0x69, 0x79, 0x6e, 0x3b, 0x69, 0x79, 0x6c, 0x3b, 0x61, 0x76, 0x71, 0x3b, 0x73, 0x65, 0x6e, 0x3b, 0x6f, 0x6b, 0x74, 0x3b,</div><div class='del'>-0x6e, 0x6f, 0x79, 0x3b, 0x64, 0x65, 0x6b, 0x3b, 0x59, 0x61, 0x6e, 0x76, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x76, 0x72, 0x61,</div><div class='del'>-0x6c, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x130, 0x79, 0x75,</div><div class='del'>-0x6e, 0x3b, 0x130, 0x79, 0x75, 0x6c, 0x3b, 0x41, 0x76, 0x71, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x6e, 0x74, 0x79, 0x61,</div><div class='del'>-0x62, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x4e, 0x6f, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x44, 0x65,</div><div class='del'>-0x6b, 0x61, 0x62, 0x72, 0x3b, 0x75, 0x72, 0x74, 0x3b, 0x6f, 0x74, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x69,</div><div class='del'>-0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x65, 0x6b, 0x61, 0x3b, 0x75, 0x7a, 0x74, 0x3b, 0x61, 0x62, 0x75, 0x3b, 0x69, 0x72, 0x61,</div><div class='del'>-0x3b, 0x75, 0x72, 0x72, 0x3b, 0x61, 0x7a, 0x61, 0x3b, 0x61, 0x62, 0x65, 0x3b, 0x75, 0x72, 0x74, 0x61, 0x72, 0x72, 0x69,</div><div class='del'>-0x6c, 0x61, 0x3b, 0x6f, 0x74, 0x73, 0x61, 0x69, 0x6c, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x78, 0x6f, 0x61, 0x3b, 0x61,</div><div class='del'>-0x70, 0x69, 0x72, 0x69, 0x6c, 0x61, 0x3b, 0x6d, 0x61, 0x69, 0x61, 0x74, 0x7a, 0x61, 0x3b, 0x65, 0x6b, 0x61, 0x69, 0x6e,</div><div class='del'>-0x61, 0x3b, 0x75, 0x7a, 0x74, 0x61, 0x69, 0x6c, 0x61, 0x3b, 0x61, 0x62, 0x75, 0x7a, 0x74, 0x75, 0x61, 0x3b, 0x69, 0x72,</div><div class='del'>-0x61, 0x69, 0x6c, 0x61, 0x3b, 0x75, 0x72, 0x72, 0x69, 0x61, 0x3b, 0x61, 0x7a, 0x61, 0x72, 0x6f, 0x61, 0x3b, 0x61, 0x62,</div><div class='del'>-0x65, 0x6e, 0x64, 0x75, 0x61, 0x3b, 0x55, 0x3b, 0x4f, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x55, 0x3b,</div><div class='del'>-0x41, 0x3b, 0x49, 0x3b, 0x55, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x9af, 0x9bc, 0x9be, 0x9b0, 0x9c0, 0x3b,</div><div class='del'>-0x9ab, 0x9c7, 0x9ac, 0x9cd, 0x9b0, 0x9c1, 0x9af, 0x9bc, 0x9be, 0x9b0, 0x9c0, 0x3b, 0x9ae, 0x9be, 0x9b0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa,</div><div class='del'>-0x9cd, 0x9b0, 0x9bf, 0x9b2, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997,</div><div class='del'>-0x9b8, 0x9cd, 0x99f, 0x3b, 0x9b8, 0x9c7, 0x9aa, 0x9cd, 0x99f, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb,</div><div class='del'>-0x9ac, 0x9b0, 0x3b, 0x9a8, 0x9ad, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x9a1, 0x9bf, 0x9b8, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b,</div><div class='del'>-0x99c, 0x9be, 0x3b, 0x9ab, 0x9c7, 0x3b, 0x9ae, 0x9be, 0x3b, 0x98f, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1,</div><div class='del'>-0x3b, 0x986, 0x3b, 0x9b8, 0x9c7, 0x3b, 0x985, 0x3b, 0x9a8, 0x3b, 0x9a1, 0x9bf, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf21, 0x3b, 0xf5f,</div><div class='del'>-0xfb3, 0xf0b, 0x20, 0xf22, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf23, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf24, 0x3b, 0xf5f, 0xfb3, 0xf0b,</div><div class='del'>-0x20, 0xf25, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf26, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf27, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf28,</div><div class='del'>-0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf29, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf21, 0xf20, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf21, 0xf21,</div><div class='del'>-0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf21, 0xf22, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf51, 0xf44, 0xf54,</div><div class='del'>-0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66,</div><div class='del'>-0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72,</div><div class='del'>-0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d,</div><div class='del'>-0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42,</div><div class='del'>-0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0xf0b,</div><div class='del'>-0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66,</div><div class='del'>-0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b,</div><div class='del'>-0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b,</div><div class='del'>-0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d,</div><div class='del'>-0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0x44f, 0x43d, 0x2e, 0x3b, 0x444, 0x435, 0x432,</div><div class='del'>-0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x44e, 0x43d, 0x438,</div><div class='del'>-0x3b, 0x44e, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e,</div><div class='del'>-0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x44f, 0x43d, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x444,</div><div class='del'>-0x435, 0x432, 0x440, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c,</div><div class='del'>-0x430, 0x439, 0x3b, 0x44e, 0x43d, 0x438, 0x3b, 0x44e, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435,</div><div class='del'>-0x43f, 0x442, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43d, 0x43e, 0x435,</div><div class='del'>-0x43c, 0x432, 0x440, 0x438, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x44f, 0x3b, 0x444, 0x3b, 0x43c, 0x3b,</div><div class='del'>-0x430, 0x3b, 0x43c, 0x3b, 0x44e, 0x3b, 0x44e, 0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x43e, 0x3b, 0x43d, 0x3b, 0x434, 0x3b, 0x1007, 0x1014,</div><div class='del'>-0x103a, 0x3b, 0x1016, 0x1031, 0x3b, 0x1019, 0x1010, 0x103a, 0x3b, 0x1027, 0x3b, 0x1019, 0x1031, 0x3b, 0x1007, 0x103d, 0x1014, 0x103a, 0x3b, 0x1007,</div><div class='del'>-0x1030, 0x3b, 0x1029, 0x3b, 0x1005, 0x1000, 0x103a, 0x3b, 0x1021, 0x1031, 0x102c, 0x1000, 0x103a, 0x3b, 0x1014, 0x102d, 0x102f, 0x3b, 0x1012, 0x102e,</div><div class='del'>-0x3b, 0x1007, 0x1014, 0x103a, 0x1014, 0x101d, 0x102b, 0x101b, 0x102e, 0x3b, 0x1016, 0x1031, 0x1016, 0x1031, 0x102c, 0x103a, 0x101d, 0x102b, 0x101b, 0x102e,</div><div class='del'>-0x3b, 0x1019, 0x1010, 0x103a, 0x3b, 0x1027, 0x1015, 0x103c, 0x102e, 0x3b, 0x1019, 0x1031, 0x3b, 0x1007, 0x103d, 0x1014, 0x103a, 0x3b, 0x1007, 0x1030,</div><div class='del'>-0x101c, 0x102d, 0x102f, 0x1004, 0x103a, 0x3b, 0x1029, 0x1002, 0x102f, 0x1010, 0x103a, 0x3b, 0x1005, 0x1000, 0x103a, 0x1010, 0x1004, 0x103a, 0x1018, 0x102c,</div><div class='del'>-0x3b, 0x1021, 0x1031, 0x102c, 0x1000, 0x103a, 0x1010, 0x102d, 0x102f, 0x1018, 0x102c, 0x3b, 0x1014, 0x102d, 0x102f, 0x101d, 0x1004, 0x103a, 0x1018, 0x102c,</div><div class='del'>-0x3b, 0x1012, 0x102e, 0x1007, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1007, 0x3b, 0x1016, 0x3b, 0x1019, 0x3b, 0x1027, 0x3b, 0x1019, 0x3b, 0x1007,</div><div class='del'>-0x3b, 0x1007, 0x3b, 0x1029, 0x3b, 0x1005, 0x3b, 0x1021, 0x3b, 0x1014, 0x3b, 0x1012, 0x3b, 0x441, 0x442, 0x443, 0x3b, 0x43b, 0x44e, 0x442,</div><div class='del'>-0x3b, 0x441, 0x430, 0x43a, 0x3b, 0x43a, 0x440, 0x430, 0x3b, 0x442, 0x440, 0x430, 0x3b, 0x447, 0x44d, 0x440, 0x3b, 0x43b, 0x456, 0x43f,</div><div class='del'>-0x3b, 0x436, 0x43d, 0x456, 0x3b, 0x432, 0x435, 0x440, 0x3b, 0x43a, 0x430, 0x441, 0x3b, 0x43b, 0x456, 0x441, 0x3b, 0x441, 0x43d, 0x435,</div><div class='del'>-0x3b, 0x441, 0x442, 0x443, 0x434, 0x437, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x44e, 0x442, 0x44b, 0x3b, 0x441, 0x430, 0x43a, 0x430, 0x432,</div><div class='del'>-0x456, 0x43a, 0x3b, 0x43a, 0x440, 0x430, 0x441, 0x430, 0x432, 0x456, 0x43a, 0x3b, 0x442, 0x440, 0x430, 0x432, 0x435, 0x43d, 0x44c, 0x3b,</div><div class='del'>-0x447, 0x44d, 0x440, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x456, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x436, 0x43d, 0x456, 0x432, 0x435,</div><div class='del'>-0x43d, 0x44c, 0x3b, 0x432, 0x435, 0x440, 0x430, 0x441, 0x435, 0x43d, 0x44c, 0x3b, 0x43a, 0x430, 0x441, 0x442, 0x440, 0x44b, 0x447, 0x43d,</div><div class='del'>-0x456, 0x43a, 0x3b, 0x43b, 0x456, 0x441, 0x442, 0x430, 0x43f, 0x430, 0x434, 0x3b, 0x441, 0x43d, 0x435, 0x436, 0x430, 0x43d, 0x44c, 0x3b,</div><div class='del'>-0x441, 0x3b, 0x43b, 0x3b, 0x441, 0x3b, 0x43a, 0x3b, 0x43c, 0x3b, 0x447, 0x3b, 0x43b, 0x3b, 0x436, 0x3b, 0x432, 0x3b, 0x43a, 0x3b,</div><div class='del'>-0x43b, 0x3b, 0x441, 0x3b, 0x17e1, 0x3b, 0x17e2, 0x3b, 0x17e3, 0x3b, 0x17e4, 0x3b, 0x17e5, 0x3b, 0x17e6, 0x3b, 0x17e7, 0x3b, 0x17e8, 0x3b,</div><div class='del'>-0x17e9, 0x3b, 0x17e1, 0x17e0, 0x3b, 0x17e1, 0x17e1, 0x3b, 0x17e1, 0x17e2, 0x3b, 0x1798, 0x1780, 0x179a, 0x17b6, 0x3b, 0x1780, 0x17bb, 0x1798, 0x17d2,</div><div class='del'>-0x1797, 0x17c8, 0x3b, 0x1798, 0x17b7, 0x1793, 0x17b6, 0x3b, 0x1798, 0x17c1, 0x179f, 0x17b6, 0x3b, 0x17a7, 0x179f, 0x1797, 0x17b6, 0x3b, 0x1798, 0x17b7,</div><div class='del'>-0x1790, 0x17bb, 0x1793, 0x17b6, 0x3b, 0x1780, 0x1780, 0x17d2, 0x1780, 0x178a, 0x17b6, 0x3b, 0x179f, 0x17b8, 0x17a0, 0x17b6, 0x3b, 0x1780, 0x1789, 0x17d2,</div><div class='del'>-0x1789, 0x17b6, 0x3b, 0x178f, 0x17bb, 0x179b, 0x17b6, 0x3b, 0x179c, 0x17b7, 0x1785, 0x17d2, 0x1786, 0x17b7, 0x1780, 0x17b6, 0x3b, 0x1792, 0x17d2, 0x1793,</div><div class='del'>-0x17bc, 0x3b, 0x67, 0x65, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x61, 0x62,</div><div class='del'>-0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67,</div><div class='del'>-0x2e, 0x3b, 0x73, 0x65, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x73,</div><div class='del'>-0x2e, 0x3b, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x3b,</div><div class='del'>-0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x6a, 0x75, 0x6c, 0x69,</div><div class='del'>-0x6f, 0x6c, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63,</div><div class='del'>-0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d,</div><div class='del'>-0x62, 0x72, 0x65, 0x3b, 0x67, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x6a, 0x3b, 0x61, 0x3b,</div><div class='del'>-0x73, 0x3b, 0x6f, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x4e00, 0x6708, 0x3b, 0x4e8c, 0x6708, 0x3b, 0x4e09, 0x6708, 0x3b, 0x56db, 0x6708, 0x3b,</div><div class='del'>-0x4e94, 0x6708, 0x3b, 0x516d, 0x6708, 0x3b, 0x4e03, 0x6708, 0x3b, 0x516b, 0x6708, 0x3b, 0x4e5d, 0x6708, 0x3b, 0x5341, 0x6708, 0x3b, 0x5341, 0x4e00,</div><div class='del'>-0x6708, 0x3b, 0x5341, 0x4e8c, 0x6708, 0x3b, 0x31, 0x6708, 0x3b, 0x32, 0x6708, 0x3b, 0x33, 0x6708, 0x3b, 0x34, 0x6708, 0x3b, 0x35, 0x6708,</div><div class='del'>-0x3b, 0x36, 0x6708, 0x3b, 0x37, 0x6708, 0x3b, 0x38, 0x6708, 0x3b, 0x39, 0x6708, 0x3b, 0x31, 0x30, 0x6708, 0x3b, 0x31, 0x31, 0x6708,</div><div class='del'>-0x3b, 0x31, 0x32, 0x6708, 0x3b, 0x73, 0x69, 0x6a, 0x3b, 0x76, 0x65, 0x6c, 0x6a, 0x3b, 0x6f, 0x17e, 0x75, 0x3b, 0x74, 0x72,</div><div class='del'>-0x61, 0x3b, 0x73, 0x76, 0x69, 0x3b, 0x6c, 0x69, 0x70, 0x3b, 0x73, 0x72, 0x70, 0x3b, 0x6b, 0x6f, 0x6c, 0x3b, 0x72, 0x75,</div><div class='del'>-0x6a, 0x3b, 0x6c, 0x69, 0x73, 0x3b, 0x73, 0x74, 0x75, 0x3b, 0x70, 0x72, 0x6f, 0x3b, 0x73, 0x69, 0x6a, 0x65, 0x10d, 0x61,</div><div class='del'>-0x6e, 0x6a, 0x3b, 0x76, 0x65, 0x6c, 0x6a, 0x61, 0x10d, 0x61, 0x3b, 0x6f, 0x17e, 0x75, 0x6a, 0x61, 0x6b, 0x3b, 0x74, 0x72,</div><div class='del'>-0x61, 0x76, 0x61, 0x6e, 0x6a, 0x3b, 0x73, 0x76, 0x69, 0x62, 0x61, 0x6e, 0x6a, 0x3b, 0x6c, 0x69, 0x70, 0x61, 0x6e, 0x6a,</div><div class='del'>-0x3b, 0x73, 0x72, 0x70, 0x61, 0x6e, 0x6a, 0x3b, 0x6b, 0x6f, 0x6c, 0x6f, 0x76, 0x6f, 0x7a, 0x3b, 0x72, 0x75, 0x6a, 0x61,</div><div class='del'>-0x6e, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x3b, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e, 0x69, 0x3b, 0x70,</div><div class='del'>-0x72, 0x6f, 0x73, 0x69, 0x6e, 0x61, 0x63, 0x3b, 0x31, 0x2e, 0x3b, 0x32, 0x2e, 0x3b, 0x33, 0x2e, 0x3b, 0x34, 0x2e, 0x3b,</div><div class='del'>-0x35, 0x2e, 0x3b, 0x36, 0x2e, 0x3b, 0x37, 0x2e, 0x3b, 0x38, 0x2e, 0x3b, 0x39, 0x2e, 0x3b, 0x31, 0x30, 0x2e, 0x3b, 0x31,</div><div class='del'>-0x31, 0x2e, 0x3b, 0x31, 0x32, 0x2e, 0x3b, 0x6c, 0x65, 0x64, 0x65, 0x6e, 0x3b, 0xfa, 0x6e, 0x6f, 0x72, 0x3b, 0x62, 0x159,</div><div class='del'>-0x65, 0x7a, 0x65, 0x6e, 0x3b, 0x64, 0x75, 0x62, 0x65, 0x6e, 0x3b, 0x6b, 0x76, 0x11b, 0x74, 0x65, 0x6e, 0x3b, 0x10d, 0x65,</div><div class='del'>-0x72, 0x76, 0x65, 0x6e, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x65, 0x6e, 0x65, 0x63, 0x3b, 0x73, 0x72, 0x70, 0x65, 0x6e, 0x3b,</div><div class='del'>-0x7a, 0xe1, 0x159, 0xed, 0x3b, 0x159, 0xed, 0x6a, 0x65, 0x6e, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x3b,</div><div class='del'>-0x70, 0x72, 0x6f, 0x73, 0x69, 0x6e, 0x65, 0x63, 0x3b, 0x6c, 0x3b, 0xfa, 0x3b, 0x62, 0x3b, 0x64, 0x3b, 0x6b, 0x3b, 0x10d,</div><div class='del'>-0x3b, 0x10d, 0x3b, 0x73, 0x3b, 0x7a, 0x3b, 0x159, 0x3b, 0x6c, 0x3b, 0x70, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62,</div><div class='del'>-0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c,</div><div class='del'>-0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63,</div><div class='del'>-0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x74,</div><div class='del'>-0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c,</div><div class='del'>-0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f,</div><div class='del'>-0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65,</div><div class='del'>-0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72,</div><div class='del'>-0x3b, 0x6d, 0x65, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70,</div><div class='del'>-0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69,</div><div class='del'>-0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69,</div><div class='del'>-0x6c, 0x3b, 0x6d, 0x65, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75,</div><div class='del'>-0x73, 0x74, 0x75, 0x73, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62,</div><div class='del'>-0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72,</div><div class='del'>-0x3b, 0x6a, 0x61, 0x61, 0x6e, 0x3b, 0x76, 0x65, 0x65, 0x62, 0x72, 0x3b, 0x6d, 0xe4, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70,</div><div class='del'>-0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75,</div><div class='del'>-0x67, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x74, 0x73, 0x3b,</div><div class='del'>-0x6a, 0x61, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x76, 0x65, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0xe4, 0x72,</div><div class='del'>-0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6e, 0x69, 0x3b,</div><div class='del'>-0x6a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62,</div><div class='del'>-0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72,</div><div class='del'>-0x3b, 0x64, 0x65, 0x74, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x56, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d,</div><div class='del'>-0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66,</div><div class='del'>-0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a,</div><div class='del'>-0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64,</div><div class='del'>-0x65, 0x73, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61,</div><div class='del'>-0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75,</div><div class='del'>-0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,</div><div class='del'>-0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x73,</div><div class='del'>-0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x74, 0x61, 0x6d, 0x6d, 0x69, 0x3b, 0x68, 0x65, 0x6c, 0x6d, 0x69, 0x3b, 0x6d, 0x61,</div><div class='del'>-0x61, 0x6c, 0x69, 0x73, 0x3b, 0x68, 0x75, 0x68, 0x74, 0x69, 0x3b, 0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x3b, 0x6b, 0x65, 0x73,</div><div class='del'>-0xe4, 0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x3b, 0x65, 0x6c, 0x6f, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x3b, 0x6c, 0x6f, 0x6b,</div><div class='del'>-0x61, 0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x3b, 0x6a, 0x6f, 0x75, 0x6c, 0x75, 0x3b, 0x74, 0x61, 0x6d, 0x6d, 0x69,</div><div class='del'>-0x6b, 0x75, 0x75, 0x3b, 0x68, 0x65, 0x6c, 0x6d, 0x69, 0x6b, 0x75, 0x75, 0x3b, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x6b,</div><div class='del'>-0x75, 0x75, 0x3b, 0x68, 0x75, 0x68, 0x74, 0x69, 0x6b, 0x75, 0x75, 0x3b, 0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x6b, 0x75, 0x75,</div><div class='del'>-0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x6b, 0x75, 0x75, 0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x6b, 0x75, 0x75, 0x3b, 0x65, 0x6c,</div><div class='del'>-0x6f, 0x6b, 0x75, 0x75, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x6b, 0x75, 0x75, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x6b, 0x75, 0x75,</div><div class='del'>-0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x6b, 0x75, 0x75, 0x3b, 0x6a, 0x6f, 0x75, 0x6c, 0x75, 0x6b, 0x75, 0x75, 0x3b,</div><div class='del'>-0x54, 0x3b, 0x48, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x48, 0x3b, 0x45, 0x3b, 0x53, 0x3b, 0x4c, 0x3b,</div><div class='del'>-0x4d, 0x3b, 0x4a, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x2e, 0x3b, 0x66, 0xe9, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73,</div><div class='del'>-0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x69, 0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x2e,</div><div class='del'>-0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76,</div><div class='del'>-0x2e, 0x3b, 0x64, 0xe9, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x69, 0x65, 0x72, 0x3b, 0x66, 0xe9, 0x76, 0x72, 0x69,</div><div class='del'>-0x65, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75,</div><div class='del'>-0x69, 0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x6c, 0x65, 0x74, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74,</div><div class='del'>-0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62,</div><div class='del'>-0x72, 0x65, 0x3b, 0x64, 0xe9, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x58, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b,</div><div class='del'>-0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x58, 0x75, 0xf1, 0x3b, 0x58, 0x75, 0x6c, 0x3b,</div><div class='del'>-0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x75, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b,</div><div class='del'>-0x58, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72,</div><div class='del'>-0x7a, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b, 0x58, 0x75, 0xf1, 0x6f, 0x3b, 0x58,</div><div class='del'>-0x75, 0x6c, 0x6c, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f,</div><div class='del'>-0x3b, 0x4f, 0x75, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x44, 0x65,</div><div class='del'>-0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x58, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x58, 0x3b, 0x58,</div><div class='del'>-0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x10d8, 0x10d0, 0x10dc, 0x3b, 0x10d7, 0x10d4, 0x10d1, 0x3b, 0x10db,</div><div class='del'>-0x10d0, 0x10e0, 0x3b, 0x10d0, 0x10de, 0x10e0, 0x3b, 0x10db, 0x10d0, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10dc, 0x3b, 0x10d8, 0x10d5, 0x10da, 0x3b, 0x10d0,</div><div class='del'>-0x10d2, 0x10d5, 0x3b, 0x10e1, 0x10d4, 0x10e5, 0x3b, 0x10dd, 0x10e5, 0x10e2, 0x3b, 0x10dc, 0x10dd, 0x10d4, 0x3b, 0x10d3, 0x10d4, 0x10d9, 0x3b, 0x10d8,</div><div class='del'>-0x10d0, 0x10dc, 0x10d5, 0x10d0, 0x10e0, 0x10d8, 0x3b, 0x10d7, 0x10d4, 0x10d1, 0x10d4, 0x10e0, 0x10d5, 0x10d0, 0x10da, 0x10d8, 0x3b, 0x10db, 0x10d0, 0x10e0,</div><div class='del'>-0x10e2, 0x10d8, 0x3b, 0x10d0, 0x10de, 0x10e0, 0x10d8, 0x10da, 0x10d8, 0x3b, 0x10db, 0x10d0, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10dc, 0x10d8,</div><div class='del'>-0x10e1, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10da, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d0, 0x10d2, 0x10d5, 0x10d8, 0x10e1, 0x10e2, 0x10dd, 0x3b, 0x10e1, 0x10d4,</div><div class='del'>-0x10e5, 0x10e2, 0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10dd, 0x10e5, 0x10e2, 0x10dd, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10dc,</div><div class='del'>-0x10dd, 0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10d3, 0x10d4, 0x10d9, 0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10d8, 0x3b,</div><div class='del'>-0x10d7, 0x3b, 0x10db, 0x3b, 0x10d0, 0x3b, 0x10db, 0x3b, 0x10d8, 0x3b, 0x10d8, 0x3b, 0x10d0, 0x3b, 0x10e1, 0x3b, 0x10dd, 0x3b, 0x10dc, 0x3b,</div><div class='del'>-0x10d3, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d, 0xe4, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x2e,</div><div class='del'>-0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65,</div><div class='del'>-0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72,</div><div class='del'>-0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b,</div><div class='del'>-0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74,</div><div class='del'>-0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e,</div><div class='del'>-0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0xe4, 0x6e,</div><div class='del'>-0x6e, 0x65, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72,</div><div class='del'>-0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67,</div><div class='del'>-0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65,</div><div class='del'>-0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,</div><div class='del'>-0x399, 0x3b1, 0x3bd, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3b, 0x39c, 0x3b1, 0x3c1, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3b, 0x39c, 0x3b1, 0x3ca, 0x3b,</div><div class='del'>-0x399, 0x3bf, 0x3c5, 0x3bd, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bb, 0x3b, 0x391, 0x3c5, 0x3b3, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3b, 0x39f, 0x3ba,</div><div class='del'>-0x3c4, 0x3b, 0x39d, 0x3bf, 0x3b5, 0x3b, 0x394, 0x3b5, 0x3ba, 0x3b, 0x399, 0x3b1, 0x3bd, 0x3bf, 0x3c5, 0x3ac, 0x3c1, 0x3b9, 0x3bf, 0x3c2,</div><div class='del'>-0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3c1, 0x3bf, 0x3c5, 0x3ac, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39c, 0x3ac, 0x3c1, 0x3c4, 0x3b9, 0x3bf, 0x3c2,</div><div class='del'>-0x3b, 0x391, 0x3c0, 0x3c1, 0x3af, 0x3bb, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39c, 0x3ac, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bd,</div><div class='del'>-0x3b9, 0x3bf, 0x3c2, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bb, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x391, 0x3cd, 0x3b3, 0x3bf, 0x3c5, 0x3c3, 0x3c4, 0x3bf,</div><div class='del'>-0x3c2, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3c4, 0x3ad, 0x3bc, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3ce, 0x3b2, 0x3c1,</div><div class='del'>-0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39d, 0x3bf, 0x3ad, 0x3bc, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x394, 0x3b5, 0x3ba, 0x3ad, 0x3bc, 0x3b2,</div><div class='del'>-0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x399, 0x3b, 0x3a6, 0x3b, 0x39c, 0x3b, 0x391, 0x3b, 0x39c, 0x3b, 0x399, 0x3b, 0x399, 0x3b, 0x391,</div><div class='del'>-0x3b, 0x3a3, 0x3b, 0x39f, 0x3b, 0x39d, 0x3b, 0x394, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62,</div><div class='del'>-0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x69, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x3b,</div><div class='del'>-0x6d, 0x61, 0x6a, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73,</div><div class='del'>-0x74, 0x75, 0x73, 0x69, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x69, 0x3b, 0x6f, 0x6b, 0x74, 0x6f,</div><div class='del'>-0x62, 0x65, 0x72, 0x69, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x69, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d,</div><div class='del'>-0x62, 0x65, 0x72, 0x69, 0x3b, 0xa9c, 0xabe, 0xaa8, 0xacd, 0xaaf, 0xac1, 0x3b, 0xaab, 0xac7, 0xaac, 0xacd, 0xab0, 0xac1, 0x3b, 0xaae,</div><div class='del'>-0xabe, 0xab0, 0xacd, 0xa9a, 0x3b, 0xa8f, 0xaaa, 0xacd, 0xab0, 0xabf, 0xab2, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0xaa8, 0x3b, 0xa9c,</div><div class='del'>-0xac1, 0xab2, 0xabe, 0xa88, 0x3b, 0xa91, 0xa97, 0xab8, 0xacd, 0xa9f, 0x3b, 0xab8, 0xaaa, 0xacd, 0xa9f, 0xac7, 0x3b, 0xa91, 0xa95, 0xacd,</div><div class='del'>-0xa9f, 0xacb, 0x3b, 0xaa8, 0xab5, 0xac7, 0x3b, 0xaa1, 0xabf, 0xab8, 0xac7, 0x3b, 0xa9c, 0xabe, 0xaa8, 0xacd, 0xaaf, 0xac1, 0xa86, 0xab0,</div><div class='del'>-0xac0, 0x3b, 0xaab, 0xac7, 0xaac, 0xacd, 0xab0, 0xac1, 0xa86, 0xab0, 0xac0, 0x3b, 0xaae, 0xabe, 0xab0, 0xacd, 0xa9a, 0x3b, 0xa8f, 0xaaa,</div><div class='del'>-0xacd, 0xab0, 0xabf, 0xab2, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0xaa8, 0x3b, 0xa9c, 0xac1, 0xab2, 0xabe, 0xa88, 0x3b, 0xa91, 0xa97,</div><div class='del'>-0xab8, 0xacd, 0xa9f, 0x3b, 0xab8, 0xaaa, 0xacd, 0xa9f, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xa91, 0xa95, 0xacd, 0xa9f, 0xacd, 0xaac,</div><div class='del'>-0xab0, 0x3b, 0xaa8, 0xab5, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xaa1, 0xabf, 0xab8, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xa9c,</div><div class='del'>-0xabe, 0x3b, 0xaab, 0xac7, 0x3b, 0xaae, 0xabe, 0x3b, 0xa8f, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0x3b, 0xa9c, 0xac1, 0x3b, 0xa91,</div><div class='del'>-0x3b, 0xab8, 0x3b, 0xa91, 0x3b, 0xaa8, 0x3b, 0xaa1, 0xabf, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x61, 0x62, 0x3b, 0x4d, 0x61,</div><div class='del'>-0x72, 0x3b, 0x41, 0x66, 0x69, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x41, 0x67,</div><div class='del'>-0x75, 0x3b, 0x53, 0x61, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x75, 0x77, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61,</div><div class='del'>-0x6e, 0x61, 0x69, 0x72, 0x75, 0x3b, 0x46, 0x61, 0x62, 0x75, 0x72, 0x61, 0x69, 0x72, 0x75, 0x3b, 0x4d, 0x61, 0x72, 0x69,</div><div class='del'>-0x73, 0x3b, 0x41, 0x66, 0x69, 0x72, 0x69, 0x6c, 0x75, 0x3b, 0x4d, 0x61, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6e, 0x69, 0x3b,</div><div class='del'>-0x59, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x53, 0x61, 0x74, 0x75, 0x6d, 0x62, 0x61, 0x3b,</div><div class='del'>-0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x75, 0x77, 0x61, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x61, 0x6d,</div><div class='del'>-0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x41, 0x3b, 0x53,</div><div class='del'>-0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x62c, 0x64e, 0x646, 0x3b, 0x6a2, 0x64e, 0x628, 0x3b, 0x645, 0x64e, 0x631, 0x3b, 0x623,</div><div class='del'>-0x64e, 0x6a2, 0x652, 0x631, 0x3b, 0x645, 0x64e, 0x64a, 0x3b, 0x64a, 0x64f, 0x648, 0x646, 0x3b, 0x64a, 0x64f, 0x648, 0x644, 0x3b, 0x623,</div><div class='del'>-0x64e, 0x63a, 0x64f, 0x3b, 0x633, 0x64e, 0x62a, 0x3b, 0x623, 0x64f, 0x643, 0x652, 0x62a, 0x3b, 0x646, 0x64f, 0x648, 0x3b, 0x62f, 0x650,</div><div class='del'>-0x633, 0x3b, 0x62c, 0x64e, 0x646, 0x64e, 0x64a, 0x652, 0x631, 0x64f, 0x3b, 0x6a2, 0x64e, 0x628, 0x652, 0x631, 0x64e, 0x64a, 0x652, 0x631,</div><div class='del'>-0x64f, 0x3b, 0x645, 0x64e, 0x631, 0x650, 0x633, 0x652, 0x3b, 0x623, 0x64e, 0x6a2, 0x652, 0x631, 0x650, 0x644, 0x64f, 0x3b, 0x645, 0x64e,</div><div class='del'>-0x64a, 0x64f, 0x3b, 0x64a, 0x64f, 0x648, 0x646, 0x650, 0x3b, 0x64a, 0x64f, 0x648, 0x644, 0x650, 0x3b, 0x623, 0x64e, 0x63a, 0x64f, 0x633,</div><div class='del'>-0x652, 0x62a, 0x64e, 0x3b, 0x633, 0x64e, 0x62a, 0x64f, 0x645, 0x652, 0x628, 0x64e, 0x3b, 0x623, 0x64f, 0x643, 0x652, 0x62a, 0x648, 0x64f,</div><div class='del'>-0x628, 0x64e, 0x3b, 0x646, 0x64f, 0x648, 0x64e, 0x645, 0x652, 0x628, 0x64e, 0x3b, 0x62f, 0x650, 0x633, 0x64e, 0x645, 0x652, 0x628, 0x64e,</div><div class='del'>-0x3b, 0x5d9, 0x5e0, 0x5d5, 0x5f3, 0x3b, 0x5e4, 0x5d1, 0x5e8, 0x5f3, 0x3b, 0x5de, 0x5e8, 0x5e1, 0x3b, 0x5d0, 0x5e4, 0x5e8, 0x5f3, 0x3b,</div><div class='del'>-0x5de, 0x5d0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dc, 0x5f3, 0x3b, 0x5d0, 0x5d5, 0x5d2, 0x5f3, 0x3b, 0x5e1,</div><div class='del'>-0x5e4, 0x5d8, 0x5f3, 0x3b, 0x5d0, 0x5d5, 0x5e7, 0x5f3, 0x3b, 0x5e0, 0x5d5, 0x5d1, 0x5f3, 0x3b, 0x5d3, 0x5e6, 0x5de, 0x5f3, 0x3b, 0x5d9,</div><div class='del'>-0x5e0, 0x5d5, 0x5d0, 0x5e8, 0x3b, 0x5e4, 0x5d1, 0x5e8, 0x5d5, 0x5d0, 0x5e8, 0x3b, 0x5de, 0x5e8, 0x5e1, 0x3b, 0x5d0, 0x5e4, 0x5e8, 0x5d9,</div><div class='del'>-0x5dc, 0x3b, 0x5de, 0x5d0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dc, 0x5d9, 0x3b, 0x5d0, 0x5d5, 0x5d2, 0x5d5,</div><div class='del'>-0x5e1, 0x5d8, 0x3b, 0x5e1, 0x5e4, 0x5d8, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x5d0, 0x5d5, 0x5e7, 0x5d8, 0x5d5, 0x5d1, 0x5e8, 0x3b, 0x5e0, 0x5d5,</div><div class='del'>-0x5d1, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x5d3, 0x5e6, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x91c, 0x928, 0x935, 0x930, 0x940, 0x3b, 0x92b, 0x930, 0x935,</div><div class='del'>-0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x948, 0x932, 0x3b, 0x92e, 0x908, 0x3b, 0x91c,</div><div class='del'>-0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917, 0x938, 0x94d, 0x924, 0x3b, 0x938, 0x93f, 0x924, 0x92e, 0x94d,</div><div class='del'>-0x92c, 0x930, 0x3b, 0x905, 0x915, 0x94d, 0x924, 0x942, 0x92c, 0x930, 0x3b, 0x928, 0x935, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x926, 0x93f,</div><div class='del'>-0x938, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x91c, 0x3b, 0x92b, 0x93c, 0x3b, 0x92e, 0x93e, 0x3b, 0x905, 0x3b, 0x92e, 0x3b, 0x91c, 0x942,</div><div class='del'>-0x3b, 0x91c, 0x941, 0x3b, 0x905, 0x3b, 0x938, 0x93f, 0x3b, 0x905, 0x3b, 0x928, 0x3b, 0x926, 0x93f, 0x3b, 0x6a, 0x61, 0x6e, 0x2e,</div><div class='del'>-0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0xe1, 0x72, 0x63, 0x2e, 0x3b, 0xe1, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0xe1,</div><div class='del'>-0x6a, 0x2e, 0x3b, 0x6a, 0xfa, 0x6e, 0x2e, 0x3b, 0x6a, 0xfa, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x7a,</div><div class='del'>-0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b,</div><div class='del'>-0x6a, 0x61, 0x6e, 0x75, 0xe1, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1, 0x72, 0x3b, 0x6d, 0xe1, 0x72, 0x63, 0x69,</div><div class='del'>-0x75, 0x73, 0x3b, 0xe1, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x73, 0x3b, 0x6d, 0xe1, 0x6a, 0x75, 0x73, 0x3b, 0x6a, 0xfa, 0x6e,</div><div class='del'>-0x69, 0x75, 0x73, 0x3b, 0x6a, 0xfa, 0x6c, 0x69, 0x75, 0x73, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x7a, 0x74, 0x75, 0x73,</div><div class='del'>-0x3b, 0x73, 0x7a, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x65, 0x72, 0x3b,</div><div class='del'>-0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b,</div><div class='del'>-0x46, 0x3b, 0x4d, 0x3b, 0xc1, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x7a, 0x3b, 0x4f, 0x3b, 0x4e,</div><div class='del'>-0x3b, 0x44, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d,</div><div class='del'>-0x61, 0xed, 0x3b, 0x6a, 0xfa, 0x6e, 0x3b, 0x6a, 0xfa, 0x6c, 0x3b, 0xe1, 0x67, 0xfa, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f,</div><div class='del'>-0x6b, 0x74, 0x3b, 0x6e, 0xf3, 0x76, 0x3b, 0x64, 0x65, 0x73, 0x3b, 0x6a, 0x61, 0x6e, 0xfa, 0x61, 0x72, 0x3b, 0x66, 0x65,</div><div class='del'>-0x62, 0x72, 0xfa, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d, 0x61, 0xed,</div><div class='del'>-0x3b, 0x6a, 0xfa, 0x6e, 0xed, 0x3b, 0x6a, 0xfa, 0x6c, 0xed, 0x3b, 0xe1, 0x67, 0xfa, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70,</div><div class='del'>-0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0xf3, 0x76, 0x65, 0x6d,</div><div class='del'>-0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61,</div><div class='del'>-0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x6a, 0x3b, 0xe1, 0x3b, 0x73, 0x3b, 0x6f, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x4a, 0x61, 0x6e,</div><div class='del'>-0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e,</div><div class='del'>-0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x75, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76,</div><div class='del'>-0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72,</div><div class='del'>-0x69, 0x3b, 0x4d, 0x61, 0x72, 0x65, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75,</div><div class='del'>-0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74,</div><div class='del'>-0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62,</div><div class='del'>-0x65, 0x72, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x45, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x61, 0x62,</div><div class='del'>-0x68, 0x3b, 0x4d, 0xe1, 0x72, 0x74, 0x61, 0x3b, 0x41, 0x69, 0x62, 0x3b, 0x42, 0x65, 0x61, 0x6c, 0x3b, 0x4d, 0x65, 0x69,</div><div class='del'>-0x74, 0x68, 0x3b, 0x49, 0xfa, 0x69, 0x6c, 0x3b, 0x4c, 0xfa, 0x6e, 0x3b, 0x4d, 0x46, 0xf3, 0x6d, 0x68, 0x3b, 0x44, 0x46,</div><div class='del'>-0xf3, 0x6d, 0x68, 0x3b, 0x53, 0x61, 0x6d, 0x68, 0x3b, 0x4e, 0x6f, 0x6c, 0x6c, 0x3b, 0x45, 0x61, 0x6e, 0xe1, 0x69, 0x72,</div><div class='del'>-0x3b, 0x46, 0x65, 0x61, 0x62, 0x68, 0x72, 0x61, 0x3b, 0x4d, 0xe1, 0x72, 0x74, 0x61, 0x3b, 0x41, 0x69, 0x62, 0x72, 0x65,</div><div class='del'>-0xe1, 0x6e, 0x3b, 0x42, 0x65, 0x61, 0x6c, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x3b, 0x4d, 0x65, 0x69, 0x74, 0x68, 0x65, 0x61,</div><div class='del'>-0x6d, 0x68, 0x3b, 0x49, 0xfa, 0x69, 0x6c, 0x3b, 0x4c, 0xfa, 0x6e, 0x61, 0x73, 0x61, 0x3b, 0x4d, 0x65, 0xe1, 0x6e, 0x20,</div><div class='del'>-0x46, 0xf3, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x44, 0x65, 0x69, 0x72, 0x65, 0x61, 0x64, 0x68, 0x20, 0x46, 0xf3, 0x6d,</div><div class='del'>-0x68, 0x61, 0x69, 0x72, 0x3b, 0x53, 0x61, 0x6d, 0x68, 0x61, 0x69, 0x6e, 0x3b, 0x4e, 0x6f, 0x6c, 0x6c, 0x61, 0x69, 0x67,</div><div class='del'>-0x3b, 0x45, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x42, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x44,</div><div class='del'>-0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x67, 0x65, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72,</div><div class='del'>-0x3b, 0x6d, 0x61, 0x67, 0x3b, 0x67, 0x69, 0x75, 0x3b, 0x6c, 0x75, 0x67, 0x3b, 0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x74,</div><div class='del'>-0x3b, 0x6f, 0x74, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x69, 0x63, 0x3b, 0x47, 0x65, 0x6e, 0x6e, 0x61, 0x69, 0x6f,</div><div class='del'>-0x3b, 0x46, 0x65, 0x62, 0x62, 0x72, 0x61, 0x69, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x41, 0x70, 0x72, 0x69,</div><div class='del'>-0x6c, 0x65, 0x3b, 0x4d, 0x61, 0x67, 0x67, 0x69, 0x6f, 0x3b, 0x47, 0x69, 0x75, 0x67, 0x6e, 0x6f, 0x3b, 0x4c, 0x75, 0x67,</div><div class='del'>-0x6c, 0x69, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65,</div><div class='del'>-0x3b, 0x4f, 0x74, 0x74, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x44, 0x69,</div><div class='del'>-0x63, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x47, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x4c,</div><div class='del'>-0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0xc9c, 0xca8, 0xcb5, 0xcb0, 0xcc0, 0x3b, 0xcab, 0xcc6, 0xcac,</div><div class='del'>-0xccd, 0xcb0, 0xcb5, 0xcb0, 0xcc0, 0x3b, 0xcae, 0xcbe, 0xcb0, 0xccd, 0xc9a, 0xccd, 0x3b, 0xc8e, 0xcaa, 0xccd, 0xcb0, 0xcbf, 0xcb2, 0xccd,</div><div class='del'>-0x3b, 0xcae, 0xcc6, 0x3b, 0xc9c, 0xcc2, 0xca8, 0xccd, 0x3b, 0xc9c, 0xcc1, 0xcb2, 0xcc8, 0x3b, 0xc86, 0xc97, 0xcb8, 0xccd, 0xc9f, 0xccd,</div><div class='del'>-0x3b, 0xcb8, 0xcaa, 0xccd, 0xc9f, 0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xc85, 0xc95, 0xccd, 0xc9f, 0xccb, 0xcac, 0xcb0, 0xccd, 0x3b,</div><div class='del'>-0xca8, 0xcb5, 0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xca1, 0xcbf, 0xcb8, 0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xc9c, 0x3b, 0xcab,</div><div class='del'>-0xcc6, 0x3b, 0xcae, 0xcbe, 0x3b, 0xc8e, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2, 0x3b, 0xc9c, 0xcc1, 0x3b, 0xc86, 0x3b, 0xcb8, 0xcc6,</div><div class='del'>-0x3b, 0xc85, 0x3b, 0xca8, 0x3b, 0xca1, 0xcbf, 0x3b, 0x49b, 0x430, 0x4a3, 0x2e, 0x3b, 0x430, 0x49b, 0x43f, 0x2e, 0x3b, 0x43d, 0x430,</div><div class='del'>-0x443, 0x2e, 0x3b, 0x441, 0x4d9, 0x443, 0x2e, 0x3b, 0x43c, 0x430, 0x43c, 0x2e, 0x3b, 0x43c, 0x430, 0x443, 0x2e, 0x3b, 0x448, 0x456,</div><div class='del'>-0x43b, 0x2e, 0x3b, 0x442, 0x430, 0x43c, 0x2e, 0x3b, 0x49b, 0x44b, 0x440, 0x2e, 0x3b, 0x49b, 0x430, 0x437, 0x2e, 0x3b, 0x49b, 0x430,</div><div class='del'>-0x440, 0x2e, 0x3b, 0x436, 0x435, 0x43b, 0x442, 0x2e, 0x3b, 0x49b, 0x430, 0x4a3, 0x442, 0x430, 0x440, 0x3b, 0x430, 0x49b, 0x43f, 0x430,</div><div class='del'>-0x43d, 0x3b, 0x43d, 0x430, 0x443, 0x440, 0x44b, 0x437, 0x3b, 0x441, 0x4d9, 0x443, 0x456, 0x440, 0x3b, 0x43c, 0x430, 0x43c, 0x44b, 0x440,</div><div class='del'>-0x3b, 0x43c, 0x430, 0x443, 0x441, 0x44b, 0x43c, 0x3b, 0x448, 0x456, 0x43b, 0x434, 0x435, 0x3b, 0x442, 0x430, 0x43c, 0x44b, 0x437, 0x3b,</div><div class='del'>-0x49b, 0x44b, 0x440, 0x43a, 0x4af, 0x439, 0x435, 0x43a, 0x3b, 0x49b, 0x430, 0x437, 0x430, 0x43d, 0x3b, 0x49b, 0x430, 0x440, 0x430, 0x448,</div><div class='del'>-0x430, 0x3b, 0x436, 0x435, 0x43b, 0x442, 0x43e, 0x49b, 0x441, 0x430, 0x43d, 0x3b, 0x6d, 0x75, 0x74, 0x2e, 0x3b, 0x67, 0x61, 0x73,</div><div class='del'>-0x2e, 0x3b, 0x77, 0x65, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x74, 0x2e, 0x3b, 0x67, 0x69, 0x63, 0x2e, 0x3b, 0x6b, 0x61, 0x6d,</div><div class='del'>-0x2e, 0x3b, 0x6e, 0x79, 0x61, 0x2e, 0x3b, 0x6b, 0x61, 0x6e, 0x2e, 0x3b, 0x6e, 0x7a, 0x65, 0x2e, 0x3b, 0x75, 0x6b, 0x77,</div><div class='del'>-0x2e, 0x3b, 0x75, 0x67, 0x75, 0x2e, 0x3b, 0x75, 0x6b, 0x75, 0x2e, 0x3b, 0x4d, 0x75, 0x74, 0x61, 0x72, 0x61, 0x6d, 0x61,</div><div class='del'>-0x3b, 0x47, 0x61, 0x73, 0x68, 0x79, 0x61, 0x6e, 0x74, 0x61, 0x72, 0x65, 0x3b, 0x57, 0x65, 0x72, 0x75, 0x72, 0x77, 0x65,</div><div class='del'>-0x3b, 0x4d, 0x61, 0x74, 0x61, 0x3b, 0x47, 0x69, 0x63, 0x75, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x3b, 0x4b, 0x61, 0x6d, 0x65,</div><div class='del'>-0x6e, 0x61, 0x3b, 0x4e, 0x79, 0x61, 0x6b, 0x61, 0x6e, 0x67, 0x61, 0x3b, 0x4b, 0x61, 0x6e, 0x61, 0x6d, 0x61, 0x3b, 0x4e,</div><div class='del'>-0x7a, 0x65, 0x6c, 0x69, 0x3b, 0x55, 0x6b, 0x77, 0x61, 0x6b, 0x69, 0x72, 0x61, 0x3b, 0x55, 0x67, 0x75, 0x73, 0x68, 0x79,</div><div class='del'>-0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x55, 0x6b, 0x75, 0x62, 0x6f, 0x7a, 0x61, 0x3b, 0x31, 0xc6d4, 0x3b, 0x32, 0xc6d4, 0x3b, 0x33,</div><div class='del'>-0xc6d4, 0x3b, 0x34, 0xc6d4, 0x3b, 0x35, 0xc6d4, 0x3b, 0x36, 0xc6d4, 0x3b, 0x37, 0xc6d4, 0x3b, 0x38, 0xc6d4, 0x3b, 0x39, 0xc6d4, 0x3b,</div><div class='del'>-0x31, 0x30, 0xc6d4, 0x3b, 0x31, 0x31, 0xc6d4, 0x3b, 0x31, 0x32, 0xc6d4, 0x3b, 0xe7, 0x69, 0x6c, 0x3b, 0x73, 0x69, 0x62, 0x3b,</div><div class='del'>-0x61, 0x64, 0x72, 0x3b, 0x6e, 0xee, 0x73, 0x3b, 0x67, 0x75, 0x6c, 0x3b, 0x68, 0x65, 0x7a, 0x3b, 0x74, 0xee, 0x72, 0x3b,</div><div class='del'>-0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0xe7, 0x69, 0x6c, 0x65, 0x3b, 0x73, 0x69,</div><div class='del'>-0x62, 0x61, 0x74, 0x3b, 0x61, 0x64, 0x61, 0x72, 0x3b, 0x6e, 0xee, 0x73, 0x61, 0x6e, 0x3b, 0x67, 0x75, 0x6c, 0x61, 0x6e,</div><div class='del'>-0x3b, 0x68, 0x65, 0x7a, 0xee, 0x72, 0x61, 0x6e, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31,</div><div class='del'>-0x3b, 0x31, 0x32, 0x3b, 0xe7, 0x3b, 0x73, 0x3b, 0x61, 0x3b, 0x6e, 0x3b, 0x67, 0x3b, 0x68, 0x3b, 0x37, 0x3b, 0x38, 0x3b,</div><div class='del'>-0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0xea1, 0x2e, 0xe81, 0x2e, 0x3b, 0xe81, 0x2e, 0xe9e, 0x2e,</div><div class='del'>-0x3b, 0xea1, 0xeb5, 0x2e, 0xe99, 0x2e, 0x3b, 0xea1, 0x2e, 0xeaa, 0x2e, 0x2e, 0x3b, 0xe9e, 0x2e, 0xe9e, 0x2e, 0x3b, 0xea1, 0xeb4,</div><div class='del'>-0x2e, 0xe96, 0x2e, 0x3b, 0xe81, 0x2e, 0xea5, 0x2e, 0x3b, 0xeaa, 0x2e, 0xeab, 0x2e, 0x3b, 0xe81, 0x2e, 0xe8d, 0x2e, 0x3b, 0xe95,</div><div class='del'>-0x2e, 0xea5, 0x2e, 0x3b, 0xe9e, 0x2e, 0xe88, 0x2e, 0x3b, 0xe97, 0x2e, 0xea7, 0x2e, 0x3b, 0xea1, 0xeb1, 0xe87, 0xe81, 0xead, 0xe99,</div><div class='del'>-0x3b, 0xe81, 0xeb8, 0xea1, 0xe9e, 0xeb2, 0x3b, 0xea1, 0xeb5, 0xe99, 0xeb2, 0x3b, 0xec0, 0xea1, 0xeaa, 0xeb2, 0x3b, 0xe9e, 0xeb6, 0xe94,</div><div class='del'>-0xeaa, 0xeb0, 0xe9e, 0xeb2, 0x3b, 0xea1, 0xeb4, 0xe96, 0xeb8, 0xe99, 0xeb2, 0x3b, 0xe81, 0xecd, 0xea5, 0xeb0, 0xe81, 0xebb, 0xe94, 0x3b,</div><div class='del'>-0xeaa, 0xeb4, 0xe87, 0xeab, 0xeb2, 0x3b, 0xe81, 0xeb1, 0xe99, 0xe8d, 0xeb2, 0x3b, 0xe95, 0xeb8, 0xea5, 0xeb2, 0x3b, 0xe9e, 0xeb0, 0xe88,</div><div class='del'>-0xeb4, 0xe81, 0x3b, 0xe97, 0xeb1, 0xe99, 0xea7, 0xeb2, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e,</div><div class='del'>-0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b,</div><div class='del'>-0x6e, 0x2e, 0x3b, 0x6a, 0x16b, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f,</div><div class='del'>-0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x101, 0x72,</div><div class='del'>-0x69, 0x73, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x101, 0x72, 0x69, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x61,</div><div class='del'>-0x70, 0x72, 0x12b, 0x6c, 0x69, 0x73, 0x3b, 0x6d, 0x61, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6e, 0x69, 0x6a, 0x73, 0x3b,</div><div class='del'>-0x6a, 0x16b, 0x6c, 0x69, 0x6a, 0x73, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x73, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65,</div><div class='del'>-0x6d, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d,</div><div class='del'>-0x62, 0x72, 0x69, 0x73, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x73, 0x31, 0x3b, 0x73, 0x32,</div><div class='del'>-0x3b, 0x73, 0x33, 0x3b, 0x73, 0x34, 0x3b, 0x73, 0x35, 0x3b, 0x73, 0x36, 0x3b, 0x73, 0x37, 0x3b, 0x73, 0x38, 0x3b, 0x73,</div><div class='del'>-0x39, 0x3b, 0x73, 0x31, 0x30, 0x3b, 0x73, 0x31, 0x31, 0x3b, 0x73, 0x31, 0x32, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20,</div><div class='del'>-0x79, 0x61, 0x20, 0x79, 0x61, 0x6d, 0x62, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed,</div><div class='del'>-0x62, 0x61, 0x6c, 0xe9, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x73, 0xe1, 0x74, 0x6f,</div><div class='del'>-0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x6e, 0x65, 0x69, 0x3b, 0x73, 0xe1, 0x6e, 0x7a,</div><div class='del'>-0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x74, 0xe1, 0x6e, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61,</div><div class='del'>-0x20, 0x6d, 0x6f, 0x74, 0xf3, 0x62, 0xe1, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6e, 0x73, 0x61,</div><div class='del'>-0x6d, 0x62, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0x77, 0x61, 0x6d, 0x62, 0x65, 0x3b,</div><div class='del'>-0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6c, 0x69, 0x62, 0x77, 0x61, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1,</div><div class='del'>-0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3,</div><div class='del'>-0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x254, 0x30c, 0x6b, 0x254, 0x301, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79,</div><div class='del'>-0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0xed, 0x62, 0x61, 0x6c, 0xe9, 0x3b, 0x53, 0x61, 0x75,</div><div class='del'>-0x73, 0x2e, 0x3b, 0x56, 0x61, 0x73, 0x2e, 0x3b, 0x6b, 0x6f, 0x76, 0x3b, 0x42, 0x61, 0x6c, 0x2e, 0x3b, 0x47, 0x65, 0x67,</div><div class='del'>-0x2e, 0x3b, 0x42, 0x69, 0x72, 0x2e, 0x3b, 0x4c, 0x69, 0x65, 0x70, 0x2e, 0x3b, 0x52, 0x75, 0x67, 0x70, 0x6a, 0x2e, 0x3b,</div><div class='del'>-0x52, 0x75, 0x67, 0x73, 0x2e, 0x3b, 0x53, 0x70, 0x61, 0x6c, 0x2e, 0x3b, 0x4c, 0x61, 0x70, 0x6b, 0x72, 0x2e, 0x3b, 0x47,</div><div class='del'>-0x72, 0x75, 0x6f, 0x64, 0x2e, 0x3b, 0x53, 0x61, 0x75, 0x73, 0x69, 0x73, 0x3b, 0x56, 0x61, 0x73, 0x61, 0x72, 0x69, 0x73,</div><div class='del'>-0x3b, 0x4b, 0x6f, 0x76, 0x61, 0x73, 0x3b, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x64, 0x69, 0x73, 0x3b, 0x47, 0x65, 0x67, 0x75,</div><div class='del'>-0x17e, 0x117, 0x3b, 0x42, 0x69, 0x72, 0x17e, 0x65, 0x6c, 0x69, 0x73, 0x3b, 0x4c, 0x69, 0x65, 0x70, 0x61, 0x3b, 0x52, 0x75,</div><div class='del'>-0x67, 0x70, 0x6a, 0x16b, 0x74, 0x69, 0x73, 0x3b, 0x52, 0x75, 0x67, 0x73, 0x117, 0x6a, 0x69, 0x73, 0x3b, 0x53, 0x70, 0x61,</div><div class='del'>-0x6c, 0x69, 0x73, 0x3b, 0x4c, 0x61, 0x70, 0x6b, 0x72, 0x69, 0x74, 0x69, 0x73, 0x3b, 0x47, 0x72, 0x75, 0x6f, 0x64, 0x69,</div><div class='del'>-0x73, 0x3b, 0x53, 0x3b, 0x56, 0x3b, 0x4b, 0x3b, 0x42, 0x3b, 0x47, 0x3b, 0x42, 0x3b, 0x4c, 0x3b, 0x52, 0x3b, 0x52, 0x3b,</div><div class='del'>-0x53, 0x3b, 0x4c, 0x3b, 0x47, 0x3b, 0x458, 0x430, 0x43d, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e,</div><div class='del'>-0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x2e, 0x3b, 0x458, 0x443, 0x43b, 0x2e, 0x3b,</div><div class='del'>-0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x435, 0x43c,</div><div class='del'>-0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x43c, 0x2e, 0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x444, 0x435, 0x432,</div><div class='del'>-0x440, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458,</div><div class='del'>-0x3b, 0x458, 0x443, 0x43d, 0x438, 0x3b, 0x458, 0x443, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435,</div><div class='del'>-0x43f, 0x442, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43d, 0x43e, 0x435,</div><div class='del'>-0x43c, 0x432, 0x440, 0x438, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x458, 0x3b, 0x444, 0x3b, 0x43c, 0x3b,</div><div class='del'>-0x430, 0x3b, 0x43c, 0x3b, 0x458, 0x3b, 0x458, 0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x43e, 0x3b, 0x43d, 0x3b, 0x434, 0x3b, 0x4a, 0x61,</div><div class='del'>-0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x6f,</div><div class='del'>-0x6e, 0x3b, 0x4a, 0x6f, 0x6c, 0x3b, 0x41, 0x6f, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f,</div><div class='del'>-0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x6f, 0x61, 0x72, 0x79, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x6f, 0x61,</div><div class='del'>-0x72, 0x79, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x73, 0x61, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x79, 0x3b, 0x4d, 0x65, 0x79,</div><div class='del'>-0x3b, 0x4a, 0x6f, 0x6e, 0x61, 0x3b, 0x4a, 0x6f, 0x6c, 0x61, 0x79, 0x3b, 0x41, 0x6f, 0x67, 0x6f, 0x73, 0x69, 0x74, 0x72,</div><div class='del'>-0x61, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x61, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x61, 0x3b,</div><div class='del'>-0x4e, 0x6f, 0x76, 0x61, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x61, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x4a, 0x61,</div><div class='del'>-0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75,</div><div class='del'>-0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x6f, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e,</div><div class='del'>-0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75,</div><div class='del'>-0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75,</div><div class='del'>-0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x4f, 0x67, 0x6f, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62,</div><div class='del'>-0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,</div><div class='del'>-0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0xd1c, 0xd28, 0xd41, 0x3b, 0xd2b, 0xd46, 0xd2c, 0xd4d, 0xd30, 0xd41, 0x3b,</div><div class='del'>-0xd2e, 0xd3e, 0xd30, 0xd4d, 0x200d, 0x3b, 0xd0f, 0xd2a, 0xd4d, 0xd30, 0xd3f, 0x3b, 0xd2e, 0xd47, 0xd2f, 0xd4d, 0x3b, 0xd1c, 0xd42, 0xd23,</div><div class='del'>-0xd4d, 0x200d, 0x3b, 0xd1c, 0xd42, 0xd32, 0xd48, 0x3b, 0xd13, 0xd17, 0x3b, 0xd38, 0xd46, 0xd2a, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd02, 0x3b,</div><div class='del'>-0xd12, 0xd15, 0xd4d, 0xd1f, 0xd4b, 0x3b, 0xd28, 0xd35, 0xd02, 0x3b, 0xd21, 0xd3f, 0xd38, 0xd02, 0x3b, 0xd1c, 0xd28, 0xd41, 0xd35, 0xd30,</div><div class='del'>-0xd3f, 0x3b, 0xd2b, 0xd46, 0xd2c, 0xd4d, 0xd30, 0xd41, 0xd35, 0xd30, 0xd3f, 0x3b, 0xd2e, 0xd3e, 0xd30, 0xd4d, 0x200d, 0xd1a, 0xd4d, 0xd1a,</div><div class='del'>-0xd4d, 0x3b, 0xd0f, 0xd2a, 0xd4d, 0xd30, 0xd3f, 0xd32, 0xd4d, 0x200d, 0x3b, 0xd2e, 0xd47, 0xd2f, 0xd4d, 0x3b, 0xd1c, 0xd42, 0xd23, 0xd4d,</div><div class='del'>-0x200d, 0x3b, 0xd1c, 0xd42, 0xd32, 0xd48, 0x3b, 0xd06, 0xd17, 0xd38, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd4d, 0x3b, 0xd38, 0xd46, 0xd2a, 0xd4d,</div><div class='del'>-0xd31, 0xd4d, 0xd31, 0xd02, 0xd2c, 0xd30, 0xd4d, 0x200d, 0x3b, 0xd12, 0xd15, 0xd4d, 0xd1f, 0xd4b, 0xd2c, 0xd30, 0xd4d, 0x200d, 0x3b, 0xd28,</div><div class='del'>-0xd35, 0xd02, 0xd2c, 0xd30, 0xd4d, 0x200d, 0x3b, 0xd21, 0xd3f, 0xd38, 0xd02, 0xd2c, 0xd30, 0xd4d, 0x200d, 0x3b, 0xd1c, 0x3b, 0xd2b, 0xd46,</div><div class='del'>-0x3b, 0xd2e, 0xd3e, 0x3b, 0xd0f, 0x3b, 0xd2e, 0xd47, 0x3b, 0xd1c, 0xd42, 0x3b, 0xd1c, 0xd42, 0x3b, 0xd13, 0x3b, 0xd38, 0xd46, 0x3b,</div><div class='del'>-0xd12, 0x3b, 0xd28, 0x3b, 0xd21, 0xd3f, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x72, 0x61, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41,</div><div class='del'>-0x70, 0x72, 0x3b, 0x4d, 0x65, 0x6a, 0x3b, 0x120, 0x75, 0x6e, 0x3b, 0x4c, 0x75, 0x6c, 0x3b, 0x41, 0x77, 0x77, 0x3b, 0x53,</div><div class='del'>-0x65, 0x74, 0x3b, 0x4f, 0x74, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x10b, 0x3b, 0x4a, 0x61, 0x6e, 0x6e, 0x61,</div><div class='del'>-0x72, 0x3b, 0x46, 0x72, 0x61, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x75, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d,</div><div class='del'>-0x65, 0x6a, 0x6a, 0x75, 0x3b, 0x120, 0x75, 0x6e, 0x6a, 0x75, 0x3b, 0x4c, 0x75, 0x6c, 0x6a, 0x75, 0x3b, 0x41, 0x77, 0x77,</div><div class='del'>-0x69, 0x73, 0x73, 0x75, 0x3b, 0x53, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b, 0x4f, 0x74, 0x74, 0x75, 0x62,</div><div class='del'>-0x72, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b, 0x44, 0x69, 0x10b, 0x65, 0x6d, 0x62, 0x72, 0x75,</div><div class='del'>-0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x120, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f,</div><div class='del'>-0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x48, 0x101, 0x6e, 0x75, 0x65, 0x72, 0x65, 0x3b, 0x50, 0x113, 0x70, 0x75, 0x65, 0x72, 0x65,</div><div class='del'>-0x3b, 0x4d, 0x101, 0x65, 0x68, 0x65, 0x3b, 0x100, 0x70, 0x65, 0x72, 0x69, 0x72, 0x61, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x48,</div><div class='del'>-0x75, 0x6e, 0x65, 0x3b, 0x48, 0x16b, 0x72, 0x61, 0x65, 0x3b, 0x100, 0x6b, 0x75, 0x68, 0x61, 0x74, 0x61, 0x3b, 0x48, 0x65,</div><div class='del'>-0x70, 0x65, 0x74, 0x65, 0x6d, 0x61, 0x3b, 0x4f, 0x6b, 0x65, 0x74, 0x6f, 0x70, 0x61, 0x3b, 0x4e, 0x6f, 0x65, 0x6d, 0x61,</div><div class='del'>-0x3b, 0x54, 0x12b, 0x68, 0x65, 0x6d, 0x61, 0x3b, 0x91c, 0x93e, 0x928, 0x947, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c,</div><div class='del'>-0x94d, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x90f, 0x92a, 0x94d, 0x930, 0x93f, 0x932,</div><div class='del'>-0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x948, 0x3b, 0x911, 0x917, 0x938, 0x94d, 0x91f, 0x3b, 0x938,</div><div class='del'>-0x92a, 0x94d, 0x91f, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x911, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x935, 0x94d,</div><div class='del'>-0x939, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x91c, 0x93e, 0x3b, 0x92b, 0x947, 0x3b,</div><div class='del'>-0x92e, 0x93e, 0x3b, 0x90f, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x3b, 0x91c, 0x941, 0x3b, 0x911, 0x3b, 0x938, 0x3b, 0x911, 0x3b,</div><div class='del'>-0x928, 0x94b, 0x3b, 0x921, 0x93f, 0x3b, 0x445, 0x443, 0x43b, 0x3b, 0x4af, 0x445, 0x44d, 0x3b, 0x431, 0x430, 0x440, 0x3b, 0x442, 0x443,</div><div class='del'>-0x443, 0x3b, 0x43b, 0x443, 0x443, 0x3b, 0x43c, 0x43e, 0x433, 0x3b, 0x43c, 0x43e, 0x440, 0x3b, 0x445, 0x43e, 0x43d, 0x3b, 0x431, 0x438,</div><div class='del'>-0x447, 0x3b, 0x442, 0x430, 0x445, 0x3b, 0x43d, 0x43e, 0x445, 0x3b, 0x433, 0x430, 0x445, 0x3b, 0x425, 0x443, 0x43b, 0x433, 0x430, 0x43d,</div><div class='del'>-0x430, 0x3b, 0x4ae, 0x445, 0x44d, 0x440, 0x3b, 0x411, 0x430, 0x440, 0x3b, 0x422, 0x443, 0x443, 0x43b, 0x430, 0x439, 0x3b, 0x41b, 0x443,</div><div class='del'>-0x443, 0x3b, 0x41c, 0x43e, 0x433, 0x43e, 0x439, 0x3b, 0x41c, 0x43e, 0x440, 0x44c, 0x3b, 0x425, 0x43e, 0x43d, 0x44c, 0x3b, 0x411, 0x438,</div><div class='del'>-0x447, 0x3b, 0x422, 0x430, 0x445, 0x438, 0x430, 0x3b, 0x41d, 0x43e, 0x445, 0x43e, 0x439, 0x3b, 0x413, 0x430, 0x445, 0x430, 0x439, 0x3b,</div><div class='del'>-0x91c, 0x928, 0x3b, 0x92b, 0x947, 0x92c, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x93f, 0x3b, 0x92e,</div><div class='del'>-0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x3b, 0x905, 0x917, 0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x3b,</div><div class='del'>-0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x3b, 0x91c, 0x928, 0x935, 0x930,</div><div class='del'>-0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x905, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a,</div><div class='del'>-0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917,</div><div class='del'>-0x938, 0x94d, 0x924, 0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b,</div><div class='del'>-0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x92e, 0x94d, 0x92c, 0x930,</div><div class='del'>-0x3b, 0x967, 0x3b, 0x968, 0x3b, 0x969, 0x3b, 0x96a, 0x3b, 0x96b, 0x3b, 0x96c, 0x3b, 0x96d, 0x3b, 0x96e, 0x3b, 0x96f, 0x3b, 0x967,</div><div class='del'>-0x966, 0x3b, 0x967, 0x967, 0x3b, 0x967, 0x968, 0x3b, 0x91c, 0x928, 0x935, 0x930, 0x940, 0x3b, 0x92b, 0x930, 0x935, 0x930, 0x940, 0x3b,</div><div class='del'>-0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x947, 0x932, 0x3b, 0x92e, 0x908, 0x3b, 0x91c, 0x941, 0x928, 0x3b,</div><div class='del'>-0x91c, 0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917, 0x938, 0x94d, 0x924, 0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x947, 0x92e, 0x94d,</div><div class='del'>-0x92c, 0x930, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b,</div><div class='del'>-0x926, 0x93f, 0x938, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61,</div><div class='del'>-0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c,</div><div class='del'>-0x69, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76,</div><div class='del'>-0x2e, 0x3b, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61,</div><div class='del'>-0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e,</div><div class='del'>-0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d,</div><div class='add'>+0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d,</div><div class='add'>+0x61, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x65, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b,</div><div class='add'>+0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d,</div><div class='ctx'> 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72,</div><div class='del'>-0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x67, 0x65, 0x6e, 0x69, 0xe8, 0x72, 0x3b, 0x66, 0x65, 0x62,</div><div class='del'>-0x72, 0x69, 0xe8, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b,</div><div class='del'>-0x6a, 0x75, 0x6e, 0x68, 0x3b, 0x6a, 0x75, 0x6c, 0x68, 0x65, 0x74, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x73, 0x65,</div><div class='del'>-0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0xf2, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d,</div><div class='del'>-0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0xb1c, 0xb3e, 0xb28, 0xb41, 0xb06, 0xb30, 0xb40,</div><div class='del'>-0x3b, 0xb2b, 0xb47, 0xb2c, 0xb4d, 0xb30, 0xb41, 0xb5f, 0xb3e, 0xb30, 0xb40, 0x3b, 0xb2e, 0xb3e, 0xb30, 0xb4d, 0xb1a, 0xb4d, 0xb1a, 0x3b,</div><div class='del'>-0xb05, 0xb2a, 0xb4d, 0xb30, 0xb47, 0xb32, 0x3b, 0xb2e, 0xb47, 0x3b, 0xb1c, 0xb41, 0xb28, 0x3b, 0xb1c, 0xb41, 0xb32, 0xb3e, 0xb07, 0x3b,</div><div class='del'>-0xb05, 0xb17, 0xb37, 0xb4d, 0xb1f, 0x3b, 0xb38, 0xb47, 0xb2a, 0xb4d, 0xb1f, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb05, 0xb15, 0xb4d,</div><div class='del'>-0xb1f, 0xb4b, 0xb2c, 0xb30, 0x3b, 0xb28, 0xb2d, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb21, 0xb3f, 0xb38, 0xb47, 0xb2e, 0xb4d, 0xb2c,</div><div class='del'>-0xb30, 0x3b, 0xb1c, 0xb3e, 0x3b, 0xb2b, 0xb47, 0x3b, 0xb2e, 0xb3e, 0x3b, 0xb05, 0x3b, 0xb2e, 0xb47, 0x3b, 0xb1c, 0xb41, 0x3b, 0xb1c,</div><div class='del'>-0xb41, 0x3b, 0xb05, 0x3b, 0xb38, 0xb47, 0x3b, 0xb05, 0x3b, 0xb28, 0x3b, 0xb21, 0xb3f, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b,</div><div class='del'>-0x641, 0x628, 0x631, 0x648, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc,</div><div class='del'>-0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6ab, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645,</div><div class='del'>-0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628,</div><div class='del'>-0x631, 0x3b, 0x698, 0x627, 0x646, 0x648, 0x6cc, 0x647, 0x654, 0x3b, 0x641, 0x648, 0x631, 0x6cc, 0x647, 0x654, 0x3b, 0x645, 0x627, 0x631,</div><div class='del'>-0x633, 0x3b, 0x622, 0x648, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc,</div><div class='del'>-0x3b, 0x627, 0x648, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646,</div><div class='del'>-0x648, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x698, 0x627, 0x646, 0x648, 0x6cc, 0x647, 0x3b,</div><div class='del'>-0x641, 0x648, 0x631, 0x6cc, 0x647, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x648, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x647, 0x3b,</div><div class='del'>-0x698, 0x648, 0x626, 0x646, 0x3b, 0x698, 0x648, 0x626, 0x6cc, 0x647, 0x3b, 0x627, 0x648, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x627, 0x645,</div><div class='del'>-0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x627, 0x645,</div><div class='del'>-0x628, 0x631, 0x3b, 0x698, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x622, 0x3b, 0x645, 0x6cc, 0x3b, 0x698, 0x3b, 0x698, 0x3b, 0x627, 0x3b,</div><div class='del'>-0x633, 0x3b, 0x627, 0x3b, 0x646, 0x3b, 0x62f, 0x3b, 0x62c, 0x646, 0x648, 0x3b, 0x641, 0x648, 0x631, 0x6cc, 0x647, 0x654, 0x3b, 0x645,</div><div class='del'>-0x627, 0x631, 0x633, 0x3b, 0x622, 0x648, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x640, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648,</div><div class='del'>-0x644, 0x3b, 0x627, 0x648, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b,</div><div class='del'>-0x646, 0x648, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x3b, 0x62c, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x627, 0x3b, 0x645,</div><div class='del'>-0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x646, 0x3b, 0x62f, 0x3b, 0x73, 0x74, 0x79, 0x3b, 0x6c,</div><div class='del'>-0x75, 0x74, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6b, 0x77, 0x69, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x63, 0x7a, 0x65, 0x3b, 0x6c,</div><div class='del'>-0x69, 0x70, 0x3b, 0x73, 0x69, 0x65, 0x3b, 0x77, 0x72, 0x7a, 0x3b, 0x70, 0x61, 0x17a, 0x3b, 0x6c, 0x69, 0x73, 0x3b, 0x67,</div><div class='del'>-0x72, 0x75, 0x3b, 0x73, 0x74, 0x79, 0x63, 0x7a, 0x65, 0x144, 0x3b, 0x6c, 0x75, 0x74, 0x79, 0x3b, 0x6d, 0x61, 0x72, 0x7a,</div><div class='del'>-0x65, 0x63, 0x3b, 0x6b, 0x77, 0x69, 0x65, 0x63, 0x69, 0x65, 0x144, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x63, 0x7a, 0x65, 0x72,</div><div class='del'>-0x77, 0x69, 0x65, 0x63, 0x3b, 0x6c, 0x69, 0x70, 0x69, 0x65, 0x63, 0x3b, 0x73, 0x69, 0x65, 0x72, 0x70, 0x69, 0x65, 0x144,</div><div class='del'>-0x3b, 0x77, 0x72, 0x7a, 0x65, 0x73, 0x69, 0x65, 0x144, 0x3b, 0x70, 0x61, 0x17a, 0x64, 0x7a, 0x69, 0x65, 0x72, 0x6e, 0x69,</div><div class='del'>-0x6b, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x3b, 0x67, 0x72, 0x75, 0x64, 0x7a, 0x69, 0x65, 0x144, 0x3b,</div><div class='del'>-0x73, 0x3b, 0x6c, 0x3b, 0x6d, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x63, 0x3b, 0x6c, 0x3b, 0x73, 0x3b, 0x77, 0x3b, 0x70, 0x3b,</div><div class='del'>-0x6c, 0x3b, 0x67, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b,</div><div class='del'>-0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b,</div><div class='del'>-0x4f, 0x75, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b,</div><div class='del'>-0x46, 0x65, 0x76, 0x65, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0xe7, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69,</div><div class='del'>-0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x4a, 0x75, 0x6c, 0x68, 0x6f, 0x3b, 0x41,</div><div class='add'>+0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0xd801, 0xdc16, 0xd801, 0xdc30, 0xd801, 0xdc4c, 0x3b, 0xd801, 0xdc19, 0xd801,</div><div class='add'>+0xdc2f, 0xd801, 0xdc3a, 0x3b, 0xd801, 0xdc23, 0xd801, 0xdc2a, 0xd801, 0xdc49, 0x3b, 0xd801, 0xdc01, 0xd801, 0xdc39, 0xd801, 0xdc49, 0x3b, 0xd801, 0xdc23,</div><div class='add'>+0xd801, 0xdc29, 0x3b, 0xd801, 0xdc16, 0xd801, 0xdc2d, 0xd801, 0xdc4c, 0x3b, 0xd801, 0xdc16, 0xd801, 0xdc2d, 0xd801, 0xdc4a, 0x3b, 0xd801, 0xdc02, 0xd801,</div><div class='add'>+0xdc40, 0x3b, 0xd801, 0xdc1d, 0xd801, 0xdc2f, 0xd801, 0xdc39, 0x3b, 0xd801, 0xdc09, 0xd801, 0xdc3f, 0xd801, 0xdc3b, 0x3b, 0xd801, 0xdc24, 0xd801, 0xdc2c,</div><div class='add'>+0xd801, 0xdc42, 0x3b, 0xd801, 0xdc14, 0xd801, 0xdc28, 0xd801, 0xdc45, 0x3b, 0xd801, 0xdc16, 0xd801, 0xdc30, 0xd801, 0xdc4c, 0xd801, 0xdc37, 0xd801, 0xdc2d,</div><div class='add'>+0xd801, 0xdc2f, 0xd801, 0xdc49, 0xd801, 0xdc28, 0x3b, 0xd801, 0xdc19, 0xd801, 0xdc2f, 0xd801, 0xdc3a, 0xd801, 0xdc49, 0xd801, 0xdc2d, 0xd801, 0xdc2f, 0xd801,</div><div class='add'>+0xdc49, 0xd801, 0xdc28, 0x3b, 0xd801, 0xdc23, 0xd801, 0xdc2a, 0xd801, 0xdc49, 0xd801, 0xdc3d, 0x3b, 0xd801, 0xdc01, 0xd801, 0xdc39, 0xd801, 0xdc49, 0xd801,</div><div class='add'>+0xdc2e, 0xd801, 0xdc4a, 0x3b, 0xd801, 0xdc23, 0xd801, 0xdc29, 0x3b, 0xd801, 0xdc16, 0xd801, 0xdc2d, 0xd801, 0xdc4c, 0x3b, 0xd801, 0xdc16, 0xd801, 0xdc2d,</div><div class='add'>+0xd801, 0xdc4a, 0xd801, 0xdc34, 0x3b, 0xd801, 0xdc02, 0xd801, 0xdc40, 0xd801, 0xdc32, 0xd801, 0xdc45, 0xd801, 0xdc3b, 0x3b, 0xd801, 0xdc1d, 0xd801, 0xdc2f,</div><div class='add'>+0xd801, 0xdc39, 0xd801, 0xdc3b, 0xd801, 0xdc2f, 0xd801, 0xdc4b, 0xd801, 0xdc3a, 0xd801, 0xdc32, 0xd801, 0xdc49, 0x3b, 0xd801, 0xdc09, 0xd801, 0xdc3f, 0xd801,</div><div class='add'>+0xdc3b, 0xd801, 0xdc2c, 0xd801, 0xdc3a, 0xd801, 0xdc32, 0xd801, 0xdc49, 0x3b, 0xd801, 0xdc24, 0xd801, 0xdc2c, 0xd801, 0xdc42, 0xd801, 0xdc2f, 0xd801, 0xdc4b,</div><div class='add'>+0xd801, 0xdc3a, 0xd801, 0xdc32, 0xd801, 0xdc49, 0x3b, 0xd801, 0xdc14, 0xd801, 0xdc28, 0xd801, 0xdc45, 0xd801, 0xdc2f, 0xd801, 0xdc4b, 0xd801, 0xdc3a, 0xd801,</div><div class='add'>+0xdc32, 0xd801, 0xdc49, 0x3b, 0xd801, 0xdc16, 0x3b, 0xd801, 0xdc19, 0x3b, 0xd801, 0xdc23, 0x3b, 0xd801, 0xdc01, 0x3b, 0xd801, 0xdc23, 0x3b, 0xd801,</div><div class='add'>+0xdc16, 0x3b, 0xd801, 0xdc16, 0x3b, 0xd801, 0xdc02, 0x3b, 0xd801, 0xdc1d, 0x3b, 0xd801, 0xdc09, 0x3b, 0xd801, 0xdc24, 0x3b, 0xd801, 0xdc14, 0x3b,</div><div class='add'>+0x6a, 0x61, 0x61, 0x6e, 0x3b, 0x76, 0x65, 0x65, 0x62, 0x72, 0x3b, 0x6d, 0xe4, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72,</div><div class='add'>+0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67,</div><div class='add'>+0x3b, 0x73, 0x65, 0x70, 0x74, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x74, 0x73, 0x3b, 0x6a,</div><div class='add'>+0x61, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x76, 0x65, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0xe4, 0x72, 0x74,</div><div class='add'>+0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x6a,</div><div class='add'>+0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65,</div><div class='add'>+0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,</div><div class='add'>+0x64, 0x65, 0x74, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x56, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b,</div><div class='add'>+0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65,</div><div class='add'>+0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75,</div><div class='add'>+0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65,</div><div class='add'>+0x73, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72,</div><div class='add'>+0x73, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c,</div><div class='add'>+0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f,</div><div class='add'>+0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x65,</div><div class='add'>+0x6d, 0x62, 0x65, 0x72, 0x3b, 0x74, 0x61, 0x6d, 0x6d, 0x69, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x68, 0x65, 0x6c, 0x6d,</div><div class='add'>+0x69, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x68,</div><div class='add'>+0x75, 0x68, 0x74, 0x69, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x74, 0x6f, 0x75, 0x6b, 0x6f, 0x6b, 0x75, 0x75, 0x74, 0x61,</div><div class='add'>+0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x6b, 0x75, 0x75, 0x74,</div><div class='add'>+0x61, 0x3b, 0x65, 0x6c, 0x6f, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x6b, 0x75, 0x75, 0x74, 0x61,</div><div class='add'>+0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x6b, 0x75, 0x75,</div><div class='add'>+0x74, 0x61, 0x3b, 0x6a, 0x6f, 0x75, 0x6c, 0x75, 0x6b, 0x75, 0x75, 0x74, 0x61, 0x3b, 0x54, 0x3b, 0x48, 0x3b, 0x4d, 0x3b,</div><div class='add'>+0x48, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x48, 0x3b, 0x45, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x6a, 0x61,</div><div class='add'>+0x6e, 0x76, 0x2e, 0x3b, 0x66, 0xe9, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x69, 0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x2e, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b,</div><div class='add'>+0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0xe9, 0x63, 0x2e,</div><div class='add'>+0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x69, 0x65, 0x72, 0x3b, 0x66, 0xe9, 0x76, 0x72, 0x69, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x72,</div><div class='add'>+0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x69, 0x6e, 0x3b, 0x6a, 0x75, 0x69,</div><div class='add'>+0x6c, 0x6c, 0x65, 0x74, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b,</div><div class='add'>+0x6f, 0x63, 0x74, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0xe9, 0x63,</div><div class='add'>+0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x58, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62,</div><div class='add'>+0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x58, 0x75, 0xf1, 0x3b, 0x58, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65,</div><div class='add'>+0x74, 0x3b, 0x4f, 0x75, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x58, 0x61, 0x6e, 0x65, 0x69, 0x72,</div><div class='add'>+0x6f, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x41, 0x62, 0x72,</div><div class='add'>+0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b, 0x58, 0x75, 0xf1, 0x6f, 0x3b, 0x58, 0x75, 0x6c, 0x6c, 0x6f, 0x3b, 0x41,</div><div class='ctx'> 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x4f, 0x75, 0x74, 0x75, 0x62,</div><div class='del'>-0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x72, 0x6f,</div><div class='del'>-0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x62, 0x72, 0x3b, 0x6d, 0x61, 0x69,</div><div class='del'>-0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x3b, 0x6f, 0x75, 0x74,</div><div class='del'>-0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x7a, 0x3b, 0x6a, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x76,</div><div class='del'>-0x65, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x6f, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d,</div><div class='del'>-0x61, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x6a, 0x75, 0x6c, 0x68, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73,</div><div class='del'>-0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x6f, 0x75, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b,</div><div class='del'>-0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x64, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0xa1c, 0xa28,</div><div class='del'>-0xa35, 0xa30, 0xa40, 0x3b, 0xa2b, 0xa3c, 0xa30, 0xa35, 0xa30, 0xa40, 0x3b, 0xa2e, 0xa3e, 0xa30, 0xa1a, 0x3b, 0xa05, 0xa2a, 0xa4d, 0xa30,</div><div class='del'>-0xa48, 0xa32, 0x3b, 0xa2e, 0xa08, 0x3b, 0xa1c, 0xa42, 0xa28, 0x3b, 0xa1c, 0xa41, 0xa32, 0xa3e, 0xa08, 0x3b, 0xa05, 0xa17, 0xa38, 0xa24,</div><div class='del'>-0x3b, 0xa38, 0xa24, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa05, 0xa15, 0xa24, 0xa42, 0xa2c, 0xa30, 0x3b, 0xa28, 0xa35, 0xa70, 0xa2c, 0xa30, 0x3b,</div><div class='del'>-0xa26, 0xa38, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa1c, 0x3b, 0xa2b, 0x3b, 0xa2e, 0xa3e, 0x3b, 0xa05, 0x3b, 0xa2e, 0x3b, 0xa1c, 0xa42, 0x3b,</div><div class='del'>-0xa1c, 0xa41, 0x3b, 0xa05, 0x3b, 0xa38, 0x3b, 0xa05, 0x3b, 0xa28, 0x3b, 0xa26, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641,</div><div class='del'>-0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x626, 0x3b, 0x62c,</div><div class='del'>-0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x626, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x62a, 0x645, 0x628, 0x631,</div><div class='del'>-0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b,</div><div class='del'>-0x73, 0x63, 0x68, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76,</div><div class='del'>-0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x74, 0x67, 0x3b, 0x7a, 0x65, 0x72, 0x63, 0x6c, 0x2e, 0x3b, 0x66, 0x61, 0x6e, 0x2e, 0x3b,</div><div class='del'>-0x61, 0x76, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76,</div><div class='del'>-0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x73, 0x63, 0x68, 0x61, 0x6e, 0x65, 0x72, 0x3b, 0x66, 0x61, 0x76, 0x72, 0x65,</div><div class='del'>-0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x67, 0x6c, 0x3b, 0x6d, 0x61, 0x74, 0x67, 0x3b, 0x7a,</div><div class='del'>-0x65, 0x72, 0x63, 0x6c, 0x61, 0x64, 0x75, 0x72, 0x3b, 0x66, 0x61, 0x6e, 0x61, 0x64, 0x75, 0x72, 0x3b, 0x61, 0x76, 0x75,</div><div class='del'>-0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x62, 0x65, 0x72,</div><div class='del'>-0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x53,</div><div class='del'>-0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0x46, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e,</div><div class='del'>-0x3b, 0x44, 0x3b, 0x69, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70,</div><div class='del'>-0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x69, 0x75, 0x6e, 0x2e, 0x3b, 0x69, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67,</div><div class='del'>-0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65,</div><div class='del'>-0x63, 0x2e, 0x3b, 0x69, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69,</div><div class='del'>-0x65, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x69, 0x65, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x65, 0x3b, 0x6d, 0x61, 0x69,</div><div class='del'>-0x3b, 0x69, 0x75, 0x6e, 0x69, 0x65, 0x3b, 0x69, 0x75, 0x6c, 0x69, 0x65, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b,</div><div class='del'>-0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x6d, 0x62, 0x72, 0x69, 0x65,</div><div class='del'>-0x3b, 0x6e, 0x6f, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65,</div><div class='del'>-0x3b, 0x49, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f,</div><div class='del'>-0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x44f, 0x43d, 0x432, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x442,</div><div class='del'>-0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d, 0x44c, 0x3b, 0x438, 0x44e, 0x43b, 0x44c, 0x3b,</div><div class='del'>-0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x431,</div><div class='del'>-0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x42f, 0x43d, 0x432, 0x430, 0x440, 0x44c, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x430, 0x43b,</div><div class='del'>-0x44c, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x44c, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e,</div><div class='del'>-0x43d, 0x44c, 0x3b, 0x418, 0x44e, 0x43b, 0x44c, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x44f,</div><div class='del'>-0x431, 0x440, 0x44c, 0x3b, 0x41e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x414,</div><div class='del'>-0x435, 0x43a, 0x430, 0x431, 0x440, 0x44c, 0x3b, 0x42f, 0x3b, 0x424, 0x3b, 0x41c, 0x3b, 0x410, 0x3b, 0x41c, 0x3b, 0x418, 0x3b, 0x418,</div><div class='del'>-0x3b, 0x410, 0x3b, 0x421, 0x3b, 0x41e, 0x3b, 0x41d, 0x3b, 0x414, 0x3b, 0x4e, 0x79, 0x65, 0x3b, 0x46, 0x75, 0x6c, 0x3b, 0x4d,</div><div class='del'>-0x62, 0xe4, 0x3b, 0x4e, 0x67, 0x75, 0x3b, 0x42, 0xea, 0x6c, 0x3b, 0x46, 0xf6, 0x6e, 0x3b, 0x4c, 0x65, 0x6e, 0x3b, 0x4b,</div><div class='del'>-0xfc, 0x6b, 0x3b, 0x4d, 0x76, 0x75, 0x3b, 0x4e, 0x67, 0x62, 0x3b, 0x4e, 0x61, 0x62, 0x3b, 0x4b, 0x61, 0x6b, 0x3b, 0x4e,</div><div class='del'>-0x79, 0x65, 0x6e, 0x79, 0x65, 0x3b, 0x46, 0x75, 0x6c, 0x75, 0x6e, 0x64, 0xef, 0x67, 0x69, 0x3b, 0x4d, 0x62, 0xe4, 0x6e,</div><div class='del'>-0x67, 0xfc, 0x3b, 0x4e, 0x67, 0x75, 0x62, 0xf9, 0x65, 0x3b, 0x42, 0xea, 0x6c, 0xe4, 0x77, 0xfc, 0x3b, 0x46, 0xf6, 0x6e,</div><div class='del'>-0x64, 0x6f, 0x3b, 0x4c, 0x65, 0x6e, 0x67, 0x75, 0x61, 0x3b, 0x4b, 0xfc, 0x6b, 0xfc, 0x72, 0xfc, 0x3b, 0x4d, 0x76, 0x75,</div><div class='del'>-0x6b, 0x61, 0x3b, 0x4e, 0x67, 0x62, 0x65, 0x72, 0x65, 0x72, 0x65, 0x3b, 0x4e, 0x61, 0x62, 0xe4, 0x6e, 0x64, 0xfc, 0x72,</div><div class='del'>-0x75, 0x3b, 0x4b, 0x61, 0x6b, 0x61, 0x75, 0x6b, 0x61, 0x3b, 0x4e, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x42, 0x3b,</div><div class='del'>-0x46, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x458, 0x430, 0x43d, 0x3b, 0x444, 0x435,</div><div class='del'>-0x431, 0x3b, 0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443,</div><div class='del'>-0x43b, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43f, 0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x432, 0x3b, 0x434, 0x435,</div><div class='del'>-0x446, 0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x431, 0x440, 0x443, 0x430, 0x440, 0x3b, 0x43c, 0x430, 0x440,</div><div class='del'>-0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b,</div><div class='del'>-0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x43e, 0x43a, 0x442,</div><div class='del'>-0x43e, 0x431, 0x430, 0x440, 0x3b, 0x43d, 0x43e, 0x432, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x446, 0x435, 0x43c, 0x431,</div><div class='del'>-0x430, 0x440, 0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x431, 0x440, 0x443, 0x430, 0x440, 0x3b, 0x43c, 0x430,</div><div class='del'>-0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x438, 0x3b, 0x458, 0x443,</div><div class='del'>-0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b,</div><div class='del'>-0x43e, 0x43a, 0x442, 0x43e, 0x431, 0x430, 0x440, 0x3b, 0x43d, 0x43e, 0x432, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x446,</div><div class='del'>-0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70,</div><div class='del'>-0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x3b, 0x73, 0x65,</div><div class='del'>-0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72,</div><div class='del'>-0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b,</div><div class='del'>-0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73,</div><div class='del'>-0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x6e, 0x6f, 0x76,</div><div class='del'>-0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6a, 0x3b, 0x66, 0x3b, 0x6d,</div><div class='del'>-0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x6a, 0x3b, 0x61, 0x3b, 0x73, 0x3b, 0x6f, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x50,</div><div class='del'>-0x68, 0x65, 0x3b, 0x4b, 0x6f, 0x6c, 0x3b, 0x55, 0x62, 0x65, 0x3b, 0x4d, 0x6d, 0x65, 0x3b, 0x4d, 0x6f, 0x74, 0x3b, 0x4a,</div><div class='del'>-0x61, 0x6e, 0x3b, 0x55, 0x70, 0x75, 0x3b, 0x50, 0x68, 0x61, 0x3b, 0x4c, 0x65, 0x6f, 0x3b, 0x4d, 0x70, 0x68, 0x3b, 0x50,</div><div class='del'>-0x75, 0x6e, 0x3b, 0x54, 0x73, 0x68, 0x3b, 0x50, 0x68, 0x65, 0x73, 0x65, 0x6b, 0x67, 0x6f, 0x6e, 0x67, 0x3b, 0x48, 0x6c,</div><div class='del'>-0x61, 0x6b, 0x6f, 0x6c, 0x61, 0x3b, 0x48, 0x6c, 0x61, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x3b, 0x4d, 0x6d, 0x65, 0x73,</div><div class='del'>-0x65, 0x3b, 0x4d, 0x6f, 0x74, 0x73, 0x68, 0x65, 0x61, 0x6e, 0x6f, 0x6e, 0x67, 0x3b, 0x50, 0x68, 0x75, 0x70, 0x6a, 0x61,</div><div class='del'>-0x6e, 0x65, 0x3b, 0x50, 0x68, 0x75, 0x70, 0x75, 0x3b, 0x50, 0x68, 0x61, 0x74, 0x61, 0x3b, 0x4c, 0x65, 0x6f, 0x74, 0x73,</div><div class='del'>-0x68, 0x65, 0x3b, 0x4d, 0x70, 0x68, 0x61, 0x6c, 0x61, 0x6e, 0x65, 0x3b, 0x50, 0x75, 0x6e, 0x64, 0x75, 0x6e, 0x67, 0x77,</div><div class='del'>-0x61, 0x6e, 0x65, 0x3b, 0x54, 0x73, 0x68, 0x69, 0x74, 0x77, 0x65, 0x3b, 0x46, 0x65, 0x72, 0x3b, 0x54, 0x6c, 0x68, 0x3b,</div><div class='del'>-0x4d, 0x6f, 0x70, 0x3b, 0x4d, 0x6f, 0x72, 0x3b, 0x4d, 0x6f, 0x74, 0x3b, 0x53, 0x65, 0x65, 0x3b, 0x50, 0x68, 0x75, 0x3b,</div><div class='del'>-0x50, 0x68, 0x61, 0x3b, 0x4c, 0x77, 0x65, 0x3b, 0x44, 0x69, 0x70, 0x3b, 0x4e, 0x67, 0x77, 0x3b, 0x53, 0x65, 0x64, 0x3b,</div><div class='del'>-0x46, 0x65, 0x72, 0x69, 0x6b, 0x67, 0x6f, 0x6e, 0x67, 0x3b, 0x54, 0x6c, 0x68, 0x61, 0x6b, 0x6f, 0x6c, 0x65, 0x3b, 0x4d,</div><div class='del'>-0x6f, 0x70, 0x69, 0x74, 0x6c, 0x6f, 0x3b, 0x4d, 0x6f, 0x72, 0x61, 0x6e, 0x61, 0x6e, 0x67, 0x3b, 0x4d, 0x6f, 0x74, 0x73,</div><div class='del'>-0x68, 0x65, 0x67, 0x61, 0x6e, 0x61, 0x6e, 0x67, 0x3b, 0x53, 0x65, 0x65, 0x74, 0x65, 0x62, 0x6f, 0x73, 0x69, 0x67, 0x6f,</div><div class='del'>-0x3b, 0x50, 0x68, 0x75, 0x6b, 0x77, 0x69, 0x3b, 0x50, 0x68, 0x61, 0x74, 0x77, 0x65, 0x3b, 0x4c, 0x77, 0x65, 0x74, 0x73,</div><div class='del'>-0x65, 0x3b, 0x44, 0x69, 0x70, 0x68, 0x61, 0x6c, 0x61, 0x6e, 0x65, 0x3b, 0x4e, 0x67, 0x77, 0x61, 0x6e, 0x61, 0x74, 0x73,</div><div class='del'>-0x65, 0x6c, 0x65, 0x3b, 0x53, 0x65, 0x64, 0x69, 0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x6f, 0x6c, 0x65, 0x3b, 0x4e, 0x64, 0x69,</div><div class='del'>-0x3b, 0x4b, 0x75, 0x6b, 0x3b, 0x4b, 0x75, 0x72, 0x3b, 0x4b, 0x75, 0x62, 0x3b, 0x43, 0x68, 0x69, 0x3b, 0x43, 0x68, 0x69,</div><div class='del'>-0x3b, 0x43, 0x68, 0x69, 0x3b, 0x4e, 0x79, 0x61, 0x3b, 0x47, 0x75, 0x6e, 0x3b, 0x47, 0x75, 0x6d, 0x3b, 0x4d, 0x62, 0x3b,</div><div class='del'>-0x5a, 0x76, 0x69, 0x3b, 0x4e, 0x64, 0x69, 0x72, 0x61, 0x3b, 0x4b, 0x75, 0x6b, 0x61, 0x64, 0x7a, 0x69, 0x3b, 0x4b, 0x75,</div><div class='del'>-0x72, 0x75, 0x6d, 0x65, 0x3b, 0x4b, 0x75, 0x62, 0x76, 0x75, 0x6d, 0x62, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x76, 0x61, 0x62,</div><div class='del'>-0x76, 0x75, 0x3b, 0x43, 0x68, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x6b, 0x75, 0x6e, 0x67, 0x75, 0x72,</div><div class='del'>-0x75, 0x3b, 0x4e, 0x79, 0x61, 0x6d, 0x61, 0x76, 0x68, 0x75, 0x76, 0x68, 0x75, 0x3b, 0x47, 0x75, 0x6e, 0x79, 0x61, 0x6e,</div><div class='del'>-0x61, 0x3b, 0x47, 0x75, 0x6d, 0x69, 0x67, 0x75, 0x72, 0x75, 0x3b, 0x4d, 0x62, 0x75, 0x64, 0x7a, 0x69, 0x3b, 0x5a, 0x76,</div><div class='del'>-0x69, 0x74, 0x61, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x4e, 0x3b,</div><div class='del'>-0x47, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0xda2, 0xdb1, 0x3b, 0xdb4, 0xdd9, 0xdb6, 0x3b, 0xdb8, 0xdcf, 0xdbb, 0xdca, 0xdad,</div><div class='del'>-0x3b, 0xd85, 0xdb4, 0xdca, 0x200d, 0xdbb, 0xdda, 0xdbd, 0x3b, 0xdb8, 0xdd0, 0xdba, 0x3b, 0xda2, 0xdd6, 0xdb1, 0x3b, 0xda2, 0xdd6, 0xdbd,</div><div class='del'>-0x3b, 0xd85, 0xd9c, 0xddd, 0x3b, 0xdc3, 0xdd0, 0xdb4, 0x3b, 0xd94, 0xd9a, 0x3b, 0xdb1, 0xddc, 0xdc0, 0xdd0, 0x3b, 0xdaf, 0xdd9, 0xdc3,</div><div class='del'>-0xdd0, 0x3b, 0xda2, 0xdb1, 0xdc0, 0xdcf, 0xdbb, 0x3b, 0xdb4, 0xdd9, 0xdb6, 0xdbb, 0xdc0, 0xdcf, 0xdbb, 0x3b, 0xdb8, 0xdcf, 0xdbb, 0xdca,</div><div class='del'>-0xdad, 0x3b, 0xd85, 0xdb4, 0xdca, 0x200d, 0xdbb, 0xdda, 0xdbd, 0xdca, 0x3b, 0xdb8, 0xdd0, 0xdba, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdb1, 0x3b,</div><div class='del'>-0xda2, 0xdd6, 0xdbd, 0xdd2, 0x3b, 0xd85, 0xd9c, 0xddd, 0xdc3, 0xdca, 0xdad, 0xdd4, 0x3b, 0xdc3, 0xdd0, 0xdb4, 0xdca, 0xdad, 0xdd0, 0xdb8,</div><div class='del'>-0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xd94, 0xd9a, 0xdca, 0xdad, 0xddd, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xdb1, 0xddc, 0xdc0, 0xdd0, 0xdb8, 0xdca,</div><div class='del'>-0xdb6, 0xdbb, 0xdca, 0x3b, 0xdaf, 0xdd9, 0xdc3, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xda2, 0x3b, 0xdb4, 0xdd9, 0x3b, 0xdb8,</div><div class='del'>-0xdcf, 0x3b, 0xd85, 0x3b, 0xdb8, 0xdd0, 0x3b, 0xda2, 0xdd6, 0x3b, 0xda2, 0xdd6, 0x3b, 0xd85, 0x3b, 0xdc3, 0xdd0, 0x3b, 0xd94, 0x3b,</div><div class='del'>-0xdb1, 0xddc, 0x3b, 0xdaf, 0xdd9, 0x3b, 0x42, 0x68, 0x69, 0x3b, 0x56, 0x61, 0x6e, 0x3b, 0x56, 0x6f, 0x6c, 0x3b, 0x4d, 0x61,</div><div class='del'>-0x62, 0x3b, 0x4e, 0x6b, 0x68, 0x3b, 0x4e, 0x68, 0x6c, 0x3b, 0x4b, 0x68, 0x6f, 0x3b, 0x4e, 0x67, 0x63, 0x3b, 0x4e, 0x79,</div><div class='del'>-0x6f, 0x3b, 0x4d, 0x70, 0x68, 0x3b, 0x4c, 0x77, 0x65, 0x3b, 0x4e, 0x67, 0x6f, 0x3b, 0x42, 0x68, 0x69, 0x6d, 0x62, 0x69,</div><div class='del'>-0x64, 0x76, 0x77, 0x61, 0x6e, 0x65, 0x3b, 0x69, 0x4e, 0x64, 0x6c, 0x6f, 0x76, 0x61, 0x6e, 0x61, 0x3b, 0x69, 0x4e, 0x64,</div><div class='del'>-0x6c, 0x6f, 0x76, 0x75, 0x2d, 0x6c, 0x65, 0x6e, 0x6b, 0x68, 0x75, 0x6c, 0x75, 0x3b, 0x4d, 0x61, 0x62, 0x61, 0x73, 0x61,</div><div class='del'>-0x3b, 0x69, 0x4e, 0x6b, 0x68, 0x77, 0x65, 0x6b, 0x68, 0x77, 0x65, 0x74, 0x69, 0x3b, 0x69, 0x4e, 0x68, 0x6c, 0x61, 0x62,</div><div class='del'>-0x61, 0x3b, 0x4b, 0x68, 0x6f, 0x6c, 0x77, 0x61, 0x6e, 0x65, 0x3b, 0x69, 0x4e, 0x67, 0x63, 0x69, 0x3b, 0x69, 0x4e, 0x79,</div><div class='del'>-0x6f, 0x6e, 0x69, 0x3b, 0x69, 0x4d, 0x70, 0x68, 0x61, 0x6c, 0x61, 0x3b, 0x4c, 0x77, 0x65, 0x74, 0x69, 0x3b, 0x69, 0x4e,</div><div class='del'>-0x67, 0x6f, 0x6e, 0x67, 0x6f, 0x6e, 0x69, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b,</div><div class='del'>-0x61, 0x70, 0x72, 0x3b, 0x6d, 0xe1, 0x6a, 0x3b, 0x6a, 0xfa, 0x6e, 0x3b, 0x6a, 0xfa, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b,</div><div class='del'>-0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75,</div><div class='del'>-0xe1, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x65, 0x63, 0x3b, 0x61, 0x70, 0x72,</div><div class='del'>-0xed, 0x6c, 0x3b, 0x6d, 0xe1, 0x6a, 0x3b, 0x6a, 0xfa, 0x6e, 0x3b, 0x6a, 0xfa, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73,</div><div class='del'>-0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x65, 0x72, 0x3b,</div><div class='del'>-0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61,</div><div class='del'>-0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x65, 0x63, 0x3b, 0x61,</div><div class='del'>-0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a,</div><div class='del'>-0x3b, 0x61, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b,</div><div class='del'>-0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d,</div><div class='del'>-0x62, 0x65, 0x72, 0x3b, 0x4b, 0x6f, 0x62, 0x3b, 0x4c, 0x61, 0x62, 0x3b, 0x53, 0x61, 0x64, 0x3b, 0x41, 0x66, 0x72, 0x3b,</div><div class='del'>-0x53, 0x68, 0x61, 0x3b, 0x4c, 0x69, 0x78, 0x3b, 0x54, 0x6f, 0x64, 0x3b, 0x53, 0x69, 0x64, 0x3b, 0x53, 0x61, 0x67, 0x3b,</div><div class='del'>-0x54, 0x6f, 0x62, 0x3b, 0x4b, 0x49, 0x54, 0x3b, 0x4c, 0x49, 0x54, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4b, 0x6f,</div><div class='del'>-0x6f, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c, 0x61, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42,</div><div class='del'>-0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x61, 0x64, 0x64, 0x65, 0x78, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61,</div><div class='del'>-0x20, 0x41, 0x66, 0x72, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x68, 0x61, 0x6e, 0x61, 0x61,</div><div class='del'>-0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c, 0x69, 0x78, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61,</div><div class='del'>-0x20, 0x54, 0x6f, 0x64, 0x6f, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x69, 0x64, 0x65,</div><div class='del'>-0x65, 0x64, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x61, 0x67, 0x61, 0x61, 0x6c, 0x61, 0x61,</div><div class='del'>-0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68,</div><div class='del'>-0x61, 0x20, 0x4b, 0x6f, 0x77, 0x20, 0x69, 0x79, 0x6f, 0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69,</div><div class='del'>-0x73, 0x68, 0x61, 0x20, 0x4c, 0x61, 0x62, 0x61, 0x20, 0x69, 0x79, 0x6f, 0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64,</div><div class='del'>-0x3b, 0x4b, 0x3b, 0x4c, 0x3b, 0x53, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x54,</div><div class='del'>-0x3b, 0x4b, 0x3b, 0x4c, 0x3b, 0x65, 0x6e, 0x65, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x62, 0x72,</div><div class='del'>-0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x70,</div><div class='del'>-0x3b, 0x6f, 0x63, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x69, 0x63, 0x3b, 0x65, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x66,</div><div class='del'>-0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d,</div><div class='del'>-0x61, 0x79, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73,</div><div class='del'>-0x74, 0x6f, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72,</div><div class='del'>-0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x69, 0x63, 0x69, 0x65, 0x6d, 0x62, 0x72,</div><div class='del'>-0x65, 0x3b, 0x45, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b,</div><div class='del'>-0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70,</div><div class='del'>-0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65,</div><div class='del'>-0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72,</div><div class='del'>-0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x72,</div><div class='del'>-0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x41,</div><div class='del'>-0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62,</div><div class='del'>-0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x6a, 0x61,</div><div class='del'>-0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b,</div><div class='del'>-0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b,</div><div class='del'>-0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x69, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b,</div><div class='del'>-0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d,</div><div class='del'>-0x62, 0x65, 0x72, 0x3b, 0x42f, 0x43d, 0x432, 0x3b, 0x424, 0x435, 0x432, 0x3b, 0x41c, 0x430, 0x440, 0x3b, 0x410, 0x43f, 0x440, 0x3b,</div><div class='del'>-0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x3b, 0x418, 0x44e, 0x43b, 0x3b, 0x410, 0x432, 0x433, 0x3b, 0x421, 0x435, 0x43d, 0x3b,</div><div class='del'>-0x41e, 0x43a, 0x442, 0x3b, 0x41d, 0x43e, 0x44f, 0x3b, 0x414, 0x435, 0x43a, 0x3b, 0x42f, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x424, 0x435,</div><div class='del'>-0x432, 0x440, 0x430, 0x43b, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x41c, 0x430, 0x439, 0x3b,</div><div class='del'>-0x418, 0x44e, 0x43d, 0x3b, 0x418, 0x44e, 0x43b, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x44f,</div><div class='del'>-0x431, 0x440, 0x3b, 0x41e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x440, 0x3b, 0x414, 0x435, 0x43a, 0x430,</div><div class='del'>-0x431, 0x440, 0x3b, 0xb9c, 0xba9, 0x2e, 0x3b, 0xbaa, 0xbbf, 0xbaa, 0xbcd, 0x2e, 0x3b, 0xbae, 0xbbe, 0xbb0, 0xbcd, 0x2e, 0x3b, 0xb8f,</div><div class='del'>-0xbaa, 0xbcd, 0x2e, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0xba9, 0xbcd, 0x3b, 0xb9c, 0xbc2, 0xbb2, 0xbc8, 0x3b, 0xb86, 0xb95, 0x2e,</div><div class='del'>-0x3b, 0xb9a, 0xbc6, 0xbaa, 0xbcd, 0x2e, 0x3b, 0xb85, 0xb95, 0xbcd, 0x2e, 0x3b, 0xba8, 0xbb5, 0x2e, 0x3b, 0xb9f, 0xbbf, 0xb9a, 0x2e,</div><div class='del'>-0x3b, 0xb9c, 0xba9, 0xbb5, 0xbb0, 0xbbf, 0x3b, 0xbaa, 0xbbf, 0xbaa, 0xbcd, 0xbb0, 0xbb5, 0xbb0, 0xbbf, 0x3b, 0xbae, 0xbbe, 0xbb0, 0xbcd,</div><div class='del'>-0xb9a, 0xbcd, 0x3b, 0xb8f, 0xbaa, 0xbcd, 0xbb0, 0xbb2, 0xbcd, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0xba9, 0xbcd, 0x3b, 0xb9c, 0xbc2,</div><div class='del'>-0xbb2, 0xbc8, 0x3b, 0xb86, 0xb95, 0xbb8, 0xbcd, 0xb9f, 0xbcd, 0x3b, 0xb9a, 0xbc6, 0xbaa, 0xbcd, 0xb9f, 0xbc6, 0xbae, 0xbcd, 0xbaa, 0xbcd,</div><div class='del'>-0xbb0, 0xbcd, 0x3b, 0xb85, 0xb95, 0xbcd, 0xb9f, 0xbcb, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xba8, 0xbb5, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b,</div><div class='del'>-0xb9f, 0xbbf, 0xb9a, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xb9c, 0x3b, 0xbaa, 0xbbf, 0x3b, 0xbae, 0xbbe, 0x3b, 0xb8f, 0x3b, 0xbae,</div><div class='del'>-0xbc7, 0x3b, 0xb9c, 0xbc2, 0x3b, 0xb9c, 0xbc2, 0x3b, 0xb86, 0x3b, 0xb9a, 0xbc6, 0x3b, 0xb85, 0x3b, 0xba8, 0x3b, 0xb9f, 0xbbf, 0x3b,</div><div class='del'>-0xc1c, 0xc28, 0xc35, 0xc30, 0xc3f, 0x3b, 0xc2b, 0xc3f, 0xc2c, 0xc4d, 0xc30, 0xc35, 0xc30, 0xc3f, 0x3b, 0xc2e, 0xc3e, 0xc30, 0xc4d, 0xc1a,</div><div class='del'>-0xc3f, 0x3b, 0xc0f, 0xc2a, 0xc4d, 0xc30, 0xc3f, 0xc32, 0xc4d, 0x3b, 0xc2e, 0xc47, 0x3b, 0xc1c, 0xc42, 0xc28, 0xc4d, 0x3b, 0xc1c, 0xc42,</div><div class='del'>-0xc32, 0xc48, 0x3b, 0xc06, 0xc17, 0xc38, 0xc4d, 0xc1f, 0xc41, 0x3b, 0xc38, 0xc46, 0xc2a, 0xc4d, 0xc1f, 0xc46, 0xc02, 0xc2c, 0xc30, 0xc4d,</div><div class='del'>-0x3b, 0xc05, 0xc15, 0xc4d, 0xc1f, 0xc4b, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc28, 0xc35, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc21, 0xc3f, 0xc38,</div><div class='del'>-0xc46, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc1c, 0x3b, 0xc2b, 0xc3f, 0x3b, 0xc2e, 0x3b, 0xc0e, 0x3b, 0xc2e, 0xc46, 0x3b, 0xc1c, 0xc41,</div><div class='del'>-0x3b, 0xc1c, 0xc41, 0x3b, 0xc06, 0x3b, 0xc38, 0xc46, 0x3b, 0xc05, 0x3b, 0xc28, 0x3b, 0xc21, 0xc3f, 0x3b, 0xe21, 0x2e, 0xe04, 0x2e,</div><div class='del'>-0x3b, 0xe01, 0x2e, 0xe1e, 0x2e, 0x3b, 0xe21, 0xe35, 0x2e, 0xe04, 0x2e, 0x3b, 0xe40, 0xe21, 0x2e, 0xe22, 0x2e, 0x3b, 0xe1e, 0x2e,</div><div class='del'>-0xe04, 0x2e, 0x3b, 0xe21, 0xe34, 0x2e, 0xe22, 0x2e, 0x3b, 0xe01, 0x2e, 0xe04, 0x2e, 0x3b, 0xe2a, 0x2e, 0xe04, 0x2e, 0x3b, 0xe01,</div><div class='del'>-0x2e, 0xe22, 0x2e, 0x3b, 0xe15, 0x2e, 0xe04, 0x2e, 0x3b, 0xe1e, 0x2e, 0xe22, 0x2e, 0x3b, 0xe18, 0x2e, 0xe04, 0x2e, 0x3b, 0xe21,</div><div class='del'>-0xe01, 0xe23, 0xe32, 0xe04, 0xe21, 0x3b, 0xe01, 0xe38, 0xe21, 0xe20, 0xe32, 0xe1e, 0xe31, 0xe19, 0xe18, 0xe4c, 0x3b, 0xe21, 0xe35, 0xe19,</div><div class='del'>-0xe32, 0xe04, 0xe21, 0x3b, 0xe40, 0xe21, 0xe29, 0xe32, 0xe22, 0xe19, 0x3b, 0xe1e, 0xe24, 0xe29, 0xe20, 0xe32, 0xe04, 0xe21, 0x3b, 0xe21,</div><div class='del'>-0xe34, 0xe16, 0xe38, 0xe19, 0xe32, 0xe22, 0xe19, 0x3b, 0xe01, 0xe23, 0xe01, 0xe0e, 0xe32, 0xe04, 0xe21, 0x3b, 0xe2a, 0xe34, 0xe07, 0xe2b,</div><div class='del'>-0xe32, 0xe04, 0xe21, 0x3b, 0xe01, 0xe31, 0xe19, 0xe22, 0xe32, 0xe22, 0xe19, 0x3b, 0xe15, 0xe38, 0xe25, 0xe32, 0xe04, 0xe21, 0x3b, 0xe1e,</div><div class='del'>-0xe24, 0xe28, 0xe08, 0xe34, 0xe01, 0xe32, 0xe22, 0xe19, 0x3b, 0xe18, 0xe31, 0xe19, 0xe27, 0xe32, 0xe04, 0xe21, 0x3b, 0xf5f, 0xfb3, 0xf0b,</div><div class='del'>-0xf21, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf22, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf23, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf24, 0x3b, 0xf5f, 0xfb3, 0xf0b,</div><div class='del'>-0xf25, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf26, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf27, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf28, 0x3b, 0xf5f, 0xfb3, 0xf0b,</div><div class='del'>-0xf29, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf20, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf21, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf22, 0x3b,</div><div class='del'>-0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf44, 0xf0b, 0xf54, 0xf7c, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42, 0xf49, 0xf72,</div><div class='del'>-0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b,</div><div class='del'>-0xf56, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0xf0b, 0x3b,</div><div class='del'>-0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf51,</div><div class='del'>-0xf74, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b,</div><div class='del'>-0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74,</div><div class='del'>-0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b,</div><div class='del'>-0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0x1325, 0x122a,</div><div class='del'>-0x3b, 0x1208, 0x12ab, 0x1272, 0x3b, 0x1218, 0x130b, 0x1262, 0x3b, 0x121a, 0x12eb, 0x12dd, 0x3b, 0x130d, 0x1295, 0x1266, 0x3b, 0x1230, 0x1290, 0x3b,</div><div class='del'>-0x1213, 0x121d, 0x1208, 0x3b, 0x1290, 0x1213, 0x1230, 0x3b, 0x1218, 0x1235, 0x12a8, 0x3b, 0x1325, 0x1245, 0x121d, 0x3b, 0x1215, 0x12f3, 0x122d, 0x3b,</div><div class='del'>-0x1273, 0x1215, 0x1233, 0x3b, 0x1325, 0x122a, 0x3b, 0x1208, 0x12ab, 0x1272, 0x1275, 0x3b, 0x1218, 0x130b, 0x1262, 0x1275, 0x3b, 0x121a, 0x12eb, 0x12dd,</div><div class='del'>-0x12eb, 0x3b, 0x130d, 0x1295, 0x1266, 0x1275, 0x3b, 0x1230, 0x1290, 0x3b, 0x1213, 0x121d, 0x1208, 0x3b, 0x1290, 0x1213, 0x1230, 0x3b, 0x1218, 0x1235,</div><div class='del'>-0x12a8, 0x1228, 0x121d, 0x3b, 0x1325, 0x1245, 0x121d, 0x1272, 0x3b, 0x1215, 0x12f3, 0x122d, 0x3b, 0x1273, 0x1215, 0x1233, 0x1235, 0x3b, 0x53, 0x101,</div><div class='del'>-0x6e, 0x3b, 0x46, 0x113, 0x70, 0x3b, 0x4d, 0x61, 0x2bb, 0x61, 0x3b, 0x2bb, 0x45, 0x70, 0x65, 0x3b, 0x4d, 0x113, 0x3b, 0x53,</div><div class='del'>-0x75, 0x6e, 0x3b, 0x53, 0x69, 0x75, 0x3b, 0x2bb, 0x41, 0x6f, 0x6b, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61,</div><div class='del'>-0x3b, 0x4e, 0x14d, 0x76, 0x3b, 0x54, 0x12b, 0x73, 0x3b, 0x53, 0x101, 0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x46, 0x113, 0x70,</div><div class='del'>-0x75, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x2bb, 0x61, 0x73, 0x69, 0x3b, 0x2bb, 0x45, 0x70, 0x65, 0x6c, 0x65, 0x6c, 0x69,</div><div class='del'>-0x3b, 0x4d, 0x113, 0x3b, 0x53, 0x75, 0x6e, 0x65, 0x3b, 0x53, 0x69, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x2bb, 0x41, 0x6f, 0x6b,</div><div class='del'>-0x6f, 0x73, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x74, 0x6f, 0x70,</div><div class='del'>-0x61, 0x3b, 0x4e, 0x14d, 0x76, 0x65, 0x6d, 0x61, 0x3b, 0x54, 0x12b, 0x73, 0x65, 0x6d, 0x61, 0x3b, 0x53, 0x3b, 0x46, 0x3b,</div><div class='del'>-0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x54, 0x3b,</div><div class='del'>-0x53, 0x75, 0x6e, 0x3b, 0x59, 0x61, 0x6e, 0x3b, 0x4b, 0x75, 0x6c, 0x3b, 0x44, 0x7a, 0x69, 0x3b, 0x4d, 0x75, 0x64, 0x3b,</div><div class='del'>-0x4b, 0x68, 0x6f, 0x3b, 0x4d, 0x61, 0x77, 0x3b, 0x4d, 0x68, 0x61, 0x3b, 0x4e, 0x64, 0x7a, 0x3b, 0x4e, 0x68, 0x6c, 0x3b,</div><div class='del'>-0x48, 0x75, 0x6b, 0x3b, 0x4e, 0x27, 0x77, 0x3b, 0x53, 0x75, 0x6e, 0x67, 0x75, 0x74, 0x69, 0x3b, 0x4e, 0x79, 0x65, 0x6e,</div><div class='del'>-0x79, 0x65, 0x6e, 0x79, 0x61, 0x6e, 0x69, 0x3b, 0x4e, 0x79, 0x65, 0x6e, 0x79, 0x61, 0x6e, 0x6b, 0x75, 0x6c, 0x75, 0x3b,</div><div class='del'>-0x44, 0x7a, 0x69, 0x76, 0x61, 0x6d, 0x69, 0x73, 0x6f, 0x6b, 0x6f, 0x3b, 0x4d, 0x75, 0x64, 0x79, 0x61, 0x78, 0x69, 0x68,</div><div class='del'>-0x69, 0x3b, 0x4b, 0x68, 0x6f, 0x74, 0x61, 0x76, 0x75, 0x78, 0x69, 0x6b, 0x61, 0x3b, 0x4d, 0x61, 0x77, 0x75, 0x77, 0x61,</div><div class='del'>-0x6e, 0x69, 0x3b, 0x4d, 0x68, 0x61, 0x77, 0x75, 0x72, 0x69, 0x3b, 0x4e, 0x64, 0x7a, 0x68, 0x61, 0x74, 0x69, 0x3b, 0x4e,</div><div class='del'>-0x68, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x3b, 0x48, 0x75, 0x6b, 0x75, 0x72, 0x69, 0x3b, 0x4e, 0x27, 0x77, 0x65,</div><div class='del'>-0x6e, 0x64, 0x7a, 0x61, 0x6d, 0x68, 0x61, 0x6c, 0x61, 0x3b, 0x4f, 0x63, 0x61, 0x3b, 0x15e, 0x75, 0x62, 0x3b, 0x4d, 0x61,</div><div class='del'>-0x72, 0x3b, 0x4e, 0x69, 0x73, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48, 0x61, 0x7a, 0x3b, 0x54, 0x65, 0x6d, 0x3b, 0x41, 0x11f,</div><div class='del'>-0x75, 0x3b, 0x45, 0x79, 0x6c, 0x3b, 0x45, 0x6b, 0x69, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x41, 0x72, 0x61, 0x3b, 0x4f, 0x63,</div><div class='del'>-0x61, 0x6b, 0x3b, 0x15e, 0x75, 0x62, 0x61, 0x74, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x4e, 0x69, 0x73, 0x61, 0x6e, 0x3b,</div><div class='del'>-0x4d, 0x61, 0x79, 0x131, 0x73, 0x3b, 0x48, 0x61, 0x7a, 0x69, 0x72, 0x61, 0x6e, 0x3b, 0x54, 0x65, 0x6d, 0x6d, 0x75, 0x7a,</div><div class='del'>-0x3b, 0x41, 0x11f, 0x75, 0x73, 0x74, 0x6f, 0x73, 0x3b, 0x45, 0x79, 0x6c, 0xfc, 0x6c, 0x3b, 0x45, 0x6b, 0x69, 0x6d, 0x3b,</div><div class='del'>-0x4b, 0x61, 0x73, 0x131, 0x6d, 0x3b, 0x41, 0x72, 0x61, 0x6c, 0x131, 0x6b, 0x3b, 0x4f, 0x3b, 0x15e, 0x3b, 0x4d, 0x3b, 0x4e,</div><div class='del'>-0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x45, 0x3b, 0x45, 0x3b, 0x4b, 0x3b, 0x41, 0x3b, 0x421, 0x456, 0x447,</div><div class='del'>-0x3b, 0x41b, 0x44e, 0x442, 0x3b, 0x411, 0x435, 0x440, 0x3b, 0x41a, 0x432, 0x456, 0x3b, 0x422, 0x440, 0x430, 0x3b, 0x427, 0x435, 0x440,</div><div class='del'>-0x3b, 0x41b, 0x438, 0x43f, 0x3b, 0x421, 0x435, 0x440, 0x3b, 0x412, 0x435, 0x440, 0x3b, 0x416, 0x43e, 0x432, 0x3b, 0x41b, 0x438, 0x441,</div><div class='del'>-0x3b, 0x413, 0x440, 0x443, 0x3b, 0x421, 0x456, 0x447, 0x435, 0x43d, 0x44c, 0x3b, 0x41b, 0x44e, 0x442, 0x438, 0x439, 0x3b, 0x411, 0x435,</div><div class='del'>-0x440, 0x435, 0x437, 0x435, 0x43d, 0x44c, 0x3b, 0x41a, 0x432, 0x456, 0x442, 0x435, 0x43d, 0x44c, 0x3b, 0x422, 0x440, 0x430, 0x432, 0x435,</div><div class='del'>-0x43d, 0x44c, 0x3b, 0x427, 0x435, 0x440, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x41b, 0x438, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x421, 0x435,</div><div class='del'>-0x440, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x412, 0x435, 0x440, 0x435, 0x441, 0x435, 0x43d, 0x44c, 0x3b, 0x416, 0x43e, 0x432, 0x442, 0x435,</div><div class='del'>-0x43d, 0x44c, 0x3b, 0x41b, 0x438, 0x441, 0x442, 0x43e, 0x43f, 0x430, 0x434, 0x3b, 0x413, 0x440, 0x443, 0x434, 0x435, 0x43d, 0x44c, 0x3b,</div><div class='del'>-0x421, 0x3b, 0x41b, 0x3b, 0x411, 0x3b, 0x41a, 0x3b, 0x422, 0x3b, 0x427, 0x3b, 0x41b, 0x3b, 0x421, 0x3b, 0x412, 0x3b, 0x416, 0x3b,</div><div class='del'>-0x41b, 0x3b, 0x413, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x20,</div><div class='del'>-0x686, 0x3b, 0x627, 0x67e, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x626, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x626,</div><div class='del'>-0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646,</div><div class='del'>-0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x41c, 0x443, 0x4b3, 0x430, 0x440, 0x440, 0x430, 0x43c, 0x3b,</div><div class='del'>-0x421, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x420, 0x430, 0x431, 0x438, 0x443, 0x43b, 0x2d, 0x430, 0x432, 0x432, 0x430, 0x43b, 0x3b, 0x420,</div><div class='del'>-0x430, 0x431, 0x438, 0x443, 0x43b, 0x2d, 0x43e, 0x445, 0x438, 0x440, 0x3b, 0x416, 0x443, 0x43c, 0x43e, 0x434, 0x438, 0x443, 0x43b, 0x2d,</div><div class='del'>-0x443, 0x43b, 0x43e, 0x3b, 0x416, 0x443, 0x43c, 0x43e, 0x434, 0x438, 0x443, 0x43b, 0x2d, 0x443, 0x445, 0x440, 0x43e, 0x3b, 0x420, 0x430,</div><div class='del'>-0x436, 0x430, 0x431, 0x3b, 0x428, 0x430, 0x44a, 0x431, 0x43e, 0x43d, 0x3b, 0x420, 0x430, 0x43c, 0x430, 0x437, 0x43e, 0x43d, 0x3b, 0x428,</div><div class='del'>-0x430, 0x432, 0x432, 0x43e, 0x43b, 0x3b, 0x417, 0x438, 0x43b, 0x2d, 0x49b, 0x430, 0x44a, 0x434, 0x430, 0x3b, 0x417, 0x438, 0x43b, 0x2d,</div><div class='del'>-0x4b3, 0x438, 0x436, 0x436, 0x430, 0x3b, 0x62c, 0x646, 0x648, 0x3b, 0x641, 0x628, 0x631, 0x3b, 0x645, 0x627, 0x631, 0x3b, 0x627, 0x67e,</div><div class='del'>-0x631, 0x3b, 0x645, 0x640, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x3b, 0x627, 0x6af, 0x633, 0x3b, 0x633, 0x67e,</div><div class='del'>-0x62a, 0x3b, 0x627, 0x6a9, 0x62a, 0x3b, 0x646, 0x648, 0x645, 0x3b, 0x62f, 0x633, 0x645, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b,</div><div class='del'>-0x641, 0x628, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc,</div><div class='del'>-0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645,</div><div class='del'>-0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628,</div><div class='del'>-0x631, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x32, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x33, 0x3b,</div><div class='del'>-0x74, 0x68, 0x67, 0x20, 0x34, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x35, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x36, 0x3b, 0x74, 0x68,</div><div class='del'>-0x67, 0x20, 0x37, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x38, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x39, 0x3b, 0x74, 0x68, 0x67, 0x20,</div><div class='del'>-0x31, 0x30, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x31, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x32, 0x3b, 0x74, 0x68, 0xe1,</div><div class='del'>-0x6e, 0x67, 0x20, 0x6d, 0x1ed9, 0x74, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x68, 0x61, 0x69, 0x3b, 0x74, 0x68, 0xe1,</div><div class='del'>-0x6e, 0x67, 0x20, 0x62, 0x61, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x74, 0x1b0, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67,</div><div class='del'>-0x20, 0x6e, 0x103, 0x6d, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x73, 0xe1, 0x75, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67,</div><div class='del'>-0x20, 0x62, 0x1ea3, 0x79, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x74, 0xe1, 0x6d, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67,</div><div class='del'>-0x20, 0x63, 0x68, 0xed, 0x6e, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x6d, 0x1b0, 0x1edd, 0x69, 0x3b, 0x74, 0x68, 0xe1,</div><div class='del'>-0x6e, 0x67, 0x20, 0x6d, 0x1b0, 0x1edd, 0x69, 0x20, 0x6d, 0x1ed9, 0x74, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x6d, 0x1b0,</div><div class='del'>-0x1edd, 0x69, 0x20, 0x68, 0x61, 0x69, 0x3b, 0x49, 0x6f, 0x6e, 0x3b, 0x43, 0x68, 0x77, 0x65, 0x3b, 0x4d, 0x61, 0x77, 0x3b,</div><div class='del'>-0x45, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x65, 0x68, 0x3b, 0x47, 0x6f, 0x72, 0x3b, 0x41, 0x77, 0x73, 0x74,</div><div class='del'>-0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79, 0x64, 0x3b, 0x54, 0x61, 0x63, 0x68, 0x3b, 0x52, 0x68, 0x61, 0x67, 0x3b,</div><div class='del'>-0x49, 0x6f, 0x6e, 0x61, 0x77, 0x72, 0x3b, 0x43, 0x68, 0x77, 0x65, 0x66, 0x72, 0x6f, 0x72, 0x3b, 0x4d, 0x61, 0x77, 0x72,</div><div class='del'>-0x74, 0x68, 0x3b, 0x45, 0x62, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x65, 0x68, 0x65, 0x66, 0x69,</div><div class='del'>-0x6e, 0x3b, 0x47, 0x6f, 0x72, 0x66, 0x66, 0x65, 0x6e, 0x6e, 0x61, 0x66, 0x3b, 0x41, 0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65,</div><div class='del'>-0x64, 0x69, 0x3b, 0x48, 0x79, 0x64, 0x72, 0x65, 0x66, 0x3b, 0x54, 0x61, 0x63, 0x68, 0x77, 0x65, 0x64, 0x64, 0x3b, 0x52,</div><div class='del'>-0x68, 0x61, 0x67, 0x66, 0x79, 0x72, 0x3b, 0x49, 0x3b, 0x43, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x47,</div><div class='del'>-0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x52, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d,</div><div class='del'>-0x61, 0x74, 0x3b, 0x45, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41,</div><div class='del'>-0x67, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a,</div><div class='del'>-0x61, 0x6e, 0x79, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x4d,</div><div class='del'>-0x61, 0x74, 0x73, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x72, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x79, 0x69, 0x3b, 0x4a, 0x75,</div><div class='del'>-0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x79, 0x69, 0x3b, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70,</div><div class='del'>-0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x68, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62,</div><div class='del'>-0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x1e62, 0x1eb9, 0x301, 0x72, 0x1eb9, 0x323, 0x3b, 0xc8, 0x72, 0xe8,</div><div class='del'>-0x6c, 0xe8, 0x3b, 0x1eb8, 0x72, 0x1eb9, 0x300, 0x6e, 0xe0, 0x3b, 0xcc, 0x67, 0x62, 0xe9, 0x3b, 0x1eb8, 0x300, 0x62, 0x69, 0x62,</div><div class='del'>-0x69, 0x3b, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x41, 0x67, 0x1eb9, 0x6d, 0x1ecd, 0x3b, 0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f,</div><div class='del'>-0x77, 0x65, 0x77, 0x65, 0x3b, 0x1ecc, 0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x42, 0xe9, 0x6c, 0xfa, 0x3b, 0x1ecc, 0x300, 0x70,</div><div class='del'>-0x1eb9, 0x300, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x1e62, 0x1eb8, 0x301, 0x72, 0x1eb9, 0x301, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0xc8, 0x72,</div><div class='del'>-0xe8, 0x6c, 0xe8, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x1eb8, 0x72, 0x1eb9, 0x300, 0x6e, 0xe0, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0xcc,</div><div class='del'>-0x67, 0x62, 0xe9, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x1eb8, 0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0xd2,</div><div class='del'>-0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x41, 0x67, 0x1eb9, 0x6d, 0x1ecd, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0xd2,</div><div class='del'>-0x67, 0xfa, 0x6e, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x1ecc, 0x300,</div><div class='del'>-0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x42, 0xe9, 0x6c, 0xfa, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x1ecc, 0x300,</div><div class='del'>-0x70, 0x1eb9, 0x300, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x73, 0x3b, 0x41, 0x70, 0x72, 0x3b,</div><div class='del'>-0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b,</div><div class='del'>-0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x75, 0x4a, 0x61, 0x6e, 0x75, 0x77, 0x61, 0x72,</div><div class='del'>-0x69, 0x3b, 0x75, 0x46, 0x65, 0x62, 0x72, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x75, 0x4d, 0x61, 0x73, 0x68, 0x69, 0x3b,</div><div class='del'>-0x75, 0x2d, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x69, 0x3b, 0x75, 0x4d, 0x65, 0x79, 0x69, 0x3b, 0x75, 0x4a, 0x75, 0x6e, 0x69,</div><div class='del'>-0x3b, 0x75, 0x4a, 0x75, 0x6c, 0x61, 0x79, 0x69, 0x3b, 0x75, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x75, 0x53, 0x65,</div><div class='del'>-0x70, 0x74, 0x68, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x75, 0x2d, 0x4f, 0x6b, 0x74, 0x68, 0x6f, 0x62, 0x61, 0x3b, 0x75, 0x4e,</div><div class='del'>-0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x75, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x61, 0x6e, 0x3b,</div><div class='del'>-0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x6a, 0x3b, 0x4a, 0x75, 0x6e, 0x3b,</div><div class='del'>-0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x76, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b,</div><div class='del'>-0x44, 0x65, 0x63, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d,</div><div class='del'>-0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x6a, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a,</div><div class='del'>-0x75, 0x6c, 0x69, 0x3b, 0x41, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72,</div><div class='del'>-0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x44, 0x65,</div><div class='del'>-0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4a, 0x2d, 0x67, 0x75, 0x65, 0x72, 0x3b, 0x54, 0x2d, 0x61, 0x72, 0x72, 0x65,</div><div class='del'>-0x65, 0x3b, 0x4d, 0x61, 0x79, 0x72, 0x6e, 0x74, 0x3b, 0x41, 0x76, 0x72, 0x72, 0x69, 0x6c, 0x3b, 0x42, 0x6f, 0x61, 0x6c,</div><div class='del'>-0x64, 0x79, 0x6e, 0x3b, 0x4d, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4a, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65,</div><div class='del'>-0x65, 0x3b, 0x4c, 0x75, 0x61, 0x6e, 0x69, 0x73, 0x74, 0x79, 0x6e, 0x3b, 0x4d, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72,</div><div class='del'>-0x3b, 0x4a, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4d, 0x2e, 0x48, 0x6f, 0x75, 0x6e, 0x65, 0x79, 0x3b, 0x4d,</div><div class='del'>-0x2e, 0x4e, 0x6f, 0x6c, 0x6c, 0x69, 0x63, 0x6b, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x67, 0x65, 0x75, 0x72,</div><div class='del'>-0x65, 0x65, 0x3b, 0x54, 0x6f, 0x73, 0x68, 0x69, 0x61, 0x67, 0x68, 0x74, 0x2d, 0x61, 0x72, 0x72, 0x65, 0x65, 0x3b, 0x4d,</div><div class='del'>-0x61, 0x79, 0x72, 0x6e, 0x74, 0x3b, 0x41, 0x76, 0x65, 0x72, 0x69, 0x6c, 0x3b, 0x42, 0x6f, 0x61, 0x6c, 0x64, 0x79, 0x6e,</div><div class='del'>-0x3b, 0x4d, 0x65, 0x61, 0x6e, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d,</div><div class='del'>-0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4c, 0x75, 0x61, 0x6e, 0x69, 0x73, 0x74, 0x79, 0x6e, 0x3b, 0x4d, 0x65, 0x61,</div><div class='del'>-0x6e, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x66, 0x6f, 0x75, 0x79,</div><div class='del'>-0x69, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x20, 0x48, 0x6f, 0x75, 0x6e, 0x65, 0x79, 0x3b, 0x4d, 0x65, 0x65, 0x20, 0x6e, 0x79,</div><div class='del'>-0x20, 0x4e, 0x6f, 0x6c, 0x6c, 0x69, 0x63, 0x6b, 0x3b, 0x47, 0x65, 0x6e, 0x3b, 0x57, 0x68, 0x65, 0x3b, 0x4d, 0x65, 0x72,</div><div class='del'>-0x3b, 0x45, 0x62, 0x72, 0x3b, 0x4d, 0x65, 0x3b, 0x45, 0x66, 0x6e, 0x3b, 0x47, 0x6f, 0x72, 0x3b, 0x45, 0x73, 0x74, 0x3b,</div><div class='del'>-0x47, 0x77, 0x6e, 0x3b, 0x48, 0x65, 0x64, 0x3b, 0x44, 0x75, 0x3b, 0x4b, 0x65, 0x76, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x47,</div><div class='del'>-0x65, 0x6e, 0x76, 0x65, 0x72, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x57, 0x68, 0x65, 0x76, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x79,</div><div class='del'>-0x73, 0x20, 0x4d, 0x65, 0x72, 0x74, 0x68, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x45, 0x62, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x79,</div><div class='del'>-0x73, 0x20, 0x4d, 0x65, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x45, 0x66, 0x61, 0x6e, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x47, 0x6f,</div><div class='del'>-0x72, 0x74, 0x68, 0x65, 0x72, 0x65, 0x6e, 0x3b, 0x4d, 0x79, 0x65, 0x20, 0x45, 0x73, 0x74, 0x3b, 0x4d, 0x79, 0x73, 0x20,</div><div class='del'>-0x47, 0x77, 0x79, 0x6e, 0x67, 0x61, 0x6c, 0x61, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x48, 0x65, 0x64, 0x72, 0x61, 0x3b, 0x4d,</div><div class='del'>-0x79, 0x73, 0x20, 0x44, 0x75, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x4b, 0x65, 0x76, 0x61, 0x72, 0x64, 0x68, 0x75, 0x3b, 0x53,</div><div class='del'>-0x2d, 0x186, 0x3b, 0x4b, 0x2d, 0x186, 0x3b, 0x45, 0x2d, 0x186, 0x3b, 0x45, 0x2d, 0x4f, 0x3b, 0x45, 0x2d, 0x4b, 0x3b, 0x4f,</div><div class='del'>-0x2d, 0x41, 0x3b, 0x41, 0x2d, 0x4b, 0x3b, 0x44, 0x2d, 0x186, 0x3b, 0x46, 0x2d, 0x190, 0x3b, 0x186, 0x2d, 0x41, 0x3b, 0x186,</div><div class='del'>-0x2d, 0x4f, 0x3b, 0x4d, 0x2d, 0x186, 0x3b, 0x53, 0x61, 0x6e, 0x64, 0x61, 0x2d, 0x186, 0x70, 0x25b, 0x70, 0x254, 0x6e, 0x3b,</div><div class='del'>-0x4b, 0x77, 0x61, 0x6b, 0x77, 0x61, 0x72, 0x2d, 0x186, 0x67, 0x79, 0x65, 0x66, 0x75, 0x6f, 0x3b, 0x45, 0x62, 0x254, 0x77,</div><div class='del'>-0x2d, 0x186, 0x62, 0x65, 0x6e, 0x65, 0x6d, 0x3b, 0x45, 0x62, 0x254, 0x62, 0x69, 0x72, 0x61, 0x2d, 0x4f, 0x66, 0x6f, 0x72,</div><div class='del'>-0x69, 0x73, 0x75, 0x6f, 0x3b, 0x45, 0x73, 0x75, 0x73, 0x6f, 0x77, 0x20, 0x41, 0x6b, 0x65, 0x74, 0x73, 0x65, 0x61, 0x62,</div><div class='del'>-0x61, 0x2d, 0x4b, 0x254, 0x74, 0x254, 0x6e, 0x69, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x62, 0x69, 0x72, 0x61, 0x64, 0x65, 0x2d,</div><div class='del'>-0x41, 0x79, 0x25b, 0x77, 0x6f, 0x68, 0x6f, 0x6d, 0x75, 0x6d, 0x75, 0x3b, 0x41, 0x79, 0x25b, 0x77, 0x6f, 0x68, 0x6f, 0x2d,</div><div class='del'>-0x4b, 0x69, 0x74, 0x61, 0x77, 0x6f, 0x6e, 0x73, 0x61, 0x3b, 0x44, 0x69, 0x66, 0x75, 0x75, 0x2d, 0x186, 0x73, 0x61, 0x6e,</div><div class='del'>-0x64, 0x61, 0x61, 0x3b, 0x46, 0x61, 0x6e, 0x6b, 0x77, 0x61, 0x2d, 0x190, 0x62, 0x254, 0x3b, 0x186, 0x62, 0x25b, 0x73, 0x25b,</div><div class='del'>-0x2d, 0x41, 0x68, 0x69, 0x6e, 0x69, 0x6d, 0x65, 0x3b, 0x186, 0x62, 0x65, 0x72, 0x25b, 0x66, 0x25b, 0x77, 0x2d, 0x4f, 0x62,</div><div class='del'>-0x75, 0x62, 0x75, 0x6f, 0x3b, 0x4d, 0x75, 0x6d, 0x75, 0x2d, 0x186, 0x70, 0x25b, 0x6e, 0x69, 0x6d, 0x62, 0x61, 0x3b, 0x91c,</div><div class='del'>-0x93e, 0x928, 0x947, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e,</div><div class='del'>-0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x90f, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c,</div><div class='del'>-0x941, 0x932, 0x948, 0x3b, 0x913, 0x917, 0x938, 0x94d, 0x91f, 0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x947, 0x902, 0x92c, 0x930, 0x3b,</div><div class='del'>-0x913, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x935, 0x94d, 0x939, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x921, 0x93f,</div><div class='del'>-0x938, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x41, 0x68, 0x61, 0x3b, 0x4f, 0x66, 0x6c, 0x3b, 0x4f, 0x63, 0x68, 0x3b, 0x41, 0x62,</div><div class='del'>-0x65, 0x3b, 0x41, 0x67, 0x62, 0x3b, 0x4f, 0x74, 0x75, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x4d, 0x61, 0x6e, 0x3b, 0x47, 0x62,</div><div class='del'>-0x6f, 0x3b, 0x41, 0x6e, 0x74, 0x3b, 0x41, 0x6c, 0x65, 0x3b, 0x41, 0x66, 0x75, 0x3b, 0x41, 0x68, 0x61, 0x72, 0x61, 0x62,</div><div class='del'>-0x61, 0x74, 0x61, 0x3b, 0x4f, 0x66, 0x6c, 0x6f, 0x3b, 0x4f, 0x63, 0x68, 0x6f, 0x6b, 0x72, 0x69, 0x6b, 0x72, 0x69, 0x3b,</div><div class='del'>-0x41, 0x62, 0x65, 0x69, 0x62, 0x65, 0x65, 0x3b, 0x41, 0x67, 0x62, 0x65, 0x69, 0x6e, 0x61, 0x61, 0x3b, 0x4f, 0x74, 0x75,</div><div class='del'>-0x6b, 0x77, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x4d, 0x61, 0x61, 0x77, 0x65, 0x3b, 0x4d, 0x61, 0x6e, 0x79, 0x61, 0x77, 0x61,</div><div class='del'>-0x6c, 0x65, 0x3b, 0x47, 0x62, 0x6f, 0x3b, 0x41, 0x6e, 0x74, 0x6f, 0x6e, 0x3b, 0x41, 0x6c, 0x65, 0x6d, 0x6c, 0x65, 0x3b,</div><div class='del'>-0x41, 0x66, 0x75, 0x61, 0x62, 0x65, 0x65, 0x3b, 0x4a, 0x65, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x61, 0x3b,</div><div class='del'>-0x45, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x75, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x1ecc, 0x67, 0x1ecd, 0x3b,</div><div class='del'>-0x53, 0x65, 0x70, 0x3b, 0x1ecc, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x65, 0x6e, 0x1ee5,</div><div class='del'>-0x77, 0x61, 0x72, 0x1ecb, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x1ee5, 0x77, 0x61, 0x72, 0x1ecb, 0x3b, 0x4d, 0x61, 0x61, 0x63, 0x68,</div><div class='del'>-0x1ecb, 0x3b, 0x45, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c,</div><div class='del'>-0x61, 0x1ecb, 0x3b, 0x1ecc, 0x67, 0x1ecd, 0x1ecd, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x1ecc,</div><div class='del'>-0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62,</div><div class='del'>-0x61, 0x3b, 0x4d, 0x62, 0x65, 0x3b, 0x4b, 0x65, 0x6c, 0x3b, 0x4b, 0x74, 0x169, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x4b, 0x74,</div><div class='del'>-0x6e, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x4d, 0x6f, 0x6f, 0x3b, 0x4e, 0x79, 0x61, 0x3b, 0x4b, 0x6e, 0x64, 0x3b, 0x128, 0x6b,</div><div class='del'>-0x75, 0x3b, 0x128, 0x6b, 0x6d, 0x3b, 0x128, 0x6b, 0x6c, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x62,</div><div class='del'>-0x65, 0x65, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6c, 0x129, 0x3b, 0x4d, 0x77, 0x61, 0x69,</div><div class='del'>-0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b,</div><div class='del'>-0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d,</div><div class='del'>-0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x74, 0x68, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x61,</div><div class='del'>-0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x75, 0x6f, 0x6e, 0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20,</div><div class='del'>-0x6e, 0x79, 0x61, 0x61, 0x6e, 0x79, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6e, 0x64,</div><div class='del'>-0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x61, 0x69,</div><div class='del'>-0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x129, 0x6d, 0x77, 0x65, 0x3b, 0x4d, 0x77,</div><div class='del'>-0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x6c, 0x129, 0x3b, 0x4d,</div><div class='del'>-0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x128, 0x3b, 0x128,</div><div class='del'>-0x3b, 0x128, 0x3b, 0x70f, 0x71f, 0x722, 0x20, 0x70f, 0x712, 0x3b, 0x72b, 0x712, 0x71b, 0x3b, 0x710, 0x715, 0x72a, 0x3b, 0x722, 0x71d,</div><div class='del'>-0x723, 0x722, 0x3b, 0x710, 0x71d, 0x72a, 0x3b, 0x71a, 0x719, 0x71d, 0x72a, 0x722, 0x3b, 0x72c, 0x721, 0x718, 0x719, 0x3b, 0x710, 0x712,</div><div class='del'>-0x3b, 0x710, 0x71d, 0x720, 0x718, 0x720, 0x3b, 0x70f, 0x72c, 0x72b, 0x20, 0x70f, 0x710, 0x3b, 0x70f, 0x72c, 0x72b, 0x20, 0x70f, 0x712,</div><div class='del'>-0x3b, 0x70f, 0x71f, 0x722, 0x20, 0x70f, 0x710, 0x3b, 0x120d, 0x12f0, 0x1275, 0x3b, 0x12ab, 0x1265, 0x12bd, 0x3b, 0x12ad, 0x1265, 0x120b, 0x3b,</div><div class='del'>-0x134b, 0x1305, 0x12ba, 0x3b, 0x12ad, 0x1262, 0x1245, 0x3b, 0x121d, 0x2f, 0x1275, 0x3b, 0x12b0, 0x122d, 0x3b, 0x121b, 0x122d, 0x12eb, 0x3b, 0x12eb,</div><div class='del'>-0x12b8, 0x1292, 0x3b, 0x1218, 0x1270, 0x1209, 0x3b, 0x121d, 0x2f, 0x121d, 0x3b, 0x1270, 0x1215, 0x1233, 0x3b, 0x120d, 0x12f0, 0x1275, 0x122a, 0x3b,</div><div class='del'>-0x12ab, 0x1265, 0x12bd, 0x1265, 0x1272, 0x3b, 0x12ad, 0x1265, 0x120b, 0x3b, 0x134b, 0x1305, 0x12ba, 0x122a, 0x3b, 0x12ad, 0x1262, 0x1245, 0x122a, 0x3b,</div><div class='del'>-0x121d, 0x12aa, 0x12a4, 0x120d, 0x20, 0x1275, 0x131f, 0x1292, 0x122a, 0x3b, 0x12b0, 0x122d, 0x12a9, 0x3b, 0x121b, 0x122d, 0x12eb, 0x121d, 0x20, 0x1275,</div><div class='del'>-0x122a, 0x3b, 0x12eb, 0x12b8, 0x1292, 0x20, 0x1218, 0x1233, 0x1245, 0x1208, 0x122a, 0x3b, 0x1218, 0x1270, 0x1209, 0x3b, 0x121d, 0x12aa, 0x12a4, 0x120d,</div><div class='del'>-0x20, 0x1218, 0x123d, 0x12c8, 0x122a, 0x3b, 0x1270, 0x1215, 0x1233, 0x1235, 0x122a, 0x3b, 0x120d, 0x3b, 0x12ab, 0x3b, 0x12ad, 0x3b, 0x134b, 0x3b,</div><div class='del'>-0x12ad, 0x3b, 0x121d, 0x3b, 0x12b0, 0x3b, 0x121b, 0x3b, 0x12eb, 0x3b, 0x1218, 0x3b, 0x121d, 0x3b, 0x1270, 0x3b, 0x1320, 0x1210, 0x1228, 0x3b,</div><div class='del'>-0x12a8, 0x1270, 0x1270, 0x3b, 0x1218, 0x1308, 0x1260, 0x3b, 0x12a0, 0x1280, 0x12d8, 0x3b, 0x130d, 0x1295, 0x1263, 0x1275, 0x3b, 0x1220, 0x1295, 0x12e8,</div><div class='del'>-0x3b, 0x1210, 0x1218, 0x1208, 0x3b, 0x1290, 0x1210, 0x1230, 0x3b, 0x12a8, 0x1228, 0x1218, 0x3b, 0x1320, 0x1240, 0x1218, 0x3b, 0x1280, 0x12f0, 0x1228,</div><div class='del'>-0x3b, 0x1280, 0x1220, 0x1220, 0x3b, 0x1320, 0x3b, 0x12a8, 0x3b, 0x1218, 0x3b, 0x12a0, 0x3b, 0x130d, 0x3b, 0x1220, 0x3b, 0x1210, 0x3b, 0x1290,</div><div class='del'>-0x3b, 0x12a8, 0x3b, 0x1320, 0x3b, 0x1280, 0x3b, 0x1280, 0x3b, 0x57, 0x65, 0x79, 0x3b, 0x46, 0x61, 0x6e, 0x3b, 0x54, 0x61, 0x74,</div><div class='del'>-0x3b, 0x4e, 0x61, 0x6e, 0x3b, 0x54, 0x75, 0x79, 0x3b, 0x54, 0x73, 0x6f, 0x3b, 0x54, 0x61, 0x66, 0x3b, 0x57, 0x61, 0x72,</div><div class='del'>-0x3b, 0x4b, 0x75, 0x6e, 0x3b, 0x42, 0x61, 0x6e, 0x3b, 0x4b, 0x6f, 0x6d, 0x3b, 0x53, 0x61, 0x75, 0x3b, 0x46, 0x61, 0x69,</div><div class='del'>-0x20, 0x57, 0x65, 0x79, 0x65, 0x6e, 0x65, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x46, 0x61, 0x6e, 0x69, 0x3b, 0x46, 0x61, 0x69,</div><div class='del'>-0x20, 0x54, 0x61, 0x74, 0x61, 0x6b, 0x61, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x4e, 0x61, 0x6e, 0x67, 0x72, 0x61, 0x3b, 0x46,</div><div class='del'>-0x61, 0x69, 0x20, 0x54, 0x75, 0x79, 0x6f, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x54, 0x73, 0x6f, 0x79, 0x69, 0x3b, 0x46, 0x61,</div><div class='del'>-0x69, 0x20, 0x54, 0x61, 0x66, 0x61, 0x6b, 0x61, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x57, 0x61, 0x72, 0x61, 0x63, 0x68, 0x69,</div><div class='del'>-0x3b, 0x46, 0x61, 0x69, 0x20, 0x4b, 0x75, 0x6e, 0x6f, 0x62, 0x6f, 0x6b, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x42, 0x61, 0x6e,</div><div class='del'>-0x73, 0x6f, 0x6b, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x4b, 0x6f, 0x6d, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x53, 0x61, 0x75, 0x6b,</div><div class='del'>-0x3b, 0x44, 0x79, 0x6f, 0x6e, 0x3b, 0x42, 0x61, 0x61, 0x3b, 0x41, 0x74, 0x61, 0x74, 0x3b, 0x41, 0x6e, 0x61, 0x73, 0x3b,</div><div class='del'>-0x41, 0x74, 0x79, 0x6f, 0x3b, 0x41, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x74, 0x61, 0x72, 0x3b, 0x41, 0x77, 0x75, 0x72, 0x3b,</div><div class='del'>-0x53, 0x68, 0x61, 0x64, 0x3b, 0x53, 0x68, 0x61, 0x6b, 0x3b, 0x4e, 0x61, 0x62, 0x61, 0x3b, 0x4e, 0x61, 0x74, 0x61, 0x3b,</div><div class='del'>-0x50, 0x65, 0x6e, 0x20, 0x44, 0x79, 0x6f, 0x6e, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x42, 0x61, 0x27, 0x61, 0x3b, 0x50, 0x65,</div><div class='del'>-0x6e, 0x20, 0x41, 0x74, 0x61, 0x74, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x6e, 0x61, 0x73, 0x3b, 0x50, 0x65, 0x6e, 0x20,</div><div class='del'>-0x41, 0x74, 0x79, 0x6f, 0x6e, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x63, 0x68, 0x69, 0x72, 0x69, 0x6d, 0x3b, 0x50, 0x65,</div><div class='del'>-0x6e, 0x20, 0x41, 0x74, 0x61, 0x72, 0x69, 0x62, 0x61, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x77, 0x75, 0x72, 0x72, 0x3b,</div><div class='del'>-0x50, 0x65, 0x6e, 0x20, 0x53, 0x68, 0x61, 0x64, 0x6f, 0x6e, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x53, 0x68, 0x61, 0x6b, 0x75,</div><div class='del'>-0x72, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x4b, 0x75, 0x72, 0x20, 0x4e, 0x61, 0x62, 0x61, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x4b,</div><div class='del'>-0x75, 0x72, 0x20, 0x4e, 0x61, 0x74, 0x61, 0x74, 0x3b, 0x41, 0x331, 0x79, 0x72, 0x3b, 0x41, 0x331, 0x68, 0x77, 0x3b, 0x41,</div><div class='del'>-0x331, 0x74, 0x61, 0x3b, 0x41, 0x331, 0x6e, 0x61, 0x3b, 0x41, 0x331, 0x70, 0x66, 0x3b, 0x41, 0x331, 0x6b, 0x69, 0x3b, 0x41,</div><div class='del'>-0x331, 0x74, 0x79, 0x3b, 0x41, 0x331, 0x6e, 0x69, 0x3b, 0x41, 0x331, 0x6b, 0x75, 0x3b, 0x53, 0x77, 0x61, 0x3b, 0x53, 0x62,</div><div class='del'>-0x79, 0x3b, 0x53, 0x62, 0x68, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x79, 0x72, 0x6e, 0x69, 0x67, 0x3b,</div><div class='del'>-0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x68, 0x77, 0x61, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331,</div><div class='del'>-0x74, 0x61, 0x74, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x6e, 0x61, 0x61, 0x69, 0x3b, 0x48, 0x79, 0x77,</div><div class='del'>-0x61, 0x6e, 0x20, 0x41, 0x331, 0x70, 0x66, 0x77, 0x6f, 0x6e, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x6b,</div><div class='del'>-0x69, 0x74, 0x61, 0x74, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x74, 0x79, 0x69, 0x72, 0x69, 0x6e, 0x3b,</div><div class='del'>-0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x6e, 0x69, 0x6e, 0x61, 0x69, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20,</div><div class='del'>-0x41, 0x331, 0x6b, 0x75, 0x6d, 0x76, 0x69, 0x72, 0x69, 0x79, 0x69, 0x6e, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x53,</div><div class='del'>-0x77, 0x61, 0x6b, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x53, 0x77, 0x61, 0x6b, 0x20, 0x42, 0x27, 0x61, 0x331, 0x79,</div><div class='del'>-0x72, 0x6e, 0x69, 0x67, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x53, 0x77, 0x61, 0x6b, 0x20, 0x42, 0x27, 0x61, 0x331,</div><div class='del'>-0x68, 0x77, 0x61, 0x3b, 0x5a, 0x65, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x76, 0x72, 0x3b,</div><div class='del'>-0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x67, 0x3b, 0x4c, 0x75, 0x69, 0x3b, 0x41, 0x76, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b,</div><div class='del'>-0x4f, 0x74, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x63, 0x3b, 0x5a, 0x65, 0x6e, 0xe2, 0x72, 0x3b, 0x46, 0x65,</div><div class='del'>-0x76, 0x72, 0xe2, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0xe7, 0x3b, 0x41, 0x76, 0x72, 0xee, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b,</div><div class='del'>-0x4a, 0x75, 0x67, 0x6e, 0x3b, 0x4c, 0x75, 0x69, 0x3b, 0x41, 0x76, 0x6f, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d,</div><div class='del'>-0x62, 0x61, 0x72, 0x3b, 0x4f, 0x74, 0x75, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b,</div><div class='del'>-0x44, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x5a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a,</div><div class='del'>-0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x50, 0x68, 0x61, 0x3b, 0x4c, 0x75, 0x68,</div><div class='del'>-0x3b, 0x1e70, 0x68, 0x61, 0x3b, 0x4c, 0x61, 0x6d, 0x3b, 0x53, 0x68, 0x75, 0x3b, 0x4c, 0x77, 0x69, 0x3b, 0x4c, 0x77, 0x61,</div><div class='del'>-0x3b, 0x1e70, 0x68, 0x61, 0x3b, 0x4b, 0x68, 0x75, 0x3b, 0x54, 0x73, 0x68, 0x3b, 0x1e3c, 0x61, 0x72, 0x3b, 0x4e, 0x79, 0x65,</div><div class='del'>-0x3b, 0x50, 0x68, 0x61, 0x6e, 0x64, 0x6f, 0x3b, 0x4c, 0x75, 0x68, 0x75, 0x68, 0x69, 0x3b, 0x1e70, 0x68, 0x61, 0x66, 0x61,</div><div class='del'>-0x6d, 0x75, 0x68, 0x77, 0x65, 0x3b, 0x4c, 0x61, 0x6d, 0x62, 0x61, 0x6d, 0x61, 0x69, 0x3b, 0x53, 0x68, 0x75, 0x6e, 0x64,</div><div class='del'>-0x75, 0x6e, 0x74, 0x68, 0x75, 0x6c, 0x65, 0x3b, 0x46, 0x75, 0x6c, 0x77, 0x69, 0x3b, 0x46, 0x75, 0x6c, 0x77, 0x61, 0x6e,</div><div class='del'>-0x61, 0x3b, 0x1e70, 0x68, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x65, 0x3b, 0x4b, 0x68, 0x75, 0x62, 0x76, 0x75, 0x6d, 0x65, 0x64,</div><div class='del'>-0x7a, 0x69, 0x3b, 0x54, 0x73, 0x68, 0x69, 0x6d, 0x65, 0x64, 0x7a, 0x69, 0x3b, 0x1e3c, 0x61, 0x72, 0x61, 0x3b, 0x4e, 0x79,</div><div class='del'>-0x65, 0x6e, 0x64, 0x61, 0x76, 0x68, 0x75, 0x73, 0x69, 0x6b, 0x75, 0x3b, 0x44, 0x7a, 0x76, 0x3b, 0x44, 0x7a, 0x64, 0x3b,</div><div class='del'>-0x54, 0x65, 0x64, 0x3b, 0x41, 0x66, 0x254, 0x3b, 0x44, 0x61, 0x6d, 0x3b, 0x4d, 0x61, 0x73, 0x3b, 0x53, 0x69, 0x61, 0x3b,</div><div class='del'>-0x44, 0x65, 0x61, 0x3b, 0x41, 0x6e, 0x79, 0x3b, 0x4b, 0x65, 0x6c, 0x3b, 0x41, 0x64, 0x65, 0x3b, 0x44, 0x7a, 0x6d, 0x3b,</div><div class='del'>-0x44, 0x7a, 0x6f, 0x76, 0x65, 0x3b, 0x44, 0x7a, 0x6f, 0x64, 0x7a, 0x65, 0x3b, 0x54, 0x65, 0x64, 0x6f, 0x78, 0x65, 0x3b,</div><div class='del'>-0x41, 0x66, 0x254, 0x66, 0x69, 0x25b, 0x3b, 0x44, 0x61, 0x6d, 0x61, 0x3b, 0x4d, 0x61, 0x73, 0x61, 0x3b, 0x53, 0x69, 0x61,</div><div class='del'>-0x6d, 0x6c, 0x254, 0x6d, 0x3b, 0x44, 0x65, 0x61, 0x73, 0x69, 0x61, 0x6d, 0x69, 0x6d, 0x65, 0x3b, 0x41, 0x6e, 0x79, 0x254,</div><div class='del'>-0x6e, 0x79, 0x254, 0x3b, 0x4b, 0x65, 0x6c, 0x65, 0x3b, 0x41, 0x64, 0x65, 0x25b, 0x6d, 0x65, 0x6b, 0x70, 0x254, 0x78, 0x65,</div><div class='del'>-0x3b, 0x44, 0x7a, 0x6f, 0x6d, 0x65, 0x3b, 0x44, 0x3b, 0x44, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x44, 0x3b, 0x4d, 0x3b, 0x53,</div><div class='del'>-0x3b, 0x44, 0x3b, 0x41, 0x3b, 0x4b, 0x3b, 0x41, 0x3b, 0x44, 0x3b, 0x49, 0x61, 0x6e, 0x2e, 0x3b, 0x50, 0x65, 0x70, 0x2e,</div><div class='del'>-0x3b, 0x4d, 0x61, 0x6c, 0x2e, 0x3b, 0x2bb, 0x41, 0x70, 0x2e, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x49, 0x75, 0x6e, 0x2e, 0x3b,</div><div class='del'>-0x49, 0x75, 0x6c, 0x2e, 0x3b, 0x2bb, 0x41, 0x75, 0x2e, 0x3b, 0x4b, 0x65, 0x70, 0x2e, 0x3b, 0x2bb, 0x4f, 0x6b, 0x2e, 0x3b,</div><div class='del'>-0x4e, 0x6f, 0x77, 0x2e, 0x3b, 0x4b, 0x65, 0x6b, 0x2e, 0x3b, 0x49, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x50, 0x65,</div><div class='del'>-0x70, 0x65, 0x6c, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x6b, 0x69, 0x3b, 0x2bb, 0x41, 0x70, 0x65, 0x6c,</div><div class='del'>-0x69, 0x6c, 0x61, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x49, 0x75, 0x6e, 0x65, 0x3b, 0x49, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x2bb,</div><div class='del'>-0x41, 0x75, 0x6b, 0x61, 0x6b, 0x65, 0x3b, 0x4b, 0x65, 0x70, 0x61, 0x6b, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x2bb, 0x4f,</div><div class='del'>-0x6b, 0x61, 0x6b, 0x6f, 0x70, 0x61, 0x3b, 0x4e, 0x6f, 0x77, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x4b, 0x65, 0x6b, 0x65,</div><div class='del'>-0x6d, 0x61, 0x70, 0x61, 0x3b, 0x4a, 0x75, 0x77, 0x3b, 0x53, 0x77, 0x69, 0x3b, 0x54, 0x73, 0x61, 0x3b, 0x4e, 0x79, 0x61,</div><div class='del'>-0x3b, 0x54, 0x73, 0x77, 0x3b, 0x41, 0x74, 0x61, 0x3b, 0x41, 0x6e, 0x61, 0x3b, 0x41, 0x72, 0x69, 0x3b, 0x41, 0x6b, 0x75,</div><div class='del'>-0x3b, 0x53, 0x77, 0x61, 0x3b, 0x4d, 0x61, 0x6e, 0x3b, 0x4d, 0x61, 0x73, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x4a, 0x75,</div><div class='del'>-0x77, 0x75, 0x6e, 0x67, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x53, 0x77, 0x69, 0x79, 0x61, 0x6e, 0x67, 0x3b, 0x5a, 0x77,</div><div class='del'>-0x61, 0x74, 0x20, 0x54, 0x73, 0x61, 0x74, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x4e, 0x79, 0x61, 0x69, 0x3b, 0x5a, 0x77,</div><div class='del'>-0x61, 0x74, 0x20, 0x54, 0x73, 0x77, 0x6f, 0x6e, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x41, 0x74, 0x61, 0x61, 0x68, 0x3b,</div><div class='del'>-0x5a, 0x77, 0x61, 0x74, 0x20, 0x41, 0x6e, 0x61, 0x74, 0x61, 0x74, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x41, 0x72, 0x69,</div><div class='del'>-0x6e, 0x61, 0x69, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x41, 0x6b, 0x75, 0x62, 0x75, 0x6e, 0x79, 0x75, 0x6e, 0x67, 0x3b,</div><div class='del'>-0x5a, 0x77, 0x61, 0x74, 0x20, 0x53, 0x77, 0x61, 0x67, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x4d, 0x61, 0x6e, 0x67, 0x6a,</div><div class='del'>-0x75, 0x77, 0x61, 0x6e, 0x67, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x53, 0x77, 0x61, 0x67, 0x2d, 0x4d, 0x61, 0x2d, 0x53,</div><div class='del'>-0x75, 0x79, 0x61, 0x6e, 0x67, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x6c, 0x3b, 0x45, 0x70,</div><div class='del'>-0x75, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x61, 0x3b, 0x53, 0x65,</div><div class='del'>-0x70, 0x3b, 0x4f, 0x6b, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x77, 0x61,</div><div class='del'>-0x6c, 0x65, 0x3b, 0x46, 0x65, 0x62, 0x75, 0x6c, 0x75, 0x77, 0x61, 0x6c, 0x65, 0x3b, 0x4d, 0x61, 0x6c, 0x69, 0x63, 0x68,</div><div class='del'>-0x69, 0x3b, 0x45, 0x70, 0x75, 0x6c, 0x6f, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c,</div><div class='del'>-0x61, 0x69, 0x3b, 0x4f, 0x67, 0x61, 0x73, 0x69, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x75, 0x74, 0x65, 0x6d, 0x62, 0x61,</div><div class='del'>-0x3b, 0x4f, 0x6b, 0x75, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73,</div><div class='del'>-0x65, 0x6d, 0x62, 0x61, 0x3b, 0x45, 0x6e, 0x65, 0x3b, 0x50, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72,</div><div class='del'>-0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48, 0x75, 0x6e, 0x3b, 0x48, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74,</div><div class='del'>-0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x45, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x50,</div><div class='del'>-0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d,</div><div class='del'>-0x61, 0x79, 0x6f, 0x3b, 0x48, 0x75, 0x6e, 0x79, 0x6f, 0x3b, 0x48, 0x75, 0x6c, 0x79, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73,</div><div class='del'>-0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x4f, 0x6b, 0x74, 0x75, 0x62, 0x72, 0x65,</div><div class='del'>-0x3b, 0x4e, 0x6f, 0x62, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x44, 0x69, 0x73, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65,</div><div class='del'>-0x3b, 0x45, 0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x48, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f,</div><div class='del'>-0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0xe4, 0x72, 0x3b, 0x41, 0x70, 0x72,</div><div class='del'>-0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70,</div><div class='del'>-0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b,</div><div class='del'>-0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d,</div><div class='del'>-0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x63, 0x68,</div><div class='del'>-0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x65, 0x72,</div><div class='del'>-0x3b, 0x4e, 0x6f, 0x76, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0xa2cd,</div><div class='del'>-0xa1aa, 0x3b, 0xa44d, 0xa1aa, 0x3b, 0xa315, 0xa1aa, 0x3b, 0xa1d6, 0xa1aa, 0x3b, 0xa26c, 0xa1aa, 0x3b, 0xa0d8, 0xa1aa, 0x3b, 0xa3c3, 0xa1aa, 0x3b,</div><div class='del'>-0xa246, 0xa1aa, 0x3b, 0xa22c, 0xa1aa, 0x3b, 0xa2b0, 0xa1aa, 0x3b, 0xa2b0, 0xa2aa, 0xa1aa, 0x3b, 0xa2b0, 0xa44b, 0xa1aa, 0x3b, 0x4a, 0x61, 0x6e,</div><div class='del'>-0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e,</div><div class='del'>-0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x72, 0x68, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x55, 0x73, 0x69,</div><div class='del'>-0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x61, 0x62, 0x61, 0x72, 0x69, 0x3b, 0x75, 0x46, 0x65, 0x62, 0x65, 0x72,</div><div class='del'>-0x62, 0x61, 0x72, 0x69, 0x3b, 0x75, 0x4d, 0x61, 0x74, 0x6a, 0x68, 0x69, 0x3b, 0x75, 0x2d, 0x41, 0x70, 0x72, 0x65, 0x6c,</div><div class='add'>+0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f,</div><div class='add'>+0x3b, 0x58, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x58, 0x3b, 0x58, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f,</div><div class='add'>+0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x10d8, 0x10d0, 0x10dc, 0x3b, 0x10d7, 0x10d4, 0x10d1, 0x3b, 0x10db, 0x10d0, 0x10e0, 0x3b, 0x10d0, 0x10de, 0x10e0,</div><div class='add'>+0x3b, 0x10db, 0x10d0, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10dc, 0x3b, 0x10d8, 0x10d5, 0x10da, 0x3b, 0x10d0, 0x10d2, 0x10d5, 0x3b, 0x10e1, 0x10d4, 0x10e5,</div><div class='add'>+0x3b, 0x10dd, 0x10e5, 0x10e2, 0x3b, 0x10dc, 0x10dd, 0x10d4, 0x3b, 0x10d3, 0x10d4, 0x10d9, 0x3b, 0x10d8, 0x10d0, 0x10dc, 0x10d5, 0x10d0, 0x10e0, 0x10d8,</div><div class='add'>+0x3b, 0x10d7, 0x10d4, 0x10d1, 0x10d4, 0x10e0, 0x10d5, 0x10d0, 0x10da, 0x10d8, 0x3b, 0x10db, 0x10d0, 0x10e0, 0x10e2, 0x10d8, 0x3b, 0x10d0, 0x10de, 0x10e0,</div><div class='add'>+0x10d8, 0x10da, 0x10d8, 0x3b, 0x10db, 0x10d0, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10dc, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10da,</div><div class='add'>+0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d0, 0x10d2, 0x10d5, 0x10d8, 0x10e1, 0x10e2, 0x10dd, 0x3b, 0x10e1, 0x10d4, 0x10e5, 0x10e2, 0x10d4, 0x10db, 0x10d1, 0x10d4,</div><div class='add'>+0x10e0, 0x10d8, 0x3b, 0x10dd, 0x10e5, 0x10e2, 0x10dd, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10dc, 0x10dd, 0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0,</div><div class='add'>+0x10d8, 0x3b, 0x10d3, 0x10d4, 0x10d9, 0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10d8, 0x3b, 0x10d7, 0x3b, 0x10db, 0x3b, 0x10d0, 0x3b,</div><div class='add'>+0x10db, 0x3b, 0x10d8, 0x3b, 0x10d8, 0x3b, 0x10d0, 0x3b, 0x10e1, 0x3b, 0x10dd, 0x3b, 0x10dc, 0x3b, 0x10d3, 0x3b, 0x4a, 0x61, 0x6e, 0x3b,</div><div class='add'>+0x46, 0x65, 0x62, 0x3b, 0x4d, 0xe4, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b,</div><div class='add'>+0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b,</div><div class='add'>+0x44, 0x65, 0x7a, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d,</div><div class='add'>+0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a,</div><div class='add'>+0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72,</div><div class='add'>+0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65,</div><div class='add'>+0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0xe4, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0xe4, 0x72, 0x3b, 0x41,</div><div class='add'>+0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53,</div><div class='add'>+0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a, 0xe4, 0x6e, 0x6e, 0x65,</div><div class='add'>+0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c,</div><div class='add'>+0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73,</div><div class='add'>+0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b,</div><div class='add'>+0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x399, 0x3b1,</div><div class='add'>+0x3bd, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3b, 0x39c, 0x3b1, 0x3c1, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3b, 0x39c, 0x3b1, 0x3ca, 0x3b, 0x399, 0x3bf,</div><div class='add'>+0x3c5, 0x3bd, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bb, 0x3b, 0x391, 0x3c5, 0x3b3, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3b,</div><div class='add'>+0x39d, 0x3bf, 0x3b5, 0x3b, 0x394, 0x3b5, 0x3ba, 0x3b, 0x399, 0x3b1, 0x3bd, 0x3bf, 0x3c5, 0x3b1, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x3a6,</div><div class='add'>+0x3b5, 0x3b2, 0x3c1, 0x3bf, 0x3c5, 0x3b1, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39c, 0x3b1, 0x3c1, 0x3c4, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x391,</div><div class='add'>+0x3c0, 0x3c1, 0x3b9, 0x3bb, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39c, 0x3b1, 0x390, 0x3bf, 0x3c5, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bd, 0x3af, 0x3bf,</div><div class='add'>+0x3c5, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bb, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x391, 0x3c5, 0x3b3, 0x3bf, 0x3cd, 0x3c3, 0x3c4, 0x3bf, 0x3c5, 0x3b,</div><div class='add'>+0x3a3, 0x3b5, 0x3c0, 0x3c4, 0x3b5, 0x3bc, 0x3b2, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3c9, 0x3b2, 0x3c1, 0x3af, 0x3bf,</div><div class='add'>+0x3c5, 0x3b, 0x39d, 0x3bf, 0x3b5, 0x3bc, 0x3b2, 0x3c1, 0x3af, 0x3bf, 0x3c5, 0x3b, 0x394, 0x3b5, 0x3ba, 0x3b5, 0x3bc, 0x3b2, 0x3c1, 0x3af,</div><div class='add'>+0x3bf, 0x3c5, 0x3b, 0x399, 0x3b, 0x3a6, 0x3b, 0x39c, 0x3b, 0x391, 0x3b, 0x39c, 0x3b, 0x399, 0x3b, 0x399, 0x3b, 0x391, 0x3b, 0x3a3,</div><div class='add'>+0x3b, 0x39f, 0x3b, 0x39d, 0x3b, 0x394, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61,</div><div class='add'>+0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73,</div><div class='add'>+0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61,</div><div class='add'>+0x72, 0x69, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x69, 0x3b, 0x61,</div><div class='add'>+0x70, 0x72, 0x69, 0x6c, 0x69, 0x3b, 0x6d, 0x61, 0x6a, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69,</div><div class='add'>+0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x69, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72,</div><div class='add'>+0x69, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x69, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x69,</div><div class='add'>+0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x69, 0x3b, 0xa9c, 0xabe, 0xaa8, 0xacd, 0xaaf, 0xac1, 0x3b, 0xaab, 0xac7,</div><div class='add'>+0xaac, 0xacd, 0xab0, 0xac1, 0x3b, 0xaae, 0xabe, 0xab0, 0xacd, 0xa9a, 0x3b, 0xa8f, 0xaaa, 0xacd, 0xab0, 0xabf, 0xab2, 0x3b, 0xaae, 0xac7,</div><div class='add'>+0x3b, 0xa9c, 0xac2, 0xaa8, 0x3b, 0xa9c, 0xac1, 0xab2, 0xabe, 0xa88, 0x3b, 0xa91, 0xa97, 0xab8, 0xacd, 0xa9f, 0x3b, 0xab8, 0xaaa, 0xacd,</div><div class='add'>+0xa9f, 0xac7, 0x3b, 0xa91, 0xa95, 0xacd, 0xa9f, 0xacb, 0x3b, 0xaa8, 0xab5, 0xac7, 0x3b, 0xaa1, 0xabf, 0xab8, 0xac7, 0x3b, 0xa9c, 0xabe,</div><div class='add'>+0xaa8, 0xacd, 0xaaf, 0xac1, 0xa86, 0xab0, 0xac0, 0x3b, 0xaab, 0xac7, 0xaac, 0xacd, 0xab0, 0xac1, 0xa86, 0xab0, 0xac0, 0x3b, 0xaae, 0xabe,</div><div class='add'>+0xab0, 0xacd, 0xa9a, 0x3b, 0xa8f, 0xaaa, 0xacd, 0xab0, 0xabf, 0xab2, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0xaa8, 0x3b, 0xa9c, 0xac1,</div><div class='add'>+0xab2, 0xabe, 0xa88, 0x3b, 0xa91, 0xa97, 0xab8, 0xacd, 0xa9f, 0x3b, 0xab8, 0xaaa, 0xacd, 0xa9f, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b,</div><div class='add'>+0xa91, 0xa95, 0xacd, 0xa9f, 0xacd, 0xaac, 0xab0, 0x3b, 0xaa8, 0xab5, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xaa1, 0xabf, 0xab8, 0xac7,</div><div class='add'>+0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xa9c, 0xabe, 0x3b, 0xaab, 0xac7, 0x3b, 0xaae, 0xabe, 0x3b, 0xa8f, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c,</div><div class='add'>+0xac2, 0x3b, 0xa9c, 0xac1, 0x3b, 0xa91, 0x3b, 0xab8, 0x3b, 0xa91, 0x3b, 0xaa8, 0x3b, 0xaa1, 0xabf, 0x3b, 0x4a, 0x61, 0x6e, 0x3b,</div><div class='add'>+0x46, 0x61, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x66, 0x69, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b,</div><div class='add'>+0x59, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x75, 0x3b, 0x53, 0x61, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x75, 0x77, 0x3b,</div><div class='add'>+0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x61, 0x69, 0x72, 0x75, 0x3b, 0x46, 0x61, 0x62, 0x75, 0x72, 0x61, 0x69, 0x72,</div><div class='add'>+0x75, 0x3b, 0x4d, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x41, 0x66, 0x69, 0x72, 0x69, 0x6c, 0x75, 0x3b, 0x4d, 0x61, 0x79, 0x75,</div><div class='add'>+0x3b, 0x59, 0x75, 0x6e, 0x69, 0x3b, 0x59, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x53, 0x61,</div><div class='add'>+0x74, 0x75, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x75, 0x77, 0x61, 0x6d, 0x62, 0x61,</div><div class='add'>+0x3b, 0x44, 0x69, 0x73, 0x61, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x59,</div><div class='add'>+0x3b, 0x59, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x62c, 0x64e, 0x646, 0x3b, 0x6a2, 0x64e, 0x628,</div><div class='add'>+0x3b, 0x645, 0x64e, 0x631, 0x3b, 0x623, 0x64e, 0x6a2, 0x652, 0x631, 0x3b, 0x645, 0x64e, 0x64a, 0x3b, 0x64a, 0x64f, 0x648, 0x646, 0x3b,</div><div class='add'>+0x64a, 0x64f, 0x648, 0x644, 0x3b, 0x623, 0x64e, 0x63a, 0x64f, 0x3b, 0x633, 0x64e, 0x62a, 0x3b, 0x623, 0x64f, 0x643, 0x652, 0x62a, 0x3b,</div><div class='add'>+0x646, 0x64f, 0x648, 0x3b, 0x62f, 0x650, 0x633, 0x3b, 0x62c, 0x64e, 0x646, 0x64e, 0x64a, 0x652, 0x631, 0x64f, 0x3b, 0x6a2, 0x64e, 0x628,</div><div class='add'>+0x652, 0x631, 0x64e, 0x64a, 0x652, 0x631, 0x64f, 0x3b, 0x645, 0x64e, 0x631, 0x650, 0x633, 0x652, 0x3b, 0x623, 0x64e, 0x6a2, 0x652, 0x631,</div><div class='add'>+0x650, 0x644, 0x64f, 0x3b, 0x645, 0x64e, 0x64a, 0x64f, 0x3b, 0x64a, 0x64f, 0x648, 0x646, 0x650, 0x3b, 0x64a, 0x64f, 0x648, 0x644, 0x650,</div><div class='add'>+0x3b, 0x623, 0x64e, 0x63a, 0x64f, 0x633, 0x652, 0x62a, 0x64e, 0x3b, 0x633, 0x64e, 0x62a, 0x64f, 0x645, 0x652, 0x628, 0x64e, 0x3b, 0x623,</div><div class='add'>+0x64f, 0x643, 0x652, 0x62a, 0x648, 0x64f, 0x628, 0x64e, 0x3b, 0x646, 0x64f, 0x648, 0x64e, 0x645, 0x652, 0x628, 0x64e, 0x3b, 0x62f, 0x650,</div><div class='add'>+0x633, 0x64e, 0x645, 0x652, 0x628, 0x64e, 0x3b, 0x5d9, 0x5e0, 0x5d5, 0x3b, 0x5e4, 0x5d1, 0x5e8, 0x3b, 0x5de, 0x5e8, 0x5e1, 0x3b, 0x5d0,</div><div class='add'>+0x5e4, 0x5e8, 0x3b, 0x5de, 0x5d0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x3b, 0x5d9, 0x5d5, 0x5dc, 0x3b, 0x5d0, 0x5d5, 0x5d2, 0x3b, 0x5e1,</div><div class='add'>+0x5e4, 0x5d8, 0x3b, 0x5d0, 0x5d5, 0x5e7, 0x3b, 0x5e0, 0x5d5, 0x5d1, 0x3b, 0x5d3, 0x5e6, 0x5de, 0x3b, 0x5d9, 0x5e0, 0x5d5, 0x5d0, 0x5e8,</div><div class='add'>+0x3b, 0x5e4, 0x5d1, 0x5e8, 0x5d5, 0x5d0, 0x5e8, 0x3b, 0x5de, 0x5e8, 0x5e1, 0x3b, 0x5d0, 0x5e4, 0x5e8, 0x5d9, 0x5dc, 0x3b, 0x5de, 0x5d0,</div><div class='add'>+0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dc, 0x5d9, 0x3b, 0x5d0, 0x5d5, 0x5d2, 0x5d5, 0x5e1, 0x5d8, 0x3b, 0x5e1,</div><div class='add'>+0x5e4, 0x5d8, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x5d0, 0x5d5, 0x5e7, 0x5d8, 0x5d5, 0x5d1, 0x5e8, 0x3b, 0x5e0, 0x5d5, 0x5d1, 0x5de, 0x5d1, 0x5e8,</div><div class='add'>+0x3b, 0x5d3, 0x5e6, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x91c, 0x928, 0x935, 0x930, 0x940, 0x3b, 0x92b, 0x930, 0x935, 0x930, 0x940, 0x3b, 0x92e,</div><div class='add'>+0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x948, 0x932, 0x3b, 0x92e, 0x908, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c,</div><div class='add'>+0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917, 0x938, 0x94d, 0x924, 0x3b, 0x938, 0x93f, 0x924, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x905,</div><div class='add'>+0x915, 0x94d, 0x924, 0x942, 0x92c, 0x930, 0x3b, 0x928, 0x935, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x926, 0x93f, 0x938, 0x92e, 0x94d, 0x92c,</div><div class='add'>+0x930, 0x3b, 0x91c, 0x3b, 0x92b, 0x93c, 0x3b, 0x92e, 0x93e, 0x3b, 0x905, 0x3b, 0x92e, 0x3b, 0x91c, 0x942, 0x3b, 0x91c, 0x941, 0x3b,</div><div class='add'>+0x905, 0x3b, 0x938, 0x93f, 0x3b, 0x905, 0x3b, 0x928, 0x3b, 0x926, 0x93f, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62,</div><div class='add'>+0x72, 0x2e, 0x3b, 0x6d, 0xe1, 0x72, 0x63, 0x2e, 0x3b, 0xe1, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0xe1, 0x6a, 0x2e, 0x3b, 0x6a,</div><div class='add'>+0xfa, 0x6e, 0x2e, 0x3b, 0x6a, 0xfa, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x7a, 0x65, 0x70, 0x74, 0x2e,</div><div class='add'>+0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75,</div><div class='add'>+0xe1, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1, 0x72, 0x3b, 0x6d, 0xe1, 0x72, 0x63, 0x69, 0x75, 0x73, 0x3b, 0xe1,</div><div class='add'>+0x70, 0x72, 0x69, 0x6c, 0x69, 0x73, 0x3b, 0x6d, 0xe1, 0x6a, 0x75, 0x73, 0x3b, 0x6a, 0xfa, 0x6e, 0x69, 0x75, 0x73, 0x3b,</div><div class='add'>+0x6a, 0xfa, 0x6c, 0x69, 0x75, 0x73, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x7a, 0x74, 0x75, 0x73, 0x3b, 0x73, 0x7a, 0x65,</div><div class='add'>+0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65,</div><div class='add'>+0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b,</div><div class='add'>+0xc1, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x7a, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6a,</div><div class='add'>+0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0xed, 0x3b, 0x6a,</div><div class='add'>+0xfa, 0x6e, 0x3b, 0x6a, 0xfa, 0x6c, 0x3b, 0xe1, 0x67, 0xfa, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e,</div><div class='add'>+0xf3, 0x76, 0x3b, 0x64, 0x65, 0x73, 0x3b, 0x6a, 0x61, 0x6e, 0xfa, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0xfa, 0x61,</div><div class='add'>+0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d, 0x61, 0xed, 0x3b, 0x6a, 0xfa, 0x6e,</div><div class='add'>+0xed, 0x3b, 0x6a, 0xfa, 0x6c, 0xed, 0x3b, 0xe1, 0x67, 0xfa, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62,</div><div class='add'>+0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0xf3, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,</div><div class='add'>+0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a,</div><div class='add'>+0x3b, 0x4a, 0x3b, 0xc1, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62,</div><div class='add'>+0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c,</div><div class='add'>+0x3b, 0x41, 0x67, 0x75, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73,</div><div class='add'>+0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61,</div><div class='add'>+0x72, 0x65, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a,</div><div class='add'>+0x75, 0x6c, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65,</div><div class='add'>+0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44,</div><div class='add'>+0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x45, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x61, 0x62, 0x68, 0x3b, 0x4d, 0xe1,</div><div class='add'>+0x72, 0x74, 0x61, 0x3b, 0x41, 0x69, 0x62, 0x3b, 0x42, 0x65, 0x61, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x74, 0x68, 0x3b, 0x49,</div><div class='add'>+0xfa, 0x69, 0x6c, 0x3b, 0x4c, 0xfa, 0x6e, 0x3b, 0x4d, 0x46, 0xf3, 0x6d, 0x68, 0x3b, 0x44, 0x46, 0xf3, 0x6d, 0x68, 0x3b,</div><div class='add'>+0x53, 0x61, 0x6d, 0x68, 0x3b, 0x4e, 0x6f, 0x6c, 0x6c, 0x3b, 0x45, 0x61, 0x6e, 0xe1, 0x69, 0x72, 0x3b, 0x46, 0x65, 0x61,</div><div class='add'>+0x62, 0x68, 0x72, 0x61, 0x3b, 0x4d, 0xe1, 0x72, 0x74, 0x61, 0x3b, 0x41, 0x69, 0x62, 0x72, 0x65, 0xe1, 0x6e, 0x3b, 0x42,</div><div class='add'>+0x65, 0x61, 0x6c, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x3b, 0x4d, 0x65, 0x69, 0x74, 0x68, 0x65, 0x61, 0x6d, 0x68, 0x3b, 0x49,</div><div class='add'>+0xfa, 0x69, 0x6c, 0x3b, 0x4c, 0xfa, 0x6e, 0x61, 0x73, 0x61, 0x3b, 0x4d, 0x65, 0xe1, 0x6e, 0x20, 0x46, 0xf3, 0x6d, 0x68,</div><div class='add'>+0x61, 0x69, 0x72, 0x3b, 0x44, 0x65, 0x69, 0x72, 0x65, 0x61, 0x64, 0x68, 0x20, 0x46, 0xf3, 0x6d, 0x68, 0x61, 0x69, 0x72,</div><div class='add'>+0x3b, 0x53, 0x61, 0x6d, 0x68, 0x61, 0x69, 0x6e, 0x3b, 0x4e, 0x6f, 0x6c, 0x6c, 0x61, 0x69, 0x67, 0x3b, 0x45, 0x3b, 0x46,</div><div class='add'>+0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x42, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x4e,</div><div class='add'>+0x3b, 0x67, 0x65, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x67,</div><div class='add'>+0x3b, 0x67, 0x69, 0x75, 0x3b, 0x6c, 0x75, 0x67, 0x3b, 0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x3b, 0x6f, 0x74, 0x74,</div><div class='add'>+0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x69, 0x63, 0x3b, 0x67, 0x65, 0x6e, 0x6e, 0x61, 0x69, 0x6f, 0x3b, 0x66, 0x65, 0x62,</div><div class='add'>+0x62, 0x72, 0x61, 0x69, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x65, 0x3b, 0x6d,</div><div class='add'>+0x61, 0x67, 0x67, 0x69, 0x6f, 0x3b, 0x67, 0x69, 0x75, 0x67, 0x6e, 0x6f, 0x3b, 0x6c, 0x75, 0x67, 0x6c, 0x69, 0x6f, 0x3b,</div><div class='add'>+0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x74, 0x74,</div><div class='add'>+0x6f, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x69, 0x63, 0x65, 0x6d, 0x62,</div><div class='add'>+0x72, 0x65, 0x3b, 0x47, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53,</div><div class='add'>+0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0xc9c, 0xca8, 0xcb5, 0xcb0, 0xcc0, 0x3b, 0xcab, 0xcc6, 0xcac, 0xccd, 0xcb0, 0xcb5, 0xcb0,</div><div class='add'>+0xcc0, 0x3b, 0xcae, 0xcbe, 0xcb0, 0xccd, 0xc9a, 0xccd, 0x3b, 0xc8e, 0xcaa, 0xccd, 0xcb0, 0xcbf, 0xcb2, 0xccd, 0x3b, 0xcae, 0xcc6, 0x3b,</div><div class='add'>+0xc9c, 0xcc2, 0xca8, 0xccd, 0x3b, 0xc9c, 0xcc1, 0xcb2, 0xcc8, 0x3b, 0xc86, 0xc97, 0xcb8, 0xccd, 0xc9f, 0xccd, 0x3b, 0xcb8, 0xcaa, 0xccd,</div><div class='add'>+0xc9f, 0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xc85, 0xc95, 0xccd, 0xc9f, 0xccb, 0xcac, 0xcb0, 0xccd, 0x3b, 0xca8, 0xcb5, 0xcc6, 0xc82,</div><div class='add'>+0xcac, 0xcb0, 0xccd, 0x3b, 0xca1, 0xcbf, 0xcb8, 0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xc9c, 0x3b, 0xcab, 0xcc6, 0x3b, 0xcae, 0xcbe,</div><div class='add'>+0x3b, 0xc8e, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2, 0x3b, 0xc9c, 0xcc1, 0x3b, 0xc86, 0x3b, 0xcb8, 0xcc6, 0x3b, 0xc85, 0x3b, 0xca8,</div><div class='add'>+0x3b, 0xca1, 0xcbf, 0x3b, 0x49b, 0x430, 0x4a3, 0x2e, 0x3b, 0x430, 0x49b, 0x43f, 0x2e, 0x3b, 0x43d, 0x430, 0x443, 0x2e, 0x3b, 0x441,</div><div class='add'>+0x4d9, 0x443, 0x2e, 0x3b, 0x43c, 0x430, 0x43c, 0x2e, 0x3b, 0x43c, 0x430, 0x443, 0x2e, 0x3b, 0x448, 0x456, 0x43b, 0x2e, 0x3b, 0x442,</div><div class='add'>+0x430, 0x43c, 0x2e, 0x3b, 0x49b, 0x44b, 0x440, 0x2e, 0x3b, 0x49b, 0x430, 0x437, 0x2e, 0x3b, 0x49b, 0x430, 0x440, 0x2e, 0x3b, 0x436,</div><div class='add'>+0x435, 0x43b, 0x442, 0x2e, 0x3b, 0x49b, 0x430, 0x4a3, 0x442, 0x430, 0x440, 0x3b, 0x430, 0x49b, 0x43f, 0x430, 0x43d, 0x3b, 0x43d, 0x430,</div><div class='add'>+0x443, 0x440, 0x44b, 0x437, 0x3b, 0x441, 0x4d9, 0x443, 0x456, 0x440, 0x3b, 0x43c, 0x430, 0x43c, 0x44b, 0x440, 0x3b, 0x43c, 0x430, 0x443,</div><div class='add'>+0x441, 0x44b, 0x43c, 0x3b, 0x448, 0x456, 0x43b, 0x434, 0x435, 0x3b, 0x442, 0x430, 0x43c, 0x44b, 0x437, 0x3b, 0x49b, 0x44b, 0x440, 0x43a,</div><div class='add'>+0x4af, 0x439, 0x435, 0x43a, 0x3b, 0x49b, 0x430, 0x437, 0x430, 0x43d, 0x3b, 0x49b, 0x430, 0x440, 0x430, 0x448, 0x430, 0x3b, 0x436, 0x435,</div><div class='add'>+0x43b, 0x442, 0x43e, 0x49b, 0x441, 0x430, 0x43d, 0x3b, 0x6d, 0x75, 0x74, 0x2e, 0x3b, 0x67, 0x61, 0x73, 0x2e, 0x3b, 0x77, 0x65,</div><div class='add'>+0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x74, 0x2e, 0x3b, 0x67, 0x69, 0x63, 0x2e, 0x3b, 0x6b, 0x61, 0x6d, 0x2e, 0x3b, 0x6e, 0x79,</div><div class='add'>+0x61, 0x2e, 0x3b, 0x6b, 0x61, 0x6e, 0x2e, 0x3b, 0x6e, 0x7a, 0x65, 0x2e, 0x3b, 0x75, 0x6b, 0x77, 0x2e, 0x3b, 0x75, 0x67,</div><div class='add'>+0x75, 0x2e, 0x3b, 0x75, 0x6b, 0x75, 0x2e, 0x3b, 0x4d, 0x75, 0x74, 0x61, 0x72, 0x61, 0x6d, 0x61, 0x3b, 0x47, 0x61, 0x73,</div><div class='add'>+0x68, 0x79, 0x61, 0x6e, 0x74, 0x61, 0x72, 0x65, 0x3b, 0x57, 0x65, 0x72, 0x75, 0x72, 0x77, 0x65, 0x3b, 0x4d, 0x61, 0x74,</div><div class='add'>+0x61, 0x3b, 0x47, 0x69, 0x63, 0x75, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x3b, 0x4b, 0x61, 0x6d, 0x65, 0x6e, 0x61, 0x3b, 0x4e,</div><div class='add'>+0x79, 0x61, 0x6b, 0x61, 0x6e, 0x67, 0x61, 0x3b, 0x4b, 0x61, 0x6e, 0x61, 0x6d, 0x61, 0x3b, 0x4e, 0x7a, 0x65, 0x6c, 0x69,</div><div class='add'>+0x3b, 0x55, 0x6b, 0x77, 0x61, 0x6b, 0x69, 0x72, 0x61, 0x3b, 0x55, 0x67, 0x75, 0x73, 0x68, 0x79, 0x69, 0x6e, 0x67, 0x6f,</div><div class='add'>+0x3b, 0x55, 0x6b, 0x75, 0x62, 0x6f, 0x7a, 0x61, 0x3b, 0x31, 0xc6d4, 0x3b, 0x32, 0xc6d4, 0x3b, 0x33, 0xc6d4, 0x3b, 0x34, 0xc6d4,</div><div class='add'>+0x3b, 0x35, 0xc6d4, 0x3b, 0x36, 0xc6d4, 0x3b, 0x37, 0xc6d4, 0x3b, 0x38, 0xc6d4, 0x3b, 0x39, 0xc6d4, 0x3b, 0x31, 0x30, 0xc6d4, 0x3b,</div><div class='add'>+0x31, 0x31, 0xc6d4, 0x3b, 0x31, 0x32, 0xc6d4, 0x3b, 0xe7, 0x69, 0x6c, 0x3b, 0x73, 0x69, 0x62, 0x3b, 0x61, 0x64, 0x72, 0x3b,</div><div class='add'>+0x6e, 0xee, 0x73, 0x3b, 0x67, 0x75, 0x6c, 0x3b, 0x68, 0x65, 0x7a, 0x3b, 0x74, 0xee, 0x72, 0x3b, 0x38, 0x3b, 0x39, 0x3b,</div><div class='add'>+0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0xe7, 0x69, 0x6c, 0x65, 0x3b, 0x73, 0x69, 0x62, 0x61, 0x74, 0x3b,</div><div class='add'>+0x61, 0x64, 0x61, 0x72, 0x3b, 0x6e, 0xee, 0x73, 0x61, 0x6e, 0x3b, 0x67, 0x75, 0x6c, 0x61, 0x6e, 0x3b, 0x68, 0x65, 0x7a,</div><div class='add'>+0xee, 0x72, 0x61, 0x6e, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b,</div><div class='add'>+0xe7, 0x3b, 0x73, 0x3b, 0x61, 0x3b, 0x6e, 0x3b, 0x67, 0x3b, 0x68, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30,</div><div class='add'>+0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0xea1, 0x2e, 0xe81, 0x2e, 0x3b, 0xe81, 0x2e, 0xe9e, 0x2e, 0x3b, 0xea1, 0xeb5, 0x2e,</div><div class='add'>+0xe99, 0x2e, 0x3b, 0xea1, 0x2e, 0xeaa, 0x2e, 0x2e, 0x3b, 0xe9e, 0x2e, 0xe9e, 0x2e, 0x3b, 0xea1, 0xeb4, 0x2e, 0xe96, 0x2e, 0x3b,</div><div class='add'>+0xe81, 0x2e, 0xea5, 0x2e, 0x3b, 0xeaa, 0x2e, 0xeab, 0x2e, 0x3b, 0xe81, 0x2e, 0xe8d, 0x2e, 0x3b, 0xe95, 0x2e, 0xea5, 0x2e, 0x3b,</div><div class='add'>+0xe9e, 0x2e, 0xe88, 0x2e, 0x3b, 0xe97, 0x2e, 0xea7, 0x2e, 0x3b, 0xea1, 0xeb1, 0xe87, 0xe81, 0xead, 0xe99, 0x3b, 0xe81, 0xeb8, 0xea1,</div><div class='add'>+0xe9e, 0xeb2, 0x3b, 0xea1, 0xeb5, 0xe99, 0xeb2, 0x3b, 0xec0, 0xea1, 0xeaa, 0xeb2, 0x3b, 0xe9e, 0xeb6, 0xe94, 0xeaa, 0xeb0, 0xe9e, 0xeb2,</div><div class='add'>+0x3b, 0xea1, 0xeb4, 0xe96, 0xeb8, 0xe99, 0xeb2, 0x3b, 0xe81, 0xecd, 0xea5, 0xeb0, 0xe81, 0xebb, 0xe94, 0x3b, 0xeaa, 0xeb4, 0xe87, 0xeab,</div><div class='add'>+0xeb2, 0x3b, 0xe81, 0xeb1, 0xe99, 0xe8d, 0xeb2, 0x3b, 0xe95, 0xeb8, 0xea5, 0xeb2, 0x3b, 0xe9e, 0xeb0, 0xe88, 0xeb4, 0xe81, 0x3b, 0xe97,</div><div class='add'>+0xeb1, 0xe99, 0xea7, 0xeb2, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72,</div><div class='add'>+0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6e, 0x2e, 0x3b, 0x6a,</div><div class='add'>+0x16b, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b,</div><div class='add'>+0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x101, 0x72, 0x69, 0x73, 0x3b, 0x66,</div><div class='add'>+0x65, 0x62, 0x72, 0x75, 0x101, 0x72, 0x69, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x12b, 0x6c,</div><div class='add'>+0x69, 0x73, 0x3b, 0x6d, 0x61, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6e, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6c, 0x69,</div><div class='add'>+0x6a, 0x73, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x73, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x69,</div><div class='add'>+0x73, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x73,</div><div class='add'>+0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x73, 0x31, 0x3b, 0x73, 0x32, 0x3b, 0x73, 0x33, 0x3b,</div><div class='add'>+0x73, 0x34, 0x3b, 0x73, 0x35, 0x3b, 0x73, 0x36, 0x3b, 0x73, 0x37, 0x3b, 0x73, 0x38, 0x3b, 0x73, 0x39, 0x3b, 0x73, 0x31,</div><div class='add'>+0x30, 0x3b, 0x73, 0x31, 0x31, 0x3b, 0x73, 0x31, 0x32, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x79,</div><div class='add'>+0x61, 0x6d, 0x62, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x62, 0x61, 0x6c, 0xe9,</div><div class='add'>+0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x73, 0xe1, 0x74, 0x6f, 0x3b, 0x73, 0xe1, 0x6e,</div><div class='add'>+0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x6e, 0x65, 0x69, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61,</div><div class='add'>+0x20, 0x6d, 0xed, 0x74, 0xe1, 0x6e, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0x6f, 0x74,</div><div class='add'>+0xf3, 0x62, 0xe1, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6e, 0x73, 0x61, 0x6d, 0x62, 0x6f, 0x3b,</div><div class='add'>+0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0x77, 0x61, 0x6d, 0x62, 0x65, 0x3b, 0x73, 0xe1, 0x6e, 0x7a,</div><div class='add'>+0xe1, 0x20, 0x79, 0x61, 0x20, 0x6c, 0x69, 0x62, 0x77, 0x61, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20,</div><div class='add'>+0x7a, 0xf3, 0x6d, 0x69, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x20, 0x6e,</div><div class='add'>+0x61, 0x20, 0x6d, 0x254, 0x30c, 0x6b, 0x254, 0x301, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3,</div><div class='add'>+0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0xed, 0x62, 0x61, 0x6c, 0xe9, 0x3b, 0x53, 0x61, 0x75, 0x3b, 0x56, 0x61, 0x73,</div><div class='add'>+0x3b, 0x4b, 0x6f, 0x76, 0x3b, 0x42, 0x61, 0x6c, 0x3b, 0x47, 0x65, 0x67, 0x3b, 0x42, 0x69, 0x72, 0x3b, 0x4c, 0x69, 0x65,</div><div class='add'>+0x3b, 0x52, 0x67, 0x70, 0x3b, 0x52, 0x67, 0x73, 0x3b, 0x53, 0x70, 0x6c, 0x3b, 0x4c, 0x61, 0x70, 0x3b, 0x47, 0x72, 0x64,</div><div class='add'>+0x3b, 0x73, 0x61, 0x75, 0x73, 0x69, 0x73, 0x3b, 0x76, 0x61, 0x73, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x6b, 0x6f, 0x76, 0x61,</div><div class='add'>+0x73, 0x3b, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x64, 0x69, 0x73, 0x3b, 0x67, 0x65, 0x67, 0x75, 0x17e, 0x117, 0x3b, 0x62, 0x69,</div><div class='add'>+0x72, 0x17e, 0x65, 0x6c, 0x69, 0x73, 0x3b, 0x6c, 0x69, 0x65, 0x70, 0x61, 0x3b, 0x72, 0x75, 0x67, 0x70, 0x6a, 0x16b, 0x74,</div><div class='add'>+0x69, 0x73, 0x3b, 0x72, 0x75, 0x67, 0x73, 0x117, 0x6a, 0x69, 0x73, 0x3b, 0x73, 0x70, 0x61, 0x6c, 0x69, 0x73, 0x3b, 0x6c,</div><div class='add'>+0x61, 0x70, 0x6b, 0x72, 0x69, 0x74, 0x69, 0x73, 0x3b, 0x67, 0x72, 0x75, 0x6f, 0x64, 0x69, 0x73, 0x3b, 0x53, 0x3b, 0x56,</div><div class='add'>+0x3b, 0x4b, 0x3b, 0x42, 0x3b, 0x47, 0x3b, 0x42, 0x3b, 0x4c, 0x3b, 0x52, 0x3b, 0x52, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x47,</div><div class='add'>+0x3b, 0x458, 0x430, 0x43d, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e,</div><div class='add'>+0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x2e, 0x3b, 0x458, 0x443, 0x43b, 0x2e, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b,</div><div class='add'>+0x441, 0x435, 0x43f, 0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x2e, 0x3b, 0x434, 0x435, 0x43a,</div><div class='add'>+0x435, 0x43c, 0x2e, 0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x443, 0x430, 0x440, 0x438,</div><div class='add'>+0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x438,</div><div class='add'>+0x3b, 0x458, 0x443, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x432,</div><div class='add'>+0x440, 0x438, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b,</div><div class='add'>+0x434, 0x435, 0x43a, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x458, 0x3b, 0x444, 0x3b, 0x43c, 0x3b, 0x430, 0x3b, 0x43c, 0x3b, 0x458,</div><div class='add'>+0x3b, 0x458, 0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x43e, 0x3b, 0x43d, 0x3b, 0x434, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62,</div><div class='add'>+0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x6f, 0x6e, 0x3b, 0x4a, 0x6f, 0x6c,</div><div class='add'>+0x3b, 0x41, 0x6f, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73,</div><div class='add'>+0x3b, 0x4a, 0x61, 0x6e, 0x6f, 0x61, 0x72, 0x79, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x6f, 0x61, 0x72, 0x79, 0x3b, 0x4d, 0x61,</div><div class='add'>+0x72, 0x74, 0x73, 0x61, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x79, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x6f, 0x6e, 0x61,</div><div class='add'>+0x3b, 0x4a, 0x6f, 0x6c, 0x61, 0x79, 0x3b, 0x41, 0x6f, 0x67, 0x6f, 0x73, 0x69, 0x74, 0x72, 0x61, 0x3b, 0x53, 0x65, 0x70,</div><div class='add'>+0x74, 0x61, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x61, 0x6d,</div><div class='add'>+0x62, 0x72, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x61, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62,</div><div class='add'>+0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c,</div><div class='add'>+0x3b, 0x4f, 0x67, 0x6f, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69,</div><div class='add'>+0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d,</div><div class='add'>+0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c,</div><div class='add'>+0x61, 0x69, 0x3b, 0x4f, 0x67, 0x6f, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b,</div><div class='add'>+0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d,</div><div class='add'>+0x62, 0x65, 0x72, 0x3b, 0xd1c, 0xd28, 0xd41, 0x3b, 0xd2b, 0xd46, 0xd2c, 0xd4d, 0xd30, 0xd41, 0x3b, 0xd2e, 0xd3e, 0xd30, 0xd4d, 0x200d,</div><div class='add'>+0x3b, 0xd0f, 0xd2a, 0xd4d, 0xd30, 0xd3f, 0x3b, 0xd2e, 0xd47, 0xd2f, 0xd4d, 0x3b, 0xd1c, 0xd42, 0xd23, 0xd4d, 0x200d, 0x3b, 0xd1c, 0xd42,</div><div class='add'>+0xd32, 0xd48, 0x3b, 0xd13, 0xd17, 0x3b, 0xd38, 0xd46, 0xd2a, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd02, 0x3b, 0xd12, 0xd15, 0xd4d, 0xd1f, 0xd4b,</div><div class='add'>+0x3b, 0xd28, 0xd35, 0xd02, 0x3b, 0xd21, 0xd3f, 0xd38, 0xd02, 0x3b, 0xd1c, 0xd28, 0xd41, 0xd35, 0xd30, 0xd3f, 0x3b, 0xd2b, 0xd46, 0xd2c,</div><div class='add'>+0xd4d, 0xd30, 0xd41, 0xd35, 0xd30, 0xd3f, 0x3b, 0xd2e, 0xd3e, 0xd30, 0xd4d, 0x200d, 0xd1a, 0xd4d, 0xd1a, 0xd4d, 0x3b, 0xd0f, 0xd2a, 0xd4d,</div><div class='add'>+0xd30, 0xd3f, 0xd32, 0xd4d, 0x200d, 0x3b, 0xd2e, 0xd47, 0xd2f, 0xd4d, 0x3b, 0xd1c, 0xd42, 0xd23, 0xd4d, 0x200d, 0x3b, 0xd1c, 0xd42, 0xd32,</div><div class='add'>+0xd48, 0x3b, 0xd06, 0xd17, 0xd38, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd4d, 0x3b, 0xd38, 0xd46, 0xd2a, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd02, 0xd2c,</div><div class='add'>+0xd30, 0xd4d, 0x200d, 0x3b, 0xd12, 0xd15, 0xd4d, 0xd1f, 0xd4b, 0xd2c, 0xd30, 0xd4d, 0x200d, 0x3b, 0xd28, 0xd35, 0xd02, 0xd2c, 0xd30, 0xd4d,</div><div class='add'>+0x200d, 0x3b, 0xd21, 0xd3f, 0xd38, 0xd02, 0xd2c, 0xd30, 0xd4d, 0x200d, 0x3b, 0xd1c, 0x3b, 0xd2b, 0xd46, 0x3b, 0xd2e, 0xd3e, 0x3b, 0xd0f,</div><div class='add'>+0x3b, 0xd2e, 0xd47, 0x3b, 0xd1c, 0xd42, 0x3b, 0xd1c, 0xd42, 0x3b, 0xd13, 0x3b, 0xd38, 0xd46, 0x3b, 0xd12, 0x3b, 0xd28, 0x3b, 0xd21,</div><div class='add'>+0xd3f, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x72, 0x61, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65,</div><div class='add'>+0x6a, 0x3b, 0x120, 0x75, 0x6e, 0x3b, 0x4c, 0x75, 0x6c, 0x3b, 0x41, 0x77, 0x77, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74,</div><div class='add'>+0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x10b, 0x3b, 0x4a, 0x61, 0x6e, 0x6e, 0x61, 0x72, 0x3b, 0x46, 0x72, 0x61,</div><div class='add'>+0x72, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x75, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x6a, 0x6a, 0x75, 0x3b,</div><div class='add'>+0x120, 0x75, 0x6e, 0x6a, 0x75, 0x3b, 0x4c, 0x75, 0x6c, 0x6a, 0x75, 0x3b, 0x41, 0x77, 0x77, 0x69, 0x73, 0x73, 0x75, 0x3b,</div><div class='add'>+0x53, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b, 0x4f, 0x74, 0x74, 0x75, 0x62, 0x72, 0x75, 0x3b, 0x4e, 0x6f,</div><div class='add'>+0x76, 0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b, 0x44, 0x69, 0x10b, 0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b, 0x4a, 0x3b, 0x46, 0x3b,</div><div class='add'>+0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x120, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b,</div><div class='add'>+0x48, 0x101, 0x6e, 0x75, 0x65, 0x72, 0x65, 0x3b, 0x50, 0x113, 0x70, 0x75, 0x65, 0x72, 0x65, 0x3b, 0x4d, 0x101, 0x65, 0x68,</div><div class='add'>+0x65, 0x3b, 0x100, 0x70, 0x65, 0x72, 0x69, 0x72, 0x61, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x48, 0x75, 0x6e, 0x65, 0x3b, 0x48,</div><div class='add'>+0x16b, 0x72, 0x61, 0x65, 0x3b, 0x100, 0x6b, 0x75, 0x68, 0x61, 0x74, 0x61, 0x3b, 0x48, 0x65, 0x70, 0x65, 0x74, 0x65, 0x6d,</div><div class='add'>+0x61, 0x3b, 0x4f, 0x6b, 0x65, 0x74, 0x6f, 0x70, 0x61, 0x3b, 0x4e, 0x6f, 0x65, 0x6d, 0x61, 0x3b, 0x54, 0x12b, 0x68, 0x65,</div><div class='add'>+0x6d, 0x61, 0x3b, 0x91c, 0x93e, 0x928, 0x947, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x935, 0x93e,</div><div class='add'>+0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x90f, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c,</div><div class='add'>+0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x948, 0x3b, 0x911, 0x917, 0x938, 0x94d, 0x91f, 0x3b, 0x938, 0x92a, 0x94d, 0x91f, 0x947, 0x902,</div><div class='add'>+0x92c, 0x930, 0x3b, 0x911, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x935, 0x94d, 0x939, 0x947, 0x902, 0x92c, 0x930,</div><div class='add'>+0x3b, 0x921, 0x93f, 0x938, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x91c, 0x93e, 0x3b, 0x92b, 0x947, 0x3b, 0x92e, 0x93e, 0x3b, 0x90f, 0x3b,</div><div class='add'>+0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x3b, 0x91c, 0x941, 0x3b, 0x911, 0x3b, 0x938, 0x3b, 0x911, 0x3b, 0x928, 0x94b, 0x3b, 0x921, 0x93f,</div><div class='add'>+0x3b, 0x445, 0x443, 0x43b, 0x3b, 0x4af, 0x445, 0x44d, 0x3b, 0x431, 0x430, 0x440, 0x3b, 0x442, 0x443, 0x443, 0x3b, 0x43b, 0x443, 0x443,</div><div class='add'>+0x3b, 0x43c, 0x43e, 0x433, 0x3b, 0x43c, 0x43e, 0x440, 0x3b, 0x445, 0x43e, 0x43d, 0x3b, 0x431, 0x438, 0x447, 0x3b, 0x442, 0x430, 0x445,</div><div class='add'>+0x3b, 0x43d, 0x43e, 0x445, 0x3b, 0x433, 0x430, 0x445, 0x3b, 0x425, 0x443, 0x43b, 0x433, 0x430, 0x43d, 0x430, 0x3b, 0x4ae, 0x445, 0x44d,</div><div class='add'>+0x440, 0x3b, 0x411, 0x430, 0x440, 0x3b, 0x422, 0x443, 0x443, 0x43b, 0x430, 0x439, 0x3b, 0x41b, 0x443, 0x443, 0x3b, 0x41c, 0x43e, 0x433,</div><div class='add'>+0x43e, 0x439, 0x3b, 0x41c, 0x43e, 0x440, 0x44c, 0x3b, 0x425, 0x43e, 0x43d, 0x44c, 0x3b, 0x411, 0x438, 0x447, 0x3b, 0x422, 0x430, 0x445,</div><div class='add'>+0x438, 0x430, 0x3b, 0x41d, 0x43e, 0x445, 0x43e, 0x439, 0x3b, 0x413, 0x430, 0x445, 0x430, 0x439, 0x3b, 0x91c, 0x928, 0x3b, 0x92b, 0x947,</div><div class='add'>+0x92c, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x93f, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928,</div><div class='add'>+0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x3b, 0x905, 0x917, 0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b,</div><div class='add'>+0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x3b, 0x91c, 0x928, 0x935, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c,</div><div class='add'>+0x94d, 0x930, 0x941, 0x905, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b,</div><div class='add'>+0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917, 0x938, 0x94d, 0x924, 0x3b, 0x938,</div><div class='add'>+0x947, 0x92a, 0x94d, 0x91f, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b,</div><div class='add'>+0x92d, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x967, 0x3b, 0x968, 0x3b,</div><div class='add'>+0x969, 0x3b, 0x96a, 0x3b, 0x96b, 0x3b, 0x96c, 0x3b, 0x96d, 0x3b, 0x96e, 0x3b, 0x96f, 0x3b, 0x967, 0x966, 0x3b, 0x967, 0x967, 0x3b,</div><div class='add'>+0x967, 0x968, 0x3b, 0x91c, 0x928, 0x935, 0x930, 0x940, 0x3b, 0x92b, 0x930, 0x935, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a,</div><div class='add'>+0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x947, 0x932, 0x3b, 0x92e, 0x908, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x908,</div><div class='add'>+0x3b, 0x905, 0x917, 0x938, 0x94d, 0x924, 0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x905, 0x915,</div><div class='add'>+0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x926, 0x93f, 0x938, 0x92e, 0x94d,</div><div class='add'>+0x92c, 0x930, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70,</div><div class='add'>+0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67,</div><div class='add'>+0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x73,</div><div class='add'>+0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72,</div><div class='add'>+0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c,</div><div class='add'>+0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f,</div><div class='add'>+0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x65,</div><div class='add'>+0x6d, 0x62, 0x65, 0x72, 0x3b, 0x67, 0x65, 0x6e, 0x69, 0xe8, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x69, 0xe8, 0x72, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x68, 0x3b,</div><div class='add'>+0x6a, 0x75, 0x6c, 0x68, 0x65, 0x74, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72,</div><div class='add'>+0x65, 0x3b, 0x6f, 0x63, 0x74, 0xf2, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64,</div><div class='add'>+0x65, 0x7a, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0xb1c, 0xb3e, 0xb28, 0xb41, 0xb06, 0xb30, 0xb40, 0x3b, 0xb2b, 0xb47, 0xb2c, 0xb4d,</div><div class='add'>+0xb30, 0xb41, 0xb5f, 0xb3e, 0xb30, 0xb40, 0x3b, 0xb2e, 0xb3e, 0xb30, 0xb4d, 0xb1a, 0xb4d, 0xb1a, 0x3b, 0xb05, 0xb2a, 0xb4d, 0xb30, 0xb47,</div><div class='add'>+0xb32, 0x3b, 0xb2e, 0xb47, 0x3b, 0xb1c, 0xb41, 0xb28, 0x3b, 0xb1c, 0xb41, 0xb32, 0xb3e, 0xb07, 0x3b, 0xb05, 0xb17, 0xb37, 0xb4d, 0xb1f,</div><div class='add'>+0x3b, 0xb38, 0xb47, 0xb2a, 0xb4d, 0xb1f, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb05, 0xb15, 0xb4d, 0xb1f, 0xb4b, 0xb2c, 0xb30, 0x3b,</div><div class='add'>+0xb28, 0xb2d, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb21, 0xb3f, 0xb38, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb1c, 0xb3e, 0x3b,</div><div class='add'>+0xb2b, 0xb47, 0x3b, 0xb2e, 0xb3e, 0x3b, 0xb05, 0x3b, 0xb2e, 0xb47, 0x3b, 0xb1c, 0xb41, 0x3b, 0xb1c, 0xb41, 0x3b, 0xb05, 0x3b, 0xb38,</div><div class='add'>+0xb47, 0x3b, 0xb05, 0x3b, 0xb28, 0x3b, 0xb21, 0xb3f, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631,</div><div class='add'>+0x64a, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b,</div><div class='add'>+0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6ab, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9,</div><div class='add'>+0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x698, 0x627, 0x646,</div><div class='add'>+0x648, 0x6cc, 0x647, 0x654, 0x3b, 0x641, 0x648, 0x631, 0x6cc, 0x647, 0x654, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x648, 0x631,</div><div class='add'>+0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x648, 0x62a, 0x3b,</div><div class='add'>+0x633, 0x67e, 0x62a, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x627, 0x645, 0x628, 0x631,</div><div class='add'>+0x3b, 0x62f, 0x633, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x698, 0x627, 0x646, 0x648, 0x6cc, 0x647, 0x654, 0x3b, 0x641, 0x648, 0x631, 0x6cc,</div><div class='add'>+0x647, 0x654, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x648, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646,</div><div class='add'>+0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x622, 0x6af, 0x648, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x627, 0x645, 0x628, 0x631,</div><div class='add'>+0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x627, 0x645, 0x628, 0x631,</div><div class='add'>+0x3b, 0x698, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x622, 0x3b, 0x645, 0x6cc, 0x3b, 0x698, 0x3b, 0x698, 0x3b, 0x627, 0x3b, 0x633, 0x3b,</div><div class='add'>+0x627, 0x3b, 0x646, 0x3b, 0x62f, 0x3b, 0x62c, 0x646, 0x648, 0x3b, 0x641, 0x648, 0x631, 0x6cc, 0x647, 0x654, 0x3b, 0x645, 0x627, 0x631,</div><div class='add'>+0x633, 0x3b, 0x622, 0x648, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x640, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x3b,</div><div class='add'>+0x627, 0x648, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646, 0x648,</div><div class='add'>+0x627, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631,</div><div class='add'>+0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b,</div><div class='add'>+0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9,</div><div class='add'>+0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x62c, 0x3b, 0x641,</div><div class='add'>+0x3b, 0x645, 0x3b, 0x627, 0x3b, 0x645, 0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x646, 0x3b, 0x62f,</div><div class='add'>+0x3b, 0x73, 0x74, 0x79, 0x3b, 0x6c, 0x75, 0x74, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6b, 0x77, 0x69, 0x3b, 0x6d, 0x61, 0x6a,</div><div class='add'>+0x3b, 0x63, 0x7a, 0x65, 0x3b, 0x6c, 0x69, 0x70, 0x3b, 0x73, 0x69, 0x65, 0x3b, 0x77, 0x72, 0x7a, 0x3b, 0x70, 0x61, 0x17a,</div><div class='add'>+0x3b, 0x6c, 0x69, 0x73, 0x3b, 0x67, 0x72, 0x75, 0x3b, 0x73, 0x74, 0x79, 0x63, 0x7a, 0x6e, 0x69, 0x61, 0x3b, 0x6c, 0x75,</div><div class='add'>+0x74, 0x65, 0x67, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x63, 0x61, 0x3b, 0x6b, 0x77, 0x69, 0x65, 0x74, 0x6e, 0x69, 0x61, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x6a, 0x61, 0x3b, 0x63, 0x7a, 0x65, 0x72, 0x77, 0x63, 0x61, 0x3b, 0x6c, 0x69, 0x70, 0x63, 0x61, 0x3b, 0x73,</div><div class='add'>+0x69, 0x65, 0x72, 0x70, 0x6e, 0x69, 0x61, 0x3b, 0x77, 0x72, 0x7a, 0x65, 0x15b, 0x6e, 0x69, 0x61, 0x3b, 0x70, 0x61, 0x17a,</div><div class='add'>+0x64, 0x7a, 0x69, 0x65, 0x72, 0x6e, 0x69, 0x6b, 0x61, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x61, 0x3b,</div><div class='add'>+0x67, 0x72, 0x75, 0x64, 0x6e, 0x69, 0x61, 0x3b, 0x73, 0x3b, 0x6c, 0x3b, 0x6d, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x63, 0x3b,</div><div class='add'>+0x6c, 0x3b, 0x73, 0x3b, 0x77, 0x3b, 0x70, 0x3b, 0x6c, 0x3b, 0x67, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b,</div><div class='add'>+0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b,</div><div class='add'>+0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x75, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b,</div><div class='add'>+0x4a, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x76, 0x65, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x4d, 0x61,</div><div class='add'>+0x72, 0xe7, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x6f,</div><div class='add'>+0x3b, 0x4a, 0x75, 0x6c, 0x68, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62,</div><div class='add'>+0x72, 0x6f, 0x3b, 0x4f, 0x75, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b,</div><div class='add'>+0x44, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72,</div><div class='add'>+0x3b, 0x61, 0x62, 0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x67, 0x6f,</div><div class='add'>+0x3b, 0x73, 0x65, 0x74, 0x3b, 0x6f, 0x75, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x7a, 0x3b, 0x6a, 0x61, 0x6e,</div><div class='add'>+0x65, 0x69, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x76, 0x65, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x6f,</div><div class='add'>+0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x6a, 0x75,</div><div class='add'>+0x6c, 0x68, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b,</div><div class='add'>+0x6f, 0x75, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x64, 0x65, 0x7a,</div><div class='add'>+0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0xa1c, 0xa28, 0xa35, 0xa30, 0xa40, 0x3b, 0xa2b, 0xa3c, 0xa30, 0xa35, 0xa30, 0xa40, 0x3b, 0xa2e,</div><div class='add'>+0xa3e, 0xa30, 0xa1a, 0x3b, 0xa05, 0xa2a, 0xa4d, 0xa30, 0xa48, 0xa32, 0x3b, 0xa2e, 0xa08, 0x3b, 0xa1c, 0xa42, 0xa28, 0x3b, 0xa1c, 0xa41,</div><div class='add'>+0xa32, 0xa3e, 0xa08, 0x3b, 0xa05, 0xa17, 0xa38, 0xa24, 0x3b, 0xa38, 0xa24, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa05, 0xa15, 0xa24, 0xa42, 0xa2c,</div><div class='add'>+0xa30, 0x3b, 0xa28, 0xa35, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa26, 0xa38, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa1c, 0x3b, 0xa2b, 0x3b, 0xa2e, 0xa3e,</div><div class='add'>+0x3b, 0xa05, 0x3b, 0xa2e, 0x3b, 0xa1c, 0xa42, 0x3b, 0xa1c, 0xa41, 0x3b, 0xa05, 0x3b, 0xa38, 0x3b, 0xa05, 0x3b, 0xa28, 0x3b, 0xa26,</div><div class='add'>+0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e,</div><div class='add'>+0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x626, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x626, 0x6cc, 0x3b, 0x627, 0x6af,</div><div class='add'>+0x633, 0x62a, 0x3b, 0x633, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628,</div><div class='add'>+0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x73, 0x63, 0x68, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x61, 0x76, 0x72, 0x2e,</div><div class='add'>+0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x74, 0x67, 0x3b, 0x7a, 0x65, 0x72, 0x63,</div><div class='add'>+0x6c, 0x2e, 0x3b, 0x66, 0x61, 0x6e, 0x2e, 0x3b, 0x61, 0x76, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x2e, 0x3b,</div><div class='add'>+0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x73, 0x63, 0x68, 0x61, 0x6e,</div><div class='add'>+0x65, 0x72, 0x3b, 0x66, 0x61, 0x76, 0x72, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x67,</div><div class='add'>+0x6c, 0x3b, 0x6d, 0x61, 0x74, 0x67, 0x3b, 0x7a, 0x65, 0x72, 0x63, 0x6c, 0x61, 0x64, 0x75, 0x72, 0x3b, 0x66, 0x61, 0x6e,</div><div class='add'>+0x61, 0x64, 0x75, 0x72, 0x3b, 0x61, 0x76, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72,</div><div class='add'>+0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65,</div><div class='add'>+0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x53, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0x46,</div><div class='add'>+0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x69, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e,</div><div class='add'>+0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x69, 0x75, 0x6e, 0x2e, 0x3b,</div><div class='add'>+0x69, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e,</div><div class='add'>+0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x69, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b,</div><div class='add'>+0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x69, 0x65, 0x3b, 0x61, 0x70, 0x72,</div><div class='add'>+0x69, 0x6c, 0x69, 0x65, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x69, 0x75, 0x6e, 0x69, 0x65, 0x3b, 0x69, 0x75, 0x6c, 0x69, 0x65,</div><div class='add'>+0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x6f,</div><div class='add'>+0x63, 0x74, 0x6f, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x6e, 0x6f, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x64,</div><div class='add'>+0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x49, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x49,</div><div class='add'>+0x3b, 0x49, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x44f, 0x43d, 0x432, 0x2e, 0x3b, 0x444, 0x435,</div><div class='add'>+0x432, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x430, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x44f, 0x3b, 0x438,</div><div class='add'>+0x44e, 0x43d, 0x44f, 0x3b, 0x438, 0x44e, 0x43b, 0x44f, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x2e, 0x3b,</div><div class='add'>+0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x44f, 0x43d, 0x432, 0x430,</div><div class='add'>+0x440, 0x44f, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x44f, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x430, 0x3b, 0x430, 0x43f, 0x440,</div><div class='add'>+0x435, 0x43b, 0x44f, 0x3b, 0x43c, 0x430, 0x44f, 0x3b, 0x438, 0x44e, 0x43d, 0x44f, 0x3b, 0x438, 0x44e, 0x43b, 0x44f, 0x3b, 0x430, 0x432,</div><div class='add'>+0x433, 0x443, 0x441, 0x442, 0x430, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44f, 0x3b, 0x43e, 0x43a, 0x442, 0x44f, 0x431,</div><div class='add'>+0x440, 0x44f, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x440, 0x44f, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44f, 0x3b, 0x42f, 0x3b,</div><div class='add'>+0x424, 0x3b, 0x41c, 0x3b, 0x410, 0x3b, 0x41c, 0x3b, 0x418, 0x3b, 0x418, 0x3b, 0x410, 0x3b, 0x421, 0x3b, 0x41e, 0x3b, 0x41d, 0x3b,</div><div class='add'>+0x414, 0x3b, 0x4e, 0x79, 0x65, 0x3b, 0x46, 0x75, 0x6c, 0x3b, 0x4d, 0x62, 0xe4, 0x3b, 0x4e, 0x67, 0x75, 0x3b, 0x42, 0xea,</div><div class='add'>+0x6c, 0x3b, 0x46, 0xf6, 0x6e, 0x3b, 0x4c, 0x65, 0x6e, 0x3b, 0x4b, 0xfc, 0x6b, 0x3b, 0x4d, 0x76, 0x75, 0x3b, 0x4e, 0x67,</div><div class='add'>+0x62, 0x3b, 0x4e, 0x61, 0x62, 0x3b, 0x4b, 0x61, 0x6b, 0x3b, 0x4e, 0x79, 0x65, 0x6e, 0x79, 0x65, 0x3b, 0x46, 0x75, 0x6c,</div><div class='add'>+0x75, 0x6e, 0x64, 0xef, 0x67, 0x69, 0x3b, 0x4d, 0x62, 0xe4, 0x6e, 0x67, 0xfc, 0x3b, 0x4e, 0x67, 0x75, 0x62, 0xf9, 0x65,</div><div class='add'>+0x3b, 0x42, 0xea, 0x6c, 0xe4, 0x77, 0xfc, 0x3b, 0x46, 0xf6, 0x6e, 0x64, 0x6f, 0x3b, 0x4c, 0x65, 0x6e, 0x67, 0x75, 0x61,</div><div class='add'>+0x3b, 0x4b, 0xfc, 0x6b, 0xfc, 0x72, 0xfc, 0x3b, 0x4d, 0x76, 0x75, 0x6b, 0x61, 0x3b, 0x4e, 0x67, 0x62, 0x65, 0x72, 0x65,</div><div class='add'>+0x72, 0x65, 0x3b, 0x4e, 0x61, 0x62, 0xe4, 0x6e, 0x64, 0xfc, 0x72, 0x75, 0x3b, 0x4b, 0x61, 0x6b, 0x61, 0x75, 0x6b, 0x61,</div><div class='add'>+0x3b, 0x4e, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x42, 0x3b, 0x46, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x4e,</div><div class='add'>+0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x458, 0x430, 0x43d, 0x3b, 0x444, 0x435, 0x431, 0x3b, 0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440,</div><div class='add'>+0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43f,</div><div class='add'>+0x3b, 0x43e, 0x43a, 0x442, 0x3b, 0x43d, 0x43e, 0x432, 0x3b, 0x434, 0x435, 0x446, 0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x3b,</div><div class='add'>+0x444, 0x435, 0x431, 0x440, 0x443, 0x430, 0x440, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c,</div><div class='add'>+0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435,</div><div class='add'>+0x43f, 0x442, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x431, 0x430, 0x440, 0x3b, 0x43d, 0x43e, 0x432, 0x435,</div><div class='add'>+0x43c, 0x431, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x446, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440,</div><div class='add'>+0x3b, 0x444, 0x435, 0x431, 0x440, 0x443, 0x430, 0x440, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b,</div><div class='add'>+0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x438, 0x3b, 0x458, 0x443, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442,</div><div class='add'>+0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x431, 0x430, 0x440, 0x3b, 0x43d,</div><div class='add'>+0x43e, 0x432, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x446, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x6a, 0x61, 0x6e,</div><div class='add'>+0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e,</div><div class='add'>+0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76,</div><div class='add'>+0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a,</div><div class='add'>+0x75, 0x6c, 0x3b, 0x61, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b,</div><div class='add'>+0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x63,</div><div class='add'>+0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6a, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x6a, 0x3b,</div><div class='add'>+0x61, 0x3b, 0x73, 0x3b, 0x6f, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x50, 0x68, 0x65, 0x3b, 0x4b, 0x6f, 0x6c, 0x3b, 0x55, 0x62,</div><div class='add'>+0x65, 0x3b, 0x4d, 0x6d, 0x65, 0x3b, 0x4d, 0x6f, 0x74, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x55, 0x70, 0x75, 0x3b, 0x50, 0x68,</div><div class='add'>+0x61, 0x3b, 0x4c, 0x65, 0x6f, 0x3b, 0x4d, 0x70, 0x68, 0x3b, 0x50, 0x75, 0x6e, 0x3b, 0x54, 0x73, 0x68, 0x3b, 0x50, 0x68,</div><div class='add'>+0x65, 0x73, 0x65, 0x6b, 0x67, 0x6f, 0x6e, 0x67, 0x3b, 0x48, 0x6c, 0x61, 0x6b, 0x6f, 0x6c, 0x61, 0x3b, 0x48, 0x6c, 0x61,</div><div class='add'>+0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x3b, 0x4d, 0x6d, 0x65, 0x73, 0x65, 0x3b, 0x4d, 0x6f, 0x74, 0x73, 0x68, 0x65, 0x61,</div><div class='add'>+0x6e, 0x6f, 0x6e, 0x67, 0x3b, 0x50, 0x68, 0x75, 0x70, 0x6a, 0x61, 0x6e, 0x65, 0x3b, 0x50, 0x68, 0x75, 0x70, 0x75, 0x3b,</div><div class='add'>+0x50, 0x68, 0x61, 0x74, 0x61, 0x3b, 0x4c, 0x65, 0x6f, 0x74, 0x73, 0x68, 0x65, 0x3b, 0x4d, 0x70, 0x68, 0x61, 0x6c, 0x61,</div><div class='add'>+0x6e, 0x65, 0x3b, 0x50, 0x75, 0x6e, 0x64, 0x75, 0x6e, 0x67, 0x77, 0x61, 0x6e, 0x65, 0x3b, 0x54, 0x73, 0x68, 0x69, 0x74,</div><div class='add'>+0x77, 0x65, 0x3b, 0x46, 0x65, 0x72, 0x3b, 0x54, 0x6c, 0x68, 0x3b, 0x4d, 0x6f, 0x70, 0x3b, 0x4d, 0x6f, 0x72, 0x3b, 0x4d,</div><div class='add'>+0x6f, 0x74, 0x3b, 0x53, 0x65, 0x65, 0x3b, 0x50, 0x68, 0x75, 0x3b, 0x50, 0x68, 0x61, 0x3b, 0x4c, 0x77, 0x65, 0x3b, 0x44,</div><div class='add'>+0x69, 0x70, 0x3b, 0x4e, 0x67, 0x77, 0x3b, 0x53, 0x65, 0x64, 0x3b, 0x46, 0x65, 0x72, 0x69, 0x6b, 0x67, 0x6f, 0x6e, 0x67,</div><div class='add'>+0x3b, 0x54, 0x6c, 0x68, 0x61, 0x6b, 0x6f, 0x6c, 0x65, 0x3b, 0x4d, 0x6f, 0x70, 0x69, 0x74, 0x6c, 0x6f, 0x3b, 0x4d, 0x6f,</div><div class='add'>+0x72, 0x61, 0x6e, 0x61, 0x6e, 0x67, 0x3b, 0x4d, 0x6f, 0x74, 0x73, 0x68, 0x65, 0x67, 0x61, 0x6e, 0x61, 0x6e, 0x67, 0x3b,</div><div class='add'>+0x53, 0x65, 0x65, 0x74, 0x65, 0x62, 0x6f, 0x73, 0x69, 0x67, 0x6f, 0x3b, 0x50, 0x68, 0x75, 0x6b, 0x77, 0x69, 0x3b, 0x50,</div><div class='add'>+0x68, 0x61, 0x74, 0x77, 0x65, 0x3b, 0x4c, 0x77, 0x65, 0x74, 0x73, 0x65, 0x3b, 0x44, 0x69, 0x70, 0x68, 0x61, 0x6c, 0x61,</div><div class='add'>+0x6e, 0x65, 0x3b, 0x4e, 0x67, 0x77, 0x61, 0x6e, 0x61, 0x74, 0x73, 0x65, 0x6c, 0x65, 0x3b, 0x53, 0x65, 0x64, 0x69, 0x6d,</div><div class='add'>+0x6f, 0x6e, 0x74, 0x68, 0x6f, 0x6c, 0x65, 0x3b, 0x4e, 0x64, 0x69, 0x3b, 0x4b, 0x75, 0x6b, 0x3b, 0x4b, 0x75, 0x72, 0x3b,</div><div class='add'>+0x4b, 0x75, 0x62, 0x3b, 0x43, 0x68, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x3b, 0x4e, 0x79, 0x61, 0x3b,</div><div class='add'>+0x47, 0x75, 0x6e, 0x3b, 0x47, 0x75, 0x6d, 0x3b, 0x4d, 0x62, 0x3b, 0x5a, 0x76, 0x69, 0x3b, 0x4e, 0x64, 0x69, 0x72, 0x61,</div><div class='add'>+0x3b, 0x4b, 0x75, 0x6b, 0x61, 0x64, 0x7a, 0x69, 0x3b, 0x4b, 0x75, 0x72, 0x75, 0x6d, 0x65, 0x3b, 0x4b, 0x75, 0x62, 0x76,</div><div class='add'>+0x75, 0x6d, 0x62, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x76, 0x61, 0x62, 0x76, 0x75, 0x3b, 0x43, 0x68, 0x69, 0x6b, 0x75, 0x6d,</div><div class='add'>+0x69, 0x3b, 0x43, 0x68, 0x69, 0x6b, 0x75, 0x6e, 0x67, 0x75, 0x72, 0x75, 0x3b, 0x4e, 0x79, 0x61, 0x6d, 0x61, 0x76, 0x68,</div><div class='add'>+0x75, 0x76, 0x68, 0x75, 0x3b, 0x47, 0x75, 0x6e, 0x79, 0x61, 0x6e, 0x61, 0x3b, 0x47, 0x75, 0x6d, 0x69, 0x67, 0x75, 0x72,</div><div class='add'>+0x75, 0x3b, 0x4d, 0x62, 0x75, 0x64, 0x7a, 0x69, 0x3b, 0x5a, 0x76, 0x69, 0x74, 0x61, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x4b,</div><div class='add'>+0x3b, 0x4b, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x4e, 0x3b, 0x47, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0xda2,</div><div class='add'>+0xdb1, 0x3b, 0xdb4, 0xdd9, 0xdb6, 0x3b, 0xdb8, 0xdcf, 0xdbb, 0xdca, 0xdad, 0x3b, 0xd85, 0xdb4, 0xdca, 0x200d, 0xdbb, 0xdda, 0xdbd, 0x3b,</div><div class='add'>+0xdb8, 0xdd0, 0xdba, 0x3b, 0xda2, 0xdd6, 0xdb1, 0x3b, 0xda2, 0xdd6, 0xdbd, 0x3b, 0xd85, 0xd9c, 0xddd, 0x3b, 0xdc3, 0xdd0, 0xdb4, 0x3b,</div><div class='add'>+0xd94, 0xd9a, 0x3b, 0xdb1, 0xddc, 0xdc0, 0xdd0, 0x3b, 0xdaf, 0xdd9, 0xdc3, 0xdd0, 0x3b, 0xda2, 0xdb1, 0xdc0, 0xdcf, 0xdbb, 0x3b, 0xdb4,</div><div class='add'>+0xdd9, 0xdb6, 0xdbb, 0xdc0, 0xdcf, 0xdbb, 0x3b, 0xdb8, 0xdcf, 0xdbb, 0xdca, 0xdad, 0x3b, 0xd85, 0xdb4, 0xdca, 0x200d, 0xdbb, 0xdda, 0xdbd,</div><div class='add'>+0xdca, 0x3b, 0xdb8, 0xdd0, 0xdba, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdb1, 0x3b, 0xda2, 0xdd6, 0xdbd, 0xdd2, 0x3b, 0xd85, 0xd9c, 0xddd, 0xdc3,</div><div class='add'>+0xdca, 0xdad, 0xdd4, 0x3b, 0xdc3, 0xdd0, 0xdb4, 0xdca, 0xdad, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xd94, 0xd9a, 0xdca, 0xdad,</div><div class='add'>+0xddd, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xdb1, 0xddc, 0xdc0, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xdaf, 0xdd9, 0xdc3, 0xdd0, 0xdb8,</div><div class='add'>+0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xda2, 0x3b, 0xdb4, 0xdd9, 0x3b, 0xdb8, 0xdcf, 0x3b, 0xd85, 0x3b, 0xdb8, 0xdd0, 0x3b, 0xda2, 0xdd6,</div><div class='add'>+0x3b, 0xda2, 0xdd6, 0x3b, 0xd85, 0x3b, 0xdc3, 0xdd0, 0x3b, 0xd94, 0x3b, 0xdb1, 0xddc, 0x3b, 0xdaf, 0xdd9, 0x3b, 0x42, 0x68, 0x69,</div><div class='add'>+0x3b, 0x56, 0x61, 0x6e, 0x3b, 0x56, 0x6f, 0x6c, 0x3b, 0x4d, 0x61, 0x62, 0x3b, 0x4e, 0x6b, 0x68, 0x3b, 0x4e, 0x68, 0x6c,</div><div class='add'>+0x3b, 0x4b, 0x68, 0x6f, 0x3b, 0x4e, 0x67, 0x63, 0x3b, 0x4e, 0x79, 0x6f, 0x3b, 0x4d, 0x70, 0x68, 0x3b, 0x4c, 0x77, 0x65,</div><div class='add'>+0x3b, 0x4e, 0x67, 0x6f, 0x3b, 0x42, 0x68, 0x69, 0x6d, 0x62, 0x69, 0x64, 0x76, 0x77, 0x61, 0x6e, 0x65, 0x3b, 0x69, 0x4e,</div><div class='add'>+0x64, 0x6c, 0x6f, 0x76, 0x61, 0x6e, 0x61, 0x3b, 0x69, 0x4e, 0x64, 0x6c, 0x6f, 0x76, 0x75, 0x2d, 0x6c, 0x65, 0x6e, 0x6b,</div><div class='add'>+0x68, 0x75, 0x6c, 0x75, 0x3b, 0x4d, 0x61, 0x62, 0x61, 0x73, 0x61, 0x3b, 0x69, 0x4e, 0x6b, 0x68, 0x77, 0x65, 0x6b, 0x68,</div><div class='add'>+0x77, 0x65, 0x74, 0x69, 0x3b, 0x69, 0x4e, 0x68, 0x6c, 0x61, 0x62, 0x61, 0x3b, 0x4b, 0x68, 0x6f, 0x6c, 0x77, 0x61, 0x6e,</div><div class='add'>+0x65, 0x3b, 0x69, 0x4e, 0x67, 0x63, 0x69, 0x3b, 0x69, 0x4e, 0x79, 0x6f, 0x6e, 0x69, 0x3b, 0x69, 0x4d, 0x70, 0x68, 0x61,</div><div class='add'>+0x6c, 0x61, 0x3b, 0x4c, 0x77, 0x65, 0x74, 0x69, 0x3b, 0x69, 0x4e, 0x67, 0x6f, 0x6e, 0x67, 0x6f, 0x6e, 0x69, 0x3b, 0x6a,</div><div class='add'>+0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0xe1, 0x6a, 0x3b, 0x6a,</div><div class='add'>+0xfa, 0x6e, 0x3b, 0x6a, 0xfa, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e,</div><div class='add'>+0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0xe1, 0x72, 0x61, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75,</div><div class='add'>+0xe1, 0x72, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x63, 0x61, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x61, 0x3b, 0x6d, 0xe1, 0x6a,</div><div class='add'>+0x61, 0x3b, 0x6a, 0xfa, 0x6e, 0x61, 0x3b, 0x6a, 0xfa, 0x6c, 0x61, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b,</div><div class='add'>+0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x72, 0x61, 0x3b, 0x6e, 0x6f,</div><div class='add'>+0x76, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x6a, 0x61, 0x6e, 0x75,</div><div class='add'>+0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x65, 0x63, 0x3b, 0x61, 0x70, 0x72,</div><div class='add'>+0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6a, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x3b, 0x61,</div><div class='add'>+0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f,</div><div class='add'>+0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65,</div><div class='add'>+0x72, 0x3b, 0x4b, 0x6f, 0x62, 0x3b, 0x4c, 0x61, 0x62, 0x3b, 0x53, 0x61, 0x64, 0x3b, 0x41, 0x66, 0x72, 0x3b, 0x53, 0x68,</div><div class='add'>+0x61, 0x3b, 0x4c, 0x69, 0x78, 0x3b, 0x54, 0x6f, 0x64, 0x3b, 0x53, 0x69, 0x64, 0x3b, 0x53, 0x61, 0x67, 0x3b, 0x54, 0x6f,</div><div class='add'>+0x62, 0x3b, 0x4b, 0x49, 0x54, 0x3b, 0x4c, 0x49, 0x54, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4b, 0x6f, 0x6f, 0x62,</div><div class='add'>+0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c, 0x61, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73,</div><div class='add'>+0x68, 0x61, 0x20, 0x53, 0x61, 0x64, 0x64, 0x65, 0x78, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x41,</div><div class='add'>+0x66, 0x72, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x68, 0x61, 0x6e, 0x61, 0x61, 0x64, 0x3b,</div><div class='add'>+0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c, 0x69, 0x78, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x54,</div><div class='add'>+0x6f, 0x64, 0x6f, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x69, 0x64, 0x65, 0x65, 0x64,</div><div class='add'>+0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x61, 0x67, 0x61, 0x61, 0x6c, 0x61, 0x61, 0x64, 0x3b,</div><div class='add'>+0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20,</div><div class='add'>+0x4b, 0x6f, 0x77, 0x20, 0x69, 0x79, 0x6f, 0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68,</div><div class='add'>+0x61, 0x20, 0x4c, 0x61, 0x62, 0x61, 0x20, 0x69, 0x79, 0x6f, 0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x4b,</div><div class='add'>+0x3b, 0x4c, 0x3b, 0x53, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x4b,</div><div class='add'>+0x3b, 0x4c, 0x3b, 0x65, 0x6e, 0x65, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x62, 0x72, 0x3b, 0x6d,</div><div class='add'>+0x61, 0x79, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f,</div><div class='add'>+0x63, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x69, 0x63, 0x3b, 0x65, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x62,</div><div class='add'>+0x72, 0x65, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x79,</div><div class='add'>+0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f,</div><div class='add'>+0x3b, 0x73, 0x65, 0x70, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b,</div><div class='add'>+0x6e, 0x6f, 0x76, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x69, 0x63, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b,</div><div class='add'>+0x45, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b,</div><div class='add'>+0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b,</div><div class='add'>+0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b,</div><div class='add'>+0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b,</div><div class='add'>+0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c,</div><div class='add'>+0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x6f,</div><div class='add'>+0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b,</div><div class='add'>+0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x6a, 0x61, 0x6e, 0x75,</div><div class='add'>+0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70,</div><div class='add'>+0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75,</div><div class='add'>+0x67, 0x75, 0x73, 0x74, 0x69, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f,</div><div class='add'>+0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65,</div><div class='add'>+0x72, 0x3b, 0x42f, 0x43d, 0x432, 0x3b, 0x424, 0x435, 0x432, 0x3b, 0x41c, 0x430, 0x440, 0x3b, 0x410, 0x43f, 0x440, 0x3b, 0x41c, 0x430,</div><div class='add'>+0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x3b, 0x418, 0x44e, 0x43b, 0x3b, 0x410, 0x432, 0x433, 0x3b, 0x421, 0x435, 0x43d, 0x3b, 0x41e, 0x43a,</div><div class='add'>+0x442, 0x3b, 0x41d, 0x43e, 0x44f, 0x3b, 0x414, 0x435, 0x43a, 0x3b, 0x42f, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x424, 0x435, 0x432, 0x440,</div><div class='add'>+0x430, 0x43b, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e,</div><div class='add'>+0x43d, 0x3b, 0x418, 0x44e, 0x43b, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440,</div><div class='add'>+0x3b, 0x41e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x3b, 0x41d, 0x43e, 0x44f, 0x431, 0x440, 0x3b, 0x414, 0x435, 0x43a, 0x430, 0x431, 0x440,</div><div class='add'>+0x3b, 0xb9c, 0xba9, 0x2e, 0x3b, 0xbaa, 0xbbf, 0xbaa, 0xbcd, 0x2e, 0x3b, 0xbae, 0xbbe, 0xbb0, 0xbcd, 0x2e, 0x3b, 0xb8f, 0xbaa, 0xbcd,</div><div class='add'>+0x2e, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0xba9, 0xbcd, 0x3b, 0xb9c, 0xbc2, 0xbb2, 0xbc8, 0x3b, 0xb86, 0xb95, 0x2e, 0x3b, 0xb9a,</div><div class='add'>+0xbc6, 0xbaa, 0xbcd, 0x2e, 0x3b, 0xb85, 0xb95, 0xbcd, 0x2e, 0x3b, 0xba8, 0xbb5, 0x2e, 0x3b, 0xb9f, 0xbbf, 0xb9a, 0x2e, 0x3b, 0xb9c,</div><div class='add'>+0xba9, 0xbb5, 0xbb0, 0xbbf, 0x3b, 0xbaa, 0xbbf, 0xbaa, 0xbcd, 0xbb0, 0xbb5, 0xbb0, 0xbbf, 0x3b, 0xbae, 0xbbe, 0xbb0, 0xbcd, 0xb9a, 0xbcd,</div><div class='add'>+0x3b, 0xb8f, 0xbaa, 0xbcd, 0xbb0, 0xbb2, 0xbcd, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0xba9, 0xbcd, 0x3b, 0xb9c, 0xbc2, 0xbb2, 0xbc8,</div><div class='add'>+0x3b, 0xb86, 0xb95, 0xbb8, 0xbcd, 0xb9f, 0xbcd, 0x3b, 0xb9a, 0xbc6, 0xbaa, 0xbcd, 0xb9f, 0xbc6, 0xbae, 0xbcd, 0xbaa, 0xbcd, 0xbb0, 0xbcd,</div><div class='add'>+0x3b, 0xb85, 0xb95, 0xbcd, 0xb9f, 0xbcb, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xba8, 0xbb5, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xb9f, 0xbbf,</div><div class='add'>+0xb9a, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xb9c, 0x3b, 0xbaa, 0xbbf, 0x3b, 0xbae, 0xbbe, 0x3b, 0xb8f, 0x3b, 0xbae, 0xbc7, 0x3b,</div><div class='add'>+0xb9c, 0xbc2, 0x3b, 0xb9c, 0xbc2, 0x3b, 0xb86, 0x3b, 0xb9a, 0xbc6, 0x3b, 0xb85, 0x3b, 0xba8, 0x3b, 0xb9f, 0xbbf, 0x3b, 0xc1c, 0xc28,</div><div class='add'>+0xc35, 0xc30, 0xc3f, 0x3b, 0xc2b, 0xc3f, 0xc2c, 0xc4d, 0xc30, 0xc35, 0xc30, 0xc3f, 0x3b, 0xc2e, 0xc3e, 0xc30, 0xc4d, 0xc1a, 0xc3f, 0x3b,</div><div class='add'>+0xc0f, 0xc2a, 0xc4d, 0xc30, 0xc3f, 0xc32, 0xc4d, 0x3b, 0xc2e, 0xc47, 0x3b, 0xc1c, 0xc42, 0xc28, 0xc4d, 0x3b, 0xc1c, 0xc42, 0xc32, 0xc48,</div><div class='add'>+0x3b, 0xc06, 0xc17, 0xc38, 0xc4d, 0xc1f, 0xc41, 0x3b, 0xc38, 0xc46, 0xc2a, 0xc4d, 0xc1f, 0xc46, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc05,</div><div class='add'>+0xc15, 0xc4d, 0xc1f, 0xc4b, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc28, 0xc35, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc21, 0xc3f, 0xc38, 0xc46, 0xc02,</div><div class='add'>+0xc2c, 0xc30, 0xc4d, 0x3b, 0xc1c, 0x3b, 0xc2b, 0xc3f, 0x3b, 0xc2e, 0x3b, 0xc0e, 0x3b, 0xc2e, 0xc46, 0x3b, 0xc1c, 0xc41, 0x3b, 0xc1c,</div><div class='add'>+0xc41, 0x3b, 0xc06, 0x3b, 0xc38, 0xc46, 0x3b, 0xc05, 0x3b, 0xc28, 0x3b, 0xc21, 0xc3f, 0x3b, 0xe21, 0x2e, 0xe04, 0x2e, 0x3b, 0xe01,</div><div class='add'>+0x2e, 0xe1e, 0x2e, 0x3b, 0xe21, 0xe35, 0x2e, 0xe04, 0x2e, 0x3b, 0xe40, 0xe21, 0x2e, 0xe22, 0x2e, 0x3b, 0xe1e, 0x2e, 0xe04, 0x2e,</div><div class='add'>+0x3b, 0xe21, 0xe34, 0x2e, 0xe22, 0x2e, 0x3b, 0xe01, 0x2e, 0xe04, 0x2e, 0x3b, 0xe2a, 0x2e, 0xe04, 0x2e, 0x3b, 0xe01, 0x2e, 0xe22,</div><div class='add'>+0x2e, 0x3b, 0xe15, 0x2e, 0xe04, 0x2e, 0x3b, 0xe1e, 0x2e, 0xe22, 0x2e, 0x3b, 0xe18, 0x2e, 0xe04, 0x2e, 0x3b, 0xe21, 0xe01, 0xe23,</div><div class='add'>+0xe32, 0xe04, 0xe21, 0x3b, 0xe01, 0xe38, 0xe21, 0xe20, 0xe32, 0xe1e, 0xe31, 0xe19, 0xe18, 0xe4c, 0x3b, 0xe21, 0xe35, 0xe19, 0xe32, 0xe04,</div><div class='add'>+0xe21, 0x3b, 0xe40, 0xe21, 0xe29, 0xe32, 0xe22, 0xe19, 0x3b, 0xe1e, 0xe24, 0xe29, 0xe20, 0xe32, 0xe04, 0xe21, 0x3b, 0xe21, 0xe34, 0xe16,</div><div class='add'>+0xe38, 0xe19, 0xe32, 0xe22, 0xe19, 0x3b, 0xe01, 0xe23, 0xe01, 0xe0e, 0xe32, 0xe04, 0xe21, 0x3b, 0xe2a, 0xe34, 0xe07, 0xe2b, 0xe32, 0xe04,</div><div class='add'>+0xe21, 0x3b, 0xe01, 0xe31, 0xe19, 0xe22, 0xe32, 0xe22, 0xe19, 0x3b, 0xe15, 0xe38, 0xe25, 0xe32, 0xe04, 0xe21, 0x3b, 0xe1e, 0xe24, 0xe28,</div><div class='add'>+0xe08, 0xe34, 0xe01, 0xe32, 0xe22, 0xe19, 0x3b, 0xe18, 0xe31, 0xe19, 0xe27, 0xe32, 0xe04, 0xe21, 0x3b, 0xe21, 0x3b, 0xe01, 0x3b, 0xe21,</div><div class='add'>+0x3b, 0xe21, 0x3b, 0xe1e, 0x3b, 0xe21, 0x3b, 0xe01, 0x3b, 0xe2a, 0x3b, 0xe01, 0x3b, 0xe15, 0x3b, 0xe1e, 0x3b, 0xe18, 0x3b, 0xf5f,</div><div class='add'>+0xfb3, 0xf0b, 0xf21, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf22, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf23, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf24, 0x3b, 0xf5f,</div><div class='add'>+0xfb3, 0xf0b, 0xf25, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf26, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf27, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf28, 0x3b, 0xf5f,</div><div class='add'>+0xfb3, 0xf0b, 0xf29, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf20, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf21, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21,</div><div class='add'>+0xf22, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf44, 0xf0b, 0xf54, 0xf7c, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42,</div><div class='add'>+0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f,</div><div class='add'>+0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54,</div><div class='add'>+0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b,</div><div class='add'>+0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54,</div><div class='add'>+0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56,</div><div class='add'>+0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b,</div><div class='add'>+0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b,</div><div class='add'>+0x1325, 0x122a, 0x3b, 0x1208, 0x12ab, 0x1272, 0x3b, 0x1218, 0x130b, 0x1262, 0x3b, 0x121a, 0x12eb, 0x12dd, 0x3b, 0x130d, 0x1295, 0x1266, 0x3b, 0x1230,</div><div class='add'>+0x1290, 0x3b, 0x1213, 0x121d, 0x1208, 0x3b, 0x1290, 0x1213, 0x1230, 0x3b, 0x1218, 0x1235, 0x12a8, 0x3b, 0x1325, 0x1245, 0x121d, 0x3b, 0x1215, 0x12f3,</div><div class='add'>+0x122d, 0x3b, 0x1273, 0x1215, 0x1233, 0x3b, 0x1325, 0x122a, 0x3b, 0x1208, 0x12ab, 0x1272, 0x1275, 0x3b, 0x1218, 0x130b, 0x1262, 0x1275, 0x3b, 0x121a,</div><div class='add'>+0x12eb, 0x12dd, 0x12eb, 0x3b, 0x130d, 0x1295, 0x1266, 0x1275, 0x3b, 0x1230, 0x1290, 0x3b, 0x1213, 0x121d, 0x1208, 0x3b, 0x1290, 0x1213, 0x1230, 0x3b,</div><div class='add'>+0x1218, 0x1235, 0x12a8, 0x1228, 0x121d, 0x3b, 0x1325, 0x1245, 0x121d, 0x1272, 0x3b, 0x1215, 0x12f3, 0x122d, 0x3b, 0x1273, 0x1215, 0x1233, 0x1235, 0x3b,</div><div class='add'>+0x53, 0x101, 0x6e, 0x3b, 0x46, 0x113, 0x70, 0x3b, 0x4d, 0x61, 0x2bb, 0x61, 0x3b, 0x2bb, 0x45, 0x70, 0x65, 0x3b, 0x4d, 0x113,</div><div class='add'>+0x3b, 0x53, 0x75, 0x6e, 0x3b, 0x53, 0x69, 0x75, 0x3b, 0x2bb, 0x41, 0x6f, 0x6b, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x2bb, 0x4f,</div><div class='add'>+0x6b, 0x61, 0x3b, 0x4e, 0x14d, 0x76, 0x3b, 0x54, 0x12b, 0x73, 0x3b, 0x53, 0x101, 0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x46,</div><div class='add'>+0x113, 0x70, 0x75, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x2bb, 0x61, 0x73, 0x69, 0x3b, 0x2bb, 0x45, 0x70, 0x65, 0x6c, 0x65,</div><div class='add'>+0x6c, 0x69, 0x3b, 0x4d, 0x113, 0x3b, 0x53, 0x75, 0x6e, 0x65, 0x3b, 0x53, 0x69, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x2bb, 0x41,</div><div class='add'>+0x6f, 0x6b, 0x6f, 0x73, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x74,</div><div class='add'>+0x6f, 0x70, 0x61, 0x3b, 0x4e, 0x14d, 0x76, 0x65, 0x6d, 0x61, 0x3b, 0x54, 0x12b, 0x73, 0x65, 0x6d, 0x61, 0x3b, 0x53, 0x3b,</div><div class='add'>+0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b,</div><div class='add'>+0x54, 0x3b, 0x53, 0x75, 0x6e, 0x3b, 0x59, 0x61, 0x6e, 0x3b, 0x4b, 0x75, 0x6c, 0x3b, 0x44, 0x7a, 0x69, 0x3b, 0x4d, 0x75,</div><div class='add'>+0x64, 0x3b, 0x4b, 0x68, 0x6f, 0x3b, 0x4d, 0x61, 0x77, 0x3b, 0x4d, 0x68, 0x61, 0x3b, 0x4e, 0x64, 0x7a, 0x3b, 0x4e, 0x68,</div><div class='add'>+0x6c, 0x3b, 0x48, 0x75, 0x6b, 0x3b, 0x4e, 0x27, 0x77, 0x3b, 0x53, 0x75, 0x6e, 0x67, 0x75, 0x74, 0x69, 0x3b, 0x4e, 0x79,</div><div class='add'>+0x65, 0x6e, 0x79, 0x65, 0x6e, 0x79, 0x61, 0x6e, 0x69, 0x3b, 0x4e, 0x79, 0x65, 0x6e, 0x79, 0x61, 0x6e, 0x6b, 0x75, 0x6c,</div><div class='add'>+0x75, 0x3b, 0x44, 0x7a, 0x69, 0x76, 0x61, 0x6d, 0x69, 0x73, 0x6f, 0x6b, 0x6f, 0x3b, 0x4d, 0x75, 0x64, 0x79, 0x61, 0x78,</div><div class='add'>+0x69, 0x68, 0x69, 0x3b, 0x4b, 0x68, 0x6f, 0x74, 0x61, 0x76, 0x75, 0x78, 0x69, 0x6b, 0x61, 0x3b, 0x4d, 0x61, 0x77, 0x75,</div><div class='add'>+0x77, 0x61, 0x6e, 0x69, 0x3b, 0x4d, 0x68, 0x61, 0x77, 0x75, 0x72, 0x69, 0x3b, 0x4e, 0x64, 0x7a, 0x68, 0x61, 0x74, 0x69,</div><div class='add'>+0x3b, 0x4e, 0x68, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x3b, 0x48, 0x75, 0x6b, 0x75, 0x72, 0x69, 0x3b, 0x4e, 0x27,</div><div class='add'>+0x77, 0x65, 0x6e, 0x64, 0x7a, 0x61, 0x6d, 0x68, 0x61, 0x6c, 0x61, 0x3b, 0x4f, 0x63, 0x61, 0x3b, 0x15e, 0x75, 0x62, 0x3b,</div><div class='add'>+0x4d, 0x61, 0x72, 0x3b, 0x4e, 0x69, 0x73, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48, 0x61, 0x7a, 0x3b, 0x54, 0x65, 0x6d, 0x3b,</div><div class='add'>+0x41, 0x11f, 0x75, 0x3b, 0x45, 0x79, 0x6c, 0x3b, 0x45, 0x6b, 0x69, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x41, 0x72, 0x61, 0x3b,</div><div class='add'>+0x4f, 0x63, 0x61, 0x6b, 0x3b, 0x15e, 0x75, 0x62, 0x61, 0x74, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x4e, 0x69, 0x73, 0x61,</div><div class='add'>+0x6e, 0x3b, 0x4d, 0x61, 0x79, 0x131, 0x73, 0x3b, 0x48, 0x61, 0x7a, 0x69, 0x72, 0x61, 0x6e, 0x3b, 0x54, 0x65, 0x6d, 0x6d,</div><div class='add'>+0x75, 0x7a, 0x3b, 0x41, 0x11f, 0x75, 0x73, 0x74, 0x6f, 0x73, 0x3b, 0x45, 0x79, 0x6c, 0xfc, 0x6c, 0x3b, 0x45, 0x6b, 0x69,</div><div class='add'>+0x6d, 0x3b, 0x4b, 0x61, 0x73, 0x131, 0x6d, 0x3b, 0x41, 0x72, 0x61, 0x6c, 0x131, 0x6b, 0x3b, 0x4f, 0x3b, 0x15e, 0x3b, 0x4d,</div><div class='add'>+0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x45, 0x3b, 0x45, 0x3b, 0x4b, 0x3b, 0x41, 0x3b, 0x441,</div><div class='add'>+0x456, 0x447, 0x2e, 0x3b, 0x43b, 0x44e, 0x442, 0x2e, 0x3b, 0x431, 0x435, 0x440, 0x2e, 0x3b, 0x43a, 0x432, 0x456, 0x442, 0x2e, 0x3b,</div><div class='add'>+0x442, 0x440, 0x430, 0x432, 0x2e, 0x3b, 0x447, 0x435, 0x440, 0x432, 0x2e, 0x3b, 0x43b, 0x438, 0x43f, 0x2e, 0x3b, 0x441, 0x435, 0x440,</div><div class='add'>+0x43f, 0x2e, 0x3b, 0x432, 0x435, 0x440, 0x2e, 0x3b, 0x436, 0x43e, 0x432, 0x442, 0x2e, 0x3b, 0x43b, 0x438, 0x441, 0x442, 0x2e, 0x3b,</div><div class='add'>+0x433, 0x440, 0x443, 0x434, 0x2e, 0x3b, 0x441, 0x456, 0x447, 0x43d, 0x44f, 0x3b, 0x43b, 0x44e, 0x442, 0x43e, 0x433, 0x43e, 0x3b, 0x431,</div><div class='add'>+0x435, 0x440, 0x435, 0x437, 0x43d, 0x44f, 0x3b, 0x43a, 0x432, 0x456, 0x442, 0x43d, 0x44f, 0x3b, 0x442, 0x440, 0x430, 0x432, 0x43d, 0x44f,</div><div class='add'>+0x3b, 0x447, 0x435, 0x440, 0x432, 0x43d, 0x44f, 0x3b, 0x43b, 0x438, 0x43f, 0x43d, 0x44f, 0x3b, 0x441, 0x435, 0x440, 0x43f, 0x43d, 0x44f,</div><div class='add'>+0x3b, 0x432, 0x435, 0x440, 0x435, 0x441, 0x43d, 0x44f, 0x3b, 0x436, 0x43e, 0x432, 0x442, 0x43d, 0x44f, 0x3b, 0x43b, 0x438, 0x441, 0x442,</div><div class='add'>+0x43e, 0x43f, 0x430, 0x434, 0x430, 0x3b, 0x433, 0x440, 0x443, 0x434, 0x43d, 0x44f, 0x3b, 0x421, 0x3b, 0x41b, 0x3b, 0x411, 0x3b, 0x41a,</div><div class='add'>+0x3b, 0x422, 0x3b, 0x427, 0x3b, 0x41b, 0x3b, 0x421, 0x3b, 0x412, 0x3b, 0x416, 0x3b, 0x41b, 0x3b, 0x413, 0x3b, 0x62c, 0x646, 0x648,</div><div class='add'>+0x631, 0x6cc, 0x3b, 0x641, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x20, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x64a, 0x644,</div><div class='add'>+0x3b, 0x645, 0x626, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x626, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633,</div><div class='add'>+0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633,</div><div class='add'>+0x645, 0x628, 0x631, 0x3b, 0x41c, 0x443, 0x4b3, 0x430, 0x440, 0x440, 0x430, 0x43c, 0x3b, 0x421, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x420,</div><div class='add'>+0x430, 0x431, 0x438, 0x443, 0x43b, 0x2d, 0x430, 0x432, 0x432, 0x430, 0x43b, 0x3b, 0x420, 0x430, 0x431, 0x438, 0x443, 0x43b, 0x2d, 0x43e,</div><div class='add'>+0x445, 0x438, 0x440, 0x3b, 0x416, 0x443, 0x43c, 0x43e, 0x434, 0x438, 0x443, 0x43b, 0x2d, 0x443, 0x43b, 0x43e, 0x3b, 0x416, 0x443, 0x43c,</div><div class='add'>+0x43e, 0x434, 0x438, 0x443, 0x43b, 0x2d, 0x443, 0x445, 0x440, 0x43e, 0x3b, 0x420, 0x430, 0x436, 0x430, 0x431, 0x3b, 0x428, 0x430, 0x44a,</div><div class='add'>+0x431, 0x43e, 0x43d, 0x3b, 0x420, 0x430, 0x43c, 0x430, 0x437, 0x43e, 0x43d, 0x3b, 0x428, 0x430, 0x432, 0x432, 0x43e, 0x43b, 0x3b, 0x417,</div><div class='add'>+0x438, 0x43b, 0x2d, 0x49b, 0x430, 0x44a, 0x434, 0x430, 0x3b, 0x417, 0x438, 0x43b, 0x2d, 0x4b3, 0x438, 0x436, 0x436, 0x430, 0x3b, 0x62c,</div><div class='add'>+0x646, 0x648, 0x3b, 0x641, 0x628, 0x631, 0x3b, 0x645, 0x627, 0x631, 0x3b, 0x627, 0x67e, 0x631, 0x3b, 0x645, 0x640, 0x6cc, 0x3b, 0x62c,</div><div class='add'>+0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x3b, 0x627, 0x6af, 0x633, 0x3b, 0x633, 0x67e, 0x62a, 0x3b, 0x627, 0x6a9, 0x62a, 0x3b, 0x646,</div><div class='add'>+0x648, 0x645, 0x3b, 0x62f, 0x633, 0x645, 0x3b, 0x59, 0x61, 0x6e, 0x76, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b,</div><div class='add'>+0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x49, 0x79, 0x75, 0x6e, 0x3b, 0x49, 0x79, 0x75, 0x6c, 0x3b, 0x41, 0x76,</div><div class='add'>+0x67, 0x3b, 0x53, 0x65, 0x6e, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x79, 0x61, 0x3b, 0x44, 0x65, 0x6b, 0x3b, 0x59,</div><div class='add'>+0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e,</div><div class='add'>+0x3b, 0x44, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x32, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x33,</div><div class='add'>+0x3b, 0x74, 0x68, 0x67, 0x20, 0x34, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x35, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x36, 0x3b, 0x74,</div><div class='add'>+0x68, 0x67, 0x20, 0x37, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x38, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x39, 0x3b, 0x74, 0x68, 0x67,</div><div class='add'>+0x20, 0x31, 0x30, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x31, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x32, 0x3b, 0x74, 0x68,</div><div class='add'>+0xe1, 0x6e, 0x67, 0x20, 0x6d, 0x1ed9, 0x74, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x68, 0x61, 0x69, 0x3b, 0x74, 0x68,</div><div class='add'>+0xe1, 0x6e, 0x67, 0x20, 0x62, 0x61, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x74, 0x1b0, 0x3b, 0x74, 0x68, 0xe1, 0x6e,</div><div class='add'>+0x67, 0x20, 0x6e, 0x103, 0x6d, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x73, 0xe1, 0x75, 0x3b, 0x74, 0x68, 0xe1, 0x6e,</div><div class='add'>+0x67, 0x20, 0x62, 0x1ea3, 0x79, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x74, 0xe1, 0x6d, 0x3b, 0x74, 0x68, 0xe1, 0x6e,</div><div class='add'>+0x67, 0x20, 0x63, 0x68, 0xed, 0x6e, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x6d, 0x1b0, 0x1edd, 0x69, 0x3b, 0x74, 0x68,</div><div class='add'>+0xe1, 0x6e, 0x67, 0x20, 0x6d, 0x1b0, 0x1edd, 0x69, 0x20, 0x6d, 0x1ed9, 0x74, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x6d,</div><div class='add'>+0x1b0, 0x1edd, 0x69, 0x20, 0x68, 0x61, 0x69, 0x3b, 0x49, 0x6f, 0x6e, 0x3b, 0x43, 0x68, 0x77, 0x65, 0x66, 0x3b, 0x4d, 0x61,</div><div class='add'>+0x77, 0x72, 0x74, 0x68, 0x3b, 0x45, 0x62, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x65, 0x68, 0x3b,</div><div class='add'>+0x47, 0x6f, 0x72, 0x66, 0x66, 0x3b, 0x41, 0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79, 0x64, 0x3b,</div><div class='add'>+0x54, 0x61, 0x63, 0x68, 0x3b, 0x52, 0x68, 0x61, 0x67, 0x3b, 0x49, 0x6f, 0x6e, 0x61, 0x77, 0x72, 0x3b, 0x43, 0x68, 0x77,</div><div class='add'>+0x65, 0x66, 0x72, 0x6f, 0x72, 0x3b, 0x4d, 0x61, 0x77, 0x72, 0x74, 0x68, 0x3b, 0x45, 0x62, 0x72, 0x69, 0x6c, 0x6c, 0x3b,</div><div class='add'>+0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x65, 0x68, 0x65, 0x66, 0x69, 0x6e, 0x3b, 0x47, 0x6f, 0x72, 0x66, 0x66, 0x65, 0x6e, 0x61,</div><div class='add'>+0x66, 0x3b, 0x41, 0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79, 0x64, 0x72, 0x65, 0x66, 0x3b, 0x54,</div><div class='add'>+0x61, 0x63, 0x68, 0x77, 0x65, 0x64, 0x64, 0x3b, 0x52, 0x68, 0x61, 0x67, 0x66, 0x79, 0x72, 0x3b, 0x49, 0x3b, 0x43, 0x3b,</div><div class='add'>+0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x52, 0x3b,</div><div class='add'>+0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x74, 0x3b, 0x45, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b,</div><div class='add'>+0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b,</div><div class='add'>+0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x79, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65,</div><div class='add'>+0x62, 0x72, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x74, 0x73, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x72, 0x65, 0x6c,</div><div class='ctx'> 0x69, 0x3b, 0x4d, 0x65, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x79, 0x69, 0x3b, 0x41,</div><div class='del'>-0x72, 0x68, 0x6f, 0x73, 0x74, 0x6f, 0x73, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b,</div><div class='del'>-0x74, 0x6f, 0x62, 0x61, 0x3b, 0x55, 0x73, 0x69, 0x6e, 0x79, 0x69, 0x6b, 0x68, 0x61, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73,</div><div class='del'>-0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x74, 0x3b, 0x41, 0x70, 0x6f,</div><div class='del'>-0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74,</div><div class='del'>-0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x66, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72,</div><div class='del'>-0x65, 0x3b, 0x46, 0x65, 0x62, 0x65, 0x72, 0x77, 0x61, 0x72, 0x65, 0x3b, 0x4d, 0x61, 0x74, 0x161, 0x68, 0x65, 0x3b, 0x41,</div><div class='del'>-0x70, 0x6f, 0x72, 0x65, 0x6c, 0x65, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6c, 0x61,</div><div class='del'>-0x65, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x73, 0x65, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x65, 0x72, 0x65, 0x3b,</div><div class='del'>-0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x6f, 0x72, 0x65, 0x3b, 0x4e, 0x6f, 0x66, 0x65, 0x6d, 0x65, 0x72, 0x65, 0x3b, 0x44, 0x69,</div><div class='del'>-0x73, 0x65, 0x6d, 0x65, 0x72, 0x65, 0x3b, 0x6f, 0x111, 0x111, 0x61, 0x6a, 0x61, 0x67, 0x65, 0x3b, 0x67, 0x75, 0x6f, 0x76,</div><div class='del'>-0x76, 0x61, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x10d, 0x61, 0x3b, 0x63, 0x75, 0x6f, 0x14b, 0x6f, 0x3b, 0x6d, 0x69, 0x65, 0x73,</div><div class='del'>-0x73, 0x65, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x73, 0x65, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x64, 0x6e, 0x65, 0x3b, 0x62, 0x6f,</div><div class='del'>-0x72, 0x67, 0x65, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x61, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x67, 0x6f, 0x74, 0x3b, 0x73, 0x6b,</div><div class='del'>-0xe1, 0x62, 0x6d, 0x61, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c, 0x61, 0x3b, 0x6f, 0x111, 0x111, 0x61, 0x6a, 0x61, 0x67, 0x65,</div><div class='del'>-0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x76, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6e, 0x6a,</div><div class='del'>-0x75, 0x6b, 0x10d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x63, 0x75, 0x6f, 0x14b, 0x6f, 0x6d, 0xe1, 0x6e, 0x6e, 0x75,</div><div class='del'>-0x3b, 0x6d, 0x69, 0x65, 0x73, 0x73, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x73, 0x65, 0x6d,</div><div class='del'>-0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x64, 0x6e, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x62, 0x6f,</div><div class='del'>-0x72, 0x67, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b,</div><div class='del'>-0x67, 0x6f, 0x6c, 0x67, 0x67, 0x6f, 0x74, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x73, 0x6b, 0xe1, 0x62, 0x6d, 0x61, 0x6d,</div><div class='del'>-0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x4f, 0x3b, 0x47,</div><div class='del'>-0x3b, 0x4e, 0x3b, 0x43, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x42, 0x3b, 0x10c, 0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x4a,</div><div class='del'>-0x3b, 0x6f, 0x111, 0x111, 0x6a, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x3b, 0x63, 0x75, 0x6f, 0x3b,</div><div class='del'>-0x6d, 0x69, 0x65, 0x73, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x3b, 0x62, 0x6f, 0x72, 0x67, 0x3b,</div><div class='del'>-0x10d, 0x61, 0x6b, 0x10d, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x3b, 0x73, 0x6b, 0xe1, 0x62, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x3b,</div><div class='del'>-0x4b, 0x69, 0x69, 0x3b, 0x44, 0x68, 0x69, 0x3b, 0x54, 0x72, 0x69, 0x3b, 0x53, 0x70, 0x69, 0x3b, 0x52, 0x69, 0x69, 0x3b,</div><div class='del'>-0x4d, 0x74, 0x69, 0x3b, 0x45, 0x6d, 0x69, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x6e, 0x69, 0x3b, 0x4d, 0x78, 0x69, 0x3b,</div><div class='del'>-0x4d, 0x78, 0x6b, 0x3b, 0x4d, 0x78, 0x64, 0x3b, 0x4b, 0x69, 0x6e, 0x67, 0x61, 0x6c, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b,</div><div class='del'>-0x44, 0x68, 0x61, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x54, 0x72, 0x75, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x53, 0x70,</div><div class='del'>-0x61, 0x74, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x52, 0x69, 0x6d, 0x61, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4d, 0x61,</div><div class='del'>-0x74, 0x61, 0x72, 0x75, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x45, 0x6d, 0x70, 0x69, 0x74, 0x75, 0x20, 0x69, 0x64, 0x61,</div><div class='del'>-0x73, 0x3b, 0x4d, 0x61, 0x73, 0x70, 0x61, 0x74, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4d, 0x6e, 0x67, 0x61, 0x72, 0x69,</div><div class='del'>-0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4d, 0x61, 0x78, 0x61, 0x6c, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4d, 0x61, 0x78,</div><div class='del'>-0x61, 0x6c, 0x20, 0x6b, 0x69, 0x6e, 0x67, 0x61, 0x6c, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4d, 0x61, 0x78, 0x61, 0x6c,</div><div class='del'>-0x20, 0x64, 0x68, 0x61, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4b, 0x3b, 0x44, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x52, 0x3b,</div><div class='del'>-0x4d, 0x3b, 0x45, 0x3b, 0x50, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x44, 0x3b, 0x43, 0x61, 0x6e, 0x3b, 0x46, 0x65,</div><div class='del'>-0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x43, 0x75,</div><div class='del'>-0x6c, 0x3b, 0x41, 0x67, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69,</div><div class='del'>-0x73, 0x3b, 0x43, 0x68, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x75, 0x72, 0x61, 0x72, 0x69, 0x3b,</div><div class='del'>-0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x69, 0x72, 0x69, 0x72, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75,</div><div class='del'>-0x6e, 0x69, 0x3b, 0x43, 0x68, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70,</div><div class='del'>-0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x69, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x62, 0x65, 0x6d, 0x62,</div><div class='del'>-0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x43, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b,</div><div class='del'>-0x4a, 0x3b, 0x43, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x49, 0x6d, 0x62, 0x3b, 0x4b, 0x61,</div><div class='del'>-0x77, 0x3b, 0x4b, 0x61, 0x64, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x4b, 0x61, 0x72, 0x3b, 0x4d, 0x66,</div><div class='del'>-0x75, 0x3b, 0x57, 0x75, 0x6e, 0x3b, 0x49, 0x6b, 0x65, 0x3b, 0x49, 0x6b, 0x75, 0x3b, 0x49, 0x6d, 0x77, 0x3b, 0x49, 0x77,</div><div class='del'>-0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6d, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4d,</div><div class='del'>-0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x77, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67,</div><div class='del'>-0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x64, 0x61, 0x64, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61,</div><div class='del'>-0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x73, 0x61,</div><div class='del'>-0x6e, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x72, 0x61, 0x6e, 0x64, 0x61,</div><div class='del'>-0x64, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6d, 0x66, 0x75, 0x6e, 0x67, 0x61, 0x64,</div><div class='del'>-0x65, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x77, 0x75, 0x6e, 0x79, 0x61, 0x6e, 0x79, 0x61,</div><div class='del'>-0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x6f,</div><div class='del'>-0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67,</div><div class='del'>-0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x6d, 0x77, 0x65, 0x72, 0x69, 0x3b,</div><div class='del'>-0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69,</div><div class='del'>-0x77, 0x69, 0x3b, 0x49, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x57, 0x3b, 0x49,</div><div class='del'>-0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x73, 0x69, 0x69, 0x3b, 0x63, 0x6f, 0x6c, 0x3b, 0x6d, 0x62, 0x6f, 0x3b, 0x73,</div><div class='del'>-0x65, 0x65, 0x3b, 0x64, 0x75, 0x75, 0x3b, 0x6b, 0x6f, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x3b, 0x6a, 0x75, 0x6b, 0x3b, 0x73,</div><div class='del'>-0x6c, 0x74, 0x3b, 0x79, 0x61, 0x72, 0x3b, 0x6a, 0x6f, 0x6c, 0x3b, 0x62, 0x6f, 0x77, 0x3b, 0x73, 0x69, 0x69, 0x6c, 0x6f,</div><div class='del'>-0x3b, 0x63, 0x6f, 0x6c, 0x74, 0x65, 0x3b, 0x6d, 0x62, 0x6f, 0x6f, 0x79, 0x3b, 0x73, 0x65, 0x65, 0x257, 0x74, 0x6f, 0x3b,</div><div class='del'>-0x64, 0x75, 0x75, 0x6a, 0x61, 0x6c, 0x3b, 0x6b, 0x6f, 0x72, 0x73, 0x65, 0x3b, 0x6d, 0x6f, 0x72, 0x73, 0x6f, 0x3b, 0x6a,</div><div class='del'>-0x75, 0x6b, 0x6f, 0x3b, 0x73, 0x69, 0x69, 0x6c, 0x74, 0x6f, 0x3b, 0x79, 0x61, 0x72, 0x6b, 0x6f, 0x6d, 0x61, 0x61, 0x3b,</div><div class='del'>-0x6a, 0x6f, 0x6c, 0x61, 0x6c, 0x3b, 0x62, 0x6f, 0x77, 0x74, 0x65, 0x3b, 0x73, 0x3b, 0x63, 0x3b, 0x6d, 0x3b, 0x73, 0x3b,</div><div class='del'>-0x64, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x73, 0x3b, 0x79, 0x3b, 0x6a, 0x3b, 0x62, 0x3b, 0x4a, 0x45, 0x4e, 0x3b,</div><div class='del'>-0x57, 0x4b, 0x52, 0x3b, 0x57, 0x47, 0x54, 0x3b, 0x57, 0x4b, 0x4e, 0x3b, 0x57, 0x54, 0x4e, 0x3b, 0x57, 0x54, 0x44, 0x3b,</div><div class='del'>-0x57, 0x4d, 0x4a, 0x3b, 0x57, 0x4e, 0x4e, 0x3b, 0x57, 0x4b, 0x44, 0x3b, 0x57, 0x49, 0x4b, 0x3b, 0x57, 0x4d, 0x57, 0x3b,</div><div class='del'>-0x44, 0x49, 0x54, 0x3b, 0x4e, 0x6a, 0x65, 0x6e, 0x75, 0x61, 0x72, 0x129, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77,</div><div class='del'>-0x61, 0x20, 0x6b, 0x65, 0x72, 0x129, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61,</div><div class='del'>-0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65,</div><div class='del'>-0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77,</div><div class='del'>-0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61,</div><div class='del'>-0x20, 0x6d, 0x169, 0x67, 0x77, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b,</div><div class='del'>-0x61, 0x6e, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6e, 0x64, 0x61,</div><div class='del'>-0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72,</div><div class='del'>-0x65, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x169, 0x6d, 0x77, 0x65, 0x3b, 0x4e,</div><div class='del'>-0x64, 0x69, 0x74, 0x68, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x47,</div><div class='del'>-0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x44, 0x3b, 0x4f, 0x62, 0x6f, 0x3b, 0x57, 0x61, 0x61,</div><div class='del'>-0x3b, 0x4f, 0x6b, 0x75, 0x3b, 0x4f, 0x6e, 0x67, 0x3b, 0x49, 0x6d, 0x65, 0x3b, 0x49, 0x6c, 0x65, 0x3b, 0x53, 0x61, 0x70,</div><div class='del'>-0x3b, 0x49, 0x73, 0x69, 0x3b, 0x53, 0x61, 0x61, 0x3b, 0x54, 0x6f, 0x6d, 0x3b, 0x54, 0x6f, 0x62, 0x3b, 0x54, 0x6f, 0x77,</div><div class='del'>-0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f, 0x62, 0x6f, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65,</div><div class='del'>-0x20, 0x77, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f, 0x6b, 0x75, 0x6e, 0x69,</div><div class='del'>-0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f, 0x6e, 0x67, 0x27, 0x77, 0x61, 0x6e, 0x3b, 0x4c, 0x61, 0x70,</div><div class='del'>-0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x6d, 0x65, 0x74, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x6c,</div><div class='del'>-0x65, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x73, 0x61, 0x70, 0x61, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20,</div><div class='del'>-0x6c, 0x65, 0x20, 0x69, 0x73, 0x69, 0x65, 0x74, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x73, 0x61, 0x61,</div><div class='del'>-0x6c, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x3b, 0x4c, 0x61, 0x70, 0x61,</div><div class='del'>-0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x6f, 0x62, 0x6f, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c,</div><div class='del'>-0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x77, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x4f, 0x3b, 0x57, 0x3b, 0x4f, 0x3b,</div><div class='del'>-0x4f, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x4a, 0x61,</div><div class='del'>-0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75,</div><div class='del'>-0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x75, 0x3b, 0x4e, 0x6f,</div><div class='del'>-0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x4a, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x76, 0x72, 0x65, 0x69,</div><div class='del'>-0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x63, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b,</div><div class='del'>-0x4a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x4a, 0x75, 0x6c, 0x68, 0x6f, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x6f, 0x3b,</div><div class='del'>-0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x4f, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65,</div><div class='del'>-0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x5a, 0x69, 0x62, 0x3b, 0x4e, 0x68,</div><div class='del'>-0x6c, 0x3b, 0x4d, 0x62, 0x69, 0x3b, 0x4d, 0x61, 0x62, 0x3b, 0x4e, 0x6b, 0x77, 0x3b, 0x4e, 0x68, 0x6c, 0x3b, 0x4e, 0x74,</div><div class='del'>-0x75, 0x3b, 0x4e, 0x63, 0x77, 0x3b, 0x4d, 0x70, 0x61, 0x3b, 0x4d, 0x66, 0x75, 0x3b, 0x4c, 0x77, 0x65, 0x3b, 0x4d, 0x70,</div><div class='del'>-0x61, 0x3b, 0x5a, 0x69, 0x62, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x6c, 0x61, 0x3b, 0x4e, 0x68, 0x6c, 0x6f, 0x6c, 0x61, 0x6e,</div><div class='del'>-0x6a, 0x61, 0x3b, 0x4d, 0x62, 0x69, 0x6d, 0x62, 0x69, 0x74, 0x68, 0x6f, 0x3b, 0x4d, 0x61, 0x62, 0x61, 0x73, 0x61, 0x3b,</div><div class='del'>-0x4e, 0x6b, 0x77, 0x65, 0x6e, 0x6b, 0x77, 0x65, 0x7a, 0x69, 0x3b, 0x4e, 0x68, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x61,</div><div class='del'>-0x3b, 0x4e, 0x74, 0x75, 0x6c, 0x69, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x4e, 0x63, 0x77, 0x61, 0x62, 0x61, 0x6b, 0x61, 0x7a,</div><div class='del'>-0x69, 0x3b, 0x4d, 0x70, 0x61, 0x6e, 0x64, 0x75, 0x6c, 0x61, 0x3b, 0x4d, 0x66, 0x75, 0x6d, 0x66, 0x75, 0x3b, 0x4c, 0x77,</div><div class='del'>-0x65, 0x7a, 0x69, 0x3b, 0x4d, 0x70, 0x61, 0x6c, 0x61, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x5a, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b,</div><div class='del'>-0x4d, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x31,</div><div class='del'>-0x3b, 0x4d, 0x32, 0x3b, 0x4d, 0x33, 0x3b, 0x4d, 0x34, 0x3b, 0x4d, 0x35, 0x3b, 0x4d, 0x36, 0x3b, 0x4d, 0x37, 0x3b, 0x4d,</div><div class='del'>-0x38, 0x3b, 0x4d, 0x39, 0x3b, 0x4d, 0x31, 0x30, 0x3b, 0x4d, 0x31, 0x31, 0x3b, 0x4d, 0x31, 0x32, 0x3b, 0x4d, 0x77, 0x65,</div><div class='del'>-0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77,</div><div class='del'>-0x61, 0x20, 0x6b, 0x61, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74,</div><div class='del'>-0x61, 0x74, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x61, 0x6e, 0x61, 0x3b, 0x4d,</div><div class='del'>-0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x74, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77,</div><div class='del'>-0x61, 0x20, 0x73, 0x69, 0x74, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x73, 0x61, 0x62, 0x61,</div><div class='del'>-0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6e, 0x61, 0x6e, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69,</div><div class='del'>-0x20, 0x77, 0x61, 0x20, 0x74, 0x69, 0x73, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b,</div><div class='del'>-0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e,</div><div class='del'>-0x61, 0x20, 0x6d, 0x6f, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d,</div><div class='del'>-0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x54,</div><div class='del'>-0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x69, 0x6e, 0x6e, 0x3b, 0x62,</div><div class='del'>-0x1e5b, 0x61, 0x3b, 0x6d, 0x61, 0x1e5b, 0x3b, 0x69, 0x62, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x79, 0x75, 0x6e, 0x3b, 0x79,</div><div class='del'>-0x75, 0x6c, 0x3b, 0x263, 0x75, 0x63, 0x3b, 0x63, 0x75, 0x74, 0x3b, 0x6b, 0x74, 0x75, 0x3b, 0x6e, 0x75, 0x77, 0x3b, 0x64,</div><div class='del'>-0x75, 0x6a, 0x3b, 0x69, 0x6e, 0x6e, 0x61, 0x79, 0x72, 0x3b, 0x62, 0x1e5b, 0x61, 0x79, 0x1e5b, 0x3b, 0x6d, 0x61, 0x1e5b, 0x1e63,</div><div class='del'>-0x3b, 0x69, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x79, 0x75, 0x3b, 0x79, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x79,</div><div class='del'>-0x75, 0x6c, 0x79, 0x75, 0x7a, 0x3b, 0x263, 0x75, 0x63, 0x74, 0x3b, 0x63, 0x75, 0x74, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b,</div><div class='del'>-0x6b, 0x74, 0x75, 0x62, 0x72, 0x3b, 0x6e, 0x75, 0x77, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x64, 0x75, 0x6a, 0x61, 0x6e,</div><div class='del'>-0x62, 0x69, 0x72, 0x3b, 0x69, 0x3b, 0x62, 0x3b, 0x6d, 0x3b, 0x69, 0x3b, 0x6d, 0x3b, 0x79, 0x3b, 0x79, 0x3b, 0x263, 0x3b,</div><div class='del'>-0x63, 0x3b, 0x6b, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x59, 0x65, 0x6e, 0x3b, 0x46, 0x75, 0x72, 0x3b, 0x4d, 0x65, 0x263, 0x3b,</div><div class='add'>+0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x68, 0x6f,</div><div class='add'>+0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x1e62,</div><div class='add'>+0x1eb9, 0x301, 0x72, 0x1eb9, 0x323, 0x3b, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x1eb8, 0x72, 0x1eb9, 0x300, 0x6e, 0xe0, 0x3b, 0xcc,</div><div class='add'>+0x67, 0x62, 0xe9, 0x3b, 0x1eb8, 0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x41, 0x67, 0x1eb9,</div><div class='add'>+0x6d, 0x1ecd, 0x3b, 0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x1ecc, 0x300, 0x77, 0xe0, 0x72, 0xe0,</div><div class='add'>+0x3b, 0x42, 0xe9, 0x6c, 0xfa, 0x3b, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x300, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x1e62, 0x1eb8, 0x301, 0x72,</div><div class='add'>+0x1eb9, 0x301, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x1eb8, 0x72, 0x1eb9,</div><div class='add'>+0x300, 0x6e, 0xe0, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0xcc, 0x67, 0x62, 0xe9, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x1eb8, 0x300, 0x62,</div><div class='add'>+0x69, 0x62, 0x69, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x41, 0x67,</div><div class='add'>+0x1eb9, 0x6d, 0x1ecd, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x4f, 0x77, 0x65,</div><div class='add'>+0x77, 0x65, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x1ecc, 0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x42, 0xe9,</div><div class='add'>+0x6c, 0xfa, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x300, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62,</div><div class='add'>+0x3b, 0x4d, 0x61, 0x73, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c,</div><div class='add'>+0x3b, 0x41, 0x67, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73,</div><div class='add'>+0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b,</div><div class='add'>+0x4d, 0x61, 0x73, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x79, 0x69, 0x3b, 0x4a, 0x75,</div><div class='add'>+0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x79, 0x69, 0x3b, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70,</div><div class='add'>+0x74, 0x68, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x68, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d,</div><div class='add'>+0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d,</div><div class='add'>+0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x6a, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41,</div><div class='add'>+0x76, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x4a,</div><div class='add'>+0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x41,</div><div class='add'>+0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x6a, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41,</div><div class='add'>+0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f,</div><div class='add'>+0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x61,</div><div class='add'>+0x72, 0x3b, 0x4a, 0x2d, 0x67, 0x75, 0x65, 0x72, 0x3b, 0x54, 0x2d, 0x61, 0x72, 0x72, 0x65, 0x65, 0x3b, 0x4d, 0x61, 0x79,</div><div class='add'>+0x72, 0x6e, 0x74, 0x3b, 0x41, 0x76, 0x72, 0x72, 0x69, 0x6c, 0x3b, 0x42, 0x6f, 0x61, 0x6c, 0x64, 0x79, 0x6e, 0x3b, 0x4d,</div><div class='add'>+0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4a, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4c, 0x75, 0x61,</div><div class='add'>+0x6e, 0x69, 0x73, 0x74, 0x79, 0x6e, 0x3b, 0x4d, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4a, 0x2d, 0x66, 0x6f,</div><div class='add'>+0x75, 0x79, 0x69, 0x72, 0x3b, 0x4d, 0x2e, 0x48, 0x6f, 0x75, 0x6e, 0x65, 0x79, 0x3b, 0x4d, 0x2e, 0x4e, 0x6f, 0x6c, 0x6c,</div><div class='add'>+0x69, 0x63, 0x6b, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x67, 0x65, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x54, 0x6f,</div><div class='add'>+0x73, 0x68, 0x69, 0x61, 0x67, 0x68, 0x74, 0x2d, 0x61, 0x72, 0x72, 0x65, 0x65, 0x3b, 0x4d, 0x61, 0x79, 0x72, 0x6e, 0x74,</div><div class='add'>+0x3b, 0x41, 0x76, 0x65, 0x72, 0x69, 0x6c, 0x3b, 0x42, 0x6f, 0x61, 0x6c, 0x64, 0x79, 0x6e, 0x3b, 0x4d, 0x65, 0x61, 0x6e,</div><div class='add'>+0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65,</div><div class='add'>+0x65, 0x3b, 0x4c, 0x75, 0x61, 0x6e, 0x69, 0x73, 0x74, 0x79, 0x6e, 0x3b, 0x4d, 0x65, 0x61, 0x6e, 0x2d, 0x66, 0x6f, 0x75,</div><div class='add'>+0x79, 0x69, 0x72, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4d, 0x65,</div><div class='add'>+0x65, 0x20, 0x48, 0x6f, 0x75, 0x6e, 0x65, 0x79, 0x3b, 0x4d, 0x65, 0x65, 0x20, 0x6e, 0x79, 0x20, 0x4e, 0x6f, 0x6c, 0x6c,</div><div class='add'>+0x69, 0x63, 0x6b, 0x3b, 0x47, 0x65, 0x6e, 0x3b, 0x57, 0x68, 0x65, 0x3b, 0x4d, 0x65, 0x72, 0x3b, 0x45, 0x62, 0x72, 0x3b,</div><div class='add'>+0x4d, 0x65, 0x3b, 0x45, 0x66, 0x6e, 0x3b, 0x47, 0x6f, 0x72, 0x3b, 0x45, 0x73, 0x74, 0x3b, 0x47, 0x77, 0x6e, 0x3b, 0x48,</div><div class='add'>+0x65, 0x64, 0x3b, 0x44, 0x75, 0x3b, 0x4b, 0x65, 0x76, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x47, 0x65, 0x6e, 0x76, 0x65, 0x72,</div><div class='add'>+0x3b, 0x4d, 0x79, 0x73, 0x20, 0x57, 0x68, 0x65, 0x76, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x4d, 0x65, 0x72,</div><div class='add'>+0x74, 0x68, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x45, 0x62, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x4d, 0x65, 0x3b,</div><div class='add'>+0x4d, 0x79, 0x73, 0x20, 0x45, 0x66, 0x61, 0x6e, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x47, 0x6f, 0x72, 0x74, 0x68, 0x65, 0x72,</div><div class='add'>+0x65, 0x6e, 0x3b, 0x4d, 0x79, 0x65, 0x20, 0x45, 0x73, 0x74, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x47, 0x77, 0x79, 0x6e, 0x67,</div><div class='add'>+0x61, 0x6c, 0x61, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x48, 0x65, 0x64, 0x72, 0x61, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x44, 0x75,</div><div class='add'>+0x3b, 0x4d, 0x79, 0x73, 0x20, 0x4b, 0x65, 0x76, 0x61, 0x72, 0x64, 0x68, 0x75, 0x3b, 0x53, 0x2d, 0x186, 0x3b, 0x4b, 0x2d,</div><div class='add'>+0x186, 0x3b, 0x45, 0x2d, 0x186, 0x3b, 0x45, 0x2d, 0x4f, 0x3b, 0x45, 0x2d, 0x4b, 0x3b, 0x4f, 0x2d, 0x41, 0x3b, 0x41, 0x2d,</div><div class='add'>+0x4b, 0x3b, 0x44, 0x2d, 0x186, 0x3b, 0x46, 0x2d, 0x190, 0x3b, 0x186, 0x2d, 0x41, 0x3b, 0x186, 0x2d, 0x4f, 0x3b, 0x4d, 0x2d,</div><div class='add'>+0x186, 0x3b, 0x53, 0x61, 0x6e, 0x64, 0x61, 0x2d, 0x186, 0x70, 0x25b, 0x70, 0x254, 0x6e, 0x3b, 0x4b, 0x77, 0x61, 0x6b, 0x77,</div><div class='add'>+0x61, 0x72, 0x2d, 0x186, 0x67, 0x79, 0x65, 0x66, 0x75, 0x6f, 0x3b, 0x45, 0x62, 0x254, 0x77, 0x2d, 0x186, 0x62, 0x65, 0x6e,</div><div class='add'>+0x65, 0x6d, 0x3b, 0x45, 0x62, 0x254, 0x62, 0x69, 0x72, 0x61, 0x2d, 0x4f, 0x66, 0x6f, 0x72, 0x69, 0x73, 0x75, 0x6f, 0x3b,</div><div class='add'>+0x45, 0x73, 0x75, 0x73, 0x6f, 0x77, 0x20, 0x41, 0x6b, 0x65, 0x74, 0x73, 0x65, 0x61, 0x62, 0x61, 0x2d, 0x4b, 0x254, 0x74,</div><div class='add'>+0x254, 0x6e, 0x69, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x62, 0x69, 0x72, 0x61, 0x64, 0x65, 0x2d, 0x41, 0x79, 0x25b, 0x77, 0x6f,</div><div class='add'>+0x68, 0x6f, 0x6d, 0x75, 0x6d, 0x75, 0x3b, 0x41, 0x79, 0x25b, 0x77, 0x6f, 0x68, 0x6f, 0x2d, 0x4b, 0x69, 0x74, 0x61, 0x77,</div><div class='add'>+0x6f, 0x6e, 0x73, 0x61, 0x3b, 0x44, 0x69, 0x66, 0x75, 0x75, 0x2d, 0x186, 0x73, 0x61, 0x6e, 0x64, 0x61, 0x61, 0x3b, 0x46,</div><div class='add'>+0x61, 0x6e, 0x6b, 0x77, 0x61, 0x2d, 0x190, 0x62, 0x254, 0x3b, 0x186, 0x62, 0x25b, 0x73, 0x25b, 0x2d, 0x41, 0x68, 0x69, 0x6e,</div><div class='add'>+0x69, 0x6d, 0x65, 0x3b, 0x186, 0x62, 0x65, 0x72, 0x25b, 0x66, 0x25b, 0x77, 0x2d, 0x4f, 0x62, 0x75, 0x62, 0x75, 0x6f, 0x3b,</div><div class='add'>+0x4d, 0x75, 0x6d, 0x75, 0x2d, 0x186, 0x70, 0x25b, 0x6e, 0x69, 0x6d, 0x62, 0x61, 0x3b, 0x91c, 0x93e, 0x928, 0x947, 0x935, 0x93e,</div><div class='add'>+0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b,</div><div class='add'>+0x90f, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x948, 0x3b, 0x913,</div><div class='add'>+0x917, 0x938, 0x94d, 0x91f, 0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x913, 0x915, 0x94d, 0x91f, 0x94b,</div><div class='add'>+0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x935, 0x94d, 0x939, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x902, 0x92c, 0x930,</div><div class='add'>+0x3b, 0x41, 0x68, 0x61, 0x3b, 0x4f, 0x66, 0x6c, 0x3b, 0x4f, 0x63, 0x68, 0x3b, 0x41, 0x62, 0x65, 0x3b, 0x41, 0x67, 0x62,</div><div class='add'>+0x3b, 0x4f, 0x74, 0x75, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x4d, 0x61, 0x6e, 0x3b, 0x47, 0x62, 0x6f, 0x3b, 0x41, 0x6e, 0x74,</div><div class='add'>+0x3b, 0x41, 0x6c, 0x65, 0x3b, 0x41, 0x66, 0x75, 0x3b, 0x41, 0x68, 0x61, 0x72, 0x61, 0x62, 0x61, 0x74, 0x61, 0x3b, 0x4f,</div><div class='add'>+0x66, 0x6c, 0x6f, 0x3b, 0x4f, 0x63, 0x68, 0x6f, 0x6b, 0x72, 0x69, 0x6b, 0x72, 0x69, 0x3b, 0x41, 0x62, 0x65, 0x69, 0x62,</div><div class='add'>+0x65, 0x65, 0x3b, 0x41, 0x67, 0x62, 0x65, 0x69, 0x6e, 0x61, 0x61, 0x3b, 0x4f, 0x74, 0x75, 0x6b, 0x77, 0x61, 0x64, 0x61,</div><div class='add'>+0x6e, 0x3b, 0x4d, 0x61, 0x61, 0x77, 0x65, 0x3b, 0x4d, 0x61, 0x6e, 0x79, 0x61, 0x77, 0x61, 0x6c, 0x65, 0x3b, 0x47, 0x62,</div><div class='add'>+0x6f, 0x3b, 0x41, 0x6e, 0x74, 0x6f, 0x6e, 0x3b, 0x41, 0x6c, 0x65, 0x6d, 0x6c, 0x65, 0x3b, 0x41, 0x66, 0x75, 0x61, 0x62,</div><div class='add'>+0x65, 0x65, 0x3b, 0x4a, 0x65, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x45, 0x70, 0x72, 0x3b, 0x4d,</div><div class='add'>+0x65, 0x65, 0x3b, 0x4a, 0x75, 0x75, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x1ecc, 0x67, 0x1ecd, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x1ecc,</div><div class='add'>+0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x65, 0x6e, 0x1ee5, 0x77, 0x61, 0x72, 0x1ecb, 0x3b,</div><div class='add'>+0x46, 0x65, 0x62, 0x72, 0x1ee5, 0x77, 0x61, 0x72, 0x1ecb, 0x3b, 0x4d, 0x61, 0x61, 0x63, 0x68, 0x1ecb, 0x3b, 0x45, 0x70, 0x72,</div><div class='add'>+0x65, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x1ecb, 0x3b, 0x1ecc, 0x67,</div><div class='add'>+0x1ecd, 0x1ecd, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x1ecc, 0x6b, 0x74, 0x6f, 0x62, 0x61,</div><div class='add'>+0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4d, 0x62, 0x65,</div><div class='add'>+0x3b, 0x4b, 0x65, 0x6c, 0x3b, 0x4b, 0x74, 0x169, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x4b, 0x74, 0x6e, 0x3b, 0x54, 0x68, 0x61,</div><div class='add'>+0x3b, 0x4d, 0x6f, 0x6f, 0x3b, 0x4e, 0x79, 0x61, 0x3b, 0x4b, 0x6e, 0x64, 0x3b, 0x128, 0x6b, 0x75, 0x3b, 0x128, 0x6b, 0x6d,</div><div class='add'>+0x3b, 0x128, 0x6b, 0x6c, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x62, 0x65, 0x65, 0x3b, 0x4d, 0x77,</div><div class='add'>+0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6c, 0x129, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b,</div><div class='add'>+0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d,</div><div class='add'>+0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77,</div><div class='add'>+0x61, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x74, 0x68, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20,</div><div class='add'>+0x6d, 0x75, 0x6f, 0x6e, 0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6e, 0x79, 0x61, 0x61, 0x6e,</div><div class='add'>+0x79, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x61,</div><div class='add'>+0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129,</div><div class='add'>+0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x129, 0x6d, 0x77, 0x65, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61,</div><div class='add'>+0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x6c, 0x129, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b,</div><div class='add'>+0x4b, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x128, 0x3b, 0x128, 0x3b, 0x128, 0x3b, 0x70f, 0x71f,</div><div class='add'>+0x722, 0x20, 0x70f, 0x712, 0x3b, 0x72b, 0x712, 0x71b, 0x3b, 0x710, 0x715, 0x72a, 0x3b, 0x722, 0x71d, 0x723, 0x722, 0x3b, 0x710, 0x71d,</div><div class='add'>+0x72a, 0x3b, 0x71a, 0x719, 0x71d, 0x72a, 0x722, 0x3b, 0x72c, 0x721, 0x718, 0x719, 0x3b, 0x710, 0x712, 0x3b, 0x710, 0x71d, 0x720, 0x718,</div><div class='add'>+0x720, 0x3b, 0x70f, 0x72c, 0x72b, 0x20, 0x70f, 0x710, 0x3b, 0x70f, 0x72c, 0x72b, 0x20, 0x70f, 0x712, 0x3b, 0x70f, 0x71f, 0x722, 0x20,</div><div class='add'>+0x70f, 0x710, 0x3b, 0x120d, 0x12f0, 0x1275, 0x3b, 0x12ab, 0x1265, 0x12bd, 0x3b, 0x12ad, 0x1265, 0x120b, 0x3b, 0x134b, 0x1305, 0x12ba, 0x3b, 0x12ad,</div><div class='add'>+0x1262, 0x1245, 0x3b, 0x121d, 0x2f, 0x1275, 0x3b, 0x12b0, 0x122d, 0x3b, 0x121b, 0x122d, 0x12eb, 0x3b, 0x12eb, 0x12b8, 0x1292, 0x3b, 0x1218, 0x1270,</div><div class='add'>+0x1209, 0x3b, 0x121d, 0x2f, 0x121d, 0x3b, 0x1270, 0x1215, 0x1233, 0x3b, 0x120d, 0x12f0, 0x1275, 0x122a, 0x3b, 0x12ab, 0x1265, 0x12bd, 0x1265, 0x1272,</div><div class='add'>+0x3b, 0x12ad, 0x1265, 0x120b, 0x3b, 0x134b, 0x1305, 0x12ba, 0x122a, 0x3b, 0x12ad, 0x1262, 0x1245, 0x122a, 0x3b, 0x121d, 0x12aa, 0x12a4, 0x120d, 0x20,</div><div class='add'>+0x1275, 0x131f, 0x1292, 0x122a, 0x3b, 0x12b0, 0x122d, 0x12a9, 0x3b, 0x121b, 0x122d, 0x12eb, 0x121d, 0x20, 0x1275, 0x122a, 0x3b, 0x12eb, 0x12b8, 0x1292,</div><div class='add'>+0x20, 0x1218, 0x1233, 0x1245, 0x1208, 0x122a, 0x3b, 0x1218, 0x1270, 0x1209, 0x3b, 0x121d, 0x12aa, 0x12a4, 0x120d, 0x20, 0x1218, 0x123d, 0x12c8, 0x122a,</div><div class='add'>+0x3b, 0x1270, 0x1215, 0x1233, 0x1235, 0x122a, 0x3b, 0x120d, 0x3b, 0x12ab, 0x3b, 0x12ad, 0x3b, 0x134b, 0x3b, 0x12ad, 0x3b, 0x121d, 0x3b, 0x12b0,</div><div class='add'>+0x3b, 0x121b, 0x3b, 0x12eb, 0x3b, 0x1218, 0x3b, 0x121d, 0x3b, 0x1270, 0x3b, 0x1320, 0x1210, 0x1228, 0x3b, 0x12a8, 0x1270, 0x1270, 0x3b, 0x1218,</div><div class='add'>+0x1308, 0x1260, 0x3b, 0x12a0, 0x1280, 0x12d8, 0x3b, 0x130d, 0x1295, 0x1263, 0x1275, 0x3b, 0x1220, 0x1295, 0x12e8, 0x3b, 0x1210, 0x1218, 0x1208, 0x3b,</div><div class='add'>+0x1290, 0x1210, 0x1230, 0x3b, 0x12a8, 0x1228, 0x1218, 0x3b, 0x1320, 0x1240, 0x1218, 0x3b, 0x1280, 0x12f0, 0x1228, 0x3b, 0x1280, 0x1220, 0x1220, 0x3b,</div><div class='add'>+0x1320, 0x3b, 0x12a8, 0x3b, 0x1218, 0x3b, 0x12a0, 0x3b, 0x130d, 0x3b, 0x1220, 0x3b, 0x1210, 0x3b, 0x1290, 0x3b, 0x12a8, 0x3b, 0x1320, 0x3b,</div><div class='add'>+0x1280, 0x3b, 0x1280, 0x3b, 0x57, 0x65, 0x79, 0x3b, 0x46, 0x61, 0x6e, 0x3b, 0x54, 0x61, 0x74, 0x3b, 0x4e, 0x61, 0x6e, 0x3b,</div><div class='add'>+0x54, 0x75, 0x79, 0x3b, 0x54, 0x73, 0x6f, 0x3b, 0x54, 0x61, 0x66, 0x3b, 0x57, 0x61, 0x72, 0x3b, 0x4b, 0x75, 0x6e, 0x3b,</div><div class='add'>+0x42, 0x61, 0x6e, 0x3b, 0x4b, 0x6f, 0x6d, 0x3b, 0x53, 0x61, 0x75, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x57, 0x65, 0x79, 0x65,</div><div class='add'>+0x6e, 0x65, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x46, 0x61, 0x6e, 0x69, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x54, 0x61, 0x74, 0x61,</div><div class='add'>+0x6b, 0x61, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x4e, 0x61, 0x6e, 0x67, 0x72, 0x61, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x54, 0x75,</div><div class='add'>+0x79, 0x6f, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x54, 0x73, 0x6f, 0x79, 0x69, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x54, 0x61, 0x66,</div><div class='add'>+0x61, 0x6b, 0x61, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x57, 0x61, 0x72, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x46, 0x61, 0x69, 0x20,</div><div class='add'>+0x4b, 0x75, 0x6e, 0x6f, 0x62, 0x6f, 0x6b, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x42, 0x61, 0x6e, 0x73, 0x6f, 0x6b, 0x3b, 0x46,</div><div class='add'>+0x61, 0x69, 0x20, 0x4b, 0x6f, 0x6d, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x53, 0x61, 0x75, 0x6b, 0x3b, 0x44, 0x79, 0x6f, 0x6e,</div><div class='add'>+0x3b, 0x42, 0x61, 0x61, 0x3b, 0x41, 0x74, 0x61, 0x74, 0x3b, 0x41, 0x6e, 0x61, 0x73, 0x3b, 0x41, 0x74, 0x79, 0x6f, 0x3b,</div><div class='add'>+0x41, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x74, 0x61, 0x72, 0x3b, 0x41, 0x77, 0x75, 0x72, 0x3b, 0x53, 0x68, 0x61, 0x64, 0x3b,</div><div class='add'>+0x53, 0x68, 0x61, 0x6b, 0x3b, 0x4e, 0x61, 0x62, 0x61, 0x3b, 0x4e, 0x61, 0x74, 0x61, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x44,</div><div class='add'>+0x79, 0x6f, 0x6e, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x42, 0x61, 0x27, 0x61, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x74, 0x61,</div><div class='add'>+0x74, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x6e, 0x61, 0x73, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x74, 0x79, 0x6f, 0x6e,</div><div class='add'>+0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x63, 0x68, 0x69, 0x72, 0x69, 0x6d, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x74, 0x61,</div><div class='add'>+0x72, 0x69, 0x62, 0x61, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x77, 0x75, 0x72, 0x72, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x53,</div><div class='add'>+0x68, 0x61, 0x64, 0x6f, 0x6e, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x53, 0x68, 0x61, 0x6b, 0x75, 0x72, 0x3b, 0x50, 0x65, 0x6e,</div><div class='add'>+0x20, 0x4b, 0x75, 0x72, 0x20, 0x4e, 0x61, 0x62, 0x61, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x4b, 0x75, 0x72, 0x20, 0x4e, 0x61,</div><div class='add'>+0x74, 0x61, 0x74, 0x3b, 0x41, 0x331, 0x79, 0x72, 0x3b, 0x41, 0x331, 0x68, 0x77, 0x3b, 0x41, 0x331, 0x74, 0x61, 0x3b, 0x41,</div><div class='add'>+0x331, 0x6e, 0x61, 0x3b, 0x41, 0x331, 0x70, 0x66, 0x3b, 0x41, 0x331, 0x6b, 0x69, 0x3b, 0x41, 0x331, 0x74, 0x79, 0x3b, 0x41,</div><div class='add'>+0x331, 0x6e, 0x69, 0x3b, 0x41, 0x331, 0x6b, 0x75, 0x3b, 0x53, 0x77, 0x61, 0x3b, 0x53, 0x62, 0x79, 0x3b, 0x53, 0x62, 0x68,</div><div class='add'>+0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x79, 0x72, 0x6e, 0x69, 0x67, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e,</div><div class='add'>+0x20, 0x41, 0x331, 0x68, 0x77, 0x61, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x74, 0x61, 0x74, 0x3b, 0x48,</div><div class='add'>+0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x6e, 0x61, 0x61, 0x69, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331,</div><div class='add'>+0x70, 0x66, 0x77, 0x6f, 0x6e, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x6b, 0x69, 0x74, 0x61, 0x74, 0x3b,</div><div class='add'>+0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x74, 0x79, 0x69, 0x72, 0x69, 0x6e, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e,</div><div class='add'>+0x20, 0x41, 0x331, 0x6e, 0x69, 0x6e, 0x61, 0x69, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x6b, 0x75, 0x6d,</div><div class='add'>+0x76, 0x69, 0x72, 0x69, 0x79, 0x69, 0x6e, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x53, 0x77, 0x61, 0x6b, 0x3b, 0x48,</div><div class='add'>+0x79, 0x77, 0x61, 0x6e, 0x20, 0x53, 0x77, 0x61, 0x6b, 0x20, 0x42, 0x27, 0x61, 0x331, 0x79, 0x72, 0x6e, 0x69, 0x67, 0x3b,</div><div class='add'>+0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x53, 0x77, 0x61, 0x6b, 0x20, 0x42, 0x27, 0x61, 0x331, 0x68, 0x77, 0x61, 0x3b, 0x5a,</div><div class='add'>+0x65, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x76, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a,</div><div class='add'>+0x75, 0x67, 0x3b, 0x4c, 0x75, 0x69, 0x3b, 0x41, 0x76, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x75, 0x3b, 0x4e,</div><div class='add'>+0x6f, 0x76, 0x3b, 0x44, 0x69, 0x63, 0x3b, 0x5a, 0x65, 0x6e, 0xe2, 0x72, 0x3b, 0x46, 0x65, 0x76, 0x72, 0xe2, 0x72, 0x3b,</div><div class='add'>+0x4d, 0x61, 0x72, 0xe7, 0x3b, 0x41, 0x76, 0x72, 0xee, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x67, 0x6e, 0x3b,</div><div class='add'>+0x4c, 0x75, 0x69, 0x3b, 0x41, 0x76, 0x6f, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4f,</div><div class='add'>+0x74, 0x75, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x44, 0x69, 0x63, 0x65, 0x6d,</div><div class='add'>+0x62, 0x61, 0x72, 0x3b, 0x5a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4c, 0x3b, 0x41, 0x3b,</div><div class='add'>+0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x50, 0x68, 0x61, 0x3b, 0x4c, 0x75, 0x68, 0x3b, 0x1e70, 0x68, 0x61, 0x3b,</div><div class='add'>+0x4c, 0x61, 0x6d, 0x3b, 0x53, 0x68, 0x75, 0x3b, 0x4c, 0x77, 0x69, 0x3b, 0x4c, 0x77, 0x61, 0x3b, 0x1e70, 0x68, 0x61, 0x3b,</div><div class='add'>+0x4b, 0x68, 0x75, 0x3b, 0x54, 0x73, 0x68, 0x3b, 0x1e3c, 0x61, 0x72, 0x3b, 0x4e, 0x79, 0x65, 0x3b, 0x50, 0x68, 0x61, 0x6e,</div><div class='add'>+0x64, 0x6f, 0x3b, 0x4c, 0x75, 0x68, 0x75, 0x68, 0x69, 0x3b, 0x1e70, 0x68, 0x61, 0x66, 0x61, 0x6d, 0x75, 0x68, 0x77, 0x65,</div><div class='add'>+0x3b, 0x4c, 0x61, 0x6d, 0x62, 0x61, 0x6d, 0x61, 0x69, 0x3b, 0x53, 0x68, 0x75, 0x6e, 0x64, 0x75, 0x6e, 0x74, 0x68, 0x75,</div><div class='add'>+0x6c, 0x65, 0x3b, 0x46, 0x75, 0x6c, 0x77, 0x69, 0x3b, 0x46, 0x75, 0x6c, 0x77, 0x61, 0x6e, 0x61, 0x3b, 0x1e70, 0x68, 0x61,</div><div class='add'>+0x6e, 0x67, 0x75, 0x6c, 0x65, 0x3b, 0x4b, 0x68, 0x75, 0x62, 0x76, 0x75, 0x6d, 0x65, 0x64, 0x7a, 0x69, 0x3b, 0x54, 0x73,</div><div class='add'>+0x68, 0x69, 0x6d, 0x65, 0x64, 0x7a, 0x69, 0x3b, 0x1e3c, 0x61, 0x72, 0x61, 0x3b, 0x4e, 0x79, 0x65, 0x6e, 0x64, 0x61, 0x76,</div><div class='add'>+0x68, 0x75, 0x73, 0x69, 0x6b, 0x75, 0x3b, 0x44, 0x7a, 0x76, 0x3b, 0x44, 0x7a, 0x64, 0x3b, 0x54, 0x65, 0x64, 0x3b, 0x41,</div><div class='add'>+0x66, 0x254, 0x3b, 0x44, 0x61, 0x6d, 0x3b, 0x4d, 0x61, 0x73, 0x3b, 0x53, 0x69, 0x61, 0x3b, 0x44, 0x65, 0x61, 0x3b, 0x41,</div><div class='add'>+0x6e, 0x79, 0x3b, 0x4b, 0x65, 0x6c, 0x3b, 0x41, 0x64, 0x65, 0x3b, 0x44, 0x7a, 0x6d, 0x3b, 0x44, 0x7a, 0x6f, 0x76, 0x65,</div><div class='add'>+0x3b, 0x44, 0x7a, 0x6f, 0x64, 0x7a, 0x65, 0x3b, 0x54, 0x65, 0x64, 0x6f, 0x78, 0x65, 0x3b, 0x41, 0x66, 0x254, 0x66, 0x69,</div><div class='add'>+0x25b, 0x3b, 0x44, 0x61, 0x6d, 0x61, 0x3b, 0x4d, 0x61, 0x73, 0x61, 0x3b, 0x53, 0x69, 0x61, 0x6d, 0x6c, 0x254, 0x6d, 0x3b,</div><div class='add'>+0x44, 0x65, 0x61, 0x73, 0x69, 0x61, 0x6d, 0x69, 0x6d, 0x65, 0x3b, 0x41, 0x6e, 0x79, 0x254, 0x6e, 0x79, 0x254, 0x3b, 0x4b,</div><div class='add'>+0x65, 0x6c, 0x65, 0x3b, 0x41, 0x64, 0x65, 0x25b, 0x6d, 0x65, 0x6b, 0x70, 0x254, 0x78, 0x65, 0x3b, 0x44, 0x7a, 0x6f, 0x6d,</div><div class='add'>+0x65, 0x3b, 0x44, 0x3b, 0x44, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x44, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x44, 0x3b, 0x41, 0x3b,</div><div class='add'>+0x4b, 0x3b, 0x41, 0x3b, 0x44, 0x3b, 0x49, 0x61, 0x6e, 0x2e, 0x3b, 0x50, 0x65, 0x70, 0x2e, 0x3b, 0x4d, 0x61, 0x6c, 0x2e,</div><div class='add'>+0x3b, 0x2bb, 0x41, 0x70, 0x2e, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x49, 0x75, 0x6e, 0x2e, 0x3b, 0x49, 0x75, 0x6c, 0x2e, 0x3b,</div><div class='add'>+0x2bb, 0x41, 0x75, 0x2e, 0x3b, 0x4b, 0x65, 0x70, 0x2e, 0x3b, 0x2bb, 0x4f, 0x6b, 0x2e, 0x3b, 0x4e, 0x6f, 0x77, 0x2e, 0x3b,</div><div class='add'>+0x4b, 0x65, 0x6b, 0x2e, 0x3b, 0x49, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x50, 0x65, 0x70, 0x65, 0x6c, 0x75, 0x61,</div><div class='add'>+0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x6b, 0x69, 0x3b, 0x2bb, 0x41, 0x70, 0x65, 0x6c, 0x69, 0x6c, 0x61, 0x3b, 0x4d,</div><div class='add'>+0x65, 0x69, 0x3b, 0x49, 0x75, 0x6e, 0x65, 0x3b, 0x49, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x2bb, 0x41, 0x75, 0x6b, 0x61, 0x6b,</div><div class='add'>+0x65, 0x3b, 0x4b, 0x65, 0x70, 0x61, 0x6b, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x6b, 0x6f, 0x70,</div><div class='add'>+0x61, 0x3b, 0x4e, 0x6f, 0x77, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x4b, 0x65, 0x6b, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b,</div><div class='add'>+0x4a, 0x75, 0x77, 0x3b, 0x53, 0x77, 0x69, 0x3b, 0x54, 0x73, 0x61, 0x3b, 0x4e, 0x79, 0x61, 0x3b, 0x54, 0x73, 0x77, 0x3b,</div><div class='add'>+0x41, 0x74, 0x61, 0x3b, 0x41, 0x6e, 0x61, 0x3b, 0x41, 0x72, 0x69, 0x3b, 0x41, 0x6b, 0x75, 0x3b, 0x53, 0x77, 0x61, 0x3b,</div><div class='add'>+0x4d, 0x61, 0x6e, 0x3b, 0x4d, 0x61, 0x73, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x4a, 0x75, 0x77, 0x75, 0x6e, 0x67, 0x3b,</div><div class='add'>+0x5a, 0x77, 0x61, 0x74, 0x20, 0x53, 0x77, 0x69, 0x79, 0x61, 0x6e, 0x67, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x54, 0x73,</div><div class='add'>+0x61, 0x74, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x4e, 0x79, 0x61, 0x69, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x54, 0x73,</div><div class='add'>+0x77, 0x6f, 0x6e, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x41, 0x74, 0x61, 0x61, 0x68, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20,</div><div class='add'>+0x41, 0x6e, 0x61, 0x74, 0x61, 0x74, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x41, 0x72, 0x69, 0x6e, 0x61, 0x69, 0x3b, 0x5a,</div><div class='add'>+0x77, 0x61, 0x74, 0x20, 0x41, 0x6b, 0x75, 0x62, 0x75, 0x6e, 0x79, 0x75, 0x6e, 0x67, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20,</div><div class='add'>+0x53, 0x77, 0x61, 0x67, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x4d, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x77, 0x61, 0x6e, 0x67,</div><div class='add'>+0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x53, 0x77, 0x61, 0x67, 0x2d, 0x4d, 0x61, 0x2d, 0x53, 0x75, 0x79, 0x61, 0x6e, 0x67,</div><div class='add'>+0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x6c, 0x3b, 0x45, 0x70, 0x75, 0x3b, 0x4d, 0x65, 0x69,</div><div class='add'>+0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x75,</div><div class='add'>+0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x77, 0x61, 0x6c, 0x65, 0x3b, 0x46, 0x65,</div><div class='add'>+0x62, 0x75, 0x6c, 0x75, 0x77, 0x61, 0x6c, 0x65, 0x3b, 0x4d, 0x61, 0x6c, 0x69, 0x63, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x75,</div><div class='add'>+0x6c, 0x6f, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x4f, 0x67,</div><div class='add'>+0x61, 0x73, 0x69, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x75, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x75, 0x74,</div><div class='add'>+0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b,</div><div class='add'>+0x45, 0x6e, 0x65, 0x3b, 0x50, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b,</div><div class='add'>+0x48, 0x75, 0x6e, 0x3b, 0x48, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b,</div><div class='add'>+0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x45, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x50, 0x65, 0x62, 0x72, 0x65, 0x72,</div><div class='add'>+0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x6f, 0x3b, 0x48,</div><div class='add'>+0x75, 0x6e, 0x79, 0x6f, 0x3b, 0x48, 0x75, 0x6c, 0x79, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65,</div><div class='add'>+0x74, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x4f, 0x6b, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x4e, 0x6f, 0x62, 0x79,</div><div class='add'>+0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x44, 0x69, 0x73, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x45, 0x3b, 0x50, 0x3b,</div><div class='add'>+0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x48, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b,</div><div class='add'>+0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b,</div><div class='add'>+0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b,</div><div class='add'>+0x41, 0x75, 0x67, 0x75, 0x73, 0x63, 0x68, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f,</div><div class='add'>+0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a,</div><div class='add'>+0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0xa2cd, 0xa1aa, 0x3b, 0xa44d, 0xa1aa, 0x3b, 0xa315, 0xa1aa, 0x3b, 0xa1d6, 0xa1aa, 0x3b, 0xa26c, 0xa1aa,</div><div class='add'>+0x3b, 0xa0d8, 0xa1aa, 0x3b, 0xa3c3, 0xa1aa, 0x3b, 0xa246, 0xa1aa, 0x3b, 0xa22c, 0xa1aa, 0x3b, 0xa2b0, 0xa1aa, 0x3b, 0xa2b0, 0xa2aa, 0xa1aa, 0x3b,</div><div class='add'>+0xa2b0, 0xa44b, 0xa1aa, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x3b,</div><div class='add'>+0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x72, 0x68, 0x3b, 0x53, 0x65, 0x70, 0x3b,</div><div class='add'>+0x4f, 0x6b, 0x74, 0x3b, 0x55, 0x73, 0x69, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x61, 0x62, 0x61, 0x72, 0x69,</div><div class='add'>+0x3b, 0x75, 0x46, 0x65, 0x62, 0x65, 0x72, 0x62, 0x61, 0x72, 0x69, 0x3b, 0x75, 0x4d, 0x61, 0x74, 0x6a, 0x68, 0x69, 0x3b,</div><div class='add'>+0x75, 0x2d, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a,</div><div class='add'>+0x75, 0x6c, 0x61, 0x79, 0x69, 0x3b, 0x41, 0x72, 0x68, 0x6f, 0x73, 0x74, 0x6f, 0x73, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74,</div><div class='add'>+0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x55, 0x73, 0x69, 0x6e, 0x79, 0x69, 0x6b, 0x68,</div><div class='add'>+0x61, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b,</div><div class='add'>+0x4d, 0x61, 0x74, 0x3b, 0x41, 0x70, 0x6f, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b,</div><div class='add'>+0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x66, 0x3b, 0x44, 0x69, 0x73, 0x3b,</div><div class='add'>+0x4a, 0x61, 0x6e, 0x61, 0x77, 0x61, 0x72, 0x65, 0x3b, 0x46, 0x65, 0x62, 0x65, 0x72, 0x77, 0x61, 0x72, 0x65, 0x3b, 0x4d,</div><div class='add'>+0x61, 0x74, 0x161, 0x68, 0x65, 0x3b, 0x41, 0x70, 0x6f, 0x72, 0x65, 0x6c, 0x65, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75,</div><div class='add'>+0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x65, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x73, 0x65, 0x3b, 0x53, 0x65,</div><div class='add'>+0x74, 0x65, 0x6d, 0x65, 0x72, 0x65, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x6f, 0x72, 0x65, 0x3b, 0x4e, 0x6f, 0x66, 0x65,</div><div class='add'>+0x6d, 0x65, 0x72, 0x65, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x65, 0x72, 0x65, 0x3b, 0x6f, 0x111, 0x111, 0x61, 0x6a, 0x61,</div><div class='add'>+0x67, 0x65, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x76, 0x61, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x10d, 0x61, 0x3b, 0x63, 0x75, 0x6f,</div><div class='add'>+0x14b, 0x6f, 0x3b, 0x6d, 0x69, 0x65, 0x73, 0x73, 0x65, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x73, 0x65, 0x3b, 0x73, 0x75, 0x6f,</div><div class='add'>+0x69, 0x64, 0x6e, 0x65, 0x3b, 0x62, 0x6f, 0x72, 0x67, 0x65, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x61, 0x3b, 0x67, 0x6f, 0x6c,</div><div class='add'>+0x67, 0x67, 0x6f, 0x74, 0x3b, 0x73, 0x6b, 0xe1, 0x62, 0x6d, 0x61, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c, 0x61, 0x3b, 0x6f,</div><div class='add'>+0x111, 0x111, 0x61, 0x6a, 0x61, 0x67, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x76, 0x61, 0x6d,</div><div class='add'>+0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x10d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x63, 0x75, 0x6f,</div><div class='add'>+0x14b, 0x6f, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6d, 0x69, 0x65, 0x73, 0x73, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b,</div><div class='add'>+0x67, 0x65, 0x61, 0x73, 0x73, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x64, 0x6e, 0x65, 0x6d,</div><div class='add'>+0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x62, 0x6f, 0x72, 0x67, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x10d, 0x61, 0x6b, 0x10d,</div><div class='add'>+0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x67, 0x6f, 0x74, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b,</div><div class='add'>+0x73, 0x6b, 0xe1, 0x62, 0x6d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c, 0x61, 0x6d, 0xe1,</div><div class='add'>+0x6e, 0x6e, 0x75, 0x3b, 0x4f, 0x3b, 0x47, 0x3b, 0x4e, 0x3b, 0x43, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x42, 0x3b,</div><div class='add'>+0x10c, 0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x4a, 0x3b, 0x6f, 0x111, 0x111, 0x6a, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x3b, 0x6e, 0x6a,</div><div class='add'>+0x75, 0x6b, 0x3b, 0x63, 0x75, 0x6f, 0x3b, 0x6d, 0x69, 0x65, 0x73, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x3b, 0x73, 0x75, 0x6f,</div><div class='add'>+0x69, 0x3b, 0x62, 0x6f, 0x72, 0x67, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x3b, 0x73, 0x6b, 0xe1,</div><div class='add'>+0x62, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x3b, 0x4b, 0x69, 0x69, 0x3b, 0x44, 0x68, 0x69, 0x3b, 0x54, 0x72, 0x69, 0x3b, 0x53,</div><div class='add'>+0x70, 0x69, 0x3b, 0x52, 0x69, 0x69, 0x3b, 0x4d, 0x74, 0x69, 0x3b, 0x45, 0x6d, 0x69, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d,</div><div class='add'>+0x6e, 0x69, 0x3b, 0x4d, 0x78, 0x69, 0x3b, 0x4d, 0x78, 0x6b, 0x3b, 0x4d, 0x78, 0x64, 0x3b, 0x4b, 0x69, 0x6e, 0x67, 0x61,</div><div class='add'>+0x6c, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x44, 0x68, 0x61, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x54, 0x72, 0x75, 0x20,</div><div class='add'>+0x69, 0x64, 0x61, 0x73, 0x3b, 0x53, 0x70, 0x61, 0x74, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x52, 0x69, 0x6d, 0x61, 0x20,</div><div class='add'>+0x69, 0x64, 0x61, 0x73, 0x3b, 0x4d, 0x61, 0x74, 0x61, 0x72, 0x75, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x45, 0x6d, 0x70,</div><div class='add'>+0x69, 0x74, 0x75, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4d, 0x61, 0x73, 0x70, 0x61, 0x74, 0x20, 0x69, 0x64, 0x61, 0x73,</div><div class='add'>+0x3b, 0x4d, 0x6e, 0x67, 0x61, 0x72, 0x69, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4d, 0x61, 0x78, 0x61, 0x6c, 0x20, 0x69,</div><div class='add'>+0x64, 0x61, 0x73, 0x3b, 0x4d, 0x61, 0x78, 0x61, 0x6c, 0x20, 0x6b, 0x69, 0x6e, 0x67, 0x61, 0x6c, 0x20, 0x69, 0x64, 0x61,</div><div class='add'>+0x73, 0x3b, 0x4d, 0x61, 0x78, 0x61, 0x6c, 0x20, 0x64, 0x68, 0x61, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4b, 0x3b, 0x44,</div><div class='add'>+0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x52, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x50, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x44,</div><div class='add'>+0x3b, 0x43, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69,</div><div class='add'>+0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x43, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74,</div><div class='add'>+0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x43, 0x68, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65,</div><div class='add'>+0x62, 0x75, 0x72, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x69, 0x72, 0x69, 0x72, 0x69,</div><div class='add'>+0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x43, 0x68, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x6f,</div><div class='add'>+0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x69, 0x74, 0x6f, 0x62, 0x61,</div><div class='add'>+0x3b, 0x4e, 0x6f, 0x62, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x43, 0x3b, 0x46,</div><div class='add'>+0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x43, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44,</div><div class='add'>+0x3b, 0x49, 0x6d, 0x62, 0x3b, 0x4b, 0x61, 0x77, 0x3b, 0x4b, 0x61, 0x64, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x4b, 0x61, 0x73,</div><div class='add'>+0x3b, 0x4b, 0x61, 0x72, 0x3b, 0x4d, 0x66, 0x75, 0x3b, 0x57, 0x75, 0x6e, 0x3b, 0x49, 0x6b, 0x65, 0x3b, 0x49, 0x6b, 0x75,</div><div class='add'>+0x3b, 0x49, 0x6d, 0x77, 0x3b, 0x49, 0x77, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69,</div><div class='add'>+0x6d, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x77, 0x69,</div><div class='add'>+0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x64, 0x61, 0x64, 0x75, 0x3b, 0x4d, 0x6f,</div><div class='add'>+0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68,</div><div class='add'>+0x77, 0x61, 0x20, 0x6b, 0x61, 0x73, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20,</div><div class='add'>+0x6b, 0x61, 0x72, 0x61, 0x6e, 0x64, 0x61, 0x64, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20,</div><div class='add'>+0x6d, 0x66, 0x75, 0x6e, 0x67, 0x61, 0x64, 0x65, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x77,</div><div class='add'>+0x75, 0x6e, 0x79, 0x61, 0x6e, 0x79, 0x61, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b,</div><div class='add'>+0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69,</div><div class='add'>+0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20,</div><div class='add'>+0x69, 0x6d, 0x77, 0x65, 0x72, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75,</div><div class='add'>+0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x77, 0x69, 0x3b, 0x49, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b,</div><div class='add'>+0x4b, 0x3b, 0x4d, 0x3b, 0x57, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x73, 0x69, 0x69, 0x3b, 0x63, 0x6f,</div><div class='add'>+0x6c, 0x3b, 0x6d, 0x62, 0x6f, 0x3b, 0x73, 0x65, 0x65, 0x3b, 0x64, 0x75, 0x75, 0x3b, 0x6b, 0x6f, 0x72, 0x3b, 0x6d, 0x6f,</div><div class='add'>+0x72, 0x3b, 0x6a, 0x75, 0x6b, 0x3b, 0x73, 0x6c, 0x74, 0x3b, 0x79, 0x61, 0x72, 0x3b, 0x6a, 0x6f, 0x6c, 0x3b, 0x62, 0x6f,</div><div class='add'>+0x77, 0x3b, 0x73, 0x69, 0x69, 0x6c, 0x6f, 0x3b, 0x63, 0x6f, 0x6c, 0x74, 0x65, 0x3b, 0x6d, 0x62, 0x6f, 0x6f, 0x79, 0x3b,</div><div class='add'>+0x73, 0x65, 0x65, 0x257, 0x74, 0x6f, 0x3b, 0x64, 0x75, 0x75, 0x6a, 0x61, 0x6c, 0x3b, 0x6b, 0x6f, 0x72, 0x73, 0x65, 0x3b,</div><div class='add'>+0x6d, 0x6f, 0x72, 0x73, 0x6f, 0x3b, 0x6a, 0x75, 0x6b, 0x6f, 0x3b, 0x73, 0x69, 0x69, 0x6c, 0x74, 0x6f, 0x3b, 0x79, 0x61,</div><div class='add'>+0x72, 0x6b, 0x6f, 0x6d, 0x61, 0x61, 0x3b, 0x6a, 0x6f, 0x6c, 0x61, 0x6c, 0x3b, 0x62, 0x6f, 0x77, 0x74, 0x65, 0x3b, 0x73,</div><div class='add'>+0x3b, 0x63, 0x3b, 0x6d, 0x3b, 0x73, 0x3b, 0x64, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x73, 0x3b, 0x79, 0x3b, 0x6a,</div><div class='add'>+0x3b, 0x62, 0x3b, 0x4a, 0x45, 0x4e, 0x3b, 0x57, 0x4b, 0x52, 0x3b, 0x57, 0x47, 0x54, 0x3b, 0x57, 0x4b, 0x4e, 0x3b, 0x57,</div><div class='add'>+0x54, 0x4e, 0x3b, 0x57, 0x54, 0x44, 0x3b, 0x57, 0x4d, 0x4a, 0x3b, 0x57, 0x4e, 0x4e, 0x3b, 0x57, 0x4b, 0x44, 0x3b, 0x57,</div><div class='add'>+0x49, 0x4b, 0x3b, 0x57, 0x4d, 0x57, 0x3b, 0x44, 0x49, 0x54, 0x3b, 0x4e, 0x6a, 0x65, 0x6e, 0x75, 0x61, 0x72, 0x129, 0x3b,</div><div class='add'>+0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x72, 0x129, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20,</div><div class='add'>+0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b,</div><div class='add'>+0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b,</div><div class='add'>+0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x74, 0x169, 0x3b, 0x4d,</div><div class='add'>+0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x169, 0x67, 0x77, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65,</div><div class='add'>+0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77,</div><div class='add'>+0x61, 0x20, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169,</div><div class='add'>+0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x20, 0x6e, 0x61,</div><div class='add'>+0x20, 0x169, 0x6d, 0x77, 0x65, 0x3b, 0x4e, 0x64, 0x69, 0x74, 0x68, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x4b, 0x3b,</div><div class='add'>+0x47, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x44, 0x3b,</div><div class='add'>+0x4f, 0x62, 0x6f, 0x3b, 0x57, 0x61, 0x61, 0x3b, 0x4f, 0x6b, 0x75, 0x3b, 0x4f, 0x6e, 0x67, 0x3b, 0x49, 0x6d, 0x65, 0x3b,</div><div class='add'>+0x49, 0x6c, 0x65, 0x3b, 0x53, 0x61, 0x70, 0x3b, 0x49, 0x73, 0x69, 0x3b, 0x53, 0x61, 0x61, 0x3b, 0x54, 0x6f, 0x6d, 0x3b,</div><div class='add'>+0x54, 0x6f, 0x62, 0x3b, 0x54, 0x6f, 0x77, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f, 0x62, 0x6f, 0x3b,</div><div class='add'>+0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x77, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c,</div><div class='add'>+0x65, 0x20, 0x6f, 0x6b, 0x75, 0x6e, 0x69, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f, 0x6e, 0x67, 0x27,</div><div class='add'>+0x77, 0x61, 0x6e, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x6d, 0x65, 0x74, 0x3b, 0x4c, 0x61, 0x70,</div><div class='add'>+0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x6c, 0x65, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x73, 0x61, 0x70,</div><div class='add'>+0x61, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x73, 0x69, 0x65, 0x74, 0x3b, 0x4c, 0x61, 0x70, 0x61,</div><div class='add'>+0x20, 0x6c, 0x65, 0x20, 0x73, 0x61, 0x61, 0x6c, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d,</div><div class='add'>+0x6f, 0x6e, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x6f, 0x62, 0x6f,</div><div class='add'>+0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x77, 0x61, 0x61, 0x72, 0x65,</div><div class='add'>+0x3b, 0x4f, 0x3b, 0x57, 0x3b, 0x4f, 0x3b, 0x4f, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x54,</div><div class='add'>+0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72,</div><div class='add'>+0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x74,</div><div class='add'>+0x3b, 0x4f, 0x74, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x4a, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f,</div><div class='add'>+0x3b, 0x46, 0x65, 0x76, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x63, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69,</div><div class='add'>+0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x4a, 0x75, 0x6c, 0x68, 0x6f, 0x3b, 0x41,</div><div class='add'>+0x75, 0x67, 0x75, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x4f, 0x74, 0x75, 0x62,</div><div class='add'>+0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f,</div><div class='add'>+0x3b, 0x5a, 0x69, 0x62, 0x3b, 0x4e, 0x68, 0x6c, 0x3b, 0x4d, 0x62, 0x69, 0x3b, 0x4d, 0x61, 0x62, 0x3b, 0x4e, 0x6b, 0x77,</div><div class='add'>+0x3b, 0x4e, 0x68, 0x6c, 0x3b, 0x4e, 0x74, 0x75, 0x3b, 0x4e, 0x63, 0x77, 0x3b, 0x4d, 0x70, 0x61, 0x3b, 0x4d, 0x66, 0x75,</div><div class='add'>+0x3b, 0x4c, 0x77, 0x65, 0x3b, 0x4d, 0x70, 0x61, 0x3b, 0x5a, 0x69, 0x62, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x6c, 0x61, 0x3b,</div><div class='add'>+0x4e, 0x68, 0x6c, 0x6f, 0x6c, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x62, 0x69, 0x6d, 0x62, 0x69, 0x74, 0x68, 0x6f, 0x3b,</div><div class='add'>+0x4d, 0x61, 0x62, 0x61, 0x73, 0x61, 0x3b, 0x4e, 0x6b, 0x77, 0x65, 0x6e, 0x6b, 0x77, 0x65, 0x7a, 0x69, 0x3b, 0x4e, 0x68,</div><div class='add'>+0x6c, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x3b, 0x4e, 0x74, 0x75, 0x6c, 0x69, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x4e, 0x63,</div><div class='add'>+0x77, 0x61, 0x62, 0x61, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x4d, 0x70, 0x61, 0x6e, 0x64, 0x75, 0x6c, 0x61, 0x3b, 0x4d, 0x66,</div><div class='add'>+0x75, 0x6d, 0x66, 0x75, 0x3b, 0x4c, 0x77, 0x65, 0x7a, 0x69, 0x3b, 0x4d, 0x70, 0x61, 0x6c, 0x61, 0x6b, 0x61, 0x7a, 0x69,</div><div class='add'>+0x3b, 0x5a, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x4d,</div><div class='add'>+0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x31, 0x3b, 0x4d, 0x32, 0x3b, 0x4d, 0x33, 0x3b, 0x4d, 0x34, 0x3b, 0x4d, 0x35, 0x3b,</div><div class='add'>+0x4d, 0x36, 0x3b, 0x4d, 0x37, 0x3b, 0x4d, 0x38, 0x3b, 0x4d, 0x39, 0x3b, 0x4d, 0x31, 0x30, 0x3b, 0x4d, 0x31, 0x31, 0x3b,</div><div class='add'>+0x4d, 0x31, 0x32, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x3b,</div><div class='add'>+0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69,</div><div class='add'>+0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20,</div><div class='add'>+0x6b, 0x61, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x74, 0x61, 0x6e, 0x75, 0x3b,</div><div class='add'>+0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x73, 0x69, 0x74, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20,</div><div class='add'>+0x77, 0x61, 0x20, 0x73, 0x61, 0x62, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6e, 0x61, 0x6e,</div><div class='add'>+0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x74, 0x69, 0x73, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72,</div><div class='add'>+0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20,</div><div class='add'>+0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x6f, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20,</div><div class='add'>+0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4b, 0x3b,</div><div class='add'>+0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x49, 0x3b, 0x49, 0x3b,</div><div class='add'>+0x49, 0x3b, 0x69, 0x6e, 0x6e, 0x3b, 0x62, 0x1e5b, 0x61, 0x3b, 0x6d, 0x61, 0x1e5b, 0x3b, 0x69, 0x62, 0x72, 0x3b, 0x6d, 0x61,</div><div class='add'>+0x79, 0x3b, 0x79, 0x75, 0x6e, 0x3b, 0x79, 0x75, 0x6c, 0x3b, 0x263, 0x75, 0x63, 0x3b, 0x63, 0x75, 0x74, 0x3b, 0x6b, 0x74,</div><div class='add'>+0x75, 0x3b, 0x6e, 0x75, 0x77, 0x3b, 0x64, 0x75, 0x6a, 0x3b, 0x69, 0x6e, 0x6e, 0x61, 0x79, 0x72, 0x3b, 0x62, 0x1e5b, 0x61,</div><div class='add'>+0x79, 0x1e5b, 0x3b, 0x6d, 0x61, 0x1e5b, 0x1e63, 0x3b, 0x69, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x79, 0x75, 0x3b,</div><div class='add'>+0x79, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x79, 0x75, 0x6c, 0x79, 0x75, 0x7a, 0x3b, 0x263, 0x75, 0x63, 0x74, 0x3b, 0x63, 0x75,</div><div class='add'>+0x74, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x6b, 0x74, 0x75, 0x62, 0x72, 0x3b, 0x6e, 0x75, 0x77, 0x61, 0x6e, 0x62, 0x69,</div><div class='add'>+0x72, 0x3b, 0x64, 0x75, 0x6a, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x69, 0x3b, 0x62, 0x3b, 0x6d, 0x3b, 0x69, 0x3b, 0x6d,</div><div class='add'>+0x3b, 0x79, 0x3b, 0x79, 0x3b, 0x263, 0x3b, 0x63, 0x3b, 0x6b, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x2d49, 0x2d4f, 0x2d4f, 0x3b, 0x2d31,</div><div class='add'>+0x2d55, 0x2d30, 0x3b, 0x2d4e, 0x2d30, 0x2d55, 0x3b, 0x2d49, 0x2d31, 0x2d54, 0x3b, 0x2d4e, 0x2d30, 0x2d62, 0x3b, 0x2d62, 0x2d53, 0x2d4f, 0x3b, 0x2d62,</div><div class='add'>+0x2d53, 0x2d4d, 0x3b, 0x2d56, 0x2d53, 0x2d5b, 0x3b, 0x2d5b, 0x2d53, 0x2d5c, 0x3b, 0x2d3d, 0x2d5c, 0x2d53, 0x3b, 0x2d4f, 0x2d53, 0x2d61, 0x3b, 0x2d37,</div><div class='add'>+0x2d53, 0x2d4a, 0x3b, 0x2d49, 0x2d4f, 0x2d4f, 0x2d30, 0x2d62, 0x2d54, 0x3b, 0x2d31, 0x2d55, 0x2d30, 0x2d62, 0x2d55, 0x3b, 0x2d4e, 0x2d30, 0x2d55, 0x2d5a,</div><div class='add'>+0x3b, 0x2d49, 0x2d31, 0x2d54, 0x2d49, 0x2d54, 0x3b, 0x2d4e, 0x2d30, 0x2d62, 0x2d62, 0x2d53, 0x3b, 0x2d62, 0x2d53, 0x2d4f, 0x2d62, 0x2d53, 0x3b, 0x2d62,</div><div class='add'>+0x2d53, 0x2d4d, 0x2d62, 0x2d53, 0x2d63, 0x3b, 0x2d56, 0x2d53, 0x2d5b, 0x2d5c, 0x3b, 0x2d5b, 0x2d53, 0x2d5c, 0x2d30, 0x2d4f, 0x2d31, 0x2d49, 0x2d54, 0x3b,</div><div class='add'>+0x2d3d, 0x2d5c, 0x2d53, 0x2d31, 0x2d54, 0x3b, 0x2d4f, 0x2d53, 0x2d61, 0x2d30, 0x2d4f, 0x2d31, 0x2d49, 0x2d54, 0x3b, 0x2d37, 0x2d53, 0x2d4a, 0x2d30, 0x2d4f,</div><div class='add'>+0x2d31, 0x2d49, 0x2d54, 0x3b, 0x2d49, 0x3b, 0x2d31, 0x3b, 0x2d4e, 0x3b, 0x2d49, 0x3b, 0x2d4e, 0x3b, 0x2d62, 0x3b, 0x2d62, 0x3b, 0x2d56, 0x3b,</div><div class='add'>+0x2d5b, 0x3b, 0x2d3d, 0x3b, 0x2d4f, 0x3b, 0x2d37, 0x3b, 0x59, 0x65, 0x6e, 0x3b, 0x46, 0x75, 0x72, 0x3b, 0x4d, 0x65, 0x263, 0x3b,</div><div class='ctx'> 0x59, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x194, 0x75, 0x63, 0x3b,</div><div class='ctx'> 0x43, 0x74, 0x65, 0x3b, 0x54, 0x75, 0x62, 0x3b, 0x4e, 0x75, 0x6e, 0x3b, 0x44, 0x75, 0x1e7, 0x3b, 0x59, 0x65, 0x6e, 0x6e,</div><div class='ctx'> 0x61, 0x79, 0x65, 0x72, 0x3b, 0x46, 0x75, 0x1e5b, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x263, 0x72, 0x65, 0x73, 0x3b, 0x59, 0x65,</div><div class='hunk'>@@ -3402,6 +2170,1364 @@ static const ushort standalone_months_data[] = {</div><div class='ctx'> 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const ushort standalone_months_data[] = {</div><div class='add'>+0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b,</div><div class='add'>+0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x63, 0x74, 0x3b,</div><div class='add'>+0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x79, 0x3b, 0x46, 0x65, 0x62, 0x72,</div><div class='add'>+0x75, 0x61, 0x72, 0x79, 0x3b, 0x4d, 0x61, 0x72, 0x63, 0x68, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79,</div><div class='add'>+0x3b, 0x4a, 0x75, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6c, 0x79, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65,</div><div class='add'>+0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x63, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65,</div><div class='add'>+0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b,</div><div class='add'>+0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x41, 0x6d,</div><div class='add'>+0x61, 0x3b, 0x47, 0x75, 0x72, 0x3b, 0x42, 0x69, 0x74, 0x3b, 0x45, 0x6c, 0x62, 0x3b, 0x43, 0x61, 0x6d, 0x3b, 0x57, 0x61,</div><div class='add'>+0x78, 0x3b, 0x41, 0x64, 0x6f, 0x3b, 0x48, 0x61, 0x67, 0x3b, 0x46, 0x75, 0x6c, 0x3b, 0x4f, 0x6e, 0x6b, 0x3b, 0x53, 0x61,</div><div class='add'>+0x64, 0x3b, 0x4d, 0x75, 0x64, 0x3b, 0x41, 0x6d, 0x61, 0x6a, 0x6a, 0x69, 0x69, 0x3b, 0x47, 0x75, 0x72, 0x61, 0x61, 0x6e,</div><div class='add'>+0x64, 0x68, 0x61, 0x6c, 0x61, 0x3b, 0x42, 0x69, 0x74, 0x6f, 0x6f, 0x74, 0x65, 0x65, 0x73, 0x73, 0x61, 0x3b, 0x45, 0x6c,</div><div class='add'>+0x62, 0x61, 0x3b, 0x43, 0x61, 0x61, 0x6d, 0x73, 0x61, 0x3b, 0x57, 0x61, 0x78, 0x61, 0x62, 0x61, 0x6a, 0x6a, 0x69, 0x69,</div><div class='add'>+0x3b, 0x41, 0x64, 0x6f, 0x6f, 0x6c, 0x65, 0x65, 0x73, 0x73, 0x61, 0x3b, 0x48, 0x61, 0x67, 0x61, 0x79, 0x79, 0x61, 0x3b,</div><div class='add'>+0x46, 0x75, 0x75, 0x6c, 0x62, 0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6e, 0x6b, 0x6f, 0x6c, 0x6f, 0x6c, 0x65, 0x65, 0x73, 0x73,</div><div class='add'>+0x61, 0x3b, 0x53, 0x61, 0x64, 0x61, 0x61, 0x73, 0x61, 0x3b, 0x4d, 0x75, 0x64, 0x64, 0x65, 0x65, 0x3b, 0x51, 0x75, 0x6e,</div><div class='add'>+0x3b, 0x4e, 0x61, 0x68, 0x3b, 0x43, 0x69, 0x67, 0x3b, 0x41, 0x67, 0x64, 0x3b, 0x43, 0x61, 0x78, 0x3b, 0x51, 0x61, 0x73,</div><div class='add'>+0x3b, 0x51, 0x61, 0x64, 0x3b, 0x4c, 0x65, 0x71, 0x3b, 0x57, 0x61, 0x79, 0x3b, 0x44, 0x69, 0x74, 0x3b, 0x58, 0x69, 0x6d,</div><div class='add'>+0x3b, 0x4b, 0x61, 0x78, 0x3b, 0x51, 0x75, 0x6e, 0x78, 0x61, 0x20, 0x47, 0x61, 0x72, 0x61, 0x62, 0x6c, 0x75, 0x3b, 0x4e,</div><div class='add'>+0x61, 0x68, 0x61, 0x72, 0x73, 0x69, 0x20, 0x4b, 0x75, 0x64, 0x6f, 0x3b, 0x43, 0x69, 0x67, 0x67, 0x69, 0x6c, 0x74, 0x61,</div><div class='add'>+0x20, 0x4b, 0x75, 0x64, 0x6f, 0x3b, 0x41, 0x67, 0x64, 0x61, 0x20, 0x42, 0x61, 0x78, 0x69, 0x73, 0x73, 0x6f, 0x3b, 0x43,</div><div class='add'>+0x61, 0x78, 0x61, 0x68, 0x20, 0x41, 0x6c, 0x73, 0x61, 0x3b, 0x51, 0x61, 0x73, 0x61, 0x20, 0x44, 0x69, 0x72, 0x72, 0x69,</div><div class='add'>+0x3b, 0x51, 0x61, 0x64, 0x6f, 0x20, 0x44, 0x69, 0x72, 0x72, 0x69, 0x3b, 0x4c, 0x65, 0x71, 0x65, 0x65, 0x6e, 0x69, 0x3b,</div><div class='add'>+0x57, 0x61, 0x79, 0x73, 0x75, 0x3b, 0x44, 0x69, 0x74, 0x65, 0x6c, 0x69, 0x3b, 0x58, 0x69, 0x6d, 0x6f, 0x6c, 0x69, 0x3b,</div><div class='add'>+0x4b, 0x61, 0x78, 0x78, 0x61, 0x20, 0x47, 0x61, 0x72, 0x61, 0x62, 0x6c, 0x75, 0x3b, 0x51, 0x3b, 0x4e, 0x3b, 0x43, 0x3b,</div><div class='add'>+0x41, 0x3b, 0x43, 0x3b, 0x51, 0x3b, 0x51, 0x3b, 0x4c, 0x3b, 0x57, 0x3b, 0x44, 0x3b, 0x58, 0x3b, 0x4b, 0x3b, 0x51, 0x75,</div><div class='add'>+0x6e, 0x78, 0x61, 0x20, 0x47, 0x61, 0x72, 0x61, 0x62, 0x6c, 0x75, 0x3b, 0x4b, 0x75, 0x64, 0x6f, 0x3b, 0x43, 0x69, 0x67,</div><div class='add'>+0x67, 0x69, 0x6c, 0x74, 0x61, 0x20, 0x4b, 0x75, 0x64, 0x6f, 0x3b, 0x41, 0x67, 0x64, 0x61, 0x20, 0x42, 0x61, 0x78, 0x69,</div><div class='add'>+0x73, 0x3b, 0x43, 0x61, 0x78, 0x61, 0x68, 0x20, 0x41, 0x6c, 0x73, 0x61, 0x3b, 0x51, 0x61, 0x73, 0x61, 0x20, 0x44, 0x69,</div><div class='add'>+0x72, 0x72, 0x69, 0x3b, 0x51, 0x61, 0x64, 0x6f, 0x20, 0x44, 0x69, 0x72, 0x72, 0x69, 0x3b, 0x4c, 0x69, 0x69, 0x71, 0x65,</div><div class='add'>+0x6e, 0x3b, 0x57, 0x61, 0x79, 0x73, 0x75, 0x3b, 0x44, 0x69, 0x74, 0x65, 0x6c, 0x69, 0x3b, 0x58, 0x69, 0x6d, 0x6f, 0x6c,</div><div class='add'>+0x69, 0x3b, 0x4b, 0x61, 0x78, 0x78, 0x61, 0x20, 0x47, 0x61, 0x72, 0x61, 0x62, 0x6c, 0x75, 0x3b, 0x4a, 0x61, 0x6e, 0x3b,</div><div class='add'>+0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b,</div><div class='add'>+0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b,</div><div class='add'>+0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72,</div><div class='add'>+0x69, 0x65, 0x3b, 0x4d, 0x61, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a,</div><div class='add'>+0x75, 0x6e, 0x69, 0x65, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x65, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x3b,</div><div class='add'>+0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f,</div><div class='add'>+0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x61, 0x6e, 0x3b,</div><div class='add'>+0x53, 0x68, 0x6b, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x50, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x6a, 0x3b, 0x51, 0x65, 0x72, 0x3b,</div><div class='add'>+0x4b, 0x6f, 0x72, 0x3b, 0x47, 0x73, 0x68, 0x3b, 0x53, 0x68, 0x74, 0x3b, 0x54, 0x65, 0x74, 0x3b, 0x4e, 0xeb, 0x6e, 0x3b,</div><div class='add'>+0x44, 0x68, 0x6a, 0x3b, 0x6a, 0x61, 0x6e, 0x61, 0x72, 0x3b, 0x73, 0x68, 0x6b, 0x75, 0x72, 0x74, 0x3b, 0x6d, 0x61, 0x72,</div><div class='add'>+0x73, 0x3b, 0x70, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x71, 0x65, 0x72, 0x73, 0x68, 0x6f, 0x72, 0x3b,</div><div class='add'>+0x6b, 0x6f, 0x72, 0x72, 0x69, 0x6b, 0x3b, 0x67, 0x75, 0x73, 0x68, 0x74, 0x3b, 0x73, 0x68, 0x74, 0x61, 0x74, 0x6f, 0x72,</div><div class='add'>+0x3b, 0x74, 0x65, 0x74, 0x6f, 0x72, 0x3b, 0x6e, 0xeb, 0x6e, 0x74, 0x6f, 0x72, 0x3b, 0x64, 0x68, 0x6a, 0x65, 0x74, 0x6f,</div><div class='add'>+0x72, 0x3b, 0x4a, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x51, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x53, 0x3b,</div><div class='add'>+0x54, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x1303, 0x1295, 0x12e9, 0x3b, 0x134c, 0x1265, 0x1229, 0x3b, 0x121b, 0x122d, 0x127d, 0x3b, 0x12a4, 0x1355,</div><div class='add'>+0x1228, 0x3b, 0x121c, 0x12ed, 0x3b, 0x1301, 0x1295, 0x3b, 0x1301, 0x120b, 0x12ed, 0x3b, 0x12a6, 0x1308, 0x1235, 0x3b, 0x1234, 0x1355, 0x1274, 0x3b,</div><div class='add'>+0x12a6, 0x12ad, 0x1270, 0x3b, 0x1296, 0x126c, 0x121d, 0x3b, 0x12f2, 0x1234, 0x121d, 0x3b, 0x1303, 0x1295, 0x12e9, 0x12c8, 0x122a, 0x3b, 0x134c, 0x1265,</div><div class='add'>+0x1229, 0x12c8, 0x122a, 0x3b, 0x121b, 0x122d, 0x127d, 0x3b, 0x12a4, 0x1355, 0x1228, 0x120d, 0x3b, 0x121c, 0x12ed, 0x3b, 0x1301, 0x1295, 0x3b, 0x1301,</div><div class='add'>+0x120b, 0x12ed, 0x3b, 0x12a6, 0x1308, 0x1235, 0x1275, 0x3b, 0x1234, 0x1355, 0x1274, 0x121d, 0x1260, 0x122d, 0x3b, 0x12a6, 0x12ad, 0x1270, 0x12cd, 0x1260,</div><div class='add'>+0x122d, 0x3b, 0x1296, 0x126c, 0x121d, 0x1260, 0x122d, 0x3b, 0x12f2, 0x1234, 0x121d, 0x1260, 0x122d, 0x3b, 0x1303, 0x3b, 0x134c, 0x3b, 0x121b, 0x3b,</div><div class='add'>+0x12a4, 0x3b, 0x121c, 0x3b, 0x1301, 0x3b, 0x1301, 0x3b, 0x12a6, 0x3b, 0x1234, 0x3b, 0x12a6, 0x3b, 0x1296, 0x3b, 0x12f2, 0x3b, 0x64a, 0x646,</div><div class='add'>+0x627, 0x64a, 0x631, 0x3b, 0x641, 0x628, 0x631, 0x627, 0x64a, 0x631, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x623, 0x628, 0x631, 0x64a,</div><div class='add'>+0x644, 0x3b, 0x645, 0x627, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x646, 0x64a, 0x648, 0x3b, 0x64a, 0x648, 0x644, 0x64a, 0x648, 0x3b, 0x623,</div><div class='add'>+0x63a, 0x633, 0x637, 0x633, 0x3b, 0x633, 0x628, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x623, 0x643, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646,</div><div class='add'>+0x648, 0x641, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x64a, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x64a, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x623,</div><div class='add'>+0x3b, 0x648, 0x3b, 0x646, 0x3b, 0x644, 0x3b, 0x63a, 0x3b, 0x633, 0x3b, 0x643, 0x3b, 0x628, 0x3b, 0x62f, 0x3b, 0x643, 0x627, 0x646,</div><div class='add'>+0x648, 0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x634, 0x628, 0x627, 0x637, 0x3b, 0x622, 0x630, 0x627, 0x631, 0x3b,</div><div class='add'>+0x646, 0x64a, 0x633, 0x627, 0x646, 0x3b, 0x623, 0x64a, 0x627, 0x631, 0x3b, 0x62d, 0x632, 0x64a, 0x631, 0x627, 0x646, 0x3b, 0x62a, 0x645,</div><div class='add'>+0x648, 0x632, 0x3b, 0x622, 0x628, 0x3b, 0x623, 0x64a, 0x644, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0x20, 0x627, 0x644,</div><div class='add'>+0x623, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x643, 0x627, 0x646,</div><div class='add'>+0x648, 0x646, 0x20, 0x627, 0x644, 0x623, 0x648, 0x644, 0x3b, 0x643, 0x627, 0x646, 0x648, 0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646,</div><div class='add'>+0x64a, 0x3b, 0x634, 0x628, 0x627, 0x637, 0x3b, 0x622, 0x630, 0x627, 0x631, 0x3b, 0x646, 0x64a, 0x633, 0x627, 0x646, 0x3b, 0x646, 0x648,</div><div class='add'>+0x627, 0x631, 0x3b, 0x62d, 0x632, 0x64a, 0x631, 0x627, 0x646, 0x3b, 0x62a, 0x645, 0x648, 0x632, 0x3b, 0x622, 0x628, 0x3b, 0x623, 0x64a,</div><div class='add'>+0x644, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a, 0x646, 0x20, 0x627, 0x644, 0x623, 0x648, 0x644, 0x3b, 0x62a, 0x634, 0x631, 0x64a,</div><div class='add'>+0x646, 0x20, 0x627, 0x644, 0x62b, 0x627, 0x646, 0x64a, 0x3b, 0x643, 0x627, 0x646, 0x648, 0x646, 0x20, 0x627, 0x644, 0x623, 0x648, 0x644,</div><div class='add'>+0x3b, 0x540, 0x576, 0x57e, 0x3b, 0x553, 0x57f, 0x57e, 0x3b, 0x544, 0x580, 0x57f, 0x3b, 0x531, 0x57a, 0x580, 0x3b, 0x544, 0x575, 0x57d,</div><div class='add'>+0x3b, 0x540, 0x576, 0x57d, 0x3b, 0x540, 0x56c, 0x57d, 0x3b, 0x555, 0x563, 0x57d, 0x3b, 0x54d, 0x565, 0x57a, 0x3b, 0x540, 0x578, 0x56f,</div><div class='add'>+0x3b, 0x546, 0x578, 0x575, 0x3b, 0x534, 0x565, 0x56f, 0x3b, 0x540, 0x578, 0x582, 0x576, 0x57e, 0x561, 0x580, 0x3b, 0x553, 0x565, 0x57f,</div><div class='add'>+0x580, 0x57e, 0x561, 0x580, 0x3b, 0x544, 0x561, 0x580, 0x57f, 0x3b, 0x531, 0x57a, 0x580, 0x56b, 0x56c, 0x3b, 0x544, 0x561, 0x575, 0x56b,</div><div class='add'>+0x57d, 0x3b, 0x540, 0x578, 0x582, 0x576, 0x56b, 0x57d, 0x3b, 0x540, 0x578, 0x582, 0x56c, 0x56b, 0x57d, 0x3b, 0x555, 0x563, 0x578, 0x57d,</div><div class='add'>+0x57f, 0x578, 0x57d, 0x3b, 0x54d, 0x565, 0x57a, 0x57f, 0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x540, 0x578, 0x56f, 0x57f, 0x565, 0x574,</div><div class='add'>+0x562, 0x565, 0x580, 0x3b, 0x546, 0x578, 0x575, 0x565, 0x574, 0x562, 0x565, 0x580, 0x3b, 0x534, 0x565, 0x56f, 0x57f, 0x565, 0x574, 0x562,</div><div class='add'>+0x565, 0x580, 0x3b, 0x31, 0x3b, 0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39,</div><div class='add'>+0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x3b, 0x9ab, 0x9c7, 0x9ac, 0x9cd, 0x9f0,</div><div class='add'>+0x9c1, 0x3b, 0x9ae, 0x9be, 0x9f0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9f0, 0x9bf, 0x9b2, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1,</div><div class='add'>+0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997, 0x3b, 0x9b8, 0x9c7, 0x9aa, 0x9cd, 0x99f, 0x3b, 0x985, 0x995, 0x9cd,</div><div class='add'>+0x99f, 0x9cb, 0x3b, 0x9a8, 0x9ad, 0x9c7, 0x3b, 0x9a1, 0x9bf, 0x9b8, 0x9c7, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x9f1, 0x9be, 0x9f0, 0x9c0,</div><div class='add'>+0x3b, 0x9ab, 0x9c7, 0x9ac, 0x9cd, 0x9f0, 0x9c1, 0x9f1, 0x9be, 0x9f0, 0x9c0, 0x3b, 0x9ae, 0x9be, 0x9f0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa,</div><div class='add'>+0x9cd, 0x9f0, 0x9bf, 0x9b2, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997,</div><div class='add'>+0x9b7, 0x9cd, 0x99f, 0x3b, 0x99b, 0x9c7, 0x9aa, 0x9cd, 0x9a4, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb,</div><div class='add'>+0x9ac, 0x9f0, 0x3b, 0x9a8, 0x9f1, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x3b, 0x9a1, 0x9bf, 0x99a, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9f0, 0x3b,</div><div class='add'>+0x79, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b,</div><div class='add'>+0x69, 0x79, 0x6e, 0x3b, 0x69, 0x79, 0x6c, 0x3b, 0x61, 0x76, 0x71, 0x3b, 0x73, 0x65, 0x6e, 0x3b, 0x6f, 0x6b, 0x74, 0x3b,</div><div class='add'>+0x6e, 0x6f, 0x79, 0x3b, 0x64, 0x65, 0x6b, 0x3b, 0x59, 0x61, 0x6e, 0x76, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x76, 0x72, 0x61,</div><div class='add'>+0x6c, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x130, 0x79, 0x75,</div><div class='add'>+0x6e, 0x3b, 0x130, 0x79, 0x75, 0x6c, 0x3b, 0x41, 0x76, 0x71, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x6e, 0x74, 0x79, 0x61,</div><div class='add'>+0x62, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x4e, 0x6f, 0x79, 0x61, 0x62, 0x72, 0x3b, 0x44, 0x65,</div><div class='add'>+0x6b, 0x61, 0x62, 0x72, 0x3b, 0x458, 0x430, 0x43d, 0x432, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b, 0x43c,</div><div class='add'>+0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x435, 0x43b, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x458, 0x443, 0x43d, 0x3b, 0x438,</div><div class='add'>+0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x458, 0x430, 0x431, 0x440, 0x3b,</div><div class='add'>+0x43e, 0x43a, 0x442, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x43d, 0x43e, 0x458, 0x430, 0x431, 0x440, 0x3b, 0x434, 0x435, 0x43a, 0x430, 0x431,</div><div class='add'>+0x440, 0x3b, 0x75, 0x72, 0x74, 0x3b, 0x6f, 0x74, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x69, 0x3b, 0x6d, 0x61,</div><div class='add'>+0x69, 0x3b, 0x65, 0x6b, 0x61, 0x3b, 0x75, 0x7a, 0x74, 0x3b, 0x61, 0x62, 0x75, 0x3b, 0x69, 0x72, 0x61, 0x3b, 0x75, 0x72,</div><div class='add'>+0x72, 0x3b, 0x61, 0x7a, 0x61, 0x3b, 0x61, 0x62, 0x65, 0x3b, 0x75, 0x72, 0x74, 0x61, 0x72, 0x72, 0x69, 0x6c, 0x61, 0x3b,</div><div class='add'>+0x6f, 0x74, 0x73, 0x61, 0x69, 0x6c, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x78, 0x6f, 0x61, 0x3b, 0x61, 0x70, 0x69, 0x72,</div><div class='add'>+0x69, 0x6c, 0x61, 0x3b, 0x6d, 0x61, 0x69, 0x61, 0x74, 0x7a, 0x61, 0x3b, 0x65, 0x6b, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x75,</div><div class='add'>+0x7a, 0x74, 0x61, 0x69, 0x6c, 0x61, 0x3b, 0x61, 0x62, 0x75, 0x7a, 0x74, 0x75, 0x61, 0x3b, 0x69, 0x72, 0x61, 0x69, 0x6c,</div><div class='add'>+0x61, 0x3b, 0x75, 0x72, 0x72, 0x69, 0x61, 0x3b, 0x61, 0x7a, 0x61, 0x72, 0x6f, 0x61, 0x3b, 0x61, 0x62, 0x65, 0x6e, 0x64,</div><div class='add'>+0x75, 0x61, 0x3b, 0x55, 0x3b, 0x4f, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x55, 0x3b, 0x41, 0x3b, 0x49,</div><div class='add'>+0x3b, 0x55, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x99c, 0x9be, 0x9a8, 0x9c1, 0x9af, 0x9bc, 0x9be, 0x9b0, 0x9c0, 0x3b, 0x9ab, 0x9c7, 0x9ac,</div><div class='add'>+0x9cd, 0x9b0, 0x9c1, 0x9af, 0x9bc, 0x9be, 0x9b0, 0x9c0, 0x3b, 0x9ae, 0x9be, 0x9b0, 0x9cd, 0x99a, 0x3b, 0x98f, 0x9aa, 0x9cd, 0x9b0, 0x9bf,</div><div class='add'>+0x9b2, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x9b2, 0x9be, 0x987, 0x3b, 0x986, 0x997, 0x9b8, 0x9cd, 0x99f,</div><div class='add'>+0x3b, 0x9b8, 0x9c7, 0x9aa, 0x9cd, 0x99f, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x985, 0x995, 0x9cd, 0x99f, 0x9cb, 0x9ac, 0x9b0, 0x3b,</div><div class='add'>+0x9a8, 0x9ad, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x9a1, 0x9bf, 0x9b8, 0x9c7, 0x9ae, 0x9cd, 0x9ac, 0x9b0, 0x3b, 0x99c, 0x9be, 0x3b,</div><div class='add'>+0x9ab, 0x9c7, 0x3b, 0x9ae, 0x9be, 0x3b, 0x98f, 0x3b, 0x9ae, 0x9c7, 0x3b, 0x99c, 0x9c1, 0x9a8, 0x3b, 0x99c, 0x9c1, 0x3b, 0x986, 0x3b,</div><div class='add'>+0x9b8, 0x9c7, 0x3b, 0x985, 0x3b, 0x9a8, 0x3b, 0x9a1, 0x9bf, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf21, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20,</div><div class='add'>+0xf22, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf23, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf24, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf25, 0x3b,</div><div class='add'>+0xf5f, 0xfb3, 0xf0b, 0x20, 0xf26, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf27, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf28, 0x3b, 0xf5f, 0xfb3,</div><div class='add'>+0xf0b, 0x20, 0xf29, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf21, 0xf20, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x20, 0xf21, 0xf21, 0x3b, 0xf5f, 0xfb3,</div><div class='add'>+0xf0b, 0x20, 0xf21, 0xf22, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf51, 0xf44, 0xf54, 0xf0b, 0x3b, 0xf66,</div><div class='add'>+0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72,</div><div class='add'>+0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf42, 0xf66, 0xf74, 0xf58, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3,</div><div class='add'>+0xf5d, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf63, 0xf94,</div><div class='add'>+0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0xf0b,</div><div class='add'>+0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4,</div><div class='add'>+0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf56, 0xf62, 0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72,</div><div class='add'>+0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d,</div><div class='add'>+0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf56, 0xf45, 0xf74,</div><div class='add'>+0xf0b, 0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xfb1, 0xf72, 0xf0b, 0xf5f, 0xfb3, 0xf5d, 0xf0b, 0xf56, 0xf45,</div><div class='add'>+0xf74, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0x44f, 0x43d, 0x2e, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x2e, 0x3b,</div><div class='add'>+0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x44e, 0x43d, 0x438, 0x3b, 0x44e, 0x43b,</div><div class='add'>+0x438, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x2e, 0x3b, 0x43e, 0x43a, 0x442, 0x2e, 0x3b, 0x43d, 0x43e,</div><div class='add'>+0x435, 0x43c, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x44f, 0x43d, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x444, 0x435, 0x432, 0x440,</div><div class='add'>+0x443, 0x430, 0x440, 0x438, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x439, 0x3b,</div><div class='add'>+0x44e, 0x43d, 0x438, 0x3b, 0x44e, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435,</div><div class='add'>+0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x432, 0x440,</div><div class='add'>+0x438, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x44f, 0x3b, 0x444, 0x3b, 0x43c, 0x3b, 0x430, 0x3b, 0x43c,</div><div class='add'>+0x3b, 0x44e, 0x3b, 0x44e, 0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x43e, 0x3b, 0x43d, 0x3b, 0x434, 0x3b, 0x1007, 0x1014, 0x103a, 0x3b, 0x1016,</div><div class='add'>+0x1031, 0x3b, 0x1019, 0x1010, 0x103a, 0x3b, 0x1027, 0x3b, 0x1019, 0x1031, 0x3b, 0x1007, 0x103d, 0x1014, 0x103a, 0x3b, 0x1007, 0x1030, 0x3b, 0x1029,</div><div class='add'>+0x3b, 0x1005, 0x1000, 0x103a, 0x3b, 0x1021, 0x1031, 0x102c, 0x1000, 0x103a, 0x3b, 0x1014, 0x102d, 0x102f, 0x3b, 0x1012, 0x102e, 0x3b, 0x1007, 0x1014,</div><div class='add'>+0x103a, 0x1014, 0x101d, 0x102b, 0x101b, 0x102e, 0x3b, 0x1016, 0x1031, 0x1016, 0x1031, 0x102c, 0x103a, 0x101d, 0x102b, 0x101b, 0x102e, 0x3b, 0x1019, 0x1010,</div><div class='add'>+0x103a, 0x3b, 0x1027, 0x1015, 0x103c, 0x102e, 0x3b, 0x1019, 0x1031, 0x3b, 0x1007, 0x103d, 0x1014, 0x103a, 0x3b, 0x1007, 0x1030, 0x101c, 0x102d, 0x102f,</div><div class='add'>+0x1004, 0x103a, 0x3b, 0x1029, 0x1002, 0x102f, 0x1010, 0x103a, 0x3b, 0x1005, 0x1000, 0x103a, 0x1010, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1021, 0x1031,</div><div class='add'>+0x102c, 0x1000, 0x103a, 0x1010, 0x102d, 0x102f, 0x1018, 0x102c, 0x3b, 0x1014, 0x102d, 0x102f, 0x101d, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1012, 0x102e,</div><div class='add'>+0x1007, 0x1004, 0x103a, 0x1018, 0x102c, 0x3b, 0x1007, 0x3b, 0x1016, 0x3b, 0x1019, 0x3b, 0x1027, 0x3b, 0x1019, 0x3b, 0x1007, 0x3b, 0x1007, 0x3b,</div><div class='add'>+0x1029, 0x3b, 0x1005, 0x3b, 0x1021, 0x3b, 0x1014, 0x3b, 0x1012, 0x3b, 0x441, 0x442, 0x443, 0x3b, 0x43b, 0x44e, 0x442, 0x3b, 0x441, 0x430,</div><div class='add'>+0x43a, 0x3b, 0x43a, 0x440, 0x430, 0x3b, 0x442, 0x440, 0x430, 0x3b, 0x447, 0x44d, 0x440, 0x3b, 0x43b, 0x456, 0x43f, 0x3b, 0x436, 0x43d,</div><div class='add'>+0x456, 0x3b, 0x432, 0x435, 0x440, 0x3b, 0x43a, 0x430, 0x441, 0x3b, 0x43b, 0x456, 0x441, 0x3b, 0x441, 0x43d, 0x435, 0x3b, 0x441, 0x442,</div><div class='add'>+0x443, 0x434, 0x437, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x44e, 0x442, 0x44b, 0x3b, 0x441, 0x430, 0x43a, 0x430, 0x432, 0x456, 0x43a, 0x3b,</div><div class='add'>+0x43a, 0x440, 0x430, 0x441, 0x430, 0x432, 0x456, 0x43a, 0x3b, 0x442, 0x440, 0x430, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x447, 0x44d, 0x440,</div><div class='add'>+0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x43b, 0x456, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x436, 0x43d, 0x456, 0x432, 0x435, 0x43d, 0x44c, 0x3b,</div><div class='add'>+0x432, 0x435, 0x440, 0x430, 0x441, 0x435, 0x43d, 0x44c, 0x3b, 0x43a, 0x430, 0x441, 0x442, 0x440, 0x44b, 0x447, 0x43d, 0x456, 0x43a, 0x3b,</div><div class='add'>+0x43b, 0x456, 0x441, 0x442, 0x430, 0x43f, 0x430, 0x434, 0x3b, 0x441, 0x43d, 0x435, 0x436, 0x430, 0x43d, 0x44c, 0x3b, 0x441, 0x3b, 0x43b,</div><div class='add'>+0x3b, 0x441, 0x3b, 0x43a, 0x3b, 0x43c, 0x3b, 0x447, 0x3b, 0x43b, 0x3b, 0x436, 0x3b, 0x432, 0x3b, 0x43a, 0x3b, 0x43b, 0x3b, 0x441,</div><div class='add'>+0x3b, 0x17e1, 0x3b, 0x17e2, 0x3b, 0x17e3, 0x3b, 0x17e4, 0x3b, 0x17e5, 0x3b, 0x17e6, 0x3b, 0x17e7, 0x3b, 0x17e8, 0x3b, 0x17e9, 0x3b, 0x17e1,</div><div class='add'>+0x17e0, 0x3b, 0x17e1, 0x17e1, 0x3b, 0x17e1, 0x17e2, 0x3b, 0x1798, 0x1780, 0x179a, 0x17b6, 0x3b, 0x1780, 0x17bb, 0x1798, 0x17d2, 0x1797, 0x17c8, 0x3b,</div><div class='add'>+0x1798, 0x17b7, 0x1793, 0x17b6, 0x3b, 0x1798, 0x17c1, 0x179f, 0x17b6, 0x3b, 0x17a7, 0x179f, 0x1797, 0x17b6, 0x3b, 0x1798, 0x17b7, 0x1790, 0x17bb, 0x1793,</div><div class='add'>+0x17b6, 0x3b, 0x1780, 0x1780, 0x17d2, 0x1780, 0x178a, 0x17b6, 0x3b, 0x179f, 0x17b8, 0x17a0, 0x17b6, 0x3b, 0x1780, 0x1789, 0x17d2, 0x1789, 0x17b6, 0x3b,</div><div class='add'>+0x178f, 0x17bb, 0x179b, 0x17b6, 0x3b, 0x179c, 0x17b7, 0x1785, 0x17d2, 0x1786, 0x17b7, 0x1780, 0x17b6, 0x3b, 0x1792, 0x17d2, 0x1793, 0x17bc, 0x3b, 0x67,</div><div class='add'>+0x65, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x61, 0x62, 0x72, 0x2e, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x69, 0x67, 0x3b, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x6a, 0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x67, 0x2e, 0x3b, 0x73,</div><div class='add'>+0x65, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x67,</div><div class='add'>+0x65, 0x6e, 0x65, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x61, 0x62, 0x72,</div><div class='add'>+0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x67, 0x3b, 0x6a, 0x75, 0x6e, 0x79, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6f, 0x6c, 0x3b,</div><div class='add'>+0x61, 0x67, 0x6f, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x75, 0x62,</div><div class='add'>+0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x72, 0x65,</div><div class='add'>+0x3b, 0x67, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x6a, 0x3b, 0x61, 0x3b, 0x73, 0x3b, 0x6f,</div><div class='add'>+0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x4e00, 0x6708, 0x3b, 0x4e8c, 0x6708, 0x3b, 0x4e09, 0x6708, 0x3b, 0x56db, 0x6708, 0x3b, 0x4e94, 0x6708, 0x3b,</div><div class='add'>+0x516d, 0x6708, 0x3b, 0x4e03, 0x6708, 0x3b, 0x516b, 0x6708, 0x3b, 0x4e5d, 0x6708, 0x3b, 0x5341, 0x6708, 0x3b, 0x5341, 0x4e00, 0x6708, 0x3b, 0x5341,</div><div class='add'>+0x4e8c, 0x6708, 0x3b, 0x31, 0x6708, 0x3b, 0x32, 0x6708, 0x3b, 0x33, 0x6708, 0x3b, 0x34, 0x6708, 0x3b, 0x35, 0x6708, 0x3b, 0x36, 0x6708,</div><div class='add'>+0x3b, 0x37, 0x6708, 0x3b, 0x38, 0x6708, 0x3b, 0x39, 0x6708, 0x3b, 0x31, 0x30, 0x6708, 0x3b, 0x31, 0x31, 0x6708, 0x3b, 0x31, 0x32,</div><div class='add'>+0x6708, 0x3b, 0x73, 0x69, 0x6a, 0x3b, 0x76, 0x65, 0x6c, 0x6a, 0x3b, 0x6f, 0x17e, 0x75, 0x3b, 0x74, 0x72, 0x61, 0x3b, 0x73,</div><div class='add'>+0x76, 0x69, 0x3b, 0x6c, 0x69, 0x70, 0x3b, 0x73, 0x72, 0x70, 0x3b, 0x6b, 0x6f, 0x6c, 0x3b, 0x72, 0x75, 0x6a, 0x3b, 0x6c,</div><div class='add'>+0x69, 0x73, 0x3b, 0x73, 0x74, 0x75, 0x3b, 0x70, 0x72, 0x6f, 0x3b, 0x73, 0x69, 0x6a, 0x65, 0x10d, 0x61, 0x6e, 0x6a, 0x3b,</div><div class='add'>+0x76, 0x65, 0x6c, 0x6a, 0x61, 0x10d, 0x61, 0x3b, 0x6f, 0x17e, 0x75, 0x6a, 0x61, 0x6b, 0x3b, 0x74, 0x72, 0x61, 0x76, 0x61,</div><div class='add'>+0x6e, 0x6a, 0x3b, 0x73, 0x76, 0x69, 0x62, 0x61, 0x6e, 0x6a, 0x3b, 0x6c, 0x69, 0x70, 0x61, 0x6e, 0x6a, 0x3b, 0x73, 0x72,</div><div class='add'>+0x70, 0x61, 0x6e, 0x6a, 0x3b, 0x6b, 0x6f, 0x6c, 0x6f, 0x76, 0x6f, 0x7a, 0x3b, 0x72, 0x75, 0x6a, 0x61, 0x6e, 0x3b, 0x6c,</div><div class='add'>+0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x3b, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e, 0x69, 0x3b, 0x70, 0x72, 0x6f, 0x73,</div><div class='add'>+0x69, 0x6e, 0x61, 0x63, 0x3b, 0x31, 0x2e, 0x3b, 0x32, 0x2e, 0x3b, 0x33, 0x2e, 0x3b, 0x34, 0x2e, 0x3b, 0x35, 0x2e, 0x3b,</div><div class='add'>+0x36, 0x2e, 0x3b, 0x37, 0x2e, 0x3b, 0x38, 0x2e, 0x3b, 0x39, 0x2e, 0x3b, 0x31, 0x30, 0x2e, 0x3b, 0x31, 0x31, 0x2e, 0x3b,</div><div class='add'>+0x31, 0x32, 0x2e, 0x3b, 0x6c, 0x65, 0x64, 0x65, 0x6e, 0x3b, 0xfa, 0x6e, 0x6f, 0x72, 0x3b, 0x62, 0x159, 0x65, 0x7a, 0x65,</div><div class='add'>+0x6e, 0x3b, 0x64, 0x75, 0x62, 0x65, 0x6e, 0x3b, 0x6b, 0x76, 0x11b, 0x74, 0x65, 0x6e, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x65,</div><div class='add'>+0x6e, 0x3b, 0x10d, 0x65, 0x72, 0x76, 0x65, 0x6e, 0x65, 0x63, 0x3b, 0x73, 0x72, 0x70, 0x65, 0x6e, 0x3b, 0x7a, 0xe1, 0x159,</div><div class='add'>+0xed, 0x3b, 0x159, 0xed, 0x6a, 0x65, 0x6e, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x3b, 0x70, 0x72, 0x6f,</div><div class='add'>+0x73, 0x69, 0x6e, 0x65, 0x63, 0x3b, 0x6c, 0x3b, 0xfa, 0x3b, 0x62, 0x3b, 0x64, 0x3b, 0x6b, 0x3b, 0x10d, 0x3b, 0x10d, 0x3b,</div><div class='add'>+0x73, 0x3b, 0x7a, 0x3b, 0x159, 0x3b, 0x6c, 0x3b, 0x70, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61,</div><div class='add'>+0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75,</div><div class='add'>+0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61,</div><div class='add'>+0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x61,</div><div class='add'>+0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61,</div><div class='add'>+0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f,</div><div class='add'>+0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65,</div><div class='add'>+0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x65,</div><div class='add'>+0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b,</div><div class='add'>+0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x66, 0x65,</div><div class='add'>+0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x61, 0x72, 0x74, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d,</div><div class='add'>+0x65, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x75,</div><div class='add'>+0x73, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b,</div><div class='add'>+0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0xd801, 0xdc16,</div><div class='add'>+0xd801, 0xdc30, 0xd801, 0xdc4c, 0x3b, 0xd801, 0xdc19, 0xd801, 0xdc2f, 0xd801, 0xdc3a, 0x3b, 0xd801, 0xdc23, 0xd801, 0xdc2a, 0xd801, 0xdc49, 0x3b, 0xd801,</div><div class='add'>+0xdc01, 0xd801, 0xdc39, 0xd801, 0xdc49, 0x3b, 0xd801, 0xdc23, 0xd801, 0xdc29, 0x3b, 0xd801, 0xdc16, 0xd801, 0xdc2d, 0xd801, 0xdc4c, 0x3b, 0xd801, 0xdc16,</div><div class='add'>+0xd801, 0xdc2d, 0xd801, 0xdc4a, 0x3b, 0xd801, 0xdc02, 0xd801, 0xdc40, 0x3b, 0xd801, 0xdc1d, 0xd801, 0xdc2f, 0xd801, 0xdc39, 0x3b, 0xd801, 0xdc09, 0xd801,</div><div class='add'>+0xdc3f, 0xd801, 0xdc3b, 0x3b, 0xd801, 0xdc24, 0xd801, 0xdc2c, 0xd801, 0xdc42, 0x3b, 0xd801, 0xdc14, 0xd801, 0xdc28, 0xd801, 0xdc45, 0x3b, 0xd801, 0xdc16,</div><div class='add'>+0xd801, 0xdc30, 0xd801, 0xdc4c, 0xd801, 0xdc37, 0xd801, 0xdc2d, 0xd801, 0xdc2f, 0xd801, 0xdc49, 0xd801, 0xdc28, 0x3b, 0xd801, 0xdc19, 0xd801, 0xdc2f, 0xd801,</div><div class='add'>+0xdc3a, 0xd801, 0xdc49, 0xd801, 0xdc2d, 0xd801, 0xdc2f, 0xd801, 0xdc49, 0xd801, 0xdc28, 0x3b, 0xd801, 0xdc23, 0xd801, 0xdc2a, 0xd801, 0xdc49, 0xd801, 0xdc3d,</div><div class='add'>+0x3b, 0xd801, 0xdc01, 0xd801, 0xdc39, 0xd801, 0xdc49, 0xd801, 0xdc2e, 0xd801, 0xdc4a, 0x3b, 0xd801, 0xdc23, 0xd801, 0xdc29, 0x3b, 0xd801, 0xdc16, 0xd801,</div><div class='add'>+0xdc2d, 0xd801, 0xdc4c, 0x3b, 0xd801, 0xdc16, 0xd801, 0xdc2d, 0xd801, 0xdc4a, 0xd801, 0xdc34, 0x3b, 0xd801, 0xdc02, 0xd801, 0xdc40, 0xd801, 0xdc32, 0xd801,</div><div class='add'>+0xdc45, 0xd801, 0xdc3b, 0x3b, 0xd801, 0xdc1d, 0xd801, 0xdc2f, 0xd801, 0xdc39, 0xd801, 0xdc3b, 0xd801, 0xdc2f, 0xd801, 0xdc4b, 0xd801, 0xdc3a, 0xd801, 0xdc32,</div><div class='add'>+0xd801, 0xdc49, 0x3b, 0xd801, 0xdc09, 0xd801, 0xdc3f, 0xd801, 0xdc3b, 0xd801, 0xdc2c, 0xd801, 0xdc3a, 0xd801, 0xdc32, 0xd801, 0xdc49, 0x3b, 0xd801, 0xdc24,</div><div class='add'>+0xd801, 0xdc2c, 0xd801, 0xdc42, 0xd801, 0xdc2f, 0xd801, 0xdc4b, 0xd801, 0xdc3a, 0xd801, 0xdc32, 0xd801, 0xdc49, 0x3b, 0xd801, 0xdc14, 0xd801, 0xdc28, 0xd801,</div><div class='add'>+0xdc45, 0xd801, 0xdc2f, 0xd801, 0xdc4b, 0xd801, 0xdc3a, 0xd801, 0xdc32, 0xd801, 0xdc49, 0x3b, 0xd801, 0xdc16, 0x3b, 0xd801, 0xdc19, 0x3b, 0xd801, 0xdc23,</div><div class='add'>+0x3b, 0xd801, 0xdc01, 0x3b, 0xd801, 0xdc23, 0x3b, 0xd801, 0xdc16, 0x3b, 0xd801, 0xdc16, 0x3b, 0xd801, 0xdc02, 0x3b, 0xd801, 0xdc1d, 0x3b, 0xd801,</div><div class='add'>+0xdc09, 0x3b, 0xd801, 0xdc24, 0x3b, 0xd801, 0xdc14, 0x3b, 0x6a, 0x61, 0x61, 0x6e, 0x3b, 0x76, 0x65, 0x65, 0x62, 0x72, 0x3b, 0x6d,</div><div class='add'>+0xe4, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x6a,</div><div class='add'>+0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f,</div><div class='add'>+0x76, 0x3b, 0x64, 0x65, 0x74, 0x73, 0x3b, 0x6a, 0x61, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x76, 0x65, 0x65, 0x62, 0x72,</div><div class='add'>+0x75, 0x61, 0x72, 0x3b, 0x6d, 0xe4, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x6d, 0x61, 0x69,</div><div class='add'>+0x3b, 0x6a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b,</div><div class='add'>+0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e,</div><div class='add'>+0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x74, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b,</div><div class='add'>+0x56, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b,</div><div class='add'>+0x44, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61,</div><div class='add'>+0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b,</div><div class='add'>+0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x73, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62,</div><div class='add'>+0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b,</div><div class='add'>+0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70,</div><div class='add'>+0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d,</div><div class='add'>+0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x74, 0x61, 0x6d, 0x6d, 0x69, 0x3b, 0x68,</div><div class='add'>+0x65, 0x6c, 0x6d, 0x69, 0x3b, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x3b, 0x68, 0x75, 0x68, 0x74, 0x69, 0x3b, 0x74, 0x6f,</div><div class='add'>+0x75, 0x6b, 0x6f, 0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x3b, 0x68, 0x65, 0x69, 0x6e, 0xe4, 0x3b, 0x65, 0x6c, 0x6f, 0x3b, 0x73,</div><div class='add'>+0x79, 0x79, 0x73, 0x3b, 0x6c, 0x6f, 0x6b, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x3b, 0x6a, 0x6f, 0x75, 0x6c,</div><div class='add'>+0x75, 0x3b, 0x74, 0x61, 0x6d, 0x6d, 0x69, 0x6b, 0x75, 0x75, 0x3b, 0x68, 0x65, 0x6c, 0x6d, 0x69, 0x6b, 0x75, 0x75, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x61, 0x6c, 0x69, 0x73, 0x6b, 0x75, 0x75, 0x3b, 0x68, 0x75, 0x68, 0x74, 0x69, 0x6b, 0x75, 0x75, 0x3b, 0x74,</div><div class='add'>+0x6f, 0x75, 0x6b, 0x6f, 0x6b, 0x75, 0x75, 0x3b, 0x6b, 0x65, 0x73, 0xe4, 0x6b, 0x75, 0x75, 0x3b, 0x68, 0x65, 0x69, 0x6e,</div><div class='add'>+0xe4, 0x6b, 0x75, 0x75, 0x3b, 0x65, 0x6c, 0x6f, 0x6b, 0x75, 0x75, 0x3b, 0x73, 0x79, 0x79, 0x73, 0x6b, 0x75, 0x75, 0x3b,</div><div class='add'>+0x6c, 0x6f, 0x6b, 0x61, 0x6b, 0x75, 0x75, 0x3b, 0x6d, 0x61, 0x72, 0x72, 0x61, 0x73, 0x6b, 0x75, 0x75, 0x3b, 0x6a, 0x6f,</div><div class='add'>+0x75, 0x6c, 0x75, 0x6b, 0x75, 0x75, 0x3b, 0x54, 0x3b, 0x48, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x48,</div><div class='add'>+0x3b, 0x45, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x2e, 0x3b, 0x66, 0xe9, 0x76,</div><div class='add'>+0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x69,</div><div class='add'>+0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x2e, 0x3b, 0x61, 0x6f, 0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f,</div><div class='add'>+0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0xe9, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x69, 0x65,</div><div class='add'>+0x72, 0x3b, 0x66, 0xe9, 0x76, 0x72, 0x69, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x6c,</div><div class='add'>+0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x69, 0x6e, 0x3b, 0x6a, 0x75, 0x69, 0x6c, 0x6c, 0x65, 0x74, 0x3b, 0x61, 0x6f,</div><div class='add'>+0xfb, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0x6f, 0x62, 0x72, 0x65,</div><div class='add'>+0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0xe9, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x58,</div><div class='add'>+0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x58,</div><div class='add'>+0x75, 0xf1, 0x3b, 0x58, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x75, 0x74, 0x3b, 0x4e,</div><div class='add'>+0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x58, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x65,</div><div class='add'>+0x69, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f,</div><div class='add'>+0x3b, 0x58, 0x75, 0xf1, 0x6f, 0x3b, 0x58, 0x75, 0x6c, 0x6c, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53,</div><div class='add'>+0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x4f, 0x75, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65,</div><div class='add'>+0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x58, 0x3b, 0x46, 0x3b, 0x4d, 0x3b,</div><div class='add'>+0x41, 0x3b, 0x4d, 0x3b, 0x58, 0x3b, 0x58, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x10d8, 0x10d0,</div><div class='add'>+0x10dc, 0x3b, 0x10d7, 0x10d4, 0x10d1, 0x3b, 0x10db, 0x10d0, 0x10e0, 0x3b, 0x10d0, 0x10de, 0x10e0, 0x3b, 0x10db, 0x10d0, 0x10d8, 0x3b, 0x10d8, 0x10d5,</div><div class='add'>+0x10dc, 0x3b, 0x10d8, 0x10d5, 0x10da, 0x3b, 0x10d0, 0x10d2, 0x10d5, 0x3b, 0x10e1, 0x10d4, 0x10e5, 0x3b, 0x10dd, 0x10e5, 0x10e2, 0x3b, 0x10dc, 0x10dd,</div><div class='add'>+0x10d4, 0x3b, 0x10d3, 0x10d4, 0x10d9, 0x3b, 0x10d8, 0x10d0, 0x10dc, 0x10d5, 0x10d0, 0x10e0, 0x10d8, 0x3b, 0x10d7, 0x10d4, 0x10d1, 0x10d4, 0x10e0, 0x10d5,</div><div class='add'>+0x10d0, 0x10da, 0x10d8, 0x3b, 0x10db, 0x10d0, 0x10e0, 0x10e2, 0x10d8, 0x3b, 0x10d0, 0x10de, 0x10e0, 0x10d8, 0x10da, 0x10d8, 0x3b, 0x10db, 0x10d0, 0x10d8,</div><div class='add'>+0x10e1, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10dc, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d8, 0x10d5, 0x10da, 0x10d8, 0x10e1, 0x10d8, 0x3b, 0x10d0, 0x10d2, 0x10d5,</div><div class='add'>+0x10d8, 0x10e1, 0x10e2, 0x10dd, 0x3b, 0x10e1, 0x10d4, 0x10e5, 0x10e2, 0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10dd, 0x10e5, 0x10e2, 0x10dd,</div><div class='add'>+0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10dc, 0x10dd, 0x10d4, 0x10db, 0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10d3, 0x10d4, 0x10d9, 0x10d4, 0x10db,</div><div class='add'>+0x10d1, 0x10d4, 0x10e0, 0x10d8, 0x3b, 0x10d8, 0x3b, 0x10d7, 0x3b, 0x10db, 0x3b, 0x10d0, 0x3b, 0x10db, 0x3b, 0x10d8, 0x3b, 0x10d8, 0x3b, 0x10d0,</div><div class='add'>+0x3b, 0x10e1, 0x3b, 0x10dd, 0x3b, 0x10dc, 0x3b, 0x10d3, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0x65, 0x62, 0x2e, 0x3b, 0x4d,</div><div class='add'>+0xe4, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c,</div><div class='add'>+0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a,</div><div class='add'>+0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a,</div><div class='add'>+0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69,</div><div class='add'>+0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b,</div><div class='add'>+0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0x65, 0x6d,</div><div class='add'>+0x62, 0x65, 0x72, 0x3b, 0x4a, 0xe4, 0x6e, 0x6e, 0x65, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d,</div><div class='add'>+0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a,</div><div class='add'>+0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72,</div><div class='add'>+0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65,</div><div class='add'>+0x7a, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x399, 0x3b1, 0x3bd, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3b, 0x39c, 0x3b1, 0x3c1, 0x3b, 0x391,</div><div class='add'>+0x3c0, 0x3c1, 0x3b, 0x39c, 0x3b1, 0x3ca, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bd, 0x3b, 0x399, 0x3bf, 0x3c5, 0x3bb, 0x3b, 0x391, 0x3c5, 0x3b3,</div><div class='add'>+0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3b, 0x39f, 0x3ba, 0x3c4, 0x3b, 0x39d, 0x3bf, 0x3b5, 0x3b, 0x394, 0x3b5, 0x3ba, 0x3b, 0x399, 0x3b1, 0x3bd,</div><div class='add'>+0x3bf, 0x3c5, 0x3ac, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x3a6, 0x3b5, 0x3b2, 0x3c1, 0x3bf, 0x3c5, 0x3ac, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b,</div><div class='add'>+0x39c, 0x3ac, 0x3c1, 0x3c4, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x391, 0x3c0, 0x3c1, 0x3af, 0x3bb, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39c, 0x3ac, 0x3b9,</div><div class='add'>+0x3bf, 0x3c2, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bd, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x399, 0x3bf, 0x3cd, 0x3bb, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x391,</div><div class='add'>+0x3cd, 0x3b3, 0x3bf, 0x3c5, 0x3c3, 0x3c4, 0x3bf, 0x3c2, 0x3b, 0x3a3, 0x3b5, 0x3c0, 0x3c4, 0x3ad, 0x3bc, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2,</div><div class='add'>+0x3b, 0x39f, 0x3ba, 0x3c4, 0x3ce, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x39d, 0x3bf, 0x3ad, 0x3bc, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2,</div><div class='add'>+0x3b, 0x394, 0x3b5, 0x3ba, 0x3ad, 0x3bc, 0x3b2, 0x3c1, 0x3b9, 0x3bf, 0x3c2, 0x3b, 0x399, 0x3b, 0x3a6, 0x3b, 0x39c, 0x3b, 0x391, 0x3b,</div><div class='add'>+0x39c, 0x3b, 0x399, 0x3b, 0x399, 0x3b, 0x391, 0x3b, 0x3a3, 0x3b, 0x39f, 0x3b, 0x39d, 0x3b, 0x394, 0x3b, 0x6a, 0x61, 0x6e, 0x75,</div><div class='add'>+0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x69, 0x3b,</div><div class='add'>+0x61, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x3b, 0x6d, 0x61, 0x6a, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c,</div><div class='add'>+0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x75, 0x73, 0x69, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65,</div><div class='add'>+0x72, 0x69, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x69, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72,</div><div class='add'>+0x69, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x69, 0x3b, 0xa9c, 0xabe, 0xaa8, 0xacd, 0xaaf, 0xac1, 0x3b, 0xaab,</div><div class='add'>+0xac7, 0xaac, 0xacd, 0xab0, 0xac1, 0x3b, 0xaae, 0xabe, 0xab0, 0xacd, 0xa9a, 0x3b, 0xa8f, 0xaaa, 0xacd, 0xab0, 0xabf, 0xab2, 0x3b, 0xaae,</div><div class='add'>+0xac7, 0x3b, 0xa9c, 0xac2, 0xaa8, 0x3b, 0xa9c, 0xac1, 0xab2, 0xabe, 0xa88, 0x3b, 0xa91, 0xa97, 0xab8, 0xacd, 0xa9f, 0x3b, 0xab8, 0xaaa,</div><div class='add'>+0xacd, 0xa9f, 0xac7, 0x3b, 0xa91, 0xa95, 0xacd, 0xa9f, 0xacb, 0x3b, 0xaa8, 0xab5, 0xac7, 0x3b, 0xaa1, 0xabf, 0xab8, 0xac7, 0x3b, 0xa9c,</div><div class='add'>+0xabe, 0xaa8, 0xacd, 0xaaf, 0xac1, 0xa86, 0xab0, 0xac0, 0x3b, 0xaab, 0xac7, 0xaac, 0xacd, 0xab0, 0xac1, 0xa86, 0xab0, 0xac0, 0x3b, 0xaae,</div><div class='add'>+0xabe, 0xab0, 0xacd, 0xa9a, 0x3b, 0xa8f, 0xaaa, 0xacd, 0xab0, 0xabf, 0xab2, 0x3b, 0xaae, 0xac7, 0x3b, 0xa9c, 0xac2, 0xaa8, 0x3b, 0xa9c,</div><div class='add'>+0xac1, 0xab2, 0xabe, 0xa88, 0x3b, 0xa91, 0xa97, 0xab8, 0xacd, 0xa9f, 0x3b, 0xab8, 0xaaa, 0xacd, 0xa9f, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0,</div><div class='add'>+0x3b, 0xa91, 0xa95, 0xacd, 0xa9f, 0xacd, 0xaac, 0xab0, 0x3b, 0xaa8, 0xab5, 0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xaa1, 0xabf, 0xab8,</div><div class='add'>+0xac7, 0xaae, 0xacd, 0xaac, 0xab0, 0x3b, 0xa9c, 0xabe, 0x3b, 0xaab, 0xac7, 0x3b, 0xaae, 0xabe, 0x3b, 0xa8f, 0x3b, 0xaae, 0xac7, 0x3b,</div><div class='add'>+0xa9c, 0xac2, 0x3b, 0xa9c, 0xac1, 0x3b, 0xa91, 0x3b, 0xab8, 0x3b, 0xa91, 0x3b, 0xaa8, 0x3b, 0xaa1, 0xabf, 0x3b, 0x4a, 0x61, 0x6e,</div><div class='add'>+0x3b, 0x46, 0x61, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x66, 0x69, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e,</div><div class='add'>+0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x75, 0x3b, 0x53, 0x61, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x75, 0x77,</div><div class='add'>+0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x61, 0x69, 0x72, 0x75, 0x3b, 0x46, 0x61, 0x62, 0x75, 0x72, 0x61, 0x69,</div><div class='add'>+0x72, 0x75, 0x3b, 0x4d, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x41, 0x66, 0x69, 0x72, 0x69, 0x6c, 0x75, 0x3b, 0x4d, 0x61, 0x79,</div><div class='add'>+0x75, 0x3b, 0x59, 0x75, 0x6e, 0x69, 0x3b, 0x59, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x74, 0x61, 0x3b, 0x53,</div><div class='add'>+0x61, 0x74, 0x75, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x75, 0x77, 0x61, 0x6d, 0x62,</div><div class='add'>+0x61, 0x3b, 0x44, 0x69, 0x73, 0x61, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b,</div><div class='add'>+0x59, 0x3b, 0x59, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x62c, 0x64e, 0x646, 0x3b, 0x6a2, 0x64e,</div><div class='add'>+0x628, 0x3b, 0x645, 0x64e, 0x631, 0x3b, 0x623, 0x64e, 0x6a2, 0x652, 0x631, 0x3b, 0x645, 0x64e, 0x64a, 0x3b, 0x64a, 0x64f, 0x648, 0x646,</div><div class='add'>+0x3b, 0x64a, 0x64f, 0x648, 0x644, 0x3b, 0x623, 0x64e, 0x63a, 0x64f, 0x3b, 0x633, 0x64e, 0x62a, 0x3b, 0x623, 0x64f, 0x643, 0x652, 0x62a,</div><div class='add'>+0x3b, 0x646, 0x64f, 0x648, 0x3b, 0x62f, 0x650, 0x633, 0x3b, 0x62c, 0x64e, 0x646, 0x64e, 0x64a, 0x652, 0x631, 0x64f, 0x3b, 0x6a2, 0x64e,</div><div class='add'>+0x628, 0x652, 0x631, 0x64e, 0x64a, 0x652, 0x631, 0x64f, 0x3b, 0x645, 0x64e, 0x631, 0x650, 0x633, 0x652, 0x3b, 0x623, 0x64e, 0x6a2, 0x652,</div><div class='add'>+0x631, 0x650, 0x644, 0x64f, 0x3b, 0x645, 0x64e, 0x64a, 0x64f, 0x3b, 0x64a, 0x64f, 0x648, 0x646, 0x650, 0x3b, 0x64a, 0x64f, 0x648, 0x644,</div><div class='add'>+0x650, 0x3b, 0x623, 0x64e, 0x63a, 0x64f, 0x633, 0x652, 0x62a, 0x64e, 0x3b, 0x633, 0x64e, 0x62a, 0x64f, 0x645, 0x652, 0x628, 0x64e, 0x3b,</div><div class='add'>+0x623, 0x64f, 0x643, 0x652, 0x62a, 0x648, 0x64f, 0x628, 0x64e, 0x3b, 0x646, 0x64f, 0x648, 0x64e, 0x645, 0x652, 0x628, 0x64e, 0x3b, 0x62f,</div><div class='add'>+0x650, 0x633, 0x64e, 0x645, 0x652, 0x628, 0x64e, 0x3b, 0x5d9, 0x5e0, 0x5d5, 0x5f3, 0x3b, 0x5e4, 0x5d1, 0x5e8, 0x5f3, 0x3b, 0x5de, 0x5e8,</div><div class='add'>+0x5e1, 0x3b, 0x5d0, 0x5e4, 0x5e8, 0x5f3, 0x3b, 0x5de, 0x5d0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dc, 0x5f3,</div><div class='add'>+0x3b, 0x5d0, 0x5d5, 0x5d2, 0x5f3, 0x3b, 0x5e1, 0x5e4, 0x5d8, 0x5f3, 0x3b, 0x5d0, 0x5d5, 0x5e7, 0x5f3, 0x3b, 0x5e0, 0x5d5, 0x5d1, 0x5f3,</div><div class='add'>+0x3b, 0x5d3, 0x5e6, 0x5de, 0x5f3, 0x3b, 0x5d9, 0x5e0, 0x5d5, 0x5d0, 0x5e8, 0x3b, 0x5e4, 0x5d1, 0x5e8, 0x5d5, 0x5d0, 0x5e8, 0x3b, 0x5de,</div><div class='add'>+0x5e8, 0x5e1, 0x3b, 0x5d0, 0x5e4, 0x5e8, 0x5d9, 0x5dc, 0x3b, 0x5de, 0x5d0, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5e0, 0x5d9, 0x3b, 0x5d9, 0x5d5,</div><div class='add'>+0x5dc, 0x5d9, 0x3b, 0x5d0, 0x5d5, 0x5d2, 0x5d5, 0x5e1, 0x5d8, 0x3b, 0x5e1, 0x5e4, 0x5d8, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x5d0, 0x5d5, 0x5e7,</div><div class='add'>+0x5d8, 0x5d5, 0x5d1, 0x5e8, 0x3b, 0x5e0, 0x5d5, 0x5d1, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x5d3, 0x5e6, 0x5de, 0x5d1, 0x5e8, 0x3b, 0x91c, 0x928,</div><div class='add'>+0x935, 0x930, 0x940, 0x3b, 0x92b, 0x930, 0x935, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930,</div><div class='add'>+0x948, 0x932, 0x3b, 0x92e, 0x908, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917, 0x938, 0x94d,</div><div class='add'>+0x924, 0x3b, 0x938, 0x93f, 0x924, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x905, 0x915, 0x94d, 0x924, 0x942, 0x92c, 0x930, 0x3b, 0x928, 0x935,</div><div class='add'>+0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x926, 0x93f, 0x938, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x91c, 0x3b, 0x92b, 0x93c, 0x3b, 0x92e, 0x93e,</div><div class='add'>+0x3b, 0x905, 0x3b, 0x92e, 0x3b, 0x91c, 0x942, 0x3b, 0x91c, 0x941, 0x3b, 0x905, 0x3b, 0x938, 0x93f, 0x3b, 0x905, 0x3b, 0x928, 0x3b,</div><div class='add'>+0x926, 0x93f, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0xe1, 0x72, 0x63, 0x2e, 0x3b,</div><div class='add'>+0xe1, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0xe1, 0x6a, 0x2e, 0x3b, 0x6a, 0xfa, 0x6e, 0x2e, 0x3b, 0x6a, 0xfa, 0x6c, 0x2e, 0x3b,</div><div class='add'>+0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x7a, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76,</div><div class='add'>+0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0xe1, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1,</div><div class='add'>+0x72, 0x3b, 0x6d, 0xe1, 0x72, 0x63, 0x69, 0x75, 0x73, 0x3b, 0xe1, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x73, 0x3b, 0x6d, 0xe1,</div><div class='add'>+0x6a, 0x75, 0x73, 0x3b, 0x6a, 0xfa, 0x6e, 0x69, 0x75, 0x73, 0x3b, 0x6a, 0xfa, 0x6c, 0x69, 0x75, 0x73, 0x3b, 0x61, 0x75,</div><div class='add'>+0x67, 0x75, 0x73, 0x7a, 0x74, 0x75, 0x73, 0x3b, 0x73, 0x7a, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f,</div><div class='add'>+0x6b, 0x74, 0xf3, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65,</div><div class='add'>+0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0xc1, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41,</div><div class='add'>+0x3b, 0x53, 0x7a, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b, 0x6d, 0x61,</div><div class='add'>+0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0xed, 0x3b, 0x6a, 0xfa, 0x6e, 0x3b, 0x6a, 0xfa, 0x6c, 0x3b, 0xe1, 0x67,</div><div class='add'>+0xfa, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0xf3, 0x76, 0x3b, 0x64, 0x65, 0x73, 0x3b, 0x6a, 0x61,</div><div class='add'>+0x6e, 0xfa, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0xfa, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70,</div><div class='add'>+0x72, 0xed, 0x6c, 0x3b, 0x6d, 0x61, 0xed, 0x3b, 0x6a, 0xfa, 0x6e, 0xed, 0x3b, 0x6a, 0xfa, 0x6c, 0xed, 0x3b, 0xe1, 0x67,</div><div class='add'>+0xfa, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0xf3, 0x62, 0x65,</div><div class='add'>+0x72, 0x3b, 0x6e, 0xf3, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,</div><div class='add'>+0x6a, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x6a, 0x3b, 0xe1, 0x3b, 0x73, 0x3b, 0x6f, 0x3b,</div><div class='add'>+0x6e, 0x3b, 0x64, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b,</div><div class='add'>+0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x75, 0x3b, 0x53, 0x65, 0x70, 0x3b,</div><div class='add'>+0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b,</div><div class='add'>+0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x72, 0x65, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c,</div><div class='add'>+0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x74,</div><div class='add'>+0x75, 0x73, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72,</div><div class='add'>+0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x45,</div><div class='add'>+0x61, 0x6e, 0x3b, 0x46, 0x65, 0x61, 0x62, 0x68, 0x3b, 0x4d, 0xe1, 0x72, 0x74, 0x61, 0x3b, 0x41, 0x69, 0x62, 0x3b, 0x42,</div><div class='add'>+0x65, 0x61, 0x6c, 0x3b, 0x4d, 0x65, 0x69, 0x74, 0x68, 0x3b, 0x49, 0xfa, 0x69, 0x6c, 0x3b, 0x4c, 0xfa, 0x6e, 0x3b, 0x4d,</div><div class='add'>+0x46, 0xf3, 0x6d, 0x68, 0x3b, 0x44, 0x46, 0xf3, 0x6d, 0x68, 0x3b, 0x53, 0x61, 0x6d, 0x68, 0x3b, 0x4e, 0x6f, 0x6c, 0x6c,</div><div class='add'>+0x3b, 0x45, 0x61, 0x6e, 0xe1, 0x69, 0x72, 0x3b, 0x46, 0x65, 0x61, 0x62, 0x68, 0x72, 0x61, 0x3b, 0x4d, 0xe1, 0x72, 0x74,</div><div class='add'>+0x61, 0x3b, 0x41, 0x69, 0x62, 0x72, 0x65, 0xe1, 0x6e, 0x3b, 0x42, 0x65, 0x61, 0x6c, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x3b,</div><div class='add'>+0x4d, 0x65, 0x69, 0x74, 0x68, 0x65, 0x61, 0x6d, 0x68, 0x3b, 0x49, 0xfa, 0x69, 0x6c, 0x3b, 0x4c, 0xfa, 0x6e, 0x61, 0x73,</div><div class='add'>+0x61, 0x3b, 0x4d, 0x65, 0xe1, 0x6e, 0x20, 0x46, 0xf3, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x44, 0x65, 0x69, 0x72, 0x65,</div><div class='add'>+0x61, 0x64, 0x68, 0x20, 0x46, 0xf3, 0x6d, 0x68, 0x61, 0x69, 0x72, 0x3b, 0x53, 0x61, 0x6d, 0x68, 0x61, 0x69, 0x6e, 0x3b,</div><div class='add'>+0x4e, 0x6f, 0x6c, 0x6c, 0x61, 0x69, 0x67, 0x3b, 0x45, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x42, 0x3b, 0x4d, 0x3b,</div><div class='add'>+0x49, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x67, 0x65, 0x6e, 0x3b, 0x66, 0x65, 0x62, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x67, 0x3b, 0x67, 0x69, 0x75, 0x3b, 0x6c, 0x75, 0x67, 0x3b,</div><div class='add'>+0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x3b, 0x6f, 0x74, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x69, 0x63, 0x3b,</div><div class='add'>+0x47, 0x65, 0x6e, 0x6e, 0x61, 0x69, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x62, 0x72, 0x61, 0x69, 0x6f, 0x3b, 0x4d, 0x61, 0x72,</div><div class='add'>+0x7a, 0x6f, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x65, 0x3b, 0x4d, 0x61, 0x67, 0x67, 0x69, 0x6f, 0x3b, 0x47, 0x69, 0x75,</div><div class='add'>+0x67, 0x6e, 0x6f, 0x3b, 0x4c, 0x75, 0x67, 0x6c, 0x69, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65,</div><div class='add'>+0x74, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x4f, 0x74, 0x74, 0x6f, 0x62, 0x72, 0x65, 0x3b, 0x4e, 0x6f, 0x76, 0x65,</div><div class='add'>+0x6d, 0x62, 0x72, 0x65, 0x3b, 0x44, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x47, 0x3b, 0x46, 0x3b, 0x4d, 0x3b,</div><div class='add'>+0x41, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0xc9c, 0xca8,</div><div class='add'>+0xcb5, 0xcb0, 0xcc0, 0x3b, 0xcab, 0xcc6, 0xcac, 0xccd, 0xcb0, 0xcb5, 0xcb0, 0xcc0, 0x3b, 0xcae, 0xcbe, 0xcb0, 0xccd, 0xc9a, 0xccd, 0x3b,</div><div class='add'>+0xc8e, 0xcaa, 0xccd, 0xcb0, 0xcbf, 0xcb2, 0xccd, 0x3b, 0xcae, 0xcc6, 0x3b, 0xc9c, 0xcc2, 0xca8, 0xccd, 0x3b, 0xc9c, 0xcc1, 0xcb2, 0xcc8,</div><div class='add'>+0x3b, 0xc86, 0xc97, 0xcb8, 0xccd, 0xc9f, 0xccd, 0x3b, 0xcb8, 0xcaa, 0xccd, 0xc9f, 0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xc85, 0xc95,</div><div class='add'>+0xccd, 0xc9f, 0xccb, 0xcac, 0xcb0, 0xccd, 0x3b, 0xca8, 0xcb5, 0xcc6, 0xc82, 0xcac, 0xcb0, 0xccd, 0x3b, 0xca1, 0xcbf, 0xcb8, 0xcc6, 0xc82,</div><div class='add'>+0xcac, 0xcb0, 0xccd, 0x3b, 0xc9c, 0x3b, 0xcab, 0xcc6, 0x3b, 0xcae, 0xcbe, 0x3b, 0xc8e, 0x3b, 0xcae, 0xcc7, 0x3b, 0xc9c, 0xcc2, 0x3b,</div><div class='add'>+0xc9c, 0xcc1, 0x3b, 0xc86, 0x3b, 0xcb8, 0xcc6, 0x3b, 0xc85, 0x3b, 0xca8, 0x3b, 0xca1, 0xcbf, 0x3b, 0x49b, 0x430, 0x4a3, 0x2e, 0x3b,</div><div class='add'>+0x430, 0x49b, 0x43f, 0x2e, 0x3b, 0x43d, 0x430, 0x443, 0x2e, 0x3b, 0x441, 0x4d9, 0x443, 0x2e, 0x3b, 0x43c, 0x430, 0x43c, 0x2e, 0x3b,</div><div class='add'>+0x43c, 0x430, 0x443, 0x2e, 0x3b, 0x448, 0x456, 0x43b, 0x2e, 0x3b, 0x442, 0x430, 0x43c, 0x2e, 0x3b, 0x49b, 0x44b, 0x440, 0x2e, 0x3b,</div><div class='add'>+0x49b, 0x430, 0x437, 0x2e, 0x3b, 0x49b, 0x430, 0x440, 0x2e, 0x3b, 0x436, 0x435, 0x43b, 0x442, 0x2e, 0x3b, 0x49b, 0x430, 0x4a3, 0x442,</div><div class='add'>+0x430, 0x440, 0x3b, 0x430, 0x49b, 0x43f, 0x430, 0x43d, 0x3b, 0x43d, 0x430, 0x443, 0x440, 0x44b, 0x437, 0x3b, 0x441, 0x4d9, 0x443, 0x456,</div><div class='add'>+0x440, 0x3b, 0x43c, 0x430, 0x43c, 0x44b, 0x440, 0x3b, 0x43c, 0x430, 0x443, 0x441, 0x44b, 0x43c, 0x3b, 0x448, 0x456, 0x43b, 0x434, 0x435,</div><div class='add'>+0x3b, 0x442, 0x430, 0x43c, 0x44b, 0x437, 0x3b, 0x49b, 0x44b, 0x440, 0x43a, 0x4af, 0x439, 0x435, 0x43a, 0x3b, 0x49b, 0x430, 0x437, 0x430,</div><div class='add'>+0x43d, 0x3b, 0x49b, 0x430, 0x440, 0x430, 0x448, 0x430, 0x3b, 0x436, 0x435, 0x43b, 0x442, 0x43e, 0x49b, 0x441, 0x430, 0x43d, 0x3b, 0x6d,</div><div class='add'>+0x75, 0x74, 0x2e, 0x3b, 0x67, 0x61, 0x73, 0x2e, 0x3b, 0x77, 0x65, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x74, 0x2e, 0x3b, 0x67,</div><div class='add'>+0x69, 0x63, 0x2e, 0x3b, 0x6b, 0x61, 0x6d, 0x2e, 0x3b, 0x6e, 0x79, 0x61, 0x2e, 0x3b, 0x6b, 0x61, 0x6e, 0x2e, 0x3b, 0x6e,</div><div class='add'>+0x7a, 0x65, 0x2e, 0x3b, 0x75, 0x6b, 0x77, 0x2e, 0x3b, 0x75, 0x67, 0x75, 0x2e, 0x3b, 0x75, 0x6b, 0x75, 0x2e, 0x3b, 0x4d,</div><div class='add'>+0x75, 0x74, 0x61, 0x72, 0x61, 0x6d, 0x61, 0x3b, 0x47, 0x61, 0x73, 0x68, 0x79, 0x61, 0x6e, 0x74, 0x61, 0x72, 0x65, 0x3b,</div><div class='add'>+0x57, 0x65, 0x72, 0x75, 0x72, 0x77, 0x65, 0x3b, 0x4d, 0x61, 0x74, 0x61, 0x3b, 0x47, 0x69, 0x63, 0x75, 0x72, 0x61, 0x6e,</div><div class='add'>+0x73, 0x69, 0x3b, 0x4b, 0x61, 0x6d, 0x65, 0x6e, 0x61, 0x3b, 0x4e, 0x79, 0x61, 0x6b, 0x61, 0x6e, 0x67, 0x61, 0x3b, 0x4b,</div><div class='add'>+0x61, 0x6e, 0x61, 0x6d, 0x61, 0x3b, 0x4e, 0x7a, 0x65, 0x6c, 0x69, 0x3b, 0x55, 0x6b, 0x77, 0x61, 0x6b, 0x69, 0x72, 0x61,</div><div class='add'>+0x3b, 0x55, 0x67, 0x75, 0x73, 0x68, 0x79, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x55, 0x6b, 0x75, 0x62, 0x6f, 0x7a, 0x61, 0x3b,</div><div class='add'>+0x31, 0xc6d4, 0x3b, 0x32, 0xc6d4, 0x3b, 0x33, 0xc6d4, 0x3b, 0x34, 0xc6d4, 0x3b, 0x35, 0xc6d4, 0x3b, 0x36, 0xc6d4, 0x3b, 0x37, 0xc6d4,</div><div class='add'>+0x3b, 0x38, 0xc6d4, 0x3b, 0x39, 0xc6d4, 0x3b, 0x31, 0x30, 0xc6d4, 0x3b, 0x31, 0x31, 0xc6d4, 0x3b, 0x31, 0x32, 0xc6d4, 0x3b, 0xe7,</div><div class='add'>+0x69, 0x6c, 0x3b, 0x73, 0x69, 0x62, 0x3b, 0x61, 0x64, 0x72, 0x3b, 0x6e, 0xee, 0x73, 0x3b, 0x67, 0x75, 0x6c, 0x3b, 0x68,</div><div class='add'>+0x65, 0x7a, 0x3b, 0x74, 0xee, 0x72, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b,</div><div class='add'>+0xe7, 0x69, 0x6c, 0x65, 0x3b, 0x73, 0x69, 0x62, 0x61, 0x74, 0x3b, 0x61, 0x64, 0x61, 0x72, 0x3b, 0x6e, 0xee, 0x73, 0x61,</div><div class='add'>+0x6e, 0x3b, 0x67, 0x75, 0x6c, 0x61, 0x6e, 0x3b, 0x68, 0x65, 0x7a, 0xee, 0x72, 0x61, 0x6e, 0x3b, 0x37, 0x3b, 0x38, 0x3b,</div><div class='add'>+0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0xe7, 0x3b, 0x73, 0x3b, 0x61, 0x3b, 0x6e, 0x3b, 0x67,</div><div class='add'>+0x3b, 0x68, 0x3b, 0x37, 0x3b, 0x38, 0x3b, 0x39, 0x3b, 0x31, 0x30, 0x3b, 0x31, 0x31, 0x3b, 0x31, 0x32, 0x3b, 0xea1, 0x2e,</div><div class='add'>+0xe81, 0x2e, 0x3b, 0xe81, 0x2e, 0xe9e, 0x2e, 0x3b, 0xea1, 0xeb5, 0x2e, 0xe99, 0x2e, 0x3b, 0xea1, 0x2e, 0xeaa, 0x2e, 0x2e, 0x3b,</div><div class='add'>+0xe9e, 0x2e, 0xe9e, 0x2e, 0x3b, 0xea1, 0xeb4, 0x2e, 0xe96, 0x2e, 0x3b, 0xe81, 0x2e, 0xea5, 0x2e, 0x3b, 0xeaa, 0x2e, 0xeab, 0x2e,</div><div class='add'>+0x3b, 0xe81, 0x2e, 0xe8d, 0x2e, 0x3b, 0xe95, 0x2e, 0xea5, 0x2e, 0x3b, 0xe9e, 0x2e, 0xe88, 0x2e, 0x3b, 0xe97, 0x2e, 0xea7, 0x2e,</div><div class='add'>+0x3b, 0xea1, 0xeb1, 0xe87, 0xe81, 0xead, 0xe99, 0x3b, 0xe81, 0xeb8, 0xea1, 0xe9e, 0xeb2, 0x3b, 0xea1, 0xeb5, 0xe99, 0xeb2, 0x3b, 0xec0,</div><div class='add'>+0xea1, 0xeaa, 0xeb2, 0x3b, 0xe9e, 0xeb6, 0xe94, 0xeaa, 0xeb0, 0xe9e, 0xeb2, 0x3b, 0xea1, 0xeb4, 0xe96, 0xeb8, 0xe99, 0xeb2, 0x3b, 0xe81,</div><div class='add'>+0xecd, 0xea5, 0xeb0, 0xe81, 0xebb, 0xe94, 0x3b, 0xeaa, 0xeb4, 0xe87, 0xeab, 0xeb2, 0x3b, 0xe81, 0xeb1, 0xe99, 0xe8d, 0xeb2, 0x3b, 0xe95,</div><div class='add'>+0xeb8, 0xea5, 0xeb2, 0x3b, 0xe9e, 0xeb0, 0xe88, 0xeb4, 0xe81, 0x3b, 0xe97, 0xeb1, 0xe99, 0xea7, 0xeb2, 0x3b, 0x6a, 0x61, 0x6e, 0x76,</div><div class='add'>+0x2e, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d,</div><div class='add'>+0x61, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6e, 0x2e, 0x3b, 0x6a, 0x16b, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b,</div><div class='add'>+0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e,</div><div class='add'>+0x3b, 0x6a, 0x61, 0x6e, 0x76, 0x101, 0x72, 0x69, 0x73, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x101, 0x72, 0x69, 0x73, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x12b, 0x6c, 0x69, 0x73, 0x3b, 0x6d, 0x61, 0x69, 0x6a, 0x73, 0x3b,</div><div class='add'>+0x6a, 0x16b, 0x6e, 0x69, 0x6a, 0x73, 0x3b, 0x6a, 0x16b, 0x6c, 0x69, 0x6a, 0x73, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74,</div><div class='add'>+0x73, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x72, 0x69,</div><div class='add'>+0x73, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x73, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x69,</div><div class='add'>+0x73, 0x3b, 0x73, 0x31, 0x3b, 0x73, 0x32, 0x3b, 0x73, 0x33, 0x3b, 0x73, 0x34, 0x3b, 0x73, 0x35, 0x3b, 0x73, 0x36, 0x3b,</div><div class='add'>+0x73, 0x37, 0x3b, 0x73, 0x38, 0x3b, 0x73, 0x39, 0x3b, 0x73, 0x31, 0x30, 0x3b, 0x73, 0x31, 0x31, 0x3b, 0x73, 0x31, 0x32,</div><div class='add'>+0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x79, 0x61, 0x6d, 0x62, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a,</div><div class='add'>+0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x62, 0x61, 0x6c, 0xe9, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61,</div><div class='add'>+0x20, 0x6d, 0xed, 0x73, 0xe1, 0x74, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x6e,</div><div class='add'>+0x65, 0x69, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x74, 0xe1, 0x6e, 0x6f, 0x3b, 0x73,</div><div class='add'>+0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6d, 0x6f, 0x74, 0xf3, 0x62, 0xe1, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1,</div><div class='add'>+0x20, 0x79, 0x61, 0x20, 0x6e, 0x73, 0x61, 0x6d, 0x62, 0x6f, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20,</div><div class='add'>+0x6d, 0x77, 0x61, 0x6d, 0x62, 0x65, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x6c, 0x69, 0x62, 0x77,</div><div class='add'>+0x61, 0x3b, 0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x3b, 0x73, 0xe1, 0x6e, 0x7a,</div><div class='add'>+0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x254, 0x30c, 0x6b, 0x254, 0x301, 0x3b,</div><div class='add'>+0x73, 0xe1, 0x6e, 0x7a, 0xe1, 0x20, 0x79, 0x61, 0x20, 0x7a, 0xf3, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0xed, 0x62,</div><div class='add'>+0x61, 0x6c, 0xe9, 0x3b, 0x53, 0x61, 0x75, 0x73, 0x2e, 0x3b, 0x56, 0x61, 0x73, 0x2e, 0x3b, 0x6b, 0x6f, 0x76, 0x3b, 0x42,</div><div class='add'>+0x61, 0x6c, 0x2e, 0x3b, 0x47, 0x65, 0x67, 0x2e, 0x3b, 0x42, 0x69, 0x72, 0x2e, 0x3b, 0x4c, 0x69, 0x65, 0x70, 0x2e, 0x3b,</div><div class='add'>+0x52, 0x75, 0x67, 0x70, 0x6a, 0x2e, 0x3b, 0x52, 0x75, 0x67, 0x73, 0x2e, 0x3b, 0x53, 0x70, 0x61, 0x6c, 0x2e, 0x3b, 0x4c,</div><div class='add'>+0x61, 0x70, 0x6b, 0x72, 0x2e, 0x3b, 0x47, 0x72, 0x75, 0x6f, 0x64, 0x2e, 0x3b, 0x53, 0x61, 0x75, 0x73, 0x69, 0x73, 0x3b,</div><div class='add'>+0x56, 0x61, 0x73, 0x61, 0x72, 0x69, 0x73, 0x3b, 0x4b, 0x6f, 0x76, 0x61, 0x73, 0x3b, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x64,</div><div class='add'>+0x69, 0x73, 0x3b, 0x47, 0x65, 0x67, 0x75, 0x17e, 0x117, 0x3b, 0x42, 0x69, 0x72, 0x17e, 0x65, 0x6c, 0x69, 0x73, 0x3b, 0x4c,</div><div class='add'>+0x69, 0x65, 0x70, 0x61, 0x3b, 0x52, 0x75, 0x67, 0x70, 0x6a, 0x16b, 0x74, 0x69, 0x73, 0x3b, 0x52, 0x75, 0x67, 0x73, 0x117,</div><div class='add'>+0x6a, 0x69, 0x73, 0x3b, 0x53, 0x70, 0x61, 0x6c, 0x69, 0x73, 0x3b, 0x4c, 0x61, 0x70, 0x6b, 0x72, 0x69, 0x74, 0x69, 0x73,</div><div class='add'>+0x3b, 0x47, 0x72, 0x75, 0x6f, 0x64, 0x69, 0x73, 0x3b, 0x53, 0x3b, 0x56, 0x3b, 0x4b, 0x3b, 0x42, 0x3b, 0x47, 0x3b, 0x42,</div><div class='add'>+0x3b, 0x4c, 0x3b, 0x52, 0x3b, 0x52, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x47, 0x3b, 0x458, 0x430, 0x43d, 0x2e, 0x3b, 0x444, 0x435,</div><div class='add'>+0x432, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x2e, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d,</div><div class='add'>+0x2e, 0x3b, 0x458, 0x443, 0x43b, 0x2e, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x2e, 0x3b, 0x43e, 0x43a,</div><div class='add'>+0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x43c, 0x2e, 0x3b, 0x458, 0x430, 0x43d, 0x443,</div><div class='add'>+0x430, 0x440, 0x438, 0x3b, 0x444, 0x435, 0x432, 0x440, 0x443, 0x430, 0x440, 0x438, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f,</div><div class='add'>+0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458, 0x443, 0x43d, 0x438, 0x3b, 0x458, 0x443, 0x43b, 0x438, 0x3b, 0x430, 0x432,</div><div class='add'>+0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x43c,</div><div class='add'>+0x432, 0x440, 0x438, 0x3b, 0x43d, 0x43e, 0x435, 0x43c, 0x432, 0x440, 0x438, 0x3b, 0x434, 0x435, 0x43a, 0x435, 0x43c, 0x432, 0x440, 0x438,</div><div class='add'>+0x3b, 0x458, 0x3b, 0x444, 0x3b, 0x43c, 0x3b, 0x430, 0x3b, 0x43c, 0x3b, 0x458, 0x3b, 0x458, 0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x43e,</div><div class='add'>+0x3b, 0x43d, 0x3b, 0x434, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72,</div><div class='add'>+0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x6f, 0x6e, 0x3b, 0x4a, 0x6f, 0x6c, 0x3b, 0x41, 0x6f, 0x67, 0x3b, 0x53, 0x65, 0x70,</div><div class='add'>+0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x6f, 0x61, 0x72, 0x79,</div><div class='add'>+0x3b, 0x46, 0x65, 0x62, 0x72, 0x6f, 0x61, 0x72, 0x79, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x73, 0x61, 0x3b, 0x41, 0x70, 0x72,</div><div class='add'>+0x69, 0x6c, 0x79, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x6f, 0x6e, 0x61, 0x3b, 0x4a, 0x6f, 0x6c, 0x61, 0x79, 0x3b, 0x41,</div><div class='add'>+0x6f, 0x67, 0x6f, 0x73, 0x69, 0x74, 0x72, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x61, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x4f,</div><div class='add'>+0x6b, 0x74, 0x6f, 0x62, 0x72, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x61, 0x6d, 0x62, 0x72, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x61,</div><div class='add'>+0x6d, 0x62, 0x72, 0x61, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72,</div><div class='add'>+0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x6f, 0x73, 0x3b, 0x53, 0x65,</div><div class='add'>+0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72,</div><div class='add'>+0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c,</div><div class='add'>+0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x4f, 0x67, 0x6f, 0x73, 0x3b,</div><div class='add'>+0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f,</div><div class='add'>+0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0xd1c, 0xd28, 0xd41, 0x3b,</div><div class='add'>+0xd2b, 0xd46, 0xd2c, 0xd4d, 0xd30, 0xd41, 0x3b, 0xd2e, 0xd3e, 0xd30, 0xd4d, 0x200d, 0x3b, 0xd0f, 0xd2a, 0xd4d, 0xd30, 0xd3f, 0x3b, 0xd2e,</div><div class='add'>+0xd47, 0xd2f, 0xd4d, 0x3b, 0xd1c, 0xd42, 0xd23, 0xd4d, 0x200d, 0x3b, 0xd1c, 0xd42, 0xd32, 0xd48, 0x3b, 0xd13, 0xd17, 0x3b, 0xd38, 0xd46,</div><div class='add'>+0xd2a, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd02, 0x3b, 0xd12, 0xd15, 0xd4d, 0xd1f, 0xd4b, 0x3b, 0xd28, 0xd35, 0xd02, 0x3b, 0xd21, 0xd3f, 0xd38,</div><div class='add'>+0xd02, 0x3b, 0xd1c, 0xd28, 0xd41, 0xd35, 0xd30, 0xd3f, 0x3b, 0xd2b, 0xd46, 0xd2c, 0xd4d, 0xd30, 0xd41, 0xd35, 0xd30, 0xd3f, 0x3b, 0xd2e,</div><div class='add'>+0xd3e, 0xd30, 0xd4d, 0x200d, 0xd1a, 0xd4d, 0xd1a, 0xd4d, 0x3b, 0xd0f, 0xd2a, 0xd4d, 0xd30, 0xd3f, 0xd32, 0xd4d, 0x200d, 0x3b, 0xd2e, 0xd47,</div><div class='add'>+0xd2f, 0xd4d, 0x3b, 0xd1c, 0xd42, 0xd23, 0xd4d, 0x200d, 0x3b, 0xd1c, 0xd42, 0xd32, 0xd48, 0x3b, 0xd06, 0xd17, 0xd38, 0xd4d, 0xd31, 0xd4d,</div><div class='add'>+0xd31, 0xd4d, 0x3b, 0xd38, 0xd46, 0xd2a, 0xd4d, 0xd31, 0xd4d, 0xd31, 0xd02, 0xd2c, 0xd30, 0xd4d, 0x200d, 0x3b, 0xd12, 0xd15, 0xd4d, 0xd1f,</div><div class='add'>+0xd4b, 0xd2c, 0xd30, 0xd4d, 0x200d, 0x3b, 0xd28, 0xd35, 0xd02, 0xd2c, 0xd30, 0xd4d, 0x200d, 0x3b, 0xd21, 0xd3f, 0xd38, 0xd02, 0xd2c, 0xd30,</div><div class='add'>+0xd4d, 0x200d, 0x3b, 0xd1c, 0x3b, 0xd2b, 0xd46, 0x3b, 0xd2e, 0xd3e, 0x3b, 0xd0f, 0x3b, 0xd2e, 0xd47, 0x3b, 0xd1c, 0xd42, 0x3b, 0xd1c,</div><div class='add'>+0xd42, 0x3b, 0xd13, 0x3b, 0xd38, 0xd46, 0x3b, 0xd12, 0x3b, 0xd28, 0x3b, 0xd21, 0xd3f, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x72,</div><div class='add'>+0x61, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x6a, 0x3b, 0x120, 0x75, 0x6e, 0x3b, 0x4c, 0x75,</div><div class='add'>+0x6c, 0x3b, 0x41, 0x77, 0x77, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69,</div><div class='add'>+0x10b, 0x3b, 0x4a, 0x61, 0x6e, 0x6e, 0x61, 0x72, 0x3b, 0x46, 0x72, 0x61, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0x7a, 0x75, 0x3b,</div><div class='add'>+0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x6a, 0x6a, 0x75, 0x3b, 0x120, 0x75, 0x6e, 0x6a, 0x75, 0x3b, 0x4c, 0x75,</div><div class='add'>+0x6c, 0x6a, 0x75, 0x3b, 0x41, 0x77, 0x77, 0x69, 0x73, 0x73, 0x75, 0x3b, 0x53, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x72,</div><div class='add'>+0x75, 0x3b, 0x4f, 0x74, 0x74, 0x75, 0x62, 0x72, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b, 0x44,</div><div class='add'>+0x69, 0x10b, 0x65, 0x6d, 0x62, 0x72, 0x75, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x120, 0x3b,</div><div class='add'>+0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x48, 0x101, 0x6e, 0x75, 0x65, 0x72, 0x65, 0x3b,</div><div class='add'>+0x50, 0x113, 0x70, 0x75, 0x65, 0x72, 0x65, 0x3b, 0x4d, 0x101, 0x65, 0x68, 0x65, 0x3b, 0x100, 0x70, 0x65, 0x72, 0x69, 0x72,</div><div class='add'>+0x61, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x48, 0x75, 0x6e, 0x65, 0x3b, 0x48, 0x16b, 0x72, 0x61, 0x65, 0x3b, 0x100, 0x6b, 0x75,</div><div class='add'>+0x68, 0x61, 0x74, 0x61, 0x3b, 0x48, 0x65, 0x70, 0x65, 0x74, 0x65, 0x6d, 0x61, 0x3b, 0x4f, 0x6b, 0x65, 0x74, 0x6f, 0x70,</div><div class='add'>+0x61, 0x3b, 0x4e, 0x6f, 0x65, 0x6d, 0x61, 0x3b, 0x54, 0x12b, 0x68, 0x65, 0x6d, 0x61, 0x3b, 0x91c, 0x93e, 0x928, 0x947, 0x935,</div><div class='add'>+0x93e, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a,</div><div class='add'>+0x3b, 0x90f, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x948, 0x3b,</div><div class='add'>+0x911, 0x917, 0x938, 0x94d, 0x91f, 0x3b, 0x938, 0x92a, 0x94d, 0x91f, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x911, 0x915, 0x94d, 0x91f, 0x94b,</div><div class='add'>+0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x935, 0x94d, 0x939, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x921, 0x93f, 0x938, 0x947, 0x902, 0x92c, 0x930,</div><div class='add'>+0x3b, 0x91c, 0x93e, 0x3b, 0x92b, 0x947, 0x3b, 0x92e, 0x93e, 0x3b, 0x90f, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942, 0x3b, 0x91c, 0x941,</div><div class='add'>+0x3b, 0x911, 0x3b, 0x938, 0x3b, 0x911, 0x3b, 0x928, 0x94b, 0x3b, 0x921, 0x93f, 0x3b, 0x445, 0x443, 0x43b, 0x3b, 0x4af, 0x445, 0x44d,</div><div class='add'>+0x3b, 0x431, 0x430, 0x440, 0x3b, 0x442, 0x443, 0x443, 0x3b, 0x43b, 0x443, 0x443, 0x3b, 0x43c, 0x43e, 0x433, 0x3b, 0x43c, 0x43e, 0x440,</div><div class='add'>+0x3b, 0x445, 0x43e, 0x43d, 0x3b, 0x431, 0x438, 0x447, 0x3b, 0x442, 0x430, 0x445, 0x3b, 0x43d, 0x43e, 0x445, 0x3b, 0x433, 0x430, 0x445,</div><div class='add'>+0x3b, 0x425, 0x443, 0x43b, 0x433, 0x430, 0x43d, 0x430, 0x3b, 0x4ae, 0x445, 0x44d, 0x440, 0x3b, 0x411, 0x430, 0x440, 0x3b, 0x422, 0x443,</div><div class='add'>+0x443, 0x43b, 0x430, 0x439, 0x3b, 0x41b, 0x443, 0x443, 0x3b, 0x41c, 0x43e, 0x433, 0x43e, 0x439, 0x3b, 0x41c, 0x43e, 0x440, 0x44c, 0x3b,</div><div class='add'>+0x425, 0x43e, 0x43d, 0x44c, 0x3b, 0x411, 0x438, 0x447, 0x3b, 0x422, 0x430, 0x445, 0x438, 0x430, 0x3b, 0x41d, 0x43e, 0x445, 0x43e, 0x439,</div><div class='add'>+0x3b, 0x413, 0x430, 0x445, 0x430, 0x439, 0x3b, 0x91c, 0x928, 0x3b, 0x92b, 0x947, 0x92c, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b,</div><div class='add'>+0x905, 0x92a, 0x94d, 0x930, 0x93f, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x3b, 0x905, 0x917,</div><div class='add'>+0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x3b, 0x921, 0x93f,</div><div class='add'>+0x938, 0x947, 0x3b, 0x91c, 0x928, 0x935, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x905, 0x930, 0x940, 0x3b, 0x92e,</div><div class='add'>+0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c,</div><div class='add'>+0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917, 0x938, 0x94d, 0x924, 0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x947, 0x92e, 0x94d, 0x92c,</div><div class='add'>+0x930, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x92d, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x921,</div><div class='add'>+0x93f, 0x938, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x967, 0x3b, 0x968, 0x3b, 0x969, 0x3b, 0x96a, 0x3b, 0x96b, 0x3b, 0x96c, 0x3b,</div><div class='add'>+0x96d, 0x3b, 0x96e, 0x3b, 0x96f, 0x3b, 0x967, 0x966, 0x3b, 0x967, 0x967, 0x3b, 0x967, 0x968, 0x3b, 0x91c, 0x928, 0x935, 0x930, 0x940,</div><div class='add'>+0x3b, 0x92b, 0x930, 0x935, 0x930, 0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x905, 0x92a, 0x94d, 0x930, 0x947, 0x932, 0x3b,</div><div class='add'>+0x92e, 0x908, 0x3b, 0x91c, 0x941, 0x928, 0x3b, 0x91c, 0x941, 0x932, 0x93e, 0x908, 0x3b, 0x905, 0x917, 0x938, 0x94d, 0x924, 0x3b, 0x938,</div><div class='add'>+0x947, 0x92a, 0x94d, 0x91f, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x905, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b,</div><div class='add'>+0x92d, 0x947, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x926, 0x93f, 0x938, 0x92e, 0x94d, 0x92c, 0x930, 0x3b, 0x6a, 0x61, 0x6e, 0x2e, 0x3b,</div><div class='add'>+0x66, 0x65, 0x62, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a,</div><div class='add'>+0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x2e, 0x3b, 0x6f,</div><div class='add'>+0x6b, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x73, 0x2e, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72,</div><div class='add'>+0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74,</div><div class='add'>+0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e,</div><div class='add'>+0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x67, 0x65, 0x6e,</div><div class='add'>+0x69, 0xe8, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x69, 0xe8, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x61, 0x62, 0x72,</div><div class='add'>+0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x68, 0x3b, 0x6a, 0x75, 0x6c, 0x68, 0x65, 0x74, 0x3b, 0x61,</div><div class='add'>+0x67, 0x6f, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x6f, 0x63, 0x74, 0xf2, 0x62, 0x72,</div><div class='add'>+0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64, 0x65, 0x7a, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b,</div><div class='add'>+0xb1c, 0xb3e, 0xb28, 0xb41, 0xb06, 0xb30, 0xb40, 0x3b, 0xb2b, 0xb47, 0xb2c, 0xb4d, 0xb30, 0xb41, 0xb5f, 0xb3e, 0xb30, 0xb40, 0x3b, 0xb2e,</div><div class='add'>+0xb3e, 0xb30, 0xb4d, 0xb1a, 0xb4d, 0xb1a, 0x3b, 0xb05, 0xb2a, 0xb4d, 0xb30, 0xb47, 0xb32, 0x3b, 0xb2e, 0xb47, 0x3b, 0xb1c, 0xb41, 0xb28,</div><div class='add'>+0x3b, 0xb1c, 0xb41, 0xb32, 0xb3e, 0xb07, 0x3b, 0xb05, 0xb17, 0xb37, 0xb4d, 0xb1f, 0x3b, 0xb38, 0xb47, 0xb2a, 0xb4d, 0xb1f, 0xb47, 0xb2e,</div><div class='add'>+0xb4d, 0xb2c, 0xb30, 0x3b, 0xb05, 0xb15, 0xb4d, 0xb1f, 0xb4b, 0xb2c, 0xb30, 0x3b, 0xb28, 0xb2d, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b,</div><div class='add'>+0xb21, 0xb3f, 0xb38, 0xb47, 0xb2e, 0xb4d, 0xb2c, 0xb30, 0x3b, 0xb1c, 0xb3e, 0x3b, 0xb2b, 0xb47, 0x3b, 0xb2e, 0xb3e, 0x3b, 0xb05, 0x3b,</div><div class='add'>+0xb2e, 0xb47, 0x3b, 0xb1c, 0xb41, 0x3b, 0xb1c, 0xb41, 0x3b, 0xb05, 0x3b, 0xb38, 0xb47, 0x3b, 0xb05, 0x3b, 0xb28, 0x3b, 0xb21, 0xb3f,</div><div class='add'>+0x3b, 0x62c, 0x646, 0x648, 0x631, 0x64a, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631, 0x64a, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627,</div><div class='add'>+0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6ab,</div><div class='add'>+0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645,</div><div class='add'>+0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x698, 0x627, 0x646, 0x648, 0x6cc, 0x647, 0x654, 0x3b, 0x641, 0x648, 0x631,</div><div class='add'>+0x6cc, 0x647, 0x654, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x648, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648,</div><div class='add'>+0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x648, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x627, 0x645, 0x628, 0x631, 0x3b,</div><div class='add'>+0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x627, 0x645, 0x628, 0x631, 0x3b,</div><div class='add'>+0x698, 0x627, 0x646, 0x648, 0x6cc, 0x647, 0x3b, 0x641, 0x648, 0x631, 0x6cc, 0x647, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x648,</div><div class='add'>+0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x647, 0x3b, 0x698, 0x648, 0x626, 0x646, 0x3b, 0x698, 0x648, 0x626, 0x6cc, 0x647, 0x3b, 0x627, 0x648,</div><div class='add'>+0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x627, 0x645,</div><div class='add'>+0x628, 0x631, 0x3b, 0x62f, 0x633, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x698, 0x3b, 0x641, 0x3b, 0x645, 0x3b, 0x622, 0x3b, 0x645, 0x6cc,</div><div class='add'>+0x3b, 0x698, 0x3b, 0x698, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x646, 0x3b, 0x62f, 0x3b, 0x62c, 0x646, 0x648, 0x3b, 0x641,</div><div class='add'>+0x648, 0x631, 0x6cc, 0x647, 0x654, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x648, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x640, 0x6cc,</div><div class='add'>+0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x3b, 0x627, 0x648, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x627, 0x645, 0x628, 0x631,</div><div class='add'>+0x3b, 0x627, 0x6a9, 0x62a, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x627, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x3b, 0x62c, 0x3b,</div><div class='add'>+0x641, 0x3b, 0x645, 0x3b, 0x627, 0x3b, 0x645, 0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x627, 0x3b, 0x633, 0x3b, 0x627, 0x3b, 0x646, 0x3b,</div><div class='add'>+0x62f, 0x3b, 0x73, 0x74, 0x79, 0x3b, 0x6c, 0x75, 0x74, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6b, 0x77, 0x69, 0x3b, 0x6d, 0x61,</div><div class='add'>+0x6a, 0x3b, 0x63, 0x7a, 0x65, 0x3b, 0x6c, 0x69, 0x70, 0x3b, 0x73, 0x69, 0x65, 0x3b, 0x77, 0x72, 0x7a, 0x3b, 0x70, 0x61,</div><div class='add'>+0x17a, 0x3b, 0x6c, 0x69, 0x73, 0x3b, 0x67, 0x72, 0x75, 0x3b, 0x73, 0x74, 0x79, 0x63, 0x7a, 0x65, 0x144, 0x3b, 0x6c, 0x75,</div><div class='add'>+0x74, 0x79, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x65, 0x63, 0x3b, 0x6b, 0x77, 0x69, 0x65, 0x63, 0x69, 0x65, 0x144, 0x3b, 0x6d,</div><div class='add'>+0x61, 0x6a, 0x3b, 0x63, 0x7a, 0x65, 0x72, 0x77, 0x69, 0x65, 0x63, 0x3b, 0x6c, 0x69, 0x70, 0x69, 0x65, 0x63, 0x3b, 0x73,</div><div class='add'>+0x69, 0x65, 0x72, 0x70, 0x69, 0x65, 0x144, 0x3b, 0x77, 0x72, 0x7a, 0x65, 0x73, 0x69, 0x65, 0x144, 0x3b, 0x70, 0x61, 0x17a,</div><div class='add'>+0x64, 0x7a, 0x69, 0x65, 0x72, 0x6e, 0x69, 0x6b, 0x3b, 0x6c, 0x69, 0x73, 0x74, 0x6f, 0x70, 0x61, 0x64, 0x3b, 0x67, 0x72,</div><div class='add'>+0x75, 0x64, 0x7a, 0x69, 0x65, 0x144, 0x3b, 0x73, 0x3b, 0x6c, 0x3b, 0x6d, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x63, 0x3b, 0x6c,</div><div class='add'>+0x3b, 0x73, 0x3b, 0x77, 0x3b, 0x70, 0x3b, 0x6c, 0x3b, 0x67, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d,</div><div class='add'>+0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41,</div><div class='add'>+0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x75, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a,</div><div class='add'>+0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x76, 0x65, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72,</div><div class='add'>+0xe7, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x6f, 0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x6f, 0x3b,</div><div class='add'>+0x4a, 0x75, 0x6c, 0x68, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72,</div><div class='add'>+0x6f, 0x3b, 0x4f, 0x75, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x44,</div><div class='add'>+0x65, 0x7a, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76, 0x3b, 0x6d, 0x61, 0x72, 0x3b,</div><div class='add'>+0x61, 0x62, 0x72, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61, 0x67, 0x6f, 0x3b,</div><div class='add'>+0x73, 0x65, 0x74, 0x3b, 0x6f, 0x75, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x7a, 0x3b, 0x6a, 0x61, 0x6e, 0x65,</div><div class='add'>+0x69, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x76, 0x65, 0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0xe7, 0x6f, 0x3b,</div><div class='add'>+0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x6a, 0x75, 0x6c,</div><div class='add'>+0x68, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x6f,</div><div class='add'>+0x75, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x64, 0x65, 0x7a, 0x65,</div><div class='add'>+0x6d, 0x62, 0x72, 0x6f, 0x3b, 0xa1c, 0xa28, 0xa35, 0xa30, 0xa40, 0x3b, 0xa2b, 0xa3c, 0xa30, 0xa35, 0xa30, 0xa40, 0x3b, 0xa2e, 0xa3e,</div><div class='add'>+0xa30, 0xa1a, 0x3b, 0xa05, 0xa2a, 0xa4d, 0xa30, 0xa48, 0xa32, 0x3b, 0xa2e, 0xa08, 0x3b, 0xa1c, 0xa42, 0xa28, 0x3b, 0xa1c, 0xa41, 0xa32,</div><div class='add'>+0xa3e, 0xa08, 0x3b, 0xa05, 0xa17, 0xa38, 0xa24, 0x3b, 0xa38, 0xa24, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa05, 0xa15, 0xa24, 0xa42, 0xa2c, 0xa30,</div><div class='add'>+0x3b, 0xa28, 0xa35, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa26, 0xa38, 0xa70, 0xa2c, 0xa30, 0x3b, 0xa1c, 0x3b, 0xa2b, 0x3b, 0xa2e, 0xa3e, 0x3b,</div><div class='add'>+0xa05, 0x3b, 0xa2e, 0x3b, 0xa1c, 0xa42, 0x3b, 0xa1c, 0xa41, 0x3b, 0xa05, 0x3b, 0xa38, 0x3b, 0xa05, 0x3b, 0xa28, 0x3b, 0xa26, 0x3b,</div><div class='add'>+0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627, 0x67e, 0x631,</div><div class='add'>+0x6cc, 0x644, 0x3b, 0x645, 0x626, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x626, 0x6cc, 0x3b, 0x627, 0x6af, 0x633,</div><div class='add'>+0x62a, 0x3b, 0x633, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631,</div><div class='add'>+0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x73, 0x63, 0x68, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x61, 0x76, 0x72, 0x2e, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x74, 0x67, 0x3b, 0x7a, 0x65, 0x72, 0x63, 0x6c,</div><div class='add'>+0x2e, 0x3b, 0x66, 0x61, 0x6e, 0x2e, 0x3b, 0x61, 0x76, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x2e, 0x3b, 0x6f,</div><div class='add'>+0x63, 0x74, 0x2e, 0x3b, 0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x73, 0x63, 0x68, 0x61, 0x6e, 0x65,</div><div class='add'>+0x72, 0x3b, 0x66, 0x61, 0x76, 0x72, 0x65, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x76, 0x72, 0x69, 0x67, 0x6c,</div><div class='add'>+0x3b, 0x6d, 0x61, 0x74, 0x67, 0x3b, 0x7a, 0x65, 0x72, 0x63, 0x6c, 0x61, 0x64, 0x75, 0x72, 0x3b, 0x66, 0x61, 0x6e, 0x61,</div><div class='add'>+0x64, 0x75, 0x72, 0x3b, 0x61, 0x76, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b,</div><div class='add'>+0x6f, 0x63, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63,</div><div class='add'>+0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x53, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0x46, 0x3b,</div><div class='add'>+0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x69, 0x61, 0x6e, 0x2e, 0x3b, 0x66, 0x65, 0x62, 0x2e, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x61, 0x70, 0x72, 0x2e, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x69, 0x75, 0x6e, 0x2e, 0x3b, 0x69,</div><div class='add'>+0x75, 0x6c, 0x2e, 0x3b, 0x61, 0x75, 0x67, 0x2e, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x2e, 0x3b, 0x6f, 0x63, 0x74, 0x2e, 0x3b,</div><div class='add'>+0x6e, 0x6f, 0x76, 0x2e, 0x3b, 0x64, 0x65, 0x63, 0x2e, 0x3b, 0x69, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b, 0x66,</div><div class='add'>+0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x65, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x69, 0x65, 0x3b, 0x61, 0x70, 0x72, 0x69,</div><div class='add'>+0x6c, 0x69, 0x65, 0x3b, 0x6d, 0x61, 0x69, 0x3b, 0x69, 0x75, 0x6e, 0x69, 0x65, 0x3b, 0x69, 0x75, 0x6c, 0x69, 0x65, 0x3b,</div><div class='add'>+0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x6f, 0x63,</div><div class='add'>+0x74, 0x6f, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x6e, 0x6f, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x64, 0x65,</div><div class='add'>+0x63, 0x65, 0x6d, 0x62, 0x72, 0x69, 0x65, 0x3b, 0x49, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x49, 0x3b,</div><div class='add'>+0x49, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x44f, 0x43d, 0x432, 0x2e, 0x3b, 0x444, 0x435, 0x432,</div><div class='add'>+0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x2e, 0x3b, 0x43c, 0x430, 0x439, 0x3b, 0x438, 0x44e, 0x43d,</div><div class='add'>+0x44c, 0x3b, 0x438, 0x44e, 0x43b, 0x44c, 0x3b, 0x430, 0x432, 0x433, 0x2e, 0x3b, 0x441, 0x435, 0x43d, 0x442, 0x2e, 0x3b, 0x43e, 0x43a,</div><div class='add'>+0x442, 0x2e, 0x3b, 0x43d, 0x43e, 0x44f, 0x431, 0x2e, 0x3b, 0x434, 0x435, 0x43a, 0x2e, 0x3b, 0x42f, 0x43d, 0x432, 0x430, 0x440, 0x44c,</div><div class='add'>+0x3b, 0x424, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x44c, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x3b, 0x410, 0x43f, 0x440, 0x435, 0x43b, 0x44c,</div><div class='add'>+0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x44c, 0x3b, 0x418, 0x44e, 0x43b, 0x44c, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441,</div><div class='add'>+0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x41e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x41d,</div><div class='add'>+0x43e, 0x44f, 0x431, 0x440, 0x44c, 0x3b, 0x414, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x44c, 0x3b, 0x42f, 0x3b, 0x424, 0x3b, 0x41c, 0x3b,</div><div class='add'>+0x410, 0x3b, 0x41c, 0x3b, 0x418, 0x3b, 0x418, 0x3b, 0x410, 0x3b, 0x421, 0x3b, 0x41e, 0x3b, 0x41d, 0x3b, 0x414, 0x3b, 0x4e, 0x79,</div><div class='add'>+0x65, 0x3b, 0x46, 0x75, 0x6c, 0x3b, 0x4d, 0x62, 0xe4, 0x3b, 0x4e, 0x67, 0x75, 0x3b, 0x42, 0xea, 0x6c, 0x3b, 0x46, 0xf6,</div><div class='add'>+0x6e, 0x3b, 0x4c, 0x65, 0x6e, 0x3b, 0x4b, 0xfc, 0x6b, 0x3b, 0x4d, 0x76, 0x75, 0x3b, 0x4e, 0x67, 0x62, 0x3b, 0x4e, 0x61,</div><div class='add'>+0x62, 0x3b, 0x4b, 0x61, 0x6b, 0x3b, 0x4e, 0x79, 0x65, 0x6e, 0x79, 0x65, 0x3b, 0x46, 0x75, 0x6c, 0x75, 0x6e, 0x64, 0xef,</div><div class='add'>+0x67, 0x69, 0x3b, 0x4d, 0x62, 0xe4, 0x6e, 0x67, 0xfc, 0x3b, 0x4e, 0x67, 0x75, 0x62, 0xf9, 0x65, 0x3b, 0x42, 0xea, 0x6c,</div><div class='add'>+0xe4, 0x77, 0xfc, 0x3b, 0x46, 0xf6, 0x6e, 0x64, 0x6f, 0x3b, 0x4c, 0x65, 0x6e, 0x67, 0x75, 0x61, 0x3b, 0x4b, 0xfc, 0x6b,</div><div class='add'>+0xfc, 0x72, 0xfc, 0x3b, 0x4d, 0x76, 0x75, 0x6b, 0x61, 0x3b, 0x4e, 0x67, 0x62, 0x65, 0x72, 0x65, 0x72, 0x65, 0x3b, 0x4e,</div><div class='add'>+0x61, 0x62, 0xe4, 0x6e, 0x64, 0xfc, 0x72, 0x75, 0x3b, 0x4b, 0x61, 0x6b, 0x61, 0x75, 0x6b, 0x61, 0x3b, 0x4e, 0x3b, 0x46,</div><div class='add'>+0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x42, 0x3b, 0x46, 0x3b, 0x4c, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4b,</div><div class='add'>+0x3b, 0x458, 0x430, 0x43d, 0x3b, 0x444, 0x435, 0x431, 0x3b, 0x43c, 0x430, 0x440, 0x3b, 0x430, 0x43f, 0x440, 0x3b, 0x43c, 0x430, 0x458,</div><div class='add'>+0x3b, 0x458, 0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x3b, 0x441, 0x435, 0x43f, 0x3b, 0x43e, 0x43a, 0x442,</div><div class='add'>+0x3b, 0x43d, 0x43e, 0x432, 0x3b, 0x434, 0x435, 0x446, 0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x431, 0x440,</div><div class='add'>+0x443, 0x430, 0x440, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b, 0x458,</div><div class='add'>+0x443, 0x43d, 0x3b, 0x458, 0x443, 0x43b, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f, 0x442, 0x435, 0x43c,</div><div class='add'>+0x431, 0x430, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x431, 0x430, 0x440, 0x3b, 0x43d, 0x43e, 0x432, 0x435, 0x43c, 0x431, 0x430, 0x440,</div><div class='add'>+0x3b, 0x434, 0x435, 0x446, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x458, 0x430, 0x43d, 0x443, 0x430, 0x440, 0x3b, 0x444, 0x435, 0x431,</div><div class='add'>+0x440, 0x443, 0x430, 0x440, 0x3b, 0x43c, 0x430, 0x440, 0x442, 0x3b, 0x430, 0x43f, 0x440, 0x438, 0x43b, 0x3b, 0x43c, 0x430, 0x458, 0x3b,</div><div class='add'>+0x458, 0x443, 0x43d, 0x438, 0x3b, 0x458, 0x443, 0x43b, 0x438, 0x3b, 0x430, 0x432, 0x433, 0x443, 0x441, 0x442, 0x3b, 0x441, 0x435, 0x43f,</div><div class='add'>+0x442, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x43e, 0x43a, 0x442, 0x43e, 0x431, 0x430, 0x440, 0x3b, 0x43d, 0x43e, 0x432, 0x435, 0x43c,</div><div class='add'>+0x431, 0x430, 0x440, 0x3b, 0x434, 0x435, 0x446, 0x435, 0x43c, 0x431, 0x430, 0x440, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62,</div><div class='add'>+0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c,</div><div class='add'>+0x3b, 0x61, 0x76, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x63,</div><div class='add'>+0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x6d, 0x61, 0x72, 0x74,</div><div class='add'>+0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b, 0x61,</div><div class='add'>+0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f,</div><div class='add'>+0x62, 0x61, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x61,</div><div class='add'>+0x72, 0x3b, 0x6a, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x6a, 0x3b, 0x61, 0x3b, 0x73, 0x3b,</div><div class='add'>+0x6f, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x50, 0x68, 0x65, 0x3b, 0x4b, 0x6f, 0x6c, 0x3b, 0x55, 0x62, 0x65, 0x3b, 0x4d, 0x6d,</div><div class='add'>+0x65, 0x3b, 0x4d, 0x6f, 0x74, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x55, 0x70, 0x75, 0x3b, 0x50, 0x68, 0x61, 0x3b, 0x4c, 0x65,</div><div class='add'>+0x6f, 0x3b, 0x4d, 0x70, 0x68, 0x3b, 0x50, 0x75, 0x6e, 0x3b, 0x54, 0x73, 0x68, 0x3b, 0x50, 0x68, 0x65, 0x73, 0x65, 0x6b,</div><div class='add'>+0x67, 0x6f, 0x6e, 0x67, 0x3b, 0x48, 0x6c, 0x61, 0x6b, 0x6f, 0x6c, 0x61, 0x3b, 0x48, 0x6c, 0x61, 0x6b, 0x75, 0x62, 0x65,</div><div class='add'>+0x6c, 0x65, 0x3b, 0x4d, 0x6d, 0x65, 0x73, 0x65, 0x3b, 0x4d, 0x6f, 0x74, 0x73, 0x68, 0x65, 0x61, 0x6e, 0x6f, 0x6e, 0x67,</div><div class='add'>+0x3b, 0x50, 0x68, 0x75, 0x70, 0x6a, 0x61, 0x6e, 0x65, 0x3b, 0x50, 0x68, 0x75, 0x70, 0x75, 0x3b, 0x50, 0x68, 0x61, 0x74,</div><div class='add'>+0x61, 0x3b, 0x4c, 0x65, 0x6f, 0x74, 0x73, 0x68, 0x65, 0x3b, 0x4d, 0x70, 0x68, 0x61, 0x6c, 0x61, 0x6e, 0x65, 0x3b, 0x50,</div><div class='add'>+0x75, 0x6e, 0x64, 0x75, 0x6e, 0x67, 0x77, 0x61, 0x6e, 0x65, 0x3b, 0x54, 0x73, 0x68, 0x69, 0x74, 0x77, 0x65, 0x3b, 0x46,</div><div class='add'>+0x65, 0x72, 0x3b, 0x54, 0x6c, 0x68, 0x3b, 0x4d, 0x6f, 0x70, 0x3b, 0x4d, 0x6f, 0x72, 0x3b, 0x4d, 0x6f, 0x74, 0x3b, 0x53,</div><div class='add'>+0x65, 0x65, 0x3b, 0x50, 0x68, 0x75, 0x3b, 0x50, 0x68, 0x61, 0x3b, 0x4c, 0x77, 0x65, 0x3b, 0x44, 0x69, 0x70, 0x3b, 0x4e,</div><div class='add'>+0x67, 0x77, 0x3b, 0x53, 0x65, 0x64, 0x3b, 0x46, 0x65, 0x72, 0x69, 0x6b, 0x67, 0x6f, 0x6e, 0x67, 0x3b, 0x54, 0x6c, 0x68,</div><div class='add'>+0x61, 0x6b, 0x6f, 0x6c, 0x65, 0x3b, 0x4d, 0x6f, 0x70, 0x69, 0x74, 0x6c, 0x6f, 0x3b, 0x4d, 0x6f, 0x72, 0x61, 0x6e, 0x61,</div><div class='add'>+0x6e, 0x67, 0x3b, 0x4d, 0x6f, 0x74, 0x73, 0x68, 0x65, 0x67, 0x61, 0x6e, 0x61, 0x6e, 0x67, 0x3b, 0x53, 0x65, 0x65, 0x74,</div><div class='add'>+0x65, 0x62, 0x6f, 0x73, 0x69, 0x67, 0x6f, 0x3b, 0x50, 0x68, 0x75, 0x6b, 0x77, 0x69, 0x3b, 0x50, 0x68, 0x61, 0x74, 0x77,</div><div class='add'>+0x65, 0x3b, 0x4c, 0x77, 0x65, 0x74, 0x73, 0x65, 0x3b, 0x44, 0x69, 0x70, 0x68, 0x61, 0x6c, 0x61, 0x6e, 0x65, 0x3b, 0x4e,</div><div class='add'>+0x67, 0x77, 0x61, 0x6e, 0x61, 0x74, 0x73, 0x65, 0x6c, 0x65, 0x3b, 0x53, 0x65, 0x64, 0x69, 0x6d, 0x6f, 0x6e, 0x74, 0x68,</div><div class='add'>+0x6f, 0x6c, 0x65, 0x3b, 0x4e, 0x64, 0x69, 0x3b, 0x4b, 0x75, 0x6b, 0x3b, 0x4b, 0x75, 0x72, 0x3b, 0x4b, 0x75, 0x62, 0x3b,</div><div class='add'>+0x43, 0x68, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x3b, 0x4e, 0x79, 0x61, 0x3b, 0x47, 0x75, 0x6e, 0x3b,</div><div class='add'>+0x47, 0x75, 0x6d, 0x3b, 0x4d, 0x62, 0x3b, 0x5a, 0x76, 0x69, 0x3b, 0x4e, 0x64, 0x69, 0x72, 0x61, 0x3b, 0x4b, 0x75, 0x6b,</div><div class='add'>+0x61, 0x64, 0x7a, 0x69, 0x3b, 0x4b, 0x75, 0x72, 0x75, 0x6d, 0x65, 0x3b, 0x4b, 0x75, 0x62, 0x76, 0x75, 0x6d, 0x62, 0x69,</div><div class='add'>+0x3b, 0x43, 0x68, 0x69, 0x76, 0x61, 0x62, 0x76, 0x75, 0x3b, 0x43, 0x68, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x43, 0x68,</div><div class='add'>+0x69, 0x6b, 0x75, 0x6e, 0x67, 0x75, 0x72, 0x75, 0x3b, 0x4e, 0x79, 0x61, 0x6d, 0x61, 0x76, 0x68, 0x75, 0x76, 0x68, 0x75,</div><div class='add'>+0x3b, 0x47, 0x75, 0x6e, 0x79, 0x61, 0x6e, 0x61, 0x3b, 0x47, 0x75, 0x6d, 0x69, 0x67, 0x75, 0x72, 0x75, 0x3b, 0x4d, 0x62,</div><div class='add'>+0x75, 0x64, 0x7a, 0x69, 0x3b, 0x5a, 0x76, 0x69, 0x74, 0x61, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x43,</div><div class='add'>+0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x4e, 0x3b, 0x47, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x5a, 0x3b, 0xda2, 0xdb1, 0x3b, 0xdb4, 0xdd9,</div><div class='add'>+0xdb6, 0x3b, 0xdb8, 0xdcf, 0xdbb, 0xdca, 0xdad, 0x3b, 0xd85, 0xdb4, 0xdca, 0x200d, 0xdbb, 0xdda, 0xdbd, 0x3b, 0xdb8, 0xdd0, 0xdba, 0x3b,</div><div class='add'>+0xda2, 0xdd6, 0xdb1, 0x3b, 0xda2, 0xdd6, 0xdbd, 0x3b, 0xd85, 0xd9c, 0xddd, 0x3b, 0xdc3, 0xdd0, 0xdb4, 0x3b, 0xd94, 0xd9a, 0x3b, 0xdb1,</div><div class='add'>+0xddc, 0xdc0, 0xdd0, 0x3b, 0xdaf, 0xdd9, 0xdc3, 0xdd0, 0x3b, 0xda2, 0xdb1, 0xdc0, 0xdcf, 0xdbb, 0x3b, 0xdb4, 0xdd9, 0xdb6, 0xdbb, 0xdc0,</div><div class='add'>+0xdcf, 0xdbb, 0x3b, 0xdb8, 0xdcf, 0xdbb, 0xdca, 0xdad, 0x3b, 0xd85, 0xdb4, 0xdca, 0x200d, 0xdbb, 0xdda, 0xdbd, 0xdca, 0x3b, 0xdb8, 0xdd0,</div><div class='add'>+0xdba, 0xdd2, 0x3b, 0xda2, 0xdd6, 0xdb1, 0x3b, 0xda2, 0xdd6, 0xdbd, 0xdd2, 0x3b, 0xd85, 0xd9c, 0xddd, 0xdc3, 0xdca, 0xdad, 0xdd4, 0x3b,</div><div class='add'>+0xdc3, 0xdd0, 0xdb4, 0xdca, 0xdad, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xd94, 0xd9a, 0xdca, 0xdad, 0xddd, 0xdb6, 0xdbb, 0xdca,</div><div class='add'>+0x3b, 0xdb1, 0xddc, 0xdc0, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca, 0x3b, 0xdaf, 0xdd9, 0xdc3, 0xdd0, 0xdb8, 0xdca, 0xdb6, 0xdbb, 0xdca,</div><div class='add'>+0x3b, 0xda2, 0x3b, 0xdb4, 0xdd9, 0x3b, 0xdb8, 0xdcf, 0x3b, 0xd85, 0x3b, 0xdb8, 0xdd0, 0x3b, 0xda2, 0xdd6, 0x3b, 0xda2, 0xdd6, 0x3b,</div><div class='add'>+0xd85, 0x3b, 0xdc3, 0xdd0, 0x3b, 0xd94, 0x3b, 0xdb1, 0xddc, 0x3b, 0xdaf, 0xdd9, 0x3b, 0x42, 0x68, 0x69, 0x3b, 0x56, 0x61, 0x6e,</div><div class='add'>+0x3b, 0x56, 0x6f, 0x6c, 0x3b, 0x4d, 0x61, 0x62, 0x3b, 0x4e, 0x6b, 0x68, 0x3b, 0x4e, 0x68, 0x6c, 0x3b, 0x4b, 0x68, 0x6f,</div><div class='add'>+0x3b, 0x4e, 0x67, 0x63, 0x3b, 0x4e, 0x79, 0x6f, 0x3b, 0x4d, 0x70, 0x68, 0x3b, 0x4c, 0x77, 0x65, 0x3b, 0x4e, 0x67, 0x6f,</div><div class='add'>+0x3b, 0x42, 0x68, 0x69, 0x6d, 0x62, 0x69, 0x64, 0x76, 0x77, 0x61, 0x6e, 0x65, 0x3b, 0x69, 0x4e, 0x64, 0x6c, 0x6f, 0x76,</div><div class='add'>+0x61, 0x6e, 0x61, 0x3b, 0x69, 0x4e, 0x64, 0x6c, 0x6f, 0x76, 0x75, 0x2d, 0x6c, 0x65, 0x6e, 0x6b, 0x68, 0x75, 0x6c, 0x75,</div><div class='add'>+0x3b, 0x4d, 0x61, 0x62, 0x61, 0x73, 0x61, 0x3b, 0x69, 0x4e, 0x6b, 0x68, 0x77, 0x65, 0x6b, 0x68, 0x77, 0x65, 0x74, 0x69,</div><div class='add'>+0x3b, 0x69, 0x4e, 0x68, 0x6c, 0x61, 0x62, 0x61, 0x3b, 0x4b, 0x68, 0x6f, 0x6c, 0x77, 0x61, 0x6e, 0x65, 0x3b, 0x69, 0x4e,</div><div class='add'>+0x67, 0x63, 0x69, 0x3b, 0x69, 0x4e, 0x79, 0x6f, 0x6e, 0x69, 0x3b, 0x69, 0x4d, 0x70, 0x68, 0x61, 0x6c, 0x61, 0x3b, 0x4c,</div><div class='add'>+0x77, 0x65, 0x74, 0x69, 0x3b, 0x69, 0x4e, 0x67, 0x6f, 0x6e, 0x67, 0x6f, 0x6e, 0x69, 0x3b, 0x6a, 0x61, 0x6e, 0x3b, 0x66,</div><div class='add'>+0x65, 0x62, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x70, 0x72, 0x3b, 0x6d, 0xe1, 0x6a, 0x3b, 0x6a, 0xfa, 0x6e, 0x3b, 0x6a,</div><div class='add'>+0xfa, 0x6c, 0x3b, 0x61, 0x75, 0x67, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64,</div><div class='add'>+0x65, 0x63, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0xe1, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0xe1, 0x72, 0x3b, 0x6d, 0x61,</div><div class='add'>+0x72, 0x65, 0x63, 0x3b, 0x61, 0x70, 0x72, 0xed, 0x6c, 0x3b, 0x6d, 0xe1, 0x6a, 0x3b, 0x6a, 0xfa, 0x6e, 0x3b, 0x6a, 0xfa,</div><div class='add'>+0x6c, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f,</div><div class='add'>+0x6b, 0x74, 0xf3, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x64, 0x65, 0x63, 0x65,</div><div class='add'>+0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x72, 0x65, 0x63, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e, 0x69,</div><div class='add'>+0x6a, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x6a, 0x3b, 0x61, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65,</div><div class='add'>+0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65,</div><div class='add'>+0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4b, 0x6f, 0x62, 0x3b, 0x4c, 0x61, 0x62, 0x3b, 0x53,</div><div class='add'>+0x61, 0x64, 0x3b, 0x41, 0x66, 0x72, 0x3b, 0x53, 0x68, 0x61, 0x3b, 0x4c, 0x69, 0x78, 0x3b, 0x54, 0x6f, 0x64, 0x3b, 0x53,</div><div class='add'>+0x69, 0x64, 0x3b, 0x53, 0x61, 0x67, 0x3b, 0x54, 0x6f, 0x62, 0x3b, 0x4b, 0x49, 0x54, 0x3b, 0x4c, 0x49, 0x54, 0x3b, 0x42,</div><div class='add'>+0x69, 0x73, 0x68, 0x61, 0x20, 0x4b, 0x6f, 0x6f, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c,</div><div class='add'>+0x61, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53, 0x61, 0x64, 0x64, 0x65, 0x78, 0x61, 0x61,</div><div class='add'>+0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x41, 0x66, 0x72, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61,</div><div class='add'>+0x20, 0x53, 0x68, 0x61, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c, 0x69, 0x78, 0x61, 0x61,</div><div class='add'>+0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x54, 0x6f, 0x64, 0x6f, 0x62, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73,</div><div class='add'>+0x68, 0x61, 0x20, 0x53, 0x69, 0x64, 0x65, 0x65, 0x64, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x53,</div><div class='add'>+0x61, 0x67, 0x61, 0x61, 0x6c, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x54, 0x6f, 0x62, 0x6e, 0x61,</div><div class='add'>+0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4b, 0x6f, 0x77, 0x20, 0x69, 0x79, 0x6f, 0x20, 0x54, 0x6f, 0x62,</div><div class='add'>+0x6e, 0x61, 0x61, 0x64, 0x3b, 0x42, 0x69, 0x73, 0x68, 0x61, 0x20, 0x4c, 0x61, 0x62, 0x61, 0x20, 0x69, 0x79, 0x6f, 0x20,</div><div class='add'>+0x54, 0x6f, 0x62, 0x6e, 0x61, 0x61, 0x64, 0x3b, 0x4b, 0x3b, 0x4c, 0x3b, 0x53, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4c, 0x3b,</div><div class='add'>+0x54, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x4c, 0x3b, 0x65, 0x6e, 0x65, 0x3b, 0x66, 0x65, 0x62, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x72, 0x3b, 0x61, 0x62, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x6a, 0x75, 0x6e, 0x3b, 0x6a, 0x75, 0x6c, 0x3b,</div><div class='add'>+0x61, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x63, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x69, 0x63, 0x3b,</div><div class='add'>+0x65, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x6d, 0x61, 0x72, 0x7a, 0x6f, 0x3b,</div><div class='add'>+0x61, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x79, 0x6f, 0x3b, 0x6a, 0x75, 0x6e, 0x69, 0x6f, 0x3b, 0x6a, 0x75, 0x6c,</div><div class='add'>+0x69, 0x6f, 0x3b, 0x61, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65,</div><div class='add'>+0x3b, 0x6f, 0x63, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x6e, 0x6f, 0x76, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x64,</div><div class='add'>+0x69, 0x63, 0x69, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x45, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4a,</div><div class='add'>+0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62,</div><div class='add'>+0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c,</div><div class='add'>+0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x73,</div><div class='add'>+0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61,</div><div class='add'>+0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b,</div><div class='add'>+0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62,</div><div class='add'>+0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73,</div><div class='add'>+0x65, 0x6d, 0x62, 0x61, 0x3b, 0x6a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x66, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72,</div><div class='add'>+0x69, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b, 0x61, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x61, 0x6a, 0x3b, 0x6a, 0x75, 0x6e,</div><div class='add'>+0x69, 0x3b, 0x6a, 0x75, 0x6c, 0x69, 0x3b, 0x61, 0x75, 0x67, 0x75, 0x73, 0x74, 0x69, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x65,</div><div class='add'>+0x6d, 0x62, 0x65, 0x72, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x6e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x65,</div><div class='add'>+0x72, 0x3b, 0x64, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x42f, 0x43d, 0x432, 0x3b, 0x424, 0x435, 0x432, 0x3b, 0x41c,</div><div class='add'>+0x430, 0x440, 0x3b, 0x410, 0x43f, 0x440, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x3b, 0x418, 0x44e, 0x43b, 0x3b, 0x410,</div><div class='add'>+0x432, 0x433, 0x3b, 0x421, 0x435, 0x43d, 0x3b, 0x41e, 0x43a, 0x442, 0x3b, 0x41d, 0x43e, 0x44f, 0x3b, 0x414, 0x435, 0x43a, 0x3b, 0x42f,</div><div class='add'>+0x43d, 0x432, 0x430, 0x440, 0x3b, 0x424, 0x435, 0x432, 0x440, 0x430, 0x43b, 0x3b, 0x41c, 0x430, 0x440, 0x442, 0x3b, 0x410, 0x43f, 0x440,</div><div class='add'>+0x435, 0x43b, 0x3b, 0x41c, 0x430, 0x439, 0x3b, 0x418, 0x44e, 0x43d, 0x3b, 0x418, 0x44e, 0x43b, 0x3b, 0x410, 0x432, 0x433, 0x443, 0x441,</div><div class='add'>+0x442, 0x3b, 0x421, 0x435, 0x43d, 0x442, 0x44f, 0x431, 0x440, 0x3b, 0x41e, 0x43a, 0x442, 0x44f, 0x431, 0x440, 0x3b, 0x41d, 0x43e, 0x44f,</div><div class='add'>+0x431, 0x440, 0x3b, 0x414, 0x435, 0x43a, 0x430, 0x431, 0x440, 0x3b, 0xb9c, 0xba9, 0x2e, 0x3b, 0xbaa, 0xbbf, 0xbaa, 0xbcd, 0x2e, 0x3b,</div><div class='add'>+0xbae, 0xbbe, 0xbb0, 0xbcd, 0x2e, 0x3b, 0xb8f, 0xbaa, 0xbcd, 0x2e, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0xba9, 0xbcd, 0x3b, 0xb9c,</div><div class='add'>+0xbc2, 0xbb2, 0xbc8, 0x3b, 0xb86, 0xb95, 0x2e, 0x3b, 0xb9a, 0xbc6, 0xbaa, 0xbcd, 0x2e, 0x3b, 0xb85, 0xb95, 0xbcd, 0x2e, 0x3b, 0xba8,</div><div class='add'>+0xbb5, 0x2e, 0x3b, 0xb9f, 0xbbf, 0xb9a, 0x2e, 0x3b, 0xb9c, 0xba9, 0xbb5, 0xbb0, 0xbbf, 0x3b, 0xbaa, 0xbbf, 0xbaa, 0xbcd, 0xbb0, 0xbb5,</div><div class='add'>+0xbb0, 0xbbf, 0x3b, 0xbae, 0xbbe, 0xbb0, 0xbcd, 0xb9a, 0xbcd, 0x3b, 0xb8f, 0xbaa, 0xbcd, 0xbb0, 0xbb2, 0xbcd, 0x3b, 0xbae, 0xbc7, 0x3b,</div><div class='add'>+0xb9c, 0xbc2, 0xba9, 0xbcd, 0x3b, 0xb9c, 0xbc2, 0xbb2, 0xbc8, 0x3b, 0xb86, 0xb95, 0xbb8, 0xbcd, 0xb9f, 0xbcd, 0x3b, 0xb9a, 0xbc6, 0xbaa,</div><div class='add'>+0xbcd, 0xb9f, 0xbc6, 0xbae, 0xbcd, 0xbaa, 0xbcd, 0xbb0, 0xbcd, 0x3b, 0xb85, 0xb95, 0xbcd, 0xb9f, 0xbcb, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xba8,</div><div class='add'>+0xbb5, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xb9f, 0xbbf, 0xb9a, 0xbae, 0xbcd, 0xbaa, 0xbb0, 0xbcd, 0x3b, 0xb9c, 0x3b, 0xbaa, 0xbbf,</div><div class='add'>+0x3b, 0xbae, 0xbbe, 0x3b, 0xb8f, 0x3b, 0xbae, 0xbc7, 0x3b, 0xb9c, 0xbc2, 0x3b, 0xb9c, 0xbc2, 0x3b, 0xb86, 0x3b, 0xb9a, 0xbc6, 0x3b,</div><div class='add'>+0xb85, 0x3b, 0xba8, 0x3b, 0xb9f, 0xbbf, 0x3b, 0xc1c, 0xc28, 0xc35, 0xc30, 0xc3f, 0x3b, 0xc2b, 0xc3f, 0xc2c, 0xc4d, 0xc30, 0xc35, 0xc30,</div><div class='add'>+0xc3f, 0x3b, 0xc2e, 0xc3e, 0xc30, 0xc4d, 0xc1a, 0xc3f, 0x3b, 0xc0f, 0xc2a, 0xc4d, 0xc30, 0xc3f, 0xc32, 0xc4d, 0x3b, 0xc2e, 0xc47, 0x3b,</div><div class='add'>+0xc1c, 0xc42, 0xc28, 0xc4d, 0x3b, 0xc1c, 0xc42, 0xc32, 0xc48, 0x3b, 0xc06, 0xc17, 0xc38, 0xc4d, 0xc1f, 0xc41, 0x3b, 0xc38, 0xc46, 0xc2a,</div><div class='add'>+0xc4d, 0xc1f, 0xc46, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc05, 0xc15, 0xc4d, 0xc1f, 0xc4b, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc28, 0xc35, 0xc02,</div><div class='add'>+0xc2c, 0xc30, 0xc4d, 0x3b, 0xc21, 0xc3f, 0xc38, 0xc46, 0xc02, 0xc2c, 0xc30, 0xc4d, 0x3b, 0xc1c, 0x3b, 0xc2b, 0xc3f, 0x3b, 0xc2e, 0x3b,</div><div class='add'>+0xc0e, 0x3b, 0xc2e, 0xc46, 0x3b, 0xc1c, 0xc41, 0x3b, 0xc1c, 0xc41, 0x3b, 0xc06, 0x3b, 0xc38, 0xc46, 0x3b, 0xc05, 0x3b, 0xc28, 0x3b,</div><div class='add'>+0xc21, 0xc3f, 0x3b, 0xe21, 0x2e, 0xe04, 0x2e, 0x3b, 0xe01, 0x2e, 0xe1e, 0x2e, 0x3b, 0xe21, 0xe35, 0x2e, 0xe04, 0x2e, 0x3b, 0xe40,</div><div class='add'>+0xe21, 0x2e, 0xe22, 0x2e, 0x3b, 0xe1e, 0x2e, 0xe04, 0x2e, 0x3b, 0xe21, 0xe34, 0x2e, 0xe22, 0x2e, 0x3b, 0xe01, 0x2e, 0xe04, 0x2e,</div><div class='add'>+0x3b, 0xe2a, 0x2e, 0xe04, 0x2e, 0x3b, 0xe01, 0x2e, 0xe22, 0x2e, 0x3b, 0xe15, 0x2e, 0xe04, 0x2e, 0x3b, 0xe1e, 0x2e, 0xe22, 0x2e,</div><div class='add'>+0x3b, 0xe18, 0x2e, 0xe04, 0x2e, 0x3b, 0xe21, 0xe01, 0xe23, 0xe32, 0xe04, 0xe21, 0x3b, 0xe01, 0xe38, 0xe21, 0xe20, 0xe32, 0xe1e, 0xe31,</div><div class='add'>+0xe19, 0xe18, 0xe4c, 0x3b, 0xe21, 0xe35, 0xe19, 0xe32, 0xe04, 0xe21, 0x3b, 0xe40, 0xe21, 0xe29, 0xe32, 0xe22, 0xe19, 0x3b, 0xe1e, 0xe24,</div><div class='add'>+0xe29, 0xe20, 0xe32, 0xe04, 0xe21, 0x3b, 0xe21, 0xe34, 0xe16, 0xe38, 0xe19, 0xe32, 0xe22, 0xe19, 0x3b, 0xe01, 0xe23, 0xe01, 0xe0e, 0xe32,</div><div class='add'>+0xe04, 0xe21, 0x3b, 0xe2a, 0xe34, 0xe07, 0xe2b, 0xe32, 0xe04, 0xe21, 0x3b, 0xe01, 0xe31, 0xe19, 0xe22, 0xe32, 0xe22, 0xe19, 0x3b, 0xe15,</div><div class='add'>+0xe38, 0xe25, 0xe32, 0xe04, 0xe21, 0x3b, 0xe1e, 0xe24, 0xe28, 0xe08, 0xe34, 0xe01, 0xe32, 0xe22, 0xe19, 0x3b, 0xe18, 0xe31, 0xe19, 0xe27,</div><div class='add'>+0xe32, 0xe04, 0xe21, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf22, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf23, 0x3b, 0xf5f,</div><div class='add'>+0xfb3, 0xf0b, 0xf24, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf25, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf26, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf27, 0x3b, 0xf5f,</div><div class='add'>+0xfb3, 0xf0b, 0xf28, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf29, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf20, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf21,</div><div class='add'>+0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf21, 0xf22, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf44, 0xf0b, 0xf54, 0xf7c, 0xf0b, 0x3b, 0xf5f,</div><div class='add'>+0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf42, 0xf49, 0xf72, 0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf66, 0xf74, 0xf58,</div><div class='add'>+0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf5e, 0xf72, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56,</div><div class='add'>+0xf0b, 0xf63, 0xf94, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xfb2, 0xf74, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b,</div><div class='add'>+0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf51, 0xf74, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf62,</div><div class='add'>+0xf92, 0xfb1, 0xf51, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf51, 0xf42, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f,</div><div class='add'>+0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b,</div><div class='add'>+0xf42, 0xf45, 0xf72, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0xf56, 0xf45, 0xf74, 0xf0b, 0xf42, 0xf49, 0xf72,</div><div class='add'>+0xf66, 0xf0b, 0xf54, 0xf0b, 0x3b, 0x1325, 0x122a, 0x3b, 0x1208, 0x12ab, 0x1272, 0x3b, 0x1218, 0x130b, 0x1262, 0x3b, 0x121a, 0x12eb, 0x12dd, 0x3b,</div><div class='add'>+0x130d, 0x1295, 0x1266, 0x3b, 0x1230, 0x1290, 0x3b, 0x1213, 0x121d, 0x1208, 0x3b, 0x1290, 0x1213, 0x1230, 0x3b, 0x1218, 0x1235, 0x12a8, 0x3b, 0x1325,</div><div class='add'>+0x1245, 0x121d, 0x3b, 0x1215, 0x12f3, 0x122d, 0x3b, 0x1273, 0x1215, 0x1233, 0x3b, 0x1325, 0x122a, 0x3b, 0x1208, 0x12ab, 0x1272, 0x1275, 0x3b, 0x1218,</div><div class='add'>+0x130b, 0x1262, 0x1275, 0x3b, 0x121a, 0x12eb, 0x12dd, 0x12eb, 0x3b, 0x130d, 0x1295, 0x1266, 0x1275, 0x3b, 0x1230, 0x1290, 0x3b, 0x1213, 0x121d, 0x1208,</div><div class='add'>+0x3b, 0x1290, 0x1213, 0x1230, 0x3b, 0x1218, 0x1235, 0x12a8, 0x1228, 0x121d, 0x3b, 0x1325, 0x1245, 0x121d, 0x1272, 0x3b, 0x1215, 0x12f3, 0x122d, 0x3b,</div><div class='add'>+0x1273, 0x1215, 0x1233, 0x1235, 0x3b, 0x53, 0x101, 0x6e, 0x3b, 0x46, 0x113, 0x70, 0x3b, 0x4d, 0x61, 0x2bb, 0x61, 0x3b, 0x2bb, 0x45,</div><div class='add'>+0x70, 0x65, 0x3b, 0x4d, 0x113, 0x3b, 0x53, 0x75, 0x6e, 0x3b, 0x53, 0x69, 0x75, 0x3b, 0x2bb, 0x41, 0x6f, 0x6b, 0x3b, 0x53,</div><div class='add'>+0x65, 0x70, 0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x3b, 0x4e, 0x14d, 0x76, 0x3b, 0x54, 0x12b, 0x73, 0x3b, 0x53, 0x101, 0x6e, 0x75,</div><div class='add'>+0x61, 0x6c, 0x69, 0x3b, 0x46, 0x113, 0x70, 0x75, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x2bb, 0x61, 0x73, 0x69, 0x3b, 0x2bb,</div><div class='add'>+0x45, 0x70, 0x65, 0x6c, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x113, 0x3b, 0x53, 0x75, 0x6e, 0x65, 0x3b, 0x53, 0x69, 0x75, 0x6c,</div><div class='add'>+0x61, 0x69, 0x3b, 0x2bb, 0x41, 0x6f, 0x6b, 0x6f, 0x73, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x69, 0x74, 0x65, 0x6d, 0x61, 0x3b,</div><div class='add'>+0x2bb, 0x4f, 0x6b, 0x61, 0x74, 0x6f, 0x70, 0x61, 0x3b, 0x4e, 0x14d, 0x76, 0x65, 0x6d, 0x61, 0x3b, 0x54, 0x12b, 0x73, 0x65,</div><div class='add'>+0x6d, 0x61, 0x3b, 0x53, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x41, 0x3b, 0x53,</div><div class='add'>+0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x53, 0x75, 0x6e, 0x3b, 0x59, 0x61, 0x6e, 0x3b, 0x4b, 0x75, 0x6c, 0x3b, 0x44,</div><div class='add'>+0x7a, 0x69, 0x3b, 0x4d, 0x75, 0x64, 0x3b, 0x4b, 0x68, 0x6f, 0x3b, 0x4d, 0x61, 0x77, 0x3b, 0x4d, 0x68, 0x61, 0x3b, 0x4e,</div><div class='add'>+0x64, 0x7a, 0x3b, 0x4e, 0x68, 0x6c, 0x3b, 0x48, 0x75, 0x6b, 0x3b, 0x4e, 0x27, 0x77, 0x3b, 0x53, 0x75, 0x6e, 0x67, 0x75,</div><div class='add'>+0x74, 0x69, 0x3b, 0x4e, 0x79, 0x65, 0x6e, 0x79, 0x65, 0x6e, 0x79, 0x61, 0x6e, 0x69, 0x3b, 0x4e, 0x79, 0x65, 0x6e, 0x79,</div><div class='add'>+0x61, 0x6e, 0x6b, 0x75, 0x6c, 0x75, 0x3b, 0x44, 0x7a, 0x69, 0x76, 0x61, 0x6d, 0x69, 0x73, 0x6f, 0x6b, 0x6f, 0x3b, 0x4d,</div><div class='add'>+0x75, 0x64, 0x79, 0x61, 0x78, 0x69, 0x68, 0x69, 0x3b, 0x4b, 0x68, 0x6f, 0x74, 0x61, 0x76, 0x75, 0x78, 0x69, 0x6b, 0x61,</div><div class='add'>+0x3b, 0x4d, 0x61, 0x77, 0x75, 0x77, 0x61, 0x6e, 0x69, 0x3b, 0x4d, 0x68, 0x61, 0x77, 0x75, 0x72, 0x69, 0x3b, 0x4e, 0x64,</div><div class='add'>+0x7a, 0x68, 0x61, 0x74, 0x69, 0x3b, 0x4e, 0x68, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x3b, 0x48, 0x75, 0x6b, 0x75,</div><div class='add'>+0x72, 0x69, 0x3b, 0x4e, 0x27, 0x77, 0x65, 0x6e, 0x64, 0x7a, 0x61, 0x6d, 0x68, 0x61, 0x6c, 0x61, 0x3b, 0x4f, 0x63, 0x61,</div><div class='add'>+0x3b, 0x15e, 0x75, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4e, 0x69, 0x73, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48, 0x61, 0x7a,</div><div class='add'>+0x3b, 0x54, 0x65, 0x6d, 0x3b, 0x41, 0x11f, 0x75, 0x3b, 0x45, 0x79, 0x6c, 0x3b, 0x45, 0x6b, 0x69, 0x3b, 0x4b, 0x61, 0x73,</div><div class='add'>+0x3b, 0x41, 0x72, 0x61, 0x3b, 0x4f, 0x63, 0x61, 0x6b, 0x3b, 0x15e, 0x75, 0x62, 0x61, 0x74, 0x3b, 0x4d, 0x61, 0x72, 0x74,</div><div class='add'>+0x3b, 0x4e, 0x69, 0x73, 0x61, 0x6e, 0x3b, 0x4d, 0x61, 0x79, 0x131, 0x73, 0x3b, 0x48, 0x61, 0x7a, 0x69, 0x72, 0x61, 0x6e,</div><div class='add'>+0x3b, 0x54, 0x65, 0x6d, 0x6d, 0x75, 0x7a, 0x3b, 0x41, 0x11f, 0x75, 0x73, 0x74, 0x6f, 0x73, 0x3b, 0x45, 0x79, 0x6c, 0xfc,</div><div class='add'>+0x6c, 0x3b, 0x45, 0x6b, 0x69, 0x6d, 0x3b, 0x4b, 0x61, 0x73, 0x131, 0x6d, 0x3b, 0x41, 0x72, 0x61, 0x6c, 0x131, 0x6b, 0x3b,</div><div class='add'>+0x4f, 0x3b, 0x15e, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x45, 0x3b, 0x45, 0x3b,</div><div class='add'>+0x4b, 0x3b, 0x41, 0x3b, 0x421, 0x456, 0x447, 0x3b, 0x41b, 0x44e, 0x442, 0x3b, 0x411, 0x435, 0x440, 0x3b, 0x41a, 0x432, 0x456, 0x3b,</div><div class='add'>+0x422, 0x440, 0x430, 0x3b, 0x427, 0x435, 0x440, 0x3b, 0x41b, 0x438, 0x43f, 0x3b, 0x421, 0x435, 0x440, 0x3b, 0x412, 0x435, 0x440, 0x3b,</div><div class='add'>+0x416, 0x43e, 0x432, 0x3b, 0x41b, 0x438, 0x441, 0x3b, 0x413, 0x440, 0x443, 0x3b, 0x421, 0x456, 0x447, 0x435, 0x43d, 0x44c, 0x3b, 0x41b,</div><div class='add'>+0x44e, 0x442, 0x438, 0x439, 0x3b, 0x411, 0x435, 0x440, 0x435, 0x437, 0x435, 0x43d, 0x44c, 0x3b, 0x41a, 0x432, 0x456, 0x442, 0x435, 0x43d,</div><div class='add'>+0x44c, 0x3b, 0x422, 0x440, 0x430, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x427, 0x435, 0x440, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x41b, 0x438,</div><div class='add'>+0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x421, 0x435, 0x440, 0x43f, 0x435, 0x43d, 0x44c, 0x3b, 0x412, 0x435, 0x440, 0x435, 0x441, 0x435, 0x43d,</div><div class='add'>+0x44c, 0x3b, 0x416, 0x43e, 0x432, 0x442, 0x435, 0x43d, 0x44c, 0x3b, 0x41b, 0x438, 0x441, 0x442, 0x43e, 0x43f, 0x430, 0x434, 0x3b, 0x413,</div><div class='add'>+0x440, 0x443, 0x434, 0x435, 0x43d, 0x44c, 0x3b, 0x421, 0x3b, 0x41b, 0x3b, 0x411, 0x3b, 0x41a, 0x3b, 0x422, 0x3b, 0x427, 0x3b, 0x41b,</div><div class='add'>+0x3b, 0x421, 0x3b, 0x412, 0x3b, 0x416, 0x3b, 0x41b, 0x3b, 0x413, 0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x631, 0x648,</div><div class='add'>+0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x20, 0x686, 0x3b, 0x627, 0x67e, 0x631, 0x64a, 0x644, 0x3b, 0x645, 0x626, 0x3b, 0x62c, 0x648,</div><div class='add'>+0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x626, 0x3b, 0x627, 0x6af, 0x633, 0x62a, 0x3b, 0x633, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627,</div><div class='add'>+0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645, 0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x41c, 0x443,</div><div class='add'>+0x4b3, 0x430, 0x440, 0x440, 0x430, 0x43c, 0x3b, 0x421, 0x430, 0x444, 0x430, 0x440, 0x3b, 0x420, 0x430, 0x431, 0x438, 0x443, 0x43b, 0x2d,</div><div class='add'>+0x430, 0x432, 0x432, 0x430, 0x43b, 0x3b, 0x420, 0x430, 0x431, 0x438, 0x443, 0x43b, 0x2d, 0x43e, 0x445, 0x438, 0x440, 0x3b, 0x416, 0x443,</div><div class='add'>+0x43c, 0x43e, 0x434, 0x438, 0x443, 0x43b, 0x2d, 0x443, 0x43b, 0x43e, 0x3b, 0x416, 0x443, 0x43c, 0x43e, 0x434, 0x438, 0x443, 0x43b, 0x2d,</div><div class='add'>+0x443, 0x445, 0x440, 0x43e, 0x3b, 0x420, 0x430, 0x436, 0x430, 0x431, 0x3b, 0x428, 0x430, 0x44a, 0x431, 0x43e, 0x43d, 0x3b, 0x420, 0x430,</div><div class='add'>+0x43c, 0x430, 0x437, 0x43e, 0x43d, 0x3b, 0x428, 0x430, 0x432, 0x432, 0x43e, 0x43b, 0x3b, 0x417, 0x438, 0x43b, 0x2d, 0x49b, 0x430, 0x44a,</div><div class='add'>+0x434, 0x430, 0x3b, 0x417, 0x438, 0x43b, 0x2d, 0x4b3, 0x438, 0x436, 0x436, 0x430, 0x3b, 0x62c, 0x646, 0x648, 0x3b, 0x641, 0x628, 0x631,</div><div class='add'>+0x3b, 0x645, 0x627, 0x631, 0x3b, 0x627, 0x67e, 0x631, 0x3b, 0x645, 0x640, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644,</div><div class='add'>+0x3b, 0x627, 0x6af, 0x633, 0x3b, 0x633, 0x67e, 0x62a, 0x3b, 0x627, 0x6a9, 0x62a, 0x3b, 0x646, 0x648, 0x645, 0x3b, 0x62f, 0x633, 0x645,</div><div class='add'>+0x3b, 0x62c, 0x646, 0x648, 0x631, 0x6cc, 0x3b, 0x641, 0x628, 0x631, 0x648, 0x631, 0x6cc, 0x3b, 0x645, 0x627, 0x631, 0x686, 0x3b, 0x627,</div><div class='add'>+0x67e, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x6cc, 0x3b, 0x62c, 0x648, 0x646, 0x3b, 0x62c, 0x648, 0x644, 0x627, 0x6cc, 0x3b, 0x627, 0x6af,</div><div class='add'>+0x633, 0x62a, 0x3b, 0x633, 0x67e, 0x62a, 0x645, 0x628, 0x631, 0x3b, 0x627, 0x6a9, 0x62a, 0x648, 0x628, 0x631, 0x3b, 0x646, 0x648, 0x645,</div><div class='add'>+0x628, 0x631, 0x3b, 0x62f, 0x633, 0x645, 0x628, 0x631, 0x3b, 0x59, 0x61, 0x6e, 0x76, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61,</div><div class='add'>+0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x49, 0x79, 0x75, 0x6e, 0x3b, 0x49, 0x79, 0x75, 0x6c, 0x3b,</div><div class='add'>+0x41, 0x76, 0x67, 0x3b, 0x53, 0x65, 0x6e, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x79, 0x61, 0x3b, 0x44, 0x65, 0x6b,</div><div class='add'>+0x3b, 0x59, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f,</div><div class='add'>+0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x32, 0x3b, 0x74, 0x68, 0x67,</div><div class='add'>+0x20, 0x33, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x34, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x35, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x36,</div><div class='add'>+0x3b, 0x74, 0x68, 0x67, 0x20, 0x37, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x38, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x39, 0x3b, 0x74,</div><div class='add'>+0x68, 0x67, 0x20, 0x31, 0x30, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x31, 0x3b, 0x74, 0x68, 0x67, 0x20, 0x31, 0x32, 0x3b,</div><div class='add'>+0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x6d, 0x1ed9, 0x74, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x68, 0x61, 0x69, 0x3b,</div><div class='add'>+0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x62, 0x61, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x74, 0x1b0, 0x3b, 0x74, 0x68,</div><div class='add'>+0xe1, 0x6e, 0x67, 0x20, 0x6e, 0x103, 0x6d, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x73, 0xe1, 0x75, 0x3b, 0x74, 0x68,</div><div class='add'>+0xe1, 0x6e, 0x67, 0x20, 0x62, 0x1ea3, 0x79, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x74, 0xe1, 0x6d, 0x3b, 0x74, 0x68,</div><div class='add'>+0xe1, 0x6e, 0x67, 0x20, 0x63, 0x68, 0xed, 0x6e, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x6d, 0x1b0, 0x1edd, 0x69, 0x3b,</div><div class='add'>+0x74, 0x68, 0xe1, 0x6e, 0x67, 0x20, 0x6d, 0x1b0, 0x1edd, 0x69, 0x20, 0x6d, 0x1ed9, 0x74, 0x3b, 0x74, 0x68, 0xe1, 0x6e, 0x67,</div><div class='add'>+0x20, 0x6d, 0x1b0, 0x1edd, 0x69, 0x20, 0x68, 0x61, 0x69, 0x3b, 0x49, 0x6f, 0x6e, 0x3b, 0x43, 0x68, 0x77, 0x65, 0x3b, 0x4d,</div><div class='add'>+0x61, 0x77, 0x3b, 0x45, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x65, 0x68, 0x3b, 0x47, 0x6f, 0x72, 0x3b, 0x41,</div><div class='add'>+0x77, 0x73, 0x74, 0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79, 0x64, 0x3b, 0x54, 0x61, 0x63, 0x68, 0x3b, 0x52, 0x68,</div><div class='add'>+0x61, 0x67, 0x3b, 0x49, 0x6f, 0x6e, 0x61, 0x77, 0x72, 0x3b, 0x43, 0x68, 0x77, 0x65, 0x66, 0x72, 0x6f, 0x72, 0x3b, 0x4d,</div><div class='add'>+0x61, 0x77, 0x72, 0x74, 0x68, 0x3b, 0x45, 0x62, 0x72, 0x69, 0x6c, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x65, 0x68,</div><div class='add'>+0x65, 0x66, 0x69, 0x6e, 0x3b, 0x47, 0x6f, 0x72, 0x66, 0x66, 0x65, 0x6e, 0x6e, 0x61, 0x66, 0x3b, 0x41, 0x77, 0x73, 0x74,</div><div class='add'>+0x3b, 0x4d, 0x65, 0x64, 0x69, 0x3b, 0x48, 0x79, 0x64, 0x72, 0x65, 0x66, 0x3b, 0x54, 0x61, 0x63, 0x68, 0x77, 0x65, 0x64,</div><div class='add'>+0x64, 0x3b, 0x52, 0x68, 0x61, 0x67, 0x66, 0x79, 0x72, 0x3b, 0x49, 0x3b, 0x43, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b,</div><div class='add'>+0x4d, 0x3b, 0x47, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x52, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65,</div><div class='add'>+0x62, 0x3b, 0x4d, 0x61, 0x74, 0x3b, 0x45, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75,</div><div class='add'>+0x6c, 0x3b, 0x41, 0x67, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69,</div><div class='add'>+0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x79, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x77, 0x61, 0x72,</div><div class='add'>+0x69, 0x3b, 0x4d, 0x61, 0x74, 0x73, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x72, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x79, 0x69,</div><div class='add'>+0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x79, 0x69, 0x3b, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b,</div><div class='add'>+0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x68, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76,</div><div class='add'>+0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x1e62, 0x1eb9, 0x301, 0x72, 0x1eb9, 0x323, 0x3b,</div><div class='add'>+0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x1eb8, 0x72, 0x1eb9, 0x300, 0x6e, 0xe0, 0x3b, 0xcc, 0x67, 0x62, 0xe9, 0x3b, 0x1eb8, 0x300,</div><div class='add'>+0x62, 0x69, 0x62, 0x69, 0x3b, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x41, 0x67, 0x1eb9, 0x6d, 0x1ecd, 0x3b, 0xd2, 0x67, 0xfa,</div><div class='add'>+0x6e, 0x3b, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x1ecc, 0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x42, 0xe9, 0x6c, 0xfa, 0x3b,</div><div class='add'>+0x1ecc, 0x300, 0x70, 0x1eb9, 0x300, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x1e62, 0x1eb8, 0x301, 0x72, 0x1eb9, 0x301, 0x3b, 0x4f, 0x1e62, 0xf9,</div><div class='add'>+0x20, 0xc8, 0x72, 0xe8, 0x6c, 0xe8, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x1eb8, 0x72, 0x1eb9, 0x300, 0x6e, 0xe0, 0x3b, 0x4f, 0x1e62,</div><div class='add'>+0xf9, 0x20, 0xcc, 0x67, 0x62, 0xe9, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x1eb8, 0x300, 0x62, 0x69, 0x62, 0x69, 0x3b, 0x4f, 0x1e62,</div><div class='add'>+0xf9, 0x20, 0xd2, 0x6b, 0xfa, 0x64, 0x75, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x41, 0x67, 0x1eb9, 0x6d, 0x1ecd, 0x3b, 0x4f, 0x1e62,</div><div class='add'>+0xf9, 0x20, 0xd2, 0x67, 0xfa, 0x6e, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x4f, 0x77, 0x65, 0x77, 0x65, 0x3b, 0x4f, 0x1e62, 0xf9,</div><div class='add'>+0x20, 0x1ecc, 0x300, 0x77, 0xe0, 0x72, 0xe0, 0x3b, 0x4f, 0x1e62, 0xf9, 0x20, 0x42, 0xe9, 0x6c, 0xfa, 0x3b, 0x4f, 0x1e62, 0xf9,</div><div class='add'>+0x20, 0x1ecc, 0x300, 0x70, 0x1eb9, 0x300, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x73, 0x3b, 0x41,</div><div class='add'>+0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x61, 0x3b, 0x53,</div><div class='add'>+0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x75, 0x4a, 0x61, 0x6e, 0x75,</div><div class='add'>+0x77, 0x61, 0x72, 0x69, 0x3b, 0x75, 0x46, 0x65, 0x62, 0x72, 0x75, 0x77, 0x61, 0x72, 0x69, 0x3b, 0x75, 0x4d, 0x61, 0x73,</div><div class='add'>+0x68, 0x69, 0x3b, 0x75, 0x2d, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x69, 0x3b, 0x75, 0x4d, 0x65, 0x79, 0x69, 0x3b, 0x75, 0x4a,</div><div class='add'>+0x75, 0x6e, 0x69, 0x3b, 0x75, 0x4a, 0x75, 0x6c, 0x61, 0x79, 0x69, 0x3b, 0x75, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b,</div><div class='add'>+0x75, 0x53, 0x65, 0x70, 0x74, 0x68, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x75, 0x2d, 0x4f, 0x6b, 0x74, 0x68, 0x6f, 0x62, 0x61,</div><div class='add'>+0x3b, 0x75, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x75, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a,</div><div class='add'>+0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x6a, 0x3b, 0x4a,</div><div class='add'>+0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x76, 0x67, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e,</div><div class='add'>+0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61,</div><div class='add'>+0x72, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x6a, 0x3b, 0x4a, 0x75, 0x6e,</div><div class='add'>+0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x76, 0x67, 0x75, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d,</div><div class='add'>+0x62, 0x61, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x72,</div><div class='add'>+0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4a, 0x2d, 0x67, 0x75, 0x65, 0x72, 0x3b, 0x54, 0x2d, 0x61,</div><div class='add'>+0x72, 0x72, 0x65, 0x65, 0x3b, 0x4d, 0x61, 0x79, 0x72, 0x6e, 0x74, 0x3b, 0x41, 0x76, 0x72, 0x72, 0x69, 0x6c, 0x3b, 0x42,</div><div class='add'>+0x6f, 0x61, 0x6c, 0x64, 0x79, 0x6e, 0x3b, 0x4d, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4a, 0x2d, 0x73, 0x6f,</div><div class='add'>+0x75, 0x72, 0x65, 0x65, 0x3b, 0x4c, 0x75, 0x61, 0x6e, 0x69, 0x73, 0x74, 0x79, 0x6e, 0x3b, 0x4d, 0x2d, 0x66, 0x6f, 0x75,</div><div class='add'>+0x79, 0x69, 0x72, 0x3b, 0x4a, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4d, 0x2e, 0x48, 0x6f, 0x75, 0x6e, 0x65,</div><div class='add'>+0x79, 0x3b, 0x4d, 0x2e, 0x4e, 0x6f, 0x6c, 0x6c, 0x69, 0x63, 0x6b, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x67,</div><div class='add'>+0x65, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x54, 0x6f, 0x73, 0x68, 0x69, 0x61, 0x67, 0x68, 0x74, 0x2d, 0x61, 0x72, 0x72, 0x65,</div><div class='add'>+0x65, 0x3b, 0x4d, 0x61, 0x79, 0x72, 0x6e, 0x74, 0x3b, 0x41, 0x76, 0x65, 0x72, 0x69, 0x6c, 0x3b, 0x42, 0x6f, 0x61, 0x6c,</div><div class='add'>+0x64, 0x79, 0x6e, 0x3b, 0x4d, 0x65, 0x61, 0x6e, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4a, 0x65, 0x72, 0x72,</div><div class='add'>+0x65, 0x79, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x65, 0x65, 0x3b, 0x4c, 0x75, 0x61, 0x6e, 0x69, 0x73, 0x74, 0x79, 0x6e, 0x3b,</div><div class='add'>+0x4d, 0x65, 0x61, 0x6e, 0x2d, 0x66, 0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4a, 0x65, 0x72, 0x72, 0x65, 0x79, 0x2d, 0x66,</div><div class='add'>+0x6f, 0x75, 0x79, 0x69, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x20, 0x48, 0x6f, 0x75, 0x6e, 0x65, 0x79, 0x3b, 0x4d, 0x65, 0x65,</div><div class='add'>+0x20, 0x6e, 0x79, 0x20, 0x4e, 0x6f, 0x6c, 0x6c, 0x69, 0x63, 0x6b, 0x3b, 0x47, 0x65, 0x6e, 0x3b, 0x57, 0x68, 0x65, 0x3b,</div><div class='add'>+0x4d, 0x65, 0x72, 0x3b, 0x45, 0x62, 0x72, 0x3b, 0x4d, 0x65, 0x3b, 0x45, 0x66, 0x6e, 0x3b, 0x47, 0x6f, 0x72, 0x3b, 0x45,</div><div class='add'>+0x73, 0x74, 0x3b, 0x47, 0x77, 0x6e, 0x3b, 0x48, 0x65, 0x64, 0x3b, 0x44, 0x75, 0x3b, 0x4b, 0x65, 0x76, 0x3b, 0x4d, 0x79,</div><div class='add'>+0x73, 0x20, 0x47, 0x65, 0x6e, 0x76, 0x65, 0x72, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x57, 0x68, 0x65, 0x76, 0x72, 0x65, 0x6c,</div><div class='add'>+0x3b, 0x4d, 0x79, 0x73, 0x20, 0x4d, 0x65, 0x72, 0x74, 0x68, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x45, 0x62, 0x72, 0x65, 0x6c,</div><div class='add'>+0x3b, 0x4d, 0x79, 0x73, 0x20, 0x4d, 0x65, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x45, 0x66, 0x61, 0x6e, 0x3b, 0x4d, 0x79, 0x73,</div><div class='add'>+0x20, 0x47, 0x6f, 0x72, 0x74, 0x68, 0x65, 0x72, 0x65, 0x6e, 0x3b, 0x4d, 0x79, 0x65, 0x20, 0x45, 0x73, 0x74, 0x3b, 0x4d,</div><div class='add'>+0x79, 0x73, 0x20, 0x47, 0x77, 0x79, 0x6e, 0x67, 0x61, 0x6c, 0x61, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x48, 0x65, 0x64, 0x72,</div><div class='add'>+0x61, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x44, 0x75, 0x3b, 0x4d, 0x79, 0x73, 0x20, 0x4b, 0x65, 0x76, 0x61, 0x72, 0x64, 0x68,</div><div class='add'>+0x75, 0x3b, 0x53, 0x2d, 0x186, 0x3b, 0x4b, 0x2d, 0x186, 0x3b, 0x45, 0x2d, 0x186, 0x3b, 0x45, 0x2d, 0x4f, 0x3b, 0x45, 0x2d,</div><div class='add'>+0x4b, 0x3b, 0x4f, 0x2d, 0x41, 0x3b, 0x41, 0x2d, 0x4b, 0x3b, 0x44, 0x2d, 0x186, 0x3b, 0x46, 0x2d, 0x190, 0x3b, 0x186, 0x2d,</div><div class='add'>+0x41, 0x3b, 0x186, 0x2d, 0x4f, 0x3b, 0x4d, 0x2d, 0x186, 0x3b, 0x53, 0x61, 0x6e, 0x64, 0x61, 0x2d, 0x186, 0x70, 0x25b, 0x70,</div><div class='add'>+0x254, 0x6e, 0x3b, 0x4b, 0x77, 0x61, 0x6b, 0x77, 0x61, 0x72, 0x2d, 0x186, 0x67, 0x79, 0x65, 0x66, 0x75, 0x6f, 0x3b, 0x45,</div><div class='add'>+0x62, 0x254, 0x77, 0x2d, 0x186, 0x62, 0x65, 0x6e, 0x65, 0x6d, 0x3b, 0x45, 0x62, 0x254, 0x62, 0x69, 0x72, 0x61, 0x2d, 0x4f,</div><div class='add'>+0x66, 0x6f, 0x72, 0x69, 0x73, 0x75, 0x6f, 0x3b, 0x45, 0x73, 0x75, 0x73, 0x6f, 0x77, 0x20, 0x41, 0x6b, 0x65, 0x74, 0x73,</div><div class='add'>+0x65, 0x61, 0x62, 0x61, 0x2d, 0x4b, 0x254, 0x74, 0x254, 0x6e, 0x69, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x62, 0x69, 0x72, 0x61,</div><div class='add'>+0x64, 0x65, 0x2d, 0x41, 0x79, 0x25b, 0x77, 0x6f, 0x68, 0x6f, 0x6d, 0x75, 0x6d, 0x75, 0x3b, 0x41, 0x79, 0x25b, 0x77, 0x6f,</div><div class='add'>+0x68, 0x6f, 0x2d, 0x4b, 0x69, 0x74, 0x61, 0x77, 0x6f, 0x6e, 0x73, 0x61, 0x3b, 0x44, 0x69, 0x66, 0x75, 0x75, 0x2d, 0x186,</div><div class='add'>+0x73, 0x61, 0x6e, 0x64, 0x61, 0x61, 0x3b, 0x46, 0x61, 0x6e, 0x6b, 0x77, 0x61, 0x2d, 0x190, 0x62, 0x254, 0x3b, 0x186, 0x62,</div><div class='add'>+0x25b, 0x73, 0x25b, 0x2d, 0x41, 0x68, 0x69, 0x6e, 0x69, 0x6d, 0x65, 0x3b, 0x186, 0x62, 0x65, 0x72, 0x25b, 0x66, 0x25b, 0x77,</div><div class='add'>+0x2d, 0x4f, 0x62, 0x75, 0x62, 0x75, 0x6f, 0x3b, 0x4d, 0x75, 0x6d, 0x75, 0x2d, 0x186, 0x70, 0x25b, 0x6e, 0x69, 0x6d, 0x62,</div><div class='add'>+0x61, 0x3b, 0x91c, 0x93e, 0x928, 0x947, 0x935, 0x93e, 0x930, 0x940, 0x3b, 0x92b, 0x947, 0x92c, 0x94d, 0x930, 0x941, 0x935, 0x93e, 0x930,</div><div class='add'>+0x940, 0x3b, 0x92e, 0x93e, 0x930, 0x94d, 0x91a, 0x3b, 0x90f, 0x92a, 0x94d, 0x930, 0x93f, 0x932, 0x3b, 0x92e, 0x947, 0x3b, 0x91c, 0x942,</div><div class='add'>+0x928, 0x3b, 0x91c, 0x941, 0x932, 0x948, 0x3b, 0x913, 0x917, 0x938, 0x94d, 0x91f, 0x3b, 0x938, 0x947, 0x92a, 0x94d, 0x91f, 0x947, 0x902,</div><div class='add'>+0x92c, 0x930, 0x3b, 0x913, 0x915, 0x94d, 0x91f, 0x94b, 0x92c, 0x930, 0x3b, 0x928, 0x94b, 0x935, 0x94d, 0x939, 0x947, 0x902, 0x92c, 0x930,</div><div class='add'>+0x3b, 0x921, 0x93f, 0x938, 0x947, 0x902, 0x92c, 0x930, 0x3b, 0x41, 0x68, 0x61, 0x3b, 0x4f, 0x66, 0x6c, 0x3b, 0x4f, 0x63, 0x68,</div><div class='add'>+0x3b, 0x41, 0x62, 0x65, 0x3b, 0x41, 0x67, 0x62, 0x3b, 0x4f, 0x74, 0x75, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x4d, 0x61, 0x6e,</div><div class='add'>+0x3b, 0x47, 0x62, 0x6f, 0x3b, 0x41, 0x6e, 0x74, 0x3b, 0x41, 0x6c, 0x65, 0x3b, 0x41, 0x66, 0x75, 0x3b, 0x41, 0x68, 0x61,</div><div class='add'>+0x72, 0x61, 0x62, 0x61, 0x74, 0x61, 0x3b, 0x4f, 0x66, 0x6c, 0x6f, 0x3b, 0x4f, 0x63, 0x68, 0x6f, 0x6b, 0x72, 0x69, 0x6b,</div><div class='add'>+0x72, 0x69, 0x3b, 0x41, 0x62, 0x65, 0x69, 0x62, 0x65, 0x65, 0x3b, 0x41, 0x67, 0x62, 0x65, 0x69, 0x6e, 0x61, 0x61, 0x3b,</div><div class='add'>+0x4f, 0x74, 0x75, 0x6b, 0x77, 0x61, 0x64, 0x61, 0x6e, 0x3b, 0x4d, 0x61, 0x61, 0x77, 0x65, 0x3b, 0x4d, 0x61, 0x6e, 0x79,</div><div class='add'>+0x61, 0x77, 0x61, 0x6c, 0x65, 0x3b, 0x47, 0x62, 0x6f, 0x3b, 0x41, 0x6e, 0x74, 0x6f, 0x6e, 0x3b, 0x41, 0x6c, 0x65, 0x6d,</div><div class='add'>+0x6c, 0x65, 0x3b, 0x41, 0x66, 0x75, 0x61, 0x62, 0x65, 0x65, 0x3b, 0x4a, 0x65, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d,</div><div class='add'>+0x61, 0x61, 0x3b, 0x45, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x75, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x1ecc,</div><div class='add'>+0x67, 0x1ecd, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x1ecc, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a,</div><div class='add'>+0x65, 0x6e, 0x1ee5, 0x77, 0x61, 0x72, 0x1ecb, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x1ee5, 0x77, 0x61, 0x72, 0x1ecb, 0x3b, 0x4d, 0x61,</div><div class='add'>+0x61, 0x63, 0x68, 0x1ecb, 0x3b, 0x45, 0x70, 0x72, 0x65, 0x6c, 0x3b, 0x4d, 0x65, 0x65, 0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x3b,</div><div class='add'>+0x4a, 0x75, 0x6c, 0x61, 0x1ecb, 0x3b, 0x1ecc, 0x67, 0x1ecd, 0x1ecd, 0x73, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62,</div><div class='add'>+0x61, 0x3b, 0x1ecc, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73,</div><div class='add'>+0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4d, 0x62, 0x65, 0x3b, 0x4b, 0x65, 0x6c, 0x3b, 0x4b, 0x74, 0x169, 0x3b, 0x4b, 0x61, 0x6e,</div><div class='add'>+0x3b, 0x4b, 0x74, 0x6e, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x4d, 0x6f, 0x6f, 0x3b, 0x4e, 0x79, 0x61, 0x3b, 0x4b, 0x6e, 0x64,</div><div class='add'>+0x3b, 0x128, 0x6b, 0x75, 0x3b, 0x128, 0x6b, 0x6d, 0x3b, 0x128, 0x6b, 0x6c, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61,</div><div class='add'>+0x20, 0x6d, 0x62, 0x65, 0x65, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x6c, 0x129, 0x3b, 0x4d,</div><div class='add'>+0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77,</div><div class='add'>+0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x6e,</div><div class='add'>+0x6f, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x74, 0x68, 0x61, 0x74, 0x169, 0x3b,</div><div class='add'>+0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x75, 0x6f, 0x6e, 0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20,</div><div class='add'>+0x77, 0x61, 0x20, 0x6e, 0x79, 0x61, 0x61, 0x6e, 0x79, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b,</div><div class='add'>+0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d,</div><div class='add'>+0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x129, 0x6d, 0x77, 0x65,</div><div class='add'>+0x3b, 0x4d, 0x77, 0x61, 0x69, 0x20, 0x77, 0x61, 0x20, 0x129, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x6c,</div><div class='add'>+0x129, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b,</div><div class='add'>+0x128, 0x3b, 0x128, 0x3b, 0x128, 0x3b, 0x70f, 0x71f, 0x722, 0x20, 0x70f, 0x712, 0x3b, 0x72b, 0x712, 0x71b, 0x3b, 0x710, 0x715, 0x72a,</div><div class='add'>+0x3b, 0x722, 0x71d, 0x723, 0x722, 0x3b, 0x710, 0x71d, 0x72a, 0x3b, 0x71a, 0x719, 0x71d, 0x72a, 0x722, 0x3b, 0x72c, 0x721, 0x718, 0x719,</div><div class='add'>+0x3b, 0x710, 0x712, 0x3b, 0x710, 0x71d, 0x720, 0x718, 0x720, 0x3b, 0x70f, 0x72c, 0x72b, 0x20, 0x70f, 0x710, 0x3b, 0x70f, 0x72c, 0x72b,</div><div class='add'>+0x20, 0x70f, 0x712, 0x3b, 0x70f, 0x71f, 0x722, 0x20, 0x70f, 0x710, 0x3b, 0x120d, 0x12f0, 0x1275, 0x3b, 0x12ab, 0x1265, 0x12bd, 0x3b, 0x12ad,</div><div class='add'>+0x1265, 0x120b, 0x3b, 0x134b, 0x1305, 0x12ba, 0x3b, 0x12ad, 0x1262, 0x1245, 0x3b, 0x121d, 0x2f, 0x1275, 0x3b, 0x12b0, 0x122d, 0x3b, 0x121b, 0x122d,</div><div class='add'>+0x12eb, 0x3b, 0x12eb, 0x12b8, 0x1292, 0x3b, 0x1218, 0x1270, 0x1209, 0x3b, 0x121d, 0x2f, 0x121d, 0x3b, 0x1270, 0x1215, 0x1233, 0x3b, 0x120d, 0x12f0,</div><div class='add'>+0x1275, 0x122a, 0x3b, 0x12ab, 0x1265, 0x12bd, 0x1265, 0x1272, 0x3b, 0x12ad, 0x1265, 0x120b, 0x3b, 0x134b, 0x1305, 0x12ba, 0x122a, 0x3b, 0x12ad, 0x1262,</div><div class='add'>+0x1245, 0x122a, 0x3b, 0x121d, 0x12aa, 0x12a4, 0x120d, 0x20, 0x1275, 0x131f, 0x1292, 0x122a, 0x3b, 0x12b0, 0x122d, 0x12a9, 0x3b, 0x121b, 0x122d, 0x12eb,</div><div class='add'>+0x121d, 0x20, 0x1275, 0x122a, 0x3b, 0x12eb, 0x12b8, 0x1292, 0x20, 0x1218, 0x1233, 0x1245, 0x1208, 0x122a, 0x3b, 0x1218, 0x1270, 0x1209, 0x3b, 0x121d,</div><div class='add'>+0x12aa, 0x12a4, 0x120d, 0x20, 0x1218, 0x123d, 0x12c8, 0x122a, 0x3b, 0x1270, 0x1215, 0x1233, 0x1235, 0x122a, 0x3b, 0x120d, 0x3b, 0x12ab, 0x3b, 0x12ad,</div><div class='add'>+0x3b, 0x134b, 0x3b, 0x12ad, 0x3b, 0x121d, 0x3b, 0x12b0, 0x3b, 0x121b, 0x3b, 0x12eb, 0x3b, 0x1218, 0x3b, 0x121d, 0x3b, 0x1270, 0x3b, 0x1320,</div><div class='add'>+0x1210, 0x1228, 0x3b, 0x12a8, 0x1270, 0x1270, 0x3b, 0x1218, 0x1308, 0x1260, 0x3b, 0x12a0, 0x1280, 0x12d8, 0x3b, 0x130d, 0x1295, 0x1263, 0x1275, 0x3b,</div><div class='add'>+0x1220, 0x1295, 0x12e8, 0x3b, 0x1210, 0x1218, 0x1208, 0x3b, 0x1290, 0x1210, 0x1230, 0x3b, 0x12a8, 0x1228, 0x1218, 0x3b, 0x1320, 0x1240, 0x1218, 0x3b,</div><div class='add'>+0x1280, 0x12f0, 0x1228, 0x3b, 0x1280, 0x1220, 0x1220, 0x3b, 0x1320, 0x3b, 0x12a8, 0x3b, 0x1218, 0x3b, 0x12a0, 0x3b, 0x130d, 0x3b, 0x1220, 0x3b,</div><div class='add'>+0x1210, 0x3b, 0x1290, 0x3b, 0x12a8, 0x3b, 0x1320, 0x3b, 0x1280, 0x3b, 0x1280, 0x3b, 0x57, 0x65, 0x79, 0x3b, 0x46, 0x61, 0x6e, 0x3b,</div><div class='add'>+0x54, 0x61, 0x74, 0x3b, 0x4e, 0x61, 0x6e, 0x3b, 0x54, 0x75, 0x79, 0x3b, 0x54, 0x73, 0x6f, 0x3b, 0x54, 0x61, 0x66, 0x3b,</div><div class='add'>+0x57, 0x61, 0x72, 0x3b, 0x4b, 0x75, 0x6e, 0x3b, 0x42, 0x61, 0x6e, 0x3b, 0x4b, 0x6f, 0x6d, 0x3b, 0x53, 0x61, 0x75, 0x3b,</div><div class='add'>+0x46, 0x61, 0x69, 0x20, 0x57, 0x65, 0x79, 0x65, 0x6e, 0x65, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x46, 0x61, 0x6e, 0x69, 0x3b,</div><div class='add'>+0x46, 0x61, 0x69, 0x20, 0x54, 0x61, 0x74, 0x61, 0x6b, 0x61, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x4e, 0x61, 0x6e, 0x67, 0x72,</div><div class='add'>+0x61, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x54, 0x75, 0x79, 0x6f, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x54, 0x73, 0x6f, 0x79, 0x69,</div><div class='add'>+0x3b, 0x46, 0x61, 0x69, 0x20, 0x54, 0x61, 0x66, 0x61, 0x6b, 0x61, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x57, 0x61, 0x72, 0x61,</div><div class='add'>+0x63, 0x68, 0x69, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x4b, 0x75, 0x6e, 0x6f, 0x62, 0x6f, 0x6b, 0x3b, 0x46, 0x61, 0x69, 0x20,</div><div class='add'>+0x42, 0x61, 0x6e, 0x73, 0x6f, 0x6b, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x4b, 0x6f, 0x6d, 0x3b, 0x46, 0x61, 0x69, 0x20, 0x53,</div><div class='add'>+0x61, 0x75, 0x6b, 0x3b, 0x44, 0x79, 0x6f, 0x6e, 0x3b, 0x42, 0x61, 0x61, 0x3b, 0x41, 0x74, 0x61, 0x74, 0x3b, 0x41, 0x6e,</div><div class='add'>+0x61, 0x73, 0x3b, 0x41, 0x74, 0x79, 0x6f, 0x3b, 0x41, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x74, 0x61, 0x72, 0x3b, 0x41, 0x77,</div><div class='add'>+0x75, 0x72, 0x3b, 0x53, 0x68, 0x61, 0x64, 0x3b, 0x53, 0x68, 0x61, 0x6b, 0x3b, 0x4e, 0x61, 0x62, 0x61, 0x3b, 0x4e, 0x61,</div><div class='add'>+0x74, 0x61, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x44, 0x79, 0x6f, 0x6e, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x42, 0x61, 0x27, 0x61,</div><div class='add'>+0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x74, 0x61, 0x74, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x6e, 0x61, 0x73, 0x3b, 0x50,</div><div class='add'>+0x65, 0x6e, 0x20, 0x41, 0x74, 0x79, 0x6f, 0x6e, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x63, 0x68, 0x69, 0x72, 0x69, 0x6d,</div><div class='add'>+0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x74, 0x61, 0x72, 0x69, 0x62, 0x61, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x41, 0x77, 0x75,</div><div class='add'>+0x72, 0x72, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x53, 0x68, 0x61, 0x64, 0x6f, 0x6e, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x53, 0x68,</div><div class='add'>+0x61, 0x6b, 0x75, 0x72, 0x3b, 0x50, 0x65, 0x6e, 0x20, 0x4b, 0x75, 0x72, 0x20, 0x4e, 0x61, 0x62, 0x61, 0x3b, 0x50, 0x65,</div><div class='add'>+0x6e, 0x20, 0x4b, 0x75, 0x72, 0x20, 0x4e, 0x61, 0x74, 0x61, 0x74, 0x3b, 0x41, 0x331, 0x79, 0x72, 0x3b, 0x41, 0x331, 0x68,</div><div class='add'>+0x77, 0x3b, 0x41, 0x331, 0x74, 0x61, 0x3b, 0x41, 0x331, 0x6e, 0x61, 0x3b, 0x41, 0x331, 0x70, 0x66, 0x3b, 0x41, 0x331, 0x6b,</div><div class='add'>+0x69, 0x3b, 0x41, 0x331, 0x74, 0x79, 0x3b, 0x41, 0x331, 0x6e, 0x69, 0x3b, 0x41, 0x331, 0x6b, 0x75, 0x3b, 0x53, 0x77, 0x61,</div><div class='add'>+0x3b, 0x53, 0x62, 0x79, 0x3b, 0x53, 0x62, 0x68, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x79, 0x72, 0x6e,</div><div class='add'>+0x69, 0x67, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x68, 0x77, 0x61, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e,</div><div class='add'>+0x20, 0x41, 0x331, 0x74, 0x61, 0x74, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x6e, 0x61, 0x61, 0x69, 0x3b,</div><div class='add'>+0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x70, 0x66, 0x77, 0x6f, 0x6e, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20,</div><div class='add'>+0x41, 0x331, 0x6b, 0x69, 0x74, 0x61, 0x74, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x74, 0x79, 0x69, 0x72,</div><div class='add'>+0x69, 0x6e, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x41, 0x331, 0x6e, 0x69, 0x6e, 0x61, 0x69, 0x3b, 0x48, 0x79, 0x77,</div><div class='add'>+0x61, 0x6e, 0x20, 0x41, 0x331, 0x6b, 0x75, 0x6d, 0x76, 0x69, 0x72, 0x69, 0x79, 0x69, 0x6e, 0x3b, 0x48, 0x79, 0x77, 0x61,</div><div class='add'>+0x6e, 0x20, 0x53, 0x77, 0x61, 0x6b, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x53, 0x77, 0x61, 0x6b, 0x20, 0x42, 0x27,</div><div class='add'>+0x61, 0x331, 0x79, 0x72, 0x6e, 0x69, 0x67, 0x3b, 0x48, 0x79, 0x77, 0x61, 0x6e, 0x20, 0x53, 0x77, 0x61, 0x6b, 0x20, 0x42,</div><div class='add'>+0x27, 0x61, 0x331, 0x68, 0x77, 0x61, 0x3b, 0x5a, 0x65, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41,</div><div class='add'>+0x76, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x67, 0x3b, 0x4c, 0x75, 0x69, 0x3b, 0x41, 0x76, 0x6f, 0x3b, 0x53,</div><div class='add'>+0x65, 0x74, 0x3b, 0x4f, 0x74, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x63, 0x3b, 0x5a, 0x65, 0x6e, 0xe2, 0x72,</div><div class='add'>+0x3b, 0x46, 0x65, 0x76, 0x72, 0xe2, 0x72, 0x3b, 0x4d, 0x61, 0x72, 0xe7, 0x3b, 0x41, 0x76, 0x72, 0xee, 0x6c, 0x3b, 0x4d,</div><div class='add'>+0x61, 0x69, 0x3b, 0x4a, 0x75, 0x67, 0x6e, 0x3b, 0x4c, 0x75, 0x69, 0x3b, 0x41, 0x76, 0x6f, 0x73, 0x74, 0x3b, 0x53, 0x65,</div><div class='add'>+0x74, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x4f, 0x74, 0x75, 0x62, 0x61, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62,</div><div class='add'>+0x61, 0x72, 0x3b, 0x44, 0x69, 0x63, 0x65, 0x6d, 0x62, 0x61, 0x72, 0x3b, 0x5a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b,</div><div class='add'>+0x4d, 0x3b, 0x4a, 0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x50, 0x68, 0x61, 0x3b,</div><div class='add'>+0x4c, 0x75, 0x68, 0x3b, 0x1e70, 0x68, 0x61, 0x3b, 0x4c, 0x61, 0x6d, 0x3b, 0x53, 0x68, 0x75, 0x3b, 0x4c, 0x77, 0x69, 0x3b,</div><div class='add'>+0x4c, 0x77, 0x61, 0x3b, 0x1e70, 0x68, 0x61, 0x3b, 0x4b, 0x68, 0x75, 0x3b, 0x54, 0x73, 0x68, 0x3b, 0x1e3c, 0x61, 0x72, 0x3b,</div><div class='add'>+0x4e, 0x79, 0x65, 0x3b, 0x50, 0x68, 0x61, 0x6e, 0x64, 0x6f, 0x3b, 0x4c, 0x75, 0x68, 0x75, 0x68, 0x69, 0x3b, 0x1e70, 0x68,</div><div class='add'>+0x61, 0x66, 0x61, 0x6d, 0x75, 0x68, 0x77, 0x65, 0x3b, 0x4c, 0x61, 0x6d, 0x62, 0x61, 0x6d, 0x61, 0x69, 0x3b, 0x53, 0x68,</div><div class='add'>+0x75, 0x6e, 0x64, 0x75, 0x6e, 0x74, 0x68, 0x75, 0x6c, 0x65, 0x3b, 0x46, 0x75, 0x6c, 0x77, 0x69, 0x3b, 0x46, 0x75, 0x6c,</div><div class='add'>+0x77, 0x61, 0x6e, 0x61, 0x3b, 0x1e70, 0x68, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x65, 0x3b, 0x4b, 0x68, 0x75, 0x62, 0x76, 0x75,</div><div class='add'>+0x6d, 0x65, 0x64, 0x7a, 0x69, 0x3b, 0x54, 0x73, 0x68, 0x69, 0x6d, 0x65, 0x64, 0x7a, 0x69, 0x3b, 0x1e3c, 0x61, 0x72, 0x61,</div><div class='add'>+0x3b, 0x4e, 0x79, 0x65, 0x6e, 0x64, 0x61, 0x76, 0x68, 0x75, 0x73, 0x69, 0x6b, 0x75, 0x3b, 0x44, 0x7a, 0x76, 0x3b, 0x44,</div><div class='add'>+0x7a, 0x64, 0x3b, 0x54, 0x65, 0x64, 0x3b, 0x41, 0x66, 0x254, 0x3b, 0x44, 0x61, 0x6d, 0x3b, 0x4d, 0x61, 0x73, 0x3b, 0x53,</div><div class='add'>+0x69, 0x61, 0x3b, 0x44, 0x65, 0x61, 0x3b, 0x41, 0x6e, 0x79, 0x3b, 0x4b, 0x65, 0x6c, 0x3b, 0x41, 0x64, 0x65, 0x3b, 0x44,</div><div class='add'>+0x7a, 0x6d, 0x3b, 0x44, 0x7a, 0x6f, 0x76, 0x65, 0x3b, 0x44, 0x7a, 0x6f, 0x64, 0x7a, 0x65, 0x3b, 0x54, 0x65, 0x64, 0x6f,</div><div class='add'>+0x78, 0x65, 0x3b, 0x41, 0x66, 0x254, 0x66, 0x69, 0x25b, 0x3b, 0x44, 0x61, 0x6d, 0x61, 0x3b, 0x4d, 0x61, 0x73, 0x61, 0x3b,</div><div class='add'>+0x53, 0x69, 0x61, 0x6d, 0x6c, 0x254, 0x6d, 0x3b, 0x44, 0x65, 0x61, 0x73, 0x69, 0x61, 0x6d, 0x69, 0x6d, 0x65, 0x3b, 0x41,</div><div class='add'>+0x6e, 0x79, 0x254, 0x6e, 0x79, 0x254, 0x3b, 0x4b, 0x65, 0x6c, 0x65, 0x3b, 0x41, 0x64, 0x65, 0x25b, 0x6d, 0x65, 0x6b, 0x70,</div><div class='add'>+0x254, 0x78, 0x65, 0x3b, 0x44, 0x7a, 0x6f, 0x6d, 0x65, 0x3b, 0x44, 0x3b, 0x44, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x44, 0x3b,</div><div class='add'>+0x4d, 0x3b, 0x53, 0x3b, 0x44, 0x3b, 0x41, 0x3b, 0x4b, 0x3b, 0x41, 0x3b, 0x44, 0x3b, 0x49, 0x61, 0x6e, 0x2e, 0x3b, 0x50,</div><div class='add'>+0x65, 0x70, 0x2e, 0x3b, 0x4d, 0x61, 0x6c, 0x2e, 0x3b, 0x2bb, 0x41, 0x70, 0x2e, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x49, 0x75,</div><div class='add'>+0x6e, 0x2e, 0x3b, 0x49, 0x75, 0x6c, 0x2e, 0x3b, 0x2bb, 0x41, 0x75, 0x2e, 0x3b, 0x4b, 0x65, 0x70, 0x2e, 0x3b, 0x2bb, 0x4f,</div><div class='add'>+0x6b, 0x2e, 0x3b, 0x4e, 0x6f, 0x77, 0x2e, 0x3b, 0x4b, 0x65, 0x6b, 0x2e, 0x3b, 0x49, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x69,</div><div class='add'>+0x3b, 0x50, 0x65, 0x70, 0x65, 0x6c, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x6b, 0x69, 0x3b, 0x2bb, 0x41,</div><div class='add'>+0x70, 0x65, 0x6c, 0x69, 0x6c, 0x61, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x49, 0x75, 0x6e, 0x65, 0x3b, 0x49, 0x75, 0x6c, 0x61,</div><div class='add'>+0x69, 0x3b, 0x2bb, 0x41, 0x75, 0x6b, 0x61, 0x6b, 0x65, 0x3b, 0x4b, 0x65, 0x70, 0x61, 0x6b, 0x65, 0x6d, 0x61, 0x70, 0x61,</div><div class='add'>+0x3b, 0x2bb, 0x4f, 0x6b, 0x61, 0x6b, 0x6f, 0x70, 0x61, 0x3b, 0x4e, 0x6f, 0x77, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x4b,</div><div class='add'>+0x65, 0x6b, 0x65, 0x6d, 0x61, 0x70, 0x61, 0x3b, 0x4a, 0x75, 0x77, 0x3b, 0x53, 0x77, 0x69, 0x3b, 0x54, 0x73, 0x61, 0x3b,</div><div class='add'>+0x4e, 0x79, 0x61, 0x3b, 0x54, 0x73, 0x77, 0x3b, 0x41, 0x74, 0x61, 0x3b, 0x41, 0x6e, 0x61, 0x3b, 0x41, 0x72, 0x69, 0x3b,</div><div class='add'>+0x41, 0x6b, 0x75, 0x3b, 0x53, 0x77, 0x61, 0x3b, 0x4d, 0x61, 0x6e, 0x3b, 0x4d, 0x61, 0x73, 0x3b, 0x5a, 0x77, 0x61, 0x74,</div><div class='add'>+0x20, 0x4a, 0x75, 0x77, 0x75, 0x6e, 0x67, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x53, 0x77, 0x69, 0x79, 0x61, 0x6e, 0x67,</div><div class='add'>+0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x54, 0x73, 0x61, 0x74, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x4e, 0x79, 0x61, 0x69,</div><div class='add'>+0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x54, 0x73, 0x77, 0x6f, 0x6e, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x41, 0x74, 0x61,</div><div class='add'>+0x61, 0x68, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x41, 0x6e, 0x61, 0x74, 0x61, 0x74, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20,</div><div class='add'>+0x41, 0x72, 0x69, 0x6e, 0x61, 0x69, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x41, 0x6b, 0x75, 0x62, 0x75, 0x6e, 0x79, 0x75,</div><div class='add'>+0x6e, 0x67, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x53, 0x77, 0x61, 0x67, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x4d, 0x61,</div><div class='add'>+0x6e, 0x67, 0x6a, 0x75, 0x77, 0x61, 0x6e, 0x67, 0x3b, 0x5a, 0x77, 0x61, 0x74, 0x20, 0x53, 0x77, 0x61, 0x67, 0x2d, 0x4d,</div><div class='add'>+0x61, 0x2d, 0x53, 0x75, 0x79, 0x61, 0x6e, 0x67, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x6c,</div><div class='add'>+0x3b, 0x45, 0x70, 0x75, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x61,</div><div class='add'>+0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x75, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e,</div><div class='add'>+0x75, 0x77, 0x61, 0x6c, 0x65, 0x3b, 0x46, 0x65, 0x62, 0x75, 0x6c, 0x75, 0x77, 0x61, 0x6c, 0x65, 0x3b, 0x4d, 0x61, 0x6c,</div><div class='add'>+0x69, 0x63, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x75, 0x6c, 0x6f, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b,</div><div class='add'>+0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x4f, 0x67, 0x61, 0x73, 0x69, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x75, 0x74, 0x65,</div><div class='add'>+0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x75, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b,</div><div class='add'>+0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x45, 0x6e, 0x65, 0x3b, 0x50, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b,</div><div class='add'>+0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x48, 0x75, 0x6e, 0x3b, 0x48, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b,</div><div class='add'>+0x53, 0x65, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x45, 0x6e, 0x65, 0x72,</div><div class='add'>+0x6f, 0x3b, 0x50, 0x65, 0x62, 0x72, 0x65, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69,</div><div class='add'>+0x6c, 0x3b, 0x4d, 0x61, 0x79, 0x6f, 0x3b, 0x48, 0x75, 0x6e, 0x79, 0x6f, 0x3b, 0x48, 0x75, 0x6c, 0x79, 0x6f, 0x3b, 0x41,</div><div class='add'>+0x67, 0x6f, 0x73, 0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x4f, 0x6b, 0x74, 0x75,</div><div class='add'>+0x62, 0x72, 0x65, 0x3b, 0x4e, 0x6f, 0x62, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x44, 0x69, 0x73, 0x79, 0x65, 0x6d,</div><div class='add'>+0x62, 0x72, 0x65, 0x3b, 0x45, 0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x48, 0x3b, 0x41, 0x3b,</div><div class='add'>+0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0xe4, 0x72, 0x3b,</div><div class='add'>+0x41, 0x70, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b,</div><div class='add'>+0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x7a, 0x3b, 0x4a, 0x61, 0x6e, 0x75,</div><div class='add'>+0x61, 0x72, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61, 0x72, 0x3b, 0x4d, 0xe4, 0x72, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x69,</div><div class='add'>+0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x69, 0x3b, 0x41, 0x75, 0x67, 0x75,</div><div class='add'>+0x73, 0x63, 0x68, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x74, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x6f,</div><div class='add'>+0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x7a, 0xe4, 0x6d, 0x62, 0x65,</div><div class='add'>+0x72, 0x3b, 0xa2cd, 0xa1aa, 0x3b, 0xa44d, 0xa1aa, 0x3b, 0xa315, 0xa1aa, 0x3b, 0xa1d6, 0xa1aa, 0x3b, 0xa26c, 0xa1aa, 0x3b, 0xa0d8, 0xa1aa, 0x3b,</div><div class='add'>+0xa3c3, 0xa1aa, 0x3b, 0xa246, 0xa1aa, 0x3b, 0xa22c, 0xa1aa, 0x3b, 0xa2b0, 0xa1aa, 0x3b, 0xa2b0, 0xa2aa, 0xa1aa, 0x3b, 0xa2b0, 0xa44b, 0xa1aa, 0x3b,</div><div class='add'>+0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x74, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x79, 0x3b,</div><div class='add'>+0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x72, 0x68, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b,</div><div class='add'>+0x55, 0x73, 0x69, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x61, 0x62, 0x61, 0x72, 0x69, 0x3b, 0x75, 0x46, 0x65,</div><div class='add'>+0x62, 0x65, 0x72, 0x62, 0x61, 0x72, 0x69, 0x3b, 0x75, 0x4d, 0x61, 0x74, 0x6a, 0x68, 0x69, 0x3b, 0x75, 0x2d, 0x41, 0x70,</div><div class='add'>+0x72, 0x65, 0x6c, 0x69, 0x3b, 0x4d, 0x65, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x79,</div><div class='add'>+0x69, 0x3b, 0x41, 0x72, 0x68, 0x6f, 0x73, 0x74, 0x6f, 0x73, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61,</div><div class='add'>+0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x55, 0x73, 0x69, 0x6e, 0x79, 0x69, 0x6b, 0x68, 0x61, 0x62, 0x61, 0x3b,</div><div class='add'>+0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x74, 0x3b,</div><div class='add'>+0x41, 0x70, 0x6f, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b,</div><div class='add'>+0x53, 0x65, 0x74, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x66, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x61,</div><div class='add'>+0x77, 0x61, 0x72, 0x65, 0x3b, 0x46, 0x65, 0x62, 0x65, 0x72, 0x77, 0x61, 0x72, 0x65, 0x3b, 0x4d, 0x61, 0x74, 0x161, 0x68,</div><div class='add'>+0x65, 0x3b, 0x41, 0x70, 0x6f, 0x72, 0x65, 0x6c, 0x65, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x65, 0x3b, 0x4a,</div><div class='add'>+0x75, 0x6c, 0x61, 0x65, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, 0x73, 0x65, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x65,</div><div class='add'>+0x72, 0x65, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x6f, 0x72, 0x65, 0x3b, 0x4e, 0x6f, 0x66, 0x65, 0x6d, 0x65, 0x72, 0x65,</div><div class='add'>+0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x65, 0x72, 0x65, 0x3b, 0x6f, 0x111, 0x111, 0x61, 0x6a, 0x61, 0x67, 0x65, 0x3b, 0x67,</div><div class='add'>+0x75, 0x6f, 0x76, 0x76, 0x61, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x10d, 0x61, 0x3b, 0x63, 0x75, 0x6f, 0x14b, 0x6f, 0x3b, 0x6d,</div><div class='add'>+0x69, 0x65, 0x73, 0x73, 0x65, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x73, 0x65, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x64, 0x6e, 0x65,</div><div class='add'>+0x3b, 0x62, 0x6f, 0x72, 0x67, 0x65, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x61, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x67, 0x6f, 0x74,</div><div class='add'>+0x3b, 0x73, 0x6b, 0xe1, 0x62, 0x6d, 0x61, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c, 0x61, 0x3b, 0x6f, 0x111, 0x111, 0x61, 0x6a,</div><div class='add'>+0x61, 0x67, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x76, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75,</div><div class='add'>+0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x10d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x63, 0x75, 0x6f, 0x14b, 0x6f, 0x6d, 0xe1,</div><div class='add'>+0x6e, 0x6e, 0x75, 0x3b, 0x6d, 0x69, 0x65, 0x73, 0x73, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x67, 0x65, 0x61, 0x73,</div><div class='add'>+0x73, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x64, 0x6e, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75,</div><div class='add'>+0x3b, 0x62, 0x6f, 0x72, 0x67, 0x65, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x61, 0x6d, 0xe1, 0x6e,</div><div class='add'>+0x6e, 0x75, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x67, 0x6f, 0x74, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x73, 0x6b, 0xe1, 0x62,</div><div class='add'>+0x6d, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b, 0x6a, 0x75, 0x6f, 0x76, 0x6c, 0x61, 0x6d, 0xe1, 0x6e, 0x6e, 0x75, 0x3b,</div><div class='add'>+0x4f, 0x3b, 0x47, 0x3b, 0x4e, 0x3b, 0x43, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x42, 0x3b, 0x10c, 0x3b, 0x47, 0x3b,</div><div class='add'>+0x53, 0x3b, 0x4a, 0x3b, 0x6f, 0x111, 0x111, 0x6a, 0x3b, 0x67, 0x75, 0x6f, 0x76, 0x3b, 0x6e, 0x6a, 0x75, 0x6b, 0x3b, 0x63,</div><div class='add'>+0x75, 0x6f, 0x3b, 0x6d, 0x69, 0x65, 0x73, 0x3b, 0x67, 0x65, 0x61, 0x73, 0x3b, 0x73, 0x75, 0x6f, 0x69, 0x3b, 0x62, 0x6f,</div><div class='add'>+0x72, 0x67, 0x3b, 0x10d, 0x61, 0x6b, 0x10d, 0x3b, 0x67, 0x6f, 0x6c, 0x67, 0x3b, 0x73, 0x6b, 0xe1, 0x62, 0x3b, 0x6a, 0x75,</div><div class='add'>+0x6f, 0x76, 0x3b, 0x4b, 0x69, 0x69, 0x3b, 0x44, 0x68, 0x69, 0x3b, 0x54, 0x72, 0x69, 0x3b, 0x53, 0x70, 0x69, 0x3b, 0x52,</div><div class='add'>+0x69, 0x69, 0x3b, 0x4d, 0x74, 0x69, 0x3b, 0x45, 0x6d, 0x69, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4d, 0x6e, 0x69, 0x3b, 0x4d,</div><div class='add'>+0x78, 0x69, 0x3b, 0x4d, 0x78, 0x6b, 0x3b, 0x4d, 0x78, 0x64, 0x3b, 0x4b, 0x69, 0x6e, 0x67, 0x61, 0x6c, 0x20, 0x69, 0x64,</div><div class='add'>+0x61, 0x73, 0x3b, 0x44, 0x68, 0x61, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x54, 0x72, 0x75, 0x20, 0x69, 0x64, 0x61, 0x73,</div><div class='add'>+0x3b, 0x53, 0x70, 0x61, 0x74, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x52, 0x69, 0x6d, 0x61, 0x20, 0x69, 0x64, 0x61, 0x73,</div><div class='add'>+0x3b, 0x4d, 0x61, 0x74, 0x61, 0x72, 0x75, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x45, 0x6d, 0x70, 0x69, 0x74, 0x75, 0x20,</div><div class='add'>+0x69, 0x64, 0x61, 0x73, 0x3b, 0x4d, 0x61, 0x73, 0x70, 0x61, 0x74, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4d, 0x6e, 0x67,</div><div class='add'>+0x61, 0x72, 0x69, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4d, 0x61, 0x78, 0x61, 0x6c, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b,</div><div class='add'>+0x4d, 0x61, 0x78, 0x61, 0x6c, 0x20, 0x6b, 0x69, 0x6e, 0x67, 0x61, 0x6c, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4d, 0x61,</div><div class='add'>+0x78, 0x61, 0x6c, 0x20, 0x64, 0x68, 0x61, 0x20, 0x69, 0x64, 0x61, 0x73, 0x3b, 0x4b, 0x3b, 0x44, 0x3b, 0x54, 0x3b, 0x53,</div><div class='add'>+0x3b, 0x52, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x50, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x44, 0x3b, 0x43, 0x61, 0x6e,</div><div class='add'>+0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e,</div><div class='add'>+0x3b, 0x43, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x74, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62,</div><div class='add'>+0x3b, 0x44, 0x69, 0x73, 0x3b, 0x43, 0x68, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x75, 0x72, 0x61,</div><div class='add'>+0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x69, 0x72, 0x69, 0x72, 0x69, 0x3b, 0x4d, 0x65, 0x69,</div><div class='add'>+0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x43, 0x68, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x69, 0x3b,</div><div class='add'>+0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x69, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x62,</div><div class='add'>+0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x43, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41,</div><div class='add'>+0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x43, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x49, 0x6d, 0x62,</div><div class='add'>+0x3b, 0x4b, 0x61, 0x77, 0x3b, 0x4b, 0x61, 0x64, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x4b, 0x61, 0x72,</div><div class='add'>+0x3b, 0x4d, 0x66, 0x75, 0x3b, 0x57, 0x75, 0x6e, 0x3b, 0x49, 0x6b, 0x65, 0x3b, 0x49, 0x6b, 0x75, 0x3b, 0x49, 0x6d, 0x77,</div><div class='add'>+0x3b, 0x49, 0x77, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6d, 0x62, 0x69, 0x72,</div><div class='add'>+0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x77, 0x69, 0x3b, 0x4d, 0x6f, 0x72,</div><div class='add'>+0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x64, 0x61, 0x64, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67,</div><div class='add'>+0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b,</div><div class='add'>+0x61, 0x73, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x72, 0x61,</div><div class='add'>+0x6e, 0x64, 0x61, 0x64, 0x75, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x6d, 0x66, 0x75, 0x6e,</div><div class='add'>+0x67, 0x61, 0x64, 0x65, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x77, 0x75, 0x6e, 0x79, 0x61,</div><div class='add'>+0x6e, 0x79, 0x61, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x65, 0x6e, 0x64, 0x61,</div><div class='add'>+0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x6f, 0x72,</div><div class='add'>+0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x6d, 0x77, 0x65,</div><div class='add'>+0x72, 0x69, 0x3b, 0x4d, 0x6f, 0x72, 0x69, 0x20, 0x67, 0x68, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e,</div><div class='add'>+0x61, 0x20, 0x69, 0x77, 0x69, 0x3b, 0x49, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b,</div><div class='add'>+0x57, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x73, 0x69, 0x69, 0x3b, 0x63, 0x6f, 0x6c, 0x3b, 0x6d, 0x62,</div><div class='add'>+0x6f, 0x3b, 0x73, 0x65, 0x65, 0x3b, 0x64, 0x75, 0x75, 0x3b, 0x6b, 0x6f, 0x72, 0x3b, 0x6d, 0x6f, 0x72, 0x3b, 0x6a, 0x75,</div><div class='add'>+0x6b, 0x3b, 0x73, 0x6c, 0x74, 0x3b, 0x79, 0x61, 0x72, 0x3b, 0x6a, 0x6f, 0x6c, 0x3b, 0x62, 0x6f, 0x77, 0x3b, 0x73, 0x69,</div><div class='add'>+0x69, 0x6c, 0x6f, 0x3b, 0x63, 0x6f, 0x6c, 0x74, 0x65, 0x3b, 0x6d, 0x62, 0x6f, 0x6f, 0x79, 0x3b, 0x73, 0x65, 0x65, 0x257,</div><div class='add'>+0x74, 0x6f, 0x3b, 0x64, 0x75, 0x75, 0x6a, 0x61, 0x6c, 0x3b, 0x6b, 0x6f, 0x72, 0x73, 0x65, 0x3b, 0x6d, 0x6f, 0x72, 0x73,</div><div class='add'>+0x6f, 0x3b, 0x6a, 0x75, 0x6b, 0x6f, 0x3b, 0x73, 0x69, 0x69, 0x6c, 0x74, 0x6f, 0x3b, 0x79, 0x61, 0x72, 0x6b, 0x6f, 0x6d,</div><div class='add'>+0x61, 0x61, 0x3b, 0x6a, 0x6f, 0x6c, 0x61, 0x6c, 0x3b, 0x62, 0x6f, 0x77, 0x74, 0x65, 0x3b, 0x73, 0x3b, 0x63, 0x3b, 0x6d,</div><div class='add'>+0x3b, 0x73, 0x3b, 0x64, 0x3b, 0x6b, 0x3b, 0x6d, 0x3b, 0x6a, 0x3b, 0x73, 0x3b, 0x79, 0x3b, 0x6a, 0x3b, 0x62, 0x3b, 0x4a,</div><div class='add'>+0x45, 0x4e, 0x3b, 0x57, 0x4b, 0x52, 0x3b, 0x57, 0x47, 0x54, 0x3b, 0x57, 0x4b, 0x4e, 0x3b, 0x57, 0x54, 0x4e, 0x3b, 0x57,</div><div class='add'>+0x54, 0x44, 0x3b, 0x57, 0x4d, 0x4a, 0x3b, 0x57, 0x4e, 0x4e, 0x3b, 0x57, 0x4b, 0x44, 0x3b, 0x57, 0x49, 0x4b, 0x3b, 0x57,</div><div class='add'>+0x4d, 0x57, 0x3b, 0x44, 0x49, 0x54, 0x3b, 0x4e, 0x6a, 0x65, 0x6e, 0x75, 0x61, 0x72, 0x129, 0x3b, 0x4d, 0x77, 0x65, 0x72,</div><div class='add'>+0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65, 0x72, 0x129, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67,</div><div class='add'>+0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b,</div><div class='add'>+0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x72,</div><div class='add'>+0x65, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65,</div><div class='add'>+0x20, 0x77, 0x61, 0x20, 0x6d, 0x169, 0x67, 0x77, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77,</div><div class='add'>+0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x65,</div><div class='add'>+0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x3b, 0x4d,</div><div class='add'>+0x77, 0x65, 0x72, 0x65, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x169, 0x6d, 0x77,</div><div class='add'>+0x65, 0x3b, 0x4e, 0x64, 0x69, 0x74, 0x68, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x4b, 0x3b, 0x47, 0x3b, 0x4b, 0x3b,</div><div class='add'>+0x47, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x44, 0x3b, 0x4f, 0x62, 0x6f, 0x3b,</div><div class='add'>+0x57, 0x61, 0x61, 0x3b, 0x4f, 0x6b, 0x75, 0x3b, 0x4f, 0x6e, 0x67, 0x3b, 0x49, 0x6d, 0x65, 0x3b, 0x49, 0x6c, 0x65, 0x3b,</div><div class='add'>+0x53, 0x61, 0x70, 0x3b, 0x49, 0x73, 0x69, 0x3b, 0x53, 0x61, 0x61, 0x3b, 0x54, 0x6f, 0x6d, 0x3b, 0x54, 0x6f, 0x62, 0x3b,</div><div class='add'>+0x54, 0x6f, 0x77, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f, 0x62, 0x6f, 0x3b, 0x4c, 0x61, 0x70, 0x61,</div><div class='add'>+0x20, 0x6c, 0x65, 0x20, 0x77, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f, 0x6b,</div><div class='add'>+0x75, 0x6e, 0x69, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x6f, 0x6e, 0x67, 0x27, 0x77, 0x61, 0x6e, 0x3b,</div><div class='add'>+0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x6d, 0x65, 0x74, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65,</div><div class='add'>+0x20, 0x69, 0x6c, 0x65, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x73, 0x61, 0x70, 0x61, 0x3b, 0x4c, 0x61,</div><div class='add'>+0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x69, 0x73, 0x69, 0x65, 0x74, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20,</div><div class='add'>+0x73, 0x61, 0x61, 0x6c, 0x3b, 0x4c, 0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x3b, 0x4c,</div><div class='add'>+0x61, 0x70, 0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x6f, 0x62, 0x6f, 0x3b, 0x4c, 0x61, 0x70,</div><div class='add'>+0x61, 0x20, 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x6d, 0x6f, 0x6e, 0x20, 0x77, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x4f, 0x3b, 0x57,</div><div class='add'>+0x3b, 0x4f, 0x3b, 0x4f, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x54,</div><div class='add'>+0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69,</div><div class='add'>+0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x75, 0x67, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x75,</div><div class='add'>+0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x4a, 0x61, 0x6e, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x46, 0x65, 0x76,</div><div class='add'>+0x72, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x63, 0x6f, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61,</div><div class='add'>+0x69, 0x6f, 0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x6f, 0x3b, 0x4a, 0x75, 0x6c, 0x68, 0x6f, 0x3b, 0x41, 0x75, 0x67, 0x75, 0x73,</div><div class='add'>+0x74, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x4f, 0x74, 0x75, 0x62, 0x72, 0x6f, 0x3b, 0x4e,</div><div class='add'>+0x6f, 0x76, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x44, 0x65, 0x63, 0x65, 0x6d, 0x62, 0x72, 0x6f, 0x3b, 0x5a, 0x69, 0x62,</div><div class='add'>+0x3b, 0x4e, 0x68, 0x6c, 0x3b, 0x4d, 0x62, 0x69, 0x3b, 0x4d, 0x61, 0x62, 0x3b, 0x4e, 0x6b, 0x77, 0x3b, 0x4e, 0x68, 0x6c,</div><div class='add'>+0x3b, 0x4e, 0x74, 0x75, 0x3b, 0x4e, 0x63, 0x77, 0x3b, 0x4d, 0x70, 0x61, 0x3b, 0x4d, 0x66, 0x75, 0x3b, 0x4c, 0x77, 0x65,</div><div class='add'>+0x3b, 0x4d, 0x70, 0x61, 0x3b, 0x5a, 0x69, 0x62, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x6c, 0x61, 0x3b, 0x4e, 0x68, 0x6c, 0x6f,</div><div class='add'>+0x6c, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x62, 0x69, 0x6d, 0x62, 0x69, 0x74, 0x68, 0x6f, 0x3b, 0x4d, 0x61, 0x62, 0x61,</div><div class='add'>+0x73, 0x61, 0x3b, 0x4e, 0x6b, 0x77, 0x65, 0x6e, 0x6b, 0x77, 0x65, 0x7a, 0x69, 0x3b, 0x4e, 0x68, 0x6c, 0x61, 0x6e, 0x67,</div><div class='add'>+0x75, 0x6c, 0x61, 0x3b, 0x4e, 0x74, 0x75, 0x6c, 0x69, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x4e, 0x63, 0x77, 0x61, 0x62, 0x61,</div><div class='add'>+0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x4d, 0x70, 0x61, 0x6e, 0x64, 0x75, 0x6c, 0x61, 0x3b, 0x4d, 0x66, 0x75, 0x6d, 0x66, 0x75,</div><div class='add'>+0x3b, 0x4c, 0x77, 0x65, 0x7a, 0x69, 0x3b, 0x4d, 0x70, 0x61, 0x6c, 0x61, 0x6b, 0x61, 0x7a, 0x69, 0x3b, 0x5a, 0x3b, 0x4e,</div><div class='add'>+0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4c, 0x3b, 0x4d,</div><div class='add'>+0x3b, 0x4d, 0x31, 0x3b, 0x4d, 0x32, 0x3b, 0x4d, 0x33, 0x3b, 0x4d, 0x34, 0x3b, 0x4d, 0x35, 0x3b, 0x4d, 0x36, 0x3b, 0x4d,</div><div class='add'>+0x37, 0x3b, 0x4d, 0x38, 0x3b, 0x4d, 0x39, 0x3b, 0x4d, 0x31, 0x30, 0x3b, 0x4d, 0x31, 0x31, 0x3b, 0x4d, 0x31, 0x32, 0x3b,</div><div class='add'>+0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x77, 0x61, 0x6e, 0x7a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72,</div><div class='add'>+0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20,</div><div class='add'>+0x6b, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x61, 0x6e,</div><div class='add'>+0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x74, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x72,</div><div class='add'>+0x69, 0x20, 0x77, 0x61, 0x20, 0x73, 0x69, 0x74, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x73,</div><div class='add'>+0x61, 0x62, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6e, 0x61, 0x6e, 0x65, 0x3b, 0x4d, 0x77,</div><div class='add'>+0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x74, 0x69, 0x73, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61,</div><div class='add'>+0x20, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x75, 0x6d,</div><div class='add'>+0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x6f, 0x6a, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69,</div><div class='add'>+0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b,</div><div class='add'>+0x4b, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x69, 0x6e,</div><div class='add'>+0x6e, 0x3b, 0x62, 0x1e5b, 0x61, 0x3b, 0x6d, 0x61, 0x1e5b, 0x3b, 0x69, 0x62, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x3b, 0x79, 0x75,</div><div class='add'>+0x6e, 0x3b, 0x79, 0x75, 0x6c, 0x3b, 0x263, 0x75, 0x63, 0x3b, 0x63, 0x75, 0x74, 0x3b, 0x6b, 0x74, 0x75, 0x3b, 0x6e, 0x75,</div><div class='add'>+0x77, 0x3b, 0x64, 0x75, 0x6a, 0x3b, 0x69, 0x6e, 0x6e, 0x61, 0x79, 0x72, 0x3b, 0x62, 0x1e5b, 0x61, 0x79, 0x1e5b, 0x3b, 0x6d,</div><div class='add'>+0x61, 0x1e5b, 0x1e63, 0x3b, 0x69, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x6d, 0x61, 0x79, 0x79, 0x75, 0x3b, 0x79, 0x75, 0x6e, 0x79,</div><div class='add'>+0x75, 0x3b, 0x79, 0x75, 0x6c, 0x79, 0x75, 0x7a, 0x3b, 0x263, 0x75, 0x63, 0x74, 0x3b, 0x63, 0x75, 0x74, 0x61, 0x6e, 0x62,</div><div class='add'>+0x69, 0x72, 0x3b, 0x6b, 0x74, 0x75, 0x62, 0x72, 0x3b, 0x6e, 0x75, 0x77, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x64, 0x75,</div><div class='add'>+0x6a, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x69, 0x3b, 0x62, 0x3b, 0x6d, 0x3b, 0x69, 0x3b, 0x6d, 0x3b, 0x79, 0x3b, 0x79,</div><div class='add'>+0x3b, 0x263, 0x3b, 0x63, 0x3b, 0x6b, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x2d49, 0x2d4f, 0x2d4f, 0x3b, 0x2d31, 0x2d55, 0x2d30, 0x3b, 0x2d4e,</div><div class='add'>+0x2d30, 0x2d55, 0x3b, 0x2d49, 0x2d31, 0x2d54, 0x3b, 0x2d4e, 0x2d30, 0x2d62, 0x3b, 0x2d62, 0x2d53, 0x2d4f, 0x3b, 0x2d62, 0x2d53, 0x2d4d, 0x3b, 0x2d56,</div><div class='add'>+0x2d53, 0x2d5b, 0x3b, 0x2d5b, 0x2d53, 0x2d5c, 0x3b, 0x2d3d, 0x2d5c, 0x2d53, 0x3b, 0x2d4f, 0x2d53, 0x2d61, 0x3b, 0x2d37, 0x2d53, 0x2d4a, 0x3b, 0x2d49,</div><div class='add'>+0x2d4f, 0x2d4f, 0x2d30, 0x2d62, 0x2d54, 0x3b, 0x2d31, 0x2d55, 0x2d30, 0x2d62, 0x2d55, 0x3b, 0x2d4e, 0x2d30, 0x2d55, 0x2d5a, 0x3b, 0x2d49, 0x2d31, 0x2d54,</div><div class='add'>+0x2d49, 0x2d54, 0x3b, 0x2d4e, 0x2d30, 0x2d62, 0x2d62, 0x2d53, 0x3b, 0x2d62, 0x2d53, 0x2d4f, 0x2d62, 0x2d53, 0x3b, 0x2d62, 0x2d53, 0x2d4d, 0x2d62, 0x2d53,</div><div class='add'>+0x2d63, 0x3b, 0x2d56, 0x2d53, 0x2d5b, 0x2d5c, 0x3b, 0x2d5b, 0x2d53, 0x2d5c, 0x2d30, 0x2d4f, 0x2d31, 0x2d49, 0x2d54, 0x3b, 0x2d3d, 0x2d5c, 0x2d53, 0x2d31,</div><div class='add'>+0x2d54, 0x3b, 0x2d4f, 0x2d53, 0x2d61, 0x2d30, 0x2d4f, 0x2d31, 0x2d49, 0x2d54, 0x3b, 0x2d37, 0x2d53, 0x2d4a, 0x2d30, 0x2d4f, 0x2d31, 0x2d49, 0x2d54, 0x3b,</div><div class='add'>+0x2d49, 0x3b, 0x2d31, 0x3b, 0x2d4e, 0x3b, 0x2d49, 0x3b, 0x2d4e, 0x3b, 0x2d62, 0x3b, 0x2d62, 0x3b, 0x2d56, 0x3b, 0x2d5b, 0x3b, 0x2d3d, 0x3b,</div><div class='add'>+0x2d4f, 0x3b, 0x2d37, 0x3b, 0x59, 0x65, 0x6e, 0x3b, 0x46, 0x75, 0x72, 0x3b, 0x4d, 0x65, 0x263, 0x3b, 0x59, 0x65, 0x62, 0x3b,</div><div class='add'>+0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75, 0x6c, 0x3b, 0x194, 0x75, 0x63, 0x3b, 0x43, 0x74, 0x65, 0x3b,</div><div class='add'>+0x54, 0x75, 0x62, 0x3b, 0x4e, 0x75, 0x6e, 0x3b, 0x44, 0x75, 0x1e7, 0x3b, 0x59, 0x65, 0x6e, 0x6e, 0x61, 0x79, 0x65, 0x72,</div><div class='add'>+0x3b, 0x46, 0x75, 0x1e5b, 0x61, 0x72, 0x3b, 0x4d, 0x65, 0x263, 0x72, 0x65, 0x73, 0x3b, 0x59, 0x65, 0x62, 0x72, 0x69, 0x72,</div><div class='add'>+0x3b, 0x4d, 0x61, 0x79, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6e, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6c, 0x79, 0x75, 0x3b, 0x194,</div><div class='add'>+0x75, 0x63, 0x74, 0x3b, 0x43, 0x74, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x54, 0x75, 0x62, 0x65, 0x1e5b, 0x3b, 0x4e, 0x75,</div><div class='add'>+0x6e, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x44, 0x75, 0x1e7, 0x65, 0x6d, 0x62, 0x65, 0x1e5b, 0x3b, 0x59, 0x3b, 0x46, 0x3b,</div><div class='add'>+0x4d, 0x3b, 0x59, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x194, 0x3b, 0x43, 0x3b, 0x54, 0x3b, 0x4e, 0x3b, 0x44, 0x3b,</div><div class='add'>+0x4b, 0x42, 0x5a, 0x3b, 0x4b, 0x42, 0x52, 0x3b, 0x4b, 0x53, 0x54, 0x3b, 0x4b, 0x4b, 0x4e, 0x3b, 0x4b, 0x54, 0x4e, 0x3b,</div><div class='add'>+0x4b, 0x4d, 0x4b, 0x3b, 0x4b, 0x4d, 0x53, 0x3b, 0x4b, 0x4d, 0x4e, 0x3b, 0x4b, 0x4d, 0x4e, 0x3b, 0x4b, 0x4b, 0x4d, 0x3b,</div><div class='add'>+0x4b, 0x4e, 0x4b, 0x3b, 0x4b, 0x4e, 0x42, 0x3b, 0x4f, 0x6b, 0x77, 0x6f, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x7a, 0x61, 0x3b,</div><div class='add'>+0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61, 0x73, 0x68, 0x61,</div><div class='add'>+0x74, 0x75, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6b, 0x61, 0x74, 0x61,</div><div class='add'>+0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x61, 0x67, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61,</div><div class='add'>+0x6d, 0x75, 0x73, 0x68, 0x61, 0x6e, 0x6a, 0x75, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x75, 0x6e, 0x61, 0x61, 0x6e, 0x61,</div><div class='add'>+0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x77, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d,</div><div class='add'>+0x69, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6b, 0x75, 0x6d, 0x77, 0x65,</div><div class='add'>+0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x69, 0x62, 0x69, 0x72, 0x69, 0x3b,</div><div class='add'>+0x48, 0x75, 0x74, 0x3b, 0x56, 0x69, 0x6c, 0x3b, 0x44, 0x61, 0x74, 0x3b, 0x54, 0x61, 0x69, 0x3b, 0x48, 0x61, 0x6e, 0x3b,</div><div class='add'>+0x53, 0x69, 0x74, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4e, 0x61, 0x6e, 0x3b, 0x54, 0x69, 0x73, 0x3b, 0x4b, 0x75, 0x6d, 0x3b,</div><div class='add'>+0x4b, 0x6d, 0x6a, 0x3b, 0x4b, 0x6d, 0x62, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77,</div><div class='add'>+0x61, 0x20, 0x68, 0x75, 0x74, 0x61, 0x6c, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67,</div><div class='add'>+0x77, 0x61, 0x20, 0x77, 0x75, 0x76, 0x69, 0x6c, 0x69, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20,</div><div class='add'>+0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x64, 0x61, 0x74, 0x75, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69,</div><div class='add'>+0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x74, 0x61, 0x69, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69,</div><div class='add'>+0x20, 0x67, 0x77, 0x61, 0x20, 0x77, 0x75, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a,</div><div class='add'>+0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x73, 0x69, 0x74, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69,</div><div class='add'>+0x20, 0x67, 0x77, 0x61, 0x20, 0x73, 0x61, 0x62, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20,</div><div class='add'>+0x67, 0x77, 0x61, 0x20, 0x6e, 0x61, 0x6e, 0x65, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67,</div><div class='add'>+0x77, 0x61, 0x20, 0x74, 0x69, 0x73, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77,</div><div class='add'>+0x61, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65, 0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61,</div><div class='add'>+0x20, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x6f, 0x6a, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x77, 0x65,</div><div class='add'>+0x64, 0x7a, 0x69, 0x20, 0x67, 0x77, 0x61, 0x20, 0x6b, 0x75, 0x6d, 0x69, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x62, 0x69, 0x6c,</div><div class='add'>+0x69, 0x3b, 0x48, 0x3b, 0x56, 0x3b, 0x44, 0x3b, 0x54, 0x3b, 0x48, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b,</div><div class='add'>+0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75, 0x61,</div><div class='add'>+0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x79, 0x69, 0x3b, 0x4d, 0x65, 0x69,</div><div class='add'>+0x3b, 0x4a, 0x75, 0x6e, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x79, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x74, 0x69,</div><div class='add'>+0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76,</div><div class='add'>+0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x7a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x62,</div><div class='add'>+0x3b, 0x6e, 0x61, 0x72, 0x3b, 0x61, 0x77, 0x69, 0x3b, 0x6d, 0x25b, 0x3b, 0x7a, 0x75, 0x77, 0x3b, 0x7a, 0x75, 0x6c, 0x3b,</div><div class='add'>+0x75, 0x74, 0x69, 0x3b, 0x73, 0x25b, 0x74, 0x3b, 0x254, 0x6b, 0x75, 0x3b, 0x6e, 0x6f, 0x77, 0x3b, 0x64, 0x65, 0x73, 0x3b,</div><div class='add'>+0x7a, 0x61, 0x6e, 0x77, 0x75, 0x79, 0x65, 0x3b, 0x66, 0x65, 0x62, 0x75, 0x72, 0x75, 0x79, 0x65, 0x3b, 0x6d, 0x61, 0x72,</div><div class='add'>+0x69, 0x73, 0x69, 0x3b, 0x61, 0x77, 0x69, 0x72, 0x69, 0x6c, 0x69, 0x3b, 0x6d, 0x25b, 0x3b, 0x7a, 0x75, 0x77, 0x25b, 0x6e,</div><div class='add'>+0x3b, 0x7a, 0x75, 0x6c, 0x75, 0x79, 0x65, 0x3b, 0x75, 0x74, 0x69, 0x3b, 0x73, 0x25b, 0x74, 0x61, 0x6e, 0x62, 0x75, 0x72,</div><div class='add'>+0x75, 0x3b, 0x254, 0x6b, 0x75, 0x74, 0x254, 0x62, 0x75, 0x72, 0x75, 0x3b, 0x6e, 0x6f, 0x77, 0x61, 0x6e, 0x62, 0x75, 0x72,</div><div class='add'>+0x75, 0x3b, 0x64, 0x65, 0x73, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x75, 0x3b, 0x5a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b,</div><div class='add'>+0x4d, 0x3b, 0x5a, 0x3b, 0x5a, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x186, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4d, 0x62, 0x65, 0x3b,</div><div class='add'>+0x4b, 0x61, 0x69, 0x3b, 0x4b, 0x61, 0x74, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x47, 0x61, 0x74, 0x3b, 0x47, 0x61, 0x6e, 0x3b,</div><div class='add'>+0x4d, 0x75, 0x67, 0x3b, 0x4b, 0x6e, 0x6e, 0x3b, 0x4b, 0x65, 0x6e, 0x3b, 0x49, 0x6b, 0x75, 0x3b, 0x49, 0x6d, 0x77, 0x3b,</div><div class='add'>+0x49, 0x67, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x62, 0x65, 0x72, 0x65, 0x3b, 0x4d,</div><div class='add'>+0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x129, 0x72, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20,</div><div class='add'>+0x77, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x68, 0x61, 0x74, 0x169, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20,</div><div class='add'>+0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x6f,</div><div class='add'>+0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x74, 0x61, 0x74, 0x169, 0x3b,</div><div class='add'>+0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6d, 0x169, 0x67, 0x77, 0x61, 0x6e, 0x6a, 0x61, 0x3b, 0x4d, 0x77,</div><div class='add'>+0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x6e, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20,</div><div class='add'>+0x77, 0x61, 0x20, 0x6b, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b,</div><div class='add'>+0x169, 0x6d, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d, 0x69, 0x20, 0x6e,</div><div class='add'>+0x61, 0x20, 0x169, 0x6d, 0x77, 0x65, 0x3b, 0x4d, 0x77, 0x65, 0x72, 0x69, 0x20, 0x77, 0x61, 0x20, 0x69, 0x6b, 0x169, 0x6d,</div><div class='add'>+0x69, 0x20, 0x6e, 0x61, 0x20, 0x4b, 0x61, 0x129, 0x72, 0x129, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x47,</div><div class='add'>+0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x13a4, 0x13c3, 0x3b, 0x13a7, 0x13a6,</div><div class='add'>+0x3b, 0x13a0, 0x13c5, 0x3b, 0x13a7, 0x13ec, 0x3b, 0x13a0, 0x13c2, 0x3b, 0x13d5, 0x13ad, 0x3b, 0x13ab, 0x13f0, 0x3b, 0x13a6, 0x13b6, 0x3b, 0x13da,</div><div class='add'>+0x13b5, 0x3b, 0x13da, 0x13c2, 0x3b, 0x13c5, 0x13d3, 0x3b, 0x13a4, 0x13cd, 0x3b, 0x13a4, 0x13c3, 0x13b8, 0x13d4, 0x13c5, 0x3b, 0x13a7, 0x13a6, 0x13b5,</div><div class='add'>+0x3b, 0x13a0, 0x13c5, 0x13f1, 0x3b, 0x13a7, 0x13ec, 0x13c2, 0x3b, 0x13a0, 0x13c2, 0x13cd, 0x13ac, 0x13d8, 0x3b, 0x13d5, 0x13ad, 0x13b7, 0x13f1, 0x3b,</div><div class='add'>+0x13ab, 0x13f0, 0x13c9, 0x13c2, 0x3b, 0x13a6, 0x13b6, 0x13c2, 0x3b, 0x13da, 0x13b5, 0x13cd, 0x13d7, 0x3b, 0x13da, 0x13c2, 0x13c5, 0x13d7, 0x3b, 0x13c5,</div><div class='add'>+0x13d3, 0x13d5, 0x13c6, 0x3b, 0x13a4, 0x13cd, 0x13a9, 0x13f1, 0x3b, 0x13a4, 0x3b, 0x13a7, 0x3b, 0x13a0, 0x3b, 0x13a7, 0x3b, 0x13a0, 0x3b, 0x13d5,</div><div class='add'>+0x3b, 0x13ab, 0x3b, 0x13a6, 0x3b, 0x13da, 0x3b, 0x13da, 0x3b, 0x13c5, 0x3b, 0x13a4, 0x3b, 0x7a, 0x61, 0x6e, 0x3b, 0x66, 0x65, 0x76,</div><div class='add'>+0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x61, 0x76, 0x72, 0x3b, 0x6d, 0x65, 0x3b, 0x7a, 0x69, 0x6e, 0x3b, 0x7a, 0x69, 0x6c, 0x3b,</div><div class='add'>+0x6f, 0x75, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x3b, 0x6f, 0x6b, 0x74, 0x3b, 0x6e, 0x6f, 0x76, 0x3b, 0x64, 0x65, 0x73, 0x3b,</div><div class='add'>+0x7a, 0x61, 0x6e, 0x76, 0x69, 0x65, 0x3b, 0x66, 0x65, 0x76, 0x72, 0x69, 0x79, 0x65, 0x3b, 0x6d, 0x61, 0x72, 0x73, 0x3b,</div><div class='add'>+0x61, 0x76, 0x72, 0x69, 0x6c, 0x3b, 0x6d, 0x65, 0x3b, 0x7a, 0x69, 0x6e, 0x3b, 0x7a, 0x69, 0x6c, 0x79, 0x65, 0x3b, 0x6f,</div><div class='add'>+0x75, 0x74, 0x3b, 0x73, 0x65, 0x70, 0x74, 0x61, 0x6d, 0x3b, 0x6f, 0x6b, 0x74, 0x6f, 0x62, 0x3b, 0x6e, 0x6f, 0x76, 0x61,</div><div class='add'>+0x6d, 0x3b, 0x64, 0x65, 0x73, 0x61, 0x6d, 0x3b, 0x7a, 0x3b, 0x66, 0x3b, 0x6d, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x7a, 0x3b,</div><div class='add'>+0x7a, 0x3b, 0x6f, 0x3b, 0x73, 0x3b, 0x6f, 0x3b, 0x6e, 0x3b, 0x64, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x4e, 0x74,</div><div class='add'>+0x61, 0x6e, 0x64, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x50, 0x69, 0x6c, 0x69, 0x3b, 0x4d,</div><div class='add'>+0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x54, 0x61, 0x74, 0x75, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77,</div><div class='add'>+0x61, 0x20, 0x4e, 0x63, 0x68, 0x65, 0x63, 0x68, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e,</div><div class='add'>+0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e,</div><div class='add'>+0x6f, 0x20, 0x6e, 0x61, 0x20, 0x55, 0x6d, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e,</div><div class='add'>+0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4d, 0x69, 0x76, 0x69, 0x6c, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69,</div><div class='add'>+0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4d, 0x69, 0x74, 0x61, 0x74, 0x75,</div><div class='add'>+0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20,</div><div class='add'>+0x4e, 0x63, 0x68, 0x65, 0x63, 0x68, 0x69, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79,</div><div class='add'>+0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20,</div><div class='add'>+0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20,</div><div class='add'>+0x6e, 0x61, 0x20, 0x55, 0x3b, 0x4d, 0x77, 0x65, 0x64, 0x69, 0x20, 0x77, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f,</div><div class='add'>+0x20, 0x6e, 0x61, 0x20, 0x4e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x4d, 0x3b, 0x46, 0xfa, 0x6e, 0x67,</div><div class='add'>+0x61, 0x74, 0x268, 0x3b, 0x4e, 0x61, 0x61, 0x6e, 0x268, 0x3b, 0x4b, 0x65, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x49, 0x6b, 0xfa,</div><div class='add'>+0x6d, 0x69, 0x3b, 0x49, 0x6e, 0x79, 0x61, 0x6d, 0x62, 0x61, 0x6c, 0x61, 0x3b, 0x49, 0x64, 0x77, 0x61, 0x61, 0x74, 0x61,</div><div class='add'>+0x3b, 0x4d, 0x289, 0x289, 0x6e, 0x63, 0x68, 0x268, 0x3b, 0x56, 0x268, 0x268, 0x72, 0x268, 0x3b, 0x53, 0x61, 0x61, 0x74, 0x289,</div><div class='add'>+0x3b, 0x49, 0x6e, 0x79, 0x69, 0x3b, 0x53, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x53, 0x61, 0x73, 0x61, 0x74, 0x289, 0x3b, 0x4b,</div><div class='add'>+0x289, 0x66, 0xfa, 0x6e, 0x67, 0x61, 0x74, 0x268, 0x3b, 0x4b, 0x289, 0x6e, 0x61, 0x61, 0x6e, 0x268, 0x3b, 0x4b, 0x289, 0x6b,</div><div class='add'>+0x65, 0x65, 0x6e, 0x64, 0x61, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6b, 0x75, 0x6d, 0x69, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6e,</div><div class='add'>+0x79, 0x61, 0x6d, 0x62, 0xe1, 0x6c, 0x61, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x64, 0x77, 0x61, 0x61, 0x74, 0x61, 0x3b, 0x4b,</div><div class='add'>+0x289, 0x6d, 0x289, 0x289, 0x6e, 0x63, 0x68, 0x268, 0x3b, 0x4b, 0x289, 0x76, 0x268, 0x268, 0x72, 0x268, 0x3b, 0x4b, 0x289, 0x73,</div><div class='add'>+0x61, 0x61, 0x74, 0x289, 0x3b, 0x4b, 0x77, 0x69, 0x69, 0x6e, 0x79, 0x69, 0x3b, 0x4b, 0x289, 0x73, 0x61, 0x61, 0x6e, 0x6f,</div><div class='add'>+0x3b, 0x4b, 0x289, 0x73, 0x61, 0x73, 0x61, 0x74, 0x289, 0x3b, 0x46, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x49, 0x3b,</div><div class='add'>+0x49, 0x3b, 0x4d, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65,</div><div class='add'>+0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x75, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x4a, 0x75, 0x75, 0x3b, 0x4a, 0x75,</div><div class='add'>+0x6c, 0x3b, 0x41, 0x67, 0x75, 0x3b, 0x53, 0x65, 0x62, 0x3b, 0x4f, 0x6b, 0x69, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65,</div><div class='add'>+0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x77, 0x61, 0x6c, 0x69, 0x79, 0x6f, 0x3b, 0x46, 0x65, 0x62, 0x77, 0x61, 0x6c, 0x69, 0x79,</div><div class='add'>+0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x69, 0x73, 0x69, 0x3b, 0x41, 0x70, 0x75, 0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x61, 0x79, 0x69,</div><div class='add'>+0x3b, 0x4a, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x61, 0x79, 0x69, 0x3b, 0x41, 0x67, 0x75, 0x73, 0x69,</div><div class='add'>+0x74, 0x6f, 0x3b, 0x53, 0x65, 0x62, 0x75, 0x74, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x69, 0x74, 0x6f, 0x62,</div><div class='add'>+0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a,</div><div class='add'>+0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x45, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a,</div><div class='add'>+0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x4f, 0x67, 0x61, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e,</div><div class='add'>+0x6f, 0x76, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x72, 0x69, 0x3b, 0x46, 0x65, 0x62, 0x72, 0x75,</div><div class='add'>+0x61, 0x72, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x45, 0x70, 0x72, 0x65, 0x6f, 0x3b, 0x4d, 0x65, 0x69, 0x3b,</div><div class='add'>+0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x4f, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65,</div><div class='add'>+0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62,</div><div class='add'>+0x61, 0x3b, 0x44, 0x69, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x4d, 0x3b,</div><div class='add'>+0x4a, 0x3b, 0x4a, 0x3b, 0x4f, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65,</div><div class='add'>+0x76, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75,</div><div class='add'>+0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, 0x74, 0x75, 0x3b, 0x4e, 0x75, 0x76, 0x3b, 0x44, 0x69,</div><div class='add'>+0x7a, 0x3b, 0x4a, 0x61, 0x6e, 0x65, 0x72, 0x75, 0x3b, 0x46, 0x65, 0x76, 0x65, 0x72, 0x65, 0x72, 0x75, 0x3b, 0x4d, 0x61,</div><div class='add'>+0x72, 0x73, 0x75, 0x3b, 0x41, 0x62, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x69, 0x75, 0x3b, 0x4a, 0x75, 0x6e, 0x68, 0x75,</div><div class='add'>+0x3b, 0x4a, 0x75, 0x6c, 0x68, 0x75, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x75, 0x3b, 0x53, 0x65, 0x74, 0x65, 0x6e, 0x62,</div><div class='add'>+0x72, 0x75, 0x3b, 0x4f, 0x74, 0x75, 0x62, 0x72, 0x75, 0x3b, 0x4e, 0x75, 0x76, 0x65, 0x6e, 0x62, 0x72, 0x75, 0x3b, 0x44,</div><div class='add'>+0x69, 0x7a, 0x65, 0x6e, 0x62, 0x72, 0x75, 0x3b, 0x4a, 0x41, 0x4e, 0x3b, 0x46, 0x45, 0x42, 0x3b, 0x4d, 0x41, 0x43, 0x3b,</div><div class='add'>+0x128, 0x50, 0x55, 0x3b, 0x4d, 0x128, 0x128, 0x3b, 0x4e, 0x4a, 0x55, 0x3b, 0x4e, 0x4a, 0x52, 0x3b, 0x41, 0x47, 0x41, 0x3b,</div><div class='add'>+0x53, 0x50, 0x54, 0x3b, 0x4f, 0x4b, 0x54, 0x3b, 0x4e, 0x4f, 0x56, 0x3b, 0x44, 0x45, 0x43, 0x3b, 0x4a, 0x61, 0x6e, 0x75,</div><div class='add'>+0x61, 0x72, 0x129, 0x3b, 0x46, 0x65, 0x62, 0x75, 0x72, 0x75, 0x61, 0x72, 0x129, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b,</div><div class='add'>+0x128, 0x70, 0x75, 0x72, 0x169, 0x3b, 0x4d, 0x129, 0x129, 0x3b, 0x4e, 0x6a, 0x75, 0x6e, 0x69, 0x3b, 0x4e, 0x6a, 0x75, 0x72,</div><div class='add'>+0x61, 0x129, 0x3b, 0x41, 0x67, 0x61, 0x73, 0x74, 0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f,</div><div class='add'>+0x6b, 0x74, 0x169, 0x62, 0x61, 0x3b, 0x4e, 0x6f, 0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x69, 0x63, 0x65, 0x6d, 0x62,</div><div class='add'>+0x61, 0x3b, 0x4a, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x128, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x41, 0x3b, 0x53, 0x3b,</div><div class='add'>+0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4d, 0x75, 0x6c, 0x3b, 0x4e, 0x67, 0x61, 0x3b, 0x4b, 0x69, 0x70, 0x3b, 0x49, 0x77,</div><div class='add'>+0x61, 0x3b, 0x4e, 0x67, 0x65, 0x3b, 0x57, 0x61, 0x6b, 0x3b, 0x52, 0x6f, 0x70, 0x3b, 0x4b, 0x6f, 0x67, 0x3b, 0x42, 0x75,</div><div class='add'>+0x72, 0x3b, 0x45, 0x70, 0x65, 0x3b, 0x54, 0x61, 0x69, 0x3b, 0x41, 0x65, 0x6e, 0x3b, 0x4d, 0x75, 0x6c, 0x67, 0x75, 0x6c,</div><div class='add'>+0x3b, 0x4e, 0x67, 0x27, 0x61, 0x74, 0x79, 0x61, 0x74, 0x6f, 0x3b, 0x4b, 0x69, 0x70, 0x74, 0x61, 0x6d, 0x6f, 0x3b, 0x49,</div><div class='add'>+0x77, 0x61, 0x74, 0x20, 0x6b, 0x75, 0x74, 0x3b, 0x4e, 0x67, 0x27, 0x65, 0x69, 0x79, 0x65, 0x74, 0x3b, 0x57, 0x61, 0x6b,</div><div class='add'>+0x69, 0x3b, 0x52, 0x6f, 0x70, 0x74, 0x75, 0x69, 0x3b, 0x4b, 0x69, 0x70, 0x6b, 0x6f, 0x67, 0x61, 0x67, 0x61, 0x3b, 0x42,</div><div class='add'>+0x75, 0x72, 0x65, 0x74, 0x3b, 0x45, 0x70, 0x65, 0x73, 0x6f, 0x3b, 0x4b, 0x69, 0x70, 0x73, 0x75, 0x6e, 0x64, 0x65, 0x20,</div><div class='add'>+0x6e, 0x65, 0x74, 0x61, 0x69, 0x3b, 0x4b, 0x69, 0x70, 0x73, 0x75, 0x6e, 0x64, 0x65, 0x20, 0x6e, 0x65, 0x62, 0x6f, 0x20,</div><div class='add'>+0x61, 0x65, 0x6e, 0x67, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x4b, 0x3b, 0x49, 0x3b, 0x4e, 0x3b, 0x57, 0x3b, 0x52, 0x3b, 0x4b,</div><div class='add'>+0x3b, 0x42, 0x3b, 0x45, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x1c3, 0x4b, 0x68, 0x61, 0x6e, 0x6e, 0x69, 0x3b, 0x1c3, 0x4b, 0x68,</div><div class='add'>+0x61, 0x6e, 0x1c0, 0x67, 0xf4, 0x61, 0x62, 0x3b, 0x1c0, 0x4b, 0x68, 0x75, 0x75, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x1c3,</div><div class='add'>+0x48, 0xf4, 0x61, 0x1c2, 0x6b, 0x68, 0x61, 0x69, 0x62, 0x3b, 0x1c3, 0x4b, 0x68, 0x61, 0x69, 0x74, 0x73, 0xe2, 0x62, 0x3b,</div><div class='add'>+0x47, 0x61, 0x6d, 0x61, 0x1c0, 0x61, 0x65, 0x62, 0x3b, 0x1c2, 0x4b, 0x68, 0x6f, 0x65, 0x73, 0x61, 0x6f, 0x62, 0x3b, 0x41,</div><div class='add'>+0x6f, 0x1c1, 0x6b, 0x68, 0x75, 0x75, 0x6d, 0xfb, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x54, 0x61, 0x72, 0x61, 0x1c0, 0x6b,</div><div class='add'>+0x68, 0x75, 0x75, 0x6d, 0xfb, 0x1c1, 0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x1c2, 0x4e, 0xfb, 0x1c1, 0x6e, 0xe2, 0x69, 0x73, 0x65,</div><div class='add'>+0x62, 0x3b, 0x1c0, 0x48, 0x6f, 0x6f, 0x1c2, 0x67, 0x61, 0x65, 0x62, 0x3b, 0x48, 0xf4, 0x61, 0x73, 0x6f, 0x72, 0x65, 0x1c1,</div><div class='add'>+0x6b, 0x68, 0xe2, 0x62, 0x3b, 0x4a, 0x61, 0x6e, 0x2e, 0x3b, 0x46, 0xe4, 0x62, 0x2e, 0x3b, 0x4d, 0x61, 0x72, 0x2e, 0x3b,</div><div class='add'>+0x41, 0x70, 0x72, 0x2e, 0x3b, 0x4d, 0xe4, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x2e, 0x3b, 0x4a, 0x75, 0x6c, 0x2e, 0x3b, 0x4f,</div><div class='add'>+0x75, 0x67, 0x2e, 0x3b, 0x53, 0xe4, 0x70, 0x2e, 0x3b, 0x4f, 0x6b, 0x74, 0x2e, 0x3b, 0x4e, 0x6f, 0x76, 0x2e, 0x3b, 0x44,</div><div class='add'>+0x65, 0x7a, 0x2e, 0x3b, 0x4a, 0x61, 0x6e, 0x6e, 0x65, 0x77, 0x61, 0x3b, 0x46, 0xe4, 0x62, 0x72, 0x6f, 0x77, 0x61, 0x3b,</div><div class='add'>+0x4d, 0xe4, 0xe4, 0x7a, 0x3b, 0x41, 0x70, 0x72, 0x65, 0x6c, 0x6c, 0x3b, 0x4d, 0xe4, 0x69, 0x3b, 0x4a, 0x75, 0x75, 0x6e,</div><div class='add'>+0x69, 0x3b, 0x4a, 0x75, 0x75, 0x6c, 0x69, 0x3b, 0x4f, 0x75, 0x6a, 0x6f, 0xdf, 0x3b, 0x53, 0x65, 0x70, 0x74, 0xe4, 0x6d,</div><div class='add'>+0x62, 0x65, 0x72, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x6f, 0x76, 0xe4, 0x6d, 0x62, 0x65,</div><div class='add'>+0x72, 0x3b, 0x44, 0x65, 0x7a, 0xe4, 0x6d, 0x62, 0x65, 0x72, 0x3b, 0x44, 0x61, 0x6c, 0x3b, 0x41, 0x72, 0xe1, 0x3b, 0x186,</div><div class='add'>+0x25b, 0x6e, 0x3b, 0x44, 0x6f, 0x79, 0x3b, 0x4c, 0xe9, 0x70, 0x3b, 0x52, 0x6f, 0x6b, 0x3b, 0x53, 0xe1, 0x73, 0x3b, 0x42,</div><div class='add'>+0x254, 0x301, 0x72, 0x3b, 0x4b, 0xfa, 0x73, 0x3b, 0x47, 0xed, 0x73, 0x3b, 0x53, 0x68, 0x289, 0x301, 0x3b, 0x4e, 0x74, 0x289,</div><div class='add'>+0x301, 0x3b, 0x4f, 0x6c, 0x61, 0x64, 0x61, 0x6c, 0x289, 0x301, 0x3b, 0x41, 0x72, 0xe1, 0x74, 0x3b, 0x186, 0x25b, 0x6e, 0x268,</div><div class='add'>+0x301, 0x254, 0x268, 0x14b, 0x254, 0x6b, 0x3b, 0x4f, 0x6c, 0x6f, 0x64, 0x6f, 0x79, 0xed, 0xf3, 0x72, 0xed, 0xea, 0x20, 0x69,</div><div class='add'>+0x6e, 0x6b, 0xf3, 0x6b, 0xfa, 0xe2, 0x3b, 0x4f, 0x6c, 0x6f, 0x69, 0x6c, 0xe9, 0x70, 0x16b, 0x6e, 0x79, 0x12b, 0x113, 0x20,</div><div class='add'>+0x69, 0x6e, 0x6b, 0xf3, 0x6b, 0xfa, 0xe2, 0x3b, 0x4b, 0xfa, 0x6a, 0xfa, 0x254, 0x72, 0x254, 0x6b, 0x3b, 0x4d, 0xf3, 0x72,</div><div class='add'>+0x75, 0x73, 0xe1, 0x73, 0x69, 0x6e, 0x3b, 0x186, 0x6c, 0x254, 0x301, 0x268, 0x301, 0x62, 0x254, 0x301, 0x72, 0xe1, 0x72, 0x25b,</div><div class='add'>+0x3b, 0x4b, 0xfa, 0x73, 0x68, 0xee, 0x6e, 0x3b, 0x4f, 0x6c, 0x67, 0xed, 0x73, 0x61, 0x6e, 0x3b, 0x50, 0x289, 0x73, 0x68,</div><div class='add'>+0x289, 0x301, 0x6b, 0x61, 0x3b, 0x4e, 0x74, 0x289, 0x301, 0x14b, 0x289, 0x301, 0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65,</div><div class='add'>+0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75,</div><div class='add'>+0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65,</div><div class='add'>+0x73, 0x3b, 0x4a, 0x61, 0x6e, 0x3b, 0x46, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x63, 0x3b, 0x41, 0x70, 0x72, 0x3b, 0x4d, 0x65,</div><div class='add'>+0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x3b, 0x4a, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x70, 0x3b, 0x4f, 0x6b,</div><div class='add'>+0x74, 0x3b, 0x4e, 0x6f, 0x76, 0x3b, 0x44, 0x65, 0x63, 0x3b, 0x52, 0x61, 0x72, 0x3b, 0x4d, 0x75, 0x6b, 0x3b, 0x4b, 0x77,</div><div class='add'>+0x61, 0x3b, 0x44, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0x6f, 0x64, 0x3b, 0x4a, 0x6f, 0x6c, 0x3b, 0x50, 0x65,</div><div class='add'>+0x64, 0x3b, 0x53, 0x6f, 0x6b, 0x3b, 0x54, 0x69, 0x62, 0x3b, 0x4c, 0x61, 0x62, 0x3b, 0x50, 0x6f, 0x6f, 0x3b, 0x4f, 0x72,</div><div class='add'>+0x61, 0x72, 0x61, 0x3b, 0x4f, 0x6d, 0x75, 0x6b, 0x3b, 0x4f, 0x6b, 0x77, 0x61, 0x6d, 0x67, 0x27, 0x3b, 0x4f, 0x64, 0x75,</div><div class='add'>+0x6e, 0x67, 0x27, 0x65, 0x6c, 0x3b, 0x4f, 0x6d, 0x61, 0x72, 0x75, 0x6b, 0x3b, 0x4f, 0x6d, 0x6f, 0x64, 0x6f, 0x6b, 0x27,</div><div class='add'>+0x6b, 0x69, 0x6e, 0x67, 0x27, 0x6f, 0x6c, 0x3b, 0x4f, 0x6a, 0x6f, 0x6c, 0x61, 0x3b, 0x4f, 0x70, 0x65, 0x64, 0x65, 0x6c,</div><div class='add'>+0x3b, 0x4f, 0x73, 0x6f, 0x6b, 0x6f, 0x73, 0x6f, 0x6b, 0x6f, 0x6d, 0x61, 0x3b, 0x4f, 0x74, 0x69, 0x62, 0x61, 0x72, 0x3b,</div><div class='add'>+0x4f, 0x6c, 0x61, 0x62, 0x6f, 0x72, 0x3b, 0x4f, 0x70, 0x6f, 0x6f, 0x3b, 0x52, 0x3b, 0x4d, 0x3b, 0x4b, 0x3b, 0x44, 0x3b,</div><div class='add'>+0x4d, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x4c, 0x3b, 0x50, 0x3b, 0x17d, 0x61, 0x6e, 0x3b,</div><div class='add'>+0x46, 0x65, 0x65, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x77, 0x69, 0x3b, 0x4d, 0x65, 0x3b, 0x17d, 0x75, 0x77, 0x3b, 0x17d,</div><div class='add'>+0x75, 0x79, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x6b, 0x3b, 0x4f, 0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x6f, 0x3b, 0x44, 0x65,</div><div class='add'>+0x65, 0x3b, 0x17d, 0x61, 0x6e, 0x77, 0x69, 0x79, 0x65, 0x3b, 0x46, 0x65, 0x65, 0x77, 0x69, 0x72, 0x69, 0x79, 0x65, 0x3b,</div><div class='add'>+0x4d, 0x61, 0x72, 0x73, 0x69, 0x3b, 0x41, 0x77, 0x69, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x65, 0x3b, 0x17d, 0x75, 0x77, 0x65,</div><div class='add'>+0x14b, 0x3b, 0x17d, 0x75, 0x79, 0x79, 0x65, 0x3b, 0x55, 0x74, 0x3b, 0x53, 0x65, 0x6b, 0x74, 0x61, 0x6e, 0x62, 0x75, 0x72,</div><div class='add'>+0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x6f, 0x62, 0x75, 0x72, 0x3b, 0x4e, 0x6f, 0x6f, 0x77, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x3b,</div><div class='add'>+0x44, 0x65, 0x65, 0x73, 0x61, 0x6e, 0x62, 0x75, 0x72, 0x3b, 0x17d, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b,</div><div class='add'>+0x17d, 0x3b, 0x17d, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x44, 0x41, 0x43, 0x3b, 0x44, 0x41,</div><div class='add'>+0x52, 0x3b, 0x44, 0x41, 0x44, 0x3b, 0x44, 0x41, 0x4e, 0x3b, 0x44, 0x41, 0x48, 0x3b, 0x44, 0x41, 0x55, 0x3b, 0x44, 0x41,</div><div class='add'>+0x4f, 0x3b, 0x44, 0x41, 0x42, 0x3b, 0x44, 0x4f, 0x43, 0x3b, 0x44, 0x41, 0x50, 0x3b, 0x44, 0x47, 0x49, 0x3b, 0x44, 0x41,</div><div class='add'>+0x47, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x63, 0x68, 0x69, 0x65, 0x6c, 0x3b, 0x44, 0x77, 0x65,</div><div class='add'>+0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x72, 0x69, 0x79, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41,</div><div class='add'>+0x64, 0x65, 0x6b, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x6e, 0x67, 0x27, 0x77, 0x65, 0x6e, 0x3b,</div><div class='add'>+0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x62, 0x69, 0x63, 0x68, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61,</div><div class='add'>+0x72, 0x20, 0x41, 0x75, 0x63, 0x68, 0x69, 0x65, 0x6c, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x62,</div><div class='add'>+0x69, 0x72, 0x69, 0x79, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x62, 0x6f, 0x72, 0x6f, 0x3b,</div><div class='add'>+0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x4f, 0x63, 0x68, 0x69, 0x6b, 0x6f, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d,</div><div class='add'>+0x61, 0x72, 0x20, 0x41, 0x70, 0x61, 0x72, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x67, 0x69, 0x20, 0x61,</div><div class='add'>+0x63, 0x68, 0x69, 0x65, 0x6c, 0x3b, 0x44, 0x77, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x41, 0x70, 0x61, 0x72, 0x20, 0x67,</div><div class='add'>+0x69, 0x20, 0x61, 0x72, 0x69, 0x79, 0x6f, 0x3b, 0x43, 0x3b, 0x52, 0x3b, 0x44, 0x3b, 0x4e, 0x3b, 0x42, 0x3b, 0x55, 0x3b,</div><div class='add'>+0x42, 0x3b, 0x42, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x59, 0x65, 0x6e, 0x3b, 0x59, 0x65, 0x62, 0x3b,</div><div class='add'>+0x4d, 0x61, 0x72, 0x3b, 0x49, 0x62, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x3b, 0x59, 0x75, 0x6e, 0x3b, 0x59, 0x75, 0x6c, 0x3b,</div><div class='add'>+0x194, 0x75, 0x63, 0x3b, 0x43, 0x75, 0x74, 0x3b, 0x4b, 0x1e6d, 0x75, 0x3b, 0x4e, 0x77, 0x61, 0x3b, 0x44, 0x75, 0x6a, 0x3b,</div><div class='add'>+0x59, 0x65, 0x6e, 0x6e, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x59, 0x65, 0x62, 0x72, 0x61, 0x79, 0x65, 0x72, 0x3b, 0x4d, 0x61,</div><div class='add'>+0x72, 0x73, 0x3b, 0x49, 0x62, 0x72, 0x69, 0x72, 0x3b, 0x4d, 0x61, 0x79, 0x79, 0x75, 0x3b, 0x59, 0x75, 0x6e, 0x79, 0x75,</div><div class='add'>+0x3b, 0x59, 0x75, 0x6c, 0x79, 0x75, 0x7a, 0x3b, 0x194, 0x75, 0x63, 0x74, 0x3b, 0x43, 0x75, 0x74, 0x61, 0x6e, 0x62, 0x69,</div><div class='add'>+0x72, 0x3b, 0x4b, 0x1e6d, 0x75, 0x62, 0x65, 0x72, 0x3b, 0x4e, 0x77, 0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x44, 0x75, 0x6a,</div><div class='add'>+0x61, 0x6e, 0x62, 0x69, 0x72, 0x3b, 0x59, 0x3b, 0x59, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x4d, 0x3b, 0x59, 0x3b, 0x59, 0x3b,</div><div class='add'>+0x194, 0x3b, 0x43, 0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x44, 0x3b, 0x4a, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x46, 0x65,</div><div class='add'>+0x62, 0x6c, 0x75, 0x61, 0x6c, 0x69, 0x3b, 0x4d, 0x61, 0x63, 0x68, 0x69, 0x3b, 0x41, 0x70, 0x6c, 0x69, 0x6c, 0x69, 0x3b,</div><div class='add'>+0x4d, 0x65, 0x69, 0x3b, 0x4a, 0x75, 0x6e, 0x69, 0x3b, 0x4a, 0x75, 0x6c, 0x61, 0x69, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74,</div><div class='add'>+0x69, 0x3b, 0x53, 0x65, 0x70, 0x74, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4f, 0x6b, 0x74, 0x6f, 0x62, 0x61, 0x3b, 0x4e, 0x6f,</div><div class='add'>+0x76, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x44, 0x65, 0x73, 0x65, 0x6d, 0x62, 0x61, 0x3b</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const ushort days_data[] = {</div><div class='ctx'> 0x53, 0x75, 0x6e, 0x3b, 0x4d, 0x6f, 0x6e, 0x3b, 0x54, 0x75, 0x65, 0x3b, 0x57, 0x65, 0x64, 0x3b, 0x54, 0x68, 0x75, 0x3b,</div><div class='ctx'> 0x46, 0x72, 0x69, 0x3b, 0x53, 0x61, 0x74, 0x3b, 0x53, 0x75, 0x6e, 0x64, 0x61, 0x79, 0x3b, 0x4d, 0x6f, 0x6e, 0x64, 0x61,</div><div class='hunk'>@@ -3453,866 +3579,1494 @@ static const ushort days_data[] = {</div><div class='ctx'> 0x61, 0x7a, 0x61, 0x72, 0x20, 0x65, 0x72, 0x74, 0x259, 0x73, 0x69, 0x3b, 0xe7, 0x259, 0x72, 0x15f, 0x259, 0x6e, 0x62, 0x259,</div><div class='ctx'> 0x20, 0x61, 0x78, 0x15f, 0x61, 0x6d, 0x131, 0x3b, 0xe7, 0x259, 0x72, 0x15f, 0x259, 0x6e, 0x62, 0x259, 0x3b, 0x63, 0xfc, 0x6d,</div><div class='ctx'> 0x259, 0x20, 0x61, 0x78, 0x15f, 0x61, 0x6d, 0x131, 0x3b, 0x63, 0xfc, 0x6d, 0x259, 0x3b, 0x15f, 0x259, 0x6e, 0x62, 0x259, 0x3b,</div><div class='del'>-0x69, 0x67, 0x3b, 0x61, 0x6c, 0x3b, 0x61, 0x73, 0x3b, 0x61, 0x7a, 0x3b, 0x6f, 0x67, 0x3b, 0x6f, 0x72, 0x3b, 0x6c, 0x72,</div><div class='del'>-0x3b, 0x69, 0x67, 0x61, 0x6e, 0x64, 0x65, 0x61, 0x3b, 0x61, 0x73, 0x74, 0x65, 0x6c, 0x65, 0x68, 0x65, 0x6e, 0x61, 0x3b,</div><div class='del'>-0x61, 0x73, 0x74, 0x65, 0x61, 0x72, 0x74, 0x65, 0x61, 0x3b, 0x61, 0x73, 0x74, 0x65, 0x61, 0x7a, 0x6b, 0x65, 0x6e, 0x61,</div><div class='del'>-0x3b, 0x6f, 0x73, 0x74, 0x65, 0x67, 0x75, 0x6e, 0x61, 0x3b, 0x6f, 0x73, 0x74, 0x69, 0x72, 0x61, 0x6c, 0x61, 0x3b, 0x6c,</div><div class='del'>-0x61, 0x72, 0x75, 0x6e, 0x62, 0x61, 0x74, 0x61, 0x3b, 0x9b0, 0x9ac, 0x9bf, 0x3b, 0x9b8, 0x9cb, 0x9ae, 0x3b, 0x9ae, 0x999, 0x9cd,</div><div class='del'>-0x997, 0x9b2, 0x3b, 0x9ac, 0x9c1, 0x9a7, 0x3b, 0x9ac, 0x9c3, 0x9b9, 0x9b8, 0x9cd, 0x9aa, 0x9a4, 0x9bf, 0x3b, 0x9b6, 0x9c1, 0x995, 0x9cd,</div><div class='del'>-0x9b0, 0x3b, 0x9b6, 0x9a8, 0x9bf, 0x3b, 0x9b0, 0x9ac, 0x9bf, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9b8, 0x9cb, 0x9ae, 0x9ac, 0x9be, 0x9b0, 0x3b,</div><div class='del'>-0x9ae, 0x999, 0x9cd, 0x997, 0x9b2, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9ac, 0x9c1, 0x9a7, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9ac, 0x9c3, 0x9b9, 0x9b7,</div><div class='del'>-0x9cd, 0x9aa, 0x9a4, 0x9bf, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9b6, 0x9c1, 0x995, 0x9cd, 0x9b0, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9b6, 0x9a8, 0x9bf,</div><div class='del'>-0x9ac, 0x9be, 0x9b0, 0x3b, 0x9b0, 0x3b, 0x9b8, 0x9cb, 0x3b, 0x9ae, 0x3b, 0x9ac, 0x9c1, 0x3b, 0x9ac, 0x9c3, 0x3b, 0x9b6, 0x9c1, 0x3b,</div><div class='del'>-0x9b6, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x3b, 0xf58, 0xf72, 0xf62, 0xf0b, 0x3b, 0xf63, 0xfb7, 0xf42, 0xf0b, 0x3b, 0xf55, 0xf74, 0xf62, 0xf0b,</div><div class='del'>-0x3b, 0xf66, 0xf44, 0xf66, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0xf0b, 0x3b, 0xf49, 0xf72, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b,</div><div class='del'>-0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf58, 0xf72, 0xf42, 0xf0b, 0xf51, 0xf58, 0xf62, 0xf0b, 0x3b, 0xf42,</div><div class='del'>-0xf5f, 0xf60, 0xf0b, 0xf63, 0xfb7, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf55, 0xf74, 0xf62, 0xf0b, 0xf56, 0xf74,</div><div class='del'>-0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf54, 0xf0b, 0xf66, 0xf44, 0xf66, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf66, 0xfa4, 0xf7a,</div><div class='del'>-0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf49, 0xf72, 0xf0b, 0xf58, 0xf0b, 0x3b, 0x43d, 0x434, 0x3b, 0x43f, 0x43d,</div><div class='del'>-0x3b, 0x432, 0x442, 0x3b, 0x441, 0x440, 0x3b, 0x447, 0x442, 0x3b, 0x43f, 0x442, 0x3b, 0x441, 0x431, 0x3b, 0x43d, 0x435, 0x434, 0x435,</div><div class='del'>-0x43b, 0x44f, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x43b, 0x43d, 0x438, 0x43a, 0x3b, 0x432, 0x442, 0x43e, 0x440, 0x43d, 0x438,</div><div class='del'>-0x43a, 0x3b, 0x441, 0x440, 0x44f, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x44a, 0x440, 0x442, 0x44a, 0x43a, 0x3b, 0x43f, 0x435,</div><div class='del'>-0x442, 0x44a, 0x43a, 0x3b, 0x441, 0x44a, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x43d, 0x3b, 0x43f, 0x3b, 0x432, 0x3b, 0x441, 0x3b, 0x447,</div><div class='del'>-0x3b, 0x43f, 0x3b, 0x441, 0x3b, 0x1014, 0x103d, 0x1031, 0x3b, 0x101c, 0x102c, 0x3b, 0x1002, 0x102b, 0x3b, 0x101f, 0x1030, 0x1038, 0x3b, 0x1010,</div><div class='del'>-0x1031, 0x1038, 0x3b, 0x1000, 0x103c, 0x102c, 0x3b, 0x1014, 0x1031, 0x3b, 0x1010, 0x1014, 0x1004, 0x103a, 0x1039, 0x1002, 0x1014, 0x103d, 0x1031, 0x3b,</div><div class='del'>-0x1010, 0x1014, 0x1004, 0x103a, 0x1039, 0x101c, 0x102c, 0x3b, 0x1021, 0x1004, 0x103a, 0x1039, 0x1002, 0x102b, 0x3b, 0x1017, 0x102f, 0x1012, 0x1039, 0x1013,</div><div class='del'>-0x101f, 0x1030, 0x1038, 0x3b, 0x1000, 0x103c, 0x102c, 0x101e, 0x1015, 0x1010, 0x1031, 0x1038, 0x3b, 0x101e, 0x1031, 0x102c, 0x1000, 0x103c, 0x102c, 0x3b,</div><div class='del'>-0x1005, 0x1014, 0x1031, 0x3b, 0x1010, 0x3b, 0x1010, 0x3b, 0x1021, 0x3b, 0x1017, 0x3b, 0x1000, 0x3b, 0x101e, 0x3b, 0x1005, 0x3b, 0x43d, 0x434,</div><div class='del'>-0x3b, 0x43f, 0x43d, 0x3b, 0x430, 0x45e, 0x3b, 0x441, 0x440, 0x3b, 0x447, 0x446, 0x3b, 0x43f, 0x442, 0x3b, 0x441, 0x431, 0x3b, 0x43d,</div><div class='del'>-0x44f, 0x434, 0x437, 0x435, 0x43b, 0x44f, 0x3b, 0x43f, 0x430, 0x43d, 0x44f, 0x434, 0x437, 0x435, 0x43b, 0x430, 0x43a, 0x3b, 0x430, 0x45e,</div><div class='del'>-0x442, 0x43e, 0x440, 0x430, 0x43a, 0x3b, 0x441, 0x435, 0x440, 0x430, 0x434, 0x430, 0x3b, 0x447, 0x430, 0x446, 0x432, 0x435, 0x440, 0x3b,</div><div class='del'>-0x43f, 0x44f, 0x442, 0x43d, 0x456, 0x446, 0x430, 0x3b, 0x441, 0x443, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x43d, 0x3b, 0x43f, 0x3b, 0x430,</div><div class='del'>-0x3b, 0x441, 0x3b, 0x447, 0x3b, 0x43f, 0x3b, 0x441, 0x3b, 0x17a2, 0x17b6, 0x3b, 0x1785, 0x3b, 0x17a2, 0x3b, 0x1796, 0x17bb, 0x3b, 0x1796,</div><div class='del'>-0x17d2, 0x179a, 0x3b, 0x179f, 0x17bb, 0x3b, 0x179f, 0x3b, 0x1790, 0x17d2, 0x1784, 0x17c3, 0x17a2, 0x17b6, 0x1791, 0x17b7, 0x178f, 0x17d2, 0x1799, 0x3b,</div><div class='del'>-0x200b, 0x1790, 0x17d2, 0x1784, 0x17c3, 0x1785, 0x17d0, 0x1793, 0x17d2, 0x1791, 0x3b, 0x1790, 0x17d2, 0x1784, 0x17c3, 0x17a2, 0x1784, 0x17d2, 0x1782, 0x17b6,</div><div class='del'>-0x179a, 0x3b, 0x1790, 0x17d2, 0x1784, 0x17c3, 0x1796, 0x17bb, 0x1792, 0x3b, 0x1790, 0x17d2, 0x1784, 0x17c3, 0x1796, 0x17d2, 0x179a, 0x17a0, 0x179f, 0x17d2,</div><div class='del'>-0x1794, 0x178f, 0x17b7, 0x17cd, 0x3b, 0x1790, 0x17d2, 0x1784, 0x17c3, 0x179f, 0x17bb, 0x1780, 0x17d2, 0x179a, 0x3b, 0x1790, 0x17d2, 0x1784, 0x17c3, 0x179f,</div><div class='del'>-0x17c5, 0x179a, 0x17cd, 0x3b, 0x64, 0x67, 0x3b, 0x64, 0x6c, 0x3b, 0x64, 0x74, 0x3b, 0x64, 0x63, 0x3b, 0x64, 0x6a, 0x3b, 0x64,</div><div class='del'>-0x76, 0x3b, 0x64, 0x73, 0x3b, 0x44, 0x69, 0x75, 0x6d, 0x65, 0x6e, 0x67, 0x65, 0x3b, 0x44, 0x69, 0x6c, 0x6c, 0x75, 0x6e,</div><div class='del'>-0x73, 0x3b, 0x44, 0x69, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x44, 0x69, 0x6d, 0x65, 0x63, 0x72, 0x65, 0x73, 0x3b, 0x44,</div><div class='del'>-0x69, 0x6a, 0x6f, 0x75, 0x73, 0x3b, 0x44, 0x69, 0x76, 0x65, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x3b, 0x64, 0x69, 0x73, 0x73,</div><div class='del'>-0x61, 0x62, 0x74, 0x65, 0x3b, 0x67, 0x3b, 0x6c, 0x3b, 0x74, 0x3b, 0x63, 0x3b, 0x6a, 0x3b, 0x76, 0x3b, 0x73, 0x3b, 0x64,</div><div class='del'>-0x67, 0x2e, 0x3b, 0x64, 0x6c, 0x2e, 0x3b, 0x64, 0x74, 0x2e, 0x3b, 0x64, 0x63, 0x2e, 0x3b, 0x64, 0x6a, 0x2e, 0x3b, 0x64,</div><div class='del'>-0x76, 0x2e, 0x3b, 0x64, 0x73, 0x2e, 0x3b, 0x64, 0x69, 0x75, 0x6d, 0x65, 0x6e, 0x67, 0x65, 0x3b, 0x64, 0x69, 0x6c, 0x6c,</div><div class='del'>-0x75, 0x6e, 0x73, 0x3b, 0x64, 0x69, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x64, 0x69, 0x6d, 0x65, 0x63, 0x72, 0x65, 0x73,</div><div class='del'>-0x3b, 0x64, 0x69, 0x6a, 0x6f, 0x75, 0x73, 0x3b, 0x64, 0x69, 0x76, 0x65, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x3b, 0x64, 0x69,</div><div class='del'>-0x73, 0x73, 0x61, 0x62, 0x74, 0x65, 0x3b, 0x47, 0x3b, 0x6c, 0x3b, 0x54, 0x3b, 0x43, 0x3b, 0x4a, 0x3b, 0x56, 0x3b, 0x53,</div><div class='del'>-0x3b, 0x5468, 0x65e5, 0x3b, 0x5468, 0x4e00, 0x3b, 0x5468, 0x4e8c, 0x3b, 0x5468, 0x4e09, 0x3b, 0x5468, 0x56db, 0x3b, 0x5468, 0x4e94, 0x3b, 0x5468,</div><div class='del'>-0x516d, 0x3b, 0x661f, 0x671f, 0x65e5, 0x3b, 0x661f, 0x671f, 0x4e00, 0x3b, 0x661f, 0x671f, 0x4e8c, 0x3b, 0x661f, 0x671f, 0x4e09, 0x3b, 0x661f, 0x671f,</div><div class='del'>-0x56db, 0x3b, 0x661f, 0x671f, 0x4e94, 0x3b, 0x661f, 0x671f, 0x516d, 0x3b, 0x65e5, 0x3b, 0x4e00, 0x3b, 0x4e8c, 0x3b, 0x4e09, 0x3b, 0x56db, 0x3b,</div><div class='del'>-0x4e94, 0x3b, 0x516d, 0x3b, 0x9031, 0x65e5, 0x3b, 0x9031, 0x4e00, 0x3b, 0x9031, 0x4e8c, 0x3b, 0x9031, 0x4e09, 0x3b, 0x9031, 0x56db, 0x3b, 0x9031,</div><div class='del'>-0x4e94, 0x3b, 0x9031, 0x516d, 0x3b, 0x6e, 0x65, 0x64, 0x3b, 0x70, 0x6f, 0x6e, 0x3b, 0x75, 0x74, 0x6f, 0x3b, 0x73, 0x72, 0x69,</div><div class='del'>-0x3b, 0x10d, 0x65, 0x74, 0x3b, 0x70, 0x65, 0x74, 0x3b, 0x73, 0x75, 0x62, 0x3b, 0x6e, 0x65, 0x64, 0x6a, 0x65, 0x6c, 0x6a,</div><div class='del'>-0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x6a, 0x65, 0x6c, 0x6a, 0x61, 0x6b, 0x3b, 0x75, 0x74, 0x6f, 0x72, 0x61, 0x6b,</div><div class='del'>-0x3b, 0x73, 0x72, 0x69, 0x6a, 0x65, 0x64, 0x61, 0x3b, 0x10d, 0x65, 0x74, 0x76, 0x72, 0x74, 0x61, 0x6b, 0x3b, 0x70, 0x65,</div><div class='del'>-0x74, 0x61, 0x6b, 0x3b, 0x73, 0x75, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x6e, 0x3b, 0x70, 0x3b, 0x75, 0x3b, 0x73, 0x3b, 0x10d,</div><div class='del'>-0x3b, 0x70, 0x3b, 0x73, 0x3b, 0x6e, 0x65, 0x3b, 0x70, 0x6f, 0x3b, 0xfa, 0x74, 0x3b, 0x73, 0x74, 0x3b, 0x10d, 0x74, 0x3b,</div><div class='del'>-0x70, 0xe1, 0x3b, 0x73, 0x6f, 0x3b, 0x6e, 0x65, 0x64, 0x11b, 0x6c, 0x65, 0x3b, 0x70, 0x6f, 0x6e, 0x64, 0x11b, 0x6c, 0xed,</div><div class='del'>-0x3b, 0xfa, 0x74, 0x65, 0x72, 0xfd, 0x3b, 0x73, 0x74, 0x159, 0x65, 0x64, 0x61, 0x3b, 0x10d, 0x74, 0x76, 0x72, 0x74, 0x65,</div><div class='del'>-0x6b, 0x3b, 0x70, 0xe1, 0x74, 0x65, 0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x4e, 0x3b, 0x50, 0x3b, 0xda,</div><div class='del'>-0x3b, 0x53, 0x3b, 0x10c, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x73, 0xf8, 0x6e, 0x3b, 0x6d, 0x61, 0x6e, 0x3b, 0x74, 0x69, 0x72,</div><div class='del'>-0x3b, 0x6f, 0x6e, 0x73, 0x3b, 0x74, 0x6f, 0x72, 0x3b, 0x66, 0x72, 0x65, 0x3b, 0x6c, 0xf8, 0x72, 0x3b, 0x73, 0xf8, 0x6e,</div><div class='del'>-0x64, 0x61, 0x67, 0x3b, 0x6d, 0x61, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x69, 0x72, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x6f,</div><div class='del'>-0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x6f, 0x72, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x66, 0x72, 0x65, 0x64, 0x61, 0x67,</div><div class='del'>-0x3b, 0x6c, 0xf8, 0x72, 0x64, 0x61, 0x67, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x54, 0x3b, 0x4f, 0x3b, 0x54, 0x3b, 0x46, 0x3b,</div><div class='del'>-0x4c, 0x3b, 0x7a, 0x6f, 0x3b, 0x6d, 0x61, 0x3b, 0x64, 0x69, 0x3b, 0x77, 0x6f, 0x3b, 0x64, 0x6f, 0x3b, 0x76, 0x72, 0x3b,</div><div class='del'>-0x7a, 0x61, 0x3b, 0x7a, 0x6f, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x6d, 0x61, 0x61, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x64, 0x69,</div><div class='del'>-0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x77, 0x6f, 0x65, 0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x64, 0x6f, 0x6e, 0x64, 0x65,</div><div class='del'>-0x72, 0x64, 0x61, 0x67, 0x3b, 0x76, 0x72, 0x69, 0x6a, 0x64, 0x61, 0x67, 0x3b, 0x7a, 0x61, 0x74, 0x65, 0x72, 0x64, 0x61,</div><div class='del'>-0x67, 0x3b, 0x5a, 0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x57, 0x3b, 0x44, 0x3b, 0x56, 0x3b, 0x5a, 0x3b, 0x50, 0x3b, 0x45, 0x3b,</div><div class='del'>-0x54, 0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x52, 0x3b, 0x4c, 0x3b, 0x70, 0xfc, 0x68, 0x61, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x65,</div><div class='del'>-0x73, 0x6d, 0x61, 0x73, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x74, 0x65, 0x69, 0x73, 0x69, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x6b,</div><div class='del'>-0x6f, 0x6c, 0x6d, 0x61, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x6e, 0x65, 0x6c, 0x6a, 0x61, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x72,</div><div class='del'>-0x65, 0x65, 0x64, 0x65, 0x3b, 0x6c, 0x61, 0x75, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x73, 0x75, 0x6e, 0x3b, 0x6d, 0xe1, 0x6e,</div><div class='del'>-0x3b, 0x74, 0xfd, 0x73, 0x3b, 0x6d, 0x69, 0x6b, 0x3b, 0x68, 0xf3, 0x73, 0x3b, 0x66, 0x72, 0xed, 0x3b, 0x6c, 0x65, 0x79,</div><div class='del'>-0x3b, 0x73, 0x75, 0x6e, 0x6e, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x6d, 0xe1, 0x6e, 0x61, 0x64, 0x61, 0x67, 0x75,</div><div class='del'>-0x72, 0x3b, 0x74, 0xfd, 0x73, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x6d, 0x69, 0x6b, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72,</div><div class='del'>-0x3b, 0x68, 0xf3, 0x73, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x66, 0x72, 0xed, 0x67, 0x67, 0x6a, 0x61, 0x64, 0x61, 0x67,</div><div class='del'>-0x75, 0x72, 0x3b, 0x6c, 0x65, 0x79, 0x67, 0x61, 0x72, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x54,</div><div class='del'>-0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x46, 0x3b, 0x4c, 0x3b, 0x73, 0x75, 0x3b, 0x6d, 0x61, 0x3b, 0x74, 0x69, 0x3b, 0x6b, 0x65,</div><div class='del'>-0x3b, 0x74, 0x6f, 0x3b, 0x70, 0x65, 0x3b, 0x6c, 0x61, 0x3b, 0x73, 0x75, 0x6e, 0x6e, 0x75, 0x6e, 0x74, 0x61, 0x69, 0x3b,</div><div class='del'>-0x6d, 0x61, 0x61, 0x6e, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x3b, 0x74, 0x69, 0x69, 0x73, 0x74, 0x61, 0x69, 0x3b, 0x6b, 0x65,</div><div class='del'>-0x73, 0x6b, 0x69, 0x76, 0x69, 0x69, 0x6b, 0x6b, 0x6f, 0x3b, 0x74, 0x6f, 0x72, 0x73, 0x74, 0x61, 0x69, 0x3b, 0x70, 0x65,</div><div class='del'>-0x72, 0x6a, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x3b, 0x6c, 0x61, 0x75, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x3b, 0x53, 0x3b, 0x4d,</div><div class='del'>-0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x50, 0x3b, 0x4c, 0x3b, 0x73, 0x75, 0x6e, 0x6e, 0x75, 0x6e, 0x74, 0x61, 0x69,</div><div class='del'>-0x6e, 0x61, 0x3b, 0x6d, 0x61, 0x61, 0x6e, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x74, 0x69, 0x69, 0x73, 0x74,</div><div class='del'>-0x61, 0x69, 0x6e, 0x61, 0x3b, 0x6b, 0x65, 0x73, 0x6b, 0x69, 0x76, 0x69, 0x69, 0x6b, 0x6b, 0x6f, 0x6e, 0x61, 0x3b, 0x74,</div><div class='del'>-0x6f, 0x72, 0x73, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x70, 0x65, 0x72, 0x6a, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x61,</div><div class='del'>-0x3b, 0x6c, 0x61, 0x75, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x64, 0x69, 0x6d, 0x2e, 0x3b, 0x6c, 0x75, 0x6e,</div><div class='del'>-0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x6d, 0x65, 0x72, 0x2e, 0x3b, 0x6a, 0x65, 0x75, 0x2e, 0x3b, 0x76, 0x65, 0x6e,</div><div class='del'>-0x2e, 0x3b, 0x73, 0x61, 0x6d, 0x2e, 0x3b, 0x64, 0x69, 0x6d, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x3b, 0x6c, 0x75, 0x6e, 0x64,</div><div class='del'>-0x69, 0x3b, 0x6d, 0x61, 0x72, 0x64, 0x69, 0x3b, 0x6d, 0x65, 0x72, 0x63, 0x72, 0x65, 0x64, 0x69, 0x3b, 0x6a, 0x65, 0x75,</div><div class='del'>-0x64, 0x69, 0x3b, 0x76, 0x65, 0x6e, 0x64, 0x72, 0x65, 0x64, 0x69, 0x3b, 0x73, 0x61, 0x6d, 0x65, 0x64, 0x69, 0x3b, 0x44,</div><div class='del'>-0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x44, 0x6f, 0x6d, 0x3b, 0x4c, 0x75, 0x6e,</div><div class='del'>-0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0xe9, 0x72, 0x3b, 0x58, 0x6f, 0x76, 0x3b, 0x56, 0x65, 0x6e, 0x3b, 0x53, 0xe1, 0x62,</div><div class='del'>-0x3b, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x73, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x65, 0x73,</div><div class='del'>-0x3b, 0x4d, 0xe9, 0x72, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x3b, 0x58, 0x6f, 0x76, 0x65, 0x73, 0x3b, 0x56, 0x65, 0x6e, 0x72,</div><div class='del'>-0x65, 0x73, 0x3b, 0x53, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x58, 0x3b,</div><div class='del'>-0x56, 0x3b, 0x53, 0x3b, 0x10d9, 0x10d5, 0x10d8, 0x3b, 0x10dd, 0x10e0, 0x10e8, 0x3b, 0x10e1, 0x10d0, 0x10db, 0x3b, 0x10dd, 0x10d7, 0x10ee, 0x3b,</div><div class='del'>-0x10ee, 0x10e3, 0x10d7, 0x3b, 0x10de, 0x10d0, 0x10e0, 0x3b, 0x10e8, 0x10d0, 0x10d1, 0x3b, 0x10d9, 0x10d5, 0x10d8, 0x10e0, 0x10d0, 0x3b, 0x10dd, 0x10e0,</div><div class='del'>-0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8, 0x3b, 0x10e1, 0x10d0, 0x10db, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8, 0x3b, 0x10dd, 0x10d7, 0x10ee,</div><div class='del'>-0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8, 0x3b, 0x10ee, 0x10e3, 0x10d7, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8, 0x3b, 0x10de, 0x10d0, 0x10e0,</div><div class='del'>-0x10d0, 0x10e1, 0x10d9, 0x10d4, 0x10d5, 0x10d8, 0x3b, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8, 0x3b, 0x10d9, 0x3b, 0x10dd, 0x3b, 0x10e1, 0x3b,</div><div class='del'>-0x10dd, 0x3b, 0x10ee, 0x3b, 0x10de, 0x3b, 0x10e8, 0x3b, 0x53, 0x6f, 0x3b, 0x4d, 0x6f, 0x3b, 0x44, 0x69, 0x3b, 0x4d, 0x69, 0x3b,</div><div class='del'>-0x44, 0x6f, 0x3b, 0x46, 0x72, 0x3b, 0x53, 0x61, 0x3b, 0x53, 0x6f, 0x6e, 0x6e, 0x74, 0x61, 0x67, 0x3b, 0x4d, 0x6f, 0x6e,</div><div class='del'>-0x74, 0x61, 0x67, 0x3b, 0x44, 0x69, 0x65, 0x6e, 0x73, 0x74, 0x61, 0x67, 0x3b, 0x4d, 0x69, 0x74, 0x74, 0x77, 0x6f, 0x63,</div><div class='del'>-0x68, 0x3b, 0x44, 0x6f, 0x6e, 0x6e, 0x65, 0x72, 0x73, 0x74, 0x61, 0x67, 0x3b, 0x46, 0x72, 0x65, 0x69, 0x74, 0x61, 0x67,</div><div class='del'>-0x3b, 0x53, 0x61, 0x6d, 0x73, 0x74, 0x61, 0x67, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x46,</div><div class='del'>-0x3b, 0x53, 0x3b, 0x53, 0x6f, 0x2e, 0x3b, 0x4d, 0x6f, 0x2e, 0x3b, 0x44, 0x69, 0x2e, 0x3b, 0x4d, 0x69, 0x2e, 0x3b, 0x44,</div><div class='del'>-0x6f, 0x2e, 0x3b, 0x46, 0x72, 0x2e, 0x3b, 0x53, 0x61, 0x2e, 0x3b, 0x53, 0x6f, 0x6e, 0x3b, 0x4d, 0x6f, 0x6e, 0x3b, 0x44,</div><div class='del'>-0x69, 0x65, 0x3b, 0x4d, 0x69, 0x74, 0x3b, 0x44, 0x6f, 0x6e, 0x3b, 0x46, 0x72, 0x65, 0x3b, 0x53, 0x61, 0x6d, 0x3b, 0x39a,</div><div class='del'>-0x3c5, 0x3c1, 0x3b, 0x394, 0x3b5, 0x3c5, 0x3b, 0x3a4, 0x3c1, 0x3b9, 0x3b, 0x3a4, 0x3b5, 0x3c4, 0x3b, 0x3a0, 0x3b5, 0x3bc, 0x3b, 0x3a0,</div><div class='del'>-0x3b1, 0x3c1, 0x3b, 0x3a3, 0x3b1, 0x3b2, 0x3b, 0x39a, 0x3c5, 0x3c1, 0x3b9, 0x3b1, 0x3ba, 0x3ae, 0x3b, 0x394, 0x3b5, 0x3c5, 0x3c4, 0x3ad,</div><div class='del'>-0x3c1, 0x3b1, 0x3b, 0x3a4, 0x3c1, 0x3af, 0x3c4, 0x3b7, 0x3b, 0x3a4, 0x3b5, 0x3c4, 0x3ac, 0x3c1, 0x3c4, 0x3b7, 0x3b, 0x3a0, 0x3ad, 0x3bc,</div><div class='del'>-0x3c0, 0x3c4, 0x3b7, 0x3b, 0x3a0, 0x3b1, 0x3c1, 0x3b1, 0x3c3, 0x3ba, 0x3b5, 0x3c5, 0x3ae, 0x3b, 0x3a3, 0x3ac, 0x3b2, 0x3b2, 0x3b1, 0x3c4,</div><div class='del'>-0x3bf, 0x3b, 0x39a, 0x3b, 0x394, 0x3b, 0x3a4, 0x3b, 0x3a4, 0x3b, 0x3a0, 0x3b, 0x3a0, 0x3b, 0x3a3, 0x3b, 0x73, 0x61, 0x62, 0x3b,</div><div class='del'>-0x61, 0x74, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x70, 0x69, 0x6e, 0x3b, 0x73, 0x69, 0x73, 0x3b, 0x74, 0x61, 0x6c, 0x3b,</div><div class='del'>-0x61, 0x72, 0x66, 0x3b, 0x73, 0x61, 0x62, 0x61, 0x61, 0x74, 0x3b, 0x61, 0x74, 0x61, 0x61, 0x73, 0x69, 0x6e, 0x6e, 0x67,</div><div class='del'>-0x6f, 0x72, 0x6e, 0x65, 0x71, 0x3b, 0x6d, 0x61, 0x72, 0x6c, 0x75, 0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65, 0x71, 0x3b,</div><div class='del'>-0x70, 0x69, 0x6e, 0x67, 0x61, 0x73, 0x75, 0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65, 0x71, 0x3b, 0x73, 0x69, 0x73, 0x61,</div><div class='del'>-0x6d, 0x61, 0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65, 0x71, 0x3b, 0x74, 0x61, 0x6c, 0x6c, 0x69, 0x6d, 0x61, 0x6e, 0x6e,</div><div class='del'>-0x67, 0x6f, 0x72, 0x6e, 0x65, 0x71, 0x3b, 0x61, 0x72, 0x66, 0x69, 0x6e, 0x69, 0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65,</div><div class='del'>-0x71, 0x3b, 0x53, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0xab0, 0xab5, 0xabf, 0x3b,</div><div class='del'>-0xab8, 0xacb, 0xaae, 0x3b, 0xaae, 0xa82, 0xa97, 0xab3, 0x3b, 0xaac, 0xac1, 0xaa7, 0x3b, 0xa97, 0xac1, 0xab0, 0xac1, 0x3b, 0xab6, 0xac1,</div><div class='del'>-0xa95, 0xacd, 0xab0, 0x3b, 0xab6, 0xaa8, 0xabf, 0x3b, 0xab0, 0xab5, 0xabf, 0xab5, 0xabe, 0xab0, 0x3b, 0xab8, 0xacb, 0xaae, 0xab5, 0xabe,</div><div class='del'>-0xab0, 0x3b, 0xaae, 0xa82, 0xa97, 0xab3, 0xab5, 0xabe, 0xab0, 0x3b, 0xaac, 0xac1, 0xaa7, 0xab5, 0xabe, 0xab0, 0x3b, 0xa97, 0xac1, 0xab0,</div><div class='del'>-0xac1, 0xab5, 0xabe, 0xab0, 0x3b, 0xab6, 0xac1, 0xa95, 0xacd, 0xab0, 0xab5, 0xabe, 0xab0, 0x3b, 0xab6, 0xaa8, 0xabf, 0xab5, 0xabe, 0xab0,</div><div class='del'>-0x3b, 0xab0, 0x3b, 0xab8, 0xacb, 0x3b, 0xaae, 0xa82, 0x3b, 0xaac, 0xac1, 0x3b, 0xa97, 0xac1, 0x3b, 0xab6, 0xac1, 0x3b, 0xab6, 0x3b,</div><div class='del'>-0x4c, 0x68, 0x3b, 0x4c, 0x69, 0x3b, 0x54, 0x61, 0x3b, 0x4c, 0x72, 0x3b, 0x41, 0x6c, 0x3b, 0x4a, 0x75, 0x3b, 0x41, 0x73,</div><div class='del'>-0x3b, 0x4c, 0x61, 0x68, 0x61, 0x64, 0x69, 0x3b, 0x4c, 0x69, 0x74, 0x69, 0x6e, 0x69, 0x6e, 0x3b, 0x54, 0x61, 0x6c, 0x61,</div><div class='del'>-0x74, 0x61, 0x3b, 0x4c, 0x61, 0x72, 0x61, 0x62, 0x61, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x3b, 0x4a, 0x75,</div><div class='del'>-0x6d, 0x6d, 0x61, 0x27, 0x61, 0x3b, 0x41, 0x73, 0x61, 0x62, 0x61, 0x72, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x54, 0x3b, 0x4c,</div><div class='del'>-0x3b, 0x41, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x644, 0x64e, 0x62d, 0x3b, 0x644, 0x650, 0x62a, 0x3b, 0x62a, 0x64e, 0x644, 0x3b, 0x644,</div><div class='del'>-0x64e, 0x631, 0x3b, 0x623, 0x64e, 0x644, 0x652, 0x62d, 0x3b, 0x62c, 0x64f, 0x645, 0x3b, 0x623, 0x64e, 0x633, 0x64e, 0x3b, 0x644, 0x64e,</div><div class='del'>-0x62d, 0x64e, 0x62f, 0x650, 0x3b, 0x644, 0x650, 0x62a, 0x650, 0x646, 0x650, 0x646, 0x652, 0x3b, 0x62a, 0x64e, 0x644, 0x64e, 0x62a, 0x64e,</div><div class='del'>-0x3b, 0x644, 0x64e, 0x631, 0x64e, 0x628, 0x64e, 0x3b, 0x623, 0x64e, 0x644, 0x652, 0x62d, 0x64e, 0x645, 0x650, 0x633, 0x652, 0x3b, 0x62c,</div><div class='del'>-0x64f, 0x645, 0x64e, 0x639, 0x64e, 0x3b, 0x623, 0x64e, 0x633, 0x64e, 0x628, 0x64e, 0x631, 0x652, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d0,</div><div class='del'>-0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d1, 0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d2, 0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20,</div><div class='del'>-0x5d3, 0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d4, 0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d5, 0x5f3, 0x3b, 0x5e9, 0x5d1, 0x5ea,</div><div class='del'>-0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e8, 0x5d0, 0x5e9, 0x5d5, 0x5df, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e9, 0x5e0, 0x5d9, 0x3b, 0x5d9,</div><div class='del'>-0x5d5, 0x5dd, 0x20, 0x5e9, 0x5dc, 0x5d9, 0x5e9, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x5d9, 0x3b, 0x5d9,</div><div class='del'>-0x5d5, 0x5dd, 0x20, 0x5d7, 0x5de, 0x5d9, 0x5e9, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e9, 0x5d9, 0x5e9, 0x5d9, 0x3b, 0x5d9, 0x5d5,</div><div class='del'>-0x5dd, 0x20, 0x5e9, 0x5d1, 0x5ea, 0x3b, 0x5d0, 0x3b, 0x5d1, 0x3b, 0x5d2, 0x3b, 0x5d3, 0x3b, 0x5d4, 0x3b, 0x5d5, 0x3b, 0x5e9, 0x3b,</div><div class='del'>-0x930, 0x935, 0x93f, 0x2e, 0x3b, 0x938, 0x94b, 0x92e, 0x2e, 0x3b, 0x92e, 0x902, 0x917, 0x932, 0x2e, 0x3b, 0x92c, 0x941, 0x927, 0x2e,</div><div class='del'>-0x3b, 0x92c, 0x943, 0x939, 0x2e, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x2e, 0x3b, 0x936, 0x928, 0x93f, 0x2e, 0x3b, 0x930, 0x935,</div><div class='del'>-0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x938, 0x94b, 0x92e, 0x935, 0x93e, 0x930, 0x3b, 0x92e, 0x902, 0x917, 0x932, 0x935, 0x93e, 0x930, 0x3b,</div><div class='del'>-0x92c, 0x941, 0x927, 0x935, 0x93e, 0x930, 0x3b, 0x92c, 0x943, 0x939, 0x938, 0x94d, 0x92a, 0x924, 0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x936,</div><div class='del'>-0x941, 0x915, 0x94d, 0x930, 0x935, 0x93e, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x930, 0x3b, 0x938, 0x94b, 0x3b,</div><div class='del'>-0x92e, 0x902, 0x3b, 0x92c, 0x941, 0x3b, 0x917, 0x941, 0x3b, 0x936, 0x941, 0x3b, 0x936, 0x3b, 0x56, 0x3b, 0x48, 0x3b, 0x4b, 0x3b,</div><div class='del'>-0x53, 0x7a, 0x65, 0x3b, 0x43, 0x73, 0x3b, 0x50, 0x3b, 0x53, 0x7a, 0x6f, 0x3b, 0x76, 0x61, 0x73, 0xe1, 0x72, 0x6e, 0x61,</div><div class='del'>-0x70, 0x3b, 0x68, 0xe9, 0x74, 0x66, 0x151, 0x3b, 0x6b, 0x65, 0x64, 0x64, 0x3b, 0x73, 0x7a, 0x65, 0x72, 0x64, 0x61, 0x3b,</div><div class='del'>-0x63, 0x73, 0xfc, 0x74, 0xf6, 0x72, 0x74, 0xf6, 0x6b, 0x3b, 0x70, 0xe9, 0x6e, 0x74, 0x65, 0x6b, 0x3b, 0x73, 0x7a, 0x6f,</div><div class='del'>-0x6d, 0x62, 0x61, 0x74, 0x3b, 0x56, 0x3b, 0x48, 0x3b, 0x4b, 0x3b, 0x53, 0x7a, 0x3b, 0x43, 0x73, 0x3b, 0x50, 0x3b, 0x53,</div><div class='del'>-0x7a, 0x3b, 0x73, 0x75, 0x6e, 0x3b, 0x6d, 0xe1, 0x6e, 0x3b, 0xfe, 0x72, 0x69, 0x3b, 0x6d, 0x69, 0xf0, 0x3b, 0x66, 0x69,</div><div class='del'>-0x6d, 0x3b, 0x66, 0xf6, 0x73, 0x3b, 0x6c, 0x61, 0x75, 0x3b, 0x73, 0x75, 0x6e, 0x6e, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72,</div><div class='del'>-0x3b, 0x6d, 0xe1, 0x6e, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0xfe, 0x72, 0x69, 0xf0, 0x6a, 0x75, 0x64, 0x61, 0x67,</div><div class='del'>-0x75, 0x72, 0x3b, 0x6d, 0x69, 0xf0, 0x76, 0x69, 0x6b, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x66, 0x69, 0x6d, 0x6d,</div><div class='del'>-0x74, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x66, 0xf6, 0x73, 0x74, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x6c,</div><div class='del'>-0x61, 0x75, 0x67, 0x61, 0x72, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x73, 0x3b, 0x6d, 0x3b, 0xfe, 0x3b, 0x6d, 0x3b, 0x66,</div><div class='del'>-0x3b, 0x66, 0x3b, 0x6c, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0xde, 0x3b, 0x4d, 0x3b, 0x46, 0x3b, 0x46, 0x3b, 0x4c, 0x3b, 0x4d,</div><div class='del'>-0x69, 0x6e, 0x3b, 0x53, 0x65, 0x6e, 0x3b, 0x53, 0x65, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x3b, 0x4b, 0x61, 0x6d, 0x3b, 0x4a,</div><div class='del'>-0x75, 0x6d, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4d, 0x69, 0x6e, 0x67, 0x67, 0x75, 0x3b, 0x53, 0x65, 0x6e, 0x69, 0x6e, 0x3b,</div><div class='del'>-0x53, 0x65, 0x6c, 0x61, 0x73, 0x61, 0x3b, 0x52, 0x61, 0x62, 0x75, 0x3b, 0x4b, 0x61, 0x6d, 0x69, 0x73, 0x3b, 0x4a, 0x75,</div><div class='del'>-0x6d, 0x61, 0x74, 0x3b, 0x53, 0x61, 0x62, 0x74, 0x75, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x52, 0x3b, 0x4b, 0x3b,</div><div class='del'>-0x4a, 0x3b, 0x53, 0x3b, 0x44, 0x6f, 0x6d, 0x68, 0x3b, 0x4c, 0x75, 0x61, 0x6e, 0x3b, 0x4d, 0xe1, 0x69, 0x72, 0x74, 0x3b,</div><div class='del'>-0x43, 0xe9, 0x61, 0x64, 0x3b, 0x44, 0xe9, 0x61, 0x72, 0x3b, 0x41, 0x6f, 0x69, 0x6e, 0x65, 0x3b, 0x53, 0x61, 0x74, 0x68,</div><div class='del'>-0x3b, 0x44, 0xe9, 0x20, 0x44, 0x6f, 0x6d, 0x68, 0x6e, 0x61, 0x69, 0x67, 0x68, 0x3b, 0x44, 0xe9, 0x20, 0x4c, 0x75, 0x61,</div><div class='del'>-0x69, 0x6e, 0x3b, 0x44, 0xe9, 0x20, 0x4d, 0xe1, 0x69, 0x72, 0x74, 0x3b, 0x44, 0xe9, 0x20, 0x43, 0xe9, 0x61, 0x64, 0x61,</div><div class='del'>-0x6f, 0x69, 0x6e, 0x3b, 0x44, 0xe9, 0x61, 0x72, 0x64, 0x61, 0x6f, 0x69, 0x6e, 0x3b, 0x44, 0xe9, 0x20, 0x68, 0x41, 0x6f,</div><div class='del'>-0x69, 0x6e, 0x65, 0x3b, 0x44, 0xe9, 0x20, 0x53, 0x61, 0x74, 0x68, 0x61, 0x69, 0x72, 0x6e, 0x3b, 0x44, 0x3b, 0x4c, 0x3b,</div><div class='del'>-0x4d, 0x3b, 0x43, 0x3b, 0x44, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x64, 0x6f, 0x6d, 0x3b, 0x6c, 0x75, 0x6e, 0x3b, 0x6d, 0x61,</div><div class='del'>-0x72, 0x3b, 0x6d, 0x65, 0x72, 0x3b, 0x67, 0x69, 0x6f, 0x3b, 0x76, 0x65, 0x6e, 0x3b, 0x73, 0x61, 0x62, 0x3b, 0x44, 0x6f,</div><div class='del'>-0x6d, 0x65, 0x6e, 0x69, 0x63, 0x61, 0x3b, 0x4c, 0x75, 0x6e, 0x65, 0x64, 0xec, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x65, 0x64,</div><div class='del'>-0xec, 0x3b, 0x4d, 0x65, 0x72, 0x63, 0x6f, 0x6c, 0x65, 0x64, 0xec, 0x3b, 0x47, 0x69, 0x6f, 0x76, 0x65, 0x64, 0xec, 0x3b,</div><div class='del'>-0x56, 0x65, 0x6e, 0x65, 0x72, 0x64, 0xec, 0x3b, 0x53, 0x61, 0x62, 0x61, 0x74, 0x6f, 0x3b, 0x44, 0x3b, 0x4c, 0x3b, 0x4d,</div><div class='del'>-0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x64, 0x6f, 0x6d, 0x65, 0x6e, 0x69, 0x63, 0x61, 0x3b, 0x6c, 0x75,</div><div class='del'>-0x6e, 0x65, 0x64, 0xec, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x65, 0x64, 0xec, 0x3b, 0x6d, 0x65, 0x72, 0x63, 0x6f, 0x6c, 0x65,</div><div class='del'>-0x64, 0xec, 0x3b, 0x67, 0x69, 0x6f, 0x76, 0x65, 0x64, 0xec, 0x3b, 0x76, 0x65, 0x6e, 0x65, 0x72, 0x64, 0xec, 0x3b, 0x73,</div><div class='del'>-0x61, 0x62, 0x61, 0x74, 0x6f, 0x3b, 0x65e5, 0x3b, 0x6708, 0x3b, 0x706b, 0x3b, 0x6c34, 0x3b, 0x6728, 0x3b, 0x91d1, 0x3b, 0x571f, 0x3b,</div><div class='del'>-0x65e5, 0x66dc, 0x65e5, 0x3b, 0x6708, 0x66dc, 0x65e5, 0x3b, 0x706b, 0x66dc, 0x65e5, 0x3b, 0x6c34, 0x66dc, 0x65e5, 0x3b, 0x6728, 0x66dc, 0x65e5, 0x3b,</div><div class='del'>-0x91d1, 0x66dc, 0x65e5, 0x3b, 0x571f, 0x66dc, 0x65e5, 0x3b, 0xcb0, 0x2e, 0x3b, 0xcb8, 0xccb, 0x2e, 0x3b, 0xcae, 0xc82, 0x2e, 0x3b, 0xcac,</div><div class='del'>-0xcc1, 0x2e, 0x3b, 0xc97, 0xcc1, 0x2e, 0x3b, 0xcb6, 0xcc1, 0x2e, 0x3b, 0xcb6, 0xca8, 0xcbf, 0x2e, 0x3b, 0xcb0, 0xcb5, 0xcbf, 0xcb5,</div><div class='del'>-0xcbe, 0xcb0, 0x3b, 0xcb8, 0xccb, 0xcae, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcae, 0xc82, 0xc97, 0xcb3, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcac, 0xcc1,</div><div class='del'>-0xca7, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xc97, 0xcc1, 0xcb0, 0xcc1, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcb6, 0xcc1, 0xc95, 0xccd, 0xcb0, 0xcb5, 0xcbe,</div><div class='del'>-0xcb0, 0x3b, 0xcb6, 0xca8, 0xcbf, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcb0, 0x3b, 0xcb8, 0xccb, 0x3b, 0xcae, 0xc82, 0x3b, 0xcac, 0xcc1, 0x3b,</div><div class='del'>-0xc97, 0xcc1, 0x3b, 0xcb6, 0xcc1, 0x3b, 0xcb6, 0x3b, 0x436, 0x441, 0x2e, 0x3b, 0x434, 0x441, 0x2e, 0x3b, 0x441, 0x441, 0x2e, 0x3b,</div><div class='del'>-0x441, 0x440, 0x2e, 0x3b, 0x431, 0x441, 0x2e, 0x3b, 0x436, 0x43c, 0x2e, 0x3b, 0x441, 0x4bb, 0x2e, 0x3b, 0x436, 0x435, 0x43a, 0x441,</div><div class='del'>-0x435, 0x43d, 0x456, 0x3b, 0x434, 0x443, 0x439, 0x441, 0x435, 0x43d, 0x431, 0x456, 0x3b, 0x441, 0x435, 0x439, 0x441, 0x435, 0x43d, 0x431,</div><div class='del'>-0x456, 0x3b, 0x441, 0x4d9, 0x440, 0x435, 0x43d, 0x431, 0x456, 0x3b, 0x431, 0x435, 0x439, 0x441, 0x435, 0x43d, 0x431, 0x456, 0x3b, 0x436,</div><div class='del'>-0x4b1, 0x43c, 0x430, 0x3b, 0x441, 0x435, 0x43d, 0x431, 0x456, 0x3b, 0x63, 0x79, 0x75, 0x2e, 0x3b, 0x6d, 0x62, 0x65, 0x2e, 0x3b,</div><div class='del'>-0x6b, 0x61, 0x62, 0x2e, 0x3b, 0x67, 0x74, 0x75, 0x2e, 0x3b, 0x6b, 0x61, 0x6e, 0x2e, 0x3b, 0x67, 0x6e, 0x75, 0x2e, 0x3b,</div><div class='del'>-0x67, 0x6e, 0x64, 0x2e, 0x3b, 0x4b, 0x75, 0x20, 0x63, 0x79, 0x75, 0x6d, 0x77, 0x65, 0x72, 0x75, 0x3b, 0x4b, 0x75, 0x77,</div><div class='del'>-0x61, 0x20, 0x6d, 0x62, 0x65, 0x72, 0x65, 0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x62, 0x69, 0x72, 0x69, 0x3b,</div><div class='del'>-0x4b, 0x75, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x6e,</div><div class='del'>-0x65, 0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x75, 0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x67,</div><div class='del'>-0x61, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x74, 0x75, 0x3b, 0xc77c, 0x3b, 0xc6d4, 0x3b, 0xd654, 0x3b, 0xc218, 0x3b, 0xbaa9, 0x3b, 0xae08,</div><div class='del'>-0x3b, 0xd1a0, 0x3b, 0xc77c, 0xc694, 0xc77c, 0x3b, 0xc6d4, 0xc694, 0xc77c, 0x3b, 0xd654, 0xc694, 0xc77c, 0x3b, 0xc218, 0xc694, 0xc77c, 0x3b, 0xbaa9,</div><div class='del'>-0xc694, 0xc77c, 0x3b, 0xae08, 0xc694, 0xc77c, 0x3b, 0xd1a0, 0xc694, 0xc77c, 0x3b, 0x6cc, 0x6d5, 0x6a9, 0x634, 0x6d5, 0x645, 0x645, 0x6d5, 0x3b,</div><div class='del'>-0x62f, 0x648, 0x648, 0x634, 0x6d5, 0x645, 0x645, 0x6d5, 0x3b, 0x633, 0x6ce, 0x634, 0x6d5, 0x645, 0x645, 0x6d5, 0x3b, 0x686, 0x648, 0x627,</div><div class='del'>-0x631, 0x634, 0x6d5, 0x645, 0x645, 0x6d5, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x6cc, 0x3b, 0x62f, 0x3b, 0x633, 0x3b, 0x34,</div><div class='del'>-0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x79, 0x15f, 0x3b, 0x64, 0x15f, 0x3b, 0x73, 0x15f, 0x3b, 0xe7, 0x15f, 0x3b, 0x70,</div><div class='del'>-0x15f, 0x3b, 0xee, 0x6e, 0x3b, 0x15f, 0x3b, 0x79, 0x65, 0x6b, 0x15f, 0x65, 0x6d, 0x3b, 0x64, 0x75, 0x15f, 0x65, 0x6d, 0x3b,</div><div class='del'>-0x15f, 0xea, 0x3b, 0xe7, 0x61, 0x72, 0x15f, 0x65, 0x6d, 0x3b, 0x70, 0xea, 0x6e, 0x63, 0x15f, 0x65, 0x6d, 0x3b, 0xee, 0x6e,</div><div class='del'>-0x3b, 0x15f, 0x65, 0x6d, 0xee, 0x3b, 0x79, 0x3b, 0x64, 0x3b, 0x73, 0x3b, 0xe7, 0x3b, 0x70, 0x3b, 0xee, 0x3b, 0x15f, 0x3b,</div><div class='del'>-0xead, 0xeb2, 0x2e, 0x3b, 0xe88, 0x2e, 0x3b, 0xead, 0x2e, 0x3b, 0xe9e, 0x2e, 0x3b, 0xe9e, 0xeab, 0x2e, 0x3b, 0xeaa, 0xe81, 0x2e,</div><div class='del'>-0x3b, 0xeaa, 0x2e, 0x3b, 0xea7, 0xeb1, 0xe99, 0xead, 0xeb2, 0xe97, 0xeb4, 0xe94, 0x3b, 0xea7, 0xeb1, 0xe99, 0xe88, 0xeb1, 0xe99, 0x3b,</div><div class='del'>-0xea7, 0xeb1, 0xe99, 0xead, 0xeb1, 0xe87, 0xe84, 0xeb2, 0xe99, 0x3b, 0xea7, 0xeb1, 0xe99, 0xe9e, 0xeb8, 0xe94, 0x3b, 0xea7, 0xeb1, 0xe99,</div><div class='del'>-0xe9e, 0xeb0, 0xeab, 0xeb1, 0xe94, 0x3b, 0xea7, 0xeb1, 0xe99, 0xeaa, 0xeb8, 0xe81, 0x3b, 0xea7, 0xeb1, 0xe99, 0xec0, 0xeaa, 0xebb, 0xeb2,</div><div class='del'>-0x3b, 0x53, 0x76, 0x3b, 0x50, 0x72, 0x3b, 0x4f, 0x74, 0x3b, 0x54, 0x72, 0x3b, 0x43, 0x65, 0x3b, 0x50, 0x6b, 0x3b, 0x53,</div><div class='del'>-0x65, 0x3b, 0x73, 0x76, 0x113, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x70, 0x69, 0x72, 0x6d, 0x64, 0x69, 0x65, 0x6e,</div><div class='del'>-0x61, 0x3b, 0x6f, 0x74, 0x72, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x74, 0x72, 0x65, 0x161, 0x64, 0x69, 0x65, 0x6e, 0x61,</div><div class='del'>-0x3b, 0x63, 0x65, 0x74, 0x75, 0x72, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x70, 0x69, 0x65, 0x6b, 0x74, 0x64, 0x69,</div><div class='del'>-0x65, 0x6e, 0x61, 0x3b, 0x73, 0x65, 0x73, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x53, 0x3b, 0x50, 0x3b, 0x4f, 0x3b,</div><div class='del'>-0x54, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x65, 0x79, 0x65, 0x3b, 0x6d, 0x31, 0x3b, 0x6d, 0x32, 0x3b, 0x6d, 0x33,</div><div class='del'>-0x3b, 0x6d, 0x34, 0x3b, 0x6d, 0x35, 0x3b, 0x6d, 0x70, 0x73, 0x3b, 0x65, 0x79, 0x65, 0x6e, 0x67, 0x61, 0x3b, 0x6d, 0x6f,</div><div class='del'>-0x6b, 0x254, 0x6c, 0x254, 0x20, 0x79, 0x61, 0x20, 0x6c, 0x69, 0x62, 0x6f, 0x73, 0xf3, 0x3b, 0x6d, 0x6f, 0x6b, 0x254, 0x6c,</div><div class='del'>-0x254, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x62, 0x61, 0x6c, 0xe9, 0x3b, 0x6d, 0x6f, 0x6b, 0x254, 0x6c, 0x254, 0x20, 0x79,</div><div class='del'>-0x61, 0x20, 0x6d, 0xed, 0x73, 0xe1, 0x74, 0x6f, 0x3b, 0x6d, 0x6f, 0x6b, 0x254, 0x6c, 0x254, 0x20, 0x79, 0x61, 0x20, 0x6d,</div><div class='del'>-0xed, 0x6e, 0xe9, 0x69, 0x3b, 0x6d, 0x6f, 0x6b, 0x254, 0x6c, 0x254, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x74, 0xe1, 0x6e,</div><div class='del'>-0x6f, 0x3b, 0x6d, 0x70, 0x254, 0x301, 0x73, 0x254, 0x3b, 0x53, 0x6b, 0x3b, 0x50, 0x69, 0x3b, 0x41, 0x3b, 0x54, 0x3b, 0x4b,</div><div class='del'>-0x3b, 0x50, 0x65, 0x3b, 0x160, 0x3b, 0x73, 0x65, 0x6b, 0x6d, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x70, 0x69,</div><div class='del'>-0x72, 0x6d, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x61, 0x6e, 0x74, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69,</div><div class='del'>-0x73, 0x3b, 0x74, 0x72, 0x65, 0x10d, 0x69, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x6b, 0x65, 0x74, 0x76, 0x69,</div><div class='del'>-0x72, 0x74, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x70, 0x65, 0x6e, 0x6b, 0x74, 0x61, 0x64, 0x69, 0x65, 0x6e,</div><div class='del'>-0x69, 0x73, 0x3b, 0x161, 0x65, 0x161, 0x74, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x53, 0x3b, 0x50, 0x3b, 0x41,</div><div class='del'>-0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x50, 0x3b, 0x160, 0x3b, 0x53, 0x6b, 0x3b, 0x50, 0x72, 0x3b, 0x41, 0x6e, 0x3b, 0x54, 0x72,</div><div class='del'>-0x3b, 0x4b, 0x74, 0x3b, 0x50, 0x6e, 0x3b, 0x160, 0x74, 0x3b, 0x43d, 0x435, 0x434, 0x2e, 0x3b, 0x43f, 0x43e, 0x43d, 0x2e, 0x3b,</div><div class='del'>-0x432, 0x442, 0x2e, 0x3b, 0x441, 0x440, 0x435, 0x2e, 0x3b, 0x447, 0x435, 0x442, 0x2e, 0x3b, 0x43f, 0x435, 0x442, 0x2e, 0x3b, 0x441,</div><div class='del'>-0x430, 0x431, 0x2e, 0x3b, 0x43d, 0x435, 0x434, 0x435, 0x43b, 0x430, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x43b, 0x43d, 0x438,</div><div class='del'>-0x43a, 0x3b, 0x432, 0x442, 0x43e, 0x440, 0x43d, 0x438, 0x43a, 0x3b, 0x441, 0x440, 0x435, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432,</div><div class='del'>-0x440, 0x442, 0x43e, 0x43a, 0x3b, 0x43f, 0x435, 0x442, 0x43e, 0x43a, 0x3b, 0x441, 0x430, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x41, 0x6c,</div><div class='del'>-0x61, 0x68, 0x3b, 0x41, 0x6c, 0x61, 0x74, 0x73, 0x3b, 0x54, 0x61, 0x6c, 0x3b, 0x41, 0x6c, 0x61, 0x72, 0x3b, 0x41, 0x6c,</div><div class='del'>-0x61, 0x6b, 0x3b, 0x5a, 0x6f, 0x6d, 0x3b, 0x41, 0x73, 0x61, 0x62, 0x3b, 0x41, 0x6c, 0x61, 0x68, 0x61, 0x64, 0x79, 0x3b,</div><div class='del'>-0x41, 0x6c, 0x61, 0x74, 0x73, 0x69, 0x6e, 0x61, 0x69, 0x6e, 0x79, 0x3b, 0x54, 0x61, 0x6c, 0x61, 0x74, 0x61, 0x3b, 0x41,</div><div class='del'>-0x6c, 0x61, 0x72, 0x6f, 0x62, 0x69, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x6b, 0x61, 0x6d, 0x69, 0x73, 0x79, 0x3b, 0x5a, 0x6f,</div><div class='del'>-0x6d, 0x61, 0x3b, 0x41, 0x73, 0x61, 0x62, 0x6f, 0x74, 0x73, 0x79, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x54, 0x3b, 0x41, 0x3b,</div><div class='del'>-0x41, 0x3b, 0x5a, 0x3b, 0x41, 0x3b, 0x41, 0x68, 0x64, 0x3b, 0x49, 0x73, 0x6e, 0x3b, 0x53, 0x65, 0x6c, 0x3b, 0x52, 0x61,</div><div class='del'>-0x62, 0x3b, 0x4b, 0x68, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x41, 0x68, 0x61, 0x64, 0x3b, 0x49,</div><div class='del'>-0x73, 0x6e, 0x69, 0x6e, 0x3b, 0x53, 0x65, 0x6c, 0x61, 0x73, 0x61, 0x3b, 0x52, 0x61, 0x62, 0x75, 0x3b, 0x4b, 0x68, 0x61,</div><div class='del'>-0x6d, 0x69, 0x73, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x74, 0x3b, 0x53, 0x61, 0x62, 0x74, 0x75, 0x3b, 0xd1e, 0xd3e, 0xd2f,</div><div class='del'>-0xd30, 0xd4d, 0x200d, 0x3b, 0xd24, 0xd3f, 0xd19, 0xd4d, 0xd15, 0xd33, 0xd4d, 0x200d, 0x3b, 0xd1a, 0xd4a, 0xd35, 0xd4d, 0xd35, 0x3b, 0xd2c,</div><div class='del'>-0xd41, 0xd27, 0xd28, 0xd4d, 0x200d, 0x3b, 0xd35, 0xd4d, 0xd2f, 0xd3e, 0xd34, 0xd02, 0x3b, 0xd35, 0xd46, 0xd33, 0xd4d, 0xd33, 0xd3f, 0x3b,</div><div class='del'>-0xd36, 0xd28, 0xd3f, 0x3b, 0xd1e, 0xd3e, 0xd2f, 0xd31, 0xd3e, 0xd34, 0xd4d, 0xd1a, 0x3b, 0xd24, 0xd3f, 0xd19, 0xd4d, 0xd15, 0xd33, 0xd3e,</div><div class='del'>-0xd34, 0xd4d, 0xd1a, 0x3b, 0xd1a, 0xd4a, 0xd35, 0xd4d, 0xd35, 0xd3e, 0xd34, 0xd4d, 0xd1a, 0x3b, 0xd2c, 0xd41, 0xd27, 0xd28, 0xd3e, 0xd34,</div><div class='del'>-0xd4d, 0xd1a, 0x3b, 0xd35, 0xd4d, 0xd2f, 0xd3e, 0xd34, 0xd3e, 0xd34, 0xd4d, 0xd1a, 0x3b, 0xd35, 0xd46, 0xd33, 0xd4d, 0xd33, 0xd3f, 0xd2f,</div><div class='del'>-0xd3e, 0xd34, 0xd4d, 0xd1a, 0x3b, 0xd36, 0xd28, 0xd3f, 0xd2f, 0xd3e, 0xd34, 0xd4d, 0xd1a, 0x3b, 0xd1e, 0xd3e, 0x3b, 0xd24, 0xd3f, 0x3b,</div><div class='del'>-0xd1a, 0xd4a, 0x3b, 0xd2c, 0xd41, 0x3b, 0xd35, 0xd4d, 0xd2f, 0xd3e, 0x3b, 0xd35, 0xd46, 0x3b, 0xd36, 0x3b, 0x126, 0x61, 0x64, 0x3b,</div><div class='del'>-0x54, 0x6e, 0x65, 0x3b, 0x54, 0x6c, 0x69, 0x3b, 0x45, 0x72, 0x62, 0x3b, 0x126, 0x61, 0x6d, 0x3b, 0x120, 0x69, 0x6d, 0x3b,</div><div class='del'>-0x53, 0x69, 0x62, 0x3b, 0x49, 0x6c, 0x2d, 0x126, 0x61, 0x64, 0x64, 0x3b, 0x49, 0x74, 0x2d, 0x54, 0x6e, 0x65, 0x6a, 0x6e,</div><div class='del'>-0x3b, 0x49, 0x74, 0x2d, 0x54, 0x6c, 0x69, 0x65, 0x74, 0x61, 0x3b, 0x4c, 0x2d, 0x45, 0x72, 0x62, 0x67, 0x127, 0x61, 0x3b,</div><div class='del'>-0x49, 0x6c, 0x2d, 0x126, 0x61, 0x6d, 0x69, 0x73, 0x3b, 0x49, 0x6c, 0x2d, 0x120, 0x69, 0x6d, 0x67, 0x127, 0x61, 0x3b, 0x49,</div><div class='del'>-0x73, 0x2d, 0x53, 0x69, 0x62, 0x74, 0x3b, 0x126, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x45, 0x3b, 0x126, 0x3b, 0x120, 0x3b, 0x53,</div><div class='del'>-0x3b, 0x52, 0x101, 0x74, 0x61, 0x70, 0x75, 0x3b, 0x4d, 0x61, 0x6e, 0x65, 0x3b, 0x54, 0x16b, 0x72, 0x65, 0x69, 0x3b, 0x57,</div><div class='del'>-0x65, 0x6e, 0x65, 0x72, 0x65, 0x69, 0x3b, 0x54, 0x101, 0x69, 0x74, 0x65, 0x3b, 0x50, 0x61, 0x72, 0x61, 0x69, 0x72, 0x65,</div><div class='del'>-0x3b, 0x48, 0x101, 0x74, 0x61, 0x72, 0x65, 0x69, 0x3b, 0x930, 0x935, 0x93f, 0x3b, 0x938, 0x94b, 0x92e, 0x3b, 0x92e, 0x902, 0x917,</div><div class='del'>-0x933, 0x3b, 0x92c, 0x941, 0x927, 0x3b, 0x917, 0x941, 0x930, 0x941, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x3b, 0x936, 0x928, 0x93f,</div><div class='del'>-0x3b, 0x930, 0x935, 0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x938, 0x94b, 0x92e, 0x935, 0x93e, 0x930, 0x3b, 0x92e, 0x902, 0x917, 0x933, 0x935,</div><div class='del'>-0x93e, 0x930, 0x3b, 0x92c, 0x941, 0x927, 0x935, 0x93e, 0x930, 0x3b, 0x917, 0x941, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x3b, 0x936, 0x941,</div><div class='del'>-0x915, 0x94d, 0x930, 0x935, 0x93e, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x41d, 0x44f, 0x3b, 0x414, 0x430, 0x3b,</div><div class='del'>-0x41c, 0x44f, 0x3b, 0x41b, 0x445, 0x3b, 0x41f, 0x4af, 0x3b, 0x411, 0x430, 0x3b, 0x411, 0x44f, 0x3b, 0x43d, 0x44f, 0x43c, 0x3b, 0x434,</div><div class='del'>-0x430, 0x432, 0x430, 0x430, 0x3b, 0x43c, 0x44f, 0x433, 0x43c, 0x430, 0x440, 0x3b, 0x43b, 0x445, 0x430, 0x433, 0x432, 0x430, 0x3b, 0x43f,</div><div class='del'>-0x4af, 0x440, 0x44d, 0x432, 0x3b, 0x431, 0x430, 0x430, 0x441, 0x430, 0x43d, 0x3b, 0x431, 0x44f, 0x43c, 0x431, 0x430, 0x3b, 0x906, 0x907,</div><div class='del'>-0x924, 0x3b, 0x938, 0x94b, 0x92e, 0x3b, 0x92e, 0x919, 0x94d, 0x917, 0x932, 0x3b, 0x92c, 0x941, 0x927, 0x3b, 0x92c, 0x93f, 0x939, 0x940,</div><div class='del'>-0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x3b, 0x906, 0x907, 0x924, 0x92c, 0x93e, 0x930, 0x3b, 0x938, 0x94b,</div><div class='del'>-0x92e, 0x92c, 0x93e, 0x930, 0x3b, 0x92e, 0x919, 0x94d, 0x917, 0x932, 0x92c, 0x93e, 0x930, 0x3b, 0x92c, 0x941, 0x927, 0x92c, 0x93e, 0x930,</div><div class='del'>-0x3b, 0x92c, 0x93f, 0x939, 0x940, 0x92c, 0x93e, 0x930, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x92c, 0x93e, 0x930, 0x3b, 0x936, 0x928,</div><div class='del'>-0x93f, 0x92c, 0x93e, 0x930, 0x3b, 0x967, 0x3b, 0x968, 0x3b, 0x969, 0x3b, 0x96a, 0x3b, 0x96b, 0x3b, 0x96c, 0x3b, 0x96d, 0x3b, 0x906,</div><div class='del'>-0x907, 0x924, 0x935, 0x93e, 0x930, 0x3b, 0x938, 0x94b, 0x92e, 0x935, 0x93e, 0x930, 0x3b, 0x92e, 0x919, 0x94d, 0x917, 0x932, 0x935, 0x93e,</div><div class='del'>-0x930, 0x3b, 0x92c, 0x941, 0x927, 0x935, 0x93e, 0x930, 0x3b, 0x92c, 0x93f, 0x939, 0x940, 0x935, 0x93e, 0x930, 0x3b, 0x936, 0x941, 0x915,</div><div class='del'>-0x94d, 0x930, 0x935, 0x93e, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x73, 0xf8, 0x2e, 0x3b, 0x6d, 0x61, 0x2e,</div><div class='del'>-0x3b, 0x74, 0x69, 0x2e, 0x3b, 0x6f, 0x6e, 0x2e, 0x3b, 0x74, 0x6f, 0x2e, 0x3b, 0x66, 0x72, 0x2e, 0x3b, 0x6c, 0xf8, 0x2e,</div><div class='del'>-0x3b, 0x73, 0xf8, 0x6e, 0x2e, 0x3b, 0x6d, 0x61, 0x6e, 0x2e, 0x3b, 0x74, 0x69, 0x72, 0x2e, 0x3b, 0x6f, 0x6e, 0x73, 0x2e,</div><div class='del'>-0x3b, 0x74, 0x6f, 0x72, 0x2e, 0x3b, 0x66, 0x72, 0x65, 0x2e, 0x3b, 0x6c, 0xf8, 0x72, 0x2e, 0x3b, 0x44, 0x69, 0x6d, 0x65,</div><div class='del'>-0x6e, 0x67, 0x65, 0x3b, 0x64, 0x69, 0x6c, 0x75, 0x6e, 0x73, 0x3b, 0x64, 0x69, 0x6d, 0x61, 0x72, 0xe7, 0x3b, 0x64, 0x69,</div><div class='del'>-0x6d, 0xe8, 0x63, 0x72, 0x65, 0x73, 0x3b, 0x64, 0x69, 0x6a, 0xf2, 0x75, 0x73, 0x3b, 0x64, 0x69, 0x76, 0xe8, 0x6e, 0x64,</div><div class='del'>-0x72, 0x65, 0x73, 0x3b, 0x64, 0x69, 0x73, 0x73, 0x61, 0x62, 0x74, 0x65, 0x3b, 0xb30, 0xb2c, 0xb3f, 0x3b, 0xb38, 0xb4b, 0xb2e,</div><div class='del'>-0x3b, 0xb2e, 0xb19, 0xb4d, 0xb17, 0xb33, 0x3b, 0xb2c, 0xb41, 0xb27, 0x3b, 0xb17, 0xb41, 0xb30, 0xb41, 0x3b, 0xb36, 0xb41, 0xb15, 0xb4d,</div><div class='del'>-0xb30, 0x3b, 0xb36, 0xb28, 0xb3f, 0x3b, 0xb30, 0xb2c, 0xb3f, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb38, 0xb4b, 0xb2e, 0xb2c, 0xb3e, 0xb30, 0x3b,</div><div class='del'>-0xb2e, 0xb19, 0xb4d, 0xb17, 0xb33, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb2c, 0xb41, 0xb27, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb17, 0xb41, 0xb30, 0xb41,</div><div class='del'>-0xb2c, 0xb3e, 0xb30, 0x3b, 0xb36, 0xb41, 0xb15, 0xb4d, 0xb30, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb36, 0xb28, 0xb3f, 0xb2c, 0xb3e, 0xb30, 0x3b,</div><div class='del'>-0xb30, 0x3b, 0xb38, 0xb4b, 0x3b, 0xb2e, 0x3b, 0xb2c, 0xb41, 0x3b, 0xb17, 0xb41, 0x3b, 0xb36, 0xb41, 0x3b, 0xb36, 0x3b, 0x6cc, 0x6a9,</div><div class='del'>-0x634, 0x646, 0x628, 0x647, 0x3b, 0x62f, 0x648, 0x634, 0x646, 0x628, 0x647, 0x3b, 0x633, 0x647, 0x200c, 0x634, 0x646, 0x628, 0x647, 0x3b,</div><div class='del'>-0x686, 0x647, 0x627, 0x631, 0x634, 0x646, 0x628, 0x647, 0x3b, 0x67e, 0x646, 0x62c, 0x634, 0x646, 0x628, 0x647, 0x3b, 0x62c, 0x645, 0x639,</div><div class='del'>-0x647, 0x3b, 0x634, 0x646, 0x628, 0x647, 0x3b, 0x6cc, 0x3b, 0x62f, 0x3b, 0x633, 0x3b, 0x686, 0x3b, 0x67e, 0x3b, 0x62c, 0x3b, 0x634,</div><div class='del'>-0x3b, 0x6e, 0x69, 0x65, 0x64, 0x7a, 0x2e, 0x3b, 0x70, 0x6f, 0x6e, 0x2e, 0x3b, 0x77, 0x74, 0x2e, 0x3b, 0x15b, 0x72, 0x2e,</div><div class='del'>-0x3b, 0x63, 0x7a, 0x77, 0x2e, 0x3b, 0x70, 0x74, 0x2e, 0x3b, 0x73, 0x6f, 0x62, 0x2e, 0x3b, 0x6e, 0x69, 0x65, 0x64, 0x7a,</div><div class='del'>-0x69, 0x65, 0x6c, 0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x69, 0x65, 0x64, 0x7a, 0x69, 0x61, 0x142, 0x65, 0x6b, 0x3b, 0x77, 0x74,</div><div class='del'>-0x6f, 0x72, 0x65, 0x6b, 0x3b, 0x15b, 0x72, 0x6f, 0x64, 0x61, 0x3b, 0x63, 0x7a, 0x77, 0x61, 0x72, 0x74, 0x65, 0x6b, 0x3b,</div><div class='del'>-0x70, 0x69, 0x105, 0x74, 0x65, 0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x4e, 0x3b, 0x50, 0x3b, 0x57, 0x3b,</div><div class='del'>-0x15a, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x64, 0x6f, 0x6d, 0x3b, 0x73, 0x65, 0x67, 0x3b, 0x74, 0x65, 0x72, 0x3b,</div><div class='del'>-0x71, 0x75, 0x61, 0x3b, 0x71, 0x75, 0x69, 0x3b, 0x73, 0x65, 0x78, 0x3b, 0x73, 0xe1, 0x62, 0x3b, 0x44, 0x6f, 0x6d, 0x69,</div><div class='del'>-0x6e, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x67, 0x75, 0x6e, 0x64, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x54, 0x65,</div><div class='del'>-0x72, 0xe7, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x51, 0x75, 0x61, 0x72, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x69,</div><div class='del'>-0x72, 0x61, 0x3b, 0x51, 0x75, 0x69, 0x6e, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x53, 0x65, 0x78, 0x74,</div><div class='del'>-0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x53, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0x44, 0x3b, 0x53, 0x3b, 0x54,</div><div class='del'>-0x3b, 0x51, 0x3b, 0x51, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x73, 0x65, 0x67,</div><div class='del'>-0x75, 0x6e, 0x64, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x74, 0x65, 0x72, 0xe7, 0x61, 0x2d, 0x66, 0x65, 0x69,</div><div class='del'>-0x72, 0x61, 0x3b, 0x71, 0x75, 0x61, 0x72, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x71, 0x75, 0x69, 0x6e,</div><div class='del'>-0x74, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x73, 0x65, 0x78, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61,</div><div class='del'>-0x3b, 0x73, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0xa10, 0xa24, 0x2e, 0x3b, 0xa38, 0xa4b, 0xa2e, 0x2e, 0x3b, 0xa2e, 0xa70, 0xa17,</div><div class='del'>-0xa32, 0x2e, 0x3b, 0xa2c, 0xa41, 0xa27, 0x2e, 0x3b, 0xa35, 0xa40, 0xa30, 0x2e, 0x3b, 0xa38, 0xa3c, 0xa41, 0xa15, 0xa30, 0x2e, 0x3b,</div><div class='del'>-0xa38, 0xa3c, 0xa28, 0xa40, 0x2e, 0x3b, 0xa10, 0xa24, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa38, 0xa4b, 0xa2e, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa2e,</div><div class='del'>-0xa70, 0xa17, 0xa32, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa2c, 0xa41, 0xa27, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa35, 0xa40, 0xa30, 0xa35, 0xa3e, 0xa30,</div><div class='del'>-0x3b, 0xa38, 0xa3c, 0xa41, 0xa71, 0xa15, 0xa30, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa38, 0xa3c, 0xa28, 0xa40, 0xa1a, 0xa30, 0xa35, 0xa3e, 0xa30,</div><div class='del'>-0x3b, 0xa10, 0x3b, 0xa38, 0xa4b, 0x3b, 0xa2e, 0xa70, 0x3b, 0xa2c, 0xa41, 0xa71, 0x3b, 0xa35, 0xa40, 0x3b, 0xa38, 0xa3c, 0xa41, 0xa71,</div><div class='del'>-0x3b, 0xa38, 0xa3c, 0x3b, 0x627, 0x62a, 0x648, 0x627, 0x631, 0x3b, 0x67e, 0x6cc, 0x631, 0x3b, 0x645, 0x646, 0x6af, 0x644, 0x3b, 0x628,</div><div class='del'>-0x64f, 0x62f, 0x6be, 0x3b, 0x62c, 0x645, 0x639, 0x631, 0x627, 0x62a, 0x3b, 0x62c, 0x645, 0x639, 0x6c1, 0x3b, 0x6c1, 0x641, 0x62a, 0x6c1,</div><div class='del'>-0x3b, 0x64, 0x75, 0x3b, 0x67, 0x6c, 0x69, 0x3b, 0x6d, 0x61, 0x3b, 0x6d, 0x65, 0x3b, 0x67, 0x69, 0x65, 0x3b, 0x76, 0x65,</div><div class='del'>-0x3b, 0x73, 0x6f, 0x3b, 0x64, 0x75, 0x6d, 0x65, 0x6e, 0x67, 0x69, 0x61, 0x3b, 0x67, 0x6c, 0x69, 0x6e, 0x64, 0x65, 0x73,</div><div class='del'>-0x64, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x64, 0x69, 0x3b, 0x6d, 0x65, 0x73, 0x65, 0x6d, 0x6e, 0x61, 0x3b, 0x67, 0x69, 0x65,</div><div class='del'>-0x76, 0x67, 0x69, 0x61, 0x3b, 0x76, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x64, 0x69, 0x3b, 0x73, 0x6f, 0x6e, 0x64, 0x61, 0x3b,</div><div class='del'>-0x44, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x44, 0x75, 0x3b, 0x4c, 0x75, 0x3b,</div><div class='del'>-0x4d, 0x61, 0x3b, 0x4d, 0x69, 0x3b, 0x4a, 0x6f, 0x3b, 0x56, 0x69, 0x3b, 0x53, 0xe2, 0x3b, 0x64, 0x75, 0x6d, 0x69, 0x6e,</div><div class='del'>-0x69, 0x63, 0x103, 0x3b, 0x6c, 0x75, 0x6e, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x21b, 0x69, 0x3b, 0x6d, 0x69, 0x65, 0x72, 0x63,</div><div class='del'>-0x75, 0x72, 0x69, 0x3b, 0x6a, 0x6f, 0x69, 0x3b, 0x76, 0x69, 0x6e, 0x65, 0x72, 0x69, 0x3b, 0x73, 0xe2, 0x6d, 0x62, 0x103,</div><div class='del'>-0x74, 0x103, 0x3b, 0x412, 0x441, 0x3b, 0x41f, 0x43d, 0x3b, 0x412, 0x442, 0x3b, 0x421, 0x440, 0x3b, 0x427, 0x442, 0x3b, 0x41f, 0x442,</div><div class='del'>-0x3b, 0x421, 0x431, 0x3b, 0x412, 0x43e, 0x441, 0x43a, 0x440, 0x435, 0x441, 0x435, 0x43d, 0x44c, 0x435, 0x3b, 0x41f, 0x43e, 0x43d, 0x435,</div><div class='del'>-0x434, 0x435, 0x43b, 0x44c, 0x43d, 0x438, 0x43a, 0x3b, 0x412, 0x442, 0x43e, 0x440, 0x43d, 0x438, 0x43a, 0x3b, 0x421, 0x440, 0x435, 0x434,</div><div class='del'>-0x430, 0x3b, 0x427, 0x435, 0x442, 0x432, 0x435, 0x440, 0x433, 0x3b, 0x41f, 0x44f, 0x442, 0x43d, 0x438, 0x446, 0x430, 0x3b, 0x421, 0x443,</div><div class='del'>-0x431, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x412, 0x3b, 0x41f, 0x3b, 0x412, 0x3b, 0x421, 0x3b, 0x427, 0x3b, 0x41f, 0x3b, 0x421, 0x3b,</div><div class='del'>-0x432, 0x43e, 0x441, 0x43a, 0x440, 0x435, 0x441, 0x435, 0x43d, 0x44c, 0x435, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x43b, 0x44c,</div><div class='add'>+0x431, 0x430, 0x437, 0x430, 0x440, 0x3b, 0x431, 0x430, 0x437, 0x430, 0x440, 0x20, 0x435, 0x440, 0x442, 0x4d9, 0x441, 0x438, 0x3b, 0x447,</div><div class='add'>+0x4d9, 0x440, 0x448, 0x4d9, 0x43d, 0x431, 0x4d9, 0x20, 0x430, 0x445, 0x448, 0x430, 0x43c, 0x44b, 0x3b, 0x447, 0x4d9, 0x440, 0x448, 0x4d9,</div><div class='add'>+0x43d, 0x431, 0x4d9, 0x3b, 0x4b9, 0x4af, 0x43c, 0x4d9, 0x20, 0x430, 0x445, 0x448, 0x430, 0x43c, 0x44b, 0x3b, 0x4b9, 0x4af, 0x43c, 0x4d9,</div><div class='add'>+0x3b, 0x448, 0x4d9, 0x43d, 0x431, 0x4d9, 0x3b, 0x69, 0x67, 0x3b, 0x61, 0x6c, 0x3b, 0x61, 0x73, 0x3b, 0x61, 0x7a, 0x3b, 0x6f,</div><div class='add'>+0x67, 0x3b, 0x6f, 0x72, 0x3b, 0x6c, 0x72, 0x3b, 0x69, 0x67, 0x61, 0x6e, 0x64, 0x65, 0x61, 0x3b, 0x61, 0x73, 0x74, 0x65,</div><div class='add'>+0x6c, 0x65, 0x68, 0x65, 0x6e, 0x61, 0x3b, 0x61, 0x73, 0x74, 0x65, 0x61, 0x72, 0x74, 0x65, 0x61, 0x3b, 0x61, 0x73, 0x74,</div><div class='add'>+0x65, 0x61, 0x7a, 0x6b, 0x65, 0x6e, 0x61, 0x3b, 0x6f, 0x73, 0x74, 0x65, 0x67, 0x75, 0x6e, 0x61, 0x3b, 0x6f, 0x73, 0x74,</div><div class='add'>+0x69, 0x72, 0x61, 0x6c, 0x61, 0x3b, 0x6c, 0x61, 0x72, 0x75, 0x6e, 0x62, 0x61, 0x74, 0x61, 0x3b, 0x9b0, 0x9ac, 0x9bf, 0x3b,</div><div class='add'>+0x9b8, 0x9cb, 0x9ae, 0x3b, 0x9ae, 0x999, 0x9cd, 0x997, 0x9b2, 0x3b, 0x9ac, 0x9c1, 0x9a7, 0x3b, 0x9ac, 0x9c3, 0x9b9, 0x9b8, 0x9cd, 0x9aa,</div><div class='add'>+0x9a4, 0x9bf, 0x3b, 0x9b6, 0x9c1, 0x995, 0x9cd, 0x9b0, 0x3b, 0x9b6, 0x9a8, 0x9bf, 0x3b, 0x9b0, 0x9ac, 0x9bf, 0x9ac, 0x9be, 0x9b0, 0x3b,</div><div class='add'>+0x9b8, 0x9cb, 0x9ae, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9ae, 0x999, 0x9cd, 0x997, 0x9b2, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9ac, 0x9c1, 0x9a7, 0x9ac,</div><div class='add'>+0x9be, 0x9b0, 0x3b, 0x9ac, 0x9c3, 0x9b9, 0x9b7, 0x9cd, 0x9aa, 0x9a4, 0x9bf, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9b6, 0x9c1, 0x995, 0x9cd, 0x9b0,</div><div class='add'>+0x9ac, 0x9be, 0x9b0, 0x3b, 0x9b6, 0x9a8, 0x9bf, 0x9ac, 0x9be, 0x9b0, 0x3b, 0x9b0, 0x3b, 0x9b8, 0x9cb, 0x3b, 0x9ae, 0x3b, 0x9ac, 0x9c1,</div><div class='add'>+0x3b, 0x9ac, 0x9c3, 0x3b, 0x9b6, 0x9c1, 0x3b, 0x9b6, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0x3b, 0xf58, 0xf72, 0xf62, 0xf0b, 0x3b, 0xf63, 0xfb7,</div><div class='add'>+0xf42, 0xf0b, 0x3b, 0xf55, 0xf74, 0xf62, 0xf0b, 0x3b, 0xf66, 0xf44, 0xf66, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0xf0b, 0x3b, 0xf49,</div><div class='add'>+0xf72, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf58, 0xf72, 0xf42,</div><div class='add'>+0xf0b, 0xf51, 0xf58, 0xf62, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf63, 0xfb7, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60,</div><div class='add'>+0xf0b, 0xf55, 0xf74, 0xf62, 0xf0b, 0xf56, 0xf74, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf54, 0xf0b, 0xf66, 0xf44, 0xf66, 0xf0b, 0x3b,</div><div class='add'>+0xf42, 0xf5f, 0xf60, 0xf0b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf49, 0xf72, 0xf0b, 0xf58,</div><div class='add'>+0xf0b, 0x3b, 0x43d, 0x434, 0x3b, 0x43f, 0x43d, 0x3b, 0x432, 0x442, 0x3b, 0x441, 0x440, 0x3b, 0x447, 0x442, 0x3b, 0x43f, 0x442, 0x3b,</div><div class='add'>+0x441, 0x431, 0x3b, 0x43d, 0x435, 0x434, 0x435, 0x43b, 0x44f, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x43b, 0x43d, 0x438, 0x43a,</div><div class='add'>+0x3b, 0x432, 0x442, 0x43e, 0x440, 0x43d, 0x438, 0x43a, 0x3b, 0x441, 0x440, 0x44f, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x44a,</div><div class='add'>+0x440, 0x442, 0x44a, 0x43a, 0x3b, 0x43f, 0x435, 0x442, 0x44a, 0x43a, 0x3b, 0x441, 0x44a, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x43d, 0x3b,</div><div class='add'>+0x43f, 0x3b, 0x432, 0x3b, 0x441, 0x3b, 0x447, 0x3b, 0x43f, 0x3b, 0x441, 0x3b, 0x1014, 0x103d, 0x1031, 0x3b, 0x101c, 0x102c, 0x3b, 0x1002,</div><div class='add'>+0x102b, 0x3b, 0x101f, 0x1030, 0x1038, 0x3b, 0x1010, 0x1031, 0x1038, 0x3b, 0x1000, 0x103c, 0x102c, 0x3b, 0x1014, 0x1031, 0x3b, 0x1010, 0x1014, 0x1004,</div><div class='add'>+0x103a, 0x1039, 0x1002, 0x1014, 0x103d, 0x1031, 0x3b, 0x1010, 0x1014, 0x1004, 0x103a, 0x1039, 0x101c, 0x102c, 0x3b, 0x1021, 0x1004, 0x103a, 0x1039, 0x1002,</div><div class='add'>+0x102b, 0x3b, 0x1017, 0x102f, 0x1012, 0x1039, 0x1013, 0x101f, 0x1030, 0x1038, 0x3b, 0x1000, 0x103c, 0x102c, 0x101e, 0x1015, 0x1010, 0x1031, 0x1038, 0x3b,</div><div class='add'>+0x101e, 0x1031, 0x102c, 0x1000, 0x103c, 0x102c, 0x3b, 0x1005, 0x1014, 0x1031, 0x3b, 0x1010, 0x3b, 0x1010, 0x3b, 0x1021, 0x3b, 0x1017, 0x3b, 0x1000,</div><div class='add'>+0x3b, 0x101e, 0x3b, 0x1005, 0x3b, 0x43d, 0x434, 0x3b, 0x43f, 0x43d, 0x3b, 0x430, 0x45e, 0x3b, 0x441, 0x440, 0x3b, 0x447, 0x446, 0x3b,</div><div class='add'>+0x43f, 0x442, 0x3b, 0x441, 0x431, 0x3b, 0x43d, 0x44f, 0x434, 0x437, 0x435, 0x43b, 0x44f, 0x3b, 0x43f, 0x430, 0x43d, 0x44f, 0x434, 0x437,</div><div class='add'>+0x435, 0x43b, 0x430, 0x43a, 0x3b, 0x430, 0x45e, 0x442, 0x43e, 0x440, 0x430, 0x43a, 0x3b, 0x441, 0x435, 0x440, 0x430, 0x434, 0x430, 0x3b,</div><div class='add'>+0x447, 0x430, 0x446, 0x432, 0x435, 0x440, 0x3b, 0x43f, 0x44f, 0x442, 0x43d, 0x456, 0x446, 0x430, 0x3b, 0x441, 0x443, 0x431, 0x43e, 0x442,</div><div class='add'>+0x430, 0x3b, 0x43d, 0x3b, 0x43f, 0x3b, 0x430, 0x3b, 0x441, 0x3b, 0x447, 0x3b, 0x43f, 0x3b, 0x441, 0x3b, 0x17a2, 0x17b6, 0x3b, 0x1785,</div><div class='add'>+0x3b, 0x17a2, 0x3b, 0x1796, 0x17bb, 0x3b, 0x1796, 0x17d2, 0x179a, 0x3b, 0x179f, 0x17bb, 0x3b, 0x179f, 0x3b, 0x1790, 0x17d2, 0x1784, 0x17c3, 0x17a2,</div><div class='add'>+0x17b6, 0x1791, 0x17b7, 0x178f, 0x17d2, 0x1799, 0x3b, 0x200b, 0x1790, 0x17d2, 0x1784, 0x17c3, 0x1785, 0x17d0, 0x1793, 0x17d2, 0x1791, 0x3b, 0x1790, 0x17d2,</div><div class='add'>+0x1784, 0x17c3, 0x17a2, 0x1784, 0x17d2, 0x1782, 0x17b6, 0x179a, 0x3b, 0x1790, 0x17d2, 0x1784, 0x17c3, 0x1796, 0x17bb, 0x1792, 0x3b, 0x1790, 0x17d2, 0x1784,</div><div class='add'>+0x17c3, 0x1796, 0x17d2, 0x179a, 0x17a0, 0x179f, 0x17d2, 0x1794, 0x178f, 0x17b7, 0x17cd, 0x3b, 0x1790, 0x17d2, 0x1784, 0x17c3, 0x179f, 0x17bb, 0x1780, 0x17d2,</div><div class='add'>+0x179a, 0x3b, 0x1790, 0x17d2, 0x1784, 0x17c3, 0x179f, 0x17c5, 0x179a, 0x17cd, 0x3b, 0x64, 0x67, 0x3b, 0x64, 0x6c, 0x3b, 0x64, 0x74, 0x3b,</div><div class='add'>+0x64, 0x63, 0x3b, 0x64, 0x6a, 0x3b, 0x64, 0x76, 0x3b, 0x64, 0x73, 0x3b, 0x44, 0x69, 0x75, 0x6d, 0x65, 0x6e, 0x67, 0x65,</div><div class='add'>+0x3b, 0x44, 0x69, 0x6c, 0x6c, 0x75, 0x6e, 0x73, 0x3b, 0x44, 0x69, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x44, 0x69, 0x6d,</div><div class='add'>+0x65, 0x63, 0x72, 0x65, 0x73, 0x3b, 0x44, 0x69, 0x6a, 0x6f, 0x75, 0x73, 0x3b, 0x44, 0x69, 0x76, 0x65, 0x6e, 0x64, 0x72,</div><div class='add'>+0x65, 0x73, 0x3b, 0x64, 0x69, 0x73, 0x73, 0x61, 0x62, 0x74, 0x65, 0x3b, 0x67, 0x3b, 0x6c, 0x3b, 0x74, 0x3b, 0x63, 0x3b,</div><div class='add'>+0x6a, 0x3b, 0x76, 0x3b, 0x73, 0x3b, 0x64, 0x67, 0x2e, 0x3b, 0x64, 0x6c, 0x2e, 0x3b, 0x64, 0x74, 0x2e, 0x3b, 0x64, 0x63,</div><div class='add'>+0x2e, 0x3b, 0x64, 0x6a, 0x2e, 0x3b, 0x64, 0x76, 0x2e, 0x3b, 0x64, 0x73, 0x2e, 0x3b, 0x64, 0x69, 0x75, 0x6d, 0x65, 0x6e,</div><div class='add'>+0x67, 0x65, 0x3b, 0x64, 0x69, 0x6c, 0x6c, 0x75, 0x6e, 0x73, 0x3b, 0x64, 0x69, 0x6d, 0x61, 0x72, 0x74, 0x73, 0x3b, 0x64,</div><div class='add'>+0x69, 0x6d, 0x65, 0x63, 0x72, 0x65, 0x73, 0x3b, 0x64, 0x69, 0x6a, 0x6f, 0x75, 0x73, 0x3b, 0x64, 0x69, 0x76, 0x65, 0x6e,</div><div class='add'>+0x64, 0x72, 0x65, 0x73, 0x3b, 0x64, 0x69, 0x73, 0x73, 0x61, 0x62, 0x74, 0x65, 0x3b, 0x47, 0x3b, 0x6c, 0x3b, 0x54, 0x3b,</div><div class='add'>+0x43, 0x3b, 0x4a, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x5468, 0x65e5, 0x3b, 0x5468, 0x4e00, 0x3b, 0x5468, 0x4e8c, 0x3b, 0x5468, 0x4e09, 0x3b,</div><div class='add'>+0x5468, 0x56db, 0x3b, 0x5468, 0x4e94, 0x3b, 0x5468, 0x516d, 0x3b, 0x661f, 0x671f, 0x65e5, 0x3b, 0x661f, 0x671f, 0x4e00, 0x3b, 0x661f, 0x671f, 0x4e8c,</div><div class='add'>+0x3b, 0x661f, 0x671f, 0x4e09, 0x3b, 0x661f, 0x671f, 0x56db, 0x3b, 0x661f, 0x671f, 0x4e94, 0x3b, 0x661f, 0x671f, 0x516d, 0x3b, 0x65e5, 0x3b, 0x4e00,</div><div class='add'>+0x3b, 0x4e8c, 0x3b, 0x4e09, 0x3b, 0x56db, 0x3b, 0x4e94, 0x3b, 0x516d, 0x3b, 0x9031, 0x65e5, 0x3b, 0x9031, 0x4e00, 0x3b, 0x9031, 0x4e8c, 0x3b,</div><div class='add'>+0x9031, 0x4e09, 0x3b, 0x9031, 0x56db, 0x3b, 0x9031, 0x4e94, 0x3b, 0x9031, 0x516d, 0x3b, 0x6e, 0x65, 0x64, 0x3b, 0x70, 0x6f, 0x6e, 0x3b,</div><div class='add'>+0x75, 0x74, 0x6f, 0x3b, 0x73, 0x72, 0x69, 0x3b, 0x10d, 0x65, 0x74, 0x3b, 0x70, 0x65, 0x74, 0x3b, 0x73, 0x75, 0x62, 0x3b,</div><div class='add'>+0x6e, 0x65, 0x64, 0x6a, 0x65, 0x6c, 0x6a, 0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x6a, 0x65, 0x6c, 0x6a, 0x61, 0x6b,</div><div class='add'>+0x3b, 0x75, 0x74, 0x6f, 0x72, 0x61, 0x6b, 0x3b, 0x73, 0x72, 0x69, 0x6a, 0x65, 0x64, 0x61, 0x3b, 0x10d, 0x65, 0x74, 0x76,</div><div class='add'>+0x72, 0x74, 0x61, 0x6b, 0x3b, 0x70, 0x65, 0x74, 0x61, 0x6b, 0x3b, 0x73, 0x75, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x6e, 0x3b,</div><div class='add'>+0x70, 0x3b, 0x75, 0x3b, 0x73, 0x3b, 0x10d, 0x3b, 0x70, 0x3b, 0x73, 0x3b, 0x6e, 0x65, 0x3b, 0x70, 0x6f, 0x3b, 0xfa, 0x74,</div><div class='add'>+0x3b, 0x73, 0x74, 0x3b, 0x10d, 0x74, 0x3b, 0x70, 0xe1, 0x3b, 0x73, 0x6f, 0x3b, 0x6e, 0x65, 0x64, 0x11b, 0x6c, 0x65, 0x3b,</div><div class='add'>+0x70, 0x6f, 0x6e, 0x64, 0x11b, 0x6c, 0xed, 0x3b, 0xfa, 0x74, 0x65, 0x72, 0xfd, 0x3b, 0x73, 0x74, 0x159, 0x65, 0x64, 0x61,</div><div class='add'>+0x3b, 0x10d, 0x74, 0x76, 0x72, 0x74, 0x65, 0x6b, 0x3b, 0x70, 0xe1, 0x74, 0x65, 0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f, 0x74,</div><div class='add'>+0x61, 0x3b, 0x4e, 0x3b, 0x50, 0x3b, 0xda, 0x3b, 0x53, 0x3b, 0x10c, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x73, 0xf8, 0x6e, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x6e, 0x3b, 0x74, 0x69, 0x72, 0x3b, 0x6f, 0x6e, 0x73, 0x3b, 0x74, 0x6f, 0x72, 0x3b, 0x66, 0x72, 0x65, 0x3b,</div><div class='add'>+0x6c, 0xf8, 0x72, 0x3b, 0x73, 0xf8, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x6d, 0x61, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x69,</div><div class='add'>+0x72, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x6f, 0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x6f, 0x72, 0x73, 0x64, 0x61, 0x67,</div><div class='add'>+0x3b, 0x66, 0x72, 0x65, 0x64, 0x61, 0x67, 0x3b, 0x6c, 0xf8, 0x72, 0x64, 0x61, 0x67, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x54,</div><div class='add'>+0x3b, 0x4f, 0x3b, 0x54, 0x3b, 0x46, 0x3b, 0x4c, 0x3b, 0x7a, 0x6f, 0x3b, 0x6d, 0x61, 0x3b, 0x64, 0x69, 0x3b, 0x77, 0x6f,</div><div class='add'>+0x3b, 0x64, 0x6f, 0x3b, 0x76, 0x72, 0x3b, 0x7a, 0x61, 0x3b, 0x7a, 0x6f, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x6d, 0x61, 0x61,</div><div class='add'>+0x6e, 0x64, 0x61, 0x67, 0x3b, 0x64, 0x69, 0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x77, 0x6f, 0x65, 0x6e, 0x73, 0x64, 0x61,</div><div class='add'>+0x67, 0x3b, 0x64, 0x6f, 0x6e, 0x64, 0x65, 0x72, 0x64, 0x61, 0x67, 0x3b, 0x76, 0x72, 0x69, 0x6a, 0x64, 0x61, 0x67, 0x3b,</div><div class='add'>+0x7a, 0x61, 0x74, 0x65, 0x72, 0x64, 0x61, 0x67, 0x3b, 0x5a, 0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x57, 0x3b, 0x44, 0x3b, 0x56,</div><div class='add'>+0x3b, 0x5a, 0x3b, 0xd801, 0xdc1d, 0xd801, 0xdc32, 0xd801, 0xdc4c, 0x3b, 0xd801, 0xdc23, 0xd801, 0xdc32, 0xd801, 0xdc4c, 0x3b, 0xd801, 0xdc13, 0xd801,</div><div class='add'>+0xdc2d, 0xd801, 0xdc46, 0x3b, 0xd801, 0xdc0e, 0xd801, 0xdc2f, 0xd801, 0xdc4c, 0x3b, 0xd801, 0xdc1b, 0xd801, 0xdc32, 0xd801, 0xdc49, 0x3b, 0xd801, 0xdc19,</div><div class='add'>+0xd801, 0xdc49, 0xd801, 0xdc34, 0x3b, 0xd801, 0xdc1d, 0xd801, 0xdc30, 0xd801, 0xdc3b, 0x3b, 0xd801, 0xdc1d, 0xd801, 0xdc32, 0xd801, 0xdc4c, 0xd801, 0xdc3c,</div><div class='add'>+0xd801, 0xdc29, 0x3b, 0xd801, 0xdc23, 0xd801, 0xdc32, 0xd801, 0xdc4c, 0xd801, 0xdc3c, 0xd801, 0xdc29, 0x3b, 0xd801, 0xdc13, 0xd801, 0xdc2d, 0xd801, 0xdc46,</div><div class='add'>+0xd801, 0xdc3c, 0xd801, 0xdc29, 0x3b, 0xd801, 0xdc0e, 0xd801, 0xdc2f, 0xd801, 0xdc4c, 0xd801, 0xdc46, 0xd801, 0xdc3c, 0xd801, 0xdc29, 0x3b, 0xd801, 0xdc1b,</div><div class='add'>+0xd801, 0xdc32, 0xd801, 0xdc49, 0xd801, 0xdc46, 0xd801, 0xdc3c, 0xd801, 0xdc29, 0x3b, 0xd801, 0xdc19, 0xd801, 0xdc49, 0xd801, 0xdc34, 0xd801, 0xdc3c, 0xd801,</div><div class='add'>+0xdc29, 0x3b, 0xd801, 0xdc1d, 0xd801, 0xdc30, 0xd801, 0xdc3b, 0xd801, 0xdc32, 0xd801, 0xdc49, 0xd801, 0xdc3c, 0xd801, 0xdc29, 0x3b, 0xd801, 0xdc1d, 0x3b,</div><div class='add'>+0xd801, 0xdc23, 0x3b, 0xd801, 0xdc13, 0x3b, 0xd801, 0xdc0e, 0x3b, 0xd801, 0xdc1b, 0x3b, 0xd801, 0xdc19, 0x3b, 0xd801, 0xdc1d, 0x3b, 0x50, 0x3b,</div><div class='add'>+0x45, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x52, 0x3b, 0x4c, 0x3b, 0x70, 0xfc, 0x68, 0x61, 0x70, 0xe4, 0x65, 0x76,</div><div class='add'>+0x3b, 0x65, 0x73, 0x6d, 0x61, 0x73, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x74, 0x65, 0x69, 0x73, 0x69, 0x70, 0xe4, 0x65, 0x76,</div><div class='add'>+0x3b, 0x6b, 0x6f, 0x6c, 0x6d, 0x61, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x6e, 0x65, 0x6c, 0x6a, 0x61, 0x70, 0xe4, 0x65, 0x76,</div><div class='add'>+0x3b, 0x72, 0x65, 0x65, 0x64, 0x65, 0x3b, 0x6c, 0x61, 0x75, 0x70, 0xe4, 0x65, 0x76, 0x3b, 0x73, 0x75, 0x6e, 0x3b, 0x6d,</div><div class='add'>+0xe1, 0x6e, 0x3b, 0x74, 0xfd, 0x73, 0x3b, 0x6d, 0x69, 0x6b, 0x3b, 0x68, 0xf3, 0x73, 0x3b, 0x66, 0x72, 0xed, 0x3b, 0x6c,</div><div class='add'>+0x65, 0x79, 0x3b, 0x73, 0x75, 0x6e, 0x6e, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x6d, 0xe1, 0x6e, 0x61, 0x64, 0x61,</div><div class='add'>+0x67, 0x75, 0x72, 0x3b, 0x74, 0xfd, 0x73, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x6d, 0x69, 0x6b, 0x75, 0x64, 0x61, 0x67,</div><div class='add'>+0x75, 0x72, 0x3b, 0x68, 0xf3, 0x73, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x66, 0x72, 0xed, 0x67, 0x67, 0x6a, 0x61, 0x64,</div><div class='add'>+0x61, 0x67, 0x75, 0x72, 0x3b, 0x6c, 0x65, 0x79, 0x67, 0x61, 0x72, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x53, 0x3b, 0x4d,</div><div class='add'>+0x3b, 0x54, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x46, 0x3b, 0x4c, 0x3b, 0x73, 0x75, 0x3b, 0x6d, 0x61, 0x3b, 0x74, 0x69, 0x3b,</div><div class='add'>+0x6b, 0x65, 0x3b, 0x74, 0x6f, 0x3b, 0x70, 0x65, 0x3b, 0x6c, 0x61, 0x3b, 0x73, 0x75, 0x6e, 0x6e, 0x75, 0x6e, 0x74, 0x61,</div><div class='add'>+0x69, 0x3b, 0x6d, 0x61, 0x61, 0x6e, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x3b, 0x74, 0x69, 0x69, 0x73, 0x74, 0x61, 0x69, 0x3b,</div><div class='add'>+0x6b, 0x65, 0x73, 0x6b, 0x69, 0x76, 0x69, 0x69, 0x6b, 0x6b, 0x6f, 0x3b, 0x74, 0x6f, 0x72, 0x73, 0x74, 0x61, 0x69, 0x3b,</div><div class='add'>+0x70, 0x65, 0x72, 0x6a, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x3b, 0x6c, 0x61, 0x75, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x3b, 0x53,</div><div class='add'>+0x3b, 0x4d, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x50, 0x3b, 0x4c, 0x3b, 0x73, 0x75, 0x6e, 0x6e, 0x75, 0x6e, 0x74,</div><div class='add'>+0x61, 0x69, 0x6e, 0x61, 0x3b, 0x6d, 0x61, 0x61, 0x6e, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x74, 0x69, 0x69,</div><div class='add'>+0x73, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x6b, 0x65, 0x73, 0x6b, 0x69, 0x76, 0x69, 0x69, 0x6b, 0x6b, 0x6f, 0x6e, 0x61,</div><div class='add'>+0x3b, 0x74, 0x6f, 0x72, 0x73, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x70, 0x65, 0x72, 0x6a, 0x61, 0x6e, 0x74, 0x61, 0x69,</div><div class='add'>+0x6e, 0x61, 0x3b, 0x6c, 0x61, 0x75, 0x61, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x61, 0x3b, 0x64, 0x69, 0x6d, 0x2e, 0x3b, 0x6c,</div><div class='add'>+0x75, 0x6e, 0x2e, 0x3b, 0x6d, 0x61, 0x72, 0x2e, 0x3b, 0x6d, 0x65, 0x72, 0x2e, 0x3b, 0x6a, 0x65, 0x75, 0x2e, 0x3b, 0x76,</div><div class='add'>+0x65, 0x6e, 0x2e, 0x3b, 0x73, 0x61, 0x6d, 0x2e, 0x3b, 0x64, 0x69, 0x6d, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x3b, 0x6c, 0x75,</div><div class='add'>+0x6e, 0x64, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x64, 0x69, 0x3b, 0x6d, 0x65, 0x72, 0x63, 0x72, 0x65, 0x64, 0x69, 0x3b, 0x6a,</div><div class='add'>+0x65, 0x75, 0x64, 0x69, 0x3b, 0x76, 0x65, 0x6e, 0x64, 0x72, 0x65, 0x64, 0x69, 0x3b, 0x73, 0x61, 0x6d, 0x65, 0x64, 0x69,</div><div class='add'>+0x3b, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x44, 0x6f, 0x6d, 0x3b, 0x4c,</div><div class='add'>+0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0xe9, 0x72, 0x3b, 0x58, 0x6f, 0x76, 0x3b, 0x56, 0x65, 0x6e, 0x3b, 0x53,</div><div class='add'>+0xe1, 0x62, 0x3b, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x73, 0x3b, 0x4d, 0x61, 0x72, 0x74,</div><div class='add'>+0x65, 0x73, 0x3b, 0x4d, 0xe9, 0x72, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x3b, 0x58, 0x6f, 0x76, 0x65, 0x73, 0x3b, 0x56, 0x65,</div><div class='add'>+0x6e, 0x72, 0x65, 0x73, 0x3b, 0x53, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b,</div><div class='add'>+0x58, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x10d9, 0x10d5, 0x10d8, 0x3b, 0x10dd, 0x10e0, 0x10e8, 0x3b, 0x10e1, 0x10d0, 0x10db, 0x3b, 0x10dd, 0x10d7,</div><div class='add'>+0x10ee, 0x3b, 0x10ee, 0x10e3, 0x10d7, 0x3b, 0x10de, 0x10d0, 0x10e0, 0x3b, 0x10e8, 0x10d0, 0x10d1, 0x3b, 0x10d9, 0x10d5, 0x10d8, 0x10e0, 0x10d0, 0x3b,</div><div class='add'>+0x10dd, 0x10e0, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8, 0x3b, 0x10e1, 0x10d0, 0x10db, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8, 0x3b, 0x10dd,</div><div class='add'>+0x10d7, 0x10ee, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8, 0x3b, 0x10ee, 0x10e3, 0x10d7, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8, 0x3b, 0x10de,</div><div class='add'>+0x10d0, 0x10e0, 0x10d0, 0x10e1, 0x10d9, 0x10d4, 0x10d5, 0x10d8, 0x3b, 0x10e8, 0x10d0, 0x10d1, 0x10d0, 0x10d7, 0x10d8, 0x3b, 0x10d9, 0x3b, 0x10dd, 0x3b,</div><div class='add'>+0x10e1, 0x3b, 0x10dd, 0x3b, 0x10ee, 0x3b, 0x10de, 0x3b, 0x10e8, 0x3b, 0x53, 0x6f, 0x3b, 0x4d, 0x6f, 0x3b, 0x44, 0x69, 0x3b, 0x4d,</div><div class='add'>+0x69, 0x3b, 0x44, 0x6f, 0x3b, 0x46, 0x72, 0x3b, 0x53, 0x61, 0x3b, 0x53, 0x6f, 0x6e, 0x6e, 0x74, 0x61, 0x67, 0x3b, 0x4d,</div><div class='add'>+0x6f, 0x6e, 0x74, 0x61, 0x67, 0x3b, 0x44, 0x69, 0x65, 0x6e, 0x73, 0x74, 0x61, 0x67, 0x3b, 0x4d, 0x69, 0x74, 0x74, 0x77,</div><div class='add'>+0x6f, 0x63, 0x68, 0x3b, 0x44, 0x6f, 0x6e, 0x6e, 0x65, 0x72, 0x73, 0x74, 0x61, 0x67, 0x3b, 0x46, 0x72, 0x65, 0x69, 0x74,</div><div class='add'>+0x61, 0x67, 0x3b, 0x53, 0x61, 0x6d, 0x73, 0x74, 0x61, 0x67, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x4d, 0x3b, 0x44,</div><div class='add'>+0x3b, 0x46, 0x3b, 0x53, 0x3b, 0x53, 0x6f, 0x2e, 0x3b, 0x4d, 0x6f, 0x2e, 0x3b, 0x44, 0x69, 0x2e, 0x3b, 0x4d, 0x69, 0x2e,</div><div class='add'>+0x3b, 0x44, 0x6f, 0x2e, 0x3b, 0x46, 0x72, 0x2e, 0x3b, 0x53, 0x61, 0x2e, 0x3b, 0x53, 0x6f, 0x6e, 0x3b, 0x4d, 0x6f, 0x6e,</div><div class='add'>+0x3b, 0x44, 0x69, 0x65, 0x3b, 0x4d, 0x69, 0x74, 0x3b, 0x44, 0x6f, 0x6e, 0x3b, 0x46, 0x72, 0x65, 0x3b, 0x53, 0x61, 0x6d,</div><div class='add'>+0x3b, 0x39a, 0x3c5, 0x3c1, 0x3b, 0x394, 0x3b5, 0x3c5, 0x3b, 0x3a4, 0x3c1, 0x3b9, 0x3b, 0x3a4, 0x3b5, 0x3c4, 0x3b, 0x3a0, 0x3b5, 0x3bc,</div><div class='add'>+0x3b, 0x3a0, 0x3b1, 0x3c1, 0x3b, 0x3a3, 0x3b1, 0x3b2, 0x3b, 0x39a, 0x3c5, 0x3c1, 0x3b9, 0x3b1, 0x3ba, 0x3ae, 0x3b, 0x394, 0x3b5, 0x3c5,</div><div class='add'>+0x3c4, 0x3ad, 0x3c1, 0x3b1, 0x3b, 0x3a4, 0x3c1, 0x3af, 0x3c4, 0x3b7, 0x3b, 0x3a4, 0x3b5, 0x3c4, 0x3ac, 0x3c1, 0x3c4, 0x3b7, 0x3b, 0x3a0,</div><div class='add'>+0x3ad, 0x3bc, 0x3c0, 0x3c4, 0x3b7, 0x3b, 0x3a0, 0x3b1, 0x3c1, 0x3b1, 0x3c3, 0x3ba, 0x3b5, 0x3c5, 0x3ae, 0x3b, 0x3a3, 0x3ac, 0x3b2, 0x3b2,</div><div class='add'>+0x3b1, 0x3c4, 0x3bf, 0x3b, 0x39a, 0x3b, 0x394, 0x3b, 0x3a4, 0x3b, 0x3a4, 0x3b, 0x3a0, 0x3b, 0x3a0, 0x3b, 0x3a3, 0x3b, 0x73, 0x61,</div><div class='add'>+0x62, 0x3b, 0x61, 0x74, 0x61, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x70, 0x69, 0x6e, 0x3b, 0x73, 0x69, 0x73, 0x3b, 0x74, 0x61,</div><div class='add'>+0x6c, 0x3b, 0x61, 0x72, 0x66, 0x3b, 0x73, 0x61, 0x62, 0x61, 0x61, 0x74, 0x3b, 0x61, 0x74, 0x61, 0x61, 0x73, 0x69, 0x6e,</div><div class='add'>+0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65, 0x71, 0x3b, 0x6d, 0x61, 0x72, 0x6c, 0x75, 0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65,</div><div class='add'>+0x71, 0x3b, 0x70, 0x69, 0x6e, 0x67, 0x61, 0x73, 0x75, 0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65, 0x71, 0x3b, 0x73, 0x69,</div><div class='add'>+0x73, 0x61, 0x6d, 0x61, 0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65, 0x71, 0x3b, 0x74, 0x61, 0x6c, 0x6c, 0x69, 0x6d, 0x61,</div><div class='add'>+0x6e, 0x6e, 0x67, 0x6f, 0x72, 0x6e, 0x65, 0x71, 0x3b, 0x61, 0x72, 0x66, 0x69, 0x6e, 0x69, 0x6e, 0x6e, 0x67, 0x6f, 0x72,</div><div class='add'>+0x6e, 0x65, 0x71, 0x3b, 0x53, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0xab0, 0xab5,</div><div class='add'>+0xabf, 0x3b, 0xab8, 0xacb, 0xaae, 0x3b, 0xaae, 0xa82, 0xa97, 0xab3, 0x3b, 0xaac, 0xac1, 0xaa7, 0x3b, 0xa97, 0xac1, 0xab0, 0xac1, 0x3b,</div><div class='add'>+0xab6, 0xac1, 0xa95, 0xacd, 0xab0, 0x3b, 0xab6, 0xaa8, 0xabf, 0x3b, 0xab0, 0xab5, 0xabf, 0xab5, 0xabe, 0xab0, 0x3b, 0xab8, 0xacb, 0xaae,</div><div class='add'>+0xab5, 0xabe, 0xab0, 0x3b, 0xaae, 0xa82, 0xa97, 0xab3, 0xab5, 0xabe, 0xab0, 0x3b, 0xaac, 0xac1, 0xaa7, 0xab5, 0xabe, 0xab0, 0x3b, 0xa97,</div><div class='add'>+0xac1, 0xab0, 0xac1, 0xab5, 0xabe, 0xab0, 0x3b, 0xab6, 0xac1, 0xa95, 0xacd, 0xab0, 0xab5, 0xabe, 0xab0, 0x3b, 0xab6, 0xaa8, 0xabf, 0xab5,</div><div class='add'>+0xabe, 0xab0, 0x3b, 0xab0, 0x3b, 0xab8, 0xacb, 0x3b, 0xaae, 0xa82, 0x3b, 0xaac, 0xac1, 0x3b, 0xa97, 0xac1, 0x3b, 0xab6, 0xac1, 0x3b,</div><div class='add'>+0xab6, 0x3b, 0x4c, 0x68, 0x3b, 0x4c, 0x69, 0x3b, 0x54, 0x61, 0x3b, 0x4c, 0x72, 0x3b, 0x41, 0x6c, 0x3b, 0x4a, 0x75, 0x3b,</div><div class='add'>+0x41, 0x73, 0x3b, 0x4c, 0x61, 0x68, 0x61, 0x64, 0x69, 0x3b, 0x4c, 0x69, 0x74, 0x69, 0x6e, 0x69, 0x6e, 0x3b, 0x54, 0x61,</div><div class='add'>+0x6c, 0x61, 0x74, 0x61, 0x3b, 0x4c, 0x61, 0x72, 0x61, 0x62, 0x61, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x3b,</div><div class='add'>+0x4a, 0x75, 0x6d, 0x6d, 0x61, 0x27, 0x61, 0x3b, 0x41, 0x73, 0x61, 0x62, 0x61, 0x72, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x54,</div><div class='add'>+0x3b, 0x4c, 0x3b, 0x41, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x644, 0x64e, 0x62d, 0x3b, 0x644, 0x650, 0x62a, 0x3b, 0x62a, 0x64e, 0x644,</div><div class='add'>+0x3b, 0x644, 0x64e, 0x631, 0x3b, 0x623, 0x64e, 0x644, 0x652, 0x62d, 0x3b, 0x62c, 0x64f, 0x645, 0x3b, 0x623, 0x64e, 0x633, 0x64e, 0x3b,</div><div class='add'>+0x644, 0x64e, 0x62d, 0x64e, 0x62f, 0x650, 0x3b, 0x644, 0x650, 0x62a, 0x650, 0x646, 0x650, 0x646, 0x652, 0x3b, 0x62a, 0x64e, 0x644, 0x64e,</div><div class='add'>+0x62a, 0x64e, 0x3b, 0x644, 0x64e, 0x631, 0x64e, 0x628, 0x64e, 0x3b, 0x623, 0x64e, 0x644, 0x652, 0x62d, 0x64e, 0x645, 0x650, 0x633, 0x652,</div><div class='add'>+0x3b, 0x62c, 0x64f, 0x645, 0x64e, 0x639, 0x64e, 0x3b, 0x623, 0x64e, 0x633, 0x64e, 0x628, 0x64e, 0x631, 0x652, 0x3b, 0x5d9, 0x5d5, 0x5dd,</div><div class='add'>+0x20, 0x5d0, 0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d1, 0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d2, 0x5f3, 0x3b, 0x5d9, 0x5d5,</div><div class='add'>+0x5dd, 0x20, 0x5d3, 0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d4, 0x5f3, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d5, 0x5f3, 0x3b, 0x5e9,</div><div class='add'>+0x5d1, 0x5ea, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e8, 0x5d0, 0x5e9, 0x5d5, 0x5df, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e9, 0x5e0, 0x5d9,</div><div class='add'>+0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e9, 0x5dc, 0x5d9, 0x5e9, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e8, 0x5d1, 0x5d9, 0x5e2, 0x5d9,</div><div class='add'>+0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5d7, 0x5de, 0x5d9, 0x5e9, 0x5d9, 0x3b, 0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e9, 0x5d9, 0x5e9, 0x5d9, 0x3b,</div><div class='add'>+0x5d9, 0x5d5, 0x5dd, 0x20, 0x5e9, 0x5d1, 0x5ea, 0x3b, 0x5d0, 0x3b, 0x5d1, 0x3b, 0x5d2, 0x3b, 0x5d3, 0x3b, 0x5d4, 0x3b, 0x5d5, 0x3b,</div><div class='add'>+0x5e9, 0x3b, 0x930, 0x935, 0x93f, 0x2e, 0x3b, 0x938, 0x94b, 0x92e, 0x2e, 0x3b, 0x92e, 0x902, 0x917, 0x932, 0x2e, 0x3b, 0x92c, 0x941,</div><div class='add'>+0x927, 0x2e, 0x3b, 0x92c, 0x943, 0x939, 0x2e, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x2e, 0x3b, 0x936, 0x928, 0x93f, 0x2e, 0x3b,</div><div class='add'>+0x930, 0x935, 0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x938, 0x94b, 0x92e, 0x935, 0x93e, 0x930, 0x3b, 0x92e, 0x902, 0x917, 0x932, 0x935, 0x93e,</div><div class='add'>+0x930, 0x3b, 0x92c, 0x941, 0x927, 0x935, 0x93e, 0x930, 0x3b, 0x92c, 0x943, 0x939, 0x938, 0x94d, 0x92a, 0x924, 0x93f, 0x935, 0x93e, 0x930,</div><div class='add'>+0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x935, 0x93e, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x930, 0x3b, 0x938,</div><div class='add'>+0x94b, 0x3b, 0x92e, 0x902, 0x3b, 0x92c, 0x941, 0x3b, 0x917, 0x941, 0x3b, 0x936, 0x941, 0x3b, 0x936, 0x3b, 0x56, 0x3b, 0x48, 0x3b,</div><div class='add'>+0x4b, 0x3b, 0x53, 0x7a, 0x65, 0x3b, 0x43, 0x73, 0x3b, 0x50, 0x3b, 0x53, 0x7a, 0x6f, 0x3b, 0x76, 0x61, 0x73, 0xe1, 0x72,</div><div class='add'>+0x6e, 0x61, 0x70, 0x3b, 0x68, 0xe9, 0x74, 0x66, 0x151, 0x3b, 0x6b, 0x65, 0x64, 0x64, 0x3b, 0x73, 0x7a, 0x65, 0x72, 0x64,</div><div class='add'>+0x61, 0x3b, 0x63, 0x73, 0xfc, 0x74, 0xf6, 0x72, 0x74, 0xf6, 0x6b, 0x3b, 0x70, 0xe9, 0x6e, 0x74, 0x65, 0x6b, 0x3b, 0x73,</div><div class='add'>+0x7a, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x3b, 0x56, 0x3b, 0x48, 0x3b, 0x4b, 0x3b, 0x53, 0x7a, 0x3b, 0x43, 0x73, 0x3b, 0x50,</div><div class='add'>+0x3b, 0x53, 0x7a, 0x3b, 0x73, 0x75, 0x6e, 0x3b, 0x6d, 0xe1, 0x6e, 0x3b, 0xfe, 0x72, 0x69, 0x3b, 0x6d, 0x69, 0xf0, 0x3b,</div><div class='add'>+0x66, 0x69, 0x6d, 0x3b, 0x66, 0xf6, 0x73, 0x3b, 0x6c, 0x61, 0x75, 0x3b, 0x73, 0x75, 0x6e, 0x6e, 0x75, 0x64, 0x61, 0x67,</div><div class='add'>+0x75, 0x72, 0x3b, 0x6d, 0xe1, 0x6e, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0xfe, 0x72, 0x69, 0xf0, 0x6a, 0x75, 0x64,</div><div class='add'>+0x61, 0x67, 0x75, 0x72, 0x3b, 0x6d, 0x69, 0xf0, 0x76, 0x69, 0x6b, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x66, 0x69,</div><div class='add'>+0x6d, 0x6d, 0x74, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x66, 0xf6, 0x73, 0x74, 0x75, 0x64, 0x61, 0x67, 0x75, 0x72,</div><div class='add'>+0x3b, 0x6c, 0x61, 0x75, 0x67, 0x61, 0x72, 0x64, 0x61, 0x67, 0x75, 0x72, 0x3b, 0x73, 0x3b, 0x6d, 0x3b, 0xfe, 0x3b, 0x6d,</div><div class='add'>+0x3b, 0x66, 0x3b, 0x66, 0x3b, 0x6c, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0xde, 0x3b, 0x4d, 0x3b, 0x46, 0x3b, 0x46, 0x3b, 0x4c,</div><div class='add'>+0x3b, 0x4d, 0x69, 0x6e, 0x3b, 0x53, 0x65, 0x6e, 0x3b, 0x53, 0x65, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x3b, 0x4b, 0x61, 0x6d,</div><div class='add'>+0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4d, 0x69, 0x6e, 0x67, 0x67, 0x75, 0x3b, 0x53, 0x65, 0x6e, 0x69,</div><div class='add'>+0x6e, 0x3b, 0x53, 0x65, 0x6c, 0x61, 0x73, 0x61, 0x3b, 0x52, 0x61, 0x62, 0x75, 0x3b, 0x4b, 0x61, 0x6d, 0x69, 0x73, 0x3b,</div><div class='add'>+0x4a, 0x75, 0x6d, 0x61, 0x74, 0x3b, 0x53, 0x61, 0x62, 0x74, 0x75, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x52, 0x3b,</div><div class='add'>+0x4b, 0x3b, 0x4a, 0x3b, 0x53, 0x3b, 0x44, 0x6f, 0x6d, 0x68, 0x3b, 0x4c, 0x75, 0x61, 0x6e, 0x3b, 0x4d, 0xe1, 0x69, 0x72,</div><div class='add'>+0x74, 0x3b, 0x43, 0xe9, 0x61, 0x64, 0x3b, 0x44, 0xe9, 0x61, 0x72, 0x3b, 0x41, 0x6f, 0x69, 0x6e, 0x65, 0x3b, 0x53, 0x61,</div><div class='add'>+0x74, 0x68, 0x3b, 0x44, 0xe9, 0x20, 0x44, 0x6f, 0x6d, 0x68, 0x6e, 0x61, 0x69, 0x67, 0x68, 0x3b, 0x44, 0xe9, 0x20, 0x4c,</div><div class='add'>+0x75, 0x61, 0x69, 0x6e, 0x3b, 0x44, 0xe9, 0x20, 0x4d, 0xe1, 0x69, 0x72, 0x74, 0x3b, 0x44, 0xe9, 0x20, 0x43, 0xe9, 0x61,</div><div class='add'>+0x64, 0x61, 0x6f, 0x69, 0x6e, 0x3b, 0x44, 0xe9, 0x61, 0x72, 0x64, 0x61, 0x6f, 0x69, 0x6e, 0x3b, 0x44, 0xe9, 0x20, 0x68,</div><div class='add'>+0x41, 0x6f, 0x69, 0x6e, 0x65, 0x3b, 0x44, 0xe9, 0x20, 0x53, 0x61, 0x74, 0x68, 0x61, 0x69, 0x72, 0x6e, 0x3b, 0x44, 0x3b,</div><div class='add'>+0x4c, 0x3b, 0x4d, 0x3b, 0x43, 0x3b, 0x44, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x64, 0x6f, 0x6d, 0x3b, 0x6c, 0x75, 0x6e, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x72, 0x3b, 0x67, 0x69, 0x6f, 0x3b, 0x76, 0x65, 0x6e, 0x3b, 0x73, 0x61, 0x62, 0x3b,</div><div class='add'>+0x44, 0x6f, 0x6d, 0x65, 0x6e, 0x69, 0x63, 0x61, 0x3b, 0x4c, 0x75, 0x6e, 0x65, 0x64, 0xec, 0x3b, 0x4d, 0x61, 0x72, 0x74,</div><div class='add'>+0x65, 0x64, 0xec, 0x3b, 0x4d, 0x65, 0x72, 0x63, 0x6f, 0x6c, 0x65, 0x64, 0xec, 0x3b, 0x47, 0x69, 0x6f, 0x76, 0x65, 0x64,</div><div class='add'>+0xec, 0x3b, 0x56, 0x65, 0x6e, 0x65, 0x72, 0x64, 0xec, 0x3b, 0x53, 0x61, 0x62, 0x61, 0x74, 0x6f, 0x3b, 0x44, 0x3b, 0x4c,</div><div class='add'>+0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x64, 0x6f, 0x6d, 0x65, 0x6e, 0x69, 0x63, 0x61, 0x3b,</div><div class='add'>+0x6c, 0x75, 0x6e, 0x65, 0x64, 0xec, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x65, 0x64, 0xec, 0x3b, 0x6d, 0x65, 0x72, 0x63, 0x6f,</div><div class='add'>+0x6c, 0x65, 0x64, 0xec, 0x3b, 0x67, 0x69, 0x6f, 0x76, 0x65, 0x64, 0xec, 0x3b, 0x76, 0x65, 0x6e, 0x65, 0x72, 0x64, 0xec,</div><div class='add'>+0x3b, 0x73, 0x61, 0x62, 0x61, 0x74, 0x6f, 0x3b, 0x65e5, 0x3b, 0x6708, 0x3b, 0x706b, 0x3b, 0x6c34, 0x3b, 0x6728, 0x3b, 0x91d1, 0x3b,</div><div class='add'>+0x571f, 0x3b, 0x65e5, 0x66dc, 0x65e5, 0x3b, 0x6708, 0x66dc, 0x65e5, 0x3b, 0x706b, 0x66dc, 0x65e5, 0x3b, 0x6c34, 0x66dc, 0x65e5, 0x3b, 0x6728, 0x66dc,</div><div class='add'>+0x65e5, 0x3b, 0x91d1, 0x66dc, 0x65e5, 0x3b, 0x571f, 0x66dc, 0x65e5, 0x3b, 0xcb0, 0x2e, 0x3b, 0xcb8, 0xccb, 0x2e, 0x3b, 0xcae, 0xc82, 0x2e,</div><div class='add'>+0x3b, 0xcac, 0xcc1, 0x2e, 0x3b, 0xc97, 0xcc1, 0x2e, 0x3b, 0xcb6, 0xcc1, 0x2e, 0x3b, 0xcb6, 0xca8, 0xcbf, 0x2e, 0x3b, 0xcb0, 0xcb5,</div><div class='add'>+0xcbf, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcb8, 0xccb, 0xcae, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcae, 0xc82, 0xc97, 0xcb3, 0xcb5, 0xcbe, 0xcb0, 0x3b,</div><div class='add'>+0xcac, 0xcc1, 0xca7, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xc97, 0xcc1, 0xcb0, 0xcc1, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcb6, 0xcc1, 0xc95, 0xccd, 0xcb0,</div><div class='add'>+0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcb6, 0xca8, 0xcbf, 0xcb5, 0xcbe, 0xcb0, 0x3b, 0xcb0, 0x3b, 0xcb8, 0xccb, 0x3b, 0xcae, 0xc82, 0x3b, 0xcac,</div><div class='add'>+0xcc1, 0x3b, 0xc97, 0xcc1, 0x3b, 0xcb6, 0xcc1, 0x3b, 0xcb6, 0x3b, 0x436, 0x441, 0x2e, 0x3b, 0x434, 0x441, 0x2e, 0x3b, 0x441, 0x441,</div><div class='add'>+0x2e, 0x3b, 0x441, 0x440, 0x2e, 0x3b, 0x431, 0x441, 0x2e, 0x3b, 0x436, 0x43c, 0x2e, 0x3b, 0x441, 0x4bb, 0x2e, 0x3b, 0x436, 0x435,</div><div class='add'>+0x43a, 0x441, 0x435, 0x43d, 0x456, 0x3b, 0x434, 0x443, 0x439, 0x441, 0x435, 0x43d, 0x431, 0x456, 0x3b, 0x441, 0x435, 0x439, 0x441, 0x435,</div><div class='add'>+0x43d, 0x431, 0x456, 0x3b, 0x441, 0x4d9, 0x440, 0x435, 0x43d, 0x431, 0x456, 0x3b, 0x431, 0x435, 0x439, 0x441, 0x435, 0x43d, 0x431, 0x456,</div><div class='add'>+0x3b, 0x436, 0x4b1, 0x43c, 0x430, 0x3b, 0x441, 0x435, 0x43d, 0x431, 0x456, 0x3b, 0x63, 0x79, 0x75, 0x2e, 0x3b, 0x6d, 0x62, 0x65,</div><div class='add'>+0x2e, 0x3b, 0x6b, 0x61, 0x62, 0x2e, 0x3b, 0x67, 0x74, 0x75, 0x2e, 0x3b, 0x6b, 0x61, 0x6e, 0x2e, 0x3b, 0x67, 0x6e, 0x75,</div><div class='add'>+0x2e, 0x3b, 0x67, 0x6e, 0x64, 0x2e, 0x3b, 0x4b, 0x75, 0x20, 0x63, 0x79, 0x75, 0x6d, 0x77, 0x65, 0x72, 0x75, 0x3b, 0x4b,</div><div class='add'>+0x75, 0x77, 0x61, 0x20, 0x6d, 0x62, 0x65, 0x72, 0x65, 0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x6b, 0x61, 0x62, 0x69, 0x72,</div><div class='add'>+0x69, 0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x6b,</div><div class='add'>+0x61, 0x6e, 0x65, 0x3b, 0x4b, 0x75, 0x77, 0x61, 0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x75, 0x3b, 0x4b, 0x75, 0x77, 0x61,</div><div class='add'>+0x20, 0x67, 0x61, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x74, 0x75, 0x3b, 0xc77c, 0x3b, 0xc6d4, 0x3b, 0xd654, 0x3b, 0xc218, 0x3b, 0xbaa9,</div><div class='add'>+0x3b, 0xae08, 0x3b, 0xd1a0, 0x3b, 0xc77c, 0xc694, 0xc77c, 0x3b, 0xc6d4, 0xc694, 0xc77c, 0x3b, 0xd654, 0xc694, 0xc77c, 0x3b, 0xc218, 0xc694, 0xc77c,</div><div class='add'>+0x3b, 0xbaa9, 0xc694, 0xc77c, 0x3b, 0xae08, 0xc694, 0xc77c, 0x3b, 0xd1a0, 0xc694, 0xc77c, 0x3b, 0x6cc, 0x6d5, 0x6a9, 0x634, 0x6d5, 0x645, 0x645,</div><div class='add'>+0x6d5, 0x3b, 0x62f, 0x648, 0x648, 0x634, 0x6d5, 0x645, 0x645, 0x6d5, 0x3b, 0x633, 0x6ce, 0x634, 0x6d5, 0x645, 0x645, 0x6d5, 0x3b, 0x686,</div><div class='add'>+0x648, 0x627, 0x631, 0x634, 0x6d5, 0x645, 0x645, 0x6d5, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x6cc, 0x3b, 0x62f, 0x3b, 0x633,</div><div class='add'>+0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x79, 0x15f, 0x3b, 0x64, 0x15f, 0x3b, 0x73, 0x15f, 0x3b, 0xe7, 0x15f,</div><div class='add'>+0x3b, 0x70, 0x15f, 0x3b, 0xee, 0x6e, 0x3b, 0x15f, 0x3b, 0x79, 0x65, 0x6b, 0x15f, 0x65, 0x6d, 0x3b, 0x64, 0x75, 0x15f, 0x65,</div><div class='add'>+0x6d, 0x3b, 0x15f, 0xea, 0x3b, 0xe7, 0x61, 0x72, 0x15f, 0x65, 0x6d, 0x3b, 0x70, 0xea, 0x6e, 0x63, 0x15f, 0x65, 0x6d, 0x3b,</div><div class='add'>+0xee, 0x6e, 0x3b, 0x15f, 0x65, 0x6d, 0xee, 0x3b, 0x79, 0x3b, 0x64, 0x3b, 0x73, 0x3b, 0xe7, 0x3b, 0x70, 0x3b, 0xee, 0x3b,</div><div class='add'>+0x15f, 0x3b, 0xead, 0xeb2, 0x2e, 0x3b, 0xe88, 0x2e, 0x3b, 0xead, 0x2e, 0x3b, 0xe9e, 0x2e, 0x3b, 0xe9e, 0xeab, 0x2e, 0x3b, 0xeaa,</div><div class='add'>+0xe81, 0x2e, 0x3b, 0xeaa, 0x2e, 0x3b, 0xea7, 0xeb1, 0xe99, 0xead, 0xeb2, 0xe97, 0xeb4, 0xe94, 0x3b, 0xea7, 0xeb1, 0xe99, 0xe88, 0xeb1,</div><div class='add'>+0xe99, 0x3b, 0xea7, 0xeb1, 0xe99, 0xead, 0xeb1, 0xe87, 0xe84, 0xeb2, 0xe99, 0x3b, 0xea7, 0xeb1, 0xe99, 0xe9e, 0xeb8, 0xe94, 0x3b, 0xea7,</div><div class='add'>+0xeb1, 0xe99, 0xe9e, 0xeb0, 0xeab, 0xeb1, 0xe94, 0x3b, 0xea7, 0xeb1, 0xe99, 0xeaa, 0xeb8, 0xe81, 0x3b, 0xea7, 0xeb1, 0xe99, 0xec0, 0xeaa,</div><div class='add'>+0xebb, 0xeb2, 0x3b, 0x53, 0x76, 0x3b, 0x50, 0x72, 0x3b, 0x4f, 0x74, 0x3b, 0x54, 0x72, 0x3b, 0x43, 0x65, 0x3b, 0x50, 0x6b,</div><div class='add'>+0x3b, 0x53, 0x65, 0x3b, 0x73, 0x76, 0x113, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x70, 0x69, 0x72, 0x6d, 0x64, 0x69,</div><div class='add'>+0x65, 0x6e, 0x61, 0x3b, 0x6f, 0x74, 0x72, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x74, 0x72, 0x65, 0x161, 0x64, 0x69, 0x65,</div><div class='add'>+0x6e, 0x61, 0x3b, 0x63, 0x65, 0x74, 0x75, 0x72, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x70, 0x69, 0x65, 0x6b, 0x74,</div><div class='add'>+0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x73, 0x65, 0x73, 0x74, 0x64, 0x69, 0x65, 0x6e, 0x61, 0x3b, 0x53, 0x3b, 0x50, 0x3b,</div><div class='add'>+0x4f, 0x3b, 0x54, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x65, 0x79, 0x65, 0x3b, 0x6d, 0x31, 0x3b, 0x6d, 0x32, 0x3b,</div><div class='add'>+0x6d, 0x33, 0x3b, 0x6d, 0x34, 0x3b, 0x6d, 0x35, 0x3b, 0x6d, 0x70, 0x73, 0x3b, 0x65, 0x79, 0x65, 0x6e, 0x67, 0x61, 0x3b,</div><div class='add'>+0x6d, 0x6f, 0x6b, 0x254, 0x6c, 0x254, 0x20, 0x79, 0x61, 0x20, 0x6c, 0x69, 0x62, 0x6f, 0x73, 0xf3, 0x3b, 0x6d, 0x6f, 0x6b,</div><div class='add'>+0x254, 0x6c, 0x254, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x62, 0x61, 0x6c, 0xe9, 0x3b, 0x6d, 0x6f, 0x6b, 0x254, 0x6c, 0x254,</div><div class='add'>+0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x73, 0xe1, 0x74, 0x6f, 0x3b, 0x6d, 0x6f, 0x6b, 0x254, 0x6c, 0x254, 0x20, 0x79, 0x61,</div><div class='add'>+0x20, 0x6d, 0xed, 0x6e, 0xe9, 0x69, 0x3b, 0x6d, 0x6f, 0x6b, 0x254, 0x6c, 0x254, 0x20, 0x79, 0x61, 0x20, 0x6d, 0xed, 0x74,</div><div class='add'>+0xe1, 0x6e, 0x6f, 0x3b, 0x6d, 0x70, 0x254, 0x301, 0x73, 0x254, 0x3b, 0x53, 0x6b, 0x3b, 0x50, 0x69, 0x3b, 0x41, 0x3b, 0x54,</div><div class='add'>+0x3b, 0x4b, 0x3b, 0x50, 0x65, 0x3b, 0x160, 0x3b, 0x73, 0x65, 0x6b, 0x6d, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b,</div><div class='add'>+0x70, 0x69, 0x72, 0x6d, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x61, 0x6e, 0x74, 0x72, 0x61, 0x64, 0x69, 0x65,</div><div class='add'>+0x6e, 0x69, 0x73, 0x3b, 0x74, 0x72, 0x65, 0x10d, 0x69, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x6b, 0x65, 0x74,</div><div class='add'>+0x76, 0x69, 0x72, 0x74, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x70, 0x65, 0x6e, 0x6b, 0x74, 0x61, 0x64, 0x69,</div><div class='add'>+0x65, 0x6e, 0x69, 0x73, 0x3b, 0x161, 0x65, 0x161, 0x74, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x69, 0x73, 0x3b, 0x53, 0x3b, 0x50,</div><div class='add'>+0x3b, 0x41, 0x3b, 0x54, 0x3b, 0x4b, 0x3b, 0x50, 0x3b, 0x160, 0x3b, 0x53, 0x6b, 0x3b, 0x50, 0x72, 0x3b, 0x41, 0x6e, 0x3b,</div><div class='add'>+0x54, 0x72, 0x3b, 0x4b, 0x74, 0x3b, 0x50, 0x6e, 0x3b, 0x160, 0x74, 0x3b, 0x43d, 0x435, 0x434, 0x2e, 0x3b, 0x43f, 0x43e, 0x43d,</div><div class='add'>+0x2e, 0x3b, 0x432, 0x442, 0x2e, 0x3b, 0x441, 0x440, 0x435, 0x2e, 0x3b, 0x447, 0x435, 0x442, 0x2e, 0x3b, 0x43f, 0x435, 0x442, 0x2e,</div><div class='add'>+0x3b, 0x441, 0x430, 0x431, 0x2e, 0x3b, 0x43d, 0x435, 0x434, 0x435, 0x43b, 0x430, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x43b,</div><div class='ctx'> 0x43d, 0x438, 0x43a, 0x3b, 0x432, 0x442, 0x43e, 0x440, 0x43d, 0x438, 0x43a, 0x3b, 0x441, 0x440, 0x435, 0x434, 0x430, 0x3b, 0x447, 0x435,</div><div class='del'>-0x442, 0x432, 0x435, 0x440, 0x433, 0x3b, 0x43f, 0x44f, 0x442, 0x43d, 0x438, 0x446, 0x430, 0x3b, 0x441, 0x443, 0x431, 0x431, 0x43e, 0x442,</div><div class='del'>-0x430, 0x3b, 0x42, 0x6b, 0x31, 0x3b, 0x42, 0x6b, 0x32, 0x3b, 0x42, 0x6b, 0x33, 0x3b, 0x42, 0x6b, 0x34, 0x3b, 0x42, 0x6b,</div><div class='del'>-0x35, 0x3b, 0x4c, 0xe2, 0x70, 0x3b, 0x4c, 0xe2, 0x79, 0x3b, 0x42, 0x69, 0x6b, 0x75, 0x61, 0x2d, 0xf4, 0x6b, 0x6f, 0x3b,</div><div class='del'>-0x42, 0xef, 0x6b, 0x75, 0x61, 0x2d, 0xfb, 0x73, 0x65, 0x3b, 0x42, 0xef, 0x6b, 0x75, 0x61, 0x2d, 0x70, 0x74, 0xe2, 0x3b,</div><div class='del'>-0x42, 0xef, 0x6b, 0x75, 0x61, 0x2d, 0x75, 0x73, 0xef, 0xf6, 0x3b, 0x42, 0xef, 0x6b, 0x75, 0x61, 0x2d, 0x6f, 0x6b, 0xfc,</div><div class='del'>-0x3b, 0x4c, 0xe2, 0x70, 0xf4, 0x73, 0xf6, 0x3b, 0x4c, 0xe2, 0x79, 0x65, 0x6e, 0x67, 0x61, 0x3b, 0x4b, 0x3b, 0x53, 0x3b,</div><div class='del'>-0x54, 0x3b, 0x53, 0x3b, 0x4b, 0x3b, 0x50, 0x3b, 0x59, 0x3b, 0x43d, 0x435, 0x434, 0x3b, 0x43f, 0x43e, 0x43d, 0x3b, 0x443, 0x442,</div><div class='del'>-0x43e, 0x3b, 0x441, 0x440, 0x435, 0x3b, 0x447, 0x435, 0x442, 0x3b, 0x43f, 0x435, 0x442, 0x3b, 0x441, 0x443, 0x431, 0x3b, 0x43d, 0x435,</div><div class='del'>-0x434, 0x435, 0x459, 0x430, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x459, 0x430, 0x43a, 0x3b, 0x443, 0x442, 0x43e, 0x440, 0x430,</div><div class='del'>-0x43a, 0x3b, 0x441, 0x440, 0x435, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x440, 0x442, 0x430, 0x43a, 0x3b, 0x43f, 0x435, 0x442,</div><div class='del'>-0x430, 0x43a, 0x3b, 0x441, 0x443, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x43d, 0x3b, 0x43f, 0x3b, 0x443, 0x3b, 0x441, 0x3b, 0x447, 0x3b,</div><div class='del'>-0x43f, 0x3b, 0x441, 0x3b, 0x43d, 0x435, 0x434, 0x3b, 0x43f, 0x43e, 0x43d, 0x3b, 0x443, 0x442, 0x43e, 0x3b, 0x441, 0x440, 0x438, 0x3b,</div><div class='del'>-0x447, 0x435, 0x442, 0x3b, 0x43f, 0x435, 0x442, 0x3b, 0x441, 0x443, 0x431, 0x3b, 0x43d, 0x435, 0x434, 0x435, 0x459, 0x430, 0x3b, 0x43f,</div><div class='del'>-0x43e, 0x43d, 0x435, 0x434, 0x435, 0x459, 0x430, 0x43a, 0x3b, 0x443, 0x442, 0x43e, 0x440, 0x430, 0x43a, 0x3b, 0x441, 0x440, 0x438, 0x458,</div><div class='del'>-0x435, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x440, 0x442, 0x430, 0x43a, 0x3b, 0x43f, 0x435, 0x442, 0x430, 0x43a, 0x3b, 0x441,</div><div class='del'>-0x443, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x6e, 0x65, 0x64, 0x3b, 0x70, 0x6f, 0x6e, 0x3b, 0x75, 0x74, 0x6f, 0x3b, 0x73, 0x72,</div><div class='del'>-0x65, 0x3b, 0x10d, 0x65, 0x74, 0x3b, 0x70, 0x65, 0x74, 0x3b, 0x73, 0x75, 0x62, 0x3b, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a,</div><div class='del'>-0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a, 0x61, 0x6b, 0x3b, 0x75, 0x74, 0x6f, 0x72, 0x61, 0x6b, 0x3b,</div><div class='del'>-0x73, 0x72, 0x65, 0x64, 0x61, 0x3b, 0x10d, 0x65, 0x74, 0x76, 0x72, 0x74, 0x61, 0x6b, 0x3b, 0x70, 0x65, 0x74, 0x61, 0x6b,</div><div class='del'>-0x3b, 0x73, 0x75, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x53, 0x6f, 0x6e, 0x3b, 0x4d, 0x6d, 0x61, 0x3b, 0x42, 0x65, 0x64, 0x3b,</div><div class='del'>-0x52, 0x61, 0x72, 0x3b, 0x4e, 0x65, 0x3b, 0x48, 0x6c, 0x61, 0x3b, 0x4d, 0x6f, 0x71, 0x3b, 0x53, 0x6f, 0x6e, 0x74, 0x61,</div><div class='del'>-0x68, 0x61, 0x3b, 0x4d, 0x6d, 0x61, 0x6e, 0x74, 0x61, 0x68, 0x61, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x62, 0x65, 0x64, 0x69,</div><div class='del'>-0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x72, 0x61, 0x72, 0x75, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x6e, 0x65, 0x3b, 0x4c, 0x61, 0x62,</div><div class='del'>-0x6f, 0x68, 0x6c, 0x61, 0x6e, 0x65, 0x3b, 0x4d, 0x6f, 0x71, 0x65, 0x62, 0x65, 0x6c, 0x6f, 0x3b, 0x54, 0x73, 0x68, 0x3b,</div><div class='del'>-0x4d, 0x6f, 0x73, 0x3b, 0x42, 0x65, 0x64, 0x3b, 0x52, 0x61, 0x72, 0x3b, 0x4e, 0x65, 0x3b, 0x54, 0x6c, 0x61, 0x3b, 0x4d,</div><div class='del'>-0x61, 0x74, 0x3b, 0x54, 0x73, 0x68, 0x69, 0x70, 0x69, 0x3b, 0x4d, 0x6f, 0x73, 0x6f, 0x70, 0x75, 0x6c, 0x6f, 0x67, 0x6f,</div><div class='del'>-0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x62, 0x65, 0x64, 0x69, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x72, 0x61, 0x72, 0x6f, 0x3b, 0x4c,</div><div class='del'>-0x61, 0x62, 0x6f, 0x6e, 0x65, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x74, 0x6c, 0x68, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x61, 0x74,</div><div class='del'>-0x6c, 0x68, 0x61, 0x74, 0x73, 0x6f, 0x3b, 0x53, 0x76, 0x6f, 0x3b, 0x4d, 0x75, 0x76, 0x3b, 0x43, 0x68, 0x69, 0x70, 0x3b,</div><div class='del'>-0x43, 0x68, 0x69, 0x74, 0x3b, 0x43, 0x68, 0x69, 0x6e, 0x3b, 0x43, 0x68, 0x69, 0x73, 0x3b, 0x4d, 0x75, 0x67, 0x3b, 0x53,</div><div class='del'>-0x76, 0x6f, 0x6e, 0x64, 0x6f, 0x3b, 0x4d, 0x75, 0x76, 0x68, 0x75, 0x72, 0x6f, 0x3b, 0x43, 0x68, 0x69, 0x70, 0x69, 0x72,</div><div class='del'>-0x69, 0x3b, 0x43, 0x68, 0x69, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x43, 0x68, 0x69, 0x6e, 0x61, 0x3b, 0x43, 0x68, 0x69, 0x73,</div><div class='del'>-0x68, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x75, 0x67, 0x6f, 0x76, 0x65, 0x72, 0x61, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x43, 0x3b,</div><div class='del'>-0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x4d, 0x3b, 0xd89, 0xdbb, 0xdd2, 0x3b, 0xdc3, 0xdb3, 0xdd4, 0x3b, 0xd85, 0xd9f, 0x3b, 0xdb6,</div><div class='del'>-0xdaf, 0xdcf, 0x3b, 0xdb6, 0xdca, 0x200d, 0xdbb, 0xdc4, 0x3b, 0xdc3, 0xdd2, 0xd9a, 0xdd4, 0x3b, 0xdc3, 0xdd9, 0xdb1, 0x3b, 0xd89, 0xdbb,</div><div class='del'>-0xdd2, 0xdaf, 0xdcf, 0x3b, 0xdc3, 0xdb3, 0xdd4, 0xdaf, 0xdcf, 0x3b, 0xd85, 0xd9f, 0xdc4, 0xdbb, 0xdd4, 0xdc0, 0xdcf, 0xdaf, 0xdcf, 0x3b,</div><div class='del'>-0xdb6, 0xdaf, 0xdcf, 0xdaf, 0xdcf, 0x3b, 0xdb6, 0xdca, 0x200d, 0xdbb, 0xdc4, 0xdc3, 0xdca, 0xdb4, 0xdad, 0xdd2, 0xdb1, 0xdca, 0xdaf, 0xdcf,</div><div class='del'>-0x3b, 0xdc3, 0xdd2, 0xd9a, 0xdd4, 0xdbb, 0xdcf, 0xdaf, 0xdcf, 0x3b, 0xdc3, 0xdd9, 0xdb1, 0xdc3, 0xdd4, 0xdbb, 0xdcf, 0xdaf, 0xdcf, 0x3b,</div><div class='del'>-0xd89, 0x3b, 0xdc3, 0x3b, 0xd85, 0x3b, 0xdb6, 0x3b, 0xdb6, 0xdca, 0x200d, 0xdbb, 0x3b, 0xdc3, 0xdd2, 0x3b, 0xdc3, 0xdd9, 0x3b, 0x53,</div><div class='del'>-0x6f, 0x6e, 0x3b, 0x4d, 0x73, 0x6f, 0x3b, 0x42, 0x69, 0x6c, 0x3b, 0x54, 0x73, 0x61, 0x3b, 0x4e, 0x65, 0x3b, 0x48, 0x6c,</div><div class='del'>-0x61, 0x3b, 0x4d, 0x67, 0x63, 0x3b, 0x4c, 0x69, 0x73, 0x6f, 0x6e, 0x74, 0x66, 0x6f, 0x3b, 0x75, 0x4d, 0x73, 0x6f, 0x6d,</div><div class='del'>-0x62, 0x75, 0x6c, 0x75, 0x6b, 0x6f, 0x3b, 0x4c, 0x65, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4c, 0x65, 0x73, 0x69,</div><div class='del'>-0x74, 0x73, 0x61, 0x74, 0x66, 0x75, 0x3b, 0x4c, 0x65, 0x73, 0x69, 0x6e, 0x65, 0x3b, 0x4c, 0x65, 0x73, 0x69, 0x68, 0x6c,</div><div class='del'>-0x61, 0x6e, 0x75, 0x3b, 0x75, 0x4d, 0x67, 0x63, 0x69, 0x62, 0x65, 0x6c, 0x6f, 0x3b, 0x6e, 0x65, 0x3b, 0x70, 0x6f, 0x3b,</div><div class='del'>-0x75, 0x74, 0x3b, 0x73, 0x74, 0x3b, 0x161, 0x74, 0x3b, 0x70, 0x69, 0x3b, 0x73, 0x6f, 0x3b, 0x6e, 0x65, 0x64, 0x65, 0x13e,</div><div class='del'>-0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x64, 0x65, 0x6c, 0x6f, 0x6b, 0x3b, 0x75, 0x74, 0x6f, 0x72, 0x6f, 0x6b, 0x3b, 0x73, 0x74,</div><div class='del'>-0x72, 0x65, 0x64, 0x61, 0x3b, 0x161, 0x74, 0x76, 0x72, 0x74, 0x6f, 0x6b, 0x3b, 0x70, 0x69, 0x61, 0x74, 0x6f, 0x6b, 0x3b,</div><div class='del'>-0x73, 0x6f, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x4e, 0x3b, 0x50, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x160, 0x3b, 0x50, 0x3b, 0x53,</div><div class='del'>-0x3b, 0x6e, 0x65, 0x64, 0x3b, 0x70, 0x6f, 0x6e, 0x3b, 0x74, 0x6f, 0x72, 0x3b, 0x73, 0x72, 0x65, 0x3b, 0x10d, 0x65, 0x74,</div><div class='del'>-0x3b, 0x70, 0x65, 0x74, 0x3b, 0x73, 0x6f, 0x62, 0x3b, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a, 0x61, 0x3b, 0x70, 0x6f, 0x6e,</div><div class='del'>-0x65, 0x64, 0x65, 0x6c, 0x6a, 0x65, 0x6b, 0x3b, 0x74, 0x6f, 0x72, 0x65, 0x6b, 0x3b, 0x73, 0x72, 0x65, 0x64, 0x61, 0x3b,</div><div class='del'>-0x10d, 0x65, 0x74, 0x72, 0x74, 0x65, 0x6b, 0x3b, 0x70, 0x65, 0x74, 0x65, 0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f, 0x74, 0x61,</div><div class='del'>-0x3b, 0x6e, 0x3b, 0x70, 0x3b, 0x74, 0x3b, 0x73, 0x3b, 0x10d, 0x3b, 0x70, 0x3b, 0x73, 0x3b, 0x41, 0x78, 0x64, 0x3b, 0x49,</div><div class='del'>-0x73, 0x6e, 0x3b, 0x54, 0x61, 0x6c, 0x3b, 0x41, 0x72, 0x62, 0x3b, 0x4b, 0x68, 0x61, 0x3b, 0x4a, 0x69, 0x6d, 0x3b, 0x53,</div><div class='del'>-0x61, 0x62, 0x3b, 0x41, 0x78, 0x61, 0x64, 0x3b, 0x49, 0x73, 0x6e, 0x69, 0x69, 0x6e, 0x3b, 0x54, 0x61, 0x6c, 0x61, 0x61,</div><div class='del'>-0x64, 0x6f, 0x3b, 0x41, 0x72, 0x62, 0x61, 0x63, 0x6f, 0x3b, 0x4b, 0x68, 0x61, 0x6d, 0x69, 0x69, 0x73, 0x3b, 0x4a, 0x69,</div><div class='del'>-0x6d, 0x63, 0x6f, 0x3b, 0x53, 0x61, 0x62, 0x74, 0x69, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x4b, 0x3b,</div><div class='del'>-0x4a, 0x3b, 0x53, 0x3b, 0x64, 0x6f, 0x6d, 0x3b, 0x6c, 0x75, 0x6e, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6d, 0x69, 0xe9, 0x3b,</div><div class='del'>-0x6a, 0x75, 0x65, 0x3b, 0x76, 0x69, 0x65, 0x3b, 0x73, 0xe1, 0x62, 0x3b, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x3b,</div><div class='del'>-0x6c, 0x75, 0x6e, 0x65, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x3b, 0x6d, 0x69, 0xe9, 0x72, 0x63, 0x6f, 0x6c,</div><div class='del'>-0x65, 0x73, 0x3b, 0x6a, 0x75, 0x65, 0x76, 0x65, 0x73, 0x3b, 0x76, 0x69, 0x65, 0x72, 0x6e, 0x65, 0x73, 0x3b, 0x73, 0xe1,</div><div class='del'>-0x62, 0x61, 0x64, 0x6f, 0x3b, 0x4a, 0x32, 0x3b, 0x4a, 0x33, 0x3b, 0x4a, 0x34, 0x3b, 0x4a, 0x35, 0x3b, 0x41, 0x6c, 0x68,</div><div class='del'>-0x3b, 0x49, 0x6a, 0x3b, 0x4a, 0x31, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x6c, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61,</div><div class='del'>-0x74, 0x61, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e,</div><div class='del'>-0x6f, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4a, 0x75,</div><div class='del'>-0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x3b, 0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x31,</div><div class='del'>-0x3b, 0x73, 0xf6, 0x6e, 0x3b, 0x6d, 0xe5, 0x6e, 0x3b, 0x74, 0x69, 0x73, 0x3b, 0x6f, 0x6e, 0x73, 0x3b, 0x74, 0x6f, 0x72,</div><div class='del'>-0x73, 0x3b, 0x66, 0x72, 0x65, 0x3b, 0x6c, 0xf6, 0x72, 0x3b, 0x73, 0xf6, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x6d, 0xe5, 0x6e,</div><div class='del'>-0x64, 0x61, 0x67, 0x3b, 0x74, 0x69, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x6f, 0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x6f,</div><div class='del'>-0x72, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x66, 0x72, 0x65, 0x64, 0x61, 0x67, 0x3b, 0x6c, 0xf6, 0x72, 0x64, 0x61, 0x67, 0x3b,</div><div class='del'>-0x42f, 0x448, 0x431, 0x3b, 0x414, 0x448, 0x431, 0x3b, 0x421, 0x448, 0x431, 0x3b, 0x427, 0x448, 0x431, 0x3b, 0x41f, 0x448, 0x431, 0x3b,</div><div class='del'>-0x4b6, 0x43c, 0x44a, 0x3b, 0x428, 0x43d, 0x431, 0x3b, 0x42f, 0x43a, 0x448, 0x430, 0x43d, 0x431, 0x435, 0x3b, 0x414, 0x443, 0x448, 0x430,</div><div class='del'>-0x43d, 0x431, 0x435, 0x3b, 0x421, 0x435, 0x448, 0x430, 0x43d, 0x431, 0x435, 0x3b, 0x427, 0x43e, 0x440, 0x448, 0x430, 0x43d, 0x431, 0x435,</div><div class='del'>-0x3b, 0x41f, 0x430, 0x43d, 0x4b7, 0x448, 0x430, 0x43d, 0x431, 0x435, 0x3b, 0x4b6, 0x443, 0x43c, 0x44a, 0x430, 0x3b, 0x428, 0x430, 0x43d,</div><div class='del'>-0x431, 0x435, 0x3b, 0xb9e, 0xbbe, 0x3b, 0xba4, 0xbbf, 0x3b, 0xb9a, 0xbc6, 0x3b, 0xbaa, 0xbc1, 0x3b, 0xbb5, 0xbbf, 0x3b, 0xbb5, 0xbc6,</div><div class='del'>-0x3b, 0xb9a, 0x3b, 0xb9e, 0xbbe, 0xbaf, 0xbbf, 0xbb1, 0xbc1, 0x3b, 0xba4, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbb3, 0xbcd, 0x3b, 0xb9a, 0xbc6,</div><div class='del'>-0xbb5, 0xbcd, 0xbb5, 0xbbe, 0xbaf, 0xbcd, 0x3b, 0xbaa, 0xbc1, 0xba4, 0xba9, 0xbcd, 0x3b, 0xbb5, 0xbbf, 0xbaf, 0xbbe, 0xbb4, 0xba9, 0xbcd,</div><div class='del'>-0x3b, 0xbb5, 0xbc6, 0xbb3, 0xbcd, 0xbb3, 0xbbf, 0x3b, 0xb9a, 0xba9, 0xbbf, 0x3b, 0xc06, 0xc26, 0xc3f, 0x3b, 0xc38, 0xc4b, 0xc2e, 0x3b,</div><div class='del'>-0xc2e, 0xc02, 0xc17, 0xc33, 0x3b, 0xc2c, 0xc41, 0xc27, 0x3b, 0xc17, 0xc41, 0xc30, 0xc41, 0x3b, 0xc36, 0xc41, 0xc15, 0xc4d, 0xc30, 0x3b,</div><div class='del'>-0xc36, 0xc28, 0xc3f, 0x3b, 0xc06, 0xc26, 0xc3f, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc38, 0xc4b, 0xc2e, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b,</div><div class='del'>-0xc2e, 0xc02, 0xc17, 0xc33, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc2c, 0xc41, 0xc27, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc17, 0xc41, 0xc30,</div><div class='del'>-0xc41, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc36, 0xc41, 0xc15, 0xc4d, 0xc30, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc36, 0xc28, 0xc3f, 0xc35,</div><div class='del'>-0xc3e, 0xc30, 0xc02, 0x3b, 0xc06, 0x3b, 0xc38, 0xc4b, 0x3b, 0xc2e, 0x3b, 0xc2d, 0xc41, 0x3b, 0xc17, 0xc41, 0x3b, 0xc36, 0xc41, 0x3b,</div><div class='del'>-0xc36, 0x3b, 0xe2d, 0xe32, 0x2e, 0x3b, 0xe08, 0x2e, 0x3b, 0xe2d, 0x2e, 0x3b, 0xe1e, 0x2e, 0x3b, 0xe1e, 0xe24, 0x2e, 0x3b, 0xe28,</div><div class='del'>-0x2e, 0x3b, 0xe2a, 0x2e, 0x3b, 0xe27, 0xe31, 0xe19, 0xe2d, 0xe32, 0xe17, 0xe34, 0xe15, 0xe22, 0xe4c, 0x3b, 0xe27, 0xe31, 0xe19, 0xe08,</div><div class='del'>-0xe31, 0xe19, 0xe17, 0xe23, 0xe4c, 0x3b, 0xe27, 0xe31, 0xe19, 0xe2d, 0xe31, 0xe07, 0xe04, 0xe32, 0xe23, 0x3b, 0xe27, 0xe31, 0xe19, 0xe1e,</div><div class='del'>-0xe38, 0xe18, 0x3b, 0xe27, 0xe31, 0xe19, 0xe1e, 0xe24, 0xe2b, 0xe31, 0xe2a, 0xe1a, 0xe14, 0xe35, 0x3b, 0xe27, 0xe31, 0xe19, 0xe28, 0xe38,</div><div class='del'>-0xe01, 0xe23, 0xe4c, 0x3b, 0xe27, 0xe31, 0xe19, 0xe40, 0xe2a, 0xe32, 0xe23, 0xe4c, 0x3b, 0xe2d, 0x3b, 0xe08, 0x3b, 0xe2d, 0x3b, 0xe1e,</div><div class='del'>-0x3b, 0xe1e, 0x3b, 0xe28, 0x3b, 0xe2a, 0x3b, 0xf49, 0xf72, 0xf0b, 0xf58, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0x3b, 0xf58,</div><div class='del'>-0xf72, 0xf42, 0xf0b, 0xf51, 0xf58, 0xf62, 0xf0b, 0x3b, 0xf67, 0xfb3, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf55, 0xf74, 0xf62, 0xf0b, 0xf56,</div><div class='del'>-0xf74, 0xf0b, 0x3b, 0xf66, 0xf44, 0xf66, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b,</div><div class='del'>-0xf49, 0xf72, 0xf0b, 0xf58, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b,</div><div class='del'>-0xf58, 0xf72, 0xf42, 0xf0b, 0xf51, 0xf58, 0xf62, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf67, 0xfb3, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b,</div><div class='del'>-0xf42, 0xf5f, 0xf60, 0xf0b, 0xf55, 0xf74, 0xf62, 0xf0b, 0xf56, 0xf74, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf66, 0xf44, 0xf66, 0xf0b,</div><div class='del'>-0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf49, 0xf72, 0x3b, 0xf5f, 0xfb3, 0x3b, 0xf58,</div><div class='del'>-0xf72, 0x3b, 0xf67, 0xfb3, 0x3b, 0xf55, 0xf74, 0x3b, 0xf66, 0x3b, 0xf66, 0xfa4, 0xf7a, 0x3b, 0x1230, 0x1295, 0x1260, 0x1275, 0x3b, 0x1230,</div><div class='del'>-0x1291, 0x12ed, 0x3b, 0x1230, 0x1209, 0x1235, 0x3b, 0x1228, 0x1261, 0x12d5, 0x3b, 0x1213, 0x1219, 0x1235, 0x3b, 0x12d3, 0x122d, 0x1262, 0x3b, 0x1240,</div><div class='del'>-0x12f3, 0x121d, 0x3b, 0x1230, 0x3b, 0x1230, 0x3b, 0x1220, 0x3b, 0x1228, 0x3b, 0x1283, 0x3b, 0x12d3, 0x3b, 0x1240, 0x3b, 0x1230, 0x1295, 0x1260,</div><div class='del'>-0x1275, 0x3b, 0x1230, 0x1291, 0x12ed, 0x3b, 0x1220, 0x1209, 0x1235, 0x3b, 0x1228, 0x1261, 0x12d5, 0x3b, 0x1283, 0x1219, 0x1235, 0x3b, 0x12d3, 0x122d,</div><div class='del'>-0x1262, 0x3b, 0x1240, 0x12f3, 0x121d, 0x3b, 0x53, 0x101, 0x70, 0x3b, 0x4d, 0x14d, 0x6e, 0x3b, 0x54, 0x16b, 0x73, 0x3b, 0x50, 0x75,</div><div class='del'>-0x6c, 0x3b, 0x54, 0x75, 0x2bb, 0x61, 0x3b, 0x46, 0x61, 0x6c, 0x3b, 0x54, 0x6f, 0x6b, 0x3b, 0x53, 0x101, 0x70, 0x61, 0x74,</div><div class='del'>-0x65, 0x3b, 0x4d, 0x14d, 0x6e, 0x69, 0x74, 0x65, 0x3b, 0x54, 0x16b, 0x73, 0x69, 0x74, 0x65, 0x3b, 0x50, 0x75, 0x6c, 0x65,</div><div class='del'>-0x6c, 0x75, 0x6c, 0x75, 0x3b, 0x54, 0x75, 0x2bb, 0x61, 0x70, 0x75, 0x6c, 0x65, 0x6c, 0x75, 0x6c, 0x75, 0x3b, 0x46, 0x61,</div><div class='del'>-0x6c, 0x61, 0x69, 0x74, 0x65, 0x3b, 0x54, 0x6f, 0x6b, 0x6f, 0x6e, 0x61, 0x6b, 0x69, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x54,</div><div class='del'>-0x3b, 0x50, 0x3b, 0x54, 0x3b, 0x46, 0x3b, 0x54, 0x3b, 0x53, 0x6f, 0x6e, 0x3b, 0x4d, 0x75, 0x73, 0x3b, 0x42, 0x69, 0x72,</div><div class='del'>-0x3b, 0x48, 0x61, 0x72, 0x3b, 0x4e, 0x65, 0x3b, 0x54, 0x6c, 0x68, 0x3b, 0x4d, 0x75, 0x67, 0x3b, 0x53, 0x6f, 0x6e, 0x74,</div><div class='del'>-0x6f, 0x3b, 0x4d, 0x75, 0x73, 0x75, 0x6d, 0x62, 0x68, 0x75, 0x6e, 0x75, 0x6b, 0x75, 0x3b, 0x52, 0x61, 0x76, 0x75, 0x6d,</div><div class='del'>-0x62, 0x69, 0x72, 0x68, 0x69, 0x3b, 0x52, 0x61, 0x76, 0x75, 0x6e, 0x68, 0x61, 0x72, 0x68, 0x75, 0x3b, 0x52, 0x61, 0x76,</div><div class='del'>-0x75, 0x6d, 0x75, 0x6e, 0x65, 0x3b, 0x52, 0x61, 0x76, 0x75, 0x6e, 0x74, 0x6c, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x75,</div><div class='del'>-0x67, 0x71, 0x69, 0x76, 0x65, 0x6c, 0x61, 0x3b, 0x50, 0x61, 0x7a, 0x3b, 0x50, 0x7a, 0x74, 0x3b, 0x53, 0x61, 0x6c, 0x3b,</div><div class='del'>-0xc7, 0x61, 0x72, 0x3b, 0x50, 0x65, 0x72, 0x3b, 0x43, 0x75, 0x6d, 0x3b, 0x43, 0x6d, 0x74, 0x3b, 0x50, 0x61, 0x7a, 0x61,</div><div class='del'>-0x72, 0x3b, 0x50, 0x61, 0x7a, 0x61, 0x72, 0x74, 0x65, 0x73, 0x69, 0x3b, 0x53, 0x61, 0x6c, 0x131, 0x3b, 0xc7, 0x61, 0x72,</div><div class='del'>-0x15f, 0x61, 0x6d, 0x62, 0x61, 0x3b, 0x50, 0x65, 0x72, 0x15f, 0x65, 0x6d, 0x62, 0x65, 0x3b, 0x43, 0x75, 0x6d, 0x61, 0x3b,</div><div class='del'>-0x43, 0x75, 0x6d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x69, 0x3b, 0x50, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0xc7, 0x3b, 0x50, 0x3b,</div><div class='del'>-0x43, 0x3b, 0x43, 0x3b, 0x41d, 0x434, 0x3b, 0x41f, 0x43d, 0x3b, 0x412, 0x442, 0x3b, 0x421, 0x440, 0x3b, 0x427, 0x442, 0x3b, 0x41f,</div><div class='del'>-0x442, 0x3b, 0x421, 0x431, 0x3b, 0x41d, 0x435, 0x434, 0x456, 0x43b, 0x44f, 0x3b, 0x41f, 0x43e, 0x43d, 0x435, 0x434, 0x456, 0x43b, 0x43e,</div><div class='del'>-0x43a, 0x3b, 0x412, 0x456, 0x432, 0x442, 0x43e, 0x440, 0x43e, 0x43a, 0x3b, 0x421, 0x435, 0x440, 0x435, 0x434, 0x430, 0x3b, 0x427, 0x435,</div><div class='del'>-0x442, 0x432, 0x435, 0x440, 0x3b, 0x41f, 0x2bc, 0x44f, 0x442, 0x43d, 0x438, 0x446, 0x44f, 0x3b, 0x421, 0x443, 0x431, 0x43e, 0x442, 0x430,</div><div class='del'>-0x3b, 0x41d, 0x3b, 0x41f, 0x3b, 0x412, 0x3b, 0x421, 0x3b, 0x427, 0x3b, 0x41f, 0x3b, 0x421, 0x3b, 0x627, 0x62a, 0x648, 0x627, 0x631,</div><div class='del'>-0x3b, 0x67e, 0x64a, 0x631, 0x3b, 0x645, 0x646, 0x6af, 0x644, 0x3b, 0x628, 0x62f, 0x647, 0x3b, 0x62c, 0x645, 0x639, 0x631, 0x627, 0x62a,</div><div class='del'>-0x3b, 0x62c, 0x645, 0x639, 0x6c1, 0x3b, 0x6c1, 0x641, 0x62a, 0x6c1, 0x3b, 0x627, 0x3b, 0x67e, 0x3b, 0x645, 0x3b, 0x628, 0x3b, 0x62c,</div><div class='del'>-0x3b, 0x62c, 0x3b, 0x6c1, 0x3b, 0x42f, 0x43a, 0x448, 0x3b, 0x414, 0x443, 0x448, 0x3b, 0x421, 0x435, 0x448, 0x3b, 0x427, 0x43e, 0x440,</div><div class='del'>-0x3b, 0x41f, 0x430, 0x439, 0x3b, 0x416, 0x443, 0x43c, 0x3b, 0x428, 0x430, 0x43d, 0x3b, 0x44f, 0x43a, 0x448, 0x430, 0x43d, 0x431, 0x430,</div><div class='del'>-0x3b, 0x434, 0x443, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x441, 0x435, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x447, 0x43e, 0x440,</div><div class='del'>-0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x43f, 0x430, 0x439, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x436, 0x443, 0x43c, 0x430, 0x3b,</div><div class='del'>-0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x42f, 0x3b, 0x414, 0x3b, 0x421, 0x3b, 0x427, 0x3b, 0x41f, 0x3b, 0x416, 0x3b, 0x428, 0x3b,</div><div class='del'>-0x6cc, 0x2e, 0x3b, 0x62f, 0x2e, 0x3b, 0x633, 0x2e, 0x3b, 0x686, 0x2e, 0x3b, 0x67e, 0x2e, 0x3b, 0x62c, 0x2e, 0x3b, 0x634, 0x2e,</div><div class='del'>-0x3b, 0x43, 0x4e, 0x3b, 0x54, 0x68, 0x20, 0x32, 0x3b, 0x54, 0x68, 0x20, 0x33, 0x3b, 0x54, 0x68, 0x20, 0x34, 0x3b, 0x54,</div><div class='del'>-0x68, 0x20, 0x35, 0x3b, 0x54, 0x68, 0x20, 0x36, 0x3b, 0x54, 0x68, 0x20, 0x37, 0x3b, 0x43, 0x68, 0x1ee7, 0x20, 0x6e, 0x68,</div><div class='del'>-0x1ead, 0x74, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x68, 0x61, 0x69, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x62, 0x61, 0x3b, 0x54, 0x68,</div><div class='del'>-0x1ee9, 0x20, 0x74, 0x1b0, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x6e, 0x103, 0x6d, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x73, 0xe1, 0x75,</div><div class='del'>-0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x62, 0x1ea3, 0x79, 0x3b, 0x43, 0x4e, 0x3b, 0x54, 0x32, 0x3b, 0x54, 0x33, 0x3b, 0x54, 0x34,</div><div class='del'>-0x3b, 0x54, 0x35, 0x3b, 0x54, 0x36, 0x3b, 0x54, 0x37, 0x3b, 0x53, 0x75, 0x6c, 0x3b, 0x4c, 0x6c, 0x75, 0x6e, 0x3b, 0x4d,</div><div class='del'>-0x61, 0x77, 0x3b, 0x4d, 0x65, 0x72, 0x3b, 0x49, 0x61, 0x75, 0x3b, 0x47, 0x77, 0x65, 0x3b, 0x53, 0x61, 0x64, 0x3b, 0x44,</div><div class='del'>-0x79, 0x64, 0x64, 0x20, 0x53, 0x75, 0x6c, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x4c, 0x6c, 0x75, 0x6e, 0x3b, 0x44, 0x79,</div><div class='del'>-0x64, 0x64, 0x20, 0x4d, 0x61, 0x77, 0x72, 0x74, 0x68, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x4d, 0x65, 0x72, 0x63, 0x68,</div><div class='del'>-0x65, 0x72, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x49, 0x61, 0x75, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x47, 0x77, 0x65,</div><div class='del'>-0x6e, 0x65, 0x72, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x53, 0x61, 0x64, 0x77, 0x72, 0x6e, 0x3b, 0x53, 0x3b, 0x4c, 0x3b,</div><div class='del'>-0x4d, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x47, 0x3b, 0x53, 0x3b, 0x53, 0x75, 0x6c, 0x3b, 0x4c, 0x6c, 0x75, 0x6e, 0x3b, 0x4d,</div><div class='del'>-0x61, 0x77, 0x3b, 0x4d, 0x65, 0x72, 0x3b, 0x49, 0x61, 0x75, 0x3b, 0x47, 0x77, 0x65, 0x6e, 0x3b, 0x53, 0x61, 0x64, 0x3b,</div><div class='del'>-0x43, 0x61, 0x77, 0x3b, 0x4d, 0x76, 0x75, 0x3b, 0x42, 0x69, 0x6e, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x53, 0x69, 0x6e, 0x3b,</div><div class='del'>-0x48, 0x6c, 0x61, 0x3b, 0x4d, 0x67, 0x71, 0x3b, 0x43, 0x61, 0x77, 0x65, 0x3b, 0x4d, 0x76, 0x75, 0x6c, 0x6f, 0x3b, 0x4c,</div><div class='del'>-0x77, 0x65, 0x73, 0x69, 0x62, 0x69, 0x6e, 0x69, 0x3b, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x74, 0x68, 0x61, 0x74, 0x68, 0x75,</div><div class='del'>-0x3b, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x6e, 0x65, 0x3b, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x68, 0x6c, 0x61, 0x6e, 0x75, 0x3b,</div><div class='del'>-0x4d, 0x67, 0x71, 0x69, 0x62, 0x65, 0x6c, 0x6f, 0x3b, 0xc0, 0xec, 0x6b, 0xfa, 0x3b, 0x41, 0x6a, 0xe9, 0x3b, 0xcc, 0x73,</div><div class='del'>-0x1eb9, 0x301, 0x67, 0x75, 0x6e, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x72, 0xfa, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x62, 0x1ecd, 0x3b,</div><div class='del'>-0x1eb8, 0x74, 0xec, 0x3b, 0xc0, 0x62, 0xe1, 0x6d, 0x1eb9, 0x301, 0x74, 0x61, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x20, 0xc0, 0xec,</div><div class='del'>-0x6b, 0xfa, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x20, 0x41, 0x6a, 0xe9, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x20, 0xcc, 0x73, 0x1eb9,</div><div class='del'>-0x301, 0x67, 0x75, 0x6e, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x72, 0xfa, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x62, 0x1ecd, 0x3b, 0x1ecc,</div><div class='del'>-0x6a, 0x1ecd, 0x301, 0x20, 0x1eb8, 0x74, 0xec, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x20, 0xc0, 0x62, 0xe1, 0x6d, 0x1eb9, 0x301, 0x74,</div><div class='del'>-0x61, 0x3b, 0x53, 0x6f, 0x6e, 0x3b, 0x4d, 0x73, 0x6f, 0x3b, 0x42, 0x69, 0x6c, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x53, 0x69,</div><div class='del'>-0x6e, 0x3b, 0x48, 0x6c, 0x61, 0x3b, 0x4d, 0x67, 0x71, 0x3b, 0x53, 0x6f, 0x6e, 0x74, 0x6f, 0x3b, 0x4d, 0x73, 0x6f, 0x6d,</div><div class='del'>-0x62, 0x75, 0x6c, 0x75, 0x6b, 0x6f, 0x3b, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4c, 0x77, 0x65,</div><div class='del'>-0x73, 0x69, 0x74, 0x68, 0x61, 0x74, 0x68, 0x75, 0x3b, 0x75, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x6e, 0x65, 0x3b, 0x4c, 0x77,</div><div class='del'>-0x65, 0x73, 0x69, 0x68, 0x6c, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x67, 0x71, 0x69, 0x62, 0x65, 0x6c, 0x6f, 0x3b, 0x53, 0x3b,</div><div class='del'>-0x4d, 0x3b, 0x42, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x48, 0x3b, 0x4d, 0x3b, 0x73, 0xf8, 0x2e, 0x3b, 0x6d, 0xe5, 0x2e, 0x3b,</div><div class='del'>-0x74, 0x79, 0x2e, 0x3b, 0x6f, 0x6e, 0x2e, 0x3b, 0x74, 0x6f, 0x2e, 0x3b, 0x66, 0x72, 0x2e, 0x3b, 0x6c, 0x61, 0x2e, 0x3b,</div><div class='del'>-0x73, 0xf8, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x6d, 0xe5, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x79, 0x73, 0x64, 0x61, 0x67,</div><div class='del'>-0x3b, 0x6f, 0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x6f, 0x72, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x66, 0x72, 0x65, 0x64,</div><div class='del'>-0x61, 0x67, 0x3b, 0x6c, 0x61, 0x75, 0x72, 0x64, 0x61, 0x67, 0x3b, 0x4e, 0x65, 0x64, 0x3b, 0x50, 0x6f, 0x6e, 0x3b, 0x55,</div><div class='del'>-0x74, 0x6f, 0x3b, 0x53, 0x72, 0x69, 0x3b, 0x10c, 0x65, 0x74, 0x3b, 0x50, 0x65, 0x74, 0x3b, 0x53, 0x75, 0x62, 0x3b, 0x4e,</div><div class='del'>-0x65, 0x64, 0x6a, 0x65, 0x6c, 0x6a, 0x61, 0x3b, 0x50, 0x6f, 0x6e, 0x65, 0x64, 0x6a, 0x65, 0x6c, 0x6a, 0x61, 0x6b, 0x3b,</div><div class='del'>-0x55, 0x74, 0x6f, 0x72, 0x61, 0x6b, 0x3b, 0x53, 0x72, 0x69, 0x6a, 0x65, 0x64, 0x61, 0x3b, 0x10c, 0x65, 0x74, 0x76, 0x72,</div><div class='del'>-0x74, 0x61, 0x6b, 0x3b, 0x50, 0x65, 0x74, 0x61, 0x6b, 0x3b, 0x53, 0x75, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x4a, 0x65, 0x64,</div><div class='del'>-0x3b, 0x4a, 0x65, 0x6c, 0x3b, 0x4a, 0x65, 0x6d, 0x3b, 0x4a, 0x65, 0x72, 0x63, 0x3b, 0x4a, 0x65, 0x72, 0x64, 0x3b, 0x4a,</div><div class='del'>-0x65, 0x68, 0x3b, 0x4a, 0x65, 0x73, 0x3b, 0x4a, 0x65, 0x64, 0x6f, 0x6f, 0x6e, 0x65, 0x65, 0x3b, 0x4a, 0x65, 0x6c, 0x68,</div><div class='del'>-0x65, 0x69, 0x6e, 0x3b, 0x4a, 0x65, 0x6d, 0x61, 0x79, 0x72, 0x74, 0x3b, 0x4a, 0x65, 0x72, 0x63, 0x65, 0x61, 0x6e, 0x3b,</div><div class='del'>-0x4a, 0x65, 0x72, 0x64, 0x65, 0x69, 0x6e, 0x3b, 0x4a, 0x65, 0x68, 0x65, 0x69, 0x6e, 0x65, 0x79, 0x3b, 0x4a, 0x65, 0x73,</div><div class='del'>-0x61, 0x72, 0x6e, 0x3b, 0x53, 0x75, 0x6c, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x74, 0x68, 0x3b, 0x4d, 0x68, 0x72, 0x3b,</div><div class='del'>-0x59, 0x6f, 0x77, 0x3b, 0x47, 0x77, 0x65, 0x3b, 0x53, 0x61, 0x64, 0x3b, 0x44, 0x65, 0x20, 0x53, 0x75, 0x6c, 0x3b, 0x44,</div><div class='del'>-0x65, 0x20, 0x4c, 0x75, 0x6e, 0x3b, 0x44, 0x65, 0x20, 0x4d, 0x65, 0x72, 0x74, 0x68, 0x3b, 0x44, 0x65, 0x20, 0x4d, 0x65,</div><div class='del'>-0x72, 0x68, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x20, 0x59, 0x6f, 0x77, 0x3b, 0x44, 0x65, 0x20, 0x47, 0x77, 0x65, 0x6e, 0x65,</div><div class='del'>-0x72, 0x3b, 0x44, 0x65, 0x20, 0x53, 0x61, 0x64, 0x6f, 0x72, 0x6e, 0x3b, 0x4b, 0x77, 0x65, 0x3b, 0x44, 0x77, 0x6f, 0x3b,</div><div class='del'>-0x42, 0x65, 0x6e, 0x3b, 0x57, 0x75, 0x6b, 0x3b, 0x59, 0x61, 0x77, 0x3b, 0x46, 0x69, 0x61, 0x3b, 0x4d, 0x65, 0x6d, 0x3b,</div><div class='del'>-0x4b, 0x77, 0x65, 0x73, 0x69, 0x64, 0x61, 0x3b, 0x44, 0x77, 0x6f, 0x77, 0x64, 0x61, 0x3b, 0x42, 0x65, 0x6e, 0x61, 0x64,</div><div class='del'>-0x61, 0x3b, 0x57, 0x75, 0x6b, 0x75, 0x64, 0x61, 0x3b, 0x59, 0x61, 0x77, 0x64, 0x61, 0x3b, 0x46, 0x69, 0x64, 0x61, 0x3b,</div><div class='del'>-0x4d, 0x65, 0x6d, 0x65, 0x6e, 0x65, 0x64, 0x61, 0x3b, 0x4b, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x57, 0x3b, 0x59, 0x3b, 0x46,</div><div class='del'>-0x3b, 0x4d, 0x3b, 0x906, 0x926, 0x93f, 0x924, 0x94d, 0x92f, 0x935, 0x93e, 0x930, 0x3b, 0x938, 0x94b, 0x92e, 0x935, 0x93e, 0x930, 0x3b,</div><div class='del'>-0x92e, 0x902, 0x917, 0x933, 0x93e, 0x930, 0x3b, 0x92c, 0x941, 0x927, 0x935, 0x93e, 0x930, 0x3b, 0x917, 0x941, 0x930, 0x941, 0x935, 0x93e,</div><div class='del'>-0x930, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x935, 0x93e, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x48, 0x6f,</div><div class='del'>-0x3b, 0x44, 0x7a, 0x75, 0x3b, 0x44, 0x7a, 0x66, 0x3b, 0x53, 0x68, 0x6f, 0x3b, 0x53, 0x6f, 0x6f, 0x3b, 0x53, 0x6f, 0x68,</div><div class='del'>-0x3b, 0x48, 0x6f, 0x3b, 0x48, 0x6f, 0x67, 0x62, 0x61, 0x61, 0x3b, 0x44, 0x7a, 0x75, 0x3b, 0x44, 0x7a, 0x75, 0x66, 0x6f,</div><div class='del'>-0x3b, 0x53, 0x68, 0x6f, 0x3b, 0x53, 0x6f, 0x6f, 0x3b, 0x53, 0x6f, 0x68, 0x61, 0x61, 0x3b, 0x48, 0x6f, 0x3b, 0x1ee4, 0x6b,</div><div class='del'>-0x61, 0x3b, 0x4d, 0x1ecd, 0x6e, 0x3b, 0x54, 0x69, 0x75, 0x3b, 0x57, 0x65, 0x6e, 0x3b, 0x54, 0x1ecd, 0x1ecd, 0x3b, 0x46, 0x72,</div><div class='del'>-0x61, 0x1ecb, 0x3b, 0x53, 0x61, 0x74, 0x3b, 0x4d, 0x62, 0x1ecd, 0x73, 0x1ecb, 0x20, 0x1ee4, 0x6b, 0x61, 0x3b, 0x4d, 0x1ecd, 0x6e,</div><div class='del'>-0x64, 0x65, 0x3b, 0x54, 0x69, 0x75, 0x7a, 0x64, 0x65, 0x65, 0x3b, 0x57, 0x65, 0x6e, 0x65, 0x7a, 0x64, 0x65, 0x65, 0x3b,</div><div class='del'>-0x54, 0x1ecd, 0x1ecd, 0x7a, 0x64, 0x65, 0x65, 0x3b, 0x46, 0x72, 0x61, 0x1ecb, 0x64, 0x65, 0x65, 0x3b, 0x53, 0x61, 0x74, 0x1ecd,</div><div class='del'>-0x64, 0x65, 0x65, 0x3b, 0x57, 0x6b, 0x79, 0x3b, 0x57, 0x6b, 0x77, 0x3b, 0x57, 0x6b, 0x6c, 0x3b, 0x57, 0x74, 0x169, 0x3b,</div><div class='del'>-0x57, 0x6b, 0x6e, 0x3b, 0x57, 0x74, 0x6e, 0x3b, 0x57, 0x74, 0x68, 0x3b, 0x57, 0x61, 0x20, 0x6b, 0x79, 0x75, 0x6d, 0x77,</div><div class='del'>-0x61, 0x3b, 0x57, 0x61, 0x20, 0x6b, 0x77, 0x61, 0x6d, 0x62, 0x129, 0x6c, 0x129, 0x6c, 0x79, 0x61, 0x3b, 0x57, 0x61, 0x20,</div><div class='del'>-0x6b, 0x65, 0x6c, 0x129, 0x3b, 0x57, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x57, 0x61, 0x20, 0x6b, 0x61,</div><div class='del'>-0x6e, 0x61, 0x3b, 0x57, 0x61, 0x20, 0x6b, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x57, 0x61, 0x20, 0x74, 0x68, 0x61, 0x6e,</div><div class='del'>-0x74, 0x68, 0x61, 0x74, 0x169, 0x3b, 0x59, 0x3b, 0x57, 0x3b, 0x45, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b,</div><div class='del'>-0x1230, 0x2f, 0x1245, 0x3b, 0x1230, 0x1291, 0x3b, 0x1230, 0x120a, 0x131d, 0x3b, 0x1208, 0x1313, 0x3b, 0x12a3, 0x121d, 0x12f5, 0x3b, 0x12a3, 0x122d,</div><div class='del'>-0x1265, 0x3b, 0x1230, 0x2f, 0x123d, 0x3b, 0x1230, 0x1295, 0x1260, 0x122d, 0x20, 0x1245, 0x12f3, 0x12c5, 0x3b, 0x1230, 0x1291, 0x3b, 0x1230, 0x120a,</div><div class='del'>-0x131d, 0x3b, 0x1208, 0x1313, 0x20, 0x12c8, 0x122a, 0x20, 0x1208, 0x1265, 0x12cb, 0x3b, 0x12a3, 0x121d, 0x12f5, 0x3b, 0x12a3, 0x122d, 0x1265, 0x3b,</div><div class='del'>-0x1230, 0x1295, 0x1260, 0x122d, 0x20, 0x123d, 0x1313, 0x12c5, 0x3b, 0x1230, 0x3b, 0x1230, 0x3b, 0x1230, 0x3b, 0x1208, 0x3b, 0x12a3, 0x3b, 0x12a3,</div><div class='del'>-0x3b, 0x1230, 0x3b, 0x12a5, 0x1281, 0x12f5, 0x3b, 0x1230, 0x1291, 0x12ed, 0x3b, 0x1220, 0x1209, 0x1235, 0x3b, 0x122b, 0x1265, 0x12d5, 0x3b, 0x1210,</div><div class='del'>-0x1219, 0x1235, 0x3b, 0x12d3, 0x122d, 0x1260, 0x3b, 0x1240, 0x12f3, 0x121a, 0x1275, 0x3b, 0x12a5, 0x3b, 0x1230, 0x3b, 0x1220, 0x3b, 0x122b, 0x3b,</div><div class='del'>-0x1210, 0x3b, 0x12d3, 0x3b, 0x1240, 0x3b, 0x4c, 0x61, 0x68, 0x3b, 0x4b, 0x75, 0x62, 0x3b, 0x47, 0x62, 0x61, 0x3b, 0x54, 0x61,</div><div class='del'>-0x6e, 0x3b, 0x59, 0x65, 0x69, 0x3b, 0x4b, 0x6f, 0x79, 0x3b, 0x53, 0x61, 0x74, 0x3b, 0x4c, 0x61, 0x68, 0x61, 0x64, 0x69,</div><div class='del'>-0x3b, 0x4a, 0x65, 0x2d, 0x4b, 0x75, 0x62, 0x61, 0x63, 0x68, 0x61, 0x3b, 0x4a, 0x65, 0x2d, 0x47, 0x62, 0x61, 0x69, 0x3b,</div><div class='del'>-0x54, 0x61, 0x6e, 0x73, 0x61, 0x74, 0x69, 0x3b, 0x4a, 0x65, 0x2d, 0x59, 0x65, 0x69, 0x3b, 0x4a, 0x65, 0x2d, 0x4b, 0x6f,</div><div class='del'>-0x79, 0x65, 0x3b, 0x53, 0x61, 0x74, 0x69, 0x3b, 0x53, 0x61, 0x6d, 0x3b, 0x53, 0x61, 0x6e, 0x3b, 0x4d, 0x61, 0x6b, 0x3b,</div><div class='del'>-0x52, 0x6f, 0x77, 0x3b, 0x48, 0x61, 0x6d, 0x3b, 0x41, 0x72, 0x62, 0x3b, 0x51, 0x69, 0x64, 0x3b, 0x53, 0x61, 0x6d, 0x62,</div><div class='del'>-0x61, 0x74, 0x61, 0x3b, 0x53, 0x61, 0x6e, 0x79, 0x6f, 0x3b, 0x4d, 0x61, 0x61, 0x6b, 0x69, 0x73, 0x61, 0x6e, 0x79, 0x6f,</div><div class='del'>-0x3b, 0x52, 0x6f, 0x6f, 0x77, 0x65, 0x3b, 0x48, 0x61, 0x6d, 0x75, 0x73, 0x65, 0x3b, 0x41, 0x72, 0x62, 0x65, 0x3b, 0x51,</div><div class='del'>-0x69, 0x64, 0x61, 0x61, 0x6d, 0x65, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x52, 0x3b, 0x48, 0x3b, 0x41, 0x3b, 0x51,</div><div class='del'>-0x3b, 0x59, 0x6f, 0x6b, 0x3b, 0x54, 0x75, 0x6e, 0x67, 0x3b, 0x54, 0x2e, 0x20, 0x54, 0x75, 0x6e, 0x67, 0x3b, 0x54, 0x73,</div><div class='del'>-0x61, 0x6e, 0x3b, 0x4e, 0x61, 0x73, 0x3b, 0x4e, 0x61, 0x74, 0x3b, 0x43, 0x68, 0x69, 0x72, 0x3b, 0x57, 0x61, 0x69, 0x20,</div><div class='del'>-0x59, 0x6f, 0x6b, 0x61, 0x20, 0x42, 0x61, 0x77, 0x61, 0x69, 0x3b, 0x57, 0x61, 0x69, 0x20, 0x54, 0x75, 0x6e, 0x67, 0x61,</div><div class='del'>-0x3b, 0x54, 0x6f, 0x6b, 0x69, 0x20, 0x47, 0x69, 0x74, 0x75, 0x6e, 0x67, 0x3b, 0x54, 0x73, 0x61, 0x6d, 0x20, 0x4b, 0x61,</div><div class='del'>-0x73, 0x75, 0x77, 0x61, 0x3b, 0x57, 0x61, 0x69, 0x20, 0x4e, 0x61, 0x20, 0x4e, 0x61, 0x73, 0x3b, 0x57, 0x61, 0x69, 0x20,</div><div class='del'>-0x4e, 0x61, 0x20, 0x54, 0x69, 0x79, 0x6f, 0x6e, 0x3b, 0x57, 0x61, 0x69, 0x20, 0x4e, 0x61, 0x20, 0x43, 0x68, 0x69, 0x72,</div><div class='del'>-0x69, 0x6d, 0x3b, 0x1230, 0x2f, 0x12d3, 0x3b, 0x1230, 0x1296, 0x3b, 0x1273, 0x120b, 0x1238, 0x3b, 0x12a3, 0x1228, 0x122d, 0x3b, 0x12a8, 0x121a,</div><div class='del'>-0x123d, 0x3b, 0x1305, 0x121d, 0x12d3, 0x3b, 0x1230, 0x2f, 0x1295, 0x3b, 0x1230, 0x1295, 0x1260, 0x1275, 0x20, 0x12d3, 0x1263, 0x12ed, 0x3b, 0x1230,</div><div class='del'>-0x1296, 0x3b, 0x1273, 0x120b, 0x1238, 0x1296, 0x3b, 0x12a3, 0x1228, 0x122d, 0x1263, 0x12d3, 0x3b, 0x12a8, 0x121a, 0x123d, 0x3b, 0x1305, 0x121d, 0x12d3,</div><div class='del'>-0x1275, 0x3b, 0x1230, 0x1295, 0x1260, 0x1275, 0x20, 0x1295, 0x12a2, 0x123d, 0x3b, 0x1230, 0x3b, 0x1230, 0x3b, 0x1273, 0x3b, 0x12a3, 0x3b, 0x12a8,</div><div class='del'>-0x3b, 0x1305, 0x3b, 0x1230, 0x3b, 0x4c, 0x61, 0x64, 0x3b, 0x4c, 0x69, 0x6e, 0x3b, 0x54, 0x61, 0x6c, 0x3b, 0x4c, 0x61, 0x72,</div><div class='del'>-0x3b, 0x4c, 0x61, 0x6d, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x41, 0x73, 0x61, 0x3b, 0x4c, 0x61, 0x64, 0x69, 0x3b, 0x4c, 0x69,</div><div class='del'>-0x6e, 0x74, 0x61, 0x6e, 0x69, 0x3b, 0x54, 0x61, 0x6c, 0x61, 0x74, 0x61, 0x3b, 0x4c, 0x61, 0x72, 0x62, 0x61, 0x3b, 0x4c,</div><div class='del'>-0x61, 0x6d, 0x69, 0x74, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x3b, 0x41, 0x73, 0x61, 0x62, 0x61, 0x72, 0x3b, 0x64, 0x6f, 0x6d,</div><div class='del'>-0x3b, 0x6c, 0x75, 0x6e, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6d, 0x69, 0x65, 0x3b, 0x6a, 0x6f, 0x69, 0x3b, 0x76, 0x69, 0x6e,</div><div class='del'>-0x3b, 0x73, 0x61, 0x62, 0x3b, 0x64, 0x6f, 0x6d, 0x65, 0x6e, 0x69, 0x65, 0x3b, 0x6c, 0x75, 0x6e, 0x69, 0x73, 0x3b, 0x6d,</div><div class='del'>-0x61, 0x72, 0x74, 0x61, 0x72, 0x73, 0x3b, 0x6d, 0x69, 0x65, 0x72, 0x63, 0x75, 0x73, 0x3b, 0x6a, 0x6f, 0x69, 0x62, 0x65,</div><div class='del'>-0x3b, 0x76, 0x69, 0x6e, 0x61, 0x72, 0x73, 0x3b, 0x73, 0x61, 0x62, 0x69, 0x64, 0x65, 0x3b, 0x53, 0x77, 0x6f, 0x3b, 0x4d,</div><div class='del'>-0x75, 0x73, 0x3b, 0x56, 0x68, 0x69, 0x3b, 0x52, 0x61, 0x72, 0x3b, 0x1e4a, 0x61, 0x3b, 0x1e70, 0x61, 0x6e, 0x3b, 0x4d, 0x75,</div><div class='del'>-0x67, 0x3b, 0x53, 0x77, 0x6f, 0x6e, 0x64, 0x61, 0x68, 0x61, 0x3b, 0x4d, 0x75, 0x73, 0x75, 0x6d, 0x62, 0x75, 0x6c, 0x75,</div><div class='del'>-0x77, 0x6f, 0x3b, 0x1e3c, 0x61, 0x76, 0x68, 0x75, 0x76, 0x68, 0x69, 0x6c, 0x69, 0x3b, 0x1e3c, 0x61, 0x76, 0x68, 0x75, 0x72,</div><div class='del'>-0x61, 0x72, 0x75, 0x3b, 0x1e3c, 0x61, 0x76, 0x68, 0x75, 0x1e4b, 0x61, 0x3b, 0x1e3c, 0x61, 0x76, 0x68, 0x75, 0x1e71, 0x61, 0x6e,</div><div class='del'>-0x75, 0x3b, 0x4d, 0x75, 0x67, 0x69, 0x76, 0x68, 0x65, 0x6c, 0x61, 0x3b, 0x4b, 0x254, 0x73, 0x20, 0x4b, 0x77, 0x65, 0x3b,</div><div class='del'>-0x44, 0x7a, 0x6f, 0x3b, 0x42, 0x72, 0x61, 0x3b, 0x4b, 0x75, 0x256, 0x3b, 0x59, 0x61, 0x77, 0x3b, 0x46, 0x69, 0x256, 0x3b,</div><div class='del'>-0x4d, 0x65, 0x6d, 0x3b, 0x4b, 0x254, 0x73, 0x69, 0x256, 0x61, 0x3b, 0x44, 0x7a, 0x6f, 0x256, 0x61, 0x3b, 0x42, 0x72, 0x61,</div><div class='del'>-0x256, 0x61, 0x3b, 0x4b, 0x75, 0x256, 0x61, 0x3b, 0x59, 0x61, 0x77, 0x6f, 0x256, 0x61, 0x3b, 0x46, 0x69, 0x256, 0x61, 0x3b,</div><div class='del'>-0x4d, 0x65, 0x6d, 0x6c, 0x65, 0x256, 0x61, 0x3b, 0x4b, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x4b, 0x3b, 0x59, 0x3b, 0x46, 0x3b,</div><div class='del'>-0x4d, 0x3b, 0x12c8, 0x130b, 0x3b, 0x1233, 0x12ed, 0x1296, 0x3b, 0x121b, 0x1246, 0x1233, 0x129b, 0x3b, 0x12a0, 0x1229, 0x12cb, 0x3b, 0x1203, 0x1219,</div><div class='del'>-0x1233, 0x3b, 0x12a0, 0x122d, 0x1263, 0x3b, 0x1244, 0x122b, 0x3b, 0x12c8, 0x3b, 0x1233, 0x3b, 0x121b, 0x3b, 0x12a0, 0x3b, 0x1203, 0x3b, 0x12a0,</div><div class='del'>-0x3b, 0x1244, 0x3b, 0x4c, 0x50, 0x3b, 0x50, 0x31, 0x3b, 0x50, 0x32, 0x3b, 0x50, 0x33, 0x3b, 0x50, 0x34, 0x3b, 0x50, 0x35,</div><div class='del'>-0x3b, 0x50, 0x36, 0x3b, 0x4c, 0x101, 0x70, 0x75, 0x6c, 0x65, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x6b, 0x61, 0x68, 0x69, 0x3b,</div><div class='del'>-0x50, 0x6f, 0x2bb, 0x61, 0x6c, 0x75, 0x61, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x6b, 0x6f, 0x6c, 0x75, 0x3b, 0x50, 0x6f, 0x2bb,</div><div class='del'>-0x61, 0x68, 0x101, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x6c, 0x69, 0x6d, 0x61, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x6f, 0x6e, 0x6f,</div><div class='del'>-0x3b, 0x4c, 0x61, 0x64, 0x3b, 0x54, 0x61, 0x6e, 0x3b, 0x54, 0x61, 0x6c, 0x3b, 0x4c, 0x61, 0x72, 0x3b, 0x4c, 0x61, 0x6d,</div><div class='del'>-0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x41, 0x73, 0x61, 0x3b, 0x4c, 0x61, 0x64, 0x69, 0x3b, 0x54, 0x61, 0x6e, 0x69, 0x69, 0x3b,</div><div class='del'>-0x54, 0x61, 0x6c, 0x61, 0x74, 0x61, 0x3b, 0x4c, 0x61, 0x72, 0x62, 0x61, 0x3b, 0x4c, 0x61, 0x6d, 0x69, 0x74, 0x3b, 0x4a,</div><div class='del'>-0x75, 0x6d, 0x61, 0x3b, 0x41, 0x73, 0x61, 0x62, 0x61, 0x74, 0x3b, 0x4d, 0x75, 0x6c, 0x3b, 0x4c, 0x65, 0x6d, 0x3b, 0x57,</div><div class='del'>-0x69, 0x72, 0x3b, 0x54, 0x61, 0x74, 0x3b, 0x4e, 0x61, 0x69, 0x3b, 0x53, 0x61, 0x6e, 0x3b, 0x57, 0x65, 0x72, 0x3b, 0x4c,</div><div class='del'>-0x61, 0x6d, 0x75, 0x6c, 0x75, 0x6e, 0x67, 0x75, 0x3b, 0x4c, 0x6f, 0x6c, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4c, 0x61, 0x63,</div><div class='del'>-0x68, 0x69, 0x77, 0x69, 0x72, 0x69, 0x3b, 0x4c, 0x61, 0x63, 0x68, 0x69, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4c, 0x61, 0x63,</div><div class='del'>-0x68, 0x69, 0x6e, 0x61, 0x79, 0x69, 0x3b, 0x4c, 0x61, 0x63, 0x68, 0x69, 0x73, 0x61, 0x6e, 0x75, 0x3b, 0x4c, 0x6f, 0x77,</div><div class='del'>-0x65, 0x72, 0x75, 0x6b, 0x61, 0x3b, 0x4c, 0x69, 0x6e, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0x69,</div><div class='del'>-0x79, 0x3b, 0x48, 0x75, 0x77, 0x3b, 0x42, 0x69, 0x79, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4c, 0x69, 0x6e, 0x67, 0x67, 0x6f,</div><div class='del'>-0x3b, 0x4c, 0x75, 0x6e, 0x65, 0x73, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x3b, 0x4d, 0x69, 0x79, 0x65, 0x72, 0x6b,</div><div class='del'>-0x75, 0x6c, 0x65, 0x73, 0x3b, 0x48, 0x75, 0x77, 0x65, 0x62, 0x65, 0x73, 0x3b, 0x42, 0x69, 0x79, 0x65, 0x72, 0x6e, 0x65,</div><div class='del'>-0x73, 0x3b, 0x53, 0x61, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x42,</div><div class='del'>-0x3b, 0x53, 0x3b, 0x4c, 0x69, 0x6e, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0x79, 0x65, 0x3b, 0x48,</div><div class='del'>-0x75, 0x77, 0x3b, 0x42, 0x79, 0x65, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x53, 0x75, 0x2e, 0x3b, 0x4d, 0xe4, 0x2e, 0x3b, 0x5a,</div><div class='del'>-0x69, 0x2e, 0x3b, 0x4d, 0x69, 0x2e, 0x3b, 0x44, 0x75, 0x2e, 0x3b, 0x46, 0x72, 0x2e, 0x3b, 0x53, 0x61, 0x2e, 0x3b, 0x53,</div><div class='del'>-0x75, 0x6e, 0x6e, 0x74, 0x69, 0x67, 0x3b, 0x4d, 0xe4, 0xe4, 0x6e, 0x74, 0x69, 0x67, 0x3b, 0x5a, 0x69, 0x69, 0x73, 0x63,</div><div class='del'>-0x68, 0x74, 0x69, 0x67, 0x3b, 0x4d, 0x69, 0x74, 0x74, 0x77, 0x75, 0x63, 0x68, 0x3b, 0x44, 0x75, 0x6e, 0x73, 0x63, 0x68,</div><div class='del'>-0x74, 0x69, 0x67, 0x3b, 0x46, 0x72, 0x69, 0x69, 0x74, 0x69, 0x67, 0x3b, 0x53, 0x61, 0x6d, 0x73, 0x63, 0x68, 0x74, 0x69,</div><div class='del'>-0x67, 0x3b, 0xa18f, 0xa44d, 0x3b, 0xa18f, 0xa2cd, 0x3b, 0xa18f, 0xa44d, 0x3b, 0xa18f, 0xa315, 0x3b, 0xa18f, 0xa1d6, 0x3b, 0xa18f, 0xa26c, 0x3b,</div><div class='del'>-0xa18f, 0xa0d8, 0x3b, 0xa46d, 0xa18f, 0xa44d, 0x3b, 0xa18f, 0xa282, 0xa2cd, 0x3b, 0xa18f, 0xa282, 0xa44d, 0x3b, 0xa18f, 0xa282, 0xa315, 0x3b, 0xa18f,</div><div class='del'>-0xa282, 0xa1d6, 0x3b, 0xa18f, 0xa282, 0xa26c, 0x3b, 0xa18f, 0xa282, 0xa0d8, 0x3b, 0xa18f, 0x3b, 0xa2cd, 0x3b, 0xa44d, 0x3b, 0xa315, 0x3b, 0xa1d6,</div><div class='del'>-0x3b, 0xa26c, 0x3b, 0xa0d8, 0x3b, 0x53, 0x6f, 0x6e, 0x3b, 0x4d, 0x76, 0x75, 0x3b, 0x42, 0x69, 0x6c, 0x3b, 0x54, 0x68, 0x61,</div><div class='del'>-0x3b, 0x4e, 0x65, 0x3b, 0x48, 0x6c, 0x61, 0x3b, 0x47, 0x71, 0x69, 0x3b, 0x75, 0x53, 0x6f, 0x6e, 0x74, 0x6f, 0x3b, 0x75,</div><div class='del'>-0x4d, 0x76, 0x75, 0x6c, 0x6f, 0x3b, 0x75, 0x4c, 0x65, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4c, 0x65, 0x73, 0x69,</div><div class='del'>-0x74, 0x68, 0x61, 0x74, 0x68, 0x75, 0x3b, 0x75, 0x4c, 0x65, 0x73, 0x69, 0x6e, 0x65, 0x3b, 0x6e, 0x67, 0x6f, 0x4c, 0x65,</div><div class='del'>-0x73, 0x69, 0x68, 0x6c, 0x61, 0x6e, 0x75, 0x3b, 0x75, 0x6d, 0x47, 0x71, 0x69, 0x62, 0x65, 0x6c, 0x6f, 0x3b, 0x53, 0x6f,</div><div class='del'>-0x6e, 0x3b, 0x4d, 0x6f, 0x73, 0x3b, 0x42, 0x65, 0x64, 0x3b, 0x52, 0x61, 0x72, 0x3b, 0x4e, 0x65, 0x3b, 0x48, 0x6c, 0x61,</div><div class='del'>-0x3b, 0x4d, 0x6f, 0x6b, 0x3b, 0x53, 0x6f, 0x6e, 0x74, 0x61, 0x67, 0x61, 0x3b, 0x4d, 0x6f, 0x73, 0x75, 0x70, 0x61, 0x6c,</div><div class='del'>-0x6f, 0x67, 0x6f, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x62, 0x65, 0x64, 0x69, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x72, 0x61, 0x72,</div><div class='del'>-0x6f, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x6e, 0x65, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x68, 0x6c, 0x61, 0x6e, 0x6f, 0x3b, 0x4d,</div><div class='del'>-0x6f, 0x6b, 0x69, 0x62, 0x65, 0x6c, 0x6f, 0x3b, 0x73, 0x6f, 0x74, 0x6e, 0x3b, 0x76, 0x75, 0x6f, 0x73, 0x3b, 0x6d, 0x61,</div><div class='del'>-0x14b, 0x3b, 0x67, 0x61, 0x73, 0x6b, 0x3b, 0x64, 0x75, 0x6f, 0x72, 0x3b, 0x62, 0x65, 0x61, 0x72, 0x3b, 0x6c, 0xe1, 0x76,</div><div class='del'>-0x3b, 0x61, 0x65, 0x6a, 0x6c, 0x65, 0x67, 0x65, 0x3b, 0x6d, 0xe5, 0x61, 0x6e, 0x74, 0x61, 0x3b, 0x64, 0xe4, 0x6a, 0x73,</div><div class='del'>-0x74, 0x61, 0x3b, 0x67, 0x61, 0x73, 0x6b, 0x65, 0x76, 0x61, 0x68, 0x6b, 0x6f, 0x65, 0x3b, 0x64, 0xe5, 0x61, 0x72, 0x73,</div><div class='del'>-0x74, 0x61, 0x3b, 0x62, 0x65, 0x61, 0x72, 0x6a, 0x61, 0x64, 0x61, 0x68, 0x6b, 0x65, 0x3b, 0x6c, 0x61, 0x61, 0x76, 0x61,</div><div class='del'>-0x64, 0x61, 0x68, 0x6b, 0x65, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x44, 0x3b, 0x47, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x4c, 0x3b,</div><div class='del'>-0x73, 0x6f, 0x74, 0x6e, 0x61, 0x62, 0x65, 0x61, 0x69, 0x76, 0x69, 0x3b, 0x76, 0x75, 0x6f, 0x73, 0x73, 0xe1, 0x72, 0x67,</div><div class='del'>-0x61, 0x3b, 0x6d, 0x61, 0x14b, 0x14b, 0x65, 0x62, 0xe1, 0x72, 0x67, 0x61, 0x3b, 0x67, 0x61, 0x73, 0x6b, 0x61, 0x76, 0x61,</div><div class='del'>-0x68, 0x6b, 0x6b, 0x75, 0x3b, 0x64, 0x75, 0x6f, 0x72, 0x61, 0x73, 0x64, 0x61, 0x74, 0x3b, 0x62, 0x65, 0x61, 0x72, 0x6a,</div><div class='del'>-0x61, 0x64, 0x61, 0x74, 0x3b, 0x6c, 0xe1, 0x76, 0x76, 0x61, 0x72, 0x64, 0x61, 0x74, 0x3b, 0x53, 0x3b, 0x56, 0x3b, 0x4d,</div><div class='del'>-0x3b, 0x47, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x4c, 0x3b, 0x45, 0x6d, 0x70, 0x3b, 0x4b, 0x69, 0x6e, 0x3b, 0x44, 0x68, 0x61,</div><div class='del'>-0x3b, 0x54, 0x72, 0x75, 0x3b, 0x53, 0x70, 0x61, 0x3b, 0x52, 0x69, 0x6d, 0x3b, 0x4d, 0x61, 0x74, 0x3b, 0x4a, 0x69, 0x79,</div><div class='del'>-0x61, 0x78, 0x20, 0x73, 0x6e, 0x67, 0x61, 0x79, 0x61, 0x6e, 0x3b, 0x74, 0x67, 0x4b, 0x69, 0x6e, 0x67, 0x61, 0x6c, 0x20,</div><div class='del'>-0x6a, 0x69, 0x79, 0x61, 0x78, 0x20, 0x69, 0x79, 0x61, 0x78, 0x20, 0x73, 0x6e, 0x67, 0x61, 0x79, 0x61, 0x6e, 0x3b, 0x74,</div><div class='del'>-0x67, 0x44, 0x68, 0x61, 0x20, 0x6a, 0x69, 0x79, 0x61, 0x78, 0x20, 0x69, 0x79, 0x61, 0x78, 0x20, 0x73, 0x6e, 0x67, 0x61,</div><div class='del'>-0x79, 0x61, 0x6e, 0x3b, 0x74, 0x67, 0x54, 0x72, 0x75, 0x20, 0x6a, 0x69, 0x79, 0x61, 0x78, 0x20, 0x69, 0x79, 0x61, 0x78,</div><div class='del'>-0x20, 0x73, 0x6e, 0x67, 0x61, 0x79, 0x61, 0x6e, 0x3b, 0x74, 0x67, 0x53, 0x70, 0x61, 0x63, 0x20, 0x6a, 0x69, 0x79, 0x61,</div><div class='del'>-0x78, 0x20, 0x69, 0x79, 0x61, 0x78, 0x20, 0x73, 0x6e, 0x67, 0x61, 0x79, 0x61, 0x6e, 0x3b, 0x74, 0x67, 0x52, 0x69, 0x6d,</div><div class='del'>-0x61, 0x20, 0x6a, 0x69, 0x79, 0x61, 0x78, 0x20, 0x69, 0x79, 0x61, 0x78, 0x20, 0x73, 0x6e, 0x67, 0x61, 0x79, 0x61, 0x6e,</div><div class='del'>-0x3b, 0x74, 0x67, 0x4d, 0x61, 0x74, 0x61, 0x72, 0x75, 0x20, 0x6a, 0x69, 0x79, 0x61, 0x78, 0x20, 0x69, 0x79, 0x61, 0x78,</div><div class='del'>-0x20, 0x73, 0x6e, 0x67, 0x61, 0x79, 0x61, 0x6e, 0x3b, 0x45, 0x3b, 0x4b, 0x3b, 0x44, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x52,</div><div class='del'>-0x3b, 0x4d, 0x3b, 0x43, 0x70, 0x72, 0x3b, 0x43, 0x74, 0x74, 0x3b, 0x43, 0x6d, 0x6e, 0x3b, 0x43, 0x6d, 0x74, 0x3b, 0x41,</div><div class='del'>-0x72, 0x73, 0x3b, 0x49, 0x63, 0x6d, 0x3b, 0x45, 0x73, 0x74, 0x3b, 0x43, 0x68, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x72, 0x69,</div><div class='del'>-0x3b, 0x43, 0x68, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x6f, 0x3b, 0x43, 0x68, 0x75, 0x6d, 0x61, 0x69, 0x6e, 0x65, 0x3b,</div><div class='del'>-0x43, 0x68, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x72, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x63,</div><div class='del'>-0x68, 0x75, 0x6d, 0x61, 0x3b, 0x45, 0x73, 0x61, 0x62, 0x61, 0x74, 0x6f, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x43,</div><div class='del'>-0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x45, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x4a, 0x69, 0x6d, 0x3b, 0x4b, 0x61, 0x77, 0x3b, 0x4b,</div><div class='del'>-0x61, 0x64, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x4b, 0x61, 0x73, 0x3b, 0x4e, 0x67, 0x75, 0x3b, 0x49, 0x74, 0x75, 0x6b, 0x75,</div><div class='del'>-0x20, 0x6a, 0x61, 0x20, 0x6a, 0x75, 0x6d, 0x77, 0x61, 0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x20, 0x6a,</div><div class='del'>-0x69, 0x6d, 0x77, 0x65, 0x72, 0x69, 0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x20, 0x20, 0x6b, 0x61, 0x77,</div><div class='del'>-0x69, 0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x20, 0x6b, 0x61, 0x64, 0x61, 0x64, 0x75, 0x3b, 0x4b, 0x75,</div><div class='del'>-0x72, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x61,</div><div class='del'>-0x20, 0x6b, 0x61, 0x73, 0x61, 0x6e, 0x75, 0x3b, 0x4b, 0x69, 0x66, 0x75, 0x6c, 0x61, 0x20, 0x6e, 0x67, 0x75, 0x77, 0x6f,</div><div class='del'>-0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x64, 0x65, 0x77, 0x3b, 0x61,</div><div class='del'>-0x61, 0x253, 0x3b, 0x6d, 0x61, 0x77, 0x3b, 0x6e, 0x6a, 0x65, 0x3b, 0x6e, 0x61, 0x61, 0x3b, 0x6d, 0x77, 0x64, 0x3b, 0x68,</div><div class='del'>-0x62, 0x69, 0x3b, 0x64, 0x65, 0x77, 0x6f, 0x3b, 0x61, 0x61, 0x253, 0x6e, 0x64, 0x65, 0x3b, 0x6d, 0x61, 0x77, 0x62, 0x61,</div><div class='del'>-0x61, 0x72, 0x65, 0x3b, 0x6e, 0x6a, 0x65, 0x73, 0x6c, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x6e, 0x61, 0x61, 0x73, 0x61, 0x61,</div><div class='del'>-0x6e, 0x64, 0x65, 0x3b, 0x6d, 0x61, 0x77, 0x6e, 0x64, 0x65, 0x3b, 0x68, 0x6f, 0x6f, 0x72, 0x65, 0x2d, 0x62, 0x69, 0x69,</div><div class='del'>-0x72, 0x3b, 0x64, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x6e, 0x3b, 0x6e, 0x3b, 0x6d, 0x3b, 0x68, 0x3b, 0x4b, 0x4d, 0x41, 0x3b,</div><div class='del'>-0x4e, 0x54, 0x54, 0x3b, 0x4e, 0x4d, 0x4e, 0x3b, 0x4e, 0x4d, 0x54, 0x3b, 0x41, 0x52, 0x54, 0x3b, 0x4e, 0x4d, 0x41, 0x3b,</div><div class='del'>-0x4e, 0x4d, 0x4d, 0x3b, 0x4b, 0x69, 0x75, 0x6d, 0x69, 0x61, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x169,</div><div class='del'>-0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x69, 0x6e, 0x65, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x61, 0x3b,</div><div class='del'>-0x41, 0x72, 0x61, 0x6d, 0x69, 0x74, 0x68, 0x69, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4e, 0x6a, 0x75, 0x6d,</div><div class='del'>-0x61, 0x6d, 0x6f, 0x74, 0x68, 0x69, 0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x41, 0x3b, 0x4e, 0x3b, 0x4e,</div><div class='del'>-0x3b, 0x41, 0x72, 0x65, 0x3b, 0x4b, 0x75, 0x6e, 0x3b, 0x4f, 0x6e, 0x67, 0x3b, 0x49, 0x6e, 0x65, 0x3b, 0x49, 0x6c, 0x65,</div><div class='del'>-0x3b, 0x53, 0x61, 0x70, 0x3b, 0x4b, 0x77, 0x65, 0x3b, 0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65, 0x20, 0x61,</div><div class='del'>-0x72, 0x65, 0x3b, 0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65, 0x20, 0x6b, 0x75, 0x6e, 0x69, 0x3b, 0x4d, 0x64,</div><div class='del'>-0x65, 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65, 0x20, 0x6f, 0x6e, 0x67, 0x27, 0x77, 0x61, 0x6e, 0x3b, 0x4d, 0x64, 0x65, 0x72,</div><div class='del'>-0x6f, 0x74, 0x20, 0x65, 0x65, 0x20, 0x69, 0x6e, 0x65, 0x74, 0x3b, 0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65,</div><div class='del'>-0x20, 0x69, 0x6c, 0x65, 0x3b, 0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65, 0x20, 0x73, 0x61, 0x70, 0x61, 0x3b,</div><div class='del'>-0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65, 0x20, 0x6b, 0x77, 0x65, 0x3b, 0x41, 0x3b, 0x4b, 0x3b, 0x4f, 0x3b,</div><div class='del'>-0x49, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x4b, 0x3b, 0x44, 0x69, 0x6d, 0x3b, 0x50, 0x6f, 0x73, 0x3b, 0x50, 0x69, 0x72, 0x3b,</div><div class='del'>-0x54, 0x61, 0x74, 0x3b, 0x4e, 0x61, 0x69, 0x3b, 0x53, 0x68, 0x61, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x44, 0x69, 0x6d, 0x69,</div><div class='del'>-0x6e, 0x67, 0x75, 0x3b, 0x43, 0x68, 0x69, 0x70, 0x6f, 0x73, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x70, 0x69, 0x72, 0x69, 0x3b,</div><div class='del'>-0x43, 0x68, 0x69, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x43, 0x68, 0x69, 0x6e, 0x61, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x73, 0x68,</div><div class='del'>-0x61, 0x6e, 0x75, 0x3b, 0x53, 0x61, 0x62, 0x75, 0x64, 0x75, 0x3b, 0x44, 0x3b, 0x50, 0x3b, 0x43, 0x3b, 0x54, 0x3b, 0x4e,</div><div class='del'>-0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x53, 0x6f, 0x6e, 0x3b, 0x4d, 0x76, 0x75, 0x3b, 0x53, 0x69, 0x62, 0x3b, 0x53, 0x69, 0x74,</div><div class='del'>-0x3b, 0x53, 0x69, 0x6e, 0x3b, 0x53, 0x69, 0x68, 0x3b, 0x4d, 0x67, 0x71, 0x3b, 0x53, 0x6f, 0x6e, 0x74, 0x6f, 0x3b, 0x4d,</div><div class='del'>-0x76, 0x75, 0x6c, 0x6f, 0x3b, 0x53, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x53, 0x69, 0x74, 0x68, 0x61, 0x74, 0x68, 0x75,</div><div class='del'>-0x3b, 0x53, 0x69, 0x6e, 0x65, 0x3b, 0x53, 0x69, 0x68, 0x6c, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x67, 0x71, 0x69, 0x62, 0x65,</div><div class='del'>-0x6c, 0x6f, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x49, 0x6a, 0x70,</div><div class='del'>-0x3b, 0x49, 0x6a, 0x74, 0x3b, 0x49, 0x6a, 0x6e, 0x3b, 0x49, 0x6a, 0x74, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x75,</div><div class='del'>-0x3b, 0x49, 0x6a, 0x6d, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x6c, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61,</div><div class='del'>-0x74, 0x61, 0x74, 0x75, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x74,</div><div class='add'>+0x442, 0x432, 0x440, 0x442, 0x43e, 0x43a, 0x3b, 0x43f, 0x435, 0x442, 0x43e, 0x43a, 0x3b, 0x441, 0x430, 0x431, 0x43e, 0x442, 0x430, 0x3b,</div><div class='add'>+0x41, 0x6c, 0x61, 0x68, 0x3b, 0x41, 0x6c, 0x61, 0x74, 0x73, 0x3b, 0x54, 0x61, 0x6c, 0x3b, 0x41, 0x6c, 0x61, 0x72, 0x3b,</div><div class='add'>+0x41, 0x6c, 0x61, 0x6b, 0x3b, 0x5a, 0x6f, 0x6d, 0x3b, 0x41, 0x73, 0x61, 0x62, 0x3b, 0x41, 0x6c, 0x61, 0x68, 0x61, 0x64,</div><div class='add'>+0x79, 0x3b, 0x41, 0x6c, 0x61, 0x74, 0x73, 0x69, 0x6e, 0x61, 0x69, 0x6e, 0x79, 0x3b, 0x54, 0x61, 0x6c, 0x61, 0x74, 0x61,</div><div class='add'>+0x3b, 0x41, 0x6c, 0x61, 0x72, 0x6f, 0x62, 0x69, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x6b, 0x61, 0x6d, 0x69, 0x73, 0x79, 0x3b,</div><div class='add'>+0x5a, 0x6f, 0x6d, 0x61, 0x3b, 0x41, 0x73, 0x61, 0x62, 0x6f, 0x74, 0x73, 0x79, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x54, 0x3b,</div><div class='add'>+0x41, 0x3b, 0x41, 0x3b, 0x5a, 0x3b, 0x41, 0x3b, 0x41, 0x68, 0x64, 0x3b, 0x49, 0x73, 0x6e, 0x3b, 0x53, 0x65, 0x6c, 0x3b,</div><div class='add'>+0x52, 0x61, 0x62, 0x3b, 0x4b, 0x68, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x41, 0x68, 0x61, 0x64,</div><div class='add'>+0x3b, 0x49, 0x73, 0x6e, 0x69, 0x6e, 0x3b, 0x53, 0x65, 0x6c, 0x61, 0x73, 0x61, 0x3b, 0x52, 0x61, 0x62, 0x75, 0x3b, 0x4b,</div><div class='add'>+0x68, 0x61, 0x6d, 0x69, 0x73, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x74, 0x3b, 0x53, 0x61, 0x62, 0x74, 0x75, 0x3b, 0xd1e,</div><div class='add'>+0xd3e, 0xd2f, 0xd30, 0xd4d, 0x200d, 0x3b, 0xd24, 0xd3f, 0xd19, 0xd4d, 0xd15, 0xd33, 0xd4d, 0x200d, 0x3b, 0xd1a, 0xd4a, 0xd35, 0xd4d, 0xd35,</div><div class='add'>+0x3b, 0xd2c, 0xd41, 0xd27, 0xd28, 0xd4d, 0x200d, 0x3b, 0xd35, 0xd4d, 0xd2f, 0xd3e, 0xd34, 0xd02, 0x3b, 0xd35, 0xd46, 0xd33, 0xd4d, 0xd33,</div><div class='add'>+0xd3f, 0x3b, 0xd36, 0xd28, 0xd3f, 0x3b, 0xd1e, 0xd3e, 0xd2f, 0xd31, 0xd3e, 0xd34, 0xd4d, 0xd1a, 0x3b, 0xd24, 0xd3f, 0xd19, 0xd4d, 0xd15,</div><div class='add'>+0xd33, 0xd3e, 0xd34, 0xd4d, 0xd1a, 0x3b, 0xd1a, 0xd4a, 0xd35, 0xd4d, 0xd35, 0xd3e, 0xd34, 0xd4d, 0xd1a, 0x3b, 0xd2c, 0xd41, 0xd27, 0xd28,</div><div class='add'>+0xd3e, 0xd34, 0xd4d, 0xd1a, 0x3b, 0xd35, 0xd4d, 0xd2f, 0xd3e, 0xd34, 0xd3e, 0xd34, 0xd4d, 0xd1a, 0x3b, 0xd35, 0xd46, 0xd33, 0xd4d, 0xd33,</div><div class='add'>+0xd3f, 0xd2f, 0xd3e, 0xd34, 0xd4d, 0xd1a, 0x3b, 0xd36, 0xd28, 0xd3f, 0xd2f, 0xd3e, 0xd34, 0xd4d, 0xd1a, 0x3b, 0xd1e, 0xd3e, 0x3b, 0xd24,</div><div class='add'>+0xd3f, 0x3b, 0xd1a, 0xd4a, 0x3b, 0xd2c, 0xd41, 0x3b, 0xd35, 0xd4d, 0xd2f, 0xd3e, 0x3b, 0xd35, 0xd46, 0x3b, 0xd36, 0x3b, 0x126, 0x61,</div><div class='add'>+0x64, 0x3b, 0x54, 0x6e, 0x65, 0x3b, 0x54, 0x6c, 0x69, 0x3b, 0x45, 0x72, 0x62, 0x3b, 0x126, 0x61, 0x6d, 0x3b, 0x120, 0x69,</div><div class='add'>+0x6d, 0x3b, 0x53, 0x69, 0x62, 0x3b, 0x49, 0x6c, 0x2d, 0x126, 0x61, 0x64, 0x64, 0x3b, 0x49, 0x74, 0x2d, 0x54, 0x6e, 0x65,</div><div class='add'>+0x6a, 0x6e, 0x3b, 0x49, 0x74, 0x2d, 0x54, 0x6c, 0x69, 0x65, 0x74, 0x61, 0x3b, 0x4c, 0x2d, 0x45, 0x72, 0x62, 0x67, 0x127,</div><div class='add'>+0x61, 0x3b, 0x49, 0x6c, 0x2d, 0x126, 0x61, 0x6d, 0x69, 0x73, 0x3b, 0x49, 0x6c, 0x2d, 0x120, 0x69, 0x6d, 0x67, 0x127, 0x61,</div><div class='add'>+0x3b, 0x49, 0x73, 0x2d, 0x53, 0x69, 0x62, 0x74, 0x3b, 0x126, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x45, 0x3b, 0x126, 0x3b, 0x120,</div><div class='add'>+0x3b, 0x53, 0x3b, 0x52, 0x101, 0x74, 0x61, 0x70, 0x75, 0x3b, 0x4d, 0x61, 0x6e, 0x65, 0x3b, 0x54, 0x16b, 0x72, 0x65, 0x69,</div><div class='add'>+0x3b, 0x57, 0x65, 0x6e, 0x65, 0x72, 0x65, 0x69, 0x3b, 0x54, 0x101, 0x69, 0x74, 0x65, 0x3b, 0x50, 0x61, 0x72, 0x61, 0x69,</div><div class='add'>+0x72, 0x65, 0x3b, 0x48, 0x101, 0x74, 0x61, 0x72, 0x65, 0x69, 0x3b, 0x930, 0x935, 0x93f, 0x3b, 0x938, 0x94b, 0x92e, 0x3b, 0x92e,</div><div class='add'>+0x902, 0x917, 0x933, 0x3b, 0x92c, 0x941, 0x927, 0x3b, 0x917, 0x941, 0x930, 0x941, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x3b, 0x936,</div><div class='add'>+0x928, 0x93f, 0x3b, 0x930, 0x935, 0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x938, 0x94b, 0x92e, 0x935, 0x93e, 0x930, 0x3b, 0x92e, 0x902, 0x917,</div><div class='add'>+0x933, 0x935, 0x93e, 0x930, 0x3b, 0x92c, 0x941, 0x927, 0x935, 0x93e, 0x930, 0x3b, 0x917, 0x941, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x3b,</div><div class='add'>+0x936, 0x941, 0x915, 0x94d, 0x930, 0x935, 0x93e, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x41d, 0x44f, 0x3b, 0x414,</div><div class='add'>+0x430, 0x3b, 0x41c, 0x44f, 0x3b, 0x41b, 0x445, 0x3b, 0x41f, 0x4af, 0x3b, 0x411, 0x430, 0x3b, 0x411, 0x44f, 0x3b, 0x43d, 0x44f, 0x43c,</div><div class='add'>+0x3b, 0x434, 0x430, 0x432, 0x430, 0x430, 0x3b, 0x43c, 0x44f, 0x433, 0x43c, 0x430, 0x440, 0x3b, 0x43b, 0x445, 0x430, 0x433, 0x432, 0x430,</div><div class='add'>+0x3b, 0x43f, 0x4af, 0x440, 0x44d, 0x432, 0x3b, 0x431, 0x430, 0x430, 0x441, 0x430, 0x43d, 0x3b, 0x431, 0x44f, 0x43c, 0x431, 0x430, 0x3b,</div><div class='add'>+0x906, 0x907, 0x924, 0x3b, 0x938, 0x94b, 0x92e, 0x3b, 0x92e, 0x919, 0x94d, 0x917, 0x932, 0x3b, 0x92c, 0x941, 0x927, 0x3b, 0x92c, 0x93f,</div><div class='add'>+0x939, 0x940, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x3b, 0x906, 0x907, 0x924, 0x92c, 0x93e, 0x930, 0x3b,</div><div class='add'>+0x938, 0x94b, 0x92e, 0x92c, 0x93e, 0x930, 0x3b, 0x92e, 0x919, 0x94d, 0x917, 0x932, 0x92c, 0x93e, 0x930, 0x3b, 0x92c, 0x941, 0x927, 0x92c,</div><div class='add'>+0x93e, 0x930, 0x3b, 0x92c, 0x93f, 0x939, 0x940, 0x92c, 0x93e, 0x930, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x92c, 0x93e, 0x930, 0x3b,</div><div class='add'>+0x936, 0x928, 0x93f, 0x92c, 0x93e, 0x930, 0x3b, 0x967, 0x3b, 0x968, 0x3b, 0x969, 0x3b, 0x96a, 0x3b, 0x96b, 0x3b, 0x96c, 0x3b, 0x96d,</div><div class='add'>+0x3b, 0x906, 0x907, 0x924, 0x935, 0x93e, 0x930, 0x3b, 0x938, 0x94b, 0x92e, 0x935, 0x93e, 0x930, 0x3b, 0x92e, 0x919, 0x94d, 0x917, 0x932,</div><div class='add'>+0x935, 0x93e, 0x930, 0x3b, 0x92c, 0x941, 0x927, 0x935, 0x93e, 0x930, 0x3b, 0x92c, 0x93f, 0x939, 0x940, 0x935, 0x93e, 0x930, 0x3b, 0x936,</div><div class='add'>+0x941, 0x915, 0x94d, 0x930, 0x935, 0x93e, 0x930, 0x3b, 0x936, 0x928, 0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x73, 0xf8, 0x2e, 0x3b, 0x6d,</div><div class='add'>+0x61, 0x2e, 0x3b, 0x74, 0x69, 0x2e, 0x3b, 0x6f, 0x6e, 0x2e, 0x3b, 0x74, 0x6f, 0x2e, 0x3b, 0x66, 0x72, 0x2e, 0x3b, 0x6c,</div><div class='add'>+0xf8, 0x2e, 0x3b, 0x73, 0xf8, 0x6e, 0x2e, 0x3b, 0x6d, 0x61, 0x6e, 0x2e, 0x3b, 0x74, 0x69, 0x72, 0x2e, 0x3b, 0x6f, 0x6e,</div><div class='add'>+0x73, 0x2e, 0x3b, 0x74, 0x6f, 0x72, 0x2e, 0x3b, 0x66, 0x72, 0x65, 0x2e, 0x3b, 0x6c, 0xf8, 0x72, 0x2e, 0x3b, 0x44, 0x69,</div><div class='add'>+0x6d, 0x65, 0x6e, 0x67, 0x65, 0x3b, 0x64, 0x69, 0x6c, 0x75, 0x6e, 0x73, 0x3b, 0x64, 0x69, 0x6d, 0x61, 0x72, 0xe7, 0x3b,</div><div class='add'>+0x64, 0x69, 0x6d, 0xe8, 0x63, 0x72, 0x65, 0x73, 0x3b, 0x64, 0x69, 0x6a, 0xf2, 0x75, 0x73, 0x3b, 0x64, 0x69, 0x76, 0xe8,</div><div class='add'>+0x6e, 0x64, 0x72, 0x65, 0x73, 0x3b, 0x64, 0x69, 0x73, 0x73, 0x61, 0x62, 0x74, 0x65, 0x3b, 0xb30, 0xb2c, 0xb3f, 0x3b, 0xb38,</div><div class='add'>+0xb4b, 0xb2e, 0x3b, 0xb2e, 0xb19, 0xb4d, 0xb17, 0xb33, 0x3b, 0xb2c, 0xb41, 0xb27, 0x3b, 0xb17, 0xb41, 0xb30, 0xb41, 0x3b, 0xb36, 0xb41,</div><div class='add'>+0xb15, 0xb4d, 0xb30, 0x3b, 0xb36, 0xb28, 0xb3f, 0x3b, 0xb30, 0xb2c, 0xb3f, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb38, 0xb4b, 0xb2e, 0xb2c, 0xb3e,</div><div class='add'>+0xb30, 0x3b, 0xb2e, 0xb19, 0xb4d, 0xb17, 0xb33, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb2c, 0xb41, 0xb27, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb17, 0xb41,</div><div class='add'>+0xb30, 0xb41, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb36, 0xb41, 0xb15, 0xb4d, 0xb30, 0xb2c, 0xb3e, 0xb30, 0x3b, 0xb36, 0xb28, 0xb3f, 0xb2c, 0xb3e,</div><div class='add'>+0xb30, 0x3b, 0xb30, 0x3b, 0xb38, 0xb4b, 0x3b, 0xb2e, 0x3b, 0xb2c, 0xb41, 0x3b, 0xb17, 0xb41, 0x3b, 0xb36, 0xb41, 0x3b, 0xb36, 0x3b,</div><div class='add'>+0x6cc, 0x6a9, 0x634, 0x646, 0x628, 0x647, 0x3b, 0x62f, 0x648, 0x634, 0x646, 0x628, 0x647, 0x3b, 0x633, 0x647, 0x200c, 0x634, 0x646, 0x628,</div><div class='add'>+0x647, 0x3b, 0x686, 0x647, 0x627, 0x631, 0x634, 0x646, 0x628, 0x647, 0x3b, 0x67e, 0x646, 0x62c, 0x634, 0x646, 0x628, 0x647, 0x3b, 0x62c,</div><div class='add'>+0x645, 0x639, 0x647, 0x3b, 0x634, 0x646, 0x628, 0x647, 0x3b, 0x6cc, 0x3b, 0x62f, 0x3b, 0x633, 0x3b, 0x686, 0x3b, 0x67e, 0x3b, 0x62c,</div><div class='add'>+0x3b, 0x634, 0x3b, 0x6e, 0x69, 0x65, 0x64, 0x7a, 0x2e, 0x3b, 0x70, 0x6f, 0x6e, 0x2e, 0x3b, 0x77, 0x74, 0x2e, 0x3b, 0x15b,</div><div class='add'>+0x72, 0x2e, 0x3b, 0x63, 0x7a, 0x77, 0x2e, 0x3b, 0x70, 0x74, 0x2e, 0x3b, 0x73, 0x6f, 0x62, 0x2e, 0x3b, 0x6e, 0x69, 0x65,</div><div class='add'>+0x64, 0x7a, 0x69, 0x65, 0x6c, 0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x69, 0x65, 0x64, 0x7a, 0x69, 0x61, 0x142, 0x65, 0x6b, 0x3b,</div><div class='add'>+0x77, 0x74, 0x6f, 0x72, 0x65, 0x6b, 0x3b, 0x15b, 0x72, 0x6f, 0x64, 0x61, 0x3b, 0x63, 0x7a, 0x77, 0x61, 0x72, 0x74, 0x65,</div><div class='add'>+0x6b, 0x3b, 0x70, 0x69, 0x105, 0x74, 0x65, 0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x4e, 0x3b, 0x50, 0x3b,</div><div class='add'>+0x57, 0x3b, 0x15a, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0x64, 0x6f, 0x6d, 0x3b, 0x73, 0x65, 0x67, 0x3b, 0x74, 0x65,</div><div class='add'>+0x72, 0x3b, 0x71, 0x75, 0x61, 0x3b, 0x71, 0x75, 0x69, 0x3b, 0x73, 0x65, 0x78, 0x3b, 0x73, 0xe1, 0x62, 0x3b, 0x44, 0x6f,</div><div class='add'>+0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x53, 0x65, 0x67, 0x75, 0x6e, 0x64, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b,</div><div class='add'>+0x54, 0x65, 0x72, 0xe7, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x51, 0x75, 0x61, 0x72, 0x74, 0x61, 0x2d, 0x66,</div><div class='add'>+0x65, 0x69, 0x72, 0x61, 0x3b, 0x51, 0x75, 0x69, 0x6e, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x53, 0x65,</div><div class='add'>+0x78, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x53, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0x44, 0x3b, 0x53,</div><div class='add'>+0x3b, 0x54, 0x3b, 0x51, 0x3b, 0x51, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x3b, 0x73,</div><div class='add'>+0x65, 0x67, 0x75, 0x6e, 0x64, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x74, 0x65, 0x72, 0xe7, 0x61, 0x2d, 0x66,</div><div class='add'>+0x65, 0x69, 0x72, 0x61, 0x3b, 0x71, 0x75, 0x61, 0x72, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x71, 0x75,</div><div class='add'>+0x69, 0x6e, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x69, 0x72, 0x61, 0x3b, 0x73, 0x65, 0x78, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x69,</div><div class='add'>+0x72, 0x61, 0x3b, 0x73, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0xa10, 0xa24, 0x2e, 0x3b, 0xa38, 0xa4b, 0xa2e, 0x2e, 0x3b, 0xa2e,</div><div class='add'>+0xa70, 0xa17, 0xa32, 0x2e, 0x3b, 0xa2c, 0xa41, 0xa27, 0x2e, 0x3b, 0xa35, 0xa40, 0xa30, 0x2e, 0x3b, 0xa38, 0xa3c, 0xa41, 0xa15, 0xa30,</div><div class='add'>+0x2e, 0x3b, 0xa38, 0xa3c, 0xa28, 0xa40, 0x2e, 0x3b, 0xa10, 0xa24, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa38, 0xa4b, 0xa2e, 0xa35, 0xa3e, 0xa30,</div><div class='add'>+0x3b, 0xa2e, 0xa70, 0xa17, 0xa32, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa2c, 0xa41, 0xa27, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa35, 0xa40, 0xa30, 0xa35,</div><div class='add'>+0xa3e, 0xa30, 0x3b, 0xa38, 0xa3c, 0xa41, 0xa71, 0xa15, 0xa30, 0xa35, 0xa3e, 0xa30, 0x3b, 0xa38, 0xa3c, 0xa28, 0xa40, 0xa1a, 0xa30, 0xa35,</div><div class='add'>+0xa3e, 0xa30, 0x3b, 0xa10, 0x3b, 0xa38, 0xa4b, 0x3b, 0xa2e, 0xa70, 0x3b, 0xa2c, 0xa41, 0xa71, 0x3b, 0xa35, 0xa40, 0x3b, 0xa38, 0xa3c,</div><div class='add'>+0xa41, 0xa71, 0x3b, 0xa38, 0xa3c, 0x3b, 0x627, 0x62a, 0x648, 0x627, 0x631, 0x3b, 0x67e, 0x6cc, 0x631, 0x3b, 0x645, 0x646, 0x6af, 0x644,</div><div class='add'>+0x3b, 0x628, 0x64f, 0x62f, 0x6be, 0x3b, 0x62c, 0x645, 0x639, 0x631, 0x627, 0x62a, 0x3b, 0x62c, 0x645, 0x639, 0x6c1, 0x3b, 0x6c1, 0x641,</div><div class='add'>+0x62a, 0x6c1, 0x3b, 0x64, 0x75, 0x3b, 0x67, 0x6c, 0x69, 0x3b, 0x6d, 0x61, 0x3b, 0x6d, 0x65, 0x3b, 0x67, 0x69, 0x65, 0x3b,</div><div class='add'>+0x76, 0x65, 0x3b, 0x73, 0x6f, 0x3b, 0x64, 0x75, 0x6d, 0x65, 0x6e, 0x67, 0x69, 0x61, 0x3b, 0x67, 0x6c, 0x69, 0x6e, 0x64,</div><div class='add'>+0x65, 0x73, 0x64, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x64, 0x69, 0x3b, 0x6d, 0x65, 0x73, 0x65, 0x6d, 0x6e, 0x61, 0x3b, 0x67,</div><div class='add'>+0x69, 0x65, 0x76, 0x67, 0x69, 0x61, 0x3b, 0x76, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x64, 0x69, 0x3b, 0x73, 0x6f, 0x6e, 0x64,</div><div class='add'>+0x61, 0x3b, 0x44, 0x3b, 0x47, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x56, 0x3b, 0x53, 0x3b, 0x44, 0x75, 0x3b, 0x4c,</div><div class='add'>+0x75, 0x3b, 0x4d, 0x61, 0x3b, 0x4d, 0x69, 0x3b, 0x4a, 0x6f, 0x3b, 0x56, 0x69, 0x3b, 0x53, 0xe2, 0x3b, 0x64, 0x75, 0x6d,</div><div class='add'>+0x69, 0x6e, 0x69, 0x63, 0x103, 0x3b, 0x6c, 0x75, 0x6e, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x21b, 0x69, 0x3b, 0x6d, 0x69, 0x65,</div><div class='add'>+0x72, 0x63, 0x75, 0x72, 0x69, 0x3b, 0x6a, 0x6f, 0x69, 0x3b, 0x76, 0x69, 0x6e, 0x65, 0x72, 0x69, 0x3b, 0x73, 0xe2, 0x6d,</div><div class='add'>+0x62, 0x103, 0x74, 0x103, 0x3b, 0x412, 0x441, 0x3b, 0x41f, 0x43d, 0x3b, 0x412, 0x442, 0x3b, 0x421, 0x440, 0x3b, 0x427, 0x442, 0x3b,</div><div class='add'>+0x41f, 0x442, 0x3b, 0x421, 0x431, 0x3b, 0x412, 0x43e, 0x441, 0x43a, 0x440, 0x435, 0x441, 0x435, 0x43d, 0x44c, 0x435, 0x3b, 0x41f, 0x43e,</div><div class='add'>+0x43d, 0x435, 0x434, 0x435, 0x43b, 0x44c, 0x43d, 0x438, 0x43a, 0x3b, 0x412, 0x442, 0x43e, 0x440, 0x43d, 0x438, 0x43a, 0x3b, 0x421, 0x440,</div><div class='add'>+0x435, 0x434, 0x430, 0x3b, 0x427, 0x435, 0x442, 0x432, 0x435, 0x440, 0x433, 0x3b, 0x41f, 0x44f, 0x442, 0x43d, 0x438, 0x446, 0x430, 0x3b,</div><div class='add'>+0x421, 0x443, 0x431, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x412, 0x3b, 0x41f, 0x3b, 0x412, 0x3b, 0x421, 0x3b, 0x427, 0x3b, 0x41f, 0x3b,</div><div class='add'>+0x421, 0x3b, 0x432, 0x43e, 0x441, 0x43a, 0x440, 0x435, 0x441, 0x435, 0x43d, 0x44c, 0x435, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435,</div><div class='add'>+0x43b, 0x44c, 0x43d, 0x438, 0x43a, 0x3b, 0x432, 0x442, 0x43e, 0x440, 0x43d, 0x438, 0x43a, 0x3b, 0x441, 0x440, 0x435, 0x434, 0x430, 0x3b,</div><div class='add'>+0x447, 0x435, 0x442, 0x432, 0x435, 0x440, 0x433, 0x3b, 0x43f, 0x44f, 0x442, 0x43d, 0x438, 0x446, 0x430, 0x3b, 0x441, 0x443, 0x431, 0x431,</div><div class='add'>+0x43e, 0x442, 0x430, 0x3b, 0x42, 0x6b, 0x31, 0x3b, 0x42, 0x6b, 0x32, 0x3b, 0x42, 0x6b, 0x33, 0x3b, 0x42, 0x6b, 0x34, 0x3b,</div><div class='add'>+0x42, 0x6b, 0x35, 0x3b, 0x4c, 0xe2, 0x70, 0x3b, 0x4c, 0xe2, 0x79, 0x3b, 0x42, 0x69, 0x6b, 0x75, 0x61, 0x2d, 0xf4, 0x6b,</div><div class='add'>+0x6f, 0x3b, 0x42, 0xef, 0x6b, 0x75, 0x61, 0x2d, 0xfb, 0x73, 0x65, 0x3b, 0x42, 0xef, 0x6b, 0x75, 0x61, 0x2d, 0x70, 0x74,</div><div class='add'>+0xe2, 0x3b, 0x42, 0xef, 0x6b, 0x75, 0x61, 0x2d, 0x75, 0x73, 0xef, 0xf6, 0x3b, 0x42, 0xef, 0x6b, 0x75, 0x61, 0x2d, 0x6f,</div><div class='add'>+0x6b, 0xfc, 0x3b, 0x4c, 0xe2, 0x70, 0xf4, 0x73, 0xf6, 0x3b, 0x4c, 0xe2, 0x79, 0x65, 0x6e, 0x67, 0x61, 0x3b, 0x4b, 0x3b,</div><div class='add'>+0x53, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x4b, 0x3b, 0x50, 0x3b, 0x59, 0x3b, 0x43d, 0x435, 0x434, 0x3b, 0x43f, 0x43e, 0x43d, 0x3b,</div><div class='add'>+0x443, 0x442, 0x43e, 0x3b, 0x441, 0x440, 0x435, 0x3b, 0x447, 0x435, 0x442, 0x3b, 0x43f, 0x435, 0x442, 0x3b, 0x441, 0x443, 0x431, 0x3b,</div><div class='add'>+0x43d, 0x435, 0x434, 0x435, 0x459, 0x430, 0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x459, 0x430, 0x43a, 0x3b, 0x443, 0x442, 0x43e,</div><div class='add'>+0x440, 0x430, 0x43a, 0x3b, 0x441, 0x440, 0x435, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x440, 0x442, 0x430, 0x43a, 0x3b, 0x43f,</div><div class='add'>+0x435, 0x442, 0x430, 0x43a, 0x3b, 0x441, 0x443, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x43d, 0x3b, 0x43f, 0x3b, 0x443, 0x3b, 0x441, 0x3b,</div><div class='add'>+0x447, 0x3b, 0x43f, 0x3b, 0x441, 0x3b, 0x43d, 0x435, 0x434, 0x3b, 0x43f, 0x43e, 0x43d, 0x3b, 0x443, 0x442, 0x43e, 0x3b, 0x441, 0x440,</div><div class='add'>+0x438, 0x3b, 0x447, 0x435, 0x442, 0x3b, 0x43f, 0x435, 0x442, 0x3b, 0x441, 0x443, 0x431, 0x3b, 0x43d, 0x435, 0x434, 0x435, 0x459, 0x430,</div><div class='add'>+0x3b, 0x43f, 0x43e, 0x43d, 0x435, 0x434, 0x435, 0x459, 0x430, 0x43a, 0x3b, 0x443, 0x442, 0x43e, 0x440, 0x430, 0x43a, 0x3b, 0x441, 0x440,</div><div class='add'>+0x438, 0x458, 0x435, 0x434, 0x430, 0x3b, 0x447, 0x435, 0x442, 0x432, 0x440, 0x442, 0x430, 0x43a, 0x3b, 0x43f, 0x435, 0x442, 0x430, 0x43a,</div><div class='add'>+0x3b, 0x441, 0x443, 0x431, 0x43e, 0x442, 0x430, 0x3b, 0x6e, 0x65, 0x64, 0x3b, 0x70, 0x6f, 0x6e, 0x3b, 0x75, 0x74, 0x6f, 0x3b,</div><div class='add'>+0x73, 0x72, 0x65, 0x3b, 0x10d, 0x65, 0x74, 0x3b, 0x70, 0x65, 0x74, 0x3b, 0x73, 0x75, 0x62, 0x3b, 0x6e, 0x65, 0x64, 0x65,</div><div class='add'>+0x6c, 0x6a, 0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a, 0x61, 0x6b, 0x3b, 0x75, 0x74, 0x6f, 0x72, 0x61,</div><div class='add'>+0x6b, 0x3b, 0x73, 0x72, 0x65, 0x64, 0x61, 0x3b, 0x10d, 0x65, 0x74, 0x76, 0x72, 0x74, 0x61, 0x6b, 0x3b, 0x70, 0x65, 0x74,</div><div class='add'>+0x61, 0x6b, 0x3b, 0x73, 0x75, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x53, 0x6f, 0x6e, 0x3b, 0x4d, 0x6d, 0x61, 0x3b, 0x42, 0x65,</div><div class='add'>+0x64, 0x3b, 0x52, 0x61, 0x72, 0x3b, 0x4e, 0x65, 0x3b, 0x48, 0x6c, 0x61, 0x3b, 0x4d, 0x6f, 0x71, 0x3b, 0x53, 0x6f, 0x6e,</div><div class='add'>+0x74, 0x61, 0x68, 0x61, 0x3b, 0x4d, 0x6d, 0x61, 0x6e, 0x74, 0x61, 0x68, 0x61, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x62, 0x65,</div><div class='add'>+0x64, 0x69, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x72, 0x61, 0x72, 0x75, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x6e, 0x65, 0x3b, 0x4c,</div><div class='add'>+0x61, 0x62, 0x6f, 0x68, 0x6c, 0x61, 0x6e, 0x65, 0x3b, 0x4d, 0x6f, 0x71, 0x65, 0x62, 0x65, 0x6c, 0x6f, 0x3b, 0x54, 0x73,</div><div class='add'>+0x68, 0x3b, 0x4d, 0x6f, 0x73, 0x3b, 0x42, 0x65, 0x64, 0x3b, 0x52, 0x61, 0x72, 0x3b, 0x4e, 0x65, 0x3b, 0x54, 0x6c, 0x61,</div><div class='add'>+0x3b, 0x4d, 0x61, 0x74, 0x3b, 0x54, 0x73, 0x68, 0x69, 0x70, 0x69, 0x3b, 0x4d, 0x6f, 0x73, 0x6f, 0x70, 0x75, 0x6c, 0x6f,</div><div class='add'>+0x67, 0x6f, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x62, 0x65, 0x64, 0x69, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x72, 0x61, 0x72, 0x6f,</div><div class='add'>+0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x6e, 0x65, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x74, 0x6c, 0x68, 0x61, 0x6e, 0x6f, 0x3b, 0x4d,</div><div class='add'>+0x61, 0x74, 0x6c, 0x68, 0x61, 0x74, 0x73, 0x6f, 0x3b, 0x53, 0x76, 0x6f, 0x3b, 0x4d, 0x75, 0x76, 0x3b, 0x43, 0x68, 0x69,</div><div class='add'>+0x70, 0x3b, 0x43, 0x68, 0x69, 0x74, 0x3b, 0x43, 0x68, 0x69, 0x6e, 0x3b, 0x43, 0x68, 0x69, 0x73, 0x3b, 0x4d, 0x75, 0x67,</div><div class='add'>+0x3b, 0x53, 0x76, 0x6f, 0x6e, 0x64, 0x6f, 0x3b, 0x4d, 0x75, 0x76, 0x68, 0x75, 0x72, 0x6f, 0x3b, 0x43, 0x68, 0x69, 0x70,</div><div class='add'>+0x69, 0x72, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x43, 0x68, 0x69, 0x6e, 0x61, 0x3b, 0x43, 0x68,</div><div class='add'>+0x69, 0x73, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x75, 0x67, 0x6f, 0x76, 0x65, 0x72, 0x61, 0x3b, 0x53, 0x3b, 0x4d, 0x3b,</div><div class='add'>+0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x4d, 0x3b, 0xd89, 0xdbb, 0xdd2, 0x3b, 0xdc3, 0xdb3, 0xdd4, 0x3b, 0xd85, 0xd9f,</div><div class='add'>+0x3b, 0xdb6, 0xdaf, 0xdcf, 0x3b, 0xdb6, 0xdca, 0x200d, 0xdbb, 0xdc4, 0x3b, 0xdc3, 0xdd2, 0xd9a, 0xdd4, 0x3b, 0xdc3, 0xdd9, 0xdb1, 0x3b,</div><div class='add'>+0xd89, 0xdbb, 0xdd2, 0xdaf, 0xdcf, 0x3b, 0xdc3, 0xdb3, 0xdd4, 0xdaf, 0xdcf, 0x3b, 0xd85, 0xd9f, 0xdc4, 0xdbb, 0xdd4, 0xdc0, 0xdcf, 0xdaf,</div><div class='add'>+0xdcf, 0x3b, 0xdb6, 0xdaf, 0xdcf, 0xdaf, 0xdcf, 0x3b, 0xdb6, 0xdca, 0x200d, 0xdbb, 0xdc4, 0xdc3, 0xdca, 0xdb4, 0xdad, 0xdd2, 0xdb1, 0xdca,</div><div class='add'>+0xdaf, 0xdcf, 0x3b, 0xdc3, 0xdd2, 0xd9a, 0xdd4, 0xdbb, 0xdcf, 0xdaf, 0xdcf, 0x3b, 0xdc3, 0xdd9, 0xdb1, 0xdc3, 0xdd4, 0xdbb, 0xdcf, 0xdaf,</div><div class='add'>+0xdcf, 0x3b, 0xd89, 0x3b, 0xdc3, 0x3b, 0xd85, 0x3b, 0xdb6, 0x3b, 0xdb6, 0xdca, 0x200d, 0xdbb, 0x3b, 0xdc3, 0xdd2, 0x3b, 0xdc3, 0xdd9,</div><div class='add'>+0x3b, 0x53, 0x6f, 0x6e, 0x3b, 0x4d, 0x73, 0x6f, 0x3b, 0x42, 0x69, 0x6c, 0x3b, 0x54, 0x73, 0x61, 0x3b, 0x4e, 0x65, 0x3b,</div><div class='add'>+0x48, 0x6c, 0x61, 0x3b, 0x4d, 0x67, 0x63, 0x3b, 0x4c, 0x69, 0x73, 0x6f, 0x6e, 0x74, 0x66, 0x6f, 0x3b, 0x75, 0x4d, 0x73,</div><div class='add'>+0x6f, 0x6d, 0x62, 0x75, 0x6c, 0x75, 0x6b, 0x6f, 0x3b, 0x4c, 0x65, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4c, 0x65,</div><div class='add'>+0x73, 0x69, 0x74, 0x73, 0x61, 0x74, 0x66, 0x75, 0x3b, 0x4c, 0x65, 0x73, 0x69, 0x6e, 0x65, 0x3b, 0x4c, 0x65, 0x73, 0x69,</div><div class='add'>+0x68, 0x6c, 0x61, 0x6e, 0x75, 0x3b, 0x75, 0x4d, 0x67, 0x63, 0x69, 0x62, 0x65, 0x6c, 0x6f, 0x3b, 0x6e, 0x65, 0x3b, 0x70,</div><div class='add'>+0x6f, 0x3b, 0x75, 0x74, 0x3b, 0x73, 0x74, 0x3b, 0x161, 0x74, 0x3b, 0x70, 0x69, 0x3b, 0x73, 0x6f, 0x3b, 0x6e, 0x65, 0x64,</div><div class='add'>+0x65, 0x13e, 0x61, 0x3b, 0x70, 0x6f, 0x6e, 0x64, 0x65, 0x6c, 0x6f, 0x6b, 0x3b, 0x75, 0x74, 0x6f, 0x72, 0x6f, 0x6b, 0x3b,</div><div class='add'>+0x73, 0x74, 0x72, 0x65, 0x64, 0x61, 0x3b, 0x161, 0x74, 0x76, 0x72, 0x74, 0x6f, 0x6b, 0x3b, 0x70, 0x69, 0x61, 0x74, 0x6f,</div><div class='add'>+0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x4e, 0x3b, 0x50, 0x3b, 0x55, 0x3b, 0x53, 0x3b, 0x160, 0x3b, 0x50,</div><div class='add'>+0x3b, 0x53, 0x3b, 0x6e, 0x65, 0x64, 0x3b, 0x70, 0x6f, 0x6e, 0x3b, 0x74, 0x6f, 0x72, 0x3b, 0x73, 0x72, 0x65, 0x3b, 0x10d,</div><div class='add'>+0x65, 0x74, 0x3b, 0x70, 0x65, 0x74, 0x3b, 0x73, 0x6f, 0x62, 0x3b, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a, 0x61, 0x3b, 0x70,</div><div class='add'>+0x6f, 0x6e, 0x65, 0x64, 0x65, 0x6c, 0x6a, 0x65, 0x6b, 0x3b, 0x74, 0x6f, 0x72, 0x65, 0x6b, 0x3b, 0x73, 0x72, 0x65, 0x64,</div><div class='add'>+0x61, 0x3b, 0x10d, 0x65, 0x74, 0x72, 0x74, 0x65, 0x6b, 0x3b, 0x70, 0x65, 0x74, 0x65, 0x6b, 0x3b, 0x73, 0x6f, 0x62, 0x6f,</div><div class='add'>+0x74, 0x61, 0x3b, 0x6e, 0x3b, 0x70, 0x3b, 0x74, 0x3b, 0x73, 0x3b, 0x10d, 0x3b, 0x70, 0x3b, 0x73, 0x3b, 0x41, 0x78, 0x64,</div><div class='add'>+0x3b, 0x49, 0x73, 0x6e, 0x3b, 0x54, 0x61, 0x6c, 0x3b, 0x41, 0x72, 0x62, 0x3b, 0x4b, 0x68, 0x61, 0x3b, 0x4a, 0x69, 0x6d,</div><div class='add'>+0x3b, 0x53, 0x61, 0x62, 0x3b, 0x41, 0x78, 0x61, 0x64, 0x3b, 0x49, 0x73, 0x6e, 0x69, 0x69, 0x6e, 0x3b, 0x54, 0x61, 0x6c,</div><div class='add'>+0x61, 0x61, 0x64, 0x6f, 0x3b, 0x41, 0x72, 0x62, 0x61, 0x63, 0x6f, 0x3b, 0x4b, 0x68, 0x61, 0x6d, 0x69, 0x69, 0x73, 0x3b,</div><div class='add'>+0x4a, 0x69, 0x6d, 0x63, 0x6f, 0x3b, 0x53, 0x61, 0x62, 0x74, 0x69, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x54, 0x3b, 0x41, 0x3b,</div><div class='add'>+0x4b, 0x3b, 0x4a, 0x3b, 0x53, 0x3b, 0x64, 0x6f, 0x6d, 0x3b, 0x6c, 0x75, 0x6e, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6d, 0x69,</div><div class='add'>+0xe9, 0x3b, 0x6a, 0x75, 0x65, 0x3b, 0x76, 0x69, 0x65, 0x3b, 0x73, 0xe1, 0x62, 0x3b, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x67,</div><div class='add'>+0x6f, 0x3b, 0x6c, 0x75, 0x6e, 0x65, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x3b, 0x6d, 0x69, 0xe9, 0x72, 0x63,</div><div class='add'>+0x6f, 0x6c, 0x65, 0x73, 0x3b, 0x6a, 0x75, 0x65, 0x76, 0x65, 0x73, 0x3b, 0x76, 0x69, 0x65, 0x72, 0x6e, 0x65, 0x73, 0x3b,</div><div class='add'>+0x73, 0xe1, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0x4a, 0x32, 0x3b, 0x4a, 0x33, 0x3b, 0x4a, 0x34, 0x3b, 0x4a, 0x35, 0x3b, 0x41,</div><div class='add'>+0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x3b, 0x4a, 0x31, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x6c, 0x69, 0x3b, 0x4a, 0x75,</div><div class='add'>+0x6d, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74,</div><div class='ctx'> 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b,</div><div class='del'>-0x49, 0x6a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x3b, 0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b,</div><div class='del'>-0x37, 0x3b, 0x31, 0x3b, 0x61, 0x73, 0x69, 0x3b, 0x61, 0x79, 0x6e, 0x3b, 0x61, 0x73, 0x69, 0x3b, 0x61, 0x6b, 0x1e5b, 0x3b,</div><div class='del'>-0x61, 0x6b, 0x77, 0x3b, 0x61, 0x73, 0x69, 0x6d, 0x3b, 0x41, 0x73, 0x69, 0x1e0d, 0x3b, 0x61, 0x73, 0x61, 0x6d, 0x61, 0x73,</div><div class='del'>-0x3b, 0x61, 0x79, 0x6e, 0x61, 0x73, 0x3b, 0x61, 0x73, 0x69, 0x6e, 0x61, 0x73, 0x3b, 0x61, 0x6b, 0x1e5b, 0x61, 0x73, 0x3b,</div><div class='del'>-0x61, 0x6b, 0x77, 0x61, 0x73, 0x3b, 0x61, 0x73, 0x69, 0x6d, 0x77, 0x61, 0x73, 0x3b, 0x61, 0x73, 0x69, 0x1e0d, 0x79, 0x61,</div><div class='del'>-0x73, 0x3b, 0x59, 0x61, 0x6e, 0x3b, 0x53, 0x61, 0x6e, 0x3b, 0x4b, 0x72, 0x61, 0x1e0d, 0x3b, 0x4b, 0x75, 0x1e93, 0x3b, 0x53,</div><div class='del'>-0x61, 0x6d, 0x3b, 0x53, 0x1e0d, 0x69, 0x73, 0x3b, 0x53, 0x61, 0x79, 0x3b, 0x59, 0x61, 0x6e, 0x61, 0x73, 0x73, 0x3b, 0x53,</div><div class='del'>-0x61, 0x6e, 0x61, 0x73, 0x73, 0x3b, 0x4b, 0x72, 0x61, 0x1e0d, 0x61, 0x73, 0x73, 0x3b, 0x4b, 0x75, 0x1e93, 0x61, 0x73, 0x73,</div><div class='del'>-0x3b, 0x53, 0x61, 0x6d, 0x61, 0x73, 0x73, 0x3b, 0x53, 0x1e0d, 0x69, 0x73, 0x61, 0x73, 0x73, 0x3b, 0x53, 0x61, 0x79, 0x61,</div><div class='del'>-0x73, 0x73, 0x3b, 0x59, 0x3b, 0x53, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x53, 0x41, 0x4e,</div><div class='del'>-0x3b, 0x4f, 0x52, 0x4b, 0x3b, 0x4f, 0x4b, 0x42, 0x3b, 0x4f, 0x4b, 0x53, 0x3b, 0x4f, 0x4b, 0x4e, 0x3b, 0x4f, 0x4b, 0x54,</div><div class='del'>-0x3b, 0x4f, 0x4d, 0x4b, 0x3b, 0x53, 0x61, 0x6e, 0x64, 0x65, 0x3b, 0x4f, 0x72, 0x77, 0x6f, 0x6b, 0x75, 0x62, 0x61, 0x6e,</div><div class='del'>-0x7a, 0x61, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6b, 0x61, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6b, 0x61,</div><div class='del'>-0x73, 0x68, 0x61, 0x74, 0x75, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6b,</div><div class='del'>-0x61, 0x74, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x61, 0x67, 0x61, 0x3b, 0x53,</div><div class='del'>-0x3b, 0x4b, 0x3b, 0x52, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x4d, 0x3b, 0x4d, 0x75, 0x6c, 0x3b, 0x56, 0x69, 0x6c,</div><div class='del'>-0x3b, 0x48, 0x69, 0x76, 0x3b, 0x48, 0x69, 0x64, 0x3b, 0x48, 0x69, 0x74, 0x3b, 0x48, 0x69, 0x68, 0x3b, 0x4c, 0x65, 0x6d,</div><div class='del'>-0x3b, 0x70, 0x61, 0x20, 0x6d, 0x75, 0x6c, 0x75, 0x6e, 0x67, 0x75, 0x3b, 0x70, 0x61, 0x20, 0x73, 0x68, 0x61, 0x68, 0x75,</div><div class='del'>-0x76, 0x69, 0x6c, 0x75, 0x68, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x68, 0x69, 0x76, 0x69, 0x6c, 0x69, 0x3b, 0x70, 0x61, 0x20,</div><div class='del'>-0x68, 0x69, 0x64, 0x61, 0x74, 0x75, 0x3b, 0x70, 0x61, 0x20, 0x68, 0x69, 0x74, 0x61, 0x79, 0x69, 0x3b, 0x70, 0x61, 0x20,</div><div class='del'>-0x68, 0x69, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x70, 0x61, 0x20, 0x73, 0x68, 0x61, 0x68, 0x75, 0x6c, 0x65, 0x6d, 0x62, 0x65,</div><div class='del'>-0x6c, 0x61, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x48, 0x3b, 0x48, 0x3b, 0x48, 0x3b, 0x57, 0x3b, 0x4a, 0x3b, 0x4a, 0x70, 0x69,</div><div class='del'>-0x3b, 0x4a, 0x74, 0x74, 0x3b, 0x4a, 0x6e, 0x6e, 0x3b, 0x4a, 0x74, 0x6e, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x75,</div><div class='del'>-0x3b, 0x4a, 0x6d, 0x6f, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x6c, 0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74,</div><div class='del'>-0x61, 0x74, 0x75, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e,</div><div class='del'>-0x75, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4a, 0x75,</div><div class='del'>-0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x4a,</div><div class='del'>-0x3b, 0x6b, 0x61, 0x72, 0x3b, 0x6e, 0x74, 0x25b, 0x3b, 0x74, 0x61, 0x72, 0x3b, 0x61, 0x72, 0x61, 0x3b, 0x61, 0x6c, 0x61,</div><div class='del'>-0x3b, 0x6a, 0x75, 0x6d, 0x3b, 0x73, 0x69, 0x62, 0x3b, 0x6b, 0x61, 0x72, 0x69, 0x3b, 0x6e, 0x74, 0x25b, 0x6e, 0x25b, 0x3b,</div><div class='del'>-0x74, 0x61, 0x72, 0x61, 0x74, 0x61, 0x3b, 0x61, 0x72, 0x61, 0x62, 0x61, 0x3b, 0x61, 0x6c, 0x61, 0x6d, 0x69, 0x73, 0x61,</div><div class='del'>-0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x3b, 0x73, 0x69, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x41,</div><div class='del'>-0x3b, 0x41, 0x3b, 0x4a, 0x3b, 0x53, 0x3b, 0x4b, 0x6d, 0x61, 0x3b, 0x54, 0x61, 0x74, 0x3b, 0x49, 0x6e, 0x65, 0x3b, 0x54,</div><div class='del'>-0x61, 0x6e, 0x3b, 0x41, 0x72, 0x6d, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x4e, 0x4d, 0x4d, 0x3b, 0x4b, 0x69, 0x75, 0x6d, 0x69,</div><div class='del'>-0x61, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x69, 0x6e, 0x65,</div><div class='del'>-0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x72, 0x61, 0x6d, 0x69, 0x74, 0x68, 0x69, 0x3b,</div><div class='del'>-0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4e, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x74, 0x68, 0x69, 0x69, 0x3b, 0x4b,</div><div class='del'>-0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4e, 0x3b, 0x13c6, 0x13cd, 0x13ac, 0x3b, 0x13c9, 0x13c5, 0x13af,</div><div class='del'>-0x3b, 0x13d4, 0x13b5, 0x13c1, 0x3b, 0x13e6, 0x13a2, 0x13c1, 0x3b, 0x13c5, 0x13a9, 0x13c1, 0x3b, 0x13e7, 0x13be, 0x13a9, 0x3b, 0x13c8, 0x13d5, 0x13be,</div><div class='del'>-0x3b, 0x13a4, 0x13be, 0x13d9, 0x13d3, 0x13c6, 0x13cd, 0x13ac, 0x3b, 0x13a4, 0x13be, 0x13d9, 0x13d3, 0x13c9, 0x13c5, 0x13af, 0x3b, 0x13d4, 0x13b5, 0x13c1,</div><div class='del'>-0x13a2, 0x13a6, 0x3b, 0x13e6, 0x13a2, 0x13c1, 0x13a2, 0x13a6, 0x3b, 0x13c5, 0x13a9, 0x13c1, 0x13a2, 0x13a6, 0x3b, 0x13e7, 0x13be, 0x13a9, 0x13b6, 0x13cd,</div><div class='del'>-0x13d7, 0x3b, 0x13a4, 0x13be, 0x13d9, 0x13d3, 0x13c8, 0x13d5, 0x13be, 0x3b, 0x13c6, 0x3b, 0x13c9, 0x3b, 0x13d4, 0x3b, 0x13e6, 0x3b, 0x13c5, 0x3b,</div><div class='del'>-0x13e7, 0x3b, 0x13a4, 0x3b, 0x64, 0x69, 0x6d, 0x3b, 0x6c, 0x69, 0x6e, 0x3b, 0x6d, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x72, 0x3b,</div><div class='del'>-0x7a, 0x65, 0x3b, 0x76, 0x61, 0x6e, 0x3b, 0x73, 0x61, 0x6d, 0x3b, 0x64, 0x69, 0x6d, 0x61, 0x6e, 0x73, 0x3b, 0x6c, 0x69,</div><div class='del'>-0x6e, 0x64, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x64, 0x69, 0x3b, 0x6d, 0x65, 0x72, 0x6b, 0x72, 0x65, 0x64, 0x69, 0x3b, 0x7a,</div><div class='del'>-0x65, 0x64, 0x69, 0x3b, 0x76, 0x61, 0x6e, 0x64, 0x72, 0x65, 0x64, 0x69, 0x3b, 0x73, 0x61, 0x6d, 0x64, 0x69, 0x3b, 0x64,</div><div class='del'>-0x3b, 0x6c, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x7a, 0x3b, 0x76, 0x3b, 0x73, 0x3b, 0x4c, 0x6c, 0x32, 0x3b, 0x4c, 0x6c, 0x33,</div><div class='del'>-0x3b, 0x4c, 0x6c, 0x34, 0x3b, 0x4c, 0x6c, 0x35, 0x3b, 0x4c, 0x6c, 0x36, 0x3b, 0x4c, 0x6c, 0x37, 0x3b, 0x4c, 0x6c, 0x31,</div><div class='del'>-0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x70, 0x69, 0x6c, 0x69, 0x3b, 0x4c, 0x69, 0x64, 0x75,</div><div class='del'>-0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x79,</div><div class='del'>-0x61, 0x6e, 0x63, 0x68, 0x65, 0x63, 0x68, 0x69, 0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x6e,</div><div class='del'>-0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x6e, 0x6e, 0x79, 0x61,</div><div class='del'>-0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x6c, 0x69, 0x6e, 0x6a, 0x69, 0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c,</div><div class='del'>-0x79, 0x61, 0x6e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x6d, 0x61, 0x76, 0x69, 0x6c, 0x69, 0x3b, 0x4c,</div><div class='del'>-0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x69, 0x74, 0x61, 0x6e, 0x64, 0x69, 0x3b, 0x50, 0xed, 0x69, 0x6c, 0x69, 0x3b,</div><div class='del'>-0x54, 0xe1, 0x61, 0x74, 0x75, 0x3b, 0xcd, 0x6e, 0x65, 0x3b, 0x54, 0xe1, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x6c, 0x68, 0x3b,</div><div class='del'>-0x49, 0x6a, 0x6d, 0x3b, 0x4d, 0xf3, 0x6f, 0x73, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x70, 0xed, 0x69, 0x72, 0x69, 0x3b,</div><div class='del'>-0x4a, 0x75, 0x6d, 0x61, 0x74, 0xe1, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0xed, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d,</div><div class='del'>-0x61, 0x74, 0xe1, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x6c, 0x61, 0x6d, 0xed, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d,</div><div class='del'>-0xe1, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0xf3, 0x6f, 0x73, 0x69, 0x3b, 0x50, 0x3b, 0x54, 0x3b, 0x45, 0x3b, 0x4f,</div><div class='del'>-0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x4d, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x42, 0x61, 0x6c, 0x3b, 0x4c, 0x77, 0x32, 0x3b, 0x4c,</div><div class='del'>-0x77, 0x33, 0x3b, 0x4c, 0x77, 0x34, 0x3b, 0x4c, 0x77, 0x35, 0x3b, 0x4c, 0x77, 0x36, 0x3b, 0x53, 0x61, 0x62, 0x62, 0x69,</div><div class='del'>-0x69, 0x74, 0x69, 0x3b, 0x42, 0x61, 0x6c, 0x61, 0x7a, 0x61, 0x3b, 0x4c, 0x77, 0x61, 0x6b, 0x75, 0x62, 0x69, 0x72, 0x69,</div><div class='del'>-0x3b, 0x4c, 0x77, 0x61, 0x6b, 0x75, 0x73, 0x61, 0x74, 0x75, 0x3b, 0x4c, 0x77, 0x61, 0x6b, 0x75, 0x6e, 0x61, 0x3b, 0x4c,</div><div class='del'>-0x77, 0x61, 0x6b, 0x75, 0x74, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x4c, 0x77, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x61, 0x67, 0x61,</div><div class='del'>-0x3b, 0x53, 0x3b, 0x42, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x50, 0x61, 0x20, 0x4d, 0x75,</div><div class='del'>-0x6c, 0x75, 0x6e, 0x67, 0x75, 0x3b, 0x50, 0x61, 0x6c, 0x69, 0x63, 0x68, 0x69, 0x6d, 0x6f, 0x3b, 0x50, 0x61, 0x6c, 0x69,</div><div class='del'>-0x63, 0x68, 0x69, 0x62, 0x75, 0x6c, 0x69, 0x3b, 0x50, 0x61, 0x6c, 0x69, 0x63, 0x68, 0x69, 0x74, 0x61, 0x74, 0x75, 0x3b,</div><div class='del'>-0x50, 0x61, 0x6c, 0x69, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x3b, 0x50, 0x61, 0x6c, 0x69, 0x63, 0x68, 0x69, 0x73, 0x61, 0x6e,</div><div class='del'>-0x6f, 0x3b, 0x50, 0x61, 0x63, 0x68, 0x69, 0x62, 0x65, 0x6c, 0x75, 0x73, 0x68, 0x69, 0x3b, 0x64, 0x75, 0x6d, 0x3b, 0x73,</div><div class='del'>-0x69, 0x67, 0x3b, 0x74, 0x65, 0x72, 0x3b, 0x6b, 0x75, 0x61, 0x3b, 0x6b, 0x69, 0x6e, 0x3b, 0x73, 0x65, 0x73, 0x3b, 0x73,</div><div class='del'>-0x61, 0x62, 0x3b, 0x64, 0x75, 0x6d, 0x69, 0x6e, 0x67, 0x75, 0x3b, 0x73, 0x69, 0x67, 0x75, 0x6e, 0x64, 0x61, 0x2d, 0x66,</div><div class='del'>-0x65, 0x72, 0x61, 0x3b, 0x74, 0x65, 0x72, 0x73, 0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x6b, 0x75, 0x61, 0x72, 0x74,</div><div class='del'>-0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x6b, 0x69, 0x6e, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x73, 0x65,</div><div class='del'>-0x73, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x73, 0x61, 0x62, 0x61, 0x64, 0x75, 0x3b, 0x64, 0x3b, 0x73, 0x3b,</div><div class='del'>-0x74, 0x3b, 0x6b, 0x3b, 0x6b, 0x3b, 0x73, 0x3b, 0x73, 0x3b, 0x4b, 0x49, 0x55, 0x3b, 0x4d, 0x52, 0x41, 0x3b, 0x57, 0x41,</div><div class='del'>-0x49, 0x3b, 0x57, 0x45, 0x54, 0x3b, 0x57, 0x45, 0x4e, 0x3b, 0x57, 0x54, 0x4e, 0x3b, 0x4a, 0x55, 0x4d, 0x3b, 0x4b, 0x69,</div><div class='del'>-0x75, 0x6d, 0x69, 0x61, 0x3b, 0x4d, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x6f, 0x3b, 0x57, 0x61, 0x69, 0x72, 0x69, 0x3b,</div><div class='del'>-0x57, 0x65, 0x74, 0x68, 0x61, 0x74, 0x75, 0x3b, 0x57, 0x65, 0x6e, 0x61, 0x3b, 0x57, 0x65, 0x74, 0x61, 0x6e, 0x6f, 0x3b,</div><div class='del'>-0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x57, 0x3b, 0x57, 0x3b, 0x57, 0x3b, 0x57,</div><div class='del'>-0x3b, 0x4a, 0x3b, 0x54, 0x69, 0x73, 0x3b, 0x54, 0x61, 0x69, 0x3b, 0x41, 0x65, 0x6e, 0x3b, 0x53, 0x6f, 0x6d, 0x3b, 0x41,</div><div class='del'>-0x6e, 0x67, 0x3b, 0x4d, 0x75, 0x74, 0x3b, 0x4c, 0x6f, 0x68, 0x3b, 0x42, 0x65, 0x74, 0x75, 0x74, 0x61, 0x62, 0x20, 0x74,</div><div class='del'>-0x69, 0x73, 0x61, 0x70, 0x3b, 0x42, 0x65, 0x74, 0x75, 0x74, 0x20, 0x6e, 0x65, 0x74, 0x61, 0x69, 0x3b, 0x42, 0x65, 0x74,</div><div class='del'>-0x75, 0x74, 0x61, 0x62, 0x20, 0x61, 0x65, 0x6e, 0x67, 0x27, 0x3b, 0x42, 0x65, 0x74, 0x75, 0x74, 0x61, 0x62, 0x20, 0x73,</div><div class='del'>-0x6f, 0x6d, 0x6f, 0x6b, 0x3b, 0x42, 0x65, 0x74, 0x75, 0x74, 0x61, 0x62, 0x20, 0x61, 0x6e, 0x67, 0x27, 0x77, 0x61, 0x6e,</div><div class='del'>-0x3b, 0x42, 0x65, 0x74, 0x75, 0x74, 0x61, 0x62, 0x20, 0x6d, 0x75, 0x74, 0x3b, 0x42, 0x65, 0x74, 0x75, 0x74, 0x61, 0x62,</div><div class='del'>-0x20, 0x6c, 0x6f, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4c, 0x3b, 0x53, 0x6f,</div><div class='del'>-0x6e, 0x3b, 0x4d, 0x61, 0x3b, 0x44, 0x65, 0x3b, 0x57, 0x75, 0x3b, 0x44, 0x6f, 0x3b, 0x46, 0x72, 0x3b, 0x53, 0x61, 0x74,</div><div class='del'>-0x3b, 0x53, 0x6f, 0x6e, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x4d, 0x61, 0x6e, 0x74, 0x61, 0x78, 0x74,</div><div class='del'>-0x73, 0x65, 0x65, 0x73, 0x3b, 0x44, 0x65, 0x6e, 0x73, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x57, 0x75,</div><div class='del'>-0x6e, 0x73, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x44, 0x6f, 0x6e, 0x64, 0x65, 0x72, 0x74, 0x61, 0x78,</div><div class='del'>-0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x46, 0x72, 0x61, 0x69, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x53,</div><div class='del'>-0x61, 0x74, 0x65, 0x72, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x57,</div><div class='del'>-0x3b, 0x44, 0x3b, 0x46, 0x3b, 0x41, 0x3b, 0x53, 0x75, 0x2e, 0x3b, 0x4d, 0x6f, 0x2e, 0x3b, 0x44, 0x69, 0x2e, 0x3b, 0x4d,</div><div class='del'>-0x65, 0x2e, 0x3b, 0x44, 0x75, 0x2e, 0x3b, 0x46, 0x72, 0x2e, 0x3b, 0x53, 0x61, 0x2e, 0x3b, 0x53, 0x75, 0x6e, 0x6e, 0x64,</div><div class='del'>-0x61, 0x61, 0x63, 0x68, 0x3b, 0x4d, 0x6f, 0x6f, 0x6e, 0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x44, 0x69, 0x6e, 0x6e, 0x73,</div><div class='del'>-0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x4d, 0x65, 0x74, 0x77, 0x6f, 0x63, 0x68, 0x3b, 0x44, 0x75, 0x6e, 0x6e, 0x65, 0x72,</div><div class='del'>-0x73, 0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x46, 0x72, 0x69, 0x69, 0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x53, 0x61, 0x6d,</div><div class='del'>-0x73, 0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x70, 0xed, 0x6c, 0xed, 0x3b, 0x4a, 0x75, 0x6d, 0x61,</div><div class='del'>-0x74, 0xe1, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0xe1, 0x6e, 0x254,</div><div class='del'>-0x3b, 0x41, 0x6c, 0x61, 0xe1, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0xe1, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x61,</div><div class='del'>-0x6d, 0xf3, 0x73, 0x69, 0x3b, 0x53, 0x61, 0x62, 0x69, 0x3b, 0x42, 0x61, 0x6c, 0x61, 0x3b, 0x4b, 0x75, 0x62, 0x69, 0x3b,</div><div class='del'>-0x4b, 0x75, 0x73, 0x61, 0x3b, 0x4b, 0x75, 0x6e, 0x61, 0x3b, 0x4b, 0x75, 0x74, 0x61, 0x3b, 0x4d, 0x75, 0x6b, 0x61, 0x3b,</div><div class='del'>-0x53, 0x61, 0x62, 0x69, 0x69, 0x74, 0x69, 0x3b, 0x42, 0x61, 0x6c, 0x61, 0x7a, 0x61, 0x3b, 0x4f, 0x77, 0x6f, 0x6b, 0x75,</div><div class='del'>-0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4f, 0x77, 0x6f, 0x6b, 0x75, 0x73, 0x61, 0x74, 0x75, 0x3b, 0x4f, 0x6c, 0x6f, 0x6b, 0x75,</div><div class='del'>-0x6e, 0x61, 0x3b, 0x4f, 0x6c, 0x6f, 0x6b, 0x75, 0x74, 0x61, 0x61, 0x6e, 0x75, 0x3b, 0x4f, 0x6c, 0x6f, 0x6d, 0x75, 0x6b,</div><div class='del'>-0x61, 0x61, 0x67, 0x61, 0x3b, 0x53, 0x3b, 0x42, 0x3b, 0x42, 0x3b, 0x53, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x4a,</div><div class='del'>-0x32, 0x3b, 0x4a, 0x33, 0x3b, 0x4a, 0x34, 0x3b, 0x4a, 0x35, 0x3b, 0x41, 0x6c, 0x3b, 0x49, 0x6a, 0x3b, 0x4a, 0x31, 0x3b,</div><div class='del'>-0x4a, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x72, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4a, 0x75,</div><div class='del'>-0x6d, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x75, 0x72, 0x77, 0x61,</div><div class='del'>-0x20, 0x77, 0x61, 0x20, 0x4b, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x4d, 0x75, 0x72, 0x77, 0x61, 0x20, 0x77, 0x61, 0x20, 0x4b,</div><div class='del'>-0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x3b, 0x4a, 0x70, 0x69, 0x3b, 0x4a,</div><div class='del'>-0x74, 0x74, 0x3b, 0x4a, 0x6e, 0x6e, 0x3b, 0x4a, 0x74, 0x6e, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x6d, 0x3b, 0x4a,</div><div class='del'>-0x6d, 0x6f, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x42, 0x61, 0x72, 0x3b, 0x41, 0x61, 0x72, 0x3b, 0x55, 0x6e, 0x69, 0x3b, 0x55,</div><div class='del'>-0x6e, 0x67, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x65, 0x6a, 0x75, 0x6d, 0x61,</div><div class='del'>-0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x65, 0x62, 0x61, 0x72, 0x61, 0x73, 0x61, 0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x61, 0x72, 0x65,</div><div class='del'>-0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x75, 0x6e, 0x69, 0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x75, 0x6e, 0x67, 0x27, 0x6f, 0x6e, 0x3b,</div><div class='del'>-0x4e, 0x61, 0x6b, 0x61, 0x6b, 0x61, 0x6e, 0x79, 0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x73, 0x61, 0x62, 0x69, 0x74, 0x69, 0x3b,</div><div class='del'>-0x4a, 0x3b, 0x42, 0x3b, 0x41, 0x3b, 0x55, 0x3b, 0x55, 0x3b, 0x4b, 0x3b, 0x53, 0x3b, 0x4e, 0x61, 0x62, 0x3b, 0x53, 0x61,</div><div class='del'>-0x6e, 0x3b, 0x53, 0x61, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x3b, 0x43, 0x61, 0x6d, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x51, 0x75,</div><div class='del'>-0x6e, 0x3b, 0x4e, 0x61, 0x62, 0x61, 0x20, 0x53, 0x61, 0x6d, 0x62, 0x61, 0x74, 0x3b, 0x53, 0x61, 0x6e, 0x69, 0x3b, 0x53,</div><div class='del'>-0x61, 0x6c, 0x75, 0x73, 0x3b, 0x52, 0x61, 0x62, 0x75, 0x71, 0x3b, 0x43, 0x61, 0x6d, 0x75, 0x73, 0x3b, 0x4a, 0x75, 0x6d,</div><div class='del'>-0x71, 0x61, 0x74, 0x61, 0x3b, 0x51, 0x75, 0x6e, 0x78, 0x61, 0x20, 0x53, 0x61, 0x6d, 0x62, 0x61, 0x74, 0x3b, 0x4e, 0x3b,</div><div class='del'>-0x53, 0x3b, 0x53, 0x3b, 0x52, 0x3b, 0x43, 0x3b, 0x4a, 0x3b, 0x51, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x41, 0x74, 0x69, 0x3b,</div><div class='del'>-0x41, 0x74, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x3b, 0x41, 0x73, 0x73, 0x3b,</div><div class='del'>-0x41, 0x6c, 0x68, 0x61, 0x64, 0x69, 0x3b, 0x41, 0x74, 0x69, 0x6e, 0x69, 0x3b, 0x41, 0x74, 0x61, 0x6c, 0x61, 0x74, 0x61,</div><div class='del'>-0x3b, 0x41, 0x6c, 0x61, 0x72, 0x62, 0x61, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x69, 0x73, 0x61, 0x3b, 0x41, 0x6c,</div><div class='del'>-0x6a, 0x75, 0x6d, 0x61, 0x3b, 0x41, 0x73, 0x73, 0x61, 0x62, 0x64, 0x75, 0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x4c,</div><div class='del'>-0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x53, 0x3b, 0x4a, 0x4d, 0x50, 0x3b, 0x57, 0x55, 0x54, 0x3b, 0x54, 0x41, 0x52, 0x3b, 0x54,</div><div class='del'>-0x41, 0x44, 0x3b, 0x54, 0x41, 0x4e, 0x3b, 0x54, 0x41, 0x42, 0x3b, 0x4e, 0x47, 0x53, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x70,</div><div class='del'>-0x69, 0x6c, 0x3b, 0x57, 0x75, 0x6f, 0x6b, 0x20, 0x54, 0x69, 0x63, 0x68, 0x3b, 0x54, 0x69, 0x63, 0x68, 0x20, 0x41, 0x72,</div><div class='del'>-0x69, 0x79, 0x6f, 0x3b, 0x54, 0x69, 0x63, 0x68, 0x20, 0x41, 0x64, 0x65, 0x6b, 0x3b, 0x54, 0x69, 0x63, 0x68, 0x20, 0x41,</div><div class='del'>-0x6e, 0x67, 0x27, 0x77, 0x65, 0x6e, 0x3b, 0x54, 0x69, 0x63, 0x68, 0x20, 0x41, 0x62, 0x69, 0x63, 0x68, 0x3b, 0x4e, 0x67,</div><div class='del'>-0x65, 0x73, 0x6f, 0x3b, 0x4a, 0x3b, 0x57, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x4e, 0x3b, 0x41, 0x73,</div><div class='del'>-0x61, 0x3b, 0x41, 0x79, 0x6e, 0x3b, 0x41, 0x73, 0x6e, 0x3b, 0x41, 0x6b, 0x72, 0x3b, 0x41, 0x6b, 0x77, 0x3b, 0x41, 0x73,</div><div class='del'>-0x6d, 0x3b, 0x41, 0x73, 0x1e0d, 0x3b, 0x41, 0x73, 0x61, 0x6d, 0x61, 0x73, 0x3b, 0x41, 0x79, 0x6e, 0x61, 0x73, 0x3b, 0x41,</div><div class='del'>-0x73, 0x69, 0x6e, 0x61, 0x73, 0x3b, 0x41, 0x6b, 0x72, 0x61, 0x73, 0x3b, 0x41, 0x6b, 0x77, 0x61, 0x73, 0x3b, 0x41, 0x73,</div><div class='del'>-0x69, 0x6d, 0x77, 0x61, 0x73, 0x3b, 0x41, 0x73, 0x69, 0x1e0d, 0x79, 0x61, 0x73, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b,</div><div class='del'>-0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x41, 0x74, 0x69, 0x3b, 0x41, 0x74, 0x61, 0x3b,</div><div class='del'>-0x41, 0x6c, 0x61, 0x3b, 0x41, 0x6c, 0x6d, 0x3b, 0x41, 0x6c, 0x7a, 0x3b, 0x41, 0x73, 0x69, 0x3b, 0x41, 0x6c, 0x68, 0x61,</div><div class='del'>-0x64, 0x69, 0x3b, 0x41, 0x74, 0x69, 0x6e, 0x6e, 0x69, 0x3b, 0x41, 0x74, 0x61, 0x6c, 0x61, 0x61, 0x74, 0x61, 0x3b, 0x41,</div><div class='del'>-0x6c, 0x61, 0x72, 0x62, 0x61, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x69, 0x73, 0x61, 0x3b, 0x41, 0x6c, 0x7a, 0x75,</div><div class='del'>-0x6d, 0x61, 0x3b, 0x41, 0x73, 0x69, 0x62, 0x74, 0x69, 0x3b, 0x4a, 0x70, 0x69, 0x3b, 0x4a, 0x74, 0x74, 0x3b, 0x4a, 0x6d,</div><div class='del'>-0x6e, 0x3b, 0x4a, 0x74, 0x6e, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x75, 0x3b, 0x4a, 0x6d, 0x6f, 0x3b, 0x4a, 0x75,</div><div class='del'>-0x6d, 0x61, 0x61, 0x70, 0x69, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d,</div><div class='del'>-0x61, 0x61, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d,</div><div class='del'>-0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x6d, 0x6f, 0x73, 0x69,</div><div class='del'>-0x3b</div><div class='add'>+0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x3b, 0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x41, 0x3b, 0x49,</div><div class='add'>+0x3b, 0x31, 0x3b, 0x73, 0xf6, 0x6e, 0x3b, 0x6d, 0xe5, 0x6e, 0x3b, 0x74, 0x69, 0x73, 0x3b, 0x6f, 0x6e, 0x73, 0x3b, 0x74,</div><div class='add'>+0x6f, 0x72, 0x73, 0x3b, 0x66, 0x72, 0x65, 0x3b, 0x6c, 0xf6, 0x72, 0x3b, 0x73, 0xf6, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x6d,</div><div class='add'>+0xe5, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x69, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x6f, 0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b,</div><div class='add'>+0x74, 0x6f, 0x72, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x66, 0x72, 0x65, 0x64, 0x61, 0x67, 0x3b, 0x6c, 0xf6, 0x72, 0x64, 0x61,</div><div class='add'>+0x67, 0x3b, 0x42f, 0x448, 0x431, 0x3b, 0x414, 0x448, 0x431, 0x3b, 0x421, 0x448, 0x431, 0x3b, 0x427, 0x448, 0x431, 0x3b, 0x41f, 0x448,</div><div class='add'>+0x431, 0x3b, 0x4b6, 0x43c, 0x44a, 0x3b, 0x428, 0x43d, 0x431, 0x3b, 0x42f, 0x43a, 0x448, 0x430, 0x43d, 0x431, 0x435, 0x3b, 0x414, 0x443,</div><div class='add'>+0x448, 0x430, 0x43d, 0x431, 0x435, 0x3b, 0x421, 0x435, 0x448, 0x430, 0x43d, 0x431, 0x435, 0x3b, 0x427, 0x43e, 0x440, 0x448, 0x430, 0x43d,</div><div class='add'>+0x431, 0x435, 0x3b, 0x41f, 0x430, 0x43d, 0x4b7, 0x448, 0x430, 0x43d, 0x431, 0x435, 0x3b, 0x4b6, 0x443, 0x43c, 0x44a, 0x430, 0x3b, 0x428,</div><div class='add'>+0x430, 0x43d, 0x431, 0x435, 0x3b, 0xb9e, 0xbbe, 0x3b, 0xba4, 0xbbf, 0x3b, 0xb9a, 0xbc6, 0x3b, 0xbaa, 0xbc1, 0x3b, 0xbb5, 0xbbf, 0x3b,</div><div class='add'>+0xbb5, 0xbc6, 0x3b, 0xb9a, 0x3b, 0xb9e, 0xbbe, 0xbaf, 0xbbf, 0xbb1, 0xbc1, 0x3b, 0xba4, 0xbbf, 0xb99, 0xbcd, 0xb95, 0xbb3, 0xbcd, 0x3b,</div><div class='add'>+0xb9a, 0xbc6, 0xbb5, 0xbcd, 0xbb5, 0xbbe, 0xbaf, 0xbcd, 0x3b, 0xbaa, 0xbc1, 0xba4, 0xba9, 0xbcd, 0x3b, 0xbb5, 0xbbf, 0xbaf, 0xbbe, 0xbb4,</div><div class='add'>+0xba9, 0xbcd, 0x3b, 0xbb5, 0xbc6, 0xbb3, 0xbcd, 0xbb3, 0xbbf, 0x3b, 0xb9a, 0xba9, 0xbbf, 0x3b, 0xc06, 0xc26, 0xc3f, 0x3b, 0xc38, 0xc4b,</div><div class='add'>+0xc2e, 0x3b, 0xc2e, 0xc02, 0xc17, 0xc33, 0x3b, 0xc2c, 0xc41, 0xc27, 0x3b, 0xc17, 0xc41, 0xc30, 0xc41, 0x3b, 0xc36, 0xc41, 0xc15, 0xc4d,</div><div class='add'>+0xc30, 0x3b, 0xc36, 0xc28, 0xc3f, 0x3b, 0xc06, 0xc26, 0xc3f, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc38, 0xc4b, 0xc2e, 0xc35, 0xc3e, 0xc30,</div><div class='add'>+0xc02, 0x3b, 0xc2e, 0xc02, 0xc17, 0xc33, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc2c, 0xc41, 0xc27, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc17,</div><div class='add'>+0xc41, 0xc30, 0xc41, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc36, 0xc41, 0xc15, 0xc4d, 0xc30, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc36, 0xc28,</div><div class='add'>+0xc3f, 0xc35, 0xc3e, 0xc30, 0xc02, 0x3b, 0xc06, 0x3b, 0xc38, 0xc4b, 0x3b, 0xc2e, 0x3b, 0xc2d, 0xc41, 0x3b, 0xc17, 0xc41, 0x3b, 0xc36,</div><div class='add'>+0xc41, 0x3b, 0xc36, 0x3b, 0xe2d, 0xe32, 0x2e, 0x3b, 0xe08, 0x2e, 0x3b, 0xe2d, 0x2e, 0x3b, 0xe1e, 0x2e, 0x3b, 0xe1e, 0xe24, 0x2e,</div><div class='add'>+0x3b, 0xe28, 0x2e, 0x3b, 0xe2a, 0x2e, 0x3b, 0xe27, 0xe31, 0xe19, 0xe2d, 0xe32, 0xe17, 0xe34, 0xe15, 0xe22, 0xe4c, 0x3b, 0xe27, 0xe31,</div><div class='add'>+0xe19, 0xe08, 0xe31, 0xe19, 0xe17, 0xe23, 0xe4c, 0x3b, 0xe27, 0xe31, 0xe19, 0xe2d, 0xe31, 0xe07, 0xe04, 0xe32, 0xe23, 0x3b, 0xe27, 0xe31,</div><div class='add'>+0xe19, 0xe1e, 0xe38, 0xe18, 0x3b, 0xe27, 0xe31, 0xe19, 0xe1e, 0xe24, 0xe2b, 0xe31, 0xe2a, 0xe1a, 0xe14, 0xe35, 0x3b, 0xe27, 0xe31, 0xe19,</div><div class='add'>+0xe28, 0xe38, 0xe01, 0xe23, 0xe4c, 0x3b, 0xe27, 0xe31, 0xe19, 0xe40, 0xe2a, 0xe32, 0xe23, 0xe4c, 0x3b, 0xe2d, 0x3b, 0xe08, 0x3b, 0xe2d,</div><div class='add'>+0x3b, 0xe1e, 0x3b, 0xe1e, 0x3b, 0xe28, 0x3b, 0xe2a, 0x3b, 0xf49, 0xf72, 0xf0b, 0xf58, 0xf0b, 0x3b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b,</div><div class='add'>+0x3b, 0xf58, 0xf72, 0xf42, 0xf0b, 0xf51, 0xf58, 0xf62, 0xf0b, 0x3b, 0xf67, 0xfb3, 0xf42, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf55, 0xf74, 0xf62,</div><div class='add'>+0xf0b, 0xf56, 0xf74, 0xf0b, 0x3b, 0xf66, 0xf44, 0xf66, 0xf0b, 0x3b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf42, 0xf5f,</div><div class='add'>+0xf60, 0xf0b, 0xf49, 0xf72, 0xf0b, 0xf58, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf5f, 0xfb3, 0xf0b, 0xf56, 0xf0b, 0x3b, 0xf42, 0xf5f,</div><div class='add'>+0xf60, 0xf0b, 0xf58, 0xf72, 0xf42, 0xf0b, 0xf51, 0xf58, 0xf62, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf67, 0xfb3, 0xf42, 0xf0b, 0xf54,</div><div class='add'>+0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf55, 0xf74, 0xf62, 0xf0b, 0xf56, 0xf74, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf66, 0xf44,</div><div class='add'>+0xf66, 0xf0b, 0x3b, 0xf42, 0xf5f, 0xf60, 0xf0b, 0xf66, 0xfa4, 0xf7a, 0xf53, 0xf0b, 0xf54, 0xf0b, 0x3b, 0xf49, 0xf72, 0x3b, 0xf5f, 0xfb3,</div><div class='add'>+0x3b, 0xf58, 0xf72, 0x3b, 0xf67, 0xfb3, 0x3b, 0xf55, 0xf74, 0x3b, 0xf66, 0x3b, 0xf66, 0xfa4, 0xf7a, 0x3b, 0x1230, 0x1295, 0x1260, 0x1275,</div><div class='add'>+0x3b, 0x1230, 0x1291, 0x12ed, 0x3b, 0x1230, 0x1209, 0x1235, 0x3b, 0x1228, 0x1261, 0x12d5, 0x3b, 0x1213, 0x1219, 0x1235, 0x3b, 0x12d3, 0x122d, 0x1262,</div><div class='add'>+0x3b, 0x1240, 0x12f3, 0x121d, 0x3b, 0x1230, 0x3b, 0x1230, 0x3b, 0x1220, 0x3b, 0x1228, 0x3b, 0x1283, 0x3b, 0x12d3, 0x3b, 0x1240, 0x3b, 0x1230,</div><div class='add'>+0x1295, 0x1260, 0x1275, 0x3b, 0x1230, 0x1291, 0x12ed, 0x3b, 0x1220, 0x1209, 0x1235, 0x3b, 0x1228, 0x1261, 0x12d5, 0x3b, 0x1283, 0x1219, 0x1235, 0x3b,</div><div class='add'>+0x12d3, 0x122d, 0x1262, 0x3b, 0x1240, 0x12f3, 0x121d, 0x3b, 0x53, 0x101, 0x70, 0x3b, 0x4d, 0x14d, 0x6e, 0x3b, 0x54, 0x16b, 0x73, 0x3b,</div><div class='add'>+0x50, 0x75, 0x6c, 0x3b, 0x54, 0x75, 0x2bb, 0x61, 0x3b, 0x46, 0x61, 0x6c, 0x3b, 0x54, 0x6f, 0x6b, 0x3b, 0x53, 0x101, 0x70,</div><div class='add'>+0x61, 0x74, 0x65, 0x3b, 0x4d, 0x14d, 0x6e, 0x69, 0x74, 0x65, 0x3b, 0x54, 0x16b, 0x73, 0x69, 0x74, 0x65, 0x3b, 0x50, 0x75,</div><div class='add'>+0x6c, 0x65, 0x6c, 0x75, 0x6c, 0x75, 0x3b, 0x54, 0x75, 0x2bb, 0x61, 0x70, 0x75, 0x6c, 0x65, 0x6c, 0x75, 0x6c, 0x75, 0x3b,</div><div class='add'>+0x46, 0x61, 0x6c, 0x61, 0x69, 0x74, 0x65, 0x3b, 0x54, 0x6f, 0x6b, 0x6f, 0x6e, 0x61, 0x6b, 0x69, 0x3b, 0x53, 0x3b, 0x4d,</div><div class='add'>+0x3b, 0x54, 0x3b, 0x50, 0x3b, 0x54, 0x3b, 0x46, 0x3b, 0x54, 0x3b, 0x53, 0x6f, 0x6e, 0x3b, 0x4d, 0x75, 0x73, 0x3b, 0x42,</div><div class='add'>+0x69, 0x72, 0x3b, 0x48, 0x61, 0x72, 0x3b, 0x4e, 0x65, 0x3b, 0x54, 0x6c, 0x68, 0x3b, 0x4d, 0x75, 0x67, 0x3b, 0x53, 0x6f,</div><div class='add'>+0x6e, 0x74, 0x6f, 0x3b, 0x4d, 0x75, 0x73, 0x75, 0x6d, 0x62, 0x68, 0x75, 0x6e, 0x75, 0x6b, 0x75, 0x3b, 0x52, 0x61, 0x76,</div><div class='add'>+0x75, 0x6d, 0x62, 0x69, 0x72, 0x68, 0x69, 0x3b, 0x52, 0x61, 0x76, 0x75, 0x6e, 0x68, 0x61, 0x72, 0x68, 0x75, 0x3b, 0x52,</div><div class='add'>+0x61, 0x76, 0x75, 0x6d, 0x75, 0x6e, 0x65, 0x3b, 0x52, 0x61, 0x76, 0x75, 0x6e, 0x74, 0x6c, 0x68, 0x61, 0x6e, 0x75, 0x3b,</div><div class='add'>+0x4d, 0x75, 0x67, 0x71, 0x69, 0x76, 0x65, 0x6c, 0x61, 0x3b, 0x50, 0x61, 0x7a, 0x3b, 0x50, 0x7a, 0x74, 0x3b, 0x53, 0x61,</div><div class='add'>+0x6c, 0x3b, 0xc7, 0x61, 0x72, 0x3b, 0x50, 0x65, 0x72, 0x3b, 0x43, 0x75, 0x6d, 0x3b, 0x43, 0x6d, 0x74, 0x3b, 0x50, 0x61,</div><div class='add'>+0x7a, 0x61, 0x72, 0x3b, 0x50, 0x61, 0x7a, 0x61, 0x72, 0x74, 0x65, 0x73, 0x69, 0x3b, 0x53, 0x61, 0x6c, 0x131, 0x3b, 0xc7,</div><div class='add'>+0x61, 0x72, 0x15f, 0x61, 0x6d, 0x62, 0x61, 0x3b, 0x50, 0x65, 0x72, 0x15f, 0x65, 0x6d, 0x62, 0x65, 0x3b, 0x43, 0x75, 0x6d,</div><div class='add'>+0x61, 0x3b, 0x43, 0x75, 0x6d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x69, 0x3b, 0x50, 0x3b, 0x50, 0x3b, 0x53, 0x3b, 0xc7, 0x3b,</div><div class='add'>+0x50, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x41d, 0x434, 0x3b, 0x41f, 0x43d, 0x3b, 0x412, 0x442, 0x3b, 0x421, 0x440, 0x3b, 0x427, 0x442,</div><div class='add'>+0x3b, 0x41f, 0x442, 0x3b, 0x421, 0x431, 0x3b, 0x41d, 0x435, 0x434, 0x456, 0x43b, 0x44f, 0x3b, 0x41f, 0x43e, 0x43d, 0x435, 0x434, 0x456,</div><div class='add'>+0x43b, 0x43e, 0x43a, 0x3b, 0x412, 0x456, 0x432, 0x442, 0x43e, 0x440, 0x43e, 0x43a, 0x3b, 0x421, 0x435, 0x440, 0x435, 0x434, 0x430, 0x3b,</div><div class='add'>+0x427, 0x435, 0x442, 0x432, 0x435, 0x440, 0x3b, 0x41f, 0x2bc, 0x44f, 0x442, 0x43d, 0x438, 0x446, 0x44f, 0x3b, 0x421, 0x443, 0x431, 0x43e,</div><div class='add'>+0x442, 0x430, 0x3b, 0x41d, 0x3b, 0x41f, 0x3b, 0x412, 0x3b, 0x421, 0x3b, 0x427, 0x3b, 0x41f, 0x3b, 0x421, 0x3b, 0x627, 0x62a, 0x648,</div><div class='add'>+0x627, 0x631, 0x3b, 0x67e, 0x64a, 0x631, 0x3b, 0x645, 0x646, 0x6af, 0x644, 0x3b, 0x628, 0x62f, 0x647, 0x3b, 0x62c, 0x645, 0x639, 0x631,</div><div class='add'>+0x627, 0x62a, 0x3b, 0x62c, 0x645, 0x639, 0x6c1, 0x3b, 0x6c1, 0x641, 0x62a, 0x6c1, 0x3b, 0x627, 0x3b, 0x67e, 0x3b, 0x645, 0x3b, 0x628,</div><div class='add'>+0x3b, 0x62c, 0x3b, 0x62c, 0x3b, 0x6c1, 0x3b, 0x42f, 0x43a, 0x448, 0x3b, 0x414, 0x443, 0x448, 0x3b, 0x421, 0x435, 0x448, 0x3b, 0x427,</div><div class='add'>+0x43e, 0x440, 0x3b, 0x41f, 0x430, 0x439, 0x3b, 0x416, 0x443, 0x43c, 0x3b, 0x428, 0x430, 0x43d, 0x3b, 0x44f, 0x43a, 0x448, 0x430, 0x43d,</div><div class='add'>+0x431, 0x430, 0x3b, 0x434, 0x443, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x441, 0x435, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x447,</div><div class='add'>+0x43e, 0x440, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x43f, 0x430, 0x439, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x436, 0x443, 0x43c,</div><div class='add'>+0x430, 0x3b, 0x448, 0x430, 0x43d, 0x431, 0x430, 0x3b, 0x42f, 0x3b, 0x414, 0x3b, 0x421, 0x3b, 0x427, 0x3b, 0x41f, 0x3b, 0x416, 0x3b,</div><div class='add'>+0x428, 0x3b, 0x6cc, 0x2e, 0x3b, 0x62f, 0x2e, 0x3b, 0x633, 0x2e, 0x3b, 0x686, 0x2e, 0x3b, 0x67e, 0x2e, 0x3b, 0x62c, 0x2e, 0x3b,</div><div class='add'>+0x634, 0x2e, 0x3b, 0x59, 0x61, 0x6b, 0x73, 0x68, 0x3b, 0x44, 0x75, 0x73, 0x68, 0x3b, 0x53, 0x65, 0x73, 0x68, 0x3b, 0x43,</div><div class='add'>+0x68, 0x6f, 0x72, 0x3b, 0x50, 0x61, 0x79, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x53, 0x68, 0x61, 0x6e, 0x3b, 0x79, 0x61, 0x6b,</div><div class='add'>+0x73, 0x68, 0x61, 0x6e, 0x62, 0x61, 0x3b, 0x64, 0x75, 0x73, 0x68, 0x61, 0x6e, 0x62, 0x61, 0x3b, 0x73, 0x65, 0x73, 0x68,</div><div class='add'>+0x61, 0x6e, 0x62, 0x61, 0x3b, 0x63, 0x68, 0x6f, 0x72, 0x73, 0x68, 0x61, 0x6e, 0x62, 0x61, 0x3b, 0x70, 0x61, 0x79, 0x73,</div><div class='add'>+0x68, 0x61, 0x6e, 0x62, 0x61, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x3b, 0x73, 0x68, 0x61, 0x6e, 0x62, 0x61, 0x3b, 0x59, 0x3b,</div><div class='add'>+0x44, 0x3b, 0x53, 0x3b, 0x43, 0x3b, 0x50, 0x3b, 0x4a, 0x3b, 0x53, 0x3b, 0x43, 0x4e, 0x3b, 0x54, 0x68, 0x20, 0x32, 0x3b,</div><div class='add'>+0x54, 0x68, 0x20, 0x33, 0x3b, 0x54, 0x68, 0x20, 0x34, 0x3b, 0x54, 0x68, 0x20, 0x35, 0x3b, 0x54, 0x68, 0x20, 0x36, 0x3b,</div><div class='add'>+0x54, 0x68, 0x20, 0x37, 0x3b, 0x43, 0x68, 0x1ee7, 0x20, 0x6e, 0x68, 0x1ead, 0x74, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x68, 0x61,</div><div class='add'>+0x69, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x62, 0x61, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x74, 0x1b0, 0x3b, 0x54, 0x68, 0x1ee9, 0x20,</div><div class='add'>+0x6e, 0x103, 0x6d, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x73, 0xe1, 0x75, 0x3b, 0x54, 0x68, 0x1ee9, 0x20, 0x62, 0x1ea3, 0x79, 0x3b,</div><div class='add'>+0x43, 0x4e, 0x3b, 0x54, 0x32, 0x3b, 0x54, 0x33, 0x3b, 0x54, 0x34, 0x3b, 0x54, 0x35, 0x3b, 0x54, 0x36, 0x3b, 0x54, 0x37,</div><div class='add'>+0x3b, 0x53, 0x75, 0x6c, 0x3b, 0x4c, 0x6c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x77, 0x3b, 0x4d, 0x65, 0x72, 0x3b, 0x49, 0x61,</div><div class='add'>+0x75, 0x3b, 0x47, 0x77, 0x65, 0x3b, 0x53, 0x61, 0x64, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x53, 0x75, 0x6c, 0x3b, 0x44,</div><div class='add'>+0x79, 0x64, 0x64, 0x20, 0x4c, 0x6c, 0x75, 0x6e, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x4d, 0x61, 0x77, 0x72, 0x74, 0x68,</div><div class='add'>+0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x4d, 0x65, 0x72, 0x63, 0x68, 0x65, 0x72, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x49,</div><div class='add'>+0x61, 0x75, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20, 0x47, 0x77, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x44, 0x79, 0x64, 0x64, 0x20,</div><div class='add'>+0x53, 0x61, 0x64, 0x77, 0x72, 0x6e, 0x3b, 0x53, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x49, 0x3b, 0x47, 0x3b, 0x53,</div><div class='add'>+0x3b, 0x53, 0x75, 0x6c, 0x3b, 0x4c, 0x6c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x77, 0x3b, 0x4d, 0x65, 0x72, 0x3b, 0x49, 0x61,</div><div class='add'>+0x75, 0x3b, 0x47, 0x77, 0x65, 0x6e, 0x3b, 0x53, 0x61, 0x64, 0x3b, 0x43, 0x61, 0x77, 0x3b, 0x4d, 0x76, 0x75, 0x3b, 0x42,</div><div class='add'>+0x69, 0x6e, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x53, 0x69, 0x6e, 0x3b, 0x48, 0x6c, 0x61, 0x3b, 0x4d, 0x67, 0x71, 0x3b, 0x43,</div><div class='add'>+0x61, 0x77, 0x65, 0x3b, 0x4d, 0x76, 0x75, 0x6c, 0x6f, 0x3b, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x62, 0x69, 0x6e, 0x69, 0x3b,</div><div class='add'>+0x4c, 0x77, 0x65, 0x73, 0x69, 0x74, 0x68, 0x61, 0x74, 0x68, 0x75, 0x3b, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x6e, 0x65, 0x3b,</div><div class='add'>+0x4c, 0x77, 0x65, 0x73, 0x69, 0x68, 0x6c, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x67, 0x71, 0x69, 0x62, 0x65, 0x6c, 0x6f, 0x3b,</div><div class='add'>+0xc0, 0xec, 0x6b, 0xfa, 0x3b, 0x41, 0x6a, 0xe9, 0x3b, 0xcc, 0x73, 0x1eb9, 0x301, 0x67, 0x75, 0x6e, 0x3b, 0x1ecc, 0x6a, 0x1ecd,</div><div class='add'>+0x301, 0x72, 0xfa, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x62, 0x1ecd, 0x3b, 0x1eb8, 0x74, 0xec, 0x3b, 0xc0, 0x62, 0xe1, 0x6d, 0x1eb9,</div><div class='add'>+0x301, 0x74, 0x61, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x20, 0xc0, 0xec, 0x6b, 0xfa, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x20, 0x41,</div><div class='add'>+0x6a, 0xe9, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x20, 0xcc, 0x73, 0x1eb9, 0x301, 0x67, 0x75, 0x6e, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301,</div><div class='add'>+0x72, 0xfa, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x62, 0x1ecd, 0x3b, 0x1ecc, 0x6a, 0x1ecd, 0x301, 0x20, 0x1eb8, 0x74, 0xec, 0x3b, 0x1ecc,</div><div class='add'>+0x6a, 0x1ecd, 0x301, 0x20, 0xc0, 0x62, 0xe1, 0x6d, 0x1eb9, 0x301, 0x74, 0x61, 0x3b, 0x53, 0x6f, 0x6e, 0x3b, 0x4d, 0x73, 0x6f,</div><div class='add'>+0x3b, 0x42, 0x69, 0x6c, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x53, 0x69, 0x6e, 0x3b, 0x48, 0x6c, 0x61, 0x3b, 0x4d, 0x67, 0x71,</div><div class='add'>+0x3b, 0x53, 0x6f, 0x6e, 0x74, 0x6f, 0x3b, 0x4d, 0x73, 0x6f, 0x6d, 0x62, 0x75, 0x6c, 0x75, 0x6b, 0x6f, 0x3b, 0x4c, 0x77,</div><div class='add'>+0x65, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x74, 0x68, 0x61, 0x74, 0x68, 0x75, 0x3b,</div><div class='add'>+0x75, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x6e, 0x65, 0x3b, 0x4c, 0x77, 0x65, 0x73, 0x69, 0x68, 0x6c, 0x61, 0x6e, 0x75, 0x3b,</div><div class='add'>+0x4d, 0x67, 0x71, 0x69, 0x62, 0x65, 0x6c, 0x6f, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x42, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x48,</div><div class='add'>+0x3b, 0x4d, 0x3b, 0x73, 0xf8, 0x2e, 0x3b, 0x6d, 0xe5, 0x2e, 0x3b, 0x74, 0x79, 0x2e, 0x3b, 0x6f, 0x6e, 0x2e, 0x3b, 0x74,</div><div class='add'>+0x6f, 0x2e, 0x3b, 0x66, 0x72, 0x2e, 0x3b, 0x6c, 0x61, 0x2e, 0x3b, 0x73, 0xf8, 0x6e, 0x64, 0x61, 0x67, 0x3b, 0x6d, 0xe5,</div><div class='add'>+0x6e, 0x64, 0x61, 0x67, 0x3b, 0x74, 0x79, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x6f, 0x6e, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x74,</div><div class='add'>+0x6f, 0x72, 0x73, 0x64, 0x61, 0x67, 0x3b, 0x66, 0x72, 0x65, 0x64, 0x61, 0x67, 0x3b, 0x6c, 0x61, 0x75, 0x72, 0x64, 0x61,</div><div class='add'>+0x67, 0x3b, 0x4e, 0x65, 0x64, 0x3b, 0x50, 0x6f, 0x6e, 0x3b, 0x55, 0x74, 0x6f, 0x3b, 0x53, 0x72, 0x69, 0x3b, 0x10c, 0x65,</div><div class='add'>+0x74, 0x3b, 0x50, 0x65, 0x74, 0x3b, 0x53, 0x75, 0x62, 0x3b, 0x4e, 0x65, 0x64, 0x6a, 0x65, 0x6c, 0x6a, 0x61, 0x3b, 0x50,</div><div class='add'>+0x6f, 0x6e, 0x65, 0x64, 0x6a, 0x65, 0x6c, 0x6a, 0x61, 0x6b, 0x3b, 0x55, 0x74, 0x6f, 0x72, 0x61, 0x6b, 0x3b, 0x53, 0x72,</div><div class='add'>+0x69, 0x6a, 0x65, 0x64, 0x61, 0x3b, 0x10c, 0x65, 0x74, 0x76, 0x72, 0x74, 0x61, 0x6b, 0x3b, 0x50, 0x65, 0x74, 0x61, 0x6b,</div><div class='add'>+0x3b, 0x53, 0x75, 0x62, 0x6f, 0x74, 0x61, 0x3b, 0x4a, 0x65, 0x64, 0x3b, 0x4a, 0x65, 0x6c, 0x3b, 0x4a, 0x65, 0x6d, 0x3b,</div><div class='add'>+0x4a, 0x65, 0x72, 0x63, 0x3b, 0x4a, 0x65, 0x72, 0x64, 0x3b, 0x4a, 0x65, 0x68, 0x3b, 0x4a, 0x65, 0x73, 0x3b, 0x4a, 0x65,</div><div class='add'>+0x64, 0x6f, 0x6f, 0x6e, 0x65, 0x65, 0x3b, 0x4a, 0x65, 0x6c, 0x68, 0x65, 0x69, 0x6e, 0x3b, 0x4a, 0x65, 0x6d, 0x61, 0x79,</div><div class='add'>+0x72, 0x74, 0x3b, 0x4a, 0x65, 0x72, 0x63, 0x65, 0x61, 0x6e, 0x3b, 0x4a, 0x65, 0x72, 0x64, 0x65, 0x69, 0x6e, 0x3b, 0x4a,</div><div class='add'>+0x65, 0x68, 0x65, 0x69, 0x6e, 0x65, 0x79, 0x3b, 0x4a, 0x65, 0x73, 0x61, 0x72, 0x6e, 0x3b, 0x53, 0x75, 0x6c, 0x3b, 0x4c,</div><div class='add'>+0x75, 0x6e, 0x3b, 0x4d, 0x74, 0x68, 0x3b, 0x4d, 0x68, 0x72, 0x3b, 0x59, 0x6f, 0x77, 0x3b, 0x47, 0x77, 0x65, 0x3b, 0x53,</div><div class='add'>+0x61, 0x64, 0x3b, 0x44, 0x65, 0x20, 0x53, 0x75, 0x6c, 0x3b, 0x44, 0x65, 0x20, 0x4c, 0x75, 0x6e, 0x3b, 0x44, 0x65, 0x20,</div><div class='add'>+0x4d, 0x65, 0x72, 0x74, 0x68, 0x3b, 0x44, 0x65, 0x20, 0x4d, 0x65, 0x72, 0x68, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x20, 0x59,</div><div class='add'>+0x6f, 0x77, 0x3b, 0x44, 0x65, 0x20, 0x47, 0x77, 0x65, 0x6e, 0x65, 0x72, 0x3b, 0x44, 0x65, 0x20, 0x53, 0x61, 0x64, 0x6f,</div><div class='add'>+0x72, 0x6e, 0x3b, 0x4b, 0x77, 0x65, 0x3b, 0x44, 0x77, 0x6f, 0x3b, 0x42, 0x65, 0x6e, 0x3b, 0x57, 0x75, 0x6b, 0x3b, 0x59,</div><div class='add'>+0x61, 0x77, 0x3b, 0x46, 0x69, 0x61, 0x3b, 0x4d, 0x65, 0x6d, 0x3b, 0x4b, 0x77, 0x65, 0x73, 0x69, 0x64, 0x61, 0x3b, 0x44,</div><div class='add'>+0x77, 0x6f, 0x77, 0x64, 0x61, 0x3b, 0x42, 0x65, 0x6e, 0x61, 0x64, 0x61, 0x3b, 0x57, 0x75, 0x6b, 0x75, 0x64, 0x61, 0x3b,</div><div class='add'>+0x59, 0x61, 0x77, 0x64, 0x61, 0x3b, 0x46, 0x69, 0x64, 0x61, 0x3b, 0x4d, 0x65, 0x6d, 0x65, 0x6e, 0x65, 0x64, 0x61, 0x3b,</div><div class='add'>+0x4b, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x57, 0x3b, 0x59, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x906, 0x926, 0x93f, 0x924, 0x94d, 0x92f,</div><div class='add'>+0x935, 0x93e, 0x930, 0x3b, 0x938, 0x94b, 0x92e, 0x935, 0x93e, 0x930, 0x3b, 0x92e, 0x902, 0x917, 0x933, 0x93e, 0x930, 0x3b, 0x92c, 0x941,</div><div class='add'>+0x927, 0x935, 0x93e, 0x930, 0x3b, 0x917, 0x941, 0x930, 0x941, 0x935, 0x93e, 0x930, 0x3b, 0x936, 0x941, 0x915, 0x94d, 0x930, 0x935, 0x93e,</div><div class='add'>+0x930, 0x3b, 0x936, 0x928, 0x93f, 0x935, 0x93e, 0x930, 0x3b, 0x48, 0x6f, 0x3b, 0x44, 0x7a, 0x75, 0x3b, 0x44, 0x7a, 0x66, 0x3b,</div><div class='add'>+0x53, 0x68, 0x6f, 0x3b, 0x53, 0x6f, 0x6f, 0x3b, 0x53, 0x6f, 0x68, 0x3b, 0x48, 0x6f, 0x3b, 0x48, 0x6f, 0x67, 0x62, 0x61,</div><div class='add'>+0x61, 0x3b, 0x44, 0x7a, 0x75, 0x3b, 0x44, 0x7a, 0x75, 0x66, 0x6f, 0x3b, 0x53, 0x68, 0x6f, 0x3b, 0x53, 0x6f, 0x6f, 0x3b,</div><div class='add'>+0x53, 0x6f, 0x68, 0x61, 0x61, 0x3b, 0x48, 0x6f, 0x3b, 0x1ee4, 0x6b, 0x61, 0x3b, 0x4d, 0x1ecd, 0x6e, 0x3b, 0x54, 0x69, 0x75,</div><div class='add'>+0x3b, 0x57, 0x65, 0x6e, 0x3b, 0x54, 0x1ecd, 0x1ecd, 0x3b, 0x46, 0x72, 0x61, 0x1ecb, 0x3b, 0x53, 0x61, 0x74, 0x3b, 0x4d, 0x62,</div><div class='add'>+0x1ecd, 0x73, 0x1ecb, 0x20, 0x1ee4, 0x6b, 0x61, 0x3b, 0x4d, 0x1ecd, 0x6e, 0x64, 0x65, 0x3b, 0x54, 0x69, 0x75, 0x7a, 0x64, 0x65,</div><div class='add'>+0x65, 0x3b, 0x57, 0x65, 0x6e, 0x65, 0x7a, 0x64, 0x65, 0x65, 0x3b, 0x54, 0x1ecd, 0x1ecd, 0x7a, 0x64, 0x65, 0x65, 0x3b, 0x46,</div><div class='add'>+0x72, 0x61, 0x1ecb, 0x64, 0x65, 0x65, 0x3b, 0x53, 0x61, 0x74, 0x1ecd, 0x64, 0x65, 0x65, 0x3b, 0x57, 0x6b, 0x79, 0x3b, 0x57,</div><div class='add'>+0x6b, 0x77, 0x3b, 0x57, 0x6b, 0x6c, 0x3b, 0x57, 0x74, 0x169, 0x3b, 0x57, 0x6b, 0x6e, 0x3b, 0x57, 0x74, 0x6e, 0x3b, 0x57,</div><div class='add'>+0x74, 0x68, 0x3b, 0x57, 0x61, 0x20, 0x6b, 0x79, 0x75, 0x6d, 0x77, 0x61, 0x3b, 0x57, 0x61, 0x20, 0x6b, 0x77, 0x61, 0x6d,</div><div class='add'>+0x62, 0x129, 0x6c, 0x129, 0x6c, 0x79, 0x61, 0x3b, 0x57, 0x61, 0x20, 0x6b, 0x65, 0x6c, 0x129, 0x3b, 0x57, 0x61, 0x20, 0x6b,</div><div class='add'>+0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x57, 0x61, 0x20, 0x6b, 0x61, 0x6e, 0x61, 0x3b, 0x57, 0x61, 0x20, 0x6b, 0x61, 0x74,</div><div class='add'>+0x61, 0x6e, 0x6f, 0x3b, 0x57, 0x61, 0x20, 0x74, 0x68, 0x61, 0x6e, 0x74, 0x68, 0x61, 0x74, 0x169, 0x3b, 0x59, 0x3b, 0x57,</div><div class='add'>+0x3b, 0x45, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x1230, 0x2f, 0x1245, 0x3b, 0x1230, 0x1291, 0x3b, 0x1230, 0x120a,</div><div class='add'>+0x131d, 0x3b, 0x1208, 0x1313, 0x3b, 0x12a3, 0x121d, 0x12f5, 0x3b, 0x12a3, 0x122d, 0x1265, 0x3b, 0x1230, 0x2f, 0x123d, 0x3b, 0x1230, 0x1295, 0x1260,</div><div class='add'>+0x122d, 0x20, 0x1245, 0x12f3, 0x12c5, 0x3b, 0x1230, 0x1291, 0x3b, 0x1230, 0x120a, 0x131d, 0x3b, 0x1208, 0x1313, 0x20, 0x12c8, 0x122a, 0x20, 0x1208,</div><div class='add'>+0x1265, 0x12cb, 0x3b, 0x12a3, 0x121d, 0x12f5, 0x3b, 0x12a3, 0x122d, 0x1265, 0x3b, 0x1230, 0x1295, 0x1260, 0x122d, 0x20, 0x123d, 0x1313, 0x12c5, 0x3b,</div><div class='add'>+0x1230, 0x3b, 0x1230, 0x3b, 0x1230, 0x3b, 0x1208, 0x3b, 0x12a3, 0x3b, 0x12a3, 0x3b, 0x1230, 0x3b, 0x12a5, 0x1281, 0x12f5, 0x3b, 0x1230, 0x1291,</div><div class='add'>+0x12ed, 0x3b, 0x1220, 0x1209, 0x1235, 0x3b, 0x122b, 0x1265, 0x12d5, 0x3b, 0x1210, 0x1219, 0x1235, 0x3b, 0x12d3, 0x122d, 0x1260, 0x3b, 0x1240, 0x12f3,</div><div class='add'>+0x121a, 0x1275, 0x3b, 0x12a5, 0x3b, 0x1230, 0x3b, 0x1220, 0x3b, 0x122b, 0x3b, 0x1210, 0x3b, 0x12d3, 0x3b, 0x1240, 0x3b, 0x4c, 0x61, 0x68,</div><div class='add'>+0x3b, 0x4b, 0x75, 0x62, 0x3b, 0x47, 0x62, 0x61, 0x3b, 0x54, 0x61, 0x6e, 0x3b, 0x59, 0x65, 0x69, 0x3b, 0x4b, 0x6f, 0x79,</div><div class='add'>+0x3b, 0x53, 0x61, 0x74, 0x3b, 0x4c, 0x61, 0x68, 0x61, 0x64, 0x69, 0x3b, 0x4a, 0x65, 0x2d, 0x4b, 0x75, 0x62, 0x61, 0x63,</div><div class='add'>+0x68, 0x61, 0x3b, 0x4a, 0x65, 0x2d, 0x47, 0x62, 0x61, 0x69, 0x3b, 0x54, 0x61, 0x6e, 0x73, 0x61, 0x74, 0x69, 0x3b, 0x4a,</div><div class='add'>+0x65, 0x2d, 0x59, 0x65, 0x69, 0x3b, 0x4a, 0x65, 0x2d, 0x4b, 0x6f, 0x79, 0x65, 0x3b, 0x53, 0x61, 0x74, 0x69, 0x3b, 0x53,</div><div class='add'>+0x61, 0x6d, 0x3b, 0x53, 0x61, 0x6e, 0x3b, 0x4d, 0x61, 0x6b, 0x3b, 0x52, 0x6f, 0x77, 0x3b, 0x48, 0x61, 0x6d, 0x3b, 0x41,</div><div class='add'>+0x72, 0x62, 0x3b, 0x51, 0x69, 0x64, 0x3b, 0x53, 0x61, 0x6d, 0x62, 0x61, 0x74, 0x61, 0x3b, 0x53, 0x61, 0x6e, 0x79, 0x6f,</div><div class='add'>+0x3b, 0x4d, 0x61, 0x61, 0x6b, 0x69, 0x73, 0x61, 0x6e, 0x79, 0x6f, 0x3b, 0x52, 0x6f, 0x6f, 0x77, 0x65, 0x3b, 0x48, 0x61,</div><div class='add'>+0x6d, 0x75, 0x73, 0x65, 0x3b, 0x41, 0x72, 0x62, 0x65, 0x3b, 0x51, 0x69, 0x64, 0x61, 0x61, 0x6d, 0x65, 0x3b, 0x53, 0x3b,</div><div class='add'>+0x53, 0x3b, 0x4d, 0x3b, 0x52, 0x3b, 0x48, 0x3b, 0x41, 0x3b, 0x51, 0x3b, 0x59, 0x6f, 0x6b, 0x3b, 0x54, 0x75, 0x6e, 0x67,</div><div class='add'>+0x3b, 0x54, 0x2e, 0x20, 0x54, 0x75, 0x6e, 0x67, 0x3b, 0x54, 0x73, 0x61, 0x6e, 0x3b, 0x4e, 0x61, 0x73, 0x3b, 0x4e, 0x61,</div><div class='add'>+0x74, 0x3b, 0x43, 0x68, 0x69, 0x72, 0x3b, 0x57, 0x61, 0x69, 0x20, 0x59, 0x6f, 0x6b, 0x61, 0x20, 0x42, 0x61, 0x77, 0x61,</div><div class='add'>+0x69, 0x3b, 0x57, 0x61, 0x69, 0x20, 0x54, 0x75, 0x6e, 0x67, 0x61, 0x3b, 0x54, 0x6f, 0x6b, 0x69, 0x20, 0x47, 0x69, 0x74,</div><div class='add'>+0x75, 0x6e, 0x67, 0x3b, 0x54, 0x73, 0x61, 0x6d, 0x20, 0x4b, 0x61, 0x73, 0x75, 0x77, 0x61, 0x3b, 0x57, 0x61, 0x69, 0x20,</div><div class='add'>+0x4e, 0x61, 0x20, 0x4e, 0x61, 0x73, 0x3b, 0x57, 0x61, 0x69, 0x20, 0x4e, 0x61, 0x20, 0x54, 0x69, 0x79, 0x6f, 0x6e, 0x3b,</div><div class='add'>+0x57, 0x61, 0x69, 0x20, 0x4e, 0x61, 0x20, 0x43, 0x68, 0x69, 0x72, 0x69, 0x6d, 0x3b, 0x1230, 0x2f, 0x12d3, 0x3b, 0x1230, 0x1296,</div><div class='add'>+0x3b, 0x1273, 0x120b, 0x1238, 0x3b, 0x12a3, 0x1228, 0x122d, 0x3b, 0x12a8, 0x121a, 0x123d, 0x3b, 0x1305, 0x121d, 0x12d3, 0x3b, 0x1230, 0x2f, 0x1295,</div><div class='add'>+0x3b, 0x1230, 0x1295, 0x1260, 0x1275, 0x20, 0x12d3, 0x1263, 0x12ed, 0x3b, 0x1230, 0x1296, 0x3b, 0x1273, 0x120b, 0x1238, 0x1296, 0x3b, 0x12a3, 0x1228,</div><div class='add'>+0x122d, 0x1263, 0x12d3, 0x3b, 0x12a8, 0x121a, 0x123d, 0x3b, 0x1305, 0x121d, 0x12d3, 0x1275, 0x3b, 0x1230, 0x1295, 0x1260, 0x1275, 0x20, 0x1295, 0x12a2,</div><div class='add'>+0x123d, 0x3b, 0x1230, 0x3b, 0x1230, 0x3b, 0x1273, 0x3b, 0x12a3, 0x3b, 0x12a8, 0x3b, 0x1305, 0x3b, 0x1230, 0x3b, 0x4c, 0x61, 0x64, 0x3b,</div><div class='add'>+0x4c, 0x69, 0x6e, 0x3b, 0x54, 0x61, 0x6c, 0x3b, 0x4c, 0x61, 0x72, 0x3b, 0x4c, 0x61, 0x6d, 0x3b, 0x4a, 0x75, 0x6d, 0x3b,</div><div class='add'>+0x41, 0x73, 0x61, 0x3b, 0x4c, 0x61, 0x64, 0x69, 0x3b, 0x4c, 0x69, 0x6e, 0x74, 0x61, 0x6e, 0x69, 0x3b, 0x54, 0x61, 0x6c,</div><div class='add'>+0x61, 0x74, 0x61, 0x3b, 0x4c, 0x61, 0x72, 0x62, 0x61, 0x3b, 0x4c, 0x61, 0x6d, 0x69, 0x74, 0x3b, 0x4a, 0x75, 0x6d, 0x61,</div><div class='add'>+0x3b, 0x41, 0x73, 0x61, 0x62, 0x61, 0x72, 0x3b, 0x64, 0x6f, 0x6d, 0x3b, 0x6c, 0x75, 0x6e, 0x3b, 0x6d, 0x61, 0x72, 0x3b,</div><div class='add'>+0x6d, 0x69, 0x65, 0x3b, 0x6a, 0x6f, 0x69, 0x3b, 0x76, 0x69, 0x6e, 0x3b, 0x73, 0x61, 0x62, 0x3b, 0x64, 0x6f, 0x6d, 0x65,</div><div class='add'>+0x6e, 0x69, 0x65, 0x3b, 0x6c, 0x75, 0x6e, 0x69, 0x73, 0x3b, 0x6d, 0x61, 0x72, 0x74, 0x61, 0x72, 0x73, 0x3b, 0x6d, 0x69,</div><div class='add'>+0x65, 0x72, 0x63, 0x75, 0x73, 0x3b, 0x6a, 0x6f, 0x69, 0x62, 0x65, 0x3b, 0x76, 0x69, 0x6e, 0x61, 0x72, 0x73, 0x3b, 0x73,</div><div class='add'>+0x61, 0x62, 0x69, 0x64, 0x65, 0x3b, 0x53, 0x77, 0x6f, 0x3b, 0x4d, 0x75, 0x73, 0x3b, 0x56, 0x68, 0x69, 0x3b, 0x52, 0x61,</div><div class='add'>+0x72, 0x3b, 0x1e4a, 0x61, 0x3b, 0x1e70, 0x61, 0x6e, 0x3b, 0x4d, 0x75, 0x67, 0x3b, 0x53, 0x77, 0x6f, 0x6e, 0x64, 0x61, 0x68,</div><div class='add'>+0x61, 0x3b, 0x4d, 0x75, 0x73, 0x75, 0x6d, 0x62, 0x75, 0x6c, 0x75, 0x77, 0x6f, 0x3b, 0x1e3c, 0x61, 0x76, 0x68, 0x75, 0x76,</div><div class='add'>+0x68, 0x69, 0x6c, 0x69, 0x3b, 0x1e3c, 0x61, 0x76, 0x68, 0x75, 0x72, 0x61, 0x72, 0x75, 0x3b, 0x1e3c, 0x61, 0x76, 0x68, 0x75,</div><div class='add'>+0x1e4b, 0x61, 0x3b, 0x1e3c, 0x61, 0x76, 0x68, 0x75, 0x1e71, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x75, 0x67, 0x69, 0x76, 0x68, 0x65,</div><div class='add'>+0x6c, 0x61, 0x3b, 0x4b, 0x254, 0x73, 0x20, 0x4b, 0x77, 0x65, 0x3b, 0x44, 0x7a, 0x6f, 0x3b, 0x42, 0x72, 0x61, 0x3b, 0x4b,</div><div class='add'>+0x75, 0x256, 0x3b, 0x59, 0x61, 0x77, 0x3b, 0x46, 0x69, 0x256, 0x3b, 0x4d, 0x65, 0x6d, 0x3b, 0x4b, 0x254, 0x73, 0x69, 0x256,</div><div class='add'>+0x61, 0x3b, 0x44, 0x7a, 0x6f, 0x256, 0x61, 0x3b, 0x42, 0x72, 0x61, 0x256, 0x61, 0x3b, 0x4b, 0x75, 0x256, 0x61, 0x3b, 0x59,</div><div class='add'>+0x61, 0x77, 0x6f, 0x256, 0x61, 0x3b, 0x46, 0x69, 0x256, 0x61, 0x3b, 0x4d, 0x65, 0x6d, 0x6c, 0x65, 0x256, 0x61, 0x3b, 0x4b,</div><div class='add'>+0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x4b, 0x3b, 0x59, 0x3b, 0x46, 0x3b, 0x4d, 0x3b, 0x12c8, 0x130b, 0x3b, 0x1233, 0x12ed, 0x1296, 0x3b,</div><div class='add'>+0x121b, 0x1246, 0x1233, 0x129b, 0x3b, 0x12a0, 0x1229, 0x12cb, 0x3b, 0x1203, 0x1219, 0x1233, 0x3b, 0x12a0, 0x122d, 0x1263, 0x3b, 0x1244, 0x122b, 0x3b,</div><div class='add'>+0x12c8, 0x3b, 0x1233, 0x3b, 0x121b, 0x3b, 0x12a0, 0x3b, 0x1203, 0x3b, 0x12a0, 0x3b, 0x1244, 0x3b, 0x4c, 0x50, 0x3b, 0x50, 0x31, 0x3b,</div><div class='add'>+0x50, 0x32, 0x3b, 0x50, 0x33, 0x3b, 0x50, 0x34, 0x3b, 0x50, 0x35, 0x3b, 0x50, 0x36, 0x3b, 0x4c, 0x101, 0x70, 0x75, 0x6c,</div><div class='add'>+0x65, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x6b, 0x61, 0x68, 0x69, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x6c, 0x75, 0x61, 0x3b, 0x50,</div><div class='add'>+0x6f, 0x2bb, 0x61, 0x6b, 0x6f, 0x6c, 0x75, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x68, 0x101, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x6c,</div><div class='add'>+0x69, 0x6d, 0x61, 0x3b, 0x50, 0x6f, 0x2bb, 0x61, 0x6f, 0x6e, 0x6f, 0x3b, 0x4c, 0x61, 0x64, 0x3b, 0x54, 0x61, 0x6e, 0x3b,</div><div class='add'>+0x54, 0x61, 0x6c, 0x3b, 0x4c, 0x61, 0x72, 0x3b, 0x4c, 0x61, 0x6d, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x41, 0x73, 0x61, 0x3b,</div><div class='add'>+0x4c, 0x61, 0x64, 0x69, 0x3b, 0x54, 0x61, 0x6e, 0x69, 0x69, 0x3b, 0x54, 0x61, 0x6c, 0x61, 0x74, 0x61, 0x3b, 0x4c, 0x61,</div><div class='add'>+0x72, 0x62, 0x61, 0x3b, 0x4c, 0x61, 0x6d, 0x69, 0x74, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x3b, 0x41, 0x73, 0x61, 0x62, 0x61,</div><div class='add'>+0x74, 0x3b, 0x4d, 0x75, 0x6c, 0x3b, 0x4c, 0x65, 0x6d, 0x3b, 0x57, 0x69, 0x72, 0x3b, 0x54, 0x61, 0x74, 0x3b, 0x4e, 0x61,</div><div class='add'>+0x69, 0x3b, 0x53, 0x61, 0x6e, 0x3b, 0x57, 0x65, 0x72, 0x3b, 0x4c, 0x61, 0x6d, 0x75, 0x6c, 0x75, 0x6e, 0x67, 0x75, 0x3b,</div><div class='add'>+0x4c, 0x6f, 0x6c, 0x65, 0x6d, 0x62, 0x61, 0x3b, 0x4c, 0x61, 0x63, 0x68, 0x69, 0x77, 0x69, 0x72, 0x69, 0x3b, 0x4c, 0x61,</div><div class='add'>+0x63, 0x68, 0x69, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4c, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x61, 0x79, 0x69, 0x3b, 0x4c, 0x61,</div><div class='add'>+0x63, 0x68, 0x69, 0x73, 0x61, 0x6e, 0x75, 0x3b, 0x4c, 0x6f, 0x77, 0x65, 0x72, 0x75, 0x6b, 0x61, 0x3b, 0x4c, 0x69, 0x6e,</div><div class='add'>+0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0x69, 0x79, 0x3b, 0x48, 0x75, 0x77, 0x3b, 0x42, 0x69, 0x79,</div><div class='add'>+0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4c, 0x69, 0x6e, 0x67, 0x67, 0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x65, 0x73, 0x3b, 0x4d, 0x61,</div><div class='add'>+0x72, 0x74, 0x65, 0x73, 0x3b, 0x4d, 0x69, 0x79, 0x65, 0x72, 0x6b, 0x75, 0x6c, 0x65, 0x73, 0x3b, 0x48, 0x75, 0x77, 0x65,</div><div class='add'>+0x62, 0x65, 0x73, 0x3b, 0x42, 0x69, 0x79, 0x65, 0x72, 0x6e, 0x65, 0x73, 0x3b, 0x53, 0x61, 0x62, 0x61, 0x64, 0x6f, 0x3b,</div><div class='add'>+0x4c, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x42, 0x3b, 0x53, 0x3b, 0x4c, 0x69, 0x6e, 0x3b, 0x4c, 0x75,</div><div class='add'>+0x6e, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x4d, 0x79, 0x65, 0x3b, 0x48, 0x75, 0x77, 0x3b, 0x42, 0x79, 0x65, 0x3b, 0x53, 0x61,</div><div class='add'>+0x62, 0x3b, 0x53, 0x75, 0x2e, 0x3b, 0x4d, 0xe4, 0x2e, 0x3b, 0x5a, 0x69, 0x2e, 0x3b, 0x4d, 0x69, 0x2e, 0x3b, 0x44, 0x75,</div><div class='add'>+0x2e, 0x3b, 0x46, 0x72, 0x2e, 0x3b, 0x53, 0x61, 0x2e, 0x3b, 0x53, 0x75, 0x6e, 0x6e, 0x74, 0x69, 0x67, 0x3b, 0x4d, 0xe4,</div><div class='add'>+0xe4, 0x6e, 0x74, 0x69, 0x67, 0x3b, 0x5a, 0x69, 0x69, 0x73, 0x63, 0x68, 0x74, 0x69, 0x67, 0x3b, 0x4d, 0x69, 0x74, 0x74,</div><div class='add'>+0x77, 0x75, 0x63, 0x68, 0x3b, 0x44, 0x75, 0x6e, 0x73, 0x63, 0x68, 0x74, 0x69, 0x67, 0x3b, 0x46, 0x72, 0x69, 0x69, 0x74,</div><div class='add'>+0x69, 0x67, 0x3b, 0x53, 0x61, 0x6d, 0x73, 0x63, 0x68, 0x74, 0x69, 0x67, 0x3b, 0xa18f, 0xa44d, 0x3b, 0xa18f, 0xa2cd, 0x3b, 0xa18f,</div><div class='add'>+0xa44d, 0x3b, 0xa18f, 0xa315, 0x3b, 0xa18f, 0xa1d6, 0x3b, 0xa18f, 0xa26c, 0x3b, 0xa18f, 0xa0d8, 0x3b, 0xa46d, 0xa18f, 0xa44d, 0x3b, 0xa18f, 0xa282,</div><div class='add'>+0xa2cd, 0x3b, 0xa18f, 0xa282, 0xa44d, 0x3b, 0xa18f, 0xa282, 0xa315, 0x3b, 0xa18f, 0xa282, 0xa1d6, 0x3b, 0xa18f, 0xa282, 0xa26c, 0x3b, 0xa18f, 0xa282,</div><div class='add'>+0xa0d8, 0x3b, 0xa18f, 0x3b, 0xa2cd, 0x3b, 0xa44d, 0x3b, 0xa315, 0x3b, 0xa1d6, 0x3b, 0xa26c, 0x3b, 0xa0d8, 0x3b, 0x53, 0x6f, 0x6e, 0x3b,</div><div class='add'>+0x4d, 0x76, 0x75, 0x3b, 0x42, 0x69, 0x6c, 0x3b, 0x54, 0x68, 0x61, 0x3b, 0x4e, 0x65, 0x3b, 0x48, 0x6c, 0x61, 0x3b, 0x47,</div><div class='add'>+0x71, 0x69, 0x3b, 0x75, 0x53, 0x6f, 0x6e, 0x74, 0x6f, 0x3b, 0x75, 0x4d, 0x76, 0x75, 0x6c, 0x6f, 0x3b, 0x75, 0x4c, 0x65,</div><div class='add'>+0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4c, 0x65, 0x73, 0x69, 0x74, 0x68, 0x61, 0x74, 0x68, 0x75, 0x3b, 0x75, 0x4c,</div><div class='add'>+0x65, 0x73, 0x69, 0x6e, 0x65, 0x3b, 0x6e, 0x67, 0x6f, 0x4c, 0x65, 0x73, 0x69, 0x68, 0x6c, 0x61, 0x6e, 0x75, 0x3b, 0x75,</div><div class='add'>+0x6d, 0x47, 0x71, 0x69, 0x62, 0x65, 0x6c, 0x6f, 0x3b, 0x53, 0x6f, 0x6e, 0x3b, 0x4d, 0x6f, 0x73, 0x3b, 0x42, 0x65, 0x64,</div><div class='add'>+0x3b, 0x52, 0x61, 0x72, 0x3b, 0x4e, 0x65, 0x3b, 0x48, 0x6c, 0x61, 0x3b, 0x4d, 0x6f, 0x6b, 0x3b, 0x53, 0x6f, 0x6e, 0x74,</div><div class='add'>+0x61, 0x67, 0x61, 0x3b, 0x4d, 0x6f, 0x73, 0x75, 0x70, 0x61, 0x6c, 0x6f, 0x67, 0x6f, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x62,</div><div class='add'>+0x65, 0x64, 0x69, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x72, 0x61, 0x72, 0x6f, 0x3b, 0x4c, 0x61, 0x62, 0x6f, 0x6e, 0x65, 0x3b,</div><div class='add'>+0x4c, 0x61, 0x62, 0x6f, 0x68, 0x6c, 0x61, 0x6e, 0x6f, 0x3b, 0x4d, 0x6f, 0x6b, 0x69, 0x62, 0x65, 0x6c, 0x6f, 0x3b, 0x73,</div><div class='add'>+0x6f, 0x74, 0x6e, 0x3b, 0x76, 0x75, 0x6f, 0x73, 0x3b, 0x6d, 0x61, 0x14b, 0x3b, 0x67, 0x61, 0x73, 0x6b, 0x3b, 0x64, 0x75,</div><div class='add'>+0x6f, 0x72, 0x3b, 0x62, 0x65, 0x61, 0x72, 0x3b, 0x6c, 0xe1, 0x76, 0x3b, 0x61, 0x65, 0x6a, 0x6c, 0x65, 0x67, 0x65, 0x3b,</div><div class='add'>+0x6d, 0xe5, 0x61, 0x6e, 0x74, 0x61, 0x3b, 0x64, 0xe4, 0x6a, 0x73, 0x74, 0x61, 0x3b, 0x67, 0x61, 0x73, 0x6b, 0x65, 0x76,</div><div class='add'>+0x61, 0x68, 0x6b, 0x6f, 0x65, 0x3b, 0x64, 0xe5, 0x61, 0x72, 0x73, 0x74, 0x61, 0x3b, 0x62, 0x65, 0x61, 0x72, 0x6a, 0x61,</div><div class='add'>+0x64, 0x61, 0x68, 0x6b, 0x65, 0x3b, 0x6c, 0x61, 0x61, 0x76, 0x61, 0x64, 0x61, 0x68, 0x6b, 0x65, 0x3b, 0x53, 0x3b, 0x4d,</div><div class='add'>+0x3b, 0x44, 0x3b, 0x47, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x4c, 0x3b, 0x73, 0x6f, 0x74, 0x6e, 0x61, 0x62, 0x65, 0x61, 0x69,</div><div class='add'>+0x76, 0x69, 0x3b, 0x76, 0x75, 0x6f, 0x73, 0x73, 0xe1, 0x72, 0x67, 0x61, 0x3b, 0x6d, 0x61, 0x14b, 0x14b, 0x65, 0x62, 0xe1,</div><div class='add'>+0x72, 0x67, 0x61, 0x3b, 0x67, 0x61, 0x73, 0x6b, 0x61, 0x76, 0x61, 0x68, 0x6b, 0x6b, 0x75, 0x3b, 0x64, 0x75, 0x6f, 0x72,</div><div class='add'>+0x61, 0x73, 0x64, 0x61, 0x74, 0x3b, 0x62, 0x65, 0x61, 0x72, 0x6a, 0x61, 0x64, 0x61, 0x74, 0x3b, 0x6c, 0xe1, 0x76, 0x76,</div><div class='add'>+0x61, 0x72, 0x64, 0x61, 0x74, 0x3b, 0x53, 0x3b, 0x56, 0x3b, 0x4d, 0x3b, 0x47, 0x3b, 0x44, 0x3b, 0x42, 0x3b, 0x4c, 0x3b,</div><div class='add'>+0x45, 0x6d, 0x70, 0x3b, 0x4b, 0x69, 0x6e, 0x3b, 0x44, 0x68, 0x61, 0x3b, 0x54, 0x72, 0x75, 0x3b, 0x53, 0x70, 0x61, 0x3b,</div><div class='add'>+0x52, 0x69, 0x6d, 0x3b, 0x4d, 0x61, 0x74, 0x3b, 0x4a, 0x69, 0x79, 0x61, 0x78, 0x20, 0x73, 0x6e, 0x67, 0x61, 0x79, 0x61,</div><div class='add'>+0x6e, 0x3b, 0x74, 0x67, 0x4b, 0x69, 0x6e, 0x67, 0x61, 0x6c, 0x20, 0x6a, 0x69, 0x79, 0x61, 0x78, 0x20, 0x69, 0x79, 0x61,</div><div class='add'>+0x78, 0x20, 0x73, 0x6e, 0x67, 0x61, 0x79, 0x61, 0x6e, 0x3b, 0x74, 0x67, 0x44, 0x68, 0x61, 0x20, 0x6a, 0x69, 0x79, 0x61,</div><div class='add'>+0x78, 0x20, 0x69, 0x79, 0x61, 0x78, 0x20, 0x73, 0x6e, 0x67, 0x61, 0x79, 0x61, 0x6e, 0x3b, 0x74, 0x67, 0x54, 0x72, 0x75,</div><div class='add'>+0x20, 0x6a, 0x69, 0x79, 0x61, 0x78, 0x20, 0x69, 0x79, 0x61, 0x78, 0x20, 0x73, 0x6e, 0x67, 0x61, 0x79, 0x61, 0x6e, 0x3b,</div><div class='add'>+0x74, 0x67, 0x53, 0x70, 0x61, 0x63, 0x20, 0x6a, 0x69, 0x79, 0x61, 0x78, 0x20, 0x69, 0x79, 0x61, 0x78, 0x20, 0x73, 0x6e,</div><div class='add'>+0x67, 0x61, 0x79, 0x61, 0x6e, 0x3b, 0x74, 0x67, 0x52, 0x69, 0x6d, 0x61, 0x20, 0x6a, 0x69, 0x79, 0x61, 0x78, 0x20, 0x69,</div><div class='add'>+0x79, 0x61, 0x78, 0x20, 0x73, 0x6e, 0x67, 0x61, 0x79, 0x61, 0x6e, 0x3b, 0x74, 0x67, 0x4d, 0x61, 0x74, 0x61, 0x72, 0x75,</div><div class='add'>+0x20, 0x6a, 0x69, 0x79, 0x61, 0x78, 0x20, 0x69, 0x79, 0x61, 0x78, 0x20, 0x73, 0x6e, 0x67, 0x61, 0x79, 0x61, 0x6e, 0x3b,</div><div class='add'>+0x45, 0x3b, 0x4b, 0x3b, 0x44, 0x3b, 0x54, 0x3b, 0x53, 0x3b, 0x52, 0x3b, 0x4d, 0x3b, 0x43, 0x70, 0x72, 0x3b, 0x43, 0x74,</div><div class='add'>+0x74, 0x3b, 0x43, 0x6d, 0x6e, 0x3b, 0x43, 0x6d, 0x74, 0x3b, 0x41, 0x72, 0x73, 0x3b, 0x49, 0x63, 0x6d, 0x3b, 0x45, 0x73,</div><div class='add'>+0x74, 0x3b, 0x43, 0x68, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x72, 0x69, 0x3b, 0x43, 0x68, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74,</div><div class='add'>+0x6f, 0x3b, 0x43, 0x68, 0x75, 0x6d, 0x61, 0x69, 0x6e, 0x65, 0x3b, 0x43, 0x68, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x6f,</div><div class='add'>+0x3b, 0x41, 0x72, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x63, 0x68, 0x75, 0x6d, 0x61, 0x3b, 0x45, 0x73, 0x61, 0x62,</div><div class='add'>+0x61, 0x74, 0x6f, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x43, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x45, 0x3b, 0x4a, 0x75,</div><div class='add'>+0x6d, 0x3b, 0x4a, 0x69, 0x6d, 0x3b, 0x4b, 0x61, 0x77, 0x3b, 0x4b, 0x61, 0x64, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x4b, 0x61,</div><div class='add'>+0x73, 0x3b, 0x4e, 0x67, 0x75, 0x3b, 0x49, 0x74, 0x75, 0x6b, 0x75, 0x20, 0x6a, 0x61, 0x20, 0x6a, 0x75, 0x6d, 0x77, 0x61,</div><div class='add'>+0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x20, 0x6a, 0x69, 0x6d, 0x77, 0x65, 0x72, 0x69, 0x3b, 0x4b, 0x75,</div><div class='add'>+0x72, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x20, 0x20, 0x6b, 0x61, 0x77, 0x69, 0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b,</div><div class='add'>+0x61, 0x20, 0x6b, 0x61, 0x64, 0x61, 0x64, 0x75, 0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x20, 0x6b, 0x61,</div><div class='add'>+0x6e, 0x61, 0x3b, 0x4b, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b, 0x61, 0x20, 0x6b, 0x61, 0x73, 0x61, 0x6e, 0x75, 0x3b, 0x4b,</div><div class='add'>+0x69, 0x66, 0x75, 0x6c, 0x61, 0x20, 0x6e, 0x67, 0x75, 0x77, 0x6f, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b,</div><div class='add'>+0x4b, 0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x64, 0x65, 0x77, 0x3b, 0x61, 0x61, 0x253, 0x3b, 0x6d, 0x61, 0x77, 0x3b, 0x6e, 0x6a,</div><div class='add'>+0x65, 0x3b, 0x6e, 0x61, 0x61, 0x3b, 0x6d, 0x77, 0x64, 0x3b, 0x68, 0x62, 0x69, 0x3b, 0x64, 0x65, 0x77, 0x6f, 0x3b, 0x61,</div><div class='add'>+0x61, 0x253, 0x6e, 0x64, 0x65, 0x3b, 0x6d, 0x61, 0x77, 0x62, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x6e, 0x6a, 0x65, 0x73, 0x6c,</div><div class='add'>+0x61, 0x61, 0x72, 0x65, 0x3b, 0x6e, 0x61, 0x61, 0x73, 0x61, 0x61, 0x6e, 0x64, 0x65, 0x3b, 0x6d, 0x61, 0x77, 0x6e, 0x64,</div><div class='add'>+0x65, 0x3b, 0x68, 0x6f, 0x6f, 0x72, 0x65, 0x2d, 0x62, 0x69, 0x69, 0x72, 0x3b, 0x64, 0x3b, 0x61, 0x3b, 0x6d, 0x3b, 0x6e,</div><div class='add'>+0x3b, 0x6e, 0x3b, 0x6d, 0x3b, 0x68, 0x3b, 0x4b, 0x4d, 0x41, 0x3b, 0x4e, 0x54, 0x54, 0x3b, 0x4e, 0x4d, 0x4e, 0x3b, 0x4e,</div><div class='add'>+0x4d, 0x54, 0x3b, 0x41, 0x52, 0x54, 0x3b, 0x4e, 0x4d, 0x41, 0x3b, 0x4e, 0x4d, 0x4d, 0x3b, 0x4b, 0x69, 0x75, 0x6d, 0x69,</div><div class='add'>+0x61, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x169, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x69, 0x6e, 0x65,</div><div class='add'>+0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x61, 0x3b, 0x41, 0x72, 0x61, 0x6d, 0x69, 0x74, 0x68, 0x69, 0x3b,</div><div class='add'>+0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x74, 0x68, 0x69, 0x3b, 0x4b, 0x3b,</div><div class='add'>+0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x41, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x41, 0x72, 0x65, 0x3b, 0x4b, 0x75, 0x6e, 0x3b,</div><div class='add'>+0x4f, 0x6e, 0x67, 0x3b, 0x49, 0x6e, 0x65, 0x3b, 0x49, 0x6c, 0x65, 0x3b, 0x53, 0x61, 0x70, 0x3b, 0x4b, 0x77, 0x65, 0x3b,</div><div class='add'>+0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65, 0x20, 0x61, 0x72, 0x65, 0x3b, 0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74,</div><div class='add'>+0x20, 0x65, 0x65, 0x20, 0x6b, 0x75, 0x6e, 0x69, 0x3b, 0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65, 0x20, 0x6f,</div><div class='add'>+0x6e, 0x67, 0x27, 0x77, 0x61, 0x6e, 0x3b, 0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65, 0x20, 0x69, 0x6e, 0x65,</div><div class='add'>+0x74, 0x3b, 0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65, 0x20, 0x69, 0x6c, 0x65, 0x3b, 0x4d, 0x64, 0x65, 0x72,</div><div class='add'>+0x6f, 0x74, 0x20, 0x65, 0x65, 0x20, 0x73, 0x61, 0x70, 0x61, 0x3b, 0x4d, 0x64, 0x65, 0x72, 0x6f, 0x74, 0x20, 0x65, 0x65,</div><div class='add'>+0x20, 0x6b, 0x77, 0x65, 0x3b, 0x41, 0x3b, 0x4b, 0x3b, 0x4f, 0x3b, 0x49, 0x3b, 0x49, 0x3b, 0x53, 0x3b, 0x4b, 0x3b, 0x44,</div><div class='add'>+0x69, 0x6d, 0x3b, 0x50, 0x6f, 0x73, 0x3b, 0x50, 0x69, 0x72, 0x3b, 0x54, 0x61, 0x74, 0x3b, 0x4e, 0x61, 0x69, 0x3b, 0x53,</div><div class='add'>+0x68, 0x61, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x44, 0x69, 0x6d, 0x69, 0x6e, 0x67, 0x75, 0x3b, 0x43, 0x68, 0x69, 0x70, 0x6f,</div><div class='add'>+0x73, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x70, 0x69, 0x72, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x43,</div><div class='add'>+0x68, 0x69, 0x6e, 0x61, 0x69, 0x3b, 0x43, 0x68, 0x69, 0x73, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x53, 0x61, 0x62, 0x75, 0x64,</div><div class='add'>+0x75, 0x3b, 0x44, 0x3b, 0x50, 0x3b, 0x43, 0x3b, 0x54, 0x3b, 0x4e, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x53, 0x6f, 0x6e, 0x3b,</div><div class='add'>+0x4d, 0x76, 0x75, 0x3b, 0x53, 0x69, 0x62, 0x3b, 0x53, 0x69, 0x74, 0x3b, 0x53, 0x69, 0x6e, 0x3b, 0x53, 0x69, 0x68, 0x3b,</div><div class='add'>+0x4d, 0x67, 0x71, 0x3b, 0x53, 0x6f, 0x6e, 0x74, 0x6f, 0x3b, 0x4d, 0x76, 0x75, 0x6c, 0x6f, 0x3b, 0x53, 0x69, 0x62, 0x69,</div><div class='add'>+0x6c, 0x69, 0x3b, 0x53, 0x69, 0x74, 0x68, 0x61, 0x74, 0x68, 0x75, 0x3b, 0x53, 0x69, 0x6e, 0x65, 0x3b, 0x53, 0x69, 0x68,</div><div class='add'>+0x6c, 0x61, 0x6e, 0x75, 0x3b, 0x4d, 0x67, 0x71, 0x69, 0x62, 0x65, 0x6c, 0x6f, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x53, 0x3b,</div><div class='add'>+0x53, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x49, 0x6a, 0x70, 0x3b, 0x49, 0x6a, 0x74, 0x3b, 0x49, 0x6a, 0x6e, 0x3b,</div><div class='add'>+0x49, 0x6a, 0x74, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x75, 0x3b, 0x49, 0x6a, 0x6d, 0x3b, 0x49, 0x6a, 0x75, 0x6d,</div><div class='add'>+0x61, 0x70, 0x69, 0x6c, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x49, 0x6a, 0x75, 0x6d,</div><div class='add'>+0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d,</div><div class='add'>+0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69,</div><div class='add'>+0x3b, 0x32, 0x3b, 0x33, 0x3b, 0x34, 0x3b, 0x35, 0x3b, 0x36, 0x3b, 0x37, 0x3b, 0x31, 0x3b, 0x61, 0x73, 0x69, 0x3b, 0x61,</div><div class='add'>+0x79, 0x6e, 0x3b, 0x61, 0x73, 0x69, 0x3b, 0x61, 0x6b, 0x1e5b, 0x3b, 0x61, 0x6b, 0x77, 0x3b, 0x61, 0x73, 0x69, 0x6d, 0x3b,</div><div class='add'>+0x41, 0x73, 0x69, 0x1e0d, 0x3b, 0x61, 0x73, 0x61, 0x6d, 0x61, 0x73, 0x3b, 0x61, 0x79, 0x6e, 0x61, 0x73, 0x3b, 0x61, 0x73,</div><div class='add'>+0x69, 0x6e, 0x61, 0x73, 0x3b, 0x61, 0x6b, 0x1e5b, 0x61, 0x73, 0x3b, 0x61, 0x6b, 0x77, 0x61, 0x73, 0x3b, 0x61, 0x73, 0x69,</div><div class='add'>+0x6d, 0x77, 0x61, 0x73, 0x3b, 0x61, 0x73, 0x69, 0x1e0d, 0x79, 0x61, 0x73, 0x3b, 0x2d30, 0x2d59, 0x2d30, 0x3b, 0x2d30, 0x2d62, 0x2d4f,</div><div class='add'>+0x3b, 0x2d30, 0x2d59, 0x2d49, 0x3b, 0x2d30, 0x2d3d, 0x2d55, 0x3b, 0x2d30, 0x2d3d, 0x2d61, 0x3b, 0x2d30, 0x2d59, 0x2d49, 0x2d4e, 0x3b, 0x2d30, 0x2d59,</div><div class='add'>+0x2d49, 0x2d39, 0x3b, 0x2d30, 0x2d59, 0x2d30, 0x2d4e, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d62, 0x2d4f, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d59, 0x2d49, 0x2d4f,</div><div class='add'>+0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d3d, 0x2d55, 0x2d30, 0x2d59, 0x3b, 0x2d30, 0x2d3d, 0x2d61, 0x2d30, 0x2d59, 0x3b, 0x2d59, 0x2d49, 0x2d4e, 0x2d61, 0x2d30,</div><div class='add'>+0x2d59, 0x3b, 0x2d30, 0x2d59, 0x2d49, 0x2d39, 0x2d62, 0x2d30, 0x2d59, 0x3b, 0x59, 0x61, 0x6e, 0x3b, 0x53, 0x61, 0x6e, 0x3b, 0x4b, 0x72,</div><div class='add'>+0x61, 0x1e0d, 0x3b, 0x4b, 0x75, 0x1e93, 0x3b, 0x53, 0x61, 0x6d, 0x3b, 0x53, 0x1e0d, 0x69, 0x73, 0x3b, 0x53, 0x61, 0x79, 0x3b,</div><div class='add'>+0x59, 0x61, 0x6e, 0x61, 0x73, 0x73, 0x3b, 0x53, 0x61, 0x6e, 0x61, 0x73, 0x73, 0x3b, 0x4b, 0x72, 0x61, 0x1e0d, 0x61, 0x73,</div><div class='add'>+0x73, 0x3b, 0x4b, 0x75, 0x1e93, 0x61, 0x73, 0x73, 0x3b, 0x53, 0x61, 0x6d, 0x61, 0x73, 0x73, 0x3b, 0x53, 0x1e0d, 0x69, 0x73,</div><div class='add'>+0x61, 0x73, 0x73, 0x3b, 0x53, 0x61, 0x79, 0x61, 0x73, 0x73, 0x3b, 0x59, 0x3b, 0x53, 0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x53,</div><div class='add'>+0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x53, 0x41, 0x4e, 0x3b, 0x4f, 0x52, 0x4b, 0x3b, 0x4f, 0x4b, 0x42, 0x3b, 0x4f, 0x4b, 0x53,</div><div class='add'>+0x3b, 0x4f, 0x4b, 0x4e, 0x3b, 0x4f, 0x4b, 0x54, 0x3b, 0x4f, 0x4d, 0x4b, 0x3b, 0x53, 0x61, 0x6e, 0x64, 0x65, 0x3b, 0x4f,</div><div class='add'>+0x72, 0x77, 0x6f, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x7a, 0x61, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6b, 0x61, 0x62, 0x69, 0x72,</div><div class='add'>+0x69, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6b, 0x61, 0x73, 0x68, 0x61, 0x74, 0x75, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6b, 0x61,</div><div class='add'>+0x6e, 0x61, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6b, 0x61, 0x74, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x4f, 0x72, 0x77, 0x61, 0x6d,</div><div class='add'>+0x75, 0x6b, 0x61, 0x61, 0x67, 0x61, 0x3b, 0x53, 0x3b, 0x4b, 0x3b, 0x52, 0x3b, 0x53, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x4d,</div><div class='add'>+0x3b, 0x4d, 0x75, 0x6c, 0x3b, 0x56, 0x69, 0x6c, 0x3b, 0x48, 0x69, 0x76, 0x3b, 0x48, 0x69, 0x64, 0x3b, 0x48, 0x69, 0x74,</div><div class='add'>+0x3b, 0x48, 0x69, 0x68, 0x3b, 0x4c, 0x65, 0x6d, 0x3b, 0x70, 0x61, 0x20, 0x6d, 0x75, 0x6c, 0x75, 0x6e, 0x67, 0x75, 0x3b,</div><div class='add'>+0x70, 0x61, 0x20, 0x73, 0x68, 0x61, 0x68, 0x75, 0x76, 0x69, 0x6c, 0x75, 0x68, 0x61, 0x3b, 0x70, 0x61, 0x20, 0x68, 0x69,</div><div class='add'>+0x76, 0x69, 0x6c, 0x69, 0x3b, 0x70, 0x61, 0x20, 0x68, 0x69, 0x64, 0x61, 0x74, 0x75, 0x3b, 0x70, 0x61, 0x20, 0x68, 0x69,</div><div class='add'>+0x74, 0x61, 0x79, 0x69, 0x3b, 0x70, 0x61, 0x20, 0x68, 0x69, 0x68, 0x61, 0x6e, 0x75, 0x3b, 0x70, 0x61, 0x20, 0x73, 0x68,</div><div class='add'>+0x61, 0x68, 0x75, 0x6c, 0x65, 0x6d, 0x62, 0x65, 0x6c, 0x61, 0x3b, 0x4d, 0x3b, 0x4a, 0x3b, 0x48, 0x3b, 0x48, 0x3b, 0x48,</div><div class='add'>+0x3b, 0x57, 0x3b, 0x4a, 0x3b, 0x4a, 0x70, 0x69, 0x3b, 0x4a, 0x74, 0x74, 0x3b, 0x4a, 0x6e, 0x6e, 0x3b, 0x4a, 0x74, 0x6e,</div><div class='add'>+0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x75, 0x3b, 0x4a, 0x6d, 0x6f, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x6c,</div><div class='add'>+0x79, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x75, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6e, 0x6e, 0x65,</div><div class='add'>+0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x75, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49,</div><div class='add'>+0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x3b, 0x4a, 0x3b, 0x4a, 0x3b, 0x4a,</div><div class='add'>+0x3b, 0x4a, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x4a, 0x3b, 0x6b, 0x61, 0x72, 0x3b, 0x6e, 0x74, 0x25b, 0x3b, 0x74, 0x61, 0x72,</div><div class='add'>+0x3b, 0x61, 0x72, 0x61, 0x3b, 0x61, 0x6c, 0x61, 0x3b, 0x6a, 0x75, 0x6d, 0x3b, 0x73, 0x69, 0x62, 0x3b, 0x6b, 0x61, 0x72,</div><div class='add'>+0x69, 0x3b, 0x6e, 0x74, 0x25b, 0x6e, 0x25b, 0x3b, 0x74, 0x61, 0x72, 0x61, 0x74, 0x61, 0x3b, 0x61, 0x72, 0x61, 0x62, 0x61,</div><div class='add'>+0x3b, 0x61, 0x6c, 0x61, 0x6d, 0x69, 0x73, 0x61, 0x3b, 0x6a, 0x75, 0x6d, 0x61, 0x3b, 0x73, 0x69, 0x62, 0x69, 0x72, 0x69,</div><div class='add'>+0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x4a, 0x3b, 0x53, 0x3b, 0x4b, 0x6d, 0x61, 0x3b, 0x54,</div><div class='add'>+0x61, 0x74, 0x3b, 0x49, 0x6e, 0x65, 0x3b, 0x54, 0x61, 0x6e, 0x3b, 0x41, 0x72, 0x6d, 0x3b, 0x4d, 0x61, 0x61, 0x3b, 0x4e,</div><div class='add'>+0x4d, 0x4d, 0x3b, 0x4b, 0x69, 0x75, 0x6d, 0x69, 0x61, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b,</div><div class='add'>+0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x69, 0x6e, 0x65, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x41,</div><div class='add'>+0x72, 0x61, 0x6d, 0x69, 0x74, 0x68, 0x69, 0x3b, 0x4e, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4e, 0x4a, 0x75, 0x6d, 0x61,</div><div class='add'>+0x6d, 0x6f, 0x74, 0x68, 0x69, 0x69, 0x3b, 0x4b, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x4e, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x4e,</div><div class='add'>+0x3b, 0x13c6, 0x13cd, 0x13ac, 0x3b, 0x13c9, 0x13c5, 0x13af, 0x3b, 0x13d4, 0x13b5, 0x13c1, 0x3b, 0x13e6, 0x13a2, 0x13c1, 0x3b, 0x13c5, 0x13a9, 0x13c1,</div><div class='add'>+0x3b, 0x13e7, 0x13be, 0x13a9, 0x3b, 0x13c8, 0x13d5, 0x13be, 0x3b, 0x13a4, 0x13be, 0x13d9, 0x13d3, 0x13c6, 0x13cd, 0x13ac, 0x3b, 0x13a4, 0x13be, 0x13d9,</div><div class='add'>+0x13d3, 0x13c9, 0x13c5, 0x13af, 0x3b, 0x13d4, 0x13b5, 0x13c1, 0x13a2, 0x13a6, 0x3b, 0x13e6, 0x13a2, 0x13c1, 0x13a2, 0x13a6, 0x3b, 0x13c5, 0x13a9, 0x13c1,</div><div class='add'>+0x13a2, 0x13a6, 0x3b, 0x13e7, 0x13be, 0x13a9, 0x13b6, 0x13cd, 0x13d7, 0x3b, 0x13a4, 0x13be, 0x13d9, 0x13d3, 0x13c8, 0x13d5, 0x13be, 0x3b, 0x13c6, 0x3b,</div><div class='add'>+0x13c9, 0x3b, 0x13d4, 0x3b, 0x13e6, 0x3b, 0x13c5, 0x3b, 0x13e7, 0x3b, 0x13a4, 0x3b, 0x64, 0x69, 0x6d, 0x3b, 0x6c, 0x69, 0x6e, 0x3b,</div><div class='add'>+0x6d, 0x61, 0x72, 0x3b, 0x6d, 0x65, 0x72, 0x3b, 0x7a, 0x65, 0x3b, 0x76, 0x61, 0x6e, 0x3b, 0x73, 0x61, 0x6d, 0x3b, 0x64,</div><div class='add'>+0x69, 0x6d, 0x61, 0x6e, 0x73, 0x3b, 0x6c, 0x69, 0x6e, 0x64, 0x69, 0x3b, 0x6d, 0x61, 0x72, 0x64, 0x69, 0x3b, 0x6d, 0x65,</div><div class='add'>+0x72, 0x6b, 0x72, 0x65, 0x64, 0x69, 0x3b, 0x7a, 0x65, 0x64, 0x69, 0x3b, 0x76, 0x61, 0x6e, 0x64, 0x72, 0x65, 0x64, 0x69,</div><div class='add'>+0x3b, 0x73, 0x61, 0x6d, 0x64, 0x69, 0x3b, 0x64, 0x3b, 0x6c, 0x3b, 0x6d, 0x3b, 0x6d, 0x3b, 0x7a, 0x3b, 0x76, 0x3b, 0x73,</div><div class='add'>+0x3b, 0x4c, 0x6c, 0x32, 0x3b, 0x4c, 0x6c, 0x33, 0x3b, 0x4c, 0x6c, 0x34, 0x3b, 0x4c, 0x6c, 0x35, 0x3b, 0x4c, 0x6c, 0x36,</div><div class='add'>+0x3b, 0x4c, 0x6c, 0x37, 0x3b, 0x4c, 0x6c, 0x31, 0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x70,</div><div class='add'>+0x69, 0x6c, 0x69, 0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4c,</div><div class='add'>+0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x6e, 0x63, 0x68, 0x65, 0x63, 0x68, 0x69, 0x3b, 0x4c, 0x69, 0x64,</div><div class='add'>+0x75, 0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x6e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61,</div><div class='add'>+0x20, 0x6c, 0x79, 0x61, 0x6e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20, 0x6c, 0x69, 0x6e, 0x6a, 0x69, 0x3b,</div><div class='add'>+0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x79, 0x61, 0x6e, 0x6e, 0x79, 0x61, 0x6e, 0x6f, 0x20, 0x6e, 0x61, 0x20,</div><div class='add'>+0x6d, 0x61, 0x76, 0x69, 0x6c, 0x69, 0x3b, 0x4c, 0x69, 0x64, 0x75, 0x76, 0x61, 0x20, 0x6c, 0x69, 0x74, 0x61, 0x6e, 0x64,</div><div class='add'>+0x69, 0x3b, 0x50, 0xed, 0x69, 0x6c, 0x69, 0x3b, 0x54, 0xe1, 0x61, 0x74, 0x75, 0x3b, 0xcd, 0x6e, 0x65, 0x3b, 0x54, 0xe1,</div><div class='add'>+0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x6d, 0x3b, 0x4d, 0xf3, 0x6f, 0x73, 0x69, 0x3b, 0x4a, 0x75,</div><div class='add'>+0x6d, 0x61, 0x70, 0xed, 0x69, 0x72, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0xe1, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d,</div><div class='add'>+0x61, 0xed, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0xe1, 0x61, 0x6e, 0x6f, 0x3b, 0x41, 0x6c, 0x61, 0x6d, 0xed,</div><div class='add'>+0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0xe1, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0xf3, 0x6f, 0x73, 0x69,</div><div class='add'>+0x3b, 0x50, 0x3b, 0x54, 0x3b, 0x45, 0x3b, 0x4f, 0x3b, 0x41, 0x3b, 0x49, 0x3b, 0x4d, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x42,</div><div class='add'>+0x61, 0x6c, 0x3b, 0x4c, 0x77, 0x32, 0x3b, 0x4c, 0x77, 0x33, 0x3b, 0x4c, 0x77, 0x34, 0x3b, 0x4c, 0x77, 0x35, 0x3b, 0x4c,</div><div class='add'>+0x77, 0x36, 0x3b, 0x53, 0x61, 0x62, 0x62, 0x69, 0x69, 0x74, 0x69, 0x3b, 0x42, 0x61, 0x6c, 0x61, 0x7a, 0x61, 0x3b, 0x4c,</div><div class='add'>+0x77, 0x61, 0x6b, 0x75, 0x62, 0x69, 0x72, 0x69, 0x3b, 0x4c, 0x77, 0x61, 0x6b, 0x75, 0x73, 0x61, 0x74, 0x75, 0x3b, 0x4c,</div><div class='add'>+0x77, 0x61, 0x6b, 0x75, 0x6e, 0x61, 0x3b, 0x4c, 0x77, 0x61, 0x6b, 0x75, 0x74, 0x61, 0x61, 0x6e, 0x6f, 0x3b, 0x4c, 0x77,</div><div class='add'>+0x61, 0x6d, 0x75, 0x6b, 0x61, 0x61, 0x67, 0x61, 0x3b, 0x53, 0x3b, 0x42, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4c,</div><div class='add'>+0x3b, 0x4c, 0x3b, 0x50, 0x61, 0x20, 0x4d, 0x75, 0x6c, 0x75, 0x6e, 0x67, 0x75, 0x3b, 0x50, 0x61, 0x6c, 0x69, 0x63, 0x68,</div><div class='add'>+0x69, 0x6d, 0x6f, 0x3b, 0x50, 0x61, 0x6c, 0x69, 0x63, 0x68, 0x69, 0x62, 0x75, 0x6c, 0x69, 0x3b, 0x50, 0x61, 0x6c, 0x69,</div><div class='add'>+0x63, 0x68, 0x69, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x50, 0x61, 0x6c, 0x69, 0x63, 0x68, 0x69, 0x6e, 0x65, 0x3b, 0x50, 0x61,</div><div class='add'>+0x6c, 0x69, 0x63, 0x68, 0x69, 0x73, 0x61, 0x6e, 0x6f, 0x3b, 0x50, 0x61, 0x63, 0x68, 0x69, 0x62, 0x65, 0x6c, 0x75, 0x73,</div><div class='add'>+0x68, 0x69, 0x3b, 0x64, 0x75, 0x6d, 0x3b, 0x73, 0x69, 0x67, 0x3b, 0x74, 0x65, 0x72, 0x3b, 0x6b, 0x75, 0x61, 0x3b, 0x6b,</div><div class='add'>+0x69, 0x6e, 0x3b, 0x73, 0x65, 0x73, 0x3b, 0x73, 0x61, 0x62, 0x3b, 0x64, 0x75, 0x6d, 0x69, 0x6e, 0x67, 0x75, 0x3b, 0x73,</div><div class='add'>+0x69, 0x67, 0x75, 0x6e, 0x64, 0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x74, 0x65, 0x72, 0x73, 0x61, 0x2d, 0x66, 0x65,</div><div class='add'>+0x72, 0x61, 0x3b, 0x6b, 0x75, 0x61, 0x72, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x6b, 0x69, 0x6e, 0x74, 0x61,</div><div class='add'>+0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x73, 0x65, 0x73, 0x74, 0x61, 0x2d, 0x66, 0x65, 0x72, 0x61, 0x3b, 0x73, 0x61, 0x62,</div><div class='add'>+0x61, 0x64, 0x75, 0x3b, 0x64, 0x3b, 0x73, 0x3b, 0x74, 0x3b, 0x6b, 0x3b, 0x6b, 0x3b, 0x73, 0x3b, 0x73, 0x3b, 0x4b, 0x49,</div><div class='add'>+0x55, 0x3b, 0x4d, 0x52, 0x41, 0x3b, 0x57, 0x41, 0x49, 0x3b, 0x57, 0x45, 0x54, 0x3b, 0x57, 0x45, 0x4e, 0x3b, 0x57, 0x54,</div><div class='add'>+0x4e, 0x3b, 0x4a, 0x55, 0x4d, 0x3b, 0x4b, 0x69, 0x75, 0x6d, 0x69, 0x61, 0x3b, 0x4d, 0x75, 0x72, 0x61, 0x6d, 0x75, 0x6b,</div><div class='add'>+0x6f, 0x3b, 0x57, 0x61, 0x69, 0x72, 0x69, 0x3b, 0x57, 0x65, 0x74, 0x68, 0x61, 0x74, 0x75, 0x3b, 0x57, 0x65, 0x6e, 0x61,</div><div class='add'>+0x3b, 0x57, 0x65, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x3b, 0x4b, 0x3b, 0x4d,</div><div class='add'>+0x3b, 0x57, 0x3b, 0x57, 0x3b, 0x57, 0x3b, 0x57, 0x3b, 0x4a, 0x3b, 0x54, 0x69, 0x73, 0x3b, 0x54, 0x61, 0x69, 0x3b, 0x41,</div><div class='add'>+0x65, 0x6e, 0x3b, 0x53, 0x6f, 0x6d, 0x3b, 0x41, 0x6e, 0x67, 0x3b, 0x4d, 0x75, 0x74, 0x3b, 0x4c, 0x6f, 0x68, 0x3b, 0x42,</div><div class='add'>+0x65, 0x74, 0x75, 0x74, 0x61, 0x62, 0x20, 0x74, 0x69, 0x73, 0x61, 0x70, 0x3b, 0x42, 0x65, 0x74, 0x75, 0x74, 0x20, 0x6e,</div><div class='add'>+0x65, 0x74, 0x61, 0x69, 0x3b, 0x42, 0x65, 0x74, 0x75, 0x74, 0x61, 0x62, 0x20, 0x61, 0x65, 0x6e, 0x67, 0x27, 0x3b, 0x42,</div><div class='add'>+0x65, 0x74, 0x75, 0x74, 0x61, 0x62, 0x20, 0x73, 0x6f, 0x6d, 0x6f, 0x6b, 0x3b, 0x42, 0x65, 0x74, 0x75, 0x74, 0x61, 0x62,</div><div class='add'>+0x20, 0x61, 0x6e, 0x67, 0x27, 0x77, 0x61, 0x6e, 0x3b, 0x42, 0x65, 0x74, 0x75, 0x74, 0x61, 0x62, 0x20, 0x6d, 0x75, 0x74,</div><div class='add'>+0x3b, 0x42, 0x65, 0x74, 0x75, 0x74, 0x61, 0x62, 0x20, 0x6c, 0x6f, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x41, 0x3b, 0x53, 0x3b,</div><div class='add'>+0x41, 0x3b, 0x4d, 0x3b, 0x4c, 0x3b, 0x53, 0x6f, 0x6e, 0x3b, 0x4d, 0x61, 0x3b, 0x44, 0x65, 0x3b, 0x57, 0x75, 0x3b, 0x44,</div><div class='add'>+0x6f, 0x3b, 0x46, 0x72, 0x3b, 0x53, 0x61, 0x74, 0x3b, 0x53, 0x6f, 0x6e, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73,</div><div class='add'>+0x3b, 0x4d, 0x61, 0x6e, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x44, 0x65, 0x6e, 0x73, 0x74, 0x61, 0x78,</div><div class='add'>+0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x57, 0x75, 0x6e, 0x73, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x44,</div><div class='add'>+0x6f, 0x6e, 0x64, 0x65, 0x72, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x46, 0x72, 0x61, 0x69, 0x74, 0x61,</div><div class='add'>+0x78, 0x74, 0x73, 0x65, 0x65, 0x73, 0x3b, 0x53, 0x61, 0x74, 0x65, 0x72, 0x74, 0x61, 0x78, 0x74, 0x73, 0x65, 0x65, 0x73,</div><div class='add'>+0x3b, 0x53, 0x3b, 0x4d, 0x3b, 0x45, 0x3b, 0x57, 0x3b, 0x44, 0x3b, 0x46, 0x3b, 0x41, 0x3b, 0x53, 0x75, 0x2e, 0x3b, 0x4d,</div><div class='add'>+0x6f, 0x2e, 0x3b, 0x44, 0x69, 0x2e, 0x3b, 0x4d, 0x65, 0x2e, 0x3b, 0x44, 0x75, 0x2e, 0x3b, 0x46, 0x72, 0x2e, 0x3b, 0x53,</div><div class='add'>+0x61, 0x2e, 0x3b, 0x53, 0x75, 0x6e, 0x6e, 0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x4d, 0x6f, 0x6f, 0x6e, 0x64, 0x61, 0x61,</div><div class='add'>+0x63, 0x68, 0x3b, 0x44, 0x69, 0x6e, 0x6e, 0x73, 0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x4d, 0x65, 0x74, 0x77, 0x6f, 0x63,</div><div class='add'>+0x68, 0x3b, 0x44, 0x75, 0x6e, 0x6e, 0x65, 0x72, 0x73, 0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x46, 0x72, 0x69, 0x69, 0x64,</div><div class='add'>+0x61, 0x61, 0x63, 0x68, 0x3b, 0x53, 0x61, 0x6d, 0x73, 0x64, 0x61, 0x61, 0x63, 0x68, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x70,</div><div class='add'>+0xed, 0x6c, 0xed, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0xe1, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6e, 0x65, 0x3b,</div><div class='add'>+0x4a, 0x75, 0x6d, 0x61, 0x74, 0xe1, 0x6e, 0x254, 0x3b, 0x41, 0x6c, 0x61, 0xe1, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x4a, 0x75,</div><div class='add'>+0x6d, 0xe1, 0x61, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0xf3, 0x73, 0x69, 0x3b, 0x53, 0x61, 0x62, 0x69, 0x3b, 0x42, 0x61,</div><div class='add'>+0x6c, 0x61, 0x3b, 0x4b, 0x75, 0x62, 0x69, 0x3b, 0x4b, 0x75, 0x73, 0x61, 0x3b, 0x4b, 0x75, 0x6e, 0x61, 0x3b, 0x4b, 0x75,</div><div class='add'>+0x74, 0x61, 0x3b, 0x4d, 0x75, 0x6b, 0x61, 0x3b, 0x53, 0x61, 0x62, 0x69, 0x69, 0x74, 0x69, 0x3b, 0x42, 0x61, 0x6c, 0x61,</div><div class='add'>+0x7a, 0x61, 0x3b, 0x4f, 0x77, 0x6f, 0x6b, 0x75, 0x62, 0x69, 0x6c, 0x69, 0x3b, 0x4f, 0x77, 0x6f, 0x6b, 0x75, 0x73, 0x61,</div><div class='add'>+0x74, 0x75, 0x3b, 0x4f, 0x6c, 0x6f, 0x6b, 0x75, 0x6e, 0x61, 0x3b, 0x4f, 0x6c, 0x6f, 0x6b, 0x75, 0x74, 0x61, 0x61, 0x6e,</div><div class='add'>+0x75, 0x3b, 0x4f, 0x6c, 0x6f, 0x6d, 0x75, 0x6b, 0x61, 0x61, 0x67, 0x61, 0x3b, 0x53, 0x3b, 0x42, 0x3b, 0x42, 0x3b, 0x53,</div><div class='add'>+0x3b, 0x4b, 0x3b, 0x4b, 0x3b, 0x4d, 0x3b, 0x4a, 0x32, 0x3b, 0x4a, 0x33, 0x3b, 0x4a, 0x34, 0x3b, 0x4a, 0x35, 0x3b, 0x41,</div><div class='add'>+0x6c, 0x3b, 0x49, 0x6a, 0x3b, 0x4a, 0x31, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x72, 0x69, 0x3b, 0x4a, 0x75, 0x6d,</div><div class='add'>+0x61, 0x74, 0x61, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x74, 0x61,</div><div class='add'>+0x6e, 0x6f, 0x3b, 0x4d, 0x75, 0x72, 0x77, 0x61, 0x20, 0x77, 0x61, 0x20, 0x4b, 0x61, 0x6e, 0x6e, 0x65, 0x3b, 0x4d, 0x75,</div><div class='add'>+0x72, 0x77, 0x61, 0x20, 0x77, 0x61, 0x20, 0x4b, 0x61, 0x74, 0x61, 0x6e, 0x6f, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x6d, 0x6f,</div><div class='add'>+0x73, 0x69, 0x3b, 0x4a, 0x70, 0x69, 0x3b, 0x4a, 0x74, 0x74, 0x3b, 0x4a, 0x6e, 0x6e, 0x3b, 0x4a, 0x74, 0x6e, 0x3b, 0x41,</div><div class='add'>+0x6c, 0x68, 0x3b, 0x49, 0x6a, 0x6d, 0x3b, 0x4a, 0x6d, 0x6f, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x42, 0x61, 0x72, 0x3b, 0x41,</div><div class='add'>+0x61, 0x72, 0x3b, 0x55, 0x6e, 0x69, 0x3b, 0x55, 0x6e, 0x67, 0x3b, 0x4b, 0x61, 0x6e, 0x3b, 0x53, 0x61, 0x62, 0x3b, 0x4e,</div><div class='add'>+0x61, 0x6b, 0x61, 0x65, 0x6a, 0x75, 0x6d, 0x61, 0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x65, 0x62, 0x61, 0x72, 0x61, 0x73, 0x61,</div><div class='add'>+0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x61, 0x72, 0x65, 0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x75, 0x6e, 0x69, 0x3b, 0x4e, 0x61, 0x6b,</div><div class='add'>+0x61, 0x75, 0x6e, 0x67, 0x27, 0x6f, 0x6e, 0x3b, 0x4e, 0x61, 0x6b, 0x61, 0x6b, 0x61, 0x6e, 0x79, 0x3b, 0x4e, 0x61, 0x6b,</div><div class='add'>+0x61, 0x73, 0x61, 0x62, 0x69, 0x74, 0x69, 0x3b, 0x4a, 0x3b, 0x42, 0x3b, 0x41, 0x3b, 0x55, 0x3b, 0x55, 0x3b, 0x4b, 0x3b,</div><div class='add'>+0x53, 0x3b, 0x4e, 0x61, 0x62, 0x3b, 0x53, 0x61, 0x6e, 0x3b, 0x53, 0x61, 0x6c, 0x3b, 0x52, 0x61, 0x62, 0x3b, 0x43, 0x61,</div><div class='add'>+0x6d, 0x3b, 0x4a, 0x75, 0x6d, 0x3b, 0x51, 0x75, 0x6e, 0x3b, 0x4e, 0x61, 0x62, 0x61, 0x20, 0x53, 0x61, 0x6d, 0x62, 0x61,</div><div class='add'>+0x74, 0x3b, 0x53, 0x61, 0x6e, 0x69, 0x3b, 0x53, 0x61, 0x6c, 0x75, 0x73, 0x3b, 0x52, 0x61, 0x62, 0x75, 0x71, 0x3b, 0x43,</div><div class='add'>+0x61, 0x6d, 0x75, 0x73, 0x3b, 0x4a, 0x75, 0x6d, 0x71, 0x61, 0x74, 0x61, 0x3b, 0x51, 0x75, 0x6e, 0x78, 0x61, 0x20, 0x53,</div><div class='add'>+0x61, 0x6d, 0x62, 0x61, 0x74, 0x3b, 0x4e, 0x3b, 0x53, 0x3b, 0x53, 0x3b, 0x52, 0x3b, 0x43, 0x3b, 0x4a, 0x3b, 0x51, 0x3b,</div><div class='add'>+0x41, 0x6c, 0x68, 0x3b, 0x41, 0x74, 0x69, 0x3b, 0x41, 0x74, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x3b,</div><div class='add'>+0x41, 0x6c, 0x61, 0x3b, 0x41, 0x73, 0x73, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x64, 0x69, 0x3b, 0x41, 0x74, 0x69, 0x6e, 0x69,</div><div class='add'>+0x3b, 0x41, 0x74, 0x61, 0x6c, 0x61, 0x74, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x72, 0x62, 0x61, 0x3b, 0x41, 0x6c, 0x68, 0x61,</div><div class='add'>+0x6d, 0x69, 0x69, 0x73, 0x61, 0x3b, 0x41, 0x6c, 0x6a, 0x75, 0x6d, 0x61, 0x3b, 0x41, 0x73, 0x73, 0x61, 0x62, 0x64, 0x75,</div><div class='add'>+0x3b, 0x48, 0x3b, 0x54, 0x3b, 0x54, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x4c, 0x3b, 0x53, 0x3b, 0x4a, 0x4d, 0x50, 0x3b, 0x57,</div><div class='add'>+0x55, 0x54, 0x3b, 0x54, 0x41, 0x52, 0x3b, 0x54, 0x41, 0x44, 0x3b, 0x54, 0x41, 0x4e, 0x3b, 0x54, 0x41, 0x42, 0x3b, 0x4e,</div><div class='add'>+0x47, 0x53, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x70, 0x69, 0x6c, 0x3b, 0x57, 0x75, 0x6f, 0x6b, 0x20, 0x54, 0x69, 0x63, 0x68,</div><div class='add'>+0x3b, 0x54, 0x69, 0x63, 0x68, 0x20, 0x41, 0x72, 0x69, 0x79, 0x6f, 0x3b, 0x54, 0x69, 0x63, 0x68, 0x20, 0x41, 0x64, 0x65,</div><div class='add'>+0x6b, 0x3b, 0x54, 0x69, 0x63, 0x68, 0x20, 0x41, 0x6e, 0x67, 0x27, 0x77, 0x65, 0x6e, 0x3b, 0x54, 0x69, 0x63, 0x68, 0x20,</div><div class='add'>+0x41, 0x62, 0x69, 0x63, 0x68, 0x3b, 0x4e, 0x67, 0x65, 0x73, 0x6f, 0x3b, 0x4a, 0x3b, 0x57, 0x3b, 0x54, 0x3b, 0x54, 0x3b,</div><div class='add'>+0x54, 0x3b, 0x54, 0x3b, 0x4e, 0x3b, 0x41, 0x73, 0x61, 0x3b, 0x41, 0x79, 0x6e, 0x3b, 0x41, 0x73, 0x6e, 0x3b, 0x41, 0x6b,</div><div class='add'>+0x72, 0x3b, 0x41, 0x6b, 0x77, 0x3b, 0x41, 0x73, 0x6d, 0x3b, 0x41, 0x73, 0x1e0d, 0x3b, 0x41, 0x73, 0x61, 0x6d, 0x61, 0x73,</div><div class='add'>+0x3b, 0x41, 0x79, 0x6e, 0x61, 0x73, 0x3b, 0x41, 0x73, 0x69, 0x6e, 0x61, 0x73, 0x3b, 0x41, 0x6b, 0x72, 0x61, 0x73, 0x3b,</div><div class='add'>+0x41, 0x6b, 0x77, 0x61, 0x73, 0x3b, 0x41, 0x73, 0x69, 0x6d, 0x77, 0x61, 0x73, 0x3b, 0x41, 0x73, 0x69, 0x1e0d, 0x79, 0x61,</div><div class='add'>+0x73, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x3b, 0x41, 0x6c, 0x68, 0x3b,</div><div class='add'>+0x41, 0x74, 0x69, 0x3b, 0x41, 0x74, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x3b, 0x41, 0x6c, 0x6d, 0x3b, 0x41, 0x6c, 0x7a, 0x3b,</div><div class='add'>+0x41, 0x73, 0x69, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x64, 0x69, 0x3b, 0x41, 0x74, 0x69, 0x6e, 0x6e, 0x69, 0x3b, 0x41, 0x74,</div><div class='add'>+0x61, 0x6c, 0x61, 0x61, 0x74, 0x61, 0x3b, 0x41, 0x6c, 0x61, 0x72, 0x62, 0x61, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69,</div><div class='add'>+0x69, 0x73, 0x61, 0x3b, 0x41, 0x6c, 0x7a, 0x75, 0x6d, 0x61, 0x3b, 0x41, 0x73, 0x69, 0x62, 0x74, 0x69, 0x3b, 0x4a, 0x70,</div><div class='add'>+0x69, 0x3b, 0x4a, 0x74, 0x74, 0x3b, 0x4a, 0x6d, 0x6e, 0x3b, 0x4a, 0x74, 0x6e, 0x3b, 0x41, 0x6c, 0x68, 0x3b, 0x49, 0x6a,</div><div class='add'>+0x75, 0x3b, 0x4a, 0x6d, 0x6f, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x70, 0x69, 0x69, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61,</div><div class='add'>+0x74, 0x61, 0x74, 0x75, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x6e, 0x65, 0x3b, 0x4a, 0x75, 0x6d, 0x61, 0x61, 0x74, 0x61,</div><div class='add'>+0x6e, 0x6f, 0x3b, 0x41, 0x6c, 0x68, 0x61, 0x6d, 0x69, 0x73, 0x69, 0x3b, 0x49, 0x6a, 0x75, 0x6d, 0x61, 0x61, 0x3b, 0x4a,</div><div class='add'>+0x75, 0x6d, 0x61, 0x61, 0x6d, 0x6f, 0x73, 0x69, 0x3b</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const ushort am_data[] = {</div><div class='ctx'> 0x41, 0x4d, 0x57, 0x44, 0x76, 0x6d, 0x2e, 0x50, 0x44, 0x1321, 0x12cb, 0x1275, 0x635, 0x531, 0x57c, 0x2024, 0x9aa, 0x9c2, 0x9f0, 0x9cd,</div><div class='ctx'> 0x9ac, 0x9be, 0x9b9, 0x9cd, 0x9a3, 0x9aa, 0x9c2, 0x9b0, 0x9cd, 0x9ac, 0x9be, 0x9b9, 0x9cd, 0x9a3, 0x43f, 0x440, 0x2e, 0x20, 0x43e, 0x431,</div><div class='ctx'> 0x2e, 0x434, 0x430, 0x20, 0x43f, 0x430, 0x43b, 0x443, 0x434, 0x43d, 0x44f, 0x1796, 0x17d2, 0x179a, 0x17b9, 0x1780, 0x61, 0x2e, 0x6d, 0x2e,</div><div class='del'>-0x4e0a, 0x5348, 0x64, 0x6f, 0x70, 0x2e, 0x66, 0x2e, 0x6d, 0x2e, 0x65, 0x6e, 0x6e, 0x65, 0x20, 0x6b, 0x65, 0x73, 0x6b, 0x70,</div><div class='del'>-0xe4, 0x65, 0x76, 0x61, 0x61, 0x70, 0x2e, 0x76, 0x6f, 0x72, 0x6d, 0x2e, 0x3c0, 0x2e, 0x3bc, 0x2e, 0xaaa, 0xac2, 0xab0, 0xacd,</div><div class='del'>-0xab5, 0x20, 0xaae, 0xaa7, 0xacd, 0xaaf, 0xabe, 0xab9, 0xacd, 0xaa8, 0x5dc, 0x5e4, 0x5e0, 0x5d4, 0x5f4, 0x5e6, 0x92a, 0x942, 0x930, 0x94d,</div><div class='del'>-0x935, 0x93e, 0x939, 0x94d, 0x928, 0x64, 0x65, 0x2e, 0x66, 0x2e, 0x68, 0x2e, 0x6d, 0x2e, 0x5348, 0x524d, 0x61, 0x6d, 0xc624, 0xc804,</div><div class='del'>-0x70, 0x72, 0x69, 0x65, 0x6b, 0x161, 0x70, 0x75, 0x73, 0x64, 0x69, 0x65, 0x6e, 0x101, 0x70, 0x72, 0x69, 0x65, 0x161, 0x70,</div><div class='del'>-0x69, 0x65, 0x74, 0x43f, 0x440, 0x435, 0x442, 0x43f, 0x43b, 0x430, 0x434, 0x43d, 0x435, 0xd30, 0xd3e, 0xd35, 0xd3f, 0xd32, 0xd46, 0x51,</div><div class='del'>-0x4e, 0x92a, 0x942, 0x930, 0x94d, 0x935, 0x20, 0x92e, 0x927, 0x94d, 0x92f, 0x93e, 0x928, 0x94d, 0x939, 0x63a, 0x2e, 0x645, 0x2e, 0x642,</div><div class='del'>-0x628, 0x644, 0x20, 0x627, 0x632, 0x20, 0x638, 0x647, 0x631, 0x41, 0x6e, 0x74, 0x65, 0x73, 0x20, 0x64, 0x6f, 0x20, 0x6d, 0x65,</div><div class='del'>-0x69, 0x6f, 0x2d, 0x64, 0x69, 0x61, 0xa38, 0xa35, 0xa47, 0xa30, 0xa47, 0x4e, 0x44, 0x43f, 0x440, 0x435, 0x20, 0x43f, 0x43e, 0x434,</div><div class='del'>-0x43d, 0x435, 0x70, 0x72, 0x65, 0x20, 0x70, 0x6f, 0x64, 0x6e, 0x65, 0xdb4, 0xdd9, 0x2e, 0xdc0, 0x2e, 0x64, 0x6f, 0x70, 0x6f,</div><div class='del'>-0x6c, 0x75, 0x64, 0x6e, 0x69, 0x61, 0x73, 0x6e, 0x2e, 0x61, 0x73, 0x75, 0x62, 0x75, 0x68, 0x69, 0x66, 0x6d, 0xc09, 0xe01,</div><div class='del'>-0xe48, 0xe2d, 0xe19, 0xe40, 0xe17, 0xe35, 0xe48, 0xe22, 0xe07, 0xf66, 0xf94, 0xf0b, 0xf51, 0xfb2, 0xf7c, 0xf0b, 0x1295, 0x1309, 0x1206, 0x20,</div><div class='del'>-0x1230, 0x12d3, 0x1270, 0x434, 0x43f, 0x53, 0x41, 0xc0, 0xe1, 0x72, 0x1ecd, 0x300, 0x66, 0x6f, 0x72, 0x6d, 0x69, 0x64, 0x64, 0x61,</div><div class='del'>-0x67, 0x41, 0x4e, 0x92e, 0x2e, 0x92a, 0x942, 0x2e, 0x41, 0x2e, 0x4d, 0x2e, 0x128, 0x79, 0x61, 0x6b, 0x77, 0x61, 0x6b, 0x79,</div><div class='del'>-0x61, 0xa3b8, 0xa111, 0x4d, 0x61, 0x2f, 0x4d, 0x6f, 0x4c, 0x75, 0x6d, 0x61, 0x20, 0x6c, 0x77, 0x61, 0x20, 0x4b, 0x73, 0x75,</div><div class='del'>-0x62, 0x61, 0x6b, 0x61, 0x4b, 0x69, 0x72, 0x6f, 0x6b, 0x6f, 0x54, 0x65, 0x73, 0x69, 0x72, 0x61, 0x6e, 0x6b, 0x61, 0x6e,</div><div class='del'>-0x67, 0x27, 0x61, 0x6d, 0x61, 0x74, 0x69, 0x66, 0x61, 0x77, 0x74, 0x6e, 0x20, 0x74, 0x75, 0x66, 0x61, 0x74, 0x70, 0x61,</div><div class='del'>-0x6d, 0x69, 0x6c, 0x61, 0x75, 0x75, 0x74, 0x75, 0x6b, 0x6f, 0x4b, 0x49, 0x13cc, 0x13be, 0x13b4, 0x4d, 0x75, 0x68, 0x69, 0x54,</div><div class='del'>-0x4f, 0x4f, 0x75, 0x6c, 0x75, 0x63, 0x68, 0x65, 0x6c, 0x6f, 0x52, 0x168, 0x42, 0x65, 0x65, 0x74, 0x1c1, 0x67, 0x6f, 0x61,</div><div class='del'>-0x67, 0x61, 0x73, 0x190, 0x6e, 0x6b, 0x61, 0x6b, 0x25b, 0x6e, 0x79, 0xe1, 0x4d, 0x75, 0x6e, 0x6b, 0x79, 0x6f, 0x69, 0x63,</div><div class='del'>-0x68, 0x65, 0x68, 0x65, 0x61, 0x76, 0x6f, 0x54, 0x61, 0x70, 0x61, 0x72, 0x61, 0x63, 0x68, 0x75, 0x41, 0x64, 0x64, 0x75,</div><div class='del'>-0x68, 0x61, 0x4f, 0x44, 0x5a, 0x64, 0x61, 0x74, 0x20, 0x61, 0x7a, 0x61, 0x6c, 0x6d, 0x61, 0x6b, 0x65, 0x6f</div><div class='add'>+0x4e0a, 0x5348, 0x64, 0x6f, 0x70, 0x2e, 0x66, 0x2e, 0x6d, 0x2e, 0xd801, 0xdc08, 0xd801, 0xdc23, 0x65, 0x6e, 0x6e, 0x65, 0x20, 0x6b,</div><div class='add'>+0x65, 0x73, 0x6b, 0x70, 0xe4, 0x65, 0x76, 0x61, 0x61, 0x70, 0x2e, 0x76, 0x6f, 0x72, 0x6d, 0x2e, 0x3c0, 0x2e, 0x3bc, 0x2e,</div><div class='add'>+0xaaa, 0xac2, 0xab0, 0xacd, 0xab5, 0x20, 0xaae, 0xaa7, 0xacd, 0xaaf, 0xabe, 0xab9, 0xacd, 0xaa8, 0x5dc, 0x5e4, 0x5e0, 0x5d4, 0x5f4, 0x5e6,</div><div class='add'>+0x92a, 0x942, 0x930, 0x94d, 0x935, 0x93e, 0x939, 0x94d, 0x928, 0x64, 0x65, 0x2e, 0x66, 0x2e, 0x68, 0x2e, 0x6d, 0x2e, 0x5348, 0x524d,</div><div class='add'>+0x61, 0x6d, 0xc624, 0xc804, 0x70, 0x72, 0x69, 0x65, 0x6b, 0x161, 0x70, 0x75, 0x73, 0x64, 0x69, 0x65, 0x6e, 0x101, 0x70, 0x72,</div><div class='add'>+0x69, 0x65, 0x161, 0x70, 0x69, 0x65, 0x74, 0x43f, 0x440, 0x435, 0x442, 0x43f, 0x43b, 0x430, 0x434, 0x43d, 0x435, 0xd30, 0xd3e, 0xd35,</div><div class='add'>+0xd3f, 0xd32, 0xd46, 0x51, 0x4e, 0x92a, 0x942, 0x930, 0x94d, 0x935, 0x20, 0x92e, 0x927, 0x94d, 0x92f, 0x93e, 0x928, 0x94d, 0x939, 0x63a,</div><div class='add'>+0x2e, 0x645, 0x2e, 0x642, 0x628, 0x644, 0x20, 0x627, 0x632, 0x20, 0x638, 0x647, 0x631, 0x41, 0x6e, 0x74, 0x65, 0x73, 0x20, 0x64,</div><div class='add'>+0x6f, 0x20, 0x6d, 0x65, 0x69, 0x6f, 0x2d, 0x64, 0x69, 0x61, 0xa38, 0xa35, 0xa47, 0xa30, 0xa47, 0x4e, 0x44, 0x43f, 0x440, 0x435,</div><div class='add'>+0x20, 0x43f, 0x43e, 0x434, 0x43d, 0x435, 0x70, 0x72, 0x65, 0x20, 0x70, 0x6f, 0x64, 0x6e, 0x65, 0xdb4, 0xdd9, 0x2e, 0xdc0, 0x2e,</div><div class='add'>+0x64, 0x6f, 0x70, 0x6f, 0x6c, 0x75, 0x64, 0x6e, 0x69, 0x61, 0x73, 0x6e, 0x2e, 0x61, 0x73, 0x75, 0x62, 0x75, 0x68, 0x69,</div><div class='add'>+0x66, 0x6d, 0xc09, 0xe01, 0xe48, 0xe2d, 0xe19, 0xe40, 0xe17, 0xe35, 0xe48, 0xe22, 0xe07, 0xf66, 0xf94, 0xf0b, 0xf51, 0xfb2, 0xf7c, 0xf0b,</div><div class='add'>+0x1295, 0x1309, 0x1206, 0x20, 0x1230, 0x12d3, 0x1270, 0x434, 0x43f, 0x53, 0x41, 0xc0, 0xe1, 0x72, 0x1ecd, 0x300, 0x66, 0x6f, 0x72, 0x6d,</div><div class='add'>+0x69, 0x64, 0x64, 0x61, 0x67, 0x41, 0x4e, 0x92e, 0x2e, 0x92a, 0x942, 0x2e, 0x41, 0x2e, 0x4d, 0x2e, 0x128, 0x79, 0x61, 0x6b,</div><div class='add'>+0x77, 0x61, 0x6b, 0x79, 0x61, 0xa3b8, 0xa111, 0x4d, 0x61, 0x2f, 0x4d, 0x6f, 0x4c, 0x75, 0x6d, 0x61, 0x20, 0x6c, 0x77, 0x61,</div><div class='add'>+0x20, 0x4b, 0x73, 0x75, 0x62, 0x61, 0x6b, 0x61, 0x4b, 0x69, 0x72, 0x6f, 0x6b, 0x6f, 0x54, 0x65, 0x73, 0x69, 0x72, 0x61,</div><div class='add'>+0x6e, 0x6b, 0x61, 0x6e, 0x67, 0x27, 0x61, 0x6d, 0x61, 0x74, 0x69, 0x66, 0x61, 0x77, 0x74, 0x2d5c, 0x2d49, 0x2d3c, 0x2d30, 0x2d61,</div><div class='add'>+0x2d5c, 0x6e, 0x20, 0x74, 0x75, 0x66, 0x61, 0x74, 0x70, 0x61, 0x6d, 0x69, 0x6c, 0x61, 0x75, 0x75, 0x74, 0x75, 0x6b, 0x6f,</div><div class='add'>+0x4b, 0x49, 0x13cc, 0x13be, 0x13b4, 0x4d, 0x75, 0x68, 0x69, 0x54, 0x4f, 0x4f, 0x75, 0x6c, 0x75, 0x63, 0x68, 0x65, 0x6c, 0x6f,</div><div class='add'>+0x52, 0x168, 0x42, 0x65, 0x65, 0x74, 0x1c1, 0x67, 0x6f, 0x61, 0x67, 0x61, 0x73, 0x190, 0x6e, 0x6b, 0x61, 0x6b, 0x25b, 0x6e,</div><div class='add'>+0x79, 0xe1, 0x4d, 0x75, 0x6e, 0x6b, 0x79, 0x6f, 0x69, 0x63, 0x68, 0x65, 0x68, 0x65, 0x61, 0x76, 0x6f, 0x54, 0x61, 0x70,</div><div class='add'>+0x61, 0x72, 0x61, 0x63, 0x68, 0x75, 0x41, 0x64, 0x64, 0x75, 0x68, 0x61, 0x4f, 0x44, 0x5a, 0x64, 0x61, 0x74, 0x20, 0x61,</div><div class='add'>+0x7a, 0x61, 0x6c, 0x6d, 0x61, 0x6b, 0x65, 0x6f</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const ushort pm_data[] = {</div><div class='ctx'> 0x50, 0x4d, 0x57, 0x42, 0x6e, 0x6d, 0x2e, 0x4d, 0x44, 0x12a8, 0x1233, 0x12d3, 0x1275, 0x645, 0x53f, 0x565, 0x2024, 0x985, 0x9aa, 0x9f0,</div><div class='ctx'> 0x9be, 0x9b9, 0x9cd, 0x9a3, 0x985, 0x9aa, 0x9b0, 0x9be, 0x9b9, 0x9cd, 0x9a3, 0x441, 0x43b, 0x2e, 0x20, 0x43e, 0x431, 0x2e, 0x43f, 0x430,</div><div class='ctx'> 0x441, 0x43b, 0x44f, 0x20, 0x43f, 0x430, 0x43b, 0x443, 0x434, 0x43d, 0x44f, 0x179b, 0x17d2, 0x1784, 0x17b6, 0x1785, 0x70, 0x2e, 0x6d, 0x2e,</div><div class='del'>-0x4e0b, 0x5348, 0x6f, 0x64, 0x70, 0x2e, 0x65, 0x2e, 0x6d, 0x2e, 0x70, 0xe4, 0x72, 0x61, 0x73, 0x74, 0x20, 0x6b, 0x65, 0x73,</div><div class='del'>-0x6b, 0x70, 0xe4, 0x65, 0x76, 0x61, 0x69, 0x70, 0x2e, 0x6e, 0x61, 0x63, 0x68, 0x6d, 0x2e, 0x3bc, 0x2e, 0x3bc, 0x2e, 0xa89,</div><div class='del'>-0xaa4, 0xacd, 0xaa4, 0xab0, 0x20, 0xaae, 0xaa7, 0xacd, 0xaaf, 0xabe, 0xab9, 0xacd, 0xaa8, 0x5d0, 0x5d7, 0x5d4, 0x5f4, 0x5e6, 0x905, 0x92a,</div><div class='del'>-0x930, 0x93e, 0x939, 0x94d, 0x928, 0x64, 0x75, 0x2e, 0x65, 0x2e, 0x68, 0x2e, 0x70, 0x2e, 0x5348, 0x5f8c, 0x70, 0x6d, 0xc624, 0xd6c4,</div><div class='del'>-0x70, 0x113, 0x63, 0x70, 0x75, 0x73, 0x64, 0x69, 0x65, 0x6e, 0x101, 0x70, 0x6f, 0x70, 0x69, 0x65, 0x74, 0x43f, 0x43e, 0x43f,</div><div class='del'>-0x43b, 0x430, 0x434, 0x43d, 0x435, 0xd35, 0xd48, 0xd15, 0xd41, 0xd28, 0xd4d, 0xd28, 0xd47, 0xd30, 0xd02, 0x57, 0x4e, 0x909, 0x924, 0x94d,</div><div class='del'>-0x924, 0x930, 0x20, 0x92e, 0x927, 0x94d, 0x92f, 0x93e, 0x928, 0x94d, 0x939, 0x63a, 0x2e, 0x648, 0x2e, 0x628, 0x639, 0x62f, 0x20, 0x627,</div><div class='del'>-0x632, 0x20, 0x638, 0x647, 0x631, 0x44, 0x65, 0x70, 0x6f, 0x69, 0x73, 0x20, 0x64, 0x6f, 0x20, 0x6d, 0x65, 0x69, 0x6f, 0x2d,</div><div class='del'>-0x64, 0x69, 0x61, 0xa38, 0xa3c, 0xa3e, 0xa2e, 0x73, 0x6d, 0x4c, 0x4b, 0x43f, 0x43e, 0x43f, 0x43e, 0x434, 0x43d, 0x435, 0x70, 0x6f,</div><div class='del'>-0x70, 0x6f, 0x64, 0x6e, 0x65, 0xdb4, 0x2e, 0xdc0, 0x2e, 0x70, 0x6f, 0x70, 0x6f, 0x6c, 0x75, 0x64, 0x6e, 0xed, 0x70, 0x6f,</div><div class='del'>-0x70, 0x2e, 0x67, 0x6e, 0x2e, 0x61, 0x6c, 0x61, 0x73, 0x69, 0x72, 0x69, 0x65, 0x6d, 0xc38, 0xc3e, 0xe2b, 0xe25, 0xe31, 0xe07,</div><div class='del'>-0xe40, 0xe17, 0xe35, 0xe48, 0xe22, 0xe07, 0xf55, 0xfb1, 0xf72, 0xf0b, 0xf51, 0xfb2, 0xf7c, 0xf0b, 0x12f5, 0x1215, 0x122d, 0x20, 0x1230, 0x12d3,</div><div class='del'>-0x1275, 0x43f, 0x43f, 0x43, 0x48, 0x1ecc, 0x300, 0x73, 0xe1, 0x6e, 0x65, 0x74, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x64, 0x64, 0x61,</div><div class='del'>-0x67, 0x45, 0x57, 0x92e, 0x2e, 0x928, 0x902, 0x2e, 0x50, 0x2e, 0x4d, 0x2e, 0x128, 0x79, 0x61, 0x77, 0x129, 0x6f, 0x6f, 0x6e,</div><div class='del'>-0x61, 0x6d, 0x2e, 0xa06f, 0xa2d2, 0x4d, 0x61, 0x6d, 0x62, 0x69, 0x61, 0x2f, 0x4d, 0x6f, 0x67, 0x6c, 0x75, 0x6d, 0x61, 0x20,</div><div class='del'>-0x6c, 0x77, 0x61, 0x20, 0x70, 0x6b, 0x69, 0x6b, 0x69, 0x69, 0x257, 0x65, 0x48, 0x77, 0x61, 0x129, 0x2d, 0x69, 0x6e, 0x129,</div><div class='del'>-0x54, 0x65, 0x69, 0x70, 0x61, 0x6b, 0x69, 0x6e, 0x67, 0x6f, 0x74, 0x6f, 0x74, 0x61, 0x64, 0x67, 0x67, 0x2b7, 0x61, 0x74,</div><div class='del'>-0x6e, 0x20, 0x74, 0x6d, 0x65, 0x64, 0x64, 0x69, 0x74, 0x70, 0x61, 0x6d, 0x75, 0x6e, 0x79, 0x69, 0x6b, 0x79, 0x69, 0x75,</div><div class='del'>-0x6b, 0x6f, 0x6e, 0x79, 0x69, 0x55, 0x54, 0x13d2, 0x13af, 0x13f1, 0x13a2, 0x13d7, 0x13e2, 0x43, 0x68, 0x69, 0x6c, 0x6f, 0x4d, 0x55,</div><div class='del'>-0x55, 0x61, 0x6b, 0x61, 0x73, 0x75, 0x62, 0x61, 0x168, 0x47, 0x4b, 0x65, 0x6d, 0x6f, 0x1c3, 0x75, 0x69, 0x61, 0x73, 0x190,</div><div class='del'>-0x6e, 0x64, 0xe1, 0x6d, 0xe2, 0x45, 0x69, 0x67, 0x75, 0x6c, 0x6f, 0x69, 0x63, 0x68, 0x61, 0x6d, 0x74, 0x68, 0x69, 0x45,</div><div class='del'>-0x62, 0x6f, 0x6e, 0x67, 0x69, 0x41, 0x6c, 0x75, 0x75, 0x6c, 0x61, 0x4f, 0x54, 0x1e0c, 0x65, 0x66, 0x66, 0x69, 0x72, 0x20,</div><div class='del'>-0x61, 0x7a, 0x61, 0x6e, 0x79, 0x69, 0x61, 0x67, 0x68, 0x75, 0x6f</div><div class='add'>+0x4e0b, 0x5348, 0x6f, 0x64, 0x70, 0x2e, 0x65, 0x2e, 0x6d, 0x2e, 0xd801, 0xdc11, 0xd801, 0xdc23, 0x70, 0xe4, 0x72, 0x61, 0x73, 0x74,</div><div class='add'>+0x20, 0x6b, 0x65, 0x73, 0x6b, 0x70, 0xe4, 0x65, 0x76, 0x61, 0x69, 0x70, 0x2e, 0x6e, 0x61, 0x63, 0x68, 0x6d, 0x2e, 0x3bc,</div><div class='add'>+0x2e, 0x3bc, 0x2e, 0xa89, 0xaa4, 0xacd, 0xaa4, 0xab0, 0x20, 0xaae, 0xaa7, 0xacd, 0xaaf, 0xabe, 0xab9, 0xacd, 0xaa8, 0x5d0, 0x5d7, 0x5d4,</div><div class='add'>+0x5f4, 0x5e6, 0x905, 0x92a, 0x930, 0x93e, 0x939, 0x94d, 0x928, 0x64, 0x75, 0x2e, 0x65, 0x2e, 0x68, 0x2e, 0x70, 0x2e, 0x5348, 0x5f8c,</div><div class='add'>+0x70, 0x6d, 0xc624, 0xd6c4, 0x70, 0x113, 0x63, 0x70, 0x75, 0x73, 0x64, 0x69, 0x65, 0x6e, 0x101, 0x70, 0x6f, 0x70, 0x69, 0x65,</div><div class='add'>+0x74, 0x43f, 0x43e, 0x43f, 0x43b, 0x430, 0x434, 0x43d, 0x435, 0xd35, 0xd48, 0xd15, 0xd41, 0xd28, 0xd4d, 0xd28, 0xd47, 0xd30, 0xd02, 0x57,</div><div class='add'>+0x4e, 0x909, 0x924, 0x94d, 0x924, 0x930, 0x20, 0x92e, 0x927, 0x94d, 0x92f, 0x93e, 0x928, 0x94d, 0x939, 0x63a, 0x2e, 0x648, 0x2e, 0x628,</div><div class='add'>+0x639, 0x62f, 0x20, 0x627, 0x632, 0x20, 0x638, 0x647, 0x631, 0x44, 0x65, 0x70, 0x6f, 0x69, 0x73, 0x20, 0x64, 0x6f, 0x20, 0x6d,</div><div class='add'>+0x65, 0x69, 0x6f, 0x2d, 0x64, 0x69, 0x61, 0xa38, 0xa3c, 0xa3e, 0xa2e, 0x73, 0x6d, 0x4c, 0x4b, 0x43f, 0x43e, 0x43f, 0x43e, 0x434,</div><div class='add'>+0x43d, 0x435, 0x70, 0x6f, 0x70, 0x6f, 0x64, 0x6e, 0x65, 0xdb4, 0x2e, 0xdc0, 0x2e, 0x70, 0x6f, 0x70, 0x6f, 0x6c, 0x75, 0x64,</div><div class='add'>+0x6e, 0xed, 0x70, 0x6f, 0x70, 0x2e, 0x67, 0x6e, 0x2e, 0x61, 0x6c, 0x61, 0x73, 0x69, 0x72, 0x69, 0x65, 0x6d, 0xc38, 0xc3e,</div><div class='add'>+0xe2b, 0xe25, 0xe31, 0xe07, 0xe40, 0xe17, 0xe35, 0xe48, 0xe22, 0xe07, 0xf55, 0xfb1, 0xf72, 0xf0b, 0xf51, 0xfb2, 0xf7c, 0xf0b, 0x12f5, 0x1215,</div><div class='add'>+0x122d, 0x20, 0x1230, 0x12d3, 0x1275, 0x43f, 0x43f, 0x43, 0x48, 0x1ecc, 0x300, 0x73, 0xe1, 0x6e, 0x65, 0x74, 0x74, 0x65, 0x72, 0x6d,</div><div class='add'>+0x69, 0x64, 0x64, 0x61, 0x67, 0x45, 0x57, 0x92e, 0x2e, 0x928, 0x902, 0x2e, 0x50, 0x2e, 0x4d, 0x2e, 0x128, 0x79, 0x61, 0x77,</div><div class='add'>+0x129, 0x6f, 0x6f, 0x6e, 0x61, 0x6d, 0x2e, 0xa06f, 0xa2d2, 0x4d, 0x61, 0x6d, 0x62, 0x69, 0x61, 0x2f, 0x4d, 0x6f, 0x67, 0x6c,</div><div class='add'>+0x75, 0x6d, 0x61, 0x20, 0x6c, 0x77, 0x61, 0x20, 0x70, 0x6b, 0x69, 0x6b, 0x69, 0x69, 0x257, 0x65, 0x48, 0x77, 0x61, 0x129,</div><div class='add'>+0x2d, 0x69, 0x6e, 0x129, 0x54, 0x65, 0x69, 0x70, 0x61, 0x6b, 0x69, 0x6e, 0x67, 0x6f, 0x74, 0x6f, 0x74, 0x61, 0x64, 0x67,</div><div class='add'>+0x67, 0x2b7, 0x61, 0x74, 0x2d5c, 0x2d30, 0x2d37, 0x2d33, 0x2d33, 0x2d6f, 0x2d30, 0x2d5c, 0x6e, 0x20, 0x74, 0x6d, 0x65, 0x64, 0x64, 0x69,</div><div class='add'>+0x74, 0x70, 0x61, 0x6d, 0x75, 0x6e, 0x79, 0x69, 0x6b, 0x79, 0x69, 0x75, 0x6b, 0x6f, 0x6e, 0x79, 0x69, 0x55, 0x54, 0x13d2,</div><div class='add'>+0x13af, 0x13f1, 0x13a2, 0x13d7, 0x13e2, 0x43, 0x68, 0x69, 0x6c, 0x6f, 0x4d, 0x55, 0x55, 0x61, 0x6b, 0x61, 0x73, 0x75, 0x62, 0x61,</div><div class='add'>+0x168, 0x47, 0x4b, 0x65, 0x6d, 0x6f, 0x1c3, 0x75, 0x69, 0x61, 0x73, 0x190, 0x6e, 0x64, 0xe1, 0x6d, 0xe2, 0x45, 0x69, 0x67,</div><div class='add'>+0x75, 0x6c, 0x6f, 0x69, 0x63, 0x68, 0x61, 0x6d, 0x74, 0x68, 0x69, 0x45, 0x62, 0x6f, 0x6e, 0x67, 0x69, 0x41, 0x6c, 0x75,</div><div class='add'>+0x75, 0x6c, 0x61, 0x4f, 0x54, 0x1e0c, 0x65, 0x66, 0x66, 0x69, 0x72, 0x20, 0x61, 0x7a, 0x61, 0x6e, 0x79, 0x69, 0x61, 0x67,</div><div class='add'>+0x68, 0x75, 0x6f</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const ushort currency_symbol_data[] = {</div><div class='add'>+0x42, 0x72, 0x4b, 0x73, 0x68, 0x46, 0x64, 0x6a, 0x4e, 0x66, 0x6b, 0x52, 0x4e, 0x24, 0x4c, 0x65, 0x6b, 0x1265, 0x122d, 0x631,</div><div class='add'>+0x2e, 0x633, 0x2e, 0x200f, 0x62f, 0x2e, 0x62c, 0x2e, 0x200f, 0x62f, 0x2e, 0x628, 0x2e, 0x200f, 0x62c, 0x2e, 0x645, 0x2e, 0x200f, 0x62f,</div><div class='add'>+0x2e, 0x639, 0x2e, 0x200f, 0x62f, 0x2e, 0x623, 0x2e, 0x200f, 0x62f, 0x2e, 0x643, 0x2e, 0x200f, 0x644, 0x2e, 0x644, 0x2e, 0x200f, 0x62f,</div><div class='add'>+0x2e, 0x644, 0x2e, 0x200f, 0x62f, 0x2e, 0x645, 0x2e, 0x200f, 0x631, 0x2e, 0x639, 0x2e, 0x200f, 0x631, 0x2e, 0x642, 0x2e, 0x200f, 0x644,</div><div class='add'>+0x2e, 0x633, 0x2e, 0x200f, 0x62f, 0x2e, 0x62a, 0x2e, 0x200f, 0x62f, 0x2e, 0x625, 0x2e, 0x200f, 0x631, 0x2e, 0x64a, 0x2e, 0x200f, 0x564,</div><div class='add'>+0x580, 0x2e, 0x99f, 0x995, 0x9be, 0x6d, 0x61, 0x6e, 0x2e, 0x43c, 0x430, 0x43d, 0x2e, 0x20ac, 0x9f3, 0x99f, 0x9be, 0x995, 0x9be, 0x4e,</div><div class='add'>+0x75, 0x2e, 0x43b, 0x432, 0x2e, 0x4b, 0x17db, 0xffe5, 0x24, 0x4d, 0x4f, 0x50, 0x24, 0x53, 0x24, 0x4e, 0x54, 0x24, 0x6b, 0x6e,</div><div class='add'>+0x4b, 0x10d, 0x6b, 0x72, 0x50, 0x52, 0x73, 0x4d, 0x55, 0x52, 0x73, 0x20a8, 0x20b1, 0xa3, 0x58, 0x41, 0x46, 0x43, 0x46, 0x41,</div><div class='add'>+0x47, 0x4e, 0x46, 0x43, 0x48, 0x46, 0xab0, 0xac1, 0x47, 0x48, 0x20b5, 0x20a6, 0x20aa, 0x930, 0x941, 0x2e, 0x46, 0x74, 0x52, 0x70,</div><div class='add'>+0x930, 0x941, 0x442, 0x4a3, 0x433, 0x2e, 0x52, 0x46, 0x441, 0x43e, 0x43c, 0x20a9, 0x53, 0x59, 0xa3, 0x54, 0x4c, 0x20ad, 0x4c, 0x73,</div><div class='add'>+0x46, 0x46, 0x43, 0x46, 0x41, 0x4c, 0x74, 0x52, 0x4d, 0xd30, 0xd42, 0x4e, 0x5a, 0x24, 0x20ae, 0x43, 0x4e, 0xa5, 0x928, 0x947,</div><div class='add'>+0x930, 0x942, 0x60b, 0xfdfc, 0x7a, 0x142, 0x52, 0x24, 0x4d, 0x54, 0x6e, 0xa30, 0xa41, 0x2e, 0x631, 0x52, 0x4f, 0x4e, 0x440, 0x443,</div><div class='add'>+0x431, 0x2e, 0x20b4, 0x41a, 0x41c, 0x2e, 0x434, 0x438, 0x43d, 0x2e, 0x4b, 0x4d, 0x64, 0x69, 0x6e, 0x2e, 0x55, 0x53, 0x24, 0x53,</div><div class='add'>+0x4c, 0x20, 0x52, 0x65, 0x45, 0x53, 0x73, 0x68, 0x42, 0x73, 0x20a1, 0x52, 0x44, 0x24, 0x51, 0x4c, 0x43, 0x24, 0x42, 0x2f,</div><div class='add'>+0x2e, 0x20b2, 0x53, 0x2f, 0x2e, 0x42, 0x73, 0x2e, 0x46, 0x2e, 0x54, 0x53, 0x68, 0xbb0, 0xbc2, 0x53, 0x4c, 0x52, 0x73, 0xc30,</div><div class='add'>+0xc42, 0x2e, 0xe3f, 0x54, 0x24, 0x631, 0x648, 0x67e, 0x6d2, 0x441, 0x45e, 0x43c, 0x41, 0x66, 0x73, 0x6f, 0x2bf, 0x6d, 0x20ab, 0x783,</div><div class='add'>+0x2e, 0x46, 0x47, 0x4e, 0x6b, 0x72, 0x44, 0x41, 0x55, 0x53, 0x68, 0x5a, 0x4b, 0x43, 0x56, 0x24</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const ushort currency_display_name_data[] = {</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x49, 0x74, 0x6f, 0x6f, 0x70, 0x68, 0x69, 0x79, 0x61, 0x61, 0x20, 0x42, 0x69,</div><div class='add'>+0x72, 0x72, 0x69, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x75, 0x69, 0x64, 0x2d, 0x41, 0x66, 0x72, 0x69,</div><div class='add'>+0x6b, 0x61, 0x61, 0x6e, 0x73, 0x65, 0x20, 0x72, 0x61, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x61,</div><div class='add'>+0x6d, 0x69, 0x62, 0x69, 0x65, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x12e8, 0x12a2, 0x1275, 0x12ee, 0x1335, 0x12eb, 0x20, 0x1265, 0x122d, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x631, 0x64a, 0x627,</div><div class='add'>+0x644, 0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a, 0x3b, 0x631,</div><div class='add'>+0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a,</div><div class='add'>+0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648,</div><div class='add'>+0x62f, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x633, 0x639, 0x648, 0x62f, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20,</div><div class='add'>+0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a, 0x3b,</div><div class='add'>+0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x62c,</div><div class='add'>+0x632, 0x627, 0x626, 0x631, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a, 0x3b, 0x62f,</div><div class='add'>+0x64a, 0x646, 0x627, 0x631, 0x20, 0x62c, 0x632, 0x627, 0x626, 0x631, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x62c, 0x632,</div><div class='add'>+0x627, 0x626, 0x631, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a, 0x646, 0x64a, 0x3b, 0x62f, 0x64a,</div><div class='add'>+0x646, 0x627, 0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x628, 0x62d, 0x631,</div><div class='add'>+0x64a, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646,</div><div class='add'>+0x627, 0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a,</div><div class='add'>+0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x628, 0x62d, 0x631, 0x64a, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647,</div><div class='add'>+0x20, 0x645, 0x635, 0x631, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x645, 0x635, 0x631, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647,</div><div class='add'>+0x20, 0x645, 0x635, 0x631, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x645, 0x635, 0x631, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647,</div><div class='add'>+0x20, 0x645, 0x635, 0x631, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x645, 0x635, 0x631, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647,</div><div class='add'>+0x20, 0x645, 0x635, 0x631, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642, 0x64a, 0x3b, 0x62f, 0x64a,</div><div class='add'>+0x646, 0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642,</div><div class='add'>+0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20,</div><div class='add'>+0x639, 0x631, 0x627, 0x642, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642, 0x64a, 0x3b, 0x62f, 0x64a,</div><div class='add'>+0x646, 0x627, 0x631, 0x20, 0x639, 0x631, 0x627, 0x642, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646,</div><div class='add'>+0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20,</div><div class='add'>+0x623, 0x631, 0x62f, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646, 0x64a, 0x3b, 0x62f, 0x64a,</div><div class='add'>+0x646, 0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646,</div><div class='add'>+0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x623, 0x631, 0x62f, 0x646, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20,</div><div class='add'>+0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b, 0x62f, 0x64a,</div><div class='add'>+0x646, 0x627, 0x631, 0x20, 0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x643, 0x648, 0x64a, 0x62a,</div><div class='add'>+0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20,</div><div class='add'>+0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x643, 0x648, 0x64a, 0x62a, 0x64a, 0x3b, 0x62c, 0x646,</div><div class='add'>+0x64a, 0x629, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x629, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646,</div><div class='add'>+0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x629, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x629, 0x20, 0x644,</div><div class='add'>+0x628, 0x646, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x629, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646,</div><div class='add'>+0x64a, 0x629, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x629, 0x20, 0x644, 0x628, 0x646, 0x627, 0x646,</div><div class='add'>+0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x644, 0x64a, 0x628, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x644,</div><div class='add'>+0x64a, 0x628, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x644, 0x64a, 0x628, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631,</div><div class='add'>+0x20, 0x644, 0x64a, 0x628, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x644, 0x64a, 0x628, 0x64a, 0x3b, 0x62f, 0x64a, 0x646,</div><div class='add'>+0x627, 0x631, 0x20, 0x644, 0x64a, 0x628, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x20, 0x644, 0x64a, 0x628, 0x64a, 0x3b, 0x62f,</div><div class='add'>+0x631, 0x647, 0x645, 0x20, 0x645, 0x63a, 0x631, 0x628, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x645, 0x63a, 0x631, 0x628, 0x64a,</div><div class='add'>+0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x645, 0x63a, 0x631, 0x628, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x645, 0x63a, 0x631,</div><div class='add'>+0x628, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x645, 0x63a, 0x631, 0x628, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x645,</div><div class='add'>+0x63a, 0x631, 0x628, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x645, 0x63a, 0x631, 0x628, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644,</div><div class='add'>+0x20, 0x639, 0x645, 0x627, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x639, 0x645, 0x627, 0x646, 0x64a, 0x3b, 0x631, 0x64a,</div><div class='add'>+0x627, 0x644, 0x20, 0x639, 0x645, 0x627, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x639, 0x645, 0x627, 0x646, 0x64a, 0x3b,</div><div class='add'>+0x631, 0x64a, 0x627, 0x644, 0x20, 0x639, 0x645, 0x627, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x639, 0x645, 0x627, 0x646,</div><div class='add'>+0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x639, 0x645, 0x627, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637,</div><div class='add'>+0x631, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637, 0x631, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637,</div><div class='add'>+0x631, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637, 0x631, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637,</div><div class='add'>+0x631, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637, 0x631, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x642, 0x637,</div><div class='add'>+0x631, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633, 0x648, 0x62f, 0x627, 0x646, 0x64a, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633, 0x648, 0x631, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633, 0x648, 0x631, 0x64a,</div><div class='add'>+0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633, 0x648, 0x631, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633, 0x648, 0x631, 0x64a,</div><div class='add'>+0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633, 0x648, 0x631, 0x64a, 0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633, 0x648, 0x631, 0x64a,</div><div class='add'>+0x3b, 0x62c, 0x646, 0x64a, 0x647, 0x20, 0x633, 0x648, 0x631, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x62a, 0x648, 0x646, 0x633,</div><div class='add'>+0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x62a, 0x648, 0x646, 0x633, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x62a, 0x648,</div><div class='add'>+0x646, 0x633, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x62a, 0x648, 0x646, 0x633, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631,</div><div class='add'>+0x62a, 0x648, 0x646, 0x633, 0x64a, 0x3b, 0x62f, 0x64a, 0x646, 0x627, 0x631, 0x62a, 0x648, 0x646, 0x633, 0x64a, 0x3b, 0x62f, 0x64a, 0x646,</div><div class='add'>+0x627, 0x631, 0x62a, 0x648, 0x646, 0x633, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x625, 0x645, 0x627, 0x631, 0x627, 0x62a, 0x64a,</div><div class='add'>+0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x625, 0x645, 0x627, 0x631, 0x627, 0x62a, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x625,</div><div class='add'>+0x645, 0x627, 0x631, 0x627, 0x62a, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x625, 0x645, 0x627, 0x631, 0x627, 0x62a, 0x64a, 0x3b,</div><div class='add'>+0x62f, 0x631, 0x647, 0x645, 0x20, 0x625, 0x645, 0x627, 0x631, 0x627, 0x62a, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x625, 0x645,</div><div class='add'>+0x627, 0x631, 0x627, 0x62a, 0x64a, 0x3b, 0x62f, 0x631, 0x647, 0x645, 0x20, 0x625, 0x645, 0x627, 0x631, 0x627, 0x62a, 0x64a, 0x3b, 0x631,</div><div class='add'>+0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a, 0x3b, 0x631,</div><div class='add'>+0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a, 0x3b, 0x631,</div><div class='add'>+0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a, 0x3b, 0x631, 0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a, 0x3b, 0x631,</div><div class='add'>+0x64a, 0x627, 0x644, 0x20, 0x64a, 0x645, 0x646, 0x64a, 0x3b, 0x41, 0x7a, 0x259, 0x72, 0x62, 0x61, 0x79, 0x63, 0x61, 0x6e, 0x20,</div><div class='add'>+0x6d, 0x61, 0x6e, 0x61, 0x74, 0x131, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x41, 0x7a, 0x259, 0x72, 0x62, 0x61, 0x79, 0x63,</div><div class='add'>+0x61, 0x6e, 0x20, 0x6d, 0x61, 0x6e, 0x61, 0x74, 0x131, 0x3b, 0x130, 0x72, 0x61, 0x6e, 0x20, 0x72, 0x69, 0x61, 0x6c, 0x131,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x130, 0x72, 0x61, 0x6e, 0x20, 0x72, 0x69, 0x61, 0x6c, 0x131, 0x3b, 0x43c, 0x430, 0x43d,</div><div class='add'>+0x430, 0x442, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x41, 0x7a, 0x259, 0x72, 0x62, 0x61, 0x79, 0x63, 0x61, 0x6e, 0x20, 0x6d,</div><div class='add'>+0x61, 0x6e, 0x61, 0x74, 0x131, 0x3b, 0x9ac, 0x9be, 0x982, 0x9b2, 0x9be, 0x9a6, 0x9c7, 0x9b6, 0x9c0, 0x20, 0x99f, 0x9be, 0x995, 0x9be,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x9ad, 0x9be, 0x9b0, 0x9a4, 0x9c0, 0x9af, 0x9bc, 0x20, 0x9b0, 0x9c1, 0x9aa, 0x9bf, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xf51, 0xf44, 0xf74, 0xf63, 0xf0b, 0xf40, 0xfb2, 0xf58, 0xf0b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x411, 0x44a, 0x43b, 0x433, 0x430, 0x440, 0x441,</div><div class='add'>+0x43a, 0x438, 0x20, 0x43b, 0x435, 0x432, 0x3b, 0x3b, 0x431, 0x44a, 0x43b, 0x433, 0x430, 0x440, 0x441, 0x43a, 0x438, 0x20, 0x43b, 0x435,</div><div class='add'>+0x432, 0x3b, 0x3b, 0x3b, 0x3b, 0x431, 0x44a, 0x43b, 0x433, 0x430, 0x440, 0x441, 0x43a, 0x438, 0x20, 0x43b, 0x435, 0x432, 0x430, 0x3b,</div><div class='add'>+0x1019, 0x103c, 0x1014, 0x103a, 0x1019, 0x102c, 0x20, 0x1000, 0x103b, 0x1015, 0x103a, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x431, 0x435,</div><div class='add'>+0x43b, 0x430, 0x440, 0x443, 0x441, 0x43a, 0x456, 0x20, 0x440, 0x443, 0x431, 0x435, 0x43b, 0x44c, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x52, 0x69, 0x65, 0x6c, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75,</div><div class='add'>+0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x73, 0x3b, 0x4eba, 0x6c11, 0x5e01, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x6e2f, 0x5143, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x6fb3, 0x9580, 0x5143, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x65b0, 0x52a0, 0x5761, 0x5143, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x65b0, 0x81fa, 0x5e63, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x6fb3, 0x95e8, 0x5143, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x6b, 0x75, 0x6e, 0x61, 0x3b, 0x3b, 0x6b, 0x75,</div><div class='add'>+0x6e, 0x61, 0x3b, 0x3b, 0x6b, 0x75, 0x6e, 0x65, 0x3b, 0x6b, 0x75, 0x6e, 0x61, 0x3b, 0x6b, 0x75, 0x6e, 0x61, 0x3b, 0x4b,</div><div class='add'>+0x6f, 0x72, 0x75, 0x6e, 0x61, 0x20, 0x10d, 0x65, 0x73, 0x6b, 0xe1, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x44, 0x61,</div><div class='add'>+0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x3b, 0x3b, 0x44, 0x61, 0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0x6f,</div><div class='add'>+0x6e, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x44, 0x61, 0x6e, 0x73, 0x6b, 0x65, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x72, 0x3b,</div><div class='add'>+0x45, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x55,</div><div class='add'>+0x53, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x55, 0x53, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x55, 0x53, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61,</div><div class='add'>+0x6c, 0x69, 0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c,</div><div class='add'>+0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61,</div><div class='add'>+0x6c, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x45, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65,</div><div class='add'>+0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x73, 0x3b, 0x42, 0x65, 0x6c, 0x69, 0x7a, 0x65, 0x20,</div><div class='add'>+0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x42, 0x65, 0x6c, 0x69, 0x7a, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61,</div><div class='add'>+0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x42, 0x65, 0x6c, 0x69, 0x7a, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b,</div><div class='add'>+0x42, 0x6f, 0x74, 0x73, 0x77, 0x61, 0x6e, 0x61, 0x6e, 0x20, 0x50, 0x75, 0x6c, 0x61, 0x3b, 0x3b, 0x42, 0x6f, 0x74, 0x73,</div><div class='add'>+0x77, 0x61, 0x6e, 0x61, 0x6e, 0x20, 0x70, 0x75, 0x6c, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x42, 0x6f, 0x74, 0x73, 0x77, 0x61,</div><div class='add'>+0x6e, 0x61, 0x6e, 0x20, 0x70, 0x75, 0x6c, 0x61, 0x73, 0x3b, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x44,</div><div class='add'>+0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c,</div><div class='add'>+0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61,</div><div class='add'>+0x72, 0x73, 0x3b, 0x48, 0x6f, 0x6e, 0x67, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b,</div><div class='add'>+0x3b, 0x48, 0x6f, 0x6e, 0x67, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x48, 0x6f, 0x6e, 0x67, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x49,</div><div class='add'>+0x6e, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x52, 0x75, 0x70, 0x65, 0x65, 0x3b, 0x3b, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x20,</div><div class='add'>+0x72, 0x75, 0x70, 0x65, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x20, 0x72, 0x75, 0x70, 0x65,</div><div class='add'>+0x65, 0x73, 0x3b, 0x4a, 0x61, 0x6d, 0x61, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b,</div><div class='add'>+0x4a, 0x61, 0x6d, 0x61, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x4a,</div><div class='add'>+0x61, 0x6d, 0x61, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x4d, 0x61, 0x75, 0x72,</div><div class='add'>+0x69, 0x74, 0x69, 0x61, 0x6e, 0x20, 0x52, 0x75, 0x70, 0x65, 0x65, 0x3b, 0x3b, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x69,</div><div class='add'>+0x61, 0x6e, 0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x69, 0x61,</div><div class='add'>+0x6e, 0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x73, 0x3b, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0x61, 0x6e, 0x20, 0x44, 0x6f,</div><div class='add'>+0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61,</div><div class='add'>+0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0x61, 0x6e, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72,</div><div class='add'>+0x73, 0x3b, 0x4e, 0x65, 0x77, 0x20, 0x5a, 0x65, 0x61, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72,</div><div class='add'>+0x3b, 0x3b, 0x4e, 0x65, 0x77, 0x20, 0x5a, 0x65, 0x61, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x65, 0x77, 0x20, 0x5a, 0x65, 0x61, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x64, 0x6f, 0x6c, 0x6c,</div><div class='add'>+0x61, 0x72, 0x73, 0x3b, 0x50, 0x61, 0x6b, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x69, 0x20, 0x52, 0x75, 0x70, 0x65, 0x65, 0x3b,</div><div class='add'>+0x3b, 0x50, 0x61, 0x6b, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x69, 0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x50, 0x61, 0x6b, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x69, 0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x73, 0x3b, 0x50, 0x65, 0x73,</div><div class='add'>+0x6f, 0x3b, 0x3b, 0x50, 0x68, 0x69, 0x6c, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x20, 0x70, 0x65, 0x73, 0x6f, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x50, 0x68, 0x69, 0x6c, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x20, 0x70, 0x65, 0x73, 0x6f, 0x73, 0x3b, 0x53,</div><div class='add'>+0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x20, 0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x53, 0x69, 0x6e,</div><div class='add'>+0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x69, 0x6e,</div><div class='add'>+0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x3b, 0x53, 0x6f, 0x75, 0x74, 0x68,</div><div class='add'>+0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x52, 0x61, 0x6e, 0x64, 0x3b, 0x3b, 0x53, 0x6f, 0x75, 0x74, 0x68,</div><div class='add'>+0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x72, 0x61, 0x6e, 0x64, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x6f, 0x75,</div><div class='add'>+0x74, 0x68, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x20, 0x72, 0x61, 0x6e, 0x64, 0x3b, 0x54, 0x72, 0x69, 0x6e,</div><div class='add'>+0x69, 0x64, 0x61, 0x64, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x54, 0x6f, 0x62, 0x61, 0x67, 0x6f, 0x20, 0x44, 0x6f, 0x6c, 0x6c,</div><div class='add'>+0x61, 0x72, 0x3b, 0x3b, 0x54, 0x72, 0x69, 0x6e, 0x69, 0x64, 0x61, 0x64, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x54, 0x6f, 0x62,</div><div class='add'>+0x61, 0x67, 0x6f, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x54, 0x72, 0x69, 0x6e, 0x69, 0x64,</div><div class='add'>+0x61, 0x64, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x54, 0x6f, 0x62, 0x61, 0x67, 0x6f, 0x20, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72,</div><div class='add'>+0x73, 0x3b, 0x42, 0x72, 0x69, 0x74, 0x69, 0x73, 0x68, 0x20, 0x50, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x53, 0x74, 0x65, 0x72,</div><div class='add'>+0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x3b, 0x42, 0x72, 0x69, 0x74, 0x69, 0x73, 0x68, 0x20, 0x70, 0x6f, 0x75, 0x6e, 0x64, 0x20,</div><div class='add'>+0x73, 0x74, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x3b, 0x3b, 0x3b, 0x42, 0x72, 0x69, 0x74, 0x69, 0x73, 0x68, 0x20,</div><div class='add'>+0x70, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x20, 0x73, 0x74, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x67, 0x3b, 0x45, 0x65, 0x73, 0x74,</div><div class='add'>+0x69, 0x20, 0x6b, 0x72, 0x6f, 0x6f, 0x6e, 0x3b, 0x3b, 0x45, 0x65, 0x73, 0x74, 0x69, 0x20, 0x6b, 0x72, 0x6f, 0x6f, 0x6e,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x45, 0x65, 0x73, 0x74, 0x69, 0x20, 0x6b, 0x72, 0x6f, 0x6f, 0x6e, 0x69, 0x3b, 0x64, 0x6f, 0x6e,</div><div class='add'>+0x73, 0x6b, 0x20, 0x6b, 0x72, 0xf3, 0x6e, 0x61, 0x3b, 0x3b, 0x64, 0x6f, 0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0xf3, 0x6e,</div><div class='add'>+0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0x6f, 0x6e, 0x73, 0x6b, 0x61, 0x20, 0x6b, 0x72, 0xf3, 0x6e, 0x75, 0x72, 0x3b, 0x65,</div><div class='add'>+0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x61, 0x3b, 0x66,</div><div class='add'>+0x72, 0x61, 0x6e, 0x63, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41, 0x43, 0x29, 0x3b, 0x3b, 0x66, 0x72, 0x61,</div><div class='add'>+0x6e, 0x63, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41, 0x43, 0x29, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61,</div><div class='add'>+0x6e, 0x63, 0x73, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41, 0x43, 0x29, 0x3b, 0x64, 0x6f, 0x6c, 0x6c, 0x61,</div><div class='add'>+0x72, 0x20, 0x63, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x20, 0x63,</div><div class='add'>+0x61, 0x6e, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x64, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x73, 0x20, 0x63,</div><div class='add'>+0x61, 0x6e, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x73, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28,</div><div class='add'>+0x42, 0x43, 0x45, 0x41, 0x4f, 0x29, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42,</div><div class='add'>+0x43, 0x45, 0x41, 0x4f, 0x29, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x20, 0x43, 0x46, 0x41, 0x20,</div><div class='add'>+0x28, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x29, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x67, 0x75, 0x69, 0x6e, 0xe9, 0x65,</div><div class='add'>+0x6e, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x67, 0x75, 0x69, 0x6e, 0xe9, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x20, 0x67, 0x75, 0x69, 0x6e, 0xe9, 0x65, 0x6e, 0x73, 0x3b, 0x61, 0x72, 0x69, 0x61,</div><div class='add'>+0x72, 0x79, 0x20, 0x6d, 0x61, 0x6c, 0x67, 0x61, 0x63, 0x68, 0x65, 0x3b, 0x3b, 0x61, 0x72, 0x69, 0x61, 0x72, 0x79, 0x20,</div><div class='add'>+0x6d, 0x61, 0x6c, 0x67, 0x61, 0x63, 0x68, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x61, 0x72, 0x69, 0x61, 0x72, 0x79, 0x73, 0x20,</div><div class='add'>+0x6d, 0x61, 0x6c, 0x67, 0x61, 0x63, 0x68, 0x65, 0x73, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x73, 0x75, 0x69, 0x73,</div><div class='add'>+0x73, 0x65, 0x3b, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x20, 0x73, 0x75, 0x69, 0x73, 0x73, 0x65, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x66, 0x72, 0x61, 0x6e, 0x63, 0x73, 0x20, 0x73, 0x75, 0x69, 0x73, 0x73, 0x65, 0x73, 0x3b, 0x10e5, 0x10d0, 0x10e0, 0x10d7, 0x10e3,</div><div class='add'>+0x10da, 0x10d8, 0x20, 0x10da, 0x10d0, 0x10e0, 0x10d8, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x45, 0x75, 0x72, 0x6f, 0x3b, 0x3b,</div><div class='add'>+0x45, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x45, 0x75, 0x72, 0x6f, 0x3b, 0x53, 0x63, 0x68, 0x77, 0x65, 0x69, 0x7a,</div><div class='add'>+0x65, 0x72, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x63, 0x68, 0x77,</div><div class='add'>+0x65, 0x69, 0x7a, 0x65, 0x72, 0x20, 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x6e, 0x3b, 0x395, 0x3c5, 0x3c1, 0x3ce, 0x3b, 0x3b,</div><div class='add'>+0x3b5, 0x3c5, 0x3c1, 0x3ce, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b5, 0x3c5, 0x3c1, 0x3ce, 0x3b, 0x64, 0x61, 0x6e, 0x73, 0x6b, 0x69, 0x6e,</div><div class='add'>+0x75, 0x74, 0x20, 0x6b, 0x6f, 0x72, 0x75, 0x75, 0x6e, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4b, 0x75, 0x257,</div><div class='add'>+0x69, 0x6e, 0x20, 0x53, 0x65, 0x66, 0x61, 0x20, 0x6e, 0x61, 0x20, 0x41, 0x66, 0x69, 0x72, 0x6b, 0x61, 0x20, 0x54, 0x61,</div><div class='add'>+0x20, 0x59, 0x61, 0x6d, 0x6d, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x61, 0x69, 0x72, 0x61, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x46, 0x61, 0x6d, 0x20, 0x6b, 0x69, 0x6e, 0x20, 0x53, 0x75, 0x64, 0x61, 0x6e, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x646, 0x64e, 0x64a, 0x652, 0x631, 0x64e, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x5e9, 0x5f4,</div><div class='add'>+0x5d7, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x5e9, 0x5e7, 0x5dc, 0x5d9, 0x5dd, 0x20, 0x5d7, 0x5d3, 0x5e9, 0x5d9, 0x5dd, 0x3b, 0x92d,</div><div class='add'>+0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20, 0x930, 0x942, 0x92a, 0x92f, 0x93e, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4d, 0x61,</div><div class='add'>+0x67, 0x79, 0x61, 0x72, 0x20, 0x66, 0x6f, 0x72, 0x69, 0x6e, 0x74, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xcd, 0x73,</div><div class='add'>+0x6c, 0x65, 0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0xf3, 0x6e, 0x61, 0x3b, 0x3b, 0xed, 0x73, 0x6c, 0x65, 0x6e, 0x73, 0x6b,</div><div class='add'>+0x20, 0x6b, 0x72, 0xf3, 0x6e, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0xed, 0x73, 0x6c, 0x65, 0x6e, 0x73, 0x6b, 0x75, 0x20, 0x6b,</div><div class='add'>+0x72, 0xf3, 0x6e, 0x75, 0x72, 0x3b, 0x52, 0x75, 0x70, 0x69, 0x61, 0x68, 0x20, 0x49, 0x6e, 0x64, 0x6f, 0x6e, 0x65, 0x73,</div><div class='add'>+0x69, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x45, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x46, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x53, 0x76, 0x69, 0x7a, 0x7a, 0x65, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x65e5, 0x672c, 0x5186, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xb300, 0xd55c, 0xbbfc, 0xad6d, 0x20, 0xc6d0, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xe81, 0xeb5, 0xe9a, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4c, 0x61, 0x74, 0x76, 0x69,</div><div class='add'>+0x6a, 0x61, 0x73, 0x20, 0x6c, 0x61, 0x74, 0x73, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x61, 0x6c, 0xe1, 0x6e,</div><div class='add'>+0x67, 0x61, 0x20, 0x6b, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0xe9, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4c, 0x69, 0x74,</div><div class='add'>+0x61, 0x73, 0x3b, 0x3b, 0x4c, 0x69, 0x65, 0x74, 0x75, 0x76, 0x6f, 0x73, 0x20, 0x6c, 0x69, 0x74, 0x61, 0x73, 0x3b, 0x3b,</div><div class='add'>+0x4c, 0x69, 0x65, 0x74, 0x75, 0x76, 0x6f, 0x73, 0x20, 0x6c, 0x69, 0x74, 0x61, 0x69, 0x3b, 0x3b, 0x4c, 0x69, 0x65, 0x74,</div><div class='add'>+0x75, 0x76, 0x6f, 0x73, 0x20, 0x6c, 0x69, 0x74, 0x61, 0x69, 0x3b, 0x41c, 0x430, 0x43a, 0x435, 0x434, 0x43e, 0x43d, 0x441, 0x43a,</div><div class='add'>+0x438, 0x20, 0x434, 0x435, 0x43d, 0x430, 0x440, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x41, 0x72, 0x69, 0x61, 0x72, 0x79,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x52, 0x69, 0x6e, 0x67, 0x67, 0x69, 0x74, 0x20, 0x4d, 0x61, 0x6c, 0x61, 0x79,</div><div class='add'>+0x73, 0x69, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xd07, 0xd28, 0xd4d, 0xd24, 0xd4d, 0xd2f, 0xd28, 0xd4d, 0x200d, 0x20,</div><div class='add'>+0xd30, 0xd42, 0xd2a, 0x3b, 0x3b, 0xd07, 0xd28, 0xd4d, 0xd24, 0xd4d, 0xd2f, 0xd28, 0xd4d, 0x200d, 0x20, 0xd30, 0xd42, 0xd2a, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0xd07, 0xd28, 0xd4d, 0xd24, 0xd4d, 0xd2f, 0xd28, 0xd4d, 0x200d, 0x20, 0xd30, 0xd42, 0xd2a, 0x3b, 0x45, 0x77, 0x72, 0x6f,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20, 0x930, 0x942, 0x92a, 0x93f, 0x901, 0x92f,</div><div class='add'>+0x93e, 0x3b, 0x3b, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20, 0x930, 0x942, 0x92a, 0x93f, 0x901, 0x92f, 0x93e, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x92d, 0x93e, 0x930, 0x924, 0x940, 0x92f, 0x20, 0x930, 0x942, 0x92a, 0x93f, 0x901, 0x92f, 0x93e, 0x3b, 0x6e, 0x6f, 0x72, 0x73,</div><div class='add'>+0x6b, 0x65, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x72, 0x3b, 0x3b, 0x6e, 0x6f, 0x72, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0x6f,</div><div class='add'>+0x6e, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x6e, 0x6f, 0x72, 0x73, 0x6b, 0x65, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x72, 0x3b,</div><div class='add'>+0xb1f, 0xb19, 0xb15, 0xb3e, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x6cd, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x631, 0x6cc, 0x627, 0x644, 0x20, 0x627, 0x6cc, 0x631, 0x627, 0x646, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x6cc, 0x20, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x633, 0x62a, 0x627, 0x646, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x7a, 0x142, 0x6f, 0x74, 0x79, 0x20, 0x70, 0x6f, 0x6c, 0x73, 0x6b, 0x69, 0x3b, 0x3b, 0x7a, 0x142,</div><div class='add'>+0x6f, 0x74, 0x79, 0x20, 0x70, 0x6f, 0x6c, 0x73, 0x6b, 0x69, 0x3b, 0x3b, 0x7a, 0x142, 0x6f, 0x74, 0x65, 0x20, 0x70, 0x6f,</div><div class='add'>+0x6c, 0x73, 0x6b, 0x69, 0x65, 0x3b, 0x3b, 0x7a, 0x142, 0x6f, 0x74, 0x79, 0x63, 0x68, 0x20, 0x70, 0x6f, 0x6c, 0x73, 0x6b,</div><div class='add'>+0x69, 0x63, 0x68, 0x3b, 0x52, 0x65, 0x61, 0x6c, 0x20, 0x62, 0x72, 0x61, 0x73, 0x69, 0x6c, 0x65, 0x69, 0x72, 0x6f, 0x3b,</div><div class='add'>+0x3b, 0x52, 0x65, 0x61, 0x6c, 0x20, 0x62, 0x72, 0x61, 0x73, 0x69, 0x6c, 0x65, 0x69, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x52, 0x65, 0x61, 0x69, 0x73, 0x20, 0x62, 0x72, 0x61, 0x73, 0x69, 0x6c, 0x65, 0x69, 0x72, 0x6f, 0x73, 0x3b, 0x46, 0x72,</div><div class='add'>+0x61, 0x6e, 0x63, 0x6f, 0x20, 0x43, 0x46, 0x41, 0x20, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x3b, 0x3b, 0x46, 0x72, 0x61, 0x6e,</div><div class='add'>+0x63, 0x6f, 0x20, 0x43, 0x46, 0x41, 0x20, 0x64, 0x65, 0x20, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x3b, 0x3b, 0x3b, 0x3b, 0x46,</div><div class='add'>+0x72, 0x61, 0x6e, 0x63, 0x6f, 0x73, 0x20, 0x43, 0x46, 0x41, 0x20, 0x64, 0x65, 0x20, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x3b,</div><div class='add'>+0x4d, 0x65, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x20, 0x64, 0x6f, 0x20, 0x4d, 0x6f, 0xe7, 0x61, 0x6d, 0x62, 0x69, 0x71, 0x75,</div><div class='add'>+0x65, 0x3b, 0x3b, 0x4d, 0x65, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x20, 0x64, 0x65, 0x20, 0x4d, 0x6f, 0xe7, 0x61, 0x6d, 0x62,</div><div class='add'>+0x69, 0x71, 0x75, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x4d, 0x65, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x65, 0x73, 0x20, 0x64, 0x65,</div><div class='add'>+0x20, 0x4d, 0x6f, 0xe7, 0x61, 0x6d, 0x62, 0x69, 0x71, 0x75, 0x65, 0x3b, 0xa30, 0xa41, 0xa2a, 0xa3f, 0xa2f, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x631, 0x648, 0x67e, 0x626, 0x6cc, 0x6c1, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x66, 0x72, 0x61,</div><div class='add'>+0x6e, 0x63, 0x20, 0x73, 0x76, 0x69, 0x7a, 0x7a, 0x65, 0x72, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x6c, 0x65, 0x75,</div><div class='add'>+0x20, 0x6d, 0x6f, 0x6c, 0x64, 0x6f, 0x76, 0x65, 0x6e, 0x65, 0x73, 0x63, 0x3b, 0x3b, 0x3b, 0x3b, 0x6c, 0x65, 0x69, 0x20,</div><div class='add'>+0x6d, 0x6f, 0x6c, 0x64, 0x6f, 0x76, 0x65, 0x6e, 0x65, 0x219, 0x74, 0x69, 0x3b, 0x3b, 0x6c, 0x65, 0x69, 0x20, 0x6d, 0x6f,</div><div class='add'>+0x6c, 0x64, 0x6f, 0x76, 0x65, 0x6e, 0x65, 0x219, 0x74, 0x69, 0x3b, 0x6c, 0x65, 0x75, 0x3b, 0x3b, 0x3b, 0x3b, 0x6c, 0x65,</div><div class='add'>+0x69, 0x3b, 0x3b, 0x6c, 0x65, 0x69, 0x3b, 0x420, 0x43e, 0x441, 0x441, 0x438, 0x439, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x440, 0x443,</div><div class='add'>+0x431, 0x43b, 0x44c, 0x3b, 0x3b, 0x420, 0x43e, 0x441, 0x441, 0x438, 0x439, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x440, 0x443, 0x431, 0x43b,</div><div class='add'>+0x44c, 0x3b, 0x3b, 0x420, 0x43e, 0x441, 0x441, 0x438, 0x439, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x44f, 0x3b,</div><div class='add'>+0x420, 0x43e, 0x441, 0x441, 0x438, 0x439, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x435, 0x439, 0x3b, 0x420, 0x43e,</div><div class='add'>+0x441, 0x441, 0x438, 0x439, 0x441, 0x43a, 0x43e, 0x433, 0x43e, 0x20, 0x440, 0x443, 0x431, 0x43b, 0x44f, 0x3b, 0x41c, 0x43e, 0x43b, 0x434,</div><div class='add'>+0x430, 0x432, 0x441, 0x43a, 0x438, 0x439, 0x20, 0x43b, 0x435, 0x439, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x423, 0x43a, 0x440,</div><div class='add'>+0x430, 0x438, 0x43d, 0x441, 0x43a, 0x430, 0x44f, 0x20, 0x433, 0x440, 0x438, 0x432, 0x43d, 0x430, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x66, 0x61, 0x72, 0xe2, 0x6e, 0x67, 0x61, 0x20, 0x43, 0x46, 0x41, 0x20, 0x28, 0x42, 0x45, 0x41, 0x43, 0x29, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x41a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x430, 0x20,</div><div class='add'>+0x41c, 0x430, 0x440, 0x43a, 0x430, 0x3b, 0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446,</div><div class='add'>+0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x430, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b,</div><div class='add'>+0x43d, 0x430, 0x20, 0x43c, 0x430, 0x440, 0x43a, 0x430, 0x3b, 0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445,</div><div class='add'>+0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x435, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438,</div><div class='add'>+0x431, 0x438, 0x43b, 0x43d, 0x435, 0x20, 0x43c, 0x430, 0x440, 0x43a, 0x3b, 0x431, 0x43e, 0x441, 0x430, 0x43d, 0x441, 0x43a, 0x43e, 0x2d,</div><div class='add'>+0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x438, 0x445, 0x20, 0x43a, 0x43e, 0x43d, 0x432, 0x435, 0x440,</div><div class='add'>+0x442, 0x430, 0x431, 0x438, 0x43b, 0x43d, 0x438, 0x445, 0x20, 0x43c, 0x430, 0x440, 0x430, 0x43a, 0x430, 0x3b, 0x431, 0x43e, 0x441, 0x430,</div><div class='add'>+0x43d, 0x441, 0x43a, 0x43e, 0x2d, 0x445, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x430, 0x447, 0x43a, 0x438, 0x445, 0x20, 0x43a,</div><div class='add'>+0x43e, 0x43d, 0x432, 0x435, 0x440, 0x442, 0x438, 0x431, 0x438, 0x43b, 0x43d, 0x438, 0x445, 0x20, 0x43c, 0x430, 0x440, 0x430, 0x43a, 0x430,</div><div class='add'>+0x3b, 0x45, 0x76, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x76, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x76, 0x72, 0x61, 0x3b, 0x65, 0x76,</div><div class='add'>+0x72, 0x61, 0x3b, 0x65, 0x76, 0x72, 0x61, 0x3b, 0x421, 0x440, 0x43f, 0x441, 0x43a, 0x438, 0x20, 0x434, 0x438, 0x43d, 0x430, 0x440,</div><div class='add'>+0x3b, 0x3b, 0x441, 0x440, 0x43f, 0x441, 0x43a, 0x438, 0x20, 0x434, 0x438, 0x43d, 0x430, 0x440, 0x3b, 0x3b, 0x441, 0x440, 0x43f, 0x441,</div><div class='add'>+0x43a, 0x430, 0x20, 0x434, 0x438, 0x43d, 0x430, 0x440, 0x430, 0x3b, 0x441, 0x440, 0x43f, 0x441, 0x43a, 0x438, 0x445, 0x20, 0x434, 0x438,</div><div class='add'>+0x43d, 0x430, 0x440, 0x430, 0x3b, 0x441, 0x440, 0x43f, 0x441, 0x43a, 0x438, 0x20, 0x434, 0x438, 0x43d, 0x430, 0x440, 0x438, 0x3b, 0x415,</div><div class='add'>+0x432, 0x440, 0x43e, 0x3b, 0x3b, 0x435, 0x432, 0x440, 0x43e, 0x3b, 0x3b, 0x435, 0x432, 0x440, 0x430, 0x3b, 0x435, 0x432, 0x440, 0x430,</div><div class='add'>+0x3b, 0x435, 0x432, 0x440, 0x430, 0x3b, 0x42, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x2d, 0x48, 0x65, 0x72, 0x63, 0x65,</div><div class='add'>+0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x61, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e,</div><div class='add'>+0x61, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x61, 0x3b, 0x3b, 0x62, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x2d, 0x68, 0x65,</div><div class='add'>+0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x61, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62,</div><div class='add'>+0x69, 0x6c, 0x6e, 0x61, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x61, 0x3b, 0x3b, 0x42, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f,</div><div class='add'>+0x2d, 0x48, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x65, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72,</div><div class='add'>+0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x65, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x3b, 0x42, 0x6f, 0x73, 0x61, 0x6e, 0x73,</div><div class='add'>+0x6b, 0x6f, 0x2d, 0x48, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x69, 0x68, 0x20, 0x6b, 0x6f, 0x6e,</div><div class='add'>+0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x69, 0x68, 0x20, 0x6d, 0x61, 0x72, 0x61, 0x6b, 0x61, 0x3b, 0x62,</div><div class='add'>+0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x6f, 0x2d, 0x68, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f, 0x76, 0x61, 0x10d, 0x6b, 0x69,</div><div class='add'>+0x68, 0x20, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x69, 0x68, 0x20, 0x6d, 0x61, 0x72,</div><div class='add'>+0x61, 0x6b, 0x61, 0x3b, 0x53, 0x72, 0x70, 0x73, 0x6b, 0x69, 0x20, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x3b, 0x3b, 0x73, 0x72,</div><div class='add'>+0x70, 0x73, 0x6b, 0x69, 0x20, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x3b, 0x3b, 0x73, 0x72, 0x70, 0x73, 0x6b, 0x61, 0x20, 0x64,</div><div class='add'>+0x69, 0x6e, 0x61, 0x72, 0x61, 0x3b, 0x73, 0x72, 0x70, 0x73, 0x6b, 0x69, 0x68, 0x20, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x61,</div><div class='add'>+0x3b, 0x73, 0x72, 0x70, 0x73, 0x6b, 0x69, 0x20, 0x64, 0x69, 0x6e, 0x61, 0x72, 0x69, 0x3b, 0x44, 0x6f, 0x72, 0x61, 0x20,</div><div class='add'>+0x72, 0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x6b, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xdbd, 0xd82, 0xd9a,</div><div class='add'>+0xdcf, 0x20, 0xdbb, 0xdd4, 0xdb4, 0xdd2, 0xdba, 0xdbd, 0xdca, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x76, 0x72, 0x6f,</div><div class='add'>+0x3b, 0x3b, 0x65, 0x76, 0x72, 0x6f, 0x3b, 0x65, 0x76, 0x72, 0x61, 0x3b, 0x65, 0x76, 0x72, 0x69, 0x3b, 0x3b, 0x65, 0x76,</div><div class='add'>+0x72, 0x6f, 0x76, 0x3b, 0x53, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x20, 0x73, 0x6f, 0x6f, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x46, 0x61, 0x72, 0x61, 0x6e, 0x20, 0x4a, 0x61, 0x62, 0x62, 0x75, 0x75, 0x74, 0x69,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x42, 0x69, 0x72, 0x74, 0x61, 0x20, 0x49, 0x74, 0x6f, 0x6f, 0x62, 0x62, 0x69,</div><div class='add'>+0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x61, 0x72, 0x67, 0x65, 0x6e, 0x74,</div><div class='add'>+0x69, 0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x61, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x6f, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x73, 0x20, 0x61, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x6f, 0x73, 0x3b,</div><div class='add'>+0x62, 0x6f, 0x6c, 0x69, 0x76, 0x69, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x62, 0x6f, 0x6c, 0x69, 0x76, 0x69, 0x61, 0x6e, 0x6f,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x62, 0x6f, 0x6c, 0x69, 0x76, 0x69, 0x61, 0x6e, 0x6f, 0x73, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20,</div><div class='add'>+0x63, 0x68, 0x69, 0x6c, 0x65, 0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x63, 0x68, 0x69, 0x6c, 0x65, 0x6e,</div><div class='add'>+0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x73, 0x20, 0x63, 0x68, 0x69, 0x6c, 0x65, 0x6e, 0x6f, 0x73, 0x3b,</div><div class='add'>+0x70, 0x65, 0x73, 0x6f, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x6d, 0x62, 0x69, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65, 0x73,</div><div class='add'>+0x6f, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x6d, 0x62, 0x69, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f,</div><div class='add'>+0x73, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x6d, 0x62, 0x69, 0x61, 0x6e, 0x6f, 0x73, 0x3b, 0x63, 0x6f, 0x6c, 0xf3, 0x6e, 0x20,</div><div class='add'>+0x63, 0x6f, 0x73, 0x74, 0x61, 0x72, 0x72, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x63, 0x6f, 0x6c, 0xf3, 0x6e,</div><div class='add'>+0x20, 0x63, 0x6f, 0x73, 0x74, 0x61, 0x72, 0x72, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x63, 0x6f,</div><div class='add'>+0x6c, 0x6f, 0x6e, 0x65, 0x73, 0x20, 0x63, 0x6f, 0x73, 0x74, 0x61, 0x72, 0x72, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x73,</div><div class='add'>+0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65,</div><div class='add'>+0x73, 0x6f, 0x20, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73,</div><div class='add'>+0x6f, 0x73, 0x20, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x73, 0x3b, 0x64, 0xf3, 0x6c, 0x61, 0x72,</div><div class='add'>+0x20, 0x65, 0x73, 0x74, 0x61, 0x64, 0x6f, 0x75, 0x6e, 0x69, 0x64, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x64, 0xf3, 0x6c,</div><div class='add'>+0x61, 0x72, 0x20, 0x65, 0x73, 0x74, 0x61, 0x64, 0x6f, 0x75, 0x6e, 0x69, 0x64, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x64, 0xf3, 0x6c, 0x61, 0x72, 0x65, 0x73, 0x20, 0x65, 0x73, 0x74, 0x61, 0x64, 0x6f, 0x75, 0x6e, 0x69, 0x64, 0x65,</div><div class='add'>+0x6e, 0x73, 0x65, 0x73, 0x3b, 0x66, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x43, 0x46, 0x41, 0x20, 0x42, 0x45, 0x41, 0x43,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x71, 0x75, 0x65, 0x74, 0x7a, 0x61, 0x6c, 0x20, 0x67, 0x75, 0x61, 0x74, 0x65,</div><div class='add'>+0x6d, 0x61, 0x6c, 0x74, 0x65, 0x63, 0x6f, 0x3b, 0x3b, 0x71, 0x75, 0x65, 0x74, 0x7a, 0x61, 0x6c, 0x20, 0x67, 0x75, 0x61,</div><div class='add'>+0x74, 0x65, 0x6d, 0x61, 0x6c, 0x74, 0x65, 0x63, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x71, 0x75, 0x65, 0x74, 0x7a, 0x61, 0x6c,</div><div class='add'>+0x65, 0x73, 0x20, 0x67, 0x75, 0x61, 0x74, 0x65, 0x6d, 0x61, 0x6c, 0x74, 0x65, 0x63, 0x6f, 0x73, 0x3b, 0x6c, 0x65, 0x6d,</div><div class='add'>+0x70, 0x69, 0x72, 0x61, 0x20, 0x68, 0x6f, 0x6e, 0x64, 0x75, 0x72, 0x65, 0xf1, 0x6f, 0x3b, 0x3b, 0x6c, 0x65, 0x6d, 0x70,</div><div class='add'>+0x69, 0x72, 0x61, 0x20, 0x68, 0x6f, 0x6e, 0x64, 0x75, 0x72, 0x65, 0xf1, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x6c, 0x65, 0x6d,</div><div class='add'>+0x70, 0x69, 0x72, 0x61, 0x73, 0x20, 0x68, 0x6f, 0x6e, 0x64, 0x75, 0x72, 0x65, 0xf1, 0x6f, 0x73, 0x3b, 0x70, 0x65, 0x73,</div><div class='add'>+0x6f, 0x20, 0x6d, 0x65, 0x78, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x6d, 0x65, 0x78,</div><div class='add'>+0x69, 0x63, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x73, 0x20, 0x6d, 0x65, 0x78, 0x69, 0x63,</div><div class='add'>+0x61, 0x6e, 0x6f, 0x73, 0x3b, 0x63, 0xf3, 0x72, 0x64, 0x6f, 0x62, 0x61, 0x20, 0x6f, 0x72, 0x6f, 0x20, 0x6e, 0x69, 0x63,</div><div class='add'>+0x61, 0x72, 0x61, 0x67, 0xfc, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x63, 0xf3, 0x72, 0x64, 0x6f, 0x62, 0x61, 0x20, 0x6f,</div><div class='add'>+0x72, 0x6f, 0x20, 0x6e, 0x69, 0x63, 0x61, 0x72, 0x61, 0x67, 0xfc, 0x65, 0x6e, 0x73, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x63,</div><div class='add'>+0xf3, 0x72, 0x64, 0x6f, 0x62, 0x61, 0x73, 0x20, 0x6f, 0x72, 0x6f, 0x20, 0x6e, 0x69, 0x63, 0x61, 0x72, 0x61, 0x67, 0xfc,</div><div class='add'>+0x65, 0x6e, 0x73, 0x65, 0x73, 0x3b, 0x62, 0x61, 0x6c, 0x62, 0x6f, 0x61, 0x20, 0x70, 0x61, 0x6e, 0x61, 0x6d, 0x65, 0xf1,</div><div class='add'>+0x6f, 0x3b, 0x3b, 0x62, 0x61, 0x6c, 0x62, 0x6f, 0x61, 0x20, 0x70, 0x61, 0x6e, 0x61, 0x6d, 0x65, 0xf1, 0x6f, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x62, 0x61, 0x6c, 0x62, 0x6f, 0x61, 0x73, 0x20, 0x70, 0x61, 0x6e, 0x61, 0x6d, 0x65, 0xf1, 0x6f, 0x73, 0x3b,</div><div class='add'>+0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0xed, 0x20, 0x70, 0x61, 0x72, 0x61, 0x67, 0x75, 0x61, 0x79, 0x6f, 0x3b, 0x3b, 0x67,</div><div class='add'>+0x75, 0x61, 0x72, 0x61, 0x6e, 0xed, 0x20, 0x70, 0x61, 0x72, 0x61, 0x67, 0x75, 0x61, 0x79, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0xed, 0x65, 0x73, 0x20, 0x70, 0x61, 0x72, 0x61, 0x67, 0x75, 0x61, 0x79, 0x6f, 0x73,</div><div class='add'>+0x3b, 0x6e, 0x75, 0x65, 0x76, 0x6f, 0x20, 0x73, 0x6f, 0x6c, 0x20, 0x70, 0x65, 0x72, 0x75, 0x61, 0x6e, 0x6f, 0x3b, 0x3b,</div><div class='add'>+0x6e, 0x75, 0x65, 0x76, 0x6f, 0x20, 0x73, 0x6f, 0x6c, 0x20, 0x70, 0x65, 0x72, 0x75, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x6e, 0x75, 0x65, 0x76, 0x6f, 0x73, 0x20, 0x73, 0x6f, 0x6c, 0x65, 0x73, 0x20, 0x70, 0x65, 0x72, 0x75, 0x61, 0x6e,</div><div class='add'>+0x6f, 0x73, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x20, 0x75, 0x72, 0x75, 0x67, 0x75, 0x61, 0x79, 0x6f, 0x3b, 0x3b, 0x70, 0x65,</div><div class='add'>+0x73, 0x6f, 0x20, 0x75, 0x72, 0x75, 0x67, 0x75, 0x61, 0x79, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x65, 0x73, 0x6f, 0x73,</div><div class='add'>+0x20, 0x75, 0x72, 0x75, 0x67, 0x75, 0x61, 0x79, 0x6f, 0x73, 0x3b, 0x62, 0x6f, 0x6c, 0xed, 0x76, 0x61, 0x72, 0x20, 0x66,</div><div class='add'>+0x75, 0x65, 0x72, 0x74, 0x65, 0x20, 0x76, 0x65, 0x6e, 0x65, 0x7a, 0x6f, 0x6c, 0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x62, 0x6f,</div><div class='add'>+0x6c, 0xed, 0x76, 0x61, 0x72, 0x20, 0x66, 0x75, 0x65, 0x72, 0x74, 0x65, 0x20, 0x76, 0x65, 0x6e, 0x65, 0x7a, 0x6f, 0x6c,</div><div class='add'>+0x61, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x62, 0x6f, 0x6c, 0xed, 0x76, 0x61, 0x72, 0x65, 0x73, 0x20, 0x66, 0x75, 0x65,</div><div class='add'>+0x72, 0x74, 0x65, 0x73, 0x20, 0x76, 0x65, 0x6e, 0x65, 0x7a, 0x6f, 0x6c, 0x61, 0x6e, 0x6f, 0x73, 0x3b, 0x73, 0x68, 0x69,</div><div class='add'>+0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69,</div><div class='add'>+0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x73, 0x76, 0x65, 0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x61,</div><div class='add'>+0x3b, 0x3b, 0x73, 0x76, 0x65, 0x6e, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x73, 0x76,</div><div class='add'>+0x65, 0x6e, 0x73, 0x6b, 0x61, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x6f, 0x72, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65,</div><div class='add'>+0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x421, 0x43e, 0x43c, 0x43e, 0x43d, 0x4e3, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xbb0, 0xbc2, 0xbaa, 0xbbe, 0xbaf, 0xbcd, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xc30, 0xc42,</div><div class='add'>+0xc2a, 0xc3e, 0xc2f, 0xc3f, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xe1a, 0xe32, 0xe17, 0xe44, 0xe17, 0xe22, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0xf61, 0xf74, 0xf0b, 0xf68, 0xf53, 0xf0b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0xf62, 0xf92, 0xfb1,</div><div class='add'>+0xf0b, 0xf42, 0xf62, 0xf0b, 0xf66, 0xf92, 0xf7c, 0xf62, 0xf0b, 0xf58, 0xf7c, 0xf0b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x54,</div><div class='add'>+0xfc, 0x72, 0x6b, 0x20, 0x4c, 0x69, 0x72, 0x61, 0x73, 0x131, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x423, 0x43a, 0x440,</div><div class='add'>+0x430, 0x457, 0x43d, 0x441, 0x44c, 0x43a, 0x430, 0x20, 0x433, 0x440, 0x438, 0x432, 0x43d, 0x44f, 0x3b, 0x3b, 0x433, 0x440, 0x438, 0x432,</div><div class='add'>+0x43d, 0x44f, 0x3b, 0x3b, 0x433, 0x440, 0x438, 0x432, 0x43d, 0x456, 0x3b, 0x433, 0x440, 0x438, 0x432, 0x435, 0x43d, 0x44c, 0x3b, 0x433,</div><div class='add'>+0x440, 0x438, 0x432, 0x43d, 0x456, 0x3b, 0x627, 0x646, 0x688, 0x6cc, 0x646, 0x20, 0x631, 0x648, 0x67e, 0x6cc, 0x6c1, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x67e, 0x627, 0x6a9, 0x633, 0x62a, 0x627, 0x646, 0x6cc, 0x20, 0x631, 0x648, 0x67e, 0x6cc, 0x6c1, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x40e, 0x437, 0x431, 0x435, 0x43a, 0x438, 0x441, 0x442, 0x43e, 0x43d, 0x20, 0x441, 0x45e, 0x43c, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x6cc, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4f,</div><div class='add'>+0x2bf, 0x7a, 0x62, 0x65, 0x6b, 0x69, 0x73, 0x74, 0x6f, 0x6e, 0x20, 0x73, 0x6f, 0x2bf, 0x6d, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x111, 0x1ed3, 0x6e, 0x67, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x50, 0x75, 0x6e, 0x74, 0x20, 0x53, 0x74,</div><div class='add'>+0x65, 0x72, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x50, 0x72, 0x79, 0x64, 0x61, 0x69, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x4e, 0x61, 0x69, 0x72, 0x61, 0x20, 0x74, 0x69, 0x20, 0x4f, 0x72, 0xed, 0x6c, 0x1eb9, 0x301, 0xe8, 0x64, 0x65, 0x20,</div><div class='add'>+0x4e, 0xe0, 0xec, 0x6a, 0xed, 0x72, 0xed, 0xe0, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x6e, 0x6f, 0x72, 0x73, 0x6b,</div><div class='add'>+0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x3b, 0x3b, 0x6e, 0x6f, 0x72, 0x73, 0x6b, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x6e, 0x6f, 0x72, 0x73, 0x6b, 0x65, 0x20, 0x6b, 0x72, 0x6f, 0x6e, 0x65, 0x72, 0x3b, 0x4b, 0x6f, 0x6e,</div><div class='add'>+0x76, 0x65, 0x72, 0x74, 0x69, 0x62, 0x69, 0x6c, 0x6e, 0x61, 0x20, 0x6d, 0x61, 0x72, 0x6b, 0x61, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x4e, 0x61, 0x1ecb, 0x72, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x69, 0x6c, 0x69, 0x6e,</div><div class='add'>+0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x41, 0x6d,</div><div class='add'>+0x61, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x41, 0x331, 0x6e, 0x61, 0x69, 0x72, 0x61, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x53, 0x65, 0x66, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x65, 0x72, 0x61, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4d, 0x61, 0x6c, 0x61, 0x77, 0x69, 0x61, 0x6e, 0x20, 0x4b, 0x77, 0x61, 0x63, 0x68, 0x61,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x50, 0x68, 0x69, 0x6c, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x20, 0x50, 0x65,</div><div class='add'>+0x73, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x63, 0x68, 0x77, 0x69, 0x69, 0x7a, 0x65, 0x72, 0x20, 0x46,</div><div class='add'>+0x72, 0x61, 0x6e, 0x6b, 0x65, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x63, 0x68, 0x77, 0x69, 0x69, 0x7a, 0x65, 0x72,</div><div class='add'>+0x20, 0x46, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x65,</div><div class='add'>+0x75, 0x72, 0x6f, 0x3b, 0x3b, 0x3b, 0x65, 0x75, 0x72, 0x6f, 0x3b, 0x6e, 0x6f, 0x72, 0x67, 0x67, 0x61, 0x20, 0x6b, 0x72,</div><div class='add'>+0x75, 0x76, 0x64, 0x6e, 0x6f, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x70, 0x69, 0x6c, 0x61, 0x20, 0x54, 0x61, 0x69,</div><div class='add'>+0x77, 0x61, 0x6e, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79,</div><div class='add'>+0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4d, 0x62, 0x75, 0x75, 0x257, 0x75,</div><div class='add'>+0x20, 0x53, 0x65, 0x65, 0x66, 0x61, 0x61, 0x20, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x43, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x4e, 0x6a, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x65, 0x65, 0x6c, 0x20, 0x4b, 0x65, 0x6e, 0x79,</div><div class='add'>+0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x44, 0x6f, 0x6c, 0x61, 0x20, 0x79, 0x61, 0x73, 0x65, 0x20, 0x41, 0x6d,</div><div class='add'>+0x65, 0x6c, 0x69, 0x6b, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x68, 0x65, 0x6c, 0x65, 0x72, 0x69, 0x20, 0x73,</div><div class='add'>+0x61, 0x20, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x61, 0x64, 0x72,</div><div class='add'>+0x69, 0x6d, 0x20, 0x6e, 0x20, 0x6c, 0x6d, 0x263, 0x72, 0x69, 0x62, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x2d30, 0x2d37,</div><div class='add'>+0x2d54, 0x2d49, 0x2d4e, 0x20, 0x2d4f, 0x20, 0x2d4d, 0x2d4e, 0x2d56, 0x2d54, 0x2d49, 0x2d31, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x41,</div><div class='add'>+0x64, 0x69, 0x6e, 0x61, 0x72, 0x20, 0x41, 0x7a, 0x7a, 0x61, 0x79, 0x72, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x45, 0x73, 0x68, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x55, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x48, 0x75,</div><div class='add'>+0x74, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x68, 0x69, 0x6c, 0x69,</div><div class='add'>+0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x73, 0x65, 0x66, 0x61, 0x20, 0x46, 0x72, 0x61, 0x14b, 0x20, 0x28, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x29, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x13a4, 0x13c3, 0x13cd, 0x13d7, 0x3b, 0x3b, 0x13a4, 0x13c3, 0x13cd, 0x13d7, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x13e7, 0x13c3, 0x13cd, 0x13d7, 0x3b, 0x72, 0x6f, 0x75, 0x70, 0x69, 0x20, 0x6d, 0x6f, 0x72, 0x69, 0x73, 0x69, 0x65, 0x6e, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x68, 0x69, 0x6c, 0xed, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79, 0x61, 0x20, 0x54,</div><div class='add'>+0x61, 0x61, 0x6e, 0x73, 0x61, 0x6e, 0xed, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x69, 0x6c, 0x69, 0x6e,</div><div class='add'>+0x67, 0x69, 0x20, 0x65, 0x79, 0x61, 0x20, 0x59, 0x75, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x53, 0x6b, 0x75, 0x64, 0x75, 0x20, 0x4b, 0x61, 0x62, 0x75, 0x76, 0x65, 0x72, 0x64, 0x69, 0x61, 0x6e, 0x75, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x74, 0x61, 0x62, 0x20, 0x79, 0x61, 0x20,</div><div class='add'>+0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0x61, 0x20,</div><div class='add'>+0x44, 0x6f, 0x6c, 0x6c, 0x61, 0x72, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x49, 0x72, 0x6f, 0x70, 0x69, 0x79,</div><div class='add'>+0x69, 0x61, 0x6e, 0xed, 0x20, 0x65, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x49,</div><div class='add'>+0x72, 0x6f, 0x70, 0x69, 0x79, 0x69, 0x61, 0x6e, 0xed, 0x20, 0x65, 0x20, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x69, 0x72, 0x69, 0x6e, 0x6a, 0x69, 0x20, 0x79, 0x61, 0x20, 0x4b, 0x65,</div><div class='add'>+0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x73, 0x68, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x69, 0x20, 0x79,</div><div class='add'>+0x61, 0x20, 0x54, 0x61, 0x6e, 0x64, 0x68, 0x61, 0x6e, 0x69, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x41, 0x6e,</div><div class='add'>+0x67, 0x6f, 0x27, 0x6f, 0x74, 0x6f, 0x6c, 0x20, 0x6c, 0x6f, 0x6b, 0x27, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b,</div><div class='add'>+0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x41, 0x6e, 0x67, 0x6f, 0x27, 0x6f, 0x74, 0x6f, 0x6c, 0x20, 0x6c, 0x6f, 0x6b, 0x27, 0x20,</div><div class='add'>+0x55, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x43, 0x46, 0x41, 0x20, 0x46, 0x72, 0x61,</div><div class='add'>+0x14b, 0x20, 0x28, 0x42, 0x43, 0x45, 0x41, 0x4f, 0x29, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x53, 0x69, 0x6c, 0x69,</div><div class='add'>+0x6e, 0x67, 0x20, 0x6d, 0x61, 0x72, 0x20, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x44,</div><div class='add'>+0x65, 0x72, 0x68, 0x65, 0x6d, 0x20, 0x55, 0x6d, 0x65, 0x1e5b, 0x1e5b, 0x75, 0x6b, 0x69, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b,</div><div class='add'>+0x3b</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const ushort currency_format_data[] = {</div><div class='add'>+0x25, 0x31, 0x25, 0x32, 0x25, 0x32, 0x25, 0x31, 0x25, 0x32, 0xa0, 0x25, 0x31, 0x28, 0x25, 0x32, 0x25, 0x31, 0x29, 0x25,</div><div class='add'>+0x32, 0xa0, 0x25, 0x31, 0x2d, 0x25, 0x31, 0xa0, 0x25, 0x32, 0x28, 0x25, 0x31, 0x25, 0x32, 0x29, 0x25, 0x32, 0x2212, 0x25,</div><div class='add'>+0x31, 0x28, 0x25, 0x31, 0xa0, 0x25, 0x32, 0x29, 0x25, 0x32, 0x2d, 0x25, 0x31, 0x202a, 0x2212, 0x25, 0x31, 0x202c, 0xa0, 0x25,</div><div class='add'>+0x32, 0x25, 0x32, 0xa0, 0x2d, 0x25, 0x31, 0x28, 0x25, 0x32, 0xa0, 0x25, 0x31, 0x29, 0x2d, 0x25, 0x31, 0x25, 0x32, 0x25,</div><div class='add'>+0x32, 0x2d, 0xa0, 0x25, 0x31</div><div class='add'>+};</div><div class='add'>+static const ushort endonyms_data[] = {</div><div class='add'>+0x4f, 0x72, 0x6f, 0x6d, 0x6f, 0x6f, 0x49, 0x74, 0x6f, 0x6f, 0x70, 0x68, 0x69, 0x79, 0x61, 0x61, 0x4b, 0x65, 0x65, 0x6e,</div><div class='add'>+0x69, 0x79, 0x61, 0x61, 0x51, 0x61, 0x66, 0x61, 0x72, 0x59, 0x61, 0x62, 0x75, 0x75, 0x74, 0x69, 0x45, 0x72, 0x65, 0x74,</div><div class='add'>+0x72, 0x69, 0x61, 0x4f, 0x74, 0x6f, 0x62, 0x62, 0x69, 0x61, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x61, 0x6e, 0x73, 0x53,</div><div class='add'>+0x75, 0x69, 0x64, 0x2d, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0xeb, 0x73, 0x68, 0x71,</div><div class='add'>+0x69, 0x70, 0x65, 0x53, 0x68, 0x71, 0x69, 0x70, 0xeb, 0x72, 0x69, 0x61, 0x12a0, 0x121b, 0x122d, 0x129b, 0x12a2, 0x1275, 0x12ee, 0x1335,</div><div class='add'>+0x12eb, 0x627, 0x644, 0x639, 0x631, 0x628, 0x64a, 0x629, 0x627, 0x644, 0x645, 0x645, 0x644, 0x643, 0x629, 0x20, 0x627, 0x644, 0x639, 0x631,</div><div class='add'>+0x628, 0x64a, 0x629, 0x20, 0x627, 0x644, 0x633, 0x639, 0x648, 0x62f, 0x64a, 0x629, 0x627, 0x644, 0x62c, 0x632, 0x627, 0x626, 0x631, 0x627,</div><div class='add'>+0x644, 0x628, 0x62d, 0x631, 0x64a, 0x646, 0x645, 0x635, 0x631, 0x627, 0x644, 0x639, 0x631, 0x627, 0x642, 0x627, 0x644, 0x623, 0x631, 0x62f,</div><div class='add'>+0x646, 0x627, 0x644, 0x643, 0x648, 0x64a, 0x62a, 0x644, 0x628, 0x646, 0x627, 0x646, 0x644, 0x64a, 0x628, 0x64a, 0x627, 0x627, 0x644, 0x645,</div><div class='add'>+0x63a, 0x631, 0x628, 0x639, 0x64f, 0x645, 0x627, 0x646, 0x642, 0x637, 0x631, 0x627, 0x644, 0x633, 0x648, 0x62f, 0x627, 0x646, 0x633, 0x648,</div><div class='add'>+0x631, 0x64a, 0x627, 0x62a, 0x648, 0x646, 0x633, 0x627, 0x644, 0x627, 0x645, 0x627, 0x631, 0x627, 0x62a, 0x20, 0x627, 0x644, 0x639, 0x631,</div><div class='add'>+0x628, 0x64a, 0x629, 0x20, 0x627, 0x644, 0x645, 0x62a, 0x62d, 0x62f, 0x629, 0x627, 0x644, 0x64a, 0x645, 0x646, 0x540, 0x561, 0x575, 0x565,</div><div class='add'>+0x580, 0x567, 0x576, 0x540, 0x561, 0x575, 0x561, 0x57d, 0x57f, 0x561, 0x576, 0x56b, 0x20, 0x540, 0x561, 0x576, 0x580, 0x561, 0x57a, 0x565,</div><div class='add'>+0x57f, 0x578, 0x582, 0x569, 0x56b, 0x582, 0x576, 0x985, 0x9b8, 0x9ae, 0x9c0, 0x9df, 0x9be, 0x9ad, 0x9be, 0x9f0, 0x9a4, 0x61, 0x7a, 0x259,</div><div class='add'>+0x72, 0x62, 0x61, 0x79, 0x63, 0x61, 0x6e, 0x63, 0x61, 0x41, 0x7a, 0x259, 0x72, 0x62, 0x61, 0x79, 0x63, 0x61, 0x6e, 0x130,</div><div class='add'>+0x72, 0x61, 0x6e, 0x410, 0x437, 0x4d9, 0x440, 0x431, 0x430, 0x458, 0x4b9, 0x430, 0x43d, 0x65, 0x75, 0x73, 0x6b, 0x61, 0x72, 0x61,</div><div class='add'>+0x45, 0x73, 0x70, 0x61, 0x69, 0x6e, 0x69, 0x61, 0x9ac, 0x9be, 0x982, 0x9b2, 0x9be, 0x9ac, 0x9be, 0x982, 0x9b2, 0x9be, 0x9a6, 0x9c7,</div><div class='add'>+0x9b6, 0x9ad, 0x9be, 0x9b0, 0x9a4, 0xf62, 0xfab, 0xf7c, 0xf44, 0xf0b, 0xf41, 0xf60, 0xf56, 0xfb2, 0xf74, 0xf42, 0x46, 0x72, 0x61, 0xf1,</div><div class='add'>+0x73, 0x431, 0x44a, 0x43b, 0x433, 0x430, 0x440, 0x441, 0x43a, 0x438, 0x411, 0x44a, 0x43b, 0x433, 0x430, 0x440, 0x438, 0x44f, 0x1017, 0x1019,</div><div class='add'>+0x102c, 0x1019, 0x103c, 0x1014, 0x103a, 0x1019, 0x102c, 0x431, 0x435, 0x43b, 0x430, 0x440, 0x443, 0x441, 0x43a, 0x430, 0x44f, 0x411, 0x435, 0x43b,</div><div class='add'>+0x430, 0x440, 0x443, 0x441, 0x44c, 0x1797, 0x17b6, 0x179f, 0x17b6, 0x1781, 0x17d2, 0x1798, 0x17c2, 0x179a, 0x1780, 0x1798, 0x17d2, 0x1796, 0x17bb, 0x1787,</div><div class='add'>+0x17b6, 0x63, 0x61, 0x74, 0x61, 0x6c, 0xe0, 0x45, 0x73, 0x70, 0x61, 0x6e, 0x79, 0x61, 0x4e2d, 0x6587, 0x4e2d, 0x56fd, 0x4e2d, 0x83ef,</div><div class='add'>+0x4eba, 0x6c11, 0x5171, 0x548c, 0x570b, 0x9999, 0x6e2f, 0x7279, 0x5225, 0x884c, 0x653f, 0x5340, 0x4e2d, 0x83ef, 0x4eba, 0x6c11, 0x5171, 0x548c, 0x570b, 0x6fb3,</div><div class='add'>+0x9580, 0x7279, 0x5225, 0x884c, 0x653f, 0x5340, 0x65b0, 0x52a0, 0x5761, 0x53f0, 0x7063, 0x4e2d, 0x6587, 0xff08, 0x7b80, 0x4f53, 0xff09, 0x4e2d, 0x56fd, 0x9999,</div><div class='add'>+0x6e2f, 0x7279, 0x522b, 0x884c, 0x653f, 0x533a, 0x4e2d, 0x56fd, 0x6fb3, 0x95e8, 0x7279, 0x522b, 0x884c, 0x653f, 0x533a, 0x7e41, 0x9ad4, 0x4e2d, 0x6587, 0x68,</div><div class='add'>+0x72, 0x76, 0x61, 0x74, 0x73, 0x6b, 0x69, 0x48, 0x72, 0x76, 0x61, 0x74, 0x73, 0x6b, 0x61, 0x10d, 0x65, 0x161, 0x74, 0x69,</div><div class='add'>+0x6e, 0x61, 0x10c, 0x65, 0x73, 0x6b, 0xe1, 0x20, 0x72, 0x65, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x6b, 0x61, 0x64, 0x61, 0x6e,</div><div class='add'>+0x73, 0x6b, 0x44, 0x61, 0x6e, 0x6d, 0x61, 0x72, 0x6b, 0x4e, 0x65, 0x64, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x4e,</div><div class='add'>+0x65, 0x64, 0x65, 0x72, 0x6c, 0x61, 0x6e, 0x64, 0x56, 0x6c, 0x61, 0x61, 0x6d, 0x73, 0x42, 0x65, 0x6c, 0x67, 0x69, 0xeb,</div><div class='add'>+0x55, 0x2e, 0x53, 0x2e, 0x20, 0x45, 0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68, 0x55, 0x6e, 0x69, 0x74, 0x65, 0x64, 0x20, 0x53,</div><div class='add'>+0x74, 0x61, 0x74, 0x65, 0x73, 0x45, 0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x6e,</div><div class='add'>+0x20, 0x53, 0x61, 0x6d, 0x6f, 0x61, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x6e, 0x20, 0x45, 0x6e, 0x67,</div><div class='add'>+0x6c, 0x69, 0x73, 0x68, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x42, 0x65, 0x6c, 0x67, 0x69, 0x75, 0x6d,</div><div class='add'>+0x42, 0x65, 0x6c, 0x69, 0x7a, 0x65, 0x42, 0x6f, 0x74, 0x73, 0x77, 0x61, 0x6e, 0x61, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x69,</div><div class='add'>+0x61, 0x6e, 0x20, 0x45, 0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x61, 0x47, 0x75, 0x61, 0x6d,</div><div class='add'>+0x48, 0x6f, 0x6e, 0x67, 0x20, 0x4b, 0x6f, 0x6e, 0x67, 0x20, 0x53, 0x41, 0x52, 0x20, 0x43, 0x68, 0x69, 0x6e, 0x61, 0x49,</div><div class='add'>+0x6e, 0x64, 0x69, 0x61, 0x49, 0x72, 0x65, 0x6c, 0x61, 0x6e, 0x64, 0x4a, 0x61, 0x6d, 0x61, 0x69, 0x63, 0x61, 0x4d, 0x61,</div><div class='add'>+0x6c, 0x74, 0x61, 0x4d, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6c, 0x6c, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x4d,</div><div class='add'>+0x61, 0x75, 0x72, 0x69, 0x74, 0x69, 0x75, 0x73, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0x61, 0x4e, 0x65, 0x77, 0x20, 0x5a,</div><div class='add'>+0x65, 0x61, 0x6c, 0x61, 0x6e, 0x64, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x65, 0x72, 0x6e, 0x20, 0x4d, 0x61, 0x72, 0x69, 0x61,</div><div class='add'>+0x6e, 0x61, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x50, 0x61, 0x6b, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x50, 0x68,</div><div class='add'>+0x69, 0x6c, 0x69, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x73, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x53, 0x6f,</div><div class='add'>+0x75, 0x74, 0x68, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x54, 0x72, 0x69, 0x6e, 0x69, 0x64, 0x61, 0x64, 0x20, 0x61,</div><div class='add'>+0x6e, 0x64, 0x20, 0x54, 0x6f, 0x62, 0x61, 0x67, 0x6f, 0x42, 0x72, 0x69, 0x74, 0x69, 0x73, 0x68, 0x20, 0x45, 0x6e, 0x67,</div><div class='add'>+0x6c, 0x69, 0x73, 0x68, 0x55, 0x6e, 0x69, 0x74, 0x65, 0x64, 0x20, 0x4b, 0x69, 0x6e, 0x67, 0x64, 0x6f, 0x6d, 0x55, 0x2e,</div><div class='add'>+0x53, 0x2e, 0x20, 0x4d, 0x69, 0x6e, 0x6f, 0x72, 0x20, 0x4f, 0x75, 0x74, 0x6c, 0x79, 0x69, 0x6e, 0x67, 0x20, 0x49, 0x73,</div><div class='add'>+0x6c, 0x61, 0x6e, 0x64, 0x73, 0x55, 0x2e, 0x53, 0x2e, 0x20, 0x56, 0x69, 0x72, 0x67, 0x69, 0x6e, 0x20, 0x49, 0x73, 0x6c,</div><div class='add'>+0x61, 0x6e, 0x64, 0x73, 0x5a, 0x69, 0x6d, 0x62, 0x61, 0x62, 0x77, 0x65, 0xd801, 0xdc0f, 0xd801, 0xdc2d, 0xd801, 0xdc4c, 0xd801, 0xdc34,</div><div class='add'>+0xd801, 0xdc3b, 0xd801, 0xdc32, 0xd801, 0xdc3c, 0x20, 0xd801, 0xdc1d, 0xd801, 0xdc3b, 0xd801, 0xdc29, 0xd801, 0xdc3b, 0xd801, 0xdc45, 0x65, 0x65, 0x73,</div><div class='add'>+0x74, 0x69, 0x45, 0x65, 0x73, 0x74, 0x69, 0x66, 0xf8, 0x72, 0x6f, 0x79, 0x73, 0x6b, 0x74, 0x46, 0xf8, 0x72, 0x6f, 0x79,</div><div class='add'>+0x61, 0x72, 0x73, 0x75, 0x6f, 0x6d, 0x69, 0x53, 0x75, 0x6f, 0x6d, 0x69, 0x66, 0x72, 0x61, 0x6e, 0xe7, 0x61, 0x69, 0x73,</div><div class='add'>+0x46, 0x72, 0x61, 0x6e, 0x63, 0x65, 0x42, 0x65, 0x6c, 0x67, 0x69, 0x71, 0x75, 0x65, 0x43, 0x61, 0x6d, 0x65, 0x72, 0x6f,</div><div class='add'>+0x75, 0x6e, 0x66, 0x72, 0x61, 0x6e, 0xe7, 0x61, 0x69, 0x73, 0x20, 0x63, 0x61, 0x6e, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x52,</div><div class='add'>+0xe9, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x71, 0x75, 0x65, 0x20, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x66, 0x72, 0x69, 0x63,</div><div class='add'>+0x61, 0x69, 0x6e, 0x65, 0x43, 0xf4, 0x74, 0x65, 0x20, 0x64, 0x2019, 0x49, 0x76, 0x6f, 0x69, 0x72, 0x65, 0x47, 0x75, 0x61,</div><div class='add'>+0x64, 0x65, 0x6c, 0x6f, 0x75, 0x70, 0x65, 0x47, 0x75, 0x69, 0x6e, 0xe9, 0x65, 0x4c, 0x75, 0x78, 0x65, 0x6d, 0x62, 0x6f,</div><div class='add'>+0x75, 0x72, 0x67, 0x4d, 0x61, 0x64, 0x61, 0x67, 0x61, 0x73, 0x63, 0x61, 0x72, 0x4d, 0x61, 0x6c, 0x69, 0x4d, 0x61, 0x72,</div><div class='add'>+0x74, 0x69, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x4d, 0x6f, 0x6e, 0x61, 0x63, 0x6f, 0x4e, 0x69, 0x67, 0x65, 0x72, 0x52, 0xe9,</div><div class='add'>+0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x53, 0xe9, 0x6e, 0xe9, 0x67, 0x61, 0x6c, 0x66, 0x72, 0x61, 0x6e, 0xe7, 0x61, 0x69, 0x73,</div><div class='add'>+0x20, 0x73, 0x75, 0x69, 0x73, 0x73, 0x65, 0x53, 0x75, 0x69, 0x73, 0x73, 0x65, 0x53, 0x61, 0x69, 0x6e, 0x74, 0x2d, 0x42,</div><div class='add'>+0x61, 0x72, 0x74, 0x68, 0xe9, 0x6c, 0xe9, 0x6d, 0x79, 0x53, 0x61, 0x69, 0x6e, 0x74, 0x2d, 0x4d, 0x61, 0x72, 0x74, 0x69,</div><div class='add'>+0x6e, 0x67, 0x61, 0x6c, 0x65, 0x67, 0x6f, 0x45, 0x73, 0x70, 0x61, 0xf1, 0x61, 0x10e5, 0x10d0, 0x10e0, 0x10d7, 0x10e3, 0x10da, 0x10d8,</div><div class='add'>+0x10e1, 0x10d0, 0x10e5, 0x10d0, 0x10e0, 0x10d7, 0x10d5, 0x10d4, 0x10da, 0x10dd, 0x44, 0x65, 0x75, 0x74, 0x73, 0x63, 0x68, 0x44, 0x65, 0x75,</div><div class='add'>+0x74, 0x73, 0x63, 0x68, 0x6c, 0x61, 0x6e, 0x64, 0xd6, 0x73, 0x74, 0x65, 0x72, 0x72, 0x65, 0x69, 0x63, 0x68, 0x69, 0x73,</div><div class='add'>+0x63, 0x68, 0x65, 0x73, 0x20, 0x44, 0x65, 0x75, 0x74, 0x73, 0x63, 0x68, 0xd6, 0x73, 0x74, 0x65, 0x72, 0x72, 0x65, 0x69,</div><div class='add'>+0x63, 0x68, 0x42, 0x65, 0x6c, 0x67, 0x69, 0x65, 0x6e, 0x4c, 0x69, 0x65, 0x63, 0x68, 0x74, 0x65, 0x6e, 0x73, 0x74, 0x65,</div><div class='add'>+0x69, 0x6e, 0x4c, 0x75, 0x78, 0x65, 0x6d, 0x62, 0x75, 0x72, 0x67, 0x53, 0x63, 0x68, 0x77, 0x65, 0x69, 0x7a, 0x65, 0x72,</div><div class='add'>+0x20, 0x48, 0x6f, 0x63, 0x68, 0x64, 0x65, 0x75, 0x74, 0x73, 0x63, 0x68, 0x53, 0x63, 0x68, 0x77, 0x65, 0x69, 0x7a, 0x395,</div><div class='add'>+0x3bb, 0x3bb, 0x3b7, 0x3bd, 0x3b9, 0x3ba, 0x3ac, 0x395, 0x3bb, 0x3bb, 0x3ac, 0x3b4, 0x3b1, 0x39a, 0x3cd, 0x3c0, 0x3c1, 0x3bf, 0x3c2, 0x6b,</div><div class='add'>+0x61, 0x6c, 0x61, 0x61, 0x6c, 0x6c, 0x69, 0x73, 0x75, 0x74, 0x4b, 0x61, 0x6c, 0x61, 0x61, 0x6c, 0x6c, 0x69, 0x74, 0x20,</div><div class='add'>+0x4e, 0x75, 0x6e, 0x61, 0x61, 0x74, 0xa97, 0xac1, 0xa9c, 0xab0, 0xabe, 0xaa4, 0xac0, 0xaad, 0xabe, 0xab0, 0xaa4, 0x48, 0x61, 0x75,</div><div class='add'>+0x73, 0x61, 0x47, 0x61, 0x6e, 0x61, 0x4e, 0x69, 0x6a, 0x61, 0x72, 0x4e, 0x61, 0x6a, 0x65, 0x72, 0x69, 0x79, 0x61, 0x53,</div><div class='add'>+0x75, 0x64, 0x61, 0x6e, 0x5e2, 0x5d1, 0x5e8, 0x5d9, 0x5ea, 0x5d9, 0x5e9, 0x5e8, 0x5d0, 0x5dc, 0x939, 0x93f, 0x928, 0x94d, 0x926, 0x940,</div><div class='add'>+0x92d, 0x93e, 0x930, 0x924, 0x6d, 0x61, 0x67, 0x79, 0x61, 0x72, 0x4d, 0x61, 0x67, 0x79, 0x61, 0x72, 0x6f, 0x72, 0x73, 0x7a,</div><div class='add'>+0xe1, 0x67, 0xed, 0x73, 0x6c, 0x65, 0x6e, 0x73, 0x6b, 0x61, 0xcd, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x42, 0x61, 0x68, 0x61,</div><div class='add'>+0x73, 0x61, 0x20, 0x49, 0x6e, 0x64, 0x6f, 0x6e, 0x65, 0x73, 0x69, 0x61, 0x49, 0x6e, 0x64, 0x6f, 0x6e, 0x65, 0x73, 0x69,</div><div class='add'>+0x61, 0x47, 0x61, 0x65, 0x69, 0x6c, 0x67, 0x65, 0xc9, 0x69, 0x72, 0x65, 0x69, 0x74, 0x61, 0x6c, 0x69, 0x61, 0x6e, 0x6f,</div><div class='add'>+0x49, 0x74, 0x61, 0x6c, 0x69, 0x61, 0x53, 0x76, 0x69, 0x7a, 0x7a, 0x65, 0x72, 0x61, 0x65e5, 0x672c, 0x8a9e, 0x65e5, 0x672c, 0xc95,</div><div class='add'>+0xca8, 0xccd, 0xca8, 0xca1, 0xcad, 0xcbe, 0xcb0, 0xca4, 0x49a, 0x430, 0x437, 0x430, 0x49b, 0x49a, 0x430, 0x437, 0x430, 0x49b, 0x441, 0x442,</div><div class='add'>+0x430, 0x43d, 0x4b, 0x69, 0x6e, 0x79, 0x61, 0x72, 0x77, 0x61, 0x6e, 0x64, 0x61, 0x52, 0x77, 0x61, 0x6e, 0x64, 0x61, 0x41a,</div><div class='add'>+0x44b, 0x440, 0x433, 0x44b, 0x437, 0x41a, 0x44b, 0x440, 0x433, 0x44b, 0x437, 0x441, 0x442, 0x430, 0x43d, 0xd55c, 0xad6d, 0xc5b4, 0xb300, 0xd55c,</div><div class='add'>+0xbbfc, 0xad6d, 0x643, 0x648, 0x631, 0x62f, 0x6cc, 0x639, 0x6ce, 0x631, 0x627, 0x642, 0x6b, 0x75, 0x72, 0x64, 0xee, 0x54, 0x69, 0x72,</div><div class='add'>+0x6b, 0x69, 0x79, 0x65, 0xea5, 0xeb2, 0xea7, 0x6c, 0x61, 0x74, 0x76, 0x69, 0x65, 0x161, 0x75, 0x4c, 0x61, 0x74, 0x76, 0x69,</div><div class='add'>+0x6a, 0x61, 0x6c, 0x69, 0x6e, 0x67, 0xe1, 0x6c, 0x61, 0x4b, 0x6f, 0x6e, 0x67, 0xf3, 0x2d, 0x4b, 0x69, 0x6e, 0x73, 0xe1,</div><div class='add'>+0x73, 0xe1, 0x4b, 0x6f, 0x6e, 0x67, 0xf3, 0x2d, 0x42, 0x72, 0x61, 0x7a, 0x7a, 0x61, 0x76, 0x69, 0x6c, 0x6c, 0x65, 0x6c,</div><div class='add'>+0x69, 0x65, 0x74, 0x75, 0x76, 0x69, 0x173, 0x4c, 0x69, 0x65, 0x74, 0x75, 0x76, 0x61, 0x43c, 0x430, 0x43a, 0x435, 0x434, 0x43e,</div><div class='add'>+0x43d, 0x441, 0x43a, 0x438, 0x41c, 0x430, 0x43a, 0x435, 0x434, 0x43e, 0x43d, 0x438, 0x458, 0x430, 0x4d, 0x61, 0x6c, 0x61, 0x67, 0x61,</div><div class='add'>+0x73, 0x79, 0x4d, 0x61, 0x64, 0x61, 0x67, 0x61, 0x73, 0x69, 0x6b, 0x61, 0x72, 0x61, 0x42, 0x61, 0x68, 0x61, 0x73, 0x61,</div><div class='add'>+0x20, 0x4d, 0x65, 0x6c, 0x61, 0x79, 0x75, 0x4d, 0x61, 0x6c, 0x61, 0x79, 0x73, 0x69, 0x61, 0x42, 0x72, 0x75, 0x6e, 0x65,</div><div class='add'>+0x69, 0xd2e, 0xd32, 0xd2f, 0xd3e, 0xd33, 0xd02, 0xd07, 0xd28, 0xd4d, 0xd24, 0xd4d, 0xd2f, 0x4d, 0x61, 0x6c, 0x74, 0x69, 0x92e, 0x930,</div><div class='add'>+0x93e, 0x920, 0x940, 0x43c, 0x43e, 0x43d, 0x433, 0x43e, 0x43b, 0x41c, 0x43e, 0x43d, 0x433, 0x43e, 0x43b, 0x20, 0x443, 0x43b, 0x441, 0x928,</div><div class='add'>+0x947, 0x92a, 0x93e, 0x932, 0x940, 0x928, 0x947, 0x92a, 0x93e, 0x932, 0x6e, 0x6f, 0x72, 0x73, 0x6b, 0x20, 0x62, 0x6f, 0x6b, 0x6d,</div><div class='add'>+0xe5, 0x6c, 0x4e, 0x6f, 0x72, 0x67, 0x65, 0x6f, 0x63, 0x63, 0x69, 0x74, 0x61, 0x6e, 0x46, 0x72, 0x61, 0x6e, 0xe7, 0x61,</div><div class='add'>+0xb13, 0xb21, 0xb3c, 0xb3f, 0xb06, 0xb2d, 0xb3e, 0xb30, 0xb24, 0x67e, 0x69a, 0x62a, 0x648, 0x627, 0x641, 0x63a, 0x627, 0x646, 0x633, 0x62a,</div><div class='add'>+0x627, 0x646, 0x641, 0x627, 0x631, 0x633, 0x6cc, 0x627, 0x6cc, 0x631, 0x627, 0x646, 0x62f, 0x631, 0x6cc, 0x70, 0x6f, 0x6c, 0x73, 0x6b,</div><div class='add'>+0x69, 0x50, 0x6f, 0x6c, 0x73, 0x6b, 0x61, 0x70, 0x6f, 0x72, 0x74, 0x75, 0x67, 0x75, 0xea, 0x73, 0x20, 0x65, 0x75, 0x72,</div><div class='add'>+0x6f, 0x70, 0x65, 0x75, 0x50, 0x6f, 0x72, 0x74, 0x75, 0x67, 0x61, 0x6c, 0x70, 0x6f, 0x72, 0x74, 0x75, 0x67, 0x75, 0xea,</div><div class='add'>+0x73, 0x20, 0x64, 0x6f, 0x20, 0x42, 0x72, 0x61, 0x73, 0x69, 0x6c, 0x42, 0x72, 0x61, 0x73, 0x69, 0x6c, 0x70, 0x6f, 0x72,</div><div class='add'>+0x74, 0x75, 0x67, 0x75, 0xea, 0x73, 0x47, 0x75, 0x69, 0x6e, 0xe9, 0x20, 0x42, 0x69, 0x73, 0x73, 0x61, 0x75, 0x4d, 0x6f,</div><div class='add'>+0xe7, 0x61, 0x6d, 0x62, 0x69, 0x71, 0x75, 0x65, 0xa2a, 0xa70, 0xa1c, 0xa3e, 0xa2c, 0xa40, 0xa2d, 0xa3e, 0xa30, 0xa24, 0x67e, 0x646,</div><div class='add'>+0x62c, 0x627, 0x628, 0x67e, 0x6a9, 0x633, 0x62a, 0x627, 0x646, 0x72, 0x75, 0x6d, 0x61, 0x6e, 0x74, 0x73, 0x63, 0x68, 0x53, 0x76,</div><div class='add'>+0x69, 0x7a, 0x72, 0x61, 0x72, 0x6f, 0x6d, 0xe2, 0x6e, 0x103, 0x52, 0x65, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x61, 0x20,</div><div class='add'>+0x4d, 0x6f, 0x6c, 0x64, 0x6f, 0x76, 0x61, 0x52, 0x6f, 0x6d, 0xe2, 0x6e, 0x69, 0x61, 0x440, 0x443, 0x441, 0x441, 0x43a, 0x438,</div><div class='add'>+0x439, 0x420, 0x43e, 0x441, 0x441, 0x438, 0x44f, 0x41c, 0x43e, 0x43b, 0x434, 0x43e, 0x432, 0x430, 0x423, 0x43a, 0x440, 0x430, 0x438, 0x43d,</div><div class='add'>+0x430, 0x53, 0xe4, 0x6e, 0x67, 0xf6, 0x4b, 0xf6, 0x64, 0xf6, 0x72, 0xf6, 0x73, 0xea, 0x73, 0x65, 0x20, 0x74, 0xee, 0x20,</div><div class='add'>+0x42, 0xea, 0x61, 0x66, 0x72, 0xee, 0x6b, 0x61, 0x938, 0x902, 0x938, 0x94d, 0x915, 0x943, 0x924, 0x20, 0x92d, 0x93e, 0x937, 0x93e,</div><div class='add'>+0x92d, 0x93e, 0x930, 0x924, 0x92e, 0x94d, 0x421, 0x440, 0x43f, 0x441, 0x43a, 0x438, 0x421, 0x440, 0x431, 0x438, 0x458, 0x430, 0x20, 0x438,</div><div class='add'>+0x20, 0x426, 0x440, 0x43d, 0x430, 0x20, 0x413, 0x43e, 0x440, 0x430, 0x441, 0x440, 0x43f, 0x441, 0x43a, 0x438, 0x411, 0x43e, 0x441, 0x43d,</div><div class='add'>+0x430, 0x20, 0x438, 0x20, 0x425, 0x435, 0x440, 0x446, 0x435, 0x433, 0x43e, 0x432, 0x438, 0x43d, 0x430, 0x53, 0x72, 0x70, 0x73, 0x6b,</div><div class='add'>+0x69, 0x43, 0x72, 0x6e, 0x61, 0x20, 0x47, 0x6f, 0x72, 0x61, 0x421, 0x440, 0x431, 0x438, 0x458, 0x430, 0x426, 0x440, 0x43d, 0x430,</div><div class='add'>+0x20, 0x413, 0x43e, 0x440, 0x430, 0x42, 0x6f, 0x73, 0x6e, 0x61, 0x20, 0x69, 0x20, 0x48, 0x65, 0x72, 0x63, 0x65, 0x67, 0x6f,</div><div class='add'>+0x76, 0x69, 0x6e, 0x61, 0x53, 0x72, 0x62, 0x69, 0x6a, 0x61, 0x20, 0x69, 0x20, 0x43, 0x72, 0x6e, 0x61, 0x20, 0x47, 0x6f,</div><div class='add'>+0x72, 0x61, 0x53, 0x72, 0x62, 0x69, 0x6a, 0x61, 0x53, 0x72, 0x70, 0x73, 0x6b, 0x6f, 0x68, 0x72, 0x76, 0x61, 0x74, 0x73,</div><div class='add'>+0x6b, 0x69, 0x53, 0x65, 0x73, 0x6f, 0x74, 0x68, 0x6f, 0x53, 0x65, 0x74, 0x73, 0x77, 0x61, 0x6e, 0x61, 0x63, 0x68, 0x69,</div><div class='add'>+0x53, 0x68, 0x6f, 0x6e, 0x61, 0xdc3, 0xdd2, 0xd82, 0xdc4, 0xdbd, 0xdc1, 0xdca, 0x200d, 0xdbb, 0xdd3, 0x20, 0xdbd, 0xd82, 0xd9a, 0xdcf,</div><div class='add'>+0xdc0, 0x53, 0x69, 0x73, 0x77, 0x61, 0x74, 0x69, 0x73, 0x6c, 0x6f, 0x76, 0x65, 0x6e, 0x10d, 0x69, 0x6e, 0x61, 0x53, 0x6c,</div><div class='add'>+0x6f, 0x76, 0x65, 0x6e, 0x73, 0x6b, 0xe1, 0x20, 0x72, 0x65, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x6b, 0x61, 0x73, 0x6c, 0x6f,</div><div class='add'>+0x76, 0x65, 0x6e, 0x161, 0x10d, 0x69, 0x6e, 0x61, 0x53, 0x6c, 0x6f, 0x76, 0x65, 0x6e, 0x69, 0x6a, 0x61, 0x53, 0x6f, 0x6f,</div><div class='add'>+0x6d, 0x61, 0x61, 0x6c, 0x69, 0x53, 0x6f, 0x6f, 0x6d, 0x61, 0x61, 0x6c, 0x69, 0x79, 0x61, 0x4a, 0x61, 0x62, 0x75, 0x75,</div><div class='add'>+0x74, 0x69, 0x49, 0x74, 0x6f, 0x6f, 0x62, 0x69, 0x79, 0x61, 0x4b, 0x69, 0x69, 0x6e, 0x69, 0x79, 0x61, 0x65, 0x73, 0x70,</div><div class='add'>+0x61, 0xf1, 0x6f, 0x6c, 0x20, 0x64, 0x65, 0x20, 0x45, 0x73, 0x70, 0x61, 0xf1, 0x61, 0x65, 0x73, 0x70, 0x61, 0xf1, 0x6f,</div><div class='add'>+0x6c, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x42, 0x6f, 0x6c, 0x69, 0x76, 0x69, 0x61, 0x43, 0x68, 0x69,</div><div class='add'>+0x6c, 0x65, 0x43, 0x6f, 0x6c, 0x6f, 0x6d, 0x62, 0x69, 0x61, 0x43, 0x6f, 0x73, 0x74, 0x61, 0x20, 0x52, 0x69, 0x63, 0x61,</div><div class='add'>+0x52, 0x65, 0x70, 0xfa, 0x62, 0x6c, 0x69, 0x63, 0x61, 0x20, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x69, 0x63, 0x61, 0x6e, 0x61,</div><div class='add'>+0x45, 0x63, 0x75, 0x61, 0x64, 0x6f, 0x72, 0x45, 0x6c, 0x20, 0x53, 0x61, 0x6c, 0x76, 0x61, 0x64, 0x6f, 0x72, 0x47, 0x75,</div><div class='add'>+0x69, 0x6e, 0x65, 0x61, 0x20, 0x45, 0x63, 0x75, 0x61, 0x74, 0x6f, 0x72, 0x69, 0x61, 0x6c, 0x47, 0x75, 0x61, 0x74, 0x65,</div><div class='add'>+0x6d, 0x61, 0x6c, 0x61, 0x48, 0x6f, 0x6e, 0x64, 0x75, 0x72, 0x61, 0x73, 0x4d, 0xe9, 0x78, 0x69, 0x63, 0x6f, 0x4e, 0x69,</div><div class='add'>+0x63, 0x61, 0x72, 0x61, 0x67, 0x75, 0x61, 0x50, 0x61, 0x6e, 0x61, 0x6d, 0xe1, 0x50, 0x61, 0x72, 0x61, 0x67, 0x75, 0x61,</div><div class='add'>+0x79, 0x50, 0x65, 0x72, 0xfa, 0x50, 0x75, 0x65, 0x72, 0x74, 0x6f, 0x20, 0x52, 0x69, 0x63, 0x6f, 0x45, 0x73, 0x74, 0x61,</div><div class='add'>+0x64, 0x6f, 0x73, 0x20, 0x55, 0x6e, 0x69, 0x64, 0x6f, 0x73, 0x55, 0x72, 0x75, 0x67, 0x75, 0x61, 0x79, 0x56, 0x65, 0x6e,</div><div class='add'>+0x65, 0x7a, 0x75, 0x65, 0x6c, 0x61, 0x65, 0x73, 0x70, 0x61, 0xf1, 0x6f, 0x6c, 0x20, 0x6c, 0x61, 0x74, 0x69, 0x6e, 0x6f,</div><div class='add'>+0x61, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x6e, 0x6f, 0x4c, 0x61, 0x74, 0x69, 0x6e, 0x6f, 0x61, 0x6d, 0xe9, 0x72, 0x69,</div><div class='add'>+0x63, 0x61, 0x20, 0x79, 0x20, 0x65, 0x6c, 0x20, 0x43, 0x61, 0x72, 0x69, 0x62, 0x65, 0x4b, 0x69, 0x73, 0x77, 0x61, 0x68,</div><div class='add'>+0x69, 0x6c, 0x69, 0x4b, 0x65, 0x6e, 0x79, 0x61, 0x54, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x73, 0x76, 0x65, 0x6e,</div><div class='add'>+0x73, 0x6b, 0x61, 0x53, 0x76, 0x65, 0x72, 0x69, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x6c, 0x61, 0x6e, 0x64, 0xba4, 0xbae, 0xbbf,</div><div class='add'>+0xbb4, 0xbcd, 0xb87, 0xba8, 0xbcd, 0xba4, 0xbbf, 0xbaf, 0xbbe, 0xb87, 0xbb2, 0xb99, 0xbcd, 0xb95, 0xbc8, 0x422, 0x430, 0x442, 0x430, 0x440,</div><div class='add'>+0xc24, 0xc46, 0xc32, 0xc41, 0xc17, 0xc41, 0xc2d, 0xc3e, 0xc30, 0xc24, 0x20, 0xc26, 0xc47, 0xc36, 0xc02, 0xe44, 0xe17, 0xe22, 0xf54, 0xf7c,</div><div class='add'>+0xf51, 0xf0b, 0xf66, 0xf90, 0xf51, 0xf0b, 0xf62, 0xf92, 0xfb1, 0xf0b, 0xf53, 0xf42, 0xf62, 0xf92, 0xfb1, 0xf0b, 0xf42, 0xf62, 0xf0b, 0x1275,</div><div class='add'>+0x130d, 0x122d, 0x129b, 0x6c, 0x65, 0x61, 0x20, 0x66, 0x61, 0x6b, 0x61, 0x74, 0x6f, 0x6e, 0x67, 0x61, 0x54, 0x6f, 0x6e, 0x67,</div><div class='add'>+0x61, 0x58, 0x69, 0x74, 0x73, 0x6f, 0x6e, 0x67, 0x61, 0x54, 0xfc, 0x72, 0x6b, 0xe7, 0x65, 0x54, 0xfc, 0x72, 0x6b, 0x69,</div><div class='add'>+0x79, 0x65, 0x443, 0x43a, 0x440, 0x430, 0x457, 0x43d, 0x441, 0x44c, 0x43a, 0x430, 0x423, 0x43a, 0x440, 0x430, 0x457, 0x43d, 0x430, 0x627,</div><div class='add'>+0x631, 0x62f, 0x648, 0x628, 0x6be, 0x627, 0x631, 0x62a, 0x67e, 0x627, 0x6a9, 0x633, 0x62a, 0x627, 0x646, 0x40e, 0x437, 0x431, 0x435, 0x43a,</div><div class='add'>+0x40e, 0x437, 0x431, 0x435, 0x43a, 0x438, 0x441, 0x442, 0x43e, 0x43d, 0x627, 0x6c9, 0x632, 0x628, 0x6d0, 0x6a9, 0x6f, 0x27, 0x7a, 0x62,</div><div class='add'>+0x65, 0x6b, 0x63, 0x68, 0x61, 0x4f, 0x2bf, 0x7a, 0x62, 0x65, 0x6b, 0x69, 0x73, 0x74, 0x6f, 0x6e, 0x54, 0x69, 0x1ebf, 0x6e,</div><div class='add'>+0x67, 0x20, 0x56, 0x69, 0x1ec7, 0x74, 0x56, 0x69, 0x1ec7, 0x74, 0x20, 0x4e, 0x61, 0x6d, 0x43, 0x79, 0x6d, 0x72, 0x61, 0x65,</div><div class='add'>+0x67, 0x50, 0x72, 0x79, 0x64, 0x61, 0x69, 0x6e, 0x20, 0x46, 0x61, 0x77, 0x72, 0x69, 0x73, 0x69, 0x58, 0x68, 0x6f, 0x73,</div><div class='add'>+0x61, 0xc8, 0x64, 0xe8, 0x20, 0x59, 0x6f, 0x72, 0xf9, 0x62, 0xe1, 0x4f, 0x72, 0xed, 0x6c, 0x1eb9, 0x301, 0xe8, 0x64, 0x65,</div><div class='add'>+0x20, 0x4e, 0xe0, 0xec, 0x6a, 0xed, 0x72, 0xed, 0xe0, 0x69, 0x73, 0x69, 0x5a, 0x75, 0x6c, 0x75, 0x69, 0x4e, 0x69, 0x6e,</div><div class='add'>+0x67, 0x69, 0x7a, 0x69, 0x6d, 0x75, 0x20, 0x41, 0x66, 0x72, 0x69, 0x6b, 0x61, 0x6e, 0x79, 0x6e, 0x6f, 0x72, 0x73, 0x6b,</div><div class='add'>+0x4e, 0x6f, 0x72, 0x65, 0x67, 0x62, 0x6f, 0x73, 0x61, 0x6e, 0x73, 0x6b, 0x69, 0x78b, 0x7a8, 0x788, 0x7ac, 0x780, 0x7a8, 0x784,</div><div class='add'>+0x7a6, 0x790, 0x7b0, 0x78b, 0x7a8, 0x788, 0x7ac, 0x780, 0x7a8, 0x20, 0x783, 0x7a7, 0x787, 0x7b0, 0x796, 0x7ac, 0x47, 0x61, 0x65, 0x6c,</div><div class='add'>+0x67, 0x52, 0x79, 0x77, 0x76, 0x61, 0x6e, 0x65, 0x74, 0x68, 0x20, 0x55, 0x6e, 0x79, 0x73, 0x6b, 0x65, 0x72, 0x6e, 0x65,</div><div class='add'>+0x77, 0x65, 0x6b, 0x41, 0x6b, 0x61, 0x6e, 0x47, 0x61, 0x61, 0x6e, 0x61, 0x915, 0x94b, 0x902, 0x915, 0x923, 0x940, 0x49, 0x67,</div><div class='add'>+0x62, 0x6f, 0x4e, 0x69, 0x67, 0x65, 0x72, 0x69, 0x61, 0x4b, 0x69, 0x6b, 0x61, 0x6d, 0x62, 0x61, 0x723, 0x718, 0x72a, 0x71d,</div><div class='add'>+0x71d, 0x710, 0x1265, 0x120a, 0x1295, 0x12a4, 0x122d, 0x1275, 0x122b, 0x130d, 0x12d5, 0x12dd, 0x129b, 0x53, 0x69, 0x64, 0x61, 0x61, 0x6d, 0x75,</div><div class='add'>+0x20, 0x41, 0x66, 0x6f, 0x49, 0x74, 0x69, 0x79, 0x6f, 0x6f, 0x70, 0x68, 0x69, 0x79, 0x61, 0x1275, 0x130d, 0x1228, 0x66, 0x75,</div><div class='add'>+0x72, 0x6c, 0x61, 0x6e, 0x49, 0x74, 0x61, 0x6c, 0x69, 0x65, 0x54, 0x73, 0x68, 0x69, 0x76, 0x65, 0x6e, 0x1e13, 0x61, 0x45,</div><div class='add'>+0x28b, 0x65, 0x67, 0x62, 0x65, 0x47, 0x68, 0x61, 0x6e, 0x61, 0x64, 0x75, 0x54, 0x6f, 0x67, 0x6f, 0x64, 0x75, 0x12c8, 0x120b,</div><div class='add'>+0x12ed, 0x1273, 0x1271, 0x2bb, 0x14d, 0x6c, 0x65, 0x6c, 0x6f, 0x20, 0x48, 0x61, 0x77, 0x61, 0x69, 0x2bb, 0x69, 0x2bb, 0x41, 0x6d,</div><div class='add'>+0x65, 0x6c, 0x69, 0x6b, 0x61, 0x20, 0x48, 0x75, 0x69, 0x20, 0x50, 0x16b, 0x20, 0x2bb, 0x49, 0x61, 0x46, 0x69, 0x6c, 0x69,</div><div class='add'>+0x70, 0x69, 0x6e, 0x6f, 0x50, 0x69, 0x6c, 0x69, 0x70, 0x69, 0x6e, 0x61, 0x73, 0x53, 0x63, 0x68, 0x77, 0x69, 0x69, 0x7a,</div><div class='add'>+0x65, 0x72, 0x74, 0xfc, 0xfc, 0x74, 0x73, 0x63, 0x68, 0x53, 0x63, 0x68, 0x77, 0x69, 0x69, 0x7a, 0xa188, 0xa320, 0xa259, 0xa34f,</div><div class='add'>+0xa1e9, 0x50, 0x6c, 0x61, 0x74, 0x74, 0x64, 0xfc, 0xfc, 0x74, 0x73, 0x63, 0x68, 0x44, 0xfc, 0xfc, 0x74, 0x73, 0x63, 0x68,</div><div class='add'>+0x6c, 0x61, 0x6e, 0x64, 0x69, 0x73, 0x69, 0x4e, 0x64, 0x65, 0x62, 0x65, 0x6c, 0x65, 0x53, 0x65, 0x73, 0x6f, 0x74, 0x68,</div><div class='add'>+0x6f, 0x20, 0x73, 0x61, 0x20, 0x4c, 0x65, 0x62, 0x6f, 0x61, 0x64, 0x61, 0x76, 0x76, 0x69, 0x73, 0xe1, 0x6d, 0x65, 0x67,</div><div class='add'>+0x69, 0x65, 0x6c, 0x6c, 0x61, 0x53, 0x75, 0x6f, 0x70, 0x6d, 0x61, 0x4e, 0x6f, 0x72, 0x67, 0x61, 0x45, 0x6b, 0x65, 0x67,</div><div class='add'>+0x75, 0x73, 0x69, 0x69, 0x4b, 0x69, 0x74, 0x61, 0x69, 0x74, 0x61, 0x50, 0x75, 0x6c, 0x61, 0x61, 0x72, 0x53, 0x65, 0x6e,</div><div class='add'>+0x65, 0x67, 0x61, 0x61, 0x6c, 0x47, 0x69, 0x6b, 0x75, 0x79, 0x75, 0x4b, 0x69, 0x73, 0x61, 0x6d, 0x70, 0x75, 0x72, 0x73,</div><div class='add'>+0x65, 0x6e, 0x61, 0x4b, 0x69, 0x68, 0x6f, 0x72, 0x6f, 0x6d, 0x62, 0x6f, 0x74, 0x61, 0x6d, 0x61, 0x7a, 0x69, 0x67, 0x68,</div><div class='add'>+0x74, 0x6c, 0x6d, 0x263, 0x72, 0x69, 0x62, 0x2d5c, 0x2d30, 0x2d4e, 0x2d30, 0x2d63, 0x2d49, 0x2d56, 0x2d5c, 0x2d4d, 0x2d4e, 0x2d56, 0x2d54, 0x2d49,</div><div class='add'>+0x2d31, 0x54, 0x61, 0x71, 0x62, 0x61, 0x79, 0x6c, 0x69, 0x74, 0x4c, 0x65, 0x7a, 0x7a, 0x61, 0x79, 0x65, 0x72, 0x52, 0x75,</div><div class='add'>+0x6e, 0x79, 0x61, 0x6e, 0x6b, 0x6f, 0x72, 0x65, 0x55, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x48, 0x69, 0x62, 0x65, 0x6e, 0x61,</div><div class='add'>+0x48, 0x75, 0x74, 0x61, 0x6e, 0x7a, 0x61, 0x6e, 0x69, 0x61, 0x4b, 0x79, 0x69, 0x76, 0x75, 0x6e, 0x6a, 0x6f, 0x62, 0x61,</div><div class='add'>+0x6d, 0x61, 0x6e, 0x61, 0x6b, 0x61, 0x6e, 0x4b, 0x129, 0x65, 0x6d, 0x62, 0x75, 0x13e3, 0x13b3, 0x13a9, 0x13a0, 0x13b9, 0x13f0, 0x13df,</div><div class='add'>+0x6b, 0x72, 0x65, 0x6f, 0x6c, 0x20, 0x6d, 0x6f, 0x72, 0x69, 0x73, 0x69, 0x65, 0x6e, 0x4d, 0x6f, 0x72, 0x69, 0x73, 0x43,</div><div class='add'>+0x68, 0x69, 0x6d, 0x61, 0x6b, 0x6f, 0x6e, 0x64, 0x65, 0x4b, 0x268, 0x6c, 0x61, 0x61, 0x6e, 0x67, 0x69, 0x54, 0x61, 0x61,</div><div class='add'>+0x6e, 0x73, 0x61, 0x6e, 0xed, 0x61, 0x4c, 0x75, 0x67, 0x61, 0x6e, 0x64, 0x61, 0x59, 0x75, 0x67, 0x61, 0x6e, 0x64, 0x61,</div><div class='add'>+0x49, 0x63, 0x68, 0x69, 0x62, 0x65, 0x6d, 0x62, 0x61, 0x5a, 0x61, 0x6d, 0x62, 0x69, 0x61, 0x6b, 0x61, 0x62, 0x75, 0x76,</div><div class='add'>+0x65, 0x72, 0x64, 0x69, 0x61, 0x6e, 0x75, 0x4b, 0x61, 0x62, 0x75, 0x20, 0x56, 0x65, 0x72, 0x64, 0x69, 0x4b, 0x129, 0x6d,</div><div class='add'>+0x129, 0x72, 0x169, 0x4b, 0x61, 0x6c, 0x65, 0x6e, 0x6a, 0x69, 0x6e, 0x45, 0x6d, 0x65, 0x74, 0x61, 0x62, 0x20, 0x4b, 0x65,</div><div class='add'>+0x6e, 0x79, 0x61, 0x4b, 0x68, 0x6f, 0x65, 0x6b, 0x68, 0x6f, 0x65, 0x67, 0x6f, 0x77, 0x61, 0x62, 0x4e, 0x61, 0x6d, 0x69,</div><div class='add'>+0x62, 0x69, 0x61, 0x62, 0x4b, 0x69, 0x6d, 0x61, 0x63, 0x68, 0x61, 0x6d, 0x65, 0x44, 0x6f, 0xfc, 0x74, 0x73, 0x63, 0x68,</div><div class='add'>+0x6c, 0x61, 0x6e, 0x64, 0x4d, 0x61, 0x61, 0x54, 0x61, 0x6e, 0x73, 0x61, 0x6e, 0x69, 0x61, 0x4f, 0x6c, 0x75, 0x73, 0x6f,</div><div class='add'>+0x67, 0x61, 0x4c, 0x75, 0x6c, 0x75, 0x68, 0x69, 0x61, 0x4b, 0x69, 0x70, 0x61, 0x72, 0x65, 0x54, 0x61, 0x64, 0x68, 0x61,</div><div class='add'>+0x6e, 0x69, 0x61, 0x4b, 0x69, 0x74, 0x65, 0x73, 0x6f, 0x4b, 0x65, 0x6e, 0x69, 0x61, 0x4b, 0x6f, 0x79, 0x72, 0x61, 0x20,</div><div class='add'>+0x63, 0x69, 0x69, 0x6e, 0x69, 0x4d, 0x61, 0x61, 0x6c, 0x69, 0x4b, 0x69, 0x72, 0x75, 0x77, 0x61, 0x44, 0x68, 0x6f, 0x6c,</div><div class='add'>+0x75, 0x6f, 0x52, 0x75, 0x6b, 0x69, 0x67, 0x61, 0x54, 0x61, 0x6d, 0x61, 0x7a, 0x69, 0x263, 0x74, 0x4d, 0x65, 0x1e5b, 0x1e5b,</div><div class='add'>+0x75, 0x6b, 0x4b, 0x6f, 0x79, 0x72, 0x61, 0x62, 0x6f, 0x72, 0x6f, 0x20, 0x73, 0x65, 0x6e, 0x6e, 0x69, 0x4b, 0x69, 0x73,</div><div class='add'>+0x68, 0x61, 0x6d, 0x62, 0x61, 0x61</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const char language_name_list[] =</div><div class='hunk'>@@ -4534,7 +5288,7 @@ static const char language_name_list[] =</div><div class='ctx'> ;</div><div class='ctx'> </div><div class='ctx'> static const quint16 language_name_index[] = {</div><div class='del'>-     0, // Unused</div><div class='add'>+     0, // AnyLanguage</div><div class='ctx'>      8, // C</div><div class='ctx'>     10, // Abkhazian</div><div class='ctx'>     20, // Afan</div><div class='hunk'>@@ -4751,6 +5505,32 @@ static const quint16 language_name_index[] = {</div><div class='ctx'>   1694, // Shambala</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const char script_name_list[] =</div><div class='add'>+"Default\0"</div><div class='add'>+"Arabic\0"</div><div class='add'>+"Cyrillic\0"</div><div class='add'>+"Deseret\0"</div><div class='add'>+"Gurmukhi\0"</div><div class='add'>+"Simplified Han\0"</div><div class='add'>+"Traditional Han\0"</div><div class='add'>+"Latin\0"</div><div class='add'>+"Mongolian\0"</div><div class='add'>+"Tifinagh\0"</div><div class='add'>+;</div><div class='add'>+</div><div class='add'>+static const quint16 script_name_index[] = {</div><div class='add'>+     0, // AnyScript</div><div class='add'>+     8, // Arabic</div><div class='add'>+    15, // Cyrillic</div><div class='add'>+    24, // Deseret</div><div class='add'>+    32, // Gurmukhi</div><div class='add'>+    41, // Simplified Han</div><div class='add'>+    56, // Traditional Han</div><div class='add'>+    72, // Latin</div><div class='add'>+    78, // Mongolian</div><div class='add'>+    88, // Tifinagh</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const char country_name_list[] =</div><div class='ctx'> "Default\0"</div><div class='ctx'> "Afghanistan\0"</div><div class='hunk'>@@ -5252,7 +6032,7 @@ static const quint16 country_name_index[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const unsigned char language_code_list[] =</div><div class='del'>-"  \0" // Unused</div><div class='add'>+"  \0" // AnyLanguage</div><div class='ctx'> "  \0" // C</div><div class='ctx'> "ab\0" // Abkhazian</div><div class='ctx'> "om\0" // Afan</div><div class='hunk'>@@ -5469,6 +6249,18 @@ static const unsigned char language_code_list[] =</div><div class='ctx'> "ksb" // Shambala</div><div class='ctx'> ;</div><div class='ctx'> </div><div class='add'>+static const unsigned char script_code_list[] =</div><div class='add'>+"\0\0\0\0" // AnyScript</div><div class='add'>+"Arab" // Arabic</div><div class='add'>+"Cyrl" // Cyrillic</div><div class='add'>+"Dsrt" // Deseret</div><div class='add'>+"Guru" // Gurmukhi</div><div class='add'>+"Hans" // Simplified Han</div><div class='add'>+"Hant" // Traditional Han</div><div class='add'>+"Latn" // Latin</div><div class='add'>+"Mong" // Mongolian</div><div class='add'>+"Tfng" // Tifinagh</div><div class='add'>+;</div><div class='ctx'> static const unsigned char country_code_list[] =</div><div class='ctx'> "  \0" // AnyCountry</div><div class='ctx'> "AF\0" // Afghanistan</div><div class='hunk'>@@ -5719,6 +6511,8 @@ static const unsigned char country_code_list[] =</div><div class='ctx'> "419" // LatinAmericaAndTheCaribbean</div><div class='ctx'> ;</div><div class='ctx'> </div><div class='add'>+// GENERATED PART ENDS HERE</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/src/corelib/tools/qlocale_icu.cpp b/src/corelib/tools/qlocale_icu.cpp<br/>new file mode 100644<br/>index 0000000..a04b0bf<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale_icu.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qlocale_icu.cpp</a></div><div class='hunk'>@@ -0,0 +1,224 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qglobal.h"</div><div class='add'>+#include "qlibrary.h"</div><div class='add'>+#include "qdebug.h"</div><div class='add'>+</div><div class='add'>+#include "unicode/uversion.h"</div><div class='add'>+#include "unicode/ucol.h"</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+typedef UCollator *(*Ptr_ucol_open)(const char *loc, UErrorCode *status);</div><div class='add'>+typedef void (*Ptr_ucol_close)(UCollator *coll);</div><div class='add'>+typedef UCollationResult (*Ptr_ucol_strcoll)(const UCollator *coll, const UChar *source, int32_t sourceLength, const UChar *target, int32_t targetLength);</div><div class='add'>+typedef int32_t (*Ptr_u_strToCase)(UChar *dest, int32_t destCapacity, const UChar *src, int32_t srcLength, const char *locale, UErrorCode *pErrorCode);</div><div class='add'>+</div><div class='add'>+static Ptr_ucol_open ptr_ucol_open = 0;</div><div class='add'>+static Ptr_ucol_strcoll ptr_ucol_strcoll = 0;</div><div class='add'>+static Ptr_ucol_close ptr_ucol_close = 0;</div><div class='add'>+static Ptr_u_strToCase ptr_u_strToUpper = 0;</div><div class='add'>+static Ptr_u_strToCase ptr_u_strToLower = 0;</div><div class='add'>+</div><div class='add'>+enum LibLoadStatus</div><div class='add'>+{</div><div class='add'>+    ErrorLoading = -1,</div><div class='add'>+    NotLoaded = 0,</div><div class='add'>+    Loaded = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static LibLoadStatus status = NotLoaded;</div><div class='add'>+</div><div class='add'>+static UCollator *icuCollator = 0;</div><div class='add'>+</div><div class='add'>+#define STRINGIFY2(x) #x</div><div class='add'>+#define STRINGIFY(x) STRINGIFY2(x)</div><div class='add'>+</div><div class='add'>+bool qt_initIcu(const QString &amp;localeString)</div><div class='add'>+{</div><div class='add'>+    if (status == ErrorLoading)</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+    if (status == NotLoaded) {</div><div class='add'>+</div><div class='add'>+        // resolve libicui18n</div><div class='add'>+        QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));</div><div class='add'>+        if (!lib.load()) {</div><div class='add'>+            qWarning() &lt;&lt; "Unable to load library icui18n" &lt;&lt; lib.errorString();</div><div class='add'>+            status = ErrorLoading;</div><div class='add'>+            return false;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        ptr_ucol_open = (Ptr_ucol_open)lib.resolve("ucol_open");</div><div class='add'>+        ptr_ucol_close = (Ptr_ucol_close)lib.resolve("ucol_close");</div><div class='add'>+        ptr_ucol_strcoll = (Ptr_ucol_strcoll)lib.resolve("ucol_strcoll");</div><div class='add'>+</div><div class='add'>+        if (!ptr_ucol_open || !ptr_ucol_close || !ptr_ucol_strcoll) {</div><div class='add'>+            // try again with decorated symbol names</div><div class='add'>+            ptr_ucol_open = (Ptr_ucol_open)lib.resolve("ucol_open" STRINGIFY(U_ICU_VERSION_SUFFIX));</div><div class='add'>+            ptr_ucol_close = (Ptr_ucol_close)lib.resolve("ucol_close" STRINGIFY(U_ICU_VERSION_SUFFIX));</div><div class='add'>+            ptr_ucol_strcoll = (Ptr_ucol_strcoll)lib.resolve("ucol_strcoll" STRINGIFY(U_ICU_VERSION_SUFFIX));</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if (!ptr_ucol_open || !ptr_ucol_close || !ptr_ucol_strcoll) {</div><div class='add'>+            ptr_ucol_open = 0;</div><div class='add'>+            ptr_ucol_close = 0;</div><div class='add'>+            ptr_ucol_strcoll = 0;</div><div class='add'>+</div><div class='add'>+            qWarning("Unable to find symbols in icui18n");</div><div class='add'>+            status = ErrorLoading;</div><div class='add'>+            return false;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        // resolve libicuuc</div><div class='add'>+        QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));</div><div class='add'>+        if (!ucLib.load()) {</div><div class='add'>+            qWarning() &lt;&lt; "Unable to load library icuuc" &lt;&lt; ucLib.errorString();</div><div class='add'>+            status = ErrorLoading;</div><div class='add'>+            return false;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        ptr_u_strToUpper = (Ptr_u_strToCase)ucLib.resolve("u_strToUpper");</div><div class='add'>+        ptr_u_strToLower = (Ptr_u_strToCase)ucLib.resolve("u_strToLower");</div><div class='add'>+</div><div class='add'>+        if (!ptr_u_strToUpper || !ptr_u_strToLower) {</div><div class='add'>+            ptr_u_strToUpper = (Ptr_u_strToCase)ucLib.resolve("u_strToUpper" STRINGIFY(U_ICU_VERSION_SUFFIX));</div><div class='add'>+            ptr_u_strToLower = (Ptr_u_strToCase)ucLib.resolve("u_strToLower" STRINGIFY(U_ICU_VERSION_SUFFIX));</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        if (!ptr_u_strToUpper || !ptr_u_strToLower) {</div><div class='add'>+            ptr_u_strToUpper = 0;</div><div class='add'>+            ptr_u_strToLower = 0;</div><div class='add'>+</div><div class='add'>+            qWarning("Unable to find symbols in icuuc");</div><div class='add'>+            status = ErrorLoading;</div><div class='add'>+            return false;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        // success :)</div><div class='add'>+        status = Loaded;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (icuCollator) {</div><div class='add'>+        ptr_ucol_close(icuCollator);</div><div class='add'>+        icuCollator = 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    UErrorCode icuStatus = U_ZERO_ERROR;</div><div class='add'>+    icuCollator = ptr_ucol_open(localeString.toLatin1().constData(), &amp;icuStatus);</div><div class='add'>+</div><div class='add'>+    if (!icuCollator) {</div><div class='add'>+        qWarning("Unable to open locale %s in ICU, error code %d", qPrintable(localeString), icuStatus);</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool qt_ucol_strcoll(const QChar *source, int sourceLength, const QChar *target, int targetLength, int *result)</div><div class='add'>+{</div><div class='add'>+    Q_ASSERT(result);</div><div class='add'>+    Q_ASSERT(source);</div><div class='add'>+    Q_ASSERT(target);</div><div class='add'>+</div><div class='add'>+    if (!icuCollator)</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+    *result = ptr_ucol_strcoll(icuCollator, reinterpret_cast&lt;const UChar *&gt;(source), int32_t(sourceLength),</div><div class='add'>+                               reinterpret_cast&lt;const UChar *&gt;(target), int32_t(targetLength));</div><div class='add'>+</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// caseFunc can either be u_strToUpper or u_strToLower</div><div class='add'>+static bool qt_u_strToCase(const QString &amp;str, QString *out, const QLocale &amp;locale, Ptr_u_strToCase caseFunc)</div><div class='add'>+{</div><div class='add'>+    Q_ASSERT(out);</div><div class='add'>+</div><div class='add'>+    if (!icuCollator)</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+    QString result(str.size(), Qt::Uninitialized);</div><div class='add'>+</div><div class='add'>+    UErrorCode status = U_ZERO_ERROR;</div><div class='add'>+</div><div class='add'>+    int32_t size = caseFunc(reinterpret_cast&lt;UChar *&gt;(result.data()), result.size(),</div><div class='add'>+            reinterpret_cast&lt;const UChar *&gt;(str.constData()), str.size(),</div><div class='add'>+            locale.bcp47Name().toLatin1().constData(), &amp;status);</div><div class='add'>+</div><div class='add'>+    if (U_FAILURE(status))</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+    if (size &lt; result.size()) {</div><div class='add'>+        result.resize(size);</div><div class='add'>+    } else if (size &gt; result.size()) {</div><div class='add'>+        // the resulting string is larger than our source string</div><div class='add'>+        result.resize(size);</div><div class='add'>+</div><div class='add'>+        status = U_ZERO_ERROR;</div><div class='add'>+        size = caseFunc(reinterpret_cast&lt;UChar *&gt;(result.data()), result.size(),</div><div class='add'>+            reinterpret_cast&lt;const UChar *&gt;(str.constData()), str.size(),</div><div class='add'>+            locale.bcp47Name().toLatin1().constData(), &amp;status);</div><div class='add'>+</div><div class='add'>+        if (U_FAILURE(status))</div><div class='add'>+            return false;</div><div class='add'>+</div><div class='add'>+        // if the sizes don't match now, we give up.</div><div class='add'>+        if (size != result.size())</div><div class='add'>+            return false;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    *out = result;</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool qt_u_strToUpper(const QString &amp;str, QString *out, const QLocale &amp;locale)</div><div class='add'>+{</div><div class='add'>+    return qt_u_strToCase(str, out, locale, ptr_u_strToUpper);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool qt_u_strToLower(const QString &amp;str, QString *out, const QLocale &amp;locale)</div><div class='add'>+{</div><div class='add'>+    return qt_u_strToCase(str, out, locale, ptr_u_strToLower);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/tools/qlocale_mac.mm<br/>new file mode 100644<br/>index 0000000..8919141<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale_mac.mm?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qlocale_mac.mm</a></div><div class='hunk'>@@ -0,0 +1,463 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qlocale_p.h"</div><div class='add'>+</div><div class='add'>+#include "qstringlist.h"</div><div class='add'>+#include "qvariant.h"</div><div class='add'>+#include "qdatetime.h"</div><div class='add'>+</div><div class='add'>+#if !defined(QWS) &amp;&amp; defined(Q_OS_MAC)</div><div class='add'>+#   include "private/qcore_mac_p.h"</div><div class='add'>+#   include &lt;CoreFoundation/CoreFoundation.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+** Wrappers for Mac locale system functions</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+static QByteArray envVarLocale()</div><div class='add'>+{</div><div class='add'>+    static QByteArray lang = 0;</div><div class='add'>+#ifdef Q_OS_UNIX</div><div class='add'>+    lang = qgetenv("LC_ALL");</div><div class='add'>+    if (lang.isEmpty())</div><div class='add'>+        lang = qgetenv("LC_NUMERIC");</div><div class='add'>+    if (lang.isEmpty())</div><div class='add'>+#endif</div><div class='add'>+        lang = qgetenv("LANG");</div><div class='add'>+    return lang;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static QByteArray getMacLocaleName()</div><div class='add'>+{</div><div class='add'>+    QByteArray result = envVarLocale();</div><div class='add'>+</div><div class='add'>+    QString lang, script, cntry;</div><div class='add'>+    if (result.isEmpty() || result != "C"</div><div class='add'>+            &amp;&amp; !qt_splitLocaleName(QString::fromLocal8Bit(result), lang, script, cntry)) {</div><div class='add'>+        QCFType&lt;CFLocaleRef&gt; l = CFLocaleCopyCurrent();</div><div class='add'>+        CFStringRef locale = CFLocaleGetIdentifier(l);</div><div class='add'>+        result = QCFString::toQString(locale).toUtf8();</div><div class='add'>+    }</div><div class='add'>+    return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static QString macMonthName(int month, bool short_format)</div><div class='add'>+{</div><div class='add'>+    month -= 1;</div><div class='add'>+    if (month &lt; 0 || month &gt; 11)</div><div class='add'>+        return QString();</div><div class='add'>+</div><div class='add'>+    QCFType&lt;CFDateFormatterRef&gt; formatter</div><div class='add'>+        = CFDateFormatterCreate(0, QCFType&lt;CFLocaleRef&gt;(CFLocaleCopyCurrent()),</div><div class='add'>+                                kCFDateFormatterNoStyle,  kCFDateFormatterNoStyle);</div><div class='add'>+    QCFType&lt;CFArrayRef&gt; values</div><div class='add'>+        = static_cast&lt;CFArrayRef&gt;(CFDateFormatterCopyProperty(formatter,</div><div class='add'>+                                  short_format ? kCFDateFormatterShortMonthSymbols</div><div class='add'>+                                               : kCFDateFormatterMonthSymbols));</div><div class='add'>+    if (values != 0) {</div><div class='add'>+        CFStringRef cfstring = static_cast&lt;CFStringRef&gt;(CFArrayGetValueAtIndex(values, month));</div><div class='add'>+        return QCFString::toQString(cfstring);</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static QString macDayName(int day, bool short_format)</div><div class='add'>+{</div><div class='add'>+    if (day &lt; 1 || day &gt; 7)</div><div class='add'>+        return QString();</div><div class='add'>+</div><div class='add'>+    QCFType&lt;CFDateFormatterRef&gt; formatter</div><div class='add'>+        = CFDateFormatterCreate(0, QCFType&lt;CFLocaleRef&gt;(CFLocaleCopyCurrent()),</div><div class='add'>+                                kCFDateFormatterNoStyle,  kCFDateFormatterNoStyle);</div><div class='add'>+    QCFType&lt;CFArrayRef&gt; values = static_cast&lt;CFArrayRef&gt;(CFDateFormatterCopyProperty(formatter,</div><div class='add'>+                                            short_format ? kCFDateFormatterShortWeekdaySymbols</div><div class='add'>+                                                         : kCFDateFormatterWeekdaySymbols));</div><div class='add'>+    if (values != 0) {</div><div class='add'>+        CFStringRef cfstring = static_cast&lt;CFStringRef&gt;(CFArrayGetValueAtIndex(values, day % 7));</div><div class='add'>+        return QCFString::toQString(cfstring);</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static QString macDateToString(const QDate &amp;date, bool short_format)</div><div class='add'>+{</div><div class='add'>+    CFGregorianDate macGDate;</div><div class='add'>+    macGDate.year = date.year();</div><div class='add'>+    macGDate.month = date.month();</div><div class='add'>+    macGDate.day = date.day();</div><div class='add'>+    macGDate.hour = 0;</div><div class='add'>+    macGDate.minute = 0;</div><div class='add'>+    macGDate.second = 0.0;</div><div class='add'>+    QCFType&lt;CFDateRef&gt; myDate</div><div class='add'>+        = CFDateCreate(0, CFGregorianDateGetAbsoluteTime(macGDate,</div><div class='add'>+                                                         QCFType&lt;CFTimeZoneRef&gt;(CFTimeZoneCopyDefault())));</div><div class='add'>+    QCFType&lt;CFLocaleRef&gt; mylocale = CFLocaleCopyCurrent();</div><div class='add'>+    CFDateFormatterStyle style = short_format ? kCFDateFormatterShortStyle : kCFDateFormatterLongStyle;</div><div class='add'>+    QCFType&lt;CFDateFormatterRef&gt; myFormatter</div><div class='add'>+        = CFDateFormatterCreate(kCFAllocatorDefault,</div><div class='add'>+                                mylocale, style,</div><div class='add'>+                                kCFDateFormatterNoStyle);</div><div class='add'>+    return QCFString(CFDateFormatterCreateStringWithDate(0, myFormatter, myDate));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static QString macTimeToString(const QTime &amp;time, bool short_format)</div><div class='add'>+{</div><div class='add'>+    CFGregorianDate macGDate;</div><div class='add'>+    // Assume this is local time and the current date</div><div class='add'>+    QDate dt = QDate::currentDate();</div><div class='add'>+    macGDate.year = dt.year();</div><div class='add'>+    macGDate.month = dt.month();</div><div class='add'>+    macGDate.day = dt.day();</div><div class='add'>+    macGDate.hour = time.hour();</div><div class='add'>+    macGDate.minute = time.minute();</div><div class='add'>+    macGDate.second = time.second();</div><div class='add'>+    QCFType&lt;CFDateRef&gt; myDate</div><div class='add'>+        = CFDateCreate(0, CFGregorianDateGetAbsoluteTime(macGDate,</div><div class='add'>+                                                         QCFType&lt;CFTimeZoneRef&gt;(CFTimeZoneCopyDefault())));</div><div class='add'>+</div><div class='add'>+    QCFType&lt;CFLocaleRef&gt; mylocale = CFLocaleCopyCurrent();</div><div class='add'>+    CFDateFormatterStyle style = short_format ? kCFDateFormatterShortStyle :  kCFDateFormatterLongStyle;</div><div class='add'>+    QCFType&lt;CFDateFormatterRef&gt; myFormatter = CFDateFormatterCreate(kCFAllocatorDefault,</div><div class='add'>+                                                                    mylocale,</div><div class='add'>+                                                                    kCFDateFormatterNoStyle,</div><div class='add'>+                                                                    style);</div><div class='add'>+    return QCFString(CFDateFormatterCreateStringWithDate(0, myFormatter, myDate));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static QString macToQtFormat(const QString &amp;sys_fmt)</div><div class='add'>+{</div><div class='add'>+    QString result;</div><div class='add'>+    int i = 0;</div><div class='add'>+</div><div class='add'>+    while (i &lt; sys_fmt.size()) {</div><div class='add'>+        if (sys_fmt.at(i).unicode() == '\'') {</div><div class='add'>+            QString text = qt_readEscapedFormatString(sys_fmt, &amp;i);</div><div class='add'>+            if (text == QLatin1String("'"))</div><div class='add'>+                result += QLatin1String("''");</div><div class='add'>+            else</div><div class='add'>+                result += QLatin1Char('\'') + text + QLatin1Char('\'');</div><div class='add'>+            continue;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        QChar c = sys_fmt.at(i);</div><div class='add'>+        int repeat = qt_repeatCount(sys_fmt, i);</div><div class='add'>+</div><div class='add'>+        switch (c.unicode()) {</div><div class='add'>+            case 'G': // Qt doesn't support these :(</div><div class='add'>+            case 'Y':</div><div class='add'>+            case 'D':</div><div class='add'>+            case 'F':</div><div class='add'>+            case 'w':</div><div class='add'>+            case 'W':</div><div class='add'>+            case 'g':</div><div class='add'>+                break;</div><div class='add'>+</div><div class='add'>+            case 'u': // extended year - use 'y'</div><div class='add'>+                if (repeat &lt; 4)</div><div class='add'>+                    result += QLatin1String("yy");</div><div class='add'>+                else</div><div class='add'>+                    result += QLatin1String("yyyy");</div><div class='add'>+                break;</div><div class='add'>+            case 'S': // fractional second</div><div class='add'>+                if (repeat &lt; 3)</div><div class='add'>+                    result += QLatin1Char('z');</div><div class='add'>+                else</div><div class='add'>+                    result += QLatin1String("zzz");</div><div class='add'>+                break;</div><div class='add'>+            case 'E':</div><div class='add'>+                if (repeat &lt;= 3)</div><div class='add'>+                    result += QLatin1String("ddd");</div><div class='add'>+                else</div><div class='add'>+                    result += QLatin1String("dddd");</div><div class='add'>+                break;</div><div class='add'>+            case 'e':</div><div class='add'>+                if (repeat &gt;= 2)</div><div class='add'>+                    result += QLatin1String("dd");</div><div class='add'>+                else</div><div class='add'>+                    result += QLatin1Char('d');</div><div class='add'>+                break;</div><div class='add'>+            case 'a':</div><div class='add'>+                result += QLatin1String("AP");</div><div class='add'>+                break;</div><div class='add'>+            case 'k':</div><div class='add'>+                result += QString(repeat, QLatin1Char('H'));</div><div class='add'>+                break;</div><div class='add'>+            case 'K':</div><div class='add'>+                result += QString(repeat, QLatin1Char('h'));</div><div class='add'>+                break;</div><div class='add'>+            case 'z':</div><div class='add'>+            case 'Z':</div><div class='add'>+            case 'v':</div><div class='add'>+                result += QLatin1Char('t');</div><div class='add'>+                break;</div><div class='add'>+            default:</div><div class='add'>+                result += QString(repeat, c);</div><div class='add'>+                break;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        i += repeat;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString getMacDateFormat(CFDateFormatterStyle style)</div><div class='add'>+{</div><div class='add'>+    QCFType&lt;CFLocaleRef&gt; l = CFLocaleCopyCurrent();</div><div class='add'>+    QCFType&lt;CFDateFormatterRef&gt; formatter = CFDateFormatterCreate(kCFAllocatorDefault,</div><div class='add'>+                                                                  l, style, kCFDateFormatterNoStyle);</div><div class='add'>+    return macToQtFormat(QCFString::toQString(CFDateFormatterGetFormat(formatter)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static QString getMacTimeFormat(CFDateFormatterStyle style)</div><div class='add'>+{</div><div class='add'>+    QCFType&lt;CFLocaleRef&gt; l = CFLocaleCopyCurrent();</div><div class='add'>+    QCFType&lt;CFDateFormatterRef&gt; formatter = CFDateFormatterCreate(kCFAllocatorDefault,</div><div class='add'>+                                                                  l, kCFDateFormatterNoStyle, style);</div><div class='add'>+    return macToQtFormat(QCFString::toQString(CFDateFormatterGetFormat(formatter)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static QString getCFLocaleValue(CFStringRef key)</div><div class='add'>+{</div><div class='add'>+    QCFType&lt;CFLocaleRef&gt; locale = CFLocaleCopyCurrent();</div><div class='add'>+    CFTypeRef value = CFLocaleGetValue(locale, key);</div><div class='add'>+    return QCFString::toQString(CFStringRef(static_cast&lt;CFTypeRef&gt;(value)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static QLocale::MeasurementSystem macMeasurementSystem()</div><div class='add'>+{</div><div class='add'>+    QCFType&lt;CFLocaleRef&gt; locale = CFLocaleCopyCurrent();</div><div class='add'>+    CFStringRef system = static_cast&lt;CFStringRef&gt;(CFLocaleGetValue(locale, kCFLocaleMeasurementSystem));</div><div class='add'>+    if (QCFString::toQString(system) == QLatin1String("Metric")) {</div><div class='add'>+        return QLocale::MetricSystem;</div><div class='add'>+    } else {</div><div class='add'>+        return QLocale::ImperialSystem;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static quint8 macFirstDayOfWeek()</div><div class='add'>+{</div><div class='add'>+    QCFType&lt;CFCalendarRef&gt; calendar = CFCalendarCopyCurrent();</div><div class='add'>+    quint8 day = static_cast&lt;quint8&gt;(CFCalendarGetFirstWeekday(calendar))-1;</div><div class='add'>+    if (day == 0)</div><div class='add'>+        day = 7;</div><div class='add'>+    return day;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static QString macCurrencySymbol(QLocale::CurrencySymbolFormat format)</div><div class='add'>+{</div><div class='add'>+    QCFType&lt;CFLocaleRef&gt; locale = CFLocaleCopyCurrent();</div><div class='add'>+    switch (format) {</div><div class='add'>+    case QLocale::CurrencyIsoCode:</div><div class='add'>+        return QCFString::toQString(static_cast&lt;CFStringRef&gt;(CFLocaleGetValue(locale, kCFLocaleCurrencyCode)));</div><div class='add'>+    case QLocale::CurrencySymbol:</div><div class='add'>+        return QCFString::toQString(static_cast&lt;CFStringRef&gt;(CFLocaleGetValue(locale, kCFLocaleCurrencySymbol)));</div><div class='add'>+    case QLocale::CurrencyDisplayName: {</div><div class='add'>+        CFStringRef code = static_cast&lt;CFStringRef&gt;(CFLocaleGetValue(locale, kCFLocaleCurrencyCode));</div><div class='add'>+        QCFType&lt;CFStringRef&gt; value = CFLocaleCopyDisplayNameForPropertyValue(locale, kCFLocaleCurrencyCode, code);</div><div class='add'>+        return QCFString::toQString(value);</div><div class='add'>+    }</div><div class='add'>+    default:</div><div class='add'>+        break;</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+static QString macFormatCurrency(const QSystemLocale::CurrencyToStringArgument &amp;arg)</div><div class='add'>+{</div><div class='add'>+    QCFType&lt;CFNumberRef&gt; value;</div><div class='add'>+    switch (arg.value.type()) {</div><div class='add'>+    case QVariant::Int:</div><div class='add'>+    case QVariant::UInt: {</div><div class='add'>+        int v = arg.value.toInt();</div><div class='add'>+        value = CFNumberCreate(NULL, kCFNumberIntType, &amp;v);</div><div class='add'>+        break;</div><div class='add'>+    }</div><div class='add'>+    case QVariant::Double: {</div><div class='add'>+        double v = arg.value.toDouble();</div><div class='add'>+        value = CFNumberCreate(NULL, kCFNumberDoubleType, &amp;v);</div><div class='add'>+        break;</div><div class='add'>+    }</div><div class='add'>+    case QVariant::LongLong:</div><div class='add'>+    case QVariant::ULongLong: {</div><div class='add'>+        qint64 v = arg.value.toLongLong();</div><div class='add'>+        value = CFNumberCreate(NULL, kCFNumberLongLongType, &amp;v);</div><div class='add'>+        break;</div><div class='add'>+    }</div><div class='add'>+    default:</div><div class='add'>+        return QString();</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    QCFType&lt;CFLocaleRef&gt; locale = CFLocaleCopyCurrent();</div><div class='add'>+    QCFType&lt;CFNumberFormatterRef&gt; currencyFormatter =</div><div class='add'>+            CFNumberFormatterCreate(NULL, locale, kCFNumberFormatterCurrencyStyle);</div><div class='add'>+    if (!arg.symbol.isEmpty()) {</div><div class='add'>+        CFNumberFormatterSetProperty(currencyFormatter, kCFNumberFormatterCurrencySymbol,</div><div class='add'>+                                     QCFString::toCFStringRef(arg.symbol));</div><div class='add'>+    }</div><div class='add'>+    QCFType&lt;CFStringRef&gt; result = CFNumberFormatterCreateStringWithNumber(NULL, currencyFormatter, value);</div><div class='add'>+    return QCFString::toQString(result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static QVariant macQuoteString(QSystemLocale::QueryType type, const QStringRef &amp;str)</div><div class='add'>+{</div><div class='add'>+#if MAC_OS_X_VERSION_MAX_ALLOWED &gt;= MAC_OS_X_VERSION_10_6</div><div class='add'>+    if (QSysInfo::MacintoshVersion &lt; QSysInfo::MV_10_6)</div><div class='add'>+        return QVariant();</div><div class='add'>+</div><div class='add'>+    QString begin, end;</div><div class='add'>+    QCFType&lt;CFLocaleRef&gt; locale = CFLocaleCopyCurrent();</div><div class='add'>+    switch (type) {</div><div class='add'>+    case QSystemLocale::StringToStandardQuotation:</div><div class='add'>+        begin = QCFString::toQString(static_cast&lt;CFStringRef&gt;(CFLocaleGetValue(locale, kCFLocaleQuotationBeginDelimiterKey)));</div><div class='add'>+        end = QCFString::toQString(static_cast&lt;CFStringRef&gt;(CFLocaleGetValue(locale, kCFLocaleQuotationEndDelimiterKey)));</div><div class='add'>+        return QString(begin % str % end);</div><div class='add'>+    case QSystemLocale::StringToAlternateQuotation:</div><div class='add'>+        begin = QCFString::toQString(static_cast&lt;CFStringRef&gt;(CFLocaleGetValue(locale, kCFLocaleAlternateQuotationBeginDelimiterKey)));</div><div class='add'>+        end = QCFString::toQString(static_cast&lt;CFStringRef&gt;(CFLocaleGetValue(locale, kCFLocaleAlternateQuotationEndDelimiterKey)));</div><div class='add'>+        return QString(begin % str % end);</div><div class='add'>+     default:</div><div class='add'>+        break;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    return QVariant();</div><div class='add'>+}</div><div class='add'>+#endif //QT_NO_SYSTEMLOCALE</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+</div><div class='add'>+QLocale QSystemLocale::fallbackLocale() const</div><div class='add'>+{</div><div class='add'>+    return QLocale(QString::fromUtf8(getMacLocaleName().constData()));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const</div><div class='add'>+{</div><div class='add'>+    switch(type) {</div><div class='add'>+//     case Name:</div><div class='add'>+//         return getMacLocaleName();</div><div class='add'>+    case DecimalPoint: {</div><div class='add'>+        QString value = getCFLocaleValue(kCFLocaleDecimalSeparator);</div><div class='add'>+        return value.isEmpty() ? QVariant() : value;</div><div class='add'>+    }</div><div class='add'>+    case GroupSeparator: {</div><div class='add'>+        QString value = getCFLocaleValue(kCFLocaleGroupingSeparator);</div><div class='add'>+        return value.isEmpty() ? QVariant() : value;</div><div class='add'>+    }</div><div class='add'>+    case DateFormatLong:</div><div class='add'>+    case DateFormatShort:</div><div class='add'>+        return getMacDateFormat(type == DateFormatShort</div><div class='add'>+                                ? kCFDateFormatterShortStyle</div><div class='add'>+                                : kCFDateFormatterLongStyle);</div><div class='add'>+    case TimeFormatLong:</div><div class='add'>+    case TimeFormatShort:</div><div class='add'>+        return getMacTimeFormat(type == TimeFormatShort</div><div class='add'>+                                ? kCFDateFormatterShortStyle</div><div class='add'>+                                : kCFDateFormatterLongStyle);</div><div class='add'>+    case DayNameLong:</div><div class='add'>+    case DayNameShort:</div><div class='add'>+        return macDayName(in.toInt(), (type == DayNameShort));</div><div class='add'>+    case MonthNameLong:</div><div class='add'>+    case MonthNameShort:</div><div class='add'>+        return macMonthName(in.toInt(), (type == MonthNameShort));</div><div class='add'>+    case DateToStringShort:</div><div class='add'>+    case DateToStringLong:</div><div class='add'>+        return macDateToString(in.toDate(), (type == DateToStringShort));</div><div class='add'>+    case TimeToStringShort:</div><div class='add'>+    case TimeToStringLong:</div><div class='add'>+        return macTimeToString(in.toTime(), (type == TimeToStringShort));</div><div class='add'>+</div><div class='add'>+    case NegativeSign:</div><div class='add'>+    case PositiveSign:</div><div class='add'>+    case ZeroDigit:</div><div class='add'>+        break;</div><div class='add'>+</div><div class='add'>+    case MeasurementSystem:</div><div class='add'>+        return QVariant(static_cast&lt;int&gt;(macMeasurementSystem()));</div><div class='add'>+</div><div class='add'>+    case AMText:</div><div class='add'>+    case PMText: {</div><div class='add'>+        QCFType&lt;CFLocaleRef&gt; locale = CFLocaleCopyCurrent();</div><div class='add'>+        QCFType&lt;CFDateFormatterRef&gt; formatter = CFDateFormatterCreate(NULL, locale, kCFDateFormatterLongStyle, kCFDateFormatterLongStyle);</div><div class='add'>+        QCFType&lt;CFStringRef&gt; value = static_cast&lt;CFStringRef&gt;(CFDateFormatterCopyProperty(formatter,</div><div class='add'>+            (type == AMText ? kCFDateFormatterAMSymbol : kCFDateFormatterPMSymbol)));</div><div class='add'>+        return QCFString::toQString(value);</div><div class='add'>+    }</div><div class='add'>+    case FirstDayOfWeek:</div><div class='add'>+        return QVariant(macFirstDayOfWeek());</div><div class='add'>+    case CurrencySymbol:</div><div class='add'>+        return QVariant(macCurrencySymbol(QLocale::CurrencySymbolFormat(in.toUInt())));</div><div class='add'>+    case CurrencyToString:</div><div class='add'>+        return macFormatCurrency(in.value&lt;QSystemLocale::CurrencyToStringArgument&gt;());</div><div class='add'>+    case UILanguages: {</div><div class='add'>+        QCFType&lt;CFArrayRef&gt; languages = (CFArrayRef)CFPreferencesCopyValue(</div><div class='add'>+                 CFSTR("AppleLanguages"),</div><div class='add'>+                 kCFPreferencesAnyApplication,</div><div class='add'>+                 kCFPreferencesCurrentUser,</div><div class='add'>+                 kCFPreferencesAnyHost);</div><div class='add'>+        const int cnt = CFArrayGetCount(languages);</div><div class='add'>+        QStringList result;</div><div class='add'>+        result.reserve(cnt);</div><div class='add'>+        for (int i = 0; i &lt; cnt; ++i) {</div><div class='add'>+            const QString lang = QCFString::toQString(</div><div class='add'>+                        static_cast&lt;CFStringRef&gt;(CFArrayGetValueAtIndex(languages, i)));</div><div class='add'>+            result.append(lang);</div><div class='add'>+        }</div><div class='add'>+        return QVariant(result);</div><div class='add'>+    }</div><div class='add'>+    case StringToStandardQuotation:</div><div class='add'>+    case StringToAlternateQuotation:</div><div class='add'>+        return macQuoteString(type, in.value&lt;QStringRef&gt;());</div><div class='add'>+    default:</div><div class='add'>+        break;</div><div class='add'>+    }</div><div class='add'>+    return QVariant();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif // QT_NO_SYSTEMLOCALE</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h<br/>index 5971aaa..b607038 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale_p.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale_p.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qlocale_p.h</a></div><div class='hunk'>@@ -55,6 +55,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "QtCore/qstring.h"</div><div class='ctx'> #include "QtCore/qvarlengtharray.h"</div><div class='add'>+#include "QtCore/qmetatype.h"</div><div class='ctx'> </div><div class='ctx'> #include "qlocale.h"</div><div class='ctx'> </div><div class='hunk'>@@ -76,8 +77,24 @@ public:</div><div class='ctx'>     QChar minus() const { return QChar(m_minus); }</div><div class='ctx'>     QChar exponential() const { return QChar(m_exponential); }</div><div class='ctx'> </div><div class='del'>-    quint32 languageId() const { return m_language_id; }</div><div class='del'>-    quint32 countryId() const { return m_country_id; }</div><div class='add'>+    quint16 languageId() const { return m_language_id; }</div><div class='add'>+    quint16 countryId() const { return m_country_id; }</div><div class='add'>+</div><div class='add'>+    QString bcp47Name() const;</div><div class='add'>+</div><div class='add'>+    QString languageCode() const; // ### QByteArray::fromRawData would be more optimal</div><div class='add'>+    QString scriptCode() const;</div><div class='add'>+    QString countryCode() const;</div><div class='add'>+</div><div class='add'>+    static QLocale::Language codeToLanguage(const QString &amp;code);</div><div class='add'>+    static QLocale::Script codeToScript(const QString &amp;code);</div><div class='add'>+    static QLocale::Country codeToCountry(const QString &amp;code);</div><div class='add'>+    static void getLangAndCountry(const QString &amp;name, QLocale::Language &amp;lang,</div><div class='add'>+                                  QLocale::Script &amp;script, QLocale::Country &amp;cntry);</div><div class='add'>+    static const QLocalePrivate *findLocale(QLocale::Language language,</div><div class='add'>+                                            QLocale::Script script,</div><div class='add'>+                                            QLocale::Country country);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'>     QLocale::MeasurementSystem measurementSystem() const;</div><div class='ctx'> </div><div class='hunk'>@@ -108,6 +125,22 @@ public:</div><div class='ctx'>         ParseGroupSeparators</div><div class='ctx'>     };</div><div class='ctx'> </div><div class='add'>+    static QString doubleToString(const QChar zero, const QChar plus,</div><div class='add'>+                                  const QChar minus, const QChar exponent,</div><div class='add'>+                                  const QChar group, const QChar decimal,</div><div class='add'>+                                  double d, int precision,</div><div class='add'>+                                  DoubleForm form,</div><div class='add'>+                                  int width, unsigned flags);</div><div class='add'>+    static QString longLongToString(const QChar zero, const QChar group,</div><div class='add'>+                                    const QChar plus, const QChar minus,</div><div class='add'>+                                    qint64 l, int precision, int base,</div><div class='add'>+                                    int width, unsigned flags);</div><div class='add'>+    static QString unsLongLongToString(const QChar zero, const QChar group,</div><div class='add'>+                                       const QChar plus,</div><div class='add'>+                                       quint64 l, int precision,</div><div class='add'>+                                       int base, int width,</div><div class='add'>+                                       unsigned flags);</div><div class='add'>+</div><div class='ctx'>     QString doubleToString(double d,</div><div class='ctx'>                            int precision = -1,</div><div class='ctx'>                            DoubleForm form = DFSignificantDigits,</div><div class='hunk'>@@ -144,11 +177,17 @@ public:</div><div class='ctx'>     QString dateTimeToString(const QString &amp;format, const QDate *date, const QTime *time,</div><div class='ctx'>                              const QLocale *q) const;</div><div class='ctx'> </div><div class='del'>-    quint16 m_language_id, m_country_id;</div><div class='add'>+    quint16 m_language_id, m_script_id, m_country_id;</div><div class='ctx'> </div><div class='ctx'>     quint16 m_decimal, m_group, m_list, m_percent,</div><div class='ctx'>         m_zero, m_minus, m_plus, m_exponential;</div><div class='add'>+    quint16 m_quotation_start, m_quotation_end;</div><div class='add'>+    quint16 m_alternate_quotation_start, m_alternate_quotation_end;</div><div class='ctx'> </div><div class='add'>+    quint16 m_list_pattern_part_start_idx, m_list_pattern_part_start_size;</div><div class='add'>+    quint16 m_list_pattern_part_mid_idx, m_list_pattern_part_mid_size;</div><div class='add'>+    quint16 m_list_pattern_part_end_idx, m_list_pattern_part_end_size;</div><div class='add'>+    quint16 m_list_pattern_part_two_idx, m_list_pattern_part_two_size;</div><div class='ctx'>     quint16 m_short_date_format_idx, m_short_date_format_size;</div><div class='ctx'>     quint16 m_long_date_format_idx, m_long_date_format_size;</div><div class='ctx'>     quint16 m_short_time_format_idx, m_short_time_format_size;</div><div class='hunk'>@@ -167,6 +206,19 @@ public:</div><div class='ctx'>     quint16 m_narrow_day_names_idx, m_narrow_day_names_size;</div><div class='ctx'>     quint16 m_am_idx, m_am_size;</div><div class='ctx'>     quint16 m_pm_idx, m_pm_size;</div><div class='add'>+    char m_currency_iso_code[3];</div><div class='add'>+    quint16 m_currency_symbol_idx, m_currency_symbol_size;</div><div class='add'>+    quint16 m_currency_display_name_idx, m_currency_display_name_size;</div><div class='add'>+    quint8 m_currency_format_idx, m_currency_format_size;</div><div class='add'>+    quint8 m_currency_negative_format_idx, m_currency_negative_format_size;</div><div class='add'>+    quint16 m_language_endonym_idx, m_language_endonym_size;</div><div class='add'>+    quint16 m_country_endonym_idx, m_country_endonym_size;</div><div class='add'>+    quint16 m_currency_digits : 2;</div><div class='add'>+    quint16 m_currency_rounding : 3;</div><div class='add'>+    quint16 m_first_day_of_week : 3;</div><div class='add'>+    quint16 m_weekend_start : 3;</div><div class='add'>+    quint16 m_weekend_end : 3;</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> inline char QLocalePrivate::digitToCLocale(const QChar &amp;in) const</div><div class='hunk'>@@ -219,6 +271,13 @@ private:</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+QString qt_readEscapedFormatString(const QString &amp;format, int *idx);</div><div class='add'>+bool qt_splitLocaleName(const QString &amp;name, QString &amp;lang, QString &amp;script, QString &amp;cntry);</div><div class='add'>+int qt_repeatCount(const QString &amp;s, int i);</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='add'>+Q_DECLARE_METATYPE(QStringRef)</div><div class='add'>+Q_DECLARE_METATYPE(QList&lt;Qt::DayOfWeek&gt;)</div><div class='add'>+</div><div class='ctx'> #endif // QLOCALE_P_H</div><div class='head'>diff --git a/src/corelib/tools/qlocale_symbian.cpp b/src/corelib/tools/qlocale_symbian.cpp<br/>index 2742c45..a4f6cc8 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale_symbian.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qlocale_symbian.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale_symbian.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qlocale_symbian.cpp</a></div><div class='hunk'>@@ -44,6 +44,7 @@</div><div class='ctx'> #include &lt;QTime&gt;</div><div class='ctx'> #include &lt;QVariant&gt;</div><div class='ctx'> #include &lt;QThread&gt;</div><div class='add'>+#include &lt;QStringList&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;e32std.h&gt;</div><div class='ctx'> #include &lt;e32const.h&gt;</div><div class='hunk'>@@ -57,9 +58,6 @@</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='del'>-// Located in qlocale.cpp</div><div class='del'>-extern void getLangAndCountry(const QString &amp;name, QLocale::Language &amp;lang, QLocale::Country &amp;cntry);</div><div class='del'>-</div><div class='ctx'> static TExtendedLocale _s60Locale;</div><div class='ctx'> </div><div class='ctx'> // Type definitions for runtime resolved function pointers</div><div class='hunk'>@@ -89,6 +87,7 @@ static TPtrC defaultFormatSpec(TExtendedLocale&amp;)</div><div class='ctx'> struct symbianToISO {</div><div class='ctx'>     int symbian_language;</div><div class='ctx'>     char iso_name[8];</div><div class='add'>+    char uilanguage[8];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -97,77 +96,80 @@ struct symbianToISO {</div><div class='ctx'>   NOTE: This array should be sorted by the first column!</div><div class='ctx'> */</div><div class='ctx'> static const symbianToISO symbian_to_iso_list[] = {</div><div class='del'>-    { ELangEnglish,             "en_GB" },  // 1</div><div class='del'>-    { ELangFrench,              "fr_FR" },  // 2</div><div class='del'>-    { ELangGerman,              "de_DE" },  // 3</div><div class='del'>-    { ELangSpanish,             "es_ES" },  // 4</div><div class='del'>-    { ELangItalian,             "it_IT" },  // 5</div><div class='del'>-    { ELangSwedish,             "sv_SE" },  // 6</div><div class='del'>-    { ELangDanish,              "da_DK" },  // 7</div><div class='del'>-    { ELangNorwegian,           "no_NO" },  // 8</div><div class='del'>-    { ELangFinnish,             "fi_FI" },  // 9</div><div class='del'>-    { ELangAmerican,            "en_US" },  // 10</div><div class='del'>-    { ELangPortuguese,          "pt_PT" },  // 13</div><div class='del'>-    { ELangTurkish,             "tr_TR" },  // 14</div><div class='del'>-    { ELangIcelandic,           "is_IS" },  // 15</div><div class='del'>-    { ELangRussian,             "ru_RU" },  // 16</div><div class='del'>-    { ELangHungarian,           "hu_HU" },  // 17</div><div class='del'>-    { ELangDutch,               "nl_NL" },  // 18</div><div class='del'>-    { ELangBelgianFlemish,      "nl_BE" },  // 19</div><div class='del'>-    { ELangCzech,               "cs_CZ" },  // 25</div><div class='del'>-    { ELangSlovak,              "sk_SK" },  // 26</div><div class='del'>-    { ELangPolish,              "pl_PL" },  // 27</div><div class='del'>-    { ELangSlovenian,           "sl_SI" },  // 28</div><div class='del'>-    { ELangTaiwanChinese,       "zh_TW" },  // 29</div><div class='del'>-    { ELangHongKongChinese,     "zh_HK" },  // 30</div><div class='del'>-    { ELangPrcChinese,          "zh_CN" },  // 31</div><div class='del'>-    { ELangJapanese,            "ja_JP" },  // 32</div><div class='del'>-    { ELangThai,                "th_TH" },  // 33</div><div class='del'>-    { ELangArabic,              "ar_AE" },  // 37</div><div class='del'>-    { ELangTagalog,             "tl_PH" },  // 39</div><div class='del'>-    { ELangBulgarian,           "bg_BG" },  // 42</div><div class='del'>-    { ELangCatalan,             "ca_ES" },  // 44</div><div class='del'>-    { ELangCroatian,            "hr_HR" },  // 45</div><div class='del'>-    { ELangEstonian,            "et_EE" },  // 49</div><div class='del'>-    { ELangFarsi,               "fa_IR" },  // 50</div><div class='del'>-    { ELangCanadianFrench,      "fr_CA" },  // 51</div><div class='del'>-    { ELangGreek,               "el_GR" },  // 54</div><div class='del'>-    { ELangHebrew,              "he_IL" },  // 57</div><div class='del'>-    { ELangHindi,               "hi_IN" },  // 58</div><div class='del'>-    { ELangIndonesian,          "id_ID" },  // 59</div><div class='del'>-    { ELangKorean,              "ko_KO" },  // 65</div><div class='del'>-    { ELangLatvian,             "lv_LV" },  // 67</div><div class='del'>-    { ELangLithuanian,          "lt_LT" },  // 68</div><div class='del'>-    { ELangMalay,               "ms_MY" },  // 70</div><div class='del'>-    { ELangNorwegianNynorsk,    "nn_NO" },  // 75</div><div class='del'>-    { ELangBrazilianPortuguese, "pt_BR" },  // 76</div><div class='del'>-    { ELangRomanian,            "ro_RO" },  // 78</div><div class='del'>-    { ELangSerbian,             "sr_RS" },  // 79</div><div class='del'>-    { ELangLatinAmericanSpanish,"es_419" }, // 83</div><div class='del'>-    { ELangUkrainian,           "uk_UA" },  // 93</div><div class='del'>-    { ELangUrdu,                "ur_PK" },  // 94 - India/Pakistan</div><div class='del'>-    { ELangVietnamese,          "vi_VN" },  // 96</div><div class='add'>+    { ELangEnglish,             "en_GB", "en" },    // 1</div><div class='add'>+    { ELangFrench,              "fr_FR", "fr" },    // 2</div><div class='add'>+    { ELangGerman,              "de_DE", "de" },    // 3</div><div class='add'>+    { ELangSpanish,             "es_ES", "es" },    // 4</div><div class='add'>+    { ELangItalian,             "it_IT", "it" },    // 5</div><div class='add'>+    { ELangSwedish,             "sv_SE", "sv" },    // 6</div><div class='add'>+    { ELangDanish,              "da_DK", "da" },    // 7</div><div class='add'>+    { ELangNorwegian,           "nb_NO", "nb" },    // 8</div><div class='add'>+    { ELangFinnish,             "fi_FI", "fi" },    // 9</div><div class='add'>+    { ELangAmerican,            "en_US", "en-US" }, // 10</div><div class='add'>+    { ELangPortuguese,          "pt_PT", "pt" },    // 13</div><div class='add'>+    { ELangTurkish,             "tr_TR", "tr" },    // 14</div><div class='add'>+    { ELangIcelandic,           "is_IS", "is" },    // 15</div><div class='add'>+    { ELangRussian,             "ru_RU", "ru" },    // 16</div><div class='add'>+    { ELangHungarian,           "hu_HU", "hu" },    // 17</div><div class='add'>+    { ELangDutch,               "nl_NL", "nl" },    // 18</div><div class='add'>+    { ELangCzech,               "cs_CZ", "cs" },    // 25</div><div class='add'>+    { ELangSlovak,              "sk_SK", "sk" },    // 26</div><div class='add'>+    { ELangPolish,              "pl_PL", "pl" },    // 27</div><div class='add'>+    { ELangSlovenian,           "sl_SI", "sl" },    // 28</div><div class='add'>+    { ELangTaiwanChinese,       "zh_TW", "zh-TW" }, // 29</div><div class='add'>+    { ELangHongKongChinese,     "zh_HK", "zh-HK" }, // 30</div><div class='add'>+    { ELangPrcChinese,          "zh_CN", "zh" },    // 31</div><div class='add'>+    { ELangJapanese,            "ja_JP", "ja" },    // 32</div><div class='add'>+    { ELangThai,                "th_TH", "th" },    // 33</div><div class='add'>+    { ELangArabic,              "ar_AE", "ar" },    // 37</div><div class='add'>+    { ELangTagalog,             "tl_PH", "tl" },    // 39</div><div class='add'>+    { ELangBulgarian,           "bg_BG", "bg" },    // 42</div><div class='add'>+    { ELangCatalan,             "ca_ES", "ca" },    // 44</div><div class='add'>+    { ELangCroatian,            "hr_HR", "hr" },    // 45</div><div class='add'>+    { ELangEstonian,            "et_EE", "et" },    // 49</div><div class='add'>+    { ELangFarsi,               "fa_IR", "fa" },    // 50</div><div class='add'>+    { ELangCanadianFrench,      "fr_CA", "fr-CA" }, // 51</div><div class='add'>+    { ELangGreek,               "el_GR", "el" },    // 54</div><div class='add'>+    { ELangHebrew,              "he_IL", "he" },    // 57</div><div class='add'>+    { ELangHindi,               "hi_IN", "hi" },    // 58</div><div class='add'>+    { ELangIndonesian,          "id_ID", "id" },    // 59</div><div class='add'>+    { 63/*ELangKazakh*/,        "kk_KZ", "kk" },    // 63</div><div class='add'>+    { ELangKorean,              "ko_KO", "ko" },    // 65</div><div class='add'>+    { ELangLatvian,             "lv_LV", "lv" },    // 67</div><div class='add'>+    { ELangLithuanian,          "lt_LT", "lt" },    // 68</div><div class='add'>+    { ELangMalay,               "ms_MY", "ms" },    // 70</div><div class='add'>+    { ELangNorwegianNynorsk,    "nn_NO", "nn" },    // 75</div><div class='add'>+    { ELangBrazilianPortuguese, "pt_BR", "pt-BR" }, // 76</div><div class='add'>+    { ELangRomanian,            "ro_RO", "ro" },    // 78</div><div class='add'>+    { ELangSerbian,             "sr_RS", "sr" },    // 79</div><div class='add'>+    { ELangLatinAmericanSpanish,"es_419", "es-419" },// 83</div><div class='add'>+    { ELangUkrainian,           "uk_UA", "uk" },    // 93</div><div class='add'>+    { ELangUrdu,                "ur_PK", "ur" },    // 94 - India/Pakistan</div><div class='add'>+    { ELangVietnamese,          "vi_VN", "vi" },    // 96</div><div class='ctx'> #ifdef __E32LANG_H__</div><div class='ctx'> // 5.0</div><div class='del'>-    { ELangBasque,              "eu_ES" },  // 102</div><div class='del'>-    { ELangGalician,            "gl_ES" },  // 103</div><div class='add'>+    { ELangBasque,              "eu_ES", "eu" },    // 102</div><div class='add'>+    { ELangGalician,            "gl_ES", "gl" },    // 103</div><div class='ctx'> #endif</div><div class='ctx'> #if !defined(__SERIES60_31__)</div><div class='del'>-    { ELangEnglish_Apac,        "en" },     // 129</div><div class='del'>-    { ELangEnglish_Taiwan,      "en_TW" },  // 157 ### Not supported by CLDR</div><div class='del'>-    { ELangEnglish_HongKong,    "en_HK" },  // 158</div><div class='del'>-    { ELangEnglish_Prc,         "en_CN" },  // 159 ### Not supported by CLDR</div><div class='del'>-    { ELangEnglish_Japan,       "en_JP"},   // 160 ### Not supported by CLDR</div><div class='del'>-    { ELangEnglish_Thailand,    "en_TH" },  // 161 ### Not supported by CLDR</div><div class='del'>-    { ELangMalay_Apac,          "ms" },     // 326</div><div class='add'>+    { ELangEnglish_Apac,        "en_GB", "en" },     // 129</div><div class='add'>+    { ELangEnglish_Taiwan,      "en_TW", "en-TW" },  // 157 ### Not supported by CLDR</div><div class='add'>+    { ELangEnglish_HongKong,    "en_HK", "en-HK" },  // 158</div><div class='add'>+    { ELangEnglish_Prc,         "en_CN", "en-CN" },  // 159 ### Not supported by CLDR</div><div class='add'>+    { ELangEnglish_Japan,       "en_JP", "en" },     // 160 ### Not supported by CLDR</div><div class='add'>+    { ELangEnglish_Thailand,    "en_TH", "en" },     // 161 ### Not supported by CLDR</div><div class='add'>+    { 230/*ELangEnglish_India*/,"en_IN", "en" },     // 230</div><div class='add'>+    { ELangMalay_Apac,          "ms_MY", "ms" },     // 326</div><div class='ctx'> #endif</div><div class='del'>-    { 327/*ELangIndonesian_Apac*/,"id_ID" } // 327 - appeared in Symbian^3</div><div class='add'>+    { 327/*ELangIndonesian_Apac*/, "id_ID", "id" }   // 327 - appeared in Symbian^3</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*!</div><div class='del'>-    Returns ISO name corresponding to the Symbian locale code \a sys_fmt.</div><div class='del'>-*/</div><div class='del'>-QByteArray qt_symbianLocaleName(int code)</div><div class='add'>+enum LocaleNameType {</div><div class='add'>+    ISO,</div><div class='add'>+    UILanguage</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+QByteArray qt_resolveSymbianLocaleName(int code, LocaleNameType type)</div><div class='ctx'> {</div><div class='ctx'>     //Number of Symbian to ISO locale mappings</div><div class='ctx'>     static const int symbian_to_iso_count</div><div class='hunk'>@@ -177,8 +179,11 @@ QByteArray qt_symbianLocaleName(int code)</div><div class='ctx'>     if (cmp &lt; 0)</div><div class='ctx'>         return 0;</div><div class='ctx'> </div><div class='del'>-    if (cmp == 0)</div><div class='del'>-        return symbian_to_iso_list[0].iso_name;</div><div class='add'>+    if (cmp == 0) {</div><div class='add'>+        if (type == ISO)</div><div class='add'>+            return symbian_to_iso_list[0].iso_name;</div><div class='add'>+        return symbian_to_iso_list[0].uilanguage;</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     int begin = 0;</div><div class='ctx'>     int end = symbian_to_iso_count;</div><div class='hunk'>@@ -188,17 +193,27 @@ QByteArray qt_symbianLocaleName(int code)</div><div class='ctx'> </div><div class='ctx'>         const symbianToISO *elt = symbian_to_iso_list + mid;</div><div class='ctx'>         int cmp = code - elt-&gt;symbian_language;</div><div class='del'>-        if (cmp &lt; 0)</div><div class='add'>+        if (cmp &lt; 0) {</div><div class='ctx'>             end = mid;</div><div class='del'>-        else if (cmp &gt; 0)</div><div class='add'>+        } else if (cmp &gt; 0) {</div><div class='ctx'>             begin = mid;</div><div class='del'>-        else</div><div class='del'>-            return elt-&gt;iso_name;</div><div class='add'>+        } else {</div><div class='add'>+            if (type == ISO)</div><div class='add'>+                return elt-&gt;iso_name;</div><div class='add'>+            return elt-&gt;uilanguage;</div><div class='add'>+        }</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'>     return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*!</div><div class='add'>+    Returns ISO name corresponding to the Symbian locale code \a sys_fmt.</div><div class='add'>+*/</div><div class='add'>+QByteArray qt_symbianLocaleName(int code)</div><div class='add'>+{</div><div class='add'>+    return qt_resolveSymbianLocaleName(code, ISO);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> // order is: normal, abbr, nmode, nmode+abbr</div><div class='ctx'> static const char *us_locale_dep[] = {</div><div class='hunk'>@@ -825,13 +840,13 @@ QLocale QSystemLocale::fallbackLocale() const</div><div class='ctx'>     return QLocale(locale);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*!</div><div class='del'>-    Generic query method for locale data. Provides indirection.</div><div class='del'>-    Denotes the \a type of the query</div><div class='del'>-    with \a in as input data depending on the query.</div><div class='add'>+static QStringList symbianUILanguages()</div><div class='add'>+{</div><div class='add'>+    TLanguage lang = User::Language();</div><div class='add'>+    QString s = QLatin1String(qt_resolveSymbianLocaleName(lang, UILanguage));</div><div class='add'>+    return QStringList(s);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-    \sa QSystemLocale::QueryType</div><div class='del'>-*/</div><div class='ctx'> QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const</div><div class='ctx'> {</div><div class='ctx'>     switch(type) {</div><div class='hunk'>@@ -879,8 +894,9 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const</div><div class='ctx'>                 TLanguage language = User::Language();</div><div class='ctx'>                 QString locale = QLatin1String(qt_symbianLocaleName(language));</div><div class='ctx'>                 QLocale::Language lang;</div><div class='add'>+                QLocale::Script script;</div><div class='ctx'>                 QLocale::Country cntry;</div><div class='del'>-                getLangAndCountry(locale, lang, cntry);</div><div class='add'>+                QLocalePrivate::getLangAndCountry(locale, lang, script, cntry);</div><div class='ctx'>                 if (type == LanguageId)</div><div class='ctx'>                     return lang;</div><div class='ctx'>                 // few iso codes have no country and will use this</div><div class='hunk'>@@ -889,6 +905,8 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const</div><div class='ctx'> </div><div class='ctx'>                 return cntry;</div><div class='ctx'>             }</div><div class='add'>+        case ScriptId:</div><div class='add'>+            return QVariant(QLocale::AnyScript);</div><div class='ctx'>         case NegativeSign:</div><div class='ctx'>         case PositiveSign:</div><div class='ctx'>             break;</div><div class='hunk'>@@ -896,6 +914,8 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const</div><div class='ctx'>             return qt_TDes2QString(TAmPmName(TAmPm(EAm)));</div><div class='ctx'>         case PMText:</div><div class='ctx'>             return qt_TDes2QString(TAmPmName(TAmPm(EPm)));</div><div class='add'>+        case UILanguages:</div><div class='add'>+            return QVariant(symbianUILanguages());</div><div class='ctx'>         default:</div><div class='ctx'>             break;</div><div class='ctx'>     }</div><div class='head'>diff --git a/src/corelib/tools/qlocale_tools.cpp b/src/corelib/tools/qlocale_tools.cpp<br/>new file mode 100644<br/>index 0000000..df31bf9<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale_tools.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qlocale_tools.cpp</a></div><div class='hunk'>@@ -0,0 +1,2961 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qlocale_tools_p.h"</div><div class='add'>+#include "qlocale_p.h"</div><div class='add'>+#include "qstring.h"</div><div class='add'>+</div><div class='add'>+#include &lt;ctype.h&gt;</div><div class='add'>+#include &lt;float.h&gt;</div><div class='add'>+#include &lt;limits.h&gt;</div><div class='add'>+#include &lt;math.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include &lt;time.h&gt;</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_LINUX) &amp;&amp; !defined(__UCLIBC__)</div><div class='add'>+#    include &lt;fenv.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+// Sizes as defined by the ISO C99 standard - fallback</div><div class='add'>+#ifndef LLONG_MAX</div><div class='add'>+#   define LLONG_MAX Q_INT64_C(0x7fffffffffffffff)</div><div class='add'>+#endif</div><div class='add'>+#ifndef LLONG_MIN</div><div class='add'>+#   define LLONG_MIN (-LLONG_MAX - Q_INT64_C(1))</div><div class='add'>+#endif</div><div class='add'>+#ifndef ULLONG_MAX</div><div class='add'>+#   define ULLONG_MAX Q_UINT64_C(0xffffffffffffffff)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+#ifndef QT_QLOCALE_USES_FCVT</div><div class='add'>+static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt,</div><div class='add'>+                        int *sign, char **rve, char **digits_str);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+QString qulltoa(qulonglong l, int base, const QChar _zero)</div><div class='add'>+{</div><div class='add'>+    ushort buff[65]; // length of MAX_ULLONG in base 2</div><div class='add'>+    ushort *p = buff + 65;</div><div class='add'>+</div><div class='add'>+    if (base != 10 || _zero.unicode() == '0') {</div><div class='add'>+        while (l != 0) {</div><div class='add'>+            int c = l % base;</div><div class='add'>+</div><div class='add'>+            --p;</div><div class='add'>+</div><div class='add'>+            if (c &lt; 10)</div><div class='add'>+                *p = '0' + c;</div><div class='add'>+            else</div><div class='add'>+                *p = c - 10 + 'a';</div><div class='add'>+</div><div class='add'>+            l /= base;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    else {</div><div class='add'>+        while (l != 0) {</div><div class='add'>+            int c = l % base;</div><div class='add'>+</div><div class='add'>+            *(--p) = _zero.unicode() + c;</div><div class='add'>+</div><div class='add'>+            l /= base;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return QString(reinterpret_cast&lt;QChar *&gt;(p), 65 - (p - buff));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString qlltoa(qlonglong l, int base, const QChar zero)</div><div class='add'>+{</div><div class='add'>+    return qulltoa(l &lt; 0 ? -l : l, base, zero);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString &amp;decimalForm(QChar zero, QChar decimal, QChar group,</div><div class='add'>+                     QString &amp;digits, int decpt, uint precision,</div><div class='add'>+                     PrecisionMode pm,</div><div class='add'>+                     bool always_show_decpt,</div><div class='add'>+                     bool thousands_group)</div><div class='add'>+{</div><div class='add'>+    if (decpt &lt; 0) {</div><div class='add'>+        for (int i = 0; i &lt; -decpt; ++i)</div><div class='add'>+            digits.prepend(zero);</div><div class='add'>+        decpt = 0;</div><div class='add'>+    }</div><div class='add'>+    else if (decpt &gt; digits.length()) {</div><div class='add'>+        for (int i = digits.length(); i &lt; decpt; ++i)</div><div class='add'>+            digits.append(zero);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (pm == PMDecimalDigits) {</div><div class='add'>+        uint decimal_digits = digits.length() - decpt;</div><div class='add'>+        for (uint i = decimal_digits; i &lt; precision; ++i)</div><div class='add'>+            digits.append(zero);</div><div class='add'>+    }</div><div class='add'>+    else if (pm == PMSignificantDigits) {</div><div class='add'>+        for (uint i = digits.length(); i &lt; precision; ++i)</div><div class='add'>+            digits.append(zero);</div><div class='add'>+    }</div><div class='add'>+    else { // pm == PMChopTrailingZeros</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (always_show_decpt || decpt &lt; digits.length())</div><div class='add'>+        digits.insert(decpt, decimal);</div><div class='add'>+</div><div class='add'>+    if (thousands_group) {</div><div class='add'>+        for (int i = decpt - 3; i &gt; 0; i -= 3)</div><div class='add'>+            digits.insert(i, group);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (decpt == 0)</div><div class='add'>+        digits.prepend(zero);</div><div class='add'>+</div><div class='add'>+    return digits;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString &amp;exponentForm(QChar zero, QChar decimal, QChar exponential,</div><div class='add'>+                      QChar group, QChar plus, QChar minus,</div><div class='add'>+                      QString &amp;digits, int decpt, uint precision,</div><div class='add'>+                      PrecisionMode pm,</div><div class='add'>+                      bool always_show_decpt)</div><div class='add'>+{</div><div class='add'>+    int exp = decpt - 1;</div><div class='add'>+</div><div class='add'>+    if (pm == PMDecimalDigits) {</div><div class='add'>+        for (uint i = digits.length(); i &lt; precision + 1; ++i)</div><div class='add'>+            digits.append(zero);</div><div class='add'>+    }</div><div class='add'>+    else if (pm == PMSignificantDigits) {</div><div class='add'>+        for (uint i = digits.length(); i &lt; precision; ++i)</div><div class='add'>+            digits.append(zero);</div><div class='add'>+    }</div><div class='add'>+    else { // pm == PMChopTrailingZeros</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (always_show_decpt || digits.length() &gt; 1)</div><div class='add'>+        digits.insert(1, decimal);</div><div class='add'>+</div><div class='add'>+    digits.append(exponential);</div><div class='add'>+    digits.append(QLocalePrivate::longLongToString(zero, group, plus, minus,</div><div class='add'>+                   exp, 2, 10, -1, QLocalePrivate::AlwaysShowSign));</div><div class='add'>+</div><div class='add'>+    return digits;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Removes thousand-group separators in "C" locale.</div><div class='add'>+bool removeGroupSeparators(QLocalePrivate::CharBuff *num)</div><div class='add'>+{</div><div class='add'>+    int group_cnt = 0; // counts number of group chars</div><div class='add'>+    int decpt_idx = -1;</div><div class='add'>+</div><div class='add'>+    char *data = num-&gt;data();</div><div class='add'>+    int l = qstrlen(data);</div><div class='add'>+</div><div class='add'>+    // Find the decimal point and check if there are any group chars</div><div class='add'>+    int i = 0;</div><div class='add'>+    for (; i &lt; l; ++i) {</div><div class='add'>+        char c = data[i];</div><div class='add'>+</div><div class='add'>+        if (c == ',') {</div><div class='add'>+            if (i == 0 || data[i - 1] &lt; '0' || data[i - 1] &gt; '9')</div><div class='add'>+                return false;</div><div class='add'>+            if (i == l - 1 || data[i + 1] &lt; '0' || data[i + 1] &gt; '9')</div><div class='add'>+                return false;</div><div class='add'>+            ++group_cnt;</div><div class='add'>+        }</div><div class='add'>+        else if (c == '.') {</div><div class='add'>+            // Fail if more than one decimal points</div><div class='add'>+            if (decpt_idx != -1)</div><div class='add'>+                return false;</div><div class='add'>+            decpt_idx = i;</div><div class='add'>+        } else if (c == 'e' || c == 'E') {</div><div class='add'>+            // an 'e' or 'E' - if we have not encountered a decimal</div><div class='add'>+            // point, this is where it "is".</div><div class='add'>+            if (decpt_idx == -1)</div><div class='add'>+                decpt_idx = i;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    // If no group chars, we're done</div><div class='add'>+    if (group_cnt == 0)</div><div class='add'>+        return true;</div><div class='add'>+</div><div class='add'>+    // No decimal point means that it "is" at the end of the string</div><div class='add'>+    if (decpt_idx == -1)</div><div class='add'>+        decpt_idx = l;</div><div class='add'>+</div><div class='add'>+    i = 0;</div><div class='add'>+    while (i &lt; l &amp;&amp; group_cnt &gt; 0) {</div><div class='add'>+        char c = data[i];</div><div class='add'>+</div><div class='add'>+        if (c == ',') {</div><div class='add'>+            // Don't allow group chars after the decimal point</div><div class='add'>+            if (i &gt; decpt_idx)</div><div class='add'>+                return false;</div><div class='add'>+</div><div class='add'>+            // Check that it is placed correctly relative to the decpt</div><div class='add'>+            if ((decpt_idx - i) % 4 != 0)</div><div class='add'>+                return false;</div><div class='add'>+</div><div class='add'>+            // Remove it</div><div class='add'>+            memmove(data + i, data + i + 1, l - i - 1);</div><div class='add'>+            data[--l] = '\0';</div><div class='add'>+</div><div class='add'>+            --group_cnt;</div><div class='add'>+            --decpt_idx;</div><div class='add'>+        } else {</div><div class='add'>+            // Check that we are not missing a separator</div><div class='add'>+            if (i &lt; decpt_idx</div><div class='add'>+                    &amp;&amp; (decpt_idx - i) % 4 == 0</div><div class='add'>+                    &amp;&amp; !(i == 0 &amp;&amp; c == '-')) // check for negative sign at start of string</div><div class='add'>+                return false;</div><div class='add'>+            ++i;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if defined(Q_CC_MWERKS) &amp;&amp; defined(Q_OS_WIN32)</div><div class='add'>+inline bool isascii(int c)</div><div class='add'>+{</div><div class='add'>+        return (c &gt;= 0 &amp;&amp; c &lt;=127);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*-</div><div class='add'>+ * Copyright (c) 1992, 1993</div><div class='add'>+ *        The Regents of the University of California.  All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * Redistribution and use in source and binary forms, with or without</div><div class='add'>+ * modification, are permitted provided that the following conditions</div><div class='add'>+ * are met:</div><div class='add'>+ * 1. Redistributions of source code must retain the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer.</div><div class='add'>+ * 2. Redistributions in binary form must reproduce the above copyright</div><div class='add'>+ *    notice, this list of conditions and the following disclaimer in the</div><div class='add'>+ *    documentation and/or other materials provided with the distribution.</div><div class='add'>+ * 3. All advertising materials mentioning features or use of this software</div><div class='add'>+ *    must display the following acknowledgment:</div><div class='add'>+ *        This product includes software developed by the University of</div><div class='add'>+ *        California, Berkeley and its contributors.</div><div class='add'>+ * 4. Neither the name of the University nor the names of its contributors</div><div class='add'>+ *    may be used to endorse or promote products derived from this software</div><div class='add'>+ *    without specific prior written permission.</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND</div><div class='add'>+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='add'>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='add'>+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE</div><div class='add'>+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL</div><div class='add'>+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS</div><div class='add'>+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)</div><div class='add'>+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT</div><div class='add'>+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY</div><div class='add'>+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='add'>+ * SUCH DAMAGE.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+// static char sccsid[] = "@(#)strtouq.c        8.1 (Berkeley) 6/4/93";</div><div class='add'>+//  "$FreeBSD: src/lib/libc/stdlib/strtoull.c,v 1.5.2.1 2001/03/02 09:45:20 obrien Exp $";</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert a string to an unsigned long long integer.</div><div class='add'>+ *</div><div class='add'>+ * Ignores `locale' stuff.  Assumes that the upper and lower case</div><div class='add'>+ * alphabets and digits are each contiguous.</div><div class='add'>+ */</div><div class='add'>+qulonglong qstrtoull(const char *nptr, const char **endptr, register int base, bool *ok)</div><div class='add'>+{</div><div class='add'>+    register const char *s = nptr;</div><div class='add'>+    register qulonglong acc;</div><div class='add'>+    register unsigned char c;</div><div class='add'>+    register qulonglong qbase, cutoff;</div><div class='add'>+    register int any, cutlim;</div><div class='add'>+</div><div class='add'>+    if (ok != 0)</div><div class='add'>+        *ok = true;</div><div class='add'>+</div><div class='add'>+    /*</div><div class='add'>+     * See strtoq for comments as to the logic used.</div><div class='add'>+     */</div><div class='add'>+    s = nptr;</div><div class='add'>+    do {</div><div class='add'>+        c = *s++;</div><div class='add'>+    } while (isspace(c));</div><div class='add'>+    if (c == '-') {</div><div class='add'>+        if (ok != 0)</div><div class='add'>+            *ok = false;</div><div class='add'>+        if (endptr != 0)</div><div class='add'>+            *endptr = s - 1;</div><div class='add'>+        return 0;</div><div class='add'>+    } else {</div><div class='add'>+        if (c == '+')</div><div class='add'>+            c = *s++;</div><div class='add'>+    }</div><div class='add'>+    if ((base == 0 || base == 16) &amp;&amp;</div><div class='add'>+        c == '0' &amp;&amp; (*s == 'x' || *s == 'X')) {</div><div class='add'>+        c = s[1];</div><div class='add'>+        s += 2;</div><div class='add'>+        base = 16;</div><div class='add'>+    }</div><div class='add'>+    if (base == 0)</div><div class='add'>+        base = c == '0' ? 8 : 10;</div><div class='add'>+    qbase = unsigned(base);</div><div class='add'>+    cutoff = qulonglong(ULLONG_MAX) / qbase;</div><div class='add'>+    cutlim = qulonglong(ULLONG_MAX) % qbase;</div><div class='add'>+    for (acc = 0, any = 0;; c = *s++) {</div><div class='add'>+        if (!isascii(c))</div><div class='add'>+            break;</div><div class='add'>+        if (isdigit(c))</div><div class='add'>+            c -= '0';</div><div class='add'>+        else if (isalpha(c))</div><div class='add'>+            c -= isupper(c) ? 'A' - 10 : 'a' - 10;</div><div class='add'>+        else</div><div class='add'>+            break;</div><div class='add'>+        if (c &gt;= base)</div><div class='add'>+            break;</div><div class='add'>+        if (any &lt; 0 || acc &gt; cutoff || (acc == cutoff &amp;&amp; c &gt; cutlim))</div><div class='add'>+            any = -1;</div><div class='add'>+        else {</div><div class='add'>+            any = 1;</div><div class='add'>+            acc *= qbase;</div><div class='add'>+            acc += c;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    if (any == 0) {</div><div class='add'>+        if (ok != 0)</div><div class='add'>+            *ok = false;</div><div class='add'>+    } else if (any &lt; 0) {</div><div class='add'>+        acc = ULLONG_MAX;</div><div class='add'>+        if (ok != 0)</div><div class='add'>+            *ok = false;</div><div class='add'>+    }</div><div class='add'>+    if (endptr != 0)</div><div class='add'>+        *endptr = (any ? s - 1 : nptr);</div><div class='add'>+    return acc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+//  "$FreeBSD: src/lib/libc/stdlib/strtoll.c,v 1.5.2.1 2001/03/02 09:45:20 obrien Exp $";</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Convert a string to a long long integer.</div><div class='add'>+ *</div><div class='add'>+ * Ignores `locale' stuff.  Assumes that the upper and lower case</div><div class='add'>+ * alphabets and digits are each contiguous.</div><div class='add'>+ */</div><div class='add'>+qlonglong qstrtoll(const char *nptr, const char **endptr, register int base, bool *ok)</div><div class='add'>+{</div><div class='add'>+    register const char *s;</div><div class='add'>+    register qulonglong acc;</div><div class='add'>+    register unsigned char c;</div><div class='add'>+    register qulonglong qbase, cutoff;</div><div class='add'>+    register int neg, any, cutlim;</div><div class='add'>+</div><div class='add'>+    /*</div><div class='add'>+     * Skip white space and pick up leading +/- sign if any.</div><div class='add'>+     * If base is 0, allow 0x for hex and 0 for octal, else</div><div class='add'>+     * assume decimal; if base is already 16, allow 0x.</div><div class='add'>+     */</div><div class='add'>+    s = nptr;</div><div class='add'>+    do {</div><div class='add'>+        c = *s++;</div><div class='add'>+    } while (isspace(c));</div><div class='add'>+    if (c == '-') {</div><div class='add'>+        neg = 1;</div><div class='add'>+        c = *s++;</div><div class='add'>+    } else {</div><div class='add'>+        neg = 0;</div><div class='add'>+        if (c == '+')</div><div class='add'>+            c = *s++;</div><div class='add'>+    }</div><div class='add'>+    if ((base == 0 || base == 16) &amp;&amp;</div><div class='add'>+        c == '0' &amp;&amp; (*s == 'x' || *s == 'X')) {</div><div class='add'>+        c = s[1];</div><div class='add'>+        s += 2;</div><div class='add'>+        base = 16;</div><div class='add'>+    }</div><div class='add'>+    if (base == 0)</div><div class='add'>+        base = c == '0' ? 8 : 10;</div><div class='add'>+</div><div class='add'>+    /*</div><div class='add'>+     * Compute the cutoff value between legal numbers and illegal</div><div class='add'>+     * numbers.  That is the largest legal value, divided by the</div><div class='add'>+     * base.  An input number that is greater than this value, if</div><div class='add'>+     * followed by a legal input character, is too big.  One that</div><div class='add'>+     * is equal to this value may be valid or not; the limit</div><div class='add'>+     * between valid and invalid numbers is then based on the last</div><div class='add'>+     * digit.  For instance, if the range for quads is</div><div class='add'>+     * [-9223372036854775808..9223372036854775807] and the input base</div><div class='add'>+     * is 10, cutoff will be set to 922337203685477580 and cutlim to</div><div class='add'>+     * either 7 (neg==0) or 8 (neg==1), meaning that if we have</div><div class='add'>+     * accumulated a value &gt; 922337203685477580, or equal but the</div><div class='add'>+     * next digit is &gt; 7 (or 8), the number is too big, and we will</div><div class='add'>+     * return a range error.</div><div class='add'>+     *</div><div class='add'>+     * Set any if any `digits' consumed; make it negative to indicate</div><div class='add'>+     * overflow.</div><div class='add'>+     */</div><div class='add'>+    qbase = unsigned(base);</div><div class='add'>+    cutoff = neg ? qulonglong(0-(LLONG_MIN + LLONG_MAX)) + LLONG_MAX : LLONG_MAX;</div><div class='add'>+    cutlim = cutoff % qbase;</div><div class='add'>+    cutoff /= qbase;</div><div class='add'>+    for (acc = 0, any = 0;; c = *s++) {</div><div class='add'>+        if (!isascii(c))</div><div class='add'>+            break;</div><div class='add'>+        if (isdigit(c))</div><div class='add'>+            c -= '0';</div><div class='add'>+        else if (isalpha(c))</div><div class='add'>+            c -= isupper(c) ? 'A' - 10 : 'a' - 10;</div><div class='add'>+        else</div><div class='add'>+            break;</div><div class='add'>+        if (c &gt;= base)</div><div class='add'>+            break;</div><div class='add'>+        if (any &lt; 0 || acc &gt; cutoff || (acc == cutoff &amp;&amp; c &gt; cutlim))</div><div class='add'>+            any = -1;</div><div class='add'>+        else {</div><div class='add'>+            any = 1;</div><div class='add'>+            acc *= qbase;</div><div class='add'>+            acc += c;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    if (any &lt; 0) {</div><div class='add'>+        acc = neg ? LLONG_MIN : LLONG_MAX;</div><div class='add'>+        if (ok != 0)</div><div class='add'>+            *ok = false;</div><div class='add'>+    } else if (neg) {</div><div class='add'>+        acc = (~acc) + 1;</div><div class='add'>+    }</div><div class='add'>+    if (endptr != 0)</div><div class='add'>+        *endptr = (any &gt;= 0 ? s - 1 : nptr);</div><div class='add'>+</div><div class='add'>+    if (ok != 0)</div><div class='add'>+        *ok = any &gt; 0;</div><div class='add'>+</div><div class='add'>+    return acc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifndef QT_QLOCALE_USES_FCVT</div><div class='add'>+</div><div class='add'>+/*        From: NetBSD: strtod.c,v 1.26 1998/02/03 18:44:21 perry Exp */</div><div class='add'>+/* $FreeBSD: src/lib/libc/stdlib/netbsd_strtod.c,v 1.2.2.2 2001/03/02 17:14:15 tegge Exp $        */</div><div class='add'>+</div><div class='add'>+/* Please send bug reports to</div><div class='add'>+        David M. Gay</div><div class='add'>+        AT&amp;T Bell Laboratories, Room 2C-463</div><div class='add'>+        600 Mountain Avenue</div><div class='add'>+        Murray Hill, NJ 07974-2070</div><div class='add'>+        U.S.A.</div><div class='add'>+        dmg@research.att.com or research!dmg</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* strtod for IEEE-, VAX-, and IBM-arithmetic machines.</div><div class='add'>+ *</div><div class='add'>+ * This strtod returns a nearest machine number to the input decimal</div><div class='add'>+ * string (or sets errno to ERANGE).  With IEEE arithmetic, ties are</div><div class='add'>+ * broken by the IEEE round-even rule.  Otherwise ties are broken by</div><div class='add'>+ * biased rounding (add half and chop).</div><div class='add'>+ *</div><div class='add'>+ * Inspired loosely by William D. Clinger's paper "How to Read Floating</div><div class='add'>+ * Point Numbers Accurately" [Proc. ACM SIGPLAN '90, pp. 92-101].</div><div class='add'>+ *</div><div class='add'>+ * Modifications:</div><div class='add'>+ *</div><div class='add'>+ *        1. We only require IEEE, IBM, or VAX double-precision</div><div class='add'>+ *                arithmetic (not IEEE double-extended).</div><div class='add'>+ *        2. We get by with floating-point arithmetic in a case that</div><div class='add'>+ *                Clinger missed -- when we're computing d * 10^n</div><div class='add'>+ *                for a small integer d and the integer n is not too</div><div class='add'>+ *                much larger than 22 (the maximum integer k for which</div><div class='add'>+ *                we can represent 10^k exactly), we may be able to</div><div class='add'>+ *                compute (d*10^k) * 10^(e-k) with just one roundoff.</div><div class='add'>+ *        3. Rather than a bit-at-a-time adjustment of the binary</div><div class='add'>+ *                result in the hard case, we use floating-point</div><div class='add'>+ *                arithmetic to determine the adjustment to within</div><div class='add'>+ *                one bit; only in really hard cases do we need to</div><div class='add'>+ *                compute a second residual.</div><div class='add'>+ *        4. Because of 3., we don't need a large table of powers of 10</div><div class='add'>+ *                for ten-to-e (just some small tables, e.g. of 10^k</div><div class='add'>+ *                for 0 &lt;= k &lt;= 22).</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * #define IEEE_LITTLE_ENDIAN for IEEE-arithmetic machines where the least</div><div class='add'>+ *        significant byte has the lowest address.</div><div class='add'>+ * #define IEEE_BIG_ENDIAN for IEEE-arithmetic machines where the most</div><div class='add'>+ *        significant byte has the lowest address.</div><div class='add'>+ * #define Long int on machines with 32-bit ints and 64-bit longs.</div><div class='add'>+ * #define Sudden_Underflow for IEEE-format machines without gradual</div><div class='add'>+ *        underflow (i.e., that flush to zero on underflow).</div><div class='add'>+ * #define IBM for IBM mainframe-style floating-point arithmetic.</div><div class='add'>+ * #define VAX for VAX-style floating-point arithmetic.</div><div class='add'>+ * #define Unsigned_Shifts if &gt;&gt; does treats its left operand as unsigned.</div><div class='add'>+ * #define No_leftright to omit left-right logic in fast floating-point</div><div class='add'>+ *        computation of dtoa.</div><div class='add'>+ * #define Check_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3.</div><div class='add'>+ * #define RND_PRODQUOT to use rnd_prod and rnd_quot (assembly routines</div><div class='add'>+ *        that use extended-precision instructions to compute rounded</div><div class='add'>+ *        products and quotients) with IBM.</div><div class='add'>+ * #define ROUND_BIASED for IEEE-format with biased rounding.</div><div class='add'>+ * #define Inaccurate_Divide for IEEE-format with correctly rounded</div><div class='add'>+ *        products but inaccurate quotients, e.g., for Intel i860.</div><div class='add'>+ * #define Just_16 to store 16 bits per 32-bit Long when doing high-precision</div><div class='add'>+ *        integer arithmetic.  Whether this speeds things up or slows things</div><div class='add'>+ *        down depends on the machine and the number being converted.</div><div class='add'>+ * #define KR_headers for old-style C function headers.</div><div class='add'>+ * #define Bad_float_h if your system lacks a float.h or if it does not</div><div class='add'>+ *        define some or all of DBL_DIG, DBL_MAX_10_EXP, DBL_MAX_EXP,</div><div class='add'>+ *        FLT_RADIX, FLT_ROUNDS, and DBL_MAX.</div><div class='add'>+ * #define MALLOC your_malloc, where your_malloc(n) acts like malloc(n)</div><div class='add'>+ *        if memory is available and otherwise does something you deem</div><div class='add'>+ *        appropriate.  If MALLOC is undefined, malloc will be invoked</div><div class='add'>+ *        directly -- and assumed always to succeed.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#if defined(LIBC_SCCS) &amp;&amp; !defined(lint)</div><div class='add'>+__RCSID("$NetBSD: strtod.c,v 1.26 1998/02/03 18:44:21 perry Exp $");</div><div class='add'>+#endif /* LIBC_SCCS and not lint */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+#if defined(__m68k__)    || defined(__sparc__) || defined(__i386__) || \</div><div class='add'>+     defined(__mips__)    || defined(__ns32k__) || defined(__alpha__) || \</div><div class='add'>+     defined(__powerpc__) || defined(Q_OS_WIN) || defined(Q_OS_DARWIN) || defined(Q_OS_MAC) || \</div><div class='add'>+     defined(mips) || defined(Q_OS_AIX) || defined(Q_OS_SOLARIS)</div><div class='add'>+#           define IEEE_BIG_OR_LITTLE_ENDIAN 1</div><div class='add'>+#endif</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+// *All* of our architectures have IEEE arithmetic, don't they?</div><div class='add'>+#define IEEE_BIG_OR_LITTLE_ENDIAN 1</div><div class='add'>+</div><div class='add'>+#ifdef __arm32__</div><div class='add'>+/*</div><div class='add'>+ * Although the CPU is little endian the FP has different</div><div class='add'>+ * byte and word endianness. The byte order is still little endian</div><div class='add'>+ * but the word order is big endian.</div><div class='add'>+ */</div><div class='add'>+#define IEEE_BIG_OR_LITTLE_ENDIAN</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef vax</div><div class='add'>+#define VAX</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define Long        qint32</div><div class='add'>+#define ULong        quint32</div><div class='add'>+</div><div class='add'>+#define MALLOC malloc</div><div class='add'>+</div><div class='add'>+#ifdef BSD_QDTOA_DEBUG</div><div class='add'>+QT_BEGIN_INCLUDE_NAMESPACE</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+QT_END_INCLUDE_NAMESPACE</div><div class='add'>+</div><div class='add'>+#define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef Unsigned_Shifts</div><div class='add'>+#define Sign_Extend(a,b) if (b &lt; 0) a |= 0xffff0000;</div><div class='add'>+#else</div><div class='add'>+#define Sign_Extend(a,b) /*no-op*/</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if (defined(IEEE_BIG_OR_LITTLE_ENDIAN) + defined(VAX) + defined(IBM)) != 1</div><div class='add'>+#error Exactly one of IEEE_BIG_OR_LITTLE_ENDIAN, VAX, or IBM should be defined.</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static inline ULong _getWord0(const NEEDS_VOLATILE double x)</div><div class='add'>+{</div><div class='add'>+    const NEEDS_VOLATILE uchar *ptr = reinterpret_cast&lt;const NEEDS_VOLATILE uchar *&gt;(&amp;x);</div><div class='add'>+    if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {</div><div class='add'>+        return (ptr[0]&lt;&lt;24) + (ptr[1]&lt;&lt;16) + (ptr[2]&lt;&lt;8) + ptr[3];</div><div class='add'>+    } else {</div><div class='add'>+        return (ptr[7]&lt;&lt;24) + (ptr[6]&lt;&lt;16) + (ptr[5]&lt;&lt;8) + ptr[4];</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void _setWord0(NEEDS_VOLATILE double *x, ULong l)</div><div class='add'>+{</div><div class='add'>+    NEEDS_VOLATILE uchar *ptr = reinterpret_cast&lt;NEEDS_VOLATILE uchar *&gt;(x);</div><div class='add'>+    if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {</div><div class='add'>+        ptr[0] = uchar(l&gt;&gt;24);</div><div class='add'>+        ptr[1] = uchar(l&gt;&gt;16);</div><div class='add'>+        ptr[2] = uchar(l&gt;&gt;8);</div><div class='add'>+        ptr[3] = uchar(l);</div><div class='add'>+    } else {</div><div class='add'>+        ptr[7] = uchar(l&gt;&gt;24);</div><div class='add'>+        ptr[6] = uchar(l&gt;&gt;16);</div><div class='add'>+        ptr[5] = uchar(l&gt;&gt;8);</div><div class='add'>+        ptr[4] = uchar(l);</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline ULong _getWord1(const NEEDS_VOLATILE double x)</div><div class='add'>+{</div><div class='add'>+    const NEEDS_VOLATILE uchar *ptr = reinterpret_cast&lt;const NEEDS_VOLATILE uchar *&gt;(&amp;x);</div><div class='add'>+    if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {</div><div class='add'>+        return (ptr[4]&lt;&lt;24) + (ptr[5]&lt;&lt;16) + (ptr[6]&lt;&lt;8) + ptr[7];</div><div class='add'>+    } else {</div><div class='add'>+        return (ptr[3]&lt;&lt;24) + (ptr[2]&lt;&lt;16) + (ptr[1]&lt;&lt;8) + ptr[0];</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+static inline void _setWord1(NEEDS_VOLATILE double *x, ULong l)</div><div class='add'>+{</div><div class='add'>+    NEEDS_VOLATILE uchar *ptr = reinterpret_cast&lt;uchar NEEDS_VOLATILE *&gt;(x);</div><div class='add'>+    if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {</div><div class='add'>+        ptr[4] = uchar(l&gt;&gt;24);</div><div class='add'>+        ptr[5] = uchar(l&gt;&gt;16);</div><div class='add'>+        ptr[6] = uchar(l&gt;&gt;8);</div><div class='add'>+        ptr[7] = uchar(l);</div><div class='add'>+    } else {</div><div class='add'>+        ptr[3] = uchar(l&gt;&gt;24);</div><div class='add'>+        ptr[2] = uchar(l&gt;&gt;16);</div><div class='add'>+        ptr[1] = uchar(l&gt;&gt;8);</div><div class='add'>+        ptr[0] = uchar(l);</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline ULong getWord0(const NEEDS_VOLATILE double x)</div><div class='add'>+{</div><div class='add'>+#ifdef QT_ARMFPA</div><div class='add'>+    return _getWord1(x);</div><div class='add'>+#else</div><div class='add'>+    return _getWord0(x);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void setWord0(NEEDS_VOLATILE double *x, ULong l)</div><div class='add'>+{</div><div class='add'>+#ifdef QT_ARMFPA</div><div class='add'>+    _setWord1(x, l);</div><div class='add'>+#else</div><div class='add'>+    _setWord0(x, l);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline ULong getWord1(const NEEDS_VOLATILE double x)</div><div class='add'>+{</div><div class='add'>+#ifdef QT_ARMFPA</div><div class='add'>+    return _getWord0(x);</div><div class='add'>+#else</div><div class='add'>+    return _getWord1(x);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void setWord1(NEEDS_VOLATILE double *x, ULong l)</div><div class='add'>+{</div><div class='add'>+#ifdef QT_ARMFPA</div><div class='add'>+    _setWord0(x, l);</div><div class='add'>+#else</div><div class='add'>+    _setWord1(x, l);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void Storeinc(ULong *&amp;a, const ULong &amp;b, const ULong &amp;c)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+    *a = (ushort(b) &lt;&lt; 16) | ushort(c);</div><div class='add'>+    ++a;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* #define P DBL_MANT_DIG */</div><div class='add'>+/* Ten_pmax = floor(P*log(2)/log(5)) */</div><div class='add'>+/* Bletch = (highest power of 2 &lt; DBL_MAX_10_EXP) / 16 */</div><div class='add'>+/* Quick_max = floor((P-1)*log(FLT_RADIX)/log(10) - 1) */</div><div class='add'>+/* Int_max = floor(P*log(FLT_RADIX)/log(10) - 1) */</div><div class='add'>+</div><div class='add'>+#if defined(IEEE_BIG_OR_LITTLE_ENDIAN)</div><div class='add'>+#define Exp_shift  20</div><div class='add'>+#define Exp_shift1 20</div><div class='add'>+#define Exp_msk1    0x100000</div><div class='add'>+#define Exp_msk11   0x100000</div><div class='add'>+#define Exp_mask  0x7ff00000</div><div class='add'>+#define P 53</div><div class='add'>+#define Bias 1023</div><div class='add'>+#define IEEE_Arith</div><div class='add'>+#define Emin (-1022)</div><div class='add'>+#define Exp_1  0x3ff00000</div><div class='add'>+#define Exp_11 0x3ff00000</div><div class='add'>+#define Ebits 11</div><div class='add'>+#define Frac_mask  0xfffff</div><div class='add'>+#define Frac_mask1 0xfffff</div><div class='add'>+#define Ten_pmax 22</div><div class='add'>+#define Bletch 0x10</div><div class='add'>+#define Bndry_mask  0xfffff</div><div class='add'>+#define Bndry_mask1 0xfffff</div><div class='add'>+#if defined(LSB) &amp;&amp; defined(Q_OS_VXWORKS)</div><div class='add'>+#undef LSB</div><div class='add'>+#endif</div><div class='add'>+#define LSB 1</div><div class='add'>+#define Sign_bit 0x80000000</div><div class='add'>+#define Log2P 1</div><div class='add'>+#define Tiny0 0</div><div class='add'>+#define Tiny1 1</div><div class='add'>+#define Quick_max 14</div><div class='add'>+#define Int_max 14</div><div class='add'>+#define Infinite(x) (getWord0(x) == 0x7ff00000) /* sufficient test for here */</div><div class='add'>+#else</div><div class='add'>+#undef  Sudden_Underflow</div><div class='add'>+#define Sudden_Underflow</div><div class='add'>+#ifdef IBM</div><div class='add'>+#define Exp_shift  24</div><div class='add'>+#define Exp_shift1 24</div><div class='add'>+#define Exp_msk1   0x1000000</div><div class='add'>+#define Exp_msk11  0x1000000</div><div class='add'>+#define Exp_mask  0x7f000000</div><div class='add'>+#define P 14</div><div class='add'>+#define Bias 65</div><div class='add'>+#define Exp_1  0x41000000</div><div class='add'>+#define Exp_11 0x41000000</div><div class='add'>+#define Ebits 8        /* exponent has 7 bits, but 8 is the right value in b2d */</div><div class='add'>+#define Frac_mask  0xffffff</div><div class='add'>+#define Frac_mask1 0xffffff</div><div class='add'>+#define Bletch 4</div><div class='add'>+#define Ten_pmax 22</div><div class='add'>+#define Bndry_mask  0xefffff</div><div class='add'>+#define Bndry_mask1 0xffffff</div><div class='add'>+#define LSB 1</div><div class='add'>+#define Sign_bit 0x80000000</div><div class='add'>+#define Log2P 4</div><div class='add'>+#define Tiny0 0x100000</div><div class='add'>+#define Tiny1 0</div><div class='add'>+#define Quick_max 14</div><div class='add'>+#define Int_max 15</div><div class='add'>+#else /* VAX */</div><div class='add'>+#define Exp_shift  23</div><div class='add'>+#define Exp_shift1 7</div><div class='add'>+#define Exp_msk1    0x80</div><div class='add'>+#define Exp_msk11   0x800000</div><div class='add'>+#define Exp_mask  0x7f80</div><div class='add'>+#define P 56</div><div class='add'>+#define Bias 129</div><div class='add'>+#define Exp_1  0x40800000</div><div class='add'>+#define Exp_11 0x4080</div><div class='add'>+#define Ebits 8</div><div class='add'>+#define Frac_mask  0x7fffff</div><div class='add'>+#define Frac_mask1 0xffff007f</div><div class='add'>+#define Ten_pmax 24</div><div class='add'>+#define Bletch 2</div><div class='add'>+#define Bndry_mask  0xffff007f</div><div class='add'>+#define Bndry_mask1 0xffff007f</div><div class='add'>+#define LSB 0x10000</div><div class='add'>+#define Sign_bit 0x8000</div><div class='add'>+#define Log2P 1</div><div class='add'>+#define Tiny0 0x80</div><div class='add'>+#define Tiny1 0</div><div class='add'>+#define Quick_max 15</div><div class='add'>+#define Int_max 15</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef IEEE_Arith</div><div class='add'>+#define ROUND_BIASED</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifdef RND_PRODQUOT</div><div class='add'>+#define rounded_product(a,b) a = rnd_prod(a, b)</div><div class='add'>+#define rounded_quotient(a,b) a = rnd_quot(a, b)</div><div class='add'>+extern double rnd_prod(double, double), rnd_quot(double, double);</div><div class='add'>+#else</div><div class='add'>+#define rounded_product(a,b) a *= b</div><div class='add'>+#define rounded_quotient(a,b) a /= b</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define Big0 (Frac_mask1 | Exp_msk1*(DBL_MAX_EXP+Bias-1))</div><div class='add'>+#define Big1 0xffffffff</div><div class='add'>+</div><div class='add'>+#ifndef Just_16</div><div class='add'>+/* When Pack_32 is not defined, we store 16 bits per 32-bit Long.</div><div class='add'>+ * This makes some inner loops simpler and sometimes saves work</div><div class='add'>+ * during multiplications, but it often seems to make things slightly</div><div class='add'>+ * slower.  Hence the default is now to store 32 bits per Long.</div><div class='add'>+ */</div><div class='add'>+#ifndef Pack_32</div><div class='add'>+#define Pack_32</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define Kmax 15</div><div class='add'>+</div><div class='add'>+struct</div><div class='add'>+Bigint {</div><div class='add'>+    struct Bigint *next;</div><div class='add'>+    int k, maxwds, sign, wds;</div><div class='add'>+    ULong x[1];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+ typedef struct Bigint Bigint;</div><div class='add'>+</div><div class='add'>+static Bigint *Balloc(int k)</div><div class='add'>+{</div><div class='add'>+    int x;</div><div class='add'>+    Bigint *rv;</div><div class='add'>+</div><div class='add'>+    x = 1 &lt;&lt; k;</div><div class='add'>+    rv = static_cast&lt;Bigint *&gt;(MALLOC(sizeof(Bigint) + (x-1)*sizeof(Long)));</div><div class='add'>+    Q_CHECK_PTR(rv);</div><div class='add'>+    rv-&gt;k = k;</div><div class='add'>+    rv-&gt;maxwds = x;</div><div class='add'>+    rv-&gt;sign = rv-&gt;wds = 0;</div><div class='add'>+    return rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void Bfree(Bigint *v)</div><div class='add'>+{</div><div class='add'>+    free(v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define Bcopy(x,y) memcpy(reinterpret_cast&lt;char *&gt;(&amp;x-&gt;sign), reinterpret_cast&lt;char *&gt;(&amp;y-&gt;sign), \</div><div class='add'>+y-&gt;wds*sizeof(Long) + 2*sizeof(int))</div><div class='add'>+</div><div class='add'>+/* multiply by m and add a */</div><div class='add'>+static Bigint *multadd(Bigint *b, int m, int a)</div><div class='add'>+{</div><div class='add'>+    int i, wds;</div><div class='add'>+    ULong *x, y;</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+    ULong xi, z;</div><div class='add'>+#endif</div><div class='add'>+    Bigint *b1;</div><div class='add'>+</div><div class='add'>+    wds = b-&gt;wds;</div><div class='add'>+    x = b-&gt;x;</div><div class='add'>+    i = 0;</div><div class='add'>+    do {</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+        xi = *x;</div><div class='add'>+        y = (xi &amp; 0xffff) * m + a;</div><div class='add'>+        z = (xi &gt;&gt; 16) * m + (y &gt;&gt; 16);</div><div class='add'>+        a = (z &gt;&gt; 16);</div><div class='add'>+        *x++ = (z &lt;&lt; 16) + (y &amp; 0xffff);</div><div class='add'>+#else</div><div class='add'>+        y = *x * m + a;</div><div class='add'>+        a = (y &gt;&gt; 16);</div><div class='add'>+        *x++ = y &amp; 0xffff;</div><div class='add'>+#endif</div><div class='add'>+    }</div><div class='add'>+    while(++i &lt; wds);</div><div class='add'>+    if (a) {</div><div class='add'>+        if (wds &gt;= b-&gt;maxwds) {</div><div class='add'>+            b1 = Balloc(b-&gt;k+1);</div><div class='add'>+            Bcopy(b1, b);</div><div class='add'>+            Bfree(b);</div><div class='add'>+            b = b1;</div><div class='add'>+        }</div><div class='add'>+        b-&gt;x[wds++] = a;</div><div class='add'>+        b-&gt;wds = wds;</div><div class='add'>+    }</div><div class='add'>+    return b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static Bigint *s2b(const char *s, int nd0, int nd, ULong y9)</div><div class='add'>+{</div><div class='add'>+    Bigint *b;</div><div class='add'>+    int i, k;</div><div class='add'>+    Long x, y;</div><div class='add'>+</div><div class='add'>+    x = (nd + 8) / 9;</div><div class='add'>+    for(k = 0, y = 1; x &gt; y; y &lt;&lt;= 1, k++) ;</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+    b = Balloc(k);</div><div class='add'>+    b-&gt;x[0] = y9;</div><div class='add'>+    b-&gt;wds = 1;</div><div class='add'>+#else</div><div class='add'>+    b = Balloc(k+1);</div><div class='add'>+    b-&gt;x[0] = y9 &amp; 0xffff;</div><div class='add'>+    b-&gt;wds = (b-&gt;x[1] = y9 &gt;&gt; 16) ? 2 : 1;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    i = 9;</div><div class='add'>+    if (9 &lt; nd0) {</div><div class='add'>+        s += 9;</div><div class='add'>+        do b = multadd(b, 10, *s++ - '0');</div><div class='add'>+        while(++i &lt; nd0);</div><div class='add'>+        s++;</div><div class='add'>+    }</div><div class='add'>+    else</div><div class='add'>+        s += 10;</div><div class='add'>+    for(; i &lt; nd; i++)</div><div class='add'>+        b = multadd(b, 10, *s++ - '0');</div><div class='add'>+    return b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hi0bits(ULong x)</div><div class='add'>+{</div><div class='add'>+    int k = 0;</div><div class='add'>+</div><div class='add'>+    if (!(x &amp; 0xffff0000)) {</div><div class='add'>+        k = 16;</div><div class='add'>+        x &lt;&lt;= 16;</div><div class='add'>+    }</div><div class='add'>+    if (!(x &amp; 0xff000000)) {</div><div class='add'>+        k += 8;</div><div class='add'>+        x &lt;&lt;= 8;</div><div class='add'>+    }</div><div class='add'>+    if (!(x &amp; 0xf0000000)) {</div><div class='add'>+        k += 4;</div><div class='add'>+        x &lt;&lt;= 4;</div><div class='add'>+    }</div><div class='add'>+    if (!(x &amp; 0xc0000000)) {</div><div class='add'>+        k += 2;</div><div class='add'>+        x &lt;&lt;= 2;</div><div class='add'>+    }</div><div class='add'>+    if (!(x &amp; 0x80000000)) {</div><div class='add'>+        k++;</div><div class='add'>+        if (!(x &amp; 0x40000000))</div><div class='add'>+            return 32;</div><div class='add'>+    }</div><div class='add'>+    return k;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lo0bits(ULong *y)</div><div class='add'>+{</div><div class='add'>+    int k;</div><div class='add'>+    ULong x = *y;</div><div class='add'>+</div><div class='add'>+    if (x &amp; 7) {</div><div class='add'>+        if (x &amp; 1)</div><div class='add'>+            return 0;</div><div class='add'>+        if (x &amp; 2) {</div><div class='add'>+            *y = x &gt;&gt; 1;</div><div class='add'>+            return 1;</div><div class='add'>+        }</div><div class='add'>+        *y = x &gt;&gt; 2;</div><div class='add'>+        return 2;</div><div class='add'>+    }</div><div class='add'>+    k = 0;</div><div class='add'>+    if (!(x &amp; 0xffff)) {</div><div class='add'>+        k = 16;</div><div class='add'>+        x &gt;&gt;= 16;</div><div class='add'>+    }</div><div class='add'>+    if (!(x &amp; 0xff)) {</div><div class='add'>+        k += 8;</div><div class='add'>+        x &gt;&gt;= 8;</div><div class='add'>+    }</div><div class='add'>+    if (!(x &amp; 0xf)) {</div><div class='add'>+        k += 4;</div><div class='add'>+        x &gt;&gt;= 4;</div><div class='add'>+    }</div><div class='add'>+    if (!(x &amp; 0x3)) {</div><div class='add'>+        k += 2;</div><div class='add'>+        x &gt;&gt;= 2;</div><div class='add'>+    }</div><div class='add'>+    if (!(x &amp; 1)) {</div><div class='add'>+        k++;</div><div class='add'>+        x &gt;&gt;= 1;</div><div class='add'>+        if (!x &amp; 1)</div><div class='add'>+            return 32;</div><div class='add'>+    }</div><div class='add'>+    *y = x;</div><div class='add'>+    return k;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static Bigint *i2b(int i)</div><div class='add'>+{</div><div class='add'>+    Bigint *b;</div><div class='add'>+</div><div class='add'>+    b = Balloc(1);</div><div class='add'>+    b-&gt;x[0] = i;</div><div class='add'>+    b-&gt;wds = 1;</div><div class='add'>+    return b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static Bigint *mult(Bigint *a, Bigint *b)</div><div class='add'>+{</div><div class='add'>+    Bigint *c;</div><div class='add'>+    int k, wa, wb, wc;</div><div class='add'>+    ULong carry, y, z;</div><div class='add'>+    ULong *x, *xa, *xae, *xb, *xbe, *xc, *xc0;</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+    ULong z2;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    if (a-&gt;wds &lt; b-&gt;wds) {</div><div class='add'>+        c = a;</div><div class='add'>+        a = b;</div><div class='add'>+        b = c;</div><div class='add'>+    }</div><div class='add'>+    k = a-&gt;k;</div><div class='add'>+    wa = a-&gt;wds;</div><div class='add'>+    wb = b-&gt;wds;</div><div class='add'>+    wc = wa + wb;</div><div class='add'>+    if (wc &gt; a-&gt;maxwds)</div><div class='add'>+        k++;</div><div class='add'>+    c = Balloc(k);</div><div class='add'>+    for(x = c-&gt;x, xa = x + wc; x &lt; xa; x++)</div><div class='add'>+        *x = 0;</div><div class='add'>+    xa = a-&gt;x;</div><div class='add'>+    xae = xa + wa;</div><div class='add'>+    xb = b-&gt;x;</div><div class='add'>+    xbe = xb + wb;</div><div class='add'>+    xc0 = c-&gt;x;</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+    for(; xb &lt; xbe; xb++, xc0++) {</div><div class='add'>+        if ((y = *xb &amp; 0xffff) != 0) {</div><div class='add'>+            x = xa;</div><div class='add'>+            xc = xc0;</div><div class='add'>+            carry = 0;</div><div class='add'>+            do {</div><div class='add'>+                z = (*x &amp; 0xffff) * y + (*xc &amp; 0xffff) + carry;</div><div class='add'>+                carry = z &gt;&gt; 16;</div><div class='add'>+                z2 = (*x++ &gt;&gt; 16) * y + (*xc &gt;&gt; 16) + carry;</div><div class='add'>+                carry = z2 &gt;&gt; 16;</div><div class='add'>+                Storeinc(xc, z2, z);</div><div class='add'>+            }</div><div class='add'>+            while(x &lt; xae);</div><div class='add'>+            *xc = carry;</div><div class='add'>+        }</div><div class='add'>+        if ((y = *xb &gt;&gt; 16) != 0) {</div><div class='add'>+            x = xa;</div><div class='add'>+            xc = xc0;</div><div class='add'>+            carry = 0;</div><div class='add'>+            z2 = *xc;</div><div class='add'>+            do {</div><div class='add'>+                z = (*x &amp; 0xffff) * y + (*xc &gt;&gt; 16) + carry;</div><div class='add'>+                carry = z &gt;&gt; 16;</div><div class='add'>+                Storeinc(xc, z, z2);</div><div class='add'>+                z2 = (*x++ &gt;&gt; 16) * y + (*xc &amp; 0xffff) + carry;</div><div class='add'>+                carry = z2 &gt;&gt; 16;</div><div class='add'>+            }</div><div class='add'>+            while(x &lt; xae);</div><div class='add'>+            *xc = z2;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+#else</div><div class='add'>+    for(; xb &lt; xbe; xc0++) {</div><div class='add'>+        if (y = *xb++) {</div><div class='add'>+            x = xa;</div><div class='add'>+            xc = xc0;</div><div class='add'>+            carry = 0;</div><div class='add'>+            do {</div><div class='add'>+                z = *x++ * y + *xc + carry;</div><div class='add'>+                carry = z &gt;&gt; 16;</div><div class='add'>+                *xc++ = z &amp; 0xffff;</div><div class='add'>+            }</div><div class='add'>+            while(x &lt; xae);</div><div class='add'>+            *xc = carry;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    for(xc0 = c-&gt;x, xc = xc0 + wc; wc &gt; 0 &amp;&amp; !*--xc; --wc) ;</div><div class='add'>+    c-&gt;wds = wc;</div><div class='add'>+    return c;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static Bigint *p5s;</div><div class='add'>+</div><div class='add'>+struct p5s_deleter</div><div class='add'>+{</div><div class='add'>+    ~p5s_deleter()</div><div class='add'>+    {</div><div class='add'>+        while (p5s) {</div><div class='add'>+            Bigint *next = p5s-&gt;next;</div><div class='add'>+            Bfree(p5s);</div><div class='add'>+            p5s = next;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static Bigint *pow5mult(Bigint *b, int k)</div><div class='add'>+{</div><div class='add'>+    Bigint *b1, *p5, *p51;</div><div class='add'>+    int i;</div><div class='add'>+    static const int p05[3] = { 5, 25, 125 };</div><div class='add'>+</div><div class='add'>+    if ((i = k &amp; 3) != 0)</div><div class='add'>+#if defined(Q_OS_IRIX) &amp;&amp; defined(Q_CC_GNU)</div><div class='add'>+    {</div><div class='add'>+        // work around a bug on 64 bit IRIX gcc</div><div class='add'>+        int *p = (int *) p05;</div><div class='add'>+        b = multadd(b, p[i-1], 0);</div><div class='add'>+    }</div><div class='add'>+#else</div><div class='add'>+    b = multadd(b, p05[i-1], 0);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    if (!(k &gt;&gt;= 2))</div><div class='add'>+        return b;</div><div class='add'>+    if (!(p5 = p5s)) {</div><div class='add'>+        /* first time */</div><div class='add'>+        static p5s_deleter deleter;</div><div class='add'>+        p5 = p5s = i2b(625);</div><div class='add'>+        p5-&gt;next = 0;</div><div class='add'>+    }</div><div class='add'>+    for(;;) {</div><div class='add'>+        if (k &amp; 1) {</div><div class='add'>+            b1 = mult(b, p5);</div><div class='add'>+            Bfree(b);</div><div class='add'>+            b = b1;</div><div class='add'>+        }</div><div class='add'>+        if (!(k &gt;&gt;= 1))</div><div class='add'>+            break;</div><div class='add'>+        if (!(p51 = p5-&gt;next)) {</div><div class='add'>+            p51 = p5-&gt;next = mult(p5,p5);</div><div class='add'>+            p51-&gt;next = 0;</div><div class='add'>+        }</div><div class='add'>+        p5 = p51;</div><div class='add'>+    }</div><div class='add'>+    return b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static Bigint *lshift(Bigint *b, int k)</div><div class='add'>+{</div><div class='add'>+    int i, k1, n, n1;</div><div class='add'>+    Bigint *b1;</div><div class='add'>+    ULong *x, *x1, *xe, z;</div><div class='add'>+</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+    n = k &gt;&gt; 5;</div><div class='add'>+#else</div><div class='add'>+    n = k &gt;&gt; 4;</div><div class='add'>+#endif</div><div class='add'>+    k1 = b-&gt;k;</div><div class='add'>+    n1 = n + b-&gt;wds + 1;</div><div class='add'>+    for(i = b-&gt;maxwds; n1 &gt; i; i &lt;&lt;= 1)</div><div class='add'>+        k1++;</div><div class='add'>+    b1 = Balloc(k1);</div><div class='add'>+    x1 = b1-&gt;x;</div><div class='add'>+    for(i = 0; i &lt; n; i++)</div><div class='add'>+        *x1++ = 0;</div><div class='add'>+    x = b-&gt;x;</div><div class='add'>+    xe = x + b-&gt;wds;</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+    if (k &amp;= 0x1f) {</div><div class='add'>+        k1 = 32 - k;</div><div class='add'>+        z = 0;</div><div class='add'>+        do {</div><div class='add'>+            *x1++ = *x &lt;&lt; k | z;</div><div class='add'>+            z = *x++ &gt;&gt; k1;</div><div class='add'>+        }</div><div class='add'>+        while(x &lt; xe);</div><div class='add'>+        if ((*x1 = z) != 0)</div><div class='add'>+            ++n1;</div><div class='add'>+    }</div><div class='add'>+#else</div><div class='add'>+    if (k &amp;= 0xf) {</div><div class='add'>+        k1 = 16 - k;</div><div class='add'>+        z = 0;</div><div class='add'>+        do {</div><div class='add'>+            *x1++ = *x &lt;&lt; k  &amp; 0xffff | z;</div><div class='add'>+            z = *x++ &gt;&gt; k1;</div><div class='add'>+        }</div><div class='add'>+        while(x &lt; xe);</div><div class='add'>+        if (*x1 = z)</div><div class='add'>+            ++n1;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    else do</div><div class='add'>+        *x1++ = *x++;</div><div class='add'>+    while(x &lt; xe);</div><div class='add'>+    b1-&gt;wds = n1 - 1;</div><div class='add'>+    Bfree(b);</div><div class='add'>+    return b1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cmp(Bigint *a, Bigint *b)</div><div class='add'>+{</div><div class='add'>+    ULong *xa, *xa0, *xb, *xb0;</div><div class='add'>+    int i, j;</div><div class='add'>+</div><div class='add'>+    i = a-&gt;wds;</div><div class='add'>+    j = b-&gt;wds;</div><div class='add'>+#ifdef BSD_QDTOA_DEBUG</div><div class='add'>+    if (i &gt; 1 &amp;&amp; !a-&gt;x[i-1])</div><div class='add'>+        Bug("cmp called with a-&gt;x[a-&gt;wds-1] == 0");</div><div class='add'>+    if (j &gt; 1 &amp;&amp; !b-&gt;x[j-1])</div><div class='add'>+        Bug("cmp called with b-&gt;x[b-&gt;wds-1] == 0");</div><div class='add'>+#endif</div><div class='add'>+    if (i -= j)</div><div class='add'>+        return i;</div><div class='add'>+    xa0 = a-&gt;x;</div><div class='add'>+    xa = xa0 + j;</div><div class='add'>+    xb0 = b-&gt;x;</div><div class='add'>+    xb = xb0 + j;</div><div class='add'>+    for(;;) {</div><div class='add'>+        if (*--xa != *--xb)</div><div class='add'>+            return *xa &lt; *xb ? -1 : 1;</div><div class='add'>+        if (xa &lt;= xa0)</div><div class='add'>+            break;</div><div class='add'>+    }</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static Bigint *diff(Bigint *a, Bigint *b)</div><div class='add'>+{</div><div class='add'>+    Bigint *c;</div><div class='add'>+    int i, wa, wb;</div><div class='add'>+    Long borrow, y;        /* We need signed shifts here. */</div><div class='add'>+    ULong *xa, *xae, *xb, *xbe, *xc;</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+    Long z;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    i = cmp(a,b);</div><div class='add'>+    if (!i) {</div><div class='add'>+        c = Balloc(0);</div><div class='add'>+        c-&gt;wds = 1;</div><div class='add'>+        c-&gt;x[0] = 0;</div><div class='add'>+        return c;</div><div class='add'>+    }</div><div class='add'>+    if (i &lt; 0) {</div><div class='add'>+        c = a;</div><div class='add'>+        a = b;</div><div class='add'>+        b = c;</div><div class='add'>+        i = 1;</div><div class='add'>+    }</div><div class='add'>+    else</div><div class='add'>+        i = 0;</div><div class='add'>+    c = Balloc(a-&gt;k);</div><div class='add'>+    c-&gt;sign = i;</div><div class='add'>+    wa = a-&gt;wds;</div><div class='add'>+    xa = a-&gt;x;</div><div class='add'>+    xae = xa + wa;</div><div class='add'>+    wb = b-&gt;wds;</div><div class='add'>+    xb = b-&gt;x;</div><div class='add'>+    xbe = xb + wb;</div><div class='add'>+    xc = c-&gt;x;</div><div class='add'>+    borrow = 0;</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+    do {</div><div class='add'>+        y = (*xa &amp; 0xffff) - (*xb &amp; 0xffff) + borrow;</div><div class='add'>+        borrow = y &gt;&gt; 16;</div><div class='add'>+        Sign_Extend(borrow, y);</div><div class='add'>+        z = (*xa++ &gt;&gt; 16) - (*xb++ &gt;&gt; 16) + borrow;</div><div class='add'>+        borrow = z &gt;&gt; 16;</div><div class='add'>+        Sign_Extend(borrow, z);</div><div class='add'>+        Storeinc(xc, z, y);</div><div class='add'>+    }</div><div class='add'>+    while(xb &lt; xbe);</div><div class='add'>+    while(xa &lt; xae) {</div><div class='add'>+        y = (*xa &amp; 0xffff) + borrow;</div><div class='add'>+        borrow = y &gt;&gt; 16;</div><div class='add'>+        Sign_Extend(borrow, y);</div><div class='add'>+        z = (*xa++ &gt;&gt; 16) + borrow;</div><div class='add'>+        borrow = z &gt;&gt; 16;</div><div class='add'>+        Sign_Extend(borrow, z);</div><div class='add'>+        Storeinc(xc, z, y);</div><div class='add'>+    }</div><div class='add'>+#else</div><div class='add'>+    do {</div><div class='add'>+        y = *xa++ - *xb++ + borrow;</div><div class='add'>+        borrow = y &gt;&gt; 16;</div><div class='add'>+        Sign_Extend(borrow, y);</div><div class='add'>+        *xc++ = y &amp; 0xffff;</div><div class='add'>+    }</div><div class='add'>+    while(xb &lt; xbe);</div><div class='add'>+    while(xa &lt; xae) {</div><div class='add'>+        y = *xa++ + borrow;</div><div class='add'>+        borrow = y &gt;&gt; 16;</div><div class='add'>+        Sign_Extend(borrow, y);</div><div class='add'>+        *xc++ = y &amp; 0xffff;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    while(!*--xc)</div><div class='add'>+        wa--;</div><div class='add'>+    c-&gt;wds = wa;</div><div class='add'>+    return c;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static double ulp(double x)</div><div class='add'>+{</div><div class='add'>+    Long L;</div><div class='add'>+    double a;</div><div class='add'>+</div><div class='add'>+    L = (getWord0(x) &amp; Exp_mask) - (P-1)*Exp_msk1;</div><div class='add'>+#ifndef Sudden_Underflow</div><div class='add'>+    if (L &gt; 0) {</div><div class='add'>+#endif</div><div class='add'>+#ifdef IBM</div><div class='add'>+        L |= Exp_msk1 &gt;&gt; 4;</div><div class='add'>+#endif</div><div class='add'>+        setWord0(&amp;a, L);</div><div class='add'>+        setWord1(&amp;a, 0);</div><div class='add'>+#ifndef Sudden_Underflow</div><div class='add'>+    }</div><div class='add'>+    else {</div><div class='add'>+        L = -L &gt;&gt; Exp_shift;</div><div class='add'>+        if (L &lt; Exp_shift) {</div><div class='add'>+            setWord0(&amp;a, 0x80000 &gt;&gt; L);</div><div class='add'>+            setWord1(&amp;a, 0);</div><div class='add'>+        }</div><div class='add'>+        else {</div><div class='add'>+            setWord0(&amp;a, 0);</div><div class='add'>+            L -= Exp_shift;</div><div class='add'>+            setWord1(&amp;a, L &gt;= 31 ? 1U : 1U &lt;&lt; (31 - L));</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    return a;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static double b2d(Bigint *a, int *e)</div><div class='add'>+{</div><div class='add'>+    ULong *xa, *xa0, w, y, z;</div><div class='add'>+    int k;</div><div class='add'>+    double d;</div><div class='add'>+</div><div class='add'>+    xa0 = a-&gt;x;</div><div class='add'>+    xa = xa0 + a-&gt;wds;</div><div class='add'>+    y = *--xa;</div><div class='add'>+#ifdef BSD_QDTOA_DEBUG</div><div class='add'>+    if (!y) Bug("zero y in b2d");</div><div class='add'>+#endif</div><div class='add'>+    k = hi0bits(y);</div><div class='add'>+    *e = 32 - k;</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+    if (k &lt; Ebits) {</div><div class='add'>+        setWord0(&amp;d, Exp_1 | y &gt;&gt; (Ebits - k));</div><div class='add'>+        w = xa &gt; xa0 ? *--xa : 0;</div><div class='add'>+        setWord1(&amp;d, y &lt;&lt; ((32-Ebits) + k) | w &gt;&gt; (Ebits - k));</div><div class='add'>+        goto ret_d;</div><div class='add'>+    }</div><div class='add'>+    z = xa &gt; xa0 ? *--xa : 0;</div><div class='add'>+    if (k -= Ebits) {</div><div class='add'>+        setWord0(&amp;d, Exp_1 | y &lt;&lt; k | z &gt;&gt; (32 - k));</div><div class='add'>+        y = xa &gt; xa0 ? *--xa : 0;</div><div class='add'>+        setWord1(&amp;d, z &lt;&lt; k | y &gt;&gt; (32 - k));</div><div class='add'>+    }</div><div class='add'>+    else {</div><div class='add'>+        setWord0(&amp;d, Exp_1 | y);</div><div class='add'>+        setWord1(&amp;d, z);</div><div class='add'>+    }</div><div class='add'>+#else</div><div class='add'>+    if (k &lt; Ebits + 16) {</div><div class='add'>+        z = xa &gt; xa0 ? *--xa : 0;</div><div class='add'>+        setWord0(&amp;d, Exp_1 | y &lt;&lt; k - Ebits | z &gt;&gt; Ebits + 16 - k);</div><div class='add'>+        w = xa &gt; xa0 ? *--xa : 0;</div><div class='add'>+        y = xa &gt; xa0 ? *--xa : 0;</div><div class='add'>+        setWord1(&amp;d, z &lt;&lt; k + 16 - Ebits | w &lt;&lt; k - Ebits | y &gt;&gt; 16 + Ebits - k);</div><div class='add'>+        goto ret_d;</div><div class='add'>+    }</div><div class='add'>+    z = xa &gt; xa0 ? *--xa : 0;</div><div class='add'>+    w = xa &gt; xa0 ? *--xa : 0;</div><div class='add'>+    k -= Ebits + 16;</div><div class='add'>+    setWord0(&amp;d, Exp_1 | y &lt;&lt; k + 16 | z &lt;&lt; k | w &gt;&gt; 16 - k);</div><div class='add'>+    y = xa &gt; xa0 ? *--xa : 0;</div><div class='add'>+    setWord1(&amp;d, w &lt;&lt; k + 16 | y &lt;&lt; k);</div><div class='add'>+#endif</div><div class='add'>+ ret_d:</div><div class='add'>+    return d;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static Bigint *d2b(double d, int *e, int *bits)</div><div class='add'>+{</div><div class='add'>+    Bigint *b;</div><div class='add'>+    int de, i, k;</div><div class='add'>+    ULong *x, y, z;</div><div class='add'>+</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+    b = Balloc(1);</div><div class='add'>+#else</div><div class='add'>+    b = Balloc(2);</div><div class='add'>+#endif</div><div class='add'>+    x = b-&gt;x;</div><div class='add'>+</div><div class='add'>+    z = getWord0(d) &amp; Frac_mask;</div><div class='add'>+    setWord0(&amp;d, getWord0(d) &amp; 0x7fffffff);        /* clear sign bit, which we ignore */</div><div class='add'>+#ifdef Sudden_Underflow</div><div class='add'>+    de = (int)(getWord0(d) &gt;&gt; Exp_shift);</div><div class='add'>+#ifndef IBM</div><div class='add'>+    z |= Exp_msk11;</div><div class='add'>+#endif</div><div class='add'>+#else</div><div class='add'>+    if ((de = int(getWord0(d) &gt;&gt; Exp_shift)) != 0)</div><div class='add'>+        z |= Exp_msk1;</div><div class='add'>+#endif</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+    if ((y = getWord1(d)) != 0) {</div><div class='add'>+        if ((k = lo0bits(&amp;y)) != 0) {</div><div class='add'>+            x[0] = y | z &lt;&lt; (32 - k);</div><div class='add'>+            z &gt;&gt;= k;</div><div class='add'>+        }</div><div class='add'>+        else</div><div class='add'>+            x[0] = y;</div><div class='add'>+        i = b-&gt;wds = (x[1] = z) ? 2 : 1;</div><div class='add'>+    }</div><div class='add'>+    else {</div><div class='add'>+#ifdef BSD_QDTOA_DEBUG</div><div class='add'>+        if (!z)</div><div class='add'>+            Bug("Zero passed to d2b");</div><div class='add'>+#endif</div><div class='add'>+        k = lo0bits(&amp;z);</div><div class='add'>+        x[0] = z;</div><div class='add'>+        i = b-&gt;wds = 1;</div><div class='add'>+        k += 32;</div><div class='add'>+    }</div><div class='add'>+#else</div><div class='add'>+    if (y = getWord1(d)) {</div><div class='add'>+        if (k = lo0bits(&amp;y))</div><div class='add'>+            if (k &gt;= 16) {</div><div class='add'>+                x[0] = y | z &lt;&lt; 32 - k &amp; 0xffff;</div><div class='add'>+                x[1] = z &gt;&gt; k - 16 &amp; 0xffff;</div><div class='add'>+                x[2] = z &gt;&gt; k;</div><div class='add'>+                i = 2;</div><div class='add'>+            }</div><div class='add'>+            else {</div><div class='add'>+                x[0] = y &amp; 0xffff;</div><div class='add'>+                x[1] = y &gt;&gt; 16 | z &lt;&lt; 16 - k &amp; 0xffff;</div><div class='add'>+                x[2] = z &gt;&gt; k &amp; 0xffff;</div><div class='add'>+                x[3] = z &gt;&gt; k+16;</div><div class='add'>+                i = 3;</div><div class='add'>+            }</div><div class='add'>+        else {</div><div class='add'>+            x[0] = y &amp; 0xffff;</div><div class='add'>+            x[1] = y &gt;&gt; 16;</div><div class='add'>+            x[2] = z &amp; 0xffff;</div><div class='add'>+            x[3] = z &gt;&gt; 16;</div><div class='add'>+            i = 3;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    else {</div><div class='add'>+#ifdef BSD_QDTOA_DEBUG</div><div class='add'>+        if (!z)</div><div class='add'>+            Bug("Zero passed to d2b");</div><div class='add'>+#endif</div><div class='add'>+        k = lo0bits(&amp;z);</div><div class='add'>+        if (k &gt;= 16) {</div><div class='add'>+            x[0] = z;</div><div class='add'>+            i = 0;</div><div class='add'>+        }</div><div class='add'>+        else {</div><div class='add'>+            x[0] = z &amp; 0xffff;</div><div class='add'>+            x[1] = z &gt;&gt; 16;</div><div class='add'>+            i = 1;</div><div class='add'>+        }</div><div class='add'>+        k += 32;</div><div class='add'>+    }</div><div class='add'>+    while(!x[i])</div><div class='add'>+        --i;</div><div class='add'>+    b-&gt;wds = i + 1;</div><div class='add'>+#endif</div><div class='add'>+#ifndef Sudden_Underflow</div><div class='add'>+    if (de) {</div><div class='add'>+#endif</div><div class='add'>+#ifdef IBM</div><div class='add'>+        *e = (de - Bias - (P-1) &lt;&lt; 2) + k;</div><div class='add'>+        *bits = 4*P + 8 - k - hi0bits(getWord0(d) &amp; Frac_mask);</div><div class='add'>+#else</div><div class='add'>+        *e = de - Bias - (P-1) + k;</div><div class='add'>+        *bits = P - k;</div><div class='add'>+#endif</div><div class='add'>+#ifndef Sudden_Underflow</div><div class='add'>+    }</div><div class='add'>+    else {</div><div class='add'>+        *e = de - Bias - (P-1) + 1 + k;</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+        *bits = 32*i - hi0bits(x[i-1]);</div><div class='add'>+#else</div><div class='add'>+        *bits = (i+2)*16 - hi0bits(x[i]);</div><div class='add'>+#endif</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    return b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static double ratio(Bigint *a, Bigint *b)</div><div class='add'>+{</div><div class='add'>+    double da, db;</div><div class='add'>+    int k, ka, kb;</div><div class='add'>+</div><div class='add'>+    da = b2d(a, &amp;ka);</div><div class='add'>+    db = b2d(b, &amp;kb);</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+    k = ka - kb + 32*(a-&gt;wds - b-&gt;wds);</div><div class='add'>+#else</div><div class='add'>+    k = ka - kb + 16*(a-&gt;wds - b-&gt;wds);</div><div class='add'>+#endif</div><div class='add'>+#ifdef IBM</div><div class='add'>+    if (k &gt; 0) {</div><div class='add'>+        setWord0(&amp;da, getWord0(da) + (k &gt;&gt; 2)*Exp_msk1);</div><div class='add'>+        if (k &amp;= 3)</div><div class='add'>+            da *= 1 &lt;&lt; k;</div><div class='add'>+    }</div><div class='add'>+    else {</div><div class='add'>+        k = -k;</div><div class='add'>+        setWord0(&amp;db, getWord0(db) + (k &gt;&gt; 2)*Exp_msk1);</div><div class='add'>+        if (k &amp;= 3)</div><div class='add'>+            db *= 1 &lt;&lt; k;</div><div class='add'>+    }</div><div class='add'>+#else</div><div class='add'>+    if (k &gt; 0)</div><div class='add'>+        setWord0(&amp;da, getWord0(da) + k*Exp_msk1);</div><div class='add'>+    else {</div><div class='add'>+        k = -k;</div><div class='add'>+        setWord0(&amp;db, getWord0(db) + k*Exp_msk1);</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    return da / db;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const double tens[] = {</div><div class='add'>+    1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9,</div><div class='add'>+    1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19,</div><div class='add'>+    1e20, 1e21, 1e22</div><div class='add'>+#ifdef VAX</div><div class='add'>+    , 1e23, 1e24</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#ifdef IEEE_Arith</div><div class='add'>+static const double bigtens[] = { 1e16, 1e32, 1e64, 1e128, 1e256 };</div><div class='add'>+static const double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128, 1e-256 };</div><div class='add'>+#define n_bigtens 5</div><div class='add'>+#else</div><div class='add'>+#ifdef IBM</div><div class='add'>+static const double bigtens[] = { 1e16, 1e32, 1e64 };</div><div class='add'>+static const double tinytens[] = { 1e-16, 1e-32, 1e-64 };</div><div class='add'>+#define n_bigtens 3</div><div class='add'>+#else</div><div class='add'>+static const double bigtens[] = { 1e16, 1e32 };</div><div class='add'>+static const double tinytens[] = { 1e-16, 1e-32 };</div><div class='add'>+#define n_bigtens 2</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+  The pre-release gcc3.3 shipped with SuSE 8.2 has a bug which causes</div><div class='add'>+  the comparison 1e-100 == 0.0 to return true. As a workaround, we</div><div class='add'>+  compare it to a global variable containing 0.0, which produces</div><div class='add'>+  correct assembler output.</div><div class='add'>+</div><div class='add'>+  ### consider detecting the broken compilers and using the static</div><div class='add'>+  ### double for these, and use a #define for all working compilers</div><div class='add'>+*/</div><div class='add'>+static double g_double_zero = 0.0;</div><div class='add'>+</div><div class='add'>+Q_CORE_EXPORT double qstrtod(const char *s00, const char **se, bool *ok)</div><div class='add'>+{</div><div class='add'>+    int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,</div><div class='add'>+        e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;</div><div class='add'>+    const char *s, *s0, *s1;</div><div class='add'>+    double aadj, aadj1, adj, rv, rv0;</div><div class='add'>+    Long L;</div><div class='add'>+    ULong y, z;</div><div class='add'>+    Bigint *bb1, *bd0;</div><div class='add'>+    Bigint *bb = NULL, *bd = NULL, *bs = NULL, *delta = NULL;/* pacify gcc */</div><div class='add'>+</div><div class='add'>+    /*</div><div class='add'>+      #ifndef KR_headers</div><div class='add'>+      const char decimal_point = localeconv()-&gt;decimal_point[0];</div><div class='add'>+      #else</div><div class='add'>+      const char decimal_point = '.';</div><div class='add'>+      #endif */</div><div class='add'>+    if (ok != 0)</div><div class='add'>+        *ok = true;</div><div class='add'>+</div><div class='add'>+    const char decimal_point = '.';</div><div class='add'>+</div><div class='add'>+    sign = nz0 = nz = 0;</div><div class='add'>+    rv = 0.;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    for(s = s00; isspace(uchar(*s)); s++)</div><div class='add'>+        ;</div><div class='add'>+</div><div class='add'>+    if (*s == '-') {</div><div class='add'>+        sign = 1;</div><div class='add'>+        s++;</div><div class='add'>+    } else if (*s == '+') {</div><div class='add'>+        s++;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (*s == '\0') {</div><div class='add'>+        s = s00;</div><div class='add'>+        goto ret;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (*s == '0') {</div><div class='add'>+        nz0 = 1;</div><div class='add'>+        while(*++s == '0') ;</div><div class='add'>+        if (!*s)</div><div class='add'>+            goto ret;</div><div class='add'>+    }</div><div class='add'>+    s0 = s;</div><div class='add'>+    y = z = 0;</div><div class='add'>+    for(nd = nf = 0; (c = *s) &gt;= '0' &amp;&amp; c &lt;= '9'; nd++, s++)</div><div class='add'>+        if (nd &lt; 9)</div><div class='add'>+            y = 10*y + c - '0';</div><div class='add'>+        else if (nd &lt; 16)</div><div class='add'>+            z = 10*z + c - '0';</div><div class='add'>+    nd0 = nd;</div><div class='add'>+    if (c == decimal_point) {</div><div class='add'>+        c = *++s;</div><div class='add'>+        if (!nd) {</div><div class='add'>+            for(; c == '0'; c = *++s)</div><div class='add'>+                nz++;</div><div class='add'>+            if (c &gt; '0' &amp;&amp; c &lt;= '9') {</div><div class='add'>+                s0 = s;</div><div class='add'>+                nf += nz;</div><div class='add'>+                nz = 0;</div><div class='add'>+                goto have_dig;</div><div class='add'>+            }</div><div class='add'>+            goto dig_done;</div><div class='add'>+        }</div><div class='add'>+        for(; c &gt;= '0' &amp;&amp; c &lt;= '9'; c = *++s) {</div><div class='add'>+        have_dig:</div><div class='add'>+            nz++;</div><div class='add'>+            if (c -= '0') {</div><div class='add'>+                nf += nz;</div><div class='add'>+                for(i = 1; i &lt; nz; i++)</div><div class='add'>+                    if (nd++ &lt; 9)</div><div class='add'>+                        y *= 10;</div><div class='add'>+                    else if (nd &lt;= DBL_DIG + 1)</div><div class='add'>+                        z *= 10;</div><div class='add'>+                if (nd++ &lt; 9)</div><div class='add'>+                    y = 10*y + c;</div><div class='add'>+                else if (nd &lt;= DBL_DIG + 1)</div><div class='add'>+                    z = 10*z + c;</div><div class='add'>+                nz = 0;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+ dig_done:</div><div class='add'>+    e = 0;</div><div class='add'>+    if (c == 'e' || c == 'E') {</div><div class='add'>+        if (!nd &amp;&amp; !nz &amp;&amp; !nz0) {</div><div class='add'>+            s = s00;</div><div class='add'>+            goto ret;</div><div class='add'>+        }</div><div class='add'>+        s00 = s;</div><div class='add'>+        esign = 0;</div><div class='add'>+        switch(c = *++s) {</div><div class='add'>+        case '-':</div><div class='add'>+            esign = 1;</div><div class='add'>+        case '+':</div><div class='add'>+            c = *++s;</div><div class='add'>+        }</div><div class='add'>+        if (c &gt;= '0' &amp;&amp; c &lt;= '9') {</div><div class='add'>+            while(c == '0')</div><div class='add'>+                c = *++s;</div><div class='add'>+            if (c &gt; '0' &amp;&amp; c &lt;= '9') {</div><div class='add'>+                L = c - '0';</div><div class='add'>+                s1 = s;</div><div class='add'>+                while((c = *++s) &gt;= '0' &amp;&amp; c &lt;= '9')</div><div class='add'>+                    L = 10*L + c - '0';</div><div class='add'>+                if (s - s1 &gt; 8 || L &gt; 19999)</div><div class='add'>+                    /* Avoid confusion from exponents</div><div class='add'>+                     * so large that e might overflow.</div><div class='add'>+                     */</div><div class='add'>+                    e = 19999; /* safe for 16 bit ints */</div><div class='add'>+                else</div><div class='add'>+                    e = int(L);</div><div class='add'>+                if (esign)</div><div class='add'>+                    e = -e;</div><div class='add'>+            }</div><div class='add'>+            else</div><div class='add'>+                e = 0;</div><div class='add'>+        }</div><div class='add'>+        else</div><div class='add'>+            s = s00;</div><div class='add'>+    }</div><div class='add'>+    if (!nd) {</div><div class='add'>+        if (!nz &amp;&amp; !nz0)</div><div class='add'>+            s = s00;</div><div class='add'>+        goto ret;</div><div class='add'>+    }</div><div class='add'>+    e1 = e -= nf;</div><div class='add'>+</div><div class='add'>+    /* Now we have nd0 digits, starting at s0, followed by a</div><div class='add'>+     * decimal point, followed by nd-nd0 digits.  The number we're</div><div class='add'>+     * after is the integer represented by those digits times</div><div class='add'>+     * 10**e */</div><div class='add'>+</div><div class='add'>+    if (!nd0)</div><div class='add'>+        nd0 = nd;</div><div class='add'>+    k = nd &lt; DBL_DIG + 1 ? nd : DBL_DIG + 1;</div><div class='add'>+    rv = y;</div><div class='add'>+    if (k &gt; 9)</div><div class='add'>+#if defined(Q_OS_IRIX) &amp;&amp; defined(Q_CC_GNU)</div><div class='add'>+    {</div><div class='add'>+        // work around a bug on 64 bit IRIX gcc</div><div class='add'>+        double *t = (double *) tens;</div><div class='add'>+        rv = t[k - 9] * rv + z;</div><div class='add'>+    }</div><div class='add'>+#else</div><div class='add'>+    rv = tens[k - 9] * rv + z;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    bd0 = 0;</div><div class='add'>+    if (nd &lt;= DBL_DIG</div><div class='add'>+#ifndef RND_PRODQUOT</div><div class='add'>+        &amp;&amp; FLT_ROUNDS == 1</div><div class='add'>+#endif</div><div class='add'>+        ) {</div><div class='add'>+        if (!e)</div><div class='add'>+            goto ret;</div><div class='add'>+        if (e &gt; 0) {</div><div class='add'>+            if (e &lt;= Ten_pmax) {</div><div class='add'>+#ifdef VAX</div><div class='add'>+                goto vax_ovfl_check;</div><div class='add'>+#else</div><div class='add'>+                /* rv = */ rounded_product(rv, tens[e]);</div><div class='add'>+                goto ret;</div><div class='add'>+#endif</div><div class='add'>+            }</div><div class='add'>+            i = DBL_DIG - nd;</div><div class='add'>+            if (e &lt;= Ten_pmax + i) {</div><div class='add'>+                /* A fancier test would sometimes let us do</div><div class='add'>+                 * this for larger i values.</div><div class='add'>+                 */</div><div class='add'>+                e -= i;</div><div class='add'>+                rv *= tens[i];</div><div class='add'>+#ifdef VAX</div><div class='add'>+                /* VAX exponent range is so narrow we must</div><div class='add'>+                 * worry about overflow here...</div><div class='add'>+                 */</div><div class='add'>+            vax_ovfl_check:</div><div class='add'>+                setWord0(&amp;rv, getWord0(rv) - P*Exp_msk1);</div><div class='add'>+                /* rv = */ rounded_product(rv, tens[e]);</div><div class='add'>+                if ((getWord0(rv) &amp; Exp_mask)</div><div class='add'>+                    &gt; Exp_msk1*(DBL_MAX_EXP+Bias-1-P))</div><div class='add'>+                    goto ovfl;</div><div class='add'>+                setWord0(&amp;rv, getWord0(rv) + P*Exp_msk1);</div><div class='add'>+#else</div><div class='add'>+                /* rv = */ rounded_product(rv, tens[e]);</div><div class='add'>+#endif</div><div class='add'>+                goto ret;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+#ifndef Inaccurate_Divide</div><div class='add'>+        else if (e &gt;= -Ten_pmax) {</div><div class='add'>+            /* rv = */ rounded_quotient(rv, tens[-e]);</div><div class='add'>+            goto ret;</div><div class='add'>+        }</div><div class='add'>+#endif</div><div class='add'>+    }</div><div class='add'>+    e1 += nd - k;</div><div class='add'>+</div><div class='add'>+    /* Get starting approximation = rv * 10**e1 */</div><div class='add'>+</div><div class='add'>+    if (e1 &gt; 0) {</div><div class='add'>+        if ((i = e1 &amp; 15) != 0)</div><div class='add'>+            rv *= tens[i];</div><div class='add'>+        if (e1 &amp;= ~15) {</div><div class='add'>+            if (e1 &gt; DBL_MAX_10_EXP) {</div><div class='add'>+            ovfl:</div><div class='add'>+                //                                errno = ERANGE;</div><div class='add'>+                if (ok != 0)</div><div class='add'>+                    *ok = false;</div><div class='add'>+#ifdef __STDC__</div><div class='add'>+                rv = HUGE_VAL;</div><div class='add'>+#else</div><div class='add'>+                /* Can't trust HUGE_VAL */</div><div class='add'>+#ifdef IEEE_Arith</div><div class='add'>+                setWord0(&amp;rv, Exp_mask);</div><div class='add'>+                setWord1(&amp;rv, 0);</div><div class='add'>+#else</div><div class='add'>+                setWord0(&amp;rv, Big0);</div><div class='add'>+                setWord1(&amp;rv, Big1);</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='add'>+                if (bd0)</div><div class='add'>+                    goto retfree;</div><div class='add'>+                goto ret;</div><div class='add'>+            }</div><div class='add'>+            if (e1 &gt;&gt;= 4) {</div><div class='add'>+                for(j = 0; e1 &gt; 1; j++, e1 &gt;&gt;= 1)</div><div class='add'>+                    if (e1 &amp; 1)</div><div class='add'>+                        rv *= bigtens[j];</div><div class='add'>+                /* The last multiplication could overflow. */</div><div class='add'>+                setWord0(&amp;rv, getWord0(rv) - P*Exp_msk1);</div><div class='add'>+                rv *= bigtens[j];</div><div class='add'>+                if ((z = getWord0(rv) &amp; Exp_mask)</div><div class='add'>+                    &gt; Exp_msk1*(DBL_MAX_EXP+Bias-P))</div><div class='add'>+                    goto ovfl;</div><div class='add'>+                if (z &gt; Exp_msk1*(DBL_MAX_EXP+Bias-1-P)) {</div><div class='add'>+                    /* set to largest number */</div><div class='add'>+                    /* (Can't trust DBL_MAX) */</div><div class='add'>+                    setWord0(&amp;rv, Big0);</div><div class='add'>+                    setWord1(&amp;rv, Big1);</div><div class='add'>+                }</div><div class='add'>+                else</div><div class='add'>+                    setWord0(&amp;rv, getWord0(rv) + P*Exp_msk1);</div><div class='add'>+            }</div><div class='add'>+</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    else if (e1 &lt; 0) {</div><div class='add'>+        e1 = -e1;</div><div class='add'>+        if ((i = e1 &amp; 15) != 0)</div><div class='add'>+            rv /= tens[i];</div><div class='add'>+        if (e1 &amp;= ~15) {</div><div class='add'>+            e1 &gt;&gt;= 4;</div><div class='add'>+            if (e1 &gt;= 1 &lt;&lt; n_bigtens)</div><div class='add'>+                goto undfl;</div><div class='add'>+            for(j = 0; e1 &gt; 1; j++, e1 &gt;&gt;= 1)</div><div class='add'>+                if (e1 &amp; 1)</div><div class='add'>+                    rv *= tinytens[j];</div><div class='add'>+            /* The last multiplication could underflow. */</div><div class='add'>+            rv0 = rv;</div><div class='add'>+            rv *= tinytens[j];</div><div class='add'>+            if (rv == g_double_zero)</div><div class='add'>+                {</div><div class='add'>+                    rv = 2.*rv0;</div><div class='add'>+                    rv *= tinytens[j];</div><div class='add'>+                    if (rv == g_double_zero)</div><div class='add'>+                        {</div><div class='add'>+                        undfl:</div><div class='add'>+                            rv = 0.;</div><div class='add'>+                            //                                        errno = ERANGE;</div><div class='add'>+                            if (ok != 0)</div><div class='add'>+                                *ok = false;</div><div class='add'>+                            if (bd0)</div><div class='add'>+                                goto retfree;</div><div class='add'>+                            goto ret;</div><div class='add'>+                        }</div><div class='add'>+                    setWord0(&amp;rv, Tiny0);</div><div class='add'>+                    setWord1(&amp;rv, Tiny1);</div><div class='add'>+                    /* The refinement below will clean</div><div class='add'>+                     * this approximation up.</div><div class='add'>+                     */</div><div class='add'>+                }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* Now the hard part -- adjusting rv to the correct value.*/</div><div class='add'>+</div><div class='add'>+    /* Put digits into bd: true value = bd * 10^e */</div><div class='add'>+</div><div class='add'>+    bd0 = s2b(s0, nd0, nd, y);</div><div class='add'>+</div><div class='add'>+    for(;;) {</div><div class='add'>+        bd = Balloc(bd0-&gt;k);</div><div class='add'>+        Bcopy(bd, bd0);</div><div class='add'>+        bb = d2b(rv, &amp;bbe, &amp;bbbits);        /* rv = bb * 2^bbe */</div><div class='add'>+        bs = i2b(1);</div><div class='add'>+</div><div class='add'>+        if (e &gt;= 0) {</div><div class='add'>+            bb2 = bb5 = 0;</div><div class='add'>+            bd2 = bd5 = e;</div><div class='add'>+        }</div><div class='add'>+        else {</div><div class='add'>+            bb2 = bb5 = -e;</div><div class='add'>+            bd2 = bd5 = 0;</div><div class='add'>+        }</div><div class='add'>+        if (bbe &gt;= 0)</div><div class='add'>+            bb2 += bbe;</div><div class='add'>+        else</div><div class='add'>+            bd2 -= bbe;</div><div class='add'>+        bs2 = bb2;</div><div class='add'>+#ifdef Sudden_Underflow</div><div class='add'>+#ifdef IBM</div><div class='add'>+        j = 1 + 4*P - 3 - bbbits + ((bbe + bbbits - 1) &amp; 3);</div><div class='add'>+#else</div><div class='add'>+        j = P + 1 - bbbits;</div><div class='add'>+#endif</div><div class='add'>+#else</div><div class='add'>+        i = bbe + bbbits - 1;        /* logb(rv) */</div><div class='add'>+        if (i &lt; Emin)        /* denormal */</div><div class='add'>+            j = bbe + (P-Emin);</div><div class='add'>+        else</div><div class='add'>+            j = P + 1 - bbbits;</div><div class='add'>+#endif</div><div class='add'>+        bb2 += j;</div><div class='add'>+        bd2 += j;</div><div class='add'>+        i = bb2 &lt; bd2 ? bb2 : bd2;</div><div class='add'>+        if (i &gt; bs2)</div><div class='add'>+            i = bs2;</div><div class='add'>+        if (i &gt; 0) {</div><div class='add'>+            bb2 -= i;</div><div class='add'>+            bd2 -= i;</div><div class='add'>+            bs2 -= i;</div><div class='add'>+        }</div><div class='add'>+        if (bb5 &gt; 0) {</div><div class='add'>+            bs = pow5mult(bs, bb5);</div><div class='add'>+            bb1 = mult(bs, bb);</div><div class='add'>+            Bfree(bb);</div><div class='add'>+            bb = bb1;</div><div class='add'>+        }</div><div class='add'>+        if (bb2 &gt; 0)</div><div class='add'>+            bb = lshift(bb, bb2);</div><div class='add'>+        if (bd5 &gt; 0)</div><div class='add'>+            bd = pow5mult(bd, bd5);</div><div class='add'>+        if (bd2 &gt; 0)</div><div class='add'>+            bd = lshift(bd, bd2);</div><div class='add'>+        if (bs2 &gt; 0)</div><div class='add'>+            bs = lshift(bs, bs2);</div><div class='add'>+        delta = diff(bb, bd);</div><div class='add'>+        dsign = delta-&gt;sign;</div><div class='add'>+        delta-&gt;sign = 0;</div><div class='add'>+        i = cmp(delta, bs);</div><div class='add'>+        if (i &lt; 0) {</div><div class='add'>+            /* Error is less than half an ulp -- check for</div><div class='add'>+             * special case of mantissa a power of two.</div><div class='add'>+             */</div><div class='add'>+            if (dsign || getWord1(rv) || getWord0(rv) &amp; Bndry_mask)</div><div class='add'>+                break;</div><div class='add'>+            delta = lshift(delta,Log2P);</div><div class='add'>+            if (cmp(delta, bs) &gt; 0)</div><div class='add'>+                goto drop_down;</div><div class='add'>+            break;</div><div class='add'>+        }</div><div class='add'>+        if (i == 0) {</div><div class='add'>+            /* exactly half-way between */</div><div class='add'>+            if (dsign) {</div><div class='add'>+                if ((getWord0(rv) &amp; Bndry_mask1) == Bndry_mask1</div><div class='add'>+                    &amp;&amp;  getWord1(rv) == 0xffffffff) {</div><div class='add'>+                    /*boundary case -- increment exponent*/</div><div class='add'>+                    setWord0(&amp;rv, (getWord0(rv) &amp; Exp_mask)</div><div class='add'>+                                + Exp_msk1</div><div class='add'>+#ifdef IBM</div><div class='add'>+                                | Exp_msk1 &gt;&gt; 4</div><div class='add'>+#endif</div><div class='add'>+                                );</div><div class='add'>+                    setWord1(&amp;rv, 0);</div><div class='add'>+                    break;</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+            else if (!(getWord0(rv) &amp; Bndry_mask) &amp;&amp; !getWord1(rv)) {</div><div class='add'>+            drop_down:</div><div class='add'>+                /* boundary case -- decrement exponent */</div><div class='add'>+#ifdef Sudden_Underflow</div><div class='add'>+                L = getWord0(rv) &amp; Exp_mask;</div><div class='add'>+#ifdef IBM</div><div class='add'>+                if (L &lt;  Exp_msk1)</div><div class='add'>+#else</div><div class='add'>+                    if (L &lt;= Exp_msk1)</div><div class='add'>+#endif</div><div class='add'>+                        goto undfl;</div><div class='add'>+                L -= Exp_msk1;</div><div class='add'>+#else</div><div class='add'>+                L = (getWord0(rv) &amp; Exp_mask) - Exp_msk1;</div><div class='add'>+#endif</div><div class='add'>+                setWord0(&amp;rv, L | Bndry_mask1);</div><div class='add'>+                setWord1(&amp;rv, 0xffffffff);</div><div class='add'>+#ifdef IBM</div><div class='add'>+                goto cont;</div><div class='add'>+#else</div><div class='add'>+                break;</div><div class='add'>+#endif</div><div class='add'>+            }</div><div class='add'>+#ifndef ROUND_BIASED</div><div class='add'>+            if (!(getWord1(rv) &amp; LSB))</div><div class='add'>+                break;</div><div class='add'>+#endif</div><div class='add'>+            if (dsign)</div><div class='add'>+                rv += ulp(rv);</div><div class='add'>+#ifndef ROUND_BIASED</div><div class='add'>+            else {</div><div class='add'>+                rv -= ulp(rv);</div><div class='add'>+#ifndef Sudden_Underflow</div><div class='add'>+                if (rv == g_double_zero)</div><div class='add'>+                    goto undfl;</div><div class='add'>+#endif</div><div class='add'>+            }</div><div class='add'>+#endif</div><div class='add'>+            break;</div><div class='add'>+        }</div><div class='add'>+        if ((aadj = ratio(delta, bs)) &lt;= 2.) {</div><div class='add'>+            if (dsign)</div><div class='add'>+                aadj = aadj1 = 1.;</div><div class='add'>+            else if (getWord1(rv) || getWord0(rv) &amp; Bndry_mask) {</div><div class='add'>+#ifndef Sudden_Underflow</div><div class='add'>+                if (getWord1(rv) == Tiny1 &amp;&amp; !getWord0(rv))</div><div class='add'>+                    goto undfl;</div><div class='add'>+#endif</div><div class='add'>+                aadj = 1.;</div><div class='add'>+                aadj1 = -1.;</div><div class='add'>+            }</div><div class='add'>+            else {</div><div class='add'>+                /* special case -- power of FLT_RADIX to be */</div><div class='add'>+                /* rounded down... */</div><div class='add'>+</div><div class='add'>+                if (aadj &lt; 2./FLT_RADIX)</div><div class='add'>+                    aadj = 1./FLT_RADIX;</div><div class='add'>+                else</div><div class='add'>+                    aadj *= 0.5;</div><div class='add'>+                aadj1 = -aadj;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        else {</div><div class='add'>+            aadj *= 0.5;</div><div class='add'>+            aadj1 = dsign ? aadj : -aadj;</div><div class='add'>+#ifdef Check_FLT_ROUNDS</div><div class='add'>+            switch(FLT_ROUNDS) {</div><div class='add'>+            case 2: /* towards +infinity */</div><div class='add'>+                aadj1 -= 0.5;</div><div class='add'>+                break;</div><div class='add'>+            case 0: /* towards 0 */</div><div class='add'>+            case 3: /* towards -infinity */</div><div class='add'>+                aadj1 += 0.5;</div><div class='add'>+            }</div><div class='add'>+#else</div><div class='add'>+            if (FLT_ROUNDS == 0)</div><div class='add'>+                aadj1 += 0.5;</div><div class='add'>+#endif</div><div class='add'>+        }</div><div class='add'>+        y = getWord0(rv) &amp; Exp_mask;</div><div class='add'>+</div><div class='add'>+        /* Check for overflow */</div><div class='add'>+</div><div class='add'>+        if (y == Exp_msk1*(DBL_MAX_EXP+Bias-1)) {</div><div class='add'>+            rv0 = rv;</div><div class='add'>+            setWord0(&amp;rv, getWord0(rv) - P*Exp_msk1);</div><div class='add'>+            adj = aadj1 * ulp(rv);</div><div class='add'>+            rv += adj;</div><div class='add'>+            if ((getWord0(rv) &amp; Exp_mask) &gt;=</div><div class='add'>+                Exp_msk1*(DBL_MAX_EXP+Bias-P)) {</div><div class='add'>+                if (getWord0(rv0) == Big0 &amp;&amp; getWord1(rv0) == Big1)</div><div class='add'>+                    goto ovfl;</div><div class='add'>+                setWord0(&amp;rv, Big0);</div><div class='add'>+                setWord1(&amp;rv, Big1);</div><div class='add'>+                goto cont;</div><div class='add'>+            }</div><div class='add'>+            else</div><div class='add'>+                setWord0(&amp;rv, getWord0(rv) + P*Exp_msk1);</div><div class='add'>+        }</div><div class='add'>+        else {</div><div class='add'>+#ifdef Sudden_Underflow</div><div class='add'>+            if ((getWord0(rv) &amp; Exp_mask) &lt;= P*Exp_msk1) {</div><div class='add'>+                rv0 = rv;</div><div class='add'>+                setWord0(&amp;rv, getWord0(rv) + P*Exp_msk1);</div><div class='add'>+                adj = aadj1 * ulp(rv);</div><div class='add'>+                rv += adj;</div><div class='add'>+#ifdef IBM</div><div class='add'>+                if ((getWord0(rv) &amp; Exp_mask) &lt;  P*Exp_msk1)</div><div class='add'>+#else</div><div class='add'>+                    if ((getWord0(rv) &amp; Exp_mask) &lt;= P*Exp_msk1)</div><div class='add'>+#endif</div><div class='add'>+                        {</div><div class='add'>+                            if (getWord0(rv0) == Tiny0</div><div class='add'>+                                &amp;&amp; getWord1(rv0) == Tiny1)</div><div class='add'>+                                goto undfl;</div><div class='add'>+                            setWord0(&amp;rv, Tiny0);</div><div class='add'>+                            setWord1(&amp;rv, Tiny1);</div><div class='add'>+                            goto cont;</div><div class='add'>+                        }</div><div class='add'>+                    else</div><div class='add'>+                        setWord0(&amp;rv, getWord0(rv) - P*Exp_msk1);</div><div class='add'>+            }</div><div class='add'>+            else {</div><div class='add'>+                adj = aadj1 * ulp(rv);</div><div class='add'>+                rv += adj;</div><div class='add'>+            }</div><div class='add'>+#else</div><div class='add'>+            /* Compute adj so that the IEEE rounding rules will</div><div class='add'>+             * correctly round rv + adj in some half-way cases.</div><div class='add'>+             * If rv * ulp(rv) is denormalized (i.e.,</div><div class='add'>+             * y &lt;= (P-1)*Exp_msk1), we must adjust aadj to avoid</div><div class='add'>+             * trouble from bits lost to denormalization;</div><div class='add'>+             * example: 1.2e-307 .</div><div class='add'>+             */</div><div class='add'>+            if (y &lt;= (P-1)*Exp_msk1 &amp;&amp; aadj &gt;= 1.) {</div><div class='add'>+                aadj1 = int(aadj + 0.5);</div><div class='add'>+                if (!dsign)</div><div class='add'>+                    aadj1 = -aadj1;</div><div class='add'>+            }</div><div class='add'>+            adj = aadj1 * ulp(rv);</div><div class='add'>+            rv += adj;</div><div class='add'>+#endif</div><div class='add'>+        }</div><div class='add'>+        z = getWord0(rv) &amp; Exp_mask;</div><div class='add'>+        if (y == z) {</div><div class='add'>+            /* Can we stop now? */</div><div class='add'>+            L = Long(aadj);</div><div class='add'>+            aadj -= L;</div><div class='add'>+            /* The tolerances below are conservative. */</div><div class='add'>+            if (dsign || getWord1(rv) || getWord0(rv) &amp; Bndry_mask) {</div><div class='add'>+                if (aadj &lt; .4999999 || aadj &gt; .5000001)</div><div class='add'>+                    break;</div><div class='add'>+            }</div><div class='add'>+            else if (aadj &lt; .4999999/FLT_RADIX)</div><div class='add'>+                break;</div><div class='add'>+        }</div><div class='add'>+    cont:</div><div class='add'>+        Bfree(bb);</div><div class='add'>+        Bfree(bd);</div><div class='add'>+        Bfree(bs);</div><div class='add'>+        Bfree(delta);</div><div class='add'>+    }</div><div class='add'>+ retfree:</div><div class='add'>+    Bfree(bb);</div><div class='add'>+    Bfree(bd);</div><div class='add'>+    Bfree(bs);</div><div class='add'>+    Bfree(bd0);</div><div class='add'>+    Bfree(delta);</div><div class='add'>+ ret:</div><div class='add'>+    if (se)</div><div class='add'>+        *se = s;</div><div class='add'>+    return sign ? -rv : rv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int quorem(Bigint *b, Bigint *S)</div><div class='add'>+{</div><div class='add'>+    int n;</div><div class='add'>+    Long borrow, y;</div><div class='add'>+    ULong carry, q, ys;</div><div class='add'>+    ULong *bx, *bxe, *sx, *sxe;</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+    Long z;</div><div class='add'>+    ULong si, zs;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    n = S-&gt;wds;</div><div class='add'>+#ifdef BSD_QDTOA_DEBUG</div><div class='add'>+    /*debug*/ if (b-&gt;wds &gt; n)</div><div class='add'>+        /*debug*/        Bug("oversize b in quorem");</div><div class='add'>+#endif</div><div class='add'>+    if (b-&gt;wds &lt; n)</div><div class='add'>+        return 0;</div><div class='add'>+    sx = S-&gt;x;</div><div class='add'>+    sxe = sx + --n;</div><div class='add'>+    bx = b-&gt;x;</div><div class='add'>+    bxe = bx + n;</div><div class='add'>+    q = *bxe / (*sxe + 1);        /* ensure q &lt;= true quotient */</div><div class='add'>+#ifdef BSD_QDTOA_DEBUG</div><div class='add'>+    /*debug*/ if (q &gt; 9)</div><div class='add'>+        /*debug*/        Bug("oversized quotient in quorem");</div><div class='add'>+#endif</div><div class='add'>+    if (q) {</div><div class='add'>+        borrow = 0;</div><div class='add'>+        carry = 0;</div><div class='add'>+        do {</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+            si = *sx++;</div><div class='add'>+            ys = (si &amp; 0xffff) * q + carry;</div><div class='add'>+            zs = (si &gt;&gt; 16) * q + (ys &gt;&gt; 16);</div><div class='add'>+            carry = zs &gt;&gt; 16;</div><div class='add'>+            y = (*bx &amp; 0xffff) - (ys &amp; 0xffff) + borrow;</div><div class='add'>+            borrow = y &gt;&gt; 16;</div><div class='add'>+            Sign_Extend(borrow, y);</div><div class='add'>+            z = (*bx &gt;&gt; 16) - (zs &amp; 0xffff) + borrow;</div><div class='add'>+            borrow = z &gt;&gt; 16;</div><div class='add'>+            Sign_Extend(borrow, z);</div><div class='add'>+            Storeinc(bx, z, y);</div><div class='add'>+#else</div><div class='add'>+            ys = *sx++ * q + carry;</div><div class='add'>+            carry = ys &gt;&gt; 16;</div><div class='add'>+            y = *bx - (ys &amp; 0xffff) + borrow;</div><div class='add'>+            borrow = y &gt;&gt; 16;</div><div class='add'>+            Sign_Extend(borrow, y);</div><div class='add'>+            *bx++ = y &amp; 0xffff;</div><div class='add'>+#endif</div><div class='add'>+        }</div><div class='add'>+        while(sx &lt;= sxe);</div><div class='add'>+        if (!*bxe) {</div><div class='add'>+            bx = b-&gt;x;</div><div class='add'>+            while(--bxe &gt; bx &amp;&amp; !*bxe)</div><div class='add'>+                --n;</div><div class='add'>+            b-&gt;wds = n;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    if (cmp(b, S) &gt;= 0) {</div><div class='add'>+        q++;</div><div class='add'>+        borrow = 0;</div><div class='add'>+        carry = 0;</div><div class='add'>+        bx = b-&gt;x;</div><div class='add'>+        sx = S-&gt;x;</div><div class='add'>+        do {</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+            si = *sx++;</div><div class='add'>+            ys = (si &amp; 0xffff) + carry;</div><div class='add'>+            zs = (si &gt;&gt; 16) + (ys &gt;&gt; 16);</div><div class='add'>+            carry = zs &gt;&gt; 16;</div><div class='add'>+            y = (*bx &amp; 0xffff) - (ys &amp; 0xffff) + borrow;</div><div class='add'>+            borrow = y &gt;&gt; 16;</div><div class='add'>+            Sign_Extend(borrow, y);</div><div class='add'>+            z = (*bx &gt;&gt; 16) - (zs &amp; 0xffff) + borrow;</div><div class='add'>+            borrow = z &gt;&gt; 16;</div><div class='add'>+            Sign_Extend(borrow, z);</div><div class='add'>+            Storeinc(bx, z, y);</div><div class='add'>+#else</div><div class='add'>+            ys = *sx++ + carry;</div><div class='add'>+            carry = ys &gt;&gt; 16;</div><div class='add'>+            y = *bx - (ys &amp; 0xffff) + borrow;</div><div class='add'>+            borrow = y &gt;&gt; 16;</div><div class='add'>+            Sign_Extend(borrow, y);</div><div class='add'>+            *bx++ = y &amp; 0xffff;</div><div class='add'>+#endif</div><div class='add'>+        }</div><div class='add'>+        while(sx &lt;= sxe);</div><div class='add'>+        bx = b-&gt;x;</div><div class='add'>+        bxe = bx + n;</div><div class='add'>+        if (!*bxe) {</div><div class='add'>+            while(--bxe &gt; bx &amp;&amp; !*bxe)</div><div class='add'>+                --n;</div><div class='add'>+            b-&gt;wds = n;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    return q;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* dtoa for IEEE arithmetic (dmg): convert double to ASCII string.</div><div class='add'>+ *</div><div class='add'>+ * Inspired by "How to Print Floating-Point Numbers Accurately" by</div><div class='add'>+ * Guy L. Steele, Jr. and Jon L. White [Proc. ACM SIGPLAN '90, pp. 92-101].</div><div class='add'>+ *</div><div class='add'>+ * Modifications:</div><div class='add'>+ *        1. Rather than iterating, we use a simple numeric overestimate</div><div class='add'>+ *           to determine k = floor(log10(d)).  We scale relevant</div><div class='add'>+ *           quantities using O(log2(k)) rather than O(k) multiplications.</div><div class='add'>+ *        2. For some modes &gt; 2 (corresponding to ecvt and fcvt), we don't</div><div class='add'>+ *           try to generate digits strictly left to right.  Instead, we</div><div class='add'>+ *           compute with fewer bits and propagate the carry if necessary</div><div class='add'>+ *           when rounding the final digit up.  This is often faster.</div><div class='add'>+ *        3. Under the assumption that input will be rounded nearest,</div><div class='add'>+ *           mode 0 renders 1e23 as 1e23 rather than 9.999999999999999e22.</div><div class='add'>+ *           That is, we allow equality in stopping tests when the</div><div class='add'>+ *           round-nearest rule will give the same floating-point value</div><div class='add'>+ *           as would satisfaction of the stopping test with strict</div><div class='add'>+ *           inequality.</div><div class='add'>+ *        4. We remove common factors of powers of 2 from relevant</div><div class='add'>+ *           quantities.</div><div class='add'>+ *        5. When converting floating-point integers less than 1e16,</div><div class='add'>+ *           we use floating-point arithmetic rather than resorting</div><div class='add'>+ *           to multiple-precision integers.</div><div class='add'>+ *        6. When asked to produce fewer than 15 digits, we first try</div><div class='add'>+ *           to get by with floating-point arithmetic; we resort to</div><div class='add'>+ *           multiple-precision integer arithmetic only if we cannot</div><div class='add'>+ *           guarantee that the floating-point calculation has given</div><div class='add'>+ *           the correctly rounded result.  For k requested digits and</div><div class='add'>+ *           "uniformly" distributed input, the probability is</div><div class='add'>+ *           something like 10^(k-15) that we must resort to the Long</div><div class='add'>+ *           calculation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* This actually sometimes returns a pointer to a string literal</div><div class='add'>+   cast to a char*. Do NOT try to modify the return value. */</div><div class='add'>+</div><div class='add'>+Q_CORE_EXPORT char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp)</div><div class='add'>+{</div><div class='add'>+    // Some values of the floating-point control word can cause _qdtoa to crash with an underflow.</div><div class='add'>+    // We set a safe value here.</div><div class='add'>+#ifdef Q_OS_WIN</div><div class='add'>+    _clear87();</div><div class='add'>+    unsigned int oldbits = _control87(0, 0);</div><div class='add'>+#ifndef MCW_EM</div><div class='add'>+#    ifdef _MCW_EM</div><div class='add'>+#        define MCW_EM _MCW_EM</div><div class='add'>+#    else</div><div class='add'>+#        define MCW_EM 0x0008001F</div><div class='add'>+#    endif</div><div class='add'>+#endif</div><div class='add'>+    _control87(MCW_EM, MCW_EM);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_LINUX) &amp;&amp; !defined(__UCLIBC__)</div><div class='add'>+    fenv_t envp;</div><div class='add'>+    feholdexcept(&amp;envp);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    char *s = _qdtoa(d, mode, ndigits, decpt, sign, rve, resultp);</div><div class='add'>+</div><div class='add'>+#ifdef Q_OS_WIN</div><div class='add'>+    _clear87();</div><div class='add'>+#ifndef _M_X64</div><div class='add'>+    _control87(oldbits, 0xFFFFF);</div><div class='add'>+#else</div><div class='add'>+    _control87(oldbits, _MCW_EM|_MCW_DN|_MCW_RC);</div><div class='add'>+#endif //_M_X64</div><div class='add'>+#endif //Q_OS_WIN</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_LINUX) &amp;&amp; !defined(__UCLIBC__)</div><div class='add'>+    fesetenv(&amp;envp);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    return s;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp)</div><div class='add'>+{</div><div class='add'>+    /*</div><div class='add'>+      Arguments ndigits, decpt, sign are similar to those</div><div class='add'>+      of ecvt and fcvt; trailing zeros are suppressed from</div><div class='add'>+      the returned string.  If not null, *rve is set to point</div><div class='add'>+      to the end of the return value.  If d is +-Infinity or NaN,</div><div class='add'>+      then *decpt is set to 9999.</div><div class='add'>+</div><div class='add'>+      mode:</div><div class='add'>+      0 ==&gt; shortest string that yields d when read in</div><div class='add'>+      and rounded to nearest.</div><div class='add'>+      1 ==&gt; like 0, but with Steele &amp; White stopping rule;</div><div class='add'>+      e.g. with IEEE P754 arithmetic , mode 0 gives</div><div class='add'>+      1e23 whereas mode 1 gives 9.999999999999999e22.</div><div class='add'>+      2 ==&gt; max(1,ndigits) significant digits.  This gives a</div><div class='add'>+      return value similar to that of ecvt, except</div><div class='add'>+      that trailing zeros are suppressed.</div><div class='add'>+      3 ==&gt; through ndigits past the decimal point.  This</div><div class='add'>+      gives a return value similar to that from fcvt,</div><div class='add'>+      except that trailing zeros are suppressed, and</div><div class='add'>+      ndigits can be negative.</div><div class='add'>+      4-9 should give the same return values as 2-3, i.e.,</div><div class='add'>+      4 &lt;= mode &lt;= 9 ==&gt; same return as mode</div><div class='add'>+      2 + (mode &amp; 1).  These modes are mainly for</div><div class='add'>+      debugging; often they run slower but sometimes</div><div class='add'>+      faster than modes 2-3.</div><div class='add'>+      4,5,8,9 ==&gt; left-to-right digit generation.</div><div class='add'>+      6-9 ==&gt; don't try fast floating-point estimate</div><div class='add'>+      (if applicable).</div><div class='add'>+</div><div class='add'>+      Values of mode other than 0-9 are treated as mode 0.</div><div class='add'>+</div><div class='add'>+      Sufficient space is allocated to the return value</div><div class='add'>+      to hold the suppressed trailing zeros.</div><div class='add'>+    */</div><div class='add'>+</div><div class='add'>+    int bbits, b2, b5, be, dig, i, ieps, ilim0,</div><div class='add'>+        j, j1, k, k0, k_check, leftright, m2, m5, s2, s5,</div><div class='add'>+        try_quick;</div><div class='add'>+    int ilim = 0, ilim1 = 0, spec_case = 0;        /* pacify gcc */</div><div class='add'>+    Long L;</div><div class='add'>+#ifndef Sudden_Underflow</div><div class='add'>+    int denorm;</div><div class='add'>+    ULong x;</div><div class='add'>+#endif</div><div class='add'>+    Bigint *b, *b1, *delta, *mhi, *S;</div><div class='add'>+    Bigint *mlo = NULL; /* pacify gcc */</div><div class='add'>+    double d2;</div><div class='add'>+    double ds, eps;</div><div class='add'>+    char *s, *s0;</div><div class='add'>+</div><div class='add'>+    if (getWord0(d) &amp; Sign_bit) {</div><div class='add'>+        /* set sign for everything, including 0's and NaNs */</div><div class='add'>+        *sign = 1;</div><div class='add'>+        setWord0(&amp;d, getWord0(d) &amp; ~Sign_bit);        /* clear sign bit */</div><div class='add'>+    }</div><div class='add'>+    else</div><div class='add'>+        *sign = 0;</div><div class='add'>+</div><div class='add'>+#if defined(IEEE_Arith) + defined(VAX)</div><div class='add'>+#ifdef IEEE_Arith</div><div class='add'>+    if ((getWord0(d) &amp; Exp_mask) == Exp_mask)</div><div class='add'>+#else</div><div class='add'>+        if (getWord0(d)  == 0x8000)</div><div class='add'>+#endif</div><div class='add'>+            {</div><div class='add'>+                /* Infinity or NaN */</div><div class='add'>+                *decpt = 9999;</div><div class='add'>+                s =</div><div class='add'>+#ifdef IEEE_Arith</div><div class='add'>+                    !getWord1(d) &amp;&amp; !(getWord0(d) &amp; 0xfffff) ? const_cast&lt;char*&gt;("Infinity") :</div><div class='add'>+#endif</div><div class='add'>+                    const_cast&lt;char*&gt;("NaN");</div><div class='add'>+                if (rve)</div><div class='add'>+                    *rve =</div><div class='add'>+#ifdef IEEE_Arith</div><div class='add'>+                        s[3] ? s + 8 :</div><div class='add'>+#endif</div><div class='add'>+                        s + 3;</div><div class='add'>+                return s;</div><div class='add'>+            }</div><div class='add'>+#endif</div><div class='add'>+#ifdef IBM</div><div class='add'>+    d += 0; /* normalize */</div><div class='add'>+#endif</div><div class='add'>+    if (d == g_double_zero)</div><div class='add'>+        {</div><div class='add'>+            *decpt = 1;</div><div class='add'>+            s = const_cast&lt;char*&gt;("0");</div><div class='add'>+            if (rve)</div><div class='add'>+                *rve = s + 1;</div><div class='add'>+            return s;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+    b = d2b(d, &amp;be, &amp;bbits);</div><div class='add'>+#ifdef Sudden_Underflow</div><div class='add'>+    i = (int)(getWord0(d) &gt;&gt; Exp_shift1 &amp; (Exp_mask&gt;&gt;Exp_shift1));</div><div class='add'>+#else</div><div class='add'>+    if ((i = int(getWord0(d) &gt;&gt; Exp_shift1 &amp; (Exp_mask&gt;&gt;Exp_shift1))) != 0) {</div><div class='add'>+#endif</div><div class='add'>+        d2 = d;</div><div class='add'>+        setWord0(&amp;d2, getWord0(d2) &amp; Frac_mask1);</div><div class='add'>+        setWord0(&amp;d2, getWord0(d2) | Exp_11);</div><div class='add'>+#ifdef IBM</div><div class='add'>+        if (j = 11 - hi0bits(getWord0(d2) &amp; Frac_mask))</div><div class='add'>+            d2 /= 1 &lt;&lt; j;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+        /* log(x)        ~=~ log(1.5) + (x-1.5)/1.5</div><div class='add'>+         * log10(x)         =  log(x) / log(10)</div><div class='add'>+         *                ~=~ log(1.5)/log(10) + (x-1.5)/(1.5*log(10))</div><div class='add'>+         * log10(d) = (i-Bias)*log(2)/log(10) + log10(d2)</div><div class='add'>+         *</div><div class='add'>+         * This suggests computing an approximation k to log10(d) by</div><div class='add'>+         *</div><div class='add'>+         * k = (i - Bias)*0.301029995663981</div><div class='add'>+         *        + ( (d2-1.5)*0.289529654602168 + 0.176091259055681 );</div><div class='add'>+         *</div><div class='add'>+         * We want k to be too large rather than too small.</div><div class='add'>+         * The error in the first-order Taylor series approximation</div><div class='add'>+         * is in our favor, so we just round up the constant enough</div><div class='add'>+         * to compensate for any error in the multiplication of</div><div class='add'>+         * (i - Bias) by 0.301029995663981; since |i - Bias| &lt;= 1077,</div><div class='add'>+         * and 1077 * 0.30103 * 2^-52 ~=~ 7.2e-14,</div><div class='add'>+         * adding 1e-13 to the constant term more than suffices.</div><div class='add'>+         * Hence we adjust the constant term to 0.1760912590558.</div><div class='add'>+         * (We could get a more accurate k by invoking log10,</div><div class='add'>+         *  but this is probably not worthwhile.)</div><div class='add'>+         */</div><div class='add'>+</div><div class='add'>+        i -= Bias;</div><div class='add'>+#ifdef IBM</div><div class='add'>+        i &lt;&lt;= 2;</div><div class='add'>+        i += j;</div><div class='add'>+#endif</div><div class='add'>+#ifndef Sudden_Underflow</div><div class='add'>+        denorm = 0;</div><div class='add'>+    }</div><div class='add'>+    else {</div><div class='add'>+        /* d is denormalized */</div><div class='add'>+</div><div class='add'>+        i = bbits + be + (Bias + (P-1) - 1);</div><div class='add'>+        x = i &gt; 32  ? getWord0(d) &lt;&lt; (64 - i) | getWord1(d) &gt;&gt; (i - 32)</div><div class='add'>+            : getWord1(d) &lt;&lt; (32 - i);</div><div class='add'>+        d2 = x;</div><div class='add'>+        setWord0(&amp;d2, getWord0(d2) - 31*Exp_msk1); /* adjust exponent */</div><div class='add'>+        i -= (Bias + (P-1) - 1) + 1;</div><div class='add'>+        denorm = 1;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    ds = (d2-1.5)*0.289529654602168 + 0.1760912590558 + i*0.301029995663981;</div><div class='add'>+    k = int(ds);</div><div class='add'>+    if (ds &lt; 0. &amp;&amp; ds != k)</div><div class='add'>+        k--;        /* want k = floor(ds) */</div><div class='add'>+    k_check = 1;</div><div class='add'>+    if (k &gt;= 0 &amp;&amp; k &lt;= Ten_pmax) {</div><div class='add'>+        if (d &lt; tens[k])</div><div class='add'>+            k--;</div><div class='add'>+        k_check = 0;</div><div class='add'>+    }</div><div class='add'>+    j = bbits - i - 1;</div><div class='add'>+    if (j &gt;= 0) {</div><div class='add'>+        b2 = 0;</div><div class='add'>+        s2 = j;</div><div class='add'>+    }</div><div class='add'>+    else {</div><div class='add'>+        b2 = -j;</div><div class='add'>+        s2 = 0;</div><div class='add'>+    }</div><div class='add'>+    if (k &gt;= 0) {</div><div class='add'>+        b5 = 0;</div><div class='add'>+        s5 = k;</div><div class='add'>+        s2 += k;</div><div class='add'>+    }</div><div class='add'>+    else {</div><div class='add'>+        b2 -= k;</div><div class='add'>+        b5 = -k;</div><div class='add'>+        s5 = 0;</div><div class='add'>+    }</div><div class='add'>+    if (mode &lt; 0 || mode &gt; 9)</div><div class='add'>+        mode = 0;</div><div class='add'>+    try_quick = 1;</div><div class='add'>+    if (mode &gt; 5) {</div><div class='add'>+        mode -= 4;</div><div class='add'>+        try_quick = 0;</div><div class='add'>+    }</div><div class='add'>+    leftright = 1;</div><div class='add'>+    switch(mode) {</div><div class='add'>+    case 0:</div><div class='add'>+    case 1:</div><div class='add'>+        ilim = ilim1 = -1;</div><div class='add'>+        i = 18;</div><div class='add'>+        ndigits = 0;</div><div class='add'>+        break;</div><div class='add'>+    case 2:</div><div class='add'>+        leftright = 0;</div><div class='add'>+        /* no break */</div><div class='add'>+    case 4:</div><div class='add'>+        if (ndigits &lt;= 0)</div><div class='add'>+            ndigits = 1;</div><div class='add'>+        ilim = ilim1 = i = ndigits;</div><div class='add'>+        break;</div><div class='add'>+    case 3:</div><div class='add'>+        leftright = 0;</div><div class='add'>+        /* no break */</div><div class='add'>+    case 5:</div><div class='add'>+        i = ndigits + k + 1;</div><div class='add'>+        ilim = i;</div><div class='add'>+        ilim1 = i - 1;</div><div class='add'>+        if (i &lt;= 0)</div><div class='add'>+            i = 1;</div><div class='add'>+    }</div><div class='add'>+    QT_TRY {</div><div class='add'>+        *resultp = static_cast&lt;char *&gt;(malloc(i + 1));</div><div class='add'>+        Q_CHECK_PTR(*resultp);</div><div class='add'>+    } QT_CATCH(...) {</div><div class='add'>+        Bfree(b);</div><div class='add'>+        QT_RETHROW;</div><div class='add'>+    }</div><div class='add'>+    s = s0 = *resultp;</div><div class='add'>+</div><div class='add'>+    if (ilim &gt;= 0 &amp;&amp; ilim &lt;= Quick_max &amp;&amp; try_quick) {</div><div class='add'>+</div><div class='add'>+        /* Try to get by with floating-point arithmetic. */</div><div class='add'>+</div><div class='add'>+        i = 0;</div><div class='add'>+        d2 = d;</div><div class='add'>+        k0 = k;</div><div class='add'>+        ilim0 = ilim;</div><div class='add'>+        ieps = 2; /* conservative */</div><div class='add'>+        if (k &gt; 0) {</div><div class='add'>+            ds = tens[k&amp;0xf];</div><div class='add'>+            j = k &gt;&gt; 4;</div><div class='add'>+            if (j &amp; Bletch) {</div><div class='add'>+                /* prevent overflows */</div><div class='add'>+                j &amp;= Bletch - 1;</div><div class='add'>+                d /= bigtens[n_bigtens-1];</div><div class='add'>+                ieps++;</div><div class='add'>+            }</div><div class='add'>+            for(; j; j &gt;&gt;= 1, i++)</div><div class='add'>+                if (j &amp; 1) {</div><div class='add'>+                    ieps++;</div><div class='add'>+                    ds *= bigtens[i];</div><div class='add'>+                }</div><div class='add'>+            d /= ds;</div><div class='add'>+        }</div><div class='add'>+        else if ((j1 = -k) != 0) {</div><div class='add'>+            d *= tens[j1 &amp; 0xf];</div><div class='add'>+            for(j = j1 &gt;&gt; 4; j; j &gt;&gt;= 1, i++)</div><div class='add'>+                if (j &amp; 1) {</div><div class='add'>+                    ieps++;</div><div class='add'>+                    d *= bigtens[i];</div><div class='add'>+                }</div><div class='add'>+        }</div><div class='add'>+        if (k_check &amp;&amp; d &lt; 1. &amp;&amp; ilim &gt; 0) {</div><div class='add'>+            if (ilim1 &lt;= 0)</div><div class='add'>+                goto fast_failed;</div><div class='add'>+            ilim = ilim1;</div><div class='add'>+            k--;</div><div class='add'>+            d *= 10.;</div><div class='add'>+            ieps++;</div><div class='add'>+        }</div><div class='add'>+        eps = ieps*d + 7.;</div><div class='add'>+        setWord0(&amp;eps, getWord0(eps) - (P-1)*Exp_msk1);</div><div class='add'>+        if (ilim == 0) {</div><div class='add'>+            S = mhi = 0;</div><div class='add'>+            d -= 5.;</div><div class='add'>+            if (d &gt; eps)</div><div class='add'>+                goto one_digit;</div><div class='add'>+            if (d &lt; -eps)</div><div class='add'>+                goto no_digits;</div><div class='add'>+            goto fast_failed;</div><div class='add'>+        }</div><div class='add'>+#ifndef No_leftright</div><div class='add'>+        if (leftright) {</div><div class='add'>+            /* Use Steele &amp; White method of only</div><div class='add'>+             * generating digits needed.</div><div class='add'>+             */</div><div class='add'>+            eps = 0.5/tens[ilim-1] - eps;</div><div class='add'>+            for(i = 0;;) {</div><div class='add'>+                L = Long(d);</div><div class='add'>+                d -= L;</div><div class='add'>+                *s++ = '0' + int(L);</div><div class='add'>+                if (d &lt; eps)</div><div class='add'>+                    goto ret1;</div><div class='add'>+                if (1. - d &lt; eps)</div><div class='add'>+                    goto bump_up;</div><div class='add'>+                if (++i &gt;= ilim)</div><div class='add'>+                    break;</div><div class='add'>+                eps *= 10.;</div><div class='add'>+                d *= 10.;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        else {</div><div class='add'>+#endif</div><div class='add'>+            /* Generate ilim digits, then fix them up. */</div><div class='add'>+#if defined(Q_OS_IRIX) &amp;&amp; defined(Q_CC_GNU)</div><div class='add'>+            // work around a bug on 64 bit IRIX gcc</div><div class='add'>+            double *t = (double *) tens;</div><div class='add'>+            eps *= t[ilim-1];</div><div class='add'>+#else</div><div class='add'>+            eps *= tens[ilim-1];</div><div class='add'>+#endif</div><div class='add'>+            for(i = 1;; i++, d *= 10.) {</div><div class='add'>+                L = Long(d);</div><div class='add'>+                d -= L;</div><div class='add'>+                *s++ = '0' + int(L);</div><div class='add'>+                if (i == ilim) {</div><div class='add'>+                    if (d &gt; 0.5 + eps)</div><div class='add'>+                        goto bump_up;</div><div class='add'>+                    else if (d &lt; 0.5 - eps) {</div><div class='add'>+                        while(*--s == '0') {}</div><div class='add'>+                        s++;</div><div class='add'>+                        goto ret1;</div><div class='add'>+                    }</div><div class='add'>+                    break;</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+#ifndef No_leftright</div><div class='add'>+        }</div><div class='add'>+#endif</div><div class='add'>+    fast_failed:</div><div class='add'>+        s = s0;</div><div class='add'>+        d = d2;</div><div class='add'>+        k = k0;</div><div class='add'>+        ilim = ilim0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* Do we have a "small" integer? */</div><div class='add'>+</div><div class='add'>+    if (be &gt;= 0 &amp;&amp; k &lt;= Int_max) {</div><div class='add'>+        /* Yes. */</div><div class='add'>+        ds = tens[k];</div><div class='add'>+        if (ndigits &lt; 0 &amp;&amp; ilim &lt;= 0) {</div><div class='add'>+            S = mhi = 0;</div><div class='add'>+            if (ilim &lt; 0 || d &lt;= 5*ds)</div><div class='add'>+                goto no_digits;</div><div class='add'>+            goto one_digit;</div><div class='add'>+        }</div><div class='add'>+        for(i = 1;; i++) {</div><div class='add'>+            L = Long(d / ds);</div><div class='add'>+            d -= L*ds;</div><div class='add'>+#ifdef Check_FLT_ROUNDS</div><div class='add'>+            /* If FLT_ROUNDS == 2, L will usually be high by 1 */</div><div class='add'>+            if (d &lt; 0) {</div><div class='add'>+                L--;</div><div class='add'>+                d += ds;</div><div class='add'>+            }</div><div class='add'>+#endif</div><div class='add'>+            *s++ = '0' + int(L);</div><div class='add'>+            if (i == ilim) {</div><div class='add'>+                d += d;</div><div class='add'>+                if (d &gt; ds || (d == ds &amp;&amp; L &amp; 1)) {</div><div class='add'>+                bump_up:</div><div class='add'>+                    while(*--s == '9')</div><div class='add'>+                        if (s == s0) {</div><div class='add'>+                            k++;</div><div class='add'>+                            *s = '0';</div><div class='add'>+                            break;</div><div class='add'>+                        }</div><div class='add'>+                    ++*s++;</div><div class='add'>+                }</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+            if ((d *= 10.) == g_double_zero)</div><div class='add'>+                break;</div><div class='add'>+        }</div><div class='add'>+        goto ret1;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    m2 = b2;</div><div class='add'>+    m5 = b5;</div><div class='add'>+    mhi = mlo = 0;</div><div class='add'>+    if (leftright) {</div><div class='add'>+        if (mode &lt; 2) {</div><div class='add'>+            i =</div><div class='add'>+#ifndef Sudden_Underflow</div><div class='add'>+                denorm ? be + (Bias + (P-1) - 1 + 1) :</div><div class='add'>+#endif</div><div class='add'>+#ifdef IBM</div><div class='add'>+                1 + 4*P - 3 - bbits + ((bbits + be - 1) &amp; 3);</div><div class='add'>+#else</div><div class='add'>+            1 + P - bbits;</div><div class='add'>+#endif</div><div class='add'>+        }</div><div class='add'>+        else {</div><div class='add'>+            j = ilim - 1;</div><div class='add'>+            if (m5 &gt;= j)</div><div class='add'>+                m5 -= j;</div><div class='add'>+            else {</div><div class='add'>+                s5 += j -= m5;</div><div class='add'>+                b5 += j;</div><div class='add'>+                m5 = 0;</div><div class='add'>+            }</div><div class='add'>+            if ((i = ilim) &lt; 0) {</div><div class='add'>+                m2 -= i;</div><div class='add'>+                i = 0;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        b2 += i;</div><div class='add'>+        s2 += i;</div><div class='add'>+        mhi = i2b(1);</div><div class='add'>+    }</div><div class='add'>+    if (m2 &gt; 0 &amp;&amp; s2 &gt; 0) {</div><div class='add'>+        i = m2 &lt; s2 ? m2 : s2;</div><div class='add'>+        b2 -= i;</div><div class='add'>+        m2 -= i;</div><div class='add'>+        s2 -= i;</div><div class='add'>+    }</div><div class='add'>+    if (b5 &gt; 0) {</div><div class='add'>+        if (leftright) {</div><div class='add'>+            if (m5 &gt; 0) {</div><div class='add'>+                mhi = pow5mult(mhi, m5);</div><div class='add'>+                b1 = mult(mhi, b);</div><div class='add'>+                Bfree(b);</div><div class='add'>+                b = b1;</div><div class='add'>+            }</div><div class='add'>+            if ((j = b5 - m5) != 0)</div><div class='add'>+                b = pow5mult(b, j);</div><div class='add'>+        }</div><div class='add'>+        else</div><div class='add'>+            b = pow5mult(b, b5);</div><div class='add'>+    }</div><div class='add'>+    S = i2b(1);</div><div class='add'>+    if (s5 &gt; 0)</div><div class='add'>+        S = pow5mult(S, s5);</div><div class='add'>+</div><div class='add'>+    /* Check for special case that d is a normalized power of 2. */</div><div class='add'>+</div><div class='add'>+    if (mode &lt; 2) {</div><div class='add'>+        if (!getWord1(d) &amp;&amp; !(getWord0(d) &amp; Bndry_mask)</div><div class='add'>+#ifndef Sudden_Underflow</div><div class='add'>+            &amp;&amp; getWord0(d) &amp; Exp_mask</div><div class='add'>+#endif</div><div class='add'>+            ) {</div><div class='add'>+            /* The special case */</div><div class='add'>+            b2 += Log2P;</div><div class='add'>+            s2 += Log2P;</div><div class='add'>+            spec_case = 1;</div><div class='add'>+        }</div><div class='add'>+        else</div><div class='add'>+            spec_case = 0;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* Arrange for convenient computation of quotients:</div><div class='add'>+     * shift left if necessary so divisor has 4 leading 0 bits.</div><div class='add'>+     *</div><div class='add'>+     * Perhaps we should just compute leading 28 bits of S once</div><div class='add'>+     * and for all and pass them and a shift to quorem, so it</div><div class='add'>+     * can do shifts and ors to compute the numerator for q.</div><div class='add'>+     */</div><div class='add'>+#ifdef Pack_32</div><div class='add'>+    if ((i = ((s5 ? 32 - hi0bits(S-&gt;x[S-&gt;wds-1]) : 1) + s2) &amp; 0x1f) != 0)</div><div class='add'>+        i = 32 - i;</div><div class='add'>+#else</div><div class='add'>+    if (i = ((s5 ? 32 - hi0bits(S-&gt;x[S-&gt;wds-1]) : 1) + s2) &amp; 0xf)</div><div class='add'>+        i = 16 - i;</div><div class='add'>+#endif</div><div class='add'>+    if (i &gt; 4) {</div><div class='add'>+        i -= 4;</div><div class='add'>+        b2 += i;</div><div class='add'>+        m2 += i;</div><div class='add'>+        s2 += i;</div><div class='add'>+    }</div><div class='add'>+    else if (i &lt; 4) {</div><div class='add'>+        i += 28;</div><div class='add'>+        b2 += i;</div><div class='add'>+        m2 += i;</div><div class='add'>+        s2 += i;</div><div class='add'>+    }</div><div class='add'>+    if (b2 &gt; 0)</div><div class='add'>+        b = lshift(b, b2);</div><div class='add'>+    if (s2 &gt; 0)</div><div class='add'>+        S = lshift(S, s2);</div><div class='add'>+    if (k_check) {</div><div class='add'>+        if (cmp(b,S) &lt; 0) {</div><div class='add'>+            k--;</div><div class='add'>+            b = multadd(b, 10, 0);        /* we botched the k estimate */</div><div class='add'>+            if (leftright)</div><div class='add'>+                mhi = multadd(mhi, 10, 0);</div><div class='add'>+            ilim = ilim1;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    if (ilim &lt;= 0 &amp;&amp; mode &gt; 2) {</div><div class='add'>+        if (ilim &lt; 0 || cmp(b,S = multadd(S,5,0)) &lt;= 0) {</div><div class='add'>+            /* no digits, fcvt style */</div><div class='add'>+        no_digits:</div><div class='add'>+            k = -1 - ndigits;</div><div class='add'>+            goto ret;</div><div class='add'>+        }</div><div class='add'>+    one_digit:</div><div class='add'>+        *s++ = '1';</div><div class='add'>+        k++;</div><div class='add'>+        goto ret;</div><div class='add'>+    }</div><div class='add'>+    if (leftright) {</div><div class='add'>+        if (m2 &gt; 0)</div><div class='add'>+            mhi = lshift(mhi, m2);</div><div class='add'>+</div><div class='add'>+        /* Compute mlo -- check for special case</div><div class='add'>+         * that d is a normalized power of 2.</div><div class='add'>+         */</div><div class='add'>+</div><div class='add'>+        mlo = mhi;</div><div class='add'>+        if (spec_case) {</div><div class='add'>+            mhi = Balloc(mhi-&gt;k);</div><div class='add'>+            Bcopy(mhi, mlo);</div><div class='add'>+            mhi = lshift(mhi, Log2P);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        for(i = 1;;i++) {</div><div class='add'>+            dig = quorem(b,S) + '0';</div><div class='add'>+            /* Do we yet have the shortest decimal string</div><div class='add'>+             * that will round to d?</div><div class='add'>+             */</div><div class='add'>+            j = cmp(b, mlo);</div><div class='add'>+            delta = diff(S, mhi);</div><div class='add'>+            j1 = delta-&gt;sign ? 1 : cmp(b, delta);</div><div class='add'>+            Bfree(delta);</div><div class='add'>+#ifndef ROUND_BIASED</div><div class='add'>+            if (j1 == 0 &amp;&amp; !mode &amp;&amp; !(getWord1(d) &amp; 1)) {</div><div class='add'>+                if (dig == '9')</div><div class='add'>+                    goto round_9_up;</div><div class='add'>+                if (j &gt; 0)</div><div class='add'>+                    dig++;</div><div class='add'>+                *s++ = dig;</div><div class='add'>+                goto ret;</div><div class='add'>+            }</div><div class='add'>+#endif</div><div class='add'>+            if (j &lt; 0 || (j == 0 &amp;&amp; !mode</div><div class='add'>+#ifndef ROUND_BIASED</div><div class='add'>+                          &amp;&amp; !(getWord1(d) &amp; 1)</div><div class='add'>+#endif</div><div class='add'>+                          )) {</div><div class='add'>+                if (j1 &gt; 0) {</div><div class='add'>+                    b = lshift(b, 1);</div><div class='add'>+                    j1 = cmp(b, S);</div><div class='add'>+                    if ((j1 &gt; 0 || (j1 == 0 &amp;&amp; dig &amp; 1))</div><div class='add'>+                        &amp;&amp; dig++ == '9')</div><div class='add'>+                        goto round_9_up;</div><div class='add'>+                }</div><div class='add'>+                *s++ = dig;</div><div class='add'>+                goto ret;</div><div class='add'>+            }</div><div class='add'>+            if (j1 &gt; 0) {</div><div class='add'>+                if (dig == '9') { /* possible if i == 1 */</div><div class='add'>+                round_9_up:</div><div class='add'>+                    *s++ = '9';</div><div class='add'>+                    goto roundoff;</div><div class='add'>+                }</div><div class='add'>+                *s++ = dig + 1;</div><div class='add'>+                goto ret;</div><div class='add'>+            }</div><div class='add'>+            *s++ = dig;</div><div class='add'>+            if (i == ilim)</div><div class='add'>+                break;</div><div class='add'>+            b = multadd(b, 10, 0);</div><div class='add'>+            if (mlo == mhi)</div><div class='add'>+                mlo = mhi = multadd(mhi, 10, 0);</div><div class='add'>+            else {</div><div class='add'>+                mlo = multadd(mlo, 10, 0);</div><div class='add'>+                mhi = multadd(mhi, 10, 0);</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    else</div><div class='add'>+        for(i = 1;; i++) {</div><div class='add'>+            *s++ = dig = quorem(b,S) + '0';</div><div class='add'>+            if (i &gt;= ilim)</div><div class='add'>+                break;</div><div class='add'>+            b = multadd(b, 10, 0);</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+    /* Round off last digit */</div><div class='add'>+</div><div class='add'>+    b = lshift(b, 1);</div><div class='add'>+    j = cmp(b, S);</div><div class='add'>+    if (j &gt; 0 || (j == 0 &amp;&amp; dig &amp; 1)) {</div><div class='add'>+    roundoff:</div><div class='add'>+        while(*--s == '9')</div><div class='add'>+            if (s == s0) {</div><div class='add'>+                k++;</div><div class='add'>+                *s++ = '1';</div><div class='add'>+                goto ret;</div><div class='add'>+            }</div><div class='add'>+        ++*s++;</div><div class='add'>+    }</div><div class='add'>+    else {</div><div class='add'>+        while(*--s == '0') {}</div><div class='add'>+        s++;</div><div class='add'>+    }</div><div class='add'>+ ret:</div><div class='add'>+    Bfree(S);</div><div class='add'>+    if (mhi) {</div><div class='add'>+        if (mlo &amp;&amp; mlo != mhi)</div><div class='add'>+            Bfree(mlo);</div><div class='add'>+        Bfree(mhi);</div><div class='add'>+    }</div><div class='add'>+ ret1:</div><div class='add'>+    Bfree(b);</div><div class='add'>+    if (s == s0) {                                /* don't return empty string */</div><div class='add'>+        *s++ = '0';</div><div class='add'>+        k = 0;</div><div class='add'>+    }</div><div class='add'>+    *s = 0;</div><div class='add'>+    *decpt = k + 1;</div><div class='add'>+    if (rve)</div><div class='add'>+        *rve = s;</div><div class='add'>+    return s0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+// NOT thread safe!</div><div class='add'>+</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+</div><div class='add'>+Q_CORE_EXPORT char *qdtoa( double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp)</div><div class='add'>+{</div><div class='add'>+    if(rve)</div><div class='add'>+      *rve = 0;</div><div class='add'>+</div><div class='add'>+    char *res;</div><div class='add'>+    if (mode == 0)</div><div class='add'>+        ndigits = 80;</div><div class='add'>+</div><div class='add'>+    if (mode == 3)</div><div class='add'>+        res = fcvt(d, ndigits, decpt, sign);</div><div class='add'>+    else</div><div class='add'>+        res = ecvt(d, ndigits, decpt, sign);</div><div class='add'>+</div><div class='add'>+    int n = qstrlen(res);</div><div class='add'>+    if (mode == 0) { // remove trailing 0's</div><div class='add'>+        const int stop = qMax(1, *decpt);</div><div class='add'>+        int i;</div><div class='add'>+        for (i = n-1; i &gt;= stop; --i) {</div><div class='add'>+            if (res[i] != '0')</div><div class='add'>+                break;</div><div class='add'>+        }</div><div class='add'>+        n = i + 1;</div><div class='add'>+    }</div><div class='add'>+    *resultp = static_cast&lt;char*&gt;(malloc(n + 1));</div><div class='add'>+    Q_CHECK_PTR(resultp);</div><div class='add'>+    qstrncpy(*resultp, res, n + 1);</div><div class='add'>+    return *resultp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+Q_CORE_EXPORT double qstrtod(const char *s00, const char **se, bool *ok)</div><div class='add'>+{</div><div class='add'>+    double ret = strtod((char*)s00, (char**)se);</div><div class='add'>+    if (ok) {</div><div class='add'>+      if((ret == 0.0l &amp;&amp; errno == ERANGE)</div><div class='add'>+         || ret == HUGE_VAL || ret == -HUGE_VAL)</div><div class='add'>+        *ok = false;</div><div class='add'>+      else</div><div class='add'>+        *ok = true; // the result will be that we don't report underflow in this case</div><div class='add'>+    }</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif // QT_QLOCALE_USES_FCVT</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/tools/qlocale_tools_p.h b/src/corelib/tools/qlocale_tools_p.h<br/>new file mode 100644<br/>index 0000000..996b612<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale_tools_p.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qlocale_tools_p.h</a></div><div class='hunk'>@@ -0,0 +1,122 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QLOCALE_TOOLS_P_H</div><div class='add'>+#define QLOCALE_TOOLS_P_H</div><div class='add'>+</div><div class='add'>+//</div><div class='add'>+//  W A R N I N G</div><div class='add'>+//  -------------</div><div class='add'>+//</div><div class='add'>+// This file is not part of the Qt API.  It exists for the convenience</div><div class='add'>+// of internal files.  This header file may change from version to version</div><div class='add'>+// without notice, or even be removed.</div><div class='add'>+//</div><div class='add'>+// We mean it.</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include "qlocale_p.h"</div><div class='add'>+#include "qstring.h"</div><div class='add'>+</div><div class='add'>+#if !defined(QT_QLOCALE_NEEDS_VOLATILE)</div><div class='add'>+#  if defined(Q_CC_GNU)</div><div class='add'>+#    if  __GNUC__ == 4</div><div class='add'>+#      define QT_QLOCALE_NEEDS_VOLATILE</div><div class='add'>+#    elif defined(Q_OS_WIN)</div><div class='add'>+#      define QT_QLOCALE_NEEDS_VOLATILE</div><div class='add'>+#    endif</div><div class='add'>+#  endif</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if defined(QT_QLOCALE_NEEDS_VOLATILE)</div><div class='add'>+#   define NEEDS_VOLATILE volatile</div><div class='add'>+#else</div><div class='add'>+#   define NEEDS_VOLATILE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+QString qulltoa(qulonglong l, int base, const QChar _zero);</div><div class='add'>+QString qlltoa(qlonglong l, int base, const QChar zero);</div><div class='add'>+</div><div class='add'>+enum PrecisionMode {</div><div class='add'>+    PMDecimalDigits =             0x01,</div><div class='add'>+    PMSignificantDigits =   0x02,</div><div class='add'>+    PMChopTrailingZeros =   0x03</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+QString &amp;decimalForm(QChar zero, QChar decimal, QChar group,</div><div class='add'>+                     QString &amp;digits, int decpt, uint precision,</div><div class='add'>+                     PrecisionMode pm,</div><div class='add'>+                     bool always_show_decpt,</div><div class='add'>+                     bool thousands_group);</div><div class='add'>+QString &amp;exponentForm(QChar zero, QChar decimal, QChar exponential,</div><div class='add'>+                      QChar group, QChar plus, QChar minus,</div><div class='add'>+                      QString &amp;digits, int decpt, uint precision,</div><div class='add'>+                      PrecisionMode pm,</div><div class='add'>+                      bool always_show_decpt);</div><div class='add'>+</div><div class='add'>+inline bool isZero(double d)</div><div class='add'>+{</div><div class='add'>+    uchar *ch = (uchar *)&amp;d;</div><div class='add'>+#ifdef QT_ARMFPA</div><div class='add'>+        return !(ch[3] &amp; 0x7F || ch[2] || ch[1] || ch[0] || ch[7] || ch[6] || ch[5] || ch[4]);</div><div class='add'>+#else</div><div class='add'>+    if (QSysInfo::ByteOrder == QSysInfo::BigEndian) {</div><div class='add'>+        return !(ch[0] &amp; 0x7F || ch[1] || ch[2] || ch[3] || ch[4] || ch[5] || ch[6] || ch[7]);</div><div class='add'>+    } else {</div><div class='add'>+        return !(ch[7] &amp; 0x7F || ch[6] || ch[5] || ch[4] || ch[3] || ch[2] || ch[1] || ch[0]);</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+// Removes thousand-group separators in "C" locale.</div><div class='add'>+bool removeGroupSeparators(QLocalePrivate::CharBuff *num);</div><div class='add'>+</div><div class='add'>+Q_CORE_EXPORT char *qdtoa(double d, int mode, int ndigits, int *decpt,</div><div class='add'>+                          int *sign, char **rve, char **digits_str);</div><div class='add'>+Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);</div><div class='add'>+qlonglong qstrtoll(const char *nptr, const char **endptr, register int base, bool *ok);</div><div class='add'>+qulonglong qstrtoull(const char *nptr, const char **endptr, register int base, bool *ok);</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/src/corelib/tools/qlocale_unix.cpp b/src/corelib/tools/qlocale_unix.cpp<br/>new file mode 100644<br/>index 0000000..27e1782<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale_unix.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qlocale_unix.cpp</a></div><div class='hunk'>@@ -0,0 +1,226 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qlocale_p.h"</div><div class='add'>+</div><div class='add'>+#include "qstringbuilder.h"</div><div class='add'>+#include "qdatetime.h"</div><div class='add'>+#include "qstringlist.h"</div><div class='add'>+#include "qvariant.h"</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+struct QSystemLocaleData</div><div class='add'>+{</div><div class='add'>+    QSystemLocaleData()</div><div class='add'>+        : lc_numeric(QLocale::C)</div><div class='add'>+         ,lc_time(QLocale::C)</div><div class='add'>+         ,lc_monetary(QLocale::C)</div><div class='add'>+         ,lc_messages(QLocale::C)</div><div class='add'>+    {</div><div class='add'>+        QByteArray all = qgetenv("LC_ALL");</div><div class='add'>+        QByteArray numeric  = all.isEmpty() ? qgetenv("LC_NUMERIC") : all;</div><div class='add'>+        QByteArray time     = all.isEmpty() ? qgetenv("LC_TIME") : all;</div><div class='add'>+        QByteArray monetary = all.isEmpty() ? qgetenv("LC_MONETARY") : all;</div><div class='add'>+        lc_messages_var     = all.isEmpty() ? qgetenv("LC_MESSAGES") : all;</div><div class='add'>+        lc_measurement_var  = all.isEmpty() ? qgetenv("LC_MEASUREMENT") : all;</div><div class='add'>+        QByteArray lang = qgetenv("LANG");</div><div class='add'>+        if (lang.isEmpty())</div><div class='add'>+            lang = QByteArray("C");</div><div class='add'>+        if (numeric.isEmpty())</div><div class='add'>+            numeric = lang;</div><div class='add'>+        if (monetary.isEmpty())</div><div class='add'>+            monetary = lang;</div><div class='add'>+        if (lc_messages_var.isEmpty())</div><div class='add'>+            lc_messages_var = lang;</div><div class='add'>+        if (lc_measurement_var.isEmpty())</div><div class='add'>+            lc_measurement_var = lang;</div><div class='add'>+        lc_numeric = QLocale(QString::fromLatin1(numeric));</div><div class='add'>+        lc_time = QLocale(QString::fromLatin1(time));</div><div class='add'>+        lc_monetary = QLocale(QString::fromLatin1(monetary));</div><div class='add'>+        lc_messages = QLocale(QString::fromLatin1(lc_messages_var));</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    QLocale lc_numeric;</div><div class='add'>+    QLocale lc_time;</div><div class='add'>+    QLocale lc_monetary;</div><div class='add'>+    QLocale lc_messages;</div><div class='add'>+    QByteArray lc_messages_var;</div><div class='add'>+    QByteArray lc_measurement_var;</div><div class='add'>+};</div><div class='add'>+Q_GLOBAL_STATIC(QSystemLocaleData, qSystemLocaleData)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+QLocale QSystemLocale::fallbackLocale() const</div><div class='add'>+{</div><div class='add'>+    QByteArray lang = qgetenv("LC_ALL");</div><div class='add'>+    if (lang.isEmpty())</div><div class='add'>+        lang = qgetenv("LC_NUMERIC");</div><div class='add'>+    if (lang.isEmpty())</div><div class='add'>+        lang = qgetenv("LANG");</div><div class='add'>+    return QLocale(QLatin1String(lang));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocale::query(QueryType type, QVariant in) const</div><div class='add'>+{</div><div class='add'>+    QSystemLocaleData *d = qSystemLocaleData();</div><div class='add'>+    const QLocale &amp;lc_numeric = d-&gt;lc_numeric;</div><div class='add'>+    const QLocale &amp;lc_time = d-&gt;lc_time;</div><div class='add'>+    const QLocale &amp;lc_monetary = d-&gt;lc_monetary;</div><div class='add'>+    const QLocale &amp;lc_messages = d-&gt;lc_messages;</div><div class='add'>+</div><div class='add'>+    switch (type) {</div><div class='add'>+    case DecimalPoint:</div><div class='add'>+        return lc_numeric.decimalPoint();</div><div class='add'>+    case GroupSeparator:</div><div class='add'>+        return lc_numeric.groupSeparator();</div><div class='add'>+    case ZeroDigit:</div><div class='add'>+        return lc_numeric.zeroDigit();</div><div class='add'>+    case NegativeSign:</div><div class='add'>+        return lc_numeric.negativeSign();</div><div class='add'>+    case DateFormatLong:</div><div class='add'>+        return lc_time.dateFormat(QLocale::LongFormat);</div><div class='add'>+    case DateFormatShort:</div><div class='add'>+        return lc_time.dateFormat(QLocale::ShortFormat);</div><div class='add'>+    case TimeFormatLong:</div><div class='add'>+        return lc_time.timeFormat(QLocale::LongFormat);</div><div class='add'>+    case TimeFormatShort:</div><div class='add'>+        return lc_time.timeFormat(QLocale::ShortFormat);</div><div class='add'>+    case DayNameLong:</div><div class='add'>+        return lc_time.dayName(in.toInt(), QLocale::LongFormat);</div><div class='add'>+    case DayNameShort:</div><div class='add'>+        return lc_time.dayName(in.toInt(), QLocale::ShortFormat);</div><div class='add'>+    case MonthNameLong:</div><div class='add'>+        return lc_time.monthName(in.toInt(), QLocale::LongFormat);</div><div class='add'>+    case MonthNameShort:</div><div class='add'>+        return lc_time.monthName(in.toInt(), QLocale::ShortFormat);</div><div class='add'>+    case DateToStringLong:</div><div class='add'>+        return lc_time.toString(in.toDate(), QLocale::LongFormat);</div><div class='add'>+    case DateToStringShort:</div><div class='add'>+        return lc_time.toString(in.toDate(), QLocale::ShortFormat);</div><div class='add'>+    case TimeToStringLong:</div><div class='add'>+        return lc_time.toString(in.toTime(), QLocale::LongFormat);</div><div class='add'>+    case TimeToStringShort:</div><div class='add'>+        return lc_time.toString(in.toTime(), QLocale::ShortFormat);</div><div class='add'>+    case DateTimeFormatLong:</div><div class='add'>+        return lc_time.dateTimeFormat(QLocale::LongFormat);</div><div class='add'>+    case DateTimeFormatShort:</div><div class='add'>+        return lc_time.dateTimeFormat(QLocale::ShortFormat);</div><div class='add'>+    case DateTimeToStringLong:</div><div class='add'>+        return lc_time.toString(in.toDateTime(), QLocale::LongFormat);</div><div class='add'>+    case DateTimeToStringShort:</div><div class='add'>+        return lc_time.toString(in.toDateTime(), QLocale::ShortFormat);</div><div class='add'>+    case PositiveSign:</div><div class='add'>+        return lc_numeric.positiveSign();</div><div class='add'>+    case AMText:</div><div class='add'>+        return lc_time.amText();</div><div class='add'>+    case PMText:</div><div class='add'>+        return lc_time.pmText();</div><div class='add'>+    case FirstDayOfWeek:</div><div class='add'>+        return lc_time.firstDayOfWeek();</div><div class='add'>+    case CurrencySymbol:</div><div class='add'>+        return lc_monetary.currencySymbol(QLocale::CurrencySymbolFormat(in.toUInt()));</div><div class='add'>+    case CurrencyToString: {</div><div class='add'>+        switch (in.type()) {</div><div class='add'>+        case QVariant::Int:</div><div class='add'>+            return lc_monetary.toCurrencyString(in.toInt());</div><div class='add'>+        case QVariant::UInt:</div><div class='add'>+            return lc_monetary.toCurrencyString(in.toUInt());</div><div class='add'>+        case QVariant::Double:</div><div class='add'>+            return lc_monetary.toCurrencyString(in.toDouble());</div><div class='add'>+        case QVariant::LongLong:</div><div class='add'>+            return lc_monetary.toCurrencyString(in.toLongLong());</div><div class='add'>+        case QVariant::ULongLong:</div><div class='add'>+            return lc_monetary.toCurrencyString(in.toULongLong());</div><div class='add'>+        default:</div><div class='add'>+            break;</div><div class='add'>+        }</div><div class='add'>+        return QString();</div><div class='add'>+    }</div><div class='add'>+    case MeasurementSystem: {</div><div class='add'>+        const QString meas_locale = QString::fromLatin1(d-&gt;lc_measurement_var.constData(), d-&gt;lc_measurement_var.size());</div><div class='add'>+        if (meas_locale.compare(QLatin1String("Metric"), Qt::CaseInsensitive) == 0)</div><div class='add'>+            return QLocale::MetricSystem;</div><div class='add'>+        if (meas_locale.compare(QLatin1String("Other"), Qt::CaseInsensitive) == 0)</div><div class='add'>+            return QLocale::MetricSystem;</div><div class='add'>+        return QVariant((int)QLocale(meas_locale).measurementSystem());</div><div class='add'>+    }</div><div class='add'>+    case UILanguages: {</div><div class='add'>+        static QString languages = QString::fromLatin1(qgetenv("LANGUAGE"));</div><div class='add'>+        if (!languages.isEmpty()) {</div><div class='add'>+            QStringList lst = languages.split(QLatin1Char(':'));</div><div class='add'>+            for (int i = 0; i &lt; lst.size();) {</div><div class='add'>+                const QString &amp;name = lst.at(i);</div><div class='add'>+                QString lang, script, cntry;</div><div class='add'>+                if (name.isEmpty() || !qt_splitLocaleName(name, lang, script, cntry))</div><div class='add'>+                    lst.removeAt(i);</div><div class='add'>+                else</div><div class='add'>+                    ++i;</div><div class='add'>+            }</div><div class='add'>+            return lst;</div><div class='add'>+        }</div><div class='add'>+        if (!d-&gt;lc_messages_var.isEmpty()) {</div><div class='add'>+            QString lang, script, cntry;</div><div class='add'>+            if (qt_splitLocaleName(QString::fromLatin1(d-&gt;lc_messages_var.constData(), d-&gt;lc_messages_var.size()),</div><div class='add'>+                                lang, script, cntry)) {</div><div class='add'>+                if (!cntry.length() &amp;&amp; lang.length())</div><div class='add'>+                    return QStringList(lang);</div><div class='add'>+                return QStringList(lang % QLatin1Char('-') % cntry);</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        return QVariant();</div><div class='add'>+    }</div><div class='add'>+    case StringToStandardQuotation:</div><div class='add'>+        return lc_messages.quoteString(in.value&lt;QStringRef&gt;());</div><div class='add'>+    case StringToAlternateQuotation:</div><div class='add'>+        return lc_messages.quoteString(in.value&lt;QStringRef&gt;(), QLocale::AlternateQuotation);</div><div class='add'>+    case ListToSeparatedString:</div><div class='add'>+        return lc_messages.createSeparatedList(in.value&lt;QStringList&gt;());</div><div class='add'>+    default:</div><div class='add'>+        break;</div><div class='add'>+    }</div><div class='add'>+    return QVariant();</div><div class='add'>+}</div><div class='add'>+#endif // QT_NO_SYSTEMLOCALE</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/tools/qlocale_win.cpp b/src/corelib/tools/qlocale_win.cpp<br/>new file mode 100644<br/>index 0000000..8b4b1b5<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qlocale_win.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qlocale_win.cpp</a></div><div class='hunk'>@@ -0,0 +1,988 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qlocale_p.h"</div><div class='add'>+#include "qlocale_tools_p.h"</div><div class='add'>+</div><div class='add'>+#include "qstringlist.h"</div><div class='add'>+#include "qvariant.h"</div><div class='add'>+#include "qdatetime.h"</div><div class='add'>+</div><div class='add'>+#include "private/qsystemlibrary_p.h"</div><div class='add'>+</div><div class='add'>+#include "qdebug.h"</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_WIN)</div><div class='add'>+#   include "qt_windows.h"</div><div class='add'>+#   include &lt;time.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+static QByteArray getWinLocaleName(LCID id = LOCALE_USER_DEFAULT);</div><div class='add'>+static const char *winLangCodeToIsoName(int code);</div><div class='add'>+static QString winIso639LangName(LCID id = LOCALE_USER_DEFAULT);</div><div class='add'>+static QString winIso3116CtryName(LCID id = LOCALE_USER_DEFAULT);</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_SYSTEMLOCALE</div><div class='add'>+</div><div class='add'>+#ifndef MUI_LANGUAGE_NAME</div><div class='add'>+#define MUI_LANGUAGE_NAME 0x8</div><div class='add'>+#endif</div><div class='add'>+#ifndef LOCALE_SSHORTESTDAYNAME1</div><div class='add'>+#  define LOCALE_SSHORTESTDAYNAME1 0x0060</div><div class='add'>+#  define LOCALE_SSHORTESTDAYNAME2 0x0061</div><div class='add'>+#  define LOCALE_SSHORTESTDAYNAME3 0x0062</div><div class='add'>+#  define LOCALE_SSHORTESTDAYNAME4 0x0063</div><div class='add'>+#  define LOCALE_SSHORTESTDAYNAME5 0x0064</div><div class='add'>+#  define LOCALE_SSHORTESTDAYNAME6 0x0065</div><div class='add'>+#  define LOCALE_SSHORTESTDAYNAME7 0x0066</div><div class='add'>+#endif</div><div class='add'>+#ifndef LOCALE_SNATIVELANGUAGENAME</div><div class='add'>+#  define LOCALE_SNATIVELANGUAGENAME 0x00000004</div><div class='add'>+#endif</div><div class='add'>+#ifndef LOCALE_SNATIVECOUNTRYNAME</div><div class='add'>+#  define LOCALE_SNATIVECOUNTRYNAME 0x00000008</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+struct QSystemLocalePrivate</div><div class='add'>+{</div><div class='add'>+    QSystemLocalePrivate();</div><div class='add'>+</div><div class='add'>+    QChar zeroDigit();</div><div class='add'>+    QChar decimalPoint();</div><div class='add'>+    QChar groupSeparator();</div><div class='add'>+    QChar negativeSign();</div><div class='add'>+    QChar positiveSign();</div><div class='add'>+    QVariant dateFormat(QLocale::FormatType);</div><div class='add'>+    QVariant timeFormat(QLocale::FormatType);</div><div class='add'>+    QVariant dateTimeFormat(QLocale::FormatType);</div><div class='add'>+    QVariant dayName(int, QLocale::FormatType);</div><div class='add'>+    QVariant monthName(int, QLocale::FormatType);</div><div class='add'>+    QVariant toString(const QDate &amp;, QLocale::FormatType);</div><div class='add'>+    QVariant toString(const QTime &amp;, QLocale::FormatType);</div><div class='add'>+    QVariant toString(const QDateTime &amp;, QLocale::FormatType);</div><div class='add'>+    QVariant measurementSystem();</div><div class='add'>+    QVariant amText();</div><div class='add'>+    QVariant pmText();</div><div class='add'>+    QVariant firstDayOfWeek();</div><div class='add'>+    QVariant currencySymbol(QLocale::CurrencySymbolFormat);</div><div class='add'>+    QVariant toCurrencyString(const QSystemLocale::CurrencyToStringArgument &amp;);</div><div class='add'>+    QVariant uiLanguages();</div><div class='add'>+    QVariant nativeLanguageName();</div><div class='add'>+    QVariant nativeCountryName();</div><div class='add'>+</div><div class='add'>+    void update();</div><div class='add'>+</div><div class='add'>+private:</div><div class='add'>+    QByteArray langEnvVar;</div><div class='add'>+</div><div class='add'>+    enum SubstitutionType {</div><div class='add'>+        SUnknown,</div><div class='add'>+        SContext,</div><div class='add'>+        SAlways,</div><div class='add'>+        SNever</div><div class='add'>+    };</div><div class='add'>+</div><div class='add'>+    // cached values:</div><div class='add'>+    LCID lcid;</div><div class='add'>+    SubstitutionType substitutionType;</div><div class='add'>+    QChar zero;</div><div class='add'>+</div><div class='add'>+    QString getLocaleInfo(LCTYPE type, int maxlen = 0);</div><div class='add'>+    int getLocaleInfo_int(LCTYPE type, int maxlen = 0);</div><div class='add'>+    QChar getLocaleInfo_qchar(LCTYPE type);</div><div class='add'>+</div><div class='add'>+    SubstitutionType substitution();</div><div class='add'>+    QString &amp;substituteDigits(QString &amp;string);</div><div class='add'>+</div><div class='add'>+    static QString winToQtFormat(const QString &amp;sys_fmt);</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+Q_GLOBAL_STATIC(QSystemLocalePrivate, systemLocalePrivate)</div><div class='add'>+</div><div class='add'>+QSystemLocalePrivate::QSystemLocalePrivate()</div><div class='add'>+    : substitutionType(SUnknown)</div><div class='add'>+{</div><div class='add'>+    langEnvVar = qgetenv("LANG");</div><div class='add'>+    lcid = GetUserDefaultLCID();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QSystemLocalePrivate::getLocaleInfo(LCTYPE type, int maxlen)</div><div class='add'>+{</div><div class='add'>+    QVarLengthArray&lt;wchar_t, 64&gt; buf(maxlen ? maxlen : 64);</div><div class='add'>+    if (!GetLocaleInfo(lcid, type, buf.data(), buf.size()))</div><div class='add'>+        return QString();</div><div class='add'>+    if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {</div><div class='add'>+        int cnt = GetLocaleInfo(lcid, type, 0, 0);</div><div class='add'>+        if (cnt == 0)</div><div class='add'>+            return QString();</div><div class='add'>+        buf.resize(cnt);</div><div class='add'>+        if (!GetLocaleInfo(lcid, type, buf.data(), buf.size()))</div><div class='add'>+            return QString();</div><div class='add'>+    }</div><div class='add'>+    return QString::fromWCharArray(buf.data());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int QSystemLocalePrivate::getLocaleInfo_int(LCTYPE type, int maxlen)</div><div class='add'>+{</div><div class='add'>+    QString str = getLocaleInfo(type, maxlen);</div><div class='add'>+    bool ok = false;</div><div class='add'>+    int v = str.toInt(&amp;ok);</div><div class='add'>+    return ok ? v : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QChar QSystemLocalePrivate::getLocaleInfo_qchar(LCTYPE type)</div><div class='add'>+{</div><div class='add'>+    QString str = getLocaleInfo(type);</div><div class='add'>+    return str.isEmpty() ? QChar() : str.at(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QSystemLocalePrivate::SubstitutionType QSystemLocalePrivate::substitution()</div><div class='add'>+{</div><div class='add'>+    if (substitutionType == SUnknown) {</div><div class='add'>+        wchar_t buf[8];</div><div class='add'>+        if (!GetLocaleInfo(lcid, LOCALE_IDIGITSUBSTITUTION, buf, 8)) {</div><div class='add'>+            substitutionType = QSystemLocalePrivate::SNever;</div><div class='add'>+            return substitutionType;</div><div class='add'>+        }</div><div class='add'>+        if (buf[0] == '1')</div><div class='add'>+            substitutionType = QSystemLocalePrivate::SNever;</div><div class='add'>+        else if (buf[0] == '0')</div><div class='add'>+            substitutionType = QSystemLocalePrivate::SContext;</div><div class='add'>+        else if (buf[0] == '2')</div><div class='add'>+            substitutionType = QSystemLocalePrivate::SAlways;</div><div class='add'>+        else {</div><div class='add'>+            wchar_t digits[11];</div><div class='add'>+            if (!GetLocaleInfo(lcid, LOCALE_SNATIVEDIGITS, digits, 11)) {</div><div class='add'>+                substitutionType = QSystemLocalePrivate::SNever;</div><div class='add'>+                return substitutionType;</div><div class='add'>+            }</div><div class='add'>+            const wchar_t zero = digits[0];</div><div class='add'>+            if (buf[0] == zero + 2)</div><div class='add'>+                substitutionType = QSystemLocalePrivate::SAlways;</div><div class='add'>+            else</div><div class='add'>+                substitutionType = QSystemLocalePrivate::SNever;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    return substitutionType;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString &amp;QSystemLocalePrivate::substituteDigits(QString &amp;string)</div><div class='add'>+{</div><div class='add'>+    ushort zero = zeroDigit().unicode();</div><div class='add'>+    ushort *qch = (ushort *)string.data();</div><div class='add'>+    for (ushort *end = qch + string.size(); qch != end; ++qch) {</div><div class='add'>+        if (*qch &gt;= '0' &amp;&amp; *qch &lt;= '9')</div><div class='add'>+            *qch = zero + (*qch - '0');</div><div class='add'>+    }</div><div class='add'>+    return string;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QChar QSystemLocalePrivate::zeroDigit()</div><div class='add'>+{</div><div class='add'>+    if (zero.isNull())</div><div class='add'>+        zero = getLocaleInfo_qchar(LOCALE_SNATIVEDIGITS);</div><div class='add'>+    return zero;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QChar QSystemLocalePrivate::decimalPoint()</div><div class='add'>+{</div><div class='add'>+    return getLocaleInfo_qchar(LOCALE_SDECIMAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QChar QSystemLocalePrivate::groupSeparator()</div><div class='add'>+{</div><div class='add'>+    return getLocaleInfo_qchar(LOCALE_STHOUSAND);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QChar QSystemLocalePrivate::negativeSign()</div><div class='add'>+{</div><div class='add'>+    return getLocaleInfo_qchar(LOCALE_SNEGATIVESIGN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QChar QSystemLocalePrivate::positiveSign()</div><div class='add'>+{</div><div class='add'>+    return getLocaleInfo_qchar(LOCALE_SPOSITIVESIGN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::dateFormat(QLocale::FormatType type)</div><div class='add'>+{</div><div class='add'>+    switch (type) {</div><div class='add'>+    case QLocale::ShortFormat:</div><div class='add'>+        return winToQtFormat(getLocaleInfo(LOCALE_SSHORTDATE));</div><div class='add'>+    case QLocale::LongFormat:</div><div class='add'>+        return winToQtFormat(getLocaleInfo(LOCALE_SLONGDATE));</div><div class='add'>+    case QLocale::NarrowFormat:</div><div class='add'>+        break;</div><div class='add'>+    }</div><div class='add'>+    return QVariant();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::timeFormat(QLocale::FormatType type)</div><div class='add'>+{</div><div class='add'>+    switch (type) {</div><div class='add'>+    case QLocale::ShortFormat:</div><div class='add'>+        return winToQtFormat(getLocaleInfo(LOCALE_STIMEFORMAT)); //###</div><div class='add'>+    case QLocale::LongFormat:</div><div class='add'>+        return winToQtFormat(getLocaleInfo(LOCALE_STIMEFORMAT));</div><div class='add'>+    case QLocale::NarrowFormat:</div><div class='add'>+        break;</div><div class='add'>+    }</div><div class='add'>+    return QVariant();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::dateTimeFormat(QLocale::FormatType type)</div><div class='add'>+{</div><div class='add'>+    return QString(dateFormat(type).toString() + QLatin1Char(' ') + timeFormat(type).toString());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::dayName(int day, QLocale::FormatType type)</div><div class='add'>+{</div><div class='add'>+    static const LCTYPE short_day_map[]</div><div class='add'>+        = { LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2,</div><div class='add'>+            LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, LOCALE_SABBREVDAYNAME5,</div><div class='add'>+            LOCALE_SABBREVDAYNAME6, LOCALE_SABBREVDAYNAME7 };</div><div class='add'>+</div><div class='add'>+    static const LCTYPE long_day_map[]</div><div class='add'>+        = { LOCALE_SDAYNAME1, LOCALE_SDAYNAME2,</div><div class='add'>+            LOCALE_SDAYNAME3, LOCALE_SDAYNAME4, LOCALE_SDAYNAME5,</div><div class='add'>+            LOCALE_SDAYNAME6, LOCALE_SDAYNAME7 };</div><div class='add'>+</div><div class='add'>+    static const LCTYPE narrow_day_map[]</div><div class='add'>+        = { LOCALE_SSHORTESTDAYNAME1, LOCALE_SSHORTESTDAYNAME2,</div><div class='add'>+            LOCALE_SSHORTESTDAYNAME3, LOCALE_SSHORTESTDAYNAME4,</div><div class='add'>+            LOCALE_SSHORTESTDAYNAME5, LOCALE_SSHORTESTDAYNAME6,</div><div class='add'>+            LOCALE_SSHORTESTDAYNAME7 };</div><div class='add'>+</div><div class='add'>+    day -= 1;</div><div class='add'>+</div><div class='add'>+    if (type == QLocale::LongFormat)</div><div class='add'>+        return getLocaleInfo(long_day_map[day]);</div><div class='add'>+    else if (type == QLocale::NarrowFormat &amp;&amp; QSysInfo::windowsVersion() &gt;= QSysInfo::WV_VISTA)</div><div class='add'>+        return getLocaleInfo(narrow_day_map[day]);</div><div class='add'>+    return getLocaleInfo(short_day_map[day]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::monthName(int month, QLocale::FormatType type)</div><div class='add'>+{</div><div class='add'>+    static const LCTYPE short_month_map[]</div><div class='add'>+        = { LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, LOCALE_SABBREVMONTHNAME3,</div><div class='add'>+            LOCALE_SABBREVMONTHNAME4, LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6,</div><div class='add'>+            LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, LOCALE_SABBREVMONTHNAME9,</div><div class='add'>+            LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 };</div><div class='add'>+</div><div class='add'>+    static const LCTYPE long_month_map[]</div><div class='add'>+        = { LOCALE_SMONTHNAME1, LOCALE_SMONTHNAME2, LOCALE_SMONTHNAME3,</div><div class='add'>+            LOCALE_SMONTHNAME4, LOCALE_SMONTHNAME5, LOCALE_SMONTHNAME6,</div><div class='add'>+            LOCALE_SMONTHNAME7, LOCALE_SMONTHNAME8, LOCALE_SMONTHNAME9,</div><div class='add'>+            LOCALE_SMONTHNAME10, LOCALE_SMONTHNAME11, LOCALE_SMONTHNAME12 };</div><div class='add'>+</div><div class='add'>+    month -= 1;</div><div class='add'>+    if (month &lt; 0 || month &gt; 11)</div><div class='add'>+    return QString();</div><div class='add'>+</div><div class='add'>+    LCTYPE lctype = (type == QLocale::ShortFormat || type == QLocale::NarrowFormat)</div><div class='add'>+            ? short_month_map[month] : long_month_map[month];</div><div class='add'>+    return getLocaleInfo(lctype);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::toString(const QDate &amp;date, QLocale::FormatType type)</div><div class='add'>+{</div><div class='add'>+    SYSTEMTIME st;</div><div class='add'>+    memset(&amp;st, 0, sizeof(SYSTEMTIME));</div><div class='add'>+    st.wYear = date.year();</div><div class='add'>+    st.wMonth = date.month();</div><div class='add'>+    st.wDay = date.day();</div><div class='add'>+</div><div class='add'>+    DWORD flags = (type == QLocale::LongFormat ? DATE_LONGDATE : DATE_SHORTDATE);</div><div class='add'>+    wchar_t buf[255];</div><div class='add'>+    if (GetDateFormat(lcid, flags, &amp;st, NULL, buf, 255)) {</div><div class='add'>+        QString format = QString::fromWCharArray(buf);</div><div class='add'>+        if (substitution() == SAlways)</div><div class='add'>+            substituteDigits(format);</div><div class='add'>+        return format;</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::toString(const QTime &amp;time, QLocale::FormatType)</div><div class='add'>+{</div><div class='add'>+    SYSTEMTIME st;</div><div class='add'>+    memset(&amp;st, 0, sizeof(SYSTEMTIME));</div><div class='add'>+    st.wHour = time.hour();</div><div class='add'>+    st.wMinute = time.minute();</div><div class='add'>+    st.wSecond = time.second();</div><div class='add'>+    st.wMilliseconds = 0;</div><div class='add'>+</div><div class='add'>+    DWORD flags = 0;</div><div class='add'>+</div><div class='add'>+    wchar_t buf[255];</div><div class='add'>+    if (GetTimeFormat(lcid, flags, &amp;st, NULL, buf, 255)) {</div><div class='add'>+        QString format = QString::fromWCharArray(buf);</div><div class='add'>+        if (substitution() == SAlways)</div><div class='add'>+            substituteDigits(format);</div><div class='add'>+        return format;</div><div class='add'>+    }</div><div class='add'>+    return QString();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::toString(const QDateTime &amp;dt, QLocale::FormatType type)</div><div class='add'>+{</div><div class='add'>+    return QString(toString(dt.date(), type).toString() + QLatin1Char(' ') + toString(dt.time(), type).toString());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::measurementSystem()</div><div class='add'>+{</div><div class='add'>+    wchar_t output[2];</div><div class='add'>+</div><div class='add'>+    if (GetLocaleInfo(lcid, LOCALE_IMEASURE, output, 2)) {</div><div class='add'>+        QString iMeasure = QString::fromWCharArray(output);</div><div class='add'>+        if (iMeasure == QLatin1String("1")) {</div><div class='add'>+            return QLocale::ImperialSystem;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return QLocale::MetricSystem;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::amText()</div><div class='add'>+{</div><div class='add'>+    wchar_t output[15]; // maximum length including  terminating zero character for Win2003+</div><div class='add'>+</div><div class='add'>+    if (GetLocaleInfo(lcid, LOCALE_S1159, output, 15)) {</div><div class='add'>+        return QString::fromWCharArray(output);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return QVariant();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::pmText()</div><div class='add'>+{</div><div class='add'>+    wchar_t output[15]; // maximum length including  terminating zero character for Win2003+</div><div class='add'>+</div><div class='add'>+    if (GetLocaleInfo(lcid, LOCALE_S2359, output, 15)) {</div><div class='add'>+        return QString::fromWCharArray(output);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return QVariant();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::firstDayOfWeek()</div><div class='add'>+{</div><div class='add'>+    wchar_t output[4]; // maximum length including  terminating zero character for Win2003+</div><div class='add'>+</div><div class='add'>+    if (GetLocaleInfo(lcid, LOCALE_IFIRSTDAYOFWEEK, output, 4))</div><div class='add'>+        return QString::fromWCharArray(output).toUInt()+1;</div><div class='add'>+</div><div class='add'>+    return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::currencySymbol(QLocale::CurrencySymbolFormat format)</div><div class='add'>+{</div><div class='add'>+    wchar_t buf[13];</div><div class='add'>+    switch (format) {</div><div class='add'>+    case QLocale::CurrencySymbol:</div><div class='add'>+        if (GetLocaleInfo(lcid, LOCALE_SCURRENCY, buf, 13))</div><div class='add'>+            return QString::fromWCharArray(buf);</div><div class='add'>+        break;</div><div class='add'>+    case QLocale::CurrencyIsoCode:</div><div class='add'>+        if (GetLocaleInfo(lcid, LOCALE_SINTLSYMBOL, buf, 9))</div><div class='add'>+            return QString::fromWCharArray(buf);</div><div class='add'>+        break;</div><div class='add'>+    case QLocale::CurrencyDisplayName: {</div><div class='add'>+        QVarLengthArray&lt;wchar_t, 64&gt; buf(64);</div><div class='add'>+        if (!GetLocaleInfo(lcid, LOCALE_SNATIVECURRNAME, buf.data(), buf.size())) {</div><div class='add'>+            if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)</div><div class='add'>+                break;</div><div class='add'>+            buf.resize(255); // should be large enough, right?</div><div class='add'>+            if (!GetLocaleInfo(lcid, LOCALE_SNATIVECURRNAME, buf.data(), buf.size()))</div><div class='add'>+                break;</div><div class='add'>+        }</div><div class='add'>+        return QString::fromWCharArray(buf.data());</div><div class='add'>+    }</div><div class='add'>+    default:</div><div class='add'>+        break;</div><div class='add'>+    }</div><div class='add'>+    return QVariant();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::toCurrencyString(const QSystemLocale::CurrencyToStringArgument &amp;arg)</div><div class='add'>+{</div><div class='add'>+    QString value;</div><div class='add'>+    switch (arg.value.type()) {</div><div class='add'>+    case QVariant::Int:</div><div class='add'>+        value = QLocalePrivate::longLongToString(QLatin1Char('0'), QLatin1Char(','), QLatin1Char('+'), QLatin1Char('-'),</div><div class='add'>+                                                 arg.value.toInt(), -1, 10, -1, QLocale::OmitGroupSeparator);</div><div class='add'>+        break;</div><div class='add'>+    case QVariant::UInt:</div><div class='add'>+        value = QLocalePrivate::unsLongLongToString(QLatin1Char('0'), QLatin1Char(','), QLatin1Char('+'),</div><div class='add'>+                                                    arg.value.toUInt(), -1, 10, -1, QLocale::OmitGroupSeparator);</div><div class='add'>+        break;</div><div class='add'>+    case QVariant::Double:</div><div class='add'>+        value = QLocalePrivate::doubleToString(QLatin1Char('0'), QLatin1Char('+'), QLatin1Char('-'),</div><div class='add'>+                                               QLatin1Char(' '), QLatin1Char(','), QLatin1Char('.'),</div><div class='add'>+                                               arg.value.toDouble(), -1, QLocalePrivate::DFDecimal, -1, QLocale::OmitGroupSeparator);</div><div class='add'>+        break;</div><div class='add'>+    case QVariant::LongLong:</div><div class='add'>+        value = QLocalePrivate::longLongToString(QLatin1Char('0'), QLatin1Char(','), QLatin1Char('+'), QLatin1Char('-'),</div><div class='add'>+                                                 arg.value.toLongLong(), -1, 10, -1, QLocale::OmitGroupSeparator);</div><div class='add'>+        break;</div><div class='add'>+    case QVariant::ULongLong:</div><div class='add'>+        value = QLocalePrivate::unsLongLongToString(QLatin1Char('0'), QLatin1Char(','), QLatin1Char('+'),</div><div class='add'>+                                                    arg.value.toULongLong(), -1, 10, -1, QLocale::OmitGroupSeparator);</div><div class='add'>+        break;</div><div class='add'>+    default:</div><div class='add'>+        return QVariant();</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    QVarLengthArray&lt;wchar_t, 64&gt; out(64);</div><div class='add'>+</div><div class='add'>+    QString decimalSep;</div><div class='add'>+    QString thousandSep;</div><div class='add'>+    CURRENCYFMT format;</div><div class='add'>+    CURRENCYFMT *pformat = NULL;</div><div class='add'>+    if (!arg.symbol.isEmpty()) {</div><div class='add'>+        format.NumDigits = getLocaleInfo_int(lcid, LOCALE_ICURRDIGITS);</div><div class='add'>+        format.LeadingZero = getLocaleInfo_int(lcid, LOCALE_ILZERO);</div><div class='add'>+        decimalSep = getLocaleInfo(lcid, LOCALE_SMONDECIMALSEP);</div><div class='add'>+        format.lpDecimalSep = (wchar_t *)decimalSep.utf16();</div><div class='add'>+        thousandSep = getLocaleInfo(lcid, LOCALE_SMONTHOUSANDSEP);</div><div class='add'>+        format.lpThousandSep = (wchar_t *)thousandSep.utf16();</div><div class='add'>+        format.NegativeOrder = getLocaleInfo_int(lcid, LOCALE_INEGCURR);</div><div class='add'>+        format.PositiveOrder = getLocaleInfo_int(lcid, LOCALE_ICURRENCY);</div><div class='add'>+        format.lpCurrencySymbol = (wchar_t *)arg.symbol.utf16();</div><div class='add'>+</div><div class='add'>+        // grouping is complicated and ugly:</div><div class='add'>+        // int(0)  == "123456789.00"    == string("0")</div><div class='add'>+        // int(3)  == "123,456,789.00"  == string("3;0")</div><div class='add'>+        // int(30) == "123456,789.00"   == string("3;0;0")</div><div class='add'>+        // int(32) == "12,34,56,789.00" == string("3;2;0")</div><div class='add'>+        // int(320)== "1234,56,789.00"  == string("3;2")</div><div class='add'>+        QString groupingStr = getLocaleInfo(lcid, LOCALE_SMONGROUPING);</div><div class='add'>+        format.Grouping = groupingStr.remove(QLatin1Char(';')).toInt();</div><div class='add'>+        if (format.Grouping % 10 == 0) // magic</div><div class='add'>+            format.Grouping /= 10;</div><div class='add'>+        else</div><div class='add'>+            format.Grouping *= 10;</div><div class='add'>+        pformat = &amp;format;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    int ret = ::GetCurrencyFormat(lcid, 0, reinterpret_cast&lt;const wchar_t *&gt;(value.utf16()),</div><div class='add'>+                                  pformat, out.data(), out.size());</div><div class='add'>+    if (ret == 0 &amp;&amp; GetLastError() == ERROR_INSUFFICIENT_BUFFER) {</div><div class='add'>+        ret = ::GetCurrencyFormat(lcid, 0, reinterpret_cast&lt;const wchar_t *&gt;(value.utf16()),</div><div class='add'>+                                  pformat, out.data(), 0);</div><div class='add'>+        out.resize(ret);</div><div class='add'>+        ::GetCurrencyFormat(lcid, 0, reinterpret_cast&lt;const wchar_t *&gt;(value.utf16()),</div><div class='add'>+                            pformat, out.data(), out.size());</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    value = QString::fromWCharArray(out.data());</div><div class='add'>+    if (substitution() == SAlways)</div><div class='add'>+        substituteDigits( value);</div><div class='add'>+    return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::uiLanguages()</div><div class='add'>+{</div><div class='add'>+    if (QSysInfo::windowsVersion() &gt;= QSysInfo::WV_VISTA) {</div><div class='add'>+        typedef BOOL (*GetUserPreferredUILanguagesFunc) (</div><div class='add'>+                    DWORD dwFlags,</div><div class='add'>+                    PULONG pulNumLanguages,</div><div class='add'>+                    PWSTR pwszLanguagesBuffer,</div><div class='add'>+                    PULONG pcchLanguagesBuffer);</div><div class='add'>+        static GetUserPreferredUILanguagesFunc GetUserPreferredUILanguages_ptr = 0;</div><div class='add'>+        if (!GetUserPreferredUILanguages_ptr) {</div><div class='add'>+            QSystemLibrary lib(QLatin1String("kernel32"));</div><div class='add'>+            if (lib.load())</div><div class='add'>+                GetUserPreferredUILanguages_ptr = (GetUserPreferredUILanguagesFunc)lib.resolve("GetUserPreferredUILanguages");</div><div class='add'>+        }</div><div class='add'>+        if (GetUserPreferredUILanguages_ptr) {</div><div class='add'>+            unsigned long cnt = 0;</div><div class='add'>+            QVarLengthArray&lt;wchar_t, 64&gt; buf(64);</div><div class='add'>+            unsigned long size = buf.size();</div><div class='add'>+            if (!GetUserPreferredUILanguages_ptr(MUI_LANGUAGE_NAME, &amp;cnt, buf.data(), &amp;size)) {</div><div class='add'>+                size = 0;</div><div class='add'>+                if (GetLastError() == ERROR_INSUFFICIENT_BUFFER &amp;&amp;</div><div class='add'>+                    GetUserPreferredUILanguages_ptr(MUI_LANGUAGE_NAME, &amp;cnt, NULL, &amp;size)) {</div><div class='add'>+                    buf.resize(size);</div><div class='add'>+                    if (!GetUserPreferredUILanguages_ptr(MUI_LANGUAGE_NAME, &amp;cnt, buf.data(), &amp;size))</div><div class='add'>+                        return QStringList();</div><div class='add'>+                }</div><div class='add'>+            }</div><div class='add'>+            QStringList result;</div><div class='add'>+            result.reserve(cnt);</div><div class='add'>+            const wchar_t *str = buf.constData();</div><div class='add'>+            for (; cnt &gt; 0; --cnt) {</div><div class='add'>+                QString s = QString::fromWCharArray(str);</div><div class='add'>+                if (s.isEmpty())</div><div class='add'>+                    break; // something is wrong</div><div class='add'>+                result.append(s);</div><div class='add'>+                str += s.size()+1;</div><div class='add'>+            }</div><div class='add'>+            return result;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    // old Windows before Vista</div><div class='add'>+    return QStringList(QString::fromLatin1(winLangCodeToIsoName(GetUserDefaultUILanguage())));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::nativeLanguageName()</div><div class='add'>+{</div><div class='add'>+    if (QSysInfo::windowsVersion() &lt; QSysInfo::WV_WINDOWS7)</div><div class='add'>+        return getLocaleInfo(LOCALE_SNATIVELANGNAME);</div><div class='add'>+    return getLocaleInfo(LOCALE_SNATIVELANGUAGENAME);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocalePrivate::nativeCountryName()</div><div class='add'>+{</div><div class='add'>+    if (QSysInfo::windowsVersion() &lt; QSysInfo::WV_WINDOWS7)</div><div class='add'>+        return getLocaleInfo(LOCALE_SNATIVECTRYNAME);</div><div class='add'>+    return getLocaleInfo(LOCALE_SNATIVECOUNTRYNAME);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void QSystemLocalePrivate::update()</div><div class='add'>+{</div><div class='add'>+    lcid = GetUserDefaultLCID();</div><div class='add'>+    substitutionType = SUnknown;</div><div class='add'>+    zero = QChar();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QString QSystemLocalePrivate::winToQtFormat(const QString &amp;sys_fmt)</div><div class='add'>+{</div><div class='add'>+    QString result;</div><div class='add'>+    int i = 0;</div><div class='add'>+</div><div class='add'>+    while (i &lt; sys_fmt.size()) {</div><div class='add'>+        if (sys_fmt.at(i).unicode() == QLatin1Char('\'')) {</div><div class='add'>+            QString text = qt_readEscapedFormatString(sys_fmt, &amp;i);</div><div class='add'>+            if (text == QLatin1String("'"))</div><div class='add'>+                result += QLatin1String("''");</div><div class='add'>+            else</div><div class='add'>+                result += QString(QLatin1Char('\'') + text + QLatin1Char('\''));</div><div class='add'>+            continue;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        QChar c = sys_fmt.at(i);</div><div class='add'>+        int repeat = qt_repeatCount(sys_fmt, i);</div><div class='add'>+</div><div class='add'>+        switch (c.unicode()) {</div><div class='add'>+            // Date</div><div class='add'>+            case 'y':</div><div class='add'>+                if (repeat &gt; 5)</div><div class='add'>+                    repeat = 5;</div><div class='add'>+                else if (repeat == 3)</div><div class='add'>+                    repeat = 2;</div><div class='add'>+                switch (repeat) {</div><div class='add'>+                    case 1:</div><div class='add'>+                        result += QLatin1String("yy"); // "y" unsupported by Qt, use "yy"</div><div class='add'>+                        break;</div><div class='add'>+                    case 5:</div><div class='add'>+                        result += QLatin1String("yyyy"); // "yyyyy" same as "yyyy" on Windows</div><div class='add'>+                        break;</div><div class='add'>+                    default:</div><div class='add'>+                        result += QString(repeat, QLatin1Char('y'));</div><div class='add'>+                        break;</div><div class='add'>+                }</div><div class='add'>+                break;</div><div class='add'>+            case 'g':</div><div class='add'>+                if (repeat &gt; 2)</div><div class='add'>+                    repeat = 2;</div><div class='add'>+                switch (repeat) {</div><div class='add'>+                    case 2:</div><div class='add'>+                        break; // no equivalent of "gg" in Qt</div><div class='add'>+                    default:</div><div class='add'>+                        result += QLatin1Char('g');</div><div class='add'>+                        break;</div><div class='add'>+                }</div><div class='add'>+                break;</div><div class='add'>+            case 't':</div><div class='add'>+                if (repeat &gt; 2)</div><div class='add'>+                    repeat = 2;</div><div class='add'>+                result += QLatin1String("AP"); // "t" unsupported, use "AP"</div><div class='add'>+                break;</div><div class='add'>+            default:</div><div class='add'>+                result += QString(repeat, c);</div><div class='add'>+                break;</div><div class='add'>+        }</div><div class='add'>+</div><div class='add'>+        i += repeat;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QLocale QSystemLocale::fallbackLocale() const</div><div class='add'>+{</div><div class='add'>+    return QLocale(QString::fromLatin1(getWinLocaleName()));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const</div><div class='add'>+{</div><div class='add'>+    QSystemLocalePrivate *d = systemLocalePrivate();</div><div class='add'>+    switch(type) {</div><div class='add'>+    case DecimalPoint:</div><div class='add'>+        return d-&gt;decimalPoint();</div><div class='add'>+    case GroupSeparator:</div><div class='add'>+        return d-&gt;groupSeparator();</div><div class='add'>+    case NegativeSign:</div><div class='add'>+        return d-&gt;negativeSign();</div><div class='add'>+    case PositiveSign:</div><div class='add'>+        return d-&gt;positiveSign();</div><div class='add'>+    case DateFormatLong:</div><div class='add'>+        return d-&gt;dateFormat(QLocale::LongFormat);</div><div class='add'>+    case DateFormatShort:</div><div class='add'>+        return d-&gt;dateFormat(QLocale::ShortFormat);</div><div class='add'>+    case TimeFormatLong:</div><div class='add'>+        return d-&gt;timeFormat(QLocale::LongFormat);</div><div class='add'>+    case TimeFormatShort:</div><div class='add'>+        return d-&gt;timeFormat(QLocale::ShortFormat);</div><div class='add'>+    case DateTimeFormatLong:</div><div class='add'>+        return d-&gt;dateTimeFormat(QLocale::LongFormat);</div><div class='add'>+    case DateTimeFormatShort:</div><div class='add'>+        return d-&gt;dateTimeFormat(QLocale::ShortFormat);</div><div class='add'>+    case DayNameLong:</div><div class='add'>+        return d-&gt;dayName(in.toInt(), QLocale::LongFormat);</div><div class='add'>+    case DayNameShort:</div><div class='add'>+        return d-&gt;dayName(in.toInt(), QLocale::ShortFormat);</div><div class='add'>+    case MonthNameLong:</div><div class='add'>+        return d-&gt;monthName(in.toInt(), QLocale::LongFormat);</div><div class='add'>+    case MonthNameShort:</div><div class='add'>+        return d-&gt;monthName(in.toInt(), QLocale::ShortFormat);</div><div class='add'>+    case DateToStringShort:</div><div class='add'>+        return d-&gt;toString(in.toDate(), QLocale::ShortFormat);</div><div class='add'>+    case DateToStringLong:</div><div class='add'>+        return d-&gt;toString(in.toDate(), QLocale::LongFormat);</div><div class='add'>+    case TimeToStringShort:</div><div class='add'>+        return d-&gt;toString(in.toTime(), QLocale::ShortFormat);</div><div class='add'>+    case TimeToStringLong:</div><div class='add'>+        return d-&gt;toString(in.toTime(), QLocale::LongFormat);</div><div class='add'>+    case DateTimeToStringShort:</div><div class='add'>+        return d-&gt;toString(in.toDateTime(), QLocale::ShortFormat);</div><div class='add'>+    case DateTimeToStringLong:</div><div class='add'>+        return d-&gt;toString(in.toDateTime(), QLocale::LongFormat);</div><div class='add'>+    case ZeroDigit:</div><div class='add'>+        return d-&gt;zeroDigit();</div><div class='add'>+    case LanguageId:</div><div class='add'>+    case CountryId: {</div><div class='add'>+        QString locale = QString::fromLatin1(getWinLocaleName());</div><div class='add'>+        QLocale::Language lang;</div><div class='add'>+        QLocale::Script script;</div><div class='add'>+        QLocale::Country cntry;</div><div class='add'>+        QLocalePrivate::getLangAndCountry(locale, lang, script, cntry);</div><div class='add'>+        if (type == LanguageId)</div><div class='add'>+            return lang;</div><div class='add'>+        if (cntry == QLocale::AnyCountry)</div><div class='add'>+            return fallbackLocale().country();</div><div class='add'>+        return cntry;</div><div class='add'>+    }</div><div class='add'>+    case ScriptId:</div><div class='add'>+        return QVariant(QLocale::AnyScript);</div><div class='add'>+    case MeasurementSystem:</div><div class='add'>+        return d-&gt;measurementSystem();</div><div class='add'>+    case AMText:</div><div class='add'>+        return d-&gt;amText();</div><div class='add'>+    case PMText:</div><div class='add'>+        return d-&gt;pmText();</div><div class='add'>+    case FirstDayOfWeek:</div><div class='add'>+        return d-&gt;firstDayOfWeek();</div><div class='add'>+    case CurrencySymbol:</div><div class='add'>+        return d-&gt;currencySymbol(QLocale::CurrencySymbolFormat(in.toUInt()));</div><div class='add'>+    case CurrencyToString:</div><div class='add'>+        return d-&gt;toCurrencyString(in.value&lt;QSystemLocale::CurrencyToStringArgument&gt;());</div><div class='add'>+    case UILanguages:</div><div class='add'>+        return d-&gt;uiLanguages();</div><div class='add'>+    case LocaleChanged:</div><div class='add'>+        d-&gt;update();</div><div class='add'>+        break;</div><div class='add'>+    case NativeLanguageName:</div><div class='add'>+        return d-&gt;nativeLanguageName();</div><div class='add'>+    case NativeCountryName:</div><div class='add'>+        return d-&gt;nativeCountryName();</div><div class='add'>+    default:</div><div class='add'>+        break;</div><div class='add'>+    }</div><div class='add'>+    return QVariant();</div><div class='add'>+}</div><div class='add'>+#endif // QT_NO_SYSTEMLOCALE</div><div class='add'>+</div><div class='add'>+struct WindowsToISOListElt {</div><div class='add'>+    ushort windows_code;</div><div class='add'>+    char iso_name[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* NOTE: This array should be sorted by the first column! */</div><div class='add'>+static const WindowsToISOListElt windows_to_iso_list[] = {</div><div class='add'>+    { 0x0401, "ar_SA" },</div><div class='add'>+    { 0x0402, "bg\0  " },</div><div class='add'>+    { 0x0403, "ca\0  " },</div><div class='add'>+    { 0x0404, "zh_TW" },</div><div class='add'>+    { 0x0405, "cs\0  " },</div><div class='add'>+    { 0x0406, "da\0  " },</div><div class='add'>+    { 0x0407, "de\0  " },</div><div class='add'>+    { 0x0408, "el\0  " },</div><div class='add'>+    { 0x0409, "en_US" },</div><div class='add'>+    { 0x040a, "es\0  " },</div><div class='add'>+    { 0x040b, "fi\0  " },</div><div class='add'>+    { 0x040c, "fr\0  " },</div><div class='add'>+    { 0x040d, "he\0  " },</div><div class='add'>+    { 0x040e, "hu\0  " },</div><div class='add'>+    { 0x040f, "is\0  " },</div><div class='add'>+    { 0x0410, "it\0  " },</div><div class='add'>+    { 0x0411, "ja\0  " },</div><div class='add'>+    { 0x0412, "ko\0  " },</div><div class='add'>+    { 0x0413, "nl\0  " },</div><div class='add'>+    { 0x0414, "no\0  " },</div><div class='add'>+    { 0x0415, "pl\0  " },</div><div class='add'>+    { 0x0416, "pt_BR" },</div><div class='add'>+    { 0x0418, "ro\0  " },</div><div class='add'>+    { 0x0419, "ru\0  " },</div><div class='add'>+    { 0x041a, "hr\0  " },</div><div class='add'>+    { 0x041c, "sq\0  " },</div><div class='add'>+    { 0x041d, "sv\0  " },</div><div class='add'>+    { 0x041e, "th\0  " },</div><div class='add'>+    { 0x041f, "tr\0  " },</div><div class='add'>+    { 0x0420, "ur\0  " },</div><div class='add'>+    { 0x0421, "in\0  " },</div><div class='add'>+    { 0x0422, "uk\0  " },</div><div class='add'>+    { 0x0423, "be\0  " },</div><div class='add'>+    { 0x0425, "et\0  " },</div><div class='add'>+    { 0x0426, "lv\0  " },</div><div class='add'>+    { 0x0427, "lt\0  " },</div><div class='add'>+    { 0x0429, "fa\0  " },</div><div class='add'>+    { 0x042a, "vi\0  " },</div><div class='add'>+    { 0x042d, "eu\0  " },</div><div class='add'>+    { 0x042f, "mk\0  " },</div><div class='add'>+    { 0x0436, "af\0  " },</div><div class='add'>+    { 0x0438, "fo\0  " },</div><div class='add'>+    { 0x0439, "hi\0  " },</div><div class='add'>+    { 0x043e, "ms\0  " },</div><div class='add'>+    { 0x0458, "mt\0  " },</div><div class='add'>+    { 0x0801, "ar_IQ" },</div><div class='add'>+    { 0x0804, "zh_CN" },</div><div class='add'>+    { 0x0807, "de_CH" },</div><div class='add'>+    { 0x0809, "en_GB" },</div><div class='add'>+    { 0x080a, "es_MX" },</div><div class='add'>+    { 0x080c, "fr_BE" },</div><div class='add'>+    { 0x0810, "it_CH" },</div><div class='add'>+    { 0x0812, "ko\0  " },</div><div class='add'>+    { 0x0813, "nl_BE" },</div><div class='add'>+    { 0x0814, "no\0  " },</div><div class='add'>+    { 0x0816, "pt\0  " },</div><div class='add'>+    { 0x081a, "sr\0  " },</div><div class='add'>+    { 0x081d, "sv_FI" },</div><div class='add'>+    { 0x0c01, "ar_EG" },</div><div class='add'>+    { 0x0c04, "zh_HK" },</div><div class='add'>+    { 0x0c07, "de_AT" },</div><div class='add'>+    { 0x0c09, "en_AU" },</div><div class='add'>+    { 0x0c0a, "es\0  " },</div><div class='add'>+    { 0x0c0c, "fr_CA" },</div><div class='add'>+    { 0x0c1a, "sr\0  " },</div><div class='add'>+    { 0x1001, "ar_LY" },</div><div class='add'>+    { 0x1004, "zh_SG" },</div><div class='add'>+    { 0x1007, "de_LU" },</div><div class='add'>+    { 0x1009, "en_CA" },</div><div class='add'>+    { 0x100a, "es_GT" },</div><div class='add'>+    { 0x100c, "fr_CH" },</div><div class='add'>+    { 0x1401, "ar_DZ" },</div><div class='add'>+    { 0x1407, "de_LI" },</div><div class='add'>+    { 0x1409, "en_NZ" },</div><div class='add'>+    { 0x140a, "es_CR" },</div><div class='add'>+    { 0x140c, "fr_LU" },</div><div class='add'>+    { 0x1801, "ar_MA" },</div><div class='add'>+    { 0x1809, "en_IE" },</div><div class='add'>+    { 0x180a, "es_PA" },</div><div class='add'>+    { 0x1c01, "ar_TN" },</div><div class='add'>+    { 0x1c09, "en_ZA" },</div><div class='add'>+    { 0x1c0a, "es_DO" },</div><div class='add'>+    { 0x2001, "ar_OM" },</div><div class='add'>+    { 0x2009, "en_JM" },</div><div class='add'>+    { 0x200a, "es_VE" },</div><div class='add'>+    { 0x2401, "ar_YE" },</div><div class='add'>+    { 0x2409, "en\0  " },</div><div class='add'>+    { 0x240a, "es_CO" },</div><div class='add'>+    { 0x2801, "ar_SY" },</div><div class='add'>+    { 0x2809, "en_BZ" },</div><div class='add'>+    { 0x280a, "es_PE" },</div><div class='add'>+    { 0x2c01, "ar_JO" },</div><div class='add'>+    { 0x2c09, "en_TT" },</div><div class='add'>+    { 0x2c0a, "es_AR" },</div><div class='add'>+    { 0x3001, "ar_LB" },</div><div class='add'>+    { 0x300a, "es_EC" },</div><div class='add'>+    { 0x3401, "ar_KW" },</div><div class='add'>+    { 0x340a, "es_CL" },</div><div class='add'>+    { 0x3801, "ar_AE" },</div><div class='add'>+    { 0x380a, "es_UY" },</div><div class='add'>+    { 0x3c01, "ar_BH" },</div><div class='add'>+    { 0x3c0a, "es_PY" },</div><div class='add'>+    { 0x4001, "ar_QA" },</div><div class='add'>+    { 0x400a, "es_BO" },</div><div class='add'>+    { 0x440a, "es_SV" },</div><div class='add'>+    { 0x480a, "es_HN" },</div><div class='add'>+    { 0x4c0a, "es_NI" },</div><div class='add'>+    { 0x500a, "es_PR" }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const int windows_to_iso_count</div><div class='add'>+    = sizeof(windows_to_iso_list)/sizeof(WindowsToISOListElt);</div><div class='add'>+</div><div class='add'>+static const char *winLangCodeToIsoName(int code)</div><div class='add'>+{</div><div class='add'>+    int cmp = code - windows_to_iso_list[0].windows_code;</div><div class='add'>+    if (cmp &lt; 0)</div><div class='add'>+        return 0;</div><div class='add'>+</div><div class='add'>+    if (cmp == 0)</div><div class='add'>+        return windows_to_iso_list[0].iso_name;</div><div class='add'>+</div><div class='add'>+    int begin = 0;</div><div class='add'>+    int end = windows_to_iso_count;</div><div class='add'>+</div><div class='add'>+    while (end - begin &gt; 1) {</div><div class='add'>+        uint mid = (begin + end)/2;</div><div class='add'>+</div><div class='add'>+        const WindowsToISOListElt *elt = windows_to_iso_list + mid;</div><div class='add'>+        int cmp = code - elt-&gt;windows_code;</div><div class='add'>+        if (cmp &lt; 0)</div><div class='add'>+            end = mid;</div><div class='add'>+        else if (cmp &gt; 0)</div><div class='add'>+            begin = mid;</div><div class='add'>+        else</div><div class='add'>+            return elt-&gt;iso_name;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    return 0;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static QString winIso639LangName(LCID id)</div><div class='add'>+{</div><div class='add'>+    QString result;</div><div class='add'>+</div><div class='add'>+    // Windows returns the wrong ISO639 for some languages, we need to detect them here using</div><div class='add'>+    // the language code</div><div class='add'>+    QString lang_code;</div><div class='add'>+    wchar_t out[256];</div><div class='add'>+    if (GetLocaleInfo(id, LOCALE_ILANGUAGE, out, 255)) // ### shouldn't use them according to msdn</div><div class='add'>+        lang_code = QString::fromWCharArray(out);</div><div class='add'>+</div><div class='add'>+    if (!lang_code.isEmpty()) {</div><div class='add'>+        const char *endptr;</div><div class='add'>+        bool ok;</div><div class='add'>+        QByteArray latin1_lang_code = lang_code.toLatin1();</div><div class='add'>+        int i = qstrtoull(latin1_lang_code, &amp;endptr, 16, &amp;ok);</div><div class='add'>+        if (ok &amp;&amp; *endptr == '\0') {</div><div class='add'>+            switch (i) {</div><div class='add'>+                case 0x814:</div><div class='add'>+                    result = QLatin1String("nn"); // Nynorsk</div><div class='add'>+                    break;</div><div class='add'>+                default:</div><div class='add'>+                    break;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    if (!result.isEmpty())</div><div class='add'>+        return result;</div><div class='add'>+</div><div class='add'>+    // not one of the problematic languages - do the usual lookup</div><div class='add'>+    if (GetLocaleInfo(id, LOCALE_SISO639LANGNAME , out, 255))</div><div class='add'>+        result = QString::fromWCharArray(out);</div><div class='add'>+</div><div class='add'>+    return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static QString winIso3116CtryName(LCID id)</div><div class='add'>+{</div><div class='add'>+    QString result;</div><div class='add'>+</div><div class='add'>+    wchar_t out[256];</div><div class='add'>+    if (GetLocaleInfo(id, LOCALE_SISO3166CTRYNAME, out, 255))</div><div class='add'>+        result = QString::fromWCharArray(out);</div><div class='add'>+</div><div class='add'>+    return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static QByteArray getWinLocaleName(LCID id)</div><div class='add'>+{</div><div class='add'>+    QByteArray result;</div><div class='add'>+    if (id == LOCALE_USER_DEFAULT) {</div><div class='add'>+        static QByteArray langEnvVar = qgetenv("LANG");</div><div class='add'>+        result = langEnvVar;</div><div class='add'>+        QString lang, script, cntry;</div><div class='add'>+        if ( result == "C" || (!result.isEmpty()</div><div class='add'>+                &amp;&amp; qt_splitLocaleName(QString::fromLocal8Bit(result), lang, script, cntry)) ) {</div><div class='add'>+            long id = 0;</div><div class='add'>+            bool ok = false;</div><div class='add'>+            id = qstrtoll(result.data(), 0, 0, &amp;ok);</div><div class='add'>+            if ( !ok || id == 0 || id &lt; INT_MIN || id &gt; INT_MAX )</div><div class='add'>+                return result;</div><div class='add'>+            else</div><div class='add'>+                return winLangCodeToIsoName( (int)id );</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+#if defined(Q_OS_WINCE)</div><div class='add'>+    result = winLangCodeToIsoName(id != LOCALE_USER_DEFAULT ? id : GetUserDefaultLCID());</div><div class='add'>+#else</div><div class='add'>+    if (id == LOCALE_USER_DEFAULT)</div><div class='add'>+        id = GetUserDefaultLCID();</div><div class='add'>+    QString resultuage = winIso639LangName(id);</div><div class='add'>+    QString country = winIso3116CtryName(id);</div><div class='add'>+    result = resultuage.toLatin1();</div><div class='add'>+    if (!country.isEmpty()) {</div><div class='add'>+        result += '_';</div><div class='add'>+        result += country.toLatin1();</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+    return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+Q_CORE_EXPORT QLocale qt_localeFromLCID(LCID id)</div><div class='add'>+{</div><div class='add'>+    return QLocale(QString::fromLatin1(getWinLocaleName(id)));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp<br/>index b0d6b8e..b2ca3ac 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qmap.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qmap.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qmap.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qmap.cpp</a></div><div class='hunk'>@@ -404,6 +404,20 @@ void QMapData::dump()</div><div class='ctx'>     Assigns \a other to this map and returns a reference to this map.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+/*! \fn void QMap::swap(QMap&lt;Key, T&gt; &amp;other)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Swaps map \a other with this map. This operation is very</div><div class='add'>+    fast and never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn void QMultiMap::swap(QMultiMap&lt;Key, T&gt; &amp;other)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Swaps map \a other with this map. This operation is very</div><div class='add'>+    fast and never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='ctx'> /*! \fn bool QMap::operator==(const QMap&lt;Key, T&gt; &amp;other) const</div><div class='ctx'> </div><div class='ctx'>     Returns true if \a other is equal to this map; otherwise returns</div><div class='head'>diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h<br/>index b751492..39b3eb8 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qmap.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qmap.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qmap.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qmap.h</a></div><div class='hunk'>@@ -107,7 +107,6 @@ template &lt;class Key&gt; inline bool qMapLessThanKey(const Key &amp;key1, const Key &amp;key</div><div class='ctx'>     return key1 &lt; key2;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION</div><div class='ctx'> template &lt;class Ptr&gt; inline bool qMapLessThanKey(Ptr *key1, Ptr *key2)</div><div class='ctx'> {</div><div class='ctx'>     Q_ASSERT(sizeof(quintptr) == sizeof(Ptr *));</div><div class='hunk'>@@ -119,7 +118,6 @@ template &lt;class Ptr&gt; inline bool qMapLessThanKey(const Ptr *key1, const Ptr *key</div><div class='ctx'>     Q_ASSERT(sizeof(quintptr) == sizeof(const Ptr *));</div><div class='ctx'>     return quintptr(key1) &lt; quintptr(key2);</div><div class='ctx'> }</div><div class='del'>-#endif // QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION</div><div class='ctx'> </div><div class='ctx'> template &lt;class Key, class T&gt;</div><div class='ctx'> struct QMapNode {</div><div class='hunk'>@@ -187,6 +185,11 @@ public:</div><div class='ctx'>     inline ~QMap() { if (!d) return; if (!d-&gt;ref.deref()) freeData(d); }</div><div class='ctx'> </div><div class='ctx'>     QMap&lt;Key, T&gt; &amp;operator=(const QMap&lt;Key, T&gt; &amp;other);</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    inline QMap&lt;Key, T&gt; &amp;operator=(QMap&lt;Key, T&gt; &amp;&amp;other)</div><div class='add'>+    { qSwap(d, other.d); return *this; }</div><div class='add'>+#endif</div><div class='add'>+    inline void swap(QMap&lt;Key, T&gt; &amp;other) { qSwap(d, other.d); }</div><div class='ctx'> #ifndef QT_NO_STL</div><div class='ctx'>     explicit QMap(const typename std::map&lt;Key, T&gt; &amp;other);</div><div class='ctx'>     std::map&lt;Key, T&gt; toStdMap() const;</div><div class='hunk'>@@ -640,13 +643,13 @@ Q_OUTOFLINE_TEMPLATE void QMap&lt;Key, T&gt;::freeData(QMapData *x)</div><div class='ctx'>         while (next != x) {</div><div class='ctx'>             cur = next;</div><div class='ctx'>             next = cur-&gt;forward[0];</div><div class='del'>-#if defined(_MSC_VER) &amp;&amp; (_MSC_VER &gt;= 1300)</div><div class='add'>+#if defined(_MSC_VER)</div><div class='ctx'> #pragma warning(disable:4189)</div><div class='ctx'> #endif</div><div class='ctx'>             Node *concreteNode = concrete(reinterpret_cast&lt;QMapData::Node *&gt;(cur));</div><div class='ctx'>             concreteNode-&gt;key.~Key();</div><div class='ctx'>             concreteNode-&gt;value.~T();</div><div class='del'>-#if defined(_MSC_VER) &amp;&amp; (_MSC_VER &gt;= 1300)</div><div class='add'>+#if defined(_MSC_VER)</div><div class='ctx'> #pragma warning(default:4189)</div><div class='ctx'> #endif</div><div class='ctx'>         }</div><div class='hunk'>@@ -971,6 +974,7 @@ class QMultiMap : public QMap&lt;Key, T&gt;</div><div class='ctx'> public:</div><div class='ctx'>     QMultiMap() {}</div><div class='ctx'>     QMultiMap(const QMap&lt;Key, T&gt; &amp;other) : QMap&lt;Key, T&gt;(other) {}</div><div class='add'>+    inline void swap(QMultiMap&lt;Key, T&gt; &amp;other) { QMap&lt;Key, T&gt;::swap(other); }</div><div class='ctx'> </div><div class='ctx'>     inline typename QMap&lt;Key, T&gt;::iterator replace(const Key &amp;key, const T &amp;value)</div><div class='ctx'>     { return QMap&lt;Key, T&gt;::insert(key, value); }</div><div class='head'>diff --git a/src/corelib/tools/qpoint.cpp b/src/corelib/tools/qpoint.cpp<br/>index 9e9a528..bd32fe7 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qpoint.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qpoint.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qpoint.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qpoint.cpp</a></div><div class='hunk'>@@ -187,7 +187,19 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='del'>-    \fn QPoint &amp;QPoint::operator*=(qreal factor)</div><div class='add'>+    \fn QPoint &amp;QPoint::operator*=(float factor)</div><div class='add'>+</div><div class='add'>+    Multiplies this point's coordinates by the given \a factor, and</div><div class='add'>+    returns a reference to this point.</div><div class='add'>+</div><div class='add'>+    Note that the result is rounded to the nearest integer as points are held as</div><div class='add'>+    integers. Use QPointF for floating point accuracy.</div><div class='add'>+</div><div class='add'>+    \sa operator/=()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn QPoint &amp;QPoint::operator*=(double factor)</div><div class='ctx'> </div><div class='ctx'>     Multiplies this point's coordinates by the given \a factor, and</div><div class='ctx'>     returns a reference to this point. For example:</div><div class='hunk'>@@ -200,6 +212,14 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'>     \sa operator/=()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+/*!</div><div class='add'>+    \fn QPoint &amp;QPoint::operator*=(int factor)</div><div class='add'>+</div><div class='add'>+    Multiplies this point's coordinates by the given \a factor, and</div><div class='add'>+    returns a reference to this point.</div><div class='add'>+</div><div class='add'>+    \sa operator/=()</div><div class='add'>+*/</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>     \fn bool operator==(const QPoint &amp;p1, const QPoint &amp;p2)</div><div class='hunk'>@@ -237,7 +257,7 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='del'>-    \fn const QPoint operator*(const QPoint &amp;point, qreal factor)</div><div class='add'>+    \fn const QPoint operator*(const QPoint &amp;point, float factor)</div><div class='ctx'>     \relates QPoint</div><div class='ctx'> </div><div class='ctx'>     Returns a copy of the given \a point multiplied by the given \a factor.</div><div class='hunk'>@@ -249,7 +269,44 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='del'>-    \fn const QPoint operator*(qreal factor, const QPoint &amp;point)</div><div class='add'>+    \fn const QPoint operator*(const QPoint &amp;point, double factor)</div><div class='add'>+    \relates QPoint</div><div class='add'>+</div><div class='add'>+    Returns a copy of the given \a point multiplied by the given \a factor.</div><div class='add'>+</div><div class='add'>+    Note that the result is rounded to the nearest integer as points</div><div class='add'>+    are held as integers. Use QPointF for floating point accuracy.</div><div class='add'>+</div><div class='add'>+    \sa QPoint::operator*=()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn const QPoint operator*(const QPoint &amp;point, int factor)</div><div class='add'>+    \relates QPoint</div><div class='add'>+</div><div class='add'>+    Returns a copy of the given \a point multiplied by the given \a factor.</div><div class='add'>+</div><div class='add'>+    \sa QPoint::operator*=()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn const QPoint operator*(float factor, const QPoint &amp;point)</div><div class='add'>+    \overload</div><div class='add'>+    \relates QPoint</div><div class='add'>+</div><div class='add'>+    Returns a copy of the given \a point multiplied by the given \a factor.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn const QPoint operator*(double factor, const QPoint &amp;point)</div><div class='add'>+    \overload</div><div class='add'>+    \relates QPoint</div><div class='add'>+</div><div class='add'>+    Returns a copy of the given \a point multiplied by the given \a factor.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn const QPoint operator*(int factor, const QPoint &amp;point)</div><div class='ctx'>     \overload</div><div class='ctx'>     \relates QPoint</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h<br/>index 878ab58..c0cf219 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qpoint.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qpoint.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qpoint.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qpoint.h</a></div><div class='hunk'>@@ -70,15 +70,23 @@ public:</div><div class='ctx'> </div><div class='ctx'>     QPoint &amp;operator+=(const QPoint &amp;p);</div><div class='ctx'>     QPoint &amp;operator-=(const QPoint &amp;p);</div><div class='del'>-    QPoint &amp;operator*=(qreal c);</div><div class='add'>+</div><div class='add'>+    QPoint &amp;operator*=(float c);</div><div class='add'>+    QPoint &amp;operator*=(double c);</div><div class='add'>+    QPoint &amp;operator*=(int c);</div><div class='add'>+</div><div class='ctx'>     QPoint &amp;operator/=(qreal c);</div><div class='ctx'> </div><div class='ctx'>     friend inline bool operator==(const QPoint &amp;, const QPoint &amp;);</div><div class='ctx'>     friend inline bool operator!=(const QPoint &amp;, const QPoint &amp;);</div><div class='ctx'>     friend inline const QPoint operator+(const QPoint &amp;, const QPoint &amp;);</div><div class='ctx'>     friend inline const QPoint operator-(const QPoint &amp;, const QPoint &amp;);</div><div class='del'>-    friend inline const QPoint operator*(const QPoint &amp;, qreal);</div><div class='del'>-    friend inline const QPoint operator*(qreal, const QPoint &amp;);</div><div class='add'>+    friend inline const QPoint operator*(const QPoint &amp;, float);</div><div class='add'>+    friend inline const QPoint operator*(float, const QPoint &amp;);</div><div class='add'>+    friend inline const QPoint operator*(const QPoint &amp;, double);</div><div class='add'>+    friend inline const QPoint operator*(double, const QPoint &amp;);</div><div class='add'>+    friend inline const QPoint operator*(const QPoint &amp;, int);</div><div class='add'>+    friend inline const QPoint operator*(int, const QPoint &amp;);</div><div class='ctx'>     friend inline const QPoint operator-(const QPoint &amp;);</div><div class='ctx'>     friend inline const QPoint operator/(const QPoint &amp;, qreal);</div><div class='ctx'> </div><div class='hunk'>@@ -141,9 +149,15 @@ inline QPoint &amp;QPoint::operator+=(const QPoint &amp;p)</div><div class='ctx'> inline QPoint &amp;QPoint::operator-=(const QPoint &amp;p)</div><div class='ctx'> { xp-=p.xp; yp-=p.yp; return *this; }</div><div class='ctx'> </div><div class='del'>-inline QPoint &amp;QPoint::operator*=(qreal c)</div><div class='add'>+inline QPoint &amp;QPoint::operator*=(float c)</div><div class='add'>+{ xp = qRound(xp*c); yp = qRound(yp*c); return *this; }</div><div class='add'>+</div><div class='add'>+inline QPoint &amp;QPoint::operator*=(double c)</div><div class='ctx'> { xp = qRound(xp*c); yp = qRound(yp*c); return *this; }</div><div class='ctx'> </div><div class='add'>+inline QPoint &amp;QPoint::operator*=(int c)</div><div class='add'>+{ xp = xp*c; yp = yp*c; return *this; }</div><div class='add'>+</div><div class='ctx'> inline bool operator==(const QPoint &amp;p1, const QPoint &amp;p2)</div><div class='ctx'> { return p1.xp == p2.xp &amp;&amp; p1.yp == p2.yp; }</div><div class='ctx'> </div><div class='hunk'>@@ -156,12 +170,24 @@ inline const QPoint operator+(const QPoint &amp;p1, const QPoint &amp;p2)</div><div class='ctx'> inline const QPoint operator-(const QPoint &amp;p1, const QPoint &amp;p2)</div><div class='ctx'> { return QPoint(p1.xp-p2.xp, p1.yp-p2.yp); }</div><div class='ctx'> </div><div class='del'>-inline const QPoint operator*(const QPoint &amp;p, qreal c)</div><div class='add'>+inline const QPoint operator*(const QPoint &amp;p, float c)</div><div class='ctx'> { return QPoint(qRound(p.xp*c), qRound(p.yp*c)); }</div><div class='ctx'> </div><div class='del'>-inline const QPoint operator*(qreal c, const QPoint &amp;p)</div><div class='add'>+inline const QPoint operator*(const QPoint &amp;p, double c)</div><div class='ctx'> { return QPoint(qRound(p.xp*c), qRound(p.yp*c)); }</div><div class='ctx'> </div><div class='add'>+inline const QPoint operator*(const QPoint &amp;p, int c)</div><div class='add'>+{ return QPoint(p.xp*c, p.yp*c); }</div><div class='add'>+</div><div class='add'>+inline const QPoint operator*(float c, const QPoint &amp;p)</div><div class='add'>+{ return QPoint(qRound(p.xp*c), qRound(p.yp*c)); }</div><div class='add'>+</div><div class='add'>+inline const QPoint operator*(double c, const QPoint &amp;p)</div><div class='add'>+{ return QPoint(qRound(p.xp*c), qRound(p.yp*c)); }</div><div class='add'>+</div><div class='add'>+inline const QPoint operator*(int c, const QPoint &amp;p)</div><div class='add'>+{ return QPoint(p.xp*c, p.yp*c); }</div><div class='add'>+</div><div class='ctx'> inline const QPoint operator-(const QPoint &amp;p)</div><div class='ctx'> { return QPoint(-p.xp, -p.yp); }</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/tools/qqueue.cpp b/src/corelib/tools/qqueue.cpp<br/>index 5ac8ec6..2f5aae4 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qqueue.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qqueue.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qqueue.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qqueue.cpp</a></div><div class='hunk'>@@ -91,6 +91,14 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \fn void QQueue::swap(QQueue&lt;T&gt; &amp;other)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Swaps queue \a other with this queue. This operation is very</div><div class='add'>+    fast and never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='ctx'>     \fn void QQueue::enqueue(const T&amp; t)</div><div class='ctx'> </div><div class='ctx'>     Adds value \a t to the tail of the queue.</div><div class='head'>diff --git a/src/corelib/tools/qqueue.h b/src/corelib/tools/qqueue.h<br/>index 268db9e..c10e6c0 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qqueue.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qqueue.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qqueue.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qqueue.h</a></div><div class='hunk'>@@ -56,6 +56,7 @@ class QQueue : public QList&lt;T&gt;</div><div class='ctx'> public:</div><div class='ctx'>     inline QQueue() {}</div><div class='ctx'>     inline ~QQueue() {}</div><div class='add'>+    inline void swap(QQueue&lt;T&gt; &amp;other) { QList&lt;T&gt;::swap(other); } // prevent QList&lt;-&gt;QQueue swaps</div><div class='ctx'>     inline void enqueue(const T &amp;t) { QList&lt;T&gt;::append(t); }</div><div class='ctx'>     inline T dequeue() { return QList&lt;T&gt;::takeFirst(); }</div><div class='ctx'>     inline T &amp;head() { return QList&lt;T&gt;::first(); }</div><div class='head'>diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp<br/>index 678f3d2..ba1609f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qregexp.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qregexp.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qregexp.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qregexp.cpp</a></div><div class='hunk'>@@ -3858,6 +3858,14 @@ QRegExp &amp;QRegExp::operator=(const QRegExp &amp;rx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \fn void QRegExp::swap(QRegExp &amp;other)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Swaps regular expression \a other with this regular</div><div class='add'>+    expression. This operation is very fast and never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='ctx'>     Returns true if this regular expression is equal to \a rx;</div><div class='ctx'>     otherwise returns false.</div><div class='ctx'> </div><div class='hunk'>@@ -4168,6 +4176,8 @@ int QRegExp::matchedLength() const</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_REGEXP_CAPTURE</div><div class='add'>+</div><div class='add'>+#ifndef QT_NO_DEPRECATED</div><div class='ctx'> /*!</div><div class='ctx'>   \obsolete</div><div class='ctx'>   Returns the number of captures contained in the regular expression.</div><div class='hunk'>@@ -4178,6 +4188,7 @@ int QRegExp::numCaptures() const</div><div class='ctx'> {</div><div class='ctx'>     return captureCount();</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>   \since 4.6</div><div class='head'>diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h<br/>index 5eccb7d..12e42a9 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qregexp.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qregexp.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qregexp.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qregexp.h</a></div><div class='hunk'>@@ -76,6 +76,11 @@ public:</div><div class='ctx'>     QRegExp(const QRegExp &amp;rx);</div><div class='ctx'>     ~QRegExp();</div><div class='ctx'>     QRegExp &amp;operator=(const QRegExp &amp;rx);</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    inline QRegExp &amp;operator=(QRegExp &amp;&amp;other)</div><div class='add'>+    { qSwap(priv,other.priv); return *this; }</div><div class='add'>+#endif</div><div class='add'>+    inline void swap(QRegExp &amp;other) { qSwap(priv, other.priv); }</div><div class='ctx'> </div><div class='ctx'>     bool operator==(const QRegExp &amp;rx) const;</div><div class='ctx'>     inline bool operator!=(const QRegExp &amp;rx) const { return !operator==(rx); }</div><div class='head'>diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h<br/>index 08c35d5..b15bcac 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qscopedpointer.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qscopedpointer.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qscopedpointer.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qscopedpointer.h</a></div><div class='hunk'>@@ -54,7 +54,7 @@ struct QScopedPointerDeleter</div><div class='ctx'>     static inline void cleanup(T *pointer)</div><div class='ctx'>     {</div><div class='ctx'>         // Enforce a complete type.</div><div class='del'>-        // If you get a compile error here, read the secion on forward declared</div><div class='add'>+        // If you get a compile error here, read the section on forward declared</div><div class='ctx'>         // classes in the QScopedPointer documentation.</div><div class='ctx'>         typedef char IsIncompleteType[ sizeof(T) ? 1 : -1 ];</div><div class='ctx'>         (void) sizeof(IsIncompleteType);</div><div class='hunk'>@@ -69,7 +69,7 @@ struct QScopedPointerArrayDeleter</div><div class='ctx'>     static inline void cleanup(T *pointer)</div><div class='ctx'>     {</div><div class='ctx'>         // Enforce a complete type.</div><div class='del'>-        // If you get a compile error here, read the secion on forward declared</div><div class='add'>+        // If you get a compile error here, read the section on forward declared</div><div class='ctx'>         // classes in the QScopedPointer documentation.</div><div class='ctx'>         typedef char IsIncompleteType[ sizeof(T) ? 1 : -1 ];</div><div class='ctx'>         (void) sizeof(IsIncompleteType);</div><div class='hunk'>@@ -186,11 +186,30 @@ template &lt;class T, class Cleanup&gt;</div><div class='ctx'> Q_INLINE_TEMPLATE void qSwap(QScopedPointer&lt;T, Cleanup&gt; &amp;p1, QScopedPointer&lt;T, Cleanup&gt; &amp;p2)</div><div class='ctx'> { p1.swap(p2); }</div><div class='ctx'> </div><div class='add'>+#ifndef QT_NO_STL</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+namespace std {</div><div class='add'>+    template &lt;class T, class Cleanup&gt;</div><div class='add'>+    Q_INLINE_TEMPLATE void swap(QT_PREPEND_NAMESPACE(QScopedPointer)&lt;T, Cleanup&gt; &amp;p1, QT_PREPEND_NAMESPACE(QScopedPointer)&lt;T, Cleanup&gt; &amp;p2)</div><div class='add'>+    { p1.swap(p2); }</div><div class='add'>+}</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+namespace QtPrivate {</div><div class='add'>+    template &lt;typename X, typename Y&gt; struct QScopedArrayEnsureSameType;</div><div class='add'>+    template &lt;typename X&gt; struct QScopedArrayEnsureSameType&lt;X,X&gt; { typedef X* Type; };</div><div class='add'>+    template &lt;typename X&gt; struct QScopedArrayEnsureSameType&lt;const X, X&gt; { typedef X* Type; };</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> template &lt;typename T, typename Cleanup = QScopedPointerArrayDeleter&lt;T&gt; &gt;</div><div class='ctx'> class QScopedArrayPointer : public QScopedPointer&lt;T, Cleanup&gt;</div><div class='ctx'> {</div><div class='ctx'> public:</div><div class='del'>-    explicit inline QScopedArrayPointer(T *p = 0)</div><div class='add'>+    template &lt;typename D&gt;</div><div class='add'>+    explicit inline QScopedArrayPointer(D *p = 0, typename QtPrivate::QScopedArrayEnsureSameType&lt;T,D&gt;::Type = 0)</div><div class='ctx'>         : QScopedPointer&lt;T, Cleanup&gt;(p)</div><div class='ctx'>     {</div><div class='ctx'>     }</div><div class='hunk'>@@ -206,6 +225,17 @@ public:</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='ctx'> private:</div><div class='add'>+    explicit inline QScopedArrayPointer(void *) {</div><div class='add'>+        // Enforce the same type.</div><div class='add'>+</div><div class='add'>+        // If you get a compile error here, make sure you declare</div><div class='add'>+        // QScopedArrayPointer with the same template type as you pass to the</div><div class='add'>+        // constructor. See also the QScopedPointer documentation.</div><div class='add'>+</div><div class='add'>+        // Storing a scalar array as a pointer to a different type is not</div><div class='add'>+        // allowed and results in undefined behavior.</div><div class='add'>+    }</div><div class='add'>+</div><div class='ctx'>     Q_DISABLE_COPY(QScopedArrayPointer)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/tools/qscopedvaluerollback.cpp b/src/corelib/tools/qscopedvaluerollback.cpp<br/>new file mode 100644<br/>index 0000000..a9bbdb3<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qscopedvaluerollback.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qscopedvaluerollback.cpp</a></div><div class='hunk'>@@ -0,0 +1,84 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#include "qscopedvaluerollback.h"</div><div class='add'>+</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \class QScopedValueRollback</div><div class='add'>+    \brief The QScopedValueRollback resets a variable to its previous value on destruction</div><div class='add'>+    \since 4.8</div><div class='add'>+    \ingroup misc</div><div class='add'>+</div><div class='add'>+    The QScopedAssignment class can be used to revert state when an</div><div class='add'>+    exception is thrown without needing to write try-catch blocks.</div><div class='add'>+</div><div class='add'>+    It can also be used to manage variables that are temporarily set,</div><div class='add'>+    such as reentrancy guards. By using this class, the variable will</div><div class='add'>+    be reset whether the function is exited normally, exited early by</div><div class='add'>+    a return statement, or exited by an exception.</div><div class='add'>+</div><div class='add'>+    The template can only be instantiated with a type that supports assignment.</div><div class='add'>+</div><div class='add'>+    \sa QScopedPointer</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn QScopedValueRollback::QScopedValueRollback(T &amp;var)</div><div class='add'>+</div><div class='add'>+    Stores the previous value of var internally, for revert on destruction.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn QScopedValueRollback::~QScopedValueRollback()</div><div class='add'>+</div><div class='add'>+    Assigns the previous value to the managed variable.</div><div class='add'>+    This is the value at construction time, or at the last call to commit()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \fn void QScopedValueRollback::commit()</div><div class='add'>+</div><div class='add'>+    Updates the previous value of the managed variable to its current value.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/tools/qscopedvaluerollback.h b/src/corelib/tools/qscopedvaluerollback.h<br/>new file mode 100644<br/>index 0000000..ee62147<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qscopedvaluerollback.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qscopedvaluerollback.h</a></div><div class='hunk'>@@ -0,0 +1,81 @@</div><div class='add'>+/****************************************************************************</div><div class='add'>+**</div><div class='add'>+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</div><div class='add'>+** All rights reserved.</div><div class='add'>+** Contact: Nokia Corporation (qt-info@nokia.com)</div><div class='add'>+**</div><div class='add'>+** This file is part of the QtCore module of the Qt Toolkit.</div><div class='add'>+**</div><div class='add'>+** $QT_BEGIN_LICENSE:LGPL$</div><div class='add'>+** GNU Lesser General Public License Usage</div><div class='add'>+** This file may be used under the terms of the GNU Lesser General Public</div><div class='add'>+** License version 2.1 as published by the Free Software Foundation and</div><div class='add'>+** appearing in the file LICENSE.LGPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU Lesser</div><div class='add'>+** General Public License version 2.1 requirements will be met:</div><div class='add'>+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</div><div class='add'>+**</div><div class='add'>+** In addition, as a special exception, Nokia gives you certain additional</div><div class='add'>+** rights. These rights are described in the Nokia Qt LGPL Exception</div><div class='add'>+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</div><div class='add'>+**</div><div class='add'>+** GNU General Public License Usage</div><div class='add'>+** Alternatively, this file may be used under the terms of the GNU General</div><div class='add'>+** Public License version 3.0 as published by the Free Software Foundation</div><div class='add'>+** and appearing in the file LICENSE.GPL included in the packaging of this</div><div class='add'>+** file. Please review the following information to ensure the GNU General</div><div class='add'>+** Public License version 3.0 requirements will be met:</div><div class='add'>+** http://www.gnu.org/copyleft/gpl.html.</div><div class='add'>+**</div><div class='add'>+** Other Usage</div><div class='add'>+** Alternatively, this file may be used in accordance with the terms and</div><div class='add'>+** conditions contained in a signed written agreement between you and Nokia.</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+**</div><div class='add'>+** $QT_END_LICENSE$</div><div class='add'>+**</div><div class='add'>+****************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef QSCOPEDVALUEROLLBACK_H</div><div class='add'>+#define QSCOPEDVALUEROLLBACK_H</div><div class='add'>+</div><div class='add'>+#include &lt;QtCore/qglobal.h&gt;</div><div class='add'>+</div><div class='add'>+QT_BEGIN_HEADER</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+QT_MODULE(Core)</div><div class='add'>+</div><div class='add'>+template &lt;typename T&gt;</div><div class='add'>+class QScopedValueRollback</div><div class='add'>+{</div><div class='add'>+public:</div><div class='add'>+    QScopedValueRollback(T &amp;var) :</div><div class='add'>+        varRef(var)</div><div class='add'>+    {</div><div class='add'>+        oldValue = varRef;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    ~QScopedValueRollback()</div><div class='add'>+    {</div><div class='add'>+        varRef = oldValue;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    void commit()</div><div class='add'>+    {</div><div class='add'>+        oldValue = varRef;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+private:</div><div class='add'>+    T&amp; varRef;</div><div class='add'>+    T oldValue;</div><div class='add'>+</div><div class='add'>+    Q_DISABLE_COPY(QScopedValueRollback)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+QT_END_HEADER</div><div class='add'>+</div><div class='add'>+#endif // QSCOPEDVALUEROLLBACK_H</div><div class='head'>diff --git a/src/corelib/tools/qset.h b/src/corelib/tools/qset.h<br/>index a4d29c7..5f48042 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qset.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qset.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qset.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qset.h</a></div><div class='hunk'>@@ -61,6 +61,11 @@ public:</div><div class='ctx'> </div><div class='ctx'>     inline QSet&lt;T&gt; &amp;operator=(const QSet&lt;T&gt; &amp;other)</div><div class='ctx'>         { q_hash = other.q_hash; return *this; }</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    inline QSet&lt;T&gt; &amp;operator=(QSet&lt;T&gt; &amp;&amp;other)</div><div class='add'>+        { qSwap(q_hash, other.q_hash); return *this; }</div><div class='add'>+#endif</div><div class='add'>+    inline void swap(QSet&lt;T&gt; &amp;other) { q_hash.swap(other.q_hash); }</div><div class='ctx'> </div><div class='ctx'>     inline bool operator==(const QSet&lt;T&gt; &amp;other) const</div><div class='ctx'>         { return q_hash == other.q_hash; }</div><div class='head'>diff --git a/src/corelib/tools/qset.qdoc b/src/corelib/tools/qset.qdoc<br/>index fb6dcde..f562c68 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qset.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qset.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qset.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qset.qdoc</a></div><div class='hunk'>@@ -123,6 +123,13 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \fn void QSet::swap(QSet&lt;T&gt; &amp;other)</div><div class='add'>+</div><div class='add'>+    Swaps set \a other with this set. This operation is very fast and</div><div class='add'>+    never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='ctx'>     \fn bool QSet::operator==(const QSet&lt;T&gt; &amp;other) const</div><div class='ctx'> </div><div class='ctx'>     Returns true if the \a other set is equal to this set; otherwise</div><div class='head'>diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h<br/>index fb17407..9b404bd 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qshareddata.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qshareddata.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qshareddata.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qshareddata.h</a></div><div class='hunk'>@@ -113,6 +113,11 @@ public:</div><div class='ctx'>         }</div><div class='ctx'>         return *this;</div><div class='ctx'>     }</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    QSharedDataPointer(QSharedDataPointer &amp;&amp;o) : d(o.d) { o.d = 0; }</div><div class='add'>+    inline QSharedDataPointer&lt;T&gt; &amp;operator=(QSharedDataPointer&lt;T&gt; &amp;&amp;other)</div><div class='add'>+    { qSwap(d, other.d); return *this; }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'>     inline bool operator!() const { return !d; }</div><div class='ctx'> </div><div class='hunk'>@@ -163,14 +168,12 @@ public:</div><div class='ctx'>     explicit QExplicitlySharedDataPointer(T *data);</div><div class='ctx'>     inline QExplicitlySharedDataPointer(const QExplicitlySharedDataPointer&lt;T&gt; &amp;o) : d(o.d) { if (d) d-&gt;ref.ref(); }</div><div class='ctx'> </div><div class='del'>-#ifndef QT_NO_MEMBER_TEMPLATES</div><div class='ctx'>     template&lt;class X&gt;</div><div class='ctx'>     inline QExplicitlySharedDataPointer(const QExplicitlySharedDataPointer&lt;X&gt; &amp;o) : d(static_cast&lt;T *&gt;(o.data()))</div><div class='ctx'>     {</div><div class='ctx'>         if(d)</div><div class='ctx'>             d-&gt;ref.ref();</div><div class='ctx'>     }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'>     inline QExplicitlySharedDataPointer&lt;T&gt; &amp; operator=(const QExplicitlySharedDataPointer&lt;T&gt; &amp;o) {</div><div class='ctx'>         if (o.d != d) {</div><div class='hunk'>@@ -194,6 +197,11 @@ public:</div><div class='ctx'>         }</div><div class='ctx'>         return *this;</div><div class='ctx'>     }</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    inline QExplicitlySharedDataPointer(QExplicitlySharedDataPointer &amp;&amp;o) : d(o.d) { o.d = 0; }</div><div class='add'>+    inline QExplicitlySharedDataPointer&lt;T&gt; &amp;operator=(QExplicitlySharedDataPointer&lt;T&gt; &amp;&amp;other)</div><div class='add'>+    { qSwap(d, other.d); return *this; }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'>     inline bool operator!() const { return !d; }</div><div class='ctx'> </div><div class='hunk'>@@ -257,6 +265,20 @@ template &lt;class T&gt;</div><div class='ctx'> Q_INLINE_TEMPLATE void qSwap(QExplicitlySharedDataPointer&lt;T&gt; &amp;p1, QExplicitlySharedDataPointer&lt;T&gt; &amp;p2)</div><div class='ctx'> { p1.swap(p2); }</div><div class='ctx'> </div><div class='add'>+#ifndef QT_NO_STL</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+namespace std {</div><div class='add'>+    template &lt;class T&gt;</div><div class='add'>+    Q_INLINE_TEMPLATE void swap(QT_PREPEND_NAMESPACE(QSharedDataPointer)&lt;T&gt; &amp;p1, QT_PREPEND_NAMESPACE(QSharedDataPointer)&lt;T&gt; &amp;p2)</div><div class='add'>+    { p1.swap(p2); }</div><div class='add'>+</div><div class='add'>+    template &lt;class T&gt;</div><div class='add'>+    Q_INLINE_TEMPLATE void swap(QT_PREPEND_NAMESPACE(QExplicitlySharedDataPointer)&lt;T&gt; &amp;p1, QT_PREPEND_NAMESPACE(QExplicitlySharedDataPointer)&lt;T&gt; &amp;p2)</div><div class='add'>+    { p1.swap(p2); }</div><div class='add'>+}</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> QT_END_HEADER</div><div class='head'>diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp<br/>index 191b0e3..873a2bf 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qsharedpointer.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qsharedpointer.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qsharedpointer.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qsharedpointer.cpp</a></div><div class='hunk'>@@ -85,7 +85,7 @@</div><div class='ctx'>     reference count (i.e., a reference counter placed outside the</div><div class='ctx'>     object). Like its name indicates, the pointer value is shared</div><div class='ctx'>     among all instances of QSharedPointer and QWeakPointer. The</div><div class='del'>-    contents of the object pointed to by the pointer should not</div><div class='add'>+    contents of the object pointed to by the pointer should not be</div><div class='ctx'>     considered shared, however: there is only one object. For that</div><div class='ctx'>     reason, QSharedPointer does not provide a way to detach or make</div><div class='ctx'>     copies of the pointed object.</div><div class='hunk'>@@ -151,7 +151,7 @@</div><div class='ctx'> </div><div class='ctx'>     QtSharedPointer::ExternalRefCount implements the actual reference</div><div class='ctx'>     counting and introduces the d-pointer for QSharedPointer. That d-pointer</div><div class='del'>-    itself is shared with with other QSharedPointer objects as well as</div><div class='add'>+    itself is shared with other QSharedPointer objects as well as</div><div class='ctx'>     QWeakPointer.</div><div class='ctx'> </div><div class='ctx'>     The reason for keeping the pointer value itself outside the d-pointer is</div><div class='hunk'>@@ -213,7 +213,7 @@</div><div class='ctx'>     destroyer field must be set to a valid function that \b will delete the</div><div class='ctx'>     object tracked.</div><div class='ctx'> </div><div class='del'>-    This class also adds an operator delete function to ensure that simply</div><div class='add'>+    This class also adds an operator delete function to ensure that it simply</div><div class='ctx'>     calls the global operator delete. That should be the behaviour in all</div><div class='ctx'>     compilers already, but to be on the safe side, this class ensures that no</div><div class='ctx'>     funny business happens.</div><div class='hunk'>@@ -308,7 +308,7 @@</div><div class='ctx'>     When initialising the parent class, the create() functions pass the</div><div class='ctx'>     address of the static deleter() member function. That is, when the</div><div class='ctx'>     virtual destroy() is called by QSharedPointer, the deleter() functions</div><div class='del'>-    are called instead. These functiosn static_cast the ExternalRefCountData*</div><div class='add'>+    are called instead. These functions static_cast the ExternalRefCountData*</div><div class='ctx'>     parameter to their own type and execute their deletion: for the</div><div class='ctx'>     ExternalRefCountWithCustomDeleter::deleter() case, it runs the user's</div><div class='ctx'>     custom deleter, then destroys the deleter; for</div><div class='hunk'>@@ -318,7 +318,7 @@</div><div class='ctx'>     By not calling the constructor of the derived classes, we avoid</div><div class='ctx'>     instantiating their virtual tables. Since these classes are</div><div class='ctx'>     template-based, there would be one virtual table per \tt T and \tt</div><div class='del'>-    Deleter type. (This is what Qt 4.5 did)</div><div class='add'>+    Deleter type. (This is what Qt 4.5 did.)</div><div class='ctx'> </div><div class='ctx'>     Instead, only one non-inline function is required per template, which is</div><div class='ctx'>     the deleter() static member. All the other functions can be inlined.</div><div class='hunk'>@@ -381,7 +381,7 @@</div><div class='ctx'>     first promote it to QSharedPointer and verify if the resulting object is</div><div class='ctx'>     null or not. QSharedPointer guarantees that the object isn't deleted, so</div><div class='ctx'>     if you obtain a non-null object, you may use the pointer. See</div><div class='del'>-    QWeakPointer::toStrongRef() for more an example.</div><div class='add'>+    QWeakPointer::toStrongRef() for an example.</div><div class='ctx'> </div><div class='ctx'>     QWeakPointer also provides the QWeakPointer::data() method that returns</div><div class='ctx'>     the tracked pointer without ensuring that it remains valid. This function</div><div class='hunk'>@@ -395,7 +395,7 @@</div><div class='ctx'> </div><div class='ctx'>     \section1 Tracking QObject</div><div class='ctx'> </div><div class='del'>-    QWeakPointer can be used to track deletion classes that derive from QObject,</div><div class='add'>+    QWeakPointer can be used to track deletion of classes that derive from QObject,</div><div class='ctx'>     even if they are not managed by QSharedPointer. When used in that role,</div><div class='ctx'>     QWeakPointer replaces the older QPointer in all use-cases. QWeakPointer</div><div class='ctx'>     is also more efficient than QPointer, so it should be preferred in all</div><div class='hunk'>@@ -483,9 +483,9 @@</div><div class='ctx'>     another QSharedPointer object or deleted outside this object.</div><div class='ctx'> </div><div class='ctx'>     The \a deleter parameter specifies the custom deleter for this</div><div class='del'>-    object. The custom deleter is called when the strong reference</div><div class='del'>-    count drops to 0 instead of the operator delete(). This is useful,</div><div class='del'>-    for instance, for calling deleteLater() in a QObject instead:</div><div class='add'>+    object. The custom deleter is called, instead of the operator delete(),</div><div class='add'>+    when the strong reference count drops to 0. This is useful,</div><div class='add'>+    for instance, for calling deleteLater() on a QObject instead:</div><div class='ctx'> </div><div class='ctx'>     \code</div><div class='ctx'>     static void doDeleteLater(MyObject *obj)</div><div class='hunk'>@@ -754,7 +754,7 @@</div><div class='ctx'>     \fn QWeakPointer &amp;QWeakPointer::operator=(const QObject *obj)</div><div class='ctx'>     \since 4.6</div><div class='ctx'> </div><div class='del'>-    Makes this QWeakPointer hold a weak reference to directly to the QObject</div><div class='add'>+    Makes this QWeakPointer hold a weak reference directly to the QObject</div><div class='ctx'>     \a obj. This function is only available if the template type \tt T is</div><div class='ctx'>     QObject or derives from it.</div><div class='ctx'> </div><div class='hunk'>@@ -1275,8 +1275,6 @@ QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#if !defined(QT_NO_MEMBER_TEMPLATES)</div><div class='del'>-</div><div class='ctx'> //#  define QT_SHARED_POINTER_BACKTRACE_SUPPORT</div><div class='ctx'> #  ifdef QT_SHARED_POINTER_BACKTRACE_SUPPORT</div><div class='ctx'> #    if defined(__GLIBC__) &amp;&amp; (__GLIBC__ &gt;= 2) &amp;&amp; !defined(__UCLIBC__) &amp;&amp; !defined(QT_LINUXBASE)</div><div class='hunk'>@@ -1501,5 +1499,3 @@ void QtSharedPointer::internalSafetyCheckCleanCheck()</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/src/corelib/tools/qsharedpointer.h b/src/corelib/tools/qsharedpointer.h<br/>index 978a242..6b2b41f 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qsharedpointer.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qsharedpointer.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qsharedpointer.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qsharedpointer.h</a></div><div class='hunk'>@@ -47,10 +47,7 @@</div><div class='ctx'> #include &lt;QtCore/qshareddata.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifndef Q_QDOC</div><div class='del'>-# if !defined(QT_NO_MEMBER_TEMPLATES)</div><div class='del'>-// QSharedPointer requires member template support</div><div class='ctx'> # include &lt;QtCore/qsharedpointer_impl.h&gt;</div><div class='del'>-# endif</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_HEADER</div><div class='head'>diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h<br/>index 8854891..47ad21a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qsharedpointer_impl.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qsharedpointer_impl.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qsharedpointer_impl.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qsharedpointer_impl.h</a></div><div class='hunk'>@@ -119,7 +119,6 @@ namespace QtSharedPointer {</div><div class='ctx'>     template &lt;class T&gt; inline void normalDeleter(T *t) { delete t; }</div><div class='ctx'> </div><div class='ctx'>     // this uses partial template specialization</div><div class='del'>-    // the only compilers that didn't support this were MSVC 6.0 and 2002</div><div class='ctx'>     template &lt;class T&gt; struct RemovePointer;</div><div class='ctx'>     template &lt;class T&gt; struct RemovePointer&lt;T *&gt; { typedef T Type; };</div><div class='ctx'>     template &lt;class T&gt; struct RemovePointer&lt;QSharedPointer&lt;T&gt; &gt; { typedef T Type; };</div><div class='hunk'>@@ -333,7 +332,6 @@ namespace QtSharedPointer {</div><div class='ctx'>     protected:</div><div class='ctx'>         typedef ExternalRefCountData Data;</div><div class='ctx'> </div><div class='del'>-        inline void ref() const { d-&gt;weakref.ref(); d-&gt;strongref.ref(); }</div><div class='ctx'>         inline void deref()</div><div class='ctx'>         { deref(d, this-&gt;value); }</div><div class='ctx'>         static inline void deref(Data *d, T *value)</div><div class='hunk'>@@ -405,7 +403,13 @@ namespace QtSharedPointer {</div><div class='ctx'>         template &lt;class X&gt;</div><div class='ctx'>         inline void internalCopy(const ExternalRefCount&lt;X&gt; &amp;other)</div><div class='ctx'>         {</div><div class='del'>-            internalSet(other.d, other.data());</div><div class='add'>+            Data *o = other.d;</div><div class='add'>+            T *actual = other.value;</div><div class='add'>+            if (o)</div><div class='add'>+                other.ref();</div><div class='add'>+            qSwap(d, o);</div><div class='add'>+            qSwap(this-&gt;value, actual);</div><div class='add'>+            deref(o, actual);</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'>         inline void internalSwap(ExternalRefCount &amp;other)</div><div class='hunk'>@@ -421,6 +425,7 @@ namespace QtSharedPointer {</div><div class='ctx'>         template &lt;class X&gt; friend class QT_PREPEND_NAMESPACE(QWeakPointer);</div><div class='ctx'>         template &lt;class X, class Y&gt; friend QSharedPointer&lt;X&gt; copyAndSetPointer(X * ptr, const QSharedPointer&lt;Y&gt; &amp;src);</div><div class='ctx'> #endif</div><div class='add'>+        inline void ref() const { d-&gt;weakref.ref(); d-&gt;strongref.ref(); }</div><div class='ctx'> </div><div class='ctx'>         inline void internalSet(Data *o, T *actual)</div><div class='ctx'>         {</div><div class='hunk'>@@ -478,6 +483,13 @@ public:</div><div class='ctx'>         BaseClass::internalCopy(other);</div><div class='ctx'>         return *this;</div><div class='ctx'>     }</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    inline QSharedPointer&lt;T&gt; &amp;operator=(QSharedPointer&lt;T&gt; &amp;&amp;other)</div><div class='add'>+    {</div><div class='add'>+        QSharedPointer&lt;T&gt;::internalSwap(other);</div><div class='add'>+        return *this;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'>     template &lt;class X&gt;</div><div class='ctx'>     inline QSharedPointer(const QSharedPointer&lt;X&gt; &amp;other) : BaseClass(other)</div><div class='hunk'>@@ -782,6 +794,16 @@ inline void qSwap(QSharedPointer&lt;T&gt; &amp;p1, QSharedPointer&lt;T&gt; &amp;p2)</div><div class='ctx'>     p1.swap(p2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifndef QT_NO_STL</div><div class='add'>+QT_END_NAMESPACE</div><div class='add'>+namespace std {</div><div class='add'>+    template &lt;class T&gt;</div><div class='add'>+    inline void swap(QT_PREPEND_NAMESPACE(QSharedPointer)&lt;T&gt; &amp;p1, QT_PREPEND_NAMESPACE(QSharedPointer)&lt;T&gt; &amp;p2)</div><div class='add'>+    { p1.swap(p2); }</div><div class='add'>+}</div><div class='add'>+QT_BEGIN_NAMESPACE</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> namespace QtSharedPointer {</div><div class='ctx'> // helper functions:</div><div class='ctx'>     template &lt;class X, class T&gt;</div><div class='hunk'>@@ -862,9 +884,13 @@ qobject_cast(const QWeakPointer&lt;T&gt; &amp;src)</div><div class='ctx'> {</div><div class='ctx'>     return qSharedPointerObjectCast&lt;typename QtSharedPointer::RemovePointer&lt;X&gt;::Type, T&gt;(src);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+template&lt;typename T&gt; Q_DECLARE_TYPEINFO_BODY(QWeakPointer&lt;T&gt;, Q_MOVABLE_TYPE);</div><div class='add'>+template&lt;typename T&gt; Q_DECLARE_TYPEINFO_BODY(QSharedPointer&lt;T&gt;, Q_MOVABLE_TYPE);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> QT_END_HEADER</div><div class='head'>diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp<br/>index 5277a31..9bfb956 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qsimd.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qsimd.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qsimd.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qsimd.cpp</a></div><div class='hunk'>@@ -72,7 +72,12 @@</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='del'>-#if defined (Q_OS_WINCE)</div><div class='add'>+#if defined (Q_OS_NACL)</div><div class='add'>+static inline uint detectProcessorFeatures()</div><div class='add'>+{</div><div class='add'>+    return 0;</div><div class='add'>+}</div><div class='add'>+#elif defined (Q_OS_WINCE)</div><div class='ctx'> static inline uint detectProcessorFeatures()</div><div class='ctx'> {</div><div class='ctx'>     uint features = 0;</div><div class='head'>diff --git a/src/corelib/tools/qstack.cpp b/src/corelib/tools/qstack.cpp<br/>index 8262c57..0fbb8d8 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qstack.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qstack.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qstack.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qstack.cpp</a></div><div class='hunk'>@@ -91,6 +91,14 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \fn void QStack::swap(QStack&lt;T&gt; &amp;other)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Swaps stack \a other with this stack. This operation is very fast and</div><div class='add'>+    never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*!</div><div class='ctx'>     \fn void QStack::push(const T&amp; t)</div><div class='ctx'> </div><div class='ctx'>     Adds element \a t to the top of the stack.</div><div class='head'>diff --git a/src/corelib/tools/qstack.h b/src/corelib/tools/qstack.h<br/>index 8fb3fbc..2249354 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qstack.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qstack.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qstack.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qstack.h</a></div><div class='hunk'>@@ -56,6 +56,7 @@ class QStack : public QVector&lt;T&gt;</div><div class='ctx'> public:</div><div class='ctx'>     inline QStack() {}</div><div class='ctx'>     inline ~QStack() {}</div><div class='add'>+    inline void swap(QStack&lt;T&gt; &amp;other) { QVector&lt;T&gt;::swap(other); } // prevent QVector&lt;-&gt;QStack swaps</div><div class='ctx'>     inline void push(const T &amp;t) { QVector&lt;T&gt;::append(t); }</div><div class='ctx'>     T pop();</div><div class='ctx'>     T &amp;top();</div><div class='head'>diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp<br/>index 9218861..8ad4e70 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qstring.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qstring.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qstring.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qstring.cpp</a></div><div class='hunk'>@@ -106,12 +106,36 @@ QTextCodec *QString::codecForCStrings;</div><div class='ctx'> static QHash&lt;void *, QByteArray&gt; *asciiCache = 0;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef QT_USE_ICU</div><div class='add'>+// qlocale_icu.cpp</div><div class='add'>+extern bool qt_ucol_strcoll(const QChar *source, int sourceLength, const QChar *target, int targetLength, int *result);</div><div class='add'>+extern bool qt_u_strToUpper(const QString &amp;str, QString *out, const QLocale &amp;locale);</div><div class='add'>+extern bool qt_u_strToLower(const QString &amp;str, QString *out, const QLocale &amp;locale);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> // internal</div><div class='ctx'> int qFindString(const QChar *haystack, int haystackLen, int from,</div><div class='ctx'>     const QChar *needle, int needleLen, Qt::CaseSensitivity cs);</div><div class='ctx'> int qFindStringBoyerMoore(const QChar *haystack, int haystackLen, int from,</div><div class='ctx'>     const QChar *needle, int needleLen, Qt::CaseSensitivity cs);</div><div class='del'>-</div><div class='add'>+static inline int qt_last_index_of(const QChar *haystack, int haystackLen, const QChar &amp;needle,</div><div class='add'>+                                   int from, Qt::CaseSensitivity cs);</div><div class='add'>+static inline int qt_string_count(const QChar *haystack, int haystackLen,</div><div class='add'>+                                  const QChar *needle, int needleLen,</div><div class='add'>+                                  Qt::CaseSensitivity cs);</div><div class='add'>+static inline int qt_string_count(const QChar *haystack, int haystackLen,</div><div class='add'>+                                  const QChar &amp;needle, Qt::CaseSensitivity cs);</div><div class='add'>+static inline int qt_find_latin1_string(const QChar *hay, int size, const QLatin1String &amp;needle,</div><div class='add'>+                                        int from, Qt::CaseSensitivity cs);</div><div class='add'>+static inline bool qt_starts_with(const QChar *haystack, int haystackLen,</div><div class='add'>+                                  const QChar *needle, int needleLen, Qt::CaseSensitivity cs);</div><div class='add'>+static inline bool qt_starts_with(const QChar *haystack, int haystackLen,</div><div class='add'>+                                  const QLatin1String &amp;needle, Qt::CaseSensitivity cs);</div><div class='add'>+static inline bool qt_ends_with(const QChar *haystack, int haystackLen,</div><div class='add'>+                                const QChar *needle, int needleLen, Qt::CaseSensitivity cs);</div><div class='add'>+static inline bool qt_ends_with(const QChar *haystack, int haystackLen,</div><div class='add'>+                                const QLatin1String &amp;needle, Qt::CaseSensitivity cs);</div><div class='ctx'> </div><div class='ctx'> // Unicode case-insensitive comparison</div><div class='ctx'> static int ucstricmp(const ushort *a, const ushort *ae, const ushort *b, const ushort *be)</div><div class='hunk'>@@ -350,11 +374,7 @@ inline char qToLower(char ch)</div><div class='ctx'>         return ch;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#if defined(Q_CC_MSVC) &amp;&amp; _MSC_VER &lt;= 1300</div><div class='del'>-const QString::Null QString::null;</div><div class='del'>-#else</div><div class='ctx'> const QString::Null QString::null = { };</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>   \macro QT_NO_CAST_FROM_ASCII</div><div class='hunk'>@@ -419,7 +439,6 @@ const QString::Null QString::null = { };</div><div class='ctx'>     \ingroup shared</div><div class='ctx'>     \ingroup string-processing</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'>     QString stores a string of 16-bit \l{QChar}s, where each QChar</div><div class='ctx'>     corresponds one Unicode 4.0 character. (Unicode characters</div><div class='ctx'>     with code values above 65535 are stored using surrogate pairs,</div><div class='hunk'>@@ -703,7 +722,7 @@ const QString::Null QString::null = { };</div><div class='ctx'>     formats, the \e precision represents the maximum number of</div><div class='ctx'>     significant digits (trailing zeroes are omitted).</div><div class='ctx'> </div><div class='del'>-    \section1 More Efficient String Construction </div><div class='add'>+    \section1 More Efficient String Construction</div><div class='ctx'> </div><div class='ctx'>     Using the QString \c{'+'} operator, it is easy to construct a</div><div class='ctx'>     complex string from multiple substrings. You will often write code</div><div class='hunk'>@@ -758,16 +777,12 @@ const QString::Null QString::null = { };</div><div class='ctx'> </div><div class='ctx'>     \snippet doc/src/snippets/qstring/stringbuilder.cpp 5</div><div class='ctx'> </div><div class='del'>-    A more global approach is to include this define:</div><div class='add'>+    A more global approach which is the most convenient but</div><div class='add'>+    not entirely source compatible, is to this define in your</div><div class='add'>+    .pro file:</div><div class='ctx'> </div><div class='ctx'>     \snippet doc/src/snippets/qstring/stringbuilder.cpp 3</div><div class='ctx'> </div><div class='del'>-    and use \c{'%'} instead of \c{'+'} for string concatenation</div><div class='del'>-    everywhere. The third approach, which is the most convenient but</div><div class='del'>-    not entirely source compatible, is to include two defines:</div><div class='del'>-</div><div class='del'>-    \snippet doc/src/snippets/qstring/stringbuilder.cpp 4</div><div class='del'>-</div><div class='ctx'>     and the \c{'+'} will automatically be performed as the</div><div class='ctx'>     \c{QStringBuilder} \c{'%'} everywhere.</div><div class='ctx'> </div><div class='hunk'>@@ -913,7 +928,7 @@ int QString::grow(int size)</div><div class='ctx'> /*!</div><div class='ctx'>     \since 4.2</div><div class='ctx'> </div><div class='del'>-    Returns a copy of the \a string, where the encoding of \a string depends on </div><div class='add'>+    Returns a copy of the \a string, where the encoding of \a string depends on</div><div class='ctx'>     the size of wchar. If wchar is 4 bytes, the \a string is interpreted as ucs-4,</div><div class='ctx'>     if wchar is 2 bytes it is interpreted as ucs-2.</div><div class='ctx'> </div><div class='hunk'>@@ -946,6 +961,24 @@ QString QString::fromWCharArray(const wchar_t *string, int size)</div><div class='ctx'>     \sa utf16(), toAscii(), toLatin1(), toUtf8(), toLocal8Bit()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+template&lt;typename T&gt; int toUcs4_helper(const unsigned short *uc, int length, T *out)</div><div class='add'>+{</div><div class='add'>+    int i = 0;</div><div class='add'>+    for (; i &lt; length; ++i) {</div><div class='add'>+        uint u = uc[i];</div><div class='add'>+        if (QChar::isHighSurrogate(u) &amp;&amp; i &lt; length-1) {</div><div class='add'>+            ushort low = uc[i+1];</div><div class='add'>+            if (QChar::isLowSurrogate(low)) {</div><div class='add'>+                ++i;</div><div class='add'>+                u = QChar::surrogateToUcs4(u, low);</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        *out = T(u);</div><div class='add'>+        ++out;</div><div class='add'>+    }</div><div class='add'>+    return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*!</div><div class='ctx'>   \since 4.2</div><div class='ctx'> </div><div class='hunk'>@@ -970,21 +1003,7 @@ int QString::toWCharArray(wchar_t *array) const</div><div class='ctx'>         memcpy(array, utf16(), sizeof(wchar_t)*length());</div><div class='ctx'>         return length();</div><div class='ctx'>     } else {</div><div class='del'>-        wchar_t *a = array;</div><div class='del'>-        const unsigned short *uc = utf16();</div><div class='del'>-        for (int i = 0; i &lt; length(); ++i) {</div><div class='del'>-            uint u = uc[i];</div><div class='del'>-            if (QChar::isHighSurrogate(u) &amp;&amp; i + 1 &lt; length()) {</div><div class='del'>-                ushort low = uc[i+1];</div><div class='del'>-                if (QChar::isLowSurrogate(low)) {</div><div class='del'>-                    u = QChar::surrogateToUcs4(u, low);</div><div class='del'>-                    ++i;</div><div class='del'>-                }</div><div class='del'>-            }</div><div class='del'>-            *a = wchar_t(u);</div><div class='del'>-            ++a;</div><div class='del'>-        }</div><div class='del'>-        return a - array;</div><div class='add'>+        return toUcs4_helper&lt;wchar_t&gt;(utf16(), length(), array);</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1159,6 +1178,13 @@ QString::QString(QChar ch)</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/*! \fn void QString::swap(QString &amp;other)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Swaps string \a other with this string. This operation is very fast and</div><div class='add'>+    never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='ctx'> /*! \fn void QString::detach()</div><div class='ctx'> </div><div class='ctx'>     \internal</div><div class='hunk'>@@ -1317,7 +1343,9 @@ void QString::realloc(int alloc)</div><div class='ctx'>             asciiCache-&gt;remove(d);</div><div class='ctx'>         }</div><div class='ctx'> #endif</div><div class='del'>-        d = static_cast&lt;Data *&gt;(q_check_ptr(qRealloc(d, sizeof(Data) + alloc * sizeof(QChar))));</div><div class='add'>+        Data *p = static_cast&lt;Data *&gt;(qRealloc(d, sizeof(Data) + alloc * sizeof(QChar)));</div><div class='add'>+        Q_CHECK_PTR(p);</div><div class='add'>+        d = p;</div><div class='ctx'>         d-&gt;alloc = alloc;</div><div class='ctx'>         d-&gt;data = d-&gt;array;</div><div class='ctx'>     }</div><div class='hunk'>@@ -2481,14 +2509,10 @@ int QString::indexOf(const QString &amp;str, int from, Qt::CaseSensitivity cs) const</div><div class='ctx'> </div><div class='ctx'>   \sa lastIndexOf(), contains(), count()</div><div class='ctx'> */</div><div class='add'>+</div><div class='ctx'> int QString::indexOf(const QLatin1String &amp;str, int from, Qt::CaseSensitivity cs) const</div><div class='ctx'> {</div><div class='del'>-    int len = qstrlen(str.latin1());</div><div class='del'>-    QVarLengthArray&lt;ushort&gt; s(len);</div><div class='del'>-    for (int i = 0; i &lt; len; ++i)</div><div class='del'>-        s[i] = str.latin1()[i];</div><div class='del'>-</div><div class='del'>-    return qFindString(unicode(), length(), from, (const QChar *)s.data(), len, cs);</div><div class='add'>+    return qt_find_latin1_string(unicode(), size(), str, from, cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int qFindString(</div><div class='hunk'>@@ -2578,6 +2602,23 @@ int QString::indexOf(QChar ch, int from, Qt::CaseSensitivity cs) const</div><div class='ctx'>     return findChar(unicode(), length(), ch, from, cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    \overload indexOf()</div><div class='add'>+</div><div class='add'>+    Returns the index position of the first occurrence of the string</div><div class='add'>+    reference \a str in this string, searching forward from index</div><div class='add'>+    position \a from. Returns -1 if \a str is not found.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is case</div><div class='add'>+    sensitive; otherwise the search is case insensitive.</div><div class='add'>+*/</div><div class='add'>+int QString::indexOf(const QStringRef &amp;str, int from, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qFindString(unicode(), length(), from, str.unicode(), str.length(), cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int lastIndexOfHelper(const ushort *haystack, int from, const ushort *needle, int sl, Qt::CaseSensitivity cs)</div><div class='ctx'> {</div><div class='ctx'>     /*</div><div class='hunk'>@@ -2657,12 +2698,13 @@ int QString::lastIndexOf(const QString &amp;str, int from, Qt::CaseSensitivity cs) c</div><div class='ctx'>     if (from &gt; delta)</div><div class='ctx'>         from = delta;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'>     return lastIndexOfHelper(d-&gt;data, from, str.d-&gt;data, str.d-&gt;size, cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='ctx'>   \since 4.5</div><div class='add'>+  \overload lastIndexOf()</div><div class='add'>+</div><div class='ctx'>   Returns the index position of the last occurrence of the string \a</div><div class='ctx'>   str in this string, searching backward from index position \a</div><div class='ctx'>   from. If \a from is -1 (default), the search starts at the last</div><div class='hunk'>@@ -2710,26 +2752,43 @@ int QString::lastIndexOf(const QLatin1String &amp;str, int from, Qt::CaseSensitivity</div><div class='ctx'> */</div><div class='ctx'> int QString::lastIndexOf(QChar ch, int from, Qt::CaseSensitivity cs) const</div><div class='ctx'> {</div><div class='del'>-    ushort c = ch.unicode();</div><div class='del'>-    if (from &lt; 0)</div><div class='del'>-        from += d-&gt;size;</div><div class='del'>-    if (from &lt; 0 || from &gt;= d-&gt;size)</div><div class='del'>-        return -1;</div><div class='del'>-    if (from &gt;= 0) {</div><div class='del'>-        const ushort *n = d-&gt;data + from;</div><div class='del'>-        const ushort *b = d-&gt;data;</div><div class='del'>-        if (cs == Qt::CaseSensitive) {</div><div class='del'>-            for (; n &gt;= b; --n)</div><div class='del'>-                if (*n == c)</div><div class='del'>-                    return n - b;</div><div class='del'>-        } else {</div><div class='del'>-            c = foldCase(c);</div><div class='del'>-            for (; n &gt;= b; --n)</div><div class='del'>-                if (foldCase(*n) == c)</div><div class='del'>-                    return n - b;</div><div class='del'>-        }</div><div class='add'>+    return qt_last_index_of(unicode(), size(), ch, from, cs);</div><div class='ctx'>     }</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+  \since 4.8</div><div class='add'>+  \overload lastIndexOf()</div><div class='add'>+</div><div class='add'>+  Returns the index position of the last occurrence of the string</div><div class='add'>+  reference \a str in this string, searching backward from index</div><div class='add'>+  position \a from. If \a from is -1 (default), the search starts at</div><div class='add'>+  the last character; if \a from is -2, at the next to last character</div><div class='add'>+  and so on. Returns -1 if \a str is not found.</div><div class='add'>+</div><div class='add'>+  If \a cs is Qt::CaseSensitive (default), the search is case</div><div class='add'>+  sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+  \sa indexOf(), contains(), count()</div><div class='add'>+*/</div><div class='add'>+int QString::lastIndexOf(const QStringRef &amp;str, int from, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    const int sl = str.size();</div><div class='add'>+    if (sl == 1)</div><div class='add'>+        return lastIndexOf(str.at(0), from, cs);</div><div class='add'>+</div><div class='add'>+    const int l = d-&gt;size;</div><div class='add'>+    if (from &lt; 0)</div><div class='add'>+        from += l;</div><div class='add'>+    int delta = l - sl;</div><div class='add'>+    if (from == l &amp;&amp; sl == 0)</div><div class='add'>+        return from;</div><div class='add'>+    if (from &lt; 0 || from &gt;= l || delta &lt; 0)</div><div class='ctx'>     return -1;</div><div class='add'>+    if (from &gt; delta)</div><div class='add'>+        from = delta;</div><div class='add'>+</div><div class='add'>+    return lastIndexOfHelper(d-&gt;data, from, reinterpret_cast&lt;const ushort*&gt;(str.unicode()),</div><div class='add'>+                             str.size(), cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_REGEXP</div><div class='hunk'>@@ -2904,19 +2963,10 @@ QString&amp; QString::replace(const QRegExp &amp;rx, const QString &amp;after)</div><div class='ctx'> </div><div class='ctx'>     \sa contains(), indexOf()</div><div class='ctx'> */</div><div class='add'>+</div><div class='ctx'> int QString::count(const QString &amp;str, Qt::CaseSensitivity cs) const</div><div class='ctx'> {</div><div class='del'>-    int num = 0;</div><div class='del'>-    int i = -1;</div><div class='del'>-    if (d-&gt;size &gt; 500 &amp;&amp; str.d-&gt;size &gt; 5) {</div><div class='del'>-        QStringMatcher matcher(str, cs);</div><div class='del'>-        while ((i = matcher.indexIn(*this, i + 1)) != -1)</div><div class='del'>-            ++num;</div><div class='del'>-    } else {</div><div class='del'>-        while ((i = indexOf(str, i + 1, cs)) != -1)</div><div class='del'>-            ++num;</div><div class='del'>-    }</div><div class='del'>-    return num;</div><div class='add'>+    return qt_string_count(unicode(), size(), str.unicode(), str.size(), cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -2924,25 +2974,29 @@ int QString::count(const QString &amp;str, Qt::CaseSensitivity cs) const</div><div class='ctx'> </div><div class='ctx'>   Returns the number of occurrences of character \a ch in the string.</div><div class='ctx'> */</div><div class='add'>+</div><div class='ctx'> int QString::count(QChar ch, Qt::CaseSensitivity cs) const</div><div class='ctx'> {</div><div class='del'>-    ushort c = ch.unicode();</div><div class='del'>-    int num = 0;</div><div class='del'>-    const ushort *i = d-&gt;data + d-&gt;size;</div><div class='del'>-    const ushort *b = d-&gt;data;</div><div class='del'>-    if (cs == Qt::CaseSensitive) {</div><div class='del'>-        while (i != b)</div><div class='del'>-            if (*--i == c)</div><div class='del'>-                ++num;</div><div class='del'>-    } else {</div><div class='del'>-        c = foldCase(c);</div><div class='del'>-        while (i != b)</div><div class='del'>-            if (foldCase(*(--i)) == c)</div><div class='del'>-                ++num;</div><div class='add'>+    return qt_string_count(unicode(), size(), ch, cs);</div><div class='ctx'>     }</div><div class='del'>-    return num;</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload count()</div><div class='add'>+    Returns the number of (potentially overlapping) occurrences of the</div><div class='add'>+    string reference \a str in this string.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is</div><div class='add'>+    case sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+    \sa contains(), indexOf()</div><div class='add'>+*/</div><div class='add'>+int QString::count(const QStringRef &amp;str, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qt_string_count(unicode(), size(), str.unicode(), str.size(), cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /*! \fn bool QString::contains(const QString &amp;str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const</div><div class='ctx'> </div><div class='ctx'>     Returns true if this string contains an occurrence of the string</div><div class='hunk'>@@ -2965,6 +3019,18 @@ int QString::count(QChar ch, Qt::CaseSensitivity cs) const</div><div class='ctx'>     character \a ch; otherwise returns false.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+/*! \fn bool QString::contains(const QStringRef &amp;str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns true if this string contains an occurrence of the string</div><div class='add'>+    reference \a str; otherwise returns false.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is</div><div class='add'>+    case sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+    \sa indexOf(), count()</div><div class='add'>+*/</div><div class='add'>+</div><div class='ctx'> /*! \fn bool QString::contains(const QRegExp &amp;rx) const</div><div class='ctx'> </div><div class='ctx'>     \overload contains()</div><div class='hunk'>@@ -3366,22 +3432,8 @@ QString QString::mid(int position, int n) const</div><div class='ctx'> */</div><div class='ctx'> bool QString::startsWith(const QString&amp; s, Qt::CaseSensitivity cs) const</div><div class='ctx'> {</div><div class='del'>-    if (d == &amp;shared_null)</div><div class='del'>-        return (s.d == &amp;shared_null);</div><div class='del'>-    if (d-&gt;size == 0)</div><div class='del'>-        return s.d-&gt;size == 0;</div><div class='del'>-    if (s.d-&gt;size &gt; d-&gt;size)</div><div class='del'>-        return false;</div><div class='del'>-    if (cs == Qt::CaseSensitive) {</div><div class='del'>-        return qMemEquals(d-&gt;data, s.d-&gt;data, s.d-&gt;size);</div><div class='del'>-    } else {</div><div class='del'>-        uint last = 0;</div><div class='del'>-        uint olast = 0;</div><div class='del'>-        for (int i = 0; i &lt; s.d-&gt;size; ++i)</div><div class='del'>-            if (foldCase(d-&gt;data[i], last) != foldCase(s.d-&gt;data[i], olast))</div><div class='del'>-                return false;</div><div class='del'>-    }</div><div class='del'>-    return true;</div><div class='add'>+    return qt_starts_with(isNull() ? 0 : unicode(), size(),</div><div class='add'>+                          s.isNull() ? 0 : s.unicode(), s.size(), cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -3389,24 +3441,7 @@ bool QString::startsWith(const QString&amp; s, Qt::CaseSensitivity cs) const</div><div class='ctx'>  */</div><div class='ctx'> bool QString::startsWith(const QLatin1String&amp; s, Qt::CaseSensitivity cs) const</div><div class='ctx'> {</div><div class='del'>-    if (d == &amp;shared_null)</div><div class='del'>-        return (s.latin1() == 0);</div><div class='del'>-    if (d-&gt;size == 0)</div><div class='del'>-        return !s.latin1() || *s.latin1() == 0;</div><div class='del'>-    int slen = qstrlen(s.latin1());</div><div class='del'>-    if (slen &gt; d-&gt;size)</div><div class='del'>-        return false;</div><div class='del'>-    const uchar *latin = (const uchar *)s.latin1();</div><div class='del'>-    if (cs == Qt::CaseSensitive) {</div><div class='del'>-        for (int i = 0; i &lt; slen; ++i)</div><div class='del'>-            if (d-&gt;data[i] != latin[i])</div><div class='del'>-                return false;</div><div class='del'>-    } else {</div><div class='del'>-        for (int i = 0; i &lt; slen; ++i)</div><div class='del'>-            if (foldCase(d-&gt;data[i]) != foldCase((ushort)latin[i]))</div><div class='del'>-                return false;</div><div class='del'>-    }</div><div class='del'>-    return true;</div><div class='add'>+    return qt_starts_with(isNull() ? 0 : unicode(), size(), s, cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -3424,6 +3459,23 @@ bool QString::startsWith(const QChar &amp;c, Qt::CaseSensitivity cs) const</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload</div><div class='add'>+    Returns true if the string starts with the string reference \a s;</div><div class='add'>+    otherwise returns false.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is case</div><div class='add'>+    sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+    \sa endsWith()</div><div class='add'>+*/</div><div class='add'>+bool QString::startsWith(const QStringRef &amp;s, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qt_starts_with(isNull() ? 0 : unicode(), size(),</div><div class='add'>+                          s.isNull() ? 0 : s.unicode(), s.size(), cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='ctx'>     Returns true if the string ends with \a s; otherwise returns</div><div class='ctx'>     false.</div><div class='ctx'> </div><div class='hunk'>@@ -3436,49 +3488,34 @@ bool QString::startsWith(const QChar &amp;c, Qt::CaseSensitivity cs) const</div><div class='ctx'> */</div><div class='ctx'> bool QString::endsWith(const QString&amp; s, Qt::CaseSensitivity cs) const</div><div class='ctx'> {</div><div class='del'>-    if (d == &amp;shared_null)</div><div class='del'>-        return (s.d == &amp;shared_null);</div><div class='del'>-    if (d-&gt;size == 0)</div><div class='del'>-        return s.d-&gt;size == 0;</div><div class='del'>-    int pos = d-&gt;size - s.d-&gt;size;</div><div class='del'>-    if (pos &lt; 0)</div><div class='del'>-        return false;</div><div class='del'>-    if (cs == Qt::CaseSensitive) {</div><div class='del'>-        return qMemEquals(d-&gt;data + pos, s.d-&gt;data, s.d-&gt;size);</div><div class='del'>-    } else {</div><div class='del'>-        uint last = 0;</div><div class='del'>-        uint olast = 0;</div><div class='del'>-        for (int i = 0; i &lt; s.length(); i++)</div><div class='del'>-            if (foldCase(d-&gt;data[pos+i], last) != foldCase(s.d-&gt;data[i], olast))</div><div class='del'>-                return false;</div><div class='add'>+    return qt_ends_with(isNull() ? 0 : unicode(), size(),</div><div class='add'>+                        s.isNull() ? 0 : s.unicode(), s.size(), cs);</div><div class='ctx'>     }</div><div class='del'>-    return true;</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload endsWith()</div><div class='add'>+    Returns true if the string ends with the string reference \a s;</div><div class='add'>+    otherwise returns false.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is case</div><div class='add'>+    sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+    \sa startsWith()</div><div class='add'>+*/</div><div class='add'>+bool QString::endsWith(const QStringRef &amp;s, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qt_ends_with(isNull() ? 0 : unicode(), size(),</div><div class='add'>+                        s.isNull() ? 0 : s.unicode(), s.size(), cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /*!</div><div class='ctx'>     \overload endsWith()</div><div class='ctx'> */</div><div class='ctx'> bool QString::endsWith(const QLatin1String&amp; s, Qt::CaseSensitivity cs) const</div><div class='ctx'> {</div><div class='del'>-    if (d == &amp;shared_null)</div><div class='del'>-        return (s.latin1() == 0);</div><div class='del'>-    if (d-&gt;size == 0)</div><div class='del'>-        return !s.latin1() || *s.latin1() == 0;</div><div class='del'>-    int slen = qstrlen(s.latin1());</div><div class='del'>-    int pos = d-&gt;size - slen;</div><div class='del'>-    const uchar *latin = (const uchar *)s.latin1();</div><div class='del'>-    if (pos &lt; 0)</div><div class='del'>-        return false;</div><div class='del'>-    if (cs == Qt::CaseSensitive) {</div><div class='del'>-        for (int i = 0; i &lt; slen; i++)</div><div class='del'>-            if (d-&gt;data[pos+i] != latin[i])</div><div class='del'>-                return false;</div><div class='del'>-    } else {</div><div class='del'>-        for (int i = 0; i &lt; slen; i++)</div><div class='del'>-            if (foldCase(d-&gt;data[pos+i]) != foldCase((ushort)latin[i]))</div><div class='del'>-                return false;</div><div class='del'>-    }</div><div class='del'>-    return true;</div><div class='add'>+    return qt_ends_with(isNull() ? 0 : unicode(), size(), s, cs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*!</div><div class='hunk'>@@ -3717,20 +3754,8 @@ QVector&lt;uint&gt; QString::toUcs4() const</div><div class='ctx'> {</div><div class='ctx'>     QVector&lt;uint&gt; v(length());</div><div class='ctx'>     uint *a = v.data();</div><div class='del'>-    const unsigned short *uc = utf16();</div><div class='del'>-    for (int i = 0; i &lt; length(); ++i) {</div><div class='del'>-        uint u = uc[i];</div><div class='del'>-        if (QChar(u).isHighSurrogate() &amp;&amp; i &lt; length()-1) {</div><div class='del'>-            ushort low = uc[i+1];</div><div class='del'>-            if (QChar(low).isLowSurrogate()) {</div><div class='del'>-                ++i;</div><div class='del'>-                u = QChar::surrogateToUcs4(u, low);</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        *a = u;</div><div class='del'>-        ++a;</div><div class='del'>-    }</div><div class='del'>-    v.resize(a - v.data());</div><div class='add'>+    int len = toUcs4_helper&lt;uint&gt;(utf16(), length(), a);</div><div class='add'>+    v.resize(len);</div><div class='ctx'>     return v;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4807,6 +4832,14 @@ int QString::localeAwareCompare_helper(const QChar *data1, int length1,</div><div class='ctx'>     TPtrC p2 = TPtrC16(reinterpret_cast&lt;const TUint16 *&gt;(data2), length2);</div><div class='ctx'>     return p1.CompareC(p2);</div><div class='ctx'> #elif defined(Q_OS_UNIX)</div><div class='add'>+#  if defined(QT_USE_ICU)</div><div class='add'>+    int res;</div><div class='add'>+    if (qt_ucol_strcoll(data1, length1, data2, length2, &amp;res)) {</div><div class='add'>+        if (res == 0)</div><div class='add'>+            res = ucstrcmp(data1, length1, data2, length2);</div><div class='add'>+        return res;</div><div class='add'>+    } // else fall through</div><div class='add'>+#  endif</div><div class='ctx'>     // declared in &lt;string.h&gt;</div><div class='ctx'>     int delta = strcoll(toLocal8Bit_helper(data1, length1), toLocal8Bit_helper(data2, length2));</div><div class='ctx'>     if (delta == 0)</div><div class='hunk'>@@ -4942,6 +4975,15 @@ QString QString::toLower() const</div><div class='ctx'>     if (!d-&gt;size)</div><div class='ctx'>         return *this;</div><div class='ctx'> </div><div class='add'>+#ifdef QT_USE_ICU</div><div class='add'>+    {</div><div class='add'>+        QString result;</div><div class='add'>+        if (qt_u_strToLower(*this, &amp;result, QLocale()))</div><div class='add'>+            return result;</div><div class='add'>+        // else fall through and use Qt's toUpper</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'>     const ushort *e = d-&gt;data + d-&gt;size;</div><div class='ctx'> </div><div class='ctx'>     // this avoids one out of bounds check in the loop</div><div class='hunk'>@@ -5033,6 +5075,15 @@ QString QString::toUpper() const</div><div class='ctx'>     if (!d-&gt;size)</div><div class='ctx'>         return *this;</div><div class='ctx'> </div><div class='add'>+#ifdef QT_USE_ICU</div><div class='add'>+    {</div><div class='add'>+        QString result;</div><div class='add'>+        if (qt_u_strToUpper(*this, &amp;result, QLocale()))</div><div class='add'>+            return result;</div><div class='add'>+        // else fall through and use Qt's toUpper</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'>     const ushort *e = d-&gt;data + d-&gt;size;</div><div class='ctx'> </div><div class='ctx'>     // this avoids one out of bounds check in the loop</div><div class='hunk'>@@ -6239,28 +6290,32 @@ void qt_string_normalize(QString *data, QString::NormalizationForm mode, QChar::</div><div class='ctx'>     if (version == QChar::Unicode_Unassigned) {</div><div class='ctx'>         version = UNICODE_DATA_VERSION;</div><div class='ctx'>     } else if (version != UNICODE_DATA_VERSION) {</div><div class='del'>-        QString &amp;s = *data;</div><div class='add'>+        const QString &amp;s = *data;</div><div class='add'>+        QChar *d = 0;</div><div class='ctx'>         for (int i = 0; i &lt; NumNormalizationCorrections; ++i) {</div><div class='ctx'>             const NormalizationCorrection &amp;n = uc_normalization_corrections[i];</div><div class='ctx'>             if (n.version &gt; version) {</div><div class='ctx'>                 int pos = from;</div><div class='del'>-                if (n.ucs4 &gt; 0xffff) {</div><div class='add'>+                if (QChar::requiresSurrogates(n.ucs4)) {</div><div class='ctx'>                     ushort ucs4High = QChar::highSurrogate(n.ucs4);</div><div class='ctx'>                     ushort ucs4Low = QChar::lowSurrogate(n.ucs4);</div><div class='ctx'>                     ushort oldHigh = QChar::highSurrogate(n.old_mapping);</div><div class='ctx'>                     ushort oldLow = QChar::lowSurrogate(n.old_mapping);</div><div class='ctx'>                     while (pos &lt; s.length() - 1) {</div><div class='ctx'>                         if (s.at(pos).unicode() == ucs4High &amp;&amp; s.at(pos + 1).unicode() == ucs4Low) {</div><div class='del'>-                            s[pos] = oldHigh;</div><div class='del'>-                            s[pos + 1] = oldLow;</div><div class='del'>-                            ++pos;</div><div class='add'>+                            if (!d)</div><div class='add'>+                                d = data-&gt;data();</div><div class='add'>+                            d[pos] = QChar(oldHigh);</div><div class='add'>+                            d[++pos] = QChar(oldLow);</div><div class='ctx'>                         }</div><div class='ctx'>                         ++pos;</div><div class='ctx'>                     }</div><div class='ctx'>                 } else {</div><div class='ctx'>                     while (pos &lt; s.length()) {</div><div class='ctx'>                         if (s.at(pos).unicode() == n.ucs4) {</div><div class='del'>-                            s[pos] = n.old_mapping;</div><div class='add'>+                            if (!d)</div><div class='add'>+                                d = data-&gt;data();</div><div class='add'>+                            d[pos] = QChar(n.old_mapping);</div><div class='ctx'>                         }</div><div class='ctx'>                         ++pos;</div><div class='ctx'>                     }</div><div class='hunk'>@@ -7445,31 +7500,17 @@ QDataStream &amp;operator&lt;&lt;(QDataStream &amp;out, const QString &amp;str)</div><div class='ctx'>         out &lt;&lt; str.toLatin1();</div><div class='ctx'>     } else {</div><div class='ctx'>         if (!str.isNull() || out.version() &lt; 3) {</div><div class='del'>-            int byteOrder = out.byteOrder();</div><div class='del'>-            const QChar* ub = str.unicode();</div><div class='del'>-            static const uint auto_size = 1024;</div><div class='del'>-            char t[auto_size];</div><div class='del'>-            char *b;</div><div class='del'>-            if (str.length()*sizeof(QChar) &gt; auto_size) {</div><div class='del'>-                b = new char[str.length()*sizeof(QChar)];</div><div class='add'>+            if ((out.byteOrder() == QDataStream::BigEndian) == (QSysInfo::ByteOrder == QSysInfo::BigEndian)) {</div><div class='add'>+                out.writeBytes(reinterpret_cast&lt;const char *&gt;(str.unicode()), sizeof(QChar) * str.length());</div><div class='ctx'>             } else {</div><div class='del'>-                b = t;</div><div class='del'>-            }</div><div class='del'>-            int l = str.length();</div><div class='del'>-            char *c=b;</div><div class='del'>-            while (l--) {</div><div class='del'>-                if (byteOrder == QDataStream::BigEndian) {</div><div class='del'>-                    *c++ = (char)ub-&gt;row();</div><div class='del'>-                    *c++ = (char)ub-&gt;cell();</div><div class='del'>-                } else {</div><div class='del'>-                    *c++ = (char)ub-&gt;cell();</div><div class='del'>-                    *c++ = (char)ub-&gt;row();</div><div class='add'>+                QVarLengthArray&lt;ushort&gt; buffer(str.length());</div><div class='add'>+                const ushort *data = reinterpret_cast&lt;const ushort *&gt;(str.constData());</div><div class='add'>+                for (int i = 0; i &lt; str.length(); i++) {</div><div class='add'>+                    buffer[i] = qbswap(*data);</div><div class='add'>+                    ++data;</div><div class='ctx'>                 }</div><div class='del'>-                ub++;</div><div class='add'>+                out.writeBytes(reinterpret_cast&lt;const char *&gt;(buffer.data()), sizeof(ushort) * buffer.size());</div><div class='ctx'>             }</div><div class='del'>-            out.writeBytes(b, sizeof(QChar)*str.length());</div><div class='del'>-            if (str.length()*sizeof(QChar) &gt; auto_size)</div><div class='del'>-                delete [] b;</div><div class='ctx'>         } else {</div><div class='ctx'>             // write null marker</div><div class='ctx'>             out &lt;&lt; (quint32)0xffffffff;</div><div class='hunk'>@@ -7662,6 +7703,7 @@ QDataStream &amp;operator&gt;&gt;(QDataStream &amp;in, QString &amp;str)</div><div class='ctx'>     Use the startsWith(QString, Qt::CaseSensitive) overload instead.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> /*!</div><div class='ctx'>     \fn bool QString::endsWith(const QString &amp;s, bool cs) const</div><div class='ctx'> </div><div class='hunk'>@@ -8367,4 +8409,717 @@ QStringRef QString::midRef(int position, int n) const</div><div class='ctx'>     return QStringRef(this, position, n);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*!</div><div class='add'>+  \since 4.8</div><div class='add'>+</div><div class='add'>+  Returns the index position of the first occurrence of the string \a</div><div class='add'>+  str in this string reference, searching forward from index position</div><div class='add'>+  \a from. Returns -1 if \a str is not found.</div><div class='add'>+</div><div class='add'>+  If \a cs is Qt::CaseSensitive (default), the search is case</div><div class='add'>+  sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+  If \a from is -1, the search starts at the last character; if it is</div><div class='add'>+  -2, at the next to last character and so on.</div><div class='add'>+</div><div class='add'>+  \sa QString::indexOf(), lastIndexOf(), contains(), count()</div><div class='add'>+*/</div><div class='add'>+int QStringRef::indexOf(const QString &amp;str, int from, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qFindString(unicode(), length(), from, str.unicode(), str.length(), cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload indexOf()</div><div class='add'>+</div><div class='add'>+    Returns the index position of the first occurrence of the</div><div class='add'>+    character \a ch in the string reference, searching forward from</div><div class='add'>+    index position \a from. Returns -1 if \a ch could not be found.</div><div class='add'>+</div><div class='add'>+    \sa QString::indexOf(), lastIndexOf(), contains(), count()</div><div class='add'>+*/</div><div class='add'>+int QStringRef::indexOf(QChar ch, int from, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return findChar(unicode(), length(), ch, from, cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+  \since 4.8</div><div class='add'>+</div><div class='add'>+  Returns the index position of the first occurrence of the string \a</div><div class='add'>+  str in this string reference, searching forward from index position</div><div class='add'>+  \a from. Returns -1 if \a str is not found.</div><div class='add'>+</div><div class='add'>+  If \a cs is Qt::CaseSensitive (default), the search is case</div><div class='add'>+  sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+  If \a from is -1, the search starts at the last character; if it is</div><div class='add'>+  -2, at the next to last character and so on.</div><div class='add'>+</div><div class='add'>+  \sa QString::indexOf(), lastIndexOf(), contains(), count()</div><div class='add'>+*/</div><div class='add'>+int QStringRef::indexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qt_find_latin1_string(unicode(), size(), str, from, cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    \overload indexOf()</div><div class='add'>+</div><div class='add'>+    Returns the index position of the first occurrence of the string</div><div class='add'>+    reference \a str in this string reference, searching forward from</div><div class='add'>+    index position \a from. Returns -1 if \a str is not found.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is case</div><div class='add'>+    sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+    \sa QString::indexOf(), lastIndexOf(), contains(), count()</div><div class='add'>+*/</div><div class='add'>+int QStringRef::indexOf(const QStringRef &amp;str, int from, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qFindString(unicode(), size(), from, str.unicode(), str.size(), cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+  \since 4.8</div><div class='add'>+</div><div class='add'>+  Returns the index position of the last occurrence of the string \a</div><div class='add'>+  str in this string reference, searching backward from index position</div><div class='add'>+  \a from. If \a from is -1 (default), the search starts at the last</div><div class='add'>+  character; if \a from is -2, at the next to last character and so</div><div class='add'>+  on. Returns -1 if \a str is not found.</div><div class='add'>+</div><div class='add'>+  If \a cs is Qt::CaseSensitive (default), the search is case</div><div class='add'>+  sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+  \sa QString::lastIndexOf(), indexOf(), contains(), count()</div><div class='add'>+*/</div><div class='add'>+int QStringRef::lastIndexOf(const QString &amp;str, int from, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    const int sl = str.size();</div><div class='add'>+    if (sl == 1)</div><div class='add'>+        return lastIndexOf(str.at(0), from, cs);</div><div class='add'>+</div><div class='add'>+    const int l = size();;</div><div class='add'>+    if (from &lt; 0)</div><div class='add'>+        from += l;</div><div class='add'>+    int delta = l - sl;</div><div class='add'>+    if (from == l &amp;&amp; sl == 0)</div><div class='add'>+        return from;</div><div class='add'>+    if (from &lt; 0 || from &gt;= l || delta &lt; 0)</div><div class='add'>+        return -1;</div><div class='add'>+    if (from &gt; delta)</div><div class='add'>+        from = delta;</div><div class='add'>+</div><div class='add'>+    return lastIndexOfHelper(reinterpret_cast&lt;const ushort*&gt;(unicode()), from,</div><div class='add'>+                             reinterpret_cast&lt;const ushort*&gt;(str.unicode()), str.size(), cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+  \since 4.8</div><div class='add'>+  \overload lastIndexOf()</div><div class='add'>+</div><div class='add'>+  Returns the index position of the last occurrence of the character</div><div class='add'>+  \a ch, searching backward from position \a from.</div><div class='add'>+</div><div class='add'>+  \sa QString::lastIndexOf(), indexOf(), contains(), count()</div><div class='add'>+*/</div><div class='add'>+int QStringRef::lastIndexOf(QChar ch, int from, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qt_last_index_of(unicode(), size(), ch, from, cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+  \since 4.8</div><div class='add'>+  \overload lastIndexOf()</div><div class='add'>+</div><div class='add'>+  Returns the index position of the last occurrence of the string \a</div><div class='add'>+  str in this string reference, searching backward from index position</div><div class='add'>+  \a from. If \a from is -1 (default), the search starts at the last</div><div class='add'>+  character; if \a from is -2, at the next to last character and so</div><div class='add'>+  on. Returns -1 if \a str is not found.</div><div class='add'>+</div><div class='add'>+  If \a cs is Qt::CaseSensitive (default), the search is case</div><div class='add'>+  sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+  \sa QString::lastIndexOf(), indexOf(), contains(), count()</div><div class='add'>+*/</div><div class='add'>+int QStringRef::lastIndexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    const int sl = qstrlen(str.latin1());</div><div class='add'>+    if (sl == 1)</div><div class='add'>+        return lastIndexOf(QLatin1Char(str.latin1()[0]), from, cs);</div><div class='add'>+</div><div class='add'>+    const int l = size();</div><div class='add'>+    if (from &lt; 0)</div><div class='add'>+        from += l;</div><div class='add'>+    int delta = l - sl;</div><div class='add'>+    if (from == l &amp;&amp; sl == 0)</div><div class='add'>+        return from;</div><div class='add'>+    if (from &lt; 0 || from &gt;= l || delta &lt; 0)</div><div class='add'>+        return -1;</div><div class='add'>+    if (from &gt; delta)</div><div class='add'>+        from = delta;</div><div class='add'>+</div><div class='add'>+    QVarLengthArray&lt;ushort&gt; s(sl);</div><div class='add'>+    for (int i = 0; i &lt; sl; ++i)</div><div class='add'>+        s[i] = str.latin1()[i];</div><div class='add'>+</div><div class='add'>+    return lastIndexOfHelper(reinterpret_cast&lt;const ushort*&gt;(unicode()), from, s.data(), sl, cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+  \since 4.8</div><div class='add'>+  \overload lastIndexOf()</div><div class='add'>+</div><div class='add'>+  Returns the index position of the last occurrence of the string</div><div class='add'>+  reference \a str in this string reference, searching backward from</div><div class='add'>+  index position \a from. If \a from is -1 (default), the search</div><div class='add'>+  starts at the last character; if \a from is -2, at the next to last</div><div class='add'>+  character and so on. Returns -1 if \a str is not found.</div><div class='add'>+</div><div class='add'>+  If \a cs is Qt::CaseSensitive (default), the search is case</div><div class='add'>+  sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+  \sa QString::lastIndexOf(), indexOf(), contains(), count()</div><div class='add'>+*/</div><div class='add'>+int QStringRef::lastIndexOf(const QStringRef &amp;str, int from, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    const int sl = str.size();</div><div class='add'>+    if (sl == 1)</div><div class='add'>+        return lastIndexOf(str.at(0), from, cs);</div><div class='add'>+</div><div class='add'>+    const int l = size();</div><div class='add'>+    if (from &lt; 0)</div><div class='add'>+        from += l;</div><div class='add'>+    int delta = l - sl;</div><div class='add'>+    if (from == l &amp;&amp; sl == 0)</div><div class='add'>+        return from;</div><div class='add'>+    if (from &lt; 0 || from &gt;= l || delta &lt; 0)</div><div class='add'>+        return -1;</div><div class='add'>+    if (from &gt; delta)</div><div class='add'>+        from = delta;</div><div class='add'>+</div><div class='add'>+    return lastIndexOfHelper(reinterpret_cast&lt;const ushort*&gt;(unicode()), from,</div><div class='add'>+                             reinterpret_cast&lt;const ushort*&gt;(str.unicode()),</div><div class='add'>+                             str.size(), cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    Returns the number of (potentially overlapping) occurrences of</div><div class='add'>+    the string \a str in this string reference.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is</div><div class='add'>+    case sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+    \sa QString::count(), contains(), indexOf()</div><div class='add'>+*/</div><div class='add'>+int QStringRef::count(const QString &amp;str, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qt_string_count(unicode(), size(), str.unicode(), str.size(), cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload count()</div><div class='add'>+</div><div class='add'>+    Returns the number of occurrences of the character \a ch in the</div><div class='add'>+    string reference.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is</div><div class='add'>+    case sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+    \sa QString::count(), contains(), indexOf()</div><div class='add'>+*/</div><div class='add'>+int QStringRef::count(QChar ch, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qt_string_count(unicode(), size(), ch, cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload count()</div><div class='add'>+</div><div class='add'>+    Returns the number of (potentially overlapping) occurrences of the</div><div class='add'>+    string reference \a str in this string reference.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is</div><div class='add'>+    case sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+    \sa QString::count(), contains(), indexOf()</div><div class='add'>+*/</div><div class='add'>+int QStringRef::count(const QStringRef &amp;str, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qt_string_count(unicode(), size(), str.unicode(), str.size(), cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns true if the string reference starts with \a str; otherwise</div><div class='add'>+    returns false.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is</div><div class='add'>+    case sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+    \sa QString::startsWith(), endsWith()</div><div class='add'>+*/</div><div class='add'>+bool QStringRef::startsWith(const QString &amp;str, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qt_starts_with(isNull() ? 0 : unicode(), size(),</div><div class='add'>+                          str.isNull() ? 0 : str.unicode(), str.size(), cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload startsWith()</div><div class='add'>+    \sa QString::startsWith(), endsWith()</div><div class='add'>+*/</div><div class='add'>+bool QStringRef::startsWith(QLatin1String str, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qt_starts_with(isNull() ? 0 : unicode(), size(), str, cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload startsWith()</div><div class='add'>+    \sa QString::startsWith(), endsWith()</div><div class='add'>+*/</div><div class='add'>+bool QStringRef::startsWith(const QStringRef &amp;str, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qt_starts_with(isNull() ? 0 : unicode(), size(),</div><div class='add'>+                          str.isNull() ? 0 : str.unicode(), str.size(), cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload startsWith()</div><div class='add'>+</div><div class='add'>+    Returns true if the string reference starts with \a ch; otherwise</div><div class='add'>+    returns false.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is case</div><div class='add'>+    sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+    \sa QString::startsWith(), endsWith()</div><div class='add'>+*/</div><div class='add'>+bool QStringRef::startsWith(QChar ch, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    if (!isEmpty()) {</div><div class='add'>+        const ushort *data = reinterpret_cast&lt;const ushort*&gt;(unicode());</div><div class='add'>+        return (cs == Qt::CaseSensitive</div><div class='add'>+                ? data[0] == ch</div><div class='add'>+                : foldCase(data[0]) == foldCase(ch.unicode()));</div><div class='add'>+    } else {</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    Returns true if the string reference ends with \a str; otherwise</div><div class='add'>+    returns false.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is case</div><div class='add'>+    sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+    \sa QString::endsWith(), startsWith()</div><div class='add'>+*/</div><div class='add'>+bool QStringRef::endsWith(const QString &amp;str, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qt_ends_with(isNull() ? 0 : unicode(), size(),</div><div class='add'>+                        str.isNull() ? 0 : str.unicode(), str.size(), cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload endsWith()</div><div class='add'>+</div><div class='add'>+    Returns true if the string reference ends with \a ch; otherwise</div><div class='add'>+    returns false.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is case</div><div class='add'>+    sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+    \sa QString::endsWith(), endsWith()</div><div class='add'>+*/</div><div class='add'>+bool QStringRef::endsWith(QChar ch, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    if (!isEmpty()) {</div><div class='add'>+        const ushort *data = reinterpret_cast&lt;const ushort*&gt;(unicode());</div><div class='add'>+        const int size = length();</div><div class='add'>+        return (cs == Qt::CaseSensitive</div><div class='add'>+                ? data[size - 1] == ch</div><div class='add'>+                : foldCase(data[size - 1]) == foldCase(ch.unicode()));</div><div class='add'>+    } else {</div><div class='add'>+        return false;</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload endsWith()</div><div class='add'>+    \sa QString::endsWith(), endsWith()</div><div class='add'>+*/</div><div class='add'>+bool QStringRef::endsWith(QLatin1String str, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qt_ends_with(isNull() ? 0 : unicode(), size(), str, cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload endsWith()</div><div class='add'>+    \sa QString::endsWith(), endsWith()</div><div class='add'>+*/</div><div class='add'>+bool QStringRef::endsWith(const QStringRef &amp;str, Qt::CaseSensitivity cs) const</div><div class='add'>+{</div><div class='add'>+    return qt_ends_with(isNull() ? 0 : unicode(), size(),</div><div class='add'>+                        str.isNull() ? 0 : str.unicode(), str.size(), cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*! \fn bool QStringRef::contains(const QString &amp;str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const</div><div class='add'>+</div><div class='add'>+    \since 4.8</div><div class='add'>+    Returns true if this string reference contains an occurrence of</div><div class='add'>+    the string \a str; otherwise returns false.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is</div><div class='add'>+    case sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+    \sa indexOf(), count()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn bool QStringRef::contains(QChar ch, Qt::CaseSensitivity cs = Qt::CaseSensitive) const</div><div class='add'>+</div><div class='add'>+    \overload contains()</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns true if this string contains an occurrence of the</div><div class='add'>+    character \a ch; otherwise returns false.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is</div><div class='add'>+    case sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn bool QStringRef::contains(const QStringRef &amp;str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const</div><div class='add'>+    \overload contains()</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns true if this string reference contains an occurrence of</div><div class='add'>+    the string reference \a str; otherwise returns false.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is</div><div class='add'>+    case sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+    \sa indexOf(), count()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn bool QStringRef::contains(QLatin1String str, Qt::CaseSensitivity cs) const</div><div class='add'>+    \since 4,8</div><div class='add'>+    \overload contains()</div><div class='add'>+</div><div class='add'>+    Returns true if this string reference contains an occurrence of</div><div class='add'>+    the string \a str; otherwise returns false.</div><div class='add'>+</div><div class='add'>+    If \a cs is Qt::CaseSensitive (default), the search is</div><div class='add'>+    case sensitive; otherwise the search is case insensitive.</div><div class='add'>+</div><div class='add'>+    \sa indexOf(), count()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+static inline int qt_last_index_of(const QChar *haystack, int haystackLen, const QChar &amp;needle,</div><div class='add'>+                                   int from, Qt::CaseSensitivity cs)</div><div class='add'>+{</div><div class='add'>+    ushort c = needle.unicode();</div><div class='add'>+    if (from &lt; 0)</div><div class='add'>+        from += haystackLen;</div><div class='add'>+    if (from &lt; 0 || from &gt;= haystackLen)</div><div class='add'>+        return -1;</div><div class='add'>+    if (from &gt;= 0) {</div><div class='add'>+        const ushort *b = reinterpret_cast&lt;const ushort*&gt;(haystack);</div><div class='add'>+        const ushort *n = b + from;</div><div class='add'>+        if (cs == Qt::CaseSensitive) {</div><div class='add'>+            for (; n &gt;= b; --n)</div><div class='add'>+                if (*n == c)</div><div class='add'>+                    return n - b;</div><div class='add'>+        } else {</div><div class='add'>+            c = foldCase(c);</div><div class='add'>+            for (; n &gt;= b; --n)</div><div class='add'>+                if (foldCase(*n) == c)</div><div class='add'>+                    return n - b;</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    return -1;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int qt_string_count(const QChar *haystack, int haystackLen,</div><div class='add'>+                                  const QChar *needle, int needleLen,</div><div class='add'>+                                  Qt::CaseSensitivity cs)</div><div class='add'>+{</div><div class='add'>+    int num = 0;</div><div class='add'>+    int i = -1;</div><div class='add'>+    if (haystackLen &gt; 500 &amp;&amp; needleLen &gt; 5) {</div><div class='add'>+        QStringMatcher matcher(needle, needleLen, cs);</div><div class='add'>+        while ((i = matcher.indexIn(haystack, haystackLen, i + 1)) != -1)</div><div class='add'>+            ++num;</div><div class='add'>+    } else {</div><div class='add'>+        while ((i = qFindString(haystack, haystackLen, i + 1, needle, needleLen, cs)) != -1)</div><div class='add'>+            ++num;</div><div class='add'>+    }</div><div class='add'>+    return num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int qt_string_count(const QChar *unicode, int size, const QChar &amp;ch,</div><div class='add'>+                                  Qt::CaseSensitivity cs)</div><div class='add'>+{</div><div class='add'>+    ushort c = ch.unicode();</div><div class='add'>+    int num = 0;</div><div class='add'>+    const ushort *b = reinterpret_cast&lt;const ushort*&gt;(unicode);</div><div class='add'>+    const ushort *i = b + size;</div><div class='add'>+    if (cs == Qt::CaseSensitive) {</div><div class='add'>+        while (i != b)</div><div class='add'>+            if (*--i == c)</div><div class='add'>+                ++num;</div><div class='add'>+    } else {</div><div class='add'>+        c = foldCase(c);</div><div class='add'>+        while (i != b)</div><div class='add'>+            if (foldCase(*(--i)) == c)</div><div class='add'>+                ++num;</div><div class='add'>+    }</div><div class='add'>+    return num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int qt_find_latin1_string(const QChar *haystack, int size,</div><div class='add'>+                                        const QLatin1String &amp;needle,</div><div class='add'>+                                        int from, Qt::CaseSensitivity cs)</div><div class='add'>+{</div><div class='add'>+    const char *latin1 = needle.latin1();</div><div class='add'>+    int len = qstrlen(latin1);</div><div class='add'>+    QVarLengthArray&lt;ushort&gt; s(len);</div><div class='add'>+    for (int i = 0; i &lt; len; ++i)</div><div class='add'>+        s[i] = latin1[i];</div><div class='add'>+</div><div class='add'>+    return qFindString(haystack, size, from,</div><div class='add'>+                       reinterpret_cast&lt;const QChar*&gt;(s.constData()), len, cs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool qt_starts_with(const QChar *haystack, int haystackLen,</div><div class='add'>+                                  const QChar *needle, int needleLen, Qt::CaseSensitivity cs)</div><div class='add'>+{</div><div class='add'>+    if (!haystack)</div><div class='add'>+        return !needle;</div><div class='add'>+    if (haystackLen == 0)</div><div class='add'>+        return needleLen == 0;</div><div class='add'>+    if (needleLen &gt; haystackLen)</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+    const ushort *h = reinterpret_cast&lt;const ushort*&gt;(haystack);</div><div class='add'>+    const ushort *n = reinterpret_cast&lt;const ushort*&gt;(needle);</div><div class='add'>+</div><div class='add'>+    if (cs == Qt::CaseSensitive) {</div><div class='add'>+        return qMemEquals(h, n, needleLen);</div><div class='add'>+    } else {</div><div class='add'>+        uint last = 0;</div><div class='add'>+        uint olast = 0;</div><div class='add'>+        for (int i = 0; i &lt; needleLen; ++i)</div><div class='add'>+            if (foldCase(h[i], last) != foldCase(n[i], olast))</div><div class='add'>+                return false;</div><div class='add'>+    }</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool qt_starts_with(const QChar *haystack, int haystackLen,</div><div class='add'>+                                  const QLatin1String &amp;needle, Qt::CaseSensitivity cs)</div><div class='add'>+{</div><div class='add'>+    if (!haystack)</div><div class='add'>+        return !needle.latin1();</div><div class='add'>+    if (haystackLen == 0)</div><div class='add'>+        return !needle.latin1() || *needle.latin1() == 0;</div><div class='add'>+    const int slen = qstrlen(needle.latin1());</div><div class='add'>+    if (slen &gt; haystackLen)</div><div class='add'>+        return false;</div><div class='add'>+    const ushort *data = reinterpret_cast&lt;const ushort*&gt;(haystack);</div><div class='add'>+    const uchar *latin = reinterpret_cast&lt;const uchar*&gt;(needle.latin1());</div><div class='add'>+    if (cs == Qt::CaseSensitive) {</div><div class='add'>+        for (int i = 0; i &lt; slen; ++i)</div><div class='add'>+            if (data[i] != latin[i])</div><div class='add'>+                return false;</div><div class='add'>+    } else {</div><div class='add'>+        for (int i = 0; i &lt; slen; ++i)</div><div class='add'>+            if (foldCase(data[i]) != foldCase((ushort)latin[i]))</div><div class='add'>+                return false;</div><div class='add'>+    }</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool qt_ends_with(const QChar *haystack, int haystackLen,</div><div class='add'>+                                const QChar *needle, int needleLen, Qt::CaseSensitivity cs)</div><div class='add'>+{</div><div class='add'>+    if (!haystack)</div><div class='add'>+        return !needle;</div><div class='add'>+    if (haystackLen == 0)</div><div class='add'>+        return needleLen == 0;</div><div class='add'>+    const int pos = haystackLen - needleLen;</div><div class='add'>+    if (pos &lt; 0)</div><div class='add'>+        return false;</div><div class='add'>+</div><div class='add'>+    const ushort *h = reinterpret_cast&lt;const ushort*&gt;(haystack);</div><div class='add'>+    const ushort *n = reinterpret_cast&lt;const ushort*&gt;(needle);</div><div class='add'>+</div><div class='add'>+    if (cs == Qt::CaseSensitive) {</div><div class='add'>+        return qMemEquals(h + pos, n, needleLen);</div><div class='add'>+    } else {</div><div class='add'>+        uint last = 0;</div><div class='add'>+        uint olast = 0;</div><div class='add'>+        for (int i = 0; i &lt; needleLen; i++)</div><div class='add'>+            if (foldCase(h[pos+i], last) != foldCase(n[i], olast))</div><div class='add'>+                return false;</div><div class='add'>+    }</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static inline bool qt_ends_with(const QChar *haystack, int haystackLen,</div><div class='add'>+                                const QLatin1String &amp;needle, Qt::CaseSensitivity cs)</div><div class='add'>+{</div><div class='add'>+    if (!haystack)</div><div class='add'>+        return !needle.latin1();</div><div class='add'>+    if (haystackLen == 0)</div><div class='add'>+        return !needle.latin1() || *needle.latin1() == 0;</div><div class='add'>+    const int slen = qstrlen(needle.latin1());</div><div class='add'>+    int pos = haystackLen - slen;</div><div class='add'>+    if (pos &lt; 0)</div><div class='add'>+        return false;</div><div class='add'>+    const uchar *latin = reinterpret_cast&lt;const uchar*&gt;(needle.latin1());</div><div class='add'>+    const ushort *data = reinterpret_cast&lt;const ushort*&gt;(haystack);</div><div class='add'>+    if (cs == Qt::CaseSensitive) {</div><div class='add'>+        for (int i = 0; i &lt; slen; i++)</div><div class='add'>+            if (data[pos+i] != latin[i])</div><div class='add'>+                return false;</div><div class='add'>+    } else {</div><div class='add'>+        for (int i = 0; i &lt; slen; i++)</div><div class='add'>+            if (foldCase(data[pos+i]) != foldCase((ushort)latin[i]))</div><div class='add'>+                return false;</div><div class='add'>+    }</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns a Latin-1 representation of the string as a QByteArray.</div><div class='add'>+</div><div class='add'>+    The returned byte array is undefined if the string contains non-Latin1</div><div class='add'>+    characters. Those characters may be suppressed or replaced with a</div><div class='add'>+    question mark.</div><div class='add'>+</div><div class='add'>+    \sa toAscii(), toUtf8(), toLocal8Bit(), QTextCodec</div><div class='add'>+*/</div><div class='add'>+QByteArray QStringRef::toLatin1() const</div><div class='add'>+{</div><div class='add'>+    return toLatin1_helper(unicode(), length());</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns an 8-bit representation of the string as a QByteArray.</div><div class='add'>+</div><div class='add'>+    If a codec has been set using QTextCodec::setCodecForCStrings(),</div><div class='add'>+    it is used to convert Unicode to 8-bit char; otherwise this</div><div class='add'>+    function does the same as toLatin1().</div><div class='add'>+</div><div class='add'>+    Note that, despite the name, this function does not necessarily return an US-ASCII</div><div class='add'>+    (ANSI X3.4-1986) string and its result may not be US-ASCII compatible.</div><div class='add'>+</div><div class='add'>+    \sa toLatin1(), toUtf8(), toLocal8Bit(), QTextCodec</div><div class='add'>+*/</div><div class='add'>+QByteArray QStringRef::toAscii() const</div><div class='add'>+{</div><div class='add'>+#ifndef QT_NO_TEXTCODEC</div><div class='add'>+    if (QString::codecForCStrings)</div><div class='add'>+        return QString::codecForCStrings-&gt;fromUnicode(unicode(), length());</div><div class='add'>+#endif // QT_NO_TEXTCODEC</div><div class='add'>+    return toLatin1();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns the local 8-bit representation of the string as a</div><div class='add'>+    QByteArray. The returned byte array is undefined if the string</div><div class='add'>+    contains characters not supported by the local 8-bit encoding.</div><div class='add'>+</div><div class='add'>+    QTextCodec::codecForLocale() is used to perform the conversion from</div><div class='add'>+    Unicode. If the locale encoding could not be determined, this function</div><div class='add'>+    does the same as toLatin1().</div><div class='add'>+</div><div class='add'>+    If this string contains any characters that cannot be encoded in the</div><div class='add'>+    locale, the returned byte array is undefined. Those characters may be</div><div class='add'>+    suppressed or replaced by another.</div><div class='add'>+</div><div class='add'>+    \sa toAscii(), toLatin1(), toUtf8(), QTextCodec</div><div class='add'>+*/</div><div class='add'>+QByteArray QStringRef::toLocal8Bit() const</div><div class='add'>+{</div><div class='add'>+#ifndef QT_NO_TEXTCODEC</div><div class='add'>+    if (QTextCodec::codecForLocale())</div><div class='add'>+        return QTextCodec::codecForLocale()-&gt;fromUnicode(unicode(), length());</div><div class='add'>+#endif // QT_NO_TEXTCODEC</div><div class='add'>+    return toLatin1();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns a UTF-8 representation of the string as a QByteArray.</div><div class='add'>+</div><div class='add'>+    UTF-8 is a Unicode codec and can represent all characters in a Unicode</div><div class='add'>+    string like QString.</div><div class='add'>+</div><div class='add'>+    However, in the Unicode range, there are certain codepoints that are not</div><div class='add'>+    considered characters. The Unicode standard reserves the last two</div><div class='add'>+    codepoints in each Unicode Plane (U+FFFE, U+FFFF, U+1FFFE, U+1FFFF,</div><div class='add'>+    U+2FFFE, etc.), as well as 16 codepoints in the range U+FDD0..U+FDDF,</div><div class='add'>+    inclusive, as non-characters. If any of those appear in the string, they</div><div class='add'>+    may be discarded and will not appear in the UTF-8 representation, or they</div><div class='add'>+    may be replaced by one or more replacement characters.</div><div class='add'>+</div><div class='add'>+    \sa toAscii(), toLatin1(), toLocal8Bit(), QTextCodec</div><div class='add'>+*/</div><div class='add'>+QByteArray QStringRef::toUtf8() const</div><div class='add'>+{</div><div class='add'>+    if (isNull())</div><div class='add'>+        return QByteArray();</div><div class='add'>+</div><div class='add'>+    return QUtf8::convertFromUnicode(constData(), length(), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*!</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns a UCS-4/UTF-32 representation of the string as a QVector&lt;uint&gt;.</div><div class='add'>+</div><div class='add'>+    UCS-4 is a Unicode codec and is lossless. All characters from this string</div><div class='add'>+    can be encoded in UCS-4.</div><div class='add'>+</div><div class='add'>+    \sa fromUtf8(), toAscii(), toLatin1(), toLocal8Bit(), QTextCodec, fromUcs4(), toWCharArray()</div><div class='add'>+*/</div><div class='add'>+QVector&lt;uint&gt; QStringRef::toUcs4() const</div><div class='add'>+{</div><div class='add'>+    QVector&lt;uint&gt; v(length());</div><div class='add'>+    uint *a = v.data();</div><div class='add'>+    int len = toUcs4_helper&lt;uint&gt;(reinterpret_cast&lt;const unsigned short *&gt;(unicode()), length(), a);</div><div class='add'>+    v.resize(len);</div><div class='add'>+    return v;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h<br/>index ff8d9de..c61d09e 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qstring.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qstring.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qstring.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qstring.h</a></div><div class='hunk'>@@ -51,14 +51,7 @@</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_STL</div><div class='del'>-#  if defined (Q_CC_MSVC_NET) &amp;&amp; _MSC_VER &lt; 1310 // Avoids nasty warning for xlocale, line 450</div><div class='del'>-#    pragma warning (push)</div><div class='del'>-#    pragma warning (disable : 4189)</div><div class='del'>-#    include &lt;string&gt;</div><div class='del'>-#    pragma warning (pop)</div><div class='del'>-#  else</div><div class='del'>-#    include &lt;string&gt;</div><div class='del'>-#  endif</div><div class='add'>+#  include &lt;string&gt;</div><div class='ctx'> </div><div class='ctx'> #  ifndef QT_NO_STL_WCHAR</div><div class='ctx'> // workaround for some headers not typedef'ing std::wstring</div><div class='hunk'>@@ -73,16 +66,6 @@ typedef std::basic_string&lt;wchar_t&gt; QStdWString;</div><div class='ctx'> #error qstring.h must be included before any header file that defines truncate</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(Q_CC_GNU) &amp;&amp; (__GNUC__ == 4 &amp;&amp; __GNUC_MINOR__ == 0)</div><div class='del'>-//There is a bug in GCC 4.0 that tries to instantiate template of annonymous enum</div><div class='del'>-#  ifdef QT_USE_FAST_OPERATOR_PLUS</div><div class='del'>-#    undef QT_USE_FAST_OPERATOR_PLUS</div><div class='del'>-#  endif</div><div class='del'>-#  ifdef QT_USE_FAST_CONCATENATION</div><div class='del'>-#    undef QT_USE_FAST_CONCATENATION</div><div class='del'>-#  endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> QT_BEGIN_HEADER</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='hunk'>@@ -111,7 +94,11 @@ public:</div><div class='ctx'>     QString &amp;operator=(QChar c);</div><div class='ctx'>     QString &amp;operator=(const QString &amp;);</div><div class='ctx'>     inline QString &amp;operator=(const QLatin1String &amp;);</div><div class='del'>-</div><div class='add'>+#ifdef Q_COMPILER_RVALUE_REFS</div><div class='add'>+    inline QString &amp;operator=(QString &amp;&amp;other)</div><div class='add'>+    { qSwap(d, other.d); return *this; }</div><div class='add'>+#endif</div><div class='add'>+    inline void swap(QString &amp;other) { qSwap(d, other.d); }</div><div class='ctx'>     inline int size() const { return d-&gt;size; }</div><div class='ctx'>     inline int count() const { return d-&gt;size; }</div><div class='ctx'>     inline int length() const;</div><div class='hunk'>@@ -198,14 +185,18 @@ public:</div><div class='ctx'>     int indexOf(QChar c, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='ctx'>     int indexOf(const QString &amp;s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='ctx'>     int indexOf(const QLatin1String &amp;s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    int indexOf(const QStringRef &amp;s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='ctx'>     int lastIndexOf(QChar c, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='ctx'>     int lastIndexOf(const QString &amp;s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='ctx'>     int lastIndexOf(const QLatin1String &amp;s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    int lastIndexOf(const QStringRef &amp;s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='ctx'> </div><div class='ctx'>     inline QBool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='ctx'>     inline QBool contains(const QString &amp;s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    inline QBool contains(const QStringRef &amp;s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='ctx'>     int count(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='ctx'>     int count(const QString &amp;s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    int count(const QStringRef &amp;s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_REGEXP</div><div class='ctx'>     int indexOf(const QRegExp &amp;, int from = 0) const;</div><div class='hunk'>@@ -241,9 +232,11 @@ public:</div><div class='ctx'>     QStringRef midRef(int position, int n = -1) const Q_REQUIRED_RESULT;</div><div class='ctx'> </div><div class='ctx'>     bool startsWith(const QString &amp;s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    bool startsWith(const QStringRef &amp;s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='ctx'>     bool startsWith(const QLatin1String &amp;s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='ctx'>     bool startsWith(const QChar &amp;c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='ctx'>     bool endsWith(const QString &amp;s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    bool endsWith(const QStringRef &amp;s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='ctx'>     bool endsWith(const QLatin1String &amp;s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='ctx'>     bool endsWith(const QChar &amp;c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='ctx'> </div><div class='hunk'>@@ -482,6 +475,9 @@ public:</div><div class='ctx'>     const_iterator constEnd() const;</div><div class='ctx'> </div><div class='ctx'>     // STL compatibility</div><div class='add'>+    typedef const QChar &amp; const_reference;</div><div class='add'>+    typedef QChar &amp; reference;</div><div class='add'>+    typedef QChar value_type;</div><div class='ctx'>     inline void push_back(QChar c) { append(c); }</div><div class='ctx'>     inline void push_back(const QString &amp;s) { append(s); }</div><div class='ctx'>     inline void push_front(QChar c) { prepend(c); }</div><div class='hunk'>@@ -699,9 +695,9 @@ inline QString::QString(const QLatin1String &amp;aLatin1) : d(fromLatin1_helper(aLat</div><div class='ctx'> inline int QString::length() const</div><div class='ctx'> { return d-&gt;size; }</div><div class='ctx'> inline const QChar QString::at(int i) const</div><div class='del'>-{ Q_ASSERT(i &gt;= 0 &amp;&amp; i &lt; size()); return d-&gt;data[i]; }</div><div class='add'>+{ Q_ASSERT(uint(i) &lt; uint(size())); return d-&gt;data[i]; }</div><div class='ctx'> inline const QChar QString::operator[](int i) const</div><div class='del'>-{ Q_ASSERT(i &gt;= 0 &amp;&amp; i &lt; size()); return d-&gt;data[i]; }</div><div class='add'>+{ Q_ASSERT(uint(i) &lt; uint(size())); return d-&gt;data[i]; }</div><div class='ctx'> inline const QChar QString::operator[](uint i) const</div><div class='ctx'> { Q_ASSERT(i &lt; uint(size())); return d-&gt;data[i]; }</div><div class='ctx'> inline bool QString::isEmpty() const</div><div class='hunk'>@@ -902,6 +898,8 @@ inline QString::const_iterator QString::constEnd() const</div><div class='ctx'> { return reinterpret_cast&lt;const QChar*&gt;(d-&gt;data + d-&gt;size); }</div><div class='ctx'> inline QBool QString::contains(const QString &amp;s, Qt::CaseSensitivity cs) const</div><div class='ctx'> { return QBool(indexOf(s, 0, cs) != -1); }</div><div class='add'>+inline QBool QString::contains(const QStringRef &amp;s, Qt::CaseSensitivity cs) const</div><div class='add'>+{ return QBool(indexOf(s, 0, cs) != -1); }</div><div class='ctx'> inline QBool QString::contains(QChar c, Qt::CaseSensitivity cs) const</div><div class='ctx'> { return QBool(indexOf(c, 0, cs) != -1); }</div><div class='ctx'> </div><div class='hunk'>@@ -1018,8 +1016,7 @@ inline int QByteArray::findRev(const QString &amp;s, int from) const</div><div class='ctx'> #  endif // QT3_SUPPORT</div><div class='ctx'> #endif // QT_NO_CAST_TO_ASCII</div><div class='ctx'> </div><div class='del'>-#ifndef QT_USE_FAST_OPERATOR_PLUS</div><div class='del'>-# ifndef QT_USE_FAST_CONCATENATION</div><div class='add'>+#if !defined(QT_USE_FAST_OPERATOR_PLUS) &amp;&amp; !defined(QT_USE_QSTRINGBUILDER)</div><div class='ctx'> inline const QString operator+(const QString &amp;s1, const QString &amp;s2)</div><div class='ctx'> { QString t(s1); t += s2; return t; }</div><div class='ctx'> inline const QString operator+(const QString &amp;s1, QChar s2)</div><div class='hunk'>@@ -1040,8 +1037,7 @@ inline QT_ASCII_CAST_WARN const QString operator+(const QByteArray &amp;ba, const QS</div><div class='ctx'> inline QT_ASCII_CAST_WARN const QString operator+(const QString &amp;s, const QByteArray &amp;ba)</div><div class='ctx'> { QString t(s); t += QString::fromAscii(ba.constData(), qstrnlen(ba.constData(), ba.size())); return t; }</div><div class='ctx'> #  endif // QT_NO_CAST_FROM_ASCII</div><div class='del'>-# endif // QT_USE_FAST_CONCATENATION</div><div class='del'>-#endif // QT_USE_FAST_OPERATOR_PLUS</div><div class='add'>+#endif // QT_USE_QSTRINGBUILDER</div><div class='ctx'> </div><div class='ctx'> #ifndef QT_NO_STL</div><div class='ctx'> inline std::string QString::toStdString() const</div><div class='hunk'>@@ -1123,6 +1119,34 @@ public:</div><div class='ctx'>         m_size = other.m_size; return *this;</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='add'>+    int indexOf(const QString &amp;str, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    int indexOf(QChar ch, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    int indexOf(QLatin1String str, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    int indexOf(const QStringRef &amp;str, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    int lastIndexOf(const QString &amp;str, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    int lastIndexOf(QChar ch, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    int lastIndexOf(QLatin1String str, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    int lastIndexOf(const QStringRef &amp;str, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+</div><div class='add'>+    inline QBool contains(const QString &amp;str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    inline QBool contains(QChar ch, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    inline QBool contains(QLatin1String str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    inline QBool contains(const QStringRef &amp;str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+</div><div class='add'>+    int count(const QString &amp;s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    int count(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    int count(const QStringRef &amp;s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+</div><div class='add'>+    bool startsWith(const QString &amp;s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    bool startsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    bool startsWith(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    bool startsWith(const QStringRef &amp;c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+</div><div class='add'>+    bool endsWith(const QString &amp;s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    bool endsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    bool endsWith(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+    bool endsWith(const QStringRef &amp;c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const;</div><div class='add'>+</div><div class='ctx'>     inline QStringRef &amp;operator=(const QString *string);</div><div class='ctx'> </div><div class='ctx'>     inline const QChar *unicode() const {</div><div class='hunk'>@@ -1133,6 +1157,12 @@ public:</div><div class='ctx'>     inline const QChar *data() const { return unicode(); }</div><div class='ctx'>     inline const QChar *constData() const {  return unicode(); }</div><div class='ctx'> </div><div class='add'>+    QByteArray toAscii() const Q_REQUIRED_RESULT;</div><div class='add'>+    QByteArray toLatin1() const Q_REQUIRED_RESULT;</div><div class='add'>+    QByteArray toUtf8() const Q_REQUIRED_RESULT;</div><div class='add'>+    QByteArray toLocal8Bit() const Q_REQUIRED_RESULT;</div><div class='add'>+    QVector&lt;uint&gt; toUcs4() const Q_REQUIRED_RESULT;</div><div class='add'>+</div><div class='ctx'>     inline void clear() { m_string = 0; m_position = m_size = 0; }</div><div class='ctx'>     QString toString() const;</div><div class='ctx'>     inline bool isEmpty() const { return m_size == 0; }</div><div class='hunk'>@@ -1241,12 +1271,22 @@ inline int QStringRef::localeAwareCompare(const QStringRef &amp;s1, const QString &amp;s</div><div class='ctx'> inline int QStringRef::localeAwareCompare(const QStringRef &amp;s1, const QStringRef &amp;s2)</div><div class='ctx'> { return QString::localeAwareCompare_helper(s1.constData(), s1.length(), s2.constData(), s2.length()); }</div><div class='ctx'> </div><div class='add'>+inline QBool QStringRef::contains(const QString &amp;s, Qt::CaseSensitivity cs) const</div><div class='add'>+{ return QBool(indexOf(s, 0, cs) != -1); }</div><div class='add'>+inline QBool QStringRef::contains(QLatin1String s, Qt::CaseSensitivity cs) const</div><div class='add'>+{ return QBool(indexOf(s, 0, cs) != -1); }</div><div class='add'>+inline QBool QStringRef::contains(QChar c, Qt::CaseSensitivity cs) const</div><div class='add'>+{ return QBool(indexOf(c, 0, cs) != -1); }</div><div class='add'>+inline QBool QStringRef::contains(const QStringRef &amp;s, Qt::CaseSensitivity cs) const</div><div class='add'>+{ return QBool(indexOf(s, 0, cs) != -1); }</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> QT_END_HEADER</div><div class='ctx'> </div><div class='del'>-#ifdef QT_USE_FAST_CONCATENATION</div><div class='add'>+#if defined(QT_USE_FAST_OPERATOR_PLUS) || defined(QT_USE_QSTRINGBUILDER)</div><div class='ctx'> #include &lt;QtCore/qstringbuilder.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/tools/qstringbuilder.cpp<br/>index dfd9a0a..fb06736 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qstringbuilder.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qstringbuilder.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qstringbuilder.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qstringbuilder.cpp</a></div><div class='hunk'>@@ -40,6 +40,7 @@</div><div class='ctx'> ****************************************************************************/</div><div class='ctx'> </div><div class='ctx'> #include "qstringbuilder.h"</div><div class='add'>+#include &lt;QtCore/qtextcodec.h&gt;</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_NAMESPACE</div><div class='ctx'> </div><div class='hunk'>@@ -146,12 +147,14 @@ QT_BEGIN_NAMESPACE</div><div class='ctx'>     Converts the \c QLatin1Literal into a \c QString object.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-/*! \internal */</div><div class='add'>+/*! \internal</div><div class='add'>+   Note: The len contains the ending \0</div><div class='add'>+ */</div><div class='ctx'> void QAbstractConcatenable::convertFromAscii(const char *a, int len, QChar *&amp;out)</div><div class='ctx'> {</div><div class='ctx'> #ifndef QT_NO_TEXTCODEC</div><div class='del'>-    if (QString::codecForCStrings) {</div><div class='del'>-        QString tmp = QString::fromAscii(a);</div><div class='add'>+    if (QString::codecForCStrings &amp;&amp; len) {</div><div class='add'>+        QString tmp = QString::fromAscii(a, len &gt; 0 ? len - 1 : -1);</div><div class='ctx'>         memcpy(out, reinterpret_cast&lt;const char *&gt;(tmp.constData()), sizeof(QChar) * tmp.size());</div><div class='ctx'>         out += tmp.length();</div><div class='ctx'>         return;</div><div class='hunk'>@@ -166,4 +169,25 @@ void QAbstractConcatenable::convertFromAscii(const char *a, int len, QChar *&amp;out</div><div class='ctx'>     }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*! \internal */</div><div class='add'>+void QAbstractConcatenable::convertToAscii(const QChar* a, int len, char*&amp; out) </div><div class='add'>+{</div><div class='add'>+#ifndef QT_NO_TEXTCODEC</div><div class='add'>+    if (QString::codecForCStrings) {</div><div class='add'>+        QByteArray tmp = QString::codecForCStrings-&gt;fromUnicode(a, len);</div><div class='add'>+        memcpy(out, tmp.constData(), tmp.size());</div><div class='add'>+        out += tmp.length();</div><div class='add'>+        return;</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    if (len == -1) {</div><div class='add'>+        while (a-&gt;unicode())</div><div class='add'>+            convertToLatin1(*a++, out);</div><div class='add'>+    } else {</div><div class='add'>+        for (int i = 0; i &lt; len; ++i)</div><div class='add'>+            convertToLatin1(a[i], out);</div><div class='add'>+    }</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h<br/>index 1dfb4a2..709d84a 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qstringbuilder.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qstringbuilder.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qstringbuilder.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qstringbuilder.h</a></div><div class='hunk'>@@ -43,6 +43,7 @@</div><div class='ctx'> #define QSTRINGBUILDER_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;QtCore/qstring.h&gt;</div><div class='add'>+#include &lt;QtCore/qbytearray.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if defined(Q_CC_GNU) &amp;&amp; !defined(Q_CC_INTEL)</div><div class='ctx'> #  if __GNUC__ &lt; 4 || (__GNUC__ == 4 &amp;&amp; __GNUC_MINOR__ == 0)</div><div class='hunk'>@@ -78,7 +79,7 @@ struct Q_CORE_EXPORT QAbstractConcatenable</div><div class='ctx'> {</div><div class='ctx'> protected:</div><div class='ctx'>     static void convertFromAscii(const char *a, int len, QChar *&amp;out);</div><div class='del'>-</div><div class='add'>+    static void convertToAscii(const QChar *a, int len, char *&amp;out);</div><div class='ctx'>     static inline void convertFromAscii(char a, QChar *&amp;out)</div><div class='ctx'>     {</div><div class='ctx'> #ifndef QT_NO_TEXTCODEC</div><div class='hunk'>@@ -88,6 +89,21 @@ protected:</div><div class='ctx'> #endif</div><div class='ctx'>             *out++ = QLatin1Char(a);</div><div class='ctx'>     }</div><div class='add'>+</div><div class='add'>+    static inline void convertToAscii(QChar a, char *&amp;out)</div><div class='add'>+    {</div><div class='add'>+#ifndef QT_NO_TEXTCODEC</div><div class='add'>+        if (QString::codecForCStrings)</div><div class='add'>+            *out++ = a.toAscii(); //###</div><div class='add'>+        else</div><div class='add'>+#endif</div><div class='add'>+            convertToLatin1(a, out);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    static inline void convertToLatin1(QChar a, char *&amp;out)</div><div class='add'>+    {</div><div class='add'>+        *out++ = a.unicode() &gt; 0xff ? '?' : char(a.unicode());</div><div class='add'>+    }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> template &lt;typename T&gt; struct QConcatenable {};</div><div class='hunk'>@@ -97,24 +113,33 @@ class QStringBuilder</div><div class='ctx'> {</div><div class='ctx'> public:</div><div class='ctx'>     QStringBuilder(const A &amp;a_, const B &amp;b_) : a(a_), b(b_) {}</div><div class='del'>-</div><div class='del'>-    operator QString() const</div><div class='add'>+private:</div><div class='add'>+    friend class QByteArray;</div><div class='add'>+    friend class QString;</div><div class='add'>+    template &lt;typename T&gt; T convertTo() const</div><div class='ctx'>     {</div><div class='del'>-        const uint size = QConcatenable&lt; QStringBuilder&lt;A, B&gt; &gt;::size(*this);</div><div class='del'>-        QString s(size, Qt::Uninitialized);</div><div class='add'>+        const uint len = QConcatenable&lt; QStringBuilder&lt;A, B&gt; &gt;::size(*this);</div><div class='add'>+        T s(len, Qt::Uninitialized);</div><div class='ctx'> </div><div class='del'>-        QChar *d = s.data();</div><div class='del'>-        const QChar * const start = d;</div><div class='add'>+        typename T::iterator d = s.data();</div><div class='add'>+        typename T::const_iterator const start = d;</div><div class='ctx'>         QConcatenable&lt; QStringBuilder&lt;A, B&gt; &gt;::appendTo(*this, d);</div><div class='ctx'> </div><div class='del'>-        if (!QConcatenable&lt; QStringBuilder&lt;A, B&gt; &gt;::ExactSize &amp;&amp; int(size) != d - start) {</div><div class='add'>+        if (!QConcatenable&lt; QStringBuilder&lt;A, B&gt; &gt;::ExactSize &amp;&amp; int(len) != d - start) {</div><div class='ctx'>             // this resize is necessary since we allocate a bit too much</div><div class='ctx'>             // when dealing with variable sized 8-bit encodings</div><div class='ctx'>             s.resize(d - start);</div><div class='ctx'>         }</div><div class='ctx'>         return s;</div><div class='ctx'>     }</div><div class='del'>-    QByteArray toLatin1() const { return QString(*this).toLatin1(); }</div><div class='add'>+</div><div class='add'>+    typedef QConcatenable&lt;QStringBuilder&lt;A, B&gt; &gt; Concatenable;</div><div class='add'>+    typedef typename Concatenable::ConvertTo ConvertTo;</div><div class='add'>+public:</div><div class='add'>+    operator ConvertTo() const { return convertTo&lt;ConvertTo&gt;(); }</div><div class='add'>+</div><div class='add'>+    QByteArray toLatin1() const { return convertTo&lt;QString&gt;().toLatin1(); }</div><div class='add'>+    int size() const { return Concatenable::size(*this); }</div><div class='ctx'> </div><div class='ctx'>     const A &amp;a;</div><div class='ctx'>     const B &amp;b;</div><div class='hunk'>@@ -134,53 +159,80 @@ class QStringBuilder &lt;QString, QString&gt;</div><div class='ctx'>         const QString &amp;b;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+template &lt;&gt;</div><div class='add'>+class QStringBuilder &lt;QByteArray, QByteArray&gt;</div><div class='add'>+{</div><div class='add'>+    public:</div><div class='add'>+        QStringBuilder(const QByteArray &amp;a_, const QByteArray &amp;b_) : a(a_), b(b_) {}</div><div class='add'>+</div><div class='add'>+        operator QByteArray() const</div><div class='add'>+        { QByteArray r(a); r += b; return r; }</div><div class='add'>+</div><div class='add'>+        const QByteArray &amp;a;</div><div class='add'>+        const QByteArray &amp;b;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> template &lt;&gt; struct QConcatenable&lt;char&gt; : private QAbstractConcatenable</div><div class='ctx'> {</div><div class='ctx'>     typedef char type;</div><div class='add'>+    typedef QByteArray ConvertTo;</div><div class='ctx'>     enum { ExactSize = true };</div><div class='ctx'>     static int size(const char) { return 1; }</div><div class='del'>-    static inline void appendTo(const char c, QChar *&amp;out)</div><div class='add'>+#ifndef QT_NO_CAST_FROM_ASCII</div><div class='add'>+    static inline QT_ASCII_CAST_WARN void appendTo(const char c, QChar *&amp;out)</div><div class='ctx'>     {</div><div class='ctx'>         QAbstractConcatenable::convertFromAscii(c, out);</div><div class='ctx'>     }</div><div class='add'>+#endif</div><div class='add'>+    static inline void appendTo(const char c, char *&amp;out)</div><div class='add'>+    { *out++ = c; }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> template &lt;&gt; struct QConcatenable&lt;QLatin1Char&gt;</div><div class='ctx'> {</div><div class='ctx'>     typedef QLatin1Char type;</div><div class='add'>+    typedef QString ConvertTo;</div><div class='ctx'>     enum { ExactSize = true };</div><div class='ctx'>     static int size(const QLatin1Char) { return 1; }</div><div class='ctx'>     static inline void appendTo(const QLatin1Char c, QChar *&amp;out)</div><div class='del'>-    {</div><div class='del'>-        *out++ = c;</div><div class='del'>-    }</div><div class='add'>+    { *out++ = c; }</div><div class='add'>+    static inline void appendTo(const QLatin1Char c, char *&amp;out)</div><div class='add'>+    { *out++ = c.toLatin1(); }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-template &lt;&gt; struct QConcatenable&lt;QChar&gt;</div><div class='add'>+template &lt;&gt; struct QConcatenable&lt;QChar&gt; : private QAbstractConcatenable</div><div class='ctx'> {</div><div class='ctx'>     typedef QChar type;</div><div class='add'>+    typedef QString ConvertTo;</div><div class='ctx'>     enum { ExactSize = true };</div><div class='ctx'>     static int size(const QChar) { return 1; }</div><div class='ctx'>     static inline void appendTo(const QChar c, QChar *&amp;out)</div><div class='del'>-    {</div><div class='del'>-        *out++ = c;</div><div class='del'>-    }</div><div class='add'>+    { *out++ = c; }</div><div class='add'>+#ifndef QT_NO_CAST_TO_ASCII</div><div class='add'>+    static inline QT_ASCII_CAST_WARN void appendTo(const QChar c, char *&amp;out)</div><div class='add'>+    { convertToAscii(c, out); }</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-template &lt;&gt; struct QConcatenable&lt;QCharRef&gt;</div><div class='add'>+template &lt;&gt; struct QConcatenable&lt;QCharRef&gt; : private QAbstractConcatenable</div><div class='ctx'> {</div><div class='ctx'>     typedef QCharRef type;</div><div class='add'>+    typedef QString ConvertTo;</div><div class='ctx'>     enum { ExactSize = true };</div><div class='ctx'>     static int size(const QCharRef &amp;) { return 1; }</div><div class='ctx'>     static inline void appendTo(const QCharRef &amp;c, QChar *&amp;out)</div><div class='del'>-    {</div><div class='del'>-        *out++ = QChar(c);</div><div class='del'>-    }</div><div class='add'>+    { *out++ = QChar(c); }</div><div class='add'>+#ifndef QT_NO_CAST_TO_ASCII</div><div class='add'>+    static inline QT_ASCII_CAST_WARN void appendTo(const QCharRef &amp;c, char *&amp;out)</div><div class='add'>+    { convertToAscii(c, out); }</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> template &lt;&gt; struct QConcatenable&lt;QLatin1String&gt;</div><div class='ctx'> {</div><div class='ctx'>     typedef QLatin1String type;</div><div class='add'>+    typedef QString ConvertTo;</div><div class='ctx'>     enum { ExactSize = true };</div><div class='ctx'>     static int size(const QLatin1String &amp;a) { return qstrlen(a.latin1()); }</div><div class='ctx'>     static inline void appendTo(const QLatin1String &amp;a, QChar *&amp;out)</div><div class='hunk'>@@ -188,12 +240,17 @@ template &lt;&gt; struct QConcatenable&lt;QLatin1String&gt;</div><div class='ctx'>         for (const char *s = a.latin1(); *s; )</div><div class='ctx'>             *out++ = QLatin1Char(*s++);</div><div class='ctx'>     }</div><div class='del'>-</div><div class='add'>+    static inline void appendTo(const QLatin1String &amp;a, char *&amp;out)</div><div class='add'>+    {</div><div class='add'>+        for (const char *s = a.latin1(); *s; )</div><div class='add'>+            *out++ = *s++;</div><div class='add'>+    }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> template &lt;&gt; struct QConcatenable&lt;QLatin1Literal&gt;</div><div class='ctx'> {</div><div class='ctx'>     typedef QLatin1Literal type;</div><div class='add'>+    typedef QString ConvertTo;</div><div class='ctx'>     enum { ExactSize = true };</div><div class='ctx'>     static int size(const QLatin1Literal &amp;a) { return a.size(); }</div><div class='ctx'>     static inline void appendTo(const QLatin1Literal &amp;a, QChar *&amp;out)</div><div class='hunk'>@@ -201,11 +258,17 @@ template &lt;&gt; struct QConcatenable&lt;QLatin1Literal&gt;</div><div class='ctx'>         for (const char *s = a.data(); *s; )</div><div class='ctx'>             *out++ = QLatin1Char(*s++);</div><div class='ctx'>     }</div><div class='add'>+    static inline void appendTo(const QLatin1Literal &amp;a, char *&amp;out)</div><div class='add'>+    {</div><div class='add'>+        for (const char *s = a.data(); *s; )</div><div class='add'>+            *out++ = *s++;</div><div class='add'>+    }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-template &lt;&gt; struct QConcatenable&lt;QString&gt;</div><div class='add'>+template &lt;&gt; struct QConcatenable&lt;QString&gt; : private QAbstractConcatenable</div><div class='ctx'> {</div><div class='ctx'>     typedef QString type;</div><div class='add'>+    typedef QString ConvertTo;</div><div class='ctx'>     enum { ExactSize = true };</div><div class='ctx'>     static int size(const QString &amp;a) { return a.size(); }</div><div class='ctx'>     static inline void appendTo(const QString &amp;a, QChar *&amp;out)</div><div class='hunk'>@@ -214,80 +277,126 @@ template &lt;&gt; struct QConcatenable&lt;QString&gt;</div><div class='ctx'>         memcpy(out, reinterpret_cast&lt;const char*&gt;(a.constData()), sizeof(QChar) * n);</div><div class='ctx'>         out += n;</div><div class='ctx'>     }</div><div class='add'>+#ifndef QT_NO_CAST_TO_ASCII</div><div class='add'>+    static inline QT_ASCII_CAST_WARN void appendTo(const QString &amp;a, char *&amp;out)</div><div class='add'>+    { convertToAscii(a.constData(), a.length(), out); }</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-template &lt;&gt; struct QConcatenable&lt;QStringRef&gt;</div><div class='add'>+template &lt;&gt; struct QConcatenable&lt;QStringRef&gt; : private QAbstractConcatenable</div><div class='ctx'> {</div><div class='ctx'>     typedef QStringRef type;</div><div class='add'>+    typedef QString ConvertTo;</div><div class='ctx'>     enum { ExactSize = true };</div><div class='ctx'>     static int size(const QStringRef &amp;a) { return a.size(); }</div><div class='del'>-    static inline void appendTo(QStringRef a, QChar *&amp;out)</div><div class='add'>+    static inline void appendTo(const QStringRef &amp;a, QChar *&amp;out)</div><div class='ctx'>     {</div><div class='ctx'>         const int n = a.size();</div><div class='ctx'>         memcpy(out, reinterpret_cast&lt;const char*&gt;(a.constData()), sizeof(QChar) * n);</div><div class='ctx'>         out += n;</div><div class='ctx'>     }</div><div class='add'>+#ifndef QT_NO_CAST_TO_ASCII</div><div class='add'>+    static inline QT_ASCII_CAST_WARN void appendTo(const QStringRef &amp;a, char *&amp;out)</div><div class='add'>+    { convertToAscii(a.constData(), a.length(), out); }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifndef QT_NO_CAST_FROM_ASCII</div><div class='ctx'> template &lt;int N&gt; struct QConcatenable&lt;char[N]&gt; : private QAbstractConcatenable</div><div class='ctx'> {</div><div class='ctx'>     typedef char type[N];</div><div class='add'>+    typedef QByteArray ConvertTo;</div><div class='ctx'>     enum { ExactSize = false };</div><div class='del'>-    static int size(const char[N])</div><div class='add'>+    static int size(const char[N]) { return N - 1; }</div><div class='add'>+#ifndef QT_NO_CAST_FROM_ASCII</div><div class='add'>+    static inline void QT_ASCII_CAST_WARN appendTo(const char a[N], QChar *&amp;out)</div><div class='ctx'>     {</div><div class='del'>-        return N - 1;</div><div class='add'>+        QAbstractConcatenable::convertFromAscii(a, N, out);</div><div class='ctx'>     }</div><div class='del'>-    static inline void appendTo(const char a[N], QChar *&amp;out)</div><div class='add'>+#endif</div><div class='add'>+    static inline void appendTo(const char a[N], char *&amp;out)</div><div class='ctx'>     {</div><div class='del'>-        QAbstractConcatenable::convertFromAscii(a, N, out);</div><div class='add'>+        while (*a)</div><div class='add'>+            *out++ = *a++;</div><div class='ctx'>     }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> template &lt;int N&gt; struct QConcatenable&lt;const char[N]&gt; : private QAbstractConcatenable</div><div class='ctx'> {</div><div class='ctx'>     typedef const char type[N];</div><div class='add'>+    typedef QByteArray ConvertTo;</div><div class='ctx'>     enum { ExactSize = false };</div><div class='ctx'>     static int size(const char[N]) { return N - 1; }</div><div class='del'>-    static inline void appendTo(const char a[N], QChar *&amp;out)</div><div class='add'>+#ifndef QT_NO_CAST_FROM_ASCII</div><div class='add'>+    static inline void QT_ASCII_CAST_WARN appendTo(const char a[N], QChar *&amp;out)</div><div class='ctx'>     {</div><div class='ctx'>         QAbstractConcatenable::convertFromAscii(a, N, out);</div><div class='ctx'>     }</div><div class='add'>+#endif</div><div class='add'>+    static inline void appendTo(const char a[N], char *&amp;out)</div><div class='add'>+    {</div><div class='add'>+        while (*a)</div><div class='add'>+            *out++ = *a++;</div><div class='add'>+    }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> template &lt;&gt; struct QConcatenable&lt;const char *&gt; : private QAbstractConcatenable</div><div class='ctx'> {</div><div class='ctx'>     typedef char const *type;</div><div class='add'>+    typedef QByteArray ConvertTo;</div><div class='ctx'>     enum { ExactSize = false };</div><div class='ctx'>     static int size(const char *a) { return qstrlen(a); }</div><div class='del'>-    static inline void appendTo(const char *a, QChar *&amp;out)</div><div class='add'>+#ifndef QT_NO_CAST_FROM_ASCII</div><div class='add'>+    static inline void QT_ASCII_CAST_WARN appendTo(const char *a, QChar *&amp;out)</div><div class='add'>+    { QAbstractConcatenable::convertFromAscii(a, -1, out); }</div><div class='add'>+#endif</div><div class='add'>+    static inline void appendTo(const char *a, char *&amp;out)</div><div class='ctx'>     {</div><div class='del'>-        QAbstractConcatenable::convertFromAscii(a, -1, out);</div><div class='add'>+        while (*a)</div><div class='add'>+            *out++ = *a++;</div><div class='ctx'>     }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> template &lt;&gt; struct QConcatenable&lt;QByteArray&gt; : private QAbstractConcatenable</div><div class='ctx'> {</div><div class='ctx'>     typedef QByteArray type;</div><div class='add'>+    typedef QByteArray ConvertTo;</div><div class='ctx'>     enum { ExactSize = false };</div><div class='del'>-    static int size(const QByteArray &amp;ba) { return qstrnlen(ba.constData(), ba.size()); }</div><div class='add'>+    static int size(const QByteArray &amp;ba) { return ba.size(); }</div><div class='add'>+#ifndef QT_NO_CAST_FROM_ASCII</div><div class='ctx'>     static inline void appendTo(const QByteArray &amp;ba, QChar *&amp;out)</div><div class='ctx'>     {</div><div class='del'>-        QAbstractConcatenable::convertFromAscii(ba.constData(), -1, out);</div><div class='add'>+        // adding 1 because convertFromAscii expects the size including the null-termination</div><div class='add'>+        QAbstractConcatenable::convertFromAscii(ba.constData(), ba.size() + 1, out);</div><div class='ctx'>     }</div><div class='del'>-};</div><div class='ctx'> #endif</div><div class='add'>+    static inline void appendTo(const QByteArray &amp;ba, char *&amp;out)</div><div class='add'>+    {</div><div class='add'>+        const char *a = ba.constData();</div><div class='add'>+        const char * const end = ba.end();</div><div class='add'>+        while (a != end)</div><div class='add'>+            *out++ = *a++;</div><div class='add'>+    }</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+namespace QtStringBuilder {</div><div class='add'>+    template &lt;typename A, typename B&gt; struct ConvertToTypeHelper</div><div class='add'>+    { typedef A ConvertTo; };</div><div class='add'>+    template &lt;typename T&gt; struct ConvertToTypeHelper&lt;T, QString&gt;</div><div class='add'>+    { typedef QString ConvertTo; };</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> template &lt;typename A, typename B&gt;</div><div class='ctx'> struct QConcatenable&lt; QStringBuilder&lt;A, B&gt; &gt;</div><div class='ctx'> {</div><div class='ctx'>     typedef QStringBuilder&lt;A, B&gt; type;</div><div class='add'>+    typedef typename QtStringBuilder::ConvertToTypeHelper&lt;typename QConcatenable&lt;A&gt;::ConvertTo, typename QConcatenable&lt;B&gt;::ConvertTo&gt;::ConvertTo ConvertTo;</div><div class='ctx'>     enum { ExactSize = QConcatenable&lt;A&gt;::ExactSize &amp;&amp; QConcatenable&lt;B&gt;::ExactSize };</div><div class='ctx'>     static int size(const type &amp;p)</div><div class='ctx'>     {</div><div class='ctx'>         return QConcatenable&lt;A&gt;::size(p.a) + QConcatenable&lt;B&gt;::size(p.b);</div><div class='ctx'>     }</div><div class='del'>-    static inline void appendTo(const QStringBuilder&lt;A, B&gt; &amp;p, QChar *&amp;out)</div><div class='add'>+    template&lt;typename T&gt; static inline void appendTo(const type &amp;p, T *&amp;out)</div><div class='ctx'>     {</div><div class='ctx'>         QConcatenable&lt;A&gt;::appendTo(p.a, out);</div><div class='ctx'>         QConcatenable&lt;B&gt;::appendTo(p.b, out);</div><div class='hunk'>@@ -301,7 +410,9 @@ operator%(const A &amp;a, const B &amp;b)</div><div class='ctx'>    return QStringBuilder&lt;typename QConcatenable&lt;A&gt;::type, typename QConcatenable&lt;B&gt;::type&gt;(a, b);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef QT_USE_FAST_OPERATOR_PLUS</div><div class='add'>+// QT_USE_FAST_OPERATOR_PLUS was introduced in 4.7, QT_USE_QSTRINGBUILDER is to be used from 4.8 onwards</div><div class='add'>+// QT_USE_FAST_OPERATOR_PLUS does not remove the normal operator+ for QByteArray</div><div class='add'>+#if defined(QT_USE_FAST_OPERATOR_PLUS) || defined(QT_USE_QSTRINGBUILDER)</div><div class='ctx'> template &lt;typename A, typename B&gt;</div><div class='ctx'> QStringBuilder&lt;typename QConcatenable&lt;A&gt;::type, typename QConcatenable&lt;B&gt;::type&gt;</div><div class='ctx'> operator+(const A &amp;a, const B &amp;b)</div><div class='hunk'>@@ -310,6 +421,35 @@ operator+(const A &amp;a, const B &amp;b)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+template &lt;typename A, typename B&gt;</div><div class='add'>+QByteArray &amp;operator+=(QByteArray &amp;a, const QStringBuilder&lt;A, B&gt; &amp;b)</div><div class='add'>+{</div><div class='add'>+#ifndef QT_NO_CAST_TO_ASCII</div><div class='add'>+    if (sizeof(typename QConcatenable&lt; QStringBuilder&lt;A, B&gt; &gt;::ConvertTo::value_type) == sizeof(QChar)) {</div><div class='add'>+        //it is not save to optimize as in utf8 it is not possible to compute the size</div><div class='add'>+        return a += QString(b);</div><div class='add'>+    }</div><div class='add'>+#endif</div><div class='add'>+    int len = a.size() + QConcatenable&lt; QStringBuilder&lt;A, B&gt; &gt;::size(b);</div><div class='add'>+    a.reserve(len);</div><div class='add'>+    char *it = a.data() + a.size();</div><div class='add'>+    QConcatenable&lt; QStringBuilder&lt;A, B&gt; &gt;::appendTo(b, it);</div><div class='add'>+    a.resize(len); //we need to resize after the appendTo for the case str+=foo+str</div><div class='add'>+    return a;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename A, typename B&gt;</div><div class='add'>+QString &amp;operator+=(QString &amp;a, const QStringBuilder&lt;A, B&gt; &amp;b)</div><div class='add'>+{</div><div class='add'>+    int len = a.size() + QConcatenable&lt; QStringBuilder&lt;A, B&gt; &gt;::size(b);</div><div class='add'>+    a.reserve(len);</div><div class='add'>+    QChar *it = a.data() + a.size();</div><div class='add'>+    QConcatenable&lt; QStringBuilder&lt;A, B&gt; &gt;::appendTo(b, it);</div><div class='add'>+    a.resize(it - a.constData()); //may be smaller than len if there was conversion from utf8</div><div class='add'>+    return a;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='ctx'> QT_END_HEADER</div><div class='head'>diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp<br/>index b4cc40a..5997574 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qstringlist.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qstringlist.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qstringlist.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qstringlist.cpp</a></div><div class='hunk'>@@ -680,4 +680,13 @@ int QtPrivate::QStringList_removeDuplicates(QStringList *that)</div><div class='ctx'>     return n - j;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*! \fn QStringList::QStringList(std::initializer_list&lt;QString&gt; args)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Construct a list from a std::initilizer_list.</div><div class='add'>+</div><div class='add'>+    This constructor is only enabled if the compiler supports C++0x</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> QT_END_NAMESPACE</div><div class='head'>diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h<br/>index a2f061a..2159512 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qstringlist.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qstringlist.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qstringlist.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qstringlist.h</a></div><div class='hunk'>@@ -70,6 +70,9 @@ public:</div><div class='ctx'>     inline explicit QStringList(const QString &amp;i) { append(i); }</div><div class='ctx'>     inline QStringList(const QStringList &amp;l) : QList&lt;QString&gt;(l) { }</div><div class='ctx'>     inline QStringList(const QList&lt;QString&gt; &amp;l) : QList&lt;QString&gt;(l) { }</div><div class='add'>+#ifdef Q_COMPILER_INITIALIZER_LISTS</div><div class='add'>+    inline QStringList(std::initializer_list&lt;QString&gt; args) : QList(args) { }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'>     inline void sort();</div><div class='ctx'>     inline int removeDuplicates();</div><div class='head'>diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h<br/>index 289a9dd..6da6cf5 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qvarlengtharray.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qvarlengtharray.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qvarlengtharray.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qvarlengtharray.h</a></div><div class='hunk'>@@ -44,7 +44,10 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;QtCore/qcontainerfwd.h&gt;</div><div class='ctx'> #include &lt;QtCore/qglobal.h&gt;</div><div class='add'>+#include &lt;QtCore/qalgorithms.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;new&gt;</div><div class='add'>+#include &lt;string.h&gt;</div><div class='ctx'> </div><div class='ctx'> QT_BEGIN_HEADER</div><div class='ctx'> </div><div class='hunk'>@@ -123,6 +126,18 @@ public:</div><div class='ctx'>         }</div><div class='ctx'>     }</div><div class='ctx'>     void append(const T *buf, int size);</div><div class='add'>+    inline QVarLengthArray&lt;T, Prealloc&gt; &amp;operator&lt;&lt;(const T &amp;t)</div><div class='add'>+    { append(t); return *this; }</div><div class='add'>+    inline QVarLengthArray&lt;T, Prealloc&gt; &amp;operator+=(const T &amp;t)</div><div class='add'>+    { append(t); return *this; }</div><div class='add'>+</div><div class='add'>+    void prepend(const T &amp;t);</div><div class='add'>+    void insert(int i, const T &amp;t);</div><div class='add'>+    void insert(int i, int n, const T &amp;t);</div><div class='add'>+    void replace(int i, const T &amp;t);</div><div class='add'>+    void remove(int i);</div><div class='add'>+    void remove(int i, int n);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'>     inline T *data() { return ptr; }</div><div class='ctx'>     inline const T *data() const { return ptr; }</div><div class='hunk'>@@ -135,6 +150,21 @@ public:</div><div class='ctx'>     typedef const value_type &amp;const_reference;</div><div class='ctx'>     typedef qptrdiff difference_type;</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+    typedef T* iterator;</div><div class='add'>+    typedef const T* const_iterator;</div><div class='add'>+</div><div class='add'>+    inline iterator begin() { return ptr; }</div><div class='add'>+    inline const_iterator begin() const { return ptr; }</div><div class='add'>+    inline const_iterator constBegin() const { return ptr; }</div><div class='add'>+    inline iterator end() { return ptr + s; }</div><div class='add'>+    inline const_iterator end() const { return ptr + s; }</div><div class='add'>+    inline const_iterator constEnd() const { return ptr + s; }</div><div class='add'>+    iterator insert(iterator before, int n, const T &amp;x);</div><div class='add'>+    inline iterator insert(iterator before, const T &amp;x) { return insert(before, 1, x); }</div><div class='add'>+    iterator erase(iterator begin, iterator end);</div><div class='add'>+    inline iterator erase(iterator pos) { return erase(pos, pos+1); }</div><div class='add'>+</div><div class='ctx'> private:</div><div class='ctx'>     friend class QPodList&lt;T, Prealloc&gt;;</div><div class='ctx'>     void realloc(int size, int alloc);</div><div class='hunk'>@@ -272,6 +302,100 @@ Q_OUTOFLINE_TEMPLATE T QVarLengthArray&lt;T, Prealloc&gt;::value(int i, const T &amp;defau</div><div class='ctx'>     return (i &lt; 0 || i &gt;= size()) ? defaultValue : at(i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+template &lt;class T, int Prealloc&gt;</div><div class='add'>+inline void QVarLengthArray&lt;T, Prealloc&gt;::insert(int i, const T &amp;t)</div><div class='add'>+{ Q_ASSERT_X(i &gt;= 0 &amp;&amp; i &lt;= s, "QVarLengthArray::insert", "index out of range");</div><div class='add'>+  insert(begin() + i, 1, t); }</div><div class='add'>+template &lt;class T, int Prealloc&gt;</div><div class='add'>+inline void QVarLengthArray&lt;T, Prealloc&gt;::insert(int i, int n, const T &amp;t)</div><div class='add'>+{ Q_ASSERT_X(i &gt;= 0 &amp;&amp; i &lt;= s, "QVarLengthArray::insert", "index out of range");</div><div class='add'>+  insert(begin() + i, n, t); }</div><div class='add'>+template &lt;class T, int Prealloc&gt;</div><div class='add'>+inline void QVarLengthArray&lt;T, Prealloc&gt;::remove(int i, int n)</div><div class='add'>+{ Q_ASSERT_X(i &gt;= 0 &amp;&amp; n &gt;= 0 &amp;&amp; i + n &lt;= s, "QVarLengthArray::remove", "index out of range");</div><div class='add'>+  erase(begin() + i, begin() + i + n); }</div><div class='add'>+template &lt;class T, int Prealloc&gt;</div><div class='add'>+inline void QVarLengthArray&lt;T, Prealloc&gt;::remove(int i)</div><div class='add'>+{ Q_ASSERT_X(i &gt;= 0 &amp;&amp; i &lt; s, "QVarLengthArray::remove", "index out of range");</div><div class='add'>+  erase(begin() + i, begin() + i + 1); }</div><div class='add'>+template &lt;class T, int Prealloc&gt;</div><div class='add'>+inline void QVarLengthArray&lt;T, Prealloc&gt;::prepend(const T &amp;t)</div><div class='add'>+{ insert(begin(), 1, t); }</div><div class='add'>+</div><div class='add'>+template &lt;class T, int Prealloc&gt;</div><div class='add'>+inline void QVarLengthArray&lt;T, Prealloc&gt;::replace(int i, const T &amp;t)</div><div class='add'>+{</div><div class='add'>+    Q_ASSERT_X(i &gt;= 0 &amp;&amp; i &lt; s, "QVarLengthArray::replace", "index out of range");</div><div class='add'>+    const T copy(t);</div><div class='add'>+    data()[i] = copy;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+template &lt;class T, int Prealloc&gt;</div><div class='add'>+Q_OUTOFLINE_TEMPLATE typename QVarLengthArray&lt;T, Prealloc&gt;::iterator QVarLengthArray&lt;T, Prealloc&gt;::insert(iterator before, size_type n, const T &amp;t)</div><div class='add'>+{</div><div class='add'>+    int offset = int(before - ptr);</div><div class='add'>+    if (n != 0) {</div><div class='add'>+        resize(s + n);</div><div class='add'>+        const T copy(t);</div><div class='add'>+        if (QTypeInfo&lt;T&gt;::isStatic) {</div><div class='add'>+            T *b = ptr + offset;</div><div class='add'>+            T *j = ptr + s;</div><div class='add'>+            T *i = j - n;</div><div class='add'>+            while (i != b)</div><div class='add'>+                *--j = *--i;</div><div class='add'>+            i = b + n;</div><div class='add'>+            while (i != b)</div><div class='add'>+                *--i = copy;</div><div class='add'>+        } else {</div><div class='add'>+            T *b = ptr + offset;</div><div class='add'>+            T *i = b + n;</div><div class='add'>+            memmove(i, b, (s - offset - n) * sizeof(T));</div><div class='add'>+            while (i != b)</div><div class='add'>+                new (--i) T(copy);</div><div class='add'>+        }</div><div class='add'>+    }</div><div class='add'>+    return ptr + offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;class T, int Prealloc&gt;</div><div class='add'>+Q_OUTOFLINE_TEMPLATE typename QVarLengthArray&lt;T, Prealloc&gt;::iterator QVarLengthArray&lt;T, Prealloc&gt;::erase(iterator abegin, iterator aend)</div><div class='add'>+{</div><div class='add'>+    int f = int(abegin - ptr);</div><div class='add'>+    int l = int(aend - ptr);</div><div class='add'>+    int n = l - f;</div><div class='add'>+    if (QTypeInfo&lt;T&gt;::isComplex) {</div><div class='add'>+        qCopy(ptr + l, ptr + s, ptr + f);</div><div class='add'>+        T *i = ptr + s;</div><div class='add'>+        T *b = ptr + s - n;</div><div class='add'>+        while (i != b) {</div><div class='add'>+            --i;</div><div class='add'>+            i-&gt;~T();</div><div class='add'>+        }</div><div class='add'>+    } else {</div><div class='add'>+        memmove(ptr + f, ptr + l, (s - l) * sizeof(T));</div><div class='add'>+    }</div><div class='add'>+    s -= n;</div><div class='add'>+    return ptr + f;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T, int Prealloc1, int Prealloc2&gt;</div><div class='add'>+bool operator==(const QVarLengthArray&lt;T, Prealloc1&gt; &amp;l, const QVarLengthArray&lt;T, Prealloc2&gt; &amp;r)</div><div class='add'>+{</div><div class='add'>+    if (l.size() != r.size())</div><div class='add'>+        return false;</div><div class='add'>+    for (int i = 0; i &lt; l.size(); i++) {</div><div class='add'>+        if (l.at(i) != r.at(i))</div><div class='add'>+            return false;</div><div class='add'>+    }</div><div class='add'>+    return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+template &lt;typename T, int Prealloc1, int Prealloc2&gt;</div><div class='add'>+bool operator!=(const QVarLengthArray&lt;T, Prealloc1&gt; &amp;l, const QVarLengthArray&lt;T, Prealloc2&gt; &amp;r)</div><div class='add'>+{</div><div class='add'>+    return !(l == r);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> QT_END_NAMESPACE</div><div class='ctx'> </div><div class='head'>diff --git a/src/corelib/tools/qvarlengtharray.qdoc b/src/corelib/tools/qvarlengtharray.qdoc<br/>index e01d000..b2dc7d6 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qvarlengtharray.qdoc?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qvarlengtharray.qdoc</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qvarlengtharray.qdoc?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qvarlengtharray.qdoc</a></div><div class='hunk'>@@ -337,3 +337,211 @@</div><div class='ctx'>     Typedef for const T &amp;. Provided for STL compatibility.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+/*! \fn void QVarLengthArray::prepend(const T &amp;value)</div><div class='add'>+</div><div class='add'>+    \since 4.8</div><div class='add'>+    Inserts \a value at the beginning of the array.</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+    This is the same as vector.insert(0, \a value).</div><div class='add'>+</div><div class='add'>+    For large arrays, this operation can be slow (\l{linear time}),</div><div class='add'>+    because it requires moving all the items in the vector by one</div><div class='add'>+    position further in memory. If you want a container class that</div><div class='add'>+    provides a fast prepend() function, use QList or QLinkedList</div><div class='add'>+    instead.</div><div class='add'>+</div><div class='add'>+    \sa append(), insert()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn void QVarLengthArray::replace(int i, const T &amp;value)</div><div class='add'>+</div><div class='add'>+    \since 4.8</div><div class='add'>+    Replaces the item at index position \a i with \a value.</div><div class='add'>+</div><div class='add'>+    \a i must be a valid index position in the array (i.e., 0 &lt;= \a</div><div class='add'>+    i &lt; size()).</div><div class='add'>+</div><div class='add'>+    \sa operator[](), remove()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn void QVarLengthArray::remove(int i)</div><div class='add'>+</div><div class='add'>+    \overload</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Removes the element at index position \a i.</div><div class='add'>+</div><div class='add'>+    \sa insert(), replace()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn void QVarLengthArray::remove(int i, int count)</div><div class='add'>+</div><div class='add'>+    \overload</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Removes \a count elements from the middle of the array, starting at</div><div class='add'>+    index position \a i.</div><div class='add'>+</div><div class='add'>+    \sa insert(), replace()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn QVarLengthArray::iterator QVarLengthArray::begin()</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns an \l{STL-style iterator} pointing to the first item in</div><div class='add'>+    the array.</div><div class='add'>+</div><div class='add'>+    \sa constBegin(), end()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn QVarLengthArray::const_iterator QVarLengthArray::begin() const</div><div class='add'>+    \since 4.8</div><div class='add'>+    \overload</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn QVarLengthArray::const_iterator QVarLengthArray::constBegin() const</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns a const \l{STL-style iterator} pointing to the first item</div><div class='add'>+    in the array.</div><div class='add'>+</div><div class='add'>+    \sa begin(), constEnd()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn QVarLengthArray::iterator QVarLengthArray::end()</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns an \l{STL-style iterator} pointing to the imaginary item</div><div class='add'>+    after the last item in the array.</div><div class='add'>+</div><div class='add'>+    \sa begin(), constEnd()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn QVarLengthArray::const_iterator QVarLengthArray::end() const</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    \overload</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn QVarLengthArray::const_iterator QVarLengthArray::constEnd() const</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Returns a const \l{STL-style iterator} pointing to the imaginary</div><div class='add'>+    item after the last item in the array.</div><div class='add'>+</div><div class='add'>+    \sa constBegin(), end()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn QVarLengthArray::iterator QVarLengthArray::erase(iterator pos)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Removes the item pointed to by the iterator \a pos from the</div><div class='add'>+    vector, and returns an iterator to the next item in the vector</div><div class='add'>+    (which may be end()).</div><div class='add'>+</div><div class='add'>+    \sa insert(), remove()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn QVarLengthArray::iterator QVarLengthArray::erase(iterator begin, iterator end)</div><div class='add'>+</div><div class='add'>+    \overload</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Removes all the items from \a begin up to (but not including) \a</div><div class='add'>+    end. Returns an iterator to the same item that \a end referred to</div><div class='add'>+    before the call.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn void QVarLengthArray::insert(int i, const T &amp;value)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Inserts \a value at index position \a i in the array. If \a i is</div><div class='add'>+    0, the value is prepended to the vector. If \a i is size(), the</div><div class='add'>+    value is appended to the vector.</div><div class='add'>+</div><div class='add'>+    For large arrays, this operation can be slow (\l{linear time}),</div><div class='add'>+    because it requires moving all the items at indexes \a i and</div><div class='add'>+    above by one position further in memory. If you want a container</div><div class='add'>+    class that provides a fast insert() function, use QLinkedList</div><div class='add'>+    instead.</div><div class='add'>+</div><div class='add'>+    \sa remove()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn void QVarLengthArray::insert(int i, int count, const T &amp;value)</div><div class='add'>+</div><div class='add'>+    \overload</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Inserts \a count copies of \a value at index position \a i in the</div><div class='add'>+    vector.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn QVarLengthArray::iterator QVarLengthArray::insert(iterator before, const T &amp;value)</div><div class='add'>+</div><div class='add'>+    \overload</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Inserts \a value in front of the item pointed to by the iterator</div><div class='add'>+    \a before. Returns an iterator pointing at the inserted item.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn QVarLengthArray::iterator QVarLengthArray::insert(iterator before, int count, const T &amp;value)</div><div class='add'>+</div><div class='add'>+    \since 4.8</div><div class='add'>+    Inserts \a count copies of \a value in front of the item pointed to</div><div class='add'>+    by the iterator \a before. Returns an iterator pointing at the</div><div class='add'>+    first of the inserted items.</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*! \fn bool operator==(const QVarLengthArray&lt;T, Prealloc1&gt; &amp;left, const QVarLengthArray&lt;T, Prealloc2&gt; &amp;right)</div><div class='add'>+</div><div class='add'>+    \relates QVarLengthArray</div><div class='add'>+    \since 4.8</div><div class='add'>+    Returns true if the two array are equal;</div><div class='add'>+</div><div class='add'>+    Two arrays are considered equal if they contain the same values</div><div class='add'>+    in the same order.</div><div class='add'>+</div><div class='add'>+    This function requires the value type to have an implementation</div><div class='add'>+    of \c operator==().</div><div class='add'>+</div><div class='add'>+    \sa operator!=()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn bool operator!=(const QVarLengthArray&lt;T, Prealloc1&gt; &amp;left, const QVarLengthArray&lt;T, Prealloc2&gt; &amp;right)</div><div class='add'>+</div><div class='add'>+    \relates QVarLengthArray</div><div class='add'>+    \since 4.8</div><div class='add'>+    Returns true if the two array are different;</div><div class='add'>+</div><div class='add'>+    Two arrays are considered equal if they contain the same values</div><div class='add'>+    in the same order.</div><div class='add'>+</div><div class='add'>+    This function requires the value type to have an implementation</div><div class='add'>+    of \c operator==().</div><div class='add'>+</div><div class='add'>+    \sa operator==()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn QVarLengthArray &amp;QVarLengthArray::operator&lt;&lt;(const T &amp;value)</div><div class='add'>+</div><div class='add'>+    \since 4.8</div><div class='add'>+    Appends \a value to the array and returns a reference to this</div><div class='add'>+    vector.</div><div class='add'>+</div><div class='add'>+    \sa append(), operator+=()</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+/*! \fn QVarLengthArray &amp;QVarLengthArray::operator+=(const T &amp;value)</div><div class='add'>+</div><div class='add'>+    \since 4.8</div><div class='add'>+    Appends \a value to the array and returns a reference to this</div><div class='add'>+    vector.</div><div class='add'>+</div><div class='add'>+    \sa append(), operator&lt;&lt;()</div><div class='add'>+*/</div><div class='add'>+</div><div class='head'>diff --git a/src/corelib/tools/qvector.cpp b/src/corelib/tools/qvector.cpp<br/>index 42510ca..8c4dd06 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qvector.cpp?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qvector.cpp</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qvector.cpp?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qvector.cpp</a></div><div class='hunk'>@@ -274,6 +274,15 @@ int QVectorData::grow(int sizeofTypedData, int size, int sizeofT, bool excessive</div><div class='ctx'>     \sa operator=()</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+/*! \fn QVector::QVector(std::initializer_list&lt;T&gt; args)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Construct a vector from a std::initilizer_list.</div><div class='add'>+</div><div class='add'>+    This constructor is only enabled if the compiler supports C++0x</div><div class='add'>+*/</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /*! \fn QVector::~QVector()</div><div class='ctx'> </div><div class='ctx'>     Destroys the vector.</div><div class='hunk'>@@ -285,6 +294,13 @@ int QVectorData::grow(int sizeofTypedData, int size, int sizeofT, bool excessive</div><div class='ctx'>     vector.</div><div class='ctx'> */</div><div class='ctx'> </div><div class='add'>+/*! \fn void QVector::swap(QVector&lt;T&gt; &amp;other)</div><div class='add'>+    \since 4.8</div><div class='add'>+</div><div class='add'>+    Swaps vector \a other with this vector. This operation is very fast and</div><div class='add'>+    never fails.</div><div class='add'>+*/</div><div class='add'>+</div><div class='ctx'> /*! \fn bool QVector::operator==(const QVector&lt;T&gt; &amp;other) const</div><div class='ctx'> </div><div class='ctx'>     Returns true if \a other is equal to this vector; otherwise</div><div class='head'>diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h<br/>index cd85c99..ca67151 100644<br/>--- a/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qvector.h?h=v4.8.0-beta&amp;id=570f8970bea646055583671397c3d2706ac45004'>src/corelib/tools/qvector.h</a><br/>+++ b/<a href='/oss-git/Qt.git/tree/src/corelib/tools/qvector.h?h=v4.8.0-beta&amp;id=73fc68802d8c0c8d3d499b279782ce270f1c5bc6'>src/corelib/tools/qvector.h</a></div>